7679 files changed, 115039 insertions, 112477 deletions

diff --git a/Manifest b/Manifest
index 15653c640953..861e1b44dffc 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29628 BLAKE2B efe1264958811bd516dff8949d5a98aa041e018bd361bd6d245282d91683ab882f7207d0ed42593c557547f5df8b39e0c9e7623c3528c53a68dc1742014197c0 SHA512 6dc0ce33c73077b99d5bbb8f2ccdd24771f0b5f0f26441f8a7bbc9c8020ddde693c94704f144ba4179ee5d461c9b3c1913198f042b2c3742a5248d5c5702e684
-TIMESTAMP 2019-08-18T16:09:03Z
+MANIFEST Manifest.files.gz 29634 BLAKE2B 9289a35a8c625e748add0e9c94607a6a8d3ee378f4f48a7984d80b1795a4f226f4bb0f7057ce9132ea6e04296b86b46a88028ac58280b2f76c0bff0a89c17991 SHA512 6659bdc481155b75ca48b29e1f677a0fa0bb6cadb5f4ad55748cf0a92284eea7b0bfd7292003ee8bed9363c4649f9ab2bbafcbd9b51ec68bf506b7689d126586
+TIMESTAMP 2019-09-06T08:39:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl1ZeB9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl1yGylfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD+jQ//WFTjOqPMvVfD7Ha+wOt4FJ0tQ32ySeJCZ3wj6IrqAzYfPGU7nZqOq/fQ
-4UYhyTW8zG0OzThALMkMMpFReP4qpVy5wv8wHtlBMuGeGveOI0E36TlLSt/H5MUn
-CA7RgmzJvlDZid5d8x+0/ZdGVGwVSx/SQjtBanTIlawfLyrm/4+cmv1aaadPEZTj
-x7lPDQVMSc1G9cIm3CN7LMDd2e9kJuG3swf2+aqVzADR1u3A9D8SQY/zengsntVA
-/m7F2dxjOVn2L9EYO9t67YujwNYU1ayEjd0QSNmejMhAJeN799P8kLR0DYNBNXKQ
-5GQccBN7fcKLwTDvHqw7Th4cJ5+R/rfkp5KEhsuh/s6raLtqsZQhcKJlRHbTBIUN
-fgqATFUTXoZSXus8S4vDcAuk2vUPGOGXXR0qAtDQgAW/H4glkIkiMWvh2BbwpUy7
-Gwkjsf7I4obN6Xg433mxF7z3E9GwwRYuA/rpwFADhrKilNUiJpUPBdcyPJ37k1bA
-yZyfnyTQsiHDPN9nuOF2w3TXDVcZNNqyQi9G04RO60QpdZqhyUsV8ZmcVcd3Kugi
-DYddh/O/h5taFLdOpDxnZ73AIeLvcSCwM1Ku4K9FpGL27pLu8805u52fmX2wd5V9
-8cLNt2V7wnHo0oUiWY6DNdqds5j58bwYJO4wEwIl50PYYbzkFHU=
-=+bNq
+klBAmQ/9G8+Gq7x9m6ryeAIGGxVMZ52q+Do6nBlWfUupJBtkdYlqtJx2QYbkdNfv
+QHL42267PR685JDLQCsp8TQ9joaK3FKjjNC/I4y8lmmKrsEd+EA8zMdT2nxmqQRE
+7y2rugPLOmOs6DzEljabsOBxFhgid39zRsguEZdNTYy6+QLWXzxCfOlsci8BYCbi
+HavXBRRnhPzDpLmGGDu0anGb8GYQSYqJFauzxhW8QW1KF/IBnXjjuJBU0R/NeLwE
+4iLS4SnAf2P+7lV4Ef9kbuAPgEhqsTogLP848tU9LCfHU2CjoQS/jMc3selXWiXi
+eRERRJSdHkCuct81V7E+ZD65/pzeGvui8CJx8qOTcHz2fmhDWvbNEnTJynSn2f9H
+TT5Nvaf4sdjHYKWQCk4v78Vd7Iq4Ssx8ai041fhGk4eSYx0ydcl7mU8LG/m1BVcb
+XUXpR0FMKfEx+zQtToInqV4Ess564bCUxRC3uMRdN7YQ1G4M0skgCDIc3BafeAVQ
+Sp+paqOgRdcttyfb3FwIPEd/iOrbpq3Xg8YtdD0jzTUvX4eXxPQA9htfS0FNbvm8
+JpZCuFd6s66F5ob/CbWKxDkSFiYi5mqj48xACkbWmZ7pmvxaUzp7v77FDFSVK0xd
+jHdN2yD55lRmUpXmjFh3k4fLltJzByQUQS8rn+lvmnC5PyBa90A=
+=edLC
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 824d8adf986e..8a4a9d30ca91 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 0d6956324014..488a578694ff 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/inspircd/Manifest b/acct-group/inspircd/Manifest
new file mode 100644
index 000000000000..59f702682b4c
--- /dev/null
+++ b/acct-group/inspircd/Manifest
@@ -0,0 +1,2 @@
+EBUILD inspircd-0.ebuild 164 BLAKE2B 83edcb0bfeddd85566a8b4eb83ce528df13455013d1bbd69a3de348b9c075d93a2c82fc896216489b5c81cb720f2979fdeb25751968c9df4988c3755239abf14 SHA512 08099568a51b5beb3fba0bd4f58bdaa75c9ef0d692dcce6c4da4f2bce48093ffe01abb6bccecb9134f34b475ae674b236627c132a19331da742f76f48eedc933
+MISC metadata.xml 364 BLAKE2B b8762bade85ba1f9cb7ee03782aad1d8a6703963f706b73cc24fb8c475aa7dbf9e143307cef0c42717dbd08504bac3de1fdbe5cf0d181098b4493537d2b0ad71 SHA512 2f17585fc34548ea920535b92e6f6c6c5206c080a7e476c7fbc10149298b6d8c0aac74547a494fda9b4b148750f364d038c8becd756cd147acbc43fdd6e629fe
diff --git a/acct-group/inspircd/inspircd-0.ebuild b/acct-group/inspircd/inspircd-0.ebuild
new file mode 100644
index 000000000000..071d82ef9208
--- /dev/null
+++ b/acct-group/inspircd/inspircd-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+# Port 6667 % 500
+ACCT_GROUP_ID=167
diff --git a/acct-group/inspircd/metadata.xml b/acct-group/inspircd/metadata.xml
new file mode 100644
index 000000000000..2b340d2c9798
--- /dev/null
+++ b/acct-group/inspircd/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>wadecline@hotmail.com</email>
+		<name>Wade Cline</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/knot/Manifest b/acct-group/knot/Manifest
new file mode 100644
index 000000000000..0352c83c4d37
--- /dev/null
+++ b/acct-group/knot/Manifest
@@ -0,0 +1,2 @@
+EBUILD knot-0.ebuild 145 BLAKE2B 28d79dce61d438e7cfdab41ee8abb20f827d7d1002c3532db64344dacb10e113bd4d311aef1903ada47f77984c6701de14deefad0e0db714ee30b389de4a2a6f SHA512 cbe47685fbd1c92c3eb6bdce390e456cf0f68fdec66c3904d9bf874b2ec4f15ee2e346e3434451d4836782d2d4b3ba2b794dacb3cea0d916c6080afcd103ad71
+MISC metadata.xml 375 BLAKE2B 11e88c4b125207b665bfc408cb1bc06f0a449384830dda3e38d83d2dfa922beb0079dc26fc84aecd22bb60543c1af002823f1d24996d84333a1aee3742930e6b SHA512 cfb08b91f3bc6f7596b7ecc20b490a1aeef40f41d29b57cd4a28cac579bbd2bc05801feb95a341e30f192729dce0e5547972c555a679faea15156c56d1040ec9
diff --git a/acct-group/knot/knot-0.ebuild b/acct-group/knot/knot-0.ebuild
new file mode 100644
index 000000000000..f8438eb43ff6
--- /dev/null
+++ b/acct-group/knot/knot-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=53
diff --git a/acct-group/knot/metadata.xml b/acct-group/knot/metadata.xml
new file mode 100644
index 000000000000..89aeeb96e865
--- /dev/null
+++ b/acct-group/knot/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>nemunaire@nemunai.re</email>
+		<name>Pierre-Olivier Mercier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/ntp/Manifest b/acct-group/ntp/Manifest
new file mode 100644
index 000000000000..36d27cc7a366
--- /dev/null
+++ b/acct-group/ntp/Manifest
@@ -0,0 +1,2 @@
+EBUILD ntp-0.ebuild 146 BLAKE2B d4a4033896600805280f7fe734d79e042dc65af4ac7f08fa245d71cbea3a1cfb4dc2fc06a6475f0383f9c122b250b792875bcacfe36054baf5bbd1357a69c315 SHA512 a3f99b859ada94f7b8daef9c7cf5d139443a0aacaf7106ea1c3f17c4ffafb57215f0397f5848a69844f9ba1a1569c473c199a0d3b3f277425917f7ee30758587
+MISC metadata.xml 263 BLAKE2B da35927a73cc22621ec3170a872817bc1f2e91967dd369f21f6543ce2a02e995eb654ab2c1209bae764ef194788828e00daf5d559d3a26926e6912838075dc7f SHA512 b25a1229f571493fdde40749d60d17d411676854bc3f73810e15edac8a2a930d3633f46a6f7f5a7ec6cf7f36b9ef690a7e03916c7c76869315f5ba1f862fd0f0
diff --git a/acct-group/ntp/metadata.xml b/acct-group/ntp/metadata.xml
new file mode 100644
index 000000000000..3e60a9a347a4
--- /dev/null
+++ b/acct-group/ntp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/acct-group/ntp/ntp-0.ebuild b/acct-group/ntp/ntp-0.ebuild
new file mode 100644
index 000000000000..adc40de65944
--- /dev/null
+++ b/acct-group/ntp/ntp-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=123
diff --git a/acct-group/spire/Manifest b/acct-group/spire/Manifest
new file mode 100644
index 000000000000..a6efc78a96f6
--- /dev/null
+++ b/acct-group/spire/Manifest
@@ -0,0 +1,2 @@
+EBUILD spire-0.ebuild 146 BLAKE2B a7c2af78febf814a48be9060a570cf7737cbe87458b8fcb15872dd79cdd00d730a6e6b3a1bd83322452891c93b18fa4795a3bb68ea144ea478821db7623433d0 SHA512 3ff456c06ca221cf5c6f11cd58fad6cbcced04215d8041930e717b7f9f72d0010fb6c418918c2b60b8fabd6a11c0d26d62ee387e8cfcf4f372f276039569dbf1
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-group/spire/metadata.xml b/acct-group/spire/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/spire/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/spire/spire-0.ebuild b/acct-group/spire/spire-0.ebuild
new file mode 100644
index 000000000000..cbfc94025ffc
--- /dev/null
+++ b/acct-group/spire/spire-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=271
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index ebad0c429731..34d5180f4686 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/inspircd/Manifest b/acct-user/inspircd/Manifest
new file mode 100644
index 000000000000..64cf5b8202af
--- /dev/null
+++ b/acct-user/inspircd/Manifest
@@ -0,0 +1,2 @@
+EBUILD inspircd-0.ebuild 240 BLAKE2B 003ca1118820e096363524db942fb7e3ef9112d6603ba79a95c3f17c50928548c36f0259d51189f1112b5cc5195fe09abaead7cabd383624c2244d80cddbb7b1 SHA512 76aedb43a2b2d7d9b0298db1f630980ec0505c4c377e72364ef7dd9139368c8ae1ea75e1689232ad2a047a7842e4c94b94926fa225df4229ebc5f871c97d1bf4
+MISC metadata.xml 364 BLAKE2B b8762bade85ba1f9cb7ee03782aad1d8a6703963f706b73cc24fb8c475aa7dbf9e143307cef0c42717dbd08504bac3de1fdbe5cf0d181098b4493537d2b0ad71 SHA512 2f17585fc34548ea920535b92e6f6c6c5206c080a7e476c7fbc10149298b6d8c0aac74547a494fda9b4b148750f364d038c8becd756cd147acbc43fdd6e629fe
diff --git a/acct-user/inspircd/inspircd-0.ebuild b/acct-user/inspircd/inspircd-0.ebuild
new file mode 100644
index 000000000000..dabcbe10adfa
--- /dev/null
+++ b/acct-user/inspircd/inspircd-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for InspIRCd server daemon"
+ACCT_USER_ID=167
+ACCT_USER_GROUPS=( inspircd )
+
+acct-user_add_deps
diff --git a/acct-user/inspircd/metadata.xml b/acct-user/inspircd/metadata.xml
new file mode 100644
index 000000000000..2b340d2c9798
--- /dev/null
+++ b/acct-user/inspircd/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>wadecline@hotmail.com</email>
+		<name>Wade Cline</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/knot/Manifest b/acct-user/knot/Manifest
new file mode 100644
index 000000000000..ce2b2ccb344d
--- /dev/null
+++ b/acct-user/knot/Manifest
@@ -0,0 +1,2 @@
+EBUILD knot-0.ebuild 257 BLAKE2B 5806e66608eee9f12fd97adbff37ebe813cd6734695fcb8ceeacb1151902946aa7305360dc02dc254af79f4e63b0c492cf97e27413b2ca377cc0bd308751f20f SHA512 fb7b96293f6bfa29cddf43e99fb69a0918b332247528a3c59dcdf97e579f68b8fdf3020835fb2478b567e285b79b4a9cd001117c5dc0430e880123dee9caf683
+MISC metadata.xml 375 BLAKE2B 11e88c4b125207b665bfc408cb1bc06f0a449384830dda3e38d83d2dfa922beb0079dc26fc84aecd22bb60543c1af002823f1d24996d84333a1aee3742930e6b SHA512 cfb08b91f3bc6f7596b7ecc20b490a1aeef40f41d29b57cd4a28cac579bbd2bc05801feb95a341e30f192729dce0e5547972c555a679faea15156c56d1040ec9
diff --git a/acct-user/knot/knot-0.ebuild b/acct-user/knot/knot-0.ebuild
new file mode 100644
index 000000000000..da4f2185ea62
--- /dev/null
+++ b/acct-user/knot/knot-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for knot DNS server"
+ACCT_USER_ID=53
+ACCT_USER_HOME=/var/lib/knot
+ACCT_USER_GROUPS=( knot )
+
+acct-user_add_deps
diff --git a/acct-user/knot/metadata.xml b/acct-user/knot/metadata.xml
new file mode 100644
index 000000000000..89aeeb96e865
--- /dev/null
+++ b/acct-user/knot/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>nemunaire@nemunai.re</email>
+		<name>Pierre-Olivier Mercier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/ntp/Manifest b/acct-user/ntp/Manifest
new file mode 100644
index 000000000000..336a04b803de
--- /dev/null
+++ b/acct-user/ntp/Manifest
@@ -0,0 +1,2 @@
+EBUILD ntp-0.ebuild 223 BLAKE2B 263e2752540fb186a5eff56475e4eb389fd53a907cd22313dfd706014de766ac19ecded601411fb4eba6e7e95adcff622a40f638e3bd964183e3d19f0e8080d2 SHA512 a18f5c98c4c6db68760c5fd05df2edd10d97e1e91065205a64ee6b50af53928abb2acb07d5293e9860997a8463de6d033dce53d9099c2e932b05301c0a31b00f
+MISC metadata.xml 263 BLAKE2B da35927a73cc22621ec3170a872817bc1f2e91967dd369f21f6543ce2a02e995eb654ab2c1209bae764ef194788828e00daf5d559d3a26926e6912838075dc7f SHA512 b25a1229f571493fdde40749d60d17d411676854bc3f73810e15edac8a2a930d3633f46a6f7f5a7ec6cf7f36b9ef690a7e03916c7c76869315f5ba1f862fd0f0
diff --git a/acct-user/ntp/metadata.xml b/acct-user/ntp/metadata.xml
new file mode 100644
index 000000000000..3e60a9a347a4
--- /dev/null
+++ b/acct-user/ntp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/acct-user/ntp/ntp-0.ebuild b/acct-user/ntp/ntp-0.ebuild
new file mode 100644
index 000000000000..69d774eb2d40
--- /dev/null
+++ b/acct-user/ntp/ntp-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for ntp daemon"
+ACCT_USER_ID=123
+ACCT_USER_GROUPS=( ntp )
+
+acct-user_add_deps
diff --git a/acct-user/spire/Manifest b/acct-user/spire/Manifest
new file mode 100644
index 000000000000..5fb079410659
--- /dev/null
+++ b/acct-user/spire/Manifest
@@ -0,0 +1,2 @@
+EBUILD spire-0.ebuild 241 BLAKE2B 52358f44e2531234198a6af784ec3b14ac706bc8ea22a3cefb83aae33737e981947d8880fb36088e970cc1779dca4fa0707c40cdbc92c83276814f06bd46624a SHA512 bdff0d57c2c4c1939927ecc211a97c7f0b5105036b064f5f5c9b5db6aaa6055a5ab72d93dfc035387b8e4a4058ca4c5855ca5f78aecb870963a52ea0cc45e869
+MISC metadata.xml 254 BLAKE2B 2080be28230af9420bfe91b10c9f0c31453e0b83b50a714da52d3c379a58e1758885b3506bf9a1a31c0899aba0e903e11e61217d52cf7cf135b61bc60521979f SHA512 2d8394c06ce9c195232dcee9d171639f460dc3ac3444d0a0513211f191b431048d72dc5c7e13e83532649be12a11113b0923c7a346abfe6b61709124567521b4
diff --git a/acct-user/spire/metadata.xml b/acct-user/spire/metadata.xml
new file mode 100644
index 000000000000..65da3dd78299
--- /dev/null
+++ b/acct-user/spire/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>williamh@gentoo.org</email>
+    <name>William Hubbs</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/acct-user/spire/spire-0.ebuild b/acct-user/spire/spire-0.ebuild
new file mode 100644
index 000000000000..1008ac8fc8be
--- /dev/null
+++ b/acct-user/spire/spire-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for spiffe runtime environment"
+ACCT_USER_ID=271
+ACCT_USER_GROUPS=( spire )
+
+acct-user_add_deps
diff --git a/acct-user/transmission/Manifest b/acct-user/transmission/Manifest
index 5fcfc21638de..d224571296f1 100644
--- a/acct-user/transmission/Manifest
+++ b/acct-user/transmission/Manifest
@@ -1,2 +1,2 @@
-EBUILD transmission-0.ebuild 235 BLAKE2B 99d250292d550abb995f7cc666c5de56a913adefc1af6e93227ace820ebb47cab80d4371e0c7f7ea3614384f887f1b4de079cbf6f7801ec45e76a1dede0f951b SHA512 42daeac9373c574b98199bc0f9a82a1a7dd816816d994470fabaf4ed3130d012d988d33ffa22e4a64566159f4a29fc287eb0875b87a14343085a890fd173434b
+EBUILD transmission-1.ebuild 198 BLAKE2B 6ef490efd709829b529ed97db9afe2ab93e906e02b73dab296b01ed193d3a2ac608624b2b8e09e4e429a2141910c9ef46a647769ba1520a62448b94e4b66d4c4 SHA512 b3c63b9a198674537bbad2de1a876124d5adb5bb47ce30edafa5b02116b9e7e320ecd21e577f8aecaf9cfc7ba3a0c13edeb9a935081bcfe12db704839562fd7e
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/acct-user/transmission/transmission-0.ebuild b/acct-user/transmission/transmission-0.ebuild
deleted file mode 100644
index 5d8d83e04e50..000000000000
--- a/acct-user/transmission/transmission-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-ACCT_USER_ID=169
-ACCT_USER_GROUPS=( transmission )
-ACCT_USER_HOME=/var/lib/transmission
-
-acct-user_add_deps
diff --git a/acct-user/transmission/transmission-1.ebuild b/acct-user/transmission/transmission-1.ebuild
new file mode 100644
index 000000000000..4f3a51e9fbc2
--- /dev/null
+++ b/acct-user/transmission/transmission-1.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=169
+ACCT_USER_GROUPS=( transmission )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 7fc2170a8329..acdc46bd91cb 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/festival-fi/Manifest b/app-accessibility/festival-fi/Manifest
deleted file mode 100644
index 1bfb2349d5aa..000000000000
--- a/app-accessibility/festival-fi/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX festival-fi-20041119_lavennin_path.patch 394 BLAKE2B 4a2b4b257c01af81574958aba72ac53c43ab1765be3223a307a165d5607ea6b722835bfec70f1ae79c454b4ccade0a4931e1c7481cb9582e74d059ea2b7e7451 SHA512 8946ad86e485e695c5941ff8e7247d441ef3b17ed1cf5138434f5a9e6af97ad830dc3e2ab24ea36aee0533949259a52cd7c50b09602e019fc0a2e56faf68a87f
-DIST hy_fi_mv_diphone-20041119.tgz 3670516 BLAKE2B 6f95f2697fadd1dea3127820193a0d7d16fa9b3549b6571d434dd1b8dd6ea28733df58fa63f016a432c3d9def44989062f668b2fb22306ad124c6cc7df03f24e SHA512 8e762a988e028c4b44430252150525a23421d1d58a1d58a9826866623729e4fadbb668fd891d1e0e36eee963319ae6cb2bb03dac6ce1f64629d5227d57157d60
-DIST lavennin-20041119.tgz 172438 BLAKE2B 31431a8fe2bbc62f4aaa1d3529e7ce4fd9c795c9aa177bab458864b2567c34b52eb7499f23d65dbd80bf1a9a31bf5af3a4e33ae84f56b05f78638c6b11c47ea5 SHA512 0f20ad71ce1862f05e5ee78860804255f0d40e93b80e5869276e7c8032d594b8ad259a60018fde95ea655e30d8f0574138c5bb53d5fbe61e20658d299493897d
-DIST suo_fi_lj-1.0g-20051204.tgz 5928158 BLAKE2B b38d424f69f18d232cff3ff8fabcbf495f687e396da6fa110919a89f471ce72e0305cc0ace525afeaf8ef5b0824795faaafece6b03dbab4e27f5e899d750ddfc SHA512 f239f34836a6e70be77a5f20a6cae1eba394f07e9ecb6db081b7c6d272d1c26b29ed89dc22deb7f9189562c75c00049ecb4e3426eecaa835145dfbd4aa86c360
-EBUILD festival-fi-20041119.ebuild 1134 BLAKE2B f036eb94114b0df75924a01e160675ebadae4dc4715a1381e1fd1e65517fde29b5df3ac04507a7f75ceb76c95c146dff40c45107462a136237616ac1fe212113 SHA512 1828c178078e5cf2f4b1dbbaaf2e641986864eb4c8a544caf98918b7a0d247c6addc8a56cd85afc79ddc596273a117ee8d6dce59abc90ce87c67e821ef152e89
-MISC metadata.xml 381 BLAKE2B 61e5d9f834eaad39c7af66779648cb111fb13436861e5351c336623cc4c63e10b918ad8ea78eebfaf3bfb709a15c72238eca059ac639962df736e8dfde3d1328 SHA512 bbe4c9075ebef7cbc13b22b79331aeac86d656d483c65460838eae7d1d00fffcdafa173c9702ff2ae020c64efaeb13f81d2543dbef57804f13a4fd1dd9b4ee07
diff --git a/app-accessibility/festival-fi/festival-fi-20041119.ebuild b/app-accessibility/festival-fi/festival-fi-20041119.ebuild
deleted file mode 100644
index baff3ed11700..000000000000
--- a/app-accessibility/festival-fi/festival-fi-20041119.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
-
-DESCRIPTION="Finnish diphones and text to speech script for festival"
-HOMEPAGE="http://www.ling.helsinki.fi/suopuhe"
-SRC_URI="http://www.ling.helsinki.fi/suopuhe/download/hy_fi_mv_diphone-${PV}.tgz
-	http://phon.joensuu.fi/suopuhe/tulosaineisto/suo_fi_lj-1.0g-20051204.tgz
-	http://www.ling.helsinki.fi/suopuhe/download/lavennin-${PV}.tgz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="perl"
-
-RDEPEND="
-	>=app-accessibility/festival-1.96_beta
-	dev-lang/perl"
-DEPEND=""
-
-S=${WORKDIR}
-PATCHES=( "${FILESDIR}"/${P}_lavennin_path.patch )
-
-src_install() {
-	dodoc festival/lib/voices/finnish/hy_fi_mv_diphone/README.mv
-	rm festival/lib/voices/finnish/hy_fi_mv_diphone/{README.mv,LICENSE} || die
-
-	insinto /usr/share/festival
-	doins -r festival/lib/voices
-	cd "${WORKDIR}"/lavennin/ || die
-	newdoc README.txt README.lavennin
-	dodoc man/*.shtml
-
-	if use perl; then
-		newbin bin/lavennin suopuhe-lavennin
-
-		insinto /usr/share/suopuhe
-		doins -r data
-
-		elog "TTS perl script installed as suopuhe-lavennin"
-	fi
-}
diff --git a/app-accessibility/festival-fi/files/festival-fi-20041119_lavennin_path.patch b/app-accessibility/festival-fi/files/festival-fi-20041119_lavennin_path.patch
deleted file mode 100644
index 833b633e3245..000000000000
--- a/app-accessibility/festival-fi/files/festival-fi-20041119_lavennin_path.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# 08/May/2009
-# Patch to fix the path to data files for Gentoo
-# Not sending this to upstrem.
-# neurogeek@gentoo.org
-
---- a/lavennin/bin/lavennin
-+++ b/lavennin/bin/lavennin
-@@ -164,8 +164,8 @@
-     $HOME = get_home_directory();
- }
- 
--my $DATA_DIR = $HOME . "/data";
--
-+#Gentoo Data Dir
-+my $DATA_DIR = "/usr/share/suopuhe/data";
- 
- # making the TMP dir...
- unless ( -e "$HOME/tmp" || $www ) {
diff --git a/app-accessibility/festival-fi/metadata.xml b/app-accessibility/festival-fi/metadata.xml
deleted file mode 100644
index 55e1c4cf77c7..000000000000
--- a/app-accessibility/festival-fi/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-		<email>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-accessibility/festival-freebsoft-utils/Manifest b/app-accessibility/festival-freebsoft-utils/Manifest
deleted file mode 100644
index fc906900ce72..000000000000
--- a/app-accessibility/festival-freebsoft-utils/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST festival-freebsoft-utils-0.10.tar.gz 73022 BLAKE2B dfcb13a1060c4cf4f7bcc3b9e43785113659fdcd82e35d7e4089a7e9d8853c4790c8b0b8ad24a2b1bfaba4933c05f9e00341e74db111d01d158074e553544561 SHA512 26305b9d0fc7f1333786d38cc0efbbe2cb2734e9f981e846ce7b9369cf012adf04e357af9c39fea650620cf7ff619ad15c48dbbd5d6a2781907301817718136c
-DIST festival-freebsoft-utils-0.2.tar.gz 65591 BLAKE2B 06f482521c91823809668c8afbce8c64d718900affa37d13a2b93fe855259a6a7529229b906e82d614c2c2bf7fb32edb62c59c8cb3d357d961943d73c1165506 SHA512 a0744c415461b2a58205e0c8c6e8f77695a2c0f91c6ecf245d0a5c6108ba806c8557591e36c73c02db51f1a5a97254a9eb1bc7422aa7b3043f798b3376b04e2e
-EBUILD festival-freebsoft-utils-0.10.ebuild 787 BLAKE2B 12b2f1acac6daab2ba30b379e6c4be1cd81e3d54e138c5fb5e963f6a55741d651f68ad31ac7a9c8b4cdae7ce365ba423303054bcb387f0573cc4acbd4b27b264 SHA512 dee341e56dcb133d42e56e62114e7f461c13597511b8de3ad26960d0f515ccf32c340efdcb305eab09eb6f186753300f86b68fbffde5250b8cd0c8f6ede78bfb
-EBUILD festival-freebsoft-utils-0.2.ebuild 542 BLAKE2B 065dc8b46552d275555324fdf5e9e0d1658c57e3b24dca20ee90f02c9b16c16d1edda69e6268a4e2ba0fe844019f7af2c8b1a4ad0412fcb947f1f2313003b408 SHA512 963d1e561aedd00fa2c871abd63e8b44d32f8c3eea6f1140bd45a5efd3d02d2cbc72df6873bc439fb0ef340fa3e6270cb2434a651ab83afb71f69c09e9309e86
-MISC metadata.xml 345 BLAKE2B 73e4cf90f6b94e74e7fcf0e89ecca76f346b0ea8f2651a42617b136b47aec01457a21406ce360f4924e1d8bdf9027763e6198e1a363be471e2a81401f6f6f1d2 SHA512 d034cf8435010ee64e6186cb7e14f559d3e43eec3b3b31e0cec4da133c65cd8c34a00cc4c66958fb13fc1470ef0fa5307331032cde328a443b877be6f3d4c44c
diff --git a/app-accessibility/festival-freebsoft-utils/festival-freebsoft-utils-0.10.ebuild b/app-accessibility/festival-freebsoft-utils/festival-freebsoft-utils-0.10.ebuild
deleted file mode 100644
index 138974593859..000000000000
--- a/app-accessibility/festival-freebsoft-utils/festival-freebsoft-utils-0.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="a collection of Festival functions for speech-dispatcher"
-HOMEPAGE="http://www.freebsoft.org/festival-freebsoft-utils"
-SRC_URI="http://www.freebsoft.org/pub/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-accessibility/festival-1.4.3
-	media-sound/sox
-	virtual/libiconv"
-# We depend on virtual/libiconv for the iconv command-line tool.  This
-# command should be available in both packages providing the virtual.
-
-src_compile(){
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	dodoc ANNOUNCE NEWS README
-	doinfo doc/*.info
-	insinto /usr/share/festival
-	doins "${S}"/*.scm
-}
diff --git a/app-accessibility/festival-freebsoft-utils/festival-freebsoft-utils-0.2.ebuild b/app-accessibility/festival-freebsoft-utils/festival-freebsoft-utils-0.2.ebuild
deleted file mode 100644
index 7467ba7f2fc3..000000000000
--- a/app-accessibility/festival-freebsoft-utils/festival-freebsoft-utils-0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="a collection of Festival functions for speech-dispatcher"
-HOMEPAGE="http://www.freebsoft.org/festival-freebsoft-utils"
-SRC_URI="http://www.freebsoft.org/pub/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-
-DEPEND=">=app-accessibility/festival-1.4.3"
-RDEPEND="${DEPEND}"
-
-src_compile(){
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	insinto /usr/lib/festival
-	doins "${S}"/*.scm
-}
diff --git a/app-accessibility/festival-freebsoft-utils/metadata.xml b/app-accessibility/festival-freebsoft-utils/metadata.xml
deleted file mode 100644
index 8fb4aba1043e..000000000000
--- a/app-accessibility/festival-freebsoft-utils/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>williamh@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-  <email>accessibility@gentoo.org</email>
-  <name>Gentoo Accessibility Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-accessibility/festival-hts/Manifest b/app-accessibility/festival-hts/Manifest
deleted file mode 100644
index 6c61b76882e4..000000000000
--- a/app-accessibility/festival-hts/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST festvox_nitech_us_awb_arctic_hts-2.1.tar.bz2 1636752 BLAKE2B 3074f7598e2fb785f1cb70d717f7ca888aa6c0e02efc8424d021b4bad9bf54abba3ab1e877c0ebe28ed04e52e8b70b84a208348ad4653a44415a2e9ed7e136dd SHA512 8121ca6cecf3c036ede782892a1a61737b4f967757567c285dca30e510ba0824cc94235464b0ba2594848c132e684e29e5dc3a1c6029096315b95fd3fd938240
-DIST festvox_nitech_us_bdl_arctic_hts-2.1.tar.bz2 1855093 BLAKE2B 16a4ca58a36154eea02f7580be1225fe279b142750d3e89fc5cea406c3ac20c04d44f78fe11887a904d64c34d808c60ef3e467ce7fb9836849e25a5b533767f2 SHA512 c09a14e928fd03b2fa3d2bcbf5aa197ab25d1cb336135161d119734c10702ee9a6d103d00a9a9ba22e9df9e8245aa610b717babfbf4a6d8e00f89a396ec797ec
-DIST festvox_nitech_us_clb_arctic_hts-2.1.tar.bz2 2201989 BLAKE2B cdfa4ffd3ea032c4d346e6eee71fd32a7abd9c57b13cfbb89ccda687b95b31b894865a85f109791fdd3ea8e9286b6d914c82b5bd471d9ea079949fd77597549a SHA512 133e146eff001934a6a40a82570344b0ea03fbe08a3e2538f5e4d16145eb8d5147020b2f0be02f6831003a8c39caabc289700507734a2a16064b2b4e089578b7
-DIST festvox_nitech_us_jmk_arctic_hts-2.1.tar.bz2 1607055 BLAKE2B a70a7972494f85e4a939e6bce97cb831563aa610e802d6b64f529c93fa7a5e473cbe46d135f83c8ac1a1857aebc5c4da85d1087ffca45de9f63d9f595fa5164d SHA512 4b6b7280351bdf7c6268be4a0e13487e242117374a17bf543494159b83adfc34225c26abb94d9ea08c480c11b24dcea8c7b9dd35d5794685a1684e276953ec7c
-DIST festvox_nitech_us_rms_arctic_hts-2.1.tar.bz2 1829779 BLAKE2B 5f6ec02df19fe5f6be78a9b6071b1aed4ea4c8c15886cc6c575801d6148ee8ebe58867b9b38efa36747e379a0b2ca914981cad6ec0ba2e2d97751aaa06045db3 SHA512 8072d5a1ea859aa65ea6a68ab7bbf40c080a8aede174310c81eba737c9d4b7e07bed26a2ec06c61860cd8f7f2b468e6c54325c18992209f7914046abf2509179
-DIST festvox_nitech_us_slt_arctic_hts-2.1.tar.bz2 1865263 BLAKE2B 2f87224adb462c7e09629d97f4b2dff2c88784ecf15243056df399dd6ebe301c1fabce399a770adbb3f59f602e5816f4ebac3d3f864da476e0257d2ac837b4a7 SHA512 47b3801c009775b53e9d5b2e5d20abe6a222c77cd4ac13abd9525bf38897c550a38e1819287db2ac10a863bf47837e6936b22c685d2ccfc1ed4e7a8128cb4112
-EBUILD festival-hts-2.1.ebuild 786 BLAKE2B 235f90f0a118a7330aa93550ed2afc0b9b0e839bdea6c180565ddb2bcf90ec59b25cdb72963092b3c5a15ec9660ab6a6f2a70788ccf1f9a0ad7ac08c0d4fb55f SHA512 d1736d78fb580a0a532ec1fb781dd4cf0456f52be55ab6f08ee23b52c863faa1b6bebff84915df35056057534eb4f915002a8bb64bfeab22849304e7fe303869
-MISC metadata.xml 375 BLAKE2B 53b765bc4fadaebf85eb9f48a7613a0ca9a9280ffa716accabeadbbf41eca5001f1c70f1ea7b5731345e375adbbb386669c201a7658485d30b296144eb2d98fb SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224
diff --git a/app-accessibility/festival-hts/festival-hts-2.1.ebuild b/app-accessibility/festival-hts/festival-hts-2.1.ebuild
deleted file mode 100644
index e96f94e4a1e5..000000000000
--- a/app-accessibility/festival-hts/festival-hts-2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="HTS voices for Festival"
-HOMEPAGE="http://hts.sp.nitech.ac.jp/"
-SITE="http://hts.sp.nitech.ac.jp/archives/${PV}"
-SRC_URI="${SITE}/festvox_nitech_us_awb_arctic_hts-${PV}.tar.bz2
-	${SITE}/festvox_nitech_us_bdl_arctic_hts-${PV}.tar.bz2
-	${SITE}/festvox_nitech_us_clb_arctic_hts-${PV}.tar.bz2
-	${SITE}/festvox_nitech_us_jmk_arctic_hts-${PV}.tar.bz2
-	${SITE}/festvox_nitech_us_rms_arctic_hts-${PV}.tar.bz2
-	${SITE}/festvox_nitech_us_slt_arctic_hts-${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-accessibility/festival-1.96"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/festival/voices
-	doins -r lib/voices/.
-}
diff --git a/app-accessibility/festival-hts/metadata.xml b/app-accessibility/festival-hts/metadata.xml
deleted file mode 100644
index 1dacdab965c1..000000000000
--- a/app-accessibility/festival-hts/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>accessibility@gentoo.org</email>
-	<name>Gentoo Accessibility Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-accessibility/festival-it/Manifest b/app-accessibility/festival-it/Manifest
deleted file mode 100644
index 5fa059ab7906..000000000000
--- a/app-accessibility/festival-it/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Italian-FESTIVAL.zip 20715806 BLAKE2B a507e5eacbb35dc6c31c30613fbace5122b943f220d8dae01a95e2f7fa8a41d0e0abcb521c7ba03624fb33efaab8b03d3313714bd956ce147c80ba1ae700d200 SHA512 6044683bda58253d9bb447f24316d258e233c3a1389666667b758c89249422a3cf169eecc6a2b03c7a6548316bb45ff9d63b4d5321cedfef011954fc1ea65c34
-EBUILD festival-it-1.0-r2.ebuild 1837 BLAKE2B 7876538e14dbeaf3d872dee4940962a3550ec61afa7d9e93c3955120ac27bd0c14d0a8383c97f4922ecdf13e6d885ca21d1505209237f5a754481c6d655180f1 SHA512 e9a5ebd63834b2f3e94bd0b1185c6b92d336906138bc99707a14ea61ce97eb9e9fe272ac2754804edd1d4bf787a9a879cbba6401802e86399ac793e5af85b284
-MISC metadata.xml 539 BLAKE2B 71d031984da4e0c97d786db78032c755c9a6b3468d0ddc7ac02110f987a931131bf97019db2976d97c7028d296abec11ac85b567171093095d8ca527ed60507a SHA512 0cd664e3fb547d75b02a1a3dab1ef78e523aac62c49a9d7b2f0b67f0c96a591fcdc0e47d08edbb0e70c6f1b3274be0650bfcdd59ccc6a793e87cc23a49c3e868
diff --git a/app-accessibility/festival-it/festival-it-1.0-r2.ebuild b/app-accessibility/festival-it/festival-it-1.0-r2.ebuild
deleted file mode 100644
index 3b288028c1f7..000000000000
--- a/app-accessibility/festival-it/festival-it-1.0-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="A collection of italian voices for Festival TTS"
-HOMEPAGE="http://www2.pd.istc.cnr.it/FESTIVAL/home"
-SRC_URI="mirror://sourceforge/it-festival/Italian-FESTIVAL.zip"
-
-RDEPEND=">=app-accessibility/festival-2.1
-		mbrola? ( >=app-accessibility/mbrola-3.0.1h-r4[l10n_it] )"
-DEPEND="app-arch/unzip"
-IUSE="mbrola"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}
-
-src_prepare() {
-
-	unzip -qo italian_scm.zip
-	unzip -qo lex_ifd.zip
-	unzip -qo lp_diphone.zip
-	unzip -qo pc_diphone.zip
-
-	if use mbrola; then
-	  unzip -qo lp_mbrola_unix.zip
-	  unzip -qo pc_mbrola_unix.zip
-	fi
-
-	# Deletes some useless files
-	rm -f *.zip
-
-	rm -f `find festival/ -name install_unix.txt`
-	rm -f `find festival/ -name italian_mbrola_win.scm`
-
-	if ! use mbrola; then
-	  rm -f `find festival/ -name italian_mbrola_unix.scm`
-	fi
-
-	# Aggregates some README files
-	mkdir docs
-	mv `find festival/ -name \*README` docs/
-
-	# All remaining files are moved "here"
-	mv festival/lib/* .
-	rm -rf festival/
-}
-
-src_install () {
-	# Install the docs
-	dodoc "${WORKDIR}"/docs/*
-
-	# Install the voice scheme
-	insinto /usr/share/festival/
-	doins -r "${WORKDIR}"/italian_scm/
-
-	# Install the dicts
-	insinto /usr/share/festival/dicts
-	doins -r "${WORKDIR}"/dicts/*
-
-	# Installs the voices
-	insinto /usr/share/festival/voices
-	doins -r "${WORKDIR}"/voices/*
-
-	# Enables the mbrola-based voices
-	if use mbrola; then
-	  dosym /opt/mbrola/it3 /usr/share/festival/voices/italian/pc_mbrola/it3
-	  dosym /opt/mbrola/it4 /usr/share/festival/voices/italian/lp_mbrola/it4
-	fi
-}
-
-pkg_postinst () {
-	einfo "Italian voices installed:"
-	for VOICE in `ls "${ROOT}/usr/share/festival/voices/italian/"`; do
-	  einfo "   (voice_${VOICE})"
-	done
-}
diff --git a/app-accessibility/festival-it/metadata.xml b/app-accessibility/festival-it/metadata.xml
deleted file mode 100644
index 102d683c2750..000000000000
--- a/app-accessibility/festival-it/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>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<use>
-		<flag name="mbrola">Adds support for mbrola voices</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">it-festival</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-accessibility/festival-ru/Manifest b/app-accessibility/festival-ru/Manifest
deleted file mode 100644
index 43b7f05f9c97..000000000000
--- a/app-accessibility/festival-ru/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST msu_ru_nsh_clunits-0.5.tar.bz2 176320511 BLAKE2B 7ccda2c1de0513042cb458d752813517ac4b0a597135206a9217821bdad6584bc9cd4d5de586c186f0bb53014411d5d5e1f558cc2c8da115e59aa5d988b4f579 SHA512 17428fb230cbf8154c88819c2ffe58a9e8044e80f87d2e90cb22043431558e7d3faca45d2817414754be4062dbc5a2b72957d2fbd1961e535b738b11567856e7
-EBUILD festival-ru-0.5.ebuild 812 BLAKE2B 415ad254f4de0307598384636b87044825a3de1c977c9850af605432918396ec731be52a1fa36a9a80cddc452903fe63e60da3228cacdc81a14ef53f31c8f5e4 SHA512 8b3086149c547655cef21be6957211e82483709c790181c09b1dd82cd547561a058899b497abf4d6f682a4b8e10561197b3dfddba10725cf60beafbdd60d979d
-MISC metadata.xml 580 BLAKE2B 92bfb54618096b0859e76bcad3066f9626ddc6d82880ac48370fc393c9cbfe4a79b2b8eb19e83ed0d98d385ce8f02a51115297f82ab39f1ebcc4426d9a09c116 SHA512 b99d86f3bf57221634deda74f1ec136f3d71cfb87eee77793c8a8aeb4756e9d9e2522b2831307d2e78ab79362f2df619be0cea28fff93039be51e31f2bd39b69
diff --git a/app-accessibility/festival-ru/festival-ru-0.5.ebuild b/app-accessibility/festival-ru/festival-ru-0.5.ebuild
deleted file mode 100644
index e7cf31a1fe14..000000000000
--- a/app-accessibility/festival-ru/festival-ru-0.5.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
-
-MY_PN=msu_ru_nsh_clunits
-
-DESCRIPTION="Russian voices for Festival"
-HOMEPAGE="https://sourceforge.net/projects/festlang.berlios/"
-SRC_URI="mirror://sourceforge/project/festlang.berlios/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-accessibility/festival-1.96_beta"
-DEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	dodoc ${MY_PN}/README
-
-	insinto /usr/share/festival/voices/russian
-	rm ${MY_PN}/{README,COPYING} || die
-	doins -r ${MY_PN}
-}
-
-pkg_postinst() {
-	elog
-	elog "    To enable russian voices run festval and use command:"
-	elog "        (voice_msu_ru_nsh_clunits)"
-	elog
-	elog "    Please note that text input should have UTF-8 encoding."
-	elog
-}
diff --git a/app-accessibility/festival-ru/metadata.xml b/app-accessibility/festival-ru/metadata.xml
deleted file mode 100644
index 71f7aec003e5..000000000000
--- a/app-accessibility/festival-ru/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">festlang.berlios</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-accessibility/festival/Manifest b/app-accessibility/festival/Manifest
deleted file mode 100644
index 226d89a73534..000000000000
--- a/app-accessibility/festival/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX festival-2.1-gcc4.7.patch 924 BLAKE2B e1c4147f4d6d8ea0499aed3084a0f78330d786071ebaa6f0034e874811d693dc598d116ea1787fc031377f549f0bacc2b493da3207b8a3b9888e5be30715e703 SHA512 d5d41c1dd60339fd219c51da7f1d6f9348832b2ffe4181787dacdca024d218dc7dbca168b9fbcb75795d681d534d77089aa8bf6fcbfbb47e2946f17c16a12071
-AUX festival-2.1-gentoo-system.patch 7736 BLAKE2B 9fcb970b7e0529c36aeb491e11d0d8ea46101f77567567661eaf956f7e63046092ab95dc3b46b0404b4f0376efb8e09115cd3b70160c7a81b02f28ce2f453a08 SHA512 bd15a7668e8702b1171b8a5b0ad615f6dd22ca2f2940f91abd1617fcf29aab70d97f6bf940ff5b8887bd0799af1545f781d17e23000c1f339bd9808afac4860a
-AUX festival-2.1-init-scm.patch 856 BLAKE2B 36536c1ffa0b7a2ca539cd0e269e55739d5c50868b5ffb96cff00ee936c992d276ae78774501d44c6c2106cc9e52f959351e22b246c4dab1a0f7f84fe0296e04 SHA512 bf86a21659affa4e7ec2eefedb0bfb3650473a90c72fe30e5ad8aabb9a20a344a792c6f612af466fc50359b4dec7e6f9afb358f1e509428513781b93e7c3c874
-AUX festival-2.1-ldflags.patch 438 BLAKE2B af42f0498d419cb5182538118bc0ce4d6749753b79b8c0c02a6d5d71503cfa141fc3513b567e998aa3136eae163f9c9112cf2d53f559e0e5ac6dcffe9bbfbd13 SHA512 5c7eb23673aef0ddcc0d13bec73caa90c807fdd884f73cda33c28bc80d701ef80fbf417987f078f692d418cb3a67a6243652017bb34537a75fd32b29819b9726
-DIST festival-2.1-release.tar.gz 787313 BLAKE2B 91d650ed13389107aa220d2625b09c03e98bbcbb7a6b6d2e7d76d7b12239410fbbba1b1c69c4cd364372940539037adcd2d6b0739a1c87c304df0418d1009e5e SHA512 1f9f28af7106c98e313d3c4d4bb26a7f927c1214fa5a0e2b4972fc85e1011e328331b73852abb57f26fa5062263d1dbccaf65e3be59c6ec762ccf340fc93797a
-DIST festlex_CMU.tar.gz 1925748 BLAKE2B b6ecd5d79de7c3de6ea479c89e441a0416f2afd1b5de291a65b7ff5c3c8c0642aaceddec7f97948dea7350f5ee58d009ccd389d00587587562da924254fbaf5c SHA512 c293344020fd3337193303cd5dfb7e2b0a1012770a484d8bccaae921b0c61b75699204bec45fee0db754506d6f1558fd616866cc94e76afcbb85a4dcbcf9542b
-DIST festlex_OALD.tar.gz 1472516 BLAKE2B b7037413e5c90a7ebf2ebcb14240210fdad225e3327b032897c559dcfc6f7b87d0899c0e91171d37799c5e4afc2f47fd467c14ab0b126ffcde38d540cd7899cd SHA512 0221c3d78140c6cb4e74f98edbdf0dbe5987a8efa3e7205844a5c01c31a98aaced3b20e4a42b09aaa4a3c93c9225d9f24d96df3fb5d963092e955d4cb4674aac
-DIST festlex_POSLEX.tar.gz 242914 BLAKE2B d8e38aa7f119d7e4cf5e29940bd86dbee3d0d98b0cbe4b35c873fa05eeeadb3605a2c2c692e7591da812db712d19a764a8c89160d0081415d6491ecd9bb71e54 SHA512 5c3857a195f5f5ebc4c366f37685437af41eb7e86a1a13b41b08cab91e536114ae4ddfa8b124acb40ec32c13b53d0dbf2c857d4c756b0720c9a363866ecb8c47
-DIST festvox_cmu_us_awb_cg.tar.gz 4452760 BLAKE2B ee0495700797b0d10afd83713df854543ed420ce165dab7cf11ce217d13b819813aee25ef99ac7b50b7e551ef09304d5074e75b40d54cb3830fe5dba84ecb065 SHA512 b77174d2e9ab914ee3c4d6e0d83e29b64034bb45d3fe021acf3a6da13304acc819c4ac5b1046a6f022312e90aa23c73b585aaf11f927e80aee4533584b60356b
-DIST festvox_cmu_us_rms_cg.tar.gz 5222226 BLAKE2B 4f8c41306b7dda17ed0f63bb9634bb0f16f1909b85651e1fb1e28924dc892c3197642059585f7baee429cf67754c9260cd84c8d441db068fb18f83d46e3372c6 SHA512 a251fa27f6cabecb29cf4199cb040cb2ce512a6a447840d31b0d2055d26e6a86f4730bbe3e0f1612e413858f41fdbdd184f04575f9f64658d3f34171612ee172
-DIST festvox_cmu_us_slt_arctic_hts.tar.gz 955706 BLAKE2B f696d59a4d3578ef5806cabed639de20ec3bf86dba2b84a65652193eff2aa1fb48a1e5dfa408b3088f44fe46f83a95f2f73608d01512996a1898fe4c7bdf56fd SHA512 58908094c7e538118471ebd80d86d91f681d0958587f0c5ee6c3a00e1ad5f41519e7bb2a96353f9a68946aba343e11c2949fe2b1efafc53f0d8a6b20d7e3e1f8
-DIST festvox_kallpc16k.tar.gz 4104056 BLAKE2B 4cb54b57aa90d294764faab9547bd8eeab8eea9a85f19736c45d0307d633b409be8be79373e9685a1534a9583bc9575d384e4e343f56879881ff12fe9c7ece19 SHA512 ad8d45e04cb704f31a01de8f4d1b3adb4530563728e8b331b0a730c762bd0c0590e5d49f893404a0199f51fb6afce4b786107ae1fdbc4d1b61c3139ce805267c
-DIST festvox_rablpc16k.tar.gz 5369001 BLAKE2B 5433a90e48a467afd4bbfb6a05071cf81871e14509925b9d2e1b2baf3e279ff150cc311643e98a1599b6616dd37af5698e3b5775fe82c3532e7b0c582f6195fc SHA512 11539bfb822eec9c4803c8526364d3cf6ad735a0edfd018471e95df1447e0cd3e19fdee44faaf0f0fbceed281a06b21a971f0c2a3a3ff6c46ea8272202f53f11
-DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96
-EBUILD festival-2.1-r1.ebuild 3667 BLAKE2B 17d5846890f0f0ea4118fe488bee16334b9c25bbf965cc85063af060ef6633004f7b54b068eff7400f604ebae2d0883be3d65d9ff4613958399afa8989d28fa1 SHA512 7b3bd3fcaba747e7358f4eb5257d6fb951c5d3a4cf9051820d8c118585735ecc59a3e768c750974698d225b52d370db72a91e6c7698f36d396a9fec05e41dc41
-MISC metadata.xml 482 BLAKE2B 2638ba066698967011156e0333f367bed8b4a6ffcf765afe64d976724264db09fa2dfb8c6a10f35e3bc298d0b1e9604f8081a74d130a7afbf4ddd019dfffab8b SHA512 1752986ddb186ab10d069dce7ee81c7d0077673a06682e15f4e66a5a87cb29ba4e126a2a627f5f43e388a1d180e243d5362cceae943b1f90b35f54c19de1d2ee
diff --git a/app-accessibility/festival/festival-2.1-r1.ebuild b/app-accessibility/festival/festival-2.1-r1.ebuild
deleted file mode 100644
index ea2559bf691b..000000000000
--- a/app-accessibility/festival/festival-2.1-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-inherit eutils multilib toolchain-funcs user
-
-MY_PV="${PV}-release"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/festival/"
-SITE="http://www.festvox.org/packed/${PN}/${PV}"
-SRC_URI="${SITE}/${MY_P}.tar.gz
-	${SITE}/festlex_CMU.tar.gz
-	${SITE}/festlex_OALD.tar.gz
-	${SITE}/festlex_POSLEX.tar.gz
-	${SITE}/festvox_cmu_us_awb_cg.tar.gz
-	${SITE}/festvox_cmu_us_rms_cg.tar.gz
-	${SITE}/festvox_cmu_us_slt_arctic_hts.tar.gz
-	${SITE}/festvox_rablpc16k.tar.gz
-	${SITE}/festvox_kallpc16k.tar.gz
-	${SITE}/speech_tools-${MY_PV}.tar.gz"
-
-LICENSE="FESTIVAL HPND BSD rc regexp-UofT free-noncomm"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="~app-accessibility/speech-tools-2.1
-		>=sys-libs/ncurses-5.6-r2"
-RDEPEND="${DEPEND}
-	media-sound/alsa-utils
-"
-
-S=${WORKDIR}/festival
-
-pkg_setup() {
-	enewuser festival -1 -1 -1 audio
-}
-
-src_prepare() {
-	# tell festival to use the speech-tools we have installed.
-	sed -i -e "s:\(EST=\).*:\1${EPREFIX}/usr/share/speech-tools:" "${S}"/config/config.in
-	sed -i -e "s:\$(EST)/lib:/usr/$(get_libdir):" "${S}"/config/project.mak
-
-	# fix the reference  to /usr/lib/festival
-	sed -i -e "s:\(FTLIBDIR.*=.*\)\$.*:\1${EPREFIX}/usr/share/festival:" "${S}"/config/project.mak
-
-	# Fix path for examples in festival.scm
-	sed -i -e "s:\.\./examples/:${EPREFIX}/usr/share/doc/${PF}/examples/:" "${S}"/lib/festival.scm
-
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	epatch "${FILESDIR}/${P}-init-scm.patch"
-	epatch "${FILESDIR}/${P}-gentoo-system.patch"
-
-	# copy what we need for MultiSyn from speech_tools.
-	cp -pr "${WORKDIR}"/speech_tools/base_class "${S}"/src/modules/MultiSyn
-
-	epatch "${FILESDIR}/${P}-gcc4.7.patch"
-
-	echo "(Parameter.set 'Audio_Command \"aplay -q -c 1 -t raw -f s16 -r \$SR \$FILE\")" >> "${S}"/lib/siteinit.scm
-	echo "(Parameter.set 'Audio_Method 'Audio_Command)" >> "${S}"/lib/siteinit.scm
-}
-
-src_configure() {
-	econf || die "econf failed"
-}
-
-src_compile() {
-	emake -j1 PROJECT_LIBDEPS="" REQUIRED_LIBDEPS="" LOCAL_LIBDEPS="" \
-		OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed"
-}
-
-src_install() {
-	# Install the binaries
-	dobin src/main/festival
-	dobin lib/etc/*Linux*/audsp
-	dolib.a src/lib/libFestival.a
-
-	# Install the main libraries
-	insinto /usr/share/festival
-	doins -r lib/*
-
-	# Install the examples
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-
-	# Need to fix saytime, etc. to look for festival in the correct spot
-	for ex in "${D}"/usr/share/doc/${PF}/examples/*.sh; do
-		exnoext=${ex%%.sh}
-		chmod a+x "${exnoext}"
-		dosed "s:${S}/bin/festival:/usr/bin/festival:" "${exnoext##$D}"
-	done
-
-	# Install the header files
-	insinto /usr/include/festival
-	doins src/include/*.h
-
-	insinto /etc/festival
-	doins lib/site*
-
-	# Install the docs
-	dodoc "${S}"/{ACKNOWLEDGMENTS,NEWS,README}
-	doman "${S}"/doc/{festival.1,festival_client.1}
-
-	# create the directory where our log file will go.
-	diropts -m 0755 -o festival -g audio
-	keepdir /var/log/festival
-
-}
-
-pkg_postinst() {
-	elog
-	elog "    Useful examples include saytime, text2wave. For example, try:"
-	elog "        \"/usr/share/doc/${PF}/examples/saytime\""
-	elog
-	elog "    Or for something more fun:"
-	elog '        "echo "Gentoo can speak" | festival --tts"'
-	elog
-	elog "This version also allows configuration of site specific"
-	elog "initialization in /etc/festival/siteinit.scm and"
-	elog "variables in /etc/festival/sitevars.scm."
-	elog
-}
diff --git a/app-accessibility/festival/files/festival-2.1-gcc4.7.patch b/app-accessibility/festival/files/festival-2.1-gcc4.7.patch
deleted file mode 100644
index 8ebc8cc472c0..000000000000
--- a/app-accessibility/festival/files/festival-2.1-gcc4.7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -uNr festival.orig/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc festival/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc
---- festival.orig/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc	2012-12-02 23:03:27.000000000 +0000
-+++ festival/src/modules/MultiSyn/base_class/EST_TSimpleVector.cc	2012-12-02 23:21:17.000000000 +0000
-@@ -42,6 +42,7 @@
- 
- #include "EST_TSimpleVector.h"
- #include "EST_matrix_support.h"
-+#include <cstring>
- #include <fstream>
- #include "EST_cutils.h"
- 
-@@ -49,7 +50,7 @@
- {
-   if (this->p_column_step==1 && a.p_column_step==1)
-     {
--    resize(a.n(), FALSE);
-+    this->resize(a.n(), FALSE);
-     memcpy((void *)(this->p_memory), (const void *)(a.p_memory), this->n() * sizeof(T));
-     }
- else
-@@ -70,7 +71,7 @@
-   int old_offset = this->p_offset;
-   unsigned int q;
- 
--  just_resize(newn, &old_vals);
-+  this->just_resize(newn, &old_vals);
- 
-   if (set && old_vals)
-     {
diff --git a/app-accessibility/festival/files/festival-2.1-gentoo-system.patch b/app-accessibility/festival/files/festival-2.1-gentoo-system.patch
deleted file mode 100644
index a09e1379eebf..000000000000
--- a/app-accessibility/festival/files/festival-2.1-gentoo-system.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff -uNr festival.orig/config/systems/GentooLinux.mak festival/config/systems/GentooLinux.mak
---- festival.orig/config/systems/GentooLinux.mak	1969-12-31 19:00:00.000000000 -0500
-+++ festival/config/systems/GentooLinux.mak	2011-02-09 10:43:28.000000000 -0500
-@@ -0,0 +1,42 @@
-+ ###########################################################################
-+ ##                                                                       ##
-+ ##                Centre for Speech Technology Research                  ##
-+ ##                     University of Edinburgh, UK                       ##
-+ ##                         Copyright (c) 1996                            ##
-+ ##                        All Rights Reserved.                           ##
-+ ##                                                                       ##
-+ ##  Permission is hereby granted, free of charge, to use and distribute  ##
-+ ##  this software and its documentation without restriction, including   ##
-+ ##  without limitation the rights to use, copy, modify, merge, publish,  ##
-+ ##  distribute, sublicense, and/or sell copies of this work, and to      ##
-+ ##  permit persons to whom this work is furnished to do so, subject to   ##
-+ ##  the following conditions:                                            ##
-+ ##   1. The code must retain the above copyright notice, this list of    ##
-+ ##      conditions and the following disclaimer.                         ##
-+ ##   2. Any modifications must be clearly marked as such.                ##
-+ ##   3. Original authors' names are not deleted.                         ##
-+ ##   4. The authors' names are not used to endorse or promote products   ##
-+ ##      derived from this software without specific prior written        ##
-+ ##      permission.                                                      ##
-+ ##                                                                       ##
-+ ##  THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK        ##
-+ ##  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      ##
-+ ##  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   ##
-+ ##  SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE     ##
-+ ##  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    ##
-+ ##  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   ##
-+ ##  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          ##
-+ ##  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       ##
-+ ##  THIS SOFTWARE.                                                       ##
-+ ##                                                                       ##
-+ ###########################################################################
-+ ##                                                                       ##
-+ ##                 Author: William Hubbs <williamh@gentoo.org>           ##
-+ ## --------------------------------------------------------------------  ##
-+ ## Settings for Gentoo Linux distributions.                              ##
-+ ##                                                                       ##
-+ ###########################################################################
-+
-+MANDIR=$(INSTALL_PREFIX)/share/man
-+# Gentoo does not use termcap
-+OS_LIBS = $(LDFLAGS) -ldl -lncurses
-diff -uNr festival.orig/config/systems/Makefile festival/config/systems/Makefile
---- festival.orig/config/systems/Makefile	2011-02-09 10:41:01.000000000 -0500
-+++ festival/config/systems/Makefile	2011-02-09 10:44:22.000000000 -0500
-@@ -41,6 +41,7 @@
- 	Linux.mak				\
- 	RedHatLinux.mak				\
- 	DebianGNULinux.mak			\
-+	GentooLinux.mak			\
- 	alpha_Linux.mak				\
- 	alpha_OSF1V4.0.mak			\
- 	alpha_RedHatLinux.mak			\
-@@ -94,6 +95,7 @@
- 	sparc_SunOS5.8.mak			\
- 	sparc_SunOS5.mak			\
- 	unknown_DebianGNULinux.mak		\
-+	unknown_GentooLinux.mak		\
- 	unknown_Linux.mak			\
- 	unknown_RedHatLinux.mak			\
- 	power_macintosh_Darwin.mak		\
-diff -uNr festival.orig/config/systems/unknown_GentooLinux.mak festival/config/systems/unknown_GentooLinux.mak
---- festival.orig/config/systems/unknown_GentooLinux.mak	1969-12-31 19:00:00.000000000 -0500
-+++ festival/config/systems/unknown_GentooLinux.mak	2011-02-09 10:45:34.000000000 -0500
-@@ -0,0 +1,41 @@
-+###########################################################################
-+##                                                                       ##
-+##                Centre for Speech Technology Research                  ##
-+##                     University of Edinburgh, UK                       ##
-+##                         Copyright (c) 1996                            ##
-+##                        All Rights Reserved.                           ##
-+##                                                                       ##
-+##  Permission is hereby granted, free of charge, to use and distribute  ##
-+##  this software and its documentation without restriction, including   ##
-+##  without limitation the rights to use, copy, modify, merge, publish,  ##
-+##  distribute, sublicense, and/or sell copies of this work, and to      ##
-+##  permit persons to whom this work is furnished to do so, subject to   ##
-+##  the following conditions:                                            ##
-+##   1. The code must retain the above copyright notice, this list of    ##
-+##      conditions and the following disclaimer.                         ##
-+##   2. Any modifications must be clearly marked as such.                ##
-+##   3. Original authors' names are not deleted.                         ##
-+##   4. The authors' names are not used to endorse or promote products   ##
-+##      derived from this software without specific prior written        ##
-+##      permission.                                                      ##
-+##                                                                       ##
-+##  THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK        ##
-+##  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      ##
-+##  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   ##
-+##  SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE     ##
-+##  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    ##
-+##  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   ##
-+##  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          ##
-+##  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       ##
-+##  THIS SOFTWARE.                                                       ##
-+##                                                                       ##
-+###########################################################################
-+##                                                                       ##
-+##                 Author: William Hubbs <williamh@gentoo.org>           ##
-+## --------------------------------------------------------------------  ##
-+## Settings for Gentoo Linux distributions.                              ##
-+##                                                                       ##
-+###########################################################################
-+
-+include $(EST)/config/systems/Linux.mak
-+include $(EST)/config/systems/GentooLinux.mak
-diff -uNr festival.orig/config/system.sh festival/config/system.sh
---- festival.orig/config/system.sh	2011-02-09 10:41:01.000000000 -0500
-+++ festival/config/system.sh	2011-02-09 10:42:10.000000000 -0500
-@@ -70,6 +70,10 @@
- 	then
- 	OSTYPE=DebianGNULinux
- 	OSREV=`cat /etc/debian_version`
-+    elif [ -f "/etc/gentoo-release" ]
-+    then
-+    OSTYPE=GentooLinux
-+    OSREV=""
-     else
- 	# Generic unknown GNU/Linux system.
- 	OSTYPE=Linux
diff --git a/app-accessibility/festival/files/festival-2.1-init-scm.patch b/app-accessibility/festival/files/festival-2.1-init-scm.patch
deleted file mode 100644
index efe575b0c2b7..000000000000
--- a/app-accessibility/festival/files/festival-2.1-init-scm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- festival/lib/init.scm	2006-09-15 01:34:32.000000000 -0500
-+++ festival/lib/init.scm	2006-09-15 01:50:30.000000000 -0500
-@@ -52,8 +52,8 @@
- 
- ;;;  A chance to set various variables to a local setting e.g.
- ;;;  lexdir, voices_dir audio etc etc.
--(if (probe_file (path-append libdir "sitevars.scm"))
--    (load (path-append libdir "sitevars.scm")))
-+(if (probe_file "/etc/festival/sitevars.scm")
-+    (load "/etc/festival/sitevars.scm"))
- 
- ;;; CSTR siod extensions
- (require 'cstr)
-@@ -133,8 +133,8 @@
- ;;;
- ;;;  Local site initialization, if the file exists load it
- ;;;
--(if (probe_file (path-append libdir "siteinit.scm"))
--    (load (path-append libdir "siteinit.scm")))
-+(if (probe_file "/etc/festival/siteinit.scm")
-+    (load "/etc/festival/siteinit.scm"))
- 
- ;;;  User initialization, if a user has a personal customization
- ;;;  file loaded it
diff --git a/app-accessibility/festival/files/festival-2.1-ldflags.patch b/app-accessibility/festival/files/festival-2.1-ldflags.patch
deleted file mode 100644
index e6559c8a8168..000000000000
--- a/app-accessibility/festival/files/festival-2.1-ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr festival.orig/config/systems/Linux.mak festival/config/systems/Linux.mak
---- festival.orig/config/systems/Linux.mak	2011-02-09 10:08:20.000000000 -0500
-+++ festival/config/systems/Linux.mak	2011-02-09 10:09:04.000000000 -0500
-@@ -46,7 +46,7 @@
- JAVAH=/usr/bin/javah
- 
- TCL_LIBRARY = -ltcl
--OS_LIBS = -ldl 
-+OS_LIBS = $(OPTIMISE_LDFLAGS) -ldl 
- 
- ## the native audio module for this type of system
- NATIVE_AUDIO_MODULE = LINUX16
diff --git a/app-accessibility/festival/metadata.xml b/app-accessibility/festival/metadata.xml
deleted file mode 100644
index 587a705d02c9..000000000000
--- a/app-accessibility/festival/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>accessibility@gentoo.org</email>
-	<name>Gentoo Accessibility Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-<maintainer type="person">
-	<email>bircoph@gentoo.org</email>
-	<name>Andrew Savchenko</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-accessibility/perlbox-voice/Manifest b/app-accessibility/perlbox-voice/Manifest
deleted file mode 100644
index b72201bf5ba1..000000000000
--- a/app-accessibility/perlbox-voice/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST perlbox-voice-0.09.noarch.tgz 1316675 BLAKE2B 2684c891c7cf688976a4024133b32460fdfda455c7e682ca972eacfb84959ec123e04f03d39313bea8afaf928b11cd6d9d219a338ade764818d4c653bc1224b7 SHA512 db461c4b60003383cc14d25dbc6fdbc82069f588dae14434d6d29efa809c566b36c38f4311271492a9c35e965fed8fcdccf0debf06dc121c10fec460211387c6
-EBUILD perlbox-voice-0.09-r2.ebuild 562 BLAKE2B c60a32b6c819eb83c9bcb3435856ac0f3c486504238acb7dc48d296b93bbb127fd6fc937a4771a40e937ef79534ba2c238b8d64e804283da0ddb0d402003f21c SHA512 f392fdcab967a93be814061c6750ff23a5eabdaa295df34b92628f70e7f6571ade93cb9c286ab7354c8ab346befb363d937462ca104783b228f5012ea795cb21
-MISC metadata.xml 244 BLAKE2B e9ba31e8b01f3ee6ff7a098b1cdf886d08c41c10536bbad83aeca89e0a34e9b4f5e5816d6dbaa5399f4bd2b89f87d714ec12736d286114023f0e2dc42acfb521 SHA512 fe707dfe4f31afb9a8d5fb323fbe09cffc54e895a8863cac7541a01ff26f90a99092cfa4c6b9cca75d5f3d464c283a5be3f87ecd8b01feee9491d7392af902e3
diff --git a/app-accessibility/perlbox-voice/metadata.xml b/app-accessibility/perlbox-voice/metadata.xml
deleted file mode 100644
index 32f77b0a6625..000000000000
--- a/app-accessibility/perlbox-voice/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">perlbox</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-accessibility/perlbox-voice/perlbox-voice-0.09-r2.ebuild b/app-accessibility/perlbox-voice/perlbox-voice-0.09-r2.ebuild
deleted file mode 100644
index 692e2dbd2edc..000000000000
--- a/app-accessibility/perlbox-voice/perlbox-voice-0.09-r2.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
-
-DESCRIPTION="A voice enabled application to bring your desktop under your command"
-HOMEPAGE="http://perlbox.sourceforge.net/"
-SRC_URI="mirror://sourceforge/perlbox/${P}.noarch.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-lang/perl
-	 dev-perl/Tk
-	 app-accessibility/sphinx2
-	 app-accessibility/festival
-	 app-accessibility/mbrola"
-
-src_install() {
-	tar xvf perlbox-voice.ss -C "${D}" || die "tar failed"
-	dodoc ${PN}.readme
-}
diff --git a/app-accessibility/pidgin-festival/Manifest b/app-accessibility/pidgin-festival/Manifest
deleted file mode 100644
index 94adee2a7e8a..000000000000
--- a/app-accessibility/pidgin-festival/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pidgin-festival-2.4.tar.gz 359230 BLAKE2B 50b949f3977ac77d2a8f5bed85d3a2ca4c6d2b910c528c0304465deb68823129131d01303404cd71d2af1c5322117da5bbf37f664e4752dbe92ce76b0021fa5d SHA512 6f929e53eb3dd6b53cf18e217676f62230c016f955aa18985f186ac3c697318321a3138279bfe6d01a292b371af47d6f0759585ec57490e0fd04e7020e7abd3d
-EBUILD pidgin-festival-2.4.ebuild 502 BLAKE2B 9ddc0a23e696fdcc0aee91750e9db74de25280e2b77ac3c4bee24e1519c0948389cda87c34c28b014c39bf25a64841bc7a6006f7254f2d749516d898207f1fe8 SHA512 fe412fe0ec480dd473219a2f7bfe58b226a90dde84dd725eccfafafa1a297ec05d77ff69b9952f7327ebaa5ea1660ad64fde4ad2f04db5a5a4152838cfbb69b7
-MISC metadata.xml 354 BLAKE2B 858dba775f3638d94856cce5d8bd30aea752add73d02f1fea92e73d462d0c3a0d59054a0b3c5d751c6aeb26651e4109f61960f4084cbff0edb4a2588abc674cd SHA512 ae277f8f2d930f13a7d7c470a5a3cf2c154f505fb638b642e4dc5129c4c38ee1c9f30f0f426018cbd14c1005c28a2fd7b23096384d0221ccbdf259d015885c28
diff --git a/app-accessibility/pidgin-festival/metadata.xml b/app-accessibility/pidgin-festival/metadata.xml
deleted file mode 100644
index 9b2b7c90b036..000000000000
--- a/app-accessibility/pidgin-festival/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>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pidgin-festival</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-accessibility/pidgin-festival/pidgin-festival-2.4.ebuild b/app-accessibility/pidgin-festival/pidgin-festival-2.4.ebuild
deleted file mode 100644
index 854b9e25929d..000000000000
--- a/app-accessibility/pidgin-festival/pidgin-festival-2.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A plugin which enables text-to-speech output of conversations using festival"
-HOMEPAGE="https://sourceforge.net/projects/pidgin-festival/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	app-accessibility/festival
-	net-im/pidgin[gtk]
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/app-accessibility/sound-icons/Manifest b/app-accessibility/sound-icons/Manifest
index 148ed50f1803..18212cfe768a 100644
--- a/app-accessibility/sound-icons/Manifest
+++ b/app-accessibility/sound-icons/Manifest
@@ -1,3 +1,3 @@
 DIST sound-icons-0.1.tar.gz 591196 BLAKE2B 3632d544dd186eb4358ca9cacaf6babc9ccae287cc4918462dff3b7b7a5b57fe33aea65e5c0a9399aa28a294c04ec686ddee47327cda9900173c064ef4631a5c SHA512 f0ba9e1e84ace325671c7f323f01d647aa0e1a318e9adc2a6d8af4e0d795e478b2ea66007670f9c7ced9ef7310fdbccb5168b0f404579f5dff8712fe12ad93a0
-EBUILD sound-icons-0.1.ebuild 682 BLAKE2B 36acf82e4a1e9ba9943ed3ad5aa2a06c91465826e1bf0771c561356676a1363cbba87f6551838f8675e54bd0c4673c2d82d00f84d6861ca57640301fb765f3cf SHA512 5e2e7f8057cfa7ca47ee9fab1717de65746106ea71d861117597c98d492e74c65c99c85cad7daf0d550fe4884cf1cfc45b48858881f1e193c16fdc602ee1f069
+EBUILD sound-icons-0.1.ebuild 679 BLAKE2B 0432393a18d4d5821c28805e626147b4c76bbb875300590ec17bdf9181032765b53ed06ffe2bb1bdee3e0e033e53c908aa5d1367470d9299e05d7324b42b2f30 SHA512 e0524f085c52da9d058d13a9c642bfabea77e6d06ad5da8e665f87fa4233aa6a795696fcf4d7b03724d0579a4f1868356ca55279d6fc9291dac306c82e7af362
 MISC metadata.xml 468 BLAKE2B 8eff8fd0170fd571a0cdb2ac23fa62751223d7629e4b740408e3aa6ccbc1957bb2cb4f6e506916de9913293f9959d46ad2118d02a200ed0617848a2a8cf992ed SHA512 9ab288130466bb7e5574fb54cf239a7ff0b5415e24b02f022df013fd3eb1ef8f733b7e1e310a2305f816de797ab592db7a3c7e33af46fea05e39139536b0f611
diff --git a/app-accessibility/sound-icons/sound-icons-0.1.ebuild b/app-accessibility/sound-icons/sound-icons-0.1.ebuild
index ad29d961800f..a4b952bff872 100644
--- a/app-accessibility/sound-icons/sound-icons-0.1.ebuild
+++ b/app-accessibility/sound-icons/sound-icons-0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="a collection of Sound Icons for speech-dispatcher"
 HOMEPAGE="http://www.freebsoft.org"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index eef3c3ee02b3..f7ec8fe368b4 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index a18d2632bdbe..b3e01cb33398 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,12 +1,6 @@
-DIST ansible-2.7.12.tar.gz 11860944 BLAKE2B 52cc79a88bbff9dc009ead8ab9f9d299420ae060e211aab23fe3bbef8c8229cd9e526dc3df518a4285cc17c1448ab4892cc3059d70bfef2fd332a44c72b57019 SHA512 0ab68af8239f6d4d2a13bd38a09fe6f3c700231e7c83df0af77c70ea62faebd0d45e1ff316963c6c72931608d49a79b98e8d3ddc6f4c8b826aabe87dc71cc6f9
 DIST ansible-2.7.13.tar.gz 11861862 BLAKE2B 3123d84b9f45bb5e50a0d5db5d0b2ae10163e2818d30f29ad5a80c23979a347eb5e17806bd295df547b88a09191918443162cb25d7f339ae76df52e3960954b0 SHA512 8dc19e5c93a90d43ced6628699d2da42d522a020bb2cdd35ba73f6286998c605852c89250af8696e94aba0080b2fab12761a39c3e2eb86d39c212a198f970652
-DIST ansible-2.8.2.tar.gz 14328267 BLAKE2B 9548af73914b68374f71ab83e5a68e86e75b8ccf86066831699b147091d067a3f1e0b59d94b22b42151d90779f6d3bb39856a3d205862c933aec6bbe76824e22 SHA512 02cd8fd214f61041914abeebf2395f16acf370e110bdef0181689f604f06504902f9a05a2413877a31680528af539f078e2cd7b7f2eebe2389c9aa441b063305
-DIST ansible-2.8.3.tar.gz 14343746 BLAKE2B 3859d88d8462f7109ab23c169b4a91c7a03940b5a8aaff4bfc7ab430fb533898a44221dee18f481612abe1cce1270211a34c2bc1dc7603d89adeb11e50d2b242 SHA512 cee2c663577155269c4d762816590200224e87979411dc7486f5840783f23aaa688577a3f75e272c4875af30397bb383d11eaa7d122d5f304388d5b45ffb9b6f
 DIST ansible-2.8.4.tar.gz 14348300 BLAKE2B 8a9b5587411d2366a91643682c0ef82b0aa5b5cd5e6b882f3ffdfa100c4f3995472913bc12e1c2f7077efb69ec8ac3ad168a79fc3d8c127b34ce03c69588a4c7 SHA512 9efacbaf053acb8cf92ebe5bda982794ecbdbf55e33a4a292a68874b637eebe82406bfba129adf839354ee18aa809d45d77502f68b8e8d07358a48c9b5687b7e
-EBUILD ansible-2.7.12.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
-EBUILD ansible-2.7.13.ebuild 1637 BLAKE2B cafff348e72d7970fe6851e36c2cab55e18583dbd4ec2cf018a04ed2f7093e91c341c32458d334996f7779477409d47fce82477ab812e607ba1d9d624e6efc73 SHA512 b3760d5cefead4d7965b1d1dbbcf7fd41f2bbd2b8a4941fb02791832fd60c4b0c289ba34fbf945b8889a4b15b286e051634adb90296ff81e43a15f71cad66f47
-EBUILD ansible-2.8.2.ebuild 1661 BLAKE2B a9dfb3a4da7bd2f7519eff255ec9ec465ec68160724fe680426db756aaf5e3ffdffb6947faf200c83a4cab5e0ef5b11b71de530901273f2b382c062520fc9c02 SHA512 c564e5417b1181d49cae05eb7275133c1f5cb76a18b11fb679b6267186d5bd7bba62303481601aab47d4c2bc9cf6133311591a8933584033bb92f837483158c9
-EBUILD ansible-2.8.3.ebuild 1718 BLAKE2B 2172b4f68d252c34d587698dc6f53996e42c732c47d8feb0758c22f7ef53be4f32727a06a132b41aea49bad91eddf0e66a33601d8f012c1a20303bb5e4e4c60d SHA512 3ca93b366625caa875558aba79acc3849c9c73078720f2d22473f98ecb5407581443ea4fbb60491d05db2a8b42e1397283d8891fd779e77c8ee92c1712f31657
-EBUILD ansible-2.8.4.ebuild 1718 BLAKE2B 2172b4f68d252c34d587698dc6f53996e42c732c47d8feb0758c22f7ef53be4f32727a06a132b41aea49bad91eddf0e66a33601d8f012c1a20303bb5e4e4c60d SHA512 3ca93b366625caa875558aba79acc3849c9c73078720f2d22473f98ecb5407581443ea4fbb60491d05db2a8b42e1397283d8891fd779e77c8ee92c1712f31657
+EBUILD ansible-2.7.13.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
+EBUILD ansible-2.8.4.ebuild 1716 BLAKE2B 8ddd4c96e597576d970964d5e9daf4d5f965230f3c42fffedddbd6d20a56b22d98151c0f0f3637304385e02e97af466e18c5cacee258fd93ea7006db5ea14046 SHA512 f70424d820a489d02936f625822ddecab576241d59ab65f8552fa254e4376d2cc0d746af29f3331c6814a45c60cf32f8ac46537a9ae668ebb1dea2d7354a73b2
 EBUILD ansible-9999.ebuild 1757 BLAKE2B 647e72bcd7497648dbc96e5bab87e2a8fd5a2e2f47d407536c9a7785e534adef457a24106769dbe8a4cb121a95a63c2b5dc62ed5315ffca3c7f9b72594890611 SHA512 bc9414c6235bc3706ad95ec016b2632e4a3f46649fd066d981711b3a969d7fdcab303bd3bfbd33ac30e60889304ce032743ec0cad37897812f0e055a990d2c53
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.7.12.ebuild b/app-admin/ansible/ansible-2.7.12.ebuild
deleted file mode 100644
index 028f77e10f7a..000000000000
--- a/app-admin/ansible/ansible-2.7.12.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.7.13.ebuild b/app-admin/ansible/ansible-2.7.13.ebuild
index 63e11740ae9c..028f77e10f7a 100644
--- a/app-admin/ansible/ansible-2.7.13.ebuild
+++ b/app-admin/ansible/ansible-2.7.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.8.2.ebuild b/app-admin/ansible/ansible-2.8.2.ebuild
deleted file mode 100644
index 7bb6843073cc..000000000000
--- a/app-admin/ansible/ansible-2.8.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_prepare_all() {
-	rm -fv MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.8.3.ebuild b/app-admin/ansible/ansible-2.8.3.ebuild
deleted file mode 100644
index 851a6fa4e715..000000000000
--- a/app-admin/ansible/ansible-2.8.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_prepare_all() {
-	rm -fv MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.8.4.ebuild b/app-admin/ansible/ansible-2.8.4.ebuild
index 851a6fa4e715..def82c47563a 100644
--- a/app-admin/ansible/ansible-2.8.4.ebuild
+++ b/app-admin/ansible/ansible-2.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index b29043c3a74a..052c8430ab60 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,9 +1,7 @@
 AUX apache-tools-2.2.20-Makefile.patch 1573 BLAKE2B 56de28f38934b73740d68f6429f3361bfd37f079f1f6de4e169741e7c97bceed86330744c1b69045f8ffee0baf927e35e0eca10036d2da461f14e45cd218e5cd SHA512 85120f1b57cd14baf3482dc21d4175447e135700a1f8e6455970c14e576cb0c510815681a9906de4c7eb68743de7e41bbb2d86e83dcb62cd57eb0c9f638f6892
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
-DIST httpd-2.4.39.tar.bz2 7030539 BLAKE2B 1e378833efb9bbdd6fdc277a779620a08752d064524489f9ad747cf85350fbb6ad65f57b30c81d57273cd6693d8a2c4e988f5a2c42bd5c9c538b305b9b7719e8 SHA512 9742202040b3dc6344b301540f54b2d3f8e36898410d24206a7f8dcecb1bea7d7230fabc7256752724558af249facf64bffe2cf678b8f7cccb64076737abfda7
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
-EBUILD apache-tools-2.4.39.ebuild 2578 BLAKE2B 3567f7dc0cd337d498cfea3d950d8548fa515c7ae4f4fd03810e8ceec7e821f4673b119eadee5f568ef90a7aa5bb58e58b564ebef115e36bd7881dd2164d74ae SHA512 265e2abc71c36124c977bc79002b88d672e558f17537839d7de6bb158fc476c96fa5a615af2ce6a27b6dee6fbbb36a675840351525ec0f472bc0f87830326b1e
-EBUILD apache-tools-2.4.41.ebuild 2581 BLAKE2B ea1be0bc8b2fc27dbbf55bf5e710f3b0a77c9950b5a8a71e0041df1dfb8ddf1f820a88386bff9fa2ec71e0f24579380f0fed4b4a07cffbef27d9885ada7abf72 SHA512 2b8a3139d06a94815b9c637c3442ab9107ac7595131f92dbb597a66c4693d4de8d4e7ad9f92eddb8c76b64d291970ce4135702ee865cfd9881029b934fb37acc
+EBUILD apache-tools-2.4.41.ebuild 2576 BLAKE2B 189881dc49c7e5066fe39bf63bdd99984ddb96e31aba5ff67c1c6c837367d4acd217d7ab6b7f305fc9cc6042426534840e09701dd9380f11545d916b0cce7fd1 SHA512 56b79c32eedd23bfa65bb4b75a063ef5b802f2bd45bd773e88edac2aa9b41ad10386493479c012c397f9c8cbc12c0e04d1a47409e3ef305539977102d970d474
 MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122
diff --git a/app-admin/apache-tools/apache-tools-2.4.39.ebuild b/app-admin/apache-tools/apache-tools-2.4.39.ebuild
deleted file mode 100644
index 6e1a527d5821..000000000000
--- a/app-admin/apache-tools/apache-tools-2.4.39.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic eutils multilib toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
-IUSE="libressl ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-	dev-libs/apr-util:1=
-	dev-libs/expat
-	dev-libs/libpcre
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
-	default
-
-	# This package really should upgrade to using pcre's .pc file.
-	cat <<-\EOF >"${T}"/pcre-config
-	#!/bin/bash
-	flags=()
-	for flag; do
-		if [[ ${flag} == "--version" ]]; then
-			flags+=( --modversion )
-		else
-			flags+=( "${flag}" )
-		fi
-	done
-	exec ${PKG_CONFIG} libpcre "${flags[@]}"
-	EOF
-	chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	tc-export PKG_CONFIG
-
-	local myeconfargs=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-		--sbindir="${EPREFIX}"/usr/sbin
-		--with-perl="${EPREFIX}"/usr/bin/perl
-		--with-expat="${EPREFIX}"/usr
-		--with-z="${EPREFIX}"/usr
-		--with-apr="${SYSROOT}${EPREFIX}"/usr
-		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
-		--with-pcre="${T}"/pcre-config
-		$(use_enable ssl)
-		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-	)
-	# econf overwrites the stuff from config.layout.
-	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
-	econf "${myeconfargs[@]}"
-	sed -i \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-	emake -C support
-}
-
-src_install() {
-	emake -C support DESTDIR="${D}" install
-	dodoc CHANGES
-	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		docs/man/{htcacheclean,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${ED%/}"/usr/sbin >/dev/null || die
-	local i
-	for i in *; do
-		dosym ${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl ; then
-		dosym ab /usr/bin/ab-ssl
-		dosym ab /usr/bin/ab2-ssl
-	fi
-}
diff --git a/app-admin/apache-tools/apache-tools-2.4.41.ebuild b/app-admin/apache-tools/apache-tools-2.4.41.ebuild
index 8efe334bf515..03b9e8d46a7b 100644
--- a/app-admin/apache-tools/apache-tools-2.4.41.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.41.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
@@ -90,7 +90,7 @@ src_install() {
 
 	# Providing compatiblity symlinks for #177697 (which we'll stop to install
 	# at some point).
-	pushd "${ED%/}"/usr/sbin >/dev/null || die
+	pushd "${ED}"/usr/sbin >/dev/null || die
 	local i
 	for i in *; do
 		dosym ${i} /usr/sbin/${i}2
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index ce8b024993f9..46ff9281208d 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -10,9 +10,11 @@ DIST consul-1.5.0.tar.gz 20830405 BLAKE2B e64fbc22ade0c737db4f2f1b0e3966dbe61745
 DIST consul-1.5.1.tar.gz 21123963 BLAKE2B 4fe6a45f442d849196a7b9961110cdcc6f92931626ab583859efabe62038f6b2c356b27b37ea41b27755cca138c567be5c81854794a1ba0ccae3f9e0dfd10749 SHA512 7486d24bf1fa9fe94175abf9e008dc4fe4277c509381a524a9ee20e17bc4959f621e39be29e33622cb672ef3a04f9161e575009197bcd35c78b45f1d2637a2ea
 DIST consul-1.5.2.tar.gz 21697719 BLAKE2B 782d6fe02cda097db9256a7e508cf19cf4d514d7936022d339fa62db705f6c60468cea907cd22338bb61c3287bfccb3a4d435a4f9222aa7558999553909e5d40 SHA512 e0820592abc5e119f74c8bf3d11a23726ee6dda7d193864a4486d64deef0bfd6ae4c9170b57d6f978e7ddfeb425229a019c45a8edcdea0938bce9315f2444fd6
 DIST consul-1.5.3.tar.gz 21743194 BLAKE2B c797b04457c5f0b12f06732a94038b25367b53a9e6088d725eea61786a0e18bd905ad680bc12c4bfa30b44292d2676689dd6f18e9e2143bf6e1b02c2c55f678f SHA512 3f275ec160b9e583b81ba8d463fdb05e9fc9058db2453d9393a56b67337ea04df98a89225323192230938e1abfb48fa60fe0a32b4d8980573b749217b69933e9
+DIST consul-1.6.0.tar.gz 22465984 BLAKE2B 3a030619786e8dabdf8b778012a80ff4b0e76ede6c313b688bf04bfd1a8488bff1bbd4a36c1dd11496bd1942f7bba2a9bb22ae3b364fee4335adfb741756dd67 SHA512 a122892693e3bee0fc0e0b5c0945e4a8dddb890228c091112e0db11a8afd33430611c20ff9bc13d2b3a2ac0d3b560be2d9c4e03a9cc425983fbd8f7edb699658
 EBUILD consul-1.4.4-r1.ebuild 1548 BLAKE2B 65d5c22f412b28abf5c7067b5744ca2fb627f6513eca10d91055276016487f0123e6636c080d4841be9d05f4e26fe332f1867e7d540c7810ae43a187b1485988 SHA512 9ce2e18e5177ed96d005b6967d68e8df138ff18e47b28b52ea4fb971323c5cced167bc26fc08a30d39cb243bcaa275697fe7e10c6cacb87c12d969a00bd154b1
 EBUILD consul-1.5.0-r1.ebuild 1548 BLAKE2B b70a82e758c23c2c34ecd0fa5d45e56d840966135c8d578b09d702bed31b5148bffa2eb68412a0555464018ad04e62922a4e75d5c8a2fdc779b8497a6a539159 SHA512 00c8ddee82cacfaa5092bf45a37bccf7475e8fb6402579ee95188a9334f12309ba9a70771fb49f1b43bebec1e37ae68eb7d260a34c3134009f0b4507447c8504
 EBUILD consul-1.5.1-r1.ebuild 1548 BLAKE2B d1d499907ec300d216e6884fb3c31d741911a799185f8220e0f4bb1f141105781368f9cb7c98bcd8ccd790e34b667f33b0dddc8eb5f1185318bf6c70917ead33 SHA512 6ab3f29b2416dd52250589d2ccae36f86161edea4a103d16a00e21e78c630fe8a6c7a61e8a50c08e3df546698e91f577e6ed94dcaeaf766b51f97ca93f894837
 EBUILD consul-1.5.2.ebuild 1548 BLAKE2B ef17177024301747b243ac1b77fd9061cd76a661af705ca1beee37709ee03b07c2a1738a5e2277b8db93d377c442ba3831511c6df73c6096639971236b819e76 SHA512 41dd870ec80824c66139d4e44d10ec22079fbca640213f3454dee789ef535ef13605742f2999448475e5107134f436e3d8f9cb9e3d3fe3de021e45fc7ed67421
-EBUILD consul-1.5.3.ebuild 1548 BLAKE2B f8cfe586cc76eb91db2369980ad8dd3b13f305baaca3aecd69eae820a6d2dfec0927dbae152cef61f7960d8eabd508089d2441319ea1ffb2423a97809826f71c SHA512 7f046114417edd0b55be2d1800076ce735305df2dccb188e0e4a5c228d63266ec74419b55d79645f77482a1e49bf23e237bf0ffe3dbd5b91a16b99e271f3fb6c
+EBUILD consul-1.5.3.ebuild 1793 BLAKE2B 54e7ecb7a0d7eba9bbfbc767fe14f437ba129b5cd5a113b4111bd323e96ab7817ec86a82f58b3db6e62d41411db0cd6911b7db6dcce30b1ebcf6b941a0159450 SHA512 bbbbc8a895aca5c35438a7fb40de9624919f2bf133885b1a137eeee09de70630e4e21872eecec2c41fcd615793782fd1fcc4665437ed3429dccc6b5f84bda85a
+EBUILD consul-1.6.0.ebuild 1793 BLAKE2B 82a0527541f3c03aab2c03586691a7d405a1cce98e951bc874badbeaa6fc478391fba937ea600e346e67d901dacca1ef3d4ba0311c2e469c212a86da166a5ac9 SHA512 2a197552640c848be3fb1003f2f3daa543a3ac530105714ec758cc43430f18d24a76fa80172d2218261544b3e60b01758dacebb4d8d2160da6703a128b95e88e
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.5.3.ebuild b/app-admin/consul/consul-1.5.3.ebuild
index 13ebbc13a381..913d62b917c2 100644
--- a/app-admin/consul/consul-1.5.3.ebuild
+++ b/app-admin/consul/consul-1.5.3.ebuild
@@ -30,6 +30,11 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	# avoid network-sandbox violations since go-1.13
+	rm src/${EGO_PN}/go.mod || die
+	grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \
+		xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die
+
 	sed -e 's:go get -u -v $(GOTOOLS)::' \
 		-e 's:vendorfmt dev-build:dev-build:' \
 		-i "src/${EGO_PN}/GNUmakefile" || die
diff --git a/app-admin/consul/consul-1.6.0.ebuild b/app-admin/consul/consul-1.6.0.ebuild
new file mode 100644
index 000000000000..b5b9eab35a17
--- /dev/null
+++ b/app-admin/consul/consul-1.6.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="944cc71"
+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
+
+	# avoid network-sandbox violations since go-1.13
+	rm src/${EGO_PN}/go.mod || die
+	grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \
+		xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die
+
+	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/emacs-updater/Manifest b/app-admin/emacs-updater/Manifest
index 15a4aef100ea..4631eabfc7c3 100644
--- a/app-admin/emacs-updater/Manifest
+++ b/app-admin/emacs-updater/Manifest
@@ -1,3 +1,5 @@
 DIST emacs-updater-1.15.tar.xz 7020 BLAKE2B bb35103b328a57dcaeb11c258bddbd3a08141d1e245ac4943c7a5a8b815440db0cd06eaac01ad2a00e6e2aa0d23311d774d190fd761be66514856077b3c4e296 SHA512 8cc7dd3e0e28ae71030c7c5f29d54f24e12adcbd0615f3c598ad262bd233f028c2424c277aac7dff7b4201a2ac24bfab0e05d1fdc07edcee2c184a733f699b8a
+DIST emacs-updater-1.16.tar.xz 7112 BLAKE2B 82160ef71b4c22a385a45765c1f60b7d428297cfb3b51f84bd44b176d1bd302165f9ccdde803aae628a2dab9e0520098082232c513b2006ae5facfa283f287ab SHA512 3de3126debc49ea47bd57802c1a3aa82a0769ab392741fb891c93ffb66141f05f58025fa0de746ec78795fc34c135536740e447e1f6a4ae59aa847d21bd6215b
 EBUILD emacs-updater-1.15.ebuild 969 BLAKE2B 9b77db09396e09d9c80f7f49a46bae2e202b0cfd1b43ff96f7cb762c6255565967265c6cafc24d5d6859195c77a6047eea70a5d437985fb5333a811f176148c9 SHA512 30e75f83c944a730a58ad8dbc36f640fe1e87d378db2ba4465678737f77e8f29156eb50b0ac6b07ba084f0b13d5ff216fb90d0db8a28301b81c4fdaaa03bf684
+EBUILD emacs-updater-1.16.ebuild 975 BLAKE2B 849e7e48c226fce94686eef0c3e219c9458e77c23f0c012ce13c88424a765bdab505e1397f22bb90e3209efcf80c0c9df56197c910be672588c1158b05dbdac3 SHA512 ab7eb7321d2a986073951ec206f2b5d3beffa8dd4d272c2c12a2149dd8057a80bee43a5f647aba0a2752ebf9875d7129d68bcb3fc559f77cefbc3b1966c3fa78
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-admin/emacs-updater/emacs-updater-1.16.ebuild b/app-admin/emacs-updater/emacs-updater-1.16.ebuild
new file mode 100644
index 000000000000..ef79c178430b
--- /dev/null
+++ b/app-admin/emacs-updater/emacs-updater-1.16.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Rebuild Emacs packages"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+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"
+
+DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
+RDEPEND="${DEPEND}
+	>=app-portage/portage-utils-0.3
+	virtual/emacs"
+
+src_prepare() {
+	default
+
+	if ! has_version sys-apps/util-linux; then
+		# BSD ships a dumb getopt(1), so use getopt-long instead
+		sed -i -e '/^GETOPT=/s/getopt/&-long/' emacs-updater || die
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		sed -i -e "1s:/:${EPREFIX%/}/:" \
+			-e "s:^\([[:upper:]]*=\)/:\1${EPREFIX%/}/:" \
+			emacs-updater || die
+	fi
+}
+
+src_install() {
+	dosbin emacs-updater
+	doman emacs-updater.8
+}
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 2039460c09c1..5ccd745006ff 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,8 @@
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
+DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
 EBUILD eselect-1.4.12.ebuild 1623 BLAKE2B 6d8d236b4b11ec808ab1f95c0a1c295fc4ffff17f85151dd176354a1a1bb7459eb9d64f59411b7a7e3905a563884865c5dc23973f5d6674f13ebafde00ef3d0b SHA512 398ca70365af9bb0aef6807b8d797fe55c10afabe25b2e7a4657aba39b70748f04a5f94b24569701042399e9c4ffea1c48b824f7b179608d080981ff1159f2da
 EBUILD eselect-1.4.14.ebuild 1627 BLAKE2B 681b9aa31b4e3e7cc0857c9ee13dabeeb78936f3c6a41f8ae43a44526086bf8e52ef047ba9543b0fd14280abf0025164dc6fd5b22da481b1009cdd7a9f65c4fd SHA512 8028a79b110b47c0b75ec0621729cad9be30a103ede0d0e6c3e07220fac775704df733da7b64304db2e882e3aacf310750338f9ee224baef602cf1100f96da06
+EBUILD eselect-1.4.15.ebuild 1640 BLAKE2B a2628b326ad57259ad0dc50fcce13403dda4505f5f83aa9982ad0f230c543ea3937414f5538eb635cfe8dcd9e3d3cb93d6a97cbb541dea582245fceed1fc8e5f SHA512 4437117d84c679538e30e85e77a8707c1639c28619e9161a15cf90b69edc856901fed81a8eab6dfb867d4f4ad294c804d5f19197a627d7d40ffefbf9a2296e19
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.15.ebuild b/app-admin/eselect/eselect-1.4.15.ebuild
new file mode 100644
index 000000000000..61a8c2e50a68
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.15.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs vim-syntax"
+
+RDEPEND="sys-apps/sed
+	|| (
+		sys-apps/coreutils
+		sys-freebsd/freebsd-bin
+		app-misc/realpath
+	)"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils )"
+RDEPEND="${RDEPEND}
+	sys-apps/file
+	sys-libs/ncurses:0"
+
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+	vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newbashcomp misc/${PN}.bashcomp ${PN}
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+	if use doc; then
+		docinto html
+		dodoc *.html doc/*.html doc/*.css
+	fi
+
+	# needed by news module
+	keepdir /var/lib/gentoo/news
+	if ! use prefix; then
+		fowners root:portage /var/lib/gentoo/news
+		fperms g+w /var/lib/gentoo/news
+	fi
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for the portage group:
+	# merging changes the group back to root
+	if ! use prefix; then
+		chgrp portage "${EROOT}/var/lib/gentoo/news" \
+			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
+	fi
+}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 12a1725cd202..7ee6f9d26223 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.4.1.tar.gz 3804821 BLAKE2B da865f1a19a24843ca90edc283fe2ab88119873e75934989690d0032953876ed08b8908db7f06932a934d72b8b2da8d6040c0922a08f645130dc39ebc94b1e5f SHA512 080256d78da7530f1d49f7a6451dc32d5cf64e373d8bb64f982b43c1bea25195a0a0f818c6fdf5627994f92077de1fe9cb954ef46ef9e9f4431d4b3d6076ae4e
-EBUILD exo-1.4.1.ebuild 545 BLAKE2B 1e55be70abe5f2e18f9db5058bbe72eda356212f9f698c7c9f5130d40a3da55e466412bf173952f0255370965f46b9b2af1faf8cea448c52bcef36fddcc57b1f SHA512 72e9a1fed8dc44277c4a29f71837cda8ae9a8e9ba591d78918e860122630fe6c800f4aa49d4dad62f97ee4d216212135ec9de61cc5acc8a2747a3cbf3bd00661
+DIST exo-1.5.0.tar.gz 3806818 BLAKE2B fe817962ebcebfbe37c0ec884b127144fca4d85bf985f3f6d98bf154a1bb17b49d8b7de7ece6fb71ae3b2793969fdae8bf0ad0f2031cc11943c714e27ef1a63d SHA512 3fab4c57d55d0058a4e1191d97ac04de45052e5f9c25bea0d4408df48c648e28804842d8989700daf36c6657023b99a63a4dd77a1991689abecdb11afa4e6a09
+EBUILD exo-1.5.0.ebuild 545 BLAKE2B 1e55be70abe5f2e18f9db5058bbe72eda356212f9f698c7c9f5130d40a3da55e466412bf173952f0255370965f46b9b2af1faf8cea448c52bcef36fddcc57b1f SHA512 72e9a1fed8dc44277c4a29f71837cda8ae9a8e9ba591d78918e860122630fe6c800f4aa49d4dad62f97ee4d216212135ec9de61cc5acc8a2747a3cbf3bd00661
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/exo/exo-1.4.1.ebuild b/app-admin/exo/exo-1.5.0.ebuild
index ebb329b957ff..ebb329b957ff 100644
--- a/app-admin/exo/exo-1.4.1.ebuild
+++ b/app-admin/exo/exo-1.5.0.ebuild
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 754246dd5b85..f2d0d27fbd25 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -8,7 +8,7 @@ DIST filebeat-6.5.4.tar.gz 25286147 BLAKE2B c3eca03c8e8e2b863918f3fe65bdea46b351
 DIST filebeat-6.6.1.tar.gz 29108620 BLAKE2B 21dbe189dcf91efe6170574e3cff858cca4094936fbda54a343f66e61a5f0cd7d29e71d547c34ddd78776283d13e48926dd84925eed58ca07cc7bedf216c9064 SHA512 9c7646efa8aa44c2ae1cbcf85204749bc57491aad075d3ca283cd75a1b3a93d922169603407b2ea111e7e3abe0a43ce26fabccfe93d56a4232bd63e2b2e8b24a
 DIST filebeat-6.8.1.tar.gz 35550017 BLAKE2B 0a1913adf2eda50884f33715a059fcc2028e31560afc5412e87d7fd3a6ed5cc504683ad3c5b28f18df24afd3e4c8d96c5b2a930411ae32d09d05c85cfdff0499 SHA512 5ff047e80099b09e25952ac7fc8ea0c6be25df2cd3b638c07c600e680fac32505c279a3a91ee2e61acf0f9535b4adb390a65f3a7dbc3599e74c6b02e0aa6ef71
 DIST filebeat-7.2.0.tar.gz 46415588 BLAKE2B a8940e9a4a85e6eac79dca3418d3dcd14c5a1062741dd895c561d1498c287bb974a5ac89d5b353dbb75e78e6c67cba97a08d41528042db4e4d76bb46016fac60 SHA512 67d251cabca10a1f6d392be8e6203e66d4cf5d63ceb2af88185ea4824259995dafd3aa8dd2da326d079cfcfedce5996f173cd6c50972db67cbe25f660683e5d1
-EBUILD filebeat-5.6.13.ebuild 1595 BLAKE2B ab657b0be80c86c637aa30fb32a2011aec931c43ce4a839f0040dd749321ff8bc0a67c249bc64356736cc8afc18dd9b25df2fca51bfdb6ba176c0af5cabea39f SHA512 801f38077f15698eafe43ed6138d014108ce0bb9178de2fd166874ed0f21e56da415f2f476e1b0b00929c359a286847742a732a2dc001700c4994cf9f92f91b8
+EBUILD filebeat-5.6.13.ebuild 1593 BLAKE2B eace0e8d7977b82028436e2c55c4a4bf19a7c0b57714cf6b7cc1e7176e9013edb889065f58740f8db51e38164f6e567cf809d9c4fb82de1d7e064580ef8cafaa SHA512 8eeb1e64ea6d8e06a79ef9b25103d523718f779e351ee5c1f0a00db67d1e28405ccdc371ae5c0177861276db40c848b78ee2d1eff16c14da3efca3c7576ae399
 EBUILD filebeat-6.3.2.ebuild 1477 BLAKE2B 9600502c104f8db4f8661a354bee5160b5780fb4ae3cf84a1353ae5b774ed01e61aebd66ad530550691a43ae62ebb0cf7607591c5b582564b69d81c8af64f68d SHA512 304cb456b2b56d2005b8dcdf56817005e7843c5073ef1aeedd75e69a73178eb184910027d94522e586e6492d80f86d8c49787a7d818292695304815fbecfa239
 EBUILD filebeat-6.4.3.ebuild 1478 BLAKE2B a8430ed2d2c0bc2411300514a35a72ae3c6765c54c6ec49c8deca06f02b7e2f543788e77cf48ddb08492dcadd4ae4ba0ad3b27ac6e3497ee4d29ea91f9e3482d SHA512 597ab402cd5a644892926595c65edf5853b5173e5b76d46f116dc02dbb995110a774181b7e9c3dc149ed4fdcf7b9d89d3a9c6ee36b158ab983e37d36467582bc
 EBUILD filebeat-6.5.4.ebuild 1478 BLAKE2B 4eea3c20260b9e8c32b0fe66108378fcda572d3d80bf435c341b6b0ac6e18f4a95eb4d430a13d2fbf775216d857f1877327c724d9abf9e8acf7efd33a2f57473 SHA512 3ae3570cbe614358eead82f36aa79008e317164c62f779eeee33e5ad067c58bdd42389db57f52ad4e909fff67f48043bfec3bcb4ed478b05fbbf75d43d39157c
diff --git a/app-admin/filebeat/filebeat-5.6.13.ebuild b/app-admin/filebeat/filebeat-5.6.13.ebuild
index 93f80027bc1c..0c9c4ee528fa 100644
--- a/app-admin/filebeat/filebeat-5.6.13.ebuild
+++ b/app-admin/filebeat/filebeat-5.6.13.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
@@ -56,7 +56,7 @@ pkg_postinst() {
 		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
 		elog ""
 		elog "The migration script:"
-		elog "${EROOT%/}/usr/share/filebeat/migrate_beat_config_1_x_to_5_0.py"
+		elog "${EROOT}/usr/share/filebeat/migrate_beat_config_1_x_to_5_0.py"
 		elog ""
 	fi
 
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index 4edd5990a189..f2b7b402313c 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -1,8 +1,6 @@
 AUX gopass-1.8.4-xc-tests.patch 923 BLAKE2B 67c00d9d0d983dbb0e3f8a7e78c895dc645d1ce0e4eed2e726871d5fa35086cba10872452b76fa0ffb65ff89f3ad25c9f726141221d1dd3f11086690697da0a1 SHA512 a80ce382b9e35af43a7ddeaa7a863e73d7960e37337b66d558dfc1840a7b113767eacbb6225bbbc2f3dd581b33c0f4a9a03105a08340a9abed4768baa4c32648
-DIST gopass-1.8.3.tar.gz 6374004 BLAKE2B 1f3b66e8a631d94fbbb33347009a4614f180d7bd30f3d73e98f476fc81a3f5f0aef15c80705b1b4e871f333a3366cc051eb41785082bb90420a5d34f38e35e16 SHA512 bcf8e4cdb37355ae43d0d6d21e3248d3547fb3f1892bb2e8d5d8ddc47a784f75f4f404429733ac824bd66d719fe63fef7a1d58facde65a6d1820ecf14e7bd77e
-DIST gopass-1.8.4.tar.gz 6436185 BLAKE2B ecb086717b09a4a5ea24bc4378fd54369628b0319bfe222b2ca11583eb304c84c05513b1d2ca97089152f41903d5dae24f3aa4acc5e2f6c7e948a8d918308d66 SHA512 53440ff95589f21e1ea1d8a03e3565ad6a3b35dd747ecd62f6496fbe9ba51e94e3081142dfcc094a5986828fcf4724280ee0fdebd9cdc05f0d8720aa4f1c89ae
 DIST gopass-1.8.5.tar.gz 6561060 BLAKE2B 99d5ba9d5aed396eb4747461b64285d37544e7deaeb7ee7ebd6e3298a8746cdacbae4aa573d87d324703751d5a78efad2735954d8e2a2a8b53549985a4a9952a SHA512 1f451b10aa87141de635650489bf7227c252e10e5139dad274c95d5625db74fec0b8892a468800d3d3c5dd8b3d64f1c93bd6c75a0ba54fe5f6e630c77b2c6c71
-EBUILD gopass-1.8.3.ebuild 1041 BLAKE2B 4fa9681eeb9b8c0b9be470cfc8fe3b3f2ef806e4b64238b412d67deb72bfff4cf9cc0bd4977028287ff6e5ce5fac26874925da6e181068c4c69555b3a7c4bfbc SHA512 1bbff9001cad0448f310a5db019117b13edc2c81a66025b10a0e491fc9f6d6f2bcc1837e5ffeae46705911aa7d8d4ba288efa92888fbfd3785805195733a7ed5
-EBUILD gopass-1.8.4.ebuild 1088 BLAKE2B bb31d0279bc124608f176d38e23ab630b85d5bf5ad9c53466e4e6f172576f64ba06721828af9dd9d8dde6570d395708184b8cc79ccff6a2c059236b2d03794ca SHA512 554f69abb959ec7d104bdf76bf28cc7bb8a0c269e601328926cea2af49f384ff366a228daa3f60a27ad53b481d359aeca9757786837e27ac959639f94fac3338
+DIST gopass-1.8.6.tar.gz 7072723 BLAKE2B 5ae883c54f8180f8b6da870bd99710f1c740afe9de193c127a3047fa1211641b94ab98e23148d83c6d5b2cd2e3275f644dc875d106c9267e7e0c6342bf0b9a46 SHA512 7acdb095cf8913954044c3206eab020f197542334798c6b94724709c3953b12f7e5b73ce8c1aa4bfd5df3acf1f424b64bfa94f9a8f68fa7116ed14c8a0f2e6f0
 EBUILD gopass-1.8.5.ebuild 1095 BLAKE2B ce53235ad3e59da78f578b2388372ce67131e66f5a55d444088cc41d261f9d311e04e1372accb5936d359a4871c1c54d0a90166d231b53665567dd99c9e4ee6b SHA512 f798a8efec8122f9dbbf1d3558123e13709dde9e33819ea0179ea2f407f0634e3c17fd6ffd7766c3cadcf36a9cea51ce2baccece160fba0302334d1a3b1d06db
+EBUILD gopass-1.8.6.ebuild 1041 BLAKE2B 04d26bf816ad93d9267177e12b3d86ef6f383a5c73ab9548d098b39b92ffa205e5a7924fb91bacd5f6510bb4475bec8a087ff095a5dcdb1578acdaa8c94914df SHA512 d73ae1d48ce585ae27abdec5ad52f1e95c6b9917fd5831c683765becf50565df5fe14380179f5f7027f9945d89e6fa60d6b7d9b2f562d09588885530705acd34
 MISC metadata.xml 326 BLAKE2B fbff56ecc7a4bd866c1220fc218f9233ed0660b04cde03047df5db992557bf5d20f518815dc15eba2a22f6b2b8cc4eb5ed1c0f2cc2753e18ce4cafd59b768637 SHA512 2d43a58c7997bd539d9aa5659fe7cfcd947c97c49d31dea4ee1230b06b0ae2c8cef4fb228b889968f65c36693d5befa76828da3644bea0852ead709bbf7d760c
diff --git a/app-admin/gopass/gopass-1.8.3.ebuild b/app-admin/gopass/gopass-1.8.3.ebuild
deleted file mode 100644
index 1345581a840c..000000000000
--- a/app-admin/gopass/gopass-1.8.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
-EGO_PN="github.com/gopasspw/gopass"
-
-inherit golang-vcs-snapshot golang-build bash-completion-r1
-
-DESCRIPTION="a simple but powerful password manager for the terminal"
-HOMEPAGE="https://www.gopass.pw/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
-
-src_install() {
-	dobin gopass
-
-	local DOCS=( src/${EGO_PN}/{CHANGELOG,CONTRIBUTING}.md src/${EGO_PN}/docs/*.md )
-	einstalldocs
-
-	# install fish completion
-	./gopass completion fish > "${T}"/${PN}.fish || die
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${T}"/${PN}.fish
-
-	# install bash completion
-	./gopass completion bash > "${T}"/${PN} || die
-	dobashcomp "${T}"/${PN}
-
-	# install zsh completion
-	./gopass completion zsh > "${T}"/${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins "${T}"/${PN}.zsh _${PN}
-}
diff --git a/app-admin/gopass/gopass-1.8.4.ebuild b/app-admin/gopass/gopass-1.8.4.ebuild
deleted file mode 100644
index 1733d9991751..000000000000
--- a/app-admin/gopass/gopass-1.8.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/gopasspw/gopass"
-
-inherit golang-vcs-snapshot golang-build bash-completion-r1
-
-DESCRIPTION="a simple but powerful password manager for the terminal"
-HOMEPAGE="https://www.gopass.pw/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
-
-PATCHES=( "${FILESDIR}"/${P}-xc-tests.patch )
-
-src_install() {
-	dobin gopass
-
-	local DOCS=( src/${EGO_PN}/{CHANGELOG,CONTRIBUTING}.md src/${EGO_PN}/docs/*.md )
-	einstalldocs
-
-	# install fish completion
-	./gopass completion fish > "${T}"/${PN}.fish || die
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${T}"/${PN}.fish
-
-	# install bash completion
-	./gopass completion bash > "${T}"/${PN} || die
-	dobashcomp "${T}"/${PN}
-
-	# install zsh completion
-	./gopass completion zsh > "${T}"/${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins "${T}"/${PN}.zsh _${PN}
-}
diff --git a/app-admin/gopass/gopass-1.8.6.ebuild b/app-admin/gopass/gopass-1.8.6.ebuild
new file mode 100644
index 000000000000..5ca88b63636f
--- /dev/null
+++ b/app-admin/gopass/gopass-1.8.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/gopasspw/gopass"
+
+inherit golang-vcs-snapshot golang-build bash-completion-r1
+
+DESCRIPTION="a simple but powerful password manager for the terminal"
+HOMEPAGE="https://www.gopass.pw/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.11"
+RDEPEND="
+	dev-vcs/git
+	>=app-crypt/gnupg-2
+"
+
+src_install() {
+	dobin gopass
+
+	local DOCS=( src/${EGO_PN}/{CHANGELOG,CONTRIBUTING}.md src/${EGO_PN}/docs/*.md )
+	einstalldocs
+
+	# install fish completion
+	./gopass completion fish > "${T}"/${PN}.fish || die
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${T}"/${PN}.fish
+
+	# install bash completion
+	./gopass completion bash > "${T}"/${PN} || die
+	dobashcomp "${T}"/${PN}
+
+	# install zsh completion
+	./gopass completion zsh > "${T}"/${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins "${T}"/${PN}.zsh _${PN}
+}
diff --git a/app-admin/gtkdiskfree/Manifest b/app-admin/gtkdiskfree/Manifest
index 6b5048559500..13476c36f000 100644
--- a/app-admin/gtkdiskfree/Manifest
+++ b/app-admin/gtkdiskfree/Manifest
@@ -3,4 +3,4 @@ DIST gtkdiskfree-2.0.1.tar.gz 354661 BLAKE2B 39731b38eedf92554303fa8f6784c1cc9c6
 DIST gtkdiskfree-2.0.3.tar.bz2 216189 BLAKE2B 146dae89b0f66328840f22bd7b9e8ad751759dea3a67c332d71e513388be46122cb761fec6229258b63e85c726ee889e04a56d405437904f1eb8060ea31ee88a SHA512 c6f093ff023cb8c67090b3bd3660a998163e786b08386f346bdc1aa7b29e030a31cfb0ef54c55f109f211bf045f90afd20558b91849a4f82d041c99532f170fe
 EBUILD gtkdiskfree-2.0.1-r1.ebuild 920 BLAKE2B 7ec5ce54e5a949d75ba8836162d2361340d1c115d028fce633815ce19b4aa8f0e3283f2e3b03e8b8069d498f4d6fad454151dd4505e18acf17f8620d359b3e02 SHA512 23d755ed23fcebe32e44de66bbdf92048eb80ca0e7060130c74ebd6444d944e1f906bf4f2b013c35f2545dbe69db8bd7976c00af3b23bce5eaf82cd13dfa03b3
 EBUILD gtkdiskfree-2.0.3.ebuild 606 BLAKE2B 7e437ee97362a5b8152cc036b8f92854efb9eaa3871f3a694795603b4375fa1e52f2eb70c5cfd8ce18b25606185d45dc74164e8b0d178d5c6ad2d1673f4c06f7 SHA512 b40217538674ee82af7902d25144acdfb4a3940aed487c2030687271e2107103fba230e611d57c23f6998c7194047b0707e0b98a7701bd843491221930da4962
-MISC metadata.xml 587 BLAKE2B dd739127e2229dfa3136f32152b74dd6b001947195b57776ddc4fd41a892ae77ffdbc42d9b0078f20b45be2538b655e05f99e8a67ce0d43474217a6cb8e03ffb SHA512 1d4a058ba9e674c69dd5422af178c7067772532a963fea5d1ba85efe88cf4e576b4f434721f76cb7be6aa7d6873b506faaf8009adcea135e90d9c08beebf6ec6
+MISC metadata.xml 560 BLAKE2B 9a3b649e52b152467be22c57e24d32727cc75ea2259504c1acf516620665e72a2d8662124ca5bad55d1d04bbb36e3068494840b82b541ff45798120f2c56ecf7 SHA512 d7ad34b88b4224c4f03b00eb3ce3411b209c2a02a56b00cc4e5d662dd39cdfc76b9a65a8015392e127fecc3269a0142ec8b97c2b67eb6cf1e0ccc6fd7bc04cbe
diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
index 88053de1aaef..4dac4d61504d 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -2,14 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>BM-2cTVBXjxdVtEQCycBQjMxszLsgTNVujvM5@bitmessage.ch</email>
+		<email>samuel.bauer@yahoo.fr</email>
 		<name>Samuel Bauer</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>gtkdiskfree is a gtk extension to the cli tool df, does the same and more
+	<longdescription>
+		gtkdiskfree is a gtk extension to the cli tool df, does the same and more
 	</longdescription>
 	<use>
 		<flag name="gtk2">Support GTK+ 2.x instead of GTK+ 3.x</flag>
diff --git a/app-admin/installer/Manifest b/app-admin/installer/Manifest
index b80975dad236..2ad56e5eb0ff 100644
--- a/app-admin/installer/Manifest
+++ b/app-admin/installer/Manifest
@@ -1,3 +1,3 @@
 DIST installer-0.1.1_beta.tar.gz 49946 BLAKE2B 845df010036446e65479affc3d901fe114248130627ce76583c42adc9ecf9c0e2585600106c1559c8d3dac8c086553fed1d48d00002ede9e9be509fc98632662 SHA512 940272cefed17bd6c370fe26b2941da611cbd0aa8fb1c7f51bfaef483c7f9189f10754fb7e3d84dc099ac687f4644e24ae22e7ec09c41f39efba30d5743c9163
 EBUILD installer-0.1.1_beta.ebuild 505 BLAKE2B d11943b1fc6a5f56d58a34e218a95b969984035c47e30a0c0a9c5d690e2ca22c54cae88c112b2d6f3dbadd41d320c70e0d318dd3a39822b2dd38b40b013cd521 SHA512 89df436c45e13240224c149456e58d1aab14cc34e1be850e6c21059b3f4d5481c835171f1a04792f0cd956ad771f87962b67c34f58775cde8a2753d3276a1f3d
-MISC metadata.xml 650 BLAKE2B 85405d55a8203f929a0a11864b7df6ddb9763160da824a1a1f037c1ea3e52f3a1fd1540316142f47af0ed575f90deab90fc71a90085ac1ba3f571954d079f541 SHA512 d1c0b0a1fe0b4aa0fb00595d7c46c73254ee22bd801b81a9895e176a0577ae64174dd587bacd3ac5ca17fe6c56f771274d508f9249a990608e6b515bc8aabef2
+MISC metadata.xml 425 BLAKE2B a32b198aef69dfa01edc6e5e6ec8a19cc71edcd359f95866ab95df3f8cd8c2220c11e81fe7f58c44ecff5e80d89ef70bfda04fd110635674ddf90e957e3e32f8 SHA512 c4d27457c90f3374cb04b0fbb94b0b26da6ce0b88c79b4722f02014225703f37af825aafa221d6b76ad476a9ede7c81b9a9136f6b0fdfd621caaaba3a99e142b
diff --git a/app-admin/installer/metadata.xml b/app-admin/installer/metadata.xml
index b6fd5038e019..f846e48fd956 100644
--- a/app-admin/installer/metadata.xml
+++ b/app-admin/installer/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chrisadr@gentoo.org</email>
-		<name>Christopher Díaz Riveros</name>
-		<description>Primary maintainer</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		installer is designed to aid users during the installation
 		process of Gentoo Linux. It is capable of walk a beginner 
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index 0e6cbfb0a887..b7bca0190daf 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -1,14 +1,10 @@
-DIST github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz 588432 BLAKE2B 0ea1b91d459a9708896d8e6fda386924d0dd8aeb44cf58de4a1c7d51185e9ad106333029fc807f6221db0decf7e8da883d98ba390250dc5fa47474fa951836f7 SHA512 a24eb00104b7763d7b711a4e555f00464fd19d117fe7d5c6bf0c007167dcad1b893a7130abc46619f29136fef4ee080662d4622d5f15019d41c24ae55a804a3d
 DIST github.com-fatih-color-v1.5.0.tar.gz 586937 BLAKE2B f9ee26f45c49261ae2ed708b32f878ee5499c2365f86148af23a7bce33caadd8bc5c26a54357f416d2f8f718329cc2aae4ac7ff2c6ef2dbdadfc03801ae926b2 SHA512 f58e9cfdeae96807058468efb162bcbde8445031bcf98fa0b08dbd2f1100efd40bdd44bb0c800a0eb386685fb2b0d75f0b0d0ec7d3674b739ef205fa5f59a044
 DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 BLAKE2B ced6ca6f115eedc954f6b583b28e470ec5dcfe0c279d55a63c00ee942acde095e9eef8fb4c3fa289f34871f43a7562fb71142d070a54398bc5d91122e64b4ad0 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab
-DIST github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz 64831 BLAKE2B 23c8a4141bcfb9c4b4e384a9ad372cc0761c006705384eef8a05c5491e62997df13aa19318f500d6dc39ae95e61298d1a9b491b7ea9a6f0ac51d9f28359d2c0f SHA512 3bf310558b53a724f93d228947cb5f1fe152313e90e78559d4b57b9b6db2e668ffe0358dcb74a40159dce9057e4872d905f8490bba4c19cd7a8e0301439df96b
 DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
 DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
 DIST github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz 670015 BLAKE2B b457c61f036bab4bb9ed035855607027552a6ddce89f0725cd6615362f12bcd478966e4e4b287c05bc6d055ebb21032f5993e00fb772dc18ef9804e3b0e9978a SHA512 f1c7aac5ddb1ebd9bfb91bae24c78840f2d31a5305c8d2cc4e2f3a1fded0c4432a340d92f753e3aee717f7e5643f5187eb16ac645eb6ef86df1beabcfb97d761
 DIST github.com-golang-text-17ff2d5776d2.tar.gz 6580833 BLAKE2B 85a9a26c6c5427cec821ce39fe3d01726271e2fedd24c280d63d57e426d8eff9aa355215cded6d2e8d754169f0ff5c8781b4a0cda481c6289b2016d9d1857bc5 SHA512 62318598606aab26b95cd62f8e30fd6519c2f2dfc2b5d6fc906ec70c0749745539ff983a6e084c3624d108231797d320b77b53a27aa18d9e83bf2af947dfdcd6
-DIST github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz 6112971 BLAKE2B 46e4358a177a6253797177a31d0509e63c2986645c61fb833c479498fcf3a8cb2304a81c47c562340087dc7eba5273690cfc86bdb978e72b1183715c8e9cc662 SHA512 555dfd99a41705b0e1aa7ee5a6465fbe53d1dedeeccc226a26edafb1f41d5f7a137cd4ed6ad02146d112055ca324569ccbe2863933dd363e5ed002cdbda6fa90
 DIST github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz 69787 BLAKE2B e1d034d5863ae8bca85736e971e613e6821665861e35954a067e5d659029a8680b6902387848a318aee374cd4f6b810ae160046979b5bc86e64df0e1ff5d08f6 SHA512 751ea2fcea04ab2a9b61a45443a71cdee9cd09c2576af048108ccb56027b34f46b00e14aa664b966165b7d8cbb994e49f128bf54e3469c627d73f7ee2809ebf8
-DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
 DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
 DIST github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz 70487 BLAKE2B 28c780726bbd8589beccce79f5af4a71a1ecec8438fbe77af846f79a1f8879cb8d6920b52367ff5c63bf9100c19e3c5a48ce77aa1a13ed1f17eff84529259626 SHA512 04c6a2d2c32e9a020f47f88a5e58dec47b500f387d798b98ebaada905d85ad014f78fe8683d662c61fa0c6286da1c0bc733b03f7f7ad912640cf01a4a7e4de49
 DIST github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz 4506 BLAKE2B bf66be135369acdef3c356310de015f9b0f3eeaaf9273e315d52ef21fad3d93d27a90535252a846e5f0c7d2680dccd1080c7f4c56d3d48ba38ef0cffba18129d SHA512 bf30d10b9e101c9fde9079b12b519e8bdeb5f40bc964109940b58a2bccdb2f9775c6bf25dfe47ae7b8bc7e34a0b9109a0d9f1f5b4e70cc4093264758bdce749d
@@ -20,20 +16,13 @@ DIST github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz
 DIST github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz 15601 BLAKE2B c2212f4c34ae15eefa1a681b2beaa8cbf3f63fb2317a8fd95f21df54eb6a05b2d312d96848deb1afdd47aefdeecadd20920ae25a0d865f31c16b6a5da4ac6dbd SHA512 30b6f8f902ab7d4dad899c19687b6ec0e8c51655a04163c37ed1fa36cb420695631534097d4de0f342dbe649b412d38d0254b40bbb2970c3a70adc0244a6e800
 DIST github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz 56608 BLAKE2B fbe29d5ff5dabf6c6bc123c41fb341966c5d8b41582e3dbd241e26e6e1e6b2afe7f66927e84dd9233704b766d5f72acb451359e9034466de8700d30d09f50166 SHA512 5d1b21d5af4d148451ad040a80e8c9523c0553b3fda84bc3e079881bda06dde7cf00c2daaf790bbab12f2afd2bbe794b1b7982d8a3c84411f6af99c92ececeea
 DIST github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz 43598 BLAKE2B d7fe3fff67b37002696f6672a95bacd9a8cc30783162eb4fced93bd86e91e10cde84f94a53a3af488ec032e42e1ea21d7e3f4f215b3e2b50c7add042579b749e SHA512 8563490cbab569c9bd065ea4e530a1cb47f3159100af0ad21501f66f60316a12e8e5b497829250d4b64993baddbd542996ce073b68674172ab3fb7213106771b
-DIST github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz 9594 BLAKE2B 4979fd23b48a6bcd2538357d33b7670326b9129b5de309548492d9597eace1320875e1b242b594c98777192c1e0c6abb0bda4ba946a43530cc68ec762d1949c6 SHA512 2b97f56aa83dd1302e02603a8fcbc8f2642ceff8bdc19cf8a26120801023c4a8a3fed689de0ac392f6a4144450ac85d32b00fbde200b22e972c31cbabd996cad
 DIST github.com-spf13-cast-v1.1.0.tar.gz 9592 BLAKE2B 0591ad8a8540dfafccfa68eccdc9da028213032df0b51e0057421974e84de85a28bb76ffec798048603dd33fe134769f55ed92580f3ffeef6abf6cf36c0344fd SHA512 21b9c1e72fef53a2100004f9aa1d027e7e9e1f5796753a8c22cf3fde5204d0a61fc667656eebcf3791ffa967221aa61d359a81d0e6976b5741115ef8f3f861be
-DIST github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz 101642 BLAKE2B 9d0ea2e12e915d79a3c8351357cc0ec564910dc145be7d0b8eced6422e4e841e66f28f211e369d5639fcacc201af553e70a740dab76354f9b3b256bf08c3d100 SHA512 5618be996d70382efa9a84d0d06fe866b0fc955ea79240f37132588d0f793988ed4ed1584e716d2644a774d5b4e0e80b77a04d8740cab313107929eb413e25c2
 DIST github.com-spf13-cobra-v0.0.1.tar.gz 101512 BLAKE2B 1f61e9a6ce820742d5a575901cfea6188d8bed5d3034930649c73ffcdc3e3fccd5e6c55cf017197566b21a8e141e82f9363d4531f3ca3ba08ae3f34cefdfbf1b SHA512 e2d3865f90f20c144694a70b4b7b74baf636c31d9a1efedaa90135b01ee7673a17cfc51d4fbf11f220f9035ca52294b7ae4a61c42101da059911e4bba5b1918d
 DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz 6347 BLAKE2B a1e62d37f3f736086ba5b198ca33e243f4650571d42448c593ba7c0970883aea401e8ddfc90975686bb5c992e5133294662a05b245620ca52c254b2a7e866d29 SHA512 04522be3439a2c3a06f38f764e275d8d093b935d610386bb99364f105d7d805a6a7e7a928796682955549a88d43b21f385404c1401ee66374d324f954bd4769c
 DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
-DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 30849 BLAKE2B 8e66dbb5c90c47e66ea72848d86602861791fe3198ce6cde5ea87330f15dd19cdd249788bebc31b2a66577c20edeef01c8beb59a4140d57167c4b13d33118a04 SHA512 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd
 DIST github.com-spf13-viper-v1.0.0.tar.gz 30804 BLAKE2B 9f88f872c1bcd0f3590f7b4bbc35e03b3d3fec5233eeff0ed1cc1cd68dff1b29a5170492683f864a8b66fddd57722cac2ecb06a0035f6b4dc40a636025e0ccac SHA512 a9264fb09dd9d069f3ec1543a32c55a1268e6b33c3715da9116fe6e23f7b6f179785331f07f13cc03db29eb38f017eb5e8569e144bcaafbd73801857e0387504
-DIST kube-bench-0.0.27.tar.gz 6208481 BLAKE2B 5d3efc972d0caee4db8ea80c6ec24008a9a47770cb1befce20795d6d7e8a3ae3a109b94239a0844bcc44b008f13051db72ca19b8395a9079bb424a3ac8660ebe SHA512 5c5bc90e24d805881b9949f86b852814c2e920b61616b91716a2705230a135e8d3475fa8ec2ed0add9fc2346a17e0538527eb8a7d4dce23dbc8d3b4e99b23a74
-DIST kube-bench-0.0.28.tar.gz 6210140 BLAKE2B 239f151918b8ae0646e24bdfa95b08896dfa3702391bc736e2816c78a9309f45203ffa8111f133f6f566919a02845ea2f4f85f61fbdeebde013da834296df771 SHA512 82a8671fe02f44f9b8309ce7eac36e11e4b3ecff5f7a6dbecc65a02425eea142a60db9d494f038b412954085eb10c131e8e4ec1fb2e95bde2f96c2b35e97082a
-DIST kube-bench-0.0.30.tar.gz 250893 BLAKE2B a52e465368b53671fcfe392d8c167a12d75405564333244212f743b57230f7b17edbe36e59a1262a17cf7d27b5b29d95204eaf600cd531a9f5d7dc25b4c2953d SHA512 7c0075429a446ba89d183867fef72c18f4d12765bb7f6faf65304fa8cf3a76e1552311907d66bbe0795cffccd7025d98b481b7f9a2f5fec82345acc4ea798efc
 DIST kube-bench-0.0.33.tar.gz 253236 BLAKE2B f441cbb4315d785084a51ac89ee3f02b79d569a38079384b82afc8a966e2b9fa948f93db5655abb8ddebf8df1a95afc53376992441889f53b009fd96dd809937 SHA512 f6b688126c2f09d1af3128e4888548eb943b07a336d378eeeb35ca8d84ba69d93d8672b114559f91dcab72000c9bcc996d415d01f1de9af6ce6810a399a6e631
-EBUILD kube-bench-0.0.27.ebuild 2378 BLAKE2B 7e6940c4b47382211bf747a32f68c03a9f68e1a14f7ad8e7b5073767562d7f22476edc7c2dd1bb2a68e103009e3c294f2d235cea055782fb5b616b5dc71e6a3e SHA512 17f77e0476ca8cdad7986e901810cc6af88b723367295438d6a5632b0f98aa032aa6ecbba9320256b26bd0aea17df1ab8a96e17b9be5f005ae8ec7a62215f88a
-EBUILD kube-bench-0.0.28.ebuild 2379 BLAKE2B 13c334651f415c1b45d77cea83a84bfd2db0b42b39b327d2f949d161e1ccbe5e8c82e2864af7033aeb4d284e7835a3c9507dd1a6749e31e10e35bc46b9347e6e SHA512 b75469ec2e6300fa2b294f2e4fc3887e228607c90511d9639bdc758c1cd76ada09609bc4e1a369e2e1805963c971bb9f6e8f0cdf413b892cf94afbf5cb0f1f26
-EBUILD kube-bench-0.0.30.ebuild 2286 BLAKE2B 1307c1868df0a78e5628a5b06ad32ca491e57d87c10eeb311ab2cfa6ee4f13da76f1a369dea2ff45130023bbc69ecb347ac32272361f3b42aeb060a0bf038e6b SHA512 fa680496be332ece42bc89f528fbb6f253e41bba1b40d9f653ce8d7fc4e696524b72516fe805bc26d5e64b40b254e1c3ab64f8d54c40eee757284fec942358d5
+DIST kube-bench-0.0.34.tar.gz 254837 BLAKE2B a7606ec52741bb0551a9073e1f58d23db6571c7d7ad6775ebe13ff32396530fd03b7845ede40baec6bea6cb437426454cef624b1c711bd5fef242a772e14e7e3 SHA512 4df1b88ae3d6425dff7473066bfa6561f32e5ef6f137984f7a90e713f3dd1e59f8551353cbc3e86fe35c6cd3793d2acc13b9db426bd7930d22d1a06e9c7f4156
 EBUILD kube-bench-0.0.33.ebuild 2286 BLAKE2B 1307c1868df0a78e5628a5b06ad32ca491e57d87c10eeb311ab2cfa6ee4f13da76f1a369dea2ff45130023bbc69ecb347ac32272361f3b42aeb060a0bf038e6b SHA512 fa680496be332ece42bc89f528fbb6f253e41bba1b40d9f653ce8d7fc4e696524b72516fe805bc26d5e64b40b254e1c3ab64f8d54c40eee757284fec942358d5
+EBUILD kube-bench-0.0.34.ebuild 2286 BLAKE2B 1307c1868df0a78e5628a5b06ad32ca491e57d87c10eeb311ab2cfa6ee4f13da76f1a369dea2ff45130023bbc69ecb347ac32272361f3b42aeb060a0bf038e6b SHA512 fa680496be332ece42bc89f528fbb6f253e41bba1b40d9f653ce8d7fc4e696524b72516fe805bc26d5e64b40b254e1c3ab64f8d54c40eee757284fec942358d5
 MISC metadata.xml 333 BLAKE2B c8437977b6a07e36929b13f767af0f09158bedd1ea7a0bee1da52dd1b83acb2929248c3c385a5fba14362721ab6871d399ddfba53d15bbe84a87af0ad771b73b SHA512 295cae435555436e9091195ac585fd30d022aba0b76244c85927f19f14b38dde95fb14192c832f00f52e3cf71aa3d95f7527b22a90690f85206178c49d620c8d
diff --git a/app-admin/kube-bench/kube-bench-0.0.27.ebuild b/app-admin/kube-bench/kube-bench-0.0.27.ebuild
deleted file mode 100644
index f2b116c490a0..000000000000
--- a/app-admin/kube-bench/kube-bench-0.0.27.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/aquasecurity/kube-bench"
-
-EGO_VENDOR=(
-	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
-	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
-	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
-	"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
-	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-	"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
-	"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
-	"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
-	"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
-	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
-	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
-	"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
-	"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
-	"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
-	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
-	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
-	"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
-	"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
-	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
-	"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
-	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
-	"gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
-HOMEPAGE="https://github.com/aquasecurity/kube-bench"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o ${PN} . || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/${PN}
-	insinto /etc/kube-bench
-	doins -r src/${EGO_PN}/cfg
-}
diff --git a/app-admin/kube-bench/kube-bench-0.0.28.ebuild b/app-admin/kube-bench/kube-bench-0.0.28.ebuild
deleted file mode 100644
index 456872daf1dd..000000000000
--- a/app-admin/kube-bench/kube-bench-0.0.28.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/aquasecurity/kube-bench"
-
-EGO_VENDOR=(
-	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
-	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
-	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
-	"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
-	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-	"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
-	"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
-	"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
-	"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
-	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
-	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
-	"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
-	"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
-	"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
-	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
-	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
-	"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
-	"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
-	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
-	"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
-	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
-	"gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
-HOMEPAGE="https://github.com/aquasecurity/kube-bench"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o ${PN} . || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/${PN}
-	insinto /etc/kube-bench
-	doins -r src/${EGO_PN}/cfg
-}
diff --git a/app-admin/kube-bench/kube-bench-0.0.30.ebuild b/app-admin/kube-bench/kube-bench-0.0.34.ebuild
index 5efb03763d5c..5efb03763d5c 100644
--- a/app-admin/kube-bench/kube-bench-0.0.30.ebuild
+++ b/app-admin/kube-bench/kube-bench-0.0.34.ebuild
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index c770be83dfa5..506865132de1 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -2,19 +2,14 @@ AUX logrotate-3.13.0-fbsd.patch 855 BLAKE2B 48494caecc49d7b819f889bc7acf6bd29e71
 AUX logrotate-3.13.0-ignore-hidden.patch 542 BLAKE2B 01c6e92306eaa2356090e5539555711ff09c7bdc6042aad7f3c5d9faacf449f00bb3040132bd00774104f8c0a8cb40073cb7c26323978ef199847a88eee26e45 SHA512 88bd9dd906171d45877e4c21e40cfc9a729742825b4c5d583fd9364d3943aa604e037e4b58e053a1fc7c0b77bd5ed6171f741778716ef753ecbb02ebaf012589
 AUX logrotate-3.14.0-ignore-hidden.patch 548 BLAKE2B 29a8efd36b000cc670a8a2db46cac3ad12ca49c5900409c3e1b456da88acc869e66a479481fcb24731d44d7d1815fce54068542afaa4737093a65a35ea7cd79e SHA512 2f08e4b1b483d301e2c6f9a5440957f43d336d44b3393c4408a02b5491826f887d53c782a6c7472bdb1ede9baacf2d1608d7385a576da0a8441a4b5a48ee5113
 AUX logrotate-3.15.0-ignore-hidden.patch 566 BLAKE2B 1739e0d175311eb2a3692826830bb101dc65b3966eb6dcd96fcbdb6bb1376eac5c0d0c78a26ff2ee6cfad57396d05dd3cae9ff4621a94b80d9a8b5877a52195d SHA512 ed572f12617812b44f7b79e9f3c7fb7aada1fed8f80244ee9e5e7c7f536e493c69790c7c62e0dc1951f979bc5a2cff581f439a8e1fb1a47722e6c0f1dcb4e65d
-AUX logrotate-3.9.1-Werror.patch 344 BLAKE2B 6f132592ec2446943cb4f6426b7e25b432e9e44d82d080b3773ab7f5c34de019594ef77fa74cd74e026605e775ee2b119ab39c2eeb50a092dec1a1c502409b4a SHA512 6ae8b49d1f29ce1c32603716555085b7fa2d865177558abe92c84867c69ca84b8174563db07537801ad01572717670478b273acb34b5885b9170354d1cc02493
-AUX logrotate-3.9.1-atomic-create.patch 1253 BLAKE2B 2e3486f31991ea351300241fe2ea64ad8bea952c4faf7fbdf363b594a7823312c6c9497397abaf051c760e9fe93bb8b592ebb78ac85a23bba2f5db619de6c35f SHA512 92fa8e04522f9bf06840befcb019a498d465f2d8afa3475f97e953b4e8abf2cf63f2fa27d8c89c5620da59468f753d94720f5f3a604376d7e51b86c9eb156c99
-AUX logrotate-3.9.1-fbsd.patch 1393 BLAKE2B 27f82ffb51644ce117d53a0e484779692b0b8d547d14c944c87a41862127cf05c31477c73721bd2729dfc2c22264305ce60738063640dfef47c06bcdd9dd78e1 SHA512 dd8bc024eb280e5bcb2869682bedaf5c8db6d18976e412de3283f32bc5d9ad370fdda27194eae11fa3da53339d83ff20fe541e99eb8ed183997ecb85a606f822
-AUX logrotate-3.9.1-ignore-hidden.patch 551 BLAKE2B ed2a533ca01b99fa29b5a1fc4c51d5122e027f96d549dc2d453be963df990372b2b5a6ff994c62767657f49b46a950830ed43718f454f22283555ff1f7327486 SHA512 8a2060b4f3a92f7920090b4d02b4f66b7320c068936028f07dfefc0411b0f78b1477565cef627ce131d2cd5e98ead04b7d0289c4961e68da36a69a81d8b40acb
-AUX logrotate-3.9.1-noasprintf.patch 1263 BLAKE2B 5f145d46e3c372d3999d58bb8e01ea07d7c81559f576a783548588b823abe33142fddb0bfbed51ddb4986aad0655a6c2b6c5f092866612af80aa2ed4c24368a6 SHA512 c84be7ef011fe09a2fae67fa918080c1b0c098f0000e6cacdfcc34311f17c0131e68bc1e337559391ae7272fd326ac7ba6ba1cca20f99a9cc51367ac35a924e6
 AUX logrotate.conf 743 BLAKE2B d623d150d9959ae57e61af2c442434f81636521c133479aecbad8731662ee3743cb3db858ed8326ff87d61262d20893ab6141fe09d12979785e8c52c428f5964 SHA512 c0357a432a4619392895d8180db3c593239a96f62aba7cfd981c76e9d1dfd9d93d63860655025b1e9473374c2a51068028c3a3f316cb5cbb71562ca4a61d8d24
 AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe8d0bd1703e5075671dd1e13a030ec06fa269214bff9552670d3e0932e3dbde2e3673d59b7a50a2458b SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36
 DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a1623cf1aae2444e818339361c7b7762ce51fcbd124fefafbe47d529dd21ef346a6c9a267da20547914388db99dce003 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76
 DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
 DIST logrotate-3.15.0.tar.gz 219496 BLAKE2B b9f9cd0b22b79c3da1ea6092c5f3ebf9fca39da3a4bb7e1da39a8bf96f0bdb573864b77681671ad227cfc444bbc3e64a518805780580adb954bfacd564f00e2f SHA512 9520f15eaec54da426699f1f5ce31949d1372fa25c5c127dfbf29ff717a1c15a6fd14437c1d7b67b116b12c8a5c28f6012e39ad4b3ca2b053c874d02efe98d84
-DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
+DIST logrotate-3.15.1.tar.gz 220263 BLAKE2B c164c542a0770965f5193f5816509f566b9afeb82ce8388a184d16c2b3e79aa0ef93be10d477c85f62037f01b3e626ea56d3173ca8cf017b8aa315f2e23b1a2b SHA512 72294607762751fb1aaaca1d62ebd87d109d837d50606176159a5e74782a993123321967b7a6185df6ca9c87a54febb832ac7537ceaa580a895901a995570cd5
 EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054edecf4abeb8dbd0d5df7f8bbb27e1a17a384cf4d44042197eac0c8ac7d5e6e888ef689fe2794ae206d946661b6196a SHA512 2f6b6caef77088ff1aee15f8a289f1b3559180034b5f2bfa5520b2c3627bb0f92e0f5555cbe914f4877b50729f84e3ca3f0353c6e1b63442e156b530819294a4
 EBUILD logrotate-3.14.0.ebuild 2511 BLAKE2B c824de62f72544448b54948e5025b0bfee7be00b9355be4e5c64d51721efc064dacec319f9de4e93c61a7aec2bd70c4d0515a693be375d35c16c30cb1a2b927b SHA512 e088a56371b59e4d10f4ea5574ba12985b9b7fe81de11624cfb302fee0bc08581334230776aaca74d67d9ca160dad4301f06b14e5c608c26ecffccbf370a252e
 EBUILD logrotate-3.15.0.ebuild 2491 BLAKE2B 54d0c42640b5bc52d8a06515dc93a8fb3882e5bff1307ff83ba61c02022f5a798646e56eb3eac11edad9b1d4a347a792401a155e8782df4bfe78eb782d429043 SHA512 ca4f7eb1af6d0ade04ff4917b254bb63b733daac0bcffc758804c2f15478a8b8c2ea6715fd10ace0f09966557f3d6999fcfeddcd9fd22cae6594838507fa5f08
-EBUILD logrotate-3.9.1.ebuild 1767 BLAKE2B a59f23a8a0a24b416f23a087c60fe046260cc24521f68f2551bb2a2821d12e94307e2d620ec4b625cd1b6be21cafa3d2c0f044468dbc2760897e5bb7854ac7af SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03
+EBUILD logrotate-3.15.1.ebuild 2499 BLAKE2B c5642260f3cc83c3c2a9efc208b63d28db682dd25b38fdd03de9277818deba869fe0f809932c12a52f5a4bc9cebd2b3f00cf9d4df9f01b4333c1d3bdd9655a62 SHA512 264ff42deecdc6fcd787adb0fef729e0e96fba0705eceb49d5ff519b7fda2e149a59b1dcca022a55a1ae11c98f646e802dfa92a840a4bb78766b0e05ec206792
 MISC metadata.xml 1126 BLAKE2B 1655e4bbc549896f4faef7cab3c539a5dc2a9910c80eacc6ee5626d97f1b6a5df448a502f3899833afb1723ee42f0be01e025a5d23ea3af1bab2a0311f43760e SHA512 f895d0c5ed7b02c4b92af5596a160199b6d765564050dda45171ff6e81137c508da5a8ae5fece89f04b2355d0f1b41f839aac667e4a8d8119ff64f44f34c6084
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch b/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch
deleted file mode 100644
index b8cecc4ebfb2..000000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/Makefile.am b/Makefile.am
---- a/Makefile.am	2015-04-03 09:39:35.000000000 +0200
-+++ b/Makefile.am	2015-06-28 14:03:12.429999875 +0200
-@@ -1,7 +1,7 @@
- MAN = logrotate.8
- MAN5 = logrotate.conf.5
- 
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- sbin_PROGRAMS = logrotate
- logrotate_SOURCES = logrotate.c log.c config.c basenames.c
- 
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch
deleted file mode 100644
index fdad8b6ea002..000000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c	2015-06-28 13:57:18.449999884 +0200
-+++ b/logrotate.c	2015-06-28 14:02:20.799999876 +0200
-@@ -371,15 +371,18 @@
- int createOutputFile(char *fileName, int flags, struct stat *sb, acl_type acl, int force_mode)
- {
-     int fd;
--	struct stat sb_create;
--	int acl_set = 0;
--
--	fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW),
--		(S_IRUSR | S_IWUSR) & sb->st_mode);
-+    int acl_set = 0;
-+    struct stat sb_create;
-+    char template[PATH_MAX + 1];
-+    mode_t umask_value;
-+    snprintf(template, PATH_MAX, "%s/logrotate_temp.XXXXXX", ourDirName(fileName));
-+    umask_value = umask(0000);
-+    fd = mkostemp(template, (flags | O_EXCL | O_NOFOLLOW));
-+    umask(umask_value);
- 
-     if (fd < 0) {
--	message(MESS_ERROR, "error creating output file %s: %s\n",
--		fileName, strerror(errno));
-+	message(MESS_ERROR, "error creating unique temp file: %s\n",
-+		strerror(errno));
- 	return -1;
-     }
-     if (fchmod(fd, (S_IRUSR | S_IWUSR) & sb->st_mode)) {
-@@ -430,6 +433,13 @@
- 		}
- 	}
- 
-+    if (rename(template, fileName)) {
-+        message(MESS_ERROR, "error renaming temp file to %s: %s\n",
-+        fileName, strerror(errno));
-+        close(fd);
-+        return -1;
-+    }
-+
-     return fd;
- }
- 
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch b/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch
deleted file mode 100644
index 6e329d6149f3..000000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2015-06-28 13:54:18.309999889 +0200
-+++ b/config.c	2015-06-28 13:56:49.599999885 +0200
-@@ -1,6 +1,6 @@
- #include "queue.h"
- /* Alloca is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -24,6 +24,10 @@
- #include <fnmatch.h>
- #include <sys/mman.h>
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c	2015-04-03 09:39:35.000000000 +0200
-+++ b/logrotate.c	2015-06-28 13:57:18.449999884 +0200
-@@ -1,6 +1,6 @@
- #include "queue.h"
- /* alloca() is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -26,6 +26,10 @@
- #include <limits.h>
- #endif
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
-diff -Nuar a/Makefile b/Makefile
---- a/Makefile	2015-04-03 09:39:35.000000000 +0200
-+++ b/Makefile	2015-06-28 13:58:05.729999883 +0200
-@@ -22,7 +22,9 @@
- 
- ifeq ($(WITH_ACL),yes)
- CFLAGS += -DWITH_ACL
-+ifneq ($(OS_NAME),FreeBSD)
- LOADLIBES += -lacl
-+endif
- # See pretest
- TEST_ACL=1
- else
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch
deleted file mode 100644
index 31d9298779c2..000000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2015-04-03 09:39:35.000000000 +0200
-+++ b/config.c	2015-06-28 13:54:18.309999889 +0200
-@@ -359,7 +359,10 @@
- 	char *pattern;
- 
- 	/* Check if fname is '.' or '..'; if so, return false */
--	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
-+	/* Don't include 'hidden' files either; this breaks Gentoo 
-+	   portage config file management http://bugs.gentoo.org/87683 */
-+	if (fname[0] == '.')
-+
- 		return 0;
- 
- 	/* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch
deleted file mode 100644
index 7983943ca89b..000000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2015-06-28 13:56:49.599999885 +0200
-+++ b/config.c	2015-06-28 13:59:34.799999880 +0200
-@@ -49,39 +49,6 @@
- #include "asprintf.c"
- #endif
-
--#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
--#include <stdarg.h>
--
--int asprintf(char **string_ptr, const char *format, ...)
--{
--	va_list arg;
--	char *str;
--	int size;
--	int rv;
--
--	va_start(arg, format);
--	size = vsnprintf(NULL, 0, format, arg);
--	size++;
--	va_start(arg, format);
--	str = malloc(size);
--	if (str == NULL) {
--		va_end(arg);
--		/*
--		 * Strictly speaking, GNU asprintf doesn't do this,
--		 * but the caller isn't checking the return value.
--		 */
--		fprintf(stderr, "failed to allocate memory\\n");
--		exit(1);
--	}
--	rv = vsnprintf(str, size, format, arg);
--	va_end(arg);
--
--	*string_ptr = str;
--	return (rv);
--}
--
--#endif
--
- #if !defined(strndup)
- char *strndup(const char *s, size_t n)
- {
-diff -Nuar a/logrotate.h b/logrotate.h
---- a/logrotate.h	2015-04-03 09:39:35.000000000 +0200
-+++ b/logrotate.h	2015-06-28 13:59:47.429999880 +0200
-@@ -80,8 +80,5 @@
- extern int debug;
- 
- int readAllConfigPaths(const char **paths);
--#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
--int asprintf(char **string_ptr, const char *format, ...);
--#endif
- 
- #endif
diff --git a/app-admin/logrotate/logrotate-3.15.1.ebuild b/app-admin/logrotate/logrotate-3.15.1.ebuild
new file mode 100644
index 000000000000..2be55d79dadf
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.15.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+	>=dev-libs/popt-1.5
+	selinux? ( sys-libs/libselinux )
+	acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+	>=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch"
+)
+
+src_prepare() {
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+	default
+}
+
+src_configure() {
+	econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	insinto /usr
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+	move_old_state_file
+	elog "If you are running systemd you might need to run:"
+	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+	elog "in order to create the new location of the logrotate state file"
+	elog
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs. See man logrotate for details."
+	fi
+}
diff --git a/app-admin/logrotate/logrotate-3.9.1.ebuild b/app-admin/logrotate/logrotate-3.9.1.ebuild
deleted file mode 100644
index 060e11be388f..000000000000
--- a/app-admin/logrotate/logrotate-3.9.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl +cron selinux"
-
-CDEPEND="
-	>=dev-libs/popt-1.5
-	selinux? (
-		sys-libs/libselinux
-	)
-	acl? ( virtual/acl )"
-
-DEPEND="${CDEPEND}
-	>=sys-apps/sed-4"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-logrotate )
-	cron? ( virtual/cron )"
-
-install_cron_file() {
-	exeinto /etc/cron.daily
-	newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-ignore-hidden.patch \
-		"${FILESDIR}"/${P}-fbsd.patch \
-		"${FILESDIR}"/${P}-noasprintf.patch \
-		"${FILESDIR}"/${P}-atomic-create.patch \
-		"${FILESDIR}"/${P}-Werror.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with acl) $(use_with selinux)
-}
-
-src_compile() {
-	emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	insinto /usr
-	dosbin logrotate
-	doman logrotate.8
-	dodoc CHANGES examples/logrotate*
-
-	insinto /etc
-	doins "${FILESDIR}"/logrotate.conf
-
-	use cron && install_cron_file
-
-	keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you wish to have logrotate e-mail you updates, please"
-		elog "emerge virtual/mailx and configure logrotate in"
-		elog "/etc/logrotate.conf appropriately"
-		elog
-		elog "Additionally, /etc/logrotate.conf may need to be modified"
-		elog "for your particular needs.  See man logrotate for details."
-	fi
-}
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 8858bc5ae101..3621005963cf 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -16,6 +16,6 @@ DIST logstash-oss-6.8.1.tar.gz 171901409 BLAKE2B bff3b96bcf3f53450e1279f633788af
 DIST logstash-oss-7.2.0.tar.gz 171128040 BLAKE2B f0f3d4f0d5228918d8435c521d10ff5070e23561c25ce28e8d58997d499a7c7697354c1fb1cb70bf2bd832ad50c04afb00cbde4b3053f9f24d2619f3fbfffbdf SHA512 24120740bc727b6da50b865bb85bf61f013a38b6679d679ecc75a73c69766a5133fd47ad99fa0220d5dc6cceb506fbde206787adcee31483288c68c228edd1fd
 EBUILD logstash-bin-5.6.15.ebuild 2195 BLAKE2B 1ef9e7d8a825109a85e850c2e9b971c3b16d435f1a0e3dce40e18b48f64c5b83a3cedd0d85a15d422a3accccb0ffcbe79b2a0812fda24c04fd0f07a0e37b9436 SHA512 6026cb3d76dbab56a4a495b1bc3abea2d0c4c731261047e76acf792840f3deb1fdd0fd181b5b6a599f2056f22b76920e7844f1e76516919c7404c1d10e1b7259
 EBUILD logstash-bin-6.6.1.ebuild 2185 BLAKE2B c0ca9f44ca02db43d7b6b414f866f5d7a1eed19c44f45874a1df6a9171c0327b971878bcf74bb4028903f23bd2521464bac662cecd89bbacfcc32d6e88d4b4b0 SHA512 0088d7e185bbf58af1c4880aaac299f3a4a93ee1ecd3092aa9548d60767faaa963bbcc422ff40e8b8905b843da25d73dbb0b75bfffa19261306668fd9e414c43
-EBUILD logstash-bin-6.8.1.ebuild 2110 BLAKE2B 960d4716062a128de41b79d891a836a77f88ef27f6d5b2efddeb01bdaaa03dc517e01bfc9fea3ccba1135274915839733a904ab38687d4e7c72ff48304d81df8 SHA512 3c5f628adc74640347f458e86a1f82ec485730fb484685b21d76a1411f971ce0021a95cc1c5982f1defd896bb9778cd006c947e9022bb01f10690fc07ea590e3
-EBUILD logstash-bin-7.2.0.ebuild 2106 BLAKE2B 7e872a2d5eef819528109b77bfe27f7d80702e3567eda0e4c107e3db388b7a373c9edeeaa5720252d6951bb0f317352bc339303ccc4963cfe215e5de3f20ae6a SHA512 a132cae1a40ef430208f2e2567d6208ca65db8fbb0f9453e4dcbc274ef12cf925cf9287f964416266ba5749d787809134a7c9764734c5ba87331c814c71a2b76
+EBUILD logstash-bin-6.8.1.ebuild 2106 BLAKE2B 8b04abf9b4395e60882de2d5c482bb3ee17f1ec2446a5d2c24feda677025c0662580c277334d2f7eeb0a5b61fe52bc1513a79b1a55f85d33ebbd75829307b86f SHA512 c56a7c1c3eb973cbaf895206270f80a3ed3c9ccec37c9102b5cee1f6477a1952b6a93310f41046e12d021580862dd96fb1b658798126f00535abddb4d738853f
+EBUILD logstash-bin-7.2.0.ebuild 2102 BLAKE2B 4859b52ecbe2d3cb0fa31768cbfcfe59ff4ab1ccfb70ed1b0b30edf33415a7107a246ab902fc3c42897804482dd91a25bd8da6af29374c424bc53e700ed1b797 SHA512 3e346deb2bccc47fa55d2de9afbc6bea15f28d235e93fae323620a24a70aa6671072ab90f778d3157ba74c860056a1f76d5ad0ac678b6d658bd49ffbb8fdc3dc
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild
index 08373cbcbd51..05b243d87853 100644
--- a/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild
@@ -66,8 +66,8 @@ pkg_postinst() {
 
 	elog
 	elog "Sample configuration:"
-	elog "${EROOT%/}/usr/share/${MY_PN}"
+	elog "${EROOT}/usr/share/${MY_PN}"
 	elog
 	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
+	elog "${EROOT}/etc/logstash/conf.d/*.conf"
 }
diff --git a/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild
index 8a0ac16580b6..16a1b994f632 100644
--- a/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild
@@ -66,8 +66,8 @@ pkg_postinst() {
 
 	elog
 	elog "Sample configuration:"
-	elog "${EROOT%/}/usr/share/${MY_PN}"
+	elog "${EROOT}/usr/share/${MY_PN}"
 	elog
 	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
+	elog "${EROOT}/etc/logstash/conf.d/*.conf"
 }
diff --git a/app-admin/pass-otp/Manifest b/app-admin/pass-otp/Manifest
index b834692f3070..43f553305be1 100644
--- a/app-admin/pass-otp/Manifest
+++ b/app-admin/pass-otp/Manifest
@@ -1,3 +1,3 @@
 DIST pass-otp-1.2.0.tar.gz 46789 BLAKE2B 373b1ddfb4cfae07e9e58bdad1c9c73ca6c6f53fc140ccda21527ad2ae237d3402bc52e95a180811263ef1a29f5c9da7db0063178b19a85b1dafc3d20e22996d SHA512 3d1417462998750ef1580169ed0e4b721b5f430cd86a678d1b6bc7b2ac123879902f7d22c28dc21e8a171ec80dfc51b6465d0dcc78cb009eb731651f2cb152f5
-EBUILD pass-otp-1.2.0.ebuild 644 BLAKE2B 654311acef1502d88773782670fb3217fb29fb1cadc6d88eb77a71e5157dff136cf94da3bd1854723aea203cd5c47829755c19f8ec94197755d13581b8b68402 SHA512 df41f91e005673a3e960af58a9d1d0128213aabb5b6577ff2cd34d0ab72ef232bc06b780e8c85c4a0d38c95e8ec8adb57e6eb3507cf70f3d38c911b024a3b9f8
+EBUILD pass-otp-1.2.0.ebuild 642 BLAKE2B 3b9f99c333dab4b9286d152ea4af3cf9fa0379f45f9622466db7eae6a19f405fd069e647b338e3db2ccc46d710efc57d9df813029fbce6e1b8ccd8d008fc934e SHA512 8234117cae26405b9d6354677e8f87828076210287f41f2a8364c2bc7293955d44f19fce2da0d934f1d5ad945274c75263b18f498d88388c33adea1bfc4401f7
 MISC metadata.xml 661 BLAKE2B 34d62c5a12f51ddde97f0cc24ae0d6633844e847e9cfa81ffd4191b489f6fed7fc42a6e9f8ca75119f31f02306fbe958c68f220466d222db498fb6cff0e74a8b SHA512 071e5ad337d3e41afe2c6d4feb26f02c5f1105e5f51899af2f5021782c9a836b52e0575d8343bc3532fa227d2b385f248d72be46cc395233d7c77325beefea6e
diff --git a/app-admin/pass-otp/pass-otp-1.2.0.ebuild b/app-admin/pass-otp/pass-otp-1.2.0.ebuild
index b93a38c51e23..07731fc77c09 100644
--- a/app-admin/pass-otp/pass-otp-1.2.0.ebuild
+++ b/app-admin/pass-otp/pass-otp-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tadfisher/pass-otp/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="qrcode test"
 
 DEPEND="test? ( dev-tcltk/expect:* )"
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 20e454376ad3..34a30d23e995 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,13 +1,13 @@
 AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
 AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
-DIST puppet-agent_6.4.2-1stretch_amd64.deb 18776024 BLAKE2B d8fd52357abb9649d74c9b7e54eb0f599cc2b6b1cbe8a4bdd3bd21c69904379dcda2fdea4e642d3f86bef846d1bdfb14eb8c3daed50958ad3add46bde96fe5d2 SHA512 b1bdbcb1cb87bbf4391073b0596d759e1386bd5b93046d25be112f1ddad6a0d4da162116dc9f85908de67bfd3d956a1c418faf39a85c3ed0d02f9891d4d9906c
-DIST puppet-agent_6.4.2-1stretch_i386.deb 19250972 BLAKE2B 8424047586f7747daf24901f7ba134bfcd1fc4db094fd458f4298251880b0446221575cc463c511a32a6f7cf4c635c95b6132631640b5091e48b1e7cec67b844 SHA512 0041b1e3ff1401b21f7d9ab3b3aee66d76e30acd4748571ff3ff595d7006008e0d9d3f4c28db85cccece0cf08595cf4a3342353f5b18ea3e02ae02a094e42e41
 DIST puppet-agent_6.6.0-1stretch_amd64.deb 19177382 BLAKE2B c8034e4a943394da7fd97756b3dfb59897f3d787a8f49743a4c42ed47db4411f6d0e125cf6984728a108e5070cc8e42ca0a203d2afdcce99e08ae38a6ebb9293 SHA512 f0d129b357feb6e5d05c080437910e119bbce0e97e36927c2f97d3d7fb8f54a0eb1503a74ffec3cef7fd29785fe97ffd53f04a4be6a35b558ee278af8871289b
 DIST puppet-agent_6.6.0-1stretch_i386.deb 19443284 BLAKE2B c017abc3166b3cb04a98c511b5ab05dd7076906a38edd8ee919848c130ae5b1cb6c7542b6c6c3da267fa801e152ad963c84293083c709dd769185f943a4bebcb SHA512 adadc3201dae261f2000282b67b8c4735eeb588c4c6c5dcbcde2e655772bebb1c343611607d84ba1b019279480445dc44cd4e3cc3d64e89b70e93b85a37678d5
 DIST puppet-agent_6.7.2-1stretch_amd64.deb 19184682 BLAKE2B 6078c1b21f0e737881d949cfaf052571b40df450e53724696e2738141da30e59da7abf03ce00285ab77fd4ac52291ab6e42da373420807499f37b75c872fa83e SHA512 1c464448b1478397af7b806f8bfcaee0378af9d4b6bfa5a73e8245064329b1b49136107c5fcbaea0ef6cd4e1daf840d1ba331e798b2cd255ead54969520315c9
 DIST puppet-agent_6.7.2-1stretch_i386.deb 19452604 BLAKE2B 1915e7b7085db6cb87980a98a7cb85881331719e2af98b07f8461514a0296b3cf5181eb88f78893055a0fa09fc2ffce0e81e866db27abcecf9d8f745e329311c SHA512 8d89735601c9764e207eef77f5d42e836ee9d7c0c0f2856e0f293919cce52e7a42fc28fca42bd0e0bed760063aae527007ef7ce25503ce05fcfd495a44243ee3
-EBUILD puppet-agent-6.4.2.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
+DIST puppet-agent_6.8.0-1stretch_amd64.deb 19184708 BLAKE2B ac961857784eaaa55604285cf305dac437007628ea5baa3c3ae9a8a345fcb8cf2b20820bd80cc2c96afb77cb03c4d2779b17b1183c9bc9461b56860d2179f448 SHA512 707146f71b21df4b89244df7b786f481136cfe7b0cabf20aa0d4784aca547ba85c75d13309b77c853b9e034b8271f350b30bc5358010d90b7573e3fdb63c31b6
+DIST puppet-agent_6.8.0-1stretch_i386.deb 19478404 BLAKE2B 0b9d76bb3d745ca42e489e16a133d684aa0e485941d59c6773c447f5fc79be7a964f0a2ff9e4c334a47b7d2ffc0264bd49e4f7806cbc2e72e037da1c9e385d51 SHA512 f8bc962b32abbaf070b81245b7488b4fc131d5a9e3ec94ac97038f5e9c942c70a493e61e13190fe2837eb898518724bb5f360b37531003dab37606436d66219b
 EBUILD puppet-agent-6.6.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
-EBUILD puppet-agent-6.7.2.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
+EBUILD puppet-agent-6.7.2.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
+EBUILD puppet-agent-6.8.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.4.2.ebuild b/app-admin/puppet-agent/puppet-agent-6.4.2.ebuild
deleted file mode 100644
index c648209a4a7e..000000000000
--- a/app-admin/puppet-agent/puppet-agent-6.4.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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-agent/puppet-agent-6.7.2.ebuild b/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild
index a72df734d6b1..c648209a4a7e 100644
--- a/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet-agent/puppet-agent-6.8.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.8.0.ebuild
new file mode 100644
index 000000000000..a72df734d6b1
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-6.8.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 162d67502bf5..39b177cb8b76 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -13,13 +13,13 @@ AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
 DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397dd0a4aa26f5d0fa9ffa94477a5cc59b3724ab9ae3ee2e7e9230881676582c328c804ce9138dc484b9bd92e0ec3 SHA512 861100c02e0b8a5bb232d266bcd5e54b0e32cf26954ea37f276690aa3159ffdb28195ab8691df61ee0098300d226ea1d369dbdff8aae69101c2bbe6068ede8b1
 DIST puppet-5.5.16.tar.gz 3084466 BLAKE2B f3e2f12331b4794b90a81a4f80e626fcd3d5252b7cbdacc1d6243faa557540d3a68e5e23b7b5c3e4f4286774e9a9198e59fb15d7d7c41d7193754ed5c80dd624 SHA512 7d9e533e352a22e347ac6467094c4bdbde893c2503f47b4a2d175fd6e759e6662991efdd1a0a83d9495d22f28da4ae7a30cc771c5d90b8252c4618bd8837833a
-DIST puppet-6.4.2.tar.gz 2891159 BLAKE2B dfd8e5d9935d54272096fac66a037b8eab75dedc42caf18bafe29738e749a66869ad2e741753e8b38d872e21b1a261f2b4017c54faa57043754d619cf27652ed SHA512 7ec2746ef2a021d1cc3e3076840a9f1195fe51ba591cf2907e542b3f450cb1f4002fa3c958aee966c5976245073ba3cfacc9fd2a653d1d823720b33984aff911
 DIST puppet-6.6.0.tar.gz 2898687 BLAKE2B 67370b191985f75f783d795d7ef38df53fbf28efa8ab79ae309dba985f4ba296d2862fb366b68a46d03f526c3f27c51b1e1cefcccbaa96f6694dc888a7adcc2c SHA512 e7e7367565d12c208654bd353112542fb84b736f262dc86adb940e02a4e34d473e7bb5f084e0caa5fab01be4ef479ad2baa3e751d4d86ee447cf960f400413e5
 DIST puppet-6.7.2.tar.gz 2907345 BLAKE2B bbb0f789ae64b5039e5b1bd2ce985e89ba693d33352baee7a1d11df7f314663aa3606a73d42d6b20042f81ee405a72cd17b9cf8f3c3cb257869e982f84cfd552 SHA512 6ebcaff30bda27fc17870b991287d620d455db8cf9a41c59833efc2a7541d3622228a7278689eb0494d0f6328cd334764f21ffe8700a567696e05398a5c16b7d
+DIST puppet-6.8.0.tar.gz 2906582 BLAKE2B 2dd2f9eb203aa951e0ea9639efa20aac3edb063b4bd68dd0b05a07fc2a399c4b59b3b87a1cb573096c5042920080623b9afb9c4d863b6249664edcc291cd1787 SHA512 c8446529e706dab7fd156b5bbca638f1722b07a638f626df2002a4ad218ec5e448f533395a6eed613b31ebbacea56539e903c040998d4110c8a362f2ead7f43b
 EBUILD puppet-4.10.12.ebuild 5620 BLAKE2B 75fed43f7044fef014b1c9297066e07a5ef624fd187d141475e5fbaf69aab50494e783a16b212f3063cfaa059bec310b9771ccfa88d3f8ddcfc5458a75d2ba22 SHA512 8649b6811f330733ba25602e35e13bbd5be094c8f395d5f6c7a859662d831a579b9b3ad2a44b1ed9ea60882c32eb89a261f5e36977d79a2e9a88d5f12959a3cd
 EBUILD puppet-5.5.14.ebuild 3822 BLAKE2B b639a7bd6b1a2a0229271a2c00ae246e5cd219b91510f1fb1b5bcc4668d2f81c631233329628b78240354ae884ca9e4de02287896b326eef1220c81eb3d4e173 SHA512 1043b71e29082c1020a4c67814394dc70707c3f299afadb035bb2e15e4425a38dfa76b2323f4ad31b7142c1494cb05616ed28f0cf8f46b88760fcc53c3e734a5
 EBUILD puppet-5.5.16.ebuild 3824 BLAKE2B 0501c0a04cea8cd762732a7b6728833c99c828d79c39c18dc738e2c7cb063a8f14f997108a4d3863fc0abfbedf9546dd1541f01cbbb4ea3fdcb723a49fe6ec39 SHA512 baaadc5c82ea91dab0dbcf93a5b836248183777db978e0ec0621183b695191a19b6c7fdad892d0cec05c4426c64c949eadc4dce89f08cdea8b7b6f6913d01917
-EBUILD puppet-6.4.2.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
 EBUILD puppet-6.6.0.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
-EBUILD puppet-6.7.2.ebuild 3654 BLAKE2B f29afbb842ad182df92104a03d02770c607f54ba228a694659b09d83c512bf9d7f269da42257e3ff92e68cd77e98da9f1b1ab317e791b97d338a3e30cdb3998d SHA512 4a197ad3b8114a4e7c685ff7b0ca21411645f542f1f3a948382f2755db126b6ad0cb61dc37f938a5c38a0c1ef27c5df4c91ea043ff2a3813f61406e63da4a84d
+EBUILD puppet-6.7.2.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
+EBUILD puppet-6.8.0.ebuild 3654 BLAKE2B f29afbb842ad182df92104a03d02770c607f54ba228a694659b09d83c512bf9d7f269da42257e3ff92e68cd77e98da9f1b1ab317e791b97d338a3e30cdb3998d SHA512 4a197ad3b8114a4e7c685ff7b0ca21411645f542f1f3a948382f2755db126b6ad0cb61dc37f938a5c38a0c1ef27c5df4c91ea043ff2a3813f61406e63da4a84d
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-6.4.2.ebuild b/app-admin/puppet/puppet-6.4.2.ebuild
deleted file mode 100644
index eeefd4e8c63d..000000000000
--- a/app-admin/puppet/puppet-6.4.2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-6.4.1.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppet/puppet-6.7.2.ebuild b/app-admin/puppet/puppet-6.7.2.ebuild
index 0038f1ebf433..eeefd4e8c63d 100644
--- a/app-admin/puppet/puppet-6.7.2.ebuild
+++ b/app-admin/puppet/puppet-6.7.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-6.8.0.ebuild b/app-admin/puppet/puppet-6.8.0.ebuild
new file mode 100644
index 000000000000..0038f1ebf433
--- /dev/null
+++ b/app-admin/puppet/puppet-6.8.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="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-6.4.1.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 218e68a84da7..d3cd3f84347f 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,9 +1,9 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-6.3.2.tar.gz 41707817 BLAKE2B 480737af3abc862e90a7075011327ce3821a5d9460c785602c105ec7accc82f2ea712ae488c585226126e88f817cbb1acda7fa09793b7508aa38cc47e1c76ab0 SHA512 e2a3ce73c976cbbfa6acc62612187478cf5ecc9d514ff4866a74e2c6364979f17c3daeba0f03a01e7fc3eeb1ca84a3c886fd5eed07d2a9fbaa5fd9f7c9d577af
 DIST puppetdb-6.3.4.tar.gz 41716289 BLAKE2B c2f0c074229340234e8ce146d6d711f0311f4a4d6c091ef497a376a5cca02f7bc5a85fc63555f7408f16dc60784266ba126149fb27a9e0bf0592d7ee314e4b4a SHA512 9da3707f0ecf1b7664dbf44dbc6dda79adce6928298aa8e263bb134bfccaf2403245ed0176f8929583f5631ba3927f99d6d06233eca07720d0fd174da33e4990
 DIST puppetdb-6.4.0.tar.gz 41720668 BLAKE2B a4637750c553eed8ee5bdd46212a7455fe1d59015aa78fe01f6fa9ee2b4a98ec50a2a8b551f65d4bc6965b2a969f559c53f5a6324a8e48983a1d027948387ce7 SHA512 c49afce1661ed284280e89ed9dbc2406a657e5f2cdbc501acf50900d431b58a341f1541789ea4ffe9109e8d30faf47eb85573a589426c40ad50597a7d81b5552
-EBUILD puppetdb-6.3.2.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
+DIST puppetdb-6.5.0.tar.gz 41768030 BLAKE2B 2a52239dabb5c026f4d00ee2942e3128ce50f1de23aa5ff5d53f2020237b54867b48727e774ecc27f5f18bd1617b43fcf30fbd3b03a730ca60d5bab7296e3f9c SHA512 8aee40101a17e22ef5b9b7b965ffe8d8a9b8dfaa787721b3e6a5e7363b98e0c52dc0583216a058540618a6a980cf80f138fa6b358a9daac518abd50981910cf5
 EBUILD puppetdb-6.3.4.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
-EBUILD puppetdb-6.4.0.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
+EBUILD puppetdb-6.4.0.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
+EBUILD puppetdb-6.5.0.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.3.2.ebuild b/app-admin/puppetdb/puppetdb-6.3.2.ebuild
deleted file mode 100644
index 77d1c1ca9cc4..000000000000
--- a/app-admin/puppetdb/puppetdb-6.3.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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/puppetdb/puppetdb-6.4.0.ebuild b/app-admin/puppetdb/puppetdb-6.4.0.ebuild
index 616793cb4123..77d1c1ca9cc4 100644
--- a/app-admin/puppetdb/puppetdb-6.4.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.4.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+=""
diff --git a/app-admin/puppetdb/puppetdb-6.5.0.ebuild b/app-admin/puppetdb/puppetdb-6.5.0.ebuild
new file mode 100644
index 000000000000..616793cb4123
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-6.5.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 9e1d0952ffa8..42ce513d0f1f 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,8 +1,6 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
-DIST puppetserver-6.3.0.tar.gz 75698674 BLAKE2B 4eb88b15c936f8a66c5447e5761cc35772632420ca74de17f06453c9645f6f4d6483ec6a850810401efddf07f40710bd9563e78f5f870faaa85c0c6b2e450fa1 SHA512 a3c3e9c00e3dae274a2139a166c121d1d9b1dde8ad640e70d68433eee53a9bcf7ad8ba53d6e355ee1de93a522f8e0169eb80f52fc438ce6a76ebcd007398108b
 DIST puppetserver-6.4.0.tar.gz 75721867 BLAKE2B 299d73bab6f76464fc7b2e3b5a5b63e4b0d6f11752990d2926db247dc5d6aa475f5de571640ae38f22da75505153ce0f83e7a952bd0d037f4d3d12fd37c8f269 SHA512 cc9ac9a163b1ee7488b1afb95457cea4ae9da205d4cd91dd70c8cc995fad32829b5c4d9de8baa3ca325ac235bcaee2dca78ea9cd50bc9dfe11f2837f64587a11
 DIST puppetserver-6.5.0.tar.gz 76080713 BLAKE2B 0562128001a24eae6cec071a366e16ab3ce5b0babbe50330ecddd13ab3dbfd35d6cb23634770e4bd7904cd231752ce923d4af8dc42d783cc137f300efcb05fb2 SHA512 d871f3817c370ddd08e8d791deb1a30aa50ab0d801192ebfb5ef225d8dce21885175fe4e9911287437b687b2bcbf5a098d8b9511b24bd05fdf4854575a686cfe
-EBUILD puppetserver-6.3.0.ebuild 5354 BLAKE2B c75b4c97ebd41fadf589e7ef752291425935af7d1f1528401f7dd1b2b670cc865570b8a610f1901eba1037bdaebb2d8dd2998380e001c046bcf54fe35b02153a SHA512 613533ffbcc1925f2ff040880d82f2a20c231d66697a49d6fc5fbf5a17528d3b3d1285918b83bf8ef4b4ee729656be610bb30f0bbefa827376f57da1fbd34950
 EBUILD puppetserver-6.4.0.ebuild 5370 BLAKE2B b3b8bbba45305b658c94fcc43c9e2d11b854e80f536e5e3c3afc7c4182f954b9491f47eb83529dbd00a894b793c9a0cf660ed7b52051b840b24e7fedec97a6b2 SHA512 31b6e681af9dd22d9388a447237289e3e48d79d2e7e1ba79d10e70084b99a9d7cf99fdd19b58a210f990ed1b202af2367a0e0911f8579a876ff284413f6051ce
-EBUILD puppetserver-6.5.0.ebuild 5372 BLAKE2B a4a00a13309207dc0cfc8f584bab29add3a2dd21c83cc1ca165e55631002fdb645c036665f55f580c27776dd4ac67dc993749a01d9938189442020660ab70598 SHA512 cc4934c876b59eb4eed05e4bbde2c6973623236c5fe243a4b6245aff2816477cbe9f168c89dfb9530ef5a2cd1f67410c8c532e5c8b6b29426ac2c6f18b189c19
+EBUILD puppetserver-6.5.0.ebuild 5370 BLAKE2B b3b8bbba45305b658c94fcc43c9e2d11b854e80f536e5e3c3afc7c4182f954b9491f47eb83529dbd00a894b793c9a0cf660ed7b52051b840b24e7fedec97a6b2 SHA512 31b6e681af9dd22d9388a447237289e3e48d79d2e7e1ba79d10e70084b99a9d7cf99fdd19b58a210f990ed1b202af2367a0e0911f8579a876ff284413f6051ce
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.3.0.ebuild b/app-admin/puppetserver/puppetserver-6.3.0.ebuild
deleted file mode 100644
index 39165a39524b..000000000000
--- a/app-admin/puppetserver/puppetserver-6.3.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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/puppetserver/puppetserver-6.5.0.ebuild b/app-admin/puppetserver/puppetserver-6.5.0.ebuild
index e064d2554eb5..9200fa82fd3f 100644
--- a/app-admin/puppetserver/puppetserver-6.5.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.5.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index 7f5252a5eb99..2e50bdb376af 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -1,7 +1,4 @@
-AUX 2.06-special-char.patch 252 BLAKE2B d5ca276a37d144f09888d08fcdee22033fb005cc3c2d5535b0639bc40ec00422770fb1944cd8539b0645101b2f68dc5b61df47a1e610ec8fe215289ce4ae2db6 SHA512 67b2fe0d146b395445cc2cfd1c7721132f3986e964edab41582f0061fc3c9ff6eee8833628230a58a9a9f4a30ad95c7b685082982d62d0e240430072baaea2b9
 AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d
-DIST pwgen-2.07.tar.gz 53513 BLAKE2B c5d3a548ef1fab3b246b7ad9ffdc18d572136b3addd2a23e375e45d82af0f45f0e19e747d20d4e4cf7138f7121890460e82a85ffe17c451160c6c0f08bed4422 SHA512 9c56ff04ca2f6f60126608a25f395ddbc4a3ac59585a6f233c87d993b6388e30b1867d43a6bc5b0f9f1f4064b12ea450eac4f7c9ac2844707a99fad1bbd2664d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
-EBUILD pwgen-2.07.ebuild 699 BLAKE2B e85ba0d3f6f4f432a2df5de6d8193c63cdf3a13ca6502ffc3378a9cfbf95c0d5ae5f195169ca7360ef531630fe9f913a28a768703ceea3cd2ab2fae4061ed934 SHA512 076cc779fff3df62668cce9fcfd58a98ce0f30fb535f1452f96233c96420f3893bb61f92d370cfded1dc49e2e32d89ba059a071db93d67d78d2ec12a65c13bc3
 EBUILD pwgen-2.08.ebuild 616 BLAKE2B 6f71677b2e4942cd00b3675b10eaa73c22047642afea5034ad3dc3fbf73811188b274562011a94437863f448b426eff3907dcc1838fa6dd1dba66fcdffb800fc SHA512 20045fc69973fc91523c83ae724ec54b5089a533daf9eed62d8736ffde06c4f3fc1537998c5cb56f3031420df165662d404af4b6c8f5f0cb9461969c744a568a
 MISC metadata.xml 765 BLAKE2B 133e60da10e57e53ea3013d7615aae83d8d38bf18b8e92c1a081d43524551180e2654233e0a2b2207dd11f31114cd221f33fa5eb4c1486c87ea0bd031c613f2f SHA512 5a6e7e1b7e8fc44e9f39e5d0f349a27360d94778522131c749748690fd6db5278a5a9354242b2030bdfc8db7890e340621a1d939364bd40d3d96b018cc6e443f
diff --git a/app-admin/pwgen/files/2.06-special-char.patch b/app-admin/pwgen/files/2.06-special-char.patch
deleted file mode 100644
index 3d014fa4bf11..000000000000
--- a/app-admin/pwgen/files/2.06-special-char.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pwgen.c
-+++ b/pwgen.c
-@@ -138,7 +138,7 @@ int main(int argc, char **argv)
- 			break;
- 		case 's':
- 			pwgen = pw_rand;
--			pwgen_flags = PW_DIGITS | PW_UPPERS;
-+			pwgen_flags |= PW_DIGITS | PW_UPPERS;
- 			break;
- 		case 'C':
- 			do_columns = 1;
diff --git a/app-admin/pwgen/pwgen-2.07.ebuild b/app-admin/pwgen/pwgen-2.07.ebuild
deleted file mode 100644
index 9df81de14409..000000000000
--- a/app-admin/pwgen/pwgen-2.07.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 eutils
-
-DESCRIPTION="Password Generator"
-HOMEPAGE="https://sourceforge.net/projects/pwgen/"
-SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="livecd"
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.06-special-char.patch
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/etc/pwgen
-}
-
-src_install() {
-	default
-	use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen
-}
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 5646bca12714..6ea0d7557a37 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,5 +1,7 @@
 DIST r10k-3.2.0.gem 206336 BLAKE2B badc840ec7e6793daf205f1352899fa909e9a922a353a52841809dc80fd03758a865e0cb8210e58bb5c25968207d537b3f19c1903fbb519c50b6af2dd27eb5fb SHA512 7ea00ec28ba631877d33fa8b00b25e1c69346b787499ec7b26118c16acecf6bd39fcdc4618af016ebf5b62850b6d984510f7e9153dd4e99771def299b7d0703d
 DIST r10k-3.3.0.gem 206848 BLAKE2B 92fedb9871c6e22df3a3f8c4cf18feac1bf3ef51e2e67b3001c811bc81397eda71bc9da94ef860d6e39b989fd1c1a3b9dae402142496f17c4427ff2de62188fd SHA512 674c5c386885dd1476264d8bc047ddad0411b6344350662021ede8a5352e95fd50a72f62127b00bf6b2bc8e6b3835b017128788707610d510a64eee13b9f4d4f
+DIST r10k-3.3.1.gem 208384 BLAKE2B 81e7de3d2fabd038240478ab7ace4fba181a4370544f964b438a6b96de34a741f653aff018ece21453b119ae6b12f06934cc82be8a6b78cd5a72277195a5fe81 SHA512 20f9c92fbabed82521d452f339d9d2fd8cc438cac1cc11385a6e2874a5d55fe6425ddfcd281d8e63ee043adec5fbbfba0c37ef0c6e15d498c64ba550740ccd6e
 EBUILD r10k-3.2.0.ebuild 933 BLAKE2B 6e7df53cab2a25bb5bf6fa4218cd670b742a68aeeb5402dd09d1f34861d0596250b915965a06b4cc8c157009d671046c00758cb576223d108e6b8d40067a23a6 SHA512 66c0c7e12e9f934c9e5f3024021e31ef4dce674f3eb27763bdc60413c9ef79dd101ed5cdcbdeec6cab9332fcbb60454754aea7c05f251b23327fef6f227eb7c8
 EBUILD r10k-3.3.0.ebuild 941 BLAKE2B d66e537eb1478ad0acf777d35efde0ecdad4594c5032ce01cfcb873eecef8e9fe65f237a0465ecc2f2368fb3019e728f54c7eebcfd06f461362f65ebc9cceb4f SHA512 eee05605d5294656c76a5207b25ced88a7162cfc15308660bb51fd9d22d13ccea24c288d21d540b8da108bcfe18e6539c589f0f2d3dd420ec1050850d7f19365
+EBUILD r10k-3.3.1.ebuild 916 BLAKE2B db2bdfab6af08c85fafdc36a9cf45e340ca0a65a0d8917c793d020e23d5773d77e71b40926be7e03a7161e4b0c8cbf80452ed928bd198594cc26fa55616d5158 SHA512 18d544b67913d9f0cb8f5cd0ac906b7ca482cb9bfa926b8feb98bef68447ba7450bc52ad00a2ca60289ef93a45340e8d8f96771e5647004b816fbd871e69ad4d
 MISC metadata.xml 582 BLAKE2B e3b514385b7b851b3ce037de51024108005224c75fba470db28fe6e4d6b3632ace21a8e829198e0b22d1ba0e76b1a5c01df10426ea497ec3b00e20e578608d2d SHA512 fb8913a9f806ac0b2035dc788ee78536fff96ffb635454f668d7836d8ba849fea158e628da12743c1844b658961866b3d64e8faf700c7e373065045175785536
diff --git a/app-admin/r10k/r10k-3.3.1.ebuild b/app-admin/r10k/r10k-3.3.1.ebuild
new file mode 100644
index 000000000000..1826c94b4704
--- /dev/null
+++ b/app-admin/r10k/r10k-3.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git"
+
+ruby_add_rdepend "
+	~dev-ruby/colored-1.2
+	~dev-ruby/cri-2.15.6
+	>=dev-ruby/gettext-setup-0.24:0
+	~dev-ruby/log4r-1.1.10
+	>=dev-ruby/multi_json-1.10:0
+	=dev-ruby/puppet_forge-2.3*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/archive-tar-minitar
+)"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs for unpackaged rugget git provider
+	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index a04968d5292c..f0df7f53384f 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -6,8 +6,11 @@ AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad1
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
 DIST rsyslog-8.1904.0.tar.gz 2902708 BLAKE2B 515d5e32c2dc6cdd8dd51fc595ad775503438603f28828e9f1a427b184a5a61de32af2ee90334b7d56a9404106d74da47386a18a370278d5a16422a6bb09f556 SHA512 cccb48f06508d7e7c2dd788903f4d7ddb3020cdf6079aea1d52387c56b920f10b08957a79b5d420ccdb54cae50d1da6e5eb80cde9498bceaeda4f6ce37f694fd
 DIST rsyslog-8.1907.0.tar.gz 2926855 BLAKE2B 65c674e53bfa960e3fe5c7f41a304cf8736fe72e2391895dde9fdc17fabeb2f92fccab48965d5e1689a5852136a43a3355f89c9fa9d1d1974335ce80204bb4ac SHA512 2aa3f6106e48fa63c6d4389f83e7a3212817c626d04881682236055792cf5c9d8a941638c9a508c470b6a24c934ef5cb0eda65ea25179d98831afbe2a27c1519
+DIST rsyslog-8.1908.0.tar.gz 2952939 BLAKE2B c6784753262a71f30f32fc35ad3e3e75fa2af271bdb0a62c2d4796d3d0413c7f619052a5e33c52c5f3b22aa474d14b7bb06e9c502944f914e708265835fd90ff SHA512 66b6755e1f5a610ed8ec3f8fad1ee227f8ff34618a8f2660a801e6f9aa734980190fbffd8144ac30d63f8297a06e86ada65ba838242d8a006bca8e30f56dce80
 DIST rsyslog-doc-8.1904.0.tar.gz 8042650 BLAKE2B 585fe5c63eee1fb46f94dcd3d529045b3900e08c291e0e71ed9bf32a6200e6c7283820b262bd56e9aeb74cc227ecd518caafec5a8f87c1d8523d5d7fd95030aa SHA512 da0ff00fbe71756b3c27fd8b94e88611452c3ba611e583862556393faaaa596ca8f32f694ad40a3e1df67385d9f9ca80db6a58f5d2e336fe95639dd7cd0de828
 DIST rsyslog-doc-8.1907.0.tar.gz 8071764 BLAKE2B 90c18a93bb2f2c9158a4696245c44c36ab4c40597d1eb8df8af257f57aa17e71436bd60792c4f982ebc15395abacd53281046e4ae6df65c306f815e6599fb8bc SHA512 72dcddef6e36a92d2bdcf54072fff7516b6c731f43a53ef8f5d4ebdbe46bc7aeb63bbc3e739a6e5897602ea7705c4bdd8f57aa10796955ed772a6c7cf552c5e5
-EBUILD rsyslog-8.1904.0.ebuild 12567 BLAKE2B 191746200f4a5e059c45f94ebc401a14afb6cfa5d5fff0efbeb453f694d7051f3ce550a7eee329a9f32ef1cacda575b395d1b3f8ad978cb5579a9247a7dd68c0 SHA512 3943480907c10c61405cf134ecd4e9284bb66073741f6eb638e3e568a6e65f829990027904b0d02f93fb00f39529343dac94780981e4d182821087b92b06ecd2
-EBUILD rsyslog-8.1907.0.ebuild 12545 BLAKE2B d04b8b22478f7acb2daf4752c98932fea66d2e4462c4efcd9cf64c7ead00006494597789b1b271c5bb25b51d131bd3b646c544d16b1a48502950433ab44e7563 SHA512 0bfdb4335b956a203aba420a83cb2ed5ab6aabefaf79a24280e351688be4e87f8cbf06df89e257f0e9e1b361e52ebd611e2b9b4c247bd9689b7a28d8baccf3cb
+DIST rsyslog-doc-8.1908.0.tar.gz 8082984 BLAKE2B 7f102a215b0c51b961a4e44e97c8a3cd9966215dba44a194a5ff925b8a2b1ad3389461e2de3dae6dfb770bc36c9a31747298bdb7e975d6fa86ca209c9e314ac3 SHA512 d826013de671c895be7becd2a7c5ce1fb218149c6128d486116be6a01fc69099026f5a277b30fc57e626aeb4038e00b17abcad9a45ea3c9838e7041de9d991a5
+EBUILD rsyslog-8.1904.0-r1.ebuild 12569 BLAKE2B 119a617375da61a37962edddae9f20888fcac469325b77f07c15141d471a00e62f6647b94d9837990ad7bccc0e85fb071de8b63f411245f9759f2163677fa663 SHA512 2a6514fbe431f61c29a8f261f528458c05e82398a34b4cd810c36cadaf5d355f7678f530f52d9236269eab01c990703b2bdfe2c6b6b8d3ea0005f1f168587a54
+EBUILD rsyslog-8.1907.0-r1.ebuild 12546 BLAKE2B d562cb749a8632d6399613667f786dabf472b65b112a5775a9f2977b3a513b25f50454419fb62ff02648e4dc1acf5fb226b7d01d62e70bdbcd1de69f6c6cbb97 SHA512 9d683b5267a57653bbc7f8caff1b8e60e78b6e7dbfc6cb2ba7f63ac80776b75cc1d3ba84c27a9659cfd48e568c01af97423f5450af6173e94a9bb9ae38eda95c
+EBUILD rsyslog-8.1908.0.ebuild 12548 BLAKE2B b8fb662688270ee92cc4382bbc39a78e8bf4db46f48e4dcbb4cb3efb0194eb8dffad999cff631199909573590842dd56efc5fb38c05cb88e72ea0bfe5040aa64 SHA512 fabfdc53abf6aab98f7ec7a0ee4381d73155df3a3f1e3dec5b9f8705fa83d336005de173bcbcf34d3a136f5c4565416d35e289c0a827d6fdde63ee5784c656f8
 MISC metadata.xml 3875 BLAKE2B 4281901c6e209ace8f89bf7ec7f036cbabff009da2f080c5b5d77a0639099c8d87ed9925d70e7e3edb6cad8204ebee3a4b74a688b6a22810473a22d90c441347 SHA512 039cd323565bc8e96762bef5b7b34747fffc6d70176397d4be8fd83d1f9dd094e77c21f7005f0d3dc47813ddd97bdbad1ce47ef71a2742ffdbd4145142d2d0b5
diff --git a/app-admin/rsyslog/rsyslog-8.1904.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.1904.0-r1.ebuild
new file mode 100644
index 000000000000..53c2faa29103
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.1904.0-r1.ebuild
@@ -0,0 +1,463 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="amd64 arm ~arm64 hppa x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
+IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		>=dev-libs/liblogging-1.0.1[stdlog]
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.1904.0.ebuild b/app-admin/rsyslog/rsyslog-8.1904.0.ebuild
deleted file mode 100644
index 599b21057acf..000000000000
--- a/app-admin/rsyslog/rsyslog-8.1904.0.ebuild
+++ /dev/null
@@ -1,463 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools eutils linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="amd64 arm ~arm64 hppa x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
-IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
-IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/libmysqlclient:= )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.1907.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.1907.0-r1.ebuild
new file mode 100644
index 000000000000..3ba9c5d75708
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.1907.0-r1.ebuild
@@ -0,0 +1,462 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 hppa x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
+IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		>=dev-libs/liblogging-1.0.1[stdlog]
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.1907.0.ebuild b/app-admin/rsyslog/rsyslog-8.1907.0.ebuild
deleted file mode 100644
index ed1a985412e6..000000000000
--- a/app-admin/rsyslog/rsyslog-8.1907.0.ebuild
+++ /dev/null
@@ -1,462 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools eutils linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
-IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
-IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/libmysqlclient:= )
-	normalize? (
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.1908.0.ebuild b/app-admin/rsyslog/rsyslog-8.1908.0.ebuild
new file mode 100644
index 000000000000..09eed323e458
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.1908.0.ebuild
@@ -0,0 +1,462 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
+IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		>=dev-libs/liblogging-1.0.1[stdlog]
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 7484ceec85ad..54e485931c51 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -13,6 +13,8 @@ AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd2
 AUX salt-2017.7.8-tests.patch 3303 BLAKE2B 4bce0b82f939a997aca6da94977a261b636e410678c40a50a446813a1704608350ab6e330d3dd7dbf541b373320adcca035d3e2a70e9c626f3bd7f8216bbff6e SHA512 b5ccf399bb62325bb1cf252c9d72296138fded7dc4890695e44c2fb43c5f4f4eec852057ad427ffdfb80124be21d7b5cbe2f7497ff7d9746e09f5ed3a652aba6
 AUX salt-2018.3.2-skip-zeromq-test-that-hangs.patch 2820 BLAKE2B e531bddf576322f8417e7e362bfed7aa21ce8f1edc1702074f250efc9118c755664bd2976282399b725c1f56362e37fa07064b9e4ac2a72c413a56b13d325cdd SHA512 72cbc1e7c8d59883bcbe8130fdbae6e1ccecfabe74069a7389e63f797609930036c593204ab441cff92933d3d35a24feb7db0dc76804d76608190e93a8bc6ed4
 AUX salt-2018.3.4-tests.patch 2944 BLAKE2B f41c1e53297e1828c840d0ff22a49e2d47b40932615006f1fcebf6732faf0fb79a3149cc0c1be1d6daae60ce6f93e338e7eddd7cb80e076c1fdb68d560928050 SHA512 6ab26d0ae06adeb590b0b4a77fc3d0273f3624a1e8adacbaffe1ec3ae7d1066e7be5116dcde3c4118f7008a940995665777eedf15dd17c42825d08f22a33a741
+AUX salt-2019.2.0-newer-deps.patch 9260 BLAKE2B 02234367c4de7586b72502126fec7392dca96a284058b6c21733d21e5a61e12e81da054454aae20b290b9179fc7790e74ac111c7b1b638b36a935806e367902f SHA512 1e999b302323c4880103f8e68aa4c471c280484c91af0c4ac8ae85270553d178bb79a4a7d33fcc4b3a0ba2a6d95a8199d411b15e35b87f33004821dea4a07360
+AUX salt-2019.2.0-skip-tests-that-oom-machine.patch 739 BLAKE2B c0e1b18c528ddcdc19e93061112d2c42aeca96f9091218e7ad6b4eadf11255079cecd6b9b9def576c663b4ba794d151db8fc32336b1c29c3da8e9c18c09582f3 SHA512 0bd8fc2ab73be8ffc9fdda65a60c7306dbfa9f76d874994ba09db7ef71678fca80c8fde5963d22b5bbbe3b933140a56f2173f4c109b47dd9e9c3c9a70062b0e3
 AUX salt-2019.2.0-tests.patch 2793 BLAKE2B c609564673db7388a876902deb57f0aec70531ea26536954efdabdd8849eee314e840cc299f6e1fbd6a18740847a9ee8d217426adee38d36ae569f6e2e9c85ae SHA512 eb1d61f5410b36d0749cce5fc7dc08a8950061f7fb3497a122702eba7638ec3e635750b25ad5cacc4839d4828f13785ea122df43e8aff7635d79283be0392f02
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
@@ -27,5 +29,5 @@ DIST salt-2019.2.0.tar.gz 14952746 BLAKE2B aa3bba4b7d9548a8d333c242fc0265a743f56
 EBUILD salt-2016.11.10.ebuild 4855 BLAKE2B 8d6321e45aca368c5919104752f3ab5f0ba0778b183a232cbbbcd19da126eaecc2d0c40c29e3745a27d7f1cff9dc620840d7cbd86de7a3d8c6454bc2ff9b900c SHA512 a4e7ae265c66a659eb70fccba97c2c52ba9fe06fe20e23d3643029fd68442aad4f82d94f8a9dd55a5f040644a50571dec645ab866b20ef05a70ad8a550553c92
 EBUILD salt-2017.7.8.ebuild 4614 BLAKE2B 8974a75658aa59bfc4cd98efa9d601ebc374f407ea33d51b98b02fbcd00f195455c867f824cf16092e3859fcbccfc4a0c7ae2933a1724180d34a9f616432095b SHA512 a9a09dc1939775f46687e4e25fae24a3b7bfa48c1358bfec00fcc70fcd271d947c4f2ea5e9c0a9b4a522b87c5d2ab334f0df3d487dc2799db0531cafe23e7a2d
 EBUILD salt-2018.3.4.ebuild 4905 BLAKE2B 882cbf2fc6fd4547a19bbd078a27b6deb5053702fac869af73bac8a7a664f0d368e66a1a3da3b9c30bc0a892f71c1f7d5135fd14240b80cbe24c7fd9438276c7 SHA512 217870e4aef470660089e0627674b8001a3047c783a1fe6fe95c20084ad00ec089d51e0d2783c9a6a69f407aa475091bed4b8fc9a35001e32883440f30f5c1f0
-EBUILD salt-2019.2.0.ebuild 4973 BLAKE2B c70bd776e088b3b148df8a38fdd72bae9cb06716a1536efaa90d221fbcd9461f758b7f99566e1d430efe904a844d3a0ce3ef31b6673bdfae9b5f56ce1fd551c4 SHA512 1eb634805f5e0ecf8fda2bf97bba0108062625edec62d3197d25c7bf863bd4a05a13e4b79fa5ca1d4f456dc040ef130eb27afc7d1670e0175963cf011e36502c
+EBUILD salt-2019.2.0-r1.ebuild 5079 BLAKE2B 09f9672a3ff9e8abb40e5233a600f91b0ffcacd8011ee0d28be53b394fc796c23cdaf11f3b75136f31a1e184a49b95e358940102f6e3c309993823dd18b8d9ba SHA512 ef245c5e1f8a1b4a5c7b187608643099929f8165028aa3fc7649a5bb347a21e7a976e9c8a0ebae39f601ab6ce8e291cbb25af4d5505b8ce3b330f3a8d0918eec
 MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969
diff --git a/app-admin/salt/files/salt-2019.2.0-newer-deps.patch b/app-admin/salt/files/salt-2019.2.0-newer-deps.patch
new file mode 100644
index 000000000000..bdf95e210897
--- /dev/null
+++ b/app-admin/salt/files/salt-2019.2.0-newer-deps.patch
@@ -0,0 +1,210 @@
+diff --git a/salt/modules/dockercompose.py b/salt/modules/dockercompose.py
+index 61e937536c..0f37e0d43a 100644
+--- a/salt/modules/dockercompose.py
++++ b/salt/modules/dockercompose.py
+@@ -241,7 +241,7 @@ def __load_docker_compose(path):
+                                     None, None)
+     try:
+         with salt.utils.files.fopen(file_path, 'r') as fl:
+-            loaded = yaml.load(fl)
++            loaded = yaml.safe_load(fl)
+     except EnvironmentError:
+         return None, __standardize_result(False,
+                                     'Could not read {0}'.format(file_path),
+@@ -371,7 +371,7 @@ def __load_compose_definitions(path, definition):
+                                               None, None)
+     else:
+         try:
+-            loaded_definition = yaml.load(definition)
++            loaded_definition = yaml.safe_load(definition)
+         except yaml.YAMLError as yerr:
+             msg = 'Could not parse {0} {1}'.format(definition, yerr)
+             return None, None, __standardize_result(False, msg,
+diff --git a/salt/serializers/yaml.py b/salt/serializers/yaml.py
+index c95b40e48f..2154e5dcab 100644
+--- a/salt/serializers/yaml.py
++++ b/salt/serializers/yaml.py
+@@ -72,6 +72,7 @@ def serialize(obj, **options):
+     '''
+ 
+     options.setdefault('Dumper', Dumper)
++    options.setdefault('default_flow_style', None)
+     try:
+         response = yaml.dump(obj, **options)
+         if response.endswith('\n...\n'):
+diff --git a/salt/serializers/yamlex.py b/salt/serializers/yamlex.py
+index 2e4ba6fb2b..e42634f580 100644
+--- a/salt/serializers/yamlex.py
++++ b/salt/serializers/yamlex.py
+@@ -182,6 +182,7 @@ def serialize(obj, **options):
+     '''
+ 
+     options.setdefault('Dumper', Dumper)
++    options.setdefault('default_flow_style', None)
+     try:
+         response = yaml.dump(obj, **options)
+         if response.endswith('\n...\n'):
+diff --git a/salt/utils/yamldumper.py b/salt/utils/yamldumper.py
+index 9892c87d23..3692ea324a 100644
+--- a/salt/utils/yamldumper.py
++++ b/salt/utils/yamldumper.py
+@@ -115,6 +115,7 @@ def dump(data, stream=None, **kwargs):
+     '''
+     if 'allow_unicode' not in kwargs:
+         kwargs['allow_unicode'] = True
++    kwargs.setdefault('default_flow_style', None)
+     return yaml.dump(data, stream, **kwargs)
+ 
+ 
+@@ -126,4 +127,5 @@ def safe_dump(data, stream=None, **kwargs):
+     '''
+     if 'allow_unicode' not in kwargs:
+         kwargs['allow_unicode'] = True
++    kwargs.setdefault('default_flow_style', None)
+     return yaml.dump(data, stream, Dumper=SafeOrderedDumper, **kwargs)
+diff --git a/tests/integration/utils/test_win_runas.py b/tests/integration/utils/test_win_runas.py
+index 3042a77991..d4057a4d03 100644
+--- a/tests/integration/utils/test_win_runas.py
++++ b/tests/integration/utils/test_win_runas.py
+@@ -539,7 +539,7 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 1, ret
+ 
+     @with_system_user('test-runas', on_existing='delete', delete=True,
+@@ -560,7 +560,7 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 1, ret
+ 
+     @with_system_user('test-runas-admin', on_existing='delete', delete=True,
+@@ -581,7 +581,7 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 0, ret
+ 
+     @with_system_user('test-runas-admin', on_existing='delete', delete=True,
+@@ -602,7 +602,7 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 0, ret
+ 
+     def test_runas_service_system_user(self):
+@@ -621,5 +621,5 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 0, ret
+diff --git a/tests/unit/serializers/test_serializers.py b/tests/unit/serializers/test_serializers.py
+index 3bf42b67d7..ea42d617d7 100644
+--- a/tests/unit/serializers/test_serializers.py
++++ b/tests/unit/serializers/test_serializers.py
+@@ -68,9 +68,24 @@ class TestSerializers(TestCase):
+         serialized = yamlex.serialize(data)
+         assert serialized == '{foo: bar}', serialized
+ 
++        serialized = yamlex.serialize(data, default_flow_style=False)
++        assert serialized == 'foo: bar', serialized
++
+         deserialized = yamlex.deserialize(serialized)
+         assert deserialized == data, deserialized
+ 
++        serialized = yaml.serialize(data)
++        assert serialized == '{foo: bar}', serialized
++
++        deserialized = yaml.deserialize(serialized)
++        assert deserialized == data, deserialized
++
++        serialized = yaml.serialize(data, default_flow_style=False)
++        assert serialized == 'foo: bar', serialized
++
++        deserialized = yaml.deserialize(serialized)
++        assert deserialized == data, deserialized
++
+     @skipIf(not yamlex.available, SKIP_MESSAGE % 'sls')
+     def test_serialize_complex_sls(self):
+         data = OrderedDict([
+@@ -84,6 +99,12 @@ class TestSerializers(TestCase):
+         deserialized = yamlex.deserialize(serialized)
+         assert deserialized == data, deserialized
+ 
++        serialized = yaml.serialize(data)
++        assert serialized == '{bar: 2, baz: true, foo: 1}', serialized
++
++        deserialized = yaml.deserialize(serialized)
++        assert deserialized == data, deserialized
++
+     @skipIf(not yaml.available, SKIP_MESSAGE % 'yaml')
+     @skipIf(not yamlex.available, SKIP_MESSAGE % 'sls')
+     def test_compare_sls_vs_yaml(self):
+diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py
+index 677cd0778b..5c2f1fd8fd 100644
+--- a/tests/unit/utils/test_schema.py
++++ b/tests/unit/utils/test_schema.py
+@@ -5,6 +5,7 @@
+ 
+ # Import python libs
+ from __future__ import absolute_import, print_function, unicode_literals
++import sys
+ import copy
+ 
+ # Import Salt Testing Libs
+@@ -506,7 +507,7 @@ class ConfigTestCase(TestCase):
+                 {'personal_access_token': 'foo'},
+                 Requirements.serialize()
+             )
+-        self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
++        self.assertIn("'ssh_key_file' is a required property", excinfo.exception.message)
+ 
+     def test_boolean_config(self):
+         item = schema.BooleanItem(title='Hungry', description='Are you hungry?')
+@@ -1730,7 +1731,10 @@ class ConfigTestCase(TestCase):
+ 
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': {'sides': '4', 'color': 'blue'}}, TestConf.serialize())
+-        self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
++        if sys.hexversion >= 0x03000000:
++            self.assertIn("'4' is not of type 'boolean'", excinfo.exception.message)
++        else:
++            self.assertIn("u'4' is not of type u'boolean'", excinfo.exception.message)
+ 
+         class TestConf(schema.Schema):
+             item = schema.DictItem(
+@@ -1833,7 +1837,10 @@ class ConfigTestCase(TestCase):
+ 
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': ['maybe']}, TestConf.serialize())
+-        self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
++        if sys.hexversion >= 0x03000000:
++            self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message)
++        else:
++            self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message)
+ 
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': 2}, TestConf.serialize())
+@@ -1885,7 +1892,10 @@ class ConfigTestCase(TestCase):
+ 
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': ['maybe']}, TestConf.serialize())
+-        self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
++        if sys.hexversion >= 0x03000000:
++            self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message)
++        else:
++            self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message)
+ 
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': 2}, TestConf.serialize())
diff --git a/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch b/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch
new file mode 100644
index 000000000000..d0172d739554
--- /dev/null
+++ b/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch
@@ -0,0 +1,20 @@
+diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py
+index be26b3f093..ca971556d5 100644
+--- a/tests/unit/modules/test_boto_apigateway.py
++++ b/tests/unit/modules/test_boto_apigateway.py
+@@ -169,6 +169,7 @@ def _has_required_botocore():
+         return True
+ 
+ 
++@skipIf(True, "Causes machines to OOM")
+ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
+     conn = None
+ 
+@@ -207,6 +208,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
+         self.addCleanup(delattr, self, 'conn')
+ 
+ 
++@skipIf(True, "Causes machines to OOM")
+ class BotoApiGatewayTestCaseMixin(object):
+     def _diff_list_dicts(self, listdict1, listdict2, sortkey):
+         '''
diff --git a/app-admin/salt/salt-2019.2.0-r1.ebuild b/app-admin/salt/salt-2019.2.0-r1.ebuild
new file mode 100644
index 000000000000..eb02c39bf6f9
--- /dev/null
+++ b/app-admin/salt/salt-2019.2.0-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_6 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	<www-servers/tornado-5.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:0=[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[$(python_gen_usedep 'python2*')] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/timelib[$(python_gen_usedep 'python2*')]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/salt-2019.2.0-tests.patch"
+	"${FILESDIR}/salt-2018.3.2-skip-zeromq-test-that-hangs.patch"
+	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-2019.2.0-newer-deps.patch"
+)
+
+python_prepare() {
+	# remove tests with external dependencies that may not be available
+	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+	rm tests/unit/modules/test_{kubernetes,vsphere}.py || die
+
+	# allow the use of the renamed msgpack
+	sed -i '/^msgpack/d' requirements/base.txt || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+
+	(
+		cleanup() {
+			rm -f "${tempdir}"
+			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+		}
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}
diff --git a/app-admin/salt/salt-2019.2.0.ebuild b/app-admin/salt/salt-2019.2.0.ebuild
deleted file mode 100644
index 16433de1b07d..000000000000
--- a/app-admin/salt/salt-2019.2.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit eutils systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
-	https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-	<www-servers/tornado-5.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	openssl? (
-		dev-libs/openssl:0=[-bindist]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[$(python_gen_usedep 'python2*')] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/timelib[$(python_gen_usedep 'python2*')]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )"
-RESTRICT="x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/${PN}-2019.2.0-tests.patch"
-	"${FILESDIR}/${PN}-2018.3.2-skip-zeromq-test-that-hangs.patch"
-)
-
-python_prepare() {
-	# remove tests with external dependencies that may not be available
-	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
-	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
-	rm tests/unit/states/test_boto_vpc.py || die
-	rm tests/unit/modules/test_{kubernetes,vsphere}.py || die
-
-	# allow the use of the renamed msgpack
-	sed -i '/^msgpack/d' requirements/base.txt || die
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072 || die
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
-
-	(
-		cleanup() {
-			rm -f "${tempdir}"
-			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
-		}
-
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
-
-		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
-			TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose
-
-	) || die "testing failed"
-}
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 85ef7ce3f76e..12512972b02a 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,10 +1,10 @@
 AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff848000c3181e590e557413011ebd5db650f79dfad270f6506128ef9971975ec2b26323b18f793bb914759449679bc34f388c SHA512 c30d7fa3624164d3ec5574b1ae36cc896fb5132ed875f232e9e84cf080e7081dadce61f6d88b55aefa45e417a081622acf7aa2d9f10406d23be7646905dfb3e6
-AUX setools-4.2.0-remove-gui.patch 988 BLAKE2B 8ba64a764292e2309fc27bdd8595bbe10c644642bb59b66b4423f50a077aac372c63da31a231a27940eb624bfea7de2f5ca305f9cc9b162d56d40f9f4ff4bab9 SHA512 e1f2216b14523a7033ebf3293646909df3be2756280186c5d8e6b1c01c7246663732c0f27c949bdac218749bb9631b47bdd82b7457a051df2380254021df4b95
+AUX setools-4.2.2-remove-gui.patch 970 BLAKE2B b3d701d0e9b4de0a3f66ca8696700e70becfa5de068e385d12ca61f76ca59f495a69fac65ee986fa548bfec2487f21b5b948da2d729cef8a3008d906c9f7e73d SHA512 088be5d53e4402fa91bec20b3d85b8c1a77b41ebde1bbb44909e740b140bd6f79b641b68f56d258ad5a4af40df3023745663acb305a810ee19f126a0e99f1e6b
 DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
 DIST setools-4.2.1.tar.gz 365096 BLAKE2B f415ec15ce7caade2a511896c6027720ecd8b4fae938d9dee1e0b677388966557b9615503df58dd6057f5c0ef81690f753f3e1af773ef5fd8095b29aca0ab249 SHA512 7d00295fe7ff16e96e15266807f8e0a67cc2978f9051cd85afb9ee71ca7fad16ccf7421a4a163bb793950bc20a44f3cbb8409b4e0642d0f96cf7a3df7bc59c31
 DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
 EBUILD setools-4.1.1-r1.ebuild 1445 BLAKE2B 7f7549954ddd2b34d55960ac869f4cead17b6968bba0ca5634eaf5804ee31ffe08a232f93f6cc7aaaeb5f6485261f89ec27df6977195d734a8c0744e2aa91e60 SHA512 fd76c7f9e899f051388126b76c73490836ecc3937f8c31d8639d578e21c89487d5d2d90f6e68595fa660c5a49daff937ad050a12150b1d5863183664592c4ab2
-EBUILD setools-4.2.1.ebuild 1199 BLAKE2B 640a4f9149fc0e5e1754efe796a6dc30b9199f4315cd4623c139f9f332f8f6ff8ab23632482dc30bd6cf139642f025e49f6015b7e492b1272c4ca93a596ef097 SHA512 0636242795043a0de1bf661f60bb953b7f8d7420f065763df3f84f00491317a075856fd5f21730494603c7d3bccd826f661b13d0f3688b44119c9b8fd4143e25
-EBUILD setools-4.2.2.ebuild 1202 BLAKE2B 428b1a44ba0fd9dc2be2bf57eda2d43701fe446f34b757581fca697247866f58032791d0027af564f08b7271feae487c60c5d038d5464eeba8bfcaebcbe2a8ca SHA512 036f0e6f9767b288488973f5c0d54ea87cf78af977c00f71f39a3d2a5b976a387a8e84d6876e4ecfa235b0c453d4ee9339d890384981e1cd58be32a436369906
+EBUILD setools-4.2.1.ebuild 1199 BLAKE2B cc0644c200c087907d0b4c29013b1e833976044de9b8e402ad9af2ceabde6f69a2dbdb1993ff8ec3aa2bb49f20347ef8cd4a179e3fd17ac3b8175d84eaf84971 SHA512 40712f5f7cae13f9f74a39dc58b2aca127b6901825bddab3bb045a7661c730659b28d0345719b50fd0f76d5144a84db4c640092cdb2110481cb7654b04970f37
+EBUILD setools-4.2.2.ebuild 1223 BLAKE2B 54d3f0e059ce452bae3dcc7829a411745a8382c2bd67f67b4c9e044b7a7bb424bfb25bc5ea382679651a3edce994d8bf37b77c27426f43ea07dddda552eb8bcd SHA512 be933b756cf01e925a74249f15b02bbc451182d5b795934352410a5ae5ea4f629d12f37dd823366e057928634db96d8ebeff7c816ae594fb1bb321e527bb2b95
 EBUILD setools-9999.ebuild 1201 BLAKE2B 2244435edf3e51f5727b6fe188462aedb64b68624a6d02ce32e48bd7c01e4a79db17d4f627d91a886c75803a92d005278ba8eda9bab777846718b3bd2a4c9049 SHA512 c5330e616e4d211754650994c65350137fc6cfd5f0be16e2f3cb295127c081f37946feb283713a7726462d0b367023b63f3051a807e2b24c78758009630613bb
 MISC metadata.xml 401 BLAKE2B dc411a73d59193727d72889e4e5f3840aa9cf7b1b6ef55f28ab6a6beee533276954e27fe105a60c392c49ac761745304865c221ff9417464112eb866f35bf6e9 SHA512 354eb8fc14e5673dfd6ad2781a784cd6d77442bf879a96c206b758615c1612397c09c20161efb9e37bc56a588e97a74a20939773dec0b1f137eb6ac353234d2f
diff --git a/app-admin/setools/files/setools-4.2.0-remove-gui.patch b/app-admin/setools/files/setools-4.2.0-remove-gui.patch
deleted file mode 100644
index 748b33c9a5d1..000000000000
--- a/app-admin/setools/files/setools-4.2.0-remove-gui.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/setup.py b/setup.py
-index e075a00..3f8f959 100644
---- a/setup.py
-+++ b/setup.py
-@@ -134,10 +134,10 @@ setup(name='setools',
-       author_email='pebenito@ieee.org',
-       url='https://github.com/SELinuxProject/setools',
-       cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
--      packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
--      scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-+      packages=['setools', 'setools.diff'],
-+      scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-       data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))],
--      package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
-+      package_data={'setools': ['perm_map']},
-       ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],
-                             annotate=cython_annotate,
-                             compiler_directives={"language_level": 3,
diff --git a/app-admin/setools/files/setools-4.2.2-remove-gui.patch b/app-admin/setools/files/setools-4.2.2-remove-gui.patch
new file mode 100644
index 000000000000..58579bf5a004
--- /dev/null
+++ b/app-admin/setools/files/setools-4.2.2-remove-gui.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index ac8a876..84001a8 100644
+--- a/setup.py
++++ b/setup.py
+@@ -134,10 +134,10 @@ setup(name='setools',
+       author_email='pebenito@ieee.org',
+       url='https://github.com/SELinuxProject/setools',
+       cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
+-      packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
+-      scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
++      packages=['setools', 'setools.diff'],
++      scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+       data_files=[('share/man/man1', glob.glob("man/*.1"))],
+-      package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
++      package_data={'setools': ['perm_map']},
+       ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],
+                             annotate=cython_annotate,
+                             compiler_directives={"language_level": 3,
diff --git a/app-admin/setools/setools-4.2.1.ebuild b/app-admin/setools/setools-4.2.1.ebuild
index b1bf0e666c9a..3e80e5e19f6b 100644
--- a/app-admin/setools/setools-4.2.1.ebuild
+++ b/app-admin/setools/setools-4.2.1.ebuild
@@ -40,7 +40,7 @@ python_prepare_all() {
 	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
 		die "failed to set lib_dirs"
 
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch )
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-admin/setools/setools-4.2.2.ebuild b/app-admin/setools/setools-4.2.2.ebuild
index f186598f7c00..22da7166d078 100644
--- a/app-admin/setools/setools-4.2.2.ebuild
+++ b/app-admin/setools/setools-4.2.2.ebuild
@@ -20,6 +20,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="X test"
+S="${WORKDIR}/${PN}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
@@ -40,7 +41,7 @@ python_prepare_all() {
 	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
 		die "failed to set lib_dirs"
 
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch )
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index a618071a354e..0a0842421083 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,8 @@
 DIST sudo-1.8.25p1.tar.gz 3189951 BLAKE2B ebfedaad62e60f625db8c46a5c8f19977a5ec0a86bab3b34d91096c08e8b8ece056ba312f9fecd4cdd704fc17d49a36681b41cd40269df7c67cd66d80c0d8efb SHA512 b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72
 DIST sudo-1.8.27.tar.gz 3293178 BLAKE2B 174d63ece5c24309dc0d237fadfc4131243aca333491ffa6dcdb3c44b53cb8149d3bf2f3aea2aa49529ea811d4727a11ac1909305e342b858a4c14f923f12956 SHA512 0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac
-DIST sudo-1.8.28b2.tar.gz 3301533 BLAKE2B 9805d01b87c497e8b169d48598753a1f274d00dbe8ac81b992cb08b0ac74400b4abbf1bcc5e4bb4e7c135556f0069f9db279c39e40460749801bbacd5a84caf3 SHA512 df7e352c14d586bf556cf63c6176f6f5ec8619b0f36089466abeb8a732bd190e763429d46552dc79efadc640369a82e213a9e14d9a596761cba005f52b0f0f8a
+DIST sudo-1.8.28b3.tar.gz 3305122 BLAKE2B b3b9a3fbf853cfb484516eae3398c09c897115e887a7693014c304ff4b4a477861dbdf5af85b954054abeed7afa8b77470a4bad5e3beaf278b70c0969b6c6471 SHA512 87c16bd44bfabddbf8e0b9899d02ae05fbc1ccae9a21eb8123162f4a3dd4ccd91d013db5a50a6c249d85a3e1b4ac790c7dc0aabfe155f125dc211159404816ca
 EBUILD sudo-1.8.25_p1-r1.ebuild 6418 BLAKE2B 54b1649420ec20b8f34b4ceb51549d1d04382c42cb31a90c0b3b20fc9f50a8f7bd111eac0702e9d6229c8c908df3030d0fe040c80eab22e52e71574c1ecc011f SHA512 beb5ca170c8e149d550d6c2ee96326af2c63780c4e9ae69493af2e7612dd1458aef187c193acafac16d3b003775f9d2a53ad778254468bc0d68620149a918fe1
-EBUILD sudo-1.8.27-r1.ebuild 6665 BLAKE2B a1f14a58d3ae68bba174ae1d5bdbf82d2408a036a6e22ae38393594f507390391e9ad7a0d10b6e0a4641e2037a37591d268fae02e28003418ef0a9f2fe228b0c SHA512 13b46e6da2f845b657b13ee302de36a38430c56ee4e45ec1a2c152ba077a838d7ad38e84250d902543d56f386a078706157493fb56fad65890f7e01d2e8d1f33
-EBUILD sudo-1.8.28_beta2.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd
+EBUILD sudo-1.8.27-r1.ebuild 6662 BLAKE2B 90eb9b9a0bd6de53d6bfb2ca9fd754225e50267c2e36038728dd9c7f716c0a16d9de67a3c44b5c1f719844967e2867c4b32a46d82db3a43ea5e2d8273b9466b9 SHA512 1c662e3e02c77f54001b3e59a1a68a4fc6726176e07aeec06d5b587e19550e288e36eb5b35033ef785af5ec881800e7c8ec98fb7e22cc96c25ad67ecb31b84fe
+EBUILD sudo-1.8.28_beta3.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd
 EBUILD sudo-9999.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd
 MISC metadata.xml 1489 BLAKE2B 3739b522115082830f82f509804b6f6f5e3ad55633c20b51b1cfa48960af6189bd33dd71d1e9432d4adf7bb4ad7790d7eed62996ab5ad12aa55732eee85b50a0 SHA512 6fa51671c5fa3ca442da0982542a8290ed39c835106c40d2db278ae16ec45eed28e563e203c1d5519bbf637483d0779094bca2ec3505d6f466d0a2b62b5248f8
diff --git a/app-admin/sudo/sudo-1.8.27-r1.ebuild b/app-admin/sudo/sudo-1.8.27-r1.ebuild
index 26ca23f617c5..6a259192f45d 100644
--- a/app-admin/sudo/sudo-1.8.27-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.27-r1.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} != "9999" ]] ; then
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+		KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 	fi
 fi
 
diff --git a/app-admin/sudo/sudo-1.8.28_beta2.ebuild b/app-admin/sudo/sudo-1.8.28_beta3.ebuild
index 69778e4b8d41..69778e4b8d41 100644
--- a/app-admin/sudo/sudo-1.8.28_beta2.ebuild
+++ b/app-admin/sudo/sudo-1.8.28_beta3.ebuild
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index ad96de4c550d..cdbfe7a15c35 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -12,9 +12,12 @@ DIST vault-1.1.2-webui.tar.xz 1281868 BLAKE2B 9c3662dabfd9403fda4a8acd8f9a86ff86
 DIST vault-1.1.2.tar.gz 26026601 BLAKE2B df208b15076007ab87c3c6683698dc4348f56d5a73ff2a52ce17c5a9858acf4d597f7c53f709a1415247cd4cdc65454cc1aa6c18504cbb10368d39df2974175d SHA512 bc645bc5efeaf5a185479ab2ea78589762d09a40e889845d8cceac94568fcfcfeac94ae602c548648aea800b791121fbb2b75c3af9a9651d08dd9e38c1219826
 DIST vault-1.1.3-webui.tar.xz 1284144 BLAKE2B b84260974ce0827ce8ae834827c331a9bf70f589984975152188615aa480172cf41f4a45abc96fa13bfb7837ae1679bcff519f6aa7ab0678048b2cffbbe11afe SHA512 36331457c50e2a5d42269a5f91cd3e982c3f7dbfd0a2cfa4f8f435c253af6f075da6401b59a92e1949c683b4c5e899ef2f28bbd8a5cbeabcca8ef30816d75e73
 DIST vault-1.1.3.tar.gz 26026249 BLAKE2B a8fb531caf43f675d604f58126a7e56f7bf86defa2309d5d81d92911457efe5595b5c3244be4d0f73806ca5b746bddc852f871c10841da0e7ec128e53c6c18a4 SHA512 bf757558b984711967fdc623393e71c74d5e73922de3b0574ecb229a5d52320ebc3f848b48eabf0ed7a8d6e9d9f6c12d69fb23309fb8c19492b135344c8c4be2
+DIST vault-1.2.2-webui.tar.xz 1920136 BLAKE2B 81b90a0d796727c7523712ae50f85a24fa98b8b78c304d3ee50654e7f0ea1b3d58005abcbe55a15c3b496f5fce5701306ac57f0c6decc7ab8ae24ab12f5dd81d SHA512 b454e02e664190903b11bf0e3e465463182f3b7060efeb2c858127306869d731193102ba58398c28441d2be1a3956b88b2591aab1460047647742ba9dab5a00c
+DIST vault-1.2.2.tar.gz 27588019 BLAKE2B 5d989d1750a134f0c68e25ced7406ec8e7ae1d2233a1ece634e1487e4879af2d4a3e938aea1016d6872754f31ef19c85d04cd65e63f6547d7a5cf3cfa93ec208 SHA512 ce9211b3deb1839759646f8488fe2b89fec379bafed472921a62cd507f842ed05647fe4da7cb9482d195b028a29eb576f947da24aecd8b19181c7282fd3a155d
 EBUILD vault-0.11.5.ebuild 1620 BLAKE2B 7130a0a55407c092d96c3e22b216bdfab9d2e0168176539745afda5563808efbec06051adaa66fbf644a530ae91ac6f21fa7d58f78f57aab3f8b19dc65812399 SHA512 5d22bb29b0a7bffe7410af9b9cb07ab6957ca78aa0d82016341327eb739011799f330bc1f2eacc8d3509eb52f445ccb1f04ecb5332fd8d2601bfb2ba8d36486c
 EBUILD vault-1.0.2.ebuild 2177 BLAKE2B b0eca28eea305d1959990faa564907ba489d896e11be44c31a70a56b70e66666d7006d00ce5e652d028d15157178c16e7c8fab0b1962dfbefcecee3c9e494e60 SHA512 54b48f145821acc8dff09e5ed22070fdf7c3303e186de1c1721ee654e76a51025d041a1f45c3b3fde3f55a23b2f91cdf4b8d2ac94024fe266860faf4f04162a4
 EBUILD vault-1.1.0.ebuild 2177 BLAKE2B 089d6b0dc8be55d3abbabab1193fdb5debac444d39e52fa2ccae2e695d746b93b05705ab6f743f37eea505eabed5cb774c78df4a39caa46d926653a409f755b5 SHA512 98a453127a49429823e79544cdec581707623106002e2c0d402a9af64d585e57735c10d083699d3911f2e4f1794e99b48dd666d026f7abaad55b61015321fdde
 EBUILD vault-1.1.2-r1.ebuild 2177 BLAKE2B 089d6b0dc8be55d3abbabab1193fdb5debac444d39e52fa2ccae2e695d746b93b05705ab6f743f37eea505eabed5cb774c78df4a39caa46d926653a409f755b5 SHA512 98a453127a49429823e79544cdec581707623106002e2c0d402a9af64d585e57735c10d083699d3911f2e4f1794e99b48dd666d026f7abaad55b61015321fdde
 EBUILD vault-1.1.3.ebuild 2177 BLAKE2B 089d6b0dc8be55d3abbabab1193fdb5debac444d39e52fa2ccae2e695d746b93b05705ab6f743f37eea505eabed5cb774c78df4a39caa46d926653a409f755b5 SHA512 98a453127a49429823e79544cdec581707623106002e2c0d402a9af64d585e57735c10d083699d3911f2e4f1794e99b48dd666d026f7abaad55b61015321fdde
+EBUILD vault-1.2.2.ebuild 2314 BLAKE2B 30a0dfe3dd22cbd5319977028014a28ccceffd6cfb4191963814608b875ee0c7f0137dc4427b081f54c82975a733ffef01a12e19b2c1b6ed11fb5395565f10dc SHA512 ee0ee2bd0026ec3743d785e7b841b3a1da443081fb1e7a9cff0a27347c3e8b339e178355b43de03582a2e41dc6bad07cac56d3afad0a4034f3985377c5ea3523
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.2.2.ebuild b/app-admin/vault/vault-1.2.2.ebuild
new file mode 100644
index 000000000000..851d2b1431fa
--- /dev/null
+++ b/app-admin/vault/vault-1.2.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	webui? (
+		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.11:=
+	dev-go/gox"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+	if use webui; then
+		# The webui assets build has numerous nodejs dependencies,
+		# see https://github.com/hashicorp/vault/blob/master/ui/README.md
+		pushd "${S}/src/${EGO_PN}" >/dev/null || die
+		unpack "${VAULT_WEBUI_ARCHIVE}"
+		popd >/dev/null
+	fi
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i src/${EGO_PN}/scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-i src/${EGO_PN}/Makefile || die
+
+	# Avoid network-sandbox violations since go-1.13
+	rm src/${EGO_PN}/go.mod || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	mkdir bin || die
+	export -n GOCACHE XDG_CACHE_HOME #678970
+	export GOBIN=${S}/bin GOPATH=${S}
+	cd src/${EGO_PN} || die
+	# The fmt target may need to be executed if it was previously
+	# executed by an older version of go (bug 665438).
+	emake fmt
+	BUILD_TAGS="$(usex webui ui '')" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	dobin bin/${PN}
+}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 4906cdcd3b9e..ad443727e33e 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav-unofficial-sigs/Manifest b/app-antivirus/clamav-unofficial-sigs/Manifest
index 49980d86f501..6ba2073dd802 100644
--- a/app-antivirus/clamav-unofficial-sigs/Manifest
+++ b/app-antivirus/clamav-unofficial-sigs/Manifest
@@ -2,6 +2,6 @@ AUX clamav-unofficial-sigs.8 4568 BLAKE2B 3bb0a56c11d733d0727c38588fb1b9b38b679e
 AUX clamav-unofficial-sigs.logrotate 109 BLAKE2B 662b268f5332f088670fb762dd5162c0fccba68ca3fad5d089f2330057f1d52c35785924e56a8174c3d9c2d7d6c9232f3d41adb83c2cd88c55d096b764781ed8 SHA512 3d79caf1bbc29218aacda9c6c411b6b9e827644c3a89a3a1b9e0d89baeb7927cdbda3322c9b5a5186e53f0efa598e165d10cfa698936a687bd6279f6e3866830
 DIST clamav-unofficial-sigs-5.6.2.tar.gz 50931 BLAKE2B 6fea42f8f76ae5344c2b96c9203d2b09e755573d03f2b9d3d9ee2a488150fbb6f598e052b730daf12c551920a71fd8daad1dc10002fca12fa4a74554cf7d445e SHA512 79978db065a22d778490d0a2673f5a0bb7ab73e42de64563e7d26ac23459f7e5b2e73b0548e1ea6483e3c5f43eed65cdbc6814037cc0c46a339366a0150e5427
 DIST clamav-unofficial-sigs-6.0.1.tar.gz 52262 BLAKE2B 9523da749e88c5e93f0986d7d4a234c3b1eff7c207ceb266e63cd76d7cffdf4a85aedf90aa746f7e1c82be97018f40896bbaa2dfd8f749f3c167d3bff74293d7 SHA512 d4f619628c9b2804a6d5ad533adaad72e323bb0604334c045cf92fc550ffb114493653d097b68337b33f51dc1215dc073b4ec9dc42abea8707cb03aefa40b289
-EBUILD clamav-unofficial-sigs-5.6.2.ebuild 1787 BLAKE2B f8bc585f65cc59767549bbe9c3b85cb9608a6b26e10ae1611c838058bbd8fd91fda37772ba5ec18f99db32291335d993459981a9912bd7fb9580b28d70c05c27 SHA512 9c1b49ee6b750527240d24256ee9c146251b68c26fd8fc25ff4990342cc41be4072ad25e643e90c2363a8331a05067377db47ac938f461b7b2b66a60d3ac6685
-EBUILD clamav-unofficial-sigs-6.0.1.ebuild 1789 BLAKE2B de23d3ba0a9578925404cbba0fbbab5edff8872c8a5254920b828714e705b36326b6ff29d81cc48251c16fc1a32a90c1aa0258bce1927a6a44749e78c0d6a4c6 SHA512 d96fbbf70fd4a0ea596f32f6e1cf126086e99a67903fd3508da9b0ba673198cb2fc1b08f35ff6ad7d9393c306396b68709d07db6139195190712200d24c639ea
+EBUILD clamav-unofficial-sigs-5.6.2.ebuild 1829 BLAKE2B dfdde92f921a0ab51e48d9167245b2f50d8b34678655712a68c92ac57f58ca3f4fb94b04259233662805c702721e47fb723e85ab4f2dedacf01c7131e89387e3 SHA512 b8d2e4ee32b4e5d265562ad591f885d22cb960dfda66a083d58f7cab702e345fc233b62cb74d3a1d21e3a9d1e67ddbdcc9e10026645403b7c4213593bbef4540
+EBUILD clamav-unofficial-sigs-6.0.1.ebuild 1831 BLAKE2B c51bc4ae433b836349bb2fba2d4d4bbe2a83275777d3f8feb09d8e004826f793390ab77f6496977ed56519afa0ac9fa486e679ce58005d98dcf35725766fcc7a SHA512 33f1cbcd9b7049ecf2cd11a0b52c419bfb0cffcd59ba889038795d6b4626353e3303a68af68fafd92fbb4e156681bdfe827a50dbdc30515090e1765fe510c9aa
 MISC metadata.xml 383 BLAKE2B 3640860216d88ba2817e3c23aea1bd8a6269319ee2f3efeeb384503e60f08d672d1fdbfb5add18b36027b54fd73e75b6a71c00cb97d88049c1c5935be93df2ef SHA512 05f6d2f4047ee61b977dc999baae20c7b607bd22182c23a1a9435c1e9a3e5c5a13189cc9976a01d4dc4f82024d907804e8263c4cbbfa1f8c994ea30a1e74addc
diff --git a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild
index 567334ab267f..f9b2425875ad 100644
--- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild
+++ b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild
@@ -7,7 +7,7 @@ inherit user
 
 DESCRIPTION="Download and install third-party clamav signatures"
 HOMEPAGE="https://github.com/extremeshok/${PN}"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/extremeshok/clamav-unofficial-sigs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-6.0.1.ebuild b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-6.0.1.ebuild
index e2a1d380c127..6fc6ec0b574c 100644
--- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-6.0.1.ebuild
+++ b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-6.0.1.ebuild
@@ -7,7 +7,7 @@ inherit user
 
 DESCRIPTION="Download and install third-party clamav signatures"
 HOMEPAGE="https://github.com/extremeshok/${PN}"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/extremeshok/clamav-unofficial-sigs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 3bfe8f7aed6a..20b51df48f34 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -14,6 +14,8 @@ AUX freshclamd.service 240 BLAKE2B 1b72ffee3b0b1b51811aa5f3c7a52678b3beb260f020d
 AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
 DIST clamav-0.101.2.tar.gz 21722932 BLAKE2B 5c2960e678510a6f829fc9333e05a45a57a704e13eb407e0f890dd5553a1f9644eb3b1122c677755237b8c682127319d447a508087bc9130d14cd2cfec92896a SHA512 f9ea4589a8081acf7b6d454d1a068da05ae6574a9070a08f9438935795cb6dc084ffb9222b11fb1623f31962f859e6536a2f5bd1de29ef6b9b314efa5edc8c7e
 DIST clamav-0.101.3.tar.gz 21389753 BLAKE2B f254846dad40bd9dda650ece9dd672ca040fe4779b4f46a5cfa087808711055745d02c65f24da9589420e979a777bc435f68d25f6940ebf283cd0a8f240908b5 SHA512 285e6011ef5b68683daae7287005b2a615d7ee2fb9dac28d6db347cf7fe101da627aaec800366e83551f41afb78c6b08517def7aa30d0f0c347e54344b0b14d3
+DIST clamav-0.101.4.tar.gz 21408145 BLAKE2B 5eba85dcf203f56cbd943e479e660469dcc1972819674f5624207f4123ec74207b664cba3c9b0318665d261176da338f3c3fba9c938eeb626ce75174d525a43f SHA512 fae914a95b674fa6bdea044abec702401146590ca0aaaea1245deb1c4770641a794f60ff7b448b24d8c1923150cb7ba230848974837257c3a8ab20ea1e2f86d3
 EBUILD clamav-0.101.2-r1.ebuild 5557 BLAKE2B 0a1f8899c1ef1079154b5a9a4a39f35abfd78a761ab604979e2cc90a3b843101d6855cb88904cb73e2bd98fdf0202c412ca078067a8f783d75ede7d2c9d6794b SHA512 8745df1a14da9d4001926b135df1123811475e34650c2456bccb1660e73a8a4f7c181f999cfdc0bf0ad53d337af9d7ab96baddb5e9a31a120fd5ba190d4c0d11
 EBUILD clamav-0.101.3.ebuild 5566 BLAKE2B abbe81bf45f67629ceaebd259d517d19b612614b9bb2bc3d28d0db800a894ffdba9f4ff8575461a341e185314c6af54bf4ccabb88fb096af015a98bdf0125630 SHA512 f2e6fd914813195450a1d4b519312ce88444cfe71aacd45a0ede5ac7b41ec6e5391e3b99607305f9f7ac9ced3c9beb26e02dab23429d7ba26bcff694fcf91a6b
+EBUILD clamav-0.101.4.ebuild 5566 BLAKE2B abbe81bf45f67629ceaebd259d517d19b612614b9bb2bc3d28d0db800a894ffdba9f4ff8575461a341e185314c6af54bf4ccabb88fb096af015a98bdf0125630 SHA512 f2e6fd914813195450a1d4b519312ce88444cfe71aacd45a0ede5ac7b41ec6e5391e3b99607305f9f7ac9ced3c9beb26e02dab23429d7ba26bcff694fcf91a6b
 MISC metadata.xml 677 BLAKE2B 0f1325062a27dc76bb5313cf665635af98eac88aeb331247511e24b84006bf5a01a999b7601edaa03a30674838a8c8b784e5f1bcb54117fd254333aca0f9ac10 SHA512 f63fab0eb32bf5f98155e58cbeb987a5a8623adbe44b0dc8b903e5cf8485aec6cca5c7651ca0b3af0dbe387480f9add1e5a158542fe0b5eb73f9d2fcd4cac96b
diff --git a/app-antivirus/clamav/clamav-0.101.4.ebuild b/app-antivirus/clamav/clamav-0.101.4.ebuild
new file mode 100644
index 000000000000..2cfbb3d74498
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.101.4.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic user systemd
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="https://www.clamav.net/"
+SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
+
+CDEPEND="bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses:0 )
+	iconv? ( virtual/libiconv )
+	metadata-analysis-api? ( dev-libs/json-c:= )
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	>=sys-libs/zlib-1.2.2:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-devel/libtool
+	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
+	dev-libs/libmspack
+	xml? ( dev-libs/libxml2 )
+	elibc_musl? ( sys-libs/fts-standalone )
+	!!<app-antivirus/clamav-0.99"
+# hard block clamav < 0.99 due to linking problems Bug #567680
+# openssl is now *required* see this link as to why
+# https://blog.clamav.net/2014/02/introducing-openssl-as-dependency-to.html
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+DOCS=( docs/UserManual.md docs/UserManual )
+HTML_DOCS=( docs/html )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.101.2-libxml2_pkgconfig.patch" #661328
+	"${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
+)
+
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 -1 /dev/null clamav
+}
+
+src_prepare() {
+	default
+	eautoconf
+}
+
+src_configure() {
+	use elibc_musl && append-ldflags -lfts
+	use ppc64 && append-flags -mminimal-toc
+	use uclibc && export ac_cv_type_error_t=yes
+
+	# according to configure help it should be
+	# $(use_enable xml)
+	# but that does not work
+	# do not add this, since --disable-xml seems to override
+	# --without-xml
+
+	econf \
+		$(use_enable bzip2) \
+		$(use_enable clamdtop) \
+		$(use_enable ipv6) \
+		$(use_enable milter) \
+		$(use_enable static-libs static) \
+		$(use_enable test check) \
+		$(use_with xml) \
+		$(use_with iconv) \
+		$(use_with metadata-analysis-api libjson /usr) \
+		--with-system-libmspack \
+		--cache-file="${S}"/config.cache \
+		--disable-experimental \
+		--disable-gcc-vcheck \
+		--disable-zlib-vcheck \
+		--enable-id-check \
+		--with-dbdir="${EPREFIX}"/var/lib/clamav \
+		--with-zlib="${EPREFIX}"/usr \
+		--disable-llvm
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib/clamav
+	newinitd "${FILESDIR}"/clamd.initd-r6 clamd
+	newconfd "${FILESDIR}"/clamd.conf-r1 clamd
+
+	systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
+	systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
+	systemd_dounit "${FILESDIR}/clamd.service"
+	systemd_dounit "${FILESDIR}/freshclamd.service"
+
+	keepdir /var/lib/clamav
+	fowners clamav:clamav /var/lib/clamav
+	keepdir /var/log/clamav
+	fowners clamav:clamav /var/log/clamav
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/clamav.logrotate clamav
+
+	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
+		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
+		-e "s:.*\(User\) .*:\1 clamav:" \
+		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+		-e "s:^\#\(LogTime\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/clamd.conf.sample || die
+	sed -i -e "s:^\(Example\):\# \1:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
+		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
+		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+		"${ED}"/etc/freshclam.conf.sample || die
+
+	if use milter ; then
+		# MilterSocket one to include ' /' because there is a 2nd line for
+		# inet: which we want to leave
+		##dodoc "${FILESDIR}"/clamav-milter.README.gentoo
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
+			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
+			-e "s:.*\(User\) .*:\1 clamav:" \
+			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
+			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+			"${ED}"/etc/clamav-milter.conf.sample || die
+		cat >> "${ED}"/etc/conf.d/clamd <<-EOF
+			MILTER_NICELEVEL=19
+			START_MILTER=no
+		EOF
+
+		systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
+	fi
+
+	if use doc; then
+	   einstalldocs
+	   doman docs/man/*.[1-8]
+	fi
+
+	for i in clamd freshclam clamav-milter
+	do
+		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
+	done
+
+	prune_libtool_files --all
+}
+
+src_test() {
+	emake quick-check
+}
+
+pkg_postinst() {
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
+		ewarn "You must run freshclam manually to populate the virus database files"
+		ewarn "before starting clamav for the first time.\n"
+	fi
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index f79d9be3ebd9..7dc4b48d7bc7 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index 67acff098810..b49c128f231b 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,3 +1,3 @@
 DIST engrampa-1.22.1.tar.xz 1363488 BLAKE2B 0f71e94af50443f9f562b0eed461ca1160fab0a5a3cd02c845fac09ee2466cb8634a458a6a4488ff5ac6674b0f525eccf754b8b1cc7e3f1729d4eb6ac224e025 SHA512 111eeb470555ae8edb7754159bb2e70b03cbbc7b1c9d61c253d9d67e50d84ff0e0654e16547883c39aeeb223e8ba58201d45b50819784fc6cf7a21f0cf176c70
 EBUILD engrampa-1.22.1-r1.ebuild 1680 BLAKE2B c4c11eb9ed21b405777c6957200bcf5cd9d1f6bf34f10a9c8133a4c89a7975674bd614f7d2829e180178542ed76cb0428b52907f65265919642ee3de3aa26936 SHA512 16356039e8f8b466896b418b9f804a0984d661bedc4643ab5d021c93783f4b4dca22d9571749165bece0e1a6392e763bca02f3d8d3862f7b16c60bd54cd3ff89
-MISC metadata.xml 702 BLAKE2B de15449aa20cc44e6068bd8047630353f3389845a3332b57631bacdc9b9c4b188f8152678240e0142142db322af7058b09060f74413ff55fd1980fe697f32d0d SHA512 b465ea239cabf4ad1cd6b1f5ba7f87151e637595191c1a88cf17059f96ca1b03ce57d4200fc793d56be2b6ddb2ded20be460a4e1ac1727180e9662f9baba4522
+MISC metadata.xml 611 BLAKE2B a8d57ae0c1657b6f17d961b3059746d47249007387dbf3d5dc555279e054e91fbff524e8abf17ffa64d788a3bc8b80f0a7e77977e3544bea849b5843e3ec860f SHA512 304268690ba4159d1bd296c24551b527b2ae9bfa9b99531f686e983d4954b9f00f540792d020d1a2fd46ec9c8a330c87e1bf7bf0073ba379ccdf8f36d49b434e
diff --git a/app-arch/engrampa/metadata.xml b/app-arch/engrampa/metadata.xml
index ff7ba4c5fb87..599ee32795b2 100644
--- a/app-arch/engrampa/metadata.xml
+++ b/app-arch/engrampa/metadata.xml
@@ -9,8 +9,6 @@
 		<flag name="caja">Enable engrampa to integrate with
 			<pkg>mate-base/caja</pkg> by providing entries in its context 
 			menu</flag>
-		<flag name="magic">Enable filetype auto-detection via
-			<pkg>sys-apps/file</pkg></flag>
 		<flag name="packagekit">Enable support for installing via <pkg>app-admin/packagekit</pkg>
 			based on archive type</flag>
 	</use>
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 8a5af6dab7ff..cb8f4b22d37c 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,4 +1,7 @@
 AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe
+AUX libarchive-3.4.0-without_zlib_build_fix.patch 4850 BLAKE2B 2f4a670afa2ca1ec22036b3544d03b04f7cd5fed4ce9829017c07323c45f4d0eae40555856d26a81345f65f6b65d0cb026ae4fa17ed3c1a42392190e390cf069 SHA512 1ae44704d4fcf5477baec6fdbf518dac6b9f40d3648d1a0447c0311b8388a3ab11fdea3db8b249a1cdfde65fcd27c4f41076d3f50444e67ec9bcec1a801775bc
 DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7
+DIST libarchive-3.4.0.tar.gz 6908093 BLAKE2B 6da5798ceabb542d8b877b3d672f6e6431ed7340ec0160a5d8cef28591b516b55d426002379eddc632a478bfd2f034a358f8552f55c9f066fd7f5c31c218b462 SHA512 2f9e2a551a6bcab56fb1a030b5d656df7299a3d151465aa02f0420d344d2fada49dee4755b3abff9095f62519e14dc9af8afa1695ecc6d5fdb4f0b28e6ede852
 EBUILD libarchive-3.3.3.ebuild 3625 BLAKE2B 572ade5c05fa4a9951c6ffca4ccf5dfecbaa1a13538ec8f7589823b7dd90f3476722f92afa79d615236811f8838f852c2a68803ac74756022eb9167607de32df SHA512 e87384a803a6a4148517ce235f2be295f6b59c7e8e0bba6a9c0c2b1bc3be90d5eb41d1763efe70a30fce202c77bd3e56b71213135dec26aaf8a5540cc46f1c60
+EBUILD libarchive-3.4.0.ebuild 3691 BLAKE2B f45351446ccf244340cfbce44cc0eacefee6f906b3c35aa6f0c2ded9d7215e70eec6ca1b81f88731ee47da444d8d4683c9b2a55d51438430ca230e89e07683aa SHA512 ef81ab5a6a773e6061729f726a6af5d752693e98b97c07c573d8e4c32fae1c22165d866f46500c2994cbe151f9c828c411b1277d18e5e57eedcd8d4ec06f9602
 MISC metadata.xml 1447 BLAKE2B 342ab0c5aeb3fdae86b39228d4df3c98163b55c1fa23318b2b7a22f714303f1f0615d60d9c057b0a91f90e61e6a7357043096463ca3efe1e8d5cbcd2a5897ce9 SHA512 85b5c67f258ab07b14f15967024bd5d1f11a81bd203e67d40398b42b3728735e28cf2645a0db865c6b6ed81a64da6de470ce62c882d0f72dbceb5361f791b81d
diff --git a/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch b/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch
new file mode 100644
index 000000000000..e0a3167390f0
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.4.0-without_zlib_build_fix.patch
@@ -0,0 +1,160 @@
+From 64333cef68d7bcc67bef6ecf177fbeaa549b9139 Mon Sep 17 00:00:00 2001
+From: Martin Matuska <martin@matuska.org>
+Date: Sat, 29 Jun 2019 00:20:58 +0200
+Subject: [PATCH] Unbreak compilation without zlib
+
+Fixes #1214
+---
+ libarchive/archive_read_support_filter_gzip.c | 54 ++++++++++++-------
+ libarchive/test/test_read_format_raw.c        |  4 ++
+ 2 files changed, 39 insertions(+), 19 deletions(-)
+
+diff --git a/libarchive/archive_read_support_filter_gzip.c b/libarchive/archive_read_support_filter_gzip.c
+index 458b6f729..9fa9e2b0d 100644
+--- a/libarchive/archive_read_support_filter_gzip.c
++++ b/libarchive/archive_read_support_filter_gzip.c
+@@ -131,12 +131,20 @@ archive_read_support_filter_gzip(struct archive *_a)
+  */
+ static ssize_t
+ peek_at_header(struct archive_read_filter *filter, int *pbits,
+-	       struct private_data *state)
++#ifdef HAVE_ZLIB_H
++	       struct private_data *state
++#else
++	       void *state
++#endif
++	      )
+ {
+ 	const unsigned char *p;
+ 	ssize_t avail, len;
+ 	int bits = 0;
+ 	int header_flags;
++#ifndef HAVE_ZLIB_H
++	(void)state; /* UNUSED */
++#endif
+ 
+ 	/* Start by looking at the first ten bytes of the header, which
+ 	 * is all fixed layout. */
+@@ -153,8 +161,10 @@ peek_at_header(struct archive_read_filter *filter, int *pbits,
+ 	bits += 3;
+ 	header_flags = p[3];
+ 	/* Bytes 4-7 are mod time in little endian. */
++#ifdef HAVE_ZLIB_H
+ 	if (state)
+ 		state->mtime = archive_le32dec(p + 4);
++#endif
+ 	/* Byte 8 is deflate flags. */
+ 	/* XXXX TODO: return deflate flags back to consume_header for use
+ 	   in initializing the decompressor. */
+@@ -171,7 +181,9 @@ peek_at_header(struct archive_read_filter *filter, int *pbits,
+ 
+ 	/* Null-terminated optional filename. */
+ 	if (header_flags & 8) {
++#ifdef HAVE_ZLIB_H
+ 		ssize_t file_start = len;
++#endif
+ 		do {
+ 			++len;
+ 			if (avail < len)
+@@ -181,11 +193,13 @@ peek_at_header(struct archive_read_filter *filter, int *pbits,
+ 				return (0);
+ 		} while (p[len - 1] != 0);
+ 
++#ifdef HAVE_ZLIB_H
+ 		if (state) {
+ 			/* Reset the name in case of repeat header reads. */
+ 			free(state->name);
+ 			state->name = strdup((const char *)&p[file_start]);
+ 		}
++#endif
+ 	}
+ 
+ 	/* Null-terminated optional comment. */
+@@ -236,24 +250,6 @@ gzip_bidder_bid(struct archive_read_filter_bidder *self,
+ 	return (0);
+ }
+ 
+-static int
+-gzip_read_header(struct archive_read_filter *self, struct archive_entry *entry)
+-{
+-	struct private_data *state;
+-
+-	state = (struct private_data *)self->data;
+-
+-	/* A mtime of 0 is considered invalid/missing. */
+-	if (state->mtime != 0)
+-		archive_entry_set_mtime(entry, state->mtime, 0);
+-
+-	/* If the name is available, extract it. */
+-	if (state->name)
+-		archive_entry_set_pathname(entry, state->name);
+-
+-	return (ARCHIVE_OK);
+-}
+-
+ #ifndef HAVE_ZLIB_H
+ 
+ /*
+@@ -277,6 +273,24 @@ gzip_bidder_init(struct archive_read_filter *self)
+ 
+ #else
+ 
++static int
++gzip_read_header(struct archive_read_filter *self, struct archive_entry *entry)
++{
++	struct private_data *state;
++
++	state = (struct private_data *)self->data;
++
++	/* A mtime of 0 is considered invalid/missing. */
++	if (state->mtime != 0)
++		archive_entry_set_mtime(entry, state->mtime, 0);
++
++	/* If the name is available, extract it. */
++	if (state->name)
++		archive_entry_set_pathname(entry, state->name);
++
++	return (ARCHIVE_OK);
++}
++
+ /*
+  * Initialize the filter object.
+  */
+@@ -306,7 +320,9 @@ gzip_bidder_init(struct archive_read_filter *self)
+ 	self->read = gzip_filter_read;
+ 	self->skip = NULL; /* not supported */
+ 	self->close = gzip_filter_close;
++#ifdef HAVE_ZLIB_H
+ 	self->read_header = gzip_read_header;
++#endif
+ 
+ 	state->in_stream = 0; /* We're not actually within a stream yet. */
+ 
+diff --git a/libarchive/test/test_read_format_raw.c b/libarchive/test/test_read_format_raw.c
+index 0dac8bfba..3961723b4 100644
+--- a/libarchive/test/test_read_format_raw.c
++++ b/libarchive/test/test_read_format_raw.c
+@@ -36,7 +36,9 @@ DEFINE_TEST(test_read_format_raw)
+ 	const char *reffile1 = "test_read_format_raw.data";
+ 	const char *reffile2 = "test_read_format_raw.data.Z";
+ 	const char *reffile3 = "test_read_format_raw.bufr";
++#ifdef HAVE_ZLIB_H
+ 	const char *reffile4 = "test_read_format_raw.data.gz";
++#endif
+ 
+ 	/* First, try pulling data out of an uninterpretable file. */
+ 	extract_reference_file(reffile1);
+@@ -119,6 +121,7 @@ DEFINE_TEST(test_read_format_raw)
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+ 	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+ 
++#ifdef HAVE_ZLIB_H
+ 	/* Fourth, try with gzip which has metadata. */
+ 	extract_reference_file(reffile4);
+ 	assert((a = archive_read_new()) != NULL);
+@@ -144,4 +147,5 @@ DEFINE_TEST(test_read_format_raw)
+ 	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+ 	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
++#endif
+ }
diff --git a/app-arch/libarchive/libarchive-3.4.0.ebuild b/app-arch/libarchive/libarchive-3.4.0.ebuild
new file mode 100644
index 000000000000..47f77c61efdd
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.4.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="Multi-format archive and compression library"
+HOMEPAGE="https://www.libarchive.org/"
+SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
+
+RDEPEND="
+	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	)
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.3-libressl.patch
+	"${FILESDIR}"/${P}-without_zlib_build_fix.patch #693202
+)
+
+# Various test problems, starting with the fact that sandbox
+# explodes on long paths. https://bugs.gentoo.org/598806
+RESTRICT="test"
+
+src_prepare() {
+	default
+	elibtoolize  # is required for Solaris sol2_ld linker fix
+}
+
+multilib_src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	local myconf=(
+		$(use_enable acl)
+		$(use_enable static-libs static)
+		$(use_enable xattr)
+		$(use_with bzip2 bz2lib)
+		$(use_with expat)
+		$(use_with !expat xml2)
+		$(use_with iconv)
+		$(use_with lz4)
+		$(use_with lzma)
+		$(use_with lzo lzo2)
+		$(use_with nettle)
+		$(use_with zlib)
+		$(use_with zstd)
+
+		# Windows-specific
+		--without-cng
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
+			--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
+			--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
+		)
+	else
+		myconf+=(
+			--disable-bsdcat
+			--disable-bsdcpio
+			--disable-bsdtar
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake libarchive.la
+	fi
+}
+
+multilib_src_test() {
+	# Replace the default src_test so that it builds tests in parallel
+	multilib_is_native_abi && emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		emake DESTDIR="${D}" install
+
+		# Create symlinks for FreeBSD
+		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
+			# Exclude cat for the time being #589876
+			for bin in cpio tar; do
+				dosym bsd${bin} /usr/bin/${bin}
+				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
+				doman "${T}"/${bin}.1
+			done
+		fi
+	else
+		local install_targets=(
+			install-includeHEADERS
+			install-libLTLIBRARIES
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${install_targets[@]}"
+	fi
+
+	# Libs.private: should be used from libarchive.pc instead
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+multilib_src_install_all() {
+	cd "${S}" || die
+	einstalldocs
+}
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index fa25a4386382..26dc26e93bb0 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,6 +1,8 @@
 DIST lz4-1.8.3.tar.gz 327897 BLAKE2B e2be80be14c67cf1a07cc6a2e6f6777a87abdd15499b9c32b8096e09284aea19620adf930e28454ce105e325cff684d2625e0a38211705f3c105a80b72f56be5 SHA512 5d284f75a0c4ad11ebc4abb4394d98c863436da0718d62f648ef2e2cda8e5adf47617a4b43594375f7b0b673541a9ccfaf73880a55fd240986594558214dbf9f
 DIST lz4-1.9.1.tar.gz 285336 BLAKE2B 50dfad2e92028a1ccfe186efb5dbe24e4641e104da656990ba5138a84d29fbfea26d96c2d7f64f8d6a686dc98b4890990a280d4d86e321b04f467b65b6c61e1f SHA512 536cdeb6dd73b4769cf9501ad312b004ab01699758534b47ca2eddbc815fd374a3caba40cde36f73a7a70e134065836b733e2b0c023c31740b877ef9317ccf3e
+DIST lz4-1.9.2.tar.gz 305796 BLAKE2B 0021487bee8657bc825fdd2b98a6dc8a6d10be3240fe0bebf6563e9c855a15bf5440a02d5cd6ee1f1e8502743348bcec1e866d3287b07e623887e9eb9da35eee SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
 EBUILD lz4-1.8.3.ebuild 911 BLAKE2B 674ce798fb551fd4bdc4a0e5b2913f238532439e98c8887a5d3cb64e7bf5a7349e225dc290da191c97f01a2b03a8770409b915513c65d710bbc072de6b4aa8f6 SHA512 982493e85bf02014b490a10e4dc57e25e193e493ef6fcb65f77af84dab9501fef5087bd8d80f3e16f4cffa4cec025e7ecc1829ff163f5a043fd35fa4a55a3487
 EBUILD lz4-1.9.1.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
+EBUILD lz4-1.9.2.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
 EBUILD lz4-9999.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
 MISC metadata.xml 537 BLAKE2B fe6b4b4291dd1358a873cf34cd4f62fc6b08ac0db2449c7bb2840a715f13c68521140b244f66f00e8881ed53b4d66e988d71baf75bc6b5c79dbbabc2d12f6615 SHA512 4fc89afbcd032d88e43f346105f02da50e946c706f60aa7991c64e768941409e335005c6a4f283c0dd4d2ddc8faba53e4968334763e9c8c46538bc5810fe9699
diff --git a/app-arch/lz4/lz4-1.9.2.ebuild b/app-arch/lz4/lz4-1.9.2.ebuild
new file mode 100644
index 000000000000..f68caa90b673
--- /dev/null
+++ b/app-arch/lz4/lz4-1.9.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lz4/lz4.git"
+	EGIT_BRANCH=dev
+else
+	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Extremely Fast Compression algorithm"
+HOMEPAGE="https://github.com/lz4/lz4"
+
+LICENSE="BSD-2 GPL-2"
+# https://abi-laboratory.pro/tracker/timeline/lz4/
+SLOT="0/r132"
+IUSE="static-libs"
+
+CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-arch/mt-st/Manifest b/app-arch/mt-st/Manifest
index ec8e43d0f454..b417b3fcfec0 100644
--- a/app-arch/mt-st/Manifest
+++ b/app-arch/mt-st/Manifest
@@ -1,4 +1,4 @@
 DIST mt-st-1.3.tar.gz 35341 BLAKE2B c58eee9bd58a3fa5105fe3f8dfb56f1af1c5ed73f99e5179ea14bc11d66151d1e6b6c99f61194c700ed79ce10a7e7f75f78ffe9b7d2c45c85e620d4da1aaeb5c SHA512 1d026ae85e1ca367e72f1810042314070f592306d9ddec331b95ea4e1153dc3edee68d8798bdf7e055a4cf9c67ec8c539e5d188e87f0546f48b5f4ee4bc6a820
-EBUILD mt-st-1.3.ebuild 553 BLAKE2B 771bd7f4331a3bf7a3d47c14c767e998219474d3e1740a6cb0e6479f1fafd64cbc16ee5da23c9fea150aef89be89a919f4b2984bd57927bc3ea47d1953274470 SHA512 4a03eaace0857dd917054aab4a5040872bfee230cdb5b3b5560d3b2982c31a3ba235ed821920faf78c93b69aa31e9b48b97e57d0975c51f59363fbdc61e410bd
-EBUILD mt-st-9999.ebuild 483 BLAKE2B 87f468fd1451e561a88a635b6720ef63c39af6a2d576eb671c542519a56f4ad4211a5ccb432bdd23bab63246bfec9ccc3a5cf9f5005db43c0696977c14efaff1 SHA512 d10eb52475d7b3cf4068e819e40241edbf23e3b0f973428837318898c339616a894468111c5d28c188f6ecb8b2626d7aaf419dc89300036c5694fc04a1078c76
+EBUILD mt-st-1.3.ebuild 570 BLAKE2B 643ee3126a258b136974f5d582e7f20a93480438ddba1f14af47942bce0848d100c28f31487403997cb42cf0eeff7a7f6c1600522166d41dfd414a3489ad7498 SHA512 81bbac5ef51b24e1ff4675d47959bc02f9e7d7c3cb28b16b550451b299ac27327d87ff394a03250eecb517ad8a47391a551baade7ce91c0f09a7920f206ec172
+EBUILD mt-st-9999.ebuild 504 BLAKE2B 2d69178b0c8017e89b955d53b3588f6b5666626414608ec13d235f3b4b92abfddb8491d60bc0f0ad36cb118d7ff5815ad72e0e8e3f37fcd1060ae4018ae52f62 SHA512 19cd995be404408fbc7494c15e2ab29ac50f84b99c14f5293ecf806eb2b179e7277538365d2549de80dbbf5fe5a3c89499c5b82e04892824819999880e967dbb
 MISC metadata.xml 321 BLAKE2B 3f2c57ecada60ab514926a4ddfe2fc0bdc11148a50bdeed1d336f13863e735f83056d4e647e80995c90fba92466252c2ec202e2fa9e3c667ba5a8ae6acbcece1 SHA512 79dc941553281909153cdda8422d4ac5da172a6d782936986b581a1300dcf4b4781704bb7c730f48905f0dc487f5ce781bd96abde16691d67bf5da220eb94471
diff --git a/app-arch/mt-st/mt-st-1.3.ebuild b/app-arch/mt-st/mt-st-1.3.ebuild
index d45c956874e4..d7efcd0bd4c0 100644
--- a/app-arch/mt-st/mt-st-1.3.ebuild
+++ b/app-arch/mt-st/mt-st-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"
@@ -7,7 +7,7 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="control magnetic tape drive operation"
 HOMEPAGE="https://github.com/iustin/mt-st"
-SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz"
+SRC_URI="https://github.com/iustin/mt-st/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-arch/mt-st/mt-st-9999.ebuild b/app-arch/mt-st/mt-st-9999.ebuild
index 7433526bff92..0ec674f2d8b3 100644
--- a/app-arch/mt-st/mt-st-9999.ebuild
+++ b/app-arch/mt-st/mt-st-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,7 @@ inherit eutils git-r3 toolchain-funcs
 
 DESCRIPTION="control magnetic tape drive operation"
 HOMEPAGE="https://github.com/iustin/mt-st"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/iustin/mt-st.git"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index ac4cb876c35c..1b48b278e9c0 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1,3 @@
 DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
-EBUILD pigz-2.4.ebuild 962 BLAKE2B eae850ab8f99931694b69edb474996f531673049bd83ff7318e868f6da086c9106e6c98a87da2b78aba2106853c9ac609c6e50cd74496bf400c03a48d17e1b4c SHA512 6e321cd89df80d9386b7edb5cc72e4c5ac1c1d253ee74ccafcd3c8e529b9da5624216b216cd7a012269f06c731d8018b1b6dff124b2787cfe04fc8db04239d3f
+EBUILD pigz-2.4.ebuild 959 BLAKE2B 0920a8eb84c9b2e51da97df8f4f5bcdbce4a6e4ffe7ed097586a2af9585e32690528e4b41c0bb275457cd07b4cac45495126081c2f82812f006c11b4f16ec3bb SHA512 a92e6ad4ae204480b6fc9bdcab8fae4912557108fc830f0aff9715d46986444dd7644357f39eba5bf9ec58083ce9b567d83e5c81b84179986040e250c76e9e75
 MISC metadata.xml 499 BLAKE2B a3f4937154e9907d34d3779407b1bfc07e8de329cb34b0efe4b62f20b4c9f5b9eb09d22023496e4f5228f1cb64bb4829c30730fe6035128b14e759073ec83a82 SHA512 7c954984f01ee2bf1bb9b8f0840445fed7f47899188a884462c59a862bef568845c2cb81a966aa6d46222d45ab7a9fabfc24b1bb4d178f9f8fb1789554ca87fe
diff --git a/app-arch/pigz/pigz-2.4.ebuild b/app-arch/pigz/pigz-2.4.ebuild
index ed4dddd258c9..dfe5ab863353 100644
--- a/app-arch/pigz/pigz-2.4.ebuild
+++ b/app-arch/pigz/pigz-2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
 IUSE="static symlink test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
index 1dd724d6bd25..4324e1a8f4d2 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -1,4 +1,5 @@
+AUX pixz-1.0.6-avoid-unaligned-accesses.patch 1253 BLAKE2B e852f1c991bc7ba282b47516598d09a41182f01ceade67276dcfb192767c1bf33a36cf992d5de201bddc24790896af9e22e83f3fcd48a84f3ea3f6c9cfd7e50e SHA512 6390ec34f3d7d07be6ef6842a631d2e2ef87abe54e5f745846a6c08a4c1a7c15d50d3327afae131dd4b64a66ff187ada1d4cdae4f4503c33e249dc238082ce9a
 DIST pixz-1.0.6.tar.xz 119516 BLAKE2B 758a4985b946284587998ab2a653e51ded9838a7c77c7795c82c15c1693714468b07c2cbfd86a0c7ce7be34d9a5bd8fdc3285d503524ce299ba53179447e60ed SHA512 361a8d8b736c350e4e3fd19b5d36777129a087eb81439d05edc08f9378938583bef8fc70e440ffd22efb6dad1f6494c6c3e532d7dd1ab12c9350b6078aa993d7
-EBUILD pixz-1.0.6.ebuild 1129 BLAKE2B e5ca5eb79990e3131dc834d23d79f4d76e1625da66f167764a679362b032cdd5f900e5f582037765456000bbc0e68781c43323fe6003d917a0f3d465ec255f44 SHA512 a7ba1aca5481d1d92dc35e4e8457a1c5c7a8d65b2df7f31b7cbe845e2f88d247cf5ad9e588b4a017c5d97fe030ac070c0bbcf362f222d0e73596e2581d177f2e
+EBUILD pixz-1.0.6-r1.ebuild 1192 BLAKE2B b16efeaccd366807cf0e6d9cea800677b05231397e7de49b11274339fb27b5b8c31935051850fdc43af59fc3c794b0b24cd02ce56b61de1ed6cc244b384ede3a SHA512 b6465574d64efd6a27db3a52b9ae5227ac8c54b192761b5d97041416d6671ec55a4f5608da11e4824d5a3da04feda331dbb94e8be8a46603c6faaf79f6e54686
 EBUILD pixz-9999.ebuild 1133 BLAKE2B 1df4240b4409c81ce3a28ac47a276954e3b977c1964411c995e8335da4246fd79350be5c1543b5ab896230fb81a28c6aa8ec7be26b0e5d87d2bf0c45f1cb8a7c SHA512 350b2274074199349d2724816d233df340c015a2fa2efc228bae5bf35838a92ce91150e9d3b0bc86cca7433830288876da11d6217a79bd4495d8e5ae974dab16
 MISC metadata.xml 331 BLAKE2B 15bff5a59c7a5ff1dc23d59a9c9acda8ad40691a1b79d992ea05eaab0436e56cf0419f0e70b4e8dbeed37bee33735bb6700a85a2f26d50fd857cb38eb55f152c SHA512 54391cfef5b3719b7ad708cc7367740ba68f3223e0d92ae8ae5992ff127f41291fc1afa0d0bd7a1a02cf53b76c3817a57696a16ae535f8522e9d9249f4ddf401
diff --git a/app-arch/pixz/files/pixz-1.0.6-avoid-unaligned-accesses.patch b/app-arch/pixz/files/pixz-1.0.6-avoid-unaligned-accesses.patch
new file mode 100644
index 000000000000..24c53c9acc4a
--- /dev/null
+++ b/app-arch/pixz/files/pixz-1.0.6-avoid-unaligned-accesses.patch
@@ -0,0 +1,44 @@
+https://github.com/vasi/pixz/pull/82
+
+From 8b9a198d86e435929ed0c2246217d241ed1e707c Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 1 Sep 2019 23:58:26 -0700
+Subject: [PATCH] Avoid unaligned accesses
+
+Architectures like SPARC do not allow unaligned accesses. Avoid them by
+memcpy()ing the data to an aligned buffer. On x86 systems where
+unaligned loads are fast, the memcpy() will be compiled away and the
+same code generated as before.
+---
+ src/endian.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/endian.c b/src/endian.c
+index 51aea58..122c7da 100644
+--- a/src/endian.c
++++ b/src/endian.c
+@@ -13,6 +13,7 @@ void xle64enc(uint8_t *d, uint64_t n) {
+ #elif defined(__linux__) || defined(__FreeBSD__)
+ 
+ #include <stdint.h>
++#include <string.h>
+ #ifdef __linux__
+ 	#include <endian.h>
+ 	#include <byteswap.h>
+@@ -37,11 +38,14 @@ void xle64enc(uint8_t *d, uint64_t n) {
+ #endif
+ 
+ uint64_t xle64dec(const uint8_t *d) {
+-    return le64toh(*(uint64_t*)d);
++    uint64_t tmp;
++    memcpy(&tmp, d, sizeof(tmp));
++    return le64toh(tmp);
+ }
+ 
+ void xle64enc(uint8_t *d, uint64_t n) {
+-    *(uint64_t*)d = htole64(n);
++    uint64_t tmp = htole64(n);
++    memcpy(d, &tmp, sizeof(tmp));
+ }
+ 
+ #else
diff --git a/app-arch/pixz/pixz-1.0.6-r1.ebuild b/app-arch/pixz/pixz-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..7e2076596294
--- /dev/null
+++ b/app-arch/pixz/pixz-1.0.6-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/vasi/${PN}.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+fi
+
+DESCRIPTION="Parallel Indexed XZ compressor"
+HOMEPAGE="https://github.com/vasi/pixz"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="static"
+
+LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
+	>=app-arch/xz-utils-5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-avoid-unaligned-accesses.patch
+)
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	append-flags -std=gnu99
+	# Workaround silly logic that breaks cross-compiles.
+	# https://github.com/vasi/pixz/issues/67
+	export ac_cv_file_src_pixz_1=$([[ -f src/pixz.1 ]] && echo yes || echo no)
+	econf
+}
diff --git a/app-arch/pixz/pixz-1.0.6.ebuild b/app-arch/pixz/pixz-1.0.6.ebuild
deleted file mode 100644
index bd8d4125bb53..000000000000
--- a/app-arch/pixz/pixz-1.0.6.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"
-
-inherit flag-o-matic
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/vasi/${PN}.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
-fi
-
-DESCRIPTION="Parallel Indexed XZ compressor"
-HOMEPAGE="https://github.com/vasi/pixz"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="static"
-
-LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
-	>=app-arch/xz-utils-5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-[[ ${PV} == "9999" ]] && DEPEND+=" app-text/asciidoc"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	append-flags -std=gnu99
-	# Workaround silly logic that breaks cross-compiles.
-	# https://github.com/vasi/pixz/issues/67
-	export ac_cv_file_src_pixz_1=$([[ -f src/pixz.1 ]] && echo yes || echo no)
-	econf
-}
diff --git a/app-arch/qpress/Manifest b/app-arch/qpress/Manifest
index a50b803cd869..1066cd43b93e 100644
--- a/app-arch/qpress/Manifest
+++ b/app-arch/qpress/Manifest
@@ -1,4 +1,5 @@
-AUX makefile 128 BLAKE2B 8022d7cac27556d27a2ca1e4c760ec4c59fb1073071f2cb0877ea6554f340ffe5a2dee4c2e786173c8cc73e73319420c38d33cf43e243213f67f3e3c47129d16 SHA512 57004d5735f486170824b3056970d2c4787abf0708e0771b1a7161f942458abea9edc223d940a93f0560d630fe80d7ab6053e20984120ffda545349bcf4debfd
+AUX qpress-1.1-fix-build-system.patch 231 BLAKE2B e8fa8dad2a660d37e927f254804ad9a5e556d7f6058c0ed28a46c08070d8f790765eefe41506216cc6f7e11d1813d55ef39fdd6a65470ccc85ac63e052196da4 SHA512 9e6123baed7917d484aba0dfadd9f0382f6739bf7ee4600cd5248034276bd6cd7e71a5ebe1314734182caaa2448a1fe33639c57d611d08459f3d8fef718ba618
+AUX qpress-1.1-fix-includes.patch 158 BLAKE2B fa446d129cfc56fc7d53c342df334810311de9c5e903ee8402e78b196583d5caefee29bdc2381e4f5c9193f57a328f196e68e0c79031ca37fbe40ce7d7aedeed SHA512 321cdafc7ca71597c4ccf94a8493ff5156cb7103266d5c71ad4e650efded68e91dc655ae567562f5bc28913b137d9d3f142fbe295703864277e4e53729bf4658
 DIST qpress-11-source.zip 26998 BLAKE2B 08dd943f248f7211e8588fbaf7a2c2eee988d33b17aebfb5f1178647d80314fde576caec9b4aab67d69689f5931d086f88fd51204c1df6d3abc2cca583830380 SHA512 986754cca8bb2cdcfc7e197f7e123c6b2da90db840642a6385f14613f49f7ec6b2c18944838405fe35d5382d71fcd5d69050a036dda4c5de2e588d144e16ea6b
-EBUILD qpress-1.1.ebuild 525 BLAKE2B 9fc94482e6d05ba3d8ab6176ded9443e853173b2a3a10b55110fbd9a65c8cfef2d5ac37ac7cc40bfd5bfc2d09bb163976d0dcc61ab6fe77d7b78e3b07d79145d SHA512 aee317456ab1126bb2c4f7a9eaa487f8ae6487e3777ee1d63433afdc12d11fef66c699e6e809c29de7b93ef8d068216efd33eecdbc1cbb2f537648eb96f680e5
+EBUILD qpress-1.1.ebuild 589 BLAKE2B 0335a96ebdca99ddf6fc95ab3baa9c519dd2a5786df3f1f3bcbd68186b439cb273ccd137813b585ec92a4d5196dbb0a288307a704da15ad1c3ab711062e2167d SHA512 a1825c173d6c2222a8533bb363d87c6432e77e2c064832d52aea57c934ed3543e19abb26604dc9e588c78489db614c751eb5d63147ef6588ba6ebd1624d69773
 MISC metadata.xml 477 BLAKE2B ac47bfa42430372f34f6bb63148e95db752d885f1f64740d3d2a817189e01921659914c1b16c5e5b5ec3810c9e654c9a56b2803c164249d5c009bd76de1e0af0 SHA512 e75146f4a742e9c51d47ea4e0c2e4058547378907abc0fce61e83d048c7af2eebe67fbb2f52d9affdef9a793e7c6abf63c5a1799dbe45b37c3dba74cafeffaba
diff --git a/app-arch/qpress/files/makefile b/app-arch/qpress/files/makefile
deleted file mode 100644
index 63c1f91b3943..000000000000
--- a/app-arch/qpress/files/makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-CXX ?= g++
-CXXFLAGS ?= -O3
-LIBS=-lpthread
-
-qpress:
-	$(CXX) $(CXXFLAGS) qpress.cpp aio.cpp quicklz.c utilities.cpp -o $@ $(LIBS)
diff --git a/app-arch/qpress/files/qpress-1.1-fix-build-system.patch b/app-arch/qpress/files/qpress-1.1-fix-build-system.patch
new file mode 100644
index 000000000000..b6f7c0f2841b
--- /dev/null
+++ b/app-arch/qpress/files/qpress-1.1-fix-build-system.patch
@@ -0,0 +1,7 @@
+--- a/makefile
++++ b/makefile
+@@ -1,2 +1 @@
+-g++:	qpress.cpp aio.cpp quicklz.c utilities.cpp
+-	g++ -O3 -o qpress qpress.cpp aio.cpp quicklz.c utilities.cpp -lpthread
+\ No newline at end of file
++qpress: aio.o quicklz.o utilities.o
diff --git a/app-arch/qpress/files/qpress-1.1-fix-includes.patch b/app-arch/qpress/files/qpress-1.1-fix-includes.patch
new file mode 100644
index 000000000000..51bfee465aa9
--- /dev/null
+++ b/app-arch/qpress/files/qpress-1.1-fix-includes.patch
@@ -0,0 +1,7 @@
+--- a/qpress.cpp
++++ b/qpress.cpp
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ /*

+ qpress - portable high-speed file archiver

+ Copyright Lasse Reinhold 2006-2010

diff --git a/app-arch/qpress/qpress-1.1.ebuild b/app-arch/qpress/qpress-1.1.ebuild
index e7787c7973a5..21904daf9eb3 100644
--- a/app-arch/qpress/qpress-1.1.ebuild
+++ b/app-arch/qpress/qpress-1.1.ebuild
@@ -1,7 +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
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="A portable file archiver using QuickLZ algorithm"
 HOMEPAGE="http://www.quicklz.com/"
@@ -11,14 +13,18 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+BDEPEND="app-arch/unzip"
+
 S="${WORKDIR}"
 
-src_prepare() {
-	default
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-fix-includes.patch
+	"${FILESDIR}"/${PN}-1.1-fix-build-system.patch
+)
 
-	# Fix compilation with newer gcc
-	sed -i '1i #include <unistd.h>' qpress.cpp || die
-	cp "${FILESDIR}/makefile" "${S}" || die
+src_configure() {
+	tc-export CC CXX
+	export LDLIBS="-lpthread"
 }
 
 src_install() {
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 3e2822c414d8..bab624f9915a 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -5,5 +5,5 @@ DIST rpm-4.14.1.tar.bz2 4103880 BLAKE2B 3fa7579a251b02ec89943b5505ad9ca7303a444e
 DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990
 EBUILD rpm-4.14.1-r1.ebuild 3378 BLAKE2B ab21c2c5d3905e96714fd2b7c3a36fdaa48d653d2a20e2f0ee6691332fa766a75062d7796228b597c62cdfdf34a26b4d94aa8c0903aa99bb4496d76cdcf845db SHA512 53b989149750de0fceb54d078bfac14e7fe8fef10d8f20571121dd9dbddcabf094e9cffe7f563b3e765a38f0e57066d35de9624ab9c6c1a141bf51140fdd632a
 EBUILD rpm-4.14.1.ebuild 3232 BLAKE2B defbcce58975a000c217ef7b0d15207eaa4606a595668d58eeb1d7275373b58a6adf9b0770ffd4d4db26ed73ab479ca3309bb13e101f389613687c6b0627defa SHA512 b8f39f1a6beac35dab8cce8e35727bc6832dbedf32b28df19f76c0db50071055485869227fc4dfcc6cab21f3ca69797ce5e451b0aa55ff25b578987ba0f34fd7
-EBUILD rpm-4.14.2.1.ebuild 3431 BLAKE2B f098254f82fd5fd0c5723beb775c82e89b695d6b6da5ac3b033cbf8b9c0a5f91574a44fe27c553121448053e2dc62dd307913ba0b489860d495dea457dc27411 SHA512 721d3607ea841b3ef130b2eca2fd823fa8218e202df194ec2a24d7fe4715af5e47c863d284fcb0d6fd5d3cb81ff83bea7a9c560881ef619e77bd306d3a773370
+EBUILD rpm-4.14.2.1.ebuild 3448 BLAKE2B 693af92b62da342676262cc9972c3649a92a46d5df174bee4ae78333d4d706bde074893017586cd78b887ee856971c1cb1a09247dee870e8d2b643d04a80643c SHA512 df234d544da90db5683227c69f77f4ce47fb3d139cf63fbb9091534350171cb962ba44dcbe56ed0f0861352a14bc4d60fea4ecd1937df739e936b5bd8c1326bf
 MISC metadata.xml 337 BLAKE2B d01523bdc86c3b93ae548f601265338290470dcb578a79757ba7d3b2c4be257c89e76c97b5d411f9271d9ee754981a004b03e2a5cfe9b6bd56e32932796771c9 SHA512 20a89c9f7af0c1a7dd5f325eb3c1af65044a6f09e6ea8c70033bf35819ee18faf8c3a0ee2cebcbc0849a84e962dbbdd2111e02b3369d0feccf3719dc0bcfa6cc
diff --git a/app-arch/rpm/rpm-4.14.2.1.ebuild b/app-arch/rpm/rpm-4.14.2.1.ebuild
index ec73a8f530a3..3988d03e4496 100644
--- a/app-arch/rpm/rpm-4.14.2.1.ebuild
+++ b/app-arch/rpm/rpm-4.14.2.1.ebuild
@@ -82,7 +82,7 @@ src_configure() {
 		$(use_enable python) \
 		$(use_with doc hackingdocs) \
 		$(use_enable nls) \
-		$(use_with dbus) \
+		$(use_enable dbus inhibit-plugin) \
 		$(use_with lua) \
 		$(use_with caps cap) \
 		$(use_with acl) \
diff --git a/app-arch/unar/Manifest b/app-arch/unar/Manifest
index 583c6c577b34..d52d24dadd32 100644
--- a/app-arch/unar/Manifest
+++ b/app-arch/unar/Manifest
@@ -1,3 +1,3 @@
 DIST unar1.10.1_src.zip 2552535 BLAKE2B 678c90dae6572cf9de6f90d044de650d82293df3918eb298de27fe5a557efdda1c1da284c6829c667bb2812033627fcb1a31bf22318d277e9467ca965435f6b2 SHA512 2755f1e2dcca68912f748587f195887d785d5c30933ca0d7a7de1dd35c6c1c115571e49f462fe15722e1b34560f02503382727e1df19a1f23d4a3cc75750434e
-EBUILD unar-1.10.1.ebuild 1169 BLAKE2B ebac22af794e9a19dba80156dfe96c912ddb27b163b485e884a3c9cb7a8e725c01f420f733cf216a5b19c97d50330144700b56f12426152f893d80e33f2cd261 SHA512 e8681f438331639273f32e52a9fd51f761b628584a75ad0792f42fecadde25cc5dbc175a647df031bbb1914b2f848feb1e60ce098e9a707287013ae727936492
+EBUILD unar-1.10.1.ebuild 1182 BLAKE2B 19606fe1687ab46d2080b7441eed97febdba4d99b738e2b2251007d66d94a1d46c5f628ae8c4ef2ec8fdec2e44fefe26c6acc30135fd57af52ce3d00b3821e4e SHA512 2ecbd3d4d8061c2ac9f1f8e3bc0deb978442ebe38d0f9adf35670619f322b754583b292c095a775f0a3e22260a7ca02857e99c6bf1286dac4e6628ef6f07f567
 MISC metadata.xml 299 BLAKE2B e4ba80605afa425e3affada863a2816f561e3ac3a7eba58e6392df43b9772dbc8de406a660688c556a4ebcd48647722bbb1139b2016596901a34712b9a8d4a31 SHA512 6b3bfdb09755e678dc609356ff3819f66574af5718870ff7f2ca29a6f1a1c85e1cc781d713bd27ebc8ae2d44171efabd3a69202f3b1c75323c4f410136c2850f
diff --git a/app-arch/unar/unar-1.10.1.ebuild b/app-arch/unar/unar-1.10.1.ebuild
index e81a5cd05425..dc34191d66c9 100644
--- a/app-arch/unar/unar-1.10.1.ebuild
+++ b/app-arch/unar/unar-1.10.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
@@ -21,6 +21,7 @@ RDEPEND="
 	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	>=gnustep-base/gnustep-make-2.6.0[native-exceptions]
 	sys-devel/gcc[objc]
 "
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 077f3fabd9c1..4d876760f9fc 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -4,8 +4,10 @@ DIST unrar-5.6.6.tar.gz 226484 BLAKE2B f5facddd5c326c039c02b31ac28ba86d5417a51d0
 DIST unrar-5.6.8.tar.gz 226647 BLAKE2B a3f4f791d2527d13003b7d57506e61723312bb0537066c72fa5ea27e4e9de18644f5445b69e9f66ec479402f6d944ce76b17ad9192b3f835ff9781f0902e03c9 SHA512 5410308d7f462824bc10087cdc4515c58aaad776cc09eb6491864a338ae00ff35e3b54d1e7250c0a9576554ea382383155be718a0b95d7af00f27d5df04f4f56
 DIST unrar-5.7.4.tar.gz 228754 BLAKE2B c17faa7c5cc2f58f1f9c105138f3a880f11aa539c9b90be261cadc94c5c3497dae302078e5d9f9df08c7ccc9b30ef324ce7449b7f8d11613422c5466d36969c5 SHA512 46087efce622e45f63b776c51856bf35599863dee164dd149df0dcac18b1b5c912e0419430ceb753c03493307ed1978be8cad51b1d69dca8fcc9bc66b9ea3a58
 DIST unrar-5.7.5.tar.gz 228818 BLAKE2B 2bd9cfaed07802147af9a3457cea3f78f464cc26e2e20ef2c15817fffb7dc275fd326fd96b089257a8044982c0ae130ca3dc42126356d973ee6a8afd43e28df0 SHA512 101a21a20d8e30ca2cccc1605e332579064d362feacb36e9d4a7cd5218585298dcb48ec2805ff9523ae9b25e8e3d3e7557b73ea457702c6cb6d8c50d324ea1f4
+DIST unrar-5.8.1.tar.gz 228917 BLAKE2B 4b34fd35a371ea2784af0968a95270b04afbefd4968c74c44e88d7b79598fe05b01c331ce730cbfd2535d5a713049e7f4dfbd38d28266e957ae9995cf8ce54b3 SHA512 31303df575e8a5ed9fc03e20d0482306536c3496894a39788052c5c9dfde61eb7f5ca29b8c48354581622a020aa446f108af956ab43024a48731a12233155612
 EBUILD unrar-5.6.6.ebuild 1840 BLAKE2B ad0e12315c013ba41e6157da0a8be8ed5dddceef617fc8cfd71c6e639f008988e1af80e11a8fabaa81f25090230e65eae342a913ee9fbb971f0a14f0919e2c6d SHA512 3ebcab78750c4bd802369cb91efbd482d52a3f71f0a234f4d94118897161a1465dc33796625baad03dbfa87dbceec070c7573b4ba43b40a3d4ecdf1c136f2e7d
 EBUILD unrar-5.6.8.ebuild 1843 BLAKE2B f3ed98db99dd9b96d2e31dab991871602ce9cad540674da447251af038ac1f11df703c42804597ec47de774cb1774628b83f8c2c7e5f83ab4eba6e87b0cfec36 SHA512 23550c05e189eee8dd4d5e53d91b47ffcce3d52c20c055d0fb492cb68573af941c538ca6658d8c4a468b44d43f98ce0d9c864f5b4bb9e57b0ceb574d5eb506c7
 EBUILD unrar-5.7.4.ebuild 1884 BLAKE2B c87dc0676dc54a2ad1daae0f621c6534b90d2af35d8ae8523b95119525a348700c00301cdb90305576f70cae71f1d0860d18c9a5541d0193ffb088adbc7baded SHA512 1deaaf16cd04d6ee6e7fd1c33f210a100ab6fd4e9709d910c6c7e5ed8a080eceb440bf969e7faecd199cf646b25dbd39a776153cf885166afcaca5511cfb480a
 EBUILD unrar-5.7.5.ebuild 1894 BLAKE2B ae6393adfbe7039dde87cbb0245ca5a331a532eceecba5714edec1141638e64dc4630cfcc70dd53f96b7f698d949be12ca1a1012869ec95bdc22cc3259ec6fea SHA512 078cee1baa547c9f151beeb15424ab39f9bad8697828f6a5528925eacad3d87ae00d73db6c60faaa71089a5ec0f168b01a292a65bb618b8db0a0ba56e2a9d224
+EBUILD unrar-5.8.1.ebuild 1902 BLAKE2B 0b6cf0e2c32279ef92e21c68358c68e778da9fbd2e9727737ff16751695316b535b22c5ebc86a88e17b741c9cd97aa5e7608d8ed930aa735695eae944c356952 SHA512 5c7d1dee03603eab1464dcf87fc5858cd00a9d601a9ce4226068265936b1f0df402bf2e103a4add4db9fd948a60744f1898d124b621882b0228b10351090a867
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-5.8.1.ebuild b/app-arch/unrar/unrar-5.8.1.ebuild
new file mode 100644
index 000000000000..76112ad11f74
--- /dev/null
+++ b/app-arch/unrar/unrar-5.8.1.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 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}" -type f -name "*.a" -delete || die
+}
diff --git a/app-arch/unshield/Manifest b/app-arch/unshield/Manifest
index 5e6c0cb55485..efc2cbe5cb6d 100644
--- a/app-arch/unshield/Manifest
+++ b/app-arch/unshield/Manifest
@@ -1,4 +1,4 @@
 AUX unshield-1.4.3-mandir.patch 776 BLAKE2B 6d0c23a3cf0457ffb03f8f6a08667bfec7bd2fe1744867febfd9ce9a786a0e7b84408cbd5a2c23eb94c68d33a17d2c638ab7e44ea6ae0d95d5c0cc280b0ed585 SHA512 4acc69f49e3828f1dac5448b22d6015cd1c4f551c22c9d824d0650790ec509d02e7ef13f18b58bc338d25d7e93bf334d2ae1bbf198b2b831c183707b22bceceb
 DIST unshield-1.4.3.tar.gz 58822 BLAKE2B 89e23462610d7ffd25358cb1d9f234b5c80a580deb60e85610ddacc8e3aa92420cb0e885e80375089e93786565824813f23c54f7c4d60b7773f23d174c98e5d7 SHA512 2f058e0a28d0497e2afe231ded1b1bb16745401398eb1035e628d263351b10a1343c9664f3937b8912755db9dc5236a1b43e9bcba596affb7aa8b036f49382aa
-EBUILD unshield-1.4.3.ebuild 887 BLAKE2B 0047de0c471b60bb51a4e7f4830eb8fd0cca449ca18e7b668f048ec1574792394243160c9974713d9a62f9da6b719c9f1db3b3da7e06b3998b937a3813ebddbe SHA512 a180935e33e5c92ffcc244360aa4142fa6103de44468155c3db5b2544e79586fa225f80a890a921858b33167fdffccf20fd5a121fbf1d0e08321f83d9fa00bfd
+EBUILD unshield-1.4.3.ebuild 911 BLAKE2B 7a7a3bc71de27e4919e178a08f0731def4dc15163123a286e3b09004b497c9363f435c30dd9b3374b233ce85514dde651f3fecd746c35eab7c0ed8263f5c6b68 SHA512 528db6278574ec6b6274814f8ae4bf8a9362598e99be7b12631caeed6a3c05f23120dc48ff5f016c5547fad5bd6e5e9c411b8956d6a1c782f30d7a23c07ef94c
 MISC metadata.xml 251 BLAKE2B 2a365fe10b8039e015f37a0d9600d841dae51c6b14197a58f901c55af5eca111ee054674bbc294961c042e4445b6953b424f57149ef3f153c74999bd4613ccf8 SHA512 b8b90af336a046be33f7296d073b2be30c006fb5997ad3e65666231efa3fe55eebbaf7da468529831d79cbca17fbfc9be9e7c12189f1faca083d356eec765a73
diff --git a/app-arch/unshield/unshield-1.4.3.ebuild b/app-arch/unshield/unshield-1.4.3.ebuild
index 77af3622c0e2..f81ff080ff9d 100644
--- a/app-arch/unshield/unshield-1.4.3.ebuild
+++ b/app-arch/unshield/unshield-1.4.3.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils
 
 DESCRIPTION="InstallShield CAB file extractor"
 HOMEPAGE="https://github.com/twogood/unshield"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/twogood/unshield/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index ec1d9818baa3..1febf2ccd768 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 25567065d27c..c463a9bfaf50 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,8 +1,9 @@
 DIST borgbackup-1.1.10.tar.gz 3610011 BLAKE2B 9c13d89a0441b5403019ed24b2f36fd55f4d133219b68802b79c76f5086324f4a249124a89c67049fecbadb78d5dae64b007ed6c53a579c115ce248db3e83054 SHA512 9315335208f10427e3105e10819817d15fd05171479252903bd51eaacb016bc3ff792d505b9203ce0b9b41ec350472bdb9a23b0128e7fe156aaa47c1608451c0
 DIST borgbackup-1.1.8.tar.gz 3456058 BLAKE2B cad55216f92025418e1a427f4b578d6b7eafa03f6b3e9c4fccb148dd3856c4f6649928fb4227249c534add125f9b3a2a0b6ed808ae12c5e60a28f9df4fb0031a SHA512 1455e68bcedab8f35f9426dc73958c6a6565ad1f1cc274ce59d34a12e3a7bfa1d12fa2b8e8dd3e71824e1cd0927babf79f4e99d4e516454ed12dbd3970d0e921
 DIST borgbackup-1.1.9.tar.gz 3468259 BLAKE2B 91c89304cf22328a0bd74583c22370343915209a204f52c65290dbec0cb688392c2e80b946a55317f8c58ef23099e710c16a34c6bfbbfb547a3e4b38c3c81c37 SHA512 466288258700fb0b3dae936c79fd423d26bea2d721dd70112b3cfd0f8e2bb335144a00de76743c31d336f6c19793775260d154326ec70d6d6d0a4e5ad6a59e59
+EBUILD borgbackup-1.1.10-r1.ebuild 1168 BLAKE2B 4e52665dc7d0528d5803205543f9e8eccb620a45d8d843c80af67051cc62089929576666dd91699bbde010234e89d7a98ac88d6402370929f4db23663095ecd4 SHA512 d13bae6850a120269a4744b3beee3948759d6304126486e219c6adb3075fdaafbc3ce2155ef7bc74e20d9643c7cada906d1dcfb9ffe2f6a2f85fee038a716bbf
 EBUILD borgbackup-1.1.10.ebuild 1105 BLAKE2B f44a4ce67b66d92c93f292076300033a68f9eb7cac4b22ee8f73926d366cc503283bac05423d4b0f6bbfd4773af66cc85105bc4f30171e37145ae02962dfe25d SHA512 29542266432fc3a13e0df8845a177ee8773f422320a2f030fb812eb067d0c8d16456104ae43df1ba7ed959213aa668dc8bd14f1afeda5562d9691f5067c00901
 EBUILD borgbackup-1.1.8.ebuild 1103 BLAKE2B e190ec23ed8f61a795c48a5754b33b01b31afe3e12f90dedd757476e0364a12dcea9968e84c69c206680767364c74eef4ae0da795098fa823589d2bae17787d5 SHA512 2283bbd7d91e5caf2e46d935c7f5caa4dac432a722516954224987129182ebdecdcd53fb7504c5f6f35d84acfea9eefb01912d6bb13d2c7ddf523c5e8f47c78e
 EBUILD borgbackup-1.1.9.ebuild 1103 BLAKE2B bde3f74d6c6005f31f2d62263233501a124e0ded9231c3d555a9a99558333df17080bd72190bfbf1c167cb08b2500ebbf7ba873f52c502283aa243ba59f3f09f SHA512 d2dc1e3f4a72f18641754e634a4ec9d9dcda2c9852694b7fe5afa7d913ecadaf077899e467ee6155e7ca4df0305b8a795ddc753314fabea00fe6a1c16ba3c20b
-EBUILD borgbackup-9999.ebuild 1098 BLAKE2B 3be2da264d309189c1f5ffe1f2c0f172492792aa17cd61a676cd03179089897a727f31d75f52a659552cb789fd6cab4e73c1122495dc102018a5cf51ada3c90d SHA512 51922f942a6962abd188548d6d736d8545766d0d2ba2d2ccc095facde0aacb10103015fa5ad33302a8380c709b60b0ba72c08b9a42c037abb2c1815177d45a35
+EBUILD borgbackup-9999.ebuild 1193 BLAKE2B dd45787526507ca7970f4ea756ae61e52a1eb83ef99ddff50dab51447520676cb7f1e571036437bcdce109f6a38fa3f3d4dbf469e6d5cee919eeed86c8d6fde6 SHA512 2b5019a7d1d08bb8e54de01922c42307ae4e22ac33f0fa1493a098f306e2048a9dd4ee8b33ef33fd29696d60290afa5c80723b7ff90f1e2e14961e96d6b2836e
 MISC metadata.xml 493 BLAKE2B 12d2d6c21e4a6edb732f6a78bb0f0ef3a1df88f16ce69e1044df6deb8ce6153769a0272b77ce1a43fc86a32dc1025ccad44b010df0bb726dff3871b7f0aec12a SHA512 4cb8700e921c7437de83273fe6573f179cb7186b7ec62125e076d0be7ad47a9db497548c673f8e7790d19fad74a2afd3248b37ea98ce1500674264154ebf9a17
diff --git a/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild b/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild
new file mode 100644
index 000000000000..6b88a3e3c19c
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	virtual/acl
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	~dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i "s|'msgpack-python.*',||g" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/*
+}
diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
index aaf19c457431..81920946717e 100644
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -40,8 +40,15 @@ DEPEND="
 	${RDEPEND}
 "
 
+BDEPEND="dev-python/pkgconfig"
+
 python_prepare_all() {
 	# allow use of new (renamed) msgpack
 	sed -i "s|'msgpack-python.*',||g" setup.py || die
 	distutils-r1_python_prepare_all
 }
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/*
+}
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index adfc214b5250..b22dd16afe9d 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -2,4 +2,4 @@ AUX rdiff-backup-1.3.3-librsync-1.0.0.patch 498 BLAKE2B b9af390ffa1f6061301f923f
 AUX rdiff-backup-1.3.3-no-docs.patch 573 BLAKE2B 0463ddf18f4e626879a7b2f4c330219c93305305c1dd6106586aa7b309221680515ad70c4e14cc1ee038c450c5292ea4f6459bd2cde347910898fa18197af822 SHA512 94d19500e09496322fdb1a5188321283da7e31d315ef860abdcf19a086c50c7d866cc4cbb525e456a9cdf2563d052f3d5466c5f482910d23ac07841a24e23f7f
 DIST rdiff-backup-1.3.3.tar.gz 198412 BLAKE2B 95141b64ecb3442b2a420e3e2f4325a80bc4e3949e920f3fb04d8d7e69cd20b2809d230a5f9f6af6958f47689d73cf9fdc2d95134d41a5a9d0d6037ee87cf96e SHA512 e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280
 EBUILD rdiff-backup-1.3.3-r3.ebuild 885 BLAKE2B 7cec61669c41764cfcc41f96c8f7cf072bd85a8754fd302234e43ddb96713dbca3037a127c0efec71a8c4cca2d9ac95cab684c53435fee135ddaaadf3351f1fb SHA512 f6305f4e4d309559b68adabaf3219689edaa29bf7dfa8aea76dcc4e9da00c4cd977b04e1b1d90352e470515b80e88590c718090e92d17537a14407e8c79ff085
-MISC metadata.xml 335 BLAKE2B f427a882be2c0152b97b9807660ba4b2b1113708f1cca3b86f42256e72845841f3f17d9646d996c4add83a44c5cfd29430323d6012592dc76420f8af0bc3e083 SHA512 ee210d45a15817b3fa09e4c41577bf499ffcf52bd6298429fceaa566f7edf0c17cc1016ecdf5893fcbc39a10410b7104a2c72ee035f30799058e52e48feb55da
+MISC metadata.xml 343 BLAKE2B c6de896c88011a54dd0bfc6abc3e5089419684a562ff231458a018a5179eec77e4b4ddeb69bf43b9659d330f0b1ce6102491bd84cda91a306f20913c7c5c98d6 SHA512 1b17e9542a47825d31dea5ebf2b61f091c1abb3f1cd318954693c1d9e1f03afc063890787167a411ab9c5d7108f173878578462bbffd3bceb2229160c23d49db
diff --git a/app-backup/rdiff-backup/metadata.xml b/app-backup/rdiff-backup/metadata.xml
index f7741b77b9fc..8c94752564ce 100644
--- a/app-backup/rdiff-backup/metadata.xml
+++ b/app-backup/rdiff-backup/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Bernard Cafarelli</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">sol1/rdiff-backup</remote-id>
+		<remote-id type="github">rdiff-backup/rdiff-backup</remote-id>
 	</upstream>
 </pkgmetadata>
 
diff --git a/app-backup/rdumpfs/Manifest b/app-backup/rdumpfs/Manifest
index c2fb5545137b..9ae1e193fe28 100644
--- a/app-backup/rdumpfs/Manifest
+++ b/app-backup/rdumpfs/Manifest
@@ -1,3 +1,3 @@
 DIST rdumpfs-0.1.tar.gz 3054 BLAKE2B 6ac78101003dbecb8920c52bc1c4a0bd902b2f4805cfd004665edef4488bb766c57d0328a6bd23413e88e8d8202348e0e10d1012e731eab9dab150188598a2e0 SHA512 54add203d09bff1190c3bd292bd5fde3b81f4b6810f4dc8d1be18f9abfb5334bcbca1aebc00795f4bdce861f356a7b9e5d809cd80475a3c50a21752380570853
-EBUILD rdumpfs-0.1.ebuild 600 BLAKE2B 6f922bce1ddfeb541d5a1d3e242ee93207bad8a18e8d47537a3bdd23d1a6a3339f89cbd1e85f61a4b49e56217d2de882c10036457a7ef1d11aca8222aab4656a SHA512 08bf572651ee56734f09d1c77b3ac69d4f87217bfefc80b425d1a6909073c5387fb8480892ec867ba6693f0052ae0e0a79b91fde03f02ba05629186314326e2f
+EBUILD rdumpfs-0.1.ebuild 625 BLAKE2B f16c95a0f165f140f2f1c0f461d3c9cb43f7390de4786745a146e59cc316e4e906b8cef1d4cabd4cba01f54aa5d82fc00cd4dccde1f0a06e7fd54b81c5dd7cea SHA512 bfafd561c9bae860a49524958cbbe5281cc95cc900227c645ae687ed9fcb2a740914e27016d0967405858d8858d53e2f61de3cf61514f8a190a1d7129398c8f1
 MISC metadata.xml 348 BLAKE2B 0c9eb156e54b8439196c31723fa3c29212a761f66351c3dbc867a33226431172fca6f95aaeea2874ee8be3d914ab5684569a0559be9e29637e0cb06a0267e293 SHA512 106211864b1adb098cd8728facf25fc9103ebc6fcc2478b038864c82e8af8b9c41599e0dee4b4f479e4d9c3caceeaaf34f2f3c241e2334a5357a9e0ed2c0e479
diff --git a/app-backup/rdumpfs/rdumpfs-0.1.ebuild b/app-backup/rdumpfs/rdumpfs-0.1.ebuild
index ee61a90de855..2b6b21577956 100644
--- a/app-backup/rdumpfs/rdumpfs-0.1.ebuild
+++ b/app-backup/rdumpfs/rdumpfs-0.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
@@ -8,7 +8,7 @@ inherit vcs-snapshot
 COMMIT="b7e8e7b0efd9d73344e022e204f2e99e6321136e"
 DESCRIPTION="a rsync-based dump file system backup tool"
 HOMEPAGE="https://github.com/chneukirchen/rdumpfs"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/chneukirchen/rdumpfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="0"
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 7618090641cd..ce1e14fde34d 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index 1de0cbec7e13..ca818f58c9f4 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,8 +1,8 @@
 DIST sysbench-1.0.15.tar.gz 1507930 BLAKE2B d4f18b08a122b8574b916b5ddadf69dd37718ac94642fb8d31582c79788569190a26fad3b3cccaadb695a65a3b9efda59943e32947a709918b3fb6d80aee6cac SHA512 ff68ad15c037006a2a49e3d59062611062336860205816ca6d9cdd20832fc55b631960411caa718dff881e926196046a7317b33e803061868e524a819569d3a2
 DIST sysbench-1.0.16.tar.gz 1508595 BLAKE2B 0cd7818097fb617362d79f135a45942ddf3e55435364355b063eea22ec5f1666737d8e887baae237d8a895c1f8d9f0c1dd0d145c6c46f2827d8ce3eba696ca18 SHA512 f86db33dcb46c9a6f696418de6463a597c6635dc66aecb2e2e53948c299dd7d1d4dfcb7c37d78cd024113ae5484dfaf48ff1cc0a4aefbc586976a665b2df1ca6
 DIST sysbench-1.0.17.tar.gz 1509044 BLAKE2B 9dcffcd0ee74b75416a5421879c6413b9052d65a63c4c4ef76f6bce620a0df284bcaf67225249b8c549f2ff912dab2a5df224f73153433d359e1245b27d2d715 SHA512 95a6bb7ec9b0fb111bf2844e110b8fb51c006fd68b5bac75c1b80e2ed18e839d6f07f79d55fb5adef67b41d00f67bbf659d129d1cb593d4fd118092b15431815
-EBUILD sysbench-1.0.15.ebuild 1144 BLAKE2B d551c301dad666dc5bcda8fec49180bf9c7992c7465ba9a97f278ceaedfb64ce800cd5d28cf6cc047049010d3b368fa81523b363b89e036a4afd2561c9a8c81f SHA512 c9dee1c0b6e721b1c0c6aa4db62bb27f6730285e24273cf26a230389a456aad2f685c597cc185b2b9790239cc70dcdaa55fbf686ee112221168fddc39553197a
-EBUILD sysbench-1.0.16.ebuild 1146 BLAKE2B 98efe2cf1430525d0e22402d90ffcc43794c28fc8b273868af098e4349b1b1cc6d22278b0640765168e871ca022566c292d866005d4ee54e829cd881d55a8a33 SHA512 d55a37f5e7931cab459bdc8722b9ad9c6ea59385ccd1a42864116d18ee4dd02e390cf4e2ea1a835511e3b6210713e1070ab66b29402fd0fc7bd35bb01c92dc39
-EBUILD sysbench-1.0.17.ebuild 1171 BLAKE2B 2631556d62bf05ead29eb255ba35e46aef9c866d5f452204c5c6bf893c37812c6ef67a04ed801b7f6ee71d1b79b67999a41a8d44343941d5eaa2dfc59d14ecec SHA512 e57f554aaa16333dbf78376f9ec60a64bd9774de0688fdef1754426fa65777872e776b2c4da322045c7878c16f0bbd987778648d1ee8b61f3f026aa6df87a5db
-EBUILD sysbench-9999.ebuild 1080 BLAKE2B 88fbaa15d56ee16893207090c4ef4a706b52bd2b1867e9a52af3e8a26ae2e5d8b6b8ae55830dcb57f966366c18926cac74123ddb0675be47afe383469df752c6 SHA512 acb0f80a81001b7394ccae7c5ad82f5f4c7226dcdcda2215b0c9a519ced5f37b1a0dbb9b0008dba96073cf6995ff8779b17e745dcfb281aa67cd71016141160c
+EBUILD sysbench-1.0.15-r1.ebuild 1148 BLAKE2B 95d8ac764dbe07068e6e39734dfbd932942a6f13bb4495b0166a01f8e54aaab1a7c46cc024eaabac29aa2b61469087e13607006011a56aaec80a35f7276e03be SHA512 4f3b243fdcbd3bc797313d42119b38fb80ef5d7c5e4b8a981a8ab06c933893041e3271cc9e5bd0b45b4a8916f0a8746e3713de54504672444443ec52ccc8cadd
+EBUILD sysbench-1.0.16-r1.ebuild 1148 BLAKE2B c653735f47f3a3d6fe0d68b7395bd87682434e89fad4936bdef435c8105434949b0d447e63dbcfa92fb722a98ae7cee4715f3c4ed4dfa8fc1471701dd264a41b SHA512 99b2e63dc172cfd330eeef3a32d3137e2a6dd0980386b4cefbbe4d45c47a6418b74bb72ca73228a9335edcfe987ededa20a24c6ec684afd79bdba7dd11e84725
+EBUILD sysbench-1.0.17-r1.ebuild 1175 BLAKE2B 210eced1ba2eac368c1258e9ead694f70a790e297470d5fddbe29e5f80d5298a19baf191b6a0b17b455565e0bcb66aad727d989d96ee7b79425916198dfab71b SHA512 4032fe48c210ee1c877de842ca2274042925c636349392b8f024292a043562b8c3844ad24a9533ecc1c5c0c0bd2c9911fe0359c0c6f5a2573270f7c8c32c528b
+EBUILD sysbench-9999.ebuild 1084 BLAKE2B 27c2351d0628a875942f67279aef9086cd791f77513245daad6e94f3c199bf6c015392de2126038447e8daa9afb0f0c758520ad780dae5bb866dac1ba6bbdcaa SHA512 2b9c30f8804105e255718e36083a4e0ec54f8a05ebace6ae158e69780a95c5946f699015ae2b9dbb172eb293967d1410bd0cc25fd7e89649b411adf68a3df028
 MISC metadata.xml 512 BLAKE2B c696a3f13c62ecdb93f09f486e27dce240ad3875bea3edf21a1cc74738b3e0cc293e4d5c42dd0175a3ae709d9d8f197aa06a8f5423d4b9b617ba4cac88cba3cb SHA512 8187049c2a67b1219cde6ababe233df864380dcb4adf9e5b3144f0fe488eb79d39739b80017ab47b0400c81b8c0d1f247de95e9dd0ef4c50b2a0d8a322ae81fd
diff --git a/app-benchmarks/sysbench/sysbench-1.0.15-r1.ebuild b/app-benchmarks/sysbench/sysbench-1.0.15-r1.ebuild
new file mode 100644
index 000000000000..4bb727c50313
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.15-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools pax-utils
+
+DESCRIPTION="System performance benchmark"
+HOMEPAGE="https://github.com/akopytov/sysbench"
+SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="aio mysql postgres test"
+
+RDEPEND="aio? ( dev-libs/libaio )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-lang/luajit:="
+DEPEND="${RDEPEND}
+	dev-libs/concurrencykit
+	dev-libs/libxslt
+	sys-devel/libtool
+	virtual/pkgconfig
+	test? ( dev-util/cram )"
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable aio)
+		$(use_with mysql)
+		$(use_with postgres pgsql)
+		--without-attachsql
+		--without-drizzle
+		--without-oracle
+		--with-system-luajit
+		--with-system-ck
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check test
+}
+
+src_install() {
+	default
+
+	pax-mark m "${ED%/}"/usr/bin/${PN}
+}
diff --git a/app-benchmarks/sysbench/sysbench-1.0.15.ebuild b/app-benchmarks/sysbench/sysbench-1.0.15.ebuild
deleted file mode 100644
index 436326e22526..000000000000
--- a/app-benchmarks/sysbench/sysbench-1.0.15.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools pax-utils
-
-DESCRIPTION="System performance benchmark"
-HOMEPAGE="https://github.com/akopytov/sysbench"
-SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aio mysql postgres test"
-
-RDEPEND="aio? ( dev-libs/libaio )
-	mysql? ( virtual/libmysqlclient )
-	postgres? ( dev-db/postgresql:= )
-	dev-lang/luajit:="
-DEPEND="${RDEPEND}
-	dev-libs/concurrencykit
-	dev-libs/libxslt
-	sys-devel/libtool
-	virtual/pkgconfig
-	test? ( dev-util/cram )"
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable aio)
-		$(use_with mysql)
-		$(use_with postgres pgsql)
-		--without-attachsql
-		--without-drizzle
-		--without-oracle
-		--with-system-luajit
-		--with-system-ck
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake check test
-}
-
-src_install() {
-	default
-
-	pax-mark m "${ED%/}"/usr/bin/${PN}
-}
diff --git a/app-benchmarks/sysbench/sysbench-1.0.16-r1.ebuild b/app-benchmarks/sysbench/sysbench-1.0.16-r1.ebuild
new file mode 100644
index 000000000000..7dc1fbf8fd10
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.16-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pax-utils
+
+DESCRIPTION="System performance benchmark"
+HOMEPAGE="https://github.com/akopytov/sysbench"
+SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aio mysql postgres test"
+
+RDEPEND="aio? ( dev-libs/libaio )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-lang/luajit:="
+DEPEND="${RDEPEND}
+	dev-libs/concurrencykit
+	dev-libs/libxslt
+	sys-devel/libtool
+	virtual/pkgconfig
+	test? ( dev-util/cram )"
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable aio)
+		$(use_with mysql)
+		$(use_with postgres pgsql)
+		--without-attachsql
+		--without-drizzle
+		--without-oracle
+		--with-system-luajit
+		--with-system-ck
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check test
+}
+
+src_install() {
+	default
+
+	pax-mark m "${ED}"/usr/bin/${PN}
+}
diff --git a/app-benchmarks/sysbench/sysbench-1.0.16.ebuild b/app-benchmarks/sysbench/sysbench-1.0.16.ebuild
deleted file mode 100644
index 4b1bf3a587f9..000000000000
--- a/app-benchmarks/sysbench/sysbench-1.0.16.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pax-utils
-
-DESCRIPTION="System performance benchmark"
-HOMEPAGE="https://github.com/akopytov/sysbench"
-SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aio mysql postgres test"
-
-RDEPEND="aio? ( dev-libs/libaio )
-	mysql? ( virtual/libmysqlclient )
-	postgres? ( dev-db/postgresql:= )
-	dev-lang/luajit:="
-DEPEND="${RDEPEND}
-	dev-libs/concurrencykit
-	dev-libs/libxslt
-	sys-devel/libtool
-	virtual/pkgconfig
-	test? ( dev-util/cram )"
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable aio)
-		$(use_with mysql)
-		$(use_with postgres pgsql)
-		--without-attachsql
-		--without-drizzle
-		--without-oracle
-		--with-system-luajit
-		--with-system-ck
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake check test
-}
-
-src_install() {
-	default
-
-	pax-mark m "${ED%/}"/usr/bin/${PN}
-}
diff --git a/app-benchmarks/sysbench/sysbench-1.0.17-r1.ebuild b/app-benchmarks/sysbench/sysbench-1.0.17-r1.ebuild
new file mode 100644
index 000000000000..9bfef687b507
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.17-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pax-utils
+
+DESCRIPTION="System performance benchmark"
+HOMEPAGE="https://github.com/akopytov/sysbench"
+SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aio mysql postgres test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="aio? ( dev-libs/libaio )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	dev-lang/luajit:="
+DEPEND="${RDEPEND}
+	dev-libs/concurrencykit
+	dev-libs/libxslt
+	sys-devel/libtool
+	virtual/pkgconfig
+	test? ( dev-util/cram )"
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable aio)
+		$(use_with mysql)
+		$(use_with postgres pgsql)
+		--without-attachsql
+		--without-drizzle
+		--without-oracle
+		--with-system-luajit
+		--with-system-ck
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check test
+}
+
+src_install() {
+	default
+
+	pax-mark m "${ED}"/usr/bin/${PN}
+}
diff --git a/app-benchmarks/sysbench/sysbench-1.0.17.ebuild b/app-benchmarks/sysbench/sysbench-1.0.17.ebuild
deleted file mode 100644
index 95a24a98ccf6..000000000000
--- a/app-benchmarks/sysbench/sysbench-1.0.17.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pax-utils
-
-DESCRIPTION="System performance benchmark"
-HOMEPAGE="https://github.com/akopytov/sysbench"
-SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aio mysql postgres test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="aio? ( dev-libs/libaio )
-	mysql? ( virtual/libmysqlclient )
-	postgres? ( dev-db/postgresql:= )
-	dev-lang/luajit:="
-DEPEND="${RDEPEND}
-	dev-libs/concurrencykit
-	dev-libs/libxslt
-	sys-devel/libtool
-	virtual/pkgconfig
-	test? ( dev-util/cram )"
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable aio)
-		$(use_with mysql)
-		$(use_with postgres pgsql)
-		--without-attachsql
-		--without-drizzle
-		--without-oracle
-		--with-system-luajit
-		--with-system-ck
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake check test
-}
-
-src_install() {
-	default
-
-	pax-mark m "${ED}"/usr/bin/${PN}
-}
diff --git a/app-benchmarks/sysbench/sysbench-9999.ebuild b/app-benchmarks/sysbench/sysbench-9999.ebuild
index 4787bb37870a..20702594cf13 100644
--- a/app-benchmarks/sysbench/sysbench-9999.ebuild
+++ b/app-benchmarks/sysbench/sysbench-9999.ebuild
@@ -16,7 +16,7 @@ IUSE="aio mysql postgres test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="aio? ( dev-libs/libaio )
-	mysql? ( virtual/libmysqlclient )
+	mysql? ( dev-db/mysql-connector-c:= )
 	postgres? ( dev-db/postgresql:= )
 	dev-lang/luajit:="
 DEPEND="${RDEPEND}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 25d99a6462db..5f86404aa282 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/bchunk/Manifest b/app-cdr/bchunk/Manifest
index 16dcac40bfa0..341587a01351 100644
--- a/app-cdr/bchunk/Manifest
+++ b/app-cdr/bchunk/Manifest
@@ -1,5 +1,5 @@
 AUX CVE-2017-15953.patch 738 BLAKE2B a7d35373ff5fc7f105430c6480285fe567a2ecd4cf6979b0e950a0945e9cdbe78aeab9815b628af6e398d1a57ae94ebbd8ec829b01a43bc33baa434ef4863b41 SHA512 266dc695cbc53a58f99cef7bff8e399a018275dce05d50edb4465096c418fa4d77850c671b56a3656f942f0affd83110f341c91bb325d48b9d264b5370b99a51
 AUX CVE-2017-15955.patch 773 BLAKE2B ed4a57da8a73cdde213a5b6e7b454d067ac7b178d1919490657ca0a2ba095ca0b2ae05dfe929d4ee92fa6a2fc7861215cddb9f5d6727d460f6a44b18b9f38581 SHA512 060d6d637f5af2507d63edea4bdda30ae4d6fa5b8e96aaac6d9e41fe328d474bf6854fea101fd6de878ea3b5f2f3e2ccdd1b8e1182a55fe423f293b2024dc7f1
 DIST bchunk-1.2.0.tar.gz 15078 BLAKE2B 60d443380ffaa8dd1d025777c91c1374a931f16c8de2219a4ff453ee4d7c6eb235b2380ce1021911636d247a12640214dc40b29f9c9cf917ff4bc4594f189fc4 SHA512 0e1f9daa2dfeff58e2c65ac2767bff804811fa22f70a220747aa873cb01b77b4c6a809736483aa22fb3f2d2a88885469d10fb45af4626069e992a0763a5fcc2d
-EBUILD bchunk-1.2.0-r4.ebuild 588 BLAKE2B fca2b156f7ea8c2338f6a33c048b79cbbe557db4dab177274d4e9a77fa6209dbe76a0b46a4db64ef00416cbb6e1015d172be9b05c3c67ac39cbc3454642c717b SHA512 0f695d47accf745aaded70dc63e6d6717ced7248d95b5f281115e8f2c3fc88a5c8b55baad18bc625f0c6c109449efd8bb34a389aa6e67c0045c9a7186ed64c31
+EBUILD bchunk-1.2.0-r4.ebuild 597 BLAKE2B 4030bf798180d7e46e8d0c96c9134d5675909db32db887032c43eac136569980449b361d0114597cbc40cdd94cef407707c3d23d5dcdd9c48fd73b4f93c634f0 SHA512 3cbbe4d50013895b72fb9eb223a2f110d77c8d5f83ff7d85ce9746dce1b8505268ae26bd8f888e27f610d96c4cac439c8e65f4361f90086ecacb9387d1e1b5eb
 MISC metadata.xml 316 BLAKE2B f234f603d9fcf3c50f48602826b361707317ec2dd0ca1438224e6ec753e92bd0c024d773343c6b6413a920698f4673b85cf6b6411a0c53dc02253b5e341da236 SHA512 1a2c6992e5957694c18634dd12d5a567d1bd74b063f91e7c524984722955a0a72ff22ff2ef17932eb2eafd84d4493dbe6a103df3fad70e4134fa33ddcc3463e9
diff --git a/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild b/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild
index 109475dbc088..c9df21b4a075 100644
--- a/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild
+++ b/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 DESCRIPTION="Convert CD images from bin/cue to iso+wav/cdr"
 HOMEPAGE="http://he.fi/bchunk/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="http://he.fi/bchunk/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index 23058e65cc95..007627279a79 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,3 +1,5 @@
 DIST cdemu-daemon-3.2.2.tar.bz2 82366 BLAKE2B d21436a5dbf1c6d953aa7ceb58e5d4580931391ea407c45de8f7c7154c181aef76535833bf02999d77d3a9e0c624db1124a9d333d028e206844a1256b3c5dde0 SHA512 4010bad27d5f595d20e1666700d32c2fb3f943f2e50645317bcc8fbbbba58cd61b3f6d3276e91fff55f449e44291abc776a56ded7c4f0bb7901ac247da72d7fe
+DIST cdemu-daemon-3.2.3.tar.bz2 83130 BLAKE2B 2be64beb662ebeb51d75a34bccece5f5eede8abe447d4d0be60bf1bbe4e1f9ac6eeaa67783f763f4966571cf4e13fb9b61610ead40d8a13842400f48bb3b1618 SHA512 a1c7fdea9e32e71591a29de98f28dd4d2d0ffb972861916ab287ff33f5f070da8fcc113b602e4b02fd08a72f7361ae85440ef5eb156e312a849cd716207026a7
 EBUILD cdemu-daemon-3.2.2.ebuild 1140 BLAKE2B 37bf7e266dcbf187004b9e6184176791873d8a6ef29d11e2a0348d606affd72ae5fe8a0ced71e44c460ec218cdb41dd4073539000920fc290adfa7a7a10c2383 SHA512 2e05466f5bdec9615e5bc03343706b2abd1c310532364fb09454170aa2389f70bb490a1538e2097dadb73131907f2820e4b9ca8f774f12c1a94d1e922e322adf
+EBUILD cdemu-daemon-3.2.3.ebuild 1176 BLAKE2B db60513ec861afeae0844c55fd37e1ec2e7f44b441d737cb3336ab9344a5d794b7dd9c2f05d373f9b2b77a0fab43630e3bffb4d1e883ec693d16e4a6f4fbe03e SHA512 29411e441324b114183bcd3af7068fabd691cf0ca5e0ce8f7b7dfdc1ac789aa5e81bd2569a89402ed3237fd872c3e21ee3d11088b527b46367880d90afca040e
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.3.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.3.ebuild
new file mode 100644
index 000000000000..abedc85833f8
--- /dev/null
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
+HOMEPAGE="https://cdemu.sourceforge.io"
+SRC_URI="https://download.sourceforge.net/cdemu/cdemu-daemon/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-libs/glib-2.38:2
+	>=dev-libs/libmirage-3.2.0:=
+	>=media-libs/libao-0.8.0:="
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/dbus
+	>=sys-fs/vhba-20130607"
+
+DOCS=( AUTHORS README )
+
+pkg_postinst() {
+	elog "You will need to load the vhba module to use cdemu devices:"
+	elog " # modprobe vhba"
+	elog "To automatically load the vhba module at boot time, edit your"
+	elog "/etc/conf.d/modules file."
+
+	if [[ -e "${ROOT}/etc/conf.d/cdemud" ]]; then
+		elog
+		elog "${PN} no longer installs an init.d service; instead, it is"
+		elog "automatically activated when needed via dbus."
+		elog "You can therefore remove ${ROOT}/etc/conf.d/cdemud"
+	fi
+}
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index 3f39a6105551..ab9759a7e544 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,3 +1,7 @@
 DIST cdemu-client-3.2.1.tar.bz2 43584 BLAKE2B d34c09203b7b4e70161d62aee48d531b083952174fd2357bf0fc7b69a0fd59200bedb9ca87fe2d2c18c953979c84e9db3fec4d5fb500375f0bcc155dcaf5cedb SHA512 913c26754d16c339d7ddb4e00cc7d5b754ad6cc7f1a156c9448b51ed09468cf9e8a2bc74ed123a621278d2ad281e447d33ee06c3416bc1d0d2e6c2becd539154
+DIST cdemu-client-3.2.2.tar.bz2 44305 BLAKE2B 3a656bfda48a502752cb2b14df413a26467a1512b867cc1519f3dfd21b764a8086135a70b13272f258eb079ce169f58af55665e56238a7ba57cf4e9d84f07751 SHA512 ab5c1b1c741945618581bedb18a6eebdcb55915dc811e4247f0c3afe17729f7fbfaaaec10302e444a2f237c5a1401aa402a614685a84c63442907982e759ff41
+DIST cdemu-client-3.2.3.tar.bz2 44311 BLAKE2B 23451618897a5281478c9d70ded357089a4baaf47b22f36b4add9c5d2c899478629ce034cce0e593b501a127cdc1f5527f0aaf1951f709bf4c2d131e898045a2 SHA512 5d98870fa42bb639009dc6971747f252f3403eda882bffacf55f647193a1a9fb7a75ad69a7512da3abdcdeb64510b0f163ea997c4d75a804fa93880b62b03dd6
 EBUILD cdemu-3.2.1.ebuild 1081 BLAKE2B 33bb3596f62c2df6265e4313dd0fa84e52fb73d64cdcc938650c9a340b7b6c19505acaae17b4c61080bbdc578a834ac80b90f2027ee0462f345f66d1895f41bf SHA512 95642bbf73fd7a54dae54a4408275be33a55545b91af88db0e5e6890f03433d079309d0a4f28c32b44fa85332f354657391453fa57aedf623af8f6b77bbc4ea0
+EBUILD cdemu-3.2.2.ebuild 1081 BLAKE2B 70bfa6055b171bb1502ecf1a2e00564cf1c2a9699689f6e35cf65410e14025db42bc567162e000ee40d32a881e2f01c13d2adf7a0a775ade15bd546367c9b406 SHA512 84b0acd9dab2d99032de8bfe366455c4e12f4bd07175fc71d24881ee23f81a132da5e84254bc3873723159aacf67a7ca87ed929e9e32f603649ec4294e03d62f
+EBUILD cdemu-3.2.3.ebuild 1120 BLAKE2B 725423c378be535206ca4651b73edd2054a6b6a31689b373414f7b811f4c8b319b27f04de298f958062af3a4a6e5a92a351cd7027073790bde7fade0d978859a SHA512 a2b046b729afd9600013ad9a97928378b5842b32a1f0f9b648c41bb11314e7c6d03c49537a6cd25784c4da17efa39d9130ff4b855017d7a55345d53b4a22f579
 MISC metadata.xml 529 BLAKE2B 88d72a301708901597eb11c475ae67d8477381c77d430b49042cb4a8658aa44b88273858f87cbbaa1fc16ae222b604fa9ff81f6f791d39c39d5c76b58b9d0d81 SHA512 27850929d16910038f7b406c0ec4c22648c91a6f8a8f9cd56c0a3ea8e4e772de9b77598514c5a621eb71386635a327829251a90128ba33073ac34485a3b60a92
diff --git a/app-cdr/cdemu/cdemu-3.2.2.ebuild b/app-cdr/cdemu/cdemu-3.2.2.ebuild
new file mode 100644
index 000000000000..76a0b4986339
--- /dev/null
+++ b/app-cdr/cdemu/cdemu-3.2.2.ebuild
@@ -0,0 +1,53 @@
+# 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 bash-completion-r1 cmake-utils python-single-r1 xdg-utils
+
+DESCRIPTION="Command-line tool for controlling cdemu-daemon"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cdemu-daemon"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
+DEPEND="
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig"
+
+S=${WORKDIR}/cdemu-client-${PV}
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	python_fix_shebang src/cdemu
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPOST_INSTALL_HOOKS=OFF
+		-DCMAKE_INSTALL_COMPLETIONSDIR="$(get_bashcompdir)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-cdr/cdemu/cdemu-3.2.3.ebuild b/app-cdr/cdemu/cdemu-3.2.3.ebuild
new file mode 100644
index 000000000000..dc34238bf6a4
--- /dev/null
+++ b/app-cdr/cdemu/cdemu-3.2.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit bash-completion-r1 cmake-utils python-single-r1 xdg-utils
+
+MY_P=cdemu-client-${PV}
+DESCRIPTION="Command-line tool for controlling cdemu-daemon"
+HOMEPAGE="https://cdemu.sourceforge.io"
+SRC_URI="https://download.sourceforge.net/cdemu/cdemu-client/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cdemu-daemon"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
+DEPEND="
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	python_fix_shebang src/cdemu
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPOST_INSTALL_HOOKS=OFF
+		-DCMAKE_INSTALL_COMPLETIONSDIR="$(get_bashcompdir)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index 4c8502aed37b..17ae01b89c4b 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -1,3 +1,7 @@
 DIST gcdemu-3.2.1.tar.bz2 52231 BLAKE2B f6b0025f6c5e79fe7312bf15b467327152e561db33f6190847e4e702cb98ff8005b37fe997c721b5c76cd64d64bafef1c015a9151c0ee200c52efcb849c93dba SHA512 c2da75d985981ccd0b44f210745670501fecd0ae7c60bde783fc5f91ab4c629c6eab9e8b35df906b5669b6518d3bdf36c5814b513c0f3e2d703659d23df1c82e
+DIST gcdemu-3.2.2.tar.bz2 52251 BLAKE2B 9defe9972e0ec1a594cc354113ef4877846a9abc152ea6768e7089c76b20e8cb488e2c988d92cc459abd10fbf4cdd9d2f5ad425b1ffd23dffca75d18352a0a3e SHA512 831c49e7929c379585fa48b0860054b8246c1798c783dc390edd781fca0e8c85450cb49d1e920e3f0ff29130c1049cd12e0c117851377557826803dfad9e8a8f
+DIST gcdemu-3.2.3.tar.bz2 52229 BLAKE2B 9f8d0b6e04b438c0637f42875b144ad4d1a643b8f1216d868040121e417203ffedbf983fec235eb30bf9d11bcfe142e52c1c89966ac3b64442071d0897a9e8bf SHA512 1d31b9edeb111145c7dd438fc645c7513877fe89f78cf262c282bba2d2e7f9a99a8499e607bf00f880186bd4a37a8ebbcc5ba14e1e014254e767a8335396d6e2
 EBUILD gcdemu-3.2.1.ebuild 1124 BLAKE2B ca3230f358917866a2fb5708b459b33eeca45ea23a16d7c51c53b8b18a2ae3615f39a6a6f12d8fcc7a4be0a54155907dec68eddd5bb4b731c4fb5cb74eb54f37 SHA512 bbdd46cae47b5f06d428f0131403b2b2bb39e000f02035d298155d7c81bf178c5cafbbf612a4abd34b656b835ecd3bb68643e56efd507befc7734dccdc7ba380
+EBUILD gcdemu-3.2.2.ebuild 1124 BLAKE2B 6e850dab70659ad96f92e4fd7a7b8a8da960633f0eb1d953aa3e8ef50f98fb15a102e49bcda067beabcd28ba1269196c7db351f17d572e120956add4aff9c25b SHA512 0c2d1c5db61774cd66944f1dcdc79e69900a78b0cda0440ae532b22c1565778e7697a19dbc90a9cadcf7d48aae811873f688fb634e54973c8668a120df390e81
+EBUILD gcdemu-3.2.3.ebuild 1154 BLAKE2B c9d939ac3656ce5f857a3ce5cb315c21292953218e2bda7d78a96d3a647c46f6945dde20852e0360792e52136ae6d1556862a09abbb57f1ff5ad44ddbe399d93 SHA512 76a0f4e1a84acaba4f789dd6980ef8c722f4be7847aaef5f8a49db3be4e5867ae49a5501a9b573597f4dde0c3cc7c52b714329c571157cada324cde636b1a248
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/gcdemu/gcdemu-3.2.2.ebuild b/app-cdr/gcdemu/gcdemu-3.2.2.ebuild
new file mode 100644
index 000000000000..1e96f5a37523
--- /dev/null
+++ b/app-cdr/gcdemu/gcdemu-3.2.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
+HOMEPAGE="http://cdemu.org/"
+SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# librsvg for pixbuf-loader
+RDEPEND="${PYTHON_DEPS}
+	app-cdr/cdemu-daemon:0/7
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	gnome-base/librsvg:2
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]"
+DEPEND="
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	python_fix_shebang src/gcdemu
+}
+
+src_configure() {
+	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
diff --git a/app-cdr/gcdemu/gcdemu-3.2.3.ebuild b/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
new file mode 100644
index 000000000000..c5f5aef215ac
--- /dev/null
+++ b/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
+HOMEPAGE="https://cdemu.sourceforge.io"
+SRC_URI="https://download.sourceforge.net/cdemu/gcdemu/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# librsvg for pixbuf-loader
+RDEPEND="${PYTHON_DEPS}
+	app-cdr/cdemu-daemon:0/7
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	gnome-base/librsvg:2
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]"
+DEPEND="
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	python_fix_shebang src/gcdemu
+}
+
+src_configure() {
+	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
diff --git a/app-cdr/isoimagewriter/Manifest b/app-cdr/isoimagewriter/Manifest
index e12fc6730204..d0eeb2020188 100644
--- a/app-cdr/isoimagewriter/Manifest
+++ b/app-cdr/isoimagewriter/Manifest
@@ -1,3 +1,5 @@
 DIST isoimagewriter-0.2.tar.xz 423900 BLAKE2B 36ce0b0bba3d955c4e10d003a3bded9ec55931b6496c5b1c91c83b6c8d3fa29e033a833d6c16a81f098a16f57cac0dae638719d389892d0336a28a6cdbd24151 SHA512 cec7d67e8255caaaccc14d07da3677a13b8081f599136516b0a31262e20eec884fa738dcc2d3aa1bfd49c00bb6c5bc6c3a62c767b13cdb06799cb53cf1e6ecc1
+DIST isoimagewriter-0.8.tar.xz 430368 BLAKE2B d540ca0ee874b633618480ff5cc30ceea5f0aef84e3e4b0236fc6474ce590661ca8728a3719cc733cc791d14cfdcaad609ffa32d79b99df141381aa3f35edec8 SHA512 1d5031695647be54e5de10f6243b68bf8d2dc29a7894c8ac69954df353d5baa740290b572c89cd37650718749117f5e3b25dd99b8b374d8ba0376288878f9199
 EBUILD isoimagewriter-0.2.ebuild 603 BLAKE2B 76462bfe8373be5885da3ab8a1c97122505fc909f259306ccc7abfea84d4333031adc5f89e0cd78a6f56eb5205e0580cc9fe3c42758632449791d80bc9222152 SHA512 11a294090f6429f6c37feb9e5ba61e977b38b5d1d220a0777f0531000ce47377b1f63bf7143cec6b92c5be4c623594bd00d2db52e2bb4e92f2fd55e63b273353
+EBUILD isoimagewriter-0.8.ebuild 603 BLAKE2B 76462bfe8373be5885da3ab8a1c97122505fc909f259306ccc7abfea84d4333031adc5f89e0cd78a6f56eb5205e0580cc9fe3c42758632449791d80bc9222152 SHA512 11a294090f6429f6c37feb9e5ba61e977b38b5d1d220a0777f0531000ce47377b1f63bf7143cec6b92c5be4c623594bd00d2db52e2bb4e92f2fd55e63b273353
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild b/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild
new file mode 100644
index 000000000000..904e057d83fd
--- /dev/null
+++ b/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde5
+
+DESCRIPTION="Write hybrid ISO files onto a USB disk"
+HOMEPAGE="http://wiki.rosalab.com/en/index.php/Blog:ROSA_Planet/ROSA_Image_Writer"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	app-crypt/gpgme[cxx,qt5]
+	virtual/libudev:=
+"
+RDEPEND="${DEPEND}"
diff --git a/app-cdr/xbiso/Manifest b/app-cdr/xbiso/Manifest
index 0c1f4f75a59b..b8e37abaccc2 100644
--- a/app-cdr/xbiso/Manifest
+++ b/app-cdr/xbiso/Manifest
@@ -1,5 +1,5 @@
 AUX xbiso-0.6.1-libs.patch 830 BLAKE2B afc08139e91399a28763f437cc6b6149f65195003178d1d9d75e9ff33f8fd5ac1647c5e3235bb12e32eab2c0994874ce805fecb0edfd4dd10b6680887dbb63b1 SHA512 727e8d1a7887a9ec8c694700f55c22db07792303c2a79aa091a73f7218b3df85ced7faf079762b94e4c0dbc6f2cabcbe2e14dbd16c1bfc1be43231ae3fd66c7a
 DIST xbiso-0.6.1.tar.gz 49698 BLAKE2B ac1605df188b0ec84d0798a0c0220405ce5082160025dc7b21405f1a17f8e0439c6f8d5dbbe293db1645ac0ad195fb0791fe765ea9e1b8c199461f97a2525dce SHA512 351b558c591c3a6c633fb07e081d57cf7ac8b15272ae19878f7d33a796567177aa4eb2fad64d71e6fd86ac18e1c25d30b52013a83ce5d44854f37ec893282fcc
-EBUILD xbiso-0.6.1-r2.ebuild 874 BLAKE2B b3a16c9762bb44c42f4d010014d1d68146bbf9edab3d0016ac4773868daffd3cb64ad34cf49f7d6c27a658ea6d32ff3249711e0b7bdc52fa428f7ba3f78722de SHA512 e1248654a198074e9b7f0d1b9ecfee94623a5d788339b1daf6dc272d62c636adb89a57c40b4388a085629e0ed49cad937b4a62fc7c23523beaae0f021e561d64
+EBUILD xbiso-0.6.1-r2.ebuild 801 BLAKE2B ea387fc691548ba53961c885df6f5e04aab91500798fa59068282dac65df62a1bd25403c67b2906c94140a55b6c1f3f31f18d0394bdac20d9345d2c6325ef99f SHA512 d4ee97faac62dcb4f7ac5081db6e042ab6becf169f12557f51b67e105e343aeb8db291b5f36a3a58096f083f397309a1e81a629b85a62a7ffc4b31568381513a
 EBUILD xbiso-0.6.1-r3.ebuild 810 BLAKE2B 11e78c9ae1789e5a4fa426094a6dcc9a0153031ba847637672134c0a3ba866109668538cc49fb01577b6b1d60cca217cf72c7ba62a193c009eae1afdfa1ce149 SHA512 e187ac7cfc1ac35ad1f88836ef3e164762edea7567dc59b3f2dd2b851f20b5e0288efa6e64a97f70b8059fc60a22fb13398e74b991a8e9a5816f30471ac9fdef
 MISC metadata.xml 323 BLAKE2B 6a0770e71ff7ea1d4aec6a1c463ef0e61da6e67d233faabe667fb48d66178810bb5a8cb45089aa9c6e9be72a10e88befa475ce12c2c5c5874276011543a67952 SHA512 688b4299ad48494730835903feb951941c1da2a69705d49dd4c64c7d0b8d9f5e6576e162f735739787063db73ff2dff41d5444375181e8488cff21f31c3d89f6
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
index 0bfb72aa0667..276a3173003d 100644
--- a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
+++ b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,10 +11,7 @@ SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ftp"
-
-RDEPEND="ftp? ( <net-libs/ftplib-4 )"
-DEPEND="${RDEPEND}"
+IUSE=""
 
 src_prepare() {
 	sed -i -e 's:C) $(CFLAGS):C) $(LDFLAGS) $(CFLAGS):' Makefile.in || die #337769
@@ -27,8 +24,7 @@ src_configure() {
 	# for this package, interix behaves the same as BSD
 	[[ ${CHOST} == *-interix* ]] && append-flags -D_BSD
 
-	econf \
-		$(use_enable ftp)
+	econf --disable-ftp
 }
 
 src_install() {
diff --git a/app-cdr/xfburn/Manifest b/app-cdr/xfburn/Manifest
index 884f16cf41b7..0678c67638c9 100644
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@@ -1,3 +1,3 @@
 DIST xfburn-0.5.5.tar.bz2 819546 BLAKE2B 180f50e9dc8e9bb2372ac7335374b09eade93b6477e557b4282ee65705e55d1f391578343e3473061921cfe296e0da9dae0ddb8823fc5daadc673537331f3085 SHA512 37574aa7dcec65c26a8fd5019c3776196763fa1ebb0f531002f5bcb72a6eb0ec19ed994dd14726988766d890ef257c39c26e64ca3f5944386c03d9b54c26a90a
-EBUILD xfburn-0.5.5-r1.ebuild 1044 BLAKE2B 3566521e43602f6ae3b2866633033f1546f2b28ff4978767289c52c1543a8dec4614b97308d3ac0747da7d9f64a9d0b2ccd1ea55e38a0812cfd66f34e4903f7b SHA512 0862e2138d93c6b05f4fc6fbb37034a6a9d528fddcdf8a1fd0ada6eac6f214d4da0f14a4e3fba3baf94f3a73693e224827fd7ce1fe151e1a55b954f4ce540a9c
+EBUILD xfburn-0.5.5-r1.ebuild 1053 BLAKE2B af433a5afc037674ec8c39c25649033512b802e5d7dd03fc12dc5fd7a1b7ddc2632f3ad951440a2cd79386f5544f89ebe33e290c832b42963048ca98df0f4aa2 SHA512 708fb2f20d69e08c3a0648155bc6a199bd489fbcab4d09d3fa86d011239f691d7dd5454f4778c0284bc025d8434267c41d34bce964b933c292c89c8727c9886a
 MISC metadata.xml 481 BLAKE2B 336b6da9e50fab974d5d320a93ffa10e24cb4621f13835e6a0fa86a95067b28e26fc3c9ca2e17eeecc69f0c842f98bdcebc273bc164cb26baa6b87f39f7c85ca SHA512 1ef204c9fe28b54edffac8132485e3bc326b0452a3014f7be50378be871621e62771f53810b441e4db18b657707e875b67fd2e1231609f62534adbfee2270fc4
diff --git a/app-cdr/xfburn/xfburn-0.5.5-r1.ebuild b/app-cdr/xfburn/xfburn-0.5.5-r1.ebuild
index 285e4e4bb34e..a72eefa99623 100644
--- a/app-cdr/xfburn/xfburn-0.5.5-r1.ebuild
+++ b/app-cdr/xfburn/xfburn-0.5.5-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND=">=dev-libs/glib-2.32:=
 	>=dev-libs/libisofs-0.6.2:=
 	>=x11-libs/gtk+-2.24:2=
 	<xfce-base/exo-0.12.5-r100:=
-	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
 	gstreamer? (
 		media-libs/gstreamer:1.0=
 		media-libs/gst-plugins-base:1.0= )
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 4e62b867f6ee..efc11061ccf4 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index c490b2d76cce..c846c47da5be 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
 DIST certbot-0.37.0.tar.gz 1327246 BLAKE2B 917360ab6d9dedd6e5ea2c558822c228ff34617f97341b7d176e69f7589a3aa3012f1d9abdb33b72960c68a80b29987d1a7b1121eadd7d93adec5829b316f326 SHA512 3f2df5f591ba241719fe2e5e90c2b87e2d932d991d943eefbe00b9d76f7fb056d3b6026879511f591473c698b798e78645879f018a78e503b8a06280b036cb35
+DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 EBUILD acme-0.36.0.ebuild 1721 BLAKE2B 26118df6502f483bbeb7e0a213ebd5f4ba759712acbc3d99acb5d5452364707d14dbb443bcaed7f118cac84c2e3276b8cc8df5fa9b40fe06ed700ca11277d1db SHA512 4501fe5c2ce4a63b86e4a3898a8db9e5d488e1e00f32b58af36e79a86f35ba399001c630eb3113d764740c62cdc66e212ab8594dc961009c7d0e11bf675e44d3
-EBUILD acme-0.37.0.ebuild 1723 BLAKE2B a5abd27f54ec47307fa0ced1cc3ae85c9747195848709ca395ae4a64f962ea2c0787b82eabf39ca5598bbc67abf51a05e473d390c8ca367989e6f871498a1653 SHA512 9a2ab0cdcfbc81bf6fb9e32de5449264579257f5ac185f80e4f83607bbc99730996cb16d4276005fa5cfe3b31df2a0db310ebf3fa25b6c631675d408a040dcb2
+EBUILD acme-0.37.0.ebuild 1721 BLAKE2B 26118df6502f483bbeb7e0a213ebd5f4ba759712acbc3d99acb5d5452364707d14dbb443bcaed7f118cac84c2e3276b8cc8df5fa9b40fe06ed700ca11277d1db SHA512 4501fe5c2ce4a63b86e4a3898a8db9e5d488e1e00f32b58af36e79a86f35ba399001c630eb3113d764740c62cdc66e212ab8594dc961009c7d0e11bf675e44d3
+EBUILD acme-0.38.0.ebuild 1723 BLAKE2B 2fe38f3a6255c3540a5e5527316cd27dcbd15abc265e3464bcced30b35189422b967713fbf3b5170af7ca27b415c703eae0510685e5bb4231beee8af2320cef2 SHA512 582412c0ff094447f58d1bd973d2c678e29fe64c2cf38496360080790c9c3c57c6142ed73079b98f08c324f7be8a446be3c2fd1e24d306db2ed838241f84ae4e
 EBUILD acme-9999.ebuild 1723 BLAKE2B a5abd27f54ec47307fa0ced1cc3ae85c9747195848709ca395ae4a64f962ea2c0787b82eabf39ca5598bbc67abf51a05e473d390c8ca367989e6f871498a1653 SHA512 9a2ab0cdcfbc81bf6fb9e32de5449264579257f5ac185f80e4f83607bbc99730996cb16d4276005fa5cfe3b31df2a0db310ebf3fa25b6c631675d408a040dcb2
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.37.0.ebuild b/app-crypt/acme/acme-0.37.0.ebuild
index 3acd37f75f8e..9a9b63c8fa3c 100644
--- a/app-crypt/acme/acme-0.37.0.ebuild
+++ b/app-crypt/acme/acme-0.37.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-0.38.0.ebuild b/app-crypt/acme/acme-0.38.0.ebuild
new file mode 100644
index 000000000000..3efe8a99669b
--- /dev/null
+++ b/app-crypt/acme/acme-0.38.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+
+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="doc test"
+
+RDEPEND="
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.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="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+	if use doc ; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+python_test() {
+	nosetests -w ${PN} || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/app-crypt/asekey/Manifest b/app-crypt/asekey/Manifest
index 5ea6668f1234..c18c8f7fdc3c 100644
--- a/app-crypt/asekey/Manifest
+++ b/app-crypt/asekey/Manifest
@@ -1,4 +1,4 @@
 AUX asekey-3.7-bundle.patch 727 BLAKE2B 0758992095369eadb49e4daec62a0786e790acf7e39f980f74627440b53a4eae8ac57be07cb0cabbb898e207adda3e543631e9b398770e72cc4e38fd1e153a16 SHA512 4cc556687f59371d0f1919f8649b705801da4427cdc011a40b9627601e90cd27f3a06684a721cb25f1c51b10ec28f6ae728e33fbc30217716250d42c6c15efe2
 DIST asekey-3.7.tar.bz2 33304 BLAKE2B 95bba8ded9557105dba50a587665ee638162ae6eefe1017a4ed272364eec1da7154b21833ed2f08fa7f4c3d570971795a0a6f65efebe517124da572d0b9b7d91 SHA512 29a01f8250d5fb26a4ba2aca562211cadf403c9e986f9fa6930faf477c374e13095c025b2917e6e837cbe8d83f3a3e023a527598b151ef1c704247c7e7c40647
-EBUILD asekey-3.7.ebuild 673 BLAKE2B 2b2e794249e2ac64022681b72caddb861765202b6c3c8013791ef0609767722faa45893d422c6a8606b3496da759f121d3e4e56891b10cbd919205922b534224 SHA512 545856ed4d260ab1c86f88941a9b6568a0ec4afa96fa66d8fcdbaaa0050e9116278b51107a33e0d638915552960b1937804d9a59c683fd03c004b4f29898ef0a
+EBUILD asekey-3.7.ebuild 684 BLAKE2B 94d5413cdb5b32f5bb41e6ac4bb7660cbccf50fff573428268639add9ea7b82943ab0d09aba999a01bcc9f1d0c2c29b077e6bd8917d2d9a76f799f13348c71d7 SHA512 47068530f671a9f56f09efd2ebfc1ed36c99f29357e622e52c0f23c909dbc118bd4416b5c63da18f24f4a7edcdb3e1adeb86578bb8159393431f00bc8faf0e63
 MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
diff --git a/app-crypt/asekey/asekey-3.7.ebuild b/app-crypt/asekey/asekey-3.7.ebuild
index 93d6dd55328d..d895f7bfda5f 100644
--- a/app-crypt/asekey/asekey-3.7.ebuild
+++ b/app-crypt/asekey/asekey-3.7.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 @@ inherit udev
 
 DESCRIPTION="ASEKey USB SIM Card Reader"
 HOMEPAGE="http://www.athena-scs.com/"
-SRC_URI="${HOMEPAGE}/docs/reader-drivers/${PN}-${PV/./-}-tar.bz2 -> ${P}.tar.bz2"
+SRC_URI="http://www.athena-scs.com/docs/reader-drivers/${PN}-${PV/./-}-tar.bz2 -> ${P}.tar.bz2"
 LICENSE="BSD LGPL-2.1"
 
 SLOT="0"
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 41522893f7c1..7c1a7f602afe 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
-DIST certbot-0.37.0.tar.gz 1327246 BLAKE2B 917360ab6d9dedd6e5ea2c558822c228ff34617f97341b7d176e69f7589a3aa3012f1d9abdb33b72960c68a80b29987d1a7b1121eadd7d93adec5829b316f326 SHA512 3f2df5f591ba241719fe2e5e90c2b87e2d932d991d943eefbe00b9d76f7fb056d3b6026879511f591473c698b798e78645879f018a78e503b8a06280b036cb35
+DIST certbot-0.37.2.tar.gz 1327361 BLAKE2B 2f36276f527ffc29e54cf58f25051952e9435972a94881e420712844401fc86b2a0220d651f56c07fbff69e12114fdb1d3c0650fc5fc6a4539ff1c279a0b4c24 SHA512 2e357dfcb6da669f1ab6e4f9aa3e8e3457ce0f794f40c9ac862a9f24208b4f4d773dbafffd97fd1f7e5b2a29e1ca99be787101469384a9e61b4ddb077b644211
+DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 EBUILD certbot-apache-0.36.0.ebuild 1078 BLAKE2B 343724712d023a476aadeec34ee957e3f9b0e4014731534fba8969c1f1994690d729f2546f52b94241974b74baa8bce4ae26a395f5ab3b32eb55d8dc942c5b63 SHA512 882e967cdf08915c31091b2cccbf2344c15050a95c3624e33d6e3cfd41baefa1c202c43e7e0e8c800cfc2eb298f3b7fa2bf06ee2d83f915ed88e5d578f096af6
-EBUILD certbot-apache-0.37.0.ebuild 1080 BLAKE2B d619b7b78385f52863109318365b53a5787e5c2c64bbd26cbbd735f81971b6703fd8c0367bae1d55d44f9f6782157ade26aa19d5643f078b1146d0c0f67576d7 SHA512 b158899197ccc0e9c145f90f92fa4f48ca71c2781fece4185ae1dbd01f943dd75ab3a05ef58f83558c3da7108364af094eed6d008945f9c011b80357d2d8b741
+EBUILD certbot-apache-0.37.2.ebuild 1078 BLAKE2B 343724712d023a476aadeec34ee957e3f9b0e4014731534fba8969c1f1994690d729f2546f52b94241974b74baa8bce4ae26a395f5ab3b32eb55d8dc942c5b63 SHA512 882e967cdf08915c31091b2cccbf2344c15050a95c3624e33d6e3cfd41baefa1c202c43e7e0e8c800cfc2eb298f3b7fa2bf06ee2d83f915ed88e5d578f096af6
+EBUILD certbot-apache-0.38.0.ebuild 1080 BLAKE2B d619b7b78385f52863109318365b53a5787e5c2c64bbd26cbbd735f81971b6703fd8c0367bae1d55d44f9f6782157ade26aa19d5643f078b1146d0c0f67576d7 SHA512 b158899197ccc0e9c145f90f92fa4f48ca71c2781fece4185ae1dbd01f943dd75ab3a05ef58f83558c3da7108364af094eed6d008945f9c011b80357d2d8b741
 EBUILD certbot-apache-9999.ebuild 1080 BLAKE2B d619b7b78385f52863109318365b53a5787e5c2c64bbd26cbbd735f81971b6703fd8c0367bae1d55d44f9f6782157ade26aa19d5643f078b1146d0c0f67576d7 SHA512 b158899197ccc0e9c145f90f92fa4f48ca71c2781fece4185ae1dbd01f943dd75ab3a05ef58f83558c3da7108364af094eed6d008945f9c011b80357d2d8b741
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.37.2.ebuild b/app-crypt/certbot-apache/certbot-apache-0.37.2.ebuild
new file mode 100644
index 000000000000..af3177274026
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.37.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+
+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/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.36.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.37.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.38.0.ebuild
index 5ac928afccf9..5ac928afccf9 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.37.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.38.0.ebuild
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index de570e251bc9..f80dd8f6f700 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
-DIST certbot-0.37.0.tar.gz 1327246 BLAKE2B 917360ab6d9dedd6e5ea2c558822c228ff34617f97341b7d176e69f7589a3aa3012f1d9abdb33b72960c68a80b29987d1a7b1121eadd7d93adec5829b316f326 SHA512 3f2df5f591ba241719fe2e5e90c2b87e2d932d991d943eefbe00b9d76f7fb056d3b6026879511f591473c698b798e78645879f018a78e503b8a06280b036cb35
+DIST certbot-0.37.2.tar.gz 1327361 BLAKE2B 2f36276f527ffc29e54cf58f25051952e9435972a94881e420712844401fc86b2a0220d651f56c07fbff69e12114fdb1d3c0650fc5fc6a4539ff1c279a0b4c24 SHA512 2e357dfcb6da669f1ab6e4f9aa3e8e3457ce0f794f40c9ac862a9f24208b4f4d773dbafffd97fd1f7e5b2a29e1ca99be787101469384a9e61b4ddb077b644211
+DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 EBUILD certbot-nginx-0.36.0.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
-EBUILD certbot-nginx-0.37.0.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
+EBUILD certbot-nginx-0.37.2.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
+EBUILD certbot-nginx-0.38.0.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
 EBUILD certbot-nginx-9999.ebuild 1014 BLAKE2B c424ab9e7f11ad23e128e0a9876359ebdea32746a810380e17acd108bec3920b3ed8b48992446b0a1a4bf704f8dd07e20006fcdb7ca26338bdee85b0ac1676b2 SHA512 ebeb6165a82c28105a65032c47ef92999df3aae3aa75bb9374405f58918743f983802ac8b62945eb2c93b3183a7065f36bdebd1d50ebbb94ef4a7ebca9ea1e63
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.37.2.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.37.2.ebuild
new file mode 100644
index 000000000000..73497ec2cbd3
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.37.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+
+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/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-0.35.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.37.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.38.0.ebuild
index c4f2df8684e9..c4f2df8684e9 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.37.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.38.0.ebuild
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index be0e4a9565df..32a57cd5299d 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-0.36.0.tar.gz 1322339 BLAKE2B 69fbf68b5dd95d6d3ac6c868d583da8c66dfcd01e3471c511d0d9d95de08ac096479733e9fca12ca99abf43484835fa7184dcccb1c11a41ee7948174364f2894 SHA512 f7fa8c6200a76b4fc4830865bf11fbba8bd73ea55e1236680181073952505c83b4650b43ccfc8e9b96caf47b85c43e47acf8db6d92134f7c279ebd954ab0ac92
 DIST certbot-0.37.0.tar.gz 1327246 BLAKE2B 917360ab6d9dedd6e5ea2c558822c228ff34617f97341b7d176e69f7589a3aa3012f1d9abdb33b72960c68a80b29987d1a7b1121eadd7d93adec5829b316f326 SHA512 3f2df5f591ba241719fe2e5e90c2b87e2d932d991d943eefbe00b9d76f7fb056d3b6026879511f591473c698b798e78645879f018a78e503b8a06280b036cb35
+DIST certbot-0.38.0.tar.gz 1328474 BLAKE2B 6ea7c6b5d1840ec9d42509859d0f36f3ac3c4e588149e54fd74f8799a414b43c4d182b47e051a96436c9cdac135999d7e2a25424be680a819d50de64bb85b198 SHA512 832ac36c5b13e9764c9aab40856af7b909b630f34b1fe1e42dbf847357b28b2a130df480f1cb543dad0db781a843a79a310eba7b1097370e267d01431c21ee29
 EBUILD certbot-0.36.0.ebuild 1364 BLAKE2B ab2063ceac5ae1024f2b8ac83c01825fa230f8f34aa1d75f56543e699493b8db8b6baad88c465530c649d80cafec64037333c97c18ebf5ef69012178ee33e1ff SHA512 2cf17f2e0506c4e34db9aa2174fd222d3d74f3bd40f35d2e3ee9c40f8e51e610f850d89535eaf1c24be07ad9619e1671fa46eaa3da88feb43273eaf97b814b16
-EBUILD certbot-0.37.0.ebuild 1366 BLAKE2B 81a7df13ee1e1abcb0dfff63995fb752a5e0a3d6bebebf45ea11f476715ed96e5417fd667dd5f4faf0ad446649ad03e4c45be33b035cfecbe023aa2a1044e1d2 SHA512 2bac9490ac0be45fd39696c5befc5f63436a6d8f6238fba0ba1ec07a1a892f3887f49ed23499df4e07bd712666bd579d9d035358bbd70465a7ff2fb4231dea0d
-EBUILD certbot-9999.ebuild 1366 BLAKE2B 81a7df13ee1e1abcb0dfff63995fb752a5e0a3d6bebebf45ea11f476715ed96e5417fd667dd5f4faf0ad446649ad03e4c45be33b035cfecbe023aa2a1044e1d2 SHA512 2bac9490ac0be45fd39696c5befc5f63436a6d8f6238fba0ba1ec07a1a892f3887f49ed23499df4e07bd712666bd579d9d035358bbd70465a7ff2fb4231dea0d
+EBUILD certbot-0.37.0.ebuild 1364 BLAKE2B ab2063ceac5ae1024f2b8ac83c01825fa230f8f34aa1d75f56543e699493b8db8b6baad88c465530c649d80cafec64037333c97c18ebf5ef69012178ee33e1ff SHA512 2cf17f2e0506c4e34db9aa2174fd222d3d74f3bd40f35d2e3ee9c40f8e51e610f850d89535eaf1c24be07ad9619e1671fa46eaa3da88feb43273eaf97b814b16
+EBUILD certbot-0.38.0.ebuild 1411 BLAKE2B 11eb25aedac65f87fa9de601afa3e6d74791ea657e5b766f6345f0d128555f3899b22cc5dcac09b1dbdf1bf4eb213139522bf16ea750eec6f157ff3725c15901 SHA512 60bf2b405388dcf6d1bbb752b02428da55350d32c2963ebf1002364e13877c4d7a529917b9b47a6cbc2f27ab528e45c96b797011d673032518a5e2c1a67e2530
+EBUILD certbot-9999.ebuild 1411 BLAKE2B 11eb25aedac65f87fa9de601afa3e6d74791ea657e5b766f6345f0d128555f3899b22cc5dcac09b1dbdf1bf4eb213139522bf16ea750eec6f157ff3725c15901 SHA512 60bf2b405388dcf6d1bbb752b02428da55350d32c2963ebf1002364e13877c4d7a529917b9b47a6cbc2f27ab528e45c96b797011d673032518a5e2c1a67e2530
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.37.0.ebuild b/app-crypt/certbot/certbot-0.37.0.ebuild
index c55679793511..4ed99381a016 100644
--- a/app-crypt/certbot/certbot-0.37.0.ebuild
+++ b/app-crypt/certbot/certbot-0.37.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/certbot/certbot-0.38.0.ebuild b/app-crypt/certbot/certbot-0.38.0.ebuild
new file mode 100644
index 000000000000..0e7b7afdc975
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.38.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+
+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.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${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() {
+	# acme is not installed, removing it here is fine, the dir just confuses tests
+	rm -R acme
+	pytest -vv ${PN} || die
+}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index c55679793511..0e7b7afdc975 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 2cbc98c2b6d3..749cc3b6916d 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -16,6 +16,6 @@ DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
 EBUILD heimdal-7.5.0.ebuild 4334 BLAKE2B 33303601d32d3b2c6f54a3681012f854b6addc55b09c65e6d0cea74e8ac91c12de09624e37f3d4f9933c54dbe8de3cf7f258bb99d33d26a25a0c280288777b44 SHA512 6d40e8a30e74b95c918e7ee5bf10b3d017178bd4775bba707ff2dfc02d208c121426b66ebdbb50df09a96f4caa5c55b35f2e8d53cad9eac4f8ebf46b0f6de266
-EBUILD heimdal-7.6.0.ebuild 4543 BLAKE2B 8f16fd002b689035cbad48626673b43336346054611cf636745cbabe51b20dd67e86c9ba3054681ca23cba8d1838481ab86aeb93199be7d9b98e9d105576b352 SHA512 99756373dfb610def06431c4de594e829c399e92f24274f389043281bd2fdab48dd9624addbad48bcbcf438f59cc23285daf21c73be59b1d923a675283ae5153
-EBUILD heimdal-7.7.0-r1.ebuild 4536 BLAKE2B 758d3177cccbfa83ad69239536b207a218fcbfd0c85f6a943ece3722534b4bdd34d6d0a95de4c04d95f3273198463424117999acbf38f8b7248b62afd8cead59 SHA512 8fde4dc3b338d67c998eafe5122138b49d5d188acdceff1c7455fc02ecd6806794592d9e0b97ca6587b0bfe96e4f7e63996c6d1c9c0e843d17729fe0da84ff0e
+EBUILD heimdal-7.6.0.ebuild 4539 BLAKE2B cb888bddcf93c11fbb3dc7f4f1e79f281d6a8cb569cad25f175a9679501ef5a2160f73fca7d351594dd5c4cad64cf6bcfdac26862ffc32ad46d5f1d464fd5d92 SHA512 014f090fb241244736e7c5a29a2189e925b623325e95ac28f5b6385ed75c786ee066130a49d96a6f1701f683cf97121996536c47db55f82c78d228a2cf9f9393
+EBUILD heimdal-7.7.0-r1.ebuild 4532 BLAKE2B 9c622605356c00474f2897bb6305b6c5db17d348d3c940e7c9732e6c4c7b0b2530ef9c922c37b9c611d10386bdd897d81ef1e99e3638abd9f980ee68fba92081 SHA512 7a1f33ed8567a0ee7621c32071c48b29012183b75091558151c78afa3666d56e3f69d67e6ddbf0aa14b02c9b26d2695dd7322a0ef6846ab2d7b81f96f683bda4
 MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index f7a31275a72d..e3a1a5ad1bcc 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -155,8 +155,8 @@ multilib_src_install_all() {
 	dodoc ChangeLog* README NEWS TODO
 
 	# client rename
-	mv "${ED%/}"/usr/share/man/man1/{,k}su.1
-	mv "${ED%/}"/usr/bin/{,k}su
+	mv "${ED}"/usr/share/man/man1/{,k}su.1
+	mv "${ED}"/usr/bin/{,k}su
 
 	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
 	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index 6fe1ad2703ed..96697f3aa74b 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -155,8 +155,8 @@ multilib_src_install_all() {
 	dodoc ChangeLog* README NEWS TODO
 
 	# client rename
-	mv "${ED%/}"/usr/share/man/man1/{,k}su.1
-	mv "${ED%/}"/usr/bin/{,k}su
+	mv "${ED}"/usr/share/man/man1/{,k}su.1
+	mv "${ED}"/usr/bin/{,k}su
 
 	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
 	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 6befe7b483b4..1f4fa1607e9e 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/mecab-unidic/Manifest b/app-dicts/mecab-unidic/Manifest
index d5d74135b40d..f66955d280d2 100644
--- a/app-dicts/mecab-unidic/Manifest
+++ b/app-dicts/mecab-unidic/Manifest
@@ -1,3 +1,3 @@
 DIST unidic-mecab-2.1.2_src.zip 140517811 BLAKE2B 38001714023c1de6ea5388ccc6ab9f5a910c0f40ba1f5cfee861e6a733797ee6ea528eeeb185a4354c084f71189d73478f64719bc3e0b6424cc24a8088d419e1 SHA512 db80feab873851df874781fe81430ee90e238f166b90e77755a112602e0f22a7c4c5deb4ce8bcd357d258d8d806d917652e6723bf2a1b786942952fbbcb52782
-EBUILD mecab-unidic-2.1.2.ebuild 413 BLAKE2B c6edefef76e884e8bdc24e263cb9df5b242d65f6f8a0f4076225540e381d336910d3273fa86e16a9cedd84d7f7e3df2386a8975c4b8f69cb09c75a95addd5777 SHA512 8287cc4e8389681772525b03dc4e288c9d33f45dcab2a420a923fcd54d5bb469a65e78067d62acaea9383106a1560e47ff72a4419aa175c0b1e5455a035836fa
+EBUILD mecab-unidic-2.1.2.ebuild 428 BLAKE2B 00f89dd29a238f71a9b7aa4685b92c0a5d001e57647fbbecf006081337a756721e315fab06e23bd46852e2d4a1d60ae7285374f4633312d31b6a2e326e547235 SHA512 d7dd9d44f03ef0fd6d8d21ffc292c02e9e3ab1298d9c8ad167c7d4203dfe3e4f0b4fe24ae83fb54cf092f7421cdecad43b789f7dd22064e2cc7c345ecf924e94
 MISC metadata.xml 313 BLAKE2B 243c66aeabb7e42e74c6309fd8fd86071e6e59138a804c0b2e7f344e9f036ba36752f539cb33772456542060f6532188373028c749758ac8c0e1ce22af185b34 SHA512 3234951cdd3ab4229650cc24200041fe8b2f78523270966ffcc18ad1a7cae0e294d83037145c2a38b32918b48066462467bd21e1e2a07de58a45901bf2933697
diff --git a/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild b/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild
index 10aa05e9bac6..2d372389d3eb 100644
--- a/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild
+++ b/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,5 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="app-text/mecab"
+DEPEND="
+	app-arch/unzip
+	app-text/mecab"
 S="${WORKDIR}/${MY_P}"
diff --git a/app-dicts/myspell-cs/Manifest b/app-dicts/myspell-cs/Manifest
index 5bf69bf82f92..526d2fe1481a 100644
--- a/app-dicts/myspell-cs/Manifest
+++ b/app-dicts/myspell-cs/Manifest
@@ -1,3 +1,3 @@
 DIST myspell-cs-20110224.zip 1440618 BLAKE2B d90ae82b86ac0e01bc8a5b43bfcb5f7c95f216d5781dd050d798b942291c345966f7f535d74cbd17e5b42a387d0b2c7a7ed02a23bfe93c9bbb2fd0bcf5c192cd SHA512 9f2ed5e10771c00635f382c676b2f9184374b4c20a7d2262d3c441feae4d9dcddbd611cdaf74cb035c76c969d73d913d6116d9c1a4ab0a7a754bfbd8253c1ca5
-EBUILD myspell-cs-20110224.ebuild 559 BLAKE2B 7d3a63c8b74d06f83633ab982187ea09a35e4f231f1c23f351ac865d16b8f97e8bbe081ac93b510cc9cc129372afe54d53a9dd88d6dd7ba0ad67a4cf3b259401 SHA512 9e9066fcad06df72da88a8a3da75cab2161e638ae6165a110f68dc62470d232ef982f03e56c6cbae1c4df63914814481c4ebec2df3967f8dc8f525f3c8396c3e
+EBUILD myspell-cs-20110224.ebuild 590 BLAKE2B e7f8685cf864a6c9f7ac81cf296879a73bdef8a68171255012f2a0484d1e8e9274ca7cd4d411bef2e9487d1ac8a471da8b71faafd0472ba08d5c0775dae43659 SHA512 1741994784f2d8cb6ebe37f40a10aa86db7ddebedd73e8fb9a175ce9d12b29fc8947f7411ff40121e31570c1680373d1195c0cc973b16c7265cc98c5da32c605
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-cs/myspell-cs-20110224.ebuild b/app-dicts/myspell-cs/myspell-cs-20110224.ebuild
index 3158a741e5db..e78b30190222 100644
--- a/app-dicts/myspell-cs/myspell-cs-20110224.ebuild
+++ b/app-dicts/myspell-cs/myspell-cs-20110224.ebuild
@@ -21,7 +21,7 @@ inherit myspell-r2
 
 DESCRIPTION="Czech dictionaries for myspell/hunspell"
 HOMEPAGE="http://www.liberix.cz/doplnky/slovniky/ooo/"
-SRC_URI="${HOMEPAGE}/dict-cs-2.oxt -> ${P}.zip"
+SRC_URI="http://www.liberix.cz/doplnky/slovniky/ooo/dict-cs-2.oxt -> ${P}.zip"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 819c48555232..0f050b5a1d27 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/cantera-docs/Manifest b/app-doc/cantera-docs/Manifest
index fb738d626c97..f9f00487ba75 100644
--- a/app-doc/cantera-docs/Manifest
+++ b/app-doc/cantera-docs/Manifest
@@ -1,3 +1,3 @@
 DIST cantera-docs-2.4.0.tar.xz 4915944 BLAKE2B c7c40651ec8b4c6f6488c49cc991a115f08d6053b3383e28660028e72a55b2c231bfcfde976bec5e2be85828e642668d71730bdc803198bdcdee0631c09208ec SHA512 182475b180e65bb8bd7d5259a3b2a385b2b7c7db61a258a460c3e5fa91ae101306702ea3f00c6996a65ae8ebd1985dcc84b6d8291434578938efbb584db94c40
 EBUILD cantera-docs-2.4.0.ebuild 831 BLAKE2B d9a095ee817e46ea3c6d150d602d693971d519edb07936802c4253668393658cf76ba49eeb983442829cbcce3e69e28187814ce031caab581033a8ab74fe238e SHA512 5028e20ed26a2620895ec0ab97aaf3fc26f4998254b7714c0eed259fd1b41d10d3a50114f56d0af8de7973bb8a56e9b6159da8b85e3181736f0f411ec238d74f
-MISC metadata.xml 556 BLAKE2B 92adebd88552dd951baf150654d1178a76ef694389b153f53b37c51fea550b09769bdf0a1089a64746a81507131bc17c7f7d69f519460793bd5d4ff728fa65c3 SHA512 e6e3aa0e314da217e54d1073704cad4220d45ac1b3f573bbf711c1f30242140aa243de3fbe716b7ead35dee2bb77e45b9ed80500044661f45255e457d543b873
+MISC metadata.xml 558 BLAKE2B 680e77b9d2e6a370b965775e92e2cb82f3c9fb60070ee1b59ca33232b3c942ed866de824e00efeb0bcfe8cd3f22f5f0fe11c8ca760cc25d1929d5455548a7a86 SHA512 c955ccd4ef1409345468a6e9f904f70397fad224f2fa333c03e524e7fc6456dd2ef105e54738dde93f1edddc98d9edfe79efefbda03b84f0234037088061c63c
diff --git a/app-doc/cantera-docs/metadata.xml b/app-doc/cantera-docs/metadata.xml
index 8515d6895ba1..fcc1fbde7c8c 100644
--- a/app-doc/cantera-docs/metadata.xml
+++ b/app-doc/cantera-docs/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>torokhov_s_a@mail.ru</email>
+    <email>torokhov-s-a@yandex.ru</email>
     <name>Sergey Torokhov</name>
   </maintainer>
   <maintainer type="project">
diff --git a/app-doc/diveintopython/Manifest b/app-doc/diveintopython/Manifest
index 0e1f4cdc1530..6ed1c3e59fea 100644
--- a/app-doc/diveintopython/Manifest
+++ b/app-doc/diveintopython/Manifest
@@ -2,6 +2,6 @@ DIST diveintopython-2-pdf.zip 782047 BLAKE2B aecb0dab23fc9737a22e032628e23eecdec
 DIST diveintopython-2.zip 865555 BLAKE2B 55c541c3c77f3b0c4942212f4a15925571d1eb5974af4330f9edd610ba0037a9042442d2c1283d05e893888b2e2bb3da8cfe17c62a699fe8cb6e2682cbe0cd35 SHA512 9c57a9e228d30186b1e6fc10a47d4fa69704fd83ea68bba030d7909ad8df2b9cfeee942caf359b1dd1fd8f9459fee58ea8ddb3813759b17f06b93b3ccf4ca296
 DIST diveintopython-3-pdf.tar.gz 2235256 BLAKE2B 2617ae5fc8e7a61402a56aa43c094412bdf9b3350901980d4d0e33179f7e1ae9100e4d3ca8201e18a473c17205a7ee6a8efab55cfd230249f1eb07b671f90c96 SHA512 ecca7ba1540a48eb41b5bfd7ca878962939b9ec47eac6100f13d75eb24c6cae20177110877d34e6d1de47bed6883f9a25b379ced5c03b8c220103774a00a54b4
 DIST diveintopython-3.tar.gz 9958889 BLAKE2B 5c0b9764b6bb5f51af05142446750e9831fa6edb53336c47b398bf604c349e6c5c002c8f19f390d4929c94e2c19c5f0bb18a71ddb4b8b85d3701ee5feb35a4a4 SHA512 19a8498e4d91fc2ea2c899400336696732dae73da48faf55de43507e41e72a68c6ac25cea0acfdf3ca783344cd12c41326190ac9bbaf7ebdc113833e8bfea3a4
-EBUILD diveintopython-2.ebuild 690 BLAKE2B 95510d6829762d4dabe7d007713a58e3d011aa2bc9bdec8666368f2bca6262179a9d4399bbb672aeb4f2277f82be0b3a658f29c6aa826317877b35b88968a85c SHA512 565ce1c3f25d175afab136c4ea02c47db641da7fa5f74aaad93c96d4e166bdc65ddab7edff7f62e9949a8c95f3038cbdf62dd0a726af52ab5befa47955eb9b29
+EBUILD diveintopython-2.ebuild 711 BLAKE2B f31d98f14ece25e859c0ee720750fe0047060c62a13a6ab42ffda722403667f2e5a24917cdc916bd6fb805c8a18ba2314158e7cd9b595bae5a3012ee1b3b0d75 SHA512 46c96e92705aed1d72cb8d3e6ae0a35a8d5ffc0269429a7579899e82e83242f7e469b0325ca3f607ce0457c371e400ac98601f66ed0136f584a22bd1f1042f5d
 EBUILD diveintopython-3.ebuild 532 BLAKE2B 53e0c84b8661e5148321d84172bdebb4b2ce1fc2190fb96b3497efd96a6a760978799de2b8f0c2ccdd3c34ac6eb54247067505588526bd3149eb0c211371730a SHA512 ced251ed888ea41ad5e0cb688a55f8a0278d2124a34b32fa9ab158a0fde087644b67149a8cebd9a145b94aa573fb688e98f2df8d6a4a4fd6beb1209c21412955
 MISC metadata.xml 487 BLAKE2B ca7286e38e6ee1ec327d7fa0c396c8e7ae13e256270bf8624a725dddf08d2088fee2fec19d92c30bf3614a1ec3f504da9aec4acb4886cde87e36c74184ffe379 SHA512 eac11ca2f544ef0a681218f31a792faaad13dc0de625b1a0ce260abf64538a1a87381bf0aff9024634bc7d44ec36b246ddeaf16a6a1c2efb4d04b1364fbc9fe5
diff --git a/app-doc/diveintopython/diveintopython-2.ebuild b/app-doc/diveintopython/diveintopython-2.ebuild
index 391c52aba09b..194048ff03a2 100644
--- a/app-doc/diveintopython/diveintopython-2.ebuild
+++ b/app-doc/diveintopython/diveintopython-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
@@ -15,10 +15,11 @@ pdf? ( http://www.diveintopython.net/download/${PN}-pdf-${MY_PV}.zip -> ${P}-pdf
 
 LICENSE="FDL-1.1"
 SLOT="2"
-
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="pdf"
 
+DEPEND="app-arch/unzip"
+
 S="${WORKDIR}/${MY_P}"
 
 src_install() {
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 4a9b5fb3742c..3fcfb775df29 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -3,9 +3,9 @@ DIST gnucash-docs-3.3.tar.gz 92417386 BLAKE2B 200f9b8d3006589eac5f0d66300d658f69
 DIST gnucash-docs-3.4.tar.gz 92762652 BLAKE2B 1aad3f1e7fe5b6ec11b38dc778e8994544d50f9549450b4632e5fcbd370332f05c7c68f9f6bf0e274b654dee6304924d17089b61318e0e4356bf01133ad47508 SHA512 0a64c8fcc88988a08d5b2f7c472356c580dff17b1a2a37b66a6bed790fba9d7bb437955050656656a0be399b2ce1635902f4548f44b62233c1fcd1d75fbb38ec
 DIST gnucash-docs-3.5.tar.gz 97187415 BLAKE2B f35a3a25a120d3807771d74ee1c97713e21617f7ac7b4fdc1f58b9d12f7c0cc899a9af6abca21bd4f91a0978ebf5b93604deaae29f39c8ab86bd83ec93e32642 SHA512 aa832a1929ae91b9fe2a6a4ada0c7dbd8c1a4cf76086ec3ab0b82c7396d45aabbb6971f2db788bbdde71a68c8faca5f4621429819ef6c0d1156bcefdc5d289b5
 DIST gnucash-docs-3.6.tar.gz 96986567 BLAKE2B 753ee011cadec37320fafe3c0973bc5772c300dcf641ba34f05d03b9c13ec159c10f8571876adecfd7816956f2dfa9e83ad5879387536c15e7d1b138f7e38a47 SHA512 1fd36c74633ba699116914eaef245d4b84ab85a6e65578c602db8b2e3150f7fb97b549c12068a691e38b90ae0fa5cc22f8026b6d50de1ac967eb52b8296eb135
-EBUILD gnucash-docs-3.2-r1.ebuild 1665 BLAKE2B 16ad7acf14b9e37dafded93957de6c3246be6902ccea2198832b6dc5409f93ae06bcaf52e091f88d6df6b8327a77198140b67671b0f7a242a0e2bdccfb510222 SHA512 e95eab369275cfac0b5944ae8a0659e5743f44e76c650b78c055246d66c0b953ff8398070b87c3e1f341722b7d51ceaa6896b27b2dc8e424bc9a5e5ae40c3406
-EBUILD gnucash-docs-3.3.ebuild 1666 BLAKE2B 83ab7ebba3c17425df70be4e85f9c26032faf67bd88d16f42dc65cee0486ede8bf50b8bd8eecfbbb5a2d7e2d552cea6ec48370edf8b8c3ed0505abad0cb9e544 SHA512 38f8145072110b0611563ad592113d5f60a96a43986c8ec819ad3a66f6064406f5e929e37090e9bfcd3dae4ffe387ac6fb7dbf2e4610bde6b80a7bc14f6d4e8c
-EBUILD gnucash-docs-3.4.ebuild 1667 BLAKE2B c232b46024f80a9ff86833431ff983722a72d3f9953dff610cc5e86e8a9c22174d168a5d5ae32d5ff942bc2b7c8f1424c04f3012e83765af02446a2fe3266194 SHA512 026d7aae62cb09b435de0c50e4e3b1decf32a863fee0c11791a098e5847795b4467a63cfd80fa2bf52c1659bcf63d3426b1e4f3e160d7e13bdb54c7c4adb7ab0
-EBUILD gnucash-docs-3.5.ebuild 1667 BLAKE2B c232b46024f80a9ff86833431ff983722a72d3f9953dff610cc5e86e8a9c22174d168a5d5ae32d5ff942bc2b7c8f1424c04f3012e83765af02446a2fe3266194 SHA512 026d7aae62cb09b435de0c50e4e3b1decf32a863fee0c11791a098e5847795b4467a63cfd80fa2bf52c1659bcf63d3426b1e4f3e160d7e13bdb54c7c4adb7ab0
+EBUILD gnucash-docs-3.2-r2.ebuild 1347 BLAKE2B c6e0b8869682edb5bb8af7d2e18c83ee7cf42f2e99590cb5f5474a369f7a9040ecc301dda70ec3e2e46a2c39322d681484a00abc5f73d4bd5dfe6eb4ed3cca65 SHA512 44bd23ae64ed96efc0b2c7d3b0547cd8a8f02250bde1d8579b118f403c2e9b831703f5651b396ddf0868df9f3500229f29d18ee394504f02424a2c5c5eddefe2
+EBUILD gnucash-docs-3.3-r1.ebuild 1348 BLAKE2B 8f8ba12abedf43cc5d26ec871ce017778cde7532d791eb902f8c084da980015accc6a04f301f4fbfe6201cd114743c0f35a88c42796ff59ea3a30a7960399e02 SHA512 ec36f57e7f890e0f9a3ba1ed760218b1108ecad611c98f89cc427d744ceb8567c0d8818da9d1a4d468ca60357e494d7e83d91797e647ac15b4a79fb0c19b5808
+EBUILD gnucash-docs-3.4-r1.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
+EBUILD gnucash-docs-3.5-r1.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
 EBUILD gnucash-docs-3.6-r1.ebuild 1349 BLAKE2B c49d34af4965a157742bcc809c5d3fe5182ebe5e309248c9fd7e0470b2f3477c528c0ca182790682e1319daed9ab84081fc0b8fd8151d193556030d49329cc6c SHA512 e1813f8f33e80d54129b2826452997d73611a7832401b440c92030e91fdb965f81e880c3f5e4377e09ebbfbece6948e20dec7ace2d14ebda54d3f83f19d355a1
-MISC metadata.xml 496 BLAKE2B a668cda0f44d550b086c539edbd5eeb93092fee992621cbd655b5c30e3bfd658fcd0a65d4140f2f9ba4d368438c224bac887e86e6d36b730afd4a24c195fc448 SHA512 19e5631659fe0153e6f2de3bcc8dc5eb1615dc3e6a3493d71ea0d5e18df48fe64fef31819883add93cd1da425ebea0aa82f62b0052bdc328773b8a3c0bfca26a
+MISC metadata.xml 444 BLAKE2B d5ab61b0738eb3124b32f94da3b3f38ef8993039a4797eab95f0c2c2af427c6262cdb2b5885d0e4dfc659e15bad9c492db706f134f8128595eeef6afbcd4b663 SHA512 7a97c9139b410b8054093bd666c6043e6383e5b3ad9f19a52e7b4d2aaafa1b915082408d575064e7be1f0c4b14eae660837d608e88956a4e51fa1c647a19b5b2
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.2-r1.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.2-r1.ebuild
deleted file mode 100644
index b82237e7a151..000000000000
--- a/app-doc/gnucash-docs/gnucash-docs-3.2-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="C de it ja pt ru"
-PLOCALE_BACKUP="C"
-
-inherit autotools gnome2 l10n
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-for my_locale in ${PLOCALES}; do
-	IUSE+=" l10n_${my_locale}"
-done
-
-DEPEND="
-	app-text/docbook-xml-dtd
-	app-text/docbook-xsl-stylesheets
-	app-text/rarian
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-my_l10n_get_locales() {
-	local l locales
-	for l in ${PLOCALES[@]}; do
-		use "l10n_${l}" && locales+=( $l )
-	done
-	if [[ ${#locales[@]} -gt 0 ]]; then
-		echo ${locales[@]}
-	else
-		echo $PLOCALE_BACKUP
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local doc_type my_lang
-
-	for doc_type in help guide; do
-		for my_lang in $(my_l10n_get_locales); do
-			case $my_lang in
-				# Both help and guides translated
-				C|de|it|pt) ;;
-				ru|ja) # Only guides translated
-					if [[ ${doc_type} = "help" ]] ; then
-						elog "Help documentation hasn't been translated for $my_lang"
-						elog "Will do English instead."
-						my_lang=C
-					fi
-					;;
-				*)
-					die "Invalid locale: $my_lang"
-					;;
-			esac
-
-			cd "${S}/${doc_type}/${my_lang}" || die
-			emake DESTDIR="${D}" install
-		done
-	done
-
-	cd "${S}" || die
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
-	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
-}
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.2-r2.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.2-r2.ebuild
new file mode 100644
index 000000000000..4582197df338
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-3.2-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 FDL-1.1"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+LOCALES=( de it ja pt ru )
+IUSE="${LOCALES[*]/#/l10n_}"
+
+DEPEND="
+	app-text/docbook-xml-dtd
+	app-text/docbook-xsl-stylesheets
+	app-text/rarian
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local doc_type my_lang
+
+	for doc_type in help guide; do
+		for my_lang in C ${L10N}; do
+			case $my_lang in
+				# Both help and guides translated
+				C|de|it|pt) ;;
+				ru|ja) # Only guides translated
+					if [[ ${doc_type} = "help" ]] ; then
+						elog "Help documentation hasn't been translated for $my_lang"
+						elog "Will do English instead."
+						continue
+					fi
+					;;
+				*)
+					die "Invalid locale: $my_lang"
+					;;
+			esac
+
+			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
+		done
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
+	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
+}
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.3-r1.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.3-r1.ebuild
new file mode 100644
index 000000000000..da27ce8d5de0
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-3.3-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 FDL-1.1"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+LOCALES=( de it ja pt ru )
+IUSE="${LOCALES[*]/#/l10n_}"
+
+DEPEND="
+	app-text/docbook-xml-dtd
+	app-text/docbook-xsl-stylesheets
+	app-text/rarian
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local doc_type my_lang
+
+	for doc_type in help guide; do
+		for my_lang in C ${L10N}; do
+			case $my_lang in
+				# Both help and guides translated
+				C|de|it|pt) ;;
+				ru|ja) # Only guides translated
+					if [[ ${doc_type} = "help" ]] ; then
+						elog "Help documentation hasn't been translated for $my_lang"
+						elog "Will do English instead."
+						continue
+					fi
+					;;
+				*)
+					die "Invalid locale: $my_lang"
+					;;
+			esac
+
+			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
+		done
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
+	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
+}
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.3.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.3.ebuild
deleted file mode 100644
index 1faefbd6ed41..000000000000
--- a/app-doc/gnucash-docs/gnucash-docs-3.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="C de it ja pt ru"
-PLOCALE_BACKUP="C"
-
-inherit autotools gnome2 l10n
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-
-for my_locale in ${PLOCALES}; do
-	IUSE+=" l10n_${my_locale}"
-done
-
-DEPEND="
-	app-text/docbook-xml-dtd
-	app-text/docbook-xsl-stylesheets
-	app-text/rarian
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-my_l10n_get_locales() {
-	local l locales
-	for l in ${PLOCALES[@]}; do
-		use "l10n_${l}" && locales+=( $l )
-	done
-	if [[ ${#locales[@]} -gt 0 ]]; then
-		echo ${locales[@]}
-	else
-		echo $PLOCALE_BACKUP
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local doc_type my_lang
-
-	for doc_type in help guide; do
-		for my_lang in $(my_l10n_get_locales); do
-			case $my_lang in
-				# Both help and guides translated
-				C|de|it|pt) ;;
-				ru|ja) # Only guides translated
-					if [[ ${doc_type} = "help" ]] ; then
-						elog "Help documentation hasn't been translated for $my_lang"
-						elog "Will do English instead."
-						my_lang=C
-					fi
-					;;
-				*)
-					die "Invalid locale: $my_lang"
-					;;
-			esac
-
-			cd "${S}/${doc_type}/${my_lang}" || die
-			emake DESTDIR="${D}" install
-		done
-	done
-
-	cd "${S}" || die
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
-	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
-}
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.4-r1.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.4-r1.ebuild
new file mode 100644
index 000000000000..505a73b78785
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-3.4-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 FDL-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+LOCALES=( de it ja pt ru )
+IUSE="${LOCALES[*]/#/l10n_}"
+
+DEPEND="
+	app-text/docbook-xml-dtd
+	app-text/docbook-xsl-stylesheets
+	app-text/rarian
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local doc_type my_lang
+
+	for doc_type in help guide; do
+		for my_lang in C ${L10N}; do
+			case $my_lang in
+				# Both help and guides translated
+				C|de|it|pt) ;;
+				ru|ja) # Only guides translated
+					if [[ ${doc_type} = "help" ]] ; then
+						elog "Help documentation hasn't been translated for $my_lang"
+						elog "Will do English instead."
+						continue
+					fi
+					;;
+				*)
+					die "Invalid locale: $my_lang"
+					;;
+			esac
+
+			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
+		done
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
+	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
+}
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.4.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.4.ebuild
deleted file mode 100644
index 2fd86099fbde..000000000000
--- a/app-doc/gnucash-docs/gnucash-docs-3.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="C de it ja pt ru"
-PLOCALE_BACKUP="C"
-
-inherit autotools gnome2 l10n
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-for my_locale in ${PLOCALES}; do
-	IUSE+=" l10n_${my_locale}"
-done
-
-DEPEND="
-	app-text/docbook-xml-dtd
-	app-text/docbook-xsl-stylesheets
-	app-text/rarian
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-my_l10n_get_locales() {
-	local l locales
-	for l in ${PLOCALES[@]}; do
-		use "l10n_${l}" && locales+=( $l )
-	done
-	if [[ ${#locales[@]} -gt 0 ]]; then
-		echo ${locales[@]}
-	else
-		echo $PLOCALE_BACKUP
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local doc_type my_lang
-
-	for doc_type in help guide; do
-		for my_lang in $(my_l10n_get_locales); do
-			case $my_lang in
-				# Both help and guides translated
-				C|de|it|pt) ;;
-				ru|ja) # Only guides translated
-					if [[ ${doc_type} = "help" ]] ; then
-						elog "Help documentation hasn't been translated for $my_lang"
-						elog "Will do English instead."
-						my_lang=C
-					fi
-					;;
-				*)
-					die "Invalid locale: $my_lang"
-					;;
-			esac
-
-			cd "${S}/${doc_type}/${my_lang}" || die
-			emake DESTDIR="${D}" install
-		done
-	done
-
-	cd "${S}" || die
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
-	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
-}
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.5-r1.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.5-r1.ebuild
new file mode 100644
index 000000000000..505a73b78785
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-3.5-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 FDL-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+LOCALES=( de it ja pt ru )
+IUSE="${LOCALES[*]/#/l10n_}"
+
+DEPEND="
+	app-text/docbook-xml-dtd
+	app-text/docbook-xsl-stylesheets
+	app-text/rarian
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local doc_type my_lang
+
+	for doc_type in help guide; do
+		for my_lang in C ${L10N}; do
+			case $my_lang in
+				# Both help and guides translated
+				C|de|it|pt) ;;
+				ru|ja) # Only guides translated
+					if [[ ${doc_type} = "help" ]] ; then
+						elog "Help documentation hasn't been translated for $my_lang"
+						elog "Will do English instead."
+						continue
+					fi
+					;;
+				*)
+					die "Invalid locale: $my_lang"
+					;;
+			esac
+
+			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
+		done
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
+	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
+}
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.5.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.5.ebuild
deleted file mode 100644
index 2fd86099fbde..000000000000
--- a/app-doc/gnucash-docs/gnucash-docs-3.5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="C de it ja pt ru"
-PLOCALE_BACKUP="C"
-
-inherit autotools gnome2 l10n
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-for my_locale in ${PLOCALES}; do
-	IUSE+=" l10n_${my_locale}"
-done
-
-DEPEND="
-	app-text/docbook-xml-dtd
-	app-text/docbook-xsl-stylesheets
-	app-text/rarian
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-my_l10n_get_locales() {
-	local l locales
-	for l in ${PLOCALES[@]}; do
-		use "l10n_${l}" && locales+=( $l )
-	done
-	if [[ ${#locales[@]} -gt 0 ]]; then
-		echo ${locales[@]}
-	else
-		echo $PLOCALE_BACKUP
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local doc_type my_lang
-
-	for doc_type in help guide; do
-		for my_lang in $(my_l10n_get_locales); do
-			case $my_lang in
-				# Both help and guides translated
-				C|de|it|pt) ;;
-				ru|ja) # Only guides translated
-					if [[ ${doc_type} = "help" ]] ; then
-						elog "Help documentation hasn't been translated for $my_lang"
-						elog "Will do English instead."
-						my_lang=C
-					fi
-					;;
-				*)
-					die "Invalid locale: $my_lang"
-					;;
-			esac
-
-			cd "${S}/${doc_type}/${my_lang}" || die
-			emake DESTDIR="${D}" install
-		done
-	done
-
-	cd "${S}" || die
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
-	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
-}
diff --git a/app-doc/gnucash-docs/metadata.xml b/app-doc/gnucash-docs/metadata.xml
index e0724f47e4bb..dc94f737b786 100644
--- a/app-doc/gnucash-docs/metadata.xml
+++ b/app-doc/gnucash-docs/metadata.xml
@@ -9,9 +9,6 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="l10n_C">English</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">gnucash</remote-id>
 	</upstream>
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 35d52cef23b3..52e1b6599287 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/e3/Manifest b/app-editors/e3/Manifest
index b62b8966233d..f4ec555ceffa 100644
--- a/app-editors/e3/Manifest
+++ b/app-editors/e3/Manifest
@@ -1,3 +1,5 @@
 DIST e3-2.8.tgz 119939 BLAKE2B b0882a359126d392a3e24971b1f2e39572bbbe0d95f388a4b75e8cc3e4424e798ddc381c9489ca65452668884abbacc2c27c33b6c7f230a6eb4d44986313a42c SHA512 f3443ac558203b6921458761174ebc060936ae9f8a834670044152b9af52e0919075ac8110ba47b4b6f4e8261afa917e9fe49492b8d40d38d69987353ddd5189
+DIST e3-2.82.tgz 115504 BLAKE2B 09edea9063657373cf6d7d9d8290dddf17b8fb516538d89b83462176127b8b43832bd81f326eec5504116f05ab780023832b8b5d41d72e3ab8e726d89e364a36 SHA512 07c7e40d26879871b60d7e89839805d779383dbaabe42a6a3a7047fa8a4c501c4cd0cdc828a9d29d4ac1c5b949bda07946d8e71e1320c6c303ffce88a3038547
+EBUILD e3-2.8.2.ebuild 832 BLAKE2B 0f7d39ce8a8335eb5a844d5a4bba73720aebca318a602e59f5099ee714b33151d85958f5a391d3a2c69f0dd097fbdd97ff98a2adeec8ee37681083d4a8ea182d SHA512 a720cee4f389cf7da775a3e17c3f041ad5c40cc2da4ce0be23dc0ee992a8c9040285f1ab2493897dd8f4d95c14fa19f29a29a3b194802587eedc63508c6d306b
 EBUILD e3-2.8.ebuild 759 BLAKE2B b59b4cbdf6b7c5752957dd1db03b77321ef1d89b600278abe5a841efe37794038c4aa783189fca0464d7a0f7c8671c292ed42c41232bd541d8d486cfdc72693e SHA512 d76af36d27aee6a1aff25d85c89dee78c223009caee6d8b5f57e66f6b5818aae97324203391ba91e03c5cf72bcc8c658d024660bffaf0b874a9ab68b34e49799
 MISC metadata.xml 918 BLAKE2B a0bd5163da7fe48664cc720d60b08c11af32234b0b265a8e2cca6d980a3af3b29ad223fdd5a81886ea3b528875fadd0520650a463894040b2f48ad00eabdf8c6 SHA512 9e8d5b6557a492d39c79c06507ea3ee670729e315cee2456e595d53f88178801b629595ac8903ac70878a63e85b46e934c761d70fef328fdfddc78e0c7416f4d
diff --git a/app-editors/e3/e3-2.8.2.ebuild b/app-editors/e3/e3-2.8.2.ebuild
new file mode 100644
index 000000000000..396ed8eb0f58
--- /dev/null
+++ b/app-editors/e3/e3-2.8.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-$(ver_rs 2 '')"
+DESCRIPTION="Very tiny editor in ASM with emacs, pico, wordstar, and vi keybindings"
+HOMEPAGE="https://sites.google.com/site/e3editor/"
+SRC_URI="https://sites.google.com/site/e3editor/Home/${MY_P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip"
+
+BDEPEND=">=dev-lang/nasm-2.09.04"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i 's/-D$(EXMODE)//' Makefile || die
+	eapply_user
+}
+
+src_compile() {
+	emake -- $(usex amd64 64 32)
+}
+
+src_install() {
+	dobin e3
+	dosym e3 /usr/bin/e3em
+	dosym e3 /usr/bin/e3ne
+	dosym e3 /usr/bin/e3pi
+	dosym e3 /usr/bin/e3vi
+	dosym e3 /usr/bin/e3ws
+
+	newman e3.man e3.1
+	dodoc ChangeLog README README.v2.7.1
+	docinto html
+	dodoc e3.html
+}
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index b276b29c9358..31dcdbe07f22 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,9 +1,8 @@
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 BLAKE2B 0106fe8053b4f65f384d451ca85138991a57afaca16b32035585055bb877c039af826859fa58c4660ec80664d3bfb0ee7a757ad76381c150ebcb22cb333a98d6 SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6
-DIST emacs-18.59-patches-11.tar.xz 22032 BLAKE2B cfdb85aeefa7a71dfd0719de893e9ea3f7118baa0b8c5aa97b3800c1a5743e77d63c35ab1e4afb13c284f5c6dda522d1e2e37f8bfd9bbba052e543af7401565b SHA512 cac3f2efc8b3f18cdf43474453acc406c5b469ecc11955f8216083a4deced887aea4a73221aa36f0bc6b7480788606f969ee1df15a8932ee771fdf790e98c00c
+DIST emacs-18.59-patches-12.tar.xz 22252 BLAKE2B 14cb456f83447b298b280e11920d486c8cbe824f329ed841ceaa3751e68123bc8c7eda1ed4e2070eaf479d0cf8f8319294ab9f2c31cacc7a9a822bab7a2c70d0 SHA512 24a259383b4fd303d267c9c1bce0e7c99ec8838a45b62ff16ea1f37879d240f000844cdd5e1de5ec6f87fee7cb42b23447dc6958e9fb4b2fc83e5f2d5c21a6b2
 DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
 DIST emacs-23.4-patches-23.tar.xz 19932 BLAKE2B 941d939d1a66af162016eb7f4a34a3a6d19736ecbd06e2499ccb0bf8806b2b3583de324308698b00d0b47a3d0b8a046e5d5dcb2d681c2bba90ec40b58b4e9855 SHA512 83e2cef7ebe07fc69806d01946c6e96fa0e92b363e9c6531992593eeb29413518217fef05bba48729356af7d1326c3667748185aad971a625daccb803b2bfe58
 DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296
-DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aaf0b83eb6fa841ce4569bc58e2bd12802890c2a8496375280c0ce8fa56515918dfdcbc958f349bc2472104e37ad1fcd1 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5
 DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 3e097f9cdf96a8b0255ce69770f79259ac9bdddbf5aa77c381973e4348d0900ee6dc6ed4af26021811afbb14eff84bc2a370bc8e803d112476554d03b074ce66 SHA512 fe9f9c19ff760e61dcbf1828d4e9e2806c141b47372bdd736be8237183660a28e2ef86a97034d060e244ff81540a2503a1b47655ef84222fddacb3a87f0f34ae
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e5f197215888253f75827645e440f6579da16d4cd8340f2732f8bf8a6a15713e29848953033dc62b573a1c1fab455bf SHA512 f171cc5699f06523a007aba5aa1a4274c9a875358a60405aa77cdc96ebb229082cb73453940e8c9e76dd7b86979cefc261883db0c130142543befb7a097475f4
@@ -11,11 +10,12 @@ DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099
 DIST emacs-26.1-patches-2.tar.xz 2740 BLAKE2B 43a58137d6096fd6b49688192b65e97446cd31691b18c2e69c8980ff1d93caa66ff670f06456df91411fd74396deaa1899c7afb6c0a4bbc98d4c2d9bd7ed7d40 SHA512 31c1714d130a02692c65dd1371662100f9fbf33a8df30b8bad8fa688ab993e0a596101a4765a7859801d1f66e729c9fca748e70b9919e5b2a777d39fcbe92c21
 DIST emacs-26.1.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25d13ec5e0bee9ec6a65e80c52c870162b4671e80a82f8310784c802924609f2f87d504b1a97617c44d859566f SHA512 537c2cfdd281151b360002419dde6280c313e07a937ed96405c67f754b3401ec5541091a3c0aa6690929bc33dd79e8e0d8844e7a6b014b7798c63cb15de210c2
 DIST emacs-26.2.tar.xz 44406808 BLAKE2B 23c23958b177f032082fc5e71ebccc4a88c10b19258ec22608d7bade37dc58d5f8aa4a74e86114c72ea8be8fc299b6c9af5af283f28bd7e965830e587f1bdc93 SHA512 c223ff5c51ca8bdf887bacb2dc37b08a637d39ed6f887cc24f67397e46fe5fdb68f33f21b97300b985c749f32aa09080d33103271637ed4ce5d9f2ea34ce9fe1
-EBUILD emacs-18.59-r12.ebuild 4412 BLAKE2B e560829c6de369456f7a77ddba9a6047addace03406ca36aa7778473d470484e7a675cd5eceabc491b86a5a7140ecaafdb86fab9db5974d0fd817f4b55d48a85 SHA512 11144b4d09773faf8ea2fe054695b5a045778c0cfdf0314c9eb8b0af34526eac1e0ac6f245955361e99807eadea9e8c0d40411907e14e2845ce2b91f0d404245
+DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
+EBUILD emacs-18.59-r12.ebuild 4418 BLAKE2B 232057c210d2ee4c20148d3dcd61ea9a9204a14d1e1f83c40c3c206750c4d594298eeb5cf112d9dbb697f33ca73b3e92d8f224c5dbad55f252a110effbc50b63 SHA512 2c502c95939a0bde3617f0341867d6156f2317fe4a84dff0e178d6c16edf41868df905e5711e090eea81c850cae77db6adb2d8a3d7935ec3d1db5b53006e44cd
 EBUILD emacs-23.4-r18.ebuild 11554 BLAKE2B 36ff7c5e18ea36d5ced82ce6414c9030fccfb54062340521f500d0b49c552afe47b7e7c8e09c5b4833a17a87e17481ceda99b0f1100ce72f6de01ffbd3c7f42c SHA512 84cda67a463ddb930356fd76fd1c9351577c0ab0ccabc6184a7f8f9c6ac0c6d4e44a547c08e8b56d1f8cb85b54c38f4728a954e2ffd6bf8120eb1db7ae8312b4
-EBUILD emacs-24.5-r5.ebuild 11290 BLAKE2B df7006f96dd7dc6ae829fabf469d72bea84b0275f289fd5ace87880fe7953bd0d7e92a8e6719cebd408377b53aec476035fcab058d0c6cea175447e7580a5629 SHA512 35d0d3f3f1b66e401570edad9eeef468740d28eb88064cb7f5895cd67d37c6e0a3fceea2207aae4bccc9584efdbecd37ee3008a9aac41b7e82f588a05f7be55d
 EBUILD emacs-24.5-r7.ebuild 11364 BLAKE2B f712a1af218f3e495b6c3cfc91850d2a6c31b348635609adde23943c453bb17ad9d34ea571e96fac7bd749704beec72ebeb1ccc2b6aec6b8cab438c780f24313 SHA512 7f8a2c542d85c0125212d13a86dd690cf45c92379f269e5be69772e4d3c0735facc0774ec976190fd7b6f04893220ea3c662d1c7001249c6e9d1b8f26e88eaa4
 EBUILD emacs-25.3-r6.ebuild 11662 BLAKE2B ceef7af0a3b0462e6c57bf27e4138aad675fc7a11d707a6241852cfabd7bfa72dd52654b929b7959f9a6ee39a8bd56d693b046465c97841d9eefd35703333227 SHA512 7a5b76fdb49c0d661cd3b74cb3ff365b8a96391a28ef444a676fec7e4b18eaf804a39afc395f92972ce72cac1cecb0382897ce02adc8d2e7d1f672777b4ac69a
 EBUILD emacs-26.1-r3.ebuild 12308 BLAKE2B dd36d96063583e6190a2a38af7859cb81b769d887b03f25ca39dbcc29c0f42a6fbb6344fd31f598c5f7c95674abb04fa5efd48c163c31c1f324abb7c686de5da SHA512 0a950af2d726d01dbe4803be7f8bcfc06c27c0acd900ad505bdacdd39a9bfead921d6e12f6e8f439816f160a336074eebcb8a3ef14e7b25bca6297ccfe84fc96
 EBUILD emacs-26.2.ebuild 12112 BLAKE2B 53f5681592f916e3d291511eea74cfce3a74b611b471ee65d9bac9229012572ea9922b9d02d298b0618b26da5d109318f7cffcbbdae581edf6c8d532a976e849 SHA512 98f31f2b0de5f1a588f9e459786c2d2d1b86908a7f451ebdc0ededdcef3d5b3622202f52a70a5b46bfd1351ed44ab13cc8452e63fd7dd628525b8375ed4851e1
-MISC metadata.xml 2849 BLAKE2B 28cad6b703be952825ae288ee9218209a2f38992bc8381ef60a0f6b36f57971bd133ccff284f0bc20d03a15d89c71950c21a2c32b3f47bd80bb793f5e439e1e0 SHA512 0db4dc9edb2a6f9e917b4648b887ec12f016f77d3332e67bf8962a0ba592908e34108610083e76f4abe7cd2f52a07bb75e8b14089b1ca87c138e711c2d31ff9b
+EBUILD emacs-26.3.ebuild 12122 BLAKE2B 00d5725bcbd0fe0f49e95690aebf3fdd9fe0ccd50fb6474a9a37c2f643a603fbc39e203257baeeda4e2540aa157f1ea09f9ddc9270ef4da57e3977968a1b0c84 SHA512 d6f9cf99cd551ea87266ea104c50fa1935a3f1a8f3d770e5cf0d458e5b9b938241a7c8b33d86e33d6fe2a49cb3bb60d09726d388e6b76efaa011082973de14a0
+MISC metadata.xml 2741 BLAKE2B 9f945f7d777f555676d0c51648822627a3320b98832d9a8dfb93574a2361a3c439f54c8a94f033bd6ea936625764190b5863e727bf518aafd99da389337932be SHA512 6b81f609c0834d10cbdd807e7bf60fa95e23531795bcb6b4a0f854299e3a7498a412fa2864a40b285701c4151ee8473cda9d4b8295b1d60f4b29b66dcb55e11d
diff --git a/app-editors/emacs/emacs-18.59-r12.ebuild b/app-editors/emacs/emacs-18.59-r12.ebuild
index 17824bc34455..a159d3611901 100644
--- a/app-editors/emacs/emacs-18.59-r12.ebuild
+++ b/app-editors/emacs/emacs-18.59-r12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="The extensible self-documenting text editor"
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
 	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-11.tar.xz"
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-12.tar.xz"
 
 LICENSE="GPL-1+ GPL-2+ BSD HPND"
 SLOT="18"
@@ -83,7 +83,7 @@ src_configure() {
 }
 
 src_compile() {
-	addpredict /var/lib/emacs/lock
+	addpredict /var/lib/emacs/lock		#nowarn
 	emake --jobs=1 \
 		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
 		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild
deleted file mode 100644
index 2227bcb15207..000000000000
--- a/app-editors/emacs/emacs-24.5-r5.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0=
-			<media-gfx/imagemagick-7:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	X? ( x11-base/xorg-proto )"
-#	pax_kernel? ( sys-apps/attr )
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-	eapply ../patch
-	eapply_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-	touch src/stamp-h.in || die
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-	append-ldflags $(test-flags -no-pie)	#639570
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	# Don't trigger a floating point exception for NaNs on alpha
-	use alpha && append-flags -mieee
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser=":gamestat" \
-		--without-compress-install \
-		--without-hesiod \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gpm) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-26.3.ebuild b/app-editors/emacs/emacs-26.3.ebuild
new file mode 100644
index 000000000000..0e312adbbbb7
--- /dev/null
+++ b/app-editors/emacs/emacs-26.3.ebuild
@@ -0,0 +1,385 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+REQUIRED_USE="?? ( aqua X )"
+
+RDEPEND="sys-libs/ncurses:0=
+	>=app-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			gtk2? ( x11-libs/gtk+:2 )
+			!gtk2? (
+				x11-libs/gtk+:3
+				xwidgets? (
+					net-libs/webkit-gtk:4=
+					x11-libs/libXcomposite
+				)
+			)
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+BDEPEND="virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+#	pax_kernel? ( sys-apps/attr )
+
+RDEPEND="${RDEPEND}
+	!<app-editors/emacs-vcs-${PV}"
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+# FULL_VERSION keeps the full version number, which is needed in
+# order to determine some path information correctly for copy/move
+# operations later on
+FULL_VERSION="${PV%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+
+src_prepare() {
+	#eapply ../patch
+	eapply_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	#AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			if use gtk2; then
+				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
+				use xwidgets && ewarn \
+					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
+			else
+				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			fi
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		if ! use gtk; then
+			use gtk2 && ewarn \
+				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
+			use xwidgets && ewarn \
+				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+		fi
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gpm) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+}
+
+src_install () {
+	emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+	rm -rf "${ED}/usr/$(get_libdir)"
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+	fi
+
+	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+		through the Emacs eselect module, which also redirects man and info
+		pages. Therefore, several Emacs versions can be installed at the
+		same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
+		strongly recommended that you use app-admin/emacs-updater to rebuild
+		all byte-compiled elisp files of the installed Emacs packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die
+	elif [[ -d "${ED}"${infodir} ]]; then
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" || die
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index c03b6b3d0838..7af9ff05554c 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -33,8 +33,6 @@
     system font name</flag>
   <flag name="gtk2">Prefer version 2 of the GIMP Toolkit to version 3
     (<pkg>x11-libs/gtk+</pkg>)</flag>
-  <flag name="gtk3">Prefer version 3 of the GIMP Toolkit to version 2
-    (<pkg>x11-libs/gtk+</pkg>)</flag>
   <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
   <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
     processing</flag>
diff --git a/app-editors/ersatz-emacs/Manifest b/app-editors/ersatz-emacs/Manifest
index 985ba333d8f7..348c230843b0 100644
--- a/app-editors/ersatz-emacs/Manifest
+++ b/app-editors/ersatz-emacs/Manifest
@@ -1,4 +1,5 @@
-AUX ersatz-emacs-20060515-gentoo.patch 971 BLAKE2B 2730f247c341bb89e8f0c1eadb5730098091cd01a5b1ceaef76fdd516c2cdbfb532ce25312e0ab71ba404bfca83e6a30d90982842dcce13e45d70859c9862cae SHA512 dd9264a80f80eeb06a1c194d9f9df02c2b53fc143ec676e9c9489b57d337fe2b42240029026acc932f05b11ca78464033a5571990dca1cae716932d3c9a300fe
+AUX ersatz-emacs-20060515-gentoo.patch 987 BLAKE2B d179aefe21c91d8d207ac6278334a2b2c7de91a46443981099be9926e75f047a688bf18cf290236b00b4a1be8581abb6142e56d53d5f252f5425789b9debbfe7 SHA512 3d411fcd237e320a32663abeeb5030748e9fc678aaecc51d004a538ae0163b447107b8068fe2f17ce4220f78865aee59251810b9ec7044a829bb415cd78f7b2d
 DIST ersatz-emacs-20060515.tar.gz 45581 BLAKE2B 641cad2f5a873b0c70743a6f60ffc31615bb8789d5c6a100a67aaa82c59e7a83d35023eb596303ef0160e3ff561c89e5814b685a7a650aa4625326e86ec4fdf3 SHA512 c30ede63ebb44076762aa430a73c73d3fa3bcd0e3d0016162aab31347257124479f464a1003012f7418e807abfd3c613c81f5196ccf65b0cb3f939b7ad5c989d
+EBUILD ersatz-emacs-20060515-r1.ebuild 1057 BLAKE2B 7cdaf84b5b72ceb47c401d0e3db5610c91c1737ccb2e359de0f1675546c4d6aff10048320c20747bb04a404215695da5b527382333b88477d25593ddd756ffc6 SHA512 0c1be5985a10592e97ec536970a1e88cd9341f650b284f1571a8fea1a20ed287b5a37d00329857a674e0e0a5a0872ee0aa8c40e6862aedbe07599e4677349929
 EBUILD ersatz-emacs-20060515.ebuild 998 BLAKE2B 8f2d0f17c67743b133976585a46c2bf759e84863d6be4e490aa8268d953b9a740b9ca3b763d9591c1cd238ab2a20efde978fcef837bcdeb6d43a0121ff983f78 SHA512 fb40ee9f53105526538b353bcbffa9f3c8b361f9da27289f127b6eff53f78f860577f633172e975338df6d781d85d6b629a4051cc2328bd0ba1a6f7e28099406
 MISC metadata.xml 610 BLAKE2B c7dc603c9e9ac838bd21b3e6f513f1e3f79370f9eedcc0f6973c812526c342408e1eac696d5b0c9fe3a5f8c20911af7f7bc9cc4260f443f2ec0cd80d60dbf724 SHA512 a48b4e5215cdd4a33802ef3fcf3324f43bd3c8ec8d70ba6be8e295c8dda35c4e4df400a04afbf4193c595c7dd4d23aeee38cb80585e498b1b77907aaedb56926
diff --git a/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild b/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
new file mode 100644
index 000000000000..2506526d39d2
--- /dev/null
+++ b/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A very minimal imitation of the famous GNU Emacs editor"
+HOMEPAGE="https://web.archive.org/web/20171126221613/http://hunter.apana.org.au/~cjb/Code/"
+# taken from http://hunter.apana.org.au/~cjb/Code/ersatz.tar.gz
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}
+	!app-editors/ee"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-gentoo.patch
+	sed -i -e "s%/usr/local/share/%/usr/share/doc/${PF}/%" ee.1 \
+		|| die "sed failed"
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} -Wall" \
+		LFLAGS="${LDFLAGS} $("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_install() {
+	# Note: /usr/bin/ee is "easy edit" on FreeBSD, so if this
+	# is ever keyworded *-fbsd the binary has to be renamed.
+	dobin ee
+	doman ee.1
+	dodoc ChangeLog ERSATZ.keys README
+}
diff --git a/app-editors/ersatz-emacs/files/ersatz-emacs-20060515-gentoo.patch b/app-editors/ersatz-emacs/files/ersatz-emacs-20060515-gentoo.patch
index 67c40e789241..3a31f2f116ca 100644
--- a/app-editors/ersatz-emacs/files/ersatz-emacs-20060515-gentoo.patch
+++ b/app-editors/ersatz-emacs/files/ersatz-emacs-20060515-gentoo.patch
@@ -1,5 +1,5 @@
---- display.c
-+++ display.c
+--- a/display.c
++++ b/display.c
 @@ -5,6 +5,7 @@
   * hints that are left in the windows by the commands
   */
@@ -16,8 +16,8 @@
    int i;
  
    (*term.t_open) ();
---- line.c
-+++ line.c
+--- a/line.c
++++ b/line.c
 @@ -47,7 +47,6 @@
  {
    LINE *lp;
@@ -35,8 +35,8 @@
    char *nbufp;
  
    if (kused == ksize)
---- tcap.c
-+++ tcap.c
+--- a/tcap.c
++++ b/tcap.c
 @@ -2,6 +2,7 @@
  
  #define	termdef	1		/* don't define "term" external */
@@ -45,8 +45,8 @@
  #include <stdio.h>		/* puts(3), snprintf(3) */
  #include "estruct.h"
  #include "edef.h"
---- termio.c
-+++ termio.c
+--- a/termio.c
++++ b/termio.c
 @@ -5,6 +5,7 @@
   */
  
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index 1cef68edcc3e..b98249913ead 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1,5 +1,5 @@
 DIST ghex-3.18.3.tar.xz 1630720 BLAKE2B dacca0b015dd73dca9ea7a5303de8b6ef981c7e4fd93dfdbb0782ac61f073381fef7d5a1dcb8a88f2d31319fd9583ac6f556ed6856b5ba7d3449bbf2af2c991f SHA512 e03b154a22db000a5994c68bb72280113e69e7ef210f86ab2c6578e77daabf50bac8eb620ffaad5a7eb776d23383478cbdc7fb317fa336cef55173f858519023
 DIST ghex-3.18.4.tar.xz 1420268 BLAKE2B 70a3027a2c228481ecbc6ae44c0a707c9858453e3af7bfc268b6e32a8496722cf117c1b2ce4dd798795a429dccd24e1fa9cb9d1a8c9c8fb5998243369f76ccc4 SHA512 6121a5986ee7d7f96bf7f401e155f8aa37f076af455bc68e43d1b5b02b63bc9aed3eba5209511d1b659eb4c9093ab5d9601c14a5e868d979e92a6d0ca0cf9ce2
 EBUILD ghex-3.18.3.ebuild 515 BLAKE2B 6aa5555afa45caf838b4ac12c51eac0bc649a93b04670ff869e446a0f73031829809c10bdee66ed63262266fcb92d0bb9dbf7a5c7aabaaaa3d359ef11f878c78 SHA512 e2726043a37cd14228c21c47c8cba5cf2add49fc669db221c3635940f8c688250823c4933d5e4d28377d0aef09713345dd579ae3c4f045d78e021b447a3984bf
-EBUILD ghex-3.18.4-r1.ebuild 820 BLAKE2B d47a41bb292475ac4509618ae1e3428c27a7e8aba4469b096b303834d1c0f7b5b9d2d2a213ad7a4352d87eaf776e9192ad635de5687d2ad3932fd73cb8b30dd6 SHA512 376c887a0e900dbdf680aa0b865a71ab0601654799877e6108c92f0d50501364ee5f6d3ef3dfc619ee1414d8e289ccf1082a5ec6602a33ae0dce9ed550a936e7
+EBUILD ghex-3.18.4-r1.ebuild 819 BLAKE2B a667fc8bf80f75d4844ee40cd57d14ba1a97a8e9ede6eb9f6c986e672c80f78f235f7ae56021605d101c12264fdfa76dd6f29f50472d02d42021e35659b9d83c SHA512 7e2a28c48b39cd083e48535baeba534d20ee2447f5dea63c0006709f694a5e939f9e9d9f7f41e3cf349ccf2911d5f15c7f1776bfaefc376291b9d6a0bd52762f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/ghex/ghex-3.18.4-r1.ebuild b/app-editors/ghex/ghex-3.18.4-r1.ebuild
index a735e8d30a06..8e81590e73be 100644
--- a/app-editors/ghex/ghex-3.18.4-r1.ebuild
+++ b/app-editors/ghex/ghex-3.18.4-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
index 17b178817a9b..540e3c443ff3 100644
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@@ -1,5 +1,3 @@
-DIST ghostwriter-1.7.4.tar.gz 1195162 BLAKE2B 6339161b73b6e8cf9fce37da5133416512a61289189fb3f574af96753e62e8e364d610dd277542bd18b4ec44692dc149d4b3d5a6cd89894536d4dc898994c667 SHA512 b09e0f8152cd8bdd4465f20d94134ea6ef840b4ccd6d9f75bce8452917d98adc89093c661ecde0400fba7d68f832633c8fe0b19a1607ce79e3f400caa573da8f
 DIST ghostwriter-1.8.0.tar.gz 1195999 BLAKE2B d751e570aed94bcf0806ca20d82b0ac2b465649caf31f01b761f0370a4f1b04ac8f948213b15c05a71541b8068ef21dfb2105b5fc91d5637e498e2d4c8f6bf9a SHA512 aff500d9221f28f6a06a93bf0b5ddb590792b22bc551749b790f52751cd7f2e27ea59778927c2f117320cb1791b45d51d8efdf479f0894319755afb1a509f7bd
-EBUILD ghostwriter-1.7.4-r1.ebuild 1050 BLAKE2B 7a5e483cc9c9d352f6e19b20ad48d30c14b22a1326b51d6a276b08557b0ec84ca35d8c992a9f7312a86578755083dc06eb4ea87b788b4ee55b1920fc081cc99f SHA512 8f69c952167d15bcd4eac0ea74ed44d442027228cdd448a6e0045cca93c021c92288874dd95e95061dc9e0ffa60f12110a68a0810bebbe796f84042223d71ebc
 EBUILD ghostwriter-1.8.0.ebuild 1069 BLAKE2B 6e50854e96afdfed7057b2b70684cf860e07d4fc59eb83941dbc5ae4caf622a67ba1c9aafad4513eec12e0d3a76d878e90ea31192b14fda88d45f74b0e0614e0 SHA512 f8016952ebf4be4ae9401654eb55577e49a52592a44288339a8ae53160f776a2b7b5c7cd7f6d151d3b190b76aa43a76516fbd3af9ae11ac822dea6f9fe1d6db7
 MISC metadata.xml 563 BLAKE2B 0f231e68a0335b4e4578d5ec28d8b202a26e7cf5c9f48fe9f4d430b01532aac1cb6022e13ef72c91a3ff68a86ecee0ec780a5bfe7e0c1ac1f158d8cbef84f7bd SHA512 585e39bd37abab4db3422b91a342aac06bcb76b3a6447a60c4607e3ac6edadbbbcabc1480828094d480c241a44d07ba81fbb5a4502f71da75c20e28db4583fe3
diff --git a/app-editors/ghostwriter/ghostwriter-1.7.4-r1.ebuild b/app-editors/ghostwriter/ghostwriter-1.7.4-r1.ebuild
deleted file mode 100644
index fd47f3279447..000000000000
--- a/app-editors/ghostwriter/ghostwriter-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor"
-HOMEPAGE="https://wereturtle.github.io/ghostwriter/"
-SRC_URI="https://github.com/wereturtle/ghostwriter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	app-text/hunspell
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-"
-
-DOCS=( CREDITS.md README.md )
-
-src_prepare() {
-	default
-
-	sed -i -e "/^VERSION =/s/\$.*/${PV}/" ghostwriter.pro || die "failed to override version"
-}
-
-src_configure() {
-	eqmake5 \
-		CONFIG+=$(usex debug debug release) \
-		PREFIX="${EPREFIX}"/usr
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index a2ffe18b6afa..59a10f2f7b3f 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -5,5 +5,5 @@ DIST jasspa-mehtml-20091011.tar.gz 628008 BLAKE2B 97c8326e7acfdc4bc4ddd2ef6bbcf0
 DIST jasspa-memacros-20091017.tar.gz 1105437 BLAKE2B 0a74715db55498fed646f209a9121a96c673cb34c487968c4f838bacf6404db717fbd8392d26f8fa120174923724af91e4a14bda088bf229765d1e99c785d8ba SHA512 08908acac4dbe56695362172dabe621b8cca77a35da599c6cf5b4e87700c03f4ee190ca12d5c69b2d88c623cec527daac0980dec2ed713ff563e88ebe636a725
 DIST jasspa-mesrc-20091011.tar.gz 810128 BLAKE2B ce627dab7cf4ec09b099e755c3eb17e773c64fbff60741244cdb134ee1555ffff592ef3684eecae72d5da36c10cd7caa23a03112154c616ad3c7667d913354b4 SHA512 60cc5a83b3cafd8e517f88732dc94feb0329b962bc714eaa5616ba89776fbfac41833be88fd3a666443291184086494434fb8763747c1dc5e216ce793b694b68
 DIST meicons-extra.tar.gz 43345 BLAKE2B 5b3d6e8a76604364d8e5464ba764aec96d822054c02bffed4cd763f7691f78bc3455904cd06d89ddcf8a0861134ada3c7d228751d4f3685e6700ebfc3dda2354 SHA512 bb6879fb12ec1c7b346bc1df2412a837ffdd0569f6be2800a433307a7736bb31798b3c2a71e02cebdce39c59d93d1a986f80c92184604e4292606c98285fe02a
-EBUILD jasspa-microemacs-20091011-r3.ebuild 2319 BLAKE2B 5c5b2bec2ff83769075c63cf67b79ccd2bbf4ef1f522fcaac0590fdc85123774abf0ce7aaf0bd3ffd755b750887fb07809f997847f111c06908e4a2be20349ef SHA512 85b6b933c33dcbf78886d0ae3bf6274876b10d45a86e5a542ea25c89fe3d5aa27e1bd68f9ea241a574dc25d1889f61755fd2abb552b4ff32600f4647b3e931ef
+EBUILD jasspa-microemacs-20091011-r3.ebuild 2276 BLAKE2B e9ba6dbc37f281d0d2f413dccdfe07d425d24b7e126ba340c18d262abc863b8b1e9582ff5feaaf2edc08476dc2b62457dcb749cfda862d66c098455cc571559e SHA512 180227bc3c5d549d29cc28a6bdb7aa398baf55522329244cf381763a22c8fc00cdb16226b18c40ef5405a5035ad1f9a4c0e08953198591197591e0c756ef4711
 MISC metadata.xml 1094 BLAKE2B 9983b2ebf7f9d7a979180ea0d4aa063ace2fa5a3a630339bb8112a8691eb6b46964d298d9b49c2d02b2dba2750e501b5740de2242da00abc4b24ba08af8d7fb1 SHA512 2116ed586b24da86206c4d38977c118bcf2381d455a3cd0fb9d672f8d709b5113fe4c8767e2d2f20f8c879a71f0e6bfb6384b9efe30cba82e177fa75dc4e0d6a
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
index c431c2cfdd65..27f5e8a43037 100644
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.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
 
-inherit toolchain-funcs xdg-utils
+inherit desktop toolchain-funcs xdg-utils
 
 MACROS_PV="20091017"
 DESCRIPTION="Jasspa Microemacs"
@@ -83,10 +83,7 @@ src_install() {
 		keepdir /usr/share/jasspa/site
 		insinto /usr/share
 		doins -r "${WORKDIR}"/jasspa
-		if use X; then
-			insinto /usr/share/applications
-			doins "${FILESDIR}"/${PN}.desktop
-		fi
+		use X && domenu "${FILESDIR}"/${PN}.desktop
 	fi
 
 	dodoc faq.txt readme.txt change.log
diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index 5d1f3dd669de..f77607d4cb46 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -1,3 +1,4 @@
 DIST jed-0.99-19.tar.bz2 884198 BLAKE2B c3d967e59b909a39d0f7fb49c8ce9aef70585ba433bc5c6bebf5db1b6b88de0c41b35059a242a38be91a97a5296a279bdc85ac30ec9d4ae221d94e50e41d8995 SHA512 db8a30284f9b8e3e2c5d1a600eeb7af29c9f943a5c23d7c74fce926e0b0252f54805e214670e7c9357ce0e6918ad67cba2769a523979bfbd285328f94fff747c
+EBUILD jed-0.99.19-r1.ebuild 1113 BLAKE2B d8e5bce395af77ed43d7b54542c0274dd414e17fe2eec77b939b7fdc9b136878239478b2f0011b63befa0c739dbbff475aac2867f784d731bab739793903f745 SHA512 6c9be8b81b1bd147e4416a4af26d7fdc8a58045cb798e21b246fade1b4edbbeda30d7e899987f40cfb7486d4022754a3d1a2ec11b081fab17146e995278b9327
 EBUILD jed-0.99.19.ebuild 1135 BLAKE2B 31333f1321e4f07b5d37b3198f4f91c22c7578996723c288a2d0152cf31b8dcc2f7c4343bc9c902c47772bcce8f670c048b48ea4eaf7272afd79d3510ca98bf5 SHA512 1311e8b402ab97a696f6538543da6b313fd84d62fd0fb3000642e03205d693d867fcb076843e9edcf1cab139ebeeda898875b6c33e6304381a537fa800d5981f
 MISC metadata.xml 614 BLAKE2B 023aea459e74aa16cbfd069da28b6c2bc1b87e17be50f1f49e4f070ef8764a75f53b56b6d61a9741caf93ccc1b07cd34a523940754fc33cb6591bdf7f6f417cc SHA512 79f54c7d84965a95e575c4c38d5c9a2158de0a1c539ee32f5839312bed707c8d0df00f7733c3cedeee1cfb3ac10619ff60dc0441f7062535f0d7f79094f5443b
diff --git a/app-editors/jed/jed-0.99.19-r1.ebuild b/app-editors/jed/jed-0.99.19-r1.ebuild
new file mode 100644
index 000000000000..ec91058ed134
--- /dev/null
+++ b/app-editors/jed/jed-0.99.19-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-$(ver_rs 2 -)"
+DESCRIPTION="Console S-Lang-based editor"
+HOMEPAGE="http://www.jedsoft.org/jed/"
+SRC_URI="ftp://space.mit.edu/pub/davis/jed/v${PV%.*}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="X gpm xft"
+
+RDEPEND=">=sys-libs/slang-2
+	gpm? ( sys-libs/gpm )
+	X? (
+		x11-libs/libX11
+		xft? (
+			>=media-libs/freetype-2
+			x11-libs/libXft
+		)
+	)"
+DEPEND="${RDEPEND}
+	X? (
+		x11-libs/libXt
+		x11-base/xorg-proto
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# replace IDE mode with EMACS mode
+	sed -i -e 's/\(_Jed_Default_Emulation = \).*/\1"emacs";/' \
+		lib/jed.conf || die
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		$(use_enable gpm) \
+		$(use_enable xft) \
+		JED_ROOT="${EPREFIX}"/usr/share/jed
+}
+
+src_compile() {
+	emake
+	use X && emake xjed
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc changes.txt INSTALL{,.unx} README
+	doinfo info/jed*
+
+	insinto /etc
+	doins lib/jed.conf
+}
diff --git a/app-editors/jove/Manifest b/app-editors/jove/Manifest
index 518dd51af99d..7147b41298e5 100644
--- a/app-editors/jove/Manifest
+++ b/app-editors/jove/Manifest
@@ -3,6 +3,5 @@ AUX jove-4.16.0.73-build.patch 5776 BLAKE2B 0b147601d48499076ae19a438861ca971142
 AUX jove-4.16.0.73-doc.patch 1004 BLAKE2B 64f69c7ad34f71dcfb9ccd4e15c40c408c2a79e31e490f6e3a951ccae76e439939442fcca4d4a94d44bdb45166f2ba3a8bd0403e9b07a427d89f54073aee8171 SHA512 c15d8ffc92292e8284aebe93311c14e5d157d25e75c2228497faf1121e370e738ee345f27cce187196fceb4eb26c3222a4b39f734deb13ff14b2a044225a715d
 AUX jove-4.16.0.73-sendmail.patch 675 BLAKE2B a4a7126f215dabfde8bc47b2b9539c90f6ffd1c1e89dd33a2e7e2dcaf9f4b202b1e8a807560ea898ee0df9e778ee3af2f16c3c8e4e22f44675712464bba5d121 SHA512 a0c7179b601c620aad5b6bea5e07ff620bec14d27c1f8b27b0a25cb8cd687066abacf2786a00d79913087c2c5330da99e154f325b39243e9a19323a5c7729f10
 DIST jove4.16.0.73.tgz 465214 BLAKE2B cc1eeca2cdbd7ca98a5deaf27c37bfcdc529f2b388361e0cd5fd6278b72740a06283abd1f60212e6dc0d1e540e4dc4d99edb99b781645b13e1675644db0f38eb SHA512 2198504f9a23590710acba7f27661fa5649fdbed559a4c6bde9d2c1d673c22ce7d99a690be45a4602d37cf6e70399230c4ae3a251d8451af0c5252bdca61b09d
-EBUILD jove-4.16.0.73-r1.ebuild 1097 BLAKE2B 5c4c0e86aa1d90417a2fa06793677c91986473cab5fa2ff9db14abe5f11b2d714f15f4608c580917d8ba6914c2c53cf98d4992f1a7e28952b9927ff371c02a56 SHA512 0f27399b699918efdfcb9b73abde3e63ae9a33d7a68553acc42447d104bf47a6e95c43c56feaa5790c06fce00adaa3a3a414c31e15cd8bdb4081d9ebdc1728b9
-EBUILD jove-4.16.0.73.ebuild 1106 BLAKE2B 13a7eaea327674fe90280d76fda7109cf9871a392150523f8b44353125eedb278b4e2b1dded62facbd2d2c09b2a5d4fda71886de77fbaaf52a9ea1d1fd2b4244 SHA512 f17f5e08d15c87203de69a31ebbfa8ad0574c1b258eb3e0b916d583d7163d74576f7e2c6886fdfdae7abb79d0c198e0e8aba0894044ac84e09742dbaf971c3d4
+EBUILD jove-4.16.0.73-r1.ebuild 1094 BLAKE2B 2a1d9907647c73cb233bfcc58e70635b87eeef34e7b7e2f8a64077b9b306550d9a92d4584b5bc6538d439ac328fc45f770318e5811032f641c02da7207215aff SHA512 a85a1d119e5800b66890305666340d3eebbae6a6e90a85f63be17de7b0310907db646a5fb3d478622a6567d176a9d6c5eb1d06045584783e44b45a589e592598
 MISC metadata.xml 623 BLAKE2B df929d3bcce78952076b8e17a79604f11f36dc57d2a49068838871590fa77f2c85499e4a8e66a71466d7488476a02744e651a9cdf18e8de92346521b7dd30674 SHA512 33f559b386d5163174eaf5c39ebabbecb886b822dc9db5d2d3a12449a1ec737a560956e8880dbabdf84c5ffe0486f76ef2eac55cd58c9c3406a153dc4d603788
diff --git a/app-editors/jove/jove-4.16.0.73-r1.ebuild b/app-editors/jove/jove-4.16.0.73-r1.ebuild
index 3ff695ea5c7a..c6f1bdcef2e3 100644
--- a/app-editors/jove/jove-4.16.0.73-r1.ebuild
+++ b/app-editors/jove/jove-4.16.0.73-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/${PN}${PV}.tgz"
 
 LICENSE="JOVE"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 
 RDEPEND="sys-libs/ncurses:0="
diff --git a/app-editors/jove/jove-4.16.0.73.ebuild b/app-editors/jove/jove-4.16.0.73.ebuild
deleted file mode 100644
index 72d2a677cad1..000000000000
--- a/app-editors/jove/jove-4.16.0.73.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Jonathan's Own Version of Emacs, a light emacs-like editor without LISP bindings"
-HOMEPAGE="ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/"
-SRC_URI="ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/${PN}${PV}.tgz"
-
-LICENSE="JOVE"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.16.0.70.3.1-getline.patch"
-	epatch "${FILESDIR}/${P}-build.patch"
-	epatch "${FILESDIR}/${P}-sendmail.patch"
-	epatch "${FILESDIR}/${P}-doc.patch"
-}
-
-src_compile() {
-	tc-export CC
-
-	emake OPTFLAGS="${CFLAGS}" \
-		SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" \
-		TERMCAPLIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-
-	if use doc; then
-		# Full manual (*not* man page)
-		emake doc/jove.man
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/jove/preserve
-
-	dodoc README
-	if use doc; then
-		dodoc doc/jove.man
-	fi
-}
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index f6db15724163..ec44bb6a72e3 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,6 +1,8 @@
 DIST nano-4.2.tar.gz 2928595 BLAKE2B 42bb0ccbf4961706c6c645eb2310a646a7decd3617117a079ffe9e3718c8054ab823a5aff3e543c06c4c398f83579a679267a9ad6f113ba451b76d67e14b07cc SHA512 a5dd9ce96cd09d12c65108ea6a18b2cf1c2b055929e58d3e84beb0725607b4b5a3f8ae3fda0ab658c853cc4cac70c089fee716e1bb5a700f2506a7a3e1bea1bd
 DIST nano-4.3.tar.gz 2939418 BLAKE2B 2464118a1cd16477637a8e98c1d179cbea1f33cc1548eff09b3b77b613b5b2b628915da1d11c04064f7211a0254461eab09ddae6dda582004d77adea9dff2360 SHA512 2fb76e61079efb0a16f3ea27fdc7da749c71d61a752d96beee4f8376ad0071792ecaa5f3dc627fbcce175227ca48c60c1a4a3e17bfbc89180aa484c28fe37746
+DIST nano-4.4.tar.gz 2947594 BLAKE2B 20cdc21e136ff213ecc2dd64531e51c552547633a422566c325b8d777800d5f77691751d3acae3b9489eeec40c0893fe913dd8669b29ab985cdf0ac4a3381192 SHA512 14f23de002f5919a3b75ef8c0cfb93a45c8b8ba6c87d8b7c472ab2106fb4c1c17a3846f99ad6e2d2d160aa14aea44c23067fa58b2e668a41616f5cff2feea50f
 EBUILD nano-4.2.ebuild 2189 BLAKE2B 62dcb827d9d5deb4b6f1ab8b89fea344137b78e468d29160b5873f47bd2680da952a6fa1d7ca288e0b6142f76a3d83633251465a354b1c54222bc426760b5763 SHA512 2824d4c52b92de0384d05725695d9b78e0e924b07562436dcd8963c94dc5c2aa739486e2eb96a0c410614d099efe5d8550f133d68e67b783556c4ac304857d34
 EBUILD nano-4.3.ebuild 2202 BLAKE2B 65eb35a1f56df68e380dd9f863c8299c1a9871e76d52e100e73bf9d3568cd5696195e1b8a3535809babeb0007fc84746873dbc28367e73882a23700c3238d6c9 SHA512 8f337970f9d367c891f7103ee91ee0465ba3587f7f0efc48f16662963f7d428c323974a13bdc30aa6e20bb351669667dddf6cbbf45095c121ad8dd152a8b2b55
+EBUILD nano-4.4.ebuild 2202 BLAKE2B 65eb35a1f56df68e380dd9f863c8299c1a9871e76d52e100e73bf9d3568cd5696195e1b8a3535809babeb0007fc84746873dbc28367e73882a23700c3238d6c9 SHA512 8f337970f9d367c891f7103ee91ee0465ba3587f7f0efc48f16662963f7d428c323974a13bdc30aa6e20bb351669667dddf6cbbf45095c121ad8dd152a8b2b55
 EBUILD nano-9999.ebuild 2202 BLAKE2B 65eb35a1f56df68e380dd9f863c8299c1a9871e76d52e100e73bf9d3568cd5696195e1b8a3535809babeb0007fc84746873dbc28367e73882a23700c3238d6c9 SHA512 8f337970f9d367c891f7103ee91ee0465ba3587f7f0efc48f16662963f7d428c323974a13bdc30aa6e20bb351669667dddf6cbbf45095c121ad8dd152a8b2b55
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-4.4.ebuild b/app-editors/nano/nano-4.4.ebuild
new file mode 100644
index 000000000000..9934461b7d4e
--- /dev/null
+++ b/app-editors/nano/nano-4.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
+	inherit git-r3 autotools
+else
+	MY_P="${PN}-${PV/_}"
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode"
+
+LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
+	sys-libs/ncurses:0=[static-libs(+)]
+	magic? ( sys-apps/file[static-libs(+)] )
+	nls? ( virtual/libintl )
+	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir=/trash
+		$(use_enable !minimal color)
+		$(use_enable !minimal multibuffer)
+		$(use_enable !minimal nanorc)
+		$(use_enable magic libmagic)
+		$(use_enable spell speller)
+		$(use_enable justify)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable unicode utf8)
+		$(use_enable minimal tiny)
+		$(usex ncurses --without-slang $(use_with slang))
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	# don't use "${ED}" here or things break (#654534)
+	rm -r "${D}"/trash || die
+
+	dodoc doc/sample.nanorc
+	docinto html
+	dodoc doc/faq.html
+	insinto /etc
+	newins doc/sample.nanorc nanorc
+	if ! use minimal ; then
+		# Enable colorization by default.
+		sed -i \
+			-e '/^# include /s:# *::' \
+			"${ED}"/etc/nanorc || die
+	fi
+
+	use split-usr && dosym ../../bin/nano /usr/bin/nano
+}
diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest
index 89a99d415d12..eaee2f36a013 100644
--- a/app-editors/ne/Manifest
+++ b/app-editors/ne/Manifest
@@ -1,3 +1,3 @@
 DIST ne-3.1.1.tar.gz 1219488 BLAKE2B 6d778c1b2e9e18154322a6b327cc4a2711619c353eb82073ad00f3e40b3b8e61f7ee7ce6fee3f0e02b38d001dc26365f44b63f70ddd6089f186a52bdf4c69a17 SHA512 e572ca2a0cd39a59adaea911c80e083872103d90a586117efcabbc3881cf1a48d0c3d06f20eebcd9254177afafef15fd581778cd251b1b25b64ad68a5f8afc37
-EBUILD ne-3.1.1.ebuild 1111 BLAKE2B 0792d5d622570bcaca6c63b858ffacf6402ae26dbd26cd2e659f54ac8cf9ef9b0560bf98d50946f18d599f77838de63aaaa8a7f68f87d47dc127ab3f3be20672 SHA512 bfba8a0823cefb302869bc454b83ab1e1deb23d2eff52d779a453d20b3a250327e9e5003aca3c1d75c7048572f2ddbd2869af9687ff12b4667d110bbeb9bb7ec
+EBUILD ne-3.1.1.ebuild 1118 BLAKE2B 3cdcb4ccaa8df16f2841f1ffd058c57818eea93239993d2815de93ebaca959edd85e540915164373b6756ba59ffae9413ab6ab3fea442ab48dd1b795e99a9d10 SHA512 145bc2a8931119a6b5cc6604db38a7ca027eb00d3363831d187178e7a40e8bee3174291aa864422b97f1c0924dff05037ea6d44eb5ca1159895aacddf40f437f
 MISC metadata.xml 249 BLAKE2B bd3f8cd51cd7f93c68a6ae940a7ac6a572bbd81ce9a4011bede9117025d2ec55636679e49269ca3df422ac132cc7fbfc1c982a707e30a70479b33fa0a21b0350 SHA512 40160ace781dd306147377e882be12701aa73684143080278ac55ba434185e3673aeadad11224743eefa70962ed005db0337e2ef2b5dbe6eb9fdec01bf72283c
diff --git a/app-editors/ne/ne-3.1.1.ebuild b/app-editors/ne/ne-3.1.1.ebuild
index 9d68adc0f1a0..e65e7733fbc3 100644
--- a/app-editors/ne/ne-3.1.1.ebuild
+++ b/app-editors/ne/ne-3.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
@@ -7,7 +7,7 @@ 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"
+SRC_URI="http://ne.di.unimi.it/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-editors/teco/Manifest b/app-editors/teco/Manifest
index 32c579ae9ddb..1ac34c589aa4 100644
--- a/app-editors/teco/Manifest
+++ b/app-editors/teco/Manifest
@@ -1,13 +1,7 @@
-AUX teco-double-free.diff 907 BLAKE2B 4be36191ed98cd9c210ff523dac796ec7a78697abcbb776ccff526cc1172e2bf6e5da0387df65e70020cbc7041ef6e7ca66245fb886fafe78b5d0f1e67e7ebc0 SHA512 01711be1a61217ed3040f3b13fbcaf52160118c90251098bdf65efe1551a3198ff41228bd9895be7f55e11344858898276f162cff1e207595e3f5e6dfef507ba
+AUX teco-double-free.patch 907 BLAKE2B 4be36191ed98cd9c210ff523dac796ec7a78697abcbb776ccff526cc1172e2bf6e5da0387df65e70020cbc7041ef6e7ca66245fb886fafe78b5d0f1e67e7ebc0 SHA512 01711be1a61217ed3040f3b13fbcaf52160118c90251098bdf65efe1551a3198ff41228bd9895be7f55e11344858898276f162cff1e207595e3f5e6dfef507ba
 AUX teco-gcc4.patch 294 BLAKE2B b09e7058029fb3d2fe2ded138ab92389f412cdc9613ae30eb3fd5b050f95e6efd48016e8f816a67d25b7d813e1ac2b813c20d60ac240b9138d635d958c7bc10f SHA512 ed7cf0fbe3a13dfb310be93460e07dcff50773ff1d0a1b5e3cfb304ecf5ef972243a7d3e7d429c743478b5cc2942a9ec562a25c1504324f59045685e69611d2b
 AUX teco-warnings.patch 1206 BLAKE2B f9f8312c66e506d86cdd7544288965927895822eac3ad6f49dd0f1280ddc72f9d2cb2c6e4e7eca7c36c435677559e25bd4c9f6816a9e41816d23a39d64ee445b SHA512 7294ef66917eb549d9437327b32160317313d343c731423e34a07ed407e5595e7ac52d57c55bc1e5c6732f5ed0840533aa9c546ee32f4ea2bef54adf5a91b249
-DIST tech.txt.gz 1971 BLAKE2B 327f9b860a3550e5e56ec1524dbc7ccfec31a4a58646f5a191f0867bdd94b97ecdad694cd5205be2896cef013ef63a52fe91859fe00db17da02160ad3a00384c SHA512 8c74d813d7e1bcd2f911982a8b49fa8b97ff85475a4798ea23d9a25ef30ad7243cfc851525aea895eec1a2f69aad84b6cce890ee6a29763a63c1a6d1358a200f
 DIST teco-36_p19940820.tar.gz 61305 BLAKE2B 9bb15fcb20948dbcac1928e32b4ac69c4861be3b0c01d5be68836138d9478e71cc0dd5198d9ac6816245605c34f8b21fcd4e62c48c097e56cd585579df119939 SHA512 686b3944a82d088a2fce12a9b770f4aa5f58aaadde064b3d3342114f0ece2d7cbae27d0e92fd026def6f62a3ff0dc82b37146e30a93b2ec195dc7f376b45fdf7
-DIST teco.doc.gz 129896 BLAKE2B 0372d5a697f432e41b138de9a5faff8c1032d7843ece1d1b54c325852280f51ef76d0d891e8747270b0c364edcbd731bfa849bd692afffc09041212325d010a2 SHA512 ea294aaa0d54de5b58ef645fbaf5c9512f5a27fb2b49b1120b4a712d01c6482f01a53ac2dac7c8eabdf110823a4556563cde828fc7416479b9c23157282e76da
-DIST teco.tar.gz 61305 BLAKE2B 9bb15fcb20948dbcac1928e32b4ac69c4861be3b0c01d5be68836138d9478e71cc0dd5198d9ac6816245605c34f8b21fcd4e62c48c097e56cd585579df119939 SHA512 686b3944a82d088a2fce12a9b770f4aa5f58aaadde064b3d3342114f0ece2d7cbae27d0e92fd026def6f62a3ff0dc82b37146e30a93b2ec195dc7f376b45fdf7
 DIST tecodoc.tar.gz 154109 BLAKE2B 70b9cd99281ab6180e4c13845f3fc97ccd6c142b4b9a3454ac9dcf189e2a65bfaf9b033312aeb9773301ff4d2ec166f79d587f79158b2b0f3f985f77b06f86c1 SHA512 1819450a08e296bdd3d4c282d9a9c7c58203acf82a67bdc9713b0cdfa2d0c4aa046c86ee4ee6f3b2d9ef0f3052705a13dd3d8afbf372bd3b1be8d4c5e8e96fef
-DIST tecolore.txt.gz 7039 BLAKE2B db19af3081c4c9129d8298709fe77bb8acaf1c0b19e87d4d313cf65a9426449d9fc864378c85712b5716bc6b535c36bc1b9371a212b43ff4cff6d3aca290146c SHA512 f8b66637dd140057331bb950b639f755b7d2a58c6d9feb5c89c062350f3213b40f4e955c586643312b4bcdcfd5ce67c621c8f7351e08a4303be35af967ce206e
-DIST tecoprog.doc.gz 15629 BLAKE2B c47ce219e6b7e98b4cd3332f78ea48bb9d98b7beadb0a11de0361ee680a014da4997e0657ad12052ebef02d1b3dbd234330be9f7c198b5645cc0dc6290aa01f6 SHA512 f49de461d6411345e9e72b51bf39bc1155acc07901b54d8fda94b99a4a573005ccffc475ef8aac3bfc0b8bd246dc0077399d4bcef70e8a5e753c45995df7ad55
-EBUILD teco-1.00-r4.ebuild 1698 BLAKE2B 4dee8cd8bf51f8981e51a4dd52066be80c1734e54dd326d94c877bdff97c00db1605728a80d94af46772b1c575f904332c8e6f0578a69c55ee906c04d2302952 SHA512 4c346e648fcde6b8bce1d16a83ae345d01b719983075c532aa7f729ec4d5504447685cc5644e696f637d40f65cf62faa1067a620d10e9276e098a3c904ab7c31
-EBUILD teco-36_p19940820.ebuild 1460 BLAKE2B d87d09d90937509002d83bdaf590e143c80323a98c165f60d7ba5af83720004e361b04b9b62dde53024184571c7dccbf6c25c3863b4d19f96ace7f41ae8d871a SHA512 0e32a7ee28c2bd703eda6d3f3882c3492b6fa907bb775bdaeabb3128328b0f83bb891de60e7ebd85be8319ec63fd3964d43219318b401072434788318c9c47bb
+EBUILD teco-36_p19940820.ebuild 1458 BLAKE2B 27dbb4e4ebfe5b62561c612e7330afe5ed9ca78b725db0b9002c3b4a8857df2cf313be572d98433908d336f78519cdd224290f3c0f88327575737eea045582ee SHA512 8100eca3bb36b8d9f89cb57586d198eb991feb6ee47ea0dbf44dfb1a0069788c79b2c3cc1a13923d0fbd937afdab240e14a97c6ba4c626fdbc75afe3d8cd5bf8
 MISC metadata.xml 1356 BLAKE2B a433a260d80042f9a4e034f93e94793b8ae3e9725d44cf4369f5baf506d6dcf9be045d3a4ccbefa842004c8bccd629d55f947ef591ce37a662c4199d4f27f2ca SHA512 3e8680b16e6de3e239f453d13d4b0cb41545aace84af0e9cf8103c0f605cec29467bb0b5feebd592dbded84cd109360c42f63da69115870fb57c97f8137dfdc0
diff --git a/app-editors/teco/files/teco-double-free.diff b/app-editors/teco/files/teco-double-free.patch
index 344aa6dd2dff..344aa6dd2dff 100644
--- a/app-editors/teco/files/teco-double-free.diff
+++ b/app-editors/teco/files/teco-double-free.patch
diff --git a/app-editors/teco/teco-1.00-r4.ebuild b/app-editors/teco/teco-1.00-r4.ebuild
deleted file mode 100644
index 5973b0b3eeda..000000000000
--- a/app-editors/teco/teco-1.00-r4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic readme.gentoo
-
-DESCRIPTION="Classic TECO editor, Predecessor to EMACS"
-HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/editors/tty/ http://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco"
-SRC_URI="http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz
-	doc? ( mirror://gentoo/tecolore.txt.gz
-		mirror://gentoo/tech.txt.gz
-		mirror://gentoo/teco.doc.gz
-		mirror://gentoo/tecoprog.doc.gz )"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack teco.tar.gz
-	if use doc; then
-		mkdir doc
-		cd doc || die
-		unpack tecolore.txt.gz tech.txt.gz teco.doc.gz tecoprog.doc.gz
-	fi
-}
-
-src_prepare() {
-	local pkg_config=$("$(tc-getPKG_CONFIG)" --libs ncurses)
-	sed -i -e "s:\$(CC):& \$(LDFLAGS):;s:-ltermcap:${pkg_config}:" \
-		Makefile || die
-	# bug 103257
-	epatch "${FILESDIR}"/${PN}-double-free.diff
-	epatch "${FILESDIR}"/${PN}-gcc4.patch
-	epatch "${FILESDIR}"/${PN}-warnings.patch
-}
-
-src_compile() {
-	append-flags -ansi
-	append-cppflags -D_POSIX_SOURCE
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin te
-	doman te.1
-	dodoc sample.tecorc sample.tecorc2 READ.ME MANIFEST
-	if use doc; then
-		cd doc
-		dodoc tecolore.txt tech.txt teco.doc tecoprog.doc
-	fi
-
-	DOC_CONTENTS="The TECO binary is called te.
-		\nSample configurations	and documentation are available
-		in /usr/share/doc/${PF}/."
-	readme.gentoo_create_doc
-}
diff --git a/app-editors/teco/teco-36_p19940820.ebuild b/app-editors/teco/teco-36_p19940820.ebuild
index d8bd29428abb..f46d3c234792 100644
--- a/app-editors/teco/teco-36_p19940820.ebuild
+++ b/app-editors/teco/teco-36_p19940820.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz -> ${P}.t
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="sys-libs/ncurses:0="
@@ -22,7 +22,7 @@ BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-double-free.diff
+	"${FILESDIR}"/${PN}-double-free.patch
 	"${FILESDIR}"/${PN}-gcc4.patch
 	"${FILESDIR}"/${PN}-warnings.patch
 )
diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest
index 7d5a568c11ad..ce8354be1e94 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -1,3 +1,3 @@
 DIST texworks-0.6.3.tar.gz 12082640 BLAKE2B db5b98f9226e0e7e109dc06d8e0a88b0e8f0dd237676ebec3be55308c720eb6dada25be061d8d5dc27949b9673e93fd65c8ddddfbe03aee4f8170471c52b37fd SHA512 389cf54441e74164fc842f2f293cdee45c6ff9fe202f262d32f3fb076de9a29813a62cd75052969293f2f784e0722215bbbf2206e75bc836a13d495bf5aed653
-EBUILD texworks-0.6.3.ebuild 1317 BLAKE2B ab09dfe36c209921a8d337e09581f590af747a8c40d8120607ae1c6d26bbbcd806558628cee6844dfd6fb6089895ce6ce1073fe3bd78f8944234e44d9cfaf09a SHA512 a4ba6d64c94514644340cc48a02a8ba8485a288dd3bf3757b81e7be56614c5c2a5346197f335bf2321f96321670b79329069c5b6ac25dd36cb4b428b55c4d3f8
+EBUILD texworks-0.6.3.ebuild 1315 BLAKE2B d91858e4fd69821a7c1c2c65c0139f24218beae6e3fd73c74eb948702a8d64f000b94007873c833eedd2e0f75406319b36acabf2545b612bdda7454496bd1497 SHA512 d91a5fbbc9652be39436128f655af27a8264c4a62716c57147ea3299935b64164585c0051cd7d0a73c3ea05b136a84a475d1448040cb879f6b5be488c34c82aa
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-editors/texworks/texworks-0.6.3.ebuild b/app-editors/texworks/texworks-0.6.3.ebuild
index 0927dbc1e837..f52bfdf76e57 100644
--- a/app-editors/texworks/texworks-0.6.3.ebuild
+++ b/app-editors/texworks/texworks-0.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="lua python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-editors/uemacs-pk/Manifest b/app-editors/uemacs-pk/Manifest
index 0ab8b5b03e94..b30d70cbf1bd 100644
--- a/app-editors/uemacs-pk/Manifest
+++ b/app-editors/uemacs-pk/Manifest
@@ -2,5 +2,5 @@ AUX uemacs-pk-4.0.15_p20110825-gentoo.patch 302 BLAKE2B b4e1e998b8befd15b0c6d930
 DIST uemacs-4.0.15_p20180117.tar.xz 151600 BLAKE2B 76a6a3cd3d0abf720721c7c09687c1964958e6c1c05ad8db07e6e561d6714e436d31659d118af85d069ad77da2606b0ac86005824e2ac56db8040a0ea739aabf SHA512 aadf3f9e8ab3f2c9c7bccf305f7a37e75ac1c92c5c388ce35a10b24cedf886f7d9b0ce8b1196c2f96a0d874bd5af130edb3ecb1ccf571d8e8c00753564e38aa7
 DIST uemacs-4.0.15_p20180719.tar.xz 151748 BLAKE2B 66572d3b4eb54310b7468a43fa718faa78aae8070a8675018f8dccc38d2dcb8e93b41942f49ca28b7c8ee5d100b541ecebfa2adc9a84f121a178ade0903029b1 SHA512 0baa273d5f8df75976d01acbe69b2bca7ec803c8a40364ebded39d16874426874af7b7547774c211fbbb96c82fcb69aaf75f8fa5fd3e95422ee105e6be7f9564
 EBUILD uemacs-pk-4.0.15_p20180117.ebuild 937 BLAKE2B f1ff9da5a0484ab9e5fca3573859766afc30cedf46d35ab77dff19c8850072c4e591145dec35f9b790dd0c8ccaa1107712ac6be1ad25c1c1ddd2f48959f21283 SHA512 ce04f47cf3d809ff8ae2b92514d7c032be5630165c5d000cbebee9ff0fae2588ab881c0d3009941752a8187c690d41b6d08dcfdc9e49cfe10f030171432626f2
-EBUILD uemacs-pk-4.0.15_p20180719.ebuild 945 BLAKE2B 11ef32c16e27987ca39644ea59a523c9b80ee4b26f06768816f29b0d4a59561b4b3460aba150cccfa3e1fccd85ac14211800dc1d3e73589a19273b7009ca8040 SHA512 51b6a6317372e8cd6348c16a6668c08b87accfd952b9e4f347a014a61349956215cd96ac33b283e220aa4019580007c6d20293f549ab87bf0d420d1d052b499a
+EBUILD uemacs-pk-4.0.15_p20180719.ebuild 943 BLAKE2B 9fa110db6096a60c8fa1d9e2baf02c723c085243bc848303edc11823afbe3f316d8c003fa9bbe267feba984253b9eee9f933a6336b03fd683e0764759e302040 SHA512 fc355983744a4f3190e83f29be38230885021efe3197a5029faea0f56f1dff3cae0a38b1e04641534db1aacd1d6740f5d37e9c2bec41042ad7785c6bc9d5d2eb
 MISC metadata.xml 1038 BLAKE2B 78d5d45edaf021f6be2ecb46cfc2c8538a14f7589d16a1891481633e23c272f8d76905b27535baedb4af0be51b7e1e9a2ea1bc286dd79c6c06d7b6658a856df8 SHA512 303232f4886511f0731e699a8c29a1925f506a037cebc60669c02aa060b2d555bdb2378919f5d66e61859e18a3b2ede21204edc5fce37a9220ab9dcf2f23c1b0
diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild
index 01e2c07680bf..efd6c5b740c4 100644
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild
+++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/app-editors/wily/Manifest b/app-editors/wily/Manifest
index 093ae62ceec7..b1d4e7a71107 100644
--- a/app-editors/wily/Manifest
+++ b/app-editors/wily/Manifest
@@ -1,3 +1,3 @@
 DIST wily-9libs.tar.gz 125247 BLAKE2B 94f93d081c90f6543bb26d17f8fe053135be2df983a2280fdd15243c5e448f5f3265666692e0635156217b0e759e0d6f3bbc123cb857f1d7880ee3ee4f913a37 SHA512 3c06ef1d9c6e77a00037570f8b8bdbcdfc7648f691675db679ba83ac0ce092762a4020b0483acd325aa57810e9a386800a94c5e6e2b5002a963b4751a4d30a5b
-EBUILD wily-1.0-r2.ebuild 692 BLAKE2B 3a1492d44f02f3aab9544794fd5a7349c66f3bc1f28aad18647f758b634f06dce0c1a35c7e063b4314347d6bdef56a9422bf7331752ffdd0a49dab99904a2144 SHA512 6ae69cfeb9e315d600c465cb6f691bdd176bc00a76a0a870c28425c2aaf05f57a83d3b50058073d6d17bc74e89e0c62a3522ab4a262cc4f3d728788c08110aa8
+EBUILD wily-1.0-r2.ebuild 719 BLAKE2B 97fb754aa6dedd896a7bceee57ff3703aa8e590004407ce2a5a627a249e47b3c3b6c6af7dbc5fcdac635c466c9fc1d65c7ee29d01f29ccef285fa15ca1e74320 SHA512 b24d2e7e8ab0cb3a1143b194e05948d2ec0027d00c661323d95e069e9f606d2a577ea8dd7805f60e87c65747c9e59985b96e7ad7c1ac251fb931fdaad39d2a60
 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 15660cf20334..eafceb60d927 100644
--- a/app-editors/wily/wily-1.0-r2.ebuild
+++ b/app-editors/wily/wily-1.0-r2.ebuild
@@ -8,7 +8,7 @@ MY_P="${P/1.0/9libs}"
 
 DESCRIPTION="An emulation of ACME, Plan9's hybrid window system, shell and editor"
 HOMEPAGE="https://www.netlib.org/research/9libs/"
-SRC_URI="${HOMEPAGE}${MY_P}.tar.gz"
+SRC_URI="https://www.netlib.org/research/9libs/${MY_P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest
index d00a5caede4a..0fde46de7075 100644
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@@ -5,5 +5,5 @@ DIST zile-2.4.11.tar.gz 1293707 BLAKE2B 30317856303cd093e767f7c057fab74cddcd49e9
 DIST zile-2.4.14.tar.gz 1385314 BLAKE2B 43815e87bb037a8de42b00510ce8addd748fe2a639f78e736c7fe6220c972ce600a8db557dd592065bb27e1d35a5d3a42b6a4a8d5d76eefc4274a8ce27b1d9c2 SHA512 0dea56fd13a82015ec73de3139a4b2c27ad4c001ed535f1bae557ee49f9d8a188610a08160998d0a36b95fec42b46a019fd43634ef6502ebd27e162164de98cc
 EBUILD zile-2.3.24-r2.ebuild 1388 BLAKE2B 482aa4b2d310ca7e8be5dbc41e5966e88fc2de91a78b373ec61e52c6e9bbfa4ede3656472fb9acd22d7641c7229b3be79438965eeb5aa7f45accf3ad26a5a94f SHA512 dd9cbb3919ee2ad723b6cbe0b50259f9702473902f8df03f2ae8c119e19b45fe804387f9bf6ca8e12bc51883e1bf4272d4ca2a04540640e1a2b152b0bb80b312
 EBUILD zile-2.4.11.ebuild 901 BLAKE2B e0ec9fa51062e9438d35aef6c8ccd18d5bb506719166c2a8198b331a8f0c94c034923e09a1becd65dcd8f09380e98cd061fcdf645dcc48883a13fffbe7e4ec03 SHA512 c0229948c5c9d813ae8a5530ce3de60a0eab82de587d985975a77933207e3034432dedb73f37b86fc824a1cbee747cb6b39b67e7c6571dfb04c6e240d31a58ad
-EBUILD zile-2.4.14.ebuild 1444 BLAKE2B e8367954c4c1b44f327c93f8cc7f63e5ef212eb983873f8e3dc85531facdfe85d32834ea07abdcbf08f9f9780c7386195dbabc29c5434a3101af1693647d8254 SHA512 d6d12a3221220b947e4cec6bc5cf0c52506dffda172b59fac8cc64994a3e1549c09e9e285e43f43aabe2c82fbead45825cee7d9669891dd91a337a77e7911547
+EBUILD zile-2.4.14.ebuild 1439 BLAKE2B 2c452f18f5c6ed3a77eeca4f239fffdc079877140afe0ef63760094db0ea211996329d256ed96549240930b857fdc2502d6fee0dd60debef258836e0d7d8958d SHA512 df6d931dff8a10ed363f1ad88c503ffec054f0dfc359ad932619578ac6f553a0cc7c247018b2f68f93767bea1f727b96ffe4bbb9b6f36e43a31561d16b9c9e78
 MISC metadata.xml 638 BLAKE2B 4830ef65d641a21c208c6e856daf949d8b931c1beef92f93e5428fae095e0c81e39ca93b9d9ec4cdafc74b689b1469e86d73f8a31fd3f775d728f1f973b1b743 SHA512 f2214ca22b8c80124f264991e70ad97047a5705dda78bc59573f1c80d3ee144343502bd7f610117af263611c11cb1c7c0b732fe44b6274272a50b7cf5d595ad1
diff --git a/app-editors/zile/zile-2.4.14.ebuild b/app-editors/zile/zile-2.4.14.ebuild
index 234a0c76ce15..9bb0819cd38e 100644
--- a/app-editors/zile/zile-2.4.14.ebuild
+++ b/app-editors/zile/zile-2.4.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="acl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index f842b31fba31..3d49fd1dd4e8 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/actionscript-mode/Manifest b/app-emacs/actionscript-mode/Manifest
index 10a0686f747f..9a7b8b7262d8 100644
--- a/app-emacs/actionscript-mode/Manifest
+++ b/app-emacs/actionscript-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50actionscript-mode-gentoo.el 270 BLAKE2B e3ad9140ed1c92d78fdd3aa60855bacce78f798c8cecfcab158c04340da231bc5a0338fa3d8bd111d1770527a9b00bbeb123e50f4e71d7e9e673f70aaeb41462 SHA512 0e991f231e57ff72f992670f6469f36409fc89243afc5d6955b9035fa835cd4af2b107d59031a692c07c3d66b3e6e82941659619e344fef5a5b3b4c423437a3e
-DIST actionscript-mode-7.2.2_p20120405.tar.gz 8226 BLAKE2B e8f33f3320b4b0891b244963fea282e16d50cb256fe4439a2f26bc2640607d5f530b537392248832f695d9f4ac5b89f6a8e0f17ae6941aa4ce58b0ba1c028e1b SHA512 79f59b5c6e53d8b7b5a765579629e956a90adadac65c8a46be883cb22813a15437cc63a0ec1a5c9b44e2034284f5d7c4405bbf3670861186f7a85af0a1e720fb
 DIST actionscript-mode-7.2.2_p20140605.tar.gz 8276 BLAKE2B 8fbe8147b1626f4e454753ae92baf14020424c0806aee4a9e050b789770e7bd1f19f45b0d493fd94af0d05ce541916c0dec1bad2327b285de77e8d27a7a1e675 SHA512 05a3a0a0bc185bdbc96bf292a220912e8649acd20eb3f55dbfde04cd956da3e4f71daa10957bb2ba6e150589f626ec1059908e3b294a643b4034a6c08e507fb8
-EBUILD actionscript-mode-7.2.2_p20120405.ebuild 648 BLAKE2B 7d836606f7f7f3c7add965ea9bd4377c6b4bef01258dd77b49ca5344cd935b4ec253568eb21221e42046c33ff8360e0f4c8f2535d2b105d90aceb512347b872b SHA512 d7ec42df1ab94d55f844491545f2ba533392c3b5e9d67d703a9f60ab9dc6fcae94cca26265590836b9387016d64fd38df09dd450c1485fd792c03ce0365609e6
+DIST actionscript-mode-7.2.2_p20180527.tar.gz 8446 BLAKE2B 4ce386be79ee4059e99cfef523036733a7c16a4bf24950dc77bd66ab03f9e07476507589fbc1a337f1f54cd4bf75234d2307ea630d642ee3306f2390e16fa0e1 SHA512 251877acec4ea79c03a67b3de441633080b421b5e84ef04d072e02916eb3e1c7b89beb18a897fe8165a0b39247da5a01c8d2b6980887dbf15ab3c5d38c39f279
 EBUILD actionscript-mode-7.2.2_p20140605.ebuild 648 BLAKE2B d4cc2e0ecdbde972bc6dd47103be11ba74acbe2d52e93509818b37832b8fa4bc34c88df4882e85dfa2986d56724e6474f100d47b0a4ae33ab6b322171e3f768a SHA512 4375a370c110599c159aec9eab45e7d0ead0272b52a800e320d13a05592749ea241790cf57e33069208dc7a39f92f1d4484559c0a236ad13229771a78c0586bc
+EBUILD actionscript-mode-7.2.2_p20180527.ebuild 525 BLAKE2B 1fd1602e443c88d44e084192f5778ed74c51ca8830db5f92da2255e9b062a6f622634ee006cf82e7ba53892d0115252e006b6e9160c08d25182190605a3dcc79 SHA512 d9672cc6f6471714e237279bfe117ddb23faeb212267c190bfc0468262a06a3a91a5f9dd95d04c06a3724ca2d68ee4c89b655632044f43194aee33a021cc8d64
 MISC metadata.xml 373 BLAKE2B 459d26d032a23887848eca1b521e609ba0799b2b85ee625b4ab6918562c55e0513fd4946caac21b0736d2f65648d30630c7b12f5b74f7b8f191f6d429f1b34f7 SHA512 3459389fdaaec6cf0126421ed50e0e3b06262771233808b5e3f1563ae2216e32f294396336fcf55b9807f1e2418cd17291e10ffad9d23436a19662b7e23d634e
diff --git a/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20120405.ebuild b/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20120405.ebuild
deleted file mode 100644
index bcfe47642bf7..000000000000
--- a/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20120405.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-GITHUB_USER="austinhaas"
-GITHUB_PROJECT="${PN}"
-GITHUB_TAG="aa7e63d566a815152e7e652010becd46a406abb2"
-
-DESCRIPTION="A major mode for GNU Emacs for editing Actionscript 3 files"
-HOMEPAGE="https://github.com/austinhaas/actionscript-mode"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${GITHUB_TAG} -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS="README.txt"
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	mv "${GITHUB_USER}-${GITHUB_PROJECT}"-* ${P} || die
-}
diff --git a/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20180527.ebuild b/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20180527.ebuild
new file mode 100644
index 000000000000..76ae4442f222
--- /dev/null
+++ b/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20180527.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+COMMIT="65abd58e198458a8e46748c5962c41d80d60c4ea"
+DESCRIPTION="A major mode for GNU Emacs for editing Actionscript 3 files"
+HOMEPAGE="https://github.com/austinhaas/actionscript-mode"
+SRC_URI="https://github.com/austinhaas/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/analog/Manifest b/app-emacs/analog/Manifest
index f06816fe07ba..293176ea561a 100644
--- a/app-emacs/analog/Manifest
+++ b/app-emacs/analog/Manifest
@@ -1,4 +1,4 @@
 AUX 50analog-gentoo.el 88 BLAKE2B 980fb76a8230eb768cc675d46bed630afb1e9a62301f9d47b963f00b0e3b4dee60cf497ee68a9044f48abcf7bf6d23b69eb434961e320232ffda8854c1fedf6c SHA512 a74fbc95f45893507aa84dcb6e10f5e41fc65678ceaba2f1370ca75319a9f3287c9476bc453df9ff4545a976574770dcb1ba906536a8f090aa0a273f2bb7d6dd
 DIST analog-1.9.99.el.bz2 9626 BLAKE2B e96802c075d078b4f8a951176b52457da4a6cc52d909a1ffa6dec32fce85036b38acadc1a667e0d93808abe5b3f3ae2f22be071950948da13712a864cd500233 SHA512 c4ce5dcce93805cf4cbcd3316f044485adaa36e6479956f2a87c8bb6a6c1522e46a60cb8ef5a4bb3fd6a60187c4ed6760f74afe870c7491ba5c3e760ae2d6cc0
-EBUILD analog-1.9.99.ebuild 379 BLAKE2B 487d46f29fe373c6f80a68dbd782159c6ba34075207e240ef4d2e47b714f115162ac0b0b3eef0c34733f6737a2b3c52313cb5e7d54681fe54e4e84924c16bc1a SHA512 0379a4d03f09fd7db408545177d063aed0d3da8ba515172c93fda0689088352f26704155052f77ee9e5bc31f15265dfe98ca510fb9f3594d6b736792425eabf7
+EBUILD analog-1.9.99.ebuild 412 BLAKE2B 349fd4cd63bae197bbee95cae5646837837cd57b73bf038abb3f5a552e131e7e8357739f2f1dd9f7c37ec7419d8dd50fb3f84ceafd7886fda26efea50b811782 SHA512 005fada2dc9bf724bd26bcb48f6fa9c3fd2efc0b413b46412258cbc44cd13bc2ca6517f8e0a55564033826656dedf8158e00d2a8dba71e55109df533680cb060
 MISC metadata.xml 600 BLAKE2B ec65a935c59d940ce6afeb1139aef9dd94ee0528f3d80aecc6fd228afbc9f8db179fc74e51e56bf5481021243ef274821ecb8a7e1389039658aed574c28736f0 SHA512 a4d9c8051340ef0440b989cec1fb43aeaa9bed9fd09d8d5d8d24c7e5d830e76603aee816d984ebf4d7a54517604e74189a97204b855745925852719537ac174a
diff --git a/app-emacs/analog/analog-1.9.99.ebuild b/app-emacs/analog/analog-1.9.99.ebuild
index b4aa33cca786..9e84b75732da 100644
--- a/app-emacs/analog/analog-1.9.99.ebuild
+++ b/app-emacs/analog/analog-1.9.99.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit elisp
 
 DESCRIPTION="Monitor lists of files or command output"
-HOMEPAGE="http://mph-emacs-pkgs.alioth.debian.org/AnalogEl.html"
+HOMEPAGE="https://web.archive.org/web/20150919120435/http://mph-emacs-pkgs.alioth.debian.org/AnalogEl.html"
 SRC_URI="mirror://gentoo/${P}.el.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/apache-mode/Manifest b/app-emacs/apache-mode/Manifest
index 86d8be815802..686b2840f77d 100644
--- a/app-emacs/apache-mode/Manifest
+++ b/app-emacs/apache-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50apache-mode-gentoo.el 499 BLAKE2B a49be09cf0a7ef07263899bcd1ba7485228cec4932bb7e756d2f31fecc63299389b68e9c3d6e08b2664b0e4d187f92550fe785bcd3d8b241b7a8a1bb3b707128 SHA512 4193ed796f1bd433ad33f61e2d23eafb6cde2114304f51c20464827d25185408749eccadb006663be25bb3a62b206deedf654bf0398b3e5ef94773a53ba28caf
-DIST apache-mode-1.1.el.gz 3468 BLAKE2B aa89b18877049fa8399ef75dd048e40eb84c20dec4365b08bcb1d1df2a14e4a2d63a2baff3bfeed1bb01fdd0489a757b3377ad21d311c03e958650e68a0f927b SHA512 4eb42a0b4db847026832f14473dfc6cfea6c436eaed5a52c2ca3ba27cc89b0b36b0e7be1472048e1c559f3b5d5a5e7e85b9e2cb9c5563bf781f241b540e141f1
 DIST apache-mode-2.2.0.tar.gz 16077 BLAKE2B 25b153dde0488febd361463b0f43207bd10680f7db2f28f32aa1955f9edc5a07c501646580afd124c7787da3283aa2ee4a2209bfd57f68bf73d5ad07fac41ca7 SHA512 3b309291813b309215250fc1ae1ff206df6474981302a145c305adebb6ffe6a20338b9d8fd5fef1ba491a6bd2427d372178f02d90af214dd24d389c574789aa5
-EBUILD apache-mode-1.1.ebuild 377 BLAKE2B 8818e51c9504cb143b83046ec9c33b085dfcb24e714e63138127c54f83de31b73c4161144a1b2304508832857fc97b038ed6226f0e23e1c9cde55c8c0e576501 SHA512 ae7e50866fff671b94acd287b8671ec77e5ffecc093c6f685afdb3be1e48f3178f2f4ac5d832e37897add19a2fa14e062a2899f01ec11e34f78fcbd3c7eed894
-EBUILD apache-mode-2.2.0.ebuild 441 BLAKE2B 111fb27fadd500d98507c881a7cc95168bbc98d202651c86365593571810f261efe6118e5bb2ef480e8d032d123f90de0e2c6685e20c9b71df7efbcf5992b182 SHA512 4c5f8a3cdd3015337c0886dd6be0256047a6942de455f4c12faddf23286fc647eb887523f01d509dee1f8ed1fad5301a9189a8b54ee7dec27e0b74d24b3ad66a
+EBUILD apache-mode-2.2.0.ebuild 432 BLAKE2B 8203d0d9d402f4d6f586432f12ca42d5f5b8bea3e87dc080f8b666b54e1902d4e2e2292f3b718695701a192e2f77ee5ad4588fe0919352d35faba0a56566ea71 SHA512 ebeae3f1222bd62dbff9849d70ba304b691980d35a067037aaa62ffbdf19845d692652ee962fe43e03ce07ef1ff179c00e74829d2e9550b8354120536b1f7e72
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apache-mode/apache-mode-1.1.ebuild b/app-emacs/apache-mode/apache-mode-1.1.ebuild
deleted file mode 100644
index 7fc337a8f516..000000000000
--- a/app-emacs/apache-mode/apache-mode-1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Major mode for editing Apache configuration files"
-HOMEPAGE="http://www.keelhaul.me.uk/linux/#apachemode"
-SRC_URI="mirror://gentoo/${P}.el.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/apache-mode/apache-mode-2.2.0.ebuild b/app-emacs/apache-mode/apache-mode-2.2.0.ebuild
index a3c41f739d3a..fc4c04af2ca7 100644
--- a/app-emacs/apache-mode/apache-mode-2.2.0.ebuild
+++ b/app-emacs/apache-mode/apache-mode-2.2.0.ebuild
@@ -9,10 +9,9 @@ DESCRIPTION="Major mode for editing Apache configuration files"
 HOMEPAGE="https://github.com/emacs-php/apache-mode"
 SRC_URI="https://github.com/emacs-php/apache-mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+KEYWORDS="amd64 ~ppc x86"
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.org"
diff --git a/app-emacs/apel/Manifest b/app-emacs/apel/Manifest
index 50fbb5d92f9b..ad040beb81c7 100644
--- a/app-emacs/apel/Manifest
+++ b/app-emacs/apel/Manifest
@@ -7,5 +7,5 @@ DIST apel-10.8-030_Use-new-style-backquotes.patch.gz 7869 BLAKE2B 93b93a089693a2
 DIST apel-10.8.tar.gz 126326 BLAKE2B 6fc8f04006a971e9d48dbf5f7b43e201a4f5fa515210bb69829bc3b0f05aba2e9f205915e6117e20220ae5b48a6543520533dc95a90754a30ff3fb8094779901 SHA512 39f13f15ec0a078d8f8dfe797899474cf4dfeb0bf7b8432a0c05bb38cf134d805c171a66b3d3efd074fbf294d68006d1e1d49903e45f1991d79cdcb4cca4aa9d
 DIST apel-10.8_p20190407.tar.gz 94808 BLAKE2B 47540e8c3ce96cc91efefe521942a3df4ee8423c7796d7e66b14bed7e9d662469a0767dd4863ae130fb114a1f9335d95abd13d61b6811e039db75e28679ac0f6 SHA512 6c780b0643f248e2a1409f1cea794dc6be515ee2ae766ead0834996bd9c13852492af1b9c343c4efda06fd057fae0c1b8a1ffc6b55b1469afbc7cbf1b579ea68
 EBUILD apel-10.8-r1.ebuild 1494 BLAKE2B 330d33b3436b607e3de6d46ef5ff15fb4208230c166ff3eccc837a57cdbc7885b5ec0bfad83976b1d3c2ad54e71c5dd1433903daf18c4b00fb14400f6d5c2538 SHA512 5b4881c7a966d1ee0fd82d931964d377c91a4df4647190000e3fb53a46c3eca0df9c705a34a762f2846a5a9696049d240b9549551e6a2e7151f772a16acf5c15
-EBUILD apel-10.8_p20190407.ebuild 1196 BLAKE2B 6330a54f618c4346e32c9c07e7f5ad8b8400ef78735d512adbd4940e39ce61f75a7768721e77764a7a6df3408580c960371927f4db822a5645a46015cbc76972 SHA512 c41bc722cb809cd9e1a69f1665e8b7fee05060ec1ce0f3c4975b893c5562f51e740aecab3b6c255d3961754b6950369cabb3ebe6d5d1f1adf2fec805ca107800
+EBUILD apel-10.8_p20190407.ebuild 1219 BLAKE2B 76c23074e899b3f5911d5c82d69168a7f2e0ff3e7475be5244af4fd4c7ad18c79cf7584ad8606de2b9e344a9a7d468a9f3eb69cb4b63e065738a0feaea35e3ed SHA512 a60a906313306d25d2854a5c42db8d7d345b9899462146c6d9634847d03569692841f0449b263c2d5762ca368f07d4fe6cee569b8e5132f1d7baff4d6f634758
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apel/apel-10.8_p20190407.ebuild b/app-emacs/apel/apel-10.8_p20190407.ebuild
index a218a947a7b3..a810dc04e8d8 100644
--- a/app-emacs/apel/apel-10.8_p20190407.ebuild
+++ b/app-emacs/apel/apel-10.8_p20190407.ebuild
@@ -8,7 +8,7 @@ inherit elisp
 DESCRIPTION="A Portable Emacs Library is a library for making portable Emacs Lisp programs"
 HOMEPAGE="https://github.com/wanderlust/apel"
 GITHUB_SHA1="d146ddbf8818e81d3577d5eee7825d377bec0c73"
-SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/wanderlust/apel/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index bda9a1fed2bf..390b7c8834ef 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -1,7 +1,9 @@
 AUX 50auctex-gentoo.el 157 BLAKE2B c7d59a1ff3fc08b60332f5f578841c942d1a302f9a594409b3cd6509fd254c0d8d4273061d2ec4f444ad9288b073900e4c07e9307ffe0421182e7380c4c73543 SHA512 7cfc10c95da1d920b3861eaa9950d5ddd2388af5086cb81457f084f9c094b15dae9638a8c1e9b662dedba90c2d3c33a972011b99d9e2d71d85f99003de5ebef2
 AUX 60auctex-gentoo.el 97 BLAKE2B 18cad086f4211844f8a32d0f2499d2ecf29cd41f90c9dee6cf87184f81b0ac3836a5a58705677b55f926bdeb5854aa9acd6438f42e29856acf6c6c644592e347 SHA512 2cf945ac36ad5b25afd723d04223556522ac901a469bdd47d0c7562beb985401df957acc100222df6d97f4335b6d3e8d003f6b00b86780eec0a906ff0fc2ccb4
+AUX auctex-12.1-autoload.patch 1373 BLAKE2B 8ef031135245b0f54f3789a8070253f5a32fbf12ed001d1256ec55fb6d349f2fef3fd880cff4c35464c79d2fe041c1744f1918626d671289a46f006973f9aca9 SHA512 935dbc8a145c44d655c85b6725bbe61bc165adf4561d4b6583a63a2c950b5221ed552fe53884ab026a086720d29486c7bb8b07897b8d64b0cf591f5a2db5bd8f
 DIST auctex-11.92.tar.gz 1486606 BLAKE2B 6e34d1da3bacad8f2baee2f13eb44a5b617a342c294ef4d7ba28059b678510e1d161f3f02fbcf38128c09ab4996a035e5ec28898134b967d88ad621b8b477845 SHA512 758bf82903ba0499decf0ade77c7ac70865132a24195d7e8794538b7857c448811b7ef26149a915b60ed3ee34c2ebaddb3282a320bd459c9ee3f461d6ee9b84e
 DIST auctex-12.1.tar.gz 1476296 BLAKE2B 1dd5db94b5b7bb572919fdcb6c7dd2ea4d17f816204bedc69756610b80370ca748a06ab100ef8221107605a5e464b6a8c2587b728ba6a964776ea6dfeb7f7165 SHA512 4c27a3b16eaf98db164832497c497576fcabb274b24c6eb3060625b7711b1de91fce9a52f7c7caaec77a93768a6ce2ec173ab1ccb72f4c56c51cc4740d380d97
 EBUILD auctex-11.92.ebuild 1481 BLAKE2B bdc0e1ceac0c607c80405865897c909be1be015a968419e2ef7302abb104e465a54eac7dc42d1cdaca1d215dc8ccdd07452ef5db20d3b5cf9e40613da935560c SHA512 9048e1c9a7e11f5e6e8b70d50c507083f90f0a2b3d0bdcee52a320902bc4fd78a6f8069442dfef57fb6fe78d18b82bf0787d70c4a22effcd182babb9e0a9b226
+EBUILD auctex-12.1-r1.ebuild 1535 BLAKE2B 9fb6d5cb547dc7e988c6e66577f970dcbee52e1b47f61127bfac636c55264918344e8fe6cd877f8d1378cc24e211e5d121512d433707ca6f754f0843656bda17 SHA512 b873249e97163a1d0ba1fe3824fef57f374c116ab46c188c0071d16741fcb0f428fd80bd6ed447cee531f0d76cb65df76785569685d16509e134e5a8fc68146e
 EBUILD auctex-12.1.ebuild 1492 BLAKE2B 3903ffbf021f696664750fea082ea8ba60901fee19ceb8cc85e4e8eff97237c9af1452c20b49b860b335a7fb3947ecae45896384772cda1a203e589b44f11e37 SHA512 fb4cf29c28e2aab5a316d951033ddb2efc563434983f5e74a42c4d8a02068e70f2d2cf74801aba5fc7ef8696a2c1c3d1c5b23c5fc520c2cd3da9c8e0361591e9
 MISC metadata.xml 947 BLAKE2B 0b5e298fd9ca7112b8bd91bdc8cee455fff18d6ef21820c9e3da7058c860462fe96a7fe29792cc143d9e1876495fe3ee87e09e006b203ad448e511c12983c383 SHA512 61629e82f0004763e776db51ace13d583eac8d1199ebb61d17a101d48dd60258db4310fc938b82822c64b0ee9d39d9095fd86c316585e54ea9e7872a1247763a
diff --git a/app-emacs/auctex/auctex-12.1-r1.ebuild b/app-emacs/auctex/auctex-12.1-r1.ebuild
new file mode 100644
index 000000000000..dcd803eff7f9
--- /dev/null
+++ b/app-emacs/auctex/auctex-12.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Extensible package for writing and formatting TeX files in Emacs"
+HOMEPAGE="https://www.gnu.org/software/auctex/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="preview-latex"
+
+RDEPEND="virtual/latex-base
+	preview-latex? (
+		app-text/dvipng
+		app-text/ghostscript-gpl
+	)"
+BDEPEND="${RDEPEND}"
+
+ELISP_PATCHES="${P}-autoload.patch"
+TEXMF="/usr/share/texmf-site"
+
+src_configure() {
+	econf --with-emacs \
+		--with-auto-dir="${EPREFIX}/var/lib/auctex" \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
+		--with-texmf-dir="${EPREFIX}${TEXMF}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-build-dir-test \
+		$(use_enable preview-latex preview)
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}"/fonts
+	emake
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	if use preview-latex; then
+		elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el"
+	fi
+	dodoc ChangeLog* CHANGES FAQ INSTALL PROBLEMS.preview README RELEASE TODO
+}
+
+pkg_postinst() {
+	use preview-latex && texmf-update
+	elisp-site-regen
+}
+
+pkg_postrm(){
+	use preview-latex && texmf-update
+	elisp-site-regen
+}
diff --git a/app-emacs/auctex/files/auctex-12.1-autoload.patch b/app-emacs/auctex/files/auctex-12.1-autoload.patch
new file mode 100644
index 000000000000..3ee765d94ca2
--- /dev/null
+++ b/app-emacs/auctex/files/auctex-12.1-autoload.patch
@@ -0,0 +1,33 @@
+commit 1b88eda687913a3a355a010ed0483bfcfce28301
+Author: Tassilo Horn <tsdh@gnu.org>
+Date:   Fri May 17 22:07:10 2019 +0200
+
+    Fix autoload generation code (bug#35758)
+    
+    * Makefile.in (AUTOLOAD,PREVIEW_AUTOLOAD): Use arg instead of
+      generated-autoload-file (bug#35758).
+
+diff --git a/Makefile.in b/Makefile.in
+index 822eea9f..74659f7a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52,12 +52,15 @@ PACKAGE=auctex
+ PACKAGE_INFO=auctex preview-latex
+ EMACS=@EMACS@
+ ELCC=$(EMACS) -batch -q -no-site-file -no-init-file -l lpath.el
+-AUTOLOAD=--eval '(let ((generated-autoload-file (expand-file-name "$@"))) \
+-  (mapcar (function update-file-autoloads) command-line-args-left) \
++AUTOLOAD=--eval '(let ((autoload-file (expand-file-name "$@"))) \
++  (mapcar (lambda (file) \
++            (update-file-autoloads file nil autoload-file)) \
++          command-line-args-left) \
+   (save-buffers-kill-emacs t))'
+ 
+-PREVIEW_AUTOLOAD=--eval '(let ((generated-autoload-file (expand-file-name "$@"))) \
+-		(update-file-autoloads "preview.el")(save-buffers-kill-emacs t))'
++PREVIEW_AUTOLOAD=--eval '(let ((autoload-file (expand-file-name "$@"))) \
++  (update-file-autoloads "preview.el" nil autoload-file) \
++  (save-buffers-kill-emacs t))'
+ 
+ # Files and directories excluded from distributed tar ball.
+ EXCLUDEDFILES=autogen.sh .gitignore doc/.gitignore doc/tex-ref.log \
diff --git a/app-emacs/autoconf-mode/Manifest b/app-emacs/autoconf-mode/Manifest
index a4b188b8bf98..2a670128f042 100644
--- a/app-emacs/autoconf-mode/Manifest
+++ b/app-emacs/autoconf-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50autoconf-mode-gentoo.el 366 BLAKE2B 9394476da3892a5b857fe35ff9a6ecbacec761adec91465201259b03080a7303a1c5e6fe2767ffabfad1b156f4d362e1f025fef9ab131d89799912e0328090a9 SHA512 e917a5c7e7216da4624ac9463aa575569402383fd77d11b510c4752d1dfb54aa93c3cd29f3e3b198693c4f9ee9452611f5f342ecf57bf2c5f72b5e10ffab2d9f
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
-EBUILD autoconf-mode-2.69.ebuild 549 BLAKE2B 888a6dcc0036d701a57978d2a38582fe06e3c245d81b6a0269a4cc994f625fb994dddc6a825c8dd7c0ab9596413d69991714bdf705c12007be4955f101f1735d SHA512 e23dd5c865c56bbf4d6f4cb6eac3e5426e72d0281bb21b75c6f162215227fa0d421519c5eb72d15ceb8dc36909a3e10e099f5a2794f97bc2b2dfff0464709e2f
+EBUILD autoconf-mode-2.69-r1.ebuild 549 BLAKE2B 8439c9c21b32ab9e774078f56e54164d8dd9452f523f6f6ebabc93e284aa36544c0055391b8f115ef3d680c87c1c56930da360d68cbfe3cfd5028cc15039cae6 SHA512 f7051a3a65ccf461baa4716da4c2ceb8d384e06b3d6f582739c82429c35c43935ea0fb48728d0096980583fa6539ebb0397b27aee246b78f929454f12b4f1b70
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
new file mode 100644
index 000000000000..2e7a5cec2cc4
--- /dev/null
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Emacs major modes for editing autoconf and autotest input"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+SRC_URI="mirror://gnu/autoconf/autoconf-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+S="${WORKDIR}/autoconf-${PV}/lib/emacs"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
deleted file mode 100644
index 3ad20e46390a..000000000000
--- a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Emacs major modes for editing autoconf and autotest input"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/autoconf/autoconf-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-SITEFILE="50${PN}-gentoo.el"
-S="${WORKDIR}/autoconf-${PV}/lib/emacs"
diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
index 60e2311ce82e..5d002257aa61 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -1,10 +1,5 @@
 AUX 50bbdb-gentoo-3.1.2.el 63 BLAKE2B 4e066577f6bbc4ddcc7a5b102c1bc650fd957d82468ed9782a97520db6acb2fb600372c4fcff7c21dd020080a3d4a5f41aaea15e5751ed5f22e17b9d2e04996d SHA512 3cb67cba1e12630c40b7c78572e7af0418c56d821c327c7b963cb00401a13f47da622b3a8e7a67795158b1394e860bcdf5ac3e478f8df9c5e3a97963bbd65a2e
-AUX 50bbdb-gentoo.el 115 BLAKE2B 69ff091d2da0819ec7bbc163c453a2621c12e6e1b685b577e9c2c16bce5a9c57c7afdf7ae35d113edc0b5e6e6e433f88155123646dd01f9cdb012824b81172b4 SHA512 c04101cfe2b1a13f9f25c6a8d5a9055cc4cda6e5b9208a563e6f1ed979e2585cffca97303f192f3a2b9f755d65ec3f86e68509293b874bf8020243eedbf99c50
 AUX bbdb-3.1.2-no-init.patch 4709 BLAKE2B 3e38c67d8347a8c6202ecddfa68847f0c9feab1593d84e5564607b3d9da104af93b5bb0862e899386555dd1abe5f8b7894c71575fc6a750db2e4332c5ad9c204 SHA512 3f262323cb35636d0249aafa54ff2a2e462df803d19c356bf2b7ed6a68410fa6e6bc41298a1e7fbeef224c84cf4bf9f80ff1ae068c5226ac6bea3ec62d593355
-DIST bbdb-2.35.tar.gz 393097 BLAKE2B 194924e828cb02022e90b49bc1c1cf8cfa23146e3118dbf6be7310930463c743f1648d54daf5f605f8d7a83ea307974084cbc07d630ae2273e8147a05dced799 SHA512 ee815f62796bcda63d37ae5a3805d065f6cc79648ca86852b97d4c1b849a1eb6c8f46dab2f257b9a8f9efc44d38469739f98137037c10f79f37a1ff235f6a413
 DIST bbdb-3.1.2.tar.gz 378935 BLAKE2B 3fc862d2d68632c997e3f250aa82cced743c3cc3861c74789bb12015ab99745270c79722dc0342334b90f4dd9071ef809ab670a342ac227c24a927870907c25c SHA512 8b32baadc4eb06b0abf533ccb1f540f4f407f27b8d2e847ae25e62d1405e1de5cfc6af16368eecd4086f281ee7a4016cf25568847b3cb798156c7e18e1912576
-DIST dates.el 7048 BLAKE2B 866a9a7a5524290a7762d0ad3c7b91766ca61fa025c2f634ce11909fdbd2a6d8bd7316ec66649590148a92660ef6122c93bac8085f333f1e319cc740349a8e90 SHA512 51b0dca58a1b54e913a0dbd97df12230ec49f05b368404fa3d49cddf4ca8e14dbff47a28087c4ba41b189a38a3608c77454e102ae5bb124d07d1ad3ec9c39e71
-DIST point-at.el 440 BLAKE2B fba28258d84c378985d2f17e28f0258e1e671f831f726e1d1289e84e246d9965300aa303c7f7dd383c9d33ec84e1e8bb014bba1e4f737661a5522a37ce6541ad SHA512 e38cbf39cb3f29f51f6759a7ba548f065c4763668d38c746eb69d9ab2384357f6b1c7f032a6afe739bc64658f5863730b7a4b3023cc9df1cc5e088e591c02760
-EBUILD bbdb-2.35-r1.ebuild 1831 BLAKE2B 27d7dc2da5c45c33d827030d6381b5cd329205c1ea7e51a65b2bd9c1805c0feb9b3fbe065de88f661715468f9a1873f1f26f8d0b4736ee84c158d14dfdb31310 SHA512 7b6a393f6c22933f748de30ce1be9a1b58d0f2d5ed90b403bb232cfb7eace715f14feb962c2543f15d458c11bd6131c2cdcc72cff3830008d8091d8f0726f311
-EBUILD bbdb-3.1.2.ebuild 1236 BLAKE2B b8d33d9d94984aad113fba3fa3ab2e6fdd75b1df4dab9803efe213dc84267fe1ec84625ff9d66bb90e45943c9cb0f3ded556ba7085f2a1201ba353c4b0904762 SHA512 b0a57c163c29f7eb3682ffc4ea6f1da679d9f238194d68d86785994009c96f34f41e97ec77a09f89d804767cb2f49a31cf5326256c8efffc8d4d54d3a3495695
+EBUILD bbdb-3.1.2-r1.ebuild 1252 BLAKE2B aa0e52adf4f144345ce9ab63158c28e0700992fa6166ad0dbaa2c0c774abb0d3096b75a754fd19bb796ddda5f6de3a4c5bbd67f80c0284f293e2e747271d2eb1 SHA512 b1af482f2570358068a5f2548b405cae3860b5493af9d7e212b2fd4091a2a7a8e55a552eb618996ee8b351b9d971726ef481726ab264c2f23a76d54e12a08595
 MISC metadata.xml 753 BLAKE2B 34f54aee0c3090fa9d9ee231f1f3ada71e889a4c4d7db76be9f0e351a4ae2333230c3338b014c2b267fd24610d788ede12749fe135f14d9760e76bd4e47d2827 SHA512 76dad950ad39c0f3442e2339dbf560154cc1b0685137c81e64224686ee31ff856dbd147aa04202250fa9595510c991d15609aec986dab26ad60bda3744902dda
diff --git a/app-emacs/bbdb/bbdb-2.35-r1.ebuild b/app-emacs/bbdb/bbdb-2.35-r1.ebuild
deleted file mode 100644
index f603c567dd93..000000000000
--- a/app-emacs/bbdb/bbdb-2.35-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="The Insidious Big Brother Database"
-HOMEPAGE="http://bbdb.sourceforge.net/"
-SRC_URI="http://bbdb.sourceforge.net/${P}.tar.gz
-	http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/point-at.el
-	http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/dates.el"
-
-LICENSE="GPL-2+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="tex"
-
-RDEPEND="tex? ( virtual/tex-base )"
-
-SITEFILE="50${PN}-gentoo.el"
-TEXMF="/usr/share/texmf-site"
-
-src_prepare() {
-	sed -i -e '0,/^--- bbdb-mail-folders.el ---$/d;/^--- end ---$/,$d' \
-		bits/bbdb-mail-folders.el || die "sed failed"
-	sed -i -e '/^;/,$!d' bits/bbdb-sort-mailrc.el || die "sed failed"
-	cp "${DISTDIR}"/{dates,point-at}.el bits || die "cp failed"
-}
-
-src_configure() {
-	default
-}
-
-src_compile() {
-	emake -j1
-	BYTECOMPFLAGS="-L bits -L lisp"	elisp-compile bits/*.el || die
-}
-
-src_install() {
-	elisp-install ${PN} lisp/*.el{,c} || die
-	elisp-install ${PN}/bits bits/*.el{,c} || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	doinfo texinfo/*.info*
-	dodoc ChangeLog INSTALL README bits/*.txt
-	newdoc bits/README README.bits
-	if use tex; then
-		insinto "${TEXMF}"/tex/plain/bbdb
-		doins tex/*.tex
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	use tex && texconfig rehash
-
-	elog "If you use encryption or signing, you may specify the encryption"
-	elog "method by customising variable \"bbdb/pgp-method\". For details,"
-	elog "see the documentation of this variable. Depending on the Emacs"
-	elog "version, installation of additional packages like app-emacs/gnus"
-	elog "or app-emacs/mailcrypt may be required."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	use tex && texconfig rehash
-}
diff --git a/app-emacs/bbdb/bbdb-3.1.2-r1.ebuild b/app-emacs/bbdb/bbdb-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..f4d2705ce4e8
--- /dev/null
+++ b/app-emacs/bbdb/bbdb-3.1.2-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp autotools
+
+DESCRIPTION="The Insidious Big Brother Database"
+HOMEPAGE="https://savannah.nongnu.org/projects/bbdb/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ GPL-1+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="tex vm"
+RESTRICT="test" #631700
+
+BDEPEND="vm? ( app-emacs/vm )"
+RDEPEND="${BDEPEND}
+	tex? ( virtual/tex-base )"
+
+SITEFILE="50${PN}-gentoo-${PV}.el"
+TEXMF="/usr/share/texmf-site"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-no-init.patch
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		"$(use_with vm vm-dir "${EPREFIX}${SITELISP}/vm")"
+}
+
+src_compile() {
+	emake -C lisp
+}
+
+src_install() {
+	emake -C lisp DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	doinfo doc/*.info*
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	if use tex; then
+		insinto "${TEXMF}"/tex/plain/${PN}
+		doins tex/*.tex
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	use tex && texconfig rehash
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	use tex && texconfig rehash
+}
diff --git a/app-emacs/bbdb/bbdb-3.1.2.ebuild b/app-emacs/bbdb/bbdb-3.1.2.ebuild
deleted file mode 100644
index 58c9da5277c0..000000000000
--- a/app-emacs/bbdb/bbdb-3.1.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp autotools
-
-DESCRIPTION="The Insidious Big Brother Database"
-HOMEPAGE="https://savannah.nongnu.org/projects/bbdb/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ GPL-1+ FDL-1.3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="tex vm"
-RESTRICT="test" #631700
-
-DEPEND="tex? ( virtual/tex-base )
-	vm? ( app-emacs/vm )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo-${PV}.el"
-TEXMF="/usr/share/texmf-site"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-init.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		"$(use_with vm vm-dir "${EPREFIX}${SITELISP}/vm")"
-}
-
-src_compile() {
-	emake -C lisp
-}
-
-src_install() {
-	emake -C lisp DESTDIR="${D}" install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	doinfo doc/*.info*
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	if use tex; then
-		insinto "${TEXMF}"/tex/plain/${PN}
-		doins tex/*.tex
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	use tex && texconfig rehash
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	use tex && texconfig rehash
-}
diff --git a/app-emacs/bbdb/files/50bbdb-gentoo.el b/app-emacs/bbdb/files/50bbdb-gentoo.el
deleted file mode 100644
index 7953b3c852a4..000000000000
--- a/app-emacs/bbdb/files/50bbdb-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(add-to-list 'load-path "@SITELISP@/bits")
-(require 'bbdb)
-(bbdb-initialize)
diff --git a/app-emacs/binclock/Manifest b/app-emacs/binclock/Manifest
index 5a2fe468a8f0..07aa3003a5f5 100644
--- a/app-emacs/binclock/Manifest
+++ b/app-emacs/binclock/Manifest
@@ -1,4 +1,6 @@
 AUX 50binclock-gentoo.el 100 BLAKE2B 99f128a3e3033ffabad1d18281dd70d091bfa1ad7ba213a87383bd0305829e5368a8d006a6a33bb2a6280726af11df28b6711bc8037fddf6b6b1ae254022abd6 SHA512 08997bbbba82da6b79ae2b8f60396b219bd837674d16a658c62306e13e3fe667d228c7e6e0949b9b44a2a346d3f5d2996cc853c2180ad1c1d877940da97a31f0
+DIST binclock-1.11.tar.gz 9594 BLAKE2B d5de646996cfeecde9000dcd20545005ff036eca24230cb847f4b21a3f458884f955dcb85cedfa21b8c01d60e030f95d426fa8ebbd8e66a61f2e02c0d64d9e62 SHA512 94ddc4a653a1ca119ff86b1c66cf74c3a1b3b15da32d56b4c0080d5226111b0ac31cf4262078ec40488172b14a6b37e66ba16c4bf7b7932293cb1e2a6199c0cd
 DIST binclock-1.7.tar.bz2 2734 BLAKE2B 57d872b2dc4259ca8cb033b8ff5359dd9f57fa2c7469b1ab6f2d0871cae74efef3f4874fac712b63ff783f50e0722e1959586a2e194426e0098c4e3bf16d8b5a SHA512 fe7d69605dc72777236930368e2900b71717a0a96655afa939c9cfcf76fb6cccc8c21cd81e933eed210a9e948b6d3681eb60f494f4aef276a1026a6dfe186354
+EBUILD binclock-1.11.ebuild 453 BLAKE2B e7c0232d0254b3f1e738f6118d9ecfa99982585c95c1b0810736cbcca36c25b7ce3a75132e284b379d2564f8d97f57cda69f74e210b1528fdcba63e2203ff2d6 SHA512 47ebc0e5a2dcfcb6832cb42ea8226a6ea289b2b692738fb1028b00138bf1a02184a0142bcf51a67907750ced85b7986a4b07566532562446534e79cb027e1a34
 EBUILD binclock-1.7-r1.ebuild 378 BLAKE2B 3b47dabd1b888c86dbc7fb29e1fb5ec3c3dc2acdddb9c6694d5f9e8020fd65862c521436c4cb6098ffc295a736015beb5d543c8ab737942ff716d775d2ea77c3 SHA512 964e059e07410d2fb8b878b860cd57e53d4000c7ce3aa7f97297b6823999a3f024a71f7328e621277b110de05644247077625d06f6bb88dfa9e35c942ba6eb33
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/binclock/binclock-1.11.ebuild b/app-emacs/binclock/binclock-1.11.ebuild
new file mode 100644
index 000000000000..7746cd1d12c8
--- /dev/null
+++ b/app-emacs/binclock/binclock-1.11.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Display the current time using a binary clock"
+HOMEPAGE="http://www.davep.org/emacs/"
+SRC_URI="https://github.com/davep/${PN}.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2" # v2 only
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/bongo/Manifest b/app-emacs/bongo/Manifest
index f683d36f55f2..1971c13a2d51 100644
--- a/app-emacs/bongo/Manifest
+++ b/app-emacs/bongo/Manifest
@@ -1,7 +1,5 @@
 AUX 50bongo-gentoo.el 192 BLAKE2B 45600e17a12ca18572eb8112d40cd60f74ffe8569a592610829ecd289281a2440ece63fcd9d41733cc9a5817df07e32705173c6fe81bd09a989ce8553dd4a082 SHA512 57d89540ca341578d2ee4c2dd067b4532205874d88ef7d54be065abeb7c1d1e0ca295cf02d02cda6cf8fbc708a5946fc7f2d0541975bc5d56a9b06d27cf175f9
-AUX bongo-20070619-fix-require.patch 224 BLAKE2B c2668c5a34e003c4bdc4efe1ed789d7c6496032b003a94ff824036ca004c8bfdc56f11e0b7f88639b2c5b92792ab623ba097dbf1e86039cbd5d332ca7947462a SHA512 968d2c55d6abd0f22c238e7488c8c96d3faf08df9e74d83cae63df35be556f70608e63e525e280bc497172548678a9c8df976eca342e0190ad58622c1411cffe
-AUX bongo-20110621-texinfo-5.patch 258 BLAKE2B 0b4566c08b1a96874220f7b615bf16f3f4457f3872a89f82d1e4d9dc346e3b599da9611ec6b424e1f3b594bfc6afc2b1539ec8aaf7aeb8a1059481b39c9cb2c2 SHA512 ae03701a1372ee142902763d68d73a3fc0a3862fa7c9b5cbe916a85d965af0f6f2acc859564b56c5336eb1db1400d9f3e36c7f376b44b1dc7caad405a547a2b8
-DIST bongo-20110621.tar.xz 97652 BLAKE2B a3fd04f24b122af580e75ed68ad42dcd99045ab9cc7ea9fd273c9b256dc732fd6a0328f15489a50b427c85dad4de1ea2254afc257a9e3f2896baeefc1cff1c56 SHA512 31c2a477cfb5ff36fbc64da29c725db0b0242ea09f80883fb21feb3b23f5c14c688379c4c4e53b26ffef3aca5d2813d5b2a38b91266da088c73516f7ea1d712b
+DIST bongo-1.1.tar.gz 123552 BLAKE2B 06ee27b9ea77b3227038cd18767d8398e416f43a8cdd0a3ed08831200f2edf42eb1c4ab45d363e289b5a471a4ccd60ccb4efc00d62b225eb589dee96c255d7d5 SHA512 c2a4c4241da3ca432b481f56758958a56f749a25eed345d0f30fe560319fd646712b84751212582c2f4ba410cb8858881150b77166fe919725cc50e3917c98e8
 DIST bongo-mplayer-20070204.tar.bz2 3563 BLAKE2B 684c702da46fedd365f780b165619b20e5da643db7b457cc527017971e18a2b0e843896d28216527adbda1e6e7432ff081a7368b697256ac79f2032b30d97123 SHA512 e503ed7980f011a6fc3fa75d0bb9b1cec1ed49d4fb07da92aad65e3c5096b42cf9eb203a8edbb93f2e7924254e4926e9f3fcf473de877fea130557aefad73ebd
-EBUILD bongo-20110621.ebuild 1155 BLAKE2B f4d555d08f793f1af0585f66d9b2680ea4b2b937ab37028c8f55b5c1965a59d98e97a1514d9f7c5ab4042ec5ce3d626bbb35eb78ada5fe8ce6150e84063e20a6 SHA512 6544d4e41b2359f37d1c3b896ae7993a27f69c7fec6541eddd893804b57ba3908d1519c679335d5b199747bc21415a05d00ede6fc089df26149ac333127b0f35
+EBUILD bongo-1.1.ebuild 1344 BLAKE2B a0715f85f55e17be6615d94fbb64480d907dbe934828def4557e7dbfd20c34326031ef0592c5321d48cfd2073fae87c034d251f714eaa131ef076bd51174ea11 SHA512 024d3dc2064a123f2ebb3628e939b25fd0342b3562a3b2aac1e2690c3dae33dff76c75d47c9147a015583bcc72aa90fdf0b01db9c8b697b6e02cbff7f97a3ee3
 MISC metadata.xml 1729 BLAKE2B b30c20f0fe63c627f79349ff20b07250759f6072c5b6dcfd5075359463b2c6256792e0d42b9ba57348c93947096ec86c60fae7acae3613971fa669505b58cdff SHA512 a8a11da7b2f1ed427d9571ea6259b3b0ed3d99a412bd05e4f01a57b4f5da05f11fb6e6006db1bfc624ed341f198dc8a4bef35ce5237119cee99a6d45687f2048
diff --git a/app-emacs/bongo/bongo-1.1.ebuild b/app-emacs/bongo/bongo-1.1.ebuild
new file mode 100644
index 000000000000..a260dc90ae6e
--- /dev/null
+++ b/app-emacs/bongo/bongo-1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Buffer-oriented media player for Emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/Bongo"
+SRC_URI="https://github.com/dbrock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	mplayer? ( mirror://gentoo/${PN}-mplayer-20070204.tar.bz2 )"
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mplayer"
+
+# NOTE: Bongo can use almost anything for playing media files, therefore
+# the dependency possibilities are so broad that we refrain from including
+# any media players explicitly in DEPEND/RDEPEND.
+
+RDEPEND="app-emacs/volume"
+BDEPEND="${RDEPEND}
+	sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="${PN}.texi"
+DOCS="NEWS README TODO tree-from-tags.rb"
+
+src_unpack() {
+	elisp_src_unpack
+	if use mplayer; then
+		mv ${PN}/bongo-mplayer.el "${S}"/ || die
+	fi
+}
+
+src_compile() {
+	# volume.el calls amixer in global scope, causing a sandbox violation
+	# in /dev/snd/. Work around it by disabling the mixer programs.
+	cat <<-EOF >nomixer.txt || die
+		(setq volume-amixer-program "/bin/false")
+		(setq volume-aumix-program "/bin/false")
+	EOF
+	BYTECOMPFLAGS+=" -l nomixer.txt"
+	elisp_src_compile
+}
+
+src_install() {
+	elisp_src_install
+	insinto "${SITEETC}/${PN}"
+	doins images/*.pbm images/*.png
+}
diff --git a/app-emacs/bongo/bongo-20110621.ebuild b/app-emacs/bongo/bongo-20110621.ebuild
deleted file mode 100644
index 5aa2f60e6c65..000000000000
--- a/app-emacs/bongo/bongo-20110621.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
-
-inherit elisp eutils
-
-DESCRIPTION="Buffer-oriented media player for Emacs"
-HOMEPAGE="http://www.brockman.se/software/bongo/"
-# Darcs snapshot of http://www.brockman.se/software/bongo/
-# MPlayer support from http://www.emacswiki.org/emacs/bongo-mplayer.el
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	mplayer? ( mirror://gentoo/${PN}-mplayer-20070204.tar.bz2 )"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mplayer"
-
-# NOTE: Bongo can use almost anything for playing media files, therefore
-# the dependency possibilities are so broad that we refrain from including
-# any media players explicitly in DEPEND/RDEPEND.
-
-RDEPEND="app-emacs/volume"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-S="${WORKDIR}/${PN}"
-DOCS="AUTHORS HISTORY NEWS README.rdoc"
-ELISP_PATCHES="${PN}-20070619-fix-require.patch
-	${P}-texinfo-5.patch"
-ELISP_REMOVE="bongo-emacs21.el"	# Don't bother with Emacs 21
-ELISP_TEXINFO="${PN}.texinfo"
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp_src_install
-	insinto "${SITEETC}/${PN}"
-	doins etc/*.pbm etc/*.png
-}
diff --git a/app-emacs/bongo/files/bongo-20070619-fix-require.patch b/app-emacs/bongo/files/bongo-20070619-fix-require.patch
deleted file mode 100644
index 6b3e6ff588df..000000000000
--- a/app-emacs/bongo/files/bongo-20070619-fix-require.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bongo-orig/bongo.el	2007-06-19 16:51:37.000000000 +0200
-+++ bongo/bongo.el	2008-06-22 15:30:23.000000000 +0200
-@@ -67,7 +67,7 @@
- 
- ;;; Code:
- 
--(eval-when-compile
-+(eval-and-compile
-   (require 'cl)
-   (require 'rx))
- 
diff --git a/app-emacs/bongo/files/bongo-20110621-texinfo-5.patch b/app-emacs/bongo/files/bongo-20110621-texinfo-5.patch
deleted file mode 100644
index 3fa257b97f1c..000000000000
--- a/app-emacs/bongo/files/bongo-20110621-texinfo-5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- bongo-orig/bongo.texinfo
-+++ bongo/bongo.texinfo
-@@ -374,7 +374,8 @@
- 
- @item @kbd{C-u C-u C-u b}, @kbd{C-u C-u C-u f}
- Seek 64 seconds.
--@end table}.
-+@end table
-+}.
- @end table
- 
- To seek a specific number of seconds, give a numeric prefix argument to
diff --git a/app-emacs/browse-kill-ring/Manifest b/app-emacs/browse-kill-ring/Manifest
index 3680a8a92e03..10309a2e58ff 100644
--- a/app-emacs/browse-kill-ring/Manifest
+++ b/app-emacs/browse-kill-ring/Manifest
@@ -1,4 +1,6 @@
 AUX 50browse-kill-ring-gentoo.el 284 BLAKE2B 7f9d01bd6c573eb831dc9a8e4d022eacb3bb26b27b26a7654f7ed51ee1e45680be97520211d748a3501a6e93cd3a8b1fb29a0d5238b8bffb444cc504253f4b37 SHA512 64c5c2f97e97cf01874c5dd310ab9e2b913aa48b91a8d9b2d08f87c0c467658c49a3cc5a9e11e06d17820c36e425f09f0b94cc7cd850eb6c382ff25c0b2861d1
 DIST browse-kill-ring-1.3c.el.bz2 9757 BLAKE2B 3287de095f1909a7da702a12575c6ac0254c5dd4ea485007a96bcda0ac75fb9c9017a1f594b688387b7c005bb2dba2c689464730bb8ea9ff3f005a9cc02f4caa SHA512 a7244db55b08b7247047cb71aa024dd2ba8579bd1588a31d65120145228729a329dac87c268b4be14b79beded6ec4f3473542c26bfb3c5624557023369737644
-EBUILD browse-kill-ring-1.3c.ebuild 440 BLAKE2B 81a502190c3a9c2ac867e4ad90362f22484000275859015364b041afc6bc2e6c692b5cc022bc7bca81c55de12215f5e02a44c04a7271bc698b20fe6cd665fa67 SHA512 dd65ef77111cf6a241a67ad30d70a871c51956f15282de795eb3b5b5dd917b46f9ff1cc35bd45a9ae94caf951857edf64a09b8a856f982b0af2c9cf64ed5f86e
+DIST browse-kill-ring-2.0.0.tar.gz 16559 BLAKE2B 865be7da04bb25ab5bb68dfe7171bf790333a04643146c4cfbbf78dd4685c2264d94629d560277bab12f1dde156511a79e3818936498489b914e5d266d176d4c SHA512 724614ede752e633f0f219732be03af443c19cad146244a1815c131581499d5b856973bee25f053d8ad5296bd6283b2bf6024bbd8b5fcfd03aecf150763ce8ac
+EBUILD browse-kill-ring-1.3c.ebuild 438 BLAKE2B 3c78eef776e4a9ecd5f7f30471b551014bcafe36b1d915608a2ecd07a68e16d5e1a2350610b71d040b751a765a7aa256156656c7949f248675c4ea2324f303e5 SHA512 7d01db614985b7764bb41b18bde5b0f616fdb0071da5bc32f3c77bd8283bf1dbf9daa36e6422fb3e726c781acf40ebafcea15f1ad343c93cd8d799abf520a41b
+EBUILD browse-kill-ring-2.0.0.ebuild 446 BLAKE2B 18f25b1709a5a2f520395e2e8809e7574bcf3b25a9cc385f57fa02785bdbdbf2fd5c1fb8dd1644c76b43d156ce23d41d32334c9ba89fe5bc2324a91b2ab8b047 SHA512 74f4df14f102c25da8e09327a4a53a7dd9c526ec4e6912d5111c297d1088dd8a303335c5663382c29d82db1b765d8c5d72e8fdf170dbc5799949185a7e4cef08
 MISC metadata.xml 787 BLAKE2B 6b958094927d6211737da88062c0116ae3b4794216361329ee7a6ae016a156c51ee67622c9e3019e31b93049d25086c5744839a1350f175f514b35baa89a41a7 SHA512 6ac913a862bcbea80b75c45a275907237dc5fbfab8cdd7ef945c70c9486cfbcb1cc49ab1ada3a03724c169acf56b757eeb28d0955d04dc61896d43f82822dd08
diff --git a/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild b/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
index cda01a9fd76a..bdf7fea25781 100644
--- a/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
+++ b/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.emacswiki.org/emacs/BrowseKillRing
 # taken from upstream git repo
 SRC_URI="mirror://gentoo/${P}.el.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/app-emacs/browse-kill-ring/browse-kill-ring-2.0.0.ebuild b/app-emacs/browse-kill-ring/browse-kill-ring-2.0.0.ebuild
new file mode 100644
index 000000000000..70171bdeac99
--- /dev/null
+++ b/app-emacs/browse-kill-ring/browse-kill-ring-2.0.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="An improved interface to kill-ring"
+HOMEPAGE="https://www.emacswiki.org/emacs/BrowseKillRing
+	https://github.com/browse-kill-ring/browse-kill-ring"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/calfw/Manifest b/app-emacs/calfw/Manifest
index df7f8e3f6150..5b52fa42a798 100644
--- a/app-emacs/calfw/Manifest
+++ b/app-emacs/calfw/Manifest
@@ -1,4 +1,6 @@
 AUX 50calfw-gentoo.el 118 BLAKE2B e5cd4b96817cc88b25d8da38f4d45f7c730feec236a4c636c5816d312a78f5689a7d076f4f53d0e1b947c536826057acb09a89cf8773ddb2752d148094adbb02 SHA512 55cf26db6805dc42f34c090214fc0d87594aacbab5d2113e26472453959a3d4f8d5bfacbf81954c14ac90aaaebc4e4fe8a6914aa31729459993de43a4347aa23
 DIST calfw-1.3.tar.gz 67187 BLAKE2B 7a8f34c5d6ad2ac245837b89c6854ca0c3c8f94733752a8c0d86e460eb2424e4017bd01b877d2b4d6b8fe05f6ffac8dae2d838d6cdf68fad489264fe861317df SHA512 76fc957dac22b2e4e41fa3d5ef3eb9e603369044d5aa90fa2e32ca0abbaa897d4537358f7849d0491c366b6a76c1b463e57e7a9483fca7c67555a8f6157f46bc
+DIST calfw-1.6.tar.gz 74776 BLAKE2B 26aee13fa7533c17eac9c32e8355c6e2fd760e8f87166d7a28ae90040a156ad8e8d8205387b37e5069705fa42095f318a40032ba5ce161f3d84f4823ee6619be SHA512 0c51c1747cfdda003a3b2244224e1bc2afe7b3dbdbb47804734504013ad94f7c5aaa30a2370ae9383f3836f266d47f695ca3d90419d899c8a639d474fab14180
 EBUILD calfw-1.3.ebuild 583 BLAKE2B e5c48d66073091a44d799726bbc27175f86f2286f3b03724c4b4d23ab881581ac6948d5a935799617ca2a37662ee75858b556d1fefc6fe2bfe73a35a5ce60bec SHA512 13d43e409039185471fc0805bc5eac1b38731b075bc607690e93b7d74feed0aa0c3e77c5b63ff008160ad283ad0b016a0e7deabe3831d0fb0ca385a017662b7c
+EBUILD calfw-1.6.ebuild 585 BLAKE2B 5daa74d926134c9b86cb8f55264ec262aa7d1b04cf50aedceae05f1af56b9d206a1ff8fa58dc04914e81d21124027262b1d3e171c8e1d13c4e977f5d611b5078 SHA512 78b6eacfcd55f208902908cc7dec9932c258e2a79953ba02f0f9260becfa22ae666b5ea8a7de9c5fec45e349436ebf703c28d4f72f48cf76bbd6b1bf99f7b7bf
 MISC metadata.xml 547 BLAKE2B edaea440d5e461f1e24d022c1a2aa124b32864f759d1cca28e85d5a2ea439e6f957077a857f5887d35793eec195d60e3df5d6db3d51e9d9f99002d0f151652b9 SHA512 5738530e6d52f52b2ada1839d9bb2e4987169dd82b64e60d068de84eb2ebc4f7da80e3a32abae808dca9d631777b5411618491fe061dfcbee7c04fe7b3e1e6e5
diff --git a/app-emacs/calfw/calfw-1.6.ebuild b/app-emacs/calfw/calfw-1.6.ebuild
new file mode 100644
index 000000000000..da8343f73582
--- /dev/null
+++ b/app-emacs/calfw/calfw-1.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="A calendar framework for Emacs"
+HOMEPAGE="https://github.com/kiwanami/emacs-calfw"
+SRC_URI="https://github.com/kiwanami/emacs-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="howm"
+
+RDEPEND="howm? ( app-emacs/howm )"
+BDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/emacs-${PN}-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="readme.md"
+
+src_prepare() {
+	elisp_src_prepare
+	use howm || rm calfw-howm.el || die
+}
diff --git a/app-emacs/df-mode/Manifest b/app-emacs/df-mode/Manifest
index da6f5394d082..2a17a99c4098 100644
--- a/app-emacs/df-mode/Manifest
+++ b/app-emacs/df-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50df-mode-gentoo.el 74 BLAKE2B e822e639fc1c01f43c4e63b6c9856bcf2353b3251be008348b95be481370f167030fe1a05856bdbca7d146cb9f2656bbf32d3722958a2cd650870ef7d0a7588d SHA512 35de1cfcc792b7da1271bf2ff47b93c706b89aa32cfd77245ea4df15897b5797dfd529ba7c0e89b89acb7e89ac4d4651ba8de0f76badde8b64d45d622c1f4edc
 DIST df-mode-20050509.el.bz2 3867 BLAKE2B f5051cba3b14174017e20983d26cb847ee8daceaf011b0f37f246e4730dd12fef5ed67131a86909636af28f22780563e4c5ba8d282e0272bbf08d0a89cc308e5 SHA512 e4d248d7b1fa9c231bac7d8d478c65d796123234503372ca945f5b122e62d816676c9744d42f41b1c6de6716682ad4233eeb57801155760cf7e4d41dc0e7d535
-EBUILD df-mode-20050509.ebuild 545 BLAKE2B a7131dabc13d3687fa96eb5943e50141968f1bf6836cfa2ebdef163cae9449ef69dee8e9eb671fd3464491002da99e20eb267f5f379346e5dc606d1b388e2d1d SHA512 b6c10bc8055277a67b3d2f713c2ad554bbba85383eeb72b2b7a81b291bbc88beeb293f2fd738d353b8156152ccdeee2dab1d833cd47aea39599bdf09d0032242
+EBUILD df-mode-20050509-r1.ebuild 542 BLAKE2B 32ffedf14da43f45ab2eed7f6484de8ad3be18caf2ce28f50240eebb88cc188d9396100a7305093ed186232e3c7c8baf36f69d53b00ce993abb49753babc9a91 SHA512 71e135f974589937d0b2f2f8c55ba9a48118e9d32eccc561b1378f964fd44825ef8cb3124f5e081057a11d63bd6d86d6b956c700d4b1c13b3f08f043ac95daf0
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/df-mode/df-mode-20050509-r1.ebuild b/app-emacs/df-mode/df-mode-20050509-r1.ebuild
new file mode 100644
index 000000000000..28fa3a259f40
--- /dev/null
+++ b/app-emacs/df-mode/df-mode-20050509-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Minor mode to show space left on devices in the mode line"
+HOMEPAGE="https://web.archive.org/web/20061001221337/http://www.coli.uni-saarland.de/~fouvry/software.html
+	https://www.emacswiki.org/emacs/DfMode"
+# taken from http://www.coli.uni-saarland.de/~fouvry/files/df-mode.el.gz
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/df-mode/df-mode-20050509.ebuild b/app-emacs/df-mode/df-mode-20050509.ebuild
deleted file mode 100644
index c46eb76c2460..000000000000
--- a/app-emacs/df-mode/df-mode-20050509.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Minor mode to show space left on devices in the mode line"
-HOMEPAGE="https://web.archive.org/web/20061001221337/http://www.coli.uni-saarland.de/~fouvry/software.html
-	https://www.emacswiki.org/emacs/DfMode"
-# taken from http://www.coli.uni-saarland.de/~fouvry/files/df-mode.el.gz
-SRC_URI="mirror://gentoo/${P}.el.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/distel/Manifest b/app-emacs/distel/Manifest
index 6a5501baa73d..4b371dbec85d 100644
--- a/app-emacs/distel/Manifest
+++ b/app-emacs/distel/Manifest
@@ -1,4 +1,6 @@
 AUX 50distel-gentoo.el 197 BLAKE2B 4c58633362840f228ff45786c2ded8811504def269f978d79f853bf556c2c673b8235203ed72b2119cf27f252fb603643562e26cb3ca7c75a4550461b9b95267 SHA512 1ed45f84dde596713c8f14b0eed011d9e2f073196f55cf355f3ad8c4b540aac94d7d4a1780a0020719b74f4eb3a610094ab5ed4e1ad142604937fbdaf50d2b6b
 DIST distel-4.0.6.tar.gz 210257 BLAKE2B 615682bfc2b773a78ad85d4817135144dda787d1db57b2743ea2fca8ed672fc1e37f6bc23803c9cc2b6096e7376d318cd7c25c3133f7b9c1326dbd451273841b SHA512 510f82b6794379d89020d234462e09251e0db285ebc111eaf096e32a4e3619384650cb2b47ed68d38762a496504b58981c73ca5b930bd0eb1407aee9599c149f
+DIST distel-4.1.1.tar.gz 214189 BLAKE2B 0a24039c11d603814ca352ccc09e776b2431ab1172c195a528aba6ecd85eeb15d9739bb37fcc850fd33e2af928eb9d2c7bc8a1721b46f79792ec658f58d41a4e SHA512 3ef73a650775f25f8e77c78cfaec3d2277a4e097128819d118ba566ac477455a1764383959f1d8eca33f8dedfa937eab605dfff899d344b9b03262c2abc7ac44
 EBUILD distel-4.0.6.ebuild 922 BLAKE2B 3c604aae95aa29fd62f69d57750217fae6dd8a41636bf0d8affca05c79abc9fa0e670be9f30336c2291a0db4259995b19652efd456c083fab08e95f560fa5b45 SHA512 013f6fcbaa8baae4e291fa1649d238351e166ad727a4545f06be15fea7603b670356cdacc72df4e3448f132fa99035a6981f1518833077317f59825cadc42fef
+EBUILD distel-4.1.1.ebuild 999 BLAKE2B 2fee3823eb1b9bf499ccc206408c0249575d58ec7c9ceb1ee61504b8ff4eb2791997141de6bf5b4e25b061ee295da9cf9a928c2562cc82bba6b01d2382aafa8e SHA512 20552ce41a15c393d7291373ac45a8643093f569ec39d7abb0ac76baccc8a9509a9a92c02a33a832c5f579043d498775b1e6c9ace7fd91697073635e6b33de58
 MISC metadata.xml 390 BLAKE2B 995ade09d45f16251665ffd7198d296959276bcc01ae085ecaba280022e47dbb3b9f6ebbbfcdd6d5038ef7dfe7779894a25fbc32feb5953c297e20f4321f6d7b SHA512 3652b1dc7101e291fbe1a9f4a1a54fb5692ce0e345fbd1164b6c32ae57e32af90dea1b22a648e7083d7b18f4730c6338da34e9cf3688a2e9ccee134f2dcda26c
diff --git a/app-emacs/distel/distel-4.1.1.ebuild b/app-emacs/distel/distel-4.1.1.ebuild
new file mode 100644
index 000000000000..bfe7b568b6c5
--- /dev/null
+++ b/app-emacs/distel/distel-4.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Distributed Emacs Lisp for Erlang"
+HOMEPAGE="https://massemanet.github.io/distel/
+	https://www.emacswiki.org/emacs/DistributedEmacsLisp"
+SRC_URI="https://github.com/massemanet/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+# "New BSD License" according to https://code.google.com/p/distel/
+# "MIT" according to https://github.com/massemanet/distel
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/erlang-11.2.5[emacs]"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake base info
+	cd elisp || die
+	elisp-compile *.el
+}
+
+src_install() {
+	emake prefix="${ED}"/usr \
+		ELISP_DIR="${ED}${SITELISP}/${PN}" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	doinfo doc/distel.info
+	dodoc AUTHORS ChangeLog NEWS README*
+	use doc && dodoc doc/gorrie02distel.pdf
+	docinto html
+	dodoc doc/distel/*.html
+}
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 27aaf0c16008..55e58e10ac24 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -2,5 +2,5 @@ AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f92
 DIST ebuild-mode-1.46.tar.xz 34928 BLAKE2B ee2686f3862fc7aa5f820311a6e45d62b153426134422c56a2a6222795163f454291da5510e86c52edee1b22b7bec641ceb132147b29243ee647774a8e91342b SHA512 e7a81c9a3692db1c6db41e138b382e3027094529d4ad3244ecde5a245340f911f8a63ce8ce8bbd7910116c704bcf8fcce90142b8863ecc1b543760ef1411833e
 DIST ebuild-mode-1.47.tar.xz 34812 BLAKE2B abbc3be110239f9e1765d4f1293856a7fc616d497ac5256a28b7d78fc57c8d725abccbf7b9e5908cb85f9a684dc1be26ab88152d836c2ec3a481802091729717 SHA512 13ee756ef914a314f6705df78735a3926a50d156f4abeff917bed68298aec81f072d53a60f7b985d9bb2caddcdbf65fd26f6c9189e6c5c1822674d9142b7db17
 EBUILD ebuild-mode-1.46.ebuild 737 BLAKE2B 18addf37cb9fb79decaccc0608f8e6d89ddd0fb50bddb902fd4bcf50d49803fd767ea7c1c2b3fa3f7d784b9497f243878d90439161f46e89d27db99c03caf660 SHA512 8babf31bdfc3c9efd68d333803d2d5d2edfa9a1d3e68dbdb114d5df917395186588a7b0cf02e523d2b87efd421bfdb3ab382655e2f74746777d131384a1c3780
-EBUILD ebuild-mode-1.47.ebuild 746 BLAKE2B 2fb9810ae3f03695f8f46627e5f837a6278f06e796a73af2490a329e9372390542f868fbd42686d5d309057dcc1fba5469c48d1379c1485414481e1889ed3e98 SHA512 53a478631570cd375ffa1554c9e13b9611850307922ee09b010510b15453d015e9b2b879fe78735f7366638b0341841f486e7f2a48218b561a9ccb6a28474aa4
+EBUILD ebuild-mode-1.47.ebuild 736 BLAKE2B 75dc00c3beb75c965d25a279b48589b34b9723e129e95adcfcf79368f49624a633f3ebd592e421ab8c9495d296939091151ff49d75dca9e5b19dbf120f617b6e SHA512 b6b9543141d5b0955a52227670a57a5ee13a93954515b099d64d586f01599cf5766792dade5c8c669bc92c318d80daf75b914f050c2aa5b4b51833758a4eeffb
 MISC metadata.xml 426 BLAKE2B d0b4dc2bd01fc6fb2f0c58b01676b80d09a4677876adc9681c3c436ebc437b6b034187b19fea30cf980927fec1f6a9feee9a0b7d1a4dd15818d02e4c8ec77af6 SHA512 058df2768030185953c7ac3622819c430681eae3ca60b0d02ad48ed22ab6a0ac7c169d93f8f54a3dddcade3f84c9bf58f662a58bfd78217ea8fc27a580ab9077
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild
index 7ff7faf0a815..62f2cf76c60d 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/elscreen/Manifest b/app-emacs/elscreen/Manifest
index 94ac8de60f15..0289b73ff7ab 100644
--- a/app-emacs/elscreen/Manifest
+++ b/app-emacs/elscreen/Manifest
@@ -1,6 +1,9 @@
+AUX 50elscreen-gentoo-20180321.el 82 BLAKE2B 6f7d7f574bc931161a8baac7c4bd43165703c1b4102755950aaffabb2c09d42be3ce546c0c546ffc43a04f5c946f69e43f92d4d3137befb5a299c2542a331029 SHA512 cd303735ee0a8f293e0d0d5e3e7dafd01d398d6eb6cd8871d99e6727f4d3c06711572ef9a199055f639c2a44c1f8833fafde37f2c71ca92bffc4f7e2454ab2fd
 AUX 50elscreen-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 AUX elscreen-1.4.6-emacs-24.patch 5925 BLAKE2B 1c1b7868093a56aadf4e8b2794d767b07de9123dc2be71f4af063d0ab100ca06a187186c3f685024b44b97a69cdab06732dbda3cf1201e5808e5f531d4b4aa07 SHA512 581f5c2c30fa4ae5a8a2266c40842076126a365f947ceaae32299ac680e74a7ca33b077130ff566c12008c79ba4da504160290da72d33ffab5a4d0b40e46557e
 AUX elscreen-1.4.6-void-variable-argi.patch 2789 BLAKE2B 173a2c94528d93660009e0b73e58cedf9343e415f789219350d41fb7b90fc12d7ee7774f6b5b9a97277d54a34e04b4ac4ff93a413018ca0dc872202ad376e6d2 SHA512 254c76e291848caf19983bc896b5a405b9d52dacb871ba5e9009d77968d5249c2445606fb2507f0d0f67859a955aabf4c717dae2acf94f52daa999237fd27333
 DIST elscreen-1.4.6.tar.gz 21680 BLAKE2B a23b7eb617e67205e816cb5c6588f65d8140788ab9c32b90b9c1f53dc4497e6f8250f3c51c38aa40780872f3d878a34aaf2fb455c61640d327df6e3166a59dc7 SHA512 2f19941c9c3e74bbe3912e99f53710f42d33a5b063af99c3907c478d2f571a50a75942519bfcad3bf178585f736bb6e2baf2cdffe8ac66b8e4dbd1b0d881fab2
+DIST elscreen-20180321.tar.gz 36840 BLAKE2B 7157a2040cb3d1bb60eb5c4f672dde35b5f1437a83a0af32138d252cfe44bf8a23013f5672182ece7f2dda5bfbe266247188d59408005d8963837d0958c100d3 SHA512 777835daf328aeddfd8999c37553bf5f57683292cea4f2fdca774e16d7a137ad26e791515000e8092c2ba5e4c2d0aeb03b260e4a2069c4f8a091b014d69ff201
 EBUILD elscreen-1.4.6-r1.ebuild 905 BLAKE2B 729e11a757c23a3a863c8fcc8c1be4971793326e03abd0c1f914518cadbf5ad041b1ddb9f3c1eb3e8fde4088f880e28779998498417a3ef65ef2152a8cae356e SHA512 9a5f82f0fac66c21e48ed258768bf9ab76c1c01dca4a19227d20e5785e262fbdf3256949fc215e8314d84cfe25f2e02d6c1610c5960d93fab97f315f8c516485
-MISC metadata.xml 1086 BLAKE2B e9254ee3a2f72cd43136c84c0fe5765e91f2fc846bdf94943dc739b5123a936df8b9e6d1210835da5f6dc55db70f7f8858c6a548e684954be63a4cd5c2fa9dd6 SHA512 87bf0cf357b0573f74ef28b6910de612b01f009070277c8ff386e0956913c04683819b8df22a3d4aecbd48f014d2741cd4b852235e3539752465648c754d7f55
+EBUILD elscreen-20180321.ebuild 758 BLAKE2B 113ae19fb9dbb206653fd9bc2cda596d5d1773edda797a0f43cf3958ed5556bd0a6b46f89e5fa779eb946db48068235548b49fb5c70eb1ddc088e4ac7686ba82 SHA512 d62ef569842c5b25d9dbbccce89eb719ac768f73932b88f85e26e109d904e19703c3ec8ffd307b20110a0ff78f5e20e83f22aa8ed309e4acaab9334fc150954a
+MISC metadata.xml 1188 BLAKE2B bbd91c8e116ead86174542013b33e6e83d1a464d96191e76619ec31e6c325390bb8516e70c4f81d4e73a98149be619b466ec62aa61178692c1de57b110699017 SHA512 736c8159defd57e17f46623187edb72f03fad76723062a4de6714d45fb1568838109754e735fd691ee9cfcfcb70c1223d641e112f6fcda74e5b84133cb4bdc08
diff --git a/app-emacs/elscreen/elscreen-20180321.ebuild b/app-emacs/elscreen/elscreen-20180321.ebuild
new file mode 100644
index 000000000000..f954068810f1
--- /dev/null
+++ b/app-emacs/elscreen/elscreen-20180321.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Frame configuration management for GNU Emacs modelled after GNU Screen"
+HOMEPAGE="https://www.emacswiki.org/emacs/EmacsLispScreen
+	https://github.com/knu/elscreen"
+SRC_URI="https://github.com/knu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="wanderlust"
+
+RDEPEND="wanderlust? ( app-emacs/wanderlust )"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo-${PV}.el"
+ELISP_REMOVE="elscreen-dnd.el"	# does not compile
+DOCS="Readme.md GF-README GF-QuickStart"
+
+src_prepare() {
+	elisp_src_prepare
+	use wanderlust || rm elscreen-wl.el || die
+}
diff --git a/app-emacs/elscreen/files/50elscreen-gentoo-20180321.el b/app-emacs/elscreen/files/50elscreen-gentoo-20180321.el
new file mode 100644
index 000000000000..4e9093e829fc
--- /dev/null
+++ b/app-emacs/elscreen/files/50elscreen-gentoo-20180321.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'elscreen-start "elscreen" nil t)
diff --git a/app-emacs/elscreen/metadata.xml b/app-emacs/elscreen/metadata.xml
index 71b064d851b0..71a0a92588f1 100644
--- a/app-emacs/elscreen/metadata.xml
+++ b/app-emacs/elscreen/metadata.xml
@@ -13,11 +13,15 @@
   etc. These applications likely consist of two or more windows, so when you
   switch among applications, you may want to save or restore how windows are
   located (this is called as "window-configuration"). For this purpose, Emacs
-  has two functions, window-configuratin-to-register and jump-to-register, but
-  these are too primitive to use on a daily basis.
+  has two functions, window-configuration-to-register and jump-to-register,
+  but these are too primitive to use on a daily basis.
 
   ElScreen provides the ease-to-use environment to save or restore several
   window-configurations.
 </longdescription>
 <stabilize-allarches/>
+<use>
+  <flag name="wanderlust">Include support for <pkg>app-emacs/wanderlust</pkg>
+  </flag>
+</use>
 </pkgmetadata>
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index af04281d42ed..84acac06b8bd 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,3 +1,4 @@
 DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
-EBUILD emacs-common-gentoo-1.6-r2.ebuild 2888 BLAKE2B 7f7037a5712a7b3b1943e457b86c01a53db206f17e918b15d1c8d7dff361b9fac86d3c7eade82eeccc3ae582a73a6a941d7691f999a734938c95b44644e500bc SHA512 7e6de29ed815b67ce99bd3c8f30fbc57ee75bbd38b5c3698e8396a593fbb1d6c07cc4decad4fd71f5c4da1921759d79432c1b80e459337549a2bdd358e0b9bcb
+EBUILD emacs-common-gentoo-1.6-r1.ebuild 2878 BLAKE2B aafb8c7842b9075d08dd037ed2e3fd59699bf0110d380f10a2c8adf4dba2aea3008b5670b3bd9ee8f33dca4ca1f88a4e081df292e4eb9c0578b9a51cb9b0c84b SHA512 d9b0cb62a397af1ee382aff2c9344891f9632b9eafd54f56c7f34c29b4712b0ae4006420798e6022e4ffa9658aa2874c1f43a824a3eba5ddc0e1f056af730fce
+EBUILD emacs-common-gentoo-1.6-r3.ebuild 2849 BLAKE2B 0f526443ee423c4e77c5b07da987c84da4303a449a3e955b680fb9faeb61b3c8dd158ccb1cf9c32d97d5e430f70a5141288a73d11a0e103e2c0733b9b8c1a9b9 SHA512 641b456b2f238d69dc6542b400488201c10d08a2b6fdd2e28408c93a325bff325bca1099c74b79ece849640e3f6681010b66c986cc74e0649526b50a882eb150
 MISC metadata.xml 360 BLAKE2B e7e420afb7a8377bffcf2a23f3954bbf4cc80fcd19a8514733e2e0164f4235271e21dc860bf77cb9cfcd1a4026ef3dafe97a10dc397e2d8e6f001f02bf6e9bc7 SHA512 d57f8f097617229f774b06437aaa83595aab2a6d9321d51b97dac8bd56fa94db396c7bdca538570f0912390e25ae8643c5adc374908757f67f1422fa1f872605
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
new file mode 100644
index 000000000000..84eab96b484e
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp-common desktop xdg-utils gnome2-utils readme.gentoo-r1 user
+
+DESCRIPTION="Common files needed by all GNU Emacs versions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+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"
+IUSE="games X"
+
+PDEPEND="virtual/emacs"
+
+pkg_setup() {
+	use games && enewgroup gamestat 36
+}
+
+src_install() {
+	insinto "${SITELISP}"
+	doins subdirs.el
+	newins site-gentoo.el{,.orig}
+
+	keepdir /etc/emacs
+	insinto /etc/emacs
+	doins site-start.el
+
+	if use games; then
+		keepdir /var/games/emacs
+		fowners 0:gamestat /var/games/emacs
+		fperms g+w /var/games/emacs
+	fi
+
+	if use X; then
+		local i
+		domenu emacs.desktop emacsclient.desktop || die
+
+		pushd icons || die
+		newicon sink.png emacs-sink.png
+		newicon emacs25_48.png emacs.png
+		for i in 16 24 32 48 128; do
+			[[ ${i} -le 48 ]] && newicon -s ${i} emacs22_${i}.png emacs22.png
+			newicon -s ${i} emacs23_${i}.png emacs23.png
+			newicon -s ${i} emacs25_${i}.png emacs.png
+		done
+		doicon -s scalable emacs23.svg
+		newicon -s scalable emacs25.svg emacs.svg
+		popd
+
+		gnome2_icon_savelist
+	fi
+
+	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
+		added to ${SITELISP}/site-gentoo.el. In order for this site
+		initialisation to be loaded for all users automatically, a default
+		site startup file /etc/emacs/site-start.el is installed. You are
+		responsible for maintenance of this file.
+		\n\nAlternatively, individual users can add the following command:
+		\n\n(require 'site-gentoo)
+		\n\nto their ~/.emacs initialisation files, or, for greater
+		flexibility, users may load single package-specific initialisation
+		files from the ${SITELISP}/site-gentoo.d/ directory."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# make sure that site-gentoo.el exists since site-start.el requires it
+	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
+		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
+	fi
+	if [[ -d ${EROOT}${SITELISP} ]]; then
+		elisp-site-regen
+		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
+	fi
+
+	if use games; then
+		local f
+		for f in /var/games/emacs/{snake,tetris}-scores; do
+			if [[ -e ${EROOT}${f} ]]; then
+				cp "${EROOT}${f}" "${ED}${f}" || die
+			fi
+			touch "${ED}${f}" || die
+			chgrp gamestat "${ED}${f}" || die
+			chmod g+w "${ED}${f}" || die
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use X; then
+		xdg_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	if use X; then
+		xdg_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r2.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r2.ebuild
deleted file mode 100644
index 5e48e30334cd..000000000000
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp-common desktop xdg-utils gnome2-utils readme.gentoo-r1
-
-DESCRIPTION="Common files needed by all GNU Emacs versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="games X"
-
-RDEPEND="games? ( acct-group/gamestat )"
-DEPEND="${RDEPEND}"
-PDEPEND="virtual/emacs"
-
-src_install() {
-	insinto "${SITELISP}"
-	doins subdirs.el
-	newins site-gentoo.el{,.orig}
-
-	keepdir /etc/emacs
-	insinto /etc/emacs
-	doins site-start.el
-
-	if use games; then
-		keepdir /var/games/emacs
-		fowners 0:gamestat /var/games/emacs
-		fperms g+w /var/games/emacs
-	fi
-
-	if use X; then
-		local i
-		domenu emacs.desktop emacsclient.desktop || die
-
-		pushd icons || die
-		newicon sink.png emacs-sink.png
-		newicon emacs25_48.png emacs.png
-		for i in 16 24 32 48 128; do
-			[[ ${i} -le 48 ]] && newicon -s ${i} emacs22_${i}.png emacs22.png
-			newicon -s ${i} emacs23_${i}.png emacs23.png
-			newicon -s ${i} emacs25_${i}.png emacs.png
-		done
-		doicon -s scalable emacs23.svg
-		newicon -s scalable emacs25.svg emacs.svg
-		popd
-
-		gnome2_icon_savelist
-	fi
-
-	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
-		added to ${SITELISP}/site-gentoo.el. In order for this site
-		initialisation to be loaded for all users automatically, a default
-		site startup file /etc/emacs/site-start.el is installed. You are
-		responsible for maintenance of this file.
-		\n\nAlternatively, individual users can add the following command:
-		\n\n(require 'site-gentoo)
-		\n\nto their ~/.emacs initialisation files, or, for greater
-		flexibility, users may load single package-specific initialisation
-		files from the ${SITELISP}/site-gentoo.d/ directory."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# make sure that site-gentoo.el exists since site-start.el requires it
-	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
-		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
-	fi
-	if [[ -d ${EROOT}${SITELISP} ]]; then
-		elisp-site-regen
-		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
-	fi
-
-	if use games; then
-		local f
-		for f in /var/games/emacs/{snake,tetris}-scores; do
-			if [[ -e ${EROOT}${f} ]]; then
-				cp "${EROOT}${f}" "${ED}${f}" || die
-			fi
-			touch "${ED}${f}" || die
-			chgrp gamestat "${ED}${f}" || die
-			chmod g+w "${ED}${f}" || die
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use X; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	if use X; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
new file mode 100644
index 000000000000..b6a09310a9f4
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common desktop xdg-utils readme.gentoo-r1
+
+DESCRIPTION="Common files needed by all GNU Emacs versions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="games X"
+
+RDEPEND="games? ( acct-group/gamestat )"
+DEPEND="${RDEPEND}"
+PDEPEND="virtual/emacs"
+
+src_install() {
+	insinto "${SITELISP}"
+	doins subdirs.el
+	newins site-gentoo.el{,.orig}
+
+	keepdir /etc/emacs
+	insinto /etc/emacs
+	doins site-start.el
+
+	if use games; then
+		keepdir /var/games/emacs
+		fowners 0:gamestat /var/games/emacs
+		fperms g+w /var/games/emacs
+	fi
+
+	if use X; then
+		local i
+		domenu emacs.desktop emacsclient.desktop || die
+
+		pushd icons || die
+		newicon sink.png emacs-sink.png
+		newicon emacs25_48.png emacs.png
+		for i in 16 24 32 48 128; do
+			[[ ${i} -le 48 ]] && newicon -s ${i} emacs22_${i}.png emacs22.png
+			newicon -s ${i} emacs23_${i}.png emacs23.png
+			newicon -s ${i} emacs25_${i}.png emacs.png
+		done
+		doicon -s scalable emacs23.svg
+		newicon -s scalable emacs25.svg emacs.svg
+		popd
+	fi
+
+	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
+		added to ${SITELISP}/site-gentoo.el. In order for this site
+		initialisation to be loaded for all users automatically, a default
+		site startup file /etc/emacs/site-start.el is installed. You are
+		responsible for maintenance of this file.
+		\n\nAlternatively, individual users can add the following command:
+		\n\n(require 'site-gentoo)
+		\n\nto their ~/.emacs initialisation files, or, for greater
+		flexibility, users may load single package-specific initialisation
+		files from the ${SITELISP}/site-gentoo.d/ directory."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# make sure that site-gentoo.el exists since site-start.el requires it
+	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
+		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
+	fi
+	if [[ -d ${EROOT}${SITELISP} ]]; then
+		elisp-site-regen
+		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
+	fi
+
+	if use games; then
+		local f
+		for f in /var/games/emacs/{snake,tetris}-scores; do
+			if [[ -e ${EROOT}${f} ]]; then
+				cp "${EROOT}${f}" "${ED}${f}" || die
+			fi
+			touch "${ED}${f}" || die
+			chgrp gamestat "${ED}${f}" || die
+			chmod g+w "${ED}${f}" || die
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use X; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	if use X; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index 9575f4958cb4..8c6252a50fe3 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -1,5 +1,7 @@
 AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58ac6e3f7cc44c68a16d49c9156cf37285778a38bf97a1f4805a22d6d5cf9d597acdcdedfd77c62a5825a0d1d88f SHA512 200da398adf72241112bcda74b432a8a313cf29018c9f6fbdf6021674b23a201ada6ba884d4c9c3a4ee4c042d6c8fc7c3ba59702c8ddb6ea20b652f9ded9d32f
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
+DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
 EBUILD eselect-mode-1.4.14.ebuild 569 BLAKE2B d7e4dd474ca2ba2703d8a84939f79da3cfed9b942a8e44f4a26f742ce0b54cc6473ccff07172df91d528132e404ffc14adb5478402d6f4bc0ceff8919690926b SHA512 1a684d4e547c7da81bd62f723cd03053295119f664543f50ef8edcd69c8ad6717aaf616868d0ab56dc9a6b639822d17d56517b8279b7f1a2dd879ab94ce97b81
+EBUILD eselect-mode-1.4.15.ebuild 582 BLAKE2B 721100792af38d09632673239f1956a15af5bc0b2aba872e024bf7c454b7882dde3d8eebf5ab2a1e3a11bc7be6611d1611efd8fac795c2bf015553875d0697d3 SHA512 957edb82115c3985d6a8cfa6eb6f5260f0ad84ac12075122d305372dd4b408f9046668ecf7107a72bd49f346320213b134a468b490026abe75b257df8cdfda0f
 EBUILD eselect-mode-9999.ebuild 458 BLAKE2B 0a5b748fc09dbfe532ec9b40adbbb939bd5150ecac9ee610ad0dc5b37e7b6ccdcb8c183337d6f0ce04ee5bfad4f1ede0c13cc4dc55c828474b07265fd91ffba3 SHA512 5d11532145273d6956274ce05d732352593a20daa1d86f900b1fa9927aa536131e5ec922996f4e3939803253e5649f6c2a3ec9a81dabd6dac0475422cf0a4ceb
 MISC metadata.xml 449 BLAKE2B 711e97a9feb5a464b81a738024f1f8b1ea4dcf2dab78f1e814fcb30569df5a3192cc6e72308687bffd9f7c806f3ce37ef62856f86737d3e8aa4334f721a2fd7b SHA512 38b645859453423cb80be836dc712364d5650f07f071c44d07ad7f5f629b8efd0d26535ebf61e8c38281e8426109ef5828015e01b3377486ab28f942163d155b
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild
new file mode 100644
index 000000000000..b342275247a8
--- /dev/null
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+MY_P="eselect-${PV}"
+DESCRIPTION="Emacs major mode for editing eselect files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${MY_P}/misc"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/flim/Manifest b/app-emacs/flim/Manifest
index 3b857c685d4b..c45b69ee9b87 100644
--- a/app-emacs/flim/Manifest
+++ b/app-emacs/flim/Manifest
@@ -3,5 +3,5 @@ AUX flim-1.14.9-mel-q-ccl.patch 1362 BLAKE2B 4883dfdb3ede7b93ec41cd02fe1da397a82
 DIST flim-1.14.9.tar.gz 182065 BLAKE2B e15779e93a422bc2c2b82ab5969f2b3d30a31d47b96769abf89bfe7e9aebf74e5f0f0e87270bcc187bdaf3e1af4bdd663c7d6661f1adc9575af0e4ba1dd316f1 SHA512 a272a30f27cea24f537b9bf3a6dbb25113deff0ab8e1c03bd802e4d32d673d567d282297ed9e4d35217f069699a1fc25bfdde09778171a188dfa46f49e9bb7dd
 DIST flim-1.14.9_p20190526.tar.gz 173261 BLAKE2B f28b0d1474d894fd93d9899fe66bc88d6669cc6bdbb2511dcd0b2f13c05abbe42ad4cc06e2de34664204f3ddbb3cb4f09e232394419892b3fd8e71c1ab3aab75 SHA512 8991c460bf9eb411e89edb8fb05088cc09dc354e4c14d7accba26d922b2d1041742e96d8a64407ee8dd2574984c5b3a8fbd66e828c8f8fadc55f8da6428d634e
 EBUILD flim-1.14.9-r2.ebuild 969 BLAKE2B 97aa74a6ad442c1d762001782ac19a5438dc06a4cdf06718a598aefe2e134851f97fe0cc844c84904bcb336edf2016e04d9691051f4832b0eb2b97b621ac1dce SHA512 fb65778615d632680803699f358cc8c66f422638e87308ec9a387f280a6594eec500d7ef77eb3679bdfc68511eb427e7273707ebbd714965927f82a05d07c1a7
-EBUILD flim-1.14.9_p20190526.ebuild 1021 BLAKE2B dc6713790abe82a20e31bef7a9a63d165dce2b8fac87cec0e7f2d50e1af0eba08299a26b9094f3eeb256b728e0192a60bd340a59096f95fa56c51ce9da81f6a7 SHA512 ddca7988aa99f6a7db4f84ac0f05a0218625c8aa08810b788e4c27bd5f9ae329b7aba1ba7948bf0976849889b8507f72a4ec172ef8bc064e00601a50e75512b8
+EBUILD flim-1.14.9_p20190526.ebuild 1051 BLAKE2B 841d8342cc1a13f301ce91c5b1d00d10746946270b9ce52ab04a1716038a22ddfc0b7e875f5efe9e87c5f5b385b0bf93668122d12da89fdcb0c8bf39954899c0 SHA512 c7cc71091c9f28a7386fe5688e183894d72616a2da3ced26a1024399478bd413c219542e3a516c6b0de71e2e4dbc6832134a21bd5b71513df506d8a2285a4864
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/flim/flim-1.14.9_p20190526.ebuild b/app-emacs/flim/flim-1.14.9_p20190526.ebuild
index d37cb72db079..4e621f14165b 100644
--- a/app-emacs/flim/flim-1.14.9_p20190526.ebuild
+++ b/app-emacs/flim/flim-1.14.9_p20190526.ebuild
@@ -8,11 +8,11 @@ inherit elisp
 DESCRIPTION="A library to provide basic features about message representation or encoding"
 HOMEPAGE="https://github.com/wanderlust/flim"
 GITHUB_SHA1="e4bd54fd7d335215b54f7ef27ed974c8cd68d472"
-SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/wanderlust/flim/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 
 DEPEND=">=app-emacs/apel-10.8"
 RDEPEND="${DEPEND}
diff --git a/app-emacs/google-c-style/Manifest b/app-emacs/google-c-style/Manifest
index 77b9b1507d88..415d0a318113 100644
--- a/app-emacs/google-c-style/Manifest
+++ b/app-emacs/google-c-style/Manifest
@@ -1,4 +1,6 @@
 AUX 50google-c-style-gentoo.el 258 BLAKE2B 7ec733ac75a1d1570d11f3b978e0f55c3641b6e1ded4792afe54c3757453424fa0f76724f13bd060d5a63be7f37442649669043a8b7ed326c6b46cd58db1572b SHA512 f39b91a6af6e16ac70a5baee459790efb00aa10c3a83c16429fa5d97201bec2bfb3f6645ab1327f7325eb3428a3c938914b4a63c6009109dda99a4f0fe7d89c2
 DIST google-c-style-20091009.tar.bz2 2178 BLAKE2B 72d7b430f9148589e8b4b1a57c9b4b96203c7ffddae3bbbc7aa9978e85c2c51510571f8617ac5d2bcaabe5688ed7799d5de597e96a2479d844a49e6661f93a05 SHA512 5d61d6e021643ffc1468c14cdbbde0b52dc9346330983c19bdb7f4d6fb8960c662ca6198658963ff6d2b4d7d2dc96853a8c58de48da77364a860f2f777855b5a
-EBUILD google-c-style-20091009-r1.ebuild 602 BLAKE2B 5e9cbb6e0f5df7a7aaf1695b28a20ce0ecfac59fbe8a2357f2534a848ab720500c2ac3de410adcf9eda084a914b5da3fdf86fbfdddd02162c020cab232ff7615 SHA512 454136b3a79e9b4cd21a51b8771daa4efeab80b13c1fc09c8d372b864c96e10b26bcdcbe21e48b934689f69b263ba8cb8d758a8b32ac8f41a25ddc3c5c5621a3
+DIST google-c-style-20140929.el.gz 2147 BLAKE2B c1e151e0aacac5fa39b4a293ab2663d9e784c15bb020ca4f46f09ea4736f84d7e33050632c6620d65cd45b5a631d2b08f5864096435bf9d58b321460e6a20518 SHA512 ad8682e06a2a607e4c7baa9177a03796afcbedc251281a53657fa44f718fee0416e6d60bdc9e0339ac95a0bac05389de0dd0616a6bb4577ff7b02e00c80d1df5
+EBUILD google-c-style-20091009-r1.ebuild 588 BLAKE2B 3d751da28f4dde2b94840cec08cf527f30a50c5a20d1fac805f6df2fb72018a0de7bb64460243d433bb944b98baf41424d9e5eb98c2560a902cf02e9cb9cef77 SHA512 e25c5a9e81b4a461cbf89c5de972024ba73fdd72ed4eb11740861f7f2281197e9905a886a8d748c82d0c8d0e54b2a85e90fa31a107471e3fa69f9cc02ee5dfa8
+EBUILD google-c-style-20140929.ebuild 577 BLAKE2B ac92eb6045770f507ca5c20aa0c5b7116d7a595efe812f10aebbb4231753ca7b817fb55459129aa2e22104e326f1831d950c3344d6cd8f9bef9abb97b048ddc0 SHA512 e708bf367966841f070dc3ba7f5478bfa88b5a484b23a2e12b4aa42cdf3db74c8b70ff4cc77f392938f35637121bcd6324816adde3cdbd58cbd03a11d7a6e0eb
 MISC metadata.xml 483 BLAKE2B 5321c357a3c496a72254753a00ca9e11ad6fdc420b2ab01990348c3d232d744d433ed01e5fc3de3aa6017dd805b057d3b2004d500db6fe1e38d69053c0d73179 SHA512 0f0c374e0ced07f64bf529899a190e7c4d1dadac58ef44355021fe00eeda190e2f270951242e8b1cc0b405328f2c251272da4713557600391e0ee82a35f689cb
diff --git a/app-emacs/google-c-style/google-c-style-20091009-r1.ebuild b/app-emacs/google-c-style/google-c-style-20091009-r1.ebuild
index c7353765122e..a99bcc7f98f6 100644
--- a/app-emacs/google-c-style/google-c-style-20091009-r1.ebuild
+++ b/app-emacs/google-c-style/google-c-style-20091009-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -9,7 +9,7 @@ DESCRIPTION="Provides the google C/C++ coding style"
 HOMEPAGE="https://github.com/google/styleguide"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/app-emacs/google-c-style/google-c-style-20140929.ebuild b/app-emacs/google-c-style/google-c-style-20140929.ebuild
new file mode 100644
index 000000000000..74ea088e1ecf
--- /dev/null
+++ b/app-emacs/google-c-style/google-c-style-20140929.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Provides the google C/C++ coding style"
+HOMEPAGE="https://github.com/google/styleguide"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.gz"
+
+LICENSE="|| ( GPL-1+ Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="Example usage (~/.emacs):
+	\n\t(add-hook 'c-mode-common-hook 'google-set-c-style)
+	\n\t(add-hook 'c-mode-common-hook 'google-make-newline-indent)"
diff --git a/app-emacs/htmlize/Manifest b/app-emacs/htmlize/Manifest
index a00f4bba574f..addbdd60db0f 100644
--- a/app-emacs/htmlize/Manifest
+++ b/app-emacs/htmlize/Manifest
@@ -1,6 +1,6 @@
 AUX 50htmlize-gentoo.el 543 BLAKE2B 65ee2f1bd7aeb315827301a74582d9c04ceacf898a5cdd9a72f6783bcc2e4d1f97d681f67daeea24fa3489ae7a4db02875161c20a88330edaaa828a0c37b3bb5 SHA512 7bc9bc6cd113ec9090223b6bf3f373b25da1e4330039be37186904360a515ea102b51c2c6567e9e3fed7f78c4c29a0f80642e35878a2af61e83772b8a5bad99e
-DIST htmlize-1.43.el.bz2 21018 BLAKE2B ff07571bda31c3733e3a5ef703625ea485721080d13ad28f7e2be3f7470cae7f00ebf7f7a899a7351942643c5f3b854f01918b9fd3175b8f7ba0ae9237665d42 SHA512 cdef3f8478862e9743cad23697775111fbd64737daa6e0525923cff1ccc8dfd20ad554e5e92ec99281d87acf9ecd358474761858c8c6639c5459234bf79d4be9
 DIST htmlize-1.47.el.xz 21544 BLAKE2B c00222fa39bbd530fae89b6a71cc515dd37cce4d787267eca9d23eddd9f3054b932df8908712971c46c28fc89921a42ac613e826d73094b333aa977335077f54 SHA512 2cca746f696d382336a800d3f15e6a5812afa7c6965d6695c501085ed6c8f447da8ee6ed31a27c240e9d70f7c30b91292ac60c0c903a7ca0d52f2a4bfedbf06f
-EBUILD htmlize-1.43.ebuild 399 BLAKE2B e5b22c1cd35481e4cd89200d42adcccd1ff6ab751e40927161b9095f938d9674b2646cfe6359153f97c4155e39f477785169e0b4442489a37934a663d3d6081e SHA512 f46ebc4c02904c46990d99fe860c7189dde0df5c74807d547809b7ef0207bfa1c152ec4c4701df7747f3bab0e6fbc5dd455b8aa8ec66cb39701f3f361266f33e
+DIST htmlize-1.54.tar.gz 51401 BLAKE2B 8c00c1482fa1dff852d0e0c51d0c6a337878418dd84fdf1c2522d937a4e2181766e23302936bb1e9f774b883ad3df4295897a1aaabfaea802457aa096a0ab337 SHA512 ddd256162760fc1e6e08eaf4cd44ec987bf2c49ef61d23798923ba0bd241a16aab02cab77ca7524169796453d44951257acd9bda58c055be80d9612bbfff10f7
 EBUILD htmlize-1.47.ebuild 412 BLAKE2B e6ba52cf40a4941a1efa543d5d94bfc2fb521fbff3dfcf9086a89949c772634c44d566f8c4808badfa58c273a06107d6308f4bfd27ee6be7458186a0eed5d60f SHA512 0255f5a8d6b4d03f8ee3c502e59b719baf3842ceae9510254a2f533a8f08616d4a5e4d2ce747a3b567ad42864652e09f7f2504cf8d77d389e93caff3ad60019a
+EBUILD htmlize-1.54.ebuild 526 BLAKE2B 0e4e855712141cdc41122f4539fc0d6e9fd465277e14f59244633619d0391fbc662cfd504c0ac32eb310061461af6932b8f0dae05b1d267e524257fed86e8fe7 SHA512 fc6007ac202ee7b9a007e70c57efa66feb27099adfc3ccc9e01f6cf95e9ef5b23b9ffb1b08992035c0edb7114136bc3d2f6f7afbb4df7ff99a1d716b53d19fd1
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/htmlize/htmlize-1.43.ebuild b/app-emacs/htmlize/htmlize-1.43.ebuild
deleted file mode 100644
index e614aa73039a..000000000000
--- a/app-emacs/htmlize/htmlize-1.43.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="HTML-ize font-lock buffers in Emacs"
-HOMEPAGE="https://www.emacswiki.org/emacs/Htmlize
-	http://fly.srk.fer.hr/~hniksic/emacs/"
-SRC_URI="mirror://gentoo/${P}.el.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/htmlize/htmlize-1.54.ebuild b/app-emacs/htmlize/htmlize-1.54.ebuild
new file mode 100644
index 000000000000..98ded842db43
--- /dev/null
+++ b/app-emacs/htmlize/htmlize-1.54.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+MY_PN="emacs-${PN}"
+DESCRIPTION="HTML-ize font-lock buffers in Emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/Htmlize
+	https://github.com/hniksic/emacs-htmlize"
+SRC_URI="https://github.com/hniksic/${MY_PN}/archive/release/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${MY_PN}-release-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md NEWS"
diff --git a/app-emacs/ledger-mode/Manifest b/app-emacs/ledger-mode/Manifest
index c6cfc82acb73..d7cf6a4406b8 100644
--- a/app-emacs/ledger-mode/Manifest
+++ b/app-emacs/ledger-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50ledger-mode-gentoo.el 364 BLAKE2B 5972883970743cfc2d2732b0a50ba96bfa7e82000f26e6b3bfcdc81cf7e999ac8d2687cc2e1cb416e1863d91be1fab0bb2446ed851d9c26773908858f795d6a3 SHA512 45b4e233dd4f821828c56daf3c5e7d044a0850825e9a4f32ce639de274e1e5cf23407cec337a607b1e373347de77444b851cdc17983d779fb113419c05446ce2
 DIST ledger-mode-3.1.1.tar.gz 55876 BLAKE2B 49dce2a58c278d3bca6ceba353766296609595609ce0976c8efdc6f17836ace4a0cc8676ab2de9522cafc036e97b2eaafe6fede1dd4d795201a676a2a519c761 SHA512 0d79e15f5a91eb361662761a3cc0a2d556584f3310e270b8a4db5648fea06022f74970faa5716e3726da902922eceabf4c8c5d281d02be66e8d785a4d7044d71
-EBUILD ledger-mode-3.1.1.ebuild 547 BLAKE2B 73708e3ba029db55272653390f00ded60bbfdeb8340033798a0612ed2e3e3dbad2f1bf4445d3af69cf134b3941abe2eba93b7a1cd21080fc4f91530b9e7f8f75 SHA512 fc0c6598800f42f2c8625bcc6db85640ca47ca37645acb780f6807ebe5bef51731bdc20720b8064fd7b0f93b3fbde13b96cd8c456683280f1855166c848f03b9
+EBUILD ledger-mode-3.1.1.ebuild 545 BLAKE2B fde286fefdc51565f44c3d65d4ec5b4518e2b6225274f4b1adf1e03de148b5d91a000bca49da8684c3102ac2215071aa74ba565b6d69fc8775f65ff470c8f1cd SHA512 daaa28419116512582c5e5e4422990d32feac83117f098c27cdf740e296b2136935b6a556547484d1b0c7aea5d868ed7ba4b92d5afd8eb5f89b1a88d12b4d72c
 MISC metadata.xml 363 BLAKE2B 10d170578cc809b95267779ebee32b798cd93d79436298db85abc9ad748feed0320a6d71ad452f375f34b77ab1d70fe4e65559e588f70e1a33d0fd1a7b4405b8 SHA512 3f39a02e7859d601c91ec7fb9239062ca81b52a3e3b39d2e5788209273c2c869bd504af58451b515e2abd09ad72230b2879648aa8ab56dea07f99d88485ffb58
diff --git a/app-emacs/ledger-mode/ledger-mode-3.1.1.ebuild b/app-emacs/ledger-mode/ledger-mode-3.1.1.ebuild
index 1ae2ba672dc1..6453a3601379 100644
--- a/app-emacs/ledger-mode/ledger-mode-3.1.1.ebuild
+++ b/app-emacs/ledger-mode/ledger-mode-3.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ledger/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="doc/ledger-mode.texi"
diff --git a/app-emacs/lookup/Manifest b/app-emacs/lookup/Manifest
index d157df7cfd89..5c2152ad0656 100644
--- a/app-emacs/lookup/Manifest
+++ b/app-emacs/lookup/Manifest
@@ -1,5 +1,7 @@
 AUX 50lookup-gentoo.el 155 BLAKE2B b6b3c5a64fc880aa261a632d8f14f8bc6cd1e94b9d0f03ede917fc4eb88a6203d71a0d71a92c4ce51080adf54f7740397038378f631ad1a7dc6dab126f1b8189 SHA512 021e3bd99a25974788966d840cf5ce9359447c1aa331b9ef517aef23c4dc79581539bfd61a5f35f92551a4c189a64867fbf173212d28172e379da3532c1a9694
 AUX lookup-1.4.1-garbage-char.patch 283 BLAKE2B f69000bc367024bb71d14e5d687b4159f810779a524712870e3f25ebbb1db8711b7d94495659e0faee46bf640a7d2707a921f07a181155d542d8d9fc1f67dc55 SHA512 7e338e2184454579f2e5675e9b969805bd8954fa51fa55a42b62a58094f1f9a1760f1430cb61916bdfd999428f06705f555b6325c993edad7b119e7083325e11
 DIST lookup-1.4.1.tar.gz 346391 BLAKE2B 4de52e0bf444e4822408db580f1aacbeb8a42ea1492eda2c7678f1838615da00a370b1d12efdf0ff1fef4e81302426245e0c2411f42bf17667966c90f8b39cbb SHA512 a28a770ba58f07db5a7b2452792fc0e83b74e3b45556e84a9729c73773df661dbb7d356c1f7be803feb66f23e154aa825dab610f841bbe655bc76bd7120370bf
+DIST lookup-1.99.96_pre20180209.tar.gz 220833 BLAKE2B 2555b28919991356fe2e655d8058b7a23257bab413ee542fb6a3c5f719e22c1dce1bd08f144f0c71c6590438deeae5b8798fbf9c29edbffe21ddafc499b420a8 SHA512 2292a2d4e61a5fc8d17ca8afb02e172691babd47f296c2b2ff5e284c27a805608fc4b5c63dec07a0387bb52ee4fbd736d7b2d4320d74efc4c210ed156873e8c0
 EBUILD lookup-1.4.1.ebuild 720 BLAKE2B 713e5e5ac686f549a819c1b596e750ea632e81f1b2bf0ae7bccbed89f5c3c02c933111ae6a08db4eba69ea52b75cf907bf37244e3c383004a72fd53bf09e0f1b SHA512 b03163a1cc77f9e926d04e9260748e64f17aa434d011aa13f1c88123064feba5cb922edc8b06e7a15c2411a5bbeaf0d530c41c56f106ad6237243c61f5e80173
+EBUILD lookup-1.99.96_pre20180209.ebuild 801 BLAKE2B 880fec441ccec3be6776650dd991438df5cb07432337c5850029bcfa9c40009cd044cad1504da46616ffcb8162dc5bc76c7263b2067aaf8caf0b81ea12a6002d SHA512 cf41d9846d81122fb5d3a58a41f1cca3a915b8794c3cfc9cc4d834587185726ed189ebd46c53c670b897b6bbfe4b3d5e15088c795efe70fadbaa50c697d14dd9
 MISC metadata.xml 375 BLAKE2B 022df13d1d586579ed08af80b893ce2a1a9d1275720ec5d447efca002dd05a5544eaa6c1f01a5d6df2c0e7cf594eacf6a0c1fb840989674f8af537e1468ec6ee SHA512 24ea62246bc2d2c433dd071cf9906fe2f0c9dd834ba4d5bfadbbefcb9d47a063cd07da9c6756043c296c2ae56da39f18714416dab862d5f36fbd2f6100dc663b
diff --git a/app-emacs/lookup/lookup-1.99.96_pre20180209.ebuild b/app-emacs/lookup/lookup-1.99.96_pre20180209.ebuild
new file mode 100644
index 000000000000..83eb373c097b
--- /dev/null
+++ b/app-emacs/lookup/lookup-1.99.96_pre20180209.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp
+
+COMMIT="c4f4986aac6c339e03b9e56a5dfc7c8f5c0bb5e0"
+DESCRIPTION="An interface to search CD-ROM books and network dictionaries"
+HOMEPAGE="https://lookup2.github.io/lookup2/"
+SRC_URI="https://github.com/lookup2/lookup2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-apps/texinfo"
+
+S="${WORKDIR}/lookup2-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-lispdir="${EPREFIX}${SITELISP}"
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc AUTHORS NEWS README.md
+}
diff --git a/app-emacs/mew/Manifest b/app-emacs/mew/Manifest
index 94a5bf645c3a..68d9b853b68e 100644
--- a/app-emacs/mew/Manifest
+++ b/app-emacs/mew/Manifest
@@ -1,6 +1,6 @@
 AUX 50mew-gentoo.el 195 BLAKE2B cca28ee1ad51b86b1fea56490f93365aead98f123df2f778a1f2ef2207745c551a5ac9eb10386208a8ffafbd5f3498a9ef27aa5eb0bb5d4ffcc6e4bd3c854ca6 SHA512 2bd1f98dbedcbd4529f63bad9ac6093e4e783afb95270f672b30e9a50f8d0f3fbc7527ae975d35b9650ac6fa8b3ea32352985e8757adb5d9f064449623459eeb
-DIST mew-6.5.tar.gz 1026322 BLAKE2B 16fa19eb19ce4b49ea1b33db13c46a8b6c79cdc602e6bc295d1ab3310db772dc2a73c6c218ce6358baba943e6572a803103e8bc56d3eaeb67dd29666e482f3f5 SHA512 481c55915e57889e7b8c6d27c3d21802b624a886eb8f6541c2997db4d5328e16c3b5a8c9a9ce09637b1779b8c52af86a8662ee30dfbab0a411a586d4679ac69e
 DIST mew-6.6.tar.gz 989941 BLAKE2B 7ec4e502865e13108cc51dc74ffa246dd1084ae369979c05b9c1fc326c01f716766b7aa445ac489fe7c34cbc610e130738fa7578ab338d496970f6e59847c295 SHA512 55a91faaba09a28dfe7da33d34a8c3638540db71a3572ce01646976fbdd0ac3e327475ccc2908876ee6f516c6ee60082a27413b210c4591ef12cc4f878a07472
-EBUILD mew-6.5.ebuild 978 BLAKE2B 9bc36170e0da4cbe8391be66fc0b6e5247bb98b43e9f40c1c5f306fa37283c996de02af4544c9a8fbb3230ad322168824943b8970d1774a714f32fc39e8bbb20 SHA512 66aed50ab39771fca6272f6faf87acfb83a39f51d777f1935b619148d590c40ceb1748a94bf577c5a8137d06887d8204e2294b1c3179d1791b20e2092e4c8fab
+DIST mew-6.8.tar.gz 991876 BLAKE2B 6055c30ac7f9286a2792fd3fb5fc53412ffed091594e64fa802cd4346fbd7ce542a930e3b38552dc39fa728898a68e1d71f0626f38ef8f815515af95fae0197d SHA512 e4713a4485fa31a95820100465728998b6d5b4822e2a522293754ab269fbfa625756417a55eccf400994a4cc6f6230b8142463ffe416917f321da5053abdb98c
 EBUILD mew-6.6.ebuild 983 BLAKE2B c0a7b1a2442cc25d8e23f26cd50de0eedad8fb879c5582cc2cc1ff68e74d8c4dd28817f86afaef2f67066f7e391ee5974a193d925bc7a0d14cfa6cddee5a6b67 SHA512 3b92dd4956bb82d8d59451b010b1e28b6e9c27e965c2a8ecdff5d9eedd77a215cc1c5d08159cb808bf14c1ba8c8d8b84a903c942256226d34066dee9e5c11073
+EBUILD mew-6.8.ebuild 1002 BLAKE2B d7c478298ebfe30709bf7ea0bb93da522b1d779d2a60b8866512a6a5cb40e8d496bd81edd09bf9b4c01fc7aca2485fdef2f46925d95f05ccd146c9768a2c0c9b SHA512 704df5d49bc392707ec5ab911720c93a491b2590f54501f47857b8f73662905ecb99581427381e9dab5b7a7a0917bbb24d9168013f64c958574659a5347e736d
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/mew/mew-6.5.ebuild b/app-emacs/mew/mew-6.5.ebuild
deleted file mode 100644
index 40d3f282f443..000000000000
--- a/app-emacs/mew/mew-6.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Great MIME mail reader for Emacs/XEmacs"
-HOMEPAGE="http://www.mew.org/"
-SRC_URI="http://www.mew.org/Release/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ssl l10n_ja"
-RESTRICT="test"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}
-	ssl? ( net-misc/stunnel )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	econf \
-		--with-elispdir="${SITELISP}/${PN}" \
-		--with-etcdir="${SITEETC}/${PN}"
-}
-
-src_compile() {
-	emake
-	use l10n_ja && emake jinfo
-	rm -f info/*~				# remove spurious backup files
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use l10n_ja && emake DESTDIR="${D}" install-jinfo
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	dodoc 00api 00changes* 00diff 00readme dot.*
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "Please refer to /usr/share/doc/${PF} for sample configuration files."
-}
diff --git a/app-emacs/mew/mew-6.8.ebuild b/app-emacs/mew/mew-6.8.ebuild
new file mode 100644
index 000000000000..765ba677f2b4
--- /dev/null
+++ b/app-emacs/mew/mew-6.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Great MIME mail reader for Emacs/XEmacs"
+HOMEPAGE="https://www.mew.org/"
+SRC_URI="https://www.mew.org/Release/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ssl l10n_ja"
+RESTRICT="test"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}
+	ssl? ( net-misc/stunnel )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+	econf \
+		--with-elispdir="${SITELISP}/${PN}" \
+		--with-etcdir="${SITEETC}/${PN}"
+}
+
+src_compile() {
+	emake
+	use l10n_ja && emake jinfo
+	rm -f info/*~				# remove spurious backup files
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use l10n_ja && emake DESTDIR="${D}" install-jinfo
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc 00api 00changes* 00diff 00readme dot.*
+
+	DOC_CONTENTS="Please refer to /usr/share/doc/${PF} for sample
+		configuration files."
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/mldonkey/Manifest b/app-emacs/mldonkey/Manifest
index 04b76c7dfb10..55734ccacecb 100644
--- a/app-emacs/mldonkey/Manifest
+++ b/app-emacs/mldonkey/Manifest
@@ -3,4 +3,5 @@ AUX mldonkey-0.0.4b-emacs-26.patch 387 BLAKE2B aa881c515f8c1d5125af2bd237e94ba20
 AUX mldonkey-0.0.4b-vd.patch 3511 BLAKE2B 00e05b1d18183fd8be439e7987b9dabdfb0c3e419b5497842c7598e534ae3e867943244a17991ce573dc0b3d86ab2844bba7cc09738d0ead137199a2bdfeb3fc SHA512 18ae6a4925b54b5d40ad9342fa65596df47e48a7223ca1a89c8622ab324f805d55c9bfaeea71c8465fd276997a34d979ff16532b8d8d86c4748fedf9ed02381b
 DIST mldonkey-el-0.0.4b.tar.gz 17442 BLAKE2B d9057a00c3b3532162564f59afb838a41b83b17adeb569d86c13cef8a6338083f12d078a19d0568936d9116e0c9adf0b53db3933116dc46925ac095c1a529d89 SHA512 3c6a16292968e0f40d319614bfd2a53c9612ec4121c5720f51498d8983f6b944c38fc1d664f1c7ebe1d68653ba62d828fa00092b1a1d278547c225b33f4e740b
 EBUILD mldonkey-0.0.4b-r1.ebuild 926 BLAKE2B 442018577f992d42349d97f58dffeb5749229011602e6117ef3001a211b076409705e9c503bf2cf485eda552e90110f41cf3a472673e20adb31e52b20fdb99e9 SHA512 9a85aadc2beeeceebc925cb14683331528d728758873d73aa04e180af93e4f469a0a74b55c230af13411d6e1a816e3effaac65e37e46b2487731f176cdebee83
+EBUILD mldonkey-0.0.4b-r2.ebuild 879 BLAKE2B 36f8e3cead9de9acccfc67a654b24015e3b428a98260bd02ce3dcc4f1118a84b7eccdf070560f6074f0df495152f63f88d4fc73c40634d883134801b455ffa56 SHA512 755765111da47d49951804248e8813d0220e76354281832587e6e9fe4405c646a0e4b6289b3cfc21e9418dd72c4a5f979ec6169b6370da6608125dbc885ea8e1
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/mldonkey/mldonkey-0.0.4b-r2.ebuild b/app-emacs/mldonkey/mldonkey-0.0.4b-r2.ebuild
new file mode 100644
index 000000000000..b5714cc69480
--- /dev/null
+++ b/app-emacs/mldonkey/mldonkey-0.0.4b-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+MY_P="${PN}-el-${PV}"
+DESCRIPTION="An Emacs Lisp interface to the MLDonkey core"
+HOMEPAGE="https://www.emacswiki.org/emacs/MlDonkey
+	http://web.archive.org/web/20070107165326/www.physik.fu-berlin.de/~dhansen/mldonkey/"
+SRC_URI="http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+ELISP_PATCHES="${P}-vd.patch ${P}-emacs-26.patch"
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="If your network gets really slow when you use mldonkey,
+	consider reducing the max number of connections. See bug #50510.
+	\n\nRemember to install net-p2p/mldonkey separately if you want to
+	work with a local instance."
+
+src_compile() {
+	elisp-compile ml*.el
+}
diff --git a/app-emacs/mmm-mode/Manifest b/app-emacs/mmm-mode/Manifest
index f0e9ddc65d52..072ec612f986 100644
--- a/app-emacs/mmm-mode/Manifest
+++ b/app-emacs/mmm-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50mmm-mode-gentoo.el 58 BLAKE2B 0114bc73a9125264dd76189479ec708455f88c2d50765154c64f7bd5ad386889b055b280a1dae5fe661962f27caabb06a8b6a0fc709fce83abfe9c21be6fd8da SHA512 4cbf0da7bcadcdb30947fdb789542daef059112c894be4ad418321cf526f7789e86f612c92bc5c11504ae2538f0e73650589663b3f87421543f0047932c6126f
 DIST mmm-mode-0.5.4.tar.gz 174680 BLAKE2B fbe69ffe291d7144ddaa22d161545350893285e2594f9343d6b4e3b6c929a83209c8dbdf5f270b179c98c7fd1ab88d2c5f68066e6aca0ef5e8533335c4c194e9 SHA512 71828769f40ca56d87c581481fc6531466de30155af3f22eb96ee176cd9dae354ed95a6c37d79e47a033bb79c67335e0f50dac2fb57f262bbe0ef43266af2b6e
+DIST mmm-mode-0.5.7.tar.gz 176034 BLAKE2B 23fed0f260c9f46134d83d29e96b96ff331aa0fbe8d121663b74de944489d1a51948f6fba729129e47a34e1ef48cfb0f8bbc45f6ab8f548001bbe0e88a61aeca SHA512 3afb77b3351c8ea5844cd57bb873e6ebe91ce1e268d0d585581482f5039c64ea80fc7aa620e45330eca0eb7839223764164ccc09e932b54f23f3f37c9953cb39
 EBUILD mmm-mode-0.5.4.ebuild 590 BLAKE2B ad5eb39888db88049f25b124eac984cc989393db979ab9ea2f8623f8743151119ffb7b762c901d8bfba4b0dfe683c0058ffae64c1cb08b603b5b8fc893e50332 SHA512 181a5e26bf067446f5be999f4b42f8c2edbfd249e0cacd31f7586a2b401c27fc392f5c4d06ca4bff95c2594f5e998d9212ca3a44d1ac9e7835ce42eb6706d818
+EBUILD mmm-mode-0.5.7.ebuild 581 BLAKE2B 962a19ab381f8e8b0b6b147e7d89ddbadd8987f0a3bf65ee5cb5b498cc58ec480c0bc3dcf9ffd3b551572fe0f2a1b856485b6053c9c19b62a77def58076fdbba SHA512 be5b0830cbc6b85463a605171a0d3110c1563e7fb2c3709769664e5a7d6e92824629c0f6702708a16c8394fbb15e14e2d1175d8d2d9d094d69a24dfea623714e
 MISC metadata.xml 414 BLAKE2B f62c75a172d2da325b4f7b0e41e0bc2d7f128e96493b46cd6bc5232915418a506c0d2e2dec88c2b2ac3eace003b4dfdafdeb3da147230c3675a5c3413ee4714f SHA512 ef3005e7c7016dae433d8612bbcf154c928f264ee3203784f2d3756c89c66545cbb3dd29349048b47fb07a1764677068d758d900b4f77fd825c11d5ae82dbd1b
diff --git a/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild b/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild
new file mode 100644
index 000000000000..74ec2b53ffae
--- /dev/null
+++ b/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Enables the user to edit different parts of a file in different major modes"
+HOMEPAGE="http://mmm-mode.sourceforge.net/"
+SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+BDEPEND="sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="mmm.texinfo"
+DOCS="AUTHORS FAQ NEWS README README.Mason TODO"
diff --git a/app-emacs/muse/Manifest b/app-emacs/muse/Manifest
index c341a6a05b40..90f2edb2ce16 100644
--- a/app-emacs/muse/Manifest
+++ b/app-emacs/muse/Manifest
@@ -1,4 +1,4 @@
 AUX 50muse-gentoo.el 64 BLAKE2B 1af4c3cb29edfe7f0263b2eefb1483c2f680a4199c1ec27ae7b4db26f7923d86418b3b3a87fdfae90edff728fa20cf628075a320985bde0a132d1bc864e2ad49 SHA512 c4b1049b70cd62c2490621d123227e5cc62d80c8a2fa3575d69443ec09e5fbb6294b1f3b3dda530139d9318610bc3c806f3984ae697e246778aab5aad0bbc632
 DIST muse-3.20.tar.gz 411316 BLAKE2B a67c72a470e7e2d75cf94ed262b0e9503166326666a119f41968a603b4e48f3527705691a1b4b819ae6ec69c382a09074eef74ddad598faa08be6c74793b1e97 SHA512 23cd0e864586f907418753bc3284afde51b4f8559c5d043c52baa70de70ec4a845d9e8362b93e701308dbbd662e3429035df8ad440916e61d5909498cd55f7be
-EBUILD muse-3.20.ebuild 798 BLAKE2B c1e1bfa6ee31439f39693a20edd4e6ae3fce0ecbde857fdbfae4972f5eaa85bfbf390e8e69cf01a5e88218e10139ce276101a466d41db738aa569273932892d4 SHA512 73f3d55410e94b60f40be8ddf8ce9e64e19534e26f67326bfa06d88bfae7d624026e56d1167484da5a70741ff8656f3c74fcc96b1e34c92eb4705a2c7e310856
+EBUILD muse-3.20.ebuild 772 BLAKE2B 33041b5eae18b5ae332c2371d741f1103d75c5663a517a2002e6eaec2d4916e3fa4ec9c945d722c50358eeec9f674e31b50c575dbff9dba712be3e764e10ab6d SHA512 e2eb889fc80ee956b1aa278d1c9060700f2dd91774804edaf406f4054df5f6fac351b82016e7c0e4ada486ef2717c2620bb2ff6f950a88dd258a05ecd6141379
 MISC metadata.xml 1573 BLAKE2B df1f66340b61bf97f534274155310fabbfaa2ae8b4cf64f1bd1cba27b38ca4bc1d9f7a5ea4e6c9c74e02ba333a81638c97a8cd0cf540a3433182cfce02f26b5a SHA512 e61095db5b26acf2fdd0143cffe5146a4d1755ce3a2a5fb27041d94b0f76d09c1423af83b3d65caae3ac784f6155c8ee0bcde05e3c6f3a02e677aeeda5435aea
diff --git a/app-emacs/muse/muse-3.20.ebuild b/app-emacs/muse/muse-3.20.ebuild
index 0b93b90bc77b..24997d6aa576 100644
--- a/app-emacs/muse/muse-3.20.ebuild
+++ b/app-emacs/muse/muse-3.20.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit elisp
 
 DESCRIPTION="An authoring and publishing environment for Emacs"
-HOMEPAGE="http://mwolson.org/projects/EmacsMuse.html"
+HOMEPAGE="https://www.gnu.org/software/emacs-muse/"
 SRC_URI="http://download.gna.org/muse-el/${P}.tar.gz"
 
-LICENSE="GPL-3 FDL-1.2 GPL-2 MIT"
+LICENSE="GPL-3+ FDL-1.2+ GPL-2 MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="test"
+#IUSE="test"
 RESTRICT="test"					#426546
 
-DEPEND="test? ( app-emacs/htmlize )"
-RDEPEND=""
+#DEPEND="test? ( app-emacs/htmlize )"
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -25,8 +24,8 @@ src_compile() {
 }
 
 src_install() {
-	elisp-install ${PN} lisp/*.el lisp/*.elc || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-install ${PN} lisp/*.el lisp/*.elc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	doinfo texi/muse.info
 	dodoc AUTHORS NEWS README ChangeLog*
 	insinto /usr/share/doc/${PF}
diff --git a/app-emacs/nagios-mode/Manifest b/app-emacs/nagios-mode/Manifest
index 76c83e44d996..6eaa587b5cd1 100644
--- a/app-emacs/nagios-mode/Manifest
+++ b/app-emacs/nagios-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50nagios-mode-gentoo.el 195 BLAKE2B 9462de25d1de1f9c0d972841339dac53458b6534bfe76b744312b4f0af8063fcdf11fe3d404c49bdf4ede28550d0390b6e3ff1d7068c9bc8f30d4454f117bbc5 SHA512 07e3dfbf4b4142b6b6bbf4138c76b9252f94b9cc1c25f2eaeb9cfddf2294995ffd5fbf40b6bdc032320f94dc93e8463cb270ef841ee11424939dcf5889a54fe1
 DIST nagios-mode-0.3.tar.gz 7917 BLAKE2B 17f69dd9736b5a3f94a69ef2af7827503d2ee87f97346e5ead44563d1e056457bb425f0145b58246dafebbb0fd346857e5fe9aa11a616c8e6608722013a73500 SHA512 e9ff6e0684ee0f9f1919ec9dd4c8e0dfa7faab347f56724f7fe69bc366cf8d81f98c4c4245ddde95bbf9a2b9f72fec80a100c22b6b0b9e3c28c999515d0b6a50
-EBUILD nagios-mode-0.3.ebuild 453 BLAKE2B 20c8e87cf76c917447bdffc285a714a93730c5cc4d59ed9375c9b49aaaa02336e4ce8c3e714063527e3500ab3dcae5f5bfd0ae9859baef9bf1da353a34331bbb SHA512 39ff8f5ee30350407cf6d03bfcdb8adda2baeff902ecbf5e4fafc81724b0f2499d6238f691102e360225dbe77e0d7dd376be5105a8503f3a64b9f1da88119eab
+EBUILD nagios-mode-0.3-r1.ebuild 443 BLAKE2B 3455952b7b891118d1114699bec2e02a5924aecf87e9bd0a87d03f38303a2885b629098a9848b551d958759110155769123ac302a14380c97cb642d8afea6532 SHA512 2985915962259010645477aed1a46b3a6a85122eabd73eadee8b9d8d673ed822c95e1f9085a55eb8794c774b9d5e7c0ea51d95b8f2bd9d82e0ee61c3885dfa5d
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/nagios-mode/nagios-mode-0.3-r1.ebuild b/app-emacs/nagios-mode/nagios-mode-0.3-r1.ebuild
new file mode 100644
index 000000000000..4993e417bc3a
--- /dev/null
+++ b/app-emacs/nagios-mode/nagios-mode-0.3-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Major mode for editing Nagios configuration files"
+HOMEPAGE="http://michael.orlitzky.com/code/nagios-mode.php"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog README test_suite.cfg"
diff --git a/app-emacs/nagios-mode/nagios-mode-0.3.ebuild b/app-emacs/nagios-mode/nagios-mode-0.3.ebuild
deleted file mode 100644
index d8df07e7fb29..000000000000
--- a/app-emacs/nagios-mode/nagios-mode-0.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Major mode for editing Nagios configuration files"
-HOMEPAGE="http://michael.orlitzky.com/code/nagios-mode.php"
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-SITEFILE="50${PN}-gentoo.el"
-DOCS="ChangeLog README test_suite.cfg"
diff --git a/app-emacs/nxml-docbook5-schemas/Manifest b/app-emacs/nxml-docbook5-schemas/Manifest
index bdc84e38682c..6702754190d2 100644
--- a/app-emacs/nxml-docbook5-schemas/Manifest
+++ b/app-emacs/nxml-docbook5-schemas/Manifest
@@ -1,5 +1,7 @@
 AUX 60nxml-docbook5-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
 AUX schemas.xml 198 BLAKE2B 723ce69dc7b0e63267b0e7b93965ad238b9a919f088aa5dd7611a84c7ebe0a053ae5d8e33ddd6dbf6584f6a9a5406cdf2c727c00907dbd8d5da344405c47bfe2 SHA512 1f41a1e907ae92637845803cdc0c569ad444c9c03a0ba5d9c3f909d42e41353a84f20ca50dbf4f49c0f96836af5c0d5ff0b1f034dbb9b8a45f6083a3ae955ada
-DIST docbookxi.rnc 292523 BLAKE2B 13ae2f3756485845e2fc6dca87bce5eb12c419c84b6edaab5051b075700387c32904f54286756c5fed2480c17af00e385845105a94b13ced9fe13ba959e22224 SHA512 13309beb2dbf76168889a962782d3dd1849fb254ebf1941ffd4fcfc272353ba0ddece509a9b74250462b3e1eff12f31fc408aa790e0efea01d527482b3fa3a48
-EBUILD nxml-docbook5-schemas-20080922.ebuild 586 BLAKE2B 107ad2114cb166c515237fd07c48700a3a69a0149d03a299fab73691f2b64b2994ed00cb69ea9b4e9ec3bee02aeb84a5e59b958436e713ec47f876d050ccb1c0 SHA512 2f17befae09d09e81e9a2b98d86a9d5bf479d6f5de74e8bbedace24f1c974917b1a1b7af2ff17c6b2619023dae8087010912c492d7893a37d2ce9974269a0579
+DIST docbookxi-5.0.rnc 292523 BLAKE2B 13ae2f3756485845e2fc6dca87bce5eb12c419c84b6edaab5051b075700387c32904f54286756c5fed2480c17af00e385845105a94b13ced9fe13ba959e22224 SHA512 13309beb2dbf76168889a962782d3dd1849fb254ebf1941ffd4fcfc272353ba0ddece509a9b74250462b3e1eff12f31fc408aa790e0efea01d527482b3fa3a48
+DIST docbookxi-5.1.rnc 361312 BLAKE2B 374c622718b0c9969561a76874fe878570af4fd2a1288f79c8b51c1474ac75e7e98cddd2be7bedadf8271aefccd770cf70ac4499d45187b327c0a50e402b1a48 SHA512 28191653224a301a3ce7541ca1fcc5d526b76fcce00533adbdc16507ddaa768efedebe31b0fade6b8ea7b28d3d33e9656363dfc667eab227280bf6061673a31c
+EBUILD nxml-docbook5-schemas-5.0.ebuild 630 BLAKE2B a78cad9375dc90fd0b8d404a6f72831c65d73a2c528d97763a2ca7c769e48f940dc5dbfa263427f6a9049dc49f22a3e87389272942acd55b50a742b34166a413 SHA512 1abe4eda77aa0c594c32270ed609cdd5bd2f3f06f1d32050bdca393df4f34e4d7f943d37fc07a54721165fac85c187e078fd0d3a7da83103dcb2e9bb0844ab2d
+EBUILD nxml-docbook5-schemas-5.1.ebuild 632 BLAKE2B a542a05df2a47f1c9191bcabc5d027cfaec566f6f34076ee65dd98f74b2095054bdfc133211b9559af8298054613672f7058c4c1498d71be1e8ef998a39af8f1 SHA512 24c67ca4505c8cee94d2c265192cbef6dee9c764086e5e25f456b2a1d36878d3dd00263f744398d400858d8ba661dbee679776a91818f8091591feb447630bf4
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-20080922.ebuild b/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-20080922.ebuild
deleted file mode 100644
index c136f7675203..000000000000
--- a/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-20080922.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Add support for DocBook 5 schemas to NXML"
-HOMEPAGE="http://www.docbook.org/schemas/5x.html"
-SRC_URI="http://www.docbook.org/xml/5.0/rng/docbookxi.rnc"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-S="${WORKDIR}"
-SITEFILE="60${PN}-gentoo.el"
-
-src_unpack() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto ${SITEETC}/${PN}
-	doins "${FILESDIR}"/schemas.xml "${DISTDIR}"/docbookxi.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.0.ebuild b/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.0.ebuild
new file mode 100644
index 000000000000..946c21d0a832
--- /dev/null
+++ b/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Add support for DocBook 5 schemas to NXML"
+HOMEPAGE="https://docbook.org/schemas/5x.html"
+SRC_URI="https://docbook.org/xml/${PV}/rng/docbookxi.rnc -> docbookxi-${PV}.rnc"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+S="${WORKDIR}"
+SITEFILE="60${PN}-gentoo.el"
+
+src_unpack() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto ${SITEETC}/${PN}
+	doins "${FILESDIR}"/schemas.xml
+	newins "${DISTDIR}"/docbookxi-${PV}.rnc docbookxi.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.1.ebuild b/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.1.ebuild
new file mode 100644
index 000000000000..3cede296fe4d
--- /dev/null
+++ b/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Add support for DocBook 5 schemas to NXML"
+HOMEPAGE="https://docbook.org/schemas/5x.html"
+SRC_URI="https://docbook.org/xml/${PV}/rng/docbookxi.rnc -> docbookxi-${PV}.rnc"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"
+SITEFILE="60${PN}-gentoo.el"
+
+src_unpack() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto ${SITEETC}/${PN}
+	doins "${FILESDIR}"/schemas.xml
+	newins "${DISTDIR}"/docbookxi-${PV}.rnc docbookxi.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index c20b7d3aeee2..8bf73fb8a699 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -1,8 +1,6 @@
 AUX 60nxml-libvirt-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
 AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf204c43bbea5db01626847af7ab96854efcbcc34e7fe9b1c32873ad22ef13873a1a06790e9580371d SHA512 3544959cc57ce1b273e4b9de95f51e1e21d23cc35fb48e02f179a055a61ee9092efdc43405f72c3aacb3c74eada7fabf5952eb49e3ff0514fd69a3092268dc4f
 AUX schemas.xml 560 BLAKE2B 32f01d2dd047aa7109112b47155a21825686385845fae2af0f6d052dbd36f3e1ca5027ec39d654735e390ef9aa8a31f7ae5c86b15b0cd9c4ef84128326e87ee9 SHA512 82ef6189610fc4e1a0d5546ae15f2f315e7c0d460fa141201c43a93e59d147613c7186302fdc3e6b2f0ec5c343e5566966892d4e9f55dc4957e4ad58793fc3ff
-DIST libvirt-0.9.7.tar.gz 17853636 BLAKE2B d149fe4f095c76d003bdca1a307e588a9bd1b011b34119e90b8875837ced533caa2f05f2b9e7709d13f5af0a078fdc4779b7fc8a247f7ca04ad490b18fe728c5 SHA512 ac082f3872b37fc7aad891ba3f2a9614bdc85123b3d626fc7a2e43327a7ec346a0ec154c25161592a4337e3f694d9b27d031544190dec7d6086343f15fe9ba2d
 DIST libvirt-1.2.1.tar.gz 27228694 BLAKE2B 5552508f87bddbd8d2dd65a37298f7f7e7238a7ac5aeef878bd8b3c6d5ecab8f2cf6fb94c8d520312b6c6399f1e663f8d68febf2badd544020635df841f5488f SHA512 6184840623156ca01ee7f59078ebf031bc84c25b37bb110372c7bcf230a79b74e267475f989fb73db5e3c096dcc74f03cb30adfc5de022f756ed2cd6ab05bfd0
-EBUILD nxml-libvirt-schemas-0.9.7.ebuild 1293 BLAKE2B eb3c85bbd2f35c7d02a0d81f25aa5abc1c69b4c75ce6a40647d455c9f2ae19ef8be55a7ec50aac62964197d43f84be4148fa7c94438fda69a650050c7a786f78 SHA512 1cf461b494a820e22b870620dccab37ae225361ab6406b5d22c7b1c04a6291175ef52d081cdffc5146f5865e1b2342d8345e2bf4e36d9eb9e2bc06161627de55
 EBUILD nxml-libvirt-schemas-1.2.1.ebuild 1293 BLAKE2B 6dda0f1cfff26b8f85c21178ff5df4b6259ae982b6c4a2b5423d4bbc54410c2c118461aa56d4f9bdcdd34ff66ff5a772d2cf93bcca66f39ebe56bf65c21071b2 SHA512 265f6a389fc41b15d31fb257a77c7b7fe5e7796988b3aea592c5f2cf09fdcd321e151cd09ec2cbeb2403ddd86cf1029b0598264ff4fa0e764d58a73e813701a6
 MISC metadata.xml 389 BLAKE2B 5874fa7fb23c84408f3e1c975b11cfe88067da63a91d93447f26c682d868ad822e092a186a14cb17d3ca48f8543b64c86ea0086cc26d434e3b5d03e1bd0a5e26 SHA512 5def622fb849779446a7026e11f2f9216c70da203712c4611ac21b0c487adb050159a7775906da34184bed12e4d12033e730722d152670524b4c29bd422f9307
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild
deleted file mode 100644
index 9a8a326fa0db..000000000000
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-#BACKPORTS=
-
-inherit elisp eutils
-
-MY_P="libvirt-${PV/_rc/-rc}"
-
-DESCRIPTION="Extension for nxml-mode with libvirt schemas"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
-	${BACKPORTS:+mirror://gentoo/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
-
-# This is the license of the package, but the schema files are
-# provided without license, maybe it's bad.
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Yes this requires Java, but I'd rather not repackage this, if you
-# know something better in C, I'll be glad to use that.
-DEPEND="app-text/trang"
-RDEPEND=""
-
-SITEFILE="60${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P%-rc*}"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}/patches" ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		epatch
-	fi
-}
-
-src_compile() {
-	emake -C docs/schemas -f "${FILESDIR}/Makefile-trang"
-}
-
-src_test() {
-	# No we don't need tests here... trang will take care of checking
-	# the well-formedness of the schema files for us
-	:
-}
-
-src_install() {
-	insinto ${SITEETC}/${PN}
-	doins "${FILESDIR}/schemas.xml" docs/schemas/*.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/nxml-svg-schemas/Manifest b/app-emacs/nxml-svg-schemas/Manifest
index 1f056ece7e1e..c97188ba2ec9 100644
--- a/app-emacs/nxml-svg-schemas/Manifest
+++ b/app-emacs/nxml-svg-schemas/Manifest
@@ -3,5 +3,5 @@ AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf2
 AUX schemas.xml 495 BLAKE2B ecb678b98a23e0631da09f9befa73b2b41c5204f78423f9957eaabd6963c5e8b63114c0f908039618744e4aa4643603b58a9ded5fdbf157e0cc60b1810afce84 SHA512 d6a9f0b9db51e05b4f3d0395c8d43a0577d23fdb6c0e9d0123682f00d4ccac5897dfdbd157560b3bb9f06a8a768298489e8b8a2843d7e7a65ffb4a5e20c1b316
 DIST w3c-svg-rng-1.1.20081123.zip 48420 BLAKE2B a89da9708ea79085ad5aef1f85769683af2a5c8ab84a5a4f53b9c2fdeebf422a96065309d69eb4ac9bd069bcd3685ee849c7cdb4b9b9e7829ff58fb0b7b8b754 SHA512 69e44a7c04a3af77d0fed8f19372cfcad7998e262a44b520145fe2c0ad03bf20daf57e1e97f71ff27f0e06bd3f07d1ec0b0976fdd893d77df2f82709f7c1ce1f
 EBUILD nxml-svg-schemas-1.1.20081123-r1.ebuild 1184 BLAKE2B 309e2700423b5796056a83e92caf0146edc437fafcd586995b233710af862ba7b98789bf4e0d1f872f5466503729bdfa8a0b55efb3c83c88abbe3c9c7693e28e SHA512 ec30f4253cd4161af7db052bc77f0b1ebe1803747cbe83ffc1b5d2eda9042092dce315273c862d5c016f0de2cd8fe9858b0aa75ecec012c5425c582749ae7264
-EBUILD nxml-svg-schemas-1.1.20081123.ebuild 1161 BLAKE2B 3091c7f6fd45b238fe2fae9fc88bb2458b7b883748d2ea50d11d2930c127db57bad275c9b2e9d3e3230a85cfa88b0da14d2062a079f8dd7aaf13db7a7abd2b2c SHA512 c889a3c55acbbdc5909f1c960404bc431d0902f1bb515459547debbb5af7ef26262b8f46844eba63831ed72c2a1795bdb9d40b6917d7ef917a658915566594fa
+EBUILD nxml-svg-schemas-1.1.20081123.ebuild 1176 BLAKE2B ada7a527f213685649ad3507f4f2e6048e37e1a00e8acce8d8ada3658a11473049cdac1614670d4c0c29a7ea5ef52bad1af8cbb814fc7be15074dc20a94e350b SHA512 09781d45de2872b53ac1087dfbfef8eb4881c070caea3d301b8847a63bbc00eeb57569471684684c2d82baee9d95ada14e99c985dd86b606406cc4cd4d1a6098
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild b/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild
index 639661441bd5..5180d7bed52f 100644
--- a/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild
+++ b/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.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=4
@@ -20,7 +20,9 @@ KEYWORDS="amd64 ~x86"
 
 # Yes this requires Java, but I'd rather not repackage this, if you
 # know something better in C, I'll be glad to use that.
-DEPEND="app-text/trang"
+DEPEND="
+	app-arch/unzip
+	app-text/trang"
 RDEPEND=""
 
 S="${WORKDIR}"
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
index 6ffbbef189cd..53966bba597e 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -1,8 +1,6 @@
 AUX 50ocaml-mode-gentoo-3.12.1.el 499 BLAKE2B 30d49a4e43fbf4fac02f4a2dd8a9fe7c3aeea623836330e3ed0f8921cc96a02d087f35a32a93f6e404392a1f915539799d1a5c8168b06cb1d8ab76ea0ac6b8fa SHA512 0be69a30c07caeff818e4d6fb0147e18855e88a3bb6a6e876b170edddb32382c0bd19ca960836d8442eecd00e78be09cba7de08030420645c2ef1ba5d9198524
-AUX 50ocaml-mode-gentoo.el 501 BLAKE2B 68182139142156463bc5ee18db988deb8ca61e512970ba317c34cf76422f47ccf2f1b8837d954139a82c07f84546ea39ecbe14db9ba589ef2dd614a42df483fc SHA512 a8e665564f8b8394c677d7495ba1aac1e3f6cf1f3cd52c8ae1fdb37028fdaac8b021eeb17ce7c2e2e40dda0294888abf0e1078f821367c8a05715b5326dc73ec
 DIST ocaml-3.12.1.tar.bz2 2949124 BLAKE2B 8814927411cb9b604c78f44d172fd1f8b3d5f6009a1e722d442b8e49709778824cd6d1341e8129454d49000ea4d1234c533ee72cf0fa8fa84ee3b4d664177c4a SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7
 DIST ocaml-4.00.1.tar.bz2 2762205 BLAKE2B f9a788eef67158b036ee551360410921beab87f1b01684ca17d5cb87a30cc0cd475ca640fcb284ad88d9054927ae0fd397921574cc9098956d60e80915d4cbb4 SHA512 77899430706394af558666361b152d47df3a3e21831059875f8b317d0ff9d1a010177bf1e5851e522e086c20768e92c71344aa53eda0ce003f278752870ab5da
 EBUILD ocaml-mode-3.12.1-r1.ebuild 478 BLAKE2B 57435b46af18eb982cb38ed4fb156635c19edcd9f48c26498704c9a4b2fea05e0c61ebd4d84d94ce9e8b1977ea0753df56baa675a660ddc367d0008f241a6975 SHA512 7f455663560d3ed3b52564192e353f1dda06afbd4ffc99f99332c179ed62f602fa66ff0b07daf4ebdc248e44dba35867e7b10f78630efcdd4d02f1854934107a
-EBUILD ocaml-mode-3.12.1.ebuild 481 BLAKE2B b55dd0c58c9f1f6615032c95066fb7bdbf425067f9a71b1dcb6e353eed96d60a332820725041a1c5a0ac2b96335938c590c8e7f828ea990150d6c2e33ad1f0d2 SHA512 d31b7980be6f5240927a313ae43729a06a0b5a31470a41192c00dbeeb43e3190c33097832dc580fa62fe33c3aeef0603c07afe184945a069dc145a5137d0149b
 EBUILD ocaml-mode-4.00.1.ebuild 512 BLAKE2B 8624b8a5cd72bdca4c4b684b9aa10bb2d1b74d4b39b97c29acea1c25b60a5efce98bd8be0654625d40eddf38bf565b4f44092685f9f6ba1978ac4fc9cedee9a7 SHA512 f4d728f9a8702a0f577cec7f7868c58323116b749306a4d5edf1f0795715aac9a0cabc2436789243a5b8be641df3efb900581109b15d412c6d9ec5a1fbda014b
 MISC metadata.xml 388 BLAKE2B 3b0d21b61541c15e807ececd8bfeb3a91ceefd5075836b4a22a990b1f0c9b4ad71ce68b9d65935382e5f84ae6fc49d022fc2b1c0704a5cf331857b33e09bd327 SHA512 d997ec7cfd421fa931b5ef0cc7713a75cffd1c1fb0204364253fa5243b67ae60389723f9ea473e7558bc87fcb6df54b85c987ca269c15ddc4613157ccee6b9db
diff --git a/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el b/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el
deleted file mode 100644
index 8f45033a3fce..000000000000
--- a/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el
+++ /dev/null
@@ -1,10 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(add-to-list 'auto-mode-alist '("\\.ml[iylp]?\\'" . caml-mode))
-(autoload 'caml-mode "caml" "Major mode for editing Caml code." t)
-(autoload 'run-caml "inf-caml" "Run an inferior Caml process." t)
-(autoload 'camldebug "camldebug"
-  "Run camldebug on program FILE in buffer *camldebug-FILE*." t)
-(autoload 'inferior-caml-mode-font-hook "caml-font")
-
-(eval-after-load "caml" '(require 'caml-font))
-(add-hook 'inferior-caml-mode-hooks 'inferior-caml-mode-font-hook)
diff --git a/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild
deleted file mode 100644
index 095b08c559eb..000000000000
--- a/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-MY_P=${P/-mode/}
-
-DESCRIPTION="Emacs mode for OCaml"
-HOMEPAGE="http://www.ocaml.org/"
-SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}/emacs"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README README.itz"
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 27be46526d57..25333f857c2c 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,8 +1,8 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
 DIST org-8.3.2.tar.gz 4442361 BLAKE2B f21f07578e870cd3edaa3721a53f679627c0115c320c666c2086e201e272c0ef03540bfdd90936a624cd4c4dcbac21b91346ba975b6006ada2d46184f73574f3 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2
-DIST org-9.0.4.tar.gz 4431853 BLAKE2B 1ecb8fa08597e08a6143cdf5d262274472eb5b245fa1103fe6b5509a5bb0d0aa471e9414b8f6293c3d5720c7b307a77e0f03ad6a9b590bf2469da5d54ddedfaf SHA512 fc3ab3e7c2b5f3243937497ea9515ea81434f2274ac158da7d0418e8ddc33debae2f1887ffbe37e3768d32a028834cc0ef35f3c3cc3938d7b24e0c5bfcf65ae0
 DIST org-9.1.13.tar.gz 4625532 BLAKE2B c7044913b8fd0bde43fa1ff0f4bc9963ebce1cda17753fe7642aff914603a4278e7396acf2236c27334f2b9a009bd9e3310ec6144d851e121c3f6ec6516ad6c7 SHA512 a1cb1b2a8db082b7f7a03e90109352bad219808cb506af30082b87fc2c6d66733ce304df4379542e7a85e20c213e1cbc8bf4c9d6c9777fea393a88755129c4bf
+DIST org-9.2.6.tar.gz 5720665 BLAKE2B 19346696b41c2ab5b66ca58b0e28c4ddfa184a390d39b1edc80536901754ac81a479cfb1ead5aaca6d93c9060fc122bbdfe1307900fbf0fc8cdb8fb7a2b2153c SHA512 8aba98bcd2e8e8d40c90524c7b0fd85526fc64725823a6ba66ef80b8f5f2e7d2b1d3363db2553af6672ded085a0abbf00311e36f02cfc1c2dbb18184df8f34a5
 EBUILD org-mode-8.3.2-r1.ebuild 1777 BLAKE2B f05cf006f13a39b5cdc62da3e5ba742c88b2cbdc64787218e0f2862095637714e2319c406327ce69649ac163e2e9f8cf06031d8e9464337b051ebb71da56f67f SHA512 2e5c6790fc10a7df5859ff7893ad6b37417099152e8021b306f536fcd92f7c4b2b3ca2477f268ff166b7eea92cd0c1b76ff0c3db3da4003c6181e6480959e126
-EBUILD org-mode-9.0.4.ebuild 1778 BLAKE2B b5a6c58c509c1531f9327bf7551c76eb49612061635eddb7d71a50371edb2f7e09e637d76ef30c5c7f4f63e1a24c9b9d45ad0421f43b5bf4513e8eff71c75c1a SHA512 6ebb922aec745216d6b10b4e025ffc30ecd6cb8c937396ddce75a0589b1b2ab0a953c1e10fb623a3b078822d3b2db6a10283078d8db48a83a2dfffc288b64065
 EBUILD org-mode-9.1.13.ebuild 1750 BLAKE2B f2e0c7a8921ca7583cd9417294cc3c692097694777cb6f0024361748dc88ff95bee545a1746073df475451b082f6795aec84633b14235714a60e8fe3fd6db8e4 SHA512 350915aedb567f6752dfef8debb8ac5d3c34a6a582341925ce03f52d7909c07a6bd86ee53ad579b3479442448136ee85f45b5976ff8f32c5d36d7cc40f27a1b7
+EBUILD org-mode-9.2.6.ebuild 1751 BLAKE2B 199663bcfcf3e176bc883549d18c542a618a70c08b182060f91ec8fcf2e56c46b0bc9e39a16887db66adf5f66ef0e527b91e7a06db771f515ef5174503eb69b0 SHA512 79223a957005bc4042a51cc851152fe68748493530274852d429cbd7ae7779329c3372ab9cafd4194ee4dda23b0f4fc21c6546e9231fdc7d2d0e8ebecbc68049
 MISC metadata.xml 1368 BLAKE2B 2680c11ca69b9acd8b96b6dc76586037bd1b7ce0e9cdc183781742f373ce8d0be5b8820b7fa4d18c4f59523e10d3b40df3edbba5178169fb993bacc8d10cdfe1 SHA512 6c557a3a3ecb9b1993bd8c976d0a81460cd1ecc6e53fbaeb0d086e8d78497485a1b34470b72a73e779878b4947a22d61ef36259037cf6ff0315a823e15e09c66
diff --git a/app-emacs/org-mode/org-mode-9.0.4.ebuild b/app-emacs/org-mode/org-mode-9.0.4.ebuild
deleted file mode 100644
index 4ff2e904df26..000000000000
--- a/app-emacs/org-mode/org-mode-9.0.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-NEED_EMACS=24
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="https://www.orgmode.org/"
-SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
-IUSE="contrib doc odt-schema"
-RESTRICT="test"
-
-DEPEND="doc? ( virtual/texi2dvi )"
-
-S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake datadir="${EPREFIX}${SITEETC}/${PN}"
-	use doc && emake pdf card
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		ETCDIRS="styles $(use odt-schema && echo schema)" \
-		lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		datadir="${EPREFIX}${SITEETC}/${PN}" \
-		infodir="${EPREFIX}/usr/share/info" \
-		install
-
-	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
-
-	if use contrib; then
-		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
-		insinto /usr/share/doc/${PF}/contrib
-		doins -r contrib/README contrib/scripts
-		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
-			-exec rm -f '{}' '+'
-		# add the contrib subdirectory to load-path
-		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
-			"${T}/${SITEFILE}" || die
-	fi
-
-	elisp-site-file-install "${T}/${SITEFILE}"
-	dodoc README doc/library-of-babel.org etc/ORG-NEWS
-	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-
-	DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
-		so you may have to install one or more additional packages.
-		A non-exhaustive list of these dependencies may be found at
-		<http://orgmode.org/worg/org-dependencies.html>."
-	readme.gentoo_create_doc
-}
diff --git a/app-emacs/org-mode/org-mode-9.2.6.ebuild b/app-emacs/org-mode/org-mode-9.2.6.ebuild
new file mode 100644
index 000000000000..9fb4aebaeff2
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.2.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="https://www.orgmode.org/"
+SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+IUSE="contrib doc odt-schema"
+RESTRICT="test"
+
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+S="${WORKDIR}/org-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake pdf card
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		ETCDIRS="styles $(use odt-schema && echo schema)" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
+		infodir="${EPREFIX}/usr/share/info" \
+		install
+
+	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
+
+	if use contrib; then
+		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
+		insinto /usr/share/doc/${PF}/contrib
+		doins -r contrib/README contrib/scripts
+		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
+			-exec rm -f '{}' '+'
+		# add the contrib subdirectory to load-path
+		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
+			"${T}/${SITEFILE}" || die
+	fi
+
+	elisp-site-file-install "${T}/${SITEFILE}"
+	dodoc README etc/ORG-NEWS
+	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+	DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
+		so you may have to install one or more additional packages.
+		A non-exhaustive list of these dependencies may be found at
+		<http://orgmode.org/worg/org-dependencies.html>."
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/popwin/Manifest b/app-emacs/popwin/Manifest
index b3cca907614a..44b70cf9a88b 100644
--- a/app-emacs/popwin/Manifest
+++ b/app-emacs/popwin/Manifest
@@ -1,4 +1,6 @@
 AUX 50popwin-gentoo.el 336 BLAKE2B 5f76341b524d373ed3aa8d15e99123f5be33a45eed4e865f647e8c40353bceefb8775dabadce9f0cbb630742893de1354dd09062ccc2cc4c4c68484ee380a02d SHA512 a9b72edf953d67a16aad44186d3f0f3deead224ce57342d73ba43abe15c0c2b170311380926d1195d98884b6e64fbeca23b74c3dd9a67b13015ec0b491861905
 DIST popwin-0.6.2.tar.gz 16821 BLAKE2B 6fcf2e711c28db3465fd4e267195f8526eff26aedeb04f07d66f5adac83f2447beef1ee988f692b9062a0e0eabbbe0760d3df6f1f7679fb4ab76317237aa8fdf SHA512 3c086361d6b79d7c68583cdbfb76cfd95b6ed56883382e42a863137d93e2a64fa8dce7b7873a4c46ce04a742942dd5f16367c691be608438079555578709b108
+DIST popwin-1.0.0.tar.gz 69319 BLAKE2B 2dea34f002a97ac58848abaecfb9b591ceeb58539f581918101604a485b6d45b9dd078dc89b3020bbe38e99646127a784582c51ffaa3a76de5b6ccaa365b22d6 SHA512 5b3ba489e747ec80d80e516024ca8bdafdb17a56df3f89c20053765d551173f448fbc10db348c6ec0e6efc5557eec672da3477980fb41f1fbbbf220f757f98e6
 EBUILD popwin-0.6.2.ebuild 471 BLAKE2B d76ac412dbdefe4a1449bd95b0552d5605e5fa5f27e4f4c4d2400b8f4bccaf3954d994e729927fb1537949aa4fdc52ba0af14ae234520b9bb88ca8000c2225b7 SHA512 a4dbeca3a4bd29b666fc533e01315fe02dae86ffad5653559ca3c4443189faf2b987d3b7960d04afa0a01425cc28f3a4f663d02b4bd56fd237bda367dcfedd23
+EBUILD popwin-1.0.0.ebuild 487 BLAKE2B a2b2ba9b5a428e3b58aabd2f83df7626212345fea65b4770e45633124226b8fb8fce5f5c3a2e1a0d6e9b44df513484f38d26fe453f5c5a446a4bddd40f42469d SHA512 310efe067b267ba1d0f843489f65429437773d906342d6ec94eac68b02742a5e57f972cb3c1863b46208a643359d001bddef02e8b36b0fdd6eb3504f361e0d72
 MISC metadata.xml 434 BLAKE2B 7a3d9e391906d94c7325bb2b3037ac72a17592c7000ea7952d1a24307972ac5e76197ab65757111c67b9e08714b5e8af3e96afa6b01ec6ebaba522bb07edcdcb SHA512 aecd01bc0b93d462be5de0f33709bde26740f9d5c86b926201a215c6eeedf79f8216d9906260f61b65f81f5850b958d1ac94a767775ddacee6df4547ec01efe9
diff --git a/app-emacs/popwin/popwin-1.0.0.ebuild b/app-emacs/popwin/popwin-1.0.0.ebuild
new file mode 100644
index 000000000000..1d4800d33dc5
--- /dev/null
+++ b/app-emacs/popwin/popwin-1.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Popup window manager for Emacs"
+HOMEPAGE="https://github.com/m2ym/popwin-el"
+SRC_URI="https://github.com/m2ym/${PN}-el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"		# "make test" starts Emacs in non-batch mode
+
+S="${WORKDIR}/${PN}-el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/pov-mode/Manifest b/app-emacs/pov-mode/Manifest
index f2dbe43a1b13..5270cafc4a4f 100644
--- a/app-emacs/pov-mode/Manifest
+++ b/app-emacs/pov-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50pov-mode-gentoo.el 423 BLAKE2B e622ca33adb577987c9d68e1baa2e7415e12cb74866cf64f16f693f06fa886866d3154e68cdbffaf2d929f50ffc8db29ef2c6b356f98f873eced5ee8ff4da518 SHA512 d2d27e6770909ebd08a8c53dbfba3896aca814637c861623746e66097f0f21686507322c734c0a48e15ee281cca0e51a82fff716276f9aec65e5a1419c8dc028
-DIST pov-mode-3.3.tar.gz 65929 BLAKE2B eddaa355b58ad397e377c055fbc06fcdf552fd32057246d11d9b11908635da72c9b19e8b2179fcad54bbe5a5d158a36faf0d42e62b79d4a4e5a57405672dafde SHA512 e705f25f1eb719152dbf5ec17c833f67b4c7be5b1ff9ddab94f67830d9d2caddabc47bcc6ce4864521eedd2728f4b59a6d2c0ddaba83f0b194bb0834d86e9396
-EBUILD pov-mode-3.3.ebuild 615 BLAKE2B 9a69e7ac29c7b44f42380b9e363e339340dac9e2bd052008f903f2df0e135525e1108c63317bef38b4808043674cf83da99fb2267db179bd24babaec5d048f89 SHA512 e2b80cf0fba25fc171d4e3f6c2f07ba65a091470a630cd8efaf1cd19ca4070dc6e7db1f22131c45f4945077504be4fa05ba4a62f02eeacdb211059e7ba174ddd
+DIST pov-mode-3.3.tar.gz 65926 BLAKE2B a2d217a0876fba0a490a77ee026eb555819d2668c50e6b4a289491a8cfbecc62fc55ad8c97d6b7011420098ba7052ce80ac39bd6bc8cccc78c5bd49dcc5d41ea SHA512 bdac1b6b872b8de08660adc8eec706cce4b085b62e7c48bb6bd57e25d9e1f9b8c0086f30ee9c5befee7b0d933831d459eb0704dfe5e8cce8cae378d7404b9c9e
+EBUILD pov-mode-3.3-r1.ebuild 612 BLAKE2B 935282b7f5235686ecdb93ac988f3262d37e9c73679acdda09fb9de2dcd30bbf2c8d4a473347ee5489bdf56f157d650e3f63abba53f45f4d07c6c7f80f727d32 SHA512 21f2deaca40b2a8796bab81d17f63edbbd306d883ca69ce9d58c83333728f0f02c30a7f122743b4fdd9f038fb152a0e8212ffbea33f827b82891f2aae464116f
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/pov-mode/pov-mode-3.3-r1.ebuild b/app-emacs/pov-mode/pov-mode-3.3-r1.ebuild
new file mode 100644
index 000000000000..62ecc80c9bd1
--- /dev/null
+++ b/app-emacs/pov-mode/pov-mode-3.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Major mode for Povray scene files"
+HOMEPAGE="https://github.com/emacsmirror/pov-mode"
+SRC_URI="https://github.com/emacsmirror/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_REMOVE="${PN}-pkg.el ${PN}.info"
+ELISP_TEXINFO="info/${PN}.texi"
+DOCS="README"
+
+src_install() {
+	elisp_src_install
+	insinto ${SITEETC}/${PN}
+	doins *.xpm
+	doins -r InsertMenu/
+}
diff --git a/app-emacs/pov-mode/pov-mode-3.3.ebuild b/app-emacs/pov-mode/pov-mode-3.3.ebuild
deleted file mode 100644
index 4251766d372c..000000000000
--- a/app-emacs/pov-mode/pov-mode-3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Emacs mode for povray"
-HOMEPAGE="http://gitorious.org/pov-mode/"
-SRC_URI="http://gitorious.org/${PN}/${PN}/archive-tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3 FDL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-apps/texinfo"
-
-S="${WORKDIR}/${PN}-${PN}"
-SITEFILE="50${PN}-gentoo.el"
-ELISP_REMOVE="${PN}-pkg.el ${PN}.info"
-ELISP_TEXINFO="info/${PN}.texi"
-DOCS="README"
-
-src_install() {
-	elisp_src_install
-	insinto ${SITEETC}/${PN}
-	doins *.xpm
-	doins -r InsertMenu/
-}
diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index 8b03b5b1faca..1243783843b9 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -1,5 +1,9 @@
 AUX 50proofgeneral-gentoo.el 68 BLAKE2B 14c41f176f78dee51fdb893f355c2b8cf00456e0b586c7c41c91f2eea6f8d0baaf8d6a04eda385031c96c138d47c0e7e99a75be7cd27ffd0d2087e0a69ded0b2 SHA512 32f3d33d85776f1695d542adadb8e35e372659fcce2805fc205732cd911be186cd5a1a63a8438287467dea744da9ef212f7338c0edb735a525ec30f892f1afca
 AUX proofgeneral-4.2-bytecomp-warn.patch 1150 BLAKE2B 0e4b577a1fcdbf27d2a75055ddbb970945d494ae4de2f01da4c4b1c8fc7c39bd8745a5e62abd3a7f401cb4d2ef5f30452dfae9c1899b85d7929fe4ed87bc3a66 SHA512 ad7f972148cec19c60d58e7ee7808735b92d6f642d178453d123988c68e873824a7bf8ceeded82dfd3b6109e5b50e24bd7fa8753822b5f36cbb2e73ff4e0d30f
+AUX proofgeneral-4.4-desktop.patch 425 BLAKE2B fdefa2835502ded79bc08ffff7906315913a0e740269ba5a1863bf4ef8c602ee56eda1c25fc2ff161cd0131b6c615bbcea3770bc39ef18ae654b892571c92deb SHA512 dc594dc08432fb5a4068b7aabcb85ff58b9e784903f912694da08ef97ec9bfca229dcc4d965ca5286993173083c89dc53805f09f7152eb183829985c3c4c5b22
+AUX proofgeneral-4.4-images-dir.patch 358 BLAKE2B 8c06cd031ff3dca8d9537acb86245ba01ac06e505f0baf6146dbbe89c81dee9dc471b0103f6e2dd0ec5e1c80e72d1a3682393528ea262af187e2548e29c464ef SHA512 06fed75bf855d8cbd8938ca96f9e1cb61cdf01b7f68e58188d4ef287bab847156454dea0c2bc44adfd8979e900b58e5cc7a64b742606e694b3b0717b9a735151
 DIST ProofGeneral-4.2.tgz 1613190 BLAKE2B e12913d67f95b20d99d5bdaa82a36f0dd2b664441a86dc86cb4f8afaac2379691c01e60cfe6af3bbf177f0dc2f82ce34ea4d706ee34c2d5986de3f807ce05045 SHA512 102c56a1bc113439b1fa8aa10efe571d47d68b344d3489fe18ca3bdbf8828bb31fd2302a68a4bd639c59c429d41e82e5d933abddd3444781cb0e8a603db432ab
+DIST proofgeneral-4.4.tar.gz 14105056 BLAKE2B 8d45218cde620411d14ab3c703fea37f0482c0e1f6fc8d104b4de7506140d4d0491b5e23ddbf458bfa3aeb683b71f6e4deea31c2a46b902342fc686c2945162a SHA512 8be7f78b61a225fa4770698bbbb251424a0afe093efc3229f74f3a764317dc8cc00a72cb29e751f755dc5fdab59983906c9185f7828a1644a87d160265f12061
 EBUILD proofgeneral-4.2.ebuild 1385 BLAKE2B 53d5c6afb8058ea87d4b78a23a8bf20d9e7dc2ce84b25eae8f57a16df35508ae9677698f781c8e5ffa5b7aaec306825ffbdd02dba69263ccbe0c7f5dc9faaf58 SHA512 e0e59f6ec4b73a47ee44be048a7139246502f642cda5f1a9a0a5ea3b20f37158c5109b9701ac1eeacb0f154a0b0dba34270f2d2ca418665c9e5e2c2a435b68fc
+EBUILD proofgeneral-4.4.ebuild 1633 BLAKE2B 2f5af9e77e52d28dadf546909633b91edb67dd31baed0a631bcc2255d4fe3d4b9fa9b738ab0c7d36994e5233d47decc182324607ac9dd387b0d4774c352f59bc SHA512 116240b7871c2929b56691e4ab620a08bdfc192a80749b2b72ac206da7292aa0ecefbe8cb2d0b88fd0389bbc4dff085af69192cc2ae8e5330f4f54c8e7d2241f
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.4-desktop.patch b/app-emacs/proofgeneral/files/proofgeneral-4.4-desktop.patch
new file mode 100644
index 000000000000..56937b8394c2
--- /dev/null
+++ b/app-emacs/proofgeneral/files/proofgeneral-4.4-desktop.patch
@@ -0,0 +1,14 @@
+--- PG-4.4-orig/etc/desktop/proofgeneral.desktop
++++ PG-4.4/etc/desktop/proofgeneral.desktop
+@@ -4,9 +4,9 @@
+ Name=Proof General
+ GenericName=Theorem proving environment
+ Comment=Organise your proofs!
+-Icon=proofgeneral.png
++Icon=proofgeneral
+ TryExec=proofgeneral
+ Exec=proofgeneral %F
+ Terminal=false
+-Categories=Application;IDE;Development;TextEditor;Math
++Categories=IDE;Development;TextEditor;Math
+ StartupWMClass=Emacs
diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.4-images-dir.patch b/app-emacs/proofgeneral/files/proofgeneral-4.4-images-dir.patch
new file mode 100644
index 000000000000..555837deda0d
--- /dev/null
+++ b/app-emacs/proofgeneral/files/proofgeneral-4.4-images-dir.patch
@@ -0,0 +1,11 @@
+--- PG-4.4-orig/generic/proof-site.el
++++ PG-4.4/generic/proof-site.el
+@@ -127,7 +127,7 @@
+   :group 'proof-general-internals)
+ 
+ (defcustom proof-images-directory
+-  (concat proof-home-directory "images/")
++  "@SITEETC@/images/"
+     "Where Proof General image files are installed.  Ends with slash."
+   :type 'directory
+   :group 'proof-general-internals)
diff --git a/app-emacs/proofgeneral/proofgeneral-4.4.ebuild b/app-emacs/proofgeneral/proofgeneral-4.4.ebuild
new file mode 100644
index 000000000000..0b9df0133b68
--- /dev/null
+++ b/app-emacs/proofgeneral/proofgeneral-4.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="A generic interface for proof assistants"
+HOMEPAGE="https://proofgeneral.github.io/"
+SRC_URI="https://github.com/ProofGeneral/PG/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=app-emacs/mmm-mode-0.4.8-r2"
+BDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/PG-${PV}"
+ELISP_PATCHES="${P}-images-dir.patch
+	${P}-desktop.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+	sed -i -e "s:@SITEETC@:${EPREFIX}${SITEETC}/${PN}:" \
+		generic/proof-site.el || die
+	sed -i -e '/^OTHER_ELISP/s:contrib/mmm::' Makefile || die
+}
+
+src_compile() {
+	#emake clean		# remove precompiled lisp files
+	emake -j1 compile doc.info EMACS=emacs
+}
+
+src_install() {
+	emake -j1 install-elisp install-bin install-desktop \
+		EMACS=emacs \
+		PREFIX="${ED}"/usr \
+		ELISP="${ED}${SITELISP}"/${PN} \
+		DEST_ELISP="${EPREFIX}${SITELISP}"/${PN}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	# move images out of elisp dir
+	mkdir -p "${ED}${SITEETC}"/${PN}/ || die
+	mv "${ED}${SITELISP}"/${PN}/images "${ED}${SITEETC}"/${PN}/ || die
+
+	doinfo doc/*.info*
+	doman doc/proofgeneral.1
+	dodoc AUTHORS BUGS CHANGES COMPATIBILITY FAQ.md INSTALL README.md REGISTER
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	# Already in REGISTER, so no need to install README.gentoo
+	elog "Please register your use of Proof General on the web at:"
+	elog "  http://proofgeneral.inf.ed.ac.uk/register"
+	elog "(see the REGISTER file for more information)"
+}
diff --git a/app-emacs/quilt-el/Manifest b/app-emacs/quilt-el/Manifest
index 6017bf525ef0..d3a352fb503a 100644
--- a/app-emacs/quilt-el/Manifest
+++ b/app-emacs/quilt-el/Manifest
@@ -1,6 +1,8 @@
 AUX 50quilt-el-gentoo.el 295 BLAKE2B 2179c4c7635fc79dcfc5444f37c2c38d35468a9c11742f3a162f78dc49c33abe605cb68642b858b0ff6221180f74555f0f5a5833740e757aadd0ad903325de49 SHA512 b14f5b3db3ec93cdb0b95b64295dd5d7d6561db4b71ee691001cab5678922dd2977716f023c8b046e63e2ff6dcc25d5f5dd1dce9571016ac16c86b44529d9417
 AUX quilt-el-0.45.4-header-window.patch 297 BLAKE2B 87d5157dcf03d8975afd0b72d223c2a2133039aecafd9f283ec2729e440fee56719d1ca02be7565c22bc3e1c887ac57677dd771ed4b4d11681e1d21315036bc3 SHA512 fe12a4a4326bf586441b838dbc52bf8bd32fe639208ce5078627f24f13a5e49547ac1361117f8fc9578689d1b953ba2724981b9e563ab14192cdc1d78c59fff5
 AUX quilt-el-0.48.0-tramp-recursion.patch 363 BLAKE2B ca26afa6738d51efd007d46ffb78414d4ae296626905db1ca6b65b09d8946f1e09536a04f4153650763478f4054f07a8dc58e171ed4e613d1a259afcf4214fb1 SHA512 b4369142d70543bbb8139b4f6d8b8c8c13bf2bbd93d1bc87de690c93de485d9000918c6fe7278a32472b2a9afb495f3a9c639434a3edd3489c6cf2bd5f99a5fe
+DIST quilt-0.66.tar.gz 413069 BLAKE2B 41201d54cb26d4761413365fe19b65bd6971ada1e69198d2edbc346df6a3060ff3af4d80551d68ab4ffe003183bc0a28515ce1d070db95f2b1a04a0680ac4fb2 SHA512 c2cb75c0937612e1e0da25b713acf629b6b5aacbd8254d8bd17220b63c7b8ca996cd9d0315a32d67d54a4a7dc01b212cdda33afaacf3db063da757f1973306f4
 DIST quilt-el-0.48.0.tar.gz 13147 BLAKE2B 595e7d12c24095df3c0d12de607b4e43e36345b53f9d89e6ea6ea781ed25f893d5100e3a023b4f5bc0aee11dcf93a7ef3862fabe28c8eda98a43dce634969444 SHA512 0a198ef0f8354c927c4527bb7a3e99fd6d12f17cbe65c736341c527de440d144581205337163912ce04f83749c31833221cc4153d5736ffec060ad4ade73c694
 EBUILD quilt-el-0.48.0.ebuild 524 BLAKE2B c09278c3efca977158d8a323911947439c3a7812b2b82d2f4418666c91cf3a56d3febf3e1587c72a602f7fe361233387991c7dfbfa51311b57400085dc190067 SHA512 f9a65f053573d5f561b82728701b09588aa87e42114da625abbacfa53a49d001113a04b122de67b7cc39a295bab9efcab3597d95329826ef1509fdd85e11a879
+EBUILD quilt-el-0.66.ebuild 564 BLAKE2B 4fda05d3ffa64a1f0f1e0c2d4b84b5399b29434d2b7c71eabaa865522e98d16597825f6497e6867d3ccdea285e53d86205cd9ef4e641aeda3389e17c62173118 SHA512 b8de253e365fad1530055a841f32c21179dec4b347f1c5bb5771dbba2db3c98013b9694f4116284b6e60d9140c44c5eda96cb3b2905ef4e0e5b8301f62592c8e
 MISC metadata.xml 657 BLAKE2B f42a9f750c0914dae5ebf3cf8798857d8bb2b8135597470991dfe3e3644716e47d3079d77754305be689a337609e719ba277e5e0a4119bed5e2ae2272147bebd SHA512 d7e9d85957ad96345d3394977312e5ffbb37c61f7529b7b179c2dfcb1e41208089a469fc5db8760f0f62a6cdb5ddf801e11673d126711569fc2a61bfd8a04e4b
diff --git a/app-emacs/quilt-el/quilt-el-0.66.ebuild b/app-emacs/quilt-el/quilt-el-0.66.ebuild
new file mode 100644
index 000000000000..4a2ffef3d55c
--- /dev/null
+++ b/app-emacs/quilt-el/quilt-el-0.66.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+MY_P="quilt-${PV}"
+DESCRIPTION="Quilt mode for Emacs"
+HOMEPAGE="https://savannah.nongnu.org/projects/quilt
+	http://satoru-takeuchi.org/dev/quilt-el/"
+SRC_URI="mirror://nongnu/quilt/${MY_P}.tar.gz"
+
+LICENSE="GPL-1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="dev-util/quilt"
+
+S="${WORKDIR}/${MY_P}/lib"
+ELISP_PATCHES="${PN}-0.45.4-header-window.patch"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="../doc/README.EMACS"
diff --git a/app-emacs/riece/Manifest b/app-emacs/riece/Manifest
index 548933ee7dd2..5e67f42c9db5 100644
--- a/app-emacs/riece/Manifest
+++ b/app-emacs/riece/Manifest
@@ -1,6 +1,4 @@
 AUX 50riece-gentoo.el 81 BLAKE2B 861847fd8393a454a03c810c895a62b9741a33c640988b5370fb726b0428eb506c44199009d2b593c9c9f1d0d44373e5f971642016ec4fd1b13d0383c808de59 SHA512 bbf327290280b0e5e43298c44ea62c9fb5260de5a615fb056a1d7b11e8fb26f04666dd16e272fad731469dce42b41491229123e0a107dd7a1f958931ef5a3a32
-DIST riece-8.0.0.tar.gz 432370 BLAKE2B 042392697d6110490dcdb278fe8c9c68983b1d926f97231ddf08967735c3f526f41a7135378d49dcfba1344c0092cf43ce7ebe05ca039053002d166182c22601 SHA512 ac219f882c2dedcba2bf3d75e5b934c363dfdd6d8f9e35ce11040d85fca526f8368a57535b729952d6f2731f3ec328bad3913426d0bb0b4bff78a407bfd63a96
 DIST riece-9.0.0.tar.gz 438553 BLAKE2B eaa54c7f5b445657b0a1e09914b145ccaa88a26c5f14d7b6c37061c25b90210f4fd0ec9bb6867ed881212314d0f4d9fe81f60fbde64accf8091d72cc6f9a8576 SHA512 3fbfa4a6d898a713248ce217939af208729eb441ab7ecea2d2c028ce228db1363cb7d90d0de4636bd9fe10813c73f9ef70fb003cfc2fe64ec25b71c9821e8bf6
-EBUILD riece-8.0.0.ebuild 819 BLAKE2B 753750910d723231a88bcb6c45257e93aa71a271f095d369be5397599ae569eae118cce9e2c917ebeaef15e066e0c3958952450d00c2769e3c4f5b4434cfb394 SHA512 3df864f1b103c8fc8dd7f754df9760d3154ce3675cb8da14b5cec8d9c0fbe7db08ab7c3800a6cef53689dcb81492c30e29e15f382f07b0218a8501f6339771c0
 EBUILD riece-9.0.0.ebuild 819 BLAKE2B c187c3eeef7f5a6d8b6f0e2a356e73f7cc024fd873eed25428d15e1984907c51f6da1740b03116721f6404f15e362a19d3a80740fa1138becf850a378b3c0b64 SHA512 cda075586389ebbe038f1cbf43f012481071a32f4d3445c645f60ac7fea556db37e36721c9f37844475a735443a0519570c95903bd056676090130f69f7aea3e
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/riece/riece-8.0.0.ebuild b/app-emacs/riece/riece-8.0.0.ebuild
deleted file mode 100644
index 68b8bfcd09ea..000000000000
--- a/app-emacs/riece/riece-8.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="A redesign of Liece IRC client"
-HOMEPAGE="http://www.nongnu.org/riece/"
-SRC_URI="http://download.savannah.gnu.org/releases/riece/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="l10n_ja"
-RESTRICT="test"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	econf --with-lispdir="${EPREFIX}${SITELISP}"
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		lispdir="${ED}${SITELISP}" \
-		install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc AUTHORS NEWS README doc/HACKING lisp/ChangeLog*
-
-	if use l10n_ja; then
-		dodoc NEWS.ja README.ja doc/HACKING.ja
-	else
-		rm -f "${ED}"/usr/share/info/riece-ja.info*
-	fi
-}
diff --git a/app-emacs/scheme-complete/Manifest b/app-emacs/scheme-complete/Manifest
index 5c18545c0b89..cd3f7de4b213 100644
--- a/app-emacs/scheme-complete/Manifest
+++ b/app-emacs/scheme-complete/Manifest
@@ -1,6 +1,6 @@
 AUX 60scheme-complete-gentoo.el 219 BLAKE2B bf71fafbd85fea667e895ca9dbb91761e4de7f3856d109f3fb1990788ff0f04b66c6edaa835ab681cbfb303d71ec60af8d04d0a1d7e3119c59799c7526903c52 SHA512 52314ed8b643c11fb7058ec5aa8e38e6b9b78800d6daa04b9bdbb9567b4b78c0c804277966c58d69199cab0e5e74d07d9728faab0ff95ba1af65eee7b04eccd2
-DIST scheme-complete-0.8.10.el.gz 38713 BLAKE2B cdb1e821ef752dcb5e1067f636e3b023c114bf564fe44c0e7224c879858d5da51d2ecbfa659d9699f6c7feb1f74dad3462b4ab769e834f2e4b8d9132d4b4a63a SHA512 7058983a57f1fe3cbbc4066f62075b755bd8e9a83ce65bf26a3568889d05abc9972d4b7be57ac54867fc4abe5567e223c9640bd8c898dbc6422d449f41090956
 DIST scheme-complete-0.8.11.el.gz 38847 BLAKE2B 649a4124b0b643211c2132dc0e03e8930ea7f311637b3afd375d75e3aa33abaae888b1aa34744bf22d13738179d4048faa173ec8e5e0868f5789623fb7b11c0c SHA512 90fe73dfee3377f19eca2107deb6c9d88260b2097358416dab5ad839dabc0a0678b7254ab6dbdc058cae2be5feeaa4cba2f66296e49060df5251c1888044fea8
-EBUILD scheme-complete-0.8.10.ebuild 422 BLAKE2B 2a1fc9d9f59ae079de9b6adbbac3746eefb9d2142c56564029e64c914a5527681df356508710b66dea494f1f0f0e0a6cd2c1afd5097d973c8101bf61c26d2472 SHA512 ea4b6cc9e7be6f923b361710022f5d7008938c6e71bdddfc49256ccda0e973e2fbae5823fd5b80814ce1ceb51a9b02885996bce0eb75491b456e4a608c19fa14
+DIST scheme-complete-0.9.8.el.gz 39923 BLAKE2B a7f08917823145db0b79a0d0dd2987c98eb6711acc861fa840759c6377045f7ae3edb9973bc285e468c4a20fff02ade6f638a340ba8694007ab37000f3870cd4 SHA512 b162d7766184e8e58d25b93c8e4154848963fa1c29e59f90a4741c6cfb44c217d9ae655d1106d05eb53cefab0c91bf7800b9387143268490d5f8f0685a9a2483
 EBUILD scheme-complete-0.8.11.ebuild 414 BLAKE2B 3512807aa52f7df587153ccf86c49a51baab980a2374550b863907505a571cb03c1e1fc3f5a04c45e73b2dddec4525f93e4facf85965d2a9ff8bfd3b1daab491 SHA512 79ccffb1cb1b037041ead7230f6c72dd65e9f81f5232a5749a43f6ef8f52f9bcd1ae35280873409c507bc1cc8d3462387d5942bf84f572f66c86eeceb5d9e692
+EBUILD scheme-complete-0.9.8.ebuild 416 BLAKE2B 3151d7d4191f5d8e172b42c5b908123860a9d83ed5c32dcaee72396fd1e5fdc3ba241ff70a7e11e93088b13248ec358d560ca4178c7596614e9b1cf331bd0851 SHA512 a0c751d7088531ac8ce6aa76b7173e052daf8f437c0948511b82fa04373dc903a3afb5a0502e467d11ff4b88dc4b69274925998a6a75a271c8765ced9d455c28
 MISC metadata.xml 453 BLAKE2B eee674044e30666eb05beaa44a67781bbdf407fdddc1b175e30f7034a0dd6a3efa3c23361d23b47d7bd0076a17b01b8593deedb1524dfc1597b53f94b9ffa0fb SHA512 34268e756461ba2420bf3552b7f73caa9c95f5feef714b09615b295056598f4d7486771fda804320565cf99dd0ad36754d6b966b492f74347a53f4678e12c715
diff --git a/app-emacs/scheme-complete/scheme-complete-0.8.10.ebuild b/app-emacs/scheme-complete/scheme-complete-0.8.10.ebuild
deleted file mode 100644
index 8fd6adc6b2f8..000000000000
--- a/app-emacs/scheme-complete/scheme-complete-0.8.10.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Scheme tab-completion and word-completion for Emacs"
-HOMEPAGE="http://synthcode.com/"
-SRC_URI="http://synthcode.com/emacs/${P}.el.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/scheme-complete/scheme-complete-0.9.8.ebuild b/app-emacs/scheme-complete/scheme-complete-0.9.8.ebuild
new file mode 100644
index 000000000000..77ad8bb3eec8
--- /dev/null
+++ b/app-emacs/scheme-complete/scheme-complete-0.9.8.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Scheme tab-completion and word-completion for Emacs"
+HOMEPAGE="http://synthcode.com/"
+SRC_URI="http://synthcode.com/emacs/${P}.el.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/scss-mode/Manifest b/app-emacs/scss-mode/Manifest
index 90a52d6c6a10..ab36b808fc10 100644
--- a/app-emacs/scss-mode/Manifest
+++ b/app-emacs/scss-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50scss-mode-gentoo.el 161 BLAKE2B bbe35fe0ab2a4857ad2ab3fa6866e39f873c9c32fec93eb321de9fbb20128be2fb49d36028f778217f4199603a5d5be8e4d1932a5799173b92768ec7b80c0f16 SHA512 099fe31e6a15247502498b3e27e8e462b0ca08b719becc8c22e3e6877aafa1987934b68e916cd2be1237fccda2bdd550402fd168c28967721ce472a033a61a7d
-DIST scss-mode-20130215-git.tar.gz 2632 BLAKE2B f73ad6ee5120518c6e083cc5c963601649866a826e0bf5628f90a1c1e952c36b66a7f1a385244b71d0f78f958edf1d39142aabd309af380a650f5205a1300ba3 SHA512 2241d7e0c2689ba3997e4ffdf1ed167409c1d99a4f6a11911de39775a409d3299ba7e1bb2f7f0878b5b0d91e46706b65ef8e25cef83278894d8842af8bbc95be
-DIST scss-mode-20150107-git.tar.gz 2718 BLAKE2B 5551ca7258caf22957e1d3becf147cfb617378c606c05196b87fa2ce7b035f06e48db1ad01476bcca87bde461971ab040fc7085422cd076469c6d7a9b73b624a SHA512 68a33d14166289af119625a5609c4dec47a05eb8c8452b42cf8e819368cc7561270c8223ac0624fee989f8c51592f456f91009c153fb857549d9c7e7c7e801a2
-EBUILD scss-mode-20130215.ebuild 521 BLAKE2B 5a0da27b242f938a5062bdc31925122cdfe019874ab0e34a924add392b899e675eb738eb24b5247dc0b38f53646547ff9dd7e4a06324a7907fb9f0a3062809b1 SHA512 e226eb79a179878b930dba4c85562580b562b8d06ed0c210a64531c22f7a34917fbce93b87b7c3e9f5227917e479835d8abe629e02d4888c99a28f09999bc2c4
-EBUILD scss-mode-20150107.ebuild 521 BLAKE2B fb253ab30ecd7ea705e1b20d34bc4f5b65c9db685422e4d746465b8a9afae54072dea8e210b79df9a42f31f1236363f5e78a3c3902be3ab0f797b863c7924002 SHA512 a258b0f13e1468f110164354f62dfc6cb64c21525105ed695cf0a5866ad42f1ffcbf7b9b2088f8d1ed700056e9bd72f98b7bd9fec30c82f35c01fa3035cc9fce
+DIST scss-mode-0.5.0_p20150107.tar.gz 2718 BLAKE2B 5551ca7258caf22957e1d3becf147cfb617378c606c05196b87fa2ce7b035f06e48db1ad01476bcca87bde461971ab040fc7085422cd076469c6d7a9b73b624a SHA512 68a33d14166289af119625a5609c4dec47a05eb8c8452b42cf8e819368cc7561270c8223ac0624fee989f8c51592f456f91009c153fb857549d9c7e7c7e801a2
+DIST scss-mode-0.5.0_p20180123.tar.gz 2802 BLAKE2B 0254fd89ee50de2bb9c6abb1ed1ff5f97f8a938b4fa84f38409b87049fe5e0618bc4be9c0a85d17b3911cb1d0b731b1602f76e047b3acd6e290dc091a80c9c93 SHA512 0c83d9c956d197e33c71840818dae1ad722812d1aa95ff7896091682ba7e710f3ee9855210fc403a30d76ef4986803da5dbcd7907c22b221a5cc2d619db22bff
+EBUILD scss-mode-0.5.0_p20150107.ebuild 518 BLAKE2B 137b61d375bbf2b6751e2416a16352673cb3f682e8814f7a8e57898d59b5f079252830350681d994edd1c6a5c1275e9442687612f743cb74268a6b812a25b5d1 SHA512 724f62c4a6783cee97f8cd270e325173a59ad8fd69fc13b9f7603acb6632a89a3f537b53fd4c17655d7cab484225c5f1f40fb8e840696196b7b69406ad9a25df
+EBUILD scss-mode-0.5.0_p20180123-r1.ebuild 518 BLAKE2B d02ec0d733fb453268e5fe071a6a26dee8ab4e0dc899c74042ffca09434721bd2a1512cb8670fe2ab183787af15505e586fbca1adc53a8ba9179d5176936dd41 SHA512 1d5e4eb09f7d46eb12963a7b55af2aff16e9a6c03cee40b11ba5e4bf8d471340ba204f522e7d565e934dc1935d4cfcfbe804eff2ac8ad0022240481a3c34b174
 MISC metadata.xml 361 BLAKE2B 71d6b259ce979cdcf349de35893a68db5a895e4ebb12379fe98e1bd0d7eb6f193b128659418254f3fd31071c6e2d4f8604127297cb0474831658ccbbe1c87e11 SHA512 8178cf34cff42d3d4320190b5a93c52a6387d1732459e00edbe304bc9ff585eec4b5917fa56b6a345c51fea0bb587cdf88ab816b50ee47010f039ee5943cef67
diff --git a/app-emacs/scss-mode/scss-mode-0.5.0_p20150107.ebuild b/app-emacs/scss-mode/scss-mode-0.5.0_p20150107.ebuild
new file mode 100644
index 000000000000..f92573000689
--- /dev/null
+++ b/app-emacs/scss-mode/scss-mode-0.5.0_p20150107.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+COMMIT="b010d134f499c4b4ad33fe8a669a81e9a531b0b2"
+DESCRIPTION="Major mode for editing SCSS files in Emacs"
+HOMEPAGE="https://github.com/antonj/scss-mode"
+SRC_URI="https://github.com/antonj/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-ruby/sass"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.org"
diff --git a/app-emacs/scss-mode/scss-mode-0.5.0_p20180123-r1.ebuild b/app-emacs/scss-mode/scss-mode-0.5.0_p20180123-r1.ebuild
new file mode 100644
index 000000000000..8b50724af54f
--- /dev/null
+++ b/app-emacs/scss-mode/scss-mode-0.5.0_p20180123-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+COMMIT="cf58dbec5394280503eb5502938f3b5445d1b53d"
+DESCRIPTION="Major mode for editing SCSS files in Emacs"
+HOMEPAGE="https://github.com/antonj/scss-mode"
+SRC_URI="https://github.com/antonj/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-ruby/sass"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.org"
diff --git a/app-emacs/scss-mode/scss-mode-20130215.ebuild b/app-emacs/scss-mode/scss-mode-20130215.ebuild
deleted file mode 100644
index 06f928f8b652..000000000000
--- a/app-emacs/scss-mode/scss-mode-20130215.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-GITHUB_SHA1=3452e92800c345690195f55a74ba4118c5c4d004
-
-DESCRIPTION="Major mode for editing SCSS files in Emacs"
-HOMEPAGE="https://github.com/antonj/scss-mode"
-SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}-git.tar.gz"
-S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DOCS="README.org"
-SITEFILE="50${PN}-gentoo.el"
-
-DEPEND="dev-ruby/sass"
diff --git a/app-emacs/scss-mode/scss-mode-20150107.ebuild b/app-emacs/scss-mode/scss-mode-20150107.ebuild
deleted file mode 100644
index 4641fb9938a7..000000000000
--- a/app-emacs/scss-mode/scss-mode-20150107.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-GITHUB_SHA1=b010d134f499c4b4ad33fe8a669a81e9a531b0b2
-
-DESCRIPTION="Major mode for editing SCSS files in Emacs"
-HOMEPAGE="https://github.com/antonj/scss-mode"
-SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}-git.tar.gz"
-S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DOCS="README.org"
-SITEFILE="50${PN}-gentoo.el"
-
-DEPEND="dev-ruby/sass"
diff --git a/app-emacs/semi/Manifest b/app-emacs/semi/Manifest
index 20c50449256d..99dca1057e4e 100644
--- a/app-emacs/semi/Manifest
+++ b/app-emacs/semi/Manifest
@@ -3,5 +3,5 @@ AUX semi-info.patch 1009 BLAKE2B 936ce69c254eca176f7bdbaae92dcda7fe921214b1d089c
 DIST semi-1.14.6.tar.gz 142549 BLAKE2B e417b305ad814b2a23fad4fd37057395efb47bdb61778aa167149eda4277cda47dc81148821d9e4ad3225a858c77f781a6565c3e49747d78882b9401fd5fbac1 SHA512 1011271c58414f4ca23da079f16f273b408643e0d9f4961db321b65c1ed9a7d4ca66a7d7cb5b0c9fa2b4904fa992c9188858de6131180ee30132d3cadaeef33f
 DIST semi-1.14.7_p20190517.tar.gz 152636 BLAKE2B a22b1f9a5de0a695de2d8e342ca313af05c12a1c0b597890d926496e9ce240e3329365700f91e6268cf399976ec067163ac8197c7a643e499d70851501f63798 SHA512 d25c940fdd0a048d21079d905ae91521a1f1247b8f78145baeba24c994c0d5b30985a76c909a793f82f6253b323fb4699bbf059ea48037bb49ae92505b0c6d18
 EBUILD semi-1.14.6-r2.ebuild 1297 BLAKE2B 9ac36cba82f5bada681bf11756509bc32d112b4c16b4063b8c09b17ba45e8d7dc266b405bce5c38f1686880c75aa6951823fb998c3c33c5e40d72787033a5da0 SHA512 bf13d405220097a73409b90076da8615ed3b773b6b69c7e95d2c1e159fc01aba0d9ee38f3be68fd239134e36d0f398c4dc7dc21728d21bcbc0da6e249b375062
-EBUILD semi-1.14.7_p20190517.ebuild 1330 BLAKE2B 3b2f0b304110c8574c6b0543249a4fd590b4f2d015086db1e3419d77b7ffd7e60a8e1a2c5848143284060144e5f57e60ccd26985e85c0b02c54f7a36e6a40b54 SHA512 45646f4be5fc4787b4dc900d6cadf1a823c04da17fca24c5ae06abad5a35a2d5fb502187fe79106537701bac26529db777ef5323ab38bcee8ff6364e8427e124
+EBUILD semi-1.14.7_p20190517.ebuild 1360 BLAKE2B ab44406317c2b443f0a5ed1e3f6009b23fe41cafe392331838f24ac3eedaa0f9a38238a4a6afb37c0580573213ebd98ca77e4d420c135f6e07898ec057e98ec9 SHA512 f0eb4fcf7307db30d13dd2b1485b1e5d45767592f570512037123f274136f7d974ec79882ca8ba27b0b7ec75d6e6a0a207e8c5436219b8d9a3cc96776f6de33e
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/semi/semi-1.14.7_p20190517.ebuild b/app-emacs/semi/semi-1.14.7_p20190517.ebuild
index b235b850d5ef..0402be23ef31 100644
--- a/app-emacs/semi/semi-1.14.7_p20190517.ebuild
+++ b/app-emacs/semi/semi-1.14.7_p20190517.ebuild
@@ -8,11 +8,11 @@ inherit elisp
 DESCRIPTION="A library to provide MIME feature for GNU Emacs"
 HOMEPAGE="https://github.com/wanderlust/semi"
 GITHUB_SHA1="4cf114c95fb49ad75eb6916f678b45b04bad8122"
-SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/wanderlust/semi/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="l10n_ja"
 
 DEPEND=">=app-emacs/apel-10.8
diff --git a/app-emacs/tuareg-mode/Manifest b/app-emacs/tuareg-mode/Manifest
index f7230682298b..f2f4db92dac4 100644
--- a/app-emacs/tuareg-mode/Manifest
+++ b/app-emacs/tuareg-mode/Manifest
@@ -1,8 +1,8 @@
 AUX 50tuareg-mode-gentoo.el 343 BLAKE2B 15545f9aebe6b47e6fa445e32282c4dadf8a6d3fc11d3cb9f8dd2a78ef32dfa5227248644dee8ad12587d96e2c17bf16220a92f447edf8716cd7646347fc2c57 SHA512 41cdc5aa7c083afbe044c730b898e06817fb8c5d9799d0c88be9ad15501d4135e16597623b66ae65a40160d9a04358392a98e03646ba2207e0f981f33e28750d
 DIST tuareg-2.0.7.tar.gz 57999 BLAKE2B 12649da41c8bbc547d28fe391cec51ca552dd66bb1fbf052a9d44d693b9df45ac6dc10336e146109248b130ea7ba94f7097398b598f3a7eb113b0031eea83486 SHA512 6cf290879dd9b7993a046dbebb9944a245fa82d1e7849b46f477b7217b46026ce5195e40e4d9b990e047a03680197827334e6d54d82610da6fc2e62386357d42
-DIST tuareg-2.0.8.tar.gz 57777 BLAKE2B 38d401319640ab4e691ccdbbca03c95b3bd03189aa2399a7258cfcd6660b0c30e7931072ec791ae000ceb228bb8195bd96c6b681a53e3c4cbb861037ab0f7678 SHA512 c9e268eb550fd36614e6632335b623a0916d64dd84a0259fd83c6f08e3138196d3871bc7664d6debe62732d4459130ef1e9271b24982138ff69d90442d031990
 DIST tuareg-mode-2.0.10.tar.gz 102576 BLAKE2B fac81b5f43dc9143a62fe7ebf5d35bc44994db3a155b780329339b73b087cf53e63aa15b7e817388a92f1effcc08febc617747b242d57d5e900b20fe100a8f03 SHA512 53bdc3b2b78bcf7e6b075932b9319f9d08b02b4b3fd74fc9aa30b390b30e4069e19e09e0fbb03fb11877e6d89649b8e59c645cc8de196115c1bbdab308145743
+DIST tuareg-mode-2.2.0.tar.gz 83392 BLAKE2B eead49dff45bb039abef0ffa8f4b874dd6d3bb36e81791b84e411031b4d714324637f99a0cfc3d4029b47032c61ca45424831a2d837fe5b01fa93383237cb14d SHA512 5f0b470920abd44e5b99e84e817ba678aded3042751b8949884c06f3a928105acbe96a28af3a8a089f6b607f8dd70cba7a669e9a61b906b1dad840c7f88bce12
 EBUILD tuareg-mode-2.0.10.ebuild 461 BLAKE2B 5b5bb6cbb0d25fb99e0dd82d8fd09a6b80c4622a72effc589f054b5223ca0a77344b88f27d7ff17665cb69a42f4b939c40afae2ebc125624d271e1d11725b10c SHA512 d4c20260eba3b5151d2d550e0f75e910c9f40e1a47cf96a8e548bdab2074dbd3351709be1b1c3fe32b97c57eaf5cf58bc3ead1eb35c10c472aa7eff313f68337
 EBUILD tuareg-mode-2.0.7.ebuild 505 BLAKE2B 7dd6a1e0c7da751aff504724d03892385c73bfc4afbc52f4ff997040ea67e5c413b2e0b108bba8c19f062b8dac301f0be4aa21186538cf63bf2486900caff277 SHA512 5a982624d089ce91f1b31f20f65f295c9d8cda900888007f41b498ac70b8282edd61000206d8dcdcd000a7a95ac5de3e7d2ac58981e95391131aacce47dc29cd
-EBUILD tuareg-mode-2.0.8.ebuild 518 BLAKE2B 7a3276f4a662c2d51bee7c3f7f731780ae1ecc2c5748708323db075e63b0cf1e0d0e56c8456d10d1a7d7bce762490577a4c9da318132bbcabd4309e56b046a66 SHA512 b61c58e72b5d207a85bfeebf2e94d01451ad74192c8d2f8431780f23ef02658794e72b5c2309cb925063482fb055f30de42637160ff016e9891ca40c14432435
+EBUILD tuareg-mode-2.2.0.ebuild 508 BLAKE2B f102eabd6554e8d52a68da2ad2596d54566aefac8a9c82430dcf59a736c5fb38e1872c3ee96d0f2c4c25078d5b2c8d60675c3cc88ebf6ae9678a2758cc0355ff SHA512 e3774236f306e07e839b1430c071008f28ef4929ed38cd2388713066c9c549139de1133937e4f6bfc4404b46ef7492b5a48cd40453f17215cff74e74126a8cc3
 MISC metadata.xml 780 BLAKE2B 9262902650dea63fa833d0b57f32054a6858e741f404d6f5393273518533e9008ec8a322ec013232b69e8475d9db7f407f3985477ce4449e08913e0eed84337c SHA512 480ad1fcd7b12c56081dac425686a17ad07d912c4ac0f5f259c126d4a07489d9660e1429a7f0570aac3957ec8712d406314d68c76cd45dd8ec99a7f62dba6c5d
diff --git a/app-emacs/tuareg-mode/tuareg-mode-2.0.8.ebuild b/app-emacs/tuareg-mode/tuareg-mode-2.0.8.ebuild
deleted file mode 100644
index c2eb95e0e14e..000000000000
--- a/app-emacs/tuareg-mode/tuareg-mode-2.0.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
-HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
-SRC_URI="https://github.com/ocaml/tuareg/releases/download/${PV}/tuareg-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-S="${WORKDIR}/tuareg-${PV}"
-ELISP_REMOVE="tuareg-pkg.el tuareg-site-file.el"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
diff --git a/app-emacs/tuareg-mode/tuareg-mode-2.2.0.ebuild b/app-emacs/tuareg-mode/tuareg-mode-2.2.0.ebuild
new file mode 100644
index 000000000000..3481178825af
--- /dev/null
+++ b/app-emacs/tuareg-mode/tuareg-mode-2.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
+HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
+SRC_URI="https://github.com/ocaml/tuareg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ GPL-3+ ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+S="${WORKDIR}/tuareg-${PV}"
+ELISP_REMOVE="dot-emacs.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md CHANGES.md"
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 7b255936c516..937d3683aca2 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -1,12 +1,8 @@
-AUX 50vm-gentoo-8.0.el 147 BLAKE2B 3f4da8804a26a4b931aa52409062cd9de6e4b16941e64a139216b2afcb27d09447ea3e8d4ee03ed35931f2163d1932c66b5a247ee2dee60868ba2472572e112d SHA512 9573b5ff6b747c8ac8a8d41c52391c320fe93d9e3a2aa8c22bfe5b4ea2e703fdd1cf18c59ec22aebc8fbedbc324561945bdd3407ebde432edb0015af7ad2c4e1
 AUX 50vm-gentoo.el 62 BLAKE2B 2e5093b9d4244ac229fa63fd62b7bacdf3902ea0f33616adb94852424d2078c11743f4ebd9d080e0aeaa628f66a2de38ed40dc00d6ec9023902a0670468fcb71 SHA512 e58660519b0f7e6d4f608ef09d0861293133ce25e7799e163a1afdf62193f73f0c29a081b4eb26d808a54168ab6f5f6083a107dec7228bf054357bbf16bc90c7
 AUX vm-8.0-no-pcrisis.patch 620 BLAKE2B eb8615854424645a673a62da4c9546e8ac42679d0fb74a14cc54b38006865c3e8c59fd84fb8f0d3a7b7a216cda84403836b6b759340c397de942291f8f17e042 SHA512 57e0ca67484db7a517f1e45cd7ef6974a0938c1ebb9ea740cab36ee328b1b99ce152c14701109862d89918445efc918ab1f7dacfd9228f6466f40177f38f1ae2
-AUX vm-8.1.2-texinfo-5.patch 2608 BLAKE2B 1cbfe5cfd5d633f577a3767c930d2a78e5ea29b7f880529b10e6017e1e16463be89a6c47b2d5fac70d3417b3badb390e5dd6eda0928720bc1e498586a4994ffa SHA512 cfb55e3ec2311fc1b5ca5268e8ee07ad2ea8a276804c9e891727b90fab6aec0b0f7bad274b65bb692fc7391bb95892ca1f87092594ba48716621925b82347bc9
 AUX vm-8.2.0_beta-datadir.patch 1177 BLAKE2B bb0379126f4521ba8c75e1c7fe0d3c7e179333c10acb915ce8cc9e034202d17ebd89855d0ec7b682f174d27022ace06deb545df5a73130b380aa83797b4732ed SHA512 2097837ee4d7fe28356102452f4b110d358624b607c440aee654edcaf577b3e1319bac0eb0a44c2ecefb64334e28a08731c512116bcedd4c8930ba2cee1d48c3
 AUX vm-8.2.0_beta-optional-args.patch 556 BLAKE2B 9c07937f43b99484b5973aa63b386e6e127444b11d026192be868542d98dd83a3d6d6b0816dbba4c78a3d8b8c30f1759beac7d6406bc8280e2c50dde8db884f4 SHA512 4861df97f0f1fe05a85f019a2e74ca4588fa877f67bc0a9dabfe43e9fda7ff7a349cfe23693ec29ba04f75d1698d200b39afd88550c82f1dda1e2667f52fe8c8
 AUX vm-8.2.0_beta-texinfo-5.patch 8594 BLAKE2B 542c755aa7aee4f39c8977ec0a33eab53954bdecfc9e9b65a5fa069c3f3fa89311a00356a8dfdebc2159bfd5a047dbb3500b78e0f1f21398e41fe1ac55516aba SHA512 dbc8f9456735f4d1757a7094bf2cde86148444bf4c46136eb5170b94e9124bee48c08d8f7d82e3b3c03ebd3443f0ec3dc988178e335189904c3d2b4edb6d2cd3
-DIST vm-8.1.2.tgz 703527 BLAKE2B 34b6326363893b830d76a48dc6e103100d8da6891392926d21eff00bb25217af58eb6f161ba38e99becc31f6bf1496eb75fb71709b57b08cd247fa1b28543a1b SHA512 6b879e237d6509ecd95aff3fb5e26018cb38dd19b29a57545bd28b0ca45961a7106cefd6fdd42e123119ac465a4b9ef66b683c47a9f1d9ac683a954b484a0ff4
 DIST vm-8.2.0b.tgz 839789 BLAKE2B fc032e0a6259d2397d80cc80fbb7cf5845e43a228124f867402738a9123c78c798822d8d9c8edbdb823bfe3bce946d53afb6cd24e02d28925a51d458cf21eedf SHA512 37b642975e8fe7e350c0a648f83608b28d8616417d376d9888c89b37c90d8bdb3c91cdc4c91a0f5072d29ac81bfea3d88f9b36699379bf8a5bdd15dd5a70858d
-EBUILD vm-8.1.2.ebuild 1112 BLAKE2B 978e66b2ed8cb96d8ea78afc5724359edd1d5d0137386d8e8cb55f58c974f4f8e5d758176bd1f8722fcbb4df08455058476658e619635271ea72e6265881d1ee SHA512 2679c307a2aed43826913b48b3e4055f6fb4ae0c1effec8180376ac8ae037d15a184982fde37142fe86fd0778478bdb45cdc5ed4e6e3aa5e53c4e92c58662339
-EBUILD vm-8.2.0_beta-r1.ebuild 1545 BLAKE2B 400750df3f9fc3418cf41ea127101c79e673cd7bbb1e84b186081ce296ebc433fbbf0c7d922cf5bba9d1ba486535a9f36a00a01edc2ff10cd41b1c6daee85f16 SHA512 0e056ceb100b49ec6aad8067f76971ec686f8589f266f6bd4e1519267038ec48eec0494fa3ee234cba0b3723188da7a3bdee06e364fe419018d016e7b0cb55cb
+EBUILD vm-8.2.0_beta-r1.ebuild 1546 BLAKE2B f0c2917580d70d1ac4a8a279d4b87d341c7fd233049246fa7dae22bfb271af4853d043870aeafcb84da02023cdfd5997f4cb5c486acc1b8f18c6c5f878f50247 SHA512 a24bee960aa97ad25f8f4d1d1f09d672cb9383fddfafdf873a872995dbe667c31efa4be4fca6b80a135c4b04353f6d4e16a3a9d58f71350ada40353389e2ec88
 MISC metadata.xml 785 BLAKE2B 1d8be69c7be90cb03815bad0324c55e4ed4be6443246922054dc6ebf4b66090bb9f7f30916cb5df07a664d151a77de6591a45d923847547898ebc32ac9505038 SHA512 62df38ecfe4b3de679d856cbca5b58d73c73a885f86998f00aa75e67efc2def4ce973bc1e2f40fa22f6f79cc9f4fc4185a916e6ba176a89d685b1092ea9eddfe
diff --git a/app-emacs/vm/files/50vm-gentoo-8.0.el b/app-emacs/vm/files/50vm-gentoo-8.0.el
deleted file mode 100644
index 554b6634a2ee..000000000000
--- a/app-emacs/vm/files/50vm-gentoo-8.0.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(setq vm-toolbar-pixmap-directory "@SITEETC@")
-(setq vm-image-directory "@SITEETC@")
-(require 'vm-autoloads)
diff --git a/app-emacs/vm/files/vm-8.1.2-texinfo-5.patch b/app-emacs/vm/files/vm-8.1.2-texinfo-5.patch
deleted file mode 100644
index 0283e19a8a73..000000000000
--- a/app-emacs/vm/files/vm-8.1.2-texinfo-5.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -up emacs-vm-8.1.2/info/vm.texinfo.texinfo5 emacs-vm-8.1.2/info/vm.texinfo
---- emacs-vm-8.1.2/info/vm.texinfo.texinfo5	2012-03-05 18:43:21.000000000 +0100
-+++ emacs-vm-8.1.2/info/vm.texinfo	2013-05-19 00:05:10.000000000 +0200
-@@ -783,7 +783,8 @@ following formats:
- 
- @example
- ``pop:@var{HOST}:@var{PORT}:@var{AUTH}:@var{USER}:@var{PASSWORD}''
--``imap:@var{HOST}:@var{PORT}:@var{MAILBOX}:@var{AUTH}:@var{USER}:@var{PASSWORD}''@end example
-+``imap:@var{HOST}:@var{PORT}:@var{MAILBOX}:@var{AUTH}:@var{USER}:@var{PASSWORD}''
-+@end example
- 
- @noindent Remote mailboxes accessed by VM in this fashion are referred
- to as @dfn{server folders} (and @dfn{POP folders} or @dfn{IMAP
-@@ -996,8 +997,7 @@ The variable's value should be an associ
-  ((@var{IMAPDROP} @var{NAME}) ...)
- @end example
- 
--@var{IMAPDROP} is an IMAP maildrop specification (@ref{maildrop
--  specification}). 
-+@var{IMAPDROP} is an IMAP maildrop specification (@ref{maildrop specification}).
- 
- @var{NAME} is a string that should give a less cumbersome name that you
- will use to refer to this maildrop when using @code{vm-visit-imap-folder}.
-@@ -2342,7 +2342,7 @@ MIME encode it as necessary.
- * MIME preview::        Previewing a MIME message before sending.
- @end menu
- 
--@node MIME attachments, MIME characters, MIME Composition, MIME Composition, 
-+@node MIME attachments, MIME characters, MIME Composition, MIME Composition
- @unnumberedsec MIME attachments
- 
- @kindex C-c C-a
-@@ -3328,13 +3328,15 @@ The fifth is `f' or ` ', for messages fi
- The sixth is `w' or ` ', for messages written.
- @*
- The seventh is `e' or ` ', for messages that have been edited.
-+@vindex vm-summary-attachment-indicator
- @item P
- indicator for a message with attachments.
--The variable @vindex vm-summary-attachment-indicator
-+The variable
- @code{vm-summary-attachment-indicator} is the inserted string, by default a @code{$}.
-+@vindex vm-summary-postponed-indicator
- @item p
- indicator for a postponed message. 
--The variable @vindex vm-summary-postponed-indicator
-+The variable
- @code{vm-summary-postponed-indicator} is the inserted string, by default a @code{P}.
- @item c
- number of characters in message (ignoring headers)
-@@ -4588,7 +4590,7 @@ The project code base is maintained at t
- @uref{http://launchpad.net/vm}.  The ``VM Development Team'' can be
- reached here using the email address @code{vm@@launchpad.net}.
- 
--@unnumberedsubsec Savannah project site
-+@unnumberedsec Savannah project site
- 
- The changes made in each of the releases is described in the @samp{NEWS}
- file, which can be found in the source code repository.  The changes made
diff --git a/app-emacs/vm/vm-8.1.2.ebuild b/app-emacs/vm/vm-8.1.2.ebuild
deleted file mode 100644
index 3cc65011f9ca..000000000000
--- a/app-emacs/vm/vm-8.1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp eutils
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="The VM mail reader for Emacs"
-HOMEPAGE="http://www.nongnu.org/viewmail/"
-SRC_URI="https://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="bbdb ssl"
-
-DEPEND="bbdb? ( app-emacs/bbdb )"
-RDEPEND="!app-emacs/u-vm-color
-	${DEPEND}
-	ssl? ( net-misc/stunnel )"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo-8.0.el"
-
-src_prepare() {
-	if ! use bbdb; then
-		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
-		epatch "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
-	fi
-	epatch "${FILESDIR}/${P}-texinfo-5.patch"
-}
-
-src_configure() {
-	econf \
-		--with-emacs="emacs" \
-		--with-pixmapdir="${SITEETC}/${PN}" \
-		$(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc CHANGES NEWS README TODO example.vm
-}
diff --git a/app-emacs/vm/vm-8.2.0_beta-r1.ebuild b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
index 2027647cf11c..143e0808b91d 100644
--- a/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
+++ b/app-emacs/vm/vm-8.2.0_beta-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
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="bbdb ssl"
 
 DEPEND="bbdb? ( app-emacs/bbdb )"
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index e56fdc359e6a..32366092a41f 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -1,6 +1,6 @@
 AUX 50wanderlust-gentoo.el 244 BLAKE2B 57be93cdfb9e1854ec5841996b586843ca6e514830d2c979ba9aa400200a6514220e632985a5fd6191969ef5b8a2ff32c4d2d7edfb83017c4230028107b4ab87 SHA512 2057a8d18d5c7c91c968921799d502e02a61718d437ce9a69de68ebe4f409414a799ca7b5737a8994afd52793cf03eebce03b85311db02c441efba92f0d30233
 DIST wanderlust-2.15.9_p20180814-git.tar.gz 1207081 BLAKE2B f52259b15040287f0afcf0768b3ae3237415b44960e205e48d4b658f3e522db993b87bac59ee3d9ba94ad26c830beaf26d9cf5f03830fcb1f01e4f5567ee4804 SHA512 67616cc1d35b25af1b56fa800943ad0c7e7d9b35f99c48fac96b77a68a3eb8db02b36525021ff8bba4d181530505face2a58725b7dff33b1bfe4f48a4314949f
 DIST wanderlust-2.15.9_p20190623.tar.gz 1210223 BLAKE2B 50416e27062a9837c18660ea9a1a7a3ff596639763965b09925ca16c89617d159b9aa5d08d93d8b5c6a504da2b048df8b4c489d4fc11ff6abc530f741a5d8fb9 SHA512 369f8d93af4d0d98f66c4c8500aa3535e3f772d8a1920c1bdc434f0d9078555f40d0d4278937d97bccf0f417cf1b1fdeb6c8a891d42b2675fb7737382425c91d
-EBUILD wanderlust-2.15.9_p20180814.ebuild 1324 BLAKE2B fb7abd2e4252ac534463e89502d674e4481be355bdb3c7c79ac73d09d03d31930a86af306cca4198b5020fd75c390b3864019daed60f22ff9461443bc0af6127 SHA512 a0619df4f09bae8da12e472a86e460f9791f4f95285253fde06a035a5ff469d2ad22e357697202815b9adc40b66942d92779649a3029f744d64de262e7a1aa10
-EBUILD wanderlust-2.15.9_p20190623.ebuild 1335 BLAKE2B 2fe37f003e660137388d46587c743ba3581509b10795dfcb46cdc22b014a62db95acd16c430ebf3f4e83864b6be835956fcf68c08c11f426ac56f9b8b973cdc5 SHA512 615a1fe8b68b3f2c0684fa150fd0b548992e8322b00e36e42db5db663836042401e5e268cde98c19692c76aebf27c1b63d2aa140e5eb1ff5589be368a4177472
+EBUILD wanderlust-2.15.9_p20180814.ebuild 1353 BLAKE2B 1c593e02a45e5dc45030e84c1f0e2a07b1a1e229588abed803bfad6d80947376087168f774c944dbe47719f946fcc5d217e5d3e602ff87d592973d3504313c78 SHA512 62947cf22c4b380e90e4a1a0d55f001928ed57f40720a944e9977a5feea7dae9542fd97169c2ed67d25ba0dc0d729dc767a2c5a7d184c3d072d48b175e7bfd53
+EBUILD wanderlust-2.15.9_p20190623.ebuild 1371 BLAKE2B 42d00364f87a57408cac79875886872a168b45904e6bd3627330e70aa345904dfab6ebd2c64c81f943f22e7aa78cedfdb100c69218ff2f5513f4a9bcf306084d SHA512 5bf8d08b8da7f88d8c6ee6c54e008eedcd709360af3b06b895a332de396b285580d0f554cb1e499606bfc2c8961f459ce7b72bd64e607fb69f4e81cae753c774
 MISC metadata.xml 452 BLAKE2B 79c5173a90f5687cadfb5fbf4bddfdaf4838d7b8b13d8df5f6221f2fc3a8ef777eebd7f13ec4bad09621082d688566cde30154b9c684deadd0e05c083e079857 SHA512 449539b7243e9d6646fa5cf7d56aa2cf227a6104c1dd2f1fbfdb843d7561b94315e649e2cfd5646093bed06f4f172e08adeb034a52b7b654fb3e49cabc45f8e6
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild
index b425c3ba6b4e..9fc16f03c0f9 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild
@@ -8,7 +8,7 @@ inherit elisp
 DESCRIPTION="Yet Another Message Interface on Emacsen"
 HOMEPAGE="https://github.com/wanderlust/wanderlust"
 GITHUB_SHA1="395826e99b84051396d503392f52462b6cb683a5"
-SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}-git.tar.gz"
+SRC_URI="https://github.com/wanderlust/wanderlust/archive/${GITHUB_SHA1}.tar.gz -> ${P}-git.tar.gz"
 S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
index bfb9cae0e084..d5f2f842462a 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
@@ -8,11 +8,11 @@ inherit elisp
 DESCRIPTION="Yet Another Message Interface on Emacsen"
 HOMEPAGE="https://github.com/wanderlust/wanderlust"
 GITHUB_SHA1="b9a529a54b9e7eafa4ed230ad28efffe0d25a20e"
-SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/wanderlust/wanderlust/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bbdb ssl l10n_ja"
 
 DEPEND=">=app-emacs/apel-10.8
diff --git a/app-emacs/xclip/Manifest b/app-emacs/xclip/Manifest
index 099feb72f471..42551fa12ce8 100644
--- a/app-emacs/xclip/Manifest
+++ b/app-emacs/xclip/Manifest
@@ -1,4 +1,6 @@
 AUX 50xclip-gentoo.el 128 BLAKE2B 8a5ecef89d13e7f65cf59c868adf5c984ff5dc30eedbfa23180f8c0d87a07c54215222fbbc38d0ade389aef2cbd9be1e584b31fd9f9a002f6893e689b8533230 SHA512 beadac08608ab6a45e5162ccb993b7ef99e9f3b811f144a49eb6caae25602f4346bfe15c9771177f0d9495929f92eb1e5e59b60f5957551beb7dd69340ed416c
 DIST xclip-1.3.el.xz 2164 BLAKE2B 739cad92a92732a12ac077fc9749bc883b4386977d4c47e793023811c1e668668277f6e0a6bc7105cb7a1186c0d6b3ab276dfb655478d5a6063882f60fa9a7e6 SHA512 5b51703a365fa3991a97c06734b6baf6473ba672ab2ed572db45330fc6b761258403191079725f8c3e8d72919355a2cadf0c04e31396805718de30474ac08520
+DIST xclip-1.9.el.xz 5120 BLAKE2B a2cdfda709d51d7cb8cc3792d23d97fee5b03d1a1fbcf8dfb7810aa91080b0e4af47854ec1fc9e184055c50590d181639c0da100bf4e0a0d41dd856c2f75269d SHA512 96df6cc4257125876b57f3aba469c78136c2366d045b5be38c1f2d8ba69752e6625ec6deacc25da013da2a1bff54821d2171bab9308b24ab3e49a18c3d39ddbb
 EBUILD xclip-1.3.ebuild 480 BLAKE2B e8d7f48160c6852838d55a08f86717e77aab25d7829324d90cd2887f96890977746e681191f135a0d4af827247514cd48a218ab1634fae4236a9683b21df80f1 SHA512 8d4fdd7e8057b31952f54f9da9eb894116dc591c6ec39141d68a288b9b79016d7747dcaeb9679e437c155664eceaa6a9765c7b106a9514cd913a1e29f425af21
+EBUILD xclip-1.9.ebuild 480 BLAKE2B d75eb007100352e78beae08bc8e75d7ce398d6d35468509b39bf45794b39685518e02ae2b12876ddc69817d65cd806df6ba3aa5a799b97156feaad7bf05b1813 SHA512 db6bffe4ae97fd4cbbd8f411ff4708f5e1dfa0394d634372db777c7e4bb0459b623aed70447ff3bedf5fa85bca4ef77e78e741d4705fb3de1bca940dd9d170ca
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/xclip/xclip-1.9.ebuild b/app-emacs/xclip/xclip-1.9.ebuild
new file mode 100644
index 000000000000..8c192847ee8d
--- /dev/null
+++ b/app-emacs/xclip/xclip-1.9.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Emacs Interface to XClip"
+HOMEPAGE="https://elpa.gnu.org/packages/xclip.html"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-misc/xclip"
+
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="To enable xclip-mode, add (xclip-mode 1) to your ~/.emacs file."
diff --git a/app-emacs/xslide/Manifest b/app-emacs/xslide/Manifest
index c38eb264194f..aa7380871df8 100644
--- a/app-emacs/xslide/Manifest
+++ b/app-emacs/xslide/Manifest
@@ -1,4 +1,6 @@
 AUX 50xslide-gentoo.el 264 BLAKE2B 8a3cbd3159bcd3092e381e702576987e7f2389732063d7e0b0aaa84f98b1b975d4462ccdc1ac17603ede616eb052887c8da9df489c62ab2b9f0c9424072062bb SHA512 54dfb6e7d40591dcf7ee5625ded053056305eb72c64f3808758d20b9c9fdbc78f914765909c44ff9685b075f5d87e03a94afea156b179d6ae16275d1f9ad05e8
+DIST xslide-0.2.2.tar.gz 23469 BLAKE2B a7628267b45b1da9ba1cefef5b186ed0a01975546e0bd0f551dcac6810c59e7a75bd7d479c21e4199eb12725d8a0babb2e1ae1912ae53702ad72021b4775a7bf SHA512 e0cc7b42eddcaf9fe7860fad4eff14dd3c963578302884c9aa1caf09eaef08e73b7a3f60d15de7e31ce39d735751dbef33db2181531947ace9af25d0c5092697
 DIST xslide-0.2.2.zip 29051 BLAKE2B d29bfb9b932c1370d51695ccc00d16e6d0c3ea5025f42281df51bed016cead5bdaef95dbc2fc538ba493641ca799b7a048f48b659692e975feaf5ae8b545f1ec SHA512 df658464517704289d2695faed02d733adea9f5858310b497d66bf103be5c3e1c3635aa1aa3c93f63c64cd2927b4948e53e7b2593622564f5292c583d6e245a8
+EBUILD xslide-0.2.2-r1.ebuild 476 BLAKE2B 3cd48d7a6af0fec4624999a62514e55693958604afc7df4660b5710fa7ea15d4fdb16ab3e5f1fa1a044ab0a5e1e456a0445787d798a4ca5d779ed4570b7a5a8a SHA512 9e6bdee5ef94bb82fb6d15490a29c16943bfff7571987731396abcb1f46bf4664dc85c4be99c187bb6115801ff3a97263047f5682a9b5590c49feb78de155d03
 EBUILD xslide-0.2.2.ebuild 520 BLAKE2B 0b5041a161c7c35187303f44729479153957d10effa5cac35f1418b0284e5b4c755c80f7b0cf07a5626c59d5d90920beeeb9ea941f0bc609c7da67de0aef88ce SHA512 4b3895a41210215deb5aba2172d31aacf64f3869e2a178c3d8c42c735aff544874cce557e6e09b0ffa7c20be6bc4a8a17cc0568ad49c6ebc928ede3db92e2dc1
 MISC metadata.xml 356 BLAKE2B 6b8ff8b4ccbc7f2c5c85c154ec1eb694bb83306d9832227556873cea83a29684b63ec6e95fefcf3cec83e8f3585c00882f12186d37aed81f022aae04c1c8019e SHA512 ee8540b29674e44b7aa072c02ca5031df5c5283c1eaaab2ca6a549dce024c40e25a2316949d7997951f8db69322e592d5efcd59a4f9e4480ccda668d096459d8
diff --git a/app-emacs/xslide/xslide-0.2.2-r1.ebuild b/app-emacs/xslide/xslide-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..f940babe7d83
--- /dev/null
+++ b/app-emacs/xslide/xslide-0.2.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing XSL stylesheets and running XSL processes"
+HOMEPAGE="https://sourceforge.net/projects/xslide/"
+SRC_URI="mirror://sourceforge/xslide/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog NEWS README.TXT TODO"
+
+src_compile() {
+	default
+}
diff --git a/app-emacs/zenburn/Manifest b/app-emacs/zenburn/Manifest
index 223244062895..ebaeac50a010 100644
--- a/app-emacs/zenburn/Manifest
+++ b/app-emacs/zenburn/Manifest
@@ -1,4 +1,6 @@
 AUX 50zenburn-gentoo.el 180 BLAKE2B 9ddd4068d000d8aec01e864f90c4ab1f418d45b4bd04c65ebdd3159e93dc6a2cf63dd1a11c88aa65a571dc1b89fc5e474ce6515f4b8f25392a870ec3961ccff5 SHA512 712853121e485d5100b89c69de853e8c0437c7b4c8fc47068281f6bc7dc3934a8417bb7e50f06b814991a016e6bb0be4859f01f63d4159523fb0ebc0acfbab23
 DIST zenburn-20110907.el.bz2 6979 BLAKE2B 3f38e857c9e09d73d5aafc7e5a98292c122b5ab903c902fe43be1d91ab20a9703a974707354b9f07eab190324ee4ac8a392efae06f2c05a07dd9914a78ebde4c SHA512 552f4a751ffadaf2f4174c7f722abc1fb7a8f84934df01f61c2d7cf653328ce8fd18473f0748eaa570ab9221544e5e9c81243e731a2fff5f2c9028b992163062
+DIST zenburn-20110907.tar.gz 7952 BLAKE2B c1d63eacd5e77f1d453ddd9323a7f573e487625e1f210c0a93f8992fe741d097f7662fca23900cbca320c9b0aa1484ada885b0b9c077f9a9370863172683b255 SHA512 be19da75b1f776128a8c8701655a0c7cae0d1228ed9d92cf5b57047f99385cf996c27aec9514118612a1728c126feb8892f1375c156a1b345e1018154edf6e79
+EBUILD zenburn-20110907-r1.ebuild 728 BLAKE2B d0c98e1372c7b948f72c9d71205a6e337eb233a70d6e44d6e8898bca7770ccbf4d7a852cba3013472498d6f1ce511ea4d191163439b049db485547d926a7fbd9 SHA512 f2a02a743424bf6b65825667a7017fd2845dc7bc838e46d69c7307145407851a3902502e7ecc3b4c8e46950288986b17330deb05646723e8adbeaf1af590fd8f
 EBUILD zenburn-20110907.ebuild 614 BLAKE2B 60a98f4d9c3301f50ef849bc4cb7b8f54b37bfd1e552c34a1e3b0ef783a5797a1f24039539ba46d122a03b83966285de99592c74a196adb8b94c36a387cbb929 SHA512 5fa53e44441c3f8ebd2ce3d6288b1f9191c6b2fc69caf81b816cf7f15dcfc8c0e215717939119a2273b2c4d670da6099a4f98d900e5c9ce5e06916992f5b76cf
 MISC metadata.xml 534 BLAKE2B d7a3d1d169842f90c9ce6ccc7b835c154f171098a8994f4769c041877c8d746915f461b2f97f651a62e4c750fb80290ce0549de9ccc6724c3e6fde9a5daf8947 SHA512 b1f6d9b271628e63c77f095228095581c7174207d6f1b24bac7c3b5de5ae7429b53621056a671e481dacaeba003f37e5911db3c47633ef3d80f64526214e4342
diff --git a/app-emacs/zenburn/zenburn-20110907-r1.ebuild b/app-emacs/zenburn/zenburn-20110907-r1.ebuild
new file mode 100644
index 000000000000..a444bae490e2
--- /dev/null
+++ b/app-emacs/zenburn/zenburn-20110907-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+COMMIT="2b0672b04ef3e95c25f849dceb10d669296a188b"
+DESCRIPTION="Zenburn color theme for Emacs"
+HOMEPAGE="https://web.archive.org/web/20140612104441/http://slinky.imukuppi.org/zenburnpage/
+	https://github.com/dbrock/zenburn-el"
+SRC_URI="https://github.com/dbrock/${PN}-el/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/color-theme"
+BDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-el-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="To enable zenburn by default, initialise it in your ~/.emacs:
+	\n\t(color-theme-zenburn)"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 3197fd594751..3de7191ef37c 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 0549b48ffe9b..03937ba7342a 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,9 +1,11 @@
 DIST buildah-1.10.0.tar.gz 9362108 BLAKE2B 691b5273056f9eb3e1f1dabf22c299ae281af8db13e680351bc0f4e0b6560b0ac20def5a1b3a039d14b97bb35a935a34ae83eeadc6272ad4d68a494439cc5f57 SHA512 33d33bb622e69512a2e11592455d654f6478994e78894bd0f73e03cc01e12c7e30b1fc25bbd6b44a3ce83b9e261ffb47c3d08a99bf523f4fe0e3ff00d93861a8
 DIST buildah-1.10.1.tar.gz 9378648 BLAKE2B ea563d1a52634aa4e0172f05caf04b511bd9962cec012ed35830ceb5848dae1c14020167d61d44e11d0dcdcd6d5440c216505a11987f6806bac1336dd12152c9 SHA512 0651ed1ec6015b437ed0a786bef20c6a88fedfa4d318edc081d257720b1cc2c8d380a8cde5125ab5894bf0b4a6df90034b689097f7cc05630401e8e7700fca6a
+DIST buildah-1.11.0.tar.gz 10065996 BLAKE2B fcf709f7474bcb45f2da6f90b614b4c95036d19c05fad715f80720efbb9ad6c4be6725001de4b5198c7d81e365ff12a742b73bc5d7268819de56c4b2fbe0b8e4 SHA512 a5e852a427de4e3f3ce8d78fb8ea82e8b6e0a1bcc6a0bc786c2bcb0d4689fec5f5a6413f77898bd953dc7eeea31d1d58fe22fac40cd5209fa5016a376a9958b7
 DIST buildah-1.8.4.tar.gz 5122400 BLAKE2B b02a1cac77f5f16ab6cec3a74f11ee94675c717ead21fd791feb4cfbd08dcfb4313a1ee3134d3b9f9d20218935db35e28dab406a9f706ff2f46a2beb1abaa56b SHA512 a316e5e2bea7cded1db089bbc7831c9af69242caa6108c78d63864c012053bda3dc3da5bf70248b2742b2be1ad66aeb59c844558022c20f79236f5b1292d6366
 DIST buildah-1.9.2.tar.gz 9505091 BLAKE2B 886e1ae5804f005f5782d011ed8440a8ac5eb09b2cf7917ac04ed1ab3e08f8cce6ef9b8efaf3392d60ed46b5bdb2efcec8b44c0448f970210cd613837a5d8f1f SHA512 1add432491fcae3b22dac2768ba71be2a47f42f3d9fae14cc5ff54220b3b7b96a48a95cb10b249de98f9c3067d463bbeca75c7c52783c111a9b5ed0ba03eb30f
 EBUILD buildah-1.10.0.ebuild 1446 BLAKE2B 6fd24b1e8f98f2db900fdc3840e7448cb61fa1023783e22d384a0ecff4da5d8398c9c8cd1c096c6bb6cbef297517e009fbc818aed03716b05c9f4716b237ce71 SHA512 a743db9feccc105c90b0180e4151d62d4e8bb400b8f3324702896821560bdc8d08e9545c738863e4985d7fd9a264fd7cb7166446167dbeb51348d499cf47017b
 EBUILD buildah-1.10.1.ebuild 1446 BLAKE2B 0d5351236e5fce90665bc9b30e134d9a33ad4ed0cc9d6fb4f4977243946fa3dcaa94e7c156b7db58aabdbdb12c2bbe4f10b54d7eae644734b68584b30970ab85 SHA512 956d1447f322af82f0f8f88c483d980b4409e5cecb6d01980ad31b16844f46722497cd39a760c169461cf2a493fb31bc191df8dee682b02edd038054aae52487
+EBUILD buildah-1.11.0.ebuild 1446 BLAKE2B 8dc0564305db4174600aa2181a0ca5c67c4ba8c2526e148a58eff60c0078057f0a1d1c139a25167a7ba2919a1c069f2026b5f357f88217a65234b647059eedec SHA512 42b645d49dde0685aaf444166c2809d424f7fcfcaa1ebf07c919c5156988ce0b320397770ae7d4108bdb1ff40cf733806d0b1296330949c96d83d4e59df8d198
 EBUILD buildah-1.8.4.ebuild 1446 BLAKE2B 12ce28dbbc9cdd9b3dcc9ffb32d31e343645db77c83349b02d114d1fe26d9f3a54208df5fde51760e913ffaaa2ea3b1f8ba5ef7e2bc925767ca41899d38d5688 SHA512 7fe65e02c631a6688d402fd6922b8bfb8cb8ffe9f496ccba5ccf2356fbdc066cb827a759f57f59ad53ab85c6544244fc48f0d5e048010ce7ea23b54512fc16ec
 EBUILD buildah-1.9.2.ebuild 1446 BLAKE2B 5f89e5874d84b1813c39485970832ca13a7ba70add473867d14d36d1252139bc0059ee3a365b0a530297c58dffd046ba55cb88771bdc8faf8313c70ee3adcf40 SHA512 502b062366388451ea0c120b6d05a6d6cc2db7a8b1f986f3b6e72b104b0651dd313032f16f56c5bbb7c519102598d1c94c73ae9f25c2ce6080fbab6cf1948c42
 MISC metadata.xml 430 BLAKE2B 7486f6f62edf735da40a63ee17411e421101908e3e2652584800a3bfe315afbd46b9b6fe6338f8bb6cc7d09eb1bab34c1600e9aa6ae08b8d0326ee896270f2ea SHA512 8f25eca02d11272cc5a479adf3e361fe7f7cd595b0d54d26668b68940e012499d6c447ba93f44773a72f5431dffc346f1286be1f1a984eaa94e9dfc9501eb7b0
diff --git a/app-emulation/buildah/buildah-1.11.0.ebuild b/app-emulation/buildah/buildah-1.11.0.ebuild
new file mode 100644
index 000000000000..5675dd131e1f
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.11.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ostree selinux"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="2c5da1b"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RDEPEND="app-crypt/gpgme:=
+	app-emulation/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+REQUIRED_USE="!selinux? ( !ostree )"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
+
+	[[ -f ostree_tag.sh ]] || die
+	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
+		ostree_tag.sh || die; }
+
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
+	GOPATH="${WORKDIR}/${P}" emake all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin ${PN} imgtype
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" emake test-unit
+}
diff --git a/app-emulation/cadvisor/Manifest b/app-emulation/cadvisor/Manifest
index 0372d2927175..7d9ccd13ad87 100644
--- a/app-emulation/cadvisor/Manifest
+++ b/app-emulation/cadvisor/Manifest
@@ -2,6 +2,8 @@ AUX cadvisor.initd 555 BLAKE2B eaea61c2f974f9cfd97244243581d20da2f0312b4772f7321
 AUX cadvisor.initd-r1 567 BLAKE2B 8cd59227cdc07047c6c62fbcf74ec942468b86881d9b149a44fb60a10d8ed2a07c0cc97d59a9acf6dabac55969a77a6c69305893a4dcc90d10df9f4b007186c6 SHA512 84124c91f718446473644f3ed9e82592b1dbf14aecbf13a0a31a58938df19f8f65a108e03d0f377866ddc9d68cba1cb6963c2e5b9c384e6f6df441b504384460
 DIST cadvisor-0.33.0.tar.gz 4646920 BLAKE2B ce0e264321efcfbbf422f086cd15dfde389a099d183cbc2daaefb5aa6aa36da0c6e213dc4c12a000b9049ce2a1444addee93746f5650a56fa0f7c6612aa25bd9 SHA512 3d1dd1b9dc684e71bca9dc64949911f5f3ae72c97aa3b6cd45dd51a404fc101b5591ec8c19c469d6a410de3cf46c3d8c104d34e5dd1fdc85c18c2d1b6a45b2af
 DIST cadvisor-0.33.1.tar.gz 4646909 BLAKE2B 1ba30d559c018bf11297ded8adcc77a8761f77a1a39d75fb6e704ab84b3118d14587c91fd638da59bc9a46969b0545bdcf55e482390adeef6a4841fd6a57988c SHA512 659b8c48f74ef34044c7b3d9a41d42338c9c90fa443bdf7766001ae570aab8ed61efa948d1d01c324b6f03a0d1bf3d3fb1483d40bfc3b7e67f768253e3638de5
+DIST cadvisor-0.34.0.tar.gz 5210189 BLAKE2B 48cf7ddc94e52f07a0e74868d00f4a45d45aa5233b518da46762743357c17cbe7f2971794deda9936a10c65724928a219c498bf6d2493266f5b0ea547d485cb6 SHA512 accb41afd4683413b846f9380229bfa54c88b3141be68492963444928e40e14fc28da3ce27b09746e29c4dfe6323cd6bea69181826367e830f284d6ab698c633
 EBUILD cadvisor-0.33.0-r1.ebuild 1067 BLAKE2B 1fc65cb53cf5485086b9e09ce4b5d55b03badf1b0897786e7dd110dce93a4b23e51e1594a7c3161a88ee417195ff8e31ec85e26d5a885e68b57155ef4eed43c5 SHA512 defde9918c8120d66a4766eae04c2e7c7d6e0bab1c97f40abd957bdc2d4e70181b672cce19444af071147f71c18a0974847f5eb9804a1cb042db41c1544d1544
 EBUILD cadvisor-0.33.1.ebuild 1067 BLAKE2B 6ca8de198d551133211b7840e54a497cae13e030c0d96294de2a30d86a56f4daf70ada324b308d722be79af6d438fc603902e73cf3659d84157388a94c8b4866 SHA512 52d29f926766995041bcfe545602df81aa24ae1725f853efe203711513ed7bf7c03e41d99fd359d390a4b3df5c72cdcaf256438a15e6903be35458795932c698
+EBUILD cadvisor-0.34.0.ebuild 1067 BLAKE2B 0cbedfd14e5fbb69bcf6a9778f0208ab1f6520f166ccb119dc15a23d95238053e6281e9ae0fbd300724933dc66a04b9d0c0836d6ffa53d0f309919ac571528d2 SHA512 88f20182dd1a60de4b03eee51ab325763eb6ce896348a797900dcd0f46fee8992263d2902f9f63bcd593417e8a7cf62feb1c5430daf7c99301dd8587490a2821
 MISC metadata.xml 325 BLAKE2B 3a83be7d0ee504a5ef4b25d8826101878da8bac2228afbe0598ec0aef7435d69ed6d754b88453336fd84a1ef38ab1646eb890bfbff1e8549836aa12c7d497f4b SHA512 d083dae5366eaea34ba9697c49a4399e822000a19b11cffffe82e08f4a331eb0f4672c8271ac342cebb79a66c1a245e41a17ff1d40ecbad2354940bfa14c1b06
diff --git a/app-emulation/cadvisor/cadvisor-0.34.0.ebuild b/app-emulation/cadvisor/cadvisor-0.34.0.ebuild
new file mode 100644
index 000000000000..26280e2293af
--- /dev/null
+++ b/app-emulation/cadvisor/cadvisor-0.34.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/google/cadvisor"
+
+inherit user golang-build golang-vcs-snapshot
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+COMMIT="24a6a52"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
+HOMEPAGE="https://github.com/google/cadvisor"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_prepare() {
+	sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die
+	sed -i -e "s/git describe.*/echo ${PV} )/"\
+		-e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\
+		src/${EGO_PN}/build/build.sh || die
+	default
+}
+
+src_compile() {
+	pushd "src/${EGO_PN}"
+	GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build
+	popd || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	dobin src/${EGO_PN}/${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest
index 922da5188b5f..129e54ec91c2 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1,5 +1,7 @@
-DIST conmon-0.2.0.tar.gz 48349 BLAKE2B f61d1750437102c3772669ac8cff75204bf6811a221212cb7127a439b57b70afacb460f4128413e242ccceb0fe44c417dcd0a7f08536f272131704f3a6cbd599 SHA512 81b6eb88a473c6b4e349e18ba48682dd15f5f1ad841d2ca6bead8b5f9b418dd20832a855a1c8d81ac77562d00cb6e5852aab4f6f4ce15f099ca63a0a3f432ec8
 DIST conmon-0.3.0.tar.gz 49021 BLAKE2B ca753f8fe0801cef4e392e2f60e58c51100628f0576c46d139c9c9827a927970ec63bb0aaebce6ac6ffaedae75b141730833b8adcafc8d9777900d96319edff3 SHA512 9a60f3eace596a8d12dc950597a9e3619a6728bf4555bb1636da3ac8ed8a6bc2ae28471cba9c7c3ad04b61a24aa4bbd28242a22940240bf27babb834031deea4
-EBUILD conmon-0.2.0.ebuild 929 BLAKE2B 8cebe07ee1dd31992efb45a3c35a1564c7806453d5c60d6f5a89a381a5c30476fae984736252f6868062161a462d7f2070ca796da3e49f54e921dd2146e03aa5 SHA512 08fefcc27c504946f006c5edd0c8a96fd55ae55db6208fdc865dbc65202f23eb79de876d2778c2c6dc3ee194227f6dfbe27dbf10aef98d24154405fba9337a11
-EBUILD conmon-0.3.0.ebuild 890 BLAKE2B 863ac75499780fe264c05e2535383e8f9a82d928236a8628f26b99d1c676273a47d4a2422d83a5df5993e1f575d59028c749d47b0fccd65f3bdd875a73112760 SHA512 e1c5230789d4285de2d98dc9d1cc34838f84b2526da176a5df8d5d1b299acc53470b0f8c93cecfc18357cded1dd62aae35e223ef4136cf730a8b632b2f46ca6d
+DIST conmon-0.4.0.tar.gz 48889 BLAKE2B 50bfa534d04428b422902ab3cd4feec5cb1cf7a6411eb35fc2420680eccc95dd17d7cd1ed8af904f6d246f10511b23b69ff112fee70d3a734098fcd7f5d7d7e7 SHA512 6aa9e0f72231bd890df4f4fe96b8831ad0fcb3e1f0edef74af8471aa227aefc3d8ea20d8bf0d50a6c06913c6360970464ea1b44fb68c77dbcc2da55073704bdd
+DIST conmon-2.0.0.tar.gz 51805 BLAKE2B 4c9e89c7d2339c82eda41b35f014ef392e185a28e93e81770bb1b9c629709c9b20ce0e7d78a0a1e2a68193e791ec45e70d427d8f4533adf5817bf806e919b524 SHA512 0d903f1b83248a130fa6a5c212f96a5bcc37113cfb93c73847a3744b9da8ca355f93f16ca57f4bfb50bcba13b272f23970fdec8ab7ac1862e93b3057512e572b
+EBUILD conmon-0.3.0.ebuild 917 BLAKE2B f725e979caeecc2467d5152230530b4cc0c63f536c0dc47c198b2c0b03e41b365b12e0f0f707cb598ef757e5d294611d0926457ee1e75ad71d1b5a8a817ecf1f SHA512 bf854a15acae1b18a6ec2ca80a5063ed64da5b46b4b39d6a8f213fd7bd7005ab672e3ede077531fa01dc32c4accb00651aaedb27294b56b7ec1bd0c70b61bd1d
+EBUILD conmon-0.4.0.ebuild 923 BLAKE2B adc16561c26da5483166b64cade0b8964f8549145f9bd503187c1d17829794c6dceacfa5276168ac51f33d5bdca5bd616c08db33f44c7f57ae0bb93d057f1ef8 SHA512 578a793aed849dc6f438a7ce35e9c9de1b914831983c423e01ab4496848699513a87ae78f918d06943636d533720e234c80cab2b8d567d564ccbd1cc2bc232b0
+EBUILD conmon-2.0.0.ebuild 923 BLAKE2B 3e6cf43b42c098ce9d4e3ec7cb62884c5587d591c0e2f1060d323954102ffeff7710a44de0560aab5ab3652c1ce34e9669d550d5057504d11330c35ed28fa256 SHA512 ba960efa3aba615d0ba4b82b832072a383c01acc2b4ffaa74af454bf8fe2bd86984fc34eb681927703868e707730d74887fae12d707cff3caf993978575b99f3
 MISC metadata.xml 326 BLAKE2B 88e40bbfd92c360f7ed559dc1f3ebe8d35a4905c413de8208a72e255e531d32f61dea3ad710b3a2743df01b29f3f5426440beff3ffcd59139d6f5ce118c17557 SHA512 0709bf7dd7300225974bbf974a3c90c27a368ae6862e080c95f0fb30f314b94c0502258773649fe2cdeba22ad9f5c0d29d000f95e8f7d961e9cdfbea108b4775
diff --git a/app-emulation/conmon/conmon-0.2.0.ebuild b/app-emulation/conmon/conmon-0.2.0.ebuild
deleted file mode 100644
index b529698cd21c..000000000000
--- a/app-emulation/conmon/conmon-0.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="~amd64"
-DESCRIPTION="An OCI container runtime monitor"
-HOMEPAGE="https://github.com/containers/conmon"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="systemd"
-EGIT_COMMIT="59952292a3b07ac125575024ae21956efe0ecdfb"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RDEPEND="dev-libs/glib:=
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if ! use systemd; then
-		sed -e 's| pkg-config --exists libsystemd-journal | false |' \
-			-e 's| pkg-config --exists libsystemd | false |' \
-			-i Makefile || die
-	fi
-}
-
-src_compile() {
-	emake GIT_COMMIT="${EGIT_COMMIT}" \
-		all
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX="${ED}/usr" \
-		install
-	mv "${ED}/usr/libexec"/{crio,podman} || die
-	dodir /usr/bin
-	ln "${ED}/usr/"{libexec/podman,bin}/conmon || die
-	dodoc README.md
-}
diff --git a/app-emulation/conmon/conmon-0.3.0.ebuild b/app-emulation/conmon/conmon-0.3.0.ebuild
index 72995a2d2822..0946d32bf2f1 100644
--- a/app-emulation/conmon/conmon-0.3.0.ebuild
+++ b/app-emulation/conmon/conmon-0.3.0.ebuild
@@ -3,14 +3,16 @@
 
 EAPI=7
 
-KEYWORDS="~amd64"
+EGIT_COMMIT="8455ce1ef385120deb827d0f0588c04357bad4c4"
 DESCRIPTION="An OCI container runtime monitor"
 HOMEPAGE="https://github.com/containers/conmon"
+SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="Apache-2.0"
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="systemd"
-EGIT_COMMIT="8455ce1ef385120deb827d0f0588c04357bad4c4"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 RDEPEND="dev-libs/glib:=
 	systemd? ( sys-apps/systemd:= )"
 DEPEND="${RDEPEND}"
diff --git a/app-emulation/conmon/conmon-0.4.0.ebuild b/app-emulation/conmon/conmon-0.4.0.ebuild
new file mode 100644
index 000000000000..65866c0ffe79
--- /dev/null
+++ b/app-emulation/conmon/conmon-0.4.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="ba305505e9621fc0b4429287bfc2c2a7057af51a"
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon"
+SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd"
+
+RDEPEND="dev-libs/glib:=
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
+			-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
+			-i Makefile || die
+	fi
+}
+
+src_compile() {
+	emake GIT_COMMIT="${EGIT_COMMIT}" \
+		all
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="/usr" \
+		install
+	dodir /usr/libexec/podman
+	ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
+	dodoc README.md
+}
diff --git a/app-emulation/conmon/conmon-2.0.0.ebuild b/app-emulation/conmon/conmon-2.0.0.ebuild
new file mode 100644
index 000000000000..f204af5c41de
--- /dev/null
+++ b/app-emulation/conmon/conmon-2.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="e217fdff82e0b1a6184a28c43043a4065083407f"
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon"
+SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd"
+
+RDEPEND="dev-libs/glib:=
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
+			-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
+			-i Makefile || die
+	fi
+}
+
+src_compile() {
+	emake GIT_COMMIT="${EGIT_COMMIT}" \
+		all
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="/usr" \
+		install
+	dodir /usr/libexec/podman
+	ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
+	dodoc README.md
+}
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 28e51d847e5f..16859a65b6c4 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,4 +1,6 @@
 DIST diskimage-builder-2.25.0.tar.gz 419297 BLAKE2B 78ac5b1119233080dddef917b05ca4f51f73382bb325cbf228f63837ab79be9ce524351404f2a26cf735440c66a3dc246a1642258b77f217406998650860eb39 SHA512 4afd257b01924a526ef335bf6699f5fbf49ca0c08bb3d288a6823783b842827e3afb51794771994f068332c6ee2ecf6f105fc03112d6a7807932fb5ab1fa4c24
+DIST diskimage-builder-2.26.1.tar.gz 421821 BLAKE2B 11c0ba668494285f33f3461e1a2c091ce6d622e4be164c4ab56a93cd000c82cec6702a6ed2ae37007120320f053760473f45f58ad8b45ee14b7b3eb47ac82d9a SHA512 e8bb68d15fc0bdd4881e76a7277f3e5e481b77decb4591546a576eda015bf624da3746326735add299551e168b82ab8bb165a18a64e96532c5b846e49815528f
 EBUILD diskimage-builder-2.25.0.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
+EBUILD diskimage-builder-2.26.1.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
 EBUILD diskimage-builder-9999.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.26.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.26.1.ebuild
new file mode 100644
index 000000000000..86d3bb124b34
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.26.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	<dev-python/networkx-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index e3d55b20a164..fb1a0c70314d 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,5 +1,9 @@
 DIST docker-18.09.8.tar.gz 15263186 BLAKE2B 9c6d23172e138491c383342753ddf0f7d3831d11b0d4212bd62709733a68b77151884c2a7a7b52e53a3885a84fc860eeb1561723e5967e0a95eff174fda68ae4 SHA512 34cf91da732ebbde88f0c8cd39664130e6bd344b18d4643715a00e1c4062d0838a37650a8ee68fb371abd8f01910c7bdce1237af74a49cd63b5ed5382eaf00ed
+DIST docker-18.09.9.tar.gz 15299640 BLAKE2B 2a4fa670ddac0136e85300fd137a8ea91651c51c54fa3d52ddc5b1a640a1ee202a34f428fcf9eea286c581f49a2c28b711100e7541773e5bc1f2e37884cae2dc SHA512 d0235ae54e4d8d4d0893f6f35293f36177afabc71d0b3e6a74341260e52dcd9351a924efe8fa299cf9a51efdc68b6b284f6435d7210c44193a673f7fff71ce0b
 DIST docker-19.03.1.tar.gz 16652136 BLAKE2B be5c001e48bdce0ea8e520c131ff1699d12e39c45cf7dba3452689879e29abe12509c5d70e4a82eb66ac599b85717cd7e057cff1a41ba552eb2ce549e692d991 SHA512 92b4e5fe2bbf96a261d290ca807550af45146be9d21680940bd6aa45d9127ae8ddbc706df4056f1720ed6975a2a92004f1789fae4109c50206904ad827d4bf2e
+DIST docker-19.03.2.tar.gz 16657356 BLAKE2B 3e48ea67f1ef65786c30b4d47b29dbe92d7fb7b043d2c4f15c07cdc929554a07870ce5ade2c1fe26eebea74d28dc71752e9c96e86fe12e0d96608059b5c91f11 SHA512 6b594fdbb53dcc0228781375a3884eb370446738c44f7c1e42945c4ccc263e75f53d984bc8ea6a6a498446859e667305bd967299c12956f1cb925d868a4bf2b8
 EBUILD docker-18.09.8.ebuild 8355 BLAKE2B 529357dce1baf40bd90008b7e9597be9f1a73db15e8f73a51ce27bfbfa920947dc6d588b79d866593d9ec404a89e8f5081ff8c593607882b4ed6108ca974b5c2 SHA512 2fca74c7e26ee3760b1b1b564bfcb67ef69827e49b6a9fa54ab688aff2808fee3d35c4ec7e06dfc5f7a40ffd2018fe3674df354b30a76ed908c2c5882f6f5b84
+EBUILD docker-18.09.9.ebuild 8355 BLAKE2B 7068bcb0e97cb4cbe439d0201896d49dd64acb4f6a6d16dd8ab69ab1d9fff1ac7f20b07efc5a73cf9c4faeacb8c32384f705651851d6712a1ed79ce17c344692 SHA512 3f90883e1bde2bd89d9b08ac15eba5a78f34050fd97d692d018c6da24cd5b7092a6e1c602230bb1386438b6d36d3022cd518f957225b1041c359ae7268ec3f88
 EBUILD docker-19.03.1.ebuild 8355 BLAKE2B 57168baecd4b590148c64265a3b2d4e2952c799157c0aa57c55382a6a645d398a9038750541c43e54711e53b69650d94c19cddafcafca7eb3ebae00b8f207190 SHA512 985e8bc8ddd64cf6f3f42e0e341110dc8943cd1cc0f2b703482ddf2bbba30f40fe3c787589d481d76ef4eaac7ef1bb17889d5186a5395be53453a93c86610094
+EBUILD docker-19.03.2.ebuild 8355 BLAKE2B 5d2b42bfae72f37eccbeb127643f2757c2379fe1b5709aa9c3cd27e194835bfe059ee6e5bd2f9617d80222cd2ae659b1efb73cf3f9669de8042d5afe467b6a62 SHA512 c6d1c6bd79e51e728b38bbc6505020cdd650525edfb961c192fd5dd99a51962e6c3e6f1f5b1d7462a4f6ea8dd318e46b172410a8f432fc2bfdaeab7943e1b141
 MISC metadata.xml 1576 BLAKE2B 7a378d4abcda0352c4c96108a238d693e9104a1de624f8fb4e808bfbf5ad4960c1f6155b1f6c78ff2bc6609653285e911e7eae9f319696e39c60b63e5127ef11 SHA512 9944178c2202c12bc7364f9722e70b71583bfc60a318348060d0ee8ba713c892259da46c222ce7fea4b1294be8b01b7d1b359976931e287f574733b65403e762
diff --git a/app-emulation/docker/docker-18.09.9.ebuild b/app-emulation/docker/docker-18.09.9.ebuild
new file mode 100644
index 000000000000..94950688f27c
--- /dev/null
+++ b/app-emulation/docker/docker-18.09.9.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	DOCKER_GITCOMMIT="039a7df"
+	MY_PV=${PV/_/-}
+	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev user
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://dockerproject.org"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		>=sys-fs/lvm2-2.02.89[thin]
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+	apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+	${CDEPEND}
+
+	dev-go/go-md2man
+
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.16.1
+	)
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${CDEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	~app-emulation/containerd-1.2.6
+	~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
+	~app-emulation/docker-proxy-0.8.0_p20190513
+	container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is lt 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+			~IOSCHED_CFQ
+			~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	if use overlay; then
+		CONFIG_CHECK+="
+			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
+		"
+	fi
+
+	linux-info_pkg_setup
+
+	# create docker group for the code checking for it in /etc/group
+	enewgroup docker
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a tarball, we need the GITCOMMIT value
+	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+	# fake golang layout
+	ln -s docker-ce/components/engine ../docker || die
+	ln -s docker-ce/components/cli ../cli || die
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	pushd components/engine || die
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	VERSION="$(cat ../../VERSION)" \
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	# build cli
+	emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat ../../VERSION)" \
+		GITCOMMIT="${DOCKER_GITCOMMIT}" \
+		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+		dynbinary || die
+
+	# build man pages
+	go build -o gen-manpages github.com/docker/cli/man || die
+	./gen-manpages --root . --target ./man/man1 || die
+	./man/md2man-all.sh -q || die
+	rm gen-manpages || die
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+
+	popd || die # components/cli
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+
+	pushd components/engine || die
+	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	newbin build/docker-* docker
+
+	doman man/man*/*
+
+	dobashcomp contrib/completion/bash/*
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+	popd || die # components/cli
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+
+	elog " Devicemapper storage driver has been deprecated"
+	elog " It will be removed in a future release"
+}
diff --git a/app-emulation/docker/docker-19.03.2.ebuild b/app-emulation/docker/docker-19.03.2.ebuild
new file mode 100644
index 000000000000..c501202e523f
--- /dev/null
+++ b/app-emulation/docker/docker-19.03.2.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	DOCKER_GITCOMMIT="6a30dfc"
+	MY_PV=${PV/_/-}
+	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev user
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://dockerproject.org"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		>=sys-fs/lvm2-2.02.89[thin]
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+	apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+	${CDEPEND}
+
+	dev-go/go-md2man
+
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.16.1
+	)
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${CDEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	~app-emulation/containerd-1.2.6
+	~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
+	~app-emulation/docker-proxy-0.8.0_p20190604
+	container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is lt 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+			~IOSCHED_CFQ
+			~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	if use overlay; then
+		CONFIG_CHECK+="
+			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
+		"
+	fi
+
+	linux-info_pkg_setup
+
+	# create docker group for the code checking for it in /etc/group
+	enewgroup docker
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a tarball, we need the GITCOMMIT value
+	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+	# fake golang layout
+	ln -s docker-ce/components/engine ../docker || die
+	ln -s docker-ce/components/cli ../cli || die
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	pushd components/engine || die
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	VERSION="$(cat ../../VERSION)" \
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	# build cli
+	emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat ../../VERSION)" \
+		GITCOMMIT="${DOCKER_GITCOMMIT}" \
+		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+		dynbinary || die
+
+	# build man pages
+	go build -o gen-manpages github.com/docker/cli/man || die
+	./gen-manpages --root . --target ./man/man1 || die
+	./man/md2man-all.sh -q || die
+	rm gen-manpages || die
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+
+	popd || die # components/cli
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+
+	pushd components/engine || die
+	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	newbin build/docker-* docker
+
+	doman man/man*/*
+
+	dobashcomp contrib/completion/bash/*
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+	popd || die # components/cli
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+
+	elog " Devicemapper storage driver has been deprecated"
+	elog " It will be removed in a future release"
+}
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index 0a630273055c..d064e047f450 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -6,5 +6,5 @@ AUX dosemu-1.4.1_pre20130107-ia16-ldflags.patch 1787 BLAKE2B a265263de5ccb12df72
 AUX dosemu-1.4.1_pre20130107-no-glibc.patch 559 BLAKE2B 93ba50a5acda4b0b556e5393c34babe0b9172a8c9c1b168432f454ff120673496d279496d76821eda49886aaa998244bd411d4db6b465517712c4f6683d2850d SHA512 c53e3f7ed1b7a74e1112ea5507d0912ef1d16ff657aa5a03132f6b4c35ddb638ecde40ef554254f429316ffd74fc2d8afb59548d97547eeed231c80c0c057eed
 DIST dosemu-1.4.1_pre20130107.zip 2767256 BLAKE2B 068c38108257b83d046682d4e9bda6f2da84195cff3aa5eb73764e88ba48bd415a6af9fa1b57059dee12ddd75b379df730fe6957014b554cc13b12ac029eed8d SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864
 DIST dosemu-freedos-1.0-bin.tgz 1205628 BLAKE2B e88a23b14cf1ccccb4f648b3c3af39330d8af29940e228b951cc7e48595f9838236066b67f841328e75ee7aee18f9e7814ea33382bb48902ca7947806b646852 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd
-EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 2589 BLAKE2B 0716e7fd5d50f747a34b7b03c15cc6a97eaefd905eeaecdf052b8465e3e153f4013718a3fbe2e615b5696488c08cadf4b88e2a97e63939f35279c439fa979dea SHA512 7ce15db9ddb685464ac2c7a8ab2b082d41ce8973601c1614e01ed25fea6cce93bc904b66646a0c90c168b3cdb155b8b38a0f70cbd6db85a15de8c38e1e9a3ed6
+EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 2605 BLAKE2B 9bc7d0a5e268f61dfe8422f9175f28cdbb76b529540e4a781207107b06f96a7d1ec4751c3bc1aa325a95209ddfa3429048b3e190100f80e05c22ecb9dd15b101 SHA512 064419839372e9f2ac136bd7bc0fd6be567c1cc6d982a01b8020c95605dbf905ee356f4b7ba6f8f477526497ebdf56f14fce29ca3732a5f9aa1a6b6c62ee11ee
 MISC metadata.xml 432 BLAKE2B 06cd4821f41961fdcf266bb1175ee118cd181d17c3b38508e2a30dbbfab9e5cb02608e2b8e5af905abc24718d410a24d112c073fd6ee460b33d904c975358a61 SHA512 da0538836dc326d714141ab6c7b9f00bc1604fa5b51df7d9d548a8e3d889072b3ee8890a25705e2a7c2c1c31645c0b9af85ce6a2d1e4aa142a4d83a08fd6f9d8
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
index 2954d3ad84a4..ca290fb74bb1 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
@@ -39,6 +39,7 @@ RDEPEND="X? ( x11-libs/libX11
 	>=sys-libs/slang-1.4"
 
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	X? ( x11-base/xorg-proto )
 	>=sys-devel/autoconf-2.57"
 
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index f3f253fad286..9a3daab4cb0c 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,11 +1,15 @@
 AUX free42-2.0.10-fix-build-intel-lib.patch 618 BLAKE2B 9039cdf8c78ff198ea9a4927621f7e23f362fffbd537a0a988030713fe061398d2b7b2fc6120cda280249807d9aee448095b1f5cdfb824909d7d381650daafbd SHA512 192eb5e78c50ce52449c5b859369ab7258a98162c5d924ab8b8f3566f52be7a3c4aba95c3cafd60af82d5dcf1b1ad784cf3fe6bf432839baa1b4ca994ddf416b
 AUX free42-2.0.10-fix-makefile.patch 1888 BLAKE2B 113bfc1f296ea3d35d6b4f8aea5f590298c5a47f50a2a20f0ac5f1968b06be19d53f03e64dcf22134938c232f68a6b989250064f45e88196c7fc8e7e9e0fca71 SHA512 1c9a16e29087c492fe1ee5bba8dc118674f4c167b5bc138ffae9ee08ad735a5b5aa2eec2e25236e5aeb95b89c94d7903e08e22cfaa321cf3c458b54defe72af8
+AUX free42-2.5.3-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5d25ab0a30cc1329ba79442d687f9fcd22e2edd080a43d816c8843e58827592c8c1932714fdd0012f8e643bb4c28d5cf23f9ade4 SHA512 73107855344c054318c678cffff9e39c89718d7d7d6445fc158109b8f678ebb95780a80584aa556c6076bf4c98c1d788dca09c9b727992374543c245c7400976
+AUX free42-2.5.3-fix-makefile.patch 1902 BLAKE2B 1d8ae0054275bba2f8fa46aa8c6086e5b41dae17a417d8f0fbf14bb63fe9504577f67bd92b612665d414e55396ed6bc7b1ac36983b4dcfb32b4eb98514d0f768 SHA512 895fe2a42a8e1129dbc2bd8b523ae9235eb606ae8d48f53fd2689d9991ee1818334f66d154218592d9bc92b9e1d080b148ff6fca6f80295b0dd0475d9e1bbad9
 DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
 DIST free42-nologo-2.2.1.tgz 7398286 BLAKE2B 041c9672305b712efab8e7d5eb73bc0bd159b5fd61e9ecf39d5ce691aff045be4a6a4c635c0948e610e51832db64b388bdd001eb57aad41724e27dff4cf95a0a SHA512 2ed735ff161ea14ca5be97131b69065410faa699ed05d3eb94abbb9653c694d83fc4e45ea2bcf0c2a7894f89e731ee7839105dc1d58d6a6326047c9bd55da5d7
 DIST free42-nologo-2.4.2.tgz 7403471 BLAKE2B a2dba75bbdb8ceaee2f11dbc053ce50d71e0b5f46165fb61c6d3441326dc43b2afcdc2b99cbb638bbc59e19c5da948ce748b76ff4c612d5ed44e706583b159fb SHA512 046a42aebf1b4220acb9227dc365c26349b7a69c39d765b5ab59c83d9fc644055324c6288aaf87e6f9265310b5969335bc8be7035a84935fd7dda29bd9caf5a7
 DIST free42-nologo-2.4.tgz 7402688 BLAKE2B 5e1a46977a3e385fc44f09b5e0088cf73f4a67c3657110311e95795a5b7beb2583dc56bee14e0f578f6ee3517acc78b311b2da0e1671c38d7a5bb150c1e30197 SHA512 a74efd40a952892f346bb4c4096b6e0c00c337e782696de1064d626ea1bbc8aa5a9b557ad233ac92bd27ce8fe4202837e72eddf8f0b31c9320e8c150c6c0b408
+DIST free42-nologo-2.5.3.tgz 7406566 BLAKE2B a8fcad4738b46e5725e323eb7c16929c32fe0c72eccadf2f692950a3ee952f3b8f7e1e46d6e4eee4e822ca5a3b2c42adb09e2b43f0480c954aef87dc81b1edd3 SHA512 9a96bc5453f938ba806117ac3162db4f87d3584662c8a1aae370f17a06c1e92167adb2c2bb9bbd17b91473f272f8c031c7ffc1944247962571a94cb7063f0904
 EBUILD free42-2.0.20.ebuild 948 BLAKE2B 59ada24ef7746d402bfc2e9cb8ea80c23a68e3ffcd1a3da035281d7544422b21ee3c41fe005721672a180f97a850a7066f3a8087f4aa377fb4c0b4e6233fe49f SHA512 3c117630b0266091dff0b540c1975f6e5c69ec46d8a1f8ad55d7757147df9fc2a6bc9bd3bcfead241cfa8dde29deed727bc1bf39e1f833aab686f2c98504a123
 EBUILD free42-2.2.1.ebuild 1039 BLAKE2B cf5965b23191d1c38450c6643844ca476f3b812b7cda7f17e963c1de3a4d0ff9146ee9a913131a208cf5567a01e92b19fc1700eee272a71f30ec1c51e0262018 SHA512 8b60d1a40b493a0a72c8b4f36fca1228c6f64d5bb7758594f923f2c6dd5db480381401b666b8a485012fd12a55b538e610b02000d2a394eb6516242b9473b4c9
 EBUILD free42-2.4.2.ebuild 1039 BLAKE2B cf5965b23191d1c38450c6643844ca476f3b812b7cda7f17e963c1de3a4d0ff9146ee9a913131a208cf5567a01e92b19fc1700eee272a71f30ec1c51e0262018 SHA512 8b60d1a40b493a0a72c8b4f36fca1228c6f64d5bb7758594f923f2c6dd5db480381401b666b8a485012fd12a55b538e610b02000d2a394eb6516242b9473b4c9
 EBUILD free42-2.4.ebuild 1039 BLAKE2B cf5965b23191d1c38450c6643844ca476f3b812b7cda7f17e963c1de3a4d0ff9146ee9a913131a208cf5567a01e92b19fc1700eee272a71f30ec1c51e0262018 SHA512 8b60d1a40b493a0a72c8b4f36fca1228c6f64d5bb7758594f923f2c6dd5db480381401b666b8a485012fd12a55b538e610b02000d2a394eb6516242b9473b4c9
+EBUILD free42-2.5.3.ebuild 1037 BLAKE2B a99bdae1c8b91e20de898df08545d008f73560d80df4ef5ea382998db6e493be6450e69b9f6c926c4a167b10a4ed163870a474bf1c59077c32ea3bc6316fb6e2 SHA512 8480fd31a82aa354835bc0502154c7c63b70061d319ff2648344f378a847a697d45974650a39f8f1b899cac6d9612cbdd999164b32319a47edcf52927ee7a7e6
 MISC metadata.xml 547 BLAKE2B c7cdf7e2a312b69ae94b467836751bbf61dc771e58866edc21d70bf1b15c776afaefc20a947f6dc8af6586ec2b5e3416bd32446ca3a92890ed573daad6e48d38 SHA512 99885c9a7abecc41f53a946d1b94d2f8d8fda74f0e3f0a0cf6a43a418a874922594841e17b6197aee9f80b007d7633f2154ba85cec81dcfc22efcc7b52edd15d
diff --git a/app-emulation/free42/files/free42-2.5.3-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.5.3-fix-build-intel-lib.patch
new file mode 100644
index 000000000000..e1e2ea89897a
--- /dev/null
+++ b/app-emulation/free42/files/free42-2.5.3-fix-build-intel-lib.patch
@@ -0,0 +1,12 @@
+diff -Naur free42-nologo-2.5.3.orig/gtk/build-intel-lib.sh free42-nologo-2.5.3/gtk/build-intel-lib.sh
+--- free42-nologo-2.5.3.orig/gtk/build-intel-lib.sh	2019-09-01 17:44:47.000000000 +0200
++++ free42-nologo-2.5.3/gtk/build-intel-lib.sh	2019-09-03 23:58:30.604579443 +0200
+@@ -65,7 +65,7 @@
+ esac
+ 
+ cd LIBRARY
+-$MK $OS_ARG CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
++$MK $OS_ARG A=a CC=$CC CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0 $ENDIAN_ARG
+ mv libbid.a ../../gcc111libbid.a
+ cd ../..
+ ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc
diff --git a/app-emulation/free42/files/free42-2.5.3-fix-makefile.patch b/app-emulation/free42/files/free42-2.5.3-fix-makefile.patch
new file mode 100644
index 000000000000..fc5abc33bfd0
--- /dev/null
+++ b/app-emulation/free42/files/free42-2.5.3-fix-makefile.patch
@@ -0,0 +1,62 @@
+diff -Naur free42-nologo-2.5.3.orig/gtk/Makefile free42-nologo-2.5.3/gtk/Makefile
+--- free42-nologo-2.5.3.orig/gtk/Makefile	2019-09-01 17:44:47.000000000 +0200
++++ free42-nologo-2.5.3/gtk/Makefile	2019-09-04 00:27:16.761482125 +0200
+@@ -15,7 +15,7 @@
+ # along with this program; if not, see http://www.gnu.org/licenses/.
+ ###############################################################################
+ 
+-CFLAGS = -MMD \
++CFLAGS := -MMD \
+ 	 -Wall \
+ 	 -Wno-parentheses \
+ 	 -Wno-write-strings \
+@@ -34,15 +34,17 @@
+ 	 -DDECIMAL_GLOBAL_ROUNDING=1 \
+ 	 -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
+ 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
+-	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
++	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
++	 ${CFLAGS}
+ 
+-CXXFLAGS = $(CFLAGS) \
++CXXFLAGS := $(CFLAGS) \
+ 	 -fno-exceptions \
+ 	 -fno-rtti \
+-	 -D_WCHAR_T_DEFINED
++	 -D_WCHAR_T_DEFINED \
++	 ${CXXFLAGS}
+ 
+-LDFLAGS = -L/usr/X11R6/lib
+-LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-2.0) -lXmu -lX11
++MYLDFLAGS = -L/usr/X11R6/lib
++LIBS = gcc111libbid.a -ldl -lpthread -lX11 -lXmu $(shell pkg-config --libs gtk+-2.0)
+ 
+ ifeq "$(shell uname -s)" "FreeBSD"
+ ifdef AUDIO_ALSA
+@@ -54,6 +56,8 @@
+ CFLAGS += -DF42_BIG_ENDIAN -DBID_BIG_ENDIAN
+ endif
+ 
++MYLDFLAGS += ${LDFLAGS}
++
+ SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
+ 	shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
+ 	core_commands3.cc core_commands4.cc core_commands5.cc \
+@@ -95,7 +99,7 @@
+ endif
+ 
+ $(EXE): $(OBJS)
+-	$(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
++	$(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS)
+ 
+ $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks
+ 
+@@ -119,7 +123,7 @@
+ 
+ symlinks:
+ 	for fn in `cd ../common; /bin/ls`; do ln -s ../common/$$fn; done
+-	sh ./build-intel-lib.sh
++	+sh ./build-intel-lib.sh
+ 	ln -s IntelRDFPMathLib20U1/TESTS/readtest.c
+ 	touch symlinks
+ 
diff --git a/app-emulation/free42/free42-2.5.3.ebuild b/app-emulation/free42/free42-2.5.3.ebuild
new file mode 100644
index 000000000000..67e64a2dd933
--- /dev/null
+++ b/app-emulation/free42/free42-2.5.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-nologo-${PV}"
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="http://thomasokken.com/free42/"
+SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}
+	x11-libs/libX11
+	x11-libs/libXmu"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.3-fix-makefile.patch"
+	"${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+	emake -C gtk clean
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+	default
+	dobin gtk/free42bin gtk/free42dec
+}
diff --git a/app-emulation/fs-uae/Manifest b/app-emulation/fs-uae/Manifest
index d909494b1d87..d072e5947509 100644
--- a/app-emulation/fs-uae/Manifest
+++ b/app-emulation/fs-uae/Manifest
@@ -1,4 +1,5 @@
+AUX fs-uae-3.0.0-Xatom.h.patch 669 BLAKE2B 3463b8f19551b8ea3d634bc75f9de2fb77685af9c24e1fba555991d1d094f4d75be048e4d9a7852bfd8882b1e9826f174550bc3953e3ec636193aaa647462d12 SHA512 af86c772049d8ff5eef36c8988888891ea60a68e929d752c8f1c9e325af584175f14496a2099654381bb33a3adecb913991e129fee05524ecad4a166228dbd68
 AUX fs-uae-3.0.0-libmpeg2.patch 1078 BLAKE2B 119d797854beb0148af9a77003b7b06696d9a474645ff15181044dcffd783a91f89a66cf90b072603c4f324b95a4a0cf124abefc6adc71b9be4b8a92f36060ac SHA512 8624c3404b627321a2b6673271be27daa24924a8c56903c870fd5a6f2dc50c18fd97810a1aab3cd684a5a97544c1e64f68c855c822d3e5bb5981faf264d28ae7
 DIST fs-uae-3.0.0.tar.gz 4841427 BLAKE2B 318bf457cca60e763a938d3d1a846e72a50f9b899dd8eefd79bc331f385a3529cb2bf2adc1616c1c5a04c1a1c92d4257c88593ada103d3e05847656a26a1c435 SHA512 3ceee2434b3aa3f545370a17149b3cda8d2eeb1bd093a45869a897a00b82ae4395efc52c129124e44262b47b7f56337e1adb9f58b0a1562efa73ee3ea3915b68
-EBUILD fs-uae-3.0.0.ebuild 2381 BLAKE2B cb6322fdb9c6308d7bc23aa81a3b547207e79c3268b86e04e663b580750df4157b4c861ef4e055ab19c142bac962698f7a9d318eefaf67abe0aa426c8c307ae4 SHA512 83e2a675df0ea3e94924b26d3e8a88bda0e4e178f5c63580c733750f2f22c8b26e69b1777996b5809e8e5d91213eeb61eed3e222143b4c9b8ffc072f82938e4a
+EBUILD fs-uae-3.0.0.ebuild 2424 BLAKE2B 7a3fc9be3751977d0b6dde690f5184442555cb8ea6a70eaccc76bc35e79ea92527ba9b614682875c859424586f0481572897d24e08de071b97bef1967624d6ff SHA512 f56299658b80607ab85e87b556351dc4ca9117fefa492f8ff47e1b1c7ef3cd4c32c26d46cd832b6350fb15faf1655aad0b41113b8a96cf997c67365689aa56c0
 MISC metadata.xml 533 BLAKE2B 5082ca2fc578b6fcb5a13825c2264a0c1cd6c227f8d85d1d8dfd056bd12b54784b90dca1b7e61c8d127c5d06dfb1b5a45f97125831f6ef42804a00d8fd992b2d SHA512 84eb6bf83f3ccfe871a33517117968f8aaae75a3af79ab29f96f3bff839badbd9c16c1296b1693e8c293e5a1363de12e650c0406b8dbbb1026e64acea5bbd745
diff --git a/app-emulation/fs-uae/files/fs-uae-3.0.0-Xatom.h.patch b/app-emulation/fs-uae/files/fs-uae-3.0.0-Xatom.h.patch
new file mode 100644
index 000000000000..8fa5bd612c43
--- /dev/null
+++ b/app-emulation/fs-uae/files/fs-uae-3.0.0-Xatom.h.patch
@@ -0,0 +1,25 @@
+From c4c267a90d412bc6d072615d38ce891325282b6d Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Tue, 27 Aug 2019 22:22:57 +0100
+Subject: [PATCH] Add missing X11/Xatom.h include
+
+It is sometimes (but not always?) included by SDL2.
+---
+ libfsemu/src/ml/x11.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libfsemu/src/ml/x11.c b/libfsemu/src/ml/x11.c
+index c20073d3..4dc5487c 100644
+--- a/libfsemu/src/ml/x11.c
++++ b/libfsemu/src/ml/x11.c
+@@ -26,6 +26,7 @@ extern SDL_Window* g_fs_ml_window;
+ 
+ #include <X11/Xlib.h>
+ #include <X11/keysym.h>
++#include <X11/Xatom.h>
+ #ifdef USE_X11_XTEST
+ #include <X11/extensions/XTest.h>
+ #endif
+-- 
+2.21.0
+
diff --git a/app-emulation/fs-uae/fs-uae-3.0.0.ebuild b/app-emulation/fs-uae/fs-uae-3.0.0.ebuild
index 376c782ca59f..f0492ee2c5ae 100644
--- a/app-emulation/fs-uae/fs-uae-3.0.0.ebuild
+++ b/app-emulation/fs-uae/fs-uae-3.0.0.ebuild
@@ -16,7 +16,7 @@ IUSE="fmv glew"
 RDEPEND="
 	dev-libs/glib:2
 	media-libs/libpng:0=
-	media-libs/libsdl2[opengl]
+	media-libs/libsdl2[opengl,X]
 	media-libs/openal
 	virtual/opengl
 	x11-libs/libdrm
@@ -37,6 +37,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.0-libmpeg2.patch
+	"${FILESDIR}"/${PN}-3.0.0-Xatom.h.patch
 )
 
 src_prepare() {
diff --git a/app-emulation/ganeti-os-noop/Manifest b/app-emulation/ganeti-os-noop/Manifest
index 47bfade94106..9f08e26a4ec1 100644
--- a/app-emulation/ganeti-os-noop/Manifest
+++ b/app-emulation/ganeti-os-noop/Manifest
@@ -1,3 +1,3 @@
 DIST ganeti-os-noop-0.2.tar.gz 2247 BLAKE2B ea0d9c4e884aba81895e48b8bb86a28f90432ec768feeef5f561b13041279578c5730783c12a7207b330fe9190c0b41a44fdf154f8685bb8f4d3721f37d797f9 SHA512 ae121759ef775a5fee552ef2f939bb01126ff5fee3deeadae234a6f6f66b2589be1a6cc686d564d3a77406f5839f1cf914a3492c3ea9cc803427967fb75e3c5b
-EBUILD ganeti-os-noop-0.2.ebuild 539 BLAKE2B 0f48124fc6a8450a3857a3036373247fa015f660bb540f3fdc82f12a0694faf83be20278be1b3d9107753d1689c50e712a16f61ae0c8f823cc0b97fd58cb52e7 SHA512 bc7e2454c982d2deecab9cb21202b953d4a6d02018dcd0fdd1fda4544709542222c937c9bb526c8116f635715eab7f47e665637b4600eba22c65f6be6b21aa03
+EBUILD ganeti-os-noop-0.2.ebuild 564 BLAKE2B 2eb3a0dc82eae30ac81c13a28670242bad7f8cb0a5a5494b121bd6b31d4bfc9e464c5fe918de5d4005934063ee7572a76680c6c3c6b4c67e042c3fca068fbae6 SHA512 24d3b53a43f6aade1a075519285f64fc285c4b27ccd83a9442fa1035506480ea9979fcf18e72e831109056abfe38372eccd6cb78c0e907942dbcd93261d70c36
 MISC metadata.xml 335 BLAKE2B 29dac66049297ba00c1a8c850ed7dcd9748b49c232033d4a0ce2ffe92ccd3160d8b25dd15ea989ade9508422f210f9ce6ad3438e79e6b9d04085ece9cc83bdc0 SHA512 4caaca34dae159ff71972cb9e91c8c8ab1743c3626873d0e7e21d184b88d3a86be2510fb14219adaaa1f4ff7b6f7459146e6eb98145c7af46fdd8ee2cdc11f7a
diff --git a/app-emulation/ganeti-os-noop/ganeti-os-noop-0.2.ebuild b/app-emulation/ganeti-os-noop/ganeti-os-noop-0.2.ebuild
index 18148261ba7f..3f7639fbd4e9 100644
--- a/app-emulation/ganeti-os-noop/ganeti-os-noop-0.2.ebuild
+++ b/app-emulation/ganeti-os-noop/ganeti-os-noop-0.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="Dummy OS provider for Ganeti"
 HOMEPAGE="https://github.com/grnet/ganeti-os-noop"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/grnet/ganeti-os-noop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-emulation/img/Manifest b/app-emulation/img/Manifest
index 19b3ed137cfb..87a52c545c65 100644
--- a/app-emulation/img/Manifest
+++ b/app-emulation/img/Manifest
@@ -1,15 +1,5 @@
-DIST img-0.4.8.tar.gz 5587652 BLAKE2B 5b74ff24e6f36674b66b3f87abe928a9d8c8361835eb61cb04ddfce6bfc7cb7b8e6e1f41d61d9f75c09c3646d0d697074882e1f7b87259b60d7c53303718e325 SHA512 fb5b97c4794798dc2dba5d4c9493da9708a55a9e5e7b2259585409c4e7973fecd362132dabb81c72f20b61956c5a8bc67b58db49c22e7ce56eaec784bbb51ca5
-DIST img-0.4.9.tar.gz 4654821 BLAKE2B b3cd419aeb64ec8c2e8ee0fd523d387fd5b1a340ad61deec1e3fda59ba4e58e7594682aa49e04922e5bdcad4c458f23d4b8081784ba9d7d88dc953a0bd7c24a9 SHA512 c529affce023a8ae972a8526b48701d137edd3a8d5a22687269eec07864a1c30edf1c84bfea29cb7d166cc4fed4b0eb1e34e41d5d21be9d1a3b975b4c1bc678f
-DIST img-0.5.1.tar.gz 6394095 BLAKE2B 5c26487f721ef7157c8dc47c5abc2f4f296efe4ddf3b4e1e0513e4a2a71c96287e92c2332b340d583f0687ff7c3b1f10aea107f9ab1527b3f6760f1f359de867 SHA512 66f812da0b77882a610f4de849eaf473a0a6e964fff7cc0b596b46411aa33d625a376d3e829b8eb438e26d09624146c18b83a2289ddf2785024e3f8a6fee6cf9
-DIST img-0.5.2.tar.gz 3426613 BLAKE2B 75da804bee0960c195f3f5af6f10276d3d9a93dfcf08c784b831da2dd4e27714f0c8c24b24d2683b1b75276362b47a2bbc251e032b5b1b87c081922cee4f90f4 SHA512 cbae3fab61005238c939ad5fa5b785b07ee10f964a686962bdaec7170297840ebda188b93a1e3b89c6041db455a085d537005f8b1dc8753cd4e77f3e699f40e4
-DIST img-0.5.4.tar.gz 3429272 BLAKE2B 3426dc6503693ad00c4c9f13c3813a6cf71826987aa2bb8351f695ffebed78fd79383b548040ef880b55984852f32fcb33ae5f1d1dcc4f9f6250498fbd64ebf0 SHA512 db51862aff5e0bb7280f17597f8d7231dd9aa741126b41c0af922b1f136d2ac4e0f08e51ab583ed098b194b58df29808c42cfd5381a217113f6b4bbf0dad06c8
 DIST img-0.5.6.tar.gz 3429213 BLAKE2B a1525d4aa09e11d122b41b54da8b90557dac3d0bfed5ea93dd6dad31269b7095d58d6d44dcd92dad9d56436132493d7ec8f1517b32eaa2bfb608bfb1fef639ec SHA512 e1a4469717df66f167f859cbf82ce54dd877e3e9c2f2d723f4424480c0429ac6ad99a13718c103bed3a823a91bef2f3ee3ac6c17e6f951f74f2f1b3ed0021785
 DIST img-0.5.7.tar.gz 3875988 BLAKE2B dd8f13f6861eadc3a4c3d2d07ac826e53a8f3b83d66974717e9312c579967e0c9b57657c8fe6e86f03bb91fd7a82bc6d8d7d87a70be4dd85da10800d8909a51d SHA512 a42247c2ceac0ccfcc2cfd6a561a058855869f0219994cd8fa2bdd5092be17803057e4cb48a2d5277fdfded74dd06eb7c3c3db590fbde91502aebcaf593ddef7
-EBUILD img-0.4.8.ebuild 921 BLAKE2B 050b449fa9c34e4171573810ccb204ae2eba7e0ad9a50da5e3c0673f0b9c74b81e611d9a6e07506b560e4570fc2ee5ffc7455d95ba071ab6e23aef9abdf413cf SHA512 9871ad935ed3382eddc90a3955ce68462a6e34a0f8c4299fec30ff0791924c7bd6ab75e02767afd36a2283aa705636d7c28683fea53b1ecc19352319ac0792a1
-EBUILD img-0.4.9.ebuild 921 BLAKE2B 43a0c49430a0b1c4696cbe41353fa53a2d2bbe6f0de7602d2338c48a1a86335c1cfdb548b569829bcb51591adc626c9088937cb7121d61a2de79ed775d9c48ca SHA512 14ece586610cc8b76a42b39c79b2f41bd36d8f80d10398ae3f147fda6d512276eb5bc8aba6700c122f34b28426be6dabee2048a634f29b62657b287fdc145c92
-EBUILD img-0.5.1.ebuild 918 BLAKE2B e79cd947781d1779f954a07a414bf5412fb84ae273a196aa21f12b26aa029d083f029657c6e2adb21d80267181f31ec84ef5b861526c338a260ed1c556a55013 SHA512 e93d152e84429e3044c760264e61fc8210f0f7f45c9322ede18266f88fb4f9539631aa1999ef9e3a73afae90819b769939a802c772c3d1233187d87edc821ee8
-EBUILD img-0.5.2.ebuild 918 BLAKE2B 9e982b5fb1fda4aa0c85ecd066499329848d2308b0b621d718319c9bf6fb09bbe5154afedcfa91cb7b30102590f4b96a01d588ae4e56ba03460366490dc2e25a SHA512 c01b3768cc67cb5f2263f06fe1f4c64b6194370367e642cc5463777c30c89faa2962fdb7077b476d2a8256b2807e3ce3a73180ea267564da6b3b64eb72e4cd7b
-EBUILD img-0.5.4.ebuild 918 BLAKE2B 406e7afcc01bd601aceea21dae8170989474c534100ff24dcb2270b53857a6c12f0415867ccbc0186aa8f801df6649b23467ce6517ef568b04eff9370faaaf1f SHA512 791fe47bdd4397cd5218aa47fa4f6eb8c7ccf60a70834d23a3164e8b04cefdfb60bcf48718b478a5c2dab3409f69d87a8140418e473506cfc19357e728ff049f
 EBUILD img-0.5.6.ebuild 918 BLAKE2B 4585d6c42446ba7c649791d5d4fdfd3c916457b26e40827d785900384f74ec5d888422e752538a195070858692405173f5f7cbe932cacd30087c8c7939fabf70 SHA512 fbd4cfd7778ea358f7ce43305bb52a9213269b7307e005cc0cbd053ce081087e1924069f001b105c163f87ed3caa1ecfe442980c965f4fd0a4895a51687796d4
 EBUILD img-0.5.7.ebuild 889 BLAKE2B 50e79b991e0398aa79085dee21ab1d37e7c4e46d7a77794d88080de7d67e1101e1e8f0a1a5f0ea88492afc4f91416077e382345bbbabde8f16bfc00480f08d29 SHA512 d1ca0e8d9a670a16389d3e06683a6ca3873a8761ef29b317496e45d1461ec6bf624a79561caca39e79b4d9c325f2ef5164f7b9cc576a6bfe89bd6613bc2bf96b
-MISC metadata.xml 326 BLAKE2B bade1307a8d5bd0a9945fbb417b8506b7aaa4b66d5a502e18af1f7b008e325b5514e0fc018932396aba1116b5a3c11b12b89c43d925f7e97c8a75efcd9ef4f3d SHA512 a75050de970991e19edf7b7560ca46d27c959b9a91dcf87d40d31532c85c7af24ab29743d7295c731a3153774d33b03afa5c92470ca0c0c572d50c6ec65e5692
+MISC metadata.xml 248 BLAKE2B 65f712fa82650530a08edb7671e6c6104649422106cd65d55253bdf920e84cc64ed47038feca9da18e770997c52cc6fdec416a6d82eb4146677b78d8509048ca SHA512 0de2cc5b3231aa87bc19df0801003e020b1599bf4a006a991a2d46d84495569245bb04756c1537376293765593167f2c083c46470389a5438ca7b44abafb0a2c
diff --git a/app-emulation/img/img-0.4.8.ebuild b/app-emulation/img/img-0.4.8.ebuild
deleted file mode 100644
index 8c9d8c988abb..000000000000
--- a/app-emulation/img/img-0.4.8.ebuild
+++ /dev/null
@@ -1,32 +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/genuinetools/img"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="88f96d872335cf2746380fa87ba62fd5b63540b4"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
-HOMEPAGE="https://github.com/genuinetools/img"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE="seccomp"
-
-RESTRICT="test"
-
-src_compile() {
-	local TAGS=$(usex seccomp 'seccomp' '')
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/README.md
-}
diff --git a/app-emulation/img/img-0.4.9.ebuild b/app-emulation/img/img-0.4.9.ebuild
deleted file mode 100644
index 24dc44fe9cb3..000000000000
--- a/app-emulation/img/img-0.4.9.ebuild
+++ /dev/null
@@ -1,32 +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/genuinetools/img"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="0060d887c61df8002cb05225f380cae6a8798f9a"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
-HOMEPAGE="https://github.com/genuinetools/img"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE="seccomp"
-
-RESTRICT="test"
-
-src_compile() {
-	local TAGS=$(usex seccomp 'seccomp' '')
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/README.md
-}
diff --git a/app-emulation/img/img-0.5.1.ebuild b/app-emulation/img/img-0.5.1.ebuild
deleted file mode 100644
index c730376b7f9d..000000000000
--- a/app-emulation/img/img-0.5.1.ebuild
+++ /dev/null
@@ -1,32 +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
-
-EGO_PN="github.com/genuinetools/img"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="671aaaa647a51cfd35f911e620fdd82d875403f5"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
-HOMEPAGE="https://github.com/genuinetools/img"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE="seccomp"
-
-RESTRICT="test"
-
-src_compile() {
-	local TAGS=$(usex seccomp 'seccomp' '')
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/README.md
-}
diff --git a/app-emulation/img/img-0.5.2.ebuild b/app-emulation/img/img-0.5.2.ebuild
deleted file mode 100644
index 7e5d87240515..000000000000
--- a/app-emulation/img/img-0.5.2.ebuild
+++ /dev/null
@@ -1,32 +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
-
-EGO_PN="github.com/genuinetools/img"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="0b967de9a93f2a8b014b216daff36b9201f232ee"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
-HOMEPAGE="https://github.com/genuinetools/img"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE="seccomp"
-
-RESTRICT="test"
-
-src_compile() {
-	local TAGS=$(usex seccomp 'seccomp' '')
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/README.md
-}
diff --git a/app-emulation/img/img-0.5.4.ebuild b/app-emulation/img/img-0.5.4.ebuild
deleted file mode 100644
index a8b5c6505346..000000000000
--- a/app-emulation/img/img-0.5.4.ebuild
+++ /dev/null
@@ -1,32 +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
-
-EGO_PN="github.com/genuinetools/img"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="7c58387804c0897b7086ee745c4ea528b4b40509"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
-HOMEPAGE="https://github.com/genuinetools/img"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE="seccomp"
-
-RESTRICT="test"
-
-src_compile() {
-	local TAGS=$(usex seccomp 'seccomp' '')
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/README.md
-}
diff --git a/app-emulation/img/metadata.xml b/app-emulation/img/metadata.xml
index 06bfaa067c93..7213eb804f94 100644
--- a/app-emulation/img/metadata.xml
+++ b/app-emulation/img/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">genuinetools/img</remote-id>
 	</upstream>
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 753a703a65ea..fc719675b800 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -3,7 +3,9 @@ AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690ca
 DIST libpod-1.3.2.tar.gz 6901289 BLAKE2B 5de0cf9f47f7e10866839ba01f3c3ed930ebdb716ce10ca4cb6f6b4d0e96088e10a069726125f2dc4af6febe08e6b2fc058fb8e8ecd7dd870612ecb98f29bba5 SHA512 fb959bf6af314baf3d01c53b513390b6d181adca3f9ff2ca747fabd53abdd45907e8a3f8189ff2d1bd70cff8e8bad690407cf278392a0831e6109669a1c1b12b
 DIST libpod-1.4.0.tar.gz 6937356 BLAKE2B d8fa4920485be89c84adca8a15946bfbac01671ff5460cb0e519cddd208e28b2dae392bfff93cf0b344d7d887e000d4edf430c81bd8a903678e10578a459cf70 SHA512 711de3cf02c96316aaec3d62fb5eaf5d16c6689b4b84cfcc3a375ba5c0554d3a7d2f789eb8d330e38be37d8907427641c077038c9945ed0ca6cd19ec872a451c
 DIST libpod-1.4.4.tar.gz 8286321 BLAKE2B 2f7d529d1780694e450d7ac63aef53ad2bbe27a9cdd939fe7b7d5c71020173639a6b7c20e3732cb2a8320e0f55ec906acab29fc3b1bdbec8a05add1baf688194 SHA512 18e9f2cbd308d1fd5cd9d4931530b7c8357784a1cfd84ceb106813e5bfbd404424c656dd82d74c04678e8d83c03d2ef44c16d3a866b6844a3ed0adc0e88dd8b0
+DIST libpod-1.5.1.tar.gz 8010274 BLAKE2B 4928b45a6d86fe14ff7359c856da664d14fc578dcff095c984eb0fa3b4aed42576cf610f19a9015064f406109d79cd6df60eb0b2990e5058de1e4f9f7d9ae7ee SHA512 d9d422c4189adb840cfe3dd8b7e8278412f0ea17e4ccd2cdf4f4b134a87b1add61bbdca1c8d9db3db846c272e2ab3f624bf9e4aac005b78d0c7e161af898dc02
 EBUILD libpod-1.3.2-r1.ebuild 3883 BLAKE2B 69659832d27cc862714e4f1e3c38f4ed17347849287c4d56a74ee13dbb0c76963d05792b583f250a5277d1e73bce69891568df2b1e355f28656faf8a4983868c SHA512 143e0f3590c2314574513f9884e4041381e9b246524e5b30ab9950eb05c297e91d8b22be21bde2c92ce3d98632baaaf0b86548931982bd62e7c911c9d70bdda6
 EBUILD libpod-1.4.0.ebuild 3883 BLAKE2B d0dc897d5e3768c2b63e1f07dcc7d12856a505c780cc53ed404508cb1d73a5b8df09ad0c6a9a8e76210d6f25d20c4b3e57058648f43150804dea4b6d50d91d90 SHA512 57e50da85c7c455b81c0cf9d10d271628f924f2483cc1a51a54119622353a65fadb9d9348b004410d5050df8b243a112bcfed5cb75d095d876ad970babe188a6
 EBUILD libpod-1.4.4.ebuild 3879 BLAKE2B 5b6d38fab756fc0d1728bde36e2fc32eafe780c68aae71915460a677399ad6dc15d8aadc0af0f2d7d64b1f925a433dbb4d22cc9ff5a8cfd4220da2c6c38ad553 SHA512 f22a57de1247161b34efd9e9c1897b538a43c49954afa591fec9aa184825dddbcebc7a948b33ccdd70a15fcdc0d6f0fd7ee49d01ab92f5993a252ca5cbbc51de
+EBUILD libpod-1.5.1.ebuild 3857 BLAKE2B 8a9f5bb1e7d482a47aebd2d7a8a2b5c81d0eb7f14a7c8a6b2bf897476d6d6b39717b49d159a40540a2581b37fb76ba14e99c5b0394f2eb4eb45188284f939ed1 SHA512 ba9f7cdfb5e543385bd9bb48f1ea7728ccb6e95a29424ca85fb019f2040d9f0805cf75df7f5283f18fa14bb2dd63d096fb9a445055221b0a04ebe02430bacbf1
 MISC metadata.xml 967 BLAKE2B 3fa19bf6148a1d6e7f2b73793d68a8cd22b612dc3f96356a967e01bd2cc9acf92b6aeebd4f299ab35841277a6ba3210a3014190672354c74d07733bf65fe262a SHA512 87c7701c60d07f8c3395dadf04ea52f5676d2f6cf845838ea300f2824203520f5b1229dd91da9ccd3c81c8cbbdddc320674e0075b4c1a7539cd863f7b8123555
diff --git a/app-emulation/libpod/libpod-1.5.1.ebuild b/app-emulation/libpod/libpod-1.5.1.ebuild
new file mode 100644
index 000000000000..a51d046989d0
--- /dev/null
+++ b/app-emulation/libpod/libpod-1.5.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="00057929f5acfd98341964d85722383363376d52"
+EGO_PN="github.com/containers/${PN}"
+
+inherit flag-o-matic golang-vcs-snapshot
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/libpod/"
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="apparmor btrfs ostree +rootless selinux"
+REQUIRED_USE="!selinux? ( !ostree )"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	>=app-emulation/conmon-2.0.0
+	>=app-emulation/runc-1.0.0_rc6
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	sys-fs/lvm2
+	sys-libs/libseccomp:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	ostree? (
+		dev-libs/glib:=
+		dev-util/ostree:=
+	)
+	rootless? ( app-emulation/slirp4netns )
+	selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+
+	# Disable installation of python modules here, since those are
+	# installed by separate ebuilds.
+	sed -e '/^GIT_.*/d' \
+		-e 's/$(GO) build/$(GO) build -v -work -x/' \
+		-e 's/^\(install:.*\) install\.python$/\1/' \
+		-i Makefile || die
+}
+
+src_compile() {
+	# Filter unsupported linker flags
+	filter-flags '-Wl,*'
+
+	[[ -f hack/apparmor_tag.sh ]] || die
+	if use apparmor; then
+		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+	fi
+
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	if use btrfs; then
+		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+			hack/btrfs_installed_tag.sh || die
+	fi
+
+	[[ -f hack/ostree_tag.sh ]] || die
+	if use ostree; then
+		echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_tag.sh || die
+	fi
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	if use selinux; then
+		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+	fi
+
+	env -u GOCACHE -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
+		emake all \
+			GIT_BRANCH=master \
+			GIT_BRANCH_CLEAN=master \
+			COMMIT_NO="${EGIT_COMMIT}" \
+			GIT_COMMIT="${EGIT_COMMIT}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	insinto /etc/containers
+	newins test/registries.conf registries.conf.example
+	newins test/policy.json policy.json.example
+
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	LIBPOD_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	local want_newline=false
+	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+		elog "You need to create the following config files:"
+		elog "/etc/containers/registries.conf"
+		elog "/etc/containers/policy.json"
+		elog "To copy over default examples, use:"
+		elog "cp /etc/containers/registries.conf{.example,}"
+		elog "cp /etc/containers/policy.json{.example,}"
+		want_newline=true
+	fi
+	if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
+		${want_newline} && elog ""
+		elog "For rootless operation, you need to configure subuid/subgid"
+		elog "for user running podman. In case subuid/subgid has only been"
+		elog "configured for root, run:"
+		elog "usermod --add-subuids 1065536-1131071 <user>"
+		elog "usermod --add-subgids 1065536-1131071 <user>"
+		want_newline=true
+	fi
+}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 02250b9547ff..f53a275b2de4 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -4,6 +4,7 @@ AUX libvirt-5.2.0-do-not-use-sysconf.patch 5969 BLAKE2B 965e53b33424b5e62107574b
 AUX libvirt-5.2.0-fix-paths-for-apparmor.patch 4372 BLAKE2B ac8c78097b8125932fd89756ca7332665e2080afc5de37e0a31d6f2a84e15f21e01d41b39c7781c26cf514c74a215623c0013e67cffe7543892d5b13d3022642 SHA512 391e78a2ea113c38afb07b9f0c7638748e5bc04fb88ea96be7ff439624c429ff0106024674546b01e750d8b1e1418d13040bc8462653eb8567651378b66d53a5
 AUX libvirt-5.2.0-md-clear.patch 1268 BLAKE2B f2609a957025a59a1c5daf0faf408fdcc3c77eebb6dc315cd9ba3d6e8dc441ea6f8124ea3903ef030afe5faea0839bbf118ab22b48a424b3895a7e4b451d797f SHA512 3413ba74f841ecafdbca76496f367d85fe8ac31d637099a0c875a2ea0cab90d277a26918f7a2ffd37fd726cc1ef317a27fbdf2a73a411eb259b26a0fae0f8fd7
 AUX libvirt-5.6.0-do-not-use-sysconf.patch 6243 BLAKE2B 9cd8e5654f980369310e381cf6867776afadf4a8e4466b18f89b9698923c558de88ca05dfc007d52b621a35ef81fc0ffdf673a48246bd7d062d9f90fdd1e0ebd SHA512 7347e8aaacdcb01d9982b2d9e6579e89597ebbb497bd0f78d1169fd688e045789432151c1e60eb1ff9ed7eb85304c229d8193cf77e6cab525ca093814ad15493
+AUX libvirt-5.7.0-do-not-use-sysconf.patch 6289 BLAKE2B 894077daf73a49b9e8ef4fb019847f0e59381ae26ef39ae9d2ef438bf93f08a4da752ddb5a4cf1f35b6a68a39f96fac287d49c212094c9c2a91af571a7468ef6 SHA512 87d852dbf18c51c7b244f0e1a3faaa7b7d06f59db62dfc8c561197162764eea9e1f8136915e9dd9b5916027603bce704005f3c6b9af34b4a88b87a862de43766
 AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc
 AUX libvirt-guests.init-r3 5530 BLAKE2B 5de3e8577ded1401f6dca551c6098418e596287d43b1b90e133859bb9b74dff20b8518bc09853ccff7141e6baa52fc12c9b8d3e8f60b868b72b1993254fac5d9 SHA512 7aa4eac8c293c3063d9435a4ad1ea855f9fdd84eb0ed8cbf0779935f152aab380e2ee7eb9129b2f07147bfa4dd1eae4b836ccae295c35b63dbc767208dd11b0c
 AUX libvirt-guests.init-r4 5591 BLAKE2B e745692a7ea706c8367cdb7ee2114565770bda5be5675ba3a541555659d17875f7996ff7028bf415224d095b49b71205a3d77f420464d5579ccc189def5e434d SHA512 ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0
@@ -20,5 +21,5 @@ DIST libvirt-5.6.0.tar.xz 13147976 BLAKE2B dbfc997123f43fcf9d635b59fffa00d96826e
 EBUILD libvirt-5.2.0-r2.ebuild 9748 BLAKE2B a193479eb74f656a41a96eb134e05e32e464c85e421b720627318ba78ab0dbe95649941b5ffb03821b52f95010f26977d30cc0154de30f6e7b21fb653e4437ff SHA512 87b84568d861cecdfe106a7b6f31570890c77f6fb58484faf586dad7827f6ef8bb52b0f25f8dd92556cd811aadada99700612d1afaf603d32545d5a41eaa916f
 EBUILD libvirt-5.5.0-r1.ebuild 9481 BLAKE2B ccf8b08a0073e88ef5718cbe48b5bbf256cc25520f55d486c3a79da2f6b0ff5380c4e6cc680eba125a738655d2ecb7d8f24756ad51743990becb5f313aa64bc4 SHA512 84ecf64c0fcdde9cd7a40f745ea8cd69a6c5476acdf4804eb63048d2f31b9b0cd535ea4fb7ed062cd16844c2c8053786e652b9febfa091a93827459b6989ecb3
 EBUILD libvirt-5.6.0.ebuild 9474 BLAKE2B 0ef7d9e54a1005739b18a7a383b91a2067ce0d40450be9c1786f509be0034b019192edf56a31b6f00864f88d5dae944707450f781ebb3991b763ee628934981b SHA512 a70deffb64868dae879ee3282d3426114798a46f4e9c6c64f932a7544d4bc5093638fab914e9b6dd2b867b29a82fa9d2c7724ec5a8052d8477c4bb131d61e32d
-EBUILD libvirt-9999.ebuild 9474 BLAKE2B 0ef7d9e54a1005739b18a7a383b91a2067ce0d40450be9c1786f509be0034b019192edf56a31b6f00864f88d5dae944707450f781ebb3991b763ee628934981b SHA512 a70deffb64868dae879ee3282d3426114798a46f4e9c6c64f932a7544d4bc5093638fab914e9b6dd2b867b29a82fa9d2c7724ec5a8052d8477c4bb131d61e32d
+EBUILD libvirt-9999.ebuild 9474 BLAKE2B 314db32e07b35f8346782ddaeaa35d00ebde7496082b2bde0acf0d0d9875cbd8769716903462970c39818e13170f502e4f7d15fd283c7460144419961d3132bc SHA512 bc8afcfbc4d67c30f870e39dd421daccc1d9edca91b18f8bc8519be8d9c49465df083fb8a9b3bc57848003c775a6d265ace26f5ab5174d967b65427c555eadca
 MISC metadata.xml 3858 BLAKE2B 7f1d686cbc66544ff5ab20db52cd8a77ebb92adb0c4d01c44012c720da2c3de8aa8a2ba0f125ab90e5994f7264a3cea619cb2eb6e56338645f1ba5debd9c4585 SHA512 e97d6beba9f2f6beed28c50d06b34508a841b3e916ebfd535350e2f0c22fed40098891b4d23f041f5935ca51f671f02d3488d9d0c675e2c98640a03ae30ddf88
diff --git a/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch b/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch
new file mode 100644
index 000000000000..f4850f6ae63c
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch
@@ -0,0 +1,174 @@
+From eee203f582af1f96e7a9451d447079cf49f47495 Mon Sep 17 00:00:00 2001
+Message-Id: <eee203f582af1f96e7a9451d447079cf49f47495.1565963722.git.mprivozn@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Sat, 16 Mar 2019 12:33:00 +0100
+Subject: [PATCH] gentoo: do not use sysconf
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/Makefile.am                  | 21 ++-------------------
+ src/locking/virtlockd.service.in |  3 +--
+ src/logging/virtlogd.service.in  |  3 +--
+ src/remote/libvirtd.service.in   |  3 +--
+ tools/Makefile.am                | 13 ++-----------
+ tools/libvirt-guests.service.in  |  2 +-
+ tools/libvirt-guests.sysconf     |  7 +++++++
+ 7 files changed, 15 insertions(+), 37 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3ae4b87abb..69729d15b4 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -666,23 +666,6 @@ libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
+ 
+ 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 || :
+-
+ LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
+ 
+ EXTRA_DIST += $(LOGROTATE_FILES_IN)
+@@ -740,14 +723,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
+ 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) || :
+ 
+diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
+index e7f8057c06..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=-@sysconfdir@/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 daff48e67d..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=-@sysconfdir@/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 4c5b28b478..032ea940fa 100644
+--- a/src/remote/libvirtd.service.in
++++ b/src/remote/libvirtd.service.in
+@@ -22,12 +22,11 @@ Documentation=https://libvirt.org
+ 
+ [Service]
+ Type=notify
+-EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd
+ # libvirtd.service is set to run on boot so that autostart of
+ # VMs can be performed. We don't want it to stick around if
+ # unused though, so we set a timeout. The socket activation
+ # then ensures it gets started again if anything needs it
+-ExecStart=@sbindir@/libvirtd --timeout 120 $LIBVIRTD_ARGS
++ExecStart=@sbindir@/libvirtd --timeout 120
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+ Restart=on-failure
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 29fdbfe846..04b21eb54a 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -360,15 +360,6 @@ install-data-local: install-systemd install-nss \
+ uninstall-local: 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.sh: libvirt-guests.sh.in $(top_builddir)/config.status
+@@ -388,12 +379,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 10c664016a..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=-@sysconfdir@/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.21.0
+
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 11ae2447b09c..d623c5145d17 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -123,7 +123,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.6.0-do-not-use-sysconf.patch
+	"${FILESDIR}"/${PN}-5.7.0-do-not-use-sysconf.patch
 	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
 )
diff --git a/app-emulation/openstack-guest-agents-unix/Manifest b/app-emulation/openstack-guest-agents-unix/Manifest
index 63adae1caf94..384049868c17 100644
--- a/app-emulation/openstack-guest-agents-unix/Manifest
+++ b/app-emulation/openstack-guest-agents-unix/Manifest
@@ -4,10 +4,10 @@ AUX openstack-guest-agents-unix-1.39.0-python2.patch 882 BLAKE2B 86e5e3c87e08e7d
 AUX patches-1.39.0-20140621.patch 13058 BLAKE2B aa9ddf619bc57bc164aeb976545d2105e0fa105ea61f164d1b52357299febb19a5f501260dfee57e220dbd6154848c3488ba628a1f41dc24d5b9fb62246eb45a SHA512 562aaae73acfd92a7af5d1cb7dfed52c07a1b94ce1b1bb645002515344aeba6c0737eeb4db120986495c8f6558ebf68d9cbe3862da2f0fe14d4266d0470fe185
 DIST openstack-guest-agents-unix-1.39.0.tar.gz 75013 BLAKE2B 4245fb6fa2f8344469b264d1e9eee39e1914f76a33f54677d36ca854feb5a0548454af00cf02db9c5f2f0b6e68de9dc19fcf62a604b5d55fab96b20ed70a507e SHA512 4f7c4c1f2bc2c8ebda25dc8c0fa79c39e8e5a83040ff103f8c583d9142e71c6527d23e430da983e3a8c9add508298c31ec13a7e56d1db3b5338736dd470fec80
 DIST openstack-guest-agents-unix-1.39.1.tar.gz 75458 BLAKE2B 6afcf0cb40c7f24f7ea6ea8ca8af40373ce2fcbfffc5a8cae65e2ed8bf7003eb498b4592fa215e57a20e3c5d11064cfa4629b79eb94712ebb0ad5b09459fe815 SHA512 b1e88bb3492018375e7b2275829e2698d82d75c975a396ab7409c9b88f7787145b0da87c81a089aa8914fae30e996654b589bc1675bba769b661d7d1deb9590d
-DIST openstack-guest-agents-unix-1.39.1_p20170227.zip 143082 BLAKE2B 78835e6ff4cc5975e08d1e8f3fd39f2fb4efdc3ec1078f014c79648e5299acf81804c2257e878ff6dc158f32cc4dac2ec25ba93791f5581538c6e2762c35320c SHA512 f4ef4ca4d844109ef741126eee7c313734f5faefcf68926294c83411384eb7461c779070ed0bfcc35ffba56ef47e2677bf4b990dccd9007aa6b82551346dca8f
+DIST openstack-guest-agents-unix-1.39.1_p20170227.tar.gz 75309 BLAKE2B 3cd6f0bc3f5d7ae2ba4b1e8822e3c6659525dde4b7b9a9092bae4d825c965d88c5cba8f50f7e322cc08df1c4a113010645b2969eb1f4d3377db8279d58f56e8d SHA512 f36e40344a6a4debfa070d43177208edbeef7a829ace999b970e1423d7004d9255ab239c1feacdf9f3d14ddb469c67ccefe90a1bd83b1fb81c38a407c277832c
 EBUILD openstack-guest-agents-unix-1.39.0-r1.ebuild 939 BLAKE2B 851af6f0a387a4acc821768156aaee12fe15ddb42165830d864cd2d76afd88818b4ff445a758e2f45a722ea4466b77779b0889e64ca06aa9495587219be376e7 SHA512 df63509a304e16fbd222e3b6234be09fe04771f04a85e83d0638bf11ae1c22a79955e719f50917ecb367aff928226692e298e1c6b8bbfadaf461c9a18a39ad18
 EBUILD openstack-guest-agents-unix-1.39.0-r2.ebuild 1175 BLAKE2B d32e75df33806cb4e6a5a07c4270ebd717a8d9266fcbd5d5c1fad558715e5863ddd6e799e94c657fe21a8657865b58c72bbe5affc10d73453ca3e006390243cf SHA512 45fe477835854f74c4739ff58180ac12e59c76f20636d11e8a22fc27e13e897a76840f2ac847a3144808b4fa923d95696aafead0d069acc36132cd114c80f380
 EBUILD openstack-guest-agents-unix-1.39.0.ebuild 610 BLAKE2B ae5c7e6c520e9baf3db5f3a5b7f4210e292727e865c8cf2cb023ef4dece9bcc470e815a8cbec119201fe7cd45f4e2cc4877890fb560ff1df4bbef47cbe803863 SHA512 513e7e710b81cd33f3dec761baeb9c769b042014bc7a05275cb400cfef591e1dc71055cc3ebab195cb009be907645b0b00c317f15e0b1a944fda4cb76c0e393f
 EBUILD openstack-guest-agents-unix-1.39.1.ebuild 1461 BLAKE2B 6af82a08b86a7a24e49be92ae953158e278fe6ccf07e0d06d1f49bcae5e83daf8f11e99b7680b2e4786a3036a9452d08d4cfedecd3cfa6487e528147761abb54 SHA512 fc3b5a8fa6a1c4728dbf4114274ed8a02dabd4dd93b7a407a25a3ae0acc3a22adf86051022d1ed4ed9fcc6f1f4a618e9d1acc3472a4d0807979e41062ba7b09a
-EBUILD openstack-guest-agents-unix-1.39.1_p20170227.ebuild 1674 BLAKE2B 97c825197fb69d61f11cb299434130c16455e10669ee1e27e1d8d818d97c85055ff0306befaec7a3fc7f6f14785a1cf5cbc4cebbc4924a57c2b3fb6f67101c76 SHA512 d23db9a2d138b5227087b3aff4bf96710bacc8cd320b51582ec1d13a90e9ee141e8ae2e7077d3230eb4877cf5b4b5b4599831936ff5cceec313866a9cabb06f1
+EBUILD openstack-guest-agents-unix-1.39.1_p20170227.ebuild 1677 BLAKE2B 84f8ad2b62eb0057f01cdbfb2c278dee45b5d78d5aa0c9a92e03bdb411916d94fd99116e96e7b8376908cff8a0ec066d93b4a714b85795f8a1679b403ca03a75 SHA512 685d27c58f47bb9ab05107e9be55d5a7789f9ed7b977bbe408683f108f735d2e489bd0682c64250510383f8972433883f0c77b23273933d964b7a87440f13c48
 MISC metadata.xml 329 BLAKE2B a2fdd220d42ab64eceb8ed37e7646523856b3a3578a0e1e811fcc70730c6090234d2d270ddc6dc8175088eda91b73e3905b47d19fc2e118b11667b37215769a5 SHA512 853f823555872a4294c7c6aff0b51a9e348fde71767ecf24c8f6e83002caa8c26767c7ab36d4231d14520d8689994b4dc924e3d3721528a8bd697f44783dffab
diff --git a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1_p20170227.ebuild b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1_p20170227.ebuild
index 55c5697d99b9..944e7f894497 100644
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1_p20170227.ebuild
+++ b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1_p20170227.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ COMMIT="c9a4f15b8c8f2349601d3073cc95e30d3b91af13"
 
 DESCRIPTION="Unix Guest Agent for OpenStack"
 HOMEPAGE="https://wiki.openstack.org/wiki/GuestAgent"
-SRC_URI="https://github.com/rackerlabs/${PN}/archive/${COMMIT}.zip -> ${P}.zip"
+SRC_URI="https://github.com/rackerlabs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 4bc684f02731..92e4a1029518 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -12,7 +12,6 @@ AUX qemu-4.0.0-sanitize-interp_info.patch 930 BLAKE2B d555dedc493cfa1cf888cfa7ce
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
-EBUILD qemu-4.0.0-r3.ebuild 23895 BLAKE2B caabaa7ae8d88967be382aafb987be10b63a837fc4ec995bdaf9a262fcac978a9f012f4af78cbdae237393abe27a7485bb5438316669bf92533d53f3d14b3e74 SHA512 16c1153761c0471ff030203b49ffe96621ffd462ee13c5dfdbf14332a4b765bcbe2c8cd05a6bc2488aa12e72d9d9f5e368c56bef2191884895ce3d147611696f
-EBUILD qemu-4.0.0-r50.ebuild 23983 BLAKE2B 6cc40cf140fe87892d92e962d1f56fe006f0bcce0ac4e012aa763f06e5a4d9be05c4a76f46133e7877a333ed86dadaa9a1e40596d368346f8804c63990ad8221 SHA512 7e97431526cf34b72fa6b1b3fe96a504d041fc45e43a44851e16a5897fb9e1fd27bc0b39ec21cbb1c84f96e8210dcb73379ad7c7ba74a027c8f22843446ee5e0
-EBUILD qemu-9999.ebuild 23736 BLAKE2B 97410751fab9e608630e56f54c1944acc2d0f210d578df37f98a89817fd2c99661fc001a1f3ddb744f2cb67b960b5b9bae0062a39f2254460f12cc49c529d063 SHA512 6937f10068ff629485f641c3978e9b224a7e1c69e860d11951201d8de24fd598f313fe8c51618670c2ba1bd789d11847e8c2e006982971390f4800e76737541e
+EBUILD qemu-4.0.0-r50.ebuild 23981 BLAKE2B 75a7d09180d9e348ca8bac2a767642e2fb75fbd21f06face1fe2bb4faaa1de05f1912db48cda8c2a19ecc12c34ab31e51f2d1d4189ad8957db78cfe415812822 SHA512 ba6fd9433fa359cd6ddeff940bbf1c096721eae4dcdedee93ada5e6fee1c4cf9e14e3d5ee4781bab7509e8ea9c638d37d2222719e847c5c20709f19d6a88b5e4
+EBUILD qemu-9999.ebuild 23727 BLAKE2B c7c4b5b01fcc0e970286f9b77f2a9e479e19fe10250acf1ececdcee90321aa6b214b9fd18e468ea68cbdbbd64c88ae798cc851810ebe4b8989a2b27bb197ffb7 SHA512 e37d21022b042498b3ff297f348d370f75877d465b1cec481c017d5542149c7378d83724f227f31de2adc7406c5228a874d2de37e70135d3f1b91f45e83ae50b
 MISC metadata.xml 3903 BLAKE2B 47538d32d79321c208037c95184ab68dbbcaa2331a561142bbadc01fbc2b7973cc5ae76ac6dfa7faf1c3aa31d1d0b5dfd6a46211e94c17c5a8939b0ae99b227b SHA512 d501ede1f3182e635db02c8bac4381906ac47b8d6db4bb6b0fdeb91b35b440a2a59a5dd23b06462f1d49a6b64ae2f2bcf1f81fd0a898c8f4b67a40ccf2c58341
diff --git a/app-emulation/qemu/qemu-4.0.0-r3.ebuild b/app-emulation/qemu/qemu-4.0.0-r3.ebuild
deleted file mode 100644
index 0d4fcd42894e..000000000000
--- a/app-emulation/qemu/qemu-4.0.0-r3.ebuild
+++ /dev/null
@@ -1,808 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-PYTHON_REQ_USE="ncurses,readline"
-
-PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
-
-FIRMWARE_ABI_VERSION="2.11.1-r50"
-
-inherit eutils linux-info toolchain-funcs multilib python-r1 \
-	udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
-	+fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux
-	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
-	pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
-	spice ssh static static-user systemtap tci test usb usbredir vde
-	+vhost-net virgl virtfs +vnc vte xattr xen xfs"
-
-COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
-	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
-	sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
-	lm32 moxie tricore unicore32"
-IUSE_USER_TARGETS="${COMMON_TARGETS}
-	aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
-	tilegx"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_mips64el? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_riscv32? ( fdt )
-	qemu_softmmu_targets_riscv64? ( fdt )
-	static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy )
-	virtfs? ( xattr )
-	vte? ( gtk )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-	>=dev-libs/glib-2.0[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-util/systemtap )
-	xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-	dev-libs/libxml2[static-libs(+)]
-	x11-libs/libxkbcommon[static-libs(+)]
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? (
-		app-accessibility/brltty[api]
-		app-accessibility/brltty[static-libs(+)]
-	)
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bzip2? ( app-arch/bzip2[static-libs(+)] )
-	capstone? ( dev-libs/capstone:= )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gnutls? (
-		dev-libs/nettle:=[static-libs(+)]
-		>=net-libs/gnutls-3.0:=[static-libs(+)]
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		vte? ( x11-libs/vte:2.91 )
-	)
-	infiniband? (
-		sys-fabric/libibumad:=[static-libs(+)]
-		sys-fabric/libibverbs:=[static-libs(+)]
-		sys-fabric/librdmacm:=[static-libs(+)]
-	)
-	iscsi? ( net-libs/libiscsi )
-	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	ncurses? (
-		sys-libs/ncurses:0=[unicode]
-		sys-libs/ncurses:0=[static-libs(+)]
-	)
-	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[egl,gbm]
-	)
-	png? ( media-libs/libpng:0=[static-libs(+)] )
-	pulseaudio? ( media-sound/pulseaudio )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		media-libs/libsdl2[X]
-		media-libs/libsdl2[static-libs(+)]
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-	snappy? ( app-arch/snappy:= )
-	spice? (
-		>=app-emulation/spice-protocol-0.12.3
-		>=app-emulation/spice-0.12.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
-	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virgl? ( media-libs/virglrenderer[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools:= )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-
-X86_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-2017_p20180211[binary]
-		~sys-firmware/ipxe-1.0.0_p20180211[binary]
-		~sys-firmware/seabios-1.11.0[binary,seavgabios]
-		~sys-firmware/sgabios-0.1_pre8[binary]
-	)
-	!pin-upstream-blobs? (
-		sys-firmware/edk2-ovmf
-		sys-firmware/ipxe
-		>=sys-firmware/seabios-1.10.2[seavgabios]
-		sys-firmware/sgabios
-	)"
-PPC64_FIRMWARE_DEPEND="
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-1.11.0[binary,seavgabios]
-	)
-	!pin-upstream-blobs? (
-		>=sys-firmware/seabios-1.10.2[seavgabios]
-	)
-"
-
-BDEPEND="
-	$(python_gen_impl_dep)
-	dev-lang/perl
-	sys-apps/texinfo
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	gtk? ( nls? ( sys-devel/gettext ) )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)
-"
-CDEPEND="
-	!static? (
-		${ALL_DEPEND//\[static-libs(+)]}
-		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-	)
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? (
-		${ALL_DEPEND}
-		${SOFTMMU_TOOLS_DEPEND}
-	)
-	static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
-	acct-group/kvm
-	selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-cflags.patch
-	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
-	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-	"${FILESDIR}"/${P}-sanitize-interp_info.patch
-	"${FILESDIR}"/${PN}-3.1.0-md-clear-md-no.patch
-	"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
-	"${FILESDIR}"/${PN}-4.0.0-fix_infiniband_include.patch #686412
-)
-
-QA_PREBUILT="
-	usr/share/qemu/hppa-firmware.img
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/s390-netboot.img
-	usr/share/qemu/u-boot.e500"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or1k
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-	For AMD CPUs the module is called 'kvm-amd'.
-	For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-	$ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-	$ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-	# rc-update add qemu-binfmt
-For systemd:
-	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				if grep -q AuthenticAMD /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_AMD"
-				elif grep -q GenuineIntel /proc/cpuinfo; then
-					CONFIG_CHECK+=" ~KVM_INTEL"
-				fi
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-	local var=$1 mak=$2
-	local detected sorted
-
-	pushd "${S}"/default-configs >/dev/null || die
-
-	# Force C locale until glibc is updated. #564936
-	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
-	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "${var}: ${sorted}"
-		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-		die "sync ${var} to the list of targets"
-	fi
-
-	popd >/dev/null
-}
-
-handle_locales() {
-	# Make sure locale list is kept up-to-date.
-	local detected sorted
-	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
-	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "PLOCALES: ${sorted}"
-		eerror " po/*.po: ${detected}"
-		die "sync PLOCALES"
-	fi
-
-	# Deal with selective install of locales.
-	if use nls ; then
-		# Delete locales the user does not want. #577814
-		rm_loc() { rm po/$1.po || die; }
-		l10n_for_each_disabled_locale_do rm_loc
-	else
-		# Cheap hack to disable gettext .mo generation.
-		rm -f po/*.po
-	fi
-}
-
-src_prepare() {
-	check_targets IUSE_SOFTMMU_TARGETS softmmu
-	check_targets IUSE_USER_TARGETS linux-user
-
-	default
-
-	# Fix ld and objcopy being called directly
-	tc-export AR LD OBJCOPY
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	# Run after we've applied all patches.
-	handle_locales
-
-	# Remove bundled copy of libfdt
-	rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-
-	mkdir "${builddir}"
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir=/usr/$(get_libdir)
-		--docdir=/usr/share/doc/${PF}/html
-		--disable-bsd-user
-		--disable-guest-agent
-		--disable-strip
-		--disable-werror
-		# We support gnutls/nettle for crypto operations.  It is possible
-		# to use gcrypt when gnutls/nettle are disabled (but not when they
-		# are enabled), but it's not really worth the hassle.  Disable it
-		# all the time to avoid automatically detecting it. #568856
-		--disable-gcrypt
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		$(use_enable doc docs)
-		$(use_enable tci tcg-interpreter)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets. This simplifies building
-	# static user targets (USE=static-user) considerably.
-	conf_notuser() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	conf_opts+=(
-		--disable-bluez
-		$(conf_notuser accessibility brlapi)
-		$(conf_notuser aio linux-aio)
-		$(conf_notuser bzip2)
-		$(conf_notuser capstone)
-		$(conf_notuser caps cap-ng)
-		$(conf_notuser curl)
-		$(conf_notuser fdt)
-		$(conf_notuser glusterfs)
-		$(conf_notuser gnutls)
-		$(conf_notuser gnutls nettle)
-		$(conf_notuser gtk)
-		$(conf_notuser infiniband rdma)
-		$(conf_notuser iscsi libiscsi)
-		$(conf_notuser jpeg vnc-jpeg)
-		$(conf_notuser kernel_linux kvm)
-		$(conf_notuser lzo)
-		$(conf_notuser ncurses curses)
-		$(conf_notuser nfs libnfs)
-		$(conf_notuser numa)
-		$(conf_notuser opengl)
-		$(conf_notuser png vnc-png)
-		$(conf_notuser rbd)
-		$(conf_notuser sasl vnc-sasl)
-		$(conf_notuser sdl)
-		$(conf_notuser seccomp)
-		$(conf_notuser smartcard)
-		$(conf_notuser snappy)
-		$(conf_notuser spice)
-		$(conf_notuser ssh libssh2)
-		$(conf_notuser usb libusb)
-		$(conf_notuser usbredir usb-redir)
-		$(conf_notuser vde)
-		$(conf_notuser vhost-net)
-		$(conf_notuser virgl virglrenderer)
-		$(conf_notuser virtfs)
-		$(conf_notuser vnc)
-		$(conf_notuser vte)
-		$(conf_notuser xen)
-		$(conf_notuser xen xen-pci-passthrough)
-		$(conf_notuser xfs xfsctl)
-	)
-
-	if [[ ${buildtype} == "user" ]] ; then
-		conf_opts+=( --disable-libxml2 )
-	else
-		conf_opts+=( --enable-libxml2 )
-	fi
-
-	if [[ ! ${buildtype} == "user" ]] ; then
-		# audio options
-		local audio_opts="oss"
-		use alsa && audio_opts="alsa,${audio_opts}"
-		use sdl && audio_opts="sdl,${audio_opts}"
-		use pulseaudio && audio_opts="pa,${audio_opts}"
-		conf_opts+=(
-			--audio-drv-list="${audio_opts}"
-		)
-	fi
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-blobs
-			--disable-tools
-		)
-		local static_flag="static-user"
-		;;
-	softmmu)
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--disable-tools
-		)
-		local static_flag="static"
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--disable-blobs
-			--enable-tools
-		)
-		local static_flag="static"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		tc-enables-pie && conf_opts+=( --enable-pie )
-	fi
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-
-	# FreeBSD's kernel does not support QEMU assigning/grabbing
-	# host USB devices yet
-	use kernel_FreeBSD && \
-		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-
-	cd "${S}/tools-build"
-	default
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		pax-mark m */qemu-system-* #515550
-		emake -j1 check
-		emake -j1 check-report.html
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/python/qemu/qmp.py"
-
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-	local out="${T}/qemu-binfmt"
-	local out_systemd="${T}/qemu.conf"
-	local d="${T}/binfmt.d"
-
-	einfo "Generating qemu binfmt scripts and configuration files"
-
-	# Generate the debian fragments first.
-	mkdir -p "${d}"
-	"${S}"/scripts/qemu-binfmt-conf.sh \
-		--debian \
-		--exportdir "${d}" \
-		--qemu-path "${EPREFIX}/usr/bin" \
-		|| die
-	# Then turn the fragments into a shell script we can source.
-	sed -E -i \
-		-e 's:^([^ ]+) (.*)$:\1="\2":' \
-		"${d}"/* || die
-
-	# Generate the init.d script by assembling the fragments from above.
-	local f qcpu package interpreter magic mask
-	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-	for f in "${d}"/qemu-* ; do
-		source "${f}"
-
-		# Normalize the cpu logic like we do in the init.d for the native cpu.
-		qcpu=${package#qemu-}
-		case ${qcpu} in
-		arm*)   qcpu="arm";;
-		mips*)  qcpu="mips";;
-		ppc*)   qcpu="ppc";;
-		s390*)  qcpu="s390";;
-		sh*)    qcpu="sh";;
-		sparc*) qcpu="sparc";;
-		esac
-
-		# we use 'printf' here to be portable across 'sh'
-		# implementations: #679168
-		cat <<EOF >>"${out}"
-	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
-	fi
-EOF
-
-		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
-	done
-	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets.
-		generate_initd
-		doinitd "${T}/qemu-binfmt"
-
-		# Install binfmt/qemu.conf.
-		insinto "/usr/share/qemu/binfmt.d"
-		doins "${T}/qemu.conf"
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dohtml check-report.html
-
-		if use kernel_linux; then
-			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	cd "${S}/tools-build"
-	emake DESTDIR="${ED}" install
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null
-	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-	popd >/dev/null
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	# Disallow stripping of prebuilt firmware files.
-	dostrip -x ${QA_PREBUILT}
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		rm "${ED}/usr/share/qemu/bios.bin"
-		rm "${ED}/usr/share/qemu/bios-256k.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
-		fi
-
-		# Remove vgabios since we're using the seavgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-		# PPC64 loads vgabios-stdvga
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
-			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
-			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
-			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		rm "${ED}/usr/share/qemu/sgabios.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		rm "${ED}"/usr/share/qemu/pxe-*.rom
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	xdg_icon_cache_update
-
-	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
-		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
-
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_print_elog
-
-	if use pin-upstream-blobs && firmware_abi_change; then
-		ewarn "This version of qemu pins new versions of firmware blobs:"
-		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
-		ewarn "	$(best_version sys-firmware/ipxe)"
-		ewarn "	$(best_version sys-firmware/seabios)"
-		ewarn "	$(best_version sys-firmware/sgabios)"
-		ewarn "This might break resume of hibernated guests (started with a different"
-		ewarn "firmware version) and live migration to/from qemu versions with different"
-		ewarn "firmware. Please (cold) restart all running guests. For functional"
-		ewarn "guest migration ensure that all"
-		ewarn "hosts run at least"
-		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/edk2-ovmf)"
-	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version 'sys-firmware/seabios[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-emulation/qemu/qemu-4.0.0-r50.ebuild b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
index c7b37f21801b..d547b37ab845 100644
--- a/app-emulation/qemu/qemu-4.0.0-r50.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 5dada763cbc0..c58b83277ecd 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="ncurses,readline"
 
 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
 
-FIRMWARE_ABI_VERSION="2.11.1-r50"
+FIRMWARE_ABI_VERSION="4.0.0-r50"
 
 inherit eutils linux-info toolchain-funcs multilib python-r1 \
 	udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
@@ -148,9 +148,9 @@ SOFTMMU_TOOLS_DEPEND="
 
 X86_FIRMWARE_DEPEND="
 	pin-upstream-blobs? (
-		~sys-firmware/edk2-ovmf-2017_p20180211[binary]
-		~sys-firmware/ipxe-1.0.0_p20180211[binary]
-		~sys-firmware/seabios-1.11.0[binary,seavgabios]
+		~sys-firmware/edk2-ovmf-201905[binary]
+		~sys-firmware/ipxe-1.0.0_p20190728[binary]
+		~sys-firmware/seabios-1.12.0[binary,seavgabios]
 		~sys-firmware/sgabios-0.1_pre8[binary]
 	)
 	!pin-upstream-blobs? (
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
deleted file mode 100644
index 86606e0eb899..000000000000
--- a/app-emulation/rkt/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz 245010 BLAKE2B 335f05906d4c623e7d1213e1e335af742c1072e4b7505c7f25d703c468db8b410d66809239d40b98c0aa4347985d2d861ef4d8519eae19ca6cdae776dc2a7b1b SHA512 7cca005136f3628dfef359f83732d6f8cc062c5e4a8d77f57c6dd5e007ed06c85f0c275c8844228b404755dbf3f4d45f6a149fc64235f4f1abe0058214e24730
-DIST kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patch 2168 BLAKE2B 8f33f1034dda7b7c749b5540f83b0241025eb1366631e2067ff470a5e2626b41fe41d4efde1e9f8104896b126ea4a0ac06334f2b88d4730bde16ce65283b4133 SHA512 483acd3758cf66587a173da8e24ef127c04955742d292de663226ebd3a1f3ee41b24a966e771f066cd735d0bda77a15d09ca00a27d3de7130456c0eb3cf7cf5e
-DIST kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch 1243 BLAKE2B d5591addbcdb22952b5b6e462283215bd2366edabbb0db54ffa49b101cf4dcf599a788f4c07fd02729bbf67a3490613f4c4c89f27ad4d84600351d6156dfa4bc SHA512 d8e9d6e656b51d8e4b3bf6939e927a4c11874dfb34b4d649adcbcaf44ec1f95af2bf73e138f94c53aa07cbd79db63a6ebf75f96861f8b13743c942523a3ff106
-DIST linux-4.9.2.tar.xz 93189108 BLAKE2B d9eb7bd6f168aba5955da92f54c70468a5eaa6fabceb8399d8c2398672d4401012dc23ce92dfd63e80c87b57eba56f77b62dbf8ec7a8b12e6e0af2d66ea29e3f SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de
-DIST qemu-2.8.0.tar.bz2 28368517 BLAKE2B 15177018f1f828f35e745593746228738f9bd540b3658b5ca285141867a9fc4a7a4aa9be7b174d32f5d7fc2567fb379a4ce40135b405047282cfbdcd8ab90181 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2
-DIST rkt-1.29.0.tar.gz 3434520 BLAKE2B b3e1b4e93335023e86439a5202cdb2d8c8f62a24392fd37a11fe381f76cad71ad01d0e4a6b6acdd29edaa77932530f1cdfe5a2aed403841c079f7cb40591972c SHA512 a128abddb29a246b0afea8f7dc81d77aae1e8efaf4dae8fe92aa0f2855c4e4f9dcf7a6f01efa77500ed8a6723db83933c8d1973b284dc62f8e9e0e06b6a20f6d
-DIST rkt-1.30.0.tar.gz 3655661 BLAKE2B f7ac84cdf40d64a04cb1b95cc59a33585f38ab7aac2768833a369725fccfa80c4d85d213161f0d3e265e1b84730e9224a63103dcb6085595474fafa35f8b9d5b SHA512 47b409a61960fec1352535beb2fcdc396ec1cf6feb7d66b320aed0acd908c8ae86d058b4f9b76367606f4e78db6f333bc85dac66f7d646b3b1ada9bfd1f15e44
-DIST rkt-pxe-1478.0.0.img 264382497 BLAKE2B 087fc5e27fe2fe41a82d4dad727625a573eda027b3ca67e063ec6d38bb6382353e30804e21f55cda5494ad7ff3cf1db9d593ccc63a639e16a98295d976e92325 SHA512 5f462b6223a141d72a38857fff26f4f70c0a36f21d1cc69623d946ba42f8b15fa994f222b1934cd16cc5b4e306cf5a8850295492dfb637f2a8fee8b774d7c1e4
-DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
-EBUILD rkt-1.29.0.ebuild 8629 BLAKE2B c4da76ece23345dafdb615befa4074477a499b2964996bcaa899bb617e29bfabb53031867d974cb495891d360e4530e5d65cd6a17f3a57c50c9aedf01d84e9e3 SHA512 34128807bf214649c176c2e80017d6a6485ee9c1e0d41f9a7bb7d32834900da46ad78ae7d30172ed8c6e1ceedb6e10edacd98638de31545c8ff68cf40ee274f9
-EBUILD rkt-1.30.0.ebuild 7982 BLAKE2B fc4bfa5118a5059117ad7c020d9042d9b3d697955d8027538a6ad36fdce0494add3be07ae3c676c43678af15eadc4106e0bc821e7f40317e92482b46d106782e SHA512 b0d8d5c15809bbaf5d634c116baefd4f870e6b4e51437c2b6358efce8214ce874e39dca6017c73b537b98826d4f0b056848dc29c91cb25578e123066cbe70c1b
-MISC metadata.xml 1468 BLAKE2B 5df0af80bfb8b1097b68936552afad8b18a372902fd4e36bf1dd03b4a8121c10859fda9a018ff0bb85436d33c4c9e789fd527c583f7cfaf15863ecfdc4190941 SHA512 e0548fddd59d422eb04b0b18b98b273d0f3d39465c91539fdfce71583388a6651e878725cf196b0c74efa42b489c44b12e4671e28b3f16d76a16fb8184c3da1a
diff --git a/app-emulation/rkt/metadata.xml b/app-emulation/rkt/metadata.xml
deleted file mode 100644
index d9f76835717a..000000000000
--- a/app-emulation/rkt/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<longdescription lang="en">
-		rkt is the next-generation container manager for Linux clusters.
-		Designed for security, simplicity, and composability within modern
-		cluster architectures, rkt discovers, verifies, fetches, and executes
-		application containers with pluggable isolation. rkt can run the same
-		container with varying degrees of protection, from lightweight,
-		OS-level namespace and capabilities isolation to heavier, VM-level
-		hardware virtualization.
-	</longdescription>
-	<use>
-		<flag name="actool">Install the actool for ACI manipulation</flag>
-		<flag name="rkt_stage1_coreos">Download and use a prebuilt stage1.aci from CoreOS</flag>
-		<flag name="rkt_stage1_fly">Build stage1-fly.aci</flag>
-		<flag name="rkt_stage1_kvm" restrict="&lt;app-emulation/rkt-1.15.0">
-			This flag has been replaced by the rkt_stage1_kvm_* flags
-		</flag>
-		<flag name="rkt_stage1_kvm_lkvm">Build stage1-kvm-lkvm.aci</flag>
-		<flag name="rkt_stage1_kvm_qemu">Build stage1-kvm-qemu.aci</flag>
-		<flag name="rkt_stage1_src">Build the stage1.aci from source</flag>
-		<flag name="rkt_stage1_host">Assemble stage1.aci from host binaries</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">coreos/rkt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-emulation/rkt/rkt-1.29.0.ebuild b/app-emulation/rkt/rkt-1.29.0.ebuild
deleted file mode 100644
index 314f265ac191..000000000000
--- a/app-emulation/rkt/rkt-1.29.0.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1478.0.0"
-PXE_SYSTEMD_VERSION="v233"
-KVM_LINUX_VERSION="4.9.2"
-KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
-QEMU_VERSION="v2.8.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
-	${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
-	https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
-	https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=c0a985531f49c06fd05069024f4664740e6a0baf -> kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch
-	https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=1cc05b24bfe0211bb408f3264af8e0c42dcdde9c -> kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patch
-	${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
-	http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
-	${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src +actool systemd"
-REQUIRED_USE="!systemd? ( !rkt_stage1_host ) || ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src ) !rkt_stage1_kvm"
-
-# Some tests fail.
-# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
-RESTRICT="test rkt_stage1_src? ( userpriv )"
-
-DEPEND=">=dev-lang/go-1.5
-	app-arch/cpio
-	app-crypt/trousers
-	sys-fs/squashfs-tools
-	dev-perl/Capture-Tiny
-	rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
-	rkt_stage1_kvm_qemu? (
-		sys-apps/attr[static-libs(+)]
-		sys-libs/libcap[static-libs(+)]
-		sys-libs/zlib[static-libs(+)]
-		>=x11-libs/pixman-0.28.0[static-libs(+)]
-	)"
-
-RDEPEND="!app-emulation/rocket
-	rkt_stage1_host? ( systemd? (
-		>=sys-apps/systemd-222
-		app-shells/bash:0
-	) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
-	enewgroup rkt-admin
-	enewgroup rkt
-}
-
-src_unpack() {
-	local dest x
-	for x in ${A}; do
-		case ${x} in
-			*.img|linux-*) continue ;;
-			kvmtool-include-*) #627564 #635274
-				dest=${S}/stage1/usr_from_kvm/lkvm/patches
-				mkdir -p "${dest}" || die
-				cp "${DISTDIR}/${x}" "${dest}" || die
-				;;
-			kvmtool-*)
-				mkdir kvmtool || die
-				pushd kvmtool >/dev/null || die
-				unpack ${x}
-				popd >/dev/null || die
-				;;
-			*)
-				unpack ${x}
-		esac
-	done
-}
-
-src_prepare() {
-	eapply_user
-
-	# This patch breaks linux kernel cc-option checks when the
-	# compiler doesn't recognize the -no-pie option.
-	rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
-
-	# avoid sdjournal include for bug 595874
-	if ! use systemd; then
-		sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
-			-i rkt/rkt.mk || die
-	fi
-
-	sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
-	# disable git fetch of systemd
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
-	# disable git fetch of kvmtool
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
-	# disable git fetch of qemu
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
-	-e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
-	-i stage1/usr_from_kvm/qemu.mk || die
-
-	# disable fetch of kernel sources
-	sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
-		-i stage1/usr_from_kvm/kernel.mk || die
-
-	if use rkt_stage1_host; then
-		# Make systemdUnitsPath consistent with host
-		sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
-			-i stage1/init/init.go || die
-	fi
-
-	if use rkt_stage1_kvm_qemu; then
-		sed '1i#include <sys/sysmacros.h>' -i "${WORKDIR}/qemu-${QEMU_VERSION#v}/hw/9pfs/9p.c" || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local flavors hypervisors myeconfargs=(
-		--with-stage1-default-images-directory="/usr/share/rkt"
-		--with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
-	)
-
-	use systemd || myeconfargs+=( --enable-sdjournal=no )
-
-	# enable flavors (first is default)
-	use rkt_stage1_host && flavors+=",host"
-	use rkt_stage1_src && flavors+=",src"
-	use rkt_stage1_coreos && flavors+=",coreos"
-	use rkt_stage1_fly && flavors+=",fly"
-	{ use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
-	myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
-	if use rkt_stage1_src; then
-		myeconfargs+=(
-			--with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
-			--with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
-		)
-	fi
-
-	if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
-		myeconfargs+=(
-			--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
-			--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
-		)
-	fi
-
-	if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
-		use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
-		use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
-		myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
-	fi
-
-	# Go's 6l linker does not support PIE, disable so cgo binaries
-	# which use 6l+gcc for linking can be built correctly.
-	if gcc-specs-pie; then
-		append-ldflags -nopie
-	fi
-
-	export CC=$(tc-getCC)
-	export CGO_ENABLED=1
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-	export CGO_LDFLAGS="${LDFLAGS}"
-	export BUILDDIR
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	local arch=${ARCH}
-	case ${arch} in
-		amd64) arch=x86_64;;
-	esac
-	ARCH=${arch} emake V=3
-	ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	use examples && dodoc -r examples
-	use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
-	dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
-	insinto /usr/share/rkt
-	doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
-	# create symlink for default stage1 image path
-	if use rkt_stage1_host; then
-		dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_src; then
-		dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_coreos; then
-		dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_fly; then
-		dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_kvm_lkvm; then
-		dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_kvm_qemu; then
-		dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
-	fi
-
-	systemd_dounit "${S}"/dist/init/systemd/*.service \
-		"${S}"/dist/init/systemd/*.timer \
-		"${S}"/dist/init/systemd/*.socket
-
-	insinto /usr/lib/tmpfiles.d
-	doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
-	newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
-	keepdir /etc/${PN}
-	fowners :rkt-admin /etc/${PN}
-	fperms 2775 /etc/${PN}
-}
diff --git a/app-emulation/rkt/rkt-1.30.0.ebuild b/app-emulation/rkt/rkt-1.30.0.ebuild
deleted file mode 100644
index b5ad9568d125..000000000000
--- a/app-emulation/rkt/rkt-1.30.0.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1478.0.0"
-PXE_SYSTEMD_VERSION="v233"
-KVM_LINUX_VERSION="4.9.2"
-KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
-QEMU_VERSION="v2.8.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
-	${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
-	https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
-	https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=c0a985531f49c06fd05069024f4664740e6a0baf -> kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch
-	https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=1cc05b24bfe0211bb408f3264af8e0c42dcdde9c -> kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patch
-	${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
-	http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
-	${SRC_URI_KVM}
-)"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu +actool systemd"
-REQUIRED_USE="!systemd? ( !rkt_stage1_host ) || ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu ) !rkt_stage1_kvm"
-
-# Some tests fail.
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.5
-	app-arch/cpio
-	app-crypt/trousers
-	sys-fs/squashfs-tools
-	dev-perl/Capture-Tiny
-	rkt_stage1_kvm_qemu? (
-		sys-apps/attr[static-libs(+)]
-		sys-libs/libcap[static-libs(+)]
-		sys-libs/zlib[static-libs(+)]
-		>=x11-libs/pixman-0.28.0[static-libs(+)]
-	)"
-
-RDEPEND="!app-emulation/rocket
-	rkt_stage1_host? ( systemd? (
-		>=sys-apps/systemd-222
-		app-shells/bash:0
-	) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
-	enewgroup rkt-admin
-	enewgroup rkt
-}
-
-src_unpack() {
-	local dest x
-	for x in ${A}; do
-		case ${x} in
-			*.img|linux-*) continue ;;
-			kvmtool-include-*) #627564 #635274
-				dest=${S}/stage1/usr_from_kvm/lkvm/patches
-				mkdir -p "${dest}" || die
-				cp "${DISTDIR}/${x}" "${dest}" || die
-				;;
-			kvmtool-*)
-				mkdir kvmtool || die
-				pushd kvmtool >/dev/null || die
-				unpack ${x}
-				popd >/dev/null || die
-				;;
-			*)
-				unpack ${x}
-		esac
-	done
-}
-
-src_prepare() {
-	eapply_user
-
-	# This patch breaks linux kernel cc-option checks when the
-	# compiler doesn't recognize the -no-pie option.
-	rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
-
-	# avoid sdjournal include for bug 595874
-	if ! use systemd; then
-		sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
-			-i rkt/rkt.mk || die
-	fi
-
-	sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
-	# disable git fetch of systemd
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
-	# disable git fetch of kvmtool
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
-	# disable git fetch of qemu
-	sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
-	-e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
-	-i stage1/usr_from_kvm/qemu.mk || die
-
-	# disable fetch of kernel sources
-	sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
-		-i stage1/usr_from_kvm/kernel.mk || die
-
-	if use rkt_stage1_host; then
-		# Make systemdUnitsPath consistent with host
-		sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
-			-i stage1/init/init.go || die
-	fi
-
-	if use rkt_stage1_kvm_qemu; then
-		sed '1i#include <sys/sysmacros.h>' -i "${WORKDIR}/qemu-${QEMU_VERSION#v}/hw/9pfs/9p.c" || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local flavors hypervisors myeconfargs=(
-		--with-stage1-default-images-directory="/usr/share/rkt"
-		--with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
-	)
-
-	use systemd || myeconfargs+=( --enable-sdjournal=no )
-
-	# enable flavors (first is default)
-	use rkt_stage1_host && flavors+=",host"
-	use rkt_stage1_coreos && flavors+=",coreos"
-	use rkt_stage1_fly && flavors+=",fly"
-	{ use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
-	myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
-	if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
-		myeconfargs+=(
-			--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
-			--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
-		)
-	fi
-
-	if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
-		use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
-		use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
-		myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
-	fi
-
-	# Go's 6l linker does not support PIE, disable so cgo binaries
-	# which use 6l+gcc for linking can be built correctly.
-	if gcc-specs-pie; then
-		append-ldflags -nopie
-	fi
-
-	export CC=$(tc-getCC)
-	export CGO_ENABLED=1
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-	export CGO_LDFLAGS="${LDFLAGS}"
-	export BUILDDIR
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	local arch=${ARCH}
-	case ${arch} in
-		amd64) arch=x86_64;;
-	esac
-	ARCH=${arch} emake V=3
-	ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	use examples && dodoc -r examples
-	use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
-	dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
-	insinto /usr/share/rkt
-	doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
-	# create symlink for default stage1 image path
-	if use rkt_stage1_host; then
-		dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_coreos; then
-		dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_fly; then
-		dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_kvm_lkvm; then
-		dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_kvm_qemu; then
-		dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
-	fi
-
-	systemd_dounit "${S}"/dist/init/systemd/*.service \
-		"${S}"/dist/init/systemd/*.timer \
-		"${S}"/dist/init/systemd/*.socket
-
-	insinto /usr/lib/tmpfiles.d
-	doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
-	newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
-	keepdir /etc/${PN}
-	fowners :rkt-admin /etc/${PN}
-	fperms 2775 /etc/${PN}
-}
diff --git a/app-emulation/simplevirt/Manifest b/app-emulation/simplevirt/Manifest
index 7ac2633fea54..0a3cd13ed7ca 100644
--- a/app-emulation/simplevirt/Manifest
+++ b/app-emulation/simplevirt/Manifest
@@ -5,6 +5,6 @@ DIST github.com-go-yaml-yaml-v2.2.1.tar.gz 70217 BLAKE2B 4ba34bd9432699ec60348d1
 DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
 DIST github.com-spf13-cobra-v0.0.3.tar.gz 101526 BLAKE2B 8613eccdd5bbd31429b7aa8260ee9367e34a5cc78075b394b09db91a97445ed1dadfb53a86105b55cb6ea3b4c2f9d50553e9198d64dfb6033dd1db2805984a2c SHA512 c38db9432a168f913b41a1e1b11d84bedfade82ff70791be9d343a6cc86b8a05b18bae344d67ebd8bae4c98662db7ac664a9dc86fa9b9ad4aa5c96cbf0178efb
 DIST github.com-spf13-pflag-v1.0.2.tar.gz 44042 BLAKE2B 157fa6c2b1efa594abebd76ff03121050187974d62475b1aa66af325a2198ea64105655597703c37f25e22c4a07864d9fc31a6a29ba9233fdeefcceef400d5e5 SHA512 fd3cefd683329316eda4ec660193a970e38435515c16805190235e2c969c8d65a6f602fdc7c2f7cf3d9740c5a321ee5be5e8034bd6cd7c05c12722cf64d1e8ae
-DIST simplevirt-0.0_p20181011.tar.gz 14667 BLAKE2B 02a7ecdf9ec9983a83c31fb728fbf61ffcb2ca71683ebf24d159815314b064e465da303b5c8712b18aff3ecd1da0c5170c4aa4be365855e233497f62c44ed888 SHA512 b290cbff14a3679600ca2cadcfd17184ea789c0f1556a6f1de64679ef9983eb7988ac7ebadd0de729286d8a86dbdaab3a9f7b7bbc300780c3a28aa9920610288
-EBUILD simplevirt-0.0_p20181011.ebuild 2111 BLAKE2B 1bb539551e4190aa9e278857c3e763198b48d4c8af657f52992ebb8810664f8fe571b3ddde0051506f14b745eb19f8325f14fdcd80d6a60568ce888d2191f32c SHA512 3bea399a586a3369c884fff30c34b2f2782d68f1c3f69b3fd6c3403b99f2d96468cf79487be165ac0359b99bae69a13b76253d3b2357ab8c1f63fccfd4b97303
+DIST simplevirt-0.0_p20181012.tar.gz 14652 BLAKE2B a6a648ed159d0648f27174c6598c9ae85e41530b218ef0360962884d1f61cfd16d2534ef4d2a01eb87138d0390fc7fe25e070c602f296344b8285c9dd2804287 SHA512 64c0edfc22ed0347c7335b942b06b6b9fd8c3f2ea7d374bf14b96b98b23248d15b6f38d7d1d809c8cd60b605f1809dfca8ff5c249e2df183c8b1636c26440ca8
+EBUILD simplevirt-0.0_p20181012.ebuild 2111 BLAKE2B 8251677ca167aa9add8b2b09de631c6edd4f1d9c4b82c7e687c422cbf0402f829435d0eacd836008451bef60087e1bc0e1a1bdd27ff40d43bea7b29144bf75d9 SHA512 09e1dc942e855c8d12298accc30fbb20015ac7b1978ad0e7851b62d5c79dac216eef90031b6389ba6477efde7cc19ac9feac2812cba7ec8c3d421024e6aaf506
 MISC metadata.xml 576 BLAKE2B d62570b65053dc9cb9c264b5fdc90aec72d429b6a166e0c4298e4d27105b127094b1a5ad2f96fe8ba6d23118d82faa3aada90643a5165e3874f2f425dc7d37f1 SHA512 91031a71f21466b4782efe38f645169a585dcc29346c4a6e98b129549b8ccb197cb00f03ce3d9d51306284bc24494afcf117efb003c33855f262177daf077987
diff --git a/app-emulation/simplevirt/simplevirt-0.0_p20181011.ebuild b/app-emulation/simplevirt/simplevirt-0.0_p20181011.ebuild
deleted file mode 100644
index 0dceee42cb54..000000000000
--- a/app-emulation/simplevirt/simplevirt-0.0_p20181011.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/spf13/cobra v0.0.3"
-	"github.com/spf13/pflag v1.0.2"
-	"gopkg.in/check.v1 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec github.com/go-check/check"
-	"gopkg.in/yaml.v2 v2.2.1 github.com/go-yaml/yaml"
-)
-
-inherit linux-info golang-vcs-snapshot user
-
-EGO_PN="github.com/rafaelmartins/simplevirt"
-GIT_COMMIT="2427500bce5bf9b365dc601790704694cd6c772e"
-GIT_VERSION="0.0.24-2427"
-ARCHIVE_URI="https://${EGO_PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Simple virtual machine manager for Linux (QEMU/KVM)"
-HOMEPAGE="https://github.com/rafaelmartins/simplevirt"
-SRC_URI="
-	${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	virtual/logger
-	app-emulation/qemu"
-
-CONFIG_CHECK="~TUN ~BRIDGE"
-ERROR_TUN="CONFIG_TUN: Universal TUN/TAP driver required to setup bridge networking"
-ERROR_BRIDGE="CONFIG_BRIDGE: 802.1d Ethernet Bridging required to setup bridge networking"
-
-pkg_setup() {
-	enewgroup simplevirt
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	pushd src/${EGO_PN} > /dev/null || die
-	GOPATH="${S}" go install -v -ldflags "-X ${EGO_PN}.Version=${GIT_VERSION}" ./cmd/... || die
-	popd > /dev/null || die
-}
-
-src_install() {
-	dobin bin/simplevirtctl
-	dosbin bin/simplevirtd
-
-	newinitd "${FILESDIR}/simplevirtd.initd" simplevirtd
-	newconfd "${FILESDIR}/simplevirtd.confd" simplevirtd
-
-	dodoc "src/${EGO_PN}/README.md"
-
-	keepdir /etc/simplevirt
-}
-
-src_test() {
-	pushd src/${EGO_PN} > /dev/null || die
-	GOPATH="${S}" go test -v ./pkg/... || die
-	popd > /dev/null || die
-}
-
-pkg_postinst() {
-	elog
-	elog "To use simplevirt, the simplevirtd daemon must be running as root."
-	elog "To automatically start the daemon at boot, add it to the default runlevel:"
-	elog "  rc-update add simplevirtd default"
-	elog
-	elog "systemd is not supported for now."
-	elog
-	elog "To use simplevirtctl as a non-root user, add yourself to the 'simplevirt' group:"
-	elog "  usermod -aG simplevirt youruser"
-	elog
-}
diff --git a/app-emulation/simplevirt/simplevirt-0.0_p20181012.ebuild b/app-emulation/simplevirt/simplevirt-0.0_p20181012.ebuild
new file mode 100644
index 000000000000..b888608e83fa
--- /dev/null
+++ b/app-emulation/simplevirt/simplevirt-0.0_p20181012.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=(
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/spf13/cobra v0.0.3"
+	"github.com/spf13/pflag v1.0.2"
+	"gopkg.in/check.v1 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec github.com/go-check/check"
+	"gopkg.in/yaml.v2 v2.2.1 github.com/go-yaml/yaml"
+)
+
+inherit linux-info golang-vcs-snapshot user
+
+EGO_PN="github.com/rafaelmartins/simplevirt"
+GIT_COMMIT="78d29d8fa11ce72af5f897430af7bb7d2947a32f"
+GIT_VERSION="0.0.26-78d2"
+ARCHIVE_URI="https://${EGO_PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Simple virtual machine manager for Linux (QEMU/KVM)"
+HOMEPAGE="https://github.com/rafaelmartins/simplevirt"
+SRC_URI="
+	${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="
+	virtual/logger
+	app-emulation/qemu"
+
+CONFIG_CHECK="~TUN ~BRIDGE"
+ERROR_TUN="CONFIG_TUN: Universal TUN/TAP driver required to setup bridge networking"
+ERROR_BRIDGE="CONFIG_BRIDGE: 802.1d Ethernet Bridging required to setup bridge networking"
+
+pkg_setup() {
+	enewgroup simplevirt
+
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	pushd src/${EGO_PN} > /dev/null || die
+	GOPATH="${S}" go install -v -ldflags "-X ${EGO_PN}.Version=${GIT_VERSION}" ./cmd/... || die
+	popd > /dev/null || die
+}
+
+src_install() {
+	dobin bin/simplevirtctl
+	dosbin bin/simplevirtd
+
+	newinitd "${FILESDIR}/simplevirtd.initd" simplevirtd
+	newconfd "${FILESDIR}/simplevirtd.confd" simplevirtd
+
+	dodoc "src/${EGO_PN}/README.md"
+
+	keepdir /etc/simplevirt
+}
+
+src_test() {
+	pushd src/${EGO_PN} > /dev/null || die
+	GOPATH="${S}" go test -v ./pkg/... || die
+	popd > /dev/null || die
+}
+
+pkg_postinst() {
+	elog
+	elog "To use simplevirt, the simplevirtd daemon must be running as root."
+	elog "To automatically start the daemon at boot, add it to the default runlevel:"
+	elog "  rc-update add simplevirtd default"
+	elog
+	elog "systemd is not supported for now."
+	elog
+	elog "To use simplevirtctl as a non-root user, add yourself to the 'simplevirt' group:"
+	elog "  usermod -aG simplevirt youruser"
+	elog
+}
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index aeaaf29aff63..51caa7ace54c 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,9 +1,9 @@
-DIST slirp4netns-0.3.1.tar.gz 180163 BLAKE2B 228331bea2aef527d4feb6f195a2a7db0aefa5a561b0425a7d48bab5fc0bed2231d535904223852284c6789a608f70d8c78923c06b89db6e583248744caf34fd SHA512 d482f6d22e9bb62ddca9d7f05d4aef7e2f365439a0d38d864f71c9dc4af3fbcda8ec259285ed54ebabc7e15fced26c844563944eaa1b2fe295273049e42d7686
 DIST slirp4netns-0.3.2.tar.gz 162136 BLAKE2B bc33c66ecc47e0b566eaa960e1651a0ad0b09010bc9ae3d1eb0692c7b2b67197a078b25df645bc11c50f1e805937b8e0aeeecf2fee6114937ca98eda49f61765 SHA512 b5146a9b165471037542af64618da8fb5f6824a9a4193867f4357b1b7f38082dea00e15930561eb9729fed406dae1bc2ca371035577d0f22cfb9004c13464496
-DIST slirp4netns-0.4.0_beta2.tar.gz 173593 BLAKE2B fd827f92db03eddea86bccf401ff67535343cf759353e3c221fe1d3de494e8cc0c83169ef5cda900e512aeb16cfb7e5ba6181729483fa48d8f3257d70035a41a SHA512 38b6a1fbaceece1fe151477b3bc7db624e79e2b7913f5cca9e826a5f4289e53cfa584cfb90a5a3520e3e342eb803ff8ae090ca9892ea1051fd79ce802328e578
-DIST slirp4netns-0.4.0_beta3.tar.gz 167294 BLAKE2B 349cab3199f2d228f0d9ed545d6bd8ddff25e80a57d69c16f5a4a5c8af88cae21c48d98891e844e03ab5c47feb829007c7d6ccfb37510fbe5aaa03d90b0ecea7 SHA512 83ce7eee14ebb9cea481fdde1951d89346a1b741e1232f1b032142b331226193b6869dd6febbca91f1fac1fec7afdcafedeef98f204059a1513c8ab972a411f9
-EBUILD slirp4netns-0.3.1.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
+DIST slirp4netns-0.3.3.tar.gz 162154 BLAKE2B b4a477ca94ee17e14ae0d255eb1f22713388d32cee1faff308e902a8134bc52e08cfa92537c19fbfc9869d936637c1196fee462d9699c1b5f97a0d0138dc4792 SHA512 9cccbfd30348d895c8c3f6a80ebe7991131c5a5f4907733ec65df5ce70b63427e5f666bf7c4dcb08e8dd50f1769aff0f6642c23c29eb6b9921a2d10f62d46f63
+DIST slirp4netns-0.4.0_beta4.tar.gz 168436 BLAKE2B 708a92bcdd8f0d1ce925a013d999b3a172391ffaa1dce2f414a440feb8933cdb2f5986badfbdb98c98705ef414d86a353f642e1d8964d3ca700a39527cbf6274 SHA512 2dfe5be6c6b298823e2ae4f72ea11afa8d16a5c6ab9a88522775949508a6f6edfe5eadb3681b7d1300f21a93ebfa1791f04e27066cefdaa988fc12f385ee6340
+DIST slirp4netns-0.4.1.tar.gz 168785 BLAKE2B 90e2510121177771fb77d5e48baa8a1acb95f9778e72add244b2df10d92c9cc6ef284bfbeef699bd8e58724b50254a4eb6fa485a58c7c8e6cca8469cf722e1f2 SHA512 bb2a0946f4e360eb08efb46e097d21ab1bf05d199d1e3d381e065617eb9ba15434bccb5d1e76ac27664f23c8da79349383095b4d28d2a1a8ddc0fb9675aebf34
 EBUILD slirp4netns-0.3.2.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
-EBUILD slirp4netns-0.4.0_beta2.ebuild 785 BLAKE2B af10a9e9dce9c2704471ac8f46d9b7972c4a3192954bf8b97b0b147db590a570973f1f52e05acae8f9facac15bc97e88a13a4f6663a305d042684c7e32ed23ea SHA512 1622a35e5e6baee1617fdf060336c3ef425faa605e0255471666c0227ebb320dcde9560058ebfd2a0dd1746ebb4f2661f0f6311fd0173912033ac20245ec05fc
-EBUILD slirp4netns-0.4.0_beta3.ebuild 785 BLAKE2B af10a9e9dce9c2704471ac8f46d9b7972c4a3192954bf8b97b0b147db590a570973f1f52e05acae8f9facac15bc97e88a13a4f6663a305d042684c7e32ed23ea SHA512 1622a35e5e6baee1617fdf060336c3ef425faa605e0255471666c0227ebb320dcde9560058ebfd2a0dd1746ebb4f2661f0f6311fd0173912033ac20245ec05fc
+EBUILD slirp4netns-0.3.3.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
+EBUILD slirp4netns-0.4.0_beta4.ebuild 785 BLAKE2B af10a9e9dce9c2704471ac8f46d9b7972c4a3192954bf8b97b0b147db590a570973f1f52e05acae8f9facac15bc97e88a13a4f6663a305d042684c7e32ed23ea SHA512 1622a35e5e6baee1617fdf060336c3ef425faa605e0255471666c0227ebb320dcde9560058ebfd2a0dd1746ebb4f2661f0f6311fd0173912033ac20245ec05fc
+EBUILD slirp4netns-0.4.1.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
 MISC metadata.xml 601 BLAKE2B eac6bf1b21371c913f648e944a1ba75314e772c1f0f5fdeda9d4c49cf279a15c19c9f6347ec1a3df236a6147c3d01f4084e161a81c2ee1e4db55cc9f8508d26f SHA512 d81b6889e71bf3fdc539f6c5ca057a8900f13009eafb711c4d83bb0cb349cf49f9253c0b8207a4c1f4c3b084bc9c9b0b91e75109843662fb72d25a2485cbf7dd
diff --git a/app-emulation/slirp4netns/slirp4netns-0.3.1.ebuild b/app-emulation/slirp4netns/slirp4netns-0.3.3.ebuild
index a87e63fe9495..a87e63fe9495 100644
--- a/app-emulation/slirp4netns/slirp4netns-0.3.1.ebuild
+++ b/app-emulation/slirp4netns/slirp4netns-0.3.3.ebuild
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta3.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta3.ebuild
deleted file mode 100644
index 87e485ef0571..000000000000
--- a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_PV=${PV/_/-}
-MY_PV=${MY_PV/beta/beta.}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/glib:2=
-	dev-libs/libpcre:="
-DEPEND="${RDEPEND}"
-RESTRICT="test"
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta2.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta4.ebuild
index 87e485ef0571..87e485ef0571 100644
--- a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta2.ebuild
+++ b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta4.ebuild
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.1.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.1.ebuild
new file mode 100644
index 000000000000..a87e63fe9495
--- /dev/null
+++ b/app-emulation/slirp4netns/slirp4netns-0.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="User-mode networking for unprivileged network namespaces"
+HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
+SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/glib:2=
+	dev-libs/libpcre:="
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You need to have the tun kernel module loaded in order to have"
+		elog "slirp4netns working"
+	fi
+}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 373be46817fd..b1eadcab5987 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,11 +1,9 @@
 DIST VBoxGuestAdditions_5.2.26.iso 58433536 BLAKE2B 1d7bae647923a57cdcee38a1609a07cd081d593a0852dcf67b549ed178508e93f7ee4d076ac700ab7e7ec828e660eb09cc8a55a0f2400b1ff0912cc2fafdff7f SHA512 fea91c442d3f05a35435155d3a3890e2c29e2523f1106cc8c7fb6513826263ff450e72b393796e0dff99b3bd85d85d8d55309e81f68ddfd39689df8f54bca1fe
-DIST VBoxGuestAdditions_5.2.30.iso 58578944 BLAKE2B 6a2565fa8e3b19363da82592ba4d93ddfb6d22e107e28e901aa4c0bce84aaa0bd63d781155e44462b90d9f491e4df589cfd346dd33fe8f016862e85d99c2092c SHA512 568312b26647f7932d94a42279f35b9a827145ef2bd0ea4ef00a865c355b1de55dee66e731a90d644ddd35cb301f61315edf684c9a321681882c1537c8159caa
 DIST VBoxGuestAdditions_5.2.32.iso 49620992 BLAKE2B 04853f4b9a95898263ca7238a78b5d8751882a21874e4745d675642185542eb617f2a74b3e55b4444067822511d33b6d358e37e179d1b1c6464d701a8ab45a54 SHA512 86f1d7071a9033b7826dcacbcf23822acc772d909af8a8a12345bd5fe68375677b522d0e1987f2908412d5a29369d0a1221fd099f8b692c8d25fe9cbe40fd11e
 DIST VBoxGuestAdditions_6.0.10.iso 77162496 BLAKE2B 71c95b89055a1eeaa38f650c2572d1fbabf4425d13e5473ae4a56a488125781a33e079c6390bcc5b2499b796221ef89e7373c641b8a75bbf31ffeede4f8f0ffc SHA512 d1d1602688ebdad4975b7b800012f6195774cfa29d00900fa49ded88f6cdfe4c1abdfd25ca55b08e2fc97a7f2f204511424dd561aebd68d4ee8222b9b0f0b8ff
-DIST VBoxGuestAdditions_6.0.8.iso 86562816 BLAKE2B dddac0dff687982040543bff065719a6b900666886892247d6ca2e6968d601dfd7c01b0b4c79db28ca81f25ed15906ec65c3e77ac4128eeaaf9a8d6d16632336 SHA512 95396a04e436cf2b30f6897f4ee561acaaf3fd3b677bc2f2d58dc92649245f7b105bbf0ec1b8f5612f5465e2c46d8b55786863508192d0a68aa381ddc44a315c
+DIST VBoxGuestAdditions_6.0.12.iso 77195264 BLAKE2B bc7956a8eaf4a3ddc92b20c52696e298af63980bc607f8caea51ac00b826f62a3214a30a232070c3ded7a2db9d81114a81de2f6d9b04bdec1ea5cfb26808287e SHA512 83c9703588f14b6a24d878cb929fc09dddd94510f8a63092ff91864275abf8dd47f10e8bd300128305e1ed2e8504c76260b72e5d534c6d45de1e0d64d038ec58
 EBUILD virtualbox-additions-5.2.26.ebuild 710 BLAKE2B 300f594457535bad16e10b7242da27091ff0e8fe20e3db76b73f4b6a47e525f4a39f972c2ab80b0ddf6a1908d2e84996368d12e73e8feb3c7a16cee2e325f447 SHA512 ee73c7a249ae300709068273d0fbde262883334d079fe618d3fc8715112c3c52b8b07cde5229f8fe8312cc7611088ba0742fc4233a25fd75683e58dbe1376cb6
-EBUILD virtualbox-additions-5.2.30.ebuild 712 BLAKE2B b5aec1c104906135655ac4a467d65620e52bc081143a40846649c693942624c944efcfc56e05dedc846070aa84032ac2dbcc2c9d7a28c33d96037d954d0728cc SHA512 42d1e17e8170e48bf493efebcbb7b9b0c0441c102af20b25b9f27c0823029d0b98f521dc47844825302f1d17c822104c83598619920cc063df6d83a4e8e87422
 EBUILD virtualbox-additions-5.2.32.ebuild 712 BLAKE2B b5aec1c104906135655ac4a467d65620e52bc081143a40846649c693942624c944efcfc56e05dedc846070aa84032ac2dbcc2c9d7a28c33d96037d954d0728cc SHA512 42d1e17e8170e48bf493efebcbb7b9b0c0441c102af20b25b9f27c0823029d0b98f521dc47844825302f1d17c822104c83598619920cc063df6d83a4e8e87422
 EBUILD virtualbox-additions-6.0.10.ebuild 768 BLAKE2B 892da0a6f97f633f7df332d486850cdb20e4177680c3bd7650c4d78a5ae393dffe0dd3eebbe5a50851d89e72a73930ea61681e6b51db0b2855521a149d3a3164 SHA512 21b86b35c8c5cf002801321258bba06c9880e3f7271acc9fdeee795b00d2627453a861494dd20018f87adc0fcf238f62a0c6698dd62ca6be3c853e6080429e57
-EBUILD virtualbox-additions-6.0.8.ebuild 768 BLAKE2B 892da0a6f97f633f7df332d486850cdb20e4177680c3bd7650c4d78a5ae393dffe0dd3eebbe5a50851d89e72a73930ea61681e6b51db0b2855521a149d3a3164 SHA512 21b86b35c8c5cf002801321258bba06c9880e3f7271acc9fdeee795b00d2627453a861494dd20018f87adc0fcf238f62a0c6698dd62ca6be3c853e6080429e57
+EBUILD virtualbox-additions-6.0.12.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.30.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.30.ebuild
deleted file mode 100644
index 6faf7e7e8a0d..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.30.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.8.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.12.ebuild
index 5124a818a150..5124a818a150 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.8.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.12.ebuild
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 879d2c8d22d8..72ca2220458a 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -5,26 +5,21 @@ AUX virtualbox-bin-3-wrapper 2931 BLAKE2B bb8a72f749996b945d42a3d94ab895ee5b234b
 AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a289ff56cd0d7638a0a3d47891e670e070be9f3bcc30d730982237fc9211d1a9bbdbf8429c7ca80d25fbcc1 SHA512 8086ef107aff0aa3e17f5fcb8ee5de4dd8a24cb119c3523e3e3a302819eb4258328adead1b6f40b96706539f4e1c43dbd5c055a16a304ac29f7f302ebf2e4c4c
 AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.tar.gz 19684009 BLAKE2B 81787dcf3b70211fa9c84a40c668100eda0dfd2ce3e1d35c226cb6913ef74027f3444be93069a5e881d8e60905477460a180cb98919050286978edf9c1edcdf3 SHA512 deb4c62d58e2071f4413f0ff769e9ecd756362920b29482a6a3d77566c327b075cb5ecafdc65985305b8b798dc56ca2104a0f8244651fca89c4e15ef879c121e
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.30-130521.tar.gz 26914147 BLAKE2B f595f32a76649a803be490a9a6d46702e82cc835274973f0867f957d944724252b59e9844167b0038b9ba2b91854443f6eeaf084278534f4ab4249444fb8755a SHA512 f08fde658c7c1e916ce2c0ccebe9b05e7963168bbf945156c96f75acbd06ef1dca2088371fc3a6f75c84232bee9ebbed3b6bf92dbd0702cb5ff496cdc11227c5
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.tar.gz 26917593 BLAKE2B e52c746299d32ae908892791d8fb9b4dda264875e66bf0459adfbc64381001e9be1800a8ac93bbea14dceb47a0e81cf79c29a4c0796f7c4a30021e4beb036cfa SHA512 382ed45a90981397da7d46925a73c5aa0cc870fe41992c87ccd3d3a33420b199e4a0a19761a6c6ebeacf93450e2937d81befb6fdaf7fb7961827e23f0f24c645
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.10-132072.tar.gz 23160596 BLAKE2B 5cd7d1490305236f99b759520b4c63afd207cab53e861aaca0b0c318fe96f991756db60652bf65b26b5b9690366b6a5df13c225b44df75a30c1cc04badc7dbb2 SHA512 2c99b9917c65b4287bd1b78e9b9312630850307becea526188f97de569f541fab6bfbc4d5cff2ea9aab784dc4bbb23ada3679f76116ba94169f9c73566cc6c09
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.8-130520.tar.gz 23309069 BLAKE2B bbb060e0e13e336ee445234d7a61ded3896a0948a6a24f3d4b1792da4a9003cfb5717b7f608ffd9c74b4bfe2b24ed918fa2e87cf90ec3aaa3a7b31a7ef33dee5 SHA512 f942c08dd905163cadf79897a0ad8e8a280c96a555bfb9b5d2fc50c25872e8fe69c2f30326bd6a074ed73ea2d6f99b02e143870c05c68c663ed32aee62abba1a
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.tar.gz 23160551 BLAKE2B 6174296d97f9e32a79f29e119804b15d288100017ea9da20235325f095e1d10a7ea5acf478d914b4a2e874da7640520691ad9a881228855b047f5c0c529ad120 SHA512 f7d4785ce8e53836cb4b87920765967cb3148ba09ee5921ab67fc4547d8a90923bfbb8a432d67ec6b878775fd67f1dbd826dcf993b57481f71d2f8a71ce13bfd
 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-5.2.30-130521-Linux_amd64.run 89855442 BLAKE2B ef1b8e2c83a8cc6404ccdc8cb446dfbe7ea827f88e857947779c916745f5058db33ef075c531914e4974d8abc00b4099fb531e0965a7116971d9a0560eb17a1f SHA512 36b5ee0e1815bebd5a75947004206c43c5f84341b7a967b33d37cf4b35fb6261594788859b636a918edaece4af9d08b1892db7c17e0a30a83bf9e69cd175b123
-DIST VirtualBox-5.2.30-130521-Linux_x86.run 88923599 BLAKE2B e8e5abf4b839c4edd4833c766824255675554cad2050f007d6459f28edc3f70bfd6346bbc893070630efdaf106a2e236974fe7fe09dc918e69dc1c9858edc369 SHA512 d6cddcab262422ee08ebbb796a4c2615dabad3ffde4fa5774a58a087cb14b2b813736053639dd132129a412fd68200d7666bdc110ce44d3ada864b9e7ebadaf5
 DIST VirtualBox-5.2.32-132073-Linux_amd64.run 83854803 BLAKE2B 3522df31f4f98efcd40adcaaf8ac458078adf0bbfed96c7d309d4726ddb8b8dd78eef830b3cfcb2f1fa6329bcc30ea2449f5c88cab66fa0c7d20818d7b5aa07a SHA512 aea9b27793f3363eba2ed627cc3b35ca51445946e6e9f20382fb3034afbb7470d27fdc476066c04acc595690a9e34109e8b8ce6dcab10fdc990b241b24ec47fb
 DIST VirtualBox-5.2.32-132073-Linux_x86.run 82943439 BLAKE2B 31a22e8b52a53d6948a5af533b5c8f374d703c44736678c0bbe6fd9b5298bed4817996c32902a69c2c59dbf751cea04f22beb7203deaeadf79d2424e123e9d37 SHA512 05f99b673224c2b3d94b0d568067ae5ee74200c88a3b7f6665988a9d0c35f69f81c07292b838d07c07fd6d5484979615fd255650b138387501a593f3833b9071
 DIST VirtualBox-6.0.10-132072-Linux_amd64.run 127108569 BLAKE2B f2313b8e797f1292975d6d0f214985b16541b4b05cd0efa3f9b417a02b85ad7affa8c1d4929f161f90548242541628000c3ef39acece29a376f11aaf4d3536e9 SHA512 026c9b5d5f24714293cafb522840c2c84b86ebaa903f7e402472a916bd549cf3b279ef6de02ff0c9c7cb6df74ea402568df64ed224c0173d445d80f04a2d93d1
-DIST VirtualBox-6.0.8-130520-Linux_amd64.run 133672408 BLAKE2B 62c8d51502c4b3a15ba2a79356227c9e932c87480b31f3f70a5c89881f757a2725f4c1800ac312866f0e1e2e2970f6288d4970b52428ce94e390dfc68872ea7c SHA512 ea9061f420c2fce424c98903c8f7845cbb60eab83722de2f7ccd5723df81365b8e8b6fe80d183b4b38a30c13432fa4c567ea05e799ee176111130c3060bc25b7
+DIST VirtualBox-6.0.12-133076-Linux_amd64.run 127118808 BLAKE2B b654fce2e9134390c7cf27e30e2c2e15e5d3bfd40df85627b266f250c112b0f4f60062d3f50dbb0e5bc0ac7f4b819694cdb65d2148b4b015b8e0c5c71c13e4ec SHA512 cce0e95de6e7ecb879807ec47cff0f4423c471132fc157e4c1656824ab5c914684db53bf73c77f9a98e72f654a7af13b21ad2954ef8f5a961b39ab9bb7c04990
 DIST VirtualBoxSDK-5.2.26-128414.zip 10159276 BLAKE2B 32a9e0a70cc63c8e0daa7080f8e10ac8a514837be98a66b00161cd0c9bf2cc42ef0a11f3a69a742a2f6745b4c8b8fe9e946e18f81cd5ef3ab2f68d5e3c95c568 SHA512 f3d1cc622734ecb0f56fcdf5728fcc747e3b084cb2358d420c55c1acd98d2f24870f0fd18cea430f118f34bca10199526ba195a314d6ce7fb6c4bc8281d89f09
-DIST VirtualBoxSDK-5.2.30-130521.zip 10153996 BLAKE2B d0c24220f3d9d10528e10dd65a884d7431bb54b3fe186500685f7ee228b74aae2ed81650e695f7a47d7b8769fc94d7c8d8dfda443fe3ee0f11fc4773f1b34a2c SHA512 6305c7884ede60090726d9f9e6628a20030537d121892d2005e13abce5233df85fcfc465faee199fd38901431e1d9f86c9985698ddd6b0594f80842f34b8b8b3
 DIST VirtualBoxSDK-5.2.32-132073.zip 10200195 BLAKE2B 0de34e166b94889c605014233142887e7a8857d1915866156a0cc63850937730ec063e63b550f0d39ad241259158f033b028dbab7eec3f6f38c3715139413b3a SHA512 ccbe2af819bff46055bd6f079a03d69e721a09286e83d4f650583bc7692f5d19ae1a725cf3a6eb1b75167a2c73ff2e020d1f932bf9cfeee9ee709d1174c4cabf
 DIST VirtualBoxSDK-6.0.10-132072.zip 10801181 BLAKE2B 9ad30a0db9e0e87594277c10d869f915a1981c8a7fef294c34bbc904714141bc69e9ad80b79fa61b418ab537f65ccb574f72b6a2985110b51c54d8bfeac9f42a SHA512 b1cf9d3d289a3ba765e3ef9af2491b9f785e241c2c1ff9606009d3983c8fa8660a80dbd37404c773aa57b76a06fd2d1136644565643a58d1d4e1700a7cc329fd
-DIST VirtualBoxSDK-6.0.8-130520.zip 10758177 BLAKE2B 6d4f8fc33cb57ff5055775cc0e9f676eede2cc07d62c73ee66813e9aae71ce6a73c2c81699234d5b5eab8244d9f15374a0485cfed1bedec429088e2d82bfd91a SHA512 2a94359904869b228337eb754bf545d32981bdc16ecc33544f30a6ce67d3ee1cec2d0c5bd02ed510ecfc7779871a53dc391a39a37a29fd725a403fd68789a081
+DIST VirtualBoxSDK-6.0.12-133076.zip 10799655 BLAKE2B 93fc5093454a21bf5da26d00f35ab107410cddfed63c9af8494cd194cdc080a70ec8cc8af57233be0472b84a25709a3719f51d399585c1b474ddb4d40e6488ab SHA512 f270a6c404f1bf49ca6bbbc8c4fdba70e6c65001e9731a689f391e6d4c18866ceb14c94a241c15a4e5dd01e08f2c5c61f0fe7feb43ffe36acc9868a72a75603c
 EBUILD virtualbox-bin-5.2.26.128414.ebuild 8327 BLAKE2B dbc945c46ee55ef5c11ea3a7c169632ecae5d039fd7e5961255c2006c6f827860e59bf877fd4845e0543006e57c7fee12c28848dbeddc98741d0ce6fa57a5974 SHA512 248b591075c526b2c246dfb32cb9a00166a9243391cd6caf9d9b776835e1d201e1227c2d435f403ec2f357c54fe1246b68282ec1abe7796e428c1e505e75d5d6
-EBUILD virtualbox-bin-5.2.30.130521.ebuild 8329 BLAKE2B 73fca46eb9e117a760c3de9bfe0fc4f58f1a2dbf27c4cab46f9d2db1f2d0114b580f8f5537ffeb7c570c0dfa15d25098236543f17cb8f0b0698de7f7d8a1e40c SHA512 bfcd05d67c9573dff6c7b90287938bfb69c11020e236e8bda0de32c37b571833b57e9f6d8e44cfac2ec792b54526544f3bd208124927efa12212932faadcf538
 EBUILD virtualbox-bin-5.2.32.132073.ebuild 8329 BLAKE2B 73fca46eb9e117a760c3de9bfe0fc4f58f1a2dbf27c4cab46f9d2db1f2d0114b580f8f5537ffeb7c570c0dfa15d25098236543f17cb8f0b0698de7f7d8a1e40c SHA512 bfcd05d67c9573dff6c7b90287938bfb69c11020e236e8bda0de32c37b571833b57e9f6d8e44cfac2ec792b54526544f3bd208124927efa12212932faadcf538
 EBUILD virtualbox-bin-6.0.10.132072.ebuild 8490 BLAKE2B 0acedaa47d39ac39c6739053a20343d18f6d53294177039cb54de95f0eb5d2d58a8557b852713a3e3e9c6e3b8549cd70f6c307684e569716c8e3a68b7f5f021b SHA512 a8cd2174ae64b1dc0977dbcd388c26989779546fde33d1c5e89e4d22d026154a4f5cdeeb134c67c81c161b0114a9f4648d78be1862ff5dd44d6fda205db3f822
-EBUILD virtualbox-bin-6.0.8.130520.ebuild 8490 BLAKE2B 0acedaa47d39ac39c6739053a20343d18f6d53294177039cb54de95f0eb5d2d58a8557b852713a3e3e9c6e3b8549cd70f6c307684e569716c8e3a68b7f5f021b SHA512 a8cd2174ae64b1dc0977dbcd388c26989779546fde33d1c5e89e4d22d026154a4f5cdeeb134c67c81c161b0114a9f4648d78be1862ff5dd44d6fda205db3f822
+EBUILD virtualbox-bin-6.0.12.133076.ebuild 8490 BLAKE2B 0acedaa47d39ac39c6739053a20343d18f6d53294177039cb54de95f0eb5d2d58a8557b852713a3e3e9c6e3b8549cd70f6c307684e569716c8e3a68b7f5f021b SHA512 a8cd2174ae64b1dc0977dbcd388c26989779546fde33d1c5e89e4d22d026154a4f5cdeeb134c67c81c161b0114a9f4648d78be1862ff5dd44d6fda205db3f822
 MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.30.130521.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.30.130521.ebuild
deleted file mode 100644
index e4f534871c4c..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.30.130521.ebuild
+++ /dev/null
@@ -1,287 +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 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.8.130520.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild
index 0d68ba80c9dc..0d68ba80c9dc 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.8.130520.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index cdea8574cecf..7b494ce047b7 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,11 +1,9 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.tar.gz 19684009 BLAKE2B 81787dcf3b70211fa9c84a40c668100eda0dfd2ce3e1d35c226cb6913ef74027f3444be93069a5e881d8e60905477460a180cb98919050286978edf9c1edcdf3 SHA512 deb4c62d58e2071f4413f0ff769e9ecd756362920b29482a6a3d77566c327b075cb5ecafdc65985305b8b798dc56ca2104a0f8244651fca89c4e15ef879c121e
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.30-130521.tar.gz 26914147 BLAKE2B f595f32a76649a803be490a9a6d46702e82cc835274973f0867f957d944724252b59e9844167b0038b9ba2b91854443f6eeaf084278534f4ab4249444fb8755a SHA512 f08fde658c7c1e916ce2c0ccebe9b05e7963168bbf945156c96f75acbd06ef1dca2088371fc3a6f75c84232bee9ebbed3b6bf92dbd0702cb5ff496cdc11227c5
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.tar.gz 26917593 BLAKE2B e52c746299d32ae908892791d8fb9b4dda264875e66bf0459adfbc64381001e9be1800a8ac93bbea14dceb47a0e81cf79c29a4c0796f7c4a30021e4beb036cfa SHA512 382ed45a90981397da7d46925a73c5aa0cc870fe41992c87ccd3d3a33420b199e4a0a19761a6c6ebeacf93450e2937d81befb6fdaf7fb7961827e23f0f24c645
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.10-132072.tar.gz 23160596 BLAKE2B 5cd7d1490305236f99b759520b4c63afd207cab53e861aaca0b0c318fe96f991756db60652bf65b26b5b9690366b6a5df13c225b44df75a30c1cc04badc7dbb2 SHA512 2c99b9917c65b4287bd1b78e9b9312630850307becea526188f97de569f541fab6bfbc4d5cff2ea9aab784dc4bbb23ada3679f76116ba94169f9c73566cc6c09
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.8-130520.tar.gz 23309069 BLAKE2B bbb060e0e13e336ee445234d7a61ded3896a0948a6a24f3d4b1792da4a9003cfb5717b7f608ffd9c74b4bfe2b24ed918fa2e87cf90ec3aaa3a7b31a7ef33dee5 SHA512 f942c08dd905163cadf79897a0ad8e8a280c96a555bfb9b5d2fc50c25872e8fe69c2f30326bd6a074ed73ea2d6f99b02e143870c05c68c663ed32aee62abba1a
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.tar.gz 23160551 BLAKE2B 6174296d97f9e32a79f29e119804b15d288100017ea9da20235325f095e1d10a7ea5acf478d914b4a2e874da7640520691ad9a881228855b047f5c0c529ad120 SHA512 f7d4785ce8e53836cb4b87920765967cb3148ba09ee5921ab67fc4547d8a90923bfbb8a432d67ec6b878775fd67f1dbd826dcf993b57481f71d2f8a71ce13bfd
 EBUILD virtualbox-extpack-oracle-5.2.26.128414.ebuild 1005 BLAKE2B 09ef58c0138c11e9fd2d4eb9e9ac44cec2401ddec19561e4552992cce71cb2caae461bb41460701391a61b07936d68d7c169ceb00fbde834ece475a14b556423 SHA512 3ae5144ff4cce24390628935595b2369892700fbed750a1844e40ea9f9ac904c517f9b29947e03b1acdf67e7cde75b94cb2b846de19f9e2d0136bbe319a3a3f3
-EBUILD virtualbox-extpack-oracle-5.2.30.130521.ebuild 1007 BLAKE2B 6b77c2fb22452f5ba431afdc6a13653eda458b71c94e464bb868cdd77017ca75f69b0eacd4cee788a731ebf5593a091cb9c8b3aa5c466beed5142cbf6fdcf8b7 SHA512 2759daac5078c490ace6d25070f72dd0bfc672146980631e207d5886ab80da24c67eb6972f6b314c473c3c635f2d2e2e2aea15564b4ea1e90a51defa1524571b
 EBUILD virtualbox-extpack-oracle-5.2.32.132073.ebuild 1007 BLAKE2B 6b77c2fb22452f5ba431afdc6a13653eda458b71c94e464bb868cdd77017ca75f69b0eacd4cee788a731ebf5593a091cb9c8b3aa5c466beed5142cbf6fdcf8b7 SHA512 2759daac5078c490ace6d25070f72dd0bfc672146980631e207d5886ab80da24c67eb6972f6b314c473c3c635f2d2e2e2aea15564b4ea1e90a51defa1524571b
 EBUILD virtualbox-extpack-oracle-6.0.10.132072.ebuild 1065 BLAKE2B 83a4e3f497988899b19922a2b89c3bb056f04f4e739ca685e76e15f3e9b19a6e69b7124d65d522b13b3f992e9b66bd54f52b1db358b578030cad822512a61ed7 SHA512 110a0179f35ab854400d8c08a8ec361ca0c92e275865c76342d41475cd9bfa798ae57a8b750df9aea4de91ac0b2851a8daba3c1d1700559694197110d33ad989
-EBUILD virtualbox-extpack-oracle-6.0.8.130520.ebuild 1065 BLAKE2B 83a4e3f497988899b19922a2b89c3bb056f04f4e739ca685e76e15f3e9b19a6e69b7124d65d522b13b3f992e9b66bd54f52b1db358b578030cad822512a61ed7 SHA512 110a0179f35ab854400d8c08a8ec361ca0c92e275865c76342d41475cd9bfa798ae57a8b750df9aea4de91ac0b2851a8daba3c1d1700559694197110d33ad989
+EBUILD virtualbox-extpack-oracle-6.0.12.133076.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.30.130521.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.30.130521.ebuild
deleted file mode 100644
index e598ba638113..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.30.130521.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.8.130520.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.12.133076.ebuild
index a260ead1a63b..a260ead1a63b 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.8.130520.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.12.133076.ebuild
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 62a8f237858c..8d836dd3ac3d 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -6,15 +6,13 @@ AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
 DIST VirtualBox-5.2.26.tar.bz2 118371765 BLAKE2B 32413b72e33f2f63835a2eb2d47dc75a7b63121934bdffd51ff58e9d63d68b77b4f8dac4605916ba8bd6896240d00024ccc3d7d002d4f6f92d6d9b1dc35995e3 SHA512 aee334c74bd02772ac5e0528d84d31661f61c775d0993c00febe125810efc78a2f779db41bf66283be51b19a35540fee14445bada59a8d3b7affa6ef6645005f
-DIST VirtualBox-5.2.30.tar.bz2 118462289 BLAKE2B 87126b5af657815d0fcc8aadf49a23ce613ea0998b70f988f78e9d381138c414c7c73a0bf91955481cf484f5b71081ff1bab8dabe1b41fffde877e1003477625 SHA512 6230846ceda47b8ffe942aa8427f04f193095103371b7210d30e49cd9e384b9828d6917f75ef125e63e2c1810e8aa3b7c17b72f3ede7697c55d6de9da9d3f668
 DIST VirtualBox-5.2.32.tar.bz2 118262502 BLAKE2B f42de23ddbef1bb5472f6730b711452049331cf06c80420205844ea4a46ddb3352e0fd91564d94d018cb03921e7f894b30c79ddb684ad498d3f86dee88bf8994 SHA512 4e98d5df5e9e6445dde268d5eacea82e655ce9b96cd6579a9d470a08a0c066b7cd7e212b276e2671e936b4a73a53ecf9daa666cb3a8b9d7dc353c70c9283505e
 DIST VirtualBox-6.0.10.tar.bz2 154284088 BLAKE2B 6aeb2384a777bb39e7c2692c1e262914296650f1448e8db45a03b864a824d3e8b337208087fa7f4469b1ee15e39c8cdae3707f742eb229872e8cb681d118880c SHA512 96fa3c672790239163829b3c40ac0d75d717b29a7b947ec48709eb7811c5800e314a0fc90d87810e4a03da40b3a65914605f648b287314386b371489e5d974c9
-DIST VirtualBox-6.0.8.tar.bz2 155404889 BLAKE2B 3eb6ebf713c32e301db1673b22c367a89ce1ffb25d12baab6c7335389ce17e08efd744139acc4114231c4d4b69c6370b6e5d5b18ce97fe5494ca7a192fa43f7d SHA512 df18d5df2c82761b8a77e509b2873cdeaa46d11bc50ca166af1e6c30d3042b0cf5640957b1d411333f5bd5be3f03f382550f1afaecf0651d847bc88c95863d83
+DIST VirtualBox-6.0.12.tar.bz2 154250538 BLAKE2B 1c0da29a1d4f4a9ce57280593b219d1fe507fa31dd419d5ef7e62fa8b76bc8b7b21a414edec79ce03b7b4471176e322cb5a0a592a7f61c1f6096c59ca16072ce SHA512 a2182750c6b7e2f7fe8548a923829c05167b739ad84ed025e6cfd85ce787aaa43d41c72c5a93f17e6b976561bae0aa538d81830c52c1d326b75f5a32ba3d441c
 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.26.ebuild 6118 BLAKE2B 20f06b42279f7ab9bb60d2bdb26c7bede86ac1c64ed91ad42bb5ac0e9d484aa0da7901c34e9d663c64e4c4672802e9104eeb5009fead6b41c66b7ed6e2026d49 SHA512 341d5319d2f593ead1f258b480f19c9a1c5a85c8068134c24546828ec3b56ed825672593ede34d62286b048e5d1d19dd3d6923fc6e0fd9fabc03ddd1bc5f701a
-EBUILD virtualbox-guest-additions-5.2.30.ebuild 6120 BLAKE2B a51f969b41ac40a359d649b2793478e2366449ddb3ca78386c6a88ad1729cae20266773b88f90763ec66cdf06fbf0add5f33e0b2eb6ac97d616fa1a47519d7b2 SHA512 09394ee4fdb0c1c651d58f4d9cabbcc340d61af0a3c393df31acf9e252494b73ba179869d19326ae436aec52258e6d2c195d23ffb757a528b556c084d863ac12
-EBUILD virtualbox-guest-additions-5.2.32.ebuild 6120 BLAKE2B a51f969b41ac40a359d649b2793478e2366449ddb3ca78386c6a88ad1729cae20266773b88f90763ec66cdf06fbf0add5f33e0b2eb6ac97d616fa1a47519d7b2 SHA512 09394ee4fdb0c1c651d58f4d9cabbcc340d61af0a3c393df31acf9e252494b73ba179869d19326ae436aec52258e6d2c195d23ffb757a528b556c084d863ac12
-EBUILD virtualbox-guest-additions-6.0.10.ebuild 6005 BLAKE2B abe32d5d102f191ae10da3101c2ee53e006a78ff4dacb7f2aad28256c6c5732b753422df88998817710d039f0b824b2c8f9a65fbcd094b6e0b8e3a7a81822eca SHA512 9a82cf85ba34f1eb48e4b0bbfe61e5cf73b3daf34240cc7fca9c115675c64c90ec78ae0769a6de8d6345c491cb60afb342fe853cfc03aa778c5cff6506141826
-EBUILD virtualbox-guest-additions-6.0.8.ebuild 6005 BLAKE2B abe32d5d102f191ae10da3101c2ee53e006a78ff4dacb7f2aad28256c6c5732b753422df88998817710d039f0b824b2c8f9a65fbcd094b6e0b8e3a7a81822eca SHA512 9a82cf85ba34f1eb48e4b0bbfe61e5cf73b3daf34240cc7fca9c115675c64c90ec78ae0769a6de8d6345c491cb60afb342fe853cfc03aa778c5cff6506141826
+EBUILD virtualbox-guest-additions-5.2.26.ebuild 6114 BLAKE2B 894f6fc0a4f021a905b51c1d56f7bf06f692a84af7c5f37b6fe3dd138c30c7e005d78998610a4503e7032757f51dc002dd89d57be731cbad5733ecbd139e6b8c SHA512 e042d7159a77f10c8f671d77b30a83a27f61d96cb1d822218da5084e4932ae6c1df4d758c6b0bab0d7ed29be3f8c4cf92a8dd188fb8c54c53c35e1b13698ead5
+EBUILD virtualbox-guest-additions-5.2.32.ebuild 6116 BLAKE2B 780773a587e0c4f1fb08ba53a252c6484718367d308e984766494d7244503db249604e174e045954b137df7a78918fb32a96366017aa8303883a91839fd43494 SHA512 31aa66e99e4e1ebb517b26a4f9434ceba55fb7a214a331fb7d0b3fe51f435d083453cf1810f1285bde945252187f20089b8000ebe2e3bd6def44458bd4b23219
+EBUILD virtualbox-guest-additions-6.0.10.ebuild 6001 BLAKE2B 20cd1ce48e0c9fab06c8f486b23f9b5ac73b4881dad607e4a9c91c9275e375e656749008368f32d9d9db5066f7efe6422511897bc46217b9b3ad686482c80c73 SHA512 d8b9772b0ac02cb6fb2d7944cfa206869693b74d0406fb29d8a0b782b15bb98d33c4eedbe824ff58c6f13e61c119403fd9cb545184677ae11c55a3dbe10d5bfc
+EBUILD virtualbox-guest-additions-6.0.12.ebuild 6001 BLAKE2B 20cd1ce48e0c9fab06c8f486b23f9b5ac73b4881dad607e4a9c91c9275e375e656749008368f32d9d9db5066f7efe6422511897bc46217b9b3ad686482c80c73 SHA512 d8b9772b0ac02cb6fb2d7944cfa206869693b74d0406fb29d8a0b782b15bb98d33c4eedbe824ff58c6f13e61c119403fd9cb545184677ae11c55a3dbe10d5bfc
 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
index 90e1cfab7ac5..e3a38e9dd881 100644
--- 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
@@ -167,10 +167,10 @@ src_install() {
 	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" \
+		>> "${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" \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
 		|| die
 
 	# VBoxClient autostart file
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.30.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.30.ebuild
deleted file mode 100644
index a16a06c6b19a..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.30.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# 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() {
-	export DISTCC_DISABLE=1 #674256
-	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-5.2.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.32.ebuild
index a16a06c6b19a..280f40811cd6 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.32.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.32.ebuild
@@ -167,10 +167,10 @@ src_install() {
 	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" \
+		>> "${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" \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
 		|| die
 
 	# VBoxClient autostart file
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.10.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.10.ebuild
index 8162053ffd78..efbf2bd2fdf9 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.10.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.10.ebuild
@@ -157,10 +157,10 @@ src_install() {
 	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" \
+		>> "${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" \
+		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
 		|| die
 
 	# VBoxClient autostart file
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.12.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.12.ebuild
new file mode 100644
index 000000000000..efbf2bd2fdf9
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.12.ebuild
@@ -0,0 +1,219 @@
+# 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}"
+VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
+
+pkg_setup() {
+	export DISTCC_DISABLE=1 #674256
+	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
+		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Provide kernel sources
+	pushd src/VBox/Additions &>/dev/null || die
+	ebegin "Extracting guest kernel module sources"
+	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die
+	eend
+	popd &>/dev/null || die
+
+	# PaX fixes (see bug #298988)
+	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
+	eapply "${FILESDIR}"/vboxguest-6.0.6-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
+
+	# 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-guest-additions/virtualbox-guest-additions-6.0.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.8.ebuild
deleted file mode 100644
index 8162053ffd78..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.8.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# 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}"
-VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
-
-pkg_setup() {
-	export DISTCC_DISABLE=1 #674256
-	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
-		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Provide kernel sources
-	pushd src/VBox/Additions &>/dev/null || die
-	ebegin "Extracting guest kernel module sources"
-	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die
-	eend
-	popd &>/dev/null || die
-
-	# PaX fixes (see bug #298988)
-	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-6.0.6-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
-
-	# 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 ef1e7e2a8e06..162525152627 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -2,13 +2,11 @@ AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1de
 AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8cea08a6dbe78f75dd89aa072ac2ac0d745e598e8195ef321eaee53d31bedf52013d94efc046863e65c9fac0d61a507b292b04c7fb9 SHA512 600fd557992efb1fb5db9db64914becd5a86f81a42d70bbc3823533df941881f2289a6ccf630adb8346419499dd48b84ed43c21d0aba183a780daa99fcafddbd
 AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1f0dc755a9162f7c2efed32d8f9c98fcc1e36d48067471085d5b038c6e8b3118508fbaaaab3790f7 SHA512 63eba0963b3344ea7e7a0035560406899d878a0761cddef9853bec95deb9812b221e98f446f240070d6448d61d6ecbcf7a990bcd52863660e8f21cf9a98c0e1d
 DIST vbox-kernel-module-src-5.2.26.tar.xz 642096 BLAKE2B fa908b8dda4c49e880005f22d4ec159ba4e84b20d3cf8f514ec5ad0ea556499b0df25fb714bb5f9a3474e6fc1cba67f6d56fddaee748b9561bbe31a003dd0657 SHA512 7f37be1b35772d59cd3df9b61dec436450de3c038faf2cd22fb891fee7270aa7f87f146f72497ffeb63dfe869cccd3f2788562d23fc51afd83ca19159f2a6810
-DIST vbox-kernel-module-src-5.2.30.tar.xz 642476 BLAKE2B 497a381b10f813ee333f0ac0a0b9f7893b0cc3c842757e85f119bc28dec4ed978bab827df116c8f99bafb412b8bf5a97592a964cf61f7e813284b2e74e7e8a6d SHA512 80511d96c44294a1faae165e874b838f76449a898cdc01411eae0dbdc5f7ee79f75f8c6a52e9e0c9c1ad8bd054c64751f6be6f7790d0053933db8d786dfbc53e
 DIST vbox-kernel-module-src-5.2.32.tar.xz 642428 BLAKE2B 0dda5cb5608c1eed22bea209564d53c5f7eab58ca620db2cc441e3c1ba9ad66609c4ef13df07fd29b691f2941a070f9852e8729cd386081df6a82ede345f33c5 SHA512 fadedab690cb7dee8b9a6747ed711d924bf3bce8999b24e7b64cb8738c53c2fa7372b1a8e8535e7e4ef0235aec02d4a3f1f67cd07d7621934fab684c5163329e
 DIST vbox-kernel-module-src-6.0.10.tar.xz 669008 BLAKE2B 80250aeca8421aa0b88efb1d090f78d0bc6c7b4b2c3b7e0c5c7953d9ef5246ee25df6fa14b75b821e1e3d05cda3ff975560ede89dc482e34faa801a592405a9f SHA512 afab0130c14b86e822f2a9528373388a9eeee952deec9ff7158e4b788b64343235f3a3da10218bfabcb71dd4d89c8ace0031ea9b64d7385140f6c580b5087333
-DIST vbox-kernel-module-src-6.0.8.tar.xz 668380 BLAKE2B 06deabe0bae37503ec2b2df3cf1edb820b190c9e453aad8e211278a27c9ffaf229b98c08b2d7510b3721a30ca53833b43184636fde7ce3e5ac0bcbc588330486 SHA512 a4fb626c5a58637cfef7ebc44ccfcf82d6f2a7e91af665a8854d9fafb0c9b042d473c6767dad64497aed5110aefd23299461d39b43f8e57aa0c255cfcc94b448
+DIST vbox-kernel-module-src-6.0.12.tar.xz 669148 BLAKE2B 2291e3fcb9f049ce5657288151d182dfc9a3d6d6e8e1b32047e4b682f35e56f0a5bb5d3ad7efbc98082d2d1823aeb821099e9878b8a237322e8900fb2e2d65de SHA512 e9d8fcbfc076bf4e7d4dc5954e0c24509273c6358ee2de9ddfa87ea650b69fdc31d223595d610c1dd921efd6620ba5285f7f6a10170e90e706bf731e3629dc51
 EBUILD virtualbox-modules-5.2.26.ebuild 1187 BLAKE2B 87f131dcdde7d6acf35a48183ed2423c20366d1c57bfde56b9c6b265006b049d6d5cf2f058867150f30cddfda308512907702208c15d4ae5a868c6e8d6468091 SHA512 80d1deb4b4142e7a4b718a460829ed99e5a4c24e50d65266263a872d247de519972bb13623881382ca8e12a4387e94f327fb9491728dff65ce8449244df0199f
-EBUILD virtualbox-modules-5.2.30.ebuild 1189 BLAKE2B 5edbc0952960db33bfa7f3d22266fac6785b6d01591e625e88818845667051e2a090ee34e7265dca082434d2da85dd84930bc71fab7e878f12dececa6320f0db SHA512 5701d91ab3bee88cfa0422f9d22c073f92faad72bbb8beb0ecee96ce78cdd51ef3b59c072c924b3ce267e31cbc4bcefc89376fe273de9dc35d508f3fbd6d59be
 EBUILD virtualbox-modules-5.2.32.ebuild 1189 BLAKE2B 5edbc0952960db33bfa7f3d22266fac6785b6d01591e625e88818845667051e2a090ee34e7265dca082434d2da85dd84930bc71fab7e878f12dececa6320f0db SHA512 5701d91ab3bee88cfa0422f9d22c073f92faad72bbb8beb0ecee96ce78cdd51ef3b59c072c924b3ce267e31cbc4bcefc89376fe273de9dc35d508f3fbd6d59be
 EBUILD virtualbox-modules-6.0.10.ebuild 1245 BLAKE2B d604b453e51b534c7437a56d50ca248ac61362a27c782cb909c905061064859994c2a8fed83e36d43139c848ed494d30506af040e1fd4abd6685b8c50f146c34 SHA512 cc7e6095ca1d2d32e74d32ccf2a1d419b9a68aa8a9699cf7db60f5264f7515c5d17451801014776bdf6ebdf99183c66f82ef3ca304c3d586d0f79729b6078c9c
-EBUILD virtualbox-modules-6.0.8.ebuild 1245 BLAKE2B d604b453e51b534c7437a56d50ca248ac61362a27c782cb909c905061064859994c2a8fed83e36d43139c848ed494d30506af040e1fd4abd6685b8c50f146c34 SHA512 cc7e6095ca1d2d32e74d32ccf2a1d419b9a68aa8a9699cf7db60f5264f7515c5d17451801014776bdf6ebdf99183c66f82ef3ca304c3d586d0f79729b6078c9c
+EBUILD virtualbox-modules-6.0.12.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.30.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.30.ebuild
deleted file mode 100644
index c4b01a1b3f96..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.30.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.8.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.12.ebuild
index 7257cb3b5812..7257cb3b5812 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.8.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.12.ebuild
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 78ac6af01a5c..bbfb05ab3c40 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -10,15 +10,13 @@ AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf
 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-5.2.26.tar.bz2 118371765 BLAKE2B 32413b72e33f2f63835a2eb2d47dc75a7b63121934bdffd51ff58e9d63d68b77b4f8dac4605916ba8bd6896240d00024ccc3d7d002d4f6f92d6d9b1dc35995e3 SHA512 aee334c74bd02772ac5e0528d84d31661f61c775d0993c00febe125810efc78a2f779db41bf66283be51b19a35540fee14445bada59a8d3b7affa6ef6645005f
-DIST VirtualBox-5.2.30.tar.bz2 118462289 BLAKE2B 87126b5af657815d0fcc8aadf49a23ce613ea0998b70f988f78e9d381138c414c7c73a0bf91955481cf484f5b71081ff1bab8dabe1b41fffde877e1003477625 SHA512 6230846ceda47b8ffe942aa8427f04f193095103371b7210d30e49cd9e384b9828d6917f75ef125e63e2c1810e8aa3b7c17b72f3ede7697c55d6de9da9d3f668
 DIST VirtualBox-5.2.32.tar.bz2 118262502 BLAKE2B f42de23ddbef1bb5472f6730b711452049331cf06c80420205844ea4a46ddb3352e0fd91564d94d018cb03921e7f894b30c79ddb684ad498d3f86dee88bf8994 SHA512 4e98d5df5e9e6445dde268d5eacea82e655ce9b96cd6579a9d470a08a0c066b7cd7e212b276e2671e936b4a73a53ecf9daa666cb3a8b9d7dc353c70c9283505e
 DIST VirtualBox-6.0.10.tar.bz2 154284088 BLAKE2B 6aeb2384a777bb39e7c2692c1e262914296650f1448e8db45a03b864a824d3e8b337208087fa7f4469b1ee15e39c8cdae3707f742eb229872e8cb681d118880c SHA512 96fa3c672790239163829b3c40ac0d75d717b29a7b947ec48709eb7811c5800e314a0fc90d87810e4a03da40b3a65914605f648b287314386b371489e5d974c9
-DIST VirtualBox-6.0.8.tar.bz2 155404889 BLAKE2B 3eb6ebf713c32e301db1673b22c367a89ce1ffb25d12baab6c7335389ce17e08efd744139acc4114231c4d4b69c6370b6e5d5b18ce97fe5494ca7a192fa43f7d SHA512 df18d5df2c82761b8a77e509b2873cdeaa46d11bc50ca166af1e6c30d3042b0cf5640957b1d411333f5bd5be3f03f382550f1afaecf0651d847bc88c95863d83
+DIST VirtualBox-6.0.12.tar.bz2 154250538 BLAKE2B 1c0da29a1d4f4a9ce57280593b219d1fe507fa31dd419d5ef7e62fa8b76bc8b7b21a414edec79ce03b7b4471176e322cb5a0a592a7f61c1f6096c59ca16072ce SHA512 a2182750c6b7e2f7fe8548a923829c05167b739ad84ed025e6cfd85ce787aaa43d41c72c5a93f17e6b976561bae0aa538d81830c52c1d326b75f5a32ba3d441c
 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.26-r1.ebuild 13967 BLAKE2B c31306369c0e45061b211986f0711aac54aa60d4cfe8f0e2311d2af1c24f62bed4e75e277591711dc1e86878d4fd773b1df17c0f796a9b4f8d3456391a38ba53 SHA512 0a66db90ab0d415a3c3f3adc2daa726c4776c4db93a7b2ebc495213360b8d50cfe3eef30ed808138e76e8aadf698f31e3427811fb33beb63b7b0a5a3abee9829
-EBUILD virtualbox-5.2.30.ebuild 14475 BLAKE2B 785fd360936db62615c077213851c1c2face85ed31161138807564af0e25a7956f2dac717f23b1abe41ba9ee9d4c2c75fe5dd68f397fa3c4f011037e8a54948c SHA512 7bc871971a7d295894fddb76816fb0733ecee7ba987b27eeace7271d2d9b44167545149196d4a396017807bb0264dbb0904b9c015a6c046f3aa49eedbce0b5d7
 EBUILD virtualbox-5.2.32.ebuild 14475 BLAKE2B 785fd360936db62615c077213851c1c2face85ed31161138807564af0e25a7956f2dac717f23b1abe41ba9ee9d4c2c75fe5dd68f397fa3c4f011037e8a54948c SHA512 7bc871971a7d295894fddb76816fb0733ecee7ba987b27eeace7271d2d9b44167545149196d4a396017807bb0264dbb0904b9c015a6c046f3aa49eedbce0b5d7
-EBUILD virtualbox-6.0.10-r2.ebuild 14599 BLAKE2B fbd1763e96d401758f7ba6b823bec61dc18a0446cde2cb2a73ca7bf931afddaecfef2abff6855213fa249e66ee3fa3a2bbd9ec90631ca0fc17cb9fe6489d9547 SHA512 74b420571f31ce2108ab648a176c52299eac9f5f4e884d1b004cdd2e742a629de915c22535b5659eb09209421ce4e3fe739196606da9345238bc43285364a7c3
-EBUILD virtualbox-6.0.8.ebuild 14542 BLAKE2B 1db56bd2d00e4e090aaa0d148759dacdb25419e7ba1ce0126101eacd3414be30c4c5456438766c287d5d83dc958876c3341385d3ff4374e29c1680adea70dae7 SHA512 c90a264c058637f98eff84d9519a4fc3117e9be1cc54292f5f8460afe0ffa2ac834776ef53dbc418477e8b266df3ad59569fb1b35b4fd4e20926733650251e44
+EBUILD virtualbox-6.0.10-r2.ebuild 14581 BLAKE2B 1eeb82ddd9a5c8da8719f939fcadabd98354765a5e804f93605a8a56949ebcfd5a4acfdc7b05013ac41f5cdd5a9ba20bf080ab121078dcee4d1856d31df9b2f7 SHA512 6d3fb30f7955f03368408093db5808ee759f2a1530f7d0cbbc4f5edd988191054ff6bc739f71a62b48cdebbc0f8d0f406396e098f613a8009e693be66bdaada8
+EBUILD virtualbox-6.0.12.ebuild 14580 BLAKE2B 8216a40e53ab0fbae65aa7043463b96944b8673bcfb36c753ffb525780af65c92904765d443dc157dfe39e62a0fc511c54df74233e183bf3417cc7ff77182ca2 SHA512 fe38948468c23d8fe7fcaa237570f390e1e6fa4ad8b0d7b52cada8d35355aee51f7cab7a7096ea351ca9ccb1ffe6814496729be840155eb7791e04c337e36364
 MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
diff --git a/app-emulation/virtualbox/virtualbox-5.2.30.ebuild b/app-emulation/virtualbox/virtualbox-5.2.30.ebuild
deleted file mode 100644
index a5834468ff54..000000000000
--- a/app-emulation/virtualbox/virtualbox-5.2.30.ebuild
+++ /dev/null
@@ -1,497 +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}-5.2.16-patches-02.tar.xz"
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc dtrace 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 )
-	${PYTHON_DEPS}"
-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
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
-		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
-		|| die
-
-	if use vnc ; then
-		insinto ${vbox_inst_path}/ExtensionPacks
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace ; then
-		insinto ${vbox_inst_path}/ExtensionPacks
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	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.10-r2.ebuild b/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild
index cd27d90f6c4a..a451933cccba 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild
@@ -296,7 +296,7 @@ src_install() {
 	# Set the correct libdir
 	sed \
 		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
 
 	# Install the wrapper script
 	exeinto ${vbox_inst_path}
@@ -330,7 +330,7 @@ src_install() {
 	# 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}
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
 	done
 
 	# Symlink binaries to the shipped wrapper
@@ -351,7 +351,7 @@ src_install() {
 	if ! use headless ; then
 		vbox_inst rdesktop-vrdp
 		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
 
 		for each in vboxsdl VBoxSDL ; do
 			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
@@ -361,12 +361,12 @@ src_install() {
 			vbox_inst VirtualBox
 			vbox_inst VirtualBoxVM 4750
 			for each in VirtualBox{,VM} ; do
-				pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
+				pax-mark -m "${ED}"${vbox_inst_path}/${each}
 			done
 
 			if use opengl ; then
 				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL
+				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
 			fi
 
 			for each in virtualbox{,vm} VirtualBox{,VM} ; do
@@ -409,8 +409,8 @@ src_install() {
 		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"
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
 		fi
 	fi
 
@@ -498,9 +498,9 @@ pkg_postinst() {
 		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
+	elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
 		elog ""
-		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
 		elog "or else USB in ${PN} won't work."
 	fi
 }
diff --git a/app-emulation/virtualbox/virtualbox-6.0.12.ebuild b/app-emulation/virtualbox/virtualbox-6.0.12.ebuild
new file mode 100644
index 000000000000..7b77c1872296
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-6.0.12.ebuild
@@ -0,0 +1,510 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+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 dtrace? ( CDDL )"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+
+CDEPEND="
+	${PYTHON_DEPS}
+	!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="
+	${CDEPEND}
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? ( x11-libs/libXinerama )
+	pam? ( sys-libs/pam )
+	pax_kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	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
+	)
+	java? ( >=virtual/jdk-1.6 )
+"
+RDEPEND="
+	${CDEPEND}
+	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_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() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/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
+				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
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
+		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
+		|| die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace ; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	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() {
+	xdg_pkg_postrm
+}
diff --git a/app-emulation/virtualbox/virtualbox-6.0.8.ebuild b/app-emulation/virtualbox/virtualbox-6.0.8.ebuild
deleted file mode 100644
index e0d132082e20..000000000000
--- a/app-emulation/virtualbox/virtualbox-6.0.8.ebuild
+++ /dev/null
@@ -1,500 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-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 dtrace? ( CDDL )"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc dtrace 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 )
-	${PYTHON_DEPS}"
-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_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() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/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
-				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
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
-		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
-		|| die
-
-	if use vnc ; then
-		insinto ${vbox_inst_path}/ExtensionPacks
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace ; then
-		insinto ${vbox_inst_path}/ExtensionPacks
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	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() {
-	xdg_pkg_postrm
-}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 66028acdfae6..dae8d5296ff3 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
-DIST wine-4.11.tar.xz 22098508 BLAKE2B dee7ec74808b365cfa9087cadc29721af2f17663da760ae8d3f506e8ebd897aeeba0728eb57d1afa386b181b18f0861538b5c245841f9ce5e43470029ae4ef0b SHA512 df4e636959f6044f92aca16dce9cb392fd6c513ccc5a19585d3de8cd7fe0a9d21b05fcfa538172f94721d0356d9ec1470b7da810fcfa70d3aae9054a48d4700b
 DIST wine-4.12.1.tar.xz 22125544 BLAKE2B 7a3b221e2bf3af91feff529b5af3926956cbcbce020439c7aa4f464f78d8c93ed1686eabdfee080dd0946e378645667ddb19c67a6449f1b171f1660127ecc05d SHA512 5d226aa4f24c59949c88d377d8f3d38839179e473b7e5bbf029af8142dfa23fd046ca919b63c8c8fc7e1a46077a860d3dab9d2e040f0367c85c8d386707222c1
 DIST wine-4.13.tar.xz 22137820 BLAKE2B 6aab4930fd176757e2594a580ba73694cf04b5411eaf26dc332a8aee5efcd1a181781d010610b22aaa6dd91b4f9161502609b8a23928d6848329d773f98c41cd SHA512 b359db3c99d10b489f7f72172b624e7b2e2b826c206e842a524d781ab5947e2b03623a115c2345fc71df22eb508936c2f7667d4c420a2fb6cdc34e3d2ba5e75b
 DIST wine-4.14.tar.xz 22151304 BLAKE2B 04983c21fa58091a36e681c90b92b4f014287ea7edb105bef560ed0505682dd1d3832292a0e2cc72489f0c4a2247ce9c1ec7481f80cf2baa05953e525ce00b1c SHA512 cfbcad1685abf3a3810c5f29c50e47f1340aab2276e54d8d22b9b764df5099ff7ad399a6cca200c7a622be0470992d3aee1c0c64c2e6ea90221fee6d391d911c
-DIST wine-staging-4.11.tar.gz 9919887 BLAKE2B 70e1b07c1d574806f3c74be6a545493e119a3a3a5b6d0f9da0b6dd2135a7e58a60a83dfb3f309cbc9b4a4b0e50bec11f626958817e00e7f3b0a81972f1099f2b SHA512 384866aa5b2636804825ceb36b999bc1d5dd4d4693cef1b3004d9c8252dea393a02c65227d9e7b665021f19fd087025349ad720f4bbf0f061887ba5abcb74b24
+DIST wine-4.15.tar.xz 22196108 BLAKE2B d3b28ad1bbfb7e1522a3acb120049dd3ac3fe0473d0f84529e86b5b9163401869e39f7c4c0e14795a97362722c41ea1476e4afbd1a545e5518504df2628c928a SHA512 f8290bbfd3779cb967c1cf689106fa48d1a1daeac2bd42fb91a2d4beed48e0c398ed9239437756bdbe3cd826cef59f5cd660381f637e184c47a865ff3ace91aa
 DIST wine-staging-4.12.1.tar.gz 9920469 BLAKE2B e76f1efe205fea913c8ae50e290f271a07f46ae5a9fe4a521d9e96a8834ff7eb70aa0d42a6d308ca081b14628bbb85e1c638dcfe7fa732a5e25a3a20e07b0b67 SHA512 804e99567632326f5ea55fd86c4ed236da3b3636b0aaf5dbf4427694b0786326bd048fbb119b37fc66d4072dacec9ac354b804ad372cad69cbf086360eaedc38
 DIST wine-staging-4.13.tar.gz 9913015 BLAKE2B 125b96fbe2de3c6d5c302dc25f0d1ba65fa3deb00a76c30a55e9fe43ad06bc3cb7ea18f542638268c1e854effedca557e837512b54c92905b928d83b33aa6aae SHA512 a5240b3999b1ba605d16148022e57a4574c0e9288763a5c4a259ea06c3a7152af8b136b0e2b8a74b1a40fb6adaf5ce012695160afdd5364fa1b4c7a903fd82b1
 DIST wine-staging-4.14.tar.gz 9910499 BLAKE2B 2e9d2983156a3f309e740503825ff0ebb2461ffc785147e9853122e7d64269409f7e73fea0b5a0fac149a4fb7d27a11cdc8ba0759ca9fc0fb0492d8d3884c503 SHA512 481a50f4ba3f1c445bd5b9754d7b27bdcd0bc386930e3597051a0962778288f8d4649e9f4e8bc188738c6896821a198f3af15b47e9db719f52d0b3db16a407f0
-EBUILD wine-staging-4.11.ebuild 20352 BLAKE2B 9a66ac87c5e8d7cb023ebf07cd9e717218e80110f91470612f6360f03a1c28eea272a5148e4e56480544ebc7b9d2d4f056b239745cca69011d994f562a336898 SHA512 ad4d0bb599d01b0e867a1d373be6c4db817e5956f3b6d3134e77f96a9f3697a2f664a28030d8c2cc559a21a879b53a23d4b7d2c29d3f717b9ebff5db2b0931b6
+DIST wine-staging-4.15.tar.gz 9904734 BLAKE2B 163d6f51a6fe649c8c107b013aafa5c5729bb93cafe94446cde966138c18d5aed2e950ce9a71ae4c719efb358406af079efb21cc8546d97e2b7146a5cae27a56 SHA512 0c34695c1d39773fb34a58f0cdb91d427945615e7b76b8a7222bc84fda8df08125832297b75aca55e69511b6b3686df70dade84bcc7cc9324f30c042146761b0
 EBUILD wine-staging-4.12.1.ebuild 20352 BLAKE2B 9a66ac87c5e8d7cb023ebf07cd9e717218e80110f91470612f6360f03a1c28eea272a5148e4e56480544ebc7b9d2d4f056b239745cca69011d994f562a336898 SHA512 ad4d0bb599d01b0e867a1d373be6c4db817e5956f3b6d3134e77f96a9f3697a2f664a28030d8c2cc559a21a879b53a23d4b7d2c29d3f717b9ebff5db2b0931b6
 EBUILD wine-staging-4.13.ebuild 20202 BLAKE2B 3a396d740c0fbef5461274b043c1d80f14d8d5d4cf0f46cd36b9761c06dfe09d5946e98d1378c2b1ad4561d37a04c33057ebd5bc7305d40261cfd040dddc94b6 SHA512 ea7fcca738893b74b4d6fc4d61e0ecb2c81a00c9a71e2ab8e5d5667b37f2860897a0cc89360446610e5420ce348fe8eed246497c0b965865e47f4e4c3db050e4
-EBUILD wine-staging-4.14.ebuild 20202 BLAKE2B 76c82fa50a834c98e3abd40903d20737a7aab7e7163007f21954c5ff3813903483d3de7a811dd14416ea575163b6dc2ed84981be8b80aea0a95de97da03c0cad SHA512 f022ef0a56524f34602062e10b9cb764d1d6825cc16fcef5c03988ef89ba4c567ad8dc1331c30c7e1277efe3deede555c6adfc2fc7baaa74225ed85709475a5c
-EBUILD wine-staging-9999.ebuild 20202 BLAKE2B 76c82fa50a834c98e3abd40903d20737a7aab7e7163007f21954c5ff3813903483d3de7a811dd14416ea575163b6dc2ed84981be8b80aea0a95de97da03c0cad SHA512 f022ef0a56524f34602062e10b9cb764d1d6825cc16fcef5c03988ef89ba4c567ad8dc1331c30c7e1277efe3deede555c6adfc2fc7baaa74225ed85709475a5c
+EBUILD wine-staging-4.14.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf
+EBUILD wine-staging-4.15.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf
+EBUILD wine-staging-9999.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf
 MISC metadata.xml 3712 BLAKE2B e42b36bfa8f6d0f4c9b2538c04bb0b7650c411b621a1be5cba58ca8f6f64a1bc68517eeef385351461ef72e33152b05df14775777de14e848802ee8eb4980909 SHA512 1a904083074cad42013d9a8798ea32898332fa0697f79a1a11e6a0f5b6dcf35cb42dbb52a3b5baaeb3fe2012f80dfbbafbd874df4eef783e8a151b13b98afe77
diff --git a/app-emulation/wine-staging/wine-staging-4.11.ebuild b/app-emulation/wine-staging/wine-staging-4.11.ebuild
deleted file mode 100644
index 0804c00c2432..000000000000
--- a/app-emulation/wine-staging/wine-staging-4.11.ebuild
+++ /dev/null
@@ -1,618 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20190511"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-else
-	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	ffmpeg? ( staging )
-	osmesa? ( opengl )
-	pipelight? ( staging )
-	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.0 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	staging? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${pn_live_val} ]]; then
-		if use staging; then
-			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
-			eerror "cannot be used to set the commit. Instead, you may use the"
-			eerror "environment variables:"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-			eerror
-			return 1
-		fi
-	fi
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environment variables:"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-		if use staging; then
-			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
-			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
-				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
-				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-			fi
-		fi
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	if use staging; then
-		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
-		ewarn "Wine bugzilla should explicitly state that staging was used."
-
-		local STAGING_EXCLUDE=""
-		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-		use faudio && STAGING_EXCLUDE="${STAGING_EXCLUDE} -W xaudio2-revert -W xaudio2_CommitChanges -W xaudio2_7-WMA_support -W xaudio2_7-CreateFX-FXEcho"
-
-		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
-		ebegin "Running Wine-Staging patch installer"
-		(
-			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
-			cd "${STAGING_DIR}/patches"
-			source "${STAGING_DIR}/patches/patchinstall.sh"
-		)
-		eend $? || die "Failed to apply Wine-Staging patches"
-	fi
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with ffmpeg)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use staging && myconf+=(
-		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine register --staging ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine deregister --staging ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-staging/wine-staging-4.14.ebuild b/app-emulation/wine-staging/wine-staging-4.14.ebuild
index c8cbce356e29..52c20dca7b4a 100644
--- a/app-emulation/wine-staging/wine-staging-4.14.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.14.ebuild
@@ -435,7 +435,7 @@ multilib_src_configure() {
 		--libexecdir="${MY_LIBEXECDIR}"
 		--localstatedir="${MY_LOCALSTATEDIR}"
 		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
+		--sysconfdir="${EPREFIX}/etc/wine"
 		$(use_with alsa)
 		$(use_with capi)
 		$(use_with lcms cms)
@@ -555,6 +555,9 @@ multilib_src_install_all() {
 	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
 	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
 
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
 	if use abi_x86_64 && ! use abi_x86_32; then
 		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
@@ -565,7 +568,7 @@ multilib_src_install_all() {
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 	eshopts_pop
diff --git a/app-emulation/wine-staging/wine-staging-4.15.ebuild b/app-emulation/wine-staging/wine-staging-4.15.ebuild
new file mode 100644
index 000000000000..52c20dca7b4a
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-4.15.ebuild
@@ -0,0 +1,620 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+GWP_V="20190511"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	ffmpeg? ( staging )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.9.2 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environment variables:"
+			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environment variables:"
+		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir="${EPREFIX}/etc/wine"
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with ffmpeg)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index c8cbce356e29..52c20dca7b4a 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -435,7 +435,7 @@ multilib_src_configure() {
 		--libexecdir="${MY_LIBEXECDIR}"
 		--localstatedir="${MY_LOCALSTATEDIR}"
 		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
+		--sysconfdir="${EPREFIX}/etc/wine"
 		$(use_with alsa)
 		$(use_with capi)
 		$(use_with lcms cms)
@@ -555,6 +555,9 @@ multilib_src_install_all() {
 	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
 	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
 
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
 	if use abi_x86_64 && ! use abi_x86_32; then
 		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
@@ -565,7 +568,7 @@ multilib_src_install_all() {
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 	eshopts_pop
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 93903b6f67c8..cd09fc13e02f 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,16 +1,18 @@
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
 DIST wine-4.0.1.tar.xz 21665840 BLAKE2B b33b5ce8b4624dfbbbf473a88ed8c52d5e53855fa98ac3128e9b89dbeee6e92044ed1e662e1dc9669bd8d805424c36f2dd2c836c51bf6a5e4d78350926a13150 SHA512 dd240525e389f841123a569fd2f9b8da698b7707bc0de408dfd60ae73c5e24d522abb42b76571c840df52c686fdeae56e0a9c69db2cd31f04cdb345feeacf1dc
+DIST wine-4.0.2.tar.xz 21668348 BLAKE2B f1aa8ba3add9ae1e6fbb930a0c557c0015a699b21ba9988c6832c9a1b5180f98cbaadc561fbe4a22e97ff78732ee121a14f5a82b0637c71a4856fa5524ff2f5a SHA512 14cb7eeba188562b73125c668f2020e1df6802e486552e422d3aa75b95f6fccedc0f87868f7e58ce71697941ff49757981ec93b9ef288da37ca8570658f194fc
 DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
-DIST wine-4.11.tar.xz 22098508 BLAKE2B dee7ec74808b365cfa9087cadc29721af2f17663da760ae8d3f506e8ebd897aeeba0728eb57d1afa386b181b18f0861538b5c245841f9ce5e43470029ae4ef0b SHA512 df4e636959f6044f92aca16dce9cb392fd6c513ccc5a19585d3de8cd7fe0a9d21b05fcfa538172f94721d0356d9ec1470b7da810fcfa70d3aae9054a48d4700b
 DIST wine-4.12.1.tar.xz 22125544 BLAKE2B 7a3b221e2bf3af91feff529b5af3926956cbcbce020439c7aa4f464f78d8c93ed1686eabdfee080dd0946e378645667ddb19c67a6449f1b171f1660127ecc05d SHA512 5d226aa4f24c59949c88d377d8f3d38839179e473b7e5bbf029af8142dfa23fd046ca919b63c8c8fc7e1a46077a860d3dab9d2e040f0367c85c8d386707222c1
 DIST wine-4.13.tar.xz 22137820 BLAKE2B 6aab4930fd176757e2594a580ba73694cf04b5411eaf26dc332a8aee5efcd1a181781d010610b22aaa6dd91b4f9161502609b8a23928d6848329d773f98c41cd SHA512 b359db3c99d10b489f7f72172b624e7b2e2b826c206e842a524d781ab5947e2b03623a115c2345fc71df22eb508936c2f7667d4c420a2fb6cdc34e3d2ba5e75b
 DIST wine-4.14.tar.xz 22151304 BLAKE2B 04983c21fa58091a36e681c90b92b4f014287ea7edb105bef560ed0505682dd1d3832292a0e2cc72489f0c4a2247ce9c1ec7481f80cf2baa05953e525ce00b1c SHA512 cfbcad1685abf3a3810c5f29c50e47f1340aab2276e54d8d22b9b764df5099ff7ad399a6cca200c7a622be0470992d3aee1c0c64c2e6ea90221fee6d391d911c
+DIST wine-4.15.tar.xz 22196108 BLAKE2B d3b28ad1bbfb7e1522a3acb120049dd3ac3fe0473d0f84529e86b5b9163401869e39f7c4c0e14795a97362722c41ea1476e4afbd1a545e5518504df2628c928a SHA512 f8290bbfd3779cb967c1cf689106fa48d1a1daeac2bd42fb91a2d4beed48e0c398ed9239437756bdbe3cd826cef59f5cd660381f637e184c47a865ff3ace91aa
 EBUILD wine-vanilla-4.0.1.ebuild 17343 BLAKE2B 57e3ea58827294e7719352b84038074a2a2e7a56f1030db21891afc2d275eec4481751a53bbea59d23028e40967dc9f1751f3b170cb36e669e55d3f7152708db SHA512 2b04e442062e88e663b12139ab82d20df992787936987ada9394d62b1c208fa5be6a7bd192456fb027a3d730843a135091155956cc539e8481c916e3dbfe209e
+EBUILD wine-vanilla-4.0.2.ebuild 17345 BLAKE2B 72ea2e1202b57a6da506c22daf73d9201296b5c34879960ca0217b31a50c7f798535478bbab307c7568d4e0e75c053e0ba2cda5770e9801bc95c68f67b073366 SHA512 260cf6d90fa053a8c06bf602ae918f42b95c1f56b51fc374086cff4e370d1d5be1c1a9eeb458130f6d9e1bc03a31b8afc2922c6b57e1488e4d59423037f35cde
 EBUILD wine-vanilla-4.0.ebuild 17340 BLAKE2B 44d7b71fec5fd62ad3403f881da67b2f6bbd7eb21cfb5e766fd6542967f88aa8dd42e9c4e2760ffb2e209ad45f7e7c64e522cfd0a01101765867f7e8260c9a08 SHA512 fc2eb099e3687cabb2f3a361760c5261f06e858f8046e2298df82c51b9b1541ed4c00a48709ff89674f48ad466ba409fa8e1702d1949d69ea86770079ffcc9cd
-EBUILD wine-vanilla-4.11.ebuild 17462 BLAKE2B cf23d7b119dc4fac1e4e89ffacbf68a046815640687fa10f0b32219eebc6eeb47ec5eb743e947dbcc063f60ebf86820a74a255b1c66dc78c8ada12b70185b4a1 SHA512 f897c430a44dfbf14f539ce3de2140f68076c2c878d42cd178baf07ea5aa31a2fa5eef5afca80ea6f874a6dbc7bc851e869b57b954fbc3529dc8c10a8c6661e0
 EBUILD wine-vanilla-4.12.1.ebuild 17562 BLAKE2B adc4845a27faea7d3d46db2dd8488bb3efb5f769b6217936d2734da9e99d412f60890b01d5d666a9d43aef94588ccb21500c209cb1d78ab7071c29744cf211c6 SHA512 d187f0b09ffabe340b49685aa0cc992bf6d425d8f598e07685b609565c4b287e11134a87953f5943c8521ef5894e4885d1ba56327127d6c9552fa9664f5e1b48
 EBUILD wine-vanilla-4.13.ebuild 17562 BLAKE2B adc4845a27faea7d3d46db2dd8488bb3efb5f769b6217936d2734da9e99d412f60890b01d5d666a9d43aef94588ccb21500c209cb1d78ab7071c29744cf211c6 SHA512 d187f0b09ffabe340b49685aa0cc992bf6d425d8f598e07685b609565c4b287e11134a87953f5943c8521ef5894e4885d1ba56327127d6c9552fa9664f5e1b48
-EBUILD wine-vanilla-4.14.ebuild 17462 BLAKE2B 1cf9e046eb5dd1cb48c2398d08622f3671d084813bd95f005a008958d63996f0f784809135c100947e40a3486d7730d5ad388f0c6fbb8db33c252a0e71c9991f SHA512 0db2627836498bdd71609aeb0cf6208b5f9e140a607ed20d64b14cc70f3b0ab31e212e6e7cefdef8b4f91c57d2efc734cb4510a61a82cbac27414bbfe8790ff3
-EBUILD wine-vanilla-9999.ebuild 17462 BLAKE2B 1cf9e046eb5dd1cb48c2398d08622f3671d084813bd95f005a008958d63996f0f784809135c100947e40a3486d7730d5ad388f0c6fbb8db33c252a0e71c9991f SHA512 0db2627836498bdd71609aeb0cf6208b5f9e140a607ed20d64b14cc70f3b0ab31e212e6e7cefdef8b4f91c57d2efc734cb4510a61a82cbac27414bbfe8790ff3
+EBUILD wine-vanilla-4.14.ebuild 17562 BLAKE2B 3d0fe7847fc3345b100fb3f1e8cb9019b9c31253d649c1e794c0d36fafa7d8b555eba8be60ed571f0b3d094a60cd64b32b2797bd3bc49a0637c6a13eea63effc SHA512 c39a9db6d4a78d8765bd3271c4abd625a7cf291d93b9ce3952779b202d7ef45439d9ba2d76f280fa5cfd3eae9918e94ad51e64a5d37d000c4f4478a639bb114f
+EBUILD wine-vanilla-4.15.ebuild 17562 BLAKE2B 3d0fe7847fc3345b100fb3f1e8cb9019b9c31253d649c1e794c0d36fafa7d8b555eba8be60ed571f0b3d094a60cd64b32b2797bd3bc49a0637c6a13eea63effc SHA512 c39a9db6d4a78d8765bd3271c4abd625a7cf291d93b9ce3952779b202d7ef45439d9ba2d76f280fa5cfd3eae9918e94ad51e64a5d37d000c4f4478a639bb114f
+EBUILD wine-vanilla-9999.ebuild 17562 BLAKE2B 3d0fe7847fc3345b100fb3f1e8cb9019b9c31253d649c1e794c0d36fafa7d8b555eba8be60ed571f0b3d094a60cd64b32b2797bd3bc49a0637c6a13eea63effc SHA512 c39a9db6d4a78d8765bd3271c4abd625a7cf291d93b9ce3952779b202d7ef45439d9ba2d76f280fa5cfd3eae9918e94ad51e64a5d37d000c4f4478a639bb114f
 MISC metadata.xml 3259 BLAKE2B b750a29db90841c9fa04e19ce9e5811945bb1d1d3b6a3b4a071087bf73f9386706ab28b7af29e7e89afcff2e1b68ca79944546e5f68c0d0f248b95fb1a5ac2fc SHA512 84fb94a9a9e4c9e8bf59391c9c1414e55994f80df0b264fdff77f43defa13ef0becdfc24316ef9eb3d824ea8edca5af3aed0586224a96b25fc3e90d7dfc32394
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
new file mode 100644
index 000000000000..5f5e60da9273
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
@@ -0,0 +1,533 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	MINOR_V=$(ver_cut 2)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20180120"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.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 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "EGIT_OVERRIDE_COMMIT_WINE"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.11.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.11.ebuild
deleted file mode 100644
index 2c4c919612cd..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-4.11.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20190511"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:4.9.0 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "EGIT_OVERRIDE_COMMIT_WINE"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild
index da7b74680274..d6779b0d96a5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild
@@ -368,7 +368,7 @@ multilib_src_configure() {
 		--libexecdir="${MY_LIBEXECDIR}"
 		--localstatedir="${MY_LOCALSTATEDIR}"
 		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
+		--sysconfdir="${EPREFIX}/etc/wine"
 		$(use_with alsa)
 		$(use_with capi)
 		$(use_with lcms cms)
@@ -481,6 +481,9 @@ multilib_src_install_all() {
 	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
 	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
 
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
 	if use abi_x86_64 && ! use abi_x86_32; then
 		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
@@ -491,7 +494,7 @@ multilib_src_install_all() {
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 	eshopts_pop
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.15.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.15.ebuild
new file mode 100644
index 000000000000..d6779b0d96a5
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.15.ebuild
@@ -0,0 +1,538 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20190511"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:4.9.2 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "EGIT_OVERRIDE_COMMIT_WINE"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir="${EPREFIX}/etc/wine"
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index da7b74680274..d6779b0d96a5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -368,7 +368,7 @@ multilib_src_configure() {
 		--libexecdir="${MY_LIBEXECDIR}"
 		--localstatedir="${MY_LOCALSTATEDIR}"
 		--mandir="${MY_MANDIR}"
-		--sysconfdir=/etc/wine
+		--sysconfdir="${EPREFIX}/etc/wine"
 		$(use_with alsa)
 		$(use_with capi)
 		$(use_with lcms cms)
@@ -481,6 +481,9 @@ multilib_src_install_all() {
 	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
 	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
 
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
 	if use abi_x86_64 && ! use abi_x86_32; then
 		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
 		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
@@ -491,7 +494,7 @@ multilib_src_install_all() {
 	# Make wrappers for binaries for handling multiple variants
 	# Note: wrappers instead of symlinks because some are shell which use basename
 	local b
-	for b in "${D%/}${MY_PREFIX}"/bin/*; do
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
 		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
 	done
 	eshopts_pop
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 5d2c7188c812..50bf2dcbd5d3 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-infinality/Manifest b/app-eselect/eselect-infinality/Manifest
index a087609fde8b..3e927496720d 100644
--- a/app-eselect/eselect-infinality/Manifest
+++ b/app-eselect/eselect-infinality/Manifest
@@ -1,5 +1,5 @@
 DIST eselect-infinality-1.1.tar.gz 8274 BLAKE2B 8bbdc7aa6966f685a73f1caecde632611b6b4455400e93f7c91e25c24fbaea97691784729ce6f08fa41f970ed999e189235a23da1d9409e24811331435987a13 SHA512 13fd5082db7739a64662a500aad6bd36e0e0c80a4042e87f077366e40bc9a2184b33f0d549fdec647694df320ba4cf1f93f77194a1d49074619e0798bd4072ef
 DIST eselect-infinality-1.tar.gz 8274 BLAKE2B be4696f34c908a5e6e55546dbaf63a753e936f06074face5f8c9964f89015ee7be88c935c32d36a255c9e7ed71e967d4591ee0ad598f5cbfafc809149e728b3b SHA512 0bff25817b68125c670ffb2782704604415f233711974c47935bd5dac80b164ca471cea1fea193886b30d0eec60a4a208f0ede6bd1a40488c2458a7dd9fe127d
-EBUILD eselect-infinality-1-r1.ebuild 698 BLAKE2B e3a20c706cfda7f0319751def8f49a03236cecf22ed068d7b3815d43be35d2a538616d176315f184ca4aa8b53e2a494b84d9eb5324c4284b3c5f514800e4f559 SHA512 81afb855c952f12c56aa6d3d46d027d1d8c9791ce5213706e5acb5017ab0dfd0fafe95d0d10a6b783d2c87e40da91b861083442d0fe214a0720d9604e1d210d3
-EBUILD eselect-infinality-1.1.ebuild 692 BLAKE2B c58dc156fc51bfb9cb8ea0eebb359c14a5c449a0b879443cf39c361835fa54f1f92f924f277c9c40410697b526c9e9a0b0bad153f96cd711a1c61a37719f3f0c SHA512 fa79c94e3592ba1bb95baca20b308979ce72cd8f92490f67490ea5aa5fbbadb31aedfc0ea0a34b5062598e78339855f494f491d38b5146cc35832bae7c308235
+EBUILD eselect-infinality-1-r1.ebuild 728 BLAKE2B 2ef50e5e9e3e606af2d2fbba94c197bccee3f9a4970ccf19f7b76d693d8489aa915c125d0c464d0a97a826b7f3b51e268dfd4d6a89a6041b6e30a432a397b27e SHA512 d6f6445bc35d5f76c8d2ddba8cc072828fb447a8cc616508a58ac361580885e89d4f96bcf7df1aefa0224550dee078164c7e9e4b2a05c68cc5a25f3276752445
+EBUILD eselect-infinality-1.1.ebuild 722 BLAKE2B 6eeed95c214a4421417fd56e87ce500cae1cb1fec8695615621e412ac2826afccfca91cf528e1adab8ccdc6ae98b30213abbb9aa8b71299d2066ea1892d54dcc SHA512 cf1e0803d2746f03aaa3e8ad27ff86f3016e12ade4994309aa684cc8d3d997d1898571441a6d7ef769fa82e173163d4c8260dfefe5a88e41d016e5ccce416f2f
 MISC metadata.xml 338 BLAKE2B 74c86dfb8172cce6eadacfa36d1b6a77ceba1ae2e2ce77b5fa5170c53a6228f9b800c28ee22b393fe721d001f72a3609c757443c36339439dd01dbd6dc97f6fe SHA512 cd67cba2e024bc2afaca433d25e2b8589848ceb857eea7bf7fbc489ada5c6bbf7c944aa5a0b6f7a0bc5ed75d92acbc60f0acf6334587c890d0c623b2fa39e744
diff --git a/app-eselect/eselect-infinality/eselect-infinality-1-r1.ebuild b/app-eselect/eselect-infinality/eselect-infinality-1-r1.ebuild
index a6353e254a52..17d6ee24ec0e 100644
--- a/app-eselect/eselect-infinality/eselect-infinality-1-r1.ebuild
+++ b/app-eselect/eselect-infinality/eselect-infinality-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
@@ -6,7 +6,7 @@ inherit vcs-snapshot readme.gentoo-r1
 
 DESCRIPTION="Eselect module to choose an infinality font configuration style"
 HOMEPAGE="https://github.com/yngwin/eselect-infinality"
-SRC_URI="${HOMEPAGE}/tarball/v${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/yngwin/eselect-infinality/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-eselect/eselect-infinality/eselect-infinality-1.1.ebuild b/app-eselect/eselect-infinality/eselect-infinality-1.1.ebuild
index b98311f91260..d6aa6e5b0d8c 100644
--- a/app-eselect/eselect-infinality/eselect-infinality-1.1.ebuild
+++ b/app-eselect/eselect-infinality/eselect-infinality-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ inherit readme.gentoo-r1
 
 DESCRIPTION="Eselect module to choose an infinality font configuration style"
 HOMEPAGE="https://github.com/amadio/eselect-infinality"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/amadio/eselect-infinality/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-eselect/eselect-lcdfilter/Manifest b/app-eselect/eselect-lcdfilter/Manifest
index 2e582f45c255..523be4e4f503 100644
--- a/app-eselect/eselect-lcdfilter/Manifest
+++ b/app-eselect/eselect-lcdfilter/Manifest
@@ -1,5 +1,5 @@
 DIST eselect-lcdfilter-1.tar.gz 17206 BLAKE2B 8ac9b6b85819104dd9ce25a08e28694497218372a63f65000591546aa51de94ad6dd03530f62e1e5b5bc8abf0090b9695e8cce04c6a2d37684d489fff983be5f SHA512 1f86fb2cc21ff9cc9b79c50578a02f7c461ae203533cc817dc733d0dde9ad43763267bb1703b9495ba6f46989e0446bb1cba39aaa705d3b605118f62cb0d2dfc
 DIST eselect-lcdfilter-2.tar.gz 18365 BLAKE2B 25acb2f29c3248711fbe5cfd9ba9fa7489de246ff1a4b07121d45987650e89389bb12a299520181c2012ea74fd8f4b87b8d33dcf0ab1dfea8beebb5b8928580c SHA512 e17c475c860f0a3ad7249d21ca11c52f3226852ba042b83058baf6823242c4f8be0042aad52029757944fce6d816df386b928f2005ab87e0778d3ecb26ceec92
-EBUILD eselect-lcdfilter-1.ebuild 994 BLAKE2B 687b7600c746fc51a2be57749142f5a32b7e043aa5a4a85ac2781459f31c316bd1351e803e5fb1f9d779c87950330caecc4c4d861669fefbd7e8fb366c298f60 SHA512 871e6671cc69ddab4d230af7203c149627d21730819435710590c1e5f0094882c6a15cbbe6c7ae5561c2a4c5c1a942de7971d0c9aea1e12659fa5016af93cacf
-EBUILD eselect-lcdfilter-2.ebuild 1017 BLAKE2B 4415986a1891825048e5efc214468e7d7676d332606e0886700501a88ad29e51e5b837df40dcdea061460de15d85b12a6469dbc1afe87e111bf1b6bb8b1c3901 SHA512 2d09f0f3269ab196d6a3293e8a92de964d6a87559f76963d13ffdc197826ea54e541a91f09eaa35c8e68e8ef8a360fd3598cccd43bcfa2c0cb576260fbc594a0
+EBUILD eselect-lcdfilter-1.ebuild 1023 BLAKE2B 72291e5887709a27af5908b0714588c4437685791efab287ce11f4a065b363550d7a3d12dc84df680d53d8434ffa7f75881aad5784acbe3263136b8b250c5887 SHA512 82bc5d6ba516df23a70f24094726b55698850948e7617be866eda04351cdaa9defd32e2fef880760c2028b536e6e7c11b4f36b3c376bd142000b54891e31e7fe
+EBUILD eselect-lcdfilter-2.ebuild 1046 BLAKE2B 9176d0bf0c0c4b1c98330e90a117053586ba3de009d0f93925523b65227a6953364c80ca6c51eb639ead29355a63b1b780a21483121cffa8e276c9030caa4e87 SHA512 04505ec9a396a84118e0c15e1c1fbf7ea9324e76f813d25386bc777502917f5b3fad3b3cb27deeff1ebecba1548ad0f359986641d53984985d1aa00066939e0c
 MISC metadata.xml 337 BLAKE2B 9228fb77b981e77d2998e14e342da38e1c6f8a3211ff0907ff63004ba38d7347fd5e7ba76e3da1d7d619bc2e4a24e86ac8b9d22cc7f329b8af28603a0abb23b5 SHA512 4f60f1456c6e04af05a9f716dfed68d56462dcb599a50f6c4de38f6621d13eea013740e5dac04e1f0a8da5775eb429954f5dfe85bed6f7bbbad6e6a768cb5b12
diff --git a/app-eselect/eselect-lcdfilter/eselect-lcdfilter-1.ebuild b/app-eselect/eselect-lcdfilter/eselect-lcdfilter-1.ebuild
index 867bf778f3da..b75ec6b3c840 100644
--- a/app-eselect/eselect-lcdfilter/eselect-lcdfilter-1.ebuild
+++ b/app-eselect/eselect-lcdfilter/eselect-lcdfilter-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=4
@@ -6,7 +6,7 @@ inherit vcs-snapshot
 
 DESCRIPTION="Eselect module to choose Freetype infinality-enhanced LCD filtering settings"
 HOMEPAGE="https://github.com/yngwin/eselect-lcdfilter"
-SRC_URI="${HOMEPAGE}/tarball/v1 -> ${P}.tar.gz"
+SRC_URI="https://github.com/yngwin/eselect-lcdfilter/tarball/v1 -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-eselect/eselect-lcdfilter/eselect-lcdfilter-2.ebuild b/app-eselect/eselect-lcdfilter/eselect-lcdfilter-2.ebuild
index 6f0ea6b5c257..ad0c8cecd8c3 100644
--- a/app-eselect/eselect-lcdfilter/eselect-lcdfilter-2.ebuild
+++ b/app-eselect/eselect-lcdfilter/eselect-lcdfilter-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
@@ -6,7 +6,7 @@ inherit vcs-snapshot readme.gentoo-r1
 
 DESCRIPTION="Eselect module to choose Freetype infinality-enhanced LCD filtering settings"
 HOMEPAGE="https://github.com/yngwin/eselect-lcdfilter"
-SRC_URI="${HOMEPAGE}/tarball/v${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/yngwin/eselect-lcdfilter/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-eselect/eselect-opencl/Manifest b/app-eselect/eselect-opencl/Manifest
index 052c4374965e..1335db3e48f9 100644
--- a/app-eselect/eselect-opencl/Manifest
+++ b/app-eselect/eselect-opencl/Manifest
@@ -5,5 +5,5 @@ DIST opencl11.zip 25496 BLAKE2B abd8aefddb31408e71e36b8610cde7b568debca99e99f310
 DIST opencl12.zip 33311 BLAKE2B 0f0c62856162ec1cfd42c1b53979079e0f8fd389fd2b3e05676e029705c29a65e3b84d6bc822aaedd9d15959bc07adfbd444aafb827f09f12b4dd625e868c902 SHA512 af7bb5865372a900a5b79086a54709abc99f6a3afe105adb6fdd276e30ef5c5be576421c206768e0b19e82f83e33727b6f246dfc71a0ee1d847e52d6db6130a8
 DIST opencl20.zip 34892 BLAKE2B a71a00a99825ebdde2ddba0c23de3af8880fb44ac235f399ed58936c9193ae79429219661daccac2d7d6daeb87c514308ec6b782db33899e60a2ae912d0876f7 SHA512 e4c6f68db91e0946de5a0f2aecd8fbc152f316350088a386cad9de37b377b6e8c362e93e3c2b09b3dce5f4659c753764ec8906b50a86a5107d2c29e6ffcfe71f
 DIST opencl21.zip 35514 BLAKE2B 21d23d9104712df47f7734b3c3b6f1669c88b5c75ca21fe6ad2ef21db83620c0585cc0b8d567d9fd7a755d579e7d291cf20577d025f857339ad191a1d65ee461 SHA512 2b6eafc26ff522407f06509197f5eefbb321806ac3f65bb881db4532da6c0e00b9c397468d55881578b116a1c8d05a0599f9f5727f62eb545394a2cecf5d95c0
-EBUILD eselect-opencl-1.1.0-r4.ebuild 2322 BLAKE2B d7604164a55bf3bf91569b96fc628603153e0a557d8bd1e42ba7e9134618af17a8387981673ce28cf40e76c7b86fd27ea0537932d314abe662f1013a4d49c567 SHA512 d45601f812aa4c4be5cd49308e118dbf9b5e44aff65dc31f08655985354cf42269a17866d0cc5df991206054a3db39dca38bbba5a0222fecef4df07c772bcbcf
+EBUILD eselect-opencl-1.1.0-r4.ebuild 2337 BLAKE2B c89cec3af142ddb03c07a6748ea19ec664ed806b56a2443aab342f7d741e443fc24609ed8a4366cbe316a55235f930e2e3c95ff425851eab6becaf07219fb7f5 SHA512 a57fe3cd2ba6798f015d4ee8e045f61e58cb48c66f044dad4c47bac3dac8bd0b23dbd4cdf53a9bb878f7aba80b3852454d879e3f57cdcf47719ff6c1304780b6
 MISC metadata.xml 411 BLAKE2B 8e2f9f95305134a1b09c18ced983fa2449d0c79a7b3d16993e28aeb70c4712d3f1650e85f40abd50a78f833af3b4f81ba4beccd9ffe91c739fcf9717bd02495f SHA512 7a2cbbea3ab5fbc33c2a8196c50949f5e7a207525d371447c1b44847081cd8a849b7e25034c759e738e9b3d252f13f07d2f730f38e5ce168da604c5fc4907c09
diff --git a/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild b/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild
index 8f2c592a733d..12f4b94628ce 100644
--- a/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild
+++ b/app-eselect/eselect-opencl/eselect-opencl-1.1.0-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=5
@@ -33,7 +33,9 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
-DEPEND="app-arch/xz-utils"
+DEPEND="
+	app-arch/unzip
+	app-arch/xz-utils"
 RDEPEND=">=app-admin/eselect-1.2.4"
 
 pkg_postinst() {
diff --git a/app-eselect/eselect-ruby/Manifest b/app-eselect/eselect-ruby/Manifest
index 243a3089213c..5172f1073671 100644
--- a/app-eselect/eselect-ruby/Manifest
+++ b/app-eselect/eselect-ruby/Manifest
@@ -1,5 +1,5 @@
 DIST ruby.eselect-20170723.xz 1972 BLAKE2B 338f9fbb81ebe3c0fdcab77ab12cabd6aa334ac3bf64352cd801c8088d7c3ac4c452e647addc98497d104df24f7934d8cdd8b0008e4f52fb27306a80411f793b SHA512 9c0614bc7e2ce9811466f257035d74622a96db8d44aa0908414fbac7d4142c34350257b08ace7371901e46cc0c9a38c3f2acae3caea4fb354ccc37b8c919b48f
 DIST ruby.eselect-20190121.xz 2000 BLAKE2B d04f9230e428526fb7ac7f6c274d7ac1b47af9f9bbb33cbfcec72cccdbe553db73a320e8a86190b88b4f9ee9c27fe0e5dabce1e1c5edfd4373d9a4bfcb457957 SHA512 aca2c46e39d3e0806a0ab942e8afe755992e5df98c50f4f2e012c93b8d6339e2a8400376e73187744a3d42a77725e03eed48b300f7d4d2da546a434184988f52
 EBUILD eselect-ruby-20170723.ebuild 694 BLAKE2B 39911fbeea55ce2f8058a6cb330771536fc5ce8f31b920427318535fe8a52f99e5ab814a971ab69813913e87af06c180ad94222c51134a18963af7ff8585d35b SHA512 4943aeb28e58116757bdde659c85d5654c3c190ec2916ff4a65163cf3f866755fd2fee1b6b2ccb2208335493bc88d66e2b1e0e437bfbfefd2741181ee7f16ae3
-EBUILD eselect-ruby-20190121.ebuild 700 BLAKE2B 9e675a98b9741206bd8e0271195b891b4528a2019ae9c0cf90eb87dda4493460f4bbc170a411eab313c971cd3c33a6dc38b3bd25ccfb95686cd5cb963de223b0 SHA512 37ac3c73d50358b8a85d05ade041e401844375d5bd2046eebf7f4d024c8e34a3a316972e7b86941ffb2b97a9f4ecf90c23d64e4ab18d3677b631679639a204af
+EBUILD eselect-ruby-20190121.ebuild 699 BLAKE2B 4696e6a1d9d8f3148934d38d8c75a75f518959d7fc6b74dc240e116b1cc6c14b652a3e3c53f2efc8a2d46b79bada6d1b09b82973a189210144f92aa7dfe44dee SHA512 dc6b3fc8195011bc865e46814d1c74ded0cde318f3e505ebcac6242429d8d90693c3ea2f6e6830ef6859fac5d7668d098c408844828d4a8b320c313788411a1b
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
index 909cc9af2512..065d3a8a77c3 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index ec6680101ed2..012b2cb5a4f7 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/lynis/Manifest b/app-forensics/lynis/Manifest
index 0d05256d230a..e45dab292d41 100644
--- a/app-forensics/lynis/Manifest
+++ b/app-forensics/lynis/Manifest
@@ -1,4 +1,4 @@
 AUX lynis.cron-new 72 BLAKE2B 1f2d683c74e9e85f142c23277f24e8c81b33e4d1691a6f171694194bd5d81a5e1473532afe2c6fca23c995d9c7bd08d18d6eed78a07661618c12e22b35e9ff81 SHA512 1cdaaee433912c2ccdec8ad7c9b88be55fe3f1d68e2fca79cc6e0e10112d465a70cfbe0a049623437f604bfc9793e0d29b709e035cbf710d4d38ba48acc5355f
-DIST lynis-2.7.3.tar.gz 282609 BLAKE2B 68dcb9d1fc9f81007c15a5f1074d9f42b6f558f7bc62dfba134adffb7b6d858604a10e188abea298eb51e82f8ec1ea5f270563d16a87a68de25dab8e13a1f1c1 SHA512 eb50d5d1769f0276a8383a5c6c664b390ced75248678edd80b00a7c344e8567d9c5fcc7a1f4a1a0e20a26c03bb3648d3b81f165266b3654e75bbec5061ab3837
-EBUILD lynis-2.7.3.ebuild 945 BLAKE2B 4c0a17b4a85bcbf375c6ec0c7dc7b38e2431529aa4e1faa96bd4efd2d6f1876f4f2b93545d2b0264ed6241f90507e286c8fbbb4e2542609dc19fa3cf89c9ac50 SHA512 dbb5cfde02f4904b44acbf5f0e59042371d65162ba44bdc30bddd50222ca4e51f9c2c638802c659303a9ddf6bebb76c24622ac856673afe74b8bff50da0b4b9d
+DIST lynis-2.7.5.tar.gz 288688 BLAKE2B e82dd67a49c234745e8af8faca9c4a9664568db9e6c9f9e33c1a3213582f2110a27109fa370642135bd3ec90fc9086314836cfe6d9712bedb110ef61e93aa115 SHA512 0ec814cb65252e3e8a44013ad0902e188a4825c521d47280586c0dd9924dfb7b79cce9797055ab7b7be59dacc111607d114175e0a793844227eadda76f68980b
+EBUILD lynis-2.7.5.ebuild 945 BLAKE2B 4c0a17b4a85bcbf375c6ec0c7dc7b38e2431529aa4e1faa96bd4efd2d6f1876f4f2b93545d2b0264ed6241f90507e286c8fbbb4e2542609dc19fa3cf89c9ac50 SHA512 dbb5cfde02f4904b44acbf5f0e59042371d65162ba44bdc30bddd50222ca4e51f9c2c638802c659303a9ddf6bebb76c24622ac856673afe74b8bff50da0b4b9d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-forensics/lynis/lynis-2.7.3.ebuild b/app-forensics/lynis/lynis-2.7.5.ebuild
index 1701f39cc6f0..1701f39cc6f0 100644
--- a/app-forensics/lynis/lynis-2.7.3.ebuild
+++ b/app-forensics/lynis/lynis-2.7.5.ebuild
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index edb30db19543..9c39700ecb77 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index 3c48624a82f8..b7b47c8c26ad 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -5,5 +5,5 @@ DIST librime-1.5.3.tar.gz 2847083 BLAKE2B 4ffb2c5ddaf52f9c9227fa4ea019ef2965e611
 EBUILD librime-1.2.9.ebuild 822 BLAKE2B efd4b54152a4251ddb8351e6be2387b3671227dd13500a670fb7ee0398e5a5a8a28543bdd29740cb617b911ab870e8fe29ef5abb00ed4400c57aa232379208a2 SHA512 2031060b96288f7e2e146d3f044369911ffb3f0a3df12016583a00f2d80c638fa39e4022ca0dd24da23defb93f63d2b0d06495305459f74db4aa38b28140d597
 EBUILD librime-1.3.1.ebuild 851 BLAKE2B 91a6651e7b7dc00faf653c4ed539174ce3c6efda8e4161c5edb23aeeefbd574f3c8874a7c1ff2a89ab80b9bd61276c810fb9f8ae7a501255b01d51453468a868 SHA512 2048f949b95239924ea40515fdfd7158912b3cae0a158b69031e7f388ed5633c21cb3d9a3ce1d23802c9cf5808db2cf90c7c41f83357962a998535e1c710aabb
 EBUILD librime-1.4.0.ebuild 839 BLAKE2B cccdb15cf60fa3cdb163e0e02210e84855c52d3f8fde58c6ecee1645ff90a0d3711474a088ac9292b56d5b2426f911713a36c0ca5afc1a22f9be72ebf4856467 SHA512 c63a7fd8f6dfb89fcb4566f63efccda29c962e9679aeaa384685822da9f7586ef1e96e04c024bf1c4737e620a18dcd99754ce5d0e41de5b62a60ff77fad71b98
-EBUILD librime-1.5.3.ebuild 1431 BLAKE2B ba8f6993ea9fc606c2d48d3644049604ca3769bbb1be8bad44e0e5222253b20ea99cffe22a9d826e83fee2935c422478a8e219888a39c96a8b50637463e876cc SHA512 8df0bdfe9e473bc1ad1640a210c7fc467a7c813b69aba47d9d16dce46f4ee70c3a63af56a64fb6886fb4134e23ab948f784560d5983334ad5e1b386989e9ff6a
+EBUILD librime-1.5.3.ebuild 1438 BLAKE2B b2d55ef42b789ca4a8c3689faddd1eb8d882ba5bcc82a99b89dba339b482a9ab04e24714959c269f364682b6791795c6676dd87cb015e459c63c9bfdf6cc92b5 SHA512 a69aacb796c2822628e2874f6e80283ce8f169a17637e0e69a3e2a5d43676e7aa0933d3a1dcc58a6d36aaa5c11dab2ce06c6d08dfba5a0c8f1e6008169ae4bd7
 MISC metadata.xml 532 BLAKE2B 200096c7c818b877dd156ab1456309ae4e42a8bf78075d8aeee30a79f09bbf57c6053a41369102becf87aaf3ea4481a0bf6edf1dee258f650661b61c65a9aaee SHA512 83904c4885a57569f4e74483bd5efed886ca1fd6708c1e7146ce4893bcbdd66efa82dfd4e563c7b888603e23566de21e928772a597dd2e6fc75d00793c788800
diff --git a/app-i18n/librime/librime-1.5.3.ebuild b/app-i18n/librime/librime-1.5.3.ebuild
index 0a8bfd8b1370..dbc7f5894fe3 100644
--- a/app-i18n/librime/librime-1.5.3.ebuild
+++ b/app-i18n/librime/librime-1.5.3.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 0155510e9c1d..e09fc305ccf0 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,6 +1,6 @@
 AUX opencc-stop-copy.patch 625 BLAKE2B ab2f98a03bb079ad116994c4d05e59e3638f648b3e03ea4e6a357a8658612a1425f2578989c0086e31d749e3533ffb814457071582f9fbf3fbcdf0d184892940 SHA512 e34388bc5d1841e3655c6209e31cf18957a9a02f23d49d9b1f184e48005cf5d5c108656439900f0d79fc1801700872a433ab761154abc424b717e12a616487ca
 AUX opencc-test.patch 202 BLAKE2B 1dd3bc35c1f8644cd4f27ce8a5b5dea3b0ef2750612f112d7dc6de658634ad5151972b80c7b2ede9f41ea98ac7a2d29eaeb961132c862f66dd160dc2dd522a6d SHA512 5318058587b41fb7021ffce64d4b999b1beed294ce4c00137fb4b0396dd2cb471af789bceb8a8076b1d4ec2226d3c3fdf8b3d3d6a1f5d80936cf2407b8bdd3ec
 DIST opencc-1.0.5.tar.gz 1598354 BLAKE2B a66b32b96dab543d8401960ff0548a4e3f9414606513941426eacf105bca0755a7b364c68b7eb996ef82444e52f849d2f8151353a14fb97a358ad1463fbea2d3 SHA512 3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1
-EBUILD opencc-1.0.5.ebuild 993 BLAKE2B 2127a2973d73918f2df868f650319d26c005f79c16cd54180ff5ec5b6925dd6275909156c0da8b2b9c9c5cedf01cc431fc23f5f0d877e4e2f7d3230a6bc4025a SHA512 a1844ad4b0e9ac7ca466a5a1ff0409ea265d173292e28237584ed426c6952ba588a0a19598367906bc72470233323e97e9c3f48e86772f0e4d172cef2b332cb3
+EBUILD opencc-1.0.5.ebuild 1000 BLAKE2B 7680289a8d13f050034163b2c45e94b9e6ee243f0a2f0949eebade656a9c13b09168754471a467e03ecff927dcbb53c8fe8247e33765b7675beefdab64eaf583 SHA512 941410924a58356ba4a243171b5db5d50318ecea60441a098150df1469aa1b43510406d482d6fe9c9b26cab6cfe1bf55b29a8b06b3b503e601e174831cf368a9
 EBUILD opencc-9999.ebuild 962 BLAKE2B 030f0cffd01ec8ebd917e2803d4222a7b365707fb2b5a18ccf4c61e6615522cc61c67f4a65eb2b01bcbfba56a4bf86e633d41fb1cbca620b9285c9c32c54d1db SHA512 1509dc3acde4d1d54ec538e6fad7b4310e0f0ce1616114f6200b6edfa7239e035483b03fe9ca033b3113cbf2d037ba272154181a754a34efe7a164e9b22363fe
 MISC metadata.xml 491 BLAKE2B ec523a795afb6ae99cc5835e3df9fe07916aac4bf8552254f3bacbb9e1764a3ba5a79eddcabd8f34417544709a10a0bd34e6133a01b9b7a15156a9d282316d86 SHA512 303cf35b932c5d5a1fdd1a25b2c71a65a4aab761fe3c66d72439d691255a5edd1b943287afe8b4c53ab62531a012dafb5f416471a172f5b487557684dc6655df
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
index 309ec8cea25f..763dbae7aee3 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/BYVoid/OpenCC"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm64 hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 hppa ppc ppc64 ~sparc x86"
 IUSE="doc test"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/app-i18n/rime-data/Manifest b/app-i18n/rime-data/Manifest
index 06b4c6c55ea1..d45e1a6a3b1b 100644
--- a/app-i18n/rime-data/Manifest
+++ b/app-i18n/rime-data/Manifest
@@ -1,5 +1,5 @@
 DIST brise-0.35.tar.gz 6707277 BLAKE2B 610ea2e58800676b88bc79ce7075ed5fa8ec041f2ee34e3dfbcbfa642f84413d8b188af8e49de56d815eac2e5188d18287749976aa4e28ba5c7c7dfc6dece30a SHA512 1a2a3ddba9be7089a1b82ce446a3e5dc93a13fff121f861aa1acbdea950f490c9367866902a056296e17de5076a59a54741ceb3a59a9c0ec58b6b7c54f519f3d
 DIST brise-0.38.20180515.tar.gz 7116807 BLAKE2B abf73b5813b18f4cd3ef68b3f6e8ad2c54ac90a0969a57e7786b53b99c162efeea9e82d962b3e8d7b8b1742852beb5d0eb4b07de65bdc1881c43388de552ee4a SHA512 60b3d37486b6858114036664327c9be00d09d3f7d3f5aaf337c6bc5a46134e5785fc1732db5aad15e1e628241a70c9c34b03f982fb13cae6d91220731b451bb9
 EBUILD rime-data-0.35.ebuild 558 BLAKE2B ea665052bd0668d772e2c556b7ffa9784eb1d89d8aa082deab295f8cea5c1b65597e5390a9a96aaeeca1cf5c2891270454f9ba35867fdd91da220c75dd561e9f SHA512 fa661b513b6a36e180d791230f293f950f4274f7349500d871df325fe995967e993bcee9e6569e76ba604efb3a2b46bac72503117c16c0a6e2e75bc134b8779b
-EBUILD rime-data-0.38.20180515.ebuild 675 BLAKE2B b0bc6ff6e9351382e5883c3968d7dd197a353fc62a522e30e90908b08d520d29b54b2268126cd5dd661e4b3654aa9949d75211d4d8831feb3d4b7499b72f9169 SHA512 e6a0b43c0ed183c461f7ec8343f772853559b5d2e36d8f38c1a3c85981e1dada23d84145a9368849d3bc597bc8fdbbece854496434d71e0c6c688ba08d21d37f
+EBUILD rime-data-0.38.20180515.ebuild 682 BLAKE2B 435aae8b6cefb4b220b227e24dafd5e93e32268011c19a660fb79d005659343dd3d4ca06727028928f02f3c45251c51feb2506e36e2474e9efd05debdd634db7 SHA512 8a1c2c2a1c863aa1b3d5199f3360a55ca8cb3b027776ac4fa0eeca994fafb25ecc04f48a1efc9203cc0105a4cdaa4fa6a7f3e0fb3a81df1d9ebef7f591e553fb
 MISC metadata.xml 600 BLAKE2B 3c4ba0371ca7088b9142f7fdad617c1b149cf7d5e6b9f93a5a4f12af1de4d276e3973a8092450bcc86e1acab4389d04f6a1ec9ee5cf599b7b7c1ee43cb0064bb SHA512 759252765da22d73f9e907c0095d7e60fa73aac194929da36757eab25ecb57311381459c444345eb4da5305ea15ba5ee5b89d458f39101ad887d5d9766282723
diff --git a/app-i18n/rime-data/rime-data-0.38.20180515.ebuild b/app-i18n/rime-data/rime-data-0.38.20180515.ebuild
index 5a80e686b286..447f4f4da0f1 100644
--- a/app-i18n/rime-data/rime-data-0.38.20180515.ebuild
+++ b/app-i18n/rime-data/rime-data-0.38.20180515.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rime/${MY_PN}/releases/download/${MY_P%.*}/${MY_P}.t
 
 LICENSE="GPL-3 LGPL-3 extra? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~sparc x86"
 IUSE="extra"
 
 DEPEND="app-i18n/librime"
diff --git a/app-i18n/tegaki-zinnia-japanese/Manifest b/app-i18n/tegaki-zinnia-japanese/Manifest
index 919bc2c2c75a..fb20fbf00c8f 100644
--- a/app-i18n/tegaki-zinnia-japanese/Manifest
+++ b/app-i18n/tegaki-zinnia-japanese/Manifest
@@ -1,3 +1,3 @@
 DIST tegaki-zinnia-japanese-0.3.zip 18134281 BLAKE2B 006fb90656444afb2ca824a534947f1ba16502cba8035977b93150ae242e476170eebfc02d069f04d3fbda24773a602f69bea91eb88019cfe58ab71171b19331 SHA512 fd11f94c8b5446ca22e1119ead20da9ebc01e8033beef664d94c0affc8cef6e315344c4d5e61288358bf7ff4f7c49135dcf5743c4070573f7d8e45e70abba113
-EBUILD tegaki-zinnia-japanese-0.3.ebuild 517 BLAKE2B 76fc71caa1044e4d93ffefb1bb36b08063209dc64a0d941e1c57a458d8d4008562c6932eb17fc0162e15850abc183e77a83b89660688475e94f8218ece978003 SHA512 8318cc5090f3da7a1358a3e0ecc3e34ecaec42392c758a48b027d89714d4ae98e59724a177a6cc00c278d28c4abb21fa30ab4ff4c4a3d70a91013da1ba1d6e93
+EBUILD tegaki-zinnia-japanese-0.3.ebuild 528 BLAKE2B bbf8df505535faab5eaed009870ec02a68a21f78aca9fa022eeda589704cb559000424f5df212b8a37614db2553045c6282191cb1c3a3985b8f9a35ea1a4a843 SHA512 9cbe62a3f4051fbb28633a8aa4d7741e7a248042b717d4d67a1ea91e6cb8c67a6d144116a57a408e63d4081e6f3f4f9ff899ea0de5f997598a137763f945e103
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild b/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild
index 3cf54ff01940..e760325c474d 100644
--- a/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild
+++ b/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-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=5
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
-DEPEND=""
+DEPEND="app-arch/unzip"
 RDEPEND=""
 
 src_prepare() {
diff --git a/app-i18n/tomoe/Manifest b/app-i18n/tomoe/Manifest
index 31f5a0c4edd5..396966c6de95 100644
--- a/app-i18n/tomoe/Manifest
+++ b/app-i18n/tomoe/Manifest
@@ -3,5 +3,5 @@ AUX tomoe-gentoo.patch 599 BLAKE2B d297c41007f17ac07f6a80fb451c2d605ebf275b64af9
 AUX tomoe-glib-2.32.patch 688 BLAKE2B 5aeb0fa73f54331e20d8a3cd360a4e7c06e770f988686bd3ddd055b49390abd1c064a9369d89c7a4f6cd6c9631a075ba56857b0db54befeace96c233cf9e7947 SHA512 ec0344ccb48ecc8f0df3a76424ed93c9e223a3b22733626a460c4729681d7f9f072ddb84311d22e161c04503dd845c7da774ea9832df32cb79199ca47589073c
 AUX tomoe-ruby19.patch 2646 BLAKE2B 7b2289af7e87946bb9c4cb197b493bc2b8625a3bc3f22ee42270a403bd36b1bee4efcbb46117f11d537e3c8a38dfbcfca6484c0a1db6ec2f0b7a5469dac35b47 SHA512 52f555412853c3485e8d3ab7b7739f030e2c3d2b5c4aac14ebb967c93427fe04cbcfec2f5997f09f0f7611dc268ee63437b256ef4cac1ea805f0ae84a522b836
 DIST tomoe-0.6.0.tar.gz 4918949 BLAKE2B c9f4accc77fe7c6214c4d19dbbac7d0d39ed7947588ab1b8a1416f6cfeda33a6cfa84352f888d02848c8e2026bd5c36d2fe52d099bda6ca41a6d215733b11aa3 SHA512 eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8
-EBUILD tomoe-0.6.0-r3.ebuild 2150 BLAKE2B fa5f42f2a047ee577512ff51097656c79c2926875320e98c981e68865ef5f17089a75e1277185d52b4669c14a1def3481ba1ed18780209c7aa4f12da63b0e4e1 SHA512 adc75c0753b7ace8ae234e71203e78229372b1a7566be1354354137fa9852cd24849bfbd9e6bf83e1a9ab12d339654fe1862c592a6adaf404dc63d1c9894019d
+EBUILD tomoe-0.6.0-r4.ebuild 2154 BLAKE2B 1b984a191a6a5cc25fc07f7a3ecd15b2135beb0b9402d953d7ee107d7ecafc3f7a346b993f2bfc9b5e4159f5ce61546d5dc916c701042e324963397df2868c4b SHA512 a1846c1c877e0d2dd1ec1c8320b156242a94ccf78a62c33b01f80e7832bfc22cc757ac75a32959f15ba3ea5e9ffbab043d5ef9148df5877edae948215784adbf
 MISC metadata.xml 482 BLAKE2B 454f6c496dda5f9ca738bb81c843a650be203b58bbaf4f0775204be463de6eccdd11023705295e89d1cc8513eead67dbe1fb26740bdc39216e8e2d4ee838e8ca SHA512 0898e0ba0bd42458870d268ee6bc881da1c88ab01969037d57f0d4abf5f140a7ce77bf87d918976bd763a33c8869e73d0fb2ec744be747d5bc30d594cc54efeb
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
deleted file mode 100644
index 9a406e4444a8..000000000000
--- a/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby24"
-
-inherit autotools python-single-r1 ruby-single
-
-DESCRIPTION="Japanese handwriting recognition engine"
-HOMEPAGE="http://tomoe.osdn.jp/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="hyperestraier mysql python ruby ${USE_RUBY//ruby/ruby_targets_ruby} static-libs subversion"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
-
-_ruby_set_globals() {
-	local ruby
-	for ruby in ${USE_RUBY}; do
-		RUBY_USEDEP="${RUBY_USEDEP}ruby_targets_${ruby}?,"
-	done
-	RUBY_USEDEP="${RUBY_USEDEP%,}"
-}
-_ruby_set_globals
-unset -f _ruby_set_globals
-
-RDEPEND="dev-libs/glib:2
-	hyperestraier? ( app-text/hyperestraier )
-	mysql? ( virtual/libmysqlclient )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-	)
-	ruby? (
-		${RUBY_DEPS}
-		dev-ruby/ruby-glib2[${RUBY_USEDEP}]
-	)
-	subversion? ( dev-vcs/subversion )"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-export-symbols.patch
-	"${FILESDIR}"/${PN}-glib-2.32.patch
-	"${FILESDIR}"/${PN}-ruby19.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e "s/use_est=yes/use_est=$(usex hyperestraier)/" \
-		-e "s/use_mysql=yes/use_mysql=$(usex mysql)/" \
-		configure.ac
-
-	sed -i "s/use_svn=yes/use_svn=$(usex subversion)/" macros/svn.m4
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ruby
-	for ruby in ${RUBY_TARGETS_PREFERENCE}; do
-		if use ruby_targets_${ruby}; then
-			break
-		fi
-	done
-
-	econf \
-		$(use_enable ruby dict-ruby) \
-		$(use_enable static-libs static) \
-		$(use_with python python "") \
-		$(use_with ruby ruby "$(type -p ${ruby})") \
-		--with-svn-include="${EPREFIX}"/usr/include \
-		--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r4.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r4.ebuild
new file mode 100644
index 000000000000..89645ad03b59
--- /dev/null
+++ b/app-i18n/tomoe/tomoe-0.6.0-r4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby24"
+
+inherit autotools python-single-r1 ruby-single
+
+DESCRIPTION="Japanese handwriting recognition engine"
+HOMEPAGE="http://tomoe.osdn.jp/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="hyperestraier mysql python ruby ${USE_RUBY//ruby/ruby_targets_ruby} static-libs subversion"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
+
+_ruby_set_globals() {
+	local ruby
+	for ruby in ${USE_RUBY}; do
+		RUBY_USEDEP="${RUBY_USEDEP}ruby_targets_${ruby}?,"
+	done
+	RUBY_USEDEP="${RUBY_USEDEP%,}"
+}
+_ruby_set_globals
+unset -f _ruby_set_globals
+
+RDEPEND="dev-libs/glib:2
+	hyperestraier? ( app-text/hyperestraier )
+	mysql? ( dev-db/mysql-connector-c:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)
+	ruby? (
+		${RUBY_DEPS}
+		dev-ruby/ruby-glib2[${RUBY_USEDEP}]
+	)
+	subversion? ( dev-vcs/subversion )"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-export-symbols.patch
+	"${FILESDIR}"/${PN}-glib-2.32.patch
+	"${FILESDIR}"/${PN}-ruby19.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e "s/use_est=yes/use_est=$(usex hyperestraier)/" \
+		-e "s/use_mysql=yes/use_mysql=$(usex mysql)/" \
+		configure.ac
+
+	sed -i "s/use_svn=yes/use_svn=$(usex subversion)/" macros/svn.m4
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ruby
+	for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+		if use ruby_targets_${ruby}; then
+			break
+		fi
+	done
+
+	econf \
+		$(use_enable ruby dict-ruby) \
+		$(use_enable static-libs static) \
+		$(use_with python python "") \
+		$(use_with ruby ruby "$(type -p ${ruby})") \
+		--with-svn-include="${EPREFIX}"/usr/include \
+		--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 92e5b9aa95f7..e1b0079c989a 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/dispad/Manifest b/app-laptop/dispad/Manifest
index 6b0099b9a59f..d31624c7ad13 100644
--- a/app-laptop/dispad/Manifest
+++ b/app-laptop/dispad/Manifest
@@ -1,3 +1,3 @@
 DIST dispad-0.3.1.tar.gz 97952 BLAKE2B 87c9866a396e9319aca5b4b68db6be4f937412e09b444736fd27e0a0150b7a19c56b87b60fda83881b902dfba042ca3cede18226562996912d20147ad8e4069e SHA512 fa9666e79de31f79f3567ae3b529c6df3cf56c134c1fe30d62b7d863d623c89abd6b1153de972507a3795c20001f11caf1e49926a402d145a048014aa97cd400
 EBUILD dispad-0.3.1-r1.ebuild 544 BLAKE2B 7c1c1ce89f41c23600d6fdfbdcde87af7576264f85d38a9bbec842f75a5538624d4e79f35b987df3e3ce1126e5ce573b303c7773e98d0fb7d8649e2cf25bbab4 SHA512 96160ed2accfa8c27f1974ad97dcd8474c112fda2590fd37506730396fc5fd50c50f54dacad848509e4882fc8db52f81b2bc0c251a1f720b9f62c07e38bb9bc9
-MISC metadata.xml 311 BLAKE2B f8f66bf0e47dd752b5ea040471d4f4ac065b6ecd0c11d371f3bd2b3240cf7dbd3b786e905a97f440c47a2f387bdfdc316e68b5993342ad1a7b04aa595173270e SHA512 7a28487c5bcdd8518abf28120e0f060c7b1c12d25c98759dd0d7254ae6c10ba0e7276cd240627aac07b5e462fa29ba2b8681f4cdb78cf8a465c6c928961293f1
+MISC metadata.xml 255 BLAKE2B 5cc062d128397d01917270f2012cdb2529943b52bd4bdf3a3d4e470bb6f4f5eb0f01d2cc67b12ffd45f31af7bf423ca34efa2ba0fc94989b33ade10371a0acc3 SHA512 f24a2027e2e4ec06bdd745e8632dd657fc32cc066113bd3e3810bbd7cf2bffa41f20a78b7d279d245e463e4f37af0880465f8be7079b9e61727d306958c730a8
diff --git a/app-laptop/dispad/metadata.xml b/app-laptop/dispad/metadata.xml
index 9e74a51079ce..f7c81b34e092 100644
--- a/app-laptop/dispad/metadata.xml
+++ b/app-laptop/dispad/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jsbronder@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">BlueDragonX/dispad</remote-id>
   </upstream>
diff --git a/app-laptop/msi-keyboard/Manifest b/app-laptop/msi-keyboard/Manifest
new file mode 100644
index 000000000000..4f02fc0ce730
--- /dev/null
+++ b/app-laptop/msi-keyboard/Manifest
@@ -0,0 +1,4 @@
+AUX msi-keyboard-1.0-makefile.patch 506 BLAKE2B 43d593b380383db71fd02b0a8c6378c76b614f90122744d2d776c69f1d16f105de6320a171820f4a19a5b41e61ebe71e501fa8e53e8b058c3424b9702c1a6eae SHA512 2c75593ad02c59950b341d95da5b7d6385614cae8d25519eb2f01ee7b0ca76b88bee5dccef9f34efc0ba496e5052f04aac6b58735446404ce28546d8ddf8c238
+DIST msi-keyboard-1.0.tar.gz 15182 BLAKE2B 4c084e1522da926e541b18d0e59044aeb83873516b3ec5b5bd980883b923acee21842c3612910d84008f66556b6c9e2f9d0c7e588f6aecf242a0e54d72e9c3a3 SHA512 542f74b8eb77db4ef0b26fc5c671bc7446d37b88e13855927d5cdd68c688f933e46b5a377d0f5ec496c1e35694789ae82694d31fc70f04d5059fe60f2ea9d24a
+EBUILD msi-keyboard-1.0.ebuild 532 BLAKE2B abd05b50043a59bfc77f56ace32f05766668faaa875ee1fae6950d18872e2d5d1d8ecb1f480318f199bbc452446ee5ab275c864cb74b657c57541a1342ea46df SHA512 e1da804f019d48395724fda98a2dd3621c00efe4315e0d1802588e29aabb5657766ffefff186c7b2ca68c6eaba5597788fe7bff8763907bbad5ee84fd2d084e4
+MISC metadata.xml 341 BLAKE2B 6a76dc7caa6869f96d10087412f04b6e951af45125bccb7e8fe96a634d649339f71cab41e384cab224285e8b7433b68256cb43ae1a15af335d6dbf51b1365cf6 SHA512 04a91fcb9f8d5b46fa91a2a777839a6cb12df692866114529344c5f017de0a460dde4a88cfdf3572e7d60c06e9b2b45f2a5b373be5c5d898d4e69cedc4597729
diff --git a/app-laptop/msi-keyboard/files/msi-keyboard-1.0-makefile.patch b/app-laptop/msi-keyboard/files/msi-keyboard-1.0-makefile.patch
new file mode 100644
index 000000000000..08cdaa79e235
--- /dev/null
+++ b/app-laptop/msi-keyboard/files/msi-keyboard-1.0-makefile.patch
@@ -0,0 +1,20 @@
+--- a/Makefile	2019-08-19 22:40:43.258528097 +0200
++++ b/Makefile	2019-08-19 23:00:30.786462412 +0200
+@@ -1,6 +1,4 @@
+ CC=g++
+-CFLAGS=-c -Wall
+-LDFLAGS=-lhidapi-libusb
+ SOURCES=main.cpp Keyboard.cpp Color.cpp
+ OBJECTS=$(SOURCES:.cpp=.o)
+ EXECUTABLE=msi-keyboard
+@@ -11,8 +9,7 @@
+ 	rm $(OBJECTS) $(EXECUTABLE)
+ 
+ $(EXECUTABLE): $(OBJECTS)
+-	$(CC) $(LDFLAGS) $(OBJECTS) -o $@
++	$(CC) $(CFLAGS) -lhidapi-libusb $(LDFLAGS) $(OBJECTS) -o $@
+ 
+ .cpp.o:
+-	$(CC) $(CFLAGS) $< -o $@
+-
++	$(CC) $(CFLAGS) -c $< -o $@
diff --git a/app-laptop/msi-keyboard/metadata.xml b/app-laptop/msi-keyboard/metadata.xml
new file mode 100644
index 000000000000..5c41b33f0a4b
--- /dev/null
+++ b/app-laptop/msi-keyboard/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>zohran.londais@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-laptop/msi-keyboard/msi-keyboard-1.0.ebuild b/app-laptop/msi-keyboard/msi-keyboard-1.0.ebuild
new file mode 100644
index 000000000000..7e074cc86a8a
--- /dev/null
+++ b/app-laptop/msi-keyboard/msi-keyboard-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
+
+inherit udev
+
+DESCRIPTION="Control backlight of MSI laptop keyboards"
+HOMEPAGE="https://github.com/makkarpov/msi-keyboard"
+SRC_URI="https://github.com/makkarpov/msi-keyboard/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/hidapi"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+)
+
+src_install() {
+	udev_dorules 99-msi-keyboard.rules
+	udev_reload
+	dobin msi-keyboard
+}
diff --git a/app-laptop/tp_smapi/Manifest b/app-laptop/tp_smapi/Manifest
index 96c201fbf854..762984fc9a60 100644
--- a/app-laptop/tp_smapi/Manifest
+++ b/app-laptop/tp_smapi/Manifest
@@ -1,5 +1,5 @@
 AUX tp_smapi-0.40-confd 785 BLAKE2B da1e2a5ce6e441eebf1a3dffcce8a863688a525f6ee4c29537b1783e3283c5a0311e4317617cff4be8c35246accf69738778c6c34e4d2af77a18f23a1e84b363 SHA512 a08f0b15ea37f79e1a8b41b3a3a59421dcf26e482d2eaa269e7c3f728c142e68e8c130c8a53f4c14829436a20e1354318464de780d9fbe10777d7929d7944dca
 AUX tp_smapi-0.40-initd 1851 BLAKE2B 852fc13e2d74a570918c451966214ed8ca3daea9bdb66e856f48554261f4cafc8d8be7b76889a6a639f0dc1310d34036131a9982be0cdcf0e458707e7938b161 SHA512 ebf8ac628e00979f21e266fb6d187f02bfeeafc9482a0c5bed4fd4f092c7a27158747ccf629c802969ad2a8f13124276ef889927b3f1f01a7ce44fdcde103698
 DIST tp_smapi-0.43.tgz 40122 BLAKE2B e14caa05d741d14b03c56c57badc5900a47735bc58966b5195ca34269a6227ecc50518ee5ce8cf47a4aacb314a0ed0332b987098f3be024b6af9024df6efdf9b SHA512 ec2e40a248e7eb5bff2ad9e57087058a8b4706d564bd340daba5a4700ad8a5389d1f9ec29984516a1167827ae55c28240dafb558df29e1f758a4f7af80caa1e7
-EBUILD tp_smapi-0.43.ebuild 1944 BLAKE2B 3b3f22e120dd21aac4805b06bdfdf6f6630373259a7a7fa1d0212474215118eb3b224b00b9cc55442a385131955d2a99cbba75d3b6c61539ccce9425f25e8e62 SHA512 76475b674d23283105ca9afc2b8c9d94d9f698db3aba508147805a9869846e3f1daecb4e8052bda7edc664f157dab731edaf1c4c43382ee1461855869993ec67
+EBUILD tp_smapi-0.43.ebuild 1970 BLAKE2B edbd3c305f952aaab0aad6a50b62135479282c046283365013c094136e608ecb8b80c6c494a8e363f7f5aaf04eb6ef4644c050c7aed1461bb9d72c46e639f08a SHA512 8642f737fd602dc4a7024bb98c4ccfe4a0c87984d4fd97a42f18018de8139d2db3fc143f3a8fec3c0a8cb7fa131c4ad5a835618062e36d19b285ff093df24046
 MISC metadata.xml 473 BLAKE2B 9d19f4112fc0ac3e045c2d92e510bec52bbfbcd9bbca442d856598cc95f546592c4661b317215d35a6540a14e4bf68b3b826baa8c434a170e9841fce3706cc99 SHA512 21ce54c4cd204ddea9f1170f8e1b66e636bb2b541856ff541371bd572403519a09cf2367f5642a596684d66145bc9ab92396b102ef51086f2d22f96fc6c0b7af
diff --git a/app-laptop/tp_smapi/tp_smapi-0.43.ebuild b/app-laptop/tp_smapi/tp_smapi-0.43.ebuild
index 8a841c5e15ac..99b675c4c0f3 100644
--- a/app-laptop/tp_smapi/tp_smapi-0.43.ebuild
+++ b/app-laptop/tp_smapi/tp_smapi-0.43.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit flag-o-matic linux-mod
 
 DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
-HOMEPAGE="https://github.com/evgeni/${PN}"
-SRC_URI="${HOMEPAGE}/releases/download/tp-smapi/${PV}/${P}.tgz"
+HOMEPAGE="https://github.com/evgeni/tp_smapi"
+SRC_URI="https://github.com/evgeni/tp_smapi/releases/download/tp-smapi/${PV}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-leechcraft/Manifest.gz b/app-leechcraft/Manifest.gz
index 1125b3659e3a..ba48c3b9adaf 100644
--- a/app-leechcraft/Manifest.gz
+++ b/app-leechcraft/Manifest.gz
diff --git a/app-leechcraft/liblaretz/Manifest b/app-leechcraft/liblaretz/Manifest
index 45183e254c7f..e9e445d251fe 100644
--- a/app-leechcraft/liblaretz/Manifest
+++ b/app-leechcraft/liblaretz/Manifest
@@ -1,4 +1,6 @@
 DIST liblaretz-0.1.0.tar.gz 11783 BLAKE2B 5ab0aa23fbf7d6840e53663df7963258399388f414faa3a380ff1822173f6b0f130a5f0d9b07aead08a85f2b1688138abd5a2d2bc3f224a60ed942b91b797d49 SHA512 869361667c4872e694a875655dd33744925b6dab13977b9b93b87de52c8290f59206afc1ee711941dc698a12fd4ea38fae4f1bda6aaa750dd275dd2b1c8a0a53
+DIST liblaretz-0.1.2.tar.gz 11951 BLAKE2B 87d5e9297b6fa73185a9c3555d408eafb9383d0b8361bb229848ef168a2af54dedafcd27cbfbd826d3ee432b701ed0150aa4b186eb86f02c8a145e1b9111b0c0 SHA512 d0966b5c503ed4741da6bcf57a28cd36bb6466d16f83d4276e4055b0fcf66fac58627309cbe2218ee0b8aeb7f30bfb018d58d81a87ff3dbb3c158cc7589ee484
 EBUILD liblaretz-0.1.0.ebuild 504 BLAKE2B 618bbb00c345a1a4273e4e5465a9dd23436ec8932f5f3a15acfb70b08f75dd09dd5e232a4a6d3797b2cb30eb6c02da7b7c7d9df0bfde5f09086fc2df1f3c0b24 SHA512 2d9e11b98358356179993f009737d361efec644664875018583be6587703946bb201f85ea7c4a52315ecb96d6f2571fd4856755aced197c8bb44f65487dc4b66
+EBUILD liblaretz-0.1.2.ebuild 505 BLAKE2B 95138dc1fd7bd898ef721def6b72652da5c5ea739744e048ba3c8bf17fa0b8518b9c408e7eb7cb6f743d49ea79e720d8860f717d97c7859d612e970f6fc7e16e SHA512 b8f0e8ea83f9f461d8423b10f598cb10f842d0fce377717fe238c0a1983ccbecc7333fc761c5b5883d288fc792b5fdca95b5eaaba973753c16c68ddf8b3caf55
 EBUILD liblaretz-9999.ebuild 465 BLAKE2B 2561d5bd7966e72bdcdb0348d1a55736d7d06bd5ff7ba84d925c6f86431588015f9bcba87f76aeffc6d25b0261260075441e8df96afabfed99b0119c93dfab61 SHA512 4f09faf7df589ab7c8a338e87e29645c5d65af565e27aa7c66bf61abd99f15a6a709752f57a64cb8b97df6eb093352a31c73c1029147883b8953f1c4f052e8f4
 MISC metadata.xml 446 BLAKE2B 2a7957b76ffd001b00578f63311e7bf47e578988e93e155672b147a5da93a68abec776c21a9a2889d80aab8c5255acc0cf9371d1a6bb3bb617b669173a179fa7 SHA512 2f9e6253191bd50ed94c981934f3a736c7397be9ddff0120ba8c140c0683c8f22af72fc6229b7e62a34730cfaa3e4970fe80b3459ebb5f46e78e839815d46e00
diff --git a/app-leechcraft/liblaretz/liblaretz-0.1.2.ebuild b/app-leechcraft/liblaretz/liblaretz-0.1.2.ebuild
new file mode 100644
index 000000000000..5bed8dd43ffc
--- /dev/null
+++ b/app-leechcraft/liblaretz/liblaretz-0.1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Shared library to be used by the Laretz sync server and its clients"
+HOMEPAGE="https://leechcraft.org"
+SRC_URI="https://github.com/0xd34df00d/${PN#lib}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+inherit cmake-utils
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/boost:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN#lib}-${PV}"
+CMAKE_USE_DIR="${S}"/src/lib
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index f7ca91c28fce..d41ad6484046 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/alertmanager/Manifest b/app-metrics/alertmanager/Manifest
index e32e724848aa..1cc550bdfe55 100644
--- a/app-metrics/alertmanager/Manifest
+++ b/app-metrics/alertmanager/Manifest
@@ -1,9 +1,7 @@
 AUX alertmanager.confd 135 BLAKE2B 7a3dd341e63a73e9782d44dc59c8a65ea1c855ae0589ce80e616be6d8faf24224f804c564296955487760c155649c184b3132a2741cf30d171c88dcfdd469583 SHA512 391eb26d67310fba9371d274b1e9552cf0c9c02de1e3616c3e5514ae99bf7d36b52c6caa7e94a96f640b0f8542b15b4dded9d59154173c01d4e9a99ec2219fbc
 AUX alertmanager.initd 817 BLAKE2B 74a7e6c292ac52f4d6d00644038e74624be41ed632a6db389a7c226b3a37d43f22f1c8c098d34f652d9b6b9cb407523b375c884e75fe3740578f26e822df21c7 SHA512 34ae9348f5e054543bdbffd29e30d1fb6147d47e74cecb1755c29bf4327bd56ac4fae4cecddf2c515b6ddffbce4ad7151ae3a3e7f283db2d6b74619f5faa44ac
-DIST alertmanager-0.16.2.tar.gz 3616125 BLAKE2B f7ab0dc0b4ae08527d02643facb1e0192215b64b80120e2ca0b203af2ae21b2ba9d247a037b36e96be841f39f170964e6f27e07b65003b610c04a25d1e30f3c3 SHA512 94012739c5c9691ff34bb521e220e00de13ef866451ffaaa8d45f85c228c6b515a84550a819b351db36e3da7c17a0fa397b5b1c6a4cbc3451442f5064a0184a3
-DIST alertmanager-0.17.0.tar.gz 5118311 BLAKE2B 351a47ebc0545767f9da6fdb1e276da022d6b12e424d7edc5fb471505f777f0bb403e06ff3a9b5e4817d7f612dfabb477d39c09a8e129a93e0dbcd094c082fbe SHA512 7cca7400640030caa44f713bda163dd142ad95e5b6b26d1976564fbc0b0888f26646b75c6bb4b6cc7405fa41bed9c727fca475245a170989c61b3b61cb797299
 DIST alertmanager-0.18.0.tar.gz 5181819 BLAKE2B efcc856ccacb97646915e8d622179cf3cc7554351036cf556347ec46cdede5c9223139cb209b52376964c7b19b119f3683f82698d1e7c07b1432bb3e4bb37239 SHA512 59faec308abaac3d2b59198fef25109b208de1a807b38803dc10722ff0caf1bac9d9795005fefb3b4e2acda62be136bfcafe7b9702ae52565021a424f99fa730
-EBUILD alertmanager-0.16.2.ebuild 1367 BLAKE2B 54ca24caab082176f843751e5de61b22135ecf8cadca07e8855e93b459cbc00c306e9bd00b9944159161bdffb6b956e3b8f051e29faeb8327b1061aae2c563d0 SHA512 9813e550b9dc204a2781f9bd98849bbfe8c0ad5901e0b23861c755863a0a0a27045e702f07dbe8a89336cede3849f7b69622f9dae53dc8bc9d7981f127a0d8ff
-EBUILD alertmanager-0.17.0.ebuild 1367 BLAKE2B c4fe48103687d9217bfb63331bacc51135ee51f49038e3fb10bd80d8fe46c1091e8b1b51752e78c7d1439d9b3362fea9e440caa8826dc4917a0ea945bed274ee SHA512 a5f692ccdc01d7401e7eef4089116c702400dd376c5cfc230a7356eb098f396cbfd5078a719d5ea1358a4224baa14becfe63752918d91de85775fdf749a97fbc
+DIST alertmanager-0.19.0.tar.gz 5862442 BLAKE2B a79336286ca1099dcc73cce897eccaff8d40f8d3140ebf1943a1189cf1d2ec58738cbe7fc02221826ffc0e1535954a11a461ac6ea222113c79a44d43cc9eda83 SHA512 2c21bfbb1001e07e81b1115439ad15e7c0e7089839e56a19c445177e322b8ef9aa2b85e96478f3c3d709cbbd3a5447662a8c55da370b84aa4b6b24f83848744b
 EBUILD alertmanager-0.18.0.ebuild 1367 BLAKE2B 62615ac19bc66f6245bf85e6b6d4f93343e4b303e9a7e1b67f40dce5c5c39ceb752886a2048b7bef0affe279536a6fae1eaf99e979506d6db52a1b9a411290ed SHA512 4b964437dcd48918873da9cb991bc8367c60914de05f4d5293e6b9bb818e0bfadaa9d99c037d7f3aef0177fac70059ed272b657c4241f4ea2890fe533e358d18
+EBUILD alertmanager-0.19.0.ebuild 1367 BLAKE2B cf5bb035167590396a536967525dff87a1c105aa1e275a94dc10d87bc91bbbf736bcb412fe5844a39f73861025947d432f1e2d5691068e574e0e79a04dc89c65 SHA512 089666a104bca0ff22fc0183e2d2a3b3a99868de3a8a64d1ddb66dc7cffbfda7b0e98b6c5fc009300647d21218c543f036ba89a394304f0221791c3ace07088f
 MISC metadata.xml 333 BLAKE2B eb945c2d22a9d93154b7a021559038b9565f00d54dda86445c00156ddffd6754cd433026ff465a38864d00bf1c44a3c050835fd854dadce82ea92649613151ef SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f
diff --git a/app-metrics/alertmanager/alertmanager-0.16.2.ebuild b/app-metrics/alertmanager/alertmanager-0.16.2.ebuild
deleted file mode 100644
index 0436ba1b213e..000000000000
--- a/app-metrics/alertmanager/alertmanager-0.16.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/alertmanager"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-ALERTMANAGER_COMMIT="308b762"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
-HOMEPAGE="https://github.com/prometheus/alertmanager"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
-	dev-util/promu"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/*
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	insinto /etc/alertmanager/
-	newins doc/examples/simple.yml config.yml.example
-	popd || die
-	keepdir /var/lib/alertmanager /var/log/alertmanager
-	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/alertmanager/alertmanager-0.17.0.ebuild b/app-metrics/alertmanager/alertmanager-0.17.0.ebuild
deleted file mode 100644
index 4b36f4b2ddc8..000000000000
--- a/app-metrics/alertmanager/alertmanager-0.17.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/alertmanager"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-ALERTMANAGER_COMMIT="c7551cd"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
-HOMEPAGE="https://github.com/prometheus/alertmanager"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
-	dev-util/promu"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/*
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	insinto /etc/alertmanager/
-	newins doc/examples/simple.yml config.yml.example
-	popd || die
-	keepdir /var/lib/alertmanager /var/log/alertmanager
-	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/alertmanager/alertmanager-0.19.0.ebuild b/app-metrics/alertmanager/alertmanager-0.19.0.ebuild
new file mode 100644
index 000000000000..ec6dbaf138c1
--- /dev/null
+++ b/app-metrics/alertmanager/alertmanager-0.19.0.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
+
+EGO_PN="github.com/prometheus/alertmanager"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+ALERTMANAGER_COMMIT="7aa5d19"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
+HOMEPAGE="https://github.com/prometheus/alertmanager"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.11
+	dev-util/promu"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v --prefix bin || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/*
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	insinto /etc/alertmanager/
+	newins doc/examples/simple.yml config.yml.example
+	popd || die
+	keepdir /var/lib/alertmanager /var/log/alertmanager
+	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index 617045da5013..d3b85962f990 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -1,10 +1,11 @@
 AUX collectd-5.8.1-lm_sensors-4.5.0-compatibility.patch 2595 BLAKE2B cd60e42c3870611b30068d09410abc1cc80e5c2c945805d9a105050a52f3c2fc2ca2c5e10f33cd9c5063b0773a1bdad9ea7446f88632674cbd2cdd5202a69247 SHA512 6c04f6651a4bbe0c051202cfc3fae3e366cacf34c74e9ff3f09ca83887eb165e4febf8957ede66c22195c03c1f111b24a8859a56921cd42f68f938e87d784f52
+AUX collectd-5.9.1-fixup.patch 2870 BLAKE2B 4b28683774e856ac71c41ec8016d329fd09795dfd877cd1d7a7662aac8e1bc96a62b6fa24ffa6136ed5be95712e52d114eb403a17eb438eedd7d0aa5385047e7 SHA512 1d4c102214ad825a36b6d4057fc9c47c000857ae218a0e541dff33ecbcb2ec78872a486e661ef8013040acd626e78298ca220b8fd87beef7f5ee5bd8b85551ea
 AUX collectd.confd-r2 2001 BLAKE2B fbf1a64aab6ec60111553466c3a8b725200ab13d0e09c1ba1d71e68213e8f978c3cad0dfc5eb2c536ced8213f172804f0596b3494f9b42b0cacf3432105cab5a SHA512 729f2b4e06c4a8c95d32c03c6f3f292eaa4895780ace180b74fcf139a949e9c28a2b3ae823bdebec0014f9b4d919adb399bc7f019c68c0e268b263326959edb7
 AUX collectd.initd-r2 1843 BLAKE2B ccb12e55de72565aa7b6bb0f2c4e7a5a6d15ff23d5bc75e9cb36e1f2dba85b3b2b587336f976059af165ae89333d681ffe0cf53bbcd8098eaeff75228cb80b68 SHA512 8f0a73f0f2b2280c0f2e35894a9dfa38af937930eb090eab52cbe81089a146bd974f6a2a3062b7147611f9c13b770a945a1a9228a026405d31578e27a3fd3b80
 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e
 AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668
 DIST collectd-5.8.1.tar.bz2 1789228 BLAKE2B 739f961172978db33bdf95c8f93bde0036a26b2ed2abd3396a734d4b97c4ae117bb26a62fcdbb3d77bd63d9f64a38f83d0c8a0665e8fa7bf5ed2efc6838b0e8e SHA512 8c75448c6e59ee1ea5c1cf486c07040d20fb36d5b7a1be2ab45facea330166e8c1d1fa38e3fa82ec905428d7b2c92c66aae35ee8e3546f67ce76f7f410739901
 DIST collectd-5.9.1.tar.gz 1501178 BLAKE2B ed0984637161427f3b354002850b7ea8c49a4aca64b637b864e5513c8057f52a4a479477b21e2a4cff436728c16d66c6d561df14308adcaeb7d597c290f543ce SHA512 424ef12a3ba6997a71e6eda1a62d73fec588c9c4d90542c2381c1f9f4e118b2c02e18c71507e8984e20fb255b69b7f42afe83085b3df5e225c576d1eee1655fb
-EBUILD collectd-5.8.1.ebuild 19429 BLAKE2B b84bcdcd587f375766052acc92f3c053fac92a6c0a8750a1d558333345918fdcd7e563f705830b85cc5c76f9b14beca28297a8b1762ac6f67f66bd871c1c522f SHA512 123f88476f52f94cc5a975558889fb450e5341d6ae9ac9ec0cf4ffb5d46633d04f949b27f8408cab587d818ce27058c2d2dd53c8ea70315c9c7215c06cce61fe
-EBUILD collectd-5.9.1.ebuild 19563 BLAKE2B 99704cccf28dfbfb29085fa99f586efa15dcc0702d542927931cef723d583a6e988fadbdce96a4e69976f2e21a5404566ffd98c30f2362e793e4119ef96c535d SHA512 d4ca49e401ee7b92e7422e0cd3fc09d73ebaf4a5d0432c9f8836e0e859f7c3ee527b700c35d871b83651242cf76f8aa92baadac9f3549ea3e8860b6852940d78
+EBUILD collectd-5.8.1-r1.ebuild 19431 BLAKE2B 7bc4b09438a006dea269c954133c7b8ca0f051451d7408fe53d672caec76cff0c462050719c069a8f3b4fd7106db7e6551b240b5cf3a3cd6644543a09b53fd76 SHA512 a3dedffad32926cb884678790a3243db5560600e9a7a6a1ae518a9c332db441b5e9ffd41b10191180464e3366712b90606c7e5b7c98d550b3c4bb7a4fcfcc003
+EBUILD collectd-5.9.1-r2.ebuild 19597 BLAKE2B b592caeb54af1575e62b23026ca726eb50c28206f162728f0e945c797c904a94470f7d4f5b3e4b7c51a9df7c131412e6c620c4801585b531d3164599a54f51af SHA512 c89e6971009200fefe9b8d3ba15a1e9bb0c35405f459cd779b018be3630091a70bbcd4a3d001899f1e1364f5ba3969ac0db1242e8c73029cb1779f44f34648e1
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-metrics/collectd/collectd-5.8.1-r1.ebuild b/app-metrics/collectd/collectd-5.8.1-r1.ebuild
new file mode 100644
index 000000000000..ce224b6f9195
--- /dev/null
+++ b/app-metrics/collectd/collectd-5.8.1-r1.ebuild
@@ -0,0 +1,536 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+JAVA_PKG_OPT_USE="collectd_plugins_java"
+
+inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
+
+DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
+
+HOMEPAGE="https://collectd.org/"
+SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
+
+LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
+SLOT="0"
+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
+
+# Plugins that don't build (e.g. dependencies not in Gentoo)
+# apple_sensors: Requires libIOKit
+# aquaero:       Requires aerotools-ng/libaquaero5
+# barometer:     Requires libi2c (i2c_smbus_read_i2c_block_data)
+# dpdkevents:    Requires dpdk
+# dpdkstat:      Requires dpdk
+# grpc:          Requires libgrpc
+# intel_pmu:     Requires libjevents (pmu-tools)
+# intel_rdt:     Requires libpqos from intel-cmt-cat project
+# lpar:          Requires libperfstat (AIX only)
+# mic:           Requires Intel Many Integrated Core Architecture API
+#                (part of Intel's  Xeon Phi software)
+# netapp:        Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
+# pf:            Requires BSD packet filter
+# pinba:         Requires MySQL Pinba engine (http://pinba.org/)
+# tape:          Requires libkstat (Solaris only)
+# write_riemann: Requires riemann-c-client
+# xmms:          Requires libxmms (v1)
+# zone:          Solaris only...
+COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer dpdkstat grpc
+	intel_pmu intel_rdt lpar mic netapp pf pinba tape write_riemann
+	xmms zone"
+
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
+	ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
+	csv curl curl_json curl_xml dbi df disk dns drbd email
+	entropy ethstat exec fhcount filecount fscache gmond gps hddtemp
+	hugepages interface ipc ipmi iptables ipvs irq java lua
+	load logfile log_logstash lvm madwifi match_empty_counter
+	match_hashed match_regex match_timediff match_value mbmon mcelog md
+	memcachec memcached memory modbus mqtt multimeter mysql netlink
+	network network nfs nginx notify_desktop notify_email notify_nagios
+	ntpd numa nut olsrd onewire openldap openvpn oracle ovs_events
+	ovs_stats perl ping postgresql powerdns processes protocols python
+	python redis routeros rrdcached rrdtool sensors serial sigrok smart
+	snmp snmp_agent statsd swap syslog table tail tail_csv
+	target_notification target_replace target_scale target_set tcpconns
+	teamspeak2 ted thermal threshold tokyotyrant turbostat unixsock
+	uptime users uuid varnish virt vmem vserver wireless write_graphite
+	write_http write_kafka write_log write_mongodb write_prometheus
+	write_redis write_sensu write_tsdb xencpu zfs_arc zookeeper"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
+
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
+
+for plugin in ${COLLECTD_ALL_PLUGINS}; do
+	IUSE="${IUSE} collectd_plugins_${plugin}"
+done
+unset plugin
+
+# Now come the dependencies.
+
+COMMON_DEPEND="
+	dev-libs/libgcrypt:=
+	dev-libs/libltdl:0=
+	perl?					( dev-lang/perl:=[ithreads] )
+	udev?					( virtual/udev )
+	xfs?					( sys-fs/xfsprogs )
+	collectd_plugins_amqp?			( net-libs/rabbitmq-c )
+	collectd_plugins_apache?		( net-misc/curl:0= )
+	collectd_plugins_ascent?		( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_bind?			( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_ceph?			( dev-libs/yajl:= )
+	collectd_plugins_curl?			( net-misc/curl:0= )
+	collectd_plugins_curl_json?		( net-misc/curl:0= dev-libs/yajl:= )
+	collectd_plugins_curl_xml?		( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_dbi?			( dev-db/libdbi )
+	collectd_plugins_dns?			( net-libs/libpcap )
+	collectd_plugins_gmond?			( sys-cluster/ganglia )
+	collectd_plugins_gps?			( sci-geosciences/gpsd:= )
+	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
+	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.13:0= )
+	collectd_plugins_log_logstash?		( dev-libs/yajl:= )
+	collectd_plugins_lua?			( dev-lang/lua:0= )
+	collectd_plugins_lvm?			( sys-fs/lvm2 )
+	collectd_plugins_memcachec?		( dev-libs/libmemcached )
+	collectd_plugins_modbus?		( dev-libs/libmodbus )
+	collectd_plugins_mqtt?			( app-misc/mosquitto )
+	collectd_plugins_mysql?			( dev-db/mysql-connector-c:= )
+	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_DEPS} )
+	collectd_plugins_redis?			( dev-libs/hiredis:= )
+	collectd_plugins_routeros?		( net-libs/librouteros )
+	collectd_plugins_rrdcached?		( net-analyzer/rrdtool:= )
+	collectd_plugins_rrdtool?		( net-analyzer/rrdtool:= )
+	collectd_plugins_sensors?		( sys-apps/lm_sensors:= )
+	collectd_plugins_sigrok?		( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
+	collectd_plugins_smart?			( dev-libs/libatasmart )
+	collectd_plugins_snmp?			( net-analyzer/net-snmp )
+	collectd_plugins_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:= )
+	)"
+
+# Enforcing !=sys-kernel/linux-headers-4.5 > due to #577846
+DEPEND="${COMMON_DEPEND}
+	collectd_plugins_iptables?		( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) )
+	collectd_plugins_java?			( >=virtual/jdk-1.6 )
+	virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	collectd_plugins_java?			( >=virtual/jre-1.6 )
+	collectd_plugins_syslog?		( virtual/logger )
+	selinux?				( sec-policy/selinux-collectd )
+	!<sys-apps/openrc-0.18.2"
+
+REQUIRED_USE="
+	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )
+	collectd_plugins_smart?			( udev )"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.8.1-lm_sensors-4.5.0-compatibility.patch )
+
+# @FUNCTION: collectd_plugin_kernel_linux
+# @DESCRIPTION:
+# USAGE: <plugin name> <kernel_options> <severity>
+# kernel_options is a list of kernel configurations options; the check tests whether at least
+#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
+#   is emitted.
+collectd_plugin_kernel_linux() {
+	local multi_opt opt
+	if has ${1} ${COLLECTD_ALL_PLUGINS}; then
+		if use collectd_plugins_${1}; then
+			for opt in ${2}; do
+				if linux_chkconfig_present ${opt}; then
+					return 0;
+				fi
+			done
+			multi_opt=${2//\ /\ or\ }
+			case ${3} in
+				(info)
+					elog "The ${1} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(warn)
+					ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(error)
+					eerror "The ${1} plugin needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(*)
+					die "function collectd_plugin_kernel_linux called with invalid third argument"
+				;;
+			esac
+		fi
+	fi
+}
+
+collectd_linux_kernel_checks() {
+	if ! linux_chkconfig_present PROC_FS; then
+		ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
+	fi
+
+	if ! linux_chkconfig_present SYSFS; then
+		ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
+	fi
+
+	# battery.c: /proc/pmu/battery_%i
+	# battery.c: /proc/acpi/battery
+	collectd_plugin_kernel_linux battery ACPI_BATTERY warn
+
+	# cgroups.c: /sys/fs/cgroup/
+	collectd_plugin_kernel_linux cgroups CGROUPS warn
+
+	# cpufreq.c: /sys/devices/system/cpu/cpu%d/cpufreq/
+	collectd_plugin_kernel_linux cpufreq SYSFS warn
+	collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
+
+	# drbd.c: /proc/drbd
+	collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
+
+	# conntrack.c: /proc/sys/net/netfilter/*
+	collectd_plugin_kernel_linux conntrack NETFILTER warn
+
+	# fscache.c: /proc/fs/fscache/stats
+	collectd_plugin_kernel_linux fscache FSCACHE warn
+
+	# nfs.c: /proc/net/rpc/nfs
+	# nfs.c: /proc/net/rpc/nfsd
+	collectd_plugin_kernel_linux nfs NFS_COMMON warn
+
+	# serial.c: /proc/tty/driver/serial
+	# serial.c: /proc/tty/driver/ttyS
+	collectd_plugin_kernel_linux serial SERIAL_CORE warn
+
+	# swap.c: /proc/meminfo
+	collectd_plugin_kernel_linux swap SWAP warn
+
+	# thermal.c: /proc/acpi/thermal_zone
+	# thermal.c: /sys/class/thermal
+	collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
+
+	# turbostat.c: /dev/cpu/%d/msr
+	collectd_plugin_kernel_linux turbostat X86_MSR warn
+
+	# vmem.c: /proc/vmstat
+	collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
+
+	# vserver.c: /proc/virtual
+	collectd_plugin_kernel_linux vserver VSERVER warn
+
+	# uuid.c: /sys/hypervisor/uuid
+	collectd_plugin_kernel_linux uuid SYSFS info
+
+	# wireless.c: /proc/net/wireless
+	collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
+
+	# zfs_arc.c: /proc/spl/kstat/zfs/arcstats
+	collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+
+		if linux_config_exists; then
+			einfo "Checking your linux kernel configuration:"
+			collectd_linux_kernel_checks
+		else
+			elog "Cannot find a linux kernel configuration. Continuing anyway."
+		fi
+	fi
+
+	if use collectd_plugins_java; then
+		java-pkg-opt-2_pkg_setup
+	fi
+
+	use collectd_plugins_python && python-single-r1_pkg_setup
+
+	enewgroup collectd
+	enewuser collectd -1 -1 /var/lib/collectd collectd
+}
+
+src_prepare() {
+	default
+
+	# There's some strange prefix handling in the default config file, resulting in
+	# paths like "/usr/var/..."
+	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
+
+	# Adjust upstream's systemd unit
+	#   - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
+	#   - Add User=collectd to run collectd as user "collectd" per default
+	sed -i \
+		-e '/^EnvironmentFile=.*/d' \
+		-e '/^\[Service\]/aUser=collectd' \
+		contrib/systemd.${PN}.service || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
+	# should work independent of the operating system.
+
+	local linux_plugins="barometer battery cpu cpufreq disk
+		drbd entropy ethstat hugepages interface iptables
+		ipvs irq ipc load memory md netlink nfs numa processes
+		serial swap tcpconns thermal turbostat users vmem wireless
+		zfc_arc"
+
+	local need_libstatgrab=0
+	local libstatgrab_plugins="cpu disk interface load memory swap users"
+	local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
+
+	local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
+
+	local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
+	local myos_plugins=""
+	if use kernel_linux; then
+		einfo "Enabling Linux plugins."
+		myos_plugins=${linux_plugins}
+	elif use kernel_FreeBSD; then
+		einfo "Enabling FreeBSD plugins."
+		myos_plugins=${bsd_plugins}
+	elif use kernel_Darwin; then
+		einfo "Enabling Darwin plugins."
+		myos_plugins=${darwin_plugins}
+	fi
+
+	local myconf="--disable-werror"
+
+	# Do we debug?
+	myconf+=" $(use_enable debug)"
+
+	# udev support?
+	# Required for smart plugin via REQUIRED_USE; Optional for disk plugin
+	if use udev; then
+		myconf+=" --with-libudev"
+	else
+		myconf+=" --without-libudev"
+	fi
+
+	local plugin
+
+	# Disable what needs to be disabled.
+	for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
+		myconf+=" --disable-${plugin}"
+	done
+
+	# Set enable/disable for each single plugin.
+	for plugin in ${COLLECTD_ALL_PLUGINS}; do
+		if has ${plugin} ${osdependent_plugins}; then
+			# plugin is os-dependent ...
+			if has ${plugin} ${myos_plugins}; then
+				# ... and available in this os
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+				# ... must we link against libstatgrab? Bug #541518
+				if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
+					einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
+					need_libstatgrab=1
+				fi
+			else
+				# ... and NOT available in this os
+				if use collectd_plugins_${plugin}; then
+					ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
+					ewarn "kernel. Disabling it automatically."
+				fi
+				myconf+=" --disable-${plugin}"
+			fi
+		elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
+			if use collectd_plugins_perl && ! use perl; then
+				ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
+				myconf+= --disable-perl
+			else
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+			fi
+		else
+			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+		fi
+	done
+
+	if [ "${need_libstatgrab}" -eq 1 ]; then
+		myconf+=" --with-libstatgrab"
+	else
+		myconf+=" --without-libstatgrab"
+	fi
+
+	# JAVA_HOME is set by eclasses.
+	if use collectd_plugins_java; then
+		myconf+=" --with-java"
+	fi
+
+	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+	# lots of libs are only needed for plugins, if they are disabled, also disable the lib
+	use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
+	use collectd_plugins_openldap || myconf+=" --with-libldap=no"
+	use collectd_plugins_redis    || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
+	use collectd_plugins_smart    || myconf+=" --with-libatasmart=no"
+	use collectd_plugins_gps      || myconf+=" --with-libgps=no"
+
+	if use perl; then
+		myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
+	else
+		myconf+=" --without-perl-bindings"
+	fi
+
+	# No need for v5upgrade
+	myconf+=" --disable-target_v5upgrade"
+
+	# Python
+	if use collectd_plugins_python; then
+		myconf+=" --with-libpython=yes"
+		export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
+	else
+		myconf+=" --with-libpython=no"
+	fi
+
+	# XFS support
+	myconf+=" $(use_enable xfs)"
+
+	# Finally, run econf.
+	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
+		$(use_enable static-libs static) \
+		--localstatedir=/var ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	perl_delete_localpod
+
+	find "${ED}"usr/ -name "*.la" -delete || die
+
+	if use collectd_plugins_java; then
+		java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
+	fi
+
+	fowners root:collectd /etc/collectd.conf
+	fperms u=rw,g=r,o= /etc/collectd.conf
+
+	dodoc AUTHORS ChangeLog README
+
+	if use contrib ; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib
+	fi
+
+	keepdir /var/lib/${PN}
+	fowners collectd:collectd /var/lib/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+	systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+
+	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":#PIDFile     "/run/collectd.pid":' "${ED}"etc/collectd.conf || die
+	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/run/collectd/collectd.socket":' "${ED}"etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n#   Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n#   Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+
+	if use filecaps; then
+		local caps=()
+		use collectd_plugins_ceph      && caps+=('CAP_DAC_OVERRIDE')
+		use collectd_plugins_exec      && caps+=('CAP_SETUID' 'CAP_SETGID')
+		use collectd_plugins_iptables  && caps+=('CAP_NET_ADMIN')
+		use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
+
+		if use collectd_plugins_dns || use collectd_plugins_ping; then
+			caps+=('CAP_NET_RAW')
+		fi
+
+		if use collectd_plugins_turbostat || use collectd_plugins_smart; then
+			caps+=('CAP_SYS_RAWIO')
+		fi
+
+		if [ ${#caps[@]} -gt 0 ]; then
+			local caps_str=$(IFS=","; echo "${caps[*]}")
+			fcaps ${caps_str} usr/sbin/collectd
+			elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
+			elog "  ${caps_str}+EP"
+			elog
+
+			local systemd_unit="$(systemd_get_systemunitdir)/collectd.service"
+			if [[ -e "${systemd_unit}" ]]; then
+				caps_str="${caps[*]}"
+				sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
+					die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
+
+				elog "CapabilityBoundingSet in '${systemd_unit}'"
+				elog "updated to match capabilities set above."
+				elog
+			else
+				if has_version "sys-apps/systemd"; then
+					# Bug 596852
+					ewarn "Failed to update CapabilityBoundingSet in '${systemd_unit}'"
+					ewarn "because unit was not found. Please file a bug about this."
+				fi
+			fi
+		fi
+	fi
+
+	elog "Note: Collectd is only the collector."
+	elog "      You need to install 'data' sources (applications) locally or"
+	elog "      remotely on your own."
+
+	elog
+	elog "Collectd is configured to run as unprivileged user by default."
+	elog "You may want to revisit the configuration."
+	elog
+
+	if use collectd_plugins_email; then
+		ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
+	fi
+
+	if use collectd_plugins_smart; then
+		elog ""
+		elog "If you are using smart plugin and don't run collectd as root make sure"
+		elog "that the collectd user is allowed to access the disk you want to monitor"
+		elog "(can be done via udev rule for example) and that collectd has the required"
+		elog "capabilities set (which is the default when package was emerged with"
+		elog "'filecaps' USE flag set)."
+	fi
+
+	if use contrib; then
+		elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
+		elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
+	fi
+}
diff --git a/app-metrics/collectd/collectd-5.8.1.ebuild b/app-metrics/collectd/collectd-5.8.1.ebuild
deleted file mode 100644
index ce35b6c2a889..000000000000
--- a/app-metrics/collectd/collectd-5.8.1.ebuild
+++ /dev/null
@@ -1,536 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-JAVA_PKG_OPT_USE="collectd_plugins_java"
-
-inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
-
-DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
-
-HOMEPAGE="https://collectd.org/"
-SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
-
-LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
-SLOT="0"
-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
-
-# Plugins that don't build (e.g. dependencies not in Gentoo)
-# apple_sensors: Requires libIOKit
-# aquaero:       Requires aerotools-ng/libaquaero5
-# barometer:     Requires libi2c (i2c_smbus_read_i2c_block_data)
-# dpdkevents:    Requires dpdk
-# dpdkstat:      Requires dpdk
-# grpc:          Requires libgrpc
-# intel_pmu:     Requires libjevents (pmu-tools)
-# intel_rdt:     Requires libpqos from intel-cmt-cat project
-# lpar:          Requires libperfstat (AIX only)
-# mic:           Requires Intel Many Integrated Core Architecture API
-#                (part of Intel's  Xeon Phi software)
-# netapp:        Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
-# pf:            Requires BSD packet filter
-# pinba:         Requires MySQL Pinba engine (http://pinba.org/)
-# tape:          Requires libkstat (Solaris only)
-# write_riemann: Requires riemann-c-client
-# xmms:          Requires libxmms (v1)
-# zone:          Solaris only...
-COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer dpdkstat grpc
-	intel_pmu intel_rdt lpar mic netapp pf pinba tape write_riemann
-	xmms zone"
-
-# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
-	ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
-	csv curl curl_json curl_xml dbi df disk dns drbd email
-	entropy ethstat exec fhcount filecount fscache gmond gps hddtemp
-	hugepages interface ipc ipmi iptables ipvs irq java lua
-	load logfile log_logstash lvm madwifi match_empty_counter
-	match_hashed match_regex match_timediff match_value mbmon mcelog md
-	memcachec memcached memory modbus mqtt multimeter mysql netlink
-	network network nfs nginx notify_desktop notify_email notify_nagios
-	ntpd numa nut olsrd onewire openldap openvpn oracle ovs_events
-	ovs_stats perl ping postgresql powerdns processes protocols python
-	python redis routeros rrdcached rrdtool sensors serial sigrok smart
-	snmp snmp_agent statsd swap syslog table tail tail_csv
-	target_notification target_replace target_scale target_set tcpconns
-	teamspeak2 ted thermal threshold tokyotyrant turbostat unixsock
-	uptime users uuid varnish virt vmem vserver wireless write_graphite
-	write_http write_kafka write_log write_mongodb write_prometheus
-	write_redis write_sensu write_tsdb xencpu zfs_arc zookeeper"
-
-COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
-
-COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
-
-for plugin in ${COLLECTD_ALL_PLUGINS}; do
-	IUSE="${IUSE} collectd_plugins_${plugin}"
-done
-unset plugin
-
-# Now come the dependencies.
-
-COMMON_DEPEND="
-	dev-libs/libgcrypt:=
-	dev-libs/libltdl:0=
-	perl?					( dev-lang/perl:=[ithreads] )
-	udev?					( virtual/udev )
-	xfs?					( sys-fs/xfsprogs )
-	collectd_plugins_amqp?			( net-libs/rabbitmq-c )
-	collectd_plugins_apache?		( net-misc/curl:0= )
-	collectd_plugins_ascent?		( net-misc/curl:0= dev-libs/libxml2:2= )
-	collectd_plugins_bind?			( net-misc/curl:0= dev-libs/libxml2:2= )
-	collectd_plugins_ceph?			( dev-libs/yajl:= )
-	collectd_plugins_curl?			( net-misc/curl:0= )
-	collectd_plugins_curl_json?		( net-misc/curl:0= dev-libs/yajl:= )
-	collectd_plugins_curl_xml?		( net-misc/curl:0= dev-libs/libxml2:2= )
-	collectd_plugins_dbi?			( dev-db/libdbi )
-	collectd_plugins_dns?			( net-libs/libpcap )
-	collectd_plugins_gmond?			( sys-cluster/ganglia )
-	collectd_plugins_gps?			( sci-geosciences/gpsd:= )
-	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
-	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.13:0= )
-	collectd_plugins_log_logstash?		( dev-libs/yajl:= )
-	collectd_plugins_lua?			( dev-lang/lua:0= )
-	collectd_plugins_lvm?			( sys-fs/lvm2 )
-	collectd_plugins_memcachec?		( dev-libs/libmemcached )
-	collectd_plugins_modbus?		( dev-libs/libmodbus )
-	collectd_plugins_mqtt?			( app-misc/mosquitto )
-	collectd_plugins_mysql?			( virtual/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_DEPS} )
-	collectd_plugins_redis?			( dev-libs/hiredis:= )
-	collectd_plugins_routeros?		( net-libs/librouteros )
-	collectd_plugins_rrdcached?		( net-analyzer/rrdtool:= )
-	collectd_plugins_rrdtool?		( net-analyzer/rrdtool:= )
-	collectd_plugins_sensors?		( sys-apps/lm_sensors:= )
-	collectd_plugins_sigrok?		( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
-	collectd_plugins_smart?			( dev-libs/libatasmart )
-	collectd_plugins_snmp?			( net-analyzer/net-snmp )
-	collectd_plugins_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:= )
-	)"
-
-# Enforcing !=sys-kernel/linux-headers-4.5 > due to #577846
-DEPEND="${COMMON_DEPEND}
-	collectd_plugins_iptables?		( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) )
-	collectd_plugins_java?			( >=virtual/jdk-1.6 )
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	collectd_plugins_java?			( >=virtual/jre-1.6 )
-	collectd_plugins_syslog?		( virtual/logger )
-	selinux?				( sec-policy/selinux-collectd )
-	!<sys-apps/openrc-0.18.2"
-
-REQUIRED_USE="
-	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )
-	collectd_plugins_smart?			( udev )"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.8.1-lm_sensors-4.5.0-compatibility.patch )
-
-# @FUNCTION: collectd_plugin_kernel_linux
-# @DESCRIPTION:
-# USAGE: <plugin name> <kernel_options> <severity>
-# kernel_options is a list of kernel configurations options; the check tests whether at least
-#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
-#   is emitted.
-collectd_plugin_kernel_linux() {
-	local multi_opt opt
-	if has ${1} ${COLLECTD_ALL_PLUGINS}; then
-		if use collectd_plugins_${1}; then
-			for opt in ${2}; do
-				if linux_chkconfig_present ${opt}; then
-					return 0;
-				fi
-			done
-			multi_opt=${2//\ /\ or\ }
-			case ${3} in
-				(info)
-					elog "The ${1} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(warn)
-					ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(error)
-					eerror "The ${1} plugin needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(*)
-					die "function collectd_plugin_kernel_linux called with invalid third argument"
-				;;
-			esac
-		fi
-	fi
-}
-
-collectd_linux_kernel_checks() {
-	if ! linux_chkconfig_present PROC_FS; then
-		ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
-	fi
-
-	if ! linux_chkconfig_present SYSFS; then
-		ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
-	fi
-
-	# battery.c: /proc/pmu/battery_%i
-	# battery.c: /proc/acpi/battery
-	collectd_plugin_kernel_linux battery ACPI_BATTERY warn
-
-	# cgroups.c: /sys/fs/cgroup/
-	collectd_plugin_kernel_linux cgroups CGROUPS warn
-
-	# cpufreq.c: /sys/devices/system/cpu/cpu%d/cpufreq/
-	collectd_plugin_kernel_linux cpufreq SYSFS warn
-	collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
-
-	# drbd.c: /proc/drbd
-	collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
-
-	# conntrack.c: /proc/sys/net/netfilter/*
-	collectd_plugin_kernel_linux conntrack NETFILTER warn
-
-	# fscache.c: /proc/fs/fscache/stats
-	collectd_plugin_kernel_linux fscache FSCACHE warn
-
-	# nfs.c: /proc/net/rpc/nfs
-	# nfs.c: /proc/net/rpc/nfsd
-	collectd_plugin_kernel_linux nfs NFS_COMMON warn
-
-	# serial.c: /proc/tty/driver/serial
-	# serial.c: /proc/tty/driver/ttyS
-	collectd_plugin_kernel_linux serial SERIAL_CORE warn
-
-	# swap.c: /proc/meminfo
-	collectd_plugin_kernel_linux swap SWAP warn
-
-	# thermal.c: /proc/acpi/thermal_zone
-	# thermal.c: /sys/class/thermal
-	collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
-
-	# turbostat.c: /dev/cpu/%d/msr
-	collectd_plugin_kernel_linux turbostat X86_MSR warn
-
-	# vmem.c: /proc/vmstat
-	collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
-
-	# vserver.c: /proc/virtual
-	collectd_plugin_kernel_linux vserver VSERVER warn
-
-	# uuid.c: /sys/hypervisor/uuid
-	collectd_plugin_kernel_linux uuid SYSFS info
-
-	# wireless.c: /proc/net/wireless
-	collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
-
-	# zfs_arc.c: /proc/spl/kstat/zfs/arcstats
-	collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if linux_config_exists; then
-			einfo "Checking your linux kernel configuration:"
-			collectd_linux_kernel_checks
-		else
-			elog "Cannot find a linux kernel configuration. Continuing anyway."
-		fi
-	fi
-
-	if use collectd_plugins_java; then
-		java-pkg-opt-2_pkg_setup
-	fi
-
-	use collectd_plugins_python && python-single-r1_pkg_setup
-
-	enewgroup collectd
-	enewuser collectd -1 -1 /var/lib/collectd collectd
-}
-
-src_prepare() {
-	default
-
-	# There's some strange prefix handling in the default config file, resulting in
-	# paths like "/usr/var/..."
-	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
-
-	# Adjust upstream's systemd unit
-	#   - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
-	#   - Add User=collectd to run collectd as user "collectd" per default
-	sed -i \
-		-e '/^EnvironmentFile=.*/d' \
-		-e '/^\[Service\]/aUser=collectd' \
-		contrib/systemd.${PN}.service || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
-	# should work independent of the operating system.
-
-	local linux_plugins="barometer battery cpu cpufreq disk
-		drbd entropy ethstat hugepages interface iptables
-		ipvs irq ipc load memory md netlink nfs numa processes
-		serial swap tcpconns thermal turbostat users vmem wireless
-		zfc_arc"
-
-	local need_libstatgrab=0
-	local libstatgrab_plugins="cpu disk interface load memory swap users"
-	local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
-
-	local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
-
-	local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
-	local myos_plugins=""
-	if use kernel_linux; then
-		einfo "Enabling Linux plugins."
-		myos_plugins=${linux_plugins}
-	elif use kernel_FreeBSD; then
-		einfo "Enabling FreeBSD plugins."
-		myos_plugins=${bsd_plugins}
-	elif use kernel_Darwin; then
-		einfo "Enabling Darwin plugins."
-		myos_plugins=${darwin_plugins}
-	fi
-
-	local myconf="--disable-werror"
-
-	# Do we debug?
-	myconf+=" $(use_enable debug)"
-
-	# udev support?
-	# Required for smart plugin via REQUIRED_USE; Optional for disk plugin
-	if use udev; then
-		myconf+=" --with-libudev"
-	else
-		myconf+=" --without-libudev"
-	fi
-
-	local plugin
-
-	# Disable what needs to be disabled.
-	for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
-		myconf+=" --disable-${plugin}"
-	done
-
-	# Set enable/disable for each single plugin.
-	for plugin in ${COLLECTD_ALL_PLUGINS}; do
-		if has ${plugin} ${osdependent_plugins}; then
-			# plugin is os-dependent ...
-			if has ${plugin} ${myos_plugins}; then
-				# ... and available in this os
-				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-				# ... must we link against libstatgrab? Bug #541518
-				if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
-					einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
-					need_libstatgrab=1
-				fi
-			else
-				# ... and NOT available in this os
-				if use collectd_plugins_${plugin}; then
-					ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
-					ewarn "kernel. Disabling it automatically."
-				fi
-				myconf+=" --disable-${plugin}"
-			fi
-		elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
-			if use collectd_plugins_perl && ! use perl; then
-				ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
-				myconf+= --disable-perl
-			else
-				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-			fi
-		else
-			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-		fi
-	done
-
-	if [ "${need_libstatgrab}" -eq 1 ]; then
-		myconf+=" --with-libstatgrab"
-	else
-		myconf+=" --without-libstatgrab"
-	fi
-
-	# JAVA_HOME is set by eclasses.
-	if use collectd_plugins_java; then
-		myconf+=" --with-java"
-	fi
-
-	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
-	# lots of libs are only needed for plugins, if they are disabled, also disable the lib
-	use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
-	use collectd_plugins_openldap || myconf+=" --with-libldap=no"
-	use collectd_plugins_redis    || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
-	use collectd_plugins_smart    || myconf+=" --with-libatasmart=no"
-	use collectd_plugins_gps      || myconf+=" --with-libgps=no"
-
-	if use perl; then
-		myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
-	else
-		myconf+=" --without-perl-bindings"
-	fi
-
-	# No need for v5upgrade
-	myconf+=" --disable-target_v5upgrade"
-
-	# Python
-	if use collectd_plugins_python; then
-		myconf+=" --with-libpython=yes"
-		export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
-	else
-		myconf+=" --with-libpython=no"
-	fi
-
-	# XFS support
-	myconf+=" $(use_enable xfs)"
-
-	# Finally, run econf.
-	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
-		$(use_enable static-libs static) \
-		--localstatedir=/var ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" install
-
-	perl_delete_localpod
-
-	find "${ED}"usr/ -name "*.la" -delete || die
-
-	if use collectd_plugins_java; then
-		java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
-	fi
-
-	fowners root:collectd /etc/collectd.conf
-	fperms u=rw,g=r,o= /etc/collectd.conf
-
-	dodoc AUTHORS ChangeLog README
-
-	if use contrib ; then
-		insinto /usr/share/doc/${PF}
-		doins -r contrib
-	fi
-
-	keepdir /var/lib/${PN}
-	fowners collectd:collectd /var/lib/${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
-	systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":#PIDFile     "/run/collectd.pid":' "${ED}"etc/collectd.conf || die
-	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/run/collectd/collectd.socket":' "${ED}"etc/collectd.conf || die
-	sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n#   Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
-	sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n#   Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-
-	if use filecaps; then
-		local caps=()
-		use collectd_plugins_ceph      && caps+=('CAP_DAC_OVERRIDE')
-		use collectd_plugins_exec      && caps+=('CAP_SETUID' 'CAP_SETGID')
-		use collectd_plugins_iptables  && caps+=('CAP_NET_ADMIN')
-		use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
-
-		if use collectd_plugins_dns || use collectd_plugins_ping; then
-			caps+=('CAP_NET_RAW')
-		fi
-
-		if use collectd_plugins_turbostat || use collectd_plugins_smart; then
-			caps+=('CAP_SYS_RAWIO')
-		fi
-
-		if [ ${#caps[@]} -gt 0 ]; then
-			local caps_str=$(IFS=","; echo "${caps[*]}")
-			fcaps ${caps_str} usr/sbin/collectd
-			elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
-			elog "  ${caps_str}+EP"
-			elog
-
-			local systemd_unit="$(systemd_get_systemunitdir)/collectd.service"
-			if [[ -e "${systemd_unit}" ]]; then
-				caps_str="${caps[*]}"
-				sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
-					die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
-
-				elog "CapabilityBoundingSet in '${systemd_unit}'"
-				elog "updated to match capabilities set above."
-				elog
-			else
-				if has_version "sys-apps/systemd"; then
-					# Bug 596852
-					ewarn "Failed to update CapabilityBoundingSet in '${systemd_unit}'"
-					ewarn "because unit was not found. Please file a bug about this."
-				fi
-			fi
-		fi
-	fi
-
-	elog "Note: Collectd is only the collector."
-	elog "      You need to install 'data' sources (applications) locally or"
-	elog "      remotely on your own."
-
-	elog
-	elog "Collectd is configured to run as unprivileged user by default."
-	elog "You may want to revisit the configuration."
-	elog
-
-	if use collectd_plugins_email; then
-		ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
-	fi
-
-	if use collectd_plugins_smart; then
-		elog ""
-		elog "If you are using smart plugin and don't run collectd as root make sure"
-		elog "that the collectd user is allowed to access the disk you want to monitor"
-		elog "(can be done via udev rule for example) and that collectd has the required"
-		elog "capabilities set (which is the default when package was emerged with"
-		elog "'filecaps' USE flag set)."
-	fi
-
-	if use contrib; then
-		elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
-		elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
-	fi
-}
diff --git a/app-metrics/collectd/collectd-5.9.1-r2.ebuild b/app-metrics/collectd/collectd-5.9.1-r2.ebuild
new file mode 100644
index 000000000000..af1f3432adc8
--- /dev/null
+++ b/app-metrics/collectd/collectd-5.9.1-r2.ebuild
@@ -0,0 +1,543 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+JAVA_PKG_OPT_USE="collectd_plugins_java"
+
+inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
+
+DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
+
+HOMEPAGE="https://collectd.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PN}-${PV}.tar.gz"
+
+LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
+SLOT="0"
+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
+
+# Plugins that don't build (e.g. dependencies not in Gentoo)
+# apple_sensors: Requires libIOKit
+# amqp1:         Requires libqpid-proton
+# aquaero:       Requires aerotools-ng/libaquaero5
+# barometer:     Requires libi2c (i2c_smbus_read_i2c_block_data)
+# dpdkevents:    Requires dpdk
+# dpdkstat:      Requires dpdk
+# grpc:          Requires libgrpc
+# intel_pmu:     Requires libjevents (pmu-tools)
+# intel_rdt:     Requires libpqos from intel-cmt-cat project
+# lpar:          Requires libperfstat (AIX only)
+# mic:           Requires Intel Many Integrated Core Architecture API
+#                (part of Intel's  Xeon Phi software)
+# netapp:        Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
+# pf:            Requires BSD packet filter
+# pinba:         Requires MySQL Pinba engine (http://pinba.org/)
+# tape:          Requires libkstat (Solaris only)
+# write_riemann: Requires riemann-c-client
+# xmms:          Requires libxmms (v1)
+# zone:          Solaris only...
+COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors amqp1 aquaero barometer dpdkstat
+	grpc intel_pmu intel_rdt lpar mic netapp pf pinba tape write_riemann
+	xmms zone"
+
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
+	ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
+	csv curl curl_json curl_xml dbi df disk dns drbd email
+	entropy ethstat exec fhcount filecount fscache gmond gps hddtemp
+	hugepages interface ipc ipmi iptables ipvs irq java lua
+	load logfile log_logstash lvm madwifi match_empty_counter
+	match_hashed match_regex match_timediff match_value mbmon mcelog md
+	memcachec memcached memory modbus mqtt multimeter mysql netlink
+	network network nfs nginx notify_desktop notify_email notify_nagios
+	ntpd numa nut olsrd onewire openldap openvpn oracle ovs_events
+	ovs_stats perl ping postgresql powerdns processes protocols python
+	python redis routeros rrdcached rrdtool sensors serial sigrok smart
+	snmp snmp_agent statsd swap syslog table tail tail_csv
+	target_notification target_replace target_scale target_set tcpconns
+	teamspeak2 ted thermal threshold tokyotyrant turbostat unixsock
+	uptime users uuid varnish virt vmem vserver wireless write_graphite
+	write_http write_kafka write_log write_mongodb write_prometheus
+	write_redis write_sensu write_tsdb xencpu zfs_arc zookeeper"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
+
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
+
+for plugin in ${COLLECTD_ALL_PLUGINS}; do
+	IUSE="${IUSE} collectd_plugins_${plugin}"
+done
+unset plugin
+
+# Now come the dependencies.
+
+COMMON_DEPEND="
+	dev-libs/libgcrypt:=
+	dev-libs/libltdl:0=
+	perl?					( dev-lang/perl:=[ithreads] )
+	udev?					( virtual/udev )
+	xfs?					( sys-fs/xfsprogs )
+	collectd_plugins_amqp?			( net-libs/rabbitmq-c )
+	collectd_plugins_apache?		( net-misc/curl:0= )
+	collectd_plugins_ascent?		( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_bind?			( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_ceph?			( dev-libs/yajl:= )
+	collectd_plugins_curl?			( net-misc/curl:0= )
+	collectd_plugins_curl_json?		( net-misc/curl:0= dev-libs/yajl:= )
+	collectd_plugins_curl_xml?		( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_dbi?			( dev-db/libdbi )
+	collectd_plugins_dns?			( net-libs/libpcap )
+	collectd_plugins_gmond?			( sys-cluster/ganglia )
+	collectd_plugins_gps?			( sci-geosciences/gpsd:= )
+	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
+	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.13:0= )
+	collectd_plugins_log_logstash?		( dev-libs/yajl:= )
+	collectd_plugins_lua?			( dev-lang/lua:0= )
+	collectd_plugins_lvm?			( sys-fs/lvm2 )
+	collectd_plugins_memcachec?		( dev-libs/libmemcached )
+	collectd_plugins_modbus?		( dev-libs/libmodbus )
+	collectd_plugins_mqtt?			( app-misc/mosquitto )
+	collectd_plugins_mysql?			( dev-db/mysql-connector-c:= )
+	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_DEPS} )
+	collectd_plugins_redis?			( dev-libs/hiredis:= )
+	collectd_plugins_routeros?		( net-libs/librouteros )
+	collectd_plugins_rrdcached?		( net-analyzer/rrdtool:= )
+	collectd_plugins_rrdtool?		( net-analyzer/rrdtool:= )
+	collectd_plugins_sensors?		( sys-apps/lm_sensors:= )
+	collectd_plugins_sigrok?		( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
+	collectd_plugins_smart?			( dev-libs/libatasmart )
+	collectd_plugins_snmp?			( net-analyzer/net-snmp )
+	collectd_plugins_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:= )
+	)"
+
+# Enforcing !=sys-kernel/linux-headers-4.5 > due to #577846
+DEPEND="${COMMON_DEPEND}
+	collectd_plugins_iptables?		( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) )
+	collectd_plugins_java?			( >=virtual/jdk-1.6 )
+	virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	collectd_plugins_java?			( >=virtual/jre-1.6 )
+	collectd_plugins_syslog?		( virtual/logger )
+	selinux?				( sec-policy/selinux-collectd )
+	!<sys-apps/openrc-0.18.2"
+
+REQUIRED_USE="
+	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )
+	collectd_plugins_smart?			( udev )"
+
+PATCHES=( "${FILESDIR}"/${P}-fixup.patch )
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+# @FUNCTION: collectd_plugin_kernel_linux
+# @DESCRIPTION:
+# USAGE: <plugin name> <kernel_options> <severity>
+# kernel_options is a list of kernel configurations options; the check tests whether at least
+#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
+#   is emitted.
+collectd_plugin_kernel_linux() {
+	local multi_opt opt
+	if has ${1} ${COLLECTD_ALL_PLUGINS}; then
+		if use collectd_plugins_${1}; then
+			for opt in ${2}; do
+				if linux_chkconfig_present ${opt}; then
+					return 0;
+				fi
+			done
+			multi_opt=${2//\ /\ or\ }
+			case ${3} in
+				(info)
+					elog "The ${1} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(warn)
+					ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(error)
+					eerror "The ${1} plugin needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(*)
+					die "function collectd_plugin_kernel_linux called with invalid third argument"
+				;;
+			esac
+		fi
+	fi
+}
+
+collectd_linux_kernel_checks() {
+	if ! linux_chkconfig_present PROC_FS; then
+		ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
+	fi
+
+	if ! linux_chkconfig_present SYSFS; then
+		ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
+	fi
+
+	# battery.c: /proc/pmu/battery_%i
+	# battery.c: /proc/acpi/battery
+	collectd_plugin_kernel_linux battery ACPI_BATTERY warn
+
+	# cgroups.c: /sys/fs/cgroup/
+	collectd_plugin_kernel_linux cgroups CGROUPS warn
+
+	# cpufreq.c: /sys/devices/system/cpu/cpu%d/cpufreq/
+	collectd_plugin_kernel_linux cpufreq SYSFS warn
+	collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
+
+	# drbd.c: /proc/drbd
+	collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
+
+	# conntrack.c: /proc/sys/net/netfilter/*
+	collectd_plugin_kernel_linux conntrack NETFILTER warn
+
+	# fscache.c: /proc/fs/fscache/stats
+	collectd_plugin_kernel_linux fscache FSCACHE warn
+
+	# nfs.c: /proc/net/rpc/nfs
+	# nfs.c: /proc/net/rpc/nfsd
+	collectd_plugin_kernel_linux nfs NFS_COMMON warn
+
+	# serial.c: /proc/tty/driver/serial
+	# serial.c: /proc/tty/driver/ttyS
+	collectd_plugin_kernel_linux serial SERIAL_CORE warn
+
+	# swap.c: /proc/meminfo
+	collectd_plugin_kernel_linux swap SWAP warn
+
+	# thermal.c: /proc/acpi/thermal_zone
+	# thermal.c: /sys/class/thermal
+	collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
+
+	# turbostat.c: /dev/cpu/%d/msr
+	collectd_plugin_kernel_linux turbostat X86_MSR warn
+
+	# vmem.c: /proc/vmstat
+	collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
+
+	# vserver.c: /proc/virtual
+	collectd_plugin_kernel_linux vserver VSERVER warn
+
+	# uuid.c: /sys/hypervisor/uuid
+	collectd_plugin_kernel_linux uuid SYSFS info
+
+	# wireless.c: /proc/net/wireless
+	collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
+
+	# zfs_arc.c: /proc/spl/kstat/zfs/arcstats
+	collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+
+		if linux_config_exists; then
+			einfo "Checking your linux kernel configuration:"
+			collectd_linux_kernel_checks
+		else
+			elog "Cannot find a linux kernel configuration. Continuing anyway."
+		fi
+	fi
+
+	if use collectd_plugins_java; then
+		java-pkg-opt-2_pkg_setup
+	fi
+
+	use collectd_plugins_python && python-single-r1_pkg_setup
+
+	enewgroup collectd
+	enewuser collectd -1 -1 /var/lib/collectd collectd
+}
+
+src_prepare() {
+	default
+
+	# There's some strange prefix handling in the default config file, resulting in
+	# paths like "/usr/var/..."
+	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
+
+	# Adjust upstream's systemd unit
+	#   - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
+	#   - Add User=collectd to run collectd as user "collectd" per default
+	sed -i \
+		-e '/^EnvironmentFile=.*/d' \
+		-e '/^\[Service\]/aUser=collectd' \
+		contrib/systemd.${PN}.service || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
+	# should work independent of the operating system.
+
+	local linux_plugins="barometer battery cpu cpufreq disk
+		drbd entropy ethstat hugepages interface iptables
+		ipvs irq ipc load memory md netlink nfs numa processes
+		serial swap tcpconns thermal turbostat users vmem wireless
+		zfc_arc"
+
+	local need_libstatgrab=0
+	local libstatgrab_plugins="cpu disk interface load memory swap users"
+	local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
+
+	local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
+
+	local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
+	local myos_plugins=""
+	if use kernel_linux; then
+		einfo "Enabling Linux plugins."
+		myos_plugins=${linux_plugins}
+	elif use kernel_FreeBSD; then
+		einfo "Enabling FreeBSD plugins."
+		myos_plugins=${bsd_plugins}
+	elif use kernel_Darwin; then
+		einfo "Enabling Darwin plugins."
+		myos_plugins=${darwin_plugins}
+	fi
+
+	local myconf="--disable-werror"
+
+	# Do we debug?
+	myconf+=" $(use_enable debug)"
+
+	# udev support?
+	# Required for smart plugin via REQUIRED_USE; Optional for disk plugin
+	if use udev; then
+		myconf+=" --with-libudev"
+	else
+		myconf+=" --without-libudev"
+	fi
+
+	local plugin
+
+	# Disable what needs to be disabled.
+	for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
+		if [[ "${plugin}" == 'dpdkstat' ]]; then
+			myconf+=" --without-libdpdk"
+		else
+			myconf+=" --disable-${plugin}"
+		fi
+	done
+
+	# Set enable/disable for each single plugin.
+	for plugin in ${COLLECTD_ALL_PLUGINS}; do
+		if has ${plugin} ${osdependent_plugins}; then
+			# plugin is os-dependent ...
+			if has ${plugin} ${myos_plugins}; then
+				# ... and available in this os
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+				# ... must we link against libstatgrab? Bug #541518
+				if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
+					einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
+					need_libstatgrab=1
+				fi
+			else
+				# ... and NOT available in this os
+				if use collectd_plugins_${plugin}; then
+					ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
+					ewarn "kernel. Disabling it automatically."
+				fi
+				myconf+=" --disable-${plugin}"
+			fi
+		elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
+			if use collectd_plugins_perl && ! use perl; then
+				ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
+				myconf+= --disable-perl
+			else
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+			fi
+		else
+			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+		fi
+	done
+
+	if [ "${need_libstatgrab}" -eq 1 ]; then
+		myconf+=" --with-libstatgrab"
+	else
+		myconf+=" --without-libstatgrab"
+	fi
+
+	# JAVA_HOME is set by eclasses.
+	if use collectd_plugins_java; then
+		myconf+=" --with-java"
+	fi
+
+	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+	# lots of libs are only needed for plugins, if they are disabled, also disable the lib
+	use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
+	use collectd_plugins_openldap || myconf+=" --with-libldap=no"
+	use collectd_plugins_redis    || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
+	use collectd_plugins_smart    || myconf+=" --with-libatasmart=no"
+	use collectd_plugins_gps      || myconf+=" --with-libgps=no"
+
+	if use perl; then
+		myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
+	else
+		myconf+=" --without-perl-bindings"
+	fi
+
+	# No need for v5upgrade
+	myconf+=" --disable-target_v5upgrade"
+
+	# Python
+	if use collectd_plugins_python; then
+		myconf+=" --with-libpython=yes"
+		export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
+	else
+		myconf+=" --with-libpython=no"
+	fi
+
+	# XFS support
+	myconf+=" $(use_enable xfs)"
+
+	# Finally, run econf.
+	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
+		$(use_enable static-libs static) \
+		--localstatedir=/var ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	perl_delete_localpod
+
+	find "${ED}"usr/ -name "*.la" -delete || die
+
+	if use collectd_plugins_java; then
+		java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
+	fi
+
+	fowners root:collectd /etc/collectd.conf
+	fperms u=rw,g=r,o= /etc/collectd.conf
+
+	dodoc AUTHORS ChangeLog README
+
+	if use contrib ; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib
+	fi
+
+	keepdir /var/lib/${PN}
+	fowners collectd:collectd /var/lib/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+	systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+
+	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":#PIDFile     "/run/collectd.pid":' "${ED}"etc/collectd.conf || die
+	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/run/collectd/collectd.socket":' "${ED}"etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n#   Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n#   Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+
+	if use filecaps; then
+		local caps=()
+		use collectd_plugins_ceph      && caps+=('CAP_DAC_OVERRIDE')
+		use collectd_plugins_exec      && caps+=('CAP_SETUID' 'CAP_SETGID')
+		use collectd_plugins_iptables  && caps+=('CAP_NET_ADMIN')
+		use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
+
+		if use collectd_plugins_dns || use collectd_plugins_ping; then
+			caps+=('CAP_NET_RAW')
+		fi
+
+		if use collectd_plugins_turbostat || use collectd_plugins_smart; then
+			caps+=('CAP_SYS_RAWIO')
+		fi
+
+		if [ ${#caps[@]} -gt 0 ]; then
+			local caps_str=$(IFS=","; echo "${caps[*]}")
+			fcaps ${caps_str} usr/sbin/collectd
+			elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
+			elog "  ${caps_str}+EP"
+			elog
+
+			local systemd_unit="$(systemd_get_systemunitdir)/collectd.service"
+			if [[ -e "${systemd_unit}" ]]; then
+				caps_str="${caps[*]}"
+				sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
+					die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
+
+				elog "CapabilityBoundingSet in '${systemd_unit}'"
+				elog "updated to match capabilities set above."
+				elog
+			else
+				if has_version "sys-apps/systemd"; then
+					# Bug 596852
+					ewarn "Failed to update CapabilityBoundingSet in '${systemd_unit}'"
+					ewarn "because unit was not found. Please file a bug about this."
+				fi
+			fi
+		fi
+	fi
+
+	elog "Note: Collectd is only the collector."
+	elog "      You need to install 'data' sources (applications) locally or"
+	elog "      remotely on your own."
+
+	elog
+	elog "Collectd is configured to run as unprivileged user by default."
+	elog "You may want to revisit the configuration."
+	elog
+
+	if use collectd_plugins_email; then
+		ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
+	fi
+
+	if use collectd_plugins_smart; then
+		elog ""
+		elog "If you are using smart plugin and don't run collectd as root make sure"
+		elog "that the collectd user is allowed to access the disk you want to monitor"
+		elog "(can be done via udev rule for example) and that collectd has the required"
+		elog "capabilities set (which is the default when package was emerged with"
+		elog "'filecaps' USE flag set)."
+	fi
+
+	if use contrib; then
+		elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
+		elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
+	fi
+}
diff --git a/app-metrics/collectd/collectd-5.9.1.ebuild b/app-metrics/collectd/collectd-5.9.1.ebuild
deleted file mode 100644
index e79b4d6e0e41..000000000000
--- a/app-metrics/collectd/collectd-5.9.1.ebuild
+++ /dev/null
@@ -1,543 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-JAVA_PKG_OPT_USE="collectd_plugins_java"
-
-inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
-
-DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
-
-HOMEPAGE="https://collectd.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PN}-${PV}.tar.gz"
-
-LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
-SLOT="0"
-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
-
-# Plugins that don't build (e.g. dependencies not in Gentoo)
-# apple_sensors: Requires libIOKit
-# amqp1:         Requires libqpid-proton
-# aquaero:       Requires aerotools-ng/libaquaero5
-# barometer:     Requires libi2c (i2c_smbus_read_i2c_block_data)
-# dpdkevents:    Requires dpdk
-# dpdkstat:      Requires dpdk
-# grpc:          Requires libgrpc
-# intel_pmu:     Requires libjevents (pmu-tools)
-# intel_rdt:     Requires libpqos from intel-cmt-cat project
-# lpar:          Requires libperfstat (AIX only)
-# mic:           Requires Intel Many Integrated Core Architecture API
-#                (part of Intel's  Xeon Phi software)
-# netapp:        Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
-# pf:            Requires BSD packet filter
-# pinba:         Requires MySQL Pinba engine (http://pinba.org/)
-# tape:          Requires libkstat (Solaris only)
-# write_riemann: Requires riemann-c-client
-# xmms:          Requires libxmms (v1)
-# zone:          Solaris only...
-COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors amqp1 aquaero barometer dpdkstat
-	grpc intel_pmu intel_rdt lpar mic netapp pf pinba tape write_riemann
-	xmms zone"
-
-# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
-	ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
-	csv curl curl_json curl_xml dbi df disk dns drbd email
-	entropy ethstat exec fhcount filecount fscache gmond gps hddtemp
-	hugepages interface ipc ipmi iptables ipvs irq java lua
-	load logfile log_logstash lvm madwifi match_empty_counter
-	match_hashed match_regex match_timediff match_value mbmon mcelog md
-	memcachec memcached memory modbus mqtt multimeter mysql netlink
-	network network nfs nginx notify_desktop notify_email notify_nagios
-	ntpd numa nut olsrd onewire openldap openvpn oracle ovs_events
-	ovs_stats perl ping postgresql powerdns processes protocols python
-	python redis routeros rrdcached rrdtool sensors serial sigrok smart
-	snmp snmp_agent statsd swap syslog table tail tail_csv
-	target_notification target_replace target_scale target_set tcpconns
-	teamspeak2 ted thermal threshold tokyotyrant turbostat unixsock
-	uptime users uuid varnish virt vmem vserver wireless write_graphite
-	write_http write_kafka write_log write_mongodb write_prometheus
-	write_redis write_sensu write_tsdb xencpu zfs_arc zookeeper"
-
-COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
-
-COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
-
-for plugin in ${COLLECTD_ALL_PLUGINS}; do
-	IUSE="${IUSE} collectd_plugins_${plugin}"
-done
-unset plugin
-
-# Now come the dependencies.
-
-COMMON_DEPEND="
-	dev-libs/libgcrypt:=
-	dev-libs/libltdl:0=
-	perl?					( dev-lang/perl:=[ithreads] )
-	udev?					( virtual/udev )
-	xfs?					( sys-fs/xfsprogs )
-	collectd_plugins_amqp?			( net-libs/rabbitmq-c )
-	collectd_plugins_apache?		( net-misc/curl:0= )
-	collectd_plugins_ascent?		( net-misc/curl:0= dev-libs/libxml2:2= )
-	collectd_plugins_bind?			( net-misc/curl:0= dev-libs/libxml2:2= )
-	collectd_plugins_ceph?			( dev-libs/yajl:= )
-	collectd_plugins_curl?			( net-misc/curl:0= )
-	collectd_plugins_curl_json?		( net-misc/curl:0= dev-libs/yajl:= )
-	collectd_plugins_curl_xml?		( net-misc/curl:0= dev-libs/libxml2:2= )
-	collectd_plugins_dbi?			( dev-db/libdbi )
-	collectd_plugins_dns?			( net-libs/libpcap )
-	collectd_plugins_gmond?			( sys-cluster/ganglia )
-	collectd_plugins_gps?			( sci-geosciences/gpsd:= )
-	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
-	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.13:0= )
-	collectd_plugins_log_logstash?		( dev-libs/yajl:= )
-	collectd_plugins_lua?			( dev-lang/lua:0= )
-	collectd_plugins_lvm?			( sys-fs/lvm2 )
-	collectd_plugins_memcachec?		( dev-libs/libmemcached )
-	collectd_plugins_modbus?		( dev-libs/libmodbus )
-	collectd_plugins_mqtt?			( app-misc/mosquitto )
-	collectd_plugins_mysql?			( virtual/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_DEPS} )
-	collectd_plugins_redis?			( dev-libs/hiredis:= )
-	collectd_plugins_routeros?		( net-libs/librouteros )
-	collectd_plugins_rrdcached?		( net-analyzer/rrdtool:= )
-	collectd_plugins_rrdtool?		( net-analyzer/rrdtool:= )
-	collectd_plugins_sensors?		( sys-apps/lm_sensors:= )
-	collectd_plugins_sigrok?		( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
-	collectd_plugins_smart?			( dev-libs/libatasmart )
-	collectd_plugins_snmp?			( net-analyzer/net-snmp )
-	collectd_plugins_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:= )
-	)"
-
-# Enforcing !=sys-kernel/linux-headers-4.5 > due to #577846
-DEPEND="${COMMON_DEPEND}
-	collectd_plugins_iptables?		( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) )
-	collectd_plugins_java?			( >=virtual/jdk-1.6 )
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	collectd_plugins_java?			( >=virtual/jre-1.6 )
-	collectd_plugins_syslog?		( virtual/logger )
-	selinux?				( sec-policy/selinux-collectd )
-	!<sys-apps/openrc-0.18.2"
-
-REQUIRED_USE="
-	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )
-	collectd_plugins_smart?			( udev )"
-
-PATCHES=()
-
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-# @FUNCTION: collectd_plugin_kernel_linux
-# @DESCRIPTION:
-# USAGE: <plugin name> <kernel_options> <severity>
-# kernel_options is a list of kernel configurations options; the check tests whether at least
-#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
-#   is emitted.
-collectd_plugin_kernel_linux() {
-	local multi_opt opt
-	if has ${1} ${COLLECTD_ALL_PLUGINS}; then
-		if use collectd_plugins_${1}; then
-			for opt in ${2}; do
-				if linux_chkconfig_present ${opt}; then
-					return 0;
-				fi
-			done
-			multi_opt=${2//\ /\ or\ }
-			case ${3} in
-				(info)
-					elog "The ${1} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(warn)
-					ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(error)
-					eerror "The ${1} plugin needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
-				;;
-				(*)
-					die "function collectd_plugin_kernel_linux called with invalid third argument"
-				;;
-			esac
-		fi
-	fi
-}
-
-collectd_linux_kernel_checks() {
-	if ! linux_chkconfig_present PROC_FS; then
-		ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
-	fi
-
-	if ! linux_chkconfig_present SYSFS; then
-		ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
-	fi
-
-	# battery.c: /proc/pmu/battery_%i
-	# battery.c: /proc/acpi/battery
-	collectd_plugin_kernel_linux battery ACPI_BATTERY warn
-
-	# cgroups.c: /sys/fs/cgroup/
-	collectd_plugin_kernel_linux cgroups CGROUPS warn
-
-	# cpufreq.c: /sys/devices/system/cpu/cpu%d/cpufreq/
-	collectd_plugin_kernel_linux cpufreq SYSFS warn
-	collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
-
-	# drbd.c: /proc/drbd
-	collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
-
-	# conntrack.c: /proc/sys/net/netfilter/*
-	collectd_plugin_kernel_linux conntrack NETFILTER warn
-
-	# fscache.c: /proc/fs/fscache/stats
-	collectd_plugin_kernel_linux fscache FSCACHE warn
-
-	# nfs.c: /proc/net/rpc/nfs
-	# nfs.c: /proc/net/rpc/nfsd
-	collectd_plugin_kernel_linux nfs NFS_COMMON warn
-
-	# serial.c: /proc/tty/driver/serial
-	# serial.c: /proc/tty/driver/ttyS
-	collectd_plugin_kernel_linux serial SERIAL_CORE warn
-
-	# swap.c: /proc/meminfo
-	collectd_plugin_kernel_linux swap SWAP warn
-
-	# thermal.c: /proc/acpi/thermal_zone
-	# thermal.c: /sys/class/thermal
-	collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
-
-	# turbostat.c: /dev/cpu/%d/msr
-	collectd_plugin_kernel_linux turbostat X86_MSR warn
-
-	# vmem.c: /proc/vmstat
-	collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
-
-	# vserver.c: /proc/virtual
-	collectd_plugin_kernel_linux vserver VSERVER warn
-
-	# uuid.c: /sys/hypervisor/uuid
-	collectd_plugin_kernel_linux uuid SYSFS info
-
-	# wireless.c: /proc/net/wireless
-	collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
-
-	# zfs_arc.c: /proc/spl/kstat/zfs/arcstats
-	collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if linux_config_exists; then
-			einfo "Checking your linux kernel configuration:"
-			collectd_linux_kernel_checks
-		else
-			elog "Cannot find a linux kernel configuration. Continuing anyway."
-		fi
-	fi
-
-	if use collectd_plugins_java; then
-		java-pkg-opt-2_pkg_setup
-	fi
-
-	use collectd_plugins_python && python-single-r1_pkg_setup
-
-	enewgroup collectd
-	enewuser collectd -1 -1 /var/lib/collectd collectd
-}
-
-src_prepare() {
-	default
-
-	# There's some strange prefix handling in the default config file, resulting in
-	# paths like "/usr/var/..."
-	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
-
-	# Adjust upstream's systemd unit
-	#   - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
-	#   - Add User=collectd to run collectd as user "collectd" per default
-	sed -i \
-		-e '/^EnvironmentFile=.*/d' \
-		-e '/^\[Service\]/aUser=collectd' \
-		contrib/systemd.${PN}.service || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
-	# should work independent of the operating system.
-
-	local linux_plugins="barometer battery cpu cpufreq disk
-		drbd entropy ethstat hugepages interface iptables
-		ipvs irq ipc load memory md netlink nfs numa processes
-		serial swap tcpconns thermal turbostat users vmem wireless
-		zfc_arc"
-
-	local need_libstatgrab=0
-	local libstatgrab_plugins="cpu disk interface load memory swap users"
-	local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
-
-	local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
-
-	local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
-	local myos_plugins=""
-	if use kernel_linux; then
-		einfo "Enabling Linux plugins."
-		myos_plugins=${linux_plugins}
-	elif use kernel_FreeBSD; then
-		einfo "Enabling FreeBSD plugins."
-		myos_plugins=${bsd_plugins}
-	elif use kernel_Darwin; then
-		einfo "Enabling Darwin plugins."
-		myos_plugins=${darwin_plugins}
-	fi
-
-	local myconf="--disable-werror"
-
-	# Do we debug?
-	myconf+=" $(use_enable debug)"
-
-	# udev support?
-	# Required for smart plugin via REQUIRED_USE; Optional for disk plugin
-	if use udev; then
-		myconf+=" --with-libudev"
-	else
-		myconf+=" --without-libudev"
-	fi
-
-	local plugin
-
-	# Disable what needs to be disabled.
-	for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
-		if [[ "${plugin}" == 'dpdkstat' ]]; then
-			myconf+=" --without-libdpdk"
-		else
-			myconf+=" --disable-${plugin}"
-		fi
-	done
-
-	# Set enable/disable for each single plugin.
-	for plugin in ${COLLECTD_ALL_PLUGINS}; do
-		if has ${plugin} ${osdependent_plugins}; then
-			# plugin is os-dependent ...
-			if has ${plugin} ${myos_plugins}; then
-				# ... and available in this os
-				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-				# ... must we link against libstatgrab? Bug #541518
-				if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
-					einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
-					need_libstatgrab=1
-				fi
-			else
-				# ... and NOT available in this os
-				if use collectd_plugins_${plugin}; then
-					ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
-					ewarn "kernel. Disabling it automatically."
-				fi
-				myconf+=" --disable-${plugin}"
-			fi
-		elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
-			if use collectd_plugins_perl && ! use perl; then
-				ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
-				myconf+= --disable-perl
-			else
-				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-			fi
-		else
-			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
-		fi
-	done
-
-	if [ "${need_libstatgrab}" -eq 1 ]; then
-		myconf+=" --with-libstatgrab"
-	else
-		myconf+=" --without-libstatgrab"
-	fi
-
-	# JAVA_HOME is set by eclasses.
-	if use collectd_plugins_java; then
-		myconf+=" --with-java"
-	fi
-
-	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
-	# lots of libs are only needed for plugins, if they are disabled, also disable the lib
-	use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
-	use collectd_plugins_openldap || myconf+=" --with-libldap=no"
-	use collectd_plugins_redis    || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
-	use collectd_plugins_smart    || myconf+=" --with-libatasmart=no"
-	use collectd_plugins_gps      || myconf+=" --with-libgps=no"
-
-	if use perl; then
-		myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
-	else
-		myconf+=" --without-perl-bindings"
-	fi
-
-	# No need for v5upgrade
-	myconf+=" --disable-target_v5upgrade"
-
-	# Python
-	if use collectd_plugins_python; then
-		myconf+=" --with-libpython=yes"
-		export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
-	else
-		myconf+=" --with-libpython=no"
-	fi
-
-	# XFS support
-	myconf+=" $(use_enable xfs)"
-
-	# Finally, run econf.
-	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
-		$(use_enable static-libs static) \
-		--localstatedir=/var ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" install
-
-	perl_delete_localpod
-
-	find "${ED}"usr/ -name "*.la" -delete || die
-
-	if use collectd_plugins_java; then
-		java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
-	fi
-
-	fowners root:collectd /etc/collectd.conf
-	fperms u=rw,g=r,o= /etc/collectd.conf
-
-	dodoc AUTHORS ChangeLog README
-
-	if use contrib ; then
-		insinto /usr/share/doc/${PF}
-		doins -r contrib
-	fi
-
-	keepdir /var/lib/${PN}
-	fowners collectd:collectd /var/lib/${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
-	systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":#PIDFile     "/run/collectd.pid":' "${ED}"etc/collectd.conf || die
-	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/run/collectd/collectd.socket":' "${ED}"etc/collectd.conf || die
-	sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n#   Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
-	sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n#   Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-
-	if use filecaps; then
-		local caps=()
-		use collectd_plugins_ceph      && caps+=('CAP_DAC_OVERRIDE')
-		use collectd_plugins_exec      && caps+=('CAP_SETUID' 'CAP_SETGID')
-		use collectd_plugins_iptables  && caps+=('CAP_NET_ADMIN')
-		use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
-
-		if use collectd_plugins_dns || use collectd_plugins_ping; then
-			caps+=('CAP_NET_RAW')
-		fi
-
-		if use collectd_plugins_turbostat || use collectd_plugins_smart; then
-			caps+=('CAP_SYS_RAWIO')
-		fi
-
-		if [ ${#caps[@]} -gt 0 ]; then
-			local caps_str=$(IFS=","; echo "${caps[*]}")
-			fcaps ${caps_str} usr/sbin/collectd
-			elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
-			elog "  ${caps_str}+EP"
-			elog
-
-			local systemd_unit="$(systemd_get_systemunitdir)/collectd.service"
-			if [[ -e "${systemd_unit}" ]]; then
-				caps_str="${caps[*]}"
-				sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
-					die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
-
-				elog "CapabilityBoundingSet in '${systemd_unit}'"
-				elog "updated to match capabilities set above."
-				elog
-			else
-				if has_version "sys-apps/systemd"; then
-					# Bug 596852
-					ewarn "Failed to update CapabilityBoundingSet in '${systemd_unit}'"
-					ewarn "because unit was not found. Please file a bug about this."
-				fi
-			fi
-		fi
-	fi
-
-	elog "Note: Collectd is only the collector."
-	elog "      You need to install 'data' sources (applications) locally or"
-	elog "      remotely on your own."
-
-	elog
-	elog "Collectd is configured to run as unprivileged user by default."
-	elog "You may want to revisit the configuration."
-	elog
-
-	if use collectd_plugins_email; then
-		ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
-	fi
-
-	if use collectd_plugins_smart; then
-		elog ""
-		elog "If you are using smart plugin and don't run collectd as root make sure"
-		elog "that the collectd user is allowed to access the disk you want to monitor"
-		elog "(can be done via udev rule for example) and that collectd has the required"
-		elog "capabilities set (which is the default when package was emerged with"
-		elog "'filecaps' USE flag set)."
-	fi
-
-	if use contrib; then
-		elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
-		elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
-	fi
-}
diff --git a/app-metrics/collectd/files/collectd-5.9.1-fixup.patch b/app-metrics/collectd/files/collectd-5.9.1-fixup.patch
new file mode 100644
index 000000000000..93f97d95a9c4
--- /dev/null
+++ b/app-metrics/collectd/files/collectd-5.9.1-fixup.patch
@@ -0,0 +1,81 @@
+--- a/src/daemon/plugin.c
++++ b/src/daemon/plugin.c
+@@ -647,7 +647,8 @@ static void start_read_threads(size_t num) /* {{{ */
+     }
+ 
+     char name[THREAD_NAME_MAX];
+-    snprintf(name, sizeof(name), "reader#%" PRIu64, (uint64_t)read_threads_num);
++    ssnprintf(name, sizeof(name), "reader#%" PRIu64,
++              (uint64_t)read_threads_num);
+     set_thread_name(read_threads[read_threads_num], name);
+ 
+     read_threads_num++;
+@@ -836,8 +837,8 @@ static void start_write_threads(size_t num) /* {{{ */
+     }
+ 
+     char name[THREAD_NAME_MAX];
+-    snprintf(name, sizeof(name), "writer#%" PRIu64,
+-             (uint64_t)write_threads_num);
++    ssnprintf(name, sizeof(name), "writer#%" PRIu64,
++              (uint64_t)write_threads_num);
+     set_thread_name(write_threads[write_threads_num], name);
+ 
+     write_threads_num++;
+--- a/src/intel_rdt.c
++++ b/src/intel_rdt.c
+@@ -325,8 +325,12 @@ static int strlisttoarray(char *str_list, char ***names, size_t *names_num) {
+       continue;
+ 
+     if ((isdupstr((const char **)*names, *names_num, token))) {
+-      ERROR(RDT_PLUGIN ": Duplicated process name \'%s\' in group \'%s\'",
+-            token, str_list);
++      if (str_list != NULL)
++        ERROR(RDT_PLUGIN ": Duplicated process name \'%s\' in group \'%s\'",
++              token, str_list);
++      else
++        ERROR(RDT_PLUGIN ": Duplicated process name \'%s\'", token);
++
+       return -EINVAL;
+     } else {
+       if (0 != strarray_add(names, names_num, token)) {
+--- a/src/intel_rdt.c
++++ b/src/intel_rdt.c
+@@ -325,11 +325,7 @@ static int strlisttoarray(char *str_list, char ***names, size_t *names_num) {
+       continue;
+ 
+     if ((isdupstr((const char **)*names, *names_num, token))) {
+-      if (str_list != NULL)
+-        ERROR(RDT_PLUGIN ": Duplicated process name \'%s\' in group \'%s\'",
+-              token, str_list);
+-      else
+-        ERROR(RDT_PLUGIN ": Duplicated process name \'%s\'", token);
++      ERROR(RDT_PLUGIN ": Duplicated process name \'%s\'", token);
+ 
+       return -EINVAL;
+     } else {
+--- a/src/syslog.c
++++ b/src/syslog.c
+@@ -51,8 +51,7 @@ static int sl_config(const char *key, const char *value) {
+     log_level = parse_log_severity(value);
+     if (log_level < 0) {
+       log_level = LOG_INFO;
+-      ERROR("syslog: invalid loglevel [%s] defaulting to 'info'", value);
+-      return 1;
++      WARNING("syslog: invalid loglevel [%s] defaulting to 'info'", value);
+     }
+   } else if (strcasecmp(key, "NotifyLevel") == 0) {
+     notif_severity = parse_notif_severity(value);
+--- a/src/utils/common/common.c
++++ b/src/utils/common/common.c
+@@ -99,10 +99,7 @@ int ssnprintf(char *str, size_t sz, const char *format, ...) {
+ 
+   va_end(ap);
+ 
+-  if (ret < 0) {
+-    return ret;
+-  }
+-  return (size_t)ret >= sz;
++  return ret;
+ } /* int ssnprintf */
+ 
+ char *ssnprintf_alloc(char const *format, ...) /* {{{ */
diff --git a/app-metrics/prom2json/Manifest b/app-metrics/prom2json/Manifest
index 4ea08c2b5ec4..3397969471b8 100644
--- a/app-metrics/prom2json/Manifest
+++ b/app-metrics/prom2json/Manifest
@@ -1,3 +1,3 @@
 DIST prom2json-0.1.0_p20170523.tar.gz 129179 BLAKE2B ef0e42e340d53894c31bff7018b668d8575fc3568584a43dc308955665ac6f59dbabf2d4605bc2a66957df57a29ebb7b3a4eef1f99537eefc2805a5ffd86904f SHA512 824f4c43f4a167dc7dde2f11e84cf482e5cdfa26ab11caf08a5461d525543c3491180f54694c4ae61fdd5dc9763ff16f6e29b332a64dc3ac52fdb7b9c0902571
 EBUILD prom2json-0.1.0_p20170523.ebuild 921 BLAKE2B 8c4c359398fd7941f127c2fec6f8a0306f53dee43d2948873ffffe840b27f35ce2753c787f2bdfc6445ef9371fa10b4edc36dc3c2565e358ee7f9c8fe868b6ad SHA512 85ba4728a68ea42bc69f196e0e027f38ece006b9af5b2c9fe2da30b2605f79dc568017132e2eaa116b109bc7f18109581c8d69df641f82c7ce0066ea5dd9d3f2
-MISC metadata.xml 330 BLAKE2B 0e691de7e25e1287ed59fe2606e788b073ca53a20e893ca26ae274968f42050cc6c86e8b62dbdfdd361d98f212386249cb0d028de54f52f6cc3e1b211e2da679 SHA512 17cb63ee862d80eb3e6d15cd209acee351873802eae2f3a943b17b68e8d042706c2eb6e4ee9b5bdc6e0c9901888eadf6fbd3ee9969a517f417b25237b70b5470
+MISC metadata.xml 252 BLAKE2B ba7b5183b5a1685794845e1070f0024be5bdd6e73f2727a3f905189d68851416ee0ce6a2d481da059964761cfa256581c75b5d96fd36455bb56cc0f7be4cc85a SHA512 2d90bda7f93668f2b160b8bc41c11aa0d5a9aed5c195534c691aa221500cfd27097c5180001a59be5b4d8a28fd4244d64966ee1a918806589d18e8b3c428d248
diff --git a/app-metrics/prom2json/metadata.xml b/app-metrics/prom2json/metadata.xml
index eaf3cc3d6f87..a4d942c42b71 100644
--- a/app-metrics/prom2json/metadata.xml
+++ b/app-metrics/prom2json/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">prometheus/prom2json</remote-id>
 	</upstream>
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index 85a619ff184d..16e50106289b 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -2,7 +2,9 @@ AUX prometheus-3.initd 851 BLAKE2B 600d9e541206f99c0ddddc0f5a1d37d9bea69d8f45ce6
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
 AUX prometheus.initd 929 BLAKE2B d48650b11b77d4d04b5458682456fb20f8085dc3efe9d0ddd2a6c75751ddae156bbb83c20082bc7b6833395602c24da61e2f7610bdff291e05e3eeb4fb651317 SHA512 504122eb8ed19beac81987b77eb78bba9b36b2ef15f28b1a542804271046e06363baf464f3c303982f647eba65fbc2b5459235f56625e1ff3fed9834937cd0d2
 DIST prometheus-2.11.2.tar.gz 12132678 BLAKE2B 0b6b9a93b7329c124f901d0acc6130132aa187142f0416e087c12f20b0cd35f8564a27d0df8c0bc811284b9811f446344adf700d6611afac3c5c1131c208b341 SHA512 cecdaf4522885bdf62492667d92475a97c54b04c1e93f48b6078def319fe33f5e28aafbab61e3609413615d6f853e817564fc372e5d1df0d867fe9fa333f6de9
+DIST prometheus-2.12.0.tar.gz 15221347 BLAKE2B 6061562e6bafe8e2373ad676e7acd2b5d5ff8e195cf4c1abd709347992c16970b64b225e9f58f33a801ff521abc78422281d97d8c5307a80a64fb8c8a8d8d5fe SHA512 3d3b5ce3afd13714a8fa96964784fa40feb650459f657cbc695c6a7e866f89c488132b408d78ea101804532768c51c3913607bf001f27d3f05c3df9efe3cab82
 DIST prometheus-2.9.2.tar.gz 11477683 BLAKE2B f0c18c57ff0fe292710174a91080a84ecf0375b4335aacaf4a8e32c842a9346b9fd48888ef8a19a597511c57eb8af7f90cca57d0cc51b9de4558c3f22953d165 SHA512 4cce1827580e49b1659ad492de946a81694c1dab90e079f3f0e56c1991254cf4ecac7f052aac75bf58a0b95d3cf4daa8c15b3e8305a3c089570da40c44a8ccc0
 EBUILD prometheus-2.11.2.ebuild 2006 BLAKE2B 9eb972c513982c3e8321b87490180b95048e4cb46aa64f879735f3e3c729d742cb3d2ced1873a6a4c24b8cab7a94ca95b5d41190a6a20a26ee778f63b194d770 SHA512 89b982df1c665375c9eaa9b43373ae725fec9d72b70087615f72f4c017557d6637353cdd57870b6eac1c5fcf3a1a1ed98c8b80d9c00197c8bfce31f6c14877ec
+EBUILD prometheus-2.12.0.ebuild 2006 BLAKE2B 7c5210d97d11e7552736f856d9ac635128cac842e2d62193acef410c44eb5defc54999f51231f3b4c9ab06ecaaa82a99bfaa447655c46606a57eb46f6d4a2b38 SHA512 86bb69a89c4449e173afb456c48d54647e1628957cc538cb95cb9eabc0f817f4afdd37c50b697f03938f2b9e93e93345d45813902119d122b85f9f98174a131f
 EBUILD prometheus-2.9.2.ebuild 2005 BLAKE2B be44fa8627cb4ba1be2f6696bf8a7086bdf720508bf1fd47d451f7fcc0d54b7f97e6ba1c46260a71dca1a18fbca3013ae861cdf6437c6d9a25140e731d10e5d7 SHA512 937cac2265388d791b486b5131692f3d8fa30bf0fe20d76fe35f0ea44087a9fb036a5557a3deb70d8627ba4783525ce8510f9531190a097ffea6f91834161f7d
 MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/app-metrics/prometheus/prometheus-2.12.0.ebuild b/app-metrics/prometheus/prometheus-2.12.0.ebuild
new file mode 100644
index 000000000000..5a036cba4edc
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.12.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/prometheus"
+MY_PV=v${PV/_rc/-rc.}
+PROMETHEUS_COMMIT="43acd0e"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/go-1.12
+	>=dev-util/promu-0.3.0"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup prometheus
+	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin promtool prometheus
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+	popd || die
+
+	newinitd "${FILESDIR}"/prometheus.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 0dbd729556e8..89f6e022db90 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/banner/Manifest b/app-misc/banner/Manifest
index 4ccc9a52f7ef..26c2ba250916 100644
--- a/app-misc/banner/Manifest
+++ b/app-misc/banner/Manifest
@@ -1,4 +1,6 @@
 AUX banner-1.3.3-ctype.h.patch 158 BLAKE2B efdf872b1d26d0bba8e3886b406e1642968aa4207c5d136a8558da37f5fd51113a5884a900584f13c98200471aea2e7ecaf61e97efbb63d244c31ecc1fa0e8ed SHA512 84fa0555f3fd6c41c3cdf06db92711e9be4c08e32b182ffdcd1385cccdf0d9056a7e3c61431e4a73d660b3314f763ad7e109f0b84105bd555e0c5d60a63746d8
 DIST banner-1.3.3.tar.gz 114237 BLAKE2B ea9773ce8b65ed7deb5ec377b53ab974bbb4760627788b461f5715b15f99bcde25e2f58f7fb69d937ede30de8f87be7eabb662a05c7d8c574df298446ba21649 SHA512 38f16f2a25bd7fb270056ebe43691c989a808891ecc75e4f794456d1752a07002efb7ba7b90a2000a40704e6b6f11760b47a3fe59deeb05ff3578f0d982f7d96
+DIST banner-1.3.4.tar.gz 120537 BLAKE2B c50952b7e4f73b896ef204914479ffe7c2ac2ec7a0d979f076a0134c3cc6280d01be448f08fe3914cca4b144798c1d9a68042826ec81f55353596be1c3420aa8 SHA512 c98b4b690e73d04fd9731a291e80e89b234f1af47541fbb2eb9edcb987a7c029485dedc1eef6a479fe4f876cfd4d41b090bf6c3685a8c54e4c658b76cc9cec20
 EBUILD banner-1.3.3.ebuild 492 BLAKE2B 3bc39ee1df2bf845a929f6ed8c1d1f1841dd02e7ae12a64477c9c3035d572008e61732a5ca8815aaabf9f29ca796ea168ed81cf5467aa24c4d1e91df4d0a9891 SHA512 b25184eae18eb9918ad8873d38a5002d2cf7e9fdaebd1439a6d18014aede27ee87a3598d0a7e5a8a881d437de476f45b4f739013d949d59129b4d54ab476a4f2
+EBUILD banner-1.3.4.ebuild 459 BLAKE2B 2b434dacf121b47770712f14eb8863fcbba3d2d7b699c085648c4c72cd27471531e72595bd7b68e14ed8d46fac50b32f4a1ef6a530795b86cb1f0124a7d09e82 SHA512 5ef0de83a0a226ce301b695961388a535967dd62fa97e901aedb659407d00b1cc2b0d9a818a8939da80d791bc292c680f92978f22290a214d5d61d1523a6175f
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/app-misc/banner/banner-1.3.4.ebuild b/app-misc/banner/banner-1.3.4.ebuild
new file mode 100644
index 000000000000..43101c37386b
--- /dev/null
+++ b/app-misc/banner/banner-1.3.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="The well known banner program for Linux"
+HOMEPAGE="http://cedar-solutions.com/"
+SRC_URI="${HOMEPAGE}ftp/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="!games-misc/bsd-games"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.3-ctype.h.patch
+)
diff --git a/app-misc/btail/Manifest b/app-misc/btail/Manifest
index 6e79b4f9e7d5..b0d146c6fba4 100644
--- a/app-misc/btail/Manifest
+++ b/app-misc/btail/Manifest
@@ -1,3 +1,3 @@
 DIST btail-0.3.tgz 7402 BLAKE2B 4d7fb1ce1e89aca6e4ff9b45866296b40f960fad751ff211b551655fd62ef125b3c5397c165f221feaa7070530930d65c5af1a90536faea2b112664b823c19fc SHA512 1b27b6fff41b5e69119526115d5c3d239d106303923796121829729617765354cbd3f769b95c8fd32cd5a181475c3cde0ffe2accaae44ae461966df46bb990ee
-EBUILD btail-0.3-r1.ebuild 735 BLAKE2B 78c7d8080011982cd700ac4286cf26bc06bf6d01c62e093cfd52c4dbe9661d5811381cfac5e24fd897207e5117ea1aea20ad89fc7266872a39df8c88d2f688a2 SHA512 762dfac27c90b72eb733148403d25641fb93f4e1132490f03c83621fbf742fb559161e50d5f642b62b467f8619a49320fb86238412e6e4f59b00df18e72d9384
+EBUILD btail-0.3-r1.ebuild 756 BLAKE2B 3a7fe184f5bd115e3e7ea1e40e6ba43d79b9828632cd610c339a9eadaf851150bc6fda4dc4102ae2734d8c522d4bb6f85b9250e43650002464dd526f37c410c2 SHA512 ea5884baeecb049ccae6bb5215028cc4303e3499959ed9178e4af853910d7dffe26bb267580317608506d384c4d0073d54040fb716ad0d715e69e92364d7a587
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/btail/btail-0.3-r1.ebuild b/app-misc/btail/btail-0.3-r1.ebuild
index b434b22da8da..30747c72fb00 100644
--- a/app-misc/btail/btail-0.3-r1.ebuild
+++ b/app-misc/btail/btail-0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Bayesian logfile filter"
 HOMEPAGE="https://www.vanheusden.com/btail/"
-SRC_URI="${HOMEPAGE}/${P}.tgz"
+SRC_URI="https://www.vanheusden.com/btail/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-misc/clockywock/Manifest b/app-misc/clockywock/Manifest
index cb0d0dc130ef..6e6d19775171 100644
--- a/app-misc/clockywock/Manifest
+++ b/app-misc/clockywock/Manifest
@@ -1,4 +1,4 @@
-AUX clockywock-0.3.1a-makefile.patch 264 BLAKE2B de6b34cc77f3310f1e1942d6c71f5b024eaa033aad11261d8719c86d63697986f503afd28e3398c9aa34e979b79cc0190b57b7a40aca1ca00da816f1caf62b74 SHA512 a60c4c987cdaca2bea2afda3f1d208489e2f3c6701e162d9f051ac9ffb212116749d3d3cf7155ef86f79e4a4ee818970bda29a07bfe0881342a59f51c6cbfbfb
+AUX clockywock-0.3.1a-makefile.patch 316 BLAKE2B 3f466b270d5b8da6b5b0dce42d742ab3dffd0859a1428a5228978226398574d3dd4cf6f07d34f9d8909a5161e65fdf7a43419c4fc1ae6c5d0ff4d07f687e2ac1 SHA512 b14a0ba3bf3a8beb1b152d5fe51e0a37dcd4dc68f655de18e45756eb90cd8a73b04748558c6d9481a34287911e1724d3317834891cf7bb748aa9168a2f6af9ff
 DIST clockywock-0.3.1a.tar.gz 15004 BLAKE2B 8b2838a1aab735243c8fd663bfb96a668f5efdba59b4e18ab10e5d365b539b26d915d384433441d0d37e4a9291920267a0a091b4b7d1e5002e72ab6b37e2b495 SHA512 1d4f6e0a2e9cd8f459346aa4778ed4da0f1ce8e2b0b8bfed97a90c286d79199cefa609976c6d6139f1acdaccfc07f5f84e46d2f54e397ff8e9b2b450d06399a9
-EBUILD clockywock-0.3.1a.ebuild 578 BLAKE2B f4ea4911e47c85033f2cbfc61b3c111167c0a716ca1bf3f18342420f239c232e7e8910bc93573094a9c67b8824a2cf0a1898c672afe8d274725f1e691ca870c2 SHA512 13f7c180cca8aa6cd052a52324b29ecfc441be786e5fdb8c3d27f94f187793e6a4827932bc6620f94700d10339356da1c4a16117be856ad5d54d529c37a94b60
+EBUILD clockywock-0.3.1a.ebuild 595 BLAKE2B e3a24fc36d762556aa7ea5b906ab22cf92ae8305e1da86fd75c982ab8bfc6c920c1f388c92a72c1269b998e1dd67734c587dfe14d23cd3eca0dade9b801263cf SHA512 92299bc3c9802b46fc2c726fc2509d8985890efa1fa9e3904c1f5a327bc1289e3069fae8139d0d853100b38485f3b1951a023ecd01a48a246f3e2a01b89dcd4e
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/app-misc/clockywock/clockywock-0.3.1a.ebuild b/app-misc/clockywock/clockywock-0.3.1a.ebuild
index 26f1be9445c7..1477cdb488e8 100644
--- a/app-misc/clockywock/clockywock-0.3.1a.ebuild
+++ b/app-misc/clockywock/clockywock-0.3.1a.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 toolchain-funcs
 
@@ -14,7 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
 
 PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
 
diff --git a/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch b/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch
index e6f5bd510dc3..cb1521947a7c 100644
--- a/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch
+++ b/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch
@@ -1,7 +1,8 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -1,5 +1,6 @@
-+LIBS += -lncurses -lpthread
+@@ -1,5 +1,7 @@
++PKGCONFIG ?= pkg-config
++LIBS += $(shell $(PKGCONFIG) --libs ncurses) -lpthread
  all:
 -	g++ -O3 -Wall -o clockywock clockywock.cpp -lncurses -lpthread
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o clockywock clockywock.cpp $(LIBS)
diff --git a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest
index 82573339df96..f4e58205f277 100644
--- a/app-misc/editor-wrapper/Manifest
+++ b/app-misc/editor-wrapper/Manifest
@@ -1,3 +1,3 @@
-AUX editor-wrapper-4.sh 405 BLAKE2B 0d1e023e9865f0278bd2fb5e0ceeb0bd8b92befe5544186d163946d7efe6f0a6749184052927b6d60adfec8b2b703168a85fb968bef50702ab42bbbec8bd73fc SHA512 b29f54c662494f9ed0d26c44a8a9a85e22d0d3d70c870fdb8eda3fe1a97ed188e5b8299ed524a5e00f7cb1a3603be340e544192e75b98daa6afda6b2c185faa8
-EBUILD editor-wrapper-4.ebuild 893 BLAKE2B 0fa2c0b55a3731b9404d58ab0f7fbde02bfad54101492809e140c0f4154d7487d03c967a320a74eac08cfa71d1b6331ff6bba4e757f6685fa9a4a714e1f742dd SHA512 715810f0c2b7f95cf8b3e89a9d8b472ae6acdb1c11826862dc7c5e5b07d3d76ec85a25c761da032affaf5caa7d0bf16f1104a78cb210414828f99f766f79b032
+AUX editor-wrapper-4.sh 402 BLAKE2B 1cbdc02b300968ad6d8e6b68dbc27507d92820373efd3101f85c170c2a1e7a9e3114558fb04dcf0ce91a5ea094781f1c50c2c92ead0421f9ac8e2dc24aaf09e0 SHA512 502f8018d3c135ac05081cb896cad0296cc94f636a2410562afd915d9e44be3c2d71db319a803f5453396ebc2509cce0d5b4c5affdca875a27de2b0da1101052
+EBUILD editor-wrapper-4-r1.ebuild 887 BLAKE2B 36cb980bef87a67f3b5878e0ba418b6dd0cc53ca5636745b3590e69c210d47ec6492bd93f2a555d05b03a179264105afa987954b1f14041995cd7b9b7fa1e800 SHA512 43e852ed1b5fa58ec08024c7a162ca9812eee9a9d6ddc2938738c72ecb659b79f74e4c52665cf082f2871dca538ea99e989aef2eb16ab20fddb741f7b08e67ed
 MISC metadata.xml 367 BLAKE2B c144d95fdc55aafe6dfe786f325aea6756cb51e05b7b370392bf201e5daf827ddd5b0b755d5d37d6e2a06f7929af634223f2d33a1e0e0684677ca90464e5e4df SHA512 f566d335cb37d8d951e7b86e3f4a3bafa5ed2d1b270d5d730c6e9576230848e64849f7ebf0a133a7572847faf0c075f0158f125c3f29d941b598b46ca0c7f4c3
diff --git a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
new file mode 100644
index 000000000000..361c762024fa
--- /dev/null
+++ b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wrapper scripts that will execute EDITOR or PAGER"
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	sed -e 's/@VAR@/EDITOR/g' "${FILESDIR}/${P}.sh" >editor || die
+	sed -e 's/@VAR@/PAGER/g'  "${FILESDIR}/${P}.sh" >pager  || die
+	if use prefix ; then
+		sed -i \
+			-e "s:#!/bin/sh:#!/usr/bin/env sh:" \
+			-e "s: /etc/profile: \"${EPREFIX}/etc/profile\":" \
+			editor pager || die
+	fi
+	eapply_user
+}
+
+src_install() {
+	exeinto /usr/libexec
+	doexe editor pager
+}
diff --git a/app-misc/editor-wrapper/editor-wrapper-4.ebuild b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
deleted file mode 100644
index 888c907c4373..000000000000
--- a/app-misc/editor-wrapper/editor-wrapper-4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Wrapper scripts that will execute EDITOR or PAGER"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_prepare() {
-	sed -e 's/@VAR@/EDITOR/g' "${FILESDIR}/${P}.sh" >editor || die
-	sed -e 's/@VAR@/PAGER/g'  "${FILESDIR}/${P}.sh" >pager  || die
-	if use prefix ; then
-		sed -i \
-			-e "s:#!/bin/sh:#!/usr/bin/env sh:" \
-			-e "s: /etc/profile: \"${EPREFIX}/etc/profile\":" \
-			editor pager || die
-	fi
-}
-
-src_install() {
-	exeinto /usr/libexec
-	doexe editor pager
-}
diff --git a/app-misc/editor-wrapper/files/editor-wrapper-4.sh b/app-misc/editor-wrapper/files/editor-wrapper-4.sh
index b58f1a8b9eeb..9c8fe9599552 100644
--- a/app-misc/editor-wrapper/files/editor-wrapper-4.sh
+++ b/app-misc/editor-wrapper/files/editor-wrapper-4.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2009-2011 Gentoo Foundation
+# Copyright 2009-2011 Gentoo Authors
 # Distributed under the terms of the MIT/X11 license
 
 # Wrapper script, executes ${@VAR@} with arguments $@
diff --git a/app-misc/fslint/Manifest b/app-misc/fslint/Manifest
index deba3163ea2c..48311e9b4abf 100644
--- a/app-misc/fslint/Manifest
+++ b/app-misc/fslint/Manifest
@@ -1,3 +1,3 @@
 DIST fslint-2.46.tar.xz 135988 BLAKE2B e4cd1187222f9a959c23ea0606263489d6cd52ae1e2f0f4fd4ac859fc516073f3d5186e7bc77a782ab1a698db182e7082333020b25a8f5a705bd1265d99e7ba4 SHA512 7b6122b5920d37548cfb05bb986cc29a86c7de9f549375923299c23fe19cbc8c6a521feafcf6df6fe0562dae8b6a4e804f24fdf5a833ea2b68308be41a96b696
-EBUILD fslint-2.46.ebuild 2137 BLAKE2B 5dbf48e8c1d655c5d8d6b40b18657fabe18e7e36bd9e6e44ca75c08313fff06198ec43c55da82280fa158bb188e017a5daee6cf6932fd31f21082cac1fc2fe80 SHA512 b8244fbd2c91a810bca8b29a63d0a3fbfe9eec21934682d89989b1d7569338cf2b9ff8f266808b2bf7bdd4d0ebf23a416b1ffa9bd1c1a4066fd72790f68f7902
+EBUILD fslint-2.46.ebuild 2155 BLAKE2B 50735ff899c78b9550d09063d97f5e0ee9f44f1a3bdce9e12edc3080fc4c429fdba28949068d47d9a139aaf0ed9acf2ff8ed98c2afcd4ffb0e0f2effd4e1525f SHA512 0155cab9fe7fec66c24b5e14a7f4a4899da862d44759fb5533b10767987b932022238ba78f59d37f77245afa68b4bc57b44d7da52e2a3b301a0c8e2e53531d4e
 MISC metadata.xml 250 BLAKE2B 4e66f9af5f8e38f419fa14400bb846409e25a994b97c5ea4576b86ae5b601776c81fccbea03201d3414f9eb32cd0d12afee9babdb5e864338b1a86bfdbfa5cce SHA512 aba0ad6bb553b7f17cc5865b37e6ab4d7cb932b9384937bd8e2c8b254f9ba39afa3b1df70b83974c58076339fbf62b60f26d69f789e349f02b1d89dea299ce3a
diff --git a/app-misc/fslint/fslint-2.46.ebuild b/app-misc/fslint/fslint-2.46.ebuild
index 6e119a86e0a1..6d500bd232fc 100644
--- a/app-misc/fslint/fslint-2.46.ebuild
+++ b/app-misc/fslint/fslint-2.46.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit eutils python-r1
 
 DESCRIPTION="A utility to find various forms of lint on a filesystem"
 HOMEPAGE="http://www.pixelbeat.org/fslint/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
+SRC_URI="http://www.pixelbeat.org/fslint/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-misc/glcdprocdriver/Manifest b/app-misc/glcdprocdriver/Manifest
index cefe62e3a6b4..d7343afc9e20 100644
--- a/app-misc/glcdprocdriver/Manifest
+++ b/app-misc/glcdprocdriver/Manifest
@@ -1,5 +1,5 @@
 DIST GLCDprocDriver-0.1.2.tar.gz 21438 BLAKE2B a480d241ad1f7b88ef63a0d2934d59325a9d5739497313c8bcc3f720a071d5bf2804986715e4392fc4713fc3641ae23e5f54cb81cdf1d45db9397d985555260a SHA512 b39dc9d68225bde63a053f124260cec9a081da1d2df6d245be109c8017d60e0e495f056fbc7ee077633d3ac68aaf7cdbaf606e1726f383aa583775a75eea5433
 DIST glcdprocdriver-0.0.6.tar.bz2 17209 BLAKE2B 631918337227c43eac163d7353182852500c08db0d1d0f3d4145d9b57895a66eb8c47a16715c1c0e4c3ab044a0de5ed80c282fd57850cbb33636cf775b721a4f SHA512 c489b6e6d6a72306867adb94ed6a6cf6354c834a27fd2ab2ac733707954b18bf93dc56a868e167fcb183602c03ac648bb941699760817e414ab8e8592edb8b7e
 EBUILD glcdprocdriver-0.0.6.ebuild 745 BLAKE2B 770037eff2b660262de1969140ca7ed5f5ca6bf6f0c2ec4682a7d211839347e07c626939f05c7103d58ea9b821297ece5b2ffad90f5651c19ad7ac5833c239be SHA512 3a7a28e045eafddbfc97b935454a557ead15aed88f1b6d2f9eed50f1fc1655c28a59b9bc810257a3de5eb32086e823e5821278c60672ab80b3a6caa263c81a65
-EBUILD glcdprocdriver-0.1.2.ebuild 783 BLAKE2B 5039121c747543732a54f633cf8f39d1e5a54581139ec067cd4c855957a3f75da4893ecfdf2e7e0fbe4ad1b554be4c325e02e46bcfdc5eda4ff5d0d30ffb7bd5 SHA512 ca342560344e98a407a37564adf4bd8d0aff3c66343af04caebb7f29764a0d28fde97076de63a0f3429a7e3e957c8468e8dbbb4df85738e72896288de18b6c33
+EBUILD glcdprocdriver-0.1.2.ebuild 777 BLAKE2B 3f91821217a37f85a059abebdb9549e882cad5421a0803b810ef34d065d528593c3105f99e3e3102345b301855ff50195f13c3e064d4cd3177058f92672e3f5f SHA512 4ea8fed15eff664e6c7670d964d3a51d782ffa3b7a04dae333df7255d7ac80662cfcf858a512c2e0c5f0854d2409db18b26601432635e6f6560c66517239c0ea
 MISC metadata.xml 1089 BLAKE2B c8d3e6cecf76a95e23b73b2411e68c0ad7174ce1dd497c50df74a7747bf6cc38267870522ba8eba50021f04c46365193516619f9b36aa6bab6b5fe6adc739241 SHA512 7d628191af503365b442deeb69fda18b451d34e87c903addec0cbdfc86c767522f11bfbd56ffa602c15cceb6355ab5844fba3390e5388cf333f5a458273efa4e
diff --git a/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild b/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
index baabf0037baf..98ad957b6215 100644
--- a/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
+++ b/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
@@ -29,7 +29,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${ED%/}/usr" INCDIR="${ED%/}/usr/share/include" LIBDIR="${ED%/}/usr/$(get_libdir)" install
+	emake DESTDIR="${ED}/usr" INCDIR="${ED}/usr/share/include" LIBDIR="${ED}/usr/$(get_libdir)" install
 
 	einstalldocs
 }
diff --git a/app-misc/hello/Manifest b/app-misc/hello/Manifest
index fafd38d9f843..22e3772070af 100644
--- a/app-misc/hello/Manifest
+++ b/app-misc/hello/Manifest
@@ -1,3 +1,3 @@
 DIST hello-2.10.tar.gz 725946 BLAKE2B 0af5a3890191dff6e570e2297c20f72c8d0598cadfc2b291e2fe3612e73f7eca48b3b63032c883f11a8a5764c757625c4a736904d756d451ad0516578040290f SHA512 e301d785135c52575a8b4c35994c0316f8d366451f604eb5e74c1f907077502aebd5a1a32cd1e26cd7ca32c22f4de5623a335f8ae7e735ac977420df664f01de
-EBUILD hello-2.10.ebuild 475 BLAKE2B 61041ddbbf448073cebbaadc8aeb57e2bfba978dc041719a5d4faf9a32f6f68db6e75d1598eacbb8a3838c064f3cdd11462802644a2e2dd7c6b91bf5d4a1cb8f SHA512 2c70757973aebaad59ae5dd1648ddbdda55d1f39567f123fb53fe4a1f1e9f383c3db4aba6537704fe799565c795d60dd32a74d52457f556ecad44779e36c6013
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
+EBUILD hello-2.10-r1.ebuild 470 BLAKE2B 4da043cb8d6542105fb3b7bda841d0b0c4246bba7124017ba153f95ee36da735d28b124ed4f1d979469aab64e9edc00ddb07dbe2e6e15c4cd45db07a0509f594 SHA512 f3d4bfed8c5729a4ae8fe089af1c33575f1f77127f45fd779e1a2d9962080e8d83e9e47405951485053dddca13110a55d2ad7f241c528a5b1f733af1029364a4
+MISC metadata.xml 247 BLAKE2B 9d65f58a46596a4c23d009a2d776c25c5a9dd76ac91ec6f6f548f5f786e43f0be694628bc528dc24d2fcb5efcf7cf95643aea633f12eda3d482d2d03a952d388 SHA512 44f366af35524b7fc87b2eb6c7241918d2afc9b30f1a28289d803ed0125e9099588a2bd99a75e34e3c70fde30765050e62ef5b47975e2a1860dd7a560709459d
diff --git a/app-misc/hello/hello-2.10-r1.ebuild b/app-misc/hello/hello-2.10-r1.ebuild
new file mode 100644
index 000000000000..0ebcf3ca6b47
--- /dev/null
+++ b/app-misc/hello/hello-2.10-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="GNU \"Hello, world\" application"
+HOMEPAGE="https://www.gnu.org/software/hello/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+DOCS=(AUTHORS ChangeLog ChangeLog.O NEWS README THANKS TODO contrib/evolution.txt)
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-misc/hello/hello-2.10.ebuild b/app-misc/hello/hello-2.10.ebuild
deleted file mode 100644
index c2b5e416b931..000000000000
--- a/app-misc/hello/hello-2.10.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="GNU \"Hello, world\" application"
-HOMEPAGE="https://www.gnu.org/software/hello/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls"
-
-DOCS=(AUTHORS ChangeLog ChangeLog.O NEWS README THANKS TODO contrib/evolution.txt)
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/app-misc/hello/metadata.xml b/app-misc/hello/metadata.xml
index 58f638b2ac3e..5f92e9ec0673 100644
--- a/app-misc/hello/metadata.xml
+++ b/app-misc/hello/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 9652cc0ed5d3..1737462264ed 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -18,5 +18,5 @@ DIST linux_input.docbook 1764 BLAKE2B 8e82173d0169e2e79f2625b7bd572409b10fff1ac1
 EBUILD lcdproc-0.5.2-r1.ebuild 5511 BLAKE2B eaa3431092a1e7794f24b7905e1c6c61a9d268179dfb093bd17a99aeb9a80a88ad9569a29ab8126db6bfeccd54369cce46513a3b625d15e8cdb7c9bc7003a7de SHA512 8a97517fa76ff856a7b56266efd77be52c269c1e651d7ff2bf836554be7bac84db3e0021d18a73592dfcb054a99f9efe7ca4de11f683d59f6a829523aae3f684
 EBUILD lcdproc-0.5.5.ebuild 5888 BLAKE2B 05f74abb99fba00d7cc2b2d633d0c41a743fe0537426b4997970d7fb2df1c89c5bb18e00ae24b7979a51de365f761672516ee266a6b570ed15deec484a8c8403 SHA512 3141859061d9a3d46814e361022c017ad1fab8eb92cad8a3561f371d03eef033908bd5d85391da5aa7a445309006a998699e2e5e412025ca074df5fd0f5ce130
 EBUILD lcdproc-0.5.6-r1.ebuild 6083 BLAKE2B 6d2a29febe9e6ba72fc254fb6d7c34f850dcf5b87f2115d01713b1eeac3b91b0e9004e2306b56774fe64cdbb261822dae08f50490d756a3f7cd2c58c9f52c006 SHA512 b18c7ccd63592c303081500055ada6e08c408002e0ed52e4a14fd6b799d0c70566104380eeaf1422fab424a9a68176fd37dcb2f99d614efb72587711476cd738
-EBUILD lcdproc-0.5.9.ebuild 6437 BLAKE2B 803505496345bf5fd2fd39ee27442f534e901ce49c1e79698bea44afb82e0ab886171cd397a7bb1379e87521bd3e63467a91ce5303187fbedd8f53f91376488f SHA512 e7e4b02d4693df9a6e0f7b7f16bda22d6b00298458c35f68ac6f60f845c314a24313b32e44f5688ef05049de2bcdcec628b7d7fb4b081faeee2568a5ebf58160
+EBUILD lcdproc-0.5.9.ebuild 6435 BLAKE2B b158f60e808abfe2f157dda515cd1a2d689936c524282a7d54e949e97d8cf158cbfc0b5db646036f7ed0da6738b2c23bb81f6ac4c0ce4ebe9f1f3020d340c0fd SHA512 b7287a7aaefc61f70dce9c54a90ef59d7272b6e5a3172cbb73ba6bfbc05f27b70f790bdc1ef6a03ade1b413f1aedeea811a1d79d9d4167c7a5cc9309a7af8c9c
 MISC metadata.xml 2157 BLAKE2B 4b4539bd61cdb9e6026a2b32552035f1601436867310469569875275dde9d8c55c2a0a8f161a545ddfa12608351360c3578539699cc0df3701b7af7fbeaef001 SHA512 70fb2fb6503b81394926e44a3d0110cae6955185b2c8d9f40ee9d37c8a967bbc0207318fa17076aa53cb3fa20c5f93e309729b763dc879604df9a8021216c733
diff --git a/app-misc/lcdproc/lcdproc-0.5.9.ebuild b/app-misc/lcdproc/lcdproc-0.5.9.ebuild
index a8eb7fee247f..7397f1bcdea2 100644
--- a/app-misc/lcdproc/lcdproc-0.5.9.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.9.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="http://www.lcdproc.org/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
 	https://raw.githubusercontent.com/lcdproc/lcdproc/master/docs/lcdproc-user/drivers/linux_input.docbook"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu"
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 0da4a8697c01..d19aa74b16a0 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -7,6 +7,6 @@ AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
-EBUILD lirc-0.10.1-r1.ebuild 3774 BLAKE2B 50fddecf53e357e92921d2b469704bbad1350420a1b8adbaa3a00ff834727621ad2c7ea0582de54982f61ddacc4462e0a0595221e96a3d2f3548ab36dfe15cf4 SHA512 0344ff3b1c1a4f737cf4fea23a4015d0005f9a7b4974ea3d72c672c9710039a25b87f4ad9693504fb887030d1618b0f9036c86153ad1d243cdbf7c788059cf75
+EBUILD lirc-0.10.1-r1.ebuild 3740 BLAKE2B 094a39484b473f0a36d5ace14edecc3ac8e33a4fe7a5d739bd55f34a0aab83ec2ebed9abc0df51d50ef9f9affcfd1f7dd112449a7ec3b6941ebb949441050120 SHA512 e9e5f1bc6746ec2bb8cf11c3935ae480ab94603f7e97b0e7530c63d7560c34d281fc7117eb1e783e1c403d04de7e55503747798f9e4c0b96ed6b968d6656a8a7
 EBUILD lirc-0.10.1.ebuild 3726 BLAKE2B 7054ad4a9a02d499e4460c9178f24eead6da0efa148e680e96c0a261899a05e63fc77221f270e448e2a3269a538b1a92f58b90592193f569ee1b29499b7e68d3 SHA512 db8f02c0931238d4d8d73a2217076d31d4b609dcd874a246005633d98ec655ac51d818e4007a673d19db279d3a1995609c6d3e0ac0cbb4a28242432ab1ae351e
 MISC metadata.xml 969 BLAKE2B 6dabf8921994f06c7f9e39e2049c0ac86b5e5523c554eec3c061151627512f6f17d14eeb00256585dd9fd323f4293f74175ace6bd87846ba461a72ab6e7caef4 SHA512 fc510d070b7b97d28159b77a7540b38e8558efd8a780dffe8755e3bcea7bbd601211f19733c217ce670407c523b6c5daac2c9aedde2ddeecb81dda8472c48fb6
diff --git a/app-misc/lirc/lirc-0.10.1-r1.ebuild b/app-misc/lirc/lirc-0.10.1-r1.ebuild
index d054d3132398..6a9261677694 100644
--- a/app-misc/lirc/lirc-0.10.1-r1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r1.ebuild
@@ -94,7 +94,7 @@ src_install() {
 
 	if use !gtk ; then
 		# lirc-setup requires gtk
-		rm "${ED%/}"/usr/bin/lirc-setup || die
+		rm "${ED}"/usr/bin/lirc-setup || die
 	fi
 
 	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
@@ -109,37 +109,37 @@ src_install() {
 	newconfd "${FILESDIR}"/irexec-confd irexec
 
 	keepdir /etc/lirc
-	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example
+	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
+		newdoc "${ED}"/etc/lirc/lircd.conf lircd.conf.example
 	fi
 
 	find "${ED}" -name '*.la' -delete || die
 
 	# Avoid QA notice
-	rm -d "${ED%/}"/var/run/lirc || die
-	rm -d "${ED%/}"/var/run || die
+	rm -d "${ED}"/var/run/lirc || die
+	rm -d "${ED}"/var/run || die
 }
 
 pkg_preinst() {
-	local dir="${EROOT%/}/etc/modprobe.d"
+	local dir="${EROOT}/etc/modprobe.d"
 	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
 		elog "Renaming ${dir}/lirc to lirc.conf"
 		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
 	fi
 
 	# copy the first file that can be found
-	if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then
-		cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then
-		cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die
+	if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
+		cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
+		cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf || die
 		MOVE_OLD_LIRCD_CONF=1
-	elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	elif [[ -f "${ED}"/etc/lirc/lircd.conf ]]; then
+		cp "${ED}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
 	fi
 
 	# stop portage from touching the config file
-	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		rm -f "${ED%/}"/etc/lirc/lircd.conf || die
+	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
+		rm -f "${ED}"/etc/lirc/lircd.conf || die
 	fi
 }
 
@@ -148,13 +148,13 @@ pkg_postinst() {
 	# without portage knowing about it
 	# so it will not delete it on unmerge or ever touch it again
 	if [[ -e "${T}"/lircd.conf ]]; then
-		cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die
+		cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf || die
 		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
 			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
-			rm -f "${EROOT%/}"/etc/lircd.conf || die
+			rm -f "${EROOT}"/etc/lircd.conf || die
 		fi
 	fi
 
 	einfo "The new default location for lircd.conf is inside of"
-	einfo "${EROOT%/}/etc/lirc/ directory"
+	einfo "${EROOT}/etc/lirc/ directory"
 }
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 03f28f916399..4b14e347144d 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -2,8 +2,8 @@ AUX mc-4.8.23-3933-iso9660-1.patch 2491 BLAKE2B 30e6db19f3251784dc99fc9fc8bc8961
 AUX mc-4.8.23-3933-iso9660-2.patch 825 BLAKE2B 6f10685889f42553d54d9473a26fd4644163012d8201fe9ac42e02e5d45ee6764ce7c75f7939bb676295c0ef5d9dd4b182bba3ad198ccb2f1b907f0808be0b97 SHA512 1c9c7c961d3a69081ce5835edd386c76c9b947c7b23467f9bfd8979942248ba4382c74dfe67f8615b92b0a18b3754405486bc9a27ac7014655a2ca2f733dce99
 DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed
 DIST mc-4.8.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6
-EBUILD mc-4.8.22.ebuild 2856 BLAKE2B 4690f984d23c2397b1934708b3fe03b357e6422516bc59ed50ff9e7a32988e6019ab69cecd7618ef4e60725f30367e76da3a249b4d5b04b7bec4f0346aedb977 SHA512 0976c89075f0dd7cb3028b2855824b441a74cdd981064a892d2446347484e9fbbba236705ee99f7b2b7163e6dd0769d902da85dfb0ae05a66667a82c9c6e911d
-EBUILD mc-4.8.23-r1.ebuild 2961 BLAKE2B ee54e3c02f8149df44541d4c9c1427052c54589414f2ba8b5f1cf02420bbc86ff8c8a69529e15e0a19ffa66f346a3777cfa1dd666835a40432f6d852d721f9b4 SHA512 1be001eb1bb3e7beae9949cc653bff29f5a38b1af35e88dc51a98219fba1a026ecf920c8e5e0de5cf90b2139f518d1ab417eafabfcb31ed81b75a72a9fc2d526
-EBUILD mc-4.8.23.ebuild 2866 BLAKE2B 05678e4bd3e32278f6a09c65b028fa731997481af928798edc09dd780e7c373d04a92d7dd9a2ce5c6a999ebb11f15a3b5f63b20de31ae11a043f9f01f1491232 SHA512 630ff657da56cde5e2bcfdd3c26b24416515087f4f61246f7d6bfd384a8f8d479ab2d163bb66173d31db03c7bad0be18d9f1a1c1d0e4ddc1b6b4719aef84a579
+EBUILD mc-4.8.22.ebuild 2854 BLAKE2B b62a578f351b1535f3b48ddf01c21aa5ab5bbf02cdabc9b967a108cbaf1304ad3130ea26211d06e45697d00cd65bb7842badbfecdf6f360ae8443afaf812777c SHA512 6534293609a40883ff86f9cbf1894b9898c7a8ea910b1a05f8057ce30e26e726b13f5bab7060e64196376fd244b90f41e48632860684c3c5bb1f85eab6bedf0c
+EBUILD mc-4.8.23-r1.ebuild 2959 BLAKE2B 5a2907a1bd7ba0f79cf2ee2b89d2ad2abcf2010c45e11c41841372284d68fc216cd1e8bfc802a78f125b138f096b95a0b6e212d1f39d5df371667b09950831d4 SHA512 4cf31cf14bdce25c2a14bc22a06c5390249a735d3ff15080c0be7880bac6c957013c9e65c09c64ad4905443817f66e152a0ee119a9eab85d6586fea50f7e8fe2
+EBUILD mc-4.8.23.ebuild 2864 BLAKE2B 4d2fa3896976b9775a0077db49890995d8348caa003357c27cf429c4b372381cb21a66b8477fd28bcbd821b143f94c4753f91abdc96a1f60c1de2dc746412a0f SHA512 439957bfb9c4441a3e344ff8ea7361efec8a19f19a5277237b4ac98152fe59213451d3b04b430c0e558001c7f10119381aed7fa4e3e933a5b02529dc7f948bbf
 EBUILD mc-9999.ebuild 3111 BLAKE2B 31c178fdbef8bb48d7ca13c15f7e7e56bb3d3de730ee62bccd75a593d9ad313e5cc6fc6e5dbd60a116ab5770ddcb24d31bc67393b1868b2cb57ea99a8dfb174c SHA512 fc8bbce6e66c343e141fcd0ad6c3a6fd450db0ebc366450589bf24a27556a3e536653c7430b65f2e4766172f8aece01c0206fe8c00a0bfefe4f8676c269e7553
 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
diff --git a/app-misc/mc/mc-4.8.22.ebuild b/app-misc/mc/mc-4.8.22.ebuild
index 1e7d94b10815..769e4414056a 100644
--- a/app-misc/mc/mc-4.8.22.ebuild
+++ b/app-misc/mc/mc-4.8.22.ebuild
@@ -95,7 +95,7 @@ src_install() {
 
 	if ! use xdg ; then
 		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
+			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
 	fi
 }
 
diff --git a/app-misc/mc/mc-4.8.23-r1.ebuild b/app-misc/mc/mc-4.8.23-r1.ebuild
index 322ccb31aed9..cfb708711999 100644
--- a/app-misc/mc/mc-4.8.23-r1.ebuild
+++ b/app-misc/mc/mc-4.8.23-r1.ebuild
@@ -100,7 +100,7 @@ src_install() {
 
 	if ! use xdg ; then
 		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
+			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
 	fi
 }
 
diff --git a/app-misc/mc/mc-4.8.23.ebuild b/app-misc/mc/mc-4.8.23.ebuild
index 3d20a797b3a8..5f71da448cf0 100644
--- a/app-misc/mc/mc-4.8.23.ebuild
+++ b/app-misc/mc/mc-4.8.23.ebuild
@@ -95,7 +95,7 @@ src_install() {
 
 	if ! use xdg ; then
 		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
+			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
 	fi
 }
 
diff --git a/app-misc/media-player-info/Manifest b/app-misc/media-player-info/Manifest
index 09486ef278c7..2b8eacaa3ba4 100644
--- a/app-misc/media-player-info/Manifest
+++ b/app-misc/media-player-info/Manifest
@@ -1,3 +1,3 @@
 DIST media-player-info-23.tar.gz 100849 BLAKE2B c64e33cb92c7f7b3fd77dd165fa5d33e433d09fbf171aba8ded2a274a24a544a85b7c874552951be25fe266090a882305416908975409b7c294d9435378c465d SHA512 4555456945f6f8c2fb23c86f80dc61e8e5448f3c402ac685e7eccd2df9f7861cdd41da842b0917349f7d83200ef10c810eb8b75fa6d62829834fdbdb81560f04
-EBUILD media-player-info-23.ebuild 1054 BLAKE2B cf2399e06243ec3eb11d1cc5efddc75910cbf776f6c8a955889b19b960745ce540e9e5e692586f2422c6d0e8b179a3e96dc8e87d0eb8aea986afe06b5264981e SHA512 04e4bb48d6e999d9f50b20493b0602982984bf7d64d8992a1dcdd52f1a7562d4a8107264e8a5a655c5652a82092f07df4b19bc7f83c9e249441ae64876ff0428
+EBUILD media-player-info-23.ebuild 1049 BLAKE2B 0284f6422873551711325cf62bc878ffb7f13acb58bfb208070b4ff5fa7b3c5211885b7e73e82c7fedc0fed2ab5b7651e9c1bc1c62967e789b42eb86e254ac55 SHA512 b519212e731925320c39e2118ca51b9b5a2877e0be3b87001a82b7178d2d39098c867b16415e9d4c8e5eeb6a9aaed8ee9565d85c3d8dbe9bd25e58a0e1affd18
 MISC metadata.xml 266 BLAKE2B 9c01787259e2c33e012f96ae52558f21518e2dc4e2bae1e528e8d53b897a698d9d205226aaf5c3796002ac10335d09b57de0d7a0ec079ea9982c7e05d1f67091 SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b
diff --git a/app-misc/media-player-info/media-player-info-23.ebuild b/app-misc/media-player-info/media-player-info-23.ebuild
index c89d7f350f98..f856d00a4b78 100644
--- a/app-misc/media-player-info/media-player-info-23.ebuild
+++ b/app-misc/media-player-info/media-player-info-23.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
@@ -27,7 +27,7 @@ RESTRICT="binchecks strip"
 
 pkg_postinst() {
 	# Run for /lib/udev/hwdb.d/20-usb-media-players.hwdb
-	udevadm hwdb --update --root="${ROOT%/}"
+	udevadm hwdb --update --root="${ROOT}"
 	# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
 	if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
 		return 0
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 1a5bf6856fa6..4efc9cf2fbbe 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,4 +1,6 @@
 DIST neofetch-6.0.0.tar.gz 115538 BLAKE2B ec1a019c873a6c48ca150f51cfc76174b8df6af629530906a638f3f19fdae0e926cb7512b14c90aa9af6b6fb4652f2f6c72128535c2b833d307ad58e66af9c5f SHA512 2613bbc3bd50fb11fb511dd2d3d37f8e86891c9abab5f25e5956f4458c43abd555ff7d129a24f7e5ff4ed76f7c69235b696a77326bce11d81dd81eb414ab3a8d
+DIST neofetch-6.1.0.tar.gz 118346 BLAKE2B d9a08cf0b3f9164e8e42e25434d3e23e3c0ebac5e3fe3e770d7a2bde67b127078977fdb44fcc5e11703cafbe0f68332d6d7a4df8ced235d4dbd4a525afc171b1 SHA512 a68b5021d02d217ae5bc67f3d542afe4aebf1cc891f083e276b58847b1dff4419e036dbd7694b7c49c19c615b13eb54c22db3e69e6143c3f10f3fc1966a22a2e
 EBUILD neofetch-6.0.0.ebuild 649 BLAKE2B babedb2052e50e2d89c03d23c9031692b7db74339a1fb2f23d55d91bddae11cdac4fffc1516d107017a14f40429381d247436a955556c89b1c492078d7e38dfa SHA512 f1002ccf79cc53cf6c9036767bb2825e52d37a49107ce6b2921ff20abae48694eec473ec9701d692b375793af3414edc4ef22922adbe3bdefb9e92e02673b3fe
+EBUILD neofetch-6.1.0.ebuild 651 BLAKE2B 734b213276d74a8cd6d4fee9d828b79c37c0d0f48f551e6545c2a3305464239b51b9495418941e815e8c5bcdde649dacf01e6dbcdbd6002d03b4af4df3348970 SHA512 28a81439ca17c4e52d06fa7718d101983f1bdb016402e32f96c61a8429f10bac315409e30857c2b4a5aae64138321e40e30a2b132421f5cf976b4b4bf69a7ef3
 EBUILD neofetch-9999.ebuild 651 BLAKE2B 734b213276d74a8cd6d4fee9d828b79c37c0d0f48f551e6545c2a3305464239b51b9495418941e815e8c5bcdde649dacf01e6dbcdbd6002d03b4af4df3348970 SHA512 28a81439ca17c4e52d06fa7718d101983f1bdb016402e32f96c61a8429f10bac315409e30857c2b4a5aae64138321e40e30a2b132421f5cf976b4b4bf69a7ef3
 MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/neofetch-6.1.0.ebuild b/app-misc/neofetch/neofetch-6.1.0.ebuild
new file mode 100644
index 000000000000..45192c9d63c8
--- /dev/null
+++ b/app-misc/neofetch/neofetch-6.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
+DESCRIPTION="Simple information system script"
+HOMEPAGE="https://github.com/dylanaraps/neofetch"
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="X"
+
+RDEPEND="sys-apps/pciutils
+	X? (
+		media-gfx/imagemagick
+		media-libs/imlib2
+		www-client/w3m[imlib]
+		x11-apps/xprop
+		x11-apps/xrandr
+		x11-apps/xwininfo
+	)"
diff --git a/app-misc/oneko/Manifest b/app-misc/oneko/Manifest
index 654d560aba6d..507133385431 100644
--- a/app-misc/oneko/Manifest
+++ b/app-misc/oneko/Manifest
@@ -3,6 +3,9 @@ DIST oneko-1.2-cat.png 223 BLAKE2B 35eb9a8aa7e49aa00a7a689187b598ee837b9236715ed
 DIST oneko-1.2-dog.png 236 BLAKE2B 8aa4bb11d75283784e7bef8eb6d887706d90cf6370cfa41433d32bffbb23db0b775e5a23fe9b19ef0d9426d5e98e583b599e477427c3223f4a225f1904da7ad1 SHA512 11e4a4ecfba26a0ea782846ca288da7ba3f68629dc8f4b0d7987923f06afe57971d53c9161ed13711a9a1f737ea3d8ec76f559311dd10234dca49cfa9d20f533
 DIST oneko-1.2-sakura-nobsd.patch.bz2 2967 BLAKE2B 128fe382d81fdd18f077d015fcad41613baae00171149a2d4fd253bb03595ca4c7be16640531140af90edf176754fad2bf7e4d5ae27471bf7079b3a558788189 SHA512 dbab7471b1c76d8bd7b0c0f9512ce274d98b7e96e8f1cb781a07b031d3a23c0c716222465dee16ad77f658c681116e71e6f8f50ab45ee8f24d132e24fed6849e
 DIST oneko-1.2.sakura.5.tar.gz 76825 BLAKE2B e6fbb02823a25e71b6b26d067ca898352d26971bd6595b2f8d33205bf268238e277f8a0a980178704857d50042acd0cb1663d9eb0549764934153864b3602ed1 SHA512 328bc267c027dc2bf9f4d0bf7a3a5cfb0f77e7ffe566dad58ba8728a8d72f905ef0b1b92fea77179d1e79886aea8a6b27cda44dc227d96b69ed34b4fdde3ec15
+DIST oneko_1.2.sakura.6-14.debian.tar.xz 10996 BLAKE2B 4507243c28371d99976a3ef4d015b53f6dc1e28a0e841c55da18710bfc3825786dc8ee8ce06b5af1ca41445661d6f5c10225b80c6802ab5d2de06dab09de10e0 SHA512 35656ade57e57ba400b6e2d0f9dcfa1b41a7002f874f1113db080d9e75e390ff0e1f4ec169fbcf1cbea135988500501c65a2f520eaab196b8d92ef4feb993baf
+DIST oneko_1.2.sakura.6.orig.tar.gz 64623 BLAKE2B 262f9373b1739c0181a52377dd72c5f35bd9d8e4e54364304704bb6794216585a7617525ccf439cef4783556aa732ac84f60a45424021b5963d69485c21a15fe SHA512 3f06b1c23ac6e3d9864530904bccbe0fdbeebb512233e35555ae44d2b45b2e6e50480081f46b048994c9415dca05691a0796357d86b4b7e8dc0bbcf1642ae348
 EBUILD oneko-1.2-r2.ebuild 1673 BLAKE2B 01fb6acabb5e2d39f3634af2ff7d1998580757e4b17538682f3c8563b3c91c1641f0bedfbe418f3578a499fe9873163e09088e783f18f4c1b4e09fe12db9fb1b SHA512 cca224ca83a61edea8ba92bb3a7157756ed96a9dceac9624c4c221ce955646f797efba918df52856480fc3ceb8dd7859244a4051820263a4c2b0ffaa76ca7505
-EBUILD oneko-1.2_p5.ebuild 1350 BLAKE2B 7820aecbf71866472952d32a10ad9eb38c28f94280eb642410a946454fb1102080897d822e9674737530b89be7cb2c72b3a03b5918ed65a4827e5f8afdabc8ad SHA512 c00df31305553f58e526b2b2b7beccab12f24b83633b691f5958c9b92fda9fc8e22fc5ab9a6bc4e1d1b47b14f2605a9a63aab90a28b2efd93663ffeff2628c16
+EBUILD oneko-1.2_p5.ebuild 1369 BLAKE2B 0c43a1c58a73538b6ab7ecf59723b9160cddb68094ec4e415ada1a94bea85cca0934e6e3a6584cbfeb62088ba0279872b2c4a68ac477f5879b637f4996aea9a8 SHA512 517d0576f509b3f99ece67b42c7da2a2ace712cf79fe0902cfd44609cd22594dfac3fe6332a3738aabeb86c7b32b8ca69955b99f4203c9928e3e15e65cd80a23
+EBUILD oneko-1.2_p6_p14.ebuild 1551 BLAKE2B 21076d5e0dc7418a430e3a7c24f8125138e0804ceca34014ae47743ba900a70482a83f1f61aa2834f66d03bdb0c33d89555b26b8004c3c5a660d76a2d5e53114 SHA512 65310ec4c4e785e6835791fdd1cbc58559af545d0faa0d450e0313cf8b737dfec46e88535887968e27bfed0b9a098d8bd915217bce915d271c30b72fc5481144
 MISC metadata.xml 623 BLAKE2B 55087cf6c20ffb041c6f80bb0adbdcc561c282e8de2284e139bf2b9e7156469f356210018f23229e826cc2822e84e88513e29b7dc25dc55eec583e2cb456ed72 SHA512 5f78a9557c5e87edff59075bb5a7d4dac93b4b1745244ad8b89ddcb02e997dc859bf682b7ce4dd774eab4d82e48f8895a86679b24a702e3b054f825b5d6f14f3
diff --git a/app-misc/oneko/oneko-1.2_p5.ebuild b/app-misc/oneko/oneko-1.2_p5.ebuild
index 97392a934243..6693ade88c71 100644
--- a/app-misc/oneko/oneko-1.2_p5.ebuild
+++ b/app-misc/oneko/oneko-1.2_p5.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
@@ -7,7 +7,7 @@ inherit desktop toolchain-funcs
 DESCRIPTION="A cat, dog and others which chase the mouse or windows around the screen"
 HOMEPAGE="http://www.daidouji.com/oneko/"
 SRC_URI="
-	${HOMEPAGE}distfiles/${P/_p*}.sakura.${PV/*_p}.tar.gz
+	http://www.daidouji.com/oneko/distfiles/${P/_p*}.sakura.${PV/*_p}.tar.gz
 	mirror://gentoo/${P/_p*}-cat.png
 	mirror://gentoo/${P/_p*}-dog.png
 	mirror://gentoo/${P/_p*}-sakura-nobsd.patch.bz2
diff --git a/app-misc/oneko/oneko-1.2_p6_p14.ebuild b/app-misc/oneko/oneko-1.2_p6_p14.ebuild
new file mode 100644
index 000000000000..24af54e6b8a2
--- /dev/null
+++ b/app-misc/oneko/oneko-1.2_p6_p14.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop toolchain-funcs
+
+DESCRIPTION="A cat, dog and others which chase the mouse or windows around the screen"
+HOMEPAGE="http://www.daidouji.com/oneko/"
+SRC_URI="
+	mirror://debian/pool/main/o/${PN}/${PN}_$(ver_cut 1-2).sakura.$(ver_cut 4)-$(ver_cut 6).debian.tar.xz
+	mirror://debian/pool/main/o/${PN}/${PN}_$(ver_cut 1-2).sakura.$(ver_cut 4).orig.tar.gz
+	mirror://gentoo/${P/_p*}-cat.png
+	mirror://gentoo/${P/_p*}-dog.png
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-base/xorg-proto
+	x11-misc/gccmakedep
+	x11-misc/imake
+"
+PATCHES=(
+	"${FILESDIR}"/${P/_p*}-include.patch
+)
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).sakura.$(ver_cut 4).orig
+
+src_prepare() {
+	for patch in $(< "${WORKDIR}"/debian/patches/series); do
+		eapply "${WORKDIR}"/debian/patches/${patch}
+	done
+
+	default
+}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin oneko
+	newman oneko._man oneko.1x
+	dodoc README README-NEW README-SUPP
+
+	newicon "${DISTDIR}"/${P/_*}-cat.png cat.png
+	newicon "${DISTDIR}"/${P/_*}-dog.png dog.png
+
+	make_desktop_entry "oneko" "oneko (cat)" "cat" "Game;Amusement"
+	make_desktop_entry "oneko -dog" "oneko (dog)" "dog" "Game;Amusement"
+	make_desktop_entry "killall -TERM oneko" "oneko kill" "" "Game;Amusement"
+}
diff --git a/app-misc/pip3line/Manifest b/app-misc/pip3line/Manifest
index 861130192a42..3dadadd9230f 100644
--- a/app-misc/pip3line/Manifest
+++ b/app-misc/pip3line/Manifest
@@ -1,4 +1,4 @@
 DIST pip3line-3.6.0.tar.gz 736294 BLAKE2B 75bc3bcd3ad547a31a1fc97f525a8575136ba1bcb48e5e9d7292732c04d2a62cd03710a4e6d76a652d5259e5081cf8cc8c2dfc3265ecf1f3ea5cbc6870c02ab6 SHA512 4263d18749533f1137dc3546a6a5b5856f9c5dc09355c866c7e6a8fc59787c84ee979f648f563c465aab314ff9155bba6e34e7d4641438d96bdb786c93dfaec8
 EBUILD pip3line-3.6.0.ebuild 2156 BLAKE2B 8d357980d5aeaec72fd1001b460a9c7e2a7953517983a9d57d5150f9521cac25bc9fe92a1677e4a83d237131e28be2dc9f045afae34d2bae742bbbfa8e472f23 SHA512 363ea88afc4f7be471fb624a8129e8e195cbcfd557f2615219a49848edc9d49e8e6a2150ec0309fbcb6ec52c6ea8314b73f099ac57f968f2a9c261d7b3155d2a
 EBUILD pip3line-9999.ebuild 2156 BLAKE2B 8d357980d5aeaec72fd1001b460a9c7e2a7953517983a9d57d5150f9521cac25bc9fe92a1677e4a83d237131e28be2dc9f045afae34d2bae742bbbfa8e472f23 SHA512 363ea88afc4f7be471fb624a8129e8e195cbcfd557f2615219a49848edc9d49e8e6a2150ec0309fbcb6ec52c6ea8314b73f099ac57f968f2a9c261d7b3155d2a
-MISC metadata.xml 617 BLAKE2B bf8ccd6ecd2783621a6e1c91c216afdf58ae3f4957541fe830fc3a39478331535b50097ae30f51d4ce305cf013cd613b45e3fca41d93b00f0e9a468c3f7b6346 SHA512 49298f62bc28cf669a9308741352fb510a1e7c5ba3749bfe6a9cb284e0ae35be27f672c404c194719440d68c2667f7ac58bb134335c5c95937c1b2e1d5f9e94e
+MISC metadata.xml 403 BLAKE2B ffbabd34f0ade6f1c61c98779163c17893dc50c58ab8c1712c6aa36dca531fe346f77d5eb9d6097c53aa0774ce8a8662b477f5c7f06cbdb1b6d99b1ec644103e SHA512 79486243bb6d993f9aaf2ad4b4b2f113d4b88ca5cfad18bf877ef0bc1422d4fb4dac65d5fdcecea3535776255d219e783c5767e16eb45c6109b7441b61c79a12
diff --git a/app-misc/pip3line/metadata.xml b/app-misc/pip3line/metadata.xml
index 9cc54c99226b..a89190752a47 100644
--- a/app-misc/pip3line/metadata.xml
+++ b/app-misc/pip3line/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gabriel.caudrelier@gmail.com</email>
-		<name>Gabriel Caudrelier</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<use>
 		<flag name='distorm'>Compile the Distorm plugin</flag>
 		<flag name='qscintilla'>Use QScintilla for more efficient text display</flag>
diff --git a/app-misc/remind/Manifest b/app-misc/remind/Manifest
index 831bd0e2e0fc..edf2d9ed7be9 100644
--- a/app-misc/remind/Manifest
+++ b/app-misc/remind/Manifest
@@ -1,3 +1,5 @@
 DIST remind-03.01.15.tar.gz 363101 BLAKE2B a5e27b83c20428991982c3cae22b32be6cc054bfd51a868ee3515f5ec4a37aa24f8ec476f566860ca0fbb6f29e7c9f3e6ed023714e52091ebca103162936877f SHA512 335f3ca88237f1ae53768b9ecdeb03f0bb1e706a8afd3ba36121ec76048a08fbc0d5ec72b05e552394b4cf2131be335c49533e1212b7e713ef16002a0621fc84
+DIST remind-03.01.16.tar.gz 354521 BLAKE2B b4157922842af67408423e1b36ddae8f049e9c803cec83a7a11188dff5ccf7934ce5afc776bdc02acd6b18a8ad172180841a53576220791fb64230a0e1d54884 SHA512 61d72b01315d59a0e6f96006d5cb063752efad68119e2d1c4fcf6e6f3b2c122a7df47081c305f777fb2c6574e278e401446192897e48b4f93607db29db046550
 EBUILD remind-03.01.15.ebuild 984 BLAKE2B d55ab74017d25ab206d36400fa1c98c19ed92f24e7735475a0caa7baf74935adceab7606436aed81f7bb6711e7422a15f4dc72a4cff8caed8ba7aa44336637d5 SHA512 ccb506515eb89d8e29208e2a24f983d95f091f379c84c42a965f66422abcc09652be5585090477af8cd8ffc917e91d0fed976637b3bb17e1ba8ded2a045844e1
+EBUILD remind-03.01.16.ebuild 964 BLAKE2B 11a44fd1c0b66530eb9f31f838115b0ccf7a5f22529c472e6bb7622edb60ae67a068499991ccee7f33d62e10032f2d609fc67a1462dd10bef011dfd0cd9f9831 SHA512 41463f646e9b1ccd219335ca336803af7e9bcf7ea8ec58af5dded03be22cd902187f64fab0613ff66e7a0528438c68c709efb8829c9a5db93ddbb3c3cc3ada91
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/app-misc/remind/remind-03.01.16.ebuild b/app-misc/remind/remind-03.01.16.ebuild
new file mode 100644
index 000000000000..cff1e298f1fa
--- /dev/null
+++ b/app-misc/remind/remind-03.01.16.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Ridiculously functional reminder program"
+HOMEPAGE="https://dianne.skoll.ca/projects/remind/"
+SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="tk"
+
+RDEPEND="
+	tk? ( dev-lang/tk dev-tcltk/tcllib )
+"
+DOCS="docs/WHATSNEW examples/defs.rem www/README.*"
+
+src_prepare() {
+	default
+	sed -i 's:$(MAKE) install:&-nostripped:' "${S}"/Makefile || die
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		ewarn "Testing fails if run as root. Skipping tests"
+	else
+		emake test
+	fi
+}
+
+src_install() {
+	default
+	dobin www/rem2html
+
+	if ! use tk ; then
+		rm "${D}"/usr/bin/tkremind "${D}"/usr/share/man/man1/tkremind* \
+			"${D}"/usr/bin/cm2rem*  "${D}"/usr/share/man/man1/cm2rem*
+	fi
+
+	rm "${S}"/contrib/rem2ics-*/{Makefile,rem2ics.spec} || die
+	insinto /usr/share/${PN}
+	doins -r contrib/
+}
diff --git a/app-misc/rox-filer/Manifest b/app-misc/rox-filer/Manifest
index bd3e64764ee7..ec74a95ceb5a 100644
--- a/app-misc/rox-filer/Manifest
+++ b/app-misc/rox-filer/Manifest
@@ -1,5 +1,5 @@
 AUX rox-filer-2.11-in-source-build.patch 429 BLAKE2B fdbc342e0f6a7abaf01fe0a2f5411a6aea7a833f2679d9f47a783631443bf2618a4d6be293e5ce14da295713bd7b97af36edaffa3aedbfcea3de513ac1fd455b SHA512 28cb208bc51c500ad766bf832f8098bd44813626be2ed3c50c37d0cff5193e1dc1a4430ec40ee7290befb1f20b4a506f03c8c327760b75e06d08ec646b24638c
 AUX rox.desktop 157 BLAKE2B e13b788f78bb5f3af73e6f9c0e5cc9729b7221cf37a7b1952d78ed9d1f3ba8ada67d523ae08d7280d5152e3e5f0cafbf55e65bbb75d558d4c77b14095ac7fffd SHA512 968b930f97a25c58a0aeee0789161b98b0bfa93978beb0d7e57e40affe45b65940f67b612df93ac64c0c5244de7dbf913b1083cf7aa4a357e929a7f9f4ab366a
 DIST rox-filer-2.11.tar.bz2 1907026 BLAKE2B b1afd0e2df7152bd1160632c0e7eee71c1d3e9140d453f0fafb2d8049b593513db7ca051282ecef2ce06831883d2f057774e3d37175a64d4bd5a8158e4bbb4bd SHA512 2ef5e7a5d6f4bbb825d6f01725ad4149b9cabfb6fe82c33631bb145f5a3c84e345c372b7698170c1ef78b30ffbc4665495cc266da4828cc8b4b256b592b2c50b
-EBUILD rox-filer-2.11.ebuild 2368 BLAKE2B a0ae8b22e3269fe8c528877f9585751185715c018de5a03f70c9c7f98a653b926fe8917b0612b6b320f9fc73c56848e9924da204f16c3bc15eb2dd464b7980cd SHA512 44feeda938ad145cfacd7f74106c619e4dcf7eeca856fbc12aff921fca5e53052a6f11772d44976f388dbfb24cf979328ccc99b364f58b42ea533bada138fe8f
+EBUILD rox-filer-2.11.ebuild 2340 BLAKE2B 8edd0494da53afc35242be35c3cba96153755335c1b4d9687addf34ef357eff4c057e63c30bba6c28c984a6751e40aa6c075b98bbc13aa67d77ee853a45d6f40 SHA512 e38547fde5f3d627498049fb8db64aee190fd0a3b9730d2a30474739b8906edd8aceb0389de09defb3589f70338434e19416ed4fb96ec98e0be7c08d5062f442
 MISC metadata.xml 1128 BLAKE2B 16ca555c11ddd1a0de2ac5381be54c415f16329fdf10e6523ab078db320c57f6c35e1656fb1d026ce0615da9eb4bcf08b9f565a5aea34e8a1ac3fbd0b20e2bae SHA512 23fe490bc592c9d4288966aaf41bff4a68605c15ae9778dc1a89f89e5b2fea2c4e0e9c9e12b8080c744d79a5b7d4b7abb534ce02744dc517aaf7af679764b453
diff --git a/app-misc/rox-filer/rox-filer-2.11.ebuild b/app-misc/rox-filer/rox-filer-2.11.ebuild
index 98807eb99883..6b9abf2b53dc 100644
--- a/app-misc/rox-filer/rox-filer-2.11.ebuild
+++ b/app-misc/rox-filer/rox-filer-2.11.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils virtualx
+
+inherit desktop epatch virtualx
 
 DESCRIPTION="ROX-Filer a drag and drop spatial file manager"
 HOMEPAGE="http://rox.sourceforge.net/desktop"
@@ -65,6 +66,5 @@ src_install() {
 
 	dosym ../rox/.DirIcon /usr/share/pixmaps/rox.png
 
-	insinto /usr/share/applications
-	doins   "${FILESDIR}"/rox.desktop
+	domenu "${FILESDIR}"/rox.desktop
 }
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index ca41cbec5d84..5c6e1a377378 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,4 +1,4 @@
 DIST screenfetch-3.8.0.tar.gz 71970 BLAKE2B 783d14bb30f5858f2f2f8ac81c6c8bca2fa4c1e7c9225d9ba13a7ace05c365459e277bea625b680fc3e3fedd0303507a583190d866627cedcb33e042aa8fdca7 SHA512 903f42e3bfcd719c4d6b91d10e5678063e223c2baa58214c7e8dae9ea925852f9e2c07ad90148e02d87ce5f9af7b989e80e93c2f569cd579e6f4f7d5c49c62f2
-EBUILD screenfetch-3.8.0-r1.ebuild 640 BLAKE2B 845d29382aa7241fad2ee9bb66e216df880fec4148eb3faebfa18ff739f51c66d2e1b9618f2b417248caf49081d1effc7cbc74b7e153e6652d14bec5da7edc3a SHA512 550f60f7ef1a57f44dedd488a2a8f015cb56d56608b061f436e75015a8307166c80d7d48444f5af4db8f2390e00b2873f630e0081a3b3ea09ace92a0499251ef
-EBUILD screenfetch-9999.ebuild 645 BLAKE2B da3565843558442dcfb92af2f56da8dbfddb25d88ea21492dd716377e6de0975b25e5ff25d25014c9342c0ee6abd7a1e479386bae10b5e5f505c1b109aee9efb SHA512 230977a4b296c7536799ebe36812bcbd1d311568cd5e243e96e6fdd6582dab322163dc767c796984e2fe7d16b904f3732d457b0fe59d206fcafc3a6cc3a55a6a
+EBUILD screenfetch-3.8.0-r1.ebuild 669 BLAKE2B ca0a711dc8bb9a75020635066cfe41b42c56a9027e6f537b79edd6c22e06641c9a8b4292da7f2c62462c62258e4e64c432a8ff2ab9ebf5b2a97ece10fbb27e6c SHA512 f09e0fc6e505d94fb1d6cc82081157ac8bfb40a9fb5e2e9c34a6dbae21bbf2b8ab57ac6832bcadad9c5b69b2f90260442c945803b7afd088486d60e56a157e4b
+EBUILD screenfetch-9999.ebuild 671 BLAKE2B 2d008b74395244174537713a17b82aee64940f64b9a75d1a48188ae4b70ae00dca1b31f4fe8831b51e915c3d5a7f98813aa8daf264d2fcf8362110b39aebc332 SHA512 21b8540103086070383681811e5d3a7abecde478d6e1545d17a64e960899231a5ac115555e11acd0589fd176a4b79ff95f9e26c91b92dc3f697e8f59f475dc80
 MISC metadata.xml 433 BLAKE2B 50f5c928a8db5e71033fd780bd2ea13af87d8d14d83b694ff6765fc65ca3f7313c53de0a22ee5cdc0ed4ad88c754a0ccd750e59e46cfd1456b4ea185162ae1df SHA512 d07492a28cab27bba43976cc18148cde296f7e3a5ec76f06f066812b085c8b1a2b7ba9ed0a5eeea7aa838b052f177a2fde0a99ff5ff5ef9a46c4c0553cf012e0
diff --git a/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild b/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
index 459928ae2f31..563bd71e8b10 100644
--- a/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.8.0-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 @@ DESCRIPTION="Bash Screenshot Information Tool"
 HOMEPAGE="https://github.com/KittyKatt/screenFetch"
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="${HOMEPAGE}.git"
+	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
 	inherit git-r3
 else
 	KEYWORDS="amd64 ~arm x86 ~x64-macos"
diff --git a/app-misc/screenfetch/screenfetch-9999.ebuild b/app-misc/screenfetch/screenfetch-9999.ebuild
index f2c6bb16d7d5..09b465b4c1ac 100644
--- a/app-misc/screenfetch/screenfetch-9999.ebuild
+++ b/app-misc/screenfetch/screenfetch-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
@@ -9,7 +9,7 @@ DESCRIPTION="Bash Screenshot Information Tool"
 HOMEPAGE="https://github.com/KittyKatt/screenFetch"
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="${HOMEPAGE}.git"
+	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
diff --git a/app-misc/spire/Manifest b/app-misc/spire/Manifest
new file mode 100644
index 000000000000..d75538236ce9
--- /dev/null
+++ b/app-misc/spire/Manifest
@@ -0,0 +1,8 @@
+AUX spire-agent.confd 172 BLAKE2B edeab0e043ae0efb94ce7ce6fc6edd57d75de6294a9190e874de7c2daed4a49fb098d105e64ec15ef7b1184e69d6263006076d84984fb80b9b5d72febe28fae1 SHA512 717177be0f65a4357eb29393a4b553e9c856e7694b16df4f1a05e0e26ced34b9d206354928e885a6e8c3f8adbc89c724b5e15aad8f920004093c3d5a0c22d389
+AUX spire-agent.initd 403 BLAKE2B cdac81d4d5aaa7fa1222070c0b287c07299e32c561fd98aed537a734de43bb2d1cf91da26bb2afcd2c88268d2a181e4646ac17c83ec4783ecb188df6ed936258 SHA512 ad538b741a890203c4bf25658ed4957fc434118d2dd56cd8c6e5a4a62a03a595560de5c5139572d641f79308737ebf11449cb87b679aaad55a8654940c28b233
+AUX spire-server.confd 176 BLAKE2B 9a0158a8882be40483d6cf5b34b76337064847f86d0afc4a19f12d9a43e13f6075a1c605d6a88cdf9d5012d0aa80ff6a66cb689ab578f6cb24f001dd59b25ca5 SHA512 4f8cde7dcbed2b89b22a565c7c842293061f1de354bf98b863b3551ded32e13342fa3e9efc247f922b463724697a87631950085aa67dc091a9db8600b2f96b05
+AUX spire-server.initd 408 BLAKE2B d5e2c8c8af1d27332a6a0762f0795b5a9c9367a95a00ce1eb8e84be06f3bb3201cfed91033ca742ea5ba31477d2bddafb7ee0fdf8e1094d6bc93fe791992a5b4 SHA512 511e3a2bb0baace563504deaf465a64b6ed4b1368afd7b5398357c6a13b1472b29e3da7a9027318a5bc97e3b69561fa24b9d83c022648de24fe5fcc884f93525
+DIST spire-0.8.1-vendor.tar.gz 10550551 BLAKE2B 4ab04c0e4de231097620a015f523ed9d7e0d6872425826e4bc3572f920a4d3de5174cb78f4ed61340ffc1abe3e25d42e8735228b142b424c85ef24fac52740ca SHA512 879cba4eaa681814858fa7965b28d0217d4ae806c979d348cb6d5f413dca7f03f99c34b8dcdbc0dad8e5253990a473962b9c1438ba79bef5fe757df11c7f4ee7
+DIST spire-0.8.1.tar.gz 1070262 BLAKE2B 7e30ac233759f2fed7476a82d072c4ec7815346cb50419b10ac7c5ce566aae6e783a51284a39847d63c04b0e398aab7ad15d94ea4e05569b43e762abfadaf550 SHA512 aa864f3f1d0faa8b7bfa527effde244957f9b30c6f115e49819777b6f3a5ea751ed751ac19b94a45d02aa22e719e6bd6e33355f9b561bbc5458d5997d95a1437
+EBUILD spire-0.8.1.ebuild 1519 BLAKE2B 16c667d2a4ce8be6074b4693e15d62380d1833c9a300dac33aed007ffc77f587c7be4093130855cd3a2684f5043e9985abbe617375bd6abb3cc41a81cdbbf45e SHA512 e710d49d992165bf5400a87a5d0ba57e88bef970e06e2b41fff8ba6b450e4f3ea5332d5b47aba6e09d0df2089825e0d73741027eb4539b749abb9bb23c5591b1
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-misc/spire/files/spire-agent.confd b/app-misc/spire/files/spire-agent.confd
new file mode 100644
index 000000000000..c88234b0a32e
--- /dev/null
+++ b/app-misc/spire/files/spire-agent.confd
@@ -0,0 +1,6 @@
+# log file for the spire agent.
+# The default is /var/log/spire/spire-agent.log
+#logfile=""
+#
+# Extra arguments to pass when starting the spire agent.
+#spire_agent_args=""
diff --git a/app-misc/spire/files/spire-agent.initd b/app-misc/spire/files/spire-agent.initd
new file mode 100644
index 000000000000..bd64143f3e83
--- /dev/null
+++ b/app-misc/spire/files/spire-agent.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 2019 Sony Interactive Entertainment LLC
+# Distributed under the terms of the GNU General Public License v2
+
+name="spire agent daemon"
+description="spire agent"
+logfile="${logfile:-/var/log/spire/spire-agent.log}"
+command=/opt/spire/spire-agent
+command_args="run --logFile ${logfile} ${spire_agent_args}"
+command_user=spire
+directory=/opt/spire
+supervisor=supervise-daemon
diff --git a/app-misc/spire/files/spire-server.confd b/app-misc/spire/files/spire-server.confd
new file mode 100644
index 000000000000..835686132479
--- /dev/null
+++ b/app-misc/spire/files/spire-server.confd
@@ -0,0 +1,6 @@
+# log file for the spire server.
+# The default is /var/log/spire/spire-server.log
+#logfile=""
+#
+# Extra arguments to pass when starting the spire server.
+#spire_server_args=""
diff --git a/app-misc/spire/files/spire-server.initd b/app-misc/spire/files/spire-server.initd
new file mode 100644
index 000000000000..4594f5d1fa8d
--- /dev/null
+++ b/app-misc/spire/files/spire-server.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 2019 Sony Interactive Entertainment LLC
+# Distributed under the terms of the GNU General Public License v2
+
+name="spire server daemon"
+description="spire server"
+logfile="${logfile:-/var/log/spire/spire-server.log}"
+command=/opt/spire/spire-server
+command_args="run --logFile ${logfile} ${spire_server_args}"
+command_user=spire
+directory=/opt/spire
+supervisor=supervise-daemon
diff --git a/app-misc/spire/metadata.xml b/app-misc/spire/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/app-misc/spire/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-misc/spire/spire-0.8.1.ebuild b/app-misc/spire/spire-0.8.1.ebuild
new file mode 100644
index 000000000000..15aa92b309c2
--- /dev/null
+++ b/app-misc/spire/spire-0.8.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VENDOR_URI="https://dev.gentoo.org/~whubbs/dist/${P}-vendor.tar.gz"
+
+DESCRIPTION="the spiffe runtime environment"
+HOMEPAGE="https://github.com/spiffe/spire"
+SRC_URI="https://github.com/spiffe/spire/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${VENDOR_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="acct-group/spire
+	acct-user/spire"
+DEPEND="${COMMON_DEPEND}
+	dev-lang/go"
+RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT="strip"
+
+src_prepare() {
+	default
+	mv ../vendor . || die "Unable to move ../vendor directory"
+}
+
+do_cmd() {
+	if [[ -z "$@" ]]; then
+		die "No arguments passed to do_cmd"
+	fi
+	echo $@
+	$@ || die
+}
+
+src_compile() {
+do_cmd cd cmd/spire-agent
+	do_cmd go build -mod vendor -o ../../spire-agent
+do_cmd cd ../../cmd/spire-server
+	do_cmd go build -mod vendor -o ../../spire-server
+}
+
+src_install() {
+	exeinto /opt/spire
+	doexe spire-agent spire-server
+	keepdir /opt/spire/.data
+	fowners spire:spire /opt/spire/.data
+	insinto /etc/spire
+	doins -r conf/*
+	dosym ../../etc/spire /opt/spire/conf
+	dosym ../../opt/spire/spire-agent /usr/bin/spire-agent
+	dosym ../../opt/spire/spire-server /usr/bin/spire-server
+	newconfd "${FILESDIR}"/spire-agent.confd spire-agent
+	newinitd "${FILESDIR}"/spire-agent.initd spire-agent
+	newconfd "${FILESDIR}"/spire-server.confd spire-server
+	newinitd "${FILESDIR}"/spire-server.initd spire-server
+keepdir /var/log/spire
+fowners spire:spire /var/log/spire
+}
diff --git a/app-misc/tmate/Manifest b/app-misc/tmate/Manifest
index 4b57cfaf1a83..6c909f481ae4 100644
--- a/app-misc/tmate/Manifest
+++ b/app-misc/tmate/Manifest
@@ -1,6 +1,8 @@
 DIST tmate-2.2.0-upstream-patches-0.tar.xz 6784 BLAKE2B b21a2065ba7a7832238cb6b6bbfe3e730593766a34244e139d0e357cad538a4462e68a9e884a6250fc72a10a775fa13e53054618c35804cc05ad0cc31854d9e3 SHA512 3e16e0b7988d3d1942fcac0a535d2cc8d7156d26332dc84fd21c4761afae40159282b0fbeb71cd5f6525b5a1c7a46e7813c8e6a11851592077570c1a001a73a7
 DIST tmate-2.2.0.tar.gz 610793 BLAKE2B febe2ed652e8387f65d938f09c6abbd92841a71a285035f6322bcf786aa4f80f71a0f49fc475743a8565bf4c7e434d9f503ffc6bae26d531429b1c58bc0ffbe9 SHA512 e9429833cdb8c28873d01bfc6b9a0d1241e30346ef1b3efae6763389c8444943b831283c1ea65e49c68d11936d6586186b38e0f7c14d373d9f63e841026c3338
 DIST tmate-2.2.1.tar.gz 610745 BLAKE2B 8a97d7726b528d12e14c74c07f795b18510a4b7a0068f1e1168b06e2a6856945518b3b9a35f71ba8598b8f9390d754443eca197f95f5c9c61d6160f4008ff65d SHA512 3d4ce7510cd8da39bc4fe63f2a64179846a813bb3560ca811d9e1e2a28b06d95a9033047a900d76bda069c249d7ebbe1143daa082b23212c5d32a50bf1819d2d
+DIST tmate-2.3.0.tar.gz 611262 BLAKE2B c4e789b20fbfb1736eacbf36f368d8ceb573937ed2c72f2b79b8da175a811985af12d9823fdbade9ee3f72bfb43427e8fa64eea75ba5fc3cf64273c31856d4d6 SHA512 b7de8f28ab5ee8ea389d4882ed64de3d71bd53d626ae6bf323d5be732066e63a7dba2a85318c0202a088af53df7e0d976256c1253895ad81739d270ee65d0eb7
 EBUILD tmate-2.2.0-r1.ebuild 1192 BLAKE2B f3af176ed3e72e976801e6710aa09e4fd3c1ec0ac9dcf2f7d287263c69339a03c36ec82bb31fc5bafd3b83966d392f6d1f57eff6277048669723c833c1558777 SHA512 3c37820c3ad97c90fed4a3cce146ef302dfe1f6eb00615cfe9eb8ec3e2de900caa59587136155ed2ae64e86a2c3ab3ac90a15c73f57e704bf853cf3649eee1d2
 EBUILD tmate-2.2.1.ebuild 1191 BLAKE2B 29f44defa32bc9a39e9f6122cfb2362ca8935918f23e2154edc514b67fa55807fa81b3c3c5a1bc1278ff852f0a6ef28f0b1883c2a635ef0743a6c008fcf5d788 SHA512 33df330f7aef0168a338d48a51e57066d304b100046bca6fa02b239712e58063bf6990dce9d60c0be75abaf85ed61f409cac3dc775afe0a2b575744f0b03b785
+EBUILD tmate-2.3.0.ebuild 827 BLAKE2B c1ccaca2b5ef4569d59838755b1826a8677454d89291dc768b39ee77a86040a8b54940b67a7bfbe291409a1d8ce9ca3572cb84dafaa409e51ef4defe4edadc19 SHA512 6a7548e1f248b2c22b5478a10734294ab6bd48f237e2d8c56308b733f5d7748883598ccec390a8432034726561a15d1e876f1783c0fa3122b7dce56d55960dbb
 MISC metadata.xml 329 BLAKE2B 4b983e08fb7a5704f11c7e07e91a322258b128d5a2826fbea1f62718b83daf71552d63304df6e0995a68ce33e05bf3e276aded270a004a95a43fc8f98501744d SHA512 0097a64f483d6b8a24bfa5006f6df9dbeb697ee04152f5451111449d69d54813ff6f474e8fc91b33a2db2e0ba6ad85d25b359ef6684a74c884d2bcf16cfa9e75
diff --git a/app-misc/tmate/tmate-2.3.0.ebuild b/app-misc/tmate/tmate-2.3.0.ebuild
new file mode 100644
index 000000000000..bdddbdf93b17
--- /dev/null
+++ b/app-misc/tmate/tmate-2.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Instant terminal sharing"
+HOMEPAGE="https://tmate.io/"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug libressl static-libs"
+
+SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+RDEPEND="
+	sys-libs/zlib[static-libs?]
+	sys-libs/libutempter[static-libs?]
+	dev-libs/libevent[static-libs?]
+	dev-libs/msgpack[static-libs?]
+	>=net-libs/libssh-0.6.0[static-libs?]
+	!libressl? ( dev-libs/openssl:0=[static-libs?] )
+	libressl? ( dev-libs/libressl:0=[static-libs?] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 8e55098043e0..ce1f7a68045a 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,4 +1,6 @@
 AUX 2.1.6-cue-meson-fixes.patch 2632 BLAKE2B d3d63e27b8d1ff4f3463826399133c2396dbb17fb38e9aae43df8da43aea1c05ccb6c0567235773ecaa8a5741dc75ec1be49ec06d604f6751d79e32fbb3d153a SHA512 3cfda20f1be0c956de2de2b2cc70960373c2d74ddbb895480026faa32e053bcec4db42473d15d8b37d567d2fdd2b8ccb34e8bbdcc9446fb03089eefe2fe8bd4f
 DIST tracker-miners-2.1.6.tar.xz 3456848 BLAKE2B 60b4af9ea755b79c2d31150d744468c6b980238eef542b9be382316eaf7310e137c501f9f705319e203ac3fba11e554202f6d1ee8e5a1ebcdf9b0d59aaa5e380 SHA512 3ded014c98f7be2b610fbe76c3a2b006a9ec85b090d2d3ca3e943e89b58b520da291ebfebe9efd579fe330fd49fced8f792eeba3b8e56f91fd2358bdaff4cdf2
+DIST tracker-miners-2.2.2.tar.xz 2893476 BLAKE2B 30bfd0454c5429a708ee10a299210e800e2d713859a20206b8c96cb41f4a1d14c438266b198788056b4d2f7fd5a9b8b465d9d7b460e3e57ddbd56d98f89c5ae2 SHA512 41dda92ddde2ba473ac0887ab5a0c0918c8a26a99cdcd1c0a7d49cdce0f7b02ff080fa868df7e855d08ce5cf61fa55b3ef0737bc58a83e80d2096435efa11cf3
 EBUILD tracker-miners-2.1.6.ebuild 4475 BLAKE2B 1966ad8ce6befb049de06e3688ccfa4a8c2fc795c3dcd425eab17429ca176d98d4ebc416eb494dc42d33186d82c172587295d96468f2248b2d36c6adc8523923 SHA512 e33236ef8ff6770566a4f0bfc53882642b195887b5e0be1738a4dd54d4a032dca08c0d7c7c30355b5e724b951fb0db612e2d03f2bf589e357eba72f27616af86
+EBUILD tracker-miners-2.2.2.ebuild 4578 BLAKE2B 387ec795229c358d214ea94a0271739845e7b984fbb1f26c81b59b36cdfc7cc28de792163d01c21426a6142636760e7c91d501e6ac438be6aba38d5b06884a2a SHA512 b58edb74bf4701bb8f93237502d73e60d19d09c86ccc593eea47715cb2049757b36fa31f309a991a7ac42196600a17c400ee774e04352041b34eceafae887a0c
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild b/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
new file mode 100644
index 000000000000..9ba6c233a00b
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playlist raw +rss seccomp test +taglib +tiff upower +xml xmp xps"
+
+REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	>=app-misc/tracker-2.2.0:=
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-meta:1.0 )
+	!gstreamer? (
+		ffmpeg? (
+			libav? ( media-video/libav:0= )
+			!libav? ( media-video/ffmpeg:0= ) ) )
+
+	>=sys-apps/dbus-1.3.1
+	xmp? ( >=media-libs/exempi-2.1.0:= )
+	raw? ( media-libs/gexiv2 )
+	>=dev-libs/icu-4.8.1.2:=
+	cue? ( media-libs/libcue )
+	exif? ( >=media-libs/libexif-0.6 )
+	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+	xps? ( app-text/libgxps )
+	iptc? ( media-libs/libiptcdata )
+	jpeg? ( virtual/jpeg:0 )
+	iso? ( >=sys-libs/libosinfo-0.2.10 )
+	>=media-libs/libpng-1.2:0=
+	seccomp? ( >=sys-libs/libseccomp-2.0 )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	pdf? ( >=app-text/poppler-0.16.0[cairo] )
+	taglib? ( >=media-libs/taglib-1.6 )
+	playlist? ( >=dev-libs/totem-pl-parser-3:= )
+	upower? ( >=sys-power/upower-0.9.0 )
+	sys-libs/zlib:0
+	gif? ( media-libs/giflib:= )
+
+	rss? ( >=net-libs/libgrss-0.7:0 )
+	app-arch/gzip
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS}
+		gstreamer? ( || ( media-plugins/gst-plugins-libav:1.0
+			media-plugins/gst-plugins-openh264:1.0 ) ) )
+"
+# intltool-merge manually called in meson.build in 2.2.2; might be properly gone by 2.3
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+	if use gstreamer; then
+		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+	else
+		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
+	fi
+	xdg_src_prepare
+	gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+	local media_extractor="none"
+	if use gstreamer ; then
+		media_extractor="gstreamer"
+	elif use ffmpeg ; then
+		media_extractor="libav"
+	fi
+
+	local emesonargs=(
+		-Dtracker_core=system
+
+		-Ddocs=true
+		-Dextract=true
+		-Dfunctional_tests=false # currently broken, may fare better in 2.2.3 or 2.3; if re-enabled re-add dconf test dep
+		#$(meson_use test functional_tests)
+		-Dminer_fs=true
+		$(meson_use rss miner_rss)
+		-Dwriteback=true
+		-Dabiword=true
+		-Ddvi=true
+		-Dicon=true
+		-Dmp3=true
+		-Dps=true
+		-Dtext=true
+		-Dunzip_ps_gz_files=true # spawns gunzip
+
+		$(meson_feature cue)
+		$(meson_feature exif)
+		-Dflac=disabled # never use external flac extractor - gst-plugins-flac is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature gif)
+		$(meson_feature gsf)
+		$(meson_feature iptc)
+		$(meson_feature iso)
+		$(meson_feature jpeg)
+		$(meson_feature pdf)
+		$(meson_feature playlist)
+		-Dpng=enabled
+		$(meson_feature raw)
+		$(meson_feature taglib)
+		$(meson_feature tiff)
+		-Dvorbis=disabled # never use external vorbis extractor - gst-plugins-base[vorbis] is for that; ffmpeg one is maybe worse, but that's non-default
+		$(meson_feature xml)
+		$(meson_feature xmp)
+		$(meson_feature xps)
+
+		-Dbattery_detection=$(usex upower upower none)
+		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
+		-Dgeneric_media_extractor=${media_extractor}
+		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index df56fec6e7e8..f7fc22818b68 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -4,5 +4,7 @@ AUX 2.1.8-prevent-stack-smashing.patch 1669 BLAKE2B 8c0e603f8c2aafe0cb2b381feaf5
 AUX 2.1.8-test-fix.patch 1674 BLAKE2B 5e0ff6c8d8ece11ec49c818521fbb248c13e09b14860b33e93229f41db36779aebeb3b398fc3d4c590332280cd98e756787755c54b2a600e031abe45746fbe26 SHA512 588eacbe421355b252cb98d00ef67b0205b6c9437e58ff893da822732d338cf453583b0cde3b71940c5dd24d562b0aa32cd7c0f7bd978c382eddb77527adc3f2
 AUX 2.1.8-vala-0.44-compat.patch 1597 BLAKE2B d26e88039d9aca0544c5e5fd510f8b5d5235f44ca79927aacdee83987b74196433106c26194134651d2fc44e97ea02dc91c565b43322d07f7a1dcb36b0c5ea84 SHA512 7d5940f240b6bbf62e248b165835ae08f95edf9038cc761bb972f756a1870f08d8cde1841cf3830dce0a3ec09d95cc6d24d54b603b40856dde614bbf3886dd84
 DIST tracker-2.1.8.tar.xz 2585924 BLAKE2B 8548f6a615c3357eb2f1a1656d81f50816cef2f59e23fe7bd2111eeade8b3e5c0a33abf1bc830a0baa9c1c1d74ee92d3e44da00cd6f65ab853ef04eb2f57a69e SHA512 447e519699bbb0c9802230629667a87ce39ec3f6bb9c605063319d5e6a019c95a76762fdc889b1a11280be08b8520f22f097f9c9779dcd7a6c7cf239b4da2696
+DIST tracker-2.2.2.tar.xz 2792104 BLAKE2B 654dd5a6e4d8ea8a47d209f747e0dd4e02b7f6c862c4dedd92edf271cf3645b2a7d3f956f6aba5bf104df9972bc287b49a40d77892cb9a65e40c1007f5e3ca6c SHA512 2c18c324d4d98fb62bbf21eac8f647bd34463cee4d9f71d411e22d695fc28cc0c5334e2d41517875a5741213d9405e768f3efae6a8a4a8e72d01563c335f47a7
 EBUILD tracker-2.1.8.ebuild 2917 BLAKE2B b92781992ff10c60b9663e4d1366a168d6b7ea3c9678d59af89aceb7756a6ec46facf2cefc778de7e5f73d475e9998910a732fc941bc7584d5e3588b03c8c489 SHA512 79a21bd45e9b869d0bc854751180a72da4e70f405551c7b693a56ceded7908a18ad1f88f561b1e26239651796c9f97503df82cd25b3569d81f94dd266254dc4a
+EBUILD tracker-2.2.2.ebuild 2436 BLAKE2B 08033550aad8ebf788183ab7c449f23f6723de2622486e87637dcfe4f75619391ab0dc4055e7794abec3d55a07cefd188e0c9b0fdf277e1cf12fbb00b48660b1 SHA512 4646329d106c8f613cbcf2b29306d2e8e755d513205f830351e92d47533106ed4cc3a0f96e00e1f47ae8fc1fa03b2330b15af63232070c8c9dd646e5e0930261
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/tracker-2.2.2.ebuild b/app-misc/tracker/tracker-2.2.2.ebuild
new file mode 100644
index 000000000000..22ad60d77d66
--- /dev/null
+++ b/app-misc/tracker/tracker-2.2.2.ebuild
@@ -0,0 +1,92 @@
+# 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 bash-completion-r1 gnome.org linux-info meson python-any-r1 systemd vala xdg
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/2.0"
+IUSE="gtk-doc +miners networkmanager stemmer"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+#RESTRICT="!test? ( test )"
+
+PV_SERIES=$(ver_cut 1-2)
+
+# In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time
+# But build still needs it - https://gitlab.gnome.org/GNOME/tracker/issues/131
+RDEPEND="
+	>=dev-libs/glib-2.46:2
+	>=sys-apps/dbus-1.3.2
+	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/icu-4.8.1.2:=
+	>=dev-libs/json-glib-1.0
+	>=net-libs/libsoup-2.40.1:2.4
+	>=dev-libs/libxml2-2.7
+	>=dev-db/sqlite-3.20.0
+	networkmanager? ( >=net-misc/networkmanager-0.8 )
+	stemmer? ( dev-libs/snowball-stemmer )
+	sys-apps/util-linux
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	$(vala_depend)
+	gtk-doc? ( >=dev-util/gtk-doc-1.8
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.5 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
+
+function inotify_enabled() {
+	if linux_config_exists; then
+		if ! linux_chkconfig_present INOTIFY_USER; then
+			ewarn "You should enable the INOTIFY support in your kernel."
+			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
+			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
+			die 'missing CONFIG_INOTIFY'
+		fi
+	else
+		einfo "Could not check for INOTIFY support in your kernel."
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	inotify_enabled
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dfts=true
+		-Dfunctional_tests=false # many fail in 2.2; retry with 2.3
+		#$(meson_use test functional_tests)
+		-Dman=true
+		$(meson_feature networkmanager network_manager)
+		$(meson_feature stemmer)
+		-Dunicode_support=icu
+		-Dbash_completion="$(get_bashcompdir)"
+		-Dsystemd_user_services="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index f93f0789fb2e..3dc1ceb5a35d 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -1,8 +1,8 @@
 AUX uptimed.init-r1 730 BLAKE2B 21d7b8f5fa4daee5a3807d35f749a467731b5e2ebc0e2b741cbe20ad9af32aefa52566fe99dedc31abf30c3f74d74ced97ce094f07203b1473bc79d9ee2546e2 SHA512 8a9e054b2ae3f5479504b0d466a96687f5be2c5d1d8fda740597ca21d8854b4ba4bc8576f8f903392e1b3c7564e3e9e80eb39f30f5a8df0b228d1bdae04725f0
 AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bceee3bb7856e67c1010d067c06ae699f4dd0389228392d5828e1bf75636c69171e2d21509330f6baf SHA512 949baf12782d4b8a976d29ec44bd31323500de763b82601634eea3721ce9035bb9b7ca906384e2b8ebd57371a1116a95dd78c3610c27fa1d93e36b9f897bcd98
-DIST uptimed-0.4.0.tar.gz 55026 BLAKE2B 9f66f3cda4181c01e686896a8560ecab7bb7f3ed9cdaeaee840a589137188d8629ba414e436a99b212d386b8d3319ce88ccb8867c78335b015ed65a179154621 SHA512 918cd9e065d5005daf5062f14dffb725cb6d6764aa571fd45d63de3f7349b910cbae0dedc832f9bfb52a42caea90e8aec8390685baaf0718fec827240e517900
 DIST uptimed-0.4.1.tar.gz 55162 BLAKE2B c281f922ed4fcf4f55571f1f1177451bf9f2e0fecfc87566610e1d24055969cd61543fcb0fdae4d0e6dc7a082c1b9013a08b72641d572a2475e9c7f5fd56deae SHA512 5dfe79aebab8c8daca3a3ec88d54e312446fc7cf8b54ef1414cbfcb3fb25053ef31235de4b42cb14fc7352965b77ca2875c753b97b4d61178792a5484715e23a
-EBUILD uptimed-0.4.0-r1.ebuild 1665 BLAKE2B cfe1181127c603e3ae41b73147e6e86498a11ed7f0f1c688821bb9fc442abf1dcd2e7a2edb87aab66fdbbcb28aae33b3acf442cb9dd2bc5c3bee1f1bfdce3481 SHA512 ce1d9b90d71a2cb49084499e22994d75e4461480f1f939f26f1fb75b2453749d2afbc55b5d8a96e6cf7b3f5d7ae4249f175a3198580e0ecc53ba566eec9c1ad9
+DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd989687fa8f5a40f160f2912c21d09298bbb9c676af5387d96890a98acf3f21b60e046a9548a735ca10dbc4006 SHA512 a18cc8580a4dc7db7f4d97d70e25d76e7b98b9d328a0fa4ece4176d40fc26589149d63ffc9d2638cc35003cf485b43ae6e115aa1821c662d77f234eb3c4c0a4f
 EBUILD uptimed-0.4.1-r1.ebuild 1581 BLAKE2B 1e3d06682282172a0cfbc8e40a81ccdebfe559b7a1d31f58db8b46924491ffdab2c9a928eb7b3006d58689cacf0ca84b45c231f933b20842bec94bdbed4d2078 SHA512 6454399030808f349752f563dc9d35ad64eede2365b5a5933a2d1c1f0a100568cc54e5c627c481f118c77db19836d6e92309344d587aef635be5474e3611bb49
 EBUILD uptimed-0.4.1-r2.ebuild 1613 BLAKE2B fa6b0aacb33dffac4e1882b85bb8ec87207584e0ead37fc74985b4f00b94b01ca1f438465d9ec1df733ed753fddb08e18e01428445fff6c301915fffc3090a45 SHA512 7a646071b46404f301d4118f4e9148a0ee88d16ee427938620b11fe72ae6b5dd5600f9838dba5f8b9a01a4e02f203f99ece7b67f95023f63f2721fbf97c84f91
+EBUILD uptimed-0.4.2.ebuild 1613 BLAKE2B fa6b0aacb33dffac4e1882b85bb8ec87207584e0ead37fc74985b4f00b94b01ca1f438465d9ec1df733ed753fddb08e18e01428445fff6c301915fffc3090a45 SHA512 7a646071b46404f301d4118f4e9148a0ee88d16ee427938620b11fe72ae6b5dd5600f9838dba5f8b9a01a4e02f203f99ece7b67f95023f63f2721fbf97c84f91
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.0-r1.ebuild b/app-misc/uptimed/uptimed-0.4.0-r1.ebuild
deleted file mode 100644
index 8e4829fd4054..000000000000
--- a/app-misc/uptimed/uptimed-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune user systemd
-
-DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
-HOMEPAGE="https://github.com/rpodgorny/uptimed/"
-SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="static-libs"
-
-pkg_setup() {
-	enewgroup uptimed
-	enewuser uptimed -1 -1 -1 uptimed
-}
-
-src_prepare() {
-	default
-	# respect DESTDIR
-	sed -i -e 's|-d \(/var/spool.*\)$|-d $(DESTDIR)\1|' Makefile.am || die
-	# fix configure.ac for >=automake-1.13 (bug #467582)
-	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
-	default
-	prune_libtool_files --all
-
-	local spooldir="/var/spool/${PN}"
-	keepdir ${spooldir}
-	fowners uptimed:uptimed ${spooldir}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	local spooldir="/var/spool/${PN}"
-	if [[ -d "${spooldir}" ]] ; then
-		einfo "Fixing permissions in ${spooldir}"
-		find ${spooldir} -type f -links 1 \
-			\( -name records -o -name records.old \) \
-			| xargs --no-run-if-empty chown uptimed:uptimed || die
-	fi
-	echo
-	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
-	elog "or systemctl start uptimed (for systemd)"
-	elog "To view your uptime records, use the command 'uprecords'."
-	echo
-}
diff --git a/app-misc/uptimed/uptimed-0.4.2.ebuild b/app-misc/uptimed/uptimed-0.4.2.ebuild
new file mode 100644
index 000000000000..1986bbd3429a
--- /dev/null
+++ b/app-misc/uptimed/uptimed-0.4.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
+HOMEPAGE="https://github.com/rpodgorny/uptimed/"
+SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="static-libs"
+
+RDEPEND="
+	acct-group/uptimed
+	acct-user/uptimed
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	# fix configure.ac for >=automake-1.13 (bug #467582)
+	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	local spooldir="/var/spool/${PN}"
+	keepdir ${spooldir}
+	fowners uptimed:uptimed ${spooldir}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	local spooldir="/var/spool/${PN}"
+	if [[ -d "${spooldir}" ]] ; then
+		einfo "Fixing permissions in ${spooldir}"
+		find ${spooldir} -type f -links 1 \
+			\( -name records -o -name records.old \) \
+			| xargs --no-run-if-empty chown uptimed:uptimed || die
+	fi
+	echo
+	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
+	elog "or systemctl start uptimed (for systemd)"
+	elog "To view your uptime records, use the command 'uprecords'."
+	echo
+}
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 21679b9c4cfb..96625ad46a51 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -3,4 +3,4 @@ DIST vifm-0.10.tar.bz2 1054361 BLAKE2B 81ec964b3bf236764976bcedb84c922eca0da6509
 DIST vifm-0.9.1.tar.bz2 1002758 BLAKE2B 8eb9cc4c299877485bb4a44d95fe2412e196686399a6246bc1b5036dbc34ecbcf1cd43d1d55bdacdcc099a65e03f589f360d39ee38da4e12bff0a4bfcbdd180b SHA512 a30457329bf9501efd7e9e0853107b5ecd653ab70e7081764677d035bd0f61876bc96b35bea5258153d68b7be075091168331be79d7398f94353f73bbf78933d
 EBUILD vifm-0.10.ebuild 2115 BLAKE2B 2c4af2cdd610d10cebb29815f3c1c0d840593339eeb8165d32bc21a0f33c2bcaa8a88c86760620dd4000eee87b6807f37db30fc611a9824a3eb10e2fd713b102 SHA512 97af2e063f33030d81a8013d47cd905c981413f87052588d776351d63c17964590af64ace4ac17b42554bd778c7336d558928f35373b6c332410bfdc52ac1c4e
 EBUILD vifm-0.9.1.ebuild 2171 BLAKE2B a21fb0c2f78322b2fff57396ee4b7a0e8177b5b8a9249cba884ce98062e9aa63d5bed314f53709dd125377e58701558bab58d4ad64693387d6e0cb51ab8f4d80 SHA512 3018627eea8ad64162a8239ddf84d5054f8639fb0771b2ad9eaedc2d4b46f2c467cc0c0947b890f3b6494146903b7db573a765a652b817e607816024f1efe2c7
-MISC metadata.xml 1208 BLAKE2B 17c73134c7379cf058675354054df151f1cf0bd9ff93cb160d3e25a1886f6cb11d9cbe77657aae156b10d702ef8b8378b8fe22a6fe669a05738a5ecfb44520e1 SHA512 894dd6e5392755fe99649c2c1df4d03c63c8060133effafea91de975a8fa94aa691453e986bd4531a8bbf85a4431ccfd19d71a556b61fc4f119f6c02c59946ac
+MISC metadata.xml 1144 BLAKE2B 7fb3843c66347b41788014325145c08b79ab3d2ce4845501ca33a6e0a62454298351636a21a712528fe5ea3ff99b24fdaea4d27936024710866a50bf6370ebef SHA512 ceaa84abce6268f7ea54edef793d5f0df4586e2902059fa9c06fecd20f2b562740a8993c5248558fc85fe68fc2d70794b89e75400bad8868f7e8f1a51f897fbe
diff --git a/app-misc/vifm/metadata.xml b/app-misc/vifm/metadata.xml
index b4f614ade745..be026a5f57b4 100644
--- a/app-misc/vifm/metadata.xml
+++ b/app-misc/vifm/metadata.xml
@@ -20,7 +20,6 @@
 		<flag name="developer">Enable features of interest to developers</flag>
 		<flag name="extended-keys">Support for extended keys (arrows, home etc)</flag>
 		<flag name="gtk">Use gtk+ to determine mimetypes</flag>
-		<flag name="magic">Use libmagic to determine mimetypes</flag>
 		<flag name="vim">Install the vifm vim plugin and vim-compatible documentation</flag>
 	</use>
 	<upstream>
diff --git a/app-misc/worker/Manifest b/app-misc/worker/Manifest
index e3ce02a8635a..3cf28b3e2c0f 100644
--- a/app-misc/worker/Manifest
+++ b/app-misc/worker/Manifest
@@ -1,3 +1,3 @@
 DIST worker-3.8.3.tar.bz2 1519483 BLAKE2B 45573bed62256eda879a776f8a65af63a5c57f8c89784445faf264d2e09403faecdeb225d99ee50498df4c21a9cdf69a131c7d391a24eafe48c2319808b009dd SHA512 fa5d078233a91ec603cd87718542cdd5d99ef89c5d2e72c84fe40c08778c5e9dde8e99a23ccfee5ef61e63535c809a48ccf71fe9a256fd7afa05f848c5045738
 EBUILD worker-3.8.3.ebuild 1264 BLAKE2B 94d3fe57c632417e7b2a913e3fc0556ebac23c8eff0738985d3f5e3283e75839fb77a700a557731c948299035b0d67511cacf1ebf107fd64212615271dd59307 SHA512 9d41c3ddf13e86873ac6288601e0f50e552e912a0cab69133300285947bc0f3a48574d9121729ef721ebd41b03998b0dbb0aa82f23ceec123455ba299d46d2e4
-MISC metadata.xml 636 BLAKE2B 9de5b71c8c1536a59308e33590c08227ef0bf31d96c6581fa87126576026bbd2646d1da648da45cfc35bace216a7a3a74c839340eb9f8b8a579b747feaead0b4 SHA512 67911dd438f9fa6ccd9e1f1bf47feb23016564b7d3cd33f846c17e82d83f70c39e6472bb61585a143475f207c3160c575e33fcd5edc5d2fe517ac5cf9f56c682
+MISC metadata.xml 520 BLAKE2B 0fb1b40fb4c8758fb25ef27ba4d0a7f18550a3bfb8d53efee66a72ce1e8e371a9b17e7ff49f8c109b0d99dd0fbb709636b170cbbfd4701efcc08e0580e49302a SHA512 0dfbeebb02e324e4b6d6ccc9939ae4b2293f185db6bf42de31ade55b577395950b799b9591228e1f9c9f64c05aab5011e3eb43970b1796f60cf96ed5ba82a183
diff --git a/app-misc/worker/metadata.xml b/app-misc/worker/metadata.xml
index dd300924df2a..6023fe5dc94a 100644
--- a/app-misc/worker/metadata.xml
+++ b/app-misc/worker/metadata.xml
@@ -10,6 +10,5 @@
 </longdescription>
 <use>
   <flag name="avfs">Enable support for <pkg>sys-fs/avfs</pkg></flag>
-  <flag name="magic">Add magic file support from <pkg>sys-apps/file</pkg> to automatically detect file types</flag>
 </use>
 </pkgmetadata>
diff --git a/app-misc/xmind/Manifest b/app-misc/xmind/Manifest
index 372b3fd32056..031d61b55623 100644
--- a/app-misc/xmind/Manifest
+++ b/app-misc/xmind/Manifest
@@ -5,6 +5,6 @@ AUX xmind-wrapper-3.7.0 504 BLAKE2B 3528749643f3686d11afc7817e6b3e3228e3ef22105a
 DIST xmind-8-update7-linux.zip 119918223 BLAKE2B 83a7c11e9eda40ac5f89458673417cdf98aacd793de66cca91e6b1f8429eaa0dfb276cc5a11a0eb00f055cb1b66e69bc084fd29abcfa6cecd2811de4f7d7b57f SHA512 0f59201f44b23436c7e6e3fd4dd1427337e5a262e5d4f25dbc836c2f4fd42b99232c1988138ba7015523ede50e0ae829ada6359698d5af0eee529ed19cd347e3
 DIST xmind-icons.tar.xz 5024 BLAKE2B 3391d931dc7d3094ad1213c9cbd43c6b3f151c7f7321ff23139c7f1b69c3fdc662902a95714bac240b1962c26210f3edc41752f315c885581e9ba03efa9069e6 SHA512 3ee6b8e42b75305bec8f97f733575f10ca3d08e1c5a76a10700776cb7740ae6f8a0f3dfbc4112d60ab2499915ca4ea0e3d56fd49e55bec00fccdc8710d9f9f0d
 DIST xmind-portable-3.5.3.201506180105.zip 159265180 BLAKE2B dde948c9e16cb02607b8fd23a315b0ff5d5ec75b4feb79d62cde1e0d11f06e477068435dd8856d573b7f01e7959a19169357b477841a1d5057367cd3c4f8b8c3 SHA512 d41deebec769d06276d051c57e546c44e4283feabd5f6c45ce97efdbf755d75e9b99d39b6fd10baf2f4735f25a695d2902ca9888d94ad414318f38c55e3f4af5
-EBUILD xmind-3.5.3.201506180105-r2.ebuild 2224 BLAKE2B 6e866ec7b2f12ec302d9bb7442565d476f1a8555781b475d4c59641d2755b371879c923ad9fbb89cdfe6d864aaa91649df1c25ec49bcb39b2e4cadd9f001dd2d SHA512 10201e1e9043da37fc6d14fd5f5f2e370aca617558a9d2fb78d423d7c792fa5ea783fc6d1f0c1eb7c16479bf731d644382ae31b6cec1240a02c8dd64c7e78981
-EBUILD xmind-3.7.6_p201801311814.ebuild 2179 BLAKE2B 9d3acb425169c03da22b6fad93a5ccc292e4a416c92dd58e41169c08ae56376438b0475c528a0288bd8641e067e578c8c3df845d326bfd3cb2ee13b73b4bdc5b SHA512 9757e194263ad2fc5a29cc2f9f12d8f47352f2773021c1e2c5f2b536e6769ca80656f35627ac3bde264c13b48911d196cb0e7cbf92faa220f6328edaa1b3921e
+EBUILD xmind-3.5.3.201506180105-r2.ebuild 2245 BLAKE2B 1b4e631fc80705e9fa77d51d16878eb39a7485e0d50795f8ee24fdc396c318e000229447dbbc6d075bac2aeca9c7c411dc61c605b4295f5366680404df091a46 SHA512 c17d3d205baef9d6a5a9efb9534444a487414b337904e8a50f56db1fd8a6484657d03e62f20ad22f6ba2f69dd1297e70f9725c97fdfb706d0c5ac2d6638edd02
+EBUILD xmind-3.7.6_p201801311814.ebuild 2200 BLAKE2B b339133c09aa766af4884b20ae538ebaed1204de79e5834f94b3c457910e5e2055848557985e52fd264a53d32a428306dabd0491eee959c2b02c0e70ee0744ce SHA512 9a7cdcad547178785743627d0a346771bab40df80e24811fd9d0ddd4cc9d31eacb99c26d77123e393597e83d66c958ce39b31398652a4bee67816cbc45b91f07
 MISC metadata.xml 248 BLAKE2B 756531e249f020913a383436ea184d8617481ef1ddefb311630199224eabe6082d396b3058f1123fa97d7aa6f8026de8a256cf4fb253b16381462d64f45373d6 SHA512 29d9aef2134dc48ca8f1cf14bcb7197920bee680270c75fa551c892c9bbaa325a1a6cc6e97a25e1a33c1dc36e1c7085abb3672559b9803285d755db6eefe12a3
diff --git a/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
index a5d4a0ca6de4..dfb4046680b1 100644
--- a/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
+++ b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,6 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
+DEPEND="app-arch/unzip"
 RDEPEND="
 	>=virtual/jre-1.5
 	x11-libs/gtk+:2
diff --git a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
index 12a6a7c49210..03ce175e13f3 100644
--- a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
+++ b/app-misc/xmind/xmind-3.7.6_p201801311814.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,6 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+DEPEND="app-arch/unzip"
 RDEPEND="
 	>=virtual/jre-1.8
 	x11-libs/gtk+:2
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index d443926463e6..45c64fa7f47e 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/gnocky/Manifest b/app-mobilephone/gnocky/Manifest
index 9c0ee4ef5726..4c85f1765d3e 100644
--- a/app-mobilephone/gnocky/Manifest
+++ b/app-mobilephone/gnocky/Manifest
@@ -1,3 +1,3 @@
 DIST gnocky-0.0.7.tar.bz2 569945 BLAKE2B 581e79d0126a12d3a24efd8abc4e22e0ac6195ef90143b27aedd2b14b8389b539d90b1e56d5b87bd05dd090df73477d248ef0156d4318f4860153bef69a0c126 SHA512 a4387c68bc7c3e59f122be87b5b68ec7cae9016039fb1f76c8ebfbe421bcf2399ba93419a2d27c61afe937f580dd7e9bff14f4b803bee70aa60c95c7d0f6ad53
-EBUILD gnocky-0.0.7.ebuild 424 BLAKE2B ced3c83f801600fb684637a86e191ad6532dd513f554ca139dd48f8375412562c4bfe6c9bf3a80877e11fa01111d40e09cbe5181a630282b73ba8ae80aaa6e02 SHA512 29b47e1b7f55010b6526bad7f198fd62c95c106021d3bcbea174436a41ce706f31ed5b50d836a5f7dde72b0856640d0baf01b13e375ffd8c8485072f8eec806f
+EBUILD gnocky-0.0.7.ebuild 432 BLAKE2B 6bc5f3630925f1134854361b539ecb5caa97fde0796e8118209cd105ea1c10f9f946d39531708cd4813df85fa56f8240f020ad0c75e4eddaa11b28163a44171a SHA512 0e655b71c040aa38b7fa2d12ee13923c4c95c47d9c02a203d61ba27f5fdb77e279f1c1f8b63ae4b94de5833e2ad8dd3b4928ffb67dc4db8bb61dfbba9d3128c2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-mobilephone/gnocky/gnocky-0.0.7.ebuild b/app-mobilephone/gnocky/gnocky-0.0.7.ebuild
index db68d7f735f3..abb294597d73 100644
--- a/app-mobilephone/gnocky/gnocky-0.0.7.ebuild
+++ b/app-mobilephone/gnocky/gnocky-0.0.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="GTK-2 version of gnokii"
 HOMEPAGE="http://www.gnokii.org/"
-SRC_URI="${HOMEPAGE}download/${PN}/${P}.tar.bz2"
+SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index e381831db55d..7dd53bd07b97 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index a1835afc2ade..8edffe8c5a21 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -2,6 +2,6 @@ DIST gnumeric-1.12.39.tar.xz 20040688 BLAKE2B 5d99da20b567a939208881b962de3c79ab
 DIST gnumeric-1.12.43.tar.xz 18033636 BLAKE2B 32cbbefc10c0537b02b56564ed37f03d69d0865e9bd16dc8cb77aacf682087fce60f01a2e70b5dbef4d73840b6ccbe198d3c5cc5f13b0f1b2a48d0af635e607f SHA512 d2702000e6c4f4c0c7ff442a2b81e10f4d55f0cffbf7b7f1e7c9fed98fb46172b0118ca05102aa53fb4f953799e2be3534f0518b025ece26647ce67b870a34a7
 DIST gnumeric-1.12.44.tar.xz 18010384 BLAKE2B 0348714a7dae119b36a6739ea499bc0411416637fe9cbd703024f4cdcdb894e2d4b0da3212ea6e2ad1dd81f893c96341722c83ef014db7f0a6f2a048696f41c6 SHA512 ea21dcdf5fdf4e02bb9d83671675f2409f12ee928611604d7589e0047ce5d75bf6ac51e6a5322c4af520428acdccf4c2b3b8e3fc6530030e162268aea94a503f
 EBUILD gnumeric-1.12.39.ebuild 1478 BLAKE2B 09c3f7ef78dccdd75dd66a90ef4a03395ec99e622b18a8538f5b83a6161651d1195d357ad88233a38dd272c31541dbd30947804eaf9e72919505aeb95b4b215b SHA512 fbe626756b95c7e6dc7ae870390d7bda2448caec9056d7083dc66534603e6e16a0b8c69dde18e4727719c2c4aadb32d63f7a5aa848016d04c1f5586acb70a72f
-EBUILD gnumeric-1.12.43.ebuild 1832 BLAKE2B f2b87cce66479a727d60538aa28c1377e2ab9fcf963e7b026f0e5b6160bdda6c0656d0fdbb54a76a2932f392ae5d8c4539fdec3a1a6f12ce070638efe5b85652 SHA512 7e44d00c1410aef8aafccaeebeef439e697c8ade4758753743e6734bdadef3dccc9a293c9fa88aec517e36b1bd807ce064c3b52122076937a41572086f3a9d48
-EBUILD gnumeric-1.12.44.ebuild 1832 BLAKE2B f2b87cce66479a727d60538aa28c1377e2ab9fcf963e7b026f0e5b6160bdda6c0656d0fdbb54a76a2932f392ae5d8c4539fdec3a1a6f12ce070638efe5b85652 SHA512 7e44d00c1410aef8aafccaeebeef439e697c8ade4758753743e6734bdadef3dccc9a293c9fa88aec517e36b1bd807ce064c3b52122076937a41572086f3a9d48
+EBUILD gnumeric-1.12.43.ebuild 1940 BLAKE2B 2f4f3e68a5d63579e0aa32db5ff71087cdb1fb5783d2512d27e91cd58a1431e38c79801a70fc904f855c21c76227e4da6db6fa5de3732336449e4c0e54705a5b SHA512 72a3ee9d1e40609ee95c65c406b96109bbc38733ff2b5fc461743c65f7d5c2058218369c002b298de9c3b266a45cc0942c7711531a3dc2b6b420bc2e40a54c54
+EBUILD gnumeric-1.12.44.ebuild 1940 BLAKE2B 2f4f3e68a5d63579e0aa32db5ff71087cdb1fb5783d2512d27e91cd58a1431e38c79801a70fc904f855c21c76227e4da6db6fa5de3732336449e4c0e54705a5b SHA512 72a3ee9d1e40609ee95c65c406b96109bbc38733ff2b5fc461743c65f7d5c2058218369c002b298de9c3b266a45cc0942c7711531a3dc2b6b420bc2e40a54c54
 MISC metadata.xml 465 BLAKE2B c246609f5d6b20c968faeb36a0c6e33df41ae8a373360ed003541fdf816ff9399f62ababfc4aea5c557bcf9dac83a71357ce9e789ca08d94e83cdeda83aaa275 SHA512 753783aee82021a573093a0ecb7807bdf56d037032fb1afa5559db44b1d06f72bdf9aedfead48cae9917d78aaa7c39d19e528946ef45b51fd6cf5357b9b020fa
diff --git a/app-office/gnumeric/gnumeric-1.12.43.ebuild b/app-office/gnumeric/gnumeric-1.12.43.ebuild
index ed6ea6ba93b7..903ec136a3a5 100644
--- a/app-office/gnumeric/gnumeric-1.12.43.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.43.ebuild
@@ -16,7 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="+introspection libgda perl python"
 # python-loader plugin is python2.7 only
-REQUIRED_USE="python? ( $(python_gen_useflags -2) )"
+REQUIRED_USE="
+	introspection? ( ${PYTHON_REQUIRED_USE} )
+	python? ( || ( $(python_gen_useflags -2) ) )"
 
 # Missing gnome-extra/libgnomedb required version in tree
 # but its upstream is dead and will be dropped soon.
@@ -37,9 +39,10 @@ RDEPEND="
 	>=x11-libs/gtk+-3.8.7:3
 	x11-libs/cairo:=[svg]
 
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	introspection? ( ${PYTHON_DEPS}
+	>=dev-libs/gobject-introspection-1:= )
 	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS}
+	python? ( $(python_gen_impl_dep '' -2)
 		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
 	libgda? ( gnome-extra/libgda:5[gtk] )
 "
@@ -59,7 +62,7 @@ src_prepare() {
 
 src_configure() {
 	if use python ; then
-		python_setup 'python2*'
+		python_setup -2
 	fi
 	gnome2_src_configure \
 		--disable-static \
@@ -72,6 +75,8 @@ src_configure() {
 
 src_install() {
 	gnome2_src_install
-	python_moduleinto gi.overrides
-	python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+	if use introspection; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+	fi
 }
diff --git a/app-office/gnumeric/gnumeric-1.12.44.ebuild b/app-office/gnumeric/gnumeric-1.12.44.ebuild
index ed6ea6ba93b7..903ec136a3a5 100644
--- a/app-office/gnumeric/gnumeric-1.12.44.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.44.ebuild
@@ -16,7 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="+introspection libgda perl python"
 # python-loader plugin is python2.7 only
-REQUIRED_USE="python? ( $(python_gen_useflags -2) )"
+REQUIRED_USE="
+	introspection? ( ${PYTHON_REQUIRED_USE} )
+	python? ( || ( $(python_gen_useflags -2) ) )"
 
 # Missing gnome-extra/libgnomedb required version in tree
 # but its upstream is dead and will be dropped soon.
@@ -37,9 +39,10 @@ RDEPEND="
 	>=x11-libs/gtk+-3.8.7:3
 	x11-libs/cairo:=[svg]
 
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	introspection? ( ${PYTHON_DEPS}
+	>=dev-libs/gobject-introspection-1:= )
 	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS}
+	python? ( $(python_gen_impl_dep '' -2)
 		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
 	libgda? ( gnome-extra/libgda:5[gtk] )
 "
@@ -59,7 +62,7 @@ src_prepare() {
 
 src_configure() {
 	if use python ; then
-		python_setup 'python2*'
+		python_setup -2
 	fi
 	gnome2_src_configure \
 		--disable-static \
@@ -72,6 +75,8 @@ src_configure() {
 
 src_install() {
 	gnome2_src_install
-	python_moduleinto gi.overrides
-	python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+	if use introspection; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+	fi
 }
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index c4af589cd79c..bd4989605b72 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,4 +1,5 @@
 AUX kexi-3.2.0-missing-header.patch 739 BLAKE2B da09cf24f4852222040112a7774bd5d0463f85d52d52c352b453f4d0502085a0faa67ae3ae8fd44102c2fa3b8840525929e53c9ad1a05acfb5c23747cdbb6d91 SHA512 14779c27e47d7e3c0f3f8de917deae8fed7b38673bcc5ec53fa0ca7c89c354a3601af80c6fe17ab3231f633852c47c0dcd2858834cee79a961fc3d02a1043fa1
+AUX kexi-3.2.0-postgresql-9.12.patch 1094 BLAKE2B ac9ba4ff8f5c29ae8ebdcfa6820ed8663aa0f13a9fb55f4eff85265fa3d76a3e33e6c1000400a7a21721e9f45ba58006dbb97c312fd4b96f9d0e9e49dfd88690 SHA512 cfde38090e163ff441477c7f8262629589c9ab49c2687eefe7e0a107f4d70fd447cc35e1031612a6ce970e3b3ec3b9394f13e6e2876c29614cb43ba0b9fc9fbd
 DIST kexi-3.2.0.tar.xz 3624956 BLAKE2B 8d0b3712f07d13f606c4c0d714b3d4ea0fe9f56e4d4a3aeeb144ffda56cd5ef89e4f08d5660550364103c86acd60923ddc74fcea135a23fffbae87853a7c00f4 SHA512 5cb9e0747c8e7ea19020b62345571ba10f65278dcc718bb0772827721bf8812d0ffee3c35d53b57285884c66e0406520835c7b00789fbe5459717722dff13e93
-EBUILD kexi-3.2.0.ebuild 2283 BLAKE2B 1193a1da88dd931f14c920a54435ae5fe524b654e5b2b2a177f1ff0e2956e50f8e1c87a208112980b762d07b66f097b5bd770b17e8659fd44b0acab6b47b6fd0 SHA512 199f3d0c67c77a7684e73591ad56367c8b178ed37b27c9af585dee8625ee1787827696f1d27c63b69c42a14887775d37d752172a036c434009125e3544e70863
+EBUILD kexi-3.2.0-r1.ebuild 2330 BLAKE2B 93a140281ac2503dd3c4e06889542840c7d03b3c3317f691b8b5071f2bde8d3af1275b91b6ef1d7c414c553fb85f279c656f9562f50f4529251be49f0e8d77c4 SHA512 1582cde00f8d9d293c32554fdf76217970ff704b7eeb047c17088538d81f289075d279f651784cad27e97dc27ec5e9fd4bc35c28ddfc28e127f3fd66554b44bc
 MISC metadata.xml 600 BLAKE2B 383b28f24ff8522330ed843789c30ac771b4ecb03f45f7f60503463ead5e6a6fd4480eea83be7904d3e0cfecaca73c6fc9d8d29214fbfb2082aa97c45ba607ff SHA512 fc7615150e90fb963d4ae2775b5d0dda7667c0fd975cdcd8e5d52a87d01935471c37c9256e894c68fe88268d61d7a3cde42f36171f9160dae20ce8140eaab22f
diff --git a/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch b/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch
new file mode 100644
index 000000000000..8835c5ea13db
--- /dev/null
+++ b/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch
@@ -0,0 +1,24 @@
+From 88ac2b4a1386bc05f0e3965f31949039eaf4d3ff Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Sat, 25 May 2019 07:12:17 +0200
+Subject: cmake: find PostgreSQL 12
+
+---
+ cmake/modules/FindPostgreSQL.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
+index 56e6e56..1579be0 100644
+--- a/cmake/modules/FindPostgreSQL.cmake
++++ b/cmake/modules/FindPostgreSQL.cmake
+@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e
+ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4")
+ 
+ set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
+-    "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
++    "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+ 
+ # Define additional search paths for root directories.
+ foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
+-- 
+cgit v1.1
diff --git a/app-office/kexi/kexi-3.2.0-r1.ebuild b/app-office/kexi/kexi-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..fcd7857e501d
--- /dev/null
+++ b/app-office/kexi/kexi-3.2.0-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# KDE_HANDBOOK="true"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Visual database applications creator"
+HOMEPAGE="https://kde.org/applications/office/kexi/ http://www.kexi-project.org/"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+
+KEYWORDS="amd64 x86"
+IUSE="debug experimental marble mdb mysql postgres sqlite webkit"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="
+	$(add_frameworks_dep breeze-icons-rcc)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?]
+	>=dev-libs/kproperty-3.1.0:5=
+	>=dev-libs/kreport-3.1.0:5=[scripting]
+	marble? ( $(add_kdeapps_dep marble) )
+	mdb? (
+		dev-libs/glib:2
+		virtual/libiconv
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? (
+		dev-db/postgresql:*
+		dev-libs/libpqxx
+	)
+	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-missing-header.patch
+	"${FILESDIR}"/${P}-postgresql-9.12.patch
+)
+
+src_prepare() {
+	if ! use webkit; then
+		punt_bogus_dep Qt5 WebKit
+		punt_bogus_dep Qt5 WebKitWidgets
+	fi
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug)
+		-DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental)
+		-DKEXI_SCRIPTS_SUPPORT=$(usex experimental)
+		$(cmake-utils_use_find_package marble KexiMarble)
+		$(cmake-utils_use_find_package mdb GLIB2)
+		$(cmake-utils_use_find_package mysql MySQL)
+		$(cmake-utils_use_find_package postgres PostgreSQL)
+	)
+	use experimental && mycmakeargs+=( -DKEXI_SCRIPTING_DEBUG=$(usex debug) )
+
+	kde5_src_configure
+}
diff --git a/app-office/kexi/kexi-3.2.0.ebuild b/app-office/kexi/kexi-3.2.0.ebuild
deleted file mode 100644
index 5bef8c3c8265..000000000000
--- a/app-office/kexi/kexi-3.2.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# KDE_HANDBOOK="true"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Visual database applications creator"
-HOMEPAGE="https://kde.org/applications/office/kexi/ http://www.kexi-project.org/"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-
-KEYWORDS="amd64 x86"
-IUSE="debug experimental marble mdb mysql postgres sqlite webkit"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	$(add_frameworks_dep breeze-icons-rcc)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?]
-	>=dev-libs/kproperty-3.1.0:5=
-	>=dev-libs/kreport-3.1.0:5=[scripting]
-	marble? ( $(add_kdeapps_dep marble) )
-	mdb? (
-		dev-libs/glib:2
-		virtual/libiconv
-	)
-	mysql? ( virtual/libmysqlclient )
-	postgres? (
-		dev-db/postgresql:*
-		dev-libs/libpqxx
-	)
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
-
-src_prepare() {
-	if ! use webkit; then
-		punt_bogus_dep Qt5 WebKit
-		punt_bogus_dep Qt5 WebKitWidgets
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug)
-		-DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental)
-		-DKEXI_SCRIPTS_SUPPORT=$(usex experimental)
-		$(cmake-utils_use_find_package marble KexiMarble)
-		$(cmake-utils_use_find_package mdb GLIB2)
-		$(cmake-utils_use_find_package mysql MySQL)
-		$(cmake-utils_use_find_package postgres PostgreSQL)
-	)
-	use experimental && mycmakeargs+=( -DKEXI_SCRIPTING_DEBUG=$(usex debug) )
-
-	kde5_src_configure
-}
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 0871af7d0303..7caa9bcc9b4a 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,4 +1,6 @@
 AUX kmymoney-5.0.5-missing-header.patch 755 BLAKE2B 156557b8e264bf56b5a5c8e2d05e4fc3646d660776ceef66089af19c24e8a6f866e398a97d71073b80e4305e7ba8450a76ac492f180155010f62f0e1e0370b32 SHA512 02d589e7b2c90495835cc020f42377c93a1a478ea00a7a7a59b407a097d96306664536fc99fa4bfea359b8accb47ae0c08f63d28feca0c6fa0bbfd44addb7893
 DIST kmymoney-5.0.5.tar.xz 11706112 BLAKE2B 7c0e51ad2404a88affd7b99c8ca59b813b646a7d995b5d7f6db311c8813f2966d14b34271f3d9de73d07c763fb191e9f4c0737e64feb35a62cd719856c20bab1 SHA512 ba8033b974b93d47cd2a732a352025715845d3dff016a49babb6b724d5e9b726f84f5e2a1f1f42765a6ff35a00d3d995397f2831981d48cb8468d1407030584c
+DIST kmymoney-5.0.6.tar.xz 11713976 BLAKE2B bfc4aacff79f0c92145257e7398271385f80d9ac7460b35f691c1e45dc115ebe91418a98a1a5e6a6c0cdc376beff7b92c8f7d7a29af3d2529503e7db4dc4b77a SHA512 237918b0844d5d9129d086f403090acf21be6e2ba1f41d575ff9de514a9ddcb7bd616da1377ecc34c4436e12481e425615ab640e7549c783d9010b22c0460480
 EBUILD kmymoney-5.0.5.ebuild 3278 BLAKE2B 91e564fbfa0323bee326b1adad12c1c903161feb65707d3d001d6679f9eb51a1d21757578bcbffc247de0682a20d3b9d7706f8ac3567e4d8eb2947cb7dc7ee92 SHA512 755df5db3e7d4623498df44c9d0acf5ba4edea706d7d1e087d3ebf4422d011c254d9f711401323ba162c316ea557c1c45d21df189abcc3934fa26085e0adf56a
+EBUILD kmymoney-5.0.6.ebuild 3153 BLAKE2B c35efcc8bd17a774e1c7907e050ead00256c409c7f040137e0138940cf26247549c8b9841081d57bce97ed2906f319b8ebb84bb7e016f2af05d70c1becccbc1a SHA512 3e5beaf804ac8fcbdb7f30cef0415bd601d41df229ec7ac5cf477a3d6d528bf5c35767b270a16acf451cc237f6c1b392a21f3e670dffca585b2cf6dfa91d7a2f
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/kmymoney-5.0.6.ebuild b/app-office/kmymoney/kmymoney-5.0.6.ebuild
new file mode 100644
index 000000000000..86b2bc4fc862
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-5.0.6.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_BRANCH="5.0"
+PYTHON_COMPAT=( python2_7 )
+
+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"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+IUSE="activities addressbook calendar holidays ofx quotes webkit weboob"
+
+REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="virtual/pkgconfig"
+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-7.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:= )
+	holidays? ( $(add_frameworks_dep kholidays) )
+	ofx? ( dev-libs/libofx )
+	webkit? (
+		$(add_frameworks_dep kdewebkit)
+		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+	)
+	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+	weboob? (
+		${PYTHON_DEPS}
+		$(add_qt_dep qtconcurrent)
+		www-client/weboob[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+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=OFF
+		-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; bug 673052: needs kmymoney installed to succeed
+	local myctestargs=(
+		-E "(reports-chart-test|qsqlcipher-test)"
+	)
+
+	kde5_src_test
+}
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 86ce9a5ae8fa..4c42ffcb994a 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -80,5 +80,5 @@ DIST Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_tr.tar.gz 12196002 BLAKE2B b
 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.6.ebuild 5194 BLAKE2B f8d899b08e596560c7342672448c83b64fab37c40de278274c79335897f9ed6dda342ff271fe8003dda52412815d7dc0daeaa609384fc0de3b2dc48c2ce0385e SHA512 e3b5f8850faad0b92dc8747a0d82341337762e77b8e247a0986bd06ea3dedbf537969065cb00c429507f5376099ccc45cace3f463f98b77a17dc0504c45118e9
+EBUILD openoffice-bin-4.1.6.ebuild 5262 BLAKE2B dab4a0426ddf27e15a763e92e970db16e696569e59310911daff5b8bd5bb75e0869463094c73b5e5c0fcf9c9bb09db964e4df5955f9193490b643b050c3118dd SHA512 a77c55ae576385290b210f3428d4576dd9280fef03935ac82afabf55fe3f642fa4b74f2127226cd53b2f8c3350ac8156858be24d3712f03a2e6d2a76ba108e08
 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
index d3a0c2c488bb..1cf8dc185577 100644
--- a/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild
@@ -3,7 +3,9 @@
 
 EAPI="6"
 
-inherit eutils xdg-utils gnome2-utils pax-utils prefix rpm multilib
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils xdg-utils gnome2-utils pax-utils prefix python-single-r1 rpm multilib
 
 IUSE="gnome java"
 
@@ -42,6 +44,7 @@ done
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	!app-office/openoffice
@@ -49,7 +52,7 @@ RDEPEND="
 	app-arch/unzip
 	app-arch/zip
 	>=dev-lang/perl-5.0
-	dev-lang/python:2.7
+	${PYTHON_DEPS}
 	>=media-libs/freetype-2.1.10-r2
 	sys-libs/ncurses:5/5
 	x11-libs/libXaw
@@ -70,7 +73,6 @@ pkg_setup() {
 }
 
 src_unpack() {
-
 	unpack ${A}
 
 	cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}"
@@ -115,11 +117,9 @@ src_unpack() {
 
 		fi
 	done
-
 }
 
 src_install () {
-
 	INSTDIR="/usr/$(get_libdir)/${NM}"
 	dodir ${INSTDIR}
 	# mv "${WORKDIR}"/opt/${NM}/* "${ED}${INSTDIR}" || die
@@ -166,24 +166,18 @@ src_install () {
 }
 
 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/pybliographer/Manifest b/app-office/pybliographer/Manifest
index eba6f371cd53..c638f8d1a8ed 100644
--- a/app-office/pybliographer/Manifest
+++ b/app-office/pybliographer/Manifest
@@ -1,5 +1,3 @@
-DIST pybliographer-1.2.18.tar.gz 2174899 BLAKE2B 4723a01d386a1da6f1de6b730e4e38ef1dedfeb7a72310f40fd7475710fd92236bdb484e102bf93340c8b826ddda0353e143cc741cd6b57acbedd82e40e4181b SHA512 b4a97d7e0aec3b4d7c68169d4d8799911b4da0591e819a67429c45d2b451be6be129214631770cf26f2083a935b55575d35c4f3b11ea74a9b39e55feea376204
 DIST pybliographer-1.4.0.tar.xz 1834356 BLAKE2B ba4892f707c2da3f007cb916b158258a59a41cc631e49deacdd784213d506d8e4286c463afb4148c7cb30ed7084ae1a60eee0e62d1bfe13a26bd9fd70a9e60f8 SHA512 aef50e9815b9ff28618ca72c0b50033a24a1bcaa91c9fdbf3014371bb9b4bcaf8fcdffb0fa38e59d37ccfdb4c1383cd601c73aa2e34f4078c514ae9de7341f2a
-EBUILD pybliographer-1.2.18.ebuild 1856 BLAKE2B a8730b705bb5abc370d9f3863d63738998463aa101cab6a252ab9deb71984d8f0aacc788576c6a5f8233711c09978a032975288a483b9724dc437043ca74289b SHA512 47e3d3422c29aa13f90c531337f365780fb4c4522b46010789df593f47c525a4bb4feafafd66816c9697ad28857db92449f34daee4e8b59eac750531c5130adc
-EBUILD pybliographer-1.4.0-r1.ebuild 1716 BLAKE2B b5dd9ff298e484efb4a3e71779d66263ff42cef1fbcfec4b4db55ccf4358fa87e081e3c5929246679f04229ea9fcb2ca9f8f0aa4fb3c673cd3be6b56b8d15d94 SHA512 5a4d6e5c12b497f52d3d893a7129b5cdb768557fac13a32a09910698713c148171e8cdf74285d046b37965b04196cc218ecb9b5e6ddfb12bfc90a5236ee9ad87
+EBUILD pybliographer-1.4.0-r2.ebuild 1761 BLAKE2B f63d1c712b5e8d6ee7b23b9ef327b0051363cd78711d499329bfef6ae82da650235de21415cc7cdceadc3805f62d61b91916057d1c31211ba9b576eef6708ff9 SHA512 111dcc0ab79067fddef9af9d11ac4fee3a7f47a5ef5c02494233080e7558df9c92778c79f30ee1155a1255097a51494559a5714ea131467b5e823c1a8566638c
 MISC metadata.xml 798 BLAKE2B 186a835eadc561bbb17ce369742b5c4d27ce31b3de5ee5d3e2d4ec8c81dee3e96c8c3c86c50fc3d77136738551f74f9346825a754ab4401d6c212057ebd73a76 SHA512 9719f3d541a00da1445210482b9b4f6cfc104b59629b472e50ca2869bdaed6f3a3cf7ff1e28b06806407db368c6c998d46c1e22919f4e4c6cafa9dca1808c2b1
diff --git a/app-office/pybliographer/pybliographer-1.2.18.ebuild b/app-office/pybliographer/pybliographer-1.2.18.ebuild
deleted file mode 100644
index d70519a480d3..000000000000
--- a/app-office/pybliographer/pybliographer-1.2.18.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Pybliographer is a tool for working with bibliographic databases"
-HOMEPAGE="https://pybliographer.org"
-SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/recode-3.6-r1
-	app-text/rarian
-	dev-libs/glib:2
-	dev-python/gconf-python:2[${PYTHON_USEDEP}]
-	dev-python/gnome-vfs-python:2[${PYTHON_USEDEP}]
-	dev-python/libgnome-python:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	>=dev-python/python-bibtex-1.2.5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-"
-
-# Tests broken for a long time, recheck in 1.4, bug #678444
-RESTRICT="test"
-
-src_prepare() {
-	# Workaround for bug 487204.
-	sed -i \
-		-e 's:\$(srcdir)/::g' \
-		tests/Makefile.am || die "sed failed"
-
-	# Install Python modules into site-packages directories.
-	find -name Makefile.am | xargs sed -i \
-		-e "/^pybdir[[:space:]]*=[[:space:]]*/s:\$(datadir):$(python_get_sitedir):" || die "sed failed"
-	sed -i \
-		-e "s:\${datadir}/@PACKAGE@:$(python_get_sitedir)/@PACKAGE@:" \
-		etc/installer.in || die "sed failed"
-	sed -i \
-		-e "s:gladedir = \$(datadir):gladedir = $(python_get_sitedir):" \
-		Pyblio/GnomeUI/glade/Makefile.am || die "sed failed"
-
-	# Fix shebang manually as otherwise python_fix_shebang gets confused
-	sed -i -e 's: @python_path@:/usr/bin/python2:' pybliographer.py || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-depchecks \
-		--disable-update-desktop-database
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${D}"
-}
diff --git a/app-office/pybliographer/pybliographer-1.4.0-r1.ebuild b/app-office/pybliographer/pybliographer-1.4.0-r1.ebuild
deleted file mode 100644
index 13679af58184..000000000000
--- a/app-office/pybliographer/pybliographer-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Pybliographer is a tool for working with bibliographic databases"
-HOMEPAGE="https://pybliographer.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/recode-3.6-r1
-	app-text/rarian
-	dev-libs/glib:2
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.24.0:2[${PYTHON_USEDEP}]
-	>=dev-python/python-bibtex-1.2.5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.8
-"
-
-# Tests broken for a long time, they rely on non-standard PATH for python
-# modules, bug #678444
-RESTRICT="test"
-
-src_prepare() {
-	# Workaround for bug 487204.
-	sed -i \
-		-e 's:\$(srcdir)/::g' \
-		tests/Makefile.am || die "sed failed"
-
-	# Install Python modules into site-packages directories.
-	find -name Makefile.am | xargs sed -i \
-		-e "/^pybdir[[:space:]]*=[[:space:]]*/s:\$(datadir):$(python_get_sitedir):" || die "sed failed"
-	sed -i -e 's:prefix=:cd @datapyb@ \&\& prefix=:' scripts/pybscript.in || die
-	sed -i -e "s:\@datapyb@:$(python_get_sitedir)/${PN}:g" pybliographer.in scripts/pybscript.in || die
-	sed -i \
-		-e "s:gladedir = \$(datadir):gladedir = $(python_get_sitedir):" \
-		Pyblio/GnomeUI/glade/Makefile.am || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-depchecks
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${D}"
-	dodir /usr/share/${PN}
-	mv "${D}/$(python_get_sitedir)/${PN}/pixmaps" "${ED}"/usr/share/${PN} || die
-}
diff --git a/app-office/pybliographer/pybliographer-1.4.0-r2.ebuild b/app-office/pybliographer/pybliographer-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..4cf3e67ada7b
--- /dev/null
+++ b/app-office/pybliographer/pybliographer-1.4.0-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Pybliographer is a tool for working with bibliographic databases"
+HOMEPAGE="https://pybliographer.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/recode-3.6-r1
+	app-text/rarian
+	dev-libs/glib:2
+	dev-python/gconf-python:2[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.24.0:2[${PYTHON_USEDEP}]
+	>=dev-python/python-bibtex-1.2.5[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8
+"
+
+# Tests broken for a long time, they rely on non-standard PATH for python
+# modules, bug #678444
+RESTRICT="test"
+
+src_prepare() {
+	# Workaround for bug 487204.
+	sed -i \
+		-e 's:\$(srcdir)/::g' \
+		tests/Makefile.am || die "sed failed"
+
+	# Install Python modules into site-packages directories.
+	find -name Makefile.am | xargs sed -i \
+		-e "/^pybdir[[:space:]]*=[[:space:]]*/s:\$(datadir):$(python_get_sitedir):" || die "sed failed"
+	sed -i -e 's:prefix=:cd @datapyb@ \&\& prefix=:' scripts/pybscript.in || die
+	sed -i -e "s:\@datapyb@:$(python_get_sitedir)/${PN}:g" pybliographer.in scripts/pybscript.in || die
+	sed -i \
+		-e "s:gladedir = \$(datadir):gladedir = $(python_get_sitedir):" \
+		Pyblio/GnomeUI/glade/Makefile.am || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-depchecks
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${D}"
+	dodir /usr/share/${PN}
+	mv "${D}/$(python_get_sitedir)/${PN}/pixmaps" "${ED}"/usr/share/${PN} || die
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index b98c0d2dcabc..e53cf03dbd33 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index b7ced10b260c..6ed7d64cdfb8 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,6 +1,8 @@
 DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c51e2f74020e0fa2f1f4441c203c03a1269c8c55e1461c5780ebfb8234d364837073d582a52a99f2d40c92e6b77a7f0 SHA512 3a9eac2fd214bcfe39380193cb2118edcd759dbf3eb165e7240525ce1047aa984f1d1f1d3a15324218d9be1f0a1ec960ae08a63191392f1bb3422277a52697ff
 DIST gentoolkit-0.4.5.tar.gz 3218757 BLAKE2B 9ac6e7bdee622ff3069ee0f59a1834f36496f2bd07c53a67677571e0cfc99366ba64d03fca8bd964c3517d7cbcb7d4d5d08e9f3ec721d7adf598b13944fea659 SHA512 6b459684a59c5a72f09da34a2e9491b98f49c861f763bddb52ae002413a2c89d7841d84658577e6fec36a096889265a1207eaf981adfdd5e9db6ad79ca364df3
+DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e
 EBUILD gentoolkit-0.4.2-r1.ebuild 2307 BLAKE2B 5c0ac9e4540cdbe88d6fb4bac6166454eb69a9213065f58699d40cf54b102f70b1a776ef801317cf9c46c6eb21093818d89ecdb1b2a304aaa3c3a99a6ca428c1 SHA512 019378d8e227b69a99529e30e640008673c0a2c3ac4039aa6294ea3dd0d2da2dfca0718acd8ec0874b811b32686c8c23a41ea0397936dc5db71b3e870cfd3085
-EBUILD gentoolkit-0.4.5.ebuild 2317 BLAKE2B 16f6a9a1570f4a5234a45c7db4422a0f05222adc0ea1e796ba01e84f2e685aa84c7c4e29d1271d111a62f40079ddac702106221f021c607c9c252ba9e6e270db SHA512 4d8181000ccb5e97b9acfbd03156bef80a839af092e181832a96641686b817daaa410c379b2e9d126f3889582d35cf5becc02112e549a36b54f5022f942b21b7
-EBUILD gentoolkit-9999.ebuild 2064 BLAKE2B d9f1a0876416a436698229553022d526f2697f7ffa8d0a33541a45ba78b646a21a1de760e899a0567fc68ca07f1b539d659e8a9cd6b1624f3e3ac3e65a4ef142 SHA512 6d01ddd645b27361fb6cde18036e23998415e1f2ecddf41f87eeeb35fde803631dd369e09facf83ea64fa628dbd0644e35dd621de07f35422841ad8cd7129d78
+EBUILD gentoolkit-0.4.5.ebuild 2313 BLAKE2B 5e535377f50f8042485f62537363dea9bb388ce4f231544a139b6e7b17d5fb76b365e492191103ba710d1db681810d6cdf328638473be667d31fb62204f9842f SHA512 74af9a60874ca0e6ab2fc94f1ebf3017f05df946aa3aa257634be50de88ac9051e78cf5bd9a3dd547369d80c4a29152172c13046896c86b49d641ceecab8dc37
+EBUILD gentoolkit-0.4.6.ebuild 2313 BLAKE2B 5e535377f50f8042485f62537363dea9bb388ce4f231544a139b6e7b17d5fb76b365e492191103ba710d1db681810d6cdf328638473be667d31fb62204f9842f SHA512 74af9a60874ca0e6ab2fc94f1ebf3017f05df946aa3aa257634be50de88ac9051e78cf5bd9a3dd547369d80c4a29152172c13046896c86b49d641ceecab8dc37
+EBUILD gentoolkit-9999.ebuild 2060 BLAKE2B 8534d42030279b810cafddbb21dd397071bd2f8bbadc74be63caa941fe19d539a427fa7106f18d13d75c9ee99e58b4f6cc6e106a885dc5f7f3cab7c111774096 SHA512 2b44c33b5b55ad3caeb3fa7f069da9cc03d89f27a5303d00549399b39a93bdd3c0cacf28d2f7bee6eeebc2f4cd8a305c3b625e35ac52d80f98894f694a946c60
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
index 5e01ac6b8c52..8d07e9bfe4b0 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
@@ -43,8 +43,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	# Create cache directory for revdep-rebuild
-	mkdir -p -m 0755 "${EROOT%/}"/var/cache
-	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
+	mkdir -p -m 0755 "${EROOT}"/var/cache
+	mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
 
 	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
 		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
new file mode 100644
index 000000000000..8d07e9bfe4b0
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_REQ_USE="xml(+),threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
+SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	sys-apps/gawk
+	sys-apps/gentoo-functions"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
+		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
+	fi
+}
+
+pkg_postinst() {
+	# Create cache directory for revdep-rebuild
+	mkdir -p -m 0755 "${EROOT}"/var/cache
+	mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
+
+	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
+		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
+		elog "part of the gentoolkit package."
+		elog "The gentoolkit-dev package is now deprecated in favor of a single"
+		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
+		elog "are now obsolete/unused with the git based tree."
+	fi
+
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/install-mask"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index d3fb68d9097d..9503857df3b2 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -43,8 +43,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	# Create cache directory for revdep-rebuild
-	mkdir -p -m 0755 "${EROOT%/}"/var/cache
-	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
+	mkdir -p -m 0755 "${EROOT}"/var/cache
+	mkdir -p -m 0700 "${EROOT}"/var/cache/revdep-rebuild
 
 	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
 		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index b27a58ea3aff..8d890dc050f1 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -3,4 +3,5 @@ DIST pfl-3.0.1.tar.bz2 4635 BLAKE2B 9610c46e3096bc5f2ff212980026b36b99056a9839b1
 DIST pfl-3.0.tar.bz2 4332 BLAKE2B 8e1dd17d0017cd972c02a9e8d3610a036447d7b898c6f0a9557ef2c598c0581a09ee7a72ca04860f3695d06d3fe3ee9426a99b1158db71e232ccaff69479d068 SHA512 94f7cc575689f46a0b9ce50c3de7d6a42767766c8c447616c7f3587438a6b3c09e5d00b3b80cd71b0d386ead1e396d49aa266ff408146f85b18e25ebfe887108
 EBUILD pfl-3.0-r2.ebuild 1000 BLAKE2B 6402e058d0d3bbd14f4af7f629fc7e2daa04f529c1a49aa6cbe0b0e52220e05f6b43c1ac007bcbc86b2a9f84b477b006e0d739695406b1766198c16a8f94414a SHA512 9eb518f909fcfbd50643dbc581a0109ac7acfd2c4756d0f8ae208d2af21a5bae0b8526da7468e79b8ce8373fc9e67d43649f74f7bb435573398a832cbfa75cd4
 EBUILD pfl-3.0.1-r2.ebuild 1115 BLAKE2B e38da39cd034e2629b72141313bd7c37728adbbe95575500cb3ad0d1822c4c68bf8967a9b5c79adba93a855633822ef8cadbb46f30398bda6cd6ea3db6331c41 SHA512 5cdb4750408b1dd77015b89bbab55e1a12bd537e04325b7a900f5c27ac9e00b56c5cb702114e2ae5fce704bea97358f5c21ca709c1a1dd0680d2d4ae8d9d3817
+EBUILD pfl-3.0.1-r3.ebuild 1117 BLAKE2B cc4cf21bc1cd4f350ba01bb8c9675069259e7fe04dae60d562cc3451730eb985d34d1b72fcd4b6e79c9465cfbe335ea09968fb23d538916d964b4bc4fe1b09c7 SHA512 9e56a9fcfdf2fd1148e53bfdba89c4d072bf340c6b17bec4e0ee8f4e2c6c747d195b490e8b0e57946bcce313ab0b989202f71c1c20de8c7f07cbab91d542b307
 MISC metadata.xml 495 BLAKE2B ef70490d091bdd595de1f73ab32dfa8d537c32bf8b5362d7ba19529d7f8c4cc8252702ab781fee5021f13a36b1724f471ff9b6358ddfb77cf7c31f2c4ff56b0d SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b
diff --git a/app-portage/pfl/pfl-3.0.1-r3.ebuild b/app-portage/pfl/pfl-3.0.1-r3.ebuild
new file mode 100644
index 000000000000..0683d8fadcd7
--- /dev/null
+++ b/app-portage/pfl/pfl-3.0.1-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Searchable online file/package database for Gentoo"
+HOMEPAGE="http://www.portagefilelist.de"
+SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+network-cron"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
+	net-misc/curl
+	sys-apps/portage[${PYTHON_USEDEP}]
+	network-cron? ( sys-apps/util-linux[caps] )
+"
+
+PATCHES=(
+	"${FILESDIR}/e-file-function.patch"
+)
+
+python_install_all() {
+	if use network-cron ; then
+		exeinto /etc/cron.weekly
+		doexe cron/pfl
+	fi
+
+	keepdir /var/lib/${PN}
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}/var/lib/${PN}/pfl.info" ]]; then
+		touch "${EROOT}/var/lib/${PN}/pfl.info" || die
+	fi
+	chown -R portage:portage "${EROOT}/var/lib/${PN}" || die
+	chmod 775 "${EROOT}/var/lib/${PN}" || die
+}
diff --git a/app-portage/prefix-toolkit/Manifest b/app-portage/prefix-toolkit/Manifest
index 677af425da8f..d23dc40d946a 100644
--- a/app-portage/prefix-toolkit/Manifest
+++ b/app-portage/prefix-toolkit/Manifest
@@ -1,3 +1,3 @@
-EBUILD prefix-toolkit-3.ebuild 18363 BLAKE2B a5a805882f0e654dab5da79ba18940949591272e6ae5f81d11d6ba751faac22a8c39230aecf40df315731e696e86ff5a3861c8ff8aa3302db95ba507b5d85d9b SHA512 6053e11f3c5bb8aaee05da82efa6c78019f32872188da3a0cf6fab1585923241e108f089a7084feaded48827f60397b7d10af8471329d62a75fcfbdae4f19350
 EBUILD prefix-toolkit-4.ebuild 18547 BLAKE2B 927a0ba2788c00a605f7ecc826b28b4889c1f2317278eb9dff37c62d3e25526fc2d617cc50e61da2e65d9ac7b2aa7170eb126084f33762cf337377f0e766372d SHA512 c4ed8da3e01565350d67c4eafeebd9cb72a17d1a1e9588bf95b8eb6f7326196a7be2ffbdd222510bd1f132ad4302ad1104cea2cdcceda7589246856685c1b429
+EBUILD prefix-toolkit-5.ebuild 19280 BLAKE2B f74ccb86f632f61da0fabf5f5ce0c82b1ac911aac3d066815da31f98e41ba31d76218eba28dc743ec66a1d260ea58ba96084f799262ffe699f0c9f5545e28747 SHA512 3c0fd65d10e911a6810b6a3e21678e89d684cf198f8076dea251d8395fac73f1a926b22602f395bc777810ebb37db534129dc7fd80eb782baf1f6c518d73d5e5
 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-3.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-3.ebuild
deleted file mode 100644
index e4719f87c3a9..000000000000
--- a/app-portage/prefix-toolkit/prefix-toolkit-3.ebuild
+++ /dev/null
@@ -1,647 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Utilities for users of Gentoo Prefix"
-HOMEPAGE="https://prefix.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-
-[[ ${PV} == 9999 ]] ||
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-DEPEND="
-	!app-portage/prefix-chain-setup
-	!sys-apps/prefix-chain-utils
-"
-BDEPEND="${DEPEND}
-	>sys-apps/portage-2.3.62
-"
-# In prefix-stack, these dependencies actually are the @system set,
-# as we rely on the base prefix anyway for package management,
-# which should have a proper @system set.
-# See als: pkg_preinst
-RDEPEND="${DEPEND}
-	prefix-stack? (
-		>=sys-apps/baselayout-prefix-2.6
-		sys-apps/gentoo-functions
-		app-portage/elt-patches
-		sys-devel/gnuconfig
-		sys-devel/gcc-config
-	)
-"
-
-S="${WORKDIR}"
-
-my_unpack() {
-	local infile=$1
-	local outfile=${2:-${infile}}
-	ebegin "extracting ${outfile}"
-	sed -ne "/^: ${infile} /,/EOIN/{/EOIN/d;p}" "${EBUILD}" \
-		> "${outfile}" || die "Failed to unpack ${outfile}"
-	eend $?
-}
-
-src_unpack() {
-	if use prefix-stack ; then
-		my_unpack prefix-stack.bash_login
-		my_unpack prefix-stack.bashrc
-		my_unpack prefix-stack.envd.99stack
-		my_unpack prefix-stack-ccwrap
-		local editor pager
-		for editor in "${EDITOR}" {"${EPREFIX}","${BROOT}"}/bin/nano
-		do
-			[[ -x ${editor} ]] || continue
-		done
-		for pager in "${PAGER}" {"${EPREFIX}","${BROOT}"}/usr/bin/less
-		do
-			[[ -x ${pager} ]] || continue
-		done
-		printf '%s\n' "EDITOR=\"${editor}\"" "PAGER=\"${pager}\"" > 000fallback
-	else
-		my_unpack prefix-stack-setup
-	fi
-	my_unpack startprefix
-}
-
-my_prefixify() {
-	local ebash eenv
-	if use prefix-stack ; then
-		ebash="${BROOT}/bin/bash"
-		eenv="${BROOT}/usr/bin/env"
-	else
-		ebash="${EPREFIX}/bin/bash"
-		eenv="${EPREFIX}/usr/bin/env"
-	fi
-
-	# the @=@ prevents repoman from believing we set readonly vars
-	sed -e "s,@GENTOO_PORTAGE_BPREFIX@,${BROOT},g" \
-		-e "s,@GENTOO_PORTAGE_EPREFIX@,${EPREFIX},g" \
-		-e "s,@GENTOO_PORTAGE_CHOST@,${CHOST},g" \
-		-e "s,@GENTOO_PORTAGE_EBASH@,${ebash},g" \
-		-e "s,@GENTOO_PORTAGE_EENV@,${eenv},g" \
-		-e "s,@=@,=,g" \
-		-i "$@" || die
-}
-
-src_configure() {
-	# do not eprefixify during unpack, to allow userpatches to apply
-	my_prefixify *
-}
-
-src_install-prefix-stack-ccwrap() {
-	# install toolchain wrapper.
-	local wrapperdir=/usr/${CHOST}/gcc-bin/${CHOST}-${PN}/${PV}
-	local wrappercfg=${CHOST}-${P}
-
-	exeinto $wrapperdir
-	doexe prefix-stack-ccwrap
-
-	local cc
-	for cc in \
-		gcc \
-		g++ \
-		cpp \
-		c++ \
-		windres \
-	; do
-		dosym prefix-stack-ccwrap $wrapperdir/${CHOST}-${cc}
-		dosym ${CHOST}-${cc} $wrapperdir/${cc}
-	done
-
-	# LDPATH is required to keep gcc-config happy :(
-	cat > ./${wrappercfg} <<-EOF
-		GCC_PATH="${EPREFIX}$wrapperdir"
-		LDPATH="${EPREFIX}$wrapperdir"
-		EOF
-
-	insinto /etc/env.d/gcc
-	doins ./${wrappercfg}
-}
-
-src_install() {
-	if use prefix-stack; then
-		src_install-prefix-stack-ccwrap
-		insinto /etc
-		doins prefix-stack.bash_login
-		insinto /etc/bash
-		newins prefix-stack.bashrc bashrc
-		newenvd prefix-stack.envd.99stack 99stack
-		doenvd 000fallback
-	else
-		dobin prefix-stack-setup
-	fi
-	exeinto /
-	doexe startprefix
-}
-
-pkg_preinst() {
-	use prefix-stack || return 0
-	ebegin "Purging @system package set for prefix stack"
-	# In prefix stack we empty out the @system set defined via make.profile,
-	# as we may be using some normal profile, but that @system set applies
-	# to the base prefix only.
-	# Instead, we only put ourselve into the @system set, and have additional
-	# @system packages in our RDEPEND.
-	my_lsprofile() {
-		(
-			cd -P "${1:-.}" || exit 1
-			[[ -r ./parent ]] &&
-				for p in $(<parent)
-				do
-					my_lsprofile "${p}" || exit 1
-				done
-			pwd -P
-		)
-	}
-	local systemset="/etc/portage/profile/packages"
-	dodir "${systemset%/*}"
-	[[ -s ${EROOT}${systemset} ]] &&
-		grep -v "# maintained by ${PN}" \
-			"${EROOT}${systemset}" \
-			> "${ED}${systemset}"
-	local p
-	for p in $(my_lsprofile "${EPREFIX}"/etc/portage/make.profile)
-	do
-		[[ -s ${p}/${systemset##*/} ]] || continue
-		awk '/^[ \t]*[^-#]/{print "-" $1 " # maintained by '"${PN}-${PVR}"'"}' \
-			< "${p}"/packages || die
-	done | sort -u >> "${ED}${systemset}"
-	[[ ${PIPESTATUS[@]} == "0 0" ]] || die "failed to collect for ${systemset}"
-	echo "*${CATEGORY}/${PN} # maintained by ${PN}-${PVR}" >> "${ED}${systemset}" || die
-	eend $?
-}
-
-return 0
-
-: startprefix <<'EOIN'
-#!@GENTOO_PORTAGE_EBASH@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> -- 2007-03-10
-# Enters the prefix environment by starting a login shell from the
-# prefix.  The SHELL environment variable is elevated in order to make
-# applications that start login shells to work, such as `screen`.
-
-# if you come from a substantially polluted environment (another
-# Prefix), a cleanup as follows resolves most oddities I've ever seen:
-# env -i HOME=$HOME TERM=$TERM USER=$USER $SHELL -l
-# hence this script starts the Prefix shell like this
-
-if [[ ${SHELL#@GENTOO_PORTAGE_EPREFIX@} != ${SHELL} ]]
-then
-	echo "You appear to be in prefix already (SHELL=${SHELL})" > /dev/stderr
-	exit -1
-elif [[ ${SHELL#@GENTOO_PORTAGE_BPREFIX@} != ${SHELL} ]] &&
-	 [[ ${EPREFIX-unset} == '@GENTOO_PORTAGE_EPREFIX@' ]]
-then
-	echo "You appear to be in stacked prefix already (EPREFIX=${EPREFIX})" > /dev/stderr
-	exit -1
-fi
-
-# What is our prefix?
-EPREFIX@=@'@GENTOO_PORTAGE_EPREFIX@'
-BPREFIX@=@'@GENTOO_PORTAGE_BPREFIX@'
-
-# not all systems have the same location for shells, however what it
-# boils down to, is that we need to know what the shell is, and then we
-# can find it in the bin dir of our prefix
-for SHELL in \
-	"${EPREFIX}/bin/${SHELL##*/}" \
-	"${BPREFIX}/bin/${SHELL##*/}" \
-	${SHELL##*/}
-do
-	[[ ${SHELL} == */* && -x ${SHELL} ]] && break
-done
-
-# check if the shell exists
-if [[ ${SHELL} != */* ]]
-then
-	echo "Failed to find the Prefix shell, this is probably" > /dev/stderr
-	echo "because you didn't emerge the shell ${SHELL}" > /dev/stderr
-	exit 1
-fi
-
-# set the prefix shell in the environment
-export SHELL
-
-# give a small notice
-echo "Entering Gentoo Prefix ${EPREFIX}"
-# start the login shell, clean the entire environment but what's needed
-RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
-# PROFILEREAD is necessary on SUSE not to wipe the env on shell start
-[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD"
-# ssh-agent is handy to keep, of if set, inherit it
-[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
-# if we're on some X terminal, makes sense to inherit that too
-[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
-# do it!
-if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then
-	'@GENTOO_PORTAGE_EENV@' -i $RETAIN $SHELL -l
-elif [[ ' bash ' == *" ${SHELL##*/} "* ]] ; then
-	# shell coming from different prefix would load it's own
-	# etc/profile upon -l, so we have to override
-	'@GENTOO_PORTAGE_EENV@' -i ${RETAIN} "${SHELL}" --rcfile "${EPREFIX}"/etc/prefix-stack.bash_login -i
-else
-	echo "Only bash is supported with stacked Prefix (you have ${SHELL##*/}), sorry!" > /dev/stderr
-	exit 1
-fi
-# and leave a message when we exit... the shell might return non-zero
-# without having real problems, so don't send alarming messages about
-# that
-echo "Leaving Gentoo Prefix with exit status $?"
-EOIN
-
-: prefix-stack.bashrc <<'EOIN'
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# In stacked Prefix there is no bash installed, yet
-# etc/bash/bashrc from base Prefix still is useful.
-#
-
-if [[ $- != *i* ]] ; then
-	# Shell is non-interactive, bashrc does not apply
-	return
-fi
-
-if [[ -r @GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc ]] ; then
-	source '@GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc'
-	# only if base Prefix does have an etc/bash/bashrc, we also
-	# run bashrc snippets provided by packages in stacked Prefix
-	for sh in '@GENTOO_PORTAGE_EPREFIX@'/etc/bash/bashrc.d/* ; do
-		[[ -r ${sh} ]] && source "${sh}"
-	done
-	unset sh
-else
-	# etc/profile does expect etc/bash/bashrc to set PS1
-	PS1='\u@\h \w \$ '
-fi
-EOIN
-
-: prefix-stack.bash_login <<'EOIN'
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# In stacked Prefix there is no bash installed, so there is
-# no bash able to load this Prefix' profile as login shell.
-# Instead, you can specify this one as bash rcfile to mimic
-# a bash login shell using this stacked Prefix profile.
-#
-
-if [[ -s '@GENTOO_PORTAGE_EPREFIX@/etc/profile' ]] ; then
-	. '@GENTOO_PORTAGE_EPREFIX@/etc/profile'
-fi
-if [[ -s ~/.bash_profile ]] ; then
-	. ~/.bash_profile
-elif [[ -s ~/.bash_login ]] ; then
-	. ~/.bash_login
-elif [[ -s ~/.profile ]] ; then
-	. ~/.profile
-fi
-EOIN
-
-: prefix-stack.envd.99stack <<'EOIN'
-PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
-PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
-EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
-EOIN
-
-: prefix-stack-setup <<'EOIN'
-#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
-CHILD_EPREFIX=
-CHILD_PROFILE=
-CHILD_CHOST=
-
-#
-# get ourselfs the functions.sh script for ebegin/eend/etc.
-#
-for f in \
-	/lib/gentoo/functions.sh \
-	/etc/init.d/functions.sh \
-	/sbin/functions.sh \
-; do
-	if [[ -r ${PARENT_EPREFIX}${f} ]] ; then
-		. "${PARENT_EPREFIX}${f}"
-		f=found
-		break
-	fi
-done
-
-if [[ ${f} != found ]] ; then
-	echo "Cannot find Gentoo functions, aborting." >&2
-	exit 1
-fi
-
-for arg in "$@"; do
-	case "${arg}" in
-	--eprefix=*) CHILD_EPREFIX="${arg#--eprefix=}" ;;
-	--profile=*) CHILD_PROFILE="${arg#--profile=}" ;;
-	--chost=*)   CHILD_CHOST="${arg#--chost=}" ;;
-
-	--help)
-		einfo "$0 usage:"
-		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create stacked to the prefix"
-		einfo "                         where this script is installed (${PARENT_EPREFIX})"
-		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
-		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
-		einfo "  --chost=[CHOST]        The CHOST to use for the new EPREFIX, required if"
-		einfo "                         the profile does not set CHOST, or to override."
-		exit 0
-		;;
-	esac
-done
-
-#
-# sanity check of given values
-#
-
-test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
-test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
-test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
-test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
-
-if [[ -z ${CHILD_CHOST} ]]
-then
-	my_lsprofile() {
-		(
-			cd -P "${1:-.}" || exit 1
-			[[ -r ./parent ]] &&
-				for p in $(<parent)
-				do
-					my_lsprofile "${p}" || exit 1
-				done
-			pwd -P
-		)
-	}
-
-	for profile in $(my_lsprofile "${CHILD_PROFILE}") missing
-	do
-		if [[ ${profile} == missing ]]
-		then
-		  eerror "profile does not set CHOST, need --chost argument"
-		  exit 1
-		fi
-		[[ -s "${profile}/make.defaults" ]] || continue
-		grep -q '^[ 	]*CHOST@=@' "${profile}/make.defaults" && break
-	done
-fi
-
-einfo "creating stacked prefix ${CHILD_EPREFIX}"
-
-#
-# functions needed below.
-#
-eend_exit() {
-	eend $1
-	[[ $1 != 0 ]] && exit 1
-}
-
-#
-# create the directories required to bootstrap the least.
-#
-ebegin "creating directory structure"
-(
-	set -e
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/env
-	mkdir -p "${CHILD_EPREFIX}"/etc/portage/package.env
-	ln -s "${PARENT_EPREFIX}"/etc/portage/repos.conf "${CHILD_EPREFIX}"/etc/portage/repos.conf
-)
-eend_exit $?
-
-#
-# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
-#
-ebegin "creating make.conf"
-(
-	set -e
-	echo "#"
-	echo "# The following values where taken from the parent prefix's"
-	echo "# environment. Feel free to adopt them as you like."
-	echo "#"
-	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
-	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
-	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
-	niceness=$(portageq envvar PORTAGE_NICENESS || true)
-	[[ -n ${niceness} ]] &&
-		echo "PORTAGE_NICENESS=\"${niceness}\""
-	echo
-	echo "# Mirrors from parent prefix."
-	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
-	echo
-	echo "# Below comes the prefix-stack setup. Only change things"
-	echo "# if you know exactly what you are doing!"
-	echo "EPREFIX=\"${CHILD_EPREFIX}\""
-	echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\""
-	echo "BROOT=\"${PARENT_EPREFIX}\""
-	if [[ -n ${CHILD_CHOST} ]] ; then
-		echo "CHOST=\"${CHILD_CHOST}\""
-	fi
-) > "${CHILD_EPREFIX}"/etc/portage/make.conf
-eend_exit $?
-
-ebegin "creating use.mask/prefix-stack"
-printf -- '-%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.mask/prefix-stack
-eend_exit $?
-
-ebegin "creating use.force/prefix-stack"
-printf -- '%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.force/prefix-stack
-eend_exit $?
-
-ebegin "creating env/host-cc.conf"
-cat > "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf <<-EOM
-	CC=${PARENT_CHOST}-gcc
-	CXX=${PARENT_CHOST}-g++
-	EOM
-eend_exit $?
-
-ebegin "creating package.env/prefix-stack"
-cat > "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack <<-'EOM'
-	# merge with the parent's chost. this forces the use of the parent
-	# compiler, which generally would be illegal - this is an exception.
-	# This is required for example on winnt, because the wrapper has to
-	# be able to use/resolve symlinks, etc. native winnt binaries miss
-	# that ability, but cygwin binaries don't.
-	sys-devel/gcc-config host-cc.conf
-	sys-apps/gentoo-functions host-cc.conf
-	EOM
-eend_exit $?
-
-#
-# create the make.profile symlinks.
-#
-ebegin "creating make.profile"
-(
-	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
-)
-eend_exit $?
-
-#
-# adjust permissions of generated files.
-#
-ebegin "adjusting permissions"
-(
-	set -e
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf
-	chmod 644 "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack
-)
-eend_exit $?
-
-#
-# now merge some basics.
-#
-ebegin "installing required basic packages"
-(
-	set -e
-	export PORTAGE_CONFIGROOT@=@"${CHILD_EPREFIX}"
-	export EPREFIX@=@"${CHILD_EPREFIX}"
-	export PORTAGE_OVERRIDE_EPREFIX@=@"${PARENT_EPREFIX}"
-
-	# let baselayout create the directories
-	USE@=@"${USE} build" \
-	emerge --verbose --nodeps --oneshot \
-		'>=baselayout-prefix-2.6'
-
-	# In prefix-stack, app-portage/prefix-toolkit does
-	# install/update an etc/portage/profile/packages file,
-	# removing all @system packages from current make.profile,
-	# and adding itself to @system set instead.
-	emerge --verbose --nodeps --oneshot \
-		app-portage/prefix-toolkit
-
-	# In prefix-stack, prefix-toolkit does have an RDEPEND on them,
-	# to hold them in the @system set.
-	emerge --verbose --nodeps --oneshot \
-		sys-apps/gentoo-functions \
-		app-portage/elt-patches \
-		sys-devel/gnuconfig \
-		sys-devel/gcc-config
-
-	# select the stack wrapper profile from gcc-config
-	env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" \
-		"$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
-)
-eend_exit $?
-
-#
-# wow, all ok :)
-#
-ewarn
-ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
-ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
-ewarn
-EOIN
-
-: prefix-stack-ccwrap <<'EOIN'
-#!@GENTOO_PORTAGE_BPREFIX@/bin/bash
-
-if [ -r /cygdrive/. ]; then
-	winpath2unix() { cygpath -u "$1"; }
-	unixpath2win() { cygpath -w "$1"; }
-fi
-
-myself=${0##*/} # basename $0
-link_dirs=()
-opts=()
-chost="@GENTOO_PORTAGE_CHOST@"
-prefix="@GENTOO_PORTAGE_EPREFIX@"
-absprefix=${prefix}
-if [[ ${chost} == *"-winnt"* ]]; then
-	# we may get called from windows binary, like pkgdata in dev-libs/icu
-	# in this case, PATH elements get the "/dev/fs/C/WINDOWS/SUA" prefix
-	absprefix=$(winpath2unix "$(unixpath2win "${absprefix}")")
-fi
-[[ ${myself} == *windres* ]] && mode=compile || mode=link
-orig_args=("$@")
-
-for opt in "$@"
-do
-	case "$opt" in
-	-L)
-		link_dirs=("${link_dirs[@]}" "-L$1")
-		shift
-		;;
-	-L*)
-		link_dirs=("${link_dirs[@]}" "${opt}")
-		;;
-	*)
-		case "${opt}" in
-		-v)
-			# -v done right: only use mode version if -v is the _only_
-			# argument on the command line.
-			[[ ${#orig_args[@]} -gt 1 ]] || mode=version
-			;;
-		--version)	mode=version ;;
-		-c|-E|-S)	mode=compile ;;
-		-print-search-dirs) mode=dirs ;;
-		esac
-		opts=("${opts[@]}" "${opt}")
-		;;
-	esac
-done
-
-# remove any path to current prefix, need base prefix only
-new_path=
-save_ifs=$IFS
-IFS=':'
-for p in $PATH
-do
-	IFS=$save_ifs
-	[[ ${p#${absprefix}} != "${p}" ]] && continue
-	if [[ -z "${new_path}" ]]; then
-		new_path="${p}"
-	else
-		new_path="${new_path}:${p}"
-	fi
-done
-IFS=$save_ifs
-
-PATH=${new_path}
-
-pfx_comp=("-I${prefix}/include" "-I${prefix}/usr/include")
-pfx_link=("-L${prefix}/usr/lib" "-L${prefix}/lib")
-# binutils-config's ldwrapper understands '-R' for aix and hpux too.
-pfx_link_r=("-Wl,-R,${prefix}/lib" "-Wl,-R,${prefix}/usr/lib")
-case "${chost}" in
-*-winnt*)
-	# parity (winnt) understands -rpath only ...
-	pfx_link_r=("-Wl,-rpath,${prefix}/lib" "-Wl,-rpath,${prefix}/usr/lib")
-	;;
-*-linux*)
-	# With gcc, -isystem would avoid warning messages in installed headers,
-	# but that breaks with AIX host headers.
-	pfx_comp=("-isystem" "${prefix}/include" "-isystem" "${prefix}/usr/include")
-	;;
-esac
-
-# ensure we run the right chost program in base prefix
-[[ ${myself} == *-*-*-* ]] || myself=${chost}-${myself#${chost}-}
-
-case "$mode" in
-link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" ;;
-compile) exec "${myself}" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;;
-version) exec "${myself}" "${orig_args[@]}" ;;
-dirs)
-	"${myself}" "${orig_args[@]}" | while read line; do
-		if [[ "${line}" == "libraries: ="* ]]; then
-			echo "libraries: =${prefix}/usr/lib:${prefix}/lib:${line#"libraries: ="}"
-		else
-			echo "${line}"
-		fi
-	done
-	;;
-*)			echo "cannot infer ${myself}'s mode from comamnd line arguments"; exit 1 ;;
-esac
-EOIN
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-5.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-5.ebuild
new file mode 100644
index 000000000000..62f94528cc11
--- /dev/null
+++ b/app-portage/prefix-toolkit/prefix-toolkit-5.ebuild
@@ -0,0 +1,665 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Utilities for users of Gentoo Prefix"
+HOMEPAGE="https://prefix.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-3"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] ||
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+DEPEND="
+	!app-portage/prefix-chain-setup
+	!sys-apps/prefix-chain-utils
+"
+BDEPEND="${DEPEND}
+	>sys-apps/portage-2.3.62
+"
+# In prefix-stack, these dependencies actually are the @system set,
+# as we rely on the base prefix anyway for package management,
+# which should have a proper @system set.
+# See als: pkg_preinst
+RDEPEND="${DEPEND}
+	prefix-stack? (
+		>=sys-apps/baselayout-prefix-2.6
+		sys-apps/gentoo-functions
+		app-portage/elt-patches
+		sys-devel/gnuconfig
+		sys-devel/gcc-config
+	)
+"
+
+S="${WORKDIR}"
+
+my_unpack() {
+	local infile=$1
+	local outfile=${2:-${infile}}
+	ebegin "extracting ${outfile}"
+	sed -ne "/^: ${infile} /,/EOIN/{/EOIN/d;p}" "${EBUILD}" \
+		> "${outfile}" || die "Failed to unpack ${outfile}"
+	eend $?
+}
+
+src_unpack() {
+	if use prefix-stack ; then
+		my_unpack prefix-stack.bash_login
+		my_unpack prefix-stack.bashrc
+		my_unpack prefix-stack.envd.99stack
+		my_unpack prefix-stack-ccwrap
+		local editor pager
+		for editor in "${EDITOR}" {"${EPREFIX}","${BROOT}"}/bin/nano
+		do
+			[[ -x ${editor} ]] || continue
+		done
+		for pager in "${PAGER}" {"${EPREFIX}","${BROOT}"}/usr/bin/less
+		do
+			[[ -x ${pager} ]] || continue
+		done
+		printf '%s\n' "EDITOR=\"${editor}\"" "PAGER=\"${pager}\"" > 000fallback
+	else
+		my_unpack prefix-stack-setup
+	fi
+	my_unpack startprefix
+}
+
+my_prefixify() {
+	local ebash eenv
+	if use prefix-stack ; then
+		ebash="${BROOT}/bin/bash"
+		eenv="${BROOT}/usr/bin/env"
+	else
+		ebash="${EPREFIX}/bin/bash"
+		eenv="${EPREFIX}/usr/bin/env"
+	fi
+
+	# the @=@ prevents repoman from believing we set readonly vars
+	sed -e "s,@GENTOO_PORTAGE_BPREFIX@,${BROOT},g" \
+		-e "s,@GENTOO_PORTAGE_EPREFIX@,${EPREFIX},g" \
+		-e "s,@GENTOO_PORTAGE_CHOST@,${CHOST},g" \
+		-e "s,@GENTOO_PORTAGE_EBASH@,${ebash},g" \
+		-e "s,@GENTOO_PORTAGE_EENV@,${eenv},g" \
+		-e "s,@=@,=,g" \
+		-i "$@" || die
+}
+
+src_configure() {
+	# do not eprefixify during unpack, to allow userpatches to apply
+	my_prefixify *
+}
+
+src_install-prefix-stack-ccwrap() {
+	# install toolchain wrapper.
+	local wrapperdir=/usr/${CHOST}/gcc-bin/${CHOST}-${PN}/${PV}
+	local wrappercfg=${CHOST}-${P}
+
+	exeinto $wrapperdir
+	doexe prefix-stack-ccwrap
+
+	local cc
+	for cc in \
+		gcc \
+		g++ \
+		cpp \
+		c++ \
+		windres \
+	; do
+		dosym prefix-stack-ccwrap $wrapperdir/${CHOST}-${cc}
+		dosym ${CHOST}-${cc} $wrapperdir/${cc}
+	done
+
+	# LDPATH is required to keep gcc-config happy :(
+	cat > ./${wrappercfg} <<-EOF
+		GCC_PATH="${EPREFIX}$wrapperdir"
+		LDPATH="${EPREFIX}$wrapperdir"
+		EOF
+
+	insinto /etc/env.d/gcc
+	doins ./${wrappercfg}
+}
+
+src_install() {
+	if use prefix-stack; then
+		src_install-prefix-stack-ccwrap
+		insinto /etc
+		doins prefix-stack.bash_login
+		insinto /etc/bash
+		newins prefix-stack.bashrc bashrc
+		newenvd prefix-stack.envd.99stack 99stack
+		doenvd 000fallback
+	else
+		dobin prefix-stack-setup
+	fi
+	exeinto /
+	doexe startprefix
+}
+
+pkg_preinst() {
+	use prefix-stack || return 0
+	ebegin "Purging @system package set for prefix stack"
+	# In prefix stack we empty out the @system set defined via make.profile,
+	# as we may be using some normal profile, but that @system set applies
+	# to the base prefix only.
+	# Instead, we only put ourselve into the @system set, and have additional
+	# @system packages in our RDEPEND.
+	my_lsprofile() {
+		(
+			cd -P "${1:-.}" || exit 1
+			[[ -r ./parent ]] &&
+				for p in $(<parent)
+				do
+					my_lsprofile "${p}" || exit 1
+				done
+			pwd -P
+		)
+	}
+	local systemset="/etc/portage/profile/packages"
+	dodir "${systemset%/*}"
+	[[ -s ${EROOT}${systemset} ]] &&
+		grep -v "# maintained by ${PN}" \
+			"${EROOT}${systemset}" \
+			> "${ED}${systemset}"
+	local p
+	for p in $(my_lsprofile "${EPREFIX}"/etc/portage/make.profile)
+	do
+		[[ -s ${p}/${systemset##*/} ]] || continue
+		awk '/^[ \t]*[^-#]/{print "-" $1 " # maintained by '"${PN}-${PVR}"'"}' \
+			< "${p}"/packages || die
+	done | sort -u >> "${ED}${systemset}"
+	[[ ${PIPESTATUS[@]} == "0 0" ]] || die "failed to collect for ${systemset}"
+	echo "*${CATEGORY}/${PN} # maintained by ${PN}-${PVR}" >> "${ED}${systemset}" || die
+	eend $?
+}
+
+return 0
+
+: startprefix <<'EOIN'
+#!@GENTOO_PORTAGE_EBASH@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> -- 2007-03-10
+# Enters the prefix environment by starting a login shell from the
+# prefix.  The SHELL environment variable is elevated in order to make
+# applications that start login shells to work, such as `screen`.
+
+# if you come from a substantially polluted environment (another
+# Prefix), a cleanup as follows resolves most oddities I've ever seen:
+# env -i HOME=$HOME TERM=$TERM USER=$USER $SHELL -l
+# hence this script starts the Prefix shell like this
+
+if [[ ${SHELL#@GENTOO_PORTAGE_EPREFIX@} != ${SHELL} ]]
+then
+	echo "You appear to be in prefix already (SHELL=${SHELL})" > /dev/stderr
+	exit -1
+elif [[ ${SHELL#@GENTOO_PORTAGE_BPREFIX@} != ${SHELL} ]] &&
+	 [[ ${EPREFIX-unset} == '@GENTOO_PORTAGE_EPREFIX@' ]]
+then
+	echo "You appear to be in stacked prefix already (EPREFIX=${EPREFIX})" > /dev/stderr
+	exit -1
+fi
+
+# What is our prefix?
+EPREFIX@=@'@GENTOO_PORTAGE_EPREFIX@'
+BPREFIX@=@'@GENTOO_PORTAGE_BPREFIX@'
+
+# not all systems have the same location for shells, however what it
+# boils down to, is that we need to know what the shell is, and then we
+# can find it in the bin dir of our prefix
+for SHELL in \
+	"${EPREFIX}/bin/${SHELL##*/}" \
+	"${BPREFIX}/bin/${SHELL##*/}" \
+	${SHELL##*/}
+do
+	[[ ${SHELL} == */* && -x ${SHELL} ]] && break
+done
+
+# check if the shell exists
+if [[ ${SHELL} != */* ]]
+then
+	echo "Failed to find the Prefix shell, this is probably" > /dev/stderr
+	echo "because you didn't emerge the shell ${SHELL}" > /dev/stderr
+	exit 1
+fi
+
+# set the prefix shell in the environment
+export SHELL
+
+# give a small notice
+echo "Entering Gentoo Prefix ${EPREFIX}"
+# start the login shell, clean the entire environment but what's needed
+RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
+# PROFILEREAD is necessary on SUSE not to wipe the env on shell start
+[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD"
+# ssh-agent is handy to keep, of if set, inherit it
+[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
+# if we're on some X terminal, makes sense to inherit that too
+[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
+if [[ -d /proc/registry ]]; then # we're on Cygwin
+	# crucial to Windows but cannot be restored, see
+	# https://cygwin.com/ml/cygwin/2019-08/msg00072.html
+	[[ -n ${SYSTEMDRIVE} ]] && RETAIN+=" SYSTEMDRIVE=$SYSTEMDRIVE"
+	# COMSPEC is to native Windows what SHELL is to *nix
+	[[ -n ${COMSPEC} ]] && RETAIN+=" COMSPEC=$COMSPEC"
+	# some Windows programs (e.g. devenv.exe) need TMP or TEMP
+	[[ -n ${TEMP} ]] && RETAIN+=" TEMP=$TEMP"
+fi
+# do it!
+if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then
+	'@GENTOO_PORTAGE_EENV@' -i $RETAIN $SHELL -l
+elif [[ ' bash ' == *" ${SHELL##*/} "* ]] ; then
+	# shell coming from different prefix would load it's own
+	# etc/profile upon -l, so we have to override
+	'@GENTOO_PORTAGE_EENV@' -i ${RETAIN} "${SHELL}" --rcfile "${EPREFIX}"/etc/prefix-stack.bash_login -i
+else
+	echo "Only bash is supported with stacked Prefix (you have ${SHELL##*/}), sorry!" > /dev/stderr
+	exit 1
+fi
+# and leave a message when we exit... the shell might return non-zero
+# without having real problems, so don't send alarming messages about
+# that
+echo "Leaving Gentoo Prefix with exit status $?"
+EOIN
+
+: prefix-stack.bashrc <<'EOIN'
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# In stacked Prefix there is no bash installed, yet
+# etc/bash/bashrc from base Prefix still is useful.
+#
+
+if [[ $- != *i* ]] ; then
+	# Shell is non-interactive, bashrc does not apply
+	return
+fi
+
+if [[ -r @GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc ]] ; then
+	source '@GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc'
+	# only if base Prefix does have an etc/bash/bashrc, we also
+	# run bashrc snippets provided by packages in stacked Prefix
+	for sh in '@GENTOO_PORTAGE_EPREFIX@'/etc/bash/bashrc.d/* ; do
+		[[ -r ${sh} ]] && source "${sh}"
+	done
+	unset sh
+else
+	# etc/profile does expect etc/bash/bashrc to set PS1
+	PS1='\u@\h \w \$ '
+fi
+EOIN
+
+: prefix-stack.bash_login <<'EOIN'
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# In stacked Prefix there is no bash installed, so there is
+# no bash able to load this Prefix' profile as login shell.
+# Instead, you can specify this one as bash rcfile to mimic
+# a bash login shell using this stacked Prefix profile.
+#
+
+if [[ -s '@GENTOO_PORTAGE_EPREFIX@/etc/profile' ]] ; then
+	. '@GENTOO_PORTAGE_EPREFIX@/etc/profile'
+fi
+if [[ -s ~/.bash_profile ]] ; then
+	. ~/.bash_profile
+elif [[ -s ~/.bash_login ]] ; then
+	. ~/.bash_login
+elif [[ -s ~/.profile ]] ; then
+	. ~/.profile
+fi
+EOIN
+
+: prefix-stack.envd.99stack <<'EOIN'
+PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
+PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
+EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
+EOIN
+
+: prefix-stack-setup <<'EOIN'
+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
+PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
+CHILD_EPREFIX=
+CHILD_PROFILE=
+CHILD_CHOST=
+
+#
+# get ourselfs the functions.sh script for ebegin/eend/etc.
+#
+for f in \
+	/lib/gentoo/functions.sh \
+	/etc/init.d/functions.sh \
+	/sbin/functions.sh \
+; do
+	if [[ -r ${PARENT_EPREFIX}${f} ]] ; then
+		. "${PARENT_EPREFIX}${f}"
+		f=found
+		break
+	fi
+done
+
+if [[ ${f} != found ]] ; then
+	echo "Cannot find Gentoo functions, aborting." >&2
+	exit 1
+fi
+
+for arg in "$@"; do
+	case "${arg}" in
+	--eprefix=*) CHILD_EPREFIX="${arg#--eprefix=}" ;;
+	--profile=*) CHILD_PROFILE="${arg#--profile=}" ;;
+	--chost=*)   CHILD_CHOST="${arg#--chost=}" ;;
+
+	--help)
+		einfo "$0 usage:"
+		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create stacked to the prefix"
+		einfo "                         where this script is installed (${PARENT_EPREFIX})"
+		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
+		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
+		einfo "  --chost=[CHOST]        The CHOST to use for the new EPREFIX, required if"
+		einfo "                         the profile does not set CHOST, or to override."
+		exit 0
+		;;
+	esac
+done
+
+#
+# sanity check of given values
+#
+
+test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
+test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
+test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
+test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
+
+if [[ -z ${CHILD_CHOST} ]]
+then
+	my_lsprofile() {
+		(
+			cd -P "${1:-.}" || exit 1
+			[[ -r ./parent ]] &&
+				for p in $(<parent)
+				do
+					my_lsprofile "${p}" || exit 1
+				done
+			pwd -P
+		)
+	}
+
+	for profile in $(my_lsprofile "${CHILD_PROFILE}") missing
+	do
+		if [[ ${profile} == missing ]]
+		then
+		  eerror "profile does not set CHOST, need --chost argument"
+		  exit 1
+		fi
+		[[ -s "${profile}/make.defaults" ]] || continue
+		grep -q '^[ 	]*CHOST@=@' "${profile}/make.defaults" && break
+	done
+fi
+
+einfo "creating stacked prefix ${CHILD_EPREFIX}"
+
+#
+# functions needed below.
+#
+eend_exit() {
+	eend $1
+	[[ $1 != 0 ]] && exit 1
+}
+
+#
+# create the directories required to bootstrap the least.
+#
+ebegin "creating directory structure"
+(
+	set -e
+	mkdir -p "${CHILD_EPREFIX}"/var/tmp/portage
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/env
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/package.env
+	ln -s "${PARENT_EPREFIX}"/etc/portage/repos.conf "${CHILD_EPREFIX}"/etc/portage/repos.conf
+)
+eend_exit $?
+
+#
+# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
+#
+ebegin "creating make.conf"
+(
+	set -e
+	echo "#"
+	echo "# These are sane default compiler flags, feel free to adopt them as you like."
+	echo "# Extending the flags is done to respect flags probably set by some profile."
+	echo "#"
+	echo "CFLAGS=\"\${CFLAGS} -O2 -pipe\""
+	echo "CXXFLAGS=\"${CXXFLAGS} -O2 -pipe\""
+	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
+	niceness=$(portageq envvar PORTAGE_NICENESS || true)
+	[[ -n ${niceness} ]] &&
+		echo "PORTAGE_NICENESS=\"${niceness}\""
+	echo
+	echo "# Mirrors from parent prefix."
+	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
+	echo
+	echo "# Below comes the prefix-stack setup. Only change things"
+	echo "# if you know exactly what you are doing!"
+	echo "EPREFIX=\"${CHILD_EPREFIX}\""
+	echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\""
+	echo "BROOT=\"${PARENT_EPREFIX}\""
+	echo "PORTAGE_TMPDIR=\"\${EPREFIX}/var/tmp\""
+	# Since EAPI 7 there is BDEPEND, which is DEPEND in EAPI up to 6.
+	# We do not want to pull DEPEND from EAPI <= 6, but RDEPEND only.
+	echo "EMERGE_DEFAULT_OPTS=\"--root-deps=rdeps\""
+	if [[ -n ${CHILD_CHOST} ]] ; then
+		echo "CHOST=\"${CHILD_CHOST}\""
+	fi
+) > "${CHILD_EPREFIX}"/etc/portage/make.conf
+eend_exit $?
+
+ebegin "creating use.mask/prefix-stack"
+printf -- '-%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.mask/prefix-stack
+eend_exit $?
+
+ebegin "creating use.force/prefix-stack"
+printf -- '%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.force/prefix-stack
+eend_exit $?
+
+ebegin "creating env/host-cc.conf"
+cat > "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf <<-EOM
+	CC=${PARENT_CHOST}-gcc
+	CXX=${PARENT_CHOST}-g++
+	# Inherited compiler flags from parent prefix,
+	# as the child prefix may have a different compiler.
+	CFLAGS="$(portageq envvar CFLAGS)"
+	CXXFLAGS="$(portageq envvar CXXFLAGS)"
+	EOM
+eend_exit $?
+
+ebegin "creating package.env/prefix-stack"
+cat > "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack <<-'EOM'
+	# merge with the parent's chost. this forces the use of the parent
+	# compiler, which generally would be illegal - this is an exception.
+	# This is required for example on winnt, because the wrapper has to
+	# be able to use/resolve symlinks, etc. native winnt binaries miss
+	# that ability, but cygwin binaries don't.
+	sys-devel/gcc-config host-cc.conf
+	sys-apps/gentoo-functions host-cc.conf
+	EOM
+eend_exit $?
+
+#
+# create the make.profile symlinks.
+#
+ebegin "creating make.profile"
+(
+	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
+)
+eend_exit $?
+
+#
+# adjust permissions of generated files.
+#
+ebegin "adjusting permissions"
+(
+	set -e
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack
+)
+eend_exit $?
+
+#
+# now merge some basics.
+#
+ebegin "installing required basic packages"
+(
+	set -e
+	export PORTAGE_CONFIGROOT@=@"${CHILD_EPREFIX}"
+	export EPREFIX@=@"${CHILD_EPREFIX}"
+	export PORTAGE_OVERRIDE_EPREFIX@=@"${PARENT_EPREFIX}"
+
+	# let baselayout create the directories
+	USE@=@"${USE} build" \
+	emerge --verbose --nodeps --oneshot \
+		'>=baselayout-prefix-2.6'
+
+	# In prefix-stack, app-portage/prefix-toolkit does
+	# install/update an etc/portage/profile/packages file,
+	# removing all @system packages from current make.profile,
+	# and adding itself to @system set instead.
+	emerge --verbose --nodeps --oneshot \
+		app-portage/prefix-toolkit
+
+	# In prefix-stack, prefix-toolkit does have an RDEPEND on them,
+	# to hold them in the @system set.
+	emerge --verbose --nodeps --oneshot \
+		sys-apps/gentoo-functions \
+		app-portage/elt-patches \
+		sys-devel/gnuconfig \
+		sys-devel/gcc-config
+
+	# select the stack wrapper profile from gcc-config
+	env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" \
+		"$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
+)
+eend_exit $?
+
+#
+# wow, all ok :)
+#
+ewarn
+ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
+ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
+ewarn
+EOIN
+
+: prefix-stack-ccwrap <<'EOIN'
+#!@GENTOO_PORTAGE_BPREFIX@/bin/bash
+
+if [ -r /cygdrive/. ]; then
+	winpath2unix() { cygpath -u "$1"; }
+	unixpath2win() { cygpath -w "$1"; }
+fi
+
+myself=${0##*/} # basename $0
+link_dirs=()
+opts=()
+chost="@GENTOO_PORTAGE_CHOST@"
+prefix="@GENTOO_PORTAGE_EPREFIX@"
+absprefix=${prefix}
+if [[ ${chost} == *"-winnt"* ]]; then
+	# we may get called from windows binary, like pkgdata in dev-libs/icu
+	# in this case, PATH elements get the "/dev/fs/C/WINDOWS/SUA" prefix
+	absprefix=$(winpath2unix "$(unixpath2win "${absprefix}")")
+fi
+[[ ${myself} == *windres* ]] && mode=compile || mode=link
+orig_args=("$@")
+
+for opt in "$@"
+do
+	case "$opt" in
+	-L)
+		link_dirs=("${link_dirs[@]}" "-L$1")
+		shift
+		;;
+	-L*)
+		link_dirs=("${link_dirs[@]}" "${opt}")
+		;;
+	*)
+		case "${opt}" in
+		-v)
+			# -v done right: only use mode version if -v is the _only_
+			# argument on the command line.
+			[[ ${#orig_args[@]} -gt 1 ]] || mode=version
+			;;
+		--version)	mode=version ;;
+		-c|-E|-S)	mode=compile ;;
+		-print-search-dirs) mode=dirs ;;
+		esac
+		opts=("${opts[@]}" "${opt}")
+		;;
+	esac
+done
+
+# remove any path to current prefix, need base prefix only
+new_path=
+save_ifs=$IFS
+IFS=':'
+for p in $PATH
+do
+	IFS=$save_ifs
+	[[ ${p#${absprefix}} != "${p}" ]] && continue
+	if [[ -z "${new_path}" ]]; then
+		new_path="${p}"
+	else
+		new_path="${new_path}:${p}"
+	fi
+done
+IFS=$save_ifs
+
+PATH=${new_path}
+
+pfx_comp=("-I${prefix}/include" "-I${prefix}/usr/include")
+pfx_link=("-L${prefix}/usr/lib" "-L${prefix}/lib")
+# binutils-config's ldwrapper understands '-R' for aix and hpux too.
+pfx_link_r=("-Wl,-R,${prefix}/lib" "-Wl,-R,${prefix}/usr/lib")
+case "${chost}" in
+*-winnt*)
+	# parity (winnt) understands -rpath only ...
+	pfx_link_r=("-Wl,-rpath,${prefix}/lib" "-Wl,-rpath,${prefix}/usr/lib")
+	;;
+*-linux*)
+	# With gcc, -isystem would avoid warning messages in installed headers,
+	# but that breaks with AIX host headers.
+	pfx_comp=("-isystem" "${prefix}/include" "-isystem" "${prefix}/usr/include")
+	;;
+esac
+
+# ensure we run the right chost program in base prefix
+[[ ${myself} == *-*-*-* ]] || myself=${chost}-${myself#${chost}-}
+
+case "$mode" in
+link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" ;;
+compile) exec "${myself}" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;;
+version) exec "${myself}" "${orig_args[@]}" ;;
+dirs)
+	"${myself}" "${orig_args[@]}" | while read line; do
+		if [[ "${line}" == "libraries: ="* ]]; then
+			echo "libraries: =${prefix}/usr/lib:${prefix}/lib:${line#"libraries: ="}"
+		else
+			echo "${line}"
+		fi
+	done
+	;;
+*)			echo "cannot infer ${myself}'s mode from comamnd line arguments"; exit 1 ;;
+esac
+EOIN
diff --git a/app-portage/splat/Manifest b/app-portage/splat/Manifest
index e2de02a25896..5ac432309a63 100644
--- a/app-portage/splat/Manifest
+++ b/app-portage/splat/Manifest
@@ -1,4 +1,4 @@
 AUX splat-0.08-prefix.patch 853 BLAKE2B aee44a919b6ae692d354d65b7ee622d78e0ed73a6d4ebfe9858b45ad6500a5c7e8d3d52a5953f74d395e8bd30da3cecabfec570f632fe79abe5e16dac7441528 SHA512 946764f7eb2eea8155806b842f6d5fd979bdf7e2a955c62d10cee0e652df51f70c0a0e7d9d4069cae3824c87bf6756edb0f0ca94e120a0d43bb6787705d62cf2
 DIST splat-0.08.tar.bz2 12180 BLAKE2B 9276bb0b2b8436b8becb6b502cf9b9d19f9d0a88928535939d043f88121ce3afb208de72971546f7ee8eb1ed44aff6ea4aa8d758638eec82dc7991c414542441 SHA512 18be949f601cd7ba61babc667a26df9bc5ba7ece33c9b680be7c3541418ea65f3ecf1ae402a70fa3499b79ca2b000c36a58e202d06456cbb7745bec749b1374f
-EBUILD splat-0.08-r1.ebuild 592 BLAKE2B b3a88e282f2497c8a2b69532ae3286df4f8b054128a333a98df4e8f0ab7faa733beaa971f7a8463adc0f63de62a8dbddcc93539fcc0f1163b346382e9b2cae16 SHA512 b4fbea2df6442a020a60dcdeac89cfb6715099d5af958a51b9c66f2fd5c9c0ffa6955d788abfd68584d2eaccbd48eae5380442d809554750465cf8a7ded06e13
+EBUILD splat-0.08-r1.ebuild 591 BLAKE2B edaed450223516049bb5b2fea8d1124e4ab51007a83442c7b726f4727dbff082c6de39659c9f634c81ff80892914f8cd3ae0b1a0772192e0fb01b474e6add6eb SHA512 2c2b6edd58f91b3c9716a03ef765f621ca04d900dba51da049db228da36168b5344bcd32b96fac478dbeb05bbd638d5990ad5ef117b60b32c6ef32ed208a12b7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-portage/splat/splat-0.08-r1.ebuild b/app-portage/splat/splat-0.08-r1.ebuild
index dee572b6fb0b..50fc4acc7f9b 100644
--- a/app-portage/splat/splat-0.08-r1.ebuild
+++ b/app-portage/splat/splat-0.08-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.l8nite.net/projects/splat/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 212ceb6a0558..de64ef0d34be 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index fa0ed586c65e..2b6e9fe31047 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -48,7 +48,6 @@ AUX bash-4.4-set-SHOBJ_STATUS.patch 410 BLAKE2B beddcd4ea00cf6814615896e9842a607
 AUX bash-4.x-deferred-heredocs.patch 1255 BLAKE2B 944c8d5feaba6a6818fe7e20300fdd44d1e162511c1aaf272bdb4d4c382e100908c16a17e4bef622134116e153f96f61fae4d7985e58cb881012058250a2e7f5 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0
 AUX bash-5.0-assignment-preceding-builtin.patch 2790 BLAKE2B fbafa51f96f1fef538e56e55ab3b7067ac4532ab8c0f93d151eeaf6b3a521bc15d7d4ae580489352cc6d9ecc5b43b96494c8b661cf2db3b97265bd1dffad5390 SHA512 9a4ec56b341ed90f348c3ca5ec5c98790eb98a7d78d436131a56bcdde49f09f618398e87c81da7c1dde645690d9c779578f5a2b37dadda75c587332715ab1732
 AUX bash-5.0-history-append.patch 1150 BLAKE2B cc3d4c2303b37b14da2cbb3130db0c2fa65cdc7f7f8d0a4413042a898c4c48afbedcca03c9dbfc525ab191ddc2b4258fb976a28830e03490011f89a1361974b4 SHA512 9c2fb93c67a5da1e97b293db4b26469fd6813e2cfc8ffd776042529878b96312644d8dc247887d6171c89c0853d552e9f7d5d2c0b2f3d05c25c15e17e6706999
-AUX bash-5.0-history-zero-length.patch 1704 BLAKE2B e94683d245b233b95db8e67a2e536081816ce7d095080b17ee3a9ecef1d3a9094e09e8929eeed5aeff89cd268b49a9ca0cf5cba8aab0695914e88be1b724056c SHA512 2f21c7938c585d0126456b1d878e60d7ddef6a6188f49325cf1f15ab2f7f490ce8458504da8a08cf4b00c84a48f9f43079ff6ee334120d29c1529219d9e9074d
 AUX bash-5.0-syslog-history-extern.patch 376 BLAKE2B d883d3c3adbf8f4d19ecc3c2790754a7f6972682d1679b07d5bc599bdbfc019ba8ad4d1271ec550b59447db0a02f1219c9e6057a0b1c1c6c52f7750a746a07bf SHA512 c8dd17bdd8ccbd73061a7cbcb7351195e703a2c5fc6faf288ec3721fc6e526d88dd4b2201f87078a92ca134b98214ccfa935f82f585322f72e9a41fd51842b6a
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
 AUX bashrc 3555 BLAKE2B 31b62f62632feb74cfadb5b831dd862eace55a603c24c07b50826070f599b0571962b315f7f45edb1a0dba91d7a36fa2b852215e9071012b02d0869cb6e5ab6a SHA512 4c2fded17c5346222939fac5b0a13913bdc062b93a4963ad33fe41cf00a04860b5006ec4c762acb6ce7e36e83f368d5c3427b8bc359ba6cba73d6114f219604e
@@ -374,6 +373,8 @@ DIST bash50-006 1275 BLAKE2B ae3738874ada015202a6ff21a50ea9370c6147b4c74a23112e7
 DIST bash50-007 1640 BLAKE2B 1c25af8c098322ad16353dfb32cdba2613659f5042792c725dbde7b2bc276ff09a4af44bf223fd6114dcc9beee98ccbd8081d3010fa1cfeb33bc93fc9c81e4f7 SHA512 467d377836c53d188cda39de550ce1e00b58895a6646c4da3535e74e599978558a92d8e7bf7c59c988159468fbce04f3a0dbf62cbded28472272f1b9811786e8
 DIST bash50-008 2622 BLAKE2B 9919e24840f32a44a9040fd8fa9fb482da1859223e70e75d21d5fdfc03f229ec2e98324707b10fa3aa5b3fee0e8fe5328a684cdd1b3ee5567cd1eb127a4060cb SHA512 110fef44c1a26819ad8926ce00bd5378e99275763db4b0e9cfd125ba1ab7eb9f93abf912efb9841fa2ac59c380995e477683afc8cf6bf00367a9af7ae371e7f4
 DIST bash50-009 1095 BLAKE2B 4a9b2035173dd23f9c8ac5474e573080112d9edcf918816b5dd41e880f212f66c2c80dd41793ec62449c487fec1ad2c57b353a00c0976a782098fa6be76d0f23 SHA512 6b770dbd4ca1175f9b958931b1e725d96626a24fb270bac5414d1679dde05276c87654815e9957d6932c515e8792caf8a5f0e9f2dc108bdd041d8024cf75a833
+DIST bash50-010 6407 BLAKE2B 94792141dedbb8d2c9f9355c94eec56b1fa84459291c61ac31e9ee9a67e80edb95234b67ab59c5f3f039d596275c9b154544439bc730256beaf303e6cbf99c4c SHA512 8ca2cea0264bc0401414207fd8752d4d6eda64be3bb10fdc22529fa2bcedb84e6ab257ba2badc7078ece7f2ae1e2964635926f227eea7aed58166e82871322c2
+DIST bash50-011 1870 BLAKE2B 7307aa709810ea3e9fbc0db6a558cb6a660736677edf56904721599be5c0a6e69b74cc01fb3988f1b06e7f8bcce512a3b5d773b7ebb3a7397a0e4815e84f48ce SHA512 05833d6c85f3795a9c100246335f39155c1b5d190e073bf382269c2bbceb13a2de3f85dbe1dd5d4c7824fcca481febe3bdbb4c555e1f2de86bec05fcf6f5871e
 EBUILD bash-2.05b_p13.ebuild 4613 BLAKE2B c9eae8a532057dab41ca20640f7b85e9f0d8b11eacd84c91b0dc478dcc906cd14976e02b086e2fbc1786661f27ddfce0b8631211461ed77cced2037058e99338 SHA512 f933883acba8f96a5f0390b11650981291c8048211e832a6d3bcc6f41cafe9372380051f804e22958934803c4d8cac83d1bdb604689c313bddeb67446106bff8
 EBUILD bash-3.0_p22.ebuild 4746 BLAKE2B f8840c82f5cfbcf224d1504d3cbadc3eabe015d991a8c41de978562cc0c806b6baed999d085774594deb620dd714fb8d020ccc89d65c3e622745875528b61b57 SHA512 c39a3f5b22a8b462e6b2abf63a13454559b358002e0efb16640fb9caa04cbd9b416640cf25df98b9fdcaaca465bbf083c0687dc08e122c8b965e2761b01b37f6
 EBUILD bash-3.1_p23.ebuild 4427 BLAKE2B baf534ac2cf5a872673b355532b0b9ea8d4836df331f7e50425733815862435ffa44eb9cd95b1dbdd53a29010638b516deb16c8e72a44d5fa135eaea23c34bf5 SHA512 40e91cad8af0682565d4eed7ad2f6184e1624746a8f6ea1ce21bed459e45bcdc8157aa45cc7f89d1ce5c7f1f827707a839bc89a513956b827a50a5e3bc877959
@@ -383,6 +384,6 @@ 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_p23-r1.ebuild 7389 BLAKE2B cffb239c13ab880e815dc9e5884020f2287cdbb3074e39862223fc3d3d56d64af121f4f04528e7e94b06df4fe4d520c805cf6a8f32088860cd7c4ffa2e612e2e SHA512 d9f730ce6353e99953eb95e1417d5e109ccf3612d5148087c2eab7c742d6cba979da5468ec260f3d258a9870a3b6b216dd45c67b2a79fa6fe818d6ba88a113c0
-EBUILD bash-5.0_p7.ebuild 7569 BLAKE2B ec03c5db2337f5bd9279f1717b791f850ac027320f602df801197ac831de3018552bc8e3eb5fb9b2634e9ead091e62c6a65315e4a9e58a3dd2d3ba2ad2e08482 SHA512 828d1606b9227bd0faedfce0f83d5bfa3585ccbb52dba5fffcfbdf5c5cdd27a10d25a53e9b86adb10246a2ba6cbe95aed453b59fb3dcfe01ce56558c1a1332a5
-EBUILD bash-5.0_p9.ebuild 7522 BLAKE2B 8ec9456f0040cd7a869c486e3abed668cf0dcca6a1e5911c9b771b1ac69fb52168be4daa1ba28598329db8bedf25a600ed34d34770c702521486e8a419a2012b SHA512 96b77e64e3e7677947ac76503de702a624017b513fd8351cf8ef2969c203a1d79cc09c0557b6b5e217bbe026112ef79564eed8a80e6df7e72e58a3c99df8af6f
+EBUILD bash-5.0_p11.ebuild 7450 BLAKE2B 8a1d1f0f46fd23c612d3fdc78a491e70c8cc087ea6a8dc098e64162d87e4c17e9374cf22c17ba9c20b4cc5c0bc6db2bf0794a8927d4609b007eb5a14ebcfdc1f SHA512 9f8aee55faa591310def5084b5295daf3a70add729457b3bfc1028b53c59244823d0c4ebc30e698f20a47ce6b0b76c98595b5c9e001601724733e687be167aa7
+EBUILD bash-5.0_p9.ebuild 7510 BLAKE2B 9cfca8fca829418072d0f952255af9167b029bd9a23a37f5398286990ba87509bb7f39d0286c7cc718c2f19e0266a54dd1c927fa67294d04567f9489922bcb45 SHA512 1b8601b167d891a8a684c0562d2cb03c657602a6240045f0378b5e2278b3e4001215ae014719a84f1cfed5d86ea41d375c9c93e4395b4dde0488864c62ccfae6
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-5.0_p11.ebuild b/app-shells/bash/bash-5.0_p11.ebuild
new file mode 100644
index 000000000000..9600b9ed36bb
--- /dev/null
+++ b/app-shells/bash/bash-5.0_p11.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multilib prefix
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+is_release() {
+	case ${PV} in
+	*_alpha*|*_beta*|*_rc*) return 1 ;;
+	*) return 0 ;;
+	esac
+}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="8.0"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+if is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+else
+	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+"
+RDEPEND="
+	${DEPEND}
+	!<sys-apps/portage-2.1.6.7_p1
+"
+# we only need yacc when the .y files get patched (bash42-005)
+#DEPEND+=" virtual/yacc"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Patches from Chet sent to bashbug ml
+	"${FILESDIR}"/${PN}-5.0-history-append.patch
+	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+)
+
+pkg_setup() {
+	if is-flag -malign-double ; then #7332
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/*
+		touch lib/{readline,termcap}/Makefile.in # for config.status
+		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/*
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--with-curses
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading Bug 7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
+
+	if is_release ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+	tc-export AR #444070
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+	keepdir /etc/bash/bashrc.d
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+	if ! use readline ; then
+		sed_args+=( #432338
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			insinto /usr/share/doc/${PF}/${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					doins ${f}
+				fi
+			done
+		done
+	fi
+
+	doman doc/*.1
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+
+	if [[ -L ${EROOT}/bin/sh ]] ; then
+		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
+		# missing even temporarily causes a fatal error with paludis.
+		local target=$(readlink "${EROOT}"/bin/sh)
+		local tmp=$(emktemp "${EROOT}"/bin)
+		ln -sf "${target}" "${tmp}"
+		mv -f "${tmp}" "${EROOT}"/bin/sh
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/bash/bash-5.0_p7.ebuild b/app-shells/bash/bash-5.0_p7.ebuild
deleted file mode 100644
index 1d9060d25619..000000000000
--- a/app-shells/bash/bash-5.0_p7.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs multilib prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-is_release() {
-	case ${PV} in
-	*_alpha*|*_beta*|*_rc*) return 1 ;;
-	*) return 0 ;;
-	esac
-}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-		done
-	fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="8.0"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-if is_release ; then
-	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-else
-	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:0=
-	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
-	nls? ( virtual/libintl )
-"
-RDEPEND="
-	${DEPEND}
-	!<sys-apps/portage-2.1.6.7_p1
-"
-# we only need yacc when the .y files get patched (bash42-005)
-#DEPEND+=" virtual/yacc"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Patches from Chet sent to bashbug ml
-	"${FILESDIR}"/${PN}-5.0-history-zero-length.patch
-	"${FILESDIR}"/${PN}-5.0-history-append.patch
-	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-	"${FILESDIR}"/${PN}-5.0-assignment-preceding-builtin.patch
-)
-
-pkg_setup() {
-	if is-flag -malign-double ; then #7332
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if is_release ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
-		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-	fi
-
-	# Prefixify hardcoded path names. No-op for non-prefix.
-	hprefixify pathnames.h.in
-
-	# Avoid regenerating docs after patches #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
-
-	eapply -p0 "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--disable-profiling
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
-		--with-curses
-		$(use_enable mem-scramble)
-		$(use_enable net net-redirections)
-		$(use_enable readline)
-		$(use_enable readline bang-history)
-		$(use_enable readline history)
-		$(use_with afs)
-		$(use_with mem-scramble bash-malloc)
-	)
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=${READLINE_VER%%_*}
-
-	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses.  For the most part, ncurses
-	# is here because readline needs it.  But bash itself calls
-	# ncurses in one or two small places :(.
-
-	if is_release ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-	tc-export AR #444070
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
-	keepdir /etc/bash/bashrc.d
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-	if ! use readline ; then
-		sed_args+=( #432338
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED%/}"/etc/skel/.bashrc \
-		"${ED%/}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			insinto /usr/share/doc/${PF}/${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					doins ${f}
-				fi
-			done
-		done
-	fi
-
-	doman doc/*.1
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${EROOT}/bin/sh ]] ; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${EROOT}"/bin/sh)
-		local tmp=$(emktemp "${EROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/bash/bash-5.0_p9.ebuild b/app-shells/bash/bash-5.0_p9.ebuild
index 1ead66883b4e..38244a7b24fd 100644
--- a/app-shells/bash/bash-5.0_p9.ebuild
+++ b/app-shells/bash/bash-5.0_p9.ebuild
@@ -51,6 +51,7 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
 	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
 	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
 "
 RDEPEND="
@@ -59,9 +60,6 @@ RDEPEND="
 "
 # we only need yacc when the .y files get patched (bash42-005)
 #DEPEND+=" virtual/yacc"
-BDEPEND="
-	nls? ( virtual/libintl )
-"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-shells/bash/files/bash-5.0-history-zero-length.patch b/app-shells/bash/files/bash-5.0-history-zero-length.patch
deleted file mode 100644
index 981bbfb06259..000000000000
--- a/app-shells/bash/files/bash-5.0-history-zero-length.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-*** ../bash-5.0-patched/bashhist.c	2018-07-05 22:41:14.000000000 -0400
---- bashhist.c	2019-02-20 16:20:04.000000000 -0500
-***************
-*** 561,573 ****
-    if (!history_expansion_inhibited && history_expansion && history_expansion_p (line))
-      {
-        /* If we are expanding the second or later line of a multi-line
-  	 command, decrease history_length so references to history expansions
-  	 in these lines refer to the previous history entry and not the
-  	 current command. */
-        if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
-          history_length--;
-        expanded = history_expand (line, &history_value);
-        if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
-!         history_length++;
-  
-        if (expanded)
---- 561,576 ----
-    if (!history_expansion_inhibited && history_expansion && history_expansion_p (line))
-      {
-+       int old_len;
-+ 
-        /* If we are expanding the second or later line of a multi-line
-  	 command, decrease history_length so references to history expansions
-  	 in these lines refer to the previous history entry and not the
-  	 current command. */
-+       old_len = history_length;
-        if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
-          history_length--;
-        expanded = history_expand (line, &history_value);
-        if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
-!         history_length = old_len;
-  
-        if (expanded)
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index 7e17b8da1e66..c98c88368421 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -1,5 +1,7 @@
+DIST ksh-2020.0.0-alpha1-conftab.patch 118773 BLAKE2B 63466e18a77cb86af80d6f6b4af74e3ac1edbfa735decfcd772633808a4593f6d4b057a99547482d17b22445e68c6d3e2becdf68516f913c73550da718f2abc3 SHA512 b29a70e8e31a259ac5bf556ddcdb5d4742a8dac4d11c06e4b5fc3043012e08b26d136cce8c18e9e8a1fe751044699d2258388d618408b09379732bea89a51765
+DIST ksh-2020.0.0-alpha1-solaris.patch 12317 BLAKE2B 90681bde2f3bad0e097a9367ea5a3f1d4c95f70c6e0c872dad769609f97a6332328e21399a3b9ba20f3840b3387a02370831ae4663457728bd8e41b7471c675b SHA512 5a0b818f44a860210e2a7795335d0edec01c61dd5ad04670bb2ca505690ff1b111dbda12d0d15e8b264113d4e7a5a42a49f64c9aba0cff809c2ce3185921acad
 DIST ksh-2020.0.0-alpha1.tar.gz 2041308 BLAKE2B 542f7936b7042485c0279c9b79f2d61f9580f0ae654abf60a8044254ed5fe228fa14d48dc7dd835201c32a9448182ca4cb702aac894a74bf5f92a4b866d1de70 SHA512 56c805bebe963dee7c27ba0357e26957fd8439f42c26f290ab32488ddde99f4b824e403c5dc097194eaf600e7379a010b1be4bf1e70bee76402e84909b38d981
-DIST ksh-conftab.patch 118773 BLAKE2B 63466e18a77cb86af80d6f6b4af74e3ac1edbfa735decfcd772633808a4593f6d4b057a99547482d17b22445e68c6d3e2becdf68516f913c73550da718f2abc3 SHA512 b29a70e8e31a259ac5bf556ddcdb5d4742a8dac4d11c06e4b5fc3043012e08b26d136cce8c18e9e8a1fe751044699d2258388d618408b09379732bea89a51765
-DIST ksh-solaris.patch 12317 BLAKE2B 90681bde2f3bad0e097a9367ea5a3f1d4c95f70c6e0c872dad769609f97a6332328e21399a3b9ba20f3840b3387a02370831ae4663457728bd8e41b7471c675b SHA512 5a0b818f44a860210e2a7795335d0edec01c61dd5ad04670bb2ca505690ff1b111dbda12d0d15e8b264113d4e7a5a42a49f64c9aba0cff809c2ce3185921acad
-EBUILD ksh-2020.0.0_alpha1.ebuild 881 BLAKE2B dbeac3ac74490d77d17e65dd2a0c612f5cdad924cd6de08a74b52c8f6a24a85aa387c0f7ac362cb41ed93ab838611b5bc6c5dbafd10dd4e6138c0e02c297bced SHA512 2ed9f8f485ed1ccd5fdc891f4a96fe7974c6d7b65d234b125e7f7cb442073975c67cf8217695d909cfad44b238d6d31b7b0067dd1d3eb07fc9ed2b5657bef28b
+DIST ksh-2020.0.0-beta1.tar.gz 2022254 BLAKE2B 650ad8ea1140bdbe1fb9fc3e2ecbceedb4605525523584d9ac8a067511ed385f1c83d284c781b31140760500f3de13d1ad8fc695c9c553a3285d5c286a99c7ea SHA512 6f54cdc3c59b44055cc6b670b38ce1685463c841a093a28c5f974dd153eaec3b8924308b353ed7c29a0ec3917ee87cfe57b6cabaca9841633d3599d9c6731330
+EBUILD ksh-2020.0.0_alpha1.ebuild 897 BLAKE2B 1443fede77e9081c7365dfcc875d551c3a044906cb655eca8fc09b5a71b26158ffc0bf4f30ae0341ad207bf2f70d3f7eb8f9180a7179136d07f321ea210c7ec2 SHA512 7a4bb61849e9f76d10afe299bee4c25594fa0547006bbbf2636d28c19f264631847bbd5159a690d2a40da9179ef3d761d213c2f341b0373428dcf0739942bbd3
+EBUILD ksh-2020.0.0_beta1.ebuild 598 BLAKE2B 05efbc081efdac93e1b8ce188d0e4d3e18ea7755a2e15e12bf79ed57f6496db4da2539bcaadea05c5e9fb6c907413a20d330bdf83f125392775bf99303e31594 SHA512 694bcb9a212ed86d0c50af3b518b6a1ed8bffe8769b56b9fe6652ecb42dfda074854f58d51b1cee3b42983b0dddd030b5a639233978678483861ff55723e458b
 MISC metadata.xml 1371 BLAKE2B ab655b6d15894748f8125dcc0d25fd15aee57623de8b643793b1ca456025ee35db091b500f91b59ca0801778eb65798162b732778c56b80adff4f0402b299638 SHA512 b74fe4a12ce5868839cd32fe9c4f88c216a0703a3f477b005dcf7b47f697d129c695a011a9b37894c39716b5d47ddc9abeb5bd4946ba6b6849707a73b5901810
diff --git a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild
index b8f743ad437e..3c91825f17c5 100644
--- a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild
+++ b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild
@@ -11,8 +11,8 @@ HOMEPAGE="https://github.com/att/ast"
 MY_PV="${PV/_/-}"
 MY_P="${PN}-${MY_PV}"
 SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz
-	https://github.com/att/ast/commit/db7fe39b744d071bb0428c91e2eb84877f068dac.patch -> ksh-solaris.patch
-	https://github.com/att/ast/commit/63e9edcb6084d4b164439065e2d71f3e900ec3c7.patch -> ksh-conftab.patch"
+	https://github.com/att/ast/commit/db7fe39b744d071bb0428c91e2eb84877f068dac.patch -> ${MY_P}-solaris.patch
+	https://github.com/att/ast/commit/63e9edcb6084d4b164439065e2d71f3e900ec3c7.patch -> ${MY_P}-conftab.patch"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="CPL-1.0 EPL-1.0"
@@ -22,8 +22,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 RDEPEND="!app-shells/pdksh"
 
 PATCHES=(
-	"${DISTDIR}"/ksh-solaris.patch
-	"${DISTDIR}"/ksh-conftab.patch
+	"${DISTDIR}"/${MY_P}-solaris.patch
+	"${DISTDIR}"/${MY_P}-conftab.patch
 )
 
 src_install() {
diff --git a/app-shells/ksh/ksh-2020.0.0_beta1.ebuild b/app-shells/ksh/ksh-2020.0.0_beta1.ebuild
new file mode 100644
index 000000000000..4927a8e7fe18
--- /dev/null
+++ b/app-shells/ksh/ksh-2020.0.0_beta1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)"
+HOMEPAGE="https://github.com/att/ast"
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CPL-1.0 EPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="!app-shells/pdksh"
+
+src_install() {
+	meson_src_install
+	dodir /bin
+	mv "${ED}/usr/bin/ksh" "${ED}/bin/ksh" || die
+}
diff --git a/app-shells/localshell/Manifest b/app-shells/localshell/Manifest
index 3958bf8af69d..2229b4eec152 100644
--- a/app-shells/localshell/Manifest
+++ b/app-shells/localshell/Manifest
@@ -1,3 +1,3 @@
 DIST localshell-1.3.4.tar.bz2 113170 BLAKE2B cf135b8ee2a6252f7bb792c71efdf86a9f063791346e05f4545ba88fd9503032d1448241cdc4e9babe1fd7e8a265a170f22e1df2e8d46cc1a4ac14d8533d66d6 SHA512 3a302b7d1b00e6ac8025a2145b3d12b916a60a9bad811d63c78c6eaac1b9a832f8796ab4429c677423287f70d6f6b31283aa2c90d3634ebe4bed52e1e240390d
-EBUILD localshell-1.3.4-r1.ebuild 794 BLAKE2B e8825beb247723c59624fab547872b3bbcc36fdf62ce93da73c6d93e73dc5c0f4ccb34680c61d152caf8d33db360ede9b054b276c722133f590e8120d1b03e6e SHA512 3e7fe41195ae7c1dbf281b2e890313d4eae243249b0b1b86f3145bbdf61fe116fec59dfca12c1cb20a6c38326bb4de67d647eb750fbc29f77bf2e6551cfc6e75
+EBUILD localshell-1.3.4-r1.ebuild 856 BLAKE2B 8932a98d66a1c1619f85b71ff6484a37355608b680f6b198d9597ea5f942fd2afffe9d817fe14fafc017312334adecca0dd634c35ffdf5cc31d806ded0830ffe SHA512 671a5ef03e741c5fd779adaac6519b6d662d31f5af7c188ffcfd7c2fc46ba0767051fd5ea2c894e8bdaf7ef5854fc28f62ae21688b3adbb06411ccd1503cfa52
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-shells/localshell/localshell-1.3.4-r1.ebuild b/app-shells/localshell/localshell-1.3.4-r1.ebuild
index a001e5e7de9a..dbc6064a4f9f 100644
--- a/app-shells/localshell/localshell-1.3.4-r1.ebuild
+++ b/app-shells/localshell/localshell-1.3.4-r1.ebuild
@@ -7,7 +7,7 @@ inherit base eutils
 
 DESCRIPTION="Localshell allows per-user/group local control of shell execution"
 HOMEPAGE="http://git.orbis-terrarum.net/?p=infrastructure/localshellc.git;a=summary"
-SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
+SRC_URI="http://git.orbis-terrarum.net/?p=infrastructure/localshellc.git;a=summary/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-shells/powerline/Manifest b/app-shells/powerline/Manifest
new file mode 100644
index 000000000000..a878cf5dab7c
--- /dev/null
+++ b/app-shells/powerline/Manifest
@@ -0,0 +1,4 @@
+DIST powerline-status-2.7.tar.gz 233726 BLAKE2B fc7b7d6aa5d8e050af07aeee0aa0b7f6f01b7483ea910b87a7027cd55f726d42e41a008feb07429b21ebbd890b12eb56581b8e47fc30a58de6b902bf14d999cb SHA512 053ab74d250b7d835a5f8ec9cb7da4e890f0f50d31be9bab4b393a85e087a6fc010e58d6b3fa530cf39c10671345d032ca1fa9c0f7887a89fea8a4e69b7f1517
+EBUILD powerline-2.7.ebuild 682 BLAKE2B ff81667b6a8f94cf95b579f5c456a85db05dcb03f7d3799564c43c191cde961c3d9473891cea7444f327ac61b02dc5df7d638d8fb6f2bce761914a51ffca3add SHA512 b42ad0cf024ed32d253a88f29b36b12dfa0e5155caecff931485ab6d23cdb2b192b0de812126142a66f7dcbbbaf12254674b2ea43b476e8898be863af3cf4d78
+EBUILD powerline-9999.ebuild 682 BLAKE2B ff81667b6a8f94cf95b579f5c456a85db05dcb03f7d3799564c43c191cde961c3d9473891cea7444f327ac61b02dc5df7d638d8fb6f2bce761914a51ffca3add SHA512 b42ad0cf024ed32d253a88f29b36b12dfa0e5155caecff931485ab6d23cdb2b192b0de812126142a66f7dcbbbaf12254674b2ea43b476e8898be863af3cf4d78
+MISC metadata.xml 620 BLAKE2B 3c392d83a62425429cc89d0ac8dff925d98a392aa1d84bc0c7e84dd2871ded1566b0b66afe34b201672a51b23650cc2e18320c5e4e98b4b5042099340cae4b56 SHA512 10f3ce6affeed34d2b48a922a64eb2b1b1a628ed9d5e9a78f92eec3b264d633ce75b09e83e2cc3deae074ac27cd9f1bd2adcdb5f77e8deacdcd876d849977f60
diff --git a/app-shells/powerline/metadata.xml b/app-shells/powerline/metadata.xml
new file mode 100644
index 000000000000..aa2c5f9bee3f
--- /dev/null
+++ b/app-shells/powerline/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>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	Powerline is a statusline plugin for vim, and provides statuslines and
+	prompts for several other applications, including zsh, bash, fish,
+	tmux, IPython, Awesome, i3 and Qtile.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">powerline-status</remote-id>
+		<remote-id type="github">powerline/powerline</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-shells/powerline/powerline-2.7.ebuild b/app-shells/powerline/powerline-2.7.ebuild
new file mode 100644
index 000000000000..79ff69b517e6
--- /dev/null
+++ b/app-shells/powerline/powerline-2.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="The ultimate statusline/prompt utility."
+HOMEPAGE="https://github.com/powerline/powerline"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/powerline/powerline"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}-status/${PN}-status-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+S="${WORKDIR}/${PN}-status-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/app-shells/powerline/powerline-9999.ebuild b/app-shells/powerline/powerline-9999.ebuild
new file mode 100644
index 000000000000..79ff69b517e6
--- /dev/null
+++ b/app-shells/powerline/powerline-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="The ultimate statusline/prompt utility."
+HOMEPAGE="https://github.com/powerline/powerline"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/powerline/powerline"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}-status/${PN}-status-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+S="${WORKDIR}/${PN}-status-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/app-shells/rrs/Manifest b/app-shells/rrs/Manifest
index 8567d3b4a827..a485c63b5072 100644
--- a/app-shells/rrs/Manifest
+++ b/app-shells/rrs/Manifest
@@ -1,5 +1,5 @@
 AUX rrs-1.70-asneeded.patch 1436 BLAKE2B ab35e22a351024935c13433d49e9c7e1ae452b597e179810a58a9e181895d6731a81d472abd2147865ff76bd4ad338429d41eadcead229a5ce243a66b66e8c17 SHA512 05972478d2e27290a430b0d80343f25c494a9f0f82ad87df2bc400dc652775dff447d8914e367d3092db2fcb5c4700e5d5873452767943e3d0b27410bef51188
 AUX rrs-1.70-drop-old-ssl-algos.patch 2855 BLAKE2B 86194d554b477bd1efb0e2b6950cde48202224efb0e87675f4b571efd95e509a9262236a6852a2e821b20f0e25c68d4d748a2cac3c6019b972a30366076b17e7 SHA512 9b5516a32a0c824dfb52d3cee07747b1931432ed3f7db96ca5121ecef914065b024ea4bb920e9b560f344dfad5d0eb6429ed7fcaff7cf0acc05b62a9b5135b45
 DIST rrs-1.70.tar.gz 49579 BLAKE2B 0345f559239f64d51891100c11f3b80d2b41277eaa0e283c86dbd990496f083e1da60aa6937c870c133bfe8e7f905848d0da1a17b827a2bb07bd8ee1be4b36de SHA512 58a3d34bd80f2ddaa62112819d83ab2175daf1b9e66605d0b629a15d1fc6b43b482e1a4a763b99a07d85bbb0fa6df339d0dfcc203e3a3da3d5cfdabbd14a4bfa
-EBUILD rrs-1.70-r2.ebuild 766 BLAKE2B 92fc2721518f0783bd64fb58b5a5506f2e3e0a95656d1bffd08df7c12e9f6d18c0bf8f3b479f121b71e571d100dded39ba6e4de7b7dc7b1f427e232f43b48654 SHA512 b16df4e5b98b34ae90c0ac86d9137592122f72c02dfb67488e72a263ecbe8413916e52a163ec117a440ac38bfeb194a1266d58b9cb1f7acd36cc96ca9841bac5
+EBUILD rrs-1.70-r2.ebuild 763 BLAKE2B 106557e897790963e75a34d7765c10df70a1305ea40a5084d566279ee61150f33f69420bbf0f68ac90ab43344e9ac1a3a960739986bab465c2d2e492482ce5f9 SHA512 d2c90454a1dd04cd86c4143782a6a1582f57152699744fff5b49843088854ec60ff34680657e82b0b31d0bdf9db233bacc5db3524231ed1ba475a8e37008b978
 MISC metadata.xml 317 BLAKE2B 79bf68384cb06bb254c6bd8757a368e929ae41d5dcd793c7123ea0e336c9187c9062013fc4feeb032c18515fa865d05f1f61272555f2e137e419c23b289246e7 SHA512 b80e5e730f8ee1225f73e1c1651c9cec243f117f3b983ef0814699ba367f373ada228e1fe2b6b8f1928eeb5cd854c1a7bf07d59075607a992a4a0e0dd3482ee4
diff --git a/app-shells/rrs/rrs-1.70-r2.ebuild b/app-shells/rrs/rrs-1.70-r2.ebuild
index 0af183bb953f..50056840ca19 100644
--- a/app-shells/rrs/rrs-1.70-r2.ebuild
+++ b/app-shells/rrs/rrs-1.70-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 73e2ca5ce704..c9fef5ceb5ce 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/XML-Schema-learner/Manifest b/app-text/XML-Schema-learner/Manifest
index 7350dc2001ed..22161f9b3c7c 100644
--- a/app-text/XML-Schema-learner/Manifest
+++ b/app-text/XML-Schema-learner/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Schema-learner-1.0.1.tar.gz 51057 BLAKE2B db9e5c6176484278fcc050c201f4ee3c560536fd1439cadf1f7c2be29e967ef9d84a488ec01045cc3887f527a0cbaf53649bdb4a505f11df17c5697b344a6fd3 SHA512 f357c1a99ac6a7f807538910dfe5e19b14f789046816d333cb031addfbffc0858fd5641f52dcd7304417d0cf0b6c45d1eb3f2092652c4891c09fc45dd26feb9d
-EBUILD XML-Schema-learner-1.0.1.ebuild 990 BLAKE2B 5a23ea8a6271d76a86cff4494a542d12bed7542d6efea439899638ccaddf49a65549322b5816264db2100a0fefcb4b5a5ba1ba43ebef7d126413617d2beb9bfc SHA512 578bb825228e78d83617ec19bd72def2443b3c39b00da1982aec26c0cdcd19e89e1bd792c406854044394cd4f2405ce7815960a63871f611ed4fe99f9fb4c621
+EBUILD XML-Schema-learner-1.0.1.ebuild 1031 BLAKE2B 73c8a5380ba8d61b8e0f91b6d1dce2267aa1ba589dade647bf3fb064b166608afc8d0e9fce6d89b2abfe2c48b040524b9d7c1f69ebc11d69c902c07d4c8296bd SHA512 24aadcfe0f5418b49ceeee240c6c770bd1c97d60c690ea263e9d422c7235d30888bede59c1a0c99daa9079dd55b500c41a2248ad25934da8a4c777ad09208aaf
 MISC metadata.xml 942 BLAKE2B 99cfdc01afc572294b15a21d4a14a3e272c4e465e276d83990e01c6e03273730348265d3615da5fd3c5c1dc73e4c688d20ba161c9f4021f719357f1109f6c1c1 SHA512 48e0d860bbede84a76773ad1a77620cdee393eb0894f63461371ae7cb12a43fa0b640bb2dee17eb3eeb22fbe24899c90da704a74f70075e722e83f5d0be86bb2
diff --git a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
index b4d56e1a79ba..0b0e2413742a 100644
--- a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
+++ b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="Algorithmic inferencing of XML schema definitions and DTDs"
-HOMEPAGE="https://github.com/kore/${PN}"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/kore/XML-Schema-learner"
+SRC_URI="https://github.com/kore/XML-Schema-learner/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 5e52a0e40537..c2909fd8ca89 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -2,7 +2,7 @@ DIST asciidoc-8.6.10.tar.gz 577208 BLAKE2B 320724c3e2306e14212a4e32f09fb735861f9
 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
 DIST asciidoc-8.6.9.tar.gz 907253 BLAKE2B 45db42abd9ec73f6d3b20fc755bdd501eab1503bd8d5d6bb6b7d66c442cf8bcd47ee4325dbb572bdcfd01168ef1bccc3430ee7c545e7b3a6715b8ebf09516ad9 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955
 EBUILD asciidoc-8.6.10.ebuild 2411 BLAKE2B 18435c6f4749a661ae93d613991599fffde505210c132cfe1807035efb1323eb3bfe563a5fe53a14f4b7c7a6885c27889428db70b3c4e605f4dde37fa61d0620 SHA512 c202341942125b482e8e4cb6ef6ddf11e6806826667cd53f94e032971819b70cbdf4c2a16dc4a14b1b31df096d5bed673f1e76362af13e8761f15a6271b1d5b6
-EBUILD asciidoc-8.6.10_p20181016.ebuild 2578 BLAKE2B 11ea14032a5cb9f5338a1359e0da2d408efbc80dd959a0484dd86e6a9ce1884ef8057cf423ccfd5e21d4334db71bf49f3bd384cee6ef340aed1aac4b69d39b0b SHA512 922eea93dc09b64ea0023725732804752a2680dd37149707af571f7936265902950098c2bb307aaa4ff361fd8272c17a674b30d2412826e210069bf685b045cb
+EBUILD asciidoc-8.6.10_p20181016.ebuild 2576 BLAKE2B 16cd4a41ff09070752296ba3d3aaa573b4d13c29388035db99c945e6085f2b1816eb76c3310d325a0e499f1eefb5c09f4e920d5ad5347cee6d3c5e7932534c3d SHA512 6a940592d66cf3dd654391e718c4827a590dd0f814f4694d4337f0f4d3f450135991d9359f3c83477969ac7613ac1a973989b5cd2753d97b0a492677c79390cd
 EBUILD asciidoc-8.6.9-r2.ebuild 2171 BLAKE2B 76606035ddef0bd31709a24a1b9896dda55ee1c299a043b46724da1a3d21565eddbd484ec0fd80db320c6db7aaaba1b340d6e1aac4bed7416724b9cd421791a8 SHA512 5a5bb301dab871ca93c282892c0e7a9421dad343dd529670385231397cfb96bdc01a483ce23fe86348c4af7ff2f00185006cb498e65b0eb5718e34c2fa7a3883
 EBUILD asciidoc-8.6.9-r6.ebuild 2370 BLAKE2B ffa3b9a29ff82b63eeb56d4af3c527ec62d19034086a40569116c8949fbb8bde289273f006f6f707cfed75d3f5302a8da7d09b01e998b58268aa83925eb39d31 SHA512 f953144beb29005d3a0027a644f3a1d68fbe54dafeeb2f22d176ef2a28fe92e7dc6b315c47d49e7d6132cefdef8f623e2b1c90f30337324fa90a418e6e29e39d
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
index 5474f073229d..a395cd9f17ea 100644
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
@@ -82,7 +82,7 @@ src_install() {
 	if use examples; then
 		# examples/website is full of relative symlinks,
 		# deref them for copying, which dodoc doesn't do
-		cp -rL examples/website "${ED%/}"/usr/share/doc/${PF}/examples || die
+		cp -rL examples/website "${ED}"/usr/share/doc/${PF}/examples || die
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 102bb3371367..b7c7080727d7 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,7 +5,11 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
 DIST calibre-3.44.0.tar.xz 38643008 BLAKE2B 7eb1412aa5de6ba2f48ea13e922dffff7ace0f4f475832ebe122db967c71df05b6bbb45092bdd53ddfe35d7a0c2af566ed83dde9aac64200d41ea2adc4cb1886 SHA512 a97f45f5f788357f62b4088c4d8190cd3e3b790685871d5a024342d5d21ca978d46fa4e47f85eef4b9fbc0774923732938a812dd188cd4a315445cf25b187d28
 DIST calibre-3.46.0.tar.xz 38750284 BLAKE2B 5590ba422d0323ea7c0cea67d88d448f00f5a470e7a8fdf9851b488c0856c88175bd107715a856706e95b2e1a45604713d061f4a7a3603ecaa01dfc018c1ed58 SHA512 d8eb014ba4d943e1c2ed05104d9b0c13f45a8b0085fa240248210cd43ab3739036936324183ae8a63dc636f7f8603484e3ddf50a260308ce1127745a8d3c6763
+DIST calibre-3.47.0.tar.xz 38720656 BLAKE2B 4626eac9f0940c1cd6ebab69c16b69eba3c01f62594bc7c60fb9bd097e513f0767a8b5706d07429f7529ed29ed5a7c47621ec6e62a9db82dc99accaaed028524 SHA512 b34d69f31e37ff528b22b6fab43836d53cabfaa4d4c03af42a8c2b73301bd737927f03eb256da765262f73dbb0631484ed164d46230f730e4b742b837c2dfce6
+DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 60915345dd756d085386af61128e92569304be64aadbc21b69973e93adf3fb5cc88f7250153c238ecf423546f408bfc094b5bce329a54e7f080f831c4a8c23c1 SHA512 010796b3ac3fc6adcdf26dbc7966946be0f48b2684e1317da11d77fa55151d1f6ad2b86adf3c8eced5559823567e6672bfdfd953c17e6cc978894544131fb6bd
 EBUILD calibre-3.26.1-r1.ebuild 9203 BLAKE2B 9e3bc1630f915a8548e1480f0b00d6acb4001dee3be5a5119dd9b2eb8b984c4eecaa0a0742e550a36eca359e8806d2444d21f8bf344321c11ffeca59e7e10877 SHA512 98407a3605b58125ca783dadbe7dfed5f3bb526f816d79a167fb0358202cc56870601d16b7eae46d2464a0f64761168d9f0a00d69a5a184e17d705eb540afb97
 EBUILD calibre-3.44.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
 EBUILD calibre-3.46.0-r1.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
+EBUILD calibre-3.47.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
+EBUILD calibre-3.47.1.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.47.0.ebuild b/app-text/calibre/calibre-3.47.0.ebuild
new file mode 100644
index 000000000000..9b8c29fcc23b
--- /dev/null
+++ b/app-text/calibre/calibre-3.47.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C #684484
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	rm "${ED}/usr/share/applications/defaults.list" || die
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/calibre/calibre-3.47.1.ebuild b/app-text/calibre/calibre-3.47.1.ebuild
new file mode 100644
index 000000000000..9b8c29fcc23b
--- /dev/null
+++ b/app-text/calibre/calibre-3.47.1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C #684484
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	rm "${ED}/usr/share/applications/defaults.list" || die
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 0aa7ba15cbd4..bf17920d3dd2 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,3 +1,3 @@
 DIST grip-4.2.0.zip 43079 BLAKE2B b7aa31c554d646fdedee88f54e2ad825d56eed26cb18ec364cc0e2638f3d002f2fb3192daa15085b2db5a9d608e37df8c74b19466042c57fa62b80f7bc259eef SHA512 2989a1cc2cb98254e932d5bf6679a205992e74802e68fe45d11cf087747d2379778df254bbf1cf980bb8993dc5568c5112707c645babbb32aae49f443319ff6b
-EBUILD grip-4.2.0.ebuild 599 BLAKE2B e6fe35f2b564b09af11bdaca9b7fb7293da711779f9add794c7a3c541707d1b53811845b869f86e98e338eae3c0358fe9ccc139d48f2717a6bd369d3a251f470 SHA512 5152e68c9c5b650d982b8d48e67f46df2434dd6864181c8721ae14dfdf593b23543967cbd0ff912d63fa143a8a786dfa4f08a59221a0677d48772f285b4253cd
+EBUILD grip-4.2.0.ebuild 623 BLAKE2B b4e93a1fedf58c990da6a9bb087014009338bc14e96cdc5df7185a5ff621747a14c6a149ba4c3d163f7672a30f6b064f9a13b70dec9fbb44463707aec8a75fc8 SHA512 a472818e9877fa23f9e18bd13b30a9fecc0ef2df6f366d40d0c99702ed6b2a1f7b143911c2658a3925bc1c187a0522cb0461b841f5de12ffb3f5973371726eb8
 MISC metadata.xml 287 BLAKE2B 97d6c8c5b9fa03b5b8435a9719b819a9e071d1310656d97e6a203a8cf86d2414034e8642de7f010aa8f64955bcdc849bc66ef64a1e0e80fd23e355af50c6bbc1 SHA512 047bdd78979d55e9e37b92f51b52190c6a5780d6b3475560ae8908fdc98274949372918e1ab150821f09bff97cc12f25097f4e89ee4431861b608be79bd942bc
diff --git a/app-text/grip/grip-4.2.0.ebuild b/app-text/grip/grip-4.2.0.ebuild
index 2a8b144c5550..8c88d409de93 100644
--- a/app-text/grip/grip-4.2.0.ebuild
+++ b/app-text/grip/grip-4.2.0.ebuild
@@ -16,6 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 KEYWORDS="~amd64"
 
+DEPEND="app-arch/unzip"
 RDEPEND="
 	>=dev-python/docopt-0.6.2
 	>=dev-python/flask-0.10.1
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 2ca929a1166a..789a8410a371 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,7 +1,9 @@
 AUX hunspell-1.6.2-renameexes.patch 5104 BLAKE2B 83ea0ec81fdd5e8934c954bb2f2d07e9c47f725f8b63360aca7cd611348106a1e3f13ab08609ff4877272ec6b116927c382c5b47731945656ddb7927aca22c50 SHA512 0d1871eda31b83851bf153746e0f4957599e889a536e9c0994d1cb988bc4a887788c1fafe4dccccaa94e68a69e6fa4ff1e201678fa8d1afdcb9608b83211b0ae
 AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa
+AUX hunspell-1.7.0-tinfo.patch 1721 BLAKE2B 1278f50da7577556710a8e481f46ca03ea40147149d2419343aadd2e08afcc3e1865efb9fc13beca9d4d2d7b1e027f72931415120524458843f85c86528e82da SHA512 3161ccc03a7c1af9b3a421515385d95866d306bf7639a24e4e4fc0d762a30e7195a517315ce489472fb18edc3594cd0f621ef5c42e17847d0b76563315426864
 DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
 EBUILD hunspell-1.6.2-r1.ebuild 2383 BLAKE2B 7ef52fd2c661ce65496350ebf7f33e550b9e2645183cea6a3801e7bea81045da4b9846dbedc6b933cb30a3876df87d434785ee4a39292aa2fb3093310b565b59 SHA512 41e296e4a093edc5ef757cec31fd93fcd9a6b08ea18e5b5086477f4f4b351a93fa9ff03a7cb6884da17236985c0d3e5ece154da8aba8557f56cff37c73efc3b7
+EBUILD hunspell-1.7.0-r1.ebuild 2350 BLAKE2B 549d5faa02b30a9c05f0ce88d0d25aa432ea80a0a94643c819676afbf241d4e376f483cceb97073d93396e11bbaa3d944204abb91c430b23933710b6bb5252c9 SHA512 6828c0da75f5e652df23d1d14985fd0e73e00a4bf0acd407650f5973f2fd19d1ec0d98fb3ba246d3ea7ed74f5fdf1a1eed602c260c01d0a44257feceaa68581a
 EBUILD hunspell-1.7.0.ebuild 2292 BLAKE2B ffcdf02a09d0bac21a950177962e6ee769802c3c8656d847c3c59faf21925a153bf51d7d933a06a3ec14ee88bb9178398e56b8ab1efde0992e562ab1e0540628 SHA512 aa8b250d91da765cd2e86ae0233947a5722e135f38a5f5c7ae54f1a50723b66d3aa618fda42931ea65e36d5e306de00e9983c305716d613e3d4ecf7e50a7e5b1
 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch b/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
new file mode 100644
index 000000000000..1fb992b0c9d5
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
@@ -0,0 +1,61 @@
+From ce41cfc39129ee2be67667f2d9b78cc7f7d24dca Mon Sep 17 00:00:00 2001
+From: zimous <zimous@matfyz.cz>
+Date: Mon, 2 Sep 2019 12:46:53 +0200
+Subject: [PATCH] Fix build against ncurses with separate tinfo lib
+
+Gentoo-bug: https://bugs.gentoo.org/692614
+---
+ configure.ac | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9426a94..bc5e39d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -52,11 +52,23 @@ AC_ARG_WITH(
+ AS_IF([test "x$with_ui" != xno], [
+ 	AC_CHECK_LIB([ncursesw],[tparm],[
+ 		CURSESLIB=-lncursesw
++        AC_CHECK_LIB([tinfow],[tgetent], [
++            CURSESLIB="$CURSESLIB -ltinfow"
++        ])
+ 	],[AC_CHECK_LIB([curses],[tparm],[
+ 		CURSESLIB=-lcurses
++        AC_CHECK_LIB([tinfow],[tgetent], [
++            CURSESLIB="$CURSESLIB -ltinfo"
++        ])
+ 	],[AC_CHECK_LIB([ncurses],[tparm],[
+ 		CURSESLIB=-lncurses
+-	])])])
++        AC_CHECK_LIB([tinfow],[tgetent], [
++            CURSESLIB="$CURSESLIB -ltinfo"
++        ])
++	],
++    [-ltinfo])],
++    [-ltinfo])],
++    [-ltinfow])
+    if test "$CURSESLIB" != "" ; then
+ 	echo Compiling with curses user interface.
+ 	AC_CHECK_HEADERS([curses.h])
+@@ -78,13 +90,15 @@ AC_ARG_WITH(
+ )
+ READLINELIB=""
+ AS_IF([test "x$with_readline" != xno],
+-	[AC_CHECK_LIB([tinfo],[tgetent], [
++	[AC_CHECK_LIB([tinfow],[tgetent], [
++		TERMLIB=-ltinfow
++    ],[AC_CHECK_LIB([tinfo],[tgetent], [
+ 		TERMLIB=-ltinfo
+-        ],[AC_CHECK_LIB([curses],[tparm],[
++    ],[AC_CHECK_LIB([curses],[tparm],[
+ 		TERMLIB=-lncurses
+ 	],[AC_CHECK_LIB([termcap],[tgetent],[
+ 		TERMLIB=-ltermcap
+-	])])])
++	])])])])
+ 	LDSAVE=$LDFLAGS
+ 	LDFLAGS="$LDFLAGS $TERMLIB"
+ 	AC_CHECK_LIB([readline],[readline],[
+-- 
+2.23.0
+
diff --git a/app-text/hunspell/hunspell-1.7.0-r1.ebuild b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..343a7fbce81c
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+MY_P="${PN}-${PV/_beta/b}"
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
+SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/hunspell"
+
+SLOT="0/$(ver_cut 1-2)"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="ncurses nls readline static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
+is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
+zu"
+
+PDEPEND=""
+for lang in ${LANGS}; do
+	IUSE+=" l10n_${lang}"
+	case ${lang} in
+		de-1901) dict="de_1901" ;;
+		pt-BR)   dict="pt-br"   ;;
+		*)       dict="${lang}" ;;
+	esac
+	PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
+done
+unset dict lang LANGS
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	AUTHORS ChangeLog NEWS THANKS license.hunspell
+	license.myspell README.md
+)
+
+PATCHES=(
+	# Upstream package creates some executables which names are too generic
+	# to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
+	# It modifies a Makefile.am file, hence eautoreconf.
+	"${FILESDIR}/${PN}-1.7.0-renameexes.patch"
+
+	"${FILESDIR}/${PN}-1.7.0-tinfo.patch" #692614
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# missing somehow, and I am too lazy to fix it properly
+	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
+
+	# I wanted to put the include files in /usr/include/hunspell.
+	# You can do that, libreoffice can find them anywhere, just
+	# ping me when you do so ; -- scarabeus
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_with ncurses ui)
+		$(use_with readline readline)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	#342449
+	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
+	ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so}
+	popd >/dev/null
+}
diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest
index 747bdf161dd5..a1f624be0e58 100644
--- a/app-text/jo/Manifest
+++ b/app-text/jo/Manifest
@@ -1,4 +1,4 @@
 AUX jo-1.1-version.patch 217 BLAKE2B 366b69d941f5f324de39e31de160e0a296dd65259a2051f4adcefde4b8253b514e44c0d4c52413379b33567d7a744a8beef0cc324bd098b7d017ec6318d2f5f2 SHA512 c70e5993069229143f75f2360bf7b4756a988f71d321a0f26c821d0258d523fc2c9d754692b498ece20ff452444ee817af609435160409f1ebe4033287ef89a3
 DIST jo-1.1.tar.gz 50395 BLAKE2B 753e65e5b483cee357bcfc1fb95d93fae008acc8a1eeee75e6e68da6d0ed8c9636cd489278c466ffbd179ceaec7121b4fe3f64fe2e9bf70b81febbe15144c0f2 SHA512 fd220acf53d554cb9e9920510dba2f4a01337b126dca89882e02ba96cdd84bf7a5e935a4c06dddb5200cd808f0609fd697e51a56161dc99b1638e33181494242
-EBUILD jo-1.1.ebuild 412 BLAKE2B a5d07980550f418a4022f3a36c74f49ee5fdf21a56ebb28e20a91c3dc4b75e1ce6898a1c36e89adb9b530741056ed04fb7e96a6fd2b256b35cda4598ef8432e6 SHA512 4914cdbb6a5f71e58da34c82f188901400c5afda7abe58ecece89e175b984f16333529a986baba15513ad6b08f6559b0f8f5d6b0276fbc14aecddae344192246
+EBUILD jo-1.1.ebuild 426 BLAKE2B 7752fa82f7f4f99ca1873eaa98f9a2f9612fe57548cc7791e81ffb15bced18061d1bf4d17367506dc6a6f860fd0fea2c314d240f9d6fbb84336d77f00d867a79 SHA512 eafeac07b4a04c94a03de806eabcf620685043815a4df4db89e06783533767e09c38aec38197c34ff86c854ce29ba6456b555b18a0df7373a35620dd3e34d893
 MISC metadata.xml 288 BLAKE2B 8b66970135ed40287f00f96188b1679d936f9f58d59d2991aa36f2641e0a5ae48bdf3f36556be0b0296190a1c8bf59c88e6900de93e32c102b3adb880e524dcf SHA512 c8e9c740f13a6d2e94d28748750b51c44d9291d4fdc8823dc11647e0ae058866c06d49656011398d48fed78192bfe89f50a5fd05d36054974e3e65bdc82c55cb
diff --git a/app-text/jo/jo-1.1.ebuild b/app-text/jo/jo-1.1.ebuild
index 704769988141..d52212e5bd0c 100644
--- a/app-text/jo/jo-1.1.ebuild
+++ b/app-text/jo/jo-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
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="JSON output from a shell"
 HOMEPAGE="https://github.com/jpmens/jo"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/jpmens/jo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index d3bbac96c196..23265a98edf8 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1,5 +1,5 @@
 DIST linuxdoc-tools-0.9.72.tar.gz 614429 BLAKE2B 404b311c0560780bd81f021760d32e47cd6ebe8abc9aa64a181b8ce727dd0edbbd88d286cdfdcc97a51981bd0bd299563d7b1b2945e06f83ff32c7d3e56abb19 SHA512 2d522a99212dab2535786b64e0b404a9bb023d1612d8e57a628de21b5e77b104285713a98591c61a2fb2196e687b34180198ab0dfeda2b44fbbce051e9919408
 DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252
 EBUILD linuxdoc-tools-0.9.72.ebuild 1777 BLAKE2B b61585eaf79a55b9acc1f4711cbaec19d421db998f091a4fb5827292bb30c5720de9ba5a300ad0cf248b509a8ec4d1a0415a4ee498edb18f49279cf673ff35cb SHA512 40632a82dc9252a4bac966174c4e87f6f1adf075fb2ef125ea07ccc5796b98e74d8823d1afff11f98e042ded4eb5b7da82a8b8c5ab052e4f7d53357b84cbf649
-EBUILD linuxdoc-tools-0.9.73.ebuild 1660 BLAKE2B 1d38dfa598590a912bf7d98d58ea9e6f4acc027ce9160e26ec40bc012be8913f704863a771323e3929d81f78faed6f862eff54d4955b8c82eaa2f9985bb8dfa1 SHA512 ea743c7be253326093d6c3edaacb677aa6b74340bbf9a475b4402f0b957dd41cc9e7fecf7c7f5a7356c7f834f53fbef5c523fbcb302f72e7b10325ee1b0ceda3
+EBUILD linuxdoc-tools-0.9.73.ebuild 1667 BLAKE2B 7610425455383b2de6e6d2192b1efe2ff91f177cb7d57db0244c7a5318bff2676e52b383c973345797b4322ef6d67166ef6376d7d3d2eac14a17137b59d0ef41 SHA512 1cc1811a713b4b255daf959fb45294ce2aff9c97a6c8b8fefbe0ef4d229da09c98ea4be56087b0a185ad6fde30788ee6b578c72e3f2c82673918233581c0b726
 MISC metadata.xml 911 BLAKE2B a78b50af9faf588a872f75b94f1278ce1ef5e16edb8c6f6c953dcc29b466be53f70a63275e5df54bd46f58d726e80f07b8cd8ae051d93f7c6ee11f0c8e63b8fe SHA512 6afd802552b700006b38a5eee516e5e1f59d0af0dff294bc2807804f8a85823ca2c5a928c0cfe2d5ef74d8c34521ecdd2a54d4ff5a1d322f17d42a6e5e6ad0f4
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
index bfa36dc64cdf..1c687efe9403 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.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 is blocked by Gentoo bugs 497038, 497052.
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+ MIT SGMLUG"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86 ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-text/mathtex/Manifest b/app-text/mathtex/Manifest
index 857c008d9281..3c19d498ead7 100644
--- a/app-text/mathtex/Manifest
+++ b/app-text/mathtex/Manifest
@@ -1,3 +1,3 @@
 DIST mathtex-1.04.zip 148443 BLAKE2B 6632d30536428f6f33fc13a2b5b38651f2ab7a938381166b79c009ab3d95788fc69e8ed824dae64dca00d32bb79ccd00a73b772f9aebc813d54fd6e0f18839f4 SHA512 4b299a6dc503a01d6be3182ad982e38c0b6d926f09a09bd5169f8ad2c947c020ad532b15146379b4bc2158cfceec4cb4a0b7bf902423e0a8ad9b0b0190a99601
-EBUILD mathtex-1.04.ebuild 885 BLAKE2B 1167a1ef2a7187932ff06b98d9966284a7aa8125c66d1bfc5bffffe40a661f44ec6c4869b9aa2368a932f74484c3390ec57a732b0e42cfb39f92a5275d57a54b SHA512 1c74aaa03a53c5ce6639ab5e4e960f1556aeaf3978df76eb17a9f5d9c69cfa876ef18a68b86113c518927d5239b0fa88b6a0aa9eb3300bc0cbcf48f7b296865f
+EBUILD mathtex-1.04.ebuild 896 BLAKE2B 3006c7d7502eef0620f7d2cfca7a358c3aa777dc5bf15caf897a9dc636262af13fe9431cb3bed5fe2bbcf72d73037dbe7eb3ac5c7392114bb6ac4b30472d0ba3 SHA512 5eef081c961928e5d662ddece03623a372bb1e6e85a3624abbbfbd6218fbdd2f0e0740e208c22e600795f9ffd8229934e63ce6e6f5fddd0633e1e8ca5b6ef40e
 MISC metadata.xml 633 BLAKE2B 0b7f70957a2eacffe8148ad27186334c9f6a0bb4f2f0142a132eccdbbc6c1a4f96a7cb40f927c29109e2046c5bef23af4c64b1991f9fb2984f4e76ecf96f8264 SHA512 9086dbde5cbad1aebf2b0ffdf011db515befe5bff5c40e37726a0fce358f12875469d0afa70f410e273f3ec1f80a4980c77acb888b7aa5c83cd7ecb28afbb21a
diff --git a/app-text/mathtex/mathtex-1.04.ebuild b/app-text/mathtex/mathtex-1.04.ebuild
index c04f8dc4dfea..597f3f4add0f 100644
--- a/app-text/mathtex/mathtex-1.04.ebuild
+++ b/app-text/mathtex/mathtex-1.04.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
@@ -16,7 +16,7 @@ IUSE="png"
 
 RDEPEND="app-text/dvipng
 	virtual/latex-base"
-DEPEND=""
+DEPEND="app-arch/unzip"
 
 S=${WORKDIR}
 
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index d728c1ed8669..442fb4527df7 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,3 +1,5 @@
 DIST paperwork-backend-1.2.4.tar.gz 59998 BLAKE2B e92bfbc311a38563fcb38511e8961c081b7c5d3a445ae9b18a80cb6848edbca2460a37b3f0c81d284a04974954cecbced0122a0bc66b3bbf10dc1bc1784b9969 SHA512 aba8cfd7abe9058e3433c64a96c1f79b451d8bdc661fa16ed7eb19f1b7e15efef024c94557082ec4d71c5adbaf268254af34f1eef8a35bad5e322409821ed5c4
+DIST paperwork-backend-1.3.0.tar.gz 62119 BLAKE2B 0dcb4c4d3c96cef8ab993449da46a01168be0b1ade8bb56eada723f046a0b82eb9b8b7c15b7706ab8b6be8e22166e2e01082e57d85a68c5ca919a081ad67fade SHA512 127b71db39a54533f520bb6969a36c48b54827f5720efb40728b133d4362901cbe4a20aa84337c1e8262338ae528ed502c23fedee703898a53e08b3bd5dfd7e0
 EBUILD paperwork-backend-1.2.4.ebuild 864 BLAKE2B a7934e6c7804dc0efc99770cdee56569950445d9c6e0e82386be6f3e8b344bfc4c4cfa8a3469c4160d18b3302fa4905965414192dd0b51127393755e72ae9a09 SHA512 4714544691f7c3f9ed2777863d83246e8be06834eebd41830b4513d432ae4b19a9a6d2595803f4f213591f55ca52c99d003fd035b36e6964970da641ce375b3f
+EBUILD paperwork-backend-1.3.0.ebuild 901 BLAKE2B 9e61d6c0f1c7f390fa2f3d8ee8da5a8a1d87e3df434cfbe52363de6a6c4d4beaeea6e69a6032c6e547d48621e97b77cc686dc1f6acc631b7ee844fdefd785083 SHA512 bece3bc2cfc96b05bac14236b8b19276e4e72a47d5e06e43411ebeba52da4307e3977ea477fe1b0d89ff260f6fcc628469eddf2a56fac0d3c49f65c128592111
 MISC metadata.xml 415 BLAKE2B 3d7bb0d432b982a1c482119ffedbff65e938944bb771729e1c56cb801fd5c26286eba701eb7dbf54d682b2fc975bb8bcad32f38b27f93d8ed3dd403469a416c5 SHA512 aeff8f2d4565711d077d1d2a5105f6c87cb99fd37eb1daf7dd1e919e51b5a1309c974a9e7459b35c3334041ad9776b1ae291fc08b7f2fc0bffe8bb360e2f74c6
diff --git a/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild b/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild
new file mode 100644
index 000000000000..05cf31677eb0
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler[introspection]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 080de98da352..52038f3c5b39 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,3 +1,5 @@
 DIST paperwork-1.2.4.tar.gz 4379567 BLAKE2B 19d9c00ba678ef4c2236379311d4b9f0d01bbf908ca26c0dfebf53894f4a89539ddff9ac4065f703a981e723d0573b417b8ac39c3a2a94c75f94401fa537d688 SHA512 33292b0cc16046a10a49f5df4a1750b395e95fb898637c81e980ee10cc1525a5783878451ad84a70b62c1c1de73f3701bf40452779490171966decd9b896f4d9
+DIST paperwork-1.3.0.tar.gz 4625505 BLAKE2B 866a043216dd603fa4700ac09b998c55735e6a5fe09fc3ab02aeb6b68cc62f239e86f8116d84ae1571235e7d9230cbe25bb878909e3f7e542164d5f76440f367 SHA512 6f0b7b88d62520dd69fe8ee6a033a8cde9e48ba093ce7ec77df26549df29e7a0d8eb2bfef9f74e41a722cbd1d2d7693efbffa5327838708c9af54c76634b967e
 EBUILD paperwork-1.2.4-r2.ebuild 968 BLAKE2B 6962a17308bf22f9b4d18a6e662191f66b19b05c7533063c510365cd7952aaaf3c639777a22948d6d30748b06764d176ad4c4cbfbbfb2124dce38a70ebedf0b8 SHA512 cf90898f2916cb980e310c9d65dd67ac80f92e8b358bae52944768c5979c020801601b956c1dd7c571a9bec60519fafc10afa11c1e0863c475136c14df7cad7d
+EBUILD paperwork-1.3.0.ebuild 949 BLAKE2B 18cc69d417d02fc58b7d0bdd16410f09aa9eb1f863814ba821885ce39f4e1e7f0b1da56625a424e0f29876e860f40918c53eeeacb1f3eaa57c87f3feb600ae38 SHA512 60d7f4cd8a0336f6ea5ecac0d419b7ed09f3b37e5abad3523875efa6bd2109a7e7c5312017068130d3a34e776ed99c0cba75fbae55727639d44144a6a373c00b
 MISC metadata.xml 784 BLAKE2B 3da20318f2e16ddb08ca7d5920ef57112986fdd0e0c4bfd4acdecb2aedc35123746533b391be47629985d38b2eeef75dae4eb08874526254316bd240ccee5117 SHA512 dad2a904fa5374ae34f4364bc1140d2b550783bdad137269748f614c20803f938ff51cf2cd3154f1bcd6247c3b38a54afda985811881b17515768095987c7950
diff --git a/app-text/paperwork/paperwork-1.3.0.ebuild b/app-text/paperwork/paperwork-1.3.0.ebuild
new file mode 100644
index 000000000000..bff55ca7a05e
--- /dev/null
+++ b/app-text/paperwork/paperwork-1.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
+	dev-python/libpillowfight[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	media-libs/libinsane
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index 00906d373b7e..6fad7d692e88 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -14,6 +14,6 @@ DIST pinfo-0.6.10.tar.bz2 133059 BLAKE2B aaac23583510f42ac8a0c71a380f2bc76c4db6d
 DIST pinfo-0.6.13.tar.gz 157103 BLAKE2B 18af4a5ae1bbd2abccb174ce1a3a16e4d17207a10015042723c58f80695c2580ca0c1c60f4f6f4f08e67eb01316fe48cd848a887e65159a6cd4463eca14bdecd SHA512 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
 EBUILD pinfo-0.6.10-r5.ebuild 1327 BLAKE2B fa65a2d59989d50982921aaf64b2f7e98fb3c4ea82e2c1537656d30159d44a29df0ffb0c8034dbabcfb4b82386bf15b7f4ccf86f5fcfb577eaa667cab7ee22b2 SHA512 f5132c2d41aba6c9cc41076571d70266db613f28ce63c1c3d3b3902c011d3860004cd910280527090b72c97a7735928ae2c3e8f85f96139134bf847d6ec624ba
 EBUILD pinfo-0.6.10-r7.ebuild 1440 BLAKE2B 1a52c7a2f04d51b7788233a0b0e4f4ff3367a798abdfe2c1c949655431652e1fffccc0b8c582143f596e44d4753a1e67d9b19a3b2f4ed5442260556015260990 SHA512 001351b50d182fea1772686449629ceb9946625f0d13d1f13219938ef0a3dfaaeb142d3fa7d8dd3dd1f28cb359da3a526d76654875cc6c62bf39451f1b6ca431
-EBUILD pinfo-0.6.13.ebuild 972 BLAKE2B 66a20d7f06c652930ecbce6862cd35ee5899ba45bd7d01fa6ed3d9719b5a54ad83b1d9a9bb7d98cce34139b951c10055c9f2849097ba6470ed11d4881054100d SHA512 0de182fe6b431a8346a9f8a8bc21e339c2d233e725f4202482bdb5e42ada6a11438540746b0e49190eab25898fe3238228e1dc0443a2d23f943aee1ec31012f7
-EBUILD pinfo-99999.ebuild 886 BLAKE2B 52c3d54f248446df82c34f49a4ed73ea3cd6dfebac907a7624a9eab847234b997ee1b24d3367ba1e0426ed6e2ac7173a95b35d4aca18f7d2b597bdee45197c83 SHA512 87561fef7173dfd86f36edd55ce92d1afb70d995d589b25dc889e0bee9a48116a1eda7f4673e3d47dbb466052b45e1252af255e43d7551417ffcf00feef0e91c
+EBUILD pinfo-0.6.13.ebuild 998 BLAKE2B ca950e33769cbcd5652c11cd4fe64f2aa0de98d0fe5dbec38e8fab04f4f5af0d6154188788d99f9dc4a05c1613c4c0e7ffca014043fd9a789c590f0c3490aa11 SHA512 70b4b076dbe03634a6b2745e117bf3969bfb12978ac30e54ae0c040aa74dadb3ac4cb30b910f50928ea5bf8f3787e967c4cec8ab4fa9ee1f9d3e0e24fea56f48
+EBUILD pinfo-99999.ebuild 916 BLAKE2B 665e86f2f287e61ef58076845d75955ae149a518fe40d3b39dd9795f13ea3f7295ab937d07e919843006603aed86ee8708d2f599a0ed8dcdb508ecbd4b7b7431 SHA512 93259861bcdaa1aee6c71ea59b2fce4913ec5dc61ecc6ed08e21e6d30994ef6a1dfffebb876cefeb583bcbb79123f0e89b6321f6e7aab8edb5e1b1878c7e19ca
 MISC metadata.xml 214 BLAKE2B 2714d2d15a382508ac07f9e3cf3c042bbba715d1a3f679a37d45fb68cbb7931bffe3479e8a9c3ef61c0f76d1b5822f9696d203ed0153a2e713865cce16ed2403 SHA512 6bd18312d33fe28edbaf93fa559dab76a4eb813f37bf3accccd113e111507617827f4423e81f6448edc51245f86c73a5b1d65c0a9310c3aa1d1b910597303fc1
diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index 70e4f9f8e0c8..07dccc853773 100644
--- a/app-text/pinfo/pinfo-0.6.13.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -6,7 +6,7 @@ inherit autotools flag-o-matic
 
 DESCRIPTION="Hypertext info and man viewer based on (n)curses"
 HOMEPAGE="https://github.com/baszoetekouw/pinfo"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/baszoetekouw/pinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/pinfo/pinfo-99999.ebuild b/app-text/pinfo/pinfo-99999.ebuild
index 961b78a24b48..c6cc673a9633 100644
--- a/app-text/pinfo/pinfo-99999.ebuild
+++ b/app-text/pinfo/pinfo-99999.ebuild
@@ -6,7 +6,7 @@ inherit autotools flag-o-matic git-r3
 
 DESCRIPTION="Hypertext info and man viewer based on (n)curses"
 HOMEPAGE="https://github.com/baszoetekouw/pinfo"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/baszoetekouw/pinfo.git"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 0c5d61bb13ef..754f98b73367 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -2,11 +2,10 @@ 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.71.0-respect-cflags.patch 1188 BLAKE2B 5bd8f4a66a8e0094ed02bc36f8c56fae4a34f470551a666767a5ff82ec23b387b31228fe8ca8ba3727c67211fc3fdd66bd6ba4719320a5c6f86f3858e1eb19fc SHA512 764f0d0264fede2812cd6630d744fdbf5e258616e90fc01f67f6a3a0f31ae64e0680def9768764efd890187c78cb4a1ad73556d5b138dbe187aeb955a02f2700
 AUX poppler-0.78.0-respect-cflags.patch 1140 BLAKE2B 59e87b6957a5aff35cf6ebc8092c0552b8ece31e2fc73765789ac73dc5ac01ba69928f9308de9660ba3cf6b38b921ca341dcf6c5bce1d360b1bcf1a4005e4115 SHA512 713f7a3e3e2ae950fd6406ed076d4e6d2079619e40f00de7ec7d7df587df520373b923d343494902da454423adf29174f1ced11cb874a12851febfc1860988f4
-DIST poppler-0.77.0.tar.xz 1533068 BLAKE2B 9ce7db05bd9d0131f643096b84058e67ba416b34497af5e97c9b6f404131fc72c29ac05e60b77477d16e586df73b306e4a01c113be7ede0cf3956240db889a7f SHA512 7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040
 DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9
-EBUILD poppler-0.77.0.ebuild 3515 BLAKE2B 6891a220705d7abde2096ff11b8f66dfee40dff5bb19fa4581ed72473a7476c6356d7c608760565a93c538f41e2447a65d520c2f4487f7a2651e4d700aab5f15 SHA512 70a9b2b6930071532d224eb93560555f4ee47409fa58d2a6282dff648763603575367ce5b80e2402d1a3bba015349936925ae78ef092773251b8c531a777de50
-EBUILD poppler-0.79.0-r1.ebuild 3519 BLAKE2B 5f0d5955e574546abbb15eeb73c3d28325b67bce90b819d2ae114b79d15cc40d544f4c6a73285752b7fcf684c2a4dc9f7a74e5a1ac3514f8cf254abc15d112cf SHA512 485faa57f4a2fb01ce4c792d8ece62cf9cee4355ecdab2b02aa1d067ebe4784d2fe5e33fad8cd8057518107cfefdc8b3748850fef2888a68bb88c17e4a074d9f
-EBUILD poppler-9999.ebuild 3529 BLAKE2B a443f6eea15d1e41eca59f5c9f5433cb6def0b4ebbae5fcfb881157bd4dbbe0d31bfbf6c10e8ccc78553e2a825f5d0615a7bef1b2ca9ca6783d0f019aa2eef87 SHA512 3904299dead5c2666709277469161c4795057b9651c685619cf56ee70d48230a684ded4528a288dffa4df1f4e6145d07c5066808ddc59de2d4e4458b0da0697b
+DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 09a3b10b1ee6a9de900f7a6ca105e98ec266995c3f6a3d56fbefb7b57851462caa4a16a55081efd8b70d02107d8b7a13a74e316d448290bb3b02286c1778ad86 SHA512 0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f
+EBUILD poppler-0.79.0-r1.ebuild 3518 BLAKE2B b1788df48fbc4300fc64ba2ab94bec0f1fd6fcce577ed5180fe2508043834c1894fef44096bb5d30697df5215999ec871798df1d7e936a82f604bbfe46fedece SHA512 9e04527cbacec01d734b737f9ebaa729300c987198a53c69079c198d9ace244f81eb1b6e516ad81e8afaca1ff6d44d8de3df92afc22a684fc6f389de37e5f0de
+EBUILD poppler-0.80.0.ebuild 3506 BLAKE2B ba82b892b343c3acf9029f0cdfe8f6fafa5b25f896a802b214373082295282e577f19ed3eea5a0e55d9fb23cb1a36b09e91b84d9b4e3cb65008858a34c9bec9b SHA512 bdc23a2cd987ae8f0fee3d80931b7f7e9c0a705acb58ea5eadc16c7ebf1276b9b0880130743b4c6e29b8b0acf7c442183a41a45fd626ff8830d9af7c5df5bd48
+EBUILD poppler-9999.ebuild 3506 BLAKE2B ba82b892b343c3acf9029f0cdfe8f6fafa5b25f896a802b214373082295282e577f19ed3eea5a0e55d9fb23cb1a36b09e91b84d9b4e3cb65008858a34c9bec9b SHA512 bdc23a2cd987ae8f0fee3d80931b7f7e9c0a705acb58ea5eadc16c7ebf1276b9b0880130743b4c6e29b8b0acf7c442183a41a45fd626ff8830d9af7c5df5bd48
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch
deleted file mode 100644
index e54f7c6390a9..000000000000
--- a/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/cmake/modules/PopplerMacros.cmake	2018-10-21 18:47:56.000000000 +0200
-+++ b/cmake/modules/PopplerMacros.cmake	2018-11-01 10:43:10.898347039 +0100
-@@ -147,28 +147,6 @@
-   endif(GCC_HAS_AS_NEEDED)
- endif (CMAKE_COMPILER_IS_GNUCXX)
- 
--if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--# set the default compile warnings
--  set(_warn "-Wall -Wextra -Wpedantic")
--  set(_warn "${_warn} -Wno-unused-parameter")
--  set(_warn "${_warn} -Wcast-align")
--  set(_warn "${_warn} -Wformat-security")
--  set(_warn "${_warn} -Wframe-larger-than=65536")
--  set(_warn "${_warn} -Wmissing-format-attribute")
--  set(_warn "${_warn} -Wnon-virtual-dtor")
--  set(_warn "${_warn} -Woverloaded-virtual")
--  set(_warn "${_warn} -Wmissing-declarations")
--  set(_warn "${_warn} -Wundef")
--  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
--
--  # set extra warnings
--  set(_warnx "${_warnx} -Wconversion")
--  set(_warnx "${_warnx} -Wshadow")
--
--  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
--  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--endif()
--
- if(CMAKE_C_COMPILER MATCHES "icc")
-   set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
diff --git a/app-text/poppler/poppler-0.77.0.ebuild b/app-text/poppler/poppler-0.77.0.ebuild
deleted file mode 100644
index 4052e96324c6..000000000000
--- a/app-text/poppler/poppler-0.77.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/88"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-DEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-
-DOCS=( AUTHORS NEWS README README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.71.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-
-	# we need to up the C++ version, bug #622526, #643278
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DSPLASH_CMYK=OFF
-		-DUSE_FIXEDPOINT=OFF
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.79.0-r1.ebuild b/app-text/poppler/poppler-0.79.0-r1.ebuild
index e13bc99957e5..caa27e2a577d 100644
--- a/app-text/poppler/poppler-0.79.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.79.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~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/89"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-0.80.0.ebuild b/app-text/poppler/poppler-0.80.0.ebuild
new file mode 100644
index 000000000000..e11942716aad
--- /dev/null
+++ b/app-text/poppler/poppler-0.80.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/90"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.78.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	# we need to up the C++ version, bug #622526, #643278
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DSPLASH_CMYK=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 44c544ebd76d..e11942716aad 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -95,7 +95,6 @@ src_configure() {
 		-DENABLE_ZLIB_UNCOMPRESS=OFF
 		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
 		-DSPLASH_CMYK=OFF
-		-DUSE_FIXEDPOINT=OFF
 		-DUSE_FLOAT=OFF
 		-DWITH_Cairo=$(usex cairo)
 		-DENABLE_LIBCURL=$(usex curl)
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index bacb2febb2fb..b9948d7a1561 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,13 +1,13 @@
 DIST qpdf-7.0.0.tar.gz 7053781 BLAKE2B 1abd54a3cdc24c3e56ac81cabaa56be8d2217961abfc026cbd0c0141aea3efb6c75b9daf2fe9f6fc0f09efd224d241fa859bd37bcd972df4e4837318497d774e SHA512 7b52d67b4d2c428a7b0c1cd03b03a23f05d38d7e3c81041079a137919019ea5158f12bf95fdcfcff6b43ffdefe93a85127ced2a363a6b4b380cbaa02a3840256
 DIST qpdf-7.1.1.tar.gz 7099282 BLAKE2B 9658dd1cc6f8d0e3dd13137db147e0f954f747b5bb6b1577f70a236b1f67c5513713889dca77181a9b25f1a2054a8ec5cbfda60866e97b2d43e60b494752c9fd SHA512 a75f988c7dd7ac174bdc981cd3696ca8b539ac6c581e3afecf601dc67277014cb4fe3f0e5cb75a67412cafa4eb645b2fc2d8a0ec203834464baf0c7e80baa0b4
 DIST qpdf-8.2.1.tar.gz 8256216 BLAKE2B 67e9b897ed938b9dd2e8508efaddd4dd6f63568aa23332ef72918a0888cc1e1b8fe844f0c1424b8ab568ee5ce42f8efd04293cd525e9d8de0c5fe7b352f49367 SHA512 ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c
-DIST qpdf-8.4.0.tar.gz 16981811 BLAKE2B ac0f7b6ab0ca5b421229bf3813cba6b59cc5b7472080246b1384db468e14a4e634f00e1e9e9347e2f8ac8d7e5c15c1b1c18e954f4249298e5ee4778f996fc4ee SHA512 13225c6285311e8fe89970971b082b9613e70d474ee71dd5572f1ae268234d366c2c9c7bf427c4758a746a1a27ecc0127d31044ab501dbc08885c8aa0a514028
 DIST qpdf-8.4.1.tar.gz 16990752 BLAKE2B 6e7ccd212cf8d01aea3dc615f5924c0575392f19cdd20b35327a71bd1f97d7e515fe1a73cd2e3901964f621cafa19ab07a1314af19f40ded28d3e9f683c02ab0 SHA512 d5ac3376345650f05278f8b4d99182cd58b927537085a4a6415d3df0b80b7ddd80a7c33778ec8c3b85d9788ea081ea3266bd4a9315eda9820988e9e54a22f80d
 DIST qpdf-8.4.2.tar.gz 16988263 BLAKE2B 358836310575fd0f454d4504a70796b72d2e3120c5820e2c33e84ea79c5c115d1c84f8d58392d870b5357407d0fbed05028bd854d164be0b32b348c587845300 SHA512 9cde046fb5e42dc331933294155583fb20408704a0cab3075cc3e97bd4643e3178e4162b8de7434aa2304097e7734f985fdc8e7b05cc028c37193dce91797f7a
+DIST qpdf-9.0.0.tar.gz 18172400 BLAKE2B 90b59d54dd87378ccc766f19bc142950f435e4314594fd78923f1c9099393a1b141bf7772f507df7553d9f4afbbe49414c75c0276296481c65017a48d3a5ff01 SHA512 bb20eaf4a12f33ad2ca6933a21123cdfd7d6031da472a881f8c60979881c19bc363db585c2be0635081c7380f0f0819921af7c3a4847de57505013c6e3959ea0
 EBUILD qpdf-7.0.0.ebuild 1234 BLAKE2B 303e3943f8429ab560cfef1d62b1c35f2dbec6c2e27fd6436fd8cba9eec5d8247bf4df27b2093f5a5936295452c171b81a7e07f3b888b98fff428ad7b566d109 SHA512 bc0f824517bf3d7837243162e11cd7a1b973fc27f984f2486cfea23047a7df185f5d4adcdbc82fa7c7b39a9aa6a31c80624e76fb5bda9d92aa2bff4dc457efb1
 EBUILD qpdf-7.1.1.ebuild 1243 BLAKE2B 99023977c552d4fb2b6d2177f60664d01867a5f5309a79c9e192ac4b8f6c6394649f2bc58717114bcbce15c91031ad00dac38364353c1121901722b7f4240b6a SHA512 5f9e78903502e37430b8b2dda10507fb5527b47dd76aaa1afd56dbf3453ed5a209720c0bed72e0f5c2a8aa055b27403c340b1eeb8c870274e450b9bb055e347c
-EBUILD qpdf-8.2.1.ebuild 1275 BLAKE2B 2bb7075e2ce800f0f51dd17e1f125f0100c4a87934acde7a03c2c15adfe95bacf591d31ac154adc08ae3443943cb810da9499755f1ebba6e9dca5675a740c69d SHA512 db1f34f130aee615acbf033c319911f8011dcfac5b653fbdd111168b32c184a2b481ff9e6bbae9934693a8370f2e77574a8b64a087ea0c0630f2b82f061681c5
-EBUILD qpdf-8.4.0.ebuild 1278 BLAKE2B e32c28130f8b8e90cb022fcf78fbbd4f07b94455557f41b74c6645113d89ac2f33ff7c277d89e5dc16bd3b5e0b2502aa35f99c5e74804a3422a5e9c8848aa8f9 SHA512 c589c5ca6d96c9e5b48c62e5f1bac9ca26025c6a97925443805c64d51f0267a8b05497531fe55f2c352eae14f0349bffbe275fc79cd7ee672b5e54db7776ef5a
+EBUILD qpdf-8.2.1.ebuild 1268 BLAKE2B c62c4bdf99ebd71593689e7918d57cba7031d2c0d4d17e5eda23bdd147c7cac7b955e1ad258f6542e3522c598bd893e1334f3878401aa71c94c5aff34659e4ff SHA512 3a4f44293fd6c5e9319d198007795aef5a254cbe06f28e887c4d5efa4aa1f0854d5751c94af3250d7057d2693892930c723e6b43405d4234eaac6e3f7f525efb
 EBUILD qpdf-8.4.1.ebuild 1277 BLAKE2B a7a4b94e2fe88c4a4a10e82bcb85673b1425b56c76347e21101a0f0e94f92c4e7304d110ab003b731a8315b618dd35c071e102f486b726f30899d6081807bab6 SHA512 771c029e75a25d1d7c2ea14f9bbc364051a9419f513e070f7ba548b675d1e11dd4198d6dbd853de88b603d3183af8c65ced0c33498dd2df11c43be1229feb529
 EBUILD qpdf-8.4.2.ebuild 1278 BLAKE2B e32c28130f8b8e90cb022fcf78fbbd4f07b94455557f41b74c6645113d89ac2f33ff7c277d89e5dc16bd3b5e0b2502aa35f99c5e74804a3422a5e9c8848aa8f9 SHA512 c589c5ca6d96c9e5b48c62e5f1bac9ca26025c6a97925443805c64d51f0267a8b05497531fe55f2c352eae14f0349bffbe275fc79cd7ee672b5e54db7776ef5a
+EBUILD qpdf-9.0.0.ebuild 1278 BLAKE2B 8ea12d44646d8c4835b4576c118708b15ba31e3d8296aa94ba6c3421a0e7e4c063dd597d1758f242a5e6ed9677b02089eacfac454d728d75f2ad8c2f97cb9b2e SHA512 377db56c3e509884111642b0f379a4c3d965caa50db1b242173c63970d716376931440145c6e992da3f6277ee98bf6032aa1efadfd402f47a32502f9663b1b3b
 MISC metadata.xml 438 BLAKE2B ccb3c4e7dace8650c11418fecc8c5fdd7062692f83c99f60d3b73fd698f1fea19dd429a92014267388d04ea57e00652499768c88aaffd7e0e3f66e53c84f6449 SHA512 4c1aa514207b18e7b4de0585545d1c7b5def7f42be9d43726801f9a9ae7b129b91802dedf4e3eb9f2595a26e3863918c029b927ab42b6aab7ab0130c000ff843
diff --git a/app-text/qpdf/qpdf-8.2.1.ebuild b/app-text/qpdf/qpdf-8.2.1.ebuild
index c65bd546a027..9745f21e963d 100644
--- a/app-text/qpdf/qpdf-8.2.1.ebuild
+++ b/app-text/qpdf/qpdf-8.2.1.ebuild
@@ -45,13 +45,13 @@ src_install() {
 	default
 
 	if ! use perl ; then
-		rm "${ED%/}"/usr/bin/fix-qdf || die
-		rm "${ED%/}"/usr/share/man/man1/fix-qdf.1 || die
+		rm "${ED}"/usr/bin/fix-qdf || die
+		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
 	fi
 
 	if use examples ; then
 		dobin examples/build/.libs/*
 	fi
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/qpdf/qpdf-8.4.0.ebuild b/app-text/qpdf/qpdf-8.4.0.ebuild
deleted file mode 100644
index 320e39eb2a68..000000000000
--- a/app-text/qpdf/qpdf-8.4.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/21"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-CDEPEND="
-	sys-libs/zlib
-	virtual/jpeg:0=
-"
-DEPEND="${CDEPEND}
-	test? (
-		sys-apps/diffutils
-		media-libs/tiff
-		app-text/ghostscript-gpl[tiff]
-	)
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
-	perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable test test-compare-images)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/fix-qdf || die
-		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
-	fi
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-9.0.0.ebuild b/app-text/qpdf/qpdf-9.0.0.ebuild
new file mode 100644
index 000000000000..c4633b3c6952
--- /dev/null
+++ b/app-text/qpdf/qpdf-9.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+
+# subslot = libqpdf soname version
+SLOT="0/26"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples perl static-libs test"
+
+CDEPEND="
+	sys-libs/zlib
+	virtual/jpeg:0=
+"
+DEPEND="${CDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl[tiff]
+	)
+"
+# Only need perl for the installed tools.
+RDEPEND="${CDEPEND}
+	perl? ( >=dev-lang/perl-5.8 )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable test test-compare-images)
+	)
+	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/fix-qdf || die
+		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
+	fi
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index b70016d897b9..623752853e7d 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,8 +1,8 @@
 AUX recode-3.6-as-if.patch 472 BLAKE2B b42518eea02219eae014faea4eea71e475b778de61c8645e21d86fd97bcae8f86accd5063370fdec40054263ede74842491841db48688c85d1796c93c311eff1 SHA512 5209779be9d03b770f679c2be736bc68a710e1c064b1f4a2fbb9963a8ca59a258a22b5d34ed6ac19e7a40ca83c64995f37aa9f466e49841ba2662b89d0789763
 AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8c5b6b72bc46f43ed14d658396c977053aad83df25a666739e8a431a512ffe4f7d6da9a36b0a5eb90d1c634c8380 SHA512 71408313ed269aeb8b015c171a6d16663e2bc7a3fe5ad4e0dc16ae0ec0e1f769605d92d7e32aec908a42a5ee148cd1f00ad2c069e947c0c4f64fb3b9f7dfb1b3
 DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
-DIST recode-3.7_pre20140303.zip 1902903 BLAKE2B fb85ef7710b6b4ad1bfe34f066d8a51252c40fbc4f958940eaaba142ad51982c8ee3d2da97d52a1e40e23617bbcf6450c9b45be99067efee7c1149735ea81cb6 SHA512 256d79d6f9de18bbf53cb322f0467411ef2ff8e4f242d073d7302fbd05e4942373023514d0a88e33701280c1cb4e0235d76efb9220729cd1f91f9ad8fd2407de
+DIST recode-3.7_pre20140303.tar.gz 1580388 BLAKE2B 8fb280368e6998c8cb4554f856dd779e70fd53958bf6da5839735e14e741f45b110ac106494703d97ac3390f41736b2d94539dfde4554b3ca70911788ce8c005 SHA512 a1821909e7ba68a315bbd5e0dcaf0a574f09ac6ef1ccf8858aeda1a0affc09cb70353b4bda005a14cff37ef41646a6f5246c5b5a0f6e89db2065eac7ace9b030
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
 EBUILD recode-3.6_p20-r1.ebuild 1666 BLAKE2B 4d47ac76ad8a1a57bf31c313b345158d7a36995a5b7478cd6a698aed49ba43a0d9e9f29c9813aee1b602cea80f5a8e3a98789a2cea930a7687fbd3ccd096764b SHA512 e934997a54c90398769ea35803a4008bfeca5ba69cf7c20b9001cd49f4f342648f66185e6fa0df3a59598408d233860f5effbe08bcc6c077d372ca32f7e1d294
-EBUILD recode-3.7_pre20140303.ebuild 1114 BLAKE2B 04c89e3e73d3cf4cd961d4e024d0e141898bd037402d563871981afb2536bdde7faff2cbe32895f145131c47c750faa741b39d8b67a1eaa653ff1513580a067f SHA512 24e1156be1209ccd38cda16c665007203afb5effe7934652d48832afcbe8319aeb88bd337cded810fe2650c38ae20468fce23983ddbe5ca50e565af51265668c
+EBUILD recode-3.7_pre20140303.ebuild 1117 BLAKE2B b745a5946e221ca9790e5521d86cc0f81096daa87e9a55dc88900bcedd058644cc2c85181b2f5cf532964edcfcc24acffa3e0b0d36f80868d7ea5d42b55041ea SHA512 c281d27e012193976989ae044744584ee5be47799542e9ee53c882550a2fec0f9bfbf8c5daef75cc212001e6e1d23be342a1b3ea4bbc4e16e55c95dfa9161ff6
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/recode/recode-3.7_pre20140303.ebuild b/app-text/recode/recode-3.7_pre20140303.ebuild
index a6c2e5b129fe..252872bba7df 100644
--- a/app-text/recode/recode-3.7_pre20140303.ebuild
+++ b/app-text/recode/recode-3.7_pre20140303.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,7 +8,7 @@ inherit flag-o-matic libtool toolchain-funcs
 DESCRIPTION="Convert files between various character sets"
 HOMEPAGE="https://github.com/rrthomas/recode"
 REV="2d7092a9999194fc0e9449717a8048c8d8e26c18"
-SRC_URI="https://github.com/pinard/Recode/archive/${REV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/pinard/Recode/archive/${REV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/restview/Manifest b/app-text/restview/Manifest
index 5c0a5601ce4b..a06b89c20670 100644
--- a/app-text/restview/Manifest
+++ b/app-text/restview/Manifest
@@ -1,7 +1,5 @@
-DIST restview-2.7.0.tar.gz 29448 BLAKE2B 0cf90599fb9b5c98e674f690ce3082f61f6ab83c46ae90934bafe5d9b62eff70f943a18aef91cfb61e234e04a4fb12d39c2e3a01faec688574ecf6c2d0b22f89 SHA512 fccfed505832b85bd4fad964f78b0de371ea0a42ac5cc700a8604e413743a236b70f0160edc115d1e9cdef03f2aa7fc461893f40e01203a048756887f655f65c
-DIST restview-2.8.0.tar.gz 44577 BLAKE2B 03fb6d6200b9b9c82abd2fc5f81cf7afd2ade0067b0e657b7d19a3abd12d72046633217ef57143f3f45c8360721acc65d499cc8c9bd31a461318699368ff7d7f SHA512 99bee763493d2a5fdf17b228c62eb9fe6adfbb6e0f3e09c758ceaeabc6dece892dbd750d043d722c6df456b27bdeeecfe1cf4187a53c2a0333a05b1e147e71b5
 DIST restview-2.8.1.tar.gz 46103 BLAKE2B 3f5b8852b1d174736333461181e9cad06c16ea8ac40e5041c5bf8246360e161609d99ac26a7a32f1dec518c017a30ecf1ac46eea80569b0d213ae62bee8ecc5d SHA512 cbc6057df06a108ced9bfbc7442730c8bbe3bbe334eb6f708dd54e899ed6630bfb05e532c403a9a1a36b170dbe933a5829ada3b014147a3834c492456ca65363
-EBUILD restview-2.7.0.ebuild 715 BLAKE2B b1050004fc5b21c395fe9376cf82e21fbe399350778b82f41a10381645199f50814e02b3de6d1711753e672b70a6ecbb3bbd4097323308c1055c1b1b8997a029 SHA512 ce89ae3d297d7cc6dc53b7ade6462c195cda6eff14c96f512d6c265d1bd168d907cab3311e1193aad212214f589086f026f5248f0d163affcc6dc06b44b270e1
-EBUILD restview-2.8.0.ebuild 715 BLAKE2B b1050004fc5b21c395fe9376cf82e21fbe399350778b82f41a10381645199f50814e02b3de6d1711753e672b70a6ecbb3bbd4097323308c1055c1b1b8997a029 SHA512 ce89ae3d297d7cc6dc53b7ade6462c195cda6eff14c96f512d6c265d1bd168d907cab3311e1193aad212214f589086f026f5248f0d163affcc6dc06b44b270e1
+DIST restview-2.9.2.tar.gz 47181 BLAKE2B 6812e39eb2f830cedacc359fe24988191fc6c7b46b4ddc7005e6e6ee3e52d6998b4b99687892842710154eb2bceb22dc161986f0c8f5f0d1910733226084b0b2 SHA512 4b8627248097368a06fba5dba8994d349b96e605ebde0965a9100c213d9c8bb9320e6ff33a93ce40d80a6b5f3150e4094e2824b5ef5b4757d1e3bd39399a8e0c
 EBUILD restview-2.8.1.ebuild 715 BLAKE2B b1050004fc5b21c395fe9376cf82e21fbe399350778b82f41a10381645199f50814e02b3de6d1711753e672b70a6ecbb3bbd4097323308c1055c1b1b8997a029 SHA512 ce89ae3d297d7cc6dc53b7ade6462c195cda6eff14c96f512d6c265d1bd168d907cab3311e1193aad212214f589086f026f5248f0d163affcc6dc06b44b270e1
+EBUILD restview-2.9.2.ebuild 748 BLAKE2B 89961f83baa7c8f1089741791f0626d258c3bd5b5aa5cc735beed8a7cbf195b17eff4c261f64f076ff1af58acdc5a3e2af66994574548b5510ae2cd64217445d SHA512 b3c15b7fe9d97177eaa3524d75881aefe41fff7cdaf912ba739b1d3f9ce3f649565ba789637f06f40356d6a1a1d8ab9846be3089b4c89d680d27aa876bc8a290
 MISC metadata.xml 327 BLAKE2B c839b763e0975489978f878c5ae32c89e3596cf5cdb2061cbada9a698b7985779abf6645b50f772d5924fcca664766cc31b186c9bf4fba9e76cd099c6559e78e SHA512 f4fcd47d4f411bbae5e9a29055a34a0e4a0367750ac10ce57bec7d4c32dbce43679e041b444eab258e616b571936de251fa22fd06aa8e3258cc2c882f913d3b9
diff --git a/app-text/restview/restview-2.7.0.ebuild b/app-text/restview/restview-2.7.0.ebuild
deleted file mode 100644
index b7a7637a5e31..000000000000
--- a/app-text/restview/restview-2.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="reStructuredText viewer"
-HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/readme_renderer[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst CHANGES.rst )
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-text/restview/restview-2.8.0.ebuild b/app-text/restview/restview-2.8.0.ebuild
deleted file mode 100644
index b7a7637a5e31..000000000000
--- a/app-text/restview/restview-2.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="reStructuredText viewer"
-HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/readme_renderer[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst CHANGES.rst )
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-text/restview/restview-2.9.2.ebuild b/app-text/restview/restview-2.9.2.ebuild
new file mode 100644
index 000000000000..01d1f9c130b6
--- /dev/null
+++ b/app-text/restview/restview-2.9.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="reStructuredText viewer"
+HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/readme_renderer[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst CHANGES.rst )
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 18c1e040165d..d31afa862d82 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,8 +1,7 @@
-AUX sigil-0.9.8-proper-gumbo-install.patch 1351 BLAKE2B d24d6e0be9b7c56c944aad2d97528ef38b3f96b4d81504b1169095112cc939a662101754ccc9f4d8e9303cd0e9d2ad084e8c86c32d73d43720d1a1736ec572d3 SHA512 743250a34b257ca7619b53f4373efed48867f9a059db378ee3d8192e4cc73861ba8eb490b7a72a96ee923b034922eb0224a0ef963d455bdbc1cf6f4425881f89
 DIST Sigil-0.9.13.tar.gz 18235134 BLAKE2B 4afe0f0258a8c1056029534ec696372e40343b9a398b612ee32fe95a3d417594bcc6782a4e6447323d67e84db5193756ff7c8756e160c432678ebc59ddeab706 SHA512 cafc6b075827239b73e80d3efa02e4e77d5903fed1faf8b600f70b178fb0c248c38d43e115f249124859edc12ddd8caf199ef0b0d05f20852eb060b27e5a3578
-DIST Sigil-0.9.8-Code.zip 19807795 BLAKE2B 002626842b2619b94889780a66e4de1f6d6fc9f07e36069608d2edae1078516d7c0fbedad6d4966f2cff64ccd21730719a04c144b3c3c1740ad727448aff8af2 SHA512 18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00
 DIST sigil-0.9.16.tar.gz 21241424 BLAKE2B 1e784768cfe98e08ac01f5a9c11ec8254f9a0211f69ee1eb479643cc83677f6fea43745bcb158ea178ac64eec87c2e0062e783af2fe7477e2e5e8faf4db24c46 SHA512 45358912527484a7c580db34733d30927938443096fbf23e969d966e140a20607a4d98e086149a5eeb620f2462efc9abd531988c1b5cd93c373e747d5e5cd20a
+DIST sigil-0.9.18.tar.gz 21396185 BLAKE2B a20a1465032371f9d7e567fff03c859adf4bd2264e9d803efeb3bdeb3b097eca826daa36824370848aea50fffb2b2b74b28568f7dca926565dfd0948d7ade030 SHA512 a8f669ffb76554268aae8aa0f85c6861f80def71e429b44b20ac9b231f3f7584839a82e7b6991f57ca1f2d1f023e24d1f37897bd048379e30565e9bdd7ee188a
 EBUILD sigil-0.9.13.ebuild 2527 BLAKE2B f48d3ad43514ad147011b2902e9dec7d4ca35e8f58100cd6ed4e0ce640d9a3f321ccd1c996cb5e88c861ee273c09dd384c95f1136be5604361d1dc7f5044ca0e SHA512 a6b0a5e912f90617f23abdd36b6173e8cc8287f0dc0b2d8052069f656c042dc3d132c7a0b6035c8bc899c6a8defa13f8d6caf08c55793661e5d0e8ef34d0fcdf
-EBUILD sigil-0.9.16.ebuild 2877 BLAKE2B cf884cab1b1b41c4b8ca7b95c8de4db846aaab774a741d8dc51babeff1513db3fa9354f2fb162d7010afac2e93b578603bd8eca86f2811d26ece7e4cf51f518f SHA512 080f1efaf317e4b872bc153d1e78ae793a07400b726977af985c8e73917e887097235c0960be93c9ec9facb92a8c53cf193369e884f765640b70f62b256f5979
-EBUILD sigil-0.9.8.ebuild 2234 BLAKE2B 81dbc8905e5e4d96f7a423a64a66fa2f5a1ad501a7f8e8ae4049bbf43cbac8366c7fe388da1a9ba9a2f4aaca92b7df9fe585443276f283f80a305eead2797db0 SHA512 834be1bffdd30059bd224d8b0ea0d4b5efa8286f934042183e305ba793b3b25bca01a807ce1c3de9c011d4c335a5362bcfd6cc20694a83f4f9142f65f91286c9
+EBUILD sigil-0.9.16.ebuild 2875 BLAKE2B 431939484d3124f69512bebc5bfcdf40cc5c6cc3a4fb9c4456b99fe5151579928f675a7cc2c3d3026212b36b49ad6f3e0f236eac25edb4ed68e9db90d665b350 SHA512 6aceb1ac42f5b6e7f0413337c1ec4c79748f6b8654fff933bdd93b98c5c574e6ab4dba700d80ea102e834ba518f8846848aba7c1d4eedc6ecf932db39cc051ce
+EBUILD sigil-0.9.18.ebuild 2693 BLAKE2B 531b36defdc189bd33c1c3cf15c55093518894a791af9daa89acf7438e083ddca07fa09302a28de452cbd0a7e77f5080fdccd2c9ff66efb46e86b973ef66eacb SHA512 97b853181a212d9be386cc9a769a492fdb10ad7edcbd15cf1e4621ad00a77c7c491e23654c1271f91bb8ed880f8eaeb20a0bde4065167762cf35e045a959435c
 MISC metadata.xml 1073 BLAKE2B 5428bda0e56ccfc8a4f5c7df773698fa62e0309daa5cb970df9fe3381a7a45c920a854e793b92a2d7e91c66698ddd40f2cf89001e85d0bdfbf521af9fe8ea4a8 SHA512 cdfca84a4cd89a3d4d8d6d79b7eb6432d51019b3ac2c8f59f09262c7cf52c990886e299557bcf10f698ec84e8c3c4f46da19bd9dc298d7011aaf4e52b9e0b35b
diff --git a/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch b/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
deleted file mode 100644
index 375f2e0ab6ca..000000000000
--- a/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/CMakeLists.txt	2017-10-17 14:22:57.780297490 +0200
-+++ b/src/CMakeLists.txt	2017-10-17 14:24:21.754150453 +0200
-@@ -962,12 +962,8 @@
-     endif()
- 
-     # Standard Linux 'make install'
--    install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-+    install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
-     install( PROGRAMS ${LINUX_LAUNCH_INSTALL_SCRIPT_CONFIGURED} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ RENAME ${PROJECT_NAME} )
--    if( NOT USE_SYSTEM_LIBS OR NOT HUNSPELL_FOUND )
--        install( PROGRAMS ${HUNSPELL_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
--    endif()
--    install( PROGRAMS ${GUMBO_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-     if( BUILD_PATCHED_LIBXML2 )
-         install( PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libsigilxml2.so.2.9.4 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-         install( FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libxml2.so.2 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
---- a/internal/gumbo/CMakeLists.txt	2017-10-17 14:25:02.539107666 +0200
-+++ b/internal/gumbo/CMakeLists.txt	2017-10-17 14:25:27.985457056 +0200
-@@ -40,4 +40,5 @@
- 
- if( UNIX AND NOT APPLE )
- 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" )
-+	install( TARGETS sigilgumbo DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
- endif()
diff --git a/app-text/sigil/sigil-0.9.16.ebuild b/app-text/sigil/sigil-0.9.16.ebuild
index 2faaf3abb786..f2afdb994b88 100644
--- a/app-text/sigil/sigil-0.9.16.ebuild
+++ b/app-text/sigil/sigil-0.9.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+plugins system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/sigil/sigil-0.9.18.ebuild b/app-text/sigil/sigil-0.9.18.ebuild
new file mode 100644
index 000000000000..f7af56a5f6f3
--- /dev/null
+++ b/app-text/sigil/sigil-0.9.18.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="tk"
+
+inherit cmake-utils python-single-r1 readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
+SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins system-mathjax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/hunspell:=
+	dev-libs/boost:=[threads]
+	dev-libs/libpcre:3=[pcre16]
+	dev-libs/xerces-c[icu]
+	dev-python/css-parser[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-qt/qtconcurrent-5.12:5
+	>=dev-qt/qtcore-5.12:5
+	>=dev-qt/qtgui-5.12:5
+	>=dev-qt/qtprintsupport-5.12:5
+	>=dev-qt/qtwebengine-5.12:5[widgets]
+	>=dev-qt/qtwidgets-5.12:5
+	sys-libs/zlib[minizip]
+	plugins? (
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/cssutils[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+	)
+	system-mathjax? ( dev-libs/mathjax )
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/Sigil-${PV}"
+
+DOCS=( ChangeLog.txt README.md )
+
+DOC_CONTENTS="From Sigil's release notes:
+When you fire up Sigil for the very first time:
+navigate to the new General Preferences and select the default
+epub version you plan to work with (epub2 or epub3) so that new
+empty ebooks start with the correct code.
+if you plan to work with epub3 epubs, you should change your
+PreserveEntities setting to use ONLY NUMERIC entities.
+
+For example use & # 1 6 0 ; for non-breaking spaces and etc.
+
+We strongly recommend enabling Mend On Open in your settings
+for best performance with Sigil."
+
+src_configure() {
+	python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
+	local mycmakeargs=(
+		-DINSTALL_BUNDLED_DICTS=0
+		-DUSE_SYSTEM_LIBS=1
+		-DSYSTEM_LIBS_REQUIRED=1
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
+		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
+	)
+	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${ED}"/usr/share/sigil/
+	python_optimize "${ED}"/usr/share/sigil/
+	DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/sigil/sigil-0.9.8.ebuild b/app-text/sigil/sigil-0.9.8.ebuild
deleted file mode 100644
index fbd390f249ce..000000000000
--- a/app-text/sigil/sigil-0.9.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit cmake-utils python-single-r1
-
-my_pn="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell
-	dev-libs/boost[threads]
-	dev-libs/libpcre[pcre16]
-	dev-libs/xerces-c[icu]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/cssutils[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-qt/qtconcurrent-5.4:5
-	>=dev-qt/qtcore-5.4:5
-	>=dev-qt/qtgui-5.4:5
-	>=dev-qt/qtprintsupport-5.4:5
-	>=dev-qt/qtwebkit-5.4:5
-	>=dev-qt/qtwidgets-5.4:5
-	>=dev-qt/qtxmlpatterns-5.4:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.8
-	virtual/pkgconfig
-	>=dev-qt/linguist-tools-5.4:5
-	app-arch/unzip
-"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
-	"${FILESDIR}"/${PN}-0.9.8-proper-gumbo-install.patch
-)
-DOCS=( ChangeLog.txt README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DLIBDIR="$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "From Sigil's release notes:"
-	elog "When you fire up Sigil for the very first time:"
-	elog "navigate to the new General Preferences and select the default"
-	elog "epub version you plan to work with (epub 2 or epub3) so that new"
-	elog "empty ebooks start with the correct code."
-	elog "if you plan to work with epub3 epubs, you should change your"
-	elog "PreserveEntities setting to use ONLY NUMERIC entities."
-	elog ""
-	elog "For example use & # 1 6 0 ; for non-breaking spaces and etc."
-	elog ""
-	elog "We strongly recommend enabling Mend On Open in your settings"
-	elog "for best performance with Sigil."
-}
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 8d42914c2c44..1f1b8bd3b098 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -145,6 +145,7 @@ DIST vie.traineddata-4.00 12209616 BLAKE2B cd1eb9de7a319240b5279f7a7190244fa0c4c
 EBUILD tesseract-3.05.01.ebuild 5835 BLAKE2B 8f81fd6853978106759c00b951ce428992566c68915dfd0ec5e826fd4b68d632f5fc0e76b2414cede74398ccae61258e9e9e30d832e85e9e4996559d9c9aa5a4 SHA512 f216c6b491698dc1edb47e53ebe9e2971e2c7d2acf2a02cf6c05aa6e1436eb225ae85610f1d01e746dc972fcc24d17d293a7bd3645a605ed72891de7a58e4134
 EBUILD tesseract-3.05.02.ebuild 5835 BLAKE2B 8f81fd6853978106759c00b951ce428992566c68915dfd0ec5e826fd4b68d632f5fc0e76b2414cede74398ccae61258e9e9e30d832e85e9e4996559d9c9aa5a4 SHA512 f216c6b491698dc1edb47e53ebe9e2971e2c7d2acf2a02cf6c05aa6e1436eb225ae85610f1d01e746dc972fcc24d17d293a7bd3645a605ed72891de7a58e4134
 EBUILD tesseract-4.0.0.ebuild 3658 BLAKE2B d06d2635968b2b7d68a1dbcacffffbaf941722bbad81d12e1adf37993245964d5022aacb88fb40c9c1a8a35435cd8bf0baefb0ccc482c247a542e6c532c0d16a SHA512 fdb8e1b4a4f3280d3dd808ed630f229d5af276a4e035d1f7150bb2a8d2e8f60d0c2e44839c06f8bf1c0479b1ee20c52dc997a9369493832cd565c7bff4e1484b
+EBUILD tesseract-4.1.0-r1.ebuild 2058 BLAKE2B 3751e2c6e91b98a19d1685b18dbf8eb3efbb199c7188c8004928895abc367f7a9ea5e60117a6d0d9294d5b16181a1b13531884e195bdfd7262134ef7c4b7af5a SHA512 af6a73442d988fbfe3aa70bc5dd232d88424665bc69b0621295247f07667eeeb11fec1c3e1cda11dd7912d45ce095bbdb025e554d0f17b92d80b8a0baadcd11e
 EBUILD tesseract-4.1.0.ebuild 1752 BLAKE2B 3585fbdec92bcc4ee4f8826a851b9c58cf03bbc8624c0af82528ba2f9cb900305d9816f3daf08a5343a3dd1623882ba34402b967843a84d0dc5f3f90055237bc SHA512 da8401d6628b45cf9e89c3d4703f53441b0ef789db81d841d3b657a3bc883b5622dfe651fe1827dd4530715858458d68694d2ef3fcaa241c3390c5469181d6f8
 EBUILD tesseract-9999.ebuild 3544 BLAKE2B 3747649a31c9cc8d4d83aa1c9d2f47e5ebfaea45488373a1712ced42dcefd0beca400aae8b25db9c59fb4ded3b19c5e978adc365f90c162c3361aad8cb8c9cf2 SHA512 6926f550e5d0a68af8d941c4b9d1e0e54ca8d22a1a4e60d9f5ffa3159f399f5a69bdb2180da9b0fddb1416da5ae195eb2926d772233e9c759462876eb1730366
 MISC metadata.xml 1144 BLAKE2B 1b9ecd743c9a6b016ae04ea28b8bc2f80f6192c8c52d9d7e165cb8a2f222cc08408c97b0e01cebd4840b46cf0f046b2a7511b56c8f14b1a6434fea6e1149a48f SHA512 a86b76ef0f4bdf4339df2d061d1ef4c4fa80b60bc1d748a8c8c06023a9a5bc025bd14ee2d5e06f25706fc8055d8722cef41048e39908fc3771ec5ddd314eea4e
diff --git a/app-text/tesseract/tesseract-4.1.0-r1.ebuild b/app-text/tesseract/tesseract-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..7313d345c7a4
--- /dev/null
+++ b/app-text/tesseract/tesseract-4.1.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal toolchain-funcs
+
+DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
+
+COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
+	opencl? (
+		virtual/opencl[${MULTILIB_USEDEP}]
+		media-libs/tiff:0=[${MULTILIB_USEDEP}]
+		media-libs/leptonica:=[tiff]
+	)
+	training? (
+		dev-libs/icu:=
+		x11-libs/pango:=
+		x11-libs/cairo:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		>=app-text/tessdata_fast-4.0.0
+		>=app-text/tessdata_best-4.0.0
+		>=app-text/tessdata_legacy-4.0.0
+	)"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( app-doc/doxygen )"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# scrollview disabled for now, see bug #686944
+	local myeconfargs=(
+		--enable-shared
+		--disable-graphics
+		$(use_enable opencl)
+		$(use_enable openmp)
+		$(use_enable static-libs static)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+	if multilib_is_native_abi; then
+		use doc && emake doc
+		use training && emake training
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
+		if use doc; then
+			HTML_DOCS=( doc/html/. )
+		fi
+		einstalldocs
+
+		if use training; then
+			emake DESTDIR="${D}" training-install
+		fi
+	fi
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/tokyodystopia/Manifest b/app-text/tokyodystopia/Manifest
index 1fb936baf455..aa8295177bf2 100644
--- a/app-text/tokyodystopia/Manifest
+++ b/app-text/tokyodystopia/Manifest
@@ -2,5 +2,5 @@ AUX fix_ldconfig.patch 439 BLAKE2B fa9c4b1cf06b2ea8e0a2ff6546e09040e92718558e824
 AUX fix_rpath.patch 2631 BLAKE2B abc4903f98c2399f9514322cc93e9ead3452f09fd5fc88f8ac096613ed676eec517f9eb3fd3412f438a047e9c0305535589bb8ef263f55721dc02c503cfeb87f SHA512 cc4a357c5dbdc95e0b557e2a9578b5e4c6595b19c9b8c061b9882f77f25a5f2b710c1fc83aed1bb1ec8df6ca22ab20b822f1d134743c7ccdd94f68a30bc199b1
 AUX remove_docinst.patch 456 BLAKE2B 768890c4f85a391eac2e436db6b457042a8bf6b28c1c370d19be67a85c194b5a4be06b1f5f1541ad0552228145c7e44587c9c39fa553a5866d8886220e8d2847 SHA512 cb052f09c37e0b84e9e236cf7722974b29e0a2d537bd1268cbb8de0db9ba35292836c82b1d21b35f04b753d58c908f32bb42ceeaba03ae086888aeb278dd6a29
 DIST tokyodystopia-0.9.15.tar.gz 158522 BLAKE2B 624efe5ab587b8fcb63c6365862851ec8f3e596a9d75b48a273e008fadc0919004c6163ca54600b741289ed9f16f9e6d003766a4562f3df6214d48e3ff647ada SHA512 14e956ea6d84c3e00f1af5b8fd7e7ded8e886d585d80f492119521594826e21dd556b875b9552203c9d2f9e2830b15078d635a62975162436a7c2a13387086dd
-EBUILD tokyodystopia-0.9.15.ebuild 717 BLAKE2B d2befe1f9e6d98daaa80228b7b4665dce7f1ce43abda0ade364d668d0de5a7b90ef65d31c160762826bc51a52c0f904fad0e1e8fa31b1abbed7a2660ac2316ee SHA512 b3b14c4b113052b98dac4bbffabe6a493049a3ae0f22f7f48b173c5ac8e72b889e0e2d2a9698b839bb994515a6f24dedc7a6af0ce92a4ff83ae49ce0b4e09339
+EBUILD tokyodystopia-0.9.15.ebuild 740 BLAKE2B 989306adb013c2a7a5abaec93ce37196ff3c67b98a368624275ce102aef9cce4cb37a126b626f522e09f64887f3b40f3414e95084ab4d3676e6cf10b8517eec8 SHA512 75bfd5229d27289a343159a16658c560a26f3d13d9bddbffaa8bd3108dd31e888da8ca77ba6b06365fdaf0de646211666dc8bba3c84fda22f320ad77fde034c4
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
index 6b5ad2082928..6bb8c6f44679 100644
--- a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
+++ b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="A fulltext search engine for Tokyo Cabinet"
 HOMEPAGE="https://fallabs.com/tokyodystopia/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
+SRC_URI="https://fallabs.com/tokyodystopia/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 6754f4adf273..a60a1934a85e 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -1,6 +1,7 @@
+AUX wgetpaste-2.29-fix-bpaste.patch 1401 BLAKE2B c7a08ac708aace5fbafcd8de245213307b154c8c9f94a4f37b952b7509b7768df53459b1724b91e43bdde3ddb4cacf070d02c4a2dfdf33cbce7cff240c5ec7bc SHA512 70e9b77b5e4eef7a790973737be5c330443ae5eb4f54ac7a706e1404073a3568e0dc42eee1084ae5c4fdecff3384d22ff4666f2b0b24d6d28cf5d66ba3094612
 AUX wgetpaste-remove-dead.patch 1069 BLAKE2B d11664112833cf72b3f0cfd338e6a3e7b41549b60dedb61915501f45f86d72e6003415fd30badb3820453c3b4c81829b34d5bbe501e33aba735b8668487f109d SHA512 edc121802218f7c32664d76e737195b50e167b8b86e62314bc5c818822ee8dca2807d0d38c81167c9771a9a2023ef507f509abed574bc5f1906fbf39ba72ee18
 DIST wgetpaste-2.28.tar.bz2 12448 BLAKE2B 231b6d00ecf9c355f45683d56537c0fe6a5d6561e42edee680b228f5a76e7e1b202669e429f7941b6daaf14682e5a8469521713930bb42387e168965acfccca2 SHA512 b3b9ee4bfbc52da6762b06c2640385eeedab7910ad1bc4e92ff9304371ec2442e2d30b69ebc0f1407a00a9c8afde398e00dc3d3c048452d730517227a68e6b97
 DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6
 EBUILD wgetpaste-2.28-r2.ebuild 779 BLAKE2B ed1ba770ecf40257f2db99a7a84e4cbb264264244d407db4659ea82d11afd6f6a1b8960444d11165d413955ab88a3f7df45da734444940f322f0aac18101bbb5 SHA512 851fd5ea306c1f99645096671dcda51a84791863d171bd007b92c47de760db34c6eb15feca2b7d7cb21827f2d00dd74318c715e3f97e031c8e017cbaef54239d
-EBUILD wgetpaste-2.29.ebuild 738 BLAKE2B ab009023d2ca5d29af4d1657726c9e94f0825c2003807b5c41d77e2649718b37c302e3805db07d3dc9ed601bc35f37eea00c3035a6fe322327417280b0b3d505 SHA512 6a6d96d076f5533bf1e4f2e7981dd907d88e486f09b138a6812dd249f64ab708dfc9c5b929d2623abc1a84e1e1b3a1204e65807ee8f0d8b88c110d352b72e9e7
-MISC metadata.xml 355 BLAKE2B cfb82b6309e5508319685ccad6757d701ad60ca2c9b015bf04cd500348a1c43e951876917d60e118e4008088a40761cd57b0f08a220cf1e97b9f638a4efe086a SHA512 04699e3fb3122aa304bcb525a1130732c949473086ed946ae9051928e7e84edd5347cab006e6a31f0ad854c7d8f51f07c3e77f6e3a7dac450619f4decb52f2f5
+EBUILD wgetpaste-2.29-r1.ebuild 787 BLAKE2B bb4190d4de6240b39244ec2b1b1a87af2599d81494adbdfe0682bfcdf4edf8dd79f90ae79ffc04acb871a8bcad7d566ab5f6472b76e107516067c598b21b7905 SHA512 87a551c9576cf10096f80588babefcd8fcb285c4e57109c46683b1a523aee3d2b202d479337fda3c654155c5fb1f1c53a1f02cd1c090b84f86f723061dbc0d28
+MISC metadata.xml 498 BLAKE2B 9442c088cf776d11e625be4466d161c7a2103fd34da4aad288a9e7b04297db23c2cf04745d533376fec8649e1ea4936ab27db42963f0e57623018add15182b8c SHA512 e312aefde50dcbe35325de6215d85d82f16d51beb3a5ff1d3e07c5408aeef66dd7a4ee7485cc3f795462429193dd977cb864b4f1ee8a280bb2e2e7f45e521278
diff --git a/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch b/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch
new file mode 100644
index 000000000000..0af9a6f855d7
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.29-fix-bpaste.patch
@@ -0,0 +1,40 @@
+From 6175f89cb618fef83882ed86ab049a7fd1035770 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bo=20=C3=98rsted=20Andresen?= <zlin@exherbo.org>
+Date: Tue, 23 Jul 2019 00:16:19 +0200
+Subject: [PATCH] Fix handling of bpaste urls.
+
+---
+ wgetpaste | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/wgetpaste b/wgetpaste
+index 585fcd9..99eb7f1 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -181,7 +181,8 @@ xml+cheetah xml+django xml+evoque xml+lasso xml+mako xml+myghty xml+php xml+erb
+ xml+velocity xml xquery xslt xtend yaml"
+ EXPIRATIONS_pinnwand="1day 1week 1month never"
+ POST_pinnwand="submit=Paste! % % lexer expiry % code"
+-REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[[:alnum:]]*/\?\)$|\1raw\2|'
++REGEX_LOC_pinnwand="\(/show/[^ ]*\).*$|https://bpaste.net\1"
++REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[^ ]*/\?\)$|\1raw\2|'
+ 
+ ### errors
+ die() {
+@@ -550,11 +551,15 @@ postdata() {
+ 
+ # get url from response from server
+ geturl() {
+-	local regex
++	local regex location
+ 	regex=REGEX_URL_$ENGINE
++	location=REGEX_LOC_$ENGINE
+ 	if [[ -n ${!regex} ]]; then
+ 		[[ needstdout = $1 ]] && return 0
+ 		sed -n -e "${!regex}" <<< "$*"
++	elif [[ -n ${!location} ]]; then
++		[[ needstdout = $1 ]] && return 1
++		sed -n -e "s|^.*Location: ${!location}|p" <<< "$*"
+ 	else
+ 		[[ needstdout = $1 ]] && return 1
+ 		sed -n -e 's|^.*Location: \(https\{0,1\}://[^ ]*\).*$|\1|p' <<< "$*"
diff --git a/app-text/wgetpaste/metadata.xml b/app-text/wgetpaste/metadata.xml
index 23d91c3c4034..1aa3c4c3cd76 100644
--- a/app-text/wgetpaste/metadata.xml
+++ b/app-text/wgetpaste/metadata.xml
@@ -6,7 +6,11 @@
 		<name>Maxim Koltsov</name>
 	</maintainer>
 	<maintainer type="person">
-	<email>zlogene@gentoo.org</email>
-	<name>Mikle Kolyada</name>
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">zlin/wgetpaste</remote-id>
+		<bugs-to>https://github.com/zlin/wgetpaste/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
new file mode 100644
index 000000000000..175617a320c6
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Command-line interface to various pastebins"
+HOMEPAGE="http://wgetpaste.zlin.dk/"
+SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+ssl"
+
+DEPEND=""
+RDEPEND="net-misc/wget[ssl?]"
+
+PATCHES=( "${FILESDIR}/${P}-fix-bpaste.patch" )
+
+src_prepare() {
+	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
+	default
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /usr/share/zsh/site-functions
+	doins _wgetpaste
+}
diff --git a/app-text/wgetpaste/wgetpaste-2.29.ebuild b/app-text/wgetpaste/wgetpaste-2.29.ebuild
deleted file mode 100644
index ff53674f0697..000000000000
--- a/app-text/wgetpaste/wgetpaste-2.29.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Command-line interface to various pastebins"
-HOMEPAGE="http://wgetpaste.zlin.dk/"
-SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+ssl"
-
-DEPEND=""
-RDEPEND="net-misc/wget[ssl?]"
-
-src_prepare() {
-	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
-	default
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/zsh/site-functions
-	doins _wgetpaste
-}
diff --git a/app-text/winefish/Manifest b/app-text/winefish/Manifest
deleted file mode 100644
index f4a7546c3100..000000000000
--- a/app-text/winefish/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX winefish-1.3.3-desktop.patch 355 BLAKE2B f99870a04c8d0de075bf6c4c169e2eabcbec212817a1ab6b1dd0aaf1bc29b0fcc063c834083b7ee9fd832600245f8e3650576b5f42ea53ffbc8e95d095f643db SHA512 12606e0e49bfe9e6de7fe5f7a3b17c55653a4465fb85376929f664afb8d25acad862c8004b9fdfed56e289f7d7ba9fa0618dd551663a9361e4acc174b51e6785
-AUX winefish-1.3.3-doc.patch 518 BLAKE2B e682e07326c44708ac8ee4e8fddd4a07145288f7fcac86e21e37a1cf97cc373d5340661855d896003539ae98b84d147da649a3909f49c02c7b26076cb47b412a SHA512 3a49d0035d580ec8a3daae606a3b1c287ce64cf355de899174fddc9610520ee987823d4fe84e82a25f8bcbf7d8a7c11043b373ab4865a4f7dd654e5520a5eb3b
-AUX winefish-1.3.3-memset.patch 364 BLAKE2B 5eeb23216a11845e2e5adff2fc869aae647a97f8ee6ab2ed1b1d90eb420125fe245b56332eb5a25d510d4bcafce88f4eda3a131d3463206635ee89c851150928 SHA512 282743d8eb64035c2f21a3b037004e17d4b14f15db1877baf7524d90b3a5b8c46a279ca00e9617f79be70c503611884de5859ae910406bf027fa61f70c0404fd
-AUX winefish-1.3.3-nostrip.patch 384 BLAKE2B 3f395994f6c4d214680b6c954ffc9973f3686f0dd29361e708b4e576e6043d9ebf349873ced4f53a782fd7649b6cc27b14560b5fe13c68860b32e81c16b99ba4 SHA512 4090358771013fffed32487eff4cd74c7545b4d7dea97aac6638c9b1bf1d3add2d2f5ab4ad2cc3d0626a3fed336203221528f8efe21802e0f72dd891b65e7bb9
-AUX winefish-1.3.3-version.patch 217 BLAKE2B 4830bcd33b1acc99732dc32bcaa3dd0950dc28c139286b152ba0a250833d39a1f92674900c1cf003ebc2218796aacdda1a509034b1693f7c77342f4f748d9e92 SHA512 c3da51e0a1140fbd0c2c811e16da19af0c9d8817b7d00a1d5fb97901234d8e2c8e1ad27b20a5cc79accac9d1c96239e942fd3ce5de87f5664f3769e6393f2600
-DIST winefish-1.3.3.tar.gz 485772 BLAKE2B 344059c9bc15ec693e66d5d901d2e620ff223dd48de64d32b385cc1e06f6782dc2a2ec965ab8f5ce26bbf518df8edc60a1640b7ed7b576939bf45bbc424f7900 SHA512 216196694979093f5152eb7e3ccaa1e342b44bde4a054c2b6a72c38451d08cd03c3209f5becab8ce3f3c8aace089253a60dff8d8c2f679bb297b34d0fa1ff19c
-EBUILD winefish-1.3.3-r2.ebuild 1017 BLAKE2B 015b366f7ed84feb3e3243315fc90e8e55f6c81b84a33aa1ec962cba205b3ce74725326fe5e17835e286330705563c5a238665c06017e7bf4174eb0aadd8ee5e SHA512 4897589831fb8ff3637fa79b763122edd16a9ef59487599bb418a616939de6a3dc0dab12dde544e5faa3ed4736a6ab76e4f8d4e6190da265b1dc6e260ad52ade
-MISC metadata.xml 330 BLAKE2B 28aec1129c0c006de502806221b22ef857fd367d9fa88dd34d2a4324845cf103e0446b45cf78877df1cf8038c8a569fe456126da51a5b7e7000cb7382797fa5b SHA512 000a6237daf47d5b798b4b0845582741df60e0b9c2d2bdb87e014c96d48a7c8697c03b0de38fd11a2e243c84683bf7ececad0853fbea06e8065ed4ea055cbfb6
diff --git a/app-text/winefish/files/winefish-1.3.3-desktop.patch b/app-text/winefish/files/winefish-1.3.3-desktop.patch
deleted file mode 100644
index eaa66eca7dd0..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/data/winefish.desktop.in
-+++ b/data/winefish.desktop.in
-@@ -7,7 +7,7 @@
- Icon=ICONDIR/winefish-icon.png
- Terminal=false
- Type=Application
--Categories=GTK;GNOME;Application;Editors;Office;Development;
-+Categories=GTK;GNOME;TextEditor;Office;Development;
- Encoding=UTF-8
- StartupNotify=true
- MimeType=text/x-tex;application/winefish-project;text/xml;
diff --git a/app-text/winefish/files/winefish-1.3.3-doc.patch b/app-text/winefish/files/winefish-1.3.3-doc.patch
deleted file mode 100644
index 9e02510e35a8..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-doc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -89,8 +89,8 @@
- 	$(INSTALL_DIR) $(DESTDIR)$(pkgdatadir)
- 	$(INSTALL_DATA) images/winefish_splash.png $(DESTDIR)$(pkgdatadir)
- 	$(INSTALL_DIR) $(DESTDIR)$(docdir)
--	$(INSTALL_DATA) doc/winefish.html $(DESTDIR)$(docdir)
--#	$(INSTALL_DATA) doc/winefish.txt $(DESTDIR)$(docdir)
-+#	$(INSTALL_DATA) doc/winefish.html $(DESTDIR)$(docdir)
-+	$(INSTALL_DATA) doc/winefish.txt $(DESTDIR)$(docdir)
- 	@cd icons/ && $(MAKE) install
- 	@cd src/ && $(MAKE) install
- 	@cd data/ && $(MAKE) install
diff --git a/app-text/winefish/files/winefish-1.3.3-memset.patch b/app-text/winefish/files/winefish-1.3.3-memset.patch
deleted file mode 100644
index 7390642bb690..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-memset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/highlight.c
-+++ b/src/highlight.c
-@@ -731,7 +731,7 @@
- 	GList *tmplist = g_list_first(level);
- 	while (tmplist) {
- 		Tpattern * pat = (Tpattern *)tmplist->data;
--		memset(pat->ovector,0,sizeof(pat->ovector));
-+		memset(pat->ovector,0,sizeof(&pat->ovector));
- 		pat->is_match = FALSE;
- 		patmatch_init_run(pat->childs);
- 		tmplist = g_list_next(tmplist);
diff --git a/app-text/winefish/files/winefish-1.3.3-nostrip.patch b/app-text/winefish/files/winefish-1.3.3-nostrip.patch
deleted file mode 100644
index 24f21e49d307..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-nostrip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -37,7 +37,7 @@ LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- INSTALL = @INSTALL@
- INSTALL_DIR = $(INSTALL) -d -m 755 
--INSTALL_PROGRAM = $(INSTALL) -s -m 755
-+INSTALL_PROGRAM = $(INSTALL) -m 755
- DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
- -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DPKGDATADIR=\"$(pkgdatadir)\" @DEFS@
- 
diff --git a/app-text/winefish/files/winefish-1.3.3-version.patch b/app-text/winefish/files/winefish-1.3.3-version.patch
deleted file mode 100644
index a586608719d9..000000000000
--- a/app-text/winefish/files/winefish-1.3.3-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,7 @@
- AC_CONFIG_HEADER(src/config.h)
- 
- PACKAGE=winefish
--VERSION=1.3.2
-+VERSION=1.3.3
- AC_SUBST(PACKAGE)
- AC_SUBST(VERSION)
- AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
diff --git a/app-text/winefish/metadata.xml b/app-text/winefish/metadata.xml
deleted file mode 100644
index bb345a547d2f..000000000000
--- a/app-text/winefish/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>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">viettug/winefish</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/winefish/winefish-1.3.3-r2.ebuild b/app-text/winefish/winefish-1.3.3-r2.ebuild
deleted file mode 100644
index 2c873d65af7f..000000000000
--- a/app-text/winefish/winefish-1.3.3-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils xdg-utils
-
-MY_PV=${PV/%[[:alpha:]]/}
-
-DESCRIPTION="LaTeX editor based on Bluefish"
-HOMEPAGE="https://github.com/viettug/winefish"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="spell"
-
-RDEPEND="
-	>=dev-libs/libpcre-6.3
-	>=x11-libs/gtk+-2.4:2
-	spell? ( app-text/aspell )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-doc.patch
-	"${FILESDIR}"/${P}-memset.patch
-	"${FILESDIR}"/${P}-nostrip.patch
-	"${FILESDIR}"/${P}-version.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-update-databases
-}
-
-src_install() {
-	emake install DESTDIR="${D}" docdir=/usr/share/doc/${PF}/html
-	dodoc AUTHORS CHANGES README ROADMAP THANKS TODO
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index d796c7737dcc..2158cfaf26c4 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,6 +1,7 @@
 DIST xapian-omega-1.2.25.tar.xz 440224 BLAKE2B 1e67cff0ed1796349df5da7d33c07febba2d8c79906fd98c66becd59d7d387174728551785ca42db1f69662cc157bbfc35c0e29f96958ddb76670797d9a4bcf7 SHA512 f412538cd50c82d7af28f2620c1e377afd3f03186259a145f9a37cd64d05837b7cc6f205627a3c8e4c25ec19efc2a81a6fe3a415d00b7a6f4df847d6ff2d453c
 DIST xapian-omega-1.4.10.tar.xz 532952 BLAKE2B dec0ebc7b4de24d6f11ea91f090925c0a2dd088ec6468e47e1ea6e60f31acd99d8480f47275df597a508b51c3d2046ce89cd1c8f10e19ff4ad4ce5e593e25852 SHA512 53dde1705eea39fa26afd4db6a0ab39e050ecd1ffc71d2e4c2a2287930d926993c48c36d0c2ad6268188a29876bac1f0e3c29fc54afd2fb6f831899929ebb302
 DIST xapian-omega-1.4.11.tar.xz 533596 BLAKE2B 5002f809a310cfff8b7316c6d1f7fa17f93fd88381aa5ca5de14a443f2b3bfd7f00738bae7b2e3a739a170bd8f454e82f696212fc43282d342946a774b7bfaa0 SHA512 135077e26dc0b0707d1d14c64eeb25db67374b1b7909e9f3e925b10e03b1557263339d2f84c5a82046a159e58a5301834e76e99843d66342666d5694f91ed4f3
+DIST xapian-omega-1.4.12.tar.xz 539324 BLAKE2B 01a9f54dc622699fc4362c3d36a9b529f31c87b6c424f5d55d5dc7e676e8dff895df7e31fa187680afd5eb9e90d65b06d39fc06912b9ae5db8a9e13b694d980d SHA512 2d2c48646f4f06fc4b2666e0901e4f73b2c5da93c4a8e8a5ea6d32e9076a2f18c15c14c7dd2ae2d421a501119ea19b52fe324ad98f9f0bfd6b80f4286721aa2e
 DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde25402235fee280118a90930888543b2da7821ad7d30143d04d35dccfb0de6c375231f2db4a4f4dcbaeeaf5d4e54045cfc SHA512 895da1e1a3ddf2e5e8576fd41853cc5cb7c6e4f0223a0d25f6303fd01ca26f64c8e41616d6d66b2309a4ca5763b2b20b208dbf6054f0498411f2678422c07893
 DIST xapian-omega-1.4.7.tar.xz 510644 BLAKE2B e2106b07a0ccf765dad25c3e83a745936156b002e638fbd9cbd1fd194f507ad663c305fc4981d72f92a74f645601aa83b1bc3133d10d8d4c308f28657a90a356 SHA512 e7e2c7dfa3e76ccdde103b34aa1b0732033e9f218346a81f1b0b865c6e2d17c356b96a4522a3a2273fb55eb2fbd2dd57e835368771f46c9fb458c0c11329893b
 DIST xapian-omega-1.4.8.tar.xz 521352 BLAKE2B 01d914c0dcd7e8a8cf7ec4b997af49c01883d83a5c9bd1c59da058d3329dab5f517bb4d3aa243a3e47ad36311acafd64505fda1ecf86d3605a38ef70760d8711 SHA512 5d27c03891ff941b23c899b1a293ed9be0129de08ff46156380638408360ea6e4aa2dfb4fe0ffb13726807849802fe8d19f6dc817a52ec5bf50c2bf94ed94c2f
@@ -8,6 +9,7 @@ DIST xapian-omega-1.4.9.tar.xz 522100 BLAKE2B af1d01d918ff6b6355bd3ebdd28883d7f8
 EBUILD xapian-omega-1.2.25.ebuild 1265 BLAKE2B 28e33f851cccd463daf6ff3e92c980d4c3421cd5272504c6e6dafed1dc859a60d361ebb8e89a2b62b2cd86416760a1d91f9f0c83eda7396705af45c487c88a4a SHA512 769048855d948fdfcfb06cc37d1790712fda232b800b74a8b347617140d1e0ce4dcbb8f9e47d40f39342a694201a592c3446411c92989c840e0b6305e11f1169
 EBUILD xapian-omega-1.4.10.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.11.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
+EBUILD xapian-omega-1.4.12.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.5.ebuild 1152 BLAKE2B 1cdca6a87ec353a468a65a7dc5df903e452128c8df66930d3b7eb651963d211305962cf5b415dca9a56475ff782c4693aa34cd2a91e4d2a444e6a1d2f00b5144 SHA512 540c43a135aaab12509e155b188e17f768d0b9c50a4170f39a29d815532aea4c66c24c65af270c7b906321527f4795a06d325d87b0b67f51600a0da488408944
 EBUILD xapian-omega-1.4.7.ebuild 1151 BLAKE2B 60e49c563df5f5df9b3b29a4ad0aec64c56b045b3bb0f6ac4691d34d46342ae8504a2da8910562cd6dfdd5068b097a9e0d0217c517968f1db9fee114275297c3 SHA512 bd6cc0b52a785d6d205d4faebe6f8dd620623a9c4305da606238bef4026279d6e5c3490c3f398ce51e4fedbf91cb2fd65a1efca8943f8e3ad4ebba829c6e1bf6
 EBUILD xapian-omega-1.4.8.ebuild 1156 BLAKE2B 098b20d7e4f03036303c6a5e63692b0e90b8f64cd9c6c29699e91a4d3d0e795624911546375cb330e8db9aff0cf8962d7392990c1fee6b30c387897c7bd93caa SHA512 4132801108201759b6a7a32eeda1a0ed566c4d9e772df586e174036b9042679ea42fab1f5c80d0d7c8dff6dde4af768f54ca17908e352cba7950a3ee01551108
diff --git a/app-text/xapian-omega/xapian-omega-1.4.12.ebuild b/app-text/xapian-omega/xapian-omega-1.4.12.ebuild
new file mode 100644
index 000000000000..4a7e3ffd806d
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.12.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 64aef6ec2659..e8cf47514490 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -5,7 +5,7 @@ DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f
 DIST xchm-1.29.tar.gz 972533 BLAKE2B e114047f4c3e19bb4d4c28a74997c76c54a2dc286f1f0691f105824be693e3b51c7618717b5b5b5f3604ab3f4fa89d703e071a36be0bd05529b6f44710b0bd20 SHA512 678cea2947d58e9b173379d6df809be603ca77431a3181ee45e3c1f4a4a55a6c10a395eecb5c25feb14ad361d044355ae313d537f0abc9278c6e5ab37a8768f6
 DIST xchm-1.30.tar.gz 981171 BLAKE2B 6b2077e9cf8fa849121cee3681bd390218de1ce83c9c49117a186ddef107b15ee8f491eb93ae41ba8a2ea07ede306883ef0f8f0c357142e9ca333bdea8ebc50a SHA512 896d94f4fa3b728e37985b1a2e918596e20bed0a43cf90711d27ebfdcbe49e4a0794c17e1f6cfefb6f272adcc7fb22464e2c25c15d0f0afcbe94b867899eb1a5
 EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e4033c54c032c438ec91a01ea3dc5afdc401ee0b15d650c8df1fcedd07a0a146c172f1d5cffcd4d8074575c561be SHA512 1e2ea33bb90588ba970930ccd7ab8f4fc696e03e1088dec1f65da5be8f139627cac104d9b53a6131a2c0ad2efca0747e0d17d77a684762967a688fba98016ace
-EBUILD xchm-1.29.ebuild 1192 BLAKE2B 3224add5ca8eb50105b7d28a37b067e66cd2e59b300811a5292524649ea75762bcb3d9d65ce84c826d5aa5b61f11a133bfcef1d8e34cc7718d45bdbd58a7b0ee SHA512 d891a2f14a044ac381af8a07d023f8bbb03a72203dc9982b644f5b26045ac89fd4469c83d56d6a5893fb3b704c1a0112054b0e8217d849b0471003c3f57a8134
-EBUILD xchm-1.30.ebuild 994 BLAKE2B ea80c3a38ed48d1b5f5a6dd21990398b4744221fedee5edb0a6f2001e22d1d3d2081a61647936e5576a0420e2c8106fd1a73013225187ef1d98a7aed75e9f118 SHA512 cb71ac423b415418b167f4f5e5ba641436ff9ad74666658ae3371ee3bf5cfef727e52f63560092ce404bf49fd2080398280593b8ddd4dedf0278c2d409aa0a59
+EBUILD xchm-1.29.ebuild 1212 BLAKE2B a92a0015f18489465890cb9d292aa8e834a732e9d3b13b4df7fff95a42e0a3f2654c0aa59dae7327fd09e1330b5d0d8ab885a757c6fbfdb01227f2c04957c26d SHA512 ae281e0998252802f558ed91ba1ff39ec04144b9b2f6666657bc27d2ed9320a0420cc7ade9aa25cf5846fd1fbb3e4c158c2a4d3f9d164026cbf1fa9d3108399e
+EBUILD xchm-1.30.ebuild 1014 BLAKE2B b78f2480a9fb60cea85e74e185fc69b7cf34b429c53fb4d5a2b02b6287b88d156a29f2229dfa2332d080fbc8fa7b35a6c7165dcaffb60a9da12fb9739b352c75 SHA512 030b6a0e0100e1ba1ab2948eeeacb88fe42aa4d0d40be1746b2fd0a17d90178894a9034d66f8f7921160f2a4052a0e1f85f08c7cf191229f17badcc56ff0ad7c
 EBUILD xchm-9999.ebuild 979 BLAKE2B 237ba16825e09abdf152e072a2fd6db4f596483056a56961e391bb0dc519fde5c27d2eb0293ced5e14f4cda42f5575e1acc2a3c8b4838f062ad020a42f90570c SHA512 5be7614b88a6a2d1b6db510ae78fa2be1e07dd7634479a86593328966b34686d55810c2b07ac7961e13abaa955c55cf37af30587c376d04726fcde6582c38408
 MISC metadata.xml 350 BLAKE2B f6872e04718f72ae186772afc32f65a55ed55f078f53c6b3a8448bffcf006eb65ef1923e98d369af3e9c6fda5977bd148ae13a2d8e32ab2e2a6680a4ec5fe2c6 SHA512 956319a7ec2b136c5a1b38a51ab1fb61f81274dc2898eff1441393ddc4d0c204854093800210b9e44ef214427e4664f61d0ba1c3a8c43d8f21812b55371e3e66
diff --git a/app-text/xchm/xchm-1.29.ebuild b/app-text/xchm/xchm-1.29.ebuild
index 8a1516c32201..7fc116cb157d 100644
--- a/app-text/xchm/xchm-1.29.ebuild
+++ b/app-text/xchm/xchm-1.29.ebuild
@@ -7,7 +7,7 @@ inherit autotools wxwidgets xdg-utils
 
 DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
 HOMEPAGE="https://github.com/rzvncj/xCHM/"
-SRC_URI="${HOMEPAGE}releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/xchm/xchm-1.30.ebuild b/app-text/xchm/xchm-1.30.ebuild
index 2784ed8aac1c..e1a21d227bbe 100644
--- a/app-text/xchm/xchm-1.30.ebuild
+++ b/app-text/xchm/xchm-1.30.ebuild
@@ -7,7 +7,7 @@ inherit wxwidgets xdg-utils
 
 DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
 HOMEPAGE="https://github.com/rzvncj/xCHM/"
-SRC_URI="${HOMEPAGE}releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 8813cdb082e7..24f6df0ac2c1 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-pdf-mupdf-0.3.4.tar.xz 8092 BLAKE2B 5e47a9db7fede440c10f8270e02430d2603a93a3fc05bbbcf036f825a534f9083fda3ea536de7b47091aca63409b54a15bec057b7fb3da687507e55efa779075 SHA512 8a885f1faa471d413f09bd6a78b86d419fe433139b2f811dcae9a9ea180beaf693ee8c11c7fe98ed7d5303520f6d9b3efd0d8e7edf978aa5099ef580db79166a
+DIST zathura-pdf-mupdf-0.3.5.tar.gz 8901 BLAKE2B 63595d6a4b305d8cd09eced1cfa3840a5ab3d37a61c42738603691621f1f1dbdfc31d5963b14c7af32f8c504f2470bf1cadb708fefbfd49fb25b2848b2564153 SHA512 1f7a748fee74296a008cef42c8f2e443409c77e16caa8441f74136260aaac7dee4d3c03e8a88532c45a0f9972e1b4965d4cffd488a00123d4d8cee9bcec2cf30
 EBUILD zathura-pdf-mupdf-0.3.4.ebuild 793 BLAKE2B 480774b820e6390885f0a6901fde83b5c7ee777d4921bd4e6a105e325743222c4c8793879249734e33ab2ddb6170056105454e52ed6d358870c7a1f24778d166 SHA512 f0e9fe25289a90e838062f37522255ee6256b04a0deaadc9357f996eb7b8d735903bbec10421c4e985461d4454e697004806a83c756568adca76c54a7ccbdfb4
+EBUILD zathura-pdf-mupdf-0.3.5.ebuild 809 BLAKE2B 848d3a8bd80d7b253fa42f2fa352946cc4f6d6a3da0568f230ee504c6c46c58470fb228e75142313769ddf86cbeadd674a978d70e56b713aadc9f4aa7873c9dd SHA512 b928e7582cd71e4135bc0967f3eea887e9657b41baf83c5b0995580fbac13ef4bc12583029e346b99a15b9a6de99733232f67954033cc6326c1562af9ca92766
 EBUILD zathura-pdf-mupdf-9999.ebuild 796 BLAKE2B 623e1c0f435e95826791a71c3ce66c4448ff8c47f9e13dae411d86e8c78b4e6cc630333263eb9b2fc94bb41f6d86fcb871da340fc78509e894fa13613785d934 SHA512 54e52e1405959ee3fdf0ac819dcc1941a370369291c9b480256fc2b404a16f2c839d1f29110cc2e7728de148423bf372c33c2aae413fb3d658a74777bb577fe2
 MISC metadata.xml 672 BLAKE2B 539ab88c5ef3fe3ad7ca25d9856bcf6a7755e09c479631c1cbdd835aeb398d2f6052af0980afc35771312397b6858fca2271f5aa8ee64fa8a57130f05b7594ee SHA512 288bfcdc265543b1d5d364af4fe0c6dbdeec0f30019b683ef0bf32619d87ada509cce47c141aac08cf0942f7ad74d1a453e6b5303175ea591e2f661ba044882a
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
new file mode 100644
index 000000000000..a8c73f86302b
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="app-text/mupdf
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	media-libs/jbig2dec:=
+	media-libs/openjpeg:2=
+	virtual/jpeg:0
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
+	default
+}
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index b222de9bdd2a..77c815011db6 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,4 +1,4 @@
 DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
 EBUILD zathura-0.4.3.ebuild 1333 BLAKE2B ad5146cdea9826b8d22bf95d47dc0dcfc02989ae7acd5c085cdbccb61a3b69fe2eb3aa7a44866efe71387da6d63490f37f4d19f01a4a0cdffdd680a52cd60e02 SHA512 cca06811020ead3fbc6d56aa54f1d6e5b73ab03874c5a59c885db015aeb8a9841f6f3d43562bcd0dc3a305d1faec8b7f4473f16ff7107740fc02b330869390fd
 EBUILD zathura-9999.ebuild 1374 BLAKE2B b1935313606001d9dac20406d05fde7fe1720afd0380885577fbf4ae88e78e989226f01651f59279fe863c67b552f0e4b9e6b8dcc00dbbee2b06e80622e8acc7 SHA512 a904dacf3ac21794e27aa8ebc84c2faf7cfbecde519a52936a91ec7d0d317552fd64ef95d0481ef2eb43ca19183e14075b6dc442ca2732ca6958e17cb2fde2c6
-MISC metadata.xml 827 BLAKE2B ce7ca0240a5fc4caca62988ca9d849aa2c010ff36f9ca542f45c49d47a04669e66cd6e1c891f3ef1c36b5eed690d7a6bc134d7130be7ee7e0ee987a428eaeecf SHA512 fba70c39e525376da98422f05601a327e68cb7bc904688ebb3b17854b1123e8baf066cae45d82d3c91d9ccf24b64241a6541484cfcd342fecb2a5f7ca44af02f
+MISC metadata.xml 763 BLAKE2B 1a98b02634dd4017052820cb2103b81d7bc8308c8832edb28f65127f43e9a673926b76091e2062a66c701b25e9d5866051e2268fa3fb4f53a681257132618789 SHA512 5afbabe1726a25ba2b0ae5c66533bbc247deaf1c745534487895bfafa2671ba87d9fc4333ac824176f78db64a940cc53a87d018fa4d7e5d201cfc6f41cfb50d6
diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml
index f01011d4cef6..9e879333ac21 100644
--- a/app-text/zathura/metadata.xml
+++ b/app-text/zathura/metadata.xml
@@ -6,7 +6,6 @@
 		<email>zlogene@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="magic">Use libmagic to determine mimetypes</flag>
 		<flag name="synctex">Use libsynctex to get latex codeline from pdf</flag>
 	</use>
 	<upstream>
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index b587f788e19f..fdee975782e2 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/cream/Manifest b/app-vim/cream/Manifest
index 22a9cc28d414..052a34e88bac 100644
--- a/app-vim/cream/Manifest
+++ b/app-vim/cream/Manifest
@@ -6,5 +6,5 @@ DIST cream-spell-dict-eng_2.0.2.zip 1778434 BLAKE2B c4f73ba51cf1371faec1d3aaae44
 DIST cream-spell-dict-fre_2.1.zip 872841 BLAKE2B 0711e0780c8a9b77f8bea9deda47bef3417ebea91f672a5146a0644c2f2fd70f4ccbc032802a62bd60b908d1c289a2acc46bf80115a3c37a5ef113f509319773 SHA512 d34773e3ec2bd905a669175680f91146ead8dc0a7d3de8fa668c56e550eed23ac6c8678b2e7b3c642b756d6eba97b815494395c07b3f28cb54e3a01cf8f5b1a0
 DIST cream-spell-dict-ger_2.0.1.zip 894848 BLAKE2B 0018d95b887ee48b7f36b9a7a90413a3a45c4daf6f939ec428670f54e690206e447813c0fff3048106d816960b6be0ce7153362dd0305fc2276fab1b58269efd SHA512 1fb1a797bfbcd0516d8124daf1256b27a356ef3eb58887c2a55fc8537f211faa60dcba713935b2fa5595ebf6bba07a1463819060018f725e5cd0952b978a342a
 DIST cream-spell-dict-spa_3.0.zip 1710280 BLAKE2B 44039b8ee664fe9c9664bb60af60e6b9687dd51989a2452ee3bc7afca4fa6d7f124221aca7d8578c27b462b3d660417a7c518ba4bbff64fa76125cecb29f0fd9 SHA512 27de9d920afe191ae4e7d5267b5ad6fb14a6e4185d474c09d17af1eb45f926dab2d4696080cee25d1591bf0b588234a20778e9b1485927dfffa8595b19e247d2
-EBUILD cream-0.43.ebuild 4279 BLAKE2B 73076eb05caf45817e3ca9b7791f6fb0c6a7793513c77a98a971d85de84173b387cc28944c91693d7518a67bf02a2a5167f3e72987c9e0fd08d221d7691bc4b0 SHA512 e126f9ef16ca5b6b9afb4ce985631e3d88eeae2ffa35c98b6c7af1ce1ab5ec61827e99ae615f236fa38fa2480c3776a452c1c104689bf718370cd1b7be5252df
+EBUILD cream-0.43.ebuild 4344 BLAKE2B 11b442516988d105f75db06950fd699d0b7adb2192f1de113602cb6da80bb956d467c2a106a21aaa478db46adf7c47f95659cb1dbcc60858b88b6b3b79c9510a SHA512 f3b4fb8ae5d23d56402dfc2c4d18dde113b2ca7fb206512cb664f0e0e13c25785ebc386d4f16c743f24dc27b07d42495ba41c11d46bf337ea83b25fbc8cdba3f
 MISC metadata.xml 324 BLAKE2B 6c7902862acd6c6ad8e94e0bbd0d63f771039cd456cc401a72812c2dbe94d91bd13610fe77cb6484fecf33afc9beccd8aaa3e8d11cd4dfd0884c3bd90a228c10 SHA512 0c3e2ef2f849117218de711a2952e6571f92a5bd768c61004284bfc72f8945c77174fb3f83bb70c69ef030dbcab467eb1a531e09a0baf7d85167c3deade5cf65
diff --git a/app-vim/cream/cream-0.43.ebuild b/app-vim/cream/cream-0.43.ebuild
index 2d8b551361c0..996ccd4a5a63 100644
--- a/app-vim/cream/cream-0.43.ebuild
+++ b/app-vim/cream/cream-0.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -14,10 +14,10 @@ DICT_ES="spa_3.0"
 DICT_DE="ger_2.0.1"
 
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	l10n_de? ( ${HOMEPAGE}/cream-spell-dict-${DICT_DE}.zip )
-	l10n_en? ( ${HOMEPAGE}/cream-spell-dict-${DICT_EN}.zip )
-	l10n_es? ( ${HOMEPAGE}/cream-spell-dict-${DICT_ES}.zip )
-	l10n_fr? ( ${HOMEPAGE}/cream-spell-dict-${DICT_FR}.zip )"
+	l10n_de? ( http://cream.sourceforge.net/cream-spell-dict-${DICT_DE}.zip )
+	l10n_en? ( http://cream.sourceforge.net/cream-spell-dict-${DICT_EN}.zip )
+	l10n_es? ( http://cream.sourceforge.net/cream-spell-dict-${DICT_ES}.zip )
+	l10n_fr? ( http://cream.sourceforge.net/cream-spell-dict-${DICT_FR}.zip )"
 
 IUSE="l10n_de l10n_en l10n_fr l10n_es"
 LICENSE="GPL-2"
diff --git a/app-vim/csscomplete/Manifest b/app-vim/csscomplete/Manifest
index 001d1319eed1..915b6f9c9f86 100644
--- a/app-vim/csscomplete/Manifest
+++ b/app-vim/csscomplete/Manifest
@@ -1,3 +1,3 @@
-DIST csscomplete-1.0.zip 18057 BLAKE2B e6b7f91b86f18d6359885ef92486dcbb8ed32eaf90ca3c7b49d56dd2f762b334cef30c3dc92e1bebf7cd4d902876f49838146a5ac0c79342a5004701b857ccee SHA512 63b8b9a31d09ba6ce8195b524df5785cf5da73db7b487b68bba291fcfb62af0ea8e595f1aed73d657b8343775bacca056185dae9fc22d0dbcad1596653f94a81
-EBUILD csscomplete-1.0.ebuild 501 BLAKE2B 4137d393c686ab5668b92836a98b4cf29afcd92e4a506fcf0e344edd360b88891aa7efa8e89155186e2f4769748fd2af207a8fe9b4d728eac894ac8cee770637 SHA512 48470b066d5756db5bf30fefdb681e4aa6506a12356704595c1dc501b4701618e3c79f5120bb0e095b722069dcf1fa3742b479400e970d5772a183a8df0f9c8c
+DIST csscomplete-1.0.tar.gz 16621 BLAKE2B d05f7f781fdbb26f1672ab47dc01345be3fd78a3cf57e7f746453fd437f1b387a24969fb3de7cb23163abe098a670cc36ac989e2a1285de6c7499ec41ea59a0e SHA512 adbc2634534c3f0f8b3ea2389950d37540a2f5c7b4756e428cf50d6086fef5706aa5cde9b3cfd1fa87a9b6f07fddb26be75bf32f7ffc4193d5f0813dccf84c0b
+EBUILD csscomplete-1.0.ebuild 514 BLAKE2B dc3e1f4526dd4ba373e9d84532db8267b4f39650ea51406a871692b68f05af3c6d1db5ebfa140e3a257ec955baba9f579f9c3767f6d2045281e0017a9f722f17 SHA512 d2f2220624d4f751f82f64920fb5d27634ba21cdeb1112220b5710a8b2e471ad5c693253c7294e0e5d87d21da122a979d16c70d79b8a1d9197dce411058eb151
 MISC metadata.xml 431 BLAKE2B cc935d06e76af5fe96e6f270140525e207c316cf11350476e446432b51bba36748586016edf8b314f1a895c21234bdd27873b9d351150edb570237a3aff45010 SHA512 18a9dd07313408b87c59fd36d268004d5d8c4370a377e524e1c62aadbe1d7bd6f677524912b71e5eed7ae421ce4eba60c9581382b97666cc5ed70dc88ca9b69a
diff --git a/app-vim/csscomplete/csscomplete-1.0.ebuild b/app-vim/csscomplete/csscomplete-1.0.ebuild
index 13028dac1e33..ce3311f5e11d 100644
--- a/app-vim/csscomplete/csscomplete-1.0.ebuild
+++ b/app-vim/csscomplete/csscomplete-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,10 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: CSS 3 omni complete function"
 HOMEPAGE="https://github.com/othree/csscomplete.vim"
-SRC_URI="https://github.com/othree/${PN}.vim/archive/${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/othree/${PN}.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="vim.org"
+SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 
 DEPEND="app-arch/unzip"
diff --git a/app-vim/jedi/Manifest b/app-vim/jedi/Manifest
index 7aaf0d917deb..753dda93b96e 100644
--- a/app-vim/jedi/Manifest
+++ b/app-vim/jedi/Manifest
@@ -1,3 +1,3 @@
-DIST jedi-0.8_p20171015.zip 43567 BLAKE2B 6065e2df567159054d99ec502ddb8ec8103e0892c9f78f6bbc2e72cad6cb3fe37d86882a72135f238fd47a747e03275aa82edee9d954459194940e8a69e1a775 SHA512 d69fa77ada22b0c75b7ec4ad1765035454312707ffb0f8a0bb0de4928e5fd21b08e39ab28b3f0ff9b37c8eb5389bc44c507fa2a08c0322510a57a91d7de028e6
-EBUILD jedi-0.8_p20171015-r1.ebuild 869 BLAKE2B 7db54cd86224e86c57160e7b901a2bb46c3131578f5174fb89ed334d9a3e839b90b655f57c30a8c90763a219e18704bc25714c9e81254f92f525d38daf2b4fd3 SHA512 7547ca7fe88bf2aca31b9b3cb7ba22e7aee389d90825f7c4467e2ad225f91e7268dd547a7724157cc1e128d6ebec73d8a165ee654aee4898e5ac1248ae7d280f
+DIST jedi-0.8_p20171015.tar.gz 31593 BLAKE2B a34fc7a7d8211cefbaef0012b801bc2dec2b447d34a1d3c338ed37306d36262694f0d8e771042e899959d04bed8925c5beee32803cb7f56add7a83ceb4bf27d9 SHA512 e4238c745d509d9d7e8c0593a46935f1de3c0cdf8e3893deb156110be53e2c9012d98379a6ca747a0bdab77f1def2a88dd46ce5c7d3936f01f0d9ab597f14182
+EBUILD jedi-0.8_p20171015-r1.ebuild 875 BLAKE2B 647d3b2e550f5b69f5615c4743fbe3033faa4fd86734db0c50ea8d18ec5a443d7f8410c3ef2bc80474a0b1c7cfdb318d4b36b6c5b92f21e923e4a582f50a20f7 SHA512 a105d3de51cc830ba9cd4528f1a9194fec917ac18da873d8a8d930b6e8cc2beb5bbbad13a743d987229b7f607c73ecefc37d437517e92641201acdfc251fbc70
 MISC metadata.xml 740 BLAKE2B 82dbee0d839faa814f29236625da3bed8eaf6abf8e286c15800ae43758a017394e0b714896b721104213546554f56597a68556dec22038a730423df9a215963b SHA512 145652296b05261952034b26cf36a6fdabee22cdccf4b85914c383e1fde270ca66fcc0b5cae43294907b0730005eb3ce87feb39b716f89740277a9a133229142
diff --git a/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild b/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild
index 654cb4c957eb..af6d75f78f4f 100644
--- a/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild
+++ b/app-vim/jedi/jedi-0.8_p20171015-r1.ebuild
@@ -12,7 +12,7 @@ COMMIT="77924398bd594e238766153cec97ace62650f082"
 
 DESCRIPTION="vim plugin: binding to the autocompletion library jedi"
 HOMEPAGE="https://github.com/davidhalter/jedi-vim"
-SRC_URI="https://github.com/davidhalter/jedi-vim/archive/${COMMIT}.zip -> ${P}.zip"
+SRC_URI="https://github.com/davidhalter/jedi-vim/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/perlomni/Manifest b/app-vim/perlomni/Manifest
index b06c80e99e6c..ed6c287a5554 100644
--- a/app-vim/perlomni/Manifest
+++ b/app-vim/perlomni/Manifest
@@ -1,3 +1,3 @@
-DIST perlomni-2.5.zip 26871 BLAKE2B 02a905b42580d2c66f50182fc2cae1aad4a3cde1fbef5c48a6870a810069c53b24b2cfa4e2ecf16c3e60d0a6588359b337e0652e21bbda442dd04b5d3bb2b5aa SHA512 aeb4bb6efef859145a942271ac4e08c99af3aed45024ca2d5affe2e72c356fa4e8f9cef78ff8a1796426ec9d2339ea2b83f07b224a1b4b98598aec5f6f45b0d7
-EBUILD perlomni-2.5.ebuild 656 BLAKE2B ff5470af52d19945802a02b37fd8d043ae65383cf3a09e035fbe34234ff22567b954f7fec67d1c92c7be9da89518e3e862a5f6f278a163802b436d31879a102f SHA512 675a2db99220e16c04eda42c852949a9ce39d1f9f1a7043942a1ba888d80a97d4c1e6f7097b405e980c5474e472cfed6726c1c6d9a6ba8720b1b623ff9307413
+DIST perlomni-2.5.tar.gz 20152 BLAKE2B ccba727b3ed2317a2f1983202eda97dac38080ee0e79173a402f45956c713741acebe9c79ab8321bd5b3c23481bb02963fe93edc26d022ccf29d3724a704f006 SHA512 5a7eb10233d620db73387d79801b451183e1a00f3086f4667cfaa871e6cdd43b1c978beca8eec28050148709d98e8f55be048806f111fb4bdee16a4e22786bb8
+EBUILD perlomni-2.5.ebuild 659 BLAKE2B c44fc86077a85986b5f13657441e883829881415bd15c481ce8f661badf2fd77951e2ade0705f43df8982951c7ad87fe67af3f5ce5e1d1f3615d08b0cb9b2c88 SHA512 a4c324fc314d4f0a7bc22b60e5a6f49ed4de15b86ef8cf0de3041a48ccac3e86266e1f7113346d87b31897927c7a871427a30c8b4d2123ac88bfab95954cf03e
 MISC metadata.xml 425 BLAKE2B 5413dd0212d6fd1846cfc504352d543b1be51053ac9cc140aa05db59c1f6a4a44208ae7ac798c95fec0b233b97d8581486765def9afe910c2da059f9c8eb83f2 SHA512 8ad19bbe8fd10660518b2b20d8c94307a0322031615bfbed081b24c977bc8d999fd3a5878698be85d41d4090c1dbf632887ef9ab99fbfb068596b17c5be78c2b
diff --git a/app-vim/perlomni/perlomni-2.5.ebuild b/app-vim/perlomni/perlomni-2.5.ebuild
index 8ec957c7ec19..a946abada7e4 100644
--- a/app-vim/perlomni/perlomni-2.5.ebuild
+++ b/app-vim/perlomni/perlomni-2.5.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
@@ -7,7 +7,7 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: a vim plugin with Perl omni completion functions"
 HOMEPAGE="https://github.com/c9s/perlomni.vim"
-SRC_URI="https://github.com/c9s/${PN}.vim/archive/v${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/c9s/${PN}.vim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim.org"
 KEYWORDS="amd64 ppc ppc64 x86"
 
diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
index 79f56ab2d7e3..f30eaf6a97b2 100644
--- a/app-vim/vimoutliner/Manifest
+++ b/app-vim/vimoutliner/Manifest
@@ -1,7 +1,7 @@
 AUX vimoutliner-0.3.6-fix-shebangs.patch 972 BLAKE2B 2b747133ecc49f4654131bbb963ac23ae291d186cfed97e944fd5e757cbe3288e5dafc243f4caea2acbeb56c27e92d257565a84fbcc8a4900a6287056e8e38bf SHA512 44bb6760c11a21ab817141cae5817cc4d5b88a5c94ca4e30238d9e009f080d5ae98522dcde910d5352090e7bf998ad47fa658a56bb16bb50ca905b14e5d2df2b
-DIST vimoutliner-0.3.6.zip 249053 BLAKE2B 329fbf73423291598a104881299200153c6d98cf75f3884c690879dc3460c4190c09eefec55415589f16a426ee76911a8ee7761a158d76b9e84360f5fadb83eb SHA512 20d348ff1b1b9572956fdc56b75e742b25b7deac2637fa6972a1e451edc1f679d8255847a291b84c80866a9ad8a37421524b8eb33565a1bb32ff2b75d0b68dde
+DIST vimoutliner-0.3.6.tar.gz 210251 BLAKE2B d50b3d1c752fba80e26d7430801baf30a7945d84d30866556821319fb052252a37e2dd7f989c47c376b4986b616c7f99e0753ef3f6b54b9f4f02aa166e998b65 SHA512 62c860067d394dbae639aa9d51627637769c22c4c651f2f9328ca88e8afd85396e1f371bb0cfee432e7a1faabee570a1e29ec086c6532681a309b909225fb90b
 DIST vimoutliner-0.4.0_p20180301.tar.gz 367361 BLAKE2B a97df5c154e6ed9b3209bd90bd57b4166877f02b9513351fda0e841de84334a1e592e1ed56b46cc59bc6bb64f3c763cdca81df3f8696f3c348a8ef4744124c02 SHA512 f9f369e7e7f09dac04b58a27a86dc2121b3aacd0002537db348517e779fd1b7c9e88ae905b4b42aace10f79cb8f91acada1ad58e26f2257e46d1af98347eab62
-EBUILD vimoutliner-0.3.6-r1.ebuild 694 BLAKE2B 7e0c7ddda16ac846fe5794192e6d24eafa25b8910b5fe259568c8ff7dc92117d8711fa61364abf0be8008e7c0a42e2726eb70a26e5d38eff8e09bff6de35cd90 SHA512 61b12471b3bdf1ff68ea13260c73d12df79e4a2d704758f40ebc276bb3e051c4681bf66af07b636452d28a52f0bb4168f5360e4d2deed19aaf025924ae2aacc4
-EBUILD vimoutliner-0.3.6-r2.ebuild 1298 BLAKE2B f1e86d39b5de8608b2094f43a5ab1cb07186203e1ca2e53614ec80472397b868ecc528088cab6f8a9dee8f10f317a4212980dde1d0c1a81a2d99c681f976971c SHA512 9f3bfe6dba7bbcadf8e0dfcd86a49042f8afe7548afd2b0fe33b14fccb0ded4fb65fa25868434ba62bde9bf3f7f295755f9ed53518901c7705157b02f9bd96d7
+EBUILD vimoutliner-0.3.6-r1.ebuild 697 BLAKE2B a9fb1b157c55494d0cfd01c1920e00b2eae6f711a0c98aa4a136afdd36e64f1b7a2f5fcf8aefb38880682b12ef4ce6cb9803a538b12c4c5283c86517f4daeb9a SHA512 8fcba71ba216d91e589caa40bcb41cbaee6624b0979c11b43aa2afdcc3d9cb227493ac0662c91dcf27daf5711ede562acc0f4044e7c2d4aacd9e3398052bbce1
+EBUILD vimoutliner-0.3.6-r2.ebuild 1304 BLAKE2B bd8eade19b6d363027375ec8134f86e71291ba2f60a7aa88f792aa01682658fc3bc8fb5fb96f6aeb3c32c6b64b4458e3d5f090afd9c9e82da4feb2255b9da4d0 SHA512 1d39b9389cded6ca2b99d615763181bd23aa3b49a89dfd43632f5608a5e80018054de308d106601dd10075b6de2e63047035bcfcb6a03a0a6bf6a1018291a3e7
 EBUILD vimoutliner-0.4.0_p20180301-r1.ebuild 1094 BLAKE2B 06f2432288653826cb839fb0043701444355c2dd1161a5baa0d7f99eae6d4a987ca99c09858c810af284472dcf9a80971d6681cbdc940137d19410ef022515b7 SHA512 56413d64eda82ed2cc01813b6dab78769e28498f9013e483948461c5e7da111fba1e3b10374f188db8712d5009cb5861942b0db3450d9f553c0d9006df713520
 MISC metadata.xml 337 BLAKE2B c4ae899109190b6ad14fcc71ff0dbea76f7ab6b731992174b4623847291d63bb8cbdc7e73cd92343beafdba086e0b54c4cda686593ef8b836f8add578b0459d0 SHA512 782f682a6837436ee5db28f818b2168035fbae243aa466077053e17842fec96672d702b818ad28a9f1d0b8fa1a1e2fb79b056d2e31bc09d5bf522d5f18ea1c7b
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
index 36ebfb95a0a7..476488e93c9e 100644
--- a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-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
@@ -7,7 +7,7 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: easy and fast outlining"
 HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild
index b9d58e98e883..3834129199cc 100644
--- a/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild
@@ -9,7 +9,7 @@ inherit vim-plugin python-single-r1
 
 DESCRIPTION="vim plugin: easy and fast outlining"
 HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/app-vim/zenburn/Manifest b/app-vim/zenburn/Manifest
index 70b1529badbd..450fd494567f 100644
--- a/app-vim/zenburn/Manifest
+++ b/app-vim/zenburn/Manifest
@@ -1,3 +1,3 @@
-DIST zenburn-2.25.zip 8167 BLAKE2B 71a1a74a8ac7e76591cad3c2c9da3399aa6b5e242bec070b98486862de08c8864b824f98b2bd958e913750230202dd12b0003cda76a00fce8656c20db769f2a7 SHA512 4c448724682cc05ddcc60ed03e0368082ba42031e84960bdb21fd457daca07cfda05a54b68283b4524360bf97e0959fe018a14ea2edc5980d88b7b6b96105ce5
-EBUILD zenburn-2.25.ebuild 429 BLAKE2B 8c9e3a2cb2d66bc286d4977c5a8b58c144537b464fb8ca213ebf26aa3dc79dc5a8f142b97b0ce4b349f432efb73a76d03930289de4ab59bc180728937df33bc6 SHA512 1f04fdf364f6f309a5ccb0130734a51a152da536d81567088f9f04bf285e6fd1ae23b5363ee2941fa4266de52a3d2f5e76de33a7e31b69514de38c270ed9d6c5
+DIST zenburn-2.25.tar.gz 7361 BLAKE2B 728930ddfeca46d7e020882fde92841a0ed9c889504686589a5028b1b373bc3b7c862d8fcc0740731738416057f4c99533e835594e8ce01029174d74f446bab3 SHA512 e3d222b66696ce24ff6ce8ccda201a15ee27d868581c311b8c31e7eeada4a2fe3ca395d53fc42245b1dfe4b68394cd22f23203dbd6366298adc7a9d6428af683
+EBUILD zenburn-2.25.ebuild 417 BLAKE2B 1bf1b095ae48e66c7316dad62ae51e7389791a0996323c478038771298f688118ff4e6d5380cfa05dc60b510c8bda3bb8a108ca26fdce425b2c6c87fa1b1ec2b SHA512 b72d16822f01bd64b4802766861ba6cfe9ac637b06d52f5efba948483fc988502bd1c2d0125a0aa71f159f2a8e37dc7ff047131763c439c235d45cd768c18a2d
 MISC metadata.xml 425 BLAKE2B 7b16c41040090b5e0c43e75db0637ef1bd38c600616499f1cbac877789ee7e78aa659c21663369a9705fe4d994986b3a1c97866efbf302052aa0f46fad5fcbe1 SHA512 66ba23df2866a13c9117fe6d51ebda94bcec609a588f1560ac5fbe86f20b6a38f279796ee2105b07fb968bd5c0e04db31b290d43dc9227540b20548af5e24025
diff --git a/app-vim/zenburn/zenburn-2.25.ebuild b/app-vim/zenburn/zenburn-2.25.ebuild
index ca115c1f72a5..0aa00a9a4554 100644
--- a/app-vim/zenburn/zenburn-2.25.ebuild
+++ b/app-vim/zenburn/zenburn-2.25.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
@@ -9,10 +9,10 @@ MY_PN="Zenburn"
 
 DESCRIPTION="Low-contrast color scheme for Vim"
 HOMEPAGE="https://github.com/jnurmine/Zenburn"
-SRC_URI="https://github.com/jnurmine/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/jnurmine/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="GPL-1"
+SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 
-DEPEND="app-arch/unzip"
-
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 6794714cd028..7db38d19b5b9 100644
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index 1d341a594e85..0d398d21accb 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,5 +1,5 @@
 DIST ebuild-mode-1.46.tar.xz 34928 BLAKE2B ee2686f3862fc7aa5f820311a6e45d62b153426134422c56a2a6222795163f454291da5510e86c52edee1b22b7bec641ceb132147b29243ee647774a8e91342b SHA512 e7a81c9a3692db1c6db41e138b382e3027094529d4ad3244ecde5a245340f911f8a63ce8ce8bbd7910116c704bcf8fcce90142b8863ecc1b543760ef1411833e
 DIST ebuild-mode-1.47.tar.xz 34812 BLAKE2B abbc3be110239f9e1765d4f1293856a7fc616d497ac5256a28b7d78fc57c8d725abccbf7b9e5908cb85f9a684dc1be26ab88152d836c2ec3a481802091729717 SHA512 13ee756ef914a314f6705df78735a3926a50d156f4abeff917bed68298aec81f072d53a60f7b985d9bb2caddcdbf65fd26f6c9189e6c5c1822674d9142b7db17
 EBUILD ebuild-mode-1.46.ebuild 697 BLAKE2B d8336118054f744caa1f8673c2d7a81b40ac2164f7a5bcf8ecfc93a13b3d9eb9f84db1ab9de6a9290714866e3257b76c23805029a91a297a1a19b622308ba614 SHA512 ff4d5d6c10887d69b602e4827c4d170469ef2f545ed663269ea29b7913ccd4e134b7e2cbd58b77282c357e308f03a527c03de0ad800bc9636c35aeefe87866d3
-EBUILD ebuild-mode-1.47.ebuild 700 BLAKE2B f872acc489e9d936def27439c0cac9bb4a33b167c6405d0a3721e5f9425f45fb17b9cb4ca65b9e0c6291d1b63f932c492c7e17012ce3282dad04ddf633df8cff SHA512 ff75ecff4cca4a4664e6fc88f988a3204022b8045e6a0357c6de2cbab676ee49e95307005638d3998e0655106711a5a175bfedc0f629664fdd38b66a54c7d859
+EBUILD ebuild-mode-1.47.ebuild 697 BLAKE2B 926600d5707cccd5d47d486475d60ccd26622e8208aa14dc4b61b3f9504c700eec3da5c868948a38e9a035f32144a988d0835c8a3100e2d522424071527dff60 SHA512 ad3864638cdce34cd4e0993a1a6a448377bc541683db035f4ffbdeb799a5ef21007ecd3018673c7af8cc542bd5aa76e1f65f96b544c800d3faa09b2fcc4a4c60
 MISC metadata.xml 417 BLAKE2B d442b7726c175c95922475904d9dbb6260ecf53140bf041121fed80c3183142bdf7bcc88f7f87eeeab0dd91a81eacf507e2c4ea8cc8f86dbf6b60c52fcec868d SHA512 459969f9a78209b1058fb5fed220192bddd532c9dabc8e5d340c040bef0e454f08fe3896b33bcddaa011fd4639351f6f6a33ba6669895e99e001810324c101ad
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild
index ad5a9ccad6d0..e65982b198ea 100644
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 hppa x86"
 
 RDEPEND=">=app-editors/xemacs-21.4.20-r5
 	app-xemacs/sh-script"
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 3e5b3ca1295b..bd097bf098a9 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index fd5cb6dfabf9..3b154b482d12 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -3,7 +3,7 @@ AUX asis-2017-gentoo.patch 2030 BLAKE2B 261d2e32b818f17ea4ea51047cf71b73f89d9180
 DIST asis-2019-20190517-18AB5-src.tar.gz 6173053 BLAKE2B 2ce8ba783f5d58503f6b792329779eb8a5f99746b3b03225f13da058ed5a757aef49c6ae8729b71079c67da6537c35db1c7173a569a2d7063421da5d2adee2c4 SHA512 3ca32fa2eeee10ef2d0e6eb8ab555c3e31b417bdab6749fdd8bd264efa2c93a388a5731c40705782a3a28f16e0c385af195f69d95020e265b2230ead1c91977f
 DIST asis-gpl-2016-src.tar.gz 5240554 BLAKE2B b95be816f5f52ac2b29814c09166774884dc166df6e08b26769c9502443f9797c42a1f9b6168336636add6515b748b3ef4b38c6a1dc6f49c1afb9ecec8e50c50 SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee
 DIST asis-gpl-2018-src.tar.gz 5983604 BLAKE2B d91e3ff5cb95ec5b69121ed09e73f7bff234147b809353577315cd25cae0069ec5ebfc221a9798341b2a33bde316d74c4ce47c7ace580fe4d867e47032e207f2 SHA512 e00750adf17df8d534f0e561d129002d8b3c9efd6ba9c8d6768840d1399933271d748bafb7358a45d0a520620a335e669a6c2770ed89660bb319b609961a433a
-EBUILD asis-2016.ebuild 1220 BLAKE2B 3d31f42030ea2cf19b2c98159018528cfe423cdb4fbabb0bfe116cd5f153c2c2f4a80f357381cc8dbacb25134234f4529b36214596bdfd6f03af03423ed71e03 SHA512 77c3f1f87a1cfbbb96080e37a1ebf5d3a3407eda5e31e8fba02f2e155207e07cc3ec5c47917a0b4ae11293ae053e5c0602a2b46d5655bbe817a5a1a0d0010111
-EBUILD asis-2018.ebuild 1297 BLAKE2B e8fd884ce0b058dd198aadc4c0937ccac24585ec37dfe40e34f44f65e756df2ddf6b84d366a200f018aa60887c8564cc552966118cf8be2ce81a9cf803e355fd SHA512 6f4ced4d984e41c98bce656dc82c266f04287728660d80720595c4382c799b1382522eb7f4df6e6f8b81b34ee5fb7865ecccf40dee3f4e86982470fce602d395
+EBUILD asis-2016.ebuild 1232 BLAKE2B d3a93a852880141b7403033fa92830477e7df5a1f915a5114caa44524370da669b46784debe3d2eb752733aa5427f337ecf6874cde2c1118240f85668656e577 SHA512 e90b86afa5992ea86ae4f11d1023486f96a758b218091f2b7fc05a5434815d71d9b93c770f67144a80b87dd973fc211a13f8d5b900e809ef1251bcf499bca83f
+EBUILD asis-2018.ebuild 1315 BLAKE2B b9dc4ee73cca440af4b9af2987ebcf216d462b1551ac7a0147962bf456036f2ad36821234e3a76ee38bb77e81d4f42adf5ee8dae553c0e5745955cfe5c731f55 SHA512 e5f61d632e71e995319194ef9d813c4434446c6c18ae02bfec32cd974aebf0e723e6f55fd3241221f4b667785644dcde623612506cd448cadc36157b27b321ff
 EBUILD asis-2019.ebuild 1418 BLAKE2B d9576140d91ddeae07f5eb5c25ee740f6223492827ad5070029ad92db4c01926c5a875a4792ab441bdaabf1c89662bcfac5274683ed015424dd6fb67049e6348 SHA512 c27a90fc7082419a9a016add0d6c68274af236d498a47368464886b09436df44d29989fb2eac75945d723ff1ca94043a4bd5ec200046a042ef3f752c889de163
-MISC metadata.xml 794 BLAKE2B 4a70d59a4f24d7c0e075a11acd84a5e0cc21f9836e10bb4c3adffb98a5b4cd738489d0089852a7b303c014f78d38a758aae753db09f70285fe76a2cefaae5510 SHA512 99f17f74644496f2f74fb430f46b3e9e2927773b41d101d761d358f16c06bc8f2202b5467e718cabdaf0258a94511ff86718028cbd278fedc3814ac3d7c808d4
+MISC metadata.xml 507 BLAKE2B 8b1df4ce46d0dad00a66b5460fe5274c3d31080a6dbfe88c2482bce2097c22899ed9bf8415243c4af658dfb383c5865bf0b363cec7f72ddda54d595bbd772708 SHA512 09fcf4af4c0ff4a27bdd41a2abece2736c6f78c38b1a5a4f05dbe418def78493df4940b2ee6e528f9ffc9184f69c61deb1912fc309b0304da0b4a30f1690dd9d
diff --git a/dev-ada/asis/asis-2016.ebuild b/dev-ada/asis/asis-2016.ebuild
index 74f0b0bdfadc..e86f691ae7bb 100644
--- a/dev-ada/asis/asis-2016.ebuild
+++ b/dev-ada/asis/asis-2016.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,13 +16,13 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+gnat_2016 gnat_2017 gnat_2018"
 
-RDEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=]
+RDEPEND="dev-ada/gnat_util[gnat_2016(-)?,gnat_2017(-)?]
 	|| (
 		dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared]
 		dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,shared]
 	)"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 ) !gnat_2018"
 
diff --git a/dev-ada/asis/asis-2018.ebuild b/dev-ada/asis/asis-2018.ebuild
index 503e02383473..b895af4212b4 100644
--- a/dev-ada/asis/asis-2018.ebuild
+++ b/dev-ada/asis/asis-2018.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,11 +18,11 @@ IUSE="gnat_2017 +gnat_2018"
 
 RDEPEND="dev-ada/gnat_util[gnat_2017(-)?,gnat_2018(-)?]
 	|| (
-		dev-ada/gnatcoll-core[gnat_2017=,gnat_2018=,shared]
-		dev-ada/gnatcoll[gnat_2017=,gnat_2018=,projects,shared]
+		dev-ada/gnatcoll-core[gnat_2017(-)?,gnat_2018(-)?,shared]
+		dev-ada/gnatcoll[gnat_2017(-)?,gnat_2018(-)?,projects,shared]
 	)"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2017=,gnat_2018=]"
+	dev-ada/gprbuild[gnat_2017(-)?,gnat_2018(-)?]"
 
 REQUIRED_USE="|| ( gnat_2017 gnat_2018 )"
 
diff --git a/dev-ada/asis/metadata.xml b/dev-ada/asis/metadata.xml
index 4d4d828b644c..a2c17d742260 100644
--- a/dev-ada/asis/metadata.xml
+++ b/dev-ada/asis/metadata.xml
@@ -4,12 +4,6 @@
 	<maintainer type="project">
 		<email>ada@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
-	</use>
 	<longdescription lang="en">
 		ASIS is a library that gives applications access to the complete
 		syntactic and semantic structure of an Ada compilation unit. This
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index b2579b336618..df3ca80c08ff 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,6 +1,6 @@
 AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
 DIST aunit-2019-20190429-18B77-src.tar.gz 624683 BLAKE2B 455c3566ed46138116f258b175e883a59102dc334b41040cd6a332175fc4138d7ccdab1357c5b8886f14e551e3a6f4f4aa73eb755ade4a7a1663ac2d999973ca SHA512 9b1834ebacb9dbaa7a01f702455a44921a26a8d8d00f55ecc2fc8ddf2d884ef2ef2bba0f62551421f5a47d558d0fba88cbd57671459bba0c9f90c6310d714b19
 DIST aunit-gpl-2018-src.tar.gz 639544 BLAKE2B a7d7469b0ec4951517b113a794dca4399a27d6d5d848194fc5bfa7728a5cd04644e4b5f1247eb3cfbab64c0294502ac70cdd6e7052cd60b788c7892eddb4294e SHA512 3409b490978e9160e3ec2d9214d50f846c4c38f7a728cd4ff306d6454d1e0944023342f17a580b0449cb528f42d3c608adec58b61318284237d02b7f77498513
-EBUILD aunit-2018.ebuild 1156 BLAKE2B b432e80cad038926b2bfa98840e66b97de0e0403c4723340c85634152a99032bcfcdfe3751fceba7e173975f21db836ea89e189221bed59909cf58ac03e006a9 SHA512 82309c188fa9fce5f3f4a4fc12af988a589eb7adcf8a0311f4713990819bc82974cfeb382d099b0e29b02d1de7de72492affab7312be958dffc79b3903f09299
-EBUILD aunit-2019.ebuild 1335 BLAKE2B ad17ad295f3880d2c9b89c5635be075c2ea1cd1bd6c6157bae0410c7efcfa26a53b40bf3e741e68495e526d9875da034e8a9a490175b0a514df2b0e137cecb74 SHA512 054e01da1ecd29d386b0ecf014c5dccd76f2fa30b6d4a485958b01fd85b82d28164e70b37245837cd85930c8639b884607e02fbdd77ae0a5b1bd37669c60f984
-MISC metadata.xml 1051 BLAKE2B 5828d585f090cce22fb64f4f70e2e0a1d58757d4242910299c04eb3712c363ab64b0a316245ccc7e607c1261b1422a91830129d9b823b1c57e944ee1d227dc9c SHA512 8f64ba0a90839f9ef941982a3466704363c62f125eea6b1a6c782e9a268e97241a49bef0d62fc21c4f46ceb7a153c800c8a68ce3d7cc18f86087fe1b6513f571
+EBUILD aunit-2018.ebuild 1165 BLAKE2B ec11e394f0c83a3570d4e917a614fd4c42629409f53160e149ebd73bf80e51500be6427927845108a82a4c0ec81490866afe0fd291427a15a22e200b76271e91 SHA512 399dbeec06d5dd59adeaf107cb997c9ccce3acfe61c2733dd5bc17685b9aa748666942c552766f3c39bf0e9bc86353fafd9da5cf5e4556ba205b06afcabfcee7
+EBUILD aunit-2019.ebuild 1354 BLAKE2B e4a20da7dbec249b71ed193e46401f6d25d5b39502e1392a2c508f5c99cffa5542e480debef936f30ade98880e4c53bda16ba400d2f1b29837f6f871cf40db6b SHA512 4474a1c3eaf90391ce7f76c96ef291dc8c15fa47ea55842183c49f6911c896092f1d9775d84bc1b12212305b26226ef9fb16295f60ad6b339cf7d5427bcaa58c
+MISC metadata.xml 764 BLAKE2B fa5a767e7539d5fa8d2ce44240495fe471f8221897273a6c73748b0065a5239afaf99d4c28172a877b47611aa7d568a439cf47d172bee4a3f2878d4bd778ef9d SHA512 211f0200353e3573a700d1cbacb421e53e817617bbc5b74dbfb668194eae397b34193ad743acf70287b66d3fcb4c366214822b2e97a15bcfa80f9252b7f5faa9
diff --git a/dev-ada/aunit/aunit-2018.ebuild b/dev-ada/aunit/aunit-2018.ebuild
index ccb8643f3730..9e5b6ccce816 100644
--- a/dev-ada/aunit/aunit-2018.ebuild
+++ b/dev-ada/aunit/aunit-2018.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
@@ -21,7 +21,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
 	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 )"
 
diff --git a/dev-ada/aunit/aunit-2019.ebuild b/dev-ada/aunit/aunit-2019.ebuild
index 069e8fc90324..58339ce37a43 100644
--- a/dev-ada/aunit/aunit-2019.ebuild
+++ b/dev-ada/aunit/aunit-2019.ebuild
@@ -22,7 +22,8 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
 	gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
diff --git a/dev-ada/aunit/metadata.xml b/dev-ada/aunit/metadata.xml
index 1d2d7f1a8b65..ae3ec21e600e 100644
--- a/dev-ada/aunit/metadata.xml
+++ b/dev-ada/aunit/metadata.xml
@@ -4,12 +4,6 @@
 	<maintainer type="project">
 		<email>ada@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
-	</use>
 	<longdescription lang="en">
 		AUnit is a set of Ada packages based on the xUnit family of unit test
 		frameworks. It’s intended as a developer’s tool to facilitate confident
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 791adfd2b684..598bca431537 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -3,8 +3,8 @@ AUX aws-2018-gentoo.patch 2097 BLAKE2B cbb0ed91c632292994efc2bec19d49b8ce62b0ccb
 DIST aws-2019-20190512-18AB9-src.tar.gz 4241817 BLAKE2B 1054c17c0e79ea4992a7e29fdb1996caa663321407b64ae88cb76cb03d953b7ea36a8c91a28f60328ea2ec3223c1d7f8c2f052f4f181f03b1f59cf33443ee27e SHA512 989043f75504ee8b3736800fa36f4d3a98a6bc745ff4bef38dd4f7c8a7072d5d1ea383dfd2fc090d8558a6d6442953e5f3c65e4633ab16bfb3dacf60ebf79a3b
 DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
 DIST aws-gpl-2018-src.tar.gz 4193276 BLAKE2B 31fa99fc3324f2514799a33cbd282f68a26d133da14ee2a70d3f5091c3670e82a7b77f9f941e593e914a755dd54d5a1e352d201a9dc097991b7bd50aa9f54b3b SHA512 62b85f70dd722148bbf3ad85bfd6cde2d0ab1d8029f673eb7ee42b0890c3dbf0f023c321e96eca99ccd2f0b235347ab577cfb558e7d81993d166683ec815dbe4
-EBUILD aws-2017.ebuild 1025 BLAKE2B f7b86bf4a470b5376061b4ce47263889f66d68cde383136312d979959d9c1f59e96d8367d242e44ec750bf6e006d7144f1fb337bbdcac6f95f2a42b82b3e0756 SHA512 23a477b56590afe16de4fc6707fc776daf431a0f576d002bbf0ab5305694b2d0f701bb5d4c85ca622bb4b13f3f3c7c7760820457688b5ee6bb78984558a68df5
-EBUILD aws-2018-r1.ebuild 1188 BLAKE2B 9fc4e57fba892e399f424bb56307aa3e36be1606fdab1ffad7ac1547bcfa8a3f5249c9625e57c6eb95f538b53cc4b98b738e4d85949311fb0e9e31b1a735ab3a SHA512 f049316cc3a95c4950334cccfb00f74965cd2416e1550309189c56551b84e0e7db8daf1f1cdaf71cce13b7b936f0615c19309ab8c51c9e4287946987d2a7e10f
-EBUILD aws-2018.ebuild 1004 BLAKE2B 54fe0f8d215f2f4e48deecf0439fa38c9a6ea33691e12378e39722413f7615e6650af2e4f14aebe2003f242f2128c97013bb8b035d9ab088377a653f2b50ef25 SHA512 0f61677a688267efc153d69ba68f9e9f12140cc5883f955894c896dacc1b9a1b24c045a476250834e74de12476223fc98e393b7f25038bcb75bab9cd95c7f74d
+EBUILD aws-2017.ebuild 1043 BLAKE2B 4bf8df983ccf8dc107999091aacc234dc16e53c8cad90a06fe41cb00808a1394612a684864daf6931ba2dc5c940975256e5d0e9bdf6831d618dfcc74856ec876 SHA512 b09d084921f0a5268188405801e107f0679d1f8041dfb93f116eade1c04033146b4dd9c521fe1b5217cc6e927d91c7583e1662259c50b0975ed8d66b36807c93
+EBUILD aws-2018-r1.ebuild 1207 BLAKE2B d57e15312c9735c240b71679e379cec64249d1dea46462b62f00bbacb7f150cc295bb6b4b99d9e5e75eba310c15c82d2b3fa389e331964409e9c4f485a5afed7 SHA512 04d8b535f4086d32bbdf792ed9f80a071777b61e04b34048a88185262d3addd983f4b91b12e43ad6e4554751cb3bd8571ff591310fb60830f1dd7576fa97c110
+EBUILD aws-2018.ebuild 1010 BLAKE2B 220f4ef079cbe6a6e2d5672c338e1c8cdde58c985ed6fac110c07ad867390ec2e654c2b94db609ac0b4d3ee3679b73b98e73d7664a5e527a342d174780ded586 SHA512 b547af64ff976d2bc95d7cddfd1bceefcea0f92ce6e5065bb14442a3693236ea6b91682223a5b357690e32d6f3fc960e857e55f25af2971c6f845ccd32bdaf89
 EBUILD aws-2019.ebuild 844 BLAKE2B fb145d0a9ad8af618b011dbe870932077ee571b5474019603d9ac7e00aaaa1dbbbc6a94606dca60b76792093f9e8d447221dabb46824b270125ff9cdce974bbf SHA512 38f856ed7a87e116a556a084fb7ed3f1131028998d7fc1595dae97e87b1613112b014705dd83f24a161047760e8beb9b6adb615d55664cfd6cf5dde1d827a096
-MISC metadata.xml 946 BLAKE2B b3cbfc3e5c25db14f46b6a3f617fc9f8d6cdb043fa4cd3f678969625df42fe63503ad9bdd01e71dfc580c2e86c1b0cf8de4d2807dbe84b81518dbb8216f807dd SHA512 1751c4efb119a546872823b4f937cb39a7964b09dd60cbf9c8db083b9fd06e7ed801d3adcabc793ac633d2aef540a120e940956d63da7a6eb90bf704ebcc087a
+MISC metadata.xml 659 BLAKE2B b9dcbdc561b8ffd774e7aa8d5fc1a6a809e1017e3b83d6473d8c72c690abac54b3a0ea7c4df5cbc5ed832ce9bf60e26d71c43f09cf35b3c33bdba9c3fb2dd423 SHA512 b17cf2ab035805b5e0fd7f423cfbaca61eaa6a8e7ce575fcb65b631b3c3318fc0eb9fbdcd4010a0187f07a4986acd351809697a7fc044ab7a9f4fe394b6ca227
diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild
index 081d598a0027..7bc3f363c081 100644
--- a/dev-ada/aws/aws-2017.ebuild
+++ b/dev-ada/aws/aws-2017.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
@@ -19,9 +19,9 @@ IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]"
 DEPEND="${RDEPEND}
-	dev-ada/gnat_util[gnat_2016=,gnat_2017=,static-libs]
-	dev-ada/asis[gnat_2016=,gnat_2017=]
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+	dev-ada/gnat_util[gnat_2016(-)?,gnat_2017(-)?,static-libs]
+	dev-ada/asis[gnat_2016(-)?,gnat_2017(-)?]
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]"
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-ada/aws/aws-2018-r1.ebuild b/dev-ada/aws/aws-2018-r1.ebuild
index a3ffe95306c1..8cdf9346bfde 100644
--- a/dev-ada/aws/aws-2018-r1.ebuild
+++ b/dev-ada/aws/aws-2018-r1.ebuild
@@ -22,7 +22,8 @@ RDEPEND="dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
 DEPEND="${RDEPEND}
 	dev-ada/asis[gnat_2016(-)?]
 	dev-ada/asis[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
diff --git a/dev-ada/aws/aws-2018.ebuild b/dev-ada/aws/aws-2018.ebuild
index 877e8c4fc1e0..13df9f3052b8 100644
--- a/dev-ada/aws/aws-2018.ebuild
+++ b/dev-ada/aws/aws-2018.ebuild
@@ -21,7 +21,7 @@ RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=]
 	dev-ada/xmlada[shared,static-libs]"
 DEPEND="${RDEPEND}
 	dev-ada/asis[gnat_2016(-)=,gnat_2017(-)=,gnat_2018(-)=]
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]"
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/dev-ada/aws/metadata.xml b/dev-ada/aws/metadata.xml
index 9f6b024a0833..732360689a7a 100644
--- a/dev-ada/aws/metadata.xml
+++ b/dev-ada/aws/metadata.xml
@@ -4,12 +4,6 @@
 	<maintainer type="project">
 		<email>ada@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
-	</use>
 	<longdescription lang="en">
 		AWS is a complete framework to develop Web based applications. The main part
 		of the framework is the embedded Web server. This small yet powerful Web
diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
index 81b2d6f37d9e..1508655eff54 100644
--- a/dev-ada/gnat_util/Manifest
+++ b/dev-ada/gnat_util/Manifest
@@ -2,9 +2,8 @@ AUX gnat_util-2017-gentoo.patch 2419 BLAKE2B e8085e6a6cb65c5ffe6054aa360e90042a0
 DIST gnat_util-2019-20190517-18c94-src.tar.gz 906682 BLAKE2B d00ae8b92429f9a7d7476ff6437148a869555fb66435f9355b8ba1ec3d827cd32063e9b64a6862b99a4b26e570e1a1a7b4dfabd67d1aa1b997fb5510e9b43324 SHA512 fbf9114a75f6f794705384a67581f1630460292b8d640c34323c8147bea280bdf2ac8b6097313992d27716f2edc814e587d9396d85d28158ea82ee6002e47425
 DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818f4d1bd457b113d775fe97f35f7352e03b602ac0e6d7b970e408fb3dd6d30f0d4e60feffccf42dbdc0723a76855b0164ee0 SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a
 DIST gnat_util-gpl-2018-src.tar.gz 883945 BLAKE2B e30ee379f4ea9525337b0794d4fc91c80458b3b1dd3d10cbc455c6f566d4d073b6753c171ffbbabd85995717de249cdee7c094b7ba00d752a13e18d0f54da192 SHA512 490b0fa944f4b9fee2a4e78c1181658eb8f95262314455c41beb3ebe9db5dd540090d1f9840357572969721966fa11085dc680f3498dc539631ef3f4dbf56426
-EBUILD gnat_util-2017-r1.ebuild 1430 BLAKE2B 1d5e92937f0ce1196145bf75b2df951201265ed320b62c6c7709a58127e5e3c0f66a77e23e1becfc95bcc370aafb887c4808fd06ad9376ccfa0c9eb90b388856 SHA512 4c675dcac5771a4581c85ef5fdee785155395af8fe7f8943f7e2a7cc6d562d830f6b8f770055ce0da32c098ea15bce41fbc6e7d90d576feb44b565445a77a8c5
-EBUILD gnat_util-2017.ebuild 1422 BLAKE2B b69c22ede488f993d0efeb7e66846c33f20f15e10b5344ff02252fb6d037910fc4bc24fd0421a08504164796bc50481bae6109e2d3ebd21a4425ff6d969fc918 SHA512 d3a1ebb59b8a31162349bc40027f5cb36f8e7ed4de8190fc336f4ad930792b8263bd0c47909d909245c348823a57d05bfe26fabce0938c4e292c7b7f70154cd4
+EBUILD gnat_util-2017-r1.ebuild 1428 BLAKE2B 82c57959eecc3aaa4aa4f47495ec92d05dbdb195f03834d5d0fa8c133b69f293e1cb460c071daf9025e69e15eba75160f81874118d2055c312ef832a92a33a05 SHA512 c7df4a1ed891db9d537b819aaa9ffae0f7750e0b95ae1182a8d90619288888287e6336624dd127a913b872f35a890527714f16e5c48a246ee45aebd4f06bb8d0
 EBUILD gnat_util-2018-r1.ebuild 1436 BLAKE2B 4a97460a25fdb8bfcac1eb0783a3fc9111aae0636f01a966a0c58c1298244f23eae1345d56ff72d4b3b6d03ce97e6890b70393d00f00a6347d5ad69e5a9ab652 SHA512 ffcb270b491efdfd0a6cbeb9a3d1c9a3ec1d3c8d7d5b7f3eab9da404789f570611cac0861b77933f67fe2977d9fec5672aea8293d11b66e361650d6f0a2ec6bd
 EBUILD gnat_util-2018.ebuild 1326 BLAKE2B 336432396b5b98f7d59704f30a7063873651c296eb8a63700025c5c37cda497baf1caac3d4097ed95b99cfb1aee9e8402a1e75293560b7db1e12bb40b1a5aaf6 SHA512 8014d612eb4e2fcd1599aa6262f6afc131ca5dea70b40f096aa22c95a94bcb0ecc38a94c705254085b84c56e89fb21a034f082a5606885f58231dfe37738b247
 EBUILD gnat_util-2019.ebuild 1296 BLAKE2B ee2e6b50d0ea4e324864d4be580607616bb8c556c1d53e4afa154d7662e8b396b2d5fc06521d56145dd63d6f5671de7ade9982b0dbd77319925527ae534e7691 SHA512 b849ce93833c3aecd9ee93ef275e546580c261fc395bc440a215590e5d370c098e485e32ccc96a5fcfc04bb0a8af402541ed8babe07bd39890b8b1406379cef7
-MISC metadata.xml 1193 BLAKE2B 1661d540e7969dfb3abb0d53ff6250f9f26809f07f03859c066d34088d7908f3889a787b237e935ab500466763e5166933c2d3e92f50c07e01d809a0f318a802 SHA512 c75c8b8e0344dcd9e9b5aac3b5f300798b0138b31cac960a485886805cea164cdbc224a7e6324bb2834c188115b0e6bd9463e0fb114c5dea1b1481d049a9ad13
+MISC metadata.xml 921 BLAKE2B 7e70b07f291098feab880aaedb4ebf5eb1dd6a83d4e5bff1f50b9e8657b9d2fc947cc33d91c02b1a1df5cfd15ce565fee9c267fdbe4063affc4a02e8944348c2 SHA512 d313f2d9d6dfd9a5616e75ce7ab5fb3670deb54f0fbc66f584ce398d5b5c8b9196f92833f54188ab8ea5dc50e5b7b8c74104b4af7050b268e9c2dfd5defe0374
diff --git a/dev-ada/gnat_util/gnat_util-2017-r1.ebuild b/dev-ada/gnat_util/gnat_util-2017-r1.ebuild
index 0d7f07e12a8f..3a211e741e37 100644
--- a/dev-ada/gnat_util/gnat_util-2017-r1.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2017-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/gnat_util/gnat_util-2017.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild
deleted file mode 100644
index de225724a4e8..000000000000
--- a/dev-ada/gnat_util/gnat_util-2017.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
-		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-	if use static-libs; then
-		emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \
-				build-${kind}
-		fi
-	done
-}
-
-src_install() {
-	if use static-libs; then
-		emake prefix="${D}"/usr install-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake prefix="${D}"/usr install-${kind}
-		fi
-	done
-	einstalldocs
-}
diff --git a/dev-ada/gnat_util/metadata.xml b/dev-ada/gnat_util/metadata.xml
index 7810e6399b12..a1270420b82b 100644
--- a/dev-ada/gnat_util/metadata.xml
+++ b/dev-ada/gnat_util/metadata.xml
@@ -5,10 +5,6 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="shared">Build gnat_util shared library</flag>
 		<flag name="static-pic">Build gnat_util static library with pic code</flag>
 	</use>
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest
index 5f9611707b18..147dde2c8fc8 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1,6 +1,5 @@
 DIST gnatcoll-bindings-2019-20190430-1928C-src.tar.gz 138935 BLAKE2B c72398b51bf383b163ac10000c4dd5441334a6f24d7ad075d8115f25c030b43bc1dace6a1121e1e69add1eead93a5389aff09ef013deb4682ccb1d31bb85313f SHA512 6db1d35a1cdf5188001084750f7aa32b193768f8c3dfb6d7db8a8314c745fc054b0a6d2234a6dd64c5acd4b1bafffa7ce7f1080bd51fbb8bc88edfcc855b7a48
 DIST gnatcoll-bindings-gpl-2018-src.tar.gz 100068 BLAKE2B 7e5fe106d421d853135ddaea04b7bf2b306e7d0f054379b4c66b58844ac73270d7c82de549e9440f4ecc672ed7e9df6e2b3c1fea55b67403aaa33b09c124bb9b SHA512 2d42e904ab7324d958b34b103ceb2cf7d9bf620f324578b8d3537c18bcc2b4ba73d553bbec773cde5d57979c3e68bc9eef69f97dd55a3b21e43d464881676295
-EBUILD gnatcoll-bindings-2018-r1.ebuild 2248 BLAKE2B a993d10786af11f28309c092ab9fbeafefa51ead53f8f78b07b672034306fdb202b10cda2fd0a8d1913a192fb0eb6d1a9ed061f9dc131adec38db9a0266f0c49 SHA512 f3c6d4029a8d08d3d74f9c3602f0399e3f12e942346f6a6a8a9545ddefce63b54b86e5d2d89281f5a04230e87346b2e0bc472be65c2618a5636316ea95e7ba7e
-EBUILD gnatcoll-bindings-2018.ebuild 2142 BLAKE2B 8ee5521ae2b74c65a8adff85ae19459c5dfb993184c436d05813236cc8c2bad0b7df87f46e9c1c7efb614020d51cae95f717d0be60fab88229cbfe65d9dc88e9 SHA512 16a17b64f31fbb362c58325efa18da979193befbc642270b240e0b6b36bfe243c1aef67e3b91efba097cb55097ee0b1dadc61bf8faf153d5431a6ceff1d22118
-EBUILD gnatcoll-bindings-2019.ebuild 2252 BLAKE2B e6c1d076c3983d155ec133d42718a58f52b0ab435c46a5ec53666b898182893577b5317c5100a30e44b7f65e0ed94c42bfd02f52134e89f711789b55b2e0b7f7 SHA512 39bf1d9214961bb7087d9bd04dc8e984b71d9572711f2d91d5cfa3c8ee4aa0766f08900f93e49befe3940f16589335cd155736325c9aa1d69eea61199d8883fc
-MISC metadata.xml 1353 BLAKE2B d8e1f6c7684858b837728014480a82099f9ff663db60b359681732754a6825639bdbef93d0b6c4c744358b5da1b0bdb2f35ddc8f082d53a51f509bf1914ff61b SHA512 e4094ba1d5fb1b1dafa446cb75351ce459aff3e2bd13bc0f3aa62303e23c67a96a4e04ff95ca09abe9aa5b6717309f004f2938c7aba569f849df4071c437310f
+EBUILD gnatcoll-bindings-2018-r1.ebuild 2265 BLAKE2B 6a68652aa98e6cc69e4158542b72826ed4aa12164e0c5555d7d490d6ad4d10196e3527875be17f6bc02a7f485e3dc9eccd9cc25ae5cdb8fedee3f4888a2ce8b7 SHA512 b324c1a8f9eb2cacb141ea49d1f1901d26f584976f34c1e3d8334bb2fcbfcc7483151c866d40b2d9e5ca36f8565c212d22e519b85dbb14f8691e96245efc268e
+EBUILD gnatcoll-bindings-2019.ebuild 2271 BLAKE2B ff53a14264e960bcb52a323f6b939b649e0c63b3f9c0481c33daea6223e3385f5f0cc9ede9755d65883b5e9182563944246f1edf5c9f73b9b5f089e4c94aab5b SHA512 c659dcee428f2acc6122b05d5deb050a68533c291e5ca6992d124e8af168d1854040f906af7df83b7598f80d7503204ab2d5ac1bcd41d6588bd305a0d63764bf
+MISC metadata.xml 1081 BLAKE2B a4c643dd943c019ebb42f81dc078391885d80fb3abf3afb52494d33802592eacbf43c33560855239c7e88e86f306444392b9a6336a8255d18762f095d8283838 SHA512 7e4006ffc2f972dc45efb174451c9450545c10b1b55c63bad0157940d5c64da2ac7a908f51c4a0244e2df3b09e448aac610b97dfdfa8e80a32d913de2f6c31af
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
index e4b95d410d3e..131bd638518d 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cfc7a4475261f97ca5
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gmp iconv python readline +shared
 	static-libs static-pic syslog"
 
@@ -24,7 +24,8 @@ RDEPEND="python? ( ${PYTHON_DEPS} )
 	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
 	gmp? ( dev-libs/gmp:* )"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild
deleted file mode 100644
index 5d7f13c2235f..000000000000
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib multiprocessing python-single-r1
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cfc7a4475261f97ca5
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 gmp iconv python readline +shared
-	static-libs static-pic syslog"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=]
-	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
-	gmp? ( dev-libs/gmp:* )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}"/${MYP}-src
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
-			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-		fi
-	done
-}
-
-src_install() {
-	build () {
-		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-		fi
-	done
-	if use iconv; then
-		sed -i \
-			-e "s:GNATCOLL_ICONV_BUILD:LIBRARY_TYPE:" \
-			"${D}"/usr/share/gpr/gnatcoll_iconv.gpr \
-			|| die
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild
index 60a73d35f0d0..d4e00b70793b 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild
@@ -24,7 +24,8 @@ RDEPEND="python? ( ${PYTHON_DEPS} )
 	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
 	gmp? ( dev-libs/gmp:* )"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
diff --git a/dev-ada/gnatcoll-bindings/metadata.xml b/dev-ada/gnatcoll-bindings/metadata.xml
index 911c487969ed..bd36590b78b7 100644
--- a/dev-ada/gnatcoll-bindings/metadata.xml
+++ b/dev-ada/gnatcoll-bindings/metadata.xml
@@ -5,10 +5,6 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build shared library</flag>
 	</use>
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 8a7546724d9e..8986cfdee86d 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,7 +1,6 @@
 AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64
 DIST gnatcoll-core-2019-20190515-24AD8-src.tar.gz 1423276 BLAKE2B 154b7a7f77c1f0d6414cb407958d64b84be8d19b7e3a12f69bd3dd1253b71df394aa0c842d2caf9d2de071ea5466589111526329155291f0d967c8b4cc2b18ac SHA512 9b2101448b96ac46cebada1fe3cb7b583cbf296f9b7d627771e83c56c78ce72c50ede5474f64f16feba252a18fd46b473901820766902b0c68d63beaf55a884a
 DIST gnatcoll-core-gpl-2018-src.tar.gz 1657129 BLAKE2B 616aef931fb542f4a022c63db53acb0f8b4323e3b948eb7b8b5688c36817b3f52b5f517b969b0560b6492d51a3e59c8350449cbbe7246b5294c45caeead4d9d6 SHA512 bf6082573dc537836ea8506a2c9a75dc7837440c35c5b02a52add52e38290d99e90a9706690591f8899b8b4935824b195f230b3aa1c4da10911e3caf954c04ac
-EBUILD gnatcoll-core-2018-r1.ebuild 1819 BLAKE2B c7ebb38b4ee6b3cce6b2a54aadad4482b03405cdf290498f63ca0106af6fc9b8e865f31b352112f7dc875047388a5cdfd9681bfff3505c8dd4d5248ead9fc9de SHA512 469841e1059869a40084d23150ec8c053e3752c319c8945b004a2422ab5a09df222a3039def88c764356de7f325adf72ee6a483b878055fe8f78bc3625bd6d2a
-EBUILD gnatcoll-core-2018.ebuild 1657 BLAKE2B 65f2a5a2f354b4582607e90d278099cdc17f9dfa416639e39c095f991b531d01c45256d059b30a9f26c41393c52f6f84d9e91cf8e073b3f6d314f7585334bc1f SHA512 17303963480f1335c29d4af93e2038f128a676a2a62ced9a77cf4434892b1bc94356992f55af24f3dee18f4cc9f5b65c10a799298bcee691a1d84a891cf46881
-EBUILD gnatcoll-core-2019.ebuild 1830 BLAKE2B 45bb3e91490790ae103d74ccf9397dbae604c4f1200bace2452e881d7b7fd6fa72663b991b3e1ea91ca13905ed3c683432e565cf4b3d513f368da6640bb19056 SHA512 25a6c2dfad3738c5aed6bfd7c1cb5852d5511ff568e45ce557ec454c20222671c9790a34e8850e15c03ef5378f2b31886736ec480fe78836b3e8036e5e154b13
-MISC metadata.xml 1367 BLAKE2B 8d2cc7d1880d5dad79c2a3c7692c6a0261605ba5de8709ca89eab302671b8261ec5a1d25db143cd7aa16b963c3893b47681d27f44a88ef82e685842e1301836f SHA512 b1574899cdb80ac0e497b7d3f1f281ac95f0573f8a917ab4545ce0c9a2a8aad6b7082f854f07d954c4f54af578070406d01d65ae008a2966bc35fe5aaff4ce1b
+EBUILD gnatcoll-core-2018-r1.ebuild 1836 BLAKE2B 47ca0213599f3b740c14934bb3360599d86409a221ef555e5388c39f16bb1e7f73fae3b7bdd914919e4d4d9d8431630af364166daccb3fc5aa491739c4be5a37 SHA512 e54b32a58803f4c2bb06a56d3981dff7ae9a8bdd0fd8a055316a489e433a7f807828f32501718644983fa602e7bf0556342148099ce0be00a8e9a4ffa5bd8815
+EBUILD gnatcoll-core-2019.ebuild 1849 BLAKE2B 2d4e3be08c9126b602bdb97808e9514d982141975647cc3755cb6382c6005db7e31129512b5991e65d26ac26ad80ae4c0e92c996b5c4e5954c01c999abb292a3 SHA512 d519208fd2ac9e542a017f2fa2b78b7974cbe04042b110901eb1a3678573a2457109e6c59ab1708f6548133827f2f978114d7d1cdf31bb6259a27ad8f43edf84
+MISC metadata.xml 1095 BLAKE2B 52c64e5050f7d0be080c1c05a6beef22b88e1389c61c958c8f0ccd6958e7686c3b8ca5dcca685f0314e68e1713635475178d63edef1d41277ca83fdb59322529 SHA512 57963c0ed66d0f4844b6d41e66c3c2451f4d61da45119b38e3ef2e5b80de94d6426eefbc0307928c3629e052bd4c0fdd2e6e2cf7678029308299ffb151960905
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
index e3449f09b04f..605dcf42e672 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic"
 
 RDEPEND="
@@ -21,7 +21,8 @@ RDEPEND="
 	dev-ada/libgpr[shared?,static-libs?,static-pic?]
 	!dev-ada/gnatcoll"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild
deleted file mode 100644
index 37d1058f21c9..000000000000
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="GNAT Component Collection Core packages"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
-
-RDEPEND="
-	dev-ada/libgpr[gnat_2016=,gnat_2017=,gnat_2018=]
-	dev-ada/libgpr[shared?,static-libs?,static-pic?]
-	!dev-ada/gnatcoll"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	elif use gnat_2017; then
-		GCC_PV=6.3.0
-	else
-		GCC_PV=7.3.1
-	fi
-	default
-	sed -i \
-		-e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
-		src/gnatcoll-projects.ads \
-		|| die
-}
-
-src_configure() {
-	emake prefix="${D}usr" PROCESSORS=$(makeopts_jobs) setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) \
-			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
-			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	if use static-libs; then
-		build static
-	fi
-}
-
-src_install() {
-	if use shared; then
-		emake install-relocatable
-	fi
-	if use static-pic; then
-		emake install-static-pic
-	fi
-	if use static-libs; then
-		emake install-static
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild
index e9678209c711..e1a9570911f3 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild
@@ -21,7 +21,8 @@ RDEPEND="
 	dev-ada/libgpr[shared?,static-libs?,static-pic?]
 	!dev-ada/gnatcoll"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
diff --git a/dev-ada/gnatcoll-core/metadata.xml b/dev-ada/gnatcoll-core/metadata.xml
index 67e9acaf0903..26e17d5dcfbb 100644
--- a/dev-ada/gnatcoll-core/metadata.xml
+++ b/dev-ada/gnatcoll-core/metadata.xml
@@ -5,10 +5,6 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2018</flag>
 		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
index 8c3ad6a4a7b4..5084389e81e4 100644
--- a/dev-ada/gnatcoll-db/Manifest
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -1,5 +1,4 @@
 AUX gnatcoll-db-2018-gentoo.patch 361 BLAKE2B c7b15cb7433a5bb0f9fee68df4594a390d8d77ccd027e583dd14037a7a1319e727c99fbf4dc81de97ff457f1e0f6b237d1436f6b336668aca956fc5c083cbab6 SHA512 4d90c530bfa6948282c61c6df92a32aa8e03fa794768568ce10dda9a43cd3b56970761a0bd30913ae51f0a2605f2bc0ecc2124561982c7951985c35a974264e7
 DIST gnatcoll-db-gpl-2018-src.tar.gz 2375712 BLAKE2B d5678bdc0993b67d93bdd4cb33ee3ecba15f7cdeead173caaaa08312103505d97099037215a3b0699296aadfa0ef68327f28e01c6229db1fefc5b7d7ebf93187 SHA512 02c967b5951ef0e17e58874e03c9a6252f9c4b28100c9530fb88212e91bc692545f3acc8623477942db220bd54d56b494150b088d05c40f6a24aad8cf6a8f8de
-EBUILD gnatcoll-db-2018-r1.ebuild 2802 BLAKE2B 4804c796c704d417276f345f97b02089edbe911e43c05ca5209c8f824131b5de4fd9cae0404dbdce90835a84ba20e0d16f6bf2d3692f869d26d98e55cfbf33ce SHA512 47ef7f0a0aab10023565291e049b7290c1a6af1c22158a41cd4ffcde4be503bdc18ed7f17a8f657df79e11c6bc1ebc550d54ec13cae14be5364a8963946cef20
-EBUILD gnatcoll-db-2018.ebuild 2633 BLAKE2B 87dd5f392ab6986ba13268ca70c7c873486471c9dd4e62f8160666a149a386249693506c244b02b455f47f033c28325da27c7ca893ca93a7cae4a39a1fa9e8d8 SHA512 5e0885514dc75800d83b444f53d5487b1c0ea3faf04581335f876cd64b2631ba541f76fc5bb1b704190f20c13ba9421e0bd7ac7d0e336654de3e3f16f7de2280
-MISC metadata.xml 1555 BLAKE2B 18ba00a762c3ec120d127c9c47f8e7b086fa6126bf6a9196e7ffd7d29f88725d591df937d809c1348e20785d03a6371455fd9ae6ee8b40f68533392ded420279 SHA512 4c515e6411f950d2847076bcd2aca4b49ba9639f439e865c186616e7e7529bbc89f31f8f956e9246d56f68f4f4447849067df71a6fed141a3b2eefe056134186
+EBUILD gnatcoll-db-2018-r1.ebuild 2819 BLAKE2B 8ea0088b103661b811009fe4bbaa8a9de77e07e04e82d0387edc708b527527bb35a6f539944edf38385d36509a0482bffdc72934a7f9e99dff7f6ed51a3b1ad3 SHA512 2b1f5c94d82d86a7737c68aedfda88674bb427911117036a7c1439cb297659de3167456b4cd8127413526d4107c6197f6220fc42b2ea8949799f3c0060355eeb
+MISC metadata.xml 1283 BLAKE2B edf8cff8d918007b78ad3d5011a1b4b6b0d3cb1023b892c941d499dd054c21e6e7e9ce0dc913b33e80f0052cd25d453114e622ffedd737f1a4e45bd9dd616364 SHA512 4c5746a6e201c8c5a1d4d17af1c73ed5f402eddf3af2b152e0229d847476b03dba2fb15c4439b0f032b5f0ed9ed425267db0e36617d9d220709c4ff279ea6e7c
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
index edb42ca118a3..af9bc69a22f9 100644
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cbc7a4475263382be6
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gnatcoll_db2ada gnatinspect postgres
 	+shared sql sqlite static-libs static-pic xref"
 
@@ -28,7 +28,8 @@ RDEPEND="dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_20
 	)
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 REQUIRED_USE="gnatinspect? ( xref )
 	xref? ( sqlite )
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
deleted file mode 100644
index bce7b5b49aef..000000000000
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit multilib multiprocessing autotools python-single-r1
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cbc7a4475263382be6
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 gnatcoll_db2ada gnatinspect postgres
-	+shared sql sqlite static-libs static-pic xref"
-
-RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=]
-	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
-	sqlite? ( dev-db/sqlite:3 )
-	postgres? ( dev-db/postgresql:* )
-	xref? (
-		dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?]
-		dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=]
-	)"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
-
-REQUIRED_USE="gnatinspect? ( xref )
-	xref? ( sqlite )
-	sqlite? ( sql )
-	gnatcoll_db2ada? ( sql )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	build () {
-		GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \
-			gprbuild -p -m -v -j$(makeopts_jobs) -XGNATCOLL_SQLITE=external \
-			-XGNATCOLL_VERSION=2018 \
-			-XBUILD=PROD -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 -XGPR_BUILD=$2 \
-			-P $1/$3.gpr \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in sql sqlite xref postgres ; do
-				if use $dir; then
-					build $dir $lib gnatcoll_${dir}
-				fi
-			done
-		fi
-	done
-	if use shared; then
-		preflib=relocatable
-	elif use static-libs; then
-		preflib=static
-	else
-		preflib=static-pic
-	fi
-	for dir in gnatinspect gnatcoll_db2ada ; do
-		if use $dir; then
-			build $dir $lib ${dir}
-		fi
-	done
-}
-
-src_install() {
-	build () {
-		GPR_PROJECT_PATH="${D}/usr/share/gpr" gprinstall -p -f \
-			-XBUILD=PROD -XGNATCOLL_VERSION=2018 \
-			--prefix="${D}"/usr -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 \
-			-XGPR_BUILD=$2 --build-name=$2 --build-var=LIBRARY_TYPE \
-			-P $1/$3.gpr
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in sql sqlite xref postgres ; do
-				if use $dir; then
-					build $dir $lib gnatcoll_${dir}
-				fi
-			done
-		fi
-	done
-	for dir in gnatinspect gnatcoll_db2ada ; do
-		if use $dir; then
-			build $dir $lib ${dir}
-		fi
-	done
-	rm -rf "${D}"/usr/share/gpr/manifests
-	einstalldocs
-}
diff --git a/dev-ada/gnatcoll-db/metadata.xml b/dev-ada/gnatcoll-db/metadata.xml
index 7cd1fd91fa6e..888f72c483e5 100644
--- a/dev-ada/gnatcoll-db/metadata.xml
+++ b/dev-ada/gnatcoll-db/metadata.xml
@@ -5,10 +5,6 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="gnatcoll_db2ada">Build gnatcoll_db2ada</flag>
 		<flag name="gnatinspect">Build gnatinspect</flag>
 		<flag name="shared">Build shared library</flag>
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index 8e9585c2dcda..0d9d849c119b 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -1,4 +1,4 @@
 AUX gnatcoll-2017-gentoo.patch 7843 BLAKE2B 1a7a7cc1bb1ad94f65fced28888c37acc3cc3711b0c488413313357551f3109e818f25eeba5fe25448f8362256ed5e8bccb6c5b67fe8195492d0e3b1e271f78b SHA512 d2eef0a5d4fecba7f081b97fc7c78efdb6dad76b492b1711e5c5d47b88ae621ca6826497668c9363ee16e36aaeb0e4978cc978c8688d3b346c3dd08b96a8537c
 DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363
-EBUILD gnatcoll-2017.ebuild 3250 BLAKE2B d19995ce79c3a0ba473a5e05ca7b9693c5069bc4bad9c291678792e5db5905946adf465e25156c8d6428333c5c6f8d0794e541fa6da6f48f9129e45ee65b60f2 SHA512 6aaabb4e81fedbaa892c0e1c2ac03dbf16a43e2498fcd994b7d953463157df4562d5ef2ccae852edcc2576e46f23300bb0ec84ee10e5576bcfc04679a4a55246
-MISC metadata.xml 1438 BLAKE2B 29ae4896a6c86b1e7e507d4c9a91a553ae363633221762dae9e4e46e5c604e1b1c93ac663975c659e1f316a8affafad25c7c789dd0b528add09d1bfb40e623fb SHA512 919a5c34fcf3a0b55a5d90f8749f7983e7ef4b75ecf25fad33ceb8d335ebd799d203eb126ad99296bc5a838f3d117e48a41299d245ce88a35a1f602cbc81ebed
+EBUILD gnatcoll-2017.ebuild 3257 BLAKE2B 3fe04c24429c39e1904bd95ecc09ac7f45a357ee9305fdfb3689fe9201ebedc51b838188a15d1c3ed1b40cb31fed42dc12da08a0e2a1171bebeb0af1816281a5 SHA512 d029004d698dae4016008e2c29a2a106c68f7b1b5647d3a05108d49fa44b2e5c7d90d806b2218736cb6116c18c7be6ebb2ff6d7f2a92bca65c7860d3c516fc65
+MISC metadata.xml 1194 BLAKE2B b4b93464f8dffd89bb43ca27e18e015d7cb720041fd7d405d3c7e5af9f8a53316959ab6696d5d762a1afa887648f7028cb831305b63a1782cd1c62f2486447c1 SHA512 a6fb6bf6f82f5582f4cca95e5864202664483fba5c4b813c4f515f670cb5fd720437001fd497167235c29843da2fb967e429f9a410d5b7ec2acefbc01ac30bf3
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index f43af38da683..54e0a586a460 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.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
@@ -35,14 +35,14 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		~dev-ada/libgpr-2018[gnat_2016=,gnat_2017=,shared?,static-libs?]
+		>=dev-ada/libgpr-2018[gnat_2016=,gnat_2017=,shared?,static-libs?]
 		dev-ada/xmlada[shared?,static-libs?]
 	)
 	!dev-ada/gnatcoll-core
 	!dev-ada/gnatcoll-bindings
 	!dev-ada/gnatcoll-db"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	tools? ( static-libs )
diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml
index 7ba8da900cc2..cc1fe1d3561e 100644
--- a/dev-ada/gnatcoll/metadata.xml
+++ b/dev-ada/gnatcoll/metadata.xml
@@ -4,13 +4,7 @@
 	<maintainer type="project">
 		<email>ada@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>tupone@gentoo.org</email>
-		<name>Tupone Alfredo</name>
-	</maintainer>
 	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
 		<flag name="projects">Adds support for projects</flag>
 		<flag name="pygobject">Adds support for pygobject</flag>
 		<flag name="shared">Build shared library</flag>
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index 62d9fef2e6e7..67f6ae2fd3bd 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,6 +1,4 @@
 AUX gnatmem-2018-gentoo.patch 2998 BLAKE2B ef2afa9a7ef200adb3729ac6e3bf80b6a4f92cae8c560805c741189917e454a391a6cc09271491110fd2e0c7c95cef672f807a64acf247cea2996fb2bbc71c31 SHA512 259915b1b9c5a586609c0e2801df3239f859871a194da5cd53ad323020832f5e2f37419bbb6f7e3c1d6a0c5d4a2bcf7b709db220b190abe84faa54463f43d199
 DIST gnatmem-2019-20190429-19745-src.tar.gz 80136 BLAKE2B 8ae3b41827416f951abb0d0a1fe533946fad2ac8d67ae6aad2b14495a3c068718befbbbf11800c1864f3becaa0ca6dfb838aeec3b3d715b250d4436ccee93c69 SHA512 4354a30efcf95a013f481b3519a79a22f85348840f074c734013d6c73e00fd771118b84eec416260983c383484f7a404217a32c012ca0bd7c37253ba17f2eb85
-DIST gnatmem-gpl-2018-src.tar.gz 80101 BLAKE2B c117552c2f8369f588127933ca1ba3075aeea6d7c3867861817b080f633fe26a7692c101b500d7441b49e79e75ce5a771a80287d0fb28bd0f569a358a8976d7d SHA512 539703bcb97cab996a4b4381685b021a419df781be3997538120580944fdcbb021fd28f574f66b8d52adbf5c6f1d7e29495c2115515d761f3cfce5bcc7bd8f56
-EBUILD gnatmem-2018.ebuild 901 BLAKE2B d0dbd7a555bac90acedda1f7ee2b609f3968da6a6833e6473569c38087dbcca9e84605c3bc11f96a6327b00b9338bf7433aa1f1761c6ee1bdc9d1069d167733b SHA512 f49105a45131b38de1074ecf1e0e665b247754e97a42e93eb989b44444d7f56e91854e74bfbef6bdb1b8d8eb1c9e93f62ee7c284d92a12281b0b17be9b3b6d0a
-EBUILD gnatmem-2019.ebuild 956 BLAKE2B 0709bfe8717af32203a2e4ea17ac6a3ab95526faaf014dc43b61d4f04249315cf9afb6d4129cc3fc06b62f427204306dae63266dc8f3ac9cad883586e0f2549c SHA512 b9e88b4f70a55d2802a197d9d6d85b161d3cafb094e0a8f6e36e73a3a035ee8fad00342a4c9f358704556c08ba1847004cf287902e89425024463314027b10f2
-MISC metadata.xml 1242 BLAKE2B cab6b4d13e6af83e0d7227dc9e77d5ed93a3fef9b79d2e5bbbd2375d7613794e3d8861906008f510eda9aacdd05dc898a9bc465a4a40de483bb3d6dfa4d6772c SHA512 b5f47ca9628e0a7939590ce8e40cecafb416b99860c70a8ae729183da21decc7dc080e71b704c4594b9e22f58b4bdd9257daca579cdc6c57feac54050ea3110b
+EBUILD gnatmem-2019.ebuild 973 BLAKE2B 6377ebe8d84042b57458c20105119849507e44dad55db598e472f7ef58d07828ca2db1d2a76dc78238899717221073813f963349b3b68776780cdb13739c204f SHA512 1502881ffc88f3bca1543abcae61331aa4f69010a9a42186ba2511fb8610fd35d3e9af08d6905968141fd00d1e8e2ad5bac12936f978b7a1131cff8305b69066
+MISC metadata.xml 955 BLAKE2B fe2d45bebeeb3f23c6eae6b4b2fbc14156884636af28c5bf31bb946d9a8bd74280a426be7d5e003aa88d1c6bc390f8ddd96c864d4715ce1c034b44995eeba3d1 SHA512 f2fee13e2c491e0a0393b67aa558bac39c7f3ea5a186da421ceb3ebf092bc5acb74cd2076ae59abb81d28a83c07bf4561017164ab27558a1805653023877fa72
diff --git a/dev-ada/gnatmem/gnatmem-2018.ebuild b/dev-ada/gnatmem/gnatmem-2018.ebuild
deleted file mode 100644
index 5f76770a3b7c..000000000000
--- a/dev-ada/gnatmem/gnatmem-2018.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multiprocessing autotools
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a72 ->
-	${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018"
-
-RDEPEND=""
-DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]
-	sys-libs/binutils-libs"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.in configure.ac
-	eautoreconf
-}
-
-src_compile() {
-	gprbuild -v -Pgnatmem.gpr -j$(makeopts_jobs) \
-		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}
-}
-
-src_install() {
-	dobin obj/gnatmem
-}
diff --git a/dev-ada/gnatmem/gnatmem-2019.ebuild b/dev-ada/gnatmem/gnatmem-2019.ebuild
index dbe496b25696..b99814fd6e4c 100644
--- a/dev-ada/gnatmem/gnatmem-2019.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2019.ebuild
@@ -14,11 +14,12 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e1431e87a8f1d425089
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019"
 
 RDEPEND=""
-DEPEND="dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+DEPEND="dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]
 	sys-libs/binutils-libs"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
diff --git a/dev-ada/gnatmem/metadata.xml b/dev-ada/gnatmem/metadata.xml
index c6a22a23c94b..f1230ca3fa8a 100644
--- a/dev-ada/gnatmem/metadata.xml
+++ b/dev-ada/gnatmem/metadata.xml
@@ -4,12 +4,6 @@
 	<maintainer type="project">
 		<email>ada@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
-	</use>
 	<longdescription lang="en">
 		The gnatmem utility monitors dynamic allocation and deallocation
 		activity in a program, and displays information about incorrect
diff --git a/dev-ada/gnatsymbolize/Manifest b/dev-ada/gnatsymbolize/Manifest
index 0bbcb2729ecf..b51d688947c0 100644
--- a/dev-ada/gnatsymbolize/Manifest
+++ b/dev-ada/gnatsymbolize/Manifest
@@ -2,4 +2,4 @@ DIST gnatsymbolize-2019-20190429-19761-src.tar.gz 14297 BLAKE2B 8ea689266abc4856
 DIST gnatsymbolize-gpl-2018-src.tar.gz 14286 BLAKE2B ac655b951b584224e64778fd800c082defee9abce4b3e7e1ac766a38c3b1ed8624c349f249714376e5984e37a9e9df256b6627b6ed2898f2f71fcaa8067cf36b SHA512 4fc21b45c32c08f9911cb7cdc0170e36f1c10d703244bbbfbd525386297b6e6779651751281402e8c4caee668df052e7c1ccc234e5cd88151ee471b8e3f06d0f
 EBUILD gnatsymbolize-2018.ebuild 621 BLAKE2B 50262887f4d4eaaffa4a6923f655f8e01513fe7adaaa160f6df09891441da59a6569ab1979d9a43d21c6123f2f33f6b30391d6c737162c064f1adb774e645c79 SHA512 707400f48b8be3becdb822a6049b2bb19f36d3e4674ae60b67f2a61318207df0aa242a73e60d90fb62b822f43706f45886a546cb2d20280558f5fad44534ab0e
 EBUILD gnatsymbolize-2019.ebuild 813 BLAKE2B 601a6348c8d268012af6a24863f5f30e1509b794fad9b614a9edf23d17ff4b4c0206a115afa0e42f14a11995e95484dcac80f7a8d86d52c1e485b30bddad7c2b SHA512 cfe19dd085925e8693aa12b7c9154cafe6007d56e53af968593f4052d75be83daf0d8d9d94bcbbdb30630231ed56449d8a6d4a66e9359a29a0474d453173c391
-MISC metadata.xml 541 BLAKE2B 276eebab31ec8be8532d22ce08ead6111eb5378491cd72467ca663e0446c773788da5ebb3193812243fc6cc7d874e355f6b6310b70d01896c5c83880221df986 SHA512 2a0a258e7ba3e583141810e3c99bc37afdf07bb067a2da60c45150327ab674c625becd4ca37d397e3df2ed06af280aee818d24874658d1d70f7dec04708de7c1
+MISC metadata.xml 390 BLAKE2B e655e84d98e4db460d4a5ad93fbe44c1de69cccabca3e19640ce08bf159be414aa86096e7bdf79692f99a53f433ff83fb5cf82f01be3fc67d45fff4a01e2b72d SHA512 48aa4b2d37b38a602b064a6e312fad19c193239899d859e2558b1a9090cc927f9b9983cc0c7f9a2384bf3bb7665a342d6871c236b19ed2b695fb1618d525cc05
diff --git a/dev-ada/gnatsymbolize/metadata.xml b/dev-ada/gnatsymbolize/metadata.xml
index 527404c23c2a..e429e17e3fc9 100644
--- a/dev-ada/gnatsymbolize/metadata.xml
+++ b/dev-ada/gnatsymbolize/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="project">
 		<email>ada@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
-	</use>
 	<longdescription lang="en">
 		gnatsymbolize is a program which translates addresses into their
 		corresponding filename, line number, and function names.
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 1f5e5f430543..1597af2b7522 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,15 +1,10 @@
 AUX gprbuild-2017-config.patch 5738 BLAKE2B 6089d8aa9fc3654958e46eac7ed22f887dc7017c670df53d4aaec37d937bfea866f99ba1232d3f3c55532b0c4754bed4db074850c1160308eddd3223d4d2c921 SHA512 45fd4b1cf4bf94f333350a4d3b3cdd0efd673f4eb32e8b0c837d8cf08aa87bda2b57749c230785f53807f48fcad67331c82ce1857fffbcb4af395d26a5d8f886
 AUX gprbuild-2017-gentoo.patch 3381 BLAKE2B 4e4c4d19db49aa3100f0acb97af90d942ea39fa5cc6cca5e369cd3459fa898406be18b762b33764bcc8f8ad6b007f00a2a1098990efe10f4aff96b80961ab6ce SHA512 a20642a117f61dd82469fafbd07fcd1d652ae8a11e866aafd55fb643fb9582994f94d643a4bbfcd0985534947cc8b48220de7503f83e74234b17838ce4468a66
-AUX gprbuild-2018-gentoo.patch 11203 BLAKE2B 0dc7c1e7bfc4d3864c3e200ebb1e5f4f7f920fa1939cd940f67d72cd0bf9044f0bdf09a51e492f133be1ba3ffa50816531d7038ed60c8d757fb3d60f12da268b SHA512 56c439a97109e805dea79ed624cb8687327170351e760078acc4506f02af7374fe1e51aad57150a8960ee7d904f496e0e4583543f5cbcfce2ba3677600b01ead
 AUX gprbuild-2019-gentoo.patch 11240 BLAKE2B 609968e7d95bb686db4362c06600a90cd9d9cde1c4058618ed40fd90585153b02316369dc3a439b84f3c8e1031d182ed3f739b449ed8e09761e90e2b80d73a4c SHA512 f48ed180ecfd8cb6691473e1f996f1805dcae693a0e2710fdfd0c246443cbe732ccc6dbb415c90396886b0b79d8aac22e3c7b720ca4f6da746e22485972aace5
 DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
-DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
 DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
-DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
 EBUILD gprbuild-2017-r1.ebuild 2207 BLAKE2B 50a99fa4729a7cb8a9689fa23b6f764be7077094101aa7dbe7452002b7b0c5602dbd82924ef1a6252ce6c973ec5f1ed687ef1d773b43ada1d0a5c707c97d564c SHA512 0c0d40bcd506f86da9e9b1e2d1d57163de5e3dc12095e6566251a673ddc236e099460a83be1a47e2b103d30474c168240257a442ebc5f727633fa6608e105b7b
-EBUILD gprbuild-2018-r3.ebuild 2115 BLAKE2B 6a30d38af19eb3c18bcacae6aa3bdd6e4315102c5f0c3591df90f31e51fa954c654c975c527b8b93d5190851fda8d50cd894050f36cacd351fc707d06dfbf20c SHA512 91dab25795db0e5acfa4d3a1ce9d3653d94726ad9a8f733437b2ea23cda9db17af81c998fa8b70e5ad8d5abb14f15f59aaf9aaf6f4640b11a471b14a5e0b2099
-EBUILD gprbuild-2018-r4.ebuild 2216 BLAKE2B 6f3d2ed1ba98f78f6de056a417b105f4b7fea7913e4f24c96ea0db53efaaa8d5d64e8e8d9b7282c2c2830f20c50a4d490303eba376f50f9cb711104d54ce9dc1 SHA512 30ffb50005d27bb1b16e6b6e55e0ef8d1919e5dd4232fc269931e4b140cb9ca9cdd760142a5e8857b14c2666755ac7ff3dcff600760b6892846cd80a5bef6433
 EBUILD gprbuild-2019.ebuild 2173 BLAKE2B 9d2e45af39dc7ba00768f6e2dad33b45bb41d356302e3b95ba8f563723ef6a1c6a963feebbfe7b48a11b674a81eb10953c406a5db6194d65fb87e6e1c82f0ff0 SHA512 971ff937c6b44df9d953b0e229bee3a09fd958b64925c295f7c75bffb20a7db693899731c46971f790c550d1c850163af63b711ed0474102adb7ee4124178519
-MISC metadata.xml 1093 BLAKE2B 825a9a6458e11fddc7e9e644ba3a6ea24d9ae110384f6db18d348e3a1e87cc9889f103af7f6ef2008284ce3fe87aab1a3b96675a23f686ee1b2e7aa8b275113b SHA512 b4bdcbc66e7cacd1d02b53ea1220cde0b6a40a2edf5b8eda269b6183f6459ce79228515cac6e6a59395288bc067c37285fa6f2bf11456f5b166ceebbc41d7c28
+MISC metadata.xml 806 BLAKE2B 9d6978348f59b502b01b50115341a30ee205bc7022197e70be4048e59b510bded9a1b292e8c33085a59291b2322bb14a1bbcb6f1a779f13189aa7d8e816c8d62 SHA512 76843dcfafdee7a423975793838849602b7ecc437704932d852cff87000bd1ab98c36ea33cb9a07ca09ee40eb728df1c78b4f6aa37a11ae9fe3f8bd74d83138f
diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
deleted file mode 100644
index 34936ea1f52b..000000000000
--- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
+++ /dev/null
@@ -1,284 +0,0 @@
---- a/gpr/gpr.gpr	2017-05-27 20:59:07.061135892 +0200
-+++ b/gpr/gpr.gpr	2017-05-27 20:59:38.022638398 +0200
-@@ -67,6 +67,7 @@
-             for Switches ("gpr*.ad?") use
-               Compiler'Default_Switches ("Ada") & ("-g1");
-       end case;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
- end GPR;
---- a/gpr/src/gpr-names.ads	2017-11-19 13:09:18.947527738 +0100
-+++ b/gpr/src/gpr-names.ads	2017-11-19 13:10:08.125654595 +0100
-@@ -27,6 +27,8 @@
-    Name_Buffer : String (1 .. 1_000_000);
-    Name_Len    : Natural := 0;
- 
-+   Last_Id     : Name_Id := Name_Id'First;
-+
-    procedure Get_Name_String (Id : Name_Id);
-    procedure Get_Name_String (Id : Unit_Name_Type);
-    procedure Get_Name_String (Id : File_Name_Type);
---- a/gpr/src/gpr-names.adb	2017-11-19 13:10:27.674316703 +0100
-+++ b/gpr/src/gpr-names.adb	2017-11-19 13:14:38.360963627 +0100
-@@ -354,6 +354,8 @@
- 
-       Name_Chars.Append (ASCII.NUL);
- 
-+      Last_Id := Name_Entries.Last;
-+
-       return Name_Entries.Last;
-    end Name_Enter;
- 
-@@ -427,6 +429,8 @@
- 
-       Name_Chars.Append (ASCII.NUL);
- 
-+      Last_Id := Name_Entries.Last;
-+
-       return Name_Entries.Last;
-    end Name_Find;
- 
---- a/gpr/src/gpr-snames.adb	2017-11-19 13:12:41.592995718 +0100
-+++ b/gpr/src/gpr-snames.adb	2017-11-19 13:16:31.980979696 +0100
-@@ -53,6 +53,10 @@
-          return;
-       end if;
- 
-+      if Last_Id = Name_Id'First then
-+         Add_Name ("");
-+      end if;
-+
-       Add_Name ("a");
-       Add_Name ("b");
-       Add_Name ("c");
---- a/src/gprlib.adb	2017-12-18 12:20:02.937317216 +0100
-+++ b/src/gprlib.adb	2017-12-18 12:21:36.519604590 +0100
-@@ -263,7 +263,9 @@
- 
-    Driver_Name                   : Name_Id := No_Name;
- 
--   Gnatbind_Name                 : String_Access := new String'("gnatbind");
-+   Gnatbind_Name                 : String_Access := new String'("@GNATBIND@");
-+
-+   Gnatbind_Path_Option          : constant String := "--gnatbind_path=";
- 
-    Compiler_Name                 : String_Access := new String'("gcc");
- 
-@@ -1944,13 +1946,13 @@
-                           and then Line (Last - 2 .. Last) = "gcc"
-                         then
-                            Gnatbind_Name :=
--                             new String'(Line (1 .. Last - 3) & "gnatbind");
-+                             new String'(Line (1 .. Last - 3) & "@GNATBIND@");
- 
-                         elsif Last > 7
-                           and then Line (Last - 6 .. Last) = "gcc.exe"
-                         then
-                            Gnatbind_Name :=
--                             new String'(Line (1 .. Last - 7) & "gnatbind");
-+                             new String'(Line (1 .. Last - 7) & "@GNATBIND@");
-                         end if;
-                      end if;
- 
-@@ -2100,7 +2102,13 @@
-                Mapping_File_Name := new String'(Line (1 .. Last));
- 
-             when Binding_Options =>
--               Binding_Options_Table.Append (Line (1 .. Last));
-+               if Last > Gnatbind_Path_Option'Length
-+                  and then Line (1 .. Gnatbind_Path_Option'Length) =
-+                     Gnatbind_Path_Option then
-+                     null;
-+               else
-+                  Binding_Options_Table.Append (Line (1 .. Last));
-+               end if;
- 
-             when Copy_Source_Dir =>
-                Copy_Source_Directory := new String'(Line (1 .. Last));
---- a/share/gprconfig/compilers.xml	2018-10-17 14:36:15.100480516 +0200
-+++ b/share/gprconfig/compilers.xml	2018-10-17 15:38:57.333256634 +0200
-@@ -20,15 +20,15 @@
-   <!--    GCC 3.x & 4.x (not for GNAT Pro)-->
-   <compiler_description>
-     <name>GCC</name>
--    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc</executable>
-+    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc-@VER@</executable>
-     <version>
--      <external>${PREFIX}gcc -v</external>
-+      <external>${PREFIX}gcc-@VER@ -v</external>
-       <nogrep regexp="for GNAT Pro"></nogrep>
-       <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
-     </version>
-     <languages>C</languages>
-     <target>
--      <external>${PREFIX}gcc -dumpmachine</external>
-+      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
-       <grep regexp="[^\r\n]+"></grep>
-     </target>
-   </compiler_description>
-@@ -170,14 +170,14 @@
-    -->
-   <compiler_description>
-     <name>GNAT</name>
--    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls</executable>
-+    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls-@VER@</executable>
-     <version>
--      <external>${PREFIX}gnatls -v --version</external>
-+      <external>${PREFIX}gnatls-@VER@ -v --version</external>
-       <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
-     </version>
-     <languages>Ada</languages>
-     <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
-+      <external>${PREFIX}gcc-@VER@ -v</external>
-       <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
-     </variable>
-     <runtimes default="default,kernel,native">
-@@ -187,71 +187,11 @@
-        <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
-     </runtimes>
-     <target>
--      <external>${PREFIX}gcc -dumpmachine</external>
-+      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
-       <grep regexp="[^\r\n]+"></grep>
-     </target>
-   </compiler_description>
- 
--  <!--  CodePeer -->
--
--  <compiler_description>
--    <name>GNAT_CODEPEER</name>
--    <executable prefix="1">(.*codepeer-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada</languages>
--    <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
--      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
--    </variable>
--    <runtimes default="default,native">
--       <directory group="default" >\.\./lib/gcc/.*/$gcc_version/adalib/</directory>
--       <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
--       <directory group="1" >\.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
--    </runtimes>
--    <target>codepeer</target>
--  </compiler_description>
--
--  <!--  C Target -->
--
--  <compiler_description>
--    <name>GNAT_C</name>
--    <executable prefix="1">(c-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada</languages>
--    <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
--      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
--    </variable>
--    <runtimes default="default">
--       <directory group="default" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/</directory>
--       <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
--    </runtimes>
--    <target>c</target>
--  </compiler_description>
--
--  <!--  GNAT_DOTNET -->
--
--  <compiler_description>
--    <name>GNAT_DOTNET</name>
--    <executable prefix="1">(.*dotnet-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada</languages>
--    <runtimes default="default,kernel">
--       <directory group="default" >\.\./lib/dotgnat/adalib/</directory>
--       <directory group="1" >\.\./lib/dotgnat/rts-(.*)/adalib/</directory>
--    </runtimes>
--    <target>dotnet</target>
--  </compiler_description>
--
-   <!--    G77  -->
-   <compiler_description>
-     <name>G77</name>
-@@ -295,21 +295,6 @@
-     </target>
-   </compiler_description>
- 
--  <!-- LLVM Compiler -->
--  <compiler_description>
--    <name>LLVM</name>
--    <executable>clang</executable>
--    <version>
--      <external>clang -v</external>
--      <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
--    </version>
--    <languages>C</languages>
--    <target>
--      <external>clang -dumpmachine</external>
--      <grep regexp="[^\r\n]+"></grep>
--    </target>
--  </compiler_description>
--
-   <!--  Windres compiler -->
-   <compiler_description>
-     <name>WINDRES</name>
---- a/share/gprconfig/gnat.xml	2018-10-17 18:38:35.547094541 +0200
-+++ b/share/gprconfig/gnat.xml	2018-10-17 18:40:16.281379341 +0200
-@@ -60,7 +60,7 @@
-    &filter_gnat;
-    <config>
-    package Compiler is
--      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc";
-+      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
-       for Language_Kind            ("Ada") use "unit_based";
-       for Dependency_Kind          ("Ada") use "ALI_File";
-       for Leading_Required_Switches        ("Ada") use
-@@ -77,6 +77,9 @@
-       for Objects_Path_File     ("Ada") use "ADA_PRJ_OBJECTS_FILE";
-       for Driver         ("Ada") use
-           "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
-+      for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
-+      for Required_Switches ("Ada") use
-+        Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
-    end Binder;
- 
-    for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
---- a/share/gprconfig/c.xml	2018-10-17 21:31:44.442501471 +0200
-+++ b/share/gprconfig/c.xml	2018-10-17 21:33:06.562088044 +0200
-@@ -14,7 +14,7 @@
-      </compilers>
-      <config>
-    package Compiler is
--      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc";
-+      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
-    end Compiler;
-      </config>
-    </configuration>
---- a/share/gprconfig/linker.xml	2018-10-17 21:36:15.856883517 +0200
-+++ b/share/gprconfig/linker.xml	2018-10-17 21:35:15.985896804 +0200
-@@ -1025,7 +1025,7 @@
-     </targets>
-     <config>
-    for Library_Partial_Linker use
--         ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o");
-+         ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
-     </config>
-   </configuration>
- 
-@@ -1044,7 +1044,7 @@
-     </targets>
-     <config>
-    for Library_Partial_Linker use
--         ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o");
-+         ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
-     </config>
-   </configuration>
- 
diff --git a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
deleted file mode 100644
index a1157f5c3701..000000000000
--- a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68
-		-> ${MYP}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40
-		-> xmlada-gpl-${PV}-src.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018"
-
-DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYP}-src
-
-REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 )"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	if use gnat_2017; then
-		GCC_PV=6.3.0
-	else
-		GCC_PV=7.3.1
-	fi
-	default
-	sed -i \
-		-e "s:@VER@:${GCC_PV}:g" \
-		share/gprconfig/compilers.xml \
-		share/gprconfig/gnat.xml \
-		share/gprconfig/c.xml \
-		share/gprconfig/linker.xml \
-		|| die
-	sed -i \
-		-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
-		src/gprlib.adb \
-		|| die
-}
-
-src_configure() {
-	emake prefix="${D}"usr setup
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
-	GCC=${CHOST}-gcc-${GCC_PV}
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	local xmlada_src="../xmlada-gpl-${PV}-src"
-	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
-		-I${xmlada_src}/input_sources"
-	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
-	for bin in ${bin_progs}; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
-			-o ${bin} -largs gpr_imports.o || die
-	done
-	for lib in $lib_progs; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
-			-largs gpr_imports.o || die
-	done
-}
-
-src_install() {
-	dobin ${bin_progs}
-	exeinto /usr/libexec/gprbuild
-	doexe ${lib_progs}
-	insinto /usr/share/gprconfig
-	doins share/gprconfig/*
-	insinto /usr/share/gpr
-	doins share/_default.gpr
-	einstalldocs
-}
diff --git a/dev-ada/gprbuild/gprbuild-2018-r4.ebuild b/dev-ada/gprbuild/gprbuild-2018-r4.ebuild
deleted file mode 100644
index de11e09704d2..000000000000
--- a/dev-ada/gprbuild/gprbuild-2018-r4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68
-		-> ${MYP}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40
-		-> xmlada-gpl-${PV}-src.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019"
-
-DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
-	gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYP}-src
-
-REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 gnat_2019 )"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	if use gnat_2017; then
-		GCC_PV=6.3.0
-	elif use gnat_2018; then
-		GCC_PV=7.3.1
-	else
-		GCC_PV=8.3.1
-	fi
-	default
-	sed -i \
-		-e "s:@VER@:${GCC_PV}:g" \
-		share/gprconfig/compilers.xml \
-		share/gprconfig/gnat.xml \
-		share/gprconfig/c.xml \
-		share/gprconfig/linker.xml \
-		|| die
-	sed -i \
-		-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
-		src/gprlib.adb \
-		|| die
-}
-
-src_configure() {
-	emake prefix="${D}"usr setup
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
-	GCC=${CHOST}-gcc-${GCC_PV}
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	local xmlada_src="../xmlada-gpl-${PV}-src"
-	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
-		-I${xmlada_src}/input_sources"
-	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
-	for bin in ${bin_progs}; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
-			-o ${bin} -largs gpr_imports.o || die
-	done
-	for lib in $lib_progs; do
-		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
-			-largs gpr_imports.o || die
-	done
-}
-
-src_install() {
-	dobin ${bin_progs}
-	exeinto /usr/libexec/gprbuild
-	doexe ${lib_progs}
-	insinto /usr/share/gprconfig
-	doins share/gprconfig/*
-	insinto /usr/share/gpr
-	doins share/_default.gpr
-	einstalldocs
-}
diff --git a/dev-ada/gprbuild/metadata.xml b/dev-ada/gprbuild/metadata.xml
index 505e6ca37ea1..ae7bd66e7cc3 100644
--- a/dev-ada/gprbuild/metadata.xml
+++ b/dev-ada/gprbuild/metadata.xml
@@ -4,12 +4,6 @@
 	<maintainer type="project">
 		<email>ada@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
-	</use>
 	<longdescription lang="en">
 		GPRbuild is an advanced software tool designed to help automate the
 		construction of multi-language systems. It removes complexity from
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index dd0f05d80409..e87a7cd5705a 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -7,4 +7,4 @@ DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365
 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
 EBUILD gps-2017.ebuild 2120 BLAKE2B a78b670ff9915bef812bb51b8a45e26feb1ec109b5cafcc1dbfbe3628aa33a02d32585829424e9660cb3759d464d7aca413c038aa5db2d24f0513ba86d2bfbf9 SHA512 f50681981837153b0df3080992c57c17315afbcc90848fe803b03d504284eb6f4f0a8c24cc2caa6aef2e4b5f29fb70af3b06b3c684e5b37844d350e1fa1150a0
 EBUILD gps-2018-r1.ebuild 3163 BLAKE2B b97918cfad05d883c0ea9365b73768351c15878a784e3381eefa0b1f24ff319bfdc508c2f615c245fe30e5e3a0a87fb388084fb8dc7224ecf5b8a3a3d1ea24b7 SHA512 b2da7c1b5ebd5726ee1abd24bfb512dfb94ba680a0270bee413f4003eabbc08a16f98bd491e3e7b4385faeb3c431557b5b15063104e5ca84b220a596fefb517c
-MISC metadata.xml 657 BLAKE2B c97ff9ab3140c87cb2066f25c639c3a5053c0775abfe23937b92f912ff71299bf136de797de6fd1010d576ba44f4e1b1f6e7dae4d1e076682382b33482240606 SHA512 498222549bd8c7e48575bdc0250cc810540928b19819759ba8a4f9b3aea39ad1b7b579b988a26b1bcf109774b356c7635e11e5e42a41dc76af8d9230a63f9d91
+MISC metadata.xml 438 BLAKE2B 105849097d35788d4178db05bd3c9ab5b17eb94bee320d0dfc2914889a3764824f53950f674a4d1488b649a344729e03bb8eacda9896636a632b1288a0abf07c SHA512 2bf4e76aab6f461c501b34fee6fbf719715af34e2af827daee3a145de31b96b5568009a21daaa4269a19386b0be45dd419710e926505bda7763312c809864aae
diff --git a/dev-ada/gps/metadata.xml b/dev-ada/gps/metadata.xml
index 0657e56673cc..eb9ac43cfff3 100644
--- a/dev-ada/gps/metadata.xml
+++ b/dev-ada/gps/metadata.xml
@@ -5,11 +5,6 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
-	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-	</use>
 	<longdescription lang="en">
 		GPS is a lightweight, extensible IDE, intended to develop
 		high-integrity software in Ada and SPARK, with support for C and C++
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index ea3b066bbb86..1ea48d80b040 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -2,8 +2,7 @@ AUX gtkada-2017-gentoo.patch 2270 BLAKE2B 54b7f2258ce0073b79f56a3c0c379123622e7d
 DIST gtkada-2019-20190424-19D98-src.tgz 12273911 BLAKE2B e2d0f3c410973d0412bf433f2e1cc60a5b00e9f34ad0471cb583596587e6073fdeb9b6441aa50dfa81894ce692101fe51c7714090477d585721571261737a823 SHA512 aed0758b42ee8eac752c2c83a0974ee0c7cddfa15149879472ff2fb8ee7565456a225ce783739ede76bc0f47340e97af5b5d1149e244611bcd3b3760e20f8cf5
 DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
 DIST gtkada-gpl-2018-src.tgz 11958880 BLAKE2B 4946918b52de5e15efc77411927812910d84d13cea66b86b1162b987c7849ba7fbb6da487881762f64005dc32a74fa73c9d759d25bb9ac0241d1d76cd4becbfb SHA512 9000de7675f8ee688b1c9cd93cf35b32f698aca8fc22d3b4e695d7c6b34feb60118cc687cf35432cd5ed9af7825eda7e20575a9fad4523a7b59cb0322bce0762
-EBUILD gtkada-2017.ebuild 1291 BLAKE2B 4f26d0c4c40df64522c77df6acf75175f22cf0aef8e8e3213d663e3bb4c4b7ebff538540b7bbdb212d0ecce2e60f7d7d463f3178a1df44059ce7a2ef22fe8936 SHA512 433a5ce57cf39a012f17756d8843933910e51ad3b1641360e7dd28e0f871399a57f3ec0376e7ae7c69491f2e4712aad23c71c7fabd2ce507c9c5a79c247daabc
-EBUILD gtkada-2018-r1.ebuild 1535 BLAKE2B edaf0ee99f67f2dfcc7dac73c42a1ec79f2c13b5a5b01193f7ea0a515a74078a5bebaf4640ac4cb25c833d2d41617759a54e9c4da566e8db28af5e30f8bce69e SHA512 0e616bffcd61d6ac790149b896a405964356a1a5431868486f0ddebacffd2e9f05779f6eb00171196c4d9abe3174bfd2c06b165168fe92d2aa9039695e06227c
-EBUILD gtkada-2018.ebuild 1412 BLAKE2B 60234e0a79c8b865d0adeefe8089de9b2e480b89cd2513c0ff53107202eb7a164350ed182bb6b36e269ec6a946d87d94cbf43cc26a0519de2b94c06e43312d05 SHA512 1c0739006fabdfc1b587eb6db5c55f3de8036db2b6aeb844c14b485b9b7321c90aea91b87e3a390d2e3fba38d94fd12939392557403920f62319b33cb253bb1c
-EBUILD gtkada-2019.ebuild 1539 BLAKE2B 7a9017d9c7ebd1dfc74577be0732a4da0687a82fe8b7df01d11e9d6cbcc66d8d59d4be3a2a0e6472698c8664957acd2f05cd4797231eff26d85b0801af0ace3f SHA512 018ac892a0721f5196035d014f7eda3a85ca5f7ba89721dbba9ac3b32cfb5d78a9b039c9900f2ddfa32663bfbab46e67d0facd4964930ebeb42ec8757e8af220
-MISC metadata.xml 808 BLAKE2B 06340d8d3acd7f62d9ee5a353b97dee85d4e218d3a3387f37cc0e31e1c6c219df5cce42516a2d3925dc4675d707c8a0734258bde7408c3a3c425232bd53fa583 SHA512 0dc7ec72a087e3828153b69cb455740bf26100f86966c4048a0ba41712f302636b287d18dd65003aa010b31230b3595edc0d4a42860514f86864b7bdc3bac530
+EBUILD gtkada-2017.ebuild 1297 BLAKE2B 83536071e25bc43cff672b957b9473029d910d8ac283496ff9bde6b282b57d478999780340b74b16987e935f4b042b9ecc28f0f0455217bfd89df9f297a0a89f SHA512 396961a4521e82fabbde327e7d66fef20dc5815253275e3de9118c3538ad166c85e3cdb27db2867e6e06ae683fc381a859f0c5f2afcfcfc78af23fc66120293b
+EBUILD gtkada-2018-r1.ebuild 1552 BLAKE2B 4175046358b5a6abed6de7112a6d4c0d7f65f156ec417e5f8882c5580e032bf0dce6ba7d26544723d35ad3ee0ba04cd1763a11e6140f64168ef09fd8c71f50d9 SHA512 27b3f09407e484b3edf9344fea4ab1d5800f1c347b31e10a8cfa6fef4126dc6151e35ba122ea25b7a8c864ec900231db78f1c9b8efa978edf2133950f509a1c6
+EBUILD gtkada-2019.ebuild 1558 BLAKE2B 73b5b1b9b714981ce941e7d0bf8d25193b8ab36c7bcf1429fbdf8a681e808bee835f95c0b23f81480edfb4a29a82fe545827307307dd5dc4c4f3b2b386b19cbf SHA512 42620c9318ec624821ed9fef88bbf9f5bbfc00e4637d009bac9f29dd4be18744554a7d0cf03ad08aa1fd79698ebd57f6c374f5676d44196bab1103c77a68e531
+MISC metadata.xml 536 BLAKE2B 9809d3168ce41ea5f2aaaf8f9ed0c61ffca037a42dc1d3ba5424f68c399a24f64336494b0e73b3f6a3ab1be9c5ec2e499d93d62aa34a4e2a45af09bd15482b5b SHA512 f6ce7169d8015d691548836e074450d79afffdb7449bc7bd4b7ab868b967763675d8f69b1ad89a3642de0e1c5c9271261d72ee1b8fe448b9aa4afa4879b619d5
diff --git a/dev-ada/gtkada/gtkada-2017.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild
index f64be7a6ac09..f6edaf0546c7 100644
--- a/dev-ada/gtkada/gtkada-2017.ebuild
+++ b/dev-ada/gtkada/gtkada-2017.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
@@ -28,7 +28,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	x11-libs/gtk+:3
 	x11-libs/pango"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 
diff --git a/dev-ada/gtkada/gtkada-2018-r1.ebuild b/dev-ada/gtkada/gtkada-2018-r1.ebuild
index 4ce851b8da6b..a4f93c664a1a 100644
--- a/dev-ada/gtkada/gtkada-2018-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-2018-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
@@ -30,7 +30,8 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	x11-libs/gtk+:3
 	x11-libs/pango"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
diff --git a/dev-ada/gtkada/gtkada-2018.ebuild b/dev-ada/gtkada/gtkada-2018.ebuild
deleted file mode 100644
index 63d33a60a954..000000000000
--- a/dev-ada/gtkada/gtkada-2018.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 autotools multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced
-	-> ${MYP}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
-	dev-libs/atk
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=]"
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	if use gnat_2018; then
-		GCC_PV=7.3.1
-	elif use gnat_2017; then
-		GCC_PV=6.3.0
-	else
-		GCC_PV=4.9.4
-	fi
-	econf \
-		--prefix="${D}/usr" \
-		$(use_enable static-libs static) \
-		$(use_enable shared) \
-		--without-GL
-}
-
-src_compile() {
-	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
-	emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 install
-	einstalldocs
-}
diff --git a/dev-ada/gtkada/gtkada-2019.ebuild b/dev-ada/gtkada/gtkada-2019.ebuild
index 4a02372e72e0..0b4c73a820f3 100644
--- a/dev-ada/gtkada/gtkada-2019.ebuild
+++ b/dev-ada/gtkada/gtkada-2019.ebuild
@@ -30,7 +30,8 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	x11-libs/gtk+:3
 	x11-libs/pango"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
 
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
index 5daab6a5e97b..032d800ebe61 100644
--- a/dev-ada/gtkada/metadata.xml
+++ b/dev-ada/gtkada/metadata.xml
@@ -5,10 +5,6 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="shared">Build gtkada as shared library</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/dev-ada/libadalang-tools/Manifest b/dev-ada/libadalang-tools/Manifest
index 1c6b6cb1cfbd..33e714f93630 100644
--- a/dev-ada/libadalang-tools/Manifest
+++ b/dev-ada/libadalang-tools/Manifest
@@ -1,5 +1,5 @@
 DIST libadalang-tools-2019-20190517-195C4-src.tar.gz 625775 BLAKE2B 2ec69e307576c505d20a43d229b13404966f4442778e5390da327ae71cc065873de4fff03a720949fa6bfb5ce66f405e7d45f7f0c21032a639efcff208323aed SHA512 b7368606847244cbb08ff2111fabfbfc8a9aa7f58e953febc70838006d94711dba1fd75bfb69ed2081a37a2dfaaad46097127870696c882d7cc54de5d7b051a1
 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
-EBUILD libadalang-tools-2018.ebuild 679 BLAKE2B b2869094c925f06b6e8bb44e0aef8d6c4abc258f2f02d1a6b9b8f7633c1c716db9868dcb90bf63d6c5e1dcc6cb7a6bc7168772daf0a940c2796ff02292f0a31d SHA512 97b31e48174392f26a6fe67a9dfb5f8a4c509e99fff2823b3eced0988dc88f2fd06c1f8d595b5ddd6fa8a978864419dd4f5b390823c8030e86f41003fdcbcccc
-EBUILD libadalang-tools-2019.ebuild 996 BLAKE2B 1f0df32ffc3ab067b1b16800e8d74a10100eda102923c42d300ecfc5793d793df25bc0e1ce3190ec07ed60a1519134d564e6589542ad032f38e7fdcb85fb6945 SHA512 dd1b7275fe9fe232d505563100ff8be90d7c56cd994d077d0707e2d07a8a79919bc029549453a6fa8e92dcf3c3ea0d52f89ab8c9f2817410601b2cf587a07195
-MISC metadata.xml 609 BLAKE2B f462c2a06ef2101b1c03ea448ea0770e108f38530cbeedb332974d686c79ead78cad8c15e1e200c7e9e5005364c3bbfe538bf0820d8bfd701d196bae55c3214d SHA512 6d9183c3467e597593bee1926ce664cde3c3cd764aed941387e979721fee4d3a747ef82143222e78344986c8bf051ac97f698c3410fa97755869470365cec8f0
+EBUILD libadalang-tools-2018.ebuild 685 BLAKE2B 240aa78f91f485c0f7d1779a5310ad9793b323e266ee36a744863a5210ea86720f5745360f09c65e4305a7c063fc431ebb4e0a432af75ffbb7c2b8d9293679df SHA512 e2017e038a91577ac88c40ea5e4b51d4e7ca31e66fc37a2e06252b25a025ae323fd3ae673d856e9d89a304906ab71735a5034f1640a6610edd4222ef31d6f77d
+EBUILD libadalang-tools-2019.ebuild 1015 BLAKE2B 5c141a923e9163cc46fe5e402300c36edfa1997ae51c35f9b9020e2d2b703deb49bcb7fdd2840a5b78640d8879f00c56534625c761a7397390c41c27355cfd1f SHA512 b3fb7265d4571451e06834d17499141d5698ea7d330542e779f94ecb522a8a49f333c0b1fb715e4fd07c51c30fbacfc33cfaab30c85081f051e204f284b64ab1
+MISC metadata.xml 322 BLAKE2B 15b950c159b5ceea83d02f9bc17739607d76cc1ddf829fb9eea4187cfba6721d9ff81385e011cbba5c31114c8932354b40cf40dcb7582205ffc39e9204b2a8cf SHA512 dba6a4015eaa3143d0e165df7e1d18ac8faf4077ea8b3521ebb12979aa24b5519dfa90239cc2a41630edc803cbf4529338f9ddc2de5ed3fb0987702747c5ab80
diff --git a/dev-ada/libadalang-tools/libadalang-tools-2018.ebuild b/dev-ada/libadalang-tools/libadalang-tools-2018.ebuild
index b29808431c3e..a412e2338adf 100644
--- a/dev-ada/libadalang-tools/libadalang-tools-2018.ebuild
+++ b/dev-ada/libadalang-tools/libadalang-tools-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ IUSE="gnat_2016 gnat_2017 +gnat_2018"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-ada/libadalang[gnat_2016=,gnat_2017=,gnat_2018=,static-libs]"
+	dev-ada/libadalang[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,static-libs]"
 
 S="${WORKDIR}"/${PN}-src
 
diff --git a/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild b/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild
index 283494661fa1..279ba91a1748 100644
--- a/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild
+++ b/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild
@@ -20,7 +20,8 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	dev-ada/libadalang[gnat_2016(-)?]
 	dev-ada/libadalang[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?,static-libs]
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 S="${WORKDIR}"/${MYP}-src
 
diff --git a/dev-ada/libadalang-tools/metadata.xml b/dev-ada/libadalang-tools/metadata.xml
index 596aff3263a9..2fab82fdcf6f 100644
--- a/dev-ada/libadalang-tools/metadata.xml
+++ b/dev-ada/libadalang-tools/metadata.xml
@@ -4,12 +4,6 @@
 	<maintainer type="project">
 		<email>ada@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2018</flag>
-	</use>
 	<longdescription lang="en">
 		Libadalang-based tools: gnatpp, gnatmetric and gnatstub
 	</longdescription>
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index 72ddfaa1855f..378558a7da6c 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -8,4 +8,4 @@ EBUILD libadalang-2017-r1.ebuild 1089 BLAKE2B ff0e7e37c2f2cf5f7ce0d38b5d0efc073e
 EBUILD libadalang-2018-r1.ebuild 1461 BLAKE2B 3a5f20ddf7868e8253e761d9aaa3b43064c18f7e45dbb99ecd20b22fe8f7d43530010c3d195693ab75dbd54baae21ad73d6d5b6155f361d115ae45b5cfd76f79 SHA512 489d19ec76fe9e6e7bec478b840a1bee0140827251e165b2941da377dacaef98c0f81d2068b28058d251c88a3c8024bbf6a92436da9ed910abf211bc74960e07
 EBUILD libadalang-2018.ebuild 1327 BLAKE2B 802fdf2de0d0f4659807458581887278febe957924f30e021557566c271fd4301cf3ee1587056d7d29c3a0f964c3f8074bcd0e613105e5030736f7feef1cd10a SHA512 0a08c3661094e31ca8c6bf132fa029da706b10321cf97d14e43cf856da3fba6a890de09353af2a29478a52c538f4d2d06ce4452089e9331164ced4e77d85a696
 EBUILD libadalang-2019.ebuild 1519 BLAKE2B f4b1e6cb07001949b225a57bde98f530e4f93b89ca379f33aa96e14d2f942d9c3fbf223cdeda7c6b3291a97804e9822518ad30bda62ed34ac1e2fb4547a3487b SHA512 a8226f42d074efa3ff295c75ddf1483a539fcfdd425f0008653cee6e2c25e53557cb88b3ea6b9bf7b90c30f71a9417cf430205989bec4ee95f01d22a3923e4ac
-MISC metadata.xml 878 BLAKE2B b8b5f581aa552350fdb737fd9d89fc33a02ccccad106424333f87992a8f9c6ba60d5e70f3aaba1dae13bc117e2ac97f81a66ae6cc34a1aa13a8c86cab08c2a65 SHA512 02ea95c2cf1d7c131edb2634a6daf3fe77d50d2368c1d2afa5ab18c802de0a8b596bd3bf176fbfa67f7cada1d4a8bddc8c51cb444e23ebf0d437c19922c511f9
+MISC metadata.xml 606 BLAKE2B b0a66091ccb460eb66fe3fb70be07d49dce48a655e1a7584baf532fec0f995c4de9ef0a7a99f32b44f2645b4acd446723911c569a8757ab93cbb9b70110223c8 SHA512 bab64b417a58e000c4aca66c99a04e268db42f56c24273b47f5a81be9bdc8d6224653bb169aec8095c02887d37b227999772f1b0fe6d05c5754073cdd2ad3432
diff --git a/dev-ada/libadalang/metadata.xml b/dev-ada/libadalang/metadata.xml
index 5ed09e4fd913..a2b4d6b3c81a 100644
--- a/dev-ada/libadalang/metadata.xml
+++ b/dev-ada/libadalang/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Tupone Alfredo</name>
 	</maintainer>
 	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="shared">Build shared library</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 4fd387024f15..8a2ee5d212b7 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,7 +1,6 @@
 AUX libgpr-2018-gentoo.patch 1691 BLAKE2B 4e11098f835d9d0adbd6a4eed0e63f71140eb68d0e350fd52303a0d21c308e483556b31ce84ba97a7fccddfc91e519a6ae8f999d87258c0d4f4ee473597f7267 SHA512 959e4e63c3367fd98878a2004d0fac981a1acc2a29e35960a27f2ca48b4557fc16148aa052cdba590f208c8b23832f3bc2f3959523f6e54eb8dfe2e87812f285
 DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b
 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
-EBUILD libgpr-2018-r1.ebuild 1455 BLAKE2B 09c0754d011aaa9507c89e7931ee261a06d72f507fb171ea2290a5087fe423837e4c16c82408732ffbf5375f16fd315e19dff4889604f3a934b1379e8c514e06 SHA512 2e48d5c512756b1e0222a43e958b6bab697be451b74e20a9b3afb3f7dfd65a15671b1a81b2479cad60eecd9f0b893201ebba9d1fa70b47cb9fd5a63d4b49c4f3
-EBUILD libgpr-2018.ebuild 1418 BLAKE2B ea2cd84edd7c32b6094559a9de24d8ac0ff84806b6f90fa393f07e48d984ad4f79be53211198952456b2695dc2d1af2e0bc46a0e6cf30ecbb36cccc9e64430d1 SHA512 77c55ea1e0d33b2f4ced11e495390bbccc30425fd1842361306b92aa21eff2be446837d6100977deb1ea174a1415d6de9e8c5a195a95bbbba6386bce89f0e4f1
-EBUILD libgpr-2019.ebuild 1434 BLAKE2B bd5ec33870135ccbe9dfcdd42d2c12cee85a593afd6cadfd764d260dd17d640193f167b46751816368ae5e6fc8030d8e69a9e3a39d46646fba19502d0ac945aa SHA512 de84b8e96df7d2d1a8f2449e731bcf964c96555d16001f47746b637eec35b8a3626434dfcff51dabc251b917d95dc9a9c0235dbe9d34d8db0d85ef2f56d5b540
-MISC metadata.xml 1211 BLAKE2B 072a1af7bb43fc3a59da80afdae5aecca7ddd9307d8aed91a1bb70892036485a8a0ca3057484e2af8209915bc71ea3a1d3799bae7d44e8fb5fa701eb78267639 SHA512 bb6a4a25fcc68773ee2b78313d1ccdfac47e21504f4f7e5ccfbee41fdfffd2af2561bf0db505df29c1298bffce49c750d038779bdc255f9ba6dacf1a8f3cffa0
+EBUILD libgpr-2018-r1.ebuild 1484 BLAKE2B a7d8bc4137640c55f24f0d26bea4cbad31aee22b9226402d1ccec485b39730276be75c4f8ec9568d86c4a4bd0e736a9f9b5c71a1197223f7566c4dab5a39ee44 SHA512 47a20f6b42e982f0cbe0f2ac8064c71e8384529f50b1e8e93d9b0a3125d910c7f54ae992e714968313588038bfb9b16b4f8001dbb5ba7457c0742877701c8261
+EBUILD libgpr-2019.ebuild 1451 BLAKE2B 974cfb4da43aed484fba18cb88b922d8139dacc1e7d2fd06f32d6c1d2f48ee5eb10fbeade2cd969a91d7fb1d553f61fbd51e47bb24b1ec14b882c044b69d8df9 SHA512 51ac3ce060d096e71faefaf481011592acbd4de25de1c9ee5c3e4a79ce622ab9bed793adf63df3c1dab2541cc72afe0d6379dcdf2221bdace22caebd6043e0a3
+MISC metadata.xml 939 BLAKE2B a14a037f7b5a45004833b83bd6ef13accff7e1d107873c823f0c42dd663eb638a59fdbedd8ce06aa5c00cb53e2c89bbc9f23f1f0a4dd1a388b0f5f9d5f522617 SHA512 3a09da26b5f736ece53917fbee3939ebff2045297d81043cf282fa0e0b1344be9e551df0a92b35db38b6feeb516e5319a8c65507b2f574971c9f5df66bda8079
diff --git a/dev-ada/libgpr/libgpr-2018-r1.ebuild b/dev-ada/libgpr/libgpr-2018-r1.ebuild
index 18b7fe860f2a..fdd4077231da 100644
--- a/dev-ada/libgpr/libgpr-2018-r1.ebuild
+++ b/dev-ada/libgpr/libgpr-2018-r1.ebuild
@@ -13,14 +13,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68
 		-> ${MYP}-src.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic"
 
 RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?]
-	dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=]
+	dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
 	!net-libs/grpc"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 S="${WORKDIR}"/${MYP}-src
 
diff --git a/dev-ada/libgpr/libgpr-2018.ebuild b/dev-ada/libgpr/libgpr-2018.ebuild
deleted file mode 100644
index 6041a1d9e70e..000000000000
--- a/dev-ada/libgpr/libgpr-2018.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 toolchain-funcs multiprocessing
-
-MYP=gprbuild-gpl-${PV}
-
-DESCRIPTION="Ada library to handle GPRbuild project files"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68
-		-> ${MYP}-src.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
-
-RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?]
-	dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=]
-	!net-libs/grpc"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	emake prefix="${D}"usr setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
-			gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_install() {
-	if use static-libs; then
-		emake DESTDIR="${D}" libgpr.install.static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake DESTDIR="${D}" libgpr.install.${kind}
-		fi
-	done
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/libgpr/libgpr-2019.ebuild b/dev-ada/libgpr/libgpr-2019.ebuild
index aa2517a75a3c..c493b2839717 100644
--- a/dev-ada/libgpr/libgpr-2019.ebuild
+++ b/dev-ada/libgpr/libgpr-2019.ebuild
@@ -13,14 +13,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093
 		-> ${MYP}-src.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019 +shared static-libs static-pic"
 
 RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?]
 	dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
 	!net-libs/grpc"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 S="${WORKDIR}"/${MYP}-src
 
diff --git a/dev-ada/libgpr/metadata.xml b/dev-ada/libgpr/metadata.xml
index b019905df244..1f0f18cea5f2 100644
--- a/dev-ada/libgpr/metadata.xml
+++ b/dev-ada/libgpr/metadata.xml
@@ -5,10 +5,6 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 7e0c0ec2b27f..ebbdc81c6afd 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -3,5 +3,5 @@ AUX xmlada-2019-gentoo.patch 1053 BLAKE2B 33403adf7bf4f774d7fbcf9f07fe0d248a0c7e
 DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
 EBUILD xmlada-2018.ebuild 1871 BLAKE2B f36dba5e21dadead63933f44e9b62da81ba3a40e523f92485515c7b9ccda27a84ba454325cbd7155de2da0552708266d4d05907255c852eef685e7ff007093fb SHA512 0753455dcdcc5f9e95d3966cdfffaf4fc7598f75efdc175f401ef759edcf86f89039b5035ca469399b3c67ef6e73387ec5aa53ff2145632e0b0809979d0a2580
-EBUILD xmlada-2019.ebuild 1990 BLAKE2B 79476d8c16f31e8da9a8612d014e573d5da4bcd6404ebf29f059dff764a51527626f509df67ae7add77be21d48c8ce1b52b6c340d216fe5c8795339d220ca49d SHA512 1f0e1627976faec56e5ffedf5ff6005ec01e88e84e21e8d9251072ddda0ee53dae7505f42c5cb2c35bcb7393fc31c477d6135df95d85a553b59343e970ca6fd8
-MISC metadata.xml 1179 BLAKE2B 5f118c6464cb78e444053ab496ccafaa1c3ace2308df8610b4dc624f1a7106eae999a467e83c03da186a20aef9bfe641d29b36eac2c13e7f4bb5c058b0f09676 SHA512 b466d653a77bddcda05688042bc12023303d983c017e50e223c0714bb3985ada394c968e6dd6f04674caeec2e8e2f59f51f76f80768373d97a8be6fbae5989d8
+EBUILD xmlada-2019.ebuild 2007 BLAKE2B 41f019a98cdbc81ac952ed4048de4f9bb9371f24edcbfd60fcf2c1f5cc33f275719a981723bc0542155df065d3c1df5f2dd6f18ccb21512fec7f4883ce67816e SHA512 bba6ad966ebb6ae63668856446b646be6f6a90e33030760f1d9b734084c52663dbf05d2ba096afd18a29772e0b735b76226781b8370b95ddfe5344bd426d5f0f
+MISC metadata.xml 907 BLAKE2B c57fbc3e91a6647b5687dc02c78986d161d6a8482119984a420685ce5366a4e0901aca404d066259b1e8384ba45875f15e54810d6d0fe97812ed3fb1983f1a91 SHA512 eb1acaf3359b0ca8544e07e5681ec2ab800581401644f3ee2313dcca9be163e2bdeac16b551aacb19402fd13c18e0787850fb5529382e3e0e77ba4a1b420f53a
diff --git a/dev-ada/xmlada/metadata.xml b/dev-ada/xmlada/metadata.xml
index ed84ea54db5d..6cc2bfd667c7 100644
--- a/dev-ada/xmlada/metadata.xml
+++ b/dev-ada/xmlada/metadata.xml
@@ -5,10 +5,6 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
-		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
-		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
diff --git a/dev-ada/xmlada/xmlada-2019.ebuild b/dev-ada/xmlada/xmlada-2019.ebuild
index 6469ae21ac3c..b841cf90e04c 100644
--- a/dev-ada/xmlada/xmlada-2019.ebuild
+++ b/dev-ada/xmlada/xmlada-2019.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019 +shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
@@ -24,7 +24,8 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
 	gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
+	dev-ada/gprbuild[gnat_2019(-)?]"
 
 S="${WORKDIR}"/${MYP}-src
 
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index bba0cae8a133..bc0eec0432bf 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index de5b4b580182..b5cf47a392ef 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -1,9 +1,9 @@
 DIST asio-1.10.8.tar.bz2 1270332 BLAKE2B 97e4a6a7c8b4562f10af1d122e9b08c12d567fd0447d1951a907f47f77832dcd42df4cb9b5b392feaaa2ea7c79d8bedfcf12e3052957ec012d8bb6b4d1347eb5 SHA512 d870686d2b19bec9925c311f2f0fd370e9797bbad252176a80a998f9c322ecd502b5081826105712e7caf87c03c3e6b70a0e219019e5bff46077d6e8c3c6db09
-DIST asio-1.12.1.tar.bz2 1444246 BLAKE2B d59b47a4dedd8d0892ace6d93c371cb02e16534b41bd490a945785526ad0a11bd6cb15f205bc5702b5a14780876bd92041bffac2898658b40c78ea27d4f37b14 SHA512 a994e1ee9a252d9f8cc2ada0915a9866eeebdd2b1d9a8fd50fa8db06d5ee6277f44a0f83c79f46f939adca43e02373ffee78ff6b1d6ae1798dcb1cd6d56dc568
 DIST asio-1.12.2.tar.bz2 1437221 BLAKE2B c4479b66cff7811aa7b7dbe65684d2a11fb675df53e9554c2871fd4e3a8e32d262ae701e98198d508f89463da48d4509f12e8db87d033a91d55e00609207a351 SHA512 7ce2c9e846059a2205eca6bde285eab81164fbe087d51d35a33a07be6208049fcf07fc1ac33934a758b6b5907e56f3377e20bff10ffc9268376f81c6fae4e34a
 DIST asio-1.13.0.tar.bz2 1472744 BLAKE2B 1fde414bfc782f25f8ad7d7caf9ac8971bea22ebd3b74846584a242d7df164895759b74777b2330aa98d34c5b8c34f266a2f85fcc27413990cc05420f7685398 SHA512 30b09c6656c9beaf091e72d518930bb5650f4bf66b286d11457a949a690a2b9ddcad0c95cb2098b41a2226f354741755ffbc92098f2844f3253e1921ff60cd5b
+DIST asio-1.14.0.tar.bz2 1473195 BLAKE2B e28960d585a1a84c6be7d6205be310bd2baab36e93630b9f5f4fba593377e57d6baf1c60e2503c46cd00ae73b20b622215358cae2068e86b62dac7e782210ecb SHA512 84855a06a3facc41e3c1c61be443d8b73a01afcb9bc3f1f444f0f3fd901ea1d5c932266ed94a031a0abd83171d5a6b83b6ab850e44aa31d175081a7e07b4793a
 EBUILD asio-1.10.8.ebuild 895 BLAKE2B 6f3de4ae224765cd3af5863fabb60f22a9ee060839c64cf6c2269f1cad57229914da5351cf90750522faa99fb362021ccc76fb8ea293859aef3e7465081df761 SHA512 648aa85f02271260fdc7c1ba7d6093c5dba3a172e4585d7d8f8e70dedc111d2bbd57093ebb3e8fc2a85008e5981b17a1861e356efd6102689bdc17f015e75e5a
-EBUILD asio-1.12.1.ebuild 966 BLAKE2B 9b0e88cbc1ed5221620b8822e259764d606be3b40e4d0874f45d714479488902b6e9707433679a4a5ce966bcbb5ed36afa583b6fbbf5f1405e09f6df0daf7c77 SHA512 42f3803e7b5efaba364e35b83420eaefbe86856b1722b3f4b1af4b4404c6bfe7fb2e29b10d5f537eec6d24bcd8b53d26b123e4dff515d1fc7e2903b7ee98f718
 EBUILD asio-1.12.2.ebuild 958 BLAKE2B fb6ce9c6ef49a612ea07b54ba90cded71442ff09c0093424ff22a7d5a2f7660c32c4d4f104c00908b69c5775fd6f6b041d51cb6d1d03c3f3bc989b0b74c964bd SHA512 84cbfa3082d7931f631f4cf056669e1676c59c7e36090dca77adae9c164e2660da8f9f2e32e1f63e341cdce1f9f4cea8e1028621540c3b4ddbd5a900e02348ac
 EBUILD asio-1.13.0.ebuild 958 BLAKE2B fb6ce9c6ef49a612ea07b54ba90cded71442ff09c0093424ff22a7d5a2f7660c32c4d4f104c00908b69c5775fd6f6b041d51cb6d1d03c3f3bc989b0b74c964bd SHA512 84cbfa3082d7931f631f4cf056669e1676c59c7e36090dca77adae9c164e2660da8f9f2e32e1f63e341cdce1f9f4cea8e1028621540c3b4ddbd5a900e02348ac
+EBUILD asio-1.14.0.ebuild 958 BLAKE2B fb6ce9c6ef49a612ea07b54ba90cded71442ff09c0093424ff22a7d5a2f7660c32c4d4f104c00908b69c5775fd6f6b041d51cb6d1d03c3f3bc989b0b74c964bd SHA512 84cbfa3082d7931f631f4cf056669e1676c59c7e36090dca77adae9c164e2660da8f9f2e32e1f63e341cdce1f9f4cea8e1028621540c3b4ddbd5a900e02348ac
 MISC metadata.xml 321 BLAKE2B e14808aaf0f0d648b8de65363250523777e9e4ae52a47f840af9c22321ea2f8329f6ac82ed5a05e7757d17e1c895428de69e46a60efc465dc2fd6657ebfc24c9 SHA512 a913fd91dff169b361b10efcbe51e2d55822319c06c9fd292d8fe4232ef9bed98541cb55caf37f56b27e9e135ce7ddc449d55f9159a57a8ac993f43f3ba1b751
diff --git a/dev-cpp/asio/asio-1.12.1.ebuild b/dev-cpp/asio/asio-1.12.1.ebuild
deleted file mode 100644
index 9a8a2d25af2c..000000000000
--- a/dev-cpp/asio/asio-1.12.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=6
-
-DESCRIPTION="Asynchronous Network Library"
-HOMEPAGE="http://asio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples libressl ssl test"
-
-RDEPEND="dev-libs/boost
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		# Don't build nor install any examples or unittests
-		# since we don't have a script to run them
-		cat > src/Makefile.in <<-EOF || die
-			all:
-
-			install:
-
-			clean:
-		EOF
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/. )
-	default
-
-	if use examples; then
-		# Get rid of the object files
-		emake clean
-		dodoc -r src/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-cpp/asio/asio-1.14.0.ebuild b/dev-cpp/asio/asio-1.14.0.ebuild
new file mode 100644
index 000000000000..fe556e8cbee7
--- /dev/null
+++ b/dev-cpp/asio/asio-1.14.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Asynchronous Network Library"
+HOMEPAGE="https://think-async.com"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples libressl ssl test"
+
+RDEPEND="dev-libs/boost
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if ! use test; then
+		# Don't build nor install any examples or unittests
+		# since we don't have a script to run them
+		cat > src/Makefile.in <<-EOF || die
+			all:
+
+			install:
+
+			clean:
+		EOF
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/. )
+	default
+
+	if use examples; then
+		# Get rid of the object files
+		emake clean
+		dodoc -r src/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 0554b1344220..3ea64201b2a4 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,20 +1,17 @@
-AUX configure-fix-pthread-linking.patch 3142 BLAKE2B 8bf1e9b7845330138684068ea1ba98ef9941e4f9a8d8517598fc48fdae984d051745307ac6e74a1fc37a65fd7e473b7526e6dc25dc3334f5b13e8a1a60e7f776 SHA512 4347570606853c75e43d3d1abe449cd562538e531136658e6742f8e2dddcc1767932b427a063f711b868467ca85ff947f24c4ed3e328319bd0a739bb66093016
 AUX gtest-1.8.0-fix-doublefree.patch 4176 BLAKE2B 8488622dab43418cca28fe65b43ba4e022d06e31517748226a61e18c366f33a7b8fb50ba8f0ca7a175774c580e0b356684414856a75d74363c816c5ab9ba2ef3 SHA512 5dc0b987ea9516c4ef0c8e50c58091431606d3555c0f24b2ea5786e47f8497664ca3fb55bb400e07c502319dfbf2d0a09d5121985defd8e8b5e29062a4a51134
 AUX gtest-1.8.0-fix-gcc6-undefined-behavior.patch 665 BLAKE2B 181253b829413cf41001236c4696fd35171345d9a933f62d0903d463e0bcf80004a0124e4c5b5846f40c8cfe70dfccc7488e1840ccf6418d34a461c482db373a SHA512 fc6f11a06f9aa7b1c31f5abbec208704dd0f461fed36d421802843234bb3d9fe3f2e35482629546c1a8585c84fb0850768dd8b63e0f88cfe0508b00278d800cc
 AUX gtest-1.8.0-increase-clone-stack-size.patch 588 BLAKE2B a05c131193a4fa8e585c23b8c664e1e5065bd1c02424c763df64bd2b83c975b33d8a7e6a52a4a094d2304ff96edc4cc72d5bd0c54579546d7d3512164bc18d4a SHA512 ca1e97c48b1f3340ccda093c1bac9b5ddbb84db6e8dd9f6d9da95a0ef105125c9bea34bba359ee473c0b05d7db6a69c2bdde8f1cbb14aeab9d76f83a4cd4b9a4
 AUX gtest-1.8.0-multilib-strict.patch 1126 BLAKE2B 9b7835108dec3c05025762e7161bbc993e77c0ea433ddec465746cc93cd231cbe654a756822d3a0c368497788bb5642b6a490f917736b763f18ed31b8a629558 SHA512 45bb44e3f0743ec0bd9f440585610ed04cbbd8befed398844300e21710b28f755f1775cc005efcdd0b4f6d2ec2200ad2abe98b2c6764400ffa04242fe7ce06fc
-AUX gtest-1.9.0_pre20190607-add-mmap-stack-flag.patch 743 BLAKE2B 5edde2e35acb559c1e32cb4470aa8b57f884d1b449b7a7a354ad2fce6e5926a84c7d5c8504926b1fd48dc2401da9c57bb5c33acfaf4fe833beb980169962d2e3 SHA512 56ae87e7ce980b244dc3a97d09217e20335372420016c00bc82fcd53113fef64de9f01521db3fac01cf3ffd8fb2b76febcd32c80fd9851876c735a43e811ed72
+AUX gtest-1.9.0_pre20190607-increase-clone-stack-size.patch 565 BLAKE2B 6960b5318aa450f9309811f7cd412a652203404dbfb0cec7a2e308f3dc5ae1cf6a1225caff4a60d9e70468339e19e95abf50b5aa29cabde5960eb4f1f2571714 SHA512 7a9f65e93feca436791541378d1c5b740b3c111724c4075ff1f23ac616ece50aa7beb35f143df39c93184754331666b294fbab39cad189a8da1c3290846933b3
 AUX gtest-9999-fix-gcc6-undefined-behavior.patch 463 BLAKE2B d61c3a735ab5ecc8a44b5b7c294a25be86bdfb8bd589df954862b4ddee60f14f04b0b64e4be80b6ed9e191429d640f8fecf4dac3667e9c9d875feb494bd64bce SHA512 8ee1fe3ab2b9352f4a34ea9e2813344eb507a2c7d519d67d647dc511c280f2a4609eccebc2a122d8431989b4a8e43c6cb9c5650877a257681f2d37672f446227
 AUX gtest-9999-fix-py-tests.patch 820 BLAKE2B a6a860b6935bd5f0bbe720f5af741448dd29878ca16d4187b84a40df4ec3ca216951ab0dfb1a89bebe2da1ad89f975e22ef6cdaced488de72b06953e185fd0d1 SHA512 4a059704303fffe508bd099544caaab5e4c819c978d6c104dce302e82348dd41fd63390459828a5f6161624dfd47aed5dc9cb466d36796904d598e0b10427949
-DIST gtest-1.7.0.tar.gz 1001582 BLAKE2B 3d10c1e502c2fac1500d07301031a9328b29027a3f9719137e09d2c47556cf52bbc978a8fb7b37330a94beafa27d24c3bfc247b2f0d51306b53f43e7ae2373b4 SHA512 a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
 DIST gtest-1.9.0_pre20190607.tar.gz 958396 BLAKE2B 64ae2c86a320a6ed56d6f99383591f7a0176e3f1291144bddf6dc82733c78177963f95516bbaed494318d3d7451d164aeb0d4a192b415414bcc25b9875cf6e82 SHA512 6c17ba303ec1dc8a989075a6dc0eda9b023345d00f6b43e588676cc2cd291f8c508744e4aba86a6c6b651329ce47419ad04d5765ca5978eda507a1643e8a92c3
-EBUILD gtest-1.7.0-r1.ebuild 1246 BLAKE2B 8d6ae73b7b0e7bd0d407789562d40fba430e546f97244f86d8ae87d0e64a3f6a3353463ca1a6cf17885bc4ed32b51cdc32d98d69a2401d104f84c360c95575dd SHA512 cdd56850b47e5a6f22382b6cd12854acd14b5e6760feb3ff99f7159155978b31e2879939c95c6a88a6025ce6ded3e9be0ee7a3689b1a008000addf7908753204
 EBUILD gtest-1.8.0-r1.ebuild 1670 BLAKE2B bd45cb2ffe973a6a856e858b5087177dc4d6d52c4cd955e93754165cef7d9960ef2d6d9e034f97030ce070cecfd94313c03de66604fc11918242a2567f54c410 SHA512 b7e04a98c1500109a4ecb4e02308d5fbbf360df70013bb4ccd8e1b1f4fc1b2539413dc7d658246593ce02562d17366540304658dd1b13f0e15ee4a7fbe484d6f
 EBUILD gtest-1.8.0.ebuild 1633 BLAKE2B 7d3c582e4b941c9990ba6a3cc56ae3e7305e89ecf86b8ddbecffa901047afd2783ec98db90cec9fc3f2d53349faaa992db4f3699a07529adc8f1f9319a2def68 SHA512 7335e0f5a0783c242468ab0fc8741dff517d72eb3523518aa5276483096fedce221c8f9f0933692410525ed9a24d709545e89ab8a8d6c9d8e55d8478322fd82e
 EBUILD gtest-1.8.1-r1.ebuild 1662 BLAKE2B 824a4ac0704705b3685c6f6b3b334b191537991454c68876443057fea0c2c74ad546f11b6214627994caa3a6c8cc10b2bb1139a559175bd2deb903697eda27be SHA512 ce9bf485877cbfdff5ce449af52e2939807205ec5c7348a0f56938796ae84d1778807c33300ab6d61c1babedea3095954398d12d44233065c853babd733c8bdb
 EBUILD gtest-1.8.1.ebuild 1686 BLAKE2B 7c6053a0f3d8d5f97199dd8a36b14739bc3db47a103ef5476bf46924c984e6e60745c073bd3fdf75d5a45ddcbacb226dafbc9dad2f373d13322a643a2238253b SHA512 edeb30abe53c77ec4797d9a15188b988c1981a2ceba3779c3014685c6c4a03e760f117b92264117562b504694aacfb3a9c42a9c934ae3c6c0f503edeafa7e510
-EBUILD gtest-1.9.0_pre20190607.ebuild 1753 BLAKE2B 5512cc85a06eaa11835f64dbb1cdccf090626c271e3c85390d425c13afd54d7d5b4fdbfbbc3b435157330f2f1dd57d7ba9f8f85046e364a273f7f01d3bbc18c7 SHA512 e462cfb849e05c8105a8e8b9048d7a2154823238dd9f1bd19d788bd740bedb0ef78b0bce6e670f9608128103fa7c9b4a4bd03ebd73229fa56ed6ab079b3e7186
-EBUILD gtest-9999.ebuild 1699 BLAKE2B 3eaff17f8bbaed2cd99966f2d445ed75faafabbd504bb9bac4c7e7b431d16b721cf1371d8006a373c61fdf29778e867a4f389be2f2155f70c3fc68f224287808 SHA512 de76a42373a1fd0a70c6a3b2d05dec3d681f7c10e03ab979c3e109b51f9a9ba2bbf126835877cf5086d2e078f0515fd25c84ff3e861cfb0f71f7a403d0bc20da
+EBUILD gtest-1.9.0_pre20190607.ebuild 1755 BLAKE2B a6ec7b1a789a332cd2aeb89ad2e5969a9e98eb74951ad8d6dccbcf2f62bc94a9c9b75a00abe08da05c109d3143248b87306ea81bd85957d4e6f896739fd1e266 SHA512 b0307813c7442c8e556785a1d47f23428f56d6ffe726a5d4eb3abf9d2c533ac0e830e74c6a2962e3c61eeeb92de8c58c963a3235994acb190773fe9b9e81c98c
+EBUILD gtest-9999.ebuild 1705 BLAKE2B aa0d763dab6bd0fcfda58b5ba1c267cc2a7d15d0fc33393f80c4edc48e1a3e412cb2004b155f54c2a865817d0eb073ea27b12ee71ec92ed11f5b0e84d319c203 SHA512 1c38c52e955bcac5c967514fda5612b52688b0237ba50d75b462000ab42bebf1f129a870886c26b5722457e2e617410824a4bdedeaeafa665002fd6838aaeedc
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
diff --git a/dev-cpp/gtest/files/configure-fix-pthread-linking.patch b/dev-cpp/gtest/files/configure-fix-pthread-linking.patch
deleted file mode 100644
index 75e5219b7a7c..000000000000
--- a/dev-cpp/gtest/files/configure-fix-pthread-linking.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From fb71154012e634a5e780e93af5434bcdafaf2b24 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Mon, 15 Oct 2012 17:25:07 -0400
-Subject: [PATCH] configure:  fix pthread linking
-
-- Update the pthread check to make sure that we don't need -lpthread when
-compiling with -nostdlib.
-
-- Make sure that the necessary pthread library is passed to libtool.
-
-Fixes:
-
-$ ldd -r /usr/lib/libgtest.so
-    linux-vdso.so.1 (0x00007fffe7dff000)
-    libstdc++.so.6 => /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/libstdc++.so.6 (0x00007fbe09a9f000)
-    libc.so.6 => /lib64/libc.so.6 (0x00007fbe096f7000)
-    libgcc_s.so.1 => /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/libgcc_s.so.1 (0x00007fbe094e1000)
-    libm.so.6 => /lib64/libm.so.6 (0x00007fbe091ee000)
-    /lib64/ld-linux-x86-64.so.2 (0x00007fbe0a005000)
-undefined symbol: pthread_key_create    (/usr/lib/libgtest.so)
-undefined symbol: pthread_getspecific   (/usr/lib/libgtest.so)
-undefined symbol: pthread_key_delete    (/usr/lib/libgtest.so)
-undefined symbol: pthread_setspecific   (/usr/lib/libgtest.so)
----
- Makefile.am       |    1 +
- m4/acx_pthread.m4 |   39 ++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 39 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index cb350b7..db2606e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -181,6 +181,7 @@ endif
- lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la
- 
- lib_libgtest_la_SOURCES = src/gtest-all.cc
-+lib_libgtest_la_LIBADD = $(AM_LIBS)
- 
- pkginclude_HEADERS = \
-   include/gtest/gtest-death-test.h \
-diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4
-index 2cf20de..7fba4d9 100644
---- a/m4/acx_pthread.m4
-+++ b/m4/acx_pthread.m4
-@@ -339,7 +339,44 @@ if test "x$acx_pthread_ok" = xyes; then
- 	   # so it's not safe to assume that we may use pthreads
- 	   acx_pthread_ok=no
- 	fi
--	
-+   
-+   AC_MSG_CHECKING([whether what we have so far is sufficient with -nostdlib])
-+   CFLAGS="-nostdlib $CFLAGS"
-+   # we need c with nostdlib
-+   LIBS="$LIBS -lc" 
-+   AC_TRY_LINK([#include <pthread.h>],
-+         [pthread_t th; pthread_join(th, 0);
-+         pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+         pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-+         [done=yes],[done=no])
-+      
-+   if test "x$done" = xyes; then
-+      AC_MSG_RESULT([yes])
-+   else
-+      AC_MSG_RESULT([no])
-+   fi
-+   
-+   if test x"$done" = xno; then
-+      AC_MSG_CHECKING([whether -lpthread saves the day])
-+      LIBS="-lpthread $LIBS"
-+      AC_TRY_LINK([#include <pthread.h>],
-+         [pthread_t th; pthread_join(th, 0);
-+         pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+         pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-+         [done=yes],[done=no])
-+
-+      if test "x$done" = xyes; then
-+         AC_MSG_RESULT([yes])
-+         PTHREAD_LIBS="$PTHREAD_LIBS -lpthread"
-+      else
-+         AC_MSG_RESULT([no])
-+         AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries and -nostdlib])
-+      fi
-+    fi
-+
-+    CFLAGS="$save_CFLAGS"
-+    LIBS="$save_LIBS"
-+    CC="$save_CC"	
- 	CFLAGS="$save_CFLAGS"
- 	LIBS="$save_LIBS"
- 	CC="$save_CC"
--- 
-1.7.8.6
-
diff --git a/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-add-mmap-stack-flag.patch b/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-add-mmap-stack-flag.patch
deleted file mode 100644
index 9a840aa58766..000000000000
--- a/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-add-mmap-stack-flag.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug: https://bugs.gentoo.org/688162
-Upstream PR: https://github.com/google/googletest/pull/2276
-
---- a/googletest/src/gtest-death-test.cc
-+++ b/googletest/src/gtest-death-test.cc
-@@ -1357,6 +1357,9 @@ static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
-     const auto stack_size = static_cast<size_t>(getpagesize());
-     // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
-     void* const stack = mmap(nullptr, stack_size, PROT_READ | PROT_WRITE,
-+#    if GTEST_OS_LINUX
-+                             (stack_grows_down ? MAP_GROWSDOWN : 0) | // Needed for stack auto-resizing
-+#    endif
-                              MAP_ANON | MAP_PRIVATE, -1, 0);
-     GTEST_DEATH_TEST_CHECK_(stack != MAP_FAILED);
- 
diff --git a/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch b/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch
new file mode 100755
index 000000000000..38d515a48ddb
--- /dev/null
+++ b/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/692464
+
+--- a/googletest/src/gtest-death-test.cc
++++ b/googletest/src/gtest-death-test.cc
+@@ -1070,7 +1070,7 @@
+ 
+   if (!use_fork) {
+     static const bool stack_grows_down = StackGrowsDown();
+-    const auto stack_size = static_cast<size_t>(getpagesize());
++    const auto stack_size = static_cast<size_t>(getpagesize()* 10);
+     // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
+     void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE,
+                              MAP_ANON | MAP_PRIVATE, -1, 0);
diff --git a/dev-cpp/gtest/gtest-1.7.0-r1.ebuild b/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
deleted file mode 100644
index 360809f62e74..000000000000
--- a/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 autotools-multilib
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="https://github.com/google/googletest"
-SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="examples static-libs"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/configure-fix-pthread-linking.patch" #371647
-)
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die
-	sed -i -r \
-		-e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \
-		Makefile.am || die
-	autotools-multilib_src_prepare
-}
-
-multilib_src_install() {
-	default
-	multilib_is_native_abi && dobin scripts/gtest-config
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins samples/*.{cc,h}
-	fi
-}
diff --git a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
index be0b3f49f666..47f236ed8ce0 100644
--- a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
+++ b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
@@ -20,7 +20,7 @@ else
 		MY_PV=${GOOGLETEST_COMMIT}
 	fi
 	SRC_URI="https://github.com/google/googletest/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}"/googletest-${MY_PV}
 fi
 
@@ -35,7 +35,7 @@ DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="!dev-cpp/gmock"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0_pre20190607-add-mmap-stack-flag.patch
+	"${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch
 )
 
 pkg_setup() {
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index bd677dc0bd1d..02ca3c039b1a 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -33,7 +33,7 @@ DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="!dev-cpp/gmock"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0_pre20190607-add-mmap-stack-flag.patch
+	"${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch
 )
 
 pkg_setup() {
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 69313efe7104..732aff873376 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/clickhouse/Manifest b/dev-db/clickhouse/Manifest
index 02eff11f0324..468b95de347d 100644
--- a/dev-db/clickhouse/Manifest
+++ b/dev-db/clickhouse/Manifest
@@ -9,11 +9,11 @@ DIST clickhouse-18.6.0.tar.gz 5852534 BLAKE2B 5634fd26907b21d4a35cff3ed816696205
 DIST clickhouse-19.13.1.11.zip 11502726 BLAKE2B c2788702a2c27c995abc072a94f3945ed6f9039fe0c7840312a86987faf52d2f7801d531e89a02848fa8ee1319247c41de0f3ad0c0cb51c1df1dbcfca3bd3b0a SHA512 095a0e63eff6989ea1f70fac593069e1cdb6ea207a99d8cfd610c4eb8f3f7411a784d9f100c9fc899898e68dd88dd54bec3c136764793c8cae986d920a651f8c
 DIST clickhouse-19.5.3.8.zip 11247905 BLAKE2B f72289f55bddf9b3ad2e16a4d1fc6e4f7681477e742eda3694c3c16975820c93affc01c70b194c5992226d79bee714f706c04402c62bd0ed3d1701a16fb22192 SHA512 f578abbd43c3ccf721e079ce2bafac22be0c5d619388be192c59a2053ae1cf1e7f0a025e0323f0f8f004f879990a88c0ca0cd4d135606de51c576619fe0172b8
 DIST clickhouse-19.9.5.36.zip 11708002 BLAKE2B 075f9b1556c5ee207a608047fa559cec7a0b1f044236e412189ae6dabe25aa04abf881726e4ffa17d4aad6937250c704f050935e61470994b57eaa1ac9ea07e4 SHA512 b0aa04a1c0f7c15316c83a2711f9b64f8235e664956f933530a9f2dc26fcb8b817adb8ca43c96db1cad498e06f4291ce13c0bb259726039c5caa52ae523fa4ab
-EBUILD clickhouse-18.10.3.ebuild 4915 BLAKE2B 3f6f0f1cea60a283b325b80100fc56ffcb548e6af01240a12a5f6a6aad521977c63e8918d3742c52c0fef2d5c79144f6a1f9cb95749a6c140cb16548af432f4a SHA512 0ecc73385521a4d916e8834d22e05a8be07fb0b2d6a4bcc3350dfab100717839835e4a47a17d87f50f98acbf420b077dc7f9db800e3456915dc2ed81fc0197ba
-EBUILD clickhouse-18.12.17.ebuild 4912 BLAKE2B 71e1d446bc95be176c6946d18162b78f0ae0e936be2caedd9ee7b0df958daf8423ffce528c27c90607568f5bf3b391092ef264c7d1439506ab89f6fded52bb6b SHA512 6ac5f2e640ad5e6536a38a9693df2b31706f9d777f53213971ef848160886d16b6cc0a7f900ce587e53b1cdba3edcdd37541b4e639aa65662f9e0a26f9501fc5
-EBUILD clickhouse-18.6.0.ebuild 4903 BLAKE2B d363915e46bfe1489e07f9ae9b07a39c146603af9496ab98371b053241566e02c7b85cf64a985ef8958e83a8741ac20583917e8268cec80702e4d37e69d8e110 SHA512 443eb0cd7f343eaff895dfbcb6a98abc4b2734495e2abd9c9f51e613fc2ac8698797bb5f780178c86bc0d8621cfe0b976470c7c4b9ec0bd337fa0599f0d01848
-EBUILD clickhouse-19.13.1.11-r1.ebuild 5144 BLAKE2B 77f5416736145c44a1968ebb74968fe59b807c46dfb4104e73544a554f49a3d4ae34b494290c5beca798c32096014e63fac9940790f9ed3b9c4a4d7b59b09489 SHA512 9aff8448125ad6b1dad555289f1a345b9fbbcb2e7c1594ac680bcfb4274030149c52786cd1b58c620329ec587a683258d9dfd3aca111d1d04c7bdd3a36b309c9
-EBUILD clickhouse-19.13.1.11.ebuild 5054 BLAKE2B 43ae8340ed6038c6ea92c44d4dbd27183feaea2f96ce0c563a2163ce2a3c8e0a851dab3f3a813fa83404fbc008bc84a8c905581756529e4f269b155c6d4d2e76 SHA512 092c727a4dd9a7a9ce0cac0032988e01d29d641674a5f47a0dc77eb4d99090c45925dca4aa304646cc89ceb0017463bbf93d4711683030ced0a18d3e4f04246e
-EBUILD clickhouse-19.5.3.8.ebuild 5035 BLAKE2B 5af2ff21963b567b2f1f1600a046e90c885a17aeb2b4244a3d60b15b96d25fb268330de602db576ea3809785be984e2f511d63b17776e369f1798549398148ce SHA512 5642771484458e8fc390a259af958598972207706ed3f78247fbd91e242bcf79052be58fc49b50f6d44765fc1932f6731ff45b17244b6919daa69a44ea83023c
-EBUILD clickhouse-19.9.5.36.ebuild 5035 BLAKE2B 5af2ff21963b567b2f1f1600a046e90c885a17aeb2b4244a3d60b15b96d25fb268330de602db576ea3809785be984e2f511d63b17776e369f1798549398148ce SHA512 5642771484458e8fc390a259af958598972207706ed3f78247fbd91e242bcf79052be58fc49b50f6d44765fc1932f6731ff45b17244b6919daa69a44ea83023c
+EBUILD clickhouse-18.10.3-r1.ebuild 4918 BLAKE2B 2b7db7cd6213ec5965692c231d567f29345515edd639e054ad2f4dd9ca5ccc11560126c9361fb93412395810947c1b6b19859c0b5274a90eda502851a45c44f0 SHA512 97f4328dc9b0ad5cb50c223b00d127aee0da3f3349067674cd124b6a4842547376b674d031d72274313bc1df22099570cdac6211f294be97b5b08ed91155cedc
+EBUILD clickhouse-18.12.17-r1.ebuild 4915 BLAKE2B 6912e12f85c382c0a2822c924055583d1152311f1a7480900573f7dba1002821821912c75420551aebf32ee7dea70f54f8d8c00512f155fa66f3926146e21721 SHA512 af177e7339dcc6b0a8a8d3527b2c15a663f8bab2cdf2879d1ba7ff217697bd7db369f1a3f54630ebf00bc36e455b6f9b4390752cd910d3e434d42aab962ed0e8
+EBUILD clickhouse-18.6.0-r1.ebuild 4906 BLAKE2B ab34699e3a363109e51559ed941bc47ee422335ec0a198191f8aee9673cabb2d14156210855bb46bcf0ac1cbd7b744541641b3e0e796085a0c2cd9d2e3a59435 SHA512 3671f1837b50806528893c8f1291ec60f2ef42230ae8f5b7c07ee9da34706a0ba489e90950a03fa0f3c8b9bc3b144a06e7f3f0bc35b30fbb179da7715ebefc14
+EBUILD clickhouse-19.13.1.11-r2.ebuild 5060 BLAKE2B 9dd106fcbf56f676668613defe986cc39b8b489e67a15f96bc89101e7490bccebfffdbd85dbe5ea890e635f7f87dd7f06555caaaafdd76f06ee0ae5ea7cd1db6 SHA512 8e0eb0472dbe9bca99181b644489b331a292f41ede0d6ef35c6c8862f427f883255d890f0fd973728a9c6538d679c7aa6916e481bb55f3ac1b662c402215efa1
+EBUILD clickhouse-19.13.1.11-r3.ebuild 5150 BLAKE2B 3224340a5229b176f033481560373c62ba3493e4f75d2d946379db1c1da8ff17180c382478572803d638e67614a4c4385a8bf1e13fb46293f0ea4a07fb9ae812 SHA512 ce24527a8c9c5802d6fb1cdc9a6c6fafa49a71d20199ae77e45da1190cd720719591009a0f2ecaad867f4f9952432d3af7ad5a39a9618f2467b2aee817d31f3b
+EBUILD clickhouse-19.5.3.8-r1.ebuild 5041 BLAKE2B aad165d484fd9a978057e57f57a12146ae97f82455ff47909a9476f04c28c95e719a7867cb2b2fe6acde25fa2e43c12de4c7c19c2c8e6f0810f4ddcf08b311ad SHA512 253de2e46d5eaba79d5d79a149e0fcc582dd08dd30a0b04fe39e2900ebf5ca68cfd7619f4c9af5d662d7baa795649a37a4db48efc6067c92fb79956a2ca9e847
+EBUILD clickhouse-19.9.5.36-r1.ebuild 5041 BLAKE2B aad165d484fd9a978057e57f57a12146ae97f82455ff47909a9476f04c28c95e719a7867cb2b2fe6acde25fa2e43c12de4c7c19c2c8e6f0810f4ddcf08b311ad SHA512 253de2e46d5eaba79d5d79a149e0fcc582dd08dd30a0b04fe39e2900ebf5ca68cfd7619f4c9af5d662d7baa795649a37a4db48efc6067c92fb79956a2ca9e847
 MISC metadata.xml 738 BLAKE2B 861f40f506964d64cf646f043406945dc54950f48e27d4eb28b6fc0f96bf0ceb093520a0b60d813460fbe8b99ba4858f0a49d30abcb25567f44411c78a02f6e7 SHA512 6d87cc967c081b5a5e60136f5928d7b17c65c3a1c26aa1e45a50e74d5383bb665682a8b0cb5cce0496bebcac1f5e27aace8a8373253c031acc3c166c382e0056
diff --git a/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
new file mode 100644
index 000000000000..ff3db2a3a66b
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils systemd toolchain-funcs user
+
+DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
+HOMEPAGE="https://clickhouse.yandex"
+LICENSE="Apache-2.0"
+
+MY_PN="ClickHouse"
+TYPE="stable"
+
+CCTZ_COMMIT="4f9776a"
+SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
+	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
+"
+
+SLOT="0/${TYPE}"
+IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		|| (
+			dev-db/unixODBC
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu:=
+		dev-libs/glib
+		>=dev-libs/boost-1.65.0:=
+		dev-libs/openssl:0=
+		dev-libs/zookeeper-c
+		kafka? ( dev-libs/librdkafka:= )
+		mysql? ( dev-db/mysql-connector-c:= )
+	)
+
+	>=dev-libs/poco-1.9.0
+	dev-libs/libpcre
+"
+
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/mkdocs-1.0.1 )
+	static? (
+		>=app-arch/lz4-1.8.0[static-libs]
+		>=app-arch/zstd-1.3.4[static-libs]
+		client? (
+			sys-libs/ncurses:0=[static-libs]
+			sys-libs/readline:0=[static-libs]
+		)
+		dev-libs/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-libs/zookeeper-c[static-libs]
+		dev-db/mysql-connector-c[static-libs]
+		kafka? ( dev-libs/librdkafka[static-libs] )
+	)
+
+	sys-libs/libtermcap-compat
+	dev-util/patchelf
+	>=sys-devel/lld-6.0.0
+	|| (
+		>=sys-devel/gcc-7.0
+		>=sys-devel/clang-6.0
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
+
+_clang_fullversion() {
+	local ver="$1"; shift
+	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
+	eval echo "$ver"
+}
+
+clang-fullversion() {
+	_clang_fullversion '$1.$2.$3' "$@"
+}
+
+clang-version() {
+	_clang_fullversion '$1.$2' "$@"
+}
+
+clang-major-version() {
+	_clang_fullversion '$1' "$@"
+}
+
+clang-minor-version() {
+	_clang_fullversion '$2' "$@"
+}
+
+clang-micro-version() {
+	_clang_fullversion '$3' "$@"
+}
+
+pkg_pretend() {
+	if [[ $(tc-getCC) == clang ]]; then
+		if [[ $(clang-major-version) -lt 6 ]]; then
+			eerror "Compilation with clang older than 6.0 is not supported"
+			die "Too old clang found"
+		fi
+		:
+	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
+		eerror "Compilation with gcc older than 7.2 is not supported"
+		die "Too old gcc found"
+	fi
+}
+
+src_unpack() {
+	default_src_unpack
+	[[ ${PV} == 9999 ]] && return 0
+	cd "${S}/contrib" || die "failed to cd to contrib"
+	mkdir -p cctz zookeeper zstd || die "failed to create directories"
+	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_POCO_MONGODB="$(usex mongodb)"
+		-DENABLE_RDKAFKA="$(usex kafka)"
+		-DENABLE_TESTS="$(usex test)"
+		-DUSE_STATIC_LIBRARIES="$(usex static)"
+		-DMAKE_STATIC_LIBRARIES="$(usex static)"
+		-DUSE_MYSQL="$(usex mysql)"
+		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
+		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
+		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
+		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
+		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
+		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
+		-DENABLE_CLICKHOUSE_ALL=OFF
+		-DUSE_INTERNAL_SSL_LIBRARY=False
+		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
+		-DUNBUNDLED=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use test; then
+		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
+	fi
+
+	if use doc; then
+		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
+		./build.py || die "Failed to build docs"
+		popd || die "Failed to exit docs build directory"
+
+		dodoc -r "${S}/docs/build"
+	fi
+
+	if use server; then
+		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
+		systemd_dounit "${FILESDIR}"/clickhouse-server.service
+	fi
+}
+
+pkg_preinst() {
+	if use server; then
+		enewgroup clickhouse
+		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
+	fi
+}
diff --git a/dev-db/clickhouse/clickhouse-18.10.3.ebuild b/dev-db/clickhouse/clickhouse-18.10.3.ebuild
deleted file mode 100644
index fa20957d2696..000000000000
--- a/dev-db/clickhouse/clickhouse-18.10.3.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:7
-		sys-libs/zlib
-		|| (
-			dev-db/unixODBC
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		dev-libs/zookeeper-c
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( virtual/libmysqlclient )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/double-conversion[static-libs]
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:7[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		dev-libs/zookeeper-c[static-libs]
-		virtual/libmysqlclient[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	|| (
-		>=sys-devel/gcc-7.0
-		>=sys-devel/clang-6.0
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zookeeper zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_SSL_LIBRARY=False
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
new file mode 100644
index 000000000000..b8a7337618a9
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils systemd toolchain-funcs user
+
+DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
+HOMEPAGE="https://clickhouse.yandex"
+LICENSE="Apache-2.0"
+
+MY_PN="ClickHouse"
+TYPE="stable"
+
+CCTZ_COMMIT="4f9776a"
+SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
+	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
+"
+
+SLOT="0/${TYPE}"
+IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		|| (
+			dev-db/unixODBC
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu:=
+		dev-libs/glib
+		>=dev-libs/boost-1.65.0:=
+		dev-libs/openssl:0=
+		kafka? ( dev-libs/librdkafka:= )
+		mysql? ( dev-db/mysql-connector-c:= )
+	)
+
+	>=dev-libs/poco-1.9.0
+	dev-libs/libpcre
+"
+
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/mkdocs-1.0.1 )
+	static? (
+		>=app-arch/lz4-1.8.0[static-libs]
+		>=app-arch/zstd-1.3.4[static-libs]
+		client? (
+			sys-libs/ncurses:0=[static-libs]
+			sys-libs/readline:0=[static-libs]
+		)
+		dev-libs/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-db/mysql-connector-c[static-libs]
+		kafka? ( dev-libs/librdkafka[static-libs] )
+	)
+
+	sys-libs/libtermcap-compat
+	dev-util/patchelf
+	>=sys-devel/lld-6.0.0
+	|| (
+		>=sys-devel/gcc-7.0
+		>=sys-devel/clang-6.0
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
+
+_clang_fullversion() {
+	local ver="$1"; shift
+	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
+	eval echo "$ver"
+}
+
+clang-fullversion() {
+	_clang_fullversion '$1.$2.$3' "$@"
+}
+
+clang-version() {
+	_clang_fullversion '$1.$2' "$@"
+}
+
+clang-major-version() {
+	_clang_fullversion '$1' "$@"
+}
+
+clang-minor-version() {
+	_clang_fullversion '$2' "$@"
+}
+
+clang-micro-version() {
+	_clang_fullversion '$3' "$@"
+}
+
+pkg_pretend() {
+	if [[ $(tc-getCC) == clang ]]; then
+		if [[ $(clang-major-version) -lt 6 ]]; then
+			eerror "Compilation with clang older than 6.0 is not supported"
+			die "Too old clang found"
+		fi
+		:
+	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
+		eerror "Compilation with gcc older than 7.2 is not supported"
+		die "Too old gcc found"
+	fi
+}
+
+src_unpack() {
+	default_src_unpack
+	[[ ${PV} == 9999 ]] && return 0
+	cd "${S}/contrib" || die "failed to cd to contrib"
+	mkdir -p cctz zstd || die "failed to create directories"
+	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_POCO_MONGODB="$(usex mongodb)"
+		-DENABLE_RDKAFKA="$(usex kafka)"
+		-DENABLE_TESTS="$(usex test)"
+		-DUSE_STATIC_LIBRARIES="$(usex static)"
+		-DMAKE_STATIC_LIBRARIES="$(usex static)"
+		-DUSE_MYSQL="$(usex mysql)"
+		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
+		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
+		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
+		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
+		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
+		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
+		# As of now, clickhouse fails to build if odbc is disabled
+		-DENABLE_ODBC=True
+		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
+		-DENABLE_CLICKHOUSE_ALL=OFF
+		-DUSE_INTERNAL_SSL_LIBRARY=False
+		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
+		-DUNBUNDLED=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use test; then
+		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
+	fi
+
+	if use doc; then
+		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
+		./build.py || die "Failed to build docs"
+		popd || die "Failed to exit docs build directory"
+
+		dodoc -r "${S}/docs/build"
+	fi
+
+	if use server; then
+		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
+		systemd_dounit "${FILESDIR}"/clickhouse-server.service
+	fi
+}
+
+pkg_preinst() {
+	if use server; then
+		enewgroup clickhouse
+		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
+	fi
+}
diff --git a/dev-db/clickhouse/clickhouse-18.12.17.ebuild b/dev-db/clickhouse/clickhouse-18.12.17.ebuild
deleted file mode 100644
index 40f986b3e902..000000000000
--- a/dev-db/clickhouse/clickhouse-18.12.17.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:7
-		sys-libs/zlib
-		|| (
-			dev-db/unixODBC
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( virtual/libmysqlclient )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/double-conversion[static-libs]
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:7[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		virtual/libmysqlclient[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	|| (
-		>=sys-devel/gcc-7.0
-		>=sys-devel/clang-6.0
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_SSL_LIBRARY=False
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild b/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
new file mode 100644
index 000000000000..e419edfa1571
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils systemd toolchain-funcs user
+
+DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
+HOMEPAGE="https://clickhouse.yandex"
+LICENSE="Apache-2.0"
+
+MY_PN="ClickHouse"
+TYPE="stable"
+
+CCTZ_COMMIT="4f9776a"
+ZSTD_COMMIT="2555975"
+SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
+	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
+"
+
+SLOT="0/${TYPE}"
+IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		|| (
+			dev-db/unixODBC
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu:=
+		dev-libs/glib
+		>=dev-libs/boost-1.65.0:=
+		dev-libs/openssl:0=
+		dev-libs/zookeeper-c
+		kafka? ( dev-libs/librdkafka:= )
+		mysql? ( dev-db/mysql-connector-c:= )
+	)
+
+	>=dev-libs/poco-1.9.0
+	dev-libs/libpcre
+"
+
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/mkdocs-0.17.3 )
+	static? (
+		>=app-arch/lz4-1.8.0[static-libs]
+		>=app-arch/zstd-1.3.4[static-libs]
+		client? (
+			sys-libs/ncurses:0=[static-libs]
+			sys-libs/readline:0=[static-libs]
+		)
+		dev-libs/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-libs/zookeeper-c[static-libs]
+		dev-db/mysql-connector-c[static-libs]
+		kafka? ( dev-libs/librdkafka[static-libs] )
+	)
+
+	sys-libs/libtermcap-compat
+	dev-util/patchelf
+	>=sys-devel/lld-6.0.0
+	|| (
+		>=sys-devel/gcc-7.0
+		>=sys-devel/clang-6.0
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
+
+_clang_fullversion() {
+	local ver="$1"; shift
+	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
+	eval echo "$ver"
+}
+
+clang-fullversion() {
+	_clang_fullversion '$1.$2.$3' "$@"
+}
+
+clang-version() {
+	_clang_fullversion '$1.$2' "$@"
+}
+
+clang-major-version() {
+	_clang_fullversion '$1' "$@"
+}
+
+clang-minor-version() {
+	_clang_fullversion '$2' "$@"
+}
+
+clang-micro-version() {
+	_clang_fullversion '$3' "$@"
+}
+
+pkg_pretend() {
+	if [[ $(tc-getCC) == clang ]]; then
+		if [[ $(clang-major-version) -lt 6 ]]; then
+			eerror "Compilation with clang older than 6.0 is not supported"
+			die "Too old clang found"
+		fi
+		:
+	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
+		eerror "Compilation with gcc older than 7.2 is not supported"
+		die "Too old gcc found"
+	fi
+}
+
+src_unpack() {
+	default_src_unpack
+	[[ ${PV} == 9999 ]] && return 0
+	cd "${S}/contrib" || die "failed to cd to contrib"
+	mkdir -p cctz zookeeper zstd || die "failed to create directories"
+	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_POCO_MONGODB="$(usex mongodb)"
+		-DENABLE_RDKAFKA="$(usex kafka)"
+		-DENABLE_TESTS="$(usex test)"
+		-DUSE_STATIC_LIBRARIES="$(usex static)"
+		-DMAKE_STATIC_LIBRARIES="$(usex static)"
+		-DUSE_MYSQL="$(usex mysql)"
+		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
+		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
+		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
+		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
+		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
+		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
+		-DENABLE_CLICKHOUSE_ALL=OFF
+		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
+		-DUNBUNDLED=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use test; then
+		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
+	fi
+
+	if use doc; then
+		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
+		./build.py || die "Failed to build docs"
+		popd || die "Failed to exit docs build directory"
+
+		dodoc -r "${S}/docs/build"
+	fi
+
+	if use server; then
+		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
+		systemd_dounit "${FILESDIR}"/clickhouse-server.service
+	fi
+}
+
+pkg_preinst() {
+	if use server; then
+		enewgroup clickhouse
+		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
+	fi
+}
diff --git a/dev-db/clickhouse/clickhouse-18.6.0.ebuild b/dev-db/clickhouse/clickhouse-18.6.0.ebuild
deleted file mode 100644
index 734544c61dae..000000000000
--- a/dev-db/clickhouse/clickhouse-18.6.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-ZSTD_COMMIT="2555975"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:7
-		sys-libs/zlib
-		|| (
-			dev-db/unixODBC
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		dev-libs/zookeeper-c
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( virtual/libmysqlclient )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-0.17.3 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/double-conversion[static-libs]
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:7[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		dev-libs/zookeeper-c[static-libs]
-		virtual/libmysqlclient[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	|| (
-		>=sys-devel/gcc-7.0
-		>=sys-devel/clang-6.0
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zookeeper zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r1.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r1.ebuild
deleted file mode 100644
index a2fbc773fa76..000000000000
--- a/dev-db/clickhouse/clickhouse-19.13.1.11-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:7
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( virtual/libmysqlclient )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-	dev-libs/jemalloc
-	dev-libs/protobuf
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/double-conversion[static-libs]
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:7[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		virtual/libmysqlclient[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-	=dev-cpp/gtest-1.8*
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	>=sys-devel/gcc-7.0
-	>=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_prepare() {
-	eapply_user
-	cmake-utils_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_SSL_LIBRARY=False
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd-r1 clickhouse-server
-		newconfd "${FILESDIR}"/clickhouse-server.confd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-
-	keepdir /var/log/clickhouse-server
-	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
new file mode 100644
index 000000000000..799746e089be
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils systemd toolchain-funcs user
+
+DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
+HOMEPAGE="https://clickhouse.yandex"
+LICENSE="Apache-2.0"
+
+MY_PN="ClickHouse"
+TYPE="stable"
+
+CCTZ_COMMIT="4f9776a"
+SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
+	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
+"
+
+SLOT="0/${TYPE}"
+IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		dev-libs/poco[odbc]
+		dev-libs/icu:=
+		dev-libs/glib
+		>=dev-libs/boost-1.65.0:=
+		dev-libs/openssl:0=
+		kafka? ( dev-libs/librdkafka:= )
+		mysql? ( dev-db/mysql-connector-c:= )
+	)
+
+	>=dev-libs/poco-1.9.0
+	dev-libs/libpcre
+	dev-libs/jemalloc
+	dev-libs/protobuf
+"
+
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/mkdocs-1.0.1 )
+	static? (
+		>=app-arch/lz4-1.8.0[static-libs]
+		>=app-arch/zstd-1.3.4[static-libs]
+		client? (
+			sys-libs/ncurses:0=[static-libs]
+			sys-libs/readline:0=[static-libs]
+		)
+		dev-libs/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-db/mysql-connector-c[static-libs]
+		kafka? ( dev-libs/librdkafka[static-libs] )
+	)
+
+	sys-libs/libtermcap-compat
+	dev-util/patchelf
+	>=sys-devel/lld-6.0.0
+	>=sys-devel/gcc-7.0
+	>=sys-devel/clang-6.0
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
+
+_clang_fullversion() {
+	local ver="$1"; shift
+	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
+	eval echo "$ver"
+}
+
+clang-fullversion() {
+	_clang_fullversion '$1.$2.$3' "$@"
+}
+
+clang-version() {
+	_clang_fullversion '$1.$2' "$@"
+}
+
+clang-major-version() {
+	_clang_fullversion '$1' "$@"
+}
+
+clang-minor-version() {
+	_clang_fullversion '$2' "$@"
+}
+
+clang-micro-version() {
+	_clang_fullversion '$3' "$@"
+}
+
+pkg_pretend() {
+	if [[ $(tc-getCC) == clang ]]; then
+		if [[ $(clang-major-version) -lt 6 ]]; then
+			eerror "Compilation with clang older than 6.0 is not supported"
+			die "Too old clang found"
+		fi
+		:
+	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
+		eerror "Compilation with gcc older than 7.2 is not supported"
+		die "Too old gcc found"
+	fi
+}
+
+src_unpack() {
+	default_src_unpack
+	[[ ${PV} == 9999 ]] && return 0
+	cd "${S}/contrib" || die "failed to cd to contrib"
+	mkdir -p cctz zstd || die "failed to create directories"
+	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
+}
+
+src_prepare() {
+	eapply_user
+	cmake-utils_src_prepare
+}
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_POCO_MONGODB="$(usex mongodb)"
+		-DENABLE_RDKAFKA="$(usex kafka)"
+		-DENABLE_TESTS="$(usex test)"
+		-DUSE_STATIC_LIBRARIES="$(usex static)"
+		-DMAKE_STATIC_LIBRARIES="$(usex static)"
+		-DUSE_MYSQL="$(usex mysql)"
+		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
+		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
+		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
+		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
+		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
+		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
+		# As of now, clickhouse fails to build if odbc is disabled
+		-DENABLE_ODBC=True
+		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
+		-DENABLE_CLICKHOUSE_ALL=OFF
+		-DUSE_INTERNAL_SSL_LIBRARY=False
+		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
+		-DUNBUNDLED=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use test; then
+		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
+	fi
+
+	if use doc; then
+		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
+		./build.py || die "Failed to build docs"
+		popd || die "Failed to exit docs build directory"
+
+		dodoc -r "${S}/docs/build"
+	fi
+
+	if use server; then
+		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
+		systemd_dounit "${FILESDIR}"/clickhouse-server.service
+	fi
+
+	keepdir /var/log/clickhouse-server
+	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
+}
+
+pkg_preinst() {
+	if use server; then
+		enewgroup clickhouse
+		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
+	fi
+}
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
new file mode 100644
index 000000000000..6525cf8d8cf5
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils systemd toolchain-funcs user
+
+DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
+HOMEPAGE="https://clickhouse.yandex"
+LICENSE="Apache-2.0"
+
+MY_PN="ClickHouse"
+TYPE="stable"
+
+CCTZ_COMMIT="4f9776a"
+SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
+	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
+"
+
+SLOT="0/${TYPE}"
+IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		dev-libs/poco[odbc]
+		dev-libs/icu:=
+		dev-libs/glib
+		>=dev-libs/boost-1.65.0:=
+		dev-libs/openssl:0=
+		kafka? ( dev-libs/librdkafka:= )
+		mysql? ( dev-db/mysql-connector-c:= )
+	)
+
+	>=dev-libs/poco-1.9.0
+	dev-libs/libpcre
+	dev-libs/jemalloc
+	dev-libs/protobuf
+"
+
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/mkdocs-1.0.1 )
+	static? (
+		>=app-arch/lz4-1.8.0[static-libs]
+		>=app-arch/zstd-1.3.4[static-libs]
+		client? (
+			sys-libs/ncurses:0=[static-libs]
+			sys-libs/readline:0=[static-libs]
+		)
+		dev-libs/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-db/mysql-connector-c[static-libs]
+		kafka? ( dev-libs/librdkafka[static-libs] )
+	)
+	=dev-cpp/gtest-1.8*
+	sys-libs/libtermcap-compat
+	dev-util/patchelf
+	>=sys-devel/lld-6.0.0
+	>=sys-devel/gcc-7.0
+	>=sys-devel/clang-6.0
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
+
+_clang_fullversion() {
+	local ver="$1"; shift
+	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
+	eval echo "$ver"
+}
+
+clang-fullversion() {
+	_clang_fullversion '$1.$2.$3' "$@"
+}
+
+clang-version() {
+	_clang_fullversion '$1.$2' "$@"
+}
+
+clang-major-version() {
+	_clang_fullversion '$1' "$@"
+}
+
+clang-minor-version() {
+	_clang_fullversion '$2' "$@"
+}
+
+clang-micro-version() {
+	_clang_fullversion '$3' "$@"
+}
+
+pkg_pretend() {
+	if [[ $(tc-getCC) == clang ]]; then
+		if [[ $(clang-major-version) -lt 6 ]]; then
+			eerror "Compilation with clang older than 6.0 is not supported"
+			die "Too old clang found"
+		fi
+		:
+	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
+		eerror "Compilation with gcc older than 7.2 is not supported"
+		die "Too old gcc found"
+	fi
+}
+
+src_unpack() {
+	default_src_unpack
+	[[ ${PV} == 9999 ]] && return 0
+	cd "${S}/contrib" || die "failed to cd to contrib"
+	mkdir -p cctz zstd || die "failed to create directories"
+	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
+}
+
+src_prepare() {
+	eapply_user
+	cmake-utils_src_prepare
+}
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_POCO_MONGODB="$(usex mongodb)"
+		-DENABLE_RDKAFKA="$(usex kafka)"
+		-DENABLE_TESTS="$(usex test)"
+		-DUSE_STATIC_LIBRARIES="$(usex static)"
+		-DMAKE_STATIC_LIBRARIES="$(usex static)"
+		-DUSE_MYSQL="$(usex mysql)"
+		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
+		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
+		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
+		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
+		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
+		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
+		# As of now, clickhouse fails to build if odbc is disabled
+		-DENABLE_ODBC=True
+		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
+		-DENABLE_CLICKHOUSE_ALL=OFF
+		-DUSE_INTERNAL_SSL_LIBRARY=False
+		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
+		-DUNBUNDLED=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use test; then
+		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
+	fi
+
+	if use doc; then
+		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
+		./build.py || die "Failed to build docs"
+		popd || die "Failed to exit docs build directory"
+
+		dodoc -r "${S}/docs/build"
+	fi
+
+	if use server; then
+		newinitd "${FILESDIR}"/clickhouse-server.initd-r1 clickhouse-server
+		newconfd "${FILESDIR}"/clickhouse-server.confd clickhouse-server
+		systemd_dounit "${FILESDIR}"/clickhouse-server.service
+	fi
+
+	keepdir /var/log/clickhouse-server
+	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
+}
+
+pkg_preinst() {
+	if use server; then
+		enewgroup clickhouse
+		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
+	fi
+}
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11.ebuild
deleted file mode 100644
index bbf65016a543..000000000000
--- a/dev-db/clickhouse/clickhouse-19.13.1.11.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:7
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( virtual/libmysqlclient )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-	dev-libs/jemalloc
-	dev-libs/protobuf
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/double-conversion[static-libs]
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:7[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		virtual/libmysqlclient[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	>=sys-devel/gcc-7.0
-	>=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_prepare() {
-	eapply_user
-	cmake-utils_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_SSL_LIBRARY=False
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-
-	keepdir /var/log/clickhouse-server
-	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
new file mode 100644
index 000000000000..7892e4667f5d
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils systemd toolchain-funcs user
+
+DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
+HOMEPAGE="https://clickhouse.yandex"
+LICENSE="Apache-2.0"
+
+MY_PN="ClickHouse"
+TYPE="stable"
+
+CCTZ_COMMIT="4f9776a"
+SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
+	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
+"
+
+SLOT="0/${TYPE}"
+IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		dev-libs/poco[odbc]
+		dev-libs/icu:=
+		dev-libs/glib
+		>=dev-libs/boost-1.65.0:=
+		dev-libs/openssl:0=
+		kafka? ( dev-libs/librdkafka:= )
+		mysql? ( dev-db/mysql-connector-c:= )
+	)
+
+	>=dev-libs/poco-1.9.0
+	dev-libs/libpcre
+	dev-libs/jemalloc
+"
+
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/mkdocs-1.0.1 )
+	static? (
+		>=app-arch/lz4-1.8.0[static-libs]
+		>=app-arch/zstd-1.3.4[static-libs]
+		client? (
+			sys-libs/ncurses:0=[static-libs]
+			sys-libs/readline:0=[static-libs]
+		)
+		dev-libs/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-db/mysql-connector-c[static-libs]
+		kafka? ( dev-libs/librdkafka[static-libs] )
+	)
+
+	sys-libs/libtermcap-compat
+	dev-util/patchelf
+	>=sys-devel/lld-6.0.0
+	>=sys-devel/gcc-7.0
+	>=sys-devel/clang-6.0
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
+
+_clang_fullversion() {
+	local ver="$1"; shift
+	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
+	eval echo "$ver"
+}
+
+clang-fullversion() {
+	_clang_fullversion '$1.$2.$3' "$@"
+}
+
+clang-version() {
+	_clang_fullversion '$1.$2' "$@"
+}
+
+clang-major-version() {
+	_clang_fullversion '$1' "$@"
+}
+
+clang-minor-version() {
+	_clang_fullversion '$2' "$@"
+}
+
+clang-micro-version() {
+	_clang_fullversion '$3' "$@"
+}
+
+pkg_pretend() {
+	if [[ $(tc-getCC) == clang ]]; then
+		if [[ $(clang-major-version) -lt 6 ]]; then
+			eerror "Compilation with clang older than 6.0 is not supported"
+			die "Too old clang found"
+		fi
+		:
+	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
+		eerror "Compilation with gcc older than 7.2 is not supported"
+		die "Too old gcc found"
+	fi
+}
+
+src_unpack() {
+	default_src_unpack
+	[[ ${PV} == 9999 ]] && return 0
+	cd "${S}/contrib" || die "failed to cd to contrib"
+	mkdir -p cctz zstd || die "failed to create directories"
+	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
+}
+
+src_prepare() {
+	eapply_user
+	cmake-utils_src_prepare
+}
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_POCO_MONGODB="$(usex mongodb)"
+		-DENABLE_RDKAFKA="$(usex kafka)"
+		-DENABLE_TESTS="$(usex test)"
+		-DUSE_STATIC_LIBRARIES="$(usex static)"
+		-DMAKE_STATIC_LIBRARIES="$(usex static)"
+		-DUSE_MYSQL="$(usex mysql)"
+		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
+		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
+		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
+		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
+		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
+		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
+		# As of now, clickhouse fails to build if odbc is disabled
+		-DENABLE_ODBC=True
+		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
+		-DENABLE_CLICKHOUSE_ALL=OFF
+		-DUSE_INTERNAL_SSL_LIBRARY=False
+		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
+		-DUNBUNDLED=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use test; then
+		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
+	fi
+
+	if use doc; then
+		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
+		./build.py || die "Failed to build docs"
+		popd || die "Failed to exit docs build directory"
+
+		dodoc -r "${S}/docs/build"
+	fi
+
+	if use server; then
+		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
+		systemd_dounit "${FILESDIR}"/clickhouse-server.service
+	fi
+
+	keepdir /var/log/clickhouse-server
+	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
+}
+
+pkg_preinst() {
+	if use server; then
+		enewgroup clickhouse
+		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
+	fi
+}
diff --git a/dev-db/clickhouse/clickhouse-19.5.3.8.ebuild b/dev-db/clickhouse/clickhouse-19.5.3.8.ebuild
deleted file mode 100644
index 8de003457ec7..000000000000
--- a/dev-db/clickhouse/clickhouse-19.5.3.8.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:7
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( virtual/libmysqlclient )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-	dev-libs/jemalloc
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/double-conversion[static-libs]
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:7[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		virtual/libmysqlclient[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	>=sys-devel/gcc-7.0
-	>=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_prepare() {
-	eapply_user
-	cmake-utils_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_SSL_LIBRARY=False
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-
-	keepdir /var/log/clickhouse-server
-	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild b/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
new file mode 100644
index 000000000000..7892e4667f5d
--- /dev/null
+++ b/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils systemd toolchain-funcs user
+
+DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
+HOMEPAGE="https://clickhouse.yandex"
+LICENSE="Apache-2.0"
+
+MY_PN="ClickHouse"
+TYPE="stable"
+
+CCTZ_COMMIT="4f9776a"
+SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
+	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
+"
+
+SLOT="0/${TYPE}"
+IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="
+	server? ( cpu_flags_x86_sse4_2 )
+	static? ( client server tools )
+"
+
+RDEPEND="
+	dev-libs/re2:0=
+	!static? (
+		>=app-arch/lz4-1.8.0:=
+		>=app-arch/zstd-1.3.4:=
+		client? (
+			sys-libs/ncurses:0=
+			sys-libs/readline:0=
+		)
+
+		dev-libs/double-conversion
+		dev-libs/capnproto
+		dev-libs/libltdl:0
+		sys-libs/libunwind:7
+		sys-libs/zlib
+		dev-libs/poco[odbc]
+		dev-libs/icu:=
+		dev-libs/glib
+		>=dev-libs/boost-1.65.0:=
+		dev-libs/openssl:0=
+		kafka? ( dev-libs/librdkafka:= )
+		mysql? ( dev-db/mysql-connector-c:= )
+	)
+
+	>=dev-libs/poco-1.9.0
+	dev-libs/libpcre
+	dev-libs/jemalloc
+"
+
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/mkdocs-1.0.1 )
+	static? (
+		>=app-arch/lz4-1.8.0[static-libs]
+		>=app-arch/zstd-1.3.4[static-libs]
+		client? (
+			sys-libs/ncurses:0=[static-libs]
+			sys-libs/readline:0=[static-libs]
+		)
+		dev-libs/double-conversion[static-libs]
+		dev-libs/capnproto[static-libs]
+		dev-libs/libltdl[static-libs]
+		sys-libs/libunwind:7[static-libs]
+		sys-libs/zlib[static-libs]
+		|| (
+			dev-db/unixODBC[static-libs]
+			dev-libs/poco[odbc]
+		)
+		dev-libs/icu[static-libs]
+		dev-libs/glib[static-libs]
+		>=dev-libs/boost-1.65.0[static-libs]
+		dev-libs/openssl[static-libs]
+		dev-db/mysql-connector-c[static-libs]
+		kafka? ( dev-libs/librdkafka[static-libs] )
+	)
+
+	sys-libs/libtermcap-compat
+	dev-util/patchelf
+	>=sys-devel/lld-6.0.0
+	>=sys-devel/gcc-7.0
+	>=sys-devel/clang-6.0
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
+
+_clang_fullversion() {
+	local ver="$1"; shift
+	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
+	eval echo "$ver"
+}
+
+clang-fullversion() {
+	_clang_fullversion '$1.$2.$3' "$@"
+}
+
+clang-version() {
+	_clang_fullversion '$1.$2' "$@"
+}
+
+clang-major-version() {
+	_clang_fullversion '$1' "$@"
+}
+
+clang-minor-version() {
+	_clang_fullversion '$2' "$@"
+}
+
+clang-micro-version() {
+	_clang_fullversion '$3' "$@"
+}
+
+pkg_pretend() {
+	if [[ $(tc-getCC) == clang ]]; then
+		if [[ $(clang-major-version) -lt 6 ]]; then
+			eerror "Compilation with clang older than 6.0 is not supported"
+			die "Too old clang found"
+		fi
+		:
+	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
+		eerror "Compilation with gcc older than 7.2 is not supported"
+		die "Too old gcc found"
+	fi
+}
+
+src_unpack() {
+	default_src_unpack
+	[[ ${PV} == 9999 ]] && return 0
+	cd "${S}/contrib" || die "failed to cd to contrib"
+	mkdir -p cctz zstd || die "failed to create directories"
+	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
+}
+
+src_prepare() {
+	eapply_user
+	cmake-utils_src_prepare
+}
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_POCO_MONGODB="$(usex mongodb)"
+		-DENABLE_RDKAFKA="$(usex kafka)"
+		-DENABLE_TESTS="$(usex test)"
+		-DUSE_STATIC_LIBRARIES="$(usex static)"
+		-DMAKE_STATIC_LIBRARIES="$(usex static)"
+		-DUSE_MYSQL="$(usex mysql)"
+		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
+		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
+		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
+		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
+		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
+		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
+		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
+		# As of now, clickhouse fails to build if odbc is disabled
+		-DENABLE_ODBC=True
+		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
+		-DENABLE_CLICKHOUSE_ALL=OFF
+		-DUSE_INTERNAL_SSL_LIBRARY=False
+		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
+		-DUNBUNDLED=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use test; then
+		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
+	fi
+
+	if use doc; then
+		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
+		./build.py || die "Failed to build docs"
+		popd || die "Failed to exit docs build directory"
+
+		dodoc -r "${S}/docs/build"
+	fi
+
+	if use server; then
+		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
+		systemd_dounit "${FILESDIR}"/clickhouse-server.service
+	fi
+
+	keepdir /var/log/clickhouse-server
+	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
+}
+
+pkg_preinst() {
+	if use server; then
+		enewgroup clickhouse
+		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
+	fi
+}
diff --git a/dev-db/clickhouse/clickhouse-19.9.5.36.ebuild b/dev-db/clickhouse/clickhouse-19.9.5.36.ebuild
deleted file mode 100644
index 8de003457ec7..000000000000
--- a/dev-db/clickhouse/clickhouse-19.9.5.36.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
-	https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
-	server? ( cpu_flags_x86_sse4_2 )
-	static? ( client server tools )
-"
-
-RDEPEND="
-	dev-libs/re2:0=
-	!static? (
-		>=app-arch/lz4-1.8.0:=
-		>=app-arch/zstd-1.3.4:=
-		client? (
-			sys-libs/ncurses:0=
-			sys-libs/readline:0=
-		)
-
-		dev-libs/double-conversion
-		dev-libs/capnproto
-		dev-libs/libltdl:0
-		sys-libs/libunwind:7
-		sys-libs/zlib
-		dev-libs/poco[odbc]
-		dev-libs/icu:=
-		dev-libs/glib
-		>=dev-libs/boost-1.65.0:=
-		dev-libs/openssl:0=
-		kafka? ( dev-libs/librdkafka:= )
-		mysql? ( virtual/libmysqlclient )
-	)
-
-	>=dev-libs/poco-1.9.0
-	dev-libs/libpcre
-	dev-libs/jemalloc
-"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/mkdocs-1.0.1 )
-	static? (
-		>=app-arch/lz4-1.8.0[static-libs]
-		>=app-arch/zstd-1.3.4[static-libs]
-		client? (
-			sys-libs/ncurses:0=[static-libs]
-			sys-libs/readline:0=[static-libs]
-		)
-		dev-libs/double-conversion[static-libs]
-		dev-libs/capnproto[static-libs]
-		dev-libs/libltdl[static-libs]
-		sys-libs/libunwind:7[static-libs]
-		sys-libs/zlib[static-libs]
-		|| (
-			dev-db/unixODBC[static-libs]
-			dev-libs/poco[odbc]
-		)
-		dev-libs/icu[static-libs]
-		dev-libs/glib[static-libs]
-		>=dev-libs/boost-1.65.0[static-libs]
-		dev-libs/openssl[static-libs]
-		virtual/libmysqlclient[static-libs]
-		kafka? ( dev-libs/librdkafka[static-libs] )
-	)
-
-	sys-libs/libtermcap-compat
-	dev-util/patchelf
-	>=sys-devel/lld-6.0.0
-	>=sys-devel/gcc-7.0
-	>=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
-	local ver="$1"; shift
-	set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
-	eval echo "$ver"
-}
-
-clang-fullversion() {
-	_clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
-	_clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
-	_clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
-	_clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
-	_clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
-	if [[ $(tc-getCC) == clang ]]; then
-		if [[ $(clang-major-version) -lt 6 ]]; then
-			eerror "Compilation with clang older than 6.0 is not supported"
-			die "Too old clang found"
-		fi
-		:
-	elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
-		eerror "Compilation with gcc older than 7.2 is not supported"
-		die "Too old gcc found"
-	fi
-}
-
-src_unpack() {
-	default_src_unpack
-	[[ ${PV} == 9999 ]] && return 0
-	cd "${S}/contrib" || die "failed to cd to contrib"
-	mkdir -p cctz zstd || die "failed to create directories"
-	tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_prepare() {
-	eapply_user
-	cmake-utils_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_POCO_MONGODB="$(usex mongodb)"
-		-DENABLE_RDKAFKA="$(usex kafka)"
-		-DENABLE_TESTS="$(usex test)"
-		-DUSE_STATIC_LIBRARIES="$(usex static)"
-		-DMAKE_STATIC_LIBRARIES="$(usex static)"
-		-DUSE_MYSQL="$(usex mysql)"
-		-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-		-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-		-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-		-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-		-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-		-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-		-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
-		# As of now, clickhouse fails to build if odbc is disabled
-		-DENABLE_ODBC=True
-		-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-		-DENABLE_CLICKHOUSE_ALL=OFF
-		-DUSE_INTERNAL_SSL_LIBRARY=False
-		-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-		-DUNBUNDLED=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if ! use test; then
-		rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
-	fi
-
-	if use doc; then
-		pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
-		./build.py || die "Failed to build docs"
-		popd || die "Failed to exit docs build directory"
-
-		dodoc -r "${S}/docs/build"
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
-		systemd_dounit "${FILESDIR}"/clickhouse-server.service
-	fi
-
-	keepdir /var/log/clickhouse-server
-	chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
-	if use server; then
-		enewgroup clickhouse
-		enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
-	fi
-}
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index eea595fde91e..27d9f3b9e93c 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -4,8 +4,8 @@ AUX etcd.initd 821 BLAKE2B 5eba7f0e8d134ff45caba8c1eb3aaf6afb412082b9a5df95925f3
 AUX etcd.logrotated 104 BLAKE2B 3126c99db171af177d6d6368e7e53f3e5e07b9ae2926ff12cb0ff7fb877527df33a91dedcaa4bbbffa190b4f9c2f53868aeca093b93e9cad50718a23eb5fdd46 SHA512 64d3181a936f8bab635a17f90679041c2d70a712307928feae03a517ad02252fc37e25738979bc1ccd0657ef70439e65cb0306759bec3939e940ec382a02d94f
 AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452d26fbaec17ab9c138db86b543c3c88fd3d16ce79487eb2c31ad7bbfb0c5b9cd11eede9b99bd2d SHA512 0074f77a17afe2bb4145f12a6eb312caa3e08cfe8bf35856b79d091ad8786c4223bd91c0a865e789ee9ba180f2672b31721742bb32efd0cd383bc747eb926961
 AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce
-DIST etcd-3.3.13.tar.gz 3372732 BLAKE2B 241dee0d9843eefc9aaefb35be8f649d242ab1417456cc3028c8eb2ff2af6a7a1c396f04029d87877d384247b8c7a51ec6ea2e0dd51af07ce48ecc91c613c380 SHA512 5b8cf9d8d8b0afd1551f414480f04837668729c10d5d81c5e9ffba3392bd2567f3798267c5e4dbe60f49dbdd859f668c6fe0d7924e0fd65f918ab3bd01d5751a
-DIST etcd-3.3.14.tar.gz 6342437 BLAKE2B 4bcf27829045e2f2f34c7628d6ed854a7ef5e6db02bd794d1135bb901486d8f3c1bf598c230fe7491e9db7273d3e5aa83bf4c941476ad3093423c14f377513b2 SHA512 76c8147168030310f0e4fa0c22670fd73369795ab6d98c0632c87b5947acf10af4adae58b46f042a482dc7a002044cfbdfbec962517018e2fdf211c381281dae
-EBUILD etcd-3.3.13.ebuild 1990 BLAKE2B 0dcfa21fd148dd9cfc7899a6432f3df5cfa0c678b39291bd4cc8c371e32932bf9d0f2fe97355572a621280c1200dfa3a9733be3f4fd2cebadf06f9e1fe06e435 SHA512 582ea4605eec3d812df40be5dffabc7c62be3652948f8d3dfae6f0c8553f507ce1ce6e135aa5b1b0c0c5fb52c970140a19c50cfd73bb905773ef17db9143c129
-EBUILD etcd-3.3.14.ebuild 2006 BLAKE2B 7e2c00213dd64e2ab82d7b94e606f7a258fa7d60c8a55b1f7a842f67c902d904e85959e81e457a2b43e06a6beb37ebdc07ca92b978eda8cea844a5555a12dcbb SHA512 58a239758efb92c53d5abd32ea49453e6d4ad4f606e660d3011c5ff7e7f26a42f533b6198360fec980d99bc3199da0febdda9d044dc5d3797be4e680785b5609
+DIST etcd-3.3.15.tar.gz 6271373 BLAKE2B 85786a2a4acaf144f80461a56775b8c91164e8f0c0034ef0741d98383ac400720ca69b855588a076dc174364330c0e12df73a36570983138e33a32cdbe69e22f SHA512 9fbc02c4aacb000335d558e9c5d4df672194d1b1b8511918efa35a6123bcd7f1a06ecc527f7ff01af7c7f0e818b4809918e640fd596ec51898bf511849f0a2c5
+DIST etcd-3.4.0.tar.gz 8931860 BLAKE2B abeb78866b751a3a124f1aaba2b6709402a51d0c5f36a45c8386816e4059172206c7e3420865209a53cecf7452a8c8b510a6fd50b5c7a9fefaac577e5d3c4413 SHA512 8e130cc76a2284c98bb72e3832e10e25e45c6fbaa5da7c6a7a2dd14a069d4fea7659b13c1450b87b869e5936bdad47606d0c65292febb7257369531ff2658674
+EBUILD etcd-3.3.15.ebuild 1989 BLAKE2B 533264f964f7fb88f11dfdd7114d104c8b0b47ae05512651d9f0d8492ab16ce678232637281da132fba9c34ebe7e5f7622a23f162b8bed564315153d65d5facd SHA512 aaaf9251fc4d5d411333e62f557d8477f603c261d319dbe823304a2c8840de286b842d2949ec3c0cc99cff41e84e627212e38619ed75adadf6089b793f424854
+EBUILD etcd-3.4.0.ebuild 2077 BLAKE2B 3f9fef30fe99652a34c6e221c57f0b6f3cff5ab504b53e012772f372652b6c9e7af9619f34e3408c478b8d97fe8b90a7c566bc98ab8c13da664a3f3bab53484c SHA512 cae7940cc3c7a402b66baf3719a5bbfad1c12e6edfda23fcaca0d5fc46ca00143d3db75041ca5fd8ee1eb0a11749dc338a9d0f2c37558509ffff3f9f433573ec
 MISC metadata.xml 679 BLAKE2B 7374379a18107011df792be631428834334ad8e6da5cfe404f18555e8c168d3fc716a1c8d6cb5cf1d9ccd173737aecf93a165f846865dbb6ba4a76bd4669b446 SHA512 8070d8b51dd3319e8b159072db237dcc5299361c2f74fa086fc4cbc174cc6a5c8f7659310332b54b2275e2bc3d028323c4dfa5775e21693a339f54312582d2f0
diff --git a/dev-db/etcd/etcd-3.3.13.ebuild b/dev-db/etcd/etcd-3.3.13.ebuild
deleted file mode 100644
index ba297d2a0313..000000000000
--- a/dev-db/etcd/etcd-3.3.13.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd golang-vcs-snapshot
-
-KEYWORDS="amd64"
-EGO_PN="github.com/etcd-io/etcd"
-GIT_COMMIT="98d3084"
-MY_PV="${PV/_rc/-rc.}"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/etcd-io/etcd"
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc +server"
-DEPEND=">=dev-lang/go-1.10:="
-RDEPEND="!dev-db/etcdctl"
-
-src_prepare() {
-	default
-	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
-		-i "${S}"/src/${EGO_PN}/build || die
-	sed -e 's:\(for p in \)shellcheck :\1 :' \
-		-e 's:^			gofmt \\$:\\:' \
-		-e 's:^			govet \\$:\\:' \
-		-i "${S}"/src/${EGO_PN}/test || die
-	# missing ... in args forwarded to print-like function
-	sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
-		-i "${S}"/src/${EGO_PN}/raft/logger.go || die
-}
-
-pkg_setup() {
-	if use server; then
-		enewgroup ${PN}
-		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	fi
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #651934
-	export GOPATH=${S}
-	pushd src/${EGO_PN} || die
-	GO_BUILD_FLAGS=-v ./build || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/etcdctl
-	use doc && dodoc -r Documentation
-	if use server; then
-		insinto /etc/${PN}
-		doins "${FILESDIR}/${PN}.conf"
-		dobin bin/etcd
-		dodoc README.md
-		systemd_dounit "${FILESDIR}/${PN}.service"
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-		keepdir /var/lib/${PN}
-		fowners ${PN}:${PN} /var/lib/${PN}
-		fperms 0700 /var/lib/${PN}
-		keepdir /var/log/${PN}
-		fowners ${PN}:${PN} /var/log/${PN}
-		fperms 755 /var/log/${PN}
-	fi
-	popd || die
-}
-
-src_test() {
-	pushd src/${EGO_PN} || die
-	./test || die
-	popd || die
-}
diff --git a/dev-db/etcd/etcd-3.3.14.ebuild b/dev-db/etcd/etcd-3.3.14.ebuild
deleted file mode 100644
index 4124cf6b9401..000000000000
--- a/dev-db/etcd/etcd-3.3.14.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/coreos/etcd"
-GIT_COMMIT="5cf5d88"
-MY_PV="${PV/_rc/-rc.}"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/etcd-io/etcd"
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc +server"
-DEPEND=">=dev-lang/go-1.12:="
-RDEPEND="!dev-db/etcdctl"
-
-src_prepare() {
-	default
-	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
-		-i "${S}"/src/${EGO_PN}/build || die
-	sed -e 's:\(for p in \)shellcheck :\1 :' \
-		-e 's:^			gofmt \\$:\\:' \
-		-e 's:^			govet \\$:\\:' \
-		-i "${S}"/src/${EGO_PN}/test || die
-	# missing ... in args forwarded to print-like function
-	sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
-		-i "${S}"/src/${EGO_PN}/raft/logger.go || die
-}
-
-pkg_setup() {
-	if use server; then
-		enewgroup ${PN}
-		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	fi
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #651934
-	export GOPATH=${S}
-	pushd src/${EGO_PN} || die
-	GO_BUILD_FLAGS=-v ./build || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/etcdctl
-	use doc && dodoc -r Documentation
-	if use server; then
-		insinto /etc/${PN}
-		doins "${FILESDIR}/${PN}.conf"
-		dobin bin/etcd
-		dodoc README.md
-		systemd_dounit "${FILESDIR}/${PN}.service"
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-		keepdir /var/lib/${PN}
-		fowners ${PN}:${PN} /var/lib/${PN}
-		fperms 0700 /var/lib/${PN}
-		keepdir /var/log/${PN}
-		fowners ${PN}:${PN} /var/log/${PN}
-		fperms 755 /var/log/${PN}
-	fi
-	popd || die
-}
-
-src_test() {
-	pushd src/${EGO_PN} || die
-	GO111MODULES=on ./test || die
-	popd || die
-}
diff --git a/dev-db/etcd/etcd-3.3.15.ebuild b/dev-db/etcd/etcd-3.3.15.ebuild
new file mode 100644
index 000000000000..b3ed26c899a4
--- /dev/null
+++ b/dev-db/etcd/etcd-3.3.15.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="amd64"
+EGO_PN="github.com/coreos/etcd"
+GIT_COMMIT="94745a4"
+MY_PV="${PV/_rc/-rc.}"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/etcd-io/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc +server"
+DEPEND=">=dev-lang/go-1.12:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+	default
+	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
+		-i "${S}"/src/${EGO_PN}/build || die
+	sed -e 's:\(for p in \)shellcheck :\1 :' \
+		-e 's:^			gofmt \\$:\\:' \
+		-e 's:^			govet \\$:\\:' \
+		-i "${S}"/src/${EGO_PN}/test || die
+	# missing ... in args forwarded to print-like function
+	sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
+		-i "${S}"/src/${EGO_PN}/raft/logger.go || die
+}
+
+pkg_setup() {
+	if use server; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	fi
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #651934
+	export GOPATH=${S}
+	pushd src/${EGO_PN} || die
+	GO_BUILD_FLAGS=-v ./build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/etcdctl
+	use doc && dodoc -r Documentation
+	if use server; then
+		insinto /etc/${PN}
+		doins "${FILESDIR}/${PN}.conf"
+		dobin bin/etcd
+		dodoc README.md
+		systemd_dounit "${FILESDIR}/${PN}.service"
+		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+		keepdir /var/lib/${PN}
+		fowners ${PN}:${PN} /var/lib/${PN}
+		fperms 0700 /var/lib/${PN}
+		keepdir /var/log/${PN}
+		fowners ${PN}:${PN} /var/log/${PN}
+		fperms 755 /var/log/${PN}
+	fi
+	popd || die
+}
+
+src_test() {
+	pushd src/${EGO_PN} || die
+	./test || die
+	popd || die
+}
diff --git a/dev-db/etcd/etcd-3.4.0.ebuild b/dev-db/etcd/etcd-3.4.0.ebuild
new file mode 100644
index 000000000000..97d43f62eaf2
--- /dev/null
+++ b/dev-db/etcd/etcd-3.4.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN="go.etcd.io/etcd"
+GIT_COMMIT="898bd13"
+MY_PV="${PV/_rc/-rc.}"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/etcd-io/etcd"
+SRC_URI="${HOMEPAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc +server"
+DEPEND=">=dev-lang/go-1.12:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+	default
+	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
+		-i "${S}"/src/${EGO_PN}/build || die
+	sed -e 's:\(for p in \)shellcheck :\1 :' \
+		-e 's:^			gofmt \\$:\\:' \
+		-e 's:^			govet \\$:\\:' \
+		-i "${S}"/src/${EGO_PN}/test || die
+	# missing ... in args forwarded to print-like function
+	sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
+		-i "${S}"/src/${EGO_PN}/raft/logger.go || die
+
+	# Avoid network-sandbox violations since go-1.13
+	rm src/${EGO_PN}/go.mod || die
+}
+
+pkg_setup() {
+	if use server; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	fi
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #651934
+	export GOPATH=${S}
+	pushd src/${EGO_PN} || die
+	GO_BUILD_FLAGS=-v ./build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/etcdctl
+	use doc && dodoc -r Documentation
+	if use server; then
+		insinto /etc/${PN}
+		doins "${FILESDIR}/${PN}.conf"
+		dobin bin/etcd
+		dodoc README.md
+		systemd_dounit "${FILESDIR}/${PN}.service"
+		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+		keepdir /var/lib/${PN}
+		fowners ${PN}:${PN} /var/lib/${PN}
+		fperms 0700 /var/lib/${PN}
+		keepdir /var/log/${PN}
+		fowners ${PN}:${PN} /var/log/${PN}
+		fperms 755 /var/log/${PN}
+	fi
+	popd || die
+}
+
+src_test() {
+	pushd src/${EGO_PN} || die
+	GO111MODULES=off ./test || die
+	popd || die
+}
diff --git a/dev-db/kyotocabinet/Manifest b/dev-db/kyotocabinet/Manifest
index 1db466d0113a..7db2f4654f96 100644
--- a/dev-db/kyotocabinet/Manifest
+++ b/dev-db/kyotocabinet/Manifest
@@ -4,6 +4,6 @@ AUX kyotocabinet-1.2.76-flags.patch 894 BLAKE2B 50efb4b21f0101a942eb758213cf7034
 AUX kyotocabinet-1.2.76-gcc6.patch 289 BLAKE2B 5f2c972bf3f789c4573206dcb5fa2d1d21e50c16bc90889a978979f875e0597f48fba56cc9558c2f11202ab892d09f02c3b3d0c4bdc42e64857170a48d2797eb SHA512 755fe06635309139d55d1ede2e5ec30e37867501ead68abd3218c59ea016b72c9aa4d7d4072e15b53d22755606949dfaafa7b283d33a821d280fe7791ee8ff10
 DIST kyotocabinet-1.2.76.tar.gz 951930 BLAKE2B 7d2b5e5c85e0a6f90c88cd3b6e1b41588dffeaa2a404aa2c83281e033fe4e1275fbbc15584d4998e97f166c5060ce43c9cee9567121edbe1f72a0d5f52f42b40 SHA512 278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a
 DIST kyotocabinet-1.2.77.tar.gz 949326 BLAKE2B faacde57e8c7fed3fb232ea6fd12b668f2d2ee352cd357d5e16e0d1740cd8f73e223964249efeae50f3ea5d0672117b2410b91ba557ebe1ac7ba4075ac28deab SHA512 f38794c11faa3f4b64097a2e314307e1a6b75ddc495103647ebe52786a689336754496e7083697417ea90436e7fad681f16440975abec9ae917874aa25153e0f
-EBUILD kyotocabinet-1.2.76-r1.ebuild 1316 BLAKE2B 62a72d1218c15713033c7b1726a8c07f37936d83aaf0f6eb2ce66df9f6a66a7a1a08bd05798cc4ec13ba67dbcdee813358011513d6483feaebc261d65682d3f2 SHA512 e50a18d55241cd0ebfbca17805bbdca25ac3a1179afcc2b9e97ad605b257fceaa3e910a039080cc916d90c296a18950a272a610a51e83b45216be5ea9ba5c3be
+EBUILD kyotocabinet-1.2.76-r1.ebuild 1315 BLAKE2B d329bd8f68728f21b1da73e0adaf9e98bd3ac4833ae3ae3fe15825c536ed8e3f64caa6fa6c84afc9dd9c5b748d7e7a54b574c0aac55d8101e8fb6aa3bc8450c2 SHA512 0e9149f879edefc155c7e66aa1fc230780f5dacf1ec7ccb326d9d3a546259cd2cadff54dce3e857caef6ec4fc2924630567aa8f7fb81f773f6f92f059a5b3795
 EBUILD kyotocabinet-1.2.77.ebuild 1536 BLAKE2B 4350d8ac7d28b1d1812af26f97dfb3d783bc62f1ff2e307e030f95ac12e445d2da3a2c2d6a1790fd6132a789d58373f597e4d805a7c636d69c295a29d154f8ec SHA512 74e14fca530ff6d9ef3a9c4322cf01085db7b1925ce5b6491da5edcfc78f7e841dbf7b20b32489be8d1183d6ce9afc3b988322e8010047787c1cc8acc4e05a34
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
index 1f0d97d31054..324be9e0b8af 100644
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}pkg/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 ~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 ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="debug doc examples static-libs"
 
 DEPEND="sys-libs/zlib[static-libs?]
diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest
index a417eb909731..7fb9ef8357b6 100644
--- a/dev-db/libdbi-drivers/Manifest
+++ b/dev-db/libdbi-drivers/Manifest
@@ -1,4 +1,5 @@
 AUX libdbi-drivers-0.9.0-doc-build-fix.patch 694 BLAKE2B 95207e6fbd947c01a1c3a99806f09e3f932b6d7b6fe1b55ffeb98ce73a54b7f984ffe9811c834e53e961500ae688b0548599b3f9b47a5d1e083eedf5c7ed650d SHA512 0ff58a08909327db91ebd0dfad7ac88ebb17156bbb7afc8bfc8a3711fee37708a7ad715ed50b5085cdd15d3cdb5c06de3a0779694104fb6332a1e9c2f51f5b0e
 DIST libdbi-drivers-0.9.0.tar.gz 1829864 BLAKE2B 2071c0cc21b1b4eeda926d5ce36f6dde03ede206dac91780aabafcb7c5b399f4b9580910e5ede08c9f0bf026f4af2088d1d0e8c1835b86273a7739b2946ed3c3 SHA512 f4d3aaa71014697c53012a10bf9f0af398bcf5ee5872af165f8f43a682d2fb3045a9172ffea0e068dcbfcad52494878c037d8d90fadfaf176936e42f7f1e85c1
+EBUILD libdbi-drivers-0.9.0-r1.ebuild 2192 BLAKE2B 2ee8efabdf492138c6d65a773b0f0076bd666efcd037ba5b30435e767c680befa633eed57ecb2685b0593f2fed2303b96d2f544e54971818129781e584955aec SHA512 fe6b7dfed49fec7125d86a55161e98d0c00659bca0e4787e447f13912f7871106910d6611a6bd5e7e4672de514568ffa5b9e7d03d0ed4325db75c71140614253
 EBUILD libdbi-drivers-0.9.0.ebuild 2130 BLAKE2B d07220a35fafdfa263d8d2498d8ce8ce1f531cfb3f9495e60ae13d3d154096a18ec0579e925efbbe6ac3a5ebcdce9d12f759ec8d21b83fd168a5f3513635ec03 SHA512 e1d823317b37a8c30889a5148db8c6ceff0908dfc128a1f0a388675a146e45b501582ec70fba7fea47f578612d27f4ba651a21c5d26488a75b99e1dca8ad6d51
 MISC metadata.xml 302 BLAKE2B 50e613a8be312f9b8e234ef4a810a318f51f70e71f37a01f1932f2e70fecc543956e84690de88a14dac252101865ac0ef454966bc1bf54e5f574d2d6fddecf3e SHA512 d0d6c905c747105c3b5c2bde24ea7f8c63225779fe41f106b3de3d3082cbc01b0749546c3477db1e9f14db44e1b2921316f4cddb256ef8dddec3b4176a051c70
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..a46e855b4242
--- /dev/null
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
+HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
+LICENSE="LGPL-2.1"
+
+IUSE="doc firebird mysql oci8 postgres +sqlite static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+SLOT=0
+REQUIRED_USE="|| ( mysql postgres sqlite firebird oci8 )"
+RESTRICT="firebird? ( bindist )"
+
+RDEPEND="
+	>=dev-db/libdbi-0.9.0
+	firebird? ( dev-db/firebird )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-text/openjade )"
+
+DOCS=( AUTHORS ChangeLog NEWS README README.osx TODO )
+
+PATCHES=(
+		#"${FILESDIR}"/${P}-fix-ac-macro.patch \
+		#"${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch \
+		#"${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch
+		"${FILESDIR}"/${PN}-0.9.0-doc-build-fix.patch
+)
+
+pkg_setup() {
+	use oci8 && [[ -z "${ORACLE_HOME}" ]] && die "\$ORACLE_HOME is not set!"
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+	# WARNING: the configure script does NOT work correctly
+	# --without-$driver does NOT work
+	# so do NOT use `use_with...`
+	# Future additions:
+	# msql
+	# freetds
+	# ingres
+	# db2
+	use mysql && myconf+=" --with-mysql"
+	use postgres && myconf+=" --with-pgsql"
+	use sqlite && myconf+=" --with-sqlite3"
+	use firebird && myconf+=" --with-firebird"
+	if use oci8; then
+		[[ -z "${ORACLE_HOME}" ]] && die "\$ORACLE_HOME is not set!"
+		myconf+=" --with-oracle-dir=${ORACLE_HOME} --with-oracle"
+	fi
+
+	econf \
+		$(use_enable doc docs) \
+		$(use_enable static-libs static) \
+		--with-dbi-libdir=/usr/$(get_libdir) \
+		${myconf}
+}
+
+src_test() {
+	if [[ -z "${WANT_INTERACTIVE_TESTS}" ]]; then
+		ewarn "Tests disabled due to interactivity."
+		ewarn "Run with WANT_INTERACTIVE_TESTS=1 if you want them."
+		return 0
+	fi
+	einfo "Running interactive tests"
+	emake check
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 14836ef5ef82..86d03d4bb8b7 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,4 +1,3 @@
-AUX mongodb-3.4.7-no-boost-check.patch 641 BLAKE2B 0dc3a426b28cd80d7b3361ff9c6747aff64dd27c1bc01a9717c2dd1c160b66f53feb72fd2ead385c220ebe92a8c7b8fa6b04fb3fa8437dba17d5f8346665f6b8 SHA512 812eaaadb6f265cfc904e8f3a7ae8276e42e3968529914179efab5e44f1951ab46ac3bbcfb259f924b20a8ca61d2ebcf72b7103ea9d5f25594ff8e9e3e85836b
 AUX mongodb-3.6.1-fix-scons.patch 1207 BLAKE2B 3c47d72eb940d67f40e4a12becb6de469255446b74aa5e0b2f27e8e0021e77f1af9cce12ae26ed0b05871e995e29d3da1eaee718997bc6de6e62838285946094 SHA512 70efb9309ff5a2415cec6ddca694c33ebaba29d5fb959ecc79907218205a10d4e7329fe48c8c8515bda83751061245d41f4fb11a5d8cd0c80c1db61217acb90e
 AUX mongodb-3.6.1-no-compass.patch 2046 BLAKE2B e6b6977b69eb297c6a6340661f906e0206c2b68a1cebfd3c7ca01b27cc05562e0909531a2488159a54db32a05ec0cc4f81b4fe675db51bf3c30d66bc9d484c0b SHA512 5a7257a3670f40453c424ae2e6d2bbe0e3d1c795b57351c24a1b48ea4134146b08310d88a47cbb0c94a0a451a2c4a3c30fb10c44a1b9203681ee9cb5240db412
 AUX mongodb-4.0.0-no-compass.patch 2270 BLAKE2B 66659a18d46755e6661b57e2ba020d7b967c455b0bfd5d198e0efd5bab1c0fdbb5def66b9e9fb54b34eb415e9b9231dcb6ba4b943d674e09685b47333af31d22 SHA512 e3b3adae4991e7687b191651f4c93471042bc8f56c5977743afec573fe026df3af1459b8bcbdb4f9995ecfbf83785ad56ccf46d6756429164b1f49524a36fed7
@@ -14,8 +13,8 @@ DIST mongodb-src-r3.6.13.tar.gz 40853787 BLAKE2B de9621de4f570d569df5cfe026ea5da
 DIST mongodb-src-r3.6.8.tar.gz 40428295 BLAKE2B cc02f73cfb49fb38ccabaad5a02610ce73fc41895ce944e48669e254bcbc70c8872a1bd7f8e04371fae4fcd9af2466fd8550367dd1d1da5cee50b86fc5023bf2 SHA512 c981f3269be3bafb59aa89d36c39a801fd7007b60db6c09b4616a559aaf8e50b34cabbdac2b59f23552c0a5112913fba468f7e2ed9a5f4daa3702dcffdf34999
 DIST mongodb-src-r4.0.10.tar.gz 49870574 BLAKE2B 1babbfa1a6d8fae390ec37042feff896c402772e832cc5b0b82fc4d531a6487ac2bd8d407c37ca75a76d78bc91cc665bfc3b7b223e6ceaaea2d921b337ef4d19 SHA512 891bfdc0d415515d7aa36aeb0618055ac6815c7d704537b88293226cecc1b677134db621fd90dee3913f4ff8174a888bcf68adee0a243d0f55ef6c0033a4f4b9
 DIST mongodb-src-r4.0.12.tar.gz 49937644 BLAKE2B 81044a6d68be6420d30fb2d7386ff29871a696cad94ce5977c1aba60c2ce80e18ccb86492c1947a359ef124332ea82ac3cb0fb73a68f51904a008fdf911aa055 SHA512 802eaf57d56c5e8e217344f10104a201acb6f5abef0065fc1bb8e6ceef13fe489b7ae46ed0d55b5bad50fe3579860b1c1471d224b51b0f15f968278cb5f6a47a
-EBUILD mongodb-3.6.13.ebuild 4229 BLAKE2B 6f69c6dcceb362a35ae991575db7898574f0ca6fc6c9c0ea7d1edd462e42f2edb0933004c1eb3ab6a2244e78327a453c0a89722e01082b93ae13ea8f3016c4dd SHA512 11ee8037100c1648fd9c798a15d84836ad2c25a5cc2492e157c589128bf7b1c9553b5ae5d28ab66bfef2047c02ccaf8b1a138f2885e8298ad40d4b6947b377fa
-EBUILD mongodb-3.6.8.ebuild 4196 BLAKE2B 5c5a72caa94102818cc03de85afc8d4c2818775814a9dd04555db4c1676dda953c8e64e3d222e35e96dfa90a26a18d9825c910f48102c6d574e8de816749523e SHA512 f6f83c1dd60eb8887457135b82194dd16c874678369a3b3a29907406b921502100e6d52d08b4dca6d9777d6d6c6453e6f134b08550304b0321138fb296e259dd
-EBUILD mongodb-4.0.10.ebuild 4230 BLAKE2B da38b78fd5fd7cdd301f20d90c870d36720b55b328500aca8e39bad28ce705114be57a046639888748c20cb2a8c8227d9bff9d33d490045f66f6509652c1e5ec SHA512 0f381b81c7b6a10ff7274f1065e3a38f1c801b7c7fd2ec202c2c6bd198b496352218e2fd209456eb772d586fbc3662fded83bf17d328c12c6df619159cbf8bad
-EBUILD mongodb-4.0.12.ebuild 4231 BLAKE2B cbcc36b52afa5d2ff4e6482c801297d88902b9a09576d1ac355d922e4c66333ebf62e2cfdeab51145bc0c1717587eceae4c817e5ce25ba22620fd85b9d14c60b SHA512 98180763eb93b00c464e3930eb6f4aca8b71a85299f3990a1e21be5f882a0eefc94c297919e072504c18c59b661aca851c347c8b06c3b96364abdff17266aab4
+EBUILD mongodb-3.6.13.ebuild 4230 BLAKE2B b2d7e960c5d6a4dc9e4f882d999446eb9ab4e8a1128a513e87e1d119ade30197aa1941e75632d32f1adee32e9a6d0b659f32ad64adc1f0472982885ef303479c SHA512 70e382660c6ceca1bcd53beb41656add3d16c3fec27108864423e7eeeadef90cb4fe7d9b992af6d24b362a2a614b95171a22585eb9addf2f22c177dd65e4a635
+EBUILD mongodb-3.6.8.ebuild 4197 BLAKE2B d28a62156019eaeab2d0fa8b4de5c5589e96c955145f283d810ba58c906d01e6447d74b08fc8037e2ebfff9b43dea38c3f6d5b28615e322ebee892bbe9c97d3a SHA512 90c2f9937355bed8d110044a89a7a5a3980c236b0e33b67457c3bc3ffce2ba3dc730dd55b977667cdd43ff07ecec4489183cee50e8e0e2a618ee2ec3e4fe82ef
+EBUILD mongodb-4.0.10.ebuild 4231 BLAKE2B 981c770cdbde22763fa8f4c7be235de7e8d312b1a1b1b6e688de557201cd0c265405b4bd8e5415d9e845618abdd0156bb594036376185ec57caa02cbe7b7ef56 SHA512 9e8153cd872408325dd0941f7e2fdffef09e6b1bd24dd8cf297821fdeb94098c1096df1a722db8e282db18a3bff0f95ce672cc3a3243801cbe3408135094c91a
+EBUILD mongodb-4.0.12.ebuild 4232 BLAKE2B f7143c56fd3a49fb22b57f58e52aeb21547dc2635b9d5083647af39ffeca2f560112cf40357a04fe68641e577c5ab36f9f7035c6292262e4018a762285925da5 SHA512 dfbcb298b9f81a5ff33372df79525ac0ec42fb6b06caa95194f19af3ea682b310e3beb17ef2ab125eedce5155da9134234075046526a82f90a07b7eb42a02a2b
 MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
diff --git a/dev-db/mongodb/files/mongodb-3.4.7-no-boost-check.patch b/dev-db/mongodb/files/mongodb-3.4.7-no-boost-check.patch
deleted file mode 100644
index 1d908e73f438..000000000000
--- a/dev-db/mongodb/files/mongodb-3.4.7-no-boost-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index df92e41659..2c387d5a24 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -2831,8 +2831,6 @@ def doConfigure(myenv):
-     if use_system_version_of_library("boost"):
-         if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ):
-             myenv.ConfError("can't find boost headers")
--        if not conf.CheckBoostMinVersion():
--            myenv.ConfError("system's version of boost is too old. version 1.49 or better required")
- 
-         # Note that on Windows with using-system-boost builds, the following
-         # FindSysLibDep calls do nothing useful (but nothing problematic either)
diff --git a/dev-db/mongodb/mongodb-3.6.13.ebuild b/dev-db/mongodb/mongodb-3.6.13.ebuild
index 2b4b44431d61..4fb9536e58f4 100644
--- a/dev-db/mongodb/mongodb-3.6.13.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.13.ebuild
@@ -10,7 +10,7 @@ CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs user
 
 MY_P=${PN}-src-r${PV/_rc/-rc}
 
@@ -38,19 +38,20 @@ RDEPEND=">=app-arch/snappy-1.1.3
 	)"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
+	$(python_gen_any_dep '
+		dev-python/cheetah[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
 	debug? ( dev-util/valgrind )
 	test? (
-		dev-python/pymongo[${PYTHON_USEDEP}]
+		$(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
 	)"
 PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
 	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
 	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
 )
@@ -73,7 +74,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	python-single-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/dev-db/mongodb/mongodb-3.6.8.ebuild b/dev-db/mongodb/mongodb-3.6.8.ebuild
index b8820e940534..3f1b10dc84fd 100644
--- a/dev-db/mongodb/mongodb-3.6.8.ebuild
+++ b/dev-db/mongodb/mongodb-3.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
@@ -10,7 +10,7 @@ CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-inherit check-reqs eapi7-ver flag-o-matic multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
+inherit check-reqs eapi7-ver flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs user
 
 MY_P=${PN}-src-r${PV/_rc/-rc}
 
@@ -38,19 +38,20 @@ RDEPEND=">=app-arch/snappy-1.1.3
 	)"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
+	$(python_gen_any_dep '
+		dev-python/cheetah[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
 	debug? ( dev-util/valgrind )
 	test? (
-		dev-python/pymongo[${PYTHON_USEDEP}]
+		$(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
 	)"
 PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
 	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
 	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
 )
@@ -73,7 +74,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	python-single-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/dev-db/mongodb/mongodb-4.0.10.ebuild b/dev-db/mongodb/mongodb-4.0.10.ebuild
index e6fa03c39c26..ad10fd71e28a 100644
--- a/dev-db/mongodb/mongodb-4.0.10.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.10.ebuild
@@ -10,7 +10,7 @@ CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs user
 
 MY_P=${PN}-src-r${PV/_rc/-rc}
 
@@ -38,19 +38,20 @@ RDEPEND=">=app-arch/snappy-1.1.3
 	)"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
+	$(python_gen_any_dep '
+		dev-python/cheetah[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
 	debug? ( dev-util/valgrind )
 	test? (
-		dev-python/pymongo[${PYTHON_USEDEP}]
+		$(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
 	)"
 PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
 	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
 	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
 )
@@ -73,7 +74,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	python-single-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/dev-db/mongodb/mongodb-4.0.12.ebuild b/dev-db/mongodb/mongodb-4.0.12.ebuild
index bb2a9fb04dc3..1e60cc747ff8 100644
--- a/dev-db/mongodb/mongodb-4.0.12.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.12.ebuild
@@ -10,7 +10,7 @@ CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs user
 
 MY_P=${PN}-src-r${PV/_rc/-rc}
 
@@ -38,19 +38,20 @@ RDEPEND=">=app-arch/snappy-1.1.3
 	)"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
+	$(python_gen_any_dep '
+		dev-python/cheetah[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+	')
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
 	debug? ( dev-util/valgrind )
 	test? (
-		dev-python/pymongo[${PYTHON_USEDEP}]
+		$(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
 	)"
 PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
 	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
 	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
 )
@@ -73,7 +74,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	python-single-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 132253d42873..a2e623f12358 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,9 +1,6 @@
-AUX remove-tasks.patch 423 BLAKE2B d4259bb4d0ba1434fb88d25ae1f2bc4e81e89d81c9c2d45f1ac442b2de14d5b9e42ac7ad25a73c18a80570d20626db1c8070965f817f185d9de42bd9ff1605e7 SHA512 21e577769418867ce6a3ea71e8b8949c8974a2a0f1750a87df6f125e53dca04e5e93381324b1d6f9f99b7795bb2e13384619ea4664c3d2c77c5ec83ecd4e33c4
-DIST mycli-1.15.0.tar.gz 275065 BLAKE2B 47ae049a7a669d18fc2bb467dd4ee6d1bbe23a86115db6d1965c48c93a2a1be9bb8b4427b377f8ce935b957c854c1c4bf4a87fdea07f27329a13fd6a28b59559 SHA512 7a7d98220c4a679340dbf3c3c9fb3eaab7698f7abbe3e62835a03df10b59c79f0dfd916e9f7b39f12215063849ecadf9d08d086d14b00666b67bac1d092609f2
-DIST mycli-1.17.0.tar.gz 276786 BLAKE2B 203c54b58a7876fd0bab5a05880621263e5cdf786b13207f04dfaf38866f5a7250e8fe8e1c5870aa9d3f562cf9963f15cc433e3ddd2232531f4c823e46778ac7 SHA512 bd64f44ed7b16a1e9c684da52fa60436876b26333e2705e5226c4fab3a979c6680314447333d01e4fdb274d33a7f093cbb2f732e5b4e04c5330066f9918a35ba
 DIST mycli-1.19.0.tar.gz 263255 BLAKE2B 524190429476793af038c8302f43389884a6ee24a05b0b8c739f290dbfdebec3336bd14567eafff2ea3351430791e4844e16dfc5affb1b28bb57d3759b496350 SHA512 8c6003a09a888c2ac6f35a881ca072ba8972f66b13319cbff73f7a525d1f808b767dcef0121b6272a1b82eed1a02c8c417d5805e5a8ce0c141545f28ff3c3a33
-EBUILD mycli-1.15.0-r2.ebuild 995 BLAKE2B abdbd5a3a837dd614b725fe010dff09696268a84ce6e7685e5bdb17c2ffb0543ee061c92ba089e2061b9557ac82cf16481e701b73f8745150cfa828d363df85b SHA512 ca0f8949af782e95c1bf9fbcd4b2e8e4e13ad55bd816d2f5bd5fb4be7d2689fad8707e9b23634068b5762f5f1ec00ff08942f3f73a81dc43360d14a7e3c1941d
-EBUILD mycli-1.17.0-r1.ebuild 1277 BLAKE2B 5e54dbb036a8f4e7b4898f5ce6062fd51ac3864195fd88fd32b0fc0666c527fb84c90159551d73905420937afc3d520640393e18859e4906ff5635059c23d46f SHA512 15299c5a79a495acab7d216cb66ede548bf86214b0825f8a7601cc433f5a310c57cae7b3c44eec7e4d954c30c3ea66b69dbe08acb6b0c2aa302d88ad2b26b16c
+DIST mycli-1.20.1.tar.gz 265264 BLAKE2B d00b1713132609b0a5ec6e8b78785fdab5c6b4db5937bc0b9bc69ddde90ad3dc75aeb99ccf6b5e7fe5e78e9bf4819f03fb454825e5182bc5d2c44356032343d1 SHA512 82ee642b2a4c158b0e2ea275941650125e15004ec1c70b2ab90ae0825090efccb4910a14fd46bcdf795a74adba5689b46de5668447308de63d1cbbbe2e6b0e9d
 EBUILD mycli-1.19.0.ebuild 1276 BLAKE2B b4ef901db33ef7cd55a3ad0e267c78be9c85ded80fb403efb2c108a72781157f1087a4b0734a707d2f3b03af879c1051db9207a11114d2209de696fe4dcffc4e SHA512 a2c60914458d0ff14fdc29734d67a37dd408f55d5a9492247e26d499894108c72a2bba7b0229fd0372c67526c56eff5e2e82be346c3bfed7481e4ed6ecf6f49a
-EBUILD mycli-9999.ebuild 1256 BLAKE2B 5dac698362a9cbeb9592a8e0f83d41fda55e1898dffb0d8d088244359124ba1cb8d938ba01372459853a9459b1b3a2c9f5c26b29eb85fe42031a7e3cd4263727 SHA512 8e7deac2cf6c4582ac8d81f0460822706800a3322aad24e453acbec5c32fed74f52436fe697fc6e8e842b4cb1377d19dc41ca81b67d3cfe76f74bda7ecde20a0
+EBUILD mycli-1.20.1.ebuild 1280 BLAKE2B 1f34ae0a9e226b852e03d86083b0ebeeeda16a178dcd198e2b6096604881e63f9d7db79b967b09c95397c79fb34714fd7102fa6e40e8e2dbc29eedb82f39232c SHA512 b0e8db1e8cc453277d103aaf5bd438c87934cf05b312b91afec31b99d2e8ecba3db7b3706acc8c81c5084d59a5fe003f4953c22b52b2d086b45671b3b918d0e8
+EBUILD mycli-9999.ebuild 1260 BLAKE2B f422998c353983378e777c5a80bbaebe8d360a646bac89c846024ef1978bc10462b6517c6f339fdd2b33335863813142c4ce2f857152dce2d3d8467b88f4f2b4 SHA512 118bc9163ded7b3be0629bdc4112a4d0924cde388ef2f07838f019656a526843f6f997bf6c6cb537f292574bec8a45345e10ccb9745885af741d45adb77f6e95
 MISC metadata.xml 406 BLAKE2B d46b17f9f36fc9851f36d4deadf52ca52d6df621245e521f66386ff3deed3b863188875dd2207c3cf78474cd8a04aebf03dad6564251581b8f9d09fb7bdf5ba8 SHA512 b88e9469cfd9287df46b84c62b27fd60f3cf84abfe93aba4ca7b46d668b0ed855c17ccccd95a49bc102bc2d9c054846ff33e094fe0351c598a9b55f494618e57
diff --git a/dev-db/mycli/files/remove-tasks.patch b/dev-db/mycli/files/remove-tasks.patch
deleted file mode 100644
index 94502e6b656a..000000000000
--- a/dev-db/mycli/files/remove-tasks.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 882fe92..f0d28ab 100755
---- a/setup.py
-+++ b/setup.py
-@@ -36,10 +36,6 @@ setup(
-     install_requires=install_requirements,
-     entry_points={
-         'console_scripts': ['mycli = mycli.main:cli'],
--        'distutils.commands': [
--            'lint = tasks:lint',
--            'test = tasks:test',
--        ],
-     },
-     classifiers=[
-         'Intended Audience :: Developers',
diff --git a/dev-db/mycli/mycli-1.15.0-r2.ebuild b/dev-db/mycli/mycli-1.15.0-r2.ebuild
deleted file mode 100644
index 3356d93de879..000000000000
--- a/dev-db/mycli/mycli-1.15.0-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
-
-HOMEPAGE="https://www.mycli.net"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/cli_helpers-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/click-4.1[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.10[${PYTHON_USEDEP}]
-	!>=dev-python/prompt_toolkit-1.1.0
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
-	!>=dev-python/python-sqlparse-0.3.0
-"
-
-PATCHES=( "${FILESDIR}/remove-tasks.patch" )
diff --git a/dev-db/mycli/mycli-1.17.0-r1.ebuild b/dev-db/mycli/mycli-1.17.0-r1.ebuild
deleted file mode 100644
index e3572fd7e6ed..000000000000
--- a/dev-db/mycli/mycli-1.17.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
-
-HOMEPAGE="https://www.mycli.net"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RDEPEND="
-	>=dev-python/cli_helpers-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/click-4.1[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-1.0.10[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
-	<dev-python/python-sqlparse-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] ${RDEPEND} )"
-
-python_test() {
-	pytest --capture=sys \
-		--showlocals \
-		--doctest-modules \
-		--doctest-ignore-import-errors \
-		--ignore=setup.py \
-		--ignore=mycli/magic.py \
-		--ignore=mycli/packages/parseutils.py \
-		--ignore=test/features
-}
diff --git a/dev-db/mycli/mycli-1.20.1.ebuild b/dev-db/mycli/mycli-1.20.1.ebuild
new file mode 100644
index 000000000000..8416d80d3592
--- /dev/null
+++ b/dev-db/mycli/mycli-1.20.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
+
+HOMEPAGE="https://www.mycli.net"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssh test"
+RDEPEND="
+	>=dev-python/cli_helpers-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2.0.6[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/python-sqlparse-0.4.0[${PYTHON_USEDEP}]
+	ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] ${RDEPEND} )"
+
+python_test() {
+	pytest --capture=sys \
+		--showlocals \
+		--doctest-modules \
+		--doctest-ignore-import-errors \
+		--ignore=setup.py \
+		--ignore=mycli/magic.py \
+		--ignore=mycli/packages/parseutils.py \
+		--ignore=test/features
+}
diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild
index 4aa099d560ea..e159c1e0e5bb 100644
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 EGIT_REPO_URI="https://github.com/dbcli/mycli.git"
 inherit distutils-r1 git-r3
 
@@ -16,15 +16,15 @@ SLOT="0"
 KEYWORDS=""
 IUSE="ssh test"
 RDEPEND="
-	>=dev-python/cli_helpers-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/cli_helpers-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/click-7.0[${PYTHON_USEDEP}]
 	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/prompt_toolkit-2.0.6[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
 	>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
-	<dev-python/python-sqlparse-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/python-sqlparse-0.4.0[${PYTHON_USEDEP}]
 	ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 4cab5b402ad6..6ab46cdbe307 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -11,7 +11,7 @@ DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665 BLAKE2B
 DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057 BLAKE2B e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4 SHA512 b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
 DIST mysql-connector-odbc-8.0.16-src.tar.gz 3986610 BLAKE2B c91760f8e0352a57adb5400700d22f52f70d5210d85ff0932f5288f19c917c771ce9ea9abad097d27a9723c585d1029d56c09f6865f634f9c41ad852690e016d SHA512 b7ddcdf635441bc3ed0325a8562f453e42d3c9768b0fe0b42d9b5417e268f4631e3fca3c2adc417c124ede37254c7b1890c792593d846ecaf5b158ce4b4808cd
 DIST mysql-connector-odbc-8.0.17-src.tar.gz 3953949 BLAKE2B 6d7fcef89c15d9f421f690291e793f1020b5f77f5e2132f130becd1ceed041887ffce77fda4cbc411d06972f1d488d434c8f132c0778af30a436c6b6e372e59e SHA512 474b107eb5d4c23e10c24dcf37b3787418afbd34ea385791fd0d8cdb5d29a6770cde4a61e3591329b344c442ff8f6daad3a2c250e881f9f5837eaa4e951af7e4
-EBUILD myodbc-5.3.10-r2.ebuild 3588 BLAKE2B db9749af6dd80c60ae359485e3526258e43ea7003b2302076b0ef39a72098663b27f9413d050809328fe4348f5c129135f163da8d895f65d8c9f76bd53415eb4 SHA512 33d3aced0bc4575baa860dc53f1a6b35b6a5dc2e1815d88922d66c5270e570deaa0dc20018d9329c4651cef00f48b902b208671dd0836e7224d11972491b9e66
+EBUILD myodbc-5.3.10-r3.ebuild 3591 BLAKE2B 0b7fb7976b32eb39b4e77c1d95011a623eab9ae83f02414911e7408614126a6a838d9ad8142092505c060d4142f1ac3f22f561ab6997e548999626c8c7b1e783 SHA512 73827923259949c1054f52727ec692312c37d887a6f56b8116d83dc9a91a2928ec2bacad723d9b41a32be56aea654cd94959f93237591d0aeb67df69ea563b41
 EBUILD myodbc-5.3.9.ebuild 3072 BLAKE2B 4922ed231672f11742590007b7b1f5c5dfa27263a6c98893b373793da06088f29c5401917179d479f4c57b24b2a1be9c3507caa752db79f3268fceff4719013d SHA512 4da8b034a745c453a310391a38e5cb1697bfa51838edc6903ee643e7dbe28fa5fb8f7d34264f88bb79b2aba83fa042212c0a2dd251c15150f7f0a2fcf561e052
 EBUILD myodbc-8.0.16.ebuild 3101 BLAKE2B 28664fd845b3bfb251e2f754c06b1b21ac1fb0ce85fbcaf620ff4ebea4ee181fe3c2f7c00ff8b47a084dc2e31a893c35f2d28e6176a4a40d508a6b0ebdfd57cd SHA512 856408b130fad4e4fc70fd48d841a2969aa85df46eeebb1d1476e5054b5d78af8e799463a7314f6db4131e4868146d6838c528b85f5bec1c569230231516a2cc
 EBUILD myodbc-8.0.17.ebuild 3111 BLAKE2B 4b0f0391bb0b71fc277da100630891bfca04d4ca87c3852eb728c1ba19c3de875654ee7fc1c5c66de1071f9c732c5bd2203ebd83f3654d616617895fa7a936ed SHA512 c5f960395fdb30f398dd182dafd4b75fcb6d7270ac327637e3d2fe169727cb377ee66a4e46e1a14221fc6c7aa34a617d5da636bc96f909eef772f73ec56b6a00
diff --git a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
deleted file mode 100644
index 28dde7ddccb8..000000000000
--- a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Build is broken with ninja
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake-multilib flag-o-matic versionator
-
-MAJOR="$(get_version_component_range 1-2 $PV)"
-MY_PN="mysql-connector-odbc"
-MY_P="${MY_PN}-${PV/_p/r}-src"
-
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="http://www.mysql.com/products/myodbc/"
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="${MAJOR}"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-# Does not build with libmariadb
-RDEPEND="
-	dev-db/unixODBC[${MULTILIB_USEDEP}]
-	~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]
-	!>=dev-db/mariadb-10.2.0[client-libs(+)]
-	!dev-db/mariadb-connector-c[mysqlcompat(-)]
-"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
-# Careful!
-DRIVER_NAME="${PN}-${SLOT}"
-
-# Patch document path so it doesn't install files to /usr
-PATCHES=(
-	"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
-	"${FILESDIR}/5.3.10-cxxlinkage.patch"
-	"${FILESDIR}/5.3.10-mariadb.patch"
-)
-
-src_prepare() {
-	# Remove Tests
-	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
-		"${S}/CMakeLists.txt"
-
-	# Fix as-needed on the installer binary
-#	echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	# MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
-	mycmakeargs+=(
-		-DMYSQL_CXX_LINKAGE=0
-		-DWITH_UNIXODBC=1
-		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
-		-DMYSQL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
-		-DMYSQL_INCLUDE_DIR="$(mysql_config --variable=pkgincludedir)"
-		-DMYSQLCLIENT_NO_THREADS=ON
-		-DDISABLE_GUI=ON
-		# The NUMA and LIBWRAP options are not really used.
-		# They are just copied from the server code
-		-DWITH_NUMA=OFF
-		-DWITH_LIBWRAP=OFF
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	dodir /usr/share/${PN}-${SLOT}
-	for i in odbc.ini odbcinst.ini; do
-		einfo "Building $i"
-			sed \
-			-e "s,__PN__,${DRIVER_NAME},g" \
-			-e "s,__PF__,${MAJOR},g" \
-			-e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
-			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
-			<"${FILESDIR}"/${i}.m4 \
-			|| die "Failed to build $i"
-	done;
-	mv "${D}/usr/bin/myodbc-installer" \
-		"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
-}
-
-pkg_config() {
-
-	[ "${ROOT}" != "/" ] && \
-		die 'Sorry, non-standard ROOT setting is not supported :-('
-
-	local msg='MySQL ODBC driver'
-	local drivers=$(/usr/bin/odbcinst -q -d)
-
-	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
-		rc=$?
-		eend $rc
-		[ $rc -ne 0 ] && die
-	else
-		einfo "Skipping already installed ${msg}"
-	fi
-
-	local sources=$(/usr/bin/odbcinst -q -s)
-	msg='sample MySQL ODBC DSN'
-	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
-		rc=$?
-		eend $rc
-		[ $rc -ne 0 ] && die
-	else
-		einfo "Skipping already installed ${msg}"
-	fi
-}
-
-pkg_postinst() {
-
-	elog "If this is a new install, please run the following command"
-	elog "to configure the MySQL ODBC drivers and sources:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "Please note that the driver name used to form the DSN now includes the SLOT."
-	elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
-}
diff --git a/dev-db/myodbc/myodbc-5.3.10-r3.ebuild b/dev-db/myodbc/myodbc-5.3.10-r3.ebuild
new file mode 100644
index 000000000000..ffae941ae9e1
--- /dev/null
+++ b/dev-db/myodbc/myodbc-5.3.10-r3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Build is broken with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake-multilib flag-o-matic versionator
+
+MAJOR="$(get_version_component_range 1-2 $PV)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="http://www.mysql.com/products/myodbc/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+# Does not build with libmariadb
+RDEPEND="
+	dev-db/unixODBC[${MULTILIB_USEDEP}]
+	<dev-db/mysql-connector-c-8.0:0=[${MULTILIB_USEDEP}]
+	!>=dev-db/mariadb-10.2.0[client-libs(+)]
+	!dev-db/mariadb-connector-c[mysqlcompat(-)]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+	"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+	"${FILESDIR}/5.3.10-cxxlinkage.patch"
+	"${FILESDIR}/5.3.10-mariadb.patch"
+)
+
+src_prepare() {
+	# Remove Tests
+	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+		"${S}/CMakeLists.txt"
+
+	# Fix as-needed on the installer binary
+#	echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	# MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
+	mycmakeargs+=(
+		-DMYSQL_CXX_LINKAGE=0
+		-DWITH_UNIXODBC=1
+		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
+		-DMYSQL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+		-DMYSQL_INCLUDE_DIR="$(mysql_config --variable=pkgincludedir)"
+		-DMYSQLCLIENT_NO_THREADS=ON
+		-DDISABLE_GUI=ON
+		# The NUMA and LIBWRAP options are not really used.
+		# They are just copied from the server code
+		-DWITH_NUMA=OFF
+		-DWITH_LIBWRAP=OFF
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	dodir /usr/share/${PN}-${SLOT}
+	for i in odbc.ini odbcinst.ini; do
+		einfo "Building $i"
+			sed \
+			-e "s,__PN__,${DRIVER_NAME},g" \
+			-e "s,__PF__,${MAJOR},g" \
+			-e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
+			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
+			<"${FILESDIR}"/${i}.m4 \
+			|| die "Failed to build $i"
+	done;
+	mv "${D}/usr/bin/myodbc-installer" \
+		"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
+}
+
+pkg_config() {
+
+	[ "${ROOT}" != "/" ] && \
+		die 'Sorry, non-standard ROOT setting is not supported :-('
+
+	local msg='MySQL ODBC driver'
+	local drivers=$(/usr/bin/odbcinst -q -d)
+
+	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+
+	local sources=$(/usr/bin/odbcinst -q -s)
+	msg='sample MySQL ODBC DSN'
+	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+}
+
+pkg_postinst() {
+
+	elog "If this is a new install, please run the following command"
+	elog "to configure the MySQL ODBC drivers and sources:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "Please note that the driver name used to form the DSN now includes the SLOT."
+	elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
+}
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 6920b6d52d7c..c3ecb6368d42 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -10,7 +10,7 @@ DIST mysql++-3.2.3.tar.gz 3241023 BLAKE2B 5faa5711c7ed7c64346013bd1ca6e7dc20e5b2
 DIST mysql++-3.2.4.tar.gz 4594696 BLAKE2B 7e0553b0e22bb3607a914fc7756ec192465af546749b0147a97558fb3d397e504f4552dcbc783f5bcc934e51fd1dac863e5479c4af3053d394a51c94cd825ee0 SHA512 69e23c211240854b59951bdb1cecc57f2f818d822a977942177e65195900dbdcc62d598c3e90c18f4a0a37e5340df7a149719c45b791de59c03d1f1259c5f4fd
 DIST mysql++-3.2.5.tar.gz 4748218 BLAKE2B ffceddb360cf6f0f38b7647f68e52ad9b659642c598c2aab7736813bf61d07316900d843749c2f9f4c753bd2087711ca712cc430f12b3a475c63ae3e5b11aff7 SHA512 5fa042a350322fa74afa28dc5e53f15cad32517001ab817493bf0d13a64e6559712f5e61184ef38a97bc8fe69f8732aaf436bc5d1663e4873f8baebee2e00892
 EBUILD mysql++-2.3.2-r1.ebuild 1410 BLAKE2B 6acbf4805dc44570d1d1b9df9a1c8769d3c13c9658b74cbad2052313d0538552693da45f2558be1afea78f80d6492ec36a9c02389ecbc054c60610ad521030eb SHA512 badefe7d214bd55b81965070b814b94c15fe3635d87c265225d2f9fef02360c3e09adeeb79a75c9990e89d596f111fc958c2a5fcec63624f14404192e4a26884
-EBUILD mysql++-3.2.3.ebuild 1556 BLAKE2B 8bcedbe3e000c0132610b7347329e62d0d82adc00be4b34e5333c274140ea682e3300b471dcf08a7e661e9df801fc6820b6771e7d41d0c74968856deb9375bde SHA512 4b04105492d20515ad98db286d9746b6ab1fe0d38a49c7de870cf19ab5d6dc2579303aa36b7216caeceb58ff17668fa4149b9a762612b0ca203adafda7145898
+EBUILD mysql++-3.2.3-r1.ebuild 1558 BLAKE2B 8b0a813f379929c73f0c41bab67c66dae5da003816434e8e22566a8ed94c435d83ac2cff9c2238731f74b2518c26ae8ef4f1d87a93b00958d1fdf99378ae9857 SHA512 1ff80e7a19e2cf782c1e2747f38aee37f60812944317160b9153ee39edd6e1ed7ff3d037733e80fe62596466cbb61c31137ec978df4959f003c6f6058257d136
 EBUILD mysql++-3.2.4.ebuild 1704 BLAKE2B c67e5a1e752602037503871f061f6a0430af178beab1c8fe293b19f903afbc78a62f602e8fa1af1c2812c0c938b540a99f0c25dd37ea782b9815237cfe8b4036 SHA512 7358abde75d8f9b57487955a75c7718d383b2ef0aea9094a9bce3affd8151ed94c509e884dea6b10b9d8d709fa893fcb0153e26520375410661045ed198013b2
 EBUILD mysql++-3.2.5.ebuild 1704 BLAKE2B dc150bed9777bbc18f38799121ed83f1cbf5c4c5be814a3e2b85664d5079adefafe2f3d502c4f9349a823db20723d95d039ef4b2e431e41299112be2ec06e1fe SHA512 2f784310eb4a015c67dd0c0566847c27f95dddd25e160edffcb28253a9cc545ed35e44fecac7242359c78ab05d0237242e8b548db0064fb0d63780e561304d48
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql++/mysql++-3.2.3-r1.ebuild b/dev-db/mysql++/mysql++-3.2.3-r1.ebuild
new file mode 100644
index 000000000000..28038bb90723
--- /dev/null
+++ b/dev-db/mysql++/mysql++-3.2.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool flag-o-matic
+
+DESCRIPTION="C++ API interface to the MySQL database"
+HOMEPAGE="http://tangentsoft.net/mysql++/"
+SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0/3"
+KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc"
+
+RDEPEND="dev-db/mysql-connector-c:="
+DEPEND="${RDEPEND}"
+DOCS=( CREDITS.txt HACKERS.txt Wishlist doc/ssqls-pretty )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-gold.patch
+	"${FILESDIR}"/${PN}-3.2.3-mariadb-10.2.patch
+	"${FILESDIR}"/${PN}-3.2.3-as-needed.patch
+)
+
+src_prepare() {
+	# Bug filed upstream about deprecated std::auto_ptr
+	append-cxxflags $(test-flags-CXX -Wno-deprecated-declarations)
+	# Bad symlink for libtool in the archive
+	rm "${S}/ltmain.sh" || die
+
+	default
+
+	_elibtoolize --auto-ltdl --install --copy --force
+	elibtoolize
+	# Current MySQL libraries are always with threads and slowly being removed
+	sed -i -e "s/mysqlclient_r/mysqlclient/" "${S}/configure" || die
+	rm "${S}/doc/"README-*-RPM.txt || die
+}
+
+src_configure() {
+	local myconf=(
+		--enable-thread-check
+		--with-mysql="${EPREFIX}/usr"
+		--with-mysql-lib="${EPREFIX}$(mysql_config --variable=pkglibdir)"
+		--with-mysql-include="${EPREFIX}$(mysql_config --variable=pkgincludedir)"
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	# install the docs and HTML pages
+	use doc && dodoc -r doc/pdf/ doc/refman/ doc/userman/ doc/html/
+}
diff --git a/dev-db/mysql++/mysql++-3.2.3.ebuild b/dev-db/mysql++/mysql++-3.2.3.ebuild
deleted file mode 100644
index 4b77996aeaf8..000000000000
--- a/dev-db/mysql++/mysql++-3.2.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool flag-o-matic
-
-DESCRIPTION="C++ API interface to the MySQL database"
-HOMEPAGE="http://tangentsoft.net/mysql++/"
-SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/3"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc"
-
-RDEPEND="virtual/libmysqlclient:="
-DEPEND="${RDEPEND}"
-DOCS=( CREDITS.txt HACKERS.txt Wishlist doc/ssqls-pretty )
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.1-gold.patch
-	"${FILESDIR}"/${PN}-3.2.3-mariadb-10.2.patch
-	"${FILESDIR}"/${PN}-3.2.3-as-needed.patch
-)
-
-src_prepare() {
-	# Bug filed upstream about deprecated std::auto_ptr
-	append-cxxflags $(test-flags-CXX -Wno-deprecated-declarations)
-	# Bad symlink for libtool in the archive
-	rm "${S}/ltmain.sh" || die
-
-	default
-
-	_elibtoolize --auto-ltdl --install --copy --force
-	elibtoolize
-	# Current MySQL libraries are always with threads and slowly being removed
-	sed -i -e "s/mysqlclient_r/mysqlclient/" "${S}/configure" || die
-	rm "${S}/doc/"README-*-RPM.txt || die
-}
-
-src_configure() {
-	local myconf=(
-		--enable-thread-check
-		--with-mysql="${EPREFIX}/usr"
-		--with-mysql-lib="${EPREFIX}$(mysql_config --variable=pkglibdir)"
-		--with-mysql-include="${EPREFIX}$(mysql_config --variable=pkgincludedir)"
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# install the docs and HTML pages
-	use doc && dodoc -r doc/pdf/ doc/refman/ doc/userman/ doc/html/
-}
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index bd0f17535fa3..37b411a1acbc 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -11,9 +11,9 @@ DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B e2cd300946a873a94beab13d9d1
 DIST mysql-connector-c++-8.0.11-src.tar.gz 2322951 BLAKE2B a1ea47c0440beae1892144186ad6b99a4519369845e1f37f5ce42088df6c29a458bd41840a1f9401dbd29827bc3a7c96ba34563a3a4cf3176e29e377cc254b9f SHA512 5113efb473b7cc63f680c04dacf5bee78d0a58ee20b41c8203edb92f8720c31c52c24de838996f25476eaa3d734c845531440317e82cb5e5f635bc03b057a148
 DIST mysql-connector-c++-8.0.13-src.tar.gz 2174609 BLAKE2B 5293ccfb7ad3bd6d50e0518db402d93f707535498ff1f608acc5c642cdc2c671601cbb7c14c7e6ec66fea8bdcb22effbb90e0ee2c207e8e82be7a2b446512f24 SHA512 0c260eff0002f5abc177049b9d050daf3b7860634355c10c02cb0ece18a3d1505454d67d8742d7e879c0cc6b44f8045f75e64d79bdd0bbfc211de9903abec902
 DIST mysql-connector-c++-8.0.15-src.tar.gz 2210243 BLAKE2B 45e0ffa2134c9df5a7e311963c7f2c58b5d7cfc0eefd80a5dc323bbe34ba60d40c79154f932e19c5f8e18ae45d0b61d304b7b7daba4955f92f830cf20c718931 SHA512 9a217b8f61babe5dac405be19b12d34b22673e779433d880a3aa31ea2e128f93434599a3fe0c1150b3f7b8c4d03f595d545d8cc33342a60561a2f60bff71ef14
-EBUILD mysql-connector-c++-1.1.11.ebuild 1619 BLAKE2B deca616c2dfe247328a82ed6dcee22ac8318979b78ef2d26264cc8c29d26aade47d00f2fa9367dddf21cd0a8703216d6370da1dcc96153054704541e39c31129 SHA512 8af584556114a0b5266af95b82e00d94c16dbd5c6b49c6cf25ad855f8fb4fb65ad9a2d752ce7ae4efaf4df7f2bdaa775cb712a89b0a8c4283e3e7d4fc0f29e9e
-EBUILD mysql-connector-c++-1.1.12.ebuild 1646 BLAKE2B 66e94a142efcb3a7b3111d930519d9fd53be1a500f7ee1cfdcec93ae4d5cf05f6241638c8a5b6305c29054e35dda43907a0ff2a47132eb79a8215e5ec65634c1 SHA512 907fbbab27519498402b914c8f1188d60814ae0e7ebbcc72d8dfa53620f2b52db686ab880cef61f4b37e210177e75fc3d114a5ccfaa1bbcde6df76a1b4070077
-EBUILD mysql-connector-c++-1.1.9.ebuild 1568 BLAKE2B 767d7a824046b4b1b18967abc04ae51b0610b15af54d8f1491b7d0731a2a25add4ff0bf2dd0445c793737eaf897205216e554e4405f2ab3d3eec30ef0662edc4 SHA512 55070fa6863b2e3cffc3e7f71bd2b652b198ae824e256b6f72d9c525602582c05a57262ba7f33bf01802551617d4963f30b3bbf15818a4fd1a406ac6286aa65e
+EBUILD mysql-connector-c++-1.1.11-r1.ebuild 1621 BLAKE2B fdf824ec8993976294bbc03467c63da10206bd04ed066ec33a2d7ce9310e654a0cdd1440e57517bcb22c37851310da0fb2e8e8c48696a99800da3e45cdc0c47a SHA512 7c05b18bac4af342c9feab9622e63afc916bd408a8f2b88dcf59c6192b5a62fba481b3e3f5cbca6826f61d092e7c91e9ef8f20f29b7272c11454c28a836fb15c
+EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1648 BLAKE2B 4f16129647c28a35338981d7b0efe867acc6a0aba527d26c9c79c695073d4eed57219cd740bb046a2c869326f75c101a589c4383ea876fcbd619aab15bab1db8 SHA512 382856ec409b13e3c5e96ef7f5b9282b97dcf02f6715f5c6b786e46a2859e30ee64e5911ff81b9691a379f35904fb94f7e895e747d1ed6d5804c21390ffbdbbc
+EBUILD mysql-connector-c++-1.1.9-r1.ebuild 1570 BLAKE2B 2f5d17177fe53a0ab0a70efe13d225a6982746819191719d1378b072881037ce81b0d63beb1e0e3dd9106dc04d17ef29b6ac010831734fca2f184901568ba2b2 SHA512 ce9598a2a5f8924cb24822dec8b5349f1655148ba7aba234e324912999d7a5df054a3b3d78c7e9c33c909d046d28bceb9322dc1848370fbed00b27941d49d387
 EBUILD mysql-connector-c++-8.0.11.ebuild 831 BLAKE2B cd00b3ef8d70e64c8fa7d4852a45d58f060fa443dfb90ebffdb3fa11310d4afabf0396eb05ec4af04b2d3fb3115f38b10eb76a1a302d9d7a1cbb5b4f7e61fda0 SHA512 8de6feaa69664b8faea224769777b7050470fd0b60c0d317e00049bc0e29471bac94274ae0da4239ff211651bf3775df0526d29a02d39d88b1d107bddbb44ee0
 EBUILD mysql-connector-c++-8.0.13.ebuild 840 BLAKE2B ad79745000c37f90f50ffb434613bdabcdf7cc8c8fb93e24e2148f08e65414f5bfcbd792a6b942494b776bbcd8b0717760d8576dc77d78607aeba473a2e5878a SHA512 8ed227a9269efc07223a71798225f4e573904aae94126c549e32abcf4e02459269c570a7d8e4e4db3ec7a825636a77feab6b1752ceaf23d4416cc42d4ea94e8b
 EBUILD mysql-connector-c++-8.0.15.ebuild 909 BLAKE2B 3a0fa261424e3ce299cf1d10ff5ace8e8bedc4e91fd0eb098916ca1b2d2353562a21d4aaf3fb73c119a665ad64da113036fba6ad9a02a6199306cece67b1f835 SHA512 32c8692e66ed3805c3e01ad5b4e66b04bc0a750e1fd270fc52f70777242abd21d5f11acdff27210b9194190e2ea1bfb3d203e264986c985f0d13210618e51047
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11-r1.ebuild
new file mode 100644
index 000000000000..812af80237d4
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
+URI_DIR="Connector-C++"
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
+IUSE="debug examples gcov static-libs"
+
+DEPEND="dev-db/mysql-connector-c:=
+	dev-libs/boost:=
+	dev-libs/openssl:0=
+	!<dev-db/mysql-connector-c-6.1.8"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-fix-cmake.patch"
+	"${FILESDIR}/${PN}-1.1.11-fix-mariadb.patch"
+	"${FILESDIR}/${PN}-1.1.11-fix-cpp-linking.patch"
+)
+
+src_configure() {
+	# native lib/wrapper needs this!
+	append-flags "-fno-strict-aliasing"
+
+	local mycmakeargs=(
+		-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
+		-DMYSQLCPPCONN_ICU_ENABLE=OFF
+		-DMYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF)
+		-DMYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF)
+		-DINSTALL_DOCS="/usr/share/doc/${PF}"
+		-DMYSQL_CXX_LINKAGE=0
+		-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# static lib has wrong name so we need to rename it
+	if use static-libs; then
+		mv "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
+			"${ED%/}"/usr/$(get_libdir)/libmysqlcppconn.a || die
+	else
+		rm -f "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a
+	fi
+
+	# examples
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*
+	fi
+}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11.ebuild
deleted file mode 100644
index 0f5dd84a35bb..000000000000
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
-URI_DIR="Connector-C++"
-SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
-IUSE="debug examples gcov static-libs"
-
-DEPEND="virtual/libmysqlclient:=
-	dev-libs/boost:=
-	dev-libs/openssl:0=
-	!<dev-db/mysql-connector-c-6.1.8"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-fix-cmake.patch"
-	"${FILESDIR}/${PN}-1.1.11-fix-mariadb.patch"
-	"${FILESDIR}/${PN}-1.1.11-fix-cpp-linking.patch"
-)
-
-src_configure() {
-	# native lib/wrapper needs this!
-	append-flags "-fno-strict-aliasing"
-
-	local mycmakeargs=(
-		-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
-		-DMYSQLCPPCONN_ICU_ENABLE=OFF
-		-DMYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF)
-		-DMYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF)
-		-DINSTALL_DOCS="/usr/share/doc/${PF}"
-		-DMYSQL_CXX_LINKAGE=0
-		-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# static lib has wrong name so we need to rename it
-	if use static-libs; then
-		mv "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
-			"${ED%/}"/usr/$(get_libdir)/libmysqlcppconn.a || die
-	else
-		rm -f "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a
-	fi
-
-	# examples
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/examples/*
-	fi
-}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
new file mode 100644
index 000000000000..d1f8176a8bd3
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
+URI_DIR="Connector-C++"
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
+
+LICENSE="Artistic GPL-2"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug examples gcov libressl static-libs"
+
+DEPEND="dev-db/mysql-connector-c:=
+	dev-libs/boost:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	!<dev-db/mysql-connector-c-6.1.8"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-fix-cmake.patch"
+	"${FILESDIR}/${PN}-1.1.11-fix-mariadb.patch"
+)
+
+src_configure() {
+	# native lib/wrapper needs this!
+	append-flags "-fno-strict-aliasing"
+
+	local mycmakeargs=(
+		-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
+		-DMYSQLCPPCONN_ICU_ENABLE=OFF
+		-DMYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF)
+		-DMYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF)
+		-DINSTALL_DOCS="/usr/share/doc/${PF}"
+		-DMYSQL_CXX_LINKAGE=0
+		-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# static lib has wrong name so we need to rename it
+	if use static-libs; then
+		mv "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
+			"${ED%/}"/usr/$(get_libdir)/libmysqlcppconn.a || die
+	else
+		rm -f "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a
+	fi
+
+	# examples
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*
+	fi
+}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12.ebuild
deleted file mode 100644
index 9fe978903a8c..000000000000
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
-URI_DIR="Connector-C++"
-SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
-
-LICENSE="Artistic GPL-2"
-SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug examples gcov libressl static-libs"
-
-DEPEND="virtual/libmysqlclient:=
-	dev-libs/boost:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	!<dev-db/mysql-connector-c-6.1.8"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-fix-cmake.patch"
-	"${FILESDIR}/${PN}-1.1.11-fix-mariadb.patch"
-)
-
-src_configure() {
-	# native lib/wrapper needs this!
-	append-flags "-fno-strict-aliasing"
-
-	local mycmakeargs=(
-		-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
-		-DMYSQLCPPCONN_ICU_ENABLE=OFF
-		-DMYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF)
-		-DMYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF)
-		-DINSTALL_DOCS="/usr/share/doc/${PF}"
-		-DMYSQL_CXX_LINKAGE=0
-		-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# static lib has wrong name so we need to rename it
-	if use static-libs; then
-		mv "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
-			"${ED%/}"/usr/$(get_libdir)/libmysqlcppconn.a || die
-	else
-		rm -f "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a
-	fi
-
-	# examples
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/examples/*
-	fi
-}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9-r1.ebuild
new file mode 100644
index 000000000000..3f908d77fd3b
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
+URI_DIR="Connector-C++"
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
+IUSE="debug examples gcov static-libs"
+
+DEPEND="dev-db/mysql-connector-c:=
+	dev-libs/boost:=
+	dev-libs/openssl:0=
+	!<dev-db/mysql-connector-c-6.1.8"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-fix-cmake.patch"
+	"${FILESDIR}/${PN}-1.1.8-fix-mariadb.patch"
+)
+
+src_configure() {
+	# native lib/wrapper needs this!
+	append-flags "-fno-strict-aliasing"
+
+	local mycmakeargs=(
+		-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
+		-DMYSQLCPPCONN_ICU_ENABLE=OFF
+		-DUSE_MYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF)
+		-DUSE_MYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF)
+		-DINSTALL_DOCS="/usr/share/doc/${PF}"
+		-DMYSQL_CXX_LINKAGE=0
+		-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# static lib has wrong name so we need to rename it
+	if use static-libs; then
+		mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
+			"${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
+	else
+		rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
+	fi
+
+	# examples
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*
+	fi
+}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
deleted file mode 100644
index 635d8c6cbd94..000000000000
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.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
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
-URI_DIR="Connector-C++"
-SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
-IUSE="debug examples gcov static-libs"
-
-DEPEND="virtual/libmysqlclient:=
-	dev-libs/boost:=
-	dev-libs/openssl:0=
-	!<dev-db/mysql-connector-c-6.1.8"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-fix-cmake.patch"
-	"${FILESDIR}/${PN}-1.1.8-fix-mariadb.patch"
-)
-
-src_configure() {
-	# native lib/wrapper needs this!
-	append-flags "-fno-strict-aliasing"
-
-	local mycmakeargs=(
-		-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
-		-DMYSQLCPPCONN_ICU_ENABLE=OFF
-		-DUSE_MYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF)
-		-DUSE_MYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF)
-		-DINSTALL_DOCS="/usr/share/doc/${PF}"
-		-DMYSQL_CXX_LINKAGE=0
-		-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# static lib has wrong name so we need to rename it
-	if use static-libs; then
-		mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
-			"${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
-	else
-		rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
-	fi
-
-	# examples
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/examples/*
-	fi
-}
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index bcad2b4ef3f3..581684cf6fdb 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,10 +1,12 @@
 AUX 20028_all_mysql-5.6-gcc7.patch 603 BLAKE2B f03dc2e39dca4496cc084b427daa60014464876df456bf290a5de3431b481691a35ac9ac00d71cc86931efe3bca70dae012bedefc6d29ad7fec2feeb07cce014 SHA512 f9dab813418f38f3a877b8672cdec153d6f0f289144c35277e8275cc7a58195f974b7bf76b74f8dd2403643b1199f5e6d6bcde661ce5f79f614ff10347b52278
 AUX 6.1.11-openssl-1.1.patch 8987 BLAKE2B 8bd00bb778e086cbdcd04b6ac904f36bd64bbbb332f913129eb3acbaf6da4d044fdc65523626a9fed47d6bf5859826af489bd9ae7ae51664c613c966a88708ba SHA512 46af56504ed2a69ce74a5e2040ee8b3355f5ac48fb80e4668b635f01a2650d07f50dd098ad43239e8b35a80e975a5a9549bd1b1a9c1a0612ed9e4750b537bb76
 AUX 8.0.16-libressl.patch 12591 BLAKE2B add6c31d6ea29af0b97e4f4558a006de899bf33a75ac37b20c4feb539a568a9bdec20db6bf6f3e5a64488af8740fba566d3166ea7f339f98f7c9df738bb63c71 SHA512 49ac3e698be404eb13771e3850a6b37c1f839fda1d710be7f53369d457236e14423e6d8877dfa0a580c0e700cc4c33f3fa2b5e87c9ad14e8f88899451a51a91e
+AUX mysql-connector-c-8.0.17-always-build-decompress-utilities.patch 819 BLAKE2B 424a30a5217aa4b1005d1991e90e75f033092c87cfadf0d2298d8f2a6819bafa24f5f1149d00ea252afb71f004069e9b4b406e801438d0f15a8077d5bcbc1561 SHA512 bf839e2a126066b78a64a7876b319507fd049cdc3a8b2855d8df27ae0c74a93f4b66d7d1db534552107cbe293a1913d51bd25ce945a6bdc47e785b3a6c3608df
 AUX mysql-connector-c-8.0.17-libressl.patch 10106 BLAKE2B 5ed9b5f77f35c5079ac13d855ec9de0f67769d9de20029876026064986a7c79671b607a19c6afe3cbcdc9ab14527e5618a213b4aa8953f10349e80b0ef7c21ea SHA512 7e692de4260f2a846008eca3bf8f4f59b61d2780743ded9a08d2245baf73ece360cb8b25ab4a3518b706b7dcc2915f3628122930b973ab27ec3e7bfbf120c3ed
+AUX mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch 684 BLAKE2B 10007011b38462ffa8b539f9ac531c715fcead4e6bb1d1c04ea8055decc0aa6eda8b22e3967d91773316d04062ca231cf8561ce72ab2b5aaeaf37a0bb425c7f5 SHA512 d0e60dff5faa7b6c71878803d598b46266021029c874c8f6834d496de10ddf42d3b806fae3c6d532c1890cb5f491bbd69235bd1ac919848011a9ca57c465ce1c
 AUX mysql_com.patch 1787 BLAKE2B 4fbd40325f400586926072927b3f07231d577f18c1e30951c34c36ded9b9e42b7c3dc47ca51df974265c28b40116e30274d8a73d6a843e5d9d0074430bc17b08 SHA512 340365b05d72045af0ef12fd5c260a796be547d9abb97a6ef3d6aaf30aecf29368c1dfa28f1284da544a81656f0436f11ada2f8c5cb481540d1f1c90dd354b49
 DIST mysql-boost-8.0.17.tar.gz 189322239 BLAKE2B f9f46e5fdc3e9869b203626bc09edfbcdbabcd68eba43f9c6a33b9a52cffb3a32f39704c6d22a66899aac16fa2efb271c5dc7af7522768b45542ac8dc615cd8a SHA512 a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d
 DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1 SHA512 271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6
 EBUILD mysql-connector-c-6.1.11-r2.ebuild 2289 BLAKE2B edce26b9fea987ad0d3ba93388303f62dfe004779989c6e21ac154275cd9b7e0b3f0749e19375290d625f9a17384853b63a02f4742703030aa7c8dcf863f7ade SHA512 c33ea5754eae88f1628d9d53a81db4aaea2598ebca10f2158617b2a2cd9ac3d7cd34dfc9b0314bd096ba0f531dd27fbe8c42a61727dea91fc21852ee601f409e
-EBUILD mysql-connector-c-8.0.17-r1.ebuild 2456 BLAKE2B 8c54db2595c732fb34285f673942bd0df1e07ac982cf8622baebfe81f8a9e8f1dd9f87023f3a73a58d9c59129444030d2cd06de4aade0f35c86a365db3477bcd SHA512 ccb6f68dfccc6f94d2897b7931fed8d0df5d5500f60d64e23908b5864ad7b054cd7b1eebcc008f5b4ee99c0254aa75c0478b1bf2c35e5d42d760adf2118614b4
+EBUILD mysql-connector-c-8.0.17-r3.ebuild 2910 BLAKE2B c84d7fd272718626f63ff5f7978d97b04f9b0ef0c621d7bd25d0fff3250fb00b3876bf5d83100c842a5536cbd6fc4533b87519669e3908ad3015e9799dc4739a SHA512 ffae48bad3697161efd56cea71c42fc4a3cc9ff97e17cb91bc6337dad69dd03cd86bf41b241fda0f8809f2ddff3e6137f7d10a67a7ba4a6e1aaaff81a787197c
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch
new file mode 100644
index 000000000000..927662705aa3
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch
@@ -0,0 +1,22 @@
+--- a/utilities/CMakeLists.txt
++++ b/utilities/CMakeLists.txt
+@@ -101,15 +101,11 @@ MYSQL_ADD_EXECUTABLE(perror perror.cc)
+ ADD_DEPENDENCIES(perror GenError)
+ TARGET_LINK_LIBRARIES(perror mysys)
+ 
+-IF (BUILD_BUNDLED_LZ4)
+-  MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc)
+-  TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys)
+-ENDIF()
++MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc)
++TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys)
+ 
+-IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
+-  MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc)
+-  TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys)
+-ENDIF()
++MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc)
++TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys)
+ 
+ IF(WITH_INNOBASE_STORAGE_ENGINE)
+ 
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch
new file mode 100644
index 000000000000..8fabd9952cc4
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/692644
+
+--- a/include/mysql.h.pp
++++ b/include/mysql.h.pp
+@@ -175,7 +175,7 @@ struct rand_struct {
+   unsigned long seed1, seed2, max_value;
+   double max_value_dbl;
+ };
+-#include <mysql/udf_registration_types.h>
++#include "mysql/udf_registration_types.h"
+ enum Item_result {
+   INVALID_RESULT = -1,
+   STRING_RESULT = 0,
+--- a/include/mysql_com.h
++++ b/include/mysql_com.h
+@@ -1002,7 +1002,7 @@ struct rand_struct {
+ };
+ 
+ /* Include the types here so existing UDFs can keep compiling */
+-#include <mysql/udf_registration_types.h>
++#include "mysql/udf_registration_types.h"
+ 
+ /**
+   @addtogroup group_cs_compresson_constants Constants when using compression
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild
deleted file mode 100644
index c99bb77dd8a1..000000000000
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-# wrap the config script
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/"
-LICENSE="GPL-2"
-
-SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-SLOT="0/21"
-IUSE="ldap libressl static-libs"
-
-RDEPEND="
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	"
-DEPEND="${RDEPEND}"
-
-DOCS=( README )
-
-S="${WORKDIR}/mysql-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-8.0.17-libressl.patch )
-
-src_prepare() {
-	sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die
-
-	# All these are for the server only.
-	# Disable rpm call which would trigger sandbox, #692368
-	sed -i \
-		-e '/MYSQL_CHECK_LIBEVENT/d' \
-		-e '/MYSQL_CHECK_RAPIDJSON/d' \
-		-e '/MYSQL_CHECK_ICU/d' \
-		-e '/MYSQL_CHECK_RE2/d' \
-		-e '/MYSQL_CHECK_LZ4/d' \
-		-e '/MYSQL_CHECK_EDITLINE/d' \
-		-e '/MYSQL_CHECK_CURL/d' \
-		-e '/ADD_SUBDIRECTORY(man)/d' \
-		-e '/ADD_SUBDIRECTORY(share)/d' \
-		-e '/INCLUDE(cmake\/boost/d' \
-		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
-		CMakeLists.txt || die
-
-	# Skip building clients
-	echo > client/CMakeLists.txt || die
-
-	# Forcefully disable auth plugin
-	if ! use ldap ; then
-		sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die
-		echo > libmysql/authentication_ldap/CMakeLists.txt || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LAYOUT=RPM
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
-		-DWITH_DEFAULT_FEATURE_SET=OFF
-		-DENABLED_LOCAL_INFILE=ON
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock"
-		-DWITH_ZLIB=system
-		-DWITH_SSL=system
-		-DWITH_NUMA=OFF
-		-DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
-		-DSHARED_LIB_PATCH_VERSION="0"
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-		-DWITHOUT_SERVER=ON
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	doman \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1
-
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild
new file mode 100644
index 000000000000..3c047b80fc20
--- /dev/null
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+# wrap the config script
+MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/"
+LICENSE="GPL-2"
+
+SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+SLOT="0/21"
+IUSE="ldap libressl static-libs"
+
+RDEPEND="
+	>=app-arch/lz4-0_p131:=
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	"
+DEPEND="${RDEPEND}"
+
+# Avoid file collisions, #692580
+RDEPEND+=" !<dev-db/mysql-5.6.45-r1"
+RDEPEND+=" !=dev-db/mysql-5.7.23*"
+RDEPEND+=" !=dev-db/mysql-5.7.24*"
+RDEPEND+=" !=dev-db/mysql-5.7.25*"
+RDEPEND+=" !=dev-db/mysql-5.7.26-r0"
+RDEPEND+=" !=dev-db/mysql-5.7.27-r0"
+RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1"
+
+DOCS=( README )
+
+S="${WORKDIR}/mysql-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.17-always-build-decompress-utilities.patch
+	"${FILESDIR}"/${PN}-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch
+	"${FILESDIR}"/${PN}-8.0.17-libressl.patch
+)
+
+src_prepare() {
+	sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die
+
+	# All these are for the server only.
+	# Disable rpm call which would trigger sandbox, #692368
+	sed -i \
+		-e '/MYSQL_CHECK_LIBEVENT/d' \
+		-e '/MYSQL_CHECK_RAPIDJSON/d' \
+		-e '/MYSQL_CHECK_ICU/d' \
+		-e '/MYSQL_CHECK_RE2/d' \
+		-e '/MYSQL_CHECK_EDITLINE/d' \
+		-e '/MYSQL_CHECK_CURL/d' \
+		-e '/ADD_SUBDIRECTORY(man)/d' \
+		-e '/ADD_SUBDIRECTORY(share)/d' \
+		-e '/INCLUDE(cmake\/boost/d' \
+		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
+		CMakeLists.txt || die
+
+	# Skip building clients
+	echo > client/CMakeLists.txt || die
+
+	# Forcefully disable auth plugin
+	if ! use ldap ; then
+		sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die
+		echo > libmysql/authentication_ldap/CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_LAYOUT=RPM
+		-DINSTALL_LIBDIR=$(get_libdir)
+		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
+		-DWITH_DEFAULT_FEATURE_SET=OFF
+		-DENABLED_LOCAL_INFILE=ON
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock"
+		-DWITH_ZLIB=system
+		-DWITH_SSL=system
+		-DWITH_NUMA=OFF
+		-DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
+		-DSHARED_LIB_PATCH_VERSION="0"
+		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
+		-DWITHOUT_SERVER=ON
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	doman \
+		man/my_print_defaults.1 \
+		man/perror.1 \
+		man/zlib_decompress.1
+
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index 5f21f2dcbfb3..e98528656626 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -1,20 +1,13 @@
 AUX conf.d-2.0 2944 BLAKE2B 94b94868e840267c5bf604226af11a4c806f48111472e417d725b51f48e38b8a4bd0dbbe8f9dba95c2250590c23bc0f9bc301203fdf399cd141055e54fa9a067 SHA512 2781e2caefed0c8be9c612f92cecf5a572dc17b97519034637a2b3f98a88af02dd8973f6c6b2af524d235067df6866409d1fe9d56740bfd0efb09948073c8d3b
-AUX init.d-2.2 5720 BLAKE2B 6d81ee1275439e59926ac0f2dbaa2f4b1ceed130f9047d7f6c19d27927fb0432701121554a77205f6f803c9f4e6e0ffdbf96ac8d6ff2f7ca149637585b859df4 SHA512 df1c85d527ec1805bf5ca22f5db37714ace6c55e4095ecf2e4cc1c4dad8a4aa6539282b11cb9c6a85b72e2412e1fbae90d85a8dfcda077bedb667bf784e4c613
 AUX init.d-2.3 5722 BLAKE2B 63653c5f09312899e81502aeaddc3e19cd8813ed0735baccc8c9d42b344a668dfa745366bcab24bce9b0c137c44db3052b95c5f767dd16ce22cd272417319655 SHA512 7c160885a6240be789d15f0fc257d90db3edaeb50e3695c3ae3c040c1a485367e7f72749ce5f86832b683e611eaf5c012353d58fb2382ed7e37d96c7a28d815f
-AUX init.d-s6-2.2 4978 BLAKE2B bdda1ecc926a5236be865487cca01974865c7d0c8e115b0bf4e5f791293ffd3be3976730fc21d3a4f2f81389d88c40d6b427d67dfeaa694ba8487e19f03b0aa1 SHA512 77d3691837a08d117dbaa8252368ab54f1bbd5969189261e498e57cacd158b87e5600b3c2ce62b25f72b8bf5b9a08f26d56fe93b6e2e96bc58c208d92ef1befc
 AUX init.d-s6-2.3 4980 BLAKE2B b165f6a87cc3570ef6aa28d82dedbd0bc5e151c73e7a97bca62e474af15ae9cb91869f1f2d0a12618c972aa8d4b2100202671b736b6b184c6d9ad644f5955fe8 SHA512 61bfffb8a7af2fa5f2cd0f9e21930e5a2527bd9f2ada617d1b1c06110e247c78b4889f3a80d426eb2b9fcf0c312c6d0cbdc4b501690219f35b9b10d693f538a9
-AUX init.d-supervise 5303 BLAKE2B ae0b30000d74028866512156e6d565e1bc4456680521e7af9195ffed2a7b75b0504c313b78d3629d0d2894c0ea980e8d8049624862200e64e82087e37bbb8d53 SHA512 149710600ca4780434e07101aa164e84d7decd86fdc4c2a8c5c37d2a965aff4626408885f98456773c6f8fb27eeeb5ab7028ccf73088739368c45f8ad9d587c4
 AUX init.d-supervise-2.3 5331 BLAKE2B 764fe71adaf1514d57739d03b75f86b227d1cfefef88d74473626722dbebb51e2f3757bc0c4ef1ed8c52e9f3c9fab930c5f7855862642f87dde86b8dfd4051e8 SHA512 1932c1fdb73e9b5c30b1424399bac330bb0825163a5cad2388fe0efe03ccb350c5c53586d277e30ba62d01ac729598f33552b255adc5714b9cb299e22c456d72
 AUX log-s6 373 BLAKE2B e4579d7288c7e05c1abba55c29759eb3b0b49153c7b134e28b7308ba83e33c409d82ddc2e9794d0a398330b5b72ac33d165c6140259857ce3204928b20c2f6ac SHA512 e686bc0a4d9d5daf263c5a5f6bb883da1495feb9910f93c791af2d858b2adbf7cfc785c336ce470609f3f7bd12dabb97b470453bd67316feef5ed4df9ee9307d
-AUX logrotate.mysql 368 BLAKE2B 0eb2411785e53e4ec521139943633bf7f765df532e89d626bf2387c9bc8012c4caba019615feb13eeef48e8ace55207b5d93469b323488a93f24f62a3ba32ac0 SHA512 71e6aeec21e220157fb07a609475c626e0698f556db20f5e2876117d1d46a2f297520b2124458e8b8077f9a128e27540ffa1b77cadc5eb372a502edfb804fed1
-AUX logrotate.mysql-2.3 384 BLAKE2B f7d8dae2b35283b5a7cd47418c4f43343549750a9146c522af3e093274acb24389d7ed997a20e78cbba60ccedcf9ddc667014062dd9e5a0665a61f4e3c4e1ecc SHA512 f682919b9f82649ff9fbe21287c93f0f0c434f64907476674c95dcf85bc19b9328cef1924da8247148e6424eefd4957ae86b5238f3200c71584347fe95709b53
+AUX logrotate.mysql-2.3 453 BLAKE2B 80f1d78ff5531443c1038abeac2ae8b1177e12b069f83e62e1844b08584bcb64e1b8c31bbf2399e6f9a9dbdf52599ee76de0cbe299a11aadf38bfc5b8f9d1b90 SHA512 b45773ccc270e4c6689751e008f6fa03c5de5963b7f2347ecb9975400e865120c8ac1362ca7b4920516b2da87748b86e4810dce0760b0e48c029df4a2f590348
 AUX mysql.conf 37 BLAKE2B 66f792ee51ca18e692e069a2627dd3a122dadbd0cf9097857da049ade3cc21fdc45bd7725c68def448a2763e5688ade468c17f53776b780be6f6d2a0245b1b7c SHA512 7b4940666d21f09fda47e2b24bd252c83af4372f34f1b3410c59d8f439fb7c0166d5a1b8d857bf67f2263f15d95a0fa0b67f225152a18c180b67d28f4ceb5f00
 AUX mysqld-v2.service 1208 BLAKE2B 9dad4cfa0a102fe7705f4d1db042d0c65d66e669b51b8536f0dbdc1ca3d149076ee71a373efc0cfa3ca900e87c8ccb91aa0beeb10bf8634553ddc3309ba3b2c9 SHA512 2016ea7d9c8fe9447675ec9612655f1b955a3f04ce417ebb1c7a8a86a29ef176a5737a9bd3bc5e45508e2e23a764a763897881b511f65635193291e212fd58aa
 AUX mysqld-wait-ready 1758 BLAKE2B 2a6ccc105cedc78e4e8acf77fd13f8083af80b3488572079bd063fac263382cd37a85cf40c02ffa8a9a047f146402dc2f7bfef91d47487003b64c84cdc8196c9 SHA512 ad4a850d045149df156c8236ae114e94887626e3ca803dea9bcc3909349043b51357a71ac17d694e0217f7856e076a0736267fc1ea3dedbef8a319fc9014c01b
 AUX mysqld_at-v2.service 1170 BLAKE2B d02f7ee3549d273d309e8e6e5cd8c2f987c6feab42bb330367c14df6932a887f7740ca6c28ecd15aba8bf2f89c33854345d773134630a5e8cd5ce8b99a8b6667 SHA512 a91eb574925afc0096e668799f9806b1cfa4c808ffab26dab5df1934db0dd8059a5e7913b0fdc3374f41e14cc72a6450890c9d746d3ff2de873af91199a71ee0
 AUX run-s6 268 BLAKE2B ebc9c74527257e1a35a4671afe2d34d9ed9868db0e0f33eebe655b31317a4ceeb02affe471ad49007534a9ce0a9399d9f14af664488ae753e207cf97d467107b SHA512 82be247195f6d9d230b063e9bda393bab8855382c2f3e5eb4d427fc1eb7e23dbd8c90939224ff2b5e4116a5c9d3f26ebdc9b9f548cde91e7c1217f4f8500c0d3
-EBUILD mysql-init-scripts-2.2-r3.ebuild 1899 BLAKE2B c7406995ab4a0ecdb9bcd20a9384e269e4dbd55d87c21674cd7b4c31d937468448818bd9c06286b5595fe138b2fb5d6cd2faeec0276e08e0e0f24a6b8b96426a SHA512 2b2873467515d34b6afb03b06f73d8420b5228924362866ab3ba0353ff59509b4aa37db0cc3ccb5f6529a8a732b1a3a405f0b4d30bd288bf518a899884146c2a
-EBUILD mysql-init-scripts-2.2-r4.ebuild 1983 BLAKE2B d322fc4243b6ac3c4540c1f0f312d5baf8658234e3182ff52cbb2442f59d4052ccf662d337780ac0a77611e846ac03b9da116f6e294f4cede62694c1fc2e6d52 SHA512 ac578f3ea527efe1e5b233a075d83e5e1f49785c23c3d5e6557123859d81adef4a5ca51d91fb70f1320bceb4f9fbe2cada8334d831961061a9bba216ce55306f
-EBUILD mysql-init-scripts-2.3-r1.ebuild 1988 BLAKE2B cc676a418285d581c4e1422073e4063b87f544e401f3825622befb6b971ebb68b29ac1d741ae908dbbc4816948644744d1c2f5c63266c3b0ac5c63fd0dd9c6d9 SHA512 568b832d444cfad9b6457c7e9b4add14f0bd5d29a009c78b37591a6b1a84b07b632c4756cbaeb6ca76cd33f057c766ea590b7ae1ec9aebd165f7d35daafdcf81
-EBUILD mysql-init-scripts-2.3.ebuild 1980 BLAKE2B a75ef598bb80af5b2807f38726af193755df2d03c974f51a0f49b100ea2591274335d684e405b8f559ae7f7aafbce10cc3f204c547f2a7858a63b28c29e80c93 SHA512 d09f5304d3a5f88922ac7b68c0789013c4062afbfb8eac349cbf63687dccf96014d688f0325de569588051665d9fa789a8386ea89e61b7bc578160ee4e7f03db
+EBUILD mysql-init-scripts-2.3-r3.ebuild 2028 BLAKE2B 7c2b98ac7e0151d42b5ee0e9dfce4ede07c1fb7016e9533c22347a9504736ee1b8fd596277e2056a23a5d3ce6ea787320243bf4282bf72431fa76f52fe13cc03 SHA512 56a466e3383e9464f5d3073cc4cae70fce674ddc6503438dcf98f1e9c4f1f6856dd36590998b18cd606c820e99a30c7c2ccb5a3af44191be03367685179e8449
 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mysql-init-scripts/files/init.d-2.2 b/dev-db/mysql-init-scripts/files/init.d-2.2
deleted file mode 100644
index 5603f9e60310..000000000000
--- a/dev-db/mysql-init-scripts/files/init.d-2.2
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_stopped_commands="bootstrap_galera"
-
-description_checkconfig="Verify the server's configuration"
-description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
-
-depend() {
-	use net.lo
-	# localmount needed for $basedir
-	need localmount
-	# This service has its own timeout and may need to wait for repairs
-	# or remote synchronization
-	keyword -timeout
-}
-
-get_config() {
-	my_print_defaults --defaults-file="$1" mysqld server mariadb |
-	sed -n -e "s/^--$2=//p"
-}
-
-mysql_svcname() {
-	local ebextra=
-	case "${SVCNAME}" in
-		mysql*) ;;
-		*) ebextra=" (mysql)" ;;
-	esac
-	echo "${SVCNAME}${ebextra}"
-}
-
-stringContain() { [ -z "${2##*$1*}" ] && [ -z "$1" -o -n "$2" ]; }
-
-bootstrap_galera() {
-	MY_ARGS="--wsrep-new-cluster ${MY_ARGS}"
-	mark_service_starting
-	if start ; then
-		mark_service_started
-		return 0
-	else
-		mark_service_stopped
-		return 1
-	fi
-}
-
-start() {
-	# Check for old conf.d variables that mean migration was not yet done.
-	set | egrep -sq '^(mysql_slot_|MYSQL_BLOG_PID_FILE|STOPTIMEOUT)'
-	rc=$?
-	# Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable.
-	# It does have a use in testing, as it is possible to build a config file
-	# that works with both the old and new init scripts simulateously.
-	if [ "${rc}" = 0 -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then
-		eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp."
-		eerror "Not proceeding because it may be dangerous."
-		return 1
-	fi
-
-	# Check the config or die
-	if [ ${RC_CMD} != "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	# Now we can startup
-	ebegin "Starting $(mysql_svcname)"
-
-	MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
-
-	if [ ! -r "${MY_CNF}" ] ; then
-		eerror "Cannot read the configuration file \`${MY_CNF}'"
-		return 1
-	fi
-
-	# tail -n1 is critical as these we only want the last instance of the option
-	local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
-	local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
-	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
-	local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
-	local wsrep="$(get_config "${MY_CNF}" 'wsrep[_-]on' | tail -n1 | awk '{print tolower($0)}')"
-	local wsrep_new=$(get_config "${MY_CNF}" 'wsrep-new-cluster' | tail -n1)
-
-	if [ -n "${chroot}" ] ; then
-		socket="${chroot}/${socket}"
-		pidfile="${chroot}/${pidfile}"
-	fi
-
-	# Galera: Only check datadir if not starting a new cluster and galera is enabled
-	# wsrep_on is not on or wsrep-new-cluster exists in the config or MY_ARGS
-	[ "${wsrep}" = "1" ] && wsrep="on"
-	if [ "${wsrep}" != "on" ] || [ -n "${wsrep_new}" ] || stringContain 'wsrep-new-cluster' "${MY_ARGS}" ; then
-
-		local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
-		if [ ! -d "${datadir}" ] ; then
-			eerror "MySQL datadir \`${datadir}' is empty or invalid"
-			eerror "Please check your config file \`${MY_CNF}'"
-			return 1
-		fi
-
-		if [ ! -d "${datadir}"/mysql ] ; then
-			# find which package is installed to report an error
-			local EROOT=$(portageq envvar EROOT)
-			local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
-			if [ -z ${DBPKG_P} ] ; then
-				eerror "You don't appear to have a server package installed yet."
-			else
-				eerror "You don't appear to have the mysql database installed yet."
-				eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
-			fi
-			return 1
-		fi
-	fi
-
-	local piddir="${pidfile%/*}"
-	checkpath -d --owner mysql:mysql --mode 0755 "$piddir"
-	rc=$?
-	if [ $rc -ne 0 ]; then
-		eerror "Directory $piddir for pidfile does not exist and cannot be created"
-		return 1
-	fi
-
-	local startup_timeout=${STARTUP_TIMEOUT:-900}
-	local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
-	local tmpnice="${NICE:+"--nicelevel "}${NICE}"
-	local tmpionice="${IONICE:+"--ionice "}${IONICE}"
-	start-stop-daemon \
-		${DEBUG:+"--verbose"} \
-		--start \
-		--exec "${basedir}"/sbin/mysqld \
-		--pidfile "${pidfile}" \
-		--background \
-		--wait ${startup_early_timeout} \
-		${tmpnice} \
-		${tmpionice} \
-		-- --defaults-file="${MY_CNF}" ${MY_ARGS}
-	local ret=$?
-	if [ ${ret} -ne 0 ] ; then
-		eend ${ret}
-		return ${ret}
-	fi
-
-	ewaitfile ${startup_timeout} "${socket}"
-	eend $? || return 1
-
-	save_options pidfile "${pidfile}"
-	save_options basedir "${basedir}"
-}
-
-stop() {
-	if [ ${RC_CMD} = "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	ebegin "Stopping $(mysql_svcname)"
-
-	local pidfile="$(get_options pidfile)"
-	local basedir="$(get_options basedir)"
-	local stop_timeout=${STOP_TIMEOUT:-120}
-
-	start-stop-daemon \
-		${DEBUG:+"--verbose"} \
-		--stop \
-		--exec "${basedir}"/sbin/mysqld \
-		--pidfile "${pidfile}" \
-		--retry ${stop_timeout}
-	eend $?
-}
-
-checkconfig() {
-	local my_cnf="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
-	local basedir=$(get_config "${my_cnf}" basedir | tail -n1)
-	local svc_name=$(mysql_svcname)
-	ebegin "Checking mysqld configuration for ${svc_name}"
-
-	if [ ${RC_CMD} = "checkconfig" ] ; then
-		# We are calling checkconfig specifically.  Print warnings regardless.
-		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
-	else
-		# Suppress output to check the return value
-		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null 2>&1
-
-		# If the above command does not return 0,
-		# then there is an error to echo to the user
-		if [ $? -ne 0 ] ; then
-			"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
-		fi
-	fi
-
-	eend $? "${svc_name} config check failed"
-}
-
-# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
-
diff --git a/dev-db/mysql-init-scripts/files/init.d-s6-2.2 b/dev-db/mysql-init-scripts/files/init.d-s6-2.2
deleted file mode 100644
index 3fa54e949c91..000000000000
--- a/dev-db/mysql-init-scripts/files/init.d-s6-2.2
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net.lo
-	# localmount needed for $basedir
-	need localmount s6-svscan
-}
-
-get_config() {
-	my_print_defaults --defaults-file="$1" mysqld server mariadb |
-	sed -n -e "s/^--$2=//p"
-}
-
-mysql_svcname() {
-	local ebextra=
-	case "${svc_name}" in
-		mysql*) ;;
-		*) ebextra=" (mysql)" ;;
-	esac
-	echo "${svc_name}${ebextra}"
-}
-
-stringContain() { [ -z "${2##*$1*}" ] && [ -z "$1" -o -n "$2" ]; }
-
-bootstrap_galera() {
-	MY_ARGS="--wsrep-new-cluster ${MY_ARGS}"
-	mark_service_starting
-	if start_pre && start ; then
-		mark_service_started
-		return 0
-	else
-		mark_service_stopped
-		return 1
-	fi
-}
-
-
-extra_commands="checkconfig"
-extra_stopped_commands="bootstrap_galera"
-
-description_checkconfig="Verify the server's configuration"
-description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
-supervisor=s6
-name=$(mysql_svcname)
-s6_service_timeout_stop="$((1000*${STOP_TIMEOUT:-120}))"
-#s6_svwait_options_start="-U -t $((1000*${STARTUP_EARLY_TIMEOUT:-1000}))"
-svc_name=${RC_SVCNAME%-s6}
-s6_service_path=/var/svc.d/${svc_name}
-
-start_pre() {
-	# Check the config or die
-	if [ ${RC_CMD} != "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	MY_CNF="${MY_CNF:-/etc/${svc_name}/my.cnf}"
-
-	if [ ! -r "${MY_CNF}" ] ; then
-		eerror "Cannot read the configuration file \`${MY_CNF}'"
-		return 1
-	fi
-
-	# tail -n1 is critical as these we only want the last instance of the option
-	local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
-	local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
-	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
-	local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
-	local wsrep="$(get_config "${MY_CNF}" 'wsrep[_-]on' | tail -n1 | awk '{print tolower($0)}')"
-	local wsrep_new=$(get_config "${MY_CNF}" 'wsrep-new-cluster' | tail -n1)
-
-	if [ -n "${chroot}" ] ; then
-		socket="${chroot}/${socket}"
-		pidfile="${chroot}/${pidfile}"
-	fi
-
-	# Galera: Only check datadir if not starting a new cluster and galera is enabled
-	# wsrep_on is not on or wsrep-new-cluster exists in the config or MY_ARGS
-	[ "${wsrep}" = "1" ] && wsrep="on"
-	if [ "${wsrep}" != "on" ] || [ -n "${wsrep_new}" ] || stringContain 'wsrep-new-cluster' "${MY_ARGS}" ; then
-
-		local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
-		if [ ! -d "${datadir}" ] ; then
-			eerror "MySQL datadir \`${datadir}' is empty or invalid"
-			eerror "Please check your config file \`${MY_CNF}'"
-			return 1
-		fi
-
-		if [ ! -d "${datadir}"/mysql ] ; then
-			# find which package is installed to report an error
-			local EROOT=$(portageq envvar EROOT)
-			local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
-			if [ -z ${DBPKG_P} ] ; then
-				eerror "You don't appear to have a server package installed yet."
-			else
-				eerror "You don't appear to have the mysql database installed yet."
-				eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
-			fi
-			return 1
-		fi
-	fi
-
-	local piddir="${pidfile%/*}"
-	checkpath -d --owner mysql:mysql --mode 0755 "$piddir"
-	rc=$?
-	if [ $rc -ne 0 ]; then
-		eerror "Directory $piddir for pidfile does not exist and cannot be created"
-		return 1
-	fi
-
-	# Prepare env files to source
-	mkdir -p "/var/svc.d/${svc_name}"
-	echo "MY_CNF=\"${MY_CNF}\"" > "/var/svc.d/${svc_name}/env"
-	echo "MY_ARGS=\"${MY_ARGS}\"" >> "/var/svc.d/${svc_name}/env"
-	echo "basedir=\"${basedir}\"" >> "/var/svc.d/${svc_name}/env"
-	mkdir -p "/var/svc.d/${svc_name}/log"
-	echo "SVCNAME=\"${svc_name}\"" > "/var/svc.d/${svc_name}/log/env"
-	echo "S6_LOG_OPTIONS=\"${S6_LOG_OPTIONS}\"" > "/var/svc.d/${svc_name}/log/env"
-}
-
-start_post() {
-	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
-	local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
-	local startup_timeout=${STARTUP_TIMEOUT:-900}
-
-	if [ -n "${chroot}" ] ; then
-		socket="${chroot}/${socket}"
-	fi
-	ewaitfile ${startup_timeout} "${socket}"
-}
-
-checkconfig() {
-	local my_cnf="${MY_CNF:-/etc/${svc_name}/my.cnf}"
-	local basedir=$(get_config "${my_cnf}" basedir | tail -n1)
-	local svc_name=$(mysql_svcname)
-	ebegin "Checking mysqld configuration for ${svc_name}"
-
-	if [ ${RC_CMD} = "checkconfig" ] ; then
-		# We are calling checkconfig specifically.  Print warnings regardless.
-		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
-	else
-		# Suppress output to check the return value
-		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null 2>&1
-
-		# If the above command does not return 0,
-		# then there is an error to echo to the user
-		if [ $? -ne 0 ] ; then
-			"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
-		fi
-	fi
-
-	eend $? "${svc_name} config check failed"
-}
-
-stop_pre() {
-	if [ ${RC_CMD} = "restart" ] ; then
-		checkconfig || return 1
-	fi
-}
-
-# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
-
diff --git a/dev-db/mysql-init-scripts/files/init.d-supervise b/dev-db/mysql-init-scripts/files/init.d-supervise
deleted file mode 100644
index 5341a6a18d64..000000000000
--- a/dev-db/mysql-init-scripts/files/init.d-supervise
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_stopped_commands="boostrap_galera"
-
-description_checkconfig="Verify the server's configuration"
-description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
-
-depend() {
-	use net.lo
-	# localmount needed for $basedir
-	need localmount
-}
-
-get_config() {
-	my_print_defaults --defaults-file="$1" mysqld server mariadb |
-	sed -n -e "s/^--$2=//p"
-}
-
-mysql_svcname() {
-	local ebextra=
-	case "${SVCNAME}" in
-		mysql*) ;;
-		*) ebextra=" (mysql)" ;;
-	esac
-	echo "${SVCNAME}${ebextra}"
-}
-
-stringContain() { [ -z "${2##*$1*}" ] && [ -z "$1" -o -n "$2" ]; }
-
-bootstrap_galera() {
-	MY_ARGS="--wsrep-new-cluster ${MY_ARGS}"
-	mark_service_starting
-	if start ; then
-		mark_service_started
-		return 0
-	else
-		mark_service_stopped
-		return 1
-	fi
-}
-
-start() {
-	# Check for old conf.d variables that mean migration was not yet done.
-	set | egrep -sq '^(mysql_slot_|MYSQL_BLOG_PID_FILE|STOPTIMEOUT)'
-	rc=$?
-	# Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable.
-	# It does have a use in testing, as it is possible to build a config file
-	# that works with both the old and new init scripts simulateously.
-	if [ "${rc}" = 0 -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then
-		eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp."
-		eerror "Not proceeding because it may be dangerous."
-		return 1
-	fi
-
-	# Check the config or die
-	if [ ${RC_CMD} != "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	# Now we can startup
-	ebegin "Starting $(mysql_svcname)"
-
-	MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
-
-	if [ ! -r "${MY_CNF}" ] ; then
-		eerror "Cannot read the configuration file \`${MY_CNF}'"
-		return 1
-	fi
-
-	# tail -n1 is critical as these we only want the last instance of the option
-	local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
-	local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
-	local socket=$(get_config "${MY_CNF}" socket | tail -n1)
-	local chroot=$(get_config "${MY_CNF}" chroot | tail -n1)
-	local wsrep="$(get_config "${MY_CNF}" 'wsrep[_-]on' | tail -n1 | awk '{print tolower($0)}')"
-	local wsrep_new=$(get_config "${MY_CNF}" 'wsrep-new-cluster' | tail -n1)
-
-	if [ -n "${chroot}" ] ; then
-		socket="${chroot}/${socket}"
-		pidfile="${chroot}/${pidfile}"
-	fi
-
-	# Galera: Only check datadir if not starting a new cluster and galera is enabled
-	# wsrep_on is not on or wsrep-new-cluster exists in the config or MY_ARGS
-	[ "${wsrep}" = "1" ] && wsrep="on"
-	if [ "${wsrep}" != "on" ] || [ -n "${wsrep_new}" ] || stringContain 'wsrep-new-cluster' "${MY_ARGS}" ; then
-
-		local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
-		if [ ! -d "${datadir}" ] ; then
-			eerror "MySQL datadir \`${datadir}' is empty or invalid"
-			eerror "Please check your config file \`${MY_CNF}'"
-			return 1
-		fi
-
-		if [ ! -d "${datadir}"/mysql ] ; then
-			# find which package is installed to report an error
-			local EROOT=$(portageq envvar EROOT)
-			local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
-			if [ -z ${DBPKG_P} ] ; then
-				eerror "You don't appear to have a server package installed yet."
-			else
-				eerror "You don't appear to have the mysql database installed yet."
-				eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
-			fi
-			return 1
-		fi
-	fi
-
-	local piddir="${pidfile%/*}"
-	checkpath -d --owner mysql:mysql --mode 0755 "$piddir"
-	rc=$?
-	if [ $rc -ne 0 ]; then
-		eerror "Directory $piddir for pidfile does not exist and cannot be created"
-		return 1
-	fi
-
-	local startup_timeout=${STARTUP_TIMEOUT:-900}
-#	local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
-	local tmpnice="${NICE:+"--nicelevel "}${NICE}"
-	local tmpionice="${IONICE:+"--ionice "}${IONICE}"
-	supervise-daemon \
-		${DEBUG:+"--verbose"} \
-		--pidfile "/run/${SVCNAME}.pid" \
-		${tmpnice} \
-		${tmpionice} \
-		--start \
-		"${basedir}"/sbin/mysqld \
-		-- --defaults-file="${MY_CNF}" ${MY_ARGS}
-	local ret=$?
-	if [ ${ret} -ne 0 ] ; then
-		eend ${ret}
-		return ${ret}
-	fi
-
-	ewaitfile ${startup_timeout} "${socket}"
-	eend $? || return 1
-}
-
-stop() {
-	if [ ${RC_CMD} = "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	ebegin "Stopping $(mysql_svcname)"
-
-	supervise-daemon \
-		${DEBUG:+"--verbose"} \
-		--stop \
-		--pidfile "/run/${SVCNAME}.pid"
-	eend $?
-}
-
-checkconfig() {
-	local my_cnf="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
-	local basedir=$(get_config "${my_cnf}" basedir | tail -n1)
-	local svc_name=$(mysql_svcname)
-	ebegin "Checking mysqld configuration for ${svc_name}"
-
-	if [ ${RC_CMD} = "checkconfig" ] ; then
-		# We are calling checkconfig specifically.  Print warnings regardless.
-		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
-	else
-		# Suppress output to check the return value
-		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null 2>&1
-
-		# If the above command does not return 0,
-		# then there is an error to echo to the user
-		if [ $? -ne 0 ] ; then
-			"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
-		fi
-	fi
-
-	eend $? "${svc_name} config check failed"
-}
-
-# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
-
diff --git a/dev-db/mysql-init-scripts/files/logrotate.mysql b/dev-db/mysql-init-scripts/files/logrotate.mysql
deleted file mode 100644
index afb20c66d479..000000000000
--- a/dev-db/mysql-init-scripts/files/logrotate.mysql
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-/var/log/mysql/mysql.err /var/log/mysql/mysql.log /var/log/mysql/mysqld.err {
-monthly
-create 660 mysql mysql
-notifempty
-size 5M
-sharedscripts
-missingok
-postrotate
-[ -f /var/run/mysqld/mysqld.pid ] && /bin/kill -HUP `cat /var/run/mysqld/mysqld.pid`
-endscript
-}
diff --git a/dev-db/mysql-init-scripts/files/logrotate.mysql-2.3 b/dev-db/mysql-init-scripts/files/logrotate.mysql-2.3
index 6a3b9eeb2ca9..6573671b2c7b 100644
--- a/dev-db/mysql-init-scripts/files/logrotate.mysql-2.3
+++ b/dev-db/mysql-init-scripts/files/logrotate.mysql-2.3
@@ -9,6 +9,9 @@ size 5M
 sharedscripts
 missingok
 postrotate
-  /bin/kill -HUP $(cat $(my_print_defaults server mysqld mariadb | grep 'pid[_-]file' | cut -d = -f 2))
+	pidfile=$(my_print_defaults server mysqld mariadb | grep 'pid[_-]file' | tail -n 1 | cut -d = -f 2)
+	if [ -s "${pidfile}" ] ; then
+		/bin/kill -HUP $(cat "${pidfile}")
+	fi
 endscript
 }
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r3.ebuild
deleted file mode 100644
index d0a1278895f8..000000000000
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd s6 tmpfiles
-
-DESCRIPTION="Gentoo MySQL init scripts."
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-# This _will_ break with MySQL 5.0, 4.x, 3.x
-# It also NEEDS openrc for the save_options/get_options builtins.
-# The s6 support was added after openrc 0.16.2
-RDEPEND="
-	!<dev-db/mysql-5.1
-	!<sys-apps/openrc-0.16.2
-	"
-# Need to set S due to PMS saying we need it existing, but no SRC_URI
-S=${WORKDIR}
-
-src_install() {
-	newconfd "${FILESDIR}/conf.d-2.0" "mysql"
-
-	# s6 init scripts
-	if use amd64 || use x86 ; then
-		newconfd "${FILESDIR}/conf.d-2.0" "mysql-s6"
-		newinitd "${FILESDIR}/init.d-s6-2.2" "mysql-s6"
-		s6_install_service mysql "${FILESDIR}/run-s6"
-		s6_install_service mysql/log "${FILESDIR}/log-s6"
-	fi
-
-	newinitd "${FILESDIR}/init.d-2.2" "mysql"
-	newinitd "${FILESDIR}/init.d-supervise" "mysql-supervise"
-
-	# systemd unit installation
-	exeinto /usr/libexec
-	doexe "${FILESDIR}"/mysqld-wait-ready
-	systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service"
-	systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service"
-	dotmpfiles "${FILESDIR}/mysql.conf"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate.mysql" "mysql"
-}
-
-pkg_postinst() {
-	tmpfiles_process mysql.conf
-	if use amd64 || use x86 ; then
-		elog ""
-		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
-		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
-	fi
-
-	elog ""
-	elog "Starting with version 10.1.8, MariaDB includes an improved systemd unit named mariadb.service"
-	elog "You should prefer that unit over this package's mysqld.service."
-	einfo ""
-}
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r4.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r4.ebuild
deleted file mode 100644
index 2028d860d3d2..000000000000
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd s6 tmpfiles
-
-DESCRIPTION="Gentoo MySQL init scripts."
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-# This _will_ break with MySQL 5.0, 4.x, 3.x
-# It also NEEDS openrc for the save_options/get_options builtins.
-# The s6 support was added after openrc 0.16.2
-# mysql-connector-c needed for my_print_defaults
-RDEPEND="
-	!<dev-db/mysql-5.1
-	!<sys-apps/openrc-0.16.2
-	dev-db/mysql-connector-c
-	"
-# Need to set S due to PMS saying we need it existing, but no SRC_URI
-S=${WORKDIR}
-
-src_install() {
-	newconfd "${FILESDIR}/conf.d-2.0" "mysql"
-
-	# s6 init scripts
-	if use amd64 || use x86 ; then
-		newconfd "${FILESDIR}/conf.d-2.0" "mysql-s6"
-		newinitd "${FILESDIR}/init.d-s6-2.2" "mysql-s6"
-		s6_install_service mysql "${FILESDIR}/run-s6"
-		s6_install_service mysql/log "${FILESDIR}/log-s6"
-	fi
-
-	newinitd "${FILESDIR}/init.d-2.2" "mysql"
-	newinitd "${FILESDIR}/init.d-supervise" "mysql-supervise"
-
-	# systemd unit installation
-	exeinto /usr/libexec
-	doexe "${FILESDIR}"/mysqld-wait-ready
-	systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service"
-	systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service"
-	dotmpfiles "${FILESDIR}/mysql.conf"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate.mysql" "mysql"
-}
-
-pkg_postinst() {
-	tmpfiles_process mysql.conf
-	if use amd64 || use x86 ; then
-		elog ""
-		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
-		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
-	fi
-
-	elog ""
-	elog "Starting with version 10.1.8, MariaDB includes an improved systemd unit named mariadb.service"
-	elog "You should prefer that unit over this package's mysqld.service."
-	einfo ""
-}
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r1.ebuild
deleted file mode 100644
index b3283cf3ba24..000000000000
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd s6 tmpfiles
-
-DESCRIPTION="Gentoo MySQL init scripts."
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-# This _will_ break with MySQL 5.0, 4.x, 3.x
-# It also NEEDS openrc for the save_options/get_options builtins.
-# The s6 support was added after openrc 0.16.2
-# mysql-connector-c needed for my_print_defaults
-RDEPEND="
-	!<dev-db/mysql-5.1
-	!<sys-apps/openrc-0.16.2
-	dev-db/mysql-connector-c
-	"
-# Need to set S due to PMS saying we need it existing, but no SRC_URI
-S=${WORKDIR}
-
-src_install() {
-	newconfd "${FILESDIR}/conf.d-2.0" "mysql"
-
-	# s6 init scripts
-	if use amd64 || use x86 ; then
-		newconfd "${FILESDIR}/conf.d-2.0" "mysql-s6"
-		newinitd "${FILESDIR}/init.d-s6-2.3" "mysql-s6"
-		s6_install_service mysql "${FILESDIR}/run-s6"
-		s6_install_service mysql/log "${FILESDIR}/log-s6"
-	fi
-
-	newinitd "${FILESDIR}/init.d-2.3" "mysql"
-	newinitd "${FILESDIR}/init.d-supervise-2.3" "mysql-supervise"
-
-	# systemd unit installation
-	exeinto /usr/libexec
-	doexe "${FILESDIR}"/mysqld-wait-ready
-	systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service"
-	systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service"
-	dotmpfiles "${FILESDIR}/mysql.conf"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate.mysql-2.3" "mysql"
-}
-
-pkg_postinst() {
-	tmpfiles_process mysql.conf
-	if use amd64 || use x86 ; then
-		elog ""
-		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
-		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
-	fi
-
-	elog ""
-	elog "Starting with version 10.1.8, MariaDB includes an improved systemd unit named mariadb.service"
-	elog "You should prefer that unit over this package's mysqld.service."
-	einfo ""
-}
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
new file mode 100644
index 000000000000..6d9b1ff0c99d
--- /dev/null
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd s6 tmpfiles
+
+DESCRIPTION="Gentoo MySQL init scripts."
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+# This _will_ break with MySQL 5.0, 4.x, 3.x
+# It also NEEDS openrc for the save_options/get_options builtins.
+# The s6 support was added after openrc 0.16.2
+# mysql-connector-c needed for my_print_defaults
+RDEPEND="
+	!<dev-db/mysql-5.1
+	!<sys-apps/openrc-0.16.2
+	dev-db/mysql-connector-c
+	!prefix? (
+		acct-group/mysql acct-user/mysql
+	)
+	"
+# Need to set S due to PMS saying we need it existing, but no SRC_URI
+S=${WORKDIR}
+
+src_install() {
+	newconfd "${FILESDIR}/conf.d-2.0" "mysql"
+
+	# s6 init scripts
+	if use amd64 || use x86 ; then
+		newconfd "${FILESDIR}/conf.d-2.0" "mysql-s6"
+		newinitd "${FILESDIR}/init.d-s6-2.3" "mysql-s6"
+		s6_install_service mysql "${FILESDIR}/run-s6"
+		s6_install_service mysql/log "${FILESDIR}/log-s6"
+	fi
+
+	newinitd "${FILESDIR}/init.d-2.3" "mysql"
+	newinitd "${FILESDIR}/init.d-supervise-2.3" "mysql-supervise"
+
+	# systemd unit installation
+	exeinto /usr/libexec
+	doexe "${FILESDIR}"/mysqld-wait-ready
+	systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service"
+	systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service"
+	dotmpfiles "${FILESDIR}/mysql.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate.mysql-2.3" "mysql"
+}
+
+pkg_postinst() {
+	tmpfiles_process mysql.conf
+	if use amd64 || use x86 ; then
+		elog ""
+		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
+		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
+	fi
+
+	elog ""
+	elog "Starting with version 10.1.8, MariaDB includes an improved systemd unit named mariadb.service"
+	elog "You should prefer that unit over this package's mysqld.service."
+	einfo ""
+}
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3.ebuild
deleted file mode 100644
index 303b86680e0f..000000000000
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd s6 tmpfiles
-
-DESCRIPTION="Gentoo MySQL init scripts."
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-# This _will_ break with MySQL 5.0, 4.x, 3.x
-# It also NEEDS openrc for the save_options/get_options builtins.
-# The s6 support was added after openrc 0.16.2
-# mysql-connector-c needed for my_print_defaults
-RDEPEND="
-	!<dev-db/mysql-5.1
-	!<sys-apps/openrc-0.16.2
-	dev-db/mysql-connector-c
-	"
-# Need to set S due to PMS saying we need it existing, but no SRC_URI
-S=${WORKDIR}
-
-src_install() {
-	newconfd "${FILESDIR}/conf.d-2.0" "mysql"
-
-	# s6 init scripts
-	if use amd64 || use x86 ; then
-		newconfd "${FILESDIR}/conf.d-2.0" "mysql-s6"
-		newinitd "${FILESDIR}/init.d-s6-2.3" "mysql-s6"
-		s6_install_service mysql "${FILESDIR}/run-s6"
-		s6_install_service mysql/log "${FILESDIR}/log-s6"
-	fi
-
-	newinitd "${FILESDIR}/init.d-2.3" "mysql"
-	newinitd "${FILESDIR}/init.d-supervise-2.3" "mysql-supervise"
-
-	# systemd unit installation
-	exeinto /usr/libexec
-	doexe "${FILESDIR}"/mysqld-wait-ready
-	systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service"
-	systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service"
-	dotmpfiles "${FILESDIR}/mysql.conf"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate.mysql-2.3" "mysql"
-}
-
-pkg_postinst() {
-	tmpfiles_process mysql.conf
-	if use amd64 || use x86 ; then
-		elog ""
-		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
-		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
-	fi
-
-	elog ""
-	elog "Starting with version 10.1.8, MariaDB includes an improved systemd unit named mariadb.service"
-	elog "You should prefer that unit over this package's mysqld.service."
-	einfo ""
-}
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index f9d3951bcb9f..4bc29699cba4 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,41 +1,19 @@
-AUX my.cnf-5.5 4733 BLAKE2B 89af4a9dbd4828a40aa91b294cef15ec8afbcb614ece424614d0bd2d047273906ccb8e4518a48d530f55e898b6c75403d61aa7a733d5bf50f0f0640c55471505 SHA512 6a5d183f1aeb30d9096838ac010c8f2dc004448924b3606bd03c1a5e0336a20fe5fcef1d2cd772977a167268fcff51a4b663f1f73a37d3066983621a8ca6c004
 AUX my.cnf-5.6 4504 BLAKE2B 5d904925d12ad4c3826426e7e7790800028c9adf9b42692adf3260cd8dae910338683fbcd3e5148f113c1ab27481e5ffe61871716a069c50f295cf756b3e685c SHA512 866aa700460c2962bad6294b271efad09ef285dd428ab01551078be9972d2f961fbdf56aef7927439784711022e92a96f2eba30cd297f056f6562e8817c89aae
 AUX my.cnf-5.7 138 BLAKE2B 71862b4b77334ab74002237453d2c7f6b51cd1ae57dba3b00b19e216d3f10034796de9aa618efb11482cef78b7c7e50393b5f665810d03321b5ca770ac8a6144 SHA512 1d7250689005c948f4a849959baf33f5f0fda099f230611651919ed053fb563daa19d996b7ca6714e224174172fb504f4d7d08e9d449a7e1203e32cf3fdec782
 AUX my.cnf-8.0.distro-client 749 BLAKE2B b01b39c85430714b5a4bfb9923c9ed1df99cdcef0583b25f28c2ebeee264732f4402198b1918e5ec5b4b1091dbda2d321baf31fe87eae00792b20042260969b3 SHA512 62aa589833126c2b78528e103f2de11ba0e339615cb00170a0f9f53bbb123a4bf99f2041819440297ab6cc34cf57333488e6ae12082fa5dcbe1b0ddef5f6108d
 AUX my.cnf-8.0.distro-server 1125 BLAKE2B f4d6941aad1fc29e81e6c805ac42f4c8d3c7bc250990a9c432800dbe25b5c31be08d8e3895666b57f21606ffb69e704c57ed2692fd94696b9d325a4442596587 SHA512 82d35b7bc944e5690e1f2670a3d5674845610c2d11d6d8b1c5784ccb3877c6298de70eced3d7c497c0bcaecfa9e339ac43ce0534a97e7d976e950bb1a7f5c75d
 AUX my.cnf.distro-client 637 BLAKE2B b0812e0e03aa9a3b2e55e08b933a0b41b6afd95ded61f4d9d7c34a2d3810ec38520abd0d89e1c6565f61d4cd8a36d653f9f3199b3dd6a91345cdb5ff962685d8 SHA512 74bd1d9a58075d0a6195be1f94db310bcbe8da532b03844e6fa1ff84676e84843fc9adf9aed06b7e4db53c9aa24ef0885d96de0ccfe4c6ad98afe4c145d43f4f
 AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1fd14b4c2dea398814beda3c09aabea04dd3a9e145464524c629e7e69dc257d1245e0a46dd8584b7f685172 SHA512 cf172edc23d3dda49c21af6b8adef8aa13694d8ceecddf1d612d4ae34d00ba53c51ae4ae7ca4d11083eeacb5d862f59a855a9d80e9e448ab8bbf17f42aac2650
-DIST mysql-5.5.61.tar.gz 21027098 BLAKE2B b7589f632a211349fc34cec94e333b878e07113969bf5cf6f78cd37435d95b15c03eaf188ed09768033b182de125c9f018a5fe902094f17ab891f94cab9de6dd SHA512 978384915c145ec8f0d85deb764154d8d4a9764f2d342928bda6ad43a00bc110aa888895416d2ba5684a4432e433037990dd3fe8c5caf024faa487bc2e153f49
-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-5.6.44.tar.gz 32531507 BLAKE2B 28fbf49f699eb9f43223ffa186671b119d16016274cc7192db232b85c58123a61154e37193b9b7145c6a650b80b5f6cf838529bc2bc5ea9c78c0dbc39de834d3 SHA512 65ace1c803773ca6c8759d171c09bc93c7d61b8e3208ac9905f82e99087622c9dcca602d2da217741dc62fc6eabe9108ebc7f31facd26705072eae65fcc37077
 DIST mysql-5.6.45.tar.gz 32525559 BLAKE2B 3c629aed1de808acdea6654c7413e6851507c9c5be939ca4b4f5e2796da317e9b518a749bfc03d2b0ef05bd604b39f72e24b751076b9f206b462d21fa5db4f50 SHA512 f9d8bb72e96cc83f1064fe7df2e5fe8317ca9d44c4e776cf7827a61292fbcfccec716806c80d565958383d78fef93a19d61c726687b57680d5f93299291ff168
-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-boost-5.7.26.tar.gz 51098338 BLAKE2B 1263cd75814a7293b26b0f44fd2b7d20d983f3c6a62725df9515ecac2ef252f6644810cb4bf0d6f36b98e55317f1c67ea7541228cb38d896dfedc476a5755f26 SHA512 a5f9871dc5a8e5fffc1467c3dd542533a63fe553c029120475f8fd5530d884c76ab0c33ad260daf317faf318ccef01464f6ac2dc3468efceb6bf2b6c06c54cfd
 DIST mysql-boost-5.7.27.tar.gz 51436383 BLAKE2B 6db64ab5fa659aae9baa3725a0de9465e48c37618ffd69f34809880c06a00ce55dce77f507810c6fa52d86901facfa42d3d1bd8db1914a779fbc88a69be82497 SHA512 573f4555f3d62bcd3dc2228bcfba023518d462bb6689114a3505ccf7c7c3061d2775a8e7a37ec3c8b9dea6e8fbc56ba599610f237abc38cedff58e75799bdc52
 DIST mysql-boost-8.0.17.tar.gz 189322239 BLAKE2B f9f46e5fdc3e9869b203626bc09edfbcdbabcd68eba43f9c6a33b9a52cffb3a32f39704c6d22a66899aac16fa2efb271c5dc7af7522768b45542ac8dc615cd8a SHA512 a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d
-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-20190303-1852Z.tar.bz2 331026 BLAKE2B ee033fce8f1b6a58f1f690710fb9709a585cd45564b35e71d4f840a3a7f83a5d80f53c24236c9976319abd89c68c62c74a7111517f1b9721d3cbd0898bf0dd8d SHA512 30361a0b848ed27f9170b1116458a9bc13b1b585c5fa1933c99927541c31e9bda4008b0563f2fc7db286f998089ebebf1fe3f18fce7a45e62acbf769ac62d8c1
-DIST mysql-extras-20190524-1046Z.tar.bz2 331517 BLAKE2B e6d48e34b0a7f7176de8740971f8151923beb20a520df73c22d44005059ef6779ad5aa8437e30018b9bbfe1d6d69043cbd8522b6f3662746205193b44372a6b3 SHA512 2f7238578f3aabd1701e1c54da36bc0100c9479871e3c77b22131fd6cde865037307f93b3343ea5e52251c45ef35cdc52cc2dec5a26d44fd41700598282c5c2c
-DIST mysql-extras-20190604-1109Z.tar.bz2 331780 BLAKE2B 48b6f6ff36818ba3d1d9c0580b0ff5e2343d92a42ee78b6804841d7c4f511adcdc3d5cd0590f769f308ca52e271c07cb34219450f9b86e918ddcd0a4b956e18e SHA512 19a85ba5a4c2de1688f39feb6ce1c1802e4d886436dc02afe1ba508b91365a0ac67d668cf7126588145ee55641992ad71b0d094246a94c89065876b9bb897425
 DIST mysql-extras-20190817-0024Z.tar.bz2 337793 BLAKE2B dfd51a708654aff5bdbbaf2acad7ef966869a8e3adcba544ee15f217d2ba942827445841e73981bccc6c1f145b6225bfa7245114219f0cf52f0dfb85494a6830 SHA512 c2ff81be1c55636f0a2700033af030149f312f0383217054a4b8c65aef174626299fcb4539eaae967ea7d096a5bb09f5b5122dce344b44b0a135d886ba0fdf28
-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 26057 BLAKE2B b6162d04f384dc37aabae472cc3998dea0456d672aa906e778d58637edca29fc11257f1fecbcae36d3c1245467768426284743a2aadaab6723540279c615d11c SHA512 857b83b44f185bb0b811005b0f5ee35eff1a2b4d263b199f8a4955330b7fd73fd2038d565fc6fadd9cc31948f0699db6ebb10e628e93e9b223ab87b5517fe16b
-EBUILD mysql-5.6.44-r1.ebuild 27132 BLAKE2B 6b9c9c6e47a3263e5dc454d486f02fe46fefce8e2e7e20a8ef5476bc6191f1cb57f5928e14ee68b30bed0d73152bdbc03f164ae700e3b76e75bcf6cf289cd7f9 SHA512 f9ca576c2076b34c6548543551a8ef9dee5aacc175cd4928a8ec9dc8180993d68c45824ea72628825a9e463d9d8d00c65482545435ae9f26ff7fbbf355fc9e98
-EBUILD mysql-5.6.45-r1.ebuild 27193 BLAKE2B c25435de96c371988464eac6407419dcd608812c5957569cff72e5c0c205584a0c3d8b2f4a8ad82b716e307dac39c9f3db93f8f3e2109eda82e834a593ff2ca4 SHA512 8bb737d1fb8dc00d732940983ccec3d89d4b0580f5e1ca829ff40467830203a060aa16afa4f10db725659f32e1d2d3724b41e3c41723d82e01d98fb49f4ccc86
-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 30465 BLAKE2B ec639482f3726ea18994c0e3b88ae991d16eda30c5acf7f6abee4f4301d0ada726494e4ebd2f045291faf967940adc8ef1172a48fb00e10ff69a83f837ac3e73 SHA512 6d45fd341a6f0e71d3546134d4bcfd745c6b488b28e848eb2ee1aaebb96745c797da452250a71c2eba87452e61f5ba017f80b88f4e16e23d076be4a70c6936ed
-EBUILD mysql-5.7.26.ebuild 31719 BLAKE2B c610c458def0a3ffd1c7b7e4cb2375eeeb50496a38f456916f4c8d95b30b45b8011d6d1806487a5e824bd2ed40d284650bac20e5a4756a569ab71a66bcba6a68 SHA512 4579ab74217d9fb01af95afe9fa725676bab729e772494e45f6efb63f08c4fcf7250f22bb3a680db04ffb81959dd5337ff37d1f7f2d18fa2a0ed24ebf130641e
-EBUILD mysql-5.7.27.ebuild 31857 BLAKE2B 5ddae4d74eedc28ebcddc6b293261f7fe33a03c446336a07b88a9d8088dc68f2b149405388869267db1c4f2525618ed4f61e3f15033b09a41201349ad4535549 SHA512 6c2b59adabb4f946bf8661a167059730b59f116935324c7ae7ca6b84c32a21be76472bf7055d296211bffddd02d42b226a3af59baf68465d7b22fc425665ac8c
-EBUILD mysql-8.0.17.ebuild 36377 BLAKE2B 0aff546e2e9d25c7b37d1a61d3843592cfef9fbf1d8c6e6fcea52f45a6038fdaa50d7ae22b11246a62622961a87ec20ea1283cb9e0067ee6a0c08b1492ba0f22 SHA512 af768c840fcee4eab5278bd5d7e6401f871ad9defc7fa2b461fc83ea8da4a58799a3822f4d149e96b564aeb7c4e6d61fb1541878332415d39d5892fa916d52d0
-MISC metadata.xml 1599 BLAKE2B cad6c530634fbf5923276e0b6e10e54aafca0afb7c4cdbb99ee1e3307e6b0004959eb4c8a35e5542ede6fd7d0c181933293acac0ec562988c3f8c8789546671c SHA512 cd18e4f2569e944648d23a21acf0b89c0c84e2b30a9ca6ad9d2d4f8b38b04fd29cecab598e2a836b99822c0356052fa8ada44c10241fcc03fedc5f0ce21cc36f
+DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
+EBUILD mysql-5.6.44-r1.ebuild 27130 BLAKE2B d42d26aa3282093b81c795f1ef909487831cede065a996d814850fb4c638c848d278ba0ef0d8275a2ef1c91c5832977d7c2aa3085f324ddb03a2ac25b1607916 SHA512 16e437ee7e8497b84dabf1698f701ff46c096530acfa5d211c9ca96fa538b0014f8571e2fce64182c2d497155383353bdc38a69a68dd7d333c96e9175cea804a
+EBUILD mysql-5.6.45-r2.ebuild 27084 BLAKE2B 41a60964a02aed1f7e63bfac0f162cb53a6afcb3cb9bd8813930449798ef799647a540edd201f20f4ceecef4548073dd47395bac2a5c81fa8db96b15d08f7837 SHA512 8546965f0a26fe6349322b90b7f83e27815e5da9dcd78ab290e70293e7c52cc579dfe6830e3f65f5f2b944cd7ae122a87ffbe3b3dec687d3a4410bbb0be423c5
+EBUILD mysql-5.7.26-r1.ebuild 31717 BLAKE2B 3085f70b4a76baaf7f94ac8fe5e37b9c3470b6537a88a626236232dec1c2cf234f4d25f83ab7bfd92fba1881b4080039c0259c4485259be472c8833cfcb71b6d SHA512 6663432102f90d9d2cbda3937c1a5e1dc9a01e4d6599bc517e0303e73beda60766be930cd9695fb4d0a65ea6e746c27f5449eda2e64e0268e670d0f5660040fb
+EBUILD mysql-5.7.27-r1.ebuild 31748 BLAKE2B 230fa18f6fc87a0e8d9528a08dd91707cfbedb308c9586cb84eaf185a027a7e875ec2af35565c804ae5156cc50cc08b3439e6ffc353ba95c5cef7e05ddbe4f7e SHA512 0da16aeb3fd930b128dd938b898804ba2e41f7f55fca167ed046af08e9bdb2ccbf0324ea06d11bc236105ca3b94181d8110449ff293935f907d823741ed78c58
+EBUILD mysql-8.0.17.ebuild 36451 BLAKE2B 9e81d30e5f0569790047ba7484ebe47cd70bc709ef4eca59caa5fdd2aeed4c4fddada4cfa1bbe5f298d759fc30e496d9fbe5ece7925d08eb8153cb507ada30d6 SHA512 ceeefc52d0a62cba8af57fed0a137e0317c4db39f237d31a9991611ef84ddade142287194d84e3f1dcba4ebd5c1a63c85821a2bfc2642adc0f0ebd45ed6270d2
+MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7
diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5
deleted file mode 100644
index 83b9aaab2ecc..000000000000
--- a/dev-db/mysql/files/my.cnf-5.5
+++ /dev/null
@@ -1,147 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password					= your_password
-port						= 3306
-socket						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log						= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server		= utf8
-user 						= mysql
-port 						= 3306
-socket 						= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file 					= @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error 					= @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir 					= @GENTOO_PORTAGE_EPREFIX@/usr
-datadir 					= @DATADIR@
-skip-external-locking
-key_buffer_size					= 16M
-max_allowed_packet 			= 1M
-table_open_cache 			= 64
-sort_buffer_size 			= 512K
-net_buffer_length 			= 8K
-read_buffer_size 			= 256K
-read_rnd_buffer_size 		= 512K
-myisam_sort_buffer_size 	= 8M
-lc_messages_dir			= @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
-#Set this to your desired error message language
-lc_messages			= en_US
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address				= 127.0.0.1
-
-log-bin
-server-id 					= 1
-
-# point the following paths to different dedicated disks
-tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update 				= @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log						= @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug						= d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
-# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir		= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir	= @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-# Uncomment this to get FEDERATED engine support
-#plugin-load=federated=ha_federated.so
-#loose-federated
-
-[mysqldump]
-quick
-max_allowed_packet 			= 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer_size				= 20M
-sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
-
-[myisamchk]
-key_buffer_size				= 20M
-sort_buffer_size 			= 20M
-read_buffer_size			= 2M
-write_buffer_size			= 2M
-
-[mysqlhotcopy]
-interactive-timeout
-
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index e231245763ea..e4197ced880b 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -14,7 +14,6 @@ dev-db/mariadb
   <flag name="cjk">Add CJK support for InnoDB fulltext search using <pkg>app-text/mecab</pkg></flag>
   <flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages (not recommended)</flag>
   <flag name="experimental">Build experimental features aka "rapid" plugins</flag>
-  <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
   <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
   <flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
diff --git a/dev-db/mysql/mysql-5.5.61.ebuild b/dev-db/mysql/mysql-5.5.61.ebuild
deleted file mode 100644
index bba690fe0689..000000000000
--- a/dev-db/mysql/mysql-5.5.61.ebuild
+++ /dev/null
@@ -1,791 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20180804-2323Z"
-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://cdn.mysql.com/Downloads/MySQL-5.5/${P}.tar.gz
-	https://downloads.mysql.com/archives/MySQL-5.5/${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://mysql.com/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2"
-SLOT="0/${SUBSLOT:-0}"
-IUSE="bindist client-libs debug extraengine jemalloc latin1 libressl
-	+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="!bindist? ( bindist ) libressl? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc )
-	static? ( yassl )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~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_mysql_config_cleanup-5.5.patch"
-	"${MY_PATCH_DIR}/02040_all_embedded-library-shared-5.5.10.patch"
-	"${MY_PATCH_DIR}/20001_all_fix-minimal-build-cmake-mysql-5.5.41.patch"
-	"${MY_PATCH_DIR}/20002_all_mysql-va-list.patch"
-	"${MY_PATCH_DIR}/20006_all_cmake_elib-mysql-5.5.53.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.5.38.patch"
-	"${MY_PATCH_DIR}/20018_all_mysql-5.5.60-without-clientlibs-tools.patch"
-	"${MY_PATCH_DIR}/20027_all_mysql-5.5-perl5.26-includes.patch"
-	"${MY_PATCH_DIR}/20030_all_mysql-5.5-fix-client-mysql-type.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=
-	)
-	!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/mariadb !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)
-		# 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 [[ -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
-
-	if use jemalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${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
-
-	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
-
-	cmake-utils_src_prepare
-}
-
-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
-
-	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/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)
-		-DWITH_ZLIB=system
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${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)
-		-DENABLE_DTRACE=$(usex systemtap)
-	)
-	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 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
-
-		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+=(
-			-DINSTALL_SQLBENCHDIR=share/mysql
-			-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
-
-		# 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
-	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 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.5 for now and are believed to be
-	# false positives:
-	#
-	# main.mysql_client_test, main.mysql_client_test_nonblock
-	# main.mysql_client_test_comp:
-	# segfaults at random under Portage only, suspect resource limits.
-
-	local t
-	for t in main.mysql_client_test main.mysql_client_test_nonblock \
-		main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam \
-		main.mysqlhotcopy_archive main.mysqlhotcopy_myisam main.openssl_1 \
-		rpl.rpl_semi_sync_uninstall_plugin ; 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/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 "${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 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 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
-	# 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
-
-	local cmd=( "${EROOT}usr/share/mysql/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/mysql-5.5.62.ebuild b/dev-db/mysql/mysql-5.5.62.ebuild
deleted file mode 100644
index cb229697802e..000000000000
--- a/dev-db/mysql/mysql-5.5.62.ebuild
+++ /dev/null
@@ -1,797 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20180804-2323Z"
-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://cdn.mysql.com/Downloads/MySQL-5.5/${P}.tar.gz
-	https://downloads.mysql.com/archives/MySQL-5.5/${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://mysql.com/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2"
-SLOT="0/${SUBSLOT:-0}"
-IUSE="bindist client-libs debug extraengine jemalloc latin1 libressl
-	+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="!bindist? ( bindist ) libressl? ( test )"
-
-REQUIRED_USE="?? ( tcmalloc jemalloc )
-	static? ( yassl )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~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_mysql_config_cleanup-5.5.patch"
-	"${MY_PATCH_DIR}/02040_all_embedded-library-shared-5.5.10.patch"
-	"${MY_PATCH_DIR}/20001_all_fix-minimal-build-cmake-mysql-5.5.41.patch"
-	"${MY_PATCH_DIR}/20002_all_mysql-va-list.patch"
-	"${MY_PATCH_DIR}/20006_all_cmake_elib-mysql-5.5.53.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.5.38.patch"
-	"${MY_PATCH_DIR}/20018_all_mysql-5.5.60-without-clientlibs-tools.patch"
-	"${MY_PATCH_DIR}/20027_all_mysql-5.5-perl5.26-includes.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=
-	)
-	!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/mariadb !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)
-		# 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 [[ -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
-
-	if use jemalloc; then
-		echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${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
-
-	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
-
-	cmake-utils_src_prepare
-}
-
-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
-
-	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/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)
-		-DWITH_ZLIB=system
-		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${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)
-		-DENABLE_DTRACE=$(usex systemtap)
-	)
-	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 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
-
-		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+=(
-			-DINSTALL_SQLBENCHDIR=share/mysql
-			-DEXTRA_CHARSETS=all
-			-DDISABLE_SHARED=$(usex static YES NO)
-			-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
-		)
-
-	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
-	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 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.5 for now and are believed to be
-	# false positives:
-	#
-	# main.mysql_client_test, main.mysql_client_test_nonblock
-	# main.mysql_client_test_comp:
-	# segfaults at random under Portage only, suspect resource limits.
-
-	local t
-	for t in federated.federated_plugin \
-		main.mysql_client_test main.mysql_client_test_nonblock \
-		main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam \
-		main.mysqlhotcopy_archive main.mysqlhotcopy_myisam main.openssl_1 \
-		rpl.rpl_semi_sync_uninstall_plugin ; 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/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 "${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 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 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
-	# 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
-
-	local cmd=( "${EROOT}usr/share/mysql/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/mysql-5.6.40-r2.ebuild b/dev-db/mysql/mysql-5.6.40-r2.ebuild
deleted file mode 100644
index bd964e87045e..000000000000
--- a/dev-db/mysql/mysql-5.6.40-r2.ebuild
+++ /dev/null
@@ -1,789 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20181111-2314Z"
-
-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] )
-	|| ( >=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
-			-DENABLED_PROFILING=$(usex profiling)
-		)
-
-		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.7 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
-
-	# 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.6.42.ebuild b/dev-db/mysql/mysql-5.6.42.ebuild
deleted file mode 100644
index 1ec7ebd88269..000000000000
--- a/dev-db/mysql/mysql-5.6.42.ebuild
+++ /dev/null
@@ -1,796 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20181111-2314Z"
-
-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
-
-	# 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.6.43.ebuild b/dev-db/mysql/mysql-5.6.43.ebuild
deleted file mode 100644
index 77ee38308273..000000000000
--- a/dev-db/mysql/mysql-5.6.43.ebuild
+++ /dev/null
@@ -1,799 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20190303-1852Z"
-
-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.6.44-r1.ebuild b/dev-db/mysql/mysql-5.6.44-r1.ebuild
index e51ea5affde5..642f7932867e 100644
--- a/dev-db/mysql/mysql-5.6.44-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.44-r1.ebuild
@@ -37,7 +37,7 @@ 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"
+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
diff --git a/dev-db/mysql/mysql-5.6.45-r1.ebuild b/dev-db/mysql/mysql-5.6.45-r1.ebuild
deleted file mode 100644
index dfea0d2a2a47..000000000000
--- a/dev-db/mysql/mysql-5.6.45-r1.ebuild
+++ /dev/null
@@ -1,843 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20190817-0024Z"
-
-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}"/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
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.44-fix-libressl-support.patch
-	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.44-add-openssl-1.1-support.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-2.6.5*: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
-
-	# Don't clash with dev-db/mysql-connector-c
-	rm \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		|| 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
-
-	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
-
-	if [[ -d "${ED%/}/usr/sql-bench" ]] ; then
-		mv "${ED%/}/usr/sql-bench" "${ED%/}/usr/share/mysql/" || 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
-
-	if ! use latin1 ; then
-		for t in \
-			binlog.binlog_mysqlbinlog_filter \
-			binlog.binlog_statement_insert_delayed \
-			funcs_1.is_columns_mysql \
-			funcs_1.is_tables_mysql \
-			funcs_1.is_triggers \
-			main.information_schema \
-			main.mysql_client_test \
-			main.mysqld--help-notwin \
-			perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt \
-		; do
-			_disable_test  "$t" "Requires DEFAULT_CHARSET=latin1 but USE=-latin1 is set"
-		done
-	fi
-
-	if has_version '>=dev-libs/openssl-1.1.0' ; then
-		# Tests are expecting <openssl-1.1 default cipher
-		for t in \
-			main.openssl_1 \
-			main.plugin_auth_sha256_tls \
-			main.ssl \
-			main.ssl_8k_key \
-			main.ssl_ca \
-			main.ssl_cipher\
-			main.ssl_compress \
-			main.ssl_crl \
-			main.ssl-sha512 \
-		; do
-			_disable_test  "$t" "Requires <dev-libs/openssl-1.1.0"
-		done
-	fi
-
-	_disable_test main.gis-precise "Known rounding error with latest AMD processors"
-
-	# 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.6.45-r2.ebuild b/dev-db/mysql/mysql-5.6.45-r2.ebuild
new file mode 100644
index 000000000000..da38c876ad50
--- /dev/null
+++ b/dev-db/mysql/mysql-5.6.45-r2.ebuild
@@ -0,0 +1,847 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20190822-1908Z"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils flag-o-matic prefix toolchain-funcs \
+	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}"/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
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.44-fix-libressl-support.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.44-add-openssl-1.1-support.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-2.6.5*: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? (
+		acct-group/mysql acct-user/mysql
+		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? (
+			acct-group/mysql acct-user/mysql
+			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
+}
+
+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
+
+	# Don't clash with dev-db/mysql-connector-c
+	rm \
+		man/my_print_defaults.1 \
+		man/perror.1 \
+		|| 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
+
+	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
+
+	if [[ -d "${ED%/}/usr/sql-bench" ]] ; then
+		mv "${ED%/}/usr/sql-bench" "${ED%/}/usr/share/mysql/" || 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
+
+	if ! use latin1 ; then
+		for t in \
+			binlog.binlog_mysqlbinlog_filter \
+			binlog.binlog_statement_insert_delayed \
+			funcs_1.is_columns_mysql \
+			funcs_1.is_tables_mysql \
+			funcs_1.is_triggers \
+			main.information_schema \
+			main.mysql_client_test \
+			main.mysqld--help-notwin \
+			perfschema.binlog_edge_mix \
+			perfschema.binlog_edge_stmt \
+		; do
+			_disable_test  "$t" "Requires DEFAULT_CHARSET=latin1 but USE=-latin1 is set"
+		done
+	fi
+
+	if has_version '>=dev-libs/openssl-1.1.0' ; then
+		# Tests are expecting <openssl-1.1 default cipher
+		for t in \
+			main.openssl_1 \
+			main.plugin_auth_sha256_tls \
+			main.ssl \
+			main.ssl_8k_key \
+			main.ssl_ca \
+			main.ssl_cipher\
+			main.ssl_compress \
+			main.ssl_crl \
+			main.ssl-sha512 \
+		; do
+			_disable_test  "$t" "Requires <dev-libs/openssl-1.1.0"
+		done
+	fi
+
+	_disable_test main.gis-precise "Known rounding error with latest AMD processors"
+
+	# 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.23-r2.ebuild b/dev-db/mysql/mysql-5.7.23-r2.ebuild
deleted file mode 100644
index 0b7a82c88b4d..000000000000
--- a/dev-db/mysql/mysql-5.7.23-r2.ebuild
+++ /dev/null
@@ -1,938 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20181023-0012Z"
-
-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
-)
-
-# 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] )
-"
-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
-	for t in main.xa_prepared_binlog_off ; do
-			_disable_test "$t" "Unstable test"
-	done
-
-	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/mysql/mysql-5.7.24.ebuild b/dev-db/mysql/mysql-5.7.24.ebuild
deleted file mode 100644
index f178d936fc9a..000000000000
--- a/dev-db/mysql/mysql-5.7.24.ebuild
+++ /dev/null
@@ -1,945 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20181023-0012Z"
-
-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
-)
-
-# 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/mysql/mysql-5.7.25.ebuild b/dev-db/mysql/mysql-5.7.25.ebuild
deleted file mode 100644
index 34fc5964b516..000000000000
--- a/dev-db/mysql/mysql-5.7.25.ebuild
+++ /dev/null
@@ -1,946 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20190524-1046Z"
-
-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 arm64 ~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.25-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/mysql/mysql-5.7.26-r1.ebuild b/dev-db/mysql/mysql-5.7.26-r1.ebuild
new file mode 100644
index 000000000000..ea0df7b4e112
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.26-r1.ebuild
@@ -0,0 +1,992 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20190822-1908Z"
+
+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 arm64 ~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.26-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.25-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}"/extra/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_innodb_info_tbl_slave_tmp_tbl_mismatch: https://bugs.mysql.com/bug.php?id=89223
+	# - rpl.rpl_non_direct_stm_mixing_engines: MDEV-14489
+	for t in \
+		main.xa_prepared_binlog_off \
+		rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch \
+		rpl.rpl_non_direct_stm_mixing_engines \
+	; do
+		_disable_test "$t" "Unstable test"
+	done
+
+	for t in \
+		gis.geometry_class_attri_prop \
+		gis.geometry_property_function_issimple \
+		gis.gis_bugs_crashes \
+		gis.spatial_op_testingfunc_mix \
+		gis.spatial_analysis_functions_buffer \
+		gis.spatial_analysis_functions_distance \
+		gis.spatial_utility_function_distance_sphere \
+		gis.spatial_utility_function_simplify \
+		gis.spatial_analysis_functions_centroid \
+	; do
+		_disable_test "$t" "Known rounding error with latest AMD processors"
+	done
+
+	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
+
+	if has_version '>=dev-libs/openssl-1.1.1' ; then
+		# Tests are expecting <openssl-1.1.1 default cipher
+		for t in \
+			auth_sec.cert_verify \
+			auth_sec.mysql_ssl_connection \
+			auth_sec.openssl_cert_generation \
+			auth_sec.ssl_auto_detect \
+			auth_sec.ssl_mode \
+			auth_sec.tls \
+			binlog.binlog_grant_alter_user \
+			encryption.innodb_onlinealter_encryption \
+			main.grant_alter_user_qa \
+			main.grant_user_lock_qa \
+			main.mysql_ssl_default \
+			main.openssl_1 \
+			main.plugin_auth_sha256_tls \
+			main.ssl \
+			main.ssl_8k_key \
+			main.ssl_bug75311 \
+			main.ssl_ca \
+			main.ssl_cipher \
+			main.ssl_compress \
+			main.ssl_crl \
+			main.ssl_ecdh \
+			main.ssl_verify_identity \
+			x.connection_tls_version \
+			x.connection_openssl \
+		; do
+			_disable_test  "$t" "Requires <dev-libs/openssl-1.1.1"
+		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/mysql/mysql-5.7.26.ebuild b/dev-db/mysql/mysql-5.7.26.ebuild
deleted file mode 100644
index e7550e70b180..000000000000
--- a/dev-db/mysql/mysql-5.7.26.ebuild
+++ /dev/null
@@ -1,992 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20190524-1046Z"
-
-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 arm64 ~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.25-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}"/extra/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_innodb_info_tbl_slave_tmp_tbl_mismatch: https://bugs.mysql.com/bug.php?id=89223
-	# - rpl.rpl_non_direct_stm_mixing_engines: MDEV-14489
-	for t in \
-		main.xa_prepared_binlog_off \
-		rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch \
-		rpl.rpl_non_direct_stm_mixing_engines \
-	; do
-		_disable_test "$t" "Unstable test"
-	done
-
-	for t in \
-		gis.geometry_class_attri_prop \
-		gis.geometry_property_function_issimple \
-		gis.gis_bugs_crashes \
-		gis.spatial_op_testingfunc_mix \
-		gis.spatial_analysis_functions_buffer \
-		gis.spatial_analysis_functions_distance \
-		gis.spatial_utility_function_distance_sphere \
-		gis.spatial_utility_function_simplify \
-		gis.spatial_analysis_functions_centroid \
-	; do
-		_disable_test "$t" "Known rounding error with latest AMD processors"
-	done
-
-	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
-
-	if has_version '>=dev-libs/openssl-1.1.1' ; then
-		# Tests are expecting <openssl-1.1.1 default cipher
-		for t in \
-			auth_sec.cert_verify \
-			auth_sec.mysql_ssl_connection \
-			auth_sec.openssl_cert_generation \
-			auth_sec.ssl_auto_detect \
-			auth_sec.ssl_mode \
-			auth_sec.tls \
-			binlog.binlog_grant_alter_user \
-			encryption.innodb_onlinealter_encryption \
-			main.grant_alter_user_qa \
-			main.grant_user_lock_qa \
-			main.mysql_ssl_default \
-			main.openssl_1 \
-			main.plugin_auth_sha256_tls \
-			main.ssl \
-			main.ssl_8k_key \
-			main.ssl_bug75311 \
-			main.ssl_ca \
-			main.ssl_cipher \
-			main.ssl_compress \
-			main.ssl_crl \
-			main.ssl_ecdh \
-			main.ssl_verify_identity \
-			x.connection_tls_version \
-			x.connection_openssl \
-		; do
-			_disable_test  "$t" "Requires <dev-libs/openssl-1.1.1"
-		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/mysql/mysql-5.7.27-r1.ebuild b/dev-db/mysql/mysql-5.7.27-r1.ebuild
new file mode 100644
index 000000000000..2edc05182a40
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.27-r1.ebuild
@@ -0,0 +1,1003 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20190822-1908Z"
+
+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 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 ~arm64 ~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.26-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.25-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? (
+		acct-group/mysql acct-user/mysql
+		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? (
+			acct-group/mysql acct-user/mysql
+			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
+}
+
+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}"/extra/libevent \
+		"${S}"/zlib \
+		|| die
+
+	# Don't clash with dev-db/mysql-connector-c
+	rm \
+		man/my_print_defaults.1 \
+		man/perror.1 \
+		man/zlib_decompress.1 \
+		|| 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_innodb_info_tbl_slave_tmp_tbl_mismatch: https://bugs.mysql.com/bug.php?id=89223
+	# - rpl.rpl_non_direct_stm_mixing_engines: MDEV-14489
+	for t in \
+		main.xa_prepared_binlog_off \
+		rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch \
+		rpl.rpl_non_direct_stm_mixing_engines \
+	; do
+		_disable_test "$t" "Unstable test"
+	done
+
+	for t in \
+		gis.geometry_class_attri_prop \
+		gis.geometry_property_function_issimple \
+		gis.gis_bugs_crashes \
+		gis.spatial_op_testingfunc_mix \
+		gis.spatial_analysis_functions_buffer \
+		gis.spatial_analysis_functions_distance \
+		gis.spatial_utility_function_distance_sphere \
+		gis.spatial_utility_function_simplify \
+		gis.spatial_analysis_functions_centroid \
+	; do
+		_disable_test "$t" "Known rounding error with latest AMD processors"
+	done
+
+	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
+
+	if has_version '>=dev-libs/openssl-1.1.1' ; then
+		# Tests are expecting <openssl-1.1.1 default cipher
+		for t in \
+			auth_sec.cert_verify \
+			auth_sec.mysql_ssl_connection \
+			auth_sec.openssl_cert_generation \
+			auth_sec.ssl_auto_detect \
+			auth_sec.ssl_mode \
+			auth_sec.tls \
+			binlog.binlog_grant_alter_user \
+			encryption.innodb_onlinealter_encryption \
+			main.grant_alter_user_qa \
+			main.grant_user_lock_qa \
+			main.mysql_ssl_default \
+			main.openssl_1 \
+			main.plugin_auth_sha256_tls \
+			main.ssl \
+			main.ssl_8k_key \
+			main.ssl_bug75311 \
+			main.ssl_ca \
+			main.ssl_cipher \
+			main.ssl_compress \
+			main.ssl_crl \
+			main.ssl_ecdh \
+			main.ssl_verify_identity \
+			x.connection_tls_version \
+			x.connection_openssl \
+		; do
+			_disable_test  "$t" "Requires <dev-libs/openssl-1.1.1"
+		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/mysql/mysql-5.7.27.ebuild b/dev-db/mysql/mysql-5.7.27.ebuild
deleted file mode 100644
index 81848199c426..000000000000
--- a/dev-db/mysql/mysql-5.7.27.ebuild
+++ /dev/null
@@ -1,999 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20190604-1109Z"
-
-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 ~arm64 ~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.25-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}"/extra/libevent \
-		"${S}"/zlib \
-		|| die
-
-	# Don't clash with dev-db/mysql-connector-c
-	rm \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1 \
-		|| 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_innodb_info_tbl_slave_tmp_tbl_mismatch: https://bugs.mysql.com/bug.php?id=89223
-	# - rpl.rpl_non_direct_stm_mixing_engines: MDEV-14489
-	for t in \
-		main.xa_prepared_binlog_off \
-		rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch \
-		rpl.rpl_non_direct_stm_mixing_engines \
-	; do
-		_disable_test "$t" "Unstable test"
-	done
-
-	for t in \
-		gis.geometry_class_attri_prop \
-		gis.geometry_property_function_issimple \
-		gis.gis_bugs_crashes \
-		gis.spatial_op_testingfunc_mix \
-		gis.spatial_analysis_functions_buffer \
-		gis.spatial_analysis_functions_distance \
-		gis.spatial_utility_function_distance_sphere \
-		gis.spatial_utility_function_simplify \
-		gis.spatial_analysis_functions_centroid \
-	; do
-		_disable_test "$t" "Known rounding error with latest AMD processors"
-	done
-
-	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
-
-	if has_version '>=dev-libs/openssl-1.1.1' ; then
-		# Tests are expecting <openssl-1.1.1 default cipher
-		for t in \
-			auth_sec.cert_verify \
-			auth_sec.mysql_ssl_connection \
-			auth_sec.openssl_cert_generation \
-			auth_sec.ssl_auto_detect \
-			auth_sec.ssl_mode \
-			auth_sec.tls \
-			binlog.binlog_grant_alter_user \
-			encryption.innodb_onlinealter_encryption \
-			main.grant_alter_user_qa \
-			main.grant_user_lock_qa \
-			main.mysql_ssl_default \
-			main.openssl_1 \
-			main.plugin_auth_sha256_tls \
-			main.ssl \
-			main.ssl_8k_key \
-			main.ssl_bug75311 \
-			main.ssl_ca \
-			main.ssl_cipher \
-			main.ssl_compress \
-			main.ssl_crl \
-			main.ssl_ecdh \
-			main.ssl_verify_identity \
-			x.connection_tls_version \
-			x.connection_openssl \
-		; do
-			_disable_test  "$t" "Requires <dev-libs/openssl-1.1.1"
-		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/mysql/mysql-8.0.17.ebuild b/dev-db/mysql/mysql-8.0.17.ebuild
index 9bf70ba0f6b2..2697f6786560 100644
--- a/dev-db/mysql/mysql-8.0.17.ebuild
+++ b/dev-db/mysql/mysql-8.0.17.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
 	"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-8.0.17.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-8.0.17-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20018_all_mysql-8.0.17-add-protobuf-3.8+-support.patch
 	"${MY_PATCH_DIR}"/20018_all_mysql-8.0.17-fix-libressl-support.patch
 )
 
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 4aca947006ac..d6854b2235fa 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -2,7 +2,9 @@ AUX my.cnf-5.7 138 BLAKE2B 71862b4b77334ab74002237453d2c7f6b51cd1ae57dba3b00b19e
 AUX my.cnf.distro-client 637 BLAKE2B b0812e0e03aa9a3b2e55e08b933a0b41b6afd95ded61f4d9d7c34a2d3810ec38520abd0d89e1c6565f61d4cd8a36d653f9f3199b3dd6a91345cdb5ff962685d8 SHA512 74bd1d9a58075d0a6195be1f94db310bcbe8da532b03844e6fa1ff84676e84843fc9adf9aed06b7e4db53c9aa24ef0885d96de0ccfe4c6ad98afe4c145d43f4f
 AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1fd14b4c2dea398814beda3c09aabea04dd3a9e145464524c629e7e69dc257d1245e0a46dd8584b7f685172 SHA512 cf172edc23d3dda49c21af6b8adef8aa13694d8ceecddf1d612d4ae34d00ba53c51ae4ae7ca4d11083eeacb5d862f59a855a9d80e9e448ab8bbf17f42aac2650
 DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
-DIST mysql-extras-20190524-1046Z.tar.bz2 331517 BLAKE2B e6d48e34b0a7f7176de8740971f8151923beb20a520df73c22d44005059ef6779ad5aa8437e30018b9bbfe1d6d69043cbd8522b6f3662746205193b44372a6b3 SHA512 2f7238578f3aabd1701e1c54da36bc0100c9479871e3c77b22131fd6cde865037307f93b3343ea5e52251c45ef35cdc52cc2dec5a26d44fd41700598282c5c2c
+DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
 DIST percona-server-5.7.26-29.tar.gz 84327421 BLAKE2B beedb4b5025c337a63ae56644e47991e90c2c0e57c6d03f1562095f9470cef4b67c8df6c3774d88dfc6ed6dfb81f9dd4b62325db30bc26802651279921bd3a2d SHA512 c8100e69f7e29a5aa2de9dddbc1a3cba9836fe485b7f829a8db0a7e5ac1d1bdabfb1360dacad90665f4c9c78ac91226209c6c15158ef449e84519e36bb06f0a1
-EBUILD percona-server-5.7.26.29.ebuild 36326 BLAKE2B c5b3e51c987d58d1cfd220b75fae11104afcbe356f5dca3b4257424e901cf1e41475afc128f5b6f394adc284b3b41e9e20eac136be6a8b92494c18b610ef5933 SHA512 128b3d7b079816dcdcbfc6b6ff83fdc8a791686314e221625cee876b30c03bc3d412550c683a98c259697f03a85cef00afa15ebce4d5a2c92adc03d99237a909
+DIST percona-server-5.7.27-30.tar.gz 84672298 BLAKE2B 8431d231f602b704195868110e8eb73adb3db7c761906c15eff182e54634ef091a3ffa0d4f3498a93dbfbf65cd5cdd12102871abaaaa0f32378ba3068d083b2b SHA512 d62c66de3128df87dce52292ad1671e01fe2c923e668ef0faf9cb663c11c9cd0b976345aea1de6ea2bc458d0e1066b42c022849e422121d96cea082ed12c8f4b
+EBUILD percona-server-5.7.26.29-r1.ebuild 36356 BLAKE2B 6934a52bf0359157e1f0ad4d005842716a180e482edd98a96e85e2bb66f55fca767474acba7d6aa88dbac55e22bb11c164f94c6ac0b0abfb2e8ad93ee4f4d30d SHA512 e5d8ddf8ec60d45b22563a3a89e4e54d3a31f122673bf36b49f4958efb104106db0fee9178c1a922b6501994653f96d6cf36d68108b5480bf7eb9812fddf8562
+EBUILD percona-server-5.7.27.30.ebuild 37273 BLAKE2B 44676777d025197885e2c39673b922cb79ab34aee2243e88fc0d816dc96f936f6d4bf4fe21af5435570adf6deec89387ff4669fcf3b3ce3f93e55a35007a0b29 SHA512 df991d3896275ff122d735be3d81c3376c8df9b39fb807709200efe55de669ba1762eebfd9b7e1cc3ad48f5ad061536aec5c8408cb1eb89c5057bdc60db597c5
 MISC metadata.xml 1416 BLAKE2B a479a1bc7b6e5947ccef2fdf097d3dd91af932500483112c05b86c5d60ab6ec1ac4179bee0fa291a746281054baa791152cac7a34c8c79a0ad4fd8f5e3d1bcf9 SHA512 ec92d201154c3af80aa4cdcd1eae207827a1b2711cfe7b1a9b0153268a33e472329011c56ec39a009776c629163fc9d4f9e77ad2b00461f07199f3dd12db0b52
diff --git a/dev-db/percona-server/percona-server-5.7.26.29-r1.ebuild b/dev-db/percona-server/percona-server-5.7.26.29-r1.ebuild
new file mode 100644
index 000000000000..81b46f88e3aa
--- /dev/null
+++ b/dev-db/percona-server/percona-server-5.7.26.29-r1.ebuild
@@ -0,0 +1,1108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20190822-1908Z"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+# Python2 required for innodb_stress.innodb_stress{,_blob,_crash} test
+PYTHON_COMPAT=( python2_7 )
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eapi7-ver cmake-utils eutils flag-o-matic linux-info \
+	prefix python-any-r1 toolchain-funcs multilib-minimal
+
+MY_PV=$(ver_rs 3 '-')
+MY_PN="Percona-Server"
+MY_P="${PN}-${MY_PV}"
+MY_MAJOR_PV=$(ver_cut 1-2)
+MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/5.7/release-notes/release-notes_index.html"
+
+SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
+	mirror://sourceforge/boost/boost_1_59_0.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.percona.com/software/mysql-database/percona-server"
+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 pam +perl profiling rocksdb
+	selinux +server static static-libs systemtap tcmalloc test tokudb tokudb-backup-plugin 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.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_percona-server-5.7.26-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20018_all_percona-server-5.7.25-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_percona-server-5.7.23-rocksdb-use-system-libs.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 )
+		pam? ( virtual/pam:0= )
+		rocksdb? (
+			app-arch/zstd:=
+			dev-libs/protobuf:=
+		)
+		tokudb? (
+			app-arch/snappy:=
+			app-arch/xz-utils:=
+		)
+		tokudb-backup-plugin? ( dev-util/valgrind )
+	)
+	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? (
+		acct-group/mysql acct-user/mysql
+		dev-perl/JSON
+		|| (
+			$(python_gen_any_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]')
+			$(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]')
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !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? (
+			acct-group/mysql acct-user/mysql
+			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 )"
+
+python_check_deps() {
+	has_version "dev-python/mysqlclient[${PYTHON_USEDEP}]" \
+		|| has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
+}
+
+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
+
+		use test && python-any-r1_pkg_setup
+	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
+}
+
+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)/libperconaserverclient.so" ]] ; then
+		libpath=$(readlink "${EROOT%/}/usr/$(get_libdir)/libperconaserverclient.so")
+		elog "Due to ABI changes when switching between different client libraries,"
+		elog "revdep-rebuild must find and rebuild all packages linking to libperconaserverclient."
+		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}/${MY_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
+
+	# Don't build bundled xz-utils
+	if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
+		echo > "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
+		sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
+	elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
+		echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+		sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+		sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+	fi
+
+	if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use tokudb-backup-plugin ; then
+		 rm -r "${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || 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}"/extra/libevent \
+		"${S}"/storage/rocksdb/third_party \
+		"${S}"/storage/tokudb/PerconaFT/third_party \
+		"${S}"/zlib \
+		|| die
+
+	# Don't clash with dev-db/mysql-connector-c
+	rm \
+		man/my_print_defaults.1 \
+		man/perror.1 \
+		man/zlib_decompress.1 \
+		|| die
+
+	# 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
+}
+
+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 tokudb ; then
+		# https://jira.percona.com/browse/PS-4399
+		append-cxxflags -Wno-error=shadow
+	fi
+
+	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="${WORKDIR}/boost_1_59_0"
+		-DWITH_PROTOBUF=system
+	)
+
+	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_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
+			-DWITH_ROCKSDB=$(usex rocksdb 1 0)
+			$(usex tokudb '' -DWITHOUT_TOKUDB=1)
+		)
+
+		if use tokudb ; then
+			# TokuDB Backup plugin requires valgrind unconditionally
+			mycmakeargs+=(
+				$(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1)
+			)
+		fi
+
+	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 percona-server-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 Percona-Server 5.7 for now and are believed to be
+	# false positives or are known to fail:
+	#
+	# group_replication.gr_communication_configuration: requires a valid local network address
+	#                                                   which clashes with FEATURES=network-sandbox
+	# innodb.xtradb_compressed_columns_consistency:     long running test which tends to timeout
+	#                                                   on a busy host
+	# keyring_vault.keyring_vault_timeout:              requires network access to vault.public-ci.percona.com
+	#                                                   which clashes with FEATURES=network-sandbox
+	# rocksdb.prefix_extractor_override:                https://jira.percona.com/browse/PS-5199
+	# rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch:   https://bugs.mysql.com/bug.php?id=89223
+	# rpl.rpl_multi_source_mts_reset_worker_info:       https://jira.percona.com/browse/PS-3786
+	# tokudb.bugs.5733_tokudb:                          https://jira.percona.com/browse/PS-4274
+	# x.crud_insert_cast:                               https://jira.percona.com/browse/PS-5032
+	# x.insert_table_bad_column:                        https://jira.percona.com/browse/PS-5032
+	# x.insert_table_bad_numcolumns:                    https://jira.percona.com/browse/PS-5032
+	# x.insert_table_bad_column_type:                   https://jira.percona.com/browse/PS-5032
+	# x.insert_table:                                   https://jira.percona.com/browse/PS-5032
+	# x.update_crud_arrayappend_o:                      https://jira.percona.com/browse/PS-5032
+	# x.update_crud_arrayinsert_o:                      https://jira.percona.com/browse/PS-5032
+	# x.mysqlxtest_help:                                https://jira.percona.com/browse/PS-5019
+	# x.admin_kill_client_mysqlx:                       https://jira.percona.com/browse/PS-5019
+	#
+	local t
+
+	for t in \
+		group_replication.gr_communication_configuration \
+		innodb.xtradb_compressed_columns_consistency \
+		keyring_vault.keyring_vault_timeout \
+		rocksdb.prefix_extractor_override \
+		rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch \
+		rpl.rpl_multi_source_mts_reset_worker_info \
+		tokudb.bugs.5733_tokudb \
+		x.crud_insert_cast \
+		x.insert_table_bad_column \
+		x.insert_table_bad_numcolumns \
+		x.insert_table_bad_column_type \
+		x.insert_table \
+		x.update_crud_arrayappend_o \
+		x.update_crud_arrayinsert_o \
+		x.mysqlxtest_help \
+		x.admin_kill_client_mysqlx \
+	; do
+			_disable_test "$t" "False positives in Gentoo / Known bug"
+	done
+
+	if has_version ">=dev-libs/openssl-1.1.1" ; then
+		for t in \
+			main.ssl_8k_key \
+			auth_sec.mysql_ssl_connection \
+			main.ssl_verify_identity \
+			main.ssl_crl \
+			main.grant_alter_user_qa \
+			auth_sec.ssl_auto_detect \
+			encryption.innodb_onlinealter_encryption \
+			main.ssl_ca \
+			main.ssl_cipher \
+			main.grant_user_lock_qa \
+			auth_sec.openssl_cert_generation \
+			main.ssl_bug75311 \
+			main.ssl_compress \
+			main.ssl \
+			main.plugin_auth_sha256_tls \
+			main.ssl_ecdh \
+			main.openssl_1 \
+			auth_sec.cert_verify \
+			main.mysql_ssl_default \
+			main.percona_tls \
+			auth_sec.tls \
+			auth_sec.ssl_mode \
+			binlog.binlog_grant_alter_user \
+			x.connection_tls_version \
+			x.connection_openssl \
+		; do
+			_disable_test "$t" "Known >=openssl-1.1.1 failures"
+		done
+	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 tokudb ; then
+		if [[ -f "/sys/kernel/mm/transparent_hugepage/enabled" ]] ; then
+			if grep -q -E "\[always\]" /sys/kernel/mm/transparent_hugepage/enabled &>/dev/null ; then
+				# TokuDB refuses to start when transparent hugepages are enabled
+				for t in \
+					tokudb.rows-32m-rand-insert \
+					tokudb.savepoint-2 \
+					tokudb.savepoint-3 \
+					tokudb.savepoint-4 \
+					tokudb.savepoint-1078 \
+					tokudb.savepoint-1078-2 \
+					tokudb.savepoint-1078-3 \
+					tokudb.savepoint-1078-4 \
+				; do
+						_disable_test "$t" "TokuDB will not work with transparent hugepages enabled"
+				done
+			fi
+		else
+			einfo "Cannot determine transparent hugepage status."
+			einfo "Please note that TokuDB refuses to start when transparent hugepages are enabled!"
+		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-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
+
+		if use tokudb ; then
+			# Remove some unwanted files
+			rm -fv \
+				"${ED%/}"/usr/COPYING.AGPLv3 \
+				"${ED%/}"/usr/COPYING.GPLv2 \
+				"${ED%/}"/usr/PATENTS \
+				"${ED%/}"/usr/README.md \
+				|| die
+		fi
+	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/percona-server/percona-server-5.7.26.29.ebuild b/dev-db/percona-server/percona-server-5.7.26.29.ebuild
deleted file mode 100644
index b69fc97ed144..000000000000
--- a/dev-db/percona-server/percona-server-5.7.26.29.ebuild
+++ /dev/null
@@ -1,1102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20190524-1046Z"
-
-CMAKE_MAKEFILE_GENERATOR=emake
-
-# Python2 required for innodb_stress.innodb_stress{,_blob,_crash} test
-PYTHON_COMPAT=( python2_7 )
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eapi7-ver cmake-utils eutils flag-o-matic linux-info \
-	prefix python-any-r1 toolchain-funcs user multilib-minimal
-
-MY_PV=$(ver_rs 3 '-')
-MY_PN="Percona-Server"
-MY_P="${PN}-${MY_PV}"
-MY_MAJOR_PV=$(ver_cut 1-2)
-MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/5.7/release-notes/release-notes_index.html"
-
-SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
-	mirror://sourceforge/boost/boost_1_59_0.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.percona.com/software/mysql-database/percona-server"
-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 pam +perl profiling rocksdb
-	selinux +server static static-libs systemtap tcmalloc test tokudb tokudb-backup-plugin 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.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_percona-server-5.7.23-without-clientlibs-tools.patch
-	"${MY_PATCH_DIR}"/20018_all_percona-server-5.7.25-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_percona-server-5.7.23-rocksdb-use-system-libs.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 )
-		pam? ( virtual/pam:0= )
-		rocksdb? (
-			app-arch/zstd:=
-			dev-libs/protobuf:=
-		)
-		tokudb? (
-			app-arch/snappy:=
-			app-arch/xz-utils:=
-		)
-		tokudb-backup-plugin? ( dev-util/valgrind )
-	)
-	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? (
-		$(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]')
-		dev-perl/JSON
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !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 )"
-
-python_check_deps() {
-	has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
-}
-
-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
-
-		use test && python-any-r1_pkg_setup
-	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)/libperconaserverclient.so" ]] ; then
-		libpath=$(readlink "${EROOT%/}/usr/$(get_libdir)/libperconaserverclient.so")
-		elog "Due to ABI changes when switching between different client libraries,"
-		elog "revdep-rebuild must find and rebuild all packages linking to libperconaserverclient."
-		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}/${MY_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
-
-	# Don't build bundled xz-utils
-	if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
-		echo > "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
-		sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
-	elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
-		echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
-		sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
-		sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
-	fi
-
-	if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use tokudb-backup-plugin ; then
-		 rm -r "${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || 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}"/extra/libevent \
-		"${S}"/storage/rocksdb/third_party \
-		"${S}"/storage/tokudb/PerconaFT/third_party \
-		"${S}"/zlib \
-		|| die
-
-	# Don't clash with dev-db/mysql-connector-c
-	rm \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1 \
-		|| die
-
-	# 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
-}
-
-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 tokudb ; then
-		# https://jira.percona.com/browse/PS-4399
-		append-cxxflags -Wno-error=shadow
-	fi
-
-	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="${WORKDIR}/boost_1_59_0"
-		-DWITH_PROTOBUF=system
-	)
-
-	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_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
-			-DWITH_ROCKSDB=$(usex rocksdb 1 0)
-			$(usex tokudb '' -DWITHOUT_TOKUDB=1)
-		)
-
-		if use tokudb ; then
-			# TokuDB Backup plugin requires valgrind unconditionally
-			mycmakeargs+=(
-				$(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1)
-			)
-		fi
-
-	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 percona-server-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 Percona-Server 5.7 for now and are believed to be
-	# false positives or are known to fail:
-	#
-	# group_replication.gr_communication_configuration: requires a valid local network address
-	#                                                   which clashes with FEATURES=network-sandbox
-	# innodb.xtradb_compressed_columns_consistency:     long running test which tends to timeout
-	#                                                   on a busy host
-	# keyring_vault.keyring_vault_timeout:              requires network access to vault.public-ci.percona.com
-	#                                                   which clashes with FEATURES=network-sandbox
-	# rocksdb.prefix_extractor_override:                https://jira.percona.com/browse/PS-5199
-	# rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch:   https://bugs.mysql.com/bug.php?id=89223
-	# rpl.rpl_multi_source_mts_reset_worker_info:       https://jira.percona.com/browse/PS-3786
-	# tokudb.bugs.5733_tokudb:                          https://jira.percona.com/browse/PS-4274
-	# x.crud_insert_cast:                               https://jira.percona.com/browse/PS-5032
-	# x.insert_table_bad_column:                        https://jira.percona.com/browse/PS-5032
-	# x.insert_table_bad_numcolumns:                    https://jira.percona.com/browse/PS-5032
-	# x.insert_table_bad_column_type:                   https://jira.percona.com/browse/PS-5032
-	# x.insert_table:                                   https://jira.percona.com/browse/PS-5032
-	# x.update_crud_arrayappend_o:                      https://jira.percona.com/browse/PS-5032
-	# x.update_crud_arrayinsert_o:                      https://jira.percona.com/browse/PS-5032
-	# x.mysqlxtest_help:                                https://jira.percona.com/browse/PS-5019
-	# x.admin_kill_client_mysqlx:                       https://jira.percona.com/browse/PS-5019
-	#
-	local t
-
-	for t in \
-		group_replication.gr_communication_configuration \
-		innodb.xtradb_compressed_columns_consistency \
-		keyring_vault.keyring_vault_timeout \
-		rocksdb.prefix_extractor_override \
-		rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch \
-		rpl.rpl_multi_source_mts_reset_worker_info \
-		tokudb.bugs.5733_tokudb \
-		x.crud_insert_cast \
-		x.insert_table_bad_column \
-		x.insert_table_bad_numcolumns \
-		x.insert_table_bad_column_type \
-		x.insert_table \
-		x.update_crud_arrayappend_o \
-		x.update_crud_arrayinsert_o \
-		x.mysqlxtest_help \
-		x.admin_kill_client_mysqlx \
-	; do
-			_disable_test "$t" "False positives in Gentoo / Known bug"
-	done
-
-	if has_version ">=dev-libs/openssl-1.1.1" ; then
-		for t in \
-			main.ssl_8k_key \
-			auth_sec.mysql_ssl_connection \
-			main.ssl_verify_identity \
-			main.ssl_crl \
-			main.grant_alter_user_qa \
-			auth_sec.ssl_auto_detect \
-			encryption.innodb_onlinealter_encryption \
-			main.ssl_ca \
-			main.ssl_cipher \
-			main.grant_user_lock_qa \
-			auth_sec.openssl_cert_generation \
-			main.ssl_bug75311 \
-			main.ssl_compress \
-			main.ssl \
-			main.plugin_auth_sha256_tls \
-			main.ssl_ecdh \
-			main.openssl_1 \
-			auth_sec.cert_verify \
-			main.mysql_ssl_default \
-			main.percona_tls \
-			auth_sec.tls \
-			auth_sec.ssl_mode \
-			binlog.binlog_grant_alter_user \
-			x.connection_tls_version \
-			x.connection_openssl \
-		; do
-			_disable_test "$t" "Known >=openssl-1.1.1 failures"
-		done
-	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 tokudb ; then
-		if [[ -f "/sys/kernel/mm/transparent_hugepage/enabled" ]] ; then
-			if grep -q -E "\[always\]" /sys/kernel/mm/transparent_hugepage/enabled &>/dev/null ; then
-				# TokuDB refuses to start when transparent hugepages are enabled
-				for t in \
-					tokudb.rows-32m-rand-insert \
-					tokudb.savepoint-2 \
-					tokudb.savepoint-3 \
-					tokudb.savepoint-4 \
-					tokudb.savepoint-1078 \
-					tokudb.savepoint-1078-2 \
-					tokudb.savepoint-1078-3 \
-					tokudb.savepoint-1078-4 \
-				; do
-						_disable_test "$t" "TokuDB will not work with transparent hugepages enabled"
-				done
-			fi
-		else
-			einfo "Cannot determine transparent hugepage status."
-			einfo "Please note that TokuDB refuses to start when transparent hugepages are enabled!"
-		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-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
-
-		if use tokudb ; then
-			# Remove some unwanted files
-			rm -fv \
-				"${ED%/}"/usr/COPYING.AGPLv3 \
-				"${ED%/}"/usr/COPYING.GPLv2 \
-				"${ED%/}"/usr/PATENTS \
-				"${ED%/}"/usr/README.md \
-				|| die
-		fi
-	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/percona-server/percona-server-5.7.27.30.ebuild b/dev-db/percona-server/percona-server-5.7.27.30.ebuild
new file mode 100644
index 000000000000..f6e26e0c232b
--- /dev/null
+++ b/dev-db/percona-server/percona-server-5.7.27.30.ebuild
@@ -0,0 +1,1135 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20190822-1908Z"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+# Python2 required for innodb_stress.innodb_stress{,_blob,_crash} test
+PYTHON_COMPAT=( python2_7 )
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eapi7-ver cmake-utils eutils flag-o-matic linux-info \
+	prefix python-any-r1 toolchain-funcs multilib-minimal
+
+MY_PV=$(ver_rs 3 '-')
+MY_PN="Percona-Server"
+MY_P="${PN}-${MY_PV}"
+MY_MAJOR_PV=$(ver_cut 1-2)
+MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/5.7/release-notes/release-notes_index.html"
+
+SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
+	mirror://sourceforge/boost/boost_1_59_0.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.percona.com/software/mysql-database/percona-server"
+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 pam +perl profiling rocksdb
+	selinux +server static static-libs systemtap tcmalloc test tokudb tokudb-backup-plugin 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.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_percona-server-5.7.26-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20018_all_percona-server-5.7.25-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_percona-server-5.7.23-rocksdb-use-system-libs.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 )
+		pam? ( virtual/pam:0= )
+		rocksdb? (
+			app-arch/zstd:=
+			dev-libs/protobuf:=
+		)
+		tokudb? (
+			app-arch/snappy:=
+			app-arch/xz-utils:=
+		)
+		tokudb-backup-plugin? ( dev-util/valgrind )
+	)
+	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? (
+		acct-group/mysql acct-user/mysql
+		dev-perl/JSON
+		|| (
+			$(python_gen_any_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]')
+			$(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]')
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !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? (
+			acct-group/mysql acct-user/mysql
+			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 )"
+
+python_check_deps() {
+	has_version "dev-python/mysqlclient[${PYTHON_USEDEP}]" \
+		|| has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
+}
+
+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
+
+		use test && python-any-r1_pkg_setup
+	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
+}
+
+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)/libperconaserverclient.so" ]] ; then
+		libpath=$(readlink "${EROOT%/}/usr/$(get_libdir)/libperconaserverclient.so")
+		elog "Due to ABI changes when switching between different client libraries,"
+		elog "revdep-rebuild must find and rebuild all packages linking to libperconaserverclient."
+		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}/${MY_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
+
+	# Don't build bundled xz-utils
+	if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
+		echo > "${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
+		sed -i 's/ build_lzma//' "${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
+	elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
+		echo > "${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+		sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' "${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+		sed -i -e 's/add_dependencies\(tokuportability_static_conv build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" || die
+	fi
+
+	if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use tokudb-backup-plugin ; then
+		 rm -r "${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || 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}"/extra/libevent \
+		"${S}"/storage/rocksdb/third_party \
+		"${S}"/storage/tokudb/PerconaFT/third_party \
+		"${S}"/zlib \
+		|| die
+
+	# Don't clash with dev-db/mysql-connector-c
+	rm \
+		man/my_print_defaults.1 \
+		man/perror.1 \
+		man/zlib_decompress.1 \
+		|| die
+
+	# 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
+}
+
+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 tokudb ; then
+		# https://jira.percona.com/browse/PS-4399
+		append-cxxflags -Wno-error=shadow
+	fi
+
+	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="${WORKDIR}/boost_1_59_0"
+		-DWITH_PROTOBUF=system
+	)
+
+	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_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
+			-DWITH_ROCKSDB=$(usex rocksdb 1 0)
+			$(usex tokudb '' -DWITHOUT_TOKUDB=1)
+		)
+
+		if use tokudb ; then
+			# TokuDB Backup plugin requires valgrind unconditionally
+			mycmakeargs+=(
+				$(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1)
+			)
+		fi
+
+	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 percona-server-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 Percona-Server 5.7 for now and are believed to be
+	# false positives or are known to fail:
+	#
+	# group_replication.gr_communication_configuration: requires a valid local network address
+	#                                                   which clashes with FEATURES=network-sandbox
+	# innodb.xtradb_compressed_columns_consistency:     long running test which tends to timeout
+	#                                                   on a busy host
+	# keyring_vault.keyring_vault_timeout:              requires network access to vault.public-ci.percona.com
+	#                                                   which clashes with FEATURES=network-sandbox
+	# rocksdb.prefix_extractor_override:                https://jira.percona.com/browse/PS-5199
+	# rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch:   https://bugs.mysql.com/bug.php?id=89223
+	# rpl.rpl_multi_source_mts_reset_worker_info:       https://jira.percona.com/browse/PS-3786
+	# tokudb.bugs.5733_tokudb:                          https://jira.percona.com/browse/PS-4274
+	# x.crud_insert_cast:                               https://jira.percona.com/browse/PS-5032
+	# x.insert_table_bad_column:                        https://jira.percona.com/browse/PS-5032
+	# x.insert_table_bad_numcolumns:                    https://jira.percona.com/browse/PS-5032
+	# x.insert_table_bad_column_type:                   https://jira.percona.com/browse/PS-5032
+	# x.insert_table:                                   https://jira.percona.com/browse/PS-5032
+	# x.update_crud_arrayappend_o:                      https://jira.percona.com/browse/PS-5032
+	# x.update_crud_arrayinsert_o:                      https://jira.percona.com/browse/PS-5032
+	# x.mysqlxtest_help:                                https://jira.percona.com/browse/PS-5019
+	# x.admin_kill_client_mysqlx:                       https://jira.percona.com/browse/PS-5019
+	#
+	local t
+
+	for t in \
+		group_replication.gr_communication_configuration \
+		innodb.xtradb_compressed_columns_consistency \
+		keyring_vault.keyring_vault_timeout \
+		rocksdb.prefix_extractor_override \
+		rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch \
+		rpl.rpl_multi_source_mts_reset_worker_info \
+		tokudb.bugs.5733_tokudb \
+		x.crud_insert_cast \
+		x.insert_table_bad_column \
+		x.insert_table_bad_numcolumns \
+		x.insert_table_bad_column_type \
+		x.insert_table \
+		x.update_crud_arrayappend_o \
+		x.update_crud_arrayinsert_o \
+		x.mysqlxtest_help \
+		x.admin_kill_client_mysqlx \
+	; do
+			_disable_test "$t" "False positives in Gentoo / Known bug"
+	done
+
+	# Unstable tests
+	# - main.xa_prepared_binlog_off: https://bugs.mysql.com/bug.php?id=83340
+	# - rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch: https://bugs.mysql.com/bug.php?id=89223
+	# - rpl.rpl_non_direct_stm_mixing_engines: MDEV-14489
+	for t in \
+		main.xa_prepared_binlog_off \
+		rpl.rpl_innodb_info_tbl_slave_tmp_tbl_mismatch \
+		rpl.rpl_non_direct_stm_mixing_engines \
+	; do
+		_disable_test "$t" "Unstable test"
+	done
+
+	for t in \
+		gis.geometry_class_attri_prop \
+		gis.geometry_property_function_issimple \
+		gis.gis_bugs_crashes \
+		gis.spatial_op_testingfunc_mix \
+		gis.spatial_analysis_functions_buffer \
+		gis.spatial_analysis_functions_centroid \
+		gis.spatial_analysis_functions_distance \
+		gis.spatial_op_testingfunc_mix \
+		gis.spatial_utility_function_distance_sphere \
+		gis.spatial_utility_function_simplify \
+	; do
+		_disable_test "$t" "Known rounding error with latest AMD processors"
+	done
+
+	if has_version ">=dev-libs/openssl-1.1.1" ; then
+		for t in \
+			main.ssl_8k_key \
+			auth_sec.mysql_ssl_connection \
+			main.ssl_verify_identity \
+			main.ssl_crl \
+			main.grant_alter_user_qa \
+			auth_sec.ssl_auto_detect \
+			encryption.innodb_onlinealter_encryption \
+			main.ssl_ca \
+			main.ssl_cipher \
+			main.grant_user_lock_qa \
+			auth_sec.openssl_cert_generation \
+			main.ssl_bug75311 \
+			main.ssl_compress \
+			main.ssl \
+			main.plugin_auth_sha256_tls \
+			main.ssl_ecdh \
+			main.openssl_1 \
+			auth_sec.cert_verify \
+			main.mysql_ssl_default \
+			main.percona_tls \
+			auth_sec.tls \
+			auth_sec.ssl_mode \
+			binlog.binlog_grant_alter_user \
+			x.connection_tls_version \
+			x.connection_openssl \
+		; do
+			_disable_test "$t" "Known >=openssl-1.1.1 failures"
+		done
+	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 tokudb ; then
+		if [[ -f "/sys/kernel/mm/transparent_hugepage/enabled" ]] ; then
+			if grep -q -E "\[always\]" /sys/kernel/mm/transparent_hugepage/enabled &>/dev/null ; then
+				# TokuDB refuses to start when transparent hugepages are enabled
+				for t in \
+					tokudb.rows-32m-rand-insert \
+					tokudb.savepoint-2 \
+					tokudb.savepoint-3 \
+					tokudb.savepoint-4 \
+					tokudb.savepoint-1078 \
+					tokudb.savepoint-1078-2 \
+					tokudb.savepoint-1078-3 \
+					tokudb.savepoint-1078-4 \
+				; do
+						_disable_test "$t" "TokuDB will not work with transparent hugepages enabled"
+				done
+			fi
+		else
+			einfo "Cannot determine transparent hugepage status."
+			einfo "Please note that TokuDB refuses to start when transparent hugepages are enabled!"
+		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-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
+
+		if use tokudb ; then
+			# Remove some unwanted files
+			rm -fv \
+				"${ED%/}"/usr/COPYING.AGPLv3 \
+				"${ED%/}"/usr/COPYING.GPLv2 \
+				"${ED%/}"/usr/PATENTS \
+				"${ED%/}"/usr/README.md \
+				|| die
+		fi
+	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/pgbadger/Manifest b/dev-db/pgbadger/Manifest
index 092c489fcc08..1b70c8e60a5e 100644
--- a/dev-db/pgbadger/Manifest
+++ b/dev-db/pgbadger/Manifest
@@ -1,5 +1,5 @@
 DIST pgbadger-10.3.tar.gz 1645573 BLAKE2B 583ad35f416b6d989996ae48500dcee5734bc4867095abe1eb49be971c6190cf68dd4e127a47163c8ee49400cdf2fcee14645c98f4853b6f66c2bef0db0b83e4 SHA512 f8aac47d92ddb92292c572c47d6d32f1aa673b972b2488eede7fbe0b55feddc6ce0cb1b58994e83b93a5f84fcb5b871c7c080863d17554810cc1c1b8c1e1609a
 DIST pgbadger-11.0.tar.gz 1661028 BLAKE2B d83be01017d69b83cf288b23fe5066d5c691b630ce748fe42b33514346183f7b8f18efceeefe0533e534c669e986c30388a6df5b620ea654ae89b3dc3c08d342 SHA512 167534d61cb28df6cb7eae7efe788d3f6bbad1c614468e905a9b678a76b3a2dfc0eb192b595ac4dc332cd694e820f1603b79d83bc934b7dfe3d226019f6a9c15
 EBUILD pgbadger-10.3.ebuild 454 BLAKE2B f0fde0f81f5af4fe540bfc652b607686b574a0f4edbc4e7ed251421c8962223e8357955da642b525b5dea3fa6ae498c46232502a628df04373b28b52b7da6f8f SHA512 f1140736e8be887d864e7579e0da07b5f4f774ad4ed8bb7993c29173ff87735f02e168be4a1d955cfed9dad795b051f5d65eb773b856c35e613096ce26cc2fce
-EBUILD pgbadger-11.0.ebuild 455 BLAKE2B 3c335bdb99af786159c5291af9aaa48791b9ce7005d43a998457eb899cfcc7eaca8a97d165c20c864614b03b59b6638aea2fb04f41c3b18bc06135def2fe362c SHA512 7a6fa03a5f344974c9b6ade8e7c3336fbf71ec8b09f55501ab8143419bba8039c06ca7bb2004327deda7e9c6fcf28c7aa712ed16724b396a122028a633f098fb
+EBUILD pgbadger-11.0.ebuild 454 BLAKE2B f0fde0f81f5af4fe540bfc652b607686b574a0f4edbc4e7ed251421c8962223e8357955da642b525b5dea3fa6ae498c46232502a628df04373b28b52b7da6f8f SHA512 f1140736e8be887d864e7579e0da07b5f4f774ad4ed8bb7993c29173ff87735f02e168be4a1d955cfed9dad795b051f5d65eb773b856c35e613096ce26cc2fce
 MISC metadata.xml 413 BLAKE2B 9b4f24620b42d2cf5befbaed7d52ed2e03d4619ebb547d36e207a900fe481a825a5be0a6fac073d7b278076ced053ae9a3c4b5d05597e5fb4d7ea66c1bff7988 SHA512 6bf32dc50ecd2d51d450413500b00773177109ab3ad26d74b458ec902973fa38542dbc65e65fbbe103b4be63589f61c2b9a6ab6ea5492b1954142afc5c2f8f93
diff --git a/dev-db/pgbadger/pgbadger-11.0.ebuild b/dev-db/pgbadger/pgbadger-11.0.ebuild
index 368c54188f29..83b95438fda0 100644
--- a/dev-db/pgbadger/pgbadger-11.0.ebuild
+++ b/dev-db/pgbadger/pgbadger-11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/darold/pgbadger/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 		dev-perl/JSON-XS
diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 869afc913ace..0bb0cf591832 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -4,6 +4,6 @@ AUX pgbouncer.confd-r1 457 BLAKE2B 0b2e33b57ee33eac42742a8f9fe7c0f090bad53c5d7c2
 AUX pgbouncer.initd-r2 2204 BLAKE2B 9c417188d4a762906c7631f1ae8fc7c7b8f6c52805acf6bfc12d580c53b2faa4e36b7c0662852feaf78aebcc29498bb8ae441d749a710793508c6950a448862f SHA512 dd9e8f7487affcc46b359e6d07a4c2fd698626d7360d2b2929389bbd7a340059eb27f0e0e9a648b7005c446d65762edbb02b865fa68194ebb822c01fba19fd7e
 DIST pgbouncer-1.10.0.tar.gz 480571 BLAKE2B a0c1dadc48f38cfe0ba2641791b4734da84cfe6674198bb2a8014bc92543850e909d7b4649b99e78d58febaa0f89f62b6694f6333b1111cbd62ff2f22741984d SHA512 8ec9f102b57ca5f92fb689588ec090056ac29f21825400ec67bca413fe076ad50e0b491e65c4cfebc488cc245eb3c88c36db2ee0ba1cb737f35404be0983dd1d
 DIST pgbouncer-1.9.0.tar.gz 469300 BLAKE2B 466f171a49ec9ce9be9a9d3208780cfbff956da7c74ec4332c7104ea537cb47a5cfdc0d80bbd96d233769b6f430f1ad99b623caefa2dc93af7ba336dd0f49514 SHA512 b127f4cb60ca5cdf339da76727918f0a3797a3e0a89f8ed6fdcaa80f3391d2c5bb51e19731915775210c0e5070dd611ee2e410c9a947624e45b5cf11aecdacf9
-EBUILD pgbouncer-1.10.0.ebuild 1892 BLAKE2B e4b9d58e27de0d8987f7f2bcb8b2a722e39888c66b97416718e4304bd900a9d35cc396d9c3a5c798e1b7b90565894eb19c67416c7c706f4362dac89bb6d437d1 SHA512 03d92729e095715fbfb09203dd078e2d6e4a6f76862bf672af75362a999bfbdbd28ee502c6c7d39f49c80f9231f0b28906d60a738b3063106b4540e38ab21a2e
+EBUILD pgbouncer-1.10.0.ebuild 1890 BLAKE2B 3040ae1502615e4b2dbc4a4e0baf503908eb97d53c94b98188edfe7916b3e9dfbac3d4ed74ad583cf36532260c0ebb12fbf0d5fee45c7efbb257720655ddb8de SHA512 4eb12a8791b02fa1ed0b0ab941194fb713a8b83a7d18e1d090a0603d29d2e37572725cc050764239749bc53b2b4a64bf044fa32ad08f9056fffc81144ca79d7b
 EBUILD pgbouncer-1.9.0.ebuild 1893 BLAKE2B be596d0ec72a92b9c4351de0e9ff04b5f5f12e4c53684c12aec583e577ff20729f015890394e7ebeabdbf97ef84bcf6e4bad114b84c59e2ab07bd4ecd73c1013 SHA512 b65617a84baa28abb9c207f1a0567d9267cb936823539d908dcde9735fbb66d3b2619386e74fa8f4222cbba7b09227b03f3d9c2ec2abdfe21316110941a7c56e
 MISC metadata.xml 472 BLAKE2B b06a5dca1ee52c85fa1f948c4c8cf6e83c0aba3e0b0bd77672f1585c01d0a2f8ef4d7502e30e9cb658ec3dd3e53560671b69210166c36b4ce888e329f531585b SHA512 b098e87be6194706f462bb93c4bf5425023f7bd90a0ed421a51ea42db98c85ebd77f23eb413f4e271e126ad4404cd0bdf0694f675662c421f7afd8ec0f036b4d
diff --git a/dev-db/pgbouncer/pgbouncer-1.10.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.10.0.ebuild
index caae5f40fcfd..e10c0a287d82 100644
--- a/dev-db/pgbouncer/pgbouncer-1.10.0.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.10.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://pgbouncer.github.io"
 SRC_URI="https://pgbouncer.github.io/downloads/files/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+c-ares debug doc pam ssl -udns"
 
 # At-most-one-of, one can be enabled but not both
diff --git a/dev-db/spatialite/Manifest b/dev-db/spatialite/Manifest
index 86453745b1a5..cca12fb31bb4 100644
--- a/dev-db/spatialite/Manifest
+++ b/dev-db/spatialite/Manifest
@@ -1,5 +1,5 @@
 DIST libspatialite-4.3.0.tar.gz 4439538 BLAKE2B f3bbda3b9d6099197691eb85e20c693d5cbc3a8958c8f23bd1ba57add9d8676895163d845a4aadd690650244ffa7ae2a02ce86e844e032b815fe4c94f30fb4b8 SHA512 b686766ed90711a41efbf219a8942ead8aefda8784a9cabc59233f107e0e10eda949d022152af1064a169975aa6a47515f6064589166418b853427dde5779ecc
 DIST libspatialite-4.3.0a.tar.gz 4440660 BLAKE2B 2eb2afb96b096b86be9c30cf71663b7b2839d345b6c418fc8511653ed59d0aeff1756b6b19807140c67128c938e39be66d13088640658d14883c92c438c97251 SHA512 adfd63e8dde0f370b07e4e7bb557647d2bfb5549205b60bdcaaca69ff81298a3d885e7c1ca515ef56dd0aca152ae940df8b5dbcb65bb61ae0a9337499895c3c0
 EBUILD spatialite-4.3.0-r1.ebuild 1060 BLAKE2B f01a8c5e0d60da79a3d3a524fdbd51b8afe63285746e1b5458d05742d0eb2b78bc02550dbb326f86691f0559a3d5c2f039007cba60fc3f07d9f49c1ad95b658b SHA512 1acdc18e95954a6bd6c510c80ea85b78f59435efa66f53d1f4029cc536f301243bb030161a2ad4eed596f15d2c4f1ce52b4fd673400decd171da9b11e356d582
-EBUILD spatialite-4.3.0a.ebuild 1072 BLAKE2B fca30b1c5e55b319b8b06ad509a2e305e8bad3fd5c208ec17991f0aba11ea8acdf8bd32a976511cb55d979e298c09f8973757ed2c627e4c91b658154d8682ac1 SHA512 1c63596e1101681677dfb36866f1e6135520cc6687243383d3c5b859d85bb899ea6ee0729a98448c7a8d8e882a79739c4b5cf235edead99ddc75d2336d47c90e
+EBUILD spatialite-4.3.0a.ebuild 1067 BLAKE2B 25892661a8a88737205c12710502236cfd26adcac2872a41c75adb265db5fa71e7719a59d734a7ef86f8aec6af9873a8cf242650bf3688cea49c3da1dc035a01 SHA512 46a1254fcdf31bcb867ddd74cf330c2c62911a9b3b79a6dd9dd5dc6b75a9d1902d0d69e59e0d7ff55b38a9abcc7ef32985d881e52a0d9c0d0dacd0c1b5a71a6c
 MISC metadata.xml 559 BLAKE2B b128c4425723bb652063fd3ebebcd83de75a44c7a01e5a8b6c6596cad0bcd1a5f86977f4e3b49d2f1945ea83f12f9761ba712d5f1d919338996c7ddf18bc4a66 SHA512 a21438d83d828b52e4fc16f91edd29e6ace87ada9b697cf233b847a6d3a9f5196135769993873f23409f98548bf852a4e89645c2b0eaf57bd8427ff6dcc36111
diff --git a/dev-db/spatialite/spatialite-4.3.0a.ebuild b/dev-db/spatialite/spatialite-4.3.0a.ebuild
index d822e5ce055d..796d1774d60c 100644
--- a/dev-db/spatialite/spatialite-4.3.0a.ebuild
+++ b/dev-db/spatialite/spatialite-4.3.0a.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="https://www.gaia-gis.it/gaia-sins/${MY_PN}-sources/${MY_P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="+geos iconv +proj test +xls +xml"
 
 RDEPEND="
diff --git a/dev-db/sqlcipher/Manifest b/dev-db/sqlcipher/Manifest
index dbb55864f1f9..c77bf9f9e062 100644
--- a/dev-db/sqlcipher/Manifest
+++ b/dev-db/sqlcipher/Manifest
@@ -2,5 +2,5 @@ AUX sqlcipher-3.4.2-libressl-2.8.patch 490 BLAKE2B 5ac29fbf1370f1ed1a28335d68f86
 DIST sqlcipher-3.4.2.tar.gz 14743960 BLAKE2B 88ee265b02bb9a42734c2ef93070c8fd8e13d546d7cc85e7fbfd6e6046ccbf2626d75e14b19cbba379c99784c7311d0100de06235b99b4908c60c99890d8d7a2 SHA512 c620bf2b175e404afd60ebe76b5476f5a447ff5fcdfa31bebc3f4bd7f1ebfcd507ee423cd582c9b3d6431d8b57320171492da2586e1a739adb4f440e7443dc03
 DIST sqlcipher-4.0.1.tar.gz 17006324 BLAKE2B 44e8eb4e1230c3625b4fe1b4af608cd8edc25f3c6adf7e11450c8f9ddb7970fea92ff0823f3a1e631d1b0acfbab6cf078c80e4645c535d66de57f1d73b55ff47 SHA512 0fb48326860a10e9849b2f56fae0c310deae124c7203b54d51f92d346782be795d505c29eafbdfb7206f5e7be54c0f7228fe50c45bd9d2b23cca976b263264fc
 EBUILD sqlcipher-3.4.2.ebuild 1470 BLAKE2B f0820774b609ca8045c015687c966909e2094577eb741fea9efc43d73d69712c6c38f1faec36cb7f4e68ccd8785cc99e6593956525591a8f98dbdffb8003f873 SHA512 80590c4c20230c9af47c3c2e8a51175bbc258c3738aba529879906976700880d67ff66840c69cbb32a53a5ff7344c90774b2905f3429e5eee0f005376a060c96
-EBUILD sqlcipher-4.0.1.ebuild 1627 BLAKE2B 258ddb4af9b98087b013a41470c32774c6b148b22facc1c81557428d74737be2036b7848a9a31ddbb74ae15673596b37a4988cfdb7bc7b5f701ec50e2423515f SHA512 fe40b4090a11183d24961031aa11c3bfed87694f1845789eda90a84a79c6d3bc6638018128de5ed92a2f428a462a3a2ef1688122927b85246ba4e6ca6741edd8
+EBUILD sqlcipher-4.0.1.ebuild 1670 BLAKE2B 05bafb28456a408367973a8115b5ae9e273be86e3391225ff1170c34297c84d3ed012bbbbef5287091d329390fd6cc9e5d787051139ce6fdc6ccd6348f59c43f SHA512 b80daff29d79ed5d74cdecd1f7ba95f5050d42633d1f9058865f4cc046fb1b73979378b3122a45910666b4de28608e23cabc86c62bea6cfe68c5d212db40dcbf
 MISC metadata.xml 341 BLAKE2B f5035fe38770437027936a72b9b7d66854fd6a19cf19f7140e409e8004297ed3da11aab122ba81b2f2b5d82302e8252462a7f185de0a998f79d348dd45e16c7e SHA512 b387658993279fb3c74c7647b36035f5c0e0e3e81a3cf4eab28f3dac19319f0b6958cfa16fab30295e5508c0810d601b0e2899710f57e992886f35c781e37dfa
diff --git a/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild b/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
index 7ce770c2ff1d..587212f81091 100644
--- a/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
+++ b/dev-db/sqlcipher/sqlcipher-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sqlcipher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug libedit readline libressl static-libs tcl test"
 
@@ -35,6 +35,9 @@ REQUIRED_USE="
 
 DOCS=( README.md )
 
+# Testsuite fails, bug #692310
+RESTRICT="test"
+
 src_prepare() {
 	# Column metadata added due to bug #670346
 	append-cflags -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_COLUMN_METADATA
diff --git a/dev-dotnet/Manifest.gz b/dev-dotnet/Manifest.gz
index 2c94b6234b0d..c9cb02678b40 100644
--- a/dev-dotnet/Manifest.gz
+++ b/dev-dotnet/Manifest.gz
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index bb98e26b160b..ace3878fd36a 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -6,10 +6,12 @@ AUX libgdiplus-5.6.1-cofigure.patch 584 BLAKE2B f498e2fc3ac920fddb6ba541806a6662
 DIST libgdiplus-2.10.9.tar.bz2 2074317 BLAKE2B ddbdc22d61734e9141f7d05b45867b1c0ac89903a74d23a3b05d247913aaac5350a603a5d7acb85338b2e9877b077c3c4b43839b33b2f6507b76035124cb43b4 SHA512 7f1944795c7ede5fd92a6d7e8d7d6cf2ef3c154e656b83e769b417f8f7195dd975084afe3c3cd1dda1ecb2c1167f76c0b5714cd16d549ff056add09763c6b26c
 DIST libgdiplus-4.2.tar.gz 687398 BLAKE2B e9b5912cb63de9692861b09ceeb5ad55fa6999960fddbbe55382f957591e68bede91550c2d49ed4bc78d118288ca6b35a2b2ab69f87f9fcc289b7fe2b1853b7a SHA512 102d1e07a106fa32640a20c4843bf82b3f628c5b7a3813d39c7712f2cd09d80dc5adb337a8d5bdbae065f876a0c433a5d8fcb7d761dff5ee08c48cac2cd2344e
 DIST libgdiplus-5.6.1.tar.gz 734255 BLAKE2B db54559b6bb6ea3f3f966de8692f08c4a042d0719b45263d3f546be1c7795a86d26943d699284acded8419a969238f58f2482090186df1b167d650343900729d SHA512 f1e477e4cbdd83f15bd8edc0feb975399c3eca042cafd1795a018f412b88ad5eb82d2cb0852d2009fdaa6f17d1c62c6b81340578f00eccc2e98ac9debe4a748e
+DIST libgdiplus-6.0.2.tar.gz 1377140 BLAKE2B 5c639a14371eadee0bfa2ad135284089c65212bde0909d21af8f80fd5bdf7283a8aa688ed88df374a0eac0696a377ba05419b12d9a93b37550c020d2b9961ee0 SHA512 b334846cf9471e6f81a3e0a2d6b68c9a39f52e6b22833432e34d3823ae12e3aa9d481806ea9a078463a77f56f3265633447d6709c5ade86ea117d3690f16472c
 EBUILD libgdiplus-2.10.9-r1.ebuild 1523 BLAKE2B 847c523bde5b3abd495e4c76082d280efa16f209a881f07d3fe7532878786a361ab5f2fc7be625f8727dcefd0ba77f3bf1a8854ea0b7a1a8e15e9737716369b9 SHA512 a9dbc3ef37a1afafeffd9c9d281b875cee2eee7fcf5c85d9fd10dff1c27f4f5e2d5057f9f38e39bd33291a1dd3dbfb1feb6563b4f67e17139773e57f8a94446e
 EBUILD libgdiplus-2.10.9-r2.ebuild 1583 BLAKE2B 32d47adb2856d6c7b8e753dbe4007b4d33603006ba82812c4d9e94cff330f26a90f553dfac494efdee917ae02d80d31219a349d9fc9b7c6adad5e3575d9dfc8a SHA512 5b25404630bfc2c784bec27774753fcfbc1929eca72cf18b6009a464bb869fd072f0cf1c97edafa7b121cff1e011276d9923d48ec594db49fce8ad6203c54166
 EBUILD libgdiplus-2.10.9-r3.ebuild 1528 BLAKE2B 27e5d30b24b4f95f7cabaf03e84cd4bae4bc36f94ef6f2adc70524cceac7010fa836fd637de9adf70b816ff39d3f12dfcb9fe692be99b743373f3b0b67e8d0b0 SHA512 0850083e0c58534b631ef1907d32bc6262e5d148382b05749dd0369d7e6b44353a1bdd3fb5ac16c5f7b03e5dbc4e26f6ff7868337da5e0305ba517e784a17ec1
 EBUILD libgdiplus-4.2-r2.ebuild 1132 BLAKE2B 4336653b18726b170b65ddef6d838379dd2295bbda68a37271a63a8ce4d9e0d67c46fd740822d7c923489e772d1393e44fe6eb87bdf36808c16c438397d0cc5f SHA512 ffc9919aae1e9147405efb36f7148e0d82b744dab6572d24d7de7c58047ce352751b35a79e23a6323e67e2a68b8647d33ff670f98f3d375822a363ee0c1657cc
 EBUILD libgdiplus-4.2-r3.ebuild 1125 BLAKE2B e20bdf499a79fd80c336203a5f54674386652c815bfa7b0cf9ad1653b5afbd8a7d58fb7439de06e6d423196a122e7d8c97ca8dcd0ad81950c421c0c246eb04cd SHA512 b01f877626e6022b20e0efe75f08be9c89862c783cddbd7f4db942dcdc66161646f8db7e2c112551940d7f1abd3cdde986e703b662ea5676f19e5526cb3c7253
 EBUILD libgdiplus-5.6.1-r1.ebuild 1269 BLAKE2B 27b1a5edde2da961a2233a0f84d8902341df87ccc74d010b8ac84e97cc5bea53b2ba4c923f07abc588f46a2431c64e290c132367a8c456cce972f186ed9ac846 SHA512 409f31a55254b38faea5e05cf90f7951647ed72b05a4f5a5d4acc0f5532cb817dbf672d792be0c09310bdc256bfbfc18368287ae2bad647d1db2a0f971e91f40
+EBUILD libgdiplus-6.0.2.ebuild 1149 BLAKE2B e6708254599946a566b638d9074a45b9bccbcf5daec1cf159c93edb622e11d1137b82f0123caab2fccd673fe5fabe4f9e08313e70708f7dda4db4fe540c5ac9d SHA512 b5bb113818b4be440da072d8d4a70d88e4e770d3b5e95932bc94f4a727b6e83ca2911f4a5913877a0b5156a0039b43f59b19060b9833dfac52937fbaf59a0f68
 MISC metadata.xml 255 BLAKE2B 495c21dcece437a54ddf2ba6c003601ac84e8ff4f4dd814be0cdae9bb3b6d81ce49f3b00f47ad9ca73f1c9a8b11ed9addaa3c5b8352857813e76d994d020292f SHA512 2ad078558aba9045a782316fc558ea3c6edf579a77a87c0096e3a85ac78a73904a5ceb48cec15ed30fafacc79a66fcf6836acac43d311d1840ccdd62fc2a6896
diff --git a/dev-dotnet/libgdiplus/libgdiplus-6.0.2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-6.0.2.ebuild
new file mode 100644
index 000000000000..4c37480bf4c9
--- /dev/null
+++ b/dev-dotnet/libgdiplus/libgdiplus-6.0.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit dotnet
+
+DESCRIPTION="Library for using System.Drawing with Mono"
+HOMEPAGE="https://www.mono-project.com"
+SRC_URI="https://download.mono-project.com/sources/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cairo"
+#skip tests due https://bugs.gentoo.org/687784
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib
+	media-libs/freetype
+	media-libs/fontconfig
+	>=media-libs/giflib-5.1.2
+	media-libs/libexif
+	media-libs/libpng:0=
+	media-libs/tiff
+	x11-libs/cairo[X]
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	virtual/jpeg:0
+	!cairo? ( x11-libs/pango )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(usex cairo "" "--with-pango")
+}
+
+src_install () {
+	default
+
+	dotnet_multilib_comply
+	local commondoc=( AUTHORS ChangeLog README TODO )
+	for docfile in "${commondoc[@]}"; do
+		[[ -e "${docfile}" ]] && dodoc "${docfile}"
+	done
+	[[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}"
+	prune_libtool_files
+}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index a248f87e54b6..b50184a550ec 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 9f40f475ed79..12ca3747cb2b 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,7 +1,7 @@
 DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a
 DIST openocd-0.9.0.tar.gz 4970346 BLAKE2B 96421b32a3e64fc1ed362288f5a444cc1249f3d6daab6307f920c86fff11cb74a0bbb9f021788b848a8755139ee1c43c54793ac57a429f4e39df47f0775c2538 SHA512 698b43867f8134da43a50f5d2ff2ae33b71df8ccffc45fb5c3d0bd7a6289fcd9e7bb3d89287ad4dbdb02e1871db69f3913db950965335eaf8559247f2e58c227
-EBUILD openocd-0.10.0-r1.ebuild 2832 BLAKE2B 95431b3b1fe66566760772c5ff12b5036c708613a1c422b5a02dc8f8d51c87b273f84b5f776702209ab9e3a931257dc9f11992354cee24da16f2f22c3a843103 SHA512 6e9d5bb38eddf68aff7accef4dd837c0cb454c5b219dc7a59408bd5463e6476a8e14feb0e1dbaff0582d551fba0076f9a2de6fe1037a07967bc30b094e06500d
+EBUILD openocd-0.10.0-r1.ebuild 2825 BLAKE2B f18eb669df565c32504a0194082dcc58d4a872475fda87b5cf8abf3f509fbb2e6a65abf1374bda1c06d9556789b3a7c665493e6a243b0094506094c283271b6d SHA512 9b306e9dafc7bdf1c88caeb023b3f350db5d84e826523b1a31f9edef41a86960fb6a9dbc5d743f9ffd5b56ba1f7796510ab31eeafc31db9d4b246a204c6e0170
 EBUILD openocd-0.10.0.ebuild 2806 BLAKE2B d46464e208310d3ec2a615535b4e54e4f73aa1977b1c72b94cc5fb9a165b6d53c2b2042d85c60b49559e64631b109adfceb55dc083a0fcf5836a1e3368da658f SHA512 90ce1e9b75251e998c4bb7ab2570154ebfa401e7f5b5fcf4d669b3c30505431e224bba45c5f2b26255cd8fb84f89cdafb00a615029acee993413a39552eb30c8
 EBUILD openocd-0.9.0.ebuild 2667 BLAKE2B 31aabad3b6f6e5006c007a28f7e8a5af4e946b5fb41f269cca67711a10e4a6a7f679b04529422cd25d6db154ca16321fa06a43518a76cce49d7a342cc72fc1ff SHA512 8acf019ba88414e2984edf5398bc98bc8eec74a267a7862c715aad851c76e9f369b40d35793cbfef0c04da159ff5a87e495ef01b42aeb4aab025daff0f3ce0c4
-EBUILD openocd-9999.ebuild 2832 BLAKE2B 95431b3b1fe66566760772c5ff12b5036c708613a1c422b5a02dc8f8d51c87b273f84b5f776702209ab9e3a931257dc9f11992354cee24da16f2f22c3a843103 SHA512 6e9d5bb38eddf68aff7accef4dd837c0cb454c5b219dc7a59408bd5463e6476a8e14feb0e1dbaff0582d551fba0076f9a2de6fe1037a07967bc30b094e06500d
+EBUILD openocd-9999.ebuild 2825 BLAKE2B f18eb669df565c32504a0194082dcc58d4a872475fda87b5cf8abf3f509fbb2e6a65abf1374bda1c06d9556789b3a7c665493e6a243b0094506094c283271b6d SHA512 9b306e9dafc7bdf1c88caeb023b3f350db5d84e826523b1a31f9edef41a86960fb6a9dbc5d743f9ffd5b56ba1f7796510ab31eeafc31db9d4b246a204c6e0170
 MISC metadata.xml 882 BLAKE2B f7ec7fcd46485cf4f0c9039718cda564607f6f048646b326781cf09b2383c8665b8d624a19070a659df718673f4639bc918808ae950d6013016a0349a9fa6cb3 SHA512 bd6d73764a65fb4df85ce70552f0db5d18d876a54f1f1b4f75cba7865bdc425de78797f747b77f96b1c1e5b342106dd883d02f9c638875914d91987604ea8b76
diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
index ce0f6e7381b5..3afa1fad8b47 100644
--- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
+++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
@@ -136,7 +136,7 @@ src_configure() {
 
 src_install() {
 	default
-	dostrip "${ED}"/usr/bin
+	dostrip /usr/bin
 	udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules
 }
 
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index ce0f6e7381b5..3afa1fad8b47 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -136,7 +136,7 @@ src_configure() {
 
 src_install() {
 	default
-	dostrip "${ED}"/usr/bin
+	dostrip /usr/bin
 	udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules
 }
 
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index b6ab5a21e4cb..b491d61001d6 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,4 +1,3 @@
-AUX platformio-4.0.0-Make-scripts-compatible-with-py2-and-py3.patch 1954 BLAKE2B 9bda9ae28cd356710e94153b7b54f649bf47a2899105e22a25763155311ce386df8682db16de89eeda89a468261f726276bda489ee8dadb8ccbb39db006fbeba SHA512 f80658f7f19c138270809d03d9a6dcaf3900d7b154d4ce8ae9413c2a6f10fe6e5549f3111c6eac12fe461780984c0ea4b98e1019d1eb4d74ec2a9668e121dd1f
-DIST platformio-4.0.0.tar.gz 139700 BLAKE2B 1b4e6e244a0596f2713c1c07ca117d55986776a0dbdbdf06a313226b04941e4ae22ceb3444eca943cd130a8dd8546050febebf3f4dc435b0407b32c61212b07a SHA512 dddb717e39d9ede8464090599d6bc636e258120e97327d666f3479c2b55c0c6c73708d5c1306118a6a56fa2a85471cec6865d9465726174486a70832e32bc1d7
-EBUILD platformio-4.0.0.ebuild 994 BLAKE2B bb3d8cfefde2544aafc65a90f7127d4c717739b10f5d6b0b20665bf2c1b07b691a33079f1992131cb5db6b321fabfe57b0e2b8ae4d44fe5cb587c9d76d8e6638 SHA512 c692d79032509a00714791903767665a6655327239945efd01e822e52be6ef4f6f3baddcbe047aa2c23e8a23b2a059ae66b701067e5990ee56acbbdc0e45410f
+DIST platformio-4.0.1.tar.gz 140325 BLAKE2B 82992e97c91fefcdbdb219cae066aa6314cc55f0461e7fffd9d8e7b36a308a7bb8ccffb3fe7a7b676b9866b1e6c18980b40c4f009919f649e68331b316593a63 SHA512 d74784f72d93039eb32fd984dd2cdfeb00d5a36a005bb9aefa7501d8b310ff3f7367ce9b40265095ecb06594e7e3841a7b677bffa1f9215a39b7d3c6e7e4afc2
+EBUILD platformio-4.0.1.ebuild 915 BLAKE2B 0b2fa6eeb7969312640397cce69c7fd6a8f87ff8bebbd9264cc52841f2958fb9824399768306b86001e0b9ef467592f968d8db7bd4b7cbee15f6657f1150b674 SHA512 0ded16bf5ff8e66656e5ef849d22a577e494313720ac7497efcfdbba46eb9c5c513e7b4cf48d2e4f44d8560fe0a0b0b4442893a77058a6606da4247407aa59f8
 MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
diff --git a/dev-embedded/platformio/files/platformio-4.0.0-Make-scripts-compatible-with-py2-and-py3.patch b/dev-embedded/platformio/files/platformio-4.0.0-Make-scripts-compatible-with-py2-and-py3.patch
deleted file mode 100644
index c899105dde6c..000000000000
--- a/dev-embedded/platformio/files/platformio-4.0.0-Make-scripts-compatible-with-py2-and-py3.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From e1d5cb23f342269e1e99b017c1082cd6208b8c9d Mon Sep 17 00:00:00 2001
-From: Alexey Shvetsov <alexxy@gentoo.org>
-Date: Fri, 12 Jul 2019 11:26:27 +0300
-Subject: [PATCH] Make scripts compatible with py2 and py3
-
-Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
----
- scripts/docspregen.py | 5 +++--
- scripts/fixsymlink.py | 4 +++-
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/scripts/docspregen.py b/scripts/docspregen.py
-index b4e5a67f..ab43bd7c 100644
---- a/scripts/docspregen.py
-+++ b/scripts/docspregen.py
-@@ -11,6 +11,7 @@
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
-+from __future__ import print_function
- 
- import os
- import urlparse
-@@ -280,7 +281,7 @@ Packages
- 
- 
- def generate_platform(name, rst_dir):
--    print "Processing platform: %s" % name
-+    print("Processing platform: %s" % name)
- 
-     compatible_boards = [
-         board for board in BOARDS if name == board['platform']
-@@ -439,7 +440,7 @@ def update_platform_docs():
- 
- 
- def generate_framework(type_, data, rst_dir=None):
--    print "Processing framework: %s" % type_
-+    print("Processing framework: %s" % type_)
- 
-     compatible_platforms = [
-         m for m in PLATFORM_MANIFESTS
-diff --git a/scripts/fixsymlink.py b/scripts/fixsymlink.py
-index a73a0109..b250b04b 100644
---- a/scripts/fixsymlink.py
-+++ b/scripts/fixsymlink.py
-@@ -12,13 +12,15 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
-+from __future__ import print_function
-+
- from os import chdir, getcwd, readlink, remove, symlink, walk
- from os.path import exists, islink, join, relpath
- from sys import exit as sys_exit
- 
- 
- def fix_symlink(root, fname, brokenlink):
--    print root, fname, brokenlink
-+    print(root, fname, brokenlink)
-     prevcwd = getcwd()
- 
-     chdir(root)
--- 
-2.22.0
-
diff --git a/dev-embedded/platformio/platformio-4.0.0.ebuild b/dev-embedded/platformio/platformio-4.0.0.ebuild
deleted file mode 100644
index 5200247c4260..000000000000
--- a/dev-embedded/platformio/platformio-4.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="An open source ecosystem for IoT development"
-HOMEPAGE="https://platformio.org/"
-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}]"
-RDEPEND="${DEPEND}
-	<dev-python/bottle-0.13[${PYTHON_USEDEP}]
-	>=dev-python/click-5[${PYTHON_USEDEP}]
-	<dev-python/click-8[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-3[${PYTHON_USEDEP}]
-	<dev-python/pyserial-4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/semantic_version-3[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${P}-Make-scripts-compatible-with-py2-and-py3.patch" )
diff --git a/dev-embedded/platformio/platformio-4.0.1.ebuild b/dev-embedded/platformio/platformio-4.0.1.ebuild
new file mode 100644
index 000000000000..3062aaa44234
--- /dev/null
+++ b/dev-embedded/platformio/platformio-4.0.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=( python2_7 python3_{5,6,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="An open source ecosystem for IoT development"
+HOMEPAGE="https://platformio.org/"
+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}]"
+RDEPEND="${DEPEND}
+	<dev-python/bottle-0.13[${PYTHON_USEDEP}]
+	>=dev-python/click-5[${PYTHON_USEDEP}]
+	<dev-python/click-8[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	>=dev-python/pyserial-3[${PYTHON_USEDEP}]
+	<dev-python/pyserial-4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/semantic_version-3[${PYTHON_USEDEP}]"
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 783f15c29a7f..a8222e96fa90 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,6 +1,6 @@
 AUX sdcc-3.8.0-override-override.patch 1078 BLAKE2B f1e1e135b9ee972e8f7f6a08af736de227c8534d181f160b00f6eecef0e7f4366e39fc5a8f6034bfffa64531423d28377c778055d6be8671527971ce183ebab5 SHA512 fbc13832bea859409f2ae525a82927424dd474db9c6077d1311b9775d0a4a8728d79db7465c928271faa54221b53982ee539537e4fe8a70209c0f453b95105aa
 DIST sdcc-doc-3.8.0.tar.bz2 965465 BLAKE2B 541ed3ba4d3a23dd3fcea248de84d887fdcd8ddaf3ed0f9f810bf8cb9fcb5b10eb2cd96099d83c5a0fda240cdd3d11fd247e576a67a32047a4f7a705b8401637 SHA512 63319b7c344b320600e6a7c158d1a5e69abe595dfd6b8d32a95f15678c3bc2f6fe72c959516c4b1f812deb089854c6a51c31438ef6a6c7f9fcb4d419d8cce3cf
 DIST sdcc-src-3.8.0.tar.bz2 18987862 BLAKE2B 7e8ddea41ae02842bb1376c53364c386a0fb47a1acdcc97cc72f002e78a2854fc43adfd0177f94dd1173dbd81052c390c5b2fef302c73f0b830ec83eea70869c SHA512 38145ea3e9560eb8894c54bd7213da67a20163739c944c3247fa8fa456dfedaaa469746169d3e114affcab48b73db4cd8c9a0a367e7368f2471de64761a3e04a
-EBUILD sdcc-3.8.0-r1.ebuild 3180 BLAKE2B 5f84d00b7f4a1b736212145f832b33117c2a4330e6492906cf6c64a3ecb82beb00f00da3a8f9794a7e774888fa04faccb6c48dd00c9a3d2e472b1269de9db034 SHA512 4ff5aaf7070b8e5636a870b1dca64b7b535a7fb33cc1ba8bb54954f1d4ba20ddf67b3ba9b8a9d0bdc5f37c6615fc45553474be0066060df36235513d4ee9b90c
-EBUILD sdcc-9999.ebuild 3264 BLAKE2B 609d4a47ce42971463b114007b27b067673dcc35a6f0bc79d151900752e7b33ac2acf37a1f448ff130d7990f2924df0df9c914eab312b7cb8a2b8d2e7bce8fa4 SHA512 9114783f8f825bb0cd2ace897dbc857ff8ab3c15390818a2c1387fd3aad9d53218034a9464a94cfb1aa40d4cbff3cab8ebb7d59db318bbe105c2d31ad81a171e
+EBUILD sdcc-3.8.0-r1.ebuild 3172 BLAKE2B 163f8a7661e0d0b6257686bf4e7408fb3056cc14e731c0dc5be6cf819d30b2b1b96ba45ada2943bb57f1445334c2615bd33b93140fb3d5534486d7fab7889469 SHA512 99d12ad53ffce563606c4dddf59431057eb0c7d04d8614d734ce8012dd775e12b936a7fba952aa52829d16ad13b2dc300fd407988f98da6c2b594286b1319ed5
+EBUILD sdcc-9999.ebuild 3174 BLAKE2B f9a9c96ce5f65c64f64804f0ed9c950dca6df2a9b639e75c13761e0408547e24a42fc0b0e25deec42d25f78401b7c33ff5d54383892cae0ef9b32b43e8353176 SHA512 8ad8ae7622209bf0d6c9aa9e64aac840666540688a63cc9b38ace027b0f60608737bf10bd19524dc9145469c1a96ffc84b8b7c7e8277aace7fc5272fdd66beb4
 MISC metadata.xml 2284 BLAKE2B e3fdd79032b8f663940903ed11a92c199048bcc485d24c3d7ab99757e3cdad1438c319cc7327f53921f7c853a59fe0a6bc4dfc5df84d4edfd92feae42459b858 SHA512 cd4b8ed438d294e239e67f0037d1f0f044215d2c6da8a13a661ebd56c3501df0ed7ecb41fb0c34f150345c5008dc3d37d9df127da60bb6c59bb630f1c695c118
diff --git a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
index 79c2981dc3e6..08e64f35f2be 100644
--- a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
@@ -129,5 +129,5 @@ src_install() {
 	# a bunch of archives (*.a) are built & installed by gputils
 	# for PIC processors, but they do not work with standard `ar`
 	# & `scanelf` utils and they're not for the host.
-	dostrip "${D%/}"/usr/bin
+	dostrip /usr/bin
 }
diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index efab11532f4c..23c2e5edc149 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
@@ -129,8 +129,5 @@ src_install() {
 	# a bunch of archives (*.a) are built & installed by gputils
 	# for PIC processors, but they do not work with standard `ar`
 	# & `scanelf` utils and they're not for the host.
-
-	# TODO: use dostrip from EAPI=7 when subversion gets EAPI=7
-	# in bug #678344:
-	#dostrip "${D%/}"/usr/bin
+	dostrip /usr/bin
 }
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 48cb3e5eee40..578236de1833 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -3,5 +3,5 @@ DIST u-boot-2018.11.tar.bz2 13045125 BLAKE2B d2522e1eb2fb899f1217261b6c311be35ae
 DIST u-boot-2019.01.tar.bz2 13366005 BLAKE2B 161d927d5f2cb38c6a930f0b5edfedeb3a93586ea98e03066a1fa9c516bfc1f6ab8d5ba60b36714d10c08232971e7a0987f4d0a05635fa14a6359bb120aa0ed2 SHA512 d9699cd22afe9bc747d64208068c2cf8a2c3143d161ede24536f6fd6adfd6b81e28920589722639e2e48fcf34e8dbde3ead7f691f14cbcc38cd75694d14d719b
 EBUILD u-boot-tools-2018.05.ebuild 974 BLAKE2B ffd7532ae3a54be2ea17e0aaf14e75b0e04a689189836f0aa9ac2c29bbaa4e941754139d6a24df0357b0b7af86b25992b9ed8bfc9682f50e8943be6f83341c9b SHA512 5c0e013d89eb70a6d88caf827a3ca1976a308c2f7ad5ac79a9e6a449327a9ad2f971c253f7ed955a57f713166a4528e31bec318da7db6279f357c98529750ee0
 EBUILD u-boot-tools-2018.11.ebuild 974 BLAKE2B 6ba1448e0829b731c0ea94da9202d4469b4581baf4807b2290e0c170ce7a9f9d216d041dbb41da55596e16c547206b80e461e25b5871a352c5dcdec90f7b00c7 SHA512 14e67fb478af1fcdd40d5563242c737ac2b170444fe787ef6e98ba8e4027cdc6159eaeac7b86ccff5899744fc2a1beb2793da2e8f232d1312a7634b630952e5e
-EBUILD u-boot-tools-2019.01.ebuild 1184 BLAKE2B edc37a255535fe1023f147dda1048ed4bcc0862b9f943af301b315664af3dc178fba3d701b214f63c9d6a6dadd8f7e692d1b566f520790661c40adda399af0d9 SHA512 5dae4263a4d449dd5f01abb95ab5df1990093bc696567dd91504121a04f2fa112a8eb79064b0673f255688a418d7701d6ad44893a1ac9f42b43d4783af4e62cb
+EBUILD u-boot-tools-2019.01.ebuild 1202 BLAKE2B d502ddc627f422745835a9f0ce3ac44ab212f3ffc2c6adfa010874c00035b513a587f3849f898e76a86a48843988dd926507ff51cb79d746cb917411b0a0d5c5 SHA512 22cdb73d2a2d110927edb13f2eeb334b6cf30e944e1489798e2fbcef264a834d6ce8c1db39c1347691d41b888c5be0ededd5da2548f7cf483ae8b542fa5ca492
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2019.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2019.01.ebuild
index ef93a0051969..e0e563ba9537 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2019.01.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2019.01.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -31,7 +31,7 @@ src_compile() {
 		HOSTCC="$(tc-getCC)" \
 		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
 		HOSTLDFLAGS="${LDFLAGS}" \
-		defconfig
+		tools-only_defconfig
 
 	emake \
 		V=1 \
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index 2b26b5dcbe58..392cb2df1334 100644
--- a/dev-erlang/Manifest.gz
+++ b/dev-erlang/Manifest.gz
diff --git a/dev-erlang/base64url/Manifest b/dev-erlang/base64url/Manifest
index ffa529272cf2..6a14b8a5649f 100644
--- a/dev-erlang/base64url/Manifest
+++ b/dev-erlang/base64url/Manifest
@@ -1,3 +1,5 @@
+DIST base64url-1.0.1.tar.gz 2726 BLAKE2B 38bf2e8d31cbd39a29d444f682692b6128ff41b0bd1496ea2db82f869a4f8f760a8cadaf81facee259bcf06b344cb340def8ed25af25b7b1f8b2e2213f81339b SHA512 7398dc99078053b6e0544eb8ca93e9616549493c02245084c220ec854f429139dcaba38dd522858dd74b95067979a3ec4378eb3abd5f6d1662af27687381c738
 DIST base64url-1.0.tar.gz 2759 BLAKE2B 7a9e1c4bd5343af2556b21255fed82375400088b461ad6aa5b308c49eb5fefe3597419a6cc6990ad8e29a11f4ac8814624f7c043ca19cecdfc1a4822e230693f SHA512 f9f5062d8a45c5d0fbfb7179359137e88a1af10e29c1329506446d2142331176f6be2aa30387e4c98855440c1da943ea16a655ed2ad5168d4f5f8a2cd1c47c5f
+EBUILD base64url-1.0.1.ebuild 419 BLAKE2B a71ca9d4703739b7e2799ba512dec58a2143a35bf29f41e14058575a040b557f8e479577fd840aea3b2db1bbb5d4fb1b2548988b7038750b931cc26ed33474c5 SHA512 7161ee9a67e20edeb5949b6f561fc17a1e3336a58b0389677eb9215ffe0ec658f00e6f50cab39db56a5ad521bc6f0417b623cf9f3f2e8b64ecaa727247a4dbaa
 EBUILD base64url-1.0.ebuild 423 BLAKE2B 293473eedb48581791f5e025ad92c3572907e33e14c67b2774f6bc5ea12f2945648e616ae55746e1b91ad8fe81000dcb8cb810c92ce8cded09acf686d6a0c272 SHA512 2214273c3fd6409dd5e70baa6b15cc9dc513ac04e6c977a4ee5f62a8d4fea39a370e89c869e9c4ba0985519aa8c5a6f7de7b0f885ab916089e53ea8ac15bfaac
 MISC metadata.xml 245 BLAKE2B 3328a7fe4ecf14ca85853187069c8c0aee48c99c35c44acc926ae3d8df68650132045273227fcbe99b9bd2cdf7cc7b4cc41e50b2d1380134eda85287b9e54773 SHA512 3bd1a8e0b458708f79cec57a377c3c4ecd100b7a10ae6c841175e3193a21fe1794be8e9c0ed746a967764d675e0cc105d78b0fe6ff40bf8dc8da1f0f16deda14
diff --git a/dev-erlang/base64url/base64url-1.0.1.ebuild b/dev-erlang/base64url/base64url-1.0.1.ebuild
new file mode 100644
index 000000000000..9f0f430eaa3b
--- /dev/null
+++ b/dev-erlang/base64url/base64url-1.0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="URL safe base64-compatible codec"
+HOMEPAGE="https://github.com/dvv/base64url"
+SRC_URI="https://github.com/dvv/base64url/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
diff --git a/dev-erlang/cache_tab/Manifest b/dev-erlang/cache_tab/Manifest
index 78435737a91e..77e22a8567e2 100644
--- a/dev-erlang/cache_tab/Manifest
+++ b/dev-erlang/cache_tab/Manifest
@@ -1,11 +1,13 @@
 DIST cache_tab-1.0.16.tar.gz 18736 BLAKE2B 7701ac2dbc57a8a2f3ebde2744ad27864e1e12d8a30bde5196789d702c0270345a74b9f064ca61835ace54d65d28f7b52e394abbcc155044f440752d13359862 SHA512 d4a81a64fc34ba6c784e9ade3575e6f6964d6273f84de4c0d81e18a9f9fa59547f6f270d76a42cf0061a63fddd04171e7de10abbc52de4c215f39697b7619746
 DIST cache_tab-1.0.2.tar.gz 12414 BLAKE2B 15c8d1bfe8e774b123bfedbe3ce7aaf006575670f8a41639effc7d9e4ad4e1717a47f02d195be7e60fabf8f0495ef05aa02ef91029cace32c7f66f147f723beb SHA512 9a4e225b4a1776771d964ef2b96b8eb976b930bb2e9c5ac93e1e8b238f6e259d086a550d41b4931fbde293306892cdde2a38a4af3afa581a74e9e76b5feef111
+DIST cache_tab-1.0.20.tar.gz 22903 BLAKE2B a083812091fccf085170db96a542e30caf924c09e6d55a35882e956b8660e2bdad9b9f428953cbb21e12c2dacb965713e9f2dd1f2772924cfdb190a436b55455 SHA512 5f2945c68b77dbce77c1e96c26e5d0d91e9d43df0228b4b49cd00335e272c81cc134ce465027cb14e9da6d92708c628dd841e676df0e7104f968506b3209266a
 DIST cache_tab-1.0.3.tar.gz 12600 BLAKE2B 5474ea27ee872893f1b834f361aeca17755d54571c853b39c87622daca03526529612c4ac04c5d7554d65ff838ef6bd32cff654ddbdd031b08deeb653f041591 SHA512 d6d6f23834144b58a590dcbda57c2f0d14fd6030a2ea1e1675d56ac1038618f275bb9f9f9c0f80fc03510f775c1a04637eebcf927daeb9af51e2c70efa8239f4
 DIST cache_tab-1.0.4.tar.gz 12611 BLAKE2B 191ea58bf29cd9bfe8b56a5418008e643199ac1a2f7e9b624a29a25d1f3a8a5fc85c6fc7f483b545458f3e1e4143e5cd5b79e06fbbfc60433806daed930559bc SHA512 c0f7167631eb11de59303a7cc96592c172c109019004f52759c6d5c02d581ca515a81568f2dca0bc1a38ea8303d48b5e415cf12629d27730318433843a1ff3eb
 DIST cache_tab-1.0.5.tar.gz 12632 BLAKE2B 12495a005982f23e3e2ec8fab85a1afbd6b1a49d7de8c8fcb784d9a0fd1aa21654d9df23670ad5418562a3c9854e5bb029f41a6c287cdde94e1724a220dd2314 SHA512 1a49f3e8c12f032d33fac18aab04a4fbfb0dfc31c22e1e47ee3005d65c80b6cc15cb8fccf955fee1a88002ce7b5dc1fd5fb13fd10196449117f21ac51c0abb39
 DIST cache_tab-1.0.7.tar.gz 12827 BLAKE2B 57d669e67a980550fb4d671b22e69ff2ebd0482aef9d6163ff831390135c7ee1e83e87ed50fdb8e331402398a7cae2b081ac2861125c92cff6e9570c564b2c40 SHA512 9727a0103f47d63e5a07d630ebf45b86d1f1ca7ab5006f127a749fb633a8a6b73b00ed5ddde6f420073a96542d0e073a420020947775bdadef5257675137787b
 EBUILD cache_tab-1.0.16.ebuild 515 BLAKE2B a987f4b454a11e3f56ff0c5bccc34393bc248fc3d3762cef06922bf7ec74f5b07cbf5934df081d597223858cfcba6078156871271732e592050db1e76bb2db28 SHA512 44e2eae89ea01030819ed5a562ca930f34e36df9e293201758b6f121bdab03ecbeecac51a7fde7b8658ee1243a412e1de6c05709885d30211a2e8b9b93a67110
 EBUILD cache_tab-1.0.2.ebuild 511 BLAKE2B 1b57e3e41b22e2625f111e54faf2f9fe9067ba54697c39a8fbd1feda9733dbd1e3894c4455469e6702e33ede06a21c255d252de2ec6b34a630e5938f50702496 SHA512 28f180faefccfe35c9f58f897f8fa0c87dc163c831a631833ec2f7f84fbb35b84792fa02b894ad12913b6c3ac3f2d793e49325c0a5a62a8839806673b7c680b2
+EBUILD cache_tab-1.0.20.ebuild 511 BLAKE2B dbeda452932672fdc4c40305c6e9c2b8d4ac66a112fe473abb154bf20bfbba0b46aa12252a6ee58bd53681f7cacfa927b8eab42287f7a00a5e0199eaedaf924d SHA512 f821bcad6a8a368e06414a5a805f6c3bb1861b883ba2fd87cc5cda204d872983fcfb4db01f32af2da5345a53e6571394d8612b1dbd97f6298b5f656d9b1d4972
 EBUILD cache_tab-1.0.3.ebuild 513 BLAKE2B 969f0afb070dc203f06944aa1c9e3265e01129998461efac0df89be570e9f3cae04099ae8e73abaf74d0e3beab832888519d9d19ab2deb31ba03732e178f9cd0 SHA512 debf2c7af326ca421de0af51fd6043fd30d14dc167826247edafc08257884bb7b901a515874b0e9c5b26953e09d31fa55de0f5fd4bcec57f12228e55594c5a9e
 EBUILD cache_tab-1.0.4.ebuild 511 BLAKE2B 75d469c04eaa18787523fb1d15e018b09808022224f657b7a7c21b25dd9d8fd898c8a3e1ee12bdd04a3c634a7fbedd657afa58cbebf1444a41f263cab1a4e9ff SHA512 d4eab4d39cada64eee3a95c74053e56ccf203e31c1c2e8f8abaa8793faf0db47deb496b38def8295981730769a38ccf18705c846a6950240db7372f8b2952f76
 EBUILD cache_tab-1.0.5.ebuild 514 BLAKE2B 0989ef23b83501b652c0dcf465beeb9b87aa8c71154fb4f25e1e7ba66db021695e437efc29bcbd4b75829d2ed8576d30385f5811838c040f2a748588c2e78347 SHA512 96f222f12c4cfc4162a18015445c95674a991d1bd6f3d68a1200396e188b9fbc69ff1779e704af0ccc2f3269f18d4bbe7f7cb57b1e863f500f456d3e658b727c
diff --git a/dev-erlang/cache_tab/cache_tab-1.0.20.ebuild b/dev-erlang/cache_tab/cache_tab-1.0.20.ebuild
new file mode 100644
index 000000000000..de4cb6d5c26d
--- /dev/null
+++ b/dev-erlang/cache_tab/cache_tab-1.0.20.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="In-memory cache Erlang and Elixir library"
+HOMEPAGE="https://github.com/processone/cache_tab"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.16
+	>=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/epam/Manifest b/dev-erlang/epam/Manifest
index 42114c89b4b5..d20e0e28884e 100644
--- a/dev-erlang/epam/Manifest
+++ b/dev-erlang/epam/Manifest
@@ -1,8 +1,10 @@
 DIST epam-1.0.0.tar.gz 44008 BLAKE2B 5dcb21b17bd3e4a2dca5ab4776aa609cce784f0df1f6192acaa35024a342d72f6233c03997218113bc54d18e9ef3473dc420f93a6f00fb2c2c8079c4ce6dc353 SHA512 c0b1fbdc1e910f24b2f39ea34cf6fd5859f3ab0cf762a16cf9ef71b1e49129c8238001151dd9031046049967f31fd2cb3d0c06a7d8bdd46e49f19862c143f374
 DIST epam-1.0.2.tar.gz 43720 BLAKE2B 39a1056d068bdceb7ff640a498b0766aa59649228b03e03f9385bfc106f45aa210315162d4386907a1e9cbc8f177289adebf72f527a4eaf270cd62413f1daa13 SHA512 a3fdb379d8c25e56e51dcf1e683d289e9f3d19a537b1a55ca4c09185eb5731fe073a5bf0dd1449f09f8ee5b7d868b0e63f04473c1f3d1b97722dcd9832e4e030
 DIST epam-1.0.4.tar.gz 43816 BLAKE2B a8070e45be428e1cd55dbe369051f2c5566d6d8d41af5d4258ec8dc86b70d7e55f316df10d0a65687d0ad8c5de2bd493859fd0c839ad57c90bb0eb1e4ea9db96 SHA512 46cbdfa683f48f24c4709837cba49745c3b7f87b6c1223b01ced65d547a8ec1a0467997070daf40bedeeb8298d7bb31eb33b331098b406964642f059b77fd313
+DIST epam-1.0.6.tar.gz 47494 BLAKE2B 8120e4f10222468ee2adf2f0ec9cffcaaea8c1fc92faf9889de0f970562631cb54cd9ba34d01994dcf657108c4232158d5617e4b9c884bc84e5eb383028b8e3f SHA512 2c316a46ac734be2c74a86e767b413fa8ff1b296622b85de4828fdd60c84e5b3962f8b76004fcb39ab43a345ec967e3f3db4ac6d0e7335dc982dbcf1edf02c4b
 EBUILD epam-1.0.0-r1.ebuild 724 BLAKE2B 539568b8b5af26822d3006ba2c320282b3c4d478e786374726f7ac54c28b44bfb0e341daf555ff6df5ecc09e2e0b8facbaaaba3feed47d4bca582ea8567da028 SHA512 6d2303c6ede3cb85e1cecfc2fe241480d1408dfcfcb2d79569f1d7a108153656a47d37129f0a89f45c6996ba0e542248ea6818bb90f7abdd1250a40c14903635
 EBUILD epam-1.0.0.ebuild 521 BLAKE2B 82b76739f0107e3ebbaa3dea319ffdb51e93a451089d9a6aeee5ef5ca4f57503f0a709ef4481d9209798241494914c77cb916bb9a5b13aff8f19d543e1cfe987 SHA512 6366da961a17a92992372a47466c68b9a8e4134193d3b60750309b41e882c43a128988a175d90081cc8d0cfe4a4c8687f78bcd81de02db904313cc31fbec0088
 EBUILD epam-1.0.2.ebuild 695 BLAKE2B 216a0bed0ecb446a80516d41717e1de8ef9c6166128cb57159091e8003463af9dae2ea60c6923c4a17e391a1e9fe57f469052b8cd8f2b01477de29f9a64ac283 SHA512 3c2f8248b6ed3a4312f584c2273eb872b01cae0df8aa65b64196e5fc1d95376c7069dea7efb5e97e97ec8b645d2e3a84988b09f19dcc2fed168c34f26a8724a5
 EBUILD epam-1.0.4.ebuild 704 BLAKE2B 86d57a174d9536f23d3c98bd2565a36d65535d586b65b8c1502d79dc15e572a2d5a3eeee082b7328660f6eb76c5e47a4c95ad702b9606936dad86a22f6edf403 SHA512 fe759cfbb16d47bcaac1bc82521ad1aa38433cc8306ea8be6ce7e2c02ca58bf74614b764b60c16035284c81c639f6d785b3933a16c4a0debbc16339308ee7875
+EBUILD epam-1.0.6.ebuild 714 BLAKE2B 930d2af514070e5ab7bebcfca1ffb073559ded4fdd22a28cfae427fcc2735ba22a28af897215a61812c85be6eb0e43b6327439c8f600b0b91f0e0a4a96c68f84 SHA512 dbe7ca91c073812bbecf78b34f80b95d89956ba4844e9082ccd4c9ce97f4477a2b3ce00f7b4010096c4c511edb43f25c5a306f562bdd86ca546805fddb49e304
 MISC metadata.xml 247 BLAKE2B 78e5b61eec19aae349a48d3a4d94596e49bdac8ab75348af4e77fcca33223a5207ae7c9c0384e4358187a107ce597fe7fd90ac766a24e31d51fcb2bdb0770199 SHA512 426d73c00f932bfdf3c95d2d7cb48f663263491a8affa8d8304af69fc3b4d891e95450c5e19dfee8e7d793dbc40cec9f9acb902b39ada35677e486760de03247
diff --git a/dev-erlang/epam/epam-1.0.6.ebuild b/dev-erlang/epam/epam-1.0.6.ebuild
new file mode 100644
index 000000000000..6056b365b81a
--- /dev/null
+++ b/dev-erlang/epam/epam-1.0.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar user
+
+DESCRIPTION="epam for ejabberd to help with PAM authentication support"
+HOMEPAGE="https://github.com/processone/epam"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+pkg_setup() {
+	enewgroup "${PN}"
+}
+
+src_install() {
+	rebar_src_install
+
+	local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
+	fowners root:"${PN}" "${epam_path}"
+	fperms 4750 "${epam_path}"
+}
diff --git a/dev-erlang/ezlib/Manifest b/dev-erlang/ezlib/Manifest
index 0cc92ad2d61e..8ce869b582c2 100644
--- a/dev-erlang/ezlib/Manifest
+++ b/dev-erlang/ezlib/Manifest
@@ -1,7 +1,9 @@
 DIST ezlib-1.0.1.tar.gz 45307 BLAKE2B 1226319144df02963618ace22ee2e3031226677703dc6a68c011794b336799a48eabe8b9262ca5501c6d5feec6256e517f757aa9f9986dfee9133bf9b4954a33 SHA512 7ec02dd91034eeaad3556071ef78ff6d8e890bc49b2ce5010280db48f9eb65ebfe62628fbbb89110310e359847f0da616f9281683926fb7d0f72972ee77a463b
 DIST ezlib-1.0.2.tar.gz 45369 BLAKE2B d2d23cf9fcd530a76ed4a386df15401cd9598e158f20cba3eff19332e25532fdaba8cae93e576f5756559e74f169f6a01f9d09c41e844d3af4a9d9d3cac15185 SHA512 90671fdf0bbc23a7f54da665dfb31a3ed2d92180ff5c58d872001481584e6c8b39cd84b3dc947f1efdae10792c2547218017381cbc7056070d22b140e941c9bb
 DIST ezlib-1.0.4.tar.gz 45510 BLAKE2B 685935b2aad9d20dc0d367c1edddb701d3d12fd24ec3fab617d35f9207e3994ddb57aafa9083337d0752b5e1fe15941dbff2f9b916400f0e7a3c6350a3c6ff3e SHA512 16495a6756cd60ad921695d87136e399446850ce1160d92b825673fa1e0e7d3cd4a6b49f274debbfe7dfe4285370362ece64db8843afd564ffaffe9eeba0dc7a
+DIST ezlib-1.0.6.tar.gz 49136 BLAKE2B 596e3580a20d7b8174ded16656fd5f15b8558ffe16a1278e76a25dcff935c258b2df37fb5be0c4e78de566823c41c58941fffa95cdae8b02a21bf6ea5d6f5417 SHA512 6f2a459f773eeba9a7d1316a5c38c686b54c5c68bb3d90e38ac4698fb1140c2d1b961e981af5013711fbfd854f3b3f206a828b6eda9071fd437ccdf4871d8e39
 EBUILD ezlib-1.0.1.ebuild 492 BLAKE2B bfdfa1bd5d14874377a2eb534b64438fba5930d623b9f4f0da8569a7d2e7493fe8cf1b0116ef47f207c51feef211f861a33b057855d61ba7bed0368f14d0b4dd SHA512 7f99ab77b621cc1229cebda4865f461b5438cda0c209a0c0726bdf861679d4aa1b662835c026ec1b9fc82c9bd0f5c113fec4c8543deae05236329a35dc3e74b6
 EBUILD ezlib-1.0.2.ebuild 492 BLAKE2B 59600080ee8431b029b01a7280361f1c175ee261ac8134e38939ce4ad283f4547061bc64d39b17e72e857495443fa0a65b2473fd3e9d180c6a7ad32fd7048638 SHA512 94b6c1921510ec68c9f0c6300a064aa3efdff8fbde795e2c9f08ba697aa6dc95fd79e3a7e614630eefaf0a1928617cdfc0287dc691d0faa591c16ab80e69bf7e
 EBUILD ezlib-1.0.4.ebuild 495 BLAKE2B 8e8039025f74c16cb50bbb0edf84473b908828bed5c626a916a255257b702d214a77214d1f19afc32ee2b191c294593213f7fba9363e8d62c1fa70266cbae00b SHA512 3211bd7daf4663e2ce371608e8cf1cec7136eed0ee3ed52d8653766497caccb0378e83a14761683150e18aef083649306842433dc3e2ff34ce47d219f3d518a6
+EBUILD ezlib-1.0.6.ebuild 491 BLAKE2B 31a37acf65fa9941660376a0b05af68245a7ee15b779dbbd22bed120a26b242c78d342f89f841affc4e79f908bdc7a062b0d4687daf5c437f611f8be7e6a8a36 SHA512 674dfcaf54b98737d39226ea644962c1d979b68078636799d0e3b83e6f97de6779a530852c0c6b2328696533512753a5df6ed07691f504cdb64a718086a2f356
 MISC metadata.xml 248 BLAKE2B 9ec5b64020c33ec61484a87c3d3f36ba4a2d51d768c8eb52ad89a99a2cd74acfc4445068578d8b5ed69c799f0bf9970fbcea47eba30910a7f727e8b355f7e11d SHA512 9453f3c83241ed048494c430d855107c2871661afd3a4625e8681f351bfb30e5f091d3954496a351f9812e04951252fac433b8073c5beb757f394e7a76737747
diff --git a/dev-erlang/ezlib/ezlib-1.0.6.ebuild b/dev-erlang/ezlib/ezlib-1.0.6.ebuild
new file mode 100644
index 000000000000..1e81db0e50b6
--- /dev/null
+++ b/dev-erlang/ezlib/ezlib-1.0.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Native zlib driver for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/ezlib"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/fast_tls/Manifest b/dev-erlang/fast_tls/Manifest
index 62a376b06c8f..94509706b75a 100644
--- a/dev-erlang/fast_tls/Manifest
+++ b/dev-erlang/fast_tls/Manifest
@@ -1,3 +1,5 @@
 DIST fast_tls-1.0.26.tar.gz 76348 BLAKE2B 3016d26724119a2b0b6e4ce9691ceeca7009ee758465f7d7203cab526c9cf588cefd859cb452d7f28877a2d3cf4eef26f9941bccb7aee4794006d9c0f4e8561e SHA512 3be4ed4a346c2d20f7a9d080a12e98fcf180c2f25df7a505a798ca8581aee74c4dc2f92b74c1a6866d6b13e65940cf0adfaff3cceccb0fe9fb3f375a3ebcfcd8
+DIST fast_tls-1.1.2.tar.gz 80657 BLAKE2B 44df81fca2e2a3dac8b4c9dac2506d313aea7d1a75a05b1cc1bd42e237c6ed951306e2acf7169538e3d0e68463fa8142f4d57776a8c86abdbd17f6973600f79e SHA512 79027ba6d80cb6b2bc0d6cd92d3889fa13e7ee746db20582517fc0ce36173b112805a94568a89d718166dfa4b41cd49bf8a6bc505979d4b25a389e87fdc3e4cb
 EBUILD fast_tls-1.0.26.ebuild 598 BLAKE2B a3f0d86a5b4eb18593db7515e1e60bbcf8a5136e07e7213f432eedc9d70d12ad6cd497d19742ba243f5d25e29347a22526ed42b1f561ad0d072d9d70e648bf33 SHA512 022ad97a3dbe3329df6b7fa7b624a93accb62b81de6f22d1c9b9aadc8fb2c33a87fd7483c74707ded9881f7eb139eadd37b728112c12ca5b4a0467d18a7438cb
+EBUILD fast_tls-1.1.2.ebuild 600 BLAKE2B 036c5647eaf3401912a2540d9af09b62bd814ca49a56d86959ed7f7996f69236d4ca544251949c6c1b909c1fbaf903aaf872e244286824ec505052a38028ce12 SHA512 72071a81db7082f598dc738dcb533d1cf720ca60203ed966382d3a9f4c054aa87bce2dafca48f81176a50b4faefd52cfe8c70e124056af03da7a28eef8d99004
 MISC metadata.xml 251 BLAKE2B 1758e34c1097e90a5b39fe52e6ebd3523249622929ba9927571f8f4cb26f877628dcc9d058d87ee665b150945020dfef1c9d8abcecad4f9daafa11675219bf68 SHA512 62524bb233139ae44ac8bc1ce5e1f94db2bb9d7bd821b404101206f10ceb0bb8830d4cbf71f6182d3942b14413cded3b42c1ecd8acb463e8ee5059a9334a4b7b
diff --git a/dev-erlang/fast_tls/fast_tls-1.1.2.ebuild b/dev-erlang/fast_tls/fast_tls-1.1.2.ebuild
new file mode 100644
index 000000000000..a51677b11bc7
--- /dev/null
+++ b/dev-erlang/fast_tls/fast_tls-1.1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="TLS/SSL native driver for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_tls"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.16
+	>=dev-lang/erlang-17.1
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/fast_yaml/Manifest b/dev-erlang/fast_yaml/Manifest
index 4952d3f201c3..687f66c951a4 100644
--- a/dev-erlang/fast_yaml/Manifest
+++ b/dev-erlang/fast_yaml/Manifest
@@ -1,10 +1,12 @@
 DIST fast_yaml-1.0.17.tar.gz 49925 BLAKE2B 654a8f6ed516fc851a78a360c5f57faa302b068dbb84f9f26f3b0b8204e2cd55569ca27699181415453de469e524348b0db990736647df41843070446a20c9de SHA512 596e834a63b9ca78eee9b5021c711fdac2d7bd148dbbd6b0c162ec87f94dc41ebf7c8cd3d86c8a2c94da07d0926d31601d63123103678d42905243bb86c5f4a4
+DIST fast_yaml-1.0.20.tar.gz 54476 BLAKE2B 553b433a4cbfa859b25f39e74766047f490cd11d327f73e948237fd4321e7a9f160656cb312b60fc1379c8e35f3c613ad76dc0a44a2f73b8ca09ce61a8e036e7 SHA512 583c36caf0dd492518b631bc4882530a12f83bc1de952aa8b053f4c3fb828be65d127954a5277b320a0ef28cf8b8df6db88e76b323f2774af061a9e9bd88e061
 DIST fast_yaml-1.0.3.tar.gz 49351 BLAKE2B ef705ef36f3ab2e43ac434abcce58f8fc3e0f1b0c0cfa88596c9b34b76ece0a2277a5f97046c789176231010711f906d5ec961b2053622404418e6a6d9380778 SHA512 321de1c0ff830de8a556bd661e600a66bccd944d6503a87a02111bcfb0b23c8c60b128296e7bb07ea39f923a04ebc7cd15e33971ca6691f16a75340c0695aee9
 DIST fast_yaml-1.0.5.tar.gz 49463 BLAKE2B d321ef3bbb4b51ad058b4c4125d7f53e65d5267fb0d3a6eedf2ab7b302d0b5cb9b1a2ac1cb60959ec74e8cc32684b6bf31f5247c26e61d810159d0b731541e96 SHA512 9d6b173f6086b2543273493cca460f161d16a4c3cfd8f84945a7040991fecd24a193bf0af47f3d0a326d2ebea3d46fcf5cfa0ff21607ee98e9a0bb6f2a535bab
 DIST fast_yaml-1.0.6.tar.gz 49461 BLAKE2B e79acf46f9ab85fc99774d727d3d64dfbfb583eb3e9a5379e95bde44a3a3703a1ad8aa22d9629d11f2c4346c8b0136b8076b67a4bd70a6a39c576f2df81bcf68 SHA512 04a466ebac30ee08827c9ba6d18861867571eda599e68937bbc8c924dab2387444db1f02da3cbf493ef63f03bc73cb6de32a90ee54901d269b3230611ee9600e
 DIST fast_yaml-1.0.7.tar.gz 49524 BLAKE2B d731cdbef28767ec0ef71ffcac7ae7150efcbf4e801ef1395ff95e22f9cc89909908ca26e493281487876bca361f82aeca852bb5a27ffe0ecdd1b658d6c0a78c SHA512 7d8dfd759fb6c406cb1e514b8bf66768b52e6be726067843035b037e88fa1986a465b173ead680971457059743d42829f0a9c0d9259fd0918e07804b6fbae89f
 DIST fast_yaml-1.0.9.tar.gz 49696 BLAKE2B a8cbda580e9c2bacdf046f82dc579eb5160d130f9af6c93e05e5c3e4fd7f8f30c9d767cb150a30c2abbd3d8fb3c62fa7c76bab3addb5754d04b9303e6c5bd3e3 SHA512 dd826643d1c841218bae1ccb6ea3dc0c35c64c20720c47e90b3dfad3231c4944216729bf3d46f19b06cd2d54a9487336e39a9ef15201cc315ab10a7ee950bf6a
 EBUILD fast_yaml-1.0.17.ebuild 538 BLAKE2B 208440244c10328d490bace4243f0d9d53cfb48064c6867385c83ade8d600d48a5d58eb7ed0dd7fa44633fdff569e463d49d806a2cbd09b6be72c9e7d063bf04 SHA512 85b15d8fc5b1c9f0b2887c786b31a104a1cf4ca6b3bc4fcdf2e8ebf887cdf8772dc0e7aa551ed74253770311ee1569d283c1bfac685e7697bca477b5136ed2d2
+EBUILD fast_yaml-1.0.20.ebuild 705 BLAKE2B 4e0326eac6917392e8fd96f4798d34ea075d91893be5f780aab1a21413d7d5eac7a1b36f94496b56c7bacc9015633859414d9d1ab6f566a000dbcda19f937cd9 SHA512 f280522c5f1968ba4cabd95e66e011bc75019970a676b0e8ac62ef54d527ca31be1c22efb57e24dd0ea4fae5ffed7377719b747d5c9b05bf00df8895395e8bf0
 EBUILD fast_yaml-1.0.3.ebuild 534 BLAKE2B 0d00c4102fa84821254bf7dfc942baf36b1b5b21ad9724a333af17fe9f30c4a7abb6645236fc351518851517bdc295f88f0a37c2ce5101298cb3c472d8442de8 SHA512 c73ecbdb62eb67e43ef0f52c9c9b0d1bda7e9ca6beb9945b61d78ce2c4cb0ad706fe009dad5f60f59f7bf13b05519b8fc9b538d58c92c55ede0830dda134c2ec
 EBUILD fast_yaml-1.0.5.ebuild 536 BLAKE2B e4837d431aed4780b061cd9db21ca066add911809057f83fe90da066a0eca164d84cd5f4489b0d68238f06ec731f3b14a18a90a4dec5702301be04d3013e5606 SHA512 1ecb41e6f8be61c5ae5436de14e48eb118dffede1a95bbf13c05ee2335eb414f269363497e83d40b147aa8f7bda00ff77425ca3d85476fe5b4efffe6eb66f2f8
 EBUILD fast_yaml-1.0.6.ebuild 534 BLAKE2B 9f24ada95572184c9d28b063dae707ae763174523008e6bc01c1335b01aaf60add36a748f9bb049141eb3d3ef90e213216835777e17b01dc3e87a0a84d66ac25 SHA512 9cc01d7a6cce598a7f9d809dfdf2d27d763e3ca8f9648a652a1794cbc32cce51680a00852f1c8c5d1c2bf1a4e10bcb184af125b657e5b4312656cac6685742ee
diff --git a/dev-erlang/fast_yaml/fast_yaml-1.0.20.ebuild b/dev-erlang/fast_yaml/fast_yaml-1.0.20.ebuild
new file mode 100644
index 000000000000..5dfaaa979349
--- /dev/null
+++ b/dev-erlang/fast_yaml/fast_yaml-1.0.20.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Yaml native library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_yaml"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.16
+	>=dev-lang/erlang-18.0
+	dev-libs/libyaml"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+# from upstream:
+# https://github.com/processone/fast_yaml/commit/e789f68895f71b7ad31057177810ca0161bf790e
+PATCHES=(
+	"${FILESDIR}/${P}-dont-escape-simple-quote.patch"
+)
diff --git a/dev-erlang/jose/Manifest b/dev-erlang/jose/Manifest
index 8c7eb792ba6a..eaf15a184389 100644
--- a/dev-erlang/jose/Manifest
+++ b/dev-erlang/jose/Manifest
@@ -1,3 +1,5 @@
 DIST erlang-jose-1.8.4.tar.gz 230947 BLAKE2B 18bfd6b710295575d0547afcc866674f2c65fec2742ee4dedbbe7a883fef45a9abbccfc669c90d75f5091e70b91bd7b478f4fea5d3beaa3f65510d92db07da39 SHA512 47171b4e5f6b61735a15365b4130c110c14de1f4b157cdbf97b448550d48de4ab27a30537e9d9f613d87862d592b3bd95638daacee60f3f5b9877d80a3de773b
+DIST erlang-jose-1.9.0.tar.gz 258407 BLAKE2B c6036e743b062cd18518537ffee03cc138f55f3973a2ab538410d362757747e2c8880a899326d494914068f36ffaf2bb902e83ba7899c3256d6cfc7b89f07156 SHA512 59f7123fe589c8e9bf0bab5a21089301d6b3a1c35316b9f530386bd0d9de8da8f5f956769ea6b1166c545a51d119668ed18db57e8adfa02e6f4327b01168db68
 EBUILD jose-1.8.4.ebuild 721 BLAKE2B 88ca0c5a17bebbc9e42759b75048652f5ddde5b67b6fbe2b1761bca8faba4086bd31b13a04a636eb96cdc39aac7dc31844a41c47e07e7bcc815859e3719b645b SHA512 b826312015b2f8f6764796fc1581cbf3c4138626ca6b8a5f37b6469d840c1d841015d6dca0c830e734d8a5cf13b836058861890d50d2bb5ee0a218db4e819ef7
+EBUILD jose-1.9.0.ebuild 758 BLAKE2B e48f6253daca6746cc534cea3a66ebf5d477763d2bcf1fe955ba83613c5dbf7f58a691b91d1d2a776c4f7424dfaa4bdc87c66029ebe999ce52519def93b78089 SHA512 2c811754d4d59acf2fd9e369b41fd19a7ea45a75f8f49115fcfce611c1157ffaa8361e229ccd75dc1f2d427bbee01e1e036e1202bc74ab791c3c3bb1aba28a1e
 MISC metadata.xml 255 BLAKE2B 85645b1186b8fc16acef6bf88c8b2211cc6f48d5a662c69f474ab0e2be81f4908b5eaa863c9f2a906cac3b7d1f4874e8393cd94360876f349ba5a32f58fd3008 SHA512 eb09213d23a64b2c8f77f77c1a4ab437ce8588a690d693ff0c01104ec6d2b27bbab782043f27ab105a442446c387132f714d016f8276e75ff29fd32b93e457a1
diff --git a/dev-erlang/jose/jose-1.9.0.ebuild b/dev-erlang/jose/jose-1.9.0.ebuild
new file mode 100644
index 000000000000..4f337f565a5e
--- /dev/null
+++ b/dev-erlang/jose/jose-1.9.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="JSON Object Signing and Encryption (JOSE) for Erlang and Elixir"
+HOMEPAGE="https://github.com/potatosalad/erlang-jose"
+SRC_URI="https://github.com/potatosalad/erlang-jose/archive/${PV}.tar.gz
+	-> erlang-${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-19.0
+	>=dev-erlang/base64url-1.0"
+RDEPEND="${DEPEND}"
+
+DOCS=( ALGORITHMS.md CHANGELOG.md README.md examples/KEY-GENERATION.md )
+
+# TODO: jose has test suite, but it require lots of dependencies. It may not be
+# TODO: urgent, but it would be nice to have those sooner or later.
+RESTRICT=test
+
+S="${WORKDIR}/erlang-${P}"
diff --git a/dev-erlang/lager/Manifest b/dev-erlang/lager/Manifest
index d286947861ab..6da1fa3f7548 100644
--- a/dev-erlang/lager/Manifest
+++ b/dev-erlang/lager/Manifest
@@ -8,9 +8,11 @@ DIST lager-3.2.1.tar.gz 244701 BLAKE2B 03d09c1fd42b4b1365264a2c5bd9f67032bd1f725
 DIST lager-3.2.2.tar.gz 244979 BLAKE2B 79b895c2a4df313fa582c3573c23d2ea233db1ad694d9425dc5217853c14d2ea1d40524ff634ba0f001ca85ac7833b52709840b9bb68d6b609e19d2acd906a36 SHA512 c183f141b50343c5892ee4417ab76cdd69862a53ccd9c0840b2df52c7034f08e5ac92546d6bdfc8014c8e7561cb75cfb20b3967e0146996907c9594d341095b6
 DIST lager-3.2.4.tar.gz 245002 BLAKE2B 4d6197cbefed0f9d53d4ef522b2f0827e86e404e108710a0c615befb8d033b77cef3a2fd53a9c9b8a98fd0f708be95e7d0a6d5f64802cf061d5171f343971c7c SHA512 765e132c19c46593f79f73400d04801d27767192dfeb75c3d3aef5a20963dc6113e544db35dccee2a975476a5653954a79ac49eb923d84daade0dc64a8c1e6f7
 DIST lager-3.6.7.tar.gz 266527 BLAKE2B b26fbd07b8db0a366d5adf74e56a28f3898fa4853f5c3383cc32043b7fefb58e996309d12c77ea0d94ee98eefe2b81c32a4d0c40a0f5608ed94e71c9d754d992 SHA512 7dde8196204c6e65f78a95705151d4681edd4d2e9c3a1a3b37135e777ed3b653124fbfa43192ebf56328b5f2d6daec1b4e1055399c3cd47d5969bfc3cbc822bc
+DIST lager-3.8.0.tar.gz 271830 BLAKE2B 13e84cfb561493d3fdec2d8fe9d585eed8716aa831425616b73e84cbca1c1951186bf7c378dcf21df0006a910e56458b9d9cdbf69eefd85e519fca2a1d98e8f3 SHA512 bcbd522bdc39e19466dc3e6fe8fc81ba10358cbcc167e278402e91164992fc0ee7c02e02a5bc223664c0d5974a1ba107756b073509453386003c9d02b3dc388b
 EBUILD lager-3.2.0.ebuild 954 BLAKE2B f10515f21ba6f65f8e390b80f024395f61fd07b7b744de8a7c518ca947e9a7541398f8a153242df50e9cf9d82a7eb238a4c3f0ed37756da9dcae5ee809a64502 SHA512 5f4be585916c907e3b49ec88d942b3993e75f8e04e389e90fbae1698da371f6e671d178a32f1a0bd9a08e3ed8648a1687d13bdca3c87b58669a283cc0262e385
 EBUILD lager-3.2.1.ebuild 622 BLAKE2B dfbe24e43293dedb1bd499194ce96670037955f6b610ccfa1849e31be633fbbb7df5fd7646d94b3bac6794251ff3b2085b6d1d66bd4c23b8653292c50d0c4393 SHA512 0d7578d6071ab7c0deabb7fc9d42542d1277b3925d1608ab98dfdb11755a7cfcc1894d7b67126f9466264a0d3f0b0e161e061181253e3a0a136fba3e276a895a
 EBUILD lager-3.2.2.ebuild 620 BLAKE2B 3dc58df5990d62cddc2e54eb7d8038567e4d337ac6a6178ed3da0f056f19a3a09e2dbb507c399219ac8deb00a0c72f802205d6985217be923a1b880f48c0a493 SHA512 84a39cb102fd5c2aef9407aef471b229f51c164c42f5e568d70fd088984e23921f7c65e79950cccbc95b3739488c090b0685c8a216d126e8ca3a8fed7271125f
 EBUILD lager-3.2.4.ebuild 620 BLAKE2B ee3115a7797801c911d810fa9bcbf5ce11d133203202f7a855135fe4a04401c98d48883757a7621c1b4b5281d683f0dd3d7341c9f2f1e2bdc1c0b9147bbc36d5 SHA512 b37681d6a2dd33988bf8eacd8fa14c31c052694d8cf2b5d50e2a7f231adc8d37524683046d088244c131ad5b013687d9b9270a82c46a25dbc6aebe4566541918
 EBUILD lager-3.6.7.ebuild 679 BLAKE2B 0bad13586bcb8eade43685949d58fbd54b005262341edee9d00bc0ab86bc68ffdbe76b59e4e309aa2acbee13da348b4b111e1a489b87dd7a515099b520e6f60e SHA512 0bcc949049920d4b7f2ebc50d4117a557d5ffbc31fe37bf7a690ac7377b7b2b5c884b5f866849b6d80e86e7e2748f69056f2b3779b2064a6b4964af8d81bec8c
+EBUILD lager-3.8.0.ebuild 676 BLAKE2B 699135bd286b9feefa26432bd66725602d9fd60c7b8138d7fa45444c0da51875a977f693b2e91539030973ed3965ef47d6648cfd063866e6487842800cdb8295 SHA512 fd793aac2a08a7875f88d54034bc16604a30db5b10e447e2752610720316c013cf7f4c806b8d69dbe0552cb1d3aaf5370c1b9728c99acbd0fd7ed4e1e10f71e7
 MISC metadata.xml 590 BLAKE2B 316095d1f337d8a6aaea80b791915abcc9a3eed96185885d8b69136c0875b6844bad0fe2ca7a070fdea5a9976bf6b8170b919a615ba0aec56df998324aeba1d3 SHA512 a2159430a2862e138ea7beb61bb7324a97a997249cda7232c9ffde3227f04ad9401fb3b52a970f3c572a09f3851805588864074a99853e7b0d7b7d53c4e9c5b0
diff --git a/dev-erlang/lager/lager-3.8.0.ebuild b/dev-erlang/lager/lager-3.8.0.ebuild
new file mode 100644
index 000000000000..325c7b7710c6
--- /dev/null
+++ b/dev-erlang/lager/lager-3.8.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Logging framework for Erlang/OTP"
+HOMEPAGE="https://github.com/erlang-lager/lager"
+SRC_URI="https://github.com/erlang-lager/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/goldrush-0.1.9
+	>=dev-lang/erlang-20.0"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md TODO )
+
+src_prepare() {
+	rebar_src_prepare
+	sed -i '/goldrush/d' rebar.config.script
+	# 'priv' directory contains only edoc.css, but doc isn't going to be built.
+	rm -r "${S}/priv" || die
+}
diff --git a/dev-erlang/p1_mysql/Manifest b/dev-erlang/p1_mysql/Manifest
index 25f65c637d65..a81a52108baa 100644
--- a/dev-erlang/p1_mysql/Manifest
+++ b/dev-erlang/p1_mysql/Manifest
@@ -1,7 +1,9 @@
 DIST p1_mysql-1.0.1.tar.gz 19329 BLAKE2B b5904a12e8ce5c1b58ff789adb5df7fd9040b8a874b6e1054f3086fa1c28b1347e21d6809fa00fb8281816d2bfaccd7889cb2c2665376a40e87b36eaf315e269 SHA512 2e5d3baa255ab7b6d3271e633793bfb265648b260c104256980a1229ea20bf3701d8f665f65fb4785272ea7e4e6a346a262ffbf609de10aec6d8029ef1d4f567
+DIST p1_mysql-1.0.11.tar.gz 25958 BLAKE2B 6c94287fc584ed530d70e9609cc565c2c66a2b90b8bb47d85e370353e8e56dd9cb8e902406eaf330692f70c264f44977f22534e6805017a12accdcb5828a45e1 SHA512 2929b1e66aa887258b46f7dcda71f935230b9b7ea9fccf0baff2cda0782a5b7da26b9b396ed2bf3b16f07d397c88f5881ea93913a11e262be802654ac46dd9ed
 DIST p1_mysql-1.0.2.tar.gz 19512 BLAKE2B 8cf7cded80d6ca1239019f3d1bbb7d4babbe0336a09b6c8ebb55e116eeb592e35a6f332ee6950c78ac6559a3850bdc1dbfa50ded2d30e008deb8e8d50b5c86d2 SHA512 ac0656b3134cfae47161a4643188784cf71e8ea19bbd5856e58d4f1d508a8771534975a631da51e7574e5adb3f64cdd250ab59ab7e9138fd5cb865e80522bd11
 DIST p1_mysql-1.0.8.tar.gz 21914 BLAKE2B 74c5ab5358347cd956b6d5fec2f96dedd97a0e832c39db8d44b4e7bd810d94237f87a70fe779c54e5e45efe0c574edfb7df1e608cafae226452fb8eb7d0b92a5 SHA512 68382135f96f3edb51fbdd6381a03773f99f39b9fbbcd63add159a7fe6f37a9f19f1ffa39eb248d9b490926ff3c6f393aac6449cf0d88c10eee50c807aba1ab7
 EBUILD p1_mysql-1.0.1.ebuild 457 BLAKE2B cb4272455df95ed5f69702c52842358b812244cc4a828ed5c756f33b8fe7d5ea3addcad809273bcf056ea43a9aec43f18f278553c2707277deeb6a6d0b8eecfd SHA512 33263eed86382a1a2d6f6eae1ca2400c1974ebd9fe638b22e8703e0fe25d73344dc64c711e777c844021c94025d037d8f8aa0fdd40a6bdbb54e30824b08c2a41
+EBUILD p1_mysql-1.0.11.ebuild 456 BLAKE2B 4f81320eb54b32a52c970610f809c18afe0341fc521c679af106db04302ac87aee15de37f27829669a4fddcd97ffa4c8af3e7e845d2bcd1150c09950bb4bcf30 SHA512 496f4b8f818a2918e7bdbfd9b7e61e0fac6fdd1f01719f55851032d1436d464f9f566420864e74e4c76924ffd211aa623b67ba205c8cc89186d211884b5517e7
 EBUILD p1_mysql-1.0.2.ebuild 457 BLAKE2B 990dcac1c89710c99d384dacd9af2c81680f424cd0879ef7fbae4c6f938a58e551caae225eed4ba0391a9c1856f589a9c08cd9cbac16890710effe747de6c90c SHA512 15c3ad3a348419c06ba15b1c8a906fd7ebd987a93022e3ee033b38ca58b111cfdfe5b0a25305cd75d064400a7f78022d6785e8e72070bfd5ee8ddbe7e41e8c88
 EBUILD p1_mysql-1.0.8.ebuild 460 BLAKE2B 1a28c03e9282dc452d5ba612ddf567e9798617ad2f9862e190c79c3d782e8d2a8d0aba08b2db15f7674a8ecb4f0ec8277d309fa479838e875949ee0d0edec785 SHA512 e57c57311b10be37c2a2371f3ebe8f56b300244d3df97f383f3e5b528fb17f8c38e961221408cbf19aba5f26e0fe995276c25e95e2c1b1c34c3797536db662b7
 MISC metadata.xml 251 BLAKE2B 22f743177474ea4e950f081f967da459711ff2404edc3ac810ef5943f18905cb2c88fdb5584dda80cb543cf6399150d5248bf3a0c5c2a942aee4bee0d95ffbfd SHA512 f8e20b38195b2abbb1695b361e2aaa7f84ed0bb9d05b46462dc1fe28cf475778c90527953061f540ce6a22ffdcbaa257b11bc102a907aa332f14837155de1bba
diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.11.ebuild b/dev-erlang/p1_mysql/p1_mysql-1.0.11.ebuild
new file mode 100644
index 000000000000..274bc47ea8a6
--- /dev/null
+++ b/dev-erlang/p1_mysql/p1_mysql-1.0.11.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Pure Erlang MySQL driver"
+HOMEPAGE="https://github.com/processone/p1_mysql"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/p1_oauth2/Manifest b/dev-erlang/p1_oauth2/Manifest
index 60de6d5520d7..0991e3ae8eab 100644
--- a/dev-erlang/p1_oauth2/Manifest
+++ b/dev-erlang/p1_oauth2/Manifest
@@ -1,5 +1,7 @@
 DIST p1_oauth2-0.6.1.tar.gz 212804 BLAKE2B 571341aaa4d3a4bac6ac2f8f46d2e4b9caf5e00622a392635d79ff11b520a3cab71d360220c99a46035ce851974d975d69a71ac9b1be626c9b126941fc4a73cf SHA512 2509d48775579a26178fb5a082e628a8487c986b1b4d4abe974b653a1e0b7605bed934d59f6d62927582bdb95a53ba454816d326d99a77c5360928c4973ade4a
 DIST p1_oauth2-0.6.3.tar.gz 213860 BLAKE2B a610f7911ce46c30760dd8da42531ff1f4e4953f3158a42f360cec9090ca9901647bdedff5eacd7416e34bb64987cedcbb675c1c39de3a4172e337ec50c07495 SHA512 634606530f90810fb998baf26d14afc092699144506c9be771e74d5c965698d81b93bdc35ce53ff94d0b3ad1c4557a16660cfe74bc75586fbab2baa45b1d9c46
+DIST p1_oauth2-0.6.5.tar.gz 213847 BLAKE2B de1b9dc238efacf5682ad12b1b563fc311f1e0515673003286b31f42ebd33fb8dd9e384aed194047cd6ab38d4769ab128e8de5241004ce49f72d56ad9ca22d21 SHA512 5664aba423c85d90321533878b73e58b50d7ef3bc4183c8108c99e075ef4e75041eb28620de4dc14be23dfaac3623a858a9c8e191e54dae62eb9688ea0812312
 EBUILD p1_oauth2-0.6.1.ebuild 769 BLAKE2B 5f526765741fbf73fa473a0c6ac8bc241bc265b226e343a51acc7710e2e6e6ada8a93d86cf0e42bbe419c9cdac90412f1fab69102eaa09430df63746423f7fb4 SHA512 12d79503761861d0de76bd0768024d26b82f8e16524f2ea8b1608902c97a91b6a2277ac89b5fca2969fe03f549bfb3177dd97c37e8423f97fe05e24595f8c655
 EBUILD p1_oauth2-0.6.3.ebuild 772 BLAKE2B 7a4f773917e2aa2cb354491b8bbd20debd8fc0540da4d8132542f011a58866741590e3a8c8fea1f701ce962dd14dd7f7a4a98f85551ad8fb918d2be46cd8f8bf SHA512 92eaef1379086855db6ea107d602bf87aa0a83c918ce3f546d6fc7e92d75cb40d849cddf3efab434a6b2bd97806ca488567c63e14b54ab7cd94e83dd3ec22956
+EBUILD p1_oauth2-0.6.5.ebuild 696 BLAKE2B 6d3538f3013a20e52c2470a2ae7480aafc384fc0e9a3028bd45d29217d6037bb36ff3dbeff41c865d6f78483a7d2e3080d4c0eda89ab58e5bf04eefdc8a3a655 SHA512 116e06c4cc3d0e194d3f08b35d76edf7ad80933f929a2a709f8369796e54ded2521a1603e8a92a5e2808917d61a082c76105ab9b21d065e682e91e9e81e0b2e9
 MISC metadata.xml 252 BLAKE2B 464637d08055afd228df7e0e75123bb0d32fac43fdbca81888471cc8645352ef1441862f842688295cbbba2d29fbb8014a2f65e1e3516f2f4e3d9a85e57dac54 SHA512 ba29c61f7e9f57a00dfd053e9c0b0537a65938ae99e9672dd3c535e98a23f0e32dbcb1411a86da88ea176c051b0039f4ff4ac628e47d7b660873d93c8d2cc18c
diff --git a/dev-erlang/p1_oauth2/p1_oauth2-0.6.5.ebuild b/dev-erlang/p1_oauth2/p1_oauth2-0.6.5.ebuild
new file mode 100644
index 000000000000..ba3919e1090f
--- /dev/null
+++ b/dev-erlang/p1_oauth2/p1_oauth2-0.6.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang OAuth 2.0 implementation"
+HOMEPAGE="https://github.com/processone/p1_oauth2"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-lang/erlang-17.1"
+DEPEND="${CDEPEND}
+	test? (
+		>=dev-erlang/meck-0.8.7
+		>=dev-erlang/proper-1.3
+	)"
+RDEPEND="${CDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	rebar_remove_deps rebar.test.config
+}
+
+src_test() {
+	erebar -C rebar.test.config compile eunit
+}
diff --git a/dev-erlang/p1_utils/Manifest b/dev-erlang/p1_utils/Manifest
index a03ad3e466b0..8da880f9df45 100644
--- a/dev-erlang/p1_utils/Manifest
+++ b/dev-erlang/p1_utils/Manifest
@@ -1,3 +1,5 @@
 DIST p1_utils-1.0.13.tar.gz 56548 BLAKE2B a92aa78960673f2a52b5247dc48ea94e73e018f1a9504b57c15ebfb3b12eb9b6b5dd4e706782f4200cd35f07d3193c4cf07eff462bc74b4714d1e3da4d97077d SHA512 eb4fa41a46973c300b752efa273554e293c19235c3649166f1cb52d9512d0bfa3f032053a35ca10aec1d6594f352c386720ecb193233cebea226f45e0c0add34
+DIST p1_utils-1.0.16.tar.gz 63418 BLAKE2B f7384737ba2c758ef25aedf9b1ddbe870c858172db5ed37dd146eeda0640cd589f9176f946e6c53d04d1f3d5c711d9c58e3fdd66245b603e94d9b04ce72ba086 SHA512 f7e2ae20771cb7405092b194af4f63c5d25d5f7a245ee343994ce626d5e80626f94af1bf3ec75c3d102d10c8b64238e3f90437ec6a932d8fd22877f9d4764b6a
 EBUILD p1_utils-1.0.13.ebuild 486 BLAKE2B ad5472e8b337d29cb52736fedc7fe6dd1eb2e25087be55749d78402922c88a33833092576b3e7a1ef555bb43bc3c94997cd8f7594add7c5e05432e7c5dec4711 SHA512 aa66789326941b6f96f13862c6a2093d34917ba7c735f37482956fa9d9b0a68d2e10cf8e350a2497360cb6825d6caaebce9c3577baed1b63c67f0499bfff7daf
+EBUILD p1_utils-1.0.16.ebuild 491 BLAKE2B d4628519108d490b1b2d2d40f1bc216b0b1642df86b6d09082e40c4564a9798b840182126dd4caad1b66cf3633102f38b503b9725eb6495546775833911a7955 SHA512 ce438807038aed0ddb7b706e3be75bfd1ac0f6bd8f77d543ed8cc0512e717baace84dbae697408d83b2c418ebfb12f75a1dda1c560f50d5ec5454c95a8e685ca
 MISC metadata.xml 421 BLAKE2B 6e08825b8e28f4ac5e1022bf74ec6b8546e911259d4b85a39fd2f5448ca04345de3949f3be22528ab3dacaa6e5b133c5dd68abcdd7b238fb026428a21aa32c27 SHA512 60048365ec285935f7d941abaffb1304b4b458126fd29a62df5cd7cb3208d192eb87b6cad4c39447a1ea1f8a5a3bc08c323ae5d8948128e9582d0e3608a60ffe
diff --git a/dev-erlang/p1_utils/p1_utils-1.0.16.ebuild b/dev-erlang/p1_utils/p1_utils-1.0.16.ebuild
new file mode 100644
index 000000000000..ed18b559a3ea
--- /dev/null
+++ b/dev-erlang/p1_utils/p1_utils-1.0.16.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang utility modules from ProcessOne"
+HOMEPAGE="https://github.com/processone/p1_utils"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stringprep/Manifest b/dev-erlang/stringprep/Manifest
index c0cde45fc8d3..82fc7bc8c269 100644
--- a/dev-erlang/stringprep/Manifest
+++ b/dev-erlang/stringprep/Manifest
@@ -1,10 +1,12 @@
 DIST stringprep-1.0.14.tar.gz 95662 BLAKE2B 5bba174aa4bad36b230143e6b598149a62237039482811641fb80e35437f49f5ef99d66d020f715de5db4ccfe98f8a1fd4aeab2eacae74b3093907254442c0e9 SHA512 665eebd8339405c87c810f89e7671ee9490ad960da21da9b45ea867df962c39d727f1b00c2b441b60294122db5cfad64c768497db7772cbace7391ab50fe3cb0
+DIST stringprep-1.0.17.tar.gz 98819 BLAKE2B c1db7be3bd3618c4c1a943080a39104342b11102b9e894e457ee6f7510696a4e160b3bd50fd945be9d8d7dda4bf9eb5e5517e59f7e69cffd9b71e1db9e022e4a SHA512 170d4c96882eebf4602f0a6c87764b6c10d6a063b832c4473df11741656ac03c7b7bbb7d176a991747364f7fb9487ed0cbdbf6792378daefd41672ed685e9dd8
 DIST stringprep-1.0.3.tar.gz 95189 BLAKE2B 448a5447d9974f20e110a2359a5e1e92e449784bcb3915fc7f33d4676e6de79fe42bac40c3d404fe582edb45fa90ef4fa725aade9a0ef3f67927240cae498e17 SHA512 a42ad55ddfe69f34025fb4ce8f357b13ca3f24449da7ca1e4dc5d78dd350d39530c39d1f3542fe0cba8081c6bc5d3441a606f227733d7a6d87d658a703a0feb1
 DIST stringprep-1.0.5.tar.gz 95323 BLAKE2B 1ec1a66856c707d0f34ae5e257828a9b301ce2d4d9137dc52e1b5911d4ceadaa8d6925168cd4f58207c639893048095d873b27997cfc7999815f80c74ced94b7 SHA512 08132b1c6ceb7e4d069677e8a49ef2543b7d2491d745b3b68cc59b1786ad9884db5e694317ea44059c285ce63df4e7ababc6e0fbad2f36105479e6a07e159a05
 DIST stringprep-1.0.6.tar.gz 95340 BLAKE2B d8250653ba6b0f0e0f51303dfa3b90e0695a0b51692c1005ef3ad68e07bec3c831dba7d97be00ceb75a392c2c98baa99a15dc53813ebe9c57dc594053a1f048c SHA512 930399b8a33f6f4aac9db12f0cc46197e94b6964eca6b913bea6ad331b8c2dcfb521331245858b4480f0c9bf472f7cfa98101349c4b2624c10718410d49cd040
 DIST stringprep-1.0.7.tar.gz 95491 BLAKE2B 23cb8ca266ef11f2b37db692dea2078faab0d50bdf5774743fb3d8470e62dd4ecda11ffb50cf676464f0345a63360be9422df6d440eda94757de8111078cd10a SHA512 07b9268951dd7071f652ed034404def67895846dbacc226b4d3a43306f48106d2393c4f879ae6d8bc89e16ee181b83efaf8cc9cefde74a4ada87ed9eab85747b
 DIST stringprep-1.0.8.tar.gz 95586 BLAKE2B 62fa68021c32dfc6d1d46473d9cc756cd5f0e2d3932f6f4dc78f71a1ba05e5124574a4b210d74ab555b2cc40f2c43b5eb6d0aac709a028f7cc6324189fde5ee9 SHA512 6680450a3e6226b088b06c79dd6ef1ca689ee8787b9f7eaa53ec073e9dcd70fac48ed2f5fb0b12871607092514db71f63b0617a938912a88a51d36518738a911
 EBUILD stringprep-1.0.14.ebuild 532 BLAKE2B f188866429a3caf453e9967ec6faf4c0cb96ed5c4a45b0707ed33fd4f3c43ee0436005349072f2724b5f75e164d2caef62eb5ccbf73eb4cdd5ca8eebbaa68b4b SHA512 dc95046cf0cde6a9de5612b5867257f4b5b035c563bb96bfc7659de5349ac79e0e3aa270376be0f62f61ec4a0bda14c2e3f6ef648ffbe915cc99a93b3c4ea88d
+EBUILD stringprep-1.0.17.ebuild 529 BLAKE2B b53b1940e8322880fe1c21abdde0bb449bf47cfb795af6e20ae9196a6a99db92e07b85a0a149e806fe2945e26cc82b467b8ef7bf60683b6af077f5bb43321bbd SHA512 2b96dd621935ff427012ef112679275b9178d19337d6fdae9f9abd5d1226c169e171d0cdd6d1b2fe75801a598211db735dc4190e5c00b46bd5c6042bb561bce1
 EBUILD stringprep-1.0.3.ebuild 528 BLAKE2B 8ee5039d27f0d16c20f4df550a015f1f2cbd77b5cc35327d8e8f862d50417a4dbee89d5516761bd60218372d211e799039ab87cb77de3a4279a36db363c261cc SHA512 17dd1c39a9e29bd993357aaf12ea37ac3fde9250e66d74e87c663cc6e273031c89b67a089dc2fda3c78434c4bcdc5fc0a8f0d10db5b887ce358596e517d0fdd9
 EBUILD stringprep-1.0.5.ebuild 530 BLAKE2B 8bd07c63c2e613054732c541235f6b9681c9b1e993e7cce2e00a5d057ab64ed9e8f9c10036b086ca944b9a6bc7fe1ab053344594b35abc48aa656d2d52f7c6e5 SHA512 2b29cb157e3f2136939642e25a5bb7b27722480ceb2ba390f51c945df87ae3a18d0290986e022197f43d07dd55dbb5afa7de8afac04ebda06860a20302676256
 EBUILD stringprep-1.0.6.ebuild 528 BLAKE2B e1d1c2cb2d27201473012f5f325f269de941480817dc5564ddd5b44873371cd62b1a40e002148104f13134d863982504f41ecd7604725f4411ea433c1de86cb4 SHA512 3053c458afb02e79f379dfeb14f02f2f9ef24a6aedfda6e51ec5cac4843becb4b20d0128ac08925bd3fb017a59952ee7c949676d801947eb0c3d83321c7b2fa6
diff --git a/dev-erlang/stringprep/stringprep-1.0.17.ebuild b/dev-erlang/stringprep/stringprep-1.0.17.ebuild
new file mode 100644
index 000000000000..9a6a78243046
--- /dev/null
+++ b/dev-erlang/stringprep/stringprep-1.0.17.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stringprep"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 tcltk"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.16
+	>=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index c602b4223b73..ec1a0d0b2519 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index d9e553df2a3b..5ded17ade790 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -4,6 +4,6 @@ AUX openscenegraph-3.6.3-cmake.patch 993 BLAKE2B 3adb6691bb1c2e9cc4e88ef5c1e107b
 AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
 DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827
 DIST OpenSceneGraph-3.6.3.tar.gz 5784660 BLAKE2B b117a10d7be8fa456d739eb04f218cf9565ea4bd5a91642ada3bde5cc194a71809482ca2e6f2b4ff977fd26f3a855e27392ac60921e4217b72ebd828efa4df0e SHA512 5d66002cffa935ce670a119ffaebd8e4709acdf79ae2b34b37ad9df284ec8a1a74fee5a7a4109fbf3da6b8bd857960f2b7ae68c4c2e26036edbf484fccf08322
-EBUILD openscenegraph-3.5.5.ebuild 3789 BLAKE2B a83f1017bd1add8f5b15cddb48dfa22818ad4ab4a109a9755af76b50625623cfca83d0cb4eb3a74b2f22701b1e6126195313671c333bb237b482bb5525dbfb6f SHA512 1587e604a77f4d6ed367eca0aa83a492523a5b1689f766798c8f57109ae4d88fd77f46e02e8a324907e303b31ba1fd9c65e2464a5ea15b67dbfd5d38b4c1a110
-EBUILD openscenegraph-3.6.3.ebuild 4379 BLAKE2B 9c45ab18686e98fafe495d4002c573e53815371c2cf7271cf6cfd2685d583b23d95cb3941a1370572fabae7c8b03014e13f5645b5a165f272b2d71242e1b281f SHA512 445504f7d7f523303faf1ab27ca5a5f81d7635b809a4000bb7b6e3e11abdba40d661cc08812da8b32b37efd738c4dc3265f1c5c3bdc3fc8d614ba216b9a20ff4
+EBUILD openscenegraph-3.5.5.ebuild 3735 BLAKE2B c5c689c98f6246042225f7b85e4695d0d610b65ea86def9500a1ccaa9f5bef419d33cc653d3553ff9149da58a625e2d9d179397303ff6cf0b0c0af0299f900fc SHA512 8b49334b93e1ad3033ffbec3a486705492d2275b266fd942a591b0709d854d24b5cfe65c56a1f3f47d6ddd3d308d646b126e46a4e80a60c7cc44f33b538d21c0
+EBUILD openscenegraph-3.6.3.ebuild 4332 BLAKE2B 5079b814dd8a48ff7200bc5c13b2fde78bdc002ac84e3ff06a858354df846aef29c94c3a97acba3699b42ad3151e0e0932fd289bc08a050a5b31f17380fd67ef SHA512 7b4ade8fc4403b491a8c784003874128119a78676a5102534575e3d7d772589243dd3b3e88a6e87b5a99fff0674dc9a14c07f480ce8b043e0772460d2b048af8
 MISC metadata.xml 1661 BLAKE2B 6846485027ea4fb4ba5994c4003d09f0f3929217f4f7140853776db0afe52988075bda496e29148a878ef941fe76decf2f480a8df7e87c50a8015e86b2e27e83 SHA512 e6e1f87c7322bd16929804e403f62204575a1bc6aa68e2aa22e802282ca4d547a0d30425bcf9b4caec2a618c30b2f1635f5a6c3fc816ed12f607d82b0f383789
diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
index 7b066c0abf2c..29582ffe9098 100644
--- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.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
@@ -17,7 +17,7 @@ LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
 KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 x86"
 IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg
-jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff
+las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff
 truetype vnc wxwidgets xine xrandr zlib"
 
 REQUIRED_USE="sdl2? ( sdl )"
@@ -49,7 +49,6 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 	)
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
 	las? ( >=sci-geosciences/liblas-1.8.0 )
 	lua? ( >=dev-lang/lua-5.1.5:* )
 	openexr? (
@@ -112,7 +111,7 @@ src_configure() {
 		-DWITH_GLIB=$(usex gstreamer)
 		-DWITH_GtkGl=$(usex gtk)
 		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_Jasper=$(usex jpeg2k)
+		-DWITH_Jasper=OFF
 		-DWITH_LIBLAS=$(usex las)
 		-DWITH_Lua=$(usex lua)
 		-DWITH_OpenEXR=$(usex openexr)
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild
index b1bbf9578d9a..995535e2ff3c 100644
--- a/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.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
@@ -16,7 +16,7 @@ LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/158" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="asio curl debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg
-jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff
+las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff
 truetype vnc wxwidgets xrandr zlib"
 
 REQUIRED_USE="sdl2? ( sdl )"
@@ -49,7 +49,6 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 	)
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
 	las? ( >=sci-geosciences/liblas-1.8.0 )
 	lua? ( >=dev-lang/lua-5.1.5:* )
 	openexr? (
@@ -114,7 +113,7 @@ src_configure() {
 		$(cmake-utils_use_find_package gstreamer GStreamer)
 		$(cmake-utils_use_find_package gtk GtkGl)
 		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package jpeg2k Jasper)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
 		$(cmake-utils_use_find_package las LIBLAS)
 		$(cmake-utils_use_find_package lua Lua51)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Lua52=ON
diff --git a/dev-games/vamos/Manifest b/dev-games/vamos/Manifest
deleted file mode 100644
index 4dc668a06482..000000000000
--- a/dev-games/vamos/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX vamos-0.7.1-as-needed.patch 468 BLAKE2B bdb8cbb21fe89114e45cbdacab2283d97998b8ac476745eb458a72cf5d8bcd9386c94cf4e4c58aaf74146341ed29e6d0e11a1aa84afda003bfca30508579acff SHA512 e06aca9c628b6fd58b63c1808c52d2222b4f99ccde17c07ffb5c6ef0895a940de37ffc36d4d8fe1c382a71b2d3b4ce49007a301903ff6713ebbc34f5871bc164
-AUX vamos-0.7.1-gcc46.patch 246 BLAKE2B 8db281bd4df2a8ace91b844935128ed02f4702892251bb80d8baeaff5588bc9dda616de451d3f73517490e6153d4aed1f27aef731090dbee1f7cf68c84aaf0f1 SHA512 0ae32707a87d94ba5f1bf3dc085e8109fc1b0f8bc4cf7bdf3997d7b47e65ebc10cbdee667d076cff41f65c461a16519f8615b5b704be66d6863aadd5a971e11b
-AUX vamos-0.8.2-fix-buildsystem.patch 9650 BLAKE2B 3ece75ea7415c77aff65edf63ce1be39ddce908826b5bcea0e4eb02a8f92277ade29c076976944a14c494478683de3da8887640cf513a0421f0631f505078f42 SHA512 147cc9f7ecf918dd92da85903a4ec6055ae97b45a9850c3c190e72f7f2d3eaaf43c45b155d2e2629d4e4e08cb08463073f27b2d3fa6f0e741055479d64307ba4
-AUX vamos-0.8.2-fix-c++14.patch 554 BLAKE2B 4b45082dee29de037d9e6bfffb025b0f3cc9e914445e4c3e08f5a5c50a891ed179f2c9428a6cc7477664d468958f8933a0b8a78867e3da33b8e756b41b109b43 SHA512 b5fb978bfa0a1d3d7986800e3a9d83bd7eb92b2f6b0060f171d4f388acac3714e397cc966641fbe70297534849010081a8d58b7d3eea6549625f952d3fe81179
-DIST vamos-0.7.1.tar.gz 1681074 BLAKE2B 6d7c132fc65d1ba59c12d98699e82bd4d6029c0f6bb88e2c661d14ab602dc3aa0fe15b30cb8cc70d5b4c7e81f9d5a27c96b53f450098fb164806618d0ed7d35b SHA512 7560911e12636a4c530b6eeedc942be7121e39312d58f736a72d3b7fa2f632c962e9ccf714709f8f2e4335fa6d718f6870e7ba9e0c84f55c572e7915b4bf03e2
-DIST vamos-0.8.2.tar.gz 2148278 BLAKE2B a8afa661295bd646c0ee1d826dcee452f9788ecea7364116b0026f4950286280ef57d1b0179cb51b5f54c2788ca66f16b97bbc07142e0c92468638ebfbd81975 SHA512 bbc5b71790983b3db60c633f21b15b86c232a560f05ddc407c805d5bc39cf7a90bf556b9c59b4683a187961be755b1578a0a02b8b42599c6a634bd0f5936e880
-EBUILD vamos-0.7.1.ebuild 887 BLAKE2B 36d4484d093b3b7dc8c378d3282ff5d47f2067fcf891a4db51a07c4aa5de8509f6243295374c0aa9ff85ab0938d1db5217754750dac335f4fadb4a9bb4de0249 SHA512 785311b6f0e3fecfbca8b0151fbb8ca2981c880d8eb2776deea9114faa4dda9acffe21eb87ab9225296c9c82ab3359e732a4f9e44e09c4c6efb42dbab8328fda
-EBUILD vamos-0.8.2.ebuild 1196 BLAKE2B c85dbd56914b8eae3f1ba8dfa2d652682f5733102fd56f8c496d7ec79f15cf44c7dbdabd4d7aff62d398b4c13d8d85bb56e1ab5f08469cdbfb42ae7af3b6abff SHA512 c5f55f474b2768db75090e0dcfae8f19f5c2fc62b4094d92009f13243c832204193e25309d762b62c678e085f9c675a0e81be93fa6939a6e773de1f516ee7e85
-MISC metadata.xml 328 BLAKE2B 2c3269c4159fb3bb89b8e5c119844f960236e72bbd22915a44b901293d040f8c3e65d28e0a84e0075ed870bfb7c52d919c9aebd3456e93c7ed9ed2e2f91d01f6 SHA512 698c72452fe860f88cff1cb1de6a46902e02fe685081693c2dacbd5c9843fe717128cb9a706849adf19359bba1f809863fe62d569e776649bf5f8b5190663cb4
diff --git a/dev-games/vamos/files/vamos-0.7.1-as-needed.patch b/dev-games/vamos/files/vamos-0.7.1-as-needed.patch
deleted file mode 100644
index 868e9318cae8..000000000000
--- a/dev-games/vamos/files/vamos-0.7.1-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vamos-0.7.0.orig/media/Makefile.in
-+++ vamos-0.7.0/media/Makefile.in
-@@ -71,7 +71,7 @@
-   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libvamos_media_la_LIBADD =
-+libvamos_media_la_LIBADD = ../geometry/libvamos-geometry.la
- am_libvamos_media_la_OBJECTS = Ac3d.lo Sample.lo Texture_Image.lo \
- 	XML_Parser.lo
- libvamos_media_la_OBJECTS = $(am_libvamos_media_la_OBJECTS)
diff --git a/dev-games/vamos/files/vamos-0.7.1-gcc46.patch b/dev-games/vamos/files/vamos-0.7.1-gcc46.patch
deleted file mode 100644
index bf2ec3c6f6aa..000000000000
--- a/dev-games/vamos/files/vamos-0.7.1-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- vamos-0.7.1.orig/geometry/Parameter.h
-+++ vamos-0.7.1/geometry/Parameter.h
-@@ -21,6 +21,7 @@
- #define PARAMETER_H
- 
- #include <vector>
-+#include <cstddef>
- 
- /// A container for numbers passed from the command line.
- namespace Vamos_Geometry
diff --git a/dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch b/dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch
deleted file mode 100644
index f78ac1c4f055..000000000000
--- a/dev-games/vamos/files/vamos-0.8.2-fix-buildsystem.patch
+++ /dev/null
@@ -1,378 +0,0 @@
-Fix buildsystem:
-* Prevent pollution of python site-packages root dir
-* Fix underlinking in modules
-* Remove broken AX_* macros
-* Add workaround for parallel install issue with automake
-
---- a/body/Makefile.am
-+++ b/body/Makefile.am
-@@ -21,6 +21,10 @@
- 	Tire.cc \
- 	Transmission.cc \
- 	Wheel.cc
-+libvamos_body_la_LIBADD = \
-+	-l$(BOOST_PYTHON_LIB) \
-+	../geometry/libvamos-geometry.la \
-+	../media/libvamos-media.la
- 
- pkginclude_HEADERS = \
- 	Aerodynamic_Device.h \
-@@ -46,24 +50,23 @@
- 
- EXTRA_DIST = $(pkginclude_HEADERS)
- 
--AM_CXXFLAGS = -fPIC -Wall -pedantic
-+AM_CXXFLAGS = -Wall -pedantic
-+AM_CPPFLAGS = $(PYTHON_CPPFLAGS)
- 
- # Python Module
- if HAVE_PYTHON
--pyexec_LTLIBRARIES = body.la
-+pkgpyexec_LTLIBRARIES = body.la
- else
--pyexec_LTLIBRARIES =
-+pkgpyexec_LTLIBRARIES =
- endif
- 
- body_la_SOURCES = bp-body.cc
--body_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR)
- body_la_LDFLAGS = -avoid-version -module
- body_la_LIBADD = \
--	$(top_srcdir)/body/libvamos-body.la \
--	$(top_srcdir)/geometry/libvamos-geometry.la \
--	$(top_srcdir)/media/libvamos-media.la \
--	-l$(PYTHON_LIB) \
--	-l$(BOOST_PYTHON_LIB)
-+	libvamos-body.la \
-+	../geometry/libvamos-geometry.la \
-+	../media/libvamos-media.la \
-+	$(PYTHON_LIBS)
- 
- if DO_UNIT_TESTS
- UNIT_TESTS = \
-@@ -81,7 +84,7 @@
- test_Aerodynamic_Device_SOURCES = test_Aerodynamic_Device.cc
- test_Aerodynamic_Device_CXXFLAGS = -DBOOST_TEST_DYN_LINK
- test_Aerodynamic_Device_LDADD = \
--	$(top_srcdir)/geometry/libvamos-geometry.la \
-+	../geometry/libvamos-geometry.la \
- 	Frame.lo \
- 	Particle.lo \
- 	Aerodynamic_Device.lo \
-@@ -89,35 +92,35 @@
- test_Car_SOURCES = test_Car.cc
- test_Car_CXXFLAGS = -DBOOST_TEST_DYN_LINK
- test_Car_LDADD = \
--	$(top_srcdir)/geometry/libvamos-geometry.la \
--	$(top_srcdir)/media/libvamos-media.la \
--	$(top_srcdir)/body/libvamos-body.la \
-+	../geometry/libvamos-geometry.la \
-+	../media/libvamos-media.la \
-+	../body/libvamos-body.la \
- 	-lboost_unit_test_framework
- test_Frame_SOURCES = test_Frame.cc
- test_Frame_CXXFLAGS = -DBOOST_TEST_DYN_LINK
- test_Frame_LDADD = \
--	$(top_srcdir)/geometry/libvamos-geometry.la \
-+	../geometry/libvamos-geometry.la \
- 	Frame.lo \
- 	-lboost_unit_test_framework
- test_Particle_SOURCES = test_Particle.cc
- test_Particle_CXXFLAGS = -DBOOST_TEST_DYN_LINK
- test_Particle_LDADD = \
--	$(top_srcdir)/geometry/libvamos-geometry.la \
-+	../geometry/libvamos-geometry.la \
- 	Frame.lo \
- 	Particle.lo \
- 	-lboost_unit_test_framework
- test_Rigid_Body_SOURCES = test_Rigid_Body.cc
- test_Rigid_Body_CXXFLAGS = -DBOOST_TEST_DYN_LINK
- test_Rigid_Body_LDADD = \
--	$(top_srcdir)/geometry/libvamos-geometry.la \
--	$(top_srcdir)/media/libvamos-media.la \
--	$(top_srcdir)/body/libvamos-body.la \
-+	../geometry/libvamos-geometry.la \
-+	../media/libvamos-media.la \
-+	../body/libvamos-body.la \
- 	-lboost_unit_test_framework
- 
- if DO_UNIT_TESTS
- check-local: $(UNIT_TESTS)
- 	for test in $(UNIT_TESTS); do \
- 		echo $$test; \
--		$(top_srcdir)/body/$$test; \
-+		../body/$$test; \
- 	done
- endif
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,7 +19,7 @@
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- 
--AC_PROG_LIBTOOL
-+LT_INIT
- 
- AC_PATH_X
- 
-@@ -28,9 +28,6 @@
- 
- AC_CONFIG_FILES([vamos/vamos], [chmod +x vamos/vamos])
- 
--dnl Python
--AX_PYTHON
--
- dnl Boost
- AX_BOOST_BASE([1.46.0],, AC_MSG_ERROR([Boost >= v1.46.0 is required.]))
- AX_BOOST_PYTHON([1.46.0])
---- a/geometry/Makefile.am
-+++ b/geometry/Makefile.am
-@@ -15,6 +15,7 @@
- 	Three_Vector.cc \
- 	Two_Vector.cc \
- 	Parameter.cc
-+libvamos_geometry_la_LIBADD = -l$(BOOST_PYTHON_LIB)
- 
- pkginclude_HEADERS = \
- 	Calculations.h \
-@@ -39,22 +40,21 @@
- 
- EXTRA_DIST = $(pkginclude_HEADERS)
- 
--AM_CXXFLAGS = -fPIC -Wall -pedantic
-+AM_CXXFLAGS = -Wall -pedantic
-+AM_CPPFLAGS = $(PYTHON_CPPFLAGS)
- 
- # Python Module
- if HAVE_PYTHON
--pyexec_LTLIBRARIES = geometry.la
-+pkgpyexec_LTLIBRARIES = geometry.la
- else
--pyexec_LTLIBRARIES =
-+pkgpyexec_LTLIBRARIES =
- endif
- 
- geometry_la_SOURCES = bp-geometry.cc
--geometry_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR)
- geometry_la_LDFLAGS = -avoid-version -module
- geometry_la_LIBADD = \
--	$(top_srcdir)/geometry/libvamos-geometry.la \
--	-l$(PYTHON_LIB) \
--	-l$(BOOST_PYTHON_LIB)
-+	libvamos-geometry.la \
-+	$(PYTHON_LIBS)
- 
- # Unit Tests
- if DO_UNIT_TESTS
-@@ -110,6 +110,6 @@
- check-local: $(UNIT_TESTS)
- 	for test in $(UNIT_TESTS); do \
- 		echo $$test; \
--		$(top_srcdir)/geometry/$$test; \
-+		../geometry/$$test; \
- 	done
- endif
---- a/media/Makefile.am
-+++ b/media/Makefile.am
-@@ -7,6 +7,7 @@
- 	Texture_Image.cc \
- 	Two_D.cc \
- 	XML_Parser.cc
-+libvamos_media_la_LIBADD = ../geometry/libvamos-geometry.la
- 
- pkginclude_HEADERS = \
- 	Ac3d.h \
-@@ -19,23 +20,27 @@
- 
- EXTRA_DIST = $(pkginclude_HEADERS)
- 
--AM_CXXFLAGS = -fPIC -Wall -pedantic
-+AM_CXXFLAGS = -Wall -pedantic
-+AM_CPPFLAGS = $(PYTHON_CPPFLAGS)
- 
- # Python Module
- if HAVE_PYTHON
--pyexec_LTLIBRARIES = media.la
-+pkgpyexec_LTLIBRARIES = media.la
- else
--pyexec_LTLIBRARIES =
-+pkgpyexec_LTLIBRARIES =
- endif
- 
- media_la_SOURCES = bp-media.cc
--media_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR)
- media_la_LDFLAGS = -avoid-version -module
- media_la_LIBADD = \
--	$(top_srcdir)/geometry/libvamos-geometry.la \
--	$(top_srcdir)/media/libvamos-media.la \
--	-l$(PYTHON_LIB) \
--	-l$(BOOST_PYTHON_LIB)
-+	../geometry/libvamos-geometry.la \
-+	libvamos-media.la \
-+	$(PYTHON_LIBS)
-+
-+# workaround for broken parallel install support in automake with LTLIBRARIES
-+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
-+install_pkgpyexecLTLIBRARIES = install-pkgpyexecLTLIBRARIES
-+$(install_pkgpyexecLTLIBRARIES): install-libLTLIBRARIES
- 
- # Unit Tests
- if DO_UNIT_TESTS
-@@ -54,6 +59,6 @@
- check-local: $(UNIT_TESTS)
- 	for test in $(UNIT_TESTS); do \
- 		echo $$test; \
--		$(top_srcdir)/media/$$test; \
-+		../media/$$test; \
- 	done
- endif
---- a/track/Makefile.am
-+++ b/track/Makefile.am
-@@ -6,6 +6,9 @@
- 	Road_Segment.cc \
- 	Strip_Track.cc \
- 	Strip_Track_Reader.cc
-+libvamos_track_la_LIBADD = \
-+	../geometry/libvamos-geometry.la \
-+	../media/libvamos-media.la
- 
- pkginclude_HEADERS = \
- 	Gl_Road_Segment.h \
-@@ -17,24 +20,23 @@
- 
- EXTRA_DIST = $(pkginclude_HEADERS)
- 
--AM_CXXFLAGS = -fPIC -Wall -pedantic
-+AM_CXXFLAGS = -Wall -pedantic
-+AM_CPPFLAGS = $(PYTHON_CPPFLAGS)
- 
- # Python Module
- if HAVE_PYTHON
--pyexec_LTLIBRARIES = track.la
-+pkgpyexec_LTLIBRARIES = track.la
- else
--pyexec_LTLIBRARIES =
-+pkgpyexec_LTLIBRARIES =
- endif
- 
- track_la_SOURCES = bp-track.cc
--track_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR)
- track_la_LDFLAGS = -avoid-version -module
- track_la_LIBADD = \
--	$(top_srcdir)/geometry/libvamos-geometry.la \
--	$(top_srcdir)/media/libvamos-media.la \
--	$(top_srcdir)/track/libvamos-track.la \
--	-l$(PYTHON_LIB) \
--	-l$(BOOST_PYTHON_LIB)
-+	../geometry/libvamos-geometry.la \
-+	../media/libvamos-media.la \
-+	libvamos-track.la \
-+	$(PYTHON_LIBS)
- 
- # Unit Tests
- if DO_UNIT_TESTS
-@@ -50,14 +52,14 @@
- test_Road_Segment_SOURCES = test_Road_Segment.cc
- test_Road_Segment_CXXFLAGS = -DBOOST_TEST_DYN_LINK
- test_Road_Segment_LDADD = \
--	$(top_srcdir)/geometry/libvamos-geometry.la \
-+	../geometry/libvamos-geometry.la \
- 	Road_Segment.lo \
- 	-lboost_unit_test_framework
- test_Strip_Track_SOURCES = test_Strip_Track.cc
- test_Strip_Track_CXXFLAGS = -DBOOST_TEST_DYN_LINK
- test_Strip_Track_LDADD = \
--	$(top_srcdir)/geometry/libvamos-geometry.la \
--	$(top_srcdir)/media/libvamos-media.la \
-+	../geometry/libvamos-geometry.la \
-+	../media/libvamos-media.la \
- 	Road_Segment.lo \
- 	Gl_Road_Segment.lo \
- 	Strip_Track.lo \
-@@ -68,6 +70,6 @@
- check-local: $(UNIT_TESTS)
- 	for test in $(UNIT_TESTS); do \
- 		echo $$test; \
--		$(top_srcdir)/track/$$test; \
-+		../track/$$test; \
- 	done
- endif
---- a/vamos/Makefile.am
-+++ b/vamos/Makefile.am
-@@ -9,12 +9,12 @@
- EXTRA_DIST = Options.h
- 
- cvamos_LDADD = \
--	$(top_srcdir)/world/libvamos-world.la \
--	$(top_srcdir)/body/libvamos-body.la \
--	$(top_srcdir)/track/libvamos-track.la \
--	$(top_srcdir)/geometry/libvamos-geometry.la \
--	$(top_srcdir)/media/libvamos-media.la \
-+	../world/libvamos-world.la \
-+	../body/libvamos-body.la \
-+	../track/libvamos-track.la \
-+	../geometry/libvamos-geometry.la \
-+	../media/libvamos-media.la \
- 	-lboost_system \
- 	-lboost_filesystem
- 
--AM_CXXFLAGS = -fPIC -Wall -pedantic -DDATADIR=\"$(pkgdatadir)\"
-+AM_CXXFLAGS = -Wall -pedantic -DDATADIR=\"$(pkgdatadir)\"
---- a/world/Makefile.am
-+++ b/world/Makefile.am
-@@ -10,6 +10,10 @@
- 	Sounds.cc \
- 	Timing_Info.cc \
- 	World.cc
-+libvamos_world_la_LIBADD = \
-+	../geometry/libvamos-geometry.la \
-+	../track/libvamos-track.la \
-+	../body/libvamos-body.la
- 
- pkginclude_HEADERS = \
- 	Atmosphere.h \
-@@ -26,26 +30,25 @@
- 
- EXTRA_DIST = $(pkginclude_HEADERS)
- 
--AM_CXXFLAGS = -fPIC -Wall -pedantic
-+AM_CXXFLAGS = -Wall -pedantic
-+AM_CPPFLAGS = $(PYTHON_CPPFLAGS)
- 
- # Python Module
- if HAVE_PYTHON
--pyexec_LTLIBRARIES = world.la
-+pkgpyexec_LTLIBRARIES = world.la
- else
--pyexec_LTLIBRARIES =
-+pkgpyexec_LTLIBRARIES =
- endif
- 
- world_la_SOURCES = bp-world.cc
--world_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR)
- world_la_LDFLAGS = -avoid-version -module
- world_la_LIBADD = \
--	$(top_srcdir)/body/libvamos-body.la \
--	$(top_srcdir)/geometry/libvamos-geometry.la \
--	$(top_srcdir)/media/libvamos-media.la \
--	$(top_srcdir)/track/libvamos-track.la \
--	$(top_srcdir)/world/libvamos-world.la \
--	-l$(PYTHON_LIB) \
--	-l$(BOOST_PYTHON_LIB)
-+	../body/libvamos-body.la \
-+	../geometry/libvamos-geometry.la \
-+	../media/libvamos-media.la \
-+	../track/libvamos-track.la \
-+	libvamos-world.la \
-+	$(PYTHON_LIBS)
- 
- # Unit Tests
- if DO_UNIT_TESTS
-@@ -67,6 +70,6 @@
- check-local: $(UNIT_TESTS)
- 	for test in $(UNIT_TESTS); do \
- 		echo $$test; \
--		$(top_srcdir)/world/$$test; \
-+		../world/$$test; \
- 	done
- endif
diff --git a/dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch b/dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch
deleted file mode 100644
index 95c90995f194..000000000000
--- a/dev-games/vamos/files/vamos-0.8.2-fix-c++14.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix building in C++14 mode.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=600774
-
---- a/media/Ac3d.cc
-+++ b/media/Ac3d.cc
-@@ -892,7 +892,7 @@
- 	m_rotation (rotation)
-   {
- 	std::ifstream is (m_file.c_str ());
--	if (is == 0)
-+	if (!is)
- 	  {
- 		throw No_File (m_file);
- 	  }
---- a/media/XML_Parser.cc
-+++ b/media/XML_Parser.cc
-@@ -391,7 +391,7 @@
- {
-   m_file = file;
-   mp_stream = new std::ifstream (file.c_str ());
--  if ((mp_stream == 0) || (*mp_stream == 0))
-+  if ((mp_stream == NULL) || (!(*mp_stream)))
- 	{
- 	  throw No_XML_File (m_file);
- 	}
diff --git a/dev-games/vamos/metadata.xml b/dev-games/vamos/metadata.xml
deleted file mode 100644
index 56d1bba2cf08..000000000000
--- a/dev-games/vamos/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>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">vamos</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-games/vamos/vamos-0.7.1.ebuild b/dev-games/vamos/vamos-0.7.1.ebuild
deleted file mode 100644
index c057f2d8e74e..000000000000
--- a/dev-games/vamos/vamos-0.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="an automotive simulation framework"
-HOMEPAGE="http://vamos.sourceforge.net/"
-SRC_URI="mirror://sourceforge/vamos/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	media-libs/freeglut
-	media-libs/libpng:0
-	media-libs/libsdl[joystick,video]
-	media-libs/openal
-	dev-libs/boost
-	media-libs/freealut"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-gcc46.patch
-}
-
-src_configure() {
-	econf \
-		--disable-unit-tests \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	dobin caelum/.libs/caelum
-	newdoc caelum/README README.caelum
-	dodoc AUTHORS ChangeLog README TODO
-	prune_libtool_files
-}
diff --git a/dev-games/vamos/vamos-0.8.2.ebuild b/dev-games/vamos/vamos-0.8.2.ebuild
deleted file mode 100644
index ef0530a204c7..000000000000
--- a/dev-games/vamos/vamos-0.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="An automotive simulation framework"
-HOMEPAGE="http://vamos.sourceforge.net/"
-SRC_URI="mirror://sourceforge/vamos/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	media-libs/freealut
-	media-libs/freeglut
-	media-libs/libpng:0=
-	media-libs/libsdl[joystick,video]
-	media-libs/openal
-	virtual/glu
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2016.09.16
-	virtual/pkgconfig"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.2-fix-buildsystem.patch
-	"${FILESDIR}"/${PN}-0.8.2-fix-c++14.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-x \
-		--disable-static \
-		--with-boost-python="${EPYTHON#python}" \
-		$(use_enable test unit-tests) \
-		PYTHON="${EPYTHON}"
-}
-
-src_install() {
-	MAKEOPTS="${MAKEOPTS} -j1" default #646014
-
-	dobin caelum/.libs/caelum
-	newdoc caelum/README README.caelum
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index eecc255f3245..e722c01389c9 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-oauth2/Manifest b/dev-go/go-oauth2/Manifest
index 0a3723901efd..6197832b0933 100644
--- a/dev-go/go-oauth2/Manifest
+++ b/dev-go/go-oauth2/Manifest
@@ -4,6 +4,6 @@ DIST go-net-0_pre20160216.tar.gz 741192 BLAKE2B ed4ca3ddc71f794a92746e3601579675
 DIST go-oauth2-0_pre20150701.tar.gz 32040 BLAKE2B 5d2bd7f2916b045767c16f31156edee315c2c4e592cb773380a5c284a2c619433853d1aa6ca2b6c4c953a0cd82647c645afc2a8d003b587e7030d037f93a7504 SHA512 d809e1d63c7b5a4b388616d930cb22978b1653e2314b208d12679242bdd0e9d72f275f5ade7aa468b1dcf3960aa70ff94183ae1dd04325b24cdd20ef4834880a
 DIST go-oauth2-0_pre20160222.tar.gz 34556 BLAKE2B e8e64b5e7a8b43b9297c8ff38fdf6feedd9e4f80931dafcd3d86cc8804c35de973d1867b707cd7febabbeacdfecf46e1da09f3bece21bb6411c4dc9d980adf68 SHA512 23fbc7744fe35f893d385a308428d2a3b8ddbf45fa12c5b43d3dc619e6bb422f30ce80774a25b88a8f74f9343c57280546183b45364456e1c60aee96aa6d0f77
 EBUILD go-oauth2-0_pre20150701.ebuild 1895 BLAKE2B d07a50594cd4b675ca818b4d109e14ab80bce4374e2fef715ff3723ea61f5074a736aeacb78d239830622590cc77690ea2e06266b14ab43ca199f7184ce48089 SHA512 95bc823167f5891389fcdce9b376bef32618cf50b30dab5fedb5520116dc84d08836a42be09052db2322119dffacb71d2a1acc31536bd1400b3190ff3ef0ce35
-EBUILD go-oauth2-0_pre20160222.ebuild 3243 BLAKE2B 75113c725ddffbb0eca4571fa3d74fda4351a35d467381b7a2d9223175eb0a0a74afcb94a84765cd772f933881f1ba14de8a4b631d9bc12864740fe9250035e2 SHA512 f9bb274cbed91a0aa93d4c0ed274d83a14cd57472855b05dbce326eb35adb4403628bf97ee7855ee3d4f6688fcb1be5fbaeaae80192508f0fcd92f3e4c335ca1
+EBUILD go-oauth2-0_pre20160222.ebuild 3223 BLAKE2B 51b4a2a64502d55b0ff4b7e3196b39c994025790496c2852a2acd09283700a05d085781219e9bc8fdf6047738517a1564dc4e650999ef40ad6e0a7f097ff6e7e SHA512 5a56aba68113f1e3665f60b5f1aedc221a00f245f68fe5f2790e030c8e7248004dac8cca5a173922e1b7c554dfed901102d5acb8fe1047aff9f88bec5dff656d
 EBUILD go-oauth2-9999.ebuild 650 BLAKE2B af0c9034ef98e833c27369491abfc642f0d35aa0e7b414dd70e2ba1e9780c32a2e29d9b0e8db291cf18bcff9a99bc2eb802ca3592e033a34c2ddb2ccbcb08eb7 SHA512 040aea824ee23c177a81cb6fd5ab59bfd5e9e0eb8a7c48407346371274f218ff0158f8229cd1369fbe3619898ebcb0ee70a397beac9912ba5193c4147e3c1e37
 MISC metadata.xml 324 BLAKE2B 4cadbcdc17c27bc0960508c9b0c79217c66fc676103df8a5f03e3d41e8d5b8b803e7e5765630f94796a8a1d736849537db71dd93165c995363874ec8362d0a39 SHA512 2673cfa4c19f6aa8f75ebcffa401892234098959274958623fa9e99e75624a727fc657937bff45aa446e523ea000a04bd543cb966acee22cc5dc447c950bf8f5
diff --git a/dev-go/go-oauth2/go-oauth2-0_pre20160222.ebuild b/dev-go/go-oauth2/go-oauth2-0_pre20160222.ebuild
index 3c09e97c5a46..92f8ec9c1f9a 100644
--- a/dev-go/go-oauth2/go-oauth2-0_pre20160222.ebuild
+++ b/dev-go/go-oauth2/go-oauth2-0_pre20160222.ebuild
@@ -103,9 +103,9 @@ src_install() {
 }
 
 golang_install_pkgs() {
-	insinto $(dirname "${EPREFIX}$(get_golibdir)/src/${EGO_PN%/*}")
+	insinto $(dirname "$(get_golibdir)/src/${EGO_PN%/*}")
 	rm -rf "${S}"/src/${EGO_PN%/*}/.git*
 	doins -r "${S}"/src/${EGO_PN%/*}
-	insinto $(dirname "${EPREFIX}$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
+	insinto $(dirname "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
 	doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}{,.a}
 }
diff --git a/dev-go/go-sqlite3/Manifest b/dev-go/go-sqlite3/Manifest
index 43acecd57ec8..b672854696c0 100644
--- a/dev-go/go-sqlite3/Manifest
+++ b/dev-go/go-sqlite3/Manifest
@@ -1,5 +1,5 @@
 DIST go-sqlite3-1.1.0_p20160131.tar.gz 1847546 BLAKE2B 84b7919ad14b6ac214d7ca414a63d6f73d89b97adbc6450c00165302ab84e54906608918f8d803551ceed237e9085fe104d31124d57712ff9ddf19e97d62cde8 SHA512 9596012111b23865191904b7b0817ddbd88fc61383a3dfcf737d3d1be95c1a1d57b779ffbb9fa83303245a992c56e427396ffccb759a440822fffa516cae0b3d
 DIST go-sqlite3-1.1.0_p20160307.tar.gz 1847839 BLAKE2B 1e01d313497ffed552093a0ee380a5d2d04a3c067dfaeab245bcea52bc6b1c64c2f1397ecabc43366039fcab2ea9133ae5a25f6c375d32bc50172757647c5466 SHA512 e4613f8c18c4f5c60b09facfd6f6c36e14029538eef6deef94d57d0c0aeeed86023f36ed0fb0b7e5340ecbaad4f9b5815c5182cc19f85f52349610caaa998665
 EBUILD go-sqlite3-1.1.0_p20160131.ebuild 513 BLAKE2B db298069cf3566c4a8c62f1bae964e446864caf24408c5ed7202fa5d85b9d63bf1b6f7bc837867a64762da13c732f952af06d1c8dbe0dc3a1d674b15a416a443 SHA512 d366180b334132a69f6cdd7a00a0d029b5ec2b9d9d9ad32c0c599f7c8fde822af82335ab1f453e528989535c21d2576b98b173dd515d67ddfe5bc6d18c7b974a
-EBUILD go-sqlite3-1.1.0_p20160307.ebuild 984 BLAKE2B a6c6850d83ccb70c3fc5653a0f05493cbf4ec55ecd85e5d3548dc2d2a43299d362d39a6d37ec332fd4403ac69ee4ed275cd5860e8a263c4de5cfe4cdbcec5e30 SHA512 2c1da59217861f47c1f6452067957b730d86d559d21057e2e229d35e9fb2881b6617770cf747998ca7ad1d81841a50f2d6f9c498cb31b5e9f21c517e20c39022
+EBUILD go-sqlite3-1.1.0_p20160307.ebuild 961 BLAKE2B 0fc778e134a45bb284481d299067d413a8497d62fa34fb070b6d380ca884d662c127e2bbc8f13cdeb2cc351bc7f666c94de401ca8c3efc4c2dad8a7b6360ef98 SHA512 4dcf40ab9982baa6c859b3c2488c227421b9514891641e37c770f0d6d69bfeb46c023375e90560a4aedc6fd5a81af3cc48a81f48f348b3ec3ec656b3133add40
 MISC metadata.xml 307 BLAKE2B db863a3ccef5d2c5b77486df9397c9ed84ae9c0413e4245e5d37cc32517689d8c157e452dc6083a84ad2452ab61752743f7ea1b6788af241f1d897462dc9949e SHA512 d206bdef42fcd61b40ba3516cce68d3078104fb07f366b6efc8d62308ec43eaf586141d6d2f3434333ecb360852f647eb275af9214aa16642eefd8a3266e869c
diff --git a/dev-go/go-sqlite3/go-sqlite3-1.1.0_p20160307.ebuild b/dev-go/go-sqlite3/go-sqlite3-1.1.0_p20160307.ebuild
index 9779c6f59d34..968a518d0216 100644
--- a/dev-go/go-sqlite3/go-sqlite3-1.1.0_p20160307.ebuild
+++ b/dev-go/go-sqlite3/go-sqlite3-1.1.0_p20160307.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
@@ -26,9 +26,9 @@ src_install() {
 }
 
 golang_install_pkgs() {
-	insinto $(dirname "${EPREFIX}$(get_golibdir)/src/${EGO_PN%/*}")
+	insinto $(dirname "$(get_golibdir)/src/${EGO_PN%/*}")
 	rm -rf "${S}"/src/${EGO_PN%/*}/.git*
 	doins -r "${S}"/src/${EGO_PN%/*}
-	insinto $(dirname "${EPREFIX}$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
+	insinto $(dirname "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
 	doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}{,.a}
 }
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 98ce0fcbef06..c729fa2fc84d 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/logict/Manifest b/dev-haskell/logict/Manifest
index 7060286935dc..25a6e7fad415 100644
--- a/dev-haskell/logict/Manifest
+++ b/dev-haskell/logict/Manifest
@@ -1,3 +1,3 @@
 DIST logict-0.6.0.2.tar.gz 5370 BLAKE2B c66d17f4595a27c83d9b2fddfb3c9e824d838ab353a8a71d6a78f436e20f529d7f408cf818b7034500bbfb5a14da7c6b8b2b067d36e4820898379f870922a3c7 SHA512 dfb72d006d9b7a5f0d7447d956ea0c3d083e200a616efc4b34fafa0582c2dc7e9369156cf4f51a472b97f7afb6167030edeb84e77c7bc410bfe58a44f0ac4fc4
-EBUILD logict-0.6.0.2.ebuild 627 BLAKE2B 624d92c0268d12c0bc7f62546135fc59f6d7530aa865e734abad25ecb10e0309c4ba136a0b044b57af7d3d8df81a434cd0ff813ebc32a9213b052f04b8085f7b SHA512 b12ce0538d6c55d5304dbe33eb50e0dbd74052a89d722267a39b4f441d8cacfc161022eca38f44652c63374a1a5a2801945ad1bc75721ef5eff6e20210f0717b
-MISC metadata.xml 559 BLAKE2B 0ea38e452c8db16455606726b757d22866c023836e39b651c600f7df645b6430c58566092e45afc6aaef3402185b19238b9c5d3f6f9eb01c391eabbe8988a320 SHA512 7ba71e85156efcbeeff2ab93657396d072a93f730de580b2e4ec75a31bd8be711bda636d610911462f320ecd0537219005caeafbe56730389dc225cb621eac9b
+EBUILD logict-0.6.0.2.ebuild 627 BLAKE2B 0e73f9b79751eacc66113c1ef9bda6b768a094a9f0236d160cc7d70ca0efa931d0d9fe55ecf2dd6df388350981dadc5d82be7bc654615c627ff4786f3590737e SHA512 b136635a7b267bbff8e9d2f2b3c205c1bb67c7d6390e2226a5938a16274e5c229987f2c0eac06e253ccdbcd28d68053ade0861aaa948fb0a3ea69f06b20814e0
+MISC metadata.xml 639 BLAKE2B 3230f1fbd426ece61b20dfaf9941948b1dbab928b0a346ae1e169147879e606cd1516984f2c5db2f238a81d77f5a709d259110c8bc9be25ba86f7198ce152bb1 SHA512 f73942e60af15017476d75dbc89ae2e3f15e0f4f6dc95a63ca8e86e4f785f6cd4a672c4ab6f5e47f4779e7644ea10ec19d8de4a55c815a606489bbcf5a611b18
diff --git a/dev-haskell/logict/logict-0.6.0.2.ebuild b/dev-haskell/logict/logict-0.6.0.2.ebuild
index 5a3b271b356f..893989799176 100644
--- a/dev-haskell/logict/logict-0.6.0.2.ebuild
+++ b/dev-haskell/logict/logict-0.6.0.2.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 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="A backtracking logic-programming monad"
-HOMEPAGE="http://code.haskell.org/~dolio/"
+HOMEPAGE="https://github.com/Bodigrim/logict"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-haskell/logict/metadata.xml b/dev-haskell/logict/metadata.xml
index 2075b4c3e438..7988c1d2a442 100644
--- a/dev-haskell/logict/metadata.xml
+++ b/dev-haskell/logict/metadata.xml
@@ -12,4 +12,7 @@
 		Monad Transformers" available here:
 		&lt;http://okmij.org/ftp/papers/LogicT.pdf&gt;
 	</longdescription>
+	<upstream>
+		<remote-id type="github">Bodigrim/logict</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index bef4a0abc8ff..e722aee19e8f 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/cortado/Manifest b/dev-java/cortado/Manifest
index f993adefbb82..28bdffd40a53 100644
--- a/dev-java/cortado/Manifest
+++ b/dev-java/cortado/Manifest
@@ -1,3 +1,3 @@
 DIST cortado-0.6.0.tar.gz 233854 BLAKE2B 54ace339a6038b46bbf2d993eb911f1845f8717dcf4eeaae0fcd807488a0293bb6618fe72ffa5bc425dc9f7d47f5362ff55168191aab15dbed59547f7c1d72dd SHA512 56113259da05a73f4d4e7aca92d031fa934987ad3607a69b31666c9e452330a95728e7780c45d825ddeb9c0815ace479d7a55df0e68a50e63a76ddf5602c76da
 EBUILD cortado-0.6.0-r1.ebuild 760 BLAKE2B fe0c7962ee3a8e53738663efde1c97fe8d7ef6bc110ac6926fa28c86a142e0466f0f546c0df64182db6d76b2eb574c90f3fc91fd53872f43bc7c3ce08caf2d31 SHA512 22dff7958965edb3f60c0e52ceb71807e31ee3c82689411f4f0e7600a8c975e96eb42ff5ad3a4396edb922357ad441c0458a2bc1081a083b10f16ebc0e9852fe
-MISC metadata.xml 1146 BLAKE2B c423c06402e9a88eb11980fb8404d8207a967bd9306d254aff1cbdae4f7faa64edd20b135f1998b22667a7f6aa1c535eeb507c92a371f7bea9436f33aebcf80b SHA512 3671a67e4e69eb69ab47f587e75ccc5d18cced1f8d018f90e4e0aa7ebe68819cc7b9170d1780339c55b7fe6852805d6c1ad1f0bd6fbdac3bb374eabc6426a2bd
+MISC metadata.xml 1038 BLAKE2B 57d9c273358e312774313b2a136f5e42474da701de597389647cb4e8fa212267020d3d15ad5e2beb8e69eb1be75a621cbc58a40e66c85536cf6ecf27d7f38378 SHA512 312aed5403631ad536cc71d9557a494bca084d24b344a7dbafa01fb98f45eebcf4db725f5e50fb1ced363103bee3df36777bbd18f8608dd9042346e9087608ec
diff --git a/dev-java/cortado/metadata.xml b/dev-java/cortado/metadata.xml
index d9a784348941..8dfa9f9b8158 100644
--- a/dev-java/cortado/metadata.xml
+++ b/dev-java/cortado/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tupone@gentoo.org</email>
-		<name>Tupone Alfredo</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 		<name>Java</name>
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 2f3160c0c266..b1d39e3d6fe3 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,47 +1,17 @@
 AUX icedtea-bin.env.sh 1062 BLAKE2B fd3b099ba1cd2d4f817852ad6d5f6ee5690f4c4edf481ecb0e3b6a7ce7893d983405801ac997e7df53048a64c5c8c48b5370710a897aa68a086ec79d316d0026 SHA512 7d85767b6bc1d5761d2dfcdd560199f735bd2514bd1fe78d0a11af4f491c87b89cedb063d72e3170ced9cb01ebb5c40004f23e7b97b0c7e77a4d68c051a62b12
-DIST icedtea-bin-core-3.10.0-amd64.tar.xz 62065004 BLAKE2B 5df1301414b174d2ec6c9d9604703d85279f48014655418c683c40a9234a10adb0879a5b825b9e3b215ca52e6df424bb81f0371834217744c3a07e1e1c182379 SHA512 6f3e1f408e8d69e0e95ee48579a65f7ae17c1d80a6f94ec88f1e7266a0d9a96f7291578b380810833cb8759695a3ad36d54f6868c9d51e769c78a486f524c05b
-DIST icedtea-bin-core-3.10.0-arm.tar.xz 58156488 BLAKE2B d250f4e13437384366bd11c977dd14fb29e126c17b2194e2cded6abefe4a4ede241f32a4e3979a5cbc3c60353f46736433a267d78c9f5770dd1ef2a9886962dc SHA512 71e3ea567cff85b804b0aed9589f6922b5a6146c603f9bfabb05aba1380ef8e2319024685d64836ea105e4c3378e2efeb93f4b1b121e8822ba2986bc72974ee3
-DIST icedtea-bin-core-3.10.0-arm64.tar.xz 61270912 BLAKE2B fef3e93230ec624b7e02d3cbe370191c0bfcb30d43c486025b28722f25383eb928b065e9a005a26077fc1df956ba0fc7096a73ded6018aa1992258a7f5e4a407 SHA512 6382a8de65b5fd57fd1a6c05e23699899ca850919201e1c63e907ac5e60673b4a520440fea599e20ca12ef80ac120133ec6b78c59d11020f3fc6ccd574fb4d8b
-DIST icedtea-bin-core-3.10.0-ppc64.tar.xz 54444136 BLAKE2B baa42a8a5133936f6071cbd150b122d9aaeaa9cdf4d5892a881de3d470042d3b47d9808d6e1cb6138977df930c03aa14bab6a10a61d6ed306d42cb6ad7fa2a78 SHA512 4ce1bcf040ac4e2309a4dc1d927b59344102c42e032c27163e6bb1eccab9d9dea3914ef3b854a28a507a56c9a0a13063299dd843fd83a7f79a35e0780a420564
-DIST icedtea-bin-core-3.10.0-ppc64le.tar.xz 54511716 BLAKE2B ab536cd53c696828e3edee14b7bf589b332243d6cf3fba3502aed3cf5863fb62d946ba57479c7bf64c7b5a2b8e22eb571aa86a1ea0f134e6c066c23957bb7296 SHA512 d78b9d06232d2e09d2b550b9ce750190b5340254381ccb9801f437e4af73ec99f09a64d2b6a2ba2a33bcb1e0983e8bac918a3573147a448b54cd29f71871e9cc
-DIST icedtea-bin-core-3.10.0-r1-x86.tar.xz 61580012 BLAKE2B e334e6589f7603fcd881f9fea8c2178804502f83c898274e53f427752ad8f284f5ca1ba9f6a87546e4a21284a30226551fc7047ce7f84836af3f3a815e2ea50c SHA512 004a16e67804eb01d56ba9c36b67e60547198943bb086a19fd161f7f348cea774deb6a806814f6fbddefd111e59e7e98d934d895b89db2bfdd5a836b6aa4b483
-DIST icedtea-bin-core-3.12.0-amd64.tar.xz 62006904 BLAKE2B 826bf190b8c2a20d953c3eb7222020006d8101caeff3e57b5cace7758cfa1ea70ffa5aad8001f7ca6ea8e10cc71830f239edbfd1179ce5a88b691b1921548a14 SHA512 0771b8f92102086eedca945bc2d1e2f77477bda5318e5c7a4e05d43ded588df29622fa6b92f57a821f3f4e599db8f97098cd796dd5821b62e48824b806bafa76
-DIST icedtea-bin-core-3.12.0-arm.tar.xz 58065212 BLAKE2B 4a317018ab941cafa3a6d98ab6bfa376df3f36150832f3e4e081802215f2d295225faf4cd71be492bd1e4e245d8c7fde7b2fd032c899d1bc5bc6dc53f80d7653 SHA512 591194495eea10aa2802f53f11222c03fec46e05668f004723aff7ca1923dcc9bd8eb929b9dde900e10fa779d09eae003c280de21bf1569fa3129acec8fe5cb3
-DIST icedtea-bin-core-3.12.0-arm64.tar.xz 61721616 BLAKE2B cec7f5d11f0fe3688b3e10c274ccbab1c7d6667a85cfa74a053822d223d364dc8dda6ea7114c551ab76612cecafd26333da140637a0b1aadd4136e391f4afb94 SHA512 d2020d4984b84bffe9bb642070377ae0bf4ff04ca3770a59d5553bc31a294d0f9ecb6398c8e1ee245455548f2f255c0c7a2268debb1e7c14dae16646b4e39c8f
-DIST icedtea-bin-core-3.12.0-ppc64.tar.xz 55033784 BLAKE2B 57deb4a82576b34d615ae06ed588e7304564a784d7ff8bc08597de4715c24b918716ef92f0172e9f0e9f57d4d422e21441b2adb1df4403f579fe0c0f5c1744ab SHA512 83738080c431a9b7d4dc840005ad9e1938abf2164d4cb01e2f12f81d9adf24c715c1a0306108fe4c8d0d190fe80688f158fe8a37ae9b4f5927277a4ea3609f68
-DIST icedtea-bin-core-3.12.0-ppc64le.tar.xz 55129328 BLAKE2B cb4d7b5262ed7c624ba8ad0b536dadf25fe29c8848636614c8f53fd722e3ed37bcc0adfe82f8997c1baac9610e8aef112b137935357fa623f19189bdf0c2ebca SHA512 f6711fecf9305478ece98311c13b577317f69b4c7d15acb7c8e230ef3acda3d5032067c2859f0fc6b3000e09355a1773b6caf803c4d269655dd00977ce80ec2a
-DIST icedtea-bin-core-3.12.0-x86.tar.xz 61446708 BLAKE2B 0d5790deb0092ef590eab4c631028f58fdc86df97d4e8b7ccb83993980781d7b2313c7c97bb2663e8ce43f71b7c8761a6972ff7f0c096c4fdf878f178ca8ecfd SHA512 cb5db79e955a3e7f292ece7bdaa6e3f1a0be15c1982b904bcf299699b88402390fd2b343ed95b8855ede242729c7943c6dc25befc785d153018c5e3f8dcecdcd
 DIST icedtea-bin-core-3.13.0-amd64.tar.xz 62068456 BLAKE2B cc0c35701d572b0c540a18060ccf9330504b54d6316898a28d306c3380e2f652c1c72ea256b5a11686852e0fc8e5918e80551ec03879d2522ec701bd99b4ff20 SHA512 ce506828492951ca6468d883ed2dcb3f05e6ccc697e6fc410d8147a2fff27ebcdb44c194debe017dab5145ed39b14a3acb85c62f1d003091a899cd74d495eef6
 DIST icedtea-bin-core-3.13.0-arm.tar.xz 58151480 BLAKE2B 0709c3797defd250777a4aaa859b6d13d2e877f3a85db9ae5c788caeb5834ef5f825e60b4fd912e72d1f5c191841c04ed6737ba3a2ff71bef4fb3e8d0bc258a4 SHA512 c89f5748e41a27a2f091be9b1d6911ce38ff63c1df3c1d8f686e930caac61c5598babd70054136f47acd6a789ea559b71d1811d3066a02b8e864bf289a55013a
 DIST icedtea-bin-core-3.13.0-arm64.tar.xz 61700464 BLAKE2B 333202f47b63ae050aa4375e38a33a649d898de5b1f95301ccfc38d5a3119e5371e944f6a1bec23b5e26f097a4888cffb199e279622b568989f0808b0478c54b SHA512 17d9e858d2677b1fecbdff7b07e296e797ac57f6692ebfaf2b1d38dc679fcf1bab0b86953529d60840b589a4fb5ce4c7cbde906f011842d22097a5bf02512155
 DIST icedtea-bin-core-3.13.0-ppc64.tar.xz 55002324 BLAKE2B b93312e3e82c75d2611f6907c57046fc4dc1498be989fde841a43162c381247fd934c4c3d83493455f4aecec338cb343e30cf26a313cd0d26dcca9e76ee2a2d3 SHA512 c04d0afe3b5b9a592bc9d9d26cc15e920edc6a6646337f969b889388d0ae08ddfdd84435076538b27106dc7dc1edc31d7dc84abd744de927d403e8fcde0fe742
 DIST icedtea-bin-core-3.13.0-ppc64le.tar.xz 55089960 BLAKE2B 915a80eefe41dc5cbfa7baa4db133fda0057a43e2c4d4e5c042d0ec2b8cd174fd4950cf66ec60e41f038036a09b309533ad4cf647cc9f1c6641ac040d38c6afc SHA512 a914559df5981cc88d54fed48c013632771b094b49198fc742718c549c0188846a399d1fb28710bdcf1b224df6e5588aeb2d29feebd523943759e3f3fff4b20e
 DIST icedtea-bin-core-3.13.0-x86.tar.xz 61579520 BLAKE2B 736941e5b41c4f0e13f5d60e4cefe716c7759fd4eb77e8cf7bb831c13525e8d007e5039dfb15c75ac0c9a18bd3d037564eca2bed4a6229c598f8ea8d92aa58e7 SHA512 d0f70ea72a55e5abfd459f4ce7eb4e4cee6779860c6bf95cea0bf682896cba2c2e836c613d80c5f90cf5bb14ae9abc9f0692aa4cea3bb0f6c245f8f21c842fe7
-DIST icedtea-bin-doc-3.10.0.tar.xz 11707560 BLAKE2B 1b09d024bfb39437365252b1c20fd55a0fbeb2b984dceb1c26b16319e95c6582cefd3e42694d56db998565714afbe6a375aa513afa8ab91479a727751b291c43 SHA512 010100e505d7deca6a3dea82075419eef842e0e49dd51caaadbd7f7ad4c2411e4c7c02709faef68b9d830943684632b111d45378ac657be9b11eccd6e0fc77fe
-DIST icedtea-bin-doc-3.12.0.tar.xz 11591700 BLAKE2B ca36760086440736248fa7e8be646e328cee415196e8f7d23186efd4abb6a763262746a1300624f35cc0b266720c8195d022d00eb5c28672856561422bc85886 SHA512 8930540379bdcd8dffaf6b9c309035483cfcfcc2b1cf38ea674bd46d2d4437513df3d298a3b43543ce9a57b29fcae4ea27038707198ce190aec393ad6041c0fe
 DIST icedtea-bin-doc-3.13.0.tar.xz 11641004 BLAKE2B de8fbfe42a214276e1cbb60d4567c0d06b03078ff3db50611cce5a7381c67d0219e74ff53a63b900f6353b72ef8ec943d80c4271769a058cc191ae06f9615840 SHA512 2b786ed12424494dd4e8018b5a41a558517f2614cd6dc6f59fbf4b9be5afd94e76e0c3d0e5a170d61c2212570b9d68ca9b88728e5eacd4baf2448052d782c0dd
-DIST icedtea-bin-examples-3.10.0-amd64.tar.xz 1856192 BLAKE2B ddd0ecc4eb79592e6eb7f7894decd1fac6a84e0285a252584601cab28acb860f0b6012cd15687ef5f4139431e12b043af9e187772a794e7664cffc89fb4b3835 SHA512 9535c85b36c3f66154d39f903bd5e5ba19c979ba46cd6f4e4f4a15d60f6a825f5600b108ff590254c8b1e1f194a04b80835ef3697acf9011b69285661f2e5ce4
-DIST icedtea-bin-examples-3.10.0-arm.tar.xz 1845892 BLAKE2B f071a774653c90534253d5c757e161164412ed8148e8f3fd9d91fd00f8c35a649b2221731888197730dcca4ee3af9cf5c72b9f40b62a3be2e440afa1c4628587 SHA512 79cacbd9f1e2cf7b277e1040066ebff5a982d4ee6a0df19ed48174ab287661a150d00697673728b206f9ee8709c5d8f8a6dc5908b77ffdc67ca0cc175fe90e4d
-DIST icedtea-bin-examples-3.10.0-arm64.tar.xz 1841760 BLAKE2B 89baa68800302187d0da212d4aedd3614e4a47744e75426ee81909b942ab0c0e4e0ddab7f46e1e1488c6c5a601dfa96edaff6aa4df5ca8fa8d6b3fb0baf5ef9e SHA512 36c3a2dec0fdccc836fd5bb8e37ed859b592fdabafb6ee73453fdb7d98a33989d6dd94ece2ce481676841231a9e3b6c0ba7a2fb7965bed9ba5d639f904f3b8bb
-DIST icedtea-bin-examples-3.10.0-ppc64.tar.xz 1852168 BLAKE2B 90202d9960ad99e14b223e5498a3b1d8fa399e02fa47533a812ad7d7201319a1ae32ca64bfa1cb02dcebad5fce31f7cf27882e4130812d90752e46281756b030 SHA512 734f9b2443bb038bb8e375c96147a926060eb7f0f241b5417f84da296e4353341c3f2d52d6b32d4656e3c8c68bdee854b5b2d4729dfce7fc618792c74707ba7f
-DIST icedtea-bin-examples-3.10.0-ppc64le.tar.xz 1854000 BLAKE2B c6345b3202b581a60ccbecf5dd593ccddb0ad3079e03794c4a55412bde53480651e9e3dab8714759f342eefb752fd3b509a3eab42e7e21e796aad0771aa2e1e4 SHA512 1de307b0e3230936ddfd57cae1f0a44d890d6e5cb61b6634c55abc5979c930784eda21d52a705968e59b5fc3434869693e54f61eb33dcbeeea837c99c8414128
-DIST icedtea-bin-examples-3.10.0-r1-x86.tar.xz 1863128 BLAKE2B 12002c655df6ba2228453840155495090d09b3e1fb49241f0b8d558b822f8d9fbf5395aaf0e391635034fefc170828489e5bb24470a8d98ab9b052d82f51069b SHA512 d6e7ad0c7b400acaf4bf7bdb8aa85de0028e5fcf349d04c1bf06c3a645727c2f9fb266e6f6578b6451121dac04d7d5957b717b9e97ac56079593cb42c5384da4
-DIST icedtea-bin-examples-3.12.0-amd64.tar.xz 1853616 BLAKE2B 48267b2783c402bafd1ec5988d4284a30175635035682e3761aeb36feb962977ad90130f91e55768e52eff862fd3e2c4bb1b123ec3aa629f07acd50e60335683 SHA512 6dce1b575be9d8b1e9171eb6d4724c096c8ef18508c03ba581be7b1427d266595b8fac06eb02db5583399b2763d641b712aec4cb391772c444368c79c0067ca6
-DIST icedtea-bin-examples-3.12.0-arm.tar.xz 1840952 BLAKE2B 7da7e1a79f5a0a846f0a48ade5bab975d841699598101308e2fd7f66b4884feecfcacead940905b839920ddf567c6bfec08704c1d5f880d6094e73d4d7821951 SHA512 b78cd2f61da91e644185b0b2a4595fb9645ac753f3fad0bd5bce3416ee13566e99863b7fbd7acd9ad5e53d0def1e2081622f80ff62fba1a50fb5a2e940c6f9f3
-DIST icedtea-bin-examples-3.12.0-arm64.tar.xz 1850652 BLAKE2B 21620780ec47d588dcde464b1b1706d731f569fb52225b46e27d21910f1c4b49345eb45f436623347068413eb48af5ec332b8346cd53931425e523573500a1fe SHA512 b7bf955188f192be9614d4d768af2cc93b123c3afd1db121ea4156793209ea4badd37504854a9d15e6f8387517b7bf8eed0e49b8b56124ab8281540bcd4c8c27
-DIST icedtea-bin-examples-3.12.0-ppc64.tar.xz 1864952 BLAKE2B 8fda5731a39e36347adec379db562700392c2c482447ba2775b129cb323ccfa101b4f845baeb30a016158204d1565bd2b5e0b7cc1c597f4738848cbf1d2d2816 SHA512 9cbbec98b68437924c3cc2c81a6c341efec533d61f5e3c6df99b46222a3df7824c47e37baa99a4f23e5b868f788b4501064d52b379e77ea523592a7c493629d9
-DIST icedtea-bin-examples-3.12.0-ppc64le.tar.xz 1867256 BLAKE2B f8110bffd2d1b30fa62ebfe3ad18da02ada4d6f65b6016e939ec18cf0ab7970199edc7b9c3b2d8f2edd504db8334c384f49fb423c2c2dec13f761588cdb5c4c5 SHA512 88d9b5070676fbe14fd43fa35ff01a7e1e34002271411befd6bd6b5b69b8136e742fdc6461d58970e2ed06bc7beaa12631c2b150452edd3995faaffe7afdbbb0
-DIST icedtea-bin-examples-3.12.0-x86.tar.xz 1859900 BLAKE2B 44ea53632b82e1bbcc7b569d3aaf9f3f247c79b465ca4f4e54f70f3e3fe1752b1f5d9c84ab40328270e074be6da13b34af3803fa43584df16c9f22898b77265e SHA512 1aa895aa3e02081ec45f7b3b250605ce914c7f06ef4e9c37aaa6d7f2b084295ab48e490174fa443b419d37299f88db217407d81651c08996aba1af91401629ce
 DIST icedtea-bin-examples-3.13.0-amd64.tar.xz 1854064 BLAKE2B ca2b4fc55561843a081edd3de935f9f78f0ce072b22fa758caa6ff323182e1b295ed777d8550645c6f954f17dfbe8b932d008698b9767f2ac1cdee8b96c1a90f SHA512 906f9a83174898b47616428d797b2ea0c96c3f21a6b0c630895950292fe69ed6431aa3dd066e68e70bfd9f267e22620f1775505e0175b8ed43006c05715dbf76
 DIST icedtea-bin-examples-3.13.0-arm.tar.xz 1841164 BLAKE2B 4b5668055a3faab4ab25383c54111e5add5056e21fb84d0f3e360faaef102c94975c8991ff4548dcc41deec5ad6450177d3da8e0cd9eeea112bb9253cbc43b08 SHA512 d0ddc2f82a4bac79830a5b36264f666f33833b6bcfbdaf815936be469446274ac969c33ac975e82478598babe04025d0a68918e1933ff1c659d23608a3129c2a
 DIST icedtea-bin-examples-3.13.0-arm64.tar.xz 1852148 BLAKE2B 1126bc4a17b3224640160066a5dff4d3a47be7cd2f100f978d39f2003a08966adbf7fe4b3611205677fff351db174b4162da2260fd18797c7011af2b8a1d0b65 SHA512 5384f3e0410818ef0565bdef574c19b1927d74b5ce52a8441608cd4a56d598a65a28ef1df43469a2bc36f161c7c4920f71d09c0e0d0b828b4ccc1f9093c77bb8
 DIST icedtea-bin-examples-3.13.0-ppc64.tar.xz 1865612 BLAKE2B f24e19d55da3cc588c61b4671b3494e42e7864efe624199be5cf7a1687724bdb86adc1e29de6f1f240bb1d21dc31b4a78757632a28960f3d235aa69aaf286ea7 SHA512 e86385db7f0d81ca9b73e0ea86e55714632aff87cb6fe959ec15fb323c3981a4817e12a69ac7dd2a1d0aa3fe10630ad104ccf70aa84f3318274d43c8b09c16c6
 DIST icedtea-bin-examples-3.13.0-ppc64le.tar.xz 1866904 BLAKE2B 35d86c859010608c276fb7358bea8a7b66aeb423d7a8479a2ca919907c91e2709ce915a16d8d4c9cc6796c05fa12216b96ad59f67bf761d58b8f140878b89d49 SHA512 1e10bd09028cba7d19f1a9d96f8b835cd7fdd8059cfab443d769575f2a0aa77f39df75943a2a446fad9d52481c7bef45846b757d375848c6d0cde329609e8bed
 DIST icedtea-bin-examples-3.13.0-x86.tar.xz 1860412 BLAKE2B 8c4f729b19e2badf4dbbab3c434f9af50bbdf792950c1c6582a4931afb6d0058c40641d15873bb3539f630df1ee3f4d1474627ed22334c4a5543b32e6c7117e1 SHA512 6f665210039af9ef2d68d4e5bb61e7dd553d2894d6f46dd56d07b36c43c47d43c0574f0fe07f42d26946dc89897b062bb41a77e0c3a4937167daddcde0f5c164
-DIST icedtea-bin-src-3.10.0.tar.xz 45755380 BLAKE2B ba6fd20de7d21e728108ff1d30599112ddf7ac24135e30891ae0d033bf77d52238c81c5c7fc7375e062ad4e8bb9492098cc0a20d3ab8486a4a02f20efa1f06a5 SHA512 0693cfe83a80d5e9e86be394b142b23097b0cfc1193f68f0fd07045ad4792b38bffcce47ea764f934d3dbfc568bdfbf5017725e7f35fbe1175b48498d53b0c5e
-DIST icedtea-bin-src-3.12.0.tar.xz 45776320 BLAKE2B 97ca4172ed8eadbcda0e20b598083b6948cd3a90705653716f1b6a9e65e150a1ef7d9e9ecdd3ad5ea90fd972ec9f1c3fe20ace44e4d2a0ede8e6d491991f7f9f SHA512 f6e7efa0962632d52032cd22a6b8de50bc2571a5ebcd18314b9aa01fb23cbd8d134eda5d1d2a6bb7fb1e26decc8a5740dfa60318019b920eb3f0498c2a9e9784
 DIST icedtea-bin-src-3.13.0.tar.xz 45821508 BLAKE2B 9054dfbbf243170d42d27579d56caabbc714951f28bd3e93e4eb4f1060649f87f81ce19b6aa0925f70e436aa415e1a4be88e5eead03f146ec360d9737554590b SHA512 db50381d81f7b02a0b4f42eba505874aff0ce8bb30fc72377a8ad99b2b97dfab53382603fe96014780c9862a25436918a27389e538d21a634af6a26845fc30fd
-EBUILD icedtea-bin-3.10.0-r2.ebuild 4394 BLAKE2B ffc1c96d61a6eb5afe2ad5677f493f0eeb4e84467a9426bc6b58a6f5440d14fa07df05edbeb828e36010dc58b6d57041cc9e03f1977a700e8ce2a869f159cda2 SHA512 8ff85806b905a1d2e8817d37ceefd1758b40d0a8a7824721fadb833bcd71e0aee6180287940fe0b77eb704086dfec6941479db6a8a581c85a7dfb08bc39bf7cf
-EBUILD icedtea-bin-3.12.0-r1.ebuild 4598 BLAKE2B 904e947b853b1b39810aedad41eeee5cf26b717f5ea8d9e11b4f7328337eef06801b0e96073f536b0c8f9f65adc5cb578882822e2d7306c5f7c088fa2fe1afc6 SHA512 654f93ea80ddf04b00a037ba04febb8cab14dcb23cd7b272a8180caf70b485205f946b2be9e92d93432c60b5f67a3109b8b05698824c61b69039210c37052b85
-EBUILD icedtea-bin-3.13.0.ebuild 4551 BLAKE2B 94ccb06084862f412b55d5c9334b64ffc228563037f6cc438262b16a4a0326055357adcd80e96c12aa16791784123f956376599d881a1ddf1db04c1ce6746aec SHA512 53c09e8879e0a36210c95871cf800b573c0d8f62a15fc4d3dfc3790b4b16ee3053ca9aa46cf32c3ac69f914af96392387a1185f8d62a807b6bae28de45f92bd4
+EBUILD icedtea-bin-3.13.0.ebuild 4550 BLAKE2B decfba72fcbd56b00e0d50770bc9f0bbc7ec3a847f81b098e455a1b90756a63cf30aa2468154acbfe12b7cd61e450190dbd02507a88b3987e0e421575b589ca6 SHA512 a735528cbb73a4bc4178bf879483783640af0dc4a8fc400c86e38144f93957b678d2cc96d194a9c30a7d10030b7ed79028a4b82485843f0e768f2bb126cd3418
 MISC metadata.xml 560 BLAKE2B f377bffd73661fbf1573f3d80906a38fa9fd170a686dee6c13ee7769ffadd8ff2de696d63cd7fdc4332ca654851da027b76e22389a98412b52b4fd5c00935429 SHA512 71613013231a9bf6daabb672557c3f419bd9443999b740a4d73fe242b827a278a66671f2cb347d20833008c332262609f7df03691e313e0dc0ec3e2a56e79565
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.10.0-r2.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.10.0-r2.ebuild
deleted file mode 100644
index 84c1107124c6..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-3.10.0-r2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Don't block arm. See bug #600134.
-#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
-
-inherit java-vm-2 multilib-build toolchain-funcs
-
-abi_uri() {
-	echo "${2-$1}? (
-			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
-			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
-		)"
-}
-
-BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"
-SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
-	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
-	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-r1-x86.tar.xz ) ) )
-	big-endian? ( $(abi_uri ppc64) )
-	!big-endian? ( $(abi_uri ppc64le ppc64) )
-	$(abi_uri amd64)
-	$(abi_uri arm)
-	$(abi_uri arm64)
-	$(abi_uri x86 x86 1)"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="8"
-
-IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
-REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-RDEPEND=">=dev-libs/glib-2.42:2%
-	>=media-libs/fontconfig-2.11:1.0%
-	>=media-libs/freetype-2.5.5:2%
-	>=media-libs/lcms-2.9:2%
-	>=sys-libs/zlib-1.2.8-r1%
-	virtual/jpeg-compat:62%
-	alsa? ( >=media-libs/alsa-lib-1.0% )
-	cups? ( >=net-print/cups-2.0% )
-	gtk? (
-		>=dev-libs/atk-2.16.0%
-		>=x11-libs/cairo-1.14.2%
-		x11-libs/gdk-pixbuf:2%
-		>=x11-libs/gtk+-2.24:2%
-		>=x11-libs/pango-1.36%
-	)
-	!headless-awt? (
-		media-libs/giflib:0/7%
-		=media-libs/libpng-1.6*%
-		>=x11-libs/libX11-1.6%
-		>=x11-libs/libXcomposite-0.4%
-		>=x11-libs/libXext-1.3%
-		>=x11-libs/libXi-1.7%
-		>=x11-libs/libXrender-0.9.8%
-		>=x11-libs/libXtst-1.2%
-	)"
-
-RDEPEND=">=sys-devel/gcc-6.4.0[multilib?]
-	>=sys-libs/glibc-2.26[multilib?]
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-java )
-	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
-	!multilib? ( ${RDEPEND//%/} )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# I wouldn't normally use -f below but symlinks in the arm files
-	# make this fail otherwise and any other approach would be tedious.
-
-	if ! use alsa; then
-		rm -fv */jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if use headless-awt; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
-		   */{,jre/}bin/policytool */bin/appletviewer || die
-	fi
-}
-
-multilib_src_install() {
-	local dest="/opt/${P}-${ABI}"
-	dest="${dest/%-${DEFAULT_ABI}/}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	if multilib_is_native_abi; then
-		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-		use doc && dodoc -r ${P}/doc/html
-
-		# doins doesn't preserve executable bits.
-		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
-
-		if use examples; then
-			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
-		fi
-
-		if use source; then
-			cp ${P}/src.zip "${ddest}" || die
-		fi
-
-		# Use default VMHANDLE.
-		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	else
-		local x native=$(get_system_arch ${DEFAULT_ABI})
-
-		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
-			dodir "${dest}"${x%/*}
-			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
-		done
-
-		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
-			[[ ${x##*/} = ${native} ]] && continue
-			[[ -e "${ddest}"/${x#*/} ]] && continue
-			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
-		done
-
-		# Use ABI-suffixed VMHANDLE.
-		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	fi
-
-	# Both icedtea itself and the icedtea ebuild set PAX markings but we
-	# disable them for the icedtea-bin build because the line below will
-	# respect end-user settings when icedtea-bin is actually installed.
-	java-vm_set-pax-markings "${ddest}"
-
-	# Each invocation appends to the config.
-	java-vm_revdep-mask "${EPREFIX}${dest}"
-}
-
-src_install() {
-	if use multilib; then
-		multilib_foreach_abi multilib_src_install
-	else
-		multilib_src_install
-	fi
-
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
deleted file mode 100644
index b29aacfaf99d..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-3.12.0-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Don't block arm. See bug #600134.
-#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
-
-inherit java-vm-2 multilib-build toolchain-funcs
-
-abi_uri() {
-	echo "${2-$1}? (
-			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
-			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
-		)"
-}
-
-BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"
-SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
-	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
-	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
-	big-endian? ( $(abi_uri ppc64) )
-	!big-endian? ( $(abi_uri ppc64le ppc64) )
-	$(abi_uri amd64)
-	$(abi_uri arm)
-	$(abi_uri arm64)
-	$(abi_uri x86)"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="8"
-
-IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
-REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-RDEPEND=">=dev-libs/glib-2.58:2%
-	>=media-libs/fontconfig-2.13:1.0%
-	>=media-libs/freetype-2.9.1:2%
-	>=media-libs/lcms-2.9:2%
-	>=sys-libs/zlib-1.2.11-r1%
-	virtual/jpeg-compat:62%
-	alsa? ( >=media-libs/alsa-lib-1.0% )
-	cups? ( >=net-print/cups-2.0% )
-	gtk? (
-		>=dev-libs/atk-2.28.1%
-		>=x11-libs/cairo-1.16.0%
-		x11-libs/gdk-pixbuf:2%
-		>=x11-libs/gtk+-2.24:2%
-		>=x11-libs/pango-1.42%
-	)
-	!headless-awt? (
-		media-libs/giflib:0/7%
-		=media-libs/libpng-1.6*%
-		>=x11-libs/libX11-1.6%
-		>=x11-libs/libXcomposite-0.4%
-		>=x11-libs/libXext-1.3%
-		>=x11-libs/libXi-1.7%
-		>=x11-libs/libXrender-0.9.10%
-		>=x11-libs/libXtst-1.2%
-	)"
-
-RDEPEND=">=sys-devel/gcc-8.2.0[multilib?]
-	>=sys-libs/glibc-2.28[multilib?]
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-java )
-	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
-	!multilib? ( ${RDEPEND//%/} )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# I wouldn't normally use -f below but symlinks in the arm files
-	# make this fail otherwise and any other approach would be tedious.
-
-	if ! use alsa; then
-		rm -fv */jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if use headless-awt; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
-		   */{,jre/}bin/policytool */bin/appletviewer || die
-	fi
-}
-
-multilib_src_install() {
-	local dest="/opt/${P}-${ABI}"
-	dest="${dest/%-${DEFAULT_ABI}/}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	if multilib_is_native_abi; then
-		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-		use doc && dodoc -r ${P}/doc/html
-
-		# doins doesn't preserve executable bits.
-		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
-
-		if use examples; then
-			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
-		fi
-
-		if use source; then
-			cp ${P}/src.zip "${ddest}" || die
-		fi
-
-		# use system-wide cacert store
-		mv "${ddest}"/jre/lib/security/cacerts \
-			"${ddest}"/jre/lib/security/cacerts.orig || die
-		dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-		# Use default VMHANDLE.
-		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	else
-		local x native=$(get_system_arch ${DEFAULT_ABI})
-
-		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
-			dodir "${dest}"${x%/*}
-			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
-		done
-
-		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
-			[[ ${x##*/} = ${native} ]] && continue
-			[[ -e "${ddest}"/${x#*/} ]] && continue
-			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
-		done
-
-		# Use ABI-suffixed VMHANDLE.
-		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	fi
-
-	# Both icedtea itself and the icedtea ebuild set PAX markings but we
-	# disable them for the icedtea-bin build because the line below will
-	# respect end-user settings when icedtea-bin is actually installed.
-	java-vm_set-pax-markings "${ddest}"
-
-	# Each invocation appends to the config.
-	java-vm_revdep-mask "${EPREFIX}${dest}"
-}
-
-src_install() {
-	if use multilib; then
-		multilib_foreach_abi multilib_src_install
-	else
-		multilib_src_install
-	fi
-
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.13.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.13.0.ebuild
index 9841c85aaee1..7937e80dfd77 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.13.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.13.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/icedtea/Manifest b/dev-java/icedtea/Manifest
index 8b471368d64f..3529d96d8603 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,38 +1,4 @@
-AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
 AUX icedtea.env.sh 954 BLAKE2B 4cb0d8baef5f9a6527b8d15e7258805bb859cd79aec1ee0dbbb2aa369d0ecc83cb11a482d6bf5a17a6692da1bdf40ec1544ecdf31d46bcded7a3832d0553ee1a SHA512 80161624e52e705cab16edf04e304906dc0a37b86442e63a9ff8fdda321c4888ab12e8b66dc2f4487fe9bd86bb9f33d597b489d2d486894a36e91ed7563ef23a
-DIST icedtea-3.10-aarch32-f38b47a322eb.tar.xz 6785636 BLAKE2B 87090d8a35136f4072e5a778cdfb99369e1d99ff03f20d39ff595f9b66d1d82fcb8090b9163ab6a9dd3dfd25e46abd3be016db2c4e4da75b58c4168ed78ea952 SHA512 4de97c7729dd74b110c46b302a6be1304aa8c19aa928a85a997c6f6b6a96291c135c1d19d9a2be5753a7551f33ea9547b817a26ab86957546e3ba25a8512b0a2
-DIST icedtea-3.10-corba-8249f00d6619.tar.xz 945136 BLAKE2B 103935b87d61885459ccd26cded80ece61f7f7a7b811dbdc808f7d5eb522dbc6af7d99df3de56c671b92551307605afa302e4f56ebeda330c9027e2efd51e2c1 SHA512 8593710e672c841b76b4e36b917671545e7204039d0ccb88ab71da41b4690766af48f6bd0b6b4530e58ddb9ab716f9ac448c4d934471c9a9757a32f35340a0fe
-DIST icedtea-3.10-hotspot-4e4ead43a282.tar.xz 6880664 BLAKE2B 9b54a8f8697732a3f00fa821d6967cea2b7b85a0d092f966acf55ea5c4633df182713aae892d2d084430dbe8d7ff6ad36e06a2d1637006d9e5e879666222f3d7 SHA512 265f519a8deb9c94a4e614c0ab0e1e707dc6982bb9e83f19101d8a8ec68f0c27f25edf1f9d5940ed5fe8c3eaa563297a9b4fb6d09a7488dc9c82f21179790f09
-DIST icedtea-3.10-jaxp-a1b060ef4f06.tar.xz 2290528 BLAKE2B cf1c67952b95884cfa8625f9df969840f979663a9a1bfb462dabb92fbcec54da13b19818974c83909ff187ace06acece9fb82a33f274d10b7cd2022a66f5daf5 SHA512 47d6691e4cc572e21738452137784bfcc6734b5ac80792e6556d6734596802d7ca0ab7efec1535e0234e32ed20b36647b61ab2b13b7b3356f5c9c4393d7ca73c
-DIST icedtea-3.10-jaxws-c0f01861a7fd.tar.xz 2273848 BLAKE2B 200bca72022bea2937412afe8e9c917cb02c280b03b1f0e2c9d17490feb9d74c58aaf3ea804e23ccea7ca673ab1f221a6b75bef7608bef0503d14bae1148772a SHA512 33f2c248d6f92b68905a5e0f3f308420cc6f980cd0bea52ff534a9af624f6119b00bf5c92f76b2734fd2793fb54ef1759ce66a5f9347b7bbc34e32be381a7f27
-DIST icedtea-3.10-jdk-6e67500d0ed8.tar.xz 39217432 BLAKE2B df8fb2b3e6b245ad511ff221d34a2a436c471e6401cfab1cd680d8a0d05ca3bb9093557e251179d78909869e6f97e10ce9e0319792775fb72d946587a14016df SHA512 4c0c68edaa27bf73d4edf69ca44a5c40228b132538c37ae05c522b360c1d7b8899e28ec43873f4b51fe731ff344b78861cec3d6e9eb16565eaa1f224b11e93b2
-DIST icedtea-3.10-langtools-7036a6fa432e.tar.xz 2072856 BLAKE2B dc6e68a90b1687b8d3d81afa8cf7a3592ed4551b5d04c9783f8fe57a317a8153793d8a9403a3a631d2b81d74fa69e96d57259c9109963599705d7300675f1f38 SHA512 8b5d1f221bc920e4fab755732e5db2e4dda944208536cd3703692acf7560e882dbf47195a1ecab7606f2d61a77a2e63a8fdfbc74a2622f11f622d49b2bfa49b2
-DIST icedtea-3.10-nashorn-6cf21321f367.tar.xz 2320504 BLAKE2B d0427d201c1217f5fa1e4edc7dd50325c1101fc501345a4ce617ee329df95c932aa8daed6ee4fb0dc6dba05094c18dbac829576fb393e364e8a3a2a55a6bcde8 SHA512 7bbd0de8738affb24f8fd59bb22db856f3dc247bd3aaa58eba455f3af442c9bd1d0ad563114931104329eac47a30764dde8cc699b09c3729fb26dfd585a25079
-DIST icedtea-3.10-openjdk-90de74e82bfb.tar.xz 338992 BLAKE2B 71f232161b48899b1b19f41d881302b2a939ccc466c5c460f4f24baa8f1d13068bb3d0133e12a361b5fb919ab237748b593b5365fccf2400f0ddbe5ae05645a8 SHA512 dcd7a9a73ee9fb13317fbf0778e002309194ab035289c4095b3d4940f76dbd21b7b7c7eda414b9208dc6a9eadc078eddbe51900b86b6b1eb66de3b9e15ec0868
-DIST icedtea-3.10-shenandoah-bc4deb768b1d.tar.xz 7022672 BLAKE2B 590171a545cdfe5c5724a836e0b011e99d5e679262719159173ba4a1e8830c70027affad2eda952911a2a67528c7c5247ebc339b29e80bbcb87e6c429349f16f SHA512 6c84c743da34e555da93d0b01ff03a3f570b32f8821331b68ebfb9427b247870456f907fc870b50c2e866bc5b6da065cd751ddbf6c43434a030a716f350b703f
-DIST icedtea-3.10.0.tar.xz 1538932 BLAKE2B c92131179a583829d35c0852b7cd46d1fc1a7ba975c0acfc677d51eeb3dbdbde3319af12d0e7b39d4b4d730a9ed11b2499206e02448388132a8b9d56465dc8bd SHA512 af244a8bdb083e6273de14a04c0f2c21513a9cbe3fd2437c1503f3df88ef7ec77449387e24e4d8cb0fe7dbe0b8b023ea6a3041f145a00560999781027322c697
-DIST icedtea-3.11-aarch32-5caf41da4f93.tar.xz 6792096 BLAKE2B 41ef1911520456cbb7e1dc62172ac87f48819b3a9926eea3b61e7c9da3699d6aec445bad879c5588bf84a0a07300ab6c90fa1f18609d0389681df2d0bf5b7342 SHA512 dc59c9a3dd39863b6c64b525902aaab575055b39fe8266e4b59f0cac461b5760418df217fce264962900d7547b16faf7cb01ba6f0486e1af25693a0b433ee310
-DIST icedtea-3.11-corba-cfc35c4598d9.tar.xz 946136 BLAKE2B 184677a88618d09fdfe629b2e6830b3d2530d2b643596c7e1ab397a7efdce9b74b21707e83482c5539c8fda14873f9c5b248c55229efce14b1602f829075f463 SHA512 9b8a44dda0bbfba8dc0d659e0fabf22e84b9931518e4b199a238faa103cbc4ed814c97f0f38f0aed263846b46fc7eab4500ba9759503373083e12cb8b5b364b5
-DIST icedtea-3.11-hotspot-a24b4e46303e.tar.xz 6887280 BLAKE2B fa404d71dd36d4ce297108fd7a9ddc054888f383d239daf018f4a5f8414fc71f1f6c21903a36db70f5ac02c020cde2daf7121ecb40b3f2306dd824c692aea868 SHA512 13fa35f4a4fe01b3da4efb8476c0cb3482a36596eb422f2ad958a4c51efc286962ac3123a75853e84c4db477ac064a0fd3ee5e03f1ea0ec4f7e2c8ac07aa2d0e
-DIST icedtea-3.11-jaxp-1c01fbb460ba.tar.xz 2291488 BLAKE2B 228bdc110a33b904e4d2052eaad5125cf1cfa6b8560890cd25a6f3a269b1d7a66debcdf6dcb3f83dfeb2c044a96b81d355a1721f94ba71d5eb962a5e37453dd7 SHA512 9eba0f6ada2ae8adc1791a91ceb4fba9bd06aee0626cd1b4310ff16c7c8006045fed5fb7f109e490395b70695be4e6bfd6f1f5cbcdb095fb17abf123012a03de
-DIST icedtea-3.11-jaxws-cf4d2b27895c.tar.xz 2274588 BLAKE2B 5aa62c387545e6679c2e7806262bf250e4b424aa240470c3ae7d2a4950be190adf34fb6c16751d0062ffa606c5a04bde64b8dcc2aff1a46043442e340c0d8763 SHA512 ce5f0c2aced1af59f002dc9dc6cba4b9332167e9e019a3040267901ef7f325e05b8c99ed1f276b88ddb4e43cdd1b0c456e0c4dc2222ae6b3800c0502ffa840de
-DIST icedtea-3.11-jdk-34ade0cd2dd5.tar.xz 39248532 BLAKE2B b47eba283afddb0cc22e8ba1904587542535620311e5f4e3c7770bad61a9f149b413ed30c62e43a6d4b395f6e1fa3ca647890097c5c5af4eff60dc63b7bd712f SHA512 411508ed91f14ae1c51ea54de72a943db222ff572f3991631fe1a1fa97f9bb42da1e01ca98893f7236b4b44bae2917fc3f8622d7f94a085be30d437451acd272
-DIST icedtea-3.11-langtools-78414f4f0172.tar.xz 2073920 BLAKE2B 299f8bb215710b692f9cb359951a19acb27d93e7ca048a7e83f1ed2d9bf7101fc48e5512056f70b3e780246410359739a6a23ee691c8ba7777e49630a692022e SHA512 363c376848870c6c28415967561c4b151f1256c38a315fabc69c90425f5255224182045349a00c9433db52c416b7ebffedaa4825c980460541a3f9338adbaa5e
-DIST icedtea-3.11-nashorn-3cb2fe2b1b7d.tar.xz 2317604 BLAKE2B 246d8f69c080b8b8bee1ecfd65d5f157ba8ad4b49474e324a8afe1953e2e3d7161c8456c974aa645357a40c2d1a532a04ea8052634fcde187db7aa58ae606dc6 SHA512 2b46a8599d530a351522420cae8ac780cd2e64a6d7adbff87397a178f12f0a992bccd0f56435582dbd10be2157d4a4540c41b3dca488566162eed680102e58a9
-DIST icedtea-3.11-openjdk-9edccdd36f81.tar.xz 358224 BLAKE2B fe9e2351829f03f4dc5b77b7df12d88e06c617a94e118a9c09dda2feffd6f6dcb419882b57ec7c76e32bc0ff47e797618ddc50d4f460d68d0d73343b2d52f7f7 SHA512 fc3faa7d7b9531f10c40241d89c36854043921f6f1a0851f284bcab36fc54fb0bb8cf8365dd4b2fb22b3ee8ddb8ed4a79e0807f79cb95b4b00f164993f1acc0b
-DIST icedtea-3.11-shenandoah-1e8639cc8075.tar.xz 7028904 BLAKE2B 73a2f02bc95037d62464c3699b34462db73cd5905e88c86124f5bbf016dbfce0b09b8f09b05d835d52c042d9d46097cf0f2ef2c5b165b4c5a45a75392eafb382 SHA512 c35fb93164110d92bba525911bd72760bd74590885884a636e6574da0a22515fa07b4e22d84f020128221c7bd1ec5bc8ddaa9061840a06d98a30ce817ee6b9ff
-DIST icedtea-3.11.0.tar.xz 1552144 BLAKE2B c7ed5a47b71ee5dbd36f05ee775c25041b1bd5286e413e23a2c58a5b10ef9442c465b01cc3b7e29f6f7e085358ab10553b76fb4f134f36784cbaec4a0eedd60a SHA512 a71c9318d49077f8ae27f5c3e0b61df0709eded241f557c886f6b93aa98c13ad78f713d1286da286989bf62866dfff7538ad783eb804a705a160cbc096dea851
-DIST icedtea-3.12-aarch32-57f4048a925b.tar.xz 6819888 BLAKE2B 96377f8aeeaf9a1bb4b3372f82c1666e5813a97537dabe3fd8faeeac8ed2b160c402bb35d0e0b2f6f9bc2b09faa1701a43cdea407982019ca126ff7e28076625 SHA512 5e6f4cbb5b325feefd5030d1b8f9725ba8aba028c9c93c34039fcff48893b9569d0cc92f5e0c70bc20ab7014edc81d3ff12edaab68c69a280cdab248e4e0e809
-DIST icedtea-3.12-corba-fa1553d2f23e.tar.xz 946504 BLAKE2B 729efade4ed039af95fa07fd3f6ed450fb9af8e271b054979fd37b460ab6a6273513e05e49956e15777f188952a939313d8b5f6bd52f0aa111825518693f5bd8 SHA512 d4ffe454a659db6c13b74c8e190beb3b427574d54fa44c80a3ba1dceb3af6f480ee99378d370ec2e9bfc6b5447a225eeb3e11821c83522479583fb21b0705bd7
-DIST icedtea-3.12-hotspot-3f9a60eb8ef0.tar.xz 6894876 BLAKE2B 0520d0e1a84e3b755b598d73de7587c01f4cba8148d371bcbcceb1d50849d3816929cfb07a81857ad0fc8d8b52ab3a9c68a4fc8dd3476bc52f59d2cac72eba81 SHA512 2a0c18fea7b67c5042b39746f2c7ef53e252d6665efbcd74ebf9b171b13e311821310537e8b14cd4f9798c483afdb1107b9af6bb047262b97a526bfbb481777a
-DIST icedtea-3.12-jaxp-7a977b82f34c.tar.xz 2291724 BLAKE2B f3366efa7bb076b9f8c8a0873c1bb909ad9299916c1285b3aebc004a4f33b16a6ab922867c19b7679c8a0bfb7686cbe5b80605ec942b1ac817a96277fe9c4f02 SHA512 a5b8ca9b90797c5f0bc03b763fca50334a308bfd6955f5f488b661da6698abd991dbe08a7ac1a128922c546eb0061853e12a18971adb16c27302e2d9d0f13872
-DIST icedtea-3.12-jaxws-752d9e54c69a.tar.xz 2274996 BLAKE2B 980f1bb71201fa43eb4c1852b0f518e512af908abf106e211add608560bfe531a5b0597cb11edabbdec63b94fe17800b7dbedd181a18e54a992b5dcb54a0b172 SHA512 f1deb09ccf6b1dff40d61f3bc54e55d430ebcbeb0cd53d6008cacf65b94824d486913b63034ee23a473298e0bee61ad1ea3e5520c2a3ab25e9e1e6d58d50d286
-DIST icedtea-3.12-jdk-bfaa5c6df4a8.tar.xz 39292332 BLAKE2B 0cebbd46b62b9c5ce7af0c6bb54157b8c44b97a99c060e90e3b23ff68210755be58265cd0ecdb5c2bed276d2465544a7f8435e58289b8e240b6ddf2a9b14123c SHA512 2e15cdb58c9ce65c99ad5b5506343fb29cda02a4ea8490cfbe79f708deecee2ef28ad0e5a384d2113e72678aa857d821729b588e5ef53208ae06d0d5278ec326
-DIST icedtea-3.12-langtools-fb494039358f.tar.xz 2074376 BLAKE2B dfca5f107f93196d232bdb077e910eee3de3033ecffae9d168c60de5a54cfb0591eeb9309356f385fdc2f9c2a813700401e763496651befae84acd4c1d23e2fe SHA512 838e3e458734d3fc8d2d968eb3bc7190838cd9a73bf3d61de662f9a992a9951a74021e25331d26545f0181b08c80f298de24e030dad4e076bd76368f3a14e960
-DIST icedtea-3.12-nashorn-93462e8b4f4f.tar.xz 2320548 BLAKE2B f97e168cfce1e6307926d8996a74072be9783c4045963e78a9d3f6e2890e9cb64201a5d697a29ddcddbe501fe7a3fb226601e0e2e2ef3450d965334561d5e47d SHA512 918489daf6d2816d0fac85ed89cccbb0e350dc068502857f1a7e518135c40e5fcca2709a60ae51bad392592bdc459675ea3543e684ba1ed0d8debc7a451af6d5
-DIST icedtea-3.12-openjdk-f0482b9b7f7b.tar.xz 360788 BLAKE2B 5f6727b709ffedd44e0224635b75cd15e8b85d14bae93fafb8337bdd1c5ee0b18cca8374b88d00110016d2ad94f539d8884da92cab245e3c83fdac4a389a5154 SHA512 999aa17c0e73ebc465a982c5492043487b860b84dd6e4dda3fa51e3099b4642f3f5e03eb30252f835be81f1ea60dc28cf5f0905cbe347758a1f903db430fcc35
-DIST icedtea-3.12-shenandoah-adb62c0031b8.tar.xz 7056328 BLAKE2B 90035e1b3f16ca7351197dcb7795c557700aaf264179827ae3e6b331ce60e3a9922d5e815ee0c010c6ded16973446841b9d72e918420408894bb5c7c8497c4d8 SHA512 c73bf2d1011ae4d059945e2e20c2515a3cd6e10e4413b77b290461679bbceaedd38a1b948ee7bfb8a42513b73ec99b81a9088cd96e6e61576041568ea2a0b492
-DIST icedtea-3.12.0.tar.xz 1519364 BLAKE2B 0e257aabc10bd93cf448feec99fd72175d33b7a32134d824c36ca5143e40fbdd37b5c6e5f572052d347fccd6dc89f3d99ba7eec3db6e7d73c6b6d9ec0d5695b4 SHA512 22582d65b9114749c7cfee0fc58fa2cb70e4cf77f3bc62e8097a6c601ead0bf86f530b942e6b0f32ef7bbc5bd17130da236714d83d6e9857c3c5b85c984f2efa
 DIST icedtea-3.13-aarch32-26d64a5c4b9a.tar.xz 6832524 BLAKE2B 68399b723d1f6a0fc3c940ccbbae48a47767b3870ce0eecc2eb51ef6f36f25e4d742db3eb4b204815c571d1104301a492c60ed3c608a1fc3e36271a2618d5d27 SHA512 84e8217020d8ddd62745298b2d1591e5a6d9a9ff117930524170179dee4d4c35c35007603d5bf9601b7be404ba887b69953272f687d1a9858429e1fe26c9f049
 DIST icedtea-3.13-corba-24a4cc7d7de6.tar.xz 946268 BLAKE2B d1bef8c7029c5017e0a43d6711c92643527930bb037511e84625055f38faef6fb701652458e64b062f3cdbd3e6ec35e5099411e07af3933589dc9c6a3f065ccf SHA512 834b8b09590f5b4f11bbc32af3222e1cb6bef14c44c34ae4d3f65b6320d1a78c297a341cadb76bb59156b434811510b83705d2d2994922c610ba1bafb3f59345
 DIST icedtea-3.13-hotspot-ab8fadcbbde6.tar.xz 6908200 BLAKE2B 922a86a66d670ae920c2e5a1b81da7ffbf2bb20323bc6ac1bb8d5e034528d9e767ee2ef9855dfba467c8a6a81939739f76dec28ced50531d62d1dfeae2762d16 SHA512 60c144997b2566dc42698ca4cb888b92de6a9fdbb18e01703d00f54311ad56191862c61c89e3eff4d6c4793c98d3dafd5f723bc9a22db2329138d08e832ddc11
@@ -46,8 +12,5 @@ DIST icedtea-3.13-shenandoah-ff69edbcd7ae.tar.xz 7071080 BLAKE2B 4af91356631762c
 DIST icedtea-3.13.0.tar.xz 1526900 BLAKE2B 6fbfd5cfbd2ba712ab2c03465ae3df68f87613857e763ca7b0283876a6d86330f07c94e85868f313dda9de3f6c82dc41e11ce9d7fada22300ef2b018295a6577 SHA512 312bcc6660360eb73b96801fdac0475d6b192bc3fcb80e250225cbb4dfe39ce178e0fa5154c509e7f5605113b34077a6f9c252a52024e568bab7ed6a74140f7c
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.10.0.ebuild 12819 BLAKE2B 760968745fa9ee52eb0a701266a0706f57560a3fa16f2a03dd85fdb6f1fe85c9285245f83958ba6dacfbcbcdd01b5fd4500aca93572bdf561b1db9c741acf37c SHA512 73a1a50541898495cd9af6fe5205c94779eed69a54a52a2141b533b6a01aafd08a5ed4603bdfb1d1d2dffc3d4778800928e62567b6614b8ab6a06ce28c63e5d2
-EBUILD icedtea-3.11.0.ebuild 12631 BLAKE2B 1568d3d47b2b53c3247a260bd35cd27d56038c965291ad93eac7ebb8896ddf1160f6f9ae0fc4f3c2c3844123fe5f2c11bccdd835625212100647e1ce17e8a153 SHA512 27850e65cb95734a04fe59070ea5e7366fbe5b8cb0b5d38f29d326f5bc7f897f041c4949e9d2c6516d5c397ba3c7261009a7fececbeb87ba734ade0c06f2c1be
-EBUILD icedtea-3.12.0.ebuild 12703 BLAKE2B e68b86f187b7e3f0359689baf5bea1f521ca2707c0de12b422485bfd1e87606cde37960851e262ab43e993153847ff0f4c1be5b44a9c19fd980fe4a19d41d29d SHA512 42db9f45424aa96f8e7f5c03954bea3d239ffd3c859f88910e7cdcd1a34e2c202b311f061d6ff87449089edd8286faef8fa40eb349be9a998e3545cafaf99c8a
 EBUILD icedtea-3.13.0.ebuild 12161 BLAKE2B a65d7ab38e5906ed4fd1d515bea2118ae53125fffc87066aae6e60ecebb97b2733a7b4a4128ee0dabb2f0af78217b0d5d6a99d4773e2889880f1d9b3c29d8010 SHA512 d46974f3b76fec991bfa31873525d607698c3e1bfd2d36140c56d430cb1eae65049e0c4b1c67e8d51cbf419745b6d348e61941b5e33bdfde5c52e6d23116b7f5
-MISC metadata.xml 2330 BLAKE2B 79df3d9d5ea26e632be7a497833e2ce0db5ded49770ab45d2235fe6a66b9daf56e0f476dced9aa9dc61288f88a1860a8c3f1e0f549101f5c7ce19dcf0c1044ff SHA512 fb47b5ae495ad4fc070877eca0bd2428e3cbc25cf35c39ec0116ff7f2243e9b6dba6e31fab50d2d6c5de010026645f92217337f64359f884a2badb89aa2b3664
+MISC metadata.xml 2258 BLAKE2B 589f588b726745c7c488da1a900a97586cd7283534e675fe478149c3ea178e7c4fe6149b0430ca6db3546f74a632ec6da7ddb12f6efecc0e0aebbe8fd63790ae SHA512 22d6948a51e8b56d98aa60158903eda355fca255f5ea1d8b0cfb7767c346d91ed38d51fe0a06938e95efee3d544708d880f8a41fec9cb789a6af9eb1126a95d7
diff --git a/dev-java/icedtea/files/generate-cacerts.pl b/dev-java/icedtea/files/generate-cacerts.pl
deleted file mode 100644
index 17d29b36676d..000000000000
--- a/dev-java/icedtea/files/generate-cacerts.pl
+++ /dev/null
@@ -1,358 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2007, 2008 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# generate-cacerts.pl generates a JKS keystore named 'cacerts' from
-# OpenSSL's certificate bundle using OpenJDK's keytool.
-
-# First extract each of OpenSSL's bundled certificates into its own
-# aliased filename.
-
-# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2
-# Check and prevention of duplicate aliases added by Vlastimil Babka <caster@gentoo.org>
-
-$file = $ARGV[1];
-open(CERTS, $file);
-@certs = <CERTS>;
-close(CERTS);
-
-$pem_file_count = 0;
-$in_cert_block = 0;
-$write_current_cert = 1;
-foreach $cert (@certs)
-{
-    if ($cert =~ /Issuer: /)
-    {
-        $_ = $cert;
-        if ($cert =~ /personal-freemail/)
-        {
-            $cert_alias = "thawtepersonalfreemailca";
-        }
-        elsif ($cert =~ /personal-basic/)
-        {
-            $cert_alias = "thawtepersonalbasicca";
-        }
-        elsif ($cert =~ /personal-premium/)
-        {
-            $cert_alias = "thawtepersonalpremiumca";
-        }
-        elsif ($cert =~ /server-certs/)
-        {
-            $cert_alias = "thawteserverca";
-        }
-        elsif ($cert =~ /premium-server/)
-        {
-            $cert_alias = "thawtepremiumserverca";
-        }
-        elsif ($cert =~ /Class 1 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass1ca";
-        }
-        elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/)
-        {
-            $cert_alias = "verisignclass1g2ca";
-        }
-        elsif ($cert =~
-               /VeriSign Class 1 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass1g3ca";
-        }
-        elsif ($cert =~ /Class 2 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass2ca";
-        }
-        elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/)
-        {
-            $cert_alias = "verisignclass2g2ca";
-        }
-        elsif ($cert =~
-               /VeriSign Class 2 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass2g3ca";
-        }
-        elsif ($cert =~ /Class 3 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass3ca";
-        }
-        # Version 1 of Class 3 Public Primary Certification Authority
-        # - G2 is added.  Version 3 is excluded.  See below.
-        elsif ($cert =~
-               /VeriSign Class 3 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass3g3ca";
-        }
-        elsif ($cert =~
-               /RSA Data Security.*Secure Server Certification Authority/)
-        {
-            $cert_alias = "verisignserverca";
-        }
-        elsif ($cert =~ /GTE CyberTrust Global Root/)
-        {
-            $cert_alias = "gtecybertrustglobalca";
-        }
-        elsif ($cert =~ /Baltimore CyberTrust Root/)
-        {
-            $cert_alias = "baltimorecybertrustca";
-        }
-        elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/)
-        {
-            $cert_alias = "entrustclientca";
-        }
-        elsif ($cert =~ /www.entrust.net\/GCCA_CPS/)
-        {
-            $cert_alias = "entrustglobalclientca";
-        }
-        elsif ($cert =~ /www.entrust.net\/CPS_2048/)
-        {
-            $cert_alias = "entrust2048ca";
-        }
-        elsif ($cert =~ /www.entrust.net\/CPS /)
-        {
-            $cert_alias = "entrustsslca";
-        }
-        elsif ($cert =~ /www.entrust.net\/SSL_CPS/)
-        {
-            $cert_alias = "entrustgsslca";
-        }
-        elsif ($cert =~ /The Go Daddy Group/)
-        {
-            $cert_alias = "godaddyclass2ca";
-        }
-        elsif ($cert =~ /Starfield Class 2 Certification Authority/)
-        {
-            $cert_alias = "starfieldclass2ca";
-        }
-        elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/)
-        {
-            $cert_alias = "valicertclass2ca";
-        }
-        elsif ($cert =~ /GeoTrust Global CA$/)
-        {
-            $cert_alias = "geotrustglobalca";
-        }
-        elsif ($cert =~ /Equifax Secure Certificate Authority/)
-        {
-            $cert_alias = "equifaxsecureca";
-        }
-        elsif ($cert =~ /Equifax Secure eBusiness CA-1/)
-        {
-            $cert_alias = "equifaxsecureebusinessca1";
-        }
-        elsif ($cert =~ /Equifax Secure eBusiness CA-2/)
-        {
-            $cert_alias = "equifaxsecureebusinessca2";
-        }
-        elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/)
-        {
-            $cert_alias = "equifaxsecureglobalebusinessca1";
-        }
-        elsif ($cert =~ /Sonera Class1 CA/)
-        {
-            $cert_alias = "soneraclass1ca";
-        }
-        elsif ($cert =~ /Sonera Class2 CA/)
-        {
-            $cert_alias = "soneraclass2ca";
-        }
-        elsif ($cert =~ /AAA Certificate Services/)
-        {
-            $cert_alias = "comodoaaaca";
-        }
-        elsif ($cert =~ /AddTrust Class 1 CA Root/)
-        {
-            $cert_alias = "addtrustclass1ca";
-        }
-        elsif ($cert =~ /AddTrust External CA Root/)
-        {
-            $cert_alias = "addtrustexternalca";
-        }
-        elsif ($cert =~ /AddTrust Qualified CA Root/)
-        {
-            $cert_alias = "addtrustqualifiedca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Hardware/)
-        {
-            $cert_alias = "utnuserfirsthardwareca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/)
-        {
-            $cert_alias = "utnuserfirstclientauthemailca";
-        }
-        elsif ($cert =~ /UTN - DATACorp SGC/)
-        {
-            $cert_alias = "utndatacorpsgcca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Object/)
-        {
-            $cert_alias = "utnuserfirstobjectca";
-        }
-        elsif ($cert =~ /America Online Root Certification Authority 1/)
-        {
-            $cert_alias = "aolrootca1";
-        }
-        elsif ($cert =~ /DigiCert Assured ID Root CA/)
-        {
-            $cert_alias = "digicertassuredidrootca";
-        }
-        elsif ($cert =~ /DigiCert Global Root CA/)
-        {
-            $cert_alias = "digicertglobalrootca";
-        }
-        elsif ($cert =~ /DigiCert High Assurance EV Root CA/)
-        {
-            $cert_alias = "digicerthighassuranceevrootca";
-        }
-        elsif ($cert =~ /GlobalSign Root CA$/)
-        {
-            $cert_alias = "globalsignca";
-        }
-        elsif ($cert =~ /GlobalSign Root CA - R2/)
-        {
-            $cert_alias = "globalsignr2ca";
-        }
-        elsif ($cert =~ /Elektronik.*Kas.*2005/)
-        {
-            $cert_alias = "extra-elektronikkas2005";
-        }
-        elsif ($cert =~ /Elektronik/)
-        {
-            $cert_alias = "extra-elektronik2005";
-        }
-        # Mozilla does not provide these certificates:
-        #   baltimorecodesigningca
-        #   gtecybertrust5ca
-        #   trustcenterclass2caii
-        #   trustcenterclass4caii
-        #   trustcenteruniversalcai
-        else
-        {
-            # Generate an alias using the OU and CN attributes of the
-            # Issuer field if both are present, otherwise use only the
-            # CN attribute.  The Issuer field must have either the OU
-            # or the CN attribute.
-            $_ = $cert;
-            if ($cert =~ /OU=/)
-            {
-                s/Issuer:.*?OU=//;
-                # Remove other occurrences of OU=.
-                s/OU=.*CN=//;
-                # Remove CN= if there were not other occurrences of OU=.
-                s/CN=//;
-                s/\/emailAddress.*//;
-                s/Certificate Authority/ca/g;
-                s/Certification Authority/ca/g;
-            }
-            elsif ($cert =~ /CN=/)
-            {
-                s/Issuer:.*CN=//;
-                s/\/emailAddress.*//;
-                s/Certificate Authority/ca/g;
-                s/Certification Authority/ca/g;
-            }
-            s/\W//g;
-            tr/A-Z/a-z/;
-            $cert_alias = "extra-$_";
-
-        }
-        while (-e "$cert_alias.pem")
-        {
-            $cert_alias = "$cert_alias" . "_";
-        }
-    }
-    # When it attempts to parse:
-    #
-    # Class 3 Public Primary Certification Authority - G2, Version 3
-    #
-    # keytool says:
-    #
-    # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false
-    # Unparseable AuthorityInfoAccess extension due to
-    # java.io.IOException: Invalid encoding of URI
-    #
-    # If we do not exclude this file
-    # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails
-    # on this cert, printing:
-    #
-    # Couldn't verify: java.security.SignatureException: Signature
-    # does not match.
-    #
-    elsif ($cert =~
-           /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/)
-    {
-        $write_current_cert = 0;
-        $pem_file_count--;
-    }
-    elsif ($cert eq "-----BEGIN CERTIFICATE-----\n")
-    {
-        if ($in_cert_block != 0)
-        {
-            die "$file is malformed.";
-        }
-        $in_cert_block = 1;
-        if ($write_current_cert == 1)
-        {
-            $pem_file_count++;
-            if (-e "$cert_alias.pem")
-            {
-                print "$cert_alias";
-                die "already exists"
-            }
-            open(PEM, ">$cert_alias.pem");
-            print PEM $cert;
-        }
-    }
-    elsif ($cert eq "-----END CERTIFICATE-----\n")
-    {
-        $in_cert_block = 0;
-        if ($write_current_cert == 1)
-        {
-            print PEM $cert;
-            close(PEM);
-        }
-        $write_current_cert = 1
-    }
-    else
-    {
-        if ($in_cert_block == 1 && $write_current_cert == 1)
-        {
-            print PEM $cert;
-        }
-    }
-}
-
-# Check that the correct number of .pem files were produced.
-@pem_files = <*.pem>;
-if (@pem_files != $pem_file_count)
-{
-    print "$pem_file_count";
-    die "Number of .pem files produced does not match".
-        " number of certs read from $file.";
-}
-
-# Now store each cert in the 'cacerts' file using keytool.
-$certs_written_count = 0;
-foreach $pem_file (@pem_files)
-{
-    system "$ARGV[0] -noprompt -import".
-        " -alias `basename $pem_file .pem`".
-        " -keystore cacerts -storepass 'changeit' -file $pem_file";
-    unlink($pem_file);
-    $certs_written_count++;
-}
-
-# Check that the correct number of certs were added to the keystore.
-if ($certs_written_count != $pem_file_count)
-{
-    die "Number of certs added to keystore does not match".
-        " number of certs read from $file.";
-}
diff --git a/dev-java/icedtea/icedtea-3.10.0.ebuild b/dev-java/icedtea/icedtea-3.10.0.ebuild
deleted file mode 100644
index 9dafe7d9ab91..000000000000
--- a/dev-java/icedtea/icedtea-3.10.0.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="6"
-SLOT="8"
-
-inherit check-reqs flag-o-matic gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
-
-ICEDTEA_VER=$(get_version_component_range 1-3)
-ICEDTEA_BRANCH=$(get_version_component_range 1-2)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-
-CORBA_TARBALL="8249f00d6619.tar.xz"
-JAXP_TARBALL="a1b060ef4f06.tar.xz"
-JAXWS_TARBALL="c0f01861a7fd.tar.xz"
-JDK_TARBALL="6e67500d0ed8.tar.xz"
-LANGTOOLS_TARBALL="7036a6fa432e.tar.xz"
-OPENJDK_TARBALL="90de74e82bfb.tar.xz"
-NASHORN_TARBALL="6cf21321f367.tar.xz"
-HOTSPOT_TARBALL="4e4ead43a282.tar.xz"
-SHENANDOAH_TARBALL="bc4deb768b1d.tar.xz"
-AARCH32_TARBALL="f38b47a322eb.tar.xz"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
-AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="http://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${SRC_PKG}
-	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
-	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
-	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
-	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
-	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
-	pulseaudio sctp selinux shenandoah smartcard +source +sunec +system-lcms test +webstart zero"
-
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:0=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXcomposite"
-X_DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2"
-
-# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-COMMON_DEP="
-	>=dev-libs/glib-2.26:2=
-	>=dev-util/systemtap-1
-	media-libs/fontconfig:1.0=
-	>=media-libs/freetype-2.5.3:2=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0=
-	kerberos? ( virtual/krb5 )
-	sctp? ( net-misc/lksctp-tools )
-	smartcard? ( sys-apps/pcsc-lite )
-	sunec? ( >=dev-libs/nss-3.16.1-r1 )
-	system-lcms? ( >=media-libs/lcms-2.9:2= )"
-
-# Gtk+ will move to COMMON_DEP in time; PR1982
-# gsettings-desktop-schemas will be needed for native proxy support; PR1976
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	virtual/ttf-fonts
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2
-		>=x11-libs/pango-1.24.5
-	)
-	!headless-awt? ( ${X_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
-
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# perl is needed for running the SystemTap tests and the bootstrap javac
-# lsb-release is used to obtain distro information for the version & crash dump output
-# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
-# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
-# Ant is no longer needed under the new build system
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		dev-java/icedtea-bin:8
-		dev-java/icedtea-bin:7
-		dev-java/icedtea:8
-		dev-java/icedtea:7
-		dev-java/openjdk:8
-		dev-java/openjdk-bin:8
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	dev-lang/perl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )
-	sys-apps/attr
-	sys-apps/lsb-release
-	x11-libs/libXt
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="9000M"
-	else
-		CHECKREQS_DISK_BUILD="8500M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-8 icedtea-bin-8
-		icedtea-7 icedtea-bin-7
-		openjdk-8 openjdk-bin-8"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-src_configure() {
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use JamVM if requested
-	if use jamvm; then
-		use_jamvm="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
-		hotspot_port="yes"
-
-		# Work around stack alignment issue, bug #647954.
-		use x86 && append-flags -mincoming-stack-boundary=2
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use Zero for now until alternate VMs are working
-	if test "x${hotspot_port}" != "xyes"; then
-			use_zero="yes"
-	fi
-
-	if use shenandoah; then
-		if { use amd64 || use arm64; }; then
-			hs_config="--with-hotspot-build=shenandoah"
-			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
-		else
-			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
-		fi
-	else
-		if use arm ; then
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
-		else
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
-		fi
-	fi
-
-	# Turn on JamVM if needed (non-HS archs) or requested
-	if test "x${use_jamvm}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-jamvm"'
-		fi
-		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
-		jamvm_config="--enable-jamvm"
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
-		fi
-		zero_config="--enable-zero"
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		config+=" --enable-precompiled-headers"
-	else
-		config+=" --disable-precompiled-headers"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-ccache \
-		--disable-downloading --disable-Werror --disable-tests \
-		--disable-systemtap-tests --enable-improved-font-rendering \
-		--enable-system-jpeg --enable-system-zlib \
-		$(use_enable headless-awt headless) \
-		$(use_enable !headless-awt system-gif) \
-		$(use_enable !headless-awt system-png) \
-		$(use_enable doc docs) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable system-lcms) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable sctp system-sctp) \
-		$(use_enable smartcard system-pcsc) \
-		$(use_enable sunec) \
-		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
-}
-
-src_compile() {
-	default
-}
-
-src_test() {
-	default
-}
-
-src_install() {
-	default
-
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	if ! use alsa; then
-		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use examples; then
-		rm -r "${ddest}"/demo "${ddest}"/sample || die
-	fi
-
-	if ! use source; then
-		rm -v "${ddest}"/src.zip || die
-	fi
-
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postrm
-}
diff --git a/dev-java/icedtea/icedtea-3.11.0.ebuild b/dev-java/icedtea/icedtea-3.11.0.ebuild
deleted file mode 100644
index c9d4250432bf..000000000000
--- a/dev-java/icedtea/icedtea-3.11.0.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="6"
-SLOT="8"
-
-inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
-
-ICEDTEA_VER=$(get_version_component_range 1-3)
-ICEDTEA_BRANCH=$(get_version_component_range 1-2)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-
-CORBA_TARBALL="cfc35c4598d9.tar.xz"
-JAXP_TARBALL="1c01fbb460ba.tar.xz"
-JAXWS_TARBALL="cf4d2b27895c.tar.xz"
-JDK_TARBALL="34ade0cd2dd5.tar.xz"
-LANGTOOLS_TARBALL="78414f4f0172.tar.xz"
-OPENJDK_TARBALL="9edccdd36f81.tar.xz"
-NASHORN_TARBALL="3cb2fe2b1b7d.tar.xz"
-HOTSPOT_TARBALL="a24b4e46303e.tar.xz"
-SHENANDOAH_TARBALL="1e8639cc8075.tar.xz"
-AARCH32_TARBALL="5caf41da4f93.tar.xz"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
-AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="http://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${SRC_PKG}
-	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
-	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
-	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
-	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
-	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
-	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test +webstart zero"
-
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:0=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXcomposite"
-X_DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2"
-
-# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-COMMON_DEP="
-	>=dev-libs/glib-2.26:2=
-	>=dev-util/systemtap-1
-	media-libs/fontconfig:1.0=
-	>=media-libs/freetype-2.5.3:2=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0=
-	kerberos? ( virtual/krb5 )
-	sctp? ( net-misc/lksctp-tools )
-	smartcard? ( sys-apps/pcsc-lite )
-	system-lcms? ( >=media-libs/lcms-2.9:2= )"
-
-# Gtk+ will move to COMMON_DEP in time; PR1982
-# gsettings-desktop-schemas will be needed for native proxy support; PR1976
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	virtual/ttf-fonts
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2
-		>=x11-libs/pango-1.24.5
-	)
-	!headless-awt? ( ${X_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
-
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# perl is needed for running the SystemTap tests and the bootstrap javac
-# lsb-release is used to obtain distro information for the version & crash dump output
-# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
-# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
-# Ant is no longer needed under the new build system
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		dev-java/icedtea-bin:8
-		dev-java/icedtea-bin:7
-		dev-java/icedtea:8
-		dev-java/icedtea:7
-		dev-java/openjdk:8
-		dev-java/openjdk-bin:8
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	dev-lang/perl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )
-	sys-apps/attr
-	sys-apps/lsb-release
-	x11-libs/libXt
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="9000M"
-	else
-		CHECKREQS_DISK_BUILD="8500M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-8 icedtea-bin-8
-		icedtea-7 icedtea-bin-7
-		openjdk-8 openjdk-bin-8"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-src_configure() {
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use JamVM if requested
-	if use jamvm; then
-		use_jamvm="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
-		hotspot_port="yes"
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use Zero for now until alternate VMs are working
-	if test "x${hotspot_port}" != "xyes"; then
-			use_zero="yes"
-	fi
-
-	if use shenandoah; then
-		if { use amd64 || use arm64; }; then
-			hs_config="--with-hotspot-build=shenandoah"
-			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
-		else
-			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
-		fi
-	else
-		if use arm ; then
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
-		else
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
-		fi
-	fi
-
-	# Turn on JamVM if needed (non-HS archs) or requested
-	if test "x${use_jamvm}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-jamvm"'
-		fi
-		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
-		jamvm_config="--enable-jamvm"
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
-		fi
-		zero_config="--enable-zero"
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		config+=" --enable-precompiled-headers"
-	else
-		config+=" --disable-precompiled-headers"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-ccache \
-		--disable-downloading --disable-Werror --disable-tests \
-		--disable-systemtap-tests --enable-improved-font-rendering \
-		--enable-system-jpeg --enable-system-zlib \
-		$(use_enable headless-awt headless) \
-		$(use_enable !headless-awt system-gif) \
-		$(use_enable !headless-awt system-png) \
-		$(use_enable doc docs) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable system-lcms) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable sctp system-sctp) \
-		$(use_enable smartcard system-pcsc) \
-		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
-}
-
-src_compile() {
-	default
-}
-
-src_test() {
-	default
-}
-
-src_install() {
-	default
-
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	if ! use alsa; then
-		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use examples; then
-		rm -r "${ddest}"/demo "${ddest}"/sample || die
-	fi
-
-	if ! use source; then
-		rm -v "${ddest}"/src.zip || die
-	fi
-
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	java-vm-2_pkg_postrm
-}
diff --git a/dev-java/icedtea/icedtea-3.12.0.ebuild b/dev-java/icedtea/icedtea-3.12.0.ebuild
deleted file mode 100644
index 185c29135509..000000000000
--- a/dev-java/icedtea/icedtea-3.12.0.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="6"
-SLOT="8"
-
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator xdg-utils
-
-ICEDTEA_VER=$(get_version_component_range 1-3)
-ICEDTEA_BRANCH=$(get_version_component_range 1-2)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-
-CORBA_TARBALL="fa1553d2f23e.tar.xz"
-JAXP_TARBALL="7a977b82f34c.tar.xz"
-JAXWS_TARBALL="752d9e54c69a.tar.xz"
-JDK_TARBALL="bfaa5c6df4a8.tar.xz"
-LANGTOOLS_TARBALL="fb494039358f.tar.xz"
-OPENJDK_TARBALL="f0482b9b7f7b.tar.xz"
-NASHORN_TARBALL="93462e8b4f4f.tar.xz"
-HOTSPOT_TARBALL="3f9a60eb8ef0.tar.xz"
-SHENANDOAH_TARBALL="adb62c0031b8.tar.xz"
-AARCH32_TARBALL="57f4048a925b.tar.xz"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
-AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="https://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="https://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	https://icedtea.classpath.org/download/source/${SRC_PKG}
-	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
-	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
-	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
-	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
-	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
-	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test +webstart zero"
-
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:0=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXcomposite"
-X_DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2"
-
-# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-COMMON_DEP="
-	>=dev-libs/glib-2.26:2=
-	>=dev-util/systemtap-1
-	media-libs/fontconfig:1.0=
-	>=media-libs/freetype-2.5.3:2=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0=
-	kerberos? ( virtual/krb5 )
-	sctp? ( net-misc/lksctp-tools )
-	smartcard? ( sys-apps/pcsc-lite )
-	system-lcms? ( >=media-libs/lcms-2.9:2= )"
-
-# Gtk+ will move to COMMON_DEP in time; PR1982
-# gsettings-desktop-schemas will be needed for native proxy support; PR1976
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	virtual/ttf-fonts
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2
-		>=x11-libs/pango-1.24.5
-	)
-	!headless-awt? ( ${X_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
-
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# perl is needed for running the SystemTap tests and the bootstrap javac
-# lsb-release is used to obtain distro information for the version & crash dump output
-# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
-# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
-# Ant is no longer needed under the new build system
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		dev-java/icedtea-bin:8
-		dev-java/icedtea-bin:7
-		dev-java/icedtea:8
-		dev-java/icedtea:7
-		dev-java/openjdk:8
-		dev-java/openjdk-bin:8
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	dev-lang/perl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )
-	sys-apps/attr
-	sys-apps/lsb-release
-	x11-libs/libXt
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="9000M"
-	else
-		CHECKREQS_DISK_BUILD="8500M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-8 icedtea-bin-8
-		icedtea-7 icedtea-bin-7
-		openjdk-8 openjdk-bin-8"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-src_configure() {
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use JamVM if requested
-	if use jamvm; then
-		use_jamvm="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
-		hotspot_port="yes"
-		# Work around stack alignment issue, bug #647954.
-		use x86 && append-flags -mincoming-stack-boundary=2
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use Zero for now until alternate VMs are working
-	if test "x${hotspot_port}" != "xyes"; then
-			use_zero="yes"
-	fi
-
-	if use shenandoah; then
-		if { use amd64 || use arm64; }; then
-			hs_config="--with-hotspot-build=shenandoah"
-			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
-		else
-			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
-		fi
-	else
-		if use arm ; then
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
-		else
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
-		fi
-	fi
-
-	# Turn on JamVM if needed (non-HS archs) or requested
-	if test "x${use_jamvm}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-jamvm"'
-		fi
-		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
-		jamvm_config="--enable-jamvm"
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
-		fi
-		zero_config="--enable-zero"
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		config+=" --enable-precompiled-headers"
-	else
-		config+=" --disable-precompiled-headers"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-ccache \
-		--disable-downloading --disable-Werror --disable-tests \
-		--disable-systemtap-tests --enable-improved-font-rendering \
-		--enable-system-jpeg --enable-system-zlib \
-		$(use_enable headless-awt headless) \
-		$(use_enable !headless-awt system-gif) \
-		$(use_enable !headless-awt system-png) \
-		$(use_enable doc docs) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable system-lcms) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable sctp system-sctp) \
-		$(use_enable smartcard system-pcsc) \
-		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
-}
-
-src_compile() {
-	default
-}
-
-src_test() {
-	default
-}
-
-src_install() {
-	default
-
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	if ! use alsa; then
-		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use examples; then
-		rm -r "${ddest}"/demo "${ddest}"/sample || die
-	fi
-
-	if ! use source; then
-		rm -v "${ddest}"/src.zip || die
-	fi
-
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	java-vm-2_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	java-vm-2_pkg_postrm
-}
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 6fa2d0cd3632..ee6c54b85989 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -33,7 +33,6 @@
 		<flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag>
 		<flag name="shenandoah">Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (arm64 and x86_64 only)</flag>
 		<flag name="smartcard">Build the PCSC driver against pcsc-lite</flag>
-		<flag name="sunec">Build the SunEC provider against system NSS</flag>
 		<flag name="system-lcms">Build against the system LCMS installation rather than the in-tree copy.</flag>
 		<flag name="zero">Enable Zero assembler port (usually for non-HotSpot architectures)</flag>
 		<flag name="webstart">Enable Web Start support (via NetX).</flag>
diff --git a/dev-java/jarbundler/Manifest b/dev-java/jarbundler/Manifest
index 38840df8c1e6..b54314991d8e 100644
--- a/dev-java/jarbundler/Manifest
+++ b/dev-java/jarbundler/Manifest
@@ -1,5 +1,5 @@
 DIST jarbundler-1.8.1.tar.gz 132101 BLAKE2B 0cd223ca9a63604f93d6bb2d6e89d0e48b48b43befaf510181fc8f435dc2f61388995f11c9efe4439e784b66c60a1395a43ef2041c690967b226a0212e77ef68 SHA512 f18657aaaae749846544fc35b65fe5e548a0471d85bf4e1d671bf1c7309f2392487069e880ce5f9c1a0e076637dddd9274d536969a9df5401331835f881553b4
-DIST jarbundler.zip 159874 BLAKE2B dbfa00a930a0f1e4c26e4372254f380d67279edbb6bc885db2a964f7fda744a68b9c6dc0a088ca851e62ed55048d33413186f6f340b5c80b52b8d9b4c589a355 SHA512 8b8b45533c601d10b6f986b913b824bb05617ac0901f178ee3fcfbdffa41ca060325228f71e62c4dfade778d50dd2040504eabf49311d386d75b82f77a535280
-EBUILD jarbundler-1.8.1-r2.ebuild 877 BLAKE2B e64f08cc3af09cc74ecab1318f827fcf9bb10908f022a154b172654bec234a3f654d3efaacc3a6f8ccacede12991e4712da98a37deefafb8f2eb315b1f2848b4 SHA512 29b33f54bf27ae9116394810a90cd304eaa967c5431eefbbce87939f1080d2c71510440fe583a9af7ae50d82fbd7b7afcb1c8395fc965e27e6879dd322984c6d
-EBUILD jarbundler-2.3.1.ebuild 920 BLAKE2B 51d7c5820840764ea32110d98783f07d49ead2226fa3f3f91cfcaecd1e04f249ba1695a5dc728462086ab7b194a90a2e40d2596d8e0b7b0077fa4769e6fd40f6 SHA512 8eccb4613bac9817affe001452285718b6ff6d9c40d2f59b2a174201bb56f494467f090d4de6c680f8828d5be00b1b7283c2b8eeee73dca13a168f3646e7eb2f
-MISC metadata.xml 316 BLAKE2B 208d43f0211b3f7f9322075e73673b35e703b2a5ecd4f66e2b066879792275fa7eeb03b287cef2f886157f5e3a12b5a64bc30b006b2fca4d488ce2d5eaf97414 SHA512 c52e5fd2674ee9b2eac940e7c0a92540a12e76297216d4915ab899922eb77c0f9f8125193dbc42ea3d924dbb60dceb2c6d55e35afe31eaf864ffae6ddb82a60c
+DIST jarbundler-2.3.1.zip 159874 BLAKE2B dbfa00a930a0f1e4c26e4372254f380d67279edbb6bc885db2a964f7fda744a68b9c6dc0a088ca851e62ed55048d33413186f6f340b5c80b52b8d9b4c589a355 SHA512 8b8b45533c601d10b6f986b913b824bb05617ac0901f178ee3fcfbdffa41ca060325228f71e62c4dfade778d50dd2040504eabf49311d386d75b82f77a535280
+EBUILD jarbundler-1.8.1-r2.ebuild 869 BLAKE2B cea2b3042a88685ffd2c6b939b872cee25cc5bbcdf5b69626994c0b6db257ed46a2f5a4ae726e2cb0a4b6d8bb2525121e06eec66567f7869d30e87c2cedd74f5 SHA512 d326dbcccda173844be07dd606d4c4ac25be57716a800fd71fe117d647ce80848d9f677caf73c253389899f811d50e746174f135e63e5925b922f78dbf4fdbd3
+EBUILD jarbundler-2.3.1.ebuild 881 BLAKE2B 4cf2ab8336bf9d6207ab332f7cfe6e560ac84f28904e586c7b9ca59ab2a65123b065c214991e8f4089fd937bdb31a0aa1a7330cb656b091a84b1ddfc392c68a6 SHA512 838b84fe90d9833969652b67499e87a02f1392e49a04d377ee777e7c70373d4422a89a46cd4b151fbd1e7b647c49bad6cc8a8426603e5a0ebc9a947887b69ee4
+MISC metadata.xml 322 BLAKE2B 6ea89460d4813d9c2db72652dc86a873698694cd3f3059db367be4493d959992d97467e546495cca4b2dbcf2e589d0e21abe698119b52412db2f7dbc14fb5d67 SHA512 acb71ede8573f755de74312313f408b689412ad7d045759b847be295374150608cda014779b38c47cdf408792bf794c26d4c53ba81294990f78fdd770e375f67
diff --git a/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild b/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
index 209a6407a5ca..30564a2f5c5c 100644
--- a/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
+++ b/dev-java/jarbundler/jarbundler-1.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Jar Bundler Ant Task"
-HOMEPAGE="http://www.loomcom.com/jarbundler/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="https://github.com/UltraMixer/JarBundler"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-java/jarbundler/jarbundler-2.3.1.ebuild b/dev-java/jarbundler/jarbundler-2.3.1.ebuild
index 2cfb7f543659..335239e7b0b8 100644
--- a/dev-java/jarbundler/jarbundler-2.3.1.ebuild
+++ b/dev-java/jarbundler/jarbundler-2.3.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
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Jar Bundler Ant Task"
-HOMEPAGE="http://www.loomcom.com/jarbundler/"
-SRC_URI="http://downloads.sourceforge.net/project/jarbundler/JarBundler/v${PV}/${PN}.zip"
+HOMEPAGE="https://github.com/UltraMixer/JarBundler"
+SRC_URI="mirror://gentoo/${PN}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-java/jarbundler/metadata.xml b/dev-java/jarbundler/metadata.xml
index 2b139b37e27a..0ffa001ad9d4 100644
--- a/dev-java/jarbundler/metadata.xml
+++ b/dev-java/jarbundler/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">jarbundler</remote-id>
+		<remote-id type="github">UltraMixer/JarBundler</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jsr173/Manifest b/dev-java/jsr173/Manifest
index 1c45135dc1ca..eb4db430b424 100644
--- a/dev-java/jsr173/Manifest
+++ b/dev-java/jsr173/Manifest
@@ -1,3 +1,3 @@
-DIST jsr173.jar 639734 BLAKE2B f34caff27d216303d14050c78c3a4413685e843b9a5aacb228c38c57c50a009b691bff889ebc970097f998ba93b3a0737256c3b8a19f9df3529d238b43f71538 SHA512 8b299532716682772e5eeafb63a5dd125dec8954a9a284f6766bac05409fff611724ae1a9b6f4f6f303b64c12b19e394371a6b0a87132b36e88f94e20b69efe4
-EBUILD jsr173-1.0-r4.ebuild 897 BLAKE2B 2310785a3d07ae50fba866c48e479ca8ba6b233150d1fbe92d1608e931b28f231f441f45a5a9e10333a09563c9204af7d09f873a09fa06cb3acbbbe03d546802 SHA512 87c2fe1796027e64fee8868625fa85762f6a8f1480bfd19282fda9c9ec0ab0f500a4057663b50f3dedb88821d7a9840917e891b6b04003a32b0e81b730e50769
+DIST jsr173-1.0.jar 639734 BLAKE2B f34caff27d216303d14050c78c3a4413685e843b9a5aacb228c38c57c50a009b691bff889ebc970097f998ba93b3a0737256c3b8a19f9df3529d238b43f71538 SHA512 8b299532716682772e5eeafb63a5dd125dec8954a9a284f6766bac05409fff611724ae1a9b6f4f6f303b64c12b19e394371a6b0a87132b36e88f94e20b69efe4
+EBUILD jsr173-1.0-r4.ebuild 886 BLAKE2B 6c6038bff9be4035ba0a2f647efc04376fec5578f2a7bd272c1083215f931f50a22a0ce351687abc2f35cccdb50e1372f35c2fa9a70b06ef30c92b0cf14789f3 SHA512 76f46f01084a20260dddf3b919306225538c76909e2608040026fb906ff77215e8a8c682c9b6050310f8be0406b28800816a1859e7a5fc93cce923d003088f05
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jsr173/jsr173-1.0-r4.ebuild b/dev-java/jsr173/jsr173-1.0-r4.ebuild
index 332838833908..7180b48d5303 100644
--- a/dev-java/jsr173/jsr173-1.0-r4.ebuild
+++ b/dev-java/jsr173/jsr173-1.0-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=6
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Yet another Java library for parsing and writing XML"
 HOMEPAGE="http://dev2dev.bea.com/xml/stax.html"
-SRC_URI="http://ftpna2.bea.com/pub/downloads/${PN}.jar"
+SRC_URI="mirror://gentoo/${PN}.jar -> ${P}.jar"
 
 LICENSE="bea.ri.jsr173"
 SLOT="0"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index df79bdd0644e..226333ef8413 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -4,7 +4,7 @@ DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498
 DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
 EBUILD protobuf-java-3.6.1.3.ebuild 1109 BLAKE2B d76e82ea1872d9c8d3a7cee220e243a424d5352dea09962435d487282c88157d937f89eb07e214f3a0bb62abdaab7afe88572cc4a00decc67e03ca13b6da4673 SHA512 8504a8fead79fe649cfd0d8bb63fe44c30e7f68c5fa8d0f3546a55460dc3e78fbd63f636b4f02269455159f471ead4a86d96431beb7d131c11c211b5b02d1e0a
 EBUILD protobuf-java-3.7.1.ebuild 1446 BLAKE2B 0354f61083a5747a713621fcee7a59a938ff03c008260dadd8aec7b928f81758fbe348f4eeb406069ebedfaa2979d98edaede22c1b738d0ce24c25c944a795c6 SHA512 63de3822738f831d43399cfbecb0cadf341dc605c4016abddb7444d6f93b7580102fb9bb95e55c6eaa1c6b4e4cb6217227a69fe5a927c1ee0e5ce3496a34bf15
-EBUILD protobuf-java-3.8.0.ebuild 1383 BLAKE2B d073629546fa85b36f0403ec1a716b9d286e5b7ba6e2f837aef10a9f90c13014bce56abc23ba910e8f8a90659865c79d3eeec0da49dc8f70f561f22d544b79f2 SHA512 474a86f44b1cc6effade6f6899c802b2c3c61fc269d194fff7c8f4214abe442c5f027115efb03b37d7b67a68b5c61d26b71c406f1c52e637e67cde8a6d1257ec
+EBUILD protobuf-java-3.8.0.ebuild 1382 BLAKE2B ac6dd81e147854eeca83884b7462af2dbb71fd93c1cb805b59b705b76333c8e9a4d8532742c81930b5bfc6ef0e2d6734888fe45a78b811dd7c156b3d02efa008 SHA512 2eb33c0e82ef03a2c2ff5df6f3168310520f13838308a6ad1407b8c8506199c09305828abdb2c1bfa715fdacdb74fb7116ad6e9aa7de99e444e79d2c297acddf
 EBUILD protobuf-java-3.9.1.ebuild 1385 BLAKE2B 9996fafa5a726e30a34d171d1540ccbef12e8e493459ecea750ce6feb9a5294ce476198b9d163d811b8c52fa423d848b2b4451b0d301186113c4a37d8fa0e539 SHA512 d94ab861cb3adaee0a5562429ec5277eb26fdb43b937f139c1c02a21ee2e1f3a1ec4fccafd004135990f7edb909d5e92555f7564af3d386329cbb16206f18ab7
 EBUILD protobuf-java-9999.ebuild 1369 BLAKE2B 7a4c1b79b8a6517d03b5bcdfbca494c5c7d416de235cdb26833b6245ff7cbdf2a1b34dcaeb905619b6cc4d5436d681545ca682038dd801d17f9c1766775f8665 SHA512 4913eba9d7bfc2c182101bc9340d3c6d73c913d17abe8fe8358439ffe529ad1a8c2557fab6679cc2b4a4711635b387d1b8657504ce03123ad8b39ebaabea78dc
 MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8
diff --git a/dev-java/protobuf-java/protobuf-java-3.8.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.8.0.ebuild
index ccd6c80447d3..5943243e203e 100644
--- a/dev-java/protobuf-java/protobuf-java-3.8.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.8.0.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/19"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/tablelayout/Manifest b/dev-java/tablelayout/Manifest
index 5a8b6f1ae344..60d87563a6e9 100644
--- a/dev-java/tablelayout/Manifest
+++ b/dev-java/tablelayout/Manifest
@@ -1,3 +1,3 @@
-DIST tablelayout.jar 112151 BLAKE2B cf084118517271987fd92027ee88914bdfe0199b79502d77dfd194fa4f19d2a5ffe7a208206443c1819ed10b7465ded1493e4cdbf33000bacd7e2885ec0c1877 SHA512 b6e9ef07b50165679df8338123cc636b8165ab989e71afc9d1279e257bb171675aa46cc304e65d7e301c66117149675bd987c07d6cf5b03cd1c7768144e22902
-EBUILD tablelayout-1.0.ebuild 693 BLAKE2B 2516ca37d407572a685a9c16d6ee96f9508bd283e8bdd07cb0830fa22fc80c86a937a3f1f57471795db7061f8ab1e5c4a9f76956fa02872f312a74a32939c2c1 SHA512 57ca795fa25e7d05508282e9c24dea8bf5d5deeeef562615e3298eb3c42c7d483436c98f04049ee0757d989983b26037b464618dc35d715fc1b42f7fec58606c
+DIST tablelayout-1.0.jar 112151 BLAKE2B cf084118517271987fd92027ee88914bdfe0199b79502d77dfd194fa4f19d2a5ffe7a208206443c1819ed10b7465ded1493e4cdbf33000bacd7e2885ec0c1877 SHA512 b6e9ef07b50165679df8338123cc636b8165ab989e71afc9d1279e257bb171675aa46cc304e65d7e301c66117149675bd987c07d6cf5b03cd1c7768144e22902
+EBUILD tablelayout-1.0.ebuild 734 BLAKE2B 053645e7d7704c8257e084b7af08ea63080a35a1f8e142939a18f98c11fa6a19f00dd3ca4808ca533d176203c205db564743e14a8ec1ff9e259ed6905052a613 SHA512 8ab1b10549bee2e0a51be039d958a4f57107bda880d315d3313364271640ec160e9d1583afc691b3665855451fa87079bb0db161493122f9f5bf44eaec0460aa
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tablelayout/tablelayout-1.0.ebuild b/dev-java/tablelayout/tablelayout-1.0.ebuild
index b0689be25fcf..afc16b2f180b 100644
--- a/dev-java/tablelayout/tablelayout-1.0.ebuild
+++ b/dev-java/tablelayout/tablelayout-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,8 +7,9 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Layout manager that makes creating user interfaces fast and easy"
-HOMEPAGE="https://tablelayout.dev.java.net/"
-SRC_URI="http://www.oracle.com/technetwork/java/${PN}.jar"
+HOMEPAGE="https://www.oracle.com/technetwork/java/tablelayout-141489.html"
+SRC_URI="https://www.oracle.com/technetwork/java/${PN}.jar -> ${P}.jar"
+
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 ~ppc64 x86"
 SLOT="0"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 122cab4e25d5..6d5c8cacbae4 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -16,8 +16,10 @@ DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 DIST apache-tomcat-8.5.42-src.tar.gz 5293083 BLAKE2B 4439b6a894aaa8d8db041ff25d3614271d895155d86250e25dfffc8355452d7c230bf81c22f4b75dcdb5cb528af489a8dcad6c93561a89a2aa8cea5173792331 SHA512 e06f3a0cacde6317a1f10f95a17cb7a460c81e3437a68f53da94aafdcbd528e29ed612bd0ffc5f2a3641417558348c4c0e66c1ae937bf709f9f74f79a339ad05
 DIST apache-tomcat-8.5.43-src.tar.gz 5283886 BLAKE2B 2d76e66eedf4de474d439289a9a491e5c490e2373bc91ae30113b8f3c624255339d24149b58fba640aaf3131ab3c9a449930049d26928627e1b7910f0cddd40f SHA512 f6a0439dbfd3f233bd1eb395d37466ba2cce32cd456d067fb2bb45099ac173dec7e42e7fbfab2cb50c0fce2e9dba1f1afe6c8d65877525cb13cb116489cf27a7
+DIST apache-tomcat-8.5.45-src.tar.gz 5324847 BLAKE2B 5ef3388b9324bb04772543c03686057b3035f5a5f40009d0aa1ec34fe18d04af87527bcc9ae0566f41faf64de8ce191f8ea4e2ed2869da569777621aad227d6c SHA512 1fe94b9d5ccf63d2c5fc3dd7a47dabade160ed2882848e0a41422b5a67215d53e8265535ee8e645157d56c4eba9093722982684be6668064648b0782fc48927a
 DIST apache-tomcat-9.0.21-src.tar.gz 5717051 BLAKE2B 004c5256e72c62e885a9d9040396d144d9fa73789a9699eb38210212f4ca6fa5f98c4b092f6fa2165166fd8cccc892eabcaee7a21570645ee057b0b61d3e1942 SHA512 6df978bbe9bb3a327d784d81a46affa4cfe5d370c2b847e102d25a792752ba487ebae329d1763ed7459cb3d49098c3d0cf6b01155536a04c17c4ffdf9e9a774f
 DIST apache-tomcat-9.0.22-src.tar.gz 5722896 BLAKE2B 1a006840e870ec01455285b324405e3d1ab7214daf9ea929be749a05149d6b84bcccf34787ba791a31be0d2bb295ede0dddff5053adef885080b31bc39e24ac1 SHA512 b3806caaef24821fb4b96fb1af86e0c04381d9e8943a9f94064e028e623f57b6f2ba056e62f1997bbca934fb929ee92ffecd0d0192dd08d59e2f7dde6848c5cf
+DIST apache-tomcat-9.0.24-src.tar.gz 5746934 BLAKE2B fe0ff76fd8b3caa2860c0798d66f0dfff1e907ca02d10913c768d8513b207ef11e8fe885cd7578348136b8d007e08ccc2044952198259ffcdb2d58acf9fbb8b6 SHA512 de11d0e992cce08edb83474bd4cab04857e3e2bf63ef334c8c9f3ad053edcc76691e831cc95b8c489b820773a6fa5d2755837b470d73471f9587bb7062d75a31
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
 EBUILD tomcat-servlet-api-3.ebuild 849 BLAKE2B 88f6dc377d4c33eb50a3559f5b1b275cbbddf077c119e792afc567458d74e4f6fa710a97e71543c19caecafb8a7e26ee0cfb4cf34006a2aaae9a97924cb9463b SHA512 085c9e220972fb0f923b710a33a76977aaf76c8abee84c5c0c80ff40932585fdb0cd3a00705a60ef615558a0c20f93522cfd705fc5e5c0af70fe9eb2e640ee5a
@@ -33,7 +35,9 @@ EBUILD tomcat-servlet-api-8.0.53.ebuild 961 BLAKE2B 4d207cbd6e39369ceace593d2f02
 EBUILD tomcat-servlet-api-8.5.23.ebuild 1010 BLAKE2B fb16fa9955dd865619850de21cdae0e44130895b3f886ec96ad5cff37f45f8a13b5caaddc083f46d2eab6b00e174689e652a5a0ead58fb4626e40612c1fd5784 SHA512 1ceaa37c6434f32e10705b0663bc39e2ccc5507c621a2ede604feec69a49bcb46ddd49fff33a5ccce50d4daa228170a3db30e31624ae84dfc83b538de10f7824
 EBUILD tomcat-servlet-api-8.5.42.ebuild 1009 BLAKE2B 616e51d8822c6876501edd4bc2408cf0bf8874c7bb2be477492d83aab8a90ce472072b0f92f475362109acc1468f5e80c83bc31f201694ace3485cde174dbc8d SHA512 bf685eedd82d08d142aad7301694e54ea8677f4b730def058c09e6c0b92b9db69d2df37859f113a024283e8b05e5eaa38a5ac30784c4fc269d221387e50d6e4b
 EBUILD tomcat-servlet-api-8.5.43.ebuild 1010 BLAKE2B 04f7dd7c54b930a54631cd1e444052db3290f7e9f2e289040a58a0bdd2d2410996197a22c6a36df9462328153b8a28b58f1cfa4554283ecb10ce0806c25ff484 SHA512 e6c416bae0febef9521b8ae3385c2fe41b7926b4c734f6e09b1f77d92a74ac986579811ec93d9c1887d13133a9520b9327a82725e5c90a35b5ba2aa4f93fc53d
+EBUILD tomcat-servlet-api-8.5.45.ebuild 1010 BLAKE2B 04f7dd7c54b930a54631cd1e444052db3290f7e9f2e289040a58a0bdd2d2410996197a22c6a36df9462328153b8a28b58f1cfa4554283ecb10ce0806c25ff484 SHA512 e6c416bae0febef9521b8ae3385c2fe41b7926b4c734f6e09b1f77d92a74ac986579811ec93d9c1887d13133a9520b9327a82725e5c90a35b5ba2aa4f93fc53d
 EBUILD tomcat-servlet-api-9.0.21.ebuild 1004 BLAKE2B 7f18ece7027e7c7e4af92c417870389e5938963ed8d5c03c06a4c44140e0803712a356bad0853f64fc860e900905169811dd85fa733b82940da4d9b03f1bd61a SHA512 467a31bf3148372c850fa94a9c0467163038aabe29ab72be1a539e5f2642bb363c9a0bbc4416fec9e24e46aa0c76e2b51ec000512772e8964177841310468303
 EBUILD tomcat-servlet-api-9.0.22.ebuild 1005 BLAKE2B 13c34d148546c4adaad25d2fa7ff3d90bb2464865b5af19832cc611ee3fb6c0a10c26fac4ca76da16d42e7fa9301deeed7b2c94e73e08c7ad0287c59730c81f0 SHA512 f552bd4b8f38a5e3a569755a2105fedf4ddf03572cfc3c363455e0a4bfc17a0272a0bc264b1e3d84dfaa51089f0f54fc4123a5964dc116be9b9181862b127f4e
+EBUILD tomcat-servlet-api-9.0.24.ebuild 1005 BLAKE2B 13c34d148546c4adaad25d2fa7ff3d90bb2464865b5af19832cc611ee3fb6c0a10c26fac4ca76da16d42e7fa9301deeed7b2c94e73e08c7ad0287c59730c81f0 SHA512 f552bd4b8f38a5e3a569755a2105fedf4ddf03572cfc3c363455e0a4bfc17a0272a0bc264b1e3d84dfaa51089f0f54fc4123a5964dc116be9b9181862b127f4e
 EBUILD tomcat-servlet-api-9.0.7.ebuild 1007 BLAKE2B 93f6cdc024db1fd4959c86661de3d58e4a3457e54e94bc26d28cfa14f276b17ae61113252b9004de8492f815fd4b02744e055c8082d3fe50918376e61dcca071 SHA512 4cbd09d197fa558fb2172bfb637c06c6f028939038ad3071074019de4663c833d24f8f96a1c7ca628241ae65ef16fc88a06b226f210070170844ad95e2890c51
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.45.ebuild
new file mode 100644
index 000000000000..a6df79ab2dec
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.45.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.24.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.24.ebuild
new file mode 100644
index 000000000000..e35055493b79
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.24.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a8fdd6a8d09e..cc5330f86ff7 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 369230ac4975..9584c3de98a2 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -16,12 +16,16 @@ DIST go1.12.5.src.tar.gz 21971348 BLAKE2B 7de8db4a6c4cd9e1883fbf28357fe99ad9f43f
 DIST go1.12.6.src.tar.gz 21975398 BLAKE2B 05c183baf2e6544b039cff33abb7c5d66a50a0a7cadaa16032a3dc3793bfa27e82c4598dbb700bf7f90ba2ce2639bb60484e61e50fc154d8184d4874954b81e4 SHA512 431a0b916ce2e64d816808a04bc3bf028e955538ab55c571021c08e599781ae344487a55e119bb3aae3d32f84cd83e2c176dc72d336b95da0352edffeab07a48
 DIST go1.12.7.src.tar.gz 21976647 BLAKE2B bf0c723f1e02048d91844c7b8908500c83442a8ab7ceeaacdb37d7204f72d80331eab44de54f99411479be8e645b2626fb8a34df0cedbd75fa57c4e1d84d493a SHA512 f84c6b89dea9df21f0efa07564eb80baeee5bc2d68cced5fd645ebb32e9317e60b657afe011c81e7739d8a93e4b4dafa0b4f78431a009d36e05de55f89ed0fd6
 DIST go1.12.8.src.tar.gz 21978756 BLAKE2B 65258c101d729bbd82f69ba4286ba8e64f9d3128be97243374d442dfcc4033f1238bb57530a34dc0142f55cc8f2692efab65452286c4769f24e8aa3a4a80abd1 SHA512 193a9b08752aa2479c19f5b56fdfe2296c7e6097e0c583290f0fce754ac7571e2ff345f66b69774d8e22f2caa147a3dc15658148017b09e5e7f49fd4569373d4
+DIST go1.12.9.src.tar.gz 21979950 BLAKE2B dca7e3afcabd513c4b8193e93c0a1ed1a2326dccfce9b909d97b3731fffbe7e26712ab164645e06a316baa949b1e0b14a2fea8d23e6f90fd5b72afa0d15b432b SHA512 57041e7fb767f528aa9fc2592d205d3a7c120c73f92dc8d91f17f816e12aa6152c8421b333081800a5f50b1bb656f203a25faf8ed92c69a6ec164ce0a5619c13
+DIST go1.13.src.tar.gz 21621948 BLAKE2B dff6024287c0805ec735cb40aef4ffd872bdc17df6e0d531be3d16806292edde2a63299fe7b9b3c97a79f6f864ab0f95962a0cd2e1a0ba0216b3f4bc59bf4bcf SHA512 c6346b1ab256cb743dd98625d8b16cdcc1365b186e039e99747d6c18041045daa065f6bdce17cca0a9800be2dbb34e90adf5518d5295693f80435c02fe5b2cd8
 EBUILD go-1.11.10.ebuild 6448 BLAKE2B c7196c5172a0aaaaa707b4557caf4bc093241d76b14ffb22980f130c47dfb9abc041afb6bb6a22660d0699464eff630a4c9974aac7756d7e6514f2b22e7cadcb SHA512 aa8993afc41fa784ad67e2e8bab4a3edc5c178eecc66fd2b14285b739235c9eac0b44abee85de004c835df9807be35799fcfc9cde1a92d32bccc75c2e73f8085
 EBUILD go-1.11.12.ebuild 6451 BLAKE2B de8659b981b3ae812cdcbd4816f4efa33ca8f29b9462375e03817d97c9415bff805568321b900e891c6f73576c220e55bc5ea6fb4ff47f1057c4ba6383d0707f SHA512 5543bb226fcb9958c02d67d145a3bbcb285e471eed0967db3b75187b9f9ad3a5d5e2ebd168580d014d7962aa1c92da0f447029748683feb46c9744e3239da535
-EBUILD go-1.11.13.ebuild 6449 BLAKE2B cf4db759cb9cd1f825344f2255c813045bcc25e15155d64c7765891ed6f674ebe707b4c25301a96f3c1f4c06bdde93ff7e0ed9a9aec384dc8e1fccbc8c0a2b8e SHA512 0cc8cdd9ec1acc54a40b6bb3382c7f7f900790378ba34d073de54d6c4e59126fa21abff090469a5ff7db0921376a2de76c8ce53588c6f89e64a0cb48fd3237e3
+EBUILD go-1.11.13.ebuild 6448 BLAKE2B c7196c5172a0aaaaa707b4557caf4bc093241d76b14ffb22980f130c47dfb9abc041afb6bb6a22660d0699464eff630a4c9974aac7756d7e6514f2b22e7cadcb SHA512 aa8993afc41fa784ad67e2e8bab4a3edc5c178eecc66fd2b14285b739235c9eac0b44abee85de004c835df9807be35799fcfc9cde1a92d32bccc75c2e73f8085
 EBUILD go-1.12.5.ebuild 6459 BLAKE2B 11cc998ff708a26c833e7ac2ff72c7fd2aabf0e3a3bfaa7558820d4726e29e22e5d0ad0b3100bd8e982b54074fc1230a43d288cf873810024a3fa1b3b77450e5 SHA512 deff55ebb12c4a915b439a1d598e02b8fd03a1d1ee873f9e6f47c6ff22cef82c3624aa68eac89968a3f01f7b91794d501675a59871fe9dd022fb2ee8cd29cd26
 EBUILD go-1.12.6.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f
 EBUILD go-1.12.7.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f
-EBUILD go-1.12.8.ebuild 6460 BLAKE2B fdd3ca731eda7778d0792f009ea151efb81a3a57c15ca3958f2f01ec83287bef3b4c9428c8db32cf646302c74a19258673936d6ba375ede5f1ed6f16ca05e408 SHA512 b3f2d86b543f44ec7c2af7ecbd8a961b25517e30ce796c3aa2e12edc3f22eb2136ac4e5905c8d1030e1bc631256cf90f2883569e13334c34c26b6abe603c5e9a
+EBUILD go-1.12.8.ebuild 6459 BLAKE2B 11cc998ff708a26c833e7ac2ff72c7fd2aabf0e3a3bfaa7558820d4726e29e22e5d0ad0b3100bd8e982b54074fc1230a43d288cf873810024a3fa1b3b77450e5 SHA512 deff55ebb12c4a915b439a1d598e02b8fd03a1d1ee873f9e6f47c6ff22cef82c3624aa68eac89968a3f01f7b91794d501675a59871fe9dd022fb2ee8cd29cd26
+EBUILD go-1.12.9.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f
+EBUILD go-1.13.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f
 EBUILD go-9999.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f
 MISC metadata.xml 663 BLAKE2B fc92966e1b4a155b4d442842988d0404c0148b029d187ab7294d49dabad771296d63ca3184128ac27cea4e74e7d6cfc8852084ca8f1d15a1d0755586a0bf68de SHA512 f67b7e312cfb2a896552ae73e835d53ffbb0a7c71c30f0a7cb44c65e2753055e185e7a5c48e2cfff33a42609629cc3c32ee56a9d8f61d8429798c1e8424e36bf
diff --git a/dev-lang/go/go-1.11.13.ebuild b/dev-lang/go/go-1.11.13.ebuild
index a53df7c09567..b48fe53d64d1 100644
--- a/dev-lang/go/go-1.11.13.ebuild
+++ b/dev-lang/go/go-1.11.13.ebuild
@@ -37,7 +37,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
diff --git a/dev-lang/go/go-1.12.8.ebuild b/dev-lang/go/go-1.12.8.ebuild
index 35c5de1d232e..daee1d59a92e 100644
--- a/dev-lang/go/go-1.12.8.ebuild
+++ b/dev-lang/go/go-1.12.8.ebuild
@@ -37,7 +37,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
diff --git a/dev-lang/go/go-1.12.9.ebuild b/dev-lang/go/go-1.12.9.ebuild
new file mode 100644
index 000000000000..a6151a8c829b
--- /dev/null
+++ b/dev-lang/go/go-1.12.9.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+BOOTSTRAP_URI="
+	${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
+"
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		# The upstream tests fail under portage but pass if the build is
+		# run according to their documentation [1].
+		# I am restricting the tests on released versions until this is
+		# solved.
+		# [1] https://golang.org/issues/18442
+		RESTRICT="test"
+		;;
+	esac
+esac
+
+# If gccgo or a previously installed version of dev-lang/go is not being
+# used to build Go, there is no way to know the architecture or operating system
+# of the build machine, so we need to download all of our bootstrap
+# archives to allow this ebuild to work under crossdev.
+#
+# https://bugs.gentoo.org/671394
+SRC_URI+="!gccgo? ( !system-bootstrap? ( ${BOOTSTRAP_URI} ) )"
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo system-bootstrap"
+
+BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="
+	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/*.gox
+	"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+	[[ ${MERGE_TYPE} != binary ]] &&
+		use system-bootstrap && ! has_version "dev-lang/go" &&
+		die "dev-lang/go must be installed to use the system-bootstrap use flag"
+}
+
+src_unpack()
+{
+	if [[ ${PV} = 9999 ]]; then
+		git-r3_src_unpack
+	else
+		unpack "go${MY_PV}.src.tar.gz"
+	fi
+	use gccgo || use system-bootstrap ||
+		unpack "go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-${BOOTSTRAP_VERSION}.tbz"
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-bootstrap
+	if use gccgo; then
+		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
+		[[ -x ${go_binary} ]] || go_binary=$(
+			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
+				sort -V | tail -n1)
+		[[ -x ${go_binary} ]] ||
+			die "go-$(gcc-major-version): command not found"
+		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+	elif use system-bootstrap; then
+		export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go
+	fi
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name for test object (binutils_test) on Darwin, it
+		# is never used in real circumstances
+		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
+		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
+		install_name_tool -id "${libmac64}" "${D}${libmac64}"
+	fi
+}
diff --git a/dev-lang/go/go-1.13.ebuild b/dev-lang/go/go-1.13.ebuild
new file mode 100644
index 000000000000..a6151a8c829b
--- /dev/null
+++ b/dev-lang/go/go-1.13.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_VERSION="bootstrap-1.8"
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+BOOTSTRAP_URI="
+	${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz
+	${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz
+"
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		# The upstream tests fail under portage but pass if the build is
+		# run according to their documentation [1].
+		# I am restricting the tests on released versions until this is
+		# solved.
+		# [1] https://golang.org/issues/18442
+		RESTRICT="test"
+		;;
+	esac
+esac
+
+# If gccgo or a previously installed version of dev-lang/go is not being
+# used to build Go, there is no way to know the architecture or operating system
+# of the build machine, so we need to download all of our bootstrap
+# archives to allow this ebuild to work under crossdev.
+#
+# https://bugs.gentoo.org/671394
+SRC_URI+="!gccgo? ( !system-bootstrap? ( ${BOOTSTRAP_URI} ) )"
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="gccgo system-bootstrap"
+
+BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="
+	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/*.gox
+	"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+pkg_pretend()
+{
+	# make.bash does not understand cross-compiling a cross-compiler
+	if [[ $(go_tuple) != $(go_tuple ${CTARGET}) ]]; then
+		die "CHOST CTARGET pair unsupported: CHOST=${CHOST} CTARGET=${CTARGET}"
+	fi
+	[[ ${MERGE_TYPE} != binary ]] &&
+		use system-bootstrap && ! has_version "dev-lang/go" &&
+		die "dev-lang/go must be installed to use the system-bootstrap use flag"
+}
+
+src_unpack()
+{
+	if [[ ${PV} = 9999 ]]; then
+		git-r3_src_unpack
+	else
+		unpack "go${MY_PV}.src.tar.gz"
+	fi
+	use gccgo || use system-bootstrap ||
+		unpack "go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-${BOOTSTRAP_VERSION}.tbz"
+}
+
+src_compile()
+{
+	export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os ${CBUILD})-$(go_arch ${CBUILD})-bootstrap
+	if use gccgo; then
+		mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
+		local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
+		[[ -x ${go_binary} ]] || go_binary=$(
+			find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
+				sort -V | tail -n1)
+		[[ -x ${go_binary} ]] ||
+			die "go-$(gcc-major-version): command not found"
+		ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
+	elif use system-bootstrap; then
+		export GOROOT_BOOTSTRAP="${EPREFIX}"/usr/lib/go
+	fi
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name for test object (binutils_test) on Darwin, it
+		# is never used in real circumstances
+		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
+		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
+		install_name_tool -id "${libmac64}" "${D}${libmac64}"
+	fi
+}
diff --git a/dev-lang/pasm/Manifest b/dev-lang/pasm/Manifest
index 7a88de4bde38..dca3b6261374 100644
--- a/dev-lang/pasm/Manifest
+++ b/dev-lang/pasm/Manifest
@@ -1,4 +1,4 @@
 AUX pasm-1.7-ppc.patch 901 BLAKE2B cde7b91e1015720e801914f50935aab09e800f28a504a9474815a73d2ee7694137bfc6048753669c9d37e0d5f73d14c980dbd88629c9bae5eadec9f45697a4b0 SHA512 685af1b74e3c3136aab30292ce6dd8fa412a1f214da23426e7ecb7fef728faf50f9dda58cadda97004b386f1244d47cde094dd09ad97c0e68de8484667c73457
-DIST pasm.tar.gz 82136 BLAKE2B d9aa8ab23eb184ca00b416d172b86c4c4aad0e12eea3ff92979c4570ebcf04306b8030f81524952f62f2221d25384db13d208dd22fb98105b7edd55587537a54 SHA512 313e4ad694704ad59619c46353c53ef9bd5529b6c9faee5cc6124dd0175f7b5a87268d2c26045f0639a0002311828b227915f30e697f8adedcd4256774674283
-EBUILD pasm-1.7.ebuild 662 BLAKE2B 16a1ac2ac04af5c4a76fabfb877f8a123f1bef9c846a495890d13eb354672d1d5d315b6d5f590f5a0310c51a2aa96702399435ad11c40347b9937a87c9214773 SHA512 90f6fb8a1fd82026fa08abf68fcb59b78dbc84e76da6620bf20c81609eab8ea583dcb08b4bc9c32dab25e6fb194fcdb91371e7567cf8c5e0b32e5c68b1855978
+DIST pasm-1.7.tar.gz 82136 BLAKE2B d9aa8ab23eb184ca00b416d172b86c4c4aad0e12eea3ff92979c4570ebcf04306b8030f81524952f62f2221d25384db13d208dd22fb98105b7edd55587537a54 SHA512 313e4ad694704ad59619c46353c53ef9bd5529b6c9faee5cc6124dd0175f7b5a87268d2c26045f0639a0002311828b227915f30e697f8adedcd4256774674283
+EBUILD pasm-1.7.ebuild 665 BLAKE2B b3b9e22e4f125b0f80aba39e7711579e21c06f3c85f1909b54d9e520621c501ed64f6c0b71039d35a5b6993a0ebf4eba97f3b1f8565b1c5c329bdb07e9a8da95 SHA512 21f55fad26211965c070fd677a9780b473b6c8875acc6627d3a32b998c30bffb10f224f2a22513bf5ed2c3e7827abf9fb52594ca1b52d1006fff22eabd518b2c
 MISC metadata.xml 614 BLAKE2B 8c3f30f95127d33b4582c962631e6b3e1522a75d3285466c0dcd4efc9282566e49c09ed44042370b17d613766f5a0d431a0b0b135a05f64aecec351a628480c8 SHA512 fd8449a228746b428cddb71477efdc421fba98b60ef72e1459c790a2df9f5898163a7e4fee2e9950d176f6dbe65525d41fb676e66a004d0427886dec878095e0
diff --git a/dev-lang/pasm/pasm-1.7.ebuild b/dev-lang/pasm/pasm-1.7.ebuild
index e4e41e367302..f6c98702e948 100644
--- a/dev-lang/pasm/pasm-1.7.ebuild
+++ b/dev-lang/pasm/pasm-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -6,7 +6,7 @@ EAPI=0
 inherit eutils
 
 DESCRIPTION="A portable assembler for processors of the PowerPC family"
-SRC_URI="http://devnull.owl.de/~frank/${PN}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.gz"
 HOMEPAGE="http://sun.hasenbraten.de/~frank/projects/"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 146fdaac7e7d..6b51087ad593 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -7,12 +7,18 @@ AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae7
 DIST php-5.6.40.tar.xz 12472236 BLAKE2B f41147eaec9b15e965540f9e871691cc88848dd619bae6af85e7bba0130b71ce91bad5cdbbadbb537c42df83369f5c731007339a9d9e21e689e913c135201afc SHA512 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329
 DIST php-7.1.31.tar.xz 12370928 BLAKE2B 18b7d5398380324243321a39d337bd10a7eb82812f3dbb9b2ea9eb4808ef585d6452cc5953b56d24bcf817994e249b8b20cd9b4658e1df6c77de78eecb48a3a7 SHA512 989cd157e0d67c6f03192ce9e1afaa01ff72ccc83f3e6b94ac8dc3d4c2717258a46bd64fb20e4649baec1fe2545805013eedc1de78e556d09c2b0ae64d4272d8
 DIST php-7.2.21.tar.xz 12298448 BLAKE2B f82b35fd3cdf45d8c84639d044729602340c2d34695b5603a194e2d504627c0e041ab156c3720d218d8d6ca51c9ef71d8d0ee37585142aa30ed0cce51fbcb91e SHA512 c7fe01626c1e25e8882d8f2b69d77a5479567d2daa3bf25d1ce3f45314a882f79ce9914a2aa1b3052b6289b46873f466e457049ce1db6e31b60ba4995187507c
+DIST php-7.2.22.tar.xz 12271632 BLAKE2B be3089066ba1c25c479eedaf3e6dd8f7773a6d87a16ce49d8c5379bc9b25d073b497004ccb219795bcfdc3af1310570f94f109754120c254ea5bbaaf1a5e953f SHA512 526dbcc03726d6e2f146adbdf8d89f0c8acb2575a3c21e5ef14ae256f29447d82154e0b1869c0143d831f81c2da0d943957c51144fb458457d3681cdfbc6d49b
 DIST php-7.3.8.tar.xz 12064620 BLAKE2B cfe2fde5e48080e13bd21cb2e2ca0c0ae38da03c94d0692e11bfe6722e50bd0b864d629a0ef6aed4ac5d9830ec4b4b214b9abdf917519a0c0cb70a4362fc8390 SHA512 9e9e13845350f3d4a8a80c3e2fe8291996e2749b2c862261b96346c01e5e24640cb81adad5e3b7668b56b2266c1fcbb713e8c38da4f9aa474f5f632f91378a8d
+DIST php-7.3.9.tar.xz 12064244 BLAKE2B 2837463a74a0ccffc1a2193f9fbce78c98c15dd60214cb5d5d704aed7d74449696c3a516e86f440aed9ff3dc2ed8e7bbebcaf0a1268afa55aca2b642e958abf1 SHA512 017d2ae3cd499a7f6ee30111baf0a119e2f404919575acc5ae91fa6e53a303c9d1b5d165205eec3943c3547ff8759e21fbccc62845e3269176f6fc0f2ba88490
 DIST php-7.4.0beta1.tar.xz 10200060 BLAKE2B f49c49fcebe0309bbe266dec5c468037499fc96908a4130454403e57caa3ef7da3c46dbc83829bb290c46edfc14921f71fafddb8b0777c23adec35fbb57ad68c SHA512 3e4307201c91cec238c9bc6c27a629a93de8baba0307f2e61cb4bb242720178382dd50b38e7a18fbd65baf25068b358faf571dcb895e7cd6fb292038dee3ed6b
+DIST php-7.4.0beta4.tar.xz 10207868 BLAKE2B b7fe60ec6b98c00e58b88e59aeddee7750df4480e505eab78f6ad4268bbcdba53fea36a4a0fb4e2b4e140247adc68946dcdcbc13ae339fe85570b91145025201 SHA512 c87c519453a8ba7f06b921b214b3315938b77c7d6f4f88f173f9c1e48a578937e4aa9bdb4d5a23c922b5cedaafc4d6bc29067dc55103fdecaa3a8ab4b381f203
 DIST php-patches-7.1.31bp.tar.bz2 37219 BLAKE2B 4f3ead2f69adf00ac1317371172c8adbb823f597cd8e3cafe7044d6a46671437fd2e5eaef4309a6fd5825123394044543284d3cbe892c918353a5b07c12b7401 SHA512 eb52679d035ceb4124c8e9175024f4f753e20d139479af4a57e01de941991716b2ce37f6190242c1bec46fd5305bad1f91613b04ee849a0d94f4a33ce013781e
-EBUILD php-5.6.40-r5.ebuild 22996 BLAKE2B c0e09e903c7867e65ec1d48787b3ddfa97e791825f52f09dd25a0eb95c73a8b5ac580cd1f9018dd85dde527108f83aabf8f8ecc7a0f8da2c7e04b0cb748ccac5 SHA512 2d8fce5732ebb30949bf6daea874a851f2659a25442765e238bfd4a6605df6e9179e4bf0a005a33696a76d9f03049c1e6f00ef26c9b7a993eb044c9abe5cfce0
+EBUILD php-5.6.40-r6.ebuild 23012 BLAKE2B 2c7ae50a94373c6025bb0c3aca204892d73bbe425da47603a4148927ded5d2becbd60fc19261b945ab0f733bbcf9e37a94209ccb4730ba07b9d7e7ace0ed6b55 SHA512 18d9134631d8aaca982f7fd0269f7aeaeb20a488c22d8ba013cf6fd96cdbdad0a818265512b5ce7ccdb7c478e944ca4f20706612929bbc2cc5381a5f58371a59
 EBUILD php-7.1.31.ebuild 21986 BLAKE2B 0a9f4e8fa3d742b98eb013d015cd53697421d28ad5aa649cfaf1e557d5a03567be2c32fec1dc5751721189911da14d9788bbd5d5f4fab24126b26d3259b0b322 SHA512 fbaa854f58fb9d0a634aaf6296964256970a41a0d9c7a972ac35b2124d453404fa0a67b1c4477ae5b7a47e58e6498e3bf47fafb7154995ba7c623500f506346e
 EBUILD php-7.2.21.ebuild 22517 BLAKE2B 490812bcbbb78997bfa3922bca6d635be9f1b5cc69189c465a073fbaa67d21875d4f38dc9c02c856e708fb683961446b5db0fb6f223d15018703af52d7181200 SHA512 cf7668d34d56ae10bbac60dca6d35d0c8aab93a48fc5043b8098459637b404f6832afdda80014f4a6c60b0ad061cb1f287e12ee73dbcba1c8b2afc18fb3d3b98
+EBUILD php-7.2.22.ebuild 22553 BLAKE2B e09d5f3da73606c72a1521d4395fe5419b864507e98778b634c98986e5b9b1e745aa04249a1e9fb94f1cc7686ac950ecea052184924da3935e7b947567a95319 SHA512 dc4e455d08d0af10d5800fbbdbf98a2e447ec40e79e5d25ddea082beeecdece29e63a31fc11724dacbcae3c7918a26f24a4305316e3bc1417d5aadc14373ea59
 EBUILD php-7.3.8.ebuild 22529 BLAKE2B 7f8bd6851381d324070b93e7c7bb46aee62175560861318f25f0cdbf95d231d9ad1f02a6173816a409e0ae06df83ea84010c2099024fc11b526e2fc5378b1a9d SHA512 ce6c664a8686e6270a788f291b759fdedb98a920de43fb07046f83e65b0296595d82df3da177376f02ea2c3e6540edcb406fe2edd4709bf143696bcb8c5f713d
+EBUILD php-7.3.9.ebuild 22539 BLAKE2B b964d8dfd1c5b48e3fc36ab639a26dd5ccdd483e4f2400a6d7152ce8b3894066a27bc7961357138414bb062cc8b6dc7166e4a9d3a4ef6b5959b102b4da27d515 SHA512 4bad50b0f54b83d7b50a0312cadd1d19d1301557b3a066fb46201cbb3b8774bbdc10ca6fc124d73ece41992a04bd9b902bc8e6d489fd638ece294f21dec3bd94
 EBUILD php-7.4.0_beta1.ebuild 20931 BLAKE2B d5c697c0b381e359078cbfe8d3eeffcc5509ec08db0bf8b5b7c159f0b5875f28eac283cee086d185e220b1c4a6d6a67df07adba2ae4d8f90b79321ca20e8fa92 SHA512 7d7793f1d4b99d3703f4a032418e755294c7275404d8c6c735452df2750587bbbaf9e35975ec59ff9e3e805dc326b5829bedca41602b34727f09454d2bb94db6
+EBUILD php-7.4.0_beta4.ebuild 20931 BLAKE2B d5c697c0b381e359078cbfe8d3eeffcc5509ec08db0bf8b5b7c159f0b5875f28eac283cee086d185e220b1c4a6d6a67df07adba2ae4d8f90b79321ca20e8fa92 SHA512 7d7793f1d4b99d3703f4a032418e755294c7275404d8c6c735452df2750587bbbaf9e35975ec59ff9e3e805dc326b5829bedca41602b34727f09454d2bb94db6
 MISC metadata.xml 3352 BLAKE2B 155c08bb52b049c3f79557d27ab6be9402cd35797cd385d53fc8c239c0eca089f65e106d54beca0642b8d182bfd0e172886b863a692575e9002140af7a62fa08 SHA512 f37c4c7b709bf91da6db41b0468c36cebffc630dabdcf4d43259017be5cf0577bb329ed0e206ff14d68bacc33425fba4789fc13fa34aa61acccce9fda11eee86
diff --git a/dev-lang/php/php-5.6.40-r5.ebuild b/dev-lang/php/php-5.6.40-r5.ebuild
deleted file mode 100644
index de391dcfb949..000000000000
--- a/dev-lang/php/php-5.6.40-r5.ebuild
+++ /dev/null
@@ -1,789 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools flag-o-matic systemd
-
-PATCH_V="7.1.31bp"
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://php.net/distributions/${P}.tar.xz
-	https://gitweb.gentoo.org/proj/php-patches.git/snapshot/php-patches-${PATCH_V}.tar.bz2"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
-	coverage crypt +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	+flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib:0=
-	) )
-	coverage? ( dev-util/lcov )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib:0=
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	libmysqlclient? (
-		mysql? ( virtual/libmysqlclient:= )
-		mysqli? ( virtual/libmysqlclient:= )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
-	)
-	unicode? ( dev-libs/oniguruma:= )
-	vpx? ( media-libs/libvpx:0= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib:0=
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	vpx? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	recode? ( !imap !mysql !mysqli !libmysqlclient )
-	libmysqlclient? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	sharedmem? ( !threads )
-"
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	local patchdir="${WORKDIR}/php-patches-${PATCH_V}"
-
-	eapply "${patchdir}/"
-
-	# Copy test binaries from patches
-	local ext_src
-	for ext_src in exif iconv ; do
-		cp "${patchdir}/${ext_src}/"* "ext/${ext_src}/tests/" || die
-	done
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
-		|| die
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	eapply_user
-
-	# Force rebuilding aclocal.m4
-	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-
-	mv configure.in configure.ac || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with crypt mcrypt "${EPREFIX}/usr")
-		$(use_with mssql mssql "${EPREFIX}/usr")
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_with truetype t1lib "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-		$(use_with vpx vpx-dir "${EPREFIX}/usr")
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-	use libmysqlclient && mysqllib="${EPREFIX}/usr"
-	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib)
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.6.40-r6.ebuild b/dev-lang/php/php-5.6.40-r6.ebuild
new file mode 100644
index 000000000000..9a3ebaa2a5f1
--- /dev/null
+++ b/dev-lang/php/php-5.6.40-r6.ebuild
@@ -0,0 +1,789 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic systemd
+
+PATCH_V="7.1.31bp"
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://php.net/distributions/${P}.tar.xz
+	https://gitweb.gentoo.org/proj/php-patches.git/snapshot/php-patches-${PATCH_V}.tar.bz2"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+	coverage crypt +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+	mhash mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib:0=
+	) )
+	coverage? ( dev-util/lcov )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib:0=
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( <dev-db/mysql-connector-c-8.0:0= )
+		mysqli? ( <dev-db/mysql-connector-c-8.0:0= )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
+	)
+	unicode? ( dev-libs/oniguruma:= )
+	vpx? ( media-libs/libvpx:0= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib:0=
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib:0= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	vpx? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	recode? ( !imap !mysql !mysqli !libmysqlclient )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	sharedmem? ( !threads )
+"
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	local patchdir="${WORKDIR}/php-patches-${PATCH_V}"
+
+	eapply "${patchdir}/"
+
+	# Copy test binaries from patches
+	local ext_src
+	for ext_src in exif iconv ; do
+		cp "${patchdir}/${ext_src}/"* "ext/${ext_src}/tests/" || die
+	done
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
+		|| die
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	eapply_user
+
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+
+	mv configure.in configure.ac || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with mssql mssql "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_with truetype t1lib "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+		$(use_with vpx vpx-dir "${EPREFIX}/usr")
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib)
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.2.22.ebuild b/dev-lang/php/php-7.2.22.ebuild
new file mode 100644
index 000000000000..4156c8c952e9
--- /dev/null
+++ b/dev-lang/php/php-7.2.22.ebuild
@@ -0,0 +1,749 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://php.net/"
+SRC_URI="https://php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib:0= )
+	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( hash || ( mysqli pdo ) )
+	mysqli? ( hash )
+	zip-encryption? ( zip )
+"
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+	"${FILESDIR}/php-7.2.13-intl-use-icu-namespace.patch"
+)
+RESTRICT="!test? ( test )"
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sodium sodium "${EPREFIX}/usr")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zip-encryption libzip "${EPREFIX}/usr")
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	# --with-pcre-valgrind cannot be enabled with system pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+		--without-pcre-valgrind
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.3.9.ebuild b/dev-lang/php/php-7.3.9.ebuild
new file mode 100644
index 000000000000..eb9e3727c510
--- /dev/null
+++ b/dev-lang/php/php-7.3.9.ebuild
@@ -0,0 +1,750 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://php.net/"
+SRC_URI="https://php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( >=sys-libs/zlib-1.2.0.4:0= )
+	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	zip-encryption? ( zip )
+"
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sodium sodium "${EPREFIX}/usr")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zip-encryption libzip "${EPREFIX}/usr")
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	# --with-pcre-valgrind cannot be enabled with system pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+		--without-pcre-valgrind
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.4.0_beta4.ebuild b/dev-lang/php/php-7.4.0_beta4.ebuild
new file mode 100644
index 000000000000..4e86c019721d
--- /dev/null
+++ b/dev-lang/php/php-7.4.0_beta4.ebuild
@@ -0,0 +1,723 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_/}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://php.net/"
+SRC_URI="https://downloads.php.net/~derick/${P/_/}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +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 selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	ffi? ( >=virtual/libffi-3.0.11 )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng: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:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	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? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.7.6 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlrpc? ( xml iconv )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	cp "${BROOT}/usr/share/aclocal/libtool.m4" build/ || die
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xmlrpc)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc)
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-external-pcre
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest
index 766f95957137..10cfd491b50f 100644
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@@ -1,5 +1,4 @@
 DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050
-EBUILD python-exec-2.4.6-r1.ebuild 4312 BLAKE2B 7fea7d02a9d4621717a700ede8b4e01ed99186675844d5d61e02ee35e64f33ce668a32f99c4bfac4ac8ab61b22bc8ce8efe485597f5ede70f27240814f38a69a SHA512 dce24155e8aa576cc1a5082a4ea508242762d5e961a03ae3bcafd7ad311a50d9e606d733c7d4a9d69053d5b5bada7216210b053b9f39f4cdd49a6e0c2ed4ebdf
-EBUILD python-exec-2.4.6.ebuild 4410 BLAKE2B f1c24ea633225370dc1390cd56861c230d28fa55f3bbf5a8588d7cd26e45bdc17a1edd163f0d6b5b01de9b8d98342013b456a5d2f9e4498fdf031cc222c76b44 SHA512 8ca031a55c23587a8129b25afcfb5bfccf2016d7bfa7dbd70bdf47d752d80d80f0edfb62aa2e811609a220d51211865de1f0a2fb9236f50aaa10110ed4cea83d
+EBUILD python-exec-2.4.6-r1.ebuild 4306 BLAKE2B 59fd3edded4bd678980e12e658996dda7bb74a140040a1902d07cfeb226bf1a2088fccc5b1f725d23d936d57404adad67e175e63b5ad7c8ca0a929142ca37230 SHA512 91017a7b1a1c10d8536d4587e0d7d27caa74cfa63d1823a354abbf47bb8e2e48022401addb3b8e7cd111a1e2ae7bbc21ae88650c795b3f573c996d220f50b596
 EBUILD python-exec-9999.ebuild 4101 BLAKE2B c9a38a540fb5548d34bb239d3f23bfd3ce3e8f8eea9e01f9d64a92218bced4e15212e25f12a28ff165a80412d7a62dad08f86f8183704da67dcff6238d6c239f SHA512 a57aa9bd6a88ea62e1f8d6b01a3c25491d4b405eda4de05f64a03575f737493700d73581ee2de2d79f3b3a681532f04433c33748a90dd615010340d44a316277
 MISC metadata.xml 589 BLAKE2B 7f9fa9750915db8b546b52a560a7fd8d9a63c4f310e423ebdc0508fe9b14363001b30f3c3db26f6d05eec8a44176d62a9335153dff2d55a41a31d3b428cc9ca6 SHA512 2ac0223af0a2cf95d2b18ef415eadb325af0094e4ec361a414b0d68b203dc1c937d3d680af96bdad1e8a48cb5786683bdbbd451f47a0f3a777c075e1690ccf7a
diff --git a/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild
index 427a37c2724a..18343cded128 100644
--- a/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Internal Python project hack.  Do not copy it.  Ever.
 IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}"
 
diff --git a/dev-lang/python-exec/python-exec-2.4.6.ebuild b/dev-lang/python-exec/python-exec-2.4.6.ebuild
deleted file mode 100644
index d4d144328e17..000000000000
--- a/dev-lang/python-exec/python-exec-2.4.6.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Kids, don't do this at home!
-inherit python-utils-r1
-PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
-
-# Inherited purely to have PYTHON_TARGET flags which will satisfy USE
-# dependencies and trigger necessary rebuilds.
-inherit python-r1
-
-DESCRIPTION="Python script wrapper"
-HOMEPAGE="https://github.com/mgorny/python-exec/"
-SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# eselect-python because of /usr/bin/python* collisions and new config
-# python versions because of missing $scriptdir/python* symlinks
-RDEPEND="
-	!<app-eselect/eselect-python-20160206
-	!<dev-lang/python-2.7.10-r4:2.7
-	!<dev-lang/python-3.3.5-r4:3.3
-	!<dev-lang/python-3.4.3-r4:3.4
-	!<dev-lang/python-3.5.0-r3:3.5"
-
-src_configure() {
-	local pyimpls=() i EPYTHON
-	for i in "${PYTHON_COMPAT[@]}"; do
-		python_export "${i}" EPYTHON
-		pyimpls+=( "${EPYTHON}" )
-	done
-
-	local myconf=(
-		--with-fallback-path="${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin"
-		--with-python-impls="${pyimpls[*]}"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	# Prepare and own the template
-	insinto /etc/python-exec
-	newins - python-exec.conf \
-		< <(sed -n -e '/^#/p' config/python-exec.conf.example)
-
-	local f
-	for f in python{,2,3}; do
-		# symlink the C wrapper for python to avoid shebang recursion
-		# bug #568974
-		dosym python-exec2c /usr/bin/"${f}"
-	done
-	for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do
-		# those are python scripts (except for new python-configs)
-		# so symlink them via the python wrapper
-		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
-	done
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then
-		# preserve current configuration
-		cp "${EROOT}"etc/python-exec/python-exec.conf \
-			"${ED}"etc/python-exec/python-exec.conf || die
-	else
-		# preserve previous Python version preference
-		local py old_pythons=()
-		local config_base=${EROOT}etc/env.d/python
-
-		# start with the 'global' preference (2 vs 3)
-		if [[ -f ${config_base}/config ]]; then
-			old_pythons+=( "$(<${config_base}/config)" )
-		fi
-
-		# then try specific py3 selection
-		for py in 3; do
-			local target=
-
-			if [[ -f ${config_base}/python${py} ]]; then
-				# try the newer config files
-				target=$(<${config_base}/python${py})
-			elif [[ -L ${EROOT}/usr/bin/python${py} ]]; then
-				# check the older symlink format
-				target=$(readlink "${EROOT}/usr/bin/python${py}")
-
-				# check if it's actually old eselect symlink
-				[[ ${target} == python?.? ]] || target=
-			fi
-
-			# add the extra target if found and != global
-			if [[ ${target} && ${old_pythons[0]} != ${target} ]]; then
-				old_pythons+=( "${target}" )
-			fi
-		done
-
-		if [[ ${old_pythons[@]} ]]; then
-			elog "You seem to have just upgraded into the new version of python-exec"
-			elog "that uses python-exec.conf for configuration. The ebuild has attempted"
-			elog "to convert your previous configuration to the new format, resulting"
-			elog "in the following preferences (most preferred version first):"
-			elog
-			for py in "${old_pythons[@]}"; do
-				elog "  ${py}"
-			done
-			elog
-			elog "Those interpreters will be preferred when running Python scripts or"
-			elog "calling wrapped Python executables (python, python2, pydoc...)."
-			elog "If none of the preferred interpreters are supported, python-exec will"
-			elog "fall back to the newest supported Python version."
-			elog
-			elog "Please note that due to the ambiguous character of the old settings,"
-			elog "you may want to modify the preference list yourself. In order to do so,"
-			elog "open the following file in your favorite editor:"
-			elog
-			elog "  ${EROOT}etc/python-exec/python-exec.conf"
-			elog
-			elog "For more information on the new configuration format, please read"
-			elog "the comment on top of the installed configuration file."
-
-			local IFS=$'\n'
-			echo "${old_pythons[*]}" \
-				>> "${ED}"etc/python-exec/python-exec.conf || die
-		fi
-	fi
-}
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index c2314aeaca12..7a98fb2679a0 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -13,11 +13,17 @@ AUX 2.6/005_no-undefined-ext.patch 486 BLAKE2B 715f952cab863847f420afb020cac6819
 AUX 2.6/009_no-gems.patch 1261 BLAKE2B 359d0a73c374e5c464eb0343d33272244bb88ba200977007a93f3c3c776779a013174fc2c97717e4ae4a1495011d3baae80e68b07433eab1320955a49aed8b59 SHA512 1607b9c2021e5b5f08cf28c64d3f3ddd077bc47df02a353182a9bc70dc6831ea18e8681d9808bb6841939d64082ae4966081014ee110d2090ec67ffe8faa9b8b
 AUX 2.6/010-default-gem-location.patch 688 BLAKE2B 4c2074d69b9fe5258a2fe0e38bb501a39f34ad1fa08ef338224edba1f06073138cbe3d831ecdf9910c989a7f0a1c6c6b73ced0d8ff212207a3a3df5f4d90b5de SHA512 65206a6ca42ade0413ae1467f41082f4a93b3166644d2504cff3d280d23da02fd41aea5aca69dd43f6081b436db90a5b1e98725d8fa51519ca302c02ec526ad7
 DIST ruby-2.4.6.tar.xz 10005544 BLAKE2B 2af984d96dad4d7ef4d467b317bd4bb54b0614d96619377bc46f7588cd1c72bee47202b61d6ec54f00113fd25672d2831221dbf0a4491aa271541a34c634ee84 SHA512 eafb2257747f99e2ed262af142e71175b70f7cceaa4d1253b92c8337f075a9a58a2d93b029d75e11a9b124f112a8f0983273b2b30afc147b5cf71a8dbb5fa0ba
+DIST ruby-2.4.7.tar.xz 10118948 BLAKE2B e85e051e9dbac8e7f87bd6187dc105b89a6bc7197c811bd51bf25b109781b8ec79c02e48887cbac841d38922d278da4ee32d8cf14e180083f4a902d77c4ec2dc SHA512 df637c5803ddd83f759e9c24b0e7ca1f6cae7c7b353409583d92dbffece0d9d02b48905d6552327a1522a4a37d4e2d22c6c11bd991383835be35e2f31739d649
 DIST ruby-2.5.5.tar.xz 11459832 BLAKE2B ced1105a87e7df8f82a65ca8d1d329d5a9d110d2f3f88b27a79262c4ac1484dda16d8646c0c03f18c1bb25f8b154075eb03a0614355ec62f677c2fa56ab3c956 SHA512 06b1d58536ebfacb7b56c1e6ed4b8ab816fadc4f48c845a452554cd262e7908199a30e5793f3cbaec2db56a8803aa5c6089abf7bf06c8fc47867e97870b7dfec
+DIST ruby-2.5.6.tar.xz 11323612 BLAKE2B 5db6d573089a9fba95a1027891a0116c14d495b342ca8f055bd1ad55942f2a15a65a61cc1a0f6f249cd10fe2f6161f3ab0066a6dbce8e480e55b76ca5bdb5cd9 SHA512 4fe5f8bad5d320f8f17b02ce15afee341e7b0074efcfd98d8944e0cb7c448e0660c4553dd5c0328ee3b49fea3247642f85c60bdce431ed57f58b6326dfd48ee1
 DIST ruby-2.6.2.tar.xz 11889840 BLAKE2B 817919c078869c2ad8d5c9d8c8b7ee77e8b0e3339c2ef662a94a666a859f762fa63c6f8534027abd368e91fe4e3e1fe68fa984cbf12f76cff8c0c66f0114914f SHA512 13f7d7b483a037378eac4bf4bebddc21d69f4e19e6bbb397dd53e7518037ae9a3aa5b41fc20bf1fe410803c6efc3a6a65a65af47648d3a93713f75cfe885326a
 DIST ruby-2.6.3.tar.xz 11904360 BLAKE2B 8113e5a19b967cdf995a3c8d3c83aeab3bf89e975d3b039c64259e97f20dbe9ebd96ada093f9d330516d16ef78bb0ecbbac8f3facd467aa13f1f70b23b992f82 SHA512 959a613f5cf5b3185a1d7a7ba0e1921166b3930f30461b391b1c9fcfe396f56dc3c736123dfc7b4e72c32a97dc5a1eb1fd7f09bcc3793a3c5526f6644ba421c8
+DIST ruby-2.6.4.tar.xz 11727940 BLAKE2B abeff89d50612d6426e1dc5fd7c15c83ef9714ddb38c64ed14bff6331c619b0a55d4a64bff49177576c3fae8cfcee30127e808f49d11b3e64a2230a043e16bd3 SHA512 930a4162fdb008d2446247908c14269fd13db4dc80bd2bb201a65a69c03f5933f97b4c5079ccd2a12db4934ff97b2debaa10a6c6f5c3060e55873f4397747eaa
 EBUILD ruby-2.4.6.ebuild 6643 BLAKE2B b2fd05964cb115f3a0b7509f176b7fb855c2feb666dd46d12bc3d7f532e9214152406df18ce2bc7081e0a0e68199e55c91c8a18aec70280e0416517c42110ea3 SHA512 f218259c93463e4a360ced99544fd147b77826ac0b40450e6461c5f34425cee7e50bcce316622dee56f71168f74720b77cd04aed80add2839b5c0c805b31af5f
-EBUILD ruby-2.5.5.ebuild 6441 BLAKE2B a0a5ba7c999975b6adf40fa29cf51b15a072303b5e0ad5d5c351ac2d578092a31ecf85f5673800fd6c03d50a639562bf5655d2633d31c5c77919153e8c62b0e1 SHA512 0d3650146960404bb44e08427c4c9970ac7f1b5e3b5e3c4d232ae695b102d573debd4a140a008e8a3ba30972a778732da37f67b14facb739b7ae5e1c8c0eec2f
+EBUILD ruby-2.4.7.ebuild 6649 BLAKE2B 475ae84754b435f87e6f8f54263f1504c587a4bf4048f7abe70d12e84e4df0e84fbd252478b4edb76ee13ddb6a94761b3045cf181976fe65dd6dc5db73ccf805 SHA512 00c66008aef631f25635425cfdd73281a61bfcbb733af0fa0fd56ac14bff03cfc14a6ec753eff157be4d9807fdde703549df877f73ee12e1543570c508edf04f
+EBUILD ruby-2.5.5.ebuild 6438 BLAKE2B 95a3c3b1766d29dc8eed92909adec55407f435b0321eda9b9b53897395afca16672b5988e46d2f6fa1e5e24c697c2a0403f8331c0efda29fd3e03bf7c20a3302 SHA512 507daf247cd2df63cb0b7ce5851cd7e4e485492ff67b092138b8d6d19c593be185ae5efab7249cdc17f3d6ab6eebdb387f8a9abf35b59155a5675723b7ba217a
+EBUILD ruby-2.5.6.ebuild 6439 BLAKE2B 5ed061b811b200af15fc839ea23d38c4de0351b6637ea282eb4de97e97dd38192e9a8f056b4e84b07dff3b933a02b928d6b92e1673b9b739599da980ff5c755e SHA512 96c263959a7a0b859987f0c2c24f7e82397a05edd7cf41ad32a058d2a57a812665ed0f4e280772c52bb5a86c06ecdf8540d0750f2a7e2a1c749fd4cfeafcdce2
 EBUILD ruby-2.6.2.ebuild 6891 BLAKE2B 5e59babfae786171568cfad90b3111cfc543667a0e41afafaa453c9447c21377c9cc20e6ffaf1d5fe6621d8664df73edf48913818b72dd725aef076164c962cc SHA512 c7dd27222c81ef318cd42f2222912ab9eab62015687d7589306457f5001f026b0f330317ce1115b78ddd23278a333c0c3b8052cd37f900966cf1f9b6652c601a
 EBUILD ruby-2.6.3.ebuild 6891 BLAKE2B 5e59babfae786171568cfad90b3111cfc543667a0e41afafaa453c9447c21377c9cc20e6ffaf1d5fe6621d8664df73edf48913818b72dd725aef076164c962cc SHA512 c7dd27222c81ef318cd42f2222912ab9eab62015687d7589306457f5001f026b0f330317ce1115b78ddd23278a333c0c3b8052cd37f900966cf1f9b6652c601a
+EBUILD ruby-2.6.4.ebuild 6891 BLAKE2B 059de0ac210fbac3e69eb0905b6363dd17c6cf9851e13d980413f4ca2d2d0f4622753a2d01764bf46b60faaacd0c85fa2ca4bf799cc13e68d68dd9a949de0686 SHA512 f2e334927ec9a3ea69f44542367d408bdba0cec9a0c511010dd1a7066cbe1aece971a73c7c816af49de8d91cfdce73cc134eeff6f3709462f3b4f6fc86014f4e
 MISC metadata.xml 445 BLAKE2B c3b5fae44894da3c78d024a376522aa2ef486cd9435351ddd7fa8b7c9afdc36969251a3b043d5890a368616f0736ae80e2a65a7342b327f30eb3497c5c02d28a SHA512 3818ac938dd6f8a05e18662f83af542fb29af00a476362592afa86bc537a74ddd0abe275784340539b2cd38f97ad1fce8b8c427c65d61c05a90b2118f2d16a91
diff --git a/dev-lang/ruby/ruby-2.4.7.ebuild b/dev-lang/ruby/ruby-2.4.7.ebuild
new file mode 100644
index 000000000000..728daa1020f2
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.4.7.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	virtual/libffi:=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	>=app-eselect/eselect-ruby-20161226
+	!<dev-ruby/rdoc-3.9.4
+	!<dev-ruby/rubygems-1.8.10-r1"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24]
+	>=dev-ruby/minitest-5.10.1[ruby_targets_ruby24]
+	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24]
+	>=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24]
+	>=dev-ruby/rake-12.0.0[ruby_targets_ruby24]
+	>=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24]
+	>=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby24]
+	>=dev-ruby/json-2.0.2[ruby_targets_ruby24]
+	rdoc? ( >=dev-ruby/rdoc-5.1.0-r1[ruby_targets_ruby24] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${SLOT}/{002,005,009,012}*.patch
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700. Use explicit version numbers to ensure rm fails when they
+	# change so we can update dependencies accordingly.
+	rm -f gems/{did_you_mean-1.1.0,minitest-5.10.1,net-telnet-0.1.1,power_assert-0.4.1,rake-12.0.0,test-unit-3.2.3,xmlrpc-0.2.1}.gem || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	# Fix a hardcoded lib path in configure script
+	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+		configure.in || die "sed failed"
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules= myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+	# SuperH needs this
+	use sh && append-flags -mieee
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--docdir=${EPREFIX}/usr/share/doc/${P} \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 V=1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake V=1 DESTDIR="${D}" install || die "make install failed"
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	fi
+
+	dodoc ChangeLog NEWS doc/NEWS* README* || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/ruby/ruby-2.5.5.ebuild b/dev-lang/ruby/ruby-2.5.5.ebuild
index dd8299a047ab..f316ccd5960f 100644
--- a/dev-lang/ruby/ruby-2.5.5.ebuild
+++ b/dev-lang/ruby/ruby-2.5.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.5.6.ebuild b/dev-lang/ruby/ruby-2.5.6.ebuild
new file mode 100644
index 000000000000..36623a66a2fc
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.5.6.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	virtual/libffi:=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	>=app-eselect/eselect-ruby-20171225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25]
+	>=dev-ruby/minitest-5.10.3[ruby_targets_ruby25]
+	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25]
+	>=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25]
+	>=dev-ruby/rake-12.3.0[ruby_targets_ruby25]
+	>=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25]
+	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby25]
+	>=dev-ruby/json-2.0.2[ruby_targets_ruby25]
+	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby25] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${SLOT}/{001,005,011}*.patch
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700. Use explicit version numbers to ensure rm fails when they
+	# change so we can update dependencies accordingly.
+	rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules= myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+	# SuperH needs this
+	use sh && append-flags -mieee
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--docdir=${EPREFIX}/usr/share/doc/${P} \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 V=1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake V=1 DESTDIR="${D}" install || die "make install failed"
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	fi
+
+	dodoc ChangeLog NEWS doc/NEWS* README* || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/ruby/ruby-2.6.4.ebuild b/dev-lang/ruby/ruby-2.6.4.ebuild
new file mode 100644
index 000000000000..4b9dd9787e68
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.6.4.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc )
+	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	virtual/libffi:=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	>=app-eselect/eselect-ruby-20171225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26]
+	>=dev-ruby/minitest-5.11.3[ruby_targets_ruby26]
+	>=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26]
+	>=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26]
+	>=dev-ruby/rake-12.3.2[ruby_targets_ruby26]
+	>=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26]
+	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby26]
+	>=dev-ruby/bundler-1.17.2[ruby_targets_ruby26]
+	>=dev-ruby/json-2.0.2[ruby_targets_ruby26]
+	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	# 005 does not compile bigdecimal and is questionable because it
+	# compiles ruby in a non-standard way, may be dropped
+	eapply "${FILESDIR}"/2.6/010*.patch
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr gems/* || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules= myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+	# SuperH needs this
+	use sh && append-flags -mieee
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--docdir=${EPREFIX}/usr/share/doc/${P} \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable jit jit-support ) \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no \
+		|| die "econf failed"
+
+	# Makefile is broken because it lacks -ldl
+	rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS="" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 V=1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	# Create directory for the default gems
+	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install || die "make install failed"
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	fi
+
+	dodoc ChangeLog NEWS doc/NEWS* README* || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 61c7fd1c8f86..924802b9d549 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -7,14 +7,14 @@ DIST swipl-7.6.4.tar.gz 16777875 BLAKE2B 94409966362e649f4748b94b4ec25415bb827c7
 DIST swipl-8.0.2.tar.gz 10413446 BLAKE2B 72214b86cb7276ce528b2791ed08273d568952d5a7109882a1a485c183252f5e9eb90ae18e3712e2adf9f0521c447b06daa455ee637298a64e476e675211c0bc SHA512 88b42846edefa45d67cf016f2d8bca5dfbf153667dcec36785dc441208e09c1e45cf979a7b6862de2bdf3dce4947f2d8c2e445714798de84f5e1841df57dbe96
 DIST swipl-8.0.3.tar.gz 10418553 BLAKE2B d7d381a3070384164f9788060e1c431cc4658dd3e2144fc4c186c9f5395fb7356593766dcaff3ff424f19f917c8a4b56da31b019bd2206a7f794ece549043b76 SHA512 e3a0788befb5499be6f70524ef398dc3282a38891f20519dd23ec92f216fc1919a76656e4b648c3dc9d94e578dc2663439ff976eb52ca0dba5a6594f8d4d3037
 DIST swipl-8.1.10.tar.gz 10721820 BLAKE2B 03676d7ccdf9343bccecd4113c663b0a6db34a373cf1e3e2ec0a52f0757e2acaac835296b0e7f36f71fe427b56b3574943e17ea149d0247c782298d0e04276cf SHA512 fe7bbc33aeeeba9a84c2416cc45492bd218da27532ab42b731ab5f238a3de8858d984c8129a22f79d07ceedcb78cc076198b1714bd199283a0dea41762486f55
-DIST swipl-8.1.8.tar.gz 10657374 BLAKE2B bfa858e88dae100f7415cb4eb307c51b62080fa34a9a3999672ae5f529e4b0a4aa6d2ceb665e451262ba3418722892baa95c6f9dd86946be49f12bd2f2cda113 SHA512 99443657235900327e4e2839da26c4a8c65c5905118766bcea6402516d520aae206b5ba381c99357ae5b18b983490099d820e083f47139b7cc2d2600908ae2d2
-DIST swipl-8.1.9.tar.gz 10720170 BLAKE2B dbfd314870916f79d3d9ab53d40c290558c08ccad7a293d0939c324c67cec13e1589c577205ee1b51d76b9010015fa7118e3b18ded819dd886c1cd28661e82ba SHA512 9fc49d11d7c113971f05ec6d2d2d1feb07cbbd4cf117d4eed2f6e752798729e5d92b8299cc2888771acfc998dc825d490e7985594ba4b4a8f305b65ced5f371f
+DIST swipl-8.1.11.tar.gz 10755459 BLAKE2B 8201ca316b9fdd596d5f51441a85e970fe6526393aca10a2594a798a5864f7fbe2bae67fdd6f42c1cd7138f83e2db7ea96be9286f2d14269fb7fee67d1083805 SHA512 b5e804aad27860ae2ec70e1cd3b1eb2f357924fa3001df95f505d4ac1de5fa63656564fcec647639a47e576b6c25da7ff90cfbc3ac5108da8fb25087bbcf8ee9
+DIST swipl-8.1.12.tar.gz 10762243 BLAKE2B a495b471fc4bbe296e5a7821fb51eba960056bd155f5c33a4d1764556209d6be11229d358aa16e57c4604f0ea6d0a6a73c61d67b7f535c5ed2f5a654c7ea2a17 SHA512 daae1a015ea7089a1ad2ef4a6def8d65fcac84bb78bff06a4012b39cf797c2109f2ce64ff847fbc9bde833bbf3f88ebb0d43884c3989630ca1d921ed4e3c19a2
 EBUILD swi-prolog-7.4.2.ebuild 3398 BLAKE2B 368ef93ceb17042a28699f9aa469e6b5c39aa29154b810e43fd050ab3bc1079f83680cfac8f4108c7c297a51e9bdd28357a0b6241c08faef3ea5f81ab1605558 SHA512 76d094f62e442ac86d32eaf467179fdcf4d4edf6034f711104e91f8a01b7e343208ef0b6e492ed18c8c0605b96a48f1adef8f3903f861c716e882cb9695b0dd2
 EBUILD swi-prolog-7.6.3.ebuild 3395 BLAKE2B 6445c399d7a7518bcd4ce05b9ea0bf50c7d0297d5a24d9ef84a48c36600077cea8c8b77b010d28e25dfe0766e12d1f560f42e5597a602f6bdfc7351ea6e0fa62 SHA512 830766267d3e4b60897dfcdab5263cee600ccfa2cd80f970ef3b4c3695cc3ddf9989ae85527f45cdf124898210f108a98a32a613de2543a8db813d42482b0687
 EBUILD swi-prolog-7.6.4.ebuild 3456 BLAKE2B 55d9eb2b52f47dc7fd5df9f2743775e7aabd4f070d93e31f51b038f278604909f1f48dbb4cbd12ba96614f8619923712c465d424eb224874ba158f1670d615d5 SHA512 cf64a47e39b21557915fcd6e88ac5bb01fc56bb26afebf81dedaa087ac12a3c5952383a55594dbe22de8885c6a3afd47858963a4c0c68f705be20045a518d12d
 EBUILD swi-prolog-8.0.2.ebuild 2528 BLAKE2B 13ea227e522a615d4f59f1a2b47eab60563e82e1848de689f6c0308e75043ddfade78a66ccc9408d4a844a3cded25d36dfcdf589dc6202f618d5d5c26e00bcb7 SHA512 f89d931bd455d68539369b8970f65b04baee1dac772a00e7b3f204424b278862a5b0fa34d76ae819825a21ec18420241b9b395e66b87799a1c4bc78dd6e91535
 EBUILD swi-prolog-8.0.3.ebuild 2463 BLAKE2B 1aee3b4be56dc6e445fcefc0a9843cb06084cd1e087849266659f9e70152713804b7f75fe189b2738734aa5e8c4be3aeb570fbfab4355bc4f6de0a18dd34e0ad SHA512 5f6b2960cf8febc69ae1e7cbc0470d33be40ec9f07d7ad00d8e4b20d96848010a99a725a2f922b212b9ed1e03c2bc1933e703e82bcaff78d4d63ff82bf9fc1aa
 EBUILD swi-prolog-8.1.10.ebuild 2465 BLAKE2B 1fa3a76348cca7b520023a84db9d9b2beeb07ecdea1a289a47d7eb52f0b3d06f99c1e2355136ce20809c885dbb698c609f02e76f393859c043bd4998f4b5a4a9 SHA512 38405b19366bf1c35ea8dccfd28e64c7525091053f7dd919ecc0ff7a3748b7f0bab6a1a09d88b32d83928a207ebb925df9686c527b306b4d967469d42f665954
-EBUILD swi-prolog-8.1.8.ebuild 2465 BLAKE2B 1fa3a76348cca7b520023a84db9d9b2beeb07ecdea1a289a47d7eb52f0b3d06f99c1e2355136ce20809c885dbb698c609f02e76f393859c043bd4998f4b5a4a9 SHA512 38405b19366bf1c35ea8dccfd28e64c7525091053f7dd919ecc0ff7a3748b7f0bab6a1a09d88b32d83928a207ebb925df9686c527b306b4d967469d42f665954
-EBUILD swi-prolog-8.1.9.ebuild 2465 BLAKE2B 1fa3a76348cca7b520023a84db9d9b2beeb07ecdea1a289a47d7eb52f0b3d06f99c1e2355136ce20809c885dbb698c609f02e76f393859c043bd4998f4b5a4a9 SHA512 38405b19366bf1c35ea8dccfd28e64c7525091053f7dd919ecc0ff7a3748b7f0bab6a1a09d88b32d83928a207ebb925df9686c527b306b4d967469d42f665954
+EBUILD swi-prolog-8.1.11.ebuild 2465 BLAKE2B 1fa3a76348cca7b520023a84db9d9b2beeb07ecdea1a289a47d7eb52f0b3d06f99c1e2355136ce20809c885dbb698c609f02e76f393859c043bd4998f4b5a4a9 SHA512 38405b19366bf1c35ea8dccfd28e64c7525091053f7dd919ecc0ff7a3748b7f0bab6a1a09d88b32d83928a207ebb925df9686c527b306b4d967469d42f665954
+EBUILD swi-prolog-8.1.12.ebuild 2465 BLAKE2B 1fa3a76348cca7b520023a84db9d9b2beeb07ecdea1a289a47d7eb52f0b3d06f99c1e2355136ce20809c885dbb698c609f02e76f393859c043bd4998f4b5a4a9 SHA512 38405b19366bf1c35ea8dccfd28e64c7525091053f7dd919ecc0ff7a3748b7f0bab6a1a09d88b32d83928a207ebb925df9686c527b306b4d967469d42f665954
 MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3
diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.8.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.11.ebuild
index b986aa50d899..b986aa50d899 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.1.8.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.1.11.ebuild
diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.9.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.12.ebuild
index b986aa50d899..b986aa50d899 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.1.9.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.1.12.ebuild
diff --git a/dev-lang/teyjus/Manifest b/dev-lang/teyjus/Manifest
index cecf92f59805..678229e840d0 100644
--- a/dev-lang/teyjus/Manifest
+++ b/dev-lang/teyjus/Manifest
@@ -1,7 +1,9 @@
 AUX 50teyjus-gentoo.el 74 BLAKE2B 877ca25928f4a497102a516f3495691cab2ac7421a22f95c687d8e7aaf0907fd638e234bb9e756f896f19bda117cb3ae01e1e98b251038315151c341f5615c24 SHA512 febf91bf3393d91cf1ecdd38b1b9f2e62f7bf8ca8de79e6a006238a82b909d46d7e0e4c92bf8ead39b5142710f548a8829b4e9473340225ecad9fa46b0972f35
 AUX teyjus-2.0.2-flags.patch 375 BLAKE2B 22116727c8cb10d2a4149315c6acc6f9245d1949737628f9365d6b8031c39322ac91178693ad99b494d1c49f2db673bb193b0fd96d33a3f013b76080771b35d8 SHA512 9ef27bab05ac1cb0c64ae7141984dcf74e0b7bb9bbc223b78ce649d720ee110416e639bc49b28a12a30fe8a75cae9f346f6a1b8763a14c40a0f7e20125089eb0
+AUX teyjus-2.1-p001-Fixes-arity-for-pervasive-modulo-operation.patch 1144 BLAKE2B 1ed38015d73e575950a06cbb343f5cc3ed93f0e1da739c73189da3200cfcb59b72846c7c9e02f8328d968ef0c0b68b2d75422dbec4b0857ace80248b01784bc1 SHA512 ebe80c760007f68b14b87ee178cf0c031cd851e3c9d935a87469fe20f28048ded42a6898441bdd0fa730d2d8edb2d8b6122535ef167bf57180397d6638f354f1
+AUX teyjus-2.1-p002-Add-string-literals-from-proper-character-groups.patch 2083 BLAKE2B 4480c4cc607988fe4b55e5d0405298d37ca3f7364a694b750dd2a544a5cee71d27f84745a5559b33ed67ec215b389b349e9a73fa3d65ce6f69e949b6bc19e205 SHA512 9bca80da36bcb300fca23553205e1ce459e7b52e6d2b3a8b27e9e330413cd8b49ca928bd92d47fe16546854f945d05e2280143ff75cc45aa93d7850c2da8a916
+AUX teyjus-2.1-p003-Removing-deprecated-function-String.set.patch 1599 BLAKE2B e264e64eda3b877e1042fbef4173d4483697fab19e33ceb51176c65a57df651cc0566df486ab551cc50cbf43a47bf60cdfdbd72cc42a2156b195b4f711c06fc3 SHA512 627dd8328a33fa3489ba3da59b4e8c43202b327c27ddecbef2beeddaeecff9f749522d7d9e3e105781b1e60cd633a87aedff39a7e6aa0ec8e1f76556e58ff1f3
 DIST teyjus-2.1.tar.gz 723763 BLAKE2B ab6a98c2d2291620b586ab0b419a214b0f7c0b27aad444324e5a417c1a0b27382e2d5c622f798ea88cab77853bca3305ec37904c50a7304ace20237afb993b91 SHA512 1f71d19502f4f4da00f635d2c3d4e141403182d65f039e0d43660edf84c5fcd900e7225ac92dc5bdbe0c8379c4e2ce6e27879af504fcfafddf2695a0c8a13379
-DIST teyjus-source-2.0-b2.tar.gz 465815 BLAKE2B 29d8cc2626144a77551a4cb47631a3b55d6edc33b3bf957c2b732144ce9566adb8d472b7ac423168605dcbabab507a4a3cd05b465b02fa0bbc3967a57183fc7c SHA512 071a25cd5341f7562f07dcaae1f87c35eb394ddab94a5160826c7fb2d9a51efea909b41947205503ebcc58df04388baf9eaf9f5a614186701940da29db1c1b29
-EBUILD teyjus-2.0.2.ebuild 3027 BLAKE2B 92c93ec4d7025691ec8af11de72de6dd6fc9e4e8188567b6daf37e20f0c990d2c6c06b795fb2b2b1cf33bd0c4e0a6bce262470f09b135938b358f06f8528cbe2 SHA512 85c11036d4fd3027fbea2136f6b3ac8faad53049bbef75ed2b448ef55e27e8b59bbee2e321b8f374b7de5602a810eeb4b3429fc97a71851a4447e8a4b23b7735
+EBUILD teyjus-2.1-r1.ebuild 2938 BLAKE2B c713ad568af551adc3f9ecd1e8e71e44d4956e4377de75fa8cefbe156ee2fcd0e55516f2b5a30f899e981ccd129a7ca6f723f2b6ece9140858731fe7f45e832a SHA512 c2dff73bc04710a4b92432d3334ab6cefd1c2d422fbc525bc7adcb4c8d5e5de6b6d32e3f1cba7702da4cefd88b826cf47dc5ca31e5cd1ffdcb6dfce89f991e22
 EBUILD teyjus-2.1.ebuild 2897 BLAKE2B de6b991a07ded4592fa66307d461e36cc3a8f23a40c7e62987a18c2a7576c79c1b0bc02e09703e2165448a258a66b42dd14e465ee52c2072ecbf26b1dd822d67 SHA512 8f33c998b725169d57808b0a69578a20ffd8f54192a55d8f25761b6a38ea18b9ba96c1d7775447ba17ee245a5f1376476474dbf4e5ac5afd493c530e81f19ea7
 MISC metadata.xml 1653 BLAKE2B a9c2315795d7eb61708ff4b163a0588900bcaea661b052a24f83834acbded91f3dabaa0a14525e1ff729175d7c17ac393946c21ae801b60efd591448b07b7c1c SHA512 5b82a25d9ef5e24c4c9bbd633b7de98f92ce79ae041c3056df6dd0471824c98884d1ef608352431c34aecdaa79736c7f163762206adb9207eeebca2886f5aa1b
diff --git a/dev-lang/teyjus/files/teyjus-2.1-p001-Fixes-arity-for-pervasive-modulo-operation.patch b/dev-lang/teyjus/files/teyjus-2.1-p001-Fixes-arity-for-pervasive-modulo-operation.patch
new file mode 100644
index 000000000000..0eb366f7c840
--- /dev/null
+++ b/dev-lang/teyjus/files/teyjus-2.1-p001-Fixes-arity-for-pervasive-modulo-operation.patch
@@ -0,0 +1,28 @@
+commit 4e53477a6685b515363f7123dbeeece4f60f103a
+Author: Fabien Renaud <fafounet@gmail.com>
+Date:   Sun Aug 9 21:15:16 2015 +0200
+
+    Fixes arity for pervasive modulo operation
+
+diff --git a/source/tables_gen/pervasives/pervasives.in b/source/tables_gen/pervasives/pervasives.in
+index 2a332da..fcac330 100644
+--- a/source/tables_gen/pervasives/pervasives.in
++++ b/source/tables_gen/pervasives/pervasives.in
+@@ -91,8 +91,6 @@
+       TYPE      7      int -> int
+         /* unary minus on integers */
+        56  %i~        intuminus  0 0  0  TRUE   FALSE  MAX PREFIX   NOCODE -
+-        /* modulus */
+-       61  mod        mod        0 0  0  TRUE   TRUE   160 INFIXL   NOCODE 
+         /* integer abs */
+        63  %iabs        iabs       0 0  0  TRUE   TRUE   0   NOFIXITY NOCODE abs
+       ;;
+@@ -107,6 +105,8 @@
+        59  %i*        intmult    0 0  0  TRUE   FALSE  160 INFIXL   NOCODE *
+         /* integer division */
+        60  div        intdiv     0 0  0  TRUE   FALSE  160 INFIXL   NOCODE
++        /* modulus */
++       61  mod        mod        0 0  0  TRUE   TRUE   160 INFIXL   NOCODE
+       ;;
+ 
+       /* int -> int -> o */  
diff --git a/dev-lang/teyjus/files/teyjus-2.1-p002-Add-string-literals-from-proper-character-groups.patch b/dev-lang/teyjus/files/teyjus-2.1-p002-Add-string-literals-from-proper-character-groups.patch
new file mode 100644
index 000000000000..0d5e4acbb913
--- /dev/null
+++ b/dev-lang/teyjus/files/teyjus-2.1-p002-Add-string-literals-from-proper-character-groups.patch
@@ -0,0 +1,45 @@
+commit 78ba2ba7e42d06e64a7a10915259a4e419aa4ce4
+Merge: 4e53477 bb9ba6a
+Author: fafounet <fafounet@gmail.com>
+Date:   Sat Feb 27 13:10:59 2016 +0100
+
+    Merge pull request #104 from robblanco/string-literals
+    
+    Add string literals from proper character groups
+
+commit bb9ba6a57969c9eeab5841923ca822756860163c
+Author: Rob Blanco <roberto.blanco@inria.fr>
+Date:   Wed Feb 24 19:01:06 2016 +0100
+
+    Add string literals from proper character groups
+    
+    Escape prefixes were included in the strings being passed to the
+    character composition functions, resulting in incorrect characters
+    being generated (in the case of control characters) or exceptions
+    being thrown (in octal and hex literals, in combination with the
+    OCaml-specific prefixes).
+
+diff --git a/source/compiler/lplex.mll b/source/compiler/lplex.mll
+index 6cb28cd..6b2576a 100644
+--- a/source/compiler/lplex.mll
++++ b/source/compiler/lplex.mll
+@@ -215,11 +215,14 @@ and stringstate = parse
+ | "\\\""        {addChar '"'; stringstate lexbuf}
+ | "\"\""        {addChar '"'; stringstate lexbuf}
+ 
+-| "\\^"['@'-'z'] as text            {addControl text; stringstate lexbuf}
+-| "\\" OCTAL as text                {addOctal text; stringstate lexbuf}
+-| "\\" (OCTAL OCTAL OCTAL) as text  {addOctal text; stringstate lexbuf}
+-| "\\x" HEX as text                 {addHex text; stringstate lexbuf}
+-| "\\x" (HEX HEX) as text           {addHex text; stringstate lexbuf}
++| "\\^" (['@'-'z'] as text)         {addControl (String.make 1 text);
++                                     stringstate lexbuf}
++| "\\" (OCTAL as text)              {addOctal (String.make 1 text);
++                                     stringstate lexbuf}
++| "\\" (OCTAL OCTAL OCTAL as text)  {addOctal text; stringstate lexbuf}
++| "\\x" (HEX as text)               {addHex (String.make 1 text);
++                                     stringstate lexbuf}
++| "\\x" (HEX HEX as text)           {addHex text; stringstate lexbuf}
+ 
+ | "\\x" _         {Errormsg.error lexbuf.lex_curr_p 
+                     "Illegal hex character specification";
diff --git a/dev-lang/teyjus/files/teyjus-2.1-p003-Removing-deprecated-function-String.set.patch b/dev-lang/teyjus/files/teyjus-2.1-p003-Removing-deprecated-function-String.set.patch
new file mode 100644
index 000000000000..a6724a9093ac
--- /dev/null
+++ b/dev-lang/teyjus/files/teyjus-2.1-p003-Removing-deprecated-function-String.set.patch
@@ -0,0 +1,51 @@
+commit 38772fa56ed7edef88e71df8a69eea4f341968ed
+Author: Giselle Reis <giselle.mnr@gmail.com>
+Date:   Fri Jul 26 15:28:03 2019 +0300
+
+    Removing deprecated function String.set
+    
+    Teyjus will not build with a typecheck error
+    because String.set takes bytes, not a string. This
+    commit fixes this issue.
+    String.set is deprecated, so Bytes.set is used
+    instead.
+
+diff --git a/source/compiler/bytecode.ml b/source/compiler/bytecode.ml
+index 957c276..655ddab 100644
+--- a/source/compiler/bytecode.ml
++++ b/source/compiler/bytecode.ml
+@@ -248,28 +248,28 @@ let readWord () = readNBytes (getInChannel ()) (getWordSize ())
+ let readString () =
+   let input = getInChannel () in
+   let length = readNBytes input 4 in
+-  let myString = String.make length ' ' in
++  let myString = Bytes.make length ' ' in
+   let rec readStringAux index =
+ 	if (index = length) then ()
+ 	else 
+-	  (String.set myString index (input_char input);
++	  (Bytes.set myString index (input_char input);
+ 	   readStringAux (index + 1))
+   in
+   readStringAux 0;
+-  myString 
++  Bytes.to_string myString 
+ 
+ let readLongString () = 
+   let input = getInChannel() in
+   let length = readNBytes input 4 in
+-  let myString = String.make length ' ' in
++  let myString = Bytes.make length ' ' in
+   let rec readStringAux index =
+ 	if (index = length) then ()
+ 	else 
+-	  (String.set myString index (input_char input);
++	  (Bytes.set myString index (input_char input);
+ 	   readStringAux (index + 1))
+   in
+   readStringAux 0;
+-  myString 
++  Bytes.to_string myString 
+ 
+ (* skip n bytes   *)
+ let skipNBytes numberBytes =
diff --git a/dev-lang/teyjus/teyjus-2.0.2.ebuild b/dev-lang/teyjus/teyjus-2.0.2.ebuild
deleted file mode 100644
index 41a6ffe77a02..000000000000
--- a/dev-lang/teyjus/teyjus-2.0.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit elisp-common multilib versionator
-
-MY_PN="${PN}-source"
-MY_P=$(version_format_string '${MY_PN}-$1.$2-b$3')
-
-DESCRIPTION="Higher-order logic programming language Lambda Prolog"
-HOMEPAGE="http://teyjus.cs.umn.edu/"
-SRC_URI="https://teyjus.googlecode.com/files/${MY_P}.tar.gz"
-
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-IUSE="emacs examples +ocamlopt"
-
-RDEPEND=">=sys-devel/binutils-2.17:*
-	>=sys-devel/gcc-2.95.3:*
-	>=dev-lang/ocaml-3.10[ocamlopt?]
-	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
-	dev-util/omake"
-
-S=${WORKDIR}/${PN}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${PN}-2.0.2-flags.patch"
-	local cflags=""
-	for i in ${CFLAGS}
-	do
-		cflags="${cflags} -ccopt ${i}"
-	done
-	local lflags=""
-	for i in ${LDFLAGS}
-	do
-		lflags="${lflags} -cclib ${i}"
-	done
-	sed -e "s@CFLAGS +=@CFLAGS += ${CFLAGS}@" \
-		-e "s@LDFLAGS +=@LDFLAGS += ${LDFLAGS}@" \
-		-e "s@OCAMLFLAGS +=@OCAMLFLAGS +=${cflags}${lflags}@" \
-		-i "${S}/source/OMakefile" \
-		|| die "Could not set flags in ${S}/teyjus/source/OMakefile"
-	if has_version ">=dev-lang/ocaml-4.03.0"; then
-		# bug 591368
-		pushd "${S}/source" || die
-		sed -e 's@$(FNT)/ccode_stubs@$(FNT)/ccode_stubs_c@' \
-			-e 's@\(FNT_ML_TO_C\[\] =\)@\1\n    $(FNT)/ccode_stubs@' \
-			-i OMakefile || die
-		cd "${S}/source/front" || die
-		mv ccode_stubs.mli ccode_stubs.ml || die
-		mv ccode_stubs.c ccode_stubs_c.c || die
-		popd || die
-	fi
-}
-
-src_compile() {
-	addpredict "/usr/$(get_libdir)/omake/Pervasives.omc"
-	addpredict "/usr/$(get_libdir)/omake/build/C.omc"
-	addpredict "/usr/$(get_libdir)/omake/build/Common.omc"
-	addpredict "/usr/$(get_libdir)/omake/configure/Configure.omc"
-	addpredict "/usr/$(get_libdir)/omake/build/OCaml.omc"
-	omake --verbose all || die "omake all failed"
-	if use emacs ; then
-		pushd "${S}/emacs" || die "Could change directory to emacs"
-		elisp-compile *.el || die "emacs elisp compile failed"
-		popd
-	fi
-}
-
-ins_example_dir() {
-	dodir "/usr/share/${PN}/examples/${1}"
-	insinto "/usr/share/${PN}/examples/${1}"
-	cd "${S}/examples/${1}"
-	doins *
-}
-
-src_install() {
-	newbin source/tjcc.opt tjcc
-	newbin source/tjdepend.opt tjdepend
-	newbin source/tjdis.opt tjdis
-	newbin source/tjlink.opt tjlink
-	newbin source/tjsim.opt tjsim
-	dodoc README
-	if use emacs ; then
-		elisp-install ${PN} emacs/*.{el,elc}
-		cp "${FILESDIR}"/${SITEFILE} "${S}"
-		sed -e 's@/usr/bin/tjcc@'${EPREFIX}/usr/bin/tjcc'@' -i ${SITEFILE} \
-			|| die "Could not set tjcc executable path in emacs site file"
-		elisp-site-file-install ${SITEFILE}
-	fi
-	if use examples; then
-		ins_example_dir "handbook/logic"
-		ins_example_dir "handbook/progs"
-		ins_example_dir "misc"
-		ins_example_dir "ndprover"
-		ins_example_dir "pcf"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		ewarn "For teyjus emacs, add this line to ~/.emacs"
-		ewarn ""
-		ewarn "(require 'teyjus)"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/teyjus/teyjus-2.1-r1.ebuild b/dev-lang/teyjus/teyjus-2.1-r1.ebuild
new file mode 100644
index 000000000000..4a0f0073b3ed
--- /dev/null
+++ b/dev-lang/teyjus/teyjus-2.1-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit elisp-common multilib
+
+DESCRIPTION="Higher-order logic programming language Lambda Prolog"
+HOMEPAGE="http://teyjus.cs.umn.edu/"
+SRC_URI="https://github.com/teyjus/teyjus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+IUSE="emacs examples +ocamlopt"
+
+RDEPEND=">=sys-devel/binutils-2.17:*
+	>=sys-devel/gcc-2.95.3:*
+	>=dev-lang/ocaml-3.10[ocamlopt?]
+	emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}
+	app-text/dos2unix
+	dev-util/omake"
+
+SITEFILE=50${PN}-gentoo.el
+
+PATCHES=( "${FILESDIR}/${P}-p001-Fixes-arity-for-pervasive-modulo-operation.patch"
+		  "${FILESDIR}/${P}-p002-Add-string-literals-from-proper-character-groups.patch"
+		  "${FILESDIR}/${P}-p003-Removing-deprecated-function-String.set.patch")
+
+src_prepare() {
+	find . -type f -exec dos2unix {} \;
+	default
+	local cflags=""
+	for i in ${CFLAGS}
+	do
+		cflags="${cflags} -ccopt ${i}"
+	done
+	local lflags=""
+	for i in ${LDFLAGS}
+	do
+		lflags="${lflags} -cclib ${i}"
+	done
+	sed	-e "s@\(OCAMLFLAGS= -w -A\)@\1 ${cflags}${lflags}@" \
+		-e "s@\(CFLAGS +=\) -g@\1 ${CFLAGS}\nLDFLAGS += ${LDFLAGS}@" \
+		-i "${S}/source/OMakefile" \
+		|| die "Could not set flags in ${S}/teyjus/source/OMakefile"
+	if has_version ">=dev-lang/ocaml-4.03.0"; then
+		# bug 591368
+		pushd "${S}/source" || die
+		sed -e 's@$(FNT)/ccode_stubs@$(FNT)/ccode_stubs_c@' \
+			-e 's@\(FNT_ML_TO_C\[\] =\)@\1\n    $(FNT)/ccode_stubs@' \
+			-i OMakefile || die
+		cd "${S}/source/front" || die
+		mv ccode_stubs.mli ccode_stubs.ml || die
+		mv ccode_stubs.c ccode_stubs_c.c || die
+		popd || die
+	fi
+}
+
+src_compile() {
+	export HOME="${T}"
+	omake --verbose --force-dotomake all || die "omake all failed"
+	if use emacs ; then
+		pushd "${S}/emacs" || die "Could change directory to emacs"
+		elisp-compile *.el || die "emacs elisp compile failed"
+		popd
+	fi
+}
+
+ins_example_dir() {
+	dodir "/usr/share/${PN}/examples/${1}"
+	insinto "/usr/share/${PN}/examples/${1}"
+	cd "${S}/examples/${1}"
+	doins *
+}
+
+src_install() {
+	newbin source/tjcc.opt tjcc
+	newbin source/tjdepend.opt tjdepend
+	newbin source/tjdis.opt tjdis
+	newbin source/tjlink.opt tjlink
+	newbin source/tjsim.opt tjsim
+	dodoc README.md QUICKSTART
+	if use emacs ; then
+		elisp-install ${PN} emacs/*.{el,elc}
+		cp "${FILESDIR}"/${SITEFILE} "${S}"
+		sed -e 's@/usr/bin/tjcc@'${EPREFIX}/usr/bin/tjcc'@' -i ${SITEFILE} \
+			|| die "Could not set tjcc executable path in emacs site file"
+		elisp-site-file-install ${SITEFILE}
+	fi
+	if use examples; then
+		ins_example_dir "handbook/logic"
+		ins_example_dir "handbook/progs"
+		ins_example_dir "misc"
+		ins_example_dir "ndprover"
+		ins_example_dir "pcf"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		ewarn "For teyjus emacs, add this line to ~/.emacs"
+		ewarn ""
+		ewarn "(require 'teyjus)"
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 14687535ac48..92867d7b0c11 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -3,16 +3,20 @@ AUX 0.40-valadoc-doclets-data-parallel-installable.patch 6105 BLAKE2B 24f3a2c441
 AUX 0.44-valadoc-doclets-data-parallel-installable.patch 6063 BLAKE2B d27b69ab82a789f73e9ba02ef10d3865452a5d5532215e44533012be29d36d40496346a0557ee90831fbe2cf1da9e77e56b30c3f1e988c051b97142d12952931 SHA512 d5174b6dbc887f25f90e400ae569152a998da3df3e9ca4ea5f450240b1982b7a118ddbce7814b98e966e384b956c02389b34200b6a1ecbf4e634fdc07421809a
 DIST vala-0.36.18.tar.xz 2905668 BLAKE2B ed7f8a38e99fd75945071cf54190631b0ccddbb682da9790bb07b4d334063679bfb002bcf6e5c6c1807ca2b1c4e80659441779c113a7b05f9b4ff291f5ada201 SHA512 69d76fddee8e52e54dc8a3dbe1c0ffc5aeaede096f52614c3a7e18d28ec7a6a31aa617719a4d27a7a15867cd740888f5b381cd612d8fc010f1ea9fd9389d0655
 DIST vala-0.36.19.tar.xz 2909240 BLAKE2B 8b41ab516a6e5c9eef6e4f5590cfa49892e69a8bf28837c2816fb2024a91d614df3b0007554aad3ab8a87b18f174c5571289e0264d3a724fb223276d03a3001b SHA512 cb275146537f3cf0678d7de5c0ee1b1b364fef11099f3c3aaba48c1d0b839fd313cc04bef981f36e5f08b3cbb08cd3aef930357e4ee1ed52fefef446aede6449
+DIST vala-0.36.20.tar.xz 2918672 BLAKE2B 9c2c46992444fafd173f767a4a10ac185b0c49db0ede3cb52dec10da08ab3370adb4445087b24c91c9126e8586418a149ac783b3de92cac6c4badd488f3dc56f SHA512 21ca0573a2f9d945a362f7f15da7db25532fd7b19a0aa0442243b95df0568b7a88ae94d0659af44f6f57e364f4370de361102e7e46a070487985e7cb5d81277c
 DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
 DIST vala-0.40.15.tar.xz 3406020 BLAKE2B aaa2967a140fae94b4609f4b54f2e37c71fe79453cb3ea30568ee018d2227d1c45061440ad632bcfc53650fbe4dba2f062d8095f95936623a49efb5e97f2c2bb SHA512 abb918b00afab7a85586f9bd26b78be87e19b725752cbb77dd428da2e6241b1f3d4aaa70e3e6daf6f373562d02f1ff8016e6c9107e2bf088d9b84334adecdda2
+DIST vala-0.40.16.tar.xz 3412776 BLAKE2B 0cfe072ce3dfd8b95e804582899ff002869bc005b93ad1ba68e9b085e12444a3ef967c6282d65bab7f8302018edc075077ae8de65182b9123f8f74a91ea062bf SHA512 e37c8573fe6104c0ad6f29748cd28564638d62ebe499ce084481c74d2601a19334c431575904fbbed490b44ea117246516580a5d658dfba30c63de7e7c3fa3e0
 DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
 DIST vala-0.44.7.tar.xz 3355928 BLAKE2B 172e9fee6edec63324b9babc125d2bdb53c2025b2cb86339b54a4c8017ccdf78a848076fdd6a8f5200c15c48864542d711896160f78790d36a29d30980177d34 SHA512 5a645e1b1929644ec6b53d06895afcf62d41d6fd63f82c3be3aa4e28847173071621ec857cb973df38d36e60eb960954c2fb48fb4189e1afcbb25a2376ff0d77
-DIST vala-0.45.90.tar.xz 3357976 BLAKE2B 8c7beb7f2e0fc88b2d789334d0986a6822448148fda2666bc34ff2d3a928e0256895025a88a86c5ca35a9969536157eb27226523c1bda0355bbd436e3c82337b SHA512 3d8ca535f30ba73c2433f377f029b3f7edb92f4a5a71a54ddd95936314f881d5d0b6e31a8fc8747197ab458b3bd84b3e1f1b7a7a73d6bf99edb544e6b2b5339b
+DIST vala-0.45.91.tar.xz 3358640 BLAKE2B e51e1e30042cce60f58f9c63698222d40e719f2cd9258d264bdffc2226cd0c126dc0c256d557a2bc600cd2c0cd9f1f55987f9e96ac666d9d57fdd7b1501afb1d SHA512 7bddbd0d711b50154be6e6d3ebe0576c3ead0f533a0b177c3eb181555eb3d096353157cc490b49c9453686e765739283e30d3881652a9bfb82baeed9be4817b6
 EBUILD vala-0.36.18.ebuild 798 BLAKE2B 6def4d1f13ee1fd84f2405da15b6cab064ec882b2ba4fd497636966414308dddefda9357d0559b052277476becf2856ca923f62007f0a319ea90cc3a0fcf572d SHA512 2bbd7d899f35cfbe72ee2c9304ff2d68e87babb06fa6f8c2ea94edbe95cb3b039e33e565d5af6cda978cf6e8517cc5cd51f763dcf6f9963c5c5ae30ae434555e
 EBUILD vala-0.36.19.ebuild 799 BLAKE2B 6dad69eb7e269525d33eba9e093a41a521b4de2eb6b7f4b933a2eb4e377de2c3dd6dedc0f17c03c4c0d77c85913b3d61d4d92f6b225a237a17c0b1bccc6a5100 SHA512 4a492eb53d12c62d04c5f4b574e71c88a81c28291682ac16a0f4ad02263193860fdf0f965a8c81e9aadca79e62872e833d3db8d5f97833b3a40971d2d1739c6f
+EBUILD vala-0.36.20.ebuild 803 BLAKE2B 9bdfc3b9ea2ad19f212ecf671a73e1a7a285ab21d125590755950551366bc368855102e3f91b304ad975bc6ac2e0744130629ae56643a92210b97cfef1896d16 SHA512 a19224046df529f1dc98159e92b32c57a18c89a4791ecc2420182ff047bef6bd77461c3dda0164e7af8a33981180b15a0d22ddfcca4beffabf2887a12629698f
 EBUILD vala-0.40.14.ebuild 1185 BLAKE2B 1cb8b3efdd6f010c5524aabced06132f9f90920d3345e216df0dcb555ab2d4c10afa196271b2623d71d5b4dc57ce2705677275c1da7c0099925e82d5cb1eac26 SHA512 5e271726a2e71902440df5c03897f9c1960d83bb6eff5d2f4a1213d791190a2f34a81fdefb165427c9ca3a92aacdc801c5bb4be5b98fca27ed0b9adafc4d5158
 EBUILD vala-0.40.15.ebuild 1186 BLAKE2B be9ce6de6adbaa89caaec477d2cc774af7f55533d217d74845e780b628e0d17cd124da1a7f8312b8b4f30f74eaedd4d556647f13934c953e0831bce0413b6c87 SHA512 915aabe3dac3f293517e3166c7aff81591b3aadca06034ad3ac2aa53ae3b8f6d6262fd6acbfde54f2cacaa9ab9fd5454ad611c009f909e3cce8184d256245689
+EBUILD vala-0.40.16.ebuild 1190 BLAKE2B 6acd9bc1639f16dc6ba933abd675903ab68d832170eb6342caddea8dc4a8a6ff6c7fcea12d42b7f9b2a9a4e059f96ddc499f97baf9f2612061000c9116426c2f SHA512 543ee0e1469bc4d569bc6b97889d2ba14d2175ddf3104eb56bb363ca9f0968ef0de04e679d830a9a2011ce342cb07657a7f6af770ce426f15027de8af228557c
 EBUILD vala-0.42.7.ebuild 1185 BLAKE2B bbf7accf72f7d5370762acdbcc44efe46e56a05b4a08a5cd7ada34ecb81ce6ef30a1a96880ad0a8ca38b264f06a10e464aa11b4c2e15119a4c84485cb358c42f SHA512 1d32eaa0fa1883351b774cf31863624d595f2b840383b14d88790de48ccea776a498bb9bef7dddace1878f9a1fa2b59ef0e9c4e23a881a1238165a62d3b2781e
 EBUILD vala-0.44.7.ebuild 1118 BLAKE2B 7cbf0d0ed9c91f24e4089e0f3399e9c1b37b5a4f3d437323988d6b2ded2c7fefb58c5e3628f42a486ca8efc32cfed41a22bb339509b129f4949dfa77795a402b SHA512 173584f83ac6b82bb35ea858f5898a4e88ec6f3c84bd2efe613f3aa46a710447ff8dfdaf7e707bdf197caf4e142c2a12f22db5de3e29894aa496f8a7c8396df4
-EBUILD vala-0.45.90.ebuild 933 BLAKE2B 4763ba85b0ce563ef93b147d3fe12fecda7228d381bf07b66e09a8d02526583152428ec547e0ac1eaf97b8b91021c7e3b4554baba1397fd3d30321032993efcc SHA512 766e340c2029859ef6ebb8b5fb4a80710ec880a27a786d615ab83fb365865966ab9864c7d8e8ca79857ae925911e8f4669b2cb0fea68e3615a5b6ba07bf7dff7
+EBUILD vala-0.45.91.ebuild 1311 BLAKE2B 86cf90f253b4a0901da423160e9bb013a7726ad3aa56f1e2db5b668429493331e123049806af5912b68ff9ea785be484b50b773c67864243718eb645a81ca742 SHA512 c11f735374ef683a908279cded712b0120ee0dc5c5836b688800c1ab6d6c4e9b5e8facc9aac2b6d9c375c74fe0d5dd914e807f003a6ccdc8d95ab303ba56d58d
 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
diff --git a/dev-lang/vala/vala-0.36.20.ebuild b/dev-lang/vala/vala-0.36.20.ebuild
new file mode 100644
index 000000000000..8065118e097b
--- /dev/null
+++ b/dev-lang/vala/vala-0.36.20.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+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"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/vala-common-${PV}
+"
+DEPEND="${RDEPEND}
+	!${CATEGORY}/${PN}:0
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2
+		dev-libs/gobject-introspection )
+"
+
+src_configure() {
+	# weasyprint enables generation of PDF from HTML
+	gnome2_src_configure \
+		--disable-unversioned \
+		VALAC=: \
+		WEASYPRINT=:
+}
diff --git a/dev-lang/vala/vala-0.40.16.ebuild b/dev-lang/vala/vala-0.40.16.ebuild
new file mode 100644
index 000000000000..fada0b1047f8
--- /dev/null
+++ b/dev-lang/vala/vala-0.40.16.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0.40"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="test valadoc"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/vala-common-${PV}
+	valadoc? ( >=media-gfx/graphviz-2.16 )
+"
+DEPEND="${RDEPEND}
+	!${CATEGORY}/${PN}:0
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2
+		dev-libs/gobject-introspection )
+"
+
+PATCHES=(
+	# From master
+	"${FILESDIR}"/0.40-Allow-disabling-the-build-of-valadoc.patch
+	# Add missing bits to make valadoc parallel installable
+	"${FILESDIR}"/0.40-valadoc-doclets-data-parallel-installable.patch
+)
+
+src_configure() {
+	# weasyprint enables generation of PDF from HTML
+	gnome2_src_configure \
+		--disable-unversioned \
+		$(use_enable valadoc) \
+		VALAC=: \
+		WEASYPRINT=:
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-lang/vala/vala-0.45.90.ebuild b/dev-lang/vala/vala-0.45.90.ebuild
deleted file mode 100644
index 26d79ce3530d..000000000000
--- a/dev-lang/vala/vala-0.45.90.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.46"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="test valadoc"
-
-RDEPEND="
-	>=dev-libs/glib-2.48.0:2
-	>=dev-libs/vala-common-${PV}
-	valadoc? ( >=media-gfx/graphviz-2.16 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-	test? (
-		dev-libs/dbus-glib
-		>=dev-libs/glib-2.26:2
-		dev-libs/gobject-introspection )
-"
-
-src_configure() {
-	# weasyprint enables generation of PDF from HTML
-	gnome2_src_configure \
-		--disable-unversioned \
-		$(use_enable valadoc) \
-		VALAC=: \
-		WEASYPRINT=:
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-lang/vala/vala-0.45.91.ebuild b/dev-lang/vala/vala-0.45.91.ebuild
new file mode 100644
index 000000000000..48608c5585be
--- /dev/null
+++ b/dev-lang/vala/vala-0.45.91.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.46"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="test valadoc"
+
+RDEPEND="
+	>=dev-libs/glib-2.48.0:2
+	>=dev-libs/vala-common-${PV}
+	valadoc? ( >=media-gfx/graphviz-2.16 )
+	!<net-libs/libsoup-2.66.2[vala]
+" # Older libsoup generates a libsoup-2.4.vapi that isn't fine for vala:0.46 anymore
+# We block here, so libsoup[vala] consumers wouldn't have to >= it, which would be bad
+# as the newer is not required with older vala when those are picked instead of 0.46.
+# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2
+		dev-libs/gobject-introspection )
+"
+
+src_configure() {
+	# weasyprint enables generation of PDF from HTML
+	gnome2_src_configure \
+		--disable-unversioned \
+		$(use_enable valadoc) \
+		VALAC=: \
+		WEASYPRINT=:
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 72d14eb835c0..d51c38269b29 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index 8d660b9cc8a5..29e5d264a48d 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,8 +1,5 @@
 DIST amdgpu-pro-18.20-684755-ubuntu-16.04.tar.xz 229474380 BLAKE2B f589aad71f093b74e37de40ac7c45ebbbeff93609b2fff1baaba711347a4641ef17acdcbe69d371372510a48bd48262cf6269c1f4d05e264023d52a425a423f2 SHA512 240e701acfde4ebe665cf69c8bd3710d036f450822aeb7ee2a21caab289af44167afda1d3b8d0dbe2c46c4e63d9b6fb5e96778311f342c26f334dc7beb4a2d5b
-DIST amdgpu-pro-19.10-785425-ubuntu-18.04.tar.xz 243520380 BLAKE2B 8c775feaff685b18b6df2f6f17667dbadb3da89f58c823f5470113342b585ecb436fbacef6ba26b35fe05bac53530cfe334d79d933afee303651e1375654da85 SHA512 d9c214134bf220c2ab4a306f5d83ce5718adc1f3e93165c724e70b99b4b5bcd8e703299ed70fe79f1d2db5f4f69cae2e1036b5a6238696346710c88f7fa6b3c6
 DIST amdgpu-pro-19.30-838629-ubuntu-18.04.tar.xz 301833044 BLAKE2B ffdd49be431906c5ba20e9b285b44e368b40a70678177412d2329489c987567612f5262b64a9a1aef137cef603f77f768127d674c13488e13dddbc8732cf729c SHA512 7e8091dd37ae176d1ff131e5e2b13961f5a33fc7243052dce074dffb1468476f267d50a920182358188e44f4a93d0cbf39c5d430d56a9a2e09a67409e3478904
-EBUILD amdgpu-pro-opencl-18.20.684755.ebuild 2332 BLAKE2B 20a692a7666997d60c1a2f4ad0f431d016a7a0a75f0f9c898603793d5c481fb662f002f5875e0435f75bbd94b5072f6a30b884eb4e797c64b29681dac35ae69c SHA512 acb6b04711b83787b394fc2ef6b6621ae7e45d67359d4ed6ae39826704660874170babedc15b6e4d69f3bbddb0ce4ba405e7b15ae633fbdf423dfc7358b65a40
-EBUILD amdgpu-pro-opencl-19.10.785425-r1.ebuild 2936 BLAKE2B ca7616f25c0b4ee2b132837bfc5b291338ab9201bfe2037d935821baf0841229ed962af3a5f014ee5d99bfbab1253e09bdc34ea76d25f3e34d9d2218eac0b554 SHA512 732074140878ccd2631182b2f1c5ae4b611d979cddbdc51d90088c775cbd4396c459f4c397354d8fed8730dcae4e6a739333cbf3790caf243bbc628d9fde02e3
-EBUILD amdgpu-pro-opencl-19.10.785425.ebuild 2891 BLAKE2B 7bb17e22e4e2522cab4c2469a785c93cbb947bb4906911db7a86f93aa8135f9d0e6a1a313359b4b1d40b8cb34c12f52612dbb4797ec1f10fe4215099d67a9268 SHA512 53a1f95a1d39541a5ebae9795c35b7e38bd1b15f74c0d9d29436c69b1a0084ab290a06ce702b239bc36bf370f3e49afb07df4dc4c38594e522356e74f368afda
-EBUILD amdgpu-pro-opencl-19.30.838629.ebuild 2940 BLAKE2B 77d5668ce9be3f4cf98d5a61f32a748fd1907b7f34e58e77721a124b5feafcebd092b4debd6b7b4bacb4076252ba592ba893f890b9dc04d8fa2914871abba44b SHA512 64c1d9010a379bb7bd58341ae27291f80d3677409053275ca445dddbd5e13344d1fbd1ed8b55689eef462843fd33d945842d072067676dc19bb4573eed27c61f
+EBUILD amdgpu-pro-opencl-18.20.684755.ebuild 2566 BLAKE2B 2824612381e991babf7456c7bb1a6adf910c4b0c5a8bac87c7453e980cc601fc388788c3a15ec6e8bd1358637fc742880c9defd53142f2f2c86e330a83b61ef9 SHA512 a25c6a57377fb53904bbc0c17ffcf5ccda46a482c1967b6e28610de57668188a0194628b9a225a5112eb74eb4a3d7079bfa54f50721f6fa57b0f5c8fb4e46515
+EBUILD amdgpu-pro-opencl-19.30.838629.ebuild 3174 BLAKE2B 5ea196eb08da222d941f3066709ee66fe1d623093a3204dfa49d957dc55aac87dea80b653638f24c2003368ea358ff4396577dc9f1233c696dd4f36528295e79 SHA512 4a278fedf0251e4b3602dd1bd57070ed1c1a1eda86f1ed12690bd148832ff63633c1b3765ab8afe3ab2a383d348d749effef605d77eb091a7e3cce32f55adf92
 MISC metadata.xml 536 BLAKE2B 788d99a058d77cc3992b953dd8761a224575480b29dd37bc6fc5a5f914fdc03a7c9a9eb70d9d9cebf79394f6e21d966e273ad27a02f93ca887ea48f491b797ad SHA512 912ff2f26e27d5c20219a26505f3a4545409773f1f761de4591cbd7086cd1ff241fca18d7ae5081ed12e04c1b5dc46deeb02b4a68e2a3787d1d20739a818325d
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
index ffc46c93b615..eb1c7e963ec3 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
@@ -75,5 +75,10 @@ pkg_postinst() {
 		ewarn "has become officially supported by Gentoo."
 	fi
 
+	elog ""
+	elog "This package is now DEPRECATED on amd64 in favour of dev-libs/rocm-opencl-runtime."
+	elog "Moreover, it only provides legacy AMDGPU-Pro OpenCL libraries which are not compatible with Vega 10 and newer GPUs."
+	elog ""
+
 	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
 }
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425-r1.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425-r1.ebuild
deleted file mode 100644
index 17472bd93adc..000000000000
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-inherit unpacker multilib-minimal
-
-SUPER_PN='amdgpu-pro'
-MY_PV=$(ver_rs 2 '-')
-
-DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
-HOMEPAGE="https://www.amd.com/en/support/kb/release-notes/rn-rad-lin-19-10-unified"
-SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-18.04.tar.xz"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="mirror fetch strip"
-
-BDEPEND="dev-util/patchelf"
-COMMON="app-eselect/eselect-opencl
-	dev-libs/ocl-icd"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}
-	!media-libs/mesa[opencl]" # Bug #686790
-
-QA_PREBUILT="/opt/amdgpu/lib*/*"
-
-S="${WORKDIR}/${SUPER_PN}-${MY_PV}-ubuntu-18.04"
-
-pkg_nofetch() {
-	local pkgver=$(ver_cut 1-2)
-	einfo "Please download Radeon Software for Linux version ${pkgver} for Ubuntu 18.04 from"
-	einfo "    ${HOMEPAGE}"
-	einfo "The archive should then be placed into your distfiles directory."
-}
-
-src_unpack() {
-	default
-
-	local ids_ver="1.0.0"
-	local patchlevel=$(ver_cut 3)
-	cd "${S}" || die
-	unpack_deb "${S}/libdrm-amdgpu-common_${ids_ver}-${patchlevel}_all.deb"
-	multilib_parallel_foreach_abi multilib_src_unpack
-}
-
-multilib_src_unpack() {
-	local libdrm_ver="2.4.97"
-	local patchlevel=$(ver_cut 3)
-	local deb_abi
-	[[ ${ABI} == x86 ]] && deb_abi=i386
-
-	mkdir -p "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	unpack_deb "${S}/opencl-orca-amdgpu-pro-icd_${MY_PV}_${deb_abi:-${ABI}}.deb"
-	unpack_deb "${S}/libdrm-amdgpu-amdgpu1_${libdrm_ver}-${patchlevel}_${deb_abi:-${ABI}}.deb"
-	popd >/dev/null || die
-}
-
-multilib_src_install() {
-	local dir_abi short_abi
-	[[ ${ABI} == x86 ]] && dir_abi=i386-linux-gnu && short_abi=32
-	[[ ${ABI} == amd64 ]] && dir_abi=x86_64-linux-gnu && short_abi=64
-
-	into "/opt/amdgpu"
-	patchelf --set-rpath '$ORIGIN' "opt/${SUPER_PN}/lib/${dir_abi}"/libamdocl-orca${short_abi}.so || die "Failed to fix library rpath"
-	dolib.so "opt/${SUPER_PN}/lib/${dir_abi}"/*
-	dolib.so "opt/amdgpu/lib/${dir_abi}"/*
-
-	insinto /etc/OpenCL/vendors
-	echo "/opt/amdgpu/$(get_libdir)/libamdocl-orca${short_abi}.so" \
-		> "${T}/${SUPER_PN}-${ABI}.icd" || die "Failed to generate ICD file for ABI ${ABI}"
-	doins "${T}/${SUPER_PN}-${ABI}.icd"
-}
-
-multilib_src_install_all() {
-	insinto "/opt/amdgpu"
-	doins -r opt/amdgpu/share
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		ewarn "Please note that using proprietary OpenCL libraries together with the"
-		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
-		ewarn "for support in case of problems with this package."
-		ewarn ""
-		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
-		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
-		ewarn "has become officially supported by Gentoo."
-	fi
-
-	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
-}
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425.ebuild
deleted file mode 100644
index bf99e75ccc57..000000000000
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-inherit unpacker multilib-minimal
-
-SUPER_PN='amdgpu-pro'
-MY_PV=$(ver_rs 2 '-')
-
-DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
-HOMEPAGE="https://www.amd.com/en/support/kb/release-notes/rn-rad-lin-19-10-unified"
-SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-18.04.tar.xz"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-BDEPEND="dev-util/patchelf"
-COMMON="app-eselect/eselect-opencl
-	dev-libs/ocl-icd"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-QA_PREBUILT="/opt/amdgpu/lib*/*"
-
-S="${WORKDIR}/${SUPER_PN}-${MY_PV}-ubuntu-18.04"
-
-pkg_nofetch() {
-	local pkgver=$(ver_cut 1-2)
-	einfo "Please download Radeon Software for Linux version ${pkgver} for Ubuntu 18.04 from"
-	einfo "    ${HOMEPAGE}"
-	einfo "The archive should then be placed into your distfiles directory."
-}
-
-src_unpack() {
-	default
-
-	local ids_ver="1.0.0"
-	local patchlevel=$(ver_cut 3)
-	cd "${S}" || die
-	unpack_deb "${S}/libdrm-amdgpu-common_${ids_ver}-${patchlevel}_all.deb"
-	multilib_parallel_foreach_abi multilib_src_unpack
-}
-
-multilib_src_unpack() {
-	local libdrm_ver="2.4.97"
-	local patchlevel=$(ver_cut 3)
-	local deb_abi
-	[[ ${ABI} == x86 ]] && deb_abi=i386
-
-	mkdir -p "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	unpack_deb "${S}/opencl-orca-amdgpu-pro-icd_${MY_PV}_${deb_abi:-${ABI}}.deb"
-	unpack_deb "${S}/libdrm-amdgpu-amdgpu1_${libdrm_ver}-${patchlevel}_${deb_abi:-${ABI}}.deb"
-	popd >/dev/null || die
-}
-
-multilib_src_install() {
-	local dir_abi short_abi
-	[[ ${ABI} == x86 ]] && dir_abi=i386-linux-gnu && short_abi=32
-	[[ ${ABI} == amd64 ]] && dir_abi=x86_64-linux-gnu && short_abi=64
-
-	into "/opt/amdgpu"
-	patchelf --set-rpath '$ORIGIN' "opt/${SUPER_PN}/lib/${dir_abi}"/libamdocl-orca${short_abi}.so || die "Failed to fix library rpath"
-	dolib.so "opt/${SUPER_PN}/lib/${dir_abi}"/*
-	dolib.so "opt/amdgpu/lib/${dir_abi}"/*
-
-	insinto /etc/OpenCL/vendors
-	echo "/opt/amdgpu/$(get_libdir)/libamdocl-orca${short_abi}.so" \
-		> "${T}/${SUPER_PN}-${ABI}.icd" || die "Failed to generate ICD file for ABI ${ABI}"
-	doins "${T}/${SUPER_PN}-${ABI}.icd"
-}
-
-multilib_src_install_all() {
-	insinto "/opt/amdgpu"
-	doins -r opt/amdgpu/share
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		ewarn "Please note that using proprietary OpenCL libraries together with the"
-		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
-		ewarn "for support in case of problems with this package."
-		ewarn ""
-		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
-		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
-		ewarn "has become officially supported by Gentoo."
-	fi
-
-	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
-}
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild
index a7fc2f7c5bb1..218485840c5d 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild
@@ -93,5 +93,10 @@ pkg_postinst() {
 		ewarn "has become officially supported by Gentoo."
 	fi
 
+	elog ""
+	elog "This package is now DEPRECATED on amd64 in favour of dev-libs/rocm-opencl-runtime."
+	elog "Moreover, it only provides legacy AMDGPU-Pro OpenCL libraries which are not compatible with Vega 10 and newer GPUs."
+	elog ""
+
 	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
 }
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index f71cbc88dad7..08c10011d188 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -2,6 +2,6 @@ DIST AppStream-0.12.6.tar.xz 1953604 BLAKE2B 28b03a935b8c203f2ac2c52c1de8317cc89
 DIST AppStream-0.12.7.tar.xz 1958948 BLAKE2B 51a70395e4801ceeb3e97ac081f4c45be242cca14728f8efc5eec0d4b3cfa4cc9fab9ef7429c18e9bbb0dedb693a847258be1b11491155658a6ffa2a28358e35 SHA512 53ca7ebde3fcd345a895527da2ac5d829a09f25d28836a867b500282fba3465bde657cd75a4030cb831022f7a0d9f50aadb36078d62924e4d0edad6bfe3c5561
 DIST AppStream-0.12.8.tar.xz 1992072 BLAKE2B ae1d6801119798f360b7eae36b0c46b0511a93ae00adb2437e7dda830d5293c622b04475664055bee392dc824f398d42c6a0a4000392f82fc8bdfc828fa0295e SHA512 4354ef1840d919102647feffc38687f508b14fe9c047c868448347d888aa821dd8a4d25787a2ffb55247f8e9e20e9e03ba330ad74ad61d476be0c414c04a7c30
 EBUILD appstream-0.12.6.ebuild 1577 BLAKE2B 068254a2aaf873f8376cfe229596319a462a636137c74a90109c36ef975fa6022fc63bdd7c1469981731cb1e3712740506acebb74756de81502c92127a1be3bb SHA512 1f1c5a1d307e42ddb273c4ad77cc887f913f2a74392ff25050a541403a424981baecd95e1a3c127877888ab9e910307e4a6070821a7892583e5a853620c421b4
-EBUILD appstream-0.12.7.ebuild 1593 BLAKE2B 970c6254d488a75ed7205c7c3564381d987ac6afbcc34aba8a8b6d70e8396832b9be5d4829a394b5c8ea4e88559cd1197cdc55c8904668867619991586c70b1d SHA512 0af12d23c034999c44a59d3cf89b8e25cb08e7bb7d085c4cc0c5c269008a494480cd055b8ffad9e7e83b48a1e69eaa88eb5ebee6fe14486195064e7247dcb7c2
+EBUILD appstream-0.12.7.ebuild 1592 BLAKE2B 005c91236cae8d6abdc3bcc8d88fb35b51f8fada8ba4d34b5bc669765da015789019f1a04c5bbc1ac5184a8fdc3954b565a9bf17bc11ef5c26f2cb810d7296ee SHA512 a6c840fee66ab6eb0273810497de22e3812c5d309dc863938f1308735c0202f296a3ed36626806f92084422f4bfb7033f604259c8bf431c4c2405a7cacdd02ad
 EBUILD appstream-0.12.8.ebuild 1595 BLAKE2B 34b1c48910d151e7a603efbf9b95aa96a54c6d676824a11a01a38ada5e81bbf518393fb51b56a29da8c1cce0cbbd01824fd2e0679bf0595d18998ecebf69f510 SHA512 0f537725005bee2b72e28ae0ea29741f388689199406652ee1eec2168a26e557c010266d2390262c0cb8c1d5ac3b990abd76bbc20cd42b2e70efef194090cd19
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.7.ebuild b/dev-libs/appstream/appstream-0.12.7.ebuild
index 1cacb6a7e53f..fbc659372b2b 100644
--- a/dev-libs/appstream/appstream-0.12.7.ebuild
+++ b/dev-libs/appstream/appstream-0.12.7.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	MY_PN="AppStream"
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 0631199853fe..aac0f111e424 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,6 +1,7 @@
-AUX efl-1.21.1-fix_evas_preload_segfault.patch 381 BLAKE2B a4b8afbe06cd44154a41766fcf12775369c2243325eab17647423a3d2b78cc3646361c0a4884de71fd876698defb9816f50343c46690b595c3701a6295a95040 SHA512 90901ab26915a6d2aba80deb610eb8bb873cd4cc7210888a4f062057891024d4e0b3f051be2fda39680d2267301251abbfbfc47072cb5c22ba6eba8f9d9567fc
-DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3a03df1915f604136380343ad52e86e6b485f0aa14f1caef5a36451425b79cf2a5123c83d8e8a6d430ff213bf SHA512 1e26a57fca84ec85e45d707ee57abc50bd18edfa82e478e586300b6ad5ab8b9103a54a656902d29d80425988a6116a40aa01758fb8dd581dd48334ca0f4d5a63
 DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734
-EBUILD efl-1.21.1-r3.ebuild 6637 BLAKE2B e8846787fa6d2a5767468468625492bb0794fd76a53ae8b08a204c3ce6d2950a96ce15fb7fb2d7fd7f98313f7c06124ce97638909fd34e8d8c979e3382110f77 SHA512 67874905f334701605d886c5f75a82b027c4c418c87f8e495b1449b3d3b79d544172b5be8a180098656ee620eeb46eeb805695dbeaa242d2301a8ea0f8c4710b
-EBUILD efl-1.22.2.ebuild 6879 BLAKE2B f6d0200b055bfe235b08053982243b64e4cdaa5290e91c173e86918a839a69a45385256651b0d013f6c0a854ac9d7dfd6281c9d8a529ba175d54e410081b2f10 SHA512 914afb7338f7c9889a35fc1e72bf4699439496e3c37aac13b83635a8cade901abcb17b45ebd0fd899fd7c725d546d767fc2e0b7db6ac42e2a64bdadd380f4f9c
+DIST efl-1.22.3.tar.xz 70620824 BLAKE2B b6a785ad1ebf9b7804eb2ea12dd78bcf1ee0647d24852c23955e10c59bb7a9a9d0b86cec7796382dacdef11ca164d87c02f186700dcc69bebe8ba6c62727fc6d SHA512 d29022c27950adebab96266343c4f861801f445f36806c8bf0da67fe4ea75807932fa9f218d9cb084c2c3f6ccc212903992ef4b94b95253656e8550b11b42f83
+DIST efl-1.22.4.tar.xz 71364104 BLAKE2B 66aa2cfad4b9474b4343e7c139a9d918e3c1b80944ca41414c62c2ec3468d84ebfe95e9834846b55f6ead0568b77e59cb115fd607f1653dd692baa8d9238ac5b SHA512 0a9e5bd40dfeb10f4c17c64aae5c9af8f54be934b78216f6effecaf077b9f57fe704cb61ded4487472bd9451a3eeb6634b2c0d0d038e911177c2e33576ad6b6e
+EBUILD efl-1.22.2.ebuild 6877 BLAKE2B 5569c1e68c66b5bf103f71e526eadd1ea58ead7e37d2cfa367a557bbfbfa3e0764a81338ee8f046a988984540c0a875b79097f62661fe567dfea7df7fb723cb6 SHA512 c1bb384fc318c85a7cefe6cd68c0f776f7319ff80c98389907e373f1880c00c1ce1f50befe097c207c227da87978e19c5031b590e0773ea395395f7c5a271369
+EBUILD efl-1.22.3.ebuild 6879 BLAKE2B 7d51377cfb1356054b7ab9562d77d8310591625b2af614e4cd99067eafa8f170cfb2fd66fca2e311bdc4f688aa48b61b15b7f65591810b8510d5e83797ab8bf1 SHA512 e8ce2178fd494b7e701e4e56d70573439db2ff1a6eddbbaf89b111a6b3388af49bf98367563a0c131c55a46c6df4bc982dd4582caf1110d8117ddfd35aa55d3f
+EBUILD efl-1.22.4.ebuild 6879 BLAKE2B 7d51377cfb1356054b7ab9562d77d8310591625b2af614e4cd99067eafa8f170cfb2fd66fca2e311bdc4f688aa48b61b15b7f65591810b8510d5e83797ab8bf1 SHA512 e8ce2178fd494b7e701e4e56d70573439db2ff1a6eddbbaf89b111a6b3388af49bf98367563a0c131c55a46c6df4bc982dd4582caf1110d8117ddfd35aa55d3f
 MISC metadata.xml 1920 BLAKE2B 01decb622aae3e01bf59d93d48b4babc5e2f63a1499f0daeedd1e9b513f2e7a41819caf3a8f738d49333a2b538d3231d0355ed216edb6313e0c587281f4a9bfe SHA512 ae1c2f5791cf991940eff5333747cd3591b8d03048b99fe4ff1acf442c964f7e56ff0de60cc275205f871b937ef369e9e24342368e69c565fc2efe87931df5b4
diff --git a/dev-libs/efl/efl-1.21.1-r3.ebuild b/dev-libs/efl/efl-1.21.1-r3.ebuild
deleted file mode 100644
index 0efdcf3a7234..000000000000
--- a/dev-libs/efl/efl-1.21.1-r3.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils pax-utils xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+bmp dds connman debug drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
-
-REQUIRED_USE="
-	?? ( gles2 opengl )
-	fbcon? ( !tslib )
-	gles2? (
-		|| ( wayland X )
-		!sdl
-	)
-	ibus? ( glib )
-	opengl? ( X )
-	pulseaudio? ( sound )
-	sdl? ( opengl )
-	vnc? ( fbcon X )
-	wayland? ( gles2 !opengl )
-	xim? ( X )
-	xpresent? ( X )
-"
-
-RDEPEND="
-	net-misc/curl
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/zlib:=
-	virtual/jpeg:0=
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gif? ( media-libs/giflib:= )
-	gles2? ( media-libs/mesa[egl,gles2] )
-	glib? ( dev-libs/glib:2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz )
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:= )
-	libuv? ( dev-libs/libuv )
-	luajit? ( dev-lang/luajit:= )
-	!luajit? ( dev-lang/lua:* )
-	nls? ( sys-devel/gettext )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	system-lz4? ( app-arch/lz4 )
-	systemd? ( sys-apps/systemd )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	vlc? ( media-video/vlc )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	X? (
-		media-libs/freetype
-		x11-libs/libXcursor
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		gles2? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-	)
-	xine? ( media-libs/xine-lib )
-	xpm? ( x11-libs/libXpm )
-	xpresent? ( x11-libs/libXpresent )
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix_evas_preload_segfault.patch"
-)
-
-src_prepare() {
-	default
-
-	# Upstream still doesnt offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-		configure || die "Sedding configure file with unwind fix failed."
-	fi
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myconf=(
-		--enable-cserve
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-		--enable-image-loader-png
-		--enable-libeeze
-		--enable-libmount
-		--enable-xinput22
-
-		--disable-doc
-		--disable-eglfs
-		--disable-gesture
-		--disable-gstreamer
-		--disable-image-loader-tgv
-		--disable-tizen
-		--disable-wayland-ivi-shell
-
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable dds image-loader-dds)
-		$(use_enable drm)
-		$(use_enable drm elput)
-		$(use_enable eet image-loader-eet)
-		$(use_enable examples always-build-examples)
-		$(use_enable fbcon fb)
-		$(use_enable fontconfig)
-		$(use_enable fribidi)
-		$(use_enable gif image-loader-gif)
-		$(use_enable gles2 egl)
-		$(use_enable gstreamer gstreamer1)
-		$(use_enable harfbuzz)
-		$(use_enable hyphen)
-		$(use_enable ico image-loader-ico)
-		$(use_enable ibus)
-		$(use_enable jpeg2k image-loader-jp2k)
-		$(use_enable libuv)
-		$(use_enable !luajit lua-old)
-		$(use_enable neon)
-		$(use_enable nls)
-		$(use_enable pdf poppler)
-		$(use_enable physics)
-		$(use_enable postscript spectre)
-		$(use_enable ppm image-loader-pmaps)
-		$(use_enable psd image-loader-psd)
-		$(use_enable pulseaudio)
-		$(use_enable raw libraw)
-		$(use_enable scim)
-		$(use_enable sdl)
-		$(use_enable sound audio)
-		$(use_enable static-libs static)
-		$(use_enable svg librsvg)
-		$(use_enable system-lz4 liblz4)
-		$(use_enable systemd)
-		$(use_enable tga image-loader-tga)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable tslib)
-		$(use_enable v4l v4l2)
-		$(use_enable valgrind)
-		$(use_enable vlc libvlc)
-		$(use_enable vnc vnc-server)
-		$(use_enable wayland)
-		$(use_enable webp image-loader-webp)
-		$(use_enable xcf)
-		$(use_enable xim)
-		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-		$(use_enable xpresent)
-		$(use_enable zeroconf avahi)
-
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-glib=$(usex glib)
-		--with-js=none
-		--with-net-control=$(usex connman connman none)
-		--with-profile=$(usex debug debug release)
-		--with-x11=$(usex X xlib none)
-
-		$(use_with X x)
-	)
-
-	use drm && use wayland && myconf+=( --enable-gl-drm )
-
-	if use opengl ; then
-		myconf+=( --with-opengl=full )
-	elif use gles2 ; then
-		myconf+=( --with-opengl=es )
-	elif use drm && use wayland ; then
-		myconf+=( --with-opengl=es )
-	else
-		myconf+=( --with-opengl=none )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if host-is-pax && use luajit ; then
-		# We need to build the lua code first so we can pax-mark it. #547076
-		local target='_e_built_sources_target_gogogo_'
-		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
-		emake -C src "${target}"
-		emake -C src bin/elua/elua
-		pax-mark m src/bin/elua/.libs/elua
-	fi
-
-	V=1 emake || die "Compiling EFL failed."
-}
-
-src_install() {
-	einstalldocs
-
-	V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed."
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.22.2.ebuild b/dev-libs/efl/efl-1.22.2.ebuild
index dce1d89b8816..df0fbe727fc7 100644
--- a/dev-libs/efl/efl-1.22.2.ebuild
+++ b/dev-libs/efl/efl-1.22.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
 
 REQUIRED_USE="
diff --git a/dev-libs/efl/efl-1.22.3.ebuild b/dev-libs/efl/efl-1.22.3.ebuild
new file mode 100644
index 000000000000..2da0160a9808
--- /dev/null
+++ b/dev-libs/efl/efl-1.22.3.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( gles2 opengl )
+	fbcon? ( !tslib )
+	gles2? (
+		|| ( wayland X )
+		!sdl
+	)
+	ibus? ( glib )
+	opengl? ( X )
+	pulseaudio? ( sound )
+	sdl? ( opengl )
+	vnc? ( fbcon X )
+	wayland? ( gles2 !opengl )
+	xim? ( X )
+	xpresent? ( X )
+"
+
+RDEPEND="
+	net-misc/curl
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-apps/util-linux
+	virtual/jpeg:0=
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	elogind? ( sys-auth/elogind )
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib:= )
+	gles2? ( media-libs/mesa[egl,gles2] )
+	glib? ( dev-libs/glib:2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	harfbuzz? ( media-libs/harfbuzz )
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:= )
+	libuv? ( dev-libs/libuv )
+	luajit? ( dev-lang/luajit:= )
+	!luajit? ( dev-lang/lua:* )
+	pdf? ( app-text/poppler:=[cxx] )
+	physics? ( sci-physics/bullet:= )
+	postscript? ( app-text/libspectre )
+	pulseaudio? ( media-sound/pulseaudio )
+	raw? ( media-libs/libraw:= )
+	scim? ( app-i18n/scim )
+	sdl? (
+		media-libs/libsdl2
+		virtual/opengl
+	)
+	sound? ( media-libs/libsndfile )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	system-lz4? ( app-arch/lz4 )
+	systemd? ( sys-apps/systemd:= )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind )
+	valgrind? ( dev-util/valgrind )
+	vlc? ( media-video/vlc )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[gles2,wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	X? (
+		media-libs/freetype
+		x11-libs/libXcursor
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		gles2? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+		opengl? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+	)
+	xine? ( media-libs/xine-lib )
+	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	# Upstream still doesnt offer a configure flag. #611108
+	if ! use unwind ; then
+		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
+		configure || die "Sedding configure file with unwind fix failed."
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--enable-cxx-bindings
+		--enable-image-loader-generic
+		--enable-image-loader-jpeg
+		--enable-image-loader-png
+		--enable-libeeze
+		--enable-libmount
+		--enable-quick-launch
+		--enable-threads
+		--enable-xinput22
+
+		--disable-cancel-ok
+		--disable-cocoa
+		--disable-csharp-beta
+		--disable-csharp-bindings
+		--disable-doc
+		--disable-ecore-buffer
+		--disable-ecore-drm
+		--disable-ecore-wayland
+		--disable-eglfs
+		--disable-g-main-loop
+		--disable-gesture
+		--disable-gstreamer
+		--disable-pixman
+		--disable-tizen
+		--disable-wayland-ivi-shell
+
+		$(use_enable bmp image-loader-bmp)
+		$(use_enable bmp image-loader-wbmp)
+		$(use_enable dds image-loader-dds)
+		$(use_enable drm)
+		$(use_enable drm elput)
+		$(use_enable eet image-loader-eet)
+		$(use_enable elogind)
+		$(use_enable examples always-build-examples)
+		$(use_enable fbcon fb)
+		$(use_enable fontconfig)
+		$(use_enable fribidi)
+		$(use_enable gif image-loader-gif)
+		$(use_enable gles2 egl)
+		$(use_enable gstreamer gstreamer1)
+		$(use_enable harfbuzz)
+		$(use_enable hyphen)
+		$(use_enable ico image-loader-ico)
+		$(use_enable ibus)
+		$(use_enable jpeg2k image-loader-jp2k)
+		$(use_enable libuv)
+		$(use_enable !luajit lua-old)
+		$(use_enable neon)
+		$(use_enable nls)
+		$(use_enable pdf poppler)
+		$(use_enable physics)
+		$(use_enable postscript spectre)
+		$(use_enable ppm image-loader-pmaps)
+		$(use_enable psd image-loader-psd)
+		$(use_enable pulseaudio)
+		$(use_enable raw libraw)
+		$(use_enable scim)
+		$(use_enable sdl)
+		$(use_enable sound audio)
+		$(use_enable static-libs static)
+		$(use_enable svg librsvg)
+		$(use_enable system-lz4 liblz4)
+		$(use_enable systemd)
+		$(use_enable tga image-loader-tga)
+		$(use_enable tiff image-loader-tiff)
+		$(use_enable tslib)
+		$(use_enable v4l v4l2)
+		$(use_enable valgrind)
+		$(use_enable vlc libvlc)
+		$(use_enable vnc vnc-server)
+		$(use_enable wayland)
+		$(use_enable webp image-loader-webp)
+		$(use_enable xcf)
+		$(use_enable xim)
+		$(use_enable xine)
+		$(use_enable xpm image-loader-xpm)
+		$(use_enable xpresent)
+		$(use_enable zeroconf avahi)
+
+		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
+		--with-glib=$(usex glib)
+		--with-js=none
+		--with-net-control=$(usex connman connman none)
+		--with-profile=$(usex debug debug release)
+		--with-x11=$(usex X xlib none)
+
+		$(use_with X x)
+	)
+
+	use drm && use wayland && myconf+=( --enable-gl-drm )
+
+	if use opengl ; then
+		myconf+=( --with-opengl=full )
+	elif use gles2 ; then
+		myconf+=( --with-opengl=es )
+	elif use drm && use wayland ; then
+		myconf+=( --with-opengl=es )
+	else
+		myconf+=( --with-opengl=none )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if host-is-pax && use luajit ; then
+		# We need to build the lua code first so we can pax-mark it. #547076
+		local target='_e_built_sources_target_gogogo_'
+		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
+		emake -C src "${target}"
+		emake -C src bin/elua/elua
+		pax-mark m src/bin/elua/.libs/elua
+	fi
+
+	V=1 emake
+}
+
+src_install() {
+	V=1 emake install DESTDIR="${D}"
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/efl/efl-1.22.4.ebuild b/dev-libs/efl/efl-1.22.4.ebuild
new file mode 100644
index 000000000000..2da0160a9808
--- /dev/null
+++ b/dev-libs/efl/efl-1.22.4.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( gles2 opengl )
+	fbcon? ( !tslib )
+	gles2? (
+		|| ( wayland X )
+		!sdl
+	)
+	ibus? ( glib )
+	opengl? ( X )
+	pulseaudio? ( sound )
+	sdl? ( opengl )
+	vnc? ( fbcon X )
+	wayland? ( gles2 !opengl )
+	xim? ( X )
+	xpresent? ( X )
+"
+
+RDEPEND="
+	net-misc/curl
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-apps/util-linux
+	virtual/jpeg:0=
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	elogind? ( sys-auth/elogind )
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib:= )
+	gles2? ( media-libs/mesa[egl,gles2] )
+	glib? ( dev-libs/glib:2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	harfbuzz? ( media-libs/harfbuzz )
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:= )
+	libuv? ( dev-libs/libuv )
+	luajit? ( dev-lang/luajit:= )
+	!luajit? ( dev-lang/lua:* )
+	pdf? ( app-text/poppler:=[cxx] )
+	physics? ( sci-physics/bullet:= )
+	postscript? ( app-text/libspectre )
+	pulseaudio? ( media-sound/pulseaudio )
+	raw? ( media-libs/libraw:= )
+	scim? ( app-i18n/scim )
+	sdl? (
+		media-libs/libsdl2
+		virtual/opengl
+	)
+	sound? ( media-libs/libsndfile )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	system-lz4? ( app-arch/lz4 )
+	systemd? ( sys-apps/systemd:= )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind )
+	valgrind? ( dev-util/valgrind )
+	vlc? ( media-video/vlc )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[gles2,wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	X? (
+		media-libs/freetype
+		x11-libs/libXcursor
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		gles2? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+		opengl? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+	)
+	xine? ( media-libs/xine-lib )
+	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	# Upstream still doesnt offer a configure flag. #611108
+	if ! use unwind ; then
+		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
+		configure || die "Sedding configure file with unwind fix failed."
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--enable-cxx-bindings
+		--enable-image-loader-generic
+		--enable-image-loader-jpeg
+		--enable-image-loader-png
+		--enable-libeeze
+		--enable-libmount
+		--enable-quick-launch
+		--enable-threads
+		--enable-xinput22
+
+		--disable-cancel-ok
+		--disable-cocoa
+		--disable-csharp-beta
+		--disable-csharp-bindings
+		--disable-doc
+		--disable-ecore-buffer
+		--disable-ecore-drm
+		--disable-ecore-wayland
+		--disable-eglfs
+		--disable-g-main-loop
+		--disable-gesture
+		--disable-gstreamer
+		--disable-pixman
+		--disable-tizen
+		--disable-wayland-ivi-shell
+
+		$(use_enable bmp image-loader-bmp)
+		$(use_enable bmp image-loader-wbmp)
+		$(use_enable dds image-loader-dds)
+		$(use_enable drm)
+		$(use_enable drm elput)
+		$(use_enable eet image-loader-eet)
+		$(use_enable elogind)
+		$(use_enable examples always-build-examples)
+		$(use_enable fbcon fb)
+		$(use_enable fontconfig)
+		$(use_enable fribidi)
+		$(use_enable gif image-loader-gif)
+		$(use_enable gles2 egl)
+		$(use_enable gstreamer gstreamer1)
+		$(use_enable harfbuzz)
+		$(use_enable hyphen)
+		$(use_enable ico image-loader-ico)
+		$(use_enable ibus)
+		$(use_enable jpeg2k image-loader-jp2k)
+		$(use_enable libuv)
+		$(use_enable !luajit lua-old)
+		$(use_enable neon)
+		$(use_enable nls)
+		$(use_enable pdf poppler)
+		$(use_enable physics)
+		$(use_enable postscript spectre)
+		$(use_enable ppm image-loader-pmaps)
+		$(use_enable psd image-loader-psd)
+		$(use_enable pulseaudio)
+		$(use_enable raw libraw)
+		$(use_enable scim)
+		$(use_enable sdl)
+		$(use_enable sound audio)
+		$(use_enable static-libs static)
+		$(use_enable svg librsvg)
+		$(use_enable system-lz4 liblz4)
+		$(use_enable systemd)
+		$(use_enable tga image-loader-tga)
+		$(use_enable tiff image-loader-tiff)
+		$(use_enable tslib)
+		$(use_enable v4l v4l2)
+		$(use_enable valgrind)
+		$(use_enable vlc libvlc)
+		$(use_enable vnc vnc-server)
+		$(use_enable wayland)
+		$(use_enable webp image-loader-webp)
+		$(use_enable xcf)
+		$(use_enable xim)
+		$(use_enable xine)
+		$(use_enable xpm image-loader-xpm)
+		$(use_enable xpresent)
+		$(use_enable zeroconf avahi)
+
+		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
+		--with-glib=$(usex glib)
+		--with-js=none
+		--with-net-control=$(usex connman connman none)
+		--with-profile=$(usex debug debug release)
+		--with-x11=$(usex X xlib none)
+
+		$(use_with X x)
+	)
+
+	use drm && use wayland && myconf+=( --enable-gl-drm )
+
+	if use opengl ; then
+		myconf+=( --with-opengl=full )
+	elif use gles2 ; then
+		myconf+=( --with-opengl=es )
+	elif use drm && use wayland ; then
+		myconf+=( --with-opengl=es )
+	else
+		myconf+=( --with-opengl=none )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if host-is-pax && use luajit ; then
+		# We need to build the lua code first so we can pax-mark it. #547076
+		local target='_e_built_sources_target_gogogo_'
+		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
+		emake -C src "${target}"
+		emake -C src bin/elua/elua
+		pax-mark m src/bin/elua/.libs/elua
+	fi
+
+	V=1 emake
+}
+
+src_install() {
+	V=1 emake install DESTDIR="${D}"
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch b/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch
deleted file mode 100644
index 8d42cbb0f250..000000000000
--- a/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/lib/evas/cache/evas_cache_image.c 14:09:44.971119099 +0100
-+++ b/src/lib/evas/cache/evas_cache_image.c 14:10:21.521226043 +0100
-@@ -361,6 +361,7 @@
-    cache = current->cache;
- 
-    if ((!current->flags.loaded) &&
-+       (current->info.loader) &&
-        current->info.loader->threadable)
-      {
-         evas_module_task_register(evas_cache_image_cancelled, current);
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 9d860309fecc..fcf8d45e22b9 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -4,6 +4,6 @@ AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b1
 AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb
 DIST elfutils-0.176.tar.bz2 8646075 BLAKE2B 7f23d59b7f5d74946fea928a7fada7764c1f96a5eefefc4a3a382090eb7cad07c80419218300d853ccbef8f4e2288eb443ff06b3e64bf4511d9fa7aa84f5b794 SHA512 7f032913be363a43229ded85d495dcf7542b3c85974aaaba0d984228dc9ac1721da3dc388d3fa02325a80940161db7e9ad2c9e4521a424ad8a7d050c0902915b
 DIST elfutils-0.177.tar.bz2 8852413 BLAKE2B 03f432342651f7646d73b7847325bd14b722ce34d85df01b1ad072b916af9b9da2d0d119cd24e952073bd584ec76b027ba9b6c7d45fb057372b3e700b1f5741a SHA512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f
-EBUILD elfutils-0.176-r1.ebuild 1944 BLAKE2B 5c5068ba8d9eef2406a918bb7fa4eaa65a54dd84198e16bf3cd33025129f7fbeb2180f1e0ca9c0d427a61a26b5660d1624fa371565ad9657b275b5907572ac5f SHA512 1a98e8a45115fdbcbf68924d1cfa87b7df8fcbb50b45860a2fb8dbb3691d4d5bb9153af14d9959035b2bd1b711868dfe7c98d064ef7a6c3659bb6192defd11f7
+EBUILD elfutils-0.176-r1.ebuild 1943 BLAKE2B e919191bb34934b44f7a38a008ad2eb09879fdc6b7b7656505505c97dfb4e82051f6f6ee388fa8a224d4b8374d0f4705a23db9fc30dada09411693a71f9ad719 SHA512 b04f95f56bbdc77d8b610272cda54393757bb76c70fa23f4d72dd09e59ccf1636d189f92a6e1b349a4c69e278d960853f30266208e009cb5a07b1273dcd3e242
 EBUILD elfutils-0.177.ebuild 1962 BLAKE2B 1679323257c950ea3b2464f2e65853f3b2abf1517997ed61c2a2604658971c11463383e8a905ef958f8c5a2db59c318e1ca82a2b10b6955342f1d5a597fee090 SHA512 a36297dc7350ae97453ce1db675d1d4f0c4ea7cb5ba903e74c8bb4a89a8eb8fbcd7f42925aafbc6629f6091ed85c2ab306d2b28a11db8235b804c6d3f8889150
 MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
diff --git a/dev-libs/elfutils/elfutils-0.176-r1.ebuild b/dev-libs/elfutils/elfutils-0.176-r1.ebuild
index f6d8d331ff9c..88b231edf8a4 100644
--- a/dev-libs/elfutils/elfutils-0.176-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.176-r1.ebuild
@@ -11,7 +11,7 @@ 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 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 876fc812cf6a..d4daa4714a27 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,8 +1,10 @@
 DIST ell-0.20.tar.xz 443196 BLAKE2B 35daff12e43a27b44b60ff0fd0f10c8d6b8ba122a5825ff705394b2bfb401a90174133f63e6673690461ce2d56595186593fc65783dff2f795b83a461c3aa4b5 SHA512 91200ac000dc44ae593618c21012174af2614be0e7b33bd979aefb248e42d7bb0282f0a7ba256514dfb7657231b5fec29969c874417923f413d34c38500d4d97
 DIST ell-0.21.tar.xz 448612 BLAKE2B a20e177bb2ef7620c79cecdb84e47db662d97904189c885c90232a21ca40125bee14218fe2f1f06df74b424ccdc88dcd89da12bc9bf3e86c453b9903ae93013d SHA512 7bb96194e03d0067b22745899eec3f7166dce69aeed2ece1cd362178c1b7f94d464a894417d8329554f5b707133280e6cadfbd4e3ee34a5652f396d719e6fd17
+DIST ell-0.22.tar.xz 452692 BLAKE2B 6e8add0e439bfae287be5522ccdb0b9a7f1cc0c378f0498f8b2193bd4e8b10cac71df2b21cf0df202a16182bd188cb56efecf0cc7e8b027c2d00b2579f2c155f SHA512 6977f0fe2d7e2c86317163d45ee92750d9f42a2d04cd28e8fcb48e0ef680d98f586e983cc1821eb19430ea951bfe408d821da3a58244626f97244ed2b4a9e539
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
 EBUILD ell-0.20.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.21.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
+EBUILD ell-0.22.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.9.ebuild 821 BLAKE2B 000640e99b5e0c1e1a328014a8edfe47cc197201757fc6b4e71ce3c9efe27d7ea3f89c7171c2366605374624b4282fbf2859b1832d3f5136e4c713ccf0530391 SHA512 9d497dbe091631b7863b8f403e2ae138cf30c38a1b1eb7e98b775275649fce9c67717599f1ca38ab705dd7bb33e8bc406035c2102c368fa83a15c13069c0b79e
 EBUILD ell-9999.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.22.ebuild b/dev-libs/ell/ell-0.22.ebuild
new file mode 100644
index 000000000000..cafd42ed2ce6
--- /dev/null
+++ b/dev-libs/ell/ell-0.22.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 multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="glib pie"
+
+RDEPEND="
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable glib)
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 83e946af1d06..63cdebfac539 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,5 +1,7 @@
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 DIST gjs-1.54.3.tar.xz 647704 BLAKE2B 792225afd9828755ef67b3e7221d4c53535d79d879e0aef0c7c56f06e02313a966776b5dddf9876649984a1599eb44a27d6288f9216bb929a66ad9e14cb632e5 SHA512 f19e667963fa3feecd23a9e4cc263a55d9d1311de7d10905969966f74e26ff982839c192c555cbc059e4fd65ff7c89d18944ca6bf8ffbb65ec91081036d19505
+DIST gjs-1.56.2.tar.xz 701976 BLAKE2B 77057e4a3a8958d6648c92bb56495b505b3ec49bc0eeff0fa5c9e3ae5a694a4b5643dc72d7aa673f9e66d42e9b0def7f9df0043f2690216bfc5c5109ea9eca51 SHA512 687b8e3795565b5c56fceebefb229c07b4c084a4f65c0035e0d185d12082920424632c0f896df8dc1cd5013a97b6e08274efaec4caeb564dc2070d26a5f974c5
 EBUILD gjs-1.48.7.ebuild 1548 BLAKE2B 47a474a7958d70ed915b8c1a2a973f1e72f99a7bc4459e98a687503122d83d40dc0733dcd3e7fbefc42304049520acf80b3ad609cda1ea5c8653e0ba215f19f7 SHA512 4a976754dcc518a188fa3ceae85ec61aa20b0abfe6c9c5ad248fa72ea62820935415451cb8f6659931b6b8f4044dee2f5a20be8c08a6d1a3df0d526b24b8695f
 EBUILD gjs-1.54.3.ebuild 1557 BLAKE2B 3eefd791008c74a8826023a6f788f9bf7d95a68b2d46c27f44f8a20a4e43dfb9877c4d78cfaab68383a59ce12154f75502cbdc470c63b209b444e03f692f1e2b SHA512 191d391963078c630355b6a50ddfa8c1473b5780bcfa2af98cb818743716bb2d98684bb5a76d890393c7e64ee4d6eb481524c33e76d40810576ad7487afbaef9
+EBUILD gjs-1.56.2.ebuild 1730 BLAKE2B 0d09046b4a4029486f2c06d8ef923353bedb4a65448a19a33d417d7a144f4a6c7efd8c057df8a9f468a5e7950c5b80e1c31cb76e48c39f0e013340d25fb4fdce SHA512 165ea3340b784457679f261106d57e07b1328bb73f292bfa6bce90ec08d51b72243dc0537f1ae77525c4aded557822465feaf835f7a0690cd9474bec0adcae77
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.56.2.ebuild b/dev-libs/gjs/gjs-1.56.2.ebuild
new file mode 100644
index 000000000000..a29e1c7e479c
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.56.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 pax-utils virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk readline test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.54.0
+	>=dev-libs/gobject-introspection-1.57.2:=
+
+	readline? ( sys-libs/readline:0= )
+	dev-lang/spidermonkey:60
+	virtual/libffi:=
+	cairo? ( x11-libs/cairo[X] )
+	gtk? ( >=x11-libs/gtk+-3.20:3 )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	# XXX: Do NOT enable coverage, completely useless for portage installs
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		--enable-profiler \
+		--disable-code-coverage \
+		$(use_with cairo cairo) \
+		$(use_with gtk) \
+		$(use_enable readline) \
+		$(use_with test dbus-tests) \
+		--disable-installed-tests \
+		--without-xvfb-tests # disables Makefile spawning Xvfb for us, as we do it ourselves:
+		# https://gitlab.gnome.org/GNOME/gjs/issues/280
+}
+
+src_install() {
+	# installation sometimes fails in parallel, bug #???
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for gjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/gjs-console"
+}
+
+src_test() {
+	virtx dbus-run-session emake check || die
+}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index b2f4a9e64b2c..42ca231755f2 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -5,5 +5,5 @@ DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b4
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 EBUILD glib-2.58.3-r1.ebuild 10907 BLAKE2B c600133aa1db3ec6d7171d83c59fdb6da341d2c074847770b88828c34e0616819882ff3604d79291e621b18724b8ae2e57fd5cf1fd9250ac31622d2de2157887 SHA512 011fdbe52c49f32682f5735ba4332e25e87b5ed8efe3da9c5fd543c282ea7932deb11d05cb93b6ab92460f0d545e0c7cb3798c4c3f736b58e9b5ca3ee388e1eb
-EBUILD glib-2.60.6.ebuild 10141 BLAKE2B abe763f0a4fa391af9471f3d7c2063014c7a4fa10479892fd6c3aae5a4b7f5ce82b67e86bd239ed059cd9c971e7820abb31eda89eb6772cc2431c7363a10bd0f SHA512 4e7fa4071683e1fe082ba100e84aaed82d18730e463ce74d65e05d38ff8b5495239ec479a5af1ba5372f6c9138a53de195be875fb9b2378743ce8be880dd1d29
+EBUILD glib-2.60.6.ebuild 10142 BLAKE2B 1c6567841cbdbdd0bb3d114d33be08b4c5a202c49ddaba8ee5d686682f9c1265535e4547e4ee6f2bafe938c301f0aba24f90cf175e89696e7f29bbaf6daabcdf SHA512 ff1cd340ceefd9bbcb579d87d346e7ad16afa7e30e2c96fbb6639f15fe4f58954da4000a5fe40cd2fc8a80a001ca7cbec426d15014dc66e16fe24092b99ccf7e
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.60.6.ebuild b/dev-libs/glib/glib-2.60.6.ebuild
index 9baebc14a8f0..7ea978200ad9 100644
--- a/dev-libs/glib/glib-2.60.6.ebuild
+++ b/dev-libs/glib/glib-2.60.6.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 
-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 ~riscv s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 40a09ff42dcc..926cdbe0eab8 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -3,5 +3,5 @@ DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f
 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
 EBUILD gobject-introspection-common-1.56.1.ebuild 1019 BLAKE2B 8f1d42b739389066c17614960bc214c616a9717d51e845b98ff0dc59fc10d484bda878a4149b358615568544d5b05259e2a788dce281bd4d5a70fe590373f4ea SHA512 db776369d3eb5af2c664aad6bd52a19f3d0371f9b84221c9cf65359cb625089e54b9b1aa9e3cf926b250fcd89e303a7fcffb34c0e5c58893583c82237a0c16f2
 EBUILD gobject-introspection-common-1.58.3.ebuild 1021 BLAKE2B 42f44b301be74849799c2f3b4382090aa2aa419bf50af10c7143c01251ebb9eab93997bef45e25680a3fd0d599e9bd4979bce5d6f50272199a923da6b3c7a2f1 SHA512 07e3ee6f0ec78190f024045a04b9ae3b83c34c4e495ebd99a9ddd1ad8233ca5989aa54158ed5c77bbff1d98bec21698bb46ac007c75ccd71dbfe23b50b3a4a02
-EBUILD gobject-introspection-common-1.60.2.ebuild 1030 BLAKE2B 5218b44c2b33f827ef1938baee886673372f1c549cb825fd828ccd985c5359297c29bdaae0f77e75a7abd968334f862d27ae63e73796cfce0b59078610ca2600 SHA512 69b3785d707c2ea62c8816961adba2d8e7022983a421c102d9eb46b34f0859fc4b0093eddd009c41e6c02988fbcbaf80102f968202a5c5e79276dfb927bb87ef
+EBUILD gobject-introspection-common-1.60.2.ebuild 1024 BLAKE2B f0374b9d3c75cdc9fdc2f495fbc4d6835f2d90a52d01f54eeea7b09a4760eed6680753f96f4921c6bed78ee06fbabbc7bf1d4c71b6f1bbea0086e8ff612bd579 SHA512 781b22523d1bfbee0edeaddba568cbf51260dff4cabf94329018cca5539ce66d6f2c208e30f1c8428e297bbbd2a2a5f3b335f3446378ac34154a2daaec789c44
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
index 27b259c27b3d..de62f83e3ef0 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index b06eceb140e0..51027f33c294 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -3,5 +3,5 @@ DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f
 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
 EBUILD gobject-introspection-1.56.1.ebuild 2123 BLAKE2B ee5a7866e95a1a70b74e2313e51a0b443ef2effa47aa9a119bb3c06442ba98e54e45c0d2fad34ade22fd0e1a8c9f4bb54fa4182f9acda62d0570ac30685f9893 SHA512 0e4c52cecf5cd72848f62a89402207c97bc6073472af2b0a3933dfc0f44170d06969f0bd9a0bdb692b3fffce4a1f4b40aad3b55fb9e932dc3dfa90637b9a28dd
 EBUILD gobject-introspection-1.58.3.ebuild 2201 BLAKE2B 53844bc18ba8ebe1e7f5e4e290c323bb02378793b43590bf9326c2af5fee6ad72d1083a37a2e16f654cc4c6a01e0dfa496954328ac1b9bca07aaea24791210ad SHA512 ede4515431a1d256694d18801416eb22ffe4bc6feb7cebc714178044acd396f2044c61976a3703add9066c99d08a2cad16e02b2c38cdd83725509584d4558bd0
-EBUILD gobject-introspection-1.60.2.ebuild 2124 BLAKE2B 2339e661c404552ceba7ed9a73999507da0def83f6e0185f305aab0e2b5e7245c7afd976a6221c6dc70a309055e8c050f783420c1fc54844a9c247c8f45a44cf SHA512 8be68cc09473492b6184c760690037142070ad52d9c4e9fe5ba02adfb645461e3025b38fcfadeec8c1ba168f8761970721c0b6ae312a42808a0a76bbec418731
+EBUILD gobject-introspection-1.60.2.ebuild 2118 BLAKE2B f1ffc01c08f1386c7d8a61d6b86d05ba0108e2c5f7dac3d1f519eb48ca86cf3672ea160c5aa3d2d6f3cb5df1934e179398fea8ca89ecb3b3c701cdf44f6651f8 SHA512 c513a4ecb0cf78cafa477680dcb3f1df773c0175e9b68fb84f6188a5de2523c9551a192e0fe7905581a0d951464ec21bd2c107408b1ed686d9eccdecaed71a2a
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
index 41b7103c3513..5161c5e448da 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index c7baa68b2acc..68d079dc0ff1 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -1,3 +1,5 @@
 DIST granite-0.5.0.tar.gz 365015 BLAKE2B 47b88d0b08a300fecc561161e1722cc1a544f58580d21244b6584f6aba7756afe6548dd663620fe9a09406fc0be2766b1d1093a21d262a5ab001992f309239ed SHA512 6042f40c1338768281ab3e6ad0bfdd8c5c69fc4951a069b0779a22b8999b35110ea8f09cf025dd88bafef7eca6cc0d076a608d55f01c078186e150908f8e4650
+DIST granite-5.2.4.tar.gz 390145 BLAKE2B 30abee1669bf2211aa776a5ddf38b914bc95e466f2853f4e852b77947b666c06ce8ac77a47b22bce0cdbf8e6804935007b5cef700c49db302528b7bbb0063543 SHA512 3a52a92a49f887bb802754b99b7c9c3fd13c197c74da7c25f1fd4c03b76d916197079b813909d2cceb11cb10b26e9f64978563b95319d0c744c5b612c50ce306
 EBUILD granite-0.5.0.ebuild 1233 BLAKE2B df2d0807d42020aa0179cf75b6ed3e6ce8f4c86fd17ee98ffc75220ddf08cc6cde6e472e7088ea493b843aaeabbfba863516873bd23a398e5a8e3531c880d6c7 SHA512 7cb63a7489f868bec6c6617d173f9faebc7012ca28a5f7ce5624f15eb9c3d6e9e8fea68913ec88d016162abea69f491ecb854414a4a8b9c87b49d12c3b89bdf8
-MISC metadata.xml 617 BLAKE2B 6f609311b7e71993b807c57d0f7aec4f7df646d3d70a36bf7509237e0d455a55bfac903dd7a2a00cc0bd0fa33f846152c9d0297ac77faf76dfcc3923e3d6fdd4 SHA512 83d352d15ff87be181c05184d4615aaf73fb56877fcfd63f257149c45a72c939751bf84812775207487305296d0d70f06f8be7c1b6c7fcfb7cdc0edbdec816c7
+EBUILD granite-5.2.4.ebuild 879 BLAKE2B d8e6b4e094c9979f2a3a914773e0572eedb4683f146ef8634d296788f4f0667b0b4e45627864fb8d8b0c37b7e2f37f0de92b49e3a78add2efc4de12b4c180aea SHA512 cf0f76ec976a2079f7cd82a8aae6f03a9c10db63dda055b7472b13d49c4892f4de5cbd9237cb4b454142313340adfdef66e3f126791024b716a13776580b631a
+MISC metadata.xml 835 BLAKE2B 20ae3ed5c84b3340f2e70a4c95bd80c1b769db96371c64fa8aa15e34591c2e206ba2a814cef4346613f173a48f43863e3fe64ea4a208840f7ff7ec7355e69ef1 SHA512 3d4e7730d8010f143314237e3c1b49f947ce00a1e60b9eb0c2ef46d0a8c3e2b4a5775c28b817b96234e6eddfa205c38d6ce270603a4567fdf308999a98ced416
diff --git a/dev-libs/granite/granite-5.2.4.ebuild b/dev-libs/granite/granite-5.2.4.ebuild
new file mode 100644
index 000000000000..29e4040c1284
--- /dev/null
+++ b/dev-libs/granite/granite-5.2.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION=0.40
+
+inherit meson vala xdg-utils
+
+DESCRIPTION="Elementary OS library that extends GTK+"
+HOMEPAGE="https://github.com/elementary/granite"
+SRC_URI="https://github.com/elementary/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+# FIXME: Figure out issues with enabling doc.
+# See https://github.com/gentoo/gentoo/pull/12690#issuecomment-525027164
+IUSE="test"
+
+BDEPEND="
+	$(vala_depend)
+	>=dev-util/meson-0.48.2
+	virtual/pkgconfig
+"
+DEPEND="
+	>=dev-libs/glib-2.50:2
+	dev-libs/libgee:0.8[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	vala_src_prepare
+	eapply_user
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-libs/granite/metadata.xml b/dev-libs/granite/metadata.xml
index 6ae6a460b068..9c251c8633e2 100644
--- a/dev-libs/granite/metadata.xml
+++ b/dev-libs/granite/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>bernardo@standard.ai</email>
+		<name>Bernardo Meurer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Granite is a companion library for GTK+ and GLib. Among other things,
 		it provides complex widgets and convenience functions designed for
diff --git a/dev-libs/hsa-ext-rocr/Manifest b/dev-libs/hsa-ext-rocr/Manifest
new file mode 100644
index 000000000000..e457cf99d4fe
--- /dev/null
+++ b/dev-libs/hsa-ext-rocr/Manifest
@@ -0,0 +1,3 @@
+DIST hsa-ext-rocr-dev_1.1.9-99-g835b876_amd64.deb 1113746 BLAKE2B ff1d3418febdde505e12a3a41b39a15d6ed28e97f62700ffa4b7bfbc618b23253026e3978e1293cfa2c06742c78574510e08969e1e1524b82b94a45d98efd2af SHA512 e7c799e218eaee6f926fe309b470af00e0ef7e4974a3dd67231c1c904a0a036e62b1ce3b176bb0c13c0fa65a718443f06e7472e3e66225d818074620e46350b1
+EBUILD hsa-ext-rocr-1.1.9.99.ebuild 1310 BLAKE2B c75ba48d312251789df0769b171e90a1a7fe65f4678d7786f3a0261123854b19a472f27ab47c5759a2c1b67c38d28285e6a04bf1fbae622280e3c68b41ef45e8 SHA512 177b9a26fb6d827679a95146fe77a70f465ba7358b6195b4fcf5d3462349b2910609f4ec3c8233875a9308d47a687c13ef8791e83f20f469b1e12bd1cba8bc40
+MISC metadata.xml 804 BLAKE2B 53bf694f8db04562ed3dcde4ed009a447f913d545012b511d0321d230ed9110ab73da69c2b5ac295eea48a705a8defb4409326d4f4001727139ce3ce2b7b699f SHA512 9f1c2af7864205799b5b2f36be15148de6b0d3ebe8fa6f1ca578abcf5fa6c4b08b24082a2a32e93fce71de25756c7644989b51e63b765516ad63f63a5eb880b3
diff --git a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.99.ebuild b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.99.ebuild
new file mode 100644
index 000000000000..7d91362d6a00
--- /dev/null
+++ b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.99.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker
+
+MY_PV=$(ver_rs 3 '-')
+
+DESCRIPTION="Proprietary image-support library for Radeon Open Compute"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm#closed-source-components"
+SRC_URI="http://repo.radeon.com/rocm/apt/debian/pool/main/h/${PN}-dev/${PN}-dev_${MY_PV}-g835b876_amd64.deb"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="-deprecated"
+
+RESTRICT="mirror fetch strip"
+
+QA_PREBUILT="/opt/${PN}/lib*/*"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Please download the package"
+	einfo
+	einfo "    ${SRC_URI}"
+	einfo
+	einfo "and place into your distfiles directory."
+}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_install() {
+	local destdir="/opt/${PN}"
+	local soversion=$(ver_cut 1-3)
+	local somajor=$(ver_cut 1)
+
+	local solibs_to_install=( "libhsa-ext-image64.so" )
+	if use deprecated; then
+		solibs_to_install+=( "libhsa-runtime-tools64.so" )
+	fi
+
+	into "${destdir}"
+	for solib in ${solibs_to_install[@]}; do
+		dolib.so "opt/rocm/hsa/lib/${solib}.${soversion}"
+		dosym "${EPREFIX}${destdir}/$(get_libdir)/${solib}.${soversion}" "${EPREFIX}usr/$(get_libdir)/${solib}.${soversion}"
+		dosym "${solib}.${soversion}" "${EPREFIX}usr/$(get_libdir)/${solib}.${somajor}"
+	done
+}
diff --git a/dev-libs/hsa-ext-rocr/metadata.xml b/dev-libs/hsa-ext-rocr/metadata.xml
new file mode 100644
index 000000000000..d61b59ba30a1
--- /dev/null
+++ b/dev-libs/hsa-ext-rocr/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
+	<longdescription lang="en">
+		For the time being the ROCm platform relies on a closed-source library
+		to provide HSA image support. In the future it will either be deprecated
+		or become open source.
+		Furthermore, this package optionally provides the "tools"
+		debug/trace/profiling library which has already been deprecated.
+	</longdescription>
+	<use>
+		<flag name="deprecated">Install the deprecated debug/trace/profiling library</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/ilbc-rfc3951/Manifest b/dev-libs/ilbc-rfc3951/Manifest
index ce502a40ac63..df54d71469dc 100644
--- a/dev-libs/ilbc-rfc3951/Manifest
+++ b/dev-libs/ilbc-rfc3951/Manifest
@@ -1,4 +1,4 @@
-AUX ilbc-rfc3951-asneeded.patch 441 BLAKE2B 94e1c3b911c1eb18ecf162c43c8b653c1ace3be2ba868a05aa541b456c843e2972fb6f3195e336c0b3014cf2179395623920a48a8b69c6cdf125c005b288784a SHA512 bbb81eb3fe6a6004c5766299fd437247b3c4a8e11022a202943c332132026d8d2f3d74eeba4161533255e61dad5f26b60499012823c0928d740ac96e7bb188f9
-DIST ilbc-rfc3951.tar.gz 330306 BLAKE2B cf8c56d9fc3dd2dc6a2dd241f3b0cddb7e7f6cea126056d2ab94aaf8add382f1bc1d9b03c9a91110197e0d82253ca8e824cf37bc1622af26fdf0939204736c35 SHA512 7828a9c5a193ebdfcb383d1edad0868afdee0f71d1a8a878c7d9ea2078fd63f57d31b34ae2cf4890d5abc28c8f5f4ee940c665a126f0512d1e79c4f76a72fbcf
-EBUILD ilbc-rfc3951-0-r1.ebuild 682 BLAKE2B 830cad2ddf91315eed64b223a2a6b9aebc1049141d83143b2849824ef457a90e18829ba7679a43062eadc735d57540f14d432ff26e8c147d1ac46191aa1414f3 SHA512 fc99ff46599e79652aec994a3f9e865b241241194b037646daf22d44b4404620312fc00dcf08e5906c52640af02f14876f08695c3f3bb3f404017a3842510f6a
+AUX ilbc-rfc3951-asneeded.patch 368 BLAKE2B 63ee534e58ce3cb791711e14797942b14bb5295c8e91e90e64891d40469e18fae13729a10b308e101f24eb06fd5afa728889b866cbb5f97fdc1f56ac2a7d1edd SHA512 6450bfce84f5fe9895117ec45dde903cef308bb7e8a24171874091582a67754be380fed534e779b8158c3880319d8ddc774a4a94135b6deb83b425dc430f5954
+DIST ilbc-rfc3951-0.tar.gz 330306 BLAKE2B cf8c56d9fc3dd2dc6a2dd241f3b0cddb7e7f6cea126056d2ab94aaf8add382f1bc1d9b03c9a91110197e0d82253ca8e824cf37bc1622af26fdf0939204736c35 SHA512 7828a9c5a193ebdfcb383d1edad0868afdee0f71d1a8a878c7d9ea2078fd63f57d31b34ae2cf4890d5abc28c8f5f4ee940c665a126f0512d1e79c4f76a72fbcf
+EBUILD ilbc-rfc3951-0-r1.ebuild 754 BLAKE2B 7451087f23e9d937ac67f4ad5e4c0e828df140857eb8408c6f951b1b925ef788bbad6165f1cb4ca5edd78cd035f06f2f05ea8bdb86825ae1b1f90db8c8e3eca6 SHA512 4e1ba5fb3a8c2a7b929b9c7dd24ddecd97f7a5327c0ecadb051af43818f1147394a9b71acbe11c3cdb38d5fb5fafba27d8ec26b6059e43cb371fd1c691939906
 MISC metadata.xml 239 BLAKE2B 9d90102c70502e3f729b461b00c463f8958602cf2464e9834a5d680a802a46655051b741c47ec0eed98fb758f8a9e388a982c2db65bd644205a4f9bbd6a8d638 SHA512 c9696a97f8ba113ea6badf5fcb179b749639703ddea443d6d8170f0982214e59bd0bbe58b5e99f847c953df2d772d0bac6b2dc72f89b146ba55ea69e177a7615
diff --git a/dev-libs/ilbc-rfc3951/files/ilbc-rfc3951-asneeded.patch b/dev-libs/ilbc-rfc3951/files/ilbc-rfc3951-asneeded.patch
index 8cc197d20626..115d339dd861 100644
--- a/dev-libs/ilbc-rfc3951/files/ilbc-rfc3951-asneeded.patch
+++ b/dev-libs/ilbc-rfc3951/files/ilbc-rfc3951-asneeded.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am.orig	2006-07-11 01:18:20.000000000 +1000
-+++ src/Makefile.am	2006-07-11 01:21:20.000000000 +1000
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -10,6 +10,8 @@
  doCPLC.c     gainquant.c      hpOutput.c  iLBC_define.h   lsf.c          syntFilter.c \
  doCPLC.h     gainquant.h      hpOutput.h  iLBC_encode.c   lsf.h          syntFilter.h 
diff --git a/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild b/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
index 075b530085fd..c93ceda1bb01 100644
--- a/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
+++ b/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
@@ -1,29 +1,34 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="iLBC is a speech codec suitable for robust voice communication over IP"
 HOMEPAGE="https://webrtc.org/license/ilbc-freeware/"
-SRC_URI="http://simon.morlat.free.fr/download/1.1.x/source/ilbc-rfc3951.tar.gz"
+SRC_URI="http://simon.morlat.free.fr/download/1.1.x/source/ilbc-rfc3951.tar.gz -> ${P}.tar.gz"
 
 # relicensed under 3-clause BSD license, bug 390797
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
 
 S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/${PN}-asneeded.patch )
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-asneeded.patch
+src_prepare() {
+	default
 	eautoreconf
 }
 
+src_configure() {
+	econf \
+		--enable-shared \
+		--disable-static
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index f279f0437d01..17e3b6577299 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,5 @@
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
 DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec819f333f00033ef90acfd5b926fdcc743badf403af797a6f58fe58d195ec0cdf4a1514629f8a1e75c20a6e2f6 SHA512 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766
 EBUILD jsoncpp-1.8.4.ebuild 1370 BLAKE2B a84a5ca2b32fdaf245dea03c51304e026c11428eafe2ad4a1ae36d9d394a968a6f10aee504d08b590dd2ac9d8e060e96bcae182a2178e35c7aa9d5ae40f4e0fe SHA512 b942c9e5cda3e95b10e89c88179ea279fbd7f860364eaec5ad92210c9700c916af7ac5e04925552c0599291a4ea60e4a46a451d6c6bc9b882e66f95a7f24beed
-EBUILD jsoncpp-1.9.1.ebuild 1342 BLAKE2B 978f21e2b3cd2fd0666218c861c9f0bc58f6d975d914e057912a4b543e34ce051897e33e2f6b824ceadbf4e1fcf2bc6736772bade96fc7b1b0a9b30c0432db1a SHA512 06b5ba2d79ad6765e33c86b674cc198f4a21f525e9f9b228b9808553aa49d390dce3f240abc623cd5b7c6467365e4937feb7e1ba65e5797ab39c2bce959f302d
+EBUILD jsoncpp-1.9.1.ebuild 1379 BLAKE2B 5318c296941442235f768096d378a3b0ffef0a6ad6845f6a293f383a9a5ccb83c26444446bfb4effa02d15d523e61c01b068770a61598d6f6ee7204d7eac89d3 SHA512 be851ad927e2a6e3f95aa65544d4a9430f90179217b3f5f862a194306f4965a159b2ed1e0ec320deedb334a337b570c2f018032fc49dc49401b8ca8db4663904
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
index eff2699bfb89..1c614ed01686 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
@@ -56,6 +56,7 @@ src_compile() {
 	cmake-utils_src_compile
 
 	if use doc; then
+		cp "${BUILD_DIR}"/version . || die
 		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
 		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
 	fi
diff --git a/dev-libs/kasync/Manifest b/dev-libs/kasync/Manifest
index 6cc238b50ca5..50bdb4a84441 100644
--- a/dev-libs/kasync/Manifest
+++ b/dev-libs/kasync/Manifest
@@ -1,3 +1,5 @@
 DIST kasync-0.2.0.tar.xz 28952 BLAKE2B 1ca17023a9350024195b3a840cbcea8e180fea9ac1a4ea1601c30d70c68a613bb677a65ca8a4c36552bf998a14098342f66855f84a603d2853d4df43f3466e3e SHA512 cf0d59c4ed6978552599a1d36c08df180357e112867f3730f57b13673943eb365acd16892450f100e9e5f122220a06df64ee006a0d3651d0f05d78cb5195094d
+DIST kasync-0.3.0.tar.xz 29060 BLAKE2B 0d2eeeeb296db7162426848c5467ee51e3530f0cef97cc345231fbde3225bc29736458c7e62938c7c9773742a9e4d3ed1f9545ac9d570cc5324321bc4e694e3a SHA512 a521862bafdff2931a3f01ef4393c6ae8f3c4655bb58dc2ddb4fde5f443d67b1a23d0c21491b2099ad6dae53d8894588b49299c45d334956b36ccedf94b17f9d
 EBUILD kasync-0.2.0.ebuild 318 BLAKE2B 16703ac8f943452caf248d651c5a9658c2f6ca047832e8c9f77858d6c3d5fa1badb3175ce7f87c3a43ea495674958cda35124e9fe245679bdd7821e5fc4c709d SHA512 8c7af6d006da084f93d8d48e1062999da82903b62738ef5134c7e17c29ff7b5a88c91f1453ffc4cb5e8fc5aabf54a99208d72af25104102ed10309ac8168531d
+EBUILD kasync-0.3.0.ebuild 318 BLAKE2B 16703ac8f943452caf248d651c5a9658c2f6ca047832e8c9f77858d6c3d5fa1badb3175ce7f87c3a43ea495674958cda35124e9fe245679bdd7821e5fc4c709d SHA512 8c7af6d006da084f93d8d48e1062999da82903b62738ef5134c7e17c29ff7b5a88c91f1453ffc4cb5e8fc5aabf54a99208d72af25104102ed10309ac8168531d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kasync/kasync-0.3.0.ebuild b/dev-libs/kasync/kasync-0.3.0.ebuild
new file mode 100644
index 000000000000..2a0fc33b2de3
--- /dev/null
+++ b/dev-libs/kasync/kasync-0.3.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="C++ library for controlling asynchronous tasks"
+SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index e29cb47b85a4..fb7d5f1a4041 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -14,7 +14,7 @@ EBUILD leveldb-1.15.0.ebuild 1230 BLAKE2B bbaa78014b6f36a8c6d8e5a71ff56995b95f9f
 EBUILD leveldb-1.17.ebuild 1720 BLAKE2B 683381ebc3ae11d8844e52fb2c7161348a6495f4f83bd29369f991d4169619d526ae6bd1ed878bae9269715da5a9d7f80efc298253fa78c35aa1c7eea9b98bd5 SHA512 a59df720d900c7da98a4e0c9c865f5cb962b1843461289cd0a4e78cbcb5bcfff93b0d4213fde486df0a9f5d2dc7bfe86ecfec757c83513932fb1ab02859feb25
 EBUILD leveldb-1.18-r2.ebuild 1878 BLAKE2B 8a31c57e1e5e6015b549e55b83277c47be0b882f695f3af8f2295ea801380cb02ac0e0691a2a9113bccbb39e4a505a9ceeeaa2c0f9be3644afb1eb4c5949d7b3 SHA512 865cc8d9fa5b956e3b31863d3ce4d18624bda106aa06c0176ff514c7cc3b7016edb0dd34dd5724b5fe4a9ef231ceaf2b59ef47ac9589c66ca4979254b4703075
 EBUILD leveldb-1.18.ebuild 1647 BLAKE2B 65c40aea5784964fcdf7550ff41f20980b61e3eae2e69ea790d1e1db1c3b152abb18c7ec679bbdaca21c2c91ace348e7b8a8bee53fa5c39528f1b0c1ac76108c SHA512 5a8feaeca45690fbb5d6f7ecfe7074e176532765900cb343107da542b32e61935bb0832a6682550d57a7e74bc20fec0469a7b0b20a1de9636f628fafd3de4193
-EBUILD leveldb-1.20.ebuild 1734 BLAKE2B f11bc9aeb85706437e4fef3519870b3fdfbbc11473c89d1936074fce6da7fe62d45279e9604a05c2cc0c813b4b01caa26e5e0ae12b18138b7fb255e62c21b028 SHA512 ca4bdbf333522c199c0e192a779c50bc506cec454f95a599b83e595593a1e39d1e82e49bd342a178b5fd38ef074ce05e8cf689ca9f5f8db585207e807ee43e01
+EBUILD leveldb-1.20.ebuild 1741 BLAKE2B 0d44963523ba5fe7f2075523fc52ef45487e1b410749ca4257020de639bcadec1fd46a271f481b654748de9f80bb661fe3d8201ec3e52c158eb004c2a91064cc SHA512 8eb0bd8e052cb7f54984702f0236fe1e24ade3bbefb2f65df89d2dcde392502696b0da5fc6bc5d79281629b09c9c9d8316b0c90d72db5e937dc1f27528999529
 EBUILD leveldb-1.9.0-r5.ebuild 1223 BLAKE2B 7bbb2958034b96f22b3bb5e55fd9f1383e2cd01b7a523dc32ead090b31cefcf4299d581e85430dbec267746ded520ed21ddb89a5fad9c40a1f6a652677961ecd SHA512 a97ee6357c3e37208d7900f216e4d4270bd7b6c9add1449e3a0c52d49755a1be88f6008e9ae9bb6a021d3345fa57db18e3751073a63ccc8e4270e7ba684216ea
 EBUILD leveldb-1.9.0-r6.ebuild 1277 BLAKE2B 9e581129c37d33f46037eeef50916c5ce6916e6f671f01144b9f0f7cffed096dff724076f36261d552df6cd8f396a38725ee476258211a1cdbf42af9bef6b289 SHA512 ca4965119338028813e0cdb5d1b303c88ef2e2450f471f4d58e16a276485fcb001d6c4818097f5b0c47eb66ce1b23b561ad37809415654c4cee771d0ac17137a
 MISC metadata.xml 487 BLAKE2B 33632d0f2ef6a0ed11b059a6245ec9582b1e977622a9a755e4ae98cd1f8dd8f853c0ed0aea919b11451c57c576699f4e9a22bd1303148eacec6fc2770f47492f SHA512 61c9350d750209e948d6aa51a3594546837e425c49dede490c0171771e7ff5a2e03932f5052ee90b36e477a20153bde3c265036839e2723703677414bd77d0d3
diff --git a/dev-libs/leveldb/leveldb-1.20.ebuild b/dev-libs/leveldb/leveldb-1.20.ebuild
index 148679ff2a54..55249828b5ef 100644
--- a/dev-libs/leveldb/leveldb-1.20.ebuild
+++ b/dev-libs/leveldb/leveldb-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 # https://github.com/google/leveldb/issues/536
 SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+snappy static-libs kernel_FreeBSD +tcmalloc test"
 
 DEPEND="tcmalloc? ( dev-util/google-perftools )
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 49f24cfd2450..74a25ac05e07 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,5 +1,7 @@
 DIST libarcus-3.4.1.tar.gz 29699 BLAKE2B 73f132ff9d908468f1d67c54b7430ac84c0aebb5dd12282dc894b877a91da3f9822e4db8bf16cb53f313396598d3890be9e06e50737b0a50edfc84543285f251 SHA512 63ed8d8da389641b91ed955624c04ca5488f98d3ef409c4a94ad1962155d6aedd8d61ca0231543cfe4e92ae10beb00001f957eb48f74b0c21447a1bd9b66d85d
 DIST libarcus-3.6.0.tar.gz 29469 BLAKE2B c032dd51631b10c04e69dac4425c8a5d180cf8c983b896330b2dcd5d479467d6a2e94827ef8accad25399167457e5ae9e96f1a363c986be33de8255c3e80b1fb SHA512 1bc50a08cbec61edefd78f3c347cca08f6bc40a308472bf6788c2c8962b03ea81b32357be18a3c34847c121eb52ee6836da22cea65b1a8f64b7c924bda290430
+DIST libarcus-4.2.0.tar.gz 30582 BLAKE2B cb2390d7fc8942cbdd880385313f4bd8886a1ea4eaa5246c76b0b3243e8a099953ecf51d09486e005c8c14783ec67435b33068efae2ea6075edf91b90b9fa9b2 SHA512 f9a38d095a2ba2ab29a382466ce16d1c0f5cdb34b60a2b930529edac94de177d7bed37ee26bf615833c94ccd0e3b7c71d502f5f815d92eeffdf3bc1f15b49ba5
 EBUILD libarcus-3.4.1.ebuild 1085 BLAKE2B 9d15a9454356b09eb8f05a4548bf49ee8d9ce710d47ec89baf5d11cfbc8b1c9dcc2db503e491f3558eb9da4e5456e823a51fbf7aec33d7ef68b6906d572d5d99 SHA512 95709735d9f791bb344442964ca877d480060ea8fe13c82941a30fbcdc84da2ab9c055570f37f6dd757c5347dd1451759558c73f8a02f7fd22215cd5c9f54a77
 EBUILD libarcus-3.6.0.ebuild 1082 BLAKE2B 733d32a831ac633bf7c16381686b9dadee78308180dece9d442e6c1b52a0ac650c6c074331d7e3cce7c7fcca028aa1f534adec2947ed9abef06164442c94c71b SHA512 5b73e47eed0860fe6fea6be6c442a5e1129bebca414dee7f053ba896cc920a53f059947da785324d00e0c01d9ecfd2cc9b5b89c0b12428b4945e14b9941d9419
+EBUILD libarcus-4.2.0.ebuild 1000 BLAKE2B 2ad2ccf6a15ca1ee672b35eda65d78cbd86e6688ae936b4b9c12646f82f9e4cf50ae8d1ddd3a33c3a4c5e4ba6e0126072469f12443530bc43060890daaf7f3a6 SHA512 65df9fb5e3d0772c5b71dbf5964de27115d6b692f0db6d6581b414480c6c7186c44121da1c9cd6d02abe1ea87fb0aa8fc56016af7bf5d41483d017e15aa70564
 MISC metadata.xml 860 BLAKE2B 9375bca572d46d985fbbf11b222728cdaba22c2fde64e1b4a057d2920b9845bf442bb35ce0b2b1e78fc949cd687604f9f89d5b5665e3cee7afe5b69f09f5ed2b SHA512 9dbfeff3c641642edfd27fbbd27d2ef5810833e4cb3ae5b949c1a20c27377ac70364010fc9fbc759f456e93f294af62f3c08c59bb0585a3ca01f5cd157b3b33e
diff --git a/dev-libs/libarcus/libarcus-4.2.0.ebuild b/dev-libs/libarcus/libarcus-4.2.0.ebuild
new file mode 100644
index 000000000000..1cf2de72fc49
--- /dev/null
+++ b/dev-libs/libarcus/libarcus-4.2.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit cmake-utils python-single-r1
+
+MY_PN="libArcus"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libArcus"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/sip[${PYTHON_USEDEP}]
+	dev-libs/protobuf
+	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_EXAMPLES=$(usex examples ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 15175bce8155..7b47aa171d1a 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,6 +1,6 @@
-DIST libassuan-2.4.3.tar.bz2 559867 BLAKE2B b80f73573449aa1705ac3b4f12f89cac6a19bf4b2ed8f46d5576164196300baeaeb782c997078ac252a564b9f6067df87a340b46c68058d4a28c8291bbecf96b SHA512 2b0f58682b408fc58fa0ec2980b36e54ba66701bf504cf6c98ec652af43501bc7c18573bc78c5b83260f5a3bdb0ec8f4e0662bafd9bba3fe7287e77598e8e4c1
 DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80445b48aec1366d0b997386c57187f9b7a848973d0930ca8d2be3f138e83c22ef9292e4c8bf5614a99ea3065c7827 SHA512 c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
-EBUILD libassuan-2.4.3-r1.ebuild 1088 BLAKE2B 458d0bc83d786010d8baa61a4a7c195a1c0081ee6e592ca3d29be23aaaccea5497e4927b706eb3ff63a9d07360046e02474c31ca03f8bab94af695db3611faaa SHA512 e37bd3bb1d513367b556210b9a395958f42773f5ecb4252a525717fbaa769c9a0911f6586a920c264ef388c382aad148747166c02e4bf8919c960b16c129638f
+DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
 EBUILD libassuan-2.5.1-r1.ebuild 1277 BLAKE2B a68374f1c6bba14f1d8ea1b19c0c36e1c1331a9c3b3aa55df25af0c854eeea7a4b242f54201c4d9b33754c6554689f78e88c19a300d74926290139fb7bc87077 SHA512 4ee1da02a2e37fd5f3a56539035fe91b87a2255096b59f8ca3961f07b2e1c97d672039a0009fffbdf6478c6a9ed84e4efb5ef6f0fadb885c9d0784d00bc263fc
 EBUILD libassuan-2.5.1.ebuild 1087 BLAKE2B 16d92a4b99e67f950b73ffd544b112833b3da5ec14d7eca14d40651bae83a5b96eee71f751190b4522aaf969fd4fd8df492a85b5cc71baa41d7c284795c84639 SHA512 8d9b67ceaa45c369d93c0fff2a56061d49c056aefe9a67dfee92d508d8bdf323f5651e912480d246964e4a0bb653a22f107d1ee141b3978affccd3798ece6194
+EBUILD libassuan-2.5.3.ebuild 1286 BLAKE2B 54529ba7175c4ffbe823cd5bd9d70ceae3c5953aab779ebe5ae3cd0c64d2f9001efad3db41924edc370df56e5b3d69b9abad0df12907a4c5006afb78df834189 SHA512 31575c9f72f32b732a2e90ecfce3d54569b2086831fadf8f100d9318f67d75bd9cf60ded628655b2cc03193a253b480db58189d7684fa543c082915f5babad7e
 MISC metadata.xml 858 BLAKE2B 2fc69cd4f58f8764d9d43c0b89be8765fe6d8bdab1dc8c0de634899d6ae22702ae1d7cac1b9cd69999fc297dcaa7a7386872cabb63f905558a20f736b500ad5b SHA512 cb46245a5f02ad762cb86bb18ca13fee1e9df22c6e1e367c16c9392680722d4852834c6d4d259d7ca71d817ecac22bda120da75513d6f17d243fd8db062f4303
diff --git a/dev-libs/libassuan/libassuan-2.4.3-r1.ebuild b/dev-libs/libassuan/libassuan-2.4.3-r1.ebuild
deleted file mode 100644
index b7f485950915..000000000000
--- a/dev-libs/libassuan/libassuan-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune
-
-DESCRIPTION="IPC library used by GnuPG and GPGME"
-HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		elibtoolize
-
-		# fix standards conflict
-		sed -i \
-			-e '/_XOPEN_SOURCE/s/500/600/' \
-			-e 's/_XOPEN_SOURCE_EXTENDED/_NO&/' \
-			-e 's/__EXTENSIONS__/_NO&/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	# ppl need to use libassuan-config for --cflags and --libs
-	prune_libtool_files
-}
diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild
new file mode 100644
index 000000000000..8aa761372375
--- /dev/null
+++ b/dev-libs/libassuan/libassuan-2.5.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool
+
+DESCRIPTION="IPC library used by GnuPG and GPGME"
+HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.8"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		elibtoolize
+
+		# fix standards conflict
+		sed -i \
+			-e '/_XOPEN_SOURCE/s/500/600/' \
+			-e 's/_XOPEN_SOURCE_EXTENDED/_NO&/' \
+			-e 's/__EXTENSIONS__/_NO&/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+src_install() {
+	default
+	# ppl need to use libassuan-config for --cflags and --libs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index fd992faf7db1..c6cd27824e72 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,9 +1,6 @@
-AUX libbsd-0.8.6-sparc.patch 832 BLAKE2B d02e16c7d338239ab56c6a1ce88cbf0e0c6736208ac40bf2272fbae5ddf16f10f89701515c69d81d541286012b3b9ce8fe0322197331f9c9b6293aa8454e53c1 SHA512 5b476340a35a02a15706ab7704f4e78b5f78f87e471a0749624ad4f37f9459e2d90c35fbe7984a226f247f26a4809c6a79d1c792e6c1ed64d2a9b4b984513055
 AUX libbsd-0.9.1-missing-header.patch 1165 BLAKE2B 03cd6fe04b969a3216300fa9b7d7072610047661e0b41e2dbd1ff2c471ce3c215ae31170ea0f15c775a2c68a000c3ecfa563f76ed854079609648f384615fd4a SHA512 d77b5b631aab66ce71d8170d899a0440e342be5be304719c7f576e6fa5756d432b4ec5a161582f281de00d9a2eb1aad6237e6be1c550284cdc7e30822b51bcb7
-DIST libbsd-0.8.6.tar.xz 371112 BLAKE2B adab6c17267e0cff128351efccf5c1225b7dd85dc61dd8168bf212ba5aff8d726fa5be687c041821af9a427ddad9dfcd3630cac9134b9e81c86ab2599e43aef9 SHA512 ece01ced324f840c2cee6321c7dcf97ff123d55ea9f203c1ce35e1b46643dc7b34ef6dc6c8d128252b36848624850b40823411cc96b99a66a401eb1e9d8cea6b
-DIST libbsd-0.8.7.tar.xz 371772 BLAKE2B aa4aa1c19872edf9e7e6ed270275199366345531a48ee28c25e209f17c5403a22269b91ab1c806cb1b54ba33a8464f4b035fe7ee2bc5dddd0a4fda09c540b058 SHA512 605a14eb5d33c0e45c3bd29e585ebc15832e2ed1efa9356291a0562622168da96db1a20766e9dae8910ea0c1516429f43905edc8d4f2a40a5a341a689d08fcc3
+DIST libbsd-0.10.0.tar.xz 393576 BLAKE2B 66005a511dae7fb799322c813b8ea058ab460e3b9044756d6efad5de741d8f70270496f09803bbce8cd0000ff37e998f18e092037c850826c3c8e3f47ddfdb28 SHA512 b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9
 DIST libbsd-0.9.1.tar.xz 387180 BLAKE2B 40dd82ca1088ee7aae8b3d7685e8514eec702bf7ada7ef98f7177cad92b7e0fccc22a953b35f0f27202eb56833b31a81bef1324d43864d1b80887ba7c58684d5 SHA512 435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c
-EBUILD libbsd-0.8.6.ebuild 1274 BLAKE2B 34c2102e9d8960bd9336a3b42d564883f572d14092a465c61ada7b6413b6840381a8ac683aa2d711ac0ee049c507ec1c1f4d256dd2a3a36a405e260b4b904115 SHA512 538bdf8db0f079ac60b0953b19f0374a57b389df6e7bc640a13071abe60812cbd51b4ddc379845f4dc8c822d634de784d3a791e31a64e0a95a9797a916cb266d
-EBUILD libbsd-0.8.7.ebuild 1279 BLAKE2B 9d22702c2d0c2332b157c4313d3620e6e2d35f0f4805fa36546f3b82c25daacfdf7592c06cf88a5e7fa371081641a1b54eac11caae485dcd2d1230effac87c8a SHA512 28d15bb66b724e61daa36ba43513981ac54e3e0688174ab5aa8186f29d947b3e26d608fafade0687767dafd2931ece77ded44c68848840fa1041864adfa57f90
+EBUILD libbsd-0.10.0.ebuild 1248 BLAKE2B 966ec0504283ad8e6a50e956c75f6125820e5c6c4b4e199dd24b0a84889ba9c52131d09464daf651b45dd0e48b82ffd1f5ef78aed9889e645f7e95a39105906e SHA512 ad524116200a19498374b424f0f34c86ee7e82b176d56b1ed0e5e6b91e98c3ce5f5d3c0d00bde1150df8315fb25f39040d37bd0413899b0aa2b29672b25bd636
 EBUILD libbsd-0.9.1.ebuild 1283 BLAKE2B 7ab75ea2173790f66c0910a9bf913a34b51be3d41fc3c4bcc5186053b8cfb9f3259e4bee24af6096b100ff5f6c8742e86676722be24aae1ea0503f0a07819c01 SHA512 2fe38faadbc7f8a14bd26f10cbd312f82343743b6b822a6e2dc3ec3e552abc1a988fb0addcd6a9e81ceca3184a2ac188872f4bf890a2e3d8fa20269f8f4af3b3
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch b/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch
deleted file mode 100644
index d2c35d8dc4ed..000000000000
--- a/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0b65d43963fc1bea195e94e3af922a7893bf6fcd Mon Sep 17 00:00:00 2001
-From: James Clarke <jrtc27@jrtc27.com>
-Date: Sun, 4 Mar 2018 23:44:52 +0100
-Subject: Add support for ELF machine EM_SPARC32PLUS
-
-32-bit SPARC on V8+ uses a different ELF machine type.
-
-Fixes: https://bugs.gentoo.org/634550
-Signed-off-by: Guillem Jover <guillem@hadrons.org>
----
- src/local-elf.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/local-elf.h b/src/local-elf.h
-index 1faf182..f7cbd83 100644
---- a/src/local-elf.h
-+++ b/src/local-elf.h
-@@ -186,7 +186,11 @@
- #define ELF_TARG_MACH	EM_SPARCV9
- #define ELF_TARG_CLASS	ELFCLASS64
- #else
-+#if defined(__sparc_v9__)
-+#define ELF_TARG_MACH	EM_SPARC32PLUS
-+#else
- #define ELF_TARG_MACH	EM_SPARC
-+#endif
- #define ELF_TARG_CLASS	ELFCLASS32
- #endif
- #define ELF_TARG_DATA	ELFDATA2MSB
--- 
-cgit v1.1
-
diff --git a/dev-libs/libbsd/libbsd-0.10.0.ebuild b/dev-libs/libbsd/libbsd-0.10.0.ebuild
new file mode 100644
index 000000000000..383f350fac24
--- /dev/null
+++ b/dev-libs/libbsd/libbsd-0.10.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
+HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
+SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
+
+LICENSE="BSD BSD-2 BSD-4 ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND=">=sys-kernel/linux-headers-3.17"
+RDEPEND=""
+
+pkg_setup() {
+	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
+	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
+	if ! has_version ${CATEGORY}/${PN}; then
+		if [[ -e ${f} ]]; then
+			eerror "${m}"
+			die "${m}"
+		fi
+	fi
+}
+
+multilib_src_configure() {
+	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
+	# which is correct, see:
+	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libbsd/libbsd-0.8.6.ebuild b/dev-libs/libbsd/libbsd-0.8.6.ebuild
deleted file mode 100644
index 1d417a410989..000000000000
--- a/dev-libs/libbsd/libbsd-0.8.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="BSD BSD-2 BSD-4 ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-3.17"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.6-sparc.patch"
-)
-
-pkg_setup() {
-	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
-	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
-	if ! has_version ${CATEGORY}/${PN}; then
-		if [[ -e ${f} ]]; then
-			eerror "${m}"
-			die "${m}"
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
-	# which is correct, see:
-	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libbsd/libbsd-0.8.7.ebuild b/dev-libs/libbsd/libbsd-0.8.7.ebuild
deleted file mode 100644
index 8fe9b46741c7..000000000000
--- a/dev-libs/libbsd/libbsd-0.8.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="BSD BSD-2 BSD-4 ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-3.17"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.6-sparc.patch"
-)
-
-pkg_setup() {
-	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
-	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
-	if ! has_version ${CATEGORY}/${PN}; then
-		if [[ -e ${f} ]]; then
-			eerror "${m}"
-			die "${m}"
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
-	# which is correct, see:
-	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index 2b0973d8259a..1334d7d4480a 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,5 +1,7 @@
 DIST libcharon-3.4.1.tar.gz 143489 BLAKE2B e8eb5317c708b808981cf8cb53614b54a34abca284457716b7997633a86e3cc2101f788b5c39b9292944d884985f3c342459626282695be484be5adf32b53501 SHA512 9aa269e477ce6c5c563986fcfd0061032dc58df30a7bd687a243db06ef071e888d45cc2c47cfeaac0837672529d6b3150a0a60d0cb357cea5035e47ba16115f3
 DIST libcharon-3.6.0.tar.gz 143947 BLAKE2B 5787f734e0d494eb9fc151fcf240c36b0ade38546fbbcc4e563c4d746d3e3634bd7e599e8258c0f05d96f33f6ee8283101c7dcaa1e3583244e0109bdbff7a041 SHA512 15d2b0f348bb70ef4fd92e9a4f11ed8d70bd8ee0fcd1e1e8c71d4e04a54fb5dff66f7abe81fea34630f3e200dd1aae39c697dffd95ff35fb60ff06f4a443e8b4
+DIST libcharon-4.2.0.tar.gz 145482 BLAKE2B 38f2efa1c19f81646e8b9692c57d71dda0a53fcc7c120e973f8faf55a0d92d4f8daa21e3debb873f4965f37c7e1cf0f5f1aaaebb9d078565d4fcb3edc57c9314 SHA512 4011cba788ed1789c0f364d605dfe2fc775a1f5e0ab9f0457454094f9cc3a400fdc7241692e88abae968e32e3c5394bef95cd3f77d2c68e4dbfc73ed27905b86
 EBUILD libcharon-3.4.1.ebuild 587 BLAKE2B 799f3115af06d3b5cc91c1ed0cd52627d1cb8f2eb8281ed1d184ab691059352e13f728cf41d4d6e9e016d1c480d5922cdc5874a97fcd18dd0ba6142c8a6c0771 SHA512 a101825cde1a3f11facfcbcdf4eb9e79cc1edb0109a7d86dced4dca36ee6a760043b15d42bc3a3b9a352a9a7bb46ebbc297c357c9bfc939937d188b32c514851
 EBUILD libcharon-3.6.0-r1.ebuild 587 BLAKE2B 799f3115af06d3b5cc91c1ed0cd52627d1cb8f2eb8281ed1d184ab691059352e13f728cf41d4d6e9e016d1c480d5922cdc5874a97fcd18dd0ba6142c8a6c0771 SHA512 a101825cde1a3f11facfcbcdf4eb9e79cc1edb0109a7d86dced4dca36ee6a760043b15d42bc3a3b9a352a9a7bb46ebbc297c357c9bfc939937d188b32c514851
+EBUILD libcharon-4.2.0.ebuild 573 BLAKE2B 7eb27b3193128396696421ef953f0cdabb7d72bb24088e0757eab0c640c95037581bb6782e9e4003cafcdd9d2bf9b2d84dc022f312903b998506231a3bdbd5e4 SHA512 d155e903cbc2a1f1ab0b3b22e181760e69b22763f212fb4ae93d07c6841bf8d514bdb2602f078b35c62712a5ec0d8a060d56bc4df52a09d978dd6d5710ffe3ad
 MISC metadata.xml 861 BLAKE2B dd8d5bdc3a7e48870daffb19659eba707b1c43c6682fbd5cadf52babd3282315419451c1d5352f0a2e044e60d6fc16c19d546b1dc32ec9da7dceeef4deb45eca SHA512 15a172c082a1cbcdbd0ecd93f475f9a193d3bb0707980904d8f7d6adde745297f64b906134c0c338cdd088f6f54e736b29ee3df39638ffc941dd5eda5f15f735
diff --git a/dev-libs/libcharon/libcharon-4.2.0.ebuild b/dev-libs/libcharon/libcharon-4.2.0.ebuild
new file mode 100644
index 000000000000..b8424b88bd25
--- /dev/null
+++ b/dev-libs/libcharon/libcharon-4.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils python-single-r1
+
+MY_PN="libCharon"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libCharon"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="${PYTHON_DEPS}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index 342036b9c056..28ed6799e161 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -3,7 +3,9 @@ AUX libev-pc.patch 1031 BLAKE2B 395e57ac5b71761c9603bc5355265ac7bc73aac78c2d6e0a
 DIST libev-4.23.tar.gz 524184 BLAKE2B bb8c15665e0ff59322bc2f076f4256ca8f5acff5bc55bb3f5f10ac9704f9311ad90f581e4ced25dcc22c39988ffacce1958f195234a60039d33ba7b7beb9aee2 SHA512 e3d98364b3788a7f5c56be49b99cecc98da6323fc7e6d47aff808580653ab9effffe88636a2f5d357d596a9a580e778c20139cc162467e3e2c5fc736713c6e39
 DIST libev-4.24.tar.gz 524264 BLAKE2B 92a480cfba67119c630211b9acfadfa2dc6ab1806ed015cca693829fa6deedeb4fc5530aa47e0a0d21304b0f626136110596ccdbeb75bc13ea5d23eeca7b9ded SHA512 e4cb3b5dd4b9828d5b8da840c73ae4604258a8c4330aafa5472298b83bf944628f36918f0ddd47d9069d255639f0b24a2cf8d349f0644ffd50de823bcb54a31a
 DIST libev-4.25.tar.gz 545817 BLAKE2B a6ce69ba0a5824afc9e49afa8dba67f15b5945bb01104733c2a9478265fa78908ea26b6594c00f210c86eaef936956c16d3a55cb91a834501da0a6db12caf201 SHA512 83455d4dcb626a28d8477aaea27cdee6bc88b273fae926a57eed9f6a59d4b0ea2eef0f41ad09ff711aea2956ed83a591aa53cfe8aa242f7d0a4da19180d764c4
+DIST libev-4.27.tar.gz 556658 BLAKE2B a4cd33aa9320c0c81912b50c0f03cd338e09e9c1c63f14d682317322a3c875229b2317af00a48e65be9e56b165b994a385692b103cae7c44012a1281e764f27a SHA512 18fbac15c3a24b2efcd547d98d423fe59a1684cd3afe7ff25a3da54d8df3e11f351df455657d830df93366853f74d584f6e47a7c9ffaba84aa586957bf39ea82
 EBUILD libev-4.23.ebuild 1098 BLAKE2B ed8a663be761548bf235607134c83f867cac6a090dad8a1a0fd27ae79c7124308cebdb58713631c23fa98eb40515bcf39f6d5d3a7e1393738982787f304ccb31 SHA512 ff3e6e3d8674b5c82f725039cc302e80600df10d4d428e1986720710409b9d26a2212a52a6c79c4ecc5d83bf7ebbabfd3226be377269dcc67dbe63ded9e27209
 EBUILD libev-4.24.ebuild 1115 BLAKE2B 28966f42a644d7817418cdcbd90347df31daf2470aa37934601a4d3b648193530063df7220179052ffab81151018e77031227ae68d01e621543b8ee0b103a1ff SHA512 0ac922c356c641aa6c1b636f9e0aea0a9805ee2869df1d2d441479b23519b9ded961207072513863a0ff7ad581dfc0b9d36438b70404f14a16c3f9516ece4266
 EBUILD libev-4.25.ebuild 1155 BLAKE2B a83b82d1ceacedef2390a70584cfb41dea9231962bed2422d948ea1fa2436e778ec3af2c25c44b3ad81c34b8b5026a5955d32a2994d3f8657fe72c487f6a2eef SHA512 e4b86e636b5cb80a66a5ce28b8183c4cc3ce07f9483f8273c8168a9c7062721502b3277ad142b23c04cb19cbed35c9745f3194e234e707ff3904388a4d6ceb3f
+EBUILD libev-4.27.ebuild 1161 BLAKE2B fb894275aebadd9658367a840e0c04f236655d5e478e69d1e0ad821c505ada62a23fb1aff3dac84b35252d7acfe8b00e60e6d999f8324ca2d5691443bb6b7571 SHA512 bad100e85f4e997b8083f1b69ac4d6459b3d6fa1f1454dcb62acc77b44c0ae9b8c3d429159162c933fc782692e8b49d00b427c880e8a0b4fc3bce2054b5acdff
 MISC metadata.xml 246 BLAKE2B 65c152b918cef5b72db59bbb3fd1a71a6fd444bbbb3e95a87aa880e23f33d418b96f842f4a2070ad1bbd0c1d1c3753e935841e6fccf088954bb58f297b672dc4 SHA512 9977bb6fcdb8374bf6148fef57fa31bf04fdd8eb3701ecd75be5ea62a48382fb0ef703b3d01bbc996f91322b6fd0f8365dfa4134426770fa98d624d69d8073d9
diff --git a/dev-libs/libev/libev-4.27.ebuild b/dev-libs/libev/libev-4.27.ebuild
new file mode 100644
index 000000000000..1fcb053fd86a
--- /dev/null
+++ b/dev-libs/libev/libev-4.27.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="A high-performance event loop/event model with lots of feature"
+HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
+SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
+	http://dist.schmorp.de/libev/Attic/${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="elibc_glibc static-libs"
+
+# Bug #283558
+DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )"
+RDEPEND="${DEPEND}"
+
+DOCS=( Changes README )
+
+# bug #411847
+PATCHES=( "${FILESDIR}/${PN}-4.25-pc.patch" )
+
+src_prepare() {
+	default
+	sed -i -e "/^include_HEADERS/s/ event.h//" Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-maintainer-mode \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -type f -delete || die
+	fi
+	einstalldocs
+}
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index dcecc86d8a52..fbfb02f07349 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,6 @@
 DIST libevdev-1.7.0.tar.xz 438264 BLAKE2B 3f71ccdfbd68598afed7316dd4902a8ac439c6f094788abed5cb8ed24acaf070edaeceefad17de51cadb039259aa0de6a8ec576fa1f8dbd60878ee75aeb39fde SHA512 bc43723fd1ca251a77ee549022609f73c15a33ae470fc843ac687542fb1938fba4d046d3ee1dc814bc38a4292a7f2ad9e71fcce45525b518a4f4a5bef099aa6f
+DIST libevdev-1.8.0.tar.xz 439000 BLAKE2B 408c60669557419c945901da5f146302cf0cdc43ed74cf4dc8ff4a9c272319c49f644bf95acf3d8656173bfc2f3763a6cc172ee4707a7f0129d15449701e9449 SHA512 8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4
 EBUILD libevdev-1.7.0.ebuild 1108 BLAKE2B 0c193d4337e4d2c4608b56c4bfa1fb6ca8324b979bdb83ff2df1d2b75f120d406a294ffc32c2fe503b7c5a5efb75a6c77421469609a33c9783f662b342e341f0 SHA512 3046e3c9b2144aa12e5133dfe3131d3a6115d8437073c41f21e7c202a3af100732d2f1523544500a0c8964126c89c5679b6eafbe977117fe712b55238bfb9fb8
+EBUILD libevdev-1.8.0.ebuild 1119 BLAKE2B 84c1cd909ea8f81ab025940c58b2969fc6d68be3360bfab21b865f23c1d3c26564fc1de9d1c149184efd9c517e28bcde305bc4713d8d5d1474f1c748d4c25b1c SHA512 9ecbd94c60955824c7100b0427a6417a47301618111787ca6e64d8207ac765b6de2c95994c17f8f6412f95d819b533a794add1582d526cd9e930dacbeaaf2a77
 EBUILD libevdev-9999.ebuild 1119 BLAKE2B 84c1cd909ea8f81ab025940c58b2969fc6d68be3360bfab21b865f23c1d3c26564fc1de9d1c149184efd9c517e28bcde305bc4713d8d5d1474f1c748d4c25b1c SHA512 9ecbd94c60955824c7100b0427a6417a47301618111787ca6e64d8207ac765b6de2c95994c17f8f6412f95d819b533a794add1582d526cd9e930dacbeaaf2a77
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.8.0.ebuild b/dev-libs/libevdev/libevdev-1.8.0.ebuild
new file mode 100644
index 000000000000..c32b139bc873
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.8.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit multilib-minimal python-any-r1
+
+DESCRIPTION="Handler library for evdev events"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc static-libs"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+RESTRICT="test" # Tests need to run as root.
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999* ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use doc ;then
+		local HTML_DOCS=( doc/html/. )
+		einstalldocs
+	fi
+}
diff --git a/dev-libs/libflatarray/Manifest b/dev-libs/libflatarray/Manifest
index 3da84236bcf2..216c614209b8 100644
--- a/dev-libs/libflatarray/Manifest
+++ b/dev-libs/libflatarray/Manifest
@@ -1,3 +1,5 @@
+DIST libflatarray-0.2.0.tar.bz2 34193 BLAKE2B 8f409b097a0dfe037e9fdd1f8ed3b0ba86ef9ab816219b9357d119afa1c7236c0a467d9705fd5050ccbdc54ee40b811d2daee0a697f8ba720f037294d0305d52 SHA512 96050c08479429baf22a9694ca7354e1ab4fa892976d4098419e2863cac8e21aec586116a1702a5050753febd9b9321a14fc4da5d6487cf75a574562ec4d4647
 DIST libflatarray-0.3.0.tar.bz2 104544 BLAKE2B 9ac490a526fbd71478ac569538bad28e01a1a91bd71d37e85bf89181e856e79b2dec6af5415f238e5f72fbbe57cda59ee87ebd79cd273887061e2bbb93a7ce31 SHA512 c58339cdadf98f552d2f1b440a293c48923f32fc43a5a06ee8b8a40835a5f6c21514f7a9efa0ff23930ab9fdda8d4389641ec83c589e1982dbf5a3f75d2ffd37
+EBUILD libflatarray-0.2.0.ebuild 678 BLAKE2B 497a3a6c307e6cdb1430c413eb06f0c7f95ee205d3f7df12df9f331fe974bae9f7643136e70bda9c867ae64c531d265a075e5b412b7f0693c95e4bd97543deef SHA512 c437ed372ce4dedcb3a0584431dc748103c60cd86b239d137bb5fc5770db1e2eb5d25b81f9fdd5a9444c412707d08c9b53bc6b8e7b76afada169e29759191380
 EBUILD libflatarray-0.3.0.ebuild 681 BLAKE2B ee500d048d33d8fe03b0ee118fd433e3ff66258b1ab23951273ba9cd681fa1977b75aa232850be96449e6460486e770e669dd5e555755af8c5f4a8678d305ec1 SHA512 4aadbc44470dc6041c92bd31fe745068456bf61184862ab862f1d28b20671ab9a7727921f24cbe93a494e650d23fe805f8ce6d7d28eedbabf47854c491b5ae75
 MISC metadata.xml 634 BLAKE2B 4c07ba2a9ed94cb524260d400bcf611b723e03e596864c04ee61e5289965e5c3ec738f0b82e911d9c34f9d36d1c12b9918dc0f71e7beecda09fb2beba1f03900 SHA512 85a13fa685b2dc2870705a134b59d66090f19839f645ec4741690bd3e1217a2d2a1d5be816ff6579994010889f8ae0908fb55e8b5339aa70e2ed94f38b607795
diff --git a/dev-libs/libflatarray/libflatarray-0.2.0.ebuild b/dev-libs/libflatarray/libflatarray-0.2.0.ebuild
new file mode 100644
index 000000000000..35250d070a6f
--- /dev/null
+++ b/dev-libs/libflatarray/libflatarray-0.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils cuda
+
+SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DESCRIPTION="Struct of arrays library with object oriented interface for C++"
+HOMEPAGE="http://www.libgeodecomp.org/libflatarray.html"
+
+SLOT="0"
+LICENSE="Boost-1.0"
+IUSE="cuda doc"
+
+DEPEND="
+	doc? ( app-doc/doxygen )
+	cuda? ( dev-util/nvidia-cuda-toolkit )"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use cuda && cuda_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CUDA=$(usex cuda)
+		-DWITH_SILO=false
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index b7572ba739bd..eeac220600e1 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -3,10 +3,12 @@ DIST libfmt-5.1.0.tar.gz 641502 BLAKE2B 8507e875a78de2e89b7fe2c1c049691bfef6e0a7
 DIST libfmt-5.2.0.tar.gz 648061 BLAKE2B a2ffe84277097f3cd5bfa163fa12e352349ab8239ab00f071cc0236bdea0c7c15b3c04f40036006fbe6ed231ff19d53abcba7c5dec709e5ac418ad41cc489d4e SHA512 75d53e6d8087288607f75fb891bb8812c7b9fe65e5ab7a20cdffeb5e56bd1f48e0de24c8cf1c2dd603fe3ed76f9fa067804ec5d3560f177db8f0a747c36f9d1c
 DIST libfmt-5.2.1.tar.gz 648668 BLAKE2B 516522d4e75e7ccdf95a43bfe1b5f95b8ce8ef0174d6b82d6b7be9985f084228a69e70ecba7f57788d536501699b584cb4eb51d7894b416ea857727b776b3823 SHA512 2b63a741df4df9c3cbf04098c6548bb3d0f9836fe912325542298df57c888f43e72159469fb87685b423694e43e4418545377d5ee6393f2709955be2c13780a8
 DIST libfmt-5.3.0.tar.gz 662493 BLAKE2B 462c54c227132b2398977ff575f74e63e973825968b106e09cb0f3da859f1d851a6dd1799c05e3ae6adff2ac972f4af259c42fdf8429346b2830134571c31480 SHA512 9ef0f3d328681253c1e1776576d54d67dec49c19fd7fc422ae63c3610b01a3f05f6e83cdf5e913dfd09bac42e52fe35c38ebe1ea91f4207d226a32aaf69eb4a8
+DIST libfmt-6.0.0.tar.gz 708425 BLAKE2B c04fb7f701e98442848a36489b09eca3dd64f736f668f04173db3afe77da6d933f5f13a2fe38489a5880fa1e4d8549dd34acc9fa37fbb0d6cdee3b6598610726 SHA512 7deb5bd843ae6b9d4b58dca9c68c1cfe7b55a41040f358247f5309655188d1ae194ff414437c068f74367f078faa214b5883e8c9e634c7623dcda50850e24766
 EBUILD libfmt-4.1.0.ebuild 770 BLAKE2B d629242c9a6109b42955a371589ad62ab163efa8b8b1ddbec61fd126af1368e704e2dc310bd48f9c829d81a56781d3610b63f0831c0879944788231293c00daf SHA512 b0962102dcc508761ea630c58e2e124fb0d2470f6b63fc527901ca8d5b80d3478c327dd1b4980055b295833aac85c2fc7801e87409842f7b7f17781782f037ae
 EBUILD libfmt-5.1.0.ebuild 770 BLAKE2B d629242c9a6109b42955a371589ad62ab163efa8b8b1ddbec61fd126af1368e704e2dc310bd48f9c829d81a56781d3610b63f0831c0879944788231293c00daf SHA512 b0962102dcc508761ea630c58e2e124fb0d2470f6b63fc527901ca8d5b80d3478c327dd1b4980055b295833aac85c2fc7801e87409842f7b7f17781782f037ae
 EBUILD libfmt-5.2.0.ebuild 755 BLAKE2B 2ceb89cf2e1db3ef548990b964342d5a9eff64c1aae76fba5f51b4500e220aa7fdf01e82932e4c81c76f0d7f60197ebce6d2314d8c6615432a6ac50a94184219 SHA512 6f4f4e1517a8ac5fee554e9128eeaa2695d8c65e72c57791910ff559c90023d68878d9af1966073bbcfd32c84ae596de05a6e4f6b3832eec2b927c04ebe9f9bd
 EBUILD libfmt-5.2.1.ebuild 760 BLAKE2B 353e6f862d50c681961f7a2dd7c3f8ab9abd04fc8189fb6b26bbdb698d652cdd4ed089b26e6421701108fa84e9585f1e329e175b097c366e13836c8d037ddfe9 SHA512 54007b3096d54918868e21a9f7f15706855b16f29df8a63793e5b740178a087872121989abc00f3c411e6192f9570bbca8ba10d6d78074b0edf8e6025e7ea479
 EBUILD libfmt-5.3.0.ebuild 766 BLAKE2B 7dc41353eac450d019a72d99f3b5bbc4f43cd30cd3088ebb6d47d92f6fc4f32c2e37a83c815cda3238db5b89870962e1956de26d0e8cec54a6aea627fe50bd07 SHA512 1790c9b98291ff13c713f5d1b7bef1a9980ef28cd584962333249e7b42123aee5aea1733b5c00b18b7ebc979f1951ba2e47635b95dc306502e2ce7d2bc153e6d
-EBUILD libfmt-9999.ebuild 760 BLAKE2B 353e6f862d50c681961f7a2dd7c3f8ab9abd04fc8189fb6b26bbdb698d652cdd4ed089b26e6421701108fa84e9585f1e329e175b097c366e13836c8d037ddfe9 SHA512 54007b3096d54918868e21a9f7f15706855b16f29df8a63793e5b740178a087872121989abc00f3c411e6192f9570bbca8ba10d6d78074b0edf8e6025e7ea479
+EBUILD libfmt-6.0.0.ebuild 767 BLAKE2B 76565ac2fe5b3e35c21a22f0a17e033a209a3385905333620189a05e90762e9b1352ea601c8f146ef0994232a931014b332a29ae8594ee4c0fb186385dbd0d52 SHA512 34e168525043d359ecac5f839d110160468af5b7d36330eff393d62f1380501040016f1ed249b21af0de38867054345600ebe3ac40d5cb8d530ea49a307bcc48
+EBUILD libfmt-9999.ebuild 767 BLAKE2B 76565ac2fe5b3e35c21a22f0a17e033a209a3385905333620189a05e90762e9b1352ea601c8f146ef0994232a931014b332a29ae8594ee4c0fb186385dbd0d52 SHA512 34e168525043d359ecac5f839d110160468af5b7d36330eff393d62f1380501040016f1ed249b21af0de38867054345600ebe3ac40d5cb8d530ea49a307bcc48
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-6.0.0.ebuild b/dev-libs/libfmt/libfmt-6.0.0.ebuild
new file mode 100644
index 000000000000..9bb4ee093042
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-6.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib eapi7-ver
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+LICENSE="MIT"
+IUSE="test"
+SLOT="0/$(ver_cut 1)"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/fmt-${PV}"
+fi
+
+DEPEND=""
+RDEPEND=""
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+		-DFMT_LIB_DIR="$(get_libdir)"
+		-DFMT_TEST=$(usex test)
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libfmt/libfmt-9999.ebuild b/dev-libs/libfmt/libfmt-9999.ebuild
index 932e58c0ce52..9bb4ee093042 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-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
@@ -8,7 +8,7 @@ inherit cmake-multilib eapi7-ver
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt"
 
-LICENSE="BSD-2"
+LICENSE="MIT"
 IUSE="test"
 SLOT="0/$(ver_cut 1)"
 
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 1937c0127f24..40d0e17b6002 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -2,7 +2,9 @@ AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
 DIST libgcrypt-1.8.3.tar.bz2 2989166 BLAKE2B 3443883c3e8d005be6cbdc91589b8b287226f26eb59536e1a32512004af739a64a3817ac38fa1132fdfc3424c21ca49c81db93535a23d590a5dc4f4518f3cce1 SHA512 8c873204303f173dd3f49817a81035c1d504b2fc885965c9bc074a6e3fb108ceb6dca366d85e840a40712a6890fc325018ea9b8c1b7b8804c51c44b296cb96a0
 DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
+DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89
 EBUILD libgcrypt-1.8.3-r1.ebuild 2314 BLAKE2B 6487043c0cdd0129411e11726e29878d99fce2f075d17f043b97640c73ef147184fa832576a5dd57c40b59d2b7f4c2559f7bbb03576eafd9d64dadb9ce17b68c SHA512 1ac41888cea18aa75e5cd3190c89999ce1ec4dcbf4376890c9a8cdabf414fe8022644976d7c75f6ef26a883f7a0863d5363f9979af45f68e5eb539db890a776a
 EBUILD libgcrypt-1.8.3.ebuild 2186 BLAKE2B d1c56ad5f0182fcac6ab2fa237e5205818a0f61a7edea666b1f0f1fc4fe1f95fc6ad4a410262b293fb6e47f3e570d71f552a717887a9efb921bf902bb4f12061 SHA512 8f902c37512a01fcbc83026281e8ce9f5a8dc18d975c180f4f4206c38538dad8192ff15fc3782bcb6475e37c4bfcb4b3a96ab5321e79268a91a623f890aebbae
 EBUILD libgcrypt-1.8.4.ebuild 2321 BLAKE2B dc12986a53f6b6b61e89ad3a8e40d67115fb477874dbeb864350c196e6368edd20edeb3f2ec2c97591ece373b6868ef93f98c123ac895c6dbdadcaf9e154f3a7 SHA512 9b62ad68c6bd0721a89c683b3d96e0923fdb241e0c468898b0f8db161e7d46a5abc0fbf47adbb356da173e0d52793c04d84a14038b7b86ddbbd626897427a49b
+EBUILD libgcrypt-1.8.5.ebuild 2321 BLAKE2B dc12986a53f6b6b61e89ad3a8e40d67115fb477874dbeb864350c196e6368edd20edeb3f2ec2c97591ece373b6868ef93f98c123ac895c6dbdadcaf9e154f3a7 SHA512 9b62ad68c6bd0721a89c683b3d96e0923fdb241e0c468898b0f8db161e7d46a5abc0fbf47adbb356da173e0d52793c04d84a14038b7b86ddbbd626897427a49b
 MISC metadata.xml 436 BLAKE2B 63494d2110caa2744cb7e2a43bb1622cc1709698a914bcda9958ee6fb9f8e5c5cee94e5cc9ce744a6638650e6bb78a0cea719a7afad53868513a15314ebb75f6 SHA512 953eb7a141dadcdb8f4c997924169a5e9dc5ce9e86a37b3171417f3825fad7763891ddf71cf7f05e36e2c39c534474dcba3e958b06bfb0f384d0ddf26afc10e4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
new file mode 100644
index 000000000000..dfb82b98c9ca
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.5.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 flag-o-matic multilib-minimal
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc o-flag-munging static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--enable-noexecstack
+		$(use_enable o-flag-munging O-flag-munging)
+		$(use_enable static-libs static)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 14287ffee533..ee920aae8ec5 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,9 +1,9 @@
 AUX libgdata-0.17.8-disable-demos.patch 1941 BLAKE2B e8c3b0b558d3c446f3e383268b75bc17a2149cefaa2fe1005ed695b1d0c4bd66cf4a89a4ea4e11e598d044b1b8bf469f3ddf96f3365a5542ae138d4262752d57 SHA512 4df919d8b09ef0b1af0b47c3262e08faa158b99e444a5d7d4d1b19a2987883fbb9e3f1a6dc2f858b8d343fbd5c2d266c3e02a47ad310aee92d1a5b14983d8f55
 AUX libgdata-0.17.9-ax2019-compat.patch 788 BLAKE2B f08605ae9ba096ed20b08c324727be214de5b1746280881f3017e066dfbda6eabd3a83908964c17e6932fafccf0021cc3eb775d2523c1f5bf828d97371527702 SHA512 35eacb0e1af5ae35e458a44563f830a4f19798bc3423e5bbe5fef9df048a20fabfead94a597343b7b342b510fc9e21cdf8bc2a69d7b930cbcb6ffc8ab7cbc66f
-DIST libgdata-0.17.10.tar.xz 836836 BLAKE2B a34f133289eb64ca24d96f38851ac07347e1b2a88860bf926072945d64d3064bbf5c4f674bfb262f27c290fa2b243d5f82805e09290194a9614dbf8dc0993e05 SHA512 01f8bb121c402fc0af8e9f12cafba326a87cef6756ced72652890c834fd4f497a060f6455ab66d4af92d9cd34b4d6fdf58033dca0f91bb806c80b60987955c22
+DIST libgdata-0.17.11.tar.xz 843948 BLAKE2B 8be79ea5840a585c5bdd5b51aa99401aedce0562ceaa98c7e323cdb2354384db635288d05c740993da49fa9c60c2cafab4e7c43ab82de4295afc0ca6b690d4dd SHA512 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982
 DIST libgdata-0.17.8.tar.xz 1464812 BLAKE2B 787b5d6e4a62e70f76ca4080fb5c3ff1e7d68745f388be646dd980ef8be18275997bca46a1f3639c9457c8310f9c3f4cd34892be88db284a9ee5e5f43e9723fa SHA512 dfc4c825a7053a6fd7659d04c7077bed8539b4cf3ef3da1d5ece4da3ce17941900e960a300a50b284010ed890dcab87e4c4726403f04481c672832fd34b975b0
 DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce
-EBUILD libgdata-0.17.10.ebuild 1823 BLAKE2B 70137f7e3c7561933db4f872f7eb7dc9b72f5b839826a7b11528204d9e34a7c1f72b9f0ce06b842bd2c22a84afe615ea8f6b559579d5852ff61fc6b19da1ec08 SHA512 9d45a14fd920a437c9b2a382dc4616fd3b5e8b8bfdba4b20a677f5fdd2324b243b839ef1789b770527b6ffc95724534b0bf71d1e056a8df0a6b716b3d7e3a8dc
+EBUILD libgdata-0.17.11.ebuild 1775 BLAKE2B 047b7f3547fcc2f530d7616804842893e0d8e5ec04de8cdc1113b930e53af2e78c6c9658954d638f9411dddc06423c3d36913d287af97d8d4cf0bd6b5ee2a6f6 SHA512 714ad2a22a09d99c09afefd6d9a2e5aa279678d624f7c9e7bcc7dbfadc29efc143d534cc9334aeec026bf0ff3c1b64c8877ff9463b3130b7022599803b0847e4
 EBUILD libgdata-0.17.8.ebuild 1641 BLAKE2B 8bab41b7e782b93b1c0be447f60aea096d9b18284c4e684034cf7475be39db2751f34c9c80791396c39a95ce3df16da72573bc979c18ee21793306a1f1c5cb6d SHA512 7bce4dfccc02a77a70f0d1ecd8e1c6d121016004138917fa5505aa2cdc33205e5665c367aee3b3b45ee7524ffe041c8f3a561e8c11e835d213fd01f2a2910b6e
 EBUILD libgdata-0.17.9-r1.ebuild 1755 BLAKE2B 1ad712e61fd4e87765588c399324cb6955bcbd46490f5d0e246d0001f44737729c8d2beb751131b7e504cb181420c1f3681a633ef2725c49ab0c4f9c03e6ba0d SHA512 5a12a0a05f2cd95f659cc301af235ab6a4bd8cd90a111de8c73dc9a98f3567abf604155100d31dbb77d30c384156b470749b6694f8e9f9b94171e43e28e671df
-MISC metadata.xml 362 BLAKE2B f10a4dba3d98334e8c3092595559b1a0e9036388c3d9b72a53fd1dda5935721198ef7c751efd2179701c4805b6116b3f61965fb5037fe63ef9bccfcb8b37bdfb SHA512 00513b8910b0cf0f0c42b1723c8e22a93c95a702ba3ba9f139ba8e2a25a6c408f1e8f97302ee300189ea534717b1f7d21a909cab0ebf6ba8d6cd19d38df2f30d
+MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/libgdata-0.17.10.ebuild b/dev-libs/libgdata/libgdata-0.17.10.ebuild
deleted file mode 100644
index 112574624d47..000000000000
--- a/dev-libs/libgdata/libgdata-0.17.10.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/22" # subslot = libgdata soname version
-
-IUSE="+crypt gnome-online-accounts gtk gtk-doc +introspection test vala"
-# needs dconf
-RESTRICT="test"
-
-REQUIRED_USE="
-	gnome-online-accounts? ( crypt )
-	vala? ( introspection )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/json-glib-1[introspection?]
-	>=dev-libs/libxml2-2:2
-	>=net-libs/liboauth-0.9.4
-	>=net-libs/libsoup-2.55.90:2.4[introspection?]
-	gtk? ( x11-libs/gtk+:3 )
-	crypt? ( app-crypt/gcr:= )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	sys-devel/gettext
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	test? ( >=net-libs/uhttpmock-0.5
-		>=x11-libs/gdk-pixbuf-2.14:2 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	eapply_user
-}
-
-src_configure() {
-	local emesonargs=(
-		"-Dinstalled_tests=false"
-		-Dgnome=$(usex crypt enabled disabled)
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-		-Dgtk=$(usex gtk enabled disabled)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use gtk-doc man)
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		$(meson_use test always-build-tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/dev-libs/libgdata/libgdata-0.17.11.ebuild b/dev-libs/libgdata/libgdata-0.17.11.ebuild
new file mode 100644
index 000000000000..72311b208ec4
--- /dev/null
+++ b/dev-libs/libgdata/libgdata-0.17.11.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/22" # subslot = libgdata soname version
+
+IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/json-glib-0.15[introspection?]
+	>=dev-libs/libxml2-2:2
+	>=net-libs/liboauth-0.9.4
+	>=net-libs/libsoup-2.55.90:2.4[introspection?,vala?]
+	crypt? ( app-crypt/gcr:= )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/meson-0.50.0
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( >=net-libs/uhttpmock-0.5.0
+		>=x11-libs/gdk-pixbuf-2.14:2
+	)
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+	# Don't waste time building a couple small demos that aren't installed
+	sed -i -e '/subdir.*demos/d' meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgtk=disabled # only for demos
+		$(meson_feature crypt gnome)
+		$(meson_feature gnome-online-accounts goa)
+		$(meson_use test always_build_tests)
+		-Dinstalled_tests=false
+		-Dman=true
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libgdata/metadata.xml b/dev-libs/libgdata/metadata.xml
index 4b8d03fba618..05e33e366225 100644
--- a/dev-libs/libgdata/metadata.xml
+++ b/dev-libs/libgdata/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
+	<flag name="crypt">Use <pkg>app-crypt/gcr</pkg> for keeping tokens and passwords in non-pageable memory for improved security</flag>
 	<flag name="gnome-online-accounts">Enable <pkg>net-libs/gnome-online-accounts</pkg> support</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index c50b1c082cf3..95b3cd9653f4 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -2,6 +2,6 @@ DIST libgee-0.20.1.tar.xz 681464 BLAKE2B 5e7d6d9fb9c2833bd7334f5fb38dd1ff151ee4e
 DIST libgee-0.20.2.tar.xz 675684 BLAKE2B 197eea5f1c4babf203e58c65a3419407c7657f4fb92e4e921afa2408cbe3dcba3f8e554a898766c83d3318a4a7fddc47b17f21daf04d79b5635e3363749cb035 SHA512 4ea312f73046fee5d0ad1d5d1942c9f4aecbec22509ce7f00b51352039b9643d65d2f37d4c0de550f0165ff7f6058cf88ecb55d7c5963706a1b63d5ec14c7d7d
 DIST libgee-0.6.8.tar.xz 443060 BLAKE2B b11275dd27492c0ae80fc354f1167e96def9b7c126089509f83b6d291eb48155224f5449e1b22a2549c6e3f2cb5d5daf5daa3ccc425723b7a203762e09ada091 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a
 EBUILD libgee-0.20.1.ebuild 679 BLAKE2B 56a9571229a501d6116c9c4de19620e8323caf7d5d96402b180ea1b82108fd04445f4e8694fdc9db522c873e956daed754fd974f8f481afcbb363f8e4103dfa2 SHA512 b852c9bb102daeb8bfcafda5c5200861c155ca7635061f5b136cd9a340102cccc8351344f1d7657545a2f0b411fdfe2737cc1f59bb76e6ad0561fab2ce6ef3ec
-EBUILD libgee-0.20.2.ebuild 687 BLAKE2B b284c0fa4739f28759a242c04535363bc4833021f4f13d71e754ac4d24f1fdda08b7ddb12e89d2c89c5a2baed49cb1dcdf5368dc9f8e374f122115939812a0de SHA512 43a8aa4b0a02499f0039fd2c3d5061f78d0f2ce6cf4378fc160c4aef038c68d4aa2b91455da3decba46709e043b3e705cadcd037bd960c08dbae84d8a80bc55a
+EBUILD libgee-0.20.2.ebuild 683 BLAKE2B 92acdad228938f5eaf1c56355d220e594f51b9fb57f470f4158cd7474e6de2df3d762a3e8a00b821264309f4ffeed86cc19789727b241e62aa42e10338065acc SHA512 b953f6bef70bc76c6952f57b9c3603857ea5b235571c25b6604d9fd3f999869d875e9739415bf96f401a582bc1812de203a34d913b87cbd394e21d640c958230
 EBUILD libgee-0.6.8.ebuild 659 BLAKE2B aae1527a96cc83f1408aac93b27aa67f82fa8f2c772fc026b5f4a14e41434ff9381aaca40f4f8fe7127e56d332048badae59eee7eec69e6cff5c1412ea3f7b51 SHA512 be5bb339f217170fa8725f2e02a7c222b023cc3dda19b86bdd67806adf9e6c8197dda762112a702ec72b6d9da5fed335dbc2f32a5bd92dca46fa55379089d79e
 MISC metadata.xml 410 BLAKE2B b14dbf9387001ee3bec2f3b5b968bf9b206b747a838ea70de2e44fe60397b4e0d498a3809719298d93e7bcb1908cd9d7cea4e84fc5ef6a1c32d4819b10cb574c SHA512 11953fbacef993713af860af50bb3d6edae2d69fcf672a3aa47e7c9198e514068b18ccc0eca76cf35888e2364a72ef7d9e9ad8498cd1e96663c4686e36a42285
diff --git a/dev-libs/libgee/libgee-0.20.2.ebuild b/dev-libs/libgee/libgee-0.20.2.ebuild
index 0f4023e5f8ec..b3be4767d4af 100644
--- a/dev-libs/libgee/libgee-0.20.2.ebuild
+++ b/dev-libs/libgee/libgee-0.20.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~x86-linux"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 562944bc14e3..a8d0b2d1dfe8 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,5 +1,3 @@
-DIST libgit2-glib-0.26.4.tar.xz 138492 BLAKE2B 725c14076fb940186faac079cff1ea87c456ed41e943ae95a4a674632c1be261ab6d4d5bcb5c0800bbde5d86c1ff3095d59045a2fda1342a1cf5c691a2b424aa SHA512 9eb78f292583862890ca0cd27d7621da2f8f633a76f4679f897ce6cf9e06b64a3cb7b0ddda39d231d21d3faa830fe1a9a9326b4abd420df8356d50a734360b37
 DIST libgit2-glib-0.28.0.1.tar.xz 138928 BLAKE2B 708523bb5a723f59e51501675c046da072bcdf18b3ded94920ce9eb181854780d6b44759531c8e949199a889578515994299facd14d10a07958019f6af0b6aba SHA512 6ae88bb56052461a9531016140edbd8517db8d5c0e5c217b4e8918ffef70b92652e4a95493c4290112068d0b793bff2b894f136b79929924fb7347926e3a8f51
-EBUILD libgit2-glib-0.26.4.ebuild 1320 BLAKE2B 00883cee9d3c36676ecc0fca9213c5e6f039736b69a02f285b5a86fda36fa6793b535a70ba21c23cdee8d0842703d72e2ae7f8d8a904f80b2d975fb8543d022a SHA512 0f8a2debb19db854e8114de3531a625fd3bc84233a1f2fd0a5e364e2eeae4d33fcad04206470dbfdcd796c65116f500e56a9ee8131296ae611c1b4673972c4aa
-EBUILD libgit2-glib-0.28.0.1.ebuild 1261 BLAKE2B c52e3d4aeeb67d7c78dc634e2b93295d2e22693b10127c58cbbfb36d3efebd8352b2203f4c97216b4307257b0cb3e02d04674dd52575b462784a7ea0e6ec8fbd SHA512 2cd67890db12dd5bd2fdcb12e6e86d5c9bbb415b1497828963c2de76fce4fdfec5485051d274dcb0554ef08a2b69dfcf965698242bbf455a33f65741368b2f77
+EBUILD libgit2-glib-0.28.0.1.ebuild 1260 BLAKE2B 251e5cc49feaa337f3a851f4c4c7dce3ee836abe851faf923a1cbbfb47a8ff57c74068ddfd19bb63801f2c50988f3dba2ba9fb3ed9ba027246ecdeec89f45cac SHA512 b53647b193d7e24937470fac577fea5ca54fe25d203e0a9e2be14754c71a0de08e4026794b316df2c58fdc6c2a058ba933a06bfbb4267ef0c2f056c9a99a489e
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
deleted file mode 100644
index 7445ff21ee8c..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson python-r1 vala
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python +ssh +vala"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Specify libgit2 dependency with subslot because libgit2 upstream has a habit
-# of changing their API in each release in ways that break libgit2-glib
-RDEPEND="
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libgit2-0.26.0:0/26[ssh?]
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		# apparently broken; fails to build
-		-Dgtk_doc=false
-		# we install python scripts manually
-		-Dpython=false
-		-Dssh=$(usex ssh true false)
-		-Dvapi=$(usex vala true false)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule libgit2-glib/Ggit.py
-	fi
-}
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild
index f2eae843a731..f0dd27c69742 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="python +ssh +vala"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 968992a451fd..15555b02237b 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,9 +1,4 @@
-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.28.2.tar.gz 4987586 BLAKE2B cf791adb173050b4b153062ff5fdc923289462677ce34af1077d228a95c4d9d7e9b836aee44dc79f079f42c910c4b4548241ec7ff16665ce49e319ccd38d4c7a SHA512 0879c162e2e1dc00eadfbda22cd1f9d3a95b4ec2b653c108983f37c2f695140882de4d50d7cbc04ced247125a4e9fe6df16130e1267891aecdb2411d920db5c6
 DIST libgit2-0.28.3.tar.gz 4988580 BLAKE2B 93d87792b0aef6383845230880d749fa77f28ac8ece4564abf041ccbb672d17e6efb1ef9503879d45cf5f78b6f1e54dd2b2ab9eac0fb09ddb445310484bbd7fc SHA512 15444823b7d4885f7b8c3982f8905efc4a75913de016a9b2e0a24d5ce9746e6a549dffd5469036529557feff2ce7ece9328266eb312c80b96091ce0f65ee97ee
-EBUILD libgit2-0.26.8.ebuild 2050 BLAKE2B 29ba7bdeb65ca0d274b97240ca81c732e8f5505b64856d61124a8726791ae6c4bfe1fdba88c62dec9a35a4f9ac0d43df3884f978814e7bab9ce1f8a573f7c1ad SHA512 ce1746610579ddb076cd7d8c4f97596142bc73e9d454f7188962a940693dba7e0f8814a551b9512502c0c1ece2d1392e963747208a3bcaa5f1af6d9d376f1a0a
-EBUILD libgit2-0.28.2.ebuild 1687 BLAKE2B 1776bfc14b35eb1593e6d9159f58c3c9ccdac6c25419e1d57028ef6ef832fc638fd8782e5fdf46b9e65f4caaa744660f2b87c73ae421c4db3924514c476068d0 SHA512 46079c16b630c677bd97592bfe3244c1d6943178da84ea9d862c1e58552b8267f0185102fbca573d831de67098027ffb95ba82e4f944a42d6391ecdca4031da2
-EBUILD libgit2-0.28.3.ebuild 1685 BLAKE2B e7f2859e215e7dab9517d81d44d97f1c3c415771e10692c94108442aa4497e3a396134064b819abe23079088d32a03595c768a8cfbf37fe4e2b27e7146de8125 SHA512 e5b2cccfa6bfcb0da2a951e4417946d9c69bc9f40455f43089c73f30c7eef0ce3040676cdbcd8d0ea90b047d145c9fe85de1f7cee05f6a21e5facd335cdea1dc
+EBUILD libgit2-0.28.3.ebuild 1684 BLAKE2B c13c366277f3e4b8f8b0fc074eaef7e3932483a2d2fe52aa43919457ecbba28676e0e08ca549c5e1d70701a5c55d06d32c3e460e5e6ee2e0bd71d9ef904731e2 SHA512 9a03f48114b70cb5b59a5c71c705dc0626d264173a1086ad5290d4d91f7ac52d886b5c926438caeddc9633cd9c19b5f6bf52785fd316c7682da7c69a56a68590
 EBUILD libgit2-9999.ebuild 1664 BLAKE2B ca592e3b60a50ee0ad16da964b1e9df3095e235d78aeec683582b38fd2b70395311778e453e59bbee913c2976e341f5bc947487ed58defc60d78ca63307ebd18 SHA512 ca41454b876cc379a6aac038b00ab48e01cd2fc728ba79e9164e144a1cd5b2fa7f563b9243d0af4c8d7f1538baece44cff31db260b137f265bee8ebc35050aca
-MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
+MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/files/libgit2-0.26.8-disable-oom-tests-on-32bit.patch b/dev-libs/libgit2/files/libgit2-0.26.8-disable-oom-tests-on-32bit.patch
deleted file mode 100644
index 40be2aee8fdc..000000000000
--- a/dev-libs/libgit2/files/libgit2-0.26.8-disable-oom-tests-on-32bit.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 16b5a7baf67169ff12a9a2de9c2853c6f921317c Mon Sep 17 00:00:00 2001
-From: Edward Thomson <ethomson@edwardthomson.com>
-Date: Thu, 13 Sep 2018 13:27:07 +0100
-Subject: [PATCH] tests: don't run buf::oom on 32-bit systems
-
-On a 32-bit Linux systems, the value large enough to make malloc
-guarantee a failure is also large enough that valgrind considers it
-"fishy".  Skip this test on those systems entirely.
-
-[rebased for v0.26.8]
----
- tests/buf/oom.c | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/tests/buf/oom.c b/tests/buf/oom.c
-index 16a03cc1a..86f5e7239 100644
---- a/tests/buf/oom.c
-+++ b/tests/buf/oom.c
-@@ -11,12 +11,8 @@
-  */
- #if defined(GIT_ARCH_64) && defined(__linux__)
- # define TOOBIG 0x0fffffffffffffff
--#elif defined(__linux__)
--# define TOOBIG 0x0fffffff
- #elif defined(GIT_ARCH_64)
- # define TOOBIG 0xffffffffffffff00
--#else
--# define TOOBIG 0xffffff00
- #endif
- 
- /**
-@@ -25,13 +21,18 @@
-  * will fail.  And because the git_buf_grow() wrapper always
-  * sets mark_oom, the code in git_buf_try_grow() will free
-  * the internal buffer and set it to git_buf__oom.
-- * 
-+ *
-  * We initialized the internal buffer to (the static variable)
-  * git_buf__initbuf.  The purpose of this test is to make sure
-  * that we don't try to free the static buffer.
-+ *
-+ * Skip this test entirely on 32-bit platforms; a buffer large enough
-+ * to guarantee malloc failures is so large that valgrind considers
-+ * it likely to be an error.
-  */
- void test_buf_oom__grow(void)
- {
-+#ifdef GIT_ARCH_64
- 	git_buf buf = GIT_BUF_INIT;
- 
- 	git_buf_clear(&buf);
-@@ -40,6 +41,9 @@ void test_buf_oom__grow(void)
- 	cl_assert(git_buf_oom(&buf));
- 
- 	git_buf_free(&buf);
-+#else
-+    cl_skip();
-+#endif
- }
- 
- void test_buf_oom__grow_by(void)
--- 
-2.19.1
-
diff --git a/dev-libs/libgit2/libgit2-0.26.8.ebuild b/dev-libs/libgit2/libgit2-0.26.8.ebuild
deleted file mode 100644
index 715f0172be33..000000000000
--- a/dev-libs/libgit2/libgit2-0.26.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,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/26"
-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/libgit2/libgit2-0.28.2.ebuild b/dev-libs/libgit2/libgit2-0.28.2.ebuild
deleted file mode 100644
index 89a49f8ac99d..000000000000
--- a/dev-libs/libgit2/libgit2-0.28.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils python-any-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/28"
-IUSE="examples gssapi libressl +ssh test +threads trace"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib
-	net-libs/http-parser:=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${P/_/-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DBUILD_CLAR=$(usex test)
-		-DENABLE_TRACE=$(usex trace)
-		-DUSE_GSSAPI=$(usex gssapi)
-		-DUSE_SSH=$(usex ssh)
-		-DTHREADSAFE=$(usex threads)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake-utils_src_test -R offline
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc docs/*.{md,txt}
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libgit2/libgit2-0.28.3.ebuild b/dev-libs/libgit2/libgit2-0.28.3.ebuild
index adf461f51e8f..84b9ad2b9c54 100644
--- a/dev-libs/libgit2/libgit2-0.28.3.ebuild
+++ b/dev-libs/libgit2/libgit2-0.28.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm arm64 ~ppc x86 ~ppc-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
diff --git a/dev-libs/libgit2/metadata.xml b/dev-libs/libgit2/metadata.xml
index e090ecb97fe2..341b4d4cf6d8 100644
--- a/dev-libs/libgit2/metadata.xml
+++ b/dev-libs/libgit2/metadata.xml
@@ -15,8 +15,6 @@
 		speed custom Git applications in any language which supports C bindings.
 	</longdescription>
 	<use>
-		<flag name="curl">Use <pkg>net-misc/curl</pkg> for HTTP support
-			(otherwise, limited built-in implementation will be used)</flag>
 		<flag name="gssapi">Enable GSSAPI support for SPNEGO auth</flag>
 		<flag name="ssh">Enable SSH transport support</flag>
 		<flag name="trace">Enable tracing support</flag>
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index c9d3973031a5..9f1ddbe4802a 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,5 +1,5 @@
 DIST libgudev-232.tar.xz 270904 BLAKE2B 90b2ec011f065929bd560398de9cfa8c365f9b84d205c816f2d7a98391d96bde47449eb77bc76b1e486af7dfdb3ed6525f216549e0dc3571b2ee672920438c98 SHA512 f648a41e2a6af7e26634c7cc259fdc47bb6e6ffb329324d157f340e42928e28c2059a0e923b9b0aaecd1ee3ecafbc7b55e5652f1f77bc1b88367b97057a1bedc
 DIST libgudev-233.tar.xz 271292 BLAKE2B 02c9a1040e3db21a9478927cce99cc8fdb360db922fc35421fd41ceeaffc786aa9f397f9387ac9d98bdd8ed45a457af2c0d33df731edfa08b63cb64a2c7fa4e6 SHA512 0e7beb35478bba2aed3cf8e750f524c562038b04fd59e4dd31618b0ae7cbd29545e5909c422325e4be84dcab9177a5256bf0f3ce7df7b6c07e4866cbb8ce570b
 EBUILD libgudev-232.ebuild 1113 BLAKE2B 1e963ec6a6ea7bcc322d55489203147edcbbde2593bdc9d24461b0bd2c2d6fd806d1b357b9b9ef4e7a47cd49f5826e96ec61506859f8ca6ac59e7a0fa745e63f SHA512 858e3f1db9b255b87115ebeeb7922db41cade10ad7b6cc1a45fb96f0108e20c6f29d54702fd2435a160d96141ea3b07f3eb595ea505f8367b0eecbc53faada64
-EBUILD libgudev-233.ebuild 1123 BLAKE2B 1cae6100395e31b8354d73aa74697d43a05fcdcc119369cd9069ab33c14d4a9a6b686141ac0ead6d5b303b0ec90d12a5b60d493c12955d3c749cca202aed19d0 SHA512 0124b1e12e35f5d3b6087cac1da378ba6e29a0c9ccdb32f1010982fa8634b54eb5a5f41cd25b08b838fb2083c1bb528253d5a792d816d15adf2d9d6d4ef08e37
+EBUILD libgudev-233.ebuild 1117 BLAKE2B 73f951d7c614b83b5fd8185b8be871f212cac1e3e0d6d0dea487b85a1b485382bef29d52b8b4340d38a48b3cb9259676b2d38cee339ab84eaa010da2cfc494d0 SHA512 49298c5be56ca9d509d115cd9a1ad0578c43b43bf8ceb571bec86ad3b4672d0897f216de25ffdfa070dc49e2b8ad387f1585791d42be0d483dde254bd35215d5
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-233.ebuild b/dev-libs/libgudev/libgudev-233.ebuild
index 350bd518580c..dcc92f86ab31 100644
--- a/dev-libs/libgudev/libgudev-233.ebuild
+++ b/dev-libs/libgudev/libgudev-233.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86"
 IUSE="introspection static-libs"
 
 COMMON_DEPEND="
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index e40da294bdba..5973e0ddb988 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,5 +1,7 @@
 DIST libinput-1.13.4.tar.xz 530000 BLAKE2B 96345625b98ecc5476b9525cac84ec6cffb5854ce8d9e197fa73dbcb3548ebfea7820fa32d4e808222c0471fc94d89003775587cc0ed9c8445dd5902d3463792 SHA512 ccfdfc704dab9ea19a503399ecd4ce3a95b8d9480b8dfddeb80be01236c34c6f2f472be0e12e04dddd68092611470d303351e092141bc7491729639bcf7e64d7
 DIST libinput-1.14.0.tar.xz 563272 BLAKE2B 9d5f831c9224b01aa4be92494f28ab95909dff2d81f5e60bada2ca12a2fb4f5745b99a4caa4abef06938cbd7d9e8da9aed85573e447ad6b6e52392e17534953a SHA512 e501c5b8a58bb287c175692af0e59ff766a8613eb576aaa0700686dfbb6c6ab63b7a5d3f148fce75397c8170bc49871068861d93c352355ab5d0d9e7f1b059ec
+DIST libinput-1.14.1.tar.xz 564412 BLAKE2B 185cede0e5d74dc27f544996aa003d50556ef50f432c73a45a1cffeac921ecc0a5c5c82158292bcd18a692d745fed552545e5ab60bcc29fb1451529cbdc7a57e SHA512 8416bab51ba1aab924fa1b41360bc2ad101fb60d3a82c73584bb1e2454554524716673e3eac7f08c18bd6a1ecdfa52ea3cfe09c7a866c59fcd47d75960e82d4c
 EBUILD libinput-1.13.4.ebuild 2059 BLAKE2B daeccd68674bec236e3501b14aa4529c7dfc66545acf523e76fe84696024761cd28b05aa4a30e27f30168b3ed947bde3ced491f7d410546eeff2d39dd6b0d116 SHA512 67193ea533150a70b2ff073d3078acff974eef2a46d40faa8cc6b69c695abbf4cbc6f3be7d25c351055b63ad1d2546147bfbde8fafad58fdc542da97fbe4d510
 EBUILD libinput-1.14.0.ebuild 2069 BLAKE2B c689b9409c22d2241ff39c52e19fa459938d72e51f3179d1ece4b9472ffce24e236b42a0bd69b1a7afbd4ac2d9f1946cfd41d12e11a75af1b950c324b8e55884 SHA512 807a2c5f246aa8a5a080fa446ea2b8f05f98511e693974b2cab731410b1567d93ead5344ad1fb10fa73b1d92c8591b1f88a8660cfb6516cc5186708f9205fec9
+EBUILD libinput-1.14.1.ebuild 2069 BLAKE2B c689b9409c22d2241ff39c52e19fa459938d72e51f3179d1ece4b9472ffce24e236b42a0bd69b1a7afbd4ac2d9f1946cfd41d12e11a75af1b950c324b8e55884 SHA512 807a2c5f246aa8a5a080fa446ea2b8f05f98511e693974b2cab731410b1567d93ead5344ad1fb10fa73b1d92c8591b1f88a8660cfb6516cc5186708f9205fec9
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.14.1.ebuild b/dev-libs/libinput/libinput-1.14.1.ebuild
new file mode 100644
index 000000000000..c6c5651aad46
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.14.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2014-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc input_devices_wacom"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? ( dev-util/valgrind )
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}"
+#	test? ( >=dev-libs/check-0.9.10 )
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		-Dtests=false # tests are restricted
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index a4fac95f596b..626d6598c791 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -1,3 +1,3 @@
-DIST liblouis-2.5.3.tar.gz 3785311 BLAKE2B 15130dfa6c32b9c12b6ffccf4a8b2185bcc8fe483e8822d4fdd9f1c1cd0c3e8f33325419f75a9eb23e1414743fe01b44041c836a06e4ff040708b95998251854 SHA512 5aa65f3a0b7cef37fe7cd8ccf09df8c40f38d183a88d1be9f1251b40406204e57a8d95716bf1de3569b09b640be613cc3e0bd0e05dc4d544face00bfc8d75ac7
-EBUILD liblouis-2.5.3.ebuild 1418 BLAKE2B 038a99116882249aa70912948a915b418fe37f29a9e57d2f86e801e3c86f62275c5beafa70d14c820c31140991fa5e4cb56f7489f9a22360163045095c700bfe SHA512 0811310f33eca3c289f6704de1a00a27a02e82853594d7dadb68c7f3c39e45f1ad5e9c1b79d858b57250a2e975f85b64c0c51949883f09cf2d15ecbb6ad5308c
+DIST liblouis-3.10.0.tar.gz 13335626 BLAKE2B a4c7f81f15c202c0e1030119f805e218dd51852af57065c441241f4e182828036372750231726802adbb835a7af05ccbf029316da376f3f89dd62ae9d833f838 SHA512 e05d42ba352b1336b10ecd3d320c2bed33250cd636767ecd77837530577c537de4f4e806ddaf1ed7e8b9ec766c84adf6ab045595235c1020f2bb31ba791f3833
+EBUILD liblouis-3.10.0.ebuild 1522 BLAKE2B 4a15773925c9e1c105d9ed44ea8ec5704e4d1a6c3c0f6b6ea79f5ea28c0ceadcff578a21df9391a461da13ea58d60f1e87a1d5d07fd9d1fac1a75a5acc8ee0e7 SHA512 e44c85038780a8b527620f3d9b8399cac1e82832eef546510eba5b253bbbb0e1865c83a393c1f8d8465f26dd096a40f02e3e8af48b768993937c6ef52f5cfcb5
 MISC metadata.xml 351 BLAKE2B 0fa7c957682fe363ddd29442ae153152469cc64ebf9005361c4b82f180c380485adf0b04467b147a441c6656ddcc9e44967fd692ed9f835d70653dbae9b9be1a SHA512 377a2d9ea4bc6007a60fcaf0284bd47af78b6fe2c901916f9cd7d6ab0f7a5225baf7314b47b0c3b00cd162278f910206bd99469bdef0165cd6e19c1eff73714d
diff --git a/dev-libs/liblouis/liblouis-2.5.3.ebuild b/dev-libs/liblouis/liblouis-2.5.3.ebuild
deleted file mode 100644
index d1c9eb1331eb..000000000000
--- a/dev-libs/liblouis/liblouis-2.5.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE='wide-unicode(+)'
-DISTUTILS_OPTIONAL=1
-inherit distutils-r1
-
-DESCRIPTION="An open-source braille translator and back-translator"
-HOMEPAGE="https://github.com/liblouis/liblouis"
-SRC_URI="https://liblouis.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
-IUSE="python"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	default
-
-	if use python; then
-		pushd python > /dev/null
-		distutils-r1_src_prepare
-		popd > /dev/null
-	fi
-}
-
-src_configure() {
-	econf --enable-ucs4
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		pushd python > /dev/null
-		# setup.py imports liblouis to get the version number,
-		# and this causes the shared library to be dlopened
-		# at build-time.  Hack around it with LD_PRELOAD.
-		# Thanks ArchLinux.
-		LD_PRELOAD+=':../liblouis/.libs/liblouis.so'
-			distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	if use python; then
-		pushd python > /dev/null
-		LD_PRELOAD+=':../liblouis/.libs/liblouis.so' \
-			distutils-r1_src_install
-		popd > /dev/null
-	fi
-
-	dodoc README AUTHORS NEWS ChangeLog || die
-	dohtml doc/liblouis.html
-}
diff --git a/dev-libs/liblouis/liblouis-3.10.0.ebuild b/dev-libs/liblouis/liblouis-3.10.0.ebuild
new file mode 100644
index 000000000000..3f716c400def
--- /dev/null
+++ b/dev-libs/liblouis/liblouis-3.10.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_REQ_USE='wide-unicode(+)'
+DISTUTILS_OPTIONAL=1
+inherit autotools distutils-r1
+
+DESCRIPTION="An open-source braille translator and back-translator"
+HOMEPAGE="https://github.com/liblouis/liblouis"
+SRC_URI="https://github.com/liblouis/liblouis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86"
+IUSE="python"
+BDEPEND="sys-apps/help2man"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	default
+
+	if use python; then
+		pushd python > /dev/null
+		distutils-r1_src_prepare
+		popd > /dev/null
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-ucs4
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd python > /dev/null
+		# setup.py imports liblouis to get the version number,
+		# and this causes the shared library to be dlopened
+		# at build-time.  Hack around it with LD_PRELOAD.
+		# Thanks ArchLinux.
+		LD_PRELOAD+=':../liblouis/.libs/liblouis.so'
+			distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use python; then
+		pushd python > /dev/null
+		LD_PRELOAD+=':../liblouis/.libs/liblouis.so' \
+			distutils-r1_src_install
+		popd > /dev/null
+	fi
+
+	DOCS=( README AUTHORS NEWS ChangeLog doc/liblouis.txt )
+	HTML_DOCS=( doc/liblouis.html )
+	einstalldocs
+}
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 341241bf0923..c76d27d6e0e7 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,3 +1,5 @@
 DIST libmirage-3.2.2.tar.bz2 234131 BLAKE2B e3f2825b9e799447a6201f8d46fbb8cf229a5393c73d85ee8a230225603f5e42cb07af4e984aa8602fcce667b16c2af7e2ef9d27862022327a39d0b7189c1eb1 SHA512 f41a095d7a9a3bb0d00ac2bfb8ad443d8d065f446ca2635041e24a570b72c14a27d3c3b300d5fa941253284c4b05b1913715c1169cd26a80db920df9d27cd535
+DIST libmirage-3.2.3.tar.bz2 234761 BLAKE2B f3fc24dae81643c4fea99d12e4f7f1d600586a7c5e546e854d4391ecb11f39a6d1108ac86c79b917fb96cc53424975ff548522a0f0e035ffd4b99638fc18608a SHA512 25cc3ccfac9332d06edff7e73d992e9d74b7464f61b857c3fb40ec9e2584a8f61b8aaef96a6d6f4b8f3a7c871b6b7b7803502d5e1ef771fc239021a827b90f09
 EBUILD libmirage-3.2.2.ebuild 1128 BLAKE2B fbf5a809841d07edef43316e9363c6405d1262c422431f3623b882df6f0972cf1ba43bffaddb608ae865ff8d26728603b08169199e61b40d1d5b2bdb81950977 SHA512 a793624c4915c326d3fc99dee5ce2a103f8f82bd3322ee83ff438413fc0b1b1d7619d40c74b5cc7cedd9a708ad69f405ca5ca1ede848a14bc118a656905702fc
+EBUILD libmirage-3.2.3.ebuild 1162 BLAKE2B 63aa09264c2977d6cec5bec2618bec3954e6417beeabd057a128bb14b6d2d85dbf1cb89473afe64b97be6578148f5b5b158088ccadefd42bf30e0a780f2e79cd SHA512 2ca81b70bd5c8c955b7d45f1eedb594b65af47fb65de82e548e86ec389ed97bf6a514ec327d8c8ad6d92b26668a9e6e33a0546857cd60ac88e77dc1ce0cec99b
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/dev-libs/libmirage/libmirage-3.2.3.ebuild b/dev-libs/libmirage/libmirage-3.2.3.ebuild
new file mode 100644
index 000000000000..51ba1adcb272
--- /dev/null
+++ b/dev-libs/libmirage/libmirage-3.2.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="CD and DVD image access library"
+HOMEPAGE="https://cdemu.sourceforge.io"
+SRC_URI="https://download.sourceforge.net/cdemu/libmirage/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/11" # subslot = libmirage soname version
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +introspection"
+
+RDEPEND=">=app-arch/bzip2-1:=
+	>=app-arch/xz-utils-5:=
+	>=dev-libs/glib-2.38:2
+	>=media-libs/libsamplerate-0.1:=
+	>=media-libs/libsndfile-1.0:=
+	sys-libs/zlib:=
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+DEPEND="${RDEPEND}
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGTKDOC_ENABLED="$(usex doc)"
+		-DINTROSPECTION_ENABLED="$(usex introspection)"
+		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	local DOCS=( AUTHORS README )
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/libmissing/Manifest b/dev-libs/libmissing/Manifest
new file mode 100644
index 000000000000..09d2b9c42b7f
--- /dev/null
+++ b/dev-libs/libmissing/Manifest
@@ -0,0 +1,3 @@
+DIST gnulib-b451121ab45497e78cb6f612c8673a9705193391.tar.gz 6666079 BLAKE2B e7d3b9478697067b57ab198e044f3c854128d5fe390d30947829ce4f34c695a748668c33ae19690e9927fff6df3e194a3160cb4adb7cf47235c603241c66889a SHA512 f6e165cfc0a3999c778d9f43ffc90ff9b569a77ff1e54ff5c50b12b0eddf262c24da8cd2719548574e0397535bb0eb835eef603cc74769f7876ef9db101bebec
+EBUILD libmissing-1.0.0-r1.ebuild 2866 BLAKE2B 0073f790979bde93a4c361b4b086008ba10c8c0c9b78e1a838ae0552f27be192253e05150cc23d397713a8b71c0a9484c2d50608e564cb6f2e854b1e1c3e8379 SHA512 a532d9aab59b256d67be25f243091c4a0dae694fc5cd375881302c4103e573e4a5c03912607c1d02ba5a35bdcbf5ba66282b3b5f1e90ebaa54b9cb7b633a84f3
+MISC metadata.xml 393 BLAKE2B 8fdadb018197632713de833a7b64d961fa8ce1b86db6996fad32484fa09eda403a7bbcb50d3502ac02888b44d56971b0241a9e0902366f10d79017d50e46289b SHA512 8b5739afeacf385f9399745c6396506060f425376e47e0fdc9ca05c59608dd9e82bee2dc385f34c27f96ad8df41753fe05dd90886a81f613a910c76d50bae422
diff --git a/dev-libs/libmissing/libmissing-1.0.0-r1.ebuild b/dev-libs/libmissing/libmissing-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..c1371f6d4faf
--- /dev/null
+++ b/dev-libs/libmissing/libmissing-1.0.0-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+# NOTE: PV is the libtool version number current:revision:age
+
+DESCRIPTION="Library with missing functions based on GNUlib"
+HOMEPAGE="https://prefix.gentoo.org"
+GIT_TAG="b451121ab45497e78cb6f612c8673a9705193391"
+SRC_URI="https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-${GIT_TAG}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/gnulib-${GIT_TAG}"
+
+src_prepare() {
+	default
+
+	mkdir "${PN}" || die
+	cd "${PN}" || die
+	cat > configure.ac <<- EOS
+		AC_PREREQ([2.69])
+		AC_INIT([${PN}], [${PV}], [prefix@gentoo.org])
+		AM_INIT_AUTOMAKE
+		LT_INIT
+
+		AC_CONFIG_MACRO_DIR([m4])
+		AC_CONFIG_HEADER([config.h])
+
+		AC_PROG_CC
+		gl_INIT
+		gl_EARLY
+
+		AC_CONFIG_FILES([Makefile lib/Makefile])
+
+		AC_OUTPUT
+	EOS
+
+	cat > Makefile.am <<- EOS
+		SUBDIRS = lib
+	EOS
+
+	local modules
+	local platform
+	local rev
+
+	case "${CHOST}" in
+		*-apple-darwin*)
+			rev=${CHOST##*-darwin}
+			platform="Mac OS X 10.$((rev - 4))"
+			;;
+		*-solaris2.*)
+			rev=${CHOST##*-solaris2.}
+			# we only support Solaris 10 (and perhaps 9) and up, so we
+			# don't have to bother about 2.x, just X
+			platform="Solaris ${rev}"
+			;;
+	esac
+
+	# blacklist some modules that cause collisions
+	# iconv      provided by virtual/iconv -> sys-libs/libiconv
+	modules=( $(
+		cd "${S}"/doc/posix-functions
+		grep -A1 "This function is missing" *.texi | \
+			grep "${platform}" | \
+			sed -e 's:^\(.[^-]*\)-.*$:\1:' | \
+			xargs sed -n 's/^Gnulib module: \([a-z].*\)$/\1/p' | \
+			sed -e 's: or .*$::' -e 's:, :\n:g' | \
+			sort -u | \
+			grep -v "iconv"
+	) )
+
+	# get platform specific set of missing functions
+	einfo "Including sources for missing functions on ${platform}:"
+	einfo "${modules[*]}"
+	"${S}"/gnulib-tool -S \
+		--import \
+		--lib=libmissing \
+		--libtool \
+		--no-vc-files \
+		--no-cache-modules \
+		"${modules[@]}"
+
+	sed -i -e '/^noinst_LTLIBRARIES /s/noinst_/lib_/' lib/Makefile.am || die
+	echo "libmissing_la_LDFLAGS += version-info ${PV//./:}" >> lib/Makefile.am
+	cat >> lib/Makefile.am << 'EOS'
+install-data-local: $(BUILT_SOURCES)
+	@for hdr in $(BUILT_SOURCES); do \
+		$(INSTALL_HEADER) -D "$$hdr" $(DESTDIR)$(includedir)/missing/$${hdr}; \
+	done;
+EOS
+
+	eautoreconf
+}
+
+src_configure() {
+	cd "${PN}" || die
+
+	# ensure we don't pick up installed libmissing
+	export CPPFLAGS="${CPPFLAGS/-I${EPREFIX}\/usr\/include\/missing/}"
+	export LIBS="${LIBS/-lmissing/}"
+	einfo "CPPFLAGS: ${CPPFLAGS}"
+	einfo "LIBS: ${LIBS}"
+
+	default
+}
+
+src_compile() {
+	cd "${PN}" || die
+	default
+}
+
+src_install() {
+	cd "${PN}" || die
+	default
+
+	rm "${ED}"/usr/lib/libmissing.la \
+		"$(use static-libs || echo "${ED}"/usr/lib/libmissing.a)" || die
+}
diff --git a/dev-libs/libmissing/metadata.xml b/dev-libs/libmissing/metadata.xml
new file mode 100644
index 000000000000..ac8fbe340454
--- /dev/null
+++ b/dev-libs/libmissing/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="project">
+	<email>prefix@gentoo.org</email>
+	<name>Prefix Project</name>
+</maintainer>
+<longdescription lang="en">
+	libmissing provides missing POSIX functions using the gnulib sources
+	as library and system headers.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 4fb6c73b96ef..6e708ec773f5 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -3,8 +3,10 @@ AUX libnl-1.1-vlan-header.patch 2378 BLAKE2B c6d72cb5c7437bc6600e2c34eb6f17fd22d
 AUX libnl-1.1.3-offsetof.patch 320 BLAKE2B 5edb7d935321ae40784d16fdf289470deee86921f2372d200468206ab06cb391a3fce01998d7e4924fd6d235e9292bbbd6134dbc87aa3ebc3dafd16610b4a2a1 SHA512 fe625a9ac6ea8776c8f7ef3d7e3553651c0244e830883587bd7e86490e0ec6e8b29865e172a0e39947e213b910a4279202eabfdd5d7f08e835f5be91d4ff9d6b
 DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4
 DIST libnl-3.4.0.tar.gz 933443 BLAKE2B 735da9f800277c48a5deceb78084f510f56f7017b1184e91b2bb45ba61a2e95355e7a3f5d0a74bdaf7ae003393a6c7556d5b201d0d0052dfc66042aa9e137986 SHA512 6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e
+DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
 EBUILD libnl-1.1.4-r1.ebuild 1165 BLAKE2B c53d5fc1b86e016bf89cf590a9bb8f65f9abc45d4a994d9f405a63d35415234dd8501c7bbd948ba10074e2c5e48e08426a1484fdebc95ef82c345e2539edd6f7 SHA512 2c28a5244287710b2b69aabcd210cb09304ba487e2fb35872243adf59c46af6281606b18c0a3a6de3544b04ed952640a7452c2b9681b14b5deae33374e8b0601
 EBUILD libnl-1.1.4.ebuild 1141 BLAKE2B 16521e18a8b986a96540245ed54c5737c1ba8d17d3a492fe34b2e504216ba21186d1eaf4685716894f826186a87dd3b4ad82c87d9a4e439cd984fdf0472b4828 SHA512 1c63d4eabb1268b349918acbdc3cbc7d2fabc09a75e4b07793f1e380309404f460bfc3b90c7426377d57be65f5b679a5d20155003ab589497b225dea2f9c281a
 EBUILD libnl-3.4.0.ebuild 2407 BLAKE2B 7bb952c54ccaa828e964afae46e02aeafaaef93eb357c09b70f5c56966a11d261f40a402f41668adcd781d5b006e2d971b2325aff594024e71da6d9dacd92677 SHA512 a2a65e942a7f2dd0209a2afae4964af96d0133fe73cb76b8cbc9131e9b8b246b74f05a1869a10c25f0ce539bc7c7bae4bca7ff6639ade62a031245356a1db05c
+EBUILD libnl-3.5.0.ebuild 2412 BLAKE2B 823b9e509a918f65e677233921127990c063e97fd6c8c302e924917428913c2da2de4649daef6a88ebd4d6e3acf3b0c49d905e239f8b5a259d6c07275222ee41 SHA512 b008bbe84e8f5e90f9de71442d8da8998448bdbee8e726f4b9d57e9e5720b35c934da55dfe25748bf39837cce03cd6d23cf26038cb3c4ac111543028019c0cd9
 EBUILD libnl-99999999.ebuild 2191 BLAKE2B c809f82bfa87fb44a6e0447f7f92e9f046027c45ea7780ce0d1c59261f302ad88d83ed4c474e7fde04696ad93b535eeb63f8a794ef5772dd837ee8c478d35a71 SHA512 5714afc5b9651f7de94b9c44723d05c278280b503c7b329ab12c947495ecab7479e34b3e93a001846dd05b3bc89312e5d2b6f69a07697ada101fd5dfd1367920
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
new file mode 100644
index 000000000000..32fb308b60fa
--- /dev/null
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+DISTUTILS_OPTIONAL=1
+inherit distutils-r1 libtool multilib-minimal
+
+LIBNL_P=${P/_/-}
+LIBNL_DIR=${PV/_/}
+LIBNL_DIR=${LIBNL_DIR//./_}
+
+DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
+HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
+SRC_URI="
+	https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz
+"
+LICENSE="LGPL-2.1 utils? ( GPL-2 )"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+debug static-libs python +threads utils"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+	python? ( dev-lang/swig )
+	sys-devel/bison
+	sys-devel/flex
+"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+DOCS=(
+	ChangeLog
+)
+
+S=${WORKDIR}/${LIBNL_P}
+
+MULTILIB_WRAPPED_HEADERS=(
+	# we do not install CLI stuff for non-native
+	/usr/include/libnl3/netlink/cli/addr.h
+	/usr/include/libnl3/netlink/cli/class.h
+	/usr/include/libnl3/netlink/cli/cls.h
+	/usr/include/libnl3/netlink/cli/ct.h
+	/usr/include/libnl3/netlink/cli/exp.h
+	/usr/include/libnl3/netlink/cli/link.h
+	/usr/include/libnl3/netlink/cli/neigh.h
+	/usr/include/libnl3/netlink/cli/qdisc.h
+	/usr/include/libnl3/netlink/cli/route.h
+	/usr/include/libnl3/netlink/cli/rule.h
+	/usr/include/libnl3/netlink/cli/tc.h
+	/usr/include/libnl3/netlink/cli/utils.h
+)
+
+src_prepare() {
+	default
+
+	elibtoolize
+
+	if use python; then
+		cd "${S}"/python || die
+		distutils-r1_src_prepare
+	fi
+
+	# out-of-source build broken
+	# https://github.com/thom311/libnl/pull/58
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(multilib_native_use_enable utils cli) \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		--disable-silent-rules
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python; then
+		# Unset DOCS= since distutils-r1.eclass interferes
+		local DOCS=()
+		cd python || die
+		distutils-r1_src_install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index 4dc06ca2412f..b74435514872 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,5 +1,7 @@
+AUX libofx-0.9.14-0001-Makefile.am-remove-INSTALL-from-docs.patch 697 BLAKE2B b7afbecfa66af17004ca9d8280ef491b08269eee834c3bfead44c1237ff35aeede455514301c31eb46c6cfd6431b68cbaea8cbe6993957e8883dbeb43220c8d8 SHA512 9c30bf1061666ce3659ec1a0ac00a4b5368213e8ebe338fab287740ae08ce1840f0bf80448ec2545e5d1269e25a2223b41bf91ce00d2f7e3c1b64ff6e5231a10
 DIST libofx-0.9.10.tar.gz 1433837 BLAKE2B 131be0243b8450d32417dd75f0421744412a3186c0f7a3451883b6572c0dd27427579baf280ac2ae6409d0738bd578f69eaa9debfe50024411c6b0ccad11f5c9 SHA512 061110702034dbbb9be3adaebe6236a4b0842169d8ee7671bad6c93960b380cbb33953bdf080c8b14f45930b0c817fcfe1bf71f15d9872dd2535a1415f5be895
 DIST libofx-0.9.14.tar.gz 210155 BLAKE2B 1b5ee8503dd9d4837415e53ae79889c32c50146b2b508aab052e8074a277f8181c6866470220758ed7997b0b6e3e524ac6f9e1cac9a673f60c30ce3093e5a3ee SHA512 785c5130fc6f6cfc019d4aee2bf6de6311835e5dc7f2bd56a83f1ecf5e62ecb320a95bf4a5ff8f9e14dcaf5ff1eabc833cd7974927e571a8469c9a02fb8362d2
-EBUILD libofx-0.9.10.ebuild 1118 BLAKE2B 893e34773b269783129ddecb76ecc2afad25d9fe0067e87e1d5eef0de8f6f30a84a9254e9b64a19dcedb1b8759c8ef16165a8ecef9a78f7e29cbc6f2b8eaf7f9 SHA512 37c9ab47af820ad0572b511b0d97a850b53113e8339e82bacbc26b4dd02b6a8a40784e478bd2158804d22b02963a71346c96fb6ac3710b8a4f88ff4d6ed6e673
-EBUILD libofx-0.9.14.ebuild 1232 BLAKE2B 05db418dcb8fccfdba01d26b845477bbadf93e952bd256516f785838bd15690757c97466908898198c5eca6850506b0f8cdd511a0732056664b4c54c3e15b313 SHA512 ccd2b398a0832d2b19cc47c005f6ac0b7bcd12b5a796e7e8f0938c187d0a0955faf604b297be812aec2f87467d35bce51e6e58d90e88a654f125dd51e258d40a
+EBUILD libofx-0.9.10.ebuild 1113 BLAKE2B 3631d753f719ba404467879b18d68ab9fddebe637b7ddca3e8c3821afe0a3d5527e9e6da69f7e031ef468b844f81ee567954ffde8a6c2939dfbc3965966dc2a4 SHA512 42493172e283ddf49306c5487eb22c5889b45d6c900fb41c1c33ab003cd316f4681ed239dd92a0a5b78f8f8b7bbb54fcb288622aa194b0ef4d602d853eecf9ac
+EBUILD libofx-0.9.14-r1.ebuild 1257 BLAKE2B f7cdc1d8f889624622bfb931ec3a514543c38433221c05df6fc0945763bb7cef7bf624b1353c9053cca1441e62e589c55088305b153e3c2f26c6cd7ab29cb3d3 SHA512 84b23985144ae9dd542306af7554a27bd02988e1ca8480d9e4445824f307c8a30506134d52d2da92dd29ae252584e656e88a6292af4243fbbcc3084e8ddd5110
+EBUILD libofx-0.9.14.ebuild 1226 BLAKE2B 9e56f0f44a875bb1e6548258483a73ceba593786321025bace10fae788b3569e645dff71cd3d489449275de533b036fe1b9d2baf7f68914958de295569976e0a SHA512 b64a98e16ebe5f3b1d5cead085683ec607d8d05e9f4ae33170f2820b1ddc28f084c7e52e80dbe735f7272345649f536c7b064ede0ceca999c3bea14af23f566f
 MISC metadata.xml 243 BLAKE2B 1611cb7b6df68e87374031fa563dcb5388243c0df9537b81e1c53f05cc297789e1f4d178edbbc8906af7a6b0ec549aae225662f87df1d48dc4a6fa2cc2c703c0 SHA512 fc5071bd581b91f72ea6f021641f47d46d1e6038cac7bd34bc13d94e6229441e3b2f7cdd981490a169d7e645339fe4137496a0eb0956014027ffd42a5b9814a8
diff --git a/dev-libs/libofx/files/libofx-0.9.14-0001-Makefile.am-remove-INSTALL-from-docs.patch b/dev-libs/libofx/files/libofx-0.9.14-0001-Makefile.am-remove-INSTALL-from-docs.patch
new file mode 100644
index 000000000000..b4e68e43ec34
--- /dev/null
+++ b/dev-libs/libofx/files/libofx-0.9.14-0001-Makefile.am-remove-INSTALL-from-docs.patch
@@ -0,0 +1,28 @@
+From a8f965718de5c046fa64344b6bae521cbd5a6a20 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Wed, 21 Aug 2019 10:50:46 +0200
+Subject: [PATCH] Makefile.am: remove INSTALL from docs
+
+Gentoo specific: Remove the missing INSTALL file from Makefile.am
+This could have been copied by eautoreconf, but unfortunately isn't.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3a83560..fd81144 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,7 +11,6 @@ docdir = $(datadir)/doc/libofx
+ doc_DATA = \
+   AUTHORS \
+   COPYING \
+-  INSTALL \
+   NEWS \
+   README \
+   ChangeLog \
+-- 
+2.22.0
+
diff --git a/dev-libs/libofx/libofx-0.9.10.ebuild b/dev-libs/libofx/libofx-0.9.10.ebuild
index af1022953385..873562de1519 100644
--- a/dev-libs/libofx/libofx-0.9.10.ebuild
+++ b/dev-libs/libofx/libofx-0.9.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libofx/libofx-0.9.14-r1.ebuild b/dev-libs/libofx/libofx-0.9.14-r1.ebuild
new file mode 100644
index 000000000000..7b0ecd9362c7
--- /dev/null
+++ b/dev-libs/libofx/libofx-0.9.14-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A library to support the Open Financial eXchange XML format"
+HOMEPAGE="https://github.com/libofx/libofx"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7"
+KEYWORDS="amd64 x86"
+IUSE="static-libs test"
+
+RDEPEND="
+	>=dev-cpp/libxmlpp-2.40.1:2.6
+	>=net-misc/curl-7.9.7
+	virtual/libiconv
+"
+DEPEND="
+	${RDEPEND}
+	>app-text/opensp-1.5
+"
+BDEPEND="
+	dev-util/gengetopt
+	sys-apps/help2man
+	virtual/pkgconfig
+	test? ( app-crypt/gnupg )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-0001-Makefile.am-remove-INSTALL-from-docs.patch"
+)
+
+# workaround needed for ofxconnect to compile
+MAKEOPTS="-j1"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# we will tell you where we wants the docs!
+	sed -i -e 's:docdir.*::' Makefile.am || die
+
+	# configure arguments alone don't disable everything
+	sed -e "/^SUBDIRS/s/doc//" -i Makefile.am || die
+
+	append-cxxflags -std=c++14
+}
+
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.a' -delete || die
+	fi
+}
diff --git a/dev-libs/libofx/libofx-0.9.14.ebuild b/dev-libs/libofx/libofx-0.9.14.ebuild
index 5e46431a232a..7896e2e8c5e8 100644
--- a/dev-libs/libofx/libofx-0.9.14.ebuild
+++ b/dev-libs/libofx/libofx-0.9.14.ebuild
@@ -10,8 +10,8 @@ HOMEPAGE="https://github.com/libofx/libofx"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+SLOT="0/7"
+KEYWORDS="amd64 x86"
 IUSE="static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
index 1f6044f60a47..ec779853062e 100644
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@@ -3,8 +3,8 @@ DIST libpreludedb-3.0.0.tar.gz 1269937 BLAKE2B 6f6bad7b9529b88bd03b224c1ea4066b9
 DIST libpreludedb-3.1.0.tar.gz 1291186 BLAKE2B 90b3b6264f0042b14e54abfc3068071419646076fc6cfa3dd84ba6c14797fb0ea88885edef47b8a5d0dc455468e6daaa8e795b621a4f9001d19d8edc33630a88 SHA512 dcb98eff2521979c2956bdd6f3b661c346c0f6748ef820a75d77c948e426a996de26c7fc6b6c2abddc93277db3820eb2f44b61c87feb86483e720cf9b0e0124c
 DIST libpreludedb-4.0.0.tar.gz 1325812 BLAKE2B 7a506f7cd7b51898e26201f2cc640b1f34227f9cf7c5c6e2385480f1fc0ad854b6d747293ab502b641cc65f1ee9ae4a8f225e6a1d4489bcaa59901c6342f1279 SHA512 13f5dbcfa6af965f2075d60c645ebb19cbd6b18807b26f4f13a7a05f1cf552996f9846e856728a4e1dc621efda693016e82623d4a3cbf74849b3e7114f19faca
 DIST libpreludedb-4.1.0.tar.gz 1333638 BLAKE2B 380a6d4ef8836555510f9f9882b6100417f2567520c421355fb7eec8d2cd7e2f3942c4cb90ea21fa1557327026edd5c1e35e338a79e06a21cfb2bd6813a289c2 SHA512 de1fa5106d7f34edb5a23e726c968de84bb8b10257587b6ee36276ed75ddc54f4f9539aecb7836e114eb3bfa90104dd3b5e097be0c3d12347dcbded94f293dc4
-EBUILD libpreludedb-3.0.0.ebuild 1565 BLAKE2B 0970da7819576411410b104491aa6819c7d9799c97b6ee43656de8839c47c02b1fb01bcd433a31fce0a19b18e5fa564e7be586a4eedb65366d97cfc9224f1556 SHA512 70991e5ffe60a8071e308f79861f6ad780eda7bf22d7cc616008de0cb532f24125d24951b33dce15ba57ba61e128c2047923b18fe7025362b864f57841f5054f
-EBUILD libpreludedb-3.1.0.ebuild 1489 BLAKE2B bce9a006c77081255e25d3f2c8e3d5e3e53eb0751578d870a157976caf20a2ad6ca4546c8d2557a42b570b325afcea835488112acff35d09e9b3b234156a0612 SHA512 09bf5c2bc1fa7ced73b179979dac8b05a2750a4e2a92bf3fece21c3d5d350613b0e81b45df409b67045a05be2bd67ce0a02d1de2c4a5a26030a4f8ba0ab596e2
-EBUILD libpreludedb-4.0.0.ebuild 1736 BLAKE2B ab3d192770ca8a37bb5d3a165405c7b1923f29aa5267c9ea8f3481a5291c72b677e0304c4e67a7ddd223bfab2f5a61f852bc0ed4d4fa0aba470e588bec4ffe4f SHA512 9f3f5d15e56ae1cc22e2fb404e8897b1aa5bb402c292cdd68f6c78316df96e7ba338684012d1122cf5b038e28acd9c14c9fdb0df6fa1199965a7f0fd60d9b4b0
-EBUILD libpreludedb-4.1.0.ebuild 1744 BLAKE2B 94b0b1d02edeeb51291d3d8e73d164f66d1238107357bbbb1abf8c33c3a4282c39dfbe12ebe428f110ab43ff96b91202e07f486ece4d5f53ba4938eed64df752 SHA512 af91a741ab6d21e10243ee1464fa7a4a91cffe828ff0e9dc25b452b99e7a7e191552d32ee5a4547c2a0831af063d11e9b672a15251757dbce277e44dc4cab267
+EBUILD libpreludedb-3.0.0-r1.ebuild 1569 BLAKE2B 09f528561880901c210847920fc2b1243b60141ca36f25e3f07158fef17bf029d4f2850f61db982b6bbe61a2f3a9ca488809d41132477ac4835568c8b2afa164 SHA512 a9e9f519c6ff194194a40f8a1073290c03ad1d3ca3829123524fde910d2c04343d0b0ff7ebb92e421438184511a3a4c4f326adc8cf734724419e9fbd22b1cb75
+EBUILD libpreludedb-3.1.0-r1.ebuild 1493 BLAKE2B ac1a9350ef9f151861afb2c228091ef128ed6e8a2ae3111268014aeec900a728c561799830a5694798a8b1c4b54b36920351a759306c0ea5a5555b6059eda928 SHA512 462da351b9cf2653d621a0284dedb52f26ceb9f64185d5cc70099bd80af6d79108baa3d2a1c7edc2c2cc1c90dee2289e611837c8f8bab8ca72ec87d0f0a0f2a4
+EBUILD libpreludedb-4.0.0-r1.ebuild 1740 BLAKE2B 2b8401a5fd6e7392b911a4772d108736f07fcde60a023eff9c4af1a5008723c86897a9359f0dc5582774b02f500edf8e0f309376c7dfe65312fa0379e13d904e SHA512 61ebcdb2fdb231a01f5e8d592958f31fe2d6c7723617bf35b44f4101ed80e1cb5a155efde9c561d2ceb7ce9f7f93d040cd892dec759685cc3469392f57e12f49
+EBUILD libpreludedb-4.1.0-r1.ebuild 1748 BLAKE2B 25b78382047147f273b9a3e2d8a267dddf3f45453bbc0cd5cb66a0e9fef0d7449ceaac1b687862ff49ea4301d6e94373cbe17b5830fc161cfddce51803ef8ec3 SHA512 bd14c7edb767f805a19fcec51491a52020e4548d8a0d93020cb59a60c4e29708a353474c465106dfd923c9ed7f2310992a0c4f23bfc75b44cc303b56b909a722
 MISC metadata.xml 740 BLAKE2B 4378279b071469fe4b56d29d93bbfa596c007ed9be028c028c0b3cea7b4a4d206b8dfada84f8dbefdc56ec1d355c0a81f8a5f719a3819761ef532a85fbdc2490 SHA512 336a155dddb152697e44246184aaf0cfa928f1a3acd226c3f048aaeca81e96e1c5c7bceaee2bcc5e6ff731b59de1eadb02698e01c3e9443e6d9a37859da8e973
diff --git a/dev-libs/libpreludedb/libpreludedb-3.0.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..4e7679606af1
--- /dev/null
+++ b/dev-libs/libpreludedb/libpreludedb-3.0.0-r1.ebuild
@@ -0,0 +1,74 @@
+# 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} )
+
+inherit autotools eutils python-r1
+
+DESCRIPTION="Framework to easy access to the Prelude database"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc python mysql postgres sqlite"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/libgcrypt:0=
+	net-libs/gnutls
+	dev-libs/libprelude
+	python? ( ${PYTHON_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	sys-devel/flex
+	virtual/yacc
+	>=dev-lang/swig-3.0.7
+	virtual/pkgconfig"
+
+src_prepare() {
+	default_src_prepare
+
+	mv "${S}/configure.in" "${S}/configure.ac" || die "mv failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local python2_configure=--without-python2
+	local python3_configure=--without-python3
+
+	chk_python() {
+		if [[ ${EPYTHON} == python2* ]]; then
+			python2_configure=--with-python2
+		elif [[ ${EPYTHON} == python3* ]]; then
+			python3_configure=--with-python3
+		fi
+	}
+
+	if use python; then
+		python_foreach_impl chk_python
+	fi
+
+	econf \
+		--enable-easy-bindings \
+		--with-swig \
+		$(use_enable doc gtk-doc) \
+		${python2_configure} \
+		${python3_configure} \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with sqlite sqlite3)
+}
+
+src_install() {
+	default_src_install
+	prune_libtool_files --modules
+}
diff --git a/dev-libs/libpreludedb/libpreludedb-3.0.0.ebuild b/dev-libs/libpreludedb/libpreludedb-3.0.0.ebuild
deleted file mode 100644
index a42e13bd0878..000000000000
--- a/dev-libs/libpreludedb/libpreludedb-3.0.0.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
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit autotools eutils python-r1
-
-DESCRIPTION="Framework to easy access to the Prelude database"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc python mysql postgres sqlite"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/libgcrypt:0=
-	net-libs/gnutls
-	dev-libs/libprelude
-	python? ( ${PYTHON_DEPS} )
-	mysql? ( virtual/libmysqlclient )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	sys-devel/flex
-	virtual/yacc
-	>=dev-lang/swig-3.0.7
-	virtual/pkgconfig"
-
-src_prepare() {
-	default_src_prepare
-
-	mv "${S}/configure.in" "${S}/configure.ac" || die "mv failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local python2_configure=--without-python2
-	local python3_configure=--without-python3
-
-	chk_python() {
-		if [[ ${EPYTHON} == python2* ]]; then
-			python2_configure=--with-python2
-		elif [[ ${EPYTHON} == python3* ]]; then
-			python3_configure=--with-python3
-		fi
-	}
-
-	if use python; then
-		python_foreach_impl chk_python
-	fi
-
-	econf \
-		--enable-easy-bindings \
-		--with-swig \
-		$(use_enable doc gtk-doc) \
-		${python2_configure} \
-		${python3_configure} \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with sqlite sqlite3)
-}
-
-src_install() {
-	default_src_install
-	prune_libtool_files --modules
-}
diff --git a/dev-libs/libpreludedb/libpreludedb-3.1.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..2fedf289e705
--- /dev/null
+++ b/dev-libs/libpreludedb/libpreludedb-3.1.0-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{2_7,3_5} )
+
+inherit autotools python-r1
+
+DESCRIPTION="Framework to easy access to the Prelude database"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc python mysql postgres sqlite"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/libgcrypt:0=
+	net-libs/gnutls:=
+	~dev-libs/libprelude-${PV}
+	python? ( ${PYTHON_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	sys-devel/flex
+	virtual/yacc
+	>=dev-lang/swig-3.0.7
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local python2_configure=--without-python2
+	local python3_configure=--without-python3
+
+	chk_python() {
+		if [[ ${EPYTHON} == python2* ]]; then
+			python2_configure=--with-python2
+		elif [[ ${EPYTHON} == python3* ]]; then
+			python3_configure=--with-python3
+		fi
+	}
+
+	if use python; then
+		python_foreach_impl chk_python
+	fi
+
+	econf \
+		--enable-easy-bindings \
+		--with-swig \
+		$(use_enable doc gtk-doc) \
+		${python2_configure} \
+		${python3_configure} \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with sqlite sqlite3)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libpreludedb/libpreludedb-3.1.0.ebuild b/dev-libs/libpreludedb/libpreludedb-3.1.0.ebuild
deleted file mode 100644
index fdf5055c0559..000000000000
--- a/dev-libs/libpreludedb/libpreludedb-3.1.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Framework to easy access to the Prelude database"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc python mysql postgres sqlite"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/libgcrypt:0=
-	net-libs/gnutls:=
-	~dev-libs/libprelude-${PV}
-	python? ( ${PYTHON_DEPS} )
-	mysql? ( virtual/libmysqlclient )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	sys-devel/flex
-	virtual/yacc
-	>=dev-lang/swig-3.0.7
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local python2_configure=--without-python2
-	local python3_configure=--without-python3
-
-	chk_python() {
-		if [[ ${EPYTHON} == python2* ]]; then
-			python2_configure=--with-python2
-		elif [[ ${EPYTHON} == python3* ]]; then
-			python3_configure=--with-python3
-		fi
-	}
-
-	if use python; then
-		python_foreach_impl chk_python
-	fi
-
-	econf \
-		--enable-easy-bindings \
-		--with-swig \
-		$(use_enable doc gtk-doc) \
-		${python2_configure} \
-		${python3_configure} \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with sqlite sqlite3)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..54bb58c0faac
--- /dev/null
+++ b/dev-libs/libpreludedb/libpreludedb-4.0.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 ruby-single
+
+DESCRIPTION="Framework to easy access to the Prelude database"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres python sqlite"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="~dev-libs/libprelude-${PV}
+	net-libs/gnutls:=
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	python? ( ${PYTHON_DEPS} )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-3.0.7
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-python-bindings.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--enable-easy-bindings
+		--with-swig
+		$(use_with mysql)
+		$(use_with postgres postgresql)
+		$(use_with sqlite sqlite3)
+	)
+
+	if use python; then
+		python_setup
+		if python_is_python3; then
+			myconf+=(--without-python2 --with-python3="${EPYTHON}")
+		else
+			myconf+=(--without-python3 --with-python2="${EPYTHON}")
+		fi
+	else
+		myconf+=(--without-python2 --without-python3)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_install
+	fi
+}
diff --git a/dev-libs/libpreludedb/libpreludedb-4.0.0.ebuild b/dev-libs/libpreludedb/libpreludedb-4.0.0.ebuild
deleted file mode 100644
index b7ded08b2281..000000000000
--- a/dev-libs/libpreludedb/libpreludedb-4.0.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 ruby-single
-
-DESCRIPTION="Framework to easy access to the Prelude database"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres python sqlite"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="~dev-libs/libprelude-${PV}
-	net-libs/gnutls:=
-	mysql? ( virtual/libmysqlclient )
-	postgres? ( dev-db/postgresql:* )
-	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-3.0.7
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-python-bindings.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-easy-bindings
-		--with-swig
-		$(use_with mysql)
-		$(use_with postgres postgresql)
-		$(use_with sqlite sqlite3)
-	)
-
-	if use python; then
-		python_setup
-		if python_is_python3; then
-			myconf+=(--without-python2 --with-python3="${EPYTHON}")
-		else
-			myconf+=(--without-python3 --with-python2="${EPYTHON}")
-		fi
-	else
-		myconf+=(--without-python2 --without-python3)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_install
-	fi
-}
diff --git a/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild b/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..3c44652a69d1
--- /dev/null
+++ b/dev-libs/libpreludedb/libpreludedb-4.1.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 ruby-single
+
+DESCRIPTION="Framework to easy access to the Prelude database"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres python sqlite"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="~dev-libs/libprelude-${PV}
+	net-libs/gnutls:=
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	python? ( ${PYTHON_DEPS} )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-3.0.11
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--enable-easy-bindings
+		--with-swig
+		$(use_with mysql)
+		$(use_with postgres postgresql)
+		$(use_with sqlite sqlite3)
+	)
+
+	if use python; then
+		python_setup
+		if python_is_python3; then
+			myconf+=(--without-python2 --with-python3="${EPYTHON}")
+		else
+			myconf+=(--without-python3 --with-python2="${EPYTHON}")
+		fi
+	else
+		myconf+=(--without-python2 --without-python3)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use python; then
+		cd bindings/python || die
+		distutils-r1_src_install
+	fi
+}
diff --git a/dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild b/dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild
deleted file mode 100644
index 64f67755a9f9..000000000000
--- a/dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 ruby-single
-
-DESCRIPTION="Framework to easy access to the Prelude database"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres python sqlite"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="~dev-libs/libprelude-${PV}
-	net-libs/gnutls:=
-	mysql? ( virtual/libmysqlclient )
-	postgres? ( dev-db/postgresql:* )
-	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-3.0.11
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-easy-bindings
-		--with-swig
-		$(use_with mysql)
-		$(use_with postgres postgresql)
-		$(use_with sqlite sqlite3)
-	)
-
-	if use python; then
-		python_setup
-		if python_is_python3; then
-			myconf+=(--without-python2 --with-python3="${EPYTHON}")
-		else
-			myconf+=(--without-python3 --with-python2="${EPYTHON}")
-		fi
-	else
-		myconf+=(--without-python2 --without-python3)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use python; then
-		cd bindings/python || die
-		distutils-r1_src_install
-	fi
-}
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index fda07da3268a..9ee274c1c275 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,6 +1,8 @@
 DIST libsass-3.5.5.tar.gz 327298 BLAKE2B 4127722343394bca4ed054987eed6113788e10dc4d03a869778c10b56135406c1fcd72dc101bfe405c96267b628735e8ee74d3812ab392f097dc941b78bef882 SHA512 dcb73a5080c00023b60a19ea037ba5af481253a7b47492bd7114bf45ab78ed931c7b207fa8f12ed200a39760553d72ae92dbe4eb80b826b59a6201fb34008fe5
 DIST libsass-3.6.0.tar.gz 332747 BLAKE2B be4ad469aa55f89ce54e6cf1cc5cf0a72f4727610bf2d5aeca7321fde4e4cbc009f59bee46c1e5e5b88825d5bd2f3b4fa427ab3cd535584956f7541c16339f1d SHA512 9665e50ee964ca3cc323f26c2b8322677102d26a7a102558ffbc5bef7a4c4ea44ca5096a967e4044dac1404bfa343a37d846f22d1e1adc27592023d5d4ac40c8
+DIST libsass-3.6.1.tar.gz 333609 BLAKE2B ea6cb0285a6d741614bb900ff0f3b74660c74ec9ed071abf2d980bfe3f55b02fa2873d3860e5b767ca82b5f202f3d2aef28b73357bf8d2b3117c925b4dc78791 SHA512 e9a3a30851e26145d049c4b20951c663a9d48c781a732acd3cc2cdb30df3449e445b57211f666b58afa137431fbdb149add48ff8a0dec92bd8abb514c90adebb
 EBUILD libsass-3.5.5.ebuild 1121 BLAKE2B 1be11be93f262d319d986335d725388e2fc4b1ea18841e5a89841d761873d24a36aa4d602ee0e8714ca852f4915c4e2e4d9eb9efc07c307253bd1912ac95ede3 SHA512 a955b393ca0180f6ead993584d544a9a2bf6a0d5b0652377369a94716e41167898237ec7c8e9d8c7a7f2e181adb8ec0ea2db599ba30b3bfa9ffcdb9b2a7fd95e
 EBUILD libsass-3.6.0.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
+EBUILD libsass-3.6.1.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
 EBUILD libsass-9999.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
 MISC metadata.xml 555 BLAKE2B 5bf541c7be60dbded36d2dbf944111095a7b911809236b110a9d5d79fb99d2315019c8082489699e0c984a5cc6b1fa07b845afef28f887191dd6f9243cb93ace SHA512 b4b4252aefabd61569690f83ec264a19ac00aee9559f7e1857770b560f74de1134aa3e628d12f3d04bebf426d779eb7bbb40a5d714d841ed480c8178763eb8f0
diff --git a/dev-libs/libsass/libsass-3.6.1.ebuild b/dev-libs/libsass/libsass-3.6.1.ebuild
new file mode 100644
index 000000000000..7bb47a910936
--- /dev/null
+++ b/dev-libs/libsass/libsass-3.6.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/sass/libsass.git"
+	inherit git-r3
+	KEYWORDS=
+else
+	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+fi
+
+DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
+HOMEPAGE="https://github.com/sass/libsass"
+LICENSE="MIT"
+SLOT="0/1" # libsass soname
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+DOCS=( Readme.md SECURITY.md )
+
+src_prepare() {
+	default
+
+	if [[ ${PV} != *9999 ]]; then
+		[[ -f VERSION ]] || echo "${PV}" > VERSION
+	fi
+	eautoreconf
+
+	# only sane way to deal with various version-related scripts, env variables etc.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--enable-shared
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc -r "${S}/docs"
+}
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index c06f6ffa4a13..b02152c88f6a 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,6 +1,9 @@
 AUX libsavitar-3.3.0-remove-packaged-pugixml.patch 3294 BLAKE2B aa31da750cf1adcba252560a9160b96d7289a4d5fbc417396cb3c01e655e48f8014bc99b65554c8b03d28f0d00f99dfaad47a8fa0c2d3364221ae2971a42e4ec SHA512 5f944f2e32ca0b6b9bf161802816a32e9835198923a5ff5dc0f483df3ce41a69d08c1eb49c2e932c4cf5347aafeba0f29c88dfc091c06ca2057f7f92ed55d21c
+AUX libsavitar-4.2.0-remove-packaged-pugixml.patch 2079 BLAKE2B a0fe34d3d4e2325904cad018409faecc0c6292e4e0e67f4655c7f94a36c756d1a647a62d4bb735b428fb0b8e5eca32dd8c523beabd29a52cc4dc888e7313a018 SHA512 c42965261c9aaad911a5d6f947ce139c4948375e7c74481682a4e6774a6368f335ca88024886e8640ec2a24fd382b1015ec35a75e873316a6b6dde171022f459
 DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35
 DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f
+DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb41111e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d
 EBUILD libsavitar-3.4.1.ebuild 1039 BLAKE2B a6b6119d55bcc19b7cccf71e143cdee21798f0e60c6177c1fb43aec4bc707441746cf4517009e544e0bb9ba2a90177a5a422de3cf6512bded01d4194d83ab1f7 SHA512 fbee3ebe2af9fae1622428b260cbc937482000bf5e4e15430bd3041cf41d84a074422bd59f7fc6bf0254839025493b11aeb8abaaee7fda06eef2a0cb5e098a13
 EBUILD libsavitar-3.6.0.ebuild 1036 BLAKE2B fae964502773685bccc2379288b7767c89f1cb5fdb893b7248050d87b3a324a503d890e80d5b9116484db0b4774e0d7cf5c89574bdc3ce4b1d657733715011ee SHA512 1b06c9d885ab9a29f0b4239b3412b4ba276d948881178ded503d1708aec19383c2846ff95dd860b77c89be64644fea735560a3c8462143695d31fca9877bc615
+EBUILD libsavitar-4.2.0.ebuild 954 BLAKE2B b3ff29fa31144f53b361f8353d46dcada694f20e2f629905d4557e607e12fa5b0df5a855943d7b9c8d3f0174c85b03e9470adc36530352f03fdbe21bc25da39a SHA512 4b0e25439a97dfde13afe91b7a9898d6559b5c5b1ef206b3497f85b7a0562763430bd845d07068a9a42011ad927d78f93c3d7ca6d89acaa205e565a3f5731dbf
 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/files/libsavitar-4.2.0-remove-packaged-pugixml.patch b/dev-libs/libsavitar/files/libsavitar-4.2.0-remove-packaged-pugixml.patch
new file mode 100644
index 000000000000..1d5744aebf06
--- /dev/null
+++ b/dev-libs/libsavitar/files/libsavitar-4.2.0-remove-packaged-pugixml.patch
@@ -0,0 +1,60 @@
+diff -urN libSavitar-4.2.0_old/CMakeLists.txt libSavitar-4.2.0/CMakeLists.txt
+--- libSavitar-4.2.0_old/CMakeLists.txt	2019-07-30 09:03:53.000000000 +0300
++++ libSavitar-4.2.0/CMakeLists.txt	2019-08-04 17:23:27.099395645 +0300
+@@ -15,7 +15,7 @@
+     find_package(Threads QUIET)
+ endif()
+ 
+-add_subdirectory(pugixml)
++find_package(pugixml REQUIRED)
+ 
+ if(BUILD_PYTHON)
+     list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+diff -urN libSavitar-4.2.0_old/src/MeshData.cpp libSavitar-4.2.0/src/MeshData.cpp
+--- libSavitar-4.2.0_old/src/MeshData.cpp	2019-07-30 09:03:53.000000000 +0300
++++ libSavitar-4.2.0/src/MeshData.cpp	2019-08-04 17:23:59.891051757 +0300
+@@ -17,7 +17,7 @@
+  */
+ 
+ #include "MeshData.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ #include <cstring>
+ #include <iostream>
+ #include <stdexcept> //For std::runtime_error.
+diff -urN libSavitar-4.2.0_old/src/Scene.cpp libSavitar-4.2.0/src/Scene.cpp
+--- libSavitar-4.2.0_old/src/Scene.cpp	2019-07-30 09:03:53.000000000 +0300
++++ libSavitar-4.2.0/src/Scene.cpp	2019-08-04 17:24:10.425265944 +0300
+@@ -17,7 +17,7 @@
+  */
+ 
+ #include "Scene.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ #include <iostream>
+ #include <string>
+ using namespace Savitar;
+diff -urN libSavitar-4.2.0_old/src/SceneNode.cpp libSavitar-4.2.0/src/SceneNode.cpp
+--- libSavitar-4.2.0_old/src/SceneNode.cpp	2019-07-30 09:03:53.000000000 +0300
++++ libSavitar-4.2.0/src/SceneNode.cpp	2019-08-04 17:24:31.617696840 +0300
+@@ -17,7 +17,7 @@
+  */
+ 
+ #include "SceneNode.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ #include <iostream>
+ using namespace Savitar;
+ 
+diff -urN libSavitar-4.2.0_old/src/ThreeMFParser.h libSavitar-4.2.0/src/ThreeMFParser.h
+--- libSavitar-4.2.0_old/src/ThreeMFParser.h	2019-07-30 09:03:53.000000000 +0300
++++ libSavitar-4.2.0/src/ThreeMFParser.h	2019-08-04 17:24:53.996151843 +0300
+@@ -21,7 +21,7 @@
+ 
+ #include "SavitarExport.h"
+ #include "SceneNode.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ 
+ #include <string>
+ namespace Savitar
diff --git a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
new file mode 100644
index 000000000000..d29e528448ea
--- /dev/null
+++ b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils python-single-r1
+
+MY_PN="libSavitar"
+
+DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
+HOMEPAGE="https://github.com/Ultimaker/libSavitar"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="+python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/pugixml
+	dev-python/sip[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.0-remove-packaged-pugixml.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index b7c8d891c3ef..020e53fc73aa 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1,3 +1,5 @@
 DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe771fb848fbd00f0a332388795dc6108a0fa5a282b4212abe0b0642f205bda53c2c39a4a2d65fa71e082fc76a6d2 SHA512 bf5b60a296795e0a8a4a658c0106492393aa7ce698e785256b3427c17215c2a5b6178a61a2043c93ea4334f754eabece20221ac8fef0fd5644086a3891d98a9f
+DIST libtasn1-4.14.tar.gz 1771184 BLAKE2B fab592db4c62d1ed1201637fdbfbf7b753ff90994245b28bad4fbbb6f28616f0abc65fb5cf4fe9b9cd6cc7c4ffb442686b275a97dcfdbdb6a08b0d8e781576f5 SHA512 efdcf3729e9e057cafbfdc9929f08531de03cf3b64e7db62cb53c26bf34c8db4d73786fd853620ab1a10dbafe55e119ad17bfeb40e191071945c7b4db9c9e223
 EBUILD libtasn1-4.13.ebuild 1169 BLAKE2B 5c73d0e3b295b55119251f08cdecfc9d9594bbd6fc9eec6ddd11c6743704075caccf507ba22071c3d1f41b18b30232591a2c5afb71f7625daf43e975e3d3682b SHA512 66e9032f34ed0d179c4eda17bf53d1ec153d943a33c71767ee55a6894917fbb9715d2fc4d797a2abbe2e8e72d5dc215ea9db4612ec6909d240b176a2f83c990b
+EBUILD libtasn1-4.14.ebuild 1192 BLAKE2B 467335199718a62c712a767a6fa1d40446cd4b95ade3ab5ccbcd9b09a8ed80b9a95514ef0e09491e25fd01866b4182ae2577009db7996c383c04461328a4f187 SHA512 2093ea48c8052f0d1e7d8b75109d4c801ed5ed2282a49b4fe4a9441fc4ba5711df97f049d2f38987fc590d9393a68d7acbd14901fd8b43b6b682fef25f34d8bc
 MISC metadata.xml 347 BLAKE2B d1cb59aca28df43f3b322b98daf2cefd4c91d45120bd47c5cb883dde59ae0ac9b8fcb092e0bd4b51e1f09aff48b97a6e1880568ae6796025a989b67902b01a7c SHA512 2f70d06c9e91e2d9305cce180c302b6b04b4831fd93c1897fd2027a1bf5855700c5531ba3f9c3fe93748df1db923d6ad4ea78bbe3cfd2458c0006457ed43a450
diff --git a/dev-libs/libtasn1/libtasn1-4.14.ebuild b/dev-libs/libtasn1/libtasn1-4.14.ebuild
new file mode 100644
index 000000000000..fe96740ea316
--- /dev/null
+++ b/dev-libs/libtasn1/libtasn1-4.14.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="ASN.1 library"
+HOMEPAGE="https://www.gnu.org/software/libtasn1/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0/6" # subslot = libtasn1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test valgrind"
+
+BDEPEND="sys-apps/help2man
+	virtual/yacc
+	test? ( valgrind? ( dev-util/valgrind ) )"
+
+DOCS=(
+	AUTHORS
+	ChangeLog
+	NEWS
+	README.md
+	THANKS
+)
+
+pkg_setup() {
+	if use doc; then
+		DOCS+=( doc/libtasn1.pdf )
+		HTML_DOCS=( doc/reference/html/. )
+	fi
+}
+
+src_prepare() {
+	default
+	elibtoolize  # for Solaris shared library
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable valgrind valgrind-tests)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 209dbf3f8294..107678676421 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,7 +1,9 @@
 DIST libusb-1.0.19.tar.bz2 521496 BLAKE2B 9f38dcb8f053019511dc2eed93772183c5487917794abd2839e981924bf05e39aba5cee4fb9a366b78e4d265fb16a921fb64c9a083323993ce21543d37073720 SHA512 f42f0187bfec16ebabad64efef7a7651ee85dcf2af1b7cbe543b7de615f9c6432f7eea5fcc6b23335591dcad287c905eb9bd56199cc5d3b47435027ad678f2c1
 DIST libusb-1.0.21.tar.bz2 607417 BLAKE2B c76352a19f416ad27b8940e99f38878e248cdbc04ef97752f8c8468ab0391869ab611197e3e143d69e0e23563da59f1691c14fce72958fdf28ebf10dd8c1521b SHA512 015ca07bdb559aa40af5db1302ab0b1c8a30d593699fe2f3c9f45162673dc7b608cecc58d60fde8f3bde2a68370794a045e8efa48fc55402eece11261e525762
 DIST libusb-1.0.22.tar.bz2 598833 BLAKE2B 38d01c1dd1837434c24008151a27cdfb2b2e9aab30fe95e4403bad613a0147a13b9b029814e15520bcfc2c181b00e3c5cc1ffdc3a586a604190bf441d3c89318 SHA512 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4
+DIST libusb-1.0.23.tar.bz2 602860 BLAKE2B 4eaf8cce0047b85c3057c67b53769739c50a39c4d34e94659b030fb11f02309f9217e93d35d78f699c55256346cf8b14827c8ddf495caeeacc522c51f473abc2 SHA512 73430ad31dd405e76a9c6c55086961003989c44964e2735b5076f9ca849e3f6fe71d10a66b74b111f0c34a0d2cb744b9ca105863c552123fce4ec0bbdd2ec15b
 EBUILD libusb-1.0.19-r1.ebuild 1562 BLAKE2B 9205b771773d512adf09d90e189d38cc6fd784402edf2f7f9129e2791b483a31eeacdb930682488cf95a35503b5e66e17e25cd11906b158f7b1f7c8fe9a7417f SHA512 f678d9238545b995e16d8ea726cdbb38b87c29cb6a4d549d740f1110e2fcf97438212e3c7557ee4c15853698024d51d62915ada0d2111f75e5a947aaf0377952
 EBUILD libusb-1.0.21.ebuild 1594 BLAKE2B a0834079b8a4461b65cbc338331e2f452c177497cd3019d2b79225fd62e96557e0d06e2b2b6475a1a65f349ad2a38fe1786178f4c6697126e4e602e19ee71bef SHA512 8bc2edb604068e4bf7ddfcbf65a8957f7c3f618becafdbaf5bd071f3004b8cef096cd8f7994bb9101d615692ad3052b06dc6232caaa2259c3d3668ed44629c66
 EBUILD libusb-1.0.22.ebuild 1588 BLAKE2B b0994b5c98dd8255851efe02104a0f925b9badcbd80b037d8b9f61799d0ff1f54e000411e495ba3622d6b3227371611ec9d40991ef98dd6bea0752b0661aec55 SHA512 957efadf3d5e785edf2b4dc8a423300bef1e377130383d87838402c6feb4c5dfae008877309103cfe801e0dd28c87f56db88109bcf2f4a8eef6932df22e800e6
+EBUILD libusb-1.0.23.ebuild 1642 BLAKE2B 3747bc274c6591ec30929c99acf2407507144ffbdec6466275aba9eb4ae702e82e8c056e55787fc27ef14881c65080b498338f22b4dbfe98ea0d12c36442a5bc SHA512 ddc09853ad24a29a489d68b65903889c35d637dee9c20d42ad4cfa910a1627ec630e2b53d349333f197038cae81e69bab798b7f07905204d3bde5c01b174993c
 MISC metadata.xml 437 BLAKE2B 19a1ea2b26db27c6441a15502f61ca4240b1180b9aaaaf3942ce5b8cce5ee45724385401ec067901e31a0da785a636ca2e2a9d27efe231094d3952288374d169 SHA512 a67b2294e73782a948e338bc8820bc023e39ad612319a38387b3ee15e63903687ce4d90d8246df93cf2ea498c5c8dab25cb760c3f333d6dffc5d4d7b8c77a0a0
diff --git a/dev-libs/libusb/libusb-1.0.23.ebuild b/dev-libs/libusb/libusb-1.0.23.ebuild
new file mode 100644
index 000000000000..542edcff8700
--- /dev/null
+++ b/dev-libs/libusb/libusb-1.0.23.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs multilib-minimal usr-ldscript
+
+DESCRIPTION="Userspace access to USB devices"
+HOMEPAGE="https://libusb.info/ https://github.com/libusb/libusb"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc examples static-libs test udev"
+
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	!udev? ( virtual/os-headers )"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable udev)
+		$(use_enable debug debug-log)
+		$(use_enable test tests-build)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi; then
+		use doc && emake -C doc docs
+	fi
+}
+
+multilib_src_test() {
+	emake check
+
+	# noinst_PROGRAMS from tests/Makefile.am
+	tests/stress || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi; then
+		gen_usr_ldscript -a usb-1.0
+
+		use doc && dodoc -r doc/html
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.{c,h}
+		insinto /usr/share/doc/${PF}/examples/getopt
+		doins examples/getopt/*.{c,h}
+	fi
+}
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 487659b5c2ca..8a3970fb90b2 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,5 +1,7 @@
 DIST libwacom-0.30.tar.gz 119261 BLAKE2B 4f76fcbed42c5453701e3b5dda880a26f9956a803827584aeaf080196b26bedb65f6bdccb7ffe18e7f93861dfee8a633894869b1ea4f6b95e72d64273087b60c SHA512 952ead4b39461d64d9592d0e05824669d0a8bc721aced46f5a99832da0fc63a4023f9803d416ceaf71dc7182660d05d45b799424bca7f54128fa7c44447b688b
 DIST libwacom-0.33.tar.bz2 503217 BLAKE2B 034b06495209cc88e9a3131a8a23b35fdadf8bc038ff9db62d4dc05b31657d1cfbe4856cf7b1a6112c97d47bb532b664e4e59c3b00a2aebf14dfacbcac141063 SHA512 de4d9cf3b5f4d87a159ba8ee617bafce9d13b67dc23d9dc67efd57317b0df2079dd0de328bc800de47f14ee49ea82bb842e34297cef23ba336c1ddca3afa826d
+DIST libwacom-1.0.tar.bz2 502457 BLAKE2B c7de15e8e403a4778662c711a4318ffd46c65fcb895e50181b14f6f9c4169493fcd14a78bae62cfad8af0e4d762b5babb06df21ff257994b1890d5ec9078e6ef SHA512 43a8098ed06c86edc647d6a6b0ee0b465bcb6089df77fd361909271aaf5f18ae2fecfa34062fd4a9fdee6983ff1303b99636485ebde6a75a669307bd19c2b313
 EBUILD libwacom-0.30.ebuild 1175 BLAKE2B e9793b8744475b467d267622056ef59b02fa4b147bd87ff2cad3a38c29f45a50fd113008c925414fb230b47db8c7ae3a2d6581d0040d1b04b093c0a259e25d4c SHA512 5cf6d46b944b4dcbbaa7ee691f908bed59d911c3bbcb0cd19cdec73a4a964c93ba79008e025f751837b64bc4afe6749b0e42480b5b486a59125e5b52bf4b4bdc
-EBUILD libwacom-0.33.ebuild 1182 BLAKE2B ffe3f1f6785716f0f491dddd7e81ea72728932a01295d9caa503cb40f473f8561c600353416b2de8921d36491bcf1eaa29e102cadc005a0689bb0dc8b22fefac SHA512 5b1703864a02619f78b0e7dcc7faa3ec8f3f29853d690f976e7364c267491ed6b52973f82128568147fb3322683d23d9614d3cfb3f6222702fed5ae195d2a553
+EBUILD libwacom-0.33.ebuild 1176 BLAKE2B fde097cb640b3c3eafbc14337c2804b4c88b502005f028428ea2a9ab4115999c64640d7c6619e68a0f2923a3fe0f97ae58f617469c1dd35f9c3469f1e4849b06 SHA512 9f021b5542193a5104b07b6c3facd41d4d88c45c7a5b33acd1b3226d1f62c9f5d49ff55ed8b2b8ef756cf3124fc23470eb8cb363c7cdc469dc58195aa9d7b250
+EBUILD libwacom-1.0.ebuild 975 BLAKE2B 36cc403d3c4b9c3cf7decf7b9dad5b2a94bcea11c93f600a95f93787a95011e2012d29c63c97222d55c407cfb7a9b92da4772777d7d20e2599a6b8e6ed4429d8 SHA512 9587335a62a2fd071d0b6349003536fc2208653a7c394bf44489954abf5c6d9106aff0d08b1ebaad9c5f78c8ad3af1341d7803708004f0fc87d77494d02e029c
 MISC metadata.xml 308 BLAKE2B dc6dc477d74ab5e2071a87814f3d21f5347891f8e36e36bbcf1590c253146f65210f28257cd5ec26fe0b69209d19d489ce3c52697423c087321191694561144d SHA512 fc208d84f859f167919179d96eeea91beba8825cc2b4e225bfd86db40ab7e1e9f7c1d5eb9023166bae7d4f784b0e08e04674ab72f75c49d638b6ca5ec52857a5
diff --git a/dev-libs/libwacom/libwacom-0.33.ebuild b/dev-libs/libwacom/libwacom-0.33.ebuild
index 0b1c33cddfbf..a9d2c8e9f493 100644
--- a/dev-libs/libwacom/libwacom-0.33.ebuild
+++ b/dev-libs/libwacom/libwacom-0.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 BDEPEND="
diff --git a/dev-libs/libwacom/libwacom-1.0.ebuild b/dev-libs/libwacom/libwacom-1.0.ebuild
new file mode 100644
index 000000000000..db48fc2994dc
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools udev
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="https://github.com/linuxwacom/libwacom"
+SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-libs/glib:2
+	virtual/libgudev:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	if ! use doc; then
+		sed -e 's:^\(SUBDIRS = .* \)doc:\1:' -i Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-udev-dir=$(get_udevdir)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index e5585ace2034..de2107829fd8 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -1,9 +1,3 @@
-AUX libyaml-0.1.7-mingw-no-undefined.patch 1363 BLAKE2B 0d64f4875afc98bf51f1aa76eb714b1635cc3f3cabfc5d2b6b2b497a34ace8ad9a5e19b1df932d95da95728830789cfc9947b53d500356860106e4fbb65e0950 SHA512 7c29e975deccf9789db70be45dade04b9ab62260aac5021b16173be79a32e864210b68fc78d659949487474fba841ac18cfcc7031b10f1160f97af47f3bea953
-DIST libyaml-0.2.1.tar.gz 601443 BLAKE2B 4940d1f0a698a985502d6e1c4d3d064061462642829aecc75a820bebcb7b7e4ae5d62777162063650d24962c93da6449bca791811d0438222d897388ec07c2ea SHA512 f91297c37dbbf03aaff718947474381a4a6a4ee1a39171d7fc32c3710ce55321028f3485ea1fcd52b962da36ed021c0b7ec05718296dca636329a19aecc809b8
 DIST libyaml-0.2.2.tar.gz 79465 BLAKE2B fd37cac256b40b0c5daa32584d271448e5e1c196a7fa7eeda753fb962c7d916b3c415425170d70db67c3f114b27d03fdd67fb4e380c04027198a601e1bd5a094 SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
-DIST yaml-0.1.7.tar.gz 527518 BLAKE2B 80bb082e22e7f8275924aaa4f8e95eefdc94e929690ddefdba61f50d57d01428990687d2c7bcc5b277888825b8bc0619c572594dae64ce00013adde685f9a8d9 SHA512 1ee5007dd10db137b5ee80f8117f07390ec04af98d087a5f5475dd2b38d87c699b79ab1676e6c7bfa263323fcdf8edd69fada2b0b7f9c57bef4e46cd65f1e975
-EBUILD libyaml-0.1.7-r1.ebuild 1102 BLAKE2B a3429606925e85426aaed0e2b4a82f39b1c1d0a3292f2e7823b205a5d9cf544406586dd88342b73fa141a48915b4bf97ed9b5cce3b044d9c1b392c4c3e921bc7 SHA512 275fe1435255cfb5a1752d3f96d77cc0f76909a553b2e220580472bca22924953203279c117fc379e38e5b5c055d1c056a55146a0c3dc8c170abd3f108136a6a
-EBUILD libyaml-0.1.7.ebuild 1066 BLAKE2B 6909e22b3ece9efd806dc6e09d5d444cc97199e24c91885dfd53d4c74ef300519f388b7043ea5f7c64df1ba1b46a0722a506d8c96316f42154bd546e69b551b9 SHA512 18f60b395a0f87cd31f01d8174d400a086d69b76df7332bb7672d217cfe4ef9e3ba0a81ce51ab0d7c49abc1b3290e5af00f6dcaffe1106d5a30187160c1bc4a8
-EBUILD libyaml-0.2.1.ebuild 1052 BLAKE2B 5a2c1d4c78738d437775a89779651bc7c2db7eed8b6be20dcaa83285d821c05ea7a669371e6e23a8788efafaf650196fd4b7d9619e9c90da5abca84315d83c39 SHA512 02b2aaabefde73b7b27ef2795b470edecbc5e67a56cead4e5d3febc8e95cf6e5e4cc4b114af66dc65bfc81e401c1bc3573f131f22ca550278ca1f0dc6443f321
-EBUILD libyaml-0.2.2.ebuild 1030 BLAKE2B 9de6feefb7f95eaa580f1a238cf628f634599f530b062348623ae4ab4e17373f34a6680b286ef8b8950a04c27a72e4fb54ccccd7dc42bea320bff99948d8fee9 SHA512 e74650e3226fe5181e74c184d323357f10f55633ae05a1c3eb84aafc08417eff133d9766ba6b3ae4646f42af4a8420aab500c69d484b3fe19ab731cb27f35b69
+EBUILD libyaml-0.2.2.ebuild 1024 BLAKE2B 1fc539a130c6f911bbd943f118b0f94c05e27406f8d45cbf13f8b92ee5747548fe9af3942782b3d66994faddb35ba8684bc8cc432ac90ee22ba6a3887a5d48d6 SHA512 906e0178eca1ec017de3f410039379fe90ab8e214fa9c3feca85b649730ea11c0d5eaf32aef2d138d80d459cbb7d56cfa2dbe47bfbfe74e9d03a09bae6598748
 MISC metadata.xml 393 BLAKE2B cce8a44acadbabe965899f786d3855d19b49549e42e39b2311a1d125a22789aa28924136767b42c074210fee6dd1b17f337968195aacf3190418979898bafe03 SHA512 ce775cab169e0601244583a8b771dc9f3fa58ccbe6e9bd315d5a778cc92e887b97ee63c7d5bcbc87d0b0483d89444855562aabf0d7f0067f660c173c4aeaad37
diff --git a/dev-libs/libyaml/files/libyaml-0.1.7-mingw-no-undefined.patch b/dev-libs/libyaml/files/libyaml-0.1.7-mingw-no-undefined.patch
deleted file mode 100644
index 5e0ef5249413..000000000000
--- a/dev-libs/libyaml/files/libyaml-0.1.7-mingw-no-undefined.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/include/yaml.h
-+++ b/include/yaml.h
-@@ -26,7 +26,9 @@ extern "C" {
- 
- /** The public API declaration. */
- 
--#ifdef _WIN32
-+#if defined(__MINGW32__)
-+#   define  YAML_DECLARE(type)  type
-+#elif defined(WIN32)
- #   if defined(YAML_DECLARE_STATIC)
- #       define  YAML_DECLARE(type)  type
- #   elif defined(YAML_DECLARE_EXPORT)
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,4 +1,4 @@
- AM_CPPFLAGS = -I$(top_srcdir)/include
- lib_LTLIBRARIES = libyaml.la
- libyaml_la_SOURCES = yaml_private.h api.c reader.c scanner.c parser.c loader.c writer.c emitter.c dumper.c
--libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE)
-+libyaml_la_LDFLAGS = -no-undefined -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE)
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -312,7 +312,7 @@ top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/include
- lib_LTLIBRARIES = libyaml.la
- libyaml_la_SOURCES = yaml_private.h api.c reader.c scanner.c parser.c loader.c writer.c emitter.c dumper.c
--libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE)
-+libyaml_la_LDFLAGS = -no-undefined -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE)
- all: all-am
- 
- .SUFFIXES:
diff --git a/dev-libs/libyaml/libyaml-0.1.7-r1.ebuild b/dev-libs/libyaml/libyaml-0.1.7-r1.ebuild
deleted file mode 100644
index 8e168bc585df..000000000000
--- a/dev-libs/libyaml/libyaml-0.1.7-r1.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 libtool
-
-MY_P="${P/lib}"
-
-DESCRIPTION="YAML 1.1 parser and emitter written in C"
-HOMEPAGE="http://pyyaml.org/wiki/LibYAML"
-SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
-	"${FILESDIR}/${PN}-0.1.7-mingw-no-undefined.patch"
-)
-
-src_prepare() {
-	default
-
-	# conditionally remove tests
-	if ! use test; then
-		sed -i -e 's: tests::g' Makefile* || die
-	fi
-
-	elibtoolize  # for FreeMiNT
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	docinto examples
-	dodoc tests/example-*.c
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/dev-libs/libyaml/libyaml-0.1.7.ebuild b/dev-libs/libyaml/libyaml-0.1.7.ebuild
deleted file mode 100644
index b41eaa33016c..000000000000
--- a/dev-libs/libyaml/libyaml-0.1.7.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 eutils libtool
-
-MY_P="${P/lib}"
-
-DESCRIPTION="YAML 1.1 parser and emitter written in C"
-HOMEPAGE="http://pyyaml.org/wiki/LibYAML"
-SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# conditionally remove tests
-	if ! use test; then
-		sed -i -e 's: tests::g' Makefile* || die
-	fi
-
-	elibtoolize  # for FreeMiNT
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-	use doc && dodoc -r doc/html
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-		doins tests/example-*.c
-	fi
-}
diff --git a/dev-libs/libyaml/libyaml-0.2.1.ebuild b/dev-libs/libyaml/libyaml-0.2.1.ebuild
deleted file mode 100644
index dc16d59c679c..000000000000
--- a/dev-libs/libyaml/libyaml-0.2.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool
-
-DESCRIPTION="YAML 1.1 parser and emitter written in C"
-HOMEPAGE="https://github.com/yaml/libyaml"
-SRC_URI="https://github.com/yaml/${PN}/archive/dist-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-S=${WORKDIR}/${PN}-dist-${PV}
-
-src_prepare() {
-	default
-
-	# conditionally remove tests
-	if ! use test; then
-		sed -i -e 's: tests::g' Makefile* || die
-	fi
-
-	elibtoolize  # for FreeMiNT
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	docinto examples
-	dodoc tests/example-*.c
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/dev-libs/libyaml/libyaml-0.2.2.ebuild b/dev-libs/libyaml/libyaml-0.2.2.ebuild
index f7f9e9d5a975..8f0ed3ed5081 100644
--- a/dev-libs/libyaml/libyaml-0.2.2.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index c7be9bc5aa80..4c9023987c77 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,8 +1,5 @@
-AUX libzia-4.14-ldadd.patch 548 BLAKE2B 655b2d21e8c5a90c7559381ed546df0b661b2cabe9880eb78bcfe7a0d35463f064d078c396c0bd261ad476a131a4f6e16a9eac73a8408faff73d85aec725edf7 SHA512 3b7820de0dbda89ad571b6a98b8fc601c289fcb9981586a63391c9de6ee9eb9b71cd4626434b2c4341fc9155e183c5da6a292cc61327600312e122f99a662dd0
-DIST libzia-4.14.tar.gz 597138 BLAKE2B 200e0682c6bc28248646775c5e5a71bad329edf031d0950ad8ab5244e5e925903147467d23eb3a04f9be05cca6b34947692df15620331ffc5357b73f20d363b0 SHA512 c382ef352e80df69daf3d3e4da0c0de5d8037b32182a760f88a1edf7d2b9cc7d5112de942a5a85973ccf82ca1e0771c2e92de7972ff9bec745fdb525419a2365
-DIST libzia-4.15.tar.gz 600728 BLAKE2B 7e359a09c9e440c65fe369a8ff9004883ecbc047cfa4995e671c74662f9658370e0e8f613e626f9480abb9fb6d94e777bde70b44d080d45f4e17b1f982c48237 SHA512 041e21e1506b4cc38a0b9a5fa07037de01d19a390b6ba46159688b2bd7c75c44faf6e84d1ec929a582a2c8038c60f986d6d172636b5e9cb1b2fc5a729ec2225f
 DIST libzia-4.16.tar.gz 623606 BLAKE2B 48c5eb65890c87ed48bfaee60a6683f5320c561c8f6bf55268690675e388aefeb52e229c16430b9ff04b8ae29749e52beb71ac7d7f0642f4fa255e1bef85b452 SHA512 cbf0e678abadd670acde1778dcb137a49ad11f8e8d8d8465ebac542deb964e1c138b65ebf61404ea0219e17cdb336585545eee3f63d4e0ac41bffe0010f2c2fb
-EBUILD libzia-4.14.ebuild 784 BLAKE2B 2073c5504b41ee7f4382dc902111d5058eb39cc58c8578b099e1db5d2be5613e331555e0fdc305344f4f1d2e20ef15721c7990264f48e3fbc39d8dadd42c9779 SHA512 9f73df3eee5f7caf277e4b9394ad1b179c11e00c9d7254c9707b85c74944cfd3f7037ccb5419a217df9fcfbe77957c4cee4c2421db4d84196dcae5427b65ee7c
-EBUILD libzia-4.15.ebuild 719 BLAKE2B e89d28fdf28d1405fc39d7eabf559a3dd3493cc1436752fecfb4e73386ba4c73b88907736ea9b1f107325c2bce071b696f84e2f880ea2c4df4535ca57b6a9ca1 SHA512 0c6653c16bbb1136bccc3e6d672de98c64a7695dcb8a38ddb7acf93c0d1b61449519cc0386ffc270f99155ea451c95ad6befde6f3772e639c1b8f0a2dd2deaf8
-EBUILD libzia-4.16.ebuild 721 BLAKE2B 9bcf0c0be20ca59b6b89f08dcdf8bc6a890bb96dfeb5aa191e0fea07fd09f58383d23027888c5523b30e1305f299c9c1266ab9d120413861abdd4b59f84eb8ba SHA512 1cf2d7599df0022e2165282e140ecbb298701441a9e8d34ff4b6a8684e6b8bad079a738c48411b14aadccf093708c8df68dcd0d43ac324cd54b7502e3a8b5762
+DIST libzia-4.17.tar.gz 626840 BLAKE2B f63ba0712dedd53736ae297f253fa6fcb3ed5afe8f374c33a45cfcfb36e942192ae5a1f520deaca8745ea2a9d990307e984ce2b62894514332dbcd1ee78af977 SHA512 8375cfca8b61c78a8d355ac2d0e329ac0ed3f61ed3c902dd6c3ad202fcc9a1960ef55c4389f46a0d2e1423d060750639eda3d196dec94c9a53b7feba902d5378
+EBUILD libzia-4.16.ebuild 719 BLAKE2B e89d28fdf28d1405fc39d7eabf559a3dd3493cc1436752fecfb4e73386ba4c73b88907736ea9b1f107325c2bce071b696f84e2f880ea2c4df4535ca57b6a9ca1 SHA512 0c6653c16bbb1136bccc3e6d672de98c64a7695dcb8a38ddb7acf93c0d1b61449519cc0386ffc270f99155ea451c95ad6befde6f3772e639c1b8f0a2dd2deaf8
+EBUILD libzia-4.17.ebuild 721 BLAKE2B 9bcf0c0be20ca59b6b89f08dcdf8bc6a890bb96dfeb5aa191e0fea07fd09f58383d23027888c5523b30e1305f299c9c1266ab9d120413861abdd4b59f84eb8ba SHA512 1cf2d7599df0022e2165282e140ecbb298701441a9e8d34ff4b6a8684e6b8bad079a738c48411b14aadccf093708c8df68dcd0d43ac324cd54b7502e3a8b5762
 MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
diff --git a/dev-libs/libzia/files/libzia-4.14-ldadd.patch b/dev-libs/libzia/files/libzia-4.14-ldadd.patch
deleted file mode 100644
index 4d0becc5306c..000000000000
--- a/dev-libs/libzia/files/libzia-4.14-ldadd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# add local .libs directory to library search path during build of zsdltest
---- src/Makefile.am.orig	2018-10-27 19:44:55.332591275 +0200
-+++ src/Makefile.am	2018-10-27 19:45:54.268730862 +0200
-@@ -70,10 +70,11 @@
- library_includedir = $(includedir)/libzia
- 
- zsdltest_SOURCES = zsdltest.c
--zsdltest_LDFLAGS = -lzia 
-+zsdltest_LDFLAGS = -lzia -lm
-+zsdltest_LDADD = -L.libs
- 
--gpiotest_SOURCES = gpiotest.c
--gpiotest_LDFLAGS = -lzia 
-+#gpiotest_SOURCES = gpiotest.c
-+#gpiotest_LDFLAGS = -lzia 
- 
- EXTRA_DIST = regcomp.c regex_internal.c regexec.c 
- 
diff --git a/dev-libs/libzia/libzia-4.14.ebuild b/dev-libs/libzia/libzia-4.14.ebuild
deleted file mode 100644
index 5a63aa43ba6f..000000000000
--- a/dev-libs/libzia/libzia-4.14.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 autotools
-
-DESCRIPTION="platform abstraction code for tucnak package"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ftdi"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	media-libs/libsdl
-	media-libs/libpng:0
-	ftdi? ( dev-embedded/libftdi:0 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/$P-ldadd.patch )
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	eapply_user
-	eapply -p0 ${PATCHES}
-	sed -i -e "s/docsdir/#docsdir/g" \
-		-e "s/docs_/#docs_/g" Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ftdi) --with-sdl \
-		--with-png --without-bfd
-}
diff --git a/dev-libs/libzia/libzia-4.15.ebuild b/dev-libs/libzia/libzia-4.15.ebuild
deleted file mode 100644
index 88159bfcae8d..000000000000
--- a/dev-libs/libzia/libzia-4.15.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="platform abstraction code for tucnak package"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ftdi"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	media-libs/libsdl
-	media-libs/libpng:0
-	ftdi? ( dev-embedded/libftdi:0 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	eapply_user
-	sed -i -e "s/docsdir/#docsdir/g" \
-		-e "s/docs_/#docs_/g" Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ftdi) --with-sdl \
-		--with-png --without-bfd
-}
diff --git a/dev-libs/libzia/libzia-4.16.ebuild b/dev-libs/libzia/libzia-4.16.ebuild
index 89fcf6a119f7..88159bfcae8d 100644
--- a/dev-libs/libzia/libzia-4.16.ebuild
+++ b/dev-libs/libzia/libzia-4.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ftdi"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libzia/libzia-4.17.ebuild b/dev-libs/libzia/libzia-4.17.ebuild
new file mode 100644
index 000000000000..89fcf6a119f7
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.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 autotools
+
+DESCRIPTION="platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:0 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd
+}
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 7b64705c103e..be8b329d27be 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1,4 +1,4 @@
 AUX marisa-0.2.4-python.patch 683 BLAKE2B 5d26607877b3f4614a558d085de11360783d2a448749e7a7fed2ac805e4b6dc5d4b89c29c37fe70a34cc4745789b9ff93b4f398860d8014303a4290bbd1196c5 SHA512 fa718a385cfef196833f5a9aa23c31839505a0101df3d25a73616942845668891f818213b89a36689ec93e678289128add1f6450e15fb995233621faaa76d700
 DIST marisa-0.2.4.tar.gz 502552 BLAKE2B aa8e6ce11c35db41f386d1c5d3ffdf56a940f298e10a7f6b1fa14cb80c27c9c4af1d4d61c58786f96e9598effe26379127c69b8fe72b1ca561a44ee2b9cddc61 SHA512 71aee3ae034d1ce725d986bef43472d61bd64f0af3ccda01bb019cce03f0872629b6a1b305e717056bef06e036372323b2a67e5dc69705d6a74e028b5e2553e4
-EBUILD marisa-0.2.4.ebuild 2301 BLAKE2B 36503a5be3237cbad96a89c94add4914f267abe056f1d589ca2698b2b0acb83c5aabc09eaad94823b29ba6aa155d664e27ee69d5f599068c7785d4559c65d7ee SHA512 3ec8cc3b668c1d50de74d73d1807c4acde5685c5a53d8a3d2c3580631d0ae548fd5a923f8757179e988b7eb473e0be5121e4344bdfcc439efaab6644b1d5c660
+EBUILD marisa-0.2.4.ebuild 2308 BLAKE2B 2ccaed107affdf89a08c081c28d2b8a97c5cedf77662a6149b68cabc0446fe9540d0552cc4e2acc54a9b10ae1e22d3cf3863c6350a0b13645b4155cfcb8a4ad6 SHA512 9040d446400807133f61b1884a52d203c64c7fb81e6533cacd1a096ebbf7b2c50f371abebb62cb239eabac6bcc476944f2f8e56907a66f5b96995ae9dfccfe9d
 MISC metadata.xml 317 BLAKE2B 16fd28ba01ffdf67af29ea7f6b41be190ecff6ab88706b0cb04b6e9dee5a623087652e666af02cff1c3ed3bd4b42f252adf5fce1b08c2eb9a998e8c112dba922 SHA512 0e782fba322f87cfc0f180f812d0e33630c4295df1f434d497aba1a7f9d922e9674a3c23a821211cbe11d419eee70c25dbabb7508abc7bd56267e9648a1e721c
diff --git a/dev-libs/marisa/marisa-0.2.4.ebuild b/dev-libs/marisa/marisa-0.2.4.ebuild
index 365ab5407b2a..e9dfa471d310 100644
--- a/dev-libs/marisa/marisa-0.2.4.ebuild
+++ b/dev-libs/marisa/marisa-0.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://marisa-trie.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~sparc x86"
 IUSE="python doc static-libs cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_sse4a cpu_flags_x86_popcnt"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 46e55fa4e17a..b0441f4752d8 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -7,6 +7,8 @@ AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
 DIST nspr-4.20.tar.gz 1140892 BLAKE2B 2cb96b7a40c307f904dac038f016b5c0e527aaf673463cbcb59d8bb6c9d0239219402587d624f48804e33f43abd4427c87f267bf1a88a0dacffcc408ac15dc49 SHA512 22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949
 DIST nspr-4.21.tar.gz 1140741 BLAKE2B 9d6d079ac50c97ed7fff957e23506a24ab0d723cadc2ddb0c4283a2abdf387f0d55116ff82bf748500026b5d493909aa5495bd220f3b6e83ad4990f29eb446a0 SHA512 4f152c6ca32d9dd4cf3d92b4b54f249ac1fa39047811f7c0c7a67bdc73173cf7de0dce36dc278ad781189ea2fdc71fa70e044597676a8b1f5e6d664907e5ab7c
+DIST nspr-4.22.tar.gz 1078701 BLAKE2B 8b37031ffebf79320c91ce674d7c3a0cfbef25bfb006cb9aaff44f090110b35ea2768f83dae4a793723f8e2f3aecabc1a4b8042cd1b0ab0aade30781e43f9d62 SHA512 d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b
 EBUILD nspr-4.20.ebuild 3792 BLAKE2B 2f6c9e7d9cbe04da44e9e34e45c416d77d610d045fe3cce5e2c60c7655be78853bba9428a91a0dad388f6fc1e26876b26e0bab2d6495616c4941b8585aacba38 SHA512 5f2f0b397fb9dfd274b73e9026c4e5d6ccdae99f32c98a9fbb4497f87609d7e9afaaaf08cd0dd9dc8b21f8b63f91043988f7e2171cf26703447467314b4d6c4f
 EBUILD nspr-4.21.ebuild 3897 BLAKE2B dbc3e8d02f14a0c22e2969ce9cd0cf644c2ec290f247b9581dfcfff954e1d544c05e84968a6b8ee1690c778b975ad57395cbd1cdc2313ddc048ae100c00e715a SHA512 04c3a557fe7be670d98790c499f2a7e20606a1cfa8be64247669b40057244135e32e8da5a8bf6243b9fe7164b706cadd442d3d61b7e06676bc0b820d90b9f3a1
+EBUILD nspr-4.22.ebuild 3892 BLAKE2B 5633707738207a3a7b2dfcbb8798f2ad134f95f8a39e6f8619685e33b1acd5bcc3fa4784cceaf8225f7d5973caab467d79a4378c7399c8ec64bb08e6932d729c SHA512 0021005fde55f4c02782ad4f0ee5528e7df231e84e040503a1055fa42d4c09fb1db396108ae283a0096f4ddd34b24c16b4419c44fd9ed19d7a4878425a2337f4
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/dev-libs/nspr/nspr-4.22.ebuild b/dev-libs/nspr/nspr-4.22.ebuild
new file mode 100644
index 000000000000..bc218969f496
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.22.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs multilib-minimal
+
+MIN_PV="$(ver_cut 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug elibc_musl"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nspr-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.0-prtime.patch
+	"${FILESDIR}"/${PN}-4.7.1-solaris.patch
+	"${FILESDIR}"/${PN}-4.10.6-solaris.patch
+	"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+	"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+	# We do not need to pass -L$libdir via nspr-config --libs
+	"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+)
+
+src_prepare() {
+	cd "${S}"/nspr || die
+
+	default
+
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
+
+	# rename configure.in to configure.ac for new autotools compatibility
+	if [[ -e "${S}"/nspr/configure.in ]] ; then
+		einfo "Renaming configure.in to configure.ac"
+		mv "${S}"/nspr/configure.{in,ac} || die
+	fi
+
+	# We must run eautoconf to regenerate configure
+	eautoconf
+
+	# make sure it won't find Perl out of Prefix
+	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		"${S}"/nspr/config/rules.mk || die
+}
+
+multilib_src_configure() {
+	# We use the standard BUILD_xxx but nspr uses HOST_xxx
+	tc-export_build_env BUILD_CC
+	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
+	tc-export AR CC CXX RANLIB
+	[[ ${CBUILD} != ${CHOST} ]] \
+		&& export CROSS_COMPILE=1 \
+		|| unset CROSS_COMPILE
+
+	local myconf=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_enable debug)
+		$(use_enable !debug optimize)
+	)
+
+	# The configure has some fancy --enable-{{n,x}32,64bit} switches
+	# that trigger some code conditional to platform & arch. This really
+	# matters for the few common arches (x86, ppc) but we pass a little
+	# more of them to be future-proof.
+
+	# use ABI first, this will work for most cases
+	case "${ABI}" in
+		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
+		n32) myconf+=( --enable-n32 );;
+		x32) myconf+=( --enable-x32 );;
+		s390x|*64) myconf+=( --enable-64bit );;
+		default) # no abi actually set, fall back to old check
+			einfo "Running a short build test to determine 64bit'ness"
+			echo > "${T}"/test.c || die
+			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+			case $(file "${T}"/test.o) in
+				*32-bit*x86-64*) myconf+=( --enable-x32 );;
+				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
+				*32-bit*|*ppc*|*i386*) ;;
+				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+			esac ;;
+		*) ;;
+	esac
+
+	# Ancient autoconf needs help finding the right tools.
+	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
+	ac_cv_path_AR="${AR}" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	# Their build system is royally confusing, as usual
+	MINOR_VERSION=${MIN_PV} # Used for .so version
+	emake DESTDIR="${D}" install
+
+	einfo "removing static libraries as upstream has requested!"
+	rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
+
+	# install nspr-config
+	dobin config/nspr-config
+
+	# Remove stupid files in /usr/bin
+	rm "${ED}"/usr/bin/prerr.properties || die
+
+	# This is used only to generate prerr.c and prerr.h at build time.
+	# No other projects use it, and we don't want to depend on perl.
+	# Talked to upstream and they agreed w/punting.
+	rm "${ED}"/usr/bin/compile-et.pl || die
+}
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 36f432a0ffe3..094bc78d59a7 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -5,10 +5,10 @@ AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622
 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.44.1.tar.gz 75986343 BLAKE2B b0a91ffdf879c8fd684abcb92480dd465466e83d3bad346d937bae285543705d10817527ed4f5ddbb618ad52103d4aedfc25e03053225010abc80267d2f94034 SHA512 eb8777701a25b54377026633b6bf284e4c62308012058355f348a7c57525afe96db74a07de41ba01754e316a7dff06689de527359a5474ed7ab606779c4cf169
-DIST nss-3.45.tar.gz 76017462 BLAKE2B 33b310a2cfe86bbbcbb34aa0ea8f11ef8bc9ba45301bf338a1271e88f606b89cb98ad12fad9ae248fa1205218bcf10a106437972fbf56c6563255f3ba0cbf466 SHA512 33360a1bb4e0a0a974070c354ee82c515d5cfa2a12c9c96817a9fdb3e4ca1ad62eb95886b9b0d60e2f69efda964376d0671c1e3c920b2ea614aeecb719c6ff29
+DIST nss-3.46.tar.gz 76417155 BLAKE2B 18e22a60df185764f434779211289a78d05270d8493766100e378e2ecfdb3013feb73359088d53667fb3c57a5b29633c9f800d29739cff5aab2af81e7ddbe2d7 SHA512 de309ec8d6aa2c3cf4d5ebfe9fa1f8bf5def717d22018d5c88c1de963b4ae7b0d69ad64e68d830574fc85613483fd538cb2f319ffb3fa2e1b97ec02f85d37c48
 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 9501 BLAKE2B f743d2d9ec752b5c7bba215bef12c744ae91a92b547745c7d146f457e8ae3d805231643cd1579f7b0000e853305c94a2f26930f6b7009e0f79813cfb1962682a SHA512 b67cb7e84ac85aa5c74be19aca7186b1e082a3c0f736bf93ece7f8cbb310a40993bdc6d2d5aef64311de6e42ab6029c36acc4d8377500732b3a8358314f9a75c
 EBUILD nss-3.44.1.ebuild 9488 BLAKE2B 1e9068af29f3d798a4b7a47931e77ffa04e1e3b37c7cdac7c9a4d11a91ae2eeeee2c8f5d688952204c7a2235a020e05e97e5b2c266f85d09ee97a8c0998e911d SHA512 7df96c4826322101639975574cbc2c621cecd97e7b40641fff918c8283efd85b670c84feb02e3ccc7e47af6131f9841b19668afefb9219f975fd54acbda88088
-EBUILD nss-3.45.ebuild 9488 BLAKE2B 1e9068af29f3d798a4b7a47931e77ffa04e1e3b37c7cdac7c9a4d11a91ae2eeeee2c8f5d688952204c7a2235a020e05e97e5b2c266f85d09ee97a8c0998e911d SHA512 7df96c4826322101639975574cbc2c621cecd97e7b40641fff918c8283efd85b670c84feb02e3ccc7e47af6131f9841b19668afefb9219f975fd54acbda88088
+EBUILD nss-3.46.ebuild 9483 BLAKE2B 8a78fa10ea19489b4406e35ae63e8c66cae9c911b2275186c11b203cdefc36113b8fef9dbf4644e2600caf52309e7da6dfd9d8b65f9d5c101cfcde58408ffc20 SHA512 9c557ab24761ba2482ca3857989df10bd1a97d9c7181b79f1efb0279a037d221d129e4bef956abc57973928d81abb22c8c83473faa7606a7e95f7b5261793acc
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.45.ebuild b/dev-libs/nss/nss-3.45.ebuild
deleted file mode 100644
index bd22251e6050..000000000000
--- a/dev-libs/nss/nss-3.45.ebuild
+++ /dev/null
@@ -1,373 +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 FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=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.46.ebuild b/dev-libs/nss/nss-3.46.ebuild
new file mode 100644
index 000000000000..d9753ccde6c0
--- /dev/null
+++ b/dev-libs/nss/nss-3.46.ebuild
@@ -0,0 +1,373 @@
+# 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.22"
+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 FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=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/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 17a9915dc3d7..3da123099be1 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -3,5 +3,5 @@ DIST onig-6.9.2.tar.gz 901931 BLAKE2B 93326408c7c9cd9c5053f14edd0e5fbf348a4da135
 DIST onig-6.9.3.tar.gz 902349 BLAKE2B 4b20290a2d72b638b13a2e2edc89e072a8d17f89f6a273b58d0e408d01726ace948dd390bb2f4c478b87d01bed9fa344a4933060736a40981219301529957aaa SHA512 6b038879cb9cbe8cc756159eb53125e1d4dc7365ca434d07b99a59f3602987e573da120506bbd88d0f51dcdde5866bfa48d45803f8869503726c4d9a47d62861
 EBUILD oniguruma-6.9.1.ebuild 967 BLAKE2B d33b2347afacdf230928fb427f582970b105eb5cbd893079172f9e9f9fa17f6e4ae31c03df4e967626ee573413f2668e3429b522285e00dcd1f72c3151664be0 SHA512 b0b2ca4be822fa8cd223291371e019ab023538c0dabf1300eb662e4d252a6ff05648200c1621e748965a80df80db46ec0e93d94e9d6925385c33c550ca9fa657
 EBUILD oniguruma-6.9.2.ebuild 987 BLAKE2B e328f16352bdbe51260a4b1aef78c0631f0f71aef036677ea73153f9e49709bc965a6943d04ca4702bc72b04dc819834f7a0381a37778d299acb17b667bab0d7 SHA512 11dbf5f9f1fc2cecf1d0c2500dbac1f3632330c6b8350b44dd33196aad6453e064718e6673e03c2bb011d18953bf24813cd32c1c54b88554269b37b4c4c16bef
-EBUILD oniguruma-6.9.3.ebuild 988 BLAKE2B 22e1129f20b9dd06a570543c88780d0fca2e85ae0f8d9737a1b0c0a931cdc0644891b3c989a95df120277b1079252a224dc87723f6ed383e8c62779456272c40 SHA512 000936ac268ce4abde9cc6416dcb60776998a35cba426da92172e362b9d38ad63f00de61fc10f7c075a08334b3a019379232e701f60d00e01a143097ba403e5d
+EBUILD oniguruma-6.9.3.ebuild 987 BLAKE2B e328f16352bdbe51260a4b1aef78c0631f0f71aef036677ea73153f9e49709bc965a6943d04ca4702bc72b04dc819834f7a0381a37778d299acb17b667bab0d7 SHA512 11dbf5f9f1fc2cecf1d0c2500dbac1f3632330c6b8350b44dd33196aad6453e064718e6673e03c2bb011d18953bf24813cd32c1c54b88554269b37b4c4c16bef
 MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.3.ebuild b/dev-libs/oniguruma/oniguruma-6.9.3.ebuild
index ffce8089134b..a8f178b9c387 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.3.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 440a659983f0..6a7d4232ccc1 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -11,6 +11,11 @@ DIST openssl-1.0.2r.tar.gz 5348369 BLAKE2B 9f9c2d2fe6eaf9acacab29b394a318f30c38e
 DIST openssl-1.0.2r_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
 DIST openssl-1.0.2r_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
 DIST openssl-1.0.2r_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
+DIST openssl-1.0.2s.tar.gz 5349149 BLAKE2B 46c72dcceb5b473b129be0a895f3d6c25a24ee852a31dc369ccf0e44319259d8694d3571b8cb698efb8bce89dbe31f4fc9f82753cacb24cbd3d50fa2ab9b6e83 SHA512 9f745452c4f777df694158e95003cde78a2cf8199bc481a563ec36644664c3c1415a774779b9791dd18f2aeb57fa1721cb52b3db12d025955e970071d5b66d2a
+DIST openssl-1.0.2s_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
+DIST openssl-1.0.2s_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
+DIST openssl-1.0.2s_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
 EBUILD openssl-compat-0.9.8z_p8-r1.ebuild 4969 BLAKE2B 8258165c7a8deecf2cf15da2be35d3bea56c7d6df869d9188fb0ec73e684257704d0aee189d520d54f5396c5e34498476db0966178cd43ad5b6cb76c19a6384f SHA512 463d439e67494224e40638fbbd4b44760371e10d0fcaddf6b6419f0baac04046f3bf4ce0013616c8b42a8896f5395488e6faa008acdbe1669f8308b24c20fdcb
 EBUILD openssl-compat-1.0.2r.ebuild 8037 BLAKE2B 1f652836c93e4cd7a8b0211a26a1e0b22c73a30a64a5248cc9a251afd83af8cf6e54b7f0a6a53a9beb184c7638fd834eaa565361ee710461321fc733359e630f SHA512 263f9a96aff760c96061702478651cca50b91f331d29cec718aa0bcea9f993b6fb60e01efa521a3513da5157e2364022fea747e451166ada000b1fc43e06c1d8
+EBUILD openssl-compat-1.0.2s.ebuild 8342 BLAKE2B 601201d0b2d0f2091032235e8ee6a82495b21ad1b53cb8e4e89c7919d5402c780ebaa3d48a9e3f3aa69dc283abbdad2440a3278a06ddc1e2bfde0f0c7119e117 SHA512 c9b722ce8c1c4eaa4a1299e91608b4e984a811389b7c1c2fe1883fda8b9817bcf96cfcbd83e0df7f4da45850959d26aec7c6a380db17dd3db28aa2fb283b1f13
 MISC metadata.xml 967 BLAKE2B ed2fb20c832fbd18b7834f35e21072d419e8da5d88c165b7113a3835af1408f10e8c649dd2ccdffac35b6ed297320c18c0ae76b7a124fd3db6ab1a316f11c31c SHA512 12392dd6d10877fd78b8f54d6c51a5b5d50db3690fff0084112389a1ff3d28a0a37ec09262e4e817337eb04133877de8aa06f341bf9c96e73cb36c31e77f9e0f
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2s.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2s.ebuild
new file mode 100644
index 000000000000..7449ff20b7e6
--- /dev/null
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2s.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+# openssl-1.0.2-patches-1.6 contain additional CVE patches
+# which got fixed with this release.
+# Please use 1.7 version number when rolling a new tarball!
+PATCH_SET="openssl-1.0.2-patches-1.5"
+MY_P=openssl-${PV/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	!vanilla? (
+		mirror://gentoo/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~chutzpah/dist/openssl/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/openssl/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
+	)"
+
+LICENSE="openssl"
+SLOT="1.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	!=dev-libs/openssl-1.0.2*:0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+
+RESTRICT="test"
+
+# Do not install any docs
+DOCS=()
+
+# This does not copy the entire Fedora patchset, but JUST the parts that
+# are needed to make it safe to use EC with RESTRICT=bindist.
+# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
+SOURCE1=hobble-openssl
+SOURCE12=ec_curve.c
+SOURCE13=ectest.c
+# These are ported instead
+#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
+#PATCH37=openssl-1.1.0-ec-curves.patch
+FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
+FEDORA_GIT_BRANCH='f25'
+FEDORA_SRC_URI=()
+FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
+FEDORA_PATCH=( $PATCH1 $PATCH37 )
+for i in "${FEDORA_SOURCE[@]}" ; do
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> openssl-${PV}_${i}" )
+done
+for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
+done
+SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		# This just removes the prefix, and puts it into WORKDIR like the RPM.
+		for i in "${FEDORA_SOURCE[@]}" ; do
+			cp -f "${DISTDIR}"/"openssl-${PV}_${i}" "${WORKDIR}"/"${i}" || die
+		done
+		# .spec %prep
+		bash "${WORKDIR}"/"${SOURCE1}" || die
+		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
+		for i in "${FEDORA_PATCH[@]}" ; do
+			eapply "${DISTDIR}"/"${i}"
+		done
+		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 V=1 depend
+	emake build_libs
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	dolib.so lib{crypto,ssl}.so.${SLOT}
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index a0fe883ad4a6..e813bc72a4c0 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -2,8 +2,7 @@ AUX gentoo.config-1.0.2 5158 BLAKE2B bc8b8c0558f84bcbd7c55e4b974458041aa5f31f82c
 AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c
 AUX openssl-1.0.2p-hobble-ecc.patch 10875 BLAKE2B fc8240a074f8cc354c5ae584b76b3fc895170e026767d2d99d8bd5e5028614c861dd2b3c7b955c223883062f9a057ee302ae0deecfbbed00ddc53ae8a4d50919 SHA512 29f64bacac4f61071db6caf9d92131633d2dff56d899171888cc4c8432790930ff0912cea90ad03ca59b13ca0357f812d2f0a3f42567e2bd72c260f49b2b59aa
 AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
-AUX openssl-1.1.1b-CVE-2019-1543.patch 2826 BLAKE2B 7e1d67a5f87e70f32d2b9032ec2c4422a172420d88a8c9337fd8d883876729efce4630d2ed342ac54bfd49b0ace685eb730940e9534801e3643742571da76dd4 SHA512 f11c7b8e938dca3528eee36ddb64421072e1fdd6d5dfc40452f36e2db954b3e9ae888416bb26dc73068a14c94404eb66352e37a988f04ecc08600554eab16c99
-AUX openssl-1.1.1b-ec-curves-patch.patch 6841 BLAKE2B f62865ec0cdf246b2b145466b775dbba086ddc4e7066358956e8a5de8a3070634ef2186ff84df2a277d92eea2c3e78ba34a96119db21617e559f3ce77c131727 SHA512 1eb6419b7db282d37b2c84f4425952db833677c67728ac6070b64c08cb5fcac4b32a1fa880d8a6bb2151fbe5afc7920d6ccbb9b8bd43a610e907c5cfafb74f94
+AUX openssl-1.1.0k-fix-test_fuzz.patch 485 BLAKE2B 4dc2ef2b2c1935c8143c939ed6b7168fb070edced8ae47732f1ae9fdabe19887f846d75c15cea33680a54058c9a99f981a3c6a35fc84c3a6c360b4d2b920bc04 SHA512 68590479f096f3da920a5d293f27babd541ce1946944d5540f78d8341b59eeda92fe24743f7351b565e06421d7a2da77e331ebe1e5168023f6602aaa7376a038
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2r.tar.gz 5348369 BLAKE2B 9f9c2d2fe6eaf9acacab29b394a318f30c38e831a5f9c193b2da660f9d04acbf407d8b752274783765416c0f5ba557c24ee293ad7fb7d727771db289e6acc901 SHA512 6eb2211f3ad56d7573ac26f388338592c37e5faaf5e2d44c0fa9062c12186e56a324f135d1c956a89b55fcce047e6428bec2756658d103e7275e08b46f741235
 DIST openssl-1.0.2r_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
@@ -13,30 +12,12 @@ DIST openssl-1.0.2s.tar.gz 5349149 BLAKE2B 46c72dcceb5b473b129be0a895f3d6c25a24e
 DIST openssl-1.0.2s_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
 DIST openssl-1.0.2s_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
 DIST openssl-1.0.2s_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
-DIST openssl-1.1.0-build_d2ede125556ac99aa0faa7744c703af3f559094e.patch 3001 BLAKE2B 8f0ac4be6409b4ec50bec171697da2aebe2688e8ae06bd0dfac8b0c74661d38ebeb0a12bde0ef941b213eee9b85965262213b140636060285dcfb02a3bd14961 SHA512 ec6710e9669ac19e4c6f1286c89a383e7d276a773a2740037f98a8f2dbf18305614e7d30d9ed530923a0e7d10a3776fea2ca77229adc25df13ecad55589a3673
-DIST openssl-1.1.0-ec-curves_d2ede125556ac99aa0faa7744c703af3f559094e.patch 5311 BLAKE2B e9ec985adf6f13eb04412158a05da7cbe10be7d64bce73b899152ea379336ece7b7069089ef46993ac301ef850fd46fd0352898e249b2ea9fff5baf20896e5b5 SHA512 c38c4b05195f2b323a07efd8d17335ba2a168a16a59d7941da36568081f1c043da8d2216b7084b0617963635ded9bafeee736ecddbfa251cf0a02e4cba64cdc8
-DIST openssl-1.1.0j.tar.gz 5411919 BLAKE2B 0fbd936f38d30b64bea717a67cd59704c5ce44ee19f377a820f89ba66b9e0a7509cf39e0fb00c104ae6440a6bd811e388239b458ffe685d8601235bab2afb2f1 SHA512 e7d30951ebb3cbcb6d59e3eb40f64f5a84634b7f5c380a588d378973f1c415395e3ab71a9aaff6478a89ec6efcc88f17f1882c99c25dcd18165f1435a51e5768
-DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_ec_curve.c 18401 BLAKE2B f969071ac1b5d0e43b50d54e50b5c4d9201fc8b94458902e9849f14841b5505a2e43ed57a8c13255f042a211af9ee904776c155c36da838a8ad22e1052b02bc1 SHA512 a1c2bb3c3e3d342bddc8c952985e87fc4bad2e8142d5d760b18f346c44c20f00db61c4856f3dcf879b2098e0c036330762915f65d80a1a2cba717d2caeb95457
-DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_ectest.c 30688 BLAKE2B 6673ef0fd139af82d830794179b19b9e06be25fac4a13b8bdfa5fd5dad25f594ce8eab118aab9ec2aab25001e1de127c03f8e1a04f4f3ef4c464b7fb1811ed4a SHA512 240fc72916caf4a8b0af774ce307abfe9a93a762eba6fae760cec79d619fe3db0d6919fc92a8951cb031f73958237700b45f590aa7f9f2890762cccda1f1e74b
-DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
+DIST openssl-1.1.0k-bindist-1.0.tar.xz 11716 BLAKE2B c491ba0899c44dbcc63f85b255548c439c965a20a04ac2a6324a4122c4691b7c95ec18e62be6d708a7ea62ea197d32e5091987cb5043969878f89e5bc26243d4 SHA512 1d5bc9d7b24cf55d32d996e2421d43a1218b605720293f00d07814afb481387856f0dc000ad3c3e4cba2361055668cfe79a945be44ab85a249555f37e683a909
 DIST openssl-1.1.0k.tar.gz 5287321 BLAKE2B fce40a399f5a08d5fe183dfcaab11b211d982885fb9888b25fa41bdd9919ecd203fca6f573363cfb42c9a0776ae69ea50b0f144227a3f28ca0dbadf878d396bc SHA512 65f41a240a97d79504c0e1391fde8ac8692f0993437cdc35e4bc964ecc36e5ef75a62499c4c6cb4ce63f892135e06dba2d3594c8869d935554296fa3c6ccd822
-DIST openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_ec_curve.c 18401 BLAKE2B f969071ac1b5d0e43b50d54e50b5c4d9201fc8b94458902e9849f14841b5505a2e43ed57a8c13255f042a211af9ee904776c155c36da838a8ad22e1052b02bc1 SHA512 a1c2bb3c3e3d342bddc8c952985e87fc4bad2e8142d5d760b18f346c44c20f00db61c4856f3dcf879b2098e0c036330762915f65d80a1a2cba717d2caeb95457
-DIST openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_ectest.c 30688 BLAKE2B 6673ef0fd139af82d830794179b19b9e06be25fac4a13b8bdfa5fd5dad25f594ce8eab118aab9ec2aab25001e1de127c03f8e1a04f4f3ef4c464b7fb1811ed4a SHA512 240fc72916caf4a8b0af774ce307abfe9a93a762eba6fae760cec79d619fe3db0d6919fc92a8951cb031f73958237700b45f590aa7f9f2890762cccda1f1e74b
-DIST openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
-DIST openssl-1.1.1-ec-curves.patch 7265 BLAKE2B 04725d226c430132cf54afbfaa30a82f8f8bbfd3608823d1d0cd42c3c13f417e90762759da3134d7b0c4373e531925db337b681340f2f284cb2f16a4caef22e3 SHA512 de4d0f1635740c57217836a476c420141c0d34a5f90cbf7957aed7a80e7ac9ca036de2d8448e6bf4c122999e308730575899f61cea6e51ab6825dd04890d75a1
-DIST openssl-1.1.1b.tar.gz 8213737 BLAKE2B 7ad9da9548052e2a033a684038f97c420cfffd57994604bcb3fa12640796c8c0aea3d24fb05648ee4940fbec40b81462e81c353da5a41a2575c0585d9718eae8 SHA512 b54025fbb4fe264466f3b0d762aad4be45bd23cd48bdb26d901d4c41a40bfd776177e02230995ab181a695435039dbad313f4b9a563239a70807a2e19ecf045d
-DIST openssl-1.1.1b_ec_curve.c 17938 BLAKE2B d5cbde40dcd8608087aed6ffa9feb040ffadecf0c46b7f3978cc468a9503f0a5ad0a426ea6f8db56f49a64474a508bebdf946e01ebf09adc727675f3b180bcdc SHA512 ec470f6514cb9a4f680b8cbbe02e2bbe71639b288f3429d976726047901d9c50377dfb2737f32429da2fb0e52fd67878a86debb54520e307ee196d97b5c66415
-DIST openssl-1.1.1b_ectest.c 35091 BLAKE2B a9602255ab529751c2af2419206ce113f03f93b7b776691ea2ec550f26ddbecd241844bb81dc86988fdbb1c0a587318f82ce4faecba1a6142a19cf08d40fb2c5 SHA512 7813d9b6b7ab62119a7f2dd5431c17c5839f4c320ac7071b0714c9b8528bda5fda779dbb263328dca6ee8446e9fa09c663da659c9a82832a65cf53d1cd8a4cef
-DIST openssl-1.1.1b_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
+DIST openssl-1.1.1c-bindist-1.0.tar.xz 11964 BLAKE2B 8c5190846d13984589a150089d329bb3ecc613788b9462c6f6a1833a040e21cb9bf940140449f09fd797c0e396b0aea073237be374bd16097795b8974c3e7ce5 SHA512 249c6d8c455130b98e3be635f12f323e0cc349f1770648bad591e5de15483917185a473c162ed871a2fa05b47056931e6f12e5fdd9cecee7e6d1c246b862923b
 DIST openssl-1.1.1c.tar.gz 8864262 BLAKE2B bd157b244bedcefb8e646a743732945119b267236789ac69c38856570318aca09299bdaaea3f20294863b633e6fd4dfe124820597185b3b7461cfdf094daadb0 SHA512 8e2c5cc11c120efbb7d7850980cb6eaa782d29b4996b3f3378d37613c1679f852d7cc08a90d62e78fcec3439f06bdbee70064579a8c2adaffd91532a97f646ff
-DIST openssl-1.1.1c_ec_curve.c 17938 BLAKE2B d5cbde40dcd8608087aed6ffa9feb040ffadecf0c46b7f3978cc468a9503f0a5ad0a426ea6f8db56f49a64474a508bebdf946e01ebf09adc727675f3b180bcdc SHA512 ec470f6514cb9a4f680b8cbbe02e2bbe71639b288f3429d976726047901d9c50377dfb2737f32429da2fb0e52fd67878a86debb54520e307ee196d97b5c66415
-DIST openssl-1.1.1c_ectest.c 35091 BLAKE2B a9602255ab529751c2af2419206ce113f03f93b7b776691ea2ec550f26ddbecd241844bb81dc86988fdbb1c0a587318f82ce4faecba1a6142a19cf08d40fb2c5 SHA512 7813d9b6b7ab62119a7f2dd5431c17c5839f4c320ac7071b0714c9b8528bda5fda779dbb263328dca6ee8446e9fa09c663da659c9a82832a65cf53d1cd8a4cef
-DIST openssl-1.1.1c_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
 EBUILD openssl-1.0.2r.ebuild 10261 BLAKE2B d69c02146d892718a81ea97c6d946cdbef7fbefdfdbccc1590b961d1514d0c21e5b3f9d52a07465d0848cba20b9d5773092680e95dafb2233232b607582f9834 SHA512 8e5c8ecf64b9684047106fc07d9529f64f34782129975e1dff7777104dd18de66800a75f2cc30dea3d2079e2387843fa742fc470319f53c1bf6574798ddd8630
-EBUILD openssl-1.0.2s-r200.ebuild 7981 BLAKE2B b8b41046e8754f64427bd1da2557d654939e8b16f5be96be731e56c26c23a338807641858712ddc589001e5f7cd20c167dfb6e459b1c1086c7cdfb9d3bc253b1 SHA512 530f96ce8e8543cad92138abc6695b0546819d9eaff26d08ebcbf9fd6b1075e777f395af174087016530bd4ed29f067fbb1c6bbd7647354cb87f6ec600811728
-EBUILD openssl-1.0.2s.ebuild 10274 BLAKE2B 449fe8da38c842deb7d1bd36cadb4f5090b7b969c33ed65279d3aaf6ce8f9082457ead493d203e0497d589834fddd80b20474d1b70af633596bdca334d58099c SHA512 cd1afc4d90d76aea584040334fe354bbe830090259343c82639ca5cd767b450e4f92745b4e7e18e85035f5af14bc9ee29c9f92dbb6a7281f40c42772aed10c8d
-EBUILD openssl-1.1.0j-r1.ebuild 10046 BLAKE2B 13160922f67effce50f1d73e7233c9d2b2373c1dcc2a63a33f92614395620c2dae18c9694c6398cb4cd247ed044c310f6472bd5bf9becef2ae54a81b7529d634 SHA512 6bfc16c20ca75c4c150c5e2899c15ff67e0e11b1f9450b55344f69d56474d7e8f50220f8e808d4160331aa3ae1ca0b0548e4e230ce93454f7e82032b289b3b81
-EBUILD openssl-1.1.0k.ebuild 9998 BLAKE2B 6a7f3c750f34cf1e7d202d739cca5bef55cbb1851ac3ef2ae333c0cbdd82b49e00a8d2f79fc4ae52c1b2f3321a38fa735cf54847174735d574e7b4adb055c84d SHA512 ddceb95296e5906cb999c5652cf1f64edb5de7f3093c1eb36d16385882ec759fafeb768937d9c3449c1483f9f61b21c9633feb3aa78ae5181dcf793d846b103d
-EBUILD openssl-1.1.1b-r2.ebuild 9593 BLAKE2B 9fc53267f4c5059ea12338a666d8bed60462a23461b79ba3e7e4fbc65d50e2cf9fa4923af8827d67b8fd37ecf8ae7b3f0a332aa12db3b4d9bc9a5acf2beb309c SHA512 fe9b503331830c33fae862fa19e384aa5db198525bbc96ffaa46d4bd807e198d2ae8209345707392a4e5e0e209506b87257e1fafd4e694c6bfc385f2d7675a9a
-EBUILD openssl-1.1.1c.ebuild 9525 BLAKE2B ffe3df0bc527dbaedf30e2026f8c976ab2f2d5012e9b5897276288f05165a70c4ff91b5bf5e17762d9dfbfc2bf6d1d6a94268c75790da0f6c6feeb39ea652e9f SHA512 b5539566f093d5c21a3607ef8722c554936a17f65d1035c72530d0d0b2a9d10776b4c7ecd4666f3acc6b700dfdde19551c1e052c694b1ccd7c571bacd943f27a
+EBUILD openssl-1.0.2s-r1.ebuild 10613 BLAKE2B f31ebad1aaef7aa81317c681315456874501e00f6f39f6c20e319a4365f4ec34d1c183a70d904dbe106aeb5f4503444cd63ead7cb73974c8fc5571ddba4fe0a3 SHA512 b53254e4b78fbcd48ab4d7cf3b43c5997e31a7487078e8534a18fc03af168f958793e5abd55db3b6a2ffc7baa397b461b588d2299f2a1192deaa5c0aafdeb6ac
+EBUILD openssl-1.1.0k-r1.ebuild 9463 BLAKE2B d04ca8cad9e3a763c606b88b66309a11c3f3d1b27af1870dadb258521f110e5d7e6b5482554ee3a00c5a92343542b411ebb084de338d751bd04ccd3afc69a9b4 SHA512 4be3b7b467ca52a35de64d7ec53bb414f67fa30953001a66503336ca32635e8d9d7682a1f15d60e627903bad8d5603c29398b418e263b638c58ff1ec0da42bfd
+EBUILD openssl-1.1.1c-r1.ebuild 9297 BLAKE2B 114347e74c4224d73956c4d9e333776da681690779a9e542422a9c15ac8bf624469ad337b3cbbde159b35474631de95a423f2ccdf20d3a2370d086b89fa24b10 SHA512 eb7bfe2b301769fc1e3118bf449c85f8af455c1e0252c3b574b426b4986ee1631581bbbd915c13f75ce9f1e1704f6ced048a0485dae69ba1aafb31f3aa455b65
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch b/dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch
new file mode 100644
index 000000000000..2c4cc31257ca
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.0k-fix-test_fuzz.patch
@@ -0,0 +1,19 @@
+Test fuzz was forgotten when
+
+   Perl: Use our own globbing wrapper rather than File::Glob::glob
+
+was backported to openssl-1.1.0 branch.
+
+Link: https://github.com/openssl/openssl/commit/b81cfa07ada850fd287d0a0c82ba280907f18ce7
+
+--- a/test/recipes/90-test_fuzz.t
++++ b/test/recipes/90-test_fuzz.t
+@@ -9,7 +9,7 @@
+ use strict;
+ use warnings;
+ 
+-use if $^O ne "VMS", 'File::Glob' => qw/glob/;
++use OpenSSL::Glob;
+ use OpenSSL::Test qw/:DEFAULT srctop_file/;
+ use OpenSSL::Test::Utils;
+ 
diff --git a/dev-libs/openssl/files/openssl-1.1.1b-CVE-2019-1543.patch b/dev-libs/openssl/files/openssl-1.1.1b-CVE-2019-1543.patch
deleted file mode 100644
index 4d478c484c90..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.1b-CVE-2019-1543.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From f426625b6ae9a7831010750490a5f0ad689c5ba3 Mon Sep 17 00:00:00 2001
-From: Matt Caswell <matt@openssl.org>
-Date: Tue, 5 Mar 2019 14:39:15 +0000
-Subject: [PATCH] Prevent over long nonces in ChaCha20-Poly1305
-
-ChaCha20-Poly1305 is an AEAD cipher, and requires a unique nonce input for
-every encryption operation. RFC 7539 specifies that the nonce value (IV)
-should be 96 bits (12 bytes). OpenSSL allows a variable nonce length and
-front pads the nonce with 0 bytes if it is less than 12 bytes. However it
-also incorrectly allows a nonce to be set of up to 16 bytes. In this case
-only the last 12 bytes are significant and any additional leading bytes are
-ignored.
-
-It is a requirement of using this cipher that nonce values are unique.
-Messages encrypted using a reused nonce value are susceptible to serious
-confidentiality and integrity attacks. If an application changes the
-default nonce length to be longer than 12 bytes and then makes a change to
-the leading bytes of the nonce expecting the new value to be a new unique
-nonce then such an application could inadvertently encrypt messages with a
-reused nonce.
-
-Additionally the ignored bytes in a long nonce are not covered by the
-integrity guarantee of this cipher. Any application that relies on the
-integrity of these ignored leading bytes of a long nonce may be further
-affected.
-
-Any OpenSSL internal use of this cipher, including in SSL/TLS, is safe
-because no such use sets such a long nonce value. However user
-applications that use this cipher directly and set a non-default nonce
-length to be longer than 12 bytes may be vulnerable.
-
-CVE-2019-1543
-
-Fixes #8345
-
-Reviewed-by: Paul Dale <paul.dale@oracle.com>
-Reviewed-by: Richard Levitte <levitte@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/8406)
-
-(cherry picked from commit 2a3d0ee9d59156c48973592331404471aca886d6)
----
- crypto/evp/e_chacha20_poly1305.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c
-index c1917bb86a6..d3e2c622a1b 100644
---- a/crypto/evp/e_chacha20_poly1305.c
-+++ b/crypto/evp/e_chacha20_poly1305.c
-@@ -30,6 +30,8 @@ typedef struct {
- 
- #define data(ctx)   ((EVP_CHACHA_KEY *)(ctx)->cipher_data)
- 
-+#define CHACHA20_POLY1305_MAX_IVLEN     12
-+
- static int chacha_init_key(EVP_CIPHER_CTX *ctx,
-                            const unsigned char user_key[CHACHA_KEY_SIZE],
-                            const unsigned char iv[CHACHA_CTR_SIZE], int enc)
-@@ -533,7 +535,7 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
-         return 1;
- 
-     case EVP_CTRL_AEAD_SET_IVLEN:
--        if (arg <= 0 || arg > CHACHA_CTR_SIZE)
-+        if (arg <= 0 || arg > CHACHA20_POLY1305_MAX_IVLEN)
-             return 0;
-         actx->nonce_len = arg;
-         return 1;
diff --git a/dev-libs/openssl/files/openssl-1.1.1b-ec-curves-patch.patch b/dev-libs/openssl/files/openssl-1.1.1b-ec-curves-patch.patch
deleted file mode 100644
index c1f53c838230..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.1b-ec-curves-patch.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-Based on openssl-1.1.1-ec-curves.patch.
-
-Updated for OpenSSL change b6d41ff73392df5af9c931c902ae4cd75c5b61ea.
-
---- a/apps/speed.c
-+++ b/apps/speed.c
-@@ -489,82 +489,28 @@ static const OPT_PAIR rsa_choices[] = {
- static double rsa_results[RSA_NUM][2];  /* 2 ops: sign then verify */
- #endif /* OPENSSL_NO_RSA */
- 
--#define R_EC_P160    0
--#define R_EC_P192    1
--#define R_EC_P224    2
--#define R_EC_P256    3
--#define R_EC_P384    4
--#define R_EC_P521    5
--#define R_EC_K163    6
--#define R_EC_K233    7
--#define R_EC_K283    8
--#define R_EC_K409    9
--#define R_EC_K571    10
--#define R_EC_B163    11
--#define R_EC_B233    12
--#define R_EC_B283    13
--#define R_EC_B409    14
--#define R_EC_B571    15
--#define R_EC_BRP256R1  16
--#define R_EC_BRP256T1  17
--#define R_EC_BRP384R1  18
--#define R_EC_BRP384T1  19
--#define R_EC_BRP512R1  20
--#define R_EC_BRP512T1  21
--#define R_EC_X25519  22
--#define R_EC_X448    23
-+#define R_EC_P224    0
-+#define R_EC_P256    1
-+#define R_EC_P384    2
-+#define R_EC_P521    3
-+#define R_EC_X25519  4
-+#define R_EC_X448    5
- #ifndef OPENSSL_NO_EC
- static OPT_PAIR ecdsa_choices[] = {
--    {"ecdsap160", R_EC_P160},
--    {"ecdsap192", R_EC_P192},
-     {"ecdsap224", R_EC_P224},
-     {"ecdsap256", R_EC_P256},
-     {"ecdsap384", R_EC_P384},
-     {"ecdsap521", R_EC_P521},
--    {"ecdsak163", R_EC_K163},
--    {"ecdsak233", R_EC_K233},
--    {"ecdsak283", R_EC_K283},
--    {"ecdsak409", R_EC_K409},
--    {"ecdsak571", R_EC_K571},
--    {"ecdsab163", R_EC_B163},
--    {"ecdsab233", R_EC_B233},
--    {"ecdsab283", R_EC_B283},
--    {"ecdsab409", R_EC_B409},
--    {"ecdsab571", R_EC_B571},
--    {"ecdsabrp256r1", R_EC_BRP256R1},
--    {"ecdsabrp256t1", R_EC_BRP256T1},
--    {"ecdsabrp384r1", R_EC_BRP384R1},
--    {"ecdsabrp384t1", R_EC_BRP384T1},
--    {"ecdsabrp512r1", R_EC_BRP512R1},
--    {"ecdsabrp512t1", R_EC_BRP512T1}
- };
- # define ECDSA_NUM       OSSL_NELEM(ecdsa_choices)
- 
- static double ecdsa_results[ECDSA_NUM][2];    /* 2 ops: sign then verify */
- 
- static const OPT_PAIR ecdh_choices[] = {
--    {"ecdhp160", R_EC_P160},
--    {"ecdhp192", R_EC_P192},
-     {"ecdhp224", R_EC_P224},
-     {"ecdhp256", R_EC_P256},
-     {"ecdhp384", R_EC_P384},
-     {"ecdhp521", R_EC_P521},
--    {"ecdhk163", R_EC_K163},
--    {"ecdhk233", R_EC_K233},
--    {"ecdhk283", R_EC_K283},
--    {"ecdhk409", R_EC_K409},
--    {"ecdhk571", R_EC_K571},
--    {"ecdhb163", R_EC_B163},
--    {"ecdhb233", R_EC_B233},
--    {"ecdhb283", R_EC_B283},
--    {"ecdhb409", R_EC_B409},
--    {"ecdhb571", R_EC_B571},
--    {"ecdhbrp256r1", R_EC_BRP256R1},
--    {"ecdhbrp256t1", R_EC_BRP256T1},
--    {"ecdhbrp384r1", R_EC_BRP384R1},
--    {"ecdhbrp384t1", R_EC_BRP384T1},
--    {"ecdhbrp512r1", R_EC_BRP512R1},
--    {"ecdhbrp512t1", R_EC_BRP512T1},
-     {"ecdhx25519", R_EC_X25519},
-     {"ecdhx448", R_EC_X448}
- };
-@@ -1495,29 +1441,10 @@ int speed_main(int argc, char **argv)
-         unsigned int bits;
-     } test_curves[] = {
-         /* Prime Curves */
--        {"secp160r1", NID_secp160r1, 160},
--        {"nistp192", NID_X9_62_prime192v1, 192},
-         {"nistp224", NID_secp224r1, 224},
-         {"nistp256", NID_X9_62_prime256v1, 256},
-         {"nistp384", NID_secp384r1, 384},
-         {"nistp521", NID_secp521r1, 521},
--        /* Binary Curves */
--        {"nistk163", NID_sect163k1, 163},
--        {"nistk233", NID_sect233k1, 233},
--        {"nistk283", NID_sect283k1, 283},
--        {"nistk409", NID_sect409k1, 409},
--        {"nistk571", NID_sect571k1, 571},
--        {"nistb163", NID_sect163r2, 163},
--        {"nistb233", NID_sect233r1, 233},
--        {"nistb283", NID_sect283r1, 283},
--        {"nistb409", NID_sect409r1, 409},
--        {"nistb571", NID_sect571r1, 571},
--        {"brainpoolP256r1", NID_brainpoolP256r1, 256},
--        {"brainpoolP256t1", NID_brainpoolP256t1, 256},
--        {"brainpoolP384r1", NID_brainpoolP384r1, 384},
--        {"brainpoolP384t1", NID_brainpoolP384t1, 384},
--        {"brainpoolP512r1", NID_brainpoolP512r1, 512},
--        {"brainpoolP512t1", NID_brainpoolP512t1, 512},
-         /* Other and ECDH only ones */
-         {"X25519", NID_X25519, 253},
-         {"X448", NID_X448, 448}
-@@ -2017,9 +1944,9 @@ int speed_main(int argc, char **argv)
- #  endif
- 
- #  ifndef OPENSSL_NO_EC
--    ecdsa_c[R_EC_P160][0] = count / 1000;
--    ecdsa_c[R_EC_P160][1] = count / 1000 / 2;
--    for (i = R_EC_P192; i <= R_EC_P521; i++) {
-+    ecdsa_c[R_EC_P224][0] = count / 1000;
-+    ecdsa_c[R_EC_P224][1] = count / 1000 / 2;
-+    for (i = R_EC_P256; i <= R_EC_P521; i++) {
-         ecdsa_c[i][0] = ecdsa_c[i - 1][0] / 2;
-         ecdsa_c[i][1] = ecdsa_c[i - 1][1] / 2;
-         if (ecdsa_doit[i] <= 1 && ecdsa_c[i][0] == 0)
-@@ -2031,6 +1958,7 @@ int speed_main(int argc, char **argv)
-             }
-         }
-     }
-+#if 0
-     ecdsa_c[R_EC_K163][0] = count / 1000;
-     ecdsa_c[R_EC_K163][1] = count / 1000 / 2;
-     for (i = R_EC_K233; i <= R_EC_K571; i++) {
-@@ -2059,9 +1987,9 @@ int speed_main(int argc, char **argv)
-             }
-         }
-     }
--
--    ecdh_c[R_EC_P160][0] = count / 1000;
--    for (i = R_EC_P192; i <= R_EC_P521; i++) {
-+#endif
-+    ecdh_c[R_EC_P224][0] = count / 1000;
-+    for (i = R_EC_P256; i <= R_EC_P521; i++) {
-         ecdh_c[i][0] = ecdh_c[i - 1][0] / 2;
-         if (ecdh_doit[i] <= 1 && ecdh_c[i][0] == 0)
-             ecdh_doit[i] = 0;
-@@ -2071,6 +1999,7 @@ int speed_main(int argc, char **argv)
-             }
-         }
-     }
-+#if 0
-     ecdh_c[R_EC_K163][0] = count / 1000;
-     for (i = R_EC_K233; i <= R_EC_K571; i++) {
-         ecdh_c[i][0] = ecdh_c[i - 1][0] / 2;
-@@ -2116,6 +2045,7 @@ int speed_main(int argc, char **argv)
-             }
-         }
-     }
-+#endif
-     /* default iteration count for the last two EC Curves */
-     ecdh_c[R_EC_X25519][0] = count / 1800;
-     ecdh_c[R_EC_X448][0] = count / 7200;
---- a/crypto/ec/ecp_smpl.c
-+++ b/crypto/ec/ecp_smpl.c
-@@ -145,6 +145,11 @@ int ec_GFp_simple_group_set_curve(EC_GROUP *group,
-         return 0;
-     }
- 
-+    if (BN_num_bits(p) < 224) {
-+        ECerr(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE, EC_R_UNSUPPORTED_FIELD);
-+        return 0;
-+    }
-+
-     if (ctx == NULL) {
-         ctx = new_ctx = BN_CTX_new();
-         if (ctx == NULL)
---- a/test/ecdsatest.c
-+++ b/test/ecdsatest.c
-@@ -176,6 +176,7 @@ static int x9_62_tests(void)
-     if (!change_rand())
-         goto x962_err;
- 
-+#if 0
-     if (!TEST_true(x9_62_test_internal(NID_X9_62_prime192v1,
-                  "3342403536405981729393488334694600415596881826869351677613",
-                  "5735822328888155254683894997897571951568553642892029982342")))
-@@ -186,6 +187,7 @@ static int x9_62_tests(void)
-                  "3238135532097973577080787768312505059318910517550078427819"
-                              "78505179448783")))
-         goto x962_err;
-+#endif
- 
- # ifndef OPENSSL_NO_EC2M
-     if (!TEST_true(x9_62_test_internal(NID_X9_62_c2tnb191v1,
diff --git a/dev-libs/openssl/openssl-1.0.2s-r1.ebuild b/dev-libs/openssl/openssl-1.0.2s-r1.ebuild
new file mode 100644
index 000000000000..b4902db7e537
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2s-r1.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+# openssl-1.0.2-patches-1.6 contain additional CVE patches
+# which got fixed with this release.
+# Please use 1.7 version number when rolling a new tarball!
+PATCH_SET="openssl-1.0.2-patches-1.5"
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	!vanilla? (
+		mirror://gentoo/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
+	)"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+# This does not copy the entire Fedora patchset, but JUST the parts that
+# are needed to make it safe to use EC with RESTRICT=bindist.
+# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
+SOURCE1=hobble-openssl
+SOURCE12=ec_curve.c
+SOURCE13=ectest.c
+# These are ported instead
+#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
+#PATCH37=openssl-1.1.0-ec-curves.patch
+FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
+FEDORA_GIT_BRANCH='f25'
+FEDORA_SRC_URI=()
+FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
+FEDORA_PATCH=( $PATCH1 $PATCH37 )
+for i in "${FEDORA_SOURCE[@]}" ; do
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
+done
+for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
+done
+SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		# This just removes the prefix, and puts it into WORKDIR like the RPM.
+		for i in "${FEDORA_SOURCE[@]}" ; do
+			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
+		done
+		# .spec %prep
+		bash "${WORKDIR}"/"${SOURCE1}" || die
+		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
+		for i in "${FEDORA_PATCH[@]}" ; do
+			eapply "${DISTDIR}"/"${i}"
+		done
+		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 V=1 depend
+	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake INSTALL_PREFIX="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
+	einstalldocs
+
+	use rfc3779 && dodoc engines/ccgost/README.gost
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	dodir ${SSL_CNF_DIR}/certs
+	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.0.2s-r200.ebuild b/dev-libs/openssl/openssl-1.0.2s-r200.ebuild
deleted file mode 100644
index 44b9547d141e..000000000000
--- a/dev-libs/openssl/openssl-1.0.2s-r200.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-# openssl-1.0.2-patches-1.6 contain additional CVE patches
-# which got fixed with this release.
-# Please use 1.7 version number when rolling a new tarball!
-PATCH_SET="openssl-1.0.2-patches-1.5"
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	!vanilla? (
-		mirror://gentoo/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
-	)"
-
-LICENSE="openssl"
-SLOT="1.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	!=dev-libs/openssl-1.0.2*:0"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-
-RESTRICT="test"
-
-# Do not install any docs
-DOCS=()
-
-# This does not copy the entire Fedora patchset, but JUST the parts that
-# are needed to make it safe to use EC with RESTRICT=bindist.
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
-SOURCE1=hobble-openssl
-SOURCE12=ec_curve.c
-SOURCE13=ectest.c
-# These are ported instead
-#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
-#PATCH37=openssl-1.1.0-ec-curves.patch
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f25'
-FEDORA_SRC_URI=()
-FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
-FEDORA_PATCH=( $PATCH1 $PATCH37 )
-for i in "${FEDORA_SOURCE[@]}" ; do
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
-done
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
-done
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		# This just removes the prefix, and puts it into WORKDIR like the RPM.
-		for i in "${FEDORA_SOURCE[@]}" ; do
-			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
-		done
-		# .spec %prep
-		bash "${WORKDIR}"/"${SOURCE1}" || die
-		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
-		for i in "${FEDORA_PATCH[@]}" ; do
-			eapply "${DISTDIR}"/"${i}"
-		done
-		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-		# $(use_ssl !bindist srp) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	# this breaks build with 1.0.2p, not sure if it is needed anymore
-	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist srp) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX%/}"/usr \
-		--openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 V=1 depend
-	emake build_libs
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	dolib.so lib{crypto,ssl}.so.${SLOT}
-}
diff --git a/dev-libs/openssl/openssl-1.0.2s.ebuild b/dev-libs/openssl/openssl-1.0.2s.ebuild
deleted file mode 100644
index 57280189ad1b..000000000000
--- a/dev-libs/openssl/openssl-1.0.2s.ebuild
+++ /dev/null
@@ -1,309 +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 toolchain-funcs multilib multilib-minimal
-
-# openssl-1.0.2-patches-1.6 contain additional CVE patches
-# which got fixed with this release.
-# Please use 1.7 version number when rolling a new tarball!
-PATCH_SET="openssl-1.0.2-patches-1.5"
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	!vanilla? (
-		mirror://gentoo/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
-	)"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-# This does not copy the entire Fedora patchset, but JUST the parts that
-# are needed to make it safe to use EC with RESTRICT=bindist.
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
-SOURCE1=hobble-openssl
-SOURCE12=ec_curve.c
-SOURCE13=ectest.c
-# These are ported instead
-#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
-#PATCH37=openssl-1.1.0-ec-curves.patch
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f25'
-FEDORA_SRC_URI=()
-FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
-FEDORA_PATCH=( $PATCH1 $PATCH37 )
-for i in "${FEDORA_SOURCE[@]}" ; do
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
-done
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
-done
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		# This just removes the prefix, and puts it into WORKDIR like the RPM.
-		for i in "${FEDORA_SOURCE[@]}" ; do
-			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
-		done
-		# .spec %prep
-		bash "${WORKDIR}"/"${SOURCE1}" || die
-		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
-		for i in "${FEDORA_PATCH[@]}" ; do
-			eapply "${DISTDIR}"/"${i}"
-		done
-		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-		# $(use_ssl !bindist srp) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	# this breaks build with 1.0.2p, not sure if it is needed anymore
-	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist srp) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX%/}"/usr \
-		--openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 V=1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED%/}/usr" ]]; then
-		# We can only create this directory once
-		mkdir "${ED%/}"/usr || die
-	fi
-
-	emake INSTALL_PREFIX="${D%/}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED%/}"/usr/bin/c_rehash || die
-
-	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
-	einstalldocs
-
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.0j-r1.ebuild b/dev-libs/openssl/openssl-1.1.0j-r1.ebuild
deleted file mode 100644
index 165f6d9a0500..000000000000
--- a/dev-libs/openssl/openssl-1.1.0j-r1.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-# This does not copy the entire Fedora patchset, but JUST the parts that
-# are needed to make it safe to use EC with RESTRICT=bindist.
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
-SOURCE1=hobble-openssl
-SOURCE12=ec_curve.c
-SOURCE13=ectest.c
-PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
-PATCH37=openssl-1.1.0-ec-curves.patch
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f28'
-FEDORA_GIT_COMMIT="d2ede125556ac99aa0faa7744c703af3f559094e"
-FEDORA_SRC_URI=()
-FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
-FEDORA_PATCH=( $PATCH1 $PATCH37 )
-for i in "${FEDORA_SOURCE[@]}" ; do
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH}&id=${FEDORA_GIT_COMMIT} -> ${P}_${FEDORA_GIT_COMMIT}_${i}" )
-done
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH}&id=${FEDORA_GIT_COMMIT} -> ${i%.patch}_${FEDORA_GIT_COMMIT}.patch" )
-done
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
-	"${FILESDIR}"/${PN}-1.1.1b-CVE-2019-1543.patch
-)
-
-src_prepare() {
-	if use bindist; then
-		# we need to patch the patch but we cannot patch in DISTDIR...
-		mkdir "${WORKDIR}"/fedora_patches || die
-		for i in "${FEDORA_PATCH[@]}" ; do
-			cp "${DISTDIR}"/"${i%.patch}_${FEDORA_GIT_COMMIT}.patch" "${WORKDIR}"/fedora_patches || die
-		done
-
-		# now patch the path, due to OpenSSL change cb193560e0da17a41b40ce574a2349f1d4d59ed1
-		sed -i -e 's#test/evptests.txt#test/recipes/30-test_evp_data/evppkey.txt#g' \
-			"${WORKDIR}"/fedora_patches/openssl-1.1.0-build_d2ede125556ac99aa0faa7744c703af3f559094e.patch || \
-			die
-
-		# This just removes the prefix, and puts it into WORKDIR like the RPM.
-		for i in "${FEDORA_SOURCE[@]}" ; do
-			cp -f "${DISTDIR}"/"${P}_${FEDORA_GIT_COMMIT}_${i}" "${WORKDIR}"/"${i}" || die
-		done
-		# .spec %prep
-		bash "${WORKDIR}"/"${SOURCE1}" || die
-		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die
-		for i in "${FEDORA_PATCH[@]}" ; do
-			#eapply "${DISTDIR}"/"${i%.patch}_${FEDORA_GIT_COMMIT}.patch"
-			eapply "${WORKDIR}/fedora_patches/${i%.patch}_${FEDORA_GIT_COMMIT}.patch"
-		done
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-
-	fi
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${PATCHES[@]}"
-	fi
-
-	eapply_user #332661
-
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# show the actual commands in the log
-	sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m'
-	# 'srp' was restricted until early 2017 as well.
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		enable-srp \
-		$(use elibc_musl && echo "no-async") \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		$(use_ssl asm) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	# Fix quoting for sed
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-		-e 's:\\:\\\\:g' \
-	)
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED%/}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED%/}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED%/}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED%/}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.0k-r1.ebuild b/dev-libs/openssl/openssl-1.1.0k-r1.ebuild
new file mode 100644
index 000000000000..7bcd5d03e7e3
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.0k-r1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 31,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f28/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12)
+# - ectest.c (SOURCE13)
+# - openssl-1.1.0-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.1.0k-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? ( https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET} )"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+	"${FILESDIR}"/${PN}-1.1.0k-fix-test_fuzz.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# show the actual commands in the log
+	sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.1.0k.ebuild b/dev-libs/openssl/openssl-1.1.0k.ebuild
deleted file mode 100644
index f5af55a9879c..000000000000
--- a/dev-libs/openssl/openssl-1.1.0k.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-# This does not copy the entire Fedora patchset, but JUST the parts that
-# are needed to make it safe to use EC with RESTRICT=bindist.
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
-SOURCE1=hobble-openssl
-SOURCE12=ec_curve.c
-SOURCE13=ectest.c
-PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
-PATCH37=openssl-1.1.0-ec-curves.patch
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f28'
-FEDORA_GIT_COMMIT="d2ede125556ac99aa0faa7744c703af3f559094e"
-FEDORA_SRC_URI=()
-FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
-FEDORA_PATCH=( $PATCH1 $PATCH37 )
-for i in "${FEDORA_SOURCE[@]}" ; do
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH}&id=${FEDORA_GIT_COMMIT} -> ${P}_${FEDORA_GIT_COMMIT}_${i}" )
-done
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH}&id=${FEDORA_GIT_COMMIT} -> ${i%.patch}_${FEDORA_GIT_COMMIT}.patch" )
-done
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
-)
-
-src_prepare() {
-	if use bindist; then
-		# we need to patch the patch but we cannot patch in DISTDIR...
-		mkdir "${WORKDIR}"/fedora_patches || die
-		for i in "${FEDORA_PATCH[@]}" ; do
-			cp "${DISTDIR}"/"${i%.patch}_${FEDORA_GIT_COMMIT}.patch" "${WORKDIR}"/fedora_patches || die
-		done
-
-		# now patch the path, due to OpenSSL change cb193560e0da17a41b40ce574a2349f1d4d59ed1
-		sed -i -e 's#test/evptests.txt#test/recipes/30-test_evp_data/evppkey.txt#g' \
-			"${WORKDIR}"/fedora_patches/openssl-1.1.0-build_d2ede125556ac99aa0faa7744c703af3f559094e.patch || \
-			die
-
-		# This just removes the prefix, and puts it into WORKDIR like the RPM.
-		for i in "${FEDORA_SOURCE[@]}" ; do
-			cp -f "${DISTDIR}"/"${P}_${FEDORA_GIT_COMMIT}_${i}" "${WORKDIR}"/"${i}" || die
-		done
-		# .spec %prep
-		bash "${WORKDIR}"/"${SOURCE1}" || die
-		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die
-		for i in "${FEDORA_PATCH[@]}" ; do
-			#eapply "${DISTDIR}"/"${i%.patch}_${FEDORA_GIT_COMMIT}.patch"
-			eapply "${WORKDIR}/fedora_patches/${i%.patch}_${FEDORA_GIT_COMMIT}.patch"
-		done
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-
-	fi
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${PATCHES[@]}"
-	fi
-
-	eapply_user #332661
-
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# show the actual commands in the log
-	sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m'
-	# 'srp' was restricted until early 2017 as well.
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		enable-srp \
-		$(use elibc_musl && echo "no-async") \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		$(use_ssl asm) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	# Fix quoting for sed
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-		-e 's:\\:\\\\:g' \
-	)
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED%/}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED%/}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED%/}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED%/}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.1b-r2.ebuild b/dev-libs/openssl/openssl-1.1.1b-r2.ebuild
deleted file mode 100644
index 09f5e991cf94..000000000000
--- a/dev-libs/openssl/openssl-1.1.1b-r2.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-[[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
-	"${FILESDIR}"/${P}-CVE-2019-1543.patch
-)
-
-# This does not copy the entire Fedora patchset, but JUST the parts that
-# are needed to make it safe to use EC with RESTRICT=bindist.
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
-SOURCE1=hobble-openssl
-SOURCE12=ec_curve.c
-SOURCE13=ectest.c
-PATCH37=openssl-1.1.1-ec-curves.patch
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f29'
-FEDORA_SRC_URI=()
-FEDORA_SOURCE=( ${SOURCE1} ${SOURCE12} ${SOURCE13} )
-FEDORA_PATCH=( ${PATCH37} )
-for i in "${FEDORA_SOURCE[@]}" ; do
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
-done
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
-done
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		# This just removes the prefix, and puts it into WORKDIR like the RPM.
-		for i in "${FEDORA_SOURCE[@]}" ; do
-			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
-		done
-
-		# .spec %prep
-		bash "${WORKDIR}"/"${SOURCE1}" || die
-		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die
-		for i in "${FEDORA_PATCH[@]}" ; do
-			if [[ "${i}" == "${PATCH37}" ]] ; then
-				# apply our own for OpenSSL 1.1.1b adjusted version of this patch
-				eapply "${FILESDIR}"/openssl-1.1.1b-ec-curves-patch.patch
-			else
-				eapply "${DISTDIR}"/"${i}"
-			fi
-		done
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
-			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-		fi
-	fi
-
-	eapply_user #332661
-
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX%/}&," \
-		-i Configure || die
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m'
-	# 'srp' was restricted until early 2017 as well.
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		enable-srp \
-		$(use elibc_musl && echo "no-async") \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl sslv3 ssl3-method) \
-		$(use_ssl asm) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX%/}"/usr \
-		--openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	# Fix quoting for sed
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-		-e 's:\\:\\\\:g' \
-	)
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED%/}/usr" ]]; then
-		# We can only create this directory once
-		mkdir "${ED%/}"/usr || die
-	fi
-
-	emake DESTDIR="${D%/}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED%/}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED%/}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED%/}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED%/}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.1c-r1.ebuild b/dev-libs/openssl/openssl-1.1.1c-r1.ebuild
new file mode 100644
index 000000000000..a3a0f2a2c06e
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1c-r1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 31,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12)
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.1.1c-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? ( https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET} )"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+)
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.1.1c.ebuild b/dev-libs/openssl/openssl-1.1.1c.ebuild
deleted file mode 100644
index f4e635b13b6d..000000000000
--- a/dev-libs/openssl/openssl-1.1.1c.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-[[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
-)
-
-# This does not copy the entire Fedora patchset, but JUST the parts that
-# are needed to make it safe to use EC with RESTRICT=bindist.
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
-SOURCE1=hobble-openssl
-SOURCE12=ec_curve.c
-SOURCE13=ectest.c
-PATCH37=openssl-1.1.1-ec-curves.patch
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f29'
-FEDORA_SRC_URI=()
-FEDORA_SOURCE=( ${SOURCE1} ${SOURCE12} ${SOURCE13} )
-FEDORA_PATCH=( ${PATCH37} )
-for i in "${FEDORA_SOURCE[@]}" ; do
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
-done
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
-done
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		# This just removes the prefix, and puts it into WORKDIR like the RPM.
-		for i in "${FEDORA_SOURCE[@]}" ; do
-			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
-		done
-
-		# .spec %prep
-		bash "${WORKDIR}"/"${SOURCE1}" || die
-		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die
-		for i in "${FEDORA_PATCH[@]}" ; do
-			if [[ "${i}" == "${PATCH37}" ]] ; then
-				# apply our own for OpenSSL 1.1.1b adjusted version of this patch
-				eapply "${FILESDIR}"/openssl-1.1.1b-ec-curves-patch.patch
-			else
-				eapply "${DISTDIR}"/"${i}"
-			fi
-		done
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
-			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-		fi
-	fi
-
-	eapply_user #332661
-
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m'
-	# 'srp' was restricted until early 2017 as well.
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		enable-srp \
-		$(use elibc_musl && echo "no-async") \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl sslv3 ssl3-method) \
-		$(use_ssl asm) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	# Fix quoting for sed
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-		-e 's:\\:\\\\:g' \
-	)
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED}/usr" ]]; then
-		# We can only create this directory once
-		mkdir "${ED}"/usr || die
-	fi
-
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 5a3d379a86dd..24a657d00600 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -1,5 +1,7 @@
 AUX protobuf-c-1.3.0-no-build-tests.patch 1020 BLAKE2B adda0e4764283d00093709bc97500187521c1d099c6a057513cd4c4ab3b595479f62e7f90bc28ee062f7cae8a760445c78334468f25291320b74d46a5bb454cc SHA512 c6b6f37d8d0fb1ac14e650cc521034267b0af06525249078cc81fc8a3d551dc446bb5285228ca349ce18581979ea88eb9765233154cfbbedd8c4a937987d2684
 AUX protobuf-c-1.3.1-protobuf-3.7.patch 562 BLAKE2B 4319e91d94a0f3f47bba3dfca74e5a9b7813480719c64e84c011483f3fca03f629083d4493567c0da83395adf969a8d9b08af42c6886eee7556c989c5f7d0e67 SHA512 2ff16a126b751a2faab7d1585c898cfeb07da46e8c636dc4cd44f25bb70575358943ee3e4a6ed316d93714a9668a6dec27e5e7414d458d606ab67c809ce215fb
 DIST protobuf-c-1.3.1.tar.gz 498779 BLAKE2B f9ecb2cccd8e01a2ab5bd797883f245db418a76ac73ba3e756e997e944637732d45b3fca2a45d3caf4cd89f35259180fa05e64b8b02b63537005420f2233ba37 SHA512 b32920130b4be5e8a8373c2ca37ffe7eb263accf163d93e25a9eb4b6336ec40b05dda2458fe8f0c3cbcf6e0e08e9541fdff004d696f30a5d135b7a3bdca8b2c3
+DIST protobuf-c-1.3.2.tar.gz 500100 BLAKE2B b8bcd4ad6f9ddc05f28526f7cc58778b21a34fc18c7c7aa2a5bb45ae7fdc7c5d8957f989fe1bbfe353214ca87b02afed8cf0ad43c0f0e39f7e13059a5dfd6b7d SHA512 d94d2c6f11b3e482fd3d1b8cef5b2d896ad37a679068f393d29916311deadc5b6b86f946b046d7ee49260b0223e3128e052dc76324b4a8cd6ea184d566ad9aa6
 EBUILD protobuf-c-1.3.1.ebuild 1017 BLAKE2B 68efa1e2a1ccbfa08263d05f59c21712302e9e3a3264a0cea011ef96c310d45b564662add4f1aba095bca18deb7f5191be9f33ac81045c77443d947accc2a468 SHA512 8efae9b40e88d6d9d61eed0826324bec9a5d941b8a69ba39f1611c011dbb538069c3cfc885074113bea2f260921b73dcf0ad20515452ed94159c1490154fc240
+EBUILD protobuf-c-1.3.2.ebuild 969 BLAKE2B 1dc51b298ffd27365deb77eda682dc2f5ea493a1b7f35547b4d94473495e7b2cb95727d2e0a31de872f997ebbe6f952a7e71ee6714603ea96e0ffd40900b1fa8 SHA512 51176dc900fef8772f2945e14b854040e9c8f57264ebf04ec6191054bff8da47818e3fab74057041e25e793a602140b723f6893bf1e836c1ef918ad94bfccc8a
 MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
new file mode 100644
index 000000000000..e666446a3b08
--- /dev/null
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Protocol Buffers implementation in C"
+HOMEPAGE="https://github.com/protobuf-c/protobuf-c"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+# Subslot == SONAME version
+SLOT="0/1.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static-libs test"
+
+BDEPEND="dev-libs/protobuf:0
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+DEPEND="dev-libs/protobuf:0=[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	if ! use test; then
+		eapply "${FILESDIR}"/${PN}-1.3.0-no-build-tests.patch
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index c872b8aff062..d968b6c2f18c 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -16,7 +16,7 @@ DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498
 DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
 EBUILD protobuf-3.6.1.3.ebuild 2632 BLAKE2B a56bc323756a435869076bb5e85d7aec0c777b1709dde5ba78c40cceac648802366710d00508296928cb8b7f8b3fe9f089a38c4bea32d3b877902970cb6a9c82 SHA512 afec4771997a723c61c223465fa7b18d4d8c66676dcc606a1e2d7ca06dc45f7b16c2fc12c816a08507e09c6b98d0271154310125849356e72ddc7b28b9d84a3c
 EBUILD protobuf-3.7.1.ebuild 2943 BLAKE2B 896edce997fcecd5c16e03906333fce045a365c387b42a9880af6b6ff4ffb8a8a585a80db1833ea1b215830e0fbf8eb7b915bea3b1b13db8fb68ffe98153cc1e SHA512 f0c19b39ecc5c9ef7e2fc0fd5bb5479f6d467c82cf260d943aadfe5e8c7616b9a9e2753213e2d88c1b6cd77bbe5d9253dafee65ab892e88d2e6b36285e8f3faa
-EBUILD protobuf-3.8.0.ebuild 2892 BLAKE2B 5b8e850804d5f9020490f1a83699e22210b8ce3c8b19aa9aa216b801efefa8e4fa579f738c8cfc68bb803013c6cc4221ad740acbea9ebd18bbdc0479a03d0e29 SHA512 2bc85c8b152b3a506967aec62f8015dfdf6ffd0f7868628790f4f1105978fcef2f79206dd60c750603b3824bfb9b893f3ec6143e4e35dbe04b1f4c1471fcd426
+EBUILD protobuf-3.8.0.ebuild 2886 BLAKE2B aed1935e60a5acaeaeca5c4ab77add62f5c9126f1eee7c381b8264cfa6c44c8fd9e85c4b130294f7d64158beddc049800dda753ef199557ffa6bc0b77a611278 SHA512 5eccdd3553e80e7dbbed882c7ff76c0580c6a52a13b2e39540781ef71c03959e3375e2d164705d9a1dccb9ddfdca19f515affff49ebdd46a322e41d5d64188c3
 EBUILD protobuf-3.9.1.ebuild 2896 BLAKE2B c893d4fd10dc19eb708804bb6c65ff9c349ead7e318e87a44aa6e6554ca8989227de888b5ff733d788ab2a425d1c6342f67ef549705559efddee8deb2fc2c69e SHA512 27e0441ce650a4981808dd5fd25b88ae33371e012be0e522635907bfce65e049d2095a14dcfed8c261d5c2ec3d3a34e0bb214bd133cefa5e5c28aa8c3be61332
 EBUILD protobuf-9999.ebuild 2720 BLAKE2B 2f45592f132b7758201e6c3125290ce4aef7728997cc64a325585679a81a92ae9eb5037a67c78eb762ab2490e7ddd4e174024b869d01b8629a31838fa0a52541 SHA512 0353bf1028af6eeae9689b7a08aa6e5726638c6a7e9472cf2fe4153c3c346222ec14e5a9c2627c1eff94a6e00c52a9c39c642ea05da082f53b87dd59787b2ffa
 MISC metadata.xml 426 BLAKE2B e4705957b7b549ca44bd4099f7ae592cc313604e00dba91d97887992e097e68beadbcb9cadca1a0f1c7da2a60d2fe844a79570db28d0606140d9204e73c739de SHA512 f7784ccfe1935b7946f0e4b25b1c0db457989f196b5551ab14e2b043549220260b29b014b6d330fd3ceb900490a2b87cb43a178dc45601e80ada30c6a0468fb1
diff --git a/dev-libs/protobuf/protobuf-3.8.0.ebuild b/dev-libs/protobuf/protobuf-3.8.0.ebuild
index 9d5b0b86ec79..4bce89d3d72e 100644
--- a/dev-libs/protobuf/protobuf-3.8.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.8.0.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/19"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 550eb1dabd96..c0f006404710 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -4,9 +4,11 @@ DIST re2-2016-11-01.tar.gz 379816 BLAKE2B 251c45684fa4f3f85e0138c6f788f7a35fbc2a
 DIST re2-2017-03-01.tar.gz 382241 BLAKE2B 0a034267f435386b1bfc1680c98aabf4d18dac40cbce3c5a5705cb6a383d54f81b90e22fdd0f16220434eca2eb1c6a5d28ae7e903cdca2397bbc6c10c11ac703 SHA512 566a3ff6598fc9b26dcabe175efa48becd38459185d6bb86b3abb1856a3e7b0f9b5e302594b1ac4817dcb5968920df43d23279a6cff2a74b6b0c174dc9379f88
 DIST re2-2018-04-01.tar.gz 389724 BLAKE2B 629d5cf82a465dfd2d50a3761f0b6504dba6309e5a2605a6f1fde20cae7e7cbb7bef6703abc12161891cb14e7308db3d18b25e575d3ffd8bbdd5cfba6f067983 SHA512 862d9bcb574ea986b1497d6c079104a0cf27b418a6ec8c24047f0d43ede2c8f7f0bdc6a3ccddaeb746f0d821e3e7fd701f438d7fed101db969785c4b344e0462
 DIST re2-2018-10-01.tar.gz 391254 BLAKE2B 297b9abef94fb3ad95e35bb7ff642a5d47b5bc20b1bc3544c76f8a91ec5b9812a1fad1cd5c6a7d4b7c24baaf15302602e8d1b483bdfc6d1246bf268620a9440e SHA512 91e400856137d16c6319e310dab99b4baa74c0bcf634c97464fccdf4092ffc8e1d5ee2a6714b8114719e2dd92e962d5e970ce1b360a3644a8b395d8fb47431be
+DIST re2-2019-08-01.tar.gz 390891 BLAKE2B c663efc729e8cec6f40a29c1c0ca2eeb59e3323ae1adb60b55d017d15d048ac1e329990bf33fac56037b2b03cbe710ec95073a4adc93300a8ae282d4f7e970d8 SHA512 e2b8f121f29b9afa5ae3c8f29811a010289279a9edb3761e27b44d903a85b80720a3a59388a4ad75fb687ee1343d25b5a59cdee42282eed30f5fc48b59c70c97
 EBUILD re2-0.2016.05.01.ebuild 1202 BLAKE2B 0594d59305793044b9fed2d0570a6c68c5384e0a1f38481fcbdcdf4cb3073484dc660a22f7adfdc977bf1a200cb24f27120b94e87f4319178e196b57ccb59fda SHA512 1bc1f823a2927bb76e2793933d6048ddb93f829464ba8d9d9c0850dc08889026c8e27250e5922b5aa7bdcfe74d7bd0a4be1f59433065141dd7cfaacc6c6c25ac
 EBUILD re2-0.2016.11.01-r1.ebuild 1305 BLAKE2B 8bc950fb1337eeb4f811b3a3a7435b28dce8ec9dad238095a2b19457eced7585ddf64e32844e7970e50b87f3fb913f5dcc9d7529094055e4e1a299ed75950c75 SHA512 a5ef7207e94fc73bcbc4fdd809fa3ed580c9ec0880e073124986a4bdbca7e726be0c122fe7b6f384db8a0ca654645c9fadfb16e3f035e78a1c74e6bca80850c9
 EBUILD re2-0.2017.03.01.ebuild 1305 BLAKE2B 8de6b4e1d07af2677a77755753ff474d818373c0be13008c326972de4cb02b949eb923b1c0353dc0130753d563f6deef1fc54104d32bbcc2c16f676c3afa27ad SHA512 bda266f9e96eec73858ad9c7e0f91f327c216e3d6044bd07abf58dfdf822313e6e7f7b9129b852e0b1ca4ae2bc8ad9c4a38e89e200bac433efd180fc2e7abf60
 EBUILD re2-0.2018.04.01.ebuild 1306 BLAKE2B dcfd4db7dfd17f0ffbab32c96f605ff815933859635e6296570a5783d03b02b221f560ccce8582e2635614f29c379f34e2b375480c06e0d14fe114aa43a15d2b SHA512 c4af6a5638e487c3ce981649ef8ccb30dbf4cf59cd21f06dfef2af8ac0bfa69eb13d11bb9b64b9d575adf15d84fd57163a37dc439abb15086924aad6b54a821d
 EBUILD re2-0.2018.10.01.ebuild 1345 BLAKE2B efa3dbca54f7d8916ef63e41091daecd85d829a0641877fb82e0ad9251d179a247c5fc69127945a7aad4537d83da7cb93abc1576e223f1bb83527187cffa2795 SHA512 d3c6e9cff14639ab4e8ac01e90e896cdc671898f718444009e32750fb392b35836e87e3a2394b55313d58b652cd6b1822a49211dd3159f7fc867c3dcce6815a1
+EBUILD re2-0.2019.08.01.ebuild 1349 BLAKE2B f661f3d4e88cc5c99cf82d8b802343e4a74fa977b3aabf032212dc968cd9d1b7619b8214fce8394a1469d64fe58bf487babe0a2bafdf9fca5a81500fa5dd8e1f SHA512 6d1e8d8a9241017af2e080b5dad79fa1d710f0f07e48e39d48186cf78af4ec1e0c08eaf246f45474494d881018f7596c29b51e296ea8319665c9d4973f64f1dc
 MISC metadata.xml 337 BLAKE2B a584c0de18fba97bedbfc3589eb7e35d2f9f794946f8161c50e807e6ed8dc90631b9aecf3f20b6e04bc27b4b5f92e9044221a50a92f8ed61052794392a0f68e8 SHA512 5dbef91cae8363700badc73e352829c4e4e8265bdb96104136c3759d1731148b7260840b4319116ceac00aa9ba17de6eafa2cf9684878b7e9f032469b6f2fec0
diff --git a/dev-libs/re2/re2-0.2019.08.01.ebuild b/dev-libs/re2/re2-0.2019.08.01.ebuild
new file mode 100644
index 000000000000..697b91bfc42a
--- /dev/null
+++ b/dev-libs/re2/re2-0.2019.08.01.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+# Different date format used upstream.
+RE2_VER=${PV#0.}
+RE2_VER=${RE2_VER//./-}
+
+DESCRIPTION="An efficient, principled regular expression library"
+HOMEPAGE="https://github.com/google/re2"
+SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
+
+LICENSE="BSD"
+# NOTE: Always run libre2 through abi-compliance-checker!
+# https://abi-laboratory.pro/tracker/timeline/re2/
+SONAME="gentoo-2019-01-01"
+SLOT="0/${SONAME}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="icu"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="icu? ( virtual/pkgconfig )"
+
+S="${WORKDIR}/re2-${RE2_VER}"
+
+DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+src_prepare() {
+	default
+	grep -qv '^SONAME=0$' Makefile || die "Check SONAME in Makefile"
+	if use icu; then
+		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
+	fi
+	multilib_copy_sources
+}
+
+src_configure() {
+	tc-export AR CXX NM
+}
+
+multilib_src_compile() {
+	emake SONAME="${SONAME}"
+}
+
+multilib_src_install() {
+	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
+}
diff --git a/dev-libs/rocm-opencl-driver/Manifest b/dev-libs/rocm-opencl-driver/Manifest
index f9c0afae528d..df80a46b2355 100644
--- a/dev-libs/rocm-opencl-driver/Manifest
+++ b/dev-libs/rocm-opencl-driver/Manifest
@@ -1,7 +1,8 @@
 AUX rocm-opencl-driver-2.6.0-install-correctly.patch 1931 BLAKE2B a0bb45e0bf08b777e88804cfe77eadebe1181aa4488885333c9996bbaa0177f7211b16f1fac30e743d53efaa63f59c28b2e928eb2ed6e5396ee2fa6862782caa SHA512 547bf0901a7ef8ac3ae3822dff77ab3409f39c6038c906acfa49579c7652dcd44d235331bd44cab2e5abb9ce1adcc75320f7476cc88666a45d303352e09ef20c
 AUX rocm-opencl-driver-2.6.0-install-header.patch 828 BLAKE2B 5640501a48f6d8552edf7fc89608dc7ff3d7ebe353c88759707e37ec9597a2b6a4cd982a17bf87e30f8f6def80a3a1fd866769b3f2d2572dd8506804ce7e3143 SHA512 f8569519b47f194f58fcb3a2b54f51157be792200004c7bebfde6fb7fea574eac3bec69ab0ea73ff4ef030a9335fdaa21ae22e8655661fab65e11a1a0492395f
+AUX rocm-opencl-driver-2.7.0-libraries.patch 1062 BLAKE2B 9c95bf1928542e0eccaec1927ed6bfb3d81624e29c4bc1873ade263312f5f97c896d6d19922d471c99fbb7eef3e5e7aca2f06a73ac0ed1b475386e5807f9c893 SHA512 3f490d80d08e8ffc7b843dbe33425240820eadc66973e148aca38aadc82c39e80b0e22f2937bff3b0e95cc53f73bf2ffa4fc50c80ba755b251d83e95275c8194
 DIST rocm-opencl-driver-2.6.0.tar.gz 21311 BLAKE2B f17219b577ccd58de052d5936953fd78588a0b042ce002853b10c05e6f6d433edcd90045c15dcd2f2c31ccef89f8b420ef756a1dd1613702efcc8868163878d1 SHA512 7b8bf646d9a36b09d75a0408301c2f1771daad95b8075b1671ca0c8b1f5826e8cd9de8935946858268dc89863a0ee054b4dde3040c84dd37e90f28c7ffa6e097
 DIST rocm-opencl-driver-2.7.0.tar.gz 21312 BLAKE2B 8c7233e8c5de2d92d0604a832475a474e5a171853f435908dbe73ab41d077f9f4c2d7069546b4e660d900c02cccf1f77d85d2fbe5ddb52fdde4c32d6c26910a2 SHA512 ee14bbbf502ffc00fd9e1e04224ae8109c8603d44438cddde8951c2d2caf5d45b94d39eb184af66462b4029759064aab0e2312b44fdd3f925064ebe6097ac49b
 EBUILD rocm-opencl-driver-2.6.0.ebuild 1166 BLAKE2B 4e94bb069a67cd2e0e4dfed81fd46cd331b980b5c2d615932adf988be6708f8d27a000672b81b00c34cc29ce2660aa71f0960bb716c43d1d1dc824c7e3f1b0d5 SHA512 ad72eef3737a65c333d26539150271d82a1ce31618d345c9b9acd485a72948e291ccd147985323ad724544efe9298e4369037213410565f5a37514aedbafe5f1
-EBUILD rocm-opencl-driver-2.7.0.ebuild 1196 BLAKE2B 1c5f07259df697ee75d2b25a652d1c274c9d1fae914a79e0cbc639b8fbebd3c78088afd528920a004bc399d6f259c7f892b26841af776a24370d1730dabb8c51 SHA512 64afcc72b31176174e5657e66f694df91b9ce644e4f2df78fd26a943922f42fe9378f42a217a232cf39774421ed750fbc9111503bacd2b7e22376a52e968ac89
+EBUILD rocm-opencl-driver-2.7.0.ebuild 1239 BLAKE2B bb47e63fe59633acb288b90836bbd7c2e0d5260c72ccbfb75af8add555fe2c5a82a340629870545cd42359d122d1b347d0458ef265e645e3746b1ce5e7cf4109 SHA512 08ded2734804e22d9fcd86426335c912cae6f9e43f78cf73d136f6e9bfe7989a5db013522d7a379f510f3975a9149a97fd0af819a1aa5f9b786ea2078454d1de
 MISC metadata.xml 489 BLAKE2B d989103f6ed0e6a7406558565a5d0453046f640fbef964eb84e51fc911dac4bcc57bc3f1c5222bb5f6d2fb6d10a7f83b4172161070029b0d537b475ef8473f04 SHA512 3bfb9c1ed4cd559aefaf7a74567daf0952359a9fa3e703f1dfaac48d9bb7a25d134afe16e7509c28dff8a5cdabe09870d8f541898756c028b5c5996577956f0a
diff --git a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.7.0-libraries.patch b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.7.0-libraries.patch
new file mode 100644
index 000000000000..9e2a06aac979
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.7.0-libraries.patch
@@ -0,0 +1,40 @@
+https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/pull/88
+
+From f49ad81e246f1c196cf86f40cf44dfedec0675f1 Mon Sep 17 00:00:00 2001
+From: Mike Lothain <mike@fireburn.co.uk>
+Date: Tue, 27 Aug 2019 11:32:47 +0100
+Subject: [PATCH] Include more link libraries
+
+This is required to get dev-libs/rocm-opencl-driver-2.7.0 compiling for me on Gentoo
+
+I think it might be related to using -Wl,--as-needed in my link flags globally
+---
+ src/driver/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt
+index 55ed13f..b93356d 100644
+--- a/src/driver/CMakeLists.txt
++++ b/src/driver/CMakeLists.txt
+@@ -60,9 +60,13 @@ llvm_map_components_to_libnames(llvm_libs
+   AllTargetsDescs
+   AllTargetsDisassemblers
+   AllTargetsInfos
++  BitWriter
+   CodeGen
++  IRReader
++  Linker
+   MC
+   MCDisassembler
++  MCParser
+   Object
+   Symbolize
+   Core
+@@ -83,6 +87,7 @@ target_link_libraries(opencl_driver
+   clangLex
+   clangBasic
+   clangCodeGen
++  clangSerialization
+   lldELF
+   lldCore
+   LLVMDebugInfoDWARF
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild
index f95628a7cb79..e4e2818a7ed7 100644
--- a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild
+++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}/${PN}-2.6.0-install-correctly.patch"
 	"${FILESDIR}/${PN}-2.6.0-install-header.patch"
+	"${FILESDIR}/${PN}-2.7.0-libraries.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 88cba8868e41..bdb8a87026cf 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -4,6 +4,6 @@ DIST rocr-runtime-2.6.0.tar.gz 318296 BLAKE2B c04e04db32f650def8a7973fa73f0c0e9b
 DIST rocr-runtime-2.7.0.tar.gz 321669 BLAKE2B 99f7a62019aaa893ff032a7ed492720c1d0d8fc2c8a730f2e6833d1ad34af57e1045ed480a7d5ba72123bebfa6accd6282be4299bf94d77404adc5bbc9d13624 SHA512 46926a711665df4e232a6dcbcb1f67a4a133bffac927b70404e3cefe624be31dfc5ffea49ae9b834076cfcdf94a6e61b6804af6aed75f433e1842c980bc6e54d
 EBUILD rocr-runtime-2.0.0.ebuild 862 BLAKE2B c9262812cdfdc159248b81cb168b5d2465f2bd7544d576d4d7407919a0f9764a6c2eaf53731294c424755e05915ec47647435ce7524d276acbc7786bccf6ede9 SHA512 8c02bd29599c6cc7ad77dae4f8759cd4f3c2840800ecab30953d325b0ce1aa6bc5bee51ad2b5eca60eb420d5c4fce74e746cdf1efc470a4262eb5a360531399d
 EBUILD rocr-runtime-2.6.0-r1.ebuild 869 BLAKE2B e5a736b834cf77ee056ed3497bcdd3bdb0c525e3ed117164d0a28a9c49ffd079909967110af94c5c87f9e1429e58d36511f95b8bb60c3158a27800fb8679269d SHA512 f883e3f6e2354a2bdab1f5dce33eb9ae6b6405d158414f8016276b25e8e50420489419d4bd3727981bba04ec2311afa7ac3c2590148ab1f45116b7c66124cfbb
-EBUILD rocr-runtime-2.7.0.ebuild 877 BLAKE2B cc25bd18c02adef5491b3d9abcd95b926b0c57441fce8983ef12c91ce3802fb827d1cc26e04240725ec714abeb0941a2d266466e3b070abe9443c3898ebe903f SHA512 ee2786353e21af0980fd92db90770430facbf9e3066e7b1e848cde4d1589e41bc2781a9da9a7ed255a65aa541eb8737b676ba8175f5bfc502624089a6f971a5c
-EBUILD rocr-runtime-9999.ebuild 804 BLAKE2B fbe4f25307d253b02a5a31d3a9e6fdb21fa79cdbe209a76428b8b8b745713ed176a5ab27f364d7d62e9d294acf959f78d6cc16746d1e6075b663b4d92c2e9019 SHA512 e6cb9a6877237362eb1dab9ade2b0d1394f1775ea221bc28373151bbbd5fdae1525724e4a1b35742bb343ce9e68f05e99c31a70d8a54723780f7f3ca4c162440
-MISC metadata.xml 600 BLAKE2B 6bdb934a6f2602bc39dab093a9554a71463e8818181cd9bdb15f108f8d371cc515fdd165742dfe8ac4085073cccc9bbb990a353f0d860d4590049c6965c70e3a SHA512 29543e96a8ccdb2506ba33170822f1bb7399d82c82eb60d342eed616c193902ecf49d377628db010f15aae79b529a65ea1e196ec446621bb2cd9386547c5662c
+EBUILD rocr-runtime-2.7.0.ebuild 967 BLAKE2B 847b465d805b6d30129b3bafedd2471bc093fd3bb91dbfec11dae0a086ec625e4ce087af08e405942d4677003c4c6d9794488932da754588e4567878edaed5ab SHA512 02dd1a0fc265a44a2250d475733c1aa3ea1fd046651291b457991a433676007828e082380b6593eb23dc2dbb5d0293b07072925706002dcc2aaa3d8f12306abf
+EBUILD rocr-runtime-9999.ebuild 902 BLAKE2B 0e7ae79cbaf8eec276cee4981a4e093d4fd1121c4e71d86d485db8eecf239ed773c50934ad5010d56a69fb01408968ac99af80ee6105593b1976d31e48224aab SHA512 346a787c3be08d55b1de4bbfbea44b9e321a8f9646284667c3146181d75cd7c9e98ec594d4674cd5290ed68ce1f60afc8919efd878f920eb15ec8b408100c32f
+MISC metadata.xml 720 BLAKE2B 79e9a058e954fd4d4d7d3490f5cda3e157ac772ca9dcb973d14bae4cfe572de2edc4f6b36c8ec1803632dfeb30c734552566ed1100d0ef89c74fa7386baadf3f SHA512 3a13dc340357222fbab6e417c63c83905c3c5fb9aacff18097ba954eae0cca26e752749dd0da031658de5ab96a30528775ee55403b09b36b17c98f108bd6c1d1
diff --git a/dev-libs/rocr-runtime/metadata.xml b/dev-libs/rocr-runtime/metadata.xml
index d53b83185ad3..53844ebc13ea 100644
--- a/dev-libs/rocr-runtime/metadata.xml
+++ b/dev-libs/rocr-runtime/metadata.xml
@@ -15,4 +15,7 @@
     <longdescription lang="en">
         Radeon Open Compute Platform Runtime
     </longdescription>
+    <use>
+      <flag name="nonfree">Enables HSA image support using <pkg>dev-libs/hsa-ext-rocr</pkg></flag>
+    </use>
 </pkgmetadata>
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.7.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.7.0.ebuild
index b2fdce8bee32..507d471dc104 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-2.7.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-2.7.0.ebuild
@@ -23,9 +23,12 @@ PATCHES=(
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
+IUSE="nonfree"
 
-RDEPEND="sys-process/numactl"
-DEPEND="${RDEPEND}
+COMMON_DEPEND="sys-process/numactl"
+RDEPEND="${COMMON_DEPEND}
+	nonfree? ( dev-libs/hsa-ext-rocr )"
+DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}"
 
 src_prepare() {
diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
index a31193337a6d..6a89ca2901eb 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
@@ -20,10 +20,13 @@ HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
+IUSE="nonfree"
 
-RDEPEND="sys-process/numactl"
-DEPEND="${RDEPEND}
-	dev-libs/roct-thunk-interface"
+COMMON_DEPEND="sys-process/numactl"
+RDEPEND="${COMMON_DEPEND}
+	nonfree? ( dev-libs/hsa-ext-rocr )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/roct-thunk-interface-${PV}"
 
 src_prepare() {
 	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index 639dc99c2cef..d8669db9fb1b 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,5 +1,7 @@
 DIST tinyxml2-6.2.0.tar.gz 585870 BLAKE2B 6f79ffe0894d625e3a2cccaf897c13962672f090c477b6b13e8685585a304b5cf0f5069d88d61650882e55f23768514dcbeea4795e3a4758b016cb177eee44d4 SHA512 ef784240aeb090ab04aad659352ad4b224c431feecf485f33aca7936bcaa0ef4ab9d0a2e0692d3cf6036ac3e8012019d65665e780a920bbad3d4820f736445b1
 DIST tinyxml2-7.0.1.tar.gz 590384 BLAKE2B ea055e9b85c8f1ea789f91d406e549abf1d6e8aacbbf89f5d887b6cc0d8678562810b4352c158de0ee4adedf8146016f970e1b2a221dcb8fd36aac0486d45d9f SHA512 623cd7eff542d20b434a67111ac98110101c95a18767318bf906e5e56d8cc25622269f740f50477fe907a4c52d875b614cb6167f4760d42ab18dc55b9d4bf380
+DIST tinyxml2-7.1.0.tar.gz 592717 BLAKE2B 5936356d472b8642bebb9f02579e6beda14446d57749f1e7a869ff941a03a5ad30624c4db4b2eaaaca48d7f339e3100fddfd58f96bbcfc22737a23d9c9198c9a SHA512 09d5f37018f79a593ff35e33d4296c9ec643a22e83c0cee4c37949300f86201eee07e9b7e6ba55044d8abb438d5d21b70d5843a96ae4652389bb164047ec31e1
 EBUILD tinyxml2-6.2.0.ebuild 623 BLAKE2B 62b554c62e9e1a022b2e02587fd915edbd71dae0112bd87a444485920fac5466e3e430ea2f2d5c0225fb3a5d98dd2f94ff50f1ebd950c527ced46394bf0d6f92 SHA512 24c5dafe5be94a5650dccaf189f9115ec28feb22fbbe9bcf9191e61b5ceba93e00143ecf45d0a529b2e78cbde133fe1639e7356b926055f52042e5fc4e302b41
 EBUILD tinyxml2-7.0.1-r1.ebuild 572 BLAKE2B 7ffac3676ccbebde87288fca78c7137f088412ae0e3d94f582d8b7b139d8f297429a4298d8f2a8d3fadc891e6b1a43c3eebf6b6d4bb5bdbb89f6a372fa757e4f SHA512 b2cb8225ecc17d37c5fbcd938b6da6b14fb1b680085617042885995011ec4c541b36bd17a244747f0f9b7ec0ef62579b5198f7bd575fd2670a06fb49a9409676
+EBUILD tinyxml2-7.1.0.ebuild 599 BLAKE2B d2572fe5712b32384ffe7af229e27bea71dcf1ee13542e27ae62908f38140c87c68c78bae7d1e5f8cd8d4a3bbd901c84e24c3afcaadfb00e3a705264206cd579 SHA512 1912d01fdf8f3f60d830e289e0ca61f7a5eb4f579e6f6a65b38b341e6bff0e5bbdff009e996542357373019bdb762432c3d0cc5e85c231cf5547fca29e0a11c5
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild b/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild
new file mode 100644
index 000000000000..57a8d746e1b2
--- /dev/null
+++ b/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="A simple, small, efficient, C++ XML parser"
+HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
+SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/urdfdom_headers/Manifest b/dev-libs/urdfdom_headers/Manifest
index 6ee5f481a212..f1b91731e9f7 100644
--- a/dev-libs/urdfdom_headers/Manifest
+++ b/dev-libs/urdfdom_headers/Manifest
@@ -1,6 +1,8 @@
 DIST urdfdom_headers-1.0.2.tar.gz 12474 BLAKE2B 191ed19b362f1ef4bc3e99613a99107d3f3038b10df6d0836548f3bfd8454334fc832f5686873d4add4f56585d76f3f827806d1fc12ac080c5e819cfcceda91d SHA512 902cf18b3ccc62dd5d732707e9ca2b8698f3307b8005d3858fcdd0e9585d580bbe5d2ec77c8c8bfa7b8776b870844368a8ec93b0f8a8d71420cf5015a99b8867
 DIST urdfdom_headers-1.0.3.tar.gz 12474 BLAKE2B 6c64d876161eaa380797f86ca58fa6287d9f3e9fcdc1a08dc011a56c9208993eb16c9b7f9ac6971000c1e9d5b942667d073121f69c110720ece88362ad5a0cb1 SHA512 44b1ca9724a9ccd5d2ad51f61d36de19b9a893955ad5c3ecfa2356f6468a0ac140b8cd6fa2aa18c163b0fa8ba87e834358369d2470cd3dee474408113a30b7a0
+DIST urdfdom_headers-1.0.4.tar.gz 12470 BLAKE2B 086df6ffa09b927b3353ab2830e9b5db740f32a4ddf67fa7c5b934a780169eea507309417f557d0b816ed660bc84a6719473b524a9fac54dea2e4b29c98d5e37 SHA512 68b54d75b3b6cb240c4394c452f35d41b7b2a0c3161ed1708f748f756dbf2fd6c296a91f1a0346c4d7c1d1cd01eaa13f5cd952683fa54f09b3894fbee4ab7eba
 EBUILD urdfdom_headers-1.0.2.ebuild 596 BLAKE2B ae8ae16812aeb4de4650a80220c9ef4e4a911d30f34d448223ea4cf472d9f5719e3b628ef11d332a7f75954933a05b6946d9f98662bc8d57c697144bfc31b5af SHA512 7800ea728feadda8f5718b0c4fa13907dae911801ed17911ebe5fdbcef00275f5a64fed407a7ae2404d73ee566cfe44a7372a91050b31a56d697e412e217be7b
 EBUILD urdfdom_headers-1.0.3.ebuild 596 BLAKE2B c61832537f400c84dac3e97a501976e7b22819f22e8405b215a4080db02166300a89aaa68c57d39cb4890cdd6ce094bbfc747ac12aa2de6363725800bf01e67b SHA512 558405ffc019398a88c174e34ca8076737dc4dfc0d59dbfc4f9b31d7ac069ae2c79de47f9ff4ca0a446095392d592a89ddc3c324b45ce5dc73f55293e92ef083
+EBUILD urdfdom_headers-1.0.4.ebuild 596 BLAKE2B c61832537f400c84dac3e97a501976e7b22819f22e8405b215a4080db02166300a89aaa68c57d39cb4890cdd6ce094bbfc747ac12aa2de6363725800bf01e67b SHA512 558405ffc019398a88c174e34ca8076737dc4dfc0d59dbfc4f9b31d7ac069ae2c79de47f9ff4ca0a446095392d592a89ddc3c324b45ce5dc73f55293e92ef083
 EBUILD urdfdom_headers-9999.ebuild 599 BLAKE2B 2e27f12ee18f3960580414f5dd430b6935cb21673abba85093dc65cb242ca3a661a67e9e268df061b230e0aff1fe8cb55bc04d21501e528264a839ca7f41df0d SHA512 a1617b7b51673aa6b8982c2aec93e32739f71808d9619fe90ed5a1fccd65443da99ea7133e4a38a06732242ef2f1bf2605e277ca4e17d34b716225119cc2310d
 MISC metadata.xml 343 BLAKE2B dff4acf9fbc6c2734ac356a3a83da2557b8899e8c58dade74215241f4b563055c55e7b175dc32750f140ed6e2b217f850a79b3a401f09c28eb45f873902a115b SHA512 c12551c09865f8d8f4a833ac0ae8f694e44f507c4e89f39fdb188f5d7159aa0aa6d67c05acae217f5bd8a02d0af3a08599b18f5118a1fc59a3b4105ab6612262
diff --git a/dev-libs/urdfdom_headers/urdfdom_headers-1.0.4.ebuild b/dev-libs/urdfdom_headers/urdfdom_headers-1.0.4.ebuild
new file mode 100644
index 000000000000..e6ff989498ec
--- /dev/null
+++ b/dev-libs/urdfdom_headers/urdfdom_headers-1.0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/urdfdom_headers"
+fi
+
+inherit ${SCM} cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/ros/urdfdom_headers/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="URDF (U-Robot Description Format) headers"
+HOMEPAGE="http://ros.org/wiki/urdf"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index d735502871b8..470006c9dce9 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,6 +1,6 @@
 DIST utf8_v2_3_4.zip 22422 BLAKE2B cf736876a99068c7e5cb1b0b892d1d63cb38906c993c60b78c8c5625aef86fac3a849551771d0840c3cccf04f1a3617216cbd4684fa5cdde0037e3901c70ff4b SHA512 0e85e443e7bd4ecbe85dedfb7bdf8b1767808108b3a4fc1c0c508bcf74787539ae0af95a31a70e715ca872689ac4d7233afc075ceb375375d26743f92051e222
 DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9 SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
 EBUILD utfcpp-2.3.4.ebuild 537 BLAKE2B cceb94f796696ab61bc98cf7ee4f601a0b2a2c528aed81d89ab3cae6f626868c1f33703e6e19785f35c9bf080716580764dd6f6b68a1a6ae7ace9264e1ed9c5d SHA512 5ab92460e7cc22c0d19c78a4632d12eaff02b9c2e0f985ab86dceefb3d73235012a7c037907d42ee956532d160a9775021d2c5c7cc5ffdb9aac2c834c395a4b0
-EBUILD utfcpp-3.1.ebuild 946 BLAKE2B c72550954ecda684130ac539d566dd3b1cecc26f653302a54b28cf64fdd02716ddf278654c86ff47eba1e8156a89a33267e605660c8a21c9a8f7a1228dfef6c4 SHA512 5128f79915aa8924b6e82f75dfc2faf71a0e34803a55bf88df5af04f59e8ffd79edaf4b94f0355ee6b36f6f274c51dfa1f497bcf83c7f51e1824a0a1bbc31812
+EBUILD utfcpp-3.1.ebuild 953 BLAKE2B 6a720484675821e5d573f61dc3ccaf8137cf81bc6e0f289a8f9b8db43cc5e2120c2e6c091ff3c3a31d254289a809592c6d16ee0c12bed69009e7acca81a9ad96 SHA512 e64e0dc995ce290ea855966f39f76814314e029ef6297a02a47a2033820b9b5ea2e1e0afb3da78a06550ce190e6cba11cfb416a83d6a0cb1691f1b737176d500
 EBUILD utfcpp-9999.ebuild 916 BLAKE2B 8a7a1e05ae84fbb8d875e0b7fb0558cfc0c9835090b0253343648d6d9c1833724f99de9b64702d1976a89f93bfdb38f36cf7c41979e73cae9a39bdf66338f5d0 SHA512 e7d512b80328c68fd6037d08796ea88ffabaf903d18e33ebed26253f03c5cdd02c050450a38980e23d83356c3bb30f90ecdba1c8125fb86f877c846c4bb33b01
 MISC metadata.xml 352 BLAKE2B 4ffd4d4fed2363f01b91b53dd2e869b6c49aa0bbddc249e7525b064df74e51528c193a5a987880ca2a3d20a13eba774498d220181d4f55ae262c8ac0e2867083 SHA512 bcd0d5ab729af171d91a6147ff7437f1627638a7d1f4e0c6501aaf6269d9912bca3ee8666dadd1d7037f06850468a40952ba97d572bcf846c38ac7b9273e6cad
diff --git a/dev-libs/utfcpp/utfcpp-3.1.ebuild b/dev-libs/utfcpp/utfcpp-3.1.ebuild
index 9bd3480908d9..4b052b326ee3 100644
--- a/dev-libs/utfcpp/utfcpp-3.1.ebuild
+++ b/dev-libs/utfcpp/utfcpp-3.1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index a19799befe86..05d1b9689711 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,9 +1,9 @@
 DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
 DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
 DIST vala-0.44.7.tar.xz 3355928 BLAKE2B 172e9fee6edec63324b9babc125d2bdb53c2025b2cb86339b54a4c8017ccdf78a848076fdd6a8f5200c15c48864542d711896160f78790d36a29d30980177d34 SHA512 5a645e1b1929644ec6b53d06895afcf62d41d6fd63f82c3be3aa4e28847173071621ec857cb973df38d36e60eb960954c2fb48fb4189e1afcbb25a2376ff0d77
-DIST vala-0.45.90.tar.xz 3357976 BLAKE2B 8c7beb7f2e0fc88b2d789334d0986a6822448148fda2666bc34ff2d3a928e0256895025a88a86c5ca35a9969536157eb27226523c1bda0355bbd436e3c82337b SHA512 3d8ca535f30ba73c2433f377f029b3f7edb92f4a5a71a54ddd95936314f881d5d0b6e31a8fc8747197ab458b3bd84b3e1f1b7a7a73d6bf99edb544e6b2b5339b
+DIST vala-0.45.91.tar.xz 3358640 BLAKE2B e51e1e30042cce60f58f9c63698222d40e719f2cd9258d264bdffc2226cd0c126dc0c256d557a2bc600cd2c0cd9f1f55987f9e96ac666d9d57fdd7b1501afb1d SHA512 7bddbd0d711b50154be6e6d3ebe0576c3ead0f533a0b177c3eb181555eb3d096353157cc490b49c9453686e765739283e30d3881652a9bfb82baeed9be4817b6
 EBUILD vala-common-0.40.14.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
 EBUILD vala-common-0.42.7.ebuild 2518 BLAKE2B 79889f31651bf8044e066f1275ca2c7b931a10f7a1dbe9985d945ad5141b388b13bb9e27dd2bcc508ab83f63ba63efca7d529ed1eb505c1397a4e00465b58a54 SHA512 0c264a16df1c0bfead6d1edd4967ba7d0ffeff3f4f506b6bc210b0d2db807d8986c286560baa83335412388a00fdb7841718c3e9cadb42e51427e1dcfc9940d4
 EBUILD vala-common-0.44.7.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
-EBUILD vala-common-0.45.90.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
+EBUILD vala-common-0.45.91.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.45.90.ebuild b/dev-libs/vala-common/vala-common-0.45.91.ebuild
index 5d6856bd6561..5d6856bd6561 100644
--- a/dev-libs/vala-common/vala-common-0.45.90.ebuild
+++ b/dev-libs/vala-common/vala-common-0.45.91.ebuild
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 63fc47bc34c8..f55601dc04ca 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,9 +1,7 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
-DIST weston-6.0.1.tar.xz 1522600 BLAKE2B 58318cc70bc935886141107d2be9cda8113b50723bb0893f9ada9e2469461a8ce84acd2796b052b6974439ce4ebae329b183761dcacae7137e0a64ac61cebe47 SHA512 3da04ff9b884480ce0824950347185e55584e3938021fe62014423d3d51577eafdda8de650a5de6eb37a842130c9cb14c7a952a560f6be93ff973164363af3d9
-DIST weston-6.0.93.tar.bz2 1180746 BLAKE2B 47768ad3b2901ead6fe167cf4453c99537c7795568966893f39356f614b85a813daab4b3a8d33fe4752063dbb45b5777cdd7efee784f9fbec40bda70a9cbb9c4 SHA512 3fb6d06c8fc5d8e5d3f6306f278a1227230f9ba47120475278b8cfbeee6da168834ce2c7ab25f52b382b315febf424f355cf92315c6aafbf7626522b4df4de19
+DIST weston-7.0.0.tar.xz 1086028 BLAKE2B 84bd16b9d9b191be79bd58a2eecf189971f859edd922245df426ef7871533f5e2a99d484a91241953d182047a6d70d9ee64e8754ea7638637aaf777e4382e793 SHA512 fa14467ab89fb12175830d9cf29d89dc04899fd21d801e60e85836e8e52e17e144be78098b3eedfab6c51b7fb055ecfabb456a8a74f4e40485134da59ac58ea3
 EBUILD weston-3.0.0.ebuild 3498 BLAKE2B 066de40c7595bd86c63143e8dcc1b56991b09b23755530247f38ac2a35ceb94f16329e46ded39f0e9d4135fac47e9127477afc124c119f48d220c09022ac0bb8 SHA512 e3ef428c5f03621f8860463c69d7a124e7f16f6e92523d9e309dcb623b75f9c41c73268a54579e1c3849e1100aad534f289fd0e3465dfcd9d02b846695ac5237
-EBUILD weston-6.0.1.ebuild 3561 BLAKE2B 30743028f046b73951f12a86e6ed851664dc03568ce96c7646f286055c4b133b7ea55db5e8d1c9f9aac246a64844c52a76ffd12804d16ccddcbd663bf61ca6fc SHA512 39ee9294db7dac2426c44198ec0082bb82b4ea43c207ca3b15f5564724d929be0094558b0e11f6ad2526429a41cb5da94417aa693dacf3c156a522cee0f2c782
-EBUILD weston-6.0.93.ebuild 3676 BLAKE2B adafcb4c1be9ef5d782eb3cef0b0b8331242a9e91b25fdf0cdb0d8d3bf3a47a65d82115ace9fe6bdff24cdebc7fc21c8dafa3c749a87d21c9b59175650c634f7 SHA512 71497b35b5aea4b89e48c7162a89e17953c6b42744d5b25ae6ded384d2a689dcc7b0935e2c29d35b821e3ce1c6094bc9b8fd57edae22ea5f507edaae6fb16b27
+EBUILD weston-7.0.0.ebuild 3655 BLAKE2B b1c76f1d0a5405bef3483af7497cdf549266f9fc0897460f3ad080a083518d415680d69f6256989f8fbd8c24f1025b3587125cb7628821be76ced7069c876c3e SHA512 6b3d5190612b81140161b33d02e8757c39594b55b71f439da6926c54e1b9bb19497d35cfb20c1e0413988e1369114663b8cecb3ed3e422511ccc06da0945e916
 EBUILD weston-9999.ebuild 3655 BLAKE2B b1c76f1d0a5405bef3483af7497cdf549266f9fc0897460f3ad080a083518d415680d69f6256989f8fbd8c24f1025b3587125cb7628821be76ced7069c876c3e SHA512 6b3d5190612b81140161b33d02e8757c39594b55b71f439da6926c54e1b9bb19497d35cfb20c1e0413988e1369114663b8cecb3ed3e422511ccc06da0945e916
 MISC metadata.xml 1506 BLAKE2B 7b66fcfbb46edb8480df35f1aabe87c167f02d3cbf505939523248dabadcaab41f395f6ed10eee33c08ee3fbbc2b49d391f61811a75699d4864d6f1eaea3e6fd SHA512 833531fb156a41c3d0996c50e9e72a920b315ad41b7f9a12b82a0f071b621ef9f0b73f8fe2cd63bbce7c1d63d54f41180a3496e3479ef5d0dab725a8af3330dc
diff --git a/dev-libs/weston/weston-6.0.1.ebuild b/dev-libs/weston/weston-6.0.1.ebuild
deleted file mode 100644
index a223d8efcb1c..000000000000
--- a/dev-libs/weston/weston-6.0.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS=""
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
-
-REQUIRED_USE="
-	colord? ( lcms )
-	drm? ( gles2 )
-	screen-sharing? ( rdp )
-	test? ( desktop headless xwayland )
-	wayland-compositor? ( gles2 )
-	|| ( drm fbdev headless rdp wayland-compositor X )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.17.0
-	>=dev-libs/wayland-protocols-1.17
-	lcms? ( media-libs/lcms:2 )
-	media-libs/libpng:0=
-	webp? ( media-libs/libwebp:0= )
-	jpeg? ( virtual/jpeg:0= )
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.68
-	>=x11-libs/libxkbcommon-0.5.0
-	>=x11-libs/pixman-0.25.2
-	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	colord? ( >=x11-misc/colord-0.1.27 )
-	drm? (
-		>=media-libs/mesa-17.1[gbm]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[gles2,wayland]
-	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
-	remoting? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	systemd? (
-		sys-auth/pambase[systemd]
-		>=sys-apps/dbus-1.6
-		>=sys-apps/systemd-209[pam]
-	)
-	launch? ( sys-auth/pambase )
-	X? (
-		>=x11-libs/libxcb-1.9
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xorg-server[wayland]
-		x11-libs/cairo[xcb]
-		>=x11-libs/libxcb-1.9
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use drm backend-drm)
-		-Dbackend-drm-screencast-vaapi=false
-		$(meson_use headless backend-headless)
-		$(meson_use rdp backend-rdp)
-		$(meson_use screen-sharing screenshare)
-		$(meson_use wayland-compositor backend-wayland)
-		$(meson_use X backend-x11)
-		$(meson_use fbdev backend-fbdev)
-		-Dbackend-default=auto
-		$(meson_use gles2 renderer-gl)
-		$(meson_use launch weston-launch)
-		$(meson_use xwayland)
-		$(meson_use systemd)
-		$(meson_use remoting)
-		$(meson_use desktop shell-desktop)
-		$(meson_use fullscreen shell-fullscreen)
-		$(meson_use ivi shell-ivi)
-		$(meson_use lcms color-management-lcms)
-		$(meson_use colord color-management-colord)
-		$(meson_use systemd launcher-logind)
-		$(meson_use jpeg image-jpeg)
-		$(meson_use webp image-webp)
-		-Dtools=debug,info,terminal
-		-Dsimple-dmabuf-drm=auto
-		$(meson_use examples demo-clients)
-		$(usex examples -Dsimple-clients=damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
-		$(meson_use resize-optimization resize-pool)
-		-Dtest-junit-xml=false
-		"${myconf[@]}"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	xdg_environment_reset
-
-	# devices test usually fails.
-	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Fxv devices) || die
-}
-
-src_install() {
-	meson_src_install
-	if use launch && use suid; then
-		chmod u+s "${ED}"/usr/bin/weston-launch || die
-	fi
-	readme.gentoo_create_doc
-}
diff --git a/dev-libs/weston/weston-6.0.93.ebuild b/dev-libs/weston/weston-6.0.93.ebuild
deleted file mode 100644
index 0f1fdb431f46..000000000000
--- a/dev-libs/weston/weston-6.0.93.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS=""
-else
-	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms pipewire rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
-
-REQUIRED_USE="
-	colord? ( lcms )
-	drm? ( gles2 )
-	pipewire? ( drm )
-	screen-sharing? ( rdp )
-	test? ( desktop headless xwayland )
-	wayland-compositor? ( gles2 )
-	|| ( drm fbdev headless rdp wayland-compositor X )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.17.0
-	>=dev-libs/wayland-protocols-1.18
-	lcms? ( media-libs/lcms:2 )
-	media-libs/libpng:0=
-	webp? ( media-libs/libwebp:0= )
-	jpeg? ( virtual/jpeg:0= )
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.68
-	>=x11-libs/libxkbcommon-0.5.0
-	>=x11-libs/pixman-0.25.2
-	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	colord? ( >=x11-misc/colord-0.1.27 )
-	drm? (
-		>=media-libs/mesa-17.1[gbm]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[gles2,wayland]
-	)
-	pipewire? ( >=media-video/pipewire-0.2 )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
-	remoting? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	systemd? (
-		sys-auth/pambase[systemd]
-		>=sys-apps/dbus-1.6
-		>=sys-apps/systemd-209[pam]
-	)
-	launch? ( sys-auth/pambase )
-	X? (
-		>=x11-libs/libxcb-1.9
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xorg-server[wayland]
-		x11-libs/cairo[xcb]
-		>=x11-libs/libxcb-1.9
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use drm backend-drm)
-		-Dbackend-drm-screencast-vaapi=false
-		$(meson_use headless backend-headless)
-		$(meson_use rdp backend-rdp)
-		$(meson_use screen-sharing screenshare)
-		$(meson_use wayland-compositor backend-wayland)
-		$(meson_use X backend-x11)
-		$(meson_use fbdev backend-fbdev)
-		-Dbackend-default=auto
-		$(meson_use gles2 renderer-gl)
-		$(meson_use launch weston-launch)
-		$(meson_use xwayland)
-		$(meson_use systemd)
-		$(meson_use remoting)
-		$(meson_use pipewire)
-		$(meson_use desktop shell-desktop)
-		$(meson_use fullscreen shell-fullscreen)
-		$(meson_use ivi shell-ivi)
-		$(meson_use lcms color-management-lcms)
-		$(meson_use colord color-management-colord)
-		$(meson_use systemd launcher-logind)
-		$(meson_use jpeg image-jpeg)
-		$(meson_use webp image-webp)
-		-Dtools=debug,info,terminal
-		-Dsimple-dmabuf-drm=auto
-		$(meson_use examples demo-clients)
-		$(usex examples -Dsimple-clients=damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
-		$(meson_use resize-optimization resize-pool)
-		-Dtest-junit-xml=false
-		"${myconf[@]}"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	xdg_environment_reset
-
-	# devices test usually fails.
-	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Fxv devices) || die
-}
-
-src_install() {
-	meson_src_install
-	if use launch && use suid; then
-		chmod u+s "${ED}"/usr/bin/weston-launch || die
-	fi
-	readme.gentoo_create_doc
-}
diff --git a/dev-libs/weston/weston-7.0.0.ebuild b/dev-libs/weston/weston-7.0.0.ebuild
new file mode 100644
index 000000000000..2eefef3e88ef
--- /dev/null
+++ b/dev-libs/weston/weston-7.0.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+	KEYWORDS=""
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms pipewire rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
+
+REQUIRED_USE="
+	colord? ( lcms )
+	drm? ( gles2 )
+	pipewire? ( drm )
+	screen-sharing? ( rdp )
+	test? ( desktop headless xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm fbdev headless rdp wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-0.8.0
+	>=dev-libs/wayland-1.17.0
+	>=dev-libs/wayland-protocols-1.18
+	lcms? ( media-libs/lcms:2 )
+	media-libs/libpng:0=
+	webp? ( media-libs/libwebp:0= )
+	jpeg? ( virtual/jpeg:0= )
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.68
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	fbdev? (
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	colord? ( >=x11-misc/colord-0.1.27 )
+	drm? (
+		>=media-libs/mesa-17.1[gbm]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	gles2? (
+		media-libs/mesa[gles2,wayland]
+	)
+	pipewire? ( >=media-video/pipewire-0.2 )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	systemd? (
+		sys-auth/pambase[systemd]
+		>=sys-apps/dbus-1.6
+		>=sys-apps/systemd-209[pam]
+	)
+	launch? ( sys-auth/pambase )
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xorg-server[wayland]
+		x11-libs/cairo[xcb]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use drm backend-drm)
+		-Dbackend-drm-screencast-vaapi=false
+		$(meson_use headless backend-headless)
+		$(meson_use rdp backend-rdp)
+		$(meson_use screen-sharing screenshare)
+		$(meson_use wayland-compositor backend-wayland)
+		$(meson_use X backend-x11)
+		$(meson_use fbdev backend-fbdev)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use launch weston-launch)
+		$(meson_use xwayland)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use pipewire)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
+		$(meson_use ivi shell-ivi)
+		$(meson_use lcms color-management-lcms)
+		$(meson_use colord color-management-colord)
+		$(meson_use systemd launcher-logind)
+		$(meson_use jpeg image-jpeg)
+		$(meson_use webp image-webp)
+		-Dtools=debug,info,terminal
+		-Dsimple-dmabuf-drm=auto
+		$(meson_use examples demo-clients)
+		$(usex examples -Dsimple-clients=damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		$(meson_use resize-optimization resize-pool)
+		-Dtest-junit-xml=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+
+	# devices test usually fails.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Fxv devices) || die
+}
+
+src_install() {
+	meson_src_install
+	if use launch && use suid; then
+		chmod u+s "${ED}"/usr/bin/weston-launch || die
+	fi
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 1e09bd82ad9c..76311f3b14d6 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,6 +1,7 @@
 DIST xapian-bindings-1.2.25.tar.xz 1711860 BLAKE2B 66367dbc503333c4f59da8bb5bd4885fe9678aace45365573bac8e0e8e2c712795af2021ff52de9eeabb91f65a2f0447d1963424b1ae6558be95b737d1279e98 SHA512 5d27b2ae2722409ea99a1b9e6bf3f5c61ed9195b67121c090f1533340d3b11c546014985d0989a0725b60a07b392b9705bce054495f423bd3a7c99835aa336c7
 DIST xapian-bindings-1.4.10.tar.xz 1125168 BLAKE2B cb864021362098243993560724a66964532cd4ff47ce7a746876f1102113d136676b0feb70fa6515a9c9b31627e5363c76f4d65d9928b21822f05fe41b92401c SHA512 e993c33820f7606e17ee6ff5a13bdcb91beceec6a8443298ff06a3160052e96caff3aca30908c68a8a695429ec51189a86404b69c5525e5770741637cc63bbc1
 DIST xapian-bindings-1.4.11.tar.xz 1125716 BLAKE2B 0fd4204b4d18c04e017385f5eb116df68daa2f76f528f2b1770e61e5ab5062498aed6ccb57f51ac26ced58912d41c5f5a6f076e0f721a7eb1c3f83e01f2b9523 SHA512 326b08b9959143b92e6c10bd9b6b107ce2779e6ef1a3b5570abd07802a5988dd7df4e890d820f7da355f9f9e64df9a3ae08a0664d70d10ba6f876fca3dc44ecd
+DIST xapian-bindings-1.4.12.tar.xz 1132048 BLAKE2B 56ab098a4d2da4de7e8be2a07581f57957d03cb84b31878c5f449d267060aa620a887f79c968f0ec28cb3a2c9f1f77f8e9e8d29e052c228109b71b0c137d7b71 SHA512 08190a70fe2548be50d82192f94158fd5d6839534b5ba7e0fdbcec7e99df29f0be6517603e7a66a474dffef94ea6bd2e6b7a3315717056687c6a205c25908b45
 DIST xapian-bindings-1.4.5.tar.xz 1118884 BLAKE2B 507b06f0121e5a56224250bfe7b19795eb9fd2fba977d12022d054e7b832fd70af70085ad576dab41efcde261f9ecd48179646f1ea67aaa266fb6272358eb69a SHA512 e39ece495e25077990db3d06554306567c52c6f45ad55a65005cb97e18086ee18947e41d0d612157b891b61e015881385bcb082a03aa0c6452565e90d09e8275
 DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a627a32e5209d8b79f435dc85c899cf14619af6165265e624e2ba8806f3c91dd35d71d98c4a47f5d6f4fba1b7fb83700c0d0 SHA512 c904cd3abf19d68495b0487ea77265fdc92a3cd8b1c2437b89034efd349ce41198bbc4abca49f259f71a1ba0fd269b2cf9b6dd4c1607678a73cbed4de9c5a1d5
 DIST xapian-bindings-1.4.8.tar.xz 1123812 BLAKE2B 5aa496ff3cfe06a40fa8db6a04cdc9041f4a0d9f12c7a61565f10c7d360490a7c8a7c745d91c9eda45b9d9bc58bd6a2bbae02aa9dd7ff1949ac59f7e09b090df SHA512 f979c32b096ecdc7a71b2bd032c6d0e7131f3d304e47e44005989ca79ea1f940c39626c60a8e52ff3cdb2cb380aa5ddf82a99bae08e06629c0bd47d8e0bfa7cc
@@ -8,6 +9,7 @@ DIST xapian-bindings-1.4.9.tar.xz 1123628 BLAKE2B 918748bb99b826485127b16511ae2f
 EBUILD xapian-bindings-1.2.25.ebuild 5545 BLAKE2B e28415e8afd6011e49d94dfb66880b0d79ebd75f774901980f269700dab506914e7af658d477f6a3a4a2ae63d21401fb4f5304e12a971c1ff1f11eb0360f2bcd SHA512 cb5a02386c3b80d9421f1b67c724ebc0c0d2c04b73e602e7019ca4d356d337613e56eec8d55bc6d69276b410f78a3b26fdc4293c9971e3d8c02b6bc4f8785519
 EBUILD xapian-bindings-1.4.10.ebuild 6533 BLAKE2B aca3605ecf7afbfcd5ac80ced0aefcf75c2b42b9561361116db0779f5650f0e114dfcc610f961c74829faecbd4ef3a867f4c2638929db620fb3b44f7f1b72583 SHA512 e6f6aee19f83d0473afef1a15acfa760d98f21469d4ad6ca02dbd50e41e2db310b7a19d1883823c526da69828b5ecd43ff81379d11d4b815a8ae1dd15b9405c8
 EBUILD xapian-bindings-1.4.11.ebuild 6533 BLAKE2B 3075c874eca6c1aa5eed1c4deb5c752163de860127a9f2aceae8eec12203dddef413374a1299816c8da79450d041658a1520cad611b1e03178d3ab0475602a71 SHA512 762066aeaf088ec094ebbed3ab487b77c105f57f84f051e0b4616bdda0c6c4a6c44acdbc130a0cf4288342f8133e836d182bcfb861ed058a81bf6da5656f40b9
+EBUILD xapian-bindings-1.4.12.ebuild 6533 BLAKE2B 3075c874eca6c1aa5eed1c4deb5c752163de860127a9f2aceae8eec12203dddef413374a1299816c8da79450d041658a1520cad611b1e03178d3ab0475602a71 SHA512 762066aeaf088ec094ebbed3ab487b77c105f57f84f051e0b4616bdda0c6c4a6c44acdbc130a0cf4288342f8133e836d182bcfb861ed058a81bf6da5656f40b9
 EBUILD xapian-bindings-1.4.5.ebuild 6491 BLAKE2B 29b71eec911c53f3377c1b1ed6bbfc6fda2357b5311f50b28eea850fca465a39e8131e44db9ae72ab040c0d1938e43f987922a6555edc0bf52b3b2f0180505b3 SHA512 f5a8731bbde8be861dcef0c544c4e2b8c12863aa4c4378c055fab2f4b2d4b7b30e63a54bb4490c0379ead90360e60cc5bdc101ca46186a43f573d3436d6184a9
 EBUILD xapian-bindings-1.4.7.ebuild 6493 BLAKE2B a48e6fa3bda13e2d0b43bf3cccbdc3dc23ebd53d00a2462351d11cac50003c15f3f409fd8514bca1fc8631ba6f61cffc0dd62fe1cb1e19f5cc6fbc82cd492249 SHA512 e04b3df07efa3a2fad53ebea36d05ca1f488e05b712f2c785d2b9ed37e9334a05207363a0d8dd260b0050d50bd37fbc9e57ad3d295e2bbc697b7c5cbebb6c296
 EBUILD xapian-bindings-1.4.8.ebuild 6498 BLAKE2B 1f69dae02f5e48291349b97022797062d2bc46783ff4cad3f82e87ac4c5e330ba391beaf44ccdf7360fb23349c4dcf51fab261fb279b9336db9644af7777e685 SHA512 35ca5ee0609d4c11d93418f2bb8dbabda6fe99909bd6d78cfb134868ca6d2b0047065b1b1beb2ea8e4a421ee32345ed361e389b152b10db8e968ee113ac9b248
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.12.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.12.ebuild
new file mode 100644
index 000000000000..ec1fbcb8679d
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.12.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_REQ_USE="threads(+)"
+
+USE_PHP="php7-1 php7-2 php7-3"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_OPTIONAL="yes"
+
+inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="https://www.xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java lua mono perl php python ruby tcl"
+REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( $(ruby_get_use_targets) ) )"
+
+COMMONDEPEND=">=dev-libs/xapian-1.4.9:0/30
+	lua? ( dev-lang/lua:= )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:=[-threads] )
+	python? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	ruby? ( $(ruby_implementations_depend) )
+	tcl? ( dev-lang/tcl:= )
+	mono? ( dev-lang/mono )"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.6 )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}/${P}"
+
+has_basic_bindings() {
+	# Update this list if new bindings are added that are not built
+	# multiple times for multiple versions like php, python and ruby are
+	return $(use mono || use java || use lua || use perl || use tcl)
+}
+
+php_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_copy_sources
+}
+
+php_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_foreach_variant "$@"
+}
+
+ruby_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_copy_sources
+}
+
+ruby_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_foreach_variant "$@"
+}
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			# Unfortunately required for php-ext-source-r3_createinifiles().
+			mkdir "${WORKDIR}/${php_slot}"
+		done
+	fi
+}
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+
+	# https://trac.xapian.org/ticket/702
+	export XAPIAN_CONFIG="/usr/bin/xapian-config"
+
+	if use php; then
+		php_copy_sources
+	fi
+
+	if use python; then
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		ruby_copy_sources
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	if has_basic_bindings ; then
+		local conf=(
+			--disable-documentation
+			$(use_with mono csharp)
+			$(use_with java)
+			$(use_with lua)
+			$(use_with perl)
+			$(use_with tcl)
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+		)
+
+		if use java; then
+			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+		fi
+
+		if use perl; then
+			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
+			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
+		fi
+
+		if use lua; then
+			local -x LUA_INC="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_INC lua)"
+			local -x LUA_LIB="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_CMOD lua)"
+		fi
+
+		econf "${conf[@]}"
+	fi
+
+	php_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-python
+			--without-python3
+			--without-ruby
+			--without-tcl
+		)
+		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
+			myconf+=(
+				--with-php
+				--without-php7
+			)
+			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
+			myconf+=(
+				--without-php
+				--with-php7
+			)
+			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		fi
+
+		econf "${myconf[@]}"
+	}
+
+	if use php; then
+		addpredict /usr/share/snmp/mibs/.index
+		addpredict /var/lib/net-snmp/mib_indexes
+
+		php_foreach_impl run_in_build_dir php_configure
+	fi
+
+	python_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-ruby
+			--without-tcl
+		)
+		if python_is_python3; then
+			myconf+=( --with-python3 )
+		else
+			myconf+=( --with-python )
+		fi
+
+		# Avoid sandbox failures when compiling modules
+		addpredict "$(python_get_sitedir)"
+
+		econf "${myconf[@]}"
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+
+	ruby_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--with-ruby
+			--without-tcl
+		)
+		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
+
+		econf "${myconf[@]}"
+	}
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir ruby_configure
+	fi
+}
+
+src_compile() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake
+	fi
+
+	if use python; then
+		unset PYTHONDONTWRITEBYTECODE
+		python_foreach_impl run_in_build_dir emake
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake
+	fi
+}
+
+src_test() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake check
+	fi
+}
+
+src_install() {
+	if has_basic_bindings ; then
+		emake DESTDIR="${D}" install
+	fi
+
+	if use java; then
+		java-pkg_dojar java/built/xapian.jar
+		# TODO: make the build system not install this...
+		java-pkg_doso java/.libs/libxapian_jni.so
+		rm -rf "${D}var" || die "could not remove java cruft!"
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		php-ext-source-r3_createinifiles
+		# php-ext-source-r3_createinifiles() changes current directory.
+		cd "${S}"
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	# For some USE combinations this directory is not created
+	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
+		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc AUTHORS HACKING NEWS TODO README
+}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 5385cba54968..141852404e0f 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -2,6 +2,7 @@ DIST xapian-core-1.2.24.tar.xz 3210192 BLAKE2B 062f0c15ce87fb64b0eec5e5e54b76c44
 DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
 DIST xapian-core-1.4.10.tar.xz 2973780 BLAKE2B 6ef86a4c02e6721f434e33ea27a37ddac9cee62f0c9eed8c6334cadb62dd544be66405dd359dd944cf1ab12742c10e786b7300c4987e33ce33da9d9df4e428d4 SHA512 fa716d6f8c04edb297d99dad4d7835f7874837ab3c39d7017e43708cde6992c596e579418be17b79772e002bd23b94169812523a1abd9519b1dd3df474f027d9
 DIST xapian-core-1.4.11.tar.xz 2975524 BLAKE2B c912e527ef1454c0b4b3e1aedd91a8a63d2e0b2dd186759eac00d6a0f64104669467c6c5b0bf3f132d4fa04bb2ef72d07ccfe92137a3360ba699e3420ee8bea4 SHA512 72ab7b0c774390f38319d241689b2dc3c2837fbbf933616574f6ad167f14a25c2eff747910022065508dc7c44f806dc2b71dae80a1b4f1f47e1675fb951bc785
+DIST xapian-core-1.4.12.tar.xz 2979052 BLAKE2B 26b20b22105493679052827a5e6b2890da922cdaa97fca1266b26f6ddb3de6b76d491c37ca10210ef5119ce4250700d87fdd22553456958f6869bc3af51b78ae SHA512 230b39e012366267cf5ea09d01d3b463818c0d05861b8c8643bc6fc238be21bd3f4862adeba864b4af2962b1c0748b3d380dfe845da467f5164b0d938288c430
 DIST xapian-core-1.4.5.tar.xz 2810612 BLAKE2B 7784e69e3ca064751d829173949fcde65661c2c2070fdc8392cf2b6d40874a3e5b1265e61f25dd39b33e179b3fe3842b67f33a55523c3a18e9b65528e6a23a1e SHA512 cff97a856a406583ca81164ddb704a0eeae7d8d6f94ce3b3f53d5208d657423e87dd06bdc7acb5e5904765bce1cefbc98365cde315c1d46f7b18cfba7b022ae6
 DIST xapian-core-1.4.7.tar.xz 2874172 BLAKE2B 917a35ca717ed4437f4a617ce0b6ac07d5936e07aac6bfa9d6878c12ed0c38e7ca994ad943b6dc7a5cd2fe131a445c5a7859f2286c2201dd048020569ce1a0bf SHA512 9e77a78bd63036966ebb9bbed91e36fef17b37c9465c8d4b7dc8041f0e24b040e6520de645babfeeade952771d145176a204328718cfa8bc2291bb6fdbe840d2
 DIST xapian-core-1.4.8.tar.xz 2880432 BLAKE2B 8468a33614d8c7617755cfe4cc79e72ab42612a79be9fb684525e268efe80c42ce902a60a44dc5548c70b719d752e15927ce24b4ab457905022ae806bffb1f11 SHA512 9ed1f34ec1bf53a4dc628ebb8d080af79a4ac6a315bf1ae52441f0ac3a63e5478ed02887382116b28157b926e685fdc730489426edce560aa4bba27cb7295e48
@@ -10,6 +11,7 @@ EBUILD xapian-1.2.24.ebuild 1580 BLAKE2B 381e09ce792274d6142ee236e0f1422a7bcb494
 EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B d1b5198ecb2c78befcf92017ffc74e2626a4575f0464ea22612543ea0fbdf2024aed6c24c4e741f9f97d9f70f1f4cc83607f1a1a549da056f77c4a271f86fa28 SHA512 abd485682ed6071849ce5b28e9235acf2bf7cb017cda6668ec1409581ca1e6dc528c516087d3ccc6b2757dd2cae700c474e6e65e9fc74e7fe40c634eb94abf81
 EBUILD xapian-1.4.10.ebuild 1944 BLAKE2B 796deca4b4bbb01743dc5327fe45b1371a96cbeadf4be2acde95782c576f77587e71339f2d3045e6170bde4f9cd47878a0574ab436a31188e96deaa8e547a51e SHA512 73e54166ded4dd3fafdf78fb7ba6a879539fbbf6a287232c3b18a5c7b49f792d4c607232623f6581a51de5a7b8f39e9fa3fae7af326ed580f26a2019aaa4d53d
 EBUILD xapian-1.4.11.ebuild 1908 BLAKE2B f50d8b8086109ccfc7f108623d024076cf4e8592023bd6d554f55a013be04075eb64de42e85ed18681c2600a7c112e1874ee2dd3b6cc0ea2640c34116ff02a06 SHA512 e09b9b3760512916c32b20466a680d340e7909bfe075b1364ba17e3c9efe0b28a235b3897f18787dd46f12024539964a9e479d85ddba688e192dabcb7a3e0aba
+EBUILD xapian-1.4.12.ebuild 1910 BLAKE2B f0d166cbb01cff61d032e7e9774b6f3ea3395a0ca6cf337f171d4ff053551c9a89cfbdfe502e22d4b9ea74324ddbaf93268069d36452966eec123f8d48f3d041 SHA512 92ff3c91acc80fed730bd920c38649de050d17797251a8a9ba001c7631e28aeb93d7105d51651be5450eb9ba3c6072c4e7b89b088de414eb82b8d4a997dce0d0
 EBUILD xapian-1.4.5.ebuild 1936 BLAKE2B 76f950ad9162610700da01eff6d6f33ab694d1e09b55b08592912323d70f67d09cdec09bd4f1c8316761c4b31c40e978eef683222cfbea90cb21b41cb9444f8e SHA512 6add7e80ac66f69ebbffd464d782ceefe23919faec529dc33fe53fbdc3b9cd17bfaa5be8b8580f2046601654fdd17e611d4395e262ef4a4cfe97aab85dc5844c
 EBUILD xapian-1.4.7.ebuild 1937 BLAKE2B 64996a418dcf2969c826deadfdf8b62474189cf1c32c9c017c1baa1d2ba2b18fdbe0175ff4f7d92347a21e78d4557dec0ac28abb50f7e432486aa52ff9373f22 SHA512 df6f4147fda42057fa70e9d144055cc143472657e5f5767bb2a27aacd95f09cec3e321c75501fe0cbea568141e7222d58990f85ac11141995045cc64aa065a11
 EBUILD xapian-1.4.8.ebuild 1944 BLAKE2B 6cc1549770b5283f153665c3b015264cd5ca3f6a173f3bddc509c09f14735293fa39ad4da9e761e92708cfd54c5dbadb3b056f4327d646b15af074e3757e50af SHA512 d33a78e9db80b47f09c372ed1141db6cda833d333d978af14abcd0026918217e8b7deccf42e286322a25aae04c5427e33595b93f38ae6e2787f09b8bc62a923e
diff --git a/dev-libs/xapian/xapian-1.4.12.ebuild b/dev-libs/xapian/xapian-1.4.12.ebuild
new file mode 100644
index 000000000000..fb4146bacb4b
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.4.12.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils multilib-minimal
+
+MY_P="${PN}-core-${PV}"
+
+DESCRIPTION="Xapian Probabilistic Information Retrieval library"
+HOMEPAGE="https://www.xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/30" # ABI version of libxapian.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +inmemory +remote"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myconf=""
+
+	if use cpu_flags_x86_sse2; then
+		myconf="${myconf} --enable-sse=sse2"
+	else
+		if use cpu_flags_x86_sse; then
+			myconf="${myconf} --enable-sse=sse"
+		else
+			myconf="${myconf} --disable-sse"
+		fi
+	fi
+
+	myconf="${myconf} $(use_enable static-libs static)"
+
+	use glass || myconf="${myconf} --disable-backend-glass"
+	use inmemory || myconf="${myconf} --disable-backend-inmemory"
+	use remote || myconf="${myconf} --disable-backend-remote"
+
+	myconf="${myconf} --enable-backend-chert --program-suffix="
+
+	ECONF_SOURCE=${S} econf $myconf
+}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/xapian/postingsource.h
+	/usr/include/xapian/attributes.h
+	/usr/include/xapian/valuesetmatchdecider.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/types.h
+	/usr/include/xapian/positioniterator.h
+	/usr/include/xapian/registry.h
+)
+
+multilib_src_test() {
+	emake check VALGRIND=
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# bug #573466
+	dosym xapian-config /usr/bin/xapian-config-1.3
+
+	if use doc; then
+		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
+	fi
+
+	dodoc AUTHORS HACKING PLATFORMS README NEWS
+
+	find "${D}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index f33c9b522471..6d20b62a0efd 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest
new file mode 100644
index 000000000000..1d78f0234608
--- /dev/null
+++ b/dev-lua/luv/Manifest
@@ -0,0 +1,4 @@
+DIST luv-1.30.1_p0.tar.gz 88560 BLAKE2B 9eb32f4e13921899a80dfba143508d26ef0bee3ce0186b62b31ee9da508aa434ac01dcdbd5654f03fd18798791b71e310739e2d9a879f03bf6c48475cc6e0b46 SHA512 c7f613e72d5e5e93035597fcb6a3868d60e61811d4858ced1c2087f31ed0720c11fe436af51d6626c0d77ed448989520b220d6a150b49f6ec0fe557472dd66c7
+DIST luv-lua-compat-1.30.1_p0.zip 62515 BLAKE2B 173dbe43a1f1f4e440c1e40b0a0b22b4ca580568e754a44fbcf57370a53340ebe247de18ae8e98e68cf0f85ae2fa6ec41d5acfb9a433e4bdc717a1e80a2480b6 SHA512 7e66b059aecdb4de630fd305fdcc439cccac94b44101c8b74d61f0f40a1e01e8e68c811a96bddcf5bb0ae09f369d9524f0ec9b009e31d89aef2a1115becba056
+EBUILD luv-1.30.1_p0.ebuild 1637 BLAKE2B ebb629c13b7c2febb10a71ae8515d885c1c625d73de33b91b598ad183fdfcdd7390d0e9aa06c975f943fbcc862f9bbb062076f9883aa065c788dbc7bea736938 SHA512 1e36d4bc8a345704fd7a755356fbe15ac9cfca3030d869003201c24bf07b5e3e46fddad85466da7e97d2fc154baa27bbe37b5e44c15116bce3dcbe5239683bde
+MISC metadata.xml 694 BLAKE2B 05c4a49f68f759283b8c222ed8dce31c5448b72a09e5f5d505ba9ac5a3552bb65a14483ee20f2d18b9b9ed2729b7c5ac282d66e9335ec099d411594934262637 SHA512 721d7421c83925c20a66d521d0c0f9f639b2d994b20cc9528f6f6529ddfec4f9d5cb4f0947d04e2fac7421bd7ece26f99ae94b126bc3c8c3ec9704878b029116
diff --git a/dev-lua/luv/luv-1.30.1_p0.ebuild b/dev-lua/luv/luv-1.30.1_p0.ebuild
new file mode 100644
index 000000000000..50c64f2bb52f
--- /dev/null
+++ b/dev-lua/luv/luv-1.30.1_p0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils unpacker
+
+MY_PV="${PV/_p/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Bare libuv bindings for lua"
+HOMEPAGE="https://github.com/luvit/luv"
+# XXX: Remember to check this hash between bumps!
+# https://github.com/luvit/luv/tree/master/deps
+LUA_COMPAT_HASH="daebe77a2f498817713df37f0bb316db1d82222f"
+SRC_URI="
+	https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/keplerproject/lua-compat-5.3/archive/${LUA_COMPAT_HASH}.zip -> ${PN}-lua-compat-${PV}.zip
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="luajit test"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		luajit? ( dev-lang/luajit:2 )
+		!luajit? ( dev-lang/lua:0 )
+	)
+"
+DEPEND="dev-libs/libuv:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Fix libdir
+	# Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
+	sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_HASH}"
+	local mycmakeargs=(
+		-DBUILD_MODULE=OFF
+		-DLUA_BUILD_TYPE=System
+		-DLUA_COMPAT53_DIR="${lua_compat_dir}"
+		-DWITH_LUA_ENGINE=$(usex luajit LuaJIT Lua)
+		-DWITH_SHARED_LIBUV=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	local elua="$(usex luajit luajit lua)"
+	# We need to copy the library back so that the tests see it
+	cp "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to copy library for tests"
+	${elua} "tests/run.lua" || die "Tests failed"
+}
diff --git a/dev-lua/luv/metadata.xml b/dev-lua/luv/metadata.xml
new file mode 100644
index 000000000000..b860177b3335
--- /dev/null
+++ b/dev-lua/luv/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bernardo@standard.ai</email>
+		<name>Bernardo Meurer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		libuv bindings for luajit and lua 5.1/ 5.2/ 5.3.
+
+		This library makes libuv available to lua scripts. It was made for the
+		luvit project but should usable from nearly any lua project.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">luvit/luv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index abc7f335e13a..2422ef7e44f3 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/seq/Manifest b/dev-ml/seq/Manifest
index 4f5009c8d1ab..1d40a145502c 100644
--- a/dev-ml/seq/Manifest
+++ b/dev-ml/seq/Manifest
@@ -1,4 +1,4 @@
 AUX seq-0.1-gentoo.patch 309 BLAKE2B c80895e464359e67350ee3f0a183f3dfde63d718775876acad3905446c62dac229ad173b334020f4b2d51807b37d15e526ea98fd3ce2bf27ee8fe751c77c6d11 SHA512 0f93ed7035bc7138518b99471d64cf6144cfd3d4aeb08445a7fc6b2ae631a96a242a1dceaa5014b6503149ad24a1f048c1f0ea435ff38e8c76452f0bafffe540
 DIST seq-0.1.tar.gz 2452 BLAKE2B 4f673c3909611957fc882c548c8549cbcad1e93101e1968f001609108b89f4cee13b055a7a8e75e9c36d33074863532b7d84461f036d14c468d5baadde411295 SHA512 cf0df428408efd8f593765c419007c3b181c1234fa957bd09bd96bbbbc7950dcd329429a8a22573680fdfd46847e21befae29ade967509690428ba2b90fe83f2
-EBUILD seq-0.1.ebuild 627 BLAKE2B 1d3b7e89ceee19d671d3b80a20b367e1a040e07fbb51262f837936ca6cccfb5ca30f1d45274ebb845a322e2a2c5286996cf43fb10a36ffbaa2dcd806bd3dfb77 SHA512 016c0ec96d2eebf9045105365af0d4a3a60ece2211373f758f52b5932278c92387fb43a84873aadffa86303e50db34d6a35a79fd820f6aaa8249d271ac902fc8
+EBUILD seq-0.1.ebuild 643 BLAKE2B 52181f4317536b27529cc6e5a69d918aeeacb10c461e62eb63a9672fb1e4071f0bfa0d105d9349a6f818edc13e1d871cc5c6c218a527e901f6ccdaef928123f3 SHA512 193731d29613a3c4756c419a090a6a551ca6284b9b82eb6d6e1253c253b3df4a13c5253447722cebd29092643017f312f3216c7bd85ddc630dbdb93105496df1
 MISC metadata.xml 375 BLAKE2B c6d166cdc6fbcce412dd0f1d78f8d1f54635d25c89e12d762e0f967a85c1a315c4912a58cdf8075c784881dcb507594d73cec30cd09e575877696a17b616d868 SHA512 dc49b250f3706af5b0f3a589bace4bd06c900d6d5f0551ae311090985c4267592a385c007f09423be4a37793e00cbe8275aa1faeee2df7f6858f67260cbd7932
diff --git a/dev-ml/seq/seq-0.1.ebuild b/dev-ml/seq/seq-0.1.ebuild
index 3a5b9b4aa827..13d3d327be21 100644
--- a/dev-ml/seq/seq-0.1.ebuild
+++ b/dev-ml/seq/seq-0.1.ebuild
@@ -12,7 +12,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-ml/ocamlbuild"
+DEPEND="dev-ml/findlib
+	dev-ml/ocamlbuild"
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r2.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r2.ebuild
index 84ac33ce749c..c167c867d202 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r2.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.32.0-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
@@ -15,7 +15,7 @@ IUSE="embedded test"
 
 RDEPEND="dev-perl/DBI
 	dev-perl/Test-Deep
-	virtual/libmysqlclient:=
+	<dev-db/mysql-connector-c-8.0:0=
 	embedded? ( virtual/mysql[embedded] )
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.37.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.37.0.ebuild
index 26cd430f46cd..9ebdaccc60fc 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.37.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.37.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
@@ -18,7 +18,7 @@ REQUIRED_USE="?? ( embedded ssl )"
 IUSE="embedded test +ssl"
 
 RDEPEND=">=dev-perl/DBI-1.609.0
-	virtual/libmysqlclient:=
+	<dev-db/mysql-connector-c-8.0:0=
 	embedded? ( virtual/mysql[embedded] )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r2.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r2.ebuild
index 34f18b06e628..1595e68121f8 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.41.0-r2.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.41.0-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
@@ -18,7 +18,7 @@ REQUIRED_USE="?? ( embedded ssl )"
 IUSE="embedded test +ssl"
 
 RDEPEND=">=dev-perl/DBI-1.609.0
-	virtual/libmysqlclient:=
+	<dev-db/mysql-connector-c-8.0:0=
 	embedded? ( virtual/mysql[embedded] )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.41.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.41.0.ebuild
index 25b0b306ccc8..f3a4883d4ce8 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.41.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.41.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
@@ -18,7 +18,7 @@ REQUIRED_USE="?? ( embedded ssl )"
 IUSE="embedded test +ssl"
 
 RDEPEND=">=dev-perl/DBI-1.609.0
-	virtual/libmysqlclient:=
+	<dev-db/mysql-connector-c-8.0:0=
 	embedded? ( virtual/mysql[embedded] )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.42.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.42.0.ebuild
index d96848aa70f8..40d76fff1f44 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.42.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.42.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
@@ -18,7 +18,7 @@ REQUIRED_USE="?? ( embedded ssl )"
 IUSE="embedded test +ssl"
 
 RDEPEND=">=dev-perl/DBI-1.609.0
-	virtual/libmysqlclient:=
+	<dev-db/mysql-connector-c-8.0:0=
 	embedded? ( virtual/mysql[embedded] )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r1.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r1.ebuild
new file mode 100644
index 000000000000..cf2f57bc40ae
--- /dev/null
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=CAPTTOFU
+DIST_VERSION=4.044
+inherit eutils perl-module
+
+DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="test +ssl"
+
+RDEPEND=">=dev-perl/DBI-1.609.0
+	dev-db/mysql-connector-c:=
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Data-Dumper
+	test? (
+		dev-perl/Test-Deep
+		>=virtual/perl-Test-Simple-0.900.0
+		virtual/perl-Time-HiRes
+	)
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-${DIST_VERSION}-amvis-type-conversions.patch"
+	"${FILESDIR}/${PN}-${DIST_VERSION}-no-dot-inc.patch"
+	"${FILESDIR}/4.041-mariadb-10.2.patch"
+)
+src_configure() {
+	if use test; then
+		myconf="${myconf} --testdb=test \
+			--testhost=localhost \
+			--testuser=test \
+			--testpassword=test"
+	fi
+	myconf="${myconf} --$(usex ssl ssl nossl)"
+	perl-module_src_configure
+}
+
+# Parallel testing is broken as 2 tests create the same table
+# and mysql isn't acid compliant and can't limit visibility of tables
+# to a transaction...
+DIST_TEST="do"
+
+src_test() {
+	einfo
+	einfo "If tests fail, you have to configure your MySQL instance to create"
+	einfo "and grant some privileges to the test user."
+	einfo "You can run the following commands at the MySQL prompt: "
+	einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';"
+	einfo "> CREATE DATABASE test;"
+	einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';"
+	einfo
+	sleep 5
+	perl_rm_files t/pod.t t/manifest.t
+	# Don't be a hero and try to do EXTENDED_TESTING=1 unless you can figure
+	# out why 60leaks.t fails
+	perl-module_src_test
+}
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild
new file mode 100644
index 000000000000..293180230eed
--- /dev/null
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=CAPTTOFU
+DIST_VERSION=4.044
+inherit eutils perl-module
+
+DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="mariadb +mysql test +ssl"
+REQUIRED_USE="^^ ( mysql mariadb )"
+
+RDEPEND=">=dev-perl/DBI-1.609.0
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:=[ssl(+)?] )
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Data-Dumper
+	test? (
+		dev-perl/Test-Deep
+		>=virtual/perl-Test-Simple-0.900.0
+		virtual/perl-Time-HiRes
+	)
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-${DIST_VERSION}-amvis-type-conversions.patch"
+	"${FILESDIR}/${PN}-${DIST_VERSION}-no-dot-inc.patch"
+	"${FILESDIR}/4.041-mariadb-10.2.patch"
+)
+src_configure() {
+	local impl
+	impl=$(usex mariadb mariadb mysql)
+	if use test; then
+		myconf="${myconf} --testdb=test \
+			--testhost=localhost \
+			--testuser=test \
+			--testpassword=test"
+	fi
+	myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX%/}/usr/bin/${impl}_config"
+	perl-module_src_configure
+}
+
+# Parallel testing is broken as 2 tests create the same table
+# and mysql isn't acid compliant and can't limit visibility of tables
+# to a transaction...
+DIST_TEST="do"
+
+src_test() {
+	einfo
+	einfo "If tests fail, you have to configure your MySQL instance to create"
+	einfo "and grant some privileges to the test user."
+	einfo "You can run the following commands at the MySQL prompt: "
+	einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';"
+	einfo "> CREATE DATABASE test;"
+	einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';"
+	einfo
+	sleep 5
+	perl_rm_files t/pod.t t/manifest.t
+	# Don't be a hero and try to do EXTENDED_TESTING=1 unless you can figure
+	# out why 60leaks.t fails
+	perl-module_src_test
+}
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.44.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.44.0.ebuild
deleted file mode 100644
index c16de73988fc..000000000000
--- a/dev-perl/DBD-mysql/DBD-mysql-4.44.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CAPTTOFU
-DIST_VERSION=4.044
-inherit eutils perl-module
-
-DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="test +ssl"
-
-RDEPEND=">=dev-perl/DBI-1.609.0
-	virtual/libmysqlclient:=
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	virtual/perl-Data-Dumper
-	test? (
-		dev-perl/Test-Deep
-		>=virtual/perl-Test-Simple-0.900.0
-		virtual/perl-Time-HiRes
-	)
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-${DIST_VERSION}-amvis-type-conversions.patch"
-	"${FILESDIR}/${PN}-${DIST_VERSION}-no-dot-inc.patch"
-	"${FILESDIR}/4.041-mariadb-10.2.patch"
-)
-src_configure() {
-	if use test; then
-		myconf="${myconf} --testdb=test \
-			--testhost=localhost \
-			--testuser=test \
-			--testpassword=test"
-	fi
-	myconf="${myconf} --$(usex ssl ssl nossl)"
-	perl-module_src_configure
-}
-
-# Parallel testing is broken as 2 tests create the same table
-# and mysql isn't acid compliant and can't limit visibility of tables
-# to a transaction...
-DIST_TEST="do"
-
-src_test() {
-	einfo
-	einfo "If tests fail, you have to configure your MySQL instance to create"
-	einfo "and grant some privileges to the test user."
-	einfo "You can run the following commands at the MySQL prompt: "
-	einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';"
-	einfo "> CREATE DATABASE test;"
-	einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';"
-	einfo
-	sleep 5
-	perl_rm_files t/pod.t t/manifest.t
-	# Don't be a hero and try to do EXTENDED_TESTING=1 unless you can figure
-	# out why 60leaks.t fails
-	perl-module_src_test
-}
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
new file mode 100644
index 000000000000..4f268c86e07d
--- /dev/null
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DVEEDEN
+DIST_VERSION=4.050
+inherit eutils perl-module
+
+DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="mariadb +mysql test +ssl"
+REQUIRED_USE="^^ ( mysql mariadb )"
+
+RDEPEND=">=dev-perl/DBI-1.609.0
+	>=dev-perl/Devel-CheckLib-1.109.0
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:=[ssl(+)?] )
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Data-Dumper
+	test? (
+		dev-perl/Test-Deep
+		>=virtual/perl-Test-Simple-0.900.0
+		virtual/perl-Time-HiRes
+	)
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-${DIST_VERSION}-no-dot-inc.patch"
+	"${FILESDIR}/${PN}-${DIST_VERSION}-fix-float-type-conversion.patch"
+	"${FILESDIR}/${PN}-${DIST_VERSION}-fix-for-MariaDB-10.3.13-with-zerofil.patch"
+)
+
+src_configure() {
+	local impl
+	impl=$(usex mariadb mariadb mysql)
+	if use test; then
+		myconf="${myconf} --testdb=test \
+			--testhost=localhost \
+			--testuser=test \
+			--testpassword=test"
+	fi
+	myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX%/}/usr/bin/${impl}_config"
+	perl-module_src_configure
+}
+
+# Parallel testing is broken as 2 tests create the same table
+# and mysql isn't acid compliant and can't limit visibility of tables
+# to a transaction...
+DIST_TEST="do"
+
+src_test() {
+	einfo
+	einfo "If tests fail, you have to configure your MySQL instance to create"
+	einfo "and grant some privileges to the test user."
+	einfo "You can run the following commands at the MySQL prompt: "
+	einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';"
+	einfo "> CREATE DATABASE test;"
+	einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';"
+	einfo
+	sleep 5
+	perl_rm_files t/pod.t t/manifest.t
+	# Don't be a hero and try to do EXTENDED_TESTING=1 unless you can figure
+	# out why 60leaks.t fails
+	perl-module_src_test
+}
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index 4a868aee4b4d..16af43cc299f 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -4,16 +4,22 @@ AUX 4.041-no-dot-inc.patch 3470 BLAKE2B 2c8bfe5461699a1d167f9c1ecd77631293685f02
 AUX 4.042-no-dot-inc.patch 5717 BLAKE2B fd0835e7e6446e135035489d02ae520bfb21e8590daab905bd8433c584ad35135d77fb55a8a37aa720abfb830158f0980e49bf5a4d54b96c28d279a15b99927b SHA512 8b8707cffc9ff711ea0effe9c2eb0ef56fd4b97729e76f3bffe52e780764a4f0d812e1ec00249752363475650dc803b2311c82cc645016d0449be296b8b1bf0b
 AUX DBD-mysql-4.044-amvis-type-conversions.patch 1739 BLAKE2B 25fcf1c74798a2c0aaaeae3788e69e9735533ffeb6ed3455eecc0e3500d961522081745e3e0d6a99bcbe28996555ca0caf935628688446d4ab2e896c5ee92f3f SHA512 3335e80f756b75299dd8f398a6e6f2aa3902ad581f6c46e8a1e5d032b10c586b5b3ad4a237ccd7dae48b2039a72eb3de537dcab193aba294114392ba32c42c29
 AUX DBD-mysql-4.044-no-dot-inc.patch 4927 BLAKE2B dd952d2dac0de6c9d428832083034041058c019d16f29df2e06f107181cc10a1924c1ff954e33d2269cc6d1d6e0b379b3887ad75bc1542afd6dc6714b9876dc0 SHA512 faf3f4fbe551b8dfe65e747dc78f6136c059934c145ffbd5b83781eec044f8d764f1b02cf5f11af542476853c887fa98b09c6b939740e934c57db235b0668a67
+AUX DBD-mysql-4.050-fix-float-type-conversion.patch 1627 BLAKE2B 466df4b1cb2419a30d58e7e2305f6370cf6279c77d6f0cf16e9b637136e45406f671bc1061d8e47bf3dba7e1156ea28f7ace2c9c04cfdf2afe752d9d50532f54 SHA512 94074573635f457deaace20c0166710f2ff2aed664eb4e49d57aea0de6cc9d933263cb8842cea1ff13e8907ff7e5c89b4a73dee8da9a56875798eb87d4dbad02
+AUX DBD-mysql-4.050-fix-for-MariaDB-10.3.13-with-zerofil.patch 1217 BLAKE2B 928c53b8daabe7f750522ead8a79971662c8f7b1fc076a0a8d626b4e93536f08664420c9486c05fa4944a19e90b7389b65dc590cfe0b5f5149e01d802e0f3e9a SHA512 79c9c289665a5e28dab4f0b74f2c7cb5895109edbf2f2074f9d6116b6d57dee4ade7586309739356ab318005748194b30e352fb20f1f5341ffb077085b529c07
+AUX DBD-mysql-4.050-no-dot-inc.patch 5470 BLAKE2B 09a9b2a3fe033c6ae68b949dfacf08dbc1fa6cce13369a982ad99ee0226dc2b84a8ba1f8f7384325eb5d51b663d11b6163694a19ec343bd16c2a12f74c83bab8 SHA512 795bb73dda37311b4df06ddb541c39cd924f59453d0618c5cae53ccfb698556bc0bea97a0c644546cb6285092fdf71ef04cccf8d4efa47d71a9f64eeb5c02e3f
 AUX DBD-mysql-print_embedded_options.patch 616 BLAKE2B bb8a5512e12e9a2bfe942df81689dfbc9551d94c9354830f49cf905b858a61c3a9f747c56dbb87677f86034b6747168881a09d71980d9633c345545b65cc0d37 SHA512 da7bbc1b65e58128af4c19673827c342de94e811b6ab20ff6844646eb7d6afdff79b61aaa6033ae2ac3d8dce8140f78505961e3da49306b5034a6c3eb5ba8157
 DIST DBD-mysql-4.032.tar.gz 146476 BLAKE2B 3ace983522e273cdb18352d2fa87702222594daed6e8d1eda2b037e5b98c31fd2e81bfa57ec71d6f5d836de80cdaf06a3571ae7c84d1ff4822ed6ab4f5d9e8fe SHA512 7e7ebaed07f0540079854294cc3ab4a4554fd0f850dd0927b2485cc985c2c9f5b70a650d971027c883cc4d8450020245656f6ff1f792a56d1a2d4b45402d73d0
 DIST DBD-mysql-4.037.tar.gz 146639 BLAKE2B fbecca7302cd6ea0386116a1824a7696f87f681dbfcd88970b1a5eab54639e46471fc07b37bd8c0158b3eca02d05dad159e11027daa5ab46eaa307b530f7c58e SHA512 3bda6ea18d29e32028b7eb93cd06fdbabbadafa66f982556298a68980c42a7b5236872113696e6d2df66a345049d1e63bc90ab358c8631f0cbea187780e514af
 DIST DBD-mysql-4.041.tar.gz 150508 BLAKE2B 900ccc4ad9bc5bfb236c66774a6c9529beed3568c3f3626afcbb572fa530a2488ee8e05b1dabd169a775f28d634321dd3e86923e2829e019943a9f3054b1e887 SHA512 8663c58f1dec273869ef5d3ee663d80cb36fa87b1956318fff07a4a801aaecc395510a8f31b7a51b823f7e9d6a73ebf13894c1b7f7b27fdc3f3956e6aba34777
 DIST DBD-mysql-4.042.tar.gz 160028 BLAKE2B ef2f9d6508a473c34275ae9d7233863698ab502d837975f08593d2d1ca9761081ffb84bafc5a02c572e2a6b4d54dd7c8312e476e0719733166f8edc030a016de SHA512 fe3c9e1e325f7056da783e0ea33f9a7810f25f3d9cd2c9a4bf4037b20a2148f2291b2f90d44730e63c7902b45e26993a7f9fcf1b3bf8d1bc5d3fca99893a019e
 DIST DBD-mysql-4.044.tar.gz 155006 BLAKE2B 2934224010bb09aaff9a334b25038a4c7d1eb5552f6ad2b73f44aa7e2d8cb3684644773a89f35363c156cf40867a28943320e1b8b7ef4b9d4b8ac0f6b2417b38 SHA512 e3dd9482e8f78c19dc91baba07e39e266f113ce5a014cfe6c5989c96ed0f85723a17ba6a6e00b65a1ed3c62362400bd3779eb63ed282f73587b4757da249af02
-EBUILD DBD-mysql-4.32.0-r2.ebuild 1319 BLAKE2B fca837574ca5840669f9d076dddbe0b5293dfb9df05aeb381cd2768de761b1cba5cc3c4f74d248718fe3752453935071653069f9632be06b33f852471d0eb9ca SHA512 e654b62fefeb79914ba77691a9b28777c594fc69f8ff91f77d190f831a79a7b5bd7caaf62d6cc9d6cc3d48a9ae43b96815d3bf87aa62cf9a1a2b3ef6189db776
-EBUILD DBD-mysql-4.37.0.ebuild 1973 BLAKE2B 072f8acba91a0512ed7b4f9ecd8c1dc71d14fac7d0b868aca54fcba46f38624456beb1336fe74846feff6d961aad3a4992511cb310211e7f113e95000063de2f SHA512 1b6e44cfff11f8f28e29721fd0c47b3b2b1c6a5bd638a9b219e94dd76ae23814bf86116006b1bebae49266e255cfe9b529b79e54076664a502013a6d057f1696
-EBUILD DBD-mysql-4.41.0-r2.ebuild 2093 BLAKE2B 046ff0c8ddec85d2fab3b7ec4d7018c46609b54263846d81b513a770327315ca3bbcc34f2d09308610028cfd3cad85fcf9ea4d92b251cc4576add96bf475e742 SHA512 72f9938a6e98a0a1631eb75d97af59c0ddcb8b7e5436572ab3049967452aac9d6d0339fb7c07e2e7fea58038c2d14f7cd5635767baa43967b480e3e3189fbdbe
-EBUILD DBD-mysql-4.41.0.ebuild 1966 BLAKE2B 3bd3a45c3dec31844ade8b79edb2089dc20a627b0c8797947c0e0e0ea7780a47a8a60582d57361a0f3bfa833dc65f4686f61cd33c04f591b1b562ecf8e091b60 SHA512 88e2669b1feb2b6bdeec630a9fa2fc4dfd62b907d0af3ac0b97a90608a4113593f704ce92d14fd542c8b9760d3a4a345dfdec251359d30075da1a500526182e0
-EBUILD DBD-mysql-4.42.0.ebuild 1977 BLAKE2B f7e71ad84f2f9889e4b933b1bd9b1f41a01956ac112aff4184610193b3f413d5905e16ac32aed958739457c9b2dbd1ceec46fb1fa3cb56571d317ffbf75ffceb SHA512 ee15ba80bc64c0073a81f9883ceb0366e21aed63d3543eb75427166f01ffe0125087d4ea0aa196eed1c5c8596581664038bc9f41c2486c2ea5b8c4f68cf9c201
-EBUILD DBD-mysql-4.44.0.ebuild 1816 BLAKE2B 0e760711ab58511a5560754355b7620decb65c727f2ede925fb6674757fe72139b7ee8b9c2e2ed5252ff8d4d6f3bcd2264c12c260b8ea608aa7d8e0abf2b1ee7 SHA512 d3f12d6abf01882e750f8c62dee653d302417eaf54ae261912525efc26cb48bea5c990d803daad5e82f3b364d8c1163ddf4d3af5ec9c336e50931c906ae69143
-MISC metadata.xml 876 BLAKE2B 72a484b9d7cef869858a3ac26315ca83317344de66a903072a93af8b80bdcd310d3a59084140181faaca40c1bf640e7b1f6baf9939254624acc166906f4da476 SHA512 05226b4f30741e8d77f5174491aee480a958e3cdf9b9484ff261b975805b82eee9ff865df97891c6107307c5cc19994764110f5461c3e80c9d8828b34e076968
+DIST DBD-mysql-4.050.tar.gz 161579 BLAKE2B fb17e151db730fd6955d3e4424dd495a9fcf5f3f4e2b6b79d9fdc86bc42c3314b68771f1d3c393fd80ea14aeda626a5c5d21f5b921d487350ffd79802edab1f6 SHA512 910f5b4ba7a7890d50a79f37d04ec8971a4f62acd0fe30bf3ab634f66e3128f0cd6513e5c9da8c807a0f4477d0cc766682ea8dd0d8072d02821b78df51f37879
+EBUILD DBD-mysql-4.32.0-r2.ebuild 1324 BLAKE2B cec1419b3a43f8b7ae74d469c625b3087db9b8fce775d7f14894278999d4c5de04f4bcef8e8efe7815fd1fecc53c006624338e2087e5900d2b3ee210256a46f2 SHA512 2c275cad5cfb65ae191dcd9d55b0028a01f992f59f8032af310ee95f2dc1c82f4baf061882da4cfb393ec1a70d2712bc6134038399f98a16c4630c6644ea7e48
+EBUILD DBD-mysql-4.37.0.ebuild 1978 BLAKE2B 04bbf80534d970479904ab6420ca62de33057287d1963744da60b6a1e37e5629c0781299ddbf5a03dd814bf860e4eed69ed027e6ca4074b271ece86b5390b43b SHA512 1ce03d40ba2e2fd337fed22acfba90eb63c7ebe51767111741479a62b75ad75d0bbb9210fa2d09785e0acec1ad928764e8da9e7136a7978ffdb7c636aa0e334f
+EBUILD DBD-mysql-4.41.0-r2.ebuild 2098 BLAKE2B 53a599317d0ab61d464baea4cc1654c05d9db20ae07e03cc79a2712cde47f036cfc58a992e5e0787394e990de57d379c07c1b026f8d6f096b231c33dadbd2b95 SHA512 d4297d129899f4d7ebb394fcde4ce70d34baf6b0776f59060a44934c62b37f65522136eabc5f40dc0d897f85261f9a153d36917d646ffd80a035c4d84ef5c1ee
+EBUILD DBD-mysql-4.41.0.ebuild 1971 BLAKE2B ebc0b79360c9c72d36259d5ed62d58d43eba351240936274c98ae3edc6005878ad9d2c5c338747f19b69f2dab0f78cd5dcfd3cfb1e7466d8f2dd3f75a7bf052f SHA512 3f5bef12bfe6aca7c679a1f28c43d08939cf5c5556eb06c15412ff9a7f5126bc9c70bd3b4a42ac3a364cd1902fb2c36be8ecc4a0d1c5383e9a056bac6db57d12
+EBUILD DBD-mysql-4.42.0.ebuild 1982 BLAKE2B 5d09e6d00b630450cd57905ce3d69c42455f54c4b6c4fe39a08d3d5b7f81d05c1ba7e79ac0c2854fe0c33f6c2e047a239e0f9692e66fff24ad61e43f3f8dc1a0 SHA512 dd75f1842a96bbfe55a92c7a992a1c4a6f49ae0830bb3a4bfe86927dcf4ee3eeabe491524ebc9215736fea1a9afcc22bf8023b2aba9502325e2794302dcb4555
+EBUILD DBD-mysql-4.44.0-r1.ebuild 1818 BLAKE2B 682fab6d4e3c8a8be72f581004e1c10b2b94e6ffdf2edd6ad2acb994ddbb4866756d7b62e43e0e7d76acb7fd0e15494a2dcd93b21ecf6cfbf6750a74b344fd94 SHA512 5bfba8b6bab4178d17128b46c370cfd21eadb3c927fbd7378525fb4b8edc8d45193f962e9148b44212b05677e3d881cf14a4859d9aa348d9f77b273b464dbcf4
+EBUILD DBD-mysql-4.44.0-r2.ebuild 1911 BLAKE2B df1e78a6612c68f0acbd613728da43ba57ba0bef85ed9a68124aa5737c5874f70b50bb73a49738b87f0f77517530a5c9f1553b2c1a4f70b6bfb19e967e5aa8a1 SHA512 9a3182ec5b6c63958cf259bff377c0da351e5094c0b37a87bc651f5197448e60ce87f3d8c0d722f66f634a83033a3b4a6c598161c93f7dab69e4f8104110b1e4
+EBUILD DBD-mysql-4.50.0.ebuild 1989 BLAKE2B 1f73f7acabd173c3426a90bf0e25560922e795a78959c26cf7a1d5499126677a13748181ed673d685c5f9334951e8081d32e6592e78f348d802a0124110e53de SHA512 27f922f66cfe2f20aed1469c06542eb5e95cb5aaea8bbe1b0a0f63a4f95d3a925a34595b14c8b3d24d7c8080e7386dea62d66c9bebf248fdad2eddbfb39b8651
+MISC metadata.xml 1064 BLAKE2B 8261e56b30f64e3a488bb12936cf3cfa9ad1886dc0c30f7435e7bde6d013d95f51beef3033570e555284741a109a33973e91cde5c7fdc8124628c4675fe1092d SHA512 a743576b3d3f6de5ca4408c83776d7f711af5c221a93a55ee828df7a5b573de5658c140a608115bcf951752b0a443547e517bb2f4238f43abb304757905e36df
diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-4.050-fix-float-type-conversion.patch b/dev-perl/DBD-mysql/files/DBD-mysql-4.050-fix-float-type-conversion.patch
new file mode 100644
index 000000000000..cda1cabdc24d
--- /dev/null
+++ b/dev-perl/DBD-mysql/files/DBD-mysql-4.050-fix-float-type-conversion.patch
@@ -0,0 +1,48 @@
+From: Pali <pali@cpan.org>
+Date: Fri, 24 Feb 2017 19:51:36 +0100
+Subject: [PATCH] Fix type conversions
+ Calling SvNV() for magical scalar is not enough for float type conversion.
+ It caused problem for Amavis in tainted mode -- all float values were zero.
+ On the other hand SvIV() and SvUV() seems to work fine. To be sure that
+ correct value of float is in scalar use sv_setnv() with explicit NV float
+ value. Similar code is changed also for integers IV/UV.
+ .
+ This patch should fix reported Amavis bug:
+ https://github.com/perl5-dbi/DBD-mysql/issues/78
+ .
+ See also reported perl bug about SvNV():
+ https://rt.perl.org/Public/Bug/Display.html?id=130801
+Bugs: https://github.com/perl5-dbi/DBD-mysql/issues/78
+Bugs-Debian: https://bugs.debian.org/856064
+Last-Update: 2019-01-09
+Reviewed-By: Xavier Guimard <x.guimard@free.fr>,
+ gregor herrmann <gregoa@debian.org>
+
+--- a/dbdimp.c
++++ b/dbdimp.c
+@@ -4447,8 +4447,7 @@
+           if (!(fields[i].flags & ZEROFILL_FLAG))
+           {
+             /* Coerce to double and set scalar as NV */
+-            (void) SvNV(sv);
+-            SvNOK_only(sv);
++            sv_setnv(sv, SvNV(sv));
+           }
+           break;
+ 
+@@ -4459,13 +4458,11 @@
+             /* Coerce to integer and set scalar as UV resp. IV */
+             if (fields[i].flags & UNSIGNED_FLAG)
+             {
+-              (void) SvUV(sv);
+-              SvIOK_only_UV(sv);
++              sv_setuv(sv, SvUV(sv));
+             }
+             else
+             {
+-              (void) SvIV(sv);
+-              SvIOK_only(sv);
++              sv_setiv(sv, SvIV(sv));
+             }
+           }
+           break;
diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-4.050-fix-for-MariaDB-10.3.13-with-zerofil.patch b/dev-perl/DBD-mysql/files/DBD-mysql-4.050-fix-for-MariaDB-10.3.13-with-zerofil.patch
new file mode 100644
index 000000000000..f3d5e5bf4cbc
--- /dev/null
+++ b/dev-perl/DBD-mysql/files/DBD-mysql-4.050-fix-for-MariaDB-10.3.13-with-zerofil.patch
@@ -0,0 +1,36 @@
+From 8b5ba5f9c8d239328ecbc862aba203d44819e2f5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= <git@myname.nl>
+Date: Tue, 5 Mar 2019 16:24:17 +0100
+Subject: [PATCH] Fix for MariaDB 10.3.13 with zerofil
+
+Issue: #304
+
+Bug: https://github.com/perl5-dbi/DBD-mysql/issues/304
+Bug-Debian: https://bugs.debian.org/923541
+
+---
+ dbdimp.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/dbdimp.c b/dbdimp.c
+index a9c37cf..82c96d2 100644
+--- a/dbdimp.c
++++ b/dbdimp.c
+@@ -4055,9 +4055,13 @@ int dbd_describe(SV* sth, imp_sth_t* imp_sth)
+         break;
+ 
+       default:
+-#if MYSQL_VERSION_ID > 100300
++#if (MYSQL_VERSION_ID > 100300) && (MYSQL_VERSION_ID < 100313)
+         // https://jira.mariadb.org/browse/MDEV-18143
+         buffer->buffer_length= fields[i].max_length ? fields[i].max_length : 2;
++#elif MYSQL_VERSION_ID > 100312
++        // https://jira.mariadb.org/browse/MDEV-18823
++        buffer->buffer_length= fields[i].max_length ? fields[i].max_length + 1 : 2;
++        buffer->buffer_length= fields[i].length > fields[i].max_length ? fields[i].length + 1 : 2;
+ #else
+         buffer->buffer_length= fields[i].max_length ? fields[i].max_length : 1;
+ #endif
+-- 
+2.20.1
+
diff --git a/dev-perl/DBD-mysql/files/DBD-mysql-4.050-no-dot-inc.patch b/dev-perl/DBD-mysql/files/DBD-mysql-4.050-no-dot-inc.patch
new file mode 100644
index 000000000000..d5a0fe0b5249
--- /dev/null
+++ b/dev-perl/DBD-mysql/files/DBD-mysql-4.050-no-dot-inc.patch
@@ -0,0 +1,166 @@
+From 4e5417cbdd97bfc6dd53130de69f9173af59c273 Mon Sep 17 00:00:00 2001
+From: Pali <pali@cpan.org>
+Date: Mon, 17 Apr 2017 21:38:58 +0200
+Subject: Fix tests on Perl On 5.25.10 or greater with
+ -Ddefault_inc_excludes_dot
+
+Some tests do not include dot in %INC and fails with error:
+Can't locate t/lib.pl in @INC
+
+Fixes: https://rt.cpan.org/Public/Bug/Display.html?id=120709
+---
+ t/40server_prepare_crash.t             | 3 ++-
+ t/lib.pl                               | 5 +++--
+ t/rt110983-valid-mysqlfd.t             | 3 ++-
+ t/rt118977-zerofill.t                  | 2 +-
+ t/rt25389-bin-case.t                   | 3 ++-
+ t/rt50304-column_info_parentheses.t    | 3 ++-
+ t/rt61849-bind-param-buffer-overflow.t | 3 ++-
+ t/rt75353-innodb-lock-timeout.t        | 3 ++-
+ t/rt83494-quotes-comments.t            | 3 ++-
+ 9 files changed, 18 insertions(+), 10 deletions(-)
+
+diff --git a/t/40server_prepare_crash.t b/t/40server_prepare_crash.t
+index 103276d..80bc9b7 100644
+--- a/t/40server_prepare_crash.t
++++ b/t/40server_prepare_crash.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+ 
+ my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { PrintError => 1, RaiseError => 1, AutoCommit => 0, mysql_server_prepare => 1, mysql_server_prepare_disable_fallback => 1 }) };
+ plan skip_all => "no database connection" if $@ or not $dbh;
+diff --git a/t/lib.pl b/t/lib.pl
+index 2221c40..0c756a0 100644
+--- a/t/lib.pl
++++ b/t/lib.pl
+@@ -2,6 +2,7 @@ use strict;
+ use warnings;
+ 
+ use Test::More;
++use File::Spec ();
+ use DBI::Const::GetInfoType;
+ use vars qw($mdriver $dbdriver $childPid $test_dsn $test_user $test_password);
+ 
+@@ -31,7 +32,7 @@ if (-f ($file = "t/$dbdriver.dbtest")  ||
+     -f ($file = "$dbdriver.dbtest")    ||
+     -f ($file = "../tests/$dbdriver.dbtest")  ||
+     -f ($file = "tests/$dbdriver.dbtest")) {
+-    eval { require $file; };
++    eval { require File::Spec->rel2abs($file); };
+     if ($@) {
+ 	print STDERR "Cannot execute $file: $@.\n";
+ 	print "1..0\n";
+@@ -45,7 +46,7 @@ if (-f ($file = "t/$mdriver.mtest")  ||
+     -f ($file = "$mdriver.mtest")    ||
+     -f ($file = "../tests/$mdriver.mtest")  ||
+     -f ($file = "tests/$mdriver.mtest")) {
+-    eval { require $file; };
++    eval { require File::Spec->rel2abs($file); };
+     if ($@) {
+ 	print STDERR "Cannot execute $file: $@.\n";
+ 	print "1..0\n";
+diff --git a/t/rt110983-valid-mysqlfd.t b/t/rt110983-valid-mysqlfd.t
+index c5af2fa..a6ec8fb 100644
+--- a/t/rt110983-valid-mysqlfd.t
++++ b/t/rt110983-valid-mysqlfd.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+ 
+ my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, AutoCommit => 0 }) };
+ plan skip_all => "no database connection" if $@ or not $dbh;
+diff --git a/t/rt118977-zerofill.t b/t/rt118977-zerofill.t
+index 27ba1b7..86edb8e 100644
+--- a/t/rt118977-zerofill.t
++++ b/t/rt118977-zerofill.t
+@@ -5,7 +5,7 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++require "./t/lib.pl";
+ 
+ my $dbh = eval { DBI->connect($test_dsn, $test_user, $test_password, { PrintError => 1, RaiseError => 1 }) };
+ plan skip_all => "no database connection" if $@ or not $dbh;
+diff --git a/t/rt25389-bin-case.t b/t/rt25389-bin-case.t
+index 37bffb9..9d091b3 100644
+--- a/t/rt25389-bin-case.t
++++ b/t/rt25389-bin-case.t
+@@ -4,7 +4,8 @@ use warnings;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+ 
+ use Test::More;
+ 
+diff --git a/t/rt50304-column_info_parentheses.t b/t/rt50304-column_info_parentheses.t
+index 28b2128..e03e332 100644
+--- a/t/rt50304-column_info_parentheses.t
++++ b/t/rt50304-column_info_parentheses.t
+@@ -4,7 +4,8 @@ use warnings;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password $state);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+ 
+ use Test::More;
+ 
+diff --git a/t/rt61849-bind-param-buffer-overflow.t b/t/rt61849-bind-param-buffer-overflow.t
+index f1fb254..a457d57 100644
+--- a/t/rt61849-bind-param-buffer-overflow.t
++++ b/t/rt61849-bind-param-buffer-overflow.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+ 
+ my $INSECURE_VALUE_FROM_USER = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+ 
+diff --git a/t/rt75353-innodb-lock-timeout.t b/t/rt75353-innodb-lock-timeout.t
+index 9c97d60..35fa5a7 100644
+--- a/t/rt75353-innodb-lock-timeout.t
++++ b/t/rt75353-innodb-lock-timeout.t
+@@ -5,7 +5,8 @@ use Test::More;
+ use DBI;
+ 
+ use vars qw($test_dsn $test_user $test_password);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+ 
+ my $dbh1 = eval { DBI->connect($test_dsn, $test_user, $test_password, { RaiseError => 1, AutoCommit => 0 }) };
+ plan skip_all => "no database connection" if $@ or not $dbh1;
+diff --git a/t/rt83494-quotes-comments.t b/t/rt83494-quotes-comments.t
+index 9df0d90..c42afe4 100644
+--- a/t/rt83494-quotes-comments.t
++++ b/t/rt83494-quotes-comments.t
+@@ -9,7 +9,8 @@ use DBI;
+ use Test::More;
+ 
+ use vars qw($test_dsn $test_user $test_password $state);
+-require "t/lib.pl";
++use lib 't', '.';
++require "lib.pl";
+ 
+ my $dbh;
+ eval {$dbh= DBI->connect($test_dsn, $test_user, $test_password,
+-- 
+2.23.0
+
diff --git a/dev-perl/DBD-mysql/metadata.xml b/dev-perl/DBD-mysql/metadata.xml
index 8b79ff55907b..59ac82b1e1b2 100644
--- a/dev-perl/DBD-mysql/metadata.xml
+++ b/dev-perl/DBD-mysql/metadata.xml
@@ -17,5 +17,7 @@
   <use>
     <flag name="embedded">Support embedded server (libmysqld)</flag>
     <flag name="ssl">Compile in support for SSL connections via libmysqlclient</flag>
+    <flag name="mariadb">Use <pkg>dev-db/mariadb-connector-c</pkg> as the client library</flag>
+    <flag name="mysql">Use <pkg>dev-db/mysql-connector-c</pkg> as the client library</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-perl/File-Slurp-Unicode/File-Slurp-Unicode-0.7.1-r1.ebuild b/dev-perl/File-Slurp-Unicode/File-Slurp-Unicode-0.7.1-r1.ebuild
deleted file mode 100644
index 7ddc44736c4c..000000000000
--- a/dev-perl/File-Slurp-Unicode/File-Slurp-Unicode-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DAVID
-MODULE_VERSION=0.7.1
-inherit perl-module
-
-DESCRIPTION="Reading/Writing of Complete Files with Character Encoding Support"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-perl/File-Slurp
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-"
-
-SRC_TEST=do
diff --git a/dev-perl/File-Slurp-Unicode/Manifest b/dev-perl/File-Slurp-Unicode/Manifest
deleted file mode 100644
index af330713d4eb..000000000000
--- a/dev-perl/File-Slurp-Unicode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST File-Slurp-Unicode-0.7.1.tar.gz 3609 BLAKE2B 49d3e5036bcc32f97ea95232d536d4fd5e96d87f4b5d3c1e8633242870c2fc3041154cb2da594cc51e710cdf451663311df8194b08adedd8ab57228a63bd4a3a SHA512 a7d1a63afc9e794d0b61140738aca015040942da07f44092ab799f09f05e42093ef85f0b139b7306d54f8217c1030e87f17724d0ef398122ab2a5b096061a204
-EBUILD File-Slurp-Unicode-0.7.1-r1.ebuild 394 BLAKE2B 389b85d21b47a56e12f5f74c6fd9fabeec2fc4b8d6b715109dab2a154789a10500316cad7d7f8ba0370118c16940f96b5722c5f5b335f6b2d34a5462c700c1cb SHA512 9b94219fcd6ca7d2fc65e73e627dd3e919386c55ab1af803248ce912c366d9eb8d724017843e2bc82d197d438b1d74f8d97248cce524c8bd055d74dfb1492f0d
-MISC metadata.xml 409 BLAKE2B 587a68be2a0d98c79d642701f7b4c85c4ab781082aa3c9c90f301ee66d18c2d65c2e619413958ab740d984def1cc38289328d4ecc7ed56821df9107d3ec446cc SHA512 06c378bb742dace3f8160715a24c73d6f34c4861269a5c8e5c882b908123bb0cf16e0ad80e38a00bfbd9cc2d29a7fddf09dbfe704aa73c6e146e33a8cb90557e
diff --git a/dev-perl/File-Slurp-Unicode/metadata.xml b/dev-perl/File-Slurp-Unicode/metadata.xml
deleted file mode 100644
index 2053263cda78..000000000000
--- a/dev-perl/File-Slurp-Unicode/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">File-Slurp-Unicode</remote-id>
-    <remote-id type="cpan-module">File::Slurp::Unicode</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 2e74ddeecbd8..9afa3771d349 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Net-Pcap/Manifest b/dev-perl/Net-Pcap/Manifest
index d5177affabf4..eb0770a6ee60 100644
--- a/dev-perl/Net-Pcap/Manifest
+++ b/dev-perl/Net-Pcap/Manifest
@@ -1,6 +1,8 @@
+AUX Net-Pcap-0.18-libpcap-1.9.0.patch 1300 BLAKE2B 65cd73c1f6f3b097dd8fa2b86c409e3ffb914c69945cb7535bb09a62c34c11423d7557e00515fc472a197182842399fb798dffd7b3e8eab0690fb3913f138fea SHA512 aef7911bff9284a45c2d6943f3970892750548e1bcb3f5521123dadb5addd408cd976b7274fa0ade27107cd2d993a7709c918afc32ca3541108722d95e6ec2af
 AUX Net-Pcap-0.18-test-error.patch 1302 BLAKE2B 5b61333702676ace4b987fea8b3df9fc0177ba41785b5471a170d3826c29175d39ef8b827ea40842598c4847e4aada61e2a86849bceafb2343e219694155358a SHA512 82fa8950ceb84966905646a1a210bfef23c8c3be8ef66b2db3702b3ccc66329c7148e3d74931f5e9bd1a73a312a16e7c10ce0232f344e4fb97e938b196c3daf9
 DIST Net-Pcap-0.17.tar.gz 92853 BLAKE2B 147f0a11be36e7b5022f138611ad4226ea36d61902e966ab3400463aed4aecfd0022852df2589f363a6590270750b427cac9532f22a42e18d0f959a23e990ff1 SHA512 14747661b220b119b4182f13dbc1509cae5665e77588dbc8576f7d959f33ef6ee3785f2d9022093c1f1b808c37d04ee313f5ac39cc6eaa917962c9215c5a4de6
 DIST Net-Pcap-0.18.tar.gz 94207 BLAKE2B 257e2b7c5bf6ad05936b64171db3ee530249f40d695ca2aba21d4bfe4796989e3a4aa955472b9c39e33aab5d67d2eebb26b43e173dbd359d01201926fa3a6b6e SHA512 63cc216345eb65b1e76efa657623c9d444d20f4b54ab0c75e787483baaa4f1de7e3a9294967aa7eccbdca04c60b089194dd7e0d19838f899b332c5881a8c7f6d
 EBUILD Net-Pcap-0.170.0-r1.ebuild 365 BLAKE2B 1625009c2c60fb1604a9a77b33db157168a09d1ca1eb77349914bd2b61704bffc4eda67a0c800863611149069d4535ac64881b70c3761bba8d58e64a5545f063 SHA512 47b31e2429240d1f6234d4d618a4ea263fd097a4511d755507657db8d3605b2e33bef1bdac00c6fafa8702749f99a402a65007a2b33e46512d4913c2ddb3593a
+EBUILD Net-Pcap-0.180.0-r1.ebuild 819 BLAKE2B f08f5e83912ac676fb0f5211b637e0b1050cf189acd3a5aa68c1f1fd41467f73aa438df1237db4026eb19df2f2b471cb722ecf91f1b8afb0c207877372ad7fae SHA512 31c4fd8f83a07e39096cab8c4f1238145fc6b8c476273a034b0836cf6ba7476a6c5a4b0b490b0b6cfde1660a0ed31325f22531bef2211925e4de6536427953d9
 EBUILD Net-Pcap-0.180.0.ebuild 769 BLAKE2B 95e06e37d326032faf0c292a550408eaa479fb588f4720b18aea8e55d9bfa77abb3ac374d26579f80b17c93bb864b99c0509eade8665b6983104586a2d877b6a SHA512 90178bdc959f961060b676f6423952301c11cdb9a4c8fd953fab0eafe683eb4e789914d1c149de2dcfbe4bd75f0ebb5a031d7821e8711de38d35bc100544860f
 MISC metadata.xml 388 BLAKE2B 559872c430ea234e8e0a8c495f74fe56526039a9e28dce6a252a05167901c27d6fafe8b90e9107d6d29892256e3a89012c918614032f302ea38fb4e098f54354 SHA512 6ae51c30128320478983e55d7e6e4a69c8c6c17ef926b97e466bc1ba1c7808c3728cf46743789467151ac76074fb852f8648a5c6e6cd02396bcc8c7c10f8f89c
diff --git a/dev-perl/Net-Pcap/Net-Pcap-0.180.0-r1.ebuild b/dev-perl/Net-Pcap/Net-Pcap-0.180.0-r1.ebuild
new file mode 100644
index 000000000000..e3b237b2e2b4
--- /dev/null
+++ b/dev-perl/Net-Pcap/Net-Pcap-0.180.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=SAPER
+DIST_VERSION=0.18
+DIST_EXAMPLES=( "eg/*" )
+inherit perl-module
+
+DESCRIPTION="Interface to the pcap(3) LBL packet capture library"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="net-libs/libpcap
+	dev-perl/IO-Interface"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-${DIST_VERSION}-libpcap-1.9.0.patch"
+	"${FILESDIR}/${PN}-${DIST_VERSION}-test-error.patch"
+)
+
+src_test() {
+	if [[ $EUID != 0 ]]; then
+		elog "Comprehensive testing of this module requires root permissions."
+		elog "For details, see:"
+		elog "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}"
+	fi
+	perl_rm_files t/pod{,cover,spell}.t t/distchk.t t/portfs.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Net-Pcap/files/Net-Pcap-0.18-libpcap-1.9.0.patch b/dev-perl/Net-Pcap/files/Net-Pcap-0.18-libpcap-1.9.0.patch
new file mode 100644
index 000000000000..2495600e5d0a
--- /dev/null
+++ b/dev-perl/Net-Pcap/files/Net-Pcap-0.18-libpcap-1.9.0.patch
@@ -0,0 +1,41 @@
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -106,7 +106,7 @@ REASON
+ # We also store the list of available functions in a file for skipping the 
+ # corresponding tests. 
+ my @funcs = have_functions(find_functions());
+-$options{DEFINE} .= cpp_defines(@funcs);
++$options{DEFINE} .= cpp_defines(@funcs). "-DHAVE_PCAP_SETSAMPLING";
+ open(FUNCS, '>funcs.txt') or warn "warning: can't write 'funcs.txt': $!\n";
+ print FUNCS join("\n", @funcs), "\n";
+ close(FUNCS);
+--- a/stubs.inc
++++ b/stubs.inc
+@@ -354,11 +354,6 @@ int pcap_parsesrcstr(const char *source,
+ #ifdef _MSC_VER
+ #pragma message( "Warning: the function pcap_open() is not available" )
+ #endif
+-struct pcap_rmtauth {
+-    int type;
+-    char *username;
+-    char *password;
+-};
+ 
+ pcap_t * pcap_open(const char *source, int snaplen, int flags, int read_timeout, struct pcap_rmtauth *auth, char *err);
+ pcap_t * pcap_open(const char *source, int snaplen, int flags, int read_timeout, struct pcap_rmtauth *auth, char *err) {
+@@ -511,6 +511,7 @@ HANDLE pcap_getevent(pcap_t *p) {
+ #ifdef _MSC_VER
+ #pragma message( "Warning: the function pcap_setsampling() is not available" )
+ #endif
++#if 0
+ struct pcap_samp {
+     int method;
+     int value;
+@@ -522,6 +523,7 @@ struct pcap_samp *pcap_setsampling(pcap_
+     return NULL;
+ }
+ #endif
++#endif
+ 
+ 
+ /*
diff --git a/dev-perl/libvorbis-perl/Manifest b/dev-perl/libvorbis-perl/Manifest
deleted file mode 100644
index 1219fae6f3b8..000000000000
--- a/dev-perl/libvorbis-perl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST libvorbis-perl-0.05.tar.gz 50414 BLAKE2B 9c2ed519d7242b0f527d114de4fd23e4179b0e398ef47dbf1e6547bbbd2adb656b8131cb3444c10734727e8b4c66fd459cd300b839a9e1a4a1b6f99b740261d9 SHA512 a7d543fe65b491da1e133adbc6545cccca0da914e186af4eefa58df83fcd2bb0a3ba8e1c722e9cccc929e4fe06529bb6b9b2f9fe097e7b9e0b4289c0d1c006b4
-EBUILD libvorbis-perl-0.50.0-r1.ebuild 399 BLAKE2B 68c14494a2f04c4dc26c3b9b7ed464d2c63be6131c295b11a23a50931cc9731c48f57c88fab54398d154032343050958c7227cc25fc3bdabf565aff3b842ff36 SHA512 f0f16aaf5b08186ce47fe057ab590baa69560665856067995f5fa3bd50492d4844e7b16d973a0f33ea76cbcda10dcb566e076dea1354d0d262d35eba5c191ef1
-EBUILD libvorbis-perl-0.50.0-r2.ebuild 400 BLAKE2B 3b374c4f3cd8123b70e1fc8198e44faeb3fe808c626ac4c3ee72220ad729fd9424a99262dbac83f5a4eeb25b50ff80b0615ce837625c8e1aa513df0aeed56063 SHA512 0b4f8f094ea00ee554b9af5dd495e4ca80465ac7a5f828ccf05d9da16396f15ff649b6647d045fa8e99fc4f5613e0e676de8f9e60acb93dd91ce868641be3c7e
-MISC metadata.xml 396 BLAKE2B cf15850e72ab1ad17d04570f72b6fab6fe128eae44afe6c69abc159a60a4baea3b18d0f1692902096b5da487ffa7dfce4c1505f78a56989acf0c9f33a582d146 SHA512 3d0ede590442bb63bf53dcb78c9429af810499fc2a0351050c6ad631124d878d47c34f8c9dbec6ae4ece5a547f2b1e362d574902856bc3b92ffb2c096795e585
diff --git a/dev-perl/libvorbis-perl/libvorbis-perl-0.50.0-r1.ebuild b/dev-perl/libvorbis-perl/libvorbis-perl-0.50.0-r1.ebuild
deleted file mode 100644
index 9de8cc82da2a..000000000000
--- a/dev-perl/libvorbis-perl/libvorbis-perl-0.50.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=FOOF
-MODULE_VERSION=0.05
-inherit perl-module
-
-DESCRIPTION="Ogg::Vorbis - Perl extension for Ogg Vorbis streams"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="amd64 ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="media-libs/libogg
-	media-libs/libvorbis"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/libvorbis-perl/libvorbis-perl-0.50.0-r2.ebuild b/dev-perl/libvorbis-perl/libvorbis-perl-0.50.0-r2.ebuild
deleted file mode 100644
index 7a2e6cbc5be4..000000000000
--- a/dev-perl/libvorbis-perl/libvorbis-perl-0.50.0-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=FOOF
-DIST_VERSION=0.05
-inherit perl-module
-
-DESCRIPTION="Ogg::Vorbis - Perl extension for Ogg Vorbis streams"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libogg
-	media-libs/libvorbis"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/libvorbis-perl/metadata.xml b/dev-perl/libvorbis-perl/metadata.xml
deleted file mode 100644
index 6757c7b0efed..000000000000
--- a/dev-perl/libvorbis-perl/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">libvorbis-perl</remote-id>
-    <remote-id type="cpan-module">Ogg::Vorbis</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 25dba54b405c..daa1a0e438a3 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-MDB2/Manifest b/dev-php/PEAR-MDB2/Manifest
index cbbb74b4866d..5e9e4e010ca4 100644
--- a/dev-php/PEAR-MDB2/Manifest
+++ b/dev-php/PEAR-MDB2/Manifest
@@ -1,3 +1,4 @@
 DIST MDB2-2.5.0b5.tgz 136834 BLAKE2B 4736cd205f186b56af4ad7b0c6a83aee5c042d06202464b4226d76e0e37608472f4650f6849de1912f6e47f35ff41ef6fe55f6449835f86ef7eb7ae8bb6e02e2 SHA512 76381594070d250f4428eebeaa4867e72b2be0723ec592ff4f0fba089823e97de057f93e630a5cb226ca2f67028bee57072a0af30677728d614d7a7242c6c6fc
 EBUILD PEAR-MDB2-2.5.0_beta5-r1.ebuild 875 BLAKE2B b9bbdb22670d60fa7221fe510cfa41bc346200951d0f3ce617e6465c68e9c238c53db41072ed10e695a8fe171bb36566b4c0d03d2ba2dd458cbd92749211a30e SHA512 a86f3135543576367ea8cd3e5932f7846591fdb3d3f213a811c14ebf9f9bed57550a97ddfd0769f0a270976a402d8c02c037a1410baa4ac268f560e3f59cdcce
+EBUILD PEAR-MDB2-2.5.0_beta5-r2.ebuild 882 BLAKE2B 4b69e044f0152dd8c3fe7cb8b0d9d9377d428cb0db8ffa20e264ecb9dc027211ccc3edbfb6a09192d5dc114a4f1df1bcccc59caa850cf29a52b1450264660cfb SHA512 1abbb9b1d743f5b2dd8314148b4a0f94522f05a451ba3d9ed83f85a76b34e8494e11b7032080b7fdeae68637ab3ccb063ee89c7d6a5bc5e1a5159a1be0edb4fb
 MISC metadata.xml 306 BLAKE2B c73f196a4a888c22bcde1298962ef829f5993b71d8ac5ded01f41b5fe2e91f599f8c9ed64e134ec26db62d9cc3c610397bf33159f3efde999ccc9cd40ab7bd4e SHA512 2edc3e48edb9d3788f5af8aea2797a72ff699c3fe28ed7664ebc1b1abe5d25616a54d3b9ace88ffef2399113d1678add85153b469d113f6e9e82808390d0373a
diff --git a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
new file mode 100644
index 000000000000..001677444083
--- /dev/null
+++ b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PEAR_PV=${PV/_beta/b}
+
+inherit php-pear-r2
+
+DESCRIPTION="Database Abstraction Layer"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="mssql mysql mysqli oci8 oci8-instant-client postgres sqlite"
+
+RDEPEND=">=dev-php/PEAR-PEAR-1.9.1"
+
+PDEPEND="mssql? ( >=dev-php/PEAR-MDB2_Driver_mssql-1.3.0_beta4 )
+	mysql? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4 )
+	mysqli? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4 )
+	oci8? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 )
+	oci8-instant-client? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 )
+	postgres? ( >=dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4 )"
+
+DOCS=( docs/CONTRIBUTORS docs/MAINTAINERS docs/README docs/STATUS docs/TODO )
+HTML_DOCS=( docs/datatypes.html)
diff --git a/dev-php/PEAR-Net_SmartIRC/Manifest b/dev-php/PEAR-Net_SmartIRC/Manifest
index dfacfa77aa68..ffda77c6e802 100644
--- a/dev-php/PEAR-Net_SmartIRC/Manifest
+++ b/dev-php/PEAR-Net_SmartIRC/Manifest
@@ -1,7 +1,9 @@
 DIST Net_SmartIRC-1.1.10.tar.gz 927009 BLAKE2B b410a0b4a02e60e27860f9c6b0ab8fecf4874273601694ad61dcf88a2e916aee20d1858cf951fffb229f4eac0c0ddda55530bb6840da3c7b741cf9ee3971f7b2 SHA512 16ad30d358af99f40c53a75cf5f1c944a3e68f4c1cffd586acd61ceed280d5d1fcd4f4d5e88db55f1f66c37c5b7f37aec2f45a26dc6b98860eacb42c9f3fbea5
 DIST Net_SmartIRC-1.1.12.tgz 166039 BLAKE2B 43aec437de08d6e0dd651b810b21b5fed5587e2e7e154fe4f078cc618ee501c3d962b824931558458895541ddc9dc46ec3b1f0356aac5b052dd63b498018bb47 SHA512 2da5f0f9ea9167dfd1490fb6ba1e97416c78389924f390030ba71ea28dc5b667451223daa7e3878cbae607159054d656534ff646636f8f5294eb0bda1b17074c
 DIST Net_SmartIRC-1.1.13.tgz 166028 BLAKE2B 7e2b91dc01febe561c3ce55901f999f84f87fdbe20b5a1560a060125de4ae7d9869141cc0b2bcd9dfd0479a3a0a2d3c9d0f2719f70edc122df70f181d788f73b SHA512 d8f5a4f38b0aa830a84c9433deaf16b936f79e30bd9588cb0225ec20698af3d334fd1fdb320c64d1a72b0d206ae794b9e4135f1053855f586155694f6342cb0b
+DIST Net_SmartIRC-1.1.14.tgz 166115 BLAKE2B bacd23296dea25bc898ce3ba67d89949a3ad34675000bde9fe78371a7d97596272708f114b7980c3754cb862be68b84dcb0e8df10374cb560180d50c3bf61f49 SHA512 35cf0714a695e1b40e0db1f4d20c0ea4d431940e1e5894899db0bd13137e90c790067d266dc43f1ccc2921ad1f48cc70aa448225acac4358c8eb839f755717a0
 EBUILD PEAR-Net_SmartIRC-1.1.10-r1.ebuild 772 BLAKE2B 18f87d05e097ffb5b38209978ca92f429fb319a8c2414a068c780964c4bdb6a7346dcea647e7490e68aa9764afe4db6269b30b24a99be6cb585471f4d3d6c5ac SHA512 900e81b51fd39ceb8266f7bf5dadb39bf0585fe3a9b3ec40b51a7b3b6db0313a2b7a849a292be4767e4e426ed58167d29f980a5756cdaa86398be93221a01a76
 EBUILD PEAR-Net_SmartIRC-1.1.12.ebuild 545 BLAKE2B 80991f66ddd016eacdbf1c1d1b9232bf15a507e04e4ca530f0a78d135187c1a944cb7cf57e88a4266e45a0c20c76b74b720ee733daf6562e5fc303c978e75c64 SHA512 aea02f3d6ac0e4fd6b8fa92730162e6fe07e1e6299d084f8260cead0b2e8b6d982644ed4d37cb8c8ceeb296bf118b88f8913005d81b8e972e060885aeb56d4fe
 EBUILD PEAR-Net_SmartIRC-1.1.13.ebuild 542 BLAKE2B 8ea1b954d63b2b9b79c19b5188933c28a64978bcf64e48427ff5d2d5c54b27d7ef134f30c0d04a87c3d002fa9aef40b8fce72310827c9e96600089d5707abbd5 SHA512 9e8bd3b6c852f93458b9704a28f5b0ee11d7d8eb5f08dc1ed708d1b943026f379cac37679e2446b8db06544f34c48589bc2a0b1a4f3c892b66cead0caab563b8
+EBUILD PEAR-Net_SmartIRC-1.1.14.ebuild 542 BLAKE2B b83893302467febf4d294444c9bdfe1c902aff437b199cb519228fbd74ec15f5c350f0e09c16390a7626129cf22fd384ab875b61129b6980b082556268bc6e0e SHA512 f9f78d8fd37608299b72cd9efa58e27a7095e5e6d57c81c272a641fbe040fc20a1ed40d4b63899ec4d51f10c90d38a9f6258b313e759e1a6d8d4e4ab665246f6
 MISC metadata.xml 383 BLAKE2B ab5de001d8fe2ec2f6beaf3b457f5296123b286b335b3910ea58eadefe3369ab4fba6ad34fd1262ae465e2e521251b8034c046d1cbaf35afe819717d709917a7 SHA512 083df49fdd76cb7e00bb81b6501d0f475788cef1da463919fc35abc6d0725cda8b47fa027a1a3f6af4872897567b8ba8104463be276a1524182138bdc15d04c0
diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.14.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.14.ebuild
new file mode 100644
index 000000000000..c6e49dbd4c32
--- /dev/null
+++ b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.14.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit php-pear-r2
+
+DESCRIPTION="PHP class to communicate with IRC networks"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples"
+DOCS=( CREDITS FEATURES docs/HOWTO README.md )
+
+src_install() {
+	local HTML_DOCS=( )
+	use examples && HTML_DOCS+=( docs/examples/ )
+
+	if use doc; then
+		DOCS+=( docs/DOCUMENTATION )
+		HTML_DOCS+=( docs/HTML/* )
+	fi
+	php-pear-r2_src_install
+}
diff --git a/dev-php/ming-php/Manifest b/dev-php/ming-php/Manifest
deleted file mode 100644
index 86e926c9e6dc..000000000000
--- a/dev-php/ming-php/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX php_ext-config.m4 2939 BLAKE2B cb3e65a0397b753fb6675425e3eaab0c68349b7d14f387160133312b96f5a8101cea87125d03eafbfdef7ede77b2a85dd0b32d428e6c78019a4a3d2c84f9cd05 SHA512 88e3eb6f42c38d66c050c3e6c956e239861b8c17ed7f7c4867be00b06c9b48b806af3254bd8fbd4c7349a4ff41981bfcb1c7256d671dc5b8bf6d0089d8bf62cc
-DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0
-EBUILD ming-php-0.4.8.ebuild 1392 BLAKE2B fbb2e06a7b56daf644275d3bd1bb22a87ae9fb96ee74b4f66136221559b92b1853cf43a9091d6e7aa1617b7399226c71ac575814bf7d575d6e802f337abf39a3 SHA512 0374a19eb15598b2c9a2e753f3b1b59431de81a0137554bcef45d180e45df98646bafe134ab5fba5f4e2ea356f7783d5d03188636fb31e2593459aea8afba1c8
-MISC metadata.xml 475 BLAKE2B 3f1db2ece7aef5e9f24e7fc1b2649422102cacb521ba830ae36a7cb7683957bcb89366d980c305fb9ad2a7fee9ecb87176e934f6ba328a6a2039d36f9c3ca207 SHA512 f5586b50f459b96dd287bb1ee2d1a166cb8086584c76f5b5b68cf1d8271afe22903f77d8641aee3c2d68ffd2b41441aed5f641a303b6f43243d67d65d41748c4
diff --git a/dev-php/ming-php/files/php_ext-config.m4 b/dev-php/ming-php/files/php_ext-config.m4
deleted file mode 100644
index 9f4cd19790b0..000000000000
--- a/dev-php/ming-php/files/php_ext-config.m4
+++ /dev/null
@@ -1,112 +0,0 @@
-PHP_LIBDIR=lib
-
-PHP_ARG_WITH(ming, for MING support,
-[  --with-ming[=DIR]       Include MING support])
-
-if test "$PHP_MING" != "no"; then
-  AC_CHECK_LIB(m, sin)
-
-  for i in $PHP_MING ../../src /usr/local /usr; do
-    if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libming.a; then
-      MING_DIR=$i
-      break
-    fi
-  done
-
-  if test -z "$MING_DIR"; then
-    AC_MSG_ERROR(Please reinstall ming distribution. libming.(a|so) not found.)
-  fi
-
-  for i in ../../src $MING_DIR/include $MING_DIR/include/ming $MING_DIR/ming/include; do
-    if test -f $i/ming.h; then
-      MING_INC_DIR=$i
-    fi
-  done
-
-  if test -z "$MING_INC_DIR"; then
-    AC_MSG_ERROR(Please reinstall ming distribution. ming.h not found.)
-  fi
-
-  PHP_CHECK_LIBRARY(ming, Ming_useSWFVersion, [
-    AC_DEFINE(HAVE_MING,1,[ ])
-  ],[
-    AC_MSG_ERROR([Ming library 0.2a or greater required.])
-  ],[
-    -L$MING_DIR/$PHP_LIBDIR
-  ])
-  
-  PHP_ADD_INCLUDE($MING_INC_DIR)
-  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD)
-
-  old_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS=-I$MING_INC_DIR
-  AC_MSG_CHECKING([for destroySWFBlock])
-  AC_TRY_RUN([
-#include "ming.h"
-int destroySWFBlock(int a, int b) {
-	return a+b;
-}
-int main() {
-	return destroySWFBlock(-1,1); /* returns 0 only if function is not yet defined */
-}
-  ],[
-    AC_MSG_RESULT([missing])
-  ],[
-    AC_DEFINE(HAVE_DESTROY_SWF_BLOCK,1,[ ])
-    AC_MSG_RESULT([ok])
-  ],[
-    AC_MSG_RESULT([unknown])
-  ]) 
-
-dnl Check Ming version (FIXME: if/when ming has some better way to detect the version..)
-  AC_EGREP_CPP(yes, [
-#include <ming.h>
-#ifdef SWF_SOUND_COMPRESSION
-yes
-#endif
-  ], [
-    AC_DEFINE(HAVE_NEW_MING,  1, [ ]) 
-    dnl FIXME: This is now unconditional..better check coming later.
-  ])
-
-  dnl Check if SWFVideoStream_setFrameMode() is available
-  AC_TRY_COMPILE([
-#include <ming.h>
-  ], [
-int main(void) { SWFVideoStream_setFrameMode(0, 0); return 0; }
-  ], [
-    AC_DEFINE(HAVE_SWFVIDEOSTREAM_SETFRAMEMODE, 1, [Have SWFVideoStream_setFrameMode(SWFVideoStream, int)])
-  ], [])
-
-  dnl Check if SWFVideoStream_nextFrame() is available
-  AC_TRY_COMPILE([
-#include <ming.h>
-  ], [
-int main(void) { SWFVideoStream_nextFrame(0); return 0; }
-  ], [
-    AC_DEFINE(HAVE_SWFVIDEOSTREAM_NEXTFRAME, 1, [Have SWFVideoStream_nextFrame(SWFVideoStream)])
-  ], [])
-
-  dnl Check if SWFVideoStream_seek() is available
-  AC_TRY_COMPILE([
-#include <ming.h>
-  ], [
-int main(void) { SWFVideoStream_seek(0, 0, 0); return 0; }
-  ], [
-    AC_DEFINE(HAVE_SWFVIDEOSTREAM_SEEK, 1, [Have SWFVideoStream_seek(SWFVideoStream, int frame, int whence)])
-  ], [])
-
-
-  dnl Check if SWFMovie_output() accepts the 4th parameter
-  AC_TRY_COMPILE([
-#include <ming.h>
-  ], [
-int main(void) { SWFMovie_output(NULL, NULL, NULL, 0); return 0; }
-  ], [
-    AC_DEFINE(HAVE_MING_MOVIE_LEVEL, 1, [ ])
-  ], [])
-  CPPFLAGS=$old_CPPFLAGS
-
-  PHP_NEW_EXTENSION(ming, ming.c, $ext_shared)
-  PHP_SUBST(MING_SHARED_LIBADD)
-fi
diff --git a/dev-php/ming-php/metadata.xml b/dev-php/ming-php/metadata.xml
deleted file mode 100644
index 50367ee577fa..000000000000
--- a/dev-php/ming-php/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>grknight@gentoo.org</email>
-		<name>Brian Evans</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ming</remote-id>
-		<remote-id type="github">libming/libming</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/ming-php/ming-php-0.4.8.ebuild b/dev-php/ming-php/ming-php-0.4.8.ebuild
deleted file mode 100644
index 91e42cafa688..000000000000
--- a/dev-php/ming-php/ming-php-0.4.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME=ming
-MY_P="${PHP_EXT_NAME}-${PV//./_}"
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
-PHP_EXT_S="${WORKDIR}/libming-${MY_P}/php_ext"
-inherit flag-o-matic php-ext-source-r3
-
-DESCRIPTION="PHP extension for the ming Flash movie generation library"
-HOMEPAGE="http://ming.sourceforge.net/"
-SRC_URI="https://github.com/libming/libming/archive/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/ming"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/libming-${MY_P}"
-# Clear out near-empty README files which are not helpful to the user
-DOCS=( )
-
-src_prepare() {
-	local libdir=$(get_libdir)
-	cp "${FILESDIR}/php_ext-config.m4" "${PHP_EXT_S}/config.m4" || \
-		die "Failed to copy config.m4 to target"
-	rm "${PHP_EXT_S}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}"
-	# Fix for SYMYLINK_LIB=no
-	if [[ ${libdir} != 'lib' ]] ; then
-		sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${PHP_EXT_S}/config.m4" \
-			|| die "Failed to update lib directory"
-	fi
-	php-ext-source-r3_src_prepare
-}
-
-src_configure() {
-	# build is sensitive to -O3 (bug #297437)
-	replace-flags -O3 -O2
-
-	local PHP_EXT_EXTRA_ECONF="--with-ming=${S}"
-	php-ext-source-r3_src_configure
-}
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 314eb58a6846..8195ca9324c9 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -2,6 +2,6 @@ DIST apcu-4.0.11.tgz 119535 BLAKE2B 2c1f8a0463b2802b11ae679987807127556b04fb099e
 DIST apcu-5.1.12.tgz 105890 BLAKE2B 110a56ed1da8e33bd39c9d694007acdca2deb42219ae5d31b57296ff3729bab3fdbc508965b2cd0fccc425b2c2fea9249933cd7f45586beeee7cd3bd38ef2473 SHA512 f53b7840d5aecfc899e3e878f0bb9a5dc4a83628543963c20c25ce2b2a2adf14dd40d39a6a2014c139962453e0e9e5038fca7b1d0be205c0b9b2aa6e3fefb054
 DIST apcu-5.1.17.tgz 94814 BLAKE2B 2e49f08b9445f04fd036bc949c9099ee045c3ecd460b323e371a4906fdef77f8d3e7d338af14fe3e116a94aa548c7fb79cc0003556ed739e258370095cbec075 SHA512 7f6a6cd927ed4ff251497c2c79e8d832d1a44ddd59abdb175886d3c12ea27f26142e6b851ac5bb5acb49a0e3a998e9741ba0ff03310f51b9cd188cdf6cf12793
 EBUILD pecl-apcu-4.0.11.ebuild 1537 BLAKE2B e2e859314479c8986b097a904c50d0e23e09b4189144043664143a9fc1f8a6a6830803743eae047750cfe468d7dcdf716b03d61fec2ce406b0f7828f08890bd6 SHA512 b561c23514274933b5d27eed7425a1e007c052431502f6f9a1946a51201b0ec551b4a6bb1da6ff411ab3262c94f3e6fad2e8492a731fd4fb77df02d4e1e23744
-EBUILD pecl-apcu-5.1.12.ebuild 2093 BLAKE2B 84a4783d1e5f9fb621369986b1b6f53952a3c85154ab9984051abb63a9d8b6ffee8870cd47991434f32cd81d322f74ad51098a3a1f77a19882cb86613d95e585 SHA512 d93c6e848b15a7365bc38ae5ff0fed0ed7c8be3025e18e178fb3c6ac9855e9a91c32da9c91a3849bbe8f8ce88c2931404fe0c1366ed14bd8e02674fb1f2801bc
-EBUILD pecl-apcu-5.1.17.ebuild 2097 BLAKE2B 73c0e00ca20648b49c61270d2c9055ea299b7ab64ca73f9280f314f73d5a7afbc34627087b934a50321f3154fdbba7908ab3726e6f5652deba14ead193edae27 SHA512 f09b90919f1063e47b66f978244af5caee80096b76ce16c8f7b19142292b667b7c1e18f091339a071d57c6d77f31631576892c3ad4f89e576cecf10b584aacd3
+EBUILD pecl-apcu-5.1.12.ebuild 2091 BLAKE2B 4a3ce06048c44883c4040bfa94cadda04e89d1af5445549c7190d5cf9d12f4a2f04c5027a16f79392692f114a3eb475d01948092c08b2eb4af3653187018bd97 SHA512 951f84425c892468e1a868c6068b7b6bb6b59b31d5eaf138dcc9182c2b45bb945148dbb4fe9d70b7c9125136e2a90628978485cef9e7a82e28891a123c3d6bb1
+EBUILD pecl-apcu-5.1.17.ebuild 2095 BLAKE2B d1c9996042cf528fc76d330ded500c2e9aff45cc715bc46a8bf3dbb56806901580720d44b54d60dd9fa380ee7587c715393bb7c40648b229f038c55d82bf0705 SHA512 e8f871835a26657c014ed8ec4ebce447161509d5f0b0bba39dcb5bcca0b4ab3967931d7170d467d2647cfcb2b3b2245881d6afa6ba2a83e815531c7a8fff91c5
 MISC metadata.xml 540 BLAKE2B 87b95a306509825ceb5c27c471c496692da1efaf9fc04c357d9aa47c458db302456884401b077cd040bc70a6540706cc54ac2aa76f7da8a1d3b63b6af8661e5a SHA512 46b3e028a3632c8ebfa89a9e2053bc0bb8893fd0a75ee3f84e1d62daec9be5cadbe1f9fc55bb14931a91cde04ff04c5f7c19b2dcf57551ee08fa3eb64ed88232
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
index 907e9265b6ba..675490a1e856 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
@@ -71,7 +71,7 @@ src_install() {
 pkg_postinst() {
 	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
 		elog "The apc.php file shipped with this release of pecl-apcu was"
-		elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
+		elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
 		elog
 		elog "If you depend on the apc_* functions,"
 		elog "please install dev-php/pecl-apcu_bc as this extension no longer"
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
index 7da2fb1c7123..39a64219bf7e 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
@@ -71,7 +71,7 @@ src_install() {
 pkg_postinst() {
 	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
 		elog "The apc.php file shipped with this release of pecl-apcu was"
-		elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
+		elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
 		elog
 		elog "If you depend on the apc_* functions,"
 		elog "please install dev-php/pecl-apcu_bc as this extension no longer"
diff --git a/dev-php/pecl-radius/Manifest b/dev-php/pecl-radius/Manifest
index 38ec07dd981b..5371b1f2ae58 100644
--- a/dev-php/pecl-radius/Manifest
+++ b/dev-php/pecl-radius/Manifest
@@ -1,5 +1,3 @@
-DIST radius-1.3.0.tgz 43060 BLAKE2B e348ca5693872a7af142f2f60dd91613980046ff1479894518591a9db4229147963bfc70dd7f2797ace070d89015096b7877915df18decc03ae3cc092d8d02c6 SHA512 79126a852701e77f782283b0cf2ad99cb05418c69ed39d70608f62021f3da06f5e5867ac5b09cc75806feeb3d1a06f24eeb6ff4e56cb2fde5f05bcd198b5a661
 DIST radius-1.4.0b1.tgz 50953 BLAKE2B 1f6f2a4c4cfa7600a37b8bc30e4d263b899a687becac83fd01bac2466de08cad4233984ca694dc73eaf20b64ef94e1e6a6ca7f843474c8f0c9de2c39df9d9705 SHA512 db6ebe928673db1ff4c565338010ef5acf6029844994eb240f2e8eaeda4aff734ed300a7ddf16c09e245671aad377283f99cf1c485569b3bad0c7c7b24a19664
-EBUILD pecl-radius-1.3.0-r1.ebuild 445 BLAKE2B 3afb0fe648378416f7377c872a201effb1cac2802b064edbe332a6be18bdafc8645dedbedba2d8853b899d260eddb3c33b5be683f0a85eed5b4668622d159334 SHA512 b7ecd2945d33352f62bef13b7a91feebf1968ddc4fca208c8c040bbe6e8c15628a8f1e8dff0721f16117f6be862fc7629ccadccb9af064bd46c4bee2c2d91c49
 EBUILD pecl-radius-1.4.0_beta1-r2.ebuild 765 BLAKE2B 528d655a9ec455460a283bcf9aa1b15fbb9d43db094df533f38f9fbef0eadc12388608389a05bee9dada5b9a2bca7f5724cfafca037c0b65cb39c3650a4e4d79 SHA512 ee8a5bb86cfcec12b3342a3ee9f8b07bcee817e1f9a14093ee3f9cb1125b9ac8476675cedc8b52aace45665c5de6377d24a20262e5399c2cd985864532ff128d
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-radius/pecl-radius-1.3.0-r1.ebuild b/dev-php/pecl-radius/pecl-radius-1.3.0-r1.ebuild
deleted file mode 100644
index 0b5a3b4507f4..000000000000
--- a/dev-php/pecl-radius/pecl-radius-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="radius"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)"
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="php_targets_php5-6? ( dev-lang/php:5.6[pcntl,sockets] )"
diff --git a/dev-php/pecl-yaz/Manifest b/dev-php/pecl-yaz/Manifest
index 1c87d9ef0486..e029dd2c5cd1 100644
--- a/dev-php/pecl-yaz/Manifest
+++ b/dev-php/pecl-yaz/Manifest
@@ -3,5 +3,5 @@ DIST yaz-1.2.2.tgz 20131 BLAKE2B 7aa0729ba6033870099ed7c0d4961eac02d74d5aed6c7a5
 DIST yaz-1.2.3.tgz 20059 BLAKE2B 3fbf6d57e8519f6d363dbf308cb6ba259098521ae352f8886e8e12ca2a0d8119eaa31fc30301aea6979b32c6c321c4de0ad63ebe72e8f52cbb630d7f136f3e60 SHA512 5e6ebccac05fa44b0758b6817530e8cb436e45ead659f6a5029383515213bcce8c8cc7ceb8ef5ff4ec2335ad5c3009c6ccf8786116b115c24a013329d107bd7a
 EBUILD pecl-yaz-1.2.1.ebuild 522 BLAKE2B 162fa067a1c7c9d2ed34612b5133513e7260d4f5fc3f06de16e11a4a37f30d86b22b80fc952aea8480f3007811baa7968b48d674f00d1e2fc7c3abc1a47fbae9 SHA512 80156ddce79ffa8a460fec70c99cbc68681cd4204ac6f0e18b40521ba17d81d2b4c0da6d162debb3070eb2d4477902203b431692d43a26037232a3424be54910
 EBUILD pecl-yaz-1.2.2-r1.ebuild 535 BLAKE2B a31945d38c6e736ae2cf07a7bc7d42364913fb5763285200be7039f61fa005da78acd7c24107c885afbd3a5101c15790da31c0d6e088b7bee244952ea92b6f36 SHA512 108633e57233124565ad41f06e2ca8b266068d328d4c815c98e2b0fcd61bcbfa2ba5b04495ea0c2c21dbc12f5abfb901fecb4af6182633478404586411dd07fa
-EBUILD pecl-yaz-1.2.3.ebuild 585 BLAKE2B ca0218a933d65dfa47f437743a409ff2909d5c1b79cf556453ee06edbc79fe1915580305208b5a3ba07e99332891ac9c3fa06a1af55be99307aa5223e391b9ac SHA512 679e751eb4ac8c7197c17ef0840d11a72edb29d5afcf857250ff48f5da379f3814acbaa83432d745953cfbb8538a2ce4dcffa76e68abfc2b859cdd6ccde37d39
+EBUILD pecl-yaz-1.2.3.ebuild 582 BLAKE2B b01868cb9f4036c528c0d92ec9b238af865e17267f470833622148389cc4e5da07d24241527603cc78a7e4b2493e59c1781133c3b3795541f9565ec68ef68cc7 SHA512 f17767ac8e26680ea75d408d9db7b6da91caff5f8c4e9e87a601851c4de9d08e40f4948d1cc8f1dc4f48fafafce18c4681193677e32fc99c883c35d051f72774
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
index ee31d36f6491..bfb55dcd9e52 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.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 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 
 DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
 LICENSE="BSD"
diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
index b5f9df12a738..e1a0cc0d83bf 100644
--- a/dev-php/twig/Manifest
+++ b/dev-php/twig/Manifest
@@ -1,8 +1,6 @@
-AUX 1.40.1-autoloader-path.patch 852 BLAKE2B 5a09a7fc095fd4ae34ccadd35cbb97b2ba7e4e7ae8735d1beb04ed3014f984583245b44a2d96e3283daa73fc2767de7794c40f8033624499d8fb0bd3786f4bf0 SHA512 bff2e1acab5dc61b930d3698add018eb60975a7f043d4abc764579109a0d026bfe0be29e7d0756efcf583ad84bc3831ca6d081d36ec16e6b2e6651d9c7e9534f
 AUX Autoloader.php 503 BLAKE2B 57679179226098eea818df53154b98afd3249f12a219fc894a7529bdcb8ceb39c7c5c20f14263ce03875983ab0acaeaa6e09ca8446ee5b9a591b6e284e7f9238 SHA512 054a9420a23b67c57ca0780fdbc3c817436dea71780714654469efa23c0d17173e1c87b2f3c6ce48e26e4dd49a92f1f17e2e23472a666513e9fb8903a4f11699
 DIST twig-1.40.1.tar.gz 274081 BLAKE2B 0e73bd9fff58677446ba03ed560bff17c1879192b79cca9f718ccd330e1eac64ee1195d7034fa52ec009e323868d1cc1bedc182e90f0a77c8b54d6aa16022554 SHA512 de174e5dd14562a155515a3238aa07ef5a22c3bf0eff8ecc320f1a972e56f1ec759a53ee24579c6434e286b3775044e88c753fd08930037314b45c9577b310b1
-DIST twig-1.42.2.tar.gz 277760 BLAKE2B c72462b172f1cda85ca8a7988870e20abf09bdc6114eb428213508fcf9c19a2b10e180e8fa052b8e51e8aee749c7c0ded936e5792ca1f8b5c7024872335df3fb SHA512 17ccfcea750d9d9154841598b34de8882aa1144696d912c8175b1add996db4f31b3cb85bc68dc75f62944fe858345811ebbf952aabb0c3ff8c1bbc2a0f1a2576
+DIST twig-1.42.3.tar.gz 278164 BLAKE2B 4bff9f7f85ce8ca00871e9342ec11a68d4b930f7761bc7404f504322483d328570e9e540e2518b5e1ad513002ce95686b7a1a47ff7aa4b28c16b2871ba759b01 SHA512 9dc892d80445f9fa9a3bde5cfdc49f2975a43f36123c1f4bbbb40740269e9aa4355d0d8668552e535f74a8ff27cc8ee1dc6983b50567993c1deab09569a7c5e3
 EBUILD twig-1.40.1-r1.ebuild 1369 BLAKE2B d0cb11c5eacd37538ad94097a5c2db78c351893140df5f025b82a8f3b8ec57ebadfee4ecafc2be5c527955656315e20ea9b404ecdaf374a92864c6f66edcb421 SHA512 e4243f710ed4287c8bd8ebb74bba91e534c1b6ec3b898706dbbd2cc7920682bc0c78e92472ad33257696df1031acbcfdf5a67036f7ff0a050cb3ccb49e30106b
-EBUILD twig-1.40.1.ebuild 2738 BLAKE2B 7bb7d6d53773a8c1c8dfe222b4fc84233914456fd9e04ba75404e371e39168b4506158f73f3b89c647c7a3deff516389edd56a8792a3661f6802086e12ad7b18 SHA512 d70a35093e913df6d03aca6179d6c14d0971a999f4202059653eabc441858fba4f96211d6b3c64956e524ad60a6987e23053b8b0a2f809590f2b0b5bf74cdc8b
-EBUILD twig-1.42.2.ebuild 2678 BLAKE2B 9164ac002107614f31b67bf08f10104136b8bd5c5243e7c899c5b79c7dc8109ac17b28ada77492dcc5cd9dd3607bde5841718dc2647b5da752ba24e496e94b52 SHA512 d04fcdcf3d99db5c04ddb759aaf49a73f2c7b2a5d01e9badf1e3ad302cc0dc2dca0981d36a482c77ada7bbe53f2b245e9b5d3055b3b60dff74012aedd62be8fe
-MISC metadata.xml 545 BLAKE2B ccc89ed2677959e71586c28951a718dc42b2dbce61803762b75198606407ed8ed4eebbcd18cee00591fb6c9f22e422c8e026d4a5cd4814db3af47b8f31eb88ad SHA512 7374d514d449d55037c8c57a0fb95162bb11b9ad80cb9896510cc1fddad6a984c19fff5431ce4f2d9ecd49dad72cd54edc25e521c986c4347a841c1a4b8435de
+EBUILD twig-1.42.3.ebuild 1369 BLAKE2B d0cb11c5eacd37538ad94097a5c2db78c351893140df5f025b82a8f3b8ec57ebadfee4ecafc2be5c527955656315e20ea9b404ecdaf374a92864c6f66edcb421 SHA512 e4243f710ed4287c8bd8ebb74bba91e534c1b6ec3b898706dbbd2cc7920682bc0c78e92472ad33257696df1031acbcfdf5a67036f7ff0a050cb3ccb49e30106b
+MISC metadata.xml 438 BLAKE2B 412d85f4f682c6c8e279082834468d3a59cbe2d9fbaaef1f7674903a59e68982d3ec6059f61517383a05488d7bff960ca36dbc869f588388c98511fca5662e5b SHA512 849a7ea4878de239a4454b63f63ecf3ac959ba7fb49d83b0cb60891974bb1cf2c330d27188f6b2ca7cee2f2ad5aefebeb4b914f3eb50eff4e09c973d8ca80339
diff --git a/dev-php/twig/files/1.40.1-autoloader-path.patch b/dev-php/twig/files/1.40.1-autoloader-path.patch
deleted file mode 100644
index 8c236883e070..000000000000
--- a/dev-php/twig/files/1.40.1-autoloader-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/lib/Twig/Autoloader.php	2019-04-29 16:12:28.000000000 +0200
-+++ b/lib/Twig/Autoloader.php.new	2019-05-06 21:37:39.955238245 +0200
-@@ -43,9 +43,11 @@
-             return;
-         }
- 
--        if (is_file($file = __DIR__.'/../'.str_replace(['_', "\0"], ['/', ''], $class).'.php')) {
-+        if (is_file($file = __DIR__.'/../'.str_replace(['Twig_', "\0"], ['lib/', ''], $class).'.php')) {
-             require $file;
--        } elseif (is_file($file = __DIR__.'/../../src/'.str_replace(['Twig\\', '\\', "\0"], ['', '/', ''], $class).'.php')) {
-+        } elseif (is_file($file = __DIR__.'/../'.str_replace(['_', "\0"], ['/', ''], $class).'.php')) {
-+            require $file;
-+        } elseif (is_file($file = __DIR__.'/../src/'.str_replace(['Twig\\', '\\', "\0"], ['', '/', ''], $class).'.php')) {
-             require $file;
-         }
-     }
diff --git a/dev-php/twig/metadata.xml b/dev-php/twig/metadata.xml
index 434d766441f9..26aeb448aae9 100644
--- a/dev-php/twig/metadata.xml
+++ b/dev-php/twig/metadata.xml
@@ -9,11 +9,6 @@
     <email>php-bugs@gentoo.org</email>
     <name>PHP</name>
   </maintainer>
-  <use>
-    <flag name="extension">
-      Build the C extension (only for php-5.6.x).
-    </flag>
-  </use>
   <upstream>
     <remote-id type="github">twigphp/Twig</remote-id>
   </upstream>
diff --git a/dev-php/twig/twig-1.40.1.ebuild b/dev-php/twig/twig-1.40.1.ebuild
deleted file mode 100644
index 0903fb3e789b..000000000000
--- a/dev-php/twig/twig-1.40.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="Twig"
-USE_PHP="php5-6"
-S="${WORKDIR}/${MY_PN}-${PV}"
-PHP_EXT_S="${S}/ext/${PN}"
-PHP_EXT_NAME="${PN}"
-PHP_EXT_OPTIONAL_USE="extension"
-
-inherit eutils php-ext-source-r3
-
-DESCRIPTION="PHP templating engine with syntax similar to Django"
-HOMEPAGE="http://twig.sensiolabs.org/"
-SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc extension test"
-
-DEPEND="test? ( dev-php/phpunit )"
-
-# We always require *some* version of PHP; the eclass (conditionally)
-# requires *specific* versions.
-RDEPEND="dev-lang/php"
-
-src_prepare(){
-	# We need to call eapply_user ourselves, because it may be skipped
-	# if either the "extension" USE flag is not set, or if the user's
-	# PHP_TARGETS is essentially empty (does not contain "php5-6"). In
-	# the latter case, the eclass src_prepare does nothing. We only call
-	# the eclass phase conditionally because the correct version of
-	# e.g. "phpize" may not be there unless USE=extension is set.
-	epatch "${FILESDIR}/${PV}-autoloader-path.patch"
-	eapply_user
-	use extension && php-ext-source-r3_src_prepare
-}
-
-src_configure() {
-	# The eclass phase will try to run the ./configure script even if it
-	# doesn't exist (in contrast to the default src_configure), so we
-	# need to skip it if the eclass src_prepare (that creates said
-	# script) is not run.
-	use extension && php-ext-source-r3_src_configure
-}
-
-src_compile() {
-	# Avoids the same problem as in src_configure.
-	use extension && php-ext-source-r3_src_compile
-}
-
-src_install(){
-	use extension && php-ext-source-r3_src_install
-
-	cd "${S}" || die
-	# The autoloader requires the 'T' in "Twig" capitalized.
-	insinto "/usr/share/php/${MY_PN}/lib"
-	doins -r lib/"${MY_PN}"/*
-	insinto "/usr/share/php/${MY_PN}/src"
-	doins -r src/*
-	insinto "/usr/share/php/${MY_PN}"
-	dosym "lib/Autoloader.php" "/usr/share/php/${MY_PN}/Autoloader.php"
-
-	# The eclass src_install calls einstalldocs, so we may install a few
-	# files twice. Doing so should be harmless.
-	dodoc README.rst CHANGELOG
-
-	# This installs the reStructuredText source documents. There's got
-	# to be some way to turn them into HTML using Sphinx, but upstream
-	# doesn't provide for it.
-	use doc && dodoc -r doc
-}
-
-src_test(){
-	phpunit --bootstrap test/bootstrap.php || die "test suite failed"
-}
-
-pkg_postinst(){
-	elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
-	elog "To use it in a script, require('${MY_PN}/Autoloader.php'),"
-	elog "and then run \"Twig_Autoloader::register();\". Most of"
-	elog "the examples in the documentation should work without"
-	elog "further modification."
-}
diff --git a/dev-php/twig/twig-1.42.2.ebuild b/dev-php/twig/twig-1.42.2.ebuild
deleted file mode 100644
index 54c306ddc744..000000000000
--- a/dev-php/twig/twig-1.42.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="Twig"
-USE_PHP="php5-6"
-S="${WORKDIR}/${MY_PN}-${PV}"
-PHP_EXT_S="${S}/ext/${PN}"
-PHP_EXT_NAME="${PN}"
-PHP_EXT_OPTIONAL_USE="extension"
-
-inherit eutils php-ext-source-r3
-
-DESCRIPTION="PHP templating engine with syntax similar to Django"
-HOMEPAGE="http://twig.sensiolabs.org/"
-SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc extension test"
-
-DEPEND="test? ( dev-php/phpunit )"
-
-# We always require *some* version of PHP; the eclass (conditionally)
-# requires *specific* versions.
-RDEPEND="dev-lang/php"
-
-src_prepare(){
-	# We need to call eapply_user ourselves, because it may be skipped
-	# if either the "extension" USE flag is not set, or if the user's
-	# PHP_TARGETS is essentially empty (does not contain "php5-6"). In
-	# the latter case, the eclass src_prepare does nothing. We only call
-	# the eclass phase conditionally because the correct version of
-	# e.g. "phpize" may not be there unless USE=extension is set.
-	eapply_user
-	use extension && php-ext-source-r3_src_prepare
-}
-
-src_configure() {
-	# The eclass phase will try to run the ./configure script even if it
-	# doesn't exist (in contrast to the default src_configure), so we
-	# need to skip it if the eclass src_prepare (that creates said
-	# script) is not run.
-	use extension && php-ext-source-r3_src_configure
-}
-
-src_compile() {
-	# Avoids the same problem as in src_configure.
-	use extension && php-ext-source-r3_src_compile
-}
-
-src_install(){
-	use extension && php-ext-source-r3_src_install
-
-	cd "${S}" || die
-	# The autoloader requires the 'T' in "Twig" capitalized.
-	insinto "/usr/share/php/${MY_PN}/lib"
-	doins -r lib/*
-	insinto "/usr/share/php/${MY_PN}/src"
-	doins -r src/*
-	insinto "/usr/share/php/${MY_PN}"
-	#dosym "lib/Autoloader.php" "/usr/share/php/${MY_PN}/Autoloader.php"
-
-	# The eclass src_install calls einstalldocs, so we may install a few
-	# files twice. Doing so should be harmless.
-	dodoc README.rst CHANGELOG
-
-	# This installs the reStructuredText source documents. There's got
-	# to be some way to turn them into HTML using Sphinx, but upstream
-	# doesn't provide for it.
-	use doc && dodoc -r doc
-}
-
-src_test(){
-	phpunit --bootstrap test/bootstrap.php || die "test suite failed"
-}
-
-pkg_postinst(){
-	elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
-	elog "To use it in a script, require('${MY_PN}/Autoloader.php'),"
-	elog "and then run \"Twig_Autoloader::register();\". Most of"
-	elog "the examples in the documentation should work without"
-	elog "further modification."
-}
diff --git a/dev-php/twig/twig-1.42.3.ebuild b/dev-php/twig/twig-1.42.3.ebuild
new file mode 100644
index 000000000000..c06e5c627361
--- /dev/null
+++ b/dev-php/twig/twig-1.42.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Twig"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DESCRIPTION="PHP templating engine with syntax similar to Django"
+HOMEPAGE="http://twig.sensiolabs.org/"
+SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-lang/php:*[ctype] dev-php/fedora-autoloader"
+DEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
+# Test fail due to missing Symphony dependencies
+RESTRICT="test"
+
+src_install(){
+	# The autoloader requires the 'T' in "Twig" capitalized.
+	insinto "/usr/share/php/${MY_PN}/lib"
+	doins -r lib/"${MY_PN}"/*
+	insinto "/usr/share/php/${MY_PN}/src"
+	doins -r src/*
+	insinto "/usr/share/php/${MY_PN}"
+	doins "${FILESDIR}/Autoloader.php"
+
+	dodoc README.rst CHANGELOG
+
+	# This installs the reStructuredText source documents. There's got
+	# to be some way to turn them into HTML using Sphinx, but upstream
+	# doesn't provide for it.
+	use doc && dodoc -r doc
+}
+
+src_test(){
+	cp "${FILESDIR}/Autoloader.php" "${S}" || die
+	phpunit --bootstrap Autoloader.php || die "test suite failed"
+	rm "${S}/Autoloader.php" || die
+}
+
+pkg_postinst(){
+	elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
+	elog "To use it in a script, require('${MY_PN}/Autoloader.php')"
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index fa5af67aba79..a69eca82cdd5 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 7f4d314e6abd..84d88940362d 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,18 +1,6 @@
 AUX aiohttp-3.0.5-tests.patch 294 BLAKE2B c535d85c0ad73394897db4db2743e3e6c09faa98a5a8a013b5b5b7af79adffaaa30f20a4cdff65760911c8f3ff373318e144d7ace6a7de6b0fa7b6cf9b8bf352 SHA512 0e5871efad3d360757fdd1ef723b741669a1e0b98728f58fe689b66b765dd4607e05a72cb618ac55b6a61cd53247916f9d497ca147eb7c8c86b8473a298a4b38
-DIST aiohttp-1.3.3.tar.gz 526273 BLAKE2B 5721479dc2141167118f226b266b504d689fa6708d895817fa448c4ffcdcfd71f5e95c98015d3a0e159d1f8d67232f3ad8a31abbed2532eb60564518df017bee SHA512 39342270f615f7e5e01889ad50ccb60335151e94631007b105acda9930038d2fb66128469ca44043280c9f737130e2361129e2fa1c857a7654a1151b98a19a69
-DIST aiohttp-1.3.5.tar.gz 527432 BLAKE2B 6420ecc1eaa29713643dbe9a05061df5277f10e263469d82a24397fa2ec53cf57aaeac86c22a17f06102bfcc69bfe959b6e00b264d9ef30eb193405f4eb9ea70 SHA512 b99630fa9006163d61e0e010972aee8daad021c5ad0152b04fb6f8b661f18ea03fcfa8d35603ecfcdaef4ecbaff0159b49e2f40164241bb5def48b2847e2d966
 DIST aiohttp-2.3.10.tar.gz 848324 BLAKE2B c32a7be3f3d9ba0bd1308c5bea779a10e177b9c018a03fb3cf95d1a1392180f3b4ea294dc23e2e946cc1065d16d212a169ec262a79034ae94b3a5067fbaf362c SHA512 e4ea725bbd3d7d749f2ec21eea1ff9f5c836fbeaa17ad72f77e378c69b008448e57503175bee6adff86110f65edc915cb6368df3011d1d9d61cf47718b086be0
-DIST aiohttp-2.3.2.tar.gz 841030 BLAKE2B a291baa1c5e915815ec80ea1cbd8434b31f4098eeff20767898fc73d75c6194df4bc2a5d21147a8e5c506f5bc377e79b6e8937ce65b9c73616366f439e542c1a SHA512 e481787fec8c9f21d49978b378fb5ef8c06d06cd7a6625fc36c5d4a035e9047f4ed0e38b25b613f1b685ca40e18c796376750f4ac0970fcd1d72ca7fbe31d13f
-DIST aiohttp-3.0.6.tar.gz 738111 BLAKE2B 28a3560a7b351ee974db8bbdd372798e01696e66660b6330707c542253c4d8a0405e6e8c2c8ec03c3b0ea8b548516ffb2dfe14b800b5f17e908991244bfd9335 SHA512 43f1b3c2da1bc57ac6e83a01abb3568b71ed5514e9331aaba4b691ff036d2d3e72eeddadd0f2f20608fa1f622a673ce1d4489bced2096ae546a350ad5f438d0d
-DIST aiohttp-3.3.0.tar.gz 722307 BLAKE2B 3bf1906e8a518d443a2f1bfff536fe9c4024dd18d12ed791dd4a81cfa3f81260bbbf293ae093086fa45c068f3417bcc797d1ee01e64a890a9427944ac9836760 SHA512 e7dd320abb0d9baa0dd583ce034b2d2dd328aa37750197789207e80eabfaf1e998a58e9aa0a6b98ff213f8c78ca90b85698ac559c57f44ce1b643fc317735a4b
-DIST aiohttp-3.4.4.tar.gz 822110 BLAKE2B 808c125f0d826b11d5b333ecfc35ed15cfe5a4f4242df5dd1b1e8edf6502c78d6162ad21e4fb7026294bc7013251a3b55d50c9cf34539b06b32348be2b1627a9 SHA512 968b701b8a19aa445a4af402f4bb38754565e3b80b4248127e5017671c921c370eea63fcec4148b7229ac1a74bb8739f33513abd6cb7fe02f3feddfd3ec1a6b1
 DIST aiohttp-3.5.4.tar.gz 1097647 BLAKE2B 27d3631cf33cc5052deecfeca23f6c052fce344d9a889b0c0c0e68d9dcc19eb56e2ef2496f025c795dea4f906a59ae579ecd489188f8c56bc41255b4f450f4bf SHA512 9bc31457029f7db5bbfe1e213c1f428bf90ac96d83b6d2c8838261a3910ab9f7632a4299618377acb1bed04b0cbb4b4f6d9ee814495c05f210ed9bb4f4c61714
-EBUILD aiohttp-1.3.3.ebuild 1538 BLAKE2B 0a09a1834fdfa7acda3b6aeed04217f71d01b5db13142f5c2c6261c7e33d6dafbbecfd2bc4ef667960dfad9bc953d2398541811c4ff6093b3358107ec25fc051 SHA512 2fd4ad6d6f98ce4b66d6b9e4150ddac9cadc7664a40ca93ec0059e0fc8b846ba5fc94b372211d65704ec386800a48a40f4934670796fd1408524f8f1439a168a
-EBUILD aiohttp-1.3.5.ebuild 1538 BLAKE2B 0a09a1834fdfa7acda3b6aeed04217f71d01b5db13142f5c2c6261c7e33d6dafbbecfd2bc4ef667960dfad9bc953d2398541811c4ff6093b3358107ec25fc051 SHA512 2fd4ad6d6f98ce4b66d6b9e4150ddac9cadc7664a40ca93ec0059e0fc8b846ba5fc94b372211d65704ec386800a48a40f4934670796fd1408524f8f1439a168a
 EBUILD aiohttp-2.3.10.ebuild 1716 BLAKE2B a2736bc15b41a4a29bb45ff422b86c30d886fbc80e968bf7b435045addf953bef80e24950e5ab6573e5e84f358f89c59d217e56c717a9e13aa06410f8d5e7a2d SHA512 541325c91470dc74f8f51843c5544efed81ad52bf706a8160f6fb269ae9c594a4c1f86f556b846998667b8996a80dacbc86bad968dbf5824fa81b509f3dc4049
-EBUILD aiohttp-2.3.2.ebuild 1583 BLAKE2B 4f4268a8b8a32d4d8aa4f982cf386575f9aa00852819d07e08e4e128dae10d7247585b5ef798d58fd687eff109e70da671902b91073962bdbc3b2b19c8cdfddc SHA512 3dbc911cc0ed37b993a398722c9314636cd39aef0f2a47a58e825d5df90bc49a239d6d30192304b120a87d837968f21047b85faf108d9af94bce3c60d9638ce2
-EBUILD aiohttp-3.0.6.ebuild 1833 BLAKE2B c0d3a1c13ebd7699ae2d506e78de5df605cfcebcc5c25d06aa5d696e534768dea9a0439cb6dce1aec76c042a07f852e87a228f6b1b8150a8b3f3347f8d914e9f SHA512 67b964d4905c55423ed6a1ed30db93b8439a69d0ec1b3d642f4c9b79da669dcdf4cb012c750c34a616e23767df5a1094218337fc5037a29ea35b87e775755bf6
-EBUILD aiohttp-3.3.0.ebuild 1833 BLAKE2B afc0463eaac8b5bcf7317616a3dab30adb223792c64c7516a528c235e53e72e8254cccfc9c2ee8693b83e56c26ce41dfe0107736d00dfce169d587e7541fbd3e SHA512 5647745d6f7225498f8ff20a13cc050d6e6a45091f5e84b411075ea686772971ab3d82cdfa175353b50d567a01ee9002694b45e5fdf52bcba113ec116d946daf
-EBUILD aiohttp-3.4.4.ebuild 2261 BLAKE2B d2a2ed87c1966d02a25a3d644e3d6b7ddb51fbea0cb8f9db507fd59b562ed297f6bd86f47029cc65b9b6d7b126627776f9892f4f02c279cec89bdab60b452a13 SHA512 57d9346f6372cd6249d7cfb6887db812217868f59170dffc342d45caedf9f04ae716573fc6b583ceb966cd144790237b7f5dfae82a157de65248f49e45394c19
 EBUILD aiohttp-3.5.4.ebuild 2194 BLAKE2B 5d8c82f63b0f6aff4f640da121266e99489073653107f912ac224ea78e5c419af40909994fc8d4fd3e825d0acb4c01eee572b6f7ce77088c7a53f2a988eee4a1 SHA512 35012568426f847ba852b26db64dcd3f6d535692bf897c75b822cc33b5b826a1c526f9f300bc3496b38beef7d940c785b3634704f8137d6a8ea1a2af9ff211d1
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-1.3.3.ebuild b/dev-python/aiohttp/aiohttp-1.3.3.ebuild
deleted file mode 100644
index 15ef3ba76d75..000000000000
--- a/dev-python/aiohttp/aiohttp-1.3.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/yarl-0.9.8[${PYTHON_USEDEP}]
-	<dev-python/yarl-0.10[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-1.3.5.ebuild b/dev-python/aiohttp/aiohttp-1.3.5.ebuild
deleted file mode 100644
index 15ef3ba76d75..000000000000
--- a/dev-python/aiohttp/aiohttp-1.3.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/yarl-0.9.8[${PYTHON_USEDEP}]
-	<dev-python/yarl-0.10[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-2.3.2.ebuild b/dev-python/aiohttp/aiohttp-2.3.2.ebuild
deleted file mode 100644
index 54ad3a922519..000000000000
--- a/dev-python/aiohttp/aiohttp-2.3.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/async_timeout-1.2.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-0.11[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-3.0.6.ebuild b/dev-python/aiohttp/aiohttp-3.0.6.ebuild
deleted file mode 100644
index 578bdb459407..000000000000
--- a/dev-python/aiohttp/aiohttp-3.0.6.ebuild
+++ /dev/null
@@ -1,70 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/async_timeout-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	dev-python/idna-ssl[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
-PATCHES=( "${FILESDIR}"/${PN}-3.0.5-tests.patch )
-
-python_prepare_all() {
-	# skip failing tests until cause is determined
-	rm tests/{test_pytest_plugin.py,test_worker.py} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	#PYTHONPATH="${PWD}:${PYTHONPATH}" py.test -v tests || die "Tests failed under ${EPYTHON}"
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-3.3.0.ebuild b/dev-python/aiohttp/aiohttp-3.3.0.ebuild
deleted file mode 100644
index f4498aa7e38a..000000000000
--- a/dev-python/aiohttp/aiohttp-3.3.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="6"
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	dev-python/idna-ssl[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
-PATCHES=( "${FILESDIR}"/${PN}-3.0.5-tests.patch )
-
-python_prepare_all() {
-	# skip failing tests until cause is determined
-	rm tests/{test_pytest_plugin.py,test_worker.py} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	#PYTHONPATH="${PWD}:${PYTHONPATH}" py.test -v tests || die "Tests failed under ${EPYTHON}"
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-3.4.4.ebuild b/dev-python/aiohttp/aiohttp-3.4.4.ebuild
deleted file mode 100644
index ec6ebeb0b474..000000000000
--- a/dev-python/aiohttp/aiohttp-3.4.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	dev-python/idna-ssl[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-aiohttp-theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
-PATCHES=( "${FILESDIR}"/${PN}-3.0.5-tests.patch )
-
-python_prepare_all() {
-	# skip failing tests until cause is determined
-	rm tests/{test_pytest_plugin.py,test_worker.py} || die
-	# AttributeError: 'brotli.Decompressor' object has no attribute 'flush'
-	sed -e 's:test_compression_brotli:_\0:' \
-		-e 's:test_feed_eof_no_err_brotli:_\0:' \
-		-i tests/test_http_parser.py || die
-	# make pytest warnings non-fatal, to unbreak tests
-	sed -i -e '/filterwarnings/d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 7e3eba56f92e..d09bc491cbf1 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,13 +1,7 @@
-DIST async-timeout-1.1.0.tar.gz 7590 BLAKE2B 855a630b1c1be6751ee416a9f394b93b25df7e3ebdadf1b34b6d992b643ee19ccaa4a895e66608ea0d84e10573bba90e02478964fc43c34c43ea02f1064a0b60 SHA512 7132b0616052623c17d7a541051f3e759f8dc87f9ff1730585a1010bc6e139c24d5b8835431749d695fde56fb465f22094ec3f98f5f95b0b7664ec9e1f990cac
-DIST async-timeout-1.2.0.tar.gz 7700 BLAKE2B a658cc80ba0b35d1f79286d8f6edac4aaf84e1bcef680b1ef096f6f9d14873800f948429d00fe09b26e20ab109c676fb1ca838931a83473f59863d490caf2c0e SHA512 81a8d3fd8a6756335ce7ea292afd0ba508ea120482dfc4526017dbf6ee809e6828818653be25dee123e8626fc89cc49cfbcff41748ec950b8797b2bb21f262db
 DIST async-timeout-1.2.1.tar.gz 7797 BLAKE2B d8f736423631a2b2c0fb748eb2857e0f9a143af9591ddfae15d42ab13af33196a6624db5b0a705265269ed28c6c15a4e8cfe56143ccedac75a555ae62a82891b SHA512 2072caeb65a74f1a24b59a4ea905ef96d70f8fb117e3dd9c95c1107b1d67ffaa4d76b68f00364049e6e29cdb0a6d247ba0c3638ccd0a8db27bd6ee0f180f9ccb
-DIST async-timeout-3.0.0.tar.gz 10803 BLAKE2B 3cee55e523a652c27f73bb3790d3c214f2744ef1ba3e0fe6fee80e5e4172cab808b08513d1beb99e71a36eda0a27d31fcf23e7a1ea0fb4569dc1310fef3557e6 SHA512 17df44da4d6038dcfa30b1394bcffbe9a31470c45fcd20c21da8dbea154fd2d508afafb19ce4da7f65422057e3a141be2bd9171d0a385556814759da0fb0496f
+DIST async-timeout-2.0.1.tar.gz 10463 BLAKE2B a9c1ab7ffd249f1d4d07a37f07743923a890d11bb9ff913b37f45e9f7be1110eba9cd24ce741b71a353ae349aceccd66a1853ed985416a85cdb4faa46f341681 SHA512 cb66bdc286082ef5570a7e3aa420434f82bb4131e9527c499c693a21d72b3f3772922c0ce2ad68e7de5f95960061e508effda56be398356ea75d55272f534a86
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-DIST async_timeout-1.0.0.tar.gz 7554 BLAKE2B a069f79eb25c1b698f688cff482970c60197ac6f22e610fe487e33180644a197961f97e1afc7d6ba86f9250add9c7c72d386b5209b8d99e0518c137246106225 SHA512 b02fa2f9558d23e6e1cc076f8d144dcfee7adeaad67c023ce747c99935c2809e2a2223f72b0a12274f11bacadc9b69a6bc3a2914c305ef05d483dc29908e9c97
-EBUILD async_timeout-1.0.0.ebuild 638 BLAKE2B 9461a752bcee0a1d66136c7466b3455057f75573d33d242620fdf64cf81393170d5a97bfe468b3de3edea41fad619d4e90f121bb70307689dbc4a26ac56a82cd SHA512 702b02fb755ea0c5395e07e28b8247799614d28921a7d4396c11b7e143987547c237687cad4ae696de7a58edb16ce8e02d98ce4a7aaa03bf181d39aee243b4c6
-EBUILD async_timeout-1.1.0.ebuild 687 BLAKE2B c31d7fa2f9f47cc275309a5d76d0a7e165efc67cab7a3c49fc4cf5b472d1fd89ff9895cc69d7a6d40e8a3e0473378d30ecd6acc3be0d9c92f2b17698ca18de24 SHA512 93c91df2eb301d17db8b4cb16ef1d8dd65c2aba649c66382784d515106acfe9d4448bea82664debbc87d6552ed761a6ab2f699f2473ed3e3d375eaf506acfea3
-EBUILD async_timeout-1.2.0.ebuild 679 BLAKE2B 79e40255cddfa20cff962f045fbf45d73bb967acaef923004574051bf64ec26920f041028c3370bf26732edfb0d32de9d4812e372a3ec677b38866c309299d15 SHA512 fdf7f5f6cc6d5c82e28e21c6e68f3a2d23bb72a43b1197fcdde29d346efe63acf63c6216a93ab3da29fbe315ef8a9d3ac7710a9059455fbacb21ea13c18bd51b
 EBUILD async_timeout-1.2.1.ebuild 769 BLAKE2B 6d8dca0f71de64dd55a2eab295818d2df64e51d774cd4c2fa1dddf6c69ea68f5dc1f35a702779bc76aa40daa4c143d8daa406ce365a004de1ebbf361fa035648 SHA512 dddd3320c35f7223504b500284ce96122b948a38a47144b5f92efc7a822e86ad5f8992d0cf4517af8e5a32adb293584845efe3cd597245ef98db9989219e2191
-EBUILD async_timeout-3.0.0.ebuild 877 BLAKE2B a01317eaaf886515525c77aaf49bf3a23ead7eb0b5ad686af1964fdb1dfe734a6c3ddb185c01a0b0599934608aac0c56df932523c134c20f3bf559726510832e SHA512 49ff65d96b9ba843699a3c04cb699ab68392ef2e2e076b326327a244e18e869357537f16dcc4feaf91f87f197b5cc0607a9a0fa8cdb576a35f635206bd274f55
+EBUILD async_timeout-2.0.1.ebuild 1010 BLAKE2B 5b83635cddfa16e2ad4395561b07be1cb579056b27c270ffa86849b182bf17c0e8f3617fd256dd9bbeffc11719438e1de96889c63f68d9ff25b298a21b5b9b54 SHA512 057b419ed3b6ebd4ae24c4b417914d90c659cf8f74bb8037f09bd0bc5ede828871a62ef435c94d604b289e887b41fc716207b770f33374d2ed8dd3213d8dc673
 EBUILD async_timeout-3.0.1.ebuild 973 BLAKE2B 1ae7cbf17557bb56256981a445da9c76465e2b576ec78c2931738863ca55c6bb75fb89c1013c88d979a40baba7b52042a7abe171040e84ad0a4ba2a68d5cb77a SHA512 43a969030e9de93dadb3dd07b47e8393e8b5036b313823f805655f3eff3af1b29d7b3a1e9d6b22de503e081df28cea4709eaab8e0948273e644b7790adf02dc2
 MISC metadata.xml 435 BLAKE2B a3bf9896730a3f697c6a41257e9f3c168154760ffba1cc5d5660a1442a3b5f5f8032d48ae0b069a412e3ef2e792376e29d3a0867a46576bf8b412acca0798388 SHA512 a7a43ad3fabf98be2d846d8a4bea1ff2a867f934e27d9f88b1c76daaf4d4195f8ffc6039f283313dd009566c732bcb0ab8a847e0b6424afdce902539530637dd
diff --git a/dev-python/async_timeout/async_timeout-1.0.0.ebuild b/dev-python/async_timeout/async_timeout-1.0.0.ebuild
deleted file mode 100644
index fde1383f0a3e..000000000000
--- a/dev-python/async_timeout/async_timeout-1.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Timeout context manager for asyncio programs"
-HOMEPAGE="https://github.com/aio-libs/async_timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# tests introduce a circular dependency on aiohttp
-RESTRICT="test"
-
-DEPEND="dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/async_timeout/async_timeout-1.1.0.ebuild b/dev-python/async_timeout/async_timeout-1.1.0.ebuild
deleted file mode 100644
index e268c983daa3..000000000000
--- a/dev-python/async_timeout/async_timeout-1.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-MY_P=${PN/_/-}-${PV}
-DESCRIPTION="Timeout context manager for asyncio programs"
-HOMEPAGE="https://github.com/aio-libs/async_timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# tests introduce a circular dependency on aiohttp
-RESTRICT="test"
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/async_timeout/async_timeout-1.2.0.ebuild b/dev-python/async_timeout/async_timeout-1.2.0.ebuild
deleted file mode 100644
index 375a1916976e..000000000000
--- a/dev-python/async_timeout/async_timeout-1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-MY_P=${PN/_/-}-${PV}
-DESCRIPTION="Timeout context manager for asyncio programs"
-HOMEPAGE="https://github.com/aio-libs/async_timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/pytest-runner[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-aiohttp[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/async_timeout/async_timeout-2.0.1.ebuild b/dev-python/async_timeout/async_timeout-2.0.1.ebuild
new file mode 100644
index 000000000000..96ae22608826
--- /dev/null
+++ b/dev-python/async_timeout/async_timeout-2.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+MY_P=${PN/_/-}-${PV}
+DESCRIPTION="Timeout context manager for asyncio programs"
+HOMEPAGE="https://github.com/aio-libs/async-timeout"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		<dev-python/aiohttp-3.3[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		<dev-python/pytest-aiohttp-0.3[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# remove pointless dep on pytest-cov
+	sed -i -e '/addopts/d' setup.cfg || die
+	# tests fail due to missing fixture when trying to load this file
+	rm tests/conftest.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/async_timeout/async_timeout-3.0.0.ebuild b/dev-python/async_timeout/async_timeout-3.0.0.ebuild
deleted file mode 100644
index 01a364ef3d4c..000000000000
--- a/dev-python/async_timeout/async_timeout-3.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-MY_P=${PN/_/-}-${PV}
-DESCRIPTION="Timeout context manager for asyncio programs"
-HOMEPAGE="https://github.com/aio-libs/async-timeout"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-aiohttp[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	sed -i "s:, 'pytest-runner'::" -i setup.py || die
-	# tests fail due to missing fixture when trying to load this file
-	rm tests/conftest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
index 0df0e92c8aa0..84dd2671b04b 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -1,5 +1,7 @@
 DIST backports.unittest_mock-1.3.tar.gz 4687 BLAKE2B a01712eaf5cb32d7da803aa9034f68508faa4d8db8d6f6eb02e20cb9f42c4e6bda3b409a0e2f676b6b7782f16d78877da6f093af6ac1f1deb100b19969570787 SHA512 71741db5c2e43beac8c72dbffa0efd4bbae140177f56c3b2bca3e13a3aebd8a418b5ad7654421899980f73b8dbfb3b02d85d2dfcd7b3827047fa6ba84a8dcfff
 DIST backports.unittest_mock-1.4.tar.gz 6034 BLAKE2B c347f1d45c610701b605cb75304f93c8fc7a8534e2c14efb4600a7c5cdbcff02e0534dbf572ac248d17dbc161dcabd8448941d8340a71734f29ff3294c8210f1 SHA512 ad19eba7c221fbb97ba710cbe96aa26de74ad8c70ea7b794d8dcad3dc86a55a45d36f542ad829fb8c4bcf09c772cf64532dabf337b40bf87c7b29e13236484a9
+DIST backports.unittest_mock-1.5.tar.gz 8941 BLAKE2B ba0ba99bd2668ffaf02f10cd5cf511e32660a2592550f879422400265a4b75732e03d2d0627c4563daca0063ac5759d30abf450c13f9d38b6b3a94b85cab9c17 SHA512 2f2d2c34f80009829935f9e97404bf1840d3ead9dad55fc6f967135b80ed572389d7f42ead2f82671ecfe341eb6ccf696a49560c848d1a36ec5570769a5820a5
 EBUILD backports-unittest-mock-1.3.ebuild 1481 BLAKE2B 5270648633c718bfbecff69278cb38cb0cb970bfdcdd9918e246ed5198e2ec1cfc66a27c9df3b3c0a9bde5bdcf1f01fa88e4b0ea8bf7c2b9661c79c73826dd92 SHA512 e32eadcd5c198926800f951576e3ffc081db46db662429375efb0d493307cde7de47c80bad864077f61b0c7df6ecbf241677b4e41ad80f2d250d348ac13006ab
 EBUILD backports-unittest-mock-1.4.ebuild 1592 BLAKE2B 805f016e27af7f6e37b8680b321596ef7d38d469f22d2f9a8d8812947a5e5fe4599063b38da1e33d33c7049f125b840942f6ad10d9798651023cc5d759668e3a SHA512 85bacc285529fcd48a970857c7ff9af7696806e690dea3fb637434bc3d67a0de553a4bece5d65e1a1c587bfb1e33a6f5cc94249b20afebcd47dfb684b1ca7569
+EBUILD backports-unittest-mock-1.5.ebuild 1593 BLAKE2B ffb1c9cdf9c96b9745f7f411ae17ece436e62f8041893f621d970ee3bb7a1ff1c09fe33d6d883c547ed5f171a509e87917636a4452704ebeed0ffb58cc6bec73 SHA512 5d3a248c228d8f180d26a732dace7a48a9f33f005a463d6ce8d37db4dfa6d988893487622e788f2dee351aa964b0592bd31733e212d88b249c9534e8b3b1d719
 MISC metadata.xml 657 BLAKE2B a5a51b30ebc334f17d09e38e1f42fc1e06fcf65de5a56810378909169cdce48bcb0acceb8b192bec54e67a254b0809a0339fb8ee11fee48e043a082f63fb9bf9 SHA512 5d0e58887da4b7362f3469c218af61c4ec31426aec212013f3ee19992fae9e664ce13b226c928fb0e6e6ea3efdd946d1c09b1da623a741e89b7b68b74e73cf24
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild
new file mode 100644
index 000000000000..819ab1d71bf4
--- /dev/null
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# It is the developer's intention that backports.unittest_mock will be
+# used even for Python 3: https://github.com/jaraco/jaraco.timing/pull/1
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+MY_PN="${MY_PN//-/_}"
+DESCRIPTION="Backport of unittest.mock"
+HOMEPAGE="https://github.com/jaraco/backports.unittest_mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/backports[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.5.2[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	# avoid a collision with dev-python/backports
+	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 7a881ff8568b..d325fffaeaf7 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,11 +1,9 @@
 AUX catkin_prefix2.patch 1620 BLAKE2B 7c6824c35ac840429646e1804e417ea09971be6a497ba6e45daccd453aaf0a6e17608ddabdfbc681d5d83f0bf42496425aaf4c0fbc3c3f282fb62a4639bf0a0a SHA512 2750d043373d5a7ae0761feaf5210847fad08bbef96804cf6c4931fa751918241e0517bc538b1db12ae981d6a3a89afb53cfce8b2dfd7d80b849a6de203edb13
 AUX infinite_loop3.patch 1236 BLAKE2B f236f05623b5ee4414fe3da7efebf61d62ed8617d47a659e980907aafabe3c0f4a0fc41779c73872235a186c7457ece6991433c67acace597fe86f5088ab9cca SHA512 4d07d04cfe1a10531129494000be11fe6b2598c077658b212f888b24d3de997fa6730641055caa181a5a071585f41f82cd4783c46b314cf66fe1f34b70f538cf
 AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
-DIST catkin_pkg-0.4.10-gh.tar.gz 61272 BLAKE2B e4246d602fd8b8a8b8dda4f412aac4f88ae3328bf2602268566a0f761fa7c435412ae36f563e8082a2e0497c92ca302ea7505dfb32802d3ff00fe4323cd361b1 SHA512 55c2a03c922f647f25e74dce33486d09070c3089dfe2ae26d0673752298d6bb55652b9079b32694c9d80f52ae55fef2fac9f853b6d0b9d6121e6e8c233dc3530
 DIST catkin_pkg-0.4.12-gh.tar.gz 61535 BLAKE2B 9b1a60cfc6bfda6e0f126f062cf62636df162577d693aaa07c4e7433f74383686224c31e0d567a95de20e2643c39f84781be3f82b39d9dfbbd1aed0dd397587e SHA512 227a6f07a46ab62d51f408a8aa08d57199a8f4d7c954421bf9a605fce3a0dc447c9379987bcacbed3bce139f00e95bd565286a530b7177acfc29a172da30f7dd
-DIST catkin_pkg-0.4.9-gh.tar.gz 60919 BLAKE2B e7d4987022359fa7306df77ede2e07b2371bfa16b9787e513dd096ffe3988f9b7e6cbf61b96e00992334dadc6052811c20e0b7ea6c9198db332c1eac545c5031 SHA512 53e8440c0768b221526d134c5609c3088dd02e214150253469fe5883665936472486792db2d69c05fd352949f2350bda5960e71cd54e3f1d9164e0915c963295
-EBUILD catkin_pkg-0.4.10.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
+DIST catkin_pkg-0.4.13-gh.tar.gz 61790 BLAKE2B b879b6e71c84863fdcbca1023dd5850a226c850e47348a5ce3cfa846bd4dfb7fe0fa2c406003b4d1a0ae7ab97e57a983a499c3a27851d3101c928765c9620cdf SHA512 b971019fe2f8e66639d271ce3a7933368a4af7658d143cb042a315492926a4b0c3593dc9f784ea75150aa048266219fe80f2a104adc6d361a6725d4b24aef330
 EBUILD catkin_pkg-0.4.12.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
-EBUILD catkin_pkg-0.4.9.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
+EBUILD catkin_pkg-0.4.13.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
 EBUILD catkin_pkg-9999.ebuild 1234 BLAKE2B bbe58928171aac97dbfb4d65bd0bef21da1198328ac1a0ef83024bfb54d0da6ccddb4717fa3de9c3420f621603bf5e2e9349e8de03cfb3fc1773dd99f3c3a9fb SHA512 561fe01e7b05df39d2aa0bf818efa6fb7a69543ce264e9f414960f261c23fc7a09286ac6d2f68c26c91c5bfc368e04cd7703752cb054cea1b732e46da497c235
 MISC metadata.xml 343 BLAKE2B 54c183cdd942eaeec77723ae80d09a3cdd6e40270a3974e80a811fb050289e6f86b8d722fcefb1f37f7c2b8ad1ead3e00f04d49c2a029884daa7c2c33869ef87 SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.10.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild
index d24c376aa411..d24c376aa411 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.10.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.13.ebuild
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.9.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.9.ebuild
deleted file mode 100644
index d24c376aa411..000000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the catkin package system"
-HOMEPAGE="http://wiki.ros.org/catkin_pkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${RDEPEND}
-	!<dev-util/catkin-0.7.14"
-PATCHES=(
-	"${FILESDIR}/catkin_prefix2.patch"
-	"${FILESDIR}/ros_packages.patch"
-	"${FILESDIR}/infinite_loop3.patch"
-)
-
-python_test() {
-	nosetests -s --tests test || die
-}
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index a6bc8175b949..94513a796d0d 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -4,10 +4,12 @@ DIST cryptography_vectors-2.3.tar.gz 35303908 BLAKE2B 694f5a741ddedce2101632dcf1
 DIST cryptography_vectors-2.4.2.tar.gz 35087269 BLAKE2B 2a8df1e98b6bba127bb8634ed27b43d4d99c77115d0206b4730feeaf6179d31e0b54eb38ad809e828c2ac6db2ecaa5cbc47f6ab2f99a888eb7e738380cc3b8ee SHA512 cddd46916b6e5c9101589e6aaeaae0da61eabce9df21a196e09ed0c12bfa7da6e3afcddbb75c657f3370b2a3bc67ca862b22d6c7750301a867b6b03cb9bc83a3
 DIST cryptography_vectors-2.5.tar.gz 35094063 BLAKE2B 93b97e5483892a43e69c3bc8d408e0e831246e530b2665fe372f1caa6284a2701c119a85113a85f86128f71e8be0148328f623c6a48f7d4cafc774ea3eb42da5 SHA512 cdd066c597731eb782a3288ddd83ab97b13097360399e8368c7c7c8ba16ff3e6269405885c2ad81aeb0f79d8ff84395aa00639b3453576ac0b57d37d8d36dbf7
 DIST cryptography_vectors-2.6.1.tar.gz 35097785 BLAKE2B cf5784e97d288b464d79d0aa13bcd19fed3e1c585c1589b52092d654a9988dd52e64c317c50774d4dc54f535d37296df8e5da070fbaa5f38d4eef3cade671a87 SHA512 44d318d5f983955f42791cf182dd80070a87c3c05f7353e204a520588243041fec97367c6fb6d9febcdab0ce7bcf1d135a8e6b44a7387b599752b7c87fc81d9a
+DIST cryptography_vectors-2.7.tar.gz 35098743 BLAKE2B cbc789a2a5340f5d612c68aa59dffa53092dda48c1608558ad0b5d307c7cd0522198eb0a0b754e1c9238dc4ea4bcb9ddf4febf5514ebf3ab74e239d161468153 SHA512 c68950ca1cf2ac261acdeeb2c95f22b3338d0ee3f1064d6b0e0df36e0d22bb461fb6013c9da0097e7901c7e600e0067213a854359e586efc1a9fb082bd8e4b4f
 EBUILD cryptography-vectors-2.2.2.ebuild 683 BLAKE2B 14c689b0fe1ce428867ea594b3dd257b537aff0577a25c24b37efc28ac57b05427195fd51bbb54d1aec85a6d1acb0f85fb45846dbb9e1a65436df62da6dabd05 SHA512 ec57ff26c72f11f48257b19726e2f17916cb1dede23026d76b723079ec58a12ea561bb5e44a09269238049ae0443ac5e42145a89b868b80b7bda736cbe9815c5
 EBUILD cryptography-vectors-2.3.1.ebuild 708 BLAKE2B 7c013c701827c3b9388d6a51cdfe1fa3be55018054ec60130b59cae09104be198fc5ce7056e0e8ba3cae3bc2ebaa03eaa9bb56a6408e7262b2d34b21ab07f740 SHA512 06ba07ffdf41aa1de0ce0042ebbe8c52e0a2211d0856b0df560b9caffd4c5136df4cae3e112ac08d0a839bc72ae23e5f865992312dee6bbb2f8de7ead69b4d8f
 EBUILD cryptography-vectors-2.3.ebuild 706 BLAKE2B f76f74204d63ed328e92e56343d8886f37e235cf734183b88498afd83910dfd2bf4e108cf9163020d14eb74e498a6ebf174e6e424ebfa4e186275f201d41e9aa SHA512 7f2cb39ef10afa831733bf78eea20257ee29d8ab05dd5bba14131310c4a6f9bd8f16e24b4091e0b9756056fd96465dad8ee25c684343d93b2d70291b902c2110
 EBUILD cryptography-vectors-2.4.2.ebuild 706 BLAKE2B f76f74204d63ed328e92e56343d8886f37e235cf734183b88498afd83910dfd2bf4e108cf9163020d14eb74e498a6ebf174e6e424ebfa4e186275f201d41e9aa SHA512 7f2cb39ef10afa831733bf78eea20257ee29d8ab05dd5bba14131310c4a6f9bd8f16e24b4091e0b9756056fd96465dad8ee25c684343d93b2d70291b902c2110
 EBUILD cryptography-vectors-2.5.ebuild 706 BLAKE2B f76f74204d63ed328e92e56343d8886f37e235cf734183b88498afd83910dfd2bf4e108cf9163020d14eb74e498a6ebf174e6e424ebfa4e186275f201d41e9aa SHA512 7f2cb39ef10afa831733bf78eea20257ee29d8ab05dd5bba14131310c4a6f9bd8f16e24b4091e0b9756056fd96465dad8ee25c684343d93b2d70291b902c2110
 EBUILD cryptography-vectors-2.6.1.ebuild 693 BLAKE2B fca6d15447ed2bb690c11174eb7232611c0cc5fb71c064a7902d847fb6e94519961c3a0fd0d6784f60511ea8cbeebe73b0e2f5b4f85f520f9b439dbda02f8506 SHA512 cc88ec4012c7faa0d19a4518773b8225aa0e88fa739fa02ceb97314841062375cb9e786a830d6b1f519ff69ad5b518a8d20c19709ef7b8d3bfcaa1a72560f1d3
+EBUILD cryptography-vectors-2.7.ebuild 706 BLAKE2B f76f74204d63ed328e92e56343d8886f37e235cf734183b88498afd83910dfd2bf4e108cf9163020d14eb74e498a6ebf174e6e424ebfa4e186275f201d41e9aa SHA512 7f2cb39ef10afa831733bf78eea20257ee29d8ab05dd5bba14131310c4a6f9bd8f16e24b4091e0b9756056fd96465dad8ee25c684343d93b2d70291b902c2110
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.7.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.7.ebuild
new file mode 100644
index 000000000000..dc69a046a72f
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.org/project/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 6e5b7e505418..62765762ca08 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -8,10 +8,12 @@ DIST cryptography-2.3.tar.gz 449464 BLAKE2B 7485c745f9c6512a5efce42181970deff19b
 DIST cryptography-2.4.2.tar.gz 468645 BLAKE2B 80ecde87cf1568239977fbe4f835db98f689a7dc3646d44229b5b33932885c288d4274427f5d04eb74e9e064b01b11b7eac40fc6221ea2241371bca618cc66df SHA512 800735fa86e9ad0f8517328d47e55dc79a2b86d8c7539ee2921c526085782d8dad5559bbee84f7effb42275503fa9a984b099a688c530c92f5672c423c0f1a28
 DIST cryptography-2.5.tar.gz 487694 BLAKE2B 9502e7b7987ee0101ad8e5fcd09208034222a7f20b6b3bc3126c8b59081c9d8ecf872985d5fca191fc132dd6759afd4d11c0e0d39268627f35990c005a2095d3 SHA512 5e8f8818fcaa8143526006b027107b8afbdc925d40c846701e65b2c7ee02235b7e0918246515520ef2030b1c87bb157d0d403c28ad68c31459d677af7e2d0b3f
 DIST cryptography-2.6.1.tar.gz 491580 BLAKE2B b81114b57e9973c80fe999a63a3b1269d6289ac67851fedc263927b74e9e5ec4f35356cf5d46e4a27a994d5a3b2b3b599fea264b3ebce3a0cac27abfde3ef046 SHA512 f14319e24d9dca52e74548cada5b78a6235f089ef875dbff4799e862f94da8b087f1b6e03e84dcef9fc7d7693c4a349c5f0cd54b8535806da777420ce8757d39
+DIST cryptography-2.7.tar.gz 495877 BLAKE2B 48654897ff6ecd2fcf732b2d0378b806a9162c07c9e8349128593f4e28b3df222ac6a9cc19bc9342d303d1930bfb12747f9831f2a1bc42b1e784d85d69f0bf00 SHA512 fa420f44b038b6fe1983c6f2c6d830e2668017c26e1e125ad621e37ea627a927ffe64d0e987e0a26dcc260834f2ec817cccd22da03b892190f46cb6e8131a5a8
 EBUILD cryptography-2.2.2-r1.ebuild 2167 BLAKE2B 8e134891d78e2e8651a21839784cc81d322f478616f12f6f3b550a77262065a3de42dc0fe58a4c8b8c82bb144cdf62b16011551abaed03c83e31407d87051af2 SHA512 fe98cf1615072076650bdc00c42a04b992e33f47ec27cf4153d1572017c622c2fa7285c7c759577e8750b215dac7663685564873ca83008d8cca6b172d770121
 EBUILD cryptography-2.3.1.ebuild 2162 BLAKE2B 107ab46113d303cb65ea7a525dc52cdbe4002effbc751cbbfe4e60eafa9cf9c7b6b991f8644503fab0a1114b2c63740fc966662a9a3f66576891753a8ec6e47d SHA512 788f58ba1a66ea0a658acb686fc2a9a1693274482e96cf95832c68df4c81f1a43ea545da163244385601cde5a56a83071d9340ccb2f100df6ba8474e2d019707
 EBUILD cryptography-2.3.ebuild 2117 BLAKE2B 3e57b574745c93c3418cacbff7e878c55b14623817dd3568146424b8a58e55e16365e8df0bc484f56e95914c50d5cec9babb8f77d1663512d458dc2e62a396d9 SHA512 6c507578db5f181ef9b72804d7b0ff33d2314bba8dc9a59d378e0ff7d36a51fdaaa1d71a06ddca25854850900159553e4597da96584e5a32baca4ac7d555a4fa
 EBUILD cryptography-2.4.2.ebuild 2117 BLAKE2B 3e57b574745c93c3418cacbff7e878c55b14623817dd3568146424b8a58e55e16365e8df0bc484f56e95914c50d5cec9babb8f77d1663512d458dc2e62a396d9 SHA512 6c507578db5f181ef9b72804d7b0ff33d2314bba8dc9a59d378e0ff7d36a51fdaaa1d71a06ddca25854850900159553e4597da96584e5a32baca4ac7d555a4fa
 EBUILD cryptography-2.5.ebuild 2132 BLAKE2B 1820f42eee23ede2b0248a3a962493030873c50c82f46dc76bfb56fdcfd7097ba3fbd078694a0ac19178ea5b929a2a31d8e4ca30f5e25fd3f1397243b1f6ed19 SHA512 a3bef75e92e4ecfea739ee7cc8f94179577bfc2d99d4ec7a5ae19a3a32afd50a0cefb0b83d2456e1f7b3c1c427a718702e70b3a16648727a33f10fc99c122146
 EBUILD cryptography-2.6.1.ebuild 2226 BLAKE2B f1d48009f72b3926a4531e5548251880bc209290a4a18cba100905616bc0ce44c71ebbf8a13fed23605193263e3137085491e606e02ceb0e4a8e8db9fc02b97c SHA512 1b2b0ca56e816a2c495a180cf7a6407ee77fc421d547ade989f25baab02d6e8b75f8afe2edd23310a7e98f90a25244e6e4f8f436745869461854f13b3bb8e9e1
+EBUILD cryptography-2.7.ebuild 2191 BLAKE2B f1859d0fba92e4d521287d1ff2cf1cbca9df68138846272cd299d63e9db80c4b9be822e73ef9b850649ffbf396b6c3ca67ab8b60f2bc00fef9018b82eeb614bc SHA512 6a4b90f09feb404a5e8f989b352b6ff67a8c32c630ef0c9f659d24e89ed9505105aa2e2a300e2a29ae3ce81f6a48699fd5e29a94061a373ab129c0bd8840fd94
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-2.7.ebuild b/dev-python/cryptography/cryptography-2.7.ebuild
new file mode 100644
index 000000000000..659f319fa658
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="libressl idna test"
+
+# the openssl 1.0.2l-r1 needs to be updated again :(
+# It'd theb be able to go into the || section again
+#=dev-libs/openssl-1.0.2l-r1:0
+# the following is the original section, disallowing bindist entirely
+#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+RDEPEND="
+	!libressl? (
+		dev-libs/openssl:0= (
+			|| (
+				dev-libs/openssl:0[-bindist(-)]
+				>=dev-libs/openssl-1.0.2o-r6:0
+			)
+		)
+	)
+	libressl? ( dev-libs/libressl:0= )
+	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		!~dev-python/hypothesis-3.79.2[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index d4335f8dae53..92c28151b4a5 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,4 +1,4 @@
 DIST css-parser-1.0.4.tar.gz 143977 BLAKE2B 94a42d751a90d306b0dd2d503d8d9c326509b438d1f52b5567e6f6db7d80e7a6d2c37cbfa0db79225cc4d0fd5df612b3e430fa1c62604a2f8990d20678019af0 SHA512 3781128e55c1e72aa00369873e214f683e3f42944ae83d399697adb7d2966f68fb500c39982845ce9cd06078e4021838d82b06f99d90938069371da8a89a0857
-EBUILD css-parser-1.0.4-r1.ebuild 456 BLAKE2B 7058f61f5f8ee1ba29a69de5fc522f8a45d94b114146966dec43f569a7c092cf1d99fc77c2577a809458a9d4a2bc2a3e70b7df6c04d34f654e36993dd22da1fc SHA512 3d0906af51d8b800cd4ec1711305eec4fc05195e4f6ce30c244723134358abd64af0aa1f4e651fd03ed5f077a9b183b3e29ec103fcf702100bbb95c73637ee3c
+EBUILD css-parser-1.0.4-r1.ebuild 454 BLAKE2B 54dcd27e65fd39ebde410af6218d19e334a273eda334ee98e312349fba947ae883a6d8a5eb7b01e962d6baa0602111f4ce8ad8035f0d37fb34f075ab502d4501 SHA512 799bd4da0ffa1219e68ae8bed097618b7c3d39b83b4ed600b56f1b1477b5b5eeac36575a2a4f6c70b89344f71f78375225dd11abc84288f5636cfdeac45e2dd1
 EBUILD css-parser-1.0.4.ebuild 513 BLAKE2B 0f71bdb613060632b0aa263ad32a1dff6f1cfccd2622c1e5b08dd80a990b27e79e29107a5adcb53baa378b5418b78d1afe7826352c34701b06a76b73ce53e305 SHA512 42eb2bc62415953f4d34cb550380c5c1a26fad3d34008be88b77a43086d3fdf3f6ee3372cb518080f74c778c5f632b5db10690c0d54852ebdac4f42e84da93ca
 MISC metadata.xml 313 BLAKE2B bf6a2cf19a6d43b19692e4d932d695a811d10530fadb6b33a6f329be4ce815bb36ded2c7a1b3b0081237543954972d58ae115576d4ff0c3d4fc0309fb77f3a58 SHA512 1ca073d67b4f5afa950071e961b091993c0f14a66073e28f33604bc5cf5820d9f4701901d93f8db46a91b1fb6b7a05b8164a749823e2c59959640e8771b3126f
diff --git a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
index 29254e698e30..e7bc561a48cf 100644
--- a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index bcefe00d3861..c8e6abe7eefa 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -3,6 +3,6 @@ DIST Cython-0.29.12.tar.gz 2050537 BLAKE2B 86c5ffd07e97d549f2d98ae0aa66a03dc2f8e
 DIST Cython-0.29.4.tar.gz 2044382 BLAKE2B b36d27706a3270805f66190a4cf2735eaf20b1b932365b324a433c0e58e63e860ce1500333233c3539ae697886ac0adc361a2c158d5d064a3ea05843debc3f26 SHA512 8f115e36975aaf64eda4df8b0a85378d0c80b3292dbd162be826b939def03bdc9f3eb937676e2367003c2944b570d97f50d7880becfdb2fdc5144077b4a722dc
 DIST cython-0.29.13.gh.tar.gz 2072564 BLAKE2B 55a8c5c932262972cfa55ee2771e17ab5a57beab03d0dac5668f654a0bf68850ef62b7e59b322c527115af48b7243b9c919e739eaf440338a50b89c4645c0fbf SHA512 79efebfddabf31a046ae86a2c2170e0956098f4b1c7b8bbd338d30be7c96c31ee2d648332fc16ad9cf1e5d0ea4ca1a070b2d31ccbeae0c0f86a2f7700b92f656
 EBUILD cython-0.29.12.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
-EBUILD cython-0.29.13.ebuild 1971 BLAKE2B 37e685eac0b519a4c4bad0ce3b325bb63427f1dd39859f82b15c723e2e2225f4f922188b26c8fc0cd1069e2e4d2ebe6134a0f6c194e972869ad004203a9b02da SHA512 c22b620debddf7935d54738741b32ac65642c67f7434c9a3b5794365ec172ccc1ad01cd748a97d58e7daaee3d7e4bdfb3509e4964b7ce8e60bb3d9525c8b33a8
+EBUILD cython-0.29.13.ebuild 2014 BLAKE2B b9a1af5f3a3a6a9d8866cec7dba05a26635c33fdb0523605855773ce2524aad8fd31485cfbb3c6d5f801d0b4112913c011f6ef9bf1a0902ba3e30f5e7eb00b55 SHA512 d87c8d46ac2e2862d7ab694ec90a573fc16285d12a8dd78ff59128b9382e7641e69c0aafc59d38f52f14f28d6da6059da1d191e16e44524faa114f2480ade23b
 EBUILD cython-0.29.4.ebuild 2160 BLAKE2B 4a854e80cde14979e6a35131b7002a68745978eeda2d370b46f1d816a424296e61b43894e7e488ed7cfe238f2c0a8078639172ecbd9534326965e658b2fd3672 SHA512 b1b9f03ea3addd10e61ae1b855c28a495055a13a859df06ff3869cf3c917101dbe7c0259525103fdc3123c23c5f5c2c5804f7cefd073cb80a0248ea90097e4a2
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.13.ebuild b/dev-python/cython/cython-0.29.13.ebuild
index 5af794bfd500..fc895938e377 100644
--- a/dev-python/cython/cython-0.29.13.ebuild
+++ b/dev-python/cython/cython-0.29.13.ebuild
@@ -25,7 +25,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			'python*')
+	)"
 
 SITEFILE=50cython-gentoo.el
 
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index acb538d75c5e..d6fbf8903b1b 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,5 @@
-DIST denonavr-0.7.8.tar.gz 62774 BLAKE2B d601c24f6825202de69401c0778e8e1b5010d1475ef69a78aefa9ad18d0bfbbe99cc1405606c1a9f01d937e9937c0f33dc2f54b69213869b017571706014b444 SHA512 c7fc9b47b2acbca32277f8601f8dd63435a7e31c614f8cde6e101f9230691c389f3b758a2217fec9fbf15869dd95ceb371f88c4dbf121b25478e2713cfc7a09b
+DIST denonavr-0.7.10.tar.gz 62877 BLAKE2B 0b011f187f8952af81669d3568d5c6ae5584ce6b106ca769609711883bf62f7d4b7a605bc12e8cfac8f1a1e9622e7b37cc17be0545bbd24898b0a6f882f7adac SHA512 62b8a1f61f0fcf5c7d13b473d990a562e3fddf777b077bf5f9a0d7c24f9bc76810917421653dbbedd292b659e6c0ef7e1c303a5f152cf9d7aee2039d47702314
 DIST denonavr-0.7.9.tar.gz 62838 BLAKE2B 59a036a1b2fdd48731741180b143f69d0fc78e30cfafb88c675eb4a30b079eb3955b1e2f76306809d183d10a9583dbb500962cbae352203c570861687c58b539 SHA512 2c9cd25bd38d9128602b0bf009d3d147059d712a3ead99514a257e71ea2a1c97d94c151d42840dcff55ababffce53a23fab33759cf7bbc8bb786fefb91dbe362
-EBUILD denonavr-0.7.8.ebuild 741 BLAKE2B 129c4a678d34ba00d120ec0ece1de439f38c3456220623674aa5635436c880ee3b0087900467e7e15cc00d50dd2edbd9408b2e836000e1db0e3c07c5c4b656c9 SHA512 452739766312780a4465598a3970bdfb00a13aa8ac3999bc9eb80f44eb0ee118c0e22fbf723ef342b2a681b637a7b28ab8223da0cbe44741f7f4bba901d11e8e
+EBUILD denonavr-0.7.10.ebuild 741 BLAKE2B 129c4a678d34ba00d120ec0ece1de439f38c3456220623674aa5635436c880ee3b0087900467e7e15cc00d50dd2edbd9408b2e836000e1db0e3c07c5c4b656c9 SHA512 452739766312780a4465598a3970bdfb00a13aa8ac3999bc9eb80f44eb0ee118c0e22fbf723ef342b2a681b637a7b28ab8223da0cbe44741f7f4bba901d11e8e
 EBUILD denonavr-0.7.9.ebuild 741 BLAKE2B 129c4a678d34ba00d120ec0ece1de439f38c3456220623674aa5635436c880ee3b0087900467e7e15cc00d50dd2edbd9408b2e836000e1db0e3c07c5c4b656c9 SHA512 452739766312780a4465598a3970bdfb00a13aa8ac3999bc9eb80f44eb0ee118c0e22fbf723ef342b2a681b637a7b28ab8223da0cbe44741f7f4bba901d11e8e
 MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
diff --git a/dev-python/denonavr/denonavr-0.7.8.ebuild b/dev-python/denonavr/denonavr-0.7.10.ebuild
index 82e01eee1a36..82e01eee1a36 100644
--- a/dev-python/denonavr/denonavr-0.7.8.ebuild
+++ b/dev-python/denonavr/denonavr-0.7.10.ebuild
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index fef809af3d4e..de274fa9a400 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,3 +1,3 @@
 DIST distro-1.0.4.tar.gz 28772 BLAKE2B 1a337c0a5c125b89adbd3173d17390c5cce12c8549a3e7d90d88fd71f53d1b4c7bc3d1fc87f7bec33d7b4b1311539deaa9414b143daf40108b15dd78370450d8 SHA512 466f2e14b169998e3ff7420e12bf270ad9f934962ae92c2d24bdd747897ad66cb348194dd1376b8b53ed298ea02039943c80d9ccc6b8a01c2bd0c6d2be82c7f6
-EBUILD distro-1.0.4.ebuild 590 BLAKE2B 7770ee1520e7384710661a58d18727e19d9633080a5e2a2f6add3802ba3433797f08ae61f0213a55cccef658063c8bd7b18292ff80c6b45304820ea69952b573 SHA512 01cbd734c3d9894b1d3d69a4d073c1ff464b9de1fc80b5653cea814c9b4c6fb9614e02b762066cfdc2488f7290bed89aa9253570423c1224cee9cacfc2be9e95
+EBUILD distro-1.0.4.ebuild 611 BLAKE2B f83c10a0a4afd449466fa779d7120268eb7f1622ecd0f11b60be310606bd3aca4a7468748f8eac3e869c68ad1525c7f332178fd3d7a3d8e1aaad8735ac18e614 SHA512 28bf9e5b17aa8ccd9b486c5d8d6910ecd46b85f5a6c6db272f2ab0588e9ac3ee6a03fdf1fc4060f250c341467400bfc48ea1fb5db868ff1ef12a2a5eee46a721
 MISC metadata.xml 813 BLAKE2B 7ca7237a784e0d321609382bb6427a39584f9ca36047975fc76926628d5b4b5d54543762bcec7a43eacfa91ac056a96d38a0e71a6baed93b18a9849b2563f502 SHA512 2d9fe5a2567f86d987d950a78d68f09ac45b1a50ff02d1f1c2849c381de1a5a2f164fd6850f427650789a0274af974e23c9b8ba7ef3b37c81ad653b3ba85e0b5
diff --git a/dev-python/distro/distro-1.0.4.ebuild b/dev-python/distro/distro-1.0.4.ebuild
index 7190e1f71a99..f4bb140dd689 100644
--- a/dev-python/distro/distro-1.0.4.ebuild
+++ b/dev-python/distro/distro-1.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index bc9a0109694d..12aac4f870ed 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,4 +1,9 @@
 DIST elasticsearch-oss-6.4.0.tar.gz 33727061 BLAKE2B dd0ff95bb124103ca340b480c5192c9919ef226d4c3ef1b61accd0df2ee9b60a8215693b3db0fa327a4d6791de66746654144a9172210687e8a2efa9f6f4dde3 SHA512 0197dcf24bdb81cbcfa492d899363528816143962abd1925a5092e8177c25e8ca490afe5868b41057b3cded296f59f38ed11ba0156a820b6c877c69a5888846c
+DIST elasticsearch-oss-7.0.1-no-jdk-linux-x86_64.tar.gz 68787752 BLAKE2B 63864deae4e0545a2cd1924c4e2f4c0bb61134fe9649037f23c10123efe0425d376183035171a952a10f1804196a97287c59b508e97dff5e9e05063a67ede020 SHA512 301e552b221369cca8365ee64d8b52b5e8abea0e26159f7a6e77a1722fb1107641fe2472138869f5156bbbf43c74e62ffb22d0c35062190505f7504e3f571e16
 DIST elasticsearch-py-6.3.1.tar.gz 90047 BLAKE2B 765d0a34bd22067e07f4e862eb72f2b67bd0db3516abdf76cdc0d4f24de3db6941b4dbc6afb6315667d640514415cf08ff6de127c84ab36ef9bf062d4e687d55 SHA512 b975a6b446b760bf62289e855768a26b9e104aba9cd399cf275f59f2755efa00bd55c99a746751dad2f7a18f581a1b124c1bb9b91f5c3dc9fb00138c9d198aea
+DIST elasticsearch-py-6.4.0.tar.gz 97217 BLAKE2B 376768fab9bd7b4efd98f8cc24d4bad700f9bd2f9013a794e28986ee80463e5854399124bfde43a9a43d6773ee5e546fc28077452d2daab6e2e25810c045a986 SHA512 bb9a2fad3ca002b25fa58585cffdadf847a078f72a5b24297d58e1d598103cb38155ff61fd5802be8ccfec96daec3119ecb490f876c07263f103fbf26f6dc6d4
+DIST elasticsearch-py-7.0.2.tar.gz 102921 BLAKE2B 35ea3dd964a39caa594f380cea1508f0dea15486f1e0708f9daf3aa2e461429c76e0c7bf491a9aadb7187e30544597f6c41d20ff06b8b8d3b3b1655e6df387c9 SHA512 f91823dca2958fd0292ba623599d89138dd83ed2d41ecef1d5dcdd30a66c87db99d0576f41da15affd4e0027355eb20437e2dc104f98ffa86d0066d0b04b2590
 EBUILD elasticsearch-py-6.3.1-r1.ebuild 2601 BLAKE2B d3447d9fc518bd287a5ac9750d8713cecaf3e9871b07750734073abae339a14ba49427fc921246da724b6d3d18cd6b38fbfcea23869386d12b2a7290eb671d84 SHA512 5e6ad003403b4b802abf28279b96f699187f1db632389ccb0965e072863492480270648ce1bf73693e3fb7e7cfecfe5b835fa613d11ee4929a22c19f7a4f2a04
+EBUILD elasticsearch-py-6.4.0.ebuild 2613 BLAKE2B 60076c1d7c6194ea67bf0f1c957ba8d8da3024c5e6a773fea5a2e765b86af569147c577a888bd4b18e2b926a3920efaec6a05d46cf0dce82c71330e83be90908 SHA512 1f5882255d6c651fb9388e4039f1a5ccbda33dde5f55ff571f566ecaa52370a3bc61892a2d0dfaedb0b3f033b23a35cde94b8f9400c14b4b5d407caa180bb989
+EBUILD elasticsearch-py-7.0.2.ebuild 2726 BLAKE2B 5a35e7889012d4da54bac7f10bd0abe02e861cea2f5fe2b3a873c33bda835fbae2c2ed46ba90aa991b6fa9d6c8df2b0c9874adba990dec572f94ed00e7fa54f0 SHA512 6746039965168f37a0824d715ed2b59f19ba88f54ad645abd2ae972028815a14c0818d65654ed33724e65da3072c1e2facb62d804e7e741635d6bfe985eaa858
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild
new file mode 100644
index 000000000000..b941a308a924
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+ES_VERSION="6.4.0"
+
+inherit distutils-r1
+
+MY_PN=${PN/-py/}
+DESCRIPTION="Official Python low-level client for Elasticsearch"
+HOMEPAGE="https://github.com/elastic/elasticsearch-py"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( ${RDEPEND}
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	dev-python/nosexcover[${PYTHON_USEDEP}]
+	virtual/jre:1.8 )"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_INSTANCE="gentoo-es-py-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID} || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r example
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild
new file mode 100644
index 000000000000..d307f3933ab3
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.0.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+ES_VERSION="7.0.1"
+
+inherit distutils-r1
+
+MY_PN=${PN/-py/}
+DESCRIPTION="Official Python low-level client for Elasticsearch"
+HOMEPAGE="https://github.com/elastic/elasticsearch-py"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}-no-jdk-linux-x86_64.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( ${RDEPEND}
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	virtual/jre:1.8 )"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -e '/coverage/d' \
+		-e '/nosexcover/d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_INSTANCE="gentoo-es-py-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+	export JAVA_HOME=$(java-config -g JAVA_HOME)
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	nosetests -v || die
+
+	pkill -F ${PID} || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r example
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 74acd7e1740e..8b4c2e305e46 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -3,12 +3,12 @@ DIST eventlet-0.20.0.tar.gz 466828 BLAKE2B 43beb8f924c5e375a554db3fb90e3c39121ff
 DIST eventlet-0.20.1.tar.gz 469509 BLAKE2B 727844b70c4e1874a58efc95551dd7f12bec1c8d01cadeaedbc49f00a86e1393b690076fe720e8efdf00107f72b892a3a1f4c4921f95656b904221e748df7f09 SHA512 875c1ca82822a486bf28866c7d1f34df2419e7d33450a21740434d2e7f15c37a1090436cb7fe1feaeb5c810d39e4b238206c502323317897c8a42e844cbe7734
 DIST eventlet-0.21.0.tar.gz 484191 BLAKE2B 07d3f5d1dca11032d51fef9ceb624e07da9e93bed914233da9abbdff27f21f2482b9e3417b50a63f383cae13615c6a781104a05dfb66f28d6ab4e469bce06ef9 SHA512 4ee682ca8faf870ff6f1d72e93527028f73ae13d7f755eceafb23f3cde48e52b83ff04b645b7e90299997713de93c52f244db8b81d6abc7788a56ea38c7b0f47
 DIST eventlet-0.24.1.tar.gz 391579 BLAKE2B f8abfe6d18ed3b2edf4b2fa3d197abdd1e9029dd10c035427a2ddcb70cdaa76da114083ce7016af7151927fcb2f93ce6ffa0417dbe1a125948318baaed2f6184 SHA512 867f8ead3a6c0dd692c5cc5d9f1181b04456bdb270ea95d84f7f97da4603b333df539721cda002437c035fac51134bee8cc3495e09b6a25ae1c46fdaf015d0c3
-DIST eventlet-0.25.0.tar.gz 392105 BLAKE2B f528434dadfc15ce91b7842c47d1942963c430758483e56c756267f71910310e5ed6bc8b76cf3e8a9e3421c016776cf5afab6b675e49aaa4420685aee8c8b999 SHA512 f42549ecc6ca6833d611dc178593e69ff0d63881111fe7f9357b26c602a57dccbbc53101b86ed01e1e2b4a201afa8d170ade1052fcec36aab8776c56a8a15b42
+DIST eventlet-0.25.1.tar.gz 392719 BLAKE2B 7dbc23e63e9dc8b8bb0b4a53fc07cb467661bd695b6c778b973bd690bd24f3dd0f867d7ed803e1a89ffd36e5597fd244ef2c616c663d3d9130033f5f5928e816 SHA512 936aac45e24b2797cc8b6cd6238d493ce5eb60a47096e13827b8be145bd8dd14503f5ae624485c87b163718a85733b2317688366ef5fdf347f7d367fbf4d521d
 EBUILD eventlet-0.18.4.ebuild 2032 BLAKE2B 63837d2cd0c1bfc60a90edd9dd5fdd9fb350393bf2746b1a26308ab83d768f1929a2126d73fb846ce06db05f93631f806d27c8e8e8b4dd98f4dc38cf3a02093a SHA512 2306655b590f797fe6fde21ba7f0ebcc42480426d14c3a7a484924babf3b82649a4727386bb6ac8845545b698f9d20c563b6bfcec5c3ccd5b18799dc4f1d6c69
 EBUILD eventlet-0.20.0-r1.ebuild 2136 BLAKE2B 93e89d1901920feffc42f891cf588b23638b0ee8974c1653991d568dd3c407e69bf29cbd402677768f49baf99a816fda4b2cf685bd64236b9bca0353f473e7da SHA512 63897686d8a41c07c96047660a29b4c52d6647e65a9a0f832e445f43287b7d684ccf7ccb982d5814fc8e51cc2e680240fc09b50b815a986cde04e3a0d084662f
 EBUILD eventlet-0.20.1-r1.ebuild 2152 BLAKE2B 041c85d02ec79ee2aa0e7893d8b38f7609aff6b4b975b66eb1f1825fef6fe1584ea70fd7f8781b5515e7f77c1aa947cbdd0d4eb6179336f4d608da1db65de37a SHA512 6c6344ff54aa32452821c3b85c633b417034cb31d4fbed24d5cb8c735b81668d1971ea118b8e61a5fe5f2a0ecb684423f61f18f0e5822040332f9bfb342def5b
 EBUILD eventlet-0.21.0-r1.ebuild 2154 BLAKE2B 208f7c80894393af6f730f5b2e104b4e61790245b212ee4165f1f7c4a1072e1f6730ca378a31270a6e334ffc3eb6527543ed908cac608890dbbeb0d071040028 SHA512 12b9056a134542d0053ea237a1311b64aed89f4bbb7c2f61aba1c985b508b5ecaee92f86040ab2eae47ed8ced9f8eb92c22529349c9ef70cdbe75c8beb77eb58
 EBUILD eventlet-0.24.1-r1.ebuild 2353 BLAKE2B 5edc04a9ef60c05729cff78da418afcf058e5f4808bffcae8eb55cc381dcda6698b4b5a53e6a79252360b65276aab54799ac6be4e71650fe4c27a5cecd722e88 SHA512 fa0d91230fb90c4ecc38d7b0b94d0faf3c662019f7dbbc7962c451686e8101795da587003a58bfbb544b7020f446a82a121c381234d9159a29a8f24d0e1b22b3
 EBUILD eventlet-0.24.1.ebuild 2354 BLAKE2B cecac273fa58fca2446c00882b94314733951e3c8ec2c369ff9ba06faeb9fd56408f26d499b3613d96d1473ebdec46c162b2470c1162603980653624035293f1 SHA512 f60b7379073e01931f2134f9c10bbd5b668fb7c1ada4df730f490c3f83fcd872b530afbe240fd1bd9ced707ad183940a4b3efd21d648d845b11ef61859adab89
-EBUILD eventlet-0.25.0.ebuild 2356 BLAKE2B 6c623307f3ad7d1de61c0e80aee3f11cdc392ae0a8f8784b6c1e579e96f0453639b00693e9c7034d6683af1f43648f0046b32abee6c6597f4834586e3f3ade7f SHA512 f09afd1d165b090a4e4bd11b194655c6031dd1cb1391ddbecb71939d1cdc4faa8eb58535d837a32305ccb4dac823e032cb5d8b26766e16817d8e33d9b1b5ba6f
+EBUILD eventlet-0.25.1.ebuild 2354 BLAKE2B 0e1cbd60a6c5b17c0e9dbe19a534b3e1c0c09170e0a855139265e7a9e2fbe132001eab5aaa6dbc484d7fc4ce89c5735e7b2aed291b9fed7d3a6209a415b0561f SHA512 e7415426e02bdb62ffa156d677bef4f9ce29495d96b451836b22cd9331847308b6ff13f5300ea2443924cb5e1567c40db57de57591c4c8d9c26066a9e9b73b53
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.25.0.ebuild b/dev-python/eventlet/eventlet-0.25.0.ebuild
deleted file mode 100644
index ccae643ba72d..000000000000
--- a/dev-python/eventlet/eventlet-0.25.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
-SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7 )
-	test? ( ${RDEPEND}
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# provided by virtual/python-enum34
-	sed -i '/enum-compat/d' setup.py || die
-
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version -b dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed -i "s|'https://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
-	fi
-
-	if use test; then
-#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
-#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
-#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
-		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
-	fi
-
-	# Prevent file collisions from teestsuite
-	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# https://github.com/eventlet/eventlet/issues/152
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# Several errors 1 failure
-	# https://github.com/eventlet/eventlet/issues/151
-	nosetests tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/eventlet/eventlet-0.25.1.ebuild b/dev-python/eventlet/eventlet-0.25.1.ebuild
new file mode 100644
index 000000000000..bf74019d7bf1
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.25.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# provided by virtual/python-enum34
+	sed -i '/enum-compat/d' setup.py || die
+
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version -b dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'https://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	if use test; then
+#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
+#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
+#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
+		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/eventlet/eventlet/issues/152
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# Several errors 1 failure
+	# https://github.com/eventlet/eventlet/issues/151
+	nosetests tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 0f23e553f40f..482edcb5aff1 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,6 +1,10 @@
 DIST Flask-0.12.2.tar.gz 548510 BLAKE2B bd92d0e7e6ff36d371ffd958708517d16e41d1475af9153bf3d5234c33aa5c0ab415cbd254b711731cf8cffddac94b475f62d9fff2f9fe756b0fa30bb36d4343 SHA512 c00bb807e8fbc943e23a3721acf5b04320e7a58d658bca46bdf83a345b4c4d5729accae338505e134f01bc908adec9555fd94e8c87ef6f0367e6037215c06319
 DIST Flask-1.0.2.tar.gz 644534 BLAKE2B dd024f6f7a68691c759e3fd494a9482c4ab5216b5c7486fc1717346f953678c3198deedd657e7ddd3a5deff57ce31b1afdc40ef2ba9cc2fbed48f3afc223f6d0 SHA512 0ddf5d8bb0b0ae61f990096dffe3cf02744d7986015d05ae2cc09dfe0def17df44e2a4c58e330d17c7bd8c3eb74014dee5e2edef6e300b8e4ed756c251938f52
+DIST Flask-1.0.4.tar.gz 615497 BLAKE2B 4141de3754a8ce42c6978a72da80c991d13415a19946180f5fd8f08a1827209be605ec10283b78841bee94c5a2036b8e6083187a3e68c188fde93cb702a6d645 SHA512 2ed45ebdef80fe354a0a221f991560e17c442550f667fb76dd9c9631428fe8b6686127504f4ee81fcc6748f99cd376bed7a1ff4e0a9ae913cd70c9f5f4ac1c61
+DIST Flask-1.1.1.tar.gz 625458 BLAKE2B aea56848dd1f8bb2d96059adf069f8d19c55395e5dd0d98bf4e89c7d1b54241f1f476cbf7fdb91a2390cb5438a3bd7a5bdb58383f2a196b042e90f272cb39e53 SHA512 d4e6304bdb2e20deda5b9800dc9ebeabf0442528d6cef2d15416129c151b25ab32c41460939f64fb72b15ead8d4e9bcea5694039323d080d279bfba2f6266178
 EBUILD flask-0.12.2.ebuild 1832 BLAKE2B 3842b508f228388958d8f88cfa8379bbbefdb4dcb1946fb1ece67b3cd7339fcdb2d7674663381023d68e1355cbcfc2df1f2a6c40f2fa357f29029596d0f4768b SHA512 a05a66316c2727d75bdc7dc65616256241afa69fa83fff57e88ca25cce6f258b3f40950b1a38b9fe58799329441b8124f2bcfa2bec66f10b196dc6c13e5ffb52
 EBUILD flask-1.0.2.ebuild 1539 BLAKE2B 5e6d5e28412eed92ec448547a3a23335172d6d47fe551eeb0a2071ac81c12c6173f6b02d4953a3a56c529b27729fcdd1593e97b84b5c6a10b2aa9dfc6cc5aaa4 SHA512 4d7f130fc985b4dff5a488c2f34511a12fb6020e6cb3bc065273e2b9d55cdfed747e7ecfe90cad69246f4bf2f2266b7671127f5ddbb5a403ac6471eda7a9c1cf
-EBUILD flask-9999.ebuild 1547 BLAKE2B 52d6873119dc9dfd64af46303b01bbd1c69af7028fccb0bb24ada38179c4341f90cb4e9a80389a580191cd803ae68e9139d8460036099ff319fef1c69b1ccefd SHA512 7073f5d7507c8243499d90012310456d0b7e5d727a15f72d1be51e82ee37302397e92a47a83e5204fd5dc8aa8ab6c76daaae6b8932b98bcfb639c39a120fcf78
+EBUILD flask-1.0.4.ebuild 1544 BLAKE2B 38e1bf11882f98b282a0c6e107bbb02f50fc96912b87d8902b678a534354a8040d3c9af36d04686fa727c714677efb7f12552ac03e34cbb9c9b8f7d53228d4dc SHA512 49a45558f158e4ee72732288bb22912278b01a59c3e60d443db2638c4ece8a0b5e490bb437af2370379f09cdaaff8a82a7952d311ee76b967dd4cea3ea672d77
+EBUILD flask-1.1.1.ebuild 1544 BLAKE2B 38e1bf11882f98b282a0c6e107bbb02f50fc96912b87d8902b678a534354a8040d3c9af36d04686fa727c714677efb7f12552ac03e34cbb9c9b8f7d53228d4dc SHA512 49a45558f158e4ee72732288bb22912278b01a59c3e60d443db2638c4ece8a0b5e490bb437af2370379f09cdaaff8a82a7952d311ee76b967dd4cea3ea672d77
+EBUILD flask-9999.ebuild 1544 BLAKE2B 38e1bf11882f98b282a0c6e107bbb02f50fc96912b87d8902b678a534354a8040d3c9af36d04686fa727c714677efb7f12552ac03e34cbb9c9b8f7d53228d4dc SHA512 49a45558f158e4ee72732288bb22912278b01a59c3e60d443db2638c4ece8a0b5e490bb437af2370379f09cdaaff8a82a7952d311ee76b967dd4cea3ea672d77
 MISC metadata.xml 363 BLAKE2B f031e9e0d44bc626f4cc00538e6030e732f97286a09d061cfd8b7e03c8506cc9ddc8caab73d9c10363c5bd0eab1bfe6129a668bd6c66e3d82d9221cfd1175629 SHA512 33989d02b79b82d3256dbbf7402d79580d529e728222d74dbb80f740dfc1f8f1357f03ab5da857ff1821f2bb90f7b7eeae71d89e237516da62656d3d124ef4d6
diff --git a/dev-python/flask/flask-1.0.4.ebuild b/dev-python/flask/flask-1.0.4.ebuild
new file mode 100644
index 000000000000..80cc931b35be
--- /dev/null
+++ b/dev-python/flask/flask-1.0.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="https://github.com/pallets/flask/"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
+		py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-1.1.1.ebuild b/dev-python/flask/flask-1.1.1.ebuild
new file mode 100644
index 000000000000..80cc931b35be
--- /dev/null
+++ b/dev-python/flask/flask-1.1.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="https://github.com/pallets/flask/"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
+		py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
index 6b340034d517..80cc931b35be 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-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
@@ -28,7 +28,7 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]
 	dev-python/itsdangerous[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.14[${PYTHON_USEDEP}]"
+	>=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 774252ddeabb..0f7adb5f44f1 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,5 +1,7 @@
 DIST hcloud-python-1.2.1.tar.gz 63592 BLAKE2B 9a6d2dae97ff405ebd9b92bc833c9d953c13840e68be4eb43fed375a60e55cf4bf9b4b742b26fb03401f631b7f7127815961861cb673adf4839c829141c8ed00 SHA512 cb70d190350457fc3c6e474bc6c943070102762595dac2f386041956f64255f390a928a2f2411be861645cd65b015ab9e0c931b36aeed0076b06d9f67ac72d1c
 DIST hcloud-python-1.3.0.tar.gz 71208 BLAKE2B 1a074f64aaff87991ef5c565bb8976184a1f5ca54c0d2fe19ac3dc4f8425d3a2d92ef13cbcec7ecbfb8958572ab5561953098cf0ed9f141ba43c3eb0a90ffc10 SHA512 6dfff2301ad91db3c79fc8f68a05b5a886f86824a34f044d14a6a35771d23fdba9764055c797d11f404cccf3ae6338af940e4814113859d7809733629d7c2659
+DIST hcloud-python-1.4.1.tar.gz 71379 BLAKE2B 8f6f0a4e23dd3b99bd4375644ebdd161fb0c305773ccf10992fdcc05cefa37ad58e33eb0516eccd377ebb642749f5014ed5baad4d37f3eea91cece7eeaac0c56 SHA512 3eff15d6b46caa2b46f398f26efc1f986af0818253888ee42c97652f5d0369738558eea57e6ca934c4f7e88fea379f5a0e9e671908717f07cf32ec74d8415d42
 EBUILD hcloud-python-1.2.1.ebuild 1056 BLAKE2B 94a8aeb9cf22f4263222ab52e186c8604912c1a0931d96e3a47698019245d318753fc5d5686255fa0ef6f9460fe55a94b2125804407da5f94ca92f4577189a37 SHA512 ac4b6bb887fb0b1ff076c4ba02dd1a33256f238eab49f250db3b8a1908c68784dfe5c51b5dfa2b7db7f5dc57496e472c8be8d50d152392984c2f2c6674722e18
 EBUILD hcloud-python-1.3.0.ebuild 876 BLAKE2B 62435cbddd008731368ceee8965656420e7b9f6a6b35b974e27b98ae9bf23ec9a50d3b467d472307f266a2368f9345a4695659228fc7c1eca48167f694ffb613 SHA512 b3d65bdd8814d8c8d6b0c5b62e35fb2563938db46d8213619c265eb9e737b4e9ba661264f5fb2eb7a1838bb8c6561a9bc62e0a1b1548f4e62bccb3b1527d44a1
+EBUILD hcloud-python-1.4.1.ebuild 928 BLAKE2B 05dd717554d8b02c3317c54e38b4028847c3ccaa41491b6da7867310893f59f9eae2cf423135ae4188ba2c82a86f16529f3191474d6335182ed3c8ea85fa03f2 SHA512 e4ee57fef367129a1c364000439020935b5b5b3286db30f761c99388299d5b19c8c5ccd4966b6ceef9836c70f41a63026da6a4ed3fb711eb5162e7ce8e8afa63
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/dev-python/hcloud-python/hcloud-python-1.4.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.4.1.ebuild
new file mode 100644
index 000000000000..12cb839f08d9
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.4.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Official Hetzner Cloud python library"
+HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
+SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples"
+
+COMMON_DEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+	<dev-python/requests-2.23[${PYTHON_USEDEP}]"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/future[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 85b5b5a80191..026f1f97fd6d 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,5 @@
-DIST importlib_metadata-0.18.tar.gz 23341 BLAKE2B e1c43a760b141b0589973672ad1cd6c47e077293353f67ebe2c2b3631265712dcecc8e14a57803539d2276d5d908fae3c4ac07165ddd5937cf53955ff896001e SHA512 2f39789725548bcb37061b0b99f90802a2919339db6b29f95b38811b35f4cafc7acfb4cca1167e28a4738ba195af31344f59ab457d87710764d1ba8f06034b18
 DIST importlib_metadata-0.19.tar.gz 23338 BLAKE2B 10c43bee5324804b359f951e5d375559e3a58663b11f0bda1b39ce82dcdd0ba735083793a954e2ac18b5fd607d9ea5628a86f9c345c83d718a7e46738774e0ee SHA512 2d0126e7430804b2295ec159778082806957cb86b5c7408c38064cc7c7e62229d382778284a5a231925ab336a7cc6da8e705f6bd7ae6da66f11acd1229bda17b
-EBUILD importlib_metadata-0.18.ebuild 1366 BLAKE2B f4ae505284ce2d95ae2da39d4aa47fc5a83672ee41c0f8f379e23287e4d5f743ec3978132fae9c9dd1098f7f3621ed35402a27c867ffe48bf62cb370c7b9738b SHA512 793d3f8582b947f0812e3be611721c40b220bc3dcaff3534259e66c18ddeff6703704ec611cc8153160716adb852be89d65eab2e8eb72e276e635d26953b8b60
+DIST importlib_metadata-0.20.tar.gz 23712 BLAKE2B 0af0b4fad171f24aad0b387af98b9f5c0bfec14e7f358e45afb70650dd1daf3b8abde8012ebe2e4f5751792d542d2567dda856696de8cdf96f27b50560c55645 SHA512 663d6af2f2d83c4744809b4b58ebe4152962ee40ecf17070a532614c7238a88374aa70fcefb6b7ce26d2d351b00c0859ce590f734bdd2ef76ad58b041307a95b
 EBUILD importlib_metadata-0.19.ebuild 1421 BLAKE2B 1a847f367c90077958c6229ecfbd0c69e62f820f01c5a7e59e926e334f257b34dd8831edd506f30edaa6112094cc4ec33de50559a9dab6731cc14280ae699699 SHA512 fce535f98e691c07caf170679d86ec45fe6991b8b1a385af3ce23581c720354a8adb8009c37070de4e2186c9eeb323bc5faa64628d455908c5d6826b1e684f72
+EBUILD importlib_metadata-0.20.ebuild 1421 BLAKE2B 1a847f367c90077958c6229ecfbd0c69e62f820f01c5a7e59e926e334f257b34dd8831edd506f30edaa6112094cc4ec33de50559a9dab6731cc14280ae699699 SHA512 fce535f98e691c07caf170679d86ec45fe6991b8b1a385af3ce23581c720354a8adb8009c37070de4e2186c9eeb323bc5faa64628d455908c5d6826b1e684f72
 MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
diff --git a/dev-python/importlib_metadata/importlib_metadata-0.18.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.18.ebuild
deleted file mode 100644
index 15de405a5ab5..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-0.18.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://importlib-metadata.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy pypy3 python2_7 python3_5 python3_6)
-	)
-	doc? (
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-python_prepare_all() {
-	sed -i "/'sphinx.ext.intersphinx'/d" ${PN}/docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build ${PN}/docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-0.20.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.20.ebuild
new file mode 100644
index 000000000000..8c74d5303223
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-0.20.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=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://importlib-metadata.readthedocs.io/"
+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"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy pypy3 python2_7 python3_5 python3_6)
+	)
+	doc? (
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+python_prepare_all() {
+	sed -i "/'sphinx.ext.intersphinx'/d" ${PN}/docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build ${PN}/docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/loguru/Manifest b/dev-python/loguru/Manifest
index 760cfe139fec..8c84e5de34f6 100644
--- a/dev-python/loguru/Manifest
+++ b/dev-python/loguru/Manifest
@@ -1,5 +1,3 @@
-DIST loguru-0.2.6_pre20190412.tar.gz 362315 BLAKE2B 8273fd42522396d4a17c405bebf01f8de272a56515e4a63766126494b4449333e7c25f5be5851bdbcf922d35affa9ee091ac7138482f9e2daf30f48093cee812 SHA512 49320c19f2bfdc55569290740b49889133003329dbf6cae2e993730a957d69e5200b41b75d255d2e19d937658778945ffe44350431661162eaa6141edfcfc499
-DIST loguru-0.3.1.tar.gz 377834 BLAKE2B 4402a6dfd8e36efb966eb0f31ba2161183c03a7072f45ef86110587b1f3653e4711c0461d39d5e0047fb7b84c7da417c011644ffee815f82bf1f4847588b17b8 SHA512 b0b75aa265839be0a522101671bf9992c1fe548439988a5c2feb58702be77944137e4f78920ec5dd4fe5953daf7160714a4de940527d0987dba4907ac27a0e15
-EBUILD loguru-0.2.6_pre20190412.ebuild 1125 BLAKE2B 442009acf68b49846ca90ffb5b5234e9e99e0fd6d1c25d11fbbe01c9b5b9bb34e5d968b4a9035846912c1313b165969d8e920e6b93298b20d868122c53892389 SHA512 fa0e737d2b3710e7dd1bca02d4e94d2136084a930a43955b6c8c462efd2993ad6bb0a6a69ec9e0e10884a76d3d81fb6692df04bb07ffe792068c3238d46ab94b
-EBUILD loguru-0.3.1.ebuild 1013 BLAKE2B 2bfab0b4b5623bf2ee15605e619e315ae4b3c63f2571e25d17ef144de1134d51d3072231d9e981b30871769c0688b51bb70bce58cf34edc12d4a2259bb4c313d SHA512 590dc4cfc49b9050b3cd9b220d3505da83c827effdee520ec35fd7b23123f57049ee27c1cde064ca7ca306ad04d45e68de8807602307df0151d57df2d62bb58b
+DIST loguru-0.3.2.tar.gz 378160 BLAKE2B 83301f5bb79d0edb20d211e8ee4d05b3b93a0a9f13f13b2ff103f1e9759f227b80e5571ccda48098a1e45658d99a54768fdf456ffef7a13d08375ce62ad876e1 SHA512 e78f5f43fbf4891ff9b9a21c1a29e4f02877f73a09b7b7df25076bffb25a094eef561c469b22cbb999979de4dbf81df2298681fa219dc684f15fe7c52ecb5359
+EBUILD loguru-0.3.2.ebuild 965 BLAKE2B c699d420537376ce62fdba478512f1adf7a93bed1bbcef890cfc09eee72ae78bdbb2f06c53c60a1e5ec543527678dcfd8787d8a041371fb035e1ca31115cd8b6 SHA512 191f5cdeeba332ce0263e4bed5d4c805d9556964ff741d48a0bedf2a5c4a7132e4cc25d5bda92a6fa381b0d3b294fc64cfa2161e72d0c035fbc5a9240eb5544c
 MISC metadata.xml 683 BLAKE2B bd44db6c47f17a714eb8080d63d5002bbedf247787d568735f87f8aa01a13fc32d383f4eab2b92536a2f98f5b76b0ae01c407bf3c746b08c668ef562cf488ed0 SHA512 8a671ba69aa489f384c7074623f62c03905442b14b6b12bc9f306416a66390a334dcdadf84a5485936b47ff9992ac87e35ffbc8ae17d035b381f53f721b2369b
diff --git a/dev-python/loguru/loguru-0.2.6_pre20190412.ebuild b/dev-python/loguru/loguru-0.2.6_pre20190412.ebuild
deleted file mode 100644
index 04098605437c..000000000000
--- a/dev-python/loguru/loguru-0.2.6_pre20190412.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 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
-
-EGIT_COMMIT="6571879c37904e3a18567e694d70651c6886b860"
-
-DESCRIPTION="Python logging made (stupidly) simple"
-HOMEPAGE="https://github.com/Delgan/loguru"
-SRC_URI="https://github.com/Delgan/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	>=dev-python/ansimarkup-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.4[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/isort-4.3.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.9.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	pytest -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/loguru/loguru-0.3.1.ebuild b/dev-python/loguru/loguru-0.3.1.ebuild
deleted file mode 100644
index f3f34085887e..000000000000
--- a/dev-python/loguru/loguru-0.3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 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="Python logging made (stupidly) simple"
-HOMEPAGE="https://github.com/Delgan/loguru"
-SRC_URI="https://github.com/Delgan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/colorama-0.3.4[${PYTHON_USEDEP}]"
-
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/colorama-0.3.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.5.0[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/loguru/loguru-0.3.2.ebuild b/dev-python/loguru/loguru-0.3.2.ebuild
new file mode 100644
index 000000000000..332532b9b7bb
--- /dev/null
+++ b/dev-python/loguru/loguru-0.3.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 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="Python logging made (stupidly) simple"
+HOMEPAGE="https://github.com/Delgan/loguru"
+SRC_URI="https://github.com/Delgan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/colorama-0.3.4[${PYTHON_USEDEP}]"
+
+DEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-4.5.0[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index ec09558a5e4b..a881580c5371 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,5 +1,5 @@
-DIST marshmallow-3.0.0b12.tar.gz 153870 BLAKE2B 4279bb477861cbcef219a7442ffa29cb1f5bb084b08a9812256898771560add3d8e5dbcd2348d8734c1701131e02f33c69ca17f2d1d9010712e11ada96e0374f SHA512 3155503630b2a85eeb4b04769de79346b334975ab3611695806e799a76dfca78cc3c7d490b18158c757dd15d550fa408b651fa4c69b3e5eb147c4cf38613e2ab
-DIST marshmallow-3.0.0b8.tar.gz 148882 BLAKE2B a83e9cb2ff7d5786e5a0d5c947e578f81d7d2ab008257df195096e06031b100cd6d31bdab3df63b6ab6704268b1915827dd89f7e5fce6a638d136686fc9ebc07 SHA512 34f7a974872d0cdad828e342788269ab19194e17f30716dc8db21bc3b86ab3f1be6bd5e31c7bcbeaad7b8c70acc39eab256eb938060eff42067f5f1b3ba51c1c
-EBUILD marshmallow-3.0.0_beta12.ebuild 878 BLAKE2B c05fa4202eddd5fdd656c6e682139ec89f8ea35ac31a2ee19ce7e321fac78c3f6cba625c4feb712999ed9d126bd71d8ac3f5be4f681a7442a591d7ba76e8b781 SHA512 80aa16b3b8ca9c45171ef0235b32984f4e79307941cb570c94b992f6d3bd9c6e4f7814ddd9cfcbe05cf75aa22f439ed3f572ef1a2ed0dfd6bfb120a3bf2d47da
-EBUILD marshmallow-3.0.0_beta8.ebuild 833 BLAKE2B 986b01cc8fe8065077f107c14a72613854e6c29923662c90b54c34e0853fd90b41bbd35dee2e6765d0ef142e8cef3de66e99f5e01282467b423279de72bb016d SHA512 dabb33192e4198947bef64a01132cc7a21d7e35ae45b38c6b68c67dfd786c7b3b1841ef0dc412f26a69abc663b01ddfbcbba2066e75e8415d13e35731190da6e
+DIST marshmallow-2.20.2.tar.gz 152437 BLAKE2B 0d31537051c45bad52d922439d1cb9d69fc4a4bc2767d6a13bfe32a9edc978cadf9b1c508ae51532f5661291f32ed4b7c5e54f5fcd092eb4ebd7d3045521e9b8 SHA512 05511aafa978377152ea8ea1b70dd5558782bf634df5ae52453bfa65c7ec9270a12cd7a32e11872808a3289cfab2ef0380e129e84878511872e7cc95b0792453
+DIST marshmallow-3.0.1.tar.gz 168186 BLAKE2B 6c89fed45c144a855c692bee39390e1c80b2977274acb704095e76567e6ed00643704473f95abac7fabb4c1d1d96b90cb9a6fe3a127a09a0d2a4c72c02358baf SHA512 085a7e9b265bb86232222e4decb32fa172d62bca3ba3c5303f12715be1b0ab6553b1978e28db520a6a7a25778915c770ac83c607bdebf5e4d26746cd69f2d555
+EBUILD marshmallow-2.20.2.ebuild 897 BLAKE2B 2d03ffc90f25b536777c5b4e38d2aadf1b8971b0eaeba06c3f2ed42add8b47c0c6e1ec8071e678cfda1ee73674dc860419890d2522a7cd8be6d6e0b7570f61c0 SHA512 f5ea20eb80e69fe8429971d319849e6f079db53d2b51f569189531ffc8a064bed95d3c5b5f916f142d01f1af2fe9c5cafdbf8df251508e5cbb9f94552d5365b1
+EBUILD marshmallow-3.0.1.ebuild 813 BLAKE2B 588504a5d93e0147d36d23a2316c2f03c7ea0bba93996f3b87d9544491972aa05fe65d547f1bd8f54b350b98909b599e6cecca4415fa2ee30942002d461fc1c2 SHA512 60a97f7e5db00eddb532494f7eb9174b4c64e293cd108be1d9af8c52edef31c514427086e8d6d87775584647ab722810267cf2391f44357898e565ffe4069a1e
 MISC metadata.xml 360 BLAKE2B ed1f62630b417aaefbfc1ce52c275f16187a1fac9ee46e7172c4b703452329b64de253eed111bde2e7bcb4b85e7806d8423fd5d80899f93b23e7c3da61030a2d SHA512 51665fe5adb03e70bb1582f393b95783c9e4956c24f664c09d08017663bc8373b07080c142f714fd4c93381cbd5c55bec2b58ca412df6aa55980f9a61abebc54
diff --git a/dev-python/marshmallow/marshmallow-2.20.2.ebuild b/dev-python/marshmallow/marshmallow-2.20.2.ebuild
new file mode 100644
index 000000000000..a9acebf6251e
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-2.20.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight library for converting complex datatypes to and from native Python datatypes."
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		rm -rf tests/test_py3 || die
+	fi
+	py.test -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/marshmallow/marshmallow-3.0.0_beta12.ebuild b/dev-python/marshmallow/marshmallow-3.0.0_beta12.ebuild
deleted file mode 100644
index f0836cd38e57..000000000000
--- a/dev-python/marshmallow/marshmallow-3.0.0_beta12.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="A lightweight library for converting complex datatypes to and from native Python datatypes."
-HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	rm tests/test_py3/test_utils.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	py.test -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/marshmallow/marshmallow-3.0.0_beta8.ebuild b/dev-python/marshmallow/marshmallow-3.0.0_beta8.ebuild
deleted file mode 100644
index 8f154b24c445..000000000000
--- a/dev-python/marshmallow/marshmallow-3.0.0_beta8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="A lightweight library for converting complex datatypes to and from native Python datatypes."
-HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	rm tests/test_py3/test_utils.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	py.test -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/marshmallow/marshmallow-3.0.1.ebuild b/dev-python/marshmallow/marshmallow-3.0.1.ebuild
new file mode 100644
index 000000000000..7421ff3b53a4
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(  python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight library for converting complex datatypes to and from native Python datatypes."
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	py.test -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/mini-amf/Manifest b/dev-python/mini-amf/Manifest
new file mode 100644
index 000000000000..dd80a2f1580f
--- /dev/null
+++ b/dev-python/mini-amf/Manifest
@@ -0,0 +1,3 @@
+DIST mini-amf-0.9.1.tar.gz 117016 BLAKE2B 22133a2a6f44ea8d485874924e6175383dfc9301d9bba193e4d9d2fd901671c64be3665617c02223dbd2075141071deed142e804a77816ae11ac4d00e72a870c SHA512 8487baa551a68f7882aedaa8b809089bf2e767b0055f292dab4074d48ed442cabc250297ded91daa2f2a1dcb950ddab5ddff60466ec84ab739a240b8e2665be0
+EBUILD mini-amf-0.9.1.ebuild 1090 BLAKE2B e85b1547ba43c281c1246fc5742d9edfb3d6972b8fb1cc62e92096de33257ece49d5973d46d423c4401ff996fa78280beda8b9ca6288f75bdf40cd201ab82c1e SHA512 2583b51b4aee14cbcc9cea2ae59376a908eb1bf701ccc6fee592e992198fc41624f0291b7362572374302be07fcd6bc8d74f52d3437c91c40637dc01d640bcff
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-python/mini-amf/metadata.xml b/dev-python/mini-amf/metadata.xml
new file mode 100644
index 000000000000..6b0a0fb3a729
--- /dev/null
+++ b/dev-python/mini-amf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/mini-amf/mini-amf-0.9.1.ebuild b/dev-python/mini-amf/mini-amf-0.9.1.ebuild
new file mode 100644
index 000000000000..3a0d464b7280
--- /dev/null
+++ b/dev-python/mini-amf/mini-amf-0.9.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5..7} )
+inherit distutils-r1
+
+DESCRIPTION="Minimal AMF encoder and decoder for Python"
+HOMEPAGE="https://pypi.python.org/pypi/Mini-AMF"
+SRC_URI="https://github.com/zackw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+	)"
+BDEPEND="doc? ( dev-python/sphinx )"
+
+python_test() {
+	coverage run --source=miniamf setup.py test || die
+}
+
+python_compile_all() {
+	distutils-r1_python_compile
+
+	if use doc ; then
+		cd doc/ || die
+		sphinx-build -b html . _build || die
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/. )
+	einstalldocs
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 26328dbb9733..91e8d348811e 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,6 +1,6 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
-DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
 DIST miniupnpc-2.1.20190625.tar.gz 94461 BLAKE2B 26c881c2ef99640e99a5c9cb138cc88dc29a25cd57fffaeaffcf521ded11402fd34ad1001639cd0659fdef9debd247dded5c1903b69f36b74b059c1e282bcdfb SHA512 d55a959bb2fce2c1747fa95da53d9993220403d2c511b12f489b80a7941b28238561f90a1cd60be9fa2bd62777fbfd3cef370db694b9970f73ccbdf3ef49aa48
-EBUILD miniupnpc-2.1.20190408.ebuild 748 BLAKE2B 67ab0e95d689347412b7c08b9949a059adedd4c62b0705c8cebba7347bdae1727fdaab0138200457289ac1a7eaf425163894b850e69268e9bae55cc660784b1c SHA512 bc8300b2f4df692141a7a46307858677ae37c57b64655f21daad9ded09d51c7d9bd28e861482d08b7681fd4758a3f65ac169a150a0bfbd29be464b567a176ba8
+DIST miniupnpc-2.1.20190824.tar.gz 94564 BLAKE2B 1569e15bc9a886bdee5192526b83e0a628f0d6c9b4449c547c0c22c2ab1f912b1671d84ead6aa6961161bd99e5f62f8428f3867b8f9ca14e04d5f953e6553d4a SHA512 9ed5fc6fbe6f64fbfa23938043732db1999f3c8585422a660fde04fd9e203d7acf8a5c3f1f1433468ea179f090261702194cf5714601c5c0ed9094250352f175
 EBUILD miniupnpc-2.1.20190625.ebuild 752 BLAKE2B 6cfc3ea9ac5a47a1623131fc4f01e24c838072a78f5b563499e527a8234486a46e3327e3cf2a987226ec0d8ef2f41a5b3534c327eaaa4b04ee8a45d8891c81a4 SHA512 8027e251c442459f9458296d3d0339f23c90b4c8fe83af614c9f93e83fcb783e98d98bdfd0b8aead5bca8d44da0ec25be6486e4ac25d2dd82fd0765184c85f1d
+EBUILD miniupnpc-2.1.20190824.ebuild 756 BLAKE2B d17960d77602df26cde5b78783b1201a066353baea6895363e0a207cc318a7a7b3ceb62bf4494f2e2200c216743abc35e169b5c5bf6d5d24fc2a8a3ea2ae4cc5 SHA512 9c7405c5f98f2e5ae579a5155213f7b8827bf6458f47cb00d277a0d84cc3be2db982fb2042ee13a83aa86503638fac960fa844e31481eea8c22b4a899f9a5cce
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190408.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190408.ebuild
deleted file mode 100644
index 454bb7265340..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.1.20190408.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
-
-# Example test command:
-# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild
new file mode 100644
index 000000000000..b29713da4bc7
--- /dev/null
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20190824.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for UPnP client library"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/miniupnpc-${PV}:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
+)
+
+# DOCS are installed by net-libs/miniupnpc.
+DOCS=()
+
+# Example test command:
+# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index b488031e874d..d6edcc10dda3 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -3,5 +3,5 @@ DIST mpi4py-3.0.0.tar.gz 1426843 BLAKE2B a68182c6abebac6af73654f04db9eba38f02079
 DIST mpi4py-3.0.2.tar.gz 1429331 BLAKE2B 9e35749a82698ec656553583f01ebd8edbfb3b649c7693a9ff63f9f6abfa3fd41a54cbe4e3a1de55cbaf4dc626602706c776c505d0f5c0d82ebe88f2b4ceeddb SHA512 0a18332fd45e8e80b8dab0761fbaa30444a0d55776af7a2333be17ade827e92d04ac5bb8619ce26937142f344f75de0e5ef6dcb7502f33389716aa9482ddf5ab
 EBUILD mpi4py-2.0.0.ebuild 1114 BLAKE2B e8ba3c2d390b3cb89f4d6a265a14e1a37db4d64de254dc6e0226c12339ded13ae217b03f202bb4f673b73c8225ce4a02aeaffa0bc15acdc2ed19a28a4d911e9a SHA512 2660ff53f787c9ce1dbae757c79328d53062ec317a8d4e72435fc1f8887cbec601f054a879be7465e95f2e385977630289a0bb48f550cc15b9df2e219fcd2aa1
 EBUILD mpi4py-3.0.0.ebuild 1116 BLAKE2B d6023428513b82e92623455a695cf07cacc524ba73ef7d2d4690f87f7da2a630e340993a54961ab12d6812dda09c3ecff3ef92cd846fc75dec8e288c2b33f697 SHA512 cb974499fdb92c7b1b701811bc7c75ed691c7e97e777f4de68c2e1e6546a9ffbfa0271ffa6218becd870597140ac6f1d39b615d7e0d1b0b852e12c3dac0344a0
-EBUILD mpi4py-3.0.2.ebuild 1124 BLAKE2B 011352a5f4293c584337fa2712bdd90f3719a2566833d33a25fc11c417276e990c38cb2b3a8568940812da5c659a238fd426a6d6f569be9adc3299d5e352c260 SHA512 b120ac44398a081b6e6f6de54ab5931e1c02a028736628ab9e4f68abd58a4cd9c84a9aa35c9c9fb2eb9fd9a4b4ad79a3a0c4a15fd549bfd2e0fc097322e16fad
+EBUILD mpi4py-3.0.2.ebuild 1122 BLAKE2B de24136836cf2950379d83caef88191f3bae516b8ed71e1a8468ef2e4163289dedea04e1777b0348965a662b772c7e5967442e0eda9e52c0288d8cb335ccee39 SHA512 3d59953cf84783fcb3181ef9002d0e48a5d1d9279d3c3d985f47962b82db729b97ccabb2c13450f5c2124a38e60da54406f1026cb3e9ebfcc452285c1f5d27a6
 MISC metadata.xml 1118 BLAKE2B 0bc626a2106e628d7eb639e6ce90c4badb63ec2ea66b0322e7b83418791b7edc4bd443294fba3d31133812416eb4428b5dc47d074da3aeebf6867e8a0998d046 SHA512 7afb6d05007036bf5562d6d262165d8c2576bb49a86f9230f939d6a2ef929affa8461fa6421ffd8d97203a4425b397a8dd8556190364f29622e53a67674978c7
diff --git a/dev-python/mpi4py/mpi4py-3.0.2.ebuild b/dev-python/mpi4py/mpi4py-3.0.2.ebuild
index a9ab0f634606..a9f36ad586d7 100644
--- a/dev-python/mpi4py/mpi4py-3.0.2.ebuild
+++ b/dev-python/mpi4py/mpi4py-3.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="virtual/mpi"
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 29100b197ab6..e40eef0b09cc 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,20 +1,6 @@
-DIST multidict-1.3.0_alpha1.tar.gz 98403 BLAKE2B 56f05fe00f9b551ccc9725719cb794e27d969611b29f6cd70a2c2cd09bb340bcd8d5529783084a08d65103f10abc874bbf67517ae49eb5856101be35fe988f6a SHA512 71831a567e7098aaf3f1273335249dab12a96595dd233f88dae114c7dd26beca53c6f55f9a5b2ec4145d62acf84f1734778d0ccb1a54c380569030ae4a3d2957
-DIST multidict-2.0.1.tar.gz 27586 BLAKE2B fda1d12d61f4ea08e4b0fe03b82276479453cbb60d8defb4a03cb93ed14fc5bc0b8d223e2807546b6e3bd4aa8ac23e5a3992ecf726231347224880299154532e SHA512 2de3743256cdf3849f767613a510d707716b978c964626846fd082edb52d169a5fb47becf76dc287858f2d06c7f4bbf8aa0f662e41e8bc73becabfe0518f7836
-DIST multidict-2.1.0.tar.gz 28131 BLAKE2B 8ee74eb58427cef667b2c208c6d6c43f86b5c14b928e2fd3271ac057597d672150e72f15f6cee9b2c76927abbe7fce11e9731dbee7079e27c5db2fe41b994e68 SHA512 124691f3654b202cc35c59bf4e1c38a9da7d89ca3fed71f800d15313fb4042b55c0df25c012be72b0cf64ca1b8cc00707f001d007df649840e0d7a76d171d385
-DIST multidict-2.1.2.tar.gz 28193 BLAKE2B cd705159b5e830ce8601f1b63bac103fdbb0a75400aaa5df8d9c31c45968d6f598682d8220e58dca243d507b0876d442fc93110855cc4a1865651c409c8ef486 SHA512 7debfe3c0abb3323a5ee82b7522ab86162b3d44333ea7dcb26c7c87d24fb4c4c062095db9603ac4a757d507971fff6252f4b3dd9d2183ea167caa5ae80ae3b33
-DIST multidict-2.1.4.tar.gz 28395 BLAKE2B deb08b2d1039aebc95b5c7b63261180847ef6565661c668058e9646839d81bacedb0f06db9efcd13bce482d3a869d5122d7b0b57ec6bced257f90a48365324b7 SHA512 1806f21a528f907ba16cada2eda05c7387d63bec45b7906a5a37eba834a87553c402766f4e50425a41414e93e2fc202d18ad9e6aaf02742fe06899e6a18109c8
-DIST multidict-2.1.5.tar.gz 28497 BLAKE2B 301248a428f3be7740dd04ccc8ae5e92d971736b04f7243949805ffcdd005c68b20340146dee690055554dee814354770269e48bda82094f35a4668b4ac7a61a SHA512 927f2e0c175e52edbf3a5385957e5988a08061160488df70f7431520ef75439011986365dfebac80e8da6e1874232c532ea96c53081c65c74c04f0e307db6729
-DIST multidict-3.3.2.tar.gz 40083 BLAKE2B 6622efd489d4f0046200b6b28a158306cff7a3e463688c512827b599500956793ac27f6ee839e076a921b84665bc932274a5ebf4c37e273fc02916dc9be1eed7 SHA512 d44c8b00ab7823b8840665aa1462ed547aea48874a408b2af8f1cb455727896cd77ef2201e8f234bcb3f2781599ffe931a5884fc55fc1f7286da29185c4d88fc
 DIST multidict-4.1.0.tar.gz 43492 BLAKE2B 4d53a12896f070fd029816742ccff11a12636164e51215bb22b368da10d555d52a9ab7d5dc4632baec9ebc628ca4f846ad7fb2ad0bb044f033fd7e567cda0da8 SHA512 8972ca48146b40fd88f5b0675ed6d45e6887c31fc1d5962203f0fa77a369ef11b0d7739593f5691ae1fd2bbef989940983ddcf0c09acfc5a65b39b6b336571f9
 DIST multidict-4.3.1.tar.gz 45342 BLAKE2B 12a0a8f0785c30e393d996c506a69d6ba03227e47040d46859e1289b47ce23b49a9bed48c3cb0b26f3bf4051cce3963d020a92ed28373038fb79b2204c13d380 SHA512 1b475836c776ddddfdc4f14882df41f9956ab06afac7b640e3f5ae3c50717f2b07267acbae2fa3e94cf8c5650273d4d7ce44329c0febea95046ee27d98db9288
 DIST multidict-4.5.2.tar.gz 56753 BLAKE2B 01db2ea847e5ef2fbd4eab89c8a6070f3febcb0046be7344469a7e8e6de6a3c2b2af49069e64953dfcac0044d581c6af09eee70eba78dda8cfa9e0d11d3f1947 SHA512 ec66cf3c57e3386e07e45641536a6eeb94e9707d8a0d3b485d22b8687f20282c9115d533c7b0e9fb6dba28b923cf68dd8cdda08c75e78ca4eca2f0c3ec23c58f
-EBUILD multidict-1.3.0_alpha1.ebuild 856 BLAKE2B c847272f885f964aeb0687f9db5b74bf491830aec3b65c41f7578bb973c05a1844370b23b6d08f85ec56962a02aa05b3a8a6a22ce9ccca6e01543863b44948fb SHA512 e6489bdea91e0ace6f95a7e2482716dff13e2203ac467388c33cfe1b96a14719ee536327a4bc94ee676144b3e109c53506d1db02810b2915d86b537f60994da4
-EBUILD multidict-2.0.1.ebuild 865 BLAKE2B d8e17f3c8d75ca314433732a5f8d5c6401798abb7f10c62a96de988e78016cb2094c05962c7670b8db6837df7560b27630b90043966405d7e25d4cfe927c68b2 SHA512 68b7e078bf80170d665b5797ce33b5c3b5cb172ffc41ae8ad49a0a8a27855e281880de8e1f95249c6ad9c41c642fa3df405ec5d903bab51a8d016838c898e407
-EBUILD multidict-2.1.0.ebuild 865 BLAKE2B d8e17f3c8d75ca314433732a5f8d5c6401798abb7f10c62a96de988e78016cb2094c05962c7670b8db6837df7560b27630b90043966405d7e25d4cfe927c68b2 SHA512 68b7e078bf80170d665b5797ce33b5c3b5cb172ffc41ae8ad49a0a8a27855e281880de8e1f95249c6ad9c41c642fa3df405ec5d903bab51a8d016838c898e407
-EBUILD multidict-2.1.2.ebuild 865 BLAKE2B d8e17f3c8d75ca314433732a5f8d5c6401798abb7f10c62a96de988e78016cb2094c05962c7670b8db6837df7560b27630b90043966405d7e25d4cfe927c68b2 SHA512 68b7e078bf80170d665b5797ce33b5c3b5cb172ffc41ae8ad49a0a8a27855e281880de8e1f95249c6ad9c41c642fa3df405ec5d903bab51a8d016838c898e407
-EBUILD multidict-2.1.4.ebuild 869 BLAKE2B 4620150b518f2b8172740bb607c64b99fdc3dc4b663aa1ce5233048f328b8f6db5e6d835071de3fb05c4457742d097034d08255987749c8880d0abf33c251e3d SHA512 2ec1d8174e299b1d3574b27f04ff34b21f66f6119996c3eb087df81640041572619f2518dc5d951392af92e69dbbbf04f71d45105b7eaab43aa6cfb6f7981804
-EBUILD multidict-2.1.5.ebuild 1044 BLAKE2B b172ea90b8e774c1fc9169f6f4429995f91444bd88a7537b9e748ca6786633e30e1f8dac9a53e1e450c892aead30dfda269383044d14cd6127d3b5dc6d3149d8 SHA512 134a060120779ea91dfc64323e2379684b58a6d7a9683ed799b4608846ccd88194308d098aaf88e5f0ac1cb56ae886d4d26e3b50b8a5a9c948029c6d426cea9b
-EBUILD multidict-3.3.2.ebuild 852 BLAKE2B a184bf43f1af7c01c579b1a102c17ea080bcded21a371515b02ad64045081b99f6a23253b973d7cd758e5a2fb234753204a19741f36916b13f213d53f7c41ba3 SHA512 43f7a15340cf264cd5c2efaa3afd9b999daf2284a0795e123186bb08f918ee97abd65f7d6b1b779adeaa39c36c98f3be6d32ecb05ab2f5663b11ae9383d58014
 EBUILD multidict-4.1.0.ebuild 1055 BLAKE2B 304aa42a971660b518e4d85d3f68a91514f2ee327d1b5cb7214c8949e7951b7bd343008e626d99f917b15d04196f412d117190485ace16f0c771499176078823 SHA512 abaf4e3f1997bbefadb4cad52acf78f75d2bce47b09fc6c942d7221a9b57cf2efd57ae4fb5172824b0d52b45def54ca75e31ec6773ad4b70eb17250feeb8c815
 EBUILD multidict-4.3.1.ebuild 1057 BLAKE2B c47c59a679f35c35a50be58b838f7d1218f5db4c7a350dacd69b783c5f1f7bce94cba8f2348e9f5cfdb41034f926c4d4f0e2a2467fa1d0ef5888d0f097a7b557 SHA512 29530ae8855fd675c2110c61c5262283c73fa66bdb9d56efdb3a510d1ae37ec1ba8cede328d62546b191301d4d25c94dd90aa2810783918dbe3334dc01519a60
 EBUILD multidict-4.5.2.ebuild 1080 BLAKE2B bb47730a0bb5b8e22c48e926c7aab4751edd52299d344a45639cf1ca8e9d50409bdf9500cb2d7205aec36296a74f023d4693b6b72c1d8dd753d8e12811808e99 SHA512 21f2d26b8854cd40683de267c2ec97a5625be9c21ec1d4968e7745b904f32136426a4a7f291b0674ab804653e31fb1245b15372984276db7bc082d5e8f2dd876
diff --git a/dev-python/multidict/multidict-1.3.0_alpha1.ebuild b/dev-python/multidict/multidict-1.3.0_alpha1.ebuild
deleted file mode 100644
index 52eefbc08443..000000000000
--- a/dev-python/multidict/multidict-1.3.0_alpha1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PV="${PV//_alpha/a}"
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m pytest tests || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/multidict/multidict-2.0.1.ebuild b/dev-python/multidict/multidict-2.0.1.ebuild
deleted file mode 100644
index 154eb1da04dc..000000000000
--- a/dev-python/multidict/multidict-2.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m pytest tests || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/multidict/multidict-2.1.0.ebuild b/dev-python/multidict/multidict-2.1.0.ebuild
deleted file mode 100644
index 154eb1da04dc..000000000000
--- a/dev-python/multidict/multidict-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m pytest tests || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/multidict/multidict-2.1.2.ebuild b/dev-python/multidict/multidict-2.1.2.ebuild
deleted file mode 100644
index 154eb1da04dc..000000000000
--- a/dev-python/multidict/multidict-2.1.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m pytest tests || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/multidict/multidict-2.1.4.ebuild b/dev-python/multidict/multidict-2.1.4.ebuild
deleted file mode 100644
index f96d85f71c55..000000000000
--- a/dev-python/multidict/multidict-2.1.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m pytest tests || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/multidict/multidict-2.1.5.ebuild b/dev-python/multidict/multidict-2.1.5.ebuild
deleted file mode 100644
index 48db0ee37cb8..000000000000
--- a/dev-python/multidict/multidict-2.1.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Running tests from ${S} fails as follows:
-	#     ImportError: No module named 'multidict._multidict'
-	pushd "${BUILD_DIR}" >/dev/null || die
-	"${PYTHON}" -m pytest "${S}/tests" || die "tests failed under ${EPYTHON}"
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/multidict/multidict-3.3.2.ebuild b/dev-python/multidict/multidict-3.3.2.ebuild
deleted file mode 100644
index 3b217f4f6a5b..000000000000
--- a/dev-python/multidict/multidict-3.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index eeb10b58c188..e0d19fa663c9 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,5 +1,6 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
 DIST notify2-0.3.tar.gz 8798 BLAKE2B 57e1eeaa96b9e5354991db36440abfbf80471887c094e41dd6ccff72f1b1b35524bebf83b44afa455c64cdc3fb7b0ef66d2517ca499340a3d001e796828ff9b6 SHA512 3290a5ff291d5500bcf631094fcf10302b234353eb8c26b91e7cd264238443866aadc15224d51eb6608e16b7ffbc9316d4bc551e5ad9de2a48b12a31b195739f
+EBUILD notify2-0.3.1-r1.ebuild 682 BLAKE2B 2e359b2bbd2abcf19fa5b6bfebe17b1c635ce6461a542dc360adfe0e7fb77d18c683ff5ccc339c0fb2238462d5b876149ae5b81d49221b3d439bee2cb0e0dd7e SHA512 9c70d4c345a2b20c197728ed2b9731c8c5f6ca332ffdbdd0a4a4c9efd9c4108086618e621473749b53cba25b66bf4750f557216db00b7ecd642279e395a63d55
 EBUILD notify2-0.3.1.ebuild 678 BLAKE2B 602e8091115dfd7de602b7c3647e5c37f369f63fbe0d7417e471ab89d80d9ed4f62aa2aa31aa31eeb320f94a691ea6281a3022c1c1921e92da9b9d92b8b6ae17 SHA512 755039c3dbc3e1f23e9b431ef4ffa2aa1d2ca18e3cc06193f10eef0c068218a78bef8d8aa3f59c8e78f822c509dea0e7c2b7ed321fa1028f93939b4247f9befb
 EBUILD notify2-0.3.ebuild 673 BLAKE2B d33eba87b4f9b6ac833a301a7fc5eda4ec0aed563502f5d710052d9048ecc52a839af973ba15771a329ee276fb30f1b42d06557ea2abbf4035ff204e05ff6ba5 SHA512 344ff5e49820b85635dd962bf369ec20fb1fb1619b0fb3a17c6ef7fcfafd9e3705b83120af5931257f6772a3a67c2cbf5c2aef25829ab82dae22c7d68a8656ab
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.1-r1.ebuild b/dev-python/notify2/notify2-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..d04e66c02b35
--- /dev/null
+++ b/dev-python/notify2/notify2-0.3.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python interface to DBus notifications."
+HOMEPAGE="https://bitbucket.org/takluyver/pynotify2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="examples"
+
+RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
+
+python_test() {
+	virtx ${EPYTHON} test_notify2.py || die
+}
+
+python_install_all() {
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ntlm-auth/Manifest b/dev-python/ntlm-auth/Manifest
index 9ec90249400f..b01b1aaf4369 100644
--- a/dev-python/ntlm-auth/Manifest
+++ b/dev-python/ntlm-auth/Manifest
@@ -1,7 +1,9 @@
 DIST ntlm-auth-1.1.0.tar.gz 38624 BLAKE2B 22c6fbe7ef95b7ee88b803b7ccc5f63f1a27ec9285a4527dac20c3d774abef9765f8a7aa7265effd70869f02e09e6d3b8012c50b703c3b0979e41c0134843be2 SHA512 0c41cfab957c48d5fabf391422323556289cc6d8ba5a50c82bb179f6cdbf68528f005c3987e0b47fb47aff2fbcf00deebb0ac4220df6bd08d335879344f8470a
 DIST ntlm-auth-1.2.0.tar.gz 40006 BLAKE2B 2fbe7533411dde27938412b3e5e1292ce0fa197abb048c0e52f521ff351bd7e51bdb83b5fd8c1f05e0bb3ce206a4442b8b7059c859eea7333ee2d20ed2e7f7dd SHA512 4fa537c5a6a7f3493df2fdf49261f9588b7aac876f72b7a7ef5b8a7a1dd971d9426dacdc8bbf520cecdbe5b7adb916ddcad9e9cf4df725b69793299304601912
 DIST ntlm-auth-1.3.0.tar.gz 40684 BLAKE2B 74c2b914f508b5291cc2a23ae99417db5e5ad9fe107c03f63c795bd4da202db2f1a4f6f289645d2164e708a5a5a2e3bf626aa749dff3367420d669965c462b71 SHA512 e2d5401161ba6f9fed377a7bfed501d49ad64d5104accd7df298747abade34a3ddac9e68332416a3ab68156e9bbf7a8de6a8a271542d080cafaa84ee19f01986
+DIST ntlm-auth-1.4.0.tar.gz 40745 BLAKE2B bf2c0dab7303cb0f87d83ed11d79bc12b8f74095f2f251c190eb43879bc0e9419dedf706fcb4929c51138658910bdfa836778084b34c974ca120aeb848e2da0e SHA512 abe0260c66e2b5f57c1fd672ea121129926f1c32020166dd61973cf51f6bd320f6057f3a148d602b96d8417c2ad57c335048da185100417401e049ff14b46004
 EBUILD ntlm-auth-1.1.0.ebuild 557 BLAKE2B c9b3a25a14d39832453351cb3383e258a6ab913b1966412c17d2985a884a399d70f8efeedf61e0471d23d5e4425f6be4cad63cf2f63f784eac962d40803566aa SHA512 88c9ec8e06ef96aa6fc2ab6f1fc74650339d7c09fb58ee80e86a2738b7b68c51e52bbcaf35a9e25e46e1b6f9f69fa1f02e18f87802b630ff57181a77116b4238
 EBUILD ntlm-auth-1.2.0.ebuild 557 BLAKE2B c9b3a25a14d39832453351cb3383e258a6ab913b1966412c17d2985a884a399d70f8efeedf61e0471d23d5e4425f6be4cad63cf2f63f784eac962d40803566aa SHA512 88c9ec8e06ef96aa6fc2ab6f1fc74650339d7c09fb58ee80e86a2738b7b68c51e52bbcaf35a9e25e46e1b6f9f69fa1f02e18f87802b630ff57181a77116b4238
 EBUILD ntlm-auth-1.3.0.ebuild 602 BLAKE2B 0bf33e4a7dfd47bd8e2069748047b2c25dc38f30103118748b46d16c1232352f66d4ffb95e7c1ea9fe17482891733398eb636fd2fe4de4e40602c860c024c86c SHA512 e071bd2d00dbe8efb332bf535a555182dfc2f94e14aa40a5e3ded396965130d993e47e6b044b20e455ac09d2fd430eaf5f596cb08e89ac5f44dea57bcfdc9091
+EBUILD ntlm-auth-1.4.0.ebuild 602 BLAKE2B 0bf33e4a7dfd47bd8e2069748047b2c25dc38f30103118748b46d16c1232352f66d4ffb95e7c1ea9fe17482891733398eb636fd2fe4de4e40602c860c024c86c SHA512 e071bd2d00dbe8efb332bf535a555182dfc2f94e14aa40a5e3ded396965130d993e47e6b044b20e455ac09d2fd430eaf5f596cb08e89ac5f44dea57bcfdc9091
 MISC metadata.xml 425 BLAKE2B 791b65f110ff47908b2ada3e140cbd1fb262f0cce02e5ac083cb4fecbfba686a44aece6a3d44a69b6876c4603dd74d343fd9a61638f908836250bf3badeb9524 SHA512 a38de76267e3e44d11a8e3571809031b94697d270e3c752629764300893e95ccb1e8daf8a9bf897a442fb3b097fd6da4f3d4d34fbaead847474335a53ab91768
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.4.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.4.0.ebuild
new file mode 100644
index 000000000000..2f680d17f344
--- /dev/null
+++ b/dev-python/ntlm-auth/ntlm-auth-1.4.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Calculates NTLM Authentication codes"
+HOMEPAGE="https://github.com/jborean93/ntlm-auth"
+SRC_URI="https://github.com/jborean93/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' python2_7)"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 228e5f01aee4..35443c32d104 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -5,21 +5,26 @@ AUX numpy-1.8.0-no-hardcode-blas.patch 1153 BLAKE2B d812ddc3069d23f211026c14ca36
 DIST numpy-1.14.5.zip 4904624 BLAKE2B 14d266bf1139b9539e39d08a6537e2b772e80bf46a0769cbb06b63ba54858c9284f6d0e8a19627a4d99f2c2638e9a4031bf4d4aaf773eaf34b7203d131636dc0 SHA512 e131f9fa815084e334b59c5d9abd8de0088ad1dfefecf8615ad7deca0b54b0dfa0446c8de99c90670ea9fcabea9980bd171618a5b9032c1937b597a5ce363c5b
 DIST numpy-1.15.4.zip 4473522 BLAKE2B c030ef4a06c84091eec11b6602422468bd0674489a2c7fea1230132cd3a3ca1b10ec87eeb6788f2f263943f9ac43026dc1e7f0f5f1d52e9d1cc6934a5d361090 SHA512 9e0516da04368f0353fb7e3cc2c72e1ec936042908309732a298405bd7111e712899627b82f3674295b611e0ebfd74ef91d693f065fe9cb03dc7de23d1e72676
 DIST numpy-1.16.1.zip 5070040 BLAKE2B 0429d27d88ec97e207822c9c7fa759453bbef97d1d5fdf3e68dab21ca098a6321e2e57d85561dd99084d190b8ed6fce20f00b421c8d14a249fc45dc1ea09569e SHA512 e4adce4f40a3cb6ac482f82db9fcd079179b03b0e878920cfc7d98b9f622adab997c68af892b209f417d5f31b4123a1c5ff5c07cf5b0aaa496d8be6c8354bde8
+DIST numpy-1.16.5.zip 5138208 BLAKE2B f5511650e66939a6ce21cfad7874aecdeb6c07a70b32419a808956e42c7819d82bb364f1632da91b4d8a5237001c8ae3cbdcac10651fa0acca9558bdeafb5437 SHA512 6dd790ff57fdb7e7b0bddb47ea2b70b2667edefe632548ec68934e12a16af4a51bed9726e495c4993aad4c448dc4a204d0a087577d43dcfc9fa0164eb1d4b898
 DIST numpy-1.8.2.tar.gz 3792998 BLAKE2B 00d22c72ab6f919626d3fba0edc477fb9c19f9c299f78cff6102e1860e3d1baec8f3b17aa23be797e9a34630428174de3f3b630c3f05c5340024dc6314fad8cd SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c
 DIST numpy-html-1.14.5.zip 11197881 BLAKE2B 00cac3c5be07f644328acd9ed155a6fc07ed7d7380584732bb3ac03562c8705cd152612f461d5dc251dabe0be4ba45593165a961496e351110e1aa7598c37370 SHA512 578d31660de4e1f57310b3a2137cefea17228f40046eef1689fb6d9302f0fe0fda5aaf473c3b8c69ae781049950022321593ec891a5640e3c36c886ab3bf4383
 DIST numpy-html-1.15.4.zip 11158615 BLAKE2B eb264cd51fd61b389e858300d96be63f8e2eeaa0b7346beac571b62d96867d6820c19d5043a6f81088dc52b1e4d7f3f295e02ff5ff90351b0feccf657ce90001 SHA512 1cad60013f374f456bbb1fb6161545a94e252205c28054f9b33cde65330772ab243339289517a8825957a21e210455d33bcc0b9c588052c49c88257b1b04facb
 DIST numpy-html-1.16.1.zip 12132467 BLAKE2B 050a8cba160e36a4c547f1b67b8ab2b9220c9841a9f8343dce6f3221313505530a1687efa2116384a03d3bc9172a0298b4ea5ece2f423841d595e45f565ccbc2 SHA512 5af356313363e00f05db560902cc7578162c7d2ab9c1ef0f3713854682b63d76297d55eb9aac0dfc7f4b687ccea93a53462e2082ef1270e29e19680e1222b34d
+DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-html-1.8.1.zip 9703711 BLAKE2B 1f9d9cb4e65fc2f03d07da9bc34de9c8c4f93f5267689abccb0e2383b23babfed52ae6c3969738e78eeca7b32f49c90f9f7bb92dd432a6b87e082b67c1f214a5 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071
 DIST numpy-ref-1.14.5.pdf 4855150 BLAKE2B aa924542346bd06b1aa8b11ceb8eb5de936cfdccc10a8339720a297e27b5b34961044eb8db8dd7b9a19ba93b3cbf76ec278a9a50724653aafd2b9d57a00007f2 SHA512 717f58fcb1aa66ecc5f5d4c11c9923d2beb21a1b1a0ca1e46f3622c69f1122fd0547b7f7abaf6de008e2aa988b2453af3c2590877f5596fb6642479ece651746
 DIST numpy-ref-1.15.4.pdf 4843444 BLAKE2B 26154930a8c881f49e7eb7d9540d1deba27baed1acb15dbacd42a659c05f50605cd44b63b2474e66d1d22851145cc65b3e3f26302f8966e141cbd2afc666c654 SHA512 aebff74389e785bd588ccc287329aea4dbc3ef51b46fbffdf088853342fea724f79f712733e453877949e756a52e89de3b257e5feba86e830df84ed8f9bb0e30
 DIST numpy-ref-1.16.1.pdf 5175448 BLAKE2B 5cd692a0fc825216560dbbf48738a49b794973d4539bd778f0f9a2f7f72b32d3061675f9a76db4cbfbb38eec0793c70046180fcb07e23ffc6177dee76b16bb92 SHA512 6cad03e30d7c2204fb899f4e4d1167fefade60d20dedf0ea87ac15c70139fbcca8789cdf17af5a2d221ba06eb78e9376b4b542621f9d78772041c83ab2405d1a
+DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-ref-1.8.1.pdf 5348248 BLAKE2B f087fbbd3c789adebd2902db0a2acc8a8748ccbb5a1e7e064effdc91e92c7dcf087ae36436fc52d7afa12a12ca2fc0f5f5617177bcd8b9745a7155acd10d71fc SHA512 340dd8f47430f24fea81bb3a8674e1a58f4290a9d1c5d64bac96d50b31a94a770e78381e42daf8b0a6a90cefe5cafe86b0c89f7cc7635a042a7e85eb74bdbdf5
 DIST numpy-user-1.14.5.pdf 574418 BLAKE2B 80738f1760932fa74b07334d1a355ba3ce319e0b03fe1428d0b3497466fa1164ccbad84969cb7bc8daebb5525094f0d0c7710e1d661b1c6bbaca0669bfcbf875 SHA512 fb00305408c56ee203ed71ac042474592e7e933f14a639f6dce0f6dc80206c13b844c2425a919f9072a114c7af2c2f9f85b78a07ba3874259e5d173290e51a13
 DIST numpy-user-1.15.4.pdf 596191 BLAKE2B 1387b7aac9cccba4b7ce259391f56372959db35c4ddce111afb9949347ebcf3290e7d3fb5b1b2d2e7850911259cddb07edfe104c1396ae8e31a58a81e9293f16 SHA512 2089753b48412f094b279c378be1d221ec9b171957171a4e26b4589d594e00b4f66b6f8a88a7eb665e8c3fa3e6ed505d63da80d4d01ced041544b97ea56fe212
 DIST numpy-user-1.16.1.pdf 592508 BLAKE2B 88ef7aac2998fd8eeebc3ab92df9ad9ba139b67ab0442cd4ed91cdc7b1cd72acf7905468118df25634640b709106758455c7d316539b941d7760010b8135fafa SHA512 d089b4c663f92c38aa075c37974df757bdc457f75980737477a4477f67311d28149bc4c20f5d1cd0877221a78e5a9ff10702b1ebcc8ab062d328cdda4087d0f7
+DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
 DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26639b4c6e81dbe1718052304ac5ce1a7f96646d94ad48bf737ddc6962fcbc304e31dfce32b85cb8165b0ada6e0 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c
 EBUILD numpy-1.14.5.ebuild 4100 BLAKE2B ef8db45fdbcd2a3e43065b74e2498e8a555727925594073631b7743f6e73f244cb302abf29b11c567e83bfd2667362ae0bcaf7e89e97b7a8a9cf7151f7cfcddb SHA512 1c82e4f559c04130d2c70d43c1a9142eb7da2f1def3aeb8b736b8b97ad1c71b1b081dfe8b54a32f56342bccb8f55fa6a4ccc01abbe3153baf2d806a396122b60
 EBUILD numpy-1.15.4.ebuild 3911 BLAKE2B 93ec5d217f42a505248509d642a0039c6342d2011b9c41cbbc45ae9ebb34e8445b6aeef1e8e827b99a78525b37569e33b22c4a0ffdd1af4b4d4237d8dd2bba43 SHA512 c72491e09fb7d85bb33b245eb9106fde1e6209c891651d46c101ac43174d934f1994503f93db3ff032292ffc6a59c3b78e747fa310d6a9dd2a7fc4dc092cc431
-EBUILD numpy-1.16.1.ebuild 3940 BLAKE2B e53c0d7c1fbf619fc4df91428c411b5ff1b3d3195ac7b06cc568e29d11ac0cff6e93111e988bd50330c70723d5d21a542a3b4f42a603186644a4a22fad0c4dca SHA512 77d9e194f48bf57406e6ea974fa3d44ae848d78ac4a023f2ddedba31208fb72b820403aef2f053d105aaa20848f66762053f7d2818ceb14d21b80f97d5e10410
+EBUILD numpy-1.16.1.ebuild 3931 BLAKE2B ab8432f6fecf5b5a7d54410ffb22786808d958cbacac260262929d240721a00df3982bb679f47e238c3f769ab24cc08b1cc31a20c524dd85d98d48f9567d9a00 SHA512 ce0349a7b111f50cdbae132fec2de20647b0bb254c69408e5e68d8837a8a9039e8ce2259f4af1182876966f797b467857361f2a87f0ff3d1e78ff1f423acdae9
+EBUILD numpy-1.16.5.ebuild 4247 BLAKE2B 1ff4b4445605f49ca3a9775f44bb7f6e3da2b84b1b59f31fc1745f59b62258f5996e85ae76588911e18bc1d2db2d5522233996a1c08d728d7162d29b4a1c4c04 SHA512 2095b2c1662ada4d667b5c76a1892b446226e434a593b1392e2ffbac812f314d3258a65ee694439eaf95ddb922b21073dac9016a3582b71bb79217892d484c3f
 EBUILD numpy-1.8.2.ebuild 3986 BLAKE2B 398fe9fc9afbaaf6e92a70c311a18fc47856453446bdd1a0db578c9885c53640a6faa1a6c8bc5c61450b4eb6bbe07eabc5593cbd2ea21eea8c51a68306d68b4a SHA512 58879a52e5bd331fb7dd363f8f5548a5c85a7b931b2cd5ab8b87e6cbd735997bfa9ae9e58bb940e3cb3766c1cac8929a4043fa256b40d1ff5183b56a4eba2d8d
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.16.1.ebuild b/dev-python/numpy/numpy-1.16.1.ebuild
index 89aa5f734305..1ec2abd0447f 100644
--- a/dev-python/numpy/numpy-1.16.1.ebuild
+++ b/dev-python/numpy/numpy-1.16.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
diff --git a/dev-python/numpy/numpy-1.16.5.ebuild b/dev-python/numpy/numpy-1.16.5.ebuild
new file mode 100644
index 000000000000..2556eeee4f8e
--- /dev/null
+++ b/dev-python/numpy/numpy-1.16.5.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
+
+DOC_PV="1.16.4"
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://www.numpy.org"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)"
+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"
+IUSE="doc lapack test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	lapack? (
+		virtual/cblas
+		virtual/lapack
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15.4-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = $(pc_incdir cblas):${incdir}
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# disable fuzzed tests
+	find numpy/*/tests -name '*.py' -exec sed -i \
+		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
+	# very memory- and disk-hungry
+	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	local python_makeopts_jobs=""
+	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
+	distutils-r1_python_compile \
+		${python_makeopts_jobs} \
+		${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+
+	"${EPYTHON}" -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	local DOCS=( THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pecan/Manifest b/dev-python/pecan/Manifest
index 3fc9b78fe5d9..49eb6dda60a1 100644
--- a/dev-python/pecan/Manifest
+++ b/dev-python/pecan/Manifest
@@ -6,5 +6,6 @@ EBUILD pecan-1.0.4.ebuild 840 BLAKE2B e8e278e5b0505d02671cd90c92a236c027a7ca5ed3
 EBUILD pecan-1.1.2.ebuild 848 BLAKE2B 2423f4fb53310f0433f196b4b426b161f4e158d40aabedb7682842fbe9d40a896edf55202402066fe3e8e7d031dc897bb78ce238f7100aff8da2d6fa220fe6c5 SHA512 9ea55af4fc69e54bf1bd916e2016d2c033af39e26e802f1dfd544f4a555dea0ec807686a870e1e9f3ea4827942d8fad2835a0c8978161b564e56d1bf07b37a9c
 EBUILD pecan-1.2.1-r1.ebuild 857 BLAKE2B 0fc4cbbd54aa9ed32ac4cf11f31a172f1e1304190a30ca86727a3dcabd8152ec7a27fc79e5220215fe8d5ac55ecb1c3a38ab785eb1873051f8e47d4a4efab485 SHA512 93de7068eed04d839d1168ae722e744b1ce1e352e127f5053a4cf0ca02cacd1a632646cdc6ffaa2bb5b70944ffdb189e1dd13ce2a20de921d8ac113b7aaca0a5
 EBUILD pecan-1.2.1.ebuild 858 BLAKE2B 386b6264b7d70dff6dc944f157e51c735e932cc9d5bf47d8f302c6065539bb8817bc4cfecce323e908c69046257738bf8be7bb40572e7b94cc070d2c23e98899 SHA512 e6165cd6a4cbb3838730bcb651b4444f31e79e8c061f7c05288b2ad9337e2427af8d0f72d2d1e08633d5607a58ebbf061781b0545280d762b542a2e772449a94
+EBUILD pecan-1.3.3-r1.ebuild 826 BLAKE2B 5260439da89041a0c418a0789c6fa8455792ee6848813680151161d4c6d72b97596171d6563e2ef7b1437392be74bca5b5f7556513914a3fed1e2113644e8dd2 SHA512 825f9e5b24ddf3985df53426bc465832c78c0cc4c48bf7f99b3313bf3bcec10f9341bd9c1bfb5fd9c2e1291ef30c0deeedab16d48d79925eb4fecd92482dec24
 EBUILD pecan-1.3.3.ebuild 805 BLAKE2B c32b9f52a96d3f87783211976ad3f120742605d63d46e2aa4d0f29f7f3511d5f063251763997ddd0131f3ce8e46f4b27c4e5db0de25d413a02e4068296519dcc SHA512 1e45fd1cd0c196c41306d770ce3cf4c24f5f6bc04d9cb7daf83cdda9ac8786c35d75f90676d5479b816b98796da3097e1d8baed2a6c17bbb417d9c11bf5774d4
 MISC metadata.xml 322 BLAKE2B 4be3ea8f134925d142020ac8fcfb0adbba264d7576f30c012a70c5ac175ef79cf9293d6035c9c0eeb52c01ab1a6288a42c926dcd40ee48951ba10122e640017c SHA512 506ed5b74b1e2383261f2ce34595e4fce40864db017ac9a8b2497de0802949a5d2163956a860d037898cb0885a4990531f200767781615056dac07a4af3a4e7d
diff --git a/dev-python/pecan/pecan-1.3.3-r1.ebuild b/dev-python/pecan/pecan-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..e8f8563568b2
--- /dev/null
+++ b/dev-python/pecan/pecan-1.3.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
+HOMEPAGE="https://pypi.org/project/pecan/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' python2_7)
+	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
+	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pgmagick/Manifest b/dev-python/pgmagick/Manifest
deleted file mode 100644
index 9bdcf1fa3acf..000000000000
--- a/dev-python/pgmagick/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pgmagick-0.6.7.tar.gz 357392 BLAKE2B 5994f0014ca8ed0ffbd9b1e62c8ed7304ff7c39e6b1ac2a2c829c628ea6912bcc9c7d9161aae3ff7eef5126b1c8d622ef7fc6392f4f2ea2dadc14976b40d0a6c SHA512 0a8812457c0803a1b7ca228c77691ebfb1d51689acfce7a3c36a3b10f16020cc6e4814808985b38a79fe1ecbe77cf29f4ed6b7bf813ecaa72545127919c59c7c
-EBUILD pgmagick-0.6.7.ebuild 844 BLAKE2B 467f95405dec50cce90efe15378169ea3d0406811351ca6089fc8fe6b12855faf79b9e459b70ca6747e781e9be247447c1d2ce0eff495863c36c30e09b9ad7e7 SHA512 6777932a939ef6ab512201227da942d86e2060c5288954e905bb40626c78b7816c04bc1b8fbbc86c50a8fe3da64730c461c0dd1c2b553977bd78e6ee6254dceb
-MISC metadata.xml 369 BLAKE2B 4b89e8b23267f66abf25a86a6e099608e5f45d223c6cd13f9064f1a93bf381ec79828f366325b5baca33556a7513c006afaa7c8abb1441998afe259286b10b2d SHA512 0d44d859e8682309c5b257594c122899c0be9658d8f4f60b8c94cf5cd8c64696fde6344b776e9859f3083d10cec41d2a6797f175fa55b77610885de69649e4d1
diff --git a/dev-python/pgmagick/metadata.xml b/dev-python/pgmagick/metadata.xml
deleted file mode 100644
index e116cc09bd20..000000000000
--- a/dev-python/pgmagick/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pgmagick</remote-id>
-		<remote-id type="bitbucket">hhatto/pgmagick</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pgmagick/pgmagick-0.6.7.ebuild b/dev-python/pgmagick/pgmagick-0.6.7.ebuild
deleted file mode 100644
index be69b8977bb6..000000000000
--- a/dev-python/pgmagick/pgmagick-0.6.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another boost.python based wrapper for GraphicsMagick"
-HOMEPAGE="https://pypi.org/project/pgmagick/ https://bitbucket.org/hhatto/pgmagick/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	media-gfx/graphicsmagick:=[cxx]
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( media-fonts/corefonts )"
-
-python_test() {
-	cd test || die
-
-	local t
-	for t in test_*.py; do
-		"${EPYTHON}" "${t}" || die "test ${t} failed under ${EPYTHON}"
-	done
-	# As long as the order of python impls is not changed, this will suffice
-}
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 7f770dbae39c..524d41f76d04 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,7 +1,7 @@
 DIST pocketlint-0.17.tar.gz 22612 BLAKE2B 3245f80c486a4d16389262d5795be32b784af1b99dadc26009d0cff250e8dab9f6ac4ce9ac7e37466bcb01fb3b697740e14a0d391bcc3abcc4186d72d7243c84 SHA512 7d564aca89fd479d2dc773db2723567cfff42cceacdc5a55a87c65d6b80691e6254750c52043e3bebf55488335795b541d5a838eb592747db628af567e24dc43
-DIST pocketlint-0.18.tar.gz 22848 BLAKE2B a5a9abc3543026b1cffa66dcf6204342c5d1ee20219423174daf725688a381a5d58a403b963e95bd6eede629824ccb72bd93161def56778fcaca9ea115e2b6a5 SHA512 02453af8465598053b9591a95d9e62d2cb8e2a218e04ec6903ed166959b7e1eebb5d226b9eeed77c7b94a254808124ec9d2078e102a0bbe9487e0f328a2d3e86
 DIST pocketlint-0.19.tar.gz 23118 BLAKE2B 2e622ba1de20d2043d55261b79b8f78b2c5bbebb2d739da2766b56fc379a6433c56f7184d832356fefbb231fb271782d4a884739b55ab52ffd64ef3efc5c2ea4 SHA512 409ebe916b1c83e128ebb1cd12b7f1d695a999d8ada1555cf6710acbfbde241535f2a929d06ebddfffed66ea7db9f20ca6606e9dd9f1505914ae3c6480cdfb52
+DIST pocketlint-0.20.tar.gz 23443 BLAKE2B f3f50c8f54b35e6d1bcf544ed6f55f2e3e461289929a6da5cf3028283fd97781d7b41d6ea458146ae7b563441aa52b757b4a59a0ab44b9016652503b344f1e48 SHA512 02b05f4831b00ece03856938306f0410f2849212d9aa1b686fdf58e6a8e415ce689cdc990125b7baa3e16eeb0e166b49afe6ba574d553f56c7f9981ed01a15dd
 EBUILD pocketlint-0.17.ebuild 478 BLAKE2B 0e62254afe12db459a60567527acaf4b84545fd8945645a326f71cc20539d406db7c467ad3721a82ea000f6b4e91000474e20baaa682a50a096bee6e880a73b3 SHA512 6e695b91eb875f227d60baee88b4806bedc37b1745bc061931e97d5eab010d5328d9434c9ea3d61979e5ebb0f4c96d085b514387b0d4a5fb49d16f777299f6f9
-EBUILD pocketlint-0.18.ebuild 487 BLAKE2B 09bf182155b09e18579a20765d0d77ad0512fe61ac1f5c499c65f697da3f5e2bb158cd8ad512874e35f995d6462b3b5acff24f133be9b21250d5c035f1eb989a SHA512 cba74d08634f335e1e49c54708a3a7c1d7b9618ee77671e7d22214fc0353763e7a1a9f6ac3103797ec84b6ca76ed5149d0eeaa372b3edfe6428ecc8a6d72440f
 EBUILD pocketlint-0.19.ebuild 487 BLAKE2B 09bf182155b09e18579a20765d0d77ad0512fe61ac1f5c499c65f697da3f5e2bb158cd8ad512874e35f995d6462b3b5acff24f133be9b21250d5c035f1eb989a SHA512 cba74d08634f335e1e49c54708a3a7c1d7b9618ee77671e7d22214fc0353763e7a1a9f6ac3103797ec84b6ca76ed5149d0eeaa372b3edfe6428ecc8a6d72440f
+EBUILD pocketlint-0.20.ebuild 487 BLAKE2B 09bf182155b09e18579a20765d0d77ad0512fe61ac1f5c499c65f697da3f5e2bb158cd8ad512874e35f995d6462b3b5acff24f133be9b21250d5c035f1eb989a SHA512 cba74d08634f335e1e49c54708a3a7c1d7b9618ee77671e7d22214fc0353763e7a1a9f6ac3103797ec84b6ca76ed5149d0eeaa372b3edfe6428ecc8a6d72440f
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.18.ebuild b/dev-python/pocketlint/pocketlint-0.20.ebuild
index c5d0b13365c2..c5d0b13365c2 100644
--- a/dev-python/pocketlint/pocketlint-0.18.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.20.ebuild
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 38ec0892c797..10b1cee2d25d 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -5,7 +5,7 @@ DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498
 DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
 EBUILD protobuf-python-3.6.1.3.ebuild 1338 BLAKE2B c2992acc2383bf7ab469f2a538dbd344ecf65d20bec9ebfe1209de791c643bf069c75dfac08e7b8ce1d450b4a468fee47e4903fd2cd8c4df0d4fb8643147986a SHA512 522fd9478da9a732828c8ed4ecfe468ac15218b8527d41e797f792c462987a7e293c56928ab12bddd79002a24772eecfb59f122244e327182f860810cf7fbdc8
 EBUILD protobuf-python-3.7.1.ebuild 1581 BLAKE2B 0a1956a1e5168382d5db661b7ccce17f164ac5f34d5746b54f17c94b935d7f6566731440e5d7a560ff4f03314b55f85f65dd9b8b9adb5965cb8799879ccec151 SHA512 6724d4732e02042369ccf2e662964be6493caf34dd166ae58d9afb9dcf5117e425c8f22134357d0b3b72b8e9dfac65837db31f6c317e92eae3517622e3ffb520
-EBUILD protobuf-python-3.8.0.ebuild 1530 BLAKE2B c7dfc3e89e04b8b0efc2a5222b7ec6dfbb405005ddb2dcd1b7dc0c3e3e3f1431e08dd69eba662f23af34e3f729ed71dfce4badea9c9c732768241da5e2a49585 SHA512 e512cfddb602dc389a6d7f57ed20976a8d3e6f9f035b0a9e302f0d1a6abb8d341920f5c035dc1399e250df1282bd7aaefc4134871be1abdfa6884bfcbb8b9556
+EBUILD protobuf-python-3.8.0.ebuild 1526 BLAKE2B 470958057b556e18710dd5758c290bc80e0e674ce06ea32da89fdb2f034038e8606ddc8102f94fdcf438f1943957f1631af12f4053085e1303920c2ed5c82715 SHA512 1b7f8d7c12529b4b5f25daa546681f5348bee3cc21c41a929261b4fb52b03ad281fef2487ba4753889d30fb418184a9a636528bf19dfb17d0afb961efc7ef004
 EBUILD protobuf-python-3.9.1.ebuild 1532 BLAKE2B 1731a0fb3647828d002a6dece70dec5eb0d92e6e467457e7872740bc5a504998358ec9f55e7c31f6d8f805345d5e13db9619894b7d393b7b15cbc0013b5e813e SHA512 f703f0e64b604adaab42298543878ab13b9fdebe64832a17483c6da38c000a696fd1a4e16e464a459d18f82b09f5daf0e6eb5e5b4d89328c396aeb8f35eb2ff4
 EBUILD protobuf-python-9999.ebuild 1471 BLAKE2B 96473eb9817c078af97121297054a8dd253f22b3741a40d7df78d1494e229391111ade9998973a2f3b4e4f045f7f8389c4123e64fc0d764545cae35376ca6324 SHA512 f81f1b8146f9c26a9a6d343d3121e456f4b71dc6c6b42fbf8c73777d8b48f58088d3bb966b47da7fc01576f2a0989bcbddd414c19412060a2df8af1e97155ab0
 MISC metadata.xml 539 BLAKE2B 32831dd18b1c8c19a3e5339788b48bcbc6719654148fab93412bb91aa53ccad7b39529bbc2ea78b33b157eeb024e77cfa981088375466273e58b9d043ebdd70b SHA512 c6f28c8549dc8d3552836e81322db479ed4ac7ab5a12232f64d55cd909d8e4face39eed67b3f2c79f01023cfe3d00cf0540493acdb0aac419e6b58abcd430890
diff --git a/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
index 1eab5950da37..8c37f8257387 100644
--- a/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/19"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pycanberra/Manifest b/dev-python/pycanberra/Manifest
index eea42dc5b78e..993a0bc6de74 100644
--- a/dev-python/pycanberra/Manifest
+++ b/dev-python/pycanberra/Manifest
@@ -1,3 +1,3 @@
 DIST pycanberra-0_pre20130515.zip 14945 BLAKE2B ae90cf894cec24aa4d83f69d4a4a8c72303a16171d17e1dd74ee40e2031d87ccb51780e0aa2ef2a8ca0d448f5e7b26c8ed72fdfacceb49967a05c142e8b2a92a SHA512 9836ed3d5aea9a80a3ffd64ef85b327c7dcdf24793c65010f43139c548d7c77522ab32f407930efed89493509efd117c64ec0fbf4d1d6d567d4d34d12d1936aa
-EBUILD pycanberra-0_pre20130515.ebuild 734 BLAKE2B a4cbe1349667f57ea805aa49f39d0317dc8c795e2fb9ef61f22432f571cb93ad3981feb93ce042209e00e2f4b54771d0dbc720fef2743f8814a9b80578a438a7 SHA512 52b259c7d65977518bf5f9f7fbbbcb95437fb6ddd5653f88e42e13227f9ce774c383fe3939e598778f0b7934d4970ffb4f4415b5e3c6fc137693cf71321ef038
+EBUILD pycanberra-0_pre20130515.ebuild 751 BLAKE2B 02cbae9056b2b2a05950cf353d65e413fb1326a73362ea395ae72c1a7a4c6577df5bf09e8d7d1060df26f345f4c0d5cac49ab61f8e2f6a31c58bf11ef0fdd5fb SHA512 0f51d5369a92de73c1f5496517ba218c7e3b19df64ab1b63ba276242d598885e66b21852b91de0b0a19f0d69d1de2172d43f40c486bbef341edb6ef7ff4a0dc3
 MISC metadata.xml 575 BLAKE2B cb6d8d2df8e9bec22a3d5e64554e27d6b4a684530c62e5736d7a858f765b3701ddc6e88214d263ce1d4d485fc210e0e9f1eeb514a77354b2a0d1eedcb0dd3017 SHA512 19bc4b110c746d4a0e946164d0d0b4f43f0bbabef179596d6a6b6981a443122ff395aa892e6130be75dd92aeccb263c5ef5f7857b91f076158da11db3d6714ca
diff --git a/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild b/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild
index 0c6ff027601c..23dd23e04f34 100644
--- a/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild
+++ b/dev-python/pycanberra/pycanberra-0_pre20130515.ebuild
@@ -20,7 +20,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	media-libs/libcanberra"
-DEPEND="${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+"
 
 S="${WORKDIR}/${PN}-${PCOMMIT}"
 
diff --git a/dev-python/pychroot/Manifest b/dev-python/pychroot/Manifest
index 11863508dad9..84d8823d852c 100644
--- a/dev-python/pychroot/Manifest
+++ b/dev-python/pychroot/Manifest
@@ -1,4 +1,6 @@
+DIST pychroot-0.10.0.tar.gz 23960 BLAKE2B 6d22ccbf3d71854d863577f0cf5ec3b1bea40f0f80d5c07942520d5d522ee299222e96cab4893c9cab93866c7f881052f67ad9091267c329a772fc4c3065bae1 SHA512 4a3941da9a94b75963e72536ec8f6218564dbdcb97e6314562044eb55f523e0704aecbc81e8e377338781e8bfd1a2aafb22cdc82f37bdb198a03e0e30d2323e5
 DIST pychroot-0.9.18.tar.gz 32879 BLAKE2B 769b3347bae3f7dfb47c0335015cc898ec851a3d45f774a4e21aeaf9b8d7937331bc69aa5bcbb298e76e7e51ffc2e55f049336fd90f6b08fc3bba87089f2205d SHA512 59c8750c9ba8d601eca485079c04d4153bba92531dbd30fba0104694e4435d76e65b762b76ef89a6a6f8908dd6054d1d95fe4be74825ac1c5a56e473370dfa41
+EBUILD pychroot-0.10.0.ebuild 1103 BLAKE2B 3abfa08dc253404e555048e88c3b48bf30c6e332cebbe95605f4b53740ac35794c058d465336edfae0364419d32505958a32fceec355012000517cecb0af5c3b SHA512 29b6f7551ceaccfc18717ac4254088543176c81a2cac94e5d5b08484a257233e4fab0b8507e186f85db9478b55276f1068e86c9f2840f8c310210301b6e2b76b
 EBUILD pychroot-0.9.18.ebuild 1142 BLAKE2B c8f1f4eb6f92378d0efc61c95d6e8e8bcaa1ffebe44db08d30b5552495f34ce84d4ce8e45ffcf753aac2f7cc01d26c763fc5cd829a7b53b65c322ccfc7958838 SHA512 be1db019faca07cefba2d1ef02b03792383ecd53ff9d1ced5e79151809bc6a60c258933718978b44f810cdde254be82d4c95c3c4b12e58249f05c3f9020326e3
-EBUILD pychroot-9999.ebuild 1075 BLAKE2B 99fd4195e1ab0e2804c64ccf69b19f32e34bcf0bb1ad86d4951529d597ac8b7f8c15c99e20f8a4837a44f3f5b298db5eb0ac49cacc67f798ea7b87b306157a4a SHA512 ace9b23a4ac509dcc3c9da7f2305ac71ce39eecba477a64e945a262259d1ec7ebe1346aa54604395a0b72573bfab5d84cafd63a458d6840235f4ad990c048e2a
+EBUILD pychroot-9999.ebuild 1103 BLAKE2B 3abfa08dc253404e555048e88c3b48bf30c6e332cebbe95605f4b53740ac35794c058d465336edfae0364419d32505958a32fceec355012000517cecb0af5c3b SHA512 29b6f7551ceaccfc18717ac4254088543176c81a2cac94e5d5b08484a257233e4fab0b8507e186f85db9478b55276f1068e86c9f2840f8c310210301b6e2b76b
 MISC metadata.xml 337 BLAKE2B 3c60605dbe9296fe7f6c285123fa649b47c4997af6f715cefcb5047817ddff55f15c4813c2c33dcffa4e771ab3d0afb83bd88506d915e313b237e51ca4729c70 SHA512 4b0da70f35cd4983f6f5cd8aa02e5555b770d3bc2b7e90a8e8287c64593fadf1fe532cef6becce24de96766f94d24d8ec731ac3acff6f42a2c7b06c3e1e1e4d0
diff --git a/dev-python/pychroot/pychroot-0.10.0.ebuild b/dev-python/pychroot/pychroot-0.10.0.ebuild
new file mode 100644
index 000000000000..e1419b49ab2e
--- /dev/null
+++ b/dev-python/pychroot/pychroot-0.10.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pychroot.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a python library and cli tool that simplify chroot handling"
+HOMEPAGE="https://github.com/pkgcore/pychroot"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND=">=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]"
+fi
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	esetup.py build_man
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst README.rst )
+	esetup.py install_man --mandir="${ED}/usr/share/man"
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pychroot/pychroot-9999.ebuild b/dev-python/pychroot/pychroot-9999.ebuild
index bda4fc26dfd5..e1419b49ab2e 100644
--- a/dev-python/pychroot/pychroot-9999.ebuild
+++ b/dev-python/pychroot/pychroot-9999.ebuild
@@ -19,16 +19,18 @@ HOMEPAGE="https://github.com/pkgcore/pychroot"
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND=">=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]"
+	RDEPEND=">=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]"
 fi
 
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
 [[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
 
 python_compile_all() {
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 5e8041cb1656..5f9e586188ae 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,3 @@
-DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
 DIST pygit2-0.28.2.tar.gz 496469 BLAKE2B 1173401d4555f6f40eaf5a27d9c0e83214b66afa609f15cc4d689e8c58cc0ae3865b4e6ebb31808d354ecef56f3a74cc777fe42314ef348c39f1f61d82655bc9 SHA512 3f742cdcc9d603c9cc9ef2e0a545da8bcfb555a0bdeea1c73c53a284b43d40ad6b28c87a029578ad7b1c8f2bf56ecd2859dac8dd836474bfc66223ff4af9e8f0
-EBUILD pygit2-0.26.4.ebuild 621 BLAKE2B 12689ec100e542aa3bb628e1395f1ccd8b3423812985dfe09414c0afd29c69881433355b5a8941bc8124e4ce02ca664084d18fb68cdba44dec0b9ade23356df2 SHA512 c13efaa6f3a1686f2fc6bbbbf0e9a67c004675cd5f07352b0bb2ccdb5875ec1acbe557a28631a2bbd6f8864e41f72f3f80741280bd1e54a07e8942626e2aa0e4
-EBUILD pygit2-0.28.2.ebuild 907 BLAKE2B c107bfe720ca781711038d307652e29cb0f1246abe96b60fd00764885283240999db89edaec84563fe6059bf615db1fa26d5e952cfbc7c5ee09de974d56a33a3 SHA512 9b1e2f9f0794d1fccd81dd0cb121507c3a116ca1f64f5013f6db029b29c03c001cee6fda11f8c7d899e25ad7da31f4bdb670b505750cf67b2a1e456886fd7d06
+EBUILD pygit2-0.28.2.ebuild 906 BLAKE2B 9454943a79010416c8bbde14d46822be2b5315ab6c1bf902bae6362597eb242951ea93e806b6fa6a2387599f096e4130a3f4d72c5a2d9ffb64d5e1f1168d525e SHA512 0658f9d3637c5e22ce942deace28d9e55e40eb72e76cefd6d93f76b9cf6f20bdfd592ba1529da38342a194c768fda38f4404feeb5c3c02b64a0633a50d673043
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.26.4.ebuild b/dev-python/pygit2/pygit2-0.26.4.ebuild
deleted file mode 100644
index 56414787598f..000000000000
--- a/dev-python/pygit2/pygit2-0.26.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eapi7-ver
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-libs/libgit2-$(ver_cut 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test --args='-v'
-}
diff --git a/dev-python/pygit2/pygit2-0.28.2.ebuild b/dev-python/pygit2/pygit2-0.28.2.ebuild
index 5fc3e9c5bea1..9c99e10b931d 100644
--- a/dev-python/pygit2/pygit2-0.28.2.ebuild
+++ b/dev-python/pygit2/pygit2-0.28.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index 924dab022213..8b3022cebd85 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,5 +1,3 @@
-DIST python-efl-1.21.0.tar.xz 9544352 BLAKE2B b49fc0e0d795a0334f647f414673fdaf3b086eda35f9e2d0e9e6a03d2cde572e6076eeb62c4f977b770a72e8f14d4ae536f46d0510b8753088d80e2dfc98e43f SHA512 23a8487b660e9885a1d43a4835c560edd8d27eeb9aa44f9e1878ac1d1acf9833fc62c14036fe0fe5e0bd1144cb993b0b67bcf42c78db8505ca1b8aad0715350f
 DIST python-efl-1.22.0.tar.xz 9523624 BLAKE2B b1b7573da8546f580dcd06be03e4746f2e991245c7bbc3477090c5a9365225bca663454a202f8e05ec6c73cbfb7496ee5f92bc2a9997900e6709b01017740db6 SHA512 27e29af764166e803ce6a833c8249a91226a4315dd658631cec57513befccdc9407b04b452054ceab3f77b429d899095b49dbada2e0fd1a63ff6059ef200e497
-EBUILD python-efl-1.21.0.ebuild 1769 BLAKE2B 0e3641a9fccf4f14f6a0739c2b132252c723ee54bf84345a87672d81c2bd8babf6ded15abe305b4c693c3611a52183937fc33928105e19498c07336ef5391757 SHA512 ab58581235bfe3e3135c36b06253d9eda8b440800112d47e1f2103931031a8eafa5e5503cf4980130c47cbdb49d7b45a2ef51f73cc5389041bdeb29bb7b9b7cf
-EBUILD python-efl-1.22.0.ebuild 1638 BLAKE2B 55f150e9de16b83d09867ee015f24db08f78e967efe177d4756df7b1069e4b5a892da0f3ffe1c0becf21671605dde3dffa767ca908451787eef61bd50f709249 SHA512 0f6214cfd4a15256c8dc1632fe30569f63bafa0294f9028603b16f2f1a776800cd6d51f7a0ec8f9eeb08231fe5d45a8082fdf63553b70dde2b9a1a202a7af908
+EBUILD python-efl-1.22.0.ebuild 1636 BLAKE2B d419249cb2b75e569d16158072f7340602c67e8c23123e3fae9ec5caec66960fb0287efc431a55bd55015ff728c6f4b638da95cc04299c5abd5a0b206e6e3b2e SHA512 954bf4b4732436f78c3f5c1001f966a5ba8185f17db901a3a3197064582fa539f75265e1a5f9abaee508cc32200581eb8209bb0dc5b7592838be8fc87d7bee71
 MISC metadata.xml 588 BLAKE2B 0d810c31fac4488f392b8d3b57eb830af3b5ce3c970a9087939e35bc33c58d652ad3a6dd1c42c6b2604334b5c098b81465a1dc92e051e9f5b8cf5a047a190ee8 SHA512 9390fbbc9345bd5e580a8a1208d8f2e727dd0d1d562679b5e7b7c3f7a4010ed6154e1c2f9d93502dee73d96cbe28ed771b921f67e4a4921c635ada8056449de6
diff --git a/dev-python/python-efl/python-efl-1.21.0.ebuild b/dev-python/python-efl/python-efl-1.21.0.ebuild
deleted file mode 100644
index 7a73f36bef29..000000000000
--- a/dev-python/python-efl/python-efl-1.21.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5..7} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for Enlightenment Foundation Libraries"
-HOMEPAGE="https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"
-SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	=dev-libs/efl-1.21*
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-"
-
-src_prepare() {
-	default
-
-	# Tries to download a file under /tmp
-	rm tests/ecore/test_09_file_download.py || die
-
-	# Tries to use that file which failed to download
-	rm tests/ecore/test_10_file_monitor.py || die
-
-	# Needs an active internet connetion
-	rm tests/ecore/test_11_con.py || die
-
-	# Test fails because of deleted files above
-	sed -i 's/>= 13/>= 10/g' tests/ecore/test_08_exe.py || die
-
-	# Make tests verbose
-	sed -i 's:verbosity=1:verbosity=3:' tests/00_run_all_tests.py || die
-}
-
-python_compile_all() {
-	if use doc ; then
-		# Point sphinx to right location with built sources
-		sed -i 's|"../build/"+d|"'"${BUILD_DIR}"'/lib"|g' doc/conf.py || die
-
-		esetup.py build_doc --build-dir "${S}"/build/doc/
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd tests/ || die
-	${EPYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc ; then
-		local HTML_DOCS=( build/doc/html/. )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-efl/python-efl-1.22.0.ebuild b/dev-python/python-efl/python-efl-1.22.0.ebuild
index 1f160f168884..8529f5f89dd0 100644
--- a/dev-python/python-efl/python-efl-1.22.0.ebuild
+++ b/dev-python/python-efl/python-efl-1.22.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 0ab337b72cfc..4f12a364ad28 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,3 +1,5 @@
 DIST readme_renderer-17.2.tar.gz 14643 BLAKE2B a41c2b1b426f95f026092e6776587e68b09fbe314f148a02ba21edc17f4610f563718cb8469e3fc4baaa9c1c95ca501da205bec6abbf7f70171a1ee7e8710159 SHA512 2c25eb24b04b88fa8522ff0068e3a3a7b57b035641d0053ff93c295dde50cc6f21af9eeca1061eef794f52b0aff184f97c95b3c232f02b308e09682e50a6d40e
+DIST readme_renderer-24.0.tar.gz 24038 BLAKE2B f9c9dea1284cf8ac0a8280395916118fca13a4d7537a455e95436d1d7b818c11d197618dd22c3810790eacf8982d31378f3e22dc349e82fd6dbce84192c47b4f SHA512 202a7142ccca3f5bc4e6d92330f25284fcc4f3984ccdd886e4be2789518242ed659660db5a7c7224f838dc8f5ea9dd6e14c65746cf08a102431ddd77d62a434a
 EBUILD readme_renderer-17.2.ebuild 853 BLAKE2B b50c76c7348a91ebed2ac0efbec2ae947c3d71fb7ff481d4b6a152fa49421b705ddcc854d4592d4dc6cb8ebb8fa328e7c5c18f2fc62dcb5234f488396209a633 SHA512 668ab319e9584d98c1bf99b937f0b4147a62e702f4020340fe5bf39967ba6914e702158df5b7173c771e82f7463b43f8ec3be3f209d7b6b5256b8fb17a470e37
+EBUILD readme_renderer-24.0.ebuild 884 BLAKE2B 7bc73ffff2fea04b46780ae7b58ebb88b7b6b2b53e438dd26be2415722fe305b98fd0cc3b830ed42d6c6c6075e4c1e8c6c65252891cdfe32c52854f7e75c36b0 SHA512 c1bc96e48660f9000cd5333364103a9df58357b77d651816470d0f62e6a36f428d2bdea9a112c18c8b4958b03aec69d90e8d713279708a29e14e6e6e7ab9e1d7
 MISC metadata.xml 390 BLAKE2B 2a81aedd6207fe28eafb76c0eca7ead7543282f84979e07f3b417a4fb9ed6be27a33e6e41f60c37b649cea7c8bd6977703e596760d44a734a0ba3fa023339bd2 SHA512 8594fa46429779b659f2a382d3a6607bc36476387c17c493cc7b9217c5e8600694f597ba5657e46ab7b1d3a75aabf3c113a538372b9a4db58a4b986c41bd6b7f
diff --git a/dev-python/readme_renderer/readme_renderer-24.0.ebuild b/dev-python/readme_renderer/readme_renderer-24.0.ebuild
new file mode 100644
index 000000000000..47bdfdbe3b18
--- /dev/null
+++ b/dev-python/readme_renderer/readme_renderer-24.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
+HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst )
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index 91a1d4ec2d43..c4214a141ca9 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,9 +1,7 @@
 AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153
-DIST rospkg-1.1.4.tar.gz 89554 BLAKE2B b307482cc3df0f2a178dd427a37160cfdc3c407b2135a28854f3df0ff964ed57c17a8ee358a1aa90b3d735e0913bc6c3c8ea1084efdef5fd01933166e21ebac8 SHA512 1758dcbe28c18c834a60bbda2e5e6be34629b3dd4f6519f24dfa1324ff9fc59fb7d0ae9d324c002eee06ff672309627e48f97119b36601390b24a24ae196d5c5
-DIST rospkg-1.1.7.tar.gz 90200 BLAKE2B 5b64be62b292ed8d216058d9e906451c74ebfecced92da2888b6e6340a217f56460b9dad6fb741a1b78c156513adfb435407dfac19a9fcbca49b180662b879a2 SHA512 7d6915a32370786384220cd0d62087e0f82648e96f2006853dfb1486ff5b6c3343e32b9ac8a33ad1c1a8c758499475553b081166ca7ee0c72659855a2b09f151
+DIST rospkg-1.1.10.tar.gz 90434 BLAKE2B 1eb128d7e3f6d07e8309ecf5ea6c4340afcbb6f0618fd4628543c046003782750c5013c13ff2ed17018abc6efc6ce2042ccf2c6dccea8933be7045ddfe3f4522 SHA512 54b1b0ca4683b9388989501781239cf35873f2bf2028d176718f624999835b21e44f0cc5988624b37f7172d21f0c01aa336d35a884753c842098e558c37ac6c8
 DIST rospkg-1.1.9.tar.gz 90412 BLAKE2B 4cca7d1ebfcba495aafd766f0d720a6bc6e5aade0bff098d4a1cbab3b55c7a720de7d1f97edf806a93cc21eeda4cac86e844b5e3b23f85cbcb7b328fd07da222 SHA512 d33005e29313ba06959189f8f563361fd9523c2368855f260347b4c509d8b4053f74db3e2cf5986031653d647ded097f272f65d617da93e13cf77a906cb56ca6
-EBUILD rospkg-1.1.4.ebuild 1076 BLAKE2B 8cd3171fd85c97e5c42382d0281de4629cdba1f36bf5046a671fd2f6b91089ee96e70c73524552e20b9d53ee5bee07896fde9210016ee8753cfe53b838c2eb27 SHA512 2a9964c1cd662b51ba68bb8d19f37cc3a9888dcc7376fe3efa229623e3de46cffe027847e457a7b2c04d52b599e159b30b699d2d29dfde9974f9451b7c133c48
-EBUILD rospkg-1.1.7.ebuild 1110 BLAKE2B 444f9bc1e616fd3ff8daa28c3fad5e35c16e95e9a94da3c0fd353e0180170aa5200d5aff32a81a38380f6050b1bae4530a61cc35de05a8766dfe207fe049314b SHA512 ebec7b8747e47545787e87e252d324c4c9148e8ed6c10c5746f2c6394d8987b2c66bfeb2fb432508727ca5af955927ab2e3cab091d9e9c41aad09ea2d373c03f
+EBUILD rospkg-1.1.10.ebuild 1110 BLAKE2B 444f9bc1e616fd3ff8daa28c3fad5e35c16e95e9a94da3c0fd353e0180170aa5200d5aff32a81a38380f6050b1bae4530a61cc35de05a8766dfe207fe049314b SHA512 ebec7b8747e47545787e87e252d324c4c9148e8ed6c10c5746f2c6394d8987b2c66bfeb2fb432508727ca5af955927ab2e3cab091d9e9c41aad09ea2d373c03f
 EBUILD rospkg-1.1.9.ebuild 1110 BLAKE2B 444f9bc1e616fd3ff8daa28c3fad5e35c16e95e9a94da3c0fd353e0180170aa5200d5aff32a81a38380f6050b1bae4530a61cc35de05a8766dfe207fe049314b SHA512 ebec7b8747e47545787e87e252d324c4c9148e8ed6c10c5746f2c6394d8987b2c66bfeb2fb432508727ca5af955927ab2e3cab091d9e9c41aad09ea2d373c03f
 EBUILD rospkg-9999.ebuild 1110 BLAKE2B 444f9bc1e616fd3ff8daa28c3fad5e35c16e95e9a94da3c0fd353e0180170aa5200d5aff32a81a38380f6050b1bae4530a61cc35de05a8766dfe207fe049314b SHA512 ebec7b8747e47545787e87e252d324c4c9148e8ed6c10c5746f2c6394d8987b2c66bfeb2fb432508727ca5af955927ab2e3cab091d9e9c41aad09ea2d373c03f
 MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7
diff --git a/dev-python/rospkg/rospkg-1.1.7.ebuild b/dev-python/rospkg/rospkg-1.1.10.ebuild
index 0e81f9b79bb0..0e81f9b79bb0 100644
--- a/dev-python/rospkg/rospkg-1.1.7.ebuild
+++ b/dev-python/rospkg/rospkg-1.1.10.ebuild
diff --git a/dev-python/rospkg/rospkg-1.1.4.ebuild b/dev-python/rospkg/rospkg-1.1.4.ebuild
deleted file mode 100644
index 695085ddf32e..000000000000
--- a/dev-python/rospkg/rospkg-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
index 9dd1bdb2cf0b..0c3c7b92c040 100644
--- a/dev-python/rply/Manifest
+++ b/dev-python/rply/Manifest
@@ -1,7 +1,9 @@
 DIST rply-0.7.4.tar.gz 27392 BLAKE2B 3604550646e083bf685a192dcf0dbc80c03cf4b97f6771ed37e228c84909c2518a58bde73ea584085351f1a2b5c865418ae671843087660d48f08e0e44e3ab2c SHA512 e3c3a828eb4b3cb20751ecb2d91efaabddbe3702d52b9adefe1748c07c843da1899e3944bcf0ab79f627ae428b8879cf99739ea7e0c6fd1acffc4ac4dee1b652
 DIST rply-0.7.5.tar.gz 27462 BLAKE2B 0f438e6fd786e7436f135da50fe90208970a0950422bb0d8e26b06cc2def964c0ebd7c3e5e3e282a1d56dbb9e804ac267095dc4da16eb57899f455d66fed2d71 SHA512 ccecc451d9e2e0fdf9df7eaaeabface782d9159cc1caf1feae6e46210f6384aa1a78c15ea3c0e9dcc0bd0d2b28e3b1328c8d37e94a8968b07ef7938e5f5ce201
 DIST rply-0.7.6.tar.gz 26216 BLAKE2B 5ec93739179df0d34762ea0ee004a00defa235a23af8b5cbf283e1e44c250469a704c9247463a8cdf9796c35da8aed0be025e73fe21aece3d376b1e66ffda1c3 SHA512 b0edcff1ca32c465b404a0b2f548f90d312bcb98d3f4aa4a61fb44986c8aa7ecb6f046e72112e2c1f5654173bcfcc96ab4e0625632e908ccf17b43cdb3d8d99d
+DIST rply-0.7.7.tar.gz 26366 BLAKE2B 09e6b93e9581745209b2d1fede6e0e4f08c2a34cc2495ea73aebb27b012353bbdb749ef127128cd5d9df201607f73625e248945038a927d788e324fb632341b4 SHA512 c01166b7df067a6a55d1b43caa7b5a349045e838899daf82e2ba70a2c2525fd68e95f11e5319a1fe36936e696352a37bdc13f132f739cd52759a9a9c91e317ba
 EBUILD rply-0.7.4.ebuild 902 BLAKE2B 062807535e3acd9c24edd1cef1751a83bee35c0ad777b489a6eef3a947e506f31524316aca27558145ed56c1ecea4f0b3d0fb8b24ef03f786fe98c0ba9096613 SHA512 595dda7dd3c5a18b27415323b37859029da4f9753fee44585687c28f8f1de902b66a79faeaf1ec3846f99d6bd876e3cbb212d3cf0c2b7c4f2e77cab080d1c37a
 EBUILD rply-0.7.5.ebuild 906 BLAKE2B 0d7bf337b49162d6a078b400133ff9df00bd2942fe63efb9358cded03d4fcff23ecc302103359facc8b93f2068c968c697ee41c24a486e3a075e8f81ef2697e0 SHA512 eb31a2bf2f70cfffdd8846b79132a7bff12c543d48f6b182247a5da53d1af94f66e2725c7a8b3e09358991126ed9503479511a4943ff4dff01af012f1cf5ba97
-EBUILD rply-0.7.6.ebuild 912 BLAKE2B f317952e46d3a409855cecb9f5e120244d346857b2d411332e69b7677476fabaafe825084e35d641d030dc96a61710ea3c31712e03d9df8dd83f4c36e1362edf SHA512 9846c399ed29aef6c5b8a8269811d8c1b146c69cc415e547d82cec0b466f9b89c42e51ea0bdb20dee16f91beeed0f8deb5331ffe82af8a1628f44458a09902ea
+EBUILD rply-0.7.6.ebuild 916 BLAKE2B 7b8b1280cda1acc894036a075c6f06339b7cf95d2528fe0b2dd4d7d2f8c4aa7022f35cbfe6d5f1ce4d631176d40378356a63e5c3b1bbb040b865c0db704f5e37 SHA512 87282212c197b57907c1212203ed1ab130dac5d042641f7bc9baa144ae1fb48b6ed577ae82125df8eeb8fa722de0b9ce287df17b3471c063d1d5d70f4737647c
+EBUILD rply-0.7.7.ebuild 698 BLAKE2B e723af385e80f35635cf3c432fe341dd578f291151b2c8a7e3ecd7e6b8deb27642c2aeb345c049b80060c66bc162e380f22dcb6ac7490409389686148e44d10f SHA512 e014828d0ac52e6ee1bc659066868294d2d4760b521be088a9fdb7807ce7538ba29dd62e8659ddce7122ab23701d16515157f61683fa79c535b43a2a8ae86397
 MISC metadata.xml 324 BLAKE2B d6027998ac0d5aee72ca31a60c53bdf7bbc628b16eacb329041fadb5ac5c9015f152e3e9f59495505eb73a2f8fe76ccff182026b6d5c80999274268056e63e14 SHA512 9378b0e52729cd011ed824e800aa1af7ed6b9f799de0802950dbf02eeb8dd27e356ea067a46aaa91b05d96f7ec5fc17a43c0d980b7b585fecb8220b0ddc20ba8
diff --git a/dev-python/rply/rply-0.7.6.ebuild b/dev-python/rply/rply-0.7.6.ebuild
index 29db68a22518..3499bd15290c 100644
--- a/dev-python/rply/rply-0.7.6.ebuild
+++ b/dev-python/rply/rply-0.7.6.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/appdirs[${PYTHON_USEDEP}]
@@ -26,11 +27,10 @@ python_prepare() {
 	# https://github.com/alex/rply/issues/26; fail under py[3-4]
 	if python_is_python3; then
 		sed -e s':test_simple:_&:' -e s':test_empty_production:_&:' \
-			-i tests/test_parsergenerator.py
+			-i tests/test_parsergenerator.py || die
 	fi
-	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	py.test || die "Tests fail with ${EPYTHON}"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/rply/rply-0.7.7.ebuild b/dev-python/rply/rply-0.7.7.ebuild
new file mode 100644
index 000000000000..cb3fca642b26
--- /dev/null
+++ b/dev-python/rply/rply-0.7.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python parser generator that also works with RPython"
+HOMEPAGE="https://github.com/alex/rply"
+SRC_URI="https://github.com/alex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index bbae4129adfa..ac6472daef4c 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,3 +1,3 @@
 DIST sabyenc-3.3.5.tar.gz 19578318 BLAKE2B d36182074682a00cdca15be12d9d1424f9d3a8f03130df905e53814135cb0f685086d643ad23f3aec47b56b50b3ca43925a0fb4a3ded14cae2559fd14b6beeaf SHA512 94b5114be111feafc65f75d6461e5135bc1b8c8a84d8501f28e1035150d5581e901e7290f5b4cc6cb5426fac5d4971d138c43f6a62ec3bfe43ea9b5f269c0a89
 EBUILD sabyenc-3.3.5.ebuild 597 BLAKE2B e57c4ea1bd7c5c089ea5af28c70c1adae83e6e77070d5f478439fdab6cee9a1c9c6dab738022125765b50bbb775c5cb971906710c93ec36de265468dc7b52e26 SHA512 75e4430d85c7f676c6b63271f82600b2407c98a83c3c309203c15e2f211744f07b2df9880f49b4afc561b91e6bfbf68d1db8a99e1681de62c0764c76a83b62dc
-MISC metadata.xml 220 BLAKE2B 59eda2baee6ffd0773806bfb555f2784ba2f8954133a6339cb3d3d6fe1360178bd789d0875262ea7904a299cf0bf36e9795264f42d7319463488375ad9cbade3 SHA512 878b4526d51f7901900ec97fb85bb90e0d1099d29bc8e49dd7cea6258da0737e71aec3377f1bc2621cf96fcf7c5699e424bbc5fb721af2f365742725612fe50d
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/sabyenc/metadata.xml b/dev-python/sabyenc/metadata.xml
index 664b1a9c9e03..7a38bb900964 100644
--- a/dev-python/sabyenc/metadata.xml
+++ b/dev-python/sabyenc/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jsbronder@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index b68984f90991..604081234c21 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,18 +1,10 @@
 DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14c57c421309683c6a65102ce4911850acd5d492087aa0f14a0026da732e47eb9bf971030443fc1b57f9f909aaaa SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9
 DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c
-DIST setuptools-40.7.3.zip 842920 BLAKE2B 53b5845f157d088fa0848384770f185b2daf8f1bc0304e8d5ab3eb5cae44a42133e7cf2f655e95be351733760ed401d55e3717c4a1257c77644796c08cbe67f6 SHA512 fb61e4d7ae620684b128bd60112938a4a9721a82ed3aa4daa774837a2db60e989d608ce2ba7f51393f412b78244d6f4c8f1025416b137d8ce01a2c0375ffec65
-DIST setuptools-40.8.0.zip 845071 BLAKE2B a76b92a7e3a5cd87d74f3ff5f49fe4c6b2a1f0c5cc3b04219f6f773585be479ec5d092185129ada1fe5c5ef62714687beb3a316a6d50b559e9224aed468aef24 SHA512 f14976a76bff74b7494d44fcfffa511de0d142b4d308fcbf87b34c31c51491102e152acc11a383c5f6b693d1b18eb119c5186ca23deb12b2bbf186794b062868
-DIST setuptools-40.9.0.zip 847572 BLAKE2B 1ef3f05d747a67395f705ad46bf066f400c9a5ad97efe73175e72eb9091c929cb61a526da1206f431a4e054939e0fd2b2a841a892c6cc76a6116cf781112b472 SHA512 2d278ef162139dfb1dd3640154ae3db755ff5c2285810c85b0452d12e3f3cb199e3f1a1ec7cc43a377d42cd4f86e97e2c773d9f0a3bef8dc1acbf31e6f61033f
-DIST setuptools-41.0.0.zip 848208 BLAKE2B 8d92cfb25f4ac1d0fd209b524693d66eca8fbc43b0ae4bf81343dd97820fd3b0572c8994c6ed1ee8c18e86a7eb4a6154dba53d81da081c950fa1ae1b61e023cf SHA512 e0f310368c50d954c8b0499ca2ea0e969e82515d0526b854c47d74cf6bb5af505cc522d926a346ab636163af6a85d1b40658c1701e759fbdf36f817af79ba7b1
-DIST setuptools-41.0.1.zip 849016 BLAKE2B e07d3eb864c96fc797f1ef2f93b2adcdc310a817339b51af1fc1b3b262fe86ad1bf35741fa3485f94d267bcaa55fded92f62754b3bb4544a27e21b507465c269 SHA512 022ac63b27da157ddab5eef34d4452f30b3798c3555779255686ecedcb98d6d60a9ac0b1a077b28426e3306d4ed5e89f1eea2894f9da6def57376596c01595b9
 DIST setuptools-41.1.0.zip 851100 BLAKE2B 1a2dcb1d3f1a34d9a5dab5156b76cddb03da0f3745e57ebdd363cdd23512df0de8f0d3131c930e2b67ae34fc15f75a9c06802826f97508bfb937a9e45ff287f4 SHA512 07e3381fffc7b75051640c07e334794cb008682e05ab8bbd5bb1e9757fd36305997a2974c424fd474411941f5ff014a53ec1edc276543593b238fe1e97d7d106
+DIST setuptools-41.2.0.zip 851251 BLAKE2B 1c4896c429c670832a46f951dc4c4958f808f1a7c0ad88670705fe265bee23c1d2b6a348b13298b0a60b6c821d504567d4d35b33f388949028391219cd45191e SHA512 6ac0da9f2e452b2b2334c03eb1667d88ebffeb68da18a69fe14f9f0763ac391986dcc663f123015b63eb0c3f905e5a8be7408499ddb1ac20367109275cb66ac9
 EBUILD setuptools-36.7.2.ebuild 1921 BLAKE2B a1cd7bcb5fc4ae19d069e63f56081948d2fde3161354edb7429d43907f33effb8ed04fd91ebc55e443ff44feca82051754ccaeec86fda6a36d05ff9c580dd6c7 SHA512 cd34166c627d64ac0c8f4200ded764737471884e139f7cc48ef05bb35c4af2ac9d0893ae4e9c5b2431f8e5644e253a7ef9bcd185319c1e3941c173ae6295be3f
 EBUILD setuptools-40.6.3.ebuild 2047 BLAKE2B b96175e209a987179bb72e748bc3113fd4ca10bb186f3e684beb2694b84dabdca103dd323bdb64b80c8e707012e48fc092828b94f60e29e97212b0567de65719 SHA512 b37ebd23b91421ac6bbe07ce1e061b098d1d6be9a49145574a974ddb223c01c0077a5bff373b4398bed87d6395e15ca8602356db4bbb25dc351e5e6310db60cf
-EBUILD setuptools-40.7.3.ebuild 1991 BLAKE2B 8091b15d05917a3dd3ae98c808a3968e75acc076708a2b4fe01a4c02192f416df478cc53d5aee4ba0868d464b29596701bb5464a0904ffeb35f43bb98e97515d SHA512 6ae23ba85aef8892dbf73ff2adca2b60dc34efe77f35f65884d34c96d445d2961314071f717f005576a347d6b9eb5721a8604f734d136e0c97f28f48c55f7147
-EBUILD setuptools-40.8.0.ebuild 2018 BLAKE2B c9f297d7d1aab994e2be672b3d9d328f0c2970b80adf98271cd301e0145534ebf813fa1be2ffd4d5f4958ea1f32922c30b6734ec528fb71c38f595a5a0a180e8 SHA512 1fd06b39c2e3ef35bc717933211a47515563b1c54ef3fdb8ecc55914970597c1cb13c78887ce03d81085c15ef6dec8c228e4bb1efd1fb67c96870c5e9f197b2f
-EBUILD setuptools-40.9.0.ebuild 2071 BLAKE2B 83464819d7ff0864096ef6ef6f91db2c96682ea07be7c2f89e8a055f5db39ca5071be8dbf830c71bc206c9bc6ed4d08deb39b9b2264eba516c74b97c765aa738 SHA512 715fd7e4b820e407cd75f87089302528a6d321d264eab36c6612aea49ae17c01a11828cd6b11a4f5efa3acae9faeb6c62e079b0eb562f23c270cbf0982d0110a
-EBUILD setuptools-41.0.0.ebuild 2078 BLAKE2B 8b216d3b1ae28253f484bb1e237bca58b0b610d1fcd1c5b699b99437dc912ea3ae2acdb6c108b5f985c3a4edbafc655acae07b74f4c3f08e014305d83e1beb08 SHA512 a38f7b08573f16d9de993602064d6a3243cdabd69f46bdb88c5a183d206aefc05ad02d81407f7df5150f43fdd1211c4108e52acbad43c392011ab06f3e742711
-EBUILD setuptools-41.0.1.ebuild 2085 BLAKE2B 3074d40f314473a5e66211af72fa1778dad45d2aa84aaef70c0d32003f2d6df4bcc45ce80f19c6150effc416cbde43b0f44c621be430eba1d413bb7d05f41603 SHA512 3189de5a115a4395b0e43f5d48800e43f238414cf4ec548940ea6b7419e8efea9e44149993383e793a6a9f2b25abb625d2090b6a384d3b368b14f72b295d5f17
 EBUILD setuptools-41.1.0.ebuild 2085 BLAKE2B 3074d40f314473a5e66211af72fa1778dad45d2aa84aaef70c0d32003f2d6df4bcc45ce80f19c6150effc416cbde43b0f44c621be430eba1d413bb7d05f41603 SHA512 3189de5a115a4395b0e43f5d48800e43f238414cf4ec548940ea6b7419e8efea9e44149993383e793a6a9f2b25abb625d2090b6a384d3b368b14f72b295d5f17
+EBUILD setuptools-41.2.0.ebuild 2085 BLAKE2B 3074d40f314473a5e66211af72fa1778dad45d2aa84aaef70c0d32003f2d6df4bcc45ce80f19c6150effc416cbde43b0f44c621be430eba1d413bb7d05f41603 SHA512 3189de5a115a4395b0e43f5d48800e43f238414cf4ec548940ea6b7419e8efea9e44149993383e793a6a9f2b25abb625d2090b6a384d3b368b14f72b295d5f17
 EBUILD setuptools-9999.ebuild 2025 BLAKE2B 3a683337651c897d6158f6bd9c55b842e5e5d60eb1c9c34c79655ef5b6d105d34151fa0b9ea28de60a19570a40133159881308dca5eed6d4e9b44e836f309da8 SHA512 2f2f47a4209d735d84d949b69b6532d45030f15f983af04d3b3fc332711a57fd0cdbd69236f55a746c311e50a7195867aa6f12c69044a53a4be4528242f52a9c
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-40.7.3.ebuild b/dev-python/setuptools/setuptools-40.7.3.ebuild
deleted file mode 100644
index ca484ac29db2..000000000000
--- a/dev-python/setuptools/setuptools-40.7.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{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/setuptools-40.8.0.ebuild b/dev-python/setuptools/setuptools-40.8.0.ebuild
deleted file mode 100644
index 93e45f70f490..000000000000
--- a/dev-python/setuptools/setuptools-40.8.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{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"
-RESTRICT="!test? ( 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/setuptools-40.9.0.ebuild b/dev-python/setuptools/setuptools-40.9.0.ebuild
deleted file mode 100644
index 6dea4c656330..000000000000
--- a/dev-python/setuptools/setuptools-40.9.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} 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"
-RESTRICT="!test? ( 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-fixture-config[${PYTHON_USEDEP}]
-		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/setuptools-41.0.0.ebuild b/dev-python/setuptools/setuptools-41.0.0.ebuild
deleted file mode 100644
index 2a96b81ef9b4..000000000000
--- a/dev-python/setuptools/setuptools-41.0.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} 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 ~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"
-RESTRICT="!test? ( 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-fixture-config[${PYTHON_USEDEP}]
-		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/setuptools-41.0.1.ebuild b/dev-python/setuptools/setuptools-41.2.0.ebuild
index 913d8b00ffb9..913d8b00ffb9 100644
--- a/dev-python/setuptools/setuptools-41.0.1.ebuild
+++ b/dev-python/setuptools/setuptools-41.2.0.ebuild
diff --git a/dev-python/simplecv/Manifest b/dev-python/simplecv/Manifest
deleted file mode 100644
index fabee328c693..000000000000
--- a/dev-python/simplecv/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX new-support-for-opencv-2.4.3-added.patch 4889 BLAKE2B 4f1ebacc61e86836b4dc81fc696a6deae9ccd211761a153616b3e474559591d2722188be51c09a67fe2751ced2adbbab4d1daf0fa1aa3142d2fe0413302a7815 SHA512 248a0cdaf74af780c10bbc805aa286c3dee4b93456cb2097460e5916ac94a791665355d1b814f593ac5fedbcbb12a797eff21290ce4db8a04b7c870b82db9293
-AUX remove-failing-test.patch 1476 BLAKE2B a72bb3c9dbf43617cfe891a3e47b049970693c89eaa811fa1283f238705497f835553e56bf0ff68526ac00d1ed47c734d035d817a86719368cbaac5d2c3e291f SHA512 d07daa7addc1f824a2e7bc70e51da05917e559ace9779035a032ce5358b1e0dee3184e44f9eaab137bf8f7a261a136f1f909ea1617e54a8eb7735876b5e74316
-DIST simplecv-1.3.tar.gz 42860284 BLAKE2B c94e484d8ff23fb4d2f2832aad9fdf10a2015e9ca9245d51a9c959273b8c003736f8ade34e04e3a400027cb512b1d228466a57e9d03bce106dab0b568d8205bc SHA512 47fa3c0bb41057ae17323aeb68711ef4716c4fe6607162218477af9070a1b1a03a7300f38b2c2a5c54ff69b916267504aeeac7c3108d6a45045a1469a93005b8
-EBUILD simplecv-1.3.ebuild 1226 BLAKE2B 53fb56076f35d4790d045a03ac41462db8a3ab00bd9205d4d97c752032a2dc264a5f256440e79f5085cef56939428d3ecc3ab3cb32c7d06d7e916e93a8961e87 SHA512 d479226dd26038fe8eb575bb32a8ee14359dc0e6c6a4991cb1e524a60b040a19c70412fd8c5b4b292a9199d2a7d366c4b44fcff5a7b16c3f1b6236537433415e
-MISC metadata.xml 395 BLAKE2B 3208750c8822bd57d815b05b1f9abce19adde87855bd588816c4fef73c1301d2368be1f2f2ad1a311576ac5151089ae7431ced2e200efbeefea60cc4d540ca18 SHA512 604a83919efa9e0b8ffecc3e8edc7058b6d4a1c5caefde04f0494911417bdc390f1436094602f5cc11d2c38fc034c96c209f1406386c890b027af8aed8872454
diff --git a/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch b/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch
deleted file mode 100644
index 58f8639ea064..000000000000
--- a/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 164d39c1be66eb35b02fb7c30f65b5929c9e407d Mon Sep 17 00:00:00 2001
-From: Vijay Mahantesh SM <vijay@vijay.(none)>
-Date: Sat, 8 Dec 2012 01:55:24 +0530
-Subject: [PATCH] new support for opencv 2.4.3 added
-
----
- SimpleCV/ImageClass.py | 52 ++++++++++++++++++++++++++++++++------------------
- 1 file changed, 33 insertions(+), 19 deletions(-)
-
-diff --git a/SimpleCV/ImageClass.py b/SimpleCV/ImageClass.py
-index a545b50..6fab39a 100644
---- a/SimpleCV/ImageClass.py
-+++ b/SimpleCV/ImageClass.py
-@@ -7610,11 +7610,12 @@ class Image:
-             new_version = 0
-             #For OpenCV versions till 2.4.0,  cv2.__versions__ are of the form "$Rev: 4557 $" 
-             if not ver.startswith('$Rev:'):
--	        if int(ver.replace('.','0'))>=20400 :
--                    new_version = 1
--                if int(ver.replace('.','0'))>=20402 :     
--                    new_version = 2
--                    
-+              if int(ver.replace('.','0'))>=20400:
-+                 new_version = 1
-+              if int(ver.replace('.','0'))>=20402:
-+                 new_version = 2
-+              if int(ver.replace('.','0'))>=20403:
-+                 new_version = 3    
-         except:
-             logger.warning("Can't run Keypoints without OpenCV >= 2.3.0")
-             return
-@@ -7622,11 +7623,11 @@ class Image:
-         if( forceReset ):
-             self._mKeyPoints = None
-             self._mKPDescriptors = None
--            
--        if( self._mKeyPoints is None or self._mKPFlavor != flavor ):
-+        
-+        if( not(self._mKeyPoints) or self._mKPFlavor != flavor ):
-             if ( new_version == 0):
-                 if( flavor == "SURF" ):
--                    surfer = cv2.SURF(thresh,_extended=highQuality,_upright=1) 
-+                    surfer = cv2.SURF(thresh,_extended=highQuality,_upright=1)
-                     self._mKeyPoints,self._mKPDescriptors = surfer.detect(self.getGrayNumpy(),None,False)
-                     if( len(self._mKPDescriptors) == 0 ):
-                         return None, None                     
-@@ -7659,10 +7660,9 @@ class Image:
-                     self._mKPDescriptors = None
-                     self._mKPFlavor = "STAR"
-                     del starer
--            
--            
--            elif( new_version == 2 and flavor in ["SURF", "FAST"] ): 
--                if( flavor == "SURF" ):
-+
-+            elif( new_version >= 2 and flavor in ["SURF", "FAST"] ): 
-+                if( flavor == "SURF" and new_version==2):
-                     surfer = cv2.SURF(hessianThreshold=thresh,extended=highQuality,upright=1)
-                     #mask = self.getGrayNumpy()                    
-                     #mask.fill(255) 
-@@ -7678,6 +7678,20 @@ class Image:
-                     self._mKPFlavor = "SURF"
-                     del surfer
-             
-+                if( flavor == "SURF" and new_version==3):
-+                    surfer = cv2.SURF(hessianThreshold=thresh,extended=highQuality,upright=1)
-+                    self._mKeyPoints,self._mKPDescriptors = surfer.detectAndCompute(self.getGrayNumpy(),None,useProvidedKeypoints = False)
-+                    if( len(self._mKPDescriptors) == 0 ):
-+                        return None, None                     
-+                
-+                    if( highQuality == 1 ):
-+                        self._mKPDescriptors = self._mKPDescriptors.reshape((-1,128))
-+                    else:
-+                        self._mKPDescriptors = self._mKPDescriptors.reshape((-1,64))
-+                
-+                    self._mKPFlavor = "SURF"
-+                    del surfer
-+
-                 elif( flavor == "FAST" ):
-                     faster = cv2.FastFeatureDetector(threshold=int(thresh),nonmaxSuppression=True)
-                     self._mKeyPoints = faster.detect(self.getGrayNumpy())
-@@ -7693,19 +7707,19 @@ class Image:
-                if( len(self._mKPDescriptors) == 0 ):
-                     return None, None     
-                self._mKPFlavor = flavor
--	       del FeatureDetector
-+               del FeatureDetector
- 
-             elif( new_version >= 1 and flavor in ["FAST", "STAR", "MSER", "Dense"] ):
-                FeatureDetector = cv2.FeatureDetector_create(flavor)
-                self._mKeyPoints = FeatureDetector.detect(self.getGrayNumpy())
-                self._mKPDescriptors = None
-                self._mKPFlavor = flavor
--               del FeatureDetector   
--               
--	    else:
--                logger.warning("ImageClass.Keypoints: I don't know the method you want to use")
--                return None, None
--
-+               del FeatureDetector
-+        
-+            else:
-+               logger.warning("ImageClass.Keypoints: I don't know the method you want to use")
-+               return None, None
-+        
-         return self._mKeyPoints,self._mKPDescriptors 
- 
-     def _getFLANNMatches(self,sd,td):
--- 
-1.8.1.5
-
diff --git a/dev-python/simplecv/files/remove-failing-test.patch b/dev-python/simplecv/files/remove-failing-test.patch
deleted file mode 100644
index 7ee326df02a5..000000000000
--- a/dev-python/simplecv/files/remove-failing-test.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d8abe3346d7aa2b192d384476d5f2c89ca9c70e9 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Fri, 14 Jun 2013 20:35:11 -0400
-Subject: [PATCH] remove failing test
-
-According to the docs, the UserWarning that is raised should not be an
-issue.  Ignore the failure during testings.
----
- SimpleCV/tests/tests.py | 32 --------------------------------
- 1 file changed, 32 deletions(-)
-
-diff --git a/SimpleCV/tests/tests.py b/SimpleCV/tests/tests.py
-index 94f4fc7..ce442e3 100644
---- a/SimpleCV/tests/tests.py
-+++ b/SimpleCV/tests/tests.py
-@@ -1731,38 +1731,6 @@ def test_movement_feature():
- 
-   pass 
- 
--def test_keypoint_extraction():
--  try:
--    import cv2
--  except:
--    pass
--    return 
--
--  img1 = Image("../sampleimages/KeypointTemplate2.png")
--  img2 = Image("../sampleimages/KeypointTemplate2.png")
--  img3 = Image("../sampleimages/KeypointTemplate2.png")
--
--  kp1 = img1.findKeypoints()
--  kp2 = img2.findKeypoints(highQuality=True)
--  kp3 = img3.findKeypoints(flavor="STAR")
--  kp1.draw()
--  kp2.draw()
--  kp3.draw()
--  #TODO: Fix FAST binding
--  #~ kp4 = img.findKeypoints(flavor="FAST",min_quality=10)
--  if( len(kp1)==190 and 
--      len(kp2)==190 and
--      len(kp3)==37
--      #~ and len(kp4)==521
--    ):
--    pass
--  else:
--    assert False
--  results = [img1,img2,img3]
--  name_stem = "test_keypoint_extraction"
--  perform_diff(results,name_stem,tolerance=3.0)    
--
--
- def test_keypoint_match():
-   try:
-     import cv2
--- 
-1.8.1.5
-
diff --git a/dev-python/simplecv/metadata.xml b/dev-python/simplecv/metadata.xml
deleted file mode 100644
index b317bb249d88..000000000000
--- a/dev-python/simplecv/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>jsbronder@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="shell">Enable the iPython SimpleCV shell</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">sightmachine/SimpleCV</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/simplecv/simplecv-1.3.ebuild b/dev-python/simplecv/simplecv-1.3.ebuild
deleted file mode 100644
index 146b07ce85cd..000000000000
--- a/dev-python/simplecv/simplecv-1.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=SimpleCV
-
-DESCRIPTION="Python interface to several powerful open source computer vision libraries"
-HOMEPAGE="http://simplecv.org/"
-SRC_URI="https://github.com/sightmachine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shell test"
-
-DEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RDEPEND="
-	>=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	shell? ( dev-python/ipython[${PYTHON_USEDEP}] )"
-
-# 1. FeatureDetector being called with the wrong number of arguments
-# 2. Remove test that according to docs shouldn't be an issue
-PATCHES=(
-	"${FILESDIR}"/new-support-for-opencv-2.4.3-added.patch
-	"${FILESDIR}"/remove-failing-test.patch
-)
-
-src_test() {
-	cd "${S}/SimpleCV/tests"
-	nosetests tests.py || die "tests failed"
-}
-
-src_install() {
-	distutils-r1_src_install
-	if ! use shell; then
-		rm -rf "${D}"/usr/bin
-	fi
-}
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index e3e1f4ca38ba..1840b75cfc66 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,4 +1,8 @@
 DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5
+DIST snakeoil-0.8.1.tar.gz 296997 BLAKE2B 0eef059c73f6f62ddf67ec3a76d48bc01383f5993236f43cbdef54f6c9e9f818b6065f266df2c8646963f74f8cf3b549ae8e3407cd3a38d38de95d7b84dcfb1b SHA512 70f379d06b000abd193db41fdd720161a22537320a538b6441a9cde86fe0755ec68ab393aa8442e035b134f88e20ddfd4e194961b53f7cfa7a857ec12bf7437c
+DIST snakeoil-0.8.2.tar.gz 297135 BLAKE2B fab94a4f085756228f4a74dc966ef34c94d0c33dba50e7d4d2f3a1417ca84e337a15688b171930af04a3ec3f55980025cc0c078a9b16670fb11d5f546077bca6 SHA512 401135f8b12321db5f65fb1431e8145ba1691ddc83ad106fef22beefeee5212e13fd1f9726b40267553dca46955ed1cd4dda0d3aa76cf25882bf0fc8017bba01
 EBUILD snakeoil-0.7.5.ebuild 961 BLAKE2B dfa8bdee5204a242d8445a7f73b11735c31334a368b4afb22ed04112ed5f6aad2aeef2cce592b3a18664308c9d2db05e6ead41ca9a780f8af8dbaf0d2f794263 SHA512 29daf7bf4ff953e2e3f2533528de2daf343ce355338a209a37ff396cb80ff375ca2428eb8a2e093cbe582bdd6b2f7f05c9b31a7d9b348326a99e0602073c478f
-EBUILD snakeoil-9999.ebuild 890 BLAKE2B 1578889268cc914672d064f43dd6a68ff3114f3b622d9af4dc22ace00d692e02577ad2a9c58e702171741f92e352f8854bd4f45713360c03a22bf354a30928d0 SHA512 9fc132ef92de1f43d4f46fa86046a3f1c7db096dea68fa43d417bfcb9cb4ae345383147681d1373b0f5325e78e86b8e6fb66a39f002dd57e639efbd4af7498a8
+EBUILD snakeoil-0.8.1.ebuild 886 BLAKE2B 746b7f5e4f734d116418de71d2817e6aaff486f500da34ac7b7c508ae2e9197e78d1a92e563ce6607e49b5fc4bab0ea7c75f1cb36716c34d5b813bdecf9a37f6 SHA512 97a0ce8b5e16666dab8e033ee70bffb013732373da2f86cebff7146fae52f121c5552699b0bfc522186803f7c9b943c7dbaefc6619b60c8b8de2af2dcda2af00
+EBUILD snakeoil-0.8.2.ebuild 886 BLAKE2B 746b7f5e4f734d116418de71d2817e6aaff486f500da34ac7b7c508ae2e9197e78d1a92e563ce6607e49b5fc4bab0ea7c75f1cb36716c34d5b813bdecf9a37f6 SHA512 97a0ce8b5e16666dab8e033ee70bffb013732373da2f86cebff7146fae52f121c5552699b0bfc522186803f7c9b943c7dbaefc6619b60c8b8de2af2dcda2af00
+EBUILD snakeoil-9999.ebuild 886 BLAKE2B 746b7f5e4f734d116418de71d2817e6aaff486f500da34ac7b7c508ae2e9197e78d1a92e563ce6607e49b5fc4bab0ea7c75f1cb36716c34d5b813bdecf9a37f6 SHA512 97a0ce8b5e16666dab8e033ee70bffb013732373da2f86cebff7146fae52f121c5552699b0bfc522186803f7c9b943c7dbaefc6619b60c8b8de2af2dcda2af00
 MISC metadata.xml 385 BLAKE2B 7e7195d4876c5cb5db98288566121559c8bd9208138fbd211edea15b324acb11d09a2bdd96c0200554d7e9c734202c7fd341f0d134f271c82dbfdfe75e5774f5 SHA512 32645380ddb0bd1edca1895714aeaef3e0c61c04cbacb50a414c2fd26b6978c8ea83b3c420538cadebf3a631b5aec2e9e3fc0dab98d1e1a99cfbad33b8d58715
diff --git a/dev-python/snakeoil/snakeoil-0.8.1.ebuild b/dev-python/snakeoil/snakeoil-0.8.1.ebuild
new file mode 100644
index 000000000000..e85e66b9b7a0
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.8.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=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+[[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/snakeoil/snakeoil-0.8.2.ebuild b/dev-python/snakeoil/snakeoil-0.8.2.ebuild
new file mode 100644
index 000000000000..e85e66b9b7a0
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.8.2.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=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+[[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index 901b625aba59..e85e66b9b7a0 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-	SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
 DESCRIPTION="misc common functionality and useful optimizations"
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/pkgcore/snakeoil"
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/sphinx-notfound-page/Manifest b/dev-python/sphinx-notfound-page/Manifest
index ad6603c0085d..8e15f4d1ad13 100644
--- a/dev-python/sphinx-notfound-page/Manifest
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-notfound-page-0.4.tar.gz 5685 BLAKE2B 0bfc6cf98e0731a5cc95f1802dad1e7297ed764a626831b970d75d82ec0f7d6edb45c404851ea13bf38decc39aabf0e3dd6b136714a591e8ab595f11e23e67cd SHA512 56e867e6954f26da498b77e8fa43e8d62961ab33ee9c16d2084745dd54a998df51c7d882a47560196135d2fb4d473f7305ef19b31373bc205f8eaf0d3d4946f0
-EBUILD sphinx-notfound-page-0.4.ebuild 524 BLAKE2B a6755c61f8205c4edcd6b32d370c5b54eff5410f73e3ad79aba114249ccd276278d99d639b3c8f68dbbcf7745ef2c65dc10ff26127e02f68e06078088d3effbf SHA512 4382fe457097e1e153bd23d0ea3da3dd71627359b7f0cefa8b99ba6115e61ef729948d5041f1f780cd2b6519f28a53f74e6c81b83a6b7e94931c624be1f654f0
+EBUILD sphinx-notfound-page-0.4.ebuild 522 BLAKE2B 62600caad2a3876f5bccd9ac5f48e8a54bc631707905f628ebe3f7d2b86aa7973cf673f306faf3005e664d7f61404bf6598be497d88be15f3b2f1036a77f540e SHA512 ea94649ef28752c30a96c3442e2d7b8e645af58255ebde1a1656a65b202e39a26f80bf54cb6836466254f5c28bf29c894a38cb8b163b886b2711ffd3b0a002a6
 MISC metadata.xml 440 BLAKE2B 0a08957b47eac83866fdbfd2fc137fa09413c2f6e4cbe961a0c587cb1604951d76061d41acae0a925a9f1775c785e8dc0808255685c14d88b5543e729052aeca SHA512 84b278d6a84dccb896c1e5c10ff1018ec801ea1a36083896f08629db28e82f8b20be2cad95a13b2ad53ba3751c9f6ba0c8a6367ad9baeb2881d22211793c2671
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
index 8c43245b0561..d3d0c1a98b8e 100644
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/swagger-spec-validator/Manifest b/dev-python/swagger-spec-validator/Manifest
index ac87318bce68..7e04f1f39647 100644
--- a/dev-python/swagger-spec-validator/Manifest
+++ b/dev-python/swagger-spec-validator/Manifest
@@ -1,3 +1,3 @@
 DIST swagger-spec-validator-2.4.3.tar.gz 19636 BLAKE2B 3805aa8663d141898e5106ad98d9aa0c697e87a474c0446151b0a6210684c8a0afbfa7a54b44e9aa7c4257c5e9f8713139943774bcacb38105b21c4cfe46492f SHA512 d785f1d9f2664fcf4f62e2e2c2adf9e17d7844e6febda69bcb718efa5f951ddc0496c7e2804e4269750a15f5b5c7f6cc11fac0f99363f7eadab8cf1209d152db
-EBUILD swagger-spec-validator-2.4.3.ebuild 594 BLAKE2B 77682ec5f93d052369b181531e462196f446ad935095f188293e5f19d7a7151b43818b1ba6c1bb47c1e8ef3aa6c22e5d73703ea321dcd47ea6d685b6b35a6182 SHA512 4cec0d281a484a85a80d3a6d783dd2fb366562178fee3d45f5e48e949aedf5cb1848bb155560290a2e7e27dac40669f3a2ac59b9075ed1bb9cfdf5b8b6b97a4d
+EBUILD swagger-spec-validator-2.4.3.ebuild 716 BLAKE2B aaa9c9bbd9b66f26fb58fc45854670cc25415f5000f02a5f7d1e0bc4c777009da558055ed4d6f18c062191bf6bc26ec408b694ffee70efcd19b62826e8a0190e SHA512 468a37b587ccf83066319d7e559c09b1eaa2e133eb24c16b0ed6bda027b8489975f174dad6d8b718b838efb9140e26179eff621bd8ff8e5f29d6aec6331deb42
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild b/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild
index 1901a52e0a88..fd1346c2068f 100644
--- a/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild
+++ b/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="validate Swagger specs  against Swagger 1.1 or 2.0 specification"
@@ -13,9 +13,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
+# PyPI tarball lacks unit tests
+RESTRICT="test"
 
 RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	py.test -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index c7c619295536..23d8303cbed4 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,4 +1,6 @@
 AUX uranium-3.3.0-fix-install-paths.patch 1716 BLAKE2B 13ea6150f1cfb1a07ac1886be8281110bbca5abd39b78807fe67317052579efa0498bc8a321d09fc953c9358dfb963ed210451549d14d6f58ac4a94cc3e9a5d1 SHA512 a7007c74a2e46e281dc0db6fcc45475e36f3a261445c2162fe0a548e577cd7cc344957e3284c52fffdd21cf223e91ab5b4fc1936b6893de614c4143cd1b40419
 DIST uranium-3.6.0.tar.gz 668552 BLAKE2B 84ab1eed5474bf14aec5b7782b332e9846d14f589c0dfa7366c74ad682fdc0a8e5ef94a0b9576f0e80cf792b49132d3abb3f17341a2e8570d08bf898231deca6 SHA512 41779e9cf76dff8f74252f668d1cf909c93f4f1416f75d2ed263f89fcfccfbcebce5580d8202d8d1697491139db448bbfa76e2dbc761dd24cb98030b3241e80d
+DIST uranium-4.2.0.tar.gz 711868 BLAKE2B 8098372704db0494519ab0a24046b72f2527695716286463e7ecffb776db351bfb4ffcd7b53276d59403b39e40ef605fb016e9ec57e18cd06e8f22f22d8ef732 SHA512 fab04efbb6337e366501ffc0336f208ddc0f9e568a2822363b84b6512268f2560a22bc71e745d30e66026d7a0bf9e150eda605ef8b511b59264407cab491eee1
 EBUILD uranium-3.6.0-r1.ebuild 1416 BLAKE2B 3ea73653aa36adc305b81759ded97af57a2a5bd901a73815a8d0372ebc8fd5d1565626016f5b4a9d7556817e376ff696cfc84049201a570cf58b6dffe383bf6b SHA512 2716709771e66c3d2de8912c5fe4c5ad8f5bcc453575a1045c9e44225e5cb52fdb06240457ef8bf1c193f5b141f76c8ed912393e7fbfb555c5a48c64f0970979
+EBUILD uranium-4.2.0.ebuild 1599 BLAKE2B 48553f297c6c730ff39c886c6912d8bacb068965f3ee55901cb1c0599d6db90da352b5a7f1150ab4b36f5e5c8239a419d13616ee82c1d9e27f6b45e7b39724f3 SHA512 e84ede7ae2a0b11f8c97925ea73e4fce30d4d0225320054dac6bce84c6e69740957b6a1945e8f9fd113b01b55717d3e35d768b525a354bf86c96cc7ab3c5a1bf
 MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
diff --git a/dev-python/uranium/uranium-4.2.0.ebuild b/dev-python/uranium/uranium-4.2.0.ebuild
new file mode 100644
index 000000000000..4818481b4a53
--- /dev/null
+++ b/dev-python/uranium/uranium-4.2.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit cmake-utils python-single-r1
+
+MY_PN="Uranium"
+
+DESCRIPTION="A Python framework for building 3D printing related applications"
+HOMEPAGE="https://github.com/Ultimaker/Uranium"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	sci-libs/Shapely[${PYTHON_USEDEP}]
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+	cmake-utils_src_configure
+
+	if ! use debug; then
+		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/ConsoleLogger/ConsoleLogger.py || die
+		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/FileLogger/FileLogger.py || die
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile doc
+		DOCS+=( html )
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${D}/usr/$(get_libdir)"
+}
diff --git a/dev-python/vcstools/Manifest b/dev-python/vcstools/Manifest
index edee2931b8c5..bd81c1ae543b 100644
--- a/dev-python/vcstools/Manifest
+++ b/dev-python/vcstools/Manifest
@@ -1,8 +1,6 @@
-DIST vcstools-0.1.38.tar.gz 54671 BLAKE2B b19730749878de8fb55706751b8a276e351d944803aecb45d8f07497ed9d4283939594d751e818c7fcc09a7cefc4238df978470e8f9da10f27bed5abfe76ce5c SHA512 a3693d34777235e562a5db006af8f33590df99ffce96f5d3cfd2d816ebdc23ee5fb3536bf289b64a36588e60ce20ce8396a448394f300a12672fd8bf5800973e
-DIST vcstools-0.1.39.tar.gz 51610 BLAKE2B 24997cf3981a70f9647c16a230ff776b32aaf7096d760976b6af7b1fa1fe78b4993299680d8aad53d82465e66c4fcd80389e26b8da1476df64ccaf9b40c705af SHA512 163ced29baa158d915169a4f8f432bd9ad60ddcd5abae0d3801b5d970049d717c11bd8aa95f7af9dfe48cdcbcce49d14331a82a9c41b9ded1ce4caa2e27cd901
 DIST vcstools-0.1.40.tar.gz 62109 BLAKE2B a5347ba62031e602421f26b081e26e55549e92fc4a0648b58a3c4c3b0134b91dba096604f83edcc51a99c989e60fa51e8af2f9ecbf992500a6e942c19da9c82c SHA512 7cd062f3c72b27f78361d3000ed8951b1723ea7dd99bf05ea711e8a8b93c42c2acebdfd6c7cf7384730c708da11bd0d2712a54e538dd833eafbcef46f23857cd
-EBUILD vcstools-0.1.38.ebuild 1392 BLAKE2B a866b12ba8609729d0050aa5f454451d9e02a6df11c7c33f248504e2a6bdef5127f641cf70ae63c6b417a0cf268c731c32e876152b9fe9ca4fcd6015d2aaeb28 SHA512 ee1f8b1e76ad91b98921e831c515c4d247b41b7c17a7d97402ba00b568a1feae45e4ebced1138c90c3045a08a777cc5a41d1e5bc13975681ae379598fda6af7c
-EBUILD vcstools-0.1.39.ebuild 1392 BLAKE2B a866b12ba8609729d0050aa5f454451d9e02a6df11c7c33f248504e2a6bdef5127f641cf70ae63c6b417a0cf268c731c32e876152b9fe9ca4fcd6015d2aaeb28 SHA512 ee1f8b1e76ad91b98921e831c515c4d247b41b7c17a7d97402ba00b568a1feae45e4ebced1138c90c3045a08a777cc5a41d1e5bc13975681ae379598fda6af7c
+DIST vcstools-0.1.42.tar.gz 65979 BLAKE2B 2deb29116e891bc93410e4a8f58938009140d01baaa834cccfdba2be3243d98bb11507fd134284bc1dbeca1434ea0eeaf2ed332dcb579bbacf1bc92815f8623d SHA512 1b54270c878684862eb607c2e445fe24d8edfdd8ea2cc75e899044d9e8e89a882fd2dd6fb7825553f83003ae7af08850c18fdeaabaa107a6bfdb2759b32e8fa6
 EBUILD vcstools-0.1.40.ebuild 1396 BLAKE2B 2911206f1e7d91b3551728434b783492ffe0a649ae002de716c025888e2f83145a0126c7163b785c76de6a20122fc7b957ddf05e9d093116b506147af1001f6a SHA512 3261819d9202c5dc324433434535163ee8ecd95607230198693f0dc6b79269e92e4d58a19c1c0af1dcc30fbcc97845f47fc6e8edb8bf9f5ff602655d992aaf09
+EBUILD vcstools-0.1.42.ebuild 1396 BLAKE2B 2911206f1e7d91b3551728434b783492ffe0a649ae002de716c025888e2f83145a0126c7163b785c76de6a20122fc7b957ddf05e9d093116b506147af1001f6a SHA512 3261819d9202c5dc324433434535163ee8ecd95607230198693f0dc6b79269e92e4d58a19c1c0af1dcc30fbcc97845f47fc6e8edb8bf9f5ff602655d992aaf09
 EBUILD vcstools-9999.ebuild 1396 BLAKE2B 2911206f1e7d91b3551728434b783492ffe0a649ae002de716c025888e2f83145a0126c7163b785c76de6a20122fc7b957ddf05e9d093116b506147af1001f6a SHA512 3261819d9202c5dc324433434535163ee8ecd95607230198693f0dc6b79269e92e4d58a19c1c0af1dcc30fbcc97845f47fc6e8edb8bf9f5ff602655d992aaf09
 MISC metadata.xml 331 BLAKE2B 11f0b79892ca57b4abcbd3e0538168569338972295dc250516dabf12f650416d013be219d17401ae24129ba40bea056e4831940982ae6b0368046e1efbb76974 SHA512 dbc3f8205ab4e4788a33377fd00d438a9bcc4558ff02989f20befb19de690428d377ca8e0450a47bfdc8654f74123e0e4b02a9a26ffe4f27e1a737266f5cf918
diff --git a/dev-python/vcstools/vcstools-0.1.38.ebuild b/dev-python/vcstools/vcstools-0.1.38.ebuild
deleted file mode 100644
index 8c3759ac4bd9..000000000000
--- a/dev-python/vcstools/vcstools-0.1.38.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/vcstools"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Python library for interacting with various VCS systems"
-HOMEPAGE="http://wiki.ros.org/vcstools"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/bzr
-		dev-vcs/mercurial
-		dev-vcs/subversion
-	)
-"
-
-python_test() {
-	# From travis.yml
-	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
-	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
-	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
-	#git config --global user.email "you@example.com"
-	#git config --global user.name "Your Name"
-
-	nosetests --with-coverage --cover-package vcstools || die
-}
diff --git a/dev-python/vcstools/vcstools-0.1.39.ebuild b/dev-python/vcstools/vcstools-0.1.39.ebuild
deleted file mode 100644
index 8c3759ac4bd9..000000000000
--- a/dev-python/vcstools/vcstools-0.1.39.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/vcstools"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Python library for interacting with various VCS systems"
-HOMEPAGE="http://wiki.ros.org/vcstools"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/bzr
-		dev-vcs/mercurial
-		dev-vcs/subversion
-	)
-"
-
-python_test() {
-	# From travis.yml
-	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
-	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
-	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
-	#git config --global user.email "you@example.com"
-	#git config --global user.name "Your Name"
-
-	nosetests --with-coverage --cover-package vcstools || die
-}
diff --git a/dev-python/vcstools/vcstools-0.1.42.ebuild b/dev-python/vcstools/vcstools-0.1.42.ebuild
new file mode 100644
index 000000000000..388682fd4ace
--- /dev/null
+++ b/dev-python/vcstools/vcstools-0.1.42.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vcstools/vcstools"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Python library for interacting with various VCS systems"
+HOMEPAGE="http://wiki.ros.org/vcstools"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/bzr
+		dev-vcs/mercurial
+		dev-vcs/subversion
+	)
+"
+
+python_test() {
+	# From travis.yml
+	# Set git config to silence some stuff in the tests
+	git config --global user.email "foo@example.com"
+	git config --global user.name "Foo Bar"
+	# Set the hg user
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	# Set the bzr user
+	bzr whoami "Your Name <name@example.com>"
+	#git config --global user.email "you@example.com"
+	#git config --global user.name "Your Name"
+
+	nosetests --with-coverage --cover-package vcstools || die
+}
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 99f52b47fc7e..75d29b0c52bb 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -2,6 +2,6 @@ AUX weasyprint-43-skip-failing-test.patch 517 BLAKE2B 27f574095d9dde6ac9cb99f64e
 AUX weasyprint-43-skip-useless-deps.patch 559 BLAKE2B c11b646137f26ad9a3398678534c2f8999ccdbd1baaecaf72eecdbcbf9870f168a51ee91482a3ca8aa8e0372e11c350204c14556e58b60839df571216a103492 SHA512 0d0be1d5234549d98a6c6ae43255a1dfd2ac543d72f85b9e54da4e864e961859100201de447bf88b428a66bc4a3762f4f1cc2e09465051058fd4563e3093a4f1
 DIST WeasyPrint-0.41.tar.gz 393866 BLAKE2B 895624ee547a9ed91157db6a7a72890a56f270d2ea00a508c42899e42922e51867782b1dff3ab55f98df0a130b727a7db13aaf3553a90c4405b75b6813c95ab9 SHA512 44b2d9e0a186c5767cd01d6e66495241d088908467e0fa28cee114a9c480bfcb4ef393236e9304653603f3917c73c452c05a38286932e0a271946860120d9a1f
 DIST WeasyPrint-43.tar.gz 315365 BLAKE2B af643f6a6d09d09d89802dd3823e43e9f05873738b14e4f853a324850ffc12902cb791c3f187f6b550dded40669d376cf3d2e4d7d83e9747e87795a4d57e9014 SHA512 fc4c4decb298d4f9caf244433566c9b675b23db2508093d8c43c6e361119c5fe8298213075f550bebc72fe4156cfc516f04c8d7a2c6215fcd5add14360821f40
-EBUILD weasyprint-0.41.ebuild 1321 BLAKE2B 8be7541521a71e229595cf94eea255ba691c8541e31ac1232b53a5911079d9bf7c24e47dc40d7425af2bc3a67e6d2207cae87ee32197fe98ed2b614c27afb399 SHA512 b8932f4ce5abff9f76cecf3f497acbc41bd1ace4ab02227a84e28e9b96b23e85b9931f70fc1906148454f661f2e356648bbd258a9303b95f6cd84c72f9debbee
-EBUILD weasyprint-43.ebuild 1373 BLAKE2B ddfed77772d48dd33f2ded8dcafd6fb1577a64b6e0372efdcc0e7ed6ce0fa6bb7c0c964ed3cff55d945ab0bbe7890c256992bdb6eb650119901a3cfe75561fee SHA512 87724c9fde4719c42a174cbd7523556004e9b1dfdec3576b3ea14d534f78fe9c16ca6d9f5e126598c8957117507e79e2ac772cee66928ffd9319dc2c98c3cf36
+EBUILD weasyprint-0.41.ebuild 1306 BLAKE2B 6848cf170040682d258c1e199497fe03bad436614013616d0d370c47b823075bc5e42364f9c6c3f4977f070f3591fa3afcc4965ae4028f6eb77962096d2a1d8c SHA512 36265b73c2fc71f777a0cbf8a94470ede320cc55b5f25ddd286dd0c6e62e5eeb692dc273da852f0e5f01e984c2d4b78233b270d5d6ab474fc49118c9ab149096
+EBUILD weasyprint-43.ebuild 1358 BLAKE2B 3a28aeda84988ed3b2fdc218a952e1310eb8fc8e44288f023043aee428009d3d0407761aeb2db38824bf51c7e2b3ac98dfca1f1f2964fc4ec04c97e042dc81f6 SHA512 7c0de4bdcf9714fed198c9df32d8ebed85f7ce1c9a1887d71f5f8bc5f50c936a90b0386bb8e22ffeb4ed996858bb553b40caeae9bb503af7a613dc863aa0c608
 MISC metadata.xml 381 BLAKE2B 422f89ba40bf25e47d53fa91f51ed8b12c5f37a7befd16a2cc2d78335b0dc472180c5e46c6bf890e7a30fc7936e672737e931867097e21a781819fd7ee644e94 SHA512 92ccf545a50a97d2f2cf6f85a6986525ea787d6534682b5fbdd1f0395ed7e938c4e341f5897a663b185d2b2755d4123132b8ec36866b44f2615f08d607a14398
diff --git a/dev-python/weasyprint/weasyprint-0.41.ebuild b/dev-python/weasyprint/weasyprint-0.41.ebuild
index 8efcd57fba04..388d65177310 100644
--- a/dev-python/weasyprint/weasyprint-0.41.ebuild
+++ b/dev-python/weasyprint/weasyprint-0.41.ebuild
@@ -18,12 +18,12 @@ HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="jpeg jpeg2k test tiff"
+IUSE="jpeg test tiff"
 
 # Note: specific subslot of pango since it inlines some of pango headers.
 RDEPEND="
 	x11-libs/cairo
-	x11-libs/gdk-pixbuf[jpeg?,jpeg2k?,tiff?]
+	x11-libs/gdk-pixbuf[jpeg?,tiff?]
 	x11-libs/pango:0/0
 	>=dev-python/cairocffi-0.5[${PYTHON_USEDEP}]
 	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
diff --git a/dev-python/weasyprint/weasyprint-43.ebuild b/dev-python/weasyprint/weasyprint-43.ebuild
index 5a36ffb74e9c..3863bc1fcd01 100644
--- a/dev-python/weasyprint/weasyprint-43.ebuild
+++ b/dev-python/weasyprint/weasyprint-43.ebuild
@@ -16,12 +16,12 @@ HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="jpeg jpeg2k test tiff"
+IUSE="jpeg test tiff"
 
 # Note: specific subslot of pango since it inlines some of pango headers.
 RDEPEND="
 	>=x11-libs/cairo-1.15.4
-	x11-libs/gdk-pixbuf[jpeg?,jpeg2k?,tiff?]
+	x11-libs/gdk-pixbuf[jpeg?,tiff?]
 	x11-libs/pango:0/0
 	>=dev-python/cairocffi-0.9[${PYTHON_USEDEP}]
 	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index e6e1598977ae..1d4812c28b24 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,7 +1,9 @@
 DIST Werkzeug-0.12.2.tar.gz 1169770 BLAKE2B 12e7e422e7dae0ab2fc3cc52f80536362dea8edd61cdaec45a6cca35b789d731408e10cc46288b0c5c22138e20e9d52a88c2db78d22a215d5ab4bb9477526fcc SHA512 9ff45aeb51a71fd5115e8cdee40a7b2fddfa0574c356686050cb1bdced5c6c18f672b601ca2637010c7f59be75c66ee558efb4ea05052c550ec7da3644b88e0a
 DIST Werkzeug-0.14.1.tar.gz 1185546 BLAKE2B 4c358688752adce870e8b44ffede56e44ab26990f12c98cc75a7c7e0d40b1f39f4208237ed26a2acb1f78a3359272cb44bab4606c5bca55a5c5f5edfa22c9faa SHA512 64976cc46c1cee2203112c50aba6f9404d4e48d4a90f8b11837148b5415a28572b7e706095586045a46879e853fc5a80c63e7bf0c13eda29d564a37b4a554c0b
 DIST Werkzeug-0.15.4.tar.gz 925334 BLAKE2B ffb132026e5a43bdbbb6decf19c47b07bb38afe383fc6b769a793f9e72769bdb5a9507918590d485b9a84e8db392202fe985b0cd1fa00e8af17eccbf53bcdaec SHA512 b27b313cb29128ad1a1d0b04be7d1b29eacd4fb8280757510ce662b4f8743e7311966f7fb170531bd5dcb9668e9c6672f0cc0cf53bb4af3ec7328312a88b53ab
+DIST Werkzeug-0.15.5.tar.gz 926570 BLAKE2B 39d68f7ea2f99ffa60f5a2af7ebf8a01e68a83e32106abd8fcbba3a5402bf6c6c02f7bb9b84cd483aa061bb065a0f2f6d809db55a2f6950996d70cf62a620520 SHA512 e2980b649db0c246fa87b94972f1a1e00b19f20a90e34733267cb50b0d1c8e83701f4bde3e466f9f12243c47b3cc40c6977e63164f18ee5e518b75e952988edd
 EBUILD werkzeug-0.12.2.ebuild 918 BLAKE2B a943b20ad7b1d50a9473044cb5362fc8e77a3341836cc522d3c5f00d86846ad24b18a50afef0569e6c999499811cdd6d1c39143ec082b479cd9e5f1a7e068834 SHA512 7f98e54b94baae4abb16cd44b5cfd2c73f8fea7c7dd31634a203bafb84a499c585a3d445b8f5608d8235b6c615ca1210009349fac75e88e708477e1008031e38
 EBUILD werkzeug-0.14.1.ebuild 961 BLAKE2B 24fbb29fb1cf746e9a8f84e4b869e6744e5efb9cfa57fa6aa39a1c5185a22975a7dda892dc7a24822da4c1c3ad670493c882a36f9ae4698a80ea596136c85876 SHA512 ea1c981310d4069fb3e7c380fc823d8dbeda5b78c41cbdbaed3a24bbc8642783a3683e2828c01660db121e8eb10b4b86a161560e21347900227c568d3d530a35
 EBUILD werkzeug-0.15.4.ebuild 1019 BLAKE2B a6f38cbd9d6c38a1230d83d49ff061e22e7bd755372b993ff69686a467f3421de649a0c8fe08b73359975b4fcf68226379df92b6c79d5902ca942060832c4810 SHA512 6d6792784168648a9f44083a19dd95cfbc817c7a2df03a45b75be7d716ca393bef74d02f5519df888776203de7400a2626ecd62f74925be06ba0af4062d3d4b6
+EBUILD werkzeug-0.15.5.ebuild 1019 BLAKE2B a6f38cbd9d6c38a1230d83d49ff061e22e7bd755372b993ff69686a467f3421de649a0c8fe08b73359975b4fcf68226379df92b6c79d5902ca942060832c4810 SHA512 6d6792784168648a9f44083a19dd95cfbc817c7a2df03a45b75be7d716ca393bef74d02f5519df888776203de7400a2626ecd62f74925be06ba0af4062d3d4b6
 MISC metadata.xml 450 BLAKE2B 553ae7b037307259ba7c22b90f001cc7fcdd1c2a2437ad4a038eceec9e9787b3c2287b0f4ba40c9cc435ccc80dc60a96ceadd2ca3e892ae5e5083e4dd037525c SHA512 5bdd21ede3cc864b573ccd668ec99585baa7bf922f80137fd7880f73285510d0bd357707d44f9609b13f01245d011ff209e6c8d837c0f247fce08887bffc3cef
diff --git a/dev-python/werkzeug/werkzeug-0.15.5.ebuild b/dev-python/werkzeug/werkzeug-0.15.5.ebuild
new file mode 100644
index 000000000000..0b9d42512120
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-0.15.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Werkzeug"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pytest -vv tests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 1dcc0d64dcf3..4096a4cc7bb6 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,11 +1,5 @@
-DIST yarl-0.9.8.tar.gz 125806 BLAKE2B 983ccd2516ad00e89b75cb94a2237ea85325947d8fdfd7978b08addba08566b205b5c2a2863fb9943343857b976981b0b5735fe35b2c88f77d6178faa0d814d5 SHA512 67446ca618a2539f8c1fc8a7a96d1ce50a924ece0479e01103347f73a7bd75b0fbdd0ff5c007529195c3f12aa62d185563e761557fcb95b3226eaece65c0be9f
 DIST yarl-1.1.1.tar.gz 156284 BLAKE2B d070b0ea5cb06ef78f850a130d3292e66f592fd46ccf671cfe51f93c0e419a599f42f6a7255e3eb0f15ba96b1ac0cdcd0bce4deff81da6e5dcc25f7a8136bd78 SHA512 fe53e24401e91994d04fd7274200f92168bb08d78c460b49e800646a3e4611f6baefca4ede5b2b6727f2e6e4cd51296ca834305c0e2fb377ac3a928463f995cd
-DIST yarl-1.2.4.tar.gz 159570 BLAKE2B 2214917d01ba8f7ba4ea66e28711bcf2549fb1016be9da49147788d61a51168bc81b209ee1466482c93a8fddb4bec87c9ee072b703a1b0094553ecfcc525c0a9 SHA512 370fafa7ca507589660cb9f025bfa154c7b351fa6f7f7cfbedf8b20b64a175bba78e7673b122443132b10e6214e503668efd98c79dd79ee45364b1f779ecd8f1
-DIST yarl-1.2.6.tar.gz 159816 BLAKE2B f8f8525aaf3471baffc1c9640a2b95f7d1a0b8607ccbae41ccfea5296a1a40968020282ca40d06e38ff04e448b43af1d7ead8703d618c6fdd520ed6581fd7077 SHA512 44384a11944808583139bf87846cd0080545efddb04be750d923e1b7dc8a4f88c3801b9e6fe742136298c79e60ac94e2584e3b39e42f002af4d6bd970896d3f2
 DIST yarl-1.3.0.tar.gz 159748 BLAKE2B cd7844545f3ee749d1dce865e21065c2b8e0c1ebf4715a3f8ec01064e534fa5b8b872539aece8a7e3a7ae147942ff5e0dc1878d84449d8248fd8e33c4234e3f1 SHA512 58e539900e7754b0a3d41960ebe20d21fd7245ce71fccb31d6a1204298dd71cacd742b2cb2b4c49c3a9b28ce5c664c412334f29e23a3c608aad8018142ba3e14
-EBUILD yarl-0.9.8-r1.ebuild 575 BLAKE2B b3de33eca0253af917c22c7d153a857d6f0fa5837deeee658beeb7288b5b05e5b06d29bb88c146de611df3d7661ab60e63901994675f07ee7c20ae35959ace7e SHA512 e36b67454bcad531320ac6f84a822336d8fcbcd7a900b0e2ecaa8fe0debe2fb8d163a56ec21341030c65e0394f4b7ecd7f0587d2b696f5d558c1bef36903f7fe
 EBUILD yarl-1.1.1.ebuild 657 BLAKE2B f7abb81199d7e405cc6e5f4c19ca7cfbf7404e15d05847af28fd18999af46bbf137ba9b231decc8412f5c7325009d87e65bd5ec96d7377f38b798efa11351f7f SHA512 0a1fc1cde43da587a4dde229fa21b821c2366b66cd5da25b930807a8d72ea2fac4ee165ab768fdb4f31b74757125d843045693efd1bd7147ee2701a9b8f082d1
-EBUILD yarl-1.2.4.ebuild 659 BLAKE2B 5963ec86867e21a71048047e1a9c4ed3b3c3bf69fdad2be38df553d9fa4cead4efedbcae1636a117374c8724f6d1e67f10ed010194e7dc874967c6276f5a411c SHA512 a7252fbbd5db26efcb89ee149143a21d045e28c7f910b2859a414dd0e3125b8dc95bd1bffc2b6e85388e0412919ee1dd67714e4f00242f89ccb3b1b8930f33e8
-EBUILD yarl-1.2.6.ebuild 659 BLAKE2B 5963ec86867e21a71048047e1a9c4ed3b3c3bf69fdad2be38df553d9fa4cead4efedbcae1636a117374c8724f6d1e67f10ed010194e7dc874967c6276f5a411c SHA512 a7252fbbd5db26efcb89ee149143a21d045e28c7f910b2859a414dd0e3125b8dc95bd1bffc2b6e85388e0412919ee1dd67714e4f00242f89ccb3b1b8930f33e8
 EBUILD yarl-1.3.0.ebuild 806 BLAKE2B 99db9e22a2f6f9868641ee1a9862c38fdf76f1941d3bd18b0d342b4779ab8e36bbd164c7f7bcb5b2cbe13420bcdb9cb4cf94c10fb58c0e998d627402908d8937 SHA512 e4280ae0c5559cc5589f747d936802b442ee3ce01f47897bfc1059b99c5df792002acae9ccc77d5749271dfce605f62623939f3161d3b1b020a4c7115afb38c9
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-0.9.8-r1.ebuild b/dev-python/yarl/yarl-0.9.8-r1.ebuild
deleted file mode 100644
index 1b6af5976db9..000000000000
--- a/dev-python/yarl/yarl-0.9.8-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/multidict[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-runner[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/yarl/yarl-1.2.4.ebuild b/dev-python/yarl/yarl-1.2.4.ebuild
deleted file mode 100644
index e713f0324344..000000000000
--- a/dev-python/yarl/yarl-1.2.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/yarl/yarl-1.2.6.ebuild b/dev-python/yarl/yarl-1.2.6.ebuild
deleted file mode 100644
index e713f0324344..000000000000
--- a/dev-python/yarl/yarl-1.2.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/yenc/Manifest b/dev-python/yenc/Manifest
deleted file mode 100644
index 3737f1bdf06c..000000000000
--- a/dev-python/yenc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX yenc-remove-cflags.patch 489 BLAKE2B dd747efc818c43267a5b518ed237aedbe75f82f629dc67e7db496a19e9821e166b187c98a08f383350c34dfbcb7126113c43fff64130cce808c19d2551b9b8e2 SHA512 ab8d6522fd7355a1d9680126faec3a8588e1766c9ab4d46eced70f0f6db7482b1994e05d61d7246b4cc08dfa64a0aa88e85edda8a00efb0f3d95e92edbde37cc
-DIST yenc-0.4.0.tar.gz 63156 BLAKE2B 1f33aa66cda2646ac8bfcfd94f9ab904defd3e712ac450a961cc73a56ca2c887eb834f20ade6b9a711110a4c58c42171f4891182175813f317239456eb1e29d1 SHA512 06adf10daa3eb56d1960e48c4a42c432821b8c25fcf6c703560efb9d902dc7619b79509a409f436790506f12f172fe0f0c6c1bf6bff7ab5ce3856b272c62c4d9
-EBUILD yenc-0.4.0-r1.ebuild 586 BLAKE2B e15c0f22cc8903cbecbdea62daf75930df1917b7b896b75bcca739a4a7063e28c440f07d738bd111fec9534435ba988f16d42be705e21d9bdd52066ddf44b703 SHA512 66156b7aac333c691f09583ba1d4df118ec6eaa717f3d6728dea293d992f866f6d9ce23f1059130f464109ad8a028736ad67dd6e773c94931498bf20239f4e69
-MISC metadata.xml 220 BLAKE2B 59eda2baee6ffd0773806bfb555f2784ba2f8954133a6339cb3d3d6fe1360178bd789d0875262ea7904a299cf0bf36e9795264f42d7319463488375ad9cbade3 SHA512 878b4526d51f7901900ec97fb85bb90e0d1099d29bc8e49dd7cea6258da0737e71aec3377f1bc2621cf96fcf7c5699e424bbc5fb721af2f365742725612fe50d
diff --git a/dev-python/yenc/files/yenc-remove-cflags.patch b/dev-python/yenc/files/yenc-remove-cflags.patch
deleted file mode 100644
index 27721c727db3..000000000000
--- a/dev-python/yenc/files/yenc-remove-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py	2011-09-06 09:04:33.000000000 +0200
-+++ setup.py.NEW	2012-07-07 15:33:13.295906002 +0200
-@@ -33,7 +33,7 @@
-         platforms        = ["Unix"],
- 	package_dir	 = { '': 'lib' },
- 	py_modules	 = ["yenc"],
--	ext_modules	 = [Extension("_yenc",["src/_yenc.c"],extra_compile_args=["-O2","-g"])],
-+	ext_modules	 = [Extension("_yenc",["src/_yenc.c"])],
-         classifiers      = [
-             "Programming Language :: Python",
-             "Programming Language :: Python :: 2.5",
diff --git a/dev-python/yenc/metadata.xml b/dev-python/yenc/metadata.xml
deleted file mode 100644
index 664b1a9c9e03..000000000000
--- a/dev-python/yenc/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>jsbronder@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/yenc/yenc-0.4.0-r1.ebuild b/dev-python/yenc/yenc-0.4.0-r1.ebuild
deleted file mode 100644
index bd25cb3982c7..000000000000
--- a/dev-python/yenc/yenc-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module providing raw yEnc encoding/decoding"
-HOMEPAGE="http://www.golug.it/yenc.html"
-SRC_URI="http://www.golug.it/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Remove forced CFLAG on setup.py
-PATCHES=( "${FILESDIR}"/${PN}-remove-cflags.patch )
-DOCS=( README TODO CHANGES doc/${PN}-draft.1.3.txt )
-
-python_test() {
-	"${PYTHON}" test/test.py || die "Test failed."
-}
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index b50759cdc25b..8d6c51964c90 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,5 +1,5 @@
-DIST zipp-0.5.1.tar.gz 10763 BLAKE2B 4f70d6ed94203d4b9fb9127930a07797c3cbfa023e0cd472e9d3a18e1877619dbefee654cd0364592a594b6e9e0aabc813e0560695bb18f8e3a64cb4ce76f0e2 SHA512 d4486ae98159677cd481cddb3bd00d5d2237dc94f0f3129b03994800b0e136c12b05e02d2ca7d628043dabce323f34dd919b9ba731549656802527abdcfea120
 DIST zipp-0.5.2.tar.gz 10875 BLAKE2B 97e56b8e1cbff2344ee6b385085e6c821d61bd2c2510ac54e50a3f706515f1e22789168c97599787787b47f09dabe55abb594f5724d1d540f62d8d68fc32e36f SHA512 8c84b620844315ab1f1aa3c5bb29dcdf1271a0139198b5c3d6aa31ecb9a86f0dcef963819403d971ae0461c737312c064572c57ecf32d73dc973a5f69cf0375c
-EBUILD zipp-0.5.1.ebuild 1045 BLAKE2B ba2452da28b41fdc3d8ed0db560f149fe77a4839a556fb8114d13490e51ac6a087665f427029585bb7877003d1fdcd53d9997a5250000f840f06643437cb2621 SHA512 ebdcdfeffddb439985b144ae72c3738d08503e400526cd7f3ce1ee4ee9ad29429904df5d5df3d42807b67c28f51eebe6e66cc2232ca90854fb35f97a3b802016
+DIST zipp-0.6.0.tar.gz 10778 BLAKE2B 165ae85f51fe0c0232f6cf2dde70e2d7f8064413c15616d15e1ebd65cfe3c345bbd5b1b9713fa1171cad18015b605862509790bedd734edf5a7d8c80c5378af3 SHA512 18bef5aa3388ab3901bf08888127fc9cc17d8972a52f23ccf9a8035f09ee5598e17ddff833a10b81b2118461e0c517e88413518736763425a728cd0b19cc2052
 EBUILD zipp-0.5.2.ebuild 1107 BLAKE2B c79bf6753de8cfbfaf3ff0e54ced1763d5594915211d2cedb95f3d25c605399ba65f1ce25ea0b9d2816dd71e0ba31d802f978dc3ce12da67c4cb93df91b3db7a SHA512 addadf9afc87bdd8c52c0407e42a4821628170cb1b7b06284ad72f0cf53735f1e48e3460bd2d88550aa241a41735ce75cd4f42eceda0364b8c6cc0a8f1d2b2be
+EBUILD zipp-0.6.0.ebuild 1174 BLAKE2B 1f4c65171e70f0f563177cf3ff3e18be0c2ba0a358bfc4893c48509522ed9ab10996334cf7bfb9cd0484cf9fb702ac788aee150648d79639e8223bb4cc0e0592 SHA512 f5bb949a6868e70885d88ef7592c24fa04ac20de019d1dbba5c1e85f31940c7d2625d706e75d80aa8b503405f5c4db4f433cef5654f9a256609ddb0dd8482e5f
 MISC metadata.xml 523 BLAKE2B b2c729977d84466557f0fae273e5463a41fded78780842e4a92899cc79ad8cf2843fe9c397a70f1d7cab8a7ca317a6723b119047323e0be8862b7294afe96b33 SHA512 82b88eb00bb385c47ebf5c5cd560de25e4f865086983fd9a5767b7fb286406dd06273e8a596df31aba57baaf051b7c353f50f445753541de5b15e6a439132381
diff --git a/dev-python/zipp/zipp-0.5.1.ebuild b/dev-python/zipp/zipp-0.5.1.ebuild
deleted file mode 100644
index 2d0e62d3d6e3..000000000000
--- a/dev-python/zipp/zipp-0.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/contextlib2[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	pytest -vv || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/zipp/zipp-0.6.0.ebuild b/dev-python/zipp/zipp-0.6.0.ebuild
new file mode 100644
index 000000000000..46f6ff270793
--- /dev/null
+++ b/dev-python/zipp/zipp-0.6.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=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="https://github.com/jaraco/zipp"
+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"
+IUSE="doc test"
+
+RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	pytest -vv || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 2f5cd5701e08..7ec0db96a322 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index bc1487b7cfb8..e9ae48df891b 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -6,5 +6,60 @@ DIST 5.12.3-0-201904161302qtscript-documentation.7z 723395 BLAKE2B 19fa5dae06f95
 DIST 5.12.3-0-201904161302qtscripttools-documentation.7z 90350 BLAKE2B 1c66f210f85449e5c69638d989905057c7fd0893746921891b262ea7c8439b25fd77c76413c7e5dbf4283a3779c12cc5bc08c03268aef0b0b228f908b9fe261b SHA512 e3a00e9046225599d1a46247815355f55bbc5b5124a90d6040ac94b13e7ecfed2808948182e48a0c3854bbaf05951fa6c6e1a50f397bd58f3e779d1090ca42d3
 DIST 5.12.3-0-201904161302qtvirtualkeyboard-documentation.7z 2090456 BLAKE2B 441efc066138c3a74ea51d23f277b7190a38111494d05446d32150b6e36868c110893e14c16d65394709e3dc24574ebecfbe877bce64c6cd44564799b783e30a SHA512 6707760c1139ee66bc294f8407ec43057aac02593aef939c9e03138cd3874f02d5523f31470ac0ca90e320187feb55a8f23dad8396a4d62026af651e23e7379b
 DIST 5.12.3-0-201904161302qtwebengine-documentation.7z 3831360 BLAKE2B bf7277a93a56f6282c078665c7254266452d09f6495fd9dd8f22946d9fe55f774bdf012df15d43e258cdd0a38a49ba2dd3b350b150b2b480f5dda2ccf3f54eb0 SHA512 9102aa1392a6f87bf8be8e4ac212fca002c9a20cfdddfff0e7df7653781696cfd8d44edf52147b2e389796e05e7576c97bcb9f961c60979f8cd57fff974a965a
+DIST 5.12.4-0-201906140200qdoc-documentation.7z 547017 BLAKE2B ce523a09bfbf44afbbb94e01340c91638be0ff9e14f9c8a31aedda479af066ed176e1e312d4701722f6a52293af7d1ea757928cfdababf32deffc0c10c9bb80c SHA512 931440d7efa1b5538d58e03bc311f296ede96d79a6ca345d76be02cccee2459cc040d760a59452f8ac70c1585ef6919e08715f4c4d6b665a43b4d85a1c55b389
+DIST 5.12.4-0-201906140200qmake-documentation.7z 335940 BLAKE2B 5b26601e6f72b089cf5aec21449c8830ad86494528eac09c25776a24f810766a3da3e38b6ae7808a516f127d01844b60fee107d818a75ee07ac19df8599d3a4f SHA512 8ff9a8f8899e4c873e565ab755206772754e22b210127af765c2c30e77ba8977dbbd0c9d99fe4e8e178b21e7b5028b163b8e95202096ba3e323c5b8bbf4a91c3
+DIST 5.12.4-0-201906140200qt3d-documentation.7z 39586521 BLAKE2B 47eaabfdb8ccda408b576e561347d7b347db96ddd5beadd61fbcf87f3bb4d06f541901f4c37a8d5a5df55bffe8ee8da03ffc7cc601daa333c6317def2286e250 SHA512 18a2967f110fd67a5e93592d6957465a38283728f115ef455e1b390c46b840ba023be16f2e56bcb7292a66c3cd071d0d6f8e39c6f38d36c1f6b2cdd3c0dad828
+DIST 5.12.4-0-201906140200qtassistant-documentation.7z 1101798 BLAKE2B f3142970e6c9e1a9293ff64217d9a40a85a5e985070fbbe5764706500e388026048f4336e8dd2fa56235a9fa7b8653d6fdcf41926ea4ff55a28a48309cf610bf SHA512 29875f65e400eac39bd7831823a8ad86310e63eaf7f044d7886a036497ff94082fe46070404ffc662121591566ee93cc3fb25c7982793d97827f4cd8ff1a753f
+DIST 5.12.4-0-201906140200qtbluetooth-documentation.7z 2793274 BLAKE2B a8e3472a4fe8b1582b339e860fb6e5d0c6304614d441ce2de95668172f82da12cee58f55f6ce0f2ca516112b78c9b9578715b619d65a5412d1a782d67524e45b SHA512 0374ac103369f2532fe8248a1592e9ca038f4944a2d16a5d9b1c9845e86094f40f8d560bfc02c307bca09985dbafebb4217c4f77911a19d1f01fe31f587e253e
+DIST 5.12.4-0-201906140200qtcharts-documentation.7z 9255546 BLAKE2B 48d315a1400c98b13a38b0ee4f8b0c79cf8dbff76057b393acc73c7f193c85c71ff2555f558ffd2ee9ec76fcab8cef43b642c25fbecce0b4f9624b41a41755a1 SHA512 112d47d00b50216ca0e75cd3bc66e82a54cf6ab52b5a3312c58200cc54f8c21ebd518a431bc7db48979a9fc70f8820d22c0160edd2dac480426558a4e1842df4
+DIST 5.12.4-0-201906140200qtconcurrent-documentation.7z 159480 BLAKE2B 9095b8d22fd2c26992e4786e67f4450647f97c275d53e4c3dc46933cbd44886ef4d60bf5b5e56f0cd2ffacf8406ff9a6c7b954779c248cf234f35597627db542 SHA512 5aa10494d1d01fe7fb3c87c3f923741d23a03151464192943580b312cfbc42905a3c3a1d76fcb54543e3f19a5fd8ad8c685b1391f74b3bb2a94d7988300b0509
+DIST 5.12.4-0-201906140200qtcore-documentation.7z 6708808 BLAKE2B da7f2458c8e3ca9e3e7d4b55e6843b9bdbd50fd00d2d7733ca5724b0bd6925823c18435cfc05c312314ec6a5890727b483ae5a88cfc9aa5c56bfcf4d26be2da8 SHA512 4a1b04c8fbe50f7f3dd314dcb96105368017d9d809ccec68f6131bda5ca0b5567b8cec879c8006076f716f5e2e106f6f653bd34e7cf3aa46bb97bfa9d096ba4d
+DIST 5.12.4-0-201906140200qtdatavisualization-documentation.7z 8390654 BLAKE2B ccf71584e39296fba57334f69cb10069d232db28dcacceab72516245264f1fd57247f72c97f4485701e922ba8abed50fc2375096e9a5c10380cebdb7608c9882 SHA512 9c55876345975b0c5678ca42fb38ed1154f765296cfeefcef021b2b36ad7bbba3c4295586e8622cb63423eb7eb96dd3963c2798b112510c23a31a54b02a6c1a3
+DIST 5.12.4-0-201906140200qtdbus-documentation.7z 479677 BLAKE2B d8d73877874170e6e3e0ffe19124c3c8bf8f45799aecf3d71ae2ec1e7916bd090792907669999c295124650f71a05e68ff33e69020ced1f5215a6f56b25912d4 SHA512 7bb493a56064c22b9133d243c511b83370b9a59535d4425878a52969ea4bcc8bcabcb7c310823ce31de06218b6419df5af7da6ffa18bb67f88cd50ca0d0edc76
+DIST 5.12.4-0-201906140200qtdesigner-documentation.7z 4338291 BLAKE2B 787953894e0f01de11ecf65b1e491d5082439f7bc4d4b63f6f36c11dafe4ba833aadc9d795343e759f0f8f7695880a868c8008c703936bcedd1b55c7ec119254 SHA512 2210e7abc6ce5170f0bc41c3e6bc648fd6bfe4b6bdd3c0d233b6c9cbe909737b86a0ec3217a9ac8fa84bb774ea59eeb4ae8dcf33475a67474c8374d96b1e7e51
+DIST 5.12.4-0-201906140200qtdoc-documentation.7z 10115658 BLAKE2B 045195415aef085b1fc26dac924e979e0b4a5ef56f413ede5b80c6c08450fa182759c315e36368a5f58fc5cfffe307ba3a672b537acf14a6ed0ba6e68aa21051 SHA512 15b3e20fde3163f13efad2cf7d18195c8dfb5acdf5a2a53a8a1590486ae1d5c3a8009874128b1235f0e57b2d6dc07cbced4a688f5be48f14e454530f8021eebe
+DIST 5.12.4-0-201906140200qtgamepad-documentation.7z 784189 BLAKE2B 6d669c67f02ae18e41bdb57e53ca71ca28f56140228329322b266fdd86c80299fa88e126709a12b47a248d81cb6a98e5ba2143c194f7ef38abc195878258e9e6 SHA512 ca88402b040290bb0603a3f2969ef34f10b56ee4373c7a66a7971441901d1a380cd80e12f690d9557ad59e2b2719b000fcbe3bacb152c2ca9852582c3ba4b510
+DIST 5.12.4-0-201906140200qtgraphicaleffects-documentation.7z 15992690 BLAKE2B 11b398c962af72a6b0d29fd19e3a17830f577f988a8f73a2aaac34ebaf8e0ff768abe0cbe84c69ecd9e3f7c204eea85eb1f66aca07c2f4910bec4de75d62b065 SHA512 edb32bd58323a0a073837362ef1eb29b266077df85aca7f2fc2ad497b473e1e5ec993d1dba831ca0ea516104fd5fd6c11e38cf3619e528c96d7d317ec34e4865
+DIST 5.12.4-0-201906140200qtgui-documentation.7z 9032686 BLAKE2B a8fabb606aef389bb3da8ec3b163e7648ebe4f94ba5c9f98ca4f47e83c67098d28897563bf57058eda281f2a5b362972798fa0ce337c73c4721c6be4889f2c46 SHA512 1db1add888cd644482fe225199b4dcaa385213b292f185bb4a55ba8353366bf5e1b5f0964bdd0f7b7cbb5f537be3d8dad37d798c25707b82dc6be965a7222a96
+DIST 5.12.4-0-201906140200qthelp-documentation.7z 216698 BLAKE2B e1dd591e44b1f1ce59cfc1963c869cc2030764d346d9121e1bdc1c85622106212339cc60f8adf4b71891e0807508babc9871cf7fafa2cc4719edfb03f70bfe18 SHA512 067e619850dff0edacc2cbef74e34e95540985ef8216937799a71acd14238d0a42632fb54ee6dc1a995b6cb6a9162f3ef7703bd19197635d16110ba72afe80a5
+DIST 5.12.4-0-201906140200qtimageformats-documentation.7z 29235 BLAKE2B d9bd26434376f80bce22345e5fa683f16f1f9da95bbcd6e28373b9b146f913903ec91c20bcce6c77b0cae60da94ebcb53c8867c404ff6ea553f20ef2e9b546a7 SHA512 96d77eb994931a8eac5bbb0ec3b41e1661791f4e7eb9cc19c918adbc44e2d2a7ffdfc792908ac8b71ac533ede4494377d436edcee2d4c13e132d64c753af9d32
+DIST 5.12.4-0-201906140200qtlinguist-documentation.7z 998582 BLAKE2B 78250fb9fde324a5a6f185f140cf68cc480c14a8595926a005cff808de89a80a063bef340458224e98080b0036e605b19305e62c4e855014a2dcec223aed0a27 SHA512 fa252a59a0991268b6cf7e5e8d4737574d65809802ff835e44d643c9705dcef211f1c0a28331589cdc369cb1cef2dc70cbb7b8f77eb7866d1ca52a79f1b61295
+DIST 5.12.4-0-201906140200qtlocation-documentation.7z 3212202 BLAKE2B c69e81cd65b6d80acabdaa89fec4b83ded6e77f96d1c797e68b7b22c616c2a0cea173b27fb41e7d1cf9b0936e31dd8d1e65ead960ca3912060d2d1a579ad5a90 SHA512 b1dd5668b9349e87bacaa684481660433f5de68bc27e8e9d93a56b5ecde5d21571f0eab4d799f8b7e40c6914fc82bd290227bc09ba42dffc59c2ab3d67c30090
+DIST 5.12.4-0-201906140200qtmultimedia-documentation.7z 4272883 BLAKE2B 776884864dce297388a168760593e3e1c5293afad540a7cfb3ad5a8ba64ad3658afb1065143f6b49589eac4e2db940e1b1920215e3c77cfabe472c17546252cd SHA512 e7ec99cc30598d4fa8567c8a1603557626d7f60cb874ebd3172770bba2d189f657d001d870dcddeba9274a99fb4db719341bf25c970b0c0ecb6fd6cb05a45137
+DIST 5.12.4-0-201906140200qtnetwork-documentation.7z 1988517 BLAKE2B 36b9a84c3e63731caa1347806fed56a4acdf14b7debb1fe790234d8338d769b19dc7bb13d6a44607bc5f8627f270da989aff75d4439c729304c05175a0ee52f1 SHA512 1c58b0442e7541fdc9fd6ddbff21c754fbf72f8fbebb114557f3d7de5d0c6b61e9c98393d789aff9257c2952d8ade11671a6d8294acb2416e966b9d0ad93626d
+DIST 5.12.4-0-201906140200qtnetworkauth-documentation.7z 300101 BLAKE2B 0e92e16e9d44277f0d384d8d10d4308668f0347049dff74358636d323028b92bef7c651fb973642167b5aece8e1d683c39be7be893acdecb1cc6f281e3fe7330 SHA512 ca772ea3e6cafe53ba022ffbc9ff1a0e13ad8c52812523aad5b80be838d8a73a6a473e7503b919cc9cca85a25ded685300f4161a1112b24d59530202b8f524c3
+DIST 5.12.4-0-201906140200qtopengl-documentation.7z 1034185 BLAKE2B 23c1ef83bdf2d4274279dbd1d1ae14cd9dfb4df110249dadb2feb51aa46a1f51404cc03dbb0c5c999be0c822e17aa40925a0d8bbf17074231a7395801f85caa6 SHA512 4e52ccc9b8dee64be882a605ecb61ad77ce3338769d04b0939bbbaf080f2e92958644c1e334c088ac75541e84c634564f22a24bfab9ac0fdf35a011931019857
+DIST 5.12.4-0-201906140200qtplatformheaders-documentation.7z 78010 BLAKE2B a0692263b849200f1c92b9d7e0644827df98d7e2c55a4ed4dbcb3ca964449a260c49aaf9f3e535449979d7e23c40024feb93a1edb1693e5fb6e8b6448a53c59b SHA512 26719aa3dd3c67d13a4c7f7074e9919a7e4cbb9f698e4f4c10e4b4d543808cf7d8613a41203379fe43ddbb6aac2362fe06f3f726cde08bd3ecdbd444afdc97fd
+DIST 5.12.4-0-201906140200qtpositioning-documentation.7z 2366865 BLAKE2B 4b048305e438da79330593e5f725b56bec352f81f6e361d46021015eaab812b6fd9cb62fae0275d83dc15c4183089720c8a6dd594480126de16ec5e3e66fa712 SHA512 97136fc5588160f05a3200bbf7e5862455197b3dcd279ac0b6e8255344a4f8be95fad80050c334c88f901255b1dfd828d6c4617e6cad7d53d6c191054c0d1642
+DIST 5.12.4-0-201906140200qtprintsupport-documentation.7z 390130 BLAKE2B 4b37dea1f7288369846e246f20bd4c9cdbe72a520ebf3fe69868a93b19d9726acd948dcca113668aca5c739c8043e301d5d659a4242e6860c4f8e57e4225bc7a SHA512 b8d80894d2e790937d5b403f4b1d342461cb417ce6494548fd587a1910db03c1e34b45480e377b1b317ecc813323128c3f9a23caea474764bf14e496fdf99056
+DIST 5.12.4-0-201906140200qtqml-documentation.7z 2110776 BLAKE2B 67d5e467b9b7fa5c4a8f05b32463fbe3eb34bb79c982871632bebe4b8723769c32f6c4189054c5c5e5c3d02a76fd46e23c5ca7bd7f9ff28810f5984e07c2e042 SHA512 bdb6940105aabcd3eb7cf036abf7f68dd1b73cc2d06e59f394c00868cb9034ccfb8775d16993a81bfc94e784db4886e60458f41de43ff739656f8446de85074f
+DIST 5.12.4-0-201906140200qtqmltest-documentation.7z 30411 BLAKE2B 5f5d49556acbcc93351f6982faedea7fc8cc0412b4561b3c0ec677a0fb3abc56ae83407c7e03281c2b2132378bbe9683b0156a17658ec901cb1d6945262bc8f5 SHA512 227b1b492c8fb3a13fb4142774c6232f2b573c339371f35700e6ebf54da8885659a16e5a5fe354a956d20023c484e41f1017b303b117b0fcb169e69394c30f68
+DIST 5.12.4-0-201906140200qtquick-documentation.7z 21057807 BLAKE2B 2e51230e369b34792ea2c1bfccac71c1983b9940db1602cb5008bf4b6692cfd2297cd86329b8085ee4cc782ecce0e6e1eaee19c4aec185db2326a3de3323a2b7 SHA512 42f994a678d50294676f673c9dd920b9cfd6a6c5e43e7b0d14f86a119ce59dbc1739481bcc39e273e4eed8b1be9ba93d1f8a9e1bae2b514759ca407d04e67cbc
+DIST 5.12.4-0-201906140200qtquickcontrols-documentation.7z 14919105 BLAKE2B eaae742a31d612b9d26cf95ce17aab0941e612cd046a2f2f3c9271a6e03538fb0850bd6cb5aa496507cce55968812bdf5d263e1e3d65c2dea4b8b57423731ec1 SHA512 253e6f79e7ab94ba09e2a1ff36f6c2d742838f9a16286db7c010ab6bf5827a3ab9e9c945928bd5677fdd191f4094ad57d5fd7f717b89bf215b5c780d29c486fb
+DIST 5.12.4-0-201906140200qtquickcontrols1-documentation.7z 2230127 BLAKE2B c755b08c1c601baece00ec247b62ea16cccf73062227e87f0f819cbf793e0e0cd5835431c18134a5631761842506be8e5b80fb433bf28ad1d8d4f224477aea91 SHA512 ae24133fa5e6d50bc565a235371baaea25a080964cb2f75ac75bdcb52cd698ddefa615cf303d1ff414e6c570628b886f0c150e69032198d0c57ea5b06d5be9c7
+DIST 5.12.4-0-201906140200qtquickdialogs-documentation.7z 219721 BLAKE2B 7a78b7a4a67507136055374a7c37d12b2c1a253c34137ed94d51f803af493e9cc86a226106fa9e88d8227594f96d3b246b99a2b8f69e158e9d85b8a70c37fcce SHA512 fa710433b9d94632d73c92939621e66ce2930a9b5114fc7fc55f27c4a14da9147f5e515d21c11c56b7d08e9680e1d5effe7cf2914c8f5f900a7afbef9433a5a1
+DIST 5.12.4-0-201906140200qtquickextras-documentation.7z 5719477 BLAKE2B deba1322e167e158f8d2b5ae9dda7db815c2742297dc1164317c62b66963a1ee00d7addab82c326e768a16790be02ecba6b6e0da1d9523c718ae9a1b75db397c SHA512 202cb8c354b907790e17ab557c4157a71dd8bae01d145504bc1a0f18648663e7b01fec915ce8da72154b87e4b263e652f07ea8e1121b9ecd39aafb307747c58b
+DIST 5.12.4-0-201906140200qtscript-documentation.7z 723590 BLAKE2B ce75743d29af93003a97e739ec830d9ad88457d65fa2c3565caf4fb85995b9929a8ff690c1ca96fcfc716ced9154d738a0fda3e850b2fe49357a18a588dd87d5 SHA512 febacfe841dcfb22cbb2b20c41b432e553f7dca88bc33b92c40ab3de2be87475e362a5ce029ff4b36ef2f6ccd3da3a45daf5f478db5105100d51855c057159a6
+DIST 5.12.4-0-201906140200qtscripttools-documentation.7z 90331 BLAKE2B d93039b8a7e7108aaf5e674ae19e4f3bfaecd3f4ac7cf931a3290ffc24968a42d2ced0a83030eeeabb3b380491762543b7bb59a7208ae0b31e409a5eebf065bb SHA512 f8a884099f26f8177b5dbc0c1dc06f320fccad3ef403c37526a5120d9c1568eea974912a0f94ce7340c29a246185b1d9406231ffa3ed5552a03283adb6943f70
+DIST 5.12.4-0-201906140200qtscxml-documentation.7z 817461 BLAKE2B d96126a5774477d8fcd9094fe681c2bc860f9d190761892b63eb70ca8fbcf12a831bfbd285bed294da0c687c652ece2cadfb12d5fdb6b56a5e3787213f750869 SHA512 dd2da573cd36960525ed67a6abe99f5b75efa4c674b12665a3d21aed2162b54832fb395a4806331e0ca597b6ff026ee7b31025edd98acd47f25391965d159fa8
+DIST 5.12.4-0-201906140200qtsensors-documentation.7z 3732163 BLAKE2B b302e90aa9be9c2c182e5c3ec7cec04f8ca044ac16730822c0d8adda7a880d6198af1d86a6a202ff4cecaaf4c466c627533914080a84daa57aa7a0beac5a2444 SHA512 f1c0fd6bf7221f7020e85c87fd5f63845c07d28c86412dea827bef4d78a479d154e441aa477962c1a9797894ef1218dc07b4b0a0568cc0762ca3f06aad6e4272
+DIST 5.12.4-0-201906140200qtserialbus-documentation.7z 609459 BLAKE2B e174daf8d87d57b6ff92934f1ba94433699adffc864448999ff05d9936cd9223a20effa60ea1719c657d25accc882e8b14d70cac4e1b8293b1d69e287d119a5c SHA512 9871902b3902a9bd3a06cc984088e4aeff4ebf96811019b80c87851da6636cda6f5b4b6bcceed968580979f6352f91045cb73b7ff5b2647705e35b5b43ef3474
+DIST 5.12.4-0-201906140200qtserialport-documentation.7z 507245 BLAKE2B a9df1c5fc8edb0bf31ee08698b34b401864853d5aa1e37ecbdffd770947c7ad1ae8e3594d84404d128886d319d2c267a062dd83e9e195b825eed4e5e8a3a252c SHA512 b0321bb43062326e0ae3c8f856874867dd985cfd648023dcca44e67351cfb8baf36fa51e362cbf9837247261a5ce8998302c440aefbc9463eaaa8e0f655392fe
+DIST 5.12.4-0-201906140200qtspeech-documentation.7z 157965 BLAKE2B ac962332138e7fa86e80bfa239dffa0e0767189a7ca4b7502a4d710d7aad2797d3bf87f28b6d0fdb5d5e19eecf24ed33c735c56d64f50802d705727d937dceed SHA512 d82541c572df9a5821406e8f4ef12c505f5f3da07fb98d9e54b0d32c3fff790725b91cb77de2096a7a6b06ed4bd27ced0a3e5c95e96b91a5014d4f0c6536febc
+DIST 5.12.4-0-201906140200qtsql-documentation.7z 1285172 BLAKE2B 0e97c0245a584f32156a678a9d681e1491a30e5c222cbe740d3c27dea0df2f464b0dd6173d853752155855e1769e7b46ab20eba390d77ba108dff4a69a06050c SHA512 d0fa7230d8b83637267b669124176aee33488da9b1f846e9ac249f00e7a8be84d47fc010cdb89ee0689077cc8a232cbfd8c07dbf84d579028f27a91f75454276
+DIST 5.12.4-0-201906140200qtsvg-documentation.7z 346046 BLAKE2B 06c355382fd96d69c52699a4e9b0a09c8f678f18ddc9d0d3bc1921f200d058f677532627ea27d74b6da43aa56d801a0688f61951d866a14edc79a51b392438a6 SHA512 56ba141eb48c80131f08d2dbba04fa858d71e13c5e80b8269c30007057f6ef2342037dd87583139214fbef4f2c2b4d0c37c335b6a0a607dc88a9fdf249c458ff
+DIST 5.12.4-0-201906140200qttestlib-documentation.7z 210495 BLAKE2B dc350ac9b06e9d05de5bf64100d0331797aa13e92bac13294981158200b0ba39348d171d9a50284820c6e5d99874eed64ed5e8e20c0fb25359669ca7b81c280c SHA512 d83f9bafcbee4cc5472ba7c3dcb3b99e064fe544dc87b66f209e7d27b7bb6b1cd9d426bc857a5944a4ff7a7e3638c10935f6c2a204eade44beba0286730a6eb3
+DIST 5.12.4-0-201906140200qtuitools-documentation.7z 188198 BLAKE2B dfe11b7fbd1c77d63e5a58c33d45ce647d815336bc2058476c657a9c0c53ebf2f297641bbbe87c07b561ba46b48721fcbe92e03f07971cb38d69584cf1f86aaa SHA512 12fb9d2537078f3fcd6255c5affa339fdf802f69b27076375592b183e871bc4f2342e58ec6739e9a796f80d6fe228d563b1f20b517426619cbf083e2a27df1d5
+DIST 5.12.4-0-201906140200qtvirtualkeyboard-documentation.7z 2090699 BLAKE2B 3a8eee02559dad0e3099ddaa1927245dc09320dbdbf5d9eb18713be5f8fd3e0209518038ddc558d6c4fb759cb75175527963eba59b1a77b574a2de66a66c8975 SHA512 9ccbe7d735157d933298fcdbfbacb64ed53959468322d2c4928f1b2cb0b8c5cbfaa94e48ef47ca6f45c0d60024e4dff94c6b32e438a1b0d6c5b3f49dd4c226e4
+DIST 5.12.4-0-201906140200qtwaylandcompositor-documentation.7z 762093 BLAKE2B 956aa752107a500619561b26eed2c24b9385068089e5b6e748a9da42c838f2d1ce9024530a942182277e5ff8fba58a7dbbb3cdfeeccf2a574dc88d94e7824b9c SHA512 57c16edebda27dd54233ee3ce30aa678303cfa0605acbbd401c497df0d60f9df9177907e39e1fa3817186f24262495471f0748b50f5aa353d0c7899f7803b573
+DIST 5.12.4-0-201906140200qtwebchannel-documentation.7z 217422 BLAKE2B dbc0111ab7ff779efb4341bcf79ccf1c1f13822e0979ba98365262a5ea0954fc784a3703ffbc7d93d5bc06449c8c1dd7b3ef43887cbcce3c53fe7b01839052c3 SHA512 dadcb1b1a13814384dfdf83e8f677ac9158a5ef3d61f5d986f6d2e0df45a673a9455d10a4422d4b3cc4acdd35c91d6903fdd4767beb4ac3fd31635885fec48fa
+DIST 5.12.4-0-201906140200qtwebengine-documentation.7z 3924175 BLAKE2B 18110b7b0126a46d7e343f3d01ee928bc181114d88a6bc53ece8035f4b8911bac537dbb8d25037042c338b53f2d040f86a53bb1dc03a7f064456171c1fd3e806 SHA512 898d9be1794c0d8cd07fde9195b54a2259e2f3ccd3d92ecda0e39a1b6afd82f51bc613ff5147f1c0a6b6873dcbe822fbda1325b89d5e99e3b121a6251fbc60d8
+DIST 5.12.4-0-201906140200qtwebsockets-documentation.7z 391563 BLAKE2B a9ea3a0b9efce8d9efba3b5c5428170790a66eeb0ed20f01334a20d847d856bc1bbde7c854aa91716b83ffa81d01fad054528f53f5891629314e3c03e84c13de SHA512 e8142c65716ec78af74428beae35c9cb20b8941769dbc06840dc1a09e6e29e305d6eb7f7be9c62a68d8aa7bfc619c6da2d84320f4bad7b8e69c99711176a0d23
+DIST 5.12.4-0-201906140200qtwebview-documentation.7z 142972 BLAKE2B 258469e38442ab513774add1de8a7b2e920f6ebb72f2d194fe0dfa2d21505d1180f20671b3627597f7c5ecbfb488f82c387bbb40491306a2e88626ed78f31f78 SHA512 d66f65d2e263eb98be8d2e2896356d674814eda04ce1c15f6c5ad6276662bd49d1efb04f98f9c34414c1d876e5a70ae14e0c3ab3c69814b045ae46ef3b89936b
+DIST 5.12.4-0-201906140200qtwidgets-documentation.7z 33151839 BLAKE2B 4897d74422c68482da615383a4d906a8d0c2c1175b52515b7fec77dc213c299b1e9c5f4e45f460de9e43fa832ce6629dd3dc61e87e499a68dc9e0d12fffb9c51 SHA512 f072a069825beaf46747c29833a53ff2802fd2da30c2a4ad64410251e0caa74cee49587f96bcd7a59001316cadd638942dd1b5e88d3ffa703e8f38008b3b7286
+DIST 5.12.4-0-201906140200qtx11extras-documentation.7z 37019 BLAKE2B 3c8163e4e7dbcdfe5e23c7c086ea47ec55e43ad6abd2d7220d33e6d05536ba6c889acc41c8acb6acef70ff90ea526b45bc12a043c916558e42c939d1397435dd SHA512 4601b86fd7eab0a73524a132cf885e6a27df616fb0d87ef37ac5e58858e2f6596f04ebb4ad08e213908d8e6e26a017ec7159560d53808dfecd3e2f2160baadec
+DIST 5.12.4-0-201906140200qtxml-documentation.7z 581086 BLAKE2B eb4bb19c19a434ce67370d50d41a74d215daee899484511b75f0020cc5983a50b787302494c3a7cf3bd4b1b8a4602b7497cfcd327f1fd5c6d9a26724e464a586 SHA512 2678d0a6a3cfb0292335940bb761c14ad64f3f244823f766f331bd7a0cec677a60e90827bebd347b9882b09ec816b6a9a25ac778a0cef51bf4d9b0e6b5d5aff8
+DIST 5.12.4-0-201906140200qtxmlpatterns-documentation.7z 1247517 BLAKE2B 1b18a079fbeb40155fd8d4b5d926ddf1dbbcc79dc36392b32a9127eb425796c559e293a0b4bf6773dea3e0866954e15b2fa9e70fdcb853422c3b58108060ca3e SHA512 00cc421a0737c91a7006adef1135c7d707d7cb720e5d1870035aa00411c1dea6d960a17898ff9c64414a4bd824d709fcaed3e9b49d6cfbf613ba8d8856f92625
 EBUILD qt-docs-5.12.3_p201904161302.ebuild 1920 BLAKE2B e3d18e77be8b64d63044951a1c16a47140184979255d21db82aeb617e6a333995606ac64cc9067148bb0f7a37871f5c2843b1958886020db41640ae20df2800c SHA512 613164184d59a19a83dd55195ded80be0d33cc265e3950064680107fd3214f9e185f5fee7626864c913188b1cd9cfb40bdbd35be46893753f3b5bfb130328069
-MISC metadata.xml 1716 BLAKE2B 1a50a8c7b4b2125df82206b03fad6e9721495a0748bbb98ccf059628b03c19dc2e180fe92dd2ce71195357dde2df8717726721afbc6c3cb53687384d13c931fa SHA512 6f7b54859302dd8f7364e7be60e7750286c0326d22debc6488029e4c144d8935dd1c6042d28d31c41cd67b3ab83cbfcd9cc3f9a1d5d0bed66d65a42de61bada5
+EBUILD qt-docs-5.12.4_p201906140200.ebuild 2623 BLAKE2B 19053b1dd801f0eafc0e732e2c63b751708d82c4c04690206f535e047207a9c08f2bf70d2c99bdd1b5567493db2e69c304a93c58b9f6123b88a84260d0904087 SHA512 9c74e7873479a39172ba1ff9789818730d5e57ea165c074674d6045fa311ef6a50ea9675888c0d136ccde5c58808ae4c0ac9bbd057ab2510c250fd343413cd3b
+MISC metadata.xml 3896 BLAKE2B 9ddb79d566a10dffbccfc8fca4f970c1a49b1d2c3f6885474d1919e1647a403877c565b186da92a5823ec49c0e4af92a4478643c608574f2e3b5675334bef2aa SHA512 6418b810cf78d5acee499340352b30589d483c8be74a9412cf9c7a43534b7c5d37fa9e2d5a49e2be079d40e0120e738fac21132ccc04f64aca12895bc3865c80
diff --git a/dev-qt/qt-docs/metadata.xml b/dev-qt/qt-docs/metadata.xml
index 37c1163e40ea..37201cd0276d 100644
--- a/dev-qt/qt-docs/metadata.xml
+++ b/dev-qt/qt-docs/metadata.xml
@@ -7,21 +7,46 @@
 	</maintainer>
 	<use>
 		<flag name="3d">Install documentation for <pkg>dev-qt/qt3d</pkg></flag>
+		<flag name="assistant">Install documentation for <pkg>dev-qt/assistant</pkg></flag>
 		<flag name="bluetooth">Install documentation for <pkg>dev-qt/qtbluetooth</pkg></flag>
 		<flag name="charts">Install documentation for <pkg>dev-qt/qtcharts</pkg></flag>
+		<flag name="concurrent">Install documentation for <pkg>dev-qt/qtconcurrent</pkg></flag>
+		<flag name="core">Install documentation for <pkg>dev-qt/qtcore</pkg></flag>
 		<flag name="datavis">Install documentation for <pkg>dev-qt/qtdatavis3d</pkg></flag>
-		<flag name="declarative">Install documentation for <pkg>dev-qt/qtdeclarative</pkg>,
-			<pkg>dev-qt/qtquickcontrols</pkg>, and <pkg>dev-qt/qtquickcontrols2</pkg></flag>
+		<flag name="declarative">Install documentation for <pkg>dev-qt/qtdeclarative</pkg></flag>
+		<flag name="designer">Install documentation for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="gamepad">Install documentation for dev-qt/qtgamepad (available in qt overlay only)</flag>
 		<flag name="graphicaleffects">Install documentation for <pkg>dev-qt/qtgraphicaleffects</pkg></flag>
+		<flag name="gui">Install documentation for <pkg>dev-qt/qtgui</pkg></flag>
+		<flag name="help">Install documentation for <pkg>dev-qt/qthelp</pkg></flag>
 		<flag name="html">Install documentation in HTML format</flag>
+		<flag name="imageformats">Install documentation for <pkg>dev-qt/qtimageformats</pkg></flag>
+		<flag name="linguist">Install documentation for <pkg>dev-qt/linguist</pkg></flag>
 		<flag name="location">Install documentation for <pkg>dev-qt/qtlocation</pkg></flag>
 		<flag name="multimedia">Install documentation for <pkg>dev-qt/qtmultimedia</pkg></flag>
+		<flag name="network">Install documentation for <pkg>dev-qt/qtnetwork</pkg></flag>
 		<flag name="networkauth">Install documentation for <pkg>dev-qt/qtnetworkauth</pkg></flag>
+		<flag name="positioning">Install documentation for <pkg>dev-qt/qtpositioning</pkg></flag>
+		<flag name="printsupport">Install documentation for <pkg>dev-qt/qtprintsupport</pkg></flag>
 		<flag name="qch">Install documentation in QCH format</flag>
+		<flag name="qdoc">Install documentation for <pkg>dev-qt/qdoc</pkg></flag>
+		<flag name="quickcontrols">Install documentation for <pkg>dev-qt/qtquickcontrols</pkg></flag>
+		<flag name="quickcontrols2">Install documentation for <pkg>dev-qt/qtquickcontrols2</pkg></flag>
 		<flag name="script">Install documentation for <pkg>dev-qt/qtscript</pkg></flag>
+		<flag name="scxml">Install documentation for <pkg>dev-qt/qtscxml</pkg></flag>
 		<flag name="sensors">Install documentation for <pkg>dev-qt/qtsensors</pkg></flag>
+		<flag name="serialbus">Install documentation for <pkg>dev-qt/qtserialbus</pkg></flag>
+		<flag name="serialport">Install documentation for <pkg>dev-qt/qtserialport</pkg></flag>
+		<flag name="speech">Install documentation for <pkg>dev-qt/qtspeech</pkg></flag>
+		<flag name="sql">Install documentation for <pkg>dev-qt/qtsql</pkg></flag>
 		<flag name="virtualkeyboard">Install documentation for <pkg>dev-qt/qtvirtualkeyboard</pkg></flag>
+		<flag name="webchannel">Install documentation for <pkg>dev-qt/qtwebchannel</pkg></flag>
 		<flag name="webengine">Install documentation for <pkg>dev-qt/qtwebengine</pkg></flag>
+		<flag name="websockets">Install documentation for <pkg>dev-qt/qtwebsockets</pkg></flag>
+		<flag name="webview">Install documentation for <pkg>dev-qt/qtwebview</pkg></flag>
+		<flag name="widgets">Install documentation for <pkg>dev-qt/qtwidgets</pkg></flag>
+		<flag name="x11extras">Install documentation for <pkg>dev-qt/qtx11extras</pkg></flag>
+		<flag name="xmlpatterns">Install documentation for <pkg>dev-qt/qtxmlpatterns</pkg></flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qt-docs/qt-docs-5.12.4_p201906140200.ebuild b/dev-qt/qt-docs/qt-docs-5.12.4_p201906140200.ebuild
new file mode 100644
index 000000000000..e2850d500dcf
--- /dev/null
+++ b/dev-qt/qt-docs/qt-docs-5.12.4_p201906140200.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PV_FULL=${PV/_p/-0-}
+PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*})
+BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
+
+declare -A QT5_DOCS=(
+	[3d]="qt3d"
+	[assistant]="qtassistant"
+	[bluetooth]="qtbluetooth"
+	[concurrent]="qtconcurrent"
+	[core]="qtcore qmake qtdoc"
+	[dbus]="qtdbus"
+	[declarative]="qtqml qtqmltest qtquick qtquickdialogs qtquickextras"
+	[designer]="qtdesigner qtuitools"
+	[gamepad]="qtgamepad"
+	[graphicaleffects]="qtgraphicaleffects"
+	[gui]="qtgui qtplatformheaders"
+	[help]="qthelp"
+	[imageformats]="qtimageformats"
+	[linguist]="qtlinguist"
+	[location]="qtlocation"
+	[multimedia]="qtmultimedia"
+	[network]="qtnetwork"
+	[opengl]="qtopengl"
+	[positioning]="qtpositioning"
+	[printsupport]="qtprintsupport"
+	[qdoc]="qdoc"
+	[quickcontrols2]="qtquickcontrols"
+	[quickcontrols]="qtquickcontrols1"
+	[scxml]="qtscxml"
+	[sensors]="qtsensors"
+	[serialbus]="qtserialbus"
+	[serialport]="qtserialport"
+	[speech]="qtspeech"
+	[sql]="qtsql"
+	[svg]="qtsvg"
+	[test]="qttestlib"
+	[wayland]="qtwaylandcompositor"
+	[webchannel]="qtwebchannel"
+	[websockets]="qtwebsockets"
+	[webview]="qtwebview"
+	[widgets]="qtwidgets"
+	[x11extras]="qtx11extras"
+	[xml]="qtxml"
+	[xmlpatterns]="qtxmlpatterns"
+)
+
+DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
+HOMEPAGE="https://doc.qt.io/"
+
+LICENSE="FDL-1.3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="charts datavis +html networkauth +qch script virtualkeyboard webengine"
+REQUIRED_USE="|| ( html qch )"
+
+SRC_URI="
+	charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
+	datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
+	networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
+	script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
+		${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
+	virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
+	webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
+"
+
+for DOCUSE in ${!QT5_DOCS[@]}; do
+	IUSE+=" +${DOCUSE}"
+	for DOCTAR in ${QT5_DOCS[${DOCUSE}]}; do
+		SRC_URI+=" ${DOCUSE}? ( ${BASE_URI}/${PV_FULL}${DOCTAR}-documentation.7z )"
+	done
+done
+unset DOCTAR DOCUSE
+
+BDEPEND="app-arch/p7zip"
+
+S=${WORKDIR}/Docs/Qt-${PV%_p*}
+
+src_install() {
+	# must be the same as QT5_DOCDIR
+	insinto /usr/share/qt5-doc
+	use html && doins -r */
+	use qch && doins *.qch
+}
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index ba35b83384d7..49dfd429fbda 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,5 +1,5 @@
 DIST qtimageformats-everywhere-src-5.12.3.tar.xz 1793076 BLAKE2B 59dced7576a50441c704c8debf4a86bb4db7cfb752922020d2932ee2295805b27ece866f3f86e3f89b308e28cfb720fb9c6fa782f29f45e1c3b14fd733096c87 SHA512 59cc9df597e6ac31b10ff7440b0793af13ee84a1b363db631a7aeea7413e650a99a42e8c3f4633926ec93d4ac4c2532674ea27df325ba98132bea83c81d6e6cc
 DIST qtimageformats-everywhere-src-5.12.4.tar.xz 1793912 BLAKE2B b74d328bc8ae7a56294734d8f52f2d7a845f9026d246672927298971a01d0f5942b5ff84121a19acbd7359f8768d3248895a16290da7b26eca5a66b8201dc824 SHA512 e9adab3b7e1f5a0679e1924eb08718f2c6c53073f83018c9243886f7e1b084940bb9a642f46d76fae21552c4a76c655482536ae873cd4cfead4876a3561ebe8f
-EBUILD qtimageformats-5.12.3.ebuild 610 BLAKE2B 1ba8a71e4df388692b8e0c7b69631f15a72d36620918f2fe04996e886d9d8fbc5b0eacb1c45058be712b9fb2288fbfce3d443e564682853ec3f3a67eeb4d3ab8 SHA512 a5a4c60a3489c05e0c3762761f82b802094ba1fe1a984cd0135e345ce9db751e48f4abd9a3620f0d71eec5110581336e767f8dbac1382c522e95b3ddd2438696
-EBUILD qtimageformats-5.12.4.ebuild 614 BLAKE2B a7632b701e54d0822b223a7d70a88a06cd9ddd1cce38584c1c2a0da8eb38fafad7572807e88333454cfae99d2738dfdb889e2c29a27b54a519388ca7028ecae9 SHA512 1dd4bce8f3350e2f98964304871206dbaf4183d752c3eb573eaa820e0dd03f04dfde61f5c705be6ae8c4fc1ebc61cc121a65dee53b5165a716f40c19eaaaeb64
+EBUILD qtimageformats-5.12.3.ebuild 535 BLAKE2B 6127b3746d0b8dfa12f3fd7fd5fb5fc65984a539b9110449462829131cd5f63f3d2428c7d754126564b0a92743a895cfc9aecff39cb741adf7e46ef9781ce689 SHA512 2f3807091be97592ff6a3228389fbe9877d9791a76990d1ed637af1f0caf62ed2b12a4c71cfb277b90f25ae4193573d9a51994fd61b5dcb9a1249a93243865c6
+EBUILD qtimageformats-5.12.4-r1.ebuild 674 BLAKE2B 5771237aefd18c9302d6c89494ae211a28c389f06b6b2c22796395350b9cbe8de3fab260a4db4c55b1918e855a4afb1a647d5da4c2c9aaecf54733a9ca8dd4d3 SHA512 f0dbc5327a9df26d90d7151a974ae18e3d709964fad26bf73576d9e0779575633b30081332a9b55bace930f5c68ea217237c9ca7aebf7acf9d7f7d2efdc74d43
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
index 8178c9f3f4f2..a244180237eb 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
@@ -10,20 +10,18 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
-IUSE="jpeg2k mng"
+IUSE="mng"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtgui-${PV}
 	media-libs/libwebp:=
 	media-libs/tiff:0
-	jpeg2k? ( media-libs/jasper:= )
 	mng? ( media-libs/libmng:= )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	qt_use_compile_test jpeg2k jasper
 	qt_use_compile_test mng libmng
 	qt5-build_src_configure
 }
diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.4-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.4-r1.ebuild
new file mode 100644
index 000000000000..a7eace7d6d78
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-5.12.4-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Additional format plugins for the Qt image I/O system"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="mng"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	media-libs/libwebp:=
+	media-libs/tiff:0
+	mng? ( media-libs/libmng:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	sed -e 's/qtConfig(jasper)/false:/' \
+		-i src/plugins/imageformats/imageformats.pro || die
+	qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.4.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.4.ebuild
deleted file mode 100644
index 5327581bba2c..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.12.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="jpeg2k mng"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	media-libs/libwebp:=
-	media-libs/tiff:0
-	jpeg2k? ( media-libs/jasper:= )
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	qt_use_compile_test jpeg2k jasper
-	qt_use_compile_test mng libmng
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index f111b66b3991..7ca626e5c84e 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,5 +1,6 @@
+AUX qtserialbus-5.12.4-canbus-missing-header-w-linux-headers.patch 1081 BLAKE2B 7c4ee33df12a74e947cfe682724faa096524e83e3b1d050ddc7c03c27bf21c9a5a72a44b4590e96346f04335464658cd122918ec0410edce15df5933ad4ef36f SHA512 50c36d47b388391a4805d8e055ec4294903af3b833fba348f77bf99f62bec52d3123155af6c83af174e14cb476cccea81240703fd6cb1ab052f211a43ca31c1d
 DIST qtserialbus-everywhere-src-5.12.3.tar.xz 328664 BLAKE2B cea2ebacf8a2ffc6e2f1c1ab54327a50199407ded0338d6bbfd0a3d8672106253bcfc307fd38d2e81acecd87ae69f093f516a52e0e4a864130c8491f596cdba2 SHA512 5f9d477780bfcba1edb4a11592ea6f3a2a1b2e42fbbce898e167b1975b14e93b3840789230e320869cbdb16e33eb76b45310cd27089f2f854a20ac3b7e18d763
 DIST qtserialbus-everywhere-src-5.12.4.tar.xz 328808 BLAKE2B 4a3ada386c256c4bbc9d584a6232568adfc705d69d3a9ed505a006b2c494333a75e0ad08210ca45f131cee8060afa380317574fcbed1c052825d168a4e650ae7 SHA512 7d302552780a08444ea676abf9d0503a10b12e976d9ea1c95b8359d16b190f5d75e409cd3c82e4bf711b9906dd1b183169e5746bf6dce65868332bdbbaa33394
 EBUILD qtserialbus-5.12.3.ebuild 414 BLAKE2B 23c7ea63be8c4772057ce1dc65ffa7d8182e18aa7a3ff30714cb93ecda441628ea5e7875e941f7e87c907bcc1225334d2cf1ef47a2c4abf4ae8490717e80f3be SHA512 959c1ea2bcc708c31f05526afe89944c8c965df2a77a5e6ca79b464f11e9823efa7121cb8b43ae2e63c9a6fa068417e23cd71d0b5340cd689a7cd5990e140016
-EBUILD qtserialbus-5.12.4.ebuild 414 BLAKE2B ea1f322beb701cf9f49b3172c3e6e7ae5431db17b634554d85e82bb3ea3c39b5d0158d203e328694a98208237761894395344a9025bf36da9e40f4fb55f7bbe4 SHA512 6a11e2731daf1907b3c79502a8d578163fe44b0911bd3c419a5fe343c2c72008a361012dca0a934fb0803aa6a28a547e5b9f89b11d8900884879f8e2e3d11485
+EBUILD qtserialbus-5.12.4.ebuild 506 BLAKE2B 54eba7d020f01a30629dc607fa879a655c79386d58fca258995c5323afb8b5a4cf45c6352f42cf1e4ffed0b526d5c18ccc9ce0629c92879e4a9405de4929981b SHA512 8aa47356ecd7965fd5eb336bf7aee7903114e6cbed247d74aaee143f9e7e4bb96b5a1ae86968c77a96fc022f1a5497795d952fe5708ab9467defa80b266bd524
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialbus/files/qtserialbus-5.12.4-canbus-missing-header-w-linux-headers.patch b/dev-qt/qtserialbus/files/qtserialbus-5.12.4-canbus-missing-header-w-linux-headers.patch
new file mode 100644
index 000000000000..54c0b11087c3
--- /dev/null
+++ b/dev-qt/qtserialbus/files/qtserialbus-5.12.4-canbus-missing-header-w-linux-headers.patch
@@ -0,0 +1,31 @@
+From 43d746c2c0c87c8694e835f3b052317c8fa02482 Mon Sep 17 00:00:00 2001
+From: Andre Hartmann <aha_1980@gmx.de>
+Date: Mon, 8 Jul 2019 21:35:12 +0200
+Subject: [PATCH] =?utf8?q?SocketCAN:=20Fix=20compiler=20error=20"=E2=80=98?=
+ =?utf8?q?SIOCGSTAMP=E2=80=99=20was=20not=20declared"?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Fixes: QTBUG-76957
+Change-Id: I8c4c86aa23137d67f5d20eedfe1c46a241c0632b
+Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
+Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
+---
+ src/plugins/canbus/socketcan/socketcanbackend.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
+index 74b0d1d9..a2da146f 100644
+--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
++++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
+@@ -45,6 +45,7 @@
+ 
+ #include <linux/can/error.h>
+ #include <linux/can/raw.h>
++#include <linux/sockios.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <net/if.h>
+-- 
+2.16.3
diff --git a/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild b/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild
index 4a031a9a92a1..a1577e3db334 100644
--- a/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild
+++ b/dev-qt/qtserialbus/qtserialbus-5.12.4.ebuild
@@ -12,6 +12,10 @@ fi
 
 IUSE=""
 
+PATCHES+=(
+	"${FILESDIR}/${P}-canbus-missing-header-w-linux-headers.patch" # QTBUG-76957
+)
+
 DEPEND="
 	~dev-qt/qtcore-${PV}
 	~dev-qt/qtnetwork-${PV}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index cb6cf39bf31b..8c6be1d95d6d 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,8 +3,9 @@ AUX qtwebengine-5.12.0-nouveau-disable-gpu.patch 3740 BLAKE2B fc2745ba0e3ac264d2
 AUX qtwebengine-5.12.4-bump-V8-patchlevel.patch 1003 BLAKE2B 44dd0aaa31a51f62d164b436f1938dd49cc1e82628410b4091c9e58ecdb64be2e74fd6850fcaf9728e62c1a3b583080780d5301ef54ad4b5f839d8f9c77580a1 SHA512 e0a1154124135dbffe2f8872d797f602e0817a35bbaec60850fb4f5ab2aecd8a5f47e2df1bc34ce3057b0ba5131882ce6b3347f6f6ab74bd59cb3bcc4d334127
 AUX qtwebengine-5.12.4-fix-arm-32bit-segfaults.patch 1355 BLAKE2B 2778cba49d0d942ea09b65936a24de7b49392b9f477b018934984896dfe8f5d40beebc58648e6f0304bf43ba9762f125f2178b1351ef45abe502a24784930a5b SHA512 6eeade86772715f58771f7c6114b67d79b8696ddb84ce180ee5b4c5619488372eeab6d5b6b3104c79505a13c39143205dac9537ca7ef97ed7d91fa2d1a648ff0
 AUX qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch 1429 BLAKE2B 8156e6ea24b87994343be6b1a4488f4ebc1c336c4546c677f05c4cd93e908b1f066a84e0e735ecddf28596b9793138d1d2d5802ee022860e1e5f979783c87502 SHA512 cbec12f2e557a3fcf9c3f1fb93a44ea26a5a18dc5e919eafa62947acddbf1ebb0cef9a2c957ec1ac3ae47bb13abc60cccfbbe710af34f8a703ee5e035e0ba196
+AUX qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch 858 BLAKE2B 4e29db8a650c5babc64b6c17dd0669a4fbdf1a200e2a7dc7938acba665ceaa051eceb07e80159cf23ed7df455a520a5966a47a61b59fe5b449e37af7597a16ca SHA512 f6835ddf259455ed5383be5c16a9313e64121810398df74d8658ba2da5866cf6ffa079d57b2e055d79b9c7eef15e504c19c107f4b09764354de94fb6b5d0bebb
 DIST qtwebengine-everywhere-src-5.12.3.tar.xz 249275648 BLAKE2B 7d2404084a510c62b638dd09736130eeb40e494f9594339afc7df6628878aafed778a2785f6848702d51b3a4ef1dc8b333d5e5eeeeb8f930b4da839eb70bc175 SHA512 5b500ec6653aa6ed70e7826fe394f95c7932eaea5b1b48f6342a6f18294f75e4f954959fa2f42de0685097679389245d2bc80454e8eea202fa18a326d6d5a9a5
 DIST qtwebengine-everywhere-src-5.12.4.tar.xz 249328292 BLAKE2B e76d4f0c7081bd4ccbfb8a7eba6e0ef8280b4558bf545eb76bcf87ca03c79912e9e095f7bbdb30693f6ffc2dee61db7a4308cc072d92d78773082b3df238d0b2 SHA512 312c584222ed5e7183af2be8a4f42b84c7fed18c3d4b080bc32bed1bd5c7dc88c9752deaf7afc1b4d9fcd02c8c8a013d32d5be2e7635fec2c085cdbe81998de8
 EBUILD qtwebengine-5.12.3.ebuild 3542 BLAKE2B a230a593aa0a95c94696d4a6590b1794d5c4d9f44793738d88e430225e199e48fc86692866c521cec4e304544a5eac5730ca5dbd734358d690a908d9bfe4fcf4 SHA512 ce2e2d11960cdfc6ad1997c9e749e503f17d9b7b07b2b0c793664f17fa53b36c2ed23d416e939eeae39a3e4f834c58d24512d7936af8081b4d3e127127cc455d
-EBUILD qtwebengine-5.12.4.ebuild 3501 BLAKE2B b672a31f53905e515747f75979ee14216e931b99cb31572145b06c97b3a0aa518d92f0020dbb9a3dac29385a6082159201ef95bfb5dfe6ff0dc6770ab48da9c3 SHA512 8ac4d36fb405e3a2a9ac4e126f945f02989e223d5c86ce6e699031b515f4ec99e7046169e2dc28f11e1412a35c8fcea0c6ba0c7010f733fc2952601d33753edc
+EBUILD qtwebengine-5.12.4.ebuild 3603 BLAKE2B 1c974b639f15c66438e3733c922e6dfc397b7ec7f171a6e6cc5e5a3cb4d58666737c8d020c54069c864101e908db5a1b56f0dd3077b0a5d6f838442e24294219 SHA512 331b5ffcdb6317925f0f1d6a930efe655e7a19e01aa1a3570d913c53a523d2f2209b826835a6e459da2918a66430cd821a58d23e981319dabcf42ea77ec0e852
 MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch
new file mode 100644
index 000000000000..8acd0b0d06c4
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch
@@ -0,0 +1,26 @@
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Thu, 11 Jul 2019 09:35:13 +0200
+Subject: fix build after y2038 changes in glibc
+Patch-mainline: submitted on 2019/07/11
+References: QTBUG-76963
+
+SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that
+file wherever needed.
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
+@@ -67,6 +67,7 @@ typedef void* SockOptArg;
+ #endif  // WEBRTC_POSIX
+ 
+ #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
++#include <linux/sockios.h>
+ 
+ int64_t GetSocketRecvTimestamp(int socket) {
+   struct timeval tv_ioctl;
+-- 
+2.21.0
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
index 204d8659fa8c..2390a80c8e8d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
@@ -83,6 +83,8 @@ PATCHES+=(
 	"${FILESDIR}/${P}-fix-should_override_user_agent_in_new_tabs.patch"
 	"${FILESDIR}/${P}-bump-V8-patchlevel.patch" # QTBUG-72532
 	"${FILESDIR}/${P}-fix-arm-32bit-segfaults.patch" # QTBUG-75097
+	# QTBUG-76963, not yet upstream:
+	"${FILESDIR}/${P}-webrtc-missing-header-w-linux-headers-5.2.patch"
 )
 
 src_prepare() {
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 5065fb9df386..b98cadd84bd7 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/camera_calibration_parsers/Manifest b/dev-ros/camera_calibration_parsers/Manifest
index 718d2b68c998..b88dba8ad043 100644
--- a/dev-ros/camera_calibration_parsers/Manifest
+++ b/dev-ros/camera_calibration_parsers/Manifest
@@ -1,4 +1,4 @@
-AUX boostpython.patch 848 BLAKE2B f9ca2e26e51f882735544245b0964d08c272643d7c786308d2ad5d1598d383e728c03bf7b609ca22cc7f24d365c00b5f802db138459e1af8d4b597d963e92358 SHA512 8fbb168908d3c0cc5f0b8fbe8e9f82970254a136284062c4daf27d9553fa04385e1bcae9b1da2943b37bf1d047faa262eca08409d5d364260fd529b59e44325d
+AUX boostpython.patch 894 BLAKE2B b9dadc07ac55c68b15c2960ae545a0d7f2984da11d835f41707d6a1b54487650a4507c720e3c372eeb2aec9f8fc20edfb726a4df616349802aa484210ee8bf2e SHA512 222e4ae077e40af8cd2b913d71d43e06b5b798375ae0d8fd9cf6c9387d7ffb1acd2c44208713cdeb8ae24dce74eff426b4b9180d6e07a2041b5d0a6031ad756a
 DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa
 EBUILD camera_calibration_parsers-1.11.13-r1.ebuild 725 BLAKE2B 95216c8cbedd069150bbceb53a63a0279025540f7faa93c99b074594658aeb389b2f8e362588cdc516c9c36d456997acad77a97b0bfe3e9f8e2dff5454872df8 SHA512 6769971a6358c655f0e4aa332ded4efa362221b53d5bd82b9654c26ade8f7f7e74be0ed3abea0825a4380b2f88abeba4e062319feebf42217d12bbb60c1982ae
 EBUILD camera_calibration_parsers-9999.ebuild 725 BLAKE2B 95216c8cbedd069150bbceb53a63a0279025540f7faa93c99b074594658aeb389b2f8e362588cdc516c9c36d456997acad77a97b0bfe3e9f8e2dff5454872df8 SHA512 6769971a6358c655f0e4aa332ded4efa362221b53d5bd82b9654c26ade8f7f7e74be0ed3abea0825a4380b2f88abeba4e062319feebf42217d12bbb60c1982ae
diff --git a/dev-ros/camera_calibration_parsers/files/boostpython.patch b/dev-ros/camera_calibration_parsers/files/boostpython.patch
index 8e2b868ec452..02019d6458f7 100644
--- a/dev-ros/camera_calibration_parsers/files/boostpython.patch
+++ b/dev-ros/camera_calibration_parsers/files/boostpython.patch
@@ -14,7 +14,7 @@ Index: camera_calibration_parsers/CMakeLists.txt
 -else()
 -  find_package(Boost REQUIRED COMPONENTS filesystem python3)
 -endif()
-+find_package(Boost REQUIRED COMPONENTS filesystem python)
++find_package(Boost REQUIRED COMPONENTS filesystem python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
  include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
  
  catkin_python_setup()
diff --git a/dev-ros/cmake_modules/Manifest b/dev-ros/cmake_modules/Manifest
index f3fa34e7d8e0..4ddcce29bbea 100644
--- a/dev-ros/cmake_modules/Manifest
+++ b/dev-ros/cmake_modules/Manifest
@@ -1,6 +1,8 @@
 DIST cmake_modules-0.4.0.tar.gz 17379 BLAKE2B 36e152ae01a3b7a4d7b4e7db62b27cc13a8df21a32605da30111d6fcfdff6a9d98eafb740139aca297a7e9bde296b1e5b1bc401bf6c6cb602e01c7c96d024d7b SHA512 60bcc800541d6280e3a20c016ac9489efb98e136ed0cc4b13685c1b43001d74ea75b334df8a7b6da414c17ecd7ad8398f4bb6a8fe0bb75155430b47d045a2462
 DIST cmake_modules-0.4.1.tar.gz 18057 BLAKE2B fa61b95fc2a401df8b146fc57a26ea1d0770daf94d4f2d7bf241b213ba58733e6bbbc11af0140d6ac7bf84ab78acd7abdd79570866683bc7a0704294fe8f3c29 SHA512 7bc0ab1c89686cfbabbf5fd5bf1685c8eef7325c62a7ecd5ef38a14b54eb80c65306b70b30bef4a001d4081e6c43e75a39fc38e5e1b6227a6725093417ba4cf2
+DIST cmake_modules-0.4.2.tar.gz 18541 BLAKE2B 448fa9f49c155e60f56094cadfd2f1d26bac426a18ce7355c92f227fb650f77affd49557c98fa4d0b26d4e21ed7b4d2a2e6deb6fdc25a3996705a2b9e3805f56 SHA512 1ab0f9d15296c024caf83f126db675894163ff6104c86e22f105e8027561b291e2a0178e39980439e66e4b691e6122830621fbb09f957eebe94ddd065c23f5e7
 EBUILD cmake_modules-0.4.0.ebuild 378 BLAKE2B dd8e5ea62e68f2c8215bac9cabe3f6a41d1480867ff31d3ce674be3a9e10df36107ba823e8fcd8402ce9125d0c46438aad41680f7c1c4d483de9253dea202ec4 SHA512 22e051b6b8a10f022fc1103d66c3959f6aabccfc05772752723100051a0ad6d366d3dbafe87b8edf30df6f9ed937ff5ca3edca344241cd95a6f134c4c55e9b46
 EBUILD cmake_modules-0.4.1.ebuild 378 BLAKE2B 6754d24dab6e7da85e91617d88521e45a971a24223679a553a6a9c2361ba293c59dad24020deb22f3c2e93718e86fce81ffd6d14e13e5de73c748f6639fa04e3 SHA512 680f503ced4fe891e84760007dd2fd9ea3854f27c971ca3540661369f22fd1d6201b1595e13e242ff746bef204d61639a4cdeac2d9a3da2b96771ffa17f1df3b
+EBUILD cmake_modules-0.4.2.ebuild 375 BLAKE2B 0e07ec88f48c4f823b5587eeb764a691265858f1d84386e55cee65f61a06d0cf4d1e5a11f2ff4ea78d04bbb7011e1138c9a21af71457c4ecca4775d710a4c386 SHA512 c3bd32b8ca16b4ed7274d0054fced3ca987854707dda2af695a77cb31d37bfcbfb17e04e52d729c708d4f2f929e1b9b02553bf36f122352b7b7d6128e26ddaa5
 EBUILD cmake_modules-9999.ebuild 378 BLAKE2B dd8e5ea62e68f2c8215bac9cabe3f6a41d1480867ff31d3ce674be3a9e10df36107ba823e8fcd8402ce9125d0c46438aad41680f7c1c4d483de9253dea202ec4 SHA512 22e051b6b8a10f022fc1103d66c3959f6aabccfc05772752723100051a0ad6d366d3dbafe87b8edf30df6f9ed937ff5ca3edca344241cd95a6f134c4c55e9b46
 MISC metadata.xml 331 BLAKE2B 542842b17662d8d11d0e8c9bf8e964a0bb220e9fd9b377a5d85ae41760a836cc66d5f4325fd79644878c7514d5d6487b4231417249bad174e294961404f64919 SHA512 cd2600dbf2b4aa2203c0d84f35ee501e48d3e14d16bd66a66c135dc57dab76b5abd9a9888e62babce118f9fb7c80752be6d4a72b0c7a040f844cf37735a537d9
diff --git a/dev-ros/cmake_modules/cmake_modules-0.4.2.ebuild b/dev-ros/cmake_modules/cmake_modules-0.4.2.ebuild
new file mode 100644
index 000000000000..a76cb730354e
--- /dev/null
+++ b/dev-ros/cmake_modules/cmake_modules-0.4.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/cmake_modules"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="CMake Modules which are not distributed with CMake but are commonly used by ROS packages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/cv_bridge/Manifest b/dev-ros/cv_bridge/Manifest
index bb2d0891d149..9eb6df69e8b0 100644
--- a/dev-ros/cv_bridge/Manifest
+++ b/dev-ros/cv_bridge/Manifest
@@ -1,10 +1,5 @@
-DIST vision_opencv-1.12.5.tar.gz 81739 BLAKE2B 5c135009f4e766b34c217b6de1dba836bf225b4cc7aca53b34c297f0c0986a79c3c629990464599da98fa32424a87467037caf3b51f3f6dcab2add615d613c08 SHA512 df3ad951262a692124eead5751f64c04fbf831486db8c000e23e2f0b10f645d830c38cf2d99d23b696b96cd0388c4d732ddda4e5d8e8b7cb88a3fd5909c62c71
-DIST vision_opencv-1.12.7.tar.gz 81877 BLAKE2B 216a82ec377e0bc3d85866da3ed3b9e8e90f7615bfbf0e3cacc30cd2bc2aeeb3f822d8daa1f0be42dab45dbdfc69c043a3a4c29b8357561356a2f874b3f61552 SHA512 e02f9450183e8e927d947d2382859ed01aaa5dc7a8f299e5a39815c53ee726b96781e961b1cf0f5cc3ac16699d162d4ed80678de4b6517e5139a5a8bd592e39c
-DIST vision_opencv-1.12.8.tar.gz 82043 BLAKE2B 9eb18ea9a4d3ddf6d2103ab3a2e53557349880ea665f8089d64319e8c99fb4ea922e8de1ab04fb749bed5c2503041d27d8e9b773d6142a5b5366aae937ca2514 SHA512 fadd84bb5e9586a5b04833100d9e1267ce8d153ca95a3257e1c3e6fe825dae524e25b2cc7deebb48d326cce8ef04523c5803eeecd88362cf6ff0384c52557608
+AUX boostpython.patch 551 BLAKE2B f3cecec73fbc584f324da2c1438ca42e283031fdf6df3f8ac458da9f09c3344716e9ca901de9f35edceaf6cc0223f66a1cef2e77ee3106f7b39b8ab96b204ade SHA512 9b306662ccef96aa9eee0b5c244de4919a9f8614502e1d75e63e787b4a0408ca6363c67b4b6eb897ffd8ca90df856444c357acee5f23074e33f7afd985686f7f
 DIST vision_opencv-1.13.0.tar.gz 82177 BLAKE2B 1c863f3c9e6b856d61a0e879f958f0f1fd184f088e208023a504cf5bb982c5496b71e1f2b4761e4456ca76348e51bc2bc760b2c43e1a35b02fa5c23c8e444502 SHA512 a20ec2f41a0c94dde51b19f902ae078cbf5449a2aadbeacbc49bbfc2ab52c39878e63448a3137591f7e1b2f6025baef616579463cf32274e7838157137d214bc
-EBUILD cv_bridge-1.12.5.ebuild 592 BLAKE2B e83e4897190d99593d5921ba55ba342511f8e5d3b7b4173892b3b763b01f6a68d4421d39c928519505982a6df17185973ec91685e3421a0f67ee8099b8c95999 SHA512 ae4b1d791d4ace3b583124c14a5499e0e0f45ad834e694c9c06f259ce28a4af95c43f567bd440139f043be7d80f9bcb4d19caaf56794228ec1e6e49b0b8cff62
-EBUILD cv_bridge-1.12.7.ebuild 592 BLAKE2B e83e4897190d99593d5921ba55ba342511f8e5d3b7b4173892b3b763b01f6a68d4421d39c928519505982a6df17185973ec91685e3421a0f67ee8099b8c95999 SHA512 ae4b1d791d4ace3b583124c14a5499e0e0f45ad834e694c9c06f259ce28a4af95c43f567bd440139f043be7d80f9bcb4d19caaf56794228ec1e6e49b0b8cff62
-EBUILD cv_bridge-1.12.8.ebuild 592 BLAKE2B 31b4abecd775ec2383eae038f2a27780a9b5dd1628f15223deb347426ec132ecc19b12077f44c782e7f93bd16977613bab442595c9cc7c6b3006120c863e0ffb SHA512 fcfa0f414ff530e0f0981a538b64e5a8a403aec5962f7b7d5127ff0e6aed93324e612650b46fb6632aaa9a59ce42641085221f04b5153c6a06b754310ec2618e
-EBUILD cv_bridge-1.13.0.ebuild 592 BLAKE2B 31b4abecd775ec2383eae038f2a27780a9b5dd1628f15223deb347426ec132ecc19b12077f44c782e7f93bd16977613bab442595c9cc7c6b3006120c863e0ffb SHA512 fcfa0f414ff530e0f0981a538b64e5a8a403aec5962f7b7d5127ff0e6aed93324e612650b46fb6632aaa9a59ce42641085221f04b5153c6a06b754310ec2618e
-EBUILD cv_bridge-9999.ebuild 592 BLAKE2B e83e4897190d99593d5921ba55ba342511f8e5d3b7b4173892b3b763b01f6a68d4421d39c928519505982a6df17185973ec91685e3421a0f67ee8099b8c95999 SHA512 ae4b1d791d4ace3b583124c14a5499e0e0f45ad834e694c9c06f259ce28a4af95c43f567bd440139f043be7d80f9bcb4d19caaf56794228ec1e6e49b0b8cff62
+EBUILD cv_bridge-1.13.0.ebuild 633 BLAKE2B 43e33f439c1fa4af188c7cadbfc36c16ebb4bf1594cd1b797fdb09dc1cc660b4773d1488ff189666dcd8d6a3cba4024f20b0a7b4ad82c4fa47c33c987b15196a SHA512 757803d5fa063ad1856bb9d758522b2a8908999187742f6a8fb3398204ab4c824d0da8e70b085c0e687e23ed49740ec2073e962c60f49e650ceacee2e44e1a25
+EBUILD cv_bridge-9999.ebuild 633 BLAKE2B 43e33f439c1fa4af188c7cadbfc36c16ebb4bf1594cd1b797fdb09dc1cc660b4773d1488ff189666dcd8d6a3cba4024f20b0a7b4ad82c4fa47c33c987b15196a SHA512 757803d5fa063ad1856bb9d758522b2a8908999187742f6a8fb3398204ab4c824d0da8e70b085c0e687e23ed49740ec2073e962c60f49e650ceacee2e44e1a25
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/cv_bridge/cv_bridge-1.12.5.ebuild b/dev-ros/cv_bridge/cv_bridge-1.12.5.ebuild
deleted file mode 100644
index 091646aa633e..000000000000
--- a/dev-ros/cv_bridge/cv_bridge-1.12.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=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	>=media-libs/opencv-3:=[contrib(+)]
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cv_bridge/cv_bridge-1.12.7.ebuild b/dev-ros/cv_bridge/cv_bridge-1.12.7.ebuild
deleted file mode 100644
index 091646aa633e..000000000000
--- a/dev-ros/cv_bridge/cv_bridge-1.12.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=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	>=media-libs/opencv-3:=[contrib(+)]
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cv_bridge/cv_bridge-1.12.8.ebuild b/dev-ros/cv_bridge/cv_bridge-1.12.8.ebuild
deleted file mode 100644
index 781df6ff0219..000000000000
--- a/dev-ros/cv_bridge/cv_bridge-1.12.8.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
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	>=media-libs/opencv-3:=[contrib(+)]
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild b/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
index 781df6ff0219..422225d82b4f 100644
--- a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-1.13.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
@@ -21,3 +21,4 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boostpython.patch" )
diff --git a/dev-ros/cv_bridge/cv_bridge-9999.ebuild b/dev-ros/cv_bridge/cv_bridge-9999.ebuild
index 091646aa633e..422225d82b4f 100644
--- a/dev-ros/cv_bridge/cv_bridge-9999.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-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=5
@@ -21,3 +21,4 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boostpython.patch" )
diff --git a/dev-ros/cv_bridge/files/boostpython.patch b/dev-ros/cv_bridge/files/boostpython.patch
new file mode 100644
index 000000000000..72fac8087363
--- /dev/null
+++ b/dev-ros/cv_bridge/files/boostpython.patch
@@ -0,0 +1,17 @@
+Index: cv_bridge/CMakeLists.txt
+===================================================================
+--- cv_bridge.orig/CMakeLists.txt
++++ cv_bridge/CMakeLists.txt
+@@ -5,11 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
+ 
+ if(NOT ANDROID)
+   find_package(PythonLibs)
+-  if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3)
+-    find_package(Boost REQUIRED python)
+-  else()
+-    find_package(Boost REQUIRED python3)
+-  endif()
++  find_package(Boost REQUIRED python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ else()
+ find_package(Boost REQUIRED)
+ endif()
diff --git a/dev-ros/fake_localization/Manifest b/dev-ros/fake_localization/Manifest
index 99e16c336ab6..754740aff10d 100644
--- a/dev-ros/fake_localization/Manifest
+++ b/dev-ros/fake_localization/Manifest
@@ -1,10 +1,5 @@
-DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
-DIST navigation-1.16.0.tar.gz 336708 BLAKE2B 74fdc7c3afb00bfbded011678c90b22cc95fe45b126c9a8a4bb9a80f8676ed0ade32e02ad77ec643f167d9719e71347750b6f7993f61cf743fc018d1412436d6 SHA512 ee6336627c2e095ef089534c19b7258f394858a6c04ad49b3aa6e1d0acca67c245c2743f04752be137864dba216c3aa38e34c3e40e3db7839308be3adbc808d6
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
+AUX boost170.patch 378 BLAKE2B 9e9cf95eefc7232744cf165e88b0cd8f9ce6d20db95f375f54acc98c238563acb5a18edd267fe002ddf1341ea0951921e29f3954c2435058a5e4353037346813 SHA512 ca18f9ecb6e382385995dce25851636df9f1edd1b0951b650bb292202e94758a71c820f00947f4edc3c6065e09d828b7c88c325d8a239f425b5aca423157b95a
 DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-EBUILD fake_localization-1.15.2.ebuild 720 BLAKE2B c908c0cd83c2103307dda8033ca003cc748f56a8a391f3285eac49be401d182d6eaed1f682379b861edca5b7be2c7f3d671bad838e9ac7c665f6ef7b658349cc SHA512 4bfe514a438cc5475255f4bb1a807d4a5325271b9c17536b17b3ee0f1cadd8d3090006ff6342fc049c908c97de470aeb44605f48986ea479902b071aab34a67c
-EBUILD fake_localization-1.16.0.ebuild 765 BLAKE2B 0e237ba1e5e9bdfe5e997ac17595c3d7606b937c91b2deffce7327dc8d5ac4d181e28a890ea8f6aa5dec540fe2880df4f5976ba09453df33f4ca2ec8d2b6c6a9 SHA512 aa8ec22b3120ff38e5f2d2f3a9429c1fe5d605c9fd6a9fca87f2bb3e024d66d63738d624e9ca72932521e89385a749c3bc0b6969894d950dc39e3202313027d4
-EBUILD fake_localization-1.16.1.ebuild 765 BLAKE2B 0e237ba1e5e9bdfe5e997ac17595c3d7606b937c91b2deffce7327dc8d5ac4d181e28a890ea8f6aa5dec540fe2880df4f5976ba09453df33f4ca2ec8d2b6c6a9 SHA512 aa8ec22b3120ff38e5f2d2f3a9429c1fe5d605c9fd6a9fca87f2bb3e024d66d63738d624e9ca72932521e89385a749c3bc0b6969894d950dc39e3202313027d4
-EBUILD fake_localization-1.16.2.ebuild 765 BLAKE2B 0e237ba1e5e9bdfe5e997ac17595c3d7606b937c91b2deffce7327dc8d5ac4d181e28a890ea8f6aa5dec540fe2880df4f5976ba09453df33f4ca2ec8d2b6c6a9 SHA512 aa8ec22b3120ff38e5f2d2f3a9429c1fe5d605c9fd6a9fca87f2bb3e024d66d63738d624e9ca72932521e89385a749c3bc0b6969894d950dc39e3202313027d4
+EBUILD fake_localization-1.16.2.ebuild 803 BLAKE2B e4a4f7e50b2dfedb16e3b6cf64b42f18ad0281e6316c32e301e75ca382b7fa8df4520ca8c4720ce9f5658fabfc489c7d69a3f300623f6fec3e9515a73897e096 SHA512 9c9d3f649d752f6ed4e05d1c50de2caf696d4053a006ac2737b2c2248222c210e0f259bc02c8bfd019d348d201f21d1a5662a94fa9665f040b4012544252e3c1
 EBUILD fake_localization-9999.ebuild 765 BLAKE2B 0e237ba1e5e9bdfe5e997ac17595c3d7606b937c91b2deffce7327dc8d5ac4d181e28a890ea8f6aa5dec540fe2880df4f5976ba09453df33f4ca2ec8d2b6c6a9 SHA512 aa8ec22b3120ff38e5f2d2f3a9429c1fe5d605c9fd6a9fca87f2bb3e024d66d63738d624e9ca72932521e89385a749c3bc0b6969894d950dc39e3202313027d4
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/fake_localization/fake_localization-1.15.2.ebuild b/dev-ros/fake_localization/fake_localization-1.15.2.ebuild
deleted file mode 100644
index 831e3177e5e2..000000000000
--- a/dev-ros/fake_localization/fake_localization-1.15.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="A ROS node that simply forwards odometry information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/angles
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/message_filters
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/fake_localization/fake_localization-1.16.0.ebuild b/dev-ros/fake_localization/fake_localization-1.16.0.ebuild
deleted file mode 100644
index 0c7895911491..000000000000
--- a/dev-ros/fake_localization/fake_localization-1.16.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="A ROS node that simply forwards odometry information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/angles
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/message_filters
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/fake_localization/fake_localization-1.16.1.ebuild b/dev-ros/fake_localization/fake_localization-1.16.1.ebuild
deleted file mode 100644
index 0c7895911491..000000000000
--- a/dev-ros/fake_localization/fake_localization-1.16.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="A ROS node that simply forwards odometry information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/angles
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_ros
-	dev-ros/message_filters
-	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/fake_localization/fake_localization-1.16.2.ebuild b/dev-ros/fake_localization/fake_localization-1.16.2.ebuild
index 0c7895911491..946772aaddd8 100644
--- a/dev-ros/fake_localization/fake_localization-1.16.2.ebuild
+++ b/dev-ros/fake_localization/fake_localization-1.16.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
@@ -27,3 +27,4 @@ RDEPEND="
 	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/fake_localization/files/boost170.patch b/dev-ros/fake_localization/files/boost170.patch
new file mode 100644
index 000000000000..b7f877a82b4f
--- /dev/null
+++ b/dev-ros/fake_localization/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: fake_localization/CMakeLists.txt
+===================================================================
+--- fake_localization.orig/CMakeLists.txt
++++ fake_localization/CMakeLists.txt
+@@ -14,7 +14,7 @@ find_package(catkin REQUIRED
+         )
+ 
+ 
+-find_package(Boost REQUIRED COMPONENTS signals)
++find_package(Boost REQUIRED COMPONENTS)
+ 
+ catkin_package(
+     CATKIN_DEPENDS
diff --git a/dev-ros/gazebo_dev/Manifest b/dev-ros/gazebo_dev/Manifest
index 8276b1760c22..e7dbb49be05c 100644
--- a/dev-ros/gazebo_dev/Manifest
+++ b/dev-ros/gazebo_dev/Manifest
@@ -1,8 +1,10 @@
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
+DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
 EBUILD gazebo_dev-2.7.3.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
 EBUILD gazebo_dev-2.7.4.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
 EBUILD gazebo_dev-2.8.4.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
+EBUILD gazebo_dev-2.8.5.ebuild 426 BLAKE2B f3a1c0411f63f023e771d8196cc2bdeade104317a27fa785a70f47909b6a0cb23df920f20452047a7c34fb2f265b2b20065ff09dfe9766d3c320f25e8b523055 SHA512 cc17d8c023011dcfe5a7af0876eea0164611220cac10c26ddd7ff8fcfc5fdbe06b068b9d178072293ca6eed7c4644a12f70c6cd749ef8f3727a2b86774e6769b
 EBUILD gazebo_dev-9999.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_dev/gazebo_dev-2.8.5.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.8.5.ebuild
new file mode 100644
index 000000000000..02ff0da21fb6
--- /dev/null
+++ b/dev-ros/gazebo_dev/gazebo_dev-2.8.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Provides a cmake config for the default version of Gazebo for the ROS distribution."
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-electronics/gazebo
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_msgs/Manifest b/dev-ros/gazebo_msgs/Manifest
index 4e7487c262a1..9f7659803749 100644
--- a/dev-ros/gazebo_msgs/Manifest
+++ b/dev-ros/gazebo_msgs/Manifest
@@ -2,9 +2,11 @@ DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a312
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
+DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
 EBUILD gazebo_msgs-2.6.2.ebuild 575 BLAKE2B ec162aec234dc512a0e6a0c4e8f3504551858056636ab0990f0d29cf2fa7268202be4bf733f1ee2eb3a276c8427ad80958829ef2c16162c189072eaa231a2d79 SHA512 005e0f24abf8af454865f57af36dc11fabd7bfe818188f11be3dc4ecea4e64a5cfc7fe3dd6b510019e667d9ee198e01e16112c8bb0905d6004f46d66bbc1204a
 EBUILD gazebo_msgs-2.7.3.ebuild 575 BLAKE2B ec162aec234dc512a0e6a0c4e8f3504551858056636ab0990f0d29cf2fa7268202be4bf733f1ee2eb3a276c8427ad80958829ef2c16162c189072eaa231a2d79 SHA512 005e0f24abf8af454865f57af36dc11fabd7bfe818188f11be3dc4ecea4e64a5cfc7fe3dd6b510019e667d9ee198e01e16112c8bb0905d6004f46d66bbc1204a
 EBUILD gazebo_msgs-2.7.4.ebuild 575 BLAKE2B ec162aec234dc512a0e6a0c4e8f3504551858056636ab0990f0d29cf2fa7268202be4bf733f1ee2eb3a276c8427ad80958829ef2c16162c189072eaa231a2d79 SHA512 005e0f24abf8af454865f57af36dc11fabd7bfe818188f11be3dc4ecea4e64a5cfc7fe3dd6b510019e667d9ee198e01e16112c8bb0905d6004f46d66bbc1204a
 EBUILD gazebo_msgs-2.8.4.ebuild 575 BLAKE2B ec162aec234dc512a0e6a0c4e8f3504551858056636ab0990f0d29cf2fa7268202be4bf733f1ee2eb3a276c8427ad80958829ef2c16162c189072eaa231a2d79 SHA512 005e0f24abf8af454865f57af36dc11fabd7bfe818188f11be3dc4ecea4e64a5cfc7fe3dd6b510019e667d9ee198e01e16112c8bb0905d6004f46d66bbc1204a
+EBUILD gazebo_msgs-2.8.5.ebuild 575 BLAKE2B ec162aec234dc512a0e6a0c4e8f3504551858056636ab0990f0d29cf2fa7268202be4bf733f1ee2eb3a276c8427ad80958829ef2c16162c189072eaa231a2d79 SHA512 005e0f24abf8af454865f57af36dc11fabd7bfe818188f11be3dc4ecea4e64a5cfc7fe3dd6b510019e667d9ee198e01e16112c8bb0905d6004f46d66bbc1204a
 EBUILD gazebo_msgs-9999.ebuild 575 BLAKE2B ec162aec234dc512a0e6a0c4e8f3504551858056636ab0990f0d29cf2fa7268202be4bf733f1ee2eb3a276c8427ad80958829ef2c16162c189072eaa231a2d79 SHA512 005e0f24abf8af454865f57af36dc11fabd7bfe818188f11be3dc4ecea4e64a5cfc7fe3dd6b510019e667d9ee198e01e16112c8bb0905d6004f46d66bbc1204a
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-2.8.5.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.8.5.ebuild
new file mode 100644
index 000000000000..41fc810e4a75
--- /dev/null
+++ b/dev-ros/gazebo_msgs/gazebo_msgs-2.8.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python{2_7,3_5} )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
+
+inherit ros-catkin
+
+DESCRIPTION="Message and service data structures for interacting with Gazebo from ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_plugins/Manifest b/dev-ros/gazebo_plugins/Manifest
index 1a91d0a21d8e..5acbf46e7172 100644
--- a/dev-ros/gazebo_plugins/Manifest
+++ b/dev-ros/gazebo_plugins/Manifest
@@ -3,9 +3,11 @@ DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a312
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
+DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
 EBUILD gazebo_plugins-2.6.2.ebuild 1425 BLAKE2B 7346eacd043a18ec5f1394c05772a0a662f6461698c35955b8c0bee18bcba98ba213c1633e7c5647c6788df132c02b45bf1017d18a8b8211ffbbf036aa94ee8e SHA512 17b7572dd9e6e26f0eeffee09d301f6c25dfb9a40334f02047d2fabf3f2b6196a5a3e2e8ffdd6753c0f9d908ec9e4bc0a16455bae22de5f46aa335d15be41fd1
 EBUILD gazebo_plugins-2.7.3.ebuild 1698 BLAKE2B 97e8bb62518f3d7fca4e315971a4ebd4a44492ad7a951dc992e3a7b88227a6cecc7293db2fd760911bcd9388dd1644c5f155a5fda1a4d38626e1cf39d2115810 SHA512 e6b11eb60341523338b6c5ec182cd759f9b270c49ced0cb3c3693d254058a42462a5fb94a7eade95e2d920a2a66896921bf5ce6e040f4e3640274843e8e368a8
 EBUILD gazebo_plugins-2.7.4.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
 EBUILD gazebo_plugins-2.8.4.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
+EBUILD gazebo_plugins-2.8.5.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
 EBUILD gazebo_plugins-9999.ebuild 1445 BLAKE2B 1dc2fd6f9b5fb5496d396f8a39cb69a954bedba41c21285aa62baf7af5ba78203cac9949b739952e2b042bd7837172d3b11293d47ba31966d17ee5012096e5f1 SHA512 f663cc5db54307153ae6e7c7bdf9f9ebddbe3dfa852ed656abed8d51bd567394ee44698283d32377306f3a6adf0a55aefc53db249b8b452f62539a1b44135d09
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild
new file mode 100644
index 000000000000..af125170e28e
--- /dev/null
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.8.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python{2_7,3_5} )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components"
+LICENSE="BSD Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/nodelet
+	dev-ros/angles
+	dev-ros/std_srvs
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/urdf
+	dev-ros/tf
+	dev-ros/tf2_ros
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/driver_base[${PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pcl_conversions
+	dev-ros/image_transport
+	dev-ros/rosconsole
+	dev-ros/cv_bridge
+	media-libs/opencv:=
+	dev-ros/polled_camera
+	dev-ros/diagnostic_updater
+	dev-ros/camera_info_manager
+	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/libxml2
+	>=sci-electronics/gazebo-7:=
+	dev-libs/protobuf:=
+	dev-games/ogre
+	sci-libs/pcl
+	dev-libs/boost:=
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/Manifest b/dev-ros/gazebo_ros/Manifest
index e4bc896893cb..830dffa46649 100644
--- a/dev-ros/gazebo_ros/Manifest
+++ b/dev-ros/gazebo_ros/Manifest
@@ -3,9 +3,11 @@ DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a312
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
+DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
 EBUILD gazebo_ros-2.6.2.ebuild 1009 BLAKE2B 356b118f6b7e0e2638a9b513ded0b9a9ef94a413b17ecaad22d73984ae88980be5e77390774e2ef43fd470c8af1e5e997399a8011f1bbca04b4186e0bc1105bb SHA512 61c285486cf13f06346311cd83bb04c4c9dc87963ec2927d658a8782a5a4b43fe7f54bf07127652f20ae9dde473f1234e3fd2fc84b691f665b9f6d95f978c132
 EBUILD gazebo_ros-2.7.3.ebuild 1282 BLAKE2B 2ad6a1a6e9a192a34ac8140b20ebc4787a31971d176e4ddd7f929746b1d694955e50b166f732908906ee1b5385dd51cbca746ee1ff4727e48948fca8c3ce0f37 SHA512 5d25298b56befcd572bd1939b075ed34a772410e10ebe73975a6e1f756e10bd090a2cd4776fa4bda21bd994ed1cce20155a1dae02bf8918e46259228ec3c43f8
 EBUILD gazebo_ros-2.7.4.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
 EBUILD gazebo_ros-2.8.4.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
+EBUILD gazebo_ros-2.8.5.ebuild 1026 BLAKE2B befc99333d36e2366eb794f9d2a820a310759ec9aa3e573d382f7fa7aac1e1499d8c1d7844e9343843ef66012a38e9a22781471e8c496758dce10360144f5961 SHA512 373e347c174d56497d381d3e0c6a76795caaeea32c083e878fd245b012b661c9385da8f51e19282f06ff7595fddf40ac0f573c491cc21ee1abf0611dfe1da35b
 EBUILD gazebo_ros-9999.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild
new file mode 100644
index 000000000000..107dee905b18
--- /dev/null
+++ b/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/gazebo_dev
+	dev-libs/tinyxml
+	sci-electronics/gazebo:=
+	dev-libs/protobuf:=
+	dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure
+	dev-libs/libxml2
+	dev-libs/boost:=[threads]
+	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/Manifest b/dev-ros/gazebo_ros_control/Manifest
index 63b02abb7b5b..f416c5d73f18 100644
--- a/dev-ros/gazebo_ros_control/Manifest
+++ b/dev-ros/gazebo_ros_control/Manifest
@@ -4,9 +4,11 @@ DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a312
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
+DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
 EBUILD gazebo_ros_control-2.6.2-r1.ebuild 743 BLAKE2B 7398cf457863ad2296e87275ad1a5dca21c5742d48bc9713a11a0a16d3b24906913460380349161f809abf61843616b12a18eea9472169db97f258b6d490fa60 SHA512 f7cee8fa23e02e997dea2462c6d87bfdf12fe68c6e5cc812c81fa119389517b4ee0743f93201bc4f2845ac154ac802ee0118da00a96c075a9296cad87b10dda0
 EBUILD gazebo_ros_control-2.7.3.ebuild 975 BLAKE2B 6c89cd3e49119edcd893a7f764d359035a08774b429f3b458178614f60dd0db9488f2c68f35f85c24cc100cd4705403e8b99df0a8fab1ce49a9b31c8c98c23d4 SHA512 94554d46030657d71e14614c0f297ad9e7541ef08bb601a2e8578d7187e31186c997f8298626a07b28d8110c8017e0cc129b4c07ab8831cf14c1c8df774a4e60
 EBUILD gazebo_ros_control-2.7.4.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
 EBUILD gazebo_ros_control-2.8.4.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
+EBUILD gazebo_ros_control-2.8.5.ebuild 719 BLAKE2B 5ff337b05ffaf84f0ba0e11b1b681e7e31e86af8c3829916404b85c4516e2ac080f42ff38f6bc9e2e432bc19930059ea627a4d3fa6b2432f1553eb2b8093d10d SHA512 4598b1d44a404b4ece5d67379c85798bf8db7c9d2e0580a7afb73d35ccad375bb68b95a566fba1a2e7c721a449a62b84f2d51552c3eb76619ee8acdccf5caadc
 EBUILD gazebo_ros_control-9999.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.5.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.5.ebuild
new file mode 100644
index 000000000000..c98bd84a588a
--- /dev/null
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS control plugins for gazebo"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_ros
+	dev-ros/control_toolbox
+	dev-ros/controller_manager
+	dev-ros/hardware_interface
+	dev-ros/transmission_interface
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	>=dev-ros/joint_limits_interface-0.11.0
+	>=dev-ros/urdf-1.12.3-r1
+	dev-libs/urdfdom:=
+	sci-electronics/gazebo:=
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gencpp/Manifest b/dev-ros/gencpp/Manifest
index 75435af20e8b..e48dd3fddb0d 100644
--- a/dev-ros/gencpp/Manifest
+++ b/dev-ros/gencpp/Manifest
@@ -1,6 +1,6 @@
-DIST gencpp-0.5.5.tar.gz 8601 BLAKE2B c048ce73f41d8b9ef3111bcb00b9a8776f4b1498bf4828e48ec45994c4f0fecfc75318fcfbfddd18b492d7b597e62e69fd497de63b6cc1417a107e11ecf38e83 SHA512 6440747ba98b23ed515db6d7b6760a98dcb3f832f87c0a8d3797b47c48e51cb01e2c62837ff5a84a2f8aeff16764493093170d83639602e3d82de846e95f9f8a
 DIST gencpp-0.6.0.tar.gz 9164 BLAKE2B 97b7e3904cde95ca6304e498d5f338cf303a55c407c187994b3dcb2bb062bd6dc1b4a2ab6f0cc949bfc6c481199586abef115fe54b4b99e99bc99dac8ae261cf SHA512 0ef0ae3d5f93ab5693455eb5319a0b8fbaab4ee56bd890e0ef96bfbdf8959affe61551f30739bab7e945c213c9b2fb51ff5e89c5b3a40d945da23e1ba88b9c1e
-EBUILD gencpp-0.5.5.ebuild 458 BLAKE2B dc930cb726120fd10a24c028d885025a5367b16dcd6360b26868514dbf62ea8c8c9dda2f9c1e3e2db607d15d3c65add1604e55298643ab1061b3e411154185a9 SHA512 9ccbae064bb90ca6cec89c521677a1b15bcee7bf7b48570af39cdb048cbaf4d8f9f86676d8eac3bf0c2ce8c8b84735ed88e6b41681302c70334f058db3fbc768
+DIST gencpp-0.6.2.tar.gz 9407 BLAKE2B 7676b9f22961d09684faa44f39ca3ac02196d6679f636019ab4cb4624297d3ebb16f301f53532954aec74c25e267924a5facfff6c8d0bffee02d88d665927359 SHA512 3f076369069940f2261f4bfd9b5c644709bf58c951ee309bb33ed689fe83cb331b63a5986826540b8df6fa04ace3b1b8520fbfe85856afb5bafd52ebc4459a87
 EBUILD gencpp-0.6.0.ebuild 458 BLAKE2B dc930cb726120fd10a24c028d885025a5367b16dcd6360b26868514dbf62ea8c8c9dda2f9c1e3e2db607d15d3c65add1604e55298643ab1061b3e411154185a9 SHA512 9ccbae064bb90ca6cec89c521677a1b15bcee7bf7b48570af39cdb048cbaf4d8f9f86676d8eac3bf0c2ce8c8b84735ed88e6b41681302c70334f058db3fbc768
+EBUILD gencpp-0.6.2.ebuild 458 BLAKE2B dc930cb726120fd10a24c028d885025a5367b16dcd6360b26868514dbf62ea8c8c9dda2f9c1e3e2db607d15d3c65add1604e55298643ab1061b3e411154185a9 SHA512 9ccbae064bb90ca6cec89c521677a1b15bcee7bf7b48570af39cdb048cbaf4d8f9f86676d8eac3bf0c2ce8c8b84735ed88e6b41681302c70334f058db3fbc768
 EBUILD gencpp-9999.ebuild 458 BLAKE2B dc930cb726120fd10a24c028d885025a5367b16dcd6360b26868514dbf62ea8c8c9dda2f9c1e3e2db607d15d3c65add1604e55298643ab1061b3e411154185a9 SHA512 9ccbae064bb90ca6cec89c521677a1b15bcee7bf7b48570af39cdb048cbaf4d8f9f86676d8eac3bf0c2ce8c8b84735ed88e6b41681302c70334f058db3fbc768
 MISC metadata.xml 324 BLAKE2B acb13fb86def5c4a53edd5c0db5d4c65d73e99f6d18a2fa1509981878637f006f9b14c5cd40e56b886b73c4ac8ec957844da3e424bb515248c07298388eb23c4 SHA512 031c6670cbdd1abdf53174d877a08985012d75ffa1fb16415501d128ac519567f6b9ae3c786a878aba25481c4413ebbcbc34d3782bf1d85cc6976caccd1aaaac
diff --git a/dev-ros/gencpp/gencpp-0.5.5.ebuild b/dev-ros/gencpp/gencpp-0.6.2.ebuild
index 7da44afd03eb..7da44afd03eb 100644
--- a/dev-ros/gencpp/gencpp-0.5.5.ebuild
+++ b/dev-ros/gencpp/gencpp-0.6.2.ebuild
diff --git a/dev-ros/genlisp/Manifest b/dev-ros/genlisp/Manifest
index 105310f15999..9238626966d6 100644
--- a/dev-ros/genlisp/Manifest
+++ b/dev-ros/genlisp/Manifest
@@ -1,4 +1,6 @@
 DIST genlisp-0.4.16.tar.gz 10059 BLAKE2B c6833f5af7b9da0405ed8b83a22e3f1bc584c0353485cabf3317ed82b4cca64dae0014febc9ae09a6532f869f35f9ba15c6008bd8f160eaba19e35cf90738630 SHA512 1cf180a337716f704d0e152a77049349aee9935273592b83aca64f3a9f926ed8775669114744ebf265dd09e70cf24af24e5c3e12a7bb3e7ecd90dc86f3cca3a6
+DIST genlisp-0.4.17.tar.gz 10154 BLAKE2B b16ccb9a5ad0e43906736786001b26e1de4548e40dfbf3bd24c4f2e6e1fcfb180a6dc7851f5a2c47d51dd247cc804f7cf7e3c023e88a2f442958c9ff59547ec4 SHA512 a86f4f921ff6e51323e1bf0e2ea5ada5dba106f6197b52ece4bbfe876951aead19ff9142395968bcccc06d83047232ecdad42f7ed9f380cf0f0a63e8717577dd
 EBUILD genlisp-0.4.16.ebuild 412 BLAKE2B ddfb4fbe952db9ab12e4851be24396359a42f0350223b79ddac0119b5071263b6ce44499c6343cae56657601018cd8efa3acb9802721abda6e96d6a2dda6530d SHA512 f8d78d7358929aad7c555e648dc19f74b78b2dc273343b676fcb6a3844005bd219bde48ab20b34cd13e3f1b10f7d61e44d5cf40629fdab31722e96d2e54d9f54
+EBUILD genlisp-0.4.17.ebuild 412 BLAKE2B ddfb4fbe952db9ab12e4851be24396359a42f0350223b79ddac0119b5071263b6ce44499c6343cae56657601018cd8efa3acb9802721abda6e96d6a2dda6530d SHA512 f8d78d7358929aad7c555e648dc19f74b78b2dc273343b676fcb6a3844005bd219bde48ab20b34cd13e3f1b10f7d61e44d5cf40629fdab31722e96d2e54d9f54
 EBUILD genlisp-9999.ebuild 412 BLAKE2B ddfb4fbe952db9ab12e4851be24396359a42f0350223b79ddac0119b5071263b6ce44499c6343cae56657601018cd8efa3acb9802721abda6e96d6a2dda6530d SHA512 f8d78d7358929aad7c555e648dc19f74b78b2dc273343b676fcb6a3844005bd219bde48ab20b34cd13e3f1b10f7d61e44d5cf40629fdab31722e96d2e54d9f54
 MISC metadata.xml 325 BLAKE2B 0aaea5b7b4f0c686a5c27a7551d9b33da2fee26858b13837bc30810b880a0b70850b7f85d6cdaa7b60975cc66087f4a0370d417ef1879659737530617696b5dc SHA512 f1bda8492546d5a2cecaed684a06df6d41b1b1883cf1dba70dd51f88993a5466924394468d750fc5778bd1530b660e12c0d1e186f30530e5919c9a46a9382159
diff --git a/dev-ros/genlisp/genlisp-0.4.17.ebuild b/dev-ros/genlisp/genlisp-0.4.17.ebuild
new file mode 100644
index 000000000000..1c014b8cd52c
--- /dev/null
+++ b/dev-ros/genlisp/genlisp-0.4.17.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/genlisp"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="Common-Lisp ROS message and service generators"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/genmsg/Manifest b/dev-ros/genmsg/Manifest
index 2077526f8a1c..fccab3c1eb8c 100644
--- a/dev-ros/genmsg/Manifest
+++ b/dev-ros/genmsg/Manifest
@@ -1,8 +1,6 @@
-DIST genmsg-0.5.10.tar.gz 59468 BLAKE2B 2cb70a60dc9281c8999fd88615845bec840ba0d46b00e170fb56e152234c5762058a5a1b2f87fea67d596eadb330627bcfeb8554124894bfb1155654dadb7357 SHA512 8effbada30bc3c48526ef162ef11d0d14c8bba5688d26089cb934a0e9a069233a724608862188caa86d1a4dc8e773d4e93fce5d88239acf0af525f6821d01268
 DIST genmsg-0.5.11.tar.gz 59507 BLAKE2B 080661242a9b6e71d2a098236bce380230c54b5017b2e3b4753fe79a0269fac8ecbd4a36f83710a7d499638bf7289203bea63e0f1215d008a2813a619e70935b SHA512 81ec559e1682aef3ca58c18fa33ce4b6a8d6d835be9831bc1b0401ed440b68f7e021a5a6ebfc17a9cb3b95a3c8434542724f5222f3730793c08a87762ff0c45b
-DIST genmsg-0.5.9.tar.gz 59409 BLAKE2B e3d4ac69bbc665aa62ef9fb7b35cc9b47280690eb743f50e5fe5acaf96a0fda363d594878b1f3584f5d96952dbe9c64428e5e4aeb1f0432c591d03d9ce16cd89 SHA512 ac62c8d08da449890c6eb53264153e01237cd50b97d4d4123e334c59a9a1ef73ce70c4d3d7c95f91ea872ea06b30fa72bf8a3a177309493b33984b8d21e36939
-EBUILD genmsg-0.5.10.ebuild 463 BLAKE2B f5f2c1d769f56c46bdbc8c8f2c35d3c5336813b913d2e5ebcf22f5f1f6f59818a641afe3d3eea9f4b4f477cfe45479f402c59c8de8fc90e92d681e5262874887 SHA512 4028a15840348c1c377ab017b790a5f75c94f676a00d173dfd449221adc0fdb9a2e2166d85b2cd098474efdd049c5367371ecc657e47c989abda6e379d6d27d5
+DIST genmsg-0.5.12.tar.gz 59591 BLAKE2B ca1275994a71be82054f9c3d980fc4b56b03576fb26236a5a0bf45443a5a9eb0cc078cf082004b01f893e2b5e8ffb4c0a7a285596346ee6c79a3ae084219b5c6 SHA512 e87762904eaacf37011a57c3ba0f78e96a7f8048f2222e5831774b7726e8600e0264c6d48d1e3cbb0b0d8671fccc045555c13146931dfbb16fdf193ce9b056be
 EBUILD genmsg-0.5.11.ebuild 463 BLAKE2B f5f2c1d769f56c46bdbc8c8f2c35d3c5336813b913d2e5ebcf22f5f1f6f59818a641afe3d3eea9f4b4f477cfe45479f402c59c8de8fc90e92d681e5262874887 SHA512 4028a15840348c1c377ab017b790a5f75c94f676a00d173dfd449221adc0fdb9a2e2166d85b2cd098474efdd049c5367371ecc657e47c989abda6e379d6d27d5
-EBUILD genmsg-0.5.9.ebuild 463 BLAKE2B f5f2c1d769f56c46bdbc8c8f2c35d3c5336813b913d2e5ebcf22f5f1f6f59818a641afe3d3eea9f4b4f477cfe45479f402c59c8de8fc90e92d681e5262874887 SHA512 4028a15840348c1c377ab017b790a5f75c94f676a00d173dfd449221adc0fdb9a2e2166d85b2cd098474efdd049c5367371ecc657e47c989abda6e379d6d27d5
+EBUILD genmsg-0.5.12.ebuild 463 BLAKE2B f5f2c1d769f56c46bdbc8c8f2c35d3c5336813b913d2e5ebcf22f5f1f6f59818a641afe3d3eea9f4b4f477cfe45479f402c59c8de8fc90e92d681e5262874887 SHA512 4028a15840348c1c377ab017b790a5f75c94f676a00d173dfd449221adc0fdb9a2e2166d85b2cd098474efdd049c5367371ecc657e47c989abda6e379d6d27d5
 EBUILD genmsg-9999.ebuild 463 BLAKE2B f5f2c1d769f56c46bdbc8c8f2c35d3c5336813b913d2e5ebcf22f5f1f6f59818a641afe3d3eea9f4b4f477cfe45479f402c59c8de8fc90e92d681e5262874887 SHA512 4028a15840348c1c377ab017b790a5f75c94f676a00d173dfd449221adc0fdb9a2e2166d85b2cd098474efdd049c5367371ecc657e47c989abda6e379d6d27d5
 MISC metadata.xml 324 BLAKE2B 4e885cafaf86dab897c52a6e27092584252b7daff9d9597c0bfd45b148b91ec763c3e46abbeb3db64fb5d17fc2d1ff83cf252201c165a3b52bc5e4d4033abcc6 SHA512 be0ee3a5595270480a29bf98888215b692009bdfaf06591c3cd56196b1c437e847abac787d4304f0166e76525b5ca7d82d81f660f1309a5139081bd205d95939
diff --git a/dev-ros/genmsg/genmsg-0.5.10.ebuild b/dev-ros/genmsg/genmsg-0.5.12.ebuild
index b4480e2c242a..b4480e2c242a 100644
--- a/dev-ros/genmsg/genmsg-0.5.10.ebuild
+++ b/dev-ros/genmsg/genmsg-0.5.12.ebuild
diff --git a/dev-ros/genmsg/genmsg-0.5.9.ebuild b/dev-ros/genmsg/genmsg-0.5.9.ebuild
deleted file mode 100644
index b4480e2c242a..000000000000
--- a/dev-ros/genmsg/genmsg-0.5.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/genmsg"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Python library for generating ROS message and service data structures for various languages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/genpy/Manifest b/dev-ros/genpy/Manifest
index 7001241e4524..401798602fe6 100644
--- a/dev-ros/genpy/Manifest
+++ b/dev-ros/genpy/Manifest
@@ -1,4 +1,6 @@
 DIST genpy-0.6.7.tar.gz 52001 BLAKE2B 6c2a6cbbac6b0c72b1d5bec160f2f06ac86852afa2664835a4223e5adc5df6ae13a3a506d1c684f39f1066094f437fc54e4deb927c9e58209231af599b70af77 SHA512 645db3b343d53a640c6cbae91ec178bb99249899632b88f54831a524c2c3d76a68c8e45e2820b536509eb3d84a37735f9a3cd04f46522a98748a38534cc9d6b8
+DIST genpy-0.6.8.tar.gz 52344 BLAKE2B 1b58011126d577c7c16c0b37940d491f18e9a1013296b873dfa6e53697c2b6a3e7a829b760e591b3fa502a5fd53461256547212483cd13e27f476e0a16e8121a SHA512 5de1bea04a08c4fa72ae369d56c0f4b6a0106f7317490bc9c9c65c4506028f4aa44cb149d85d270c85c72ce5847db9110e7d48a1a4331a7d588222647f3dfc5f
 EBUILD genpy-0.6.7.ebuild 529 BLAKE2B 909649e8b561b751f4cbd7c7a8bffa7a6d80f6ea582485287b7bfdb275b8f57686d3f4e0fb182b2782a43e07fca7ebbab1e40d11c1df0486543178bf553b63c5 SHA512 577bd8eba4224de58d9ced4e0e5838a1fe2e99b93c556601ea457ad61e4f3f0dd8d4c888042bd6ab373ea6d0adc28d390ae685a4966a72c5135f0c8c5b81569d
+EBUILD genpy-0.6.8.ebuild 529 BLAKE2B 909649e8b561b751f4cbd7c7a8bffa7a6d80f6ea582485287b7bfdb275b8f57686d3f4e0fb182b2782a43e07fca7ebbab1e40d11c1df0486543178bf553b63c5 SHA512 577bd8eba4224de58d9ced4e0e5838a1fe2e99b93c556601ea457ad61e4f3f0dd8d4c888042bd6ab373ea6d0adc28d390ae685a4966a72c5135f0c8c5b81569d
 EBUILD genpy-9999.ebuild 529 BLAKE2B 909649e8b561b751f4cbd7c7a8bffa7a6d80f6ea582485287b7bfdb275b8f57686d3f4e0fb182b2782a43e07fca7ebbab1e40d11c1df0486543178bf553b63c5 SHA512 577bd8eba4224de58d9ced4e0e5838a1fe2e99b93c556601ea457ad61e4f3f0dd8d4c888042bd6ab373ea6d0adc28d390ae685a4966a72c5135f0c8c5b81569d
 MISC metadata.xml 323 BLAKE2B 025145a67d18622d14ea6ac43585246aac2cdc4f65e63b04dbfd32aa6f04f4e301e22f2e326a486e2fad3c1ef82f9890179a8dc142f4aa551b5b9db155e616da SHA512 523ec83e710fb0b80d731b536c8605a4211bfa176951a1af5ee6f6e60fee1ca3634c0d659b2d3ae71f3bb9d3765cc44cfdada5c7a364cea63f323c462227f364
diff --git a/dev-ros/genpy/genpy-0.6.8.ebuild b/dev-ros/genpy/genpy-0.6.8.ebuild
new file mode 100644
index 000000000000..e4a330326fa0
--- /dev/null
+++ b/dev-ros/genpy/genpy-0.6.8.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/genpy"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+
+inherit ros-catkin
+
+DESCRIPTION="Python ROS message and service generators"
+HOMEPAGE="http://wiki.ros.org/genpy"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/gmapping/Manifest b/dev-ros/gmapping/Manifest
index 8f539baa8058..da87d350f1d1 100644
--- a/dev-ros/gmapping/Manifest
+++ b/dev-ros/gmapping/Manifest
@@ -1,4 +1,7 @@
+AUX boost170.patch 428 BLAKE2B 047a099ab5a36f3f603ecc10b5cf1e0edb25c880bf1ade298dfcfef7864bb9c445f2f0902299857003d8e32dcf7612ad149a70364fb6fa64fa86b84b620b346b SHA512 e9a2bb68993387b4ac6268d15151a4feedf1c6f73c84ee927590220edc1b826e18355fa3553d3605ca1afabd5b7b74b7e8c242797965b17fa9aa7449b406c493
 DIST slam_gmapping-1.3.10.tar.gz 21032 BLAKE2B cca0779e64d45622dad4ec29cb3c1d0162176038288c0aa7b117f1a76a7655f3af3024dba7ff1025948e400e0176794a553e357a235187d9196161a635ab6d01 SHA512 fa4485ddc9fcfaac63a63d209a5a994e33e78546a39edcf47eb3c3f1775f0d87a1f562319058868838990bbf85a9515ff0228779dce7531148f208b3522e7e7a
+DIST slam_gmapping-1.4.0.tar.gz 21123 BLAKE2B 088d1bfaa69bf98eb2b2176afbfadf843f5f478f9c54dc7eb32fa91116da31bab66f9a1ac09d0535629cc5a7f604d153c90c5a25f173fb867369aa9e33d4d7b2 SHA512 ae7984716113e24e1bced88523729481829303a2b88d247b8fc8bdd23c0f38b4ce6260d7086d79a6653ecfdbe8ba60ae011af20180ffcb5025cd9d347d3e76b1
 EBUILD gmapping-1.3.10.ebuild 546 BLAKE2B 9a6c5e78a43ba77c86dd2a1640ef56bcd2f481a830c3333ab4b87f84f4c761c8728e811e5e314b5eed9809e987fd2b8a0a72aaf58b62f6c4dea561d2101682ad SHA512 41823e5fad9201ca764d2a22af8de2c88b19e449f8d2fec8682a5d21381e35f29a17b729d3b5cc5faacd50057fe5e69b110f7756b414b859528656bea3a963b8
-EBUILD gmapping-9999.ebuild 546 BLAKE2B 9a6c5e78a43ba77c86dd2a1640ef56bcd2f481a830c3333ab4b87f84f4c761c8728e811e5e314b5eed9809e987fd2b8a0a72aaf58b62f6c4dea561d2101682ad SHA512 41823e5fad9201ca764d2a22af8de2c88b19e449f8d2fec8682a5d21381e35f29a17b729d3b5cc5faacd50057fe5e69b110f7756b414b859528656bea3a963b8
+EBUILD gmapping-1.4.0.ebuild 572 BLAKE2B d57a0f72d1343457fef74a3da8cd76103526209a99a2ab4ebcf815672ed387aa4d6504068f3da6d3441e6e51147565a0c200ab9ba109e54d6b77a3bd0d86f260 SHA512 b64efeb32bc2b14c13a3e898358a8ed7094e1d7bbc201333ac850794583a4c309ddaa61229fc2d99f67a4b8e55879ab0ec256e82b4223f9fcf8fc2dd389abe8a
+EBUILD gmapping-9999.ebuild 531 BLAKE2B 3674f6396da0e8f9dc6b0bbb16e5d627678b02a03807775f54fc7f26910cfe918b00445b780918b74ade87a304543b632c08580cc205aba1e5ab5bceb0b3f260 SHA512 019a01e8efeb054beaa804025619988c5b42ea220621c27b57deb0da4069aa3a964f10f897aa255bf09ffb7be07a3177d305bd7e747c0ec769769ddabc7d475c
 MISC metadata.xml 342 BLAKE2B 72a1fe4f1e7971418dbb3f5b1e78de71a77819b9fa7200feb2ce0abec5b50a5435c5e5541d290bfd23c7acee5a6920280934067c84e4716bd9f6bb0cc634544d SHA512 2a5beef664e8c79b9e4d858d0dc093068c6e462456ae6066ea637f4b725e5c7184dd65769906c34e55eb6b03949e957edba34b84a587e1daec784e1f74ea287c
diff --git a/dev-ros/gmapping/files/boost170.patch b/dev-ros/gmapping/files/boost170.patch
new file mode 100644
index 000000000000..e3a599471991
--- /dev/null
+++ b/dev-ros/gmapping/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: gmapping/CMakeLists.txt
+===================================================================
+--- gmapping.orig/CMakeLists.txt
++++ gmapping/CMakeLists.txt
+@@ -3,7 +3,7 @@ project(gmapping)
+ 
+ find_package(catkin REQUIRED nav_msgs nodelet openslam_gmapping roscpp tf rosbag_storage)
+ 
+-find_package(Boost REQUIRED signals)
++find_package(Boost REQUIRED)
+ 
+ include_directories(${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
+ 
diff --git a/dev-ros/gmapping/gmapping-1.4.0.ebuild b/dev-ros/gmapping/gmapping-1.4.0.ebuild
new file mode 100644
index 000000000000..aaad570edc05
--- /dev/null
+++ b/dev-ros/gmapping/gmapping-1.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/openslam_gmapping
+	dev-ros/rosbag_storage
+	dev-ros/gmapping
+"
+DEPEND="${RDEPEND}
+	dev-ros/rostest"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/gmapping/gmapping-9999.ebuild b/dev-ros/gmapping/gmapping-9999.ebuild
index ca6f43afe50c..307f03f929b1 100644
--- a/dev-ros/gmapping/gmapping-9999.ebuild
+++ b/dev-ros/gmapping/gmapping-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=5
@@ -9,7 +9,7 @@ ROS_SUBDIR=${PN}
 inherit ros-catkin
 
 DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="CC-BY-NC-SA-2.5"
+LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ros/hardware_interface/Manifest b/dev-ros/hardware_interface/Manifest
index 3fdf719f2c37..b776cfe91324 100644
--- a/dev-ros/hardware_interface/Manifest
+++ b/dev-ros/hardware_interface/Manifest
@@ -1,8 +1,4 @@
-DIST ros_control-0.14.2.tar.gz 655686 BLAKE2B e3cf0ce87c8d5324f202c1e15ece973b004d7719e30577a5661c478278826da715cd2d54f62d6def0e447d7d7ec26c3d4f4c7b2fd3c548bff960a6bdf0258fa4 SHA512 8368ae786ca0621fc560f6bc32e754757da0f3e4594039425047d3370c5c55a4a2836dc220452d47df49df1e609d79de976c0fe45d83bd62cff64fd5549f993b
-DIST ros_control-0.15.0.tar.gz 657854 BLAKE2B 102c17265df13d4454249f9752491664d9c8d4354c417e99aaf7845fbea2992fbfde674e22e8415e4b55274aba6964473cc6663c0784f78cf7bb87fc232d5c30 SHA512 be1b208631a3018f06384bf342f6d909b082d48e5509bb2bdac1ce04eddad56ac83f8cf5c10a0c66650c2c7defa04680950bf5417723e2f8551055051c4fcc99
 DIST ros_control-0.15.1.tar.gz 658048 BLAKE2B f3576199e2f0ff4314088e58d773014f115628381edbcd1e38e11b5c154a1c54d8802bc367c3a32c64c3e1c664f04ae136c69cb6fa1905d444798dcd7110a51b SHA512 1d65a3e0baf427507269b0588c2d16cf8a8463d72bbc84b7158ebbbce749d7c01a497ed74a6cbbae6b4c0557dabd9e8057803199853d21d2e24e2ec602e912b8
-EBUILD hardware_interface-0.14.2.ebuild 376 BLAKE2B 18e8430dde17dbc3210d2f2ab48b7eabf3a99759bf8188987eb3fe940f74c6f750469d5d44fa0f48c2322ac3cd098a970ddf055e462ffa412ea6b775961bbbcc SHA512 afdcab1d054715913d893114e875cbda28d221a223071fd07e51c203dfe7a7530ef51aa21262868e4c3f4c9cb5da19f416799a9587885ebe063280fd4626a67f
-EBUILD hardware_interface-0.15.0.ebuild 376 BLAKE2B 18e8430dde17dbc3210d2f2ab48b7eabf3a99759bf8188987eb3fe940f74c6f750469d5d44fa0f48c2322ac3cd098a970ddf055e462ffa412ea6b775961bbbcc SHA512 afdcab1d054715913d893114e875cbda28d221a223071fd07e51c203dfe7a7530ef51aa21262868e4c3f4c9cb5da19f416799a9587885ebe063280fd4626a67f
-EBUILD hardware_interface-0.15.1.ebuild 373 BLAKE2B c4797e08466c4708cfea0d9c81a1c39d50cb144f1d82f042ee32fd7358aa2d0997ea2560057c518fbfeb9e18f6308ff4b4b4f945b65055bf6fd8afa422e4162d SHA512 4d683b44c185383dd1aa364d3fb8385af95fb419a79117137f7496b0f3b53c064708041801aed5a4b90ac4196794b038586d647e0d3c0457af0005272232c6a9
-EBUILD hardware_interface-9999.ebuild 376 BLAKE2B 401acb59d859e1d03c60ba7d0772aeb714aac13bdf14b78b833c1ea09aa4e71cab66f89db6476f95749dd19482837de44fcb0f7902d7e237ee2c1a425c42b152 SHA512 c3b42b40faeaf538720e8b3075217a3e251d14e72f8f19895b3a7d47bf1f1ef06d69be1d73586126fa637fbad2b8dfe33aefe28cebaf38074983a3e9de853a6d
+EBUILD hardware_interface-0.15.1.ebuild 389 BLAKE2B ea9053d0704382f430d5f292b6e85bfbca99f4195300bfe08c2367533c79115207af69b881110c13ecd8c01f1bcef9c4d3bf77eb81b77c322ab610488c38db23 SHA512 e1435146e9df259f3d9442a6cd429a685f422a3f854e07a32e6f0092a7e368b04d3cd47286ef70fc869d0ab24d13b8b6e52f953b119e85027337629f831547bf
+EBUILD hardware_interface-9999.ebuild 389 BLAKE2B ea9053d0704382f430d5f292b6e85bfbca99f4195300bfe08c2367533c79115207af69b881110c13ecd8c01f1bcef9c4d3bf77eb81b77c322ab610488c38db23 SHA512 e1435146e9df259f3d9442a6cd429a685f422a3f854e07a32e6f0092a7e368b04d3cd47286ef70fc869d0ab24d13b8b6e52f953b119e85027337629f831547bf
 MISC metadata.xml 338 BLAKE2B 3206fecd7746b95f57f5e5a56f0098ba6879e09516fa13e01211fdab39b4917ebf9d3c95fc97f2e73b2bec2036b6f747581ed85f19b7cc4156fd94f186689a1a SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10
diff --git a/dev-ros/hardware_interface/hardware_interface-0.14.2.ebuild b/dev-ros/hardware_interface/hardware_interface-0.14.2.ebuild
deleted file mode 100644
index eaae5e2ef40b..000000000000
--- a/dev-ros/hardware_interface/hardware_interface-0.14.2.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
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Hardware Interface base class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/hardware_interface/hardware_interface-0.15.0.ebuild b/dev-ros/hardware_interface/hardware_interface-0.15.0.ebuild
deleted file mode 100644
index eaae5e2ef40b..000000000000
--- a/dev-ros/hardware_interface/hardware_interface-0.15.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
-ROS_REPO_URI="https://github.com/ros-controls/ros_control"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Hardware Interface base class"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roscpp"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild b/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild
index 474b9e3bcba2..a2893f32df40 100644
--- a/dev-ros/hardware_interface/hardware_interface-0.15.1.ebuild
+++ b/dev-ros/hardware_interface/hardware_interface-0.15.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
@@ -15,4 +15,4 @@ IUSE=""
 
 RDEPEND="dev-ros/roscpp"
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
+	test? ( dev-cpp/gtest dev-ros/rostest )"
diff --git a/dev-ros/hardware_interface/hardware_interface-9999.ebuild b/dev-ros/hardware_interface/hardware_interface-9999.ebuild
index b9af97a138ee..a2893f32df40 100644
--- a/dev-ros/hardware_interface/hardware_interface-9999.ebuild
+++ b/dev-ros/hardware_interface/hardware_interface-9999.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
@@ -15,4 +15,4 @@ IUSE=""
 
 RDEPEND="dev-ros/roscpp"
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
+	test? ( dev-cpp/gtest dev-ros/rostest )"
diff --git a/dev-ros/hector_mapping/Manifest b/dev-ros/hector_mapping/Manifest
index 1e07aafc1c17..2992de9716ee 100644
--- a/dev-ros/hector_mapping/Manifest
+++ b/dev-ros/hector_mapping/Manifest
@@ -1,4 +1,5 @@
+AUX boost170.patch 631 BLAKE2B 9b1d25a62617b44e6a6f81b4f281ff9331051b242698cc9ae4864237b5a7d18e77298a7f00927a1215982dbec91bb9279878cd5805233d16b9f94caab1db4ab5 SHA512 f61c0def48c65577eace4e2c4bf49b5540f74beb1f54e34f4f75df82325cf0446928e664ce3256205591bac877ae65b371348948e6eea4013a3627b83e97bcdd
 DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-EBUILD hector_mapping-0.3.5.ebuild 708 BLAKE2B 208fb91376f6c91beccbe330dfa28112f5017bf83f7ac5c39231bbf85e5a26430fa72e32608bcfb3bc14e81ef77f4ffeb9498d13da55f44a2c80729009250f87 SHA512 d5ce8cb9c597f1e0848423d6f3dfff16bf1a093bdfe06757d69bea9186cfbc21de60fad3cb814e8ec52045d7b02097e745a7c81626a43aaf8eaa3e77a0be0ed2
+EBUILD hector_mapping-0.3.5.ebuild 749 BLAKE2B f65010124e6564265f95eb3a54ebacd4ef2e684f05c3c87fb30fd7ad07fa9968c4d93864065da116be990c1ba1878cf7d23cb1f6d6b63a303cbecf7c522f4bb4 SHA512 018c0e845e93f747e4928105344ba8f05e47fe713a26b40eabe6e44049acd5da2dfba18edd01816f3545137e41f47c69bbe4312632da9e536db74ea2d2fe6b6c
 EBUILD hector_mapping-9999.ebuild 708 BLAKE2B 208fb91376f6c91beccbe330dfa28112f5017bf83f7ac5c39231bbf85e5a26430fa72e32608bcfb3bc14e81ef77f4ffeb9498d13da55f44a2c80729009250f87 SHA512 d5ce8cb9c597f1e0848423d6f3dfff16bf1a093bdfe06757d69bea9186cfbc21de60fad3cb814e8ec52045d7b02097e745a7c81626a43aaf8eaa3e77a0be0ed2
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_mapping/files/boost170.patch b/dev-ros/hector_mapping/files/boost170.patch
new file mode 100644
index 000000000000..89bc05d2f7da
--- /dev/null
+++ b/dev-ros/hector_mapping/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: hector_mapping/CMakeLists.txt
+===================================================================
+--- hector_mapping.orig/CMakeLists.txt
++++ hector_mapping/CMakeLists.txt
+@@ -7,7 +7,7 @@ project(hector_mapping)
+ find_package(catkin REQUIRED COMPONENTS roscpp nav_msgs visualization_msgs tf message_filters laser_geometry tf_conversions message_generation)
+ 
+ ## System dependencies are found with CMake's conventions
+-find_package(Boost REQUIRED COMPONENTS thread signals)
++find_package(Boost REQUIRED COMPONENTS thread)
+ include_directories(${Boost_INCLUDE_DIRS})
+ 
+ # Find Eigen3 (from http://wiki.ros.org/jade/Migration)
diff --git a/dev-ros/hector_mapping/hector_mapping-0.3.5.ebuild b/dev-ros/hector_mapping/hector_mapping-0.3.5.ebuild
index 4e49dd7e8a0e..fbcf32d16868 100644
--- a/dev-ros/hector_mapping/hector_mapping-0.3.5.ebuild
+++ b/dev-ros/hector_mapping/hector_mapping-0.3.5.ebuild
@@ -26,3 +26,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-cpp/eigen:3"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/image_cb_detector/Manifest b/dev-ros/image_cb_detector/Manifest
index de4f43b1f7d0..2bbc98ad1426 100644
--- a/dev-ros/image_cb_detector/Manifest
+++ b/dev-ros/image_cb_detector/Manifest
@@ -1,6 +1,7 @@
+AUX boost170.patch 551 BLAKE2B c98a11a8faa4c22d78e991bfa911b13bcf66fe3b8b8be2efce6ba723eb1a2226de9d73186c05073bf6b12f360a160f9fe00fe24f8c9e71120abbc58252d02a6b SHA512 e75225d990f7c56522b244f95bf812df565394a3a586b4d71032fb164ae77f351f43ed27af29aa4aed0f40e4ec613600f16a10281f47223b5cf65b2860df7777
 AUX c11.patch 587 BLAKE2B 2cf07b3b5eebf9840bd45aa419283cc53e03dc45c5cf4eab6cd5894143983c7cb05146c9242c91ac105c90bba8d878ff8da4776629f04fc3f32b5290aa59fd87 SHA512 1ae09e987fb231400594019832f8a6d42ca1ebd07eafaca151d08812d8a4b62f95d4fadac0227c96d115c69da24bc3889f7d30af27000347ee000a937ae2b498
 AUX gcc6.patch 495 BLAKE2B 50ac60a74148e3e32b2a69750cad6d98ce2ecef22ed4462431821075f6e247290e28b8d57b58b4b86a7cb9600988a8e22ea2aa5508da6dd6ac85a93aac197ad1 SHA512 5b99edada624eabd4830997677ebb4916c6a9a3c631eead6ae723985e3ce5a0f3b77c484777182a34e727dba869181d11002ba38cfb49cf20eb0832aca67f6bb
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD image_cb_detector-0.10.14-r1.ebuild 933 BLAKE2B afb1d6def81a9a3ca97bb1beefbf761626ca7a671268bb41f5fe7ef56c86a02028143f34a0d95ad82fb461181a9458aa9f13e38b77ddfa5e48c25ed2d3ed5357 SHA512 a74f31fc57efb8c52cc67127f694cf1776257773b2b575cb3786ede25618453980c0688bf519bf63e34947e31ca3fbb24703dc7e5506e6962f1bd4999d2756a9
+EBUILD image_cb_detector-0.10.14-r1.ebuild 959 BLAKE2B 13f8864e7892b30be430d1c3f5b9753a049ad9cb9fb61dcef6eb9bb6578a5687c0eb5724f9727455b463e7becd0d10e49e49e72246974f6f8eedba63c36ba07c SHA512 0e4bacf6310c9bd1c7fec693b39570ef1a8ef004a11769a5f83a5520f23cd101f6d152b38890008c83f60139bfb36dd1d7b48e97ba96b84115c057a02ae96e44
 EBUILD image_cb_detector-9999.ebuild 933 BLAKE2B afb1d6def81a9a3ca97bb1beefbf761626ca7a671268bb41f5fe7ef56c86a02028143f34a0d95ad82fb461181a9458aa9f13e38b77ddfa5e48c25ed2d3ed5357 SHA512 a74f31fc57efb8c52cc67127f694cf1776257773b2b575cb3786ede25618453980c0688bf519bf63e34947e31ca3fbb24703dc7e5506e6962f1bd4999d2756a9
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/image_cb_detector/files/boost170.patch b/dev-ros/image_cb_detector/files/boost170.patch
new file mode 100644
index 000000000000..f8ae562dadc5
--- /dev/null
+++ b/dev-ros/image_cb_detector/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: image_cb_detector/CMakeLists.txt
+===================================================================
+--- image_cb_detector.orig/CMakeLists.txt
++++ image_cb_detector/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 2.8.3)
+ project(image_cb_detector)
+ 
+-find_package(Boost REQUIRED thread signals)
++find_package(Boost REQUIRED thread)
+ find_package(catkin REQUIRED actionlib actionlib_msgs calibration_msgs cv_bridge genmsg geometry_msgs image_transport message_filters roscpp sensor_msgs std_msgs)
+ find_package(OpenCV REQUIRED)
+ 
diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
index 8b96da0e6b06..2502c78f860a 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-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
@@ -29,4 +29,4 @@ RDEPEND="
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/image_view/Manifest b/dev-ros/image_view/Manifest
index 50378f002836..138608fafb2d 100644
--- a/dev-ros/image_view/Manifest
+++ b/dev-ros/image_view/Manifest
@@ -1,6 +1,5 @@
-DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
+AUX boost170.patch 513 BLAKE2B c78a511ebf9ec506d75ba5ad639932321ff5542d5812db3e7b448765aff92c9b3e75f299c0ef15626cd5bbd6a34acee9efe202dc2f38dc20478b3f8e2f6b2577 SHA512 15c4024d4de848e06b47d845dd33758cac44c1e2c07982749a523a7d8d852921fff1306aa105f65df6d5152a09e974a0cfb8c1f70859cc415f51b1e1ec9e2b79
 DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
-EBUILD image_view-1.12.22-r1.ebuild 794 BLAKE2B 90e70f23cb4ad8c7430293bb2499acdcc35a64f5a9b605e1d96cd4e754a3d16741a190a7b1c989d8e1fc8d12507308227887eacb5e0e9663ad3e58c82ec8bfe4 SHA512 bdd6d9362267653cbd80ea6c8dd6a98b8c7eeb3b4908e270af5109d7c36ffb8a6eed7012314f52b05cafbc0c1fcb27d4f9ff3a3742faf7d408f0ce3a6c04b19f
-EBUILD image_view-1.12.23.ebuild 794 BLAKE2B b110f344132d47cdf515fadfdabb4d194c621ebe5b5aa6af9bd618e77a5b8ed57e9d3c616d4379c62a6bd21300b241e9305ba3b8e67ce20b2b2c22d5a52f7643 SHA512 9c8802246ef3e980f7111f16214ef251e62fc2b093c4e2ca8397c3fbb23ed360ff8b463fbf19947c445e0b039e2e3f91ae5c8350aa9fd0e2e190b568e5e3b7ea
-EBUILD image_view-9999.ebuild 794 BLAKE2B 90e70f23cb4ad8c7430293bb2499acdcc35a64f5a9b605e1d96cd4e754a3d16741a190a7b1c989d8e1fc8d12507308227887eacb5e0e9663ad3e58c82ec8bfe4 SHA512 bdd6d9362267653cbd80ea6c8dd6a98b8c7eeb3b4908e270af5109d7c36ffb8a6eed7012314f52b05cafbc0c1fcb27d4f9ff3a3742faf7d408f0ce3a6c04b19f
+EBUILD image_view-1.12.23.ebuild 879 BLAKE2B fa54faf98131e0639ebfb8b375c3e6d09b7765ec108cdba4a91adfbc20a74a6dc9053d4b09f306329d0f97a675c347ef2363480508bee8e84869221b3c60d002 SHA512 f5ae3c9cdd3297cdea49c0a9ad6083e547bfc4327360e362001a044e26b9fed332465ececc8a3f2ff6c1b63092a65b17b6267274db7c55cbdc10bd5ec182754e
+EBUILD image_view-9999.ebuild 838 BLAKE2B bea07f7d3bd91a3065f787a854916581e51fd718d33138828ed33a774e80b7c488deafd64899ce56ad69bd631ebdd3b6abdbb018dbc2ada14c7eaefd6b472032 SHA512 2673f92cba702ef2c199f873d64c3e38bc7f0a957e7988fdd4a32bb83cb2fc05ec34313b03ae194ee44975d782b4f93c9eeb6c2cfdeaa03e14583b982a4d0a83
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_view/files/boost170.patch b/dev-ros/image_view/files/boost170.patch
new file mode 100644
index 000000000000..ab52d89c5fad
--- /dev/null
+++ b/dev-ros/image_view/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: image_view/CMakeLists.txt
+===================================================================
+--- image_view.orig/CMakeLists.txt
++++ image_view/CMakeLists.txt
+@@ -5,7 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
+ generate_dynamic_reconfigure_options(cfg/ImageView.cfg)
+ 
+ catkin_package(CATKIN_DEPENDS dynamic_reconfigure)
+-find_package(Boost REQUIRED COMPONENTS signals thread)
++find_package(Boost REQUIRED COMPONENTS thread)
+ find_package(OpenCV REQUIRED)
+ 
+ include_directories(${Boost_INCLUDE_DIRS}
diff --git a/dev-ros/image_view/image_view-1.12.22-r1.ebuild b/dev-ros/image_view/image_view-1.12.22-r1.ebuild
deleted file mode 100644
index 9b9820cf2699..000000000000
--- a/dev-ros/image_view/image_view-1.12.22-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Simple viewer for ROS image topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/opencv:=
-	x11-libs/gtk+:2
-	dev-ros/camera_calibration_parsers
-	>=dev-ros/cv_bridge-1.11.10
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_view/image_view-1.12.23.ebuild b/dev-ros/image_view/image_view-1.12.23.ebuild
index 6835689f080e..b7c4e715c9e9 100644
--- a/dev-ros/image_view/image_view-1.12.23.ebuild
+++ b/dev-ros/image_view/image_view-1.12.23.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
@@ -29,5 +29,7 @@ RDEPEND="
 	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/image_view/image_view-9999.ebuild b/dev-ros/image_view/image_view-9999.ebuild
index 9b9820cf2699..b9c0dff05bac 100644
--- a/dev-ros/image_view/image_view-9999.ebuild
+++ b/dev-ros/image_view/image_view-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=5
@@ -29,5 +29,6 @@ RDEPEND="
 	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_filter_madgwick/Manifest b/dev-ros/imu_filter_madgwick/Manifest
index d8fb3cc5ccfc..04f00fa55599 100644
--- a/dev-ros/imu_filter_madgwick/Manifest
+++ b/dev-ros/imu_filter_madgwick/Manifest
@@ -1,9 +1,5 @@
-AUX pluginlib.patch 498 BLAKE2B 923d0288c75d969156cc5825c624e041821492c0d767873685ca8d479759cc1ded1d30cb22091b45066a8ea57fb2abcccc5acd852bc0f778a203b99760e466f1 SHA512 59e3d0c7e9c7b1dde87e430cee2084afa2c3e443277322c2c21abfe9619392d88d321b90198f03b5e90f8e3d4eb184611c0839ffdb93ca275d6e20db08e4acf5
-DIST imu_tools-1.1.5.tar.gz 1653083 BLAKE2B 8c0e84333455a5b4cae215a2e54b74ff828d00a426b9ab13f4048a72556b6a526dc4256a53dc3e21e098cc31ea6d21e0d508066a4627d01c27681ce0b3b18035 SHA512 5009884852c71d6bb1b6c2be2f30ed333eca2ac6a7f29d02cb8f0821c0b95a33dd3b09049c4c4eeb1416fb0eb5dc454b3c6d36c2c24303f37c0d1d2c0c2d906a
-DIST imu_tools-1.2.0.tar.gz 1653607 BLAKE2B 76cccfeae657188e3be3774bcb19c5edac94e7070a6fd8a01c8a56857297491568f978820e6f32467b031ceece4742e6c0fe926e5d59ad19a2f6fb1c037ac3ec SHA512 3f39a2ec539949a6881cc106122d663706ddd3ed03ed822b9370e56beb56f1349bfd668a71e443ab2b9d525c6a3a88fad053768764160d9d0f04c08ba1ad2f8e
+AUX boost_signals.patch 617 BLAKE2B f7ee39beda0b22eb154e9ada0ded0d015fe7a926c40d57563f4e1619f8d770a305c035edfd222e8b9da9eec7f7fd27f84340d6f3053de654663510af3691342b SHA512 7e21054ab7ca3594f190211c1d55df9fea02552a104d8f382067c18545eafce4f3b17453b64d687d38d993c7cf54e137cf82113e8ddc9dc3f9ef763b269d8c82
 DIST imu_tools-1.2.1.tar.gz 1654279 BLAKE2B 06e3b27708bec09fea448b636f77b1480310483468459496e3748ef786e20e10f67fe25aba3c2d128221e42762e70fa98eedeeb79185247c47388c71120ed166 SHA512 8bd7f817df4e564d255fd5820dcbc6dd8ffa762d1b32111ed2f8d9cc258096cba1f9602260f020860fe2988eb1412c6d0598de08e4cd79ede56a40d1371d1ff0
-EBUILD imu_filter_madgwick-1.1.5-r1.ebuild 797 BLAKE2B c561d840818d5aee7e61a14c076b402c83ab97ec0d6b9f671129723cc4e86f57e953e9ccbbeba362291cbf1b1561990515dcb7f1768813d0f29739117352ee14 SHA512 ab75f6871c652b1852abb67a6f633faf6048782e0924d00ae48ea2bcc6c116c13b1a6dc6cd2aed51ff554b83a9332c933d94b1a0b46e06638dc9bef46d4dfda8
-EBUILD imu_filter_madgwick-1.2.0.ebuild 755 BLAKE2B d9db5fb169aba977dbe2c7b6d67c050938e72bee39137503c79cea7a110aa7d3ab1e66e781e38636113adb2c6b590dd7bbe3ecdec3fb1ea83db96b6116cd38e5 SHA512 88428a38e0ebeefab1df6d2057b808e04b7d6ba88c430934d1cf6aed0f076f5045c227ef17cf4eabd068e3036d775e43b6ecbe21a0fad4cef0e6044607b0c6e2
-EBUILD imu_filter_madgwick-1.2.1.ebuild 752 BLAKE2B 6ee196807033632b04c62bd8206dda394f69087f0cf0142fba1b72fc1e0cfff0b28cb8fcf661ea9e2e96fbc076ddc7a944100bec7975efae77176b107733533a SHA512 03b527ecf188ce715b2c3f3cb851738faf5e9123e08eb6152921d9a12ba651b88ff963c22e4258a87ad2002640172fe401e74126561fa7686418dbbed1a6c406
-EBUILD imu_filter_madgwick-9999.ebuild 755 BLAKE2B dea2ac8e4c97538fddf1d11eb038196677a469352bca4b9a994ff6d4aa05e5471e036ae93e7c303340c1a5f412b49246d193c4804667f9a6e6a5427909a28991 SHA512 fca79c2a9a0308ed99c5c2acde0a66285dfd08ba60cdc974df9a0dfac864ee6999902b321fb6b21de1989358527e578e778b181fb41868c38c4b6f83244bc2e5
+EBUILD imu_filter_madgwick-1.2.1.ebuild 798 BLAKE2B 53a0f91afd1285fc0ef66e8e17382acdaf0d9d2526c127d050540b3a86a52bb8205a3eb9c3d37f8449986b9036c56bf7917702909f317e76247b11889cc92c6c SHA512 e10214a59ac79a47b5e739570188f54fb27740f50f6b9e1d3e2e7a997a6712489068f8dc0f38fdaf73b236b6884e8ed61a57e74da9d46ba4c978a581edf077e6
+EBUILD imu_filter_madgwick-9999.ebuild 798 BLAKE2B 53a0f91afd1285fc0ef66e8e17382acdaf0d9d2526c127d050540b3a86a52bb8205a3eb9c3d37f8449986b9036c56bf7917702909f317e76247b11889cc92c6c SHA512 e10214a59ac79a47b5e739570188f54fb27740f50f6b9e1d3e2e7a997a6712489068f8dc0f38fdaf73b236b6884e8ed61a57e74da9d46ba4c978a581edf077e6
 MISC metadata.xml 336 BLAKE2B 9f0036577f511b6a36a278270167ff44a45d958d73979fc5725cd56cc8eb6dc1228e289837c2dfbcd2a23af9679f9f633c9256315850ee734ec651fcce3a8e1e SHA512 12de24345100b9c879928c76d15db9215d340f68854ba09f5ff57b043ec90c2c0ef8bda03d9dc306141cb7d653601a9a3155224d60030284cff4242f7ddc07aa
diff --git a/dev-ros/imu_filter_madgwick/files/boost_signals.patch b/dev-ros/imu_filter_madgwick/files/boost_signals.patch
new file mode 100644
index 000000000000..75d3130d9765
--- /dev/null
+++ b/dev-ros/imu_filter_madgwick/files/boost_signals.patch
@@ -0,0 +1,13 @@
+Index: imu_filter_madgwick/CMakeLists.txt
+===================================================================
+--- imu_filter_madgwick.orig/CMakeLists.txt
++++ imu_filter_madgwick/CMakeLists.txt
+@@ -3,7 +3,7 @@ project(imu_filter_madgwick)
+ 
+ find_package(catkin REQUIRED COMPONENTS roscpp sensor_msgs geometry_msgs tf2 tf2_geometry_msgs tf2_ros nodelet pluginlib message_filters dynamic_reconfigure)
+ 
+-find_package(Boost REQUIRED COMPONENTS system thread signals)
++find_package(Boost REQUIRED COMPONENTS system thread)
+ 
+ # Generate dynamic parameters
+ generate_dynamic_reconfigure_options(cfg/ImuFilterMadgwick.cfg)
diff --git a/dev-ros/imu_filter_madgwick/files/pluginlib.patch b/dev-ros/imu_filter_madgwick/files/pluginlib.patch
deleted file mode 100644
index 26e77bb3ffcf..000000000000
--- a/dev-ros/imu_filter_madgwick/files/pluginlib.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: imu_filter_madgwick/src/imu_filter_nodelet.cpp
-===================================================================
---- imu_filter_madgwick.orig/src/imu_filter_nodelet.cpp
-+++ imu_filter_madgwick/src/imu_filter_nodelet.cpp
-@@ -36,4 +36,4 @@ void ImuFilterNodelet::onInit()
-   filter_.reset(new ImuFilterRos(nh, nh_private));
- }
- 
--PLUGINLIB_DECLARE_CLASS(imu_filter_madgwick, ImuFilterNodelet, ImuFilterNodelet, nodelet::Nodelet);
-+PLUGINLIB_EXPORT_CLASS(ImuFilterNodelet, nodelet::Nodelet);
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.1.5-r1.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.1.5-r1.ebuild
deleted file mode 100644
index 8d3eedf16d3f..000000000000
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-ros/tf2_ros
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/pluginlib
-	dev-ros/message_filters
-	dev-ros/dynamic_reconfigure
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosunit )
-"
-PATCHES=( "${FILESDIR}/pluginlib.patch" )
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.0.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.0.ebuild
deleted file mode 100644
index 1594d52649aa..000000000000
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ccny-ros-pkg/imu_tools"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-ros/tf2_ros
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/pluginlib
-	dev-ros/message_filters
-	dev-ros/dynamic_reconfigure
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rosunit )
-"
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild
index 1292030f59aa..44fb87672c7d 100644
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.1.ebuild
@@ -31,3 +31,4 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rosunit )
 "
+PATCHES=( "${FILESDIR}/boost_signals.patch" )
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
index d66fb87d71cd..44fb87672c7d 100644
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-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=5
@@ -31,3 +31,4 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rosunit )
 "
+PATCHES=( "${FILESDIR}/boost_signals.patch" )
diff --git a/dev-ros/interactive_marker_tutorials/Manifest b/dev-ros/interactive_marker_tutorials/Manifest
index 63978c407293..b6cd092ee51e 100644
--- a/dev-ros/interactive_marker_tutorials/Manifest
+++ b/dev-ros/interactive_marker_tutorials/Manifest
@@ -1,8 +1,4 @@
-DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
-DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
 DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
-EBUILD interactive_marker_tutorials-0.10.1.ebuild 616 BLAKE2B 72b4d727495dbe33c5fb596eee49474e4eac54f8d4c400a704a58efe364e4634203d102510ab77f2c9716a9f7c28f79127c2399ba05095cacbe9f612eb86dcab SHA512 23efafcbdb9297b028329a3486533e10ed560e5dcc053f397ceac1f16e2052702498346dad522191167bcb26a4141b71922dd5a3d4ce7f4e6a7d11747299dd10
-EBUILD interactive_marker_tutorials-0.10.2.ebuild 616 BLAKE2B 1a0233430e646cee91bd197ba068742de0a91ac963e060d23587e45b4b9e7aab5829bcc36a666367bf1cb50d36159a68d83c35e72499b5affce16c7bd45835d3 SHA512 d4c1167db05ac08c3f44a7fa8c1ecd5df277b045dc5a173a0bd61d6713cda6f5f3f23e7e81d42b537ca8b1acea0e66370f704bcaa5283d508918dec63aa6d7e6
-EBUILD interactive_marker_tutorials-0.10.3.ebuild 616 BLAKE2B 1a0233430e646cee91bd197ba068742de0a91ac963e060d23587e45b4b9e7aab5829bcc36a666367bf1cb50d36159a68d83c35e72499b5affce16c7bd45835d3 SHA512 d4c1167db05ac08c3f44a7fa8c1ecd5df277b045dc5a173a0bd61d6713cda6f5f3f23e7e81d42b537ca8b1acea0e66370f704bcaa5283d508918dec63aa6d7e6
-EBUILD interactive_marker_tutorials-9999.ebuild 616 BLAKE2B 72b4d727495dbe33c5fb596eee49474e4eac54f8d4c400a704a58efe364e4634203d102510ab77f2c9716a9f7c28f79127c2399ba05095cacbe9f612eb86dcab SHA512 23efafcbdb9297b028329a3486533e10ed560e5dcc053f397ceac1f16e2052702498346dad522191167bcb26a4141b71922dd5a3d4ce7f4e6a7d11747299dd10
+EBUILD interactive_marker_tutorials-0.10.3-r1.ebuild 631 BLAKE2B a35e25dd19e6280ba002ea71274d10105f0ed40b43d2aab2a89db0a6c496b1c04068cebc5874533e2f1c6adb7e7dd711f92d2004d0a7b7abf9fae6b869b4104c SHA512 6ca56c0b03b28cfde6aae740c77481ff3b7c9cf4e21de0753f5e6784af4db43563165e369af15ba3c718d525bcbdf86ada545b80da4597fea557f91abb5e1d94
+EBUILD interactive_marker_tutorials-9999.ebuild 631 BLAKE2B a35e25dd19e6280ba002ea71274d10105f0ed40b43d2aab2a89db0a6c496b1c04068cebc5874533e2f1c6adb7e7dd711f92d2004d0a7b7abf9fae6b869b4104c SHA512 6ca56c0b03b28cfde6aae740c77481ff3b7c9cf4e21de0753f5e6784af4db43563165e369af15ba3c718d525bcbdf86ada545b80da4597fea557f91abb5e1d94
 MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.1.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.1.ebuild
deleted file mode 100644
index dcb82f94d3ea..000000000000
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Interactive marker tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/interactive_markers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.2.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.2.ebuild
deleted file mode 100644
index 834526809e25..000000000000
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.2.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
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Interactive marker tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/interactive_markers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3-r1.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3-r1.ebuild
new file mode 100644
index 000000000000..6844281b86eb
--- /dev/null
+++ b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Interactive marker tutorials"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/interactive_markers
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3.ebuild
deleted file mode 100644
index 834526809e25..000000000000
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3.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
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Interactive marker tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/interactive_markers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild
index dcb82f94d3ea..6844281b86eb 100644
--- a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild
+++ b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.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
@@ -21,5 +21,6 @@ RDEPEND="
 	dev-ros/tf[${PYTHON_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/laser_assembler/Manifest b/dev-ros/laser_assembler/Manifest
index ed2fbf5726ce..b4ffa268ad19 100644
--- a/dev-ros/laser_assembler/Manifest
+++ b/dev-ros/laser_assembler/Manifest
@@ -1,8 +1,6 @@
-DIST laser_assembler-1.7.4.tar.gz 22113 BLAKE2B b0b6c7252151fa06a22b55dc62a040b229eb3d55549233931b5d8947629aca91b611c282cfe03b032a4fe718c09c4ecf5a5fa92f1536773dc2b58f8d7e72cc60 SHA512 e6b5c529f3d3c62462da7c319d71ea6ce799af05c09118fddfde7aa0928bff9fdf3237527aa66f33b248be1c35a124d794b7a0ffea920b7e62855c12be91b8ba
-DIST laser_assembler-1.7.5.tar.gz 22140 BLAKE2B 0f9667ac1b2b902e10a36e0b468c7c5ff36b1db7435d70187f53d36ce14cedf261ea03fc61ba465c4dcb170ab2b4b546acdc1055e6045df8333e18886868130f SHA512 822b83ec8eb52c13fd8931108beb22c53c27cdaabce1668a18e7b40805b232575375161f10ebe489a6752d82e81b160070ef027a52f1883e2a558ebf22eb76be
 DIST laser_assembler-1.7.6.tar.gz 22185 BLAKE2B 068c4d64e6de313a1609738880d1fa95b9d6e710e55c7c8d669d7d809955f7cd33a7b50d94abd05a18f5783d8a8b3287df21c7bc9310a6219c42a8c2db0d0561 SHA512 b3df050473a598569a9df796f3e23437604fd24b9bd1500d632c8f2a7fc0c2604063bdf28e5f5bfa5c79efa4f35abf5fb85602769d95935ef262b357e0af2dbb
-EBUILD laser_assembler-1.7.4-r1.ebuild 776 BLAKE2B 923601e1c227a5009744a7abf130d201074aafa9ff6002851a7eef5fe8d083b596ce40197adbee265b840aaa913866839cfebe637ea4fe2703aab3ace6b87b70 SHA512 e652eb8c33fbfe88c9f7417fb1d25488a0bb1faa39f6b126aaf35590caafd00839dfa10ae1d8953d7112a8250068d488a33379568c9a0e0c24ec59a932e6b20e
-EBUILD laser_assembler-1.7.5.ebuild 776 BLAKE2B d2e1adab41eacac6f3adcc8005a95d83271c9033738d0ced2def3e25526a8a756ce62ab4ad8049ef9b13d5218fb54b981af44d1c41be32cb6ec33c0b513b8963 SHA512 73e1eeaf600c1083b84c52cf57c250848298c5095e8e2774d8cd6ed67644a02c97580f269488aa6654ff5ed8d999a880e978fc0d8459fab2a36a846177fdf793
+DIST laser_assembler-1.7.7.tar.gz 22199 BLAKE2B 5ae26ef567149e6f3015cd3188bcc1adb72c09a33f6594658a20f954a500a76ca44f0f87e47dd9ae9a195df120752c4b35564264a1530b75808d8544f9b9162b SHA512 b7eb6f875209f4a692d1a16934196548a607730dd861806cda8a2f4c6a46722a56590148267b635e2bd5ee31e5490d6c533868bed7328a22a365cb1b8c63ddef
 EBUILD laser_assembler-1.7.6.ebuild 773 BLAKE2B 8c902f0232857fa1663031a67513c0c937d6686e1b0d858e74a33168d4874cc31d8b826ffefe6ab4724b914e75738a37244f81e3cc0d8be7d8db2bf02155e771 SHA512 50df22bb4bd666e928c79064ec3a7185ac38969b50da0d238e739de322b4ff632f20a687c0e895494b6cbaf1382e9e3c2e670b0227d32b38f0646340a9e44f49
+EBUILD laser_assembler-1.7.7.ebuild 773 BLAKE2B 8c902f0232857fa1663031a67513c0c937d6686e1b0d858e74a33168d4874cc31d8b826ffefe6ab4724b914e75738a37244f81e3cc0d8be7d8db2bf02155e771 SHA512 50df22bb4bd666e928c79064ec3a7185ac38969b50da0d238e739de322b4ff632f20a687c0e895494b6cbaf1382e9e3c2e670b0227d32b38f0646340a9e44f49
 EBUILD laser_assembler-9999.ebuild 776 BLAKE2B 923601e1c227a5009744a7abf130d201074aafa9ff6002851a7eef5fe8d083b596ce40197adbee265b840aaa913866839cfebe637ea4fe2703aab3ace6b87b70 SHA512 e652eb8c33fbfe88c9f7417fb1d25488a0bb1faa39f6b126aaf35590caafd00839dfa10ae1d8953d7112a8250068d488a33379568c9a0e0c24ec59a932e6b20e
 MISC metadata.xml 344 BLAKE2B 9f0a0af9b8ec8ea7a0e261981de8219df856a612762a2dc6986240610e76d0c1578b071cea0a25aa56e3462d0d871a9f8a117a0902971b6e5640e2511dfc9a8a SHA512 c9746c67ccaf314fa717cdde076e8094d48c7832e8d6e5402ffbaf7829c0205d8bfe281ffbafb4ee5933af5b49a2210d6b1645c07cf0dc2a78b9900230118d45
diff --git a/dev-ros/laser_assembler/laser_assembler-1.7.4-r1.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.4-r1.ebuild
deleted file mode 100644
index b81ead0f3d81..000000000000
--- a/dev-ros/laser_assembler/laser_assembler-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/laser_assembler"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Nodes to assemble point clouds from either LaserScan or PointCloud messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/tf
-	dev-ros/laser_geometry[${PYTHON_USEDEP}]
-	dev-ros/pluginlib
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/filters
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )
-"
diff --git a/dev-ros/laser_assembler/laser_assembler-1.7.5.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.5.ebuild
deleted file mode 100644
index 9ee670fb205b..000000000000
--- a/dev-ros/laser_assembler/laser_assembler-1.7.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/laser_assembler"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Nodes to assemble point clouds from either LaserScan or PointCloud messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/tf
-	dev-ros/laser_geometry[${PYTHON_USEDEP}]
-	dev-ros/pluginlib
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/filters
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )
-"
diff --git a/dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild
new file mode 100644
index 000000000000..903bdb286b20
--- /dev/null
+++ b/dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/laser_assembler"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Nodes to assemble point clouds from either LaserScan or PointCloud messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-libs/boost:=
+	dev-ros/tf
+	dev-ros/laser_geometry[${PYTHON_USEDEP}]
+	dev-ros/pluginlib
+	dev-libs/tinyxml2:=
+	dev-libs/console_bridge:=
+	dev-ros/message_filters[${PYTHON_USEDEP}]
+	dev-ros/filters
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )
+"
diff --git a/dev-ros/laser_cb_detector/Manifest b/dev-ros/laser_cb_detector/Manifest
index 88a9ce4022db..4b6f47a9e756 100644
--- a/dev-ros/laser_cb_detector/Manifest
+++ b/dev-ros/laser_cb_detector/Manifest
@@ -1,5 +1,6 @@
+AUX boost170.patch 539 BLAKE2B 02288b4d5c3de5ef4290ce7ba4f8c46c95148ea2417c172f0ae90ec7604c7c08c3f8b9eebdbb4d9bf26f81011f996148db3fd0243b56ad77be7533282f9ecc0b SHA512 d2185960b22b9539f318c452e5bb95612e21156380183ed795142d87c9d1f8ca74c6bb08a2039138729767800cf6592b6bb64bf12db62166c8c3ee2176aec65d
 AUX gcc6.patch 461 BLAKE2B 2e745eb80783777fb510d763b1c3119e8fb89f2a7defd9a3a62ed902c9f9a5fcf973b032281049499aa7ea4b36569c5cba72ea89d74040580a8a06a2b99d2f5d SHA512 122b897b905cd9212f038887d23c6a4c9648bcdcf64231b400fcaff7aa7c3a4c731ede2d6d69d85949ca20905a3b166451bb4de7a9ad09b3ffc9b94eb2959702
 DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD laser_cb_detector-0.10.14.ebuild 728 BLAKE2B c5a0e74981b25cacf9618ec4cba8fd7a7d1088f7a9243e0b5ecd005a7737204ce3ea9a1b8bc8bf63b33d3449d099275ed8c3f029a5b93cdcba9f08aafb04a9c0 SHA512 be9fb0ab225811f6878fca22af77defde55502875dee2c9eba8ecb56b9bf34885260552f1568b432c1e51ae277b17983fdbbbc98650e0884de0e99d9de14b1f4
+EBUILD laser_cb_detector-0.10.14.ebuild 754 BLAKE2B 754aa6caa3919022243c83f10857e83ec60befd0f7d2fc6be4fce31eea3884774252bd94ad853fbc9d2ce8df2d283290273ef40c8f6992ccba8328243080d1ed SHA512 823d9e615b926cff6fa41bd911a06e04c7c3afb153d03e75cefc1024ff5fb2a4195eff1f6546f703993f521b6558013c9998254b50c99f73c424b9127dc64898
 EBUILD laser_cb_detector-9999.ebuild 728 BLAKE2B c5a0e74981b25cacf9618ec4cba8fd7a7d1088f7a9243e0b5ecd005a7737204ce3ea9a1b8bc8bf63b33d3449d099275ed8c3f029a5b93cdcba9f08aafb04a9c0 SHA512 be9fb0ab225811f6878fca22af77defde55502875dee2c9eba8ecb56b9bf34885260552f1568b432c1e51ae277b17983fdbbbc98650e0884de0e99d9de14b1f4
 MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/laser_cb_detector/files/boost170.patch b/dev-ros/laser_cb_detector/files/boost170.patch
new file mode 100644
index 000000000000..019a948be95c
--- /dev/null
+++ b/dev-ros/laser_cb_detector/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: laser_cb_detector/CMakeLists.txt
+===================================================================
+--- laser_cb_detector.orig/CMakeLists.txt
++++ laser_cb_detector/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 2.8.3)
+ project(laser_cb_detector)
+ 
+-find_package(Boost REQUIRED signals thread)
++find_package(Boost REQUIRED thread)
+ find_package(catkin REQUIRED actionlib actionlib_msgs cv_bridge image_cb_detector message_filters roscpp settlerlib std_msgs)
+ 
+ add_action_files(DIRECTORY action FILES Config.action)
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
index 605a596b776e..888eec2019d8 100644
--- a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.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
@@ -27,4 +27,4 @@ RDEPEND="
 	dev-ros/settlerlib
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/laser_filters/Manifest b/dev-ros/laser_filters/Manifest
index b1f162a54ccd..d3ceaa8035e6 100644
--- a/dev-ros/laser_filters/Manifest
+++ b/dev-ros/laser_filters/Manifest
@@ -1,6 +1,6 @@
-DIST laser_filters-1.8.5.tar.gz 29485 BLAKE2B 4564408348a1710ba30f41b92c8f602a5cefe473527409ee3b567c2843b46d623ad20092931a68bd8a456fcb58dfabbec03056cac53eac7838bef664496c3bb4 SHA512 dc43aaa3c06f64328f9e744866ded854ffc36609f0d91b0bb0a2be736038b34690b9b819257c41b18ef01d1810e67e21d6cebf1e8bd7190fd4eaa2ddbe8723d2
 DIST laser_filters-1.8.6.tar.gz 29484 BLAKE2B b436a6715421940b55e15ab2393f06f988d1ab6d8756d3bbe90b4a189c7e5e669e2ddbd0926b8d6d149159cffe70a6c64aa600b47d6bf730ccbfc14b3e8e69ce SHA512 43662fb9a006730c34a37cd50425d54de2141294b5f271761d9e63416fa6633c3a505e637248dc4192606653d7d8083da1a42826e29495726b4744fc98ff9943
-EBUILD laser_filters-1.8.5-r1.ebuild 641 BLAKE2B 72e5ce055e7dcfe13864e5d11c401d90e6c511ecc1ae9fc9001f1551278a4fcc48006edb1f9cc21035c079b150e9cfc192103da4745fae0a78cd92ad94b2cb1d SHA512 8dbfa82eaad2684ff480f4c966cb64e8ddac779f6ac5a2792bab38c2b7a43f1b15cc234e5dab991fe2f699cba72949225a33f3da8d81b8f690f26a76f301e314
+DIST laser_filters-1.8.7.tar.gz 31072 BLAKE2B 296dd26e92e3d2e4ebe6e6c08d62224f684306bd4fdf198ca84a98801ddf884d85b7888a6d1d51e96b90403ae484c3d6d48a08c9218c1d7c118cf4518c70202a SHA512 8ea1af3af17c3d7870822230760dc8201ec7403db8246cb82f912ca6eb6bcd634df64ae757128dfa82d8fd2d297e3c2dfb066ca612d11933a4074379b35113bb
 EBUILD laser_filters-1.8.6.ebuild 641 BLAKE2B 9292584fd3190275f5ca6d2d2cbe28047f7e76d5135079f7b24945c063c95196356bb45c1b7b5ad92797509a2f17ca6169e242266c833d2ee87fd2bd1321313d SHA512 a333b0a64a0210fa160b68fce4851e2d7c5a2d75f61ae01aa8c5871bb3845f22801921644cc2ee9e48ce62bc98f3dc81bbfd16380ee439d8d78dc3766d6cd799
+EBUILD laser_filters-1.8.7.ebuild 638 BLAKE2B 19cd66c471e64e87e69614903d3fdd152d304adb797d2fe68e658b0a581a4aeeadf7c0d563526a19f7fa363545600b51a2aa08914d26f35234a92be517ef67cf SHA512 638ad97d98d29ae469075f3b52b3f06acf99f4e4325c428ba8e008e83778388a1bd91a8200fb923405cc85274524ec5ae0b569740f4230bbb646d71c9bfd98e5
 EBUILD laser_filters-9999.ebuild 641 BLAKE2B 72e5ce055e7dcfe13864e5d11c401d90e6c511ecc1ae9fc9001f1551278a4fcc48006edb1f9cc21035c079b150e9cfc192103da4745fae0a78cd92ad94b2cb1d SHA512 8dbfa82eaad2684ff480f4c966cb64e8ddac779f6ac5a2792bab38c2b7a43f1b15cc234e5dab991fe2f699cba72949225a33f3da8d81b8f690f26a76f301e314
 MISC metadata.xml 342 BLAKE2B 92f4937b0999d701af2eb4810e3d0d9d713fd0238fa57500e7bfdbfc1d602afdd51252b796c3a27c2eb8ea398330b04c3d1f78ca8f5c307bf5adfb4570c3db6b SHA512 4ab282060abc14838675f8d99f245894bec67f8e824191e666671bfc6134383c23853137cff023f59b81141aae204f282d3b40e779627c375609fc4223af8ec5
diff --git a/dev-ros/laser_filters/laser_filters-1.8.5-r1.ebuild b/dev-ros/laser_filters/laser_filters-1.8.5-r1.ebuild
deleted file mode 100644
index 0dd0c51fad51..000000000000
--- a/dev-ros/laser_filters/laser_filters-1.8.5-r1.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
-ROS_REPO_URI="https://github.com/ros-perception/laser_filters"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted filters designed to operate on 2D planar laser scanners"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-ros/angles
-	dev-ros/filters
-	dev-ros/laser_geometry
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/laser_filters/laser_filters-1.8.7.ebuild b/dev-ros/laser_filters/laser_filters-1.8.7.ebuild
new file mode 100644
index 000000000000..3f17816b445d
--- /dev/null
+++ b/dev-ros/laser_filters/laser_filters-1.8.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/laser_filters"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Assorted filters designed to operate on 2D planar laser scanners"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-libs/boost:=
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf
+	dev-ros/angles
+	dev-ros/filters
+	dev-ros/laser_geometry
+	dev-libs/tinyxml2:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest
index 3bf8d4d18fce..c1431707e56c 100644
--- a/dev-ros/libmavconn/Manifest
+++ b/dev-ros/libmavconn/Manifest
@@ -1,5 +1,6 @@
+AUX boost170.patch 3754 BLAKE2B 7e4d5be1898f70f7075cc51b36d143f3fd4feeceab6658926d6b0ba9030b0cc3d5ccbbfe624f914698eda0bcfdc748543e35f8de2cda59133b1d0cfe813bb119 SHA512 f3d0f1bdd19f08077e5650d02997028ad044594c185994e8df08903602199bb9b063d1623a807920b8d07c91b468c1b3ac34a806aec7b40ed15e9b70a0eb60c4
 AUX logging.patch 16008 BLAKE2B ac82381998cfc3b204f745b79cba6128751dd511b0d89d50f5317c82138cd06d51e627706ce533f205a731202e32838a8c7a7b3bb7c85011d6e9c698a4d1f792 SHA512 08e64047cbc613982be4bd34c07916df2e90a96f9f6873969be7dfd265f2d6ce4956669be7c57c38f23314fd4634b5569aec17618d412d0662ae5baf8f590433
 DIST mavros-0.19.0.tar.gz 219739 BLAKE2B 4e9a47fa4cdbf11b530bdc39a8048b1834689039af3005d30ffcc2b626651612db12ecc1929ecaf994c5a887224bcf2b0469d1e15ed5b353be4132fb0f523a96 SHA512 87b1b77505d3606196d609a016bcb89b3831e982f8352a13f69f5c2580f46ac603edb2d3c2ce4df5cdd1424172145b88d2b35d149c2be507eb0f23039e7e45a7
-EBUILD libmavconn-0.19.0-r1.ebuild 471 BLAKE2B 41b2e29199232ef6b987afcb6f98d892d61577b6423443148c40120ede225fe304dd1c397391d806f58f14879f26a101cb460f69e9f613161271964d3134cafb SHA512 cb723c1dc318517da33d1554b663e2bef35df7a3a3dd0ced92dd698baf33a374a1db59ea8566a146a5e09c4689b553312bb1bb28c2ed664ae1097ea6b147fdba
+EBUILD libmavconn-0.19.0-r1.ebuild 499 BLAKE2B 3c0d8430aa3e771ad35d32d4d4970e950a82d3390129d3f17853d5f39c1479f72483d8f9311ff6229c4becc587e865304aff22374e85b54bf90c339f45be7979 SHA512 cf6f5d7ed4972f115f374993a04bdb5e2c855a592133e47ba684bd2c54ce7e6d5cf0678093a34e5a81475c55ca8d95be838c86718862107d502d9fd08af6ab92
 EBUILD libmavconn-9999.ebuild 431 BLAKE2B a98c07058726ca23ea9c93d4d072b51d94dbe9472f78caccd72b3e857250f18737981a4cfa2fc48c1c1c75db9313a4b129cd66320b9e82ccee04dc28616b905f SHA512 5d0ade0e7b70ff32b9fb2fed6041e2e9610a03deac57205a5e7136bc8ef9f27aa5a98a07e76e5d362784f37b4d5eb98a03184ededbd6dd39bd50f93531ace235
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/libmavconn/files/boost170.patch b/dev-ros/libmavconn/files/boost170.patch
new file mode 100644
index 000000000000..357025d90af5
--- /dev/null
+++ b/dev-ros/libmavconn/files/boost170.patch
@@ -0,0 +1,98 @@
+Index: libmavconn/src/tcp.cpp
+===================================================================
+--- libmavconn.orig/src/tcp.cpp
++++ libmavconn/src/tcp.cpp
+@@ -41,13 +41,19 @@ static bool resolve_address_tcp(io_servi
+ 	error_code ec;
+ 
+ 	tcp::resolver::query query(host, "");
+-	std::for_each(resolver.resolve(query, ec), tcp::resolver::iterator(),
+-			[&](const tcp::endpoint & q_ep) {
+-				ep = q_ep;
+-				ep.port(port);
+-				result = true;
+-				CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
+-			});
++
++	auto fn = [&](const tcp::endpoint & q_ep) {
++		ep = q_ep;
++		ep.port(port);
++		result = true;
++		CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
++	};
++
++#if BOOST_ASIO_VERSION >= 101200
++	for (auto q_ep : resolver.resolve(query, ec)) fn(q_ep);
++#else
++	std::for_each(resolver.resolve(query, ec), tcp::resolver::iterator(), fn);
++#endif
+ 
+ 	if (ec) {
+ 		CONSOLE_BRIDGE_logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
+@@ -112,7 +118,7 @@ void MAVConnTCPClient::client_connected(
+ 			server_channel, conn_id, to_string_ss(server_ep).c_str());
+ 
+ 	// start recv
+-	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_recv, shared_from_this()));
++	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_recv, shared_from_this()));
+ }
+ 
+ MAVConnTCPClient::~MAVConnTCPClient()
+@@ -152,7 +158,7 @@ void MAVConnTCPClient::send_bytes(const
+ 
+ 		tx_q.emplace_back(bytes, length);
+ 	}
+-	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
++	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
+ }
+ 
+ void MAVConnTCPClient::send_message(const mavlink_message_t *message)
+@@ -174,7 +180,7 @@ void MAVConnTCPClient::send_message(cons
+ 
+ 		tx_q.emplace_back(message);
+ 	}
+-	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
++	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
+ }
+ 
+ void MAVConnTCPClient::send_message(const mavlink::Message &message)
+@@ -194,7 +200,7 @@ void MAVConnTCPClient::send_message(cons
+ 
+ 		tx_q.emplace_back(message, get_status_p(), sys_id, comp_id);
+ 	}
+-	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
++	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
+ }
+ 
+ void MAVConnTCPClient::do_recv()
+Index: libmavconn/src/udp.cpp
+===================================================================
+--- libmavconn.orig/src/udp.cpp
++++ libmavconn/src/udp.cpp
+@@ -41,13 +41,19 @@ static bool resolve_address_udp(io_servi
+ 	error_code ec;
+ 
+ 	udp::resolver::query query(host, "");
+-	std::for_each(resolver.resolve(query, ec), udp::resolver::iterator(),
+-			[&](const udp::endpoint & q_ep) {
+-				ep = q_ep;
+-				ep.port(port);
+-				result = true;
+-				CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
+-			});
++
++	auto fn = [&](const udp::endpoint & q_ep) {
++		ep = q_ep;
++		ep.port(port);
++		result = true;
++		CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
++	};
++
++#if BOOST_ASIO_VERSION >= 101200
++	for (auto q_ep : resolver.resolve(query, ec)) fn(q_ep);
++#else
++	std::for_each(resolver.resolve(query, ec), udp::resolver::iterator(), fn);
++#endif
+ 
+ 	if (ec) {
+ 		CONSOLE_BRIDGE_logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
diff --git a/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild b/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild
index dddbbe6be4df..d42a92fd0e64 100644
--- a/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild
+++ b/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,4 +19,7 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/logging.patch" )
+PATCHES=(
+	"${FILESDIR}/logging.patch"
+	"${FILESDIR}/boost170.patch"
+)
diff --git a/dev-ros/python_qt_binding/Manifest b/dev-ros/python_qt_binding/Manifest
index a96986339a35..fd7f65e06416 100644
--- a/dev-ros/python_qt_binding/Manifest
+++ b/dev-ros/python_qt_binding/Manifest
@@ -1,8 +1,7 @@
-DIST python_qt_binding-0.3.2.tar.gz 12047 BLAKE2B 330ab27cface576d37cfca709a9758b6499a181b8e2734c04ef0f55b84a3d45a4ae821fbf572337e71115b4db57839f900e406b9ce8b3cfc71daa2d4ff4b143c SHA512 777d7ba00652d34994648615125f6c426170a1723570de35b9e5a060d0f077b563a57c9b0cbe7bd85a7ed2f5f011797e9102918a27df4f0096831cce0bb80304
-DIST python_qt_binding-0.3.3.tar.gz 12114 BLAKE2B 12a2e785746ec3d9fe7b387a9e727bfacb5e37da90702c728c8e874c52cd3e4cfc000936d8f17cefbeeb98673de8c21f066eded743df3b5325b88e785f3dc100 SHA512 0dfd698b390a87e0619e93a291656c329ff37713411c5a805e720aeedf9fefd43fc780bbdba351cd1a73e30d67ce8e93a98b5ba6b5584a807d829611ac232263
+AUX var.patch 961 BLAKE2B 5bbf8db95f689cc7d2c0358d0dcccc8856a4318137eeda2f56458d145654bc20b6ed3a6d6df40d89f4f2a654762415776aa0bf8410dafddce5606e3d515e554f SHA512 4b774ae419f56094bb0d059fca1944043c9d8b176195dd6df970407ba7e4e71239fd2ad155c4cfaeb50bad585fea175f08ad7d6911cace5a8a21b0a03c483f52
 DIST python_qt_binding-0.3.4.tar.gz 12255 BLAKE2B bc72aa806098d460e5b884bde7664f295399555d96e10b66791e59a26d1e61dd22aabecf9b40b5d14f61c2c906c18ff3fe2cd03de6108d7d9c2c649d553ab09d SHA512 df5fc2c6a744e66d0c03089e15ce4cfb3890d8fd67d826a3832d22cf99de235e18720c59f737c3ddacefb02dac5571d64042dd862c10ea4c44835063037eb533
-EBUILD python_qt_binding-0.3.2.ebuild 457 BLAKE2B de30c507e7415187bddfc691f988e8e79e7a4f0671ad817493ba42a8aa837449946db9be13829592abfd5504718f0b08e5b67f6abbfc7a65576cec4485721530 SHA512 1da86df5a851ea02b666825ab445a1015b07d4cec74791b9eb7620e63947bdd7b52be3146312b6dc2d5bb9e6faed454efa4622a8b1928eb35bdd71107f01d2e9
-EBUILD python_qt_binding-0.3.3.ebuild 457 BLAKE2B de30c507e7415187bddfc691f988e8e79e7a4f0671ad817493ba42a8aa837449946db9be13829592abfd5504718f0b08e5b67f6abbfc7a65576cec4485721530 SHA512 1da86df5a851ea02b666825ab445a1015b07d4cec74791b9eb7620e63947bdd7b52be3146312b6dc2d5bb9e6faed454efa4622a8b1928eb35bdd71107f01d2e9
+DIST python_qt_binding-0.3.5.tar.gz 12412 BLAKE2B ee2f2537bb1ddceb5cce0ca1963e042d10e5d011cffac25caba1a714c992d975413b7e1c4a23d5472567d4e214f482414dcfc56d499fcbcb0bd5559d7670b484 SHA512 a54ce90008d0893f236533cdda7d3520db264ba3e66b6edf18bac0d6e97975823e3900d1f265a7459813c823c9fc0bce7bb12570de1f8101b588954adeb073b4
 EBUILD python_qt_binding-0.3.4.ebuild 457 BLAKE2B de30c507e7415187bddfc691f988e8e79e7a4f0671ad817493ba42a8aa837449946db9be13829592abfd5504718f0b08e5b67f6abbfc7a65576cec4485721530 SHA512 1da86df5a851ea02b666825ab445a1015b07d4cec74791b9eb7620e63947bdd7b52be3146312b6dc2d5bb9e6faed454efa4622a8b1928eb35bdd71107f01d2e9
+EBUILD python_qt_binding-0.3.5-r1.ebuild 493 BLAKE2B 50e17b641cec09703e2a2cc8cdde1fca6adb281403ff834ad0ff6b9e2518f70af7b283bceca8d744e887179ef4fff7c019d35ad77e2424691b1a2b63b76f43e0 SHA512 429199c878e3a355db508187e8aa745866f7114e52d9f3426d23a1dca03310beaa7a74f19422a21565bbdf46bf03271e19a1dc498e2a0a25437ba9a862cf4c64
 EBUILD python_qt_binding-9999.ebuild 457 BLAKE2B de30c507e7415187bddfc691f988e8e79e7a4f0671ad817493ba42a8aa837449946db9be13829592abfd5504718f0b08e5b67f6abbfc7a65576cec4485721530 SHA512 1da86df5a851ea02b666825ab445a1015b07d4cec74791b9eb7620e63947bdd7b52be3146312b6dc2d5bb9e6faed454efa4622a8b1928eb35bdd71107f01d2e9
 MISC metadata.xml 349 BLAKE2B bc205c9c90eab1ea292d3e90f9f4a1d769c5202af60c57371152eaf80a50bdf6257cb2bb0ad6070a8443f0d19cc64e8493d5ec43e2701085f96c90ec6187a705 SHA512 f388f612a53c2de0a6cdece5a03d08e583f848592da6763b7995ff80e60756caca49da4318ded57ba09141facf717442141066142ed0691172f4e6b98a5ee266
diff --git a/dev-ros/python_qt_binding/files/var.patch b/dev-ros/python_qt_binding/files/var.patch
new file mode 100644
index 000000000000..f0cd56d10a7e
--- /dev/null
+++ b/dev-ros/python_qt_binding/files/var.patch
@@ -0,0 +1,31 @@
+From 1b3000d2eccfad651b427de20028a4ca552e9ea7 Mon Sep 17 00:00:00 2001
+From: Hans Gaiser <h.gaiser@fizyr.com>
+Date: Mon, 29 Jul 2019 15:17:39 -0700
+Subject: [PATCH] Replace Qt variable in generated Makefile. (#64)
+
+* Replace Qt variable in generated Makefile.
+
+* use single quotes
+---
+ cmake/sip_configure.py | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/cmake/sip_configure.py b/cmake/sip_configure.py
+index 49eb866..ce084dd 100644
+--- a/cmake/sip_configure.py
++++ b/cmake/sip_configure.py
+@@ -145,5 +145,14 @@ def split_paths(paths):
+ else:
+     makefile.extra_cxxflags.append('-std=c++14')
+ 
++# Finalise the Makefile, preparing it to be saved to disk
++makefile.finalise()
++
++# Replace Qt variables from libraries
++libs = makefile.LIBS.as_list()
++for i in range(len(libs)):
++    libs[i] = libs[i].replace('$$[QT_INSTALL_LIBS]', config.build_macros()['LIBDIR_QT'])
++makefile.LIBS.set(libs)
++
+ # Generate the Makefile itself
+ makefile.generate()
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.3.2.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.3.2.ebuild
deleted file mode 100644
index 5309c2893fbe..000000000000
--- a/dev-ros/python_qt_binding/python_qt_binding-0.3.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.3.3.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.3.3.ebuild
deleted file mode 100644
index 5309c2893fbe..000000000000
--- a/dev-ros/python_qt_binding/python_qt_binding-0.3.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild
new file mode 100644
index 000000000000..f74ff22c2b2e
--- /dev/null
+++ b/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_5} )
+
+inherit ros-catkin
+
+DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/var.patch" )
diff --git a/dev-ros/qt_gui_cpp/Manifest b/dev-ros/qt_gui_cpp/Manifest
index 642c118d5e43..49de18ceb811 100644
--- a/dev-ros/qt_gui_cpp/Manifest
+++ b/dev-ros/qt_gui_cpp/Manifest
@@ -1,11 +1,5 @@
 AUX libdir.patch 1151 BLAKE2B f78ed19cff2df00514da0e60b6cfbda581443a0b7b1515a7c40d1a9518391611de3c5ff9eed6091ac2dbbdff168aba14239ac21754657541aa5b6e053e19aa7d SHA512 a6393e452f9a2a2517d35e2edb069f94acc8461dfda631c3183099a9b8bf6aa79bd5747ef1e1275637ad3fbbca67bab0aa9bcb21dce1f3eb67ed2600ceffe657
-DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
 DIST qt_gui_core-0.3.11.tar.gz 91640 BLAKE2B 49615e039ea7a2586679c6d6ffd9a583a16c2087b1c1090885ca83894aa98d44efc10c7bb622068ac49eb8c70eac98a5f495e3b417b3750171c31b433c53bfad SHA512 f83abd1d75ea6794fc25da79912a629bd13167bbe2815c9616a0e1a8993a4730053fc737cb864ba01ac869d9aec85269d2e1a19d963a50b8469e6d073e55db9a
-DIST qt_gui_core-0.3.8.tar.gz 91248 BLAKE2B 9ed159b8d065e7b2a44dcf9ac496a699675e5ec41d5ed222413894f098e122b092c976c934dc37a99846e0fe80858fb377bf937b3eabc3f0c6df126de7944e88 SHA512 aec926adffc9f1ab84d7d5cccb207d87254496b37e9e2e4c430de191917823424751206647d61821a65dec0aad3241dab22c85f21980fbe1a4bf114bb2c29d70
-DIST qt_gui_core-0.3.9.tar.gz 91495 BLAKE2B c0f2f2b9231a42da68c0032bfb192a47060f4b0915952b77750985be00023f22678480605990a79016b8ed906cacbdb9cd7eafabbb917b06f891f6b7817a999c SHA512 3e7e45001f1749e3ca75c6b33e3e7a131a314a5ec66925b86f2617f6f749f4c2093d33420bbe0f148faa44fb1fb3071241e47180d3c56ed9d1f7a2befb006a95
-EBUILD qt_gui_cpp-0.3.10.ebuild 745 BLAKE2B b4c55f12bd7cb313436c2267d56d2e9af5ea75d4542053309708a47b4beb0e904f3caac9dfe5a79fcecd5fb990ce73d44405c1277b54789ab44afca1fe3e884c SHA512 7bf57c06abef1e07e5fa74fa5a98f3b8a45da55d5b2c689635d2493433d0d0d8c55b77ba66616c460031443f076113dd5f8809adf9b526719ea4874237ae0006
 EBUILD qt_gui_cpp-0.3.11.ebuild 745 BLAKE2B b4c55f12bd7cb313436c2267d56d2e9af5ea75d4542053309708a47b4beb0e904f3caac9dfe5a79fcecd5fb990ce73d44405c1277b54789ab44afca1fe3e884c SHA512 7bf57c06abef1e07e5fa74fa5a98f3b8a45da55d5b2c689635d2493433d0d0d8c55b77ba66616c460031443f076113dd5f8809adf9b526719ea4874237ae0006
-EBUILD qt_gui_cpp-0.3.8-r1.ebuild 745 BLAKE2B 2f7e609d3f4336951307b9ba559969a437bf68f44a4695d333791fb9ccc7057a23c85048060812b232bc9c20ffd1a0c3c96bd341c53fb0bbda12230815c6be1d SHA512 776fa23e75d92cbf557fbcee6742f0fd18dbac87af5aa3640aded8e5775c59eac1294c22403bbf86a8ada2c205ca629e88f627ac82bffcd2f01c3e19f2c87060
-EBUILD qt_gui_cpp-0.3.9.ebuild 745 BLAKE2B b4c55f12bd7cb313436c2267d56d2e9af5ea75d4542053309708a47b4beb0e904f3caac9dfe5a79fcecd5fb990ce73d44405c1277b54789ab44afca1fe3e884c SHA512 7bf57c06abef1e07e5fa74fa5a98f3b8a45da55d5b2c689635d2493433d0d0d8c55b77ba66616c460031443f076113dd5f8809adf9b526719ea4874237ae0006
 EBUILD qt_gui_cpp-9999.ebuild 745 BLAKE2B 2f7e609d3f4336951307b9ba559969a437bf68f44a4695d333791fb9ccc7057a23c85048060812b232bc9c20ffd1a0c3c96bd341c53fb0bbda12230815c6be1d SHA512 776fa23e75d92cbf557fbcee6742f0fd18dbac87af5aa3640aded8e5775c59eac1294c22403bbf86a8ada2c205ca629e88f627ac82bffcd2f01c3e19f2c87060
 MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.10.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.10.ebuild
deleted file mode 100644
index a52422eff7b2..000000000000
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	>=dev-ros/pluginlib-1.9.23
-		dev-libs/tinyxml2:=
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-	dev-libs/tinyxml
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/libdir.patch"
-)
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8-r1.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8-r1.ebuild
deleted file mode 100644
index 0216c3788c0b..000000000000
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	>=dev-ros/pluginlib-1.9.23
-		dev-libs/tinyxml2:=
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-	dev-libs/tinyxml
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/libdir.patch"
-)
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.9.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.9.ebuild
deleted file mode 100644
index a52422eff7b2..000000000000
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	>=dev-ros/pluginlib-1.9.23
-		dev-libs/tinyxml2:=
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]
-	dev-libs/tinyxml
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/libdir.patch"
-)
diff --git a/dev-ros/rosserial_server/Manifest b/dev-ros/rosserial_server/Manifest
index 5e8a2cf69384..42c604f67fd1 100644
--- a/dev-ros/rosserial_server/Manifest
+++ b/dev-ros/rosserial_server/Manifest
@@ -1,13 +1,5 @@
-AUX boost162.patch 2859 BLAKE2B f8555ab6ed3adf3062061b1d226a9ce79d51769021db54d345fc2d6759cda50a72da3333ce4fbd19ea1a5e085e8cde0ebe169c5bca6b509e2508cf8da658b9b6 SHA512 81ce80b1c72f39fc8edf5859564f1c470c5f1cb89b6d1f032f7ea155b099ca1736a04d6e5f3110fc3ba95dc23c37c625718fe6a588d36166ba3605a69042dc71
-DIST rosserial-0.7.4.tar.gz 150244 BLAKE2B 57cc4711f42506587cc6e004f321fe4f4f1ba4e1843a3370ecc50ccb7a26912a4896b31351afaa8e3a02fa07fe7d2b0bb705d248b5a39925873df76c195aaa1f SHA512 a3b9590aeac0a557bee7fa2aa4b561f2dd83dcaff9033425c77cdeca572f4a4ba8fc30b21a3cd035e454e4997d99f9e6541d54739aa9051b9e22d84710e10e00
-DIST rosserial-0.7.5.tar.gz 150687 BLAKE2B 08026b17b08747fd9b1e23a693349f30ff8406cc50f0bd0c949b9367a2b8845b821d69d25e3d35ce9e552e9aa423471e62399ef95c17e35849fcfd858eae6d75 SHA512 3c9ce00b3d95f6d29360aee3b45cb35339ba8646f0f43f64cf1c3f2e77a7c9edbb4f85b761a21a0a3e73cdd064a59c98f997f408a6e8526641499420a94c8a36
-DIST rosserial-0.7.6.tar.gz 151270 BLAKE2B d4082e2eac6c3b2d80bb7c62b6e830a461b7b379c8bad3ea14e44ca8c054e9c78c9605e6a30f6295cbdefc0c7c57133029ebc9042c2d687e3112a703c69400b8 SHA512 adebd29406644c134ab9216f42c1e84dd245b1b1637e055717dea16e82a559c900726c0f6dd9f61e092a3f137805cc96be6f0b100a59574e0818a0bbfb712ea2
-DIST rosserial-0.7.7.tar.gz 155237 BLAKE2B e0e905c9d58face06ceac0e21aa2c72d07961daa5a37f85df6dc39738b27ffa47a9236f2627705c94185891f7d7291dabb80e10fece2eec2c6b76bcbdba7d32a SHA512 fdf880146b7697592288d3f5341f784e2dbadc9639a0b66458709bdee1725e6ca603215296f85e386bc9ad59ca8c3132daf0c33cfb852c10c7c1715c06ff2384
+AUX boost170.patch 2996 BLAKE2B d34ed939d222fa4d9528e8e6a7f3aaa90ebea944e651f7f25d4f254fec3e3b2c655f242fba7e00e315f54f8eb518309ea8f52de2a29c14d2dcdd5ec5c70c1a56 SHA512 4f0742061fdee931c5a934d5816e801bff30664e3a28e3970bf9e3636c2d8a562ff283a246b83bbabf7e4dfa755964e03c6a5b07d7d667583831cd3b6ed67fcc
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
-EBUILD rosserial_server-0.7.4.ebuild 518 BLAKE2B b455a5a1762eefcad84069783614f93c3ecfde49c3053a77d5177fbea4c267b384a1b0ced72420a694e42cc68d5140f28c65a8fc8db107597773f10fa30b021a SHA512 3f80d6d50ee1b1db6cff6894afe8a6ccccdd3b0381132d21307244a61a94265651cf9cd68ab2504f29fc51d2d2431b0249848aa967d5f1ce01cfea3fee887931
-EBUILD rosserial_server-0.7.5.ebuild 477 BLAKE2B 79518fc245f624e1b74b34c87f21518f56ad4279536552b5daa6af93f6bada35ae2d8c3fb402da1b53306eb7726138b71fe67f8d7915cd7359de780404809c62 SHA512 f7fca26dec079fc7bd52b62ffb73da97e8b3b99fb88c32f25f675128883682f3fb536e129b9a3b2caa0283d5225025289992e6a882dcbc369941f499f56e1395
-EBUILD rosserial_server-0.7.6.ebuild 477 BLAKE2B fead5c5372a7d937149e60a5199b713f0f2c65be98e0543198e4762b300a9357f02030ff76587ca723da5f3856ab65e97810884c0a6741d3774d719be8224376 SHA512 bc3775b6682869c1818f0564913f4edaf12cfb25d5b1718ee5549ec9e6ac3153418442bf5a064ac29e18e59a8390d2ba379ba789a1aa6b77476ad1816f200330
-EBUILD rosserial_server-0.7.7.ebuild 477 BLAKE2B fead5c5372a7d937149e60a5199b713f0f2c65be98e0543198e4762b300a9357f02030ff76587ca723da5f3856ab65e97810884c0a6741d3774d719be8224376 SHA512 bc3775b6682869c1818f0564913f4edaf12cfb25d5b1718ee5549ec9e6ac3153418442bf5a064ac29e18e59a8390d2ba379ba789a1aa6b77476ad1816f200330
-EBUILD rosserial_server-0.8.0.ebuild 474 BLAKE2B ead1281a9d9b0623bb781bf19314fef704fd23b68a3faaf0e86f2c3405751fc6a1f65987e3248f99774761b1bc5bff9c2ca44e03b1ad601255420c365f7fef2f SHA512 0debfa6c14ea2f1a2d4b21a605e4eebf6b50078d7b59edad0aadba2b647f9729bfbe939f29d26e3f3b7f4e44a5b87533b79711604283c40d78be69d7acc43c0f
+EBUILD rosserial_server-0.8.0.ebuild 515 BLAKE2B c3d7da30d2933a83dfc9f848cf1aa559249fa145a30be06b22afdce081e0926eeaf673e3be56f05a2056f8944461fdd3be637c0d390fb07a540b388e378686cf SHA512 a95d1df1ca5f73613d82946bce7053ca77308b91677a6cd4ebfd52a67226994faa771f4b025b0334b15f174a533a6bfb5fc75cd8cf562f796839f6e77a879b27
 EBUILD rosserial_server-9999.ebuild 477 BLAKE2B 9b3dc301b81032dd2a4d9d5046f5659d2531cd94283dde61fe0dc634fc4a60300bd90298334c7168f7c8c7ec5fb0e32856cb2f788974f127e08e6a2243faee9b SHA512 be9ca28d3ce9c5e13a57fc8c3fed5f6e8a3a6decd61d504486034638332b5ed666fb4512c833f6eb9b0e01b866cd2d39c6183d501e47d12fa877057b254568f0
 MISC metadata.xml 335 BLAKE2B c530aa8362e5262e649a12c8f598c97e4d7fe2c29d49204e96981c3832ed9ce1ec633099712c5f7deafaf423bd7864e83ad8309b176e857c6a3b7d18b1efa700 SHA512 be8c98254064526415c9b16ad1a2192ab48e924560cbf93576316d21e09b76abcf3be61bdb00f69953f111ac427cc8d05a813e9d0a49955ea65799d8e250a8db
diff --git a/dev-ros/rosserial_server/files/boost162.patch b/dev-ros/rosserial_server/files/boost162.patch
deleted file mode 100644
index d644d409f9e6..000000000000
--- a/dev-ros/rosserial_server/files/boost162.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-commit f8a46f3142444c854233a85f7a5ec7b91b5378a6
-Author: Malte Splietker <splietker@users.noreply.github.com>
-Date:   Wed Oct 5 04:26:00 2016 +0200
-
-    Fixing build errors for boost >=1.60 (#226) (#250)
-    
-    Signed-off-by: Malte Splietker <maltespl@mail.upb.de>
-
-diff --git a/rosserial_server/include/rosserial_server/session.h b/rosserial_server/include/rosserial_server/session.h
-index 86b9baa..ebd109a 100644
---- a/rosserial_server/include/rosserial_server/session.h
-+++ b/rosserial_server/include/rosserial_server/session.h
-@@ -499,7 +499,7 @@ private:
-   boost::asio::deadline_timer ros_spin_timer_;
-   std::string require_param_name_;
- 
--  std::map<uint16_t, boost::function<void(ros::serialization::IStream)> > callbacks_;
-+  std::map<uint16_t, boost::function<void(ros::serialization::IStream&)> > callbacks_;
-   std::map<uint16_t, PublisherPtr> publishers_;
-   std::map<uint16_t, SubscriberPtr> subscribers_;
-   std::map<std::string, ServiceClientPtr> services_;
-diff --git a/rosserial_server/include/rosserial_server/topic_handlers.h b/rosserial_server/include/rosserial_server/topic_handlers.h
-index 666f3fc..2f367c3 100644
---- a/rosserial_server/include/rosserial_server/topic_handlers.h
-+++ b/rosserial_server/include/rosserial_server/topic_handlers.h
-@@ -93,7 +93,7 @@ typedef boost::shared_ptr<Publisher> PublisherPtr;
- class Subscriber {
- public:
-   Subscriber(ros::NodeHandle& nh, rosserial_msgs::TopicInfo& topic_info,
--      boost::function<void(std::vector<uint8_t> buffer)> write_fn)
-+      boost::function<void(std::vector<uint8_t>& buffer)> write_fn)
-     : write_fn_(write_fn) {
-     ros::SubscribeOptions opts;
-     opts.init<topic_tools::ShapeShifter>(
-@@ -119,7 +119,7 @@ private:
-   }
- 
-   ros::Subscriber subscriber_;
--  boost::function<void(std::vector<uint8_t> buffer)> write_fn_;
-+  boost::function<void(std::vector<uint8_t>& buffer)> write_fn_;
- };
- 
- typedef boost::shared_ptr<Subscriber> SubscriberPtr;
-@@ -127,7 +127,7 @@ typedef boost::shared_ptr<Subscriber> SubscriberPtr;
- class ServiceClient {
- public:
-   ServiceClient(ros::NodeHandle& nh, rosserial_msgs::TopicInfo& topic_info,
--      boost::function<void(std::vector<uint8_t> buffer, const uint16_t topic_id)> write_fn)
-+      boost::function<void(std::vector<uint8_t>& buffer, const uint16_t topic_id)> write_fn)
-     : write_fn_(write_fn) {
-     topic_id_ = -1;
-     if (!service_info_service_.isValid()) {
-@@ -185,7 +185,7 @@ private:
-   topic_tools::ShapeShifter response_message_;
-   ros::ServiceClient service_client_;
-   static ros::ServiceClient service_info_service_;
--  boost::function<void(std::vector<uint8_t> buffer, const uint16_t topic_id)> write_fn_;
-+  boost::function<void(std::vector<uint8_t>& buffer, const uint16_t topic_id)> write_fn_;
-   std::string service_md5_;
-   std::string request_message_md5_;
-   std::string response_message_md5_;
diff --git a/dev-ros/rosserial_server/files/boost170.patch b/dev-ros/rosserial_server/files/boost170.patch
new file mode 100644
index 000000000000..cbf106fc9acd
--- /dev/null
+++ b/dev-ros/rosserial_server/files/boost170.patch
@@ -0,0 +1,71 @@
+Index: rosserial_server/include/rosserial_server/async_read_buffer.h
+===================================================================
+--- rosserial_server.orig/include/rosserial_server/async_read_buffer.h
++++ rosserial_server/include/rosserial_server/async_read_buffer.h
+@@ -166,7 +166,7 @@ private:
+ 
+     // Post the callback rather than executing it here so, so that we have a chance to do the cleanup
+     // below prior to it actually getting run, in the event that the callback queues up another read.
+-    stream_.get_io_service().post(boost::bind(read_success_callback_, stream));
++    static_cast<boost::asio::io_service&>(stream_.get_executor().context()).post(boost::bind(read_success_callback_, stream));
+ 
+     // Resetting these values clears our state so that we know there isn't a callback pending.
+     read_requested_bytes_ = 0;
+Index: rosserial_server/include/rosserial_server/udp_stream.h
+===================================================================
+--- rosserial_server.orig/include/rosserial_server/udp_stream.h
++++ rosserial_server/include/rosserial_server/udp_stream.h
+@@ -48,7 +48,6 @@ namespace rosserial_server
+ {
+ 
+ using boost::asio::ip::udp;
+-using boost::asio::handler_type;
+ 
+ 
+ class UdpStream : public udp::socket
+@@ -62,9 +61,9 @@ public:
+   {
+     boost::system::error_code ec;
+     const protocol_type protocol = server_endpoint.protocol();
+-    this->get_service().open(this->get_implementation(), protocol, ec);
++    udp::socket::open(protocol, ec);
+     boost::asio::detail::throw_error(ec, "open");
+-    this->get_service().bind(this->get_implementation(), server_endpoint, ec);
++    bind(server_endpoint, ec);
+     boost::asio::detail::throw_error(ec, "bind");
+ 
+     client_endpoint_ = client_endpoint;
+@@ -76,6 +75,8 @@ public:
+   async_write_some(const ConstBufferSequence& buffers,
+       BOOST_ASIO_MOVE_ARG(WriteHandler) handler)
+   {
++    return async_send(buffers, handler);
++#if 0
+     // If you get an error on the following line it means that your handler does
+     // not meet the documented type requirements for a WriteHandler.
+     BOOST_ASIO_WRITE_HANDLER_CHECK(WriteHandler, handler) type_check;
+@@ -94,6 +95,7 @@ public:
+         this->get_implementation(), buffers, client_endpoint_, 0,
+         BOOST_ASIO_MOVE_CAST(WriteHandler)(handler));
+ #endif
++#endif
+   }
+ 
+   template <typename MutableBufferSequence, typename ReadHandler>
+@@ -102,6 +104,8 @@ public:
+   async_read_some(const MutableBufferSequence& buffers,
+       BOOST_ASIO_MOVE_ARG(ReadHandler) handler)
+   {
++    return async_receive(buffers, handler);
++#if 0
+     // If you get an error on the following line it means that your handler does
+     // not meet the documented type requirements for a ReadHandler.
+     BOOST_ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check;
+@@ -119,6 +123,7 @@ public:
+         this->get_implementation(), buffers, client_endpoint_, 0,
+         BOOST_ASIO_MOVE_CAST(ReadHandler)(handler));
+ #endif
++#endif
+   }
+ 
+ private:
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild
deleted file mode 100644
index da37baf0378a..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-0.7.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=5
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/topic_tools
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boost162.patch" )
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.5.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.5.ebuild
deleted file mode 100644
index 305a25dc9b21..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-0.7.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
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/topic_tools
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.6.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.6.ebuild
deleted file mode 100644
index 813f62d5eb64..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-0.7.6.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
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/topic_tools
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.7.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.7.ebuild
deleted file mode 100644
index 813f62d5eb64..000000000000
--- a/dev-ros/rosserial_server/rosserial_server-0.7.7.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
-ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ implementation of the rosserial server side"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/topic_tools
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild b/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild
index 93bba24008f8..37c1c17be5dd 100644
--- a/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild
+++ b/dev-ros/rosserial_server/rosserial_server-0.8.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=5
@@ -20,3 +20,4 @@ RDEPEND="
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/sound_play/Manifest b/dev-ros/sound_play/Manifest
deleted file mode 100644
index 2571d94e7668..000000000000
--- a/dev-ros/sound_play/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
-DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
-DIST audio_common-0.3.3.tar.gz 187239 BLAKE2B 2a7172a68d2a0561c4aa20923f3ed5682d41f6e09c1b7b7cedfd9c7ebf0f03302749355a6c36fdd6dd8c6cad5994e2fe0530e16a6514b6ca33269da5be907a73 SHA512 8cfd17ac065ce6379085183b07ca85299d7e2dc17077d41d1b690e72b707ce076d88e84b1fdf639e0290309f3ea19a7d8a1e185113c081f32a2372e1874b7036
-EBUILD sound_play-0.3.1.ebuild 883 BLAKE2B ce92dce9d12107ea31d5ff1ad4175d43be03255a8a4c9d1cca3b032a99674d0161951c80633452b70760980bab9aa10e05687031636a0e49dd288737b3d9f84f SHA512 061d07513c20b8cf7ee0deb675526be846daa56dd71c947e0f066f68e015a79f8617018db0a6685a6e8492bff45a6a09a671c234885ebb0c3fb2d31f68b024fe
-EBUILD sound_play-0.3.2.ebuild 883 BLAKE2B 6a2e3a80d19fddcca1a18f02fbe68b6097edf83459d9731b356e7413ed4e51f21728ba8962d16250f7047e541e5a365dcb3a0867f1dafb546a01be10b821a591 SHA512 8b3458348592d723ae469aa7619e984063ea3a6ca8e8fe7916d36480c675e3cc14b95aa5fa6b5ead5d0d2f4999401ecd8569fe41cca846a569903be06ab210da
-EBUILD sound_play-0.3.3.ebuild 883 BLAKE2B 6a2e3a80d19fddcca1a18f02fbe68b6097edf83459d9731b356e7413ed4e51f21728ba8962d16250f7047e541e5a365dcb3a0867f1dafb546a01be10b821a591 SHA512 8b3458348592d723ae469aa7619e984063ea3a6ca8e8fe7916d36480c675e3cc14b95aa5fa6b5ead5d0d2f4999401ecd8569fe41cca846a569903be06ab210da
-EBUILD sound_play-9999.ebuild 883 BLAKE2B ce92dce9d12107ea31d5ff1ad4175d43be03255a8a4c9d1cca3b032a99674d0161951c80633452b70760980bab9aa10e05687031636a0e49dd288737b3d9f84f SHA512 061d07513c20b8cf7ee0deb675526be846daa56dd71c947e0f066f68e015a79f8617018db0a6685a6e8492bff45a6a09a671c234885ebb0c3fb2d31f68b024fe
-MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/sound_play/metadata.xml b/dev-ros/sound_play/metadata.xml
deleted file mode 100644
index 73c3483f9803..000000000000
--- a/dev-ros/sound_play/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>ros@gentoo.org</email>
-		<name>Gentoo ROS Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ros-drivers/audio_common</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ros/sound_play/sound_play-0.3.1.ebuild b/dev-ros/sound_play/sound_play-0.3.1.ebuild
deleted file mode 100644
index 218675dbdc7e..000000000000
--- a/dev-ros/sound_play/sound_play-0.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) into sounds"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib
-	media-libs/gstreamer:1.0
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	dev-python/gst-python[${PYTHON_USEDEP}]
-	app-accessibility/festival
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/sound_play/sound_play-0.3.2.ebuild b/dev-ros/sound_play/sound_play-0.3.2.ebuild
deleted file mode 100644
index c6c2efd7eed4..000000000000
--- a/dev-ros/sound_play/sound_play-0.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=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) into sounds"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib
-	media-libs/gstreamer:1.0
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	dev-python/gst-python[${PYTHON_USEDEP}]
-	app-accessibility/festival
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/sound_play/sound_play-0.3.3.ebuild b/dev-ros/sound_play/sound_play-0.3.3.ebuild
deleted file mode 100644
index c6c2efd7eed4..000000000000
--- a/dev-ros/sound_play/sound_play-0.3.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) into sounds"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib
-	media-libs/gstreamer:1.0
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	dev-python/gst-python[${PYTHON_USEDEP}]
-	app-accessibility/festival
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/sound_play/sound_play-9999.ebuild b/dev-ros/sound_play/sound_play-9999.ebuild
deleted file mode 100644
index 218675dbdc7e..000000000000
--- a/dev-ros/sound_play/sound_play-9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) into sounds"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib
-	media-libs/gstreamer:1.0
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	dev-python/gst-python[${PYTHON_USEDEP}]
-	app-accessibility/festival
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/tf/Manifest b/dev-ros/tf/Manifest
index 1fa20c1a9724..b7c6a63fa00b 100644
--- a/dev-ros/tf/Manifest
+++ b/dev-ros/tf/Manifest
@@ -1,6 +1,5 @@
-DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
+AUX boost.patch 974 BLAKE2B 77e8a170d7d6dcec9e41e32443abf512d735c0cbb82bc160883e14dad45136818fbe47e34813bf7abe328fca4549c92b5c1041c83a33a5ea63145abb1e8f9431 SHA512 272b7ea812a7a65d415fb8dc845f23cb969391a10e5035b759e48f1fe31466248ffece658f2323a3e3e0ce6b7bfef6ae6e4d0014e8a8a926755e98a9c96783fc
 DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
-EBUILD tf-1.11.9.ebuild 1006 BLAKE2B 71c1becd35ac2ececd5b14d98a0ebc183be878d4c7765b16e9d5f5d0541b54162b1b175efd3548a6bae4b7325d3989af65a5dbe066a602c54002d69d2d326a32 SHA512 936b4e9db468d68476d5aa58b76721168aab9d597589b335cbd662370ad34a1b02b3044e954374f8f6b66e2cfe472c9f689c94917da9395970c25d6f0e307e24
-EBUILD tf-1.12.0.ebuild 1006 BLAKE2B adf845f181fb20a7acd81d38786687aadfd3ed5b147bf2afa4d8a1dd32e87e746eb06859c2d5ac14b82cae587385ca8e80af95e683fcfb80bc6682a52ac69c1c SHA512 4cd0691a6b2fe1582d7c7aee0bd83e2be2db926193b58b9be050f88cd13c80e5f177e3d9e2d6c15883c3049adb8b3d48c7b40d3343e5ecbcb7a8ffae0719e165
+EBUILD tf-1.12.0.ebuild 1041 BLAKE2B bafd8e43f109f7127ce19e48a0d31e44ab91b8027ef02c0c7b86ba0159671ffca727c701e38844e6694c2313de3bd5655a9c94fe9780260507c8c1e35a3643b2 SHA512 8ec179d1f944810777444059a15c395be28c2329c7600d8696f3c99ca56e1d1edf09de48010cab9c05265c346e3dd6afeb95a2f188e6fe1954fee0de3dfa3275
 EBUILD tf-9999.ebuild 1006 BLAKE2B 67006c1c0fc77a0449be9d829464d1efad49aa0e503d96df900e3c288350dd1d140fd2b22bdd76eaa6e3973ef83642251c2ef3218f02492e6d637e903992983e SHA512 980971c39495ef9679810efa1cce7ac029ea92b2fe09031a8dd52d346c37770caf5717641d548b200b42dbce2b4c21dd64d3363794e3fd904c441753fcbd65ac
 MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/tf/files/boost.patch b/dev-ros/tf/files/boost.patch
new file mode 100644
index 000000000000..dd926cf05848
--- /dev/null
+++ b/dev-ros/tf/files/boost.patch
@@ -0,0 +1,28 @@
+From 2eed72cb7b63fc4ee98af695c625d9a741a09897 Mon Sep 17 00:00:00 2001
+From: Maarten de Vries <maarten@de-vri.es>
+Date: Thu, 17 Jan 2019 21:40:28 +0100
+Subject: [PATCH] Remove `signals` from find_package(Boost COMPONENTS ...)
+
+tf is using signals2, which is not the same library as signals.
+Additionally, signals2 has always been header only, and header only
+libraries must not be listed in find_package.
+
+Boost 1.69 removed the old signals library entirely, so the otherwise
+useless `COMPONENTS signals` actually breaks the build.
+---
+ tf/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tf/CMakeLists.txt b/tf/CMakeLists.txt
+index 04dcb4e8..b469f658 100644
+--- a/tf/CMakeLists.txt
++++ b/tf/CMakeLists.txt
+@@ -15,7 +15,7 @@ find_package(catkin REQUIRED COMPONENTS
+     std_msgs
+     tf2_ros
+ )
+-find_package(Boost REQUIRED COMPONENTS thread signals system)
++find_package(Boost REQUIRED COMPONENTS thread system)
+ 
+ catkin_python_setup()
+ 
diff --git a/dev-ros/tf/tf-1.11.9.ebuild b/dev-ros/tf/tf-1.11.9.ebuild
deleted file mode 100644
index 9fbd6e2ea2c0..000000000000
--- a/dev-ros/tf/tf-1.11.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Maintains the relationship between coordinate frames in a tree structure buffered in time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/angles
-	dev-ros/message_filters
-	dev-ros/rosconsole
-	dev-ros/rostime
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/tf/tf-1.12.0.ebuild b/dev-ros/tf/tf-1.12.0.ebuild
index d129d24ee28a..201cf57ee6b6 100644
--- a/dev-ros/tf/tf-1.12.0.ebuild
+++ b/dev-ros/tf/tf-1.12.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
@@ -36,3 +36,4 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
+PATCHES=( "${FILESDIR}/boost.patch" )
diff --git a/dev-ros/turtle_tf/Manifest b/dev-ros/turtle_tf/Manifest
index 26e7f3f340a1..e139c196d00d 100644
--- a/dev-ros/turtle_tf/Manifest
+++ b/dev-ros/turtle_tf/Manifest
@@ -1,4 +1,4 @@
 DIST geometry_tutorials-0.2.2.tar.gz 15148 BLAKE2B 459d2661ef9b21ebf465097c6fb4f01dee2b3d96b0dd6494fe91996513a60764747b2844f931f7351bcea59698e52fcf1d821ce5484ca0bb8b2e1501bdb5492f SHA512 5a6fe2e26d11d3fe8c1fc6979d1d76b13b01df23ef1f0d5e5df094aa0441e1ded33d2402b88be1143a88002ecde2a6bddc3b03efca713bd5521c68de2e054548
-EBUILD turtle_tf-0.2.2.ebuild 639 BLAKE2B 3ff434ac252c9c44b4fbbd0f3e23833938b31d54c253d355c2dfd06db347fca875d507f3985a6827df09a18c2e2ce33e01a0834ec7a4eb0164e7c6080cbcb4e6 SHA512 8b91c226e36b6cc29f2beeb7732a1ffb057a09acfee3133b7d48b3f1c23752d012da8329f5b2cc60f50f2c717530acc96ff4b27428621a90ec9d64b7e82e4746
-EBUILD turtle_tf-9999.ebuild 639 BLAKE2B 3ff434ac252c9c44b4fbbd0f3e23833938b31d54c253d355c2dfd06db347fca875d507f3985a6827df09a18c2e2ce33e01a0834ec7a4eb0164e7c6080cbcb4e6 SHA512 8b91c226e36b6cc29f2beeb7732a1ffb057a09acfee3133b7d48b3f1c23752d012da8329f5b2cc60f50f2c717530acc96ff4b27428621a90ec9d64b7e82e4746
+EBUILD turtle_tf-0.2.2-r1.ebuild 654 BLAKE2B d556aefec8b67ea6295af072a78f9376a88d49d1a02e06a7e2708e35186c3e0ab0ea1236ad6ba66d7c806039e69190229b8cd17d67a53bc7958a5d3acaade21b SHA512 a90c2e1e1a4cd9763638b516c20d4e95a7e7a3458421200f0022b2ce6ff0c4573d4cc205205802864bd4e31cf1ccaa97ea9d0e9079f1da6d95984d4589867f51
+EBUILD turtle_tf-9999.ebuild 654 BLAKE2B d556aefec8b67ea6295af072a78f9376a88d49d1a02e06a7e2708e35186c3e0ab0ea1236ad6ba66d7c806039e69190229b8cd17d67a53bc7958a5d3acaade21b SHA512 a90c2e1e1a4cd9763638b516c20d4e95a7e7a3458421200f0022b2ce6ff0c4573d4cc205205802864bd4e31cf1ccaa97ea9d0e9079f1da6d95984d4589867f51
 MISC metadata.xml 336 BLAKE2B d96d84717f479ca09194af211cae6924a342d43f2007badbe36f8986ce87000b5ee576a796dccbe741707dbeec730100c3a6f0a217bbceaae13b8397627ddf57 SHA512 79de9c6a61f56c0a03ff7eb31ba09215ff77e79a35980d3a63cbfd38cd4d5f84b0a8d6074aeb0d281884bcba981aa8467695a9249fdd644579eabc8bfe787da0
diff --git a/dev-ros/turtle_tf/turtle_tf-0.2.2-r1.ebuild b/dev-ros/turtle_tf/turtle_tf-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..382e9bc485cd
--- /dev/null
+++ b/dev-ros/turtle_tf/turtle_tf-0.2.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Demonstrates how to write a tf broadcaster and listener with the turtlesim"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/turtlesim[${PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf/turtle_tf-0.2.2.ebuild b/dev-ros/turtle_tf/turtle_tf-0.2.2.ebuild
deleted file mode 100644
index 885c2dd1ccbc..000000000000
--- a/dev-ros/turtle_tf/turtle_tf-0.2.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Demonstrates how to write a tf broadcaster and listener with the turtlesim"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/turtlesim[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf/turtle_tf-9999.ebuild b/dev-ros/turtle_tf/turtle_tf-9999.ebuild
index 885c2dd1ccbc..382e9bc485cd 100644
--- a/dev-ros/turtle_tf/turtle_tf-9999.ebuild
+++ b/dev-ros/turtle_tf/turtle_tf-9999.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
@@ -21,5 +21,6 @@ RDEPEND="
 	dev-ros/turtlesim[${PYTHON_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf2/Manifest b/dev-ros/turtle_tf2/Manifest
index 4d886cb4aa42..529737e45ac5 100644
--- a/dev-ros/turtle_tf2/Manifest
+++ b/dev-ros/turtle_tf2/Manifest
@@ -1,4 +1,4 @@
 DIST geometry_tutorials-0.2.2.tar.gz 15148 BLAKE2B 459d2661ef9b21ebf465097c6fb4f01dee2b3d96b0dd6494fe91996513a60764747b2844f931f7351bcea59698e52fcf1d821ce5484ca0bb8b2e1501bdb5492f SHA512 5a6fe2e26d11d3fe8c1fc6979d1d76b13b01df23ef1f0d5e5df094aa0441e1ded33d2402b88be1143a88002ecde2a6bddc3b03efca713bd5521c68de2e054548
-EBUILD turtle_tf2-0.2.2.ebuild 658 BLAKE2B 0128d45162c09334cf5ad8e1ec62fd4ae4c774fe97dba117cfdbb21b37d95445d9aa83112c547fb74d969816a5947455145bd8a274bc630990d6107811875d1e SHA512 9f401fe02153448a2e7cff0072ed6054679c9a711c0428d72801b2af43fd951cc696e9c32be37aa30fde6e3d17f6d3bdc23e118f0ffe9deacd8301548db3106e
-EBUILD turtle_tf2-9999.ebuild 658 BLAKE2B 0128d45162c09334cf5ad8e1ec62fd4ae4c774fe97dba117cfdbb21b37d95445d9aa83112c547fb74d969816a5947455145bd8a274bc630990d6107811875d1e SHA512 9f401fe02153448a2e7cff0072ed6054679c9a711c0428d72801b2af43fd951cc696e9c32be37aa30fde6e3d17f6d3bdc23e118f0ffe9deacd8301548db3106e
+EBUILD turtle_tf2-0.2.2-r1.ebuild 673 BLAKE2B d78c85601295d95e7c6e5184cd6534475ad46b461ef3cc463cd2e4f2172adc824d70a077c42f20250d072b2fd3e6d5504f85311bfd1a71d0881a23e0abc74b78 SHA512 09361b68326c63dedb0b4bc1b8fc50dbf2f9de47d8a6fc2f8b82fb8600e7d9474c3baa6c9e8cc57288a4616cba635204d4f56f4f012dd9c58ae4e8c608bfa351
+EBUILD turtle_tf2-9999.ebuild 673 BLAKE2B d78c85601295d95e7c6e5184cd6534475ad46b461ef3cc463cd2e4f2172adc824d70a077c42f20250d072b2fd3e6d5504f85311bfd1a71d0881a23e0abc74b78 SHA512 09361b68326c63dedb0b4bc1b8fc50dbf2f9de47d8a6fc2f8b82fb8600e7d9474c3baa6c9e8cc57288a4616cba635204d4f56f4f012dd9c58ae4e8c608bfa351
 MISC metadata.xml 336 BLAKE2B d96d84717f479ca09194af211cae6924a342d43f2007badbe36f8986ce87000b5ee576a796dccbe741707dbeec730100c3a6f0a217bbceaae13b8397627ddf57 SHA512 79de9c6a61f56c0a03ff7eb31ba09215ff77e79a35980d3a63cbfd38cd4d5f84b0a8d6074aeb0d281884bcba981aa8467695a9249fdd644579eabc8bfe787da0
diff --git a/dev-ros/turtle_tf2/turtle_tf2-0.2.2-r1.ebuild b/dev-ros/turtle_tf2/turtle_tf2-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..317903b4fac6
--- /dev/null
+++ b/dev-ros/turtle_tf2/turtle_tf2-0.2.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Demonstrates how to write a tf2 broadcaster and listener with the turtlesim"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf2
+	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-ros/turtlesim[${PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf2/turtle_tf2-0.2.2.ebuild b/dev-ros/turtle_tf2/turtle_tf2-0.2.2.ebuild
deleted file mode 100644
index 750c1ccbd2e4..000000000000
--- a/dev-ros/turtle_tf2/turtle_tf2-0.2.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Demonstrates how to write a tf2 broadcaster and listener with the turtlesim"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/turtlesim[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild b/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild
index 750c1ccbd2e4..317903b4fac6 100644
--- a/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild
+++ b/dev-ros/turtle_tf2/turtle_tf2-9999.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
@@ -22,5 +22,6 @@ RDEPEND="
 	dev-ros/turtlesim[${PYTHON_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/visp_auto_tracker/Manifest b/dev-ros/visp_auto_tracker/Manifest
index 5a169e41f614..2be54bfb5b7f 100644
--- a/dev-ros/visp_auto_tracker/Manifest
+++ b/dev-ros/visp_auto_tracker/Manifest
@@ -1,10 +1,7 @@
+AUX boost170.patch 497 BLAKE2B 3ff7f23fe562d9597bd379123721a24a6b949d38ceddce49c4dd0a12d4e6597704511c31fc133ce4d3bb8897c725c6ab207d9330482287ecb44830fb16765e65 SHA512 489454810cb6fa313ac24668c655e59e9a520c32548f9df3b7d0529f0e6a7fc83691a0f2b48d9b1f3f74fc77738e79e06fb0f32fce427c3aff3fa76886b71be7
 DIST vision_visp-0.10.0.tar.gz 1015180 BLAKE2B bf0474d0633a6b704077e232d4676e6ebb9ec666b9b03792dbb929c6c6d1c52a941f7a4517f7bc6a7150882c16ba719eb3cf17c3fbdd13df109eab3a34afa259 SHA512 8e2652d6ca9c9535f1bebb628ec908f64c9fc89358bc92ed42ef12430b0b28c8ed3ed7935d2d3fe03c9761f9ac08e200eb59839ee2243df62d5934e8162cca9c
-DIST vision_visp-0.8.0.tar.gz 1010996 BLAKE2B 4bd5947ddc5c39ae107ea0ff4127ca3f6b9f705793efa4301f10ea2f46e4957c04a64d0df3d84d613a1c1b91c04ff8c6c0e578ea7d4e6420a5bb6974081cf971 SHA512 2bf2d69b6e19de21b34869858672662162703ff8b2aea85fdb9a6dafa88d8fe1f97d18587e863f3f7c088697e931a1b6e4e2e37f31fc7caff0906e98debbad1a
-DIST vision_visp-0.9.1.tar.gz 1014625 BLAKE2B e2d4c6a05e9f155090bf450eaf53ccb9226d5a2fc8ed94d5a548985e870be0fdc57191a5056161a03105c4660acee6fc1353ff8be12b19ee0bd536685cb21795 SHA512 f9ce23286fd9c7706364e9d63e6fb3881bad759aeea72313e5d2a24347f152ba90aab1c73d1b468ed3319e99f0a2bcb81208302825c83be686b9528f3b07469e
-DIST vision_visp-0.9.3.tar.gz 1014883 BLAKE2B 45dcc7b6fc7f80986c57ab92b31ce85ec7806206903b79363e0eb54467043a63300f37fa15292174be3638898acdeb2c3b3a468c11e7ab0ef689b40b8f2c899e SHA512 e5775e410efefaaac00cdfaf07b65f9f77ade0e7d6f40b3d8345d7b594520f46741f56039c1eb0193c57287bafbddf8e755e10d6f85cc12ddefb2b997681f44a
+DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
 EBUILD visp_auto_tracker-0.10.0.ebuild 823 BLAKE2B 057ac6a5573c0d918d421bc327d516fdce3102e8b45d9f7b82ab493b1155cde822a18a181d717939c54f556910cecc0fa62c11141a338b48b9431b5de4209a39 SHA512 e022bf96aa850a4c687ce12d66d695d8e4d26fe569cd79ec8ace67e9fad25b61ca080a8db156e98a082bff56aff6a338da04f6bfc1b0df1e9f9d4bac0ad26719
-EBUILD visp_auto_tracker-0.8.0.ebuild 817 BLAKE2B 41b9a81e16d441dc2cf06bbe5ca6023349a923e50ed16327639001403db82a7e376442e7eb62a7150261dfcd8d6cf208fa6bad1072ed168b3bdccfd7db83432b SHA512 9ea3649c0e37dc9c13e9386980d2b6cfaf0e94e6d9a4b1ca090633ba9c5faf81b7291ae2fe1ad611f33905d2dcc3f83987d374b598a3d8f26b1b68fe865c17ca
-EBUILD visp_auto_tracker-0.9.1.ebuild 817 BLAKE2B 41b9a81e16d441dc2cf06bbe5ca6023349a923e50ed16327639001403db82a7e376442e7eb62a7150261dfcd8d6cf208fa6bad1072ed168b3bdccfd7db83432b SHA512 9ea3649c0e37dc9c13e9386980d2b6cfaf0e94e6d9a4b1ca090633ba9c5faf81b7291ae2fe1ad611f33905d2dcc3f83987d374b598a3d8f26b1b68fe865c17ca
-EBUILD visp_auto_tracker-0.9.3.ebuild 823 BLAKE2B 057ac6a5573c0d918d421bc327d516fdce3102e8b45d9f7b82ab493b1155cde822a18a181d717939c54f556910cecc0fa62c11141a338b48b9431b5de4209a39 SHA512 e022bf96aa850a4c687ce12d66d695d8e4d26fe569cd79ec8ace67e9fad25b61ca080a8db156e98a082bff56aff6a338da04f6bfc1b0df1e9f9d4bac0ad26719
+EBUILD visp_auto_tracker-0.11.1.ebuild 862 BLAKE2B 3676e0cffd02b7a817e56f65daf927dade01accc138e9613ffb3ce792ba8c00b9b8986fc3258b3ad4fb2f153a1b281fa9bfcc078e1d9f6124974038fd323cd4e SHA512 22294bd0393d4e07a44d93ed52c30121ed98356851e9c73a46939cb623662671c3840f13f3192ae69f5e97419aafa5bb594c1ef1fe677697b252b5b84da480ba
 EBUILD visp_auto_tracker-9999.ebuild 823 BLAKE2B 057ac6a5573c0d918d421bc327d516fdce3102e8b45d9f7b82ab493b1155cde822a18a181d717939c54f556910cecc0fa62c11141a338b48b9431b5de4209a39 SHA512 e022bf96aa850a4c687ce12d66d695d8e4d26fe569cd79ec8ace67e9fad25b61ca080a8db156e98a082bff56aff6a338da04f6bfc1b0df1e9f9d4bac0ad26719
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_auto_tracker/files/boost170.patch b/dev-ros/visp_auto_tracker/files/boost170.patch
new file mode 100644
index 000000000000..47f04d4989a3
--- /dev/null
+++ b/dev-ros/visp_auto_tracker/files/boost170.patch
@@ -0,0 +1,13 @@
+Index: visp_auto_tracker/CMakeLists.txt
+===================================================================
+--- visp_auto_tracker.orig/CMakeLists.txt
++++ visp_auto_tracker/CMakeLists.txt
+@@ -36,7 +36,7 @@ find_package(catkin REQUIRED COMPONENTS
+ find_package(VISP)
+ 
+ find_package(Boost REQUIRED
+-  COMPONENTS filesystem system signals regex date_time program_options thread)
++  COMPONENTS filesystem system regex date_time program_options thread)
+ 
+ include_directories(
+   ${Boost_INCLUDE_DIRS}
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1.ebuild
new file mode 100644
index 000000000000..dcd584eb2644
--- /dev/null
+++ b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.11.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Online automated pattern-based object tracker relying on visual servoing"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/message_filters
+	dev-ros/resource_retriever
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visp_bridge
+	dev-ros/visp_tracker
+	sci-libs/ViSP:=[dmtx,zbar]
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+fi
+
+PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.8.0.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.8.0.ebuild
deleted file mode 100644
index 6db3ddb1a6d2..000000000000
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="jade-"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Online automated pattern-based object tracker relying on visual servoing"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visp_bridge
-	dev-ros/visp_tracker
-	sci-libs/ViSP:=[dmtx,zbar]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-jade-${PV}/${ROS_SUBDIR}"
-fi
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.9.1.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.9.1.ebuild
deleted file mode 100644
index 6db3ddb1a6d2..000000000000
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.9.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="jade-"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Online automated pattern-based object tracker relying on visual servoing"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visp_bridge
-	dev-ros/visp_tracker
-	sci-libs/ViSP:=[dmtx,zbar]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-jade-${PV}/${ROS_SUBDIR}"
-fi
diff --git a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.9.3.ebuild b/dev-ros/visp_auto_tracker/visp_auto_tracker-0.9.3.ebuild
deleted file mode 100644
index 119d92d4d319..000000000000
--- a/dev-ros/visp_auto_tracker/visp_auto_tracker-0.9.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=5
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Online automated pattern-based object tracker relying on visual servoing"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visp_bridge
-	dev-ros/visp_tracker
-	sci-libs/ViSP:=[dmtx,zbar]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
-fi
diff --git a/dev-ros/visp_bridge/Manifest b/dev-ros/visp_bridge/Manifest
index 25086193f109..97dfb54b94c1 100644
--- a/dev-ros/visp_bridge/Manifest
+++ b/dev-ros/visp_bridge/Manifest
@@ -1,5 +1,7 @@
 AUX gcc6.patch 362 BLAKE2B 07aa55e77c23987add38afbb9612a4ac17d4295a51deff3986c9fa4eacf2604815d2cb654169c03c2943c7e6e0d8041ab1a3f380656643f660f176abfa347e67 SHA512 b4fc5219f35ac7ce1a81cf7b82ce0aebaef61b6e20cf42e62a1811c996dd0a68fe92dc49642ff38454c5d1f5496dbe954ba4029c93791f8ddefe71118377a03f
 DIST vision_visp-0.10.0.tar.gz 1015180 BLAKE2B bf0474d0633a6b704077e232d4676e6ebb9ec666b9b03792dbb929c6c6d1c52a941f7a4517f7bc6a7150882c16ba719eb3cf17c3fbdd13df109eab3a34afa259 SHA512 8e2652d6ca9c9535f1bebb628ec908f64c9fc89358bc92ed42ef12430b0b28c8ed3ed7935d2d3fe03c9761f9ac08e200eb59839ee2243df62d5934e8162cca9c
+DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
 EBUILD visp_bridge-0.10.0.ebuild 764 BLAKE2B 2a80f9321f45777b263c2b38d4a151ff94b448d1bcb3805e84fc1550248970867a17dd43e33fb4843b4ce59d02abdfd7ddf53daf356e3e0c3225403843306c72 SHA512 13d806ca821ae4c682af8c627d30a6803d0e3afe061e395c4115477d4826995117a4fe49dfabdcfa69aa591d2c8bc749aca7201ce7001664ac51b1ef138551ab
+EBUILD visp_bridge-0.11.1.ebuild 761 BLAKE2B c63d9082f7f2bc459f3584c93694eba59a7851a2e509cbad53568b7ad0334aa8077ec516ac60ba544d7ca7919ba6a603952d5be8398d45698da38cbd2ec61638 SHA512 c1684e01f02bcce559c910a0a9a9f45b85b8f36fcaa686500129c911a80d92d8eb8ed813f408b826e90a6731843af1eb37ee5ccf2d2fd7844f3397002eca4e59
 EBUILD visp_bridge-9999.ebuild 764 BLAKE2B 2a80f9321f45777b263c2b38d4a151ff94b448d1bcb3805e84fc1550248970867a17dd43e33fb4843b4ce59d02abdfd7ddf53daf356e3e0c3225403843306c72 SHA512 13d806ca821ae4c682af8c627d30a6803d0e3afe061e395c4115477d4826995117a4fe49dfabdcfa69aa591d2c8bc749aca7201ce7001664ac51b1ef138551ab
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_bridge/visp_bridge-0.11.1.ebuild b/dev-ros/visp_bridge/visp_bridge-0.11.1.ebuild
new file mode 100644
index 000000000000..f6afcabe1f31
--- /dev/null
+++ b/dev-ros/visp_bridge/visp_bridge-0.11.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Converts between ROS structures and ViSP structures"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-libs/ViSP:=[xml]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/camera_calibration_parsers
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_camera_calibration/Manifest b/dev-ros/visp_camera_calibration/Manifest
index 5edf466eb84b..aeffa65c9208 100644
--- a/dev-ros/visp_camera_calibration/Manifest
+++ b/dev-ros/visp_camera_calibration/Manifest
@@ -1,6 +1,8 @@
 AUX boost.patch 763 BLAKE2B 35752cfddd17e214035570181bab527d86c670be398be4f092b02dacd16ff041f30351258518f70548e5af8c34616b3b945af4bc2c6e6fb5578e2fc1963f1829 SHA512 32e9b218ea6d66658cf4d999607e798b232cc160bb8b305e20fee8f3204ea1344cfe8ef54eead8e61cd84870a5a37f7205d7ff1da82d6a19610967985122ed65
 AUX gcc6.patch 421 BLAKE2B cf5b648dbd6d5121db22cee0aaddd9a359a87e9305e3887b4ec15b148e2921baf2562c9c377abb6c848088ce9592952bf537469fbe68cc025ad6e32db8817c61 SHA512 a4ed8165e1a8099d79bfe48563558bbb6de20b90dcc7def4b9dbb46a6c1115cbacfe09ed0c3ddb2b654914fe3b49554f11453fc3d2c87c8841b6755a24f08c4e
 DIST vision_visp-0.10.0.tar.gz 1015180 BLAKE2B bf0474d0633a6b704077e232d4676e6ebb9ec666b9b03792dbb929c6c6d1c52a941f7a4517f7bc6a7150882c16ba719eb3cf17c3fbdd13df109eab3a34afa259 SHA512 8e2652d6ca9c9535f1bebb628ec908f64c9fc89358bc92ed42ef12430b0b28c8ed3ed7935d2d3fe03c9761f9ac08e200eb59839ee2243df62d5934e8162cca9c
+DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
 EBUILD visp_camera_calibration-0.10.0.ebuild 848 BLAKE2B 16cb6a6339f61c1059211ef5e342a041c0eaaf6db8fee2caa74059287568b46aec22508df3e093171e2dedd515d0be006fb860fb0f8d7660f925880cbf487471 SHA512 12ff2d1a1cf572e4a79c63cfdaab543cda1c84c5a0da6327e231da45a01cc04c1dfe0b69bf6ffdda9302ea3182976c5758018f1a7b5ee10bb615cdf90871e992
-EBUILD visp_camera_calibration-9999.ebuild 848 BLAKE2B 16cb6a6339f61c1059211ef5e342a041c0eaaf6db8fee2caa74059287568b46aec22508df3e093171e2dedd515d0be006fb860fb0f8d7660f925880cbf487471 SHA512 12ff2d1a1cf572e4a79c63cfdaab543cda1c84c5a0da6327e231da45a01cc04c1dfe0b69bf6ffdda9302ea3182976c5758018f1a7b5ee10bb615cdf90871e992
+EBUILD visp_camera_calibration-0.11.1.ebuild 822 BLAKE2B 7ac77d0d3bb577f52e68fa8757d4212a39aac172258c7818349f3c7943a1ec10cd01f0b536a2ebbe3b73ceed7060e307b2572df69eaace8fbc4816f7e18ddd44 SHA512 24a271be96708e3766681a2b5e3d512090f7daa87a1ed17adaa69de764d5e5e6c76797507eed07b8c7df6f546002adea2d20812bcc31b3f98d7bab0a7a17dcac
+EBUILD visp_camera_calibration-9999.ebuild 822 BLAKE2B 7ac77d0d3bb577f52e68fa8757d4212a39aac172258c7818349f3c7943a1ec10cd01f0b536a2ebbe3b73ceed7060e307b2572df69eaace8fbc4816f7e18ddd44 SHA512 24a271be96708e3766681a2b5e3d512090f7daa87a1ed17adaa69de764d5e5e6c76797507eed07b8c7df6f546002adea2d20812bcc31b3f98d7bab0a7a17dcac
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_camera_calibration/visp_camera_calibration-0.11.1.ebuild b/dev-ros/visp_camera_calibration/visp_camera_calibration-0.11.1.ebuild
new file mode 100644
index 000000000000..41bd62f885fa
--- /dev/null
+++ b/dev-ros/visp_camera_calibration/visp_camera_calibration-0.11.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_5} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Calibration of cameras using a customizable pattern and ViSP library"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/camera_calibration_parsers
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/visp_bridge
+	sci-libs/ViSP:=
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild b/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
index f92c1cac82c2..41bd62f885fa 100644
--- a/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
+++ b/dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild
@@ -29,4 +29,4 @@ DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
 	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
 fi
-PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_hand2eye_calibration/Manifest b/dev-ros/visp_hand2eye_calibration/Manifest
index be809e888cba..ddb8555f5fb1 100644
--- a/dev-ros/visp_hand2eye_calibration/Manifest
+++ b/dev-ros/visp_hand2eye_calibration/Manifest
@@ -1,4 +1,6 @@
 DIST vision_visp-0.10.0.tar.gz 1015180 BLAKE2B bf0474d0633a6b704077e232d4676e6ebb9ec666b9b03792dbb929c6c6d1c52a941f7a4517f7bc6a7150882c16ba719eb3cf17c3fbdd13df109eab3a34afa259 SHA512 8e2652d6ca9c9535f1bebb628ec908f64c9fc89358bc92ed42ef12430b0b28c8ed3ed7935d2d3fe03c9761f9ac08e200eb59839ee2243df62d5934e8162cca9c
+DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
 EBUILD visp_hand2eye_calibration-0.10.0.ebuild 755 BLAKE2B b35b30e3ea6bfb2bacebf0ffdab567ea22f041dd3cc7bfb4b4b456c89d9823a078c7941c8e0914e9a58c341e53930bff35952c515e62dc56050af64ddfba2100 SHA512 ed589d3eeddf49c9d3a43be5935d06153d49d4a784f900ce7c5df567bfa86b38ce37a0c326bb0a1ab8c9f217b67c1c79e6a66c6603776550828c2964f378100e
+EBUILD visp_hand2eye_calibration-0.11.1.ebuild 755 BLAKE2B b35b30e3ea6bfb2bacebf0ffdab567ea22f041dd3cc7bfb4b4b456c89d9823a078c7941c8e0914e9a58c341e53930bff35952c515e62dc56050af64ddfba2100 SHA512 ed589d3eeddf49c9d3a43be5935d06153d49d4a784f900ce7c5df567bfa86b38ce37a0c326bb0a1ab8c9f217b67c1c79e6a66c6603776550828c2964f378100e
 EBUILD visp_hand2eye_calibration-9999.ebuild 755 BLAKE2B b35b30e3ea6bfb2bacebf0ffdab567ea22f041dd3cc7bfb4b4b456c89d9823a078c7941c8e0914e9a58c341e53930bff35952c515e62dc56050af64ddfba2100 SHA512 ed589d3eeddf49c9d3a43be5935d06153d49d4a784f900ce7c5df567bfa86b38ce37a0c326bb0a1ab8c9f217b67c1c79e6a66c6603776550828c2964f378100e
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.11.1.ebuild b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.11.1.ebuild
new file mode 100644
index 000000000000..3266f4d20f9f
--- /dev/null
+++ b/dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.11.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_5} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Estimates the camera position with respect to its effector using the ViSP library"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_proc
+	dev-ros/roscpp
+	dev-ros/sensor_msgs
+	dev-ros/visp_bridge
+	dev-ros/visp_tracker
+	sci-libs/ViSP:=
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+fi
diff --git a/dev-ros/visp_tracker/Manifest b/dev-ros/visp_tracker/Manifest
index 8bbc978aa7f5..9492da77860e 100644
--- a/dev-ros/visp_tracker/Manifest
+++ b/dev-ros/visp_tracker/Manifest
@@ -1,5 +1,7 @@
 AUX gcc6.patch 350 BLAKE2B 5e0f54319cc37bf0a4cf46e3b96f37bdb059af0f0e4a2b7219363504c96a2ed43121f4028c4d264959f1cf78e10d329ac67ee85d6a2868212b0cbcf924e2f93d SHA512 b1647cca84792212a1fe20685e83ee28fc225fb7272ed892fdbc4faae809059ce955cf5df1d8b3543c1248a741ad9a0bcb263a547aa21be2cebd8608dfba457e
 DIST vision_visp-0.10.0.tar.gz 1015180 BLAKE2B bf0474d0633a6b704077e232d4676e6ebb9ec666b9b03792dbb929c6c6d1c52a941f7a4517f7bc6a7150882c16ba719eb3cf17c3fbdd13df109eab3a34afa259 SHA512 8e2652d6ca9c9535f1bebb628ec908f64c9fc89358bc92ed42ef12430b0b28c8ed3ed7935d2d3fe03c9761f9ac08e200eb59839ee2243df62d5934e8162cca9c
+DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
 EBUILD visp_tracker-0.10.0-r2.ebuild 1082 BLAKE2B 8a3c5df1b1082f6146b1e651b9a3b56135fa8f9f7ef225d1f9a18da8065d3afabf3b2ffa373bc0046e6364d7c90718ed4d4221cc955be9f102cc322bc09af8fd SHA512 867d3842ca354574e0434538fc02bb2163cd658c95c354ca318453a94acd42b98741efb04177510e56249aa4407bd63a08cb4d5a852d46edc203a134182cb491
+EBUILD visp_tracker-0.11.1.ebuild 1079 BLAKE2B 9336683df158dfd87f52b7e491274e3e7368dace92534e5eda9f4fe922cc5459f6b7299e9929b6fde0d51f413861a667d286a70549ec6ba492f47273a7255e28 SHA512 a1a439e2cabbfac28bb20c973508839845beb286f0e8d08617a72d3b3b15b8eb073c15d83bbc426ee489222b0d3f678a2f5ec535552365f271450600a4fd09fc
 EBUILD visp_tracker-9999.ebuild 1082 BLAKE2B 8a3c5df1b1082f6146b1e651b9a3b56135fa8f9f7ef225d1f9a18da8065d3afabf3b2ffa373bc0046e6364d7c90718ed4d4221cc955be9f102cc322bc09af8fd SHA512 867d3842ca354574e0434538fc02bb2163cd658c95c354ca318453a94acd42b98741efb04177510e56249aa4407bd63a08cb4d5a852d46edc203a134182cb491
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_tracker/visp_tracker-0.11.1.ebuild b/dev-ros/visp_tracker/visp_tracker-0.11.1.ebuild
new file mode 100644
index 000000000000..7f8945759d9f
--- /dev/null
+++ b/dev-ros/visp_tracker/visp_tracker-0.11.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Wraps the ViSP moving edge tracker provided by the ViSP visual servoing library into a ROS package"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-ros/dynamic_reconfigure
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/image_proc
+	dev-ros/image_transport
+	dev-ros/nodelet
+	dev-ros/resource_retriever
+	dev-ros/roscpp
+	dev-ros/sensor_msgs
+	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/ViSP:=[opencv,X]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 1b355d1ded70..14631f7a3134 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/acme-client/Manifest b/dev-ruby/acme-client/Manifest
index 52c4e1f8fbac..4e667864907c 100644
--- a/dev-ruby/acme-client/Manifest
+++ b/dev-ruby/acme-client/Manifest
@@ -1,5 +1,7 @@
 DIST acme-client-2.0.2.gem 19968 BLAKE2B 7a877d86ac4828fec08edd606b2f4f31788454ebe8109b1e94d28f33d00b0a3e49aa7ad8d3b46fa2440bcd1d7cda1c53ab91d6be6280dfeb0e5ccddcac02ed25 SHA512 e02fe9f919f8d5356bc60d0b6f2d05db42e5d6671762bfac45aafb118647e2d0b50cd7336dfa1f0983432e2bddb0344d1b240bd674e31ad14385adc15d58e1e1
 DIST acme-client-2.0.3.tar.gz 203320 BLAKE2B f5bc600c58b29429b8615b0d8cdadade9a4c7018068c356cfd481eee8b7718c19e736c620a752ef1a68ae70e8f641f3fb2ef7bcd44b70ac63cc97bad19ab3579 SHA512 c2b2bcba1cfe9184922cdfaafd02bdb51abf11cb39457e89f0670098bf9d240332129144fd4a7fcbc214a1496dbde576236ea15634b70f8f3fe22304d769f0c2
+DIST acme-client-2.0.4.tar.gz 206295 BLAKE2B 5758a940e91036de04183ace9d076649cce220e18c92abbbf683026fd4fc1d05b3d2c735553648daac0f57f5e4c5c865679607d38f663af7623bd60fac99eff1 SHA512 3e8998ddedc69c6d2a15927be278ef055d1be0fe906c499504ecba811189e5ebbd9c1f54df8692bc0135766dfc8cfbd80f27ee345eab8bcd0126fac62be33742
 EBUILD acme-client-2.0.2.ebuild 481 BLAKE2B 0c020887aa03ed71174f1cdf8ebc8d3867984cb40e6dfef6962d92f9345babbb0718ed0c8566aca7f423df8af4a3c963ec894f550817bee73f33516ee4466a1a SHA512 5688074abb247833350b8d966fd05956ce8a4e1337047dc08806d4ccafe5c90ba26fc9da107c04ca82e5984e8842fe669150aa3436956db09bfc4b8de0306543
 EBUILD acme-client-2.0.3.ebuild 842 BLAKE2B 3442fb202735a83a8b04d9486b08ff806f7a8af5aaa2a99a8a81bc942df04bf8c1819f2f42922a69c74b460008c608e53d2641588b1780495a84f6c9af00680e SHA512 1a6bde736be125430aa621474023fd01497d18a4adfe6c1cecfb6175f06121eac34acd1528c208f88cfcd6d076293717cdf3f8ed412f76ebededc24f6d3113f7
+EBUILD acme-client-2.0.4.ebuild 961 BLAKE2B 28f1105c3dac42d7685b06b1f2be9f3df32e6d1c1f870e42127ed05424b5ba21c5d3733c59096c80d70a8be272900dbad72439afc842ec3587b670a2a35bbfd2 SHA512 4f22950365f0af89a798eaacef9abf4861390f149c93597979e1ec3ca5fd103ab2a36d0c958dc86815fb2d350c3a5f557590d6f9adebe553c4d373364503e6a9
 MISC metadata.xml 542 BLAKE2B 2902d90ca553bacbcbe63ab667666b71bf156426583e91296742628aab47628205c2af8e9310795d573e894ac01ea9d178f70c45a962a8448031b1dc69c7860d SHA512 b8da5f9492916504fde0846a7eb3c2480b101f2ab419120c840a831b5180f88e2745350a729d0388acb5767b94e586ec5475674bae6805dc48811d92287eea0b
diff --git a/dev-ruby/acme-client/acme-client-2.0.4.ebuild b/dev-ruby/acme-client/acme-client-2.0.4.ebuild
new file mode 100644
index 000000000000..24a1c78f83c9
--- /dev/null
+++ b/dev-ruby/acme-client/acme-client-2.0.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="acme-client.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby client for the letsencrypt's ACME protocol."
+HOMEPAGE="https://github.com/unixcharles/acme-client"
+SRC_URI="https://github.com/unixcharles/acme-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/faraday-0.9.1:0"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/vcr-2.9.3
+	dev-ruby/webmock
+)"
+
+all_ruby_prepare() {
+	# Skip failing test where incorrect der value is retrieved, may be openssl 1.1.x related.
+	sed -i -e '/assigns the public key/apending' spec/certificate_request_spec.rb || die
+
+	# Avoid dependency on git
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index fc717a310871..eacfc1955a88 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,5 +1,7 @@
 DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce5252e8fbe4eb4c6935dc660614c2ff29fd168bbc66d74bfa64b92abb84d02645cb3b2950db5c166111b7b19 SHA512 6595eb19f174c9e46a937d6028d9bb2bfdcda06f35ec2a0499bc5deff05d8cfc8f8fc725e664496d3b431c8724141a1410201b57945b98ca211aea15c990d621
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
+DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
 EBUILD actioncable-5.1.7.ebuild 990 BLAKE2B 87a5637568d66600ed414e4ae27b69e4babbf3a4020398e92fe34c85dc10b5cf34a32c7167ea72c8f9f1b7542031d001564637eca10328e1afa1940cb99b502d SHA512 2c83d7ba10c88a10e086d04867f770593576268c5ec82d2a1bedf11ae6a319fe4defac52a1416e5a4dca9f8faac8565415bf45348d85c9a9d57e5eb6e7d04a52
 EBUILD actioncable-5.2.3.ebuild 950 BLAKE2B b844d7a524d987ce006f27b00525958f4e30c44ff49e66fa2a877422a6e35ea20f39bad6150244df31e44c43a2648c7d5f3847025b7d731c24dad80357e4dce3 SHA512 f17521f92f705b9c93e6697a2364894b3bbd67e9ad4987c7406b0558d5a625ab8c5c30bfd2b4df044e06484e215e4a76c447858b3ef714d8d600a717492ada62
+EBUILD actioncable-6.0.0.ebuild 911 BLAKE2B 93fd23504c4a60cd3d90f3d8dd2611e5fa40817f56d0455d1054fb3f2710f56710460c208832fe69f176f39a6cc7fd10b2c25acb629af0a773c163e6af076504 SHA512 5a8e547e7428471ae2496636a7c011bdfca85b6835800468fe36d7ac12402e8da8930658072f0861f728a14854eed27022a4d513044deea73dacd4660afb0199
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actioncable/actioncable-6.0.0.ebuild b/dev-ruby/actioncable/actioncable-6.0.0.ebuild
new file mode 100644
index 000000000000..636672deef02
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-6.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
new file mode 100644
index 000000000000..e70e1945d7cd
--- /dev/null
+++ b/dev-ruby/actionmailbox/Manifest
@@ -0,0 +1,3 @@
+DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
+EBUILD actionmailbox-6.0.0.ebuild 1625 BLAKE2B d59f8b89ae8227dbeeec0e2eb4362d57e546c7afbcefb55e6780e485614e06a71d10dd9a95273c4737c4bcfd2536c520b4142206b8e5866475918d9b9d3e0626 SHA512 1b94761dabba727c52a2db94c2edf8e06feece7092f8deb6279ab31b0d317647d7cf9bbf96bd2f4f8e6f4305e787c7aa5aa973f053c86f434420dd6191511079
+MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.0.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.0.ebuild
new file mode 100644
index 000000000000..f219dd402534
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-6.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.7.1:*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailbox/metadata.xml b/dev-ruby/actionmailbox/metadata.xml
new file mode 100644
index 000000000000..42d41e33d990
--- /dev/null
+++ b/dev-ruby/actionmailbox/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rails/rails</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 6e42ca60c93f..7b3d9ed8af81 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,7 +1,9 @@
 DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce5252e8fbe4eb4c6935dc660614c2ff29fd168bbc66d74bfa64b92abb84d02645cb3b2950db5c166111b7b19 SHA512 6595eb19f174c9e46a937d6028d9bb2bfdcda06f35ec2a0499bc5deff05d8cfc8f8fc725e664496d3b431c8724141a1410201b57945b98ca211aea15c990d621
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
+DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
 EBUILD actionmailer-4.2.11.1.ebuild 1668 BLAKE2B be5e490a600cd21d3e4938e65f6932a0b9728b0fd1ee95dc6a7a78124d880e2400b34761d0ac6b66e1058e61545a35f0a4f9b1ee0d66afb27ef643cd4c2b61fb SHA512 c602745eaab8bd280a4a1afc418ca2ff095dfbc14b2309831e99c2486171cd0e6bad446bfd44b43bc57ec2331f1e6b2beea9ab14581fabdf3412f0d5b44098da
 EBUILD actionmailer-5.1.7.ebuild 1369 BLAKE2B 519dbe4c1e91dda2497d31d2dad560d8d07a80b39c573d39c08b066ce6446d6baae2f99c81a5bc9815d80aff8b3e25673647bca3eda5c764b0c042adb027c4e4 SHA512 0a7d2b938d8e50210670b0e862f42b274a65dd0601596416555e842c61639c28e8bdb0a672d5c691e632f5f23e5fb2845bbbfd874cf6b3a423325d026185da2c
 EBUILD actionmailer-5.2.3.ebuild 1298 BLAKE2B 38d3fa328e458b3fe692403e834fbf491ef802fae597b1df84a439a9ec369ae81db2aa8b45b5b25d7e399422c1d038c9511679fc16cfba2350831616d1c486e8 SHA512 beb5906e5b928e38d626e60fe635ab1b53bbb710c152ed550d922a4e4070ee64026c97115e79d1e80359d74c8ae9bb5479897f453112e2256231e3975e5e39e2
+EBUILD actionmailer-6.0.0.ebuild 1239 BLAKE2B 6742e800e21a3361c90bb273860433a98b0d33a37a53ef0ef1aa235372d3a580d79600c09410bf9060632dfeb60cd278ca8f38192b6b6a8a01d866fc7d4be247 SHA512 1b0d71f8387ee022f71e26633a4e121baeed9140f97b9e4f361eb3b719d2a577d5c95b1b8e0c2bbef3d3bd1fac0951eb1938c231dd09b11a004322883eb0a939
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.0.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.0.ebuild
new file mode 100644
index 000000000000..bdccb6635d01
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-6.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
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index f3e8de56c798..7cc71c7efde6 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,7 +1,9 @@
 DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce5252e8fbe4eb4c6935dc660614c2ff29fd168bbc66d74bfa64b92abb84d02645cb3b2950db5c166111b7b19 SHA512 6595eb19f174c9e46a937d6028d9bb2bfdcda06f35ec2a0499bc5deff05d8cfc8f8fc725e664496d3b431c8724141a1410201b57945b98ca211aea15c990d621
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
+DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
 EBUILD actionpack-4.2.11.1.ebuild 1858 BLAKE2B 92cfe0735197abfb283c49b28887d421166ea56dbded2d6ce84089cd85d10c2d58ff5c53e4576094c6bfe6eda08d495cbb64e8ed5c589a675de1b9406a3d8451 SHA512 35c6071ac1d25db006886699e59bdaeaa64ec31cc70ff5cdaf41fd046d8fe87ff63ef1bb84acfba974420f3844a58fc243568ab8a2fdc201fa2add9d4dbb3981
 EBUILD actionpack-5.1.7.ebuild 1717 BLAKE2B f702eaf4b01db58bf0cce994f4c06110ef5ce41c612c7f6af33b7fb4e20097d21cf902a3b076b0837acb8dcd311536be4bb0be8a47ef93ab7cdf83085f7ba5d7 SHA512 3d81e4ebdab892c38f9405765ab59f7ecb6b2cbf8d482887f515e138cb50d193857afe475cc66dbe52f55e2d6006a75d5074e2877df8089dc03afacc6124e4b3
 EBUILD actionpack-5.2.3.ebuild 1577 BLAKE2B 488030d095bb40efcba8f2e7a83e10cc7528d17dc70ac26481016b5aaab7b4c86ffa231fc4e2572f41d7e2960488bd3b3578fbd24ae103460d0a3e954f3e57b9 SHA512 bf3a83d1c6db91e5335f74b61234d5139f880415688abea40963d39184496860b23466cf674954aa3fcae5fb6b68525bf26858d5db0fb1078fca40405428006c
+EBUILD actionpack-6.0.0.ebuild 1519 BLAKE2B 58340edb4cdac7130025bfccee7755851849e459245d047c23d6947313605870e3b202e717a701d872796f8aadf4dd0bf3fe5a872f07c184ec391de7c3fe12a7 SHA512 0c01d1235cdf5bc56333deb7c5152a00efdd89508789213127ab55f7a20c15ad848f3a45187da4ec2137f462c16bb92e0df8dea796175cea696fc6451346f2c4
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-6.0.0.ebuild b/dev-ruby/actionpack/actionpack-6.0.0.ebuild
new file mode 100644
index 000000000000..3a42d564dd50
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-6.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	dev-ruby/rack:2.0
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		>=dev-ruby/capybara-2.15
+		~dev-ruby/activemodel-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+		www-servers/puma
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
new file mode 100644
index 000000000000..6c86d5382e79
--- /dev/null
+++ b/dev-ruby/actiontext/Manifest
@@ -0,0 +1,3 @@
+DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
+EBUILD actiontext-6.0.0.ebuild 1607 BLAKE2B 6294815964645e24077c781df8873014ba7c37fb2c371ba448a7c1d76df7a867810d2fafeeb4a9caf05bcbd98ca645fa180cfa003612c24799e87f0975ffe7f7 SHA512 2dc4f793ba1ae7f2386cff0aabe63487f87808973e25450363c08d1c241d60e07e79ca991d13a75f41c20e41cadf1acd0f60b424284646522e342a53ad3be9ef
+MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actiontext/actiontext-6.0.0.ebuild b/dev-ruby/actiontext/actiontext-6.0.0.ebuild
new file mode 100644
index 000000000000..a70a3765a19b
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-6.0.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actiontext/metadata.xml b/dev-ruby/actiontext/metadata.xml
new file mode 100644
index 000000000000..42d41e33d990
--- /dev/null
+++ b/dev-ruby/actiontext/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rails/rails</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index b9500fa70680..8232b7c590ab 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,7 +1,9 @@
 DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce5252e8fbe4eb4c6935dc660614c2ff29fd168bbc66d74bfa64b92abb84d02645cb3b2950db5c166111b7b19 SHA512 6595eb19f174c9e46a937d6028d9bb2bfdcda06f35ec2a0499bc5deff05d8cfc8f8fc725e664496d3b431c8724141a1410201b57945b98ca211aea15c990d621
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
+DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
 EBUILD actionview-4.2.11.1.ebuild 1585 BLAKE2B c001b8c56264e3d1969bf8c07c54ae6580cde982b38147c4c15eb1320e4ccd4228f1b554dc80c1f04150d6e14dedd25687e9d3707881532eba44286e9cbfec61 SHA512 c7de03ec6a2865e763be290f1f76cbcee866a20d49f3aaf44ff4f040ac0e5a878ce94083eca8d5817b30908997c25e82b4ccd84569ac770affc30e8f7169c5d8
 EBUILD actionview-5.1.7.ebuild 1877 BLAKE2B 2a1be3acaa314ed7ae85062f0c425b9c1402e8fca365341f76087bbf0a76bcc56102eacd84f8924326f428b99c83d92498a1ed99a2789e8e02162d25216bda61 SHA512 36af5a0630c889fffd2767740075c1d07ab51fc36c169a5fb8dce5e6a9dc3101856b007cfe52448e080cacc814fc938e940ee927b4cd1021db688932af4f40ef
 EBUILD actionview-5.2.3.ebuild 1733 BLAKE2B e63d86214aed2a50ed7e759c615f5ff8e8a89fe070e09227fafbc39af565c537f1f4010d1cccbff57c79dfac89b9bb2128cd6779d17c1b10e17b450a498e5bac SHA512 b91c7cf9893601564fc9ad9ca1f23048a8ec36631ed57a02c1d8850decd583135dea306ad4e8158dc669475f037ff850ad3e454d3fb16b91d4ef78556058738a
+EBUILD actionview-6.0.0.ebuild 1706 BLAKE2B c8873d1c0e2a62bddbdbea9d15097f36965bfd0139aa4edfe21d6e74bcd602b503e7cc1c0838f1f60b6761d93701c38a06a4919712e4e23cb7db12045aeb7e59 SHA512 e5ac7b9f70838431364485e05799296951a2338632a1b572cf34d3043c2b1c79344706f5a333e0d31094f8126acbab2a48faff47edce34e799a4def47db55015
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-6.0.0.ebuild b/dev-ruby/actionview/actionview-6.0.0.ebuild
new file mode 100644
index 000000000000..8f84d5478fc9
--- /dev/null
+++ b/dev-ruby/actionview/actionview-6.0.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubi-1.4:0
+	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/activerecord-${PV}
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid tests failing due to missing logger setup in activerecord,
+	# most likely related to test environment setup.
+	rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 68372545a7d5..b384a3dc1973 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,7 +1,9 @@
 DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce5252e8fbe4eb4c6935dc660614c2ff29fd168bbc66d74bfa64b92abb84d02645cb3b2950db5c166111b7b19 SHA512 6595eb19f174c9e46a937d6028d9bb2bfdcda06f35ec2a0499bc5deff05d8cfc8f8fc725e664496d3b431c8724141a1410201b57945b98ca211aea15c990d621
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
+DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
 EBUILD activejob-4.2.11.1.ebuild 1070 BLAKE2B bdd6e12043c4ee89a5efe8477e44d0d40d15a6f8f14952d9059fc2380f8c4a4e94365057673e16b2f08ee15df2a5b401215b1bd3f1ec6ca6a4584698d6933cda SHA512 6e9cc9d8e3097bbd6e0fbf3fd57a5b40d7abcf43482e1df2a9c104acab407b4818508580953f713aea500dca6a2a192b64935a2c4d506a1f229a756468af2196
 EBUILD activejob-5.1.7.ebuild 1092 BLAKE2B c15aa9687bb0058e15d7841c2a8eda4c51161641163e074126ef724386d93b694d7110a183912efe8809f6dd74fb4ad1deb599ff6031771e4a019a2971e06845 SHA512 cbe36a5bafabae30dcf372190dca67639e50b795ba07589b85aabcaa844a8279dfb36d16ad07da110db56ff74eb4e1ec5c70b491377425483df3b4406fd30141
 EBUILD activejob-5.2.3.ebuild 1095 BLAKE2B c20b0752adf82a1f80058c695b1d5795a94a04fbbf91ce5eb15ff6c76a3a5b5457d7862bc9658af15012f7b21d89f84a67bd55d44b446cb5673f4dbfaf4d412a SHA512 bc80304fff0a768b70f3eced836dedc9da6e0c272165f77093e941be9eaffecbf0c2af189bc519641ad45bff6acf465e743b2526db13d90ae5292a0e8c42b645
+EBUILD activejob-6.0.0.ebuild 1107 BLAKE2B 65b60b951f5b5b3f93330e2d964bcf3c4840d34eba104a4308cf8032ffbaa8ced34aa3948dc4ccb48cfbc0f6700b52bed4cf2a9a931a362269a038796b9be8b5 SHA512 f2400924826a78bbe3f653db8e63f8de03a6e0fed67b8bf9f1b61844257f07adf51dd7a6c2c2115034ee6a6e74422e0f01125c04629456dd0fa56b5a3194ca79
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activejob/activejob-6.0.0.ebuild b/dev-ruby/activejob/activejob-6.0.0.ebuild
new file mode 100644
index 000000000000..ed669a6589dc
--- /dev/null
+++ b/dev-ruby/activejob/activejob-6.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+		-e 's/delayed_job//' Rakefile || die
+	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 23b997f16cb6..795899f90d52 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,7 +1,9 @@
 DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce5252e8fbe4eb4c6935dc660614c2ff29fd168bbc66d74bfa64b92abb84d02645cb3b2950db5c166111b7b19 SHA512 6595eb19f174c9e46a937d6028d9bb2bfdcda06f35ec2a0499bc5deff05d8cfc8f8fc725e664496d3b431c8724141a1410201b57945b98ca211aea15c990d621
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
+DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
 EBUILD activemodel-4.2.11.1.ebuild 1636 BLAKE2B 670d133746729c900586c4238698548c8aedcc90f670c3d80d20d1841d4123d71f010189ef21673e3575b5d2c1b181eac6c7439571a29aa0d7e881b583ecf3e9 SHA512 2dc483fc464c85303f605d7acfe07775f1fb6242a2e5e7f8f9e659f781a80431f70c8c79dceb15af5c1b6f39fc003a52ebc4cedcc9e1aa4bf6af0ef7526550a9
 EBUILD activemodel-5.1.7.ebuild 1125 BLAKE2B 1f92fd1e19eda6dc3ba38734baad6d9388241825a8e898da6829a4d8e2c01f54d308c68299a5e6f9ed74eab0742cbfd4a6eb08519890bd5930aec4cffaf88aac SHA512 c40da93b518c332a26ede7ebc71bec1104fda3746be11f4b994561a1d6dda3632cf212449bd7952aa2233e44cca1b3d284c5f9221aee71a3775abf0e9f4613ff
 EBUILD activemodel-5.2.3.ebuild 1040 BLAKE2B f57fa78d010743e04236bc091070ac556dfd161813c6747589e0042e2562ec4b8fbf3b88bcfab7c8c29fd25404357c03f19b7ac4090694db48a4f6c248209cca SHA512 64b2f7f9df07a28bd4a6ac1a82f0f092daddcc7f7278c9b39bb282b13948c2a9943b2efd70dc546ec70a746f1c465dfed688d80d58b0f6abc2c7d7b914f973db
+EBUILD activemodel-6.0.0.ebuild 928 BLAKE2B fa8cf014218ea86e34545f888a1e7b0026d77b6523641a6949b8675cd9c58b60ae8b7adbd623201130a8dbbbf45dff27673c8a6d5d5f94438f56bed5a6bcf82a SHA512 50af9238b04dd09416ef593d711498b54356b933affa6d17fed716ceeee33a5ca8ba5573112c51555ec6bb673d247232663f045b72277f7cde0a0666a6f1981d
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-6.0.0.ebuild b/dev-ruby/activemodel/activemodel-6.0.0.ebuild
new file mode 100644
index 000000000000..3c147647fc66
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		dev-ruby/test-unit:2
+		dev-ruby/mocha
+		>=dev-ruby/bcrypt-ruby-3.1.7
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 945034e94f19..b970f3df882c 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,7 +1,9 @@
 DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce5252e8fbe4eb4c6935dc660614c2ff29fd168bbc66d74bfa64b92abb84d02645cb3b2950db5c166111b7b19 SHA512 6595eb19f174c9e46a937d6028d9bb2bfdcda06f35ec2a0499bc5deff05d8cfc8f8fc725e664496d3b431c8724141a1410201b57945b98ca211aea15c990d621
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
+DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
 EBUILD activerecord-4.2.11.1.ebuild 2449 BLAKE2B a26059816f637e8138298795592fcaf8d839509fa62248ac010f065e7211bd63bad58183364dcf7aa9e2f7f1614c4a85fcde33f96f57ab314515c175e437256e SHA512 726fba126d24ab9f3a90c7c76cc3c6b032285bd3898e9b987f5621557e0a316eadff74cda94b553216f96ab1a858b874d120a5cd22ec5c279667a6d1bd9f08e7
 EBUILD activerecord-5.1.7.ebuild 2602 BLAKE2B 545f8aac2391b194d3642f80a0d7ba71a31dfda1cf0e46d4867e40f9420cb03697e915b54ba28a7e0cf8ebe2323632588b1de3730c02449dad7b09e10dd110b6 SHA512 dc51bf26da43cf2a2716723574215dc808ab4ce54c063f47619b452b21f9b3e8491895820b17921c0b4cf18bd8f84de734c0f6ee7b33850f958da69d4db04293
 EBUILD activerecord-5.2.3.ebuild 2798 BLAKE2B 71356359949bfbbf8035d6f12f2a4b7d112ca6a7284c09aef49468ce612a2ba0b3c000c864584443d6a019aacd63078f88246a6341e719111438e5e0ca9252cb SHA512 faef79a976c17c093dbc2aec38e801b15a33c412e28e773a932af18f7239f5023c69f690fe2f7b613dd58e3cac404266c4cd21c591d384fad3aaf9c490ce3f37
+EBUILD activerecord-6.0.0.ebuild 2903 BLAKE2B 6a1c6c5afa40335cbee8c972efe6c92d412db29e010e4eeae1fb958373e037c42777cb289a7e4790a8c9c5ad0acaa20fee36d5d256c24d001c0858fe7dc06b83 SHA512 b0c51c89539c1016c48748a61ad92150a897f305a58c98829a06b925d6f26945b1a807315d4073c6be98c10b0b1370f98f936f48768973b687738e6a345be4dc
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-6.0.0.ebuild b/dev-ruby/activerecord/activerecord-6.0.0.ebuild
new file mode 100644
index 000000000000..541ae5e776da
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.0.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	dev-ruby/arel:9.0
+	sqlite? ( >=dev-ruby/sqlite3-1.4 )
+	mysql? ( || ( dev-ruby/mysql2:0.5 >=dev-ruby/mysql2-0.4.4:0.4 ) )
+	postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		>=dev-ruby/sqlite3-1.3.6
+		dev-ruby/mocha
+		dev-ruby/minitest:5
+	)"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -e '/bcrypt/ s/3.0.0/3.0/' \
+		-i ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single tests using mysql or postgres dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
+
+	# Avoid failing test that makes bad assumptions on database state.
+	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
+		test/cases/associations/has_many_associations_test.rb
+
+	# Avoid test failing to bind limit length in favor of security release
+	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 6da288b3ddc3..d95ce95de1a6 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,3 +1,5 @@
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
+DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
 EBUILD activestorage-5.2.3.ebuild 1870 BLAKE2B 19983c022409435f1e58bfe47f184fc7aa77bc70b3a0148fd26f44078251472e6e579ea2ce5be138c86279ec1043a5905eb1667bf5a6d6e7b4513c90cd9ed30c SHA512 020adf4b757648f9e72e5f6e8e65cf9149c03f91b58a3bad13b7d48b03c8fd7596a037869fee5577e4b86f4bb3ce0d806333092906c8529009bea21a12b9f198
+EBUILD activestorage-6.0.0.ebuild 1892 BLAKE2B e35d06bc44240d5a01a8eab782089d23711f97b5ea4554ef6661c29505a4acb827bd2770192037df6838e0f3852a96a35fde39fd6896bb25d98e2e58586ca43d SHA512 6584bc948f73be8c1c1391a87de62ffe203ade9e3ed0651977293da34b74ea0d395cb597b780b0eb371312f7995dabf0e0844819c4d8df65e7a45d3e15e5fbf6
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activestorage/activestorage-6.0.0.ebuild b/dev-ruby/activestorage/activestorage-6.0.0.ebuild
new file mode 100644
index 000000000000..219f9b6c76f5
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-6.0.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Attach cloud and local files in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( app-text/mupdf ) "
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activerecord-${PV}:*
+	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/image_processing-1.2:0
+		dev-ruby/test-unit:2
+		dev-ruby/mini_magick
+		dev-ruby/mocha
+		dev-ruby/rake
+		dev-ruby/sqlite3
+	)"
+
+all_ruby_prepare() {
+	   # Remove items from the common Gemfile that we don't need for this
+		# test run. This also requires handling some gemspecs.
+		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\)/ s:^:#:" \
+			-e '/dalli/ s/2.7.7/2.7.9/' \
+			-e '/:job/,/end/ s:^:#:' \
+			-e '/:test/,/^end/ s:^:#:' \
+			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+		rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 0d209adb1a18..284317a1e26c 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -5,5 +5,5 @@ DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d4
 EBUILD activesupport-4.2.11.1.ebuild 2386 BLAKE2B ae9c03406916c3f16fcd077ef49eea1f10123428af93f1b5e6739a28b1ca741e98b4572fc5643c27b7a8b3efc24bb038f2452df5ea90dc829477affc78a7b0d6 SHA512 b753886b2478c5b54a1800b47096f63ec68489dddb1ca68d72b15f192d6c8a4e345235a76395e6f5c2c3bdd662ea07ba723ac0a025103820afd308a5c9cd18e6
 EBUILD activesupport-5.1.7.ebuild 2317 BLAKE2B b3721cab2f6b57748cfd0cde85564754c360538435201bed5edea0f7fd0cea4c2c7552b0095b3b3d977552dea0a26577c9b10f3097d320382cbdc1e315613832 SHA512 26e052a3ffc4564539f83ce35c73ddb179d314475a1457d4ee1cd3f8b9bfd5aef980452d23ac7375d7f82e138c3624bbc70218d2a2d773b6d9569b6e6ace2b61
 EBUILD activesupport-5.2.3.ebuild 2456 BLAKE2B 19da92a852c754b6b0ecf3bf5ac1f4e895087090c0542cae70287b115ed4c3d511f47cc3d688160fcaa419b1313cfc804a25f4efe6dddfee101ed05f5635bb07 SHA512 a7514744a6becd11541e24cb82bd59f56ebb769d3c0ac342105ce211684f7c8ab77add7bf6f1ba460015fdd1fbc4e386bba4a7a84cafa5972fa98bb7398bfaf0
-EBUILD activesupport-6.0.0.ebuild 2298 BLAKE2B 8b412fa1557cb661198ceb0c1c1a99168862c515be708fd802f9b135ad656ca6b31b64d6b832fa7bd21f7392930f6fa709a6add4a3cff1b6b3a3646d7504d128 SHA512 ba8292b3de46d98df02b3203baabac5888df93268e7ea69fc0e2553bd6bb98a73bdea415774230af79eee52295becaf91292e8b66d9e6e9e4fef1b878f694879
+EBUILD activesupport-6.0.0.ebuild 2305 BLAKE2B faffc01dc2638af38a58cbf62aee412261585e5d7fc1dfdfe2d4623562a0ebbbead9ce045c33887332366702ff873e205c0cc25429e0ef92b5f22c6148105473 SHA512 cef2a30201d64fb6c2abf163e18da6db2246708281ce3bf17ac32dbc5e61e8e29301109dfe1d29463db8ebd3b70440f8674765c253389189f6c9a644db91197a
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-6.0.0.ebuild b/dev-ruby/activesupport/activesupport-6.0.0.ebuild
index 0f8ba84b2d73..096dcd80f053 100644
--- a/dev-ruby/activesupport/activesupport-6.0.0.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index 8b666566c1da..a979de2621b5 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,5 +1,7 @@
 DIST addressable-2.5.2.gem 103936 BLAKE2B c6677a2b5e9a7a1b279b2e3f1816cda40c0797254970ecaed2350d4d4739dee5a51580a8e2f94fc6bb87b9fe2a535d0a68b62eb672f8e91ff4da02e15e8dffcc SHA512 ddd5aeb4b241efa897a636fd85bd227bd5c6a8ae56129b6bbbdfaad85cdbb74e3d0db4bb6693f7df148b66f68ca1f557ac17a1fb0ea7698d25d883ab0b690bc4
 DIST addressable-2.6.0.gem 104448 BLAKE2B 664365962533d31786e2a362b61879fee544867b7aadc2ceb1ae6709374015a7f0f5c0bd32a81c8f2ae711a4ce1a07cd8f84821e74c3b6aa56b7474800567737 SHA512 71aa0ce8b61a07c1d01298dcd29cb2ba73d06ed1578908cae60351214f7d0bc6c9b8b0db7a78044fb1bed258bf00f2f093aa4e2bcb32575f4db2a79ee36b2648
+DIST addressable-2.7.0.gem 104960 BLAKE2B 4bca65d54ef1d3556cf4017ae68082635c0398b6f604eb3edc18da8f8e1e49e38b46485a8716da3c407fe0605dcc9a12c7a95be49a91c4198c2e2b1cab568805 SHA512 4c438bbfa8874fdcf11eef1d1f7cceb1855ea85948daff13615a0af129d35f92cc918f4bd5bbe4cd6ebccc67a86fc582265f915dc39831ec64209de0bdeeb732
 EBUILD addressable-2.5.2.ebuild 1347 BLAKE2B 47366e6bb02d08ae0a11c5d1caca5a735f94f202d59db87baf16b60b7df3c1645413d51a974af58f885a4bf49b239545b40567efe208099506687b7cc664c135 SHA512 10785d672738cc5f039b13f823a3cddcbd40911d044fe42053d1cf8e30c80e322dc4953dfe8cfa91c22b18ab04e886209fb1784331929ab1a1eb61ed8271c317
-EBUILD addressable-2.6.0.ebuild 1349 BLAKE2B a312e1a03f0d2ca5d69f4826cc254ef4ed85814c760e0d1042c0e55e504da6ba718fc2a94e460a577aeaa215948ee69cb85d07ff670c190f5397be0d08a7f0ae SHA512 d6451a42ada86e312462d7ecfb76cb346f480cde4ae7db4d144e67d43086b39132f4d02cd120ca56b4dc653d840386475af6916375ea4aaef5e8686a322e200b
+EBUILD addressable-2.6.0.ebuild 1347 BLAKE2B 47366e6bb02d08ae0a11c5d1caca5a735f94f202d59db87baf16b60b7df3c1645413d51a974af58f885a4bf49b239545b40567efe208099506687b7cc664c135 SHA512 10785d672738cc5f039b13f823a3cddcbd40911d044fe42053d1cf8e30c80e322dc4953dfe8cfa91c22b18ab04e886209fb1784331929ab1a1eb61ed8271c317
+EBUILD addressable-2.7.0.ebuild 1307 BLAKE2B a4628e3172ac1a8fe7f67b286e6975926618dc7813d98e9807e890400796183031d4f5cd49ed1f2e47428b1c5c016e6a4f80e37af225aeffa9b1092133f36493 SHA512 890705d6e74f9d40875eef01907a84e6f1bf341049f21cce45dd5d6c325ab4ca785a3ca1a0ae9264b47bc66d1a392cdf6fec58891b2a43e7db16a0aaf474745e
 MISC metadata.xml 404 BLAKE2B 4362f3592286dd6cffae99340e1b4437af10ab4dbbe44585d3370b0970e7d02a881853329c9412bfc881c3f040995a204b758aead2c34cba4f9df8104f858479 SHA512 c335566562492b85e491233d4f908fe18c2713ed9ac3afe2cb4d9537d71bdfa1a10bf58f1ca9f29e5a695fde9a4ba0ff9b3c57122afe78907cc0b00b5c307351
diff --git a/dev-ruby/addressable/addressable-2.6.0.ebuild b/dev-ruby/addressable/addressable-2.6.0.ebuild
index d47bd69d4db5..8dd64c71c341 100644
--- a/dev-ruby/addressable/addressable-2.6.0.ebuild
+++ b/dev-ruby/addressable/addressable-2.6.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/a
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend ">=dev-ruby/public_suffix-2.0.2:* <dev-ruby/public_suffix-4:*"
diff --git a/dev-ruby/addressable/addressable-2.7.0.ebuild b/dev-ruby/addressable/addressable-2.7.0.ebuild
new file mode 100644
index 000000000000..ab6057522945
--- /dev/null
+++ b/dev-ruby/addressable/addressable-2.7.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library"
+HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable"
+
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "|| ( dev-ruby/public_suffix:4 dev-ruby/public_suffix:3 )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	# Remove spec-related tasks so that we don't need to require rspec
+	# just to build the documentation, bug 383611.
+	sed -i -e '/spectask/d' Rakefile || die
+	rm -f tasks/rspec.rake || die
+	sed -i -e '/bundler/ s:^:#:' \
+		-e '/^begin/,/^end/ s:^:#:' \
+		spec/spec_helper.rb || die
+
+	# Remove specs requiring network connectivity
+	rm -f spec/addressable/net_http_compat_spec.rb || die
+
+	# Remove spec that tests against an unreleased github fork
+	rm -f spec/addressable/rack_mount_compat_spec.rb || die
+}
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index b8bec55da6cd..b1557f2eacae 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,15 +1,11 @@
 DIST autoprefixer-rails-7.2.6.gem 196608 BLAKE2B 0f9224fbf765877b1b7414c68fc39a6587514d27fb5290e1a623db8dcdcbf6f668b66ddd0133906a97e63e877b8201168a45520a9919dc756021d5a7cffc0d38 SHA512 37b3f245291711f92ab9e264491637e753afb95e52f9fd4e2bda6655cd781b2d031934f3379cabdd5589bdf57b780d0727f2fff1cdf7887ca4cc323d23023396
 DIST autoprefixer-rails-8.6.5.gem 208896 BLAKE2B 50e8b8ef3fec9a0bb8d68afa8950989dbf84b58b79b8822e83bf22873c5172c2c514643c31dca88cfec49bd585563eb9b201c621d3ab6707ed0d49c6cd4c8fc8 SHA512 fddabc4d745ad1b4282622a52ab4e36c377eccec85c4e80b3e8d633ffcc2d1613f4fee9e9f2356c85d251e44b0010418029bb278894987119689435ac885e982
-DIST autoprefixer-rails-9.4.10.1.gem 217088 BLAKE2B 212920f8d1cbcc86c825974b6cf66f30e7f0b277160148b57d87f5bbaaacec5c017f7ac600f86a8cd5fffb0305bc2606dec213a2fab58584630014ce99883520 SHA512 0f291d66f9aecf52d1aa68032bcbf7561a196247b5effa0403b1797109d124127accb5a828fc28ed933aea5194ba9f497281d81651943cd6c26f814e19162bd9
-DIST autoprefixer-rails-9.5.0.gem 217600 BLAKE2B 067c27d42bf7f869f3030e52a43c2350cb6f670b0292ac563c41a40007aa63566b0b8924e25cb0cffac091fdcda9f86d6993f1cb634a705701fd748989c7830e SHA512 7e48dd177abbd06634e4a6be40494dfc109d1ce50cc20585cbbcd4e828d6e9dec42fd34ea55456d9db4eff6c74286dc1411aca6beb3c40103561034e9b85d4d5
 DIST autoprefixer-rails-9.5.1.1.gem 217600 BLAKE2B 188f5a23296d107e068339c0299913f4a9df641d97caedd6f140c39dfa2eab3e7cf76ac4b4ed1c46c0cd424fac1872515e54b7fe8c62285286a6aad292005657 SHA512 d1fe0da0390ac635081327b51350636b58108bd4689f6ed37a03fbdfd8620a7916bbff6818532e58c82d32912935818c476823b6d1839f068c2c171fc405e6c7
-DIST autoprefixer-rails-9.6.0.gem 219136 BLAKE2B 68c8e8c7ba4ae175f306b4ecdfc760561db41e7dfc8e5f7f17d47b143c5e6e0e5d9275847e75c5f88128ce4b62a5cb651b907f1dd2743216c561d50dee447271 SHA512 c60210546ccef073bbd8f13f2667d1c488f2d2bbd184d8a4d455ede766befeccbfde0fd3c87920f0fa5c3e8224644fcb806fc6f65e53c1b15ca2695a96d18062
+DIST autoprefixer-rails-9.6.1.1.gem 221184 BLAKE2B 62ab4a4666f7996ed5434b472f8bd6ab9273a3de58482be2cdb7ea33e3aa0285e2ae143a01112ccccf9f9b3fc9fa5c0e8f2739643ab0a7737eba206280262045 SHA512 c488e5f932d300cd3b2e029bf2a91390753b8bfb6f8162ec10d63ca899d2152cc5b83eecf60f527016294f10923813232627dcd6da78ad7840d2d425af2a6d67
 DIST autoprefixer-rails-9.6.1.gem 220672 BLAKE2B ac9d3ef36fd438f28029c708e8a3c9df4c4cdb75de39cd73ee5e9e527f099c99691b3f76eac95c821a36d4c86aaf43f6becfa8ede893b6a8b2d8da6acc10737f SHA512 c553ed602d780aff62904f73c99bc56b9d7052de1daa3ee7e28cae59ced1e9111786e63bf2a829409f4be77ac8c4639ab38c73df84f3cd0a047535d9134419fd
 EBUILD autoprefixer-rails-7.2.6.ebuild 827 BLAKE2B fd6aef469bd1e07f5100e88ebe523da96383c721dfc2bee9b7babb7d11f3d710bbb6debf4cf9cd57702f81150c8b7c7ef9a0f3de4efc1e6325240fd1bf2e4bf0 SHA512 f17f3e58a7cf0a8d960d683d3cdc6ddae7065ce7d28d3284b45b169210a068a9ec0dafcee100fcbda098aab73c809f455908df069ba72e5536b95aa1ddac7ace
 EBUILD autoprefixer-rails-8.6.5.ebuild 827 BLAKE2B 4bce491c80db4a8eb1d77467167c3c290c0af5311f4395424f5f0c4e2b30e1474fed1746c3dc5127413d48b9e7031f8e782f7b5d1a1987550747c3900d8954cd SHA512 8bd8a32ceb04e688ec4d149a67b98905b2ec975684f3fb2fe3dddcc4ff0d8a04e7556b41a3a804a6b1dd2d4c46d4b5ab45c6ed45f300c7171bf2335f73d42768
-EBUILD autoprefixer-rails-9.4.10.1.ebuild 845 BLAKE2B e5b1a04fd59da7936ea67781b76812cf584a03b01b761267d3c35fe63cb126af04d0ad186ce38fd7ef4ae4579f04080b3fda6ec3bd0dfe53e6e451981c146f9f SHA512 8b8f190dbf44fb05dafa8861e94ac635e96cd79ec25866eb7391357c81c90feade321cde4f4a6cc2b8b921e7646b11a06e2985bad8c52792af688f07e7a2f1bb
-EBUILD autoprefixer-rails-9.5.0.ebuild 852 BLAKE2B f8b5cd78ed21271c928cf958bdce4a63a1c180d52bc676cdb2a7c3127b1d7001f99af471c6ad575eb23bd37c3d2ee6a0e5877a4879020aa414b0314fc6f60baa SHA512 4233e830acebedd41a32ff4f40da0c965b9ac65911d29b41c8d385195b8123c88e6b26f1293d6993cc6812334406d3b6a376b5b01a821e099ae6960af1e6e005
 EBUILD autoprefixer-rails-9.5.1.1.ebuild 930 BLAKE2B 9bc0d96eb27f70fc0e07f85293e2525f3821a5261dcb8501206ac3ca67157df396a51bdedb00f519ae1338c2e97db09eda8581c11406e2000d225a42767d943d SHA512 39032027fda288057b29ee37ffcbfba613ab8533517f3f2c164f35eeedb06ea67477d9ab2f28fa2c855e71c082d1e5cc072764df568e2137102f6f08116119b5
-EBUILD autoprefixer-rails-9.6.0.ebuild 930 BLAKE2B 9bc0d96eb27f70fc0e07f85293e2525f3821a5261dcb8501206ac3ca67157df396a51bdedb00f519ae1338c2e97db09eda8581c11406e2000d225a42767d943d SHA512 39032027fda288057b29ee37ffcbfba613ab8533517f3f2c164f35eeedb06ea67477d9ab2f28fa2c855e71c082d1e5cc072764df568e2137102f6f08116119b5
+EBUILD autoprefixer-rails-9.6.1.1.ebuild 889 BLAKE2B 85643bd01e0a4db78f304d55c7b75181e51258b83219073e17142c86ef025d746d9e34b6781adeb5a869fd4ab4643c1a039769ddbdf2ec45c8015a8ffc5d1bdf SHA512 dba75647eac0f7e41a6a20bb359fb137b982bd28a680c85c4240356005b4508613e4364d56b31e1db9a3f373809e9e84065184656086569b02f49815e118cee1
 EBUILD autoprefixer-rails-9.6.1.ebuild 930 BLAKE2B 9bc0d96eb27f70fc0e07f85293e2525f3821a5261dcb8501206ac3ca67157df396a51bdedb00f519ae1338c2e97db09eda8581c11406e2000d225a42767d943d SHA512 39032027fda288057b29ee37ffcbfba613ab8533517f3f2c164f35eeedb06ea67477d9ab2f28fa2c855e71c082d1e5cc072764df568e2137102f6f08116119b5
 MISC metadata.xml 347 BLAKE2B 71b067345809944df1e70cdcaa44e44ae416d0c4ff80975aa796b8217170825e6be32a15d2549f464d9a65e8aa9ff1b2e9496989e66bce29d3dad672742495ec SHA512 b0985f41e9463a6c5bdbda0d5a84cc76cb6090614fa07395705b3207e0cd4fadbe9b1bb18fb7382f3c8bd00663db1232fd7107f6757bd20cfca0a0df99928426
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.4.10.1.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.4.10.1.ebuild
deleted file mode 100644
index 8ae938d51a0a..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.4.10.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rails
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
-	rm spec/rails_spec.rb spec/compass_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.5.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.5.0.ebuild
deleted file mode 100644
index 4ccf45f7b6a1..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rails
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
-	rm spec/rails_spec.rb spec/compass_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.6.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.6.0.ebuild
deleted file mode 100644
index 3c20314227e0..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/rails-5.0.0
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" \
-		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
-	sed -i -e '/standard/ s:^:#:' autoprefixer-rails.gemspec || die
-	rm -f spec/rails_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.6.1.1.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.6.1.1.ebuild
new file mode 100644
index 000000000000..8c312ceb78ee
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.6.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/rails-5.0.0
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/,+3d" \
+		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+	sed -i -e '/standard/ s:^:#:' autoprefixer-rails.gemspec || die
+	rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index 7b97500b0191..6510e5bdbb0f 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,6 +1,8 @@
 AUX capistrano-2.15.5-sudo-cleanup.patch 656 BLAKE2B 06c0d83cf2b20337d7692ca3286a6ab8fb3797d67d81ee3498a5cd49f37d94458d19afda1eebc4904c5209809ab869087cd6568af1a4c89aba1b2a2826226fb5 SHA512 846f9c25b1c7806d082ec73faa2b5b9d4b6be285a33acf1d98dc36b9eddab54d664d915c3bab1da28fa2d86225fb1619fd746354cd605b8e3e8a5d0a05cfb96f
 DIST capistrano-2.15.5.gem 132096 BLAKE2B bbaa6bd482cf9bbe7aa01540aa5dab3f32401ffa1476d9057bb8ad420194f1ab2c32d8e744d7c982ebece5c4b5369133dc8378b7adf54c78732f9cb249db2a9e SHA512 10168080c7481ec6fc6f918ac90a3b1ce8f2b36f77411375e33cc915b02d5196ab061ac47e767edd724c82cffd1c2ad0a23ba1f0519cf1f2aae5b429167b19ff
 DIST capistrano-3.11.0.gem 78336 BLAKE2B f4e3ac2c796aae12ca575e1b5f1e42d993ad13580d790c3cc392322c40486121d8dbd7bf0f0fa75c3ee59396c0dd91164b2112d30b4270b302a9f1556fe866bb SHA512 d8b635de223a0574c17dff6fdfe4007741f823e24f376cc22129b709d40792d02965b72465aeeb54560f22522dafe255f094bde9a23aa259bca9d4933585e212
+DIST capistrano-3.11.1.gem 78848 BLAKE2B 2327f2f5ab6972c71beea9b0b9cb2582260b13dd4b42752dec306a70cac3eb52e87438021d070f3a346658c10a1b1326c205e67ff3b683938d42095adceda681 SHA512 86ce970715da9f12f5beaeefe66114a42696794655ee61cf5640fc15f7eb298731fdfe02634e1293d5a0f976c2e8aeef495b7385e3d278889fdeba2169ec878f
 EBUILD capistrano-2.15.5-r2.ebuild 1243 BLAKE2B 55ddf65a863b97b137f614c2216c098c9db1138c1022df80d6050793e15371320ebfa20bc9dbfc17e4f52c7caf65669c1b7deb476ad79ed42fa92e673afce1dc SHA512 d689d98d6d74a1ebcaed190d751124693c17798fd6ee4a6de96bc06948fc79c09afd19b2d2fb96997d1c3ece1a8f3a318609c8c5dbbc0340492841814b9ec9cd
 EBUILD capistrano-3.11.0.ebuild 961 BLAKE2B 5ccd37d118a44bfb45b7d38e60ef71f8dfcaf3e6b6955f3c70953ed99133c6016385fcd5ef8e7bfe6c317d784b005ae5cb43fe473f3c9ab69b2dfe8a68c875de SHA512 6a87697151b2c3a4b075f1d1d7f70f5f7b29c5374122830a33668e71cf04e7f739096fa286c1b700dd88e6aea35589e9e021389098d7174f09742d5813512fa6
+EBUILD capistrano-3.11.1.ebuild 960 BLAKE2B 0b7f64df3396d6ccee6703b131b725d374c59bf84ed83013d62c00ec1a44b9b60b514e89e98572eda56bc5a0b42feffc8509668f7ecd16699f5b1636a01107a5 SHA512 f34e6e2056d077408f9ea3dd144afc60d0c611d2176b0bea69c85baf0acd8376bc972c749549a1a92153e7cc6559c4cbd7cd99473df436f393b57763164eaed9
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/capistrano/capistrano-3.11.1.ebuild b/dev-ruby/capistrano/capistrano-3.11.1.ebuild
new file mode 100644
index 000000000000..5e35dba14f3f
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-3.11.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="https://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/airbrussh-1.0.0
+	>=dev-ruby/sshkit-1.9:0
+	>=dev-ruby/rake-10.0.0
+	dev-ruby/i18n:*
+	!!<dev-ruby/capistrano-2.15.5-r2"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Avoid specs that depend on capistrano already being installed
+	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
+
+	# Avoid specs that require a TTY
+	sed -i -e '/asking for a variable/,/^  end/ s:^:#:' spec/integration/dsl_spec.rb || die
+	rm -f spec/lib/capistrano/configuration/question_spec.rb || die
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 0ab10fe87dbe..0f31be7597c6 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,17 +1,17 @@
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
-DIST capybara-3.18.0.gem 331776 BLAKE2B 05d4368f570bbf74a3540fd7d7594cb95c602507f4ddbde437b702b6a280dce5bbf9d0412a1a6ce7888af3a72667e6e3efa7c83d50a8791670121673426c4de2 SHA512 5e9321eb2367bfb48f090868c944bf9920e6bd298e5663e0a820d63946a9cf320e5e3a9b95569779b7e6cdc361dded5ab12a8fce4a0df430c4768d8ce161d02c
 DIST capybara-3.23.0.gem 349184 BLAKE2B 233b83fb88f106de8e25a1aa34d1082664824571eca2a79ad3de3b164e639b68173804bf2e871c3fde7fe2af54d64ee6ade90c4149807e04e844cbf5d61f24dc SHA512 53e0c6223e574960e136e7620d7d00a0e1479f9eb0fb70c7150bc60e20ed009d163dc29f7cee84acad43168cca230465490c9ca64b640fdebe9223ec62b6e4db
 DIST capybara-3.24.0.gem 349696 BLAKE2B 54447fc17169d953c43f31505a9267bebe6d093052cb553efa8eb65bf6e39fbb13fe02cb3b7252c4fe1f0554370266265eb759ad7f4dc5bab9299410e4f07e81 SHA512 32a19471d3f8d13871c40c28671125039b432065ab6ac1b31f38551f9e5c7d52c041ef9a56db853aeddd14d9411dec4e647336f6b78feb45c90a676ccdc606fe
 DIST capybara-3.25.0.gem 351744 BLAKE2B 12e8f483bca814fa826707895a6fc72a3d54df2e03c1175eb4be8e2f83afeda2466d70eab03c7700665d3f94bc7b3b8f85b2d2d6cf8242cad285d9350428cadc SHA512 1be454984862c314f0571ca68ed3858d241dc5f0709d155b1b7accd7fd81a1ab0bf0a5c6537c871989c9abc758d0e7fa5109c8b04be8b620137e129a5da13a68
 DIST capybara-3.26.0.gem 352256 BLAKE2B b6b71e163adfa2125d4e4a28fdaaf9feb725e874eab7180c0ece1166b2411ee0930244c79cac22f17e7c3ea8c1cb42b043d5bbd7321a3aa6460fbbfa775035b3 SHA512 31dabbb6ea77ed185d53b72e5f4ea89546f33b5c682d68692e4115bdec29c15d1f5f8bcab4f5256b76f6fbfadd5c638f8bf1d7b974dd3153d57521eb8c04a778
 DIST capybara-3.27.0.gem 353792 BLAKE2B 1ce648be67bbac74bb6c907ae34ceb67a7c4df40eb3cec91a423037dd2d5af9a7a603e750499d86dbb0997102682008831ec9abfa5846000f91d5abe60991f11 SHA512 3a6829906ceb5ea52a5c44515a79df6959559cca7e7e0c35e35550a376f79bfebf7cda229e5cc4aff5f69cffdb09c586961733d39c57b7dc89b293050f911ba3
 DIST capybara-3.28.0.gem 355328 BLAKE2B f9f71a3cadf5a88c86f295e02da61d7ae6813776afdc64829c72ba9ba3a6127c34e4016a152dafc337953c4d69c35f222504bd86e3bbc5f93562f7bb3ae41746 SHA512 fad8a3e6fd95c6ae03ef223001175eab59033bcc65555f708dc8efefb48f0323fbfdfedcbd304ec69e9690cee5e95640b9c43fdc93d6e01696425764b51d96df
+DIST capybara-3.29.0.gem 358400 BLAKE2B 1e8e6077cfaf189ef511367fe6c14da42a73729e02aac7461897d07210fc583ebc604dc3d7f763f90ea0fe30c139850a8ff2236434ec4f3492d9fd0892aac692 SHA512 6793ae8fe0fcd04e0ae5128dadc57e807f14673b3b92703eb3fd8016a66647f36acf53566ad938516e8ab5a09135db53825219ac81c8ced55cfb2470923aa019
 EBUILD capybara-2.18.0.ebuild 1552 BLAKE2B 7029dd19a177f4aebc1e78d83f9561ef4f3abdd41b0b8d77426e11bbaffc7865d746d4f3d3e6ed696c4414008648acc707f42e4a716681a2e331acae512ce8a6 SHA512 87dafa1f76c10eb0853eb7c8e3da36ff7c0b522b887c037ab9c3fdf12b29ec20d39a3638c4119225ab097dee44b878ed1ef0aa753d0d83f886c6d4c089a6c931
-EBUILD capybara-3.18.0.ebuild 1811 BLAKE2B 735139e0a2246c63aea1af6a9390e0c1683d5039cecb8e20e99d2f51e0603669b2599305c7ce6d5d39647e3a609b55b50e3296187eb90112ccb69b5ded210115 SHA512 ce2652102c27e9c0449f692da878c1096e470fac9d6c2207b3e1974ec6ed6cfb47e8d996f6099a7ff2eb546d1b884f40cff1c1bf42fadc6d518ce586c5269ebc
 EBUILD capybara-3.23.0.ebuild 1809 BLAKE2B f0a9ba37b66a1d4c26c4c9a42c0f9bf3cac9e11e6d1233749695d61e28a93b349079d7ba10f792b788e4f6d3628a7905ee46e291f51e601f51a4a31e35dd52de SHA512 059cf4bb8b3efa8a9fbfa2671fa7c7f01e1d2aac54a3130db45d27aa46a669c20c4593e1b0db9116dddb98049f6afcc448c7473b2d96608dfb619994a1075723
 EBUILD capybara-3.24.0.ebuild 1810 BLAKE2B 76b7c0221fb17244acec192dae6d061ff8b4f77f41847cf9f97cd9f82b19726193230ea9ca36c5b88a870e3de10899274214542573a36dd6c3c4c3411cb634cb SHA512 11eb703b46cc0d42678414716856b732e9a5a455deeb124219e45d415dffef379db2a668de5520e80ab934c453628228cff3a28458cd4f305142f1bd57dcd611
 EBUILD capybara-3.25.0.ebuild 1823 BLAKE2B e2cd9a5ad86be57b55ba1e261bf79d0b98f3161e6b2c692d8194d78c8c76ff42e1c9ea6d7eeef67ec77cd2a41cde3a0d98e56592a34ec08b03bb6ea3b52bf1ee SHA512 e475b776f26107beb0125050b9db7361075ed063f2c0db3e94d14a87a7b9d547526f936613b2646e3bdd4f0825b47300882f171bb6791abcbf0c4392f2c216b9
-EBUILD capybara-3.26.0.ebuild 1823 BLAKE2B e2cd9a5ad86be57b55ba1e261bf79d0b98f3161e6b2c692d8194d78c8c76ff42e1c9ea6d7eeef67ec77cd2a41cde3a0d98e56592a34ec08b03bb6ea3b52bf1ee SHA512 e475b776f26107beb0125050b9db7361075ed063f2c0db3e94d14a87a7b9d547526f936613b2646e3bdd4f0825b47300882f171bb6791abcbf0c4392f2c216b9
+EBUILD capybara-3.26.0.ebuild 1822 BLAKE2B a5d4327081440dd50d38c1ab02a8b9d0a303ab4a4030ff6d97a689d263e326e4a970baa4afdb5e00ae310fbc78788e69c0c64a480c5293b31589f5784e309042 SHA512 4d50b43ed8de4a6f4d49c3f0822f9a02d1963c18af166bc7d569e753f74b542337a000e7ac8e0d5d13c248d935e0f55b77603b7b6fd3e84bbce32e17db967e95
 EBUILD capybara-3.27.0.ebuild 1799 BLAKE2B bf1a7248c481db4c950e7b3571f857ac04c4aa5be7a43d79b66e9727a77911f19aef2eea21fcb627340e896814a8c8cf2b574bd9c16d73100dc9267a0172c12a SHA512 a506bb0f2961369bf071aa93748f6767f230142bc21e0631b62201d37e03f46782b971c0c3bffd7ab02f7c281524edd9eff85e6784490a7003eea19810c69b0b
 EBUILD capybara-3.28.0.ebuild 1799 BLAKE2B bf1a7248c481db4c950e7b3571f857ac04c4aa5be7a43d79b66e9727a77911f19aef2eea21fcb627340e896814a8c8cf2b574bd9c16d73100dc9267a0172c12a SHA512 a506bb0f2961369bf071aa93748f6767f230142bc21e0631b62201d37e03f46782b971c0c3bffd7ab02f7c281524edd9eff85e6784490a7003eea19810c69b0b
+EBUILD capybara-3.29.0.ebuild 1799 BLAKE2B bf1a7248c481db4c950e7b3571f857ac04c4aa5be7a43d79b66e9727a77911f19aef2eea21fcb627340e896814a8c8cf2b574bd9c16d73100dc9267a0172c12a SHA512 a506bb0f2961369bf071aa93748f6767f230142bc21e0631b62201d37e03f46782b971c0c3bffd7ab02f7c281524edd9eff85e6784490a7003eea19810c69b0b
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.18.0.ebuild b/dev-ruby/capybara/capybara-3.18.0.ebuild
deleted file mode 100644
index 528036025297..000000000000
--- a/dev-ruby/capybara/capybara-3.18.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~arm64 ~x86"
-SLOT="3"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	>=dev-ruby/launchy-2.4.0
-	>=dev-ruby/selenium-webdriver-3.5:3
-	dev-ruby/sinatra:2
-	www-servers/puma
-)"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=dev-ruby/mini_mime-0.1.3
-	>=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/rack-1.6.0:*
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/regexp_parser-1.2:1
-	>=dev-ruby/xpath-3.2:3"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
-
-	# Avoid window-manager specific tests (sizes are specific for fluxbox)
-	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
-
-	# Avoid spec that requires unpackaged geckodriver
-	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Avoid test dependency on puma server for now
-	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Update spec to catch the right error code. This seems to have
-	# changed recently accross ruby versions.
-	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
-}
diff --git a/dev-ruby/capybara/capybara-3.26.0.ebuild b/dev-ruby/capybara/capybara-3.26.0.ebuild
index d4c4662717ae..d6290e188d0a 100644
--- a/dev-ruby/capybara/capybara-3.26.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.26.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.29.0.ebuild b/dev-ruby/capybara/capybara-3.29.0.ebuild
new file mode 100644
index 000000000000..0cae33b1ec47
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.29.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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.5:1
+	>=dev-ruby/xpath-3.2:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	#sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Update spec to catch the right error code. This seems to have
+	# changed recently accross ruby versions.
+	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
+}
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index 519dd9f77ad5..af915ce60847 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -2,6 +2,6 @@ DIST did_you_mean-1.1.2.gem 30720 BLAKE2B c1fb841143928854854892e2c7890cb3952329
 DIST did_you_mean-1.2.1.gem 20992 BLAKE2B e8827b3f6797145c1adf5fae2a681ad8f437c1dfcb746465c4bb0c59f61285c2f2a65d5e31e2a501da812baf52a2f1d78b81c2d74a194d7309778cece56c1752 SHA512 98a71ad3c4fe92efec50575e26723cd3b5c60b25cd24767a7aabdb4e2b343b131fe3677367c78995f07c513d39d47984af80bde0ec2f6aeafcb34be97f134b1b
 DIST did_you_mean-1.3.0.gem 23040 BLAKE2B 2ff2049a9db318151f7a42f00b22452e60b101152d6b170e59aed9804a87658015472cdbf2fb995aea4999cfabf23a09bf09d4ec4f47bdd62193c2e20c7a8a2c SHA512 a2b2bc30d1f87d535e0af765ca53e74ba156cee877f78caefa196e335939748e0ee0512ba4cbdc4ddf4b354715299b9f8593a08f65e97e9f7c83cdba55e354f3
 EBUILD did_you_mean-1.1.2.ebuild 784 BLAKE2B 1e2dd3a20894f1cd22165d8570b308dfaa894b03718935935fa4199c5f75fb401749e18d8570d382f2a0be06db0993fb0c01698e32dffbb9e19c909d534fd1eb SHA512 688ebd98ab036117f4cfb079f625a61acbff5c68d29d22b9f592493c2057988de3ad831a7a0087e4953925967c006fad51e2ea5d6f26d533e6d9169842bb0d8b
-EBUILD did_you_mean-1.2.1.ebuild 643 BLAKE2B 0eb024178a2b37e1ad710f8a802f154b94d6b24e2aaf9ce80527551c6de973a93eda7683d16a9edd133e25eac8b0989964a25fce66e9d468fe84664c6fe90f4a SHA512 fe2c747baf4730d29327c200e8d7b6ca13a7f0e6e8a077a4ad7711ae8e379c309e2e0d09f14eda9d84dea1af97584f19f0e4722130af79669b69cc6a52decfe8
+EBUILD did_you_mean-1.2.1.ebuild 641 BLAKE2B 205442e9d23cbb8b6802786d5fdec3a14a31579fc7c787e559cd82c45c8080350e2e67dd95faa73154ff0d9c3e8f2a0f5b4890c42e12fa2bf6cd6b9f359bb7c8 SHA512 8a6d70cf58182ce594981c9ca99b1f1b82f6c2b5a1e44261c172306bddae61622431849e13d4e55a2cd4edfcf7cd4c684dd20fa0d1706729e80b20fdde07727a
 EBUILD did_you_mean-1.3.0.ebuild 653 BLAKE2B 5dfd92f888bbf7c1cfda2fc1ec31009aeddbe29a918f090076e62c1f44f61fab909f7a3afd1fd5d9d49a372e77d24b9c3bdde477b4f93a5784dfb73c8bafafbb SHA512 23ca01ff8fceeb3c2ade5164908e2da5cc8ad79b825d5673cb21ca992bf5da7d47f713f63c09fe8d08a64472422f72cee101e0950659a0b1459cdf2f03ba32f4
 MISC metadata.xml 345 BLAKE2B b3764e5648286cb66e03f3343a41b460ea2bb24f51e1c25e89e386c2b16769c9b1f88888b1e10b2c2d0a2346659195454e4ee8262aec0d4a9066795759cad053 SHA512 418114238e3e2db16ebcdd3de5213b3bc0f0a45ed719de1be60cb19015966cf39912f38d0858e22aa6330ac2e7fb58a1452e9623e7559c26161d70e0f29e66cb
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
index cfd9daf678ee..e9104bb4047b 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="2.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 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 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/ffaker/Manifest b/dev-ruby/ffaker/Manifest
index 61c400ed93a5..060be1ede00d 100644
--- a/dev-ruby/ffaker/Manifest
+++ b/dev-ruby/ffaker/Manifest
@@ -1,7 +1,9 @@
 DIST ffaker-2.10.0.gem 421376 BLAKE2B 30976c0bee8862623c923b3797bd6de31b803643191d55ee2a6ef101a92f43acf6e300991de43641f2564ac82d046fcb7e53ca8b9cecae4c6b339e43f020cc1a SHA512 cb54d995f39877eea0844395e52158ea898f1d3fb17af0b01261f8b359d50ffd5d7b94fba0400e7103543a96670a00b3e5a9c072bc46f7221d390ab81e6ac507
 DIST ffaker-2.11.0.gem 429568 BLAKE2B ed5a9d794caba5ad93c1ac8457ebf89412177fe48c05a66f162f8d2b7a7a3b395e59312ddc444965ec4d9500573a97c97b95a1381d07caca6bb3b3ca97fa3dc2 SHA512 b185adfe34c5d78fe47cedc9d685eb98ed0de7f9a4818fa5ab0f6fe9cad21d04e025b6d2e38e34f463874a5d9007fe0d01e604b316af4850a7a63f50140bbd78
+DIST ffaker-2.12.0.gem 431616 BLAKE2B dc060472749b1081500609e4b6a58310ca00c3bfe2dc8a40dba49bde50a98add33a83cc00136fbe542b1d14ce74ddbab8f737dba4866023bb44d8ad7126151ce SHA512 1763bd2b9ec45903f09d46504ebf333e9879423607dd8d31d6ceb659bab05ac9fd14b99ea2dd3f08c0d61e987d7bab647945f0a7e81f1fe8a2b085b7b571e282
 DIST ffaker-2.9.0.gem 413184 BLAKE2B a48977b2749b60db18d046a0df0b65c1790a4fba5920faaaf6ef93be31cc7defd375379e2e46bbe2b4d2bae8b29f7cace4ecf09fba7d80a6cfacd724edd60564 SHA512 dff411a4d8864817dacb0498ce73a9b350d4e03aa771edb5b69c5e749ba4565dbd24d09215a7397e4567a9cd3ce2baae9b8e4e21cd8db127257364395e481364
 EBUILD ffaker-2.10.0.ebuild 469 BLAKE2B 6cfe531564b3a20b804bbc052b31a438af417c2418f0ec02b9661ea5cc9522748054c3bedbe891574bdcb36d6e1da2de1927dafd9cf52b70c622f884b1ae7387 SHA512 37de5883d978dbf4ecfee805b2e4b8802e809df2c4df5b2939b6c63615962439627d17bf5b588b18928d38b202ecb4ee31dd3555a652547bd52e0c8c8f02ac36
 EBUILD ffaker-2.11.0.ebuild 469 BLAKE2B 6cfe531564b3a20b804bbc052b31a438af417c2418f0ec02b9661ea5cc9522748054c3bedbe891574bdcb36d6e1da2de1927dafd9cf52b70c622f884b1ae7387 SHA512 37de5883d978dbf4ecfee805b2e4b8802e809df2c4df5b2939b6c63615962439627d17bf5b588b18928d38b202ecb4ee31dd3555a652547bd52e0c8c8f02ac36
+EBUILD ffaker-2.12.0.ebuild 527 BLAKE2B 353537f33fd96dde1efc5c0ec56f02358dfe952924fc3cec7f869b9c510344d15f2930c3f62a7055c260c768afee09ac54a00a8064991b1b688287bbbc2bd8ad SHA512 f5f1160da7f927b57bcb0a1a9b4054f811064003c3a4fa645810c51254a4fbc14885b73b3b79398db9d76f4ec2153e46392b44e4c615d97df00a4f672881222d
 EBUILD ffaker-2.9.0.ebuild 472 BLAKE2B 65064f58d2b8111b153e74f1a8f7b95567d9fafb4f5521b7de196582751e29da939b08e288800ffd4cc441c48d8f7ef5c3e82d9f65af18c7e02715bee4b2c803 SHA512 0680564ca5a656128df8a9dee0d5e23a085157b605598f6ccf154c6f4592649d030573da563da7402746b1be82f2d402d3705b554b35f5b43f3d743f85a9f341
 MISC metadata.xml 344 BLAKE2B 35517e20c0036d8a175e81240ba0ea29799e0a00ddcc7dbb3b71822c4bd1d2ab64795a967dda9b2c9d207c18ffa090aab11dcfc6fe910e74b60f20413f65c001 SHA512 24ac57014a8aecdcc405060fc2e5f7ad3017cf07d022c55988bf7386bb50a79158dcf88f64e27141a4c44542f60c6d0e3b82d94f99dea71213cf6b914e717ada
diff --git a/dev-ruby/ffaker/ffaker-2.12.0.ebuild b/dev-ruby/ffaker/ffaker-2.12.0.ebuild
new file mode 100644
index 000000000000..51f707d245ed
--- /dev/null
+++ b/dev-ruby/ffaker/ffaker-2.12.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faster Faker, generates dummy data"
+HOMEPAGE="https://github.com/emmanueloga/ffaker"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/test_image_file/aomit "network"' test/test_image.rb || die
+}
diff --git a/dev-ruby/http-accept/Manifest b/dev-ruby/http-accept/Manifest
new file mode 100644
index 000000000000..3265e9e8bb41
--- /dev/null
+++ b/dev-ruby/http-accept/Manifest
@@ -0,0 +1,7 @@
+DIST http-accept-1.7.0.tar.gz 12289 BLAKE2B 5eda9bd29e2dd2b52c8f2589adf57872a80aaf93c37d28b1668dc24fc1e2fa81d00ec12766dd558691dbf3e6560bba013f456a659ead47fffd77b1565c186a7f SHA512 3502bfbd07f6bb0164843c728cd5ef27adfd675317fd60372539180de212d02d6d446cff8eb081d1cbe5a19b30d5759a55b22bc63736cea83254595bd691522f
+DIST http-accept-2.1.0.tar.gz 12473 BLAKE2B afb5513207c0491fbac6e28e14f7637de805f3da60f0f00b6efa54a21686444f3a669a0f47895f21b335031856a1bee1e60b1f11e22b8a7caac23168bc6f7892 SHA512 c8eff607b697ff1691644e4e2e0447a64f238dbbc13413afc7bc3042cbb49d2d825bc9b698845dce4be2ebb3ecd9b31f3d5910a371982e74927085c9121c4dd6
+DIST http-accept-2.1.1.tar.gz 12488 BLAKE2B b909736c0fda14b32f30c38f12f4c4c2b2bf1a36ddf753069484b6b7151d518b80a6ae8dba929e27f8f758c0c0ae0c52c24802f02b1bfd4674ca33b50d7a0de0 SHA512 e0231cae90ce9180006714485df2cf205bf1f114887dc581ea50fb558c1c7e434838d10d0c9f69c1d747249b8d0c73e628a6ea7b1ffa1ffa7059ba2447307df2
+EBUILD http-accept-1.7.0.ebuild 485 BLAKE2B dfb8d27877aab2de607b2cd2856c2d2ec9442ca0d188907fd9b10cf09c7dff571bf4d733ac361005a889dbd49b2f4341db0839024e2405880e00f35d3f36d459 SHA512 7f70294c8b49cb8585d3123d177dd5909d29bcb7d0adf4421729db2b668d2e3d299ec9220a811b3d622edd738126c620ff241ccac3826478d3b8412ede81c5d5
+EBUILD http-accept-2.1.0.ebuild 566 BLAKE2B 56ad3751ede4c737d8a2988ba9b393098e67e8a83eba8d7352a2c130bd05b8820c96a9ccd3d04616fbd5e8aed550f962feaf2c47f66092335babf47ed7d6d109 SHA512 12c1a461ea6c922df8679590774618174b33dfec638c55cb67a187b79c53e85fcb98d9ff682c5a97f6bcfff1b965ea1b7556fc56acd3725976ee7581865b5da9
+EBUILD http-accept-2.1.1.ebuild 566 BLAKE2B 56ad3751ede4c737d8a2988ba9b393098e67e8a83eba8d7352a2c130bd05b8820c96a9ccd3d04616fbd5e8aed550f962feaf2c47f66092335babf47ed7d6d109 SHA512 12c1a461ea6c922df8679590774618174b33dfec638c55cb67a187b79c53e85fcb98d9ff682c5a97f6bcfff1b965ea1b7556fc56acd3725976ee7581865b5da9
+MISC metadata.xml 346 BLAKE2B c33b0144f0c036776dc5c8693eec52606af791efe1a90ea9c1f6dd6792fe858a50f0c60f05fa2acad93a0922abdc0747a8edd45e5cd13cde04375ef34c41dcc3 SHA512 1d219740872630fd0cfbe5e93ab11f445c13c9d57089ff1adabf3745caba7cf4eeb57fea8cdbc4c5a132be18ae556ceb82ebef438bbe4d0fad665c34bf1fada2
diff --git a/dev-ruby/http-accept/http-accept-1.7.0.ebuild b/dev-ruby/http-accept/http-accept-1.7.0.ebuild
new file mode 100644
index 000000000000..7a5cbd434f37
--- /dev/null
+++ b/dev-ruby/http-accept/http-accept-1.7.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse Accept and Accept-Language HTTP headers"
+HOMEPAGE="https://github.com/socketry/http-accept"
+SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-ruby/http-accept/http-accept-2.1.0.ebuild b/dev-ruby/http-accept/http-accept-2.1.0.ebuild
new file mode 100644
index 000000000000..96888b18982e
--- /dev/null
+++ b/dev-ruby/http-accept/http-accept-2.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse Accept and Accept-Language HTTP headers"
+HOMEPAGE="https://github.com/socketry/http-accept"
+SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/http-accept/http-accept-2.1.1.ebuild b/dev-ruby/http-accept/http-accept-2.1.1.ebuild
new file mode 100644
index 000000000000..96888b18982e
--- /dev/null
+++ b/dev-ruby/http-accept/http-accept-2.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse Accept and Accept-Language HTTP headers"
+HOMEPAGE="https://github.com/socketry/http-accept"
+SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/http-accept/metadata.xml b/dev-ruby/http-accept/metadata.xml
new file mode 100644
index 000000000000..156056bca8cd
--- /dev/null
+++ b/dev-ruby/http-accept/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">socketry/http-accept</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/image_processing/Manifest b/dev-ruby/image_processing/Manifest
new file mode 100644
index 000000000000..1958c94a4fb3
--- /dev/null
+++ b/dev-ruby/image_processing/Manifest
@@ -0,0 +1,3 @@
+DIST image_processing-1.9.3.tar.gz 984561 BLAKE2B 71c729c36e7048ceee3bd452d0429b24303f6898658337211cda4c697823e275f84c8b5ccbce857caa8f63a80e620f11822d3c0024f05343c3d72f9c8aedbdb9 SHA512 117e45146b646632bb2990f1651a494887ec8b75d8dcfcbea241b75d4691329597b7c8979fd13d4e51bacd5065b51594d6de9357e63c8b9b959b78fe075d0a76
+EBUILD image_processing-1.9.3.ebuild 1156 BLAKE2B 37ab6919275d173fc292b69f27389a0e32bf16f664beff7a5414f89e42a14f4a61ff52e82ce77c112f18739f2fdd3b4a95a84a0d6fcb1db32b8ef1e4639a0989 SHA512 5fdb2831672f858c0a2ce65a5f15c1b0f75b947e8ccd1486a95d7356aa9f23f2ef738967e59936059adcde7be58b45e997cc86b6b33e3d1a43a81dff19408b74
+MISC metadata.xml 348 BLAKE2B e9ff7002a69662a1f143cd31bf22379fa85f2548c0b1ca4b3e57e833d1f0090323b1e239f4ae53477effa8641a8435049a2835b2f054e90a06bfecd1c72ac536 SHA512 1fb1b17616eb7f7f083461e60823fecdbefeadfe1c3728a7e1ff381a453998164de3a0d64daf3714f079cbb456fba78acd9e09bafc73d2b562b75c5cf2064e96
diff --git a/dev-ruby/image_processing/image_processing-1.9.3.ebuild b/dev-ruby/image_processing/image_processing-1.9.3.ebuild
new file mode 100644
index 000000000000..00324c0fa69c
--- /dev/null
+++ b/dev-ruby/image_processing/image_processing-1.9.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md doc/*.md"
+
+RUBY_FAKEGEM_GEMSPEC="image_processing.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="High-level image processing helper methods with libvips and ImageMagick"
+HOMEPAGE="https://github.com/janko/image_processing"
+SRC_URI="https://github.com/janko/image_processing/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/mini_magick-4.9.5:0
+"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/minitest-5.8:5
+	>=dev-ruby/minitest-hooks-1.4.2
+)"
+
+all_ruby_prepare() {
+	# Only support imagemagick for now since vips is not packaged
+	sed -i -e '/ruby-vips/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+	rm -f test/{pipeline,vips}_test.rb || die
+	sed -i -e '/assert_dimensions/ s:^:#:' test/*_test.rb || die
+
+	# phash is not packaged
+	sed -i -e '/\(assert\|refute\)_similar/ s:^:#:' test/*_test.rb || die
+
+	sed -i -e '/\(bundler\|phashion\|vips\)/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/image_processing/metadata.xml b/dev-ruby/image_processing/metadata.xml
new file mode 100644
index 000000000000..1f111fbaf4c1
--- /dev/null
+++ b/dev-ruby/image_processing/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">janko/image_processing</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index 7c3b17d86a6a..31f1a0ccea95 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -1,5 +1,5 @@
-DIST mime-types-data-3.2018.0812.gem 157184 BLAKE2B b43b7bd6200182c402fe74f9a3f8cb1bc39a643b1de098ec6427ec66e62b6f28732032f4d6305f1ff267a61f60a12d759950b1a8f25c396bb2a7a6acc27b88f5 SHA512 8c60151f044a03dbb28da231994e4d5e1961839774791ac9caf3332353000c7ab12671960f791a03417b4236b9b6c9f690a5d228b7c5ec0d2a19b1a8e59eadb1
 DIST mime-types-data-3.2019.0331.gem 158720 BLAKE2B 513716a6095208f63eb479497af4e713308a367ef24808d7dd05fae5844482d4eccae7fe32834302caf9a6161df0bbc2506e2f34395315dae98b32e96dba1af8 SHA512 e5b158a90ce78eba2e0f328bda98d3622d8114ab61bb9636069b5e89a507d39e4c41de7f6ab48a4f49e4b5976cad645928c5d1bcc79f09654dde87e5babeba03
-EBUILD mime-types-data-3.2018.0812.ebuild 672 BLAKE2B f3c49ab29b7f388a91d7020de08364c14f7ce646776a6c1c7446c63b0ba33c29142c39defc2d1b7df9255647a9846afe6b4a1ba9d488c8f81348933c847867c9 SHA512 9e803e81ee162d6271ae7f40b4d27456b8cb0cea2cd6f3e4f32b92bbe98a752ccc9bf2e1c8a596cc31a19b9a62dbe4f4ebd911fa4e7522eeeeaf7a19ebec85f0
+DIST mime-types-data-3.2019.0904.gem 160256 BLAKE2B 7329657e943de126efe83dd48f6583a55b93978837665e71bc9a138b4826933d083e365e0f5bbbd4074a323d8d69731e3e0a4b831bb67503d652b0104fa03ec6 SHA512 a91d31fbc051b6ad57d22e6c4810191f8fdc05137418f11280744cb3164b912e81073c0ee92c18e9b3fb415071ca764a541c30a0a98e1850fba87a4b5b25899e
 EBUILD mime-types-data-3.2019.0331.ebuild 671 BLAKE2B 4f34c996e21664a5c49300b34e7299caee42dfc8ad92f0c20206b9075fd610bf665be294e542690d8514eeb5234bc56ac58e89e969f007a4aae49e86dc6448a3 SHA512 6a66e4a0d93a5c2734138c177125bcd5a6dcda5b7b424a91affc019dff4b03e7a0baaae306050b4decf2f62bc263522ee710b7a56b23226be2e3a52fba4c8d9e
+EBUILD mime-types-data-3.2019.0904.ebuild 634 BLAKE2B 2bb2573c69249cf9c6420efac660e6c41b9f2e8ce9e0d651697d3413c09152907d7766982c33b21c9af48a5966aacf9f59ac2324baf2cc86d5d4cb0c183835f7 SHA512 34980cd3689dd7101d683088be3d71eac889548296da7d091845cbc01dbc388628598b5d87a1e340e50d903a11874f40e58f44837f3773a8eaf3aeb0a3d60ad8
 MISC metadata.xml 352 BLAKE2B 31923bc222e1b0230ff1b03dff06215d199c9f0de7c7def0a0acfa7e6d74088efad1934704aa817ac91a8ed7d8a6287c059ae72d925fb83b2a15226b9a2f7dd8 SHA512 b994c7733a66987a405c5e03c34cc1c5c33a102d6121843147b846b2c6c0eb5eba2e5bfb6b8bdc27c39adfdeaadb1f5a525de3667ee7b22f9362b8539f42ec44
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2018.0812.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2018.0812.ebuild
deleted file mode 100644
index 0aad44fdff45..000000000000
--- a/dev-ruby/mime-types-data/mime-types-data-3.2018.0812.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Registry for information about MIME media type definitions"
-HOMEPAGE="https://github.com/mime-types/mime-types-data"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2019.0904.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2019.0904.ebuild
new file mode 100644
index 000000000000..1b219150f2e1
--- /dev/null
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2019.0904.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Registry for information about MIME media type definitions"
+HOMEPAGE="https://github.com/mime-types/mime-types-data"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index 4c82c7ae1254..1ad6a011301d 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -1,7 +1,9 @@
 DIST mime-types-1.25.1.gem 61440 BLAKE2B ba28c605e910c41840645780ff42d2eea032fd9baaa5d758085ece8ae43dd33582e21c57fff791783424d3c4d666bc48b6f77a0312754bfbcb185e22b1d53f5f SHA512 50a79bc0378bb9bf694656b15ac69446447fc863a5a6556e68ad736768627c9f43e59c68b0ed141cee5dbd81a8ccca1a33a61aa01af7d0a5949b00d6edb6525e
 DIST mime-types-2.99.2.gem 149504 BLAKE2B d2088d606b0210a8607d351ce7b7e3b7f25c3d518eaa3cb32ccfbf56a16eea104c908614f315317cece175003261d240f43bbf203619b54da35702abb94be8ce SHA512 46b3add451c3a6879f0f5df5f1e09c41d78d5a5b3872c2fcae7c8b097008cb04a9f5606360af9cc9880d7d659fe2dad19a118e6dfca1774ec3f5a5b852e31720
 DIST mime-types-3.2.2.gem 35840 BLAKE2B dd77473793d68007a3f096971366b5c2120391f3bdd5c758d8e4fac2c1df509a9e367766ac8f1dd292e9b000beb6346d22f2e21c599d2d9117cee84ae7fee864 SHA512 e098df6001ddb53225cf2f48df4e13f2cb9c5e86f64dfaebfba82ed9f1d60149b05069800ea14d1d76554d760169f3c3cb506cc3c789c74da7e1c8df61d67b7c
+DIST mime-types-3.3.gem 36352 BLAKE2B 3e774ecd832865c339e1c53e8def710f9b39e9711bc3ac4a7b55a4f500d6daf4f7ec7607ad7a30de5b9a8e717100cd96999e2c6d72baf5e1196ee8bd0897c178 SHA512 288f5f2dbb3ea970703e3b0d84a89246db410f8ccab5da3cc8fa9113ebb44a46144bb48f2216d37fd293b3ae156d596aff234721ec62e10c6b024f1eef2c9fb8
 EBUILD mime-types-1.25.1.ebuild 930 BLAKE2B 89306f2bc2bdc4acfa22985d105956a9cc446cd49f8ef3efcc8d6df307958e5e6dbd27192fd914799adecef52003c8dda784025a454a0b7c2b8e7ec994bf7aaa SHA512 38aef1f501418bce5c169ddc81c669bae21359c458e1c78d61a669c25d4fdeedb032631733191721b8b93a0b5f887f695d3e8c243f867d95af9a241d9f7c08cc
 EBUILD mime-types-2.99.2.ebuild 979 BLAKE2B be42762ae2d97075fa41c7c8421f9bb8a97f249b74135ddba663a2ce858de0ac440dd9abc640aa8db0cf727863b03c60fa1eb11bbd36de10905ec77bb538a5cf SHA512 250e001a33adb93d3b07bef7b2735b6aa2482cb19a37a1dae59e8738634bf3dc55e4f46e162512e781d140461d99a0caa118ea0b76fa6f002186bc7887a150a6
 EBUILD mime-types-3.2.2.ebuild 907 BLAKE2B fb89ce7ba7022850dfd12f444516d526b30dcb7edb734624ce1742da3ce88e9317e982bbaf6fe5b232409777bdd0faacca62f443f284d1e4123fbe117621c50b SHA512 53736dae1774c39b4ba6f263705a419746fbea33243a267b580e0780a6b41368531d676cd358526b6e42cc8dd00aaadcfae4eaf7c79b33c566fe9f2995fe1244
+EBUILD mime-types-3.3.ebuild 870 BLAKE2B c8a86baaf7d06c37420330b83a400da5e0e23e752ab68dbbf68d9b7549a19c61d119b3c1009dad79b036443526b018f712be952d20330b7030a50594c08be2b7 SHA512 7716680ae52e54016e9ecdade420fdefcfbbaf7d2cb80564e0db7d4fa1164aad55570cfaeb4ed60491e88eaf02c7900c30e4c054eb7256a7ec6d5ec5ebb4df4e
 MISC metadata.xml 352 BLAKE2B 6edd7bc99a1f3c2522e87695e078800275b4e9301597961b8e9ba3b920f7b75c92c8133860be4642995d2501e9bcc6f8f7cdbf611d85aa8ea23dfeda9353011c SHA512 01ae71ee2d991c0669ce4f9ac252f8edcdbe1df3f2510e5497f9a0fd0bcc1dc10a10259dc1b3dd14b73edd58895911d363b6a60105b619033a2bf09f987f4b5b
diff --git a/dev-ruby/mime-types/mime-types-3.3.ebuild b/dev-ruby/mime-types/mime-types-3.3.ebuild
new file mode 100644
index 000000000000..a4d6fa696343
--- /dev/null
+++ b/dev-ruby/mime-types/mime-types-3.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
+HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/minitest-bonus-assertions:2 dev-ruby/minitest-hooks:1 )"
+
+ruby_add_rdepend ">=dev-ruby/mime-types-data-3.2015:3"
+
+all_ruby_prepare() {
+	# Avoid unneeded developer-only dependencies.
+	sed -i -e '/\(focus\|rg\)/ s:^:#:' \
+		-e 's:fivemat/::' test/minitest_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 023c6f9fde43..758518807387 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,5 +1,7 @@
 DIST mini_magick-4.9.3.tar.gz 1187910 BLAKE2B d0eaa19da0d7310316ed6c11befa2e48ba75f441021f3ecd6533b0e04d9a44cc6da18c867cec87198abd3e433d63643ab61e21bd3c8b059a757634445f718207 SHA512 4a8cd953a8281229c36cb2482115a8fd127099729fbffd4be7db8967da90916e07c062c96ee066d9740d7261c07f263db8f020eabae59cf10fa6043e4be590c8
 DIST mini_magick-4.9.4.tar.gz 1188193 BLAKE2B bd3ae9eb2f5796c42093d9162cd7b1437eccd7ffc2fccd257e2f18b7d34709fa723e413d36045f50bdc13aff1ba5220a4d277d95e419cd37c5b22d304628403d SHA512 9d1bcd7925a26332ff35daba67d78dab88690ea403e70042485d3c1499a41080365b73c03116f26cf11f9cc05c75cf7a8c40f660764f45ece5fdb9ca8a521757
+DIST mini_magick-4.9.5.tar.gz 1192220 BLAKE2B 18867664682b82c689beadd190d203f9a460a229ee07271fdfd3b9ef7c7fb2a913107b2f318c33b7aa15aad88488a4da5548f371f9f9b38246aa8f2210e04d15 SHA512 06a82b3c5bf47ae1254fb669f4cb63a7a944977eaa790501ee715740c6a2fdfe81ea886235fe310d2c0ca07253f4167e72ddae6e29a551315ecafc595c2a3a53
 EBUILD mini_magick-4.9.3.ebuild 2105 BLAKE2B d2b8ed34b54c73fc62ae4b48e064f3120a33f0543ba36614372c6272be85439d7439831e87ed4dcd55fb2b08d033a0baa8d327e48b3e009f8a1c4651980d5994 SHA512 db02126d3153e387d9b63e481d99ba864eeb0e50dfb89facc22f8fbe1cba583acdaeb101dcb3ae3069b2aa1a85ed3bf2d69b58997415d65a75c4bbd88d6d900e
 EBUILD mini_magick-4.9.4.ebuild 2098 BLAKE2B 45f3efc413dc295df0b52f6b41fd3e6a262221b9b32670c912aef0a712490cd9fbdd8c499bca85e3cdeead9c73f2a768643d62a3827704d3e382ab0ccc469d37 SHA512 5098a7173dca084b2299ace9073cb2294483bcbc113e8430084f36c06c8e3a2e31b9d275558f259709d67e95d830629e5e8d64a8b6c443400403e8534c0301a1
+EBUILD mini_magick-4.9.5.ebuild 1895 BLAKE2B c77ec716b48f65c6f06c3962c2adab40ab9b452cfb87022c8b4ee26b51bb438cabe279965506d9a78344ccc570bb67ea749929de5affe5074eab2603655a99df SHA512 42e1d875de68bc5b47a8761f24c1afb6d6303e86a353f9a04362da7b026676249da8da5e1b0822f4eb715e6deab750757480c0392ca565f0cf9317ff8020011f
 MISC metadata.xml 347 BLAKE2B 679c10bbe1e22a6374f3a45b14364514d2cb3c23e0b965e9418d1c8f10b1b036bbf019539d95fbf19630d6f315a930142575da49d237c782f7a11b100fa7fd2a SHA512 9b98a4a0ec7b4c2945df5300ad26d8ffe1394294d0c6e142dc7e55e2cd270327df70fed857ff7d6f12f6b0212d6c25b8043be7800fdcca20bd58d14ac75fe6d5
diff --git a/dev-ruby/mini_magick/mini_magick-4.9.5.ebuild b/dev-ruby/mini_magick/mini_magick-4.9.5.ebuild
new file mode 100644
index 000000000000..f10d9b866449
--- /dev/null
+++ b/dev-ruby/mini_magick/mini_magick-4.9.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Manipulate images with minimal use of memory"
+HOMEPAGE="https://github.com/minimagick/minimagick"
+SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="minimagick-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+# It's only used at runtime in this case because this extension only
+# _calls_ the commands. But when we run tests we're going to need tiff
+# and jpeg support at a minimum.
+RDEPEND+=" media-gfx/imagemagick"
+DEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/posix-spawn dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	# remove executable bit from all files
+	find "${S}" -type f -exec chmod -x {} +
+
+	sed -i -e '/\([Bb]undler\|pry\)/ s:^:#:' spec/spec_helper.rb || die
+
+	# Don't force a specific formatter but use overall Gentoo defaults.
+	sed -i -e '/config.formatter/d' spec/spec_helper.rb || die
+
+	# Avoid broken spec that does not assume . in path name
+	sed -i -e '/reformats a layer/,/end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
+
+	# Avoid spec broken by recent imagemagick updates
+	sed -i -e '/cache files generated from .mpc/askip' spec/lib/mini_magick/image_spec.rb || die
+
+	# Avoid graphicsmagick tests because installing both in parallel for
+	# tests is hard.
+	sed -i -e 's/:graphicsmagick//' spec/spec_helper.rb || die
+	sed -i -e '/identifies when gm exists/,/^    end/ s:^:#:' spec/lib/mini_magick/utilities_spec.rb || die
+	sed -i -e '/returns GraphicsMagick/,/^    end/ s:^:#:' spec/lib/mini_magick_spec.rb || die
+}
diff --git a/dev-ruby/minispec-metadata/Manifest b/dev-ruby/minispec-metadata/Manifest
new file mode 100644
index 000000000000..5b23ba6e3bbf
--- /dev/null
+++ b/dev-ruby/minispec-metadata/Manifest
@@ -0,0 +1,3 @@
+DIST minispec-metadata-3.3.1.gem 12288 BLAKE2B fe8b921d7c2927cdd413da29b4953482b8b673c3ad0e997d2fb4f5b1f212e46c1597125378524213a4929fa3db5e6dc75a56a0e42f478cfa0000332b6e1b9073 SHA512 54d08b96f39e3fa7fbffcc4fdb5ef22725af1e3eada333d8a5963304d2d736cb2a6be7166a70a5ae893029fb920a0541d93f0bd7a2e3c51066536a3c02567b75
+EBUILD minispec-metadata-3.3.1.ebuild 529 BLAKE2B 1c31cc743458864e7d17b44eedafd010fa2bd4058e0768793a2b809828896994ceabbc343d42c300784125728264e9ee76ed1d163041cdc653b280b2e3469e86 SHA512 a83dd8d40491d992032efc8fb761ba30c41eca0eb906529387742ffe223cdd2a5441591c546edf8e87764af29f41ab3d0214958686c362741bc507e1bf5e6ff5
+MISC metadata.xml 357 BLAKE2B cb7f5883ddf8a050351c3204d9dc3360b556e5214d1a4c29e992977ea9b4649e908f3042c6e8a2e32c40859e1d10c7895b82af7152d8083eda4f039959c2c0e5 SHA512 f639feda224ab962418eb8dbf811bd389cb370a638ca549e4ead958daf36d5561ba739cfccd537acb8d44096193a057419abb90ee78023fad300e2ac8653a86e
diff --git a/dev-ruby/minispec-metadata/metadata.xml b/dev-ruby/minispec-metadata/metadata.xml
new file mode 100644
index 000000000000..3ec80fd288ab
--- /dev/null
+++ b/dev-ruby/minispec-metadata/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ordinaryzelig/minispec-metadata</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild b/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
new file mode 100644
index 000000000000..ad1f8b589e57
--- /dev/null
+++ b/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Define and access metadata in MiniTest::Spec descriptions and specs"
+HOMEPAGE="https://github.com/ordinaryzelig/minispec-metadata"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/minitest"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|awesome_print\)/ s:^:#:' spec/helper.rb || die
+}
diff --git a/dev-ruby/minitar/Manifest b/dev-ruby/minitar/Manifest
index 6a8954611bda..f6359bc29611 100644
--- a/dev-ruby/minitar/Manifest
+++ b/dev-ruby/minitar/Manifest
@@ -1,3 +1,5 @@
 DIST minitar-0.8.tar.gz 33632 BLAKE2B b576c74cfd59893d4c0c935703453551f9a0ca6258bc6a2b1ecb3151a44ff166607931e554c811fffb489b6398123cd9e8e58372a94b303df45d88ef903868ad SHA512 cab4798b98d91a17dd5ce4aed3f6fd166dab61e8c9e3bef3df218944fe1657a9ec9d40a52ab2773430070e50410c401da799469b096dcc2b22d6466da1e50b8d
+DIST minitar-0.9.tar.gz 33873 BLAKE2B 6d285c181510c96f173d850a9411da8a214459da14895e2d186ce712387d390c8ac95e27e4e768005540fdfb7463f32206085a72faf4de6b24c31cb732234260 SHA512 e3aaf0e664a985704cf9dccb72250ea2a7ebb2db9b6120590fb8d5525fe2717e0a90b3020f461ae0c4dfb19dc8728b4eeb6ba2e24ab75d12fbd7f5d98b269c79
 EBUILD minitar-0.8.ebuild 843 BLAKE2B 4fd52b8b583baa0df3a6cf3107d9479e0037e1abc83d0eec912ef83636d1d6096a291435ea74f32c136a943020a3b1aa051cfbfdd6f6f3423a20df41f75ae54e SHA512 1494e141678e0c410a186c00e537cdb258cef90ccd78e16c8c2dd87f107ce15af48a3c7b0c91cb393dd11ec14f724a466b3a5c43bedc0cfca9e992acf0b31da4
+EBUILD minitar-0.9.ebuild 882 BLAKE2B 8204f6ec2858b0f0eb94092b9cda9e742c1e73e5ef1893f4a1c16d54f16d73a57974a8a5452a542aa1444e12c2fdfd258bc9283312f5b1bff41a8cd71bd79eed SHA512 cf5aee909ed7b37dc551a16c5f20a108b879118a8d1091dd8b34806288d1214056c44931a1304d52970f65ab23fcc86802496b03feca6976d1bb0bc19902cb94
 MISC metadata.xml 344 BLAKE2B 859b7af9a7a2a07b43cc2625a5ac93a91aa9f16041a1f179654e126ab4f78d347a7816098bb6cc559fc1bc004f27156a06a83581ffdf143d86c15d8fa2a3fbc8 SHA512 fe6d4710ed497c7b81b336533868f760892f8946f766a2749349ffc105e33309abcfd7473bc940ef0cd0cada97965d4cc9504b53a76b9cb9b846c64244e2896c
diff --git a/dev-ruby/minitar/minitar-0.9.ebuild b/dev-ruby/minitar/minitar-0.9.ebuild
new file mode 100644
index 000000000000..3a4921cdd0fd
--- /dev/null
+++ b/dev-ruby/minitar/minitar-0.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="minitar.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides POSIX tarchive management from Ruby programs"
+HOMEPAGE="https://github.com/halostatue/minitar"
+SRC_URI="https://github.com/halostatue/minitar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="minitar-${PV}"
+
+LICENSE="|| ( BSD-2 Ruby )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/minitest-power_assert/Manifest b/dev-ruby/minitest-power_assert/Manifest
index 31de9f9d2e4c..84a8e4873fdc 100644
--- a/dev-ruby/minitest-power_assert/Manifest
+++ b/dev-ruby/minitest-power_assert/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-power_assert-0.3.0.gem 8192 BLAKE2B 063bb33a29abc72ebc5a0efeed83b0ffe02864f41d25adc59d7e923469f3b690f5cbbca462107036d5678236c17c697215dd51ad1f0823ece428dd52e0b18e80 SHA512 570c54960682b33f27cc6046177142ea76a8910d9b977788e96594c1b746b642e13a4e4f824722d15f7dbe61e3c08784ea6266ab03031e54343940ee4c75e560
-EBUILD minitest-power_assert-0.3.0.ebuild 746 BLAKE2B bd5120d9d7783011a97929185ddd89c2b5b9442828018aed036d47417bf7d012834c9fc48c00b260b099f8adf5b66654a02ebb3b4228445b97cfb7587b1cb42b SHA512 13b3a975a7bd651f4e358feeb46d4e4b4511005227240928aa81a1df1eb4906eb373c7d13dbab0e968bd77ef6acc07e93a05a97216a94436fbed42ddd86cf13b
+EBUILD minitest-power_assert-0.3.0.ebuild 753 BLAKE2B 2f91b672e109bded84cc40898eef66a1a73cc746a7b59ce4c013779b9c763b07f38f2d6dcde0e80384f83a46679f8f44a370ec0c7e7cd910218b9effb14500d4 SHA512 f683553054cb28c323d3ec74260a765daf4ee95e8da7961fff4835b3d6d039688860bafa99f56d4e74bd4f79933b964d165abd8a2ea9d2dab9392713193cd4fc
 MISC metadata.xml 352 BLAKE2B 602e40e72ddfc6763f110238ecd49ae67cf566e86a996e64514e4d0302e88e287faabf52cc27bbdd50dbc92b996d06b66e8eacca2f75e318c8fb98ebd08d28ba SHA512 bee51a932b3efd1dc3a3df1d6572f83ad7011b0947f9bdbbd42b5e5ec222bd642c27f235fe3646a903597e678f0894d6c8bfe1aefce1a3e3e9e42ecb53b5ab36
diff --git a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.0.ebuild b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.0.ebuild
index 7e1acbfd5439..1aeada724073 100644
--- a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.0.ebuild
+++ b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/hsbt/minitest-power_assert"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/mysql2/Manifest b/dev-ruby/mysql2/Manifest
index efd4ba48396b..62cd0c439d3c 100644
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@@ -1,9 +1,9 @@
 DIST mysql2-0.4.10.gem 97792 BLAKE2B 4978a3fbc8e516e47907d73276b244e614248c031db7c0b7d76d20f1f845be11f7187795d3a989629ff849e2e1bd0454fd56bc7be6b692d9840838861bafdb4c SHA512 1f9c8eb1b120cfc940b3aa26b2dff54735ccdf54fd6e6745e347179d29803b4a4d1f3b80a86f92dd534089f625ffcd6055458f27aaefebe58f8332890a842b43
 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.4.10-r1.ebuild 1109 BLAKE2B 4edfafe248a1812e411ca751ed53eef968a95fffa4e1a57564d0c2196932e042ad06037849a4b58bc686dc7ea06b27122e1d865648fda7016d08c0e4e25829ac SHA512 5b8ce65af849ea4d16577ccef0a7fad6e012e03038badf7548cb2eab0d45e77d2f423fe8b62f26866412a403553e91fa9666d6b0ec4d15295725137bd7a1f5cb
-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 1111 BLAKE2B 7d41638c5bedf5dc8f691d4d7bc5261e88a6164805f7624bee3c3ea4c906941ea314d1e9d0d6b490ee2faf7797e580a9b2b5b8fad1ece7488dfe3a7aca34bf57 SHA512 95531b4f52ab8097d7293f5a66f911256bd9adc36028a2371aa02ca98ae6f571e73e73ee930cc6045d9e168372f07d98c1c452c4fbeb92d9458630867beb8892
-EBUILD mysql2-0.5.2.ebuild 864 BLAKE2B 0b11d1fbbf05babce69c0b7ffbaa363a97b8e5961c844de072cb83185b3824e51ce78a2adfe003e9cbd5563d151839ea428f60b2eee80636897051a297b45123 SHA512 c03098a3bcd4b9a73a45ddfb922af6caac8535bb6430091db5cfe2100e4f4a1c0af6e0e4c3979ddbc885f5c9e7c50c0aa9f54b7aaab24defe86bd3f731ef1413
+EBUILD mysql2-0.4.10-r1.ebuild 872 BLAKE2B 877acdceab1715ae6e707f7799689be45502dceb80d3186f584bdbe9b1ea85ac5a24528a49ca28f8b67150204be161ab8368c26ae41e891fb24d27b1d237f00b SHA512 636c5e630ac7617aaed59231a66eac2c2b32e75a89c4ba8dbcea16b301b525610ebe183059c5712889336f401034a02961c6a0a084c4bef5bbaeef572931076d
+EBUILD mysql2-0.4.10-r3.ebuild 1113 BLAKE2B bc82dc8582b4cb304f830716d0a4750327e6831bd511e3a146b2c7825256eeff2083d0c2fe024e1b9e3a38ee7af68f1bb420148b860446dba765194c157ade15 SHA512 1890f857e7b295e4570fdd0c72dc2d58f3788492931c2dc79d92222229fb71fa6ea81fe3e4e459796cdede6c5045198002b38343ceff91c08b90c3663f51c771
+EBUILD mysql2-0.5.1-r1.ebuild 872 BLAKE2B 0f398a42ca285da955c2cd7a681068dda812d6f8aaf650f5ae879eecb7cff9c4e23eb16b8e9b99833a01bcf640a0aa125a4091292ea123e60ca035fabc910d76 SHA512 42c2bff388fdb5e05274419d6fca3e927336b43bddc68b2ff955c653317a99fdc9db3d74932c0cff61d71895d5ef394342656baadd70e51642dea9dcfdebe320
+EBUILD mysql2-0.5.2-r2.ebuild 865 BLAKE2B e074f5cfead4221b0a50ffbd08bb849eb11e7ef2ceccb274e828138dfd394c9e28fb4aa252da3a58f17214c67ecef7ea84a2786a9cab633bcb6ad79dce05f26c SHA512 d79de5022e68a78c177b874b354c61b1381c935ce13ff369a2db2aa380db8ab92b3bd94c8ed7c7b374f39a81b36e088a3bfaf838ade8f91ce061a6c2d297298f
+EBUILD mysql2-0.5.2-r3.ebuild 1115 BLAKE2B 5e9248dc33b676bbcdc21e7a4ffdddce20ced5636c09c82927952749af3db0de79b22296cbff49642f69ffcf5fcddc32c2fa23d7785baebcdc134973121a3e79 SHA512 215dff68c28704d72212b4d9b671850147c6b631c0c547b06a2ad29b5297e7d9df441026d6f75255228b4770862420950a7d78aa58c4721936297ca3f7198132
 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 bce3c4b3578d..db127e8a3933 100644
--- a/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 # Tests require a live MySQL database but should all pass.
 RUBY_FAKEGEM_TASK_TEST=""
@@ -19,23 +19,13 @@ HOMEPAGE="https://github.com/brianmario/mysql2"
 LICENSE="MIT"
 SLOT="0.4"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="mysql mariadb"
-REQUIRED_USE="^^ ( mariadb mysql )"
+IUSE=""
 
-MDEPEND="mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c )"
-DEPEND="${DEPEND} ${MDEPEND}"
-RDEPEND="${RDEPEND} ${MDEPEND}"
+DEPEND="${DEPEND} dev-db/mysql-connector-c"
+RDEPEND="${RDEPEND} dev-db/mysql-connector-c:="
 
 each_ruby_configure() {
-	local config
-	if use mysql ; then
-		config="${EPREFIX}/usr/bin/mysql_config"
-	fi
-	if use mariadb ; then
-		config="${EPREFIX}/usr/bin/mariadb_config"
-	fi
-
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config=${config} || die
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
 }
 
 each_ruby_compile() {
diff --git a/dev-ruby/mysql2/mysql2-0.4.10-r3.ebuild b/dev-ruby/mysql2/mysql2-0.4.10-r3.ebuild
new file mode 100644
index 000000000000..a22fbdcd7a29
--- /dev/null
+++ b/dev-ruby/mysql2/mysql2-0.4.10-r3.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"
+
+# Tests require a live MySQL database but should all pass.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
+HOMEPAGE="https://github.com/brianmario/mysql2"
+
+LICENSE="MIT"
+SLOT="0.4"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="mysql mariadb"
+REQUIRED_USE="^^ ( mariadb mysql )"
+
+MDEPEND="mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= )"
+DEPEND="${DEPEND} ${MDEPEND}"
+RDEPEND="${RDEPEND} ${MDEPEND}"
+
+each_ruby_configure() {
+	local config
+	if use mysql ; then
+		config="${EPREFIX}/usr/bin/mysql_config"
+	fi
+	if use mariadb ; then
+		config="${EPREFIX}/usr/bin/mariadb_config"
+	fi
+
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config=${config} || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/mysql2
+	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
+}
diff --git a/dev-ruby/mysql2/mysql2-0.4.10.ebuild b/dev-ruby/mysql2/mysql2-0.4.10.ebuild
deleted file mode 100644
index ecb0a26635d7..000000000000
--- a/dev-ruby/mysql2/mysql2-0.4.10.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="ruby22 ruby23 ruby24 ruby25"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-
-LICENSE="MIT"
-SLOT="0.4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND} virtual/libmysqlclient"
-RDEPEND="${RDEPEND} virtual/libmysqlclient:="
-
-each_ruby_configure() {
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/mysql2
-	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
-}
diff --git a/dev-ruby/mysql2/mysql2-0.5.1-r1.ebuild b/dev-ruby/mysql2/mysql2-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..c9ce68fd9891
--- /dev/null
+++ b/dev-ruby/mysql2/mysql2-0.5.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+# Tests require a live MySQL database but should all pass.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
+HOMEPAGE="https://github.com/brianmario/mysql2"
+
+LICENSE="MIT"
+SLOT="0.5"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="${DEPEND} dev-db/mysql-connector-c"
+RDEPEND="${RDEPEND} dev-db/mysql-connector-c:="
+
+each_ruby_configure() {
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/mysql2
+	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
+}
diff --git a/dev-ruby/mysql2/mysql2-0.5.1.ebuild b/dev-ruby/mysql2/mysql2-0.5.1.ebuild
deleted file mode 100644
index c72134dcd7ca..000000000000
--- a/dev-ruby/mysql2/mysql2-0.5.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-
-LICENSE="MIT"
-SLOT="0.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND} virtual/libmysqlclient"
-RDEPEND="${RDEPEND} virtual/libmysqlclient:="
-
-each_ruby_configure() {
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/mysql2
-	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
-}
diff --git a/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild b/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
deleted file mode 100644
index b2eebc52d058..000000000000
--- a/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-
-LICENSE="MIT"
-SLOT="0.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="mysql mariadb"
-REQUIRED_USE="^^ ( mariadb mysql )"
-
-MDEPEND="mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c )"
-DEPEND="${DEPEND} ${MDEPEND}"
-RDEPEND="${RDEPEND} ${MDEPEND}"
-
-each_ruby_configure() {
-	local config
-	if use mysql ; then
-		config="${EPREFIX}/usr/bin/mysql_config"
-	fi
-	if use mariadb ; then
-		config="${EPREFIX}/usr/bin/mariadb_config"
-	fi
-
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config="${config}" || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/mysql2
-	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
-}
diff --git a/dev-ruby/mysql2/mysql2-0.5.2-r2.ebuild b/dev-ruby/mysql2/mysql2-0.5.2-r2.ebuild
new file mode 100644
index 000000000000..93e6a4196626
--- /dev/null
+++ b/dev-ruby/mysql2/mysql2-0.5.2-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Tests require a live MySQL database but should all pass.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
+HOMEPAGE="https://github.com/brianmario/mysql2"
+
+LICENSE="MIT"
+SLOT="0.5"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="${DEPEND} dev-db/mysql-connector-c"
+RDEPEND="${RDEPEND} dev-db/mysql-connector-c:="
+
+each_ruby_configure() {
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/mysql2
+	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
+}
diff --git a/dev-ruby/mysql2/mysql2-0.5.2-r3.ebuild b/dev-ruby/mysql2/mysql2-0.5.2-r3.ebuild
new file mode 100644
index 000000000000..c54019a08f5b
--- /dev/null
+++ b/dev-ruby/mysql2/mysql2-0.5.2-r3.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"
+
+# Tests require a live MySQL database but should all pass.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
+HOMEPAGE="https://github.com/brianmario/mysql2"
+
+LICENSE="MIT"
+SLOT="0.5"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="mysql mariadb"
+REQUIRED_USE="^^ ( mariadb mysql )"
+
+MDEPEND="mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= )"
+DEPEND="${DEPEND} ${MDEPEND}"
+RDEPEND="${RDEPEND} ${MDEPEND}"
+
+each_ruby_configure() {
+	local config
+	if use mysql ; then
+		config="${EPREFIX}/usr/bin/mysql_config"
+	fi
+	if use mariadb ; then
+		config="${EPREFIX}/usr/bin/mariadb_config"
+	fi
+
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config="${config}" || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/mysql2
+	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
+}
diff --git a/dev-ruby/mysql2/mysql2-0.5.2.ebuild b/dev-ruby/mysql2/mysql2-0.5.2.ebuild
deleted file mode 100644
index 35a83a0d372e..000000000000
--- a/dev-ruby/mysql2/mysql2-0.5.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"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-
-LICENSE="MIT"
-SLOT="0.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND} virtual/libmysqlclient"
-RDEPEND="${RDEPEND} virtual/libmysqlclient:="
-
-each_ruby_configure() {
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/mysql2
-	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
-}
diff --git a/dev-ruby/nio4r/Manifest b/dev-ruby/nio4r/Manifest
index 692cd9b3ace3..386a4ea7ef09 100644
--- a/dev-ruby/nio4r/Manifest
+++ b/dev-ruby/nio4r/Manifest
@@ -1,7 +1,9 @@
 DIST nio4r-1.2.1.gem 94208 BLAKE2B 229c1c690004444a6701ad765af26e592b9dbdb3646f155dc2114ea677b40097c0158c615efb25506c2ae59316e4ecdd7ec8747bf4f18a3ec2ca1be6bf028b85 SHA512 3136863955bd6f4d489955bae9baf2fb527447c0e71dade1a05402f3e7c8570bf1dd9b8335d70d7303ec4df0a236b13e4ede74ce9154be00a108afcd7c6b7f40
 DIST nio4r-2.3.1.gem 101888 BLAKE2B 1891581eaa8659ed86f13e365664974ea55921e0107b7ce9757961cebe27f290995e90c17d375b35cf15245856c7c1d61fd05a332dc09032fffc1599bc2474ab SHA512 6e8fbc744f17b42a0a5c9f8f6db79ce3c9c0dbf6cb047f0b48faab813effc9f5dabe7405475a755bea9f0eb49037f6f26bdc6b8ff3fc7ab3bca61fc238e4eb6d
 DIST nio4r-2.4.0.gem 101888 BLAKE2B 05f0223ccf493d3566d370e3199b26136b4158939fcd7102d5d513ae0988c3691fedb00fe47f9884396bc333ed2b88b605c583048ad6a2ebe70eb7aa4b70a6df SHA512 2cd77c4af934c10cbcc23e926d0111a319bd9be69b0ead9c5c5614911f2cd3127ffa9fb103907d961b59e6f846cc83ac9a97722a85dac390dbf2f2a20976a0c0
+DIST nio4r-2.5.1.gem 110080 BLAKE2B 4d439cf67dc45deab9107d7c4ef9853f12f3ab88537bea9d83050d57c439cb850a9b883d1c2fa83da6c197b5257a7938fd55c4d3e65af3115cb2bd810e8b3176 SHA512 a99d44b0deaa298e2ad2b3dce5ec8889f7a95cb8b44f453fd2cb84c94354316c158fbce4bb7b3e302b22cb272c3354516584cc1432ca08968144d3212ff69f9f
 EBUILD nio4r-1.2.1-r1.ebuild 1009 BLAKE2B 1e03d4b0f3fdb2643ef903fb78872a4e050b2ee7a76f21a25ac0070351487b94dd7bb423302c352372098828b7e8015b8852a93fd4fdec55401dd9a4898dd0a1 SHA512 bfac422750ae73a1c5046659b007e22d486165992fdc1ac73f0c68b0c4cd4c219c7a51573beb1fc9cb7440b09074927a581018420cdc18bd13d05c89414f7c22
 EBUILD nio4r-2.3.1.ebuild 1056 BLAKE2B 075fb456e4532098a0460fbb926410c1b74e9aa97f1ef8f93679424af4139d44f0e19ba78a529361ebe99071f98308595f21ce90b021959fd18b741c9fc83745 SHA512 ea1cc25b6b71030eecfccefdb4f84fc9b6c911f8a52844c179ad4096e8fa581a34590df586d21be7100e1d2b22ce005ec3dcfc477fe0648ef9fff4ab22ca1212
 EBUILD nio4r-2.4.0.ebuild 1056 BLAKE2B ca92ccbef58047e80b71e750e16efdc1a1081503fef107bd64960c7ac595de5ddeeaf984c0bbfa20b4221dbd892dd024f6e47d546c8020b8237f7eb061431e34 SHA512 4e750d4c25c9782490516eb8a76e3207972a49192cc6e1c7c4e4d3abcb1e578a8d2784d24a2877962cc02dabf1009410a9437aec5401bc84b692f1b760e9a627
+EBUILD nio4r-2.5.1.ebuild 1075 BLAKE2B 2f24fc6017e5d049a4782f7fd89b9697724c79d5f12546efa147ab8a297aff8dd68dadc1d8bb924673905761040045886a540692dedc1753b045b391a22aaaa0 SHA512 f3f8cc60dca12ed830045a63a3be01888123a69439434eae89a92e7370b65d5497ae605e20c002541a8c3ad4ba19e2162751d7d1e3f66af4fb7b5b6b073385b1
 MISC metadata.xml 341 BLAKE2B 97c99a0ec8181c92b543ec63b8d1a40c8cbf88905afe02e6f13fa5e8906755bafadf426b7845f2e9bb0c1244168796d661a44e5138eca44068b142a39d3ad4d4 SHA512 8ba86bd5b9b9823cca53bdf18023db7385332c31fcaade177d394a36d60b892fcc632fc91b60addb77fbe907130682b435ab6103a33c71f2ad172b345e6f389f
diff --git a/dev-ruby/nio4r/nio4r-2.5.1.ebuild b/dev-ruby/nio4r/nio4r-2.5.1.ebuild
new file mode 100644
index 000000000000..a0396fa1cc8f
--- /dev/null
+++ b/dev-ruby/nio4r/nio4r-2.5.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_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 || ( BSD GPL-2 )"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~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/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 048baec7d896..26338ff0b691 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,5 +1,5 @@
 DIST nokogiri-1.10.4-git.tgz 5792963 BLAKE2B 80223c7bda39c56ced8e98d1d9f6858907f2814eb2d9f28d13c9f26fe29ae7f057e5a19765a3b304ffc4f9edd3dd0f77b99d5a673923ce95a8f02135aa9882ca SHA512 c27877297d432b9a9baf3e0639600d6ca5b382a87ff0dc1efb5d9bb3c79aaa31a589a4491f938283e4f9d35e8d29b6f88a60e27a5d4c81e7b491e100f8d06a9d
 DIST nokogiri-1.8.4-git.tgz 5754921 BLAKE2B 189dc8ffe4df67b04fa8436799bd6d64e4f8c1f93206b619bda8e153afffb3091fdfab9a3a4da28fcaa2650711aad6e37232e4e948a74c217f7fdc8b061dd4cd SHA512 ed409daeb4e13f93e13bc6901ee27bf5d1155e24fb306b5b9e8ba462517d26d4514413b9728d4a8f2514015c54436b9689a11449030c7bb5826d2ca7bf7eb97a
-EBUILD nokogiri-1.10.4.ebuild 2684 BLAKE2B c8874e049bbf647c3dfe269fbe6261cb6289cc0ca3e27b9e15379c8f74c0d5ca132d4bc9e90af44796e33f86054ea0e2130c11024a5f7fcd3b0131fb95cd9478 SHA512 858780bda9beea3c1d42977d29cb466448454a7da24770e5114bf17a3a15e8a6fb3c5e7d6bd68172f2700d740bbf900601ac59f03cf3a5feac1b62dc7e9673e2
+EBUILD nokogiri-1.10.4.ebuild 2682 BLAKE2B 2b46dffca2d43a024f7fa33da553763bb09adc0a1c2be70340ee4c337a040254e085764afe3a758932b0daa8e617956900c708ff63b5afd04b8d190ccb7c7a9e SHA512 8f98819613848a5ea79c40f1d9a19adda94abfd45c10b419a233da106fa12a785cb5860142ecbabc2ca6ef0842b2b9dee88a5476f6b027d9d7865635314ad778
 EBUILD nokogiri-1.8.4.ebuild 2718 BLAKE2B a97aef540279f6b0b17684a3b0a9fc22099e4ba7889fa933b5606adbceeb0dabdeb85f53e5139bfa099c529e1a53dc95a52a47e192dcf6bff7bc070ba68413db SHA512 3354d796753f1f05645dd966ea1fd4d0d75c92abd840a76659b0915496bb43ee3ae32218d6276ce9e52e2a4eca5d6b9a0bd3c9e679c87031afc12a8a5d0d57fb
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
index de747099c26c..3838c467ecf9 100644
--- a/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/paint/Manifest b/dev-ruby/paint/Manifest
index 80375d26d0fc..0bafd5f5d8b9 100644
--- a/dev-ruby/paint/Manifest
+++ b/dev-ruby/paint/Manifest
@@ -1,7 +1,5 @@
-DIST paint-2.0.1.tar.gz 21724 BLAKE2B 771a832465a48f9230d4687f28aaa852ace02831a72134c75b732dc446750650fb122a6bbac110d70aa586257f907642cfbfdb2a4c8b95e3358f1e1b7344664c SHA512 49db2bdca0b3b6236669219dadb8b72fb0f68102c6f93658e9b032d1da8e5be154458979425a793355efcfc90968c9cca7a1caacd087a67a5c486cd7495235ff
-DIST paint-2.0.3.tar.gz 21903 BLAKE2B d0d96813a12a992a0742eae22ffbbbde5545d9cd1df534a345eb36c522320b920e0da2e0c4b023647bb835f4e0bae7697f48f19cb0e1d167d95ba9d5a9fede90 SHA512 6a02a277e621c053f9b9f9465d0bdff981489ea14a2f127255a32b7caecb56f4acb09ef69ee892b8a6d939b83aad8b177f9f1531e84ec48a9ef833b97f89d0f1
 DIST paint-2.1.0.tar.gz 21894 BLAKE2B f67302d32e81a0e259e6ddc25afd945abe93b9dd921a3ed93271f1aeadf7ed0697c1f79869985e7714ac588f37e9e9d35564dd22baf4d909f59bf9adcc3354a3 SHA512 0de206c78c678d77cfdff0f26e42f2a045fc98a982943f7104d11e47cd4db9b196dba6a14eb09d98c103b3b70e13b84e48fe6261d2b03a9a0f4d4f10037a39cb
-EBUILD paint-2.0.1.ebuild 517 BLAKE2B e031f59e263dcfcea65b45456514a3ba1ab6d89957f3b4b06a4ff02481b6a13060b6f03b1d9d9004edb3b8849f6eab063b088eb3974a9c5bb8f032543e78a62e SHA512 b67d618b479ddfcd652f64e38582827a19599b13f011319e46bebf10c30c9bf1b890ecea28e1f723f2f9a31a1346763d89fb76d62b3b4cf0c4b4d11e642c3e23
-EBUILD paint-2.0.3.ebuild 514 BLAKE2B 7c430e333e4a6ac78374549687aa5e364089c9743ff16b80ee8c678328d503c825cd30e3176f1418a1f1e6148c53e1fa7f84fe26def77e9bdc77a8d7eae8cf96 SHA512 22c262aaf8584b47dc7de6e19b98341df51a3e4b6dd2421f56464741cf94bf5dec5a985538289fef70078093f91fe1ba582156ffb44e671151d4b9bae2e3d3f8
+DIST paint-2.1.1.tar.gz 21939 BLAKE2B 32e0334e7119e58577214438e1274fc283a90ed748daba7a76dc9e82370a6d6c2f705c33afb1ba241b4a19b049d11ccfe97b497c936eb9f47f234aad1758dc85 SHA512 6f3a889b05a9227666c38005ae7af149b1edf7db4bad2aa9bd710444119b7b219bb316f6337f7fbea4b05ef4e8b292a62c372cc10cd99febed03cdc6fd61572d
 EBUILD paint-2.1.0.ebuild 521 BLAKE2B 0cbb24950a2109e09429009ddc74721c3ed01d95771541cb9d7fa3262c007605ea660569ac47025bad3e9eea8c52ed3e95fb23787a4c76bde21395612e988620 SHA512 85dd8bc1661c67edf1161d587422d61e14f8727be37e912f93d77760c781e8d432631601022c64bd94946263b076a08aa968eaec7009f92dcf91de0ab6071235
+EBUILD paint-2.1.1.ebuild 519 BLAKE2B e07261a2873e60eaf61d18b2252e945582249cfe30ffd41b2d4682e4148df3dd229e2b939b36145f23cfe91dc16e9fa549ef59135e5f270126945ea124d760f3 SHA512 06a52bfd5bea2141d788084d7de1a7dc9efa4158f6a5e1d79b63b202029036036a4be48007fd67a9fbf8dd3675ab056ec54ccbcc12375692ceb84589d1931bd2
 MISC metadata.xml 340 BLAKE2B 732eb269ab350d7a6a922cb7bcfde4e68f7c7bd89b857a44719fcbc3e8ad72e35be71aaa9badc3a438e6f7ca2eb82cfd6bdc70cfcbea5a277f64e6ed0439270c SHA512 da77f9b9bc4d1f82a8c0934106888bc66e3e53cc30123ccd3fc7c74c19c514547e4159f5ad0a7dedc850da19c7fa86e6f0978c1fb0493feda9a3220f385a4a65
diff --git a/dev-ruby/paint/paint-2.0.1.ebuild b/dev-ruby/paint/paint-2.0.1.ebuild
deleted file mode 100644
index aebec5054eac..000000000000
--- a/dev-ruby/paint/paint-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +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="CHANGELOG.md README.md SHORTCUTS.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Terminal painter"
-HOMEPAGE="https://github.com/janlelis/paint"
-SRC_URI="https://github.com/janlelis/paint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test doc"
diff --git a/dev-ruby/paint/paint-2.0.3.ebuild b/dev-ruby/paint/paint-2.0.3.ebuild
deleted file mode 100644
index 188fb3ec4660..000000000000
--- a/dev-ruby/paint/paint-2.0.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SHORTCUTS.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Terminal painter"
-HOMEPAGE="https://github.com/janlelis/paint"
-SRC_URI="https://github.com/janlelis/paint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test doc"
diff --git a/dev-ruby/paint/paint-2.1.1.ebuild b/dev-ruby/paint/paint-2.1.1.ebuild
new file mode 100644
index 000000000000..ec09b1d5975b
--- /dev/null
+++ b/dev-ruby/paint/paint-2.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SHORTCUTS.md"
+
+RUBY_FAKEGEM_GEMSPEC=paint.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="Terminal painter"
+HOMEPAGE="https://github.com/janlelis/paint"
+SRC_URI="https://github.com/janlelis/paint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test doc"
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 46c204767b0f..d3fd93d967d0 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,9 +1,7 @@
 DIST parser-2.5.3.0.gem 654336 BLAKE2B dff1b0e0b593a5603f1b0fd9c39f59b6126ad9575d8c077d5a7e2feb16e6f9ef72321a3c7d3a0c21e2f7c26446132c8c30120785390f2b450a0f42a1b2d11128 SHA512 3721b5064ebd9a7de4e50f299001f1640ecdb27b99d932f0a509b89c0b5bf2b337b0298466e6267c61d2b5fcf2e556e0d1a10f6c29dc6f64bd042667f9d79d5b
-DIST parser-2.6.2.0.gem 701952 BLAKE2B 5c9fd1479c7bf95e43877a39c07697b766452bd9d712b140a313384adc50356949479f6a24e6d0dcba5238d8281cba952aed97ed002142c084fc73a64e96c3ec SHA512 c729767d8d2e7ddf293e6945226e219e297862a39bb22c52be0ae02e288cdf1a468cf372caef48cb858cd130b407e531efe9b1462a169c1f8ad3f3e56085e4ca
-DIST parser-2.6.2.1.gem 701952 BLAKE2B bce964f69d80b8385e1c3c5f7fb3b549b418536cf2b617bf278d776878da516c6922553e66cbd0ba7e26b8d4253a138e15f61fa602639cf639f74e1f0521b0f6 SHA512 339e3a3c4eb6d1d7b2008d7aa49a7857f06e767a23b148a68edd2509b3540a442ea6c62fcab2dce72416b15a7b80e448546589b0e82105a83514c66496edc636
 DIST parser-2.6.3.0.gem 702976 BLAKE2B 139264c11a043d52479d76bba50b877d1c5d9a7644d0863a8733887d6bb52b82e05ac1df44669fde86d863f92f545de1782ad4214619528265396c27d4a82524 SHA512 46823097d05550cd0dabf58d442560588d0757c85d44678836abd4c048ce2e5c2124ff8a30be6fd636906fecfcd8cefc500990ed26b4361669a8644ea860e7a0
+DIST parser-2.6.4.0.gem 708608 BLAKE2B dd511be4a82b6659d4b21071b7e12660e19e42879783739be5643a1f39d5823059b862980d133fff79b72c95193edaeaa0f99f20584f48bc0289ac8d0859f418 SHA512 f4652dcacc00cb26030ceab39bef1a0cff4802824834d32628b4d33c715a5e833422fed61d26c6c498c465cd34f32e3bfefb17b08b2604749cc929910b96b1f9
 EBUILD parser-2.5.3.0.ebuild 723 BLAKE2B 8789c34bf456237f0c19782f6d46b6605265e71a576e4f6524c49eb762a46fb0d499306f8cd4f9d6b3297587ffd16c6674e12d4e7145d5de218f08603b93213b SHA512 aa5d0c9e12db9f8c35b1cb34ac34d045cc0fe6a6f69f3cad530468d2dd63dc8fc4ae90c99bc8cf70232f565210c37bbbc6fe45965dea8bd44ead58e137c10bc9
-EBUILD parser-2.6.2.0.ebuild 730 BLAKE2B 06c31bf98bb33344ef835077d7e87ad62a6d24faf803ca957668641b69ef5175bddc7594c571dc8567d3a68c883eb4adec798cebc9d62eb9e3a2879fa763bbb5 SHA512 b1fbad99e56eb7f6fa467dd3564bf3356aecfc108dbd6b28566e4463f6e413ae7758269e6c1901a1a3c84c3246577952011d47a8f6b5ce27a4efa2cbd18d59c9
-EBUILD parser-2.6.2.1.ebuild 730 BLAKE2B 06c31bf98bb33344ef835077d7e87ad62a6d24faf803ca957668641b69ef5175bddc7594c571dc8567d3a68c883eb4adec798cebc9d62eb9e3a2879fa763bbb5 SHA512 b1fbad99e56eb7f6fa467dd3564bf3356aecfc108dbd6b28566e4463f6e413ae7758269e6c1901a1a3c84c3246577952011d47a8f6b5ce27a4efa2cbd18d59c9
 EBUILD parser-2.6.3.0.ebuild 723 BLAKE2B a34c8b4c8752e3d5606a4502980166e6c717d2108a2ad745baa9bbd52bc836d14d9bd7da380cb37334b31c4ace3b40e9485951a0ef2e62739a260749102fd7a6 SHA512 055b586fd66ec1ce0bf22f253bc27393c1d56158da5458dee3cffca47fd18204bcf314bc4a1e71efe5f3ff7a4da7e8bf0b3585bd68dfb3d3036aae6dd2cd56d3
+EBUILD parser-2.6.4.0.ebuild 723 BLAKE2B f97cf615515e70de2f4cf9201c13c655c79b2eead20c9348b1b9f1d8d728d13949abad560f31f42e2b1870125ff035e7fddeabb4aabd2162ccaa9b322f1e6c69 SHA512 0efc32d24c71d8cd898bb98dea0a0455b59f5178871b3e63d2a1ce335ea3b4c0deae2d79f5aa2e5a9265f3b1090d81c623b17d73126e97718f0a7db68c104466
 MISC metadata.xml 343 BLAKE2B 7da9e267560e7a67c7a8afd5c283389dea1d4db2cb0ca65e4fda61a576036bb8068005b5e31ba9cc8fe7b68b8f8af5f93bd104e6d63412842dd7d0030b83fbd5 SHA512 f8dccc996237113d4add61dcc46e1407ea6edf156b001994e31d920f688dfcf9efe8d3d991ef31dc0084b7695b57b5d51471c57e9e945308279dec7909c69517
diff --git a/dev-ruby/parser/parser-2.6.2.0.ebuild b/dev-ruby/parser/parser-2.6.2.0.ebuild
deleted file mode 100644
index eea51db58bc4..000000000000
--- a/dev-ruby/parser/parser-2.6.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
-HOMEPAGE="https://github.com/whitequark/parser"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/racc
-	dev-ruby/cliver )"
-ruby_add_rdepend "=dev-ruby/ast-2.4*"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
-}
diff --git a/dev-ruby/parser/parser-2.6.2.1.ebuild b/dev-ruby/parser/parser-2.6.2.1.ebuild
deleted file mode 100644
index eea51db58bc4..000000000000
--- a/dev-ruby/parser/parser-2.6.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
-HOMEPAGE="https://github.com/whitequark/parser"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/racc
-	dev-ruby/cliver )"
-ruby_add_rdepend "=dev-ruby/ast-2.4*"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
-}
diff --git a/dev-ruby/parser/parser-2.6.4.0.ebuild b/dev-ruby/parser/parser-2.6.4.0.ebuild
new file mode 100644
index 000000000000..1ec9261115c9
--- /dev/null
+++ b/dev-ruby/parser/parser-2.6.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/racc
+	dev-ruby/cliver )"
+ruby_add_rdepend "=dev-ruby/ast-2.4*"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
+}
diff --git a/dev-ruby/priorityqueue/Manifest b/dev-ruby/priorityqueue/Manifest
deleted file mode 100644
index d94e3623b18e..000000000000
--- a/dev-ruby/priorityqueue/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PriorityQueue-0.1.2.gem 59392 BLAKE2B c28fbda358b79eb9f662944d80e578484c1380c1ac6490b2610eb8cdbb5c1b8ed79053a0faa301cb0c62d36c883d431deb5f4bb9248a133fc9e8ccaadb6df37c SHA512 67ae4507882e7635bef387b0df63ac7724b285cda5e23a06572477de71c98fd10b7718d966f2d5dba1f8cad29df112929d6b0ca30c042c843d364e5c8abccf23
-EBUILD priorityqueue-0.1.2.ebuild 833 BLAKE2B a38db6ad3c725aa67db560350fd404bff8a950edb77eadffb977f1bb1cb500bb846723694c444a67687f94d7d056298f632fd944c3b8a39869e753dc17d595fe SHA512 72b82b51faa4fb964e04350869a42d53f566ef233798aa10003845e0a6e2a633dbcb7208a741c93026f7915c7220764bfe78364897b9c0bf558ad26ea0ab7ca6
-MISC metadata.xml 331 BLAKE2B 18fb5659cee52271dcd402173f8416b2a9a46699937c01a40c3e500c5beb68e7adc1728db57b586254178c076d9c12945f1ac1c41eb1e145b1cee8cf0f7ba252 SHA512 2fb2c81a529e66eff41c9e02b43836076a703cad37dd3ad394266b1c291b9b4e05ec8af45304d677941e63d1ab258c5f2663acd7e886f6b9b49d32e77a48d81b
diff --git a/dev-ruby/priorityqueue/metadata.xml b/dev-ruby/priorityqueue/metadata.xml
deleted file mode 100644
index bc6621ce376e..000000000000
--- a/dev-ruby/priorityqueue/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>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="rubygems">PriorityQueue</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/priorityqueue/priorityqueue-0.1.2.ebuild b/dev-ruby/priorityqueue/priorityqueue-0.1.2.ebuild
deleted file mode 100644
index 2946adc65a87..000000000000
--- a/dev-ruby/priorityqueue/priorityqueue-0.1.2.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
-
-# ruby25: fails tests
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-RUBY_FAKEGEM_NAME="PriorityQueue"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A fibonacci-heap priority-queue implementation"
-HOMEPAGE="https://rubygems.org/gems/PriorityQueue"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	rm Makefile *.o *.so || die
-	sed -i -e "s/::Config/RbConfig/" setup.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} setup.rb config || die
-}
-
-each_ruby_compile() {
-	${RUBY} setup.rb setup || die
-	cp ext/priority_queue/*$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/priority_queue_test.rb || die
-}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 7303e6cad63e..44b613634daf 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,7 +1,7 @@
-DIST puppetdb-termini_6.3.2-1stretch_all.deb 20662 BLAKE2B 2e7daef3892070d5356ced070544099a546e4887b5654f795e06952862e4c0cb155df200806217fd5376b1bc3fb53107467ca76acec05283d2f25fed7ca7e5ca SHA512 555abacc9de7221df78a8459a76a4c3c8ce3a1bf5e2b6f1d800761eaea650d2a308e6a5054be082cfb9823903fbe049b2dc5f323b8af93693afbb61c8ce6c4be
 DIST puppetdb-termini_6.3.4-1stretch_all.deb 20680 BLAKE2B 41d64eb7a13a0036323b916a70cebdc1d522175e1b6460a0df577b35d57bdfd2eba76784e7af314336d618e7445639e12ec369f243d10b5120ef5006fa21efd3 SHA512 06ce200b4d919d99c28f5361993ca9a641f38d27b1e775db7f1edd10515b75ea131770f3e03a1e3f9d3b32cb8e6f32f6995a6df1e6b3f24d4601585db48a9d8b
 DIST puppetdb-termini_6.4.0-1stretch_all.deb 20680 BLAKE2B ccd129eb8510794c165b6fa88ed391006e583e58fb43fe1be72e1b976d75f30aee0775552f6460840b805e1e4ceb03a6c77dba70afeed75dc2ea3ebcfd4bee77 SHA512 948b5ccd1ddc1f0d52174a073cd13af9e1ba0f713c5326c4d3cbfae7daeeb16cb05efdfb7ac572f9d79e34842fca0a95e054ee49239d593bf4429223c18bb58c
-EBUILD puppetdb-termini-6.3.2.ebuild 663 BLAKE2B ee7bf569a71860c88a0553ba60a08a57df1650050470c9e42ec6138386d21069c45a828be62c16582a973c30c314a5439903bc682b28a62732486737c079bf7a SHA512 efaa2a0f75daa2a4b7791ecee01c17286f5dd11f606c01187b9081f4793d456abc24dd9d9317804784cfd34e578b5dd524c270831c9a9fcbb6a1df6d07639051
+DIST puppetdb-termini_6.5.0-1stretch_all.deb 20870 BLAKE2B 41cf79f2b7ce218fdfbce2588d8e206a3751ffb07a133bc5ddef3f5662c51eb9d12cda3017921edd4aafc064ff35713daaea9542dac687b3f399f2706657131f SHA512 956952bbc81cbcabd8ef3e37b9ebc7c489c90da7b75ff2c9a3e36cd312ee3f7eb3350cbf21a8b44f1d6722ddd3168f5795ba7258147f340a111b9dc29796cd84
 EBUILD puppetdb-termini-6.3.4.ebuild 663 BLAKE2B ee7bf569a71860c88a0553ba60a08a57df1650050470c9e42ec6138386d21069c45a828be62c16582a973c30c314a5439903bc682b28a62732486737c079bf7a SHA512 efaa2a0f75daa2a4b7791ecee01c17286f5dd11f606c01187b9081f4793d456abc24dd9d9317804784cfd34e578b5dd524c270831c9a9fcbb6a1df6d07639051
-EBUILD puppetdb-termini-6.4.0.ebuild 665 BLAKE2B 92d4b605fef931841c189603f1db1c9dcf33c674922a1f0106f05310ec7c67ce6e8c06340e9be2c46e4ef2e3c84d96fe8cf5aa77b703bb0396f78000aacd33fa SHA512 c53977ba31eb42260b92d1cb567d50f026f5cc47d7d4a9b13645376232b6f878354ceeb6b71d73da5209bb61256222f94b98441954729d8c4a264fdf8a385004
+EBUILD puppetdb-termini-6.4.0.ebuild 663 BLAKE2B ee7bf569a71860c88a0553ba60a08a57df1650050470c9e42ec6138386d21069c45a828be62c16582a973c30c314a5439903bc682b28a62732486737c079bf7a SHA512 efaa2a0f75daa2a4b7791ecee01c17286f5dd11f606c01187b9081f4793d456abc24dd9d9317804784cfd34e578b5dd524c270831c9a9fcbb6a1df6d07639051
+EBUILD puppetdb-termini-6.5.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.3.2.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.3.2.ebuild
deleted file mode 100644
index 5dea78fa68fc..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.3.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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/puppetdb-termini/puppetdb-termini-6.4.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.4.0.ebuild
index 6d51b944dfdb..5dea78fa68fc 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.4.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-6.4.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.5.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.5.0.ebuild
new file mode 100644
index 000000000000..6d51b944dfdb
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-6.5.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/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index ed69c3964ffd..80af67af472f 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -1,5 +1,7 @@
 DIST rack-protection-1.5.5.gem 18432 BLAKE2B abda1313e7e0d04299a689c55241cd92d0f5ed2048395ab79f09ba271100a8dc99fbf5f924e3b3cbe28f318090144539eb0174cc1813d371d9f37df31ab04315 SHA512 c4066a50771247fc89d4ddee44ff87e40a24bad95e914ed2f72cbf9c45152e67e51d2ccc7d1725ade637296a080b06f304157a1a024613a97595b144e03e2e70
 DIST rack-protection-2.0.5.gem 16896 BLAKE2B 144888ca499739017ffec494785ca5cba0d1cbfabdf08b11aad4fc88aaaa737408d1801412f05919830c65fd11b2f344f0f758a0334b109174805d5089352521 SHA512 9c4c80a8f70042bea81a67260e26aa25c0a33c73835e4e49cd44c83930f97d8c4d63004d3e39ed631f016e44d66fba238f9c509b0e44eddb2f484d174adea9b4
+DIST rack-protection-2.0.7.gem 16896 BLAKE2B e9d6c91cebc62e6f1efa91a790edc218c78b8336ebcb03ac086e070360be0e5ded4a897042b85bef8e5625dd8c1bf035a825202f0a619f10e584fafce1ab0d0d SHA512 9001bee93859c87060450b83171eab80bf085c0238f978673ac6e31e3e1884a0de1a6d789a61900d1fc429e64f2eb3893e88cf32bef0b3e2a9f58e6f3a3abea1
 EBUILD rack-protection-1.5.5.ebuild 690 BLAKE2B 00837887ebd9fd360b9be647ecb2850dcf9d39f9843eb0f20290d075db288fddfc7070c24a324f8bed9c74b98daf153ced7a1c6dae45bdeafd4a46dd4de2d77f SHA512 dafb498a3d11002ce365d26ffec3b2dade3c4e3ab26536035fe2954d32a926128b23ca3a16116ca84821c89e218144cab416f85679401ac28502ab486997e650
 EBUILD rack-protection-2.0.5.ebuild 770 BLAKE2B 4775b46794f9679d02f966a03ef181b17a208855facf753af40bb529260cf12724d0dc421a48c1fe17b523d282af84e724629e65e2e22943ed764c0bde6ce6f1 SHA512 1d7cfe140cd1b74af1b90ad308fba167b8a4c1882a9e07ef31a54faed4443dde493acfb97e20b9065fcdb20a76a71e2cd75f7411b6200180e3bca313335457f9
+EBUILD rack-protection-2.0.7.ebuild 723 BLAKE2B 2529a49073eb8a1ea37c2668b8d0561593c9372c428bde54a1a84685d99cdbe6656ab8996e5fd9a8b4058d42af3f28be73374e382b4ff4c73fb8a524471a4697 SHA512 c6dc8e06d8fb3056f12a06579810a4a2bc951a3212037ad02e3eea8fb66b653debbaf12f6eb36256e8ba054fccd5006f46a5b443d027f145d7497a520a9fef43
 MISC metadata.xml 488 BLAKE2B 1db94e175d1248a334fa9ff0b5936d0281a1ee2ef69974cc33ba65e19de9ae043e98599a52f5cc55d3e1ca3e5bef3e223cab7f3be0ad9b561b05d81da8c09687 SHA512 ad0122f6e0dde2c02a1af8b8e81a5aebb1a13e0f56dd8f222d6f051da55015a89db0430efa6c1e6b5e193a94ba69d0244498d7cc14f0212f8032393a7f5988b8
diff --git a/dev-ruby/rack-protection/rack-protection-2.0.7.ebuild b/dev-ruby/rack-protection/rack-protection-2.0.7.ebuild
new file mode 100644
index 000000000000..424f35c8363e
--- /dev/null
+++ b/dev-ruby/rack-protection/rack-protection-2.0.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+# There are no specs in the gem and the source cannot be downloaded separately.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem protects against typical web attacks"
+HOMEPAGE="https://github.com/rkh/rack-protection"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+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"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rails-html-sanitizer/Manifest b/dev-ruby/rails-html-sanitizer/Manifest
index 33c074d84f2a..cfecbf75fb22 100644
--- a/dev-ruby/rails-html-sanitizer/Manifest
+++ b/dev-ruby/rails-html-sanitizer/Manifest
@@ -1,3 +1,5 @@
 DIST rails-html-sanitizer-1.0.4.gem 15872 BLAKE2B 4408a494f75bedb4e4286e053536abf62f094873d9e0a8c21f9de6f42b2826f187c9919fb86c84380c1eff241c62f077d48cc21912c93fe85ac2b6039089a84d SHA512 f608f2b642869606fc2c3986298a8ae3e36c676a7eda5e3cce419700961bfed011f8d4a2dcb59e5d32a41f556815ca5f214ec19f8940ce71d1217ba84686b8e1
+DIST rails-html-sanitizer-1.2.0.gem 16384 BLAKE2B f5a5ededf15c199b59dfcd7b2da234f766cd46cf46834b458940d7b68fe27dd97602a6a673d8c0f700cf9c593a8375c97e74da0ac0db355af93bf951540ac368 SHA512 efe006ad2857a21d466375f630fe269cceb78aa467d91cdf193ec5eab8fdb0d58443696989b920840f6aafcb9ddfa6a72972f0e09456b2aa57018d86791cc38f
 EBUILD rails-html-sanitizer-1.0.4.ebuild 675 BLAKE2B 3967b0ca781cbfc191e968da05029acbcb7081430dc97a08580356f98b40603e16097505d2d2bef04fbb47c559496c85b10b52835f31d4494e91f120494c7f48 SHA512 00226658f48b339b4fa94ff5c4bd1941fafd63793f05a670be4c54cec893b758278c0189985446a4d6f99a3fd099e3fdcdd79880666f839e1398d2016fbae11a
+EBUILD rails-html-sanitizer-1.2.0.ebuild 866 BLAKE2B 61fab0bdb46f2cf9976dcb7d2f55ccf9798c06ea8a28e3d318ca49005c00b5b197688fa42badba9623619dd92860eacc6337702ed367bee626d1c5c1e4946db7 SHA512 30f4daef95453c93b30e06c4ad353f1ed523da0c8cd648897d02f2c3dbc14d96c94f8e10e0919ebc812e4bd95f3a72bc5f5c92f71708d5b0fa68ed02a587d90a
 MISC metadata.xml 359 BLAKE2B f227b45aa66e29d5ad9fe902cbd05ff8d41b6ad06ea0acbf812595b936897db899436a788fb0af5143303f0ebe6f18de1f2d265c337e57d616bdbfc7b1fdfcd5 SHA512 a7b934bec0d958559083b417dac76c3ffee71d9efa912b6bab2c2c01e6aa9acf39a46d71fff54a9b750afe6f59a8eb4b12c10b5cbee62fc5f32dab29911f4bd5
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.2.0.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.2.0.ebuild
new file mode 100644
index 000000000000..aed8ae6608b6
--- /dev/null
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize HTML fragments in Rails applications"
+HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/loofah-2.2.2:0"
+
+ruby_add_bdepend "test? ( dev-ruby/rails-dom-testing )"
+
+all_ruby_prepare() {
+	# Avoid tests that depend on nokogiri patches to libxml2.
+	sed -i -e '/\(name_action\|attr\)_in_a_tag_in_safe_list_sanitizer/askip "libxml2"' test/sanitizer_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 142684bc224a..ce49cca608b8 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,7 +1,9 @@
 DIST rails-4.2.11.1.gem 1476096 BLAKE2B 18fbaea1b955e586bf84db43dd24998e18175895385b7d360f0b87b8ff283313b360180adba73f1172ce7a3633813e8e59b3dfa18111f439afd54f3ed576440f SHA512 55cd57fdd9d8f1efa0f8c7e7c1dbcadc1a7c2bdcb6230a1c88cea5c4bb567916d1c511749a08162e509c6fe15d4f57634bcedd4e2a32fe6ed5a726a229a6ecab
 DIST rails-5.1.7.gem 6656 BLAKE2B fcd98f59c8386585048f085add74e8349f9145e72c3edb8a96e839521034f53aa4d67cd0e2ced82eb9382fe956166ed846807f1c31dac442bf8d4962cf4e7121 SHA512 6ac4450256ba9c88dbf37cdb5b4306f2822a6c9c336d5ca4c4afce6f240827a53a70d4fd839118011c538793e448bb2bccf4ac4df62240b9312cec88ff42b9a1
 DIST rails-5.2.3.gem 6656 BLAKE2B 74798f554234d7eab2498912a3c263d83a1bc6c2e0744025cddd44804bf34247de77fc9c8e6a6e17b0cc0db47c60e4fea5581284b1d31a7dbcee0c0990665057 SHA512 18387ec05fa1ab29c361518ec9c8fa0b55a65ed1da6391bed291ef82048b3e81230e1cae4b7f805ed7c56cc336d1bea8feec5aaa703eea4bc6c18912e75f78de
+DIST rails-6.0.0.gem 6656 BLAKE2B d381c7f2c019d66f5000b7c84ef9e1a14b184ee67d9bb6a473bcc72e533d8384986870920ab813421f4540d86893d6c5cd9561800c8f0c08e372e9ea93523e18 SHA512 c1bc177139efbbf3244f450335226cfbad2391b75b641d4b3062b4285632062e4b4b521829e3a12f8a5b4ee871daf27fc7a075159f901b74b5a187d06d7531dc
 EBUILD rails-4.2.11.1.ebuild 1107 BLAKE2B 824ab8fa591477ee7866c351ea8c60bcb9349fa773bfdb7574e4e24c0e28a4e57560acd288de10d290e9ed8ff1ed3347fa5a14781ed558a98356745a6c3db11b SHA512 00bcc38c8158d78f77b24a1b74306d361880504b911c80935cae0ff890896bcdeb3555f39323aca5753e15d29b03258ee617d377209f40e596cc05cae38b2993
 EBUILD rails-5.1.7.ebuild 1068 BLAKE2B 91a386218cfebeade3b3049e410891cd856deacb5237dd5967416bfb4bb5c79cb257bcf86bc7d91391e4377111a142cb1b02294fa16c6aa30b5c2e01443fdf7c SHA512 45fab1419541f3c27eca29d0ae8e7a931050124a74c23c32c1309029b7e067d8681d7aa629b49f810372075030b175a286b62a15b5d7ac1a090d0545c19e3e85
 EBUILD rails-5.2.3.ebuild 1075 BLAKE2B b0704574c1a0c8e9ec28ed94edbb5236cf22c9ad26ec14393589b47b553b974005469f314b7872e7db8535e5345903b2e7c9e9cff930725074d5c3cab8bdbb4f SHA512 e39aea504865524195baa88167643df526446bdcc8d51824cedff12877cdd5fadf10df8cbb6ed24d137b32df98f53928891624cb4630e7753405fb802b79ed51
+EBUILD rails-6.0.0.ebuild 851 BLAKE2B 530e922582cdefdadd9cdf59e37911c7fb61ac799ebd036da3285654467af293ab8470dfbe870643517ea63a384c35b0c8ea38a0a045c14c86009c812b3ed171 SHA512 2b469afae26b546caeee7320ce94257ace980df6fdf57be43ce5d54612f6205f3190714164abb096712470c97992a8b2bafcadb174931fb5fe6a013620c68732
 MISC metadata.xml 491 BLAKE2B 83b3fd3239655be2b30f22235bac80ff14e4c7480a50a32921ce1be24e898b62b68738d635f037ee2a5c5e645b616aa5a2f9e3f1f7df09ca59378ff30f35b6ab SHA512 329f17a58eab42893f554965a142409c32b26e1b195ee315a833ccc96f3081e8920d2c97bba0230a03c882c027a0184f340b8c7760d4e1b3765041f56781769f
diff --git a/dev-ruby/rails/rails-6.0.0.ebuild b/dev-ruby/rails/rails-6.0.0.ebuild
new file mode 100644
index 000000000000..50c9c59c9ee6
--- /dev/null
+++ b/dev-ruby/rails/rails-6.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailbox-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actiontext-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.3
+	>=dev-ruby/sprockets-rails-2.0.0:*
+"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 5a464c69c3bd..c7f7870885b1 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,7 +1,9 @@
 DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce5252e8fbe4eb4c6935dc660614c2ff29fd168bbc66d74bfa64b92abb84d02645cb3b2950db5c166111b7b19 SHA512 6595eb19f174c9e46a937d6028d9bb2bfdcda06f35ec2a0499bc5deff05d8cfc8f8fc725e664496d3b431c8724141a1410201b57945b98ca211aea15c990d621
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
+DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
 EBUILD railties-4.2.11.1.ebuild 1707 BLAKE2B c4ee99a40cbeef43d8ab63134f581c01be1b8c6d27a10dc7368a6ef837c515309712e9e3d37fb153975360cba76e66ebf09dd056d486e9a5948c75c8fa862b7e SHA512 c8a68a17c8cc293bc7259751414f245ace596385c39a77da025ee85c17eb065bbc1528f8b173f132893f61f5c09f91f227452cb6f1343484d967e3d16a533e5e
 EBUILD railties-5.1.7.ebuild 1660 BLAKE2B bed1ab8e8b3b1c5156ae053b72f0c888cf85a0307d0f3a6800cf34acbbfa59cbedbb9d2d1f68e40f8449c8f87088d742b3bd5abb3404de11eaf56bb167b25ca5 SHA512 cda33f5aa0cb200582ec11fa671c303c92c065c57c5f0e202bb5d3446e76a8a254a3dfe7e27d516d68699fa87f27158e79e63b269d61a47168c185c28a19a3b2
 EBUILD railties-5.2.3.ebuild 1652 BLAKE2B de5e82b9c34953edaf43299181d8b1bd6aad486eb9421fe41cb0979c794dee9dd562c662af426797bea8540ae6042cdda3b3e5834408b97f53fce5b8c26e60d0 SHA512 856bf234affa5517e0db7bdbb92fb2b3f81ad50512f72d862797af429477145dbf4e8fd27cf70c50b2e0ae1e0f5b199f518221723ab4aa16ab91d752ff7afb3b
+EBUILD railties-6.0.0.ebuild 1590 BLAKE2B c4c74b7528730c87fe917ac4825303e5dd9b31b60fd15ffe0d0a52e99ee361ed85d1f91290a25e22385af231150cf55103f28f3474aa84c05d5ffbcb5e810853 SHA512 bac2dcc855401db4d3142bdb7411da87ea274b22cc9160726b19d9ecdec453015fa3226873308e2a00ece6a52f3aa20eca79818820770be166bf7121650d9005
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-6.0.0.ebuild b/dev-ruby/railties/railties-6.0.0.ebuild
new file mode 100644
index 000000000000..0917e9af46eb
--- /dev/null
+++ b/dev-ruby/railties/railties-6.0.0.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="ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.24"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/thor-0.20.3
+	>=dev-ruby/rake-0.8.7
+	dev-ruby/method_source
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha:0.14
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/dev-ruby/rbpdf/Manifest b/dev-ruby/rbpdf/Manifest
index e793413ccfcd..ad86248922f6 100644
--- a/dev-ruby/rbpdf/Manifest
+++ b/dev-ruby/rbpdf/Manifest
@@ -1,5 +1,7 @@
 DIST rbpdf-1.19.8.tar.gz 12026547 BLAKE2B 4989bee6f35d74a703539c6d209c14730e2674d94454b1794172f147dd01af20bdea5c4ed3e68a047f7ddad17083d74ea061dc5b0c28e66acdbf56ab1e335dd3 SHA512 e3015e80b26f9de2727ebd1a97ff5fd3937b7e133d9d39c2e1b3e9fe326354ca66ef569fa35bdf4c8b495b40df1ceec26d043e6f86be8ce741068a2c28ff8a28
 DIST rbpdf-1.20.0.tar.gz 12026312 BLAKE2B add83c3bc2fde2dd0b839fedabcc49b40839d17a3c6b4eb0d17f688840a7fae1bef23660bc810176b23042475bf6ba40cac6f08f4f0468ba6f1dcc6ada4520da SHA512 5324bfc115e168a9ec4972aea21539d1e41a3799bf3beaa2cf0764734eb152f6325879ebb0aee80276825842d8c4d15fdc337874b1237342adc425554e96a9d4
+DIST rbpdf-1.20.1.tar.gz 12026190 BLAKE2B 5a468e974bc0a15a9a8f621a6ee635a8cf4f81cc94b88a6bf8afd90c4a665c0892381e903158e66ec4a68676491faa80fd99b7d4ffcf0c86defc4a4114603b08 SHA512 19b4fbd8a0c4650c73ba299721a0fe03a10f223da5e0dd2b97549972ea8f381b2d5b4837369d0667cd325392edae1ec795ec67bc852c9b3588ec0c5e686844d7
 EBUILD rbpdf-1.19.8.ebuild 1280 BLAKE2B 7337beecf56b9882621706b58f8c748fcba94c0cfe9a6a4fd4b27eb448f790f63a2f31df152567a76517274804d40e1270ae8a413e810368f4ee80822b84ab76 SHA512 21c0fc4a8b1e1531653dd58b724b18bf56f453bf14fe6258de5b01223739659970cef48352f2cee03cbcc13e79e1841d1384121115f1db65f676bb50926d885c
 EBUILD rbpdf-1.20.0.ebuild 1130 BLAKE2B a3c32d5223cb99869c4acc1eca9e79eec261ace090ba5c0e682954c35e377ee3cfa2996d4e1898dcddc76071ceaaba7eb5cd455e7f1002fc1491454d6e65c5de SHA512 44e796910ece15746156f52ffaba53c2c0ef31967fd434be569589be3e54b4761a8484c1e37f228200bdae6b4731ccffbc03f558ebb743a72e07a6db97cee9cd
+EBUILD rbpdf-1.20.1.ebuild 1130 BLAKE2B a3c32d5223cb99869c4acc1eca9e79eec261ace090ba5c0e682954c35e377ee3cfa2996d4e1898dcddc76071ceaaba7eb5cd455e7f1002fc1491454d6e65c5de SHA512 44e796910ece15746156f52ffaba53c2c0ef31967fd434be569589be3e54b4761a8484c1e37f228200bdae6b4731ccffbc03f558ebb743a72e07a6db97cee9cd
 MISC metadata.xml 417 BLAKE2B b48fb397e76caa8bfa35675062a6c4026ae44fe43cd305eb51c9470d9dce6654603742954145f3bd063f6ccc6f56162ca9affa6acc6698ac81432e0dde42a070 SHA512 c33c8dded82e45f867b4e93cb3be96cabf42152bfd6aa13f9144fae15b2b4f4b8f503d4aef4af8c2448584c2e71251c958b8dacb14c26da4a6c2b9b3ff442dc4
diff --git a/dev-ruby/rbpdf/rbpdf-1.20.1.ebuild b/dev-ruby/rbpdf/rbpdf-1.20.1.ebuild
new file mode 100644
index 000000000000..0a1de1e4c101
--- /dev/null
+++ b/dev-ruby/rbpdf/rbpdf-1.20.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+# Avoid the complexity of the "rake" recipe and run the tests manually.
+RUBY_FAKEGEM_RECIPE_TEST=none
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby on Rails RBPDF plugin"
+HOMEPAGE="https://github.com/naitoh/rbpdf"
+SRC_URI="https://github.com/naitoh/rbpdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
+ruby_add_rdepend "
+	dev-ruby/htmlentities
+	=dev-ruby/rbpdf-font-1.19*"
+
+all_ruby_prepare() {
+	default
+
+	# This test is enabled automagically in the presence of rmagick, and
+	# then fails.
+	rm -f test/rbpdf_image_rmagick_test.rb \
+		|| die "failed to remove rmagick tests"
+}
+
+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/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 389475a85406..77ef54ea6e53 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,5 +1,11 @@
+AUX rdoc-5.1.0-jquery.patch 16770 BLAKE2B 144d10bcfdf6917af0ebec7ff0df90afa4f1626c1b850acc20491c545aba0e5456d3589a6c92931d343409a86ac21f04a16ef679625d5dcde8ff8d1f169f42ca SHA512 13bd0845bae1777d8c38349db3b53fdb019b63ab6e12c0682d1bff144e70e86d629eac16d96cdfbd94402d7406835b56f64cfdfbc232917cb59ae84ab86ca7f2
 DIST rdoc-5.1.0.tar.gz 702376 BLAKE2B 733d77a341ddad10f5b648b6bb492e0f79daa392e2ca371d38236e4c85a1c409699e35dd3f5bc8bc48551b399603bb0a747cb3c5f7f1fbf4765aabffaad575aa SHA512 cd2ed37e8502a3e9093c88c258ac5e39542a23c3dcaedb9b5eb48ce391a694e5b35fbcfd62f01ec6353ac9c40a4b7043b2ff11bbc403d2e03de9a84c52bcefe7
 DIST rdoc-6.1.1.tar.gz 701297 BLAKE2B cd1494303d5bf4f81804e40a43252a589a6fa141316a573c1e321bf2dbd71330fabd547e09f5c84937cc45b3f79e2936d90813c29fc11b4a514a9cb498b9c98d SHA512 01e32d6e7ffcb5c0e138068867e6d995210d0123cb87c2754994be1a5e0aede0e05114746e6bd788fd0b4299e9a005dcfc863ef07000f1f9fcbf6ed11e44947b
+DIST rdoc-6.1.2.tar.gz 667607 BLAKE2B 4857bcf5f72d93fe4e9ea89acfda9ae82afd61a7ff501d2eea529330d2b8a63d7cc775490648fcff5000ee60417123244518f56a31593af8efccae8f925b21d9 SHA512 a54e36adf9f98117f0b5ae4490a0ab1ce12d9b1de5b7c61ffa326b36ef13885bb8f18147f3548f95a285b15470faba14965bc87088fa3ce584928d8ee396689f
+DIST rdoc-6.2.0.tar.gz 668152 BLAKE2B 9c92b27c427d6229778aba54ce7f12fe883fd3e40151f518f3d023d4f6dd10d4f1f6d05c8d6bcdce80d1ac81ab25cd99ccbe9479a4fcd950b895e14d4fdc4b83 SHA512 15352889833436c0a243e4f79c4ae8113fa3b8c222950baf1fcd272773a7a17198c2cd91a50c92e225c282a37ec743a38d8e9ca4dffe0b66c39d56412fe56ca2
+EBUILD rdoc-5.1.0-r1.ebuild 2754 BLAKE2B 52eb9c120c3b1b60edd7c6949c39a7cc3e9d3f75e029a76bc234b58da3f9ece6fd0f5ab5742f125b430cd21ec7eb1abbdd0fa9ef8f06c95d8d3eb390a3953141 SHA512 8bfbd2d7db12445c1129c66301b37257d065e9d07fcc80bc1947367164a4b74cb32eb92a15ddeda60c324c8c12a9aff733d3466401e0a8189f7eb0f21a9b3fbc
 EBUILD rdoc-5.1.0.ebuild 2586 BLAKE2B 6e028069a3beace2f42f292c6fb5bf68cd7fbe1f71842897afae9cf5f971f7b15c10f8c4e6b0fe04aa825c879994edc5a815914ce2b8f196566dc1bdcf6e4709 SHA512 8a50a8f97be6775a3e3f304e7115d567c7f0829eb9fe5e47017286480a7fead26aef314d4173ff42f5380d17bfe21d313e89bedc884815d7774ec373c902cd13
-EBUILD rdoc-6.1.1.ebuild 2678 BLAKE2B 813dfa8576ec96a23341c9f1df5eb79dd232d783194e2a0a949fb17aa4b4a164ebb5827103f38b57a2db45fb3ccc8936ca9db5542b769157d6dad12c6c1dc3b1 SHA512 45645352aa4c5645688d4322fba605ed849686748e37ef0f39b56831a28b341954987d251d3f1d3b96adc7c45ae5d614d22f6cbac6e6fffe2ada25d88f1eaf32
+EBUILD rdoc-6.1.1.ebuild 2676 BLAKE2B d8557dd8dabccfa258ef10d7d4d448a3a2d41be45273abfb95cdb110835901cd658cd2c6e8f1359fbf65ec5a6a0209786c1623c915368a856c821152b9ac9eba SHA512 56925129ff307f3d777ed074b1a619a3cc70499cc28b78a7a95c1cfe4fc92e56dcc7c5844270fafc72f6bc2e20066181cd4e5d09098830a2a33f7ee9a4228c1c
+EBUILD rdoc-6.1.2.ebuild 2684 BLAKE2B e6622814059382dc34ee2b7fc1800cb397083aca39e0f89b62ab8348f7a45eb452f57c7b8d6bdad753c55ce4feb7896a24a0733ba3438054567010f0a21a81bc SHA512 92aaf5d1b59c642474794f61ce44b2ccabfab188d098aeb0e6db1dd809bc8321a5248432b9b3ab9fbfa3268d5c5d8af81b0c719cb171d27ca4395f50912867d2
+EBUILD rdoc-6.2.0.ebuild 2707 BLAKE2B 3b8b14b2450dc35f3b9f7aa405e2a20d6a9dcdcbfaab10cc20e87190e4baecb1cc167ec8e236fe58923caec551bb4abca68a145bd65e34cf59c6c191b7806d00 SHA512 b87adee48ec8170189cb69410d189f615e8d7fefda546fdab0fcea59082b4b907ca06a9eb0de01c7b9d199c9c4b3474bbbd2e717f408108738999ce8499c59af
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/files/rdoc-5.1.0-jquery.patch b/dev-ruby/rdoc/files/rdoc-5.1.0-jquery.patch
new file mode 100644
index 000000000000..46166e90e5c1
--- /dev/null
+++ b/dev-ruby/rdoc/files/rdoc-5.1.0-jquery.patch
@@ -0,0 +1,492 @@
+From 03c737f3579de998fb8f5142f2c44c96428528dd Mon Sep 17 00:00:00 2001
+From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+Date: Tue, 27 Aug 2019 12:55:42 +0000
+Subject: [PATCH] Update rdoc version from 5.0.0 to 5.0.1.
+
+git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@67781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
+---
+ lib/rdoc.rb                                   |   2 +-
+ .../generator/template/darkfish/_head.rhtml   |   7 +-
+ .../generator/template/darkfish/css/rdoc.css  |  23 +++-
+ .../template/darkfish/js/darkfish.js          | 122 ++++--------------
+ .../generator/template/darkfish/js/search.js  |  63 ++++-----
+ .../template/json_index/js/navigation.js      |  44 +------
+ .../template/json_index/js/searcher.js        |  12 +-
+ version.h                                     |  10 +-
+ 8 files changed, 98 insertions(+), 185 deletions(-)
+
+diff --git a/lib/rdoc/generator/template/darkfish/_head.rhtml b/lib/rdoc/generator/template/darkfish/_head.rhtml
+index f308526823e2..8304310d4b34 100644
+--- a/lib/rdoc/generator/template/darkfish/_head.rhtml
++++ b/lib/rdoc/generator/template/darkfish/_head.rhtml
+@@ -7,8 +7,11 @@
+   var index_rel_prefix = "<%= rel_prefix %>/";
+ </script>
+ 
+-<script src="<%= asset_rel_prefix %>/js/jquery.js"></script>
+-<script src="<%= asset_rel_prefix %>/js/darkfish.js"></script>
++<script src="<%= asset_rel_prefix %>/js/navigation.js" defer></script>
++<script src="<%= asset_rel_prefix %>/js/search.js" defer></script>
++<script src="<%= asset_rel_prefix %>/js/search_index.js" defer></script>
++<script src="<%= asset_rel_prefix %>/js/searcher.js" defer></script>
++<script src="<%= asset_rel_prefix %>/js/darkfish.js" defer></script>
+ 
+ <link href="<%= asset_rel_prefix %>/css/fonts.css" rel="stylesheet">
+ <link href="<%= asset_rel_prefix %>/css/rdoc.css" rel="stylesheet">
+diff --git a/lib/rdoc/generator/template/darkfish/css/rdoc.css b/lib/rdoc/generator/template/darkfish/css/rdoc.css
+index 2f4dca7e0844..1bdb6e6223c1 100644
+--- a/lib/rdoc/generator/template/darkfish/css/rdoc.css
++++ b/lib/rdoc/generator/template/darkfish/css/rdoc.css
+@@ -9,6 +9,8 @@
+ /* vim: ft=css et sw=2 ts=2 sts=2 */
+ /* Base Green is: #6C8C22 */
+ 
++.hide { display: none !important; }
++
+ * { padding: 0; margin: 0; }
+ 
+ body {
+@@ -48,6 +50,16 @@ h6:hover span {
+   display: inline;
+ }
+ 
++h1:target,
++h2:target,
++h3:target,
++h4:target,
++h5:target,
++h6:target {
++  margin-left: -10px;
++  border-left: 10px solid #f1edba;
++}
++
+ :link,
+ :visited {
+   color: #6C8C22;
+@@ -441,7 +453,16 @@ main header h3 {
+ /* @group Method Details */
+ 
+ main .method-source-code {
+-  display: none;
++  max-height: 0;
++  overflow: hidden;
++  transition-duration: 200ms;
++  transition-delay: 0ms;
++  transition-property: all;
++  transition-timing-function: ease-in-out;
++}
++
++main .method-source-code.active-menu {
++  max-height: 100vh;
+ }
+ 
+ main .method-description .method-calls-super {
+diff --git a/lib/rdoc/generator/template/darkfish/js/darkfish.js b/lib/rdoc/generator/template/darkfish/js/darkfish.js
+index 38f877ed4028..089813fcdef4 100644
+--- a/lib/rdoc/generator/template/darkfish/js/darkfish.js
++++ b/lib/rdoc/generator/template/darkfish/js/darkfish.js
+@@ -8,6 +8,7 @@
+  */
+ 
+ /* Provide console simulation for firebug-less environments */
++/*
+ if (!("console" in window) || !("firebug" in console)) {
+   var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
+     "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
+@@ -16,41 +17,35 @@ if (!("console" in window) || !("firebug" in console)) {
+   for (var i = 0; i < names.length; ++i)
+     window.console[names[i]] = function() {};
+ };
+-
+-
+-/**
+- * Unwrap the first element that matches the given @expr@ from the targets and return them.
+- */
+-$.fn.unwrap = function( expr ) {
+-  return this.each( function() {
+-    $(this).parents( expr ).eq( 0 ).after( this ).remove();
+-  });
+-};
++*/
+ 
+ 
+ function showSource( e ) {
+   var target = e.target;
+-  var codeSections = $(target).
+-    parents('.method-detail').
+-    find('.method-source-code');
+-
+-  $(target).
+-    parents('.method-detail').
+-    find('.method-source-code').
+-    slideToggle();
++  while (!target.classList.contains('method-detail')) {
++    target = target.parentNode;
++  }
++  if (typeof target !== "undefined" && target !== null) {
++    target = target.querySelector('.method-source-code');
++  }
++  if (typeof target !== "undefined" && target !== null) {
++    target.classList.toggle('active-menu')
++  }
+ };
+ 
+ function hookSourceViews() {
+-  $('.method-heading').click( showSource );
++  document.querySelectorAll('.method-heading').forEach(function (codeObject) {
++    codeObject.addEventListener('click', showSource);
++  });
+ };
+ 
+ function hookSearch() {
+-  var input  = $('#search-field').eq(0);
+-  var result = $('#search-results').eq(0);
+-  $(result).show();
++  var input  = document.querySelector('#search-field');
++  var result = document.querySelector('#search-results');
++  result.classList.remove("initially-hidden");
+ 
+-  var search_section = $('#search-section').get(0);
+-  $(search_section).show();
++  var search_section = document.querySelector('#search-section');
++  search_section.classList.remove("initially-hidden");
+ 
+   var search = new Search(search_data, input, result);
+ 
+@@ -77,85 +72,14 @@ function hookSearch() {
+   }
+ 
+   search.select = function(result) {
+-    var result_element = result.get(0);
+-    window.location.href = result_element.firstChild.firstChild.href;
++      console.log(result);
++    window.location.href = result.firstChild.firstChild.href;
+   }
+ 
+   search.scrollIntoView = search.scrollInWindow;
+ };
+ 
+-function highlightTarget( anchor ) {
+-  console.debug( "Highlighting target '%s'.", anchor );
+-
+-  $("a[name]").each( function() {
+-    if ( $(this).attr("name") == anchor ) {
+-      if ( !$(this).parent().parent().hasClass('target-section') ) {
+-        console.debug( "Wrapping the target-section" );
+-        $('div.method-detail').unwrap( 'div.target-section' );
+-        $(this).parent().wrap( '<div class="target-section"></div>' );
+-      } else {
+-        console.debug( "Already wrapped." );
+-      }
+-    }
+-  });
+-};
+-
+-function highlightLocationTarget() {
+-  console.debug( "Location hash: %s", window.location.hash );
+-  if ( ! window.location.hash || window.location.hash.length == 0 ) return;
+-
+-  var anchor = window.location.hash.substring(1);
+-  console.debug( "Found anchor: %s; matching %s", anchor, "a[name=" + anchor + "]" );
+-
+-  highlightTarget( anchor );
+-};
+-
+-function highlightClickTarget( event ) {
+-  console.debug( "Highlighting click target for event %o", event.target );
+-  try {
+-    var anchor = $(event.target).attr( 'href' ).substring(1);
+-    console.debug( "Found target anchor: %s", anchor );
+-    highlightTarget( anchor );
+-  } catch ( err ) {
+-    console.error( "Exception while highlighting: %o", err );
+-  };
+-};
+-
+-function loadAsync(path, success, prefix) {
+-  $.ajax({
+-    url: prefix + path,
+-    dataType: 'script',
+-    success: success,
+-    cache: true
+-  });
+-};
+-
+-$(document).ready( function() {
++document.addEventListener('DOMContentLoaded', function() {
+   hookSourceViews();
+-  highlightLocationTarget();
+-  $('ul.link-list a').bind( "click", highlightClickTarget );
+-
+-  var search_scripts_loaded = {
+-    navigation_loaded:   false,
+-    search_loaded:       false,
+-    search_index_loaded: false,
+-    searcher_loaded:     false,
+-  }
+-
+-  var search_success_function = function(variable) {
+-    return (function (data, status, xhr) {
+-      search_scripts_loaded[variable] = true;
+-
+-      if (search_scripts_loaded['navigation_loaded']   == true &&
+-          search_scripts_loaded['search_loaded']       == true &&
+-          search_scripts_loaded['search_index_loaded'] == true &&
+-          search_scripts_loaded['searcher_loaded']     == true)
+-        hookSearch();
+-    });
+-  }
+-
+-  loadAsync('js/navigation.js',   search_success_function('navigation_loaded'), rdoc_rel_prefix);
+-  loadAsync('js/search.js',       search_success_function('search_loaded'), rdoc_rel_prefix);
+-  loadAsync('js/search_index.js', search_success_function('search_index_loaded'), index_rel_prefix);
+-  loadAsync('js/searcher.js',     search_success_function('searcher_loaded'), rdoc_rel_prefix);
++  hookSearch();
+ });
+diff --git a/lib/rdoc/generator/template/darkfish/js/search.js b/lib/rdoc/generator/template/darkfish/js/search.js
+index 60ac295e6cec..b558ca5b4f68 100644
+--- a/lib/rdoc/generator/template/darkfish/js/search.js
++++ b/lib/rdoc/generator/template/darkfish/js/search.js
+@@ -1,29 +1,29 @@
+ Search = function(data, input, result) {
+   this.data = data;
+-  this.$input = $(input);
+-  this.$result = $(result);
++  this.input = input;
++  this.result = result;
+ 
+-  this.$current = null;
+-  this.$view = this.$result.parent();
++  this.current = null;
++  this.view = this.result.parentNode;
+   this.searcher = new Searcher(data.index);
+   this.init();
+ }
+ 
+-Search.prototype = $.extend({}, Navigation, new function() {
++Search.prototype = Object.assign({}, Navigation, new function() {
+   var suid = 1;
+ 
+   this.init = function() {
+     var _this = this;
+     var observer = function(e) {
+-      switch(e.originalEvent.keyCode) {
++      switch(e.keyCode) {
+         case 38: // Event.KEY_UP
+         case 40: // Event.KEY_DOWN
+           return;
+       }
+-      _this.search(_this.$input[0].value);
++      _this.search(_this.input.value);
+     };
+-    this.$input.keyup(observer);
+-    this.$input.click(observer); // mac's clear field
++    this.input.addEventListener('keyup', observer);
++    this.input.addEventListener('click', observer); // mac's clear field
+ 
+     this.searcher.ready(function(results, isLast) {
+       _this.addResults(results, isLast);
+@@ -34,7 +34,7 @@ Search.prototype = $.extend({}, Navigation, new function() {
+   }
+ 
+   this.search = function(value, selectFirstMatch) {
+-    value = jQuery.trim(value).toLowerCase();
++    value = value.trim().toLowerCase();
+     if (value) {
+       this.setNavigationActive(true);
+     } else {
+@@ -43,23 +43,23 @@ Search.prototype = $.extend({}, Navigation, new function() {
+ 
+     if (value == '') {
+       this.lastQuery = value;
+-      this.$result.empty();
+-      this.$result.attr('aria-expanded', 'false');
++      this.result.innerHTML = '';
++      this.result.setAttribute('aria-expanded', 'false');
+       this.setNavigationActive(false);
+     } else if (value != this.lastQuery) {
+       this.lastQuery = value;
+-      this.$result.attr('aria-busy',     'true');
+-      this.$result.attr('aria-expanded', 'true');
++      this.result.setAttribute('aria-busy',     'true');
++      this.result.setAttribute('aria-expanded', 'true');
+       this.firstRun = true;
+       this.searcher.find(value);
+     }
+   }
+ 
+   this.addResults = function(results, isLast) {
+-    var target = this.$result.get(0);
++    var target = this.result;
+     if (this.firstRun && (results.length > 0 || isLast)) {
+-      this.$current = null;
+-      this.$result.empty();
++      this.current = null;
++      this.result.innerHTML = '';
+     }
+ 
+     for (var i=0, l = results.length; i < l; i++) {
+@@ -70,25 +70,26 @@ Search.prototype = $.extend({}, Navigation, new function() {
+ 
+     if (this.firstRun && results.length > 0) {
+       this.firstRun = false;
+-      this.$current = $(target.firstChild);
+-      this.$current.addClass('search-selected');
++      this.current = target.firstChild;
++      this.current.classList.add('search-selected');
+     }
+-    if (jQuery.browser.msie) this.$element[0].className += '';
++    //TODO: ECMAScript
++    //if (jQuery.browser.msie) this.$element[0].className += '';
+ 
+-    if (isLast) this.$result.attr('aria-busy', 'false');
++    if (isLast) this.result.setAttribute('aria-busy', 'false');
+   }
+ 
+   this.move = function(isDown) {
+-    if (!this.$current) return;
+-    var $next = this.$current[isDown ? 'next' : 'prev']();
+-    if ($next.length) {
+-      this.$current.removeClass('search-selected');
+-      $next.addClass('search-selected');
+-      this.$input.attr('aria-activedescendant', $next.attr('id'));
+-      this.scrollIntoView($next[0], this.$view[0]);
+-      this.$current = $next;
+-      this.$input.val($next[0].firstChild.firstChild.text);
+-      this.$input.select();
++    if (!this.current) return;
++    var next = isDown ? this.current.nextElementSibling : this.current.previousElementSibling;
++    if (next) {
++      this.current.classList.remove('search-selected');
++      next.classList.add('search-selected');
++      this.input.setAttribute('aria-activedescendant', next.getAttribute('id'));
++      this.scrollIntoView(next, this.view);
++      this.current = next;
++      this.input.value = next.firstChild.firstChild.text;
++      this.input.select();
+     }
+     return true;
+   }
+diff --git a/lib/rdoc/generator/template/json_index/js/navigation.js b/lib/rdoc/generator/template/json_index/js/navigation.js
+index e41268123ea9..4866fff81922 100644
+--- a/lib/rdoc/generator/template/json_index/js/navigation.js
++++ b/lib/rdoc/generator/template/json_index/js/navigation.js
+@@ -10,10 +10,8 @@ Navigation = new function() {
+   this.initNavigation = function() {
+     var _this = this;
+ 
+-    $(document).keydown(function(e) {
++    document.addEventListener('keydown', function(e) {
+       _this.onkeydown(e);
+-    }).keyup(function(e) {
+-      _this.onkeyup(e);
+     });
+ 
+     this.navigationActive = true;
+@@ -21,20 +19,6 @@ Navigation = new function() {
+ 
+   this.setNavigationActive = function(state) {
+     this.navigationActive = state;
+-    this.clearMoveTimeout();
+-  }
+-
+-  this.onkeyup = function(e) {
+-    if (!this.navigationActive) return;
+-
+-    switch(e.keyCode) {
+-      case 37: //Event.KEY_LEFT:
+-      case 38: //Event.KEY_UP:
+-      case 39: //Event.KEY_RIGHT:
+-      case 40: //Event.KEY_DOWN:
+-        this.clearMoveTimeout();
+-        break;
+-    }
+   }
+ 
+   this.onkeydown = function(e) {
+@@ -46,7 +30,6 @@ Navigation = new function() {
+       case 38: //Event.KEY_UP:
+         if (e.keyCode == 38 || e.ctrlKey) {
+           if (this.moveUp()) e.preventDefault();
+-          this.startMoveTimeout(false);
+         }
+         break;
+       case 39: //Event.KEY_RIGHT:
+@@ -55,34 +38,15 @@ Navigation = new function() {
+       case 40: //Event.KEY_DOWN:
+         if (e.keyCode == 40 || e.ctrlKey) {
+           if (this.moveDown()) e.preventDefault();
+-          this.startMoveTimeout(true);
+         }
+         break;
+       case 13: //Event.KEY_RETURN:
+-        if (this.$current)
++        if (this.current)
+           e.preventDefault();
+-          this.select(this.$current);
++          this.select(this.current);
+         break;
+     }
+-    if (e.ctrlKey && e.shiftKey) this.select(this.$current);
+-  }
+-
+-  this.clearMoveTimeout = function() {
+-    clearTimeout(this.moveTimeout);
+-    this.moveTimeout = null;
+-  }
+-
+-  this.startMoveTimeout = function(isDown) {
+-    if (!$.browser.mozilla && !$.browser.opera) return;
+-    if (this.moveTimeout) this.clearMoveTimeout();
+-    var _this = this;
+-
+-    var go = function() {
+-      if (!_this.moveTimeout) return;
+-      _this[isDown ? 'moveDown' : 'moveUp']();
+-      _this.moveTimout = setTimeout(go, 100);
+-    }
+-    this.moveTimeout = setTimeout(go, 200);
++    if (e.ctrlKey && e.shiftKey) this.select(this.current);
+   }
+ 
+   this.moveRight = function() {
+diff --git a/lib/rdoc/generator/template/json_index/js/searcher.js b/lib/rdoc/generator/template/json_index/js/searcher.js
+index b3b1c58a0f38..e200a168b0f7 100644
+--- a/lib/rdoc/generator/template/json_index/js/searcher.js
++++ b/lib/rdoc/generator/template/json_index/js/searcher.js
+@@ -51,20 +51,20 @@ Searcher.prototype = new function() {
+ 
+   /*  ----- Utilities ------  */
+   function splitQuery(query) {
+-    return jQuery.grep(query.split(/(\s+|::?|\(\)?)/), function(string) {
++    return query.split(/(\s+|::?|\(\)?)/).filter(function(string) {
+       return string.match(/\S/);
+     });
+   }
+ 
+   function buildRegexps(queries) {
+-    return jQuery.map(queries, function(query) {
++    return queries.map(function(query) {
+       return new RegExp(query.replace(/(.)/g, '([$1])([^$1]*?)'), 'i');
+     });
+   }
+ 
+   function buildHilighters(queries) {
+-    return jQuery.map(queries, function(query) {
+-      return jQuery.map(query.split(''), function(l, i) {
++    return queries.map(function(query) {
++      return query.split('').map(function(l, i) {
+         return '\u0001$' + (i*2+1) + '\u0002$' + (i*2+2);
+       }).join('');
+     });
+@@ -221,9 +221,9 @@ Searcher.prototype = new function() {
+   }
+ 
+   function triggerResults(results, isLast) {
+-    jQuery.each(this.handlers, function(i, fn) {
++    this.handlers.forEach(function(fn) {
+       fn.call(this, results, isLast)
+-    })
++    });
+   }
+ }
diff --git a/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild b/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild
new file mode 100644
index 000000000000..0f9a3297d061
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/rdoc/rdoc/"
+SRC_URI="https://github.com/rdoc/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Ruby MIT"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND+=">=app-eselect/eselect-ruby-20161226"
+
+RUBY_PATCHES=( "${FILESDIR}/${P}-jquery.patch" )
+
+ruby_add_bdepend "
+	dev-ruby/kpeg
+	dev-ruby/racc
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.8:5
+	)"
+
+ruby_add_rdepend "dev-ruby/json:2"
+
+all_ruby_prepare() {
+	# Other packages also have use for a nonexistent directory, bug 321059
+	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
+
+	# Avoid unneeded dependency on bundler, bug 603696
+	sed -i -e '/bundler/ s:^:#:' \
+		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' Rakefile || die
+
+	# Remove test that is depending on the locale, which we can't garantuee.
+	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
+
+	# Remove tests for code that is not included and not listed in Manifest.txt
+	rm -f test/test_rdoc_i18n_{locale,text}.rb \
+	   test/test_rdoc_generator_pot* || die
+
+	# Removal is not included in the upstream patch
+	rm -f  lib/rdoc/generator/template/darkfish/js/jquery.js || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -Ilib -S exe/rdoc || die
+	fi
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'gem "json", "~>2.0"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in $(ruby_get_use_implementations); do
+			version=`echo ${version} | cut -c 5-`
+			if use ruby_targets_ruby${version}; then
+				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
+				sed -i -e "1s/env ruby/ruby${version}/" \
+					"${ED}/usr/bin/${bin}${version}" || die
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/rdoc) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+}
diff --git a/dev-ruby/rdoc/rdoc-6.1.1.ebuild b/dev-ruby/rdoc/rdoc-6.1.1.ebuild
index 9a4423aef0a8..199b9c46cd97 100644
--- a/dev-ruby/rdoc/rdoc-6.1.1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.1.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
 SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby MIT"
-KEYWORDS="~alpha amd64 ~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"
 IUSE=""
 
diff --git a/dev-ruby/rdoc/rdoc-6.1.2.ebuild b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
new file mode 100644
index 000000000000..0579834a3511
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/ruby/rdoc/"
+SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Ruby MIT"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND+=">=app-eselect/eselect-ruby-20181225"
+
+ruby_add_bdepend "
+	>=dev-ruby/kpeg-1.1.0-r1
+	>dev-ruby/racc-1.4.10
+	dev-ruby/rake
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.8:5
+	)"
+
+all_ruby_prepare() {
+	# Other packages also have use for a nonexistent directory, bug 321059
+	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
+
+	# Avoid unneeded dependency on bundler, bug 603696
+	sed -i -e '/bundler/ s:^:#:' \
+		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
+		-e '/rubocop\/rake/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+
+	# Remove test that is depending on the locale, which we can't garantuee.
+	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
+
+	# Remove tests for code that is not included and not listed in Manifest.txt
+	rm -f test/test_rdoc_i18n_{locale,text}.rb \
+	   test/test_rdoc_generator_pot* || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -Ilib -S exe/rdoc || die
+	fi
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in $(ruby_get_use_implementations); do
+			version=`echo ${version} | cut -c 5-`
+			if use ruby_targets_ruby${version}; then
+				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
+				sed -i -e "1s/env ruby/ruby${version}/" \
+					"${ED}/usr/bin/${bin}${version}" || die
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+}
diff --git a/dev-ruby/rdoc/rdoc-6.2.0.ebuild b/dev-ruby/rdoc/rdoc-6.2.0.ebuild
new file mode 100644
index 000000000000..a3decb6aa3f9
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-6.2.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/ruby/rdoc/"
+SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Ruby MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND+=">=app-eselect/eselect-ruby-20181225"
+
+ruby_add_bdepend "
+	>=dev-ruby/kpeg-1.1.0-r1
+	>dev-ruby/racc-1.4.10
+	dev-ruby/rake
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.8:5
+	)"
+
+all_ruby_prepare() {
+	# Other packages also have use for a nonexistent directory, bug 321059
+	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
+
+	# Avoid unneeded dependency on bundler, bug 603696
+	sed -i -e '/bundler/ s:^:#:' \
+		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
+		-e '/rubocop\/rake/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+
+	# Remove test that is depending on the locale, which we can't garantuee.
+	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	# Remove tests for code that is not included and not listed in Manifest.txt
+	rm -f test/test_rdoc_i18n_{locale,text}.rb \
+	   test/rdoc/test_rdoc_generator_pot* || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -Ilib -S exe/rdoc || die
+	fi
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in $(ruby_get_use_implementations); do
+			version=`echo ${version} | cut -c 5-`
+			if use ruby_targets_ruby${version}; then
+				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
+				sed -i -e "1s/env ruby/ruby${version}/" \
+					"${ED}/usr/bin/${bin}${version}" || die
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+}
diff --git a/dev-ruby/rexical/Manifest b/dev-ruby/rexical/Manifest
index 667ddb669e60..b9c625134a7a 100644
--- a/dev-ruby/rexical/Manifest
+++ b/dev-ruby/rexical/Manifest
@@ -1,5 +1,5 @@
 DIST rexical-1.0.5.gem 20480 BLAKE2B 6ed81f9247410aa68cec1ad02a49774da839679fa3f535691f79da42144fbcda4b0f0dac74c7c02bb08d262b66bd543a8bde05ac5871454b96a7582c228e5fff SHA512 6cf5eac36953203a2de66eccbbc8679a4d695c3f0540ab8adf7a3db37eb4e94889c64c3ce4e4e88ea52738a6733680be2105e0604d01a2e07bae10939deb03c1
 DIST rexical-1.0.7.gem 22016 BLAKE2B aaadf4131fbc4958a6a17be02b970070e511dcb031fd6432fb62fb841eff36b4d5c41d8f8f295aed4ac376c49e736e5d795166f71957578c6cbe14fd6cea26be SHA512 f71c86bd9764e65ebe0c66acd5446b5da7a1b38aae9d33367d70bfa253eb53c178634ce90c883c5459622219670d4d32f375b216c3023a3109329d6930dec1fc
 EBUILD rexical-1.0.5-r3.ebuild 1068 BLAKE2B add15c13dc5362ea53856c9c286406d9bd19da53b489de72625c975192d4ced671e2b5d5cee28580b918a20971c22d4497bc18c6b808df29f1d2725944b244c3 SHA512 8f60b1b2780bd24429b1a7fd2862c483a644f3ce7e15d44849d14b2b94226e9c4fa6a21a9f590fe171182e93ebb7418073ff8296964eaf6216e8593621b239fc
-EBUILD rexical-1.0.7.ebuild 885 BLAKE2B 5879d27ea377f3423a43ae5dd2cb00ddb84980ba9a499de3d7b6c12ff92c1152b2eb908bf9af28a16d86ca4a84bca25219231d51986bf85951258b8d4acb0c85 SHA512 134000c92a7b6ecd8d76536b1b7115de1c1049105b041bcc352b096512df37953ab0a8c928baffae047b2a030456f9087e66c5c6b41caea69679e0b3f2afad8d
+EBUILD rexical-1.0.7.ebuild 889 BLAKE2B 8d41c686451e05af5191ce2e3c92d777bf7c7f440da765307291e78b8df69454f21cf0faa02c2d9b88eef467cebde1654c83f66c9b2ff77be5066341dc07b0e6 SHA512 4d2153c85bfd4d450ed7afc293c9ea40036d221133f4bb1385ebb5fc5f4013f98ea2539de63e99027bf118ddb5efc2b7f812f02bc0b33b2bf879013a3b666fde
 MISC metadata.xml 344 BLAKE2B 308f72345dd9f7ce808e53f6b3883102b7c5b51d41ff822d28888d684abb4efdce86e24fbbb2d6ba46342c85e23189fa619343c467689a13b62382a5ea024d2b SHA512 96c6b9e4f3ca4aad95e01087158bbcd9a159569d7ccfc90365732e4ee6b9772506521c7e4706043897ffceccc98236077abf570efac9f0ddb24ef56efa65176a
diff --git a/dev-ruby/rexical/rexical-1.0.7.ebuild b/dev-ruby/rexical/rexical-1.0.7.ebuild
index afa4a0506bd1..2e83f6f81ffa 100644
--- a/dev-ruby/rexical/rexical-1.0.7.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.7.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Rexical is a lexical scanner generator"
 HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
 LICENSE="LGPL-2" # plus exception
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 1b249261f326..bfbca6936cbd 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,11 +1,7 @@
-DIST rmagick-2.16.0.gem 1545728 BLAKE2B 2f5396b5d5c6a60fabf7f67d104e68443c038a8e9431fbc8252a3ca915b4fb353d6a0740f00fbaac91cf3bbaff84c0dfb45d4adca6a81622fc1d2e395ed04cac SHA512 e37fdd9c1e45d7ef7000602f495c3951ee2abcae83a87f68702a51a2183edb6fd8e576ca1a5ac8b64e05ae0287141137b505bf27fddc579e753f9310cb4d653c
-DIST rmagick-3.0.0.gem 1551360 BLAKE2B 3234231762bcdda60533f0b7479def61f592a7c06570ef6865b9eb488ac44d58edd6b6ebc914c88c51632dbba55ea79887a6ad816be4ac32b470c34003f3a2ce SHA512 7d8c2ae731e9565f168cb13adb8b454acb51d42b237f6bfb721735f9198d2546fbf0117d3296ac57bcd59b0a03eff611b7508d6684e533f203fdd7a6816adee4
 DIST rmagick-3.1.0.gem 1552896 BLAKE2B 192a09d080b328f5a2f942bf02f96a618f7f8fdf2dac899b66ece65f69b421aeb96edcbd660ef1e699db543c44b997a4330540086facc19c3fb96a1c285f644a SHA512 4fa02bf3fd3e3f423e638b700412c32cd30ac306c4126bdeaa6d192994f9f467837cf96cb98937cfba4a9180d6da2d94d4ee798dfc57378cc1861e8e27208057
 DIST rmagick-3.2.0.gem 1950208 BLAKE2B 5d4255fec8fcfb8ec2f6f361fd54a3371935dbae323918b2fe1aea47645f160024a8dd16582acf5c930639a50f702b2062e475d231c3bb0acc0bd83ac9ea00ed SHA512 f6f15b013699da5c61e83ecf4ca16d64e7e2f447dc721c7db55cad6b880f9805eb8bdcbf70aef3e30a82f38bbab8ca093d8c6d2ce761cde4f47209e3f99a9f16
 DIST rmagick-4.0.0.gem 1946624 BLAKE2B f1cec7bf1dffa94ca2803dfd64eb4a7b1cb269c935482ed42df3a8d9e3f9599b24e6d07f7268e5c641734c8e8a8984f2f0cf2a80ced0f29ee36d154a4eb1a341 SHA512 2b9e72a3f8560b8530397406d086c0d3ffa6c6ec0b8d3ec0eb9d05528f108da6023462948738bd1f420f130250fa4bf8757a9c94335b223ad1ea3e279797b0ae
-EBUILD rmagick-2.16.0.ebuild 2032 BLAKE2B f547b27b383083e6d8b5f8bbd5da93ed7fdb21a05347f95292372c5d596343d5e0c0e88a24419b1af3a383a9acad02d180813afd350fd0b3637afdb7e1f858ba SHA512 0858d2da02ea947cca05a6090b33b02e600f0bd2444c80df6ea3d210743f0b6bf7335560f2ebe046eaa520681206989c72f9903a453842ebd8373ceb78c8830b
-EBUILD rmagick-3.0.0.ebuild 2094 BLAKE2B 4fe0886e7f87360405fca1e1cd95ed20cc61a60ef6f8bb2bd3fd7dbb610c6d581af6be625b669b0798086ed1889051fd7b7e0b8df6e68f8ad2de40a2504b0859 SHA512 6b9e564ea3ac21a2b6758e5c8cdd877153ba92b87b963755f473ec1af33ba75cf92a1690971735d177d57f9f756c6e01cae7dcadeacb5543c449e2ba162a9dbf
-EBUILD rmagick-3.1.0.ebuild 1558 BLAKE2B a934fdd2a0576802cbaf528ee54222d92ee30c05fc6e8a552d9f867932ee84916e3069db9af0fc268bb8b01b81a227f2684f28c3c0779669811d10cb40a85dd0 SHA512 a9c6dbd17c5671e1fb511806565d4f0504e34ddf3029c98e29d634a8c6a471c5322e559eca2fac2de81fca64d45af52397dbf380014e257f02514f5507e58cad
+EBUILD rmagick-3.1.0.ebuild 1556 BLAKE2B 7ccb8f7c5f1cbb569eab9840b138293d1b97e83a86d5f3b352e4166e074ac2787e1e952aa1323d94ad6f8c38bff28e6499503fe2bacb643c13aca43d1a0bf580 SHA512 8f0b01f3165d84c1062e186f74791989e192a47bcc8c5e762a7f6daa7df863daba24a0525f7b1f41e43c30a34a349bcb50830863a6c9fa21c77320aef5dc3e82
 EBUILD rmagick-3.2.0.ebuild 1571 BLAKE2B 21d03defba1bf89de680f40ee8021ed314602fc858126ea95e57a8dd5b301cb15be48d0f7fe5a4d90fdeed2fb4976b83c6f055fc6848b0f06fd8a53631723573 SHA512 2dd5a7356b139cc1af19ad9468cf0826924af7ceda50be80d7489a5eb264210a9ffdc1118782956e01ad055ea6f597ae21055024bc6d55cf2bbfd3573f541449
 EBUILD rmagick-4.0.0.ebuild 1571 BLAKE2B 1ea72c8b636c67e248434986bd052386e66cea115d8a5bddf44ff22d542a371f72d3a9d8374e70c22da840bc22ce0e87b92f462ab34dda713df2ec2048226e92 SHA512 7f41467a28f7de463d1376f842badc3328d962b3aa8d7347b746c0f54bb8ec89fe74afc9b85b611c8a45ce90a66879966f934f22211419df7f0da01877b349d5
 MISC metadata.xml 341 BLAKE2B 537583fa385971de2e8ae510c7d32f11bf7644b3aac908b482833d26a2d92060255c2f15afd229c6c50207e969cbd5857705850440949788a6fac7329f26c757 SHA512 84bb956a38056526fd173c3f4aa972ea121712c15111a35e19e1f27b0cc797ebda4550ada88a46de7e66e058a66bb92d2e715d646068779843133a66d7523683
diff --git a/dev-ruby/rmagick/rmagick-2.16.0.ebuild b/dev-ruby/rmagick/rmagick-2.16.0.ebuild
deleted file mode 100644
index 6f0b1054a1af..000000000000
--- a/dev-ruby/rmagick/rmagick-2.16.0.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
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.textile"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="https://github.com/gemhome/rmagick"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-macos"
-IUSE="doc"
-
-RDEPEND+=" >=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6*"
-DEPEND+=" >=media-gfx/imagemagick-6.4.9:=[jpeg] =media-gfx/imagemagick-6*"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	# Avoid unused dependency on rake-compiler. This also avoids an
-	# extra compile during tests.
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' \
-		-e '/compile/ s:^:#:' Rakefile || die
-
-	# Avoid simplecov dependency
-	sed -i -e '/simplecov/ s:^:#:' Rakefile test/test_all_basic.rb || die
-
-	# Squelch harmless warning about imagemagick installation.
-	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-
-	# Avoid some tests that seem to be very dependent on specific
-	# imagemagick versions. color defs?
-	sed -i -e '/test_\(gray\|compress_colormap\)/,/^  end/ s:^:#:' test/Image2.rb || die
-	sed -i -e '/test_iterations/,/^    end/ s:^:#:' test/ImageList1.rb || die
-	sed -i -e '/test_\(optimize_layers\|montage\)/,/^  end/ s:^:#:' test/ImageList2.rb || die
-	sed -i -e '/test_\(background_color\|border_color\|colors\|image_type\)/,/^  end/ s:^:#:' test/Image_attributes.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext/RMagick V=1
-	cp ext/RMagick/RMagick2$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test || die
-	RSPEC_VERSION=3 ruby-ng_rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-
-	if use doc ; then
-		dohtml -r doc
-	fi
-}
diff --git a/dev-ruby/rmagick/rmagick-3.0.0.ebuild b/dev-ruby/rmagick/rmagick-3.0.0.ebuild
deleted file mode 100644
index 3d58426000b5..000000000000
--- a/dev-ruby/rmagick/rmagick-3.0.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.textile"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="https://github.com/gemhome/rmagick"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos"
-IUSE="doc"
-
-RDEPEND+=" >=media-gfx/imagemagick-6.9.0:= =media-gfx/imagemagick-6*"
-DEPEND+=" >=media-gfx/imagemagick-6.9.0:=[jpeg] =media-gfx/imagemagick-6*"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	# Avoid unused dependency on rake-compiler. This also avoids an
-	# extra compile during tests.
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' \
-		-e '/compile/ s:^:#:' Rakefile || die
-
-	# Avoid simplecov dependency
-	#sed -i -e '/simplecov/ s:^:#:' Rakefile test/test_all_basic.rb || die
-
-	# Squelch harmless warning about imagemagick installation.
-	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-
-	# Avoid some tests that seem to be very dependent on specific
-	# imagemagick versions. color defs?
-	sed -i -e '/test_\(gray\|compress_colormap\)/,/^  end/ s:^:#:' test/Image2.rb || die
-	sed -i -e '/test_\(delete_if\|iterations\|reject\)/,/^  end/ s:^:#:' test/ImageList1.rb || die
-	sed -i -e '/test_\(optimize_layers\|montage\)/,/^  end/ s:^:#:' test/ImageList2.rb || die
-	sed -i -e '/test_\(background_color\|border_color\|colors\|image_type\|number_colors\|total_colors\)/,/^  end/ s:^:#:' test/Image_attributes.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext/RMagick V=1
-	cp ext/RMagick/RMagick2$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test || die
-	RSPEC_VERSION=3 ruby-ng_rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-
-	if use doc ; then
-		dohtml -r doc
-	fi
-}
diff --git a/dev-ruby/rmagick/rmagick-3.1.0.ebuild b/dev-ruby/rmagick/rmagick-3.1.0.ebuild
index 6a3e016dc25b..f65f3e18051a 100644
--- a/dev-ruby/rmagick/rmagick-3.1.0.ebuild
+++ b/dev-ruby/rmagick/rmagick-3.1.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/gemhome/rmagick"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86 ~x86-macos"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-macos"
 IUSE="doc"
 
 RDEPEND+=" >=media-gfx/imagemagick-6.9.0:= =media-gfx/imagemagick-6*"
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index 34891ad2841b..ff8168f9cf4b 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -1,7 +1,11 @@
+DIST rouge-3.10.0.tar.gz 780864 BLAKE2B c5761806fa27e8bc83d51a3d85a62a63b33212bb2958bfd161c344285712692d8b1dfc6a3aa3328738b5f9de9a02508050e3fa5b9324220d9b54e3bbc17a22bf SHA512 4ec1ea86db8a3df98a2cc2152ec55f301799fdb40c9a4b8d178b9fedadee576ec7c15ebb21b397cae5c95ad4e126cd21a457f3cc8d14408bac860e3997cf34c1
 DIST rouge-3.6.0.tar.gz 727487 BLAKE2B d5430e0dec82244c8c5fc0df3de318556f3b6c24579b34a724f20953765ab9fabfd79c5aeab3ff9d16f5f4c7db531b0b9d511938b8836207f4a64050a4bff112 SHA512 b5ec4d6325a752033d8c1e1bbe1618840bf2b5c556391ae8d978971a520f83a49d7244f0386193c947689d84d61d98137b8d8a06ed83e3c1d6769923a1c6c1c1
 DIST rouge-3.7.0.tar.gz 761581 BLAKE2B 681b8447a0f56e774f155ca735fa57b18a58f7ba3a55f995c3b42927392c91891facee557ed85a9faae86a9fa3301aedca995cff9a9b3d729c1be8e0cbdb8b97 SHA512 9360a4e0d564435da1481503222794e4b5649b4ece1b410d079c69f10e89e20bdf08c9d04663919cfbb7ce7b7cf0688604649c42c2442750bb1301d68e78248f
 DIST rouge-3.8.0.tar.gz 755720 BLAKE2B aca1ccbd601ee080958ccf09ab8932dc556065945f4cc2ee9b9bf5531ff41cec676005b0c7540aa058b3346c5eabac4351dd6a291ff148c9b5dfc682f7579336 SHA512 16a1cf9e9eae466c55f236f10d10bf0f5f4d523f6a680c1130b02115384691c1e2fbb14b59a6be1b9df77cc67fdb0ffe026cff6d0150230afe53f26b4c254dde
+DIST rouge-3.9.0.tar.gz 771945 BLAKE2B 855a9a7b7bc5af5c19265570d7cfbb699ac3c9e355ef1a0ccba2a8a5e93ccf3dac5bc1c6e8ab1e251c29eb4eada403862c31f905d6de86bd3b6ae1d1868231c0 SHA512 da132ed07889f6dfda9199cfd6eb8f1af8e0c68b666452f0bafc86417bc153d11967138de49f299f4ae9d2f868dd7349a4089b235fceea80e32b1af3e3200172
+EBUILD rouge-3.10.0.ebuild 908 BLAKE2B a3f66937961884c778a7f04f2d4f95176a5eb1174eaaf3c54757b0bf107a7f0f60e9fb7973ce09914366900ad88aa8cc31aa0ff309963eeef3488cb6cce44f0c SHA512 cab4125cf3881500b377d4f47dee076fc47b2b60f429b87a094e7de4e566c23ea069a74ffb1bdffa4cb15fca98e3a45270fa752b6ded98e4d6140e4be336a719
 EBUILD rouge-3.6.0.ebuild 834 BLAKE2B 26ec04db0b005b7acd3b7c2ff685f33f0d51c4f414c38820a33745692faaf623cca80352891eb56a52ceb1878c983082d941fcac8533fb1ef26d9ac6328113ec SHA512 d6a84fc49e075e24f45c3739125dd0d03737844204ab94e59e4392f07db25d02e08f58d8ab1a2c5e0d66171318aaf59a2f07f2a03db6a14c1676c150cfd8fd66
 EBUILD rouge-3.7.0.ebuild 879 BLAKE2B c388823f3f9773ed2c3a0a2bf596ae94270abb071d783823264dbb8eeb136374f79f0689e16246826ecd31e4f03410d2b2951eb9766121d0c053615a3e422c1a SHA512 6943800ab239efa86373d1797654f16ce739c4225282565bc2156c6511a7433e4915446c6d777abd470f26021de943bd08b021b2e3f897285ff8639d8daad3a7
 EBUILD rouge-3.8.0.ebuild 917 BLAKE2B 7d5479ce54b4372c4d71cad96f2f012c9a013c5a5ada37d930a4b3299c69fe90c9ad78145da3103100a0b7806c69bdc3e2b6cf6c6d937734e0999bbaef67c2b4 SHA512 7880f210d33664bb78b41b3104b8ed2cb841e7bccb4e2531d21d6ba332f054ef8d37b80fcbaf0bcbda432980193646ed23d496687c357e1ef5be2a118d409b1b
+EBUILD rouge-3.9.0.ebuild 908 BLAKE2B a3f66937961884c778a7f04f2d4f95176a5eb1174eaaf3c54757b0bf107a7f0f60e9fb7973ce09914366900ad88aa8cc31aa0ff309963eeef3488cb6cce44f0c SHA512 cab4125cf3881500b377d4f47dee076fc47b2b60f429b87a094e7de4e566c23ea069a74ffb1bdffa4cb15fca98e3a45270fa752b6ded98e4d6140e4be336a719
 MISC metadata.xml 337 BLAKE2B 0b11fe43cebeee93ba1543bf3784c624a91373b066b90485698e9f58ad95d2d4ae077fa5d18d097deb5d8678877b915a9df7154899169d35345fc8fc52bb1c44 SHA512 2517857c1be612b98601b4f92e3e20f3e404902faed1965f8e2e0573820ed6dfc12de25a292bc5f5971b498e310cdfe4a3a5aa13f46354f5139c53ae6a53b876
diff --git a/dev-ruby/rouge/rouge-3.10.0.ebuild b/dev-ruby/rouge/rouge-3.10.0.ebuild
new file mode 100644
index 000000000000..645508576068
--- /dev/null
+++ b/dev-ruby/rouge/rouge-3.10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/jneen/rouge"
+SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet"
+
+all_ruby_prepare() {
+	rm -f tasks/update/changelog.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rouge/rouge-3.9.0.ebuild b/dev-ruby/rouge/rouge-3.9.0.ebuild
new file mode 100644
index 000000000000..645508576068
--- /dev/null
+++ b/dev-ruby/rouge/rouge-3.9.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/jneen/rouge"
+SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet"
+
+all_ruby_prepare() {
+	rm -f tasks/update/changelog.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 89c523b027ef..bbcfcda58ee5 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,13 +1,8 @@
 AUX rspec-core-3.8.0-ruby26.patch 894 BLAKE2B 7639c2836caa1602320288ff7662a40e3074aa82ffd9bc56639b1db9d618a81b6ad78bea5dbed09fe68455a446f06f2cc2276f3313650f9d8b58b2c5db01b4f3 SHA512 8aca41f68b16a8790c71e618e0ab18dc7e55651e4df91a92ba9089498c5995c36fefa09cd9532186882dd6a4194a21f7bb5f25e180151fde26c4616f60b5712f
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
 DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db0d0246ee619e8edef30bd9f7aeeb80bd0488e4fc73b0a00d119074c35055f6b9d0cbbe6160ae78d0727ce9848a710 SHA512 1561d044281c1b8b97cc89033ad991548fa74abbc5f20d3951d3f3de754c581a027f9ccb2bd0107c05e744d3b2804555cf4cf207e72adf365b28fc7ce052dab8
-DIST rspec-core-3.8.0-git.tgz 386022 BLAKE2B e827f006fe9f05f93b741d021bbb108ae3e98cd23f3388c1fdf2a87d8be349c04e91c810cbb7c47cc99ce99a00f62e13eb01a927b8b89d54dfa437ed46b1d24f SHA512 6d3f431a1f9485009f5029bea967f36cb789be8cf33722b36c40df44e12a2284674c6c8af333bfe8ba8825e032576569fd42c92f798988faad732ac3a720c5e6
-DIST rspec-core-3.8.1-git.tgz 387459 BLAKE2B 34888ef32e841633710cf2ec312a2a5006cbe9bb92ad16a646b7c7ef7ebca693db12de4240f4a03bbc01ecc50bc08ee676600b708ba72e1f34ad11d007bf6377 SHA512 fb9d6098e9c43b0fb0b7344521861c6095bee09d3fcaec526bed7b67f21cdff067a4a913f7cf17af9436587a20caab172670058785f138f50103708475057941
 DIST rspec-core-3.8.2-git.tgz 387788 BLAKE2B e6cf93f5cef70f53039b6c22fc875cff58eaff4c0c7d4e75d23dedfbe16081980c6fe575d3082dbe6ed9edc8e81f0cbb9e29618da78af40a94c517a859f9d793 SHA512 2fe88ee3d66ecf134562dfa7b1001f23a1a750640c4f65cdec64d85dd735e0fde9d91479286f8f9c38064746813f41632d12d21b3926724ccd7c9ded50d2a7c8
 EBUILD rspec-core-2.99.2-r2.ebuild 4274 BLAKE2B abb7a4edb2e1970a68222ea1e7f7f4889a9effda6279d9ff324cfcc02e530120d9995a051f338760cffa42f9133f6b63cdd1bea0f6390ca5f59bc4d2faaef3c6 SHA512 be430bfad3a3af78c12b9d2577461fe84561f238c52905e49bed0a845f6cb71d13f6700c9824cb3a1f338bc42b1f6d245e3c0ad9b0c3b774addc3209a79d4149
 EBUILD rspec-core-3.7.1.ebuild 3419 BLAKE2B 65b5734208e5d1c6d26c934ab92a1f15522f5305551bec461aa738c87a3680de10d780c12991dc5ce31bf5ee5afe45814e5e20011a63ec6f79a58825be4eb195 SHA512 8579d22bcca77c546cdb11d33262384a6d3a5115195869d74a99b46a0d7419ec4f74c5aa1a2f59067efec60b87fb626d621e5f4defaf62bb7d7b5ea502db3653
-EBUILD rspec-core-3.8.0-r1.ebuild 3231 BLAKE2B bdbdbfef255154975b8ad047fe6f3ceae84db99d5fb8fef588a3736a80cb3fbe245c87a629375c2e6d12fe1d89e6088481da4c700e76c8679dff4a0ddf232675 SHA512 3789540ccd02636f350cc195231b036235ba37d6a7c4f9a22d77dce57eabe0dd141f63f322436c6de67a8172fc59fb28e0d13f50a491d3df785a10fd22a68ed4
-EBUILD rspec-core-3.8.0.ebuild 2968 BLAKE2B f3f8308737d6a1cc643ff39fe39e803f11c133991c269651601881cbb5ee82fe6e998df04c5dee580db41b915b59db6e4936613d3b6ea2287e3a708f2bc85da1 SHA512 2ea428d91d9df0273c4a0c353fcb20249b216ff3a304786e5bb877be1fed4485a3c6a99c74d4ea2d5e174ae87a2b178eb5c1735af41f92210a35f9b508c9260b
-EBUILD rspec-core-3.8.1.ebuild 3179 BLAKE2B 8fd9622e03a4d0ddce3d66e0d78bbf43bce34701bdda0863321b1b71eceedb8f7cabcdb5c967afda20fc39e3fd5808b4b1fecfe78045c1ee57d101ac0d29c278 SHA512 cd0fe7084e9c2ac5bfd1abc863f9abe8b5fee28afa82cfdc299744892ba84709ed762fbf7a0a4d1d46203bf74b2442273db787bca183b21c975748ba0ef2a287
-EBUILD rspec-core-3.8.2.ebuild 3179 BLAKE2B 8fd9622e03a4d0ddce3d66e0d78bbf43bce34701bdda0863321b1b71eceedb8f7cabcdb5c967afda20fc39e3fd5808b4b1fecfe78045c1ee57d101ac0d29c278 SHA512 cd0fe7084e9c2ac5bfd1abc863f9abe8b5fee28afa82cfdc299744892ba84709ed762fbf7a0a4d1d46203bf74b2442273db787bca183b21c975748ba0ef2a287
+EBUILD rspec-core-3.8.2.ebuild 3170 BLAKE2B 0878c9b77173664a13a8ca55d84c943de067f838ed61b376469dc0c0cb1731cbc41878c7e7ddf9c5788fa32a308aaba4eeadb69b642f09ca4355ad69d4cb7716 SHA512 bb73c4fdc46fcb37c6005d022e3b3b22014ca874027c4411abbe8b7e3d1c476fffc81b8984e707947cd9bcd5e236e375bdad3c69ed3eb9c76097cb8cb2b38f39
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.8.0-r1.ebuild b/dev-ruby/rspec-core/rspec-core-3.8.0-r1.ebuild
deleted file mode 100644
index 5d8eb31f001c..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.1.1 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.1.1
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.8.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-PATCHES=( "${FILESDIR}/${P}-ruby26.patch" )
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
-	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
-	# dependencies, bug 662328
-	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
-
-	# Avoid a spec depending on specifics on local networks
-	# This fails when localhost resolves to ::1 which may be a
-	# ruby regression in the drb/acl code.
-	rm -f spec/rspec/core/bisect/server_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.8.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.8.0.ebuild
deleted file mode 100644
index 0d6bf6d9b1ea..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.8.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.1.1 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.1.1
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.8.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
-	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid a spec that depens on dev-ruby/rspec to lessen circular
-	# dependencies, bug 662328
-	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.8.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.8.1.ebuild
deleted file mode 100644
index f958c2e7cf58..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.8.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.1.1 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.1.1
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.8.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
-	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
-	# dependencies, bug 662328
-	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
-
-	# Avoid a spec depending on specifics on local networks
-	# This fails when localhost resolves to ::1 which may be a
-	# ruby regression in the drb/acl code.
-	rm -f spec/rspec/core/bisect/server_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
index f958c2e7cf58..d32e455db9b1 100644
--- a/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 68eeef096031..3d131dd24e9c 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,12 +1,8 @@
 AUX rspec-expectations-3.7.0-ruby25.patch 1467 BLAKE2B 39968ab1201fcc0e69fc1cf023150bdc19b8df15324f8411c1094857541c54f935d95d74714a870e2eb3d7de6d9b94891838efe2ff765f83f2b5d38b0ccb9774 SHA512 87a92967764e4c9214e55133d8b792441449ca87140ff4c594ff0bc528078d05d5164958744d75d6a9e8309acec9905224c45d36d408a3cf705e3987aedc24f3
 DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc6adf7be6cabad6df6fd16195c71787d73495924233d793633fa041a94d796f63c9ff97c58e6f4a75bdc09dfbe56e770bb6a5c9 SHA512 6042cafe225b2b16df458c7bf69e1694b637afcac6f6195e35a0be199432610457ccaa3e7e4bd114b27a7a6c3d530d94f4c0603c65f469cbadc55bd3f75b6f3a
 DIST rspec-expectations-3.7.0-git.tgz 194071 BLAKE2B 67c8db15c43cc1141b19c6eb99390eaaf2535ec03f0fdc7b05576daa463d252f56ff251d40f5771726ee6451d57eef206c893f2593b01d413b5d96cdf21f0daf SHA512 bdd3222089299e9bfdd6f17a2b8af81d5e695290a3ce976630d586d51ff2df5baf76a3887b8adb31294bd6623ba85f8c2a4a31ac520046515aeeb81fa3a1bd5a
-DIST rspec-expectations-3.8.2-git.tgz 198952 BLAKE2B 6952f895251f26f8a1b7746b277fc92b296e78fb23b8f581e90f649ccc28e21e0a695f87b012b4925becfcda8f8876414f74a826c75bdfa5114092849bbfe525 SHA512 d374f7add45d2b6ce607c1a068e3e0970f902a0edf96ec891bd618dd17253878c1e0b625296ff12a6dc35103651bbfbcfd1a1b444f94e08eae2680e32853a198
-DIST rspec-expectations-3.8.3-git.tgz 200239 BLAKE2B 88295c7df00a99486bb19ae37ee74a857a087afdb4c14eb6db8c343e639ef322c45ab9de25b0c70707a9f17cbc81c47baff8b7695fc6a1440de5509b1508cb1f SHA512 328b3403e7ac2864ed6ad1a196ca24df6693797e35525559f2082c7e1c161d60da7776ca1a68a82364a7ea55115ac2c12ebf6af8486ef88757a4818a9683ae80
 DIST rspec-expectations-3.8.4-git.tgz 200149 BLAKE2B 45fe4cdc4b032bb773ef0e7d3e9b75e6d14a6e8c1850ad6fd84991d85a61860730caa9f191aa9d1ce4e21c85dadd2c52bb69bd0a1454f5ab918dc1e563fc54f1 SHA512 0ecb16f11ccf19c02c40ce587f33846fb2241f1663dd87f012b9b782338c213362dac624c434dee6e00ad2cc7ec4a1cd0af7f2edf1a8e9ebb0a0dfb31cd244d8
 EBUILD rspec-expectations-2.99.2.ebuild 1706 BLAKE2B 50aae350fcb9c007f372f6e3568e7d49aebcf9d82227a5bd0ddfa2ad366237f4895f9d39be06cc18361a095ac1fb993f2414d58668dfa62dde8acaee5166f2b7 SHA512 f668f2030cd49423092216dc658204ad1dc8f8a301e60d0a2c7aadfcd8266ee98ec1e014a25647830c259d52deaf7753d3097b22ec4e5bbbc3a5d246869b3127
 EBUILD rspec-expectations-3.7.0.ebuild 1388 BLAKE2B d10ea9cad1cd9b4cd021d1c5f48ddfd57e25d414257c22316f97d31e45742115ba54a1525507754a184c957a73cca6ce54edc1074b26c8f8add41fd37b830c6b SHA512 9e4c3e0d6bddc5b4d9b1c1fc9b628fc7dd4147f01a5c0d334d184b80db340fc72b60bca39a1c287e20228892f0b7d1cd8d92c0be27083601c3c90647a5e6889c
-EBUILD rspec-expectations-3.8.2.ebuild 1331 BLAKE2B 473f7751fd9ff49dd24a8221842c6d33b93547bedc8ec49fdc601aadf9f7418ac5c75797091e27d555e3860c2a2181ef4cb8d6247027ff8a6fb5f8b595c54087 SHA512 7f1c29ba5eaeb27f49ea4d3f1e1512194bebcc83b164365fc9e12785a228f2754f271b8e8dd05e5adba23bd5a3b401507b2443bcc87b5157aa0cd7cda198331e
-EBUILD rspec-expectations-3.8.3.ebuild 1324 BLAKE2B 517e822ce04f6bc7aa481ebc3ed194fbb110860f75c9ad9bc7c94bc26dbb83181873267445e06cd8216f98a0d21afea36d3702609f2830a186a8be9a80d3e27e SHA512 30afd432ddd3f12d1b16f649cc45a05dad54324084a271c7d6d25c70f210a0a6f5545d4ab3b8f2360819b421b03f6620cd28cff819d96cd2e6a6f3e105c82be7
-EBUILD rspec-expectations-3.8.4.ebuild 1324 BLAKE2B 517e822ce04f6bc7aa481ebc3ed194fbb110860f75c9ad9bc7c94bc26dbb83181873267445e06cd8216f98a0d21afea36d3702609f2830a186a8be9a80d3e27e SHA512 30afd432ddd3f12d1b16f649cc45a05dad54324084a271c7d6d25c70f210a0a6f5545d4ab3b8f2360819b421b03f6620cd28cff819d96cd2e6a6f3e105c82be7
+EBUILD rspec-expectations-3.8.4.ebuild 1315 BLAKE2B aa8d1f79c6c6f61c216db34b303a6a056ed570f9a0d1cb8b9f54cb7f77886ea70413b241f5e35133d3f70dfd2411090b93c6c14d36697775592743634dcff19b SHA512 2615feadc767756a7c2dc445ff6e8ccbfe6dbf22a01c4db428c5784e8ec18c24b95fc073693a594e8643a08cc8f563c213e942a167ad7c47d7130b7ec8f9bd83
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.8.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.2.ebuild
deleted file mode 100644
index 3d7edbe767c2..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.8.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-expectations"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
-	=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-mocks-3.2.0:3
-		>=dev-ruby/rspec-support-3.5.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm -f Gemfile || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.8.3.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.3.ebuild
deleted file mode 100644
index 647c42d8500a..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.8.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-expectations"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
-	=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-mocks-3.2.0:3
-		>=dev-ruby/rspec-support-3.5.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm -f Gemfile || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
index 647c42d8500a..511285081a90 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 8168987e3aef..b45714f846f1 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -2,10 +2,8 @@ AUX rspec-mocks-3.7.0-ruby25-1.patch 1164 BLAKE2B c7fe549bdbd85ab2868bc6cc02f6f6
 AUX rspec-mocks-3.7.0-ruby25-2.patch 1496 BLAKE2B 1f03651f0f0ee76e055b3dc8f823f2b9e119d7d5f5583ddb44ed15152ec852eaacd1e78a56b401a606777ecc726f0820feb7975c2064fc22430ba28509b52016 SHA512 ed06d7c0c23ccde64393dfad26a70c698973817e077b2db592d908e55827b210bbbe4d95e1d5c92866336456ac21566a96c08d8dc7e84386c1ca8d3d25d5a445
 DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602caba4252ddf5393949d940be8474110eb0697901afaaa878cd8d368f081c6644c0fcbce86d9d14b9f93f48c027ae808 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d
 DIST rspec-mocks-3.7.0-git.tgz 189170 BLAKE2B a0a622ac593660c673cd80b3f3caddd2ac389000f42a7ed1745e1fcfd28d1986e61e83c265d736f3ad0649531973719bc9c5f6ab07e289cb2da89c4482e64184 SHA512 8673726571ccf8a901281e44faeb25ffcb59579dc380138f0557cd9310192cd340081e5e8ad65ae281777727b502cca2f6877134b0fb48f2e0ea40b133002aff
-DIST rspec-mocks-3.8.0-git.tgz 191102 BLAKE2B a8dc3794245e4508fb57874ba11a753db5622abda2d34a022c6f01b2e95bf43dd2df8612abcb84c32cff632f70083ea9d76171de73720d00dd929d562fa5993d SHA512 0649c3722479013aa1a20f750b3a83a9b426e5f79cb0edff995b09d1e2fa674fb8e91c0c94e7f9513f338c3c2e9c5b824a9473e91955cf928542324b8b1463ba
 DIST rspec-mocks-3.8.1-git.tgz 191543 BLAKE2B dae8b22a011a3563eb65d1709006169bf5dcf310749cb858f4ff20c7b82e7675a616fc427136fe5e0edeef1db0b42a1d0af1c5623eed35807e84dc355131c8cc SHA512 ec71c4b815beef315f8db329bd2b0e60cdbb1fa37939c624799c1589d94dd28f74b3d1a4c0b9025bc98a809f80d625315458351fe7dec8291bad20e79beecca8
 EBUILD rspec-mocks-2.99.2.ebuild 1534 BLAKE2B 0e9ece8cc785ac2d892644e96f3754da91b8e6a55b9e0f5ba342d6ee1894abffb492c3ac6f3d0dc111b71e7fcb2fc700789bcb28948b48b13cbc93f8cfd32eda SHA512 137c1337019166694a9f7331ca6a109feabefc084cc7c9800c8aafa60f86a1bf793757f6bddca7ffdd412aaca91527ab75c747038eb7d138231cfaab4db57b80
 EBUILD rspec-mocks-3.7.0.ebuild 1448 BLAKE2B b25484262e7a8d743b2d75d83d29ed24cd5370c443a541a71a6b89899083181cac17b9d8d669cf6b6a6b336b917e528516045b0398978951c31316b9a0019454 SHA512 621a0fdc7ebf457a1b70dc2730d8bf636cdff795f8f04c57369e2bc53ddcf7da9fdf27706a0f92d8d7b0e1e31d2332852492ffef32fbeb51c8c234cfcfff9418
-EBUILD rspec-mocks-3.8.0.ebuild 1355 BLAKE2B 3f0d68437a7f3ed194939a4cbcd3c5f5343fa641c376b931670f6bc0a714912639f2b99dfbcbd5bf9ddc6f645cebd7b959a126c59c59aef12ed770b9fc7bd53c SHA512 985937acd33b55db73aa7022a499f6cc82db97f6489360e1fec19c8e7702cdc85de9eb7552f17dd05be64d00dac94a5f33260fd7322e012cff7b3402f85c0968
-EBUILD rspec-mocks-3.8.1.ebuild 1348 BLAKE2B 27728fe3d8a66d0571395817fcf5f75c98af089a9b2fdec52b9540e60cb5510d1d7ff845a4058b9616b10f77ab5e13b0dc737b0b91ceb6f6e03f282077dce25f SHA512 8a5455ac2f0f5cff121a6134fb75c81434bdfd3d7e8f57ff83702f2b374eb8400b4740be4e319ec451f71f9021053cf89b977022abf14f856431c9ad1c34fed1
+EBUILD rspec-mocks-3.8.1.ebuild 1339 BLAKE2B d046296704e34f8381be051fe56d09945a13a680d1914bf1ee1674fbdf219b6d7783234bdbae0be20c8e3b294c560351d6a43cf583a20e0c341626ae05a5227b SHA512 aa86141027815848cbd59eb3da9a1369401141be8888b4f0a74e4f41594628603d24ac13a729de666dee584d20cb81c9c3f9b91aa6dbed86c967a1751a375294
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.8.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.8.0.ebuild
deleted file mode 100644
index 5cc81a7a788a..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.8.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
index 9cd545a6868a..3a5a625c388d 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index c90f79c99dca..1245c2b8eb58 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,7 +1,5 @@
 DIST rspec-support-3.7.1-git.tgz 65831 BLAKE2B 8595c496bc8d13e36fdfd4a8be8e055db4ac1e85af63f99158d191c9ef9e0a6ba0a2972ad7661a63eeda959e2969139a99ded71219777fd493544b711b6fea53 SHA512 a5760d696048897d76c665a756474bbb1a1995891e577c989cf68a205644c8608c538bf3d87c558428e2c412e02d3552d47567a0679cd4f8793c06f43eccf459
-DIST rspec-support-3.8.0-git.tgz 68415 BLAKE2B c1b13d639213e03c4e334de5520f19136da0e25e96a93b685776a691a84dc1daa66e4dacf3feb83b01032cb1364ba16cdfccf19e738264bbc3bef20882a89d8a SHA512 e16cc7bcc3de797e78c4f6ed475b0e60d492d0442dc048b4b2769a4819b80d1fb4a12aefaee3cc6a35f08d35f5fea82e00cc0fcf04363e57e74a6f5ed73d0693
 DIST rspec-support-3.8.2-git.tgz 69112 BLAKE2B 84600d3e2b4d847618f7f53efdf60be3836c7ba6c586de88cdf085e84749e616ad556683b1e7b588b9aec08adee10054e64ae1daf69c6ad58a00d1c2447171f7 SHA512 9fb9f8f2507edee5e7c414d32c1641803eed7a5e17fd300308449277ec6efb786f07207d8f28bcea0a669b8d76a2da53057488d149990ae973c0f7a0343180dc
 EBUILD rspec-support-3.7.1.ebuild 1343 BLAKE2B dd16cb1702e5105fb7d7cbecde7d766df4c07b2309213fc31723519e8954539259bbcd136c6bb1325bd1b173794aba08326cf359000adebcaf36406490b20955 SHA512 e740a41e74d7e8591adaf840116dfc1d8b2c073056a5e365da752ad11d0742bb378dccc5b97ea55a07d129c1c90ef3a298cad97c59b6e2d5348b0f434ce42738
-EBUILD rspec-support-3.8.0.ebuild 1594 BLAKE2B 08c82e1bbafbf38ed33b7b8836386c76cb730fe422699a2c8893c7e9adfd0f0e0ca4d4d6112b8daef61340491922379bc260dc82d3d87495939515b97e1d221d SHA512 fea6c09c6d411cae7f38e515780bed6dbf509a359f8d0b7dc87dd14a8ddf3bd3381ec7b79a58a81bccffb639956a93f8e90e25f840a99b481d43aed3ef030547
-EBUILD rspec-support-3.8.2.ebuild 1587 BLAKE2B 04976979655114e6a8fb3ce8e258f66c7cfeed3a0082fd20233f87ca2e9150bfa9f5b96ad1ae10d9b522960680ab71b9286531f2edbb32edbc085585fafe8f4d SHA512 24f5b26235a8e3bd6a1dc23f9c8a3441aac433a4621e956a81fe5dc3fd1d0db2d33b6d874ba1268a9de6912150e9db0412b8297642f1810266abc6537f7ea4f0
+EBUILD rspec-support-3.8.2.ebuild 1578 BLAKE2B 676a2126328591ad90a8aecb2e11bf90a14353592bdf58b0851ce9192c0c083a7086a1a164e8285ed2230591570800de1141807b9053ddd529d930779e60a008 SHA512 02860d7b8eb65686b21ec5d36e294900b3500c79647438141210978090015c6dc6291a761be692ef6c450fd4d4c05726cc867c42c3881aede06c8a6efdf817c9
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.8.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.8.0.ebuild
deleted file mode 100644
index 9ed76c16c530..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.8.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-support"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-
-	# Avoid a brittle spec depending on ruby implementation details
-	# should be fixed upstream in next version
-	sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
-}
diff --git a/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
index 1ff0874d65d5..62a912c811e8 100644
--- a/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 6c9a0ba2db68..d4e8c49bddf1 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -3,5 +3,5 @@ DIST rspec-3.7.0.gem 10752 BLAKE2B a0e15d557b0d9089a886d04c917feda80c7a8e5eb70a5
 DIST rspec-3.8.0.gem 10752 BLAKE2B 14b1710fb64fb2ab46d59ac692ceb95dbe7f5e2f5c54e4f97170bd99c2b0d32e1977250f69160ab191367c8016663ecf5cd4e0c89941ff12c727ed52e6118551 SHA512 aa3ecee499240a26866797c00461c7e63915bb84a9a29afce75bd4e7864027588bafde05b108aa7b6d988c1a123265587db807567a8e0f3d03527b0f2d8329ba
 EBUILD rspec-2.99.0.ebuild 798 BLAKE2B 3549afb18d4ecce6e7708fd19596407c0cfb2fe49dcfb0555f67ff2b9611004e660fda3ff2db18fe1a72d4d66e37ea4013086af9add8d415dc87c0d77d916890 SHA512 29534df9b0efcf725124df81443b5bcafd3801a70d33b454653b1636a5310953eae5593db64c8199ea9f4c468f7265cd3248604d87e7825f92c57a4795d09367
 EBUILD rspec-3.7.0.ebuild 676 BLAKE2B 88689e94ab419b92faf63c1676e9b42fece75813ea3a07e40aee4f95e49a44ea19d7f0e35db37b1604e2842c5586130e1d43aa28b5a79aefa33945f34707c52c SHA512 5d54f841288d1ea59d46794d2c218fd5b8c42b78b9182edf464415abd6f24bcc14b5d4a6982ba73ce942acdc94833d7f5a1f50137a1b28ef17b2773a6668f334
-EBUILD rspec-3.8.0.ebuild 664 BLAKE2B 747b59ac3f9daf5beae51f8eb49fc5d73155a8cca476626564a1c007083edb6e07af57e3f7f77137223c042daacd44b8cda9d636d8c367720df8f1eb22009388 SHA512 9ae3e09f4bc6ee735cac57f251f1ce7e7bcd3706665daa2644e87ced7979f9db49ba67bc8a8c63be74d3fe9991ed5e1b0e7761b822f518fb9688516f53802e5a
+EBUILD rspec-3.8.0.ebuild 655 BLAKE2B 7b98ce0365d1df955b72903326efd4edfb61246baa48a5c668325cfe0faa39b2cd83a012c519b5499d330a264706f89a177cc9d5f00935a2f6e034b35fb7c5a7 SHA512 6b40e8d1ee77b0b8266351b3bb1c0b7272fd8e1f03e8d8e6a0cad0e7c3f6080978e40090a73288d0ebab372a4235cbbc182166a0e1591ce40f04c19ddf815357
 MISC metadata.xml 337 BLAKE2B fd99a128031819f061bb4b2fea336d7b14b26b7a986d782d8a4e2b9b9b7ce4c703242ef724cc9bdd98cf0219973dfcfca2a2eb7979b446f879d2f337b566985f SHA512 0a9165edcea2906fb370afa35ef77b74a4b833539959e8f28194e4d02ab7685f23dd16f04ea7e18873d10bf607236972610c49cf61ed97e5df7b4796ec9a66be
diff --git a/dev-ruby/rspec/rspec-3.8.0.ebuild b/dev-ruby/rspec/rspec-3.8.0.ebuild
index 90dac217d4fe..8f288bb12522 100644
--- a/dev-ruby/rspec/rspec-3.8.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.8.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index e91985bacadb..25f7411928f7 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,17 +1,17 @@
 DIST selenium-webdriver-2.53.4.gem 897536 BLAKE2B 630b5e8cd5ce53de7a689135ce80e364e33b783bd8493f79af01d79717d3d65541fe04c6c0e5016a85af8a559864ddcb641d06c99430599b21095b54ff40845a SHA512 ad7934a67c4415a81c2d0efae5f510d41784411076ea903724e1fa2be1b209382131aa1b05f3636deb1deca38db6e76805262f5037ab2e621e785e4eb3c2b90e
-DIST selenium-webdriver-3.12.0.gem 843264 BLAKE2B f9a2e233658e071144f153f7710ec15cd58d8831793f7212d1d49a76d08d80c7110bcf1afc86e98210c6753d19ab2c63f169754f148db8a994fb777048c10b6d SHA512 1d5a510e3e7775c6b8c960de8a5f0ae2084f490c17084e8ba0894dc32021c9295c9301c6bf0ba07e0e9827a8d99ac9f9c5d29fbf57425a076825fe18e4a8f88f
 DIST selenium-webdriver-3.14.1.gem 860672 BLAKE2B 83026babf1596fc5c0621da19eb1ae48c3534448a5f4c3b6dbcb6141f2968eb527cbb667b45859a998b4950d8498dbd4a68ddcbbcadbe83fd02dcac46d2f2e4e SHA512 3671bc6446f49945b4484bce90e91178f932d799ac79b93974268eb2b9bc060c62f41c2f25436b7ea49612e1d9b014f1ca4f63dfc74b9781ddcb9c849f3be82d
 DIST selenium-webdriver-3.141.5926.gem 865280 BLAKE2B f1113b2e229788fcf2351d3ee48ee1a7ed8f5b4a35dd5d81697b41d54682a9348b657b79d931dc5bf0a17f7f0441d78eec766dcecd23da38b16b94923ae479e3 SHA512 f4333e62f241ddd325703361e7ccc064c9ac6471413ea6ee8d3bb57b7542fe7928d14223fabc7952fbc13fbbe8599b5cc5ff7dcbc390d4b7ddb5b479662a4ad2
 DIST selenium-webdriver-3.142.0.gem 865280 BLAKE2B b4175f4458727291659af21fff60268e022a241df73c502219f010d0d6d59a76b291894e4f70825c55587ed119692e27eb0394abd18aa5da83ded87581e083a0 SHA512 e0e2664dc500c99d0ff9163426b8049c7b4a03bd40616d4f2f0fc0ea2d67557e22853a61d374009e9e0ba3888f0e97f85e5cfa4eaa794c1158d41caff7a05686
 DIST selenium-webdriver-3.142.1.gem 865280 BLAKE2B d28d58cfbab64d83e28c65fa9b639f05dbab87c454ffde4507ce0a90e744006bea1e93b2fa35303b0bc17ff7423e84bb052a7f0072c7f915bdc758fb2ceabd86 SHA512 90746d11c5f7af086392ed70994d17c05c3cd5d839f743a5587c0e06dbc98f3882f4a5846cfef68110b4b4860c3980ac50e1017f9a445a296c0b0bde0ed18ecd
 DIST selenium-webdriver-3.142.2.gem 865280 BLAKE2B 8182b2eda9ab448c044a270d304364bf3f38bd1dd98580ae34c8e22fc0364a1b20629a7f91f3edd2d171fb03e76eb4762eec1cd6b255559a9809c6533cd484d2 SHA512 87998117e960812a26a09c2a45aad7145fec6be5fd3ff34a3a464969a720a7e04f39ebb93fdf7e56183f06f3e5e01e1f7441af80a1d061fc14fb186959030462
 DIST selenium-webdriver-3.142.3.gem 865280 BLAKE2B 9ff97810a1d377293b3d5f7dde91561856a4b44295b9d7ec04a8af257ebebe7765ed1ba32e7f072fceb0760b85358ce0fd10b43092a54bdbc8f42e2a9d54402d SHA512 048c1f82f1a53d4de610c5ff32acaa05907ef2d772c68d2d5ddb1fd232cf03eeef9c15ff1096a97acce026d0f4dd730ae35d7ae5d1b06ff3b49968f987704696
+DIST selenium-webdriver-3.142.4.gem 864768 BLAKE2B 9e4bf0a2c7886633b8fd3903aec89d927164d8a866f2fcf376732cf63a86e23671b58bf9d31a8156916ca7056b0330e7876028c58f89d9024e583a0dd9545852 SHA512 63c8c5f98904b2fc98c8b3ee1aec744294fcd094b651814067383872978da7917e9e529ec57fde65864f2f9962679653a2e44b21d4053481fc4d9dde5beb0aeb
 EBUILD selenium-webdriver-2.53.4-r1.ebuild 1137 BLAKE2B c1686329733f5253efee815896b641a422b510d00ce379c14d87a68c487556bf64b0771dc73097bc483dd796e3e890c5fe74e6e4fa296e2a20b60ec8eac3ad7b SHA512 fd3f0c87afd1924a40ebf80ef783414cb6fc256db64e710b922e4b2834cefc2974d11e8a6c037b1d426f867459b4cf90a922f2a8c38ce0a1d426ccc990d1d268
-EBUILD selenium-webdriver-3.12.0.ebuild 909 BLAKE2B 29d6b7d719d0dd9993a821f12a77b5ddb7bf647ddc381c3ec2e71c103debf69c7e773f7e7f8b980ac96d8c7d167dd84f7f0346fcfea5f597064275285929aa9d SHA512 3e7933e17836917a44275e627dd9d445b28a6d10ac3424ff357cc16a368117b527e40c2ad3fccdb2a5bb622a9f91cc5f0e0a85b28cac6ed8a6da25b6537e881c
 EBUILD selenium-webdriver-3.14.1.ebuild 904 BLAKE2B a0bd35ff9a5572824fd78ac311e38ee33b95559c3afc019d7b4b98ddc777afea965a14944d36685b04260df96a7ff37b29fb27a6e2a88c719db21fd44ea36095 SHA512 dcdb610e4805f576c4734491169528e26fe746da5e4f4e29f55810d5c9ff5b906bf81b3d4c0c0c34e7aeee801ba06b35f0b88628757d52bfa5925dbd7bd059b2
 EBUILD selenium-webdriver-3.141.5926.ebuild 932 BLAKE2B 133ddc94b7796364d74103198eb68cc408ab0250cf7de122ae6d998f3826fee775e0455fee96cd803b9694478c581bce8bf6fbe274bec00fbc49ddfa20f00010 SHA512 b0356d8d34de9223bc68d13e226c348522c17d38e05aae0dd60bb13cd586f178ca4160b1617e891bb0bc9b7d62ad71bb420997ab0e87d912f5cd3301326d81d7
 EBUILD selenium-webdriver-3.142.0.ebuild 939 BLAKE2B 3470af66bce9e0d4188775a0fdca2d14dcee4e5b2cd6576147a4819b11f17cbbe20aa46d49e61d8bb3e7b6f065a9047e0edb50f65e315d8cd28e20082a27755d SHA512 ede862d3468046da66fab70e6665430341a96f5d94d0a6d964ad90ae594b98f48112be380ce852a4c9b3dc5022aca0d378156cc7aa110370064e316a021589ce
 EBUILD selenium-webdriver-3.142.1.ebuild 939 BLAKE2B 3470af66bce9e0d4188775a0fdca2d14dcee4e5b2cd6576147a4819b11f17cbbe20aa46d49e61d8bb3e7b6f065a9047e0edb50f65e315d8cd28e20082a27755d SHA512 ede862d3468046da66fab70e6665430341a96f5d94d0a6d964ad90ae594b98f48112be380ce852a4c9b3dc5022aca0d378156cc7aa110370064e316a021589ce
 EBUILD selenium-webdriver-3.142.2.ebuild 939 BLAKE2B 3470af66bce9e0d4188775a0fdca2d14dcee4e5b2cd6576147a4819b11f17cbbe20aa46d49e61d8bb3e7b6f065a9047e0edb50f65e315d8cd28e20082a27755d SHA512 ede862d3468046da66fab70e6665430341a96f5d94d0a6d964ad90ae594b98f48112be380ce852a4c9b3dc5022aca0d378156cc7aa110370064e316a021589ce
-EBUILD selenium-webdriver-3.142.3.ebuild 932 BLAKE2B 7efa9272202ce8e47b447237f1db3e333ce558d033f2c03631e8daeef4567953d0e3c64210f15696d11f0bd7cce2f62c12afd2f0adf29edb0d94234600cbf9e1 SHA512 475fd1c31895c8526d9b6961fddcc925aeb68282873efcd9c25d9020b61422efc6ff144c4bb8b2828ba86cd707b488920005c53c7634817acf4fdcfc8f662c6b
+EBUILD selenium-webdriver-3.142.3.ebuild 931 BLAKE2B a2958374094c294158c69663f78ab743e399f430937073dc2044ed417e5c11fcc3f5bbd2f6b4cea621fccd321565bb32cbb7bc4a97628ccb8a95a0a5f1cfa778 SHA512 6bcb5093db48ff3b077688287deddcf55c0847e55c6373647699c4cf546fa8350d9dffcca8ab673a2623b1a026e3b1eb20685ef1413badb1c2dcd1547e7899da
+EBUILD selenium-webdriver-3.142.4.ebuild 915 BLAKE2B 099236989f595394764a9346c3ae37bd8f39eceb75f1446c2cf0336a3ef50ea90c2f0695302527ec15d41e0eafa00a582d61d368cf228fe886b7191be7861ae8 SHA512 7c6646a8de0828dd3b5644c542f083591d3ef1be785b9a82a57e6e6c1db0ec015663606fbbc5a1d7a084471c6f1b84c6579cfcae81d6d0239bd7a427fbcfe964
 MISC metadata.xml 335 BLAKE2B 374e7e6bdf450e60792ad3960c2c0fe8ab87f70c34ca76332bbbc632598354e2a774e4eba46434e9b7c85c7f5eee7086ac85268ae58bddea7d75713d9d2f014a SHA512 94e17dd297f6904f1b70709dba5f5612fcc42e9e0e57695df6d37344cc9a89c13b423e41d142631444990ff39367eb6132d6b070bcdbf256ae00e932cadc67e2
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.12.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.12.0.ebuild
deleted file mode 100644
index 24006f2dbf93..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.12.0.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
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at https://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver"
-HOMEPAGE="https://github.com/seleniumhq/selenium"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
-	>=dev-ruby/rubyzip-1.2:1"
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.3.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.3.ebuild
index 8233dcd590b6..97844b2fa009 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.3.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.3.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/seleniumhq/selenium"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/childprocess-0.5 <dev-ruby/childprocess-2
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.4.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.4.ebuild
new file mode 100644
index 000000000000..2b8d9a5d8d04
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="https://github.com/seleniumhq/selenium"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/childprocess-0.5:2
+	>=dev-ruby/rubyzip-1.2.2:1"
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 5dc232b3c301..5bd381d0bdec 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,5 +1,7 @@
 DIST sinatra-1.4.8.gem 369152 BLAKE2B 8a344f85c34dc8736180551690bc55ee615118a243c48421711339f2ef366e6c6facfecf914594f0440a825244e13f98648d11903fd9053054767a58a34aa285 SHA512 e56a5a6d7ceb0be4bc537feb6ada2956f1fd64b452dee347b259837aa02041dfa53d9808531cdd0a02a91093ba92f7c505c39f0dd990dfbc6e872681f40bc5e9
 DIST sinatra-2.0.5.tar.gz 490580 BLAKE2B 6e82a02bf57f8ec6f0c5313b6b6e89e899a5cdc9ff39e897903b6991f990ec75135483c2ef5ac71032abf7afdc84402bbad431f9ae579bab94e3b140d3ce6911 SHA512 da626d584f065f924fa5a42802b0e7a03e40e780cfd92e9cb072c86e9cb6d8ba4a699d7383a81b13ac0ffd0ce427900cdf059b77565ace5961dbd00c088ce0f9
+DIST sinatra-2.0.7.tar.gz 490969 BLAKE2B 292bc4902ad3c5ff0665f12825ede4ea44bd4db39cd622289ffe1801dac4fe4865e90a223a7b37feb9a48b4c404edb3ef62b5e061fc080d5b02fdf96aaf3114c SHA512 dd894b4eb55ff19b92142b7d87b3c60ceb7eacd70b8f524a6e86e8938c64a409098c91b8dae4af68e73b6ef04b184bb4efb29e418caba2b9288cd2b6325840c8
 EBUILD sinatra-1.4.8.ebuild 1326 BLAKE2B 4ad5b768c4cb9b61ce4f04bfb315ae65991d126e6a4ba42da2ed30c2cc77876cf0fc98c3e89f01550fe3ac60c36570c1a52af90ec44ae2acbcf71d90fb627f18 SHA512 7b91176276d8b5db61475df18ea2ede3b0fa197d2c7341e15ad8c71adf1f1d21c36161ab4523f8918f0ee6a71f5628a3e3b8021a1a4761db91fa0de39193f417
 EBUILD sinatra-2.0.5.ebuild 893 BLAKE2B 33f0039e31480122b8ad333e76f2fbd099dc37697e45f76551c9ee5b9ddde34d34df09d7da27051b3b3d44b6aa452b4a619dea352eb3333a8f5b1d7793f71bea SHA512 85682a0a1b7379ee4726aafed71dad02a97914fcc31f0b8304fbf062c0e156916bd9e048a6bf8cb1e4654f5dd0bfbc16b0005875543c5d04ad5a9ab90ab391ec
+EBUILD sinatra-2.0.7.ebuild 859 BLAKE2B 417e6ad516ea9dafa5de69ae1b85346f2105699c5e937e9d6dd70e80c14fd59448e28099f51951f6f62034a3c43f35f4a3b10b14446a79aeda7e66257d4ad4a5 SHA512 a7ac8c4ebc7f423a8fa4966597ad23311dd6f908c2dad389cf635993d4e7a1377167d42519ca75e440c2e94e1ce64d23bb9ad239ec2bc0692e743d89e741e0e9
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sinatra/sinatra-2.0.7.ebuild b/dev-ruby/sinatra/sinatra-2.0.7.ebuild
new file mode 100644
index 000000000000..98223fedbcb5
--- /dev/null
+++ b/dev-ruby/sinatra/sinatra-2.0.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="test:core"
+
+RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
+
+RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
+HOMEPAGE="http://www.sinatrarb.com/"
+SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/mustermann:1
+	dev-ruby/rack:2.0
+	~dev-ruby/rack-protection-${PV}
+	dev-ruby/tilt:2"
+ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder dev-ruby/activesupport )"
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/web-console/Manifest b/dev-ruby/web-console/Manifest
index 02e4a90f9e1b..978c4f33dac4 100644
--- a/dev-ruby/web-console/Manifest
+++ b/dev-ruby/web-console/Manifest
@@ -1,5 +1,7 @@
 DIST web-console-2.3.0.tar.gz 47641 BLAKE2B 2756f3958ea77df7dbdf7e7bd79f64711b4f958433f347175a29db2272ba549c79f1f94e2be18c17ceb8f4f1e8d281cf09995354f6ccd21da314df14dde886ec SHA512 36136242012053c2049b0faef682a8fe79f931904cd1007a6e08f36aca7a8923fc47fc058304f11cc0b205db876ca77b1cca65048c8ba4db401123ed9c05c834
 DIST web-console-3.7.0.tar.gz 53714 BLAKE2B d69a7b467e419e87d43c988026f278aea5ca142e336d120e0a50ef85b36186d2f388d551f19820e01d85fdca5a49c471aed69cb2ae0d6f1828a99350dfe86d55 SHA512 d44e4dc3ef12216829b3f522e3645b0fa9b8ae34fa70b5e52a96e345b8b5fc8dad9af6f9918ea23d276cae03445133b15f780041a8cb61584b182ca6934fd71b
+DIST web-console-4.0.1.tar.gz 54076 BLAKE2B d1c93d828f7c0c33edaac664e2f763aff55bd8437c3f8e3b20cc5c065129a0b213234ea372147d5d6df0917d17cc458e63dad1aa64f9cbd67fbf0a02ab631c5e SHA512 7f2d931b94fc2e51edd28ca0f83473c382bd7ade6e425dd9c79770885efcdfbcf6a3a3223d36572d749da15b05126fd287412d2365d9faa33039de4bcb1c9b27
 EBUILD web-console-2.3.0.ebuild 1121 BLAKE2B f7ea78faa544059960c0c72171b3cdb331acad11fb34116e93efe466c7c2c59f599acf7214f5ac5dba2e2c52d4ca7c8fdc7d3236622d44f98afb4ec4b2572728 SHA512 63a710dd361dc67eb00e433023f74184754776caee0d9d7ea52c4cbf59d292ea1206c456aaac68f88b0de0ed20dccdba7d769a5e4bf4c2ad8173ee0ba6b90f1a
 EBUILD web-console-3.7.0.ebuild 1074 BLAKE2B fa1096afae3683ea0da7c0b2d61fc8768f434ba81c805266933f6933c9d345137962abd841d3dd2be17746377666891eeefaeb886a8e55daa1ac2e8c2ba73371 SHA512 d9a93f155a46de6c0c4f60913c85ef874e42e69805e7fea050eed92f6e2542e50061a07694482cf609fdd70bcf044ca1ac03ac2bc5f92a190ce2e219b9aaa7e0
+EBUILD web-console-4.0.1.ebuild 1071 BLAKE2B fcba218fabf4ee60a81d088cc159b373212ea4d6effc121ff1c7e8e2f9ea434efe1674d6ce23c886dbb267660291759a7ea6fef3d52de9441091e67f7d0175b5 SHA512 41470af754e173c258fc1571d9537868cc97b22be59c3ead88295eda9ee80e4791d22ac999b86d9a60ca732593a60342cab7c67e138b9b8c73bd1480a16080de
 MISC metadata.xml 343 BLAKE2B 8883d76dc0b31bd49361ba715fc9546328ba5a3fc734e8a2607547cfde3d8b48914231839f0ea3d4a59f005a5074770e1dcdccc6b5d629197c8f7f859453f178 SHA512 9116cd6bba4d0030e6f8cdf055fd66afed68c52d9f5382a8a9cd2cb28f84c3f397a3e793dfef3b5ee0fc9e1a4dcd1c2d6e6b285fd7fbb027e339e2d15a0381ad
diff --git a/dev-ruby/web-console/web-console-4.0.1.ebuild b/dev-ruby/web-console/web-console-4.0.1.ebuild
new file mode 100644
index 000000000000..fc404eb434cc
--- /dev/null
+++ b/dev-ruby/web-console/web-console-4.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="web-console.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A debugging tool for your Ruby on Rails applications"
+HOMEPAGE="https://github.com/rails/web-console"
+SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/actionview-6.0:*
+	>=dev-ruby/activemodel-6.0:*
+	>=dev-ruby/bindex-0.4.0
+	>=dev-ruby/railties-6.0:*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	>=dev-ruby/rails-6.0
+	dev-ruby/sqlite3
+	dev-ruby/mocha
+	www-servers/puma
+)"
+
+all_ruby_prepare() {
+	# Use an installed rails version rather than live source from github.
+	sed -i -e '/\(rack\|rails\|simplecov\)/ s/,/#/'  \
+		-e '/\(byebug\|simplecov\)/ s:^:#:' Gemfile || die
+
+	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index fada58aa0a03..d203bda6801f 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -2,8 +2,12 @@ DIST webmock-2.3.2.gem 112128 BLAKE2B ef0a722374057d7c5392924f68de8520f08cb0aa03
 DIST webmock-3.5.1.gem 116736 BLAKE2B eb6531dd481588419932a93d091bf2c2802d98a9abe650e892e568f13a642c61ccbf395e293fb0b24b2e96f464902f8311d03a7afe84e917c4780d2da6000a78 SHA512 6096ebe84140e7385ac941c2f63951d19523b2f7e3330fb38181f19c423b4c4d47828d200d8921e02850374b048902191f96f8d693746bcdf284cf0c5eacd924
 DIST webmock-3.6.0.gem 117248 BLAKE2B 251f80c90777deacc24588a947426252522c3b4ec1670e77801391e9ed495cc7790b2f7211abc728ac357b2876fbb16b654fffe410c5aa3e837c46e927f031f7 SHA512 4bb3ed9cf7e67c1560c1835e26275657b28b40e3f95dbe50156ce1960e418519020675b6ed07e80521d85ea0b0e53c22d674b7b17b4c9349ef62c089e6bc7891
 DIST webmock-3.6.2.gem 117760 BLAKE2B 132b700323cbc4e753406ccfcc69375107c1d8546fd71bacf13db614d1818926321e2cd27dfc08670f908e0ac5946b06892138c2701fb1f27cfcf9fb6dd56c3d SHA512 1d6141be90840d01e3d7b8e925e0a981ac715fbca1219dd35edd7cf3bcea1c1da3442aaa131e3586f0827a7b06207314119c1f47e6ae64f11f154c70ba6fc5c2
+DIST webmock-3.7.0.gem 120832 BLAKE2B 24936bbbd1e0451759acba1fe3dd1760929535210d5e66ebfcfadb4d160a3b52c594e1b842a723503ea1857b515c27c9840f16243bb3446c41e7024027e7cdef SHA512 4d14fc2a5b5cb8ced0b60c65049d2db448add34a53aaa87cd79ad9beca8414a80db7673bff883cb4f8f65592ba17b195e1823c8837f9ae81f73ac185cd59d803
+DIST webmock-3.7.1.gem 120832 BLAKE2B b661e0238904c42486f721e86d0c06a77ca9eb45d1ef3d975630344e1ad503d379518f0453a63fceb784f9aceeb10860e65c78b13ab02a3dd9d23d836948401d SHA512 ccee64bb2a63e7099639cdc55c04862a0cab9b19fe01c7957c3b2a0d90b1e93c79f6fdce23d1827554377666228344475125acf26bc5f98ad2f9be02f4644245
 EBUILD webmock-2.3.2.ebuild 2039 BLAKE2B aaa37b9bf42a6e40ef0adf60d223604cacfa7f51d425885c8cb04de5932d9b1ccc295e6a7c5f5eb930136e2c45b0a1703651ccbc2c08b2ced92e174729577d61 SHA512 a49f721d3c4c2e29a007aa82137b345aff64f47ba332c8fad9de652a1220d082351f2a25dd232d42b26671610d4fe1a005c3d163ee71d6d1714667985980a505
 EBUILD webmock-3.5.1.ebuild 2073 BLAKE2B 42d64131855d8937a8c263e480b1bbce34abf325275726cc561330b2613db4d063ec12ce1b089c58cfeda2fb9ecd45e647f774ad2ab894ae9f68460f85455681 SHA512 eed21d9c9828d469a1bdf5981a760fa3001b0867d2a7113f465146fb8407a2131a339a2eb27e3df2833df3d52f8172cbbee862e5773d612a6d2c5613d2247797
 EBUILD webmock-3.6.0.ebuild 2075 BLAKE2B 61eea02d96a1c15354553c7b173da7f2697c4259464d7258b30ea3ba66c90fa342f13fbbd4a075669ba55ac94b660be4b7bd971882d10b25991b1f1c51f0ba0d SHA512 6f728b7c95195a1990d23bfe6e10597287d55d8a8c948b5163f1a7f478d283f63465a6f3c4fd5343ac476f7fc2d201eab75a7a3c8ade9c587cb133a90fae6c92
 EBUILD webmock-3.6.2.ebuild 2046 BLAKE2B 14d4550b298f48974a8f8cff3bec4c8b9617fa0130143064277f79822e5037a49055091cf52deb27857ececf59028411336742d099af7f3867a183801cb01ebb SHA512 09f60ff68edff5d8d31f5634fb7d51d09f4c14eae8653526ea18b89d8f84956d56e14cec7f1f906c6c02209211245d636ef37167fe007f865e4ad439cd6dee30
+EBUILD webmock-3.7.0.ebuild 2064 BLAKE2B 6ce7dcc34cebd37cb047ceb31954ce3c45648c0621bbdb2a0cfc6585775b0b821d40c40821cf19a47e9d74c24086c7c468579f7dbf24fdd30749af2220eafb2b SHA512 635a7e103b90ea8750a495a867a79cc2b70dd729e486e6567d6f4e23f5673bbdccfd9d61239f97438042c92019fc3288d4403314566b61e89b06814c0c3d2441
+EBUILD webmock-3.7.1.ebuild 2064 BLAKE2B 6ce7dcc34cebd37cb047ceb31954ce3c45648c0621bbdb2a0cfc6585775b0b821d40c40821cf19a47e9d74c24086c7c468579f7dbf24fdd30749af2220eafb2b SHA512 635a7e103b90ea8750a495a867a79cc2b70dd729e486e6567d6f4e23f5673bbdccfd9d61239f97438042c92019fc3288d4403314566b61e89b06814c0c3d2441
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-3.7.0.ebuild b/dev-ruby/webmock/webmock-3.7.0.ebuild
new file mode 100644
index 000000000000..377168ac6040
--- /dev/null
+++ b/dev-ruby/webmock/webmock-3.7.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
+HOMEPAGE="https://github.com/bblimke/webmock"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 >=dev-ruby/hashdiff-0.4.0:0"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/rspec:3
+	>=dev-ruby/test-unit-3.0.0
+	dev-ruby/rack
+	>=dev-ruby/httpclient-2.8.0
+	|| ( dev-ruby/http:4 dev-ruby/http:3 ) )"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
+
+	# There is now optional support for curb and typhoeus which we don't
+	# have in Gentoo yet. em_http_request is available in Gentoo but its
+	# version is too old. patron's latest version is not compatible.
+	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/d' spec/spec_helper.rb || die
+	rm spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
+
+	# Avoid httpclient specs that require network access, most likely
+	# because mocking does not fully work.
+	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
+		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
+		spec/acceptance/httpclient/httpclient_spec.rb
+
+	# Avoid specs that require network access
+	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
+}
+
+each_ruby_test() {
+	${RUBY} -S rake test NO_CONNECTION=true || die
+	${RUBY} -S rspec-3 spec || die
+
+	einfo "Delay to allow the test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/webmock/webmock-3.7.1.ebuild b/dev-ruby/webmock/webmock-3.7.1.ebuild
new file mode 100644
index 000000000000..377168ac6040
--- /dev/null
+++ b/dev-ruby/webmock/webmock-3.7.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
+HOMEPAGE="https://github.com/bblimke/webmock"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 >=dev-ruby/hashdiff-0.4.0:0"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/rspec:3
+	>=dev-ruby/test-unit-3.0.0
+	dev-ruby/rack
+	>=dev-ruby/httpclient-2.8.0
+	|| ( dev-ruby/http:4 dev-ruby/http:3 ) )"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
+
+	# There is now optional support for curb and typhoeus which we don't
+	# have in Gentoo yet. em_http_request is available in Gentoo but its
+	# version is too old. patron's latest version is not compatible.
+	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/d' spec/spec_helper.rb || die
+	rm spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
+
+	# Avoid httpclient specs that require network access, most likely
+	# because mocking does not fully work.
+	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
+		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
+		spec/acceptance/httpclient/httpclient_spec.rb
+
+	# Avoid specs that require network access
+	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
+}
+
+each_ruby_test() {
+	${RUBY} -S rake test NO_CONNECTION=true || die
+	${RUBY} -S rspec-3 spec || die
+
+	einfo "Delay to allow the test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/will_paginate/Manifest b/dev-ruby/will_paginate/Manifest
index afaa771a232e..0ec9c79e4f05 100644
--- a/dev-ruby/will_paginate/Manifest
+++ b/dev-ruby/will_paginate/Manifest
@@ -1,5 +1,7 @@
 DIST will_paginate-3.1.6.gem 36864 BLAKE2B c6babf7125c20d7ed646930b7df39db864d0d46fd89d743daab73ba35254650ec0b4c7e203c5d5a2b00439d928b95508c1a82107db142f8cd77d27a14be00e7f SHA512 50e0fed5a3ea6a62f8620db3d30046a7a4cc602d9d7936a265d0c20a50eb267ecebb2c7d3bb07f3a514f70e556dad78085971bb80f94e1f4baf7048d6fd34c11
 DIST will_paginate-3.1.7.gem 36864 BLAKE2B d003952c78f3447a21c332c2dd6e878cd5c24486e7697e0abe6d70db5e0c56858a0d03fa76a4c18dcf10e121b706cd80812d9f438360eb931430244a0e31ee11 SHA512 2741fb24482a6b55322e6ae83fc1d269074be39014e1b0e719025c86d20edf82b6b551cfb1264381b28dec240a0b5b10e9f41e3b081dd5aca94767cd98ce7376
+DIST will_paginate-3.1.8.gem 36864 BLAKE2B e9089ea72fb12f7010d95c1f3233f66e3189dabf41a2c9bc3a624cf43a6423711c8150a423b8c6f85af390b107d945aa659d30df4e71e00cae8e7d973e423479 SHA512 51e5fe45b14451b7fd8014a5fddd3a9c049e2ec52d2f6e0ec25019b0680a32fe157f8ffa48449d07df880d0255b2aff59ba24a82398659ae4520c25aec6d99aa
 EBUILD will_paginate-3.1.6.ebuild 617 BLAKE2B e2a2e320967a85f4897a173278089ac573ab644b25fbe200e5950eaf7bdef0f8aec4d0fa29f27cd2fc9dfec2f6f07bbf0084dafd1b50ce1b5373297b279749dd SHA512 4f503381427a42251b7739e9a18ffb05b1952140b6b7818ece0bd3a93f1ed2db8d1a464c5816a22ebc62ee63dcc0f980c4717fc516cb20197c1c3ce2cf196f91
 EBUILD will_paginate-3.1.7.ebuild 621 BLAKE2B e03af2f6f9f20beaf192cb3e4ac657dd16b3d1db6a020ee66623fbd2024183a9d4160e20914a0af4f5ea4729911871c817dfa676bed354f791e451581206afc5 SHA512 f0956b5093ae5ea621bbe7229af6966fd1985e1bf62188f6da0d8895ad889eff9a4bb2a1932fed368cb4336bbe96536dc08487d90799d98ca6f96be84001a6e4
+EBUILD will_paginate-3.1.8.ebuild 589 BLAKE2B c9975f4c3b48365eeb06219e8e861dcb893767dbfdc1179c6af92f1583966bab12d94cf8d41c33afb74b8a969f9321065ede1344f8b1bccded29446d32908c2b SHA512 fe67fd007896a11245bed0167a26e5e4e516603b4360dbe81ebfce5d5e2678724951c1dcda2a99954f8cd86dce612948391d4e575400ec5ea672c10e78e85117
 MISC metadata.xml 346 BLAKE2B 859514393fc9d9ac988a812dbb5fc126a269616351c6d8fc32c6ec0f25d685c835f4c1d27ce818807bb330fdc50839b81e6f63d0eb4d77d8f6a95f2da3d849af SHA512 2e061bf277b39327fb84988df2dd9cf548c87dc0bdc51e63b47aeb816c099a4a7fa5b95fc1f3ba35e15c7499d897770397c6f6f2f4d3c1b03733f16f1d0556d3
diff --git a/dev-ruby/will_paginate/will_paginate-3.1.8.ebuild b/dev-ruby/will_paginate/will_paginate-3.1.8.ebuild
new file mode 100644
index 000000000000..3c47cb11bdea
--- /dev/null
+++ b/dev-ruby/will_paginate/will_paginate-3.1.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Most awesome pagination solution for Ruby"
+HOMEPAGE="https://github.com/mislav/will_paginate/"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~x86-macos"
+IUSE=""
+
+all_ruby_prepare() {
+	# Remove tests for unpackaged ORMs
+	rm -f spec/finders/{sequel,mongoid,data_mapper}* || die
+}
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rails
+		dev-ruby/mocha
+	)"
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index e9ef6702f0f3..0600ec6a49f0 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -3,5 +3,5 @@ DIST zeitwerk-2.1.8.tar.gz 90774 BLAKE2B b42c56937b5f9709ce05125ab9358012f4132a4
 DIST zeitwerk-2.1.9.tar.gz 92046 BLAKE2B e4b48c9de3ee575d6b82427211e129478c9839d5716472896f2d6056ba42b7aaf861e644f92329af5034d92092bf02789f04cf6e5d6390151601eb138d7dfa58 SHA512 15de54c5e5b4042e99109707240627aaf5b76f4bf21a1a94d1230c1973404fdeecdc5f64ab16f75158608f64865ff8cc55f4841091c76e2731cc274b0109f677
 EBUILD zeitwerk-1.4.3.ebuild 830 BLAKE2B 7b8d3fa7f20752b2e0caf92e9e63ed1f50ad4e759092d20da1e9d1f4cb8389fba1160b533e21d0b46773152224e2cf69e54488357918353c1fc4bfad6843ba74 SHA512 98529f550a67c791df72a0126a9aaf10d11f1ea427540b4551fa02ad0b4a4ff11c6de51fc25b3d95037cda90896528fcce2634960d931a22f48d0e0481be5004
 EBUILD zeitwerk-2.1.8.ebuild 830 BLAKE2B ba7c5aace8be32a1d330a19c4e0b4458d0f3cdda769e89f8b290f76ed1f57bc2c962ab97012307572525a6ebe6b330dee772eef745264bef7e9a4ecb805e234b SHA512 9ab9e0f901b70ee27dc3a0af1cb70f0ac3160fae9bbbae76f82e928ba84c35c4901679ad685cbc753860152eed33207285f740bcf35a1483bd58e222aa185527
-EBUILD zeitwerk-2.1.9.ebuild 830 BLAKE2B ba7c5aace8be32a1d330a19c4e0b4458d0f3cdda769e89f8b290f76ed1f57bc2c962ab97012307572525a6ebe6b330dee772eef745264bef7e9a4ecb805e234b SHA512 9ab9e0f901b70ee27dc3a0af1cb70f0ac3160fae9bbbae76f82e928ba84c35c4901679ad685cbc753860152eed33207285f740bcf35a1483bd58e222aa185527
+EBUILD zeitwerk-2.1.9.ebuild 837 BLAKE2B 7bf9be7188378641b5f9ffef97468f191fd9866f072fba72d9a41b2907c99543ec22a74feb4f838e1e88d74f220e250d33c01f64054f01d42c73bf0c4e288333 SHA512 7e7d2a4641806a5f28a4d2d76c0114abc41a3a12e8b2b0f34935aea53cff835e524e498c8d26145fcfc1b77f8f7bc90a116516a6a81ef3a02be44bf17807aadb
 MISC metadata.xml 640 BLAKE2B cdf101dca54d96dc5ce6713aecadb42050e945341cb19ff14088a258384259e5dc4d1668e2a8b161d787d21f79cd8a7c8cbdb47c10997e6ecc3b2ce7ec41497c SHA512 50b6eacea9ea202e3ff44b18046b5db26c5d4ed381664af46f9fecfdedcd69cb470fcc35010a747a21dbaebe1a8360b2f37d43aa22fbba31666704cdd9f39a48
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild
index e3f56d54a1b1..6ba2e45be88b 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index fa901445289e..d158091aee25 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tkTheme/Manifest b/dev-tcltk/tkTheme/Manifest
index 63d5965ae21b..644552530b91 100644
--- a/dev-tcltk/tkTheme/Manifest
+++ b/dev-tcltk/tkTheme/Manifest
@@ -1,6 +1,6 @@
 AUX 1.0-Makefile.in.diff 1072 BLAKE2B 35d998bbf96f7cad05460e37d10e1b77581463839d19311170d77444a9d44c0b9892be78d045f39ac6d61d78262ea82b4631b3d779f1d32c2616d07191477b10 SHA512 eb8e7af60adca22d34cd12dd53ad433d41638bece12e2553555954bd7dd8a762de7053417f69517d1ae30e55c89ac59923b287e3cd2cc419d49695bbb5af6d88
 AUX 1.0-cflags.patch 471 BLAKE2B 85b5dd5cc67b95eeff7289f87249353175fb411069d816ab2ccb19e570246f992bc6103f4852ae6215c4aa17a03084f14c838e1367dcd6c3cfd02f234d40e1d3 SHA512 c32ea520bc4e7cc0d5d2b88ac1f980b16a3f1f154a04a2335084df3aa8c558b0460f924ae6ca54c8cfb1aeb305ae7a4fed3caf066f90725447e055ed2a63dd08
 AUX 1.0-configure.diff 289 BLAKE2B e2678f5a1bb12bf2bb61ff1412ad87af2e683dbf08882e5b2bbfd709be615665ccaf138260a9f136be5ef01ddba0c3f6193b3aa51e9e25f4d3efc182464b7c6b SHA512 710fa8a002f8347f79c56eff146b476a589f4ec7d457324dff86afa398df3c064cd1e053e5cc1ddad92a5252515051b88ba136174c6c5889a654d1649629ac8d
-DIST tkTheme.tgz 335061 BLAKE2B 3a1b3bd7e82f75c5d0566317d268df5a3215e738e67ca5bf1e575abe31f3de5718a5280f3de03067c94b1469f6e1f38691515dadfbac9b3a6cb9e9dee23e1878 SHA512 71988f5a627582092d30f8d825f4e9e60f11c116e40b90bf4d669cad8146d7130e27ca0f83b0650ca7f225016849242815be27e247c8917f892a16447ed40d7c
-EBUILD tkTheme-1.0-r2.ebuild 1032 BLAKE2B fa0d091df6b5db5ab6b9420eff42545cee66eb2936251ecb2f56c47e0a6d2fa56541b9cc968e403b22ea0c265a3dce9d5269a4d919745ecea93055bdeaf521bb SHA512 57e3f73e4223988caeeba2404e89afcb15bc83f6008b8f29c8c58565b2094eb73cb05716de1a7f92554b843b2869f83f09a89857e28bb5d730a95b188253a395
+DIST tkTheme-1.0.tgz 335061 BLAKE2B 3a1b3bd7e82f75c5d0566317d268df5a3215e738e67ca5bf1e575abe31f3de5718a5280f3de03067c94b1469f6e1f38691515dadfbac9b3a6cb9e9dee23e1878 SHA512 71988f5a627582092d30f8d825f4e9e60f11c116e40b90bf4d669cad8146d7130e27ca0f83b0650ca7f225016849242815be27e247c8917f892a16447ed40d7c
+EBUILD tkTheme-1.0-r2.ebuild 1008 BLAKE2B 08f11ab34862109527d01c7c0df88986aaffbb114976e9e43636606ff8956f918ff5122e796c522dbc0254107889d421a1cfea7bc14112c93b0045972fcac300 SHA512 9823345781c26d442df191a6cbf5d8db9019715bb254e4dc790543d4e9fb65942db86f73a7d309031879a89a52b4b17576edecd47d4fa7c785fa4376d180de39
 MISC metadata.xml 253 BLAKE2B 19a7f4e84d1def1f97bb3b985a4959704c25d31ff2b1b7e6527ec6867d68dc2a6b15c0399935a8311789c4fac61136dcfdebaf7c113f296ec50c9523597a74db SHA512 9881e4487c9512c1b72ff2fa72a45b82ef3bf4ade0ec982aea1222f629367ac784ef922b839224add5829cba1717a25d49c31c1481610a02658d0bb265d4eaf6
diff --git a/dev-tcltk/tkTheme/tkTheme-1.0-r2.ebuild b/dev-tcltk/tkTheme/tkTheme-1.0-r2.ebuild
index 496c8d524646..234dcde10500 100644
--- a/dev-tcltk/tkTheme/tkTheme-1.0-r2.ebuild
+++ b/dev-tcltk/tkTheme/tkTheme-1.0-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=4
@@ -7,7 +7,7 @@ inherit autotools-utils  eutils toolchain-funcs
 
 DESCRIPTION="Tcl/Tk Theming library"
 HOMEPAGE="http://www.xmission.com/~georgeps/Tk_Theme/other/"
-SRC_URI="http://www.xmission.com/~georgeps/Tk_Theme/other/${PN}.tgz"
+SRC_URI="mirror://gentoo/${PN}.tgz -> ${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 9d604313700f..98f8dd4ab22f 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/lgrind/Manifest b/dev-tex/lgrind/Manifest
index 24f0d3e1b2bc..ed6fe12a9101 100644
--- a/dev-tex/lgrind/Manifest
+++ b/dev-tex/lgrind/Manifest
@@ -1,4 +1,4 @@
 AUX lgrind-3.67-fgets.patch 530 BLAKE2B 4865cc198841f075af91d76aab3f5fa4771bc21ea909bd4288a456b9a0d0a3d08800a92c546d93c02631930e43375411302a2bb844f1bde2ae7c81c0ced87f9a SHA512 cb16d6e43240be974e5833618f8539e9155f70f7c0f47c83124e79de71cbe9545bfefcb0078c8c6017b27f1aef709957cbdaeae2995bf66a2cc6bb93fe1a8a32
-DIST lgrind.tar.gz 73205 BLAKE2B f19c5ed96251a4c9e5b8ec2cc2115a2b3581c067c26468dc80bfbeece1cb40f72964d60115221c52ab6c0067d670d6497c26eabc3743573248c77e63df24d416 SHA512 89dffec60b6cbac82e9633690412961cb619d6d86d39bea2fb6f3026e1317eb00494d7ed68865a943b1872346eaecdc1b8502de41517023a47309e1e803da2c6
-EBUILD lgrind-3.67-r3.ebuild 1113 BLAKE2B 91733f2fcd2edfce9ce9c5e3e1dd0d20fb5ee46fd74ad9be7bd3a11def5b4eb73e23b5960cf2ba4c5ba8029f7519cd0cdb2203b24ac2f7e80450333456b715fe SHA512 b82175587cf982067b7e03f404dbdd74b6a50f80fdc59d62a7ce59856c96ada97ce902dd497758fdeb3f6b7fb5e4b64b4328cf13ab5f1a2db43095187b62b468
+DIST lgrind-3.67.tgz 73205 BLAKE2B f19c5ed96251a4c9e5b8ec2cc2115a2b3581c067c26468dc80bfbeece1cb40f72964d60115221c52ab6c0067d670d6497c26eabc3743573248c77e63df24d416 SHA512 89dffec60b6cbac82e9633690412961cb619d6d86d39bea2fb6f3026e1317eb00494d7ed68865a943b1872346eaecdc1b8502de41517023a47309e1e803da2c6
+EBUILD lgrind-3.67-r3.ebuild 1134 BLAKE2B d90289902ef80b2e88a07e27552d515c35a7328a6dc2a0c9a831527e060e1f2506f634a27ce6959d075be3c2c54dca369ff0d1f605e66a5615135847208343d3 SHA512 3eb6ec682784a32ffbe1895bb745bf91db08a85950a4604c84f4ee92ae8b10354f841882b923bf5590448e1dc7c2c253141cd9c717e8f82d480d0ea7fcc4da2a
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/lgrind/lgrind-3.67-r3.ebuild b/dev-tex/lgrind/lgrind-3.67-r3.ebuild
index fa373590f4b7..7c92be12ec1b 100644
--- a/dev-tex/lgrind/lgrind-3.67-r3.ebuild
+++ b/dev-tex/lgrind/lgrind-3.67-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=0
@@ -6,7 +6,7 @@ EAPI=0
 inherit latex-package toolchain-funcs eutils
 
 DESCRIPTION="A pretty printer for various programming languages with tex output."
-SRC_URI="mirror://gentoo/${PN}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tgz"
 
 LICENSE="BSD LGrind-Jacobson"
 SLOT="0"
diff --git a/dev-tex/oesch/Manifest b/dev-tex/oesch/Manifest
deleted file mode 100644
index bfedb042a4ff..000000000000
--- a/dev-tex/oesch/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST oesch-20080712.zip 23245 BLAKE2B 324fd5e3502f27a3f2e557ac977e4d93145773e8521118ccbee9c03d716ebfad5be66b14ed931a6f2a7bb8d9a08046c7ee0793a23313685bbc9ff2c88fbeb7ca SHA512 8cb2beae77abaa32be881e5d4acef3fbec9d08750d87b2af826f3e1340f323e5d199af5788c1c6aa8d8924caaf1ed0ebb74a4ef4d59c4526f9c5946208362ac5
-EBUILD oesch-20080712.ebuild 912 BLAKE2B 848c30cde0a0ae1e08eef297ed3ec01203358363fdc547b20ec6339f510814d99ed3a64a7f462830c2e9765e1b73dac9392f754eeee160ccd60a9b911f034efe SHA512 8b20bf93edbb3945b9261cde25742e9591177c424dd5e2a77508ff1cb0bb617aeefee80a4f52850ddf9e0554598c99c4fddceb104c60d93c3d2c19ea409261ee
-MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/oesch/metadata.xml b/dev-tex/oesch/metadata.xml
deleted file mode 100644
index 13170c3184d8..000000000000
--- a/dev-tex/oesch/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-tex/oesch/oesch-20080712.ebuild b/dev-tex/oesch/oesch-20080712.ebuild
deleted file mode 100644
index 278c8219c245..000000000000
--- a/dev-tex/oesch/oesch-20080712.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit latex-package
-
-DESCRIPTION="Metafont font used in Austrian schools for hand writing"
-HOMEPAGE="http://www.ctan.org/tex-archive/fonts/oesch/"
-# taken from http://www.ctan.org/tex-archive/fonts/oesch.zip
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~x86-fbsd"
-IUSE="examples"
-
-RDEPEND="!<dev-texlive/texlive-fontsextra-2007-r1"
-DEPEND="${RDEPEND}
-	dev-texlive/texlive-langgerman
-	app-arch/unzip"
-
-TEXMF="/usr/share/texmf-site"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	export VARTEXFONTS="${T}/fonts"
-	latex-package_src_install
-	insinto "${TEXMF}/fonts/source/public"
-	doins *.mf || die "failed to install metafont sources"
-	dodoc README LIESMICH
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins *.tex || die "failed to install examples"
-	fi
-}
diff --git a/dev-tex/pgf/Manifest b/dev-tex/pgf/Manifest
index 5cb9b33b3470..16fe2dd9749c 100644
--- a/dev-tex/pgf/Manifest
+++ b/dev-tex/pgf/Manifest
@@ -1,8 +1,10 @@
 AUX pgfsys-luatex.def 13997 BLAKE2B 4d682ac413f03fc2c5f4bb27ffd367af121da27ba14631b1d9a30a3b80181178fa84e07a331efb2b46a0c04749c3f7ac56527b3c65259da7ca2a32a2fde4b294 SHA512 cb946ce0a946048acb03d45452c155a81d82a86cd4673ee70a07ff1e6553aa45be6d56e38cfd51988b095c540e8a3e1ff113958f6eae5255ac9dba8c46b6161d
 DIST pgf-3.1.4-pgfmanual.pdf 10376398 BLAKE2B 4e45a0d69000d1f89a995f3e5e9295b82a79af5cfd5863aba4f1fd9c3b40d05f2f07b6fc2b34a933136448728aea3dfacc4943fd013896cd4cfe52c9dc8aa3c3 SHA512 a2b934d6e9836fce0a731d238b713ebdc3764e8aa76ea4c7fd54c88f59f31fe17f8c306b6a381adc73becb410e0c6350427112e5d46ae762665fc73fcdca54a0
+DIST pgf-3.1.4-revisioned.tex.xz 244 BLAKE2B 088da7d921dcce118af216fefbedcdde5d3359cdb044d67ec51cd8a595c21aa4d314b33bc49bcd04387e5af1230f7244b136e2bca8fd83a01ee2d264dc89fad5 SHA512 690e3233052c81384b69bae5504c5b5ea1053aaba6444674d3aad7a550f66f4e326c413decf482d7435e7273e9a3a1fddc64ff1946bca0c92e93b8fd66f3f09d
 DIST pgf-3.1.4.tar.gz 2426346 BLAKE2B 44d1c709774586b4de81def3d4e7133d147e9e3c1b69078789c8f62378b97a6fc6cfbd580a5f1d292190282dbec5ca4f080d4567b2e1fa526909f08e07169547 SHA512 472ffca8f465bfb5f98cbe0880887afc5b9043bfc878aa8f64a79970502546cc3e0901010b8662aa582af9bc4a90b622ade828c075396542a1e2ee7af694181c
 DIST pgf-3.1.4b-pgfmanual.pdf 10371181 BLAKE2B c619e56fd184fea8761175efed7130b37b10f719e04e87b40448a0a72641f2b7c6be0270ae0c2386d91caf06d9cd46f8eb3eb9293d8ff46d8f4a8400662cc1d8 SHA512 f18e836774b8ad8d7a2adb1c876e529240907b9a9c695ab6366d4bc321766106ced3085dc0d17394d6c19654a2232e10d782e93152c075f7915ffb2f0e09b680
+DIST pgf-3.1.4b-revisioned.xz 244 BLAKE2B b394702704aa5b16549df795bc4cf04e5a81839a7694a1773dee89f4db66a286a276e48bf080f82e4fe3e55e3a6bf3983394ed84a83a372becc5b8f0738162a7 SHA512 4f5ca04317e58a191eaf7225fdd9a2ff70ad80d601951be98870f77da598ba559b464e2bd0ca4f03cf54c0ccd536925deb8bd6061b9464b36a883727ae85dc40
 DIST pgf-3.1.4b.tar.gz 2426541 BLAKE2B 91f1b0ea1f2f3526da6a57cd2deec76b49b4204047b9dcdbeb064db48357055324ffe83bb5bd09dd8931a9c8e8768305a72b82ec77257e20badc543a5ca803b8 SHA512 4ba8d9c70d573ff69128d41b20525badf3a3bd0bbbf76ef3c2f2e54ccc05bc0bf1da1f20102df04f8188fe1733d469965228445e6c4af0611c2aa5737ed72180
-EBUILD pgf-3.1.4.ebuild 1219 BLAKE2B 3b1368900d5d6a6df35bc2d3e1bd71540123cc5276de42b18c532d80ddb77afb330d2fb8a93163a863c3a76eddd028a26c435a7dd0494a1e5a8ae6a13f50d50e SHA512 5ca81d104f6c3c9aa3c34f13e5a69dca6814a98ffaf7e6348b5b5dbc8476994c5dcba8184e4a4dea22ff8a22a175f03b119709d3d54a81fdd9e82499dadf6092
-EBUILD pgf-3.1.4b.ebuild 1230 BLAKE2B 7b1e0891ac100177a75a71e1985c20a7ef9bfd100649e5acecca06586d1e4fd8d649c1be9c6bed3076cac7bdfdd2826a9fb71b18068fb4ff6acac49716b1b895 SHA512 c6db4fa004aa0b074fc7fe614c05f472a70dbbeecaa3135da171bd16ff8896928df69b46c6b67a676201e0d74c5f862297809ab068c8c530e14c28c7e5b8837d
+EBUILD pgf-3.1.4-r1.ebuild 1399 BLAKE2B 181a2cf4c76612f673d86eb9ef5a031ab7c12816e2af2ff188cdcf33abe265b7a74081f59c6cd8002a2c4bcc9a31371e8266458bd4a398fee6a08180e9c5404e SHA512 73ec6080c545955bbf53e96131aaf8332414a29de76462d61509130d28a55201d030f512efd826abfa405d6535098bff008527e8af20c992844f9b5b3fb98f9e
+EBUILD pgf-3.1.4b-r1.ebuild 1402 BLAKE2B 7d586be1ffa8be8b31bcb70dffd32c817b98983ae5891892b1fa83993976f03ec66b18883149c4784ea6c94748b3c0cd2f93968da558496cbd9dfe72ee19116c SHA512 22681edea8717eb72a488d66ef3d363512f51aa6218f00142b83412735ccc324972a98e91f131c9d34eb670c58342075164dd3376d9ded1f866974feb5ee8978
 MISC metadata.xml 322 BLAKE2B 1c28b0fcafac554548ea1862a338974f28c5d6b62745847627ffdba18494551b1fbc596c2e155787e5fc0b3410814a284f1792ee8fbb241cbae774c140a1d00a SHA512 09860d1821637bfc17aef0aae7b14913af3b5171c95a3a9edf7ab00a3b006e5335cd1d7770953a3d4956f7b876cd990affbad468b0a24d9290c69b5e1ef95ae4
diff --git a/dev-tex/pgf/pgf-3.1.4-r1.ebuild b/dev-tex/pgf/pgf-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..1523846f629b
--- /dev/null
+++ b/dev-tex/pgf/pgf-3.1.4-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package
+
+DESCRIPTION="The TeX Portable Graphic Format"
+HOMEPAGE="https://github.com/pgf-tikz/pgf"
+SRC_URI=" https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}-revisioned.tex.xz
+	doc? ( https://github.com/pgf-tikz/pgf/releases/download/${PV}/pgfmanual.pdf -> ${P}-pgfmanual.pdf )"
+
+LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc source"
+
+RDEPEND="dev-texlive/texlive-latexrecommended
+	dev-tex/xcolor"
+
+src_install() {
+	insinto "${TEXMF}"
+	doins -r tex
+	insinto "${TEXMF}"/tex/generic/${PN}
+	newins "${WORKDIR}"/${P}-revisioned.tex pgf.revision.tex
+
+	if use source ; then
+		doins -r source
+	fi
+
+	cd "${S}/doc/generic/pgf" || die
+	dodoc AUTHORS ChangeLog README
+	if use doc; then
+		insinto /usr/share/doc/${PF}/texdoc
+		# pgfmanual is now split from the main tar archive
+		newdoc "${DISTDIR}/${P}-pgfmanual.pdf" pgfmanual.pdf
+		doins -r images macros text-en version-*
+
+		dosym "/usr/share/doc/${PF}/texdoc" "${TEXMF}/doc/latex/${PN}"
+		docompress -x "/usr/share/doc/${PF}/texdoc/"
+	fi
+}
diff --git a/dev-tex/pgf/pgf-3.1.4.ebuild b/dev-tex/pgf/pgf-3.1.4.ebuild
deleted file mode 100644
index a8ea44db8ec0..000000000000
--- a/dev-tex/pgf/pgf-3.1.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package
-
-DESCRIPTION="The TeX Portable Graphic Format"
-HOMEPAGE="https://github.com/pgf-tikz/pgf"
-SRC_URI=" https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( https://github.com/pgf-tikz/pgf/releases/download/${PV}/pgfmanual.pdf -> ${P}-pgfmanual.pdf )"
-
-LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-RDEPEND="dev-texlive/texlive-latexrecommended
-	dev-tex/xcolor"
-
-src_install() {
-	insinto "${TEXMF}"
-	doins -r tex
-
-	if use source ; then
-		doins -r source
-	fi
-
-	cd "${S}/doc/generic/pgf" || die
-	dodoc AUTHORS ChangeLog README
-	if use doc; then
-		insinto /usr/share/doc/${PF}/texdoc
-		# pgfmanual is now split from the main tar archive
-		newdoc "${DISTDIR}/${P}-pgfmanual.pdf" pgfmanual.pdf
-		doins -r images macros text-en version-*
-
-		dosym "/usr/share/doc/${PF}/texdoc" "${TEXMF}/doc/latex/${PN}"
-		docompress -x "/usr/share/doc/${PF}/texdoc/"
-	fi
-}
diff --git a/dev-tex/pgf/pgf-3.1.4b-r1.ebuild b/dev-tex/pgf/pgf-3.1.4b-r1.ebuild
new file mode 100644
index 000000000000..34329e0d138a
--- /dev/null
+++ b/dev-tex/pgf/pgf-3.1.4b-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package
+
+DESCRIPTION="The TeX Portable Graphic Format"
+HOMEPAGE="https://github.com/pgf-tikz/pgf"
+SRC_URI=" https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}-revisioned.xz
+	doc? ( https://github.com/pgf-tikz/pgf/releases/download/${PV}/pgfmanual.pdf -> ${P}-pgfmanual.pdf )"
+
+LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc source"
+
+RDEPEND="dev-texlive/texlive-latexrecommended
+	dev-tex/xcolor"
+
+src_install() {
+	insinto "${TEXMF}"
+	doins -r tex
+	insinto "${TEXMF}"/tex/generic/${PN}
+	newins "${WORKDIR}"/${P}-revisioned pgf.revision.tex
+
+	if use source ; then
+		doins -r source
+	fi
+
+	cd "${S}/doc/generic/pgf" || die
+	dodoc AUTHORS ChangeLog README
+	if use doc; then
+		insinto /usr/share/doc/${PF}/texdoc
+		# pgfmanual is now split from the main tar archive
+		newdoc "${DISTDIR}/${P}-pgfmanual.pdf" pgfmanual.pdf
+		doins -r images macros text-en version-*
+
+		dosym "/usr/share/doc/${PF}/texdoc" "${TEXMF}/doc/latex/${PN}"
+		docompress -x "/usr/share/doc/${PF}/texdoc/"
+	fi
+}
diff --git a/dev-tex/pgf/pgf-3.1.4b.ebuild b/dev-tex/pgf/pgf-3.1.4b.ebuild
deleted file mode 100644
index b34e9dfc0947..000000000000
--- a/dev-tex/pgf/pgf-3.1.4b.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package
-
-DESCRIPTION="The TeX Portable Graphic Format"
-HOMEPAGE="https://github.com/pgf-tikz/pgf"
-SRC_URI=" https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( https://github.com/pgf-tikz/pgf/releases/download/${PV}/pgfmanual.pdf -> ${P}-pgfmanual.pdf )"
-
-LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-RDEPEND="dev-texlive/texlive-latexrecommended
-	dev-tex/xcolor"
-
-src_install() {
-	insinto "${TEXMF}"
-	doins -r tex
-
-	if use source ; then
-		doins -r source
-	fi
-
-	cd "${S}/doc/generic/pgf" || die
-	dodoc AUTHORS ChangeLog README
-	if use doc; then
-		insinto /usr/share/doc/${PF}/texdoc
-		# pgfmanual is now split from the main tar archive
-		newdoc "${DISTDIR}/${P}-pgfmanual.pdf" pgfmanual.pdf
-		doins -r images macros text-en version-*
-
-		dosym "/usr/share/doc/${PF}/texdoc" "${TEXMF}/doc/latex/${PN}"
-		docompress -x "/usr/share/doc/${PF}/texdoc/"
-	fi
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c1a5aa6e4d53..2446726c7e8b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 13f5d39e0fa7..7911431e6c50 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,6 @@
 DIST catalyst-3.0.5.tar.bz2 873286 BLAKE2B c4cafccb0dcee19d6b0dd30e57c99da81b3485342b6d5405cdbe2e2b59a4631f3223e7d13c5041783a7172361b4a1b69ee5ff68e29ee8bec2f76165acdc5686c SHA512 35cc16391100394f97af4cdfd14f9de2ab4532c97c213f43dd0be927766dc3892768be5aa899fc8919414743c9ea63b4489a2690437b3e7985951eb68c19d0a4
-EBUILD catalyst-3.0.5.ebuild 1899 BLAKE2B 4de4d9971e7420b86257f67037ede0afdfd0a531cc1c59a588f8daeca00b624436ca650cda73b1bf6732e096b8b481bd6b8ce1e5d94a73029771058ec90a42de SHA512 771e7a8960f9783a8ac9a36a00187f10871cc3b3ac413bb4162277a29a6a086b1ae1315814f122c6072d39d8be0ca7cc54dbd2abe792a0f21a35f3733bc29cbe
-EBUILD catalyst-9999.ebuild 1911 BLAKE2B 5efac1e33f57d80c79510e6a5110c631464c197d926ee8b4362f8f36b5bd2fca844c26ac3aeb939d33154eb0007bcda2238177862312ade31a5042026995fff1 SHA512 984489ead5a1707b52c7f693aa727de8a7f8f0c79c0657d5faec883b74cb36af5e9c974556785440881e10d8e7aaa2248e1e429a42353f34a3a637874c906d61
+DIST catalyst-3.0.6.tar.bz2 873468 BLAKE2B 146228e6a8eca293a93ab50661b1a3852fe587036d2d2ff9fde132ccb1f0642cbdd4332a13f912927ef8e7c5d8dea5bb738aa3327b559e18c7d31308a289a7fc SHA512 01de8405f48c698366cbb675e75ecbe6cfb5a7236d5b5a0f1f9bc6200b07c728fca41925b34177019b207d8ef2c1b688306a37b1571a7fd91138d31e81758bce
+EBUILD catalyst-3.0.5.ebuild 1895 BLAKE2B f4663a60dc96ca4073824942212dd667835590cec1c438de659e6251655411155bde2855c7fb47517366e04bd7ac50a0070578e1783b99c9602dfd84a917ac9e SHA512 771b85e3640689425a709c7cbd69bf81db2d42b49b6178592adec4107e803191eb1fb7e4fee8e25bb82728ecd95b55d2737631409298a4a410d7ac0789e146fe
+EBUILD catalyst-3.0.6.ebuild 1906 BLAKE2B 13c1e83fb4fabc66644fa5b82fc359866349a4864f1b4e3043ce344812a7d9828bc5bea5734582b34e34fff5cbe067591bd1a5cc7de9f1642701186c20091eff SHA512 79542ae9b5ffef341570dd5b0460f85692cf05c785a5dc97b26922f3139494f97e1d0b8f55ea2ed530df01b0e0d70aaeaaedf65898600da49948b4389f43d175
+EBUILD catalyst-9999.ebuild 1907 BLAKE2B 997e4453538efdf5bb87d27f5cca2b47025d211d7a3e3b1e8e8e5f66c19c12c06a9cefe55516327be248812b5a1df29026c29cbc0769f6620e06da3cea67a0eb SHA512 d90667ec0e6d1d9d4ad25dd00c8ae8a040e843af0de43cfd5edc1e23d4c8b654e6ccbf31209def8971688e47483700d8ec0d7eff08659079a2f964294ace968b
 MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25
diff --git a/dev-util/catalyst/catalyst-3.0.5.ebuild b/dev-util/catalyst/catalyst-3.0.5.ebuild
index 0ca5875c8c60..8369b04fcc0d 100644
--- a/dev-util/catalyst/catalyst-3.0.5.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.5.ebuild
@@ -12,7 +12,7 @@ else
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 
diff --git a/dev-util/catalyst/catalyst-3.0.6.ebuild b/dev-util/catalyst/catalyst-3.0.6.ebuild
new file mode 100644
index 000000000000..15c75f926c40
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache doc +iso kernel_linux system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	iso? ( virtual/cdrtools )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+				sys-boot/grub:2
+				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+				x86? ( sys-boot/grub[grub_platforms_efi-32] )
+				sys-boot/syslinux
+				sys-boot/shim )"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 8126cc048190..25b4d5dcd3c9 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 5a2609ac1961..3308207364ee 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -12,6 +12,7 @@ DIST cbindgen-0.7.1.crate 90623 BLAKE2B 4fa7e82ee15b89a7de678eedb6ff95c3ca36376a
 DIST cbindgen-0.8.2.crate 98747 BLAKE2B b400fa5df818760a48483883eae959de04433d1ec2d5f67bdba5c065e6bebc4f21424badd8c7598ad4aca5e1205230e79528ad9d0e1e736c2dd00745abdd058c SHA512 e4e6079170ba396f753603cd58c2a8c252e216e129cea6a0c4d82b399aea78f569d80345dbe69af509aadf207790b4d00b8f2edf500b36d54d9c095a65b9e792
 DIST cbindgen-0.8.7.crate 107774 BLAKE2B 55548bfe721ba049231318712ae392f49fcef98d328ad73a9d7af41df7c209dec1d4fcfbe0c4fe5d03abb9e14db961bfee25df79113c6f585eb5e15127161eea SHA512 0238fa87100f1792cbb2b2c977bdc13a9a8a3e916f841ee112f69335a8ecb2a9fc99d3a0ce5eda16c9eead7ccbe8e7b3b8248d4ceaa218bbea0ac9a6a20e805d
 DIST cbindgen-0.9.0.crate 125723 BLAKE2B d3eacaf7715dc7528d98c8356dc797d25a2617ef1561e0cfa7e63cbe378929243da25ffc78101d29fffbbf4e50c8008bac18b855d2a0af3ff9fc22a3b0dd18ab SHA512 134a748ec781dde54d7810d6f5f98a5a84784d4acdd13a4c13eb4ae67fc278ccd2b123eea56461a124e7aa17b99e0a5a20f39f06286ce259e6e3eb24c43f29ae
+DIST cbindgen-0.9.1.crate 129676 BLAKE2B 12315522938e941c4a53033f276f6065d6e19ba7cab3ce8aabb17b2ae5fe0c7231e51be33828434d6ca039d79c9414fe8d310a12b07ef1c544ed9b5d8cee74c6 SHA512 0e32563db42363dc82e8aca2f36bdafcdf0ec9156e7238937295c9369d306c2bfa590ea7a9afd61d8b915fc383bb7af8bbb78cde71f6ab30b0c576262c74232b
 DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
@@ -36,10 +37,12 @@ DIST proc-macro2-0.3.8.crate 24412 BLAKE2B 42895039c67122199619256b567ea66f6e0b6
 DIST proc-macro2-0.4.25.crate 31557 BLAKE2B df36d9c0f4e020d289341ec9e26cc3b4c8a5a5221e936834bdc707426e02c675ca38d6cc5dfee1a42f501619bf00a7cbc2dbd140ac523d1e99f47574ece76ff2 SHA512 e6bf37c4b990a3cc1629171c812ff145db35f1d179a40c4204857766ec4a517a7cc4342decc63026c6b891e0ff321b5fa8b5242459b6f80a9358572afc2650e1
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
 DIST proc-macro2-0.4.4.crate 28564 BLAKE2B 56935ff3b80d9c94f198a253de77fd7c8650ec75e62df100114bbeee633941570e4525a5dabfc92c370a8770be375d1ae0a83ecc09df10c4cfad2adc55ad501f SHA512 13b74a69277bd7674554414039e79dd0ae14f6e998a46e6e587cc17b6f2c97a6dbcbc459c827888510e5aff3b79d48b11f840bc21a28ff16c0eee8a51b784a86
+DIST proc-macro2-1.0.0.crate 34625 BLAKE2B c27040190bb06af8135c0fd85fc285abc3a672e629b43968573a95966ce8beb09b93dc9076e4e78da2434a2803b33c695f71ab6df07c7030432f9863d87ddfa7 SHA512 8b70b107ee0445eacae9a3f35b5c02649cbcc41550fdf109a4bf3248eab20568ad016ccde2274b406a4631605b8414d208187f5fd0090baa182df8aeb68a2727
 DIST quote-0.5.2.crate 14982 BLAKE2B 5600742b8da27015c0a461c04414dd61be208cad10a3a1212e43d7a2aa3a8fde947b700ca230f79d9d8c13da1742a7caf70810d4b6ebd6669b020513be00974c SHA512 66c0469bf1970164e87a4960791932ca06726c79bc522fe0bdfbd41ed23428e32448aa01a0f02066169c165364465eacbd19cdde47e96b4dba017a491842e6ac
 DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
 DIST quote-0.6.12.crate 17541 BLAKE2B 0d09f5075358c8c7cee6503c55ad489a2ed4efa31dd0bb47c77a01b7bcb3ab4319cdcedaf5799cd25738c8f6a9f6256f91e509b60eb18ba99664693efbe45afc SHA512 5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798
 DIST quote-0.6.3.crate 14154 BLAKE2B 16a31875577eefec9568e3b990ed17b0afa5af6ec936f0b8d1f05303b7e1dae1737677a86089a048cf51b602c71f4b3c7802ee40fb9caadf2e13fc0e6df134a8 SHA512 f2ff3cd617c69007c4f60961728c73a7ac7a2eaeb1d6da51218d2fbc9e85c06baeaccc9b82771a304bace04024479a192b88336546f96e17c6446ba85df94a10
+DIST quote-1.0.0.crate 23089 BLAKE2B 89bd0a0857da2c261f529ffce512ac55bcddc3d6aea7ec039a009df045709a15667e9f4869daa1187e1859eb489ee32302bdea1a0ca8010267ae7e892698f7dc SHA512 64db0b1690beb4f0a81dd77ccdf8e3f61b523674802ac657f0849b7ae653d8de41f279e55eb22c5f6080fc9787845cc6470b5486b35c3a0f44f019185db542e0
 DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
 DIST rand-0.6.4.crate 116260 BLAKE2B e16bde25b7493b0f77b897efb9281e31ff17636d0ce5c9c4bce47fd5cec79e6bd889880f371591f6eed9163ef49934ef4389c95d6a673172dc0f27c09e6abf1e SHA512 2b98ba7edce4b48833ca5d8c9cda25beb9f73fd22adb997afdfb10d5c59e9240537baebc2e7de1e0094716009f7fe2b657d1f4dcb4c778e492e49483a7e3ce8b
 DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
@@ -74,6 +77,7 @@ DIST serde-1.0.93.crate 71702 BLAKE2B 3f6802999b67c660b602f0c05606b0853158bba16d
 DIST serde_derive-1.0.58.crate 45146 BLAKE2B 69b230d33072d7d7e9ae17f62872560a4b919436b6e33111827597c06b380e0e43d02fa4ffafa9ed8128d008bf065165e876090c4652827ffc3dc1603a5db8a8 SHA512 6eaa57861ede4b9bbc1e0bfc561917afaa133613c4279fddc17529c291f0fb1122e0443267de9498ddd4e45ca9d13e38d88aef00864b0505a05e06ca65bb8d80
 DIST serde_derive-1.0.84.crate 47924 BLAKE2B bdc22e69da0b1c725a74966b1eb31e13475a479534e830bb1440f980e9462dc9c746470ac87e3653b171717c2e241d3005dbcd562abed7fa1f7949d36fe4c3ab SHA512 817ab7d764ef1f7781f0f01627b3c2c96797f64ce62830ec7c520e94db05b6b7efa4589a394f5375ee30cb85af6bd7a17c50b51e77d4d927ccb247c87c16b2f3
 DIST serde_derive-1.0.93.crate 48827 BLAKE2B 7e6e2a3b2c91c77882658b4f194f05e120d47a3b27a964ebee093c15009d5932184b8afef68b5c5bd2d839e76ec0ab0c44e5ed7e39f99b4c2330eb2a49f4a793 SHA512 e9ba64c934eab1c2091697d36338ea6c47d0409b0097c87376fa6b05de21391aeb228e52b1c846894c37aee44550f4059c3ee9f58840d79d4ef5be4c61293f2b
+DIST serde_derive-1.0.99.crate 49786 BLAKE2B 1a8502b8c22053c54cae207dd283402a85a7eec630883de36df85d46bed4519d04c3b82baf660d4863324a3db9875ae62b9486383596487e9648533e05e685d2 SHA512 6b1b17207fb1e593bafc1162d84c6ced08e799aca9c07c32c399fb3c78662fab920ee35e99ea9462b21515b7c3d35e4e2a457cc0577dada51138f5e8a905dd9e
 DIST serde_json-1.0.19.crate 65039 BLAKE2B 86264040f32b0c94c1d43e55248612ec56b42406cf4501fb3288b80a5ed8a110eae47a1f2b053e2b497c92457c5bfee2ed0b5f86e9dbaabb1bd3953914dd06ec SHA512 03b760d0bfd8a49499107a4b43bb9f588b375c92cb85fd131642bd787734a8523a176dc10330329a3ad8c6d575c917a813fc513a4fb5890c11ade0d48c046165
 DIST serde_json-1.0.36.crate 68203 BLAKE2B ba6088de2f87af1f1685e0d037745ece9c4534043e748321644a111d9829034a7e972882270bc1cb8a78648a848c63e103cd7fad0c4ec618621d7ad9b970350e SHA512 08828b084d0b94c282c3e17a22f8882762f8e006bf41d5fb4a2a720eb3124f7fbd3d5c87b543bd8551813a40108105ff69824a420b4f6836d2bb9fd164100b9c
 DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036
@@ -84,6 +88,7 @@ DIST syn-0.14.1.crate 133459 BLAKE2B 303abdde61afa57594db2b8882c86237f64b15582ea
 DIST syn-0.15.23.crate 145369 BLAKE2B f66939982ee09090f2baf1cc4522615e6975d4350c7c65b3b0a3568cd3b3aef04231f6c23b818333107af784780366cafe7d726f03f346ed227c1db6cca522c1 SHA512 d447ec08199d36e289ea303ee8e871e13e002a4d67c396187ef56eb16b69cf21d64becd24fd8d2f7a1c826685f7b6df747903e7eb8cc5c334ee0528998597128
 DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa
 DIST syn-0.15.38.crate 152593 BLAKE2B 970555dae87016d4440502bad9b45d7be14d390b08ac4916f0ed7a66f24c8e6f58cd7889ef2a3febc77a99671a08c6c1380f622d076341c5e4682a2a3ef3c919 SHA512 e460d6b67e3237e8e88292e2fd170ef16f6b0e30b1c7c11b8177f36c86b083ca1de2727e75f183d2708f6839138aa73865e7944a822c2d85783a79caf3fa2e6c
+DIST syn-1.0.1.crate 189474 BLAKE2B 0d2319f149c9430787e5cf2eca01a93b5b642a1e968ec3f328c3b8e79a2b11e5d16fe9da57fcee8c06d9446f3eec6d7e82705a44ee27006b6e5d4577b8aa1c72 SHA512 10ec59186b0090f4a7302ad9504ab78c0a396ce7087b7e75502f12a1c6ba02700455a7f0910f2abfb45dc0c9b59de112a170772f4da11ac8d094a701bbbe754f
 DIST tempfile-3.0.3.crate 20806 BLAKE2B 0eaabedcb1f68dddafa72a454f82e6b1de6f8cceb8af3cb52f459e8775e3df1ada5b51120ecd9f52bb6f6da3fc3e698da339bc7e39d12497fa9f7efc418b018e SHA512 2bcc90ba3eed8a830b33de169419e222c16f9e0209734cdcf919422fdb504b29fc75f30dff7243bf19eb81cca12c80c94b80a622be8bac7b847242a58595873a
 DIST tempfile-3.0.5.crate 23272 BLAKE2B 17cdc6f157fd246441f66fc46c7fbac8d3718144c69405577f9cfdf14333366330d75e62e033a7c91c2dfbb43700d5e59b96d6b011a26e95afb2f3996809cddc SHA512 f1055454383996de7a79a08f31c85b0d957f277e297a70d85b2faeb6a85e4c12348ca8ba7cae44ec1398d6d02b2d725dbd4eda68a064db66594024b407c6e306
 DIST tempfile-3.0.8.crate 24549 BLAKE2B 839b7637add53e91b232246739b21a60c28bd54704b65da889bc92733fd117d9aa46289c44d94974c9c24d7d532c97a4ad7c64617e1df8bec21671ecd16419e4 SHA512 88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00
@@ -97,6 +102,7 @@ DIST toml-0.4.6.crate 40203 BLAKE2B 7b26566bd7a94cfb7907867d84cf097ad44158fe5908
 DIST toml-0.5.1.crate 51029 BLAKE2B 790097610e420241ded7a4bba3e66a6f7f7856e2e3f4f738e4edd764bbb6b5b3a0cfa10c1e1a9210ef0bb55ff67be47f3bdc129063d135daaa16d731d06fafc4 SHA512 4b8b9212934b8a8bf8f09fc9c63219f3bd8d21a1bc5ec4f4208fa833743951ddb53cb99b5fa27b9b59d2223cc74a7274d6eb196255e44650bb633e24b2529073
 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 unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
@@ -109,4 +115,5 @@ EBUILD cbindgen-0.7.1.ebuild 987 BLAKE2B 91339558e85ad7f8eaa70e3c4889ef7a01ff2df
 EBUILD cbindgen-0.8.2.ebuild 1126 BLAKE2B 8db73faae848c3ca588625c9f86416d053bcec19743dd49b11793a5b12cf67d61b69301ac397ca54d7f53bb1548134ce33c1490c559242e2061c9c24f7efefa6 SHA512 aae96c92797b4159c04ab4ff3dcc5d7363132cf9cefaae5a980b608eb89a587b6dec74353cd265e866f58a2d06af9f12eda22932b7452189214a567893172dfe
 EBUILD cbindgen-0.8.7.ebuild 1126 BLAKE2B e4ba38b90ac624dd8c6c3fa781e45fbcfbd625be3477861d6390ca35821ea9032cbeb5ae06ee5e629cd191480c6f5dd530b9334e731740922b0fdea3109f7164 SHA512 81391a5777d22c6ef923075845cff5999ffc2b36d2bab5d7d79e6f3f7824eaa4d6a9742915e49adf840f38d0807ccd0d60e0049f99810b47addf4996df06a1a1
 EBUILD cbindgen-0.9.0.ebuild 1107 BLAKE2B 52c4bc8a893c828aee841f3cf46e93afa9fda0b0d991055545bfe830966c1a8a3f9541eecbb372235cc1e45073317dd8e6bc80527662b94415db0055e74a9ce5 SHA512 23106fb9ee3553c701235ae596fd890d0ac2bd560a2285677fc70ed4e58fd7a2cebbb4fc3a394a681b03fd9d8f965e0ac325fd1b00a5e224e27a3f5991e69822
+EBUILD cbindgen-0.9.1.ebuild 1103 BLAKE2B 3848211848503eb66a4e030dad7972b3df673ba0d3fb7d2ce4ab210a70b524e788012fd49766162c792e7cf6075ccf867559966d8962099420fa33fb20b2c520 SHA512 948a57870f01fdd83dada957edc7eddcf2fa8fc10c3211aeaea7873cdee5a6a2b87d4fdc5eae333a7c0720e3199c64aa2bbe554c1360998fb36fbe1c2a80d3f2
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.9.1.ebuild b/dev-util/cbindgen/cbindgen-0.9.1.ebuild
new file mode 100644
index 000000000000..0e533c409244
--- /dev/null
+++ b/dev-util/cbindgen/cbindgen-0.9.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CRATES="
+ansi_term-0.11.0
+atty-0.2.11
+autocfg-0.1.4
+bitflags-1.1.0
+cbindgen-0.9.1
+cfg-if-0.1.9
+clap-2.33.0
+cloudabi-0.0.3
+fuchsia-cprng-0.1.1
+itoa-0.4.4
+libc-0.2.58
+log-0.4.6
+numtoa-0.1.0
+proc-macro2-1.0.0
+quote-1.0.0
+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.4
+rand_os-0.1.3
+rand_pcg-0.1.2
+rand_xorshift-0.1.1
+rdrand-0.4.0
+redox_syscall-0.1.54
+redox_termios-0.1.1
+remove_dir_all-0.5.2
+ryu-0.2.8
+serde-1.0.93
+serde_derive-1.0.99
+serde_json-1.0.39
+strsim-0.8.0
+syn-1.0.1
+tempfile-3.0.8
+termion-1.5.3
+textwrap-0.11.0
+toml-0.5.1
+unicode-width-0.1.5
+unicode-xid-0.2.0
+vec_map-0.8.1
+winapi-0.3.7
+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 ~arm64 ~ppc64 ~x86"
+
+BDEPEND=">=virtual/cargo-1.30.0"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index f06c7782a3f0..a4c5e66ea17a 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -7,6 +7,6 @@ DIST ccache-3.7.1.tar.xz 349276 BLAKE2B 4f36ccb378b614668777d8be32dd343a0e59e368
 DIST ccache-3.7.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c015fe3dcb01c8ca1e1834fdfb82a351ec49e203721486817df58c6aebf28e0af011f470fb739d5016f72191654 SHA512 3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147
 DIST ccache-3.7.3.tar.xz 351416 BLAKE2B f825eea87e89246edecbbc0b02cd0f67bbb0e9eb082a4f0c3d9aadca14a20e2d8e9af5f2c067d78393ea92c11878a11423402160210f3f79a3135d345225e0ad SHA512 74e6dd9558273af74aaf085d932955e8ded3d9f7d7b316172109af8f703f00a75fcc27187469d9cb5ba8654bcad12e406bede77cfcacbc0a752d5ca42e52c628
 EBUILD ccache-3.7.1.ebuild 2136 BLAKE2B c9e243c7cabac39716581c38271779a706f95a20d35cb40c3bef1d6b3768260fe5abcc05a35a43b34017e3ad5637758f27a386ff0b9cddf6be6751fe3a9fb50b SHA512 77335fd55a5fc9166a21a6b94a272107c97cb5b8b74bef26b3cc69a50f62a2c4f04673dba3f9dda1784c962effc2934be25fd5fe838ca5523c59a3131e1fddd2
-EBUILD ccache-3.7.2.ebuild 2144 BLAKE2B 5c8ac9b8bea16f12337003d234fc8ce0b3416f1b4e46e3ddcfbeee18aa129066256adc77b4f1d2ff344553101f2b38bdef4ee90755ddf85d7697335d35efa8b2 SHA512 9d6b49ede8ffb44d1815cb9f6eecdd51e970a40d9e745ba22a84b3ba2d352d176b85716ed0989d4de6e30af58b07a8aa2e3b44475d22a7ad218b333128d57657
+EBUILD ccache-3.7.2.ebuild 2139 BLAKE2B 240194a3f617a5ee2915220504a7c5a61c2f086c07c595bf58b0e9338870da5a4467bf871c25a6d5ee2b31b6c3ba379d656eab26272c087461caf35d32a72f41 SHA512 a000a04d0ddf031e7b6ebbd5094a2394cf7a0e09dba7d6e7fe2df1924b7c9ce61f92cfe104a58281875b8254da537e142b5da6dbe2338577878156cef97b142d
 EBUILD ccache-3.7.3.ebuild 2036 BLAKE2B d9a00991a72a8ccf1ea4f218edd246c39dd780ffa1b435e6f311d2c7f029b3bc8a000971d1c7b05d86dafdfd63e2bd9bc66dedf1e0e32a9223b123669521bb5f SHA512 50c39ce2528656d7eae8ec9089ab1d2fa3cb33c72802c441ac14caabe23234dbaa1facd7b7569b2d95f86fb83771caf614caf002a7a78b90f211fdf5c3767c71
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.2.ebuild b/dev-util/ccache/ccache-3.7.2.ebuild
index 9f539b9ea7b2..9b42e14bf5fa 100644
--- a/dev-util/ccache/ccache-3.7.2.ebuild
+++ b/dev-util/ccache/ccache-3.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index e9c42b3ceaa1..a305b7e7923d 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -15,10 +15,10 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
-DIST cmake-3.15.1.tar.gz 9268592 BLAKE2B 3b0dbca9203b1029922d06df9abc3bbfa6f7b8320e43b11b468cd7e129171e2bb1b645fc07bf2d46c9b3c08642f1a11741240d0029f96ac3b2d7a8bb44d398da SHA512 6900a84c7764034331fb6f00801841a7a3e667ac39813c35ceb3db983b33a5bf6addbbc8539c39a0c0be9e10204c79d6236886a9d50ce901a56275b53619ec73
 DIST cmake-3.15.2.tar.gz 9269449 BLAKE2B 539a1dede60741f5159fef72f6a7fdd7dd4fd457fab73d33f01b042adee7b5179b2b620ece0556f1612745f911ffe6cd714efb18a4663ac67ed6a20e09feb233 SHA512 154494fe4c8673c3b17a6f1823c55f06fbb35d7ea048b63a5c3e3157108f222693cf1606c879a3cf425edea686dfe19e27974b338e5d281ec118b1a51c632ccc
+DIST cmake-3.15.3.tar.gz 9270184 BLAKE2B bdca3d45d603d9f40584e54102fedd736dae9eadb3ccaaf9bdb2e071da57eff5201dab390ba651772fb5f78fdd7683a86ac721a8b8273936782559a95be0167d SHA512 7d0abf2f7c661c6b555a7e93a2fce5ab5610c653b0aa4949bed6e97bfbe6523fd0665f67115d3944d3729cbe07ae3aaf780ee673b06dd80f90018cec8a999658
 EBUILD cmake-3.13.5.ebuild 6215 BLAKE2B cfb13f69a7987ff65183910288f70cb3b0a10532af213fc9567ddf722f9aa5042235daa2fe093610b55b6b8f0c94937e452894edb7c54a2ddbe55ae053003238 SHA512 dddf1c391c2c9787f731acbc894e907118b83fcc1cffbb943338bb56a035b9220c7b4316ffb5bd4c411f6d0ac2b2631ed940a0760b0c7a5419fd49dfc8c58427
 EBUILD cmake-3.14.6.ebuild 6242 BLAKE2B f60aecf31afb3a1d18dcc73eb49a725692bbd2429398b05f9b241d82f9842b93aeece44624a50b8406355ff82bf2484bbae55ec863987b82d1e27d04e58b1d58 SHA512 22317c7a34fb11df8eedf9251520db7a956eb44306aa5c7c2d950de1aa0b2844043a84ede7122ea38fe144fea2f52760ac097b84063b1f2f5b8885c858d29c81
-EBUILD cmake-3.15.1.ebuild 6253 BLAKE2B 4dc2e38854b99aa6b8aa80b8a044fa1e02211b9a7fb50c8f8f9161220e2313c4bc7af5d2af47f9c166ae85101313898f39603fa3bc73ad1159cda1398e012704 SHA512 9916b5c93b0a80ca38731d40a9d8d1538c4ec37563e8dcb2e9eea3ca622c09bbe119ec51a44ed3e74cc7c9d8bf27e1e46c7b0d49a2a15decf7d3ea4aa0ea010f
 EBUILD cmake-3.15.2.ebuild 6253 BLAKE2B 4dc2e38854b99aa6b8aa80b8a044fa1e02211b9a7fb50c8f8f9161220e2313c4bc7af5d2af47f9c166ae85101313898f39603fa3bc73ad1159cda1398e012704 SHA512 9916b5c93b0a80ca38731d40a9d8d1538c4ec37563e8dcb2e9eea3ca622c09bbe119ec51a44ed3e74cc7c9d8bf27e1e46c7b0d49a2a15decf7d3ea4aa0ea010f
+EBUILD cmake-3.15.3.ebuild 6253 BLAKE2B 4dc2e38854b99aa6b8aa80b8a044fa1e02211b9a7fb50c8f8f9161220e2313c4bc7af5d2af47f9c166ae85101313898f39603fa3bc73ad1159cda1398e012704 SHA512 9916b5c93b0a80ca38731d40a9d8d1538c4ec37563e8dcb2e9eea3ca622c09bbe119ec51a44ed3e74cc7c9d8bf27e1e46c7b0d49a2a15decf7d3ea4aa0ea010f
 MISC metadata.xml 372 BLAKE2B de2835a1f98bccd88e343ab7c058b40df0e9aa4afe938770d67a6e764ac85926b369b6d9ac4851d5deec3954436d3cb8a112b5543ac1debf74205f05641ed2ee SHA512 6c457abaf6c174d6d14b77af47c4fb65b26873cbb7a5a4fbafc558ff4c5c7c6cb0200c0f69e7a492007af4b402baeaf54177f6755c3e6da0ace149eb9bcfe69a
diff --git a/dev-util/cmake/cmake-3.15.1.ebuild b/dev-util/cmake/cmake-3.15.3.ebuild
index 06184a6bfe5f..06184a6bfe5f 100644
--- a/dev-util/cmake/cmake-3.15.1.ebuild
+++ b/dev-util/cmake/cmake-3.15.3.ebuild
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index e406b1cc4ab9..59897bf6feb4 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,4 @@
-DIST conan-1.0.4.tar.gz 580404 BLAKE2B a3099e7f5bdb882591bab031da267f3df5582975d93a840cd7bf42d7b5b57850d42a28ea33440f6570149b7db8c2ae6a395460f375fee084a9336435d42e7df6 SHA512 47fe9632b0007cdc0456004e6c9122df387869c33b58694b4a2dca9956daf977532f79c204207b21d3a4e7d90337a25dba49cf84cba98c1f9bde3170f1a185a9
 DIST conan-1.18.1.tar.gz 532813 BLAKE2B d4c8ec62100b8c4038f9bef8338aa0afccc38ab39d8d953c41934efc43d6ba8e5abda1438e3f8c3f4bba4b770b871a1afc5ef19749771a55873b35f28a427b1b SHA512 f9c4c4cb768c3f015a84adb3d4926cf91a372a8dae6655df9396b645c24c8694f47795064c0e93ee799864d19f6f77983da0a1679ad511d8f11702250ae95124
-EBUILD conan-1.0.4-r1.ebuild 1612 BLAKE2B c8ad7f6357da3783488241aedfee8414d9ece36cdd2313dc4d765413eb509f995ea1229211ef755191cec69cee6d9a1c3df64f9b49bc0f9dce7d86a790e3eb4f SHA512 0d41b2e92bcead2243fdc18181202302490a5d2a53ca660036049b46fe4b770c8e961e5872227e44f2d606d61771036a7a5a93aa894b94acdcf3bb5555956722
+EBUILD conan-1.18.1-r1.ebuild 2125 BLAKE2B 75ff8ec78323e05ca876ece3ef3d8a2c8d7b63f0f5ace559bcc1aa77e9071150dbbeec4eb853bf7b5f6c844b8b5d8f7c3ce85a932d63d5dda2d9a4f1a02ab76f SHA512 f19fc00d9b34a65a0c9e9c97b3029433dbe2471eddd91f4af119f00fc47832d1c2126194027f9f8ec2ad30e5b2fe4ef9e972e959ba00ac83d3f26f8bcadeaeb7
 EBUILD conan-1.18.1.ebuild 1957 BLAKE2B 3e33f1d58e6bcccd4fc02c6ecd6a28afe33106bf532c90e85958a385dbf610b19c3bdc4f74d861ddb9f6459a4adaa57d14bf5b88ce9f844d1d57c394aa80b2d2 SHA512 2c77ea4a0223e62a9f211b99622598becaeeed8010152fa1a469939e5b74ee3b7856cbc8b9f3da1ca1fc280c898fb6da3e1e55a8bd07a15cd06df641d8f718e1
 MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
diff --git a/dev-util/conan/conan-1.0.4-r1.ebuild b/dev-util/conan/conan-1.0.4-r1.ebuild
deleted file mode 100644
index d851c197e1bd..000000000000
--- a/dev-util/conan/conan-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed C/C++ package manager"
-HOMEPAGE="https://conan.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# overly strict requirements?
-# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
-RDEPEND="
-	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	>=dev-python/patch-1.16[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	>=dev-python/node-semver-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pylint-1.8.1[${PYTHON_USEDEP}]
-	>=dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/astroid-1.6[${PYTHON_USEDEP}]
-	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
-	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		  ${RDEPEND}
-		  dev-lang/go
-		  >=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		  >=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-		  >=dev-python/nose-parameterized-0.5.0[${PYTHON_USEDEP}]
-		  >=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
-		  dev-util/cmake
-	  )
-"
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	PYTHONPATH=. nosetests -v . || die
-}
diff --git a/dev-util/conan/conan-1.18.1-r1.ebuild b/dev-util/conan/conan-1.18.1-r1.ebuild
new file mode 100644
index 000000000000..35a7c3ffe908
--- /dev/null
+++ b/dev-util/conan/conan-1.18.1-r1.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=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed C/C++ package manager"
+HOMEPAGE="https://conan.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# overly strict requirements?
+# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
+# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt
+RDEPEND="
+	>=dev-python/astroid-1.6.5[${PYTHON_USEDEP}]
+	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/deprecation-2.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/future-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/node-semver-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/patch-1.16[${PYTHON_USEDEP}]
+	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
+	>=dev-python/pylint-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.1.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-lang/go
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/parameterized-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
+		dev-util/cmake
+	)
+"
+
+src_prepare() {
+	default
+	# Fix strict dependencies
+	sed -i \
+		-e "s:patch==1.16:patch>=1.16:g" \
+		-e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \
+		-e "s:future==0.16.0:future>=0.16.0:g" \
+		conans/requirements.txt
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	PYTHONPATH=. nosetests -v . || die
+}
diff --git a/dev-util/conf2struct/Manifest b/dev-util/conf2struct/Manifest
index 62ba9a16e864..31774d185361 100644
--- a/dev-util/conf2struct/Manifest
+++ b/dev-util/conf2struct/Manifest
@@ -1,9 +1,4 @@
-AUX conf2struct-0_pre0-cc-and-cflags.patch 894 BLAKE2B 9c710bbb0096952e4f2646b143e2750c96c42c2cfa569419b876e284d2a635d53e7e62ed4d785486b77b08755f3a8700451772af4dac9c5464014545e090ee0b SHA512 734614dab00dae640ab88402299619581e10efcab26b8f86948848e9159acff182118409e371990fdf91a908628dcb6c4e77e46283020283d43ae33a4329d756
-AUX conf2struct-0_pre0-dest-exists.patch 555 BLAKE2B e64a5abc9baabc94e236b9990196103681a4679956286cf37ff0c7250fb9973b3bfe2b099867fc90159083510ec579733aee348a348836a17b9eec7d8d9a3e99 SHA512 0b650abfa1723d736b9df22c5fbe5a0e56a6910a0ec90da96f90f8cb03331d585b35174547830579601e67a9b2d8d2410a928bb7e1e3efd453dba66dcde86251
-AUX conf2struct-0_pre0-destdir.patch 1351 BLAKE2B 5c4665b981a146d52fcc04762efac2b8ffa2367f4543607d7d7071b43fdac8c2ec727b4b0ab3f6d2f05e6bea85c2adf214dfd9040713f2ed170a7e30b8dad713 SHA512 3dfcd71ae92aed31e20f39c8d3fd591b96b938967138b267cba89e7d7ae122dd14e8fef9b5a562c0cb9f0ff141f34a343ca4b677df0410ed00840d4a60503b29
-AUX conf2struct-0_pre0-install-and-uninstall.patch 777 BLAKE2B 3d2ba3033a69c15ded7125c5351b188f00599a2b313405fed5dcf5d637daa9ad309524fa75736e5a6267cfa40169a6fb3c1b5b6ac54ce0d4af51f920a04fe08f SHA512 6b2f80bc05a384146c3382eddfe169484f251afde790cf37aa65f6d745e78aa7255f01e3af302dafb1377a9bc7e79ce094abc30d4d48e84f96f8104215e06689
-AUX conf2struct-0_pre0-install-not-run-all.patch 599 BLAKE2B 47d6ba694800d4fbd1b13ddbb09b544fda9e4f1f3b9b0d55b5fac38ead760effae165b7a35ec436a200fb2a891744818fdc139f792deb066c30c595de95d5755 SHA512 17defb200110299a4bdb7f28ad20520ec152edad306212875fcd179e4aaa644196c9b7a166dbcd8eae69a88aec8b4548b272798f078377b22427f5df68376a39
-DIST conf2struct-0_pre0.tar.gz 50851 BLAKE2B 21db6cca56ba18a48c65395fbf3def5de6190515be46ca2e7113c17c9b874cdcc7fb72b06b586c57a1803e98b56df5decd10ea1dd6dcc4144a78d6a0ff6bf9dd SHA512 e0eb1d43ec1375e65796197c16246a2cc38e0a4d078c4028e8675cc1ff6ef08c7802ec18f57232d91f2d4133573129f7a2b05a9f1d8b74bbddd072550f846b1d
-EBUILD conf2struct-0_pre0-r1.ebuild 1179 BLAKE2B db6d315e1528ec47f709bae67a85ed5c9006535f63fb0ad7d90c8524f61b85a6ea4c0e62e1a5e43afcc0d4635c9bf56b46d0675006153a9bf5512d8722570a78 SHA512 3e30072b2ad4826e398c7fed63231f116c035d3b8d872f36bdf02fceaf4016f751eddeee1e58d5138dc9da60fd63a7f1208a1a5bd67476273174f691d26c39d8
+DIST conf2struct-1.0.tar.gz 57393 BLAKE2B 7de4be755ec764d96a321c68ca68b3156889e24f6894ba78b1c88cbeff84525331f1105040d61b1121ca01ece8d50a5aee2268eb73cde3ebbc8b62f679e2451b SHA512 31e8f350af740e79d97f4698dfec9b5e8a31a8a1cee30da0af753db26eda5b61379e9156e1cb492aef5068a4987d5e8202215323b83328e99705ae3ad3c09b81
+EBUILD conf2struct-1.0.ebuild 746 BLAKE2B 3dea47468f3f014786e4afc60197ef9f9d2bc6940a779031043f7d222acc160423b6bb9b72ef38cdec5651c77077ca8b6b15e0adbe09c0914fc9f2778cbabf05 SHA512 9cc596eb33f72f9983021252e335fef30e38db9cdf565c70adcaa8efee40e1b9fe0e4109a39a0c621d5c8a844906c18689fefbc9894f69bbc30544cf00c60d77
 EBUILD conf2struct-9999.ebuild 746 BLAKE2B 3dea47468f3f014786e4afc60197ef9f9d2bc6940a779031043f7d222acc160423b6bb9b72ef38cdec5651c77077ca8b6b15e0adbe09c0914fc9f2778cbabf05 SHA512 9cc596eb33f72f9983021252e335fef30e38db9cdf565c70adcaa8efee40e1b9fe0e4109a39a0c621d5c8a844906c18689fefbc9894f69bbc30544cf00c60d77
 MISC metadata.xml 334 BLAKE2B 8a441ec6c49f135a517821de0933e09c01861a135a0a16cad200acb2a695cb04bdc5d4d6ab076b95d7f547a8771984ee3cfca0c074ad1c41db3df5cee2876f60 SHA512 db25be9a745a1ebef49e8e477e24d715453cfe0bb698dc8e42ccf3ef8d8aac3cc9693e3f2873f28b3096016741bbf3c32841f025a06bcee61e9138ac2f6ee8b7
diff --git a/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild b/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild
deleted file mode 100644
index 631e635694cf..000000000000
--- a/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Create C parsers for libconfig and command-line"
-HOMEPAGE="https://github.com/yrutschle/conf2struct/"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/yrutschle/conf2struct.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm"
-	GIT_COMMIT="10ea3356b65e712fb000f4d37f00e1dc09c1e722"
-	SRC_URI="https://github.com/yrutschle/conf2struct/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${P}-install-and-uninstall.patch"
-	"${FILESDIR}/${P}-cc-and-cflags.patch"
-	"${FILESDIR}/${P}-destdir.patch"
-	"${FILESDIR}/${P}-install-not-run-all.patch"
-	"${FILESDIR}/${P}-dest-exists.patch"
-)
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/libconfig
-	dev-perl/Conf-Libconfig"
-DEPEND="${RDEPEND}"
-
-src_compile(){
-	# -j1 due to parallel make issue reported upstream at: https://github.com/yrutschle/conf2struct/issues/10
-	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install(){
-	emake DESTDIR="${D}" prefix="${EPREFIX%/}/usr" install
-}
diff --git a/dev-util/conf2struct/conf2struct-1.0.ebuild b/dev-util/conf2struct/conf2struct-1.0.ebuild
new file mode 100644
index 000000000000..b853d93f1b86
--- /dev/null
+++ b/dev-util/conf2struct/conf2struct-1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Create C parsers for libconfig and command-line"
+HOMEPAGE="https://github.com/yrutschle/conf2struct/"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/yrutschle/conf2struct.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/yrutschle/conf2struct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/libconfig
+	dev-perl/Conf-Libconfig"
+DEPEND="${RDEPEND}"
+
+src_compile(){
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install(){
+	emake DESTDIR="${D}" prefix="${EPREFIX%/}/usr" install
+}
diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-cc-and-cflags.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-cc-and-cflags.patch
deleted file mode 100644
index 322e8724e6c4..000000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-cc-and-cflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8c68116a9c2e086e83075f46a1b21de218c2dd2e Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 15:31:59 -0400
-Subject: [PATCH] Add CC and use CFLAGS in Makefile
-
-CC is necessary to specify the compiler to use (default to gcc) and use CFLAGS to specify compiler arguments
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index bf9bae3..5b7212f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -6,7 +6,7 @@ all: example checker
- CFLAGS=-g
- 
- checker: confcheck.o
--	gcc -o confcheck confcheck.o -lconfig
-+	$(CC) $(CFLAGS) -o confcheck confcheck.o -lconfig
- 
- 
- install: all
-@@ -18,7 +18,7 @@ uninstall:
- 	
- EG_OBJ=example.o parser.o argtable3.o
- example: $(EG_OBJ)
--	gcc -o example $(EG_OBJ) -lconfig
-+	$(CC) $(CFLAGS) -o example $(EG_OBJ) -lconfig
- 
- example.c: eg_conf.cfg
- 	./conf2struct eg_conf.cfg
diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-dest-exists.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-dest-exists.patch
deleted file mode 100644
index cb345f3588cc..000000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-dest-exists.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From f4bc59c6cad87f6a237f92ea4c54e38705beeaac Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 16:24:14 -0400
-Subject: [PATCH] In install, ensure destination exists
-
----
- Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile b/Makefile
-index bf9bae3..8bebca4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,6 +10,7 @@ checker: confcheck.o
- 
- 
- install:
-+	mkdir -p $(DESTDIR)/$(bindir)
- 	install -c conf2struct $(DESTDIR)$(bindir)/conf2struct
- 	install -c confcheck $(DESTDIR)$(bindir)/confcheck
- 
diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-destdir.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-destdir.patch
deleted file mode 100644
index bae336e10854..000000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-destdir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f3724170ae5b5e750ec5482241add97217047eb4 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 15:33:49 -0400
-Subject: [PATCH 1/2] Use DESTDIR in install target
-
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index bf9bae3..fd2f21b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,8 +10,8 @@ checker: confcheck.o
- 
- 
- install: all
--	install -c conf2struct $(bindir)/conf2struct
--	install -c confcheck $(bindir)/confcheck
-+	install -c conf2struct $(DESTDIR)$(bindir)/conf2struct
-+	install -c confcheck $(DESTDIR)$(bindir)/confcheck
- 
- uninstall:
- 	rm -rf $(bindir)/conf2struct $(bindir)/confcheck
-
-From fa13135f93435de520480be9c1a578b20d538f55 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 15:36:24 -0400
-Subject: [PATCH 2/2] Use DESTDIR in uninstall target
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index fd2f21b..ca1e673 100644
---- a/Makefile
-+++ b/Makefile
-@@ -14,7 +14,7 @@ install: all
- 	install -c confcheck $(DESTDIR)$(bindir)/confcheck
- 
- uninstall:
--	rm -rf $(bindir)/conf2struct $(bindir)/confcheck
-+	rm -rf $(DESTDIR)$(bindir)/conf2struct $(DESTDIR)$(bindir)/confcheck
- 	
- EG_OBJ=example.o parser.o argtable3.o
- example: $(EG_OBJ)
diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-install-and-uninstall.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-install-and-uninstall.patch
deleted file mode 100644
index 79269d628839..000000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-install-and-uninstall.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9c0e889e29944428106c12ee28ce0074a29eae50 Mon Sep 17 00:00:00 2001
-From: Yves Rutschle <git1@rutschle.net>
-Date: Sat, 29 Jun 2019 18:41:20 +0200
-Subject: [PATCH] added install and uninstall targets to Makefile
-
----
- Makefile | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index b03aab3..bf9bae3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,3 +1,5 @@
-+prefix=/usr/local
-+bindir=$(prefix)/bin
- 
- all: example checker
- 
-@@ -6,6 +8,13 @@ CFLAGS=-g
- checker: confcheck.o
- 	gcc -o confcheck confcheck.o -lconfig
- 
-+
-+install: all
-+	install -c conf2struct $(bindir)/conf2struct
-+	install -c confcheck $(bindir)/confcheck
-+
-+uninstall:
-+	rm -rf $(bindir)/conf2struct $(bindir)/confcheck
- 	
- EG_OBJ=example.o parser.o argtable3.o
- example: $(EG_OBJ)
diff --git a/dev-util/conf2struct/files/conf2struct-0_pre0-install-not-run-all.patch b/dev-util/conf2struct/files/conf2struct-0_pre0-install-not-run-all.patch
deleted file mode 100644
index 5eca0a1de7b3..000000000000
--- a/dev-util/conf2struct/files/conf2struct-0_pre0-install-not-run-all.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b43351d0fdd687ed39b38531f673ba634aca5fee Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 5 Jul 2019 16:22:49 -0400
-Subject: [PATCH] Install target should not run all
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index bf9bae3..8943248 100644
---- a/Makefile
-+++ b/Makefile
-@@ -9,7 +9,7 @@ checker: confcheck.o
- 	$(CC) $(CFLAGS) -o confcheck confcheck.o -lconfig
- 
- 
--install: all
-+install:
- 	install -c conf2struct $(DESTDIR)$(bindir)/conf2struct
- 	install -c confcheck $(DESTDIR)$(bindir)/confcheck
- 
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 21f8f2e45543..1f644b11a0dc 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
-DIST debhelper_12.3.tar.xz 493796 BLAKE2B 65ed2b494bd7dc70ecefe1a999681af1648385ec4addde8dbe39a650e37d4613c1712ba8005dd1efc8bcc688c02f23d02afe661e6126d29d8855930a34ed74d7 SHA512 94abe39f4df1d0b95b49fc20141f46f8f0438de89f904556dcb26f9ddcb6530d04d92c2c719549c0f1f5bc8c5edc395fd770e74097b353ec521affa227d77f4f
-DIST debhelper_12.4.tar.xz 493916 BLAKE2B f1478c30a1043f66eea4aa3bbe0cd5bcc10b9d8d2a2caf9ec82b6eaaa4bff03ee7c72ee2aa87ff96827a09b6f33874fd85d7743df2f5c8b1eaaf957c3cbc4066 SHA512 82897feadfa953d12bbc6e5e8fb1fbccd4de9e42cafa5c23e188960ff11e7c14a5db0ba7a5a50873b2f399da71580a36b27156c03a11d418c58fbe5cc431b006
+DIST debhelper_12.5.3.tar.xz 500304 BLAKE2B c73d0aa6069b3c85511196e50afa73c3303a23503ff13f748fbc58ee26911b3845742ff9d37189a5373b4d05958912b76681f8fe1e02b44256cf29c161ee14c7 SHA512 920fbb44f1ec63a90d85f4814f5826a446262a54a2e5209adef902f32965e88080908445586bbac86ba1aa1152f894e5e33369d4fa604084aafb4666b7f3cd38
+DIST debhelper_12.5.4.tar.xz 500788 BLAKE2B ce562d57a0f96de13499a6aa78993dc40dacb94ce34c18d8ac81c7345f25e74407b4368c207b6837382540ecaf943bc1e51bc0032fde3d30d1988906d9fe8b12 SHA512 411dd16b779cf7e9cac76aa571d44e3c78cdc2de129d861eb6e30867ab92642f0ae070b3df8990cf02f37f3e24e127743ab92fd85f05a8b705a43a543c81e4ab
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-12.3.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
-EBUILD debhelper-12.4.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
+EBUILD debhelper-12.5.3.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
+EBUILD debhelper-12.5.4.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-12.3.ebuild b/dev-util/debhelper/debhelper-12.5.3.ebuild
index e546013a4fd6..e546013a4fd6 100644
--- a/dev-util/debhelper/debhelper-12.3.ebuild
+++ b/dev-util/debhelper/debhelper-12.5.3.ebuild
diff --git a/dev-util/debhelper/debhelper-12.4.ebuild b/dev-util/debhelper/debhelper-12.5.4.ebuild
index e546013a4fd6..e546013a4fd6 100644
--- a/dev-util/debhelper/debhelper-12.4.ebuild
+++ b/dev-util/debhelper/debhelper-12.5.4.ebuild
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index b93a25870f32..ac07d9d46b7c 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,5 @@
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
-DIST dialog-1.3-20190728.tar.gz 534764 BLAKE2B c38df2a2a71036a60c08b2f9caa0cb0b6be9f07ed0137d592ed48c6f3e57a0d24760ff85df44f0fdb4cc690b47c6a206f6eaf84a7ea7e71366424dedb7a9e1d6 SHA512 e539f9691fbca289192deec87439b9d6a463b875b24082f6684c2a1c7f7b46bed1ba29a5380dd93dadd800a99bc7c60c9d065d7230bf21dcfbb8f361d7d15de6
 DIST dialog-1.3-20190808.tar.gz 537376 BLAKE2B 38c849ef12ae6c5fc703fe5f8d172c92ba9c6d498e163d622b5dfc7c638a7058fbca79ecfbf1f3e4f274fd53c6cce0d4ef0f67fc5efb8dc16b451064d609e214 SHA512 780cecaf68616723242426f9e78c772f81ec63f0761f67061c4fa06510ba9ca229c921ee15443b63c1581726751f79bf3e6d3b6b8148bbbb3a986043b6b82f86
 EBUILD dialog-1.3.20170131.ebuild 1277 BLAKE2B 1cd46769259be314020f8f638ede023ae62f8c0c6c0d007baf8f364f018f00619301026e17bc956b53c291a2a22afacb70188e7a6946cc975a795aa9d9fa40f5 SHA512 9f72fa481b62e1ca43aee9cbc5856e139fad8c3b0d02f75fd33b8708437051eecc82c926fcc3a30f65e1829f232f92e3057fc25fe28794bf144a76535bcf8ada
-EBUILD dialog-1.3.20190728.ebuild 1276 BLAKE2B 1cbe7f171a6536cbd9fb454dec409e023b1d9b2bfb788cdf63cfaf779f718944f2a6f16c87e7fb3f8882afa5a39f556e6a64b8d661835482d26281eab7997a1e SHA512 bee75c253b382b622db52b32e762685314b35fbe9b0af4b43a7ba4ba7a7ae8ccaf7d72909fcc0efb7c856f89319c59fec8010c7cf12095ac7c9f132648d01d09
 EBUILD dialog-1.3.20190808.ebuild 1276 BLAKE2B 1cbe7f171a6536cbd9fb454dec409e023b1d9b2bfb788cdf63cfaf779f718944f2a6f16c87e7fb3f8882afa5a39f556e6a64b8d661835482d26281eab7997a1e SHA512 bee75c253b382b622db52b32e762685314b35fbe9b0af4b43a7ba4ba7a7ae8ccaf7d72909fcc0efb7c856f89319c59fec8010c7cf12095ac7c9f132648d01d09
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20190728.ebuild b/dev-util/dialog/dialog-1.3.20190728.ebuild
deleted file mode 100644
index 021642f25719..000000000000
--- a/dev-util/dialog/dialog-1.3.20190728.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib versionator
-
-DIA_P="${PN}-$(replace_version_separator 2 '-')"
-DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples minimal nls static-libs unicode"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.2-r5:=[unicode?]
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	!minimal? ( sys-devel/libtool )
-	!<=sys-freebsd/freebsd-contrib-8.9999
-"
-S=${WORKDIR}/${DIA_P}
-
-src_prepare() {
-	default
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-rpath-hack \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts=$(usex static-libs '' '-shared') \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	prune_libtool_files
-}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 82e08e0cef0d..6139e20176f8 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,5 +3,5 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 EBUILD gdbus-codegen-2.58.3.ebuild 2122 BLAKE2B 7a07be31d76197c0d4472e5e36a141944df7a6f0aa28bef8e41e8324821eec7ec8b4279be123532ffbe4b46b65f7fbfbde1638c623ba10fe535739c5bc64ef60 SHA512 3d3b02b4fdbcd3000e7778a37bc6d1c647fbb9dba7a4b097b4d921472af379bea326aff1f3c0bf21711d9cd9c9cf5e9cba1f60a4a3c2840ba38eaeb3ee494ac1
-EBUILD gdbus-codegen-2.60.6.ebuild 2054 BLAKE2B 98c1af744514e90c1d868cca51bb8bfee22f0b42075836614ef148ed15a0ea83da32c9f1b98cbd252e094e1f59156c5e13411f446af19ff9daa5ef52be5723c3 SHA512 afa27bc27c59b4e355f1c7c8aef4045b68c7ef26b47cceec89366cde559db3771c0844d37de5306843b6d70eb8202bea520278ecab46f5e31e1c9f9580d3e821
+EBUILD gdbus-codegen-2.60.6.ebuild 2048 BLAKE2B a50962cd741be429374ca1854199c02ae0fee5deba37903da653376cdf395bde1e44b2afde0795154f5038760ede015cb5614ca8fe0d0d819850e2ecd708a079 SHA512 2203f69b88acfa0192f646826ae9ce41822cb25f7e2793fbb2ed295efca575023d23cbdc7e9d266afc183c478fa04eb7cbef2f610cd48b371d2742c3b7b494b9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
index 04ecd71de65e..eb44d7ca49dc 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gengetopt/Manifest b/dev-util/gengetopt/Manifest
index b7e4bb63ca07..3ac87aeeb0d6 100644
--- a/dev-util/gengetopt/Manifest
+++ b/dev-util/gengetopt/Manifest
@@ -4,5 +4,5 @@ AUX gengetopt-2.22.6-no-docs.patch 247 BLAKE2B 7d703bd0224aa6ea25095eb36902a0969
 DIST gengetopt-2.22.6.tar.gz 1056293 BLAKE2B a99fa2ee362fc7b01ebc4c81f9daa17592a30b63f63883b73ca67885fa39f2ece48bda3f04ed5b98e74785c4030f94cc139df93a847e8789962e51d0950de0c7 SHA512 dad5baf1b6c4c76ae7f532dd63c6aecdc30f31d68a259b6a26a10197f1fe42dc9147a52ac12a0c3fc4b7cd61d288a343a9223f967a5a9a15a0614330b41f68dc
 DIST gengetopt-2.23.tar.xz 584860 BLAKE2B efd94e28d35319f3a04af4f97b87fd8a07bef93856da0dcfad54ab4800d43510f7948bbb7440f39abfe242aede5657abd874bf4ab4dd311336e10f37e7960cb5 SHA512 3749191d35acbeff6680f2a4d0516706a0491053f632aaa44ead7c3a42e56f9870bd7c4a85a1886f2052e17d86a2853e2f65d445e0c9920e41f1dc354f003712
 EBUILD gengetopt-2.22.6.ebuild 801 BLAKE2B 53d523dc4b84feb8d86bad53e7b2eb0654e0ec252732bd893b8f10ebe29d6179fbebe00faa4729ef2f9ce33f59ec29eaad2f2117165b941d3b7a0a341d24dea7 SHA512 20b5852e27a6075403100c80d678c0c4066c6b0f7db7741321e5b099c7980f1b93d01226a08599bfbc2f965f3744de4e67461fc45dd71a8d5335d6c186079dfd
-EBUILD gengetopt-2.23.ebuild 714 BLAKE2B 20954e78eb6083f97351c7e835fe812932413996e71e1ba67094c0a025392810f69ddfcaea3a80884444348271e94c69fc6924e728e9ccdd7483ae3169bbbdff SHA512 81c8a361ef1e5f0ca609422b20a76ed92e8a4424083e9448353bd8cfa961618d5b85f898b3189a4b344cc832b74e401ef446c790aef37b0916e2ccfadee901bd
+EBUILD gengetopt-2.23.ebuild 720 BLAKE2B 1ccdab18dc10e9a6c3bc54da0ddf8520dcad90cde4eab6cd4c0debba3978ad69fd6e6ec8654bc277662d4506f40e0a08a51d500d7351df645e0d459c5d071a81 SHA512 6915453a64f4f6031822fa3bd0edf3347febe78b2fac47136aa698fb6e3909de900561670982dc3970615520ecee0ea689f8404e1be29a17013a08dc272cd2be
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/gengetopt/gengetopt-2.23.ebuild b/dev-util/gengetopt/gengetopt-2.23.ebuild
index 23b2c1fa86df..d2f7836b3a84 100644
--- a/dev-util/gengetopt/gengetopt-2.23.ebuild
+++ b/dev-util/gengetopt/gengetopt-2.23.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.22.6-docdirs.patch
 )
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index b2cd91790d84..5336dbf236aa 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
 DIST glade-3.22.1.tar.xz 3592952 BLAKE2B 53f769198a093ff5d4dc98bb4ea98c6e5195933caf24247a99db980312ae3398fca3abbd640d08c02e8fb5f8647ee3e4b18e65073b1500e9017ee0586993a331 SHA512 e1bdc49b89bc5010c0abf6357dbae05c921182655b2ee5a4b161af6adfd596cfbcd495c9851ba956abbf3d6156616a6c0e94640cd72cee11551ca388674ac908
 EBUILD glade-3.20.4.ebuild 2386 BLAKE2B 8f4d42898dfe18c870f0ea90442c0ab98d43ea75299ce210a80b7527157a0f8e1bda0527c22f51c4832f6c42b6539e5294e112f822a2a94b156ac089313384fe SHA512 3cccd8c8e69e26ea881565673ed6883a68f00d11d5aa72386ca123f0c982ecac4af509359c1512517457b54c52aa5b58caac09116b6fc1c7592833ce34b348b9
-EBUILD glade-3.22.1.ebuild 2334 BLAKE2B e7309513a932bbcbbb039e45e9afca7cd15871132dc73ad8aa006b88d699b3d7830641c5b6c535968cfe08eeec6c542182e278be6ca1e001c8c1eff96ee91114 SHA512 ec1856591b08f2bf06840e0bdcccfe745097476f78c5b5d740d97651997c41714357b6a6e1acbb53c3618102938af4581dc6ac65f92d842f00e3d102628bf76d
+EBUILD glade-3.22.1.ebuild 2329 BLAKE2B c7fb05647f04c8a74e85703873620680bee94cfa5f43f227602386eec4b9cbc97745ac2d9786fb61527d93fa2f03eb0640475433f9fb4bdbb56ed20884b25a47 SHA512 f86f398a1f87d6debe5407f5b6ca6d5bc4114d0d937464260ff4174123052ac70207153c81e50b4754524dd573eebdac93060104c920a57032f6a29ae9df8284
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.22.1.ebuild b/dev-util/glade/glade-3.22.1.ebuild
index 0106822b04d0..77500747cd9e 100644
--- a/dev-util/glade/glade-3.22.1.ebuild
+++ b/dev-util/glade/glade-3.22.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 854b144fc104..320fcd3e1e2d 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,5 @@
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 EBUILD glib-utils-2.58.3.ebuild 2407 BLAKE2B df14fadeb6dece6527b3c6fcc9a851dc662b2ff59842c83c3ca57007575575e80176bb42b6d6e0f02e9dc4598c7c0605c5bc0855427bb48dfd8417b9c2847582 SHA512 4d57615eee2d86c75b33f4c8be6a8076ca0be894dea5e5e3f2858346b87ad4c2545fc9c639f8f8f68c4816bf147ec73e1c38a243588c9a4cf72c5cc3db0fc880
-EBUILD glib-utils-2.60.6.ebuild 2429 BLAKE2B 43565d10ebccf632edfb09b0ede6aef02b3f4330d12d415c72b54e88d11d9f2e524c1bc4c92b0bb9565700159f477baebfd8f15c10f3d5f1f849f68fb0f449b7 SHA512 d75f3ac2ca4dfe56482fe602b47c9eb300500d31563f05d74c8fa5c8e5724e6d96e5ab3232785cdf3940ccaa01a191ee79fdebc8edae10c79f2ad00d46f06339
+EBUILD glib-utils-2.60.6.ebuild 2423 BLAKE2B 8e274dae1e4bcdc765dc8e47cd0fa6d03d824d8b3ec0d32f131460ba4703fdbbc52195dd3e73fc5d8359db560cb1589cdfb31d3837cf3c005d61558841cf1b5b SHA512 312b5c2d139b7c334452b47caa066603ef281e792e0937324ad193e5a637e0a54f449c719d1ebbd09d1cdb3d2155a9cbbe4496b739b918126c3eb50b9c8222e6
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.60.6.ebuild b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
index d181aae83011..16b0d8f4047b 100644
--- a/dev-util/glib-utils/glib-utils-2.60.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index c4d5ae748ef3..c3cf4f05c6dd 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -4,7 +4,11 @@ AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 DIST jenkins-bin-2.176.2.war 77379386 BLAKE2B feb66ad7042ab38ecd75c31e11587efe32d06c799e6f7fd46453969faa5edc241f99d844184e8f53dbde3bd05aeda676622baf2440eccd6c721300d877acb3e6 SHA512 8e53637a10942e7cb5907a669b72bd200369c65b47a8c3a050f356887cc65e8e2a0bab7b7a56d78735e5a2da77395268f4fbf4f6d5b219f9052dff72a96c6f05
+DIST jenkins-bin-2.176.3.war 77364728 BLAKE2B c80f54999faac0a740a4030498785f5caaaf9dbbd077258a767f2b23fefdcb32892865d256a46ca9afa015a5c035ae05605ecaf031017d350684e3b199f11517 SHA512 dc01c28abe624165c8fa63534a6beb8489ed73152dcdbb1cdb0bbb2e66492583eefe3b62f7e804089febc017de61535c336aa26835501759090f9cfcbd6f2e91
 DIST jenkins-bin-2.186.war 77649944 BLAKE2B 8247cae6d25c6b24cb7b874c3e9335cfe8b82d54406a3b37a909a2cde7178f38da8312ce89b63d4e6833d7c5a5369350c97ea5a785412b4acd5ebc5e40898be6 SHA512 70140e5bb199ca1b801763ca1440d41a96dfbf3f1df0d0aa04d00e81be42616464626ed808205e7353e476dc4aa7d320c85b141ec07448b0ba2251449d0c0c28
+DIST jenkins-bin-2.192.war 78257602 BLAKE2B 09f9df5f0394fc5a8d45b4b11a53b7b110d99275ce8e2ba7a984592bb2f883fbf8f1da45903a28fa20c18ab285a6a3200077784436716cab7a5f47ef7f3cba09 SHA512 f60fd5a74cd05a755dd85ee2be13f9f473a9fcbf3d3400df17b840fe88025b8311cee2d5e9e6c6dafcc8d268fac245a519078911e600d9af5580d228bba773d9
 EBUILD jenkins-bin-2.176.2.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
+EBUILD jenkins-bin-2.176.3.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
 EBUILD jenkins-bin-2.186.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
+EBUILD jenkins-bin-2.192.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.176.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.176.3.ebuild
new file mode 100644
index 000000000000..323b88955105
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.176.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.192.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.192.ebuild
new file mode 100644
index 000000000000..7d232cbccacd
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.192.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 6015bd487d4b..62510b00322c 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,7 @@
 DIST kdev-php-5.3.3.tar.xz 1043652 BLAKE2B d181984e0c8c6b77502529dace0cb2b13afa417e98149a7caaf379fc5c27e64f7928c4232489a0e4b21af6500636a71b7217a56e500c367a579585dca6c447a9 SHA512 8a478e6170ed63ccd82822a5281abb63f70d959ae945b730d2d707efd104b0a3475a66ddb637f134d1eed90173342c1ecf42e7b15947b96c141e6228ef96a009
 DIST kdev-php-5.4.1.tar.xz 1042236 BLAKE2B 58c0e2c1d8cf0732bd4114e2c20c35076233ca1d1b6920de43abfd804f03468496596e2b061fcc8b9b8a0e9e7a10630a1f6b2f2271b33b702dc91852dfbccb48 SHA512 a6dc4447be0148956fa805a45a73bfd05311b08f6fb3beda486f2703753a1825de97b81f67ebe6e178acf5ad238f6d6708704c04ede3bdefad19ec36d467ff7a
+DIST kdev-php-5.4.2.tar.xz 1042248 BLAKE2B dbdbd12de37a3d37b96530a25db46daca7ad7c09854ba08417abe19f5136331091ef6ba977e2eca46b423ace167bea0082e71f57d9d9b41b2f9908856883f3c1 SHA512 c805431aa4efda12d15898dfe33d8c096e042fbf3077d377eb524c59b9da14c0930fbc2c456e5760452ca238b5269f360741998af0b429096ccd57fbe6575a0a
 EBUILD kdevelop-php-5.3.3.ebuild 1184 BLAKE2B d0ba9ef4a008f121bd3254b7588868161cad6c0f6687d38928241eb08f70d0f6efad87871ba83bde7c41428983f1f6aa72dc36b7765ddfea10fb053d878d4214 SHA512 70939ab2e3b29b4370ef5b7916149f4a87aefd201110581b7c8821d25593cd602bf3f147a9ebc8e9366061886c1f15e8413c042f006afec146970eb68c752887
 EBUILD kdevelop-php-5.4.1.ebuild 1114 BLAKE2B 32e704a1c556050f08491c82c889c2a377ba96429b105d864165ccba91820bba9a8ea265a6a66445fe347ed0c0bd2cffb8bbd421a8e06b10bb1ffcf2720b56f1 SHA512 2ccf9b7a344cd092cabd90ed6876a5247f22786467efa779993d469d2b24f6638caf4b1dc7bb3d0a77e2e9cbbb1350fb08b8f46d195908c1d9db96a298a97c74
+EBUILD kdevelop-php-5.4.2.ebuild 1114 BLAKE2B 32e704a1c556050f08491c82c889c2a377ba96429b105d864165ccba91820bba9a8ea265a6a66445fe347ed0c0bd2cffb8bbd421a8e06b10bb1ffcf2720b56f1 SHA512 2ccf9b7a344cd092cabd90ed6876a5247f22786467efa779993d469d2b24f6638caf4b1dc7bb3d0a77e2e9cbbb1350fb08b8f46d195908c1d9db96a298a97c74
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.4.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.2.ebuild
new file mode 100644
index 000000000000..736a5e6971ab
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.4.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_DOC_DIR="docs"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+KMNAME="kdev-php"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+LICENSE="GPL-2 LGPL-2"
+IUSE=""
+
+BDEPEND="
+	test? ( dev-util/kdevelop:5[test] )
+"
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5=
+"
+RDEPEND="${DEPEND}"
+
+# remaining tests fail for some, bug 668530
+RESTRICT+=" test"
+
+src_test() {
+	# tests hang, bug 667922
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	kde5_src_test
+}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 40e0eabcda46..ed24d6ca3b80 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,7 @@
 DIST kdev-python-5.3.3.tar.xz 1082448 BLAKE2B 000d0e54c5e2b5eb41c6be0f82d7b6ef476bed3175f367db11fdcebf2f7063b322ac0901059a2e17391904f2ac5cffdcb48d3015665d697e89aa6e0be1ae550e SHA512 4d388b20588b4032efd677e9f152be53739a4c5c5bb3fcf37b5289da418c47281b6a545ae5825f9674b90333e69f2949e6e9b4d6704010cbb878d2ce8b3ee384
 DIST kdev-python-5.4.1.tar.xz 1074132 BLAKE2B d2f21849e14ef9828085b4fa9fe8a9af85e71f59263be7295a76932801700730ec3bac147c287ed400515e0552ee79a5f48ae96398820f0000951abf82fc83c8 SHA512 156ad0af9fbd3e5845979abfa68329de4228edabe68e0765ebde2821289d2bb027d46623be2bc805cea6988450d594d94c1b497ce4ee1b8d86a88cd7ff1eebcc
+DIST kdev-python-5.4.2.tar.xz 1074220 BLAKE2B c2c6c1bfc0ebf3d0950740f11dd881830a3d5d9e0b331fbb16f14995b2f49f3a86293189409f005c582b9c0ed9de4a92682c53ef0145cd3200310092792f022f SHA512 fef69a4afa9539e719d4808c272d1c34f4b56c33eba355f3bd0de87a6614912e30233ae7f48e9821acb9f25f2c3bd3776f4965f777fabdde21fe48d0b7baefc8
 EBUILD kdevelop-python-5.3.3.ebuild 1122 BLAKE2B 06832b22adea00c8f98753dd9c05d5a43975b9118facfdece25a61eec6caeed77a9e555f92b76351f58f67f799d9dffc8b6b5c953eb105f50f5ce968886df5e4 SHA512 5246a39dc49dd41596a34bcc6327f28eef52fda72fde17c26a08c5b2fc2165bafa3d4864e93c67a6c2d0e93ec3be8d2472844734e9748fae1b768ffce688c364
 EBUILD kdevelop-python-5.4.1.ebuild 1052 BLAKE2B 29d75aa5c8909860d390700fdfe0b1c396fe26a29cfab43be02c9c1aa7310f9de439e3ba583fb0b631dbf69f205f4e0e76c527ef17e48ce1d03ba817541cb03b SHA512 8c4c3b2d162a7d5e6d1f6bf7d814e8d96be6a06f3024fc8b56539c94d582ef70dc5bfbed5755de90d3b3470b378dacae5a544010ae72dc461c0253957b033319
+EBUILD kdevelop-python-5.4.2.ebuild 1052 BLAKE2B 29d75aa5c8909860d390700fdfe0b1c396fe26a29cfab43be02c9c1aa7310f9de439e3ba583fb0b631dbf69f205f4e0e76c527ef17e48ce1d03ba817541cb03b SHA512 8c4c3b2d162a7d5e6d1f6bf7d814e8d96be6a06f3024fc8b56539c94d582ef70dc5bfbed5755de90d3b3470b378dacae5a544010ae72dc461c0253957b033319
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.2.ebuild
new file mode 100644
index 000000000000..4329abd3e932
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.4.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+KMNAME="kdev-python"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-util/kdevelop:5=
+"
+RDEPEND="${DEPEND}
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index e6248891d995..c553d07b9bcf 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,8 @@
+AUX kdevelop-5.3.3-missing-header.patch 752 BLAKE2B 1932cc385d7de6f45160215e243e978248dd07abfcf6b4ff162b4cc056713d40c6f80b84b2582cd0600100444e006b0b378bba8d93d3190d5d28a010e982d227 SHA512 d511f6d393c5189fdd2e980f8ad1be96e8b6ce7d19e4f51bf8a85ce79d9bdbe1a0e9f8bcd5ca8609b907344bcaded083851a1bd5ed1fe96782091d94d6df89d0
 DIST kdevelop-5.3.3.tar.xz 6977420 BLAKE2B 8cccce2b7473551dc4ee9b9b06e8777e7f98869870ed7ee797b0e3a7c27f68d75b7af0f030dc9b0302a44ff246f69ec9125994cd72e6020e2778ac55f6d593fb SHA512 a089763045f02ef3167fab1f663503cc7a6e29cd8a42d3caa8b3a71fc1b2150162504bf4404ea070f73b3786a7389b6ee5af9ff922515445b57a0041b07e7d5d
 DIST kdevelop-5.4.1.tar.xz 7006564 BLAKE2B 98e76daca0f124f0786a0cab5a3575548ad0d2e157c72ccbe2ebee2dc1f2fd98f6d7d803991b4c426e65d16c5feb41f818440443c00b9bcf472d9c42fbdbd2fd SHA512 096d6e1d93b4faff5988d92381bea9c31048cc686cb71c52c66d54249c8cdae50dce03f63b6cd2a6ee1f15898f619ab7307fad58281186fb6d410b2ace2041d0
-EBUILD kdevelop-5.3.3.ebuild 3743 BLAKE2B 8a6890151d7ae15823f0e30baa0c85e08f3dc1bae68dd199eb2969dc396afed40d1080535f487a54713660810e565bfe0c91488d17ab84ac2c687b05aeedd4a4 SHA512 068b4849fd58ab629b427c5f445f2c7ba933d4ab109d6a2fa83caa5e0401950ffd2e59fa234d1154891b3ae058102ca222197bd77fcd5224399ee31bf3a62913
+DIST kdevelop-5.4.2.tar.xz 7006096 BLAKE2B 105f7377e960f6012e9e976a14475b67e15038cb376c6ec499ef33f17c59ff1e068866deafb24aa1392bf0a3c833cdffeac122262dd38dc45eeca8fea69f0df8 SHA512 de25d70f2e82f61ef95ce2c6289146c52c368e93a3d23b17a2b95d14e64b599b64af32c2de2501c236f2954d981709c168fecddb4dbcf5425014d6a6e938d53b
+EBUILD kdevelop-5.3.3.ebuild 3796 BLAKE2B f0dd1488afb9408bcf6f44f1dcb0c948ad69e2f6c89e2328a9fc00c43295acef256d1d9527a0e576d8141ad32d99502e26944dd1d2d4942b1753e404b2a38455 SHA512 98fbd77a30b1e1623116c36f0098527126119cf27e982ea02c3bc9d4cd1e9a344eeb8e01853ce4cb9fb468dcf087ffa92b6c15afec38eecadb6385aefe9a24dc
 EBUILD kdevelop-5.4.1.ebuild 3841 BLAKE2B e8fa0d79c9fbee238100926098fc5c79d7f6a732f67772bf7721472a21694cdec2cc09bb64ac6f4b8c99f6d2afe886f866782e0398016778a8aef44e24a3a480 SHA512 91d50b6cf5f6e0391e104b5156ea0a9e919e720aa16972d98a5132573c466300a4c44a8998da6626c874c19c58dcc8495ca58b344a8a311c89f8a3791c7eb2f8
+EBUILD kdevelop-5.4.2.ebuild 3866 BLAKE2B b23ea12b86f92c955f5fb3f7f716cf3a5ac1546eee6a94aaa201ef5cea3020359e4db7c9f07169954bbe45a4312527f1d7d87339f54ac05bd5d5ca4e95369feb SHA512 fcbc57247d26f97a2e5032cc66052e8e34864fee77db9b7e8f21cc68395c485a601207c7f45aa2130f50537ceb21abe5d6ca79e856a4f4895bf782162a864d0d
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch b/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch
new file mode 100644
index 000000000000..39b1122f7189
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch
@@ -0,0 +1,25 @@
+From 125259eab4ddc525e816a9479d93038bffb73353 Mon Sep 17 00:00:00 2001
+From: Tomaz Canabrava <tcanabrava@kde.org>
+Date: Thu, 18 Jul 2019 18:07:39 +0200
+Subject: Add missing include
+
+(cherry picked from commit 8a3d8936fc4fce7eee1bcd62c0eb473ef908268d)
+---
+ kdevplatform/shell/mainwindow_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kdevplatform/shell/mainwindow_p.h b/kdevplatform/shell/mainwindow_p.h
+index 3020957..1e915a0 100644
+--- a/kdevplatform/shell/mainwindow_p.h
++++ b/kdevplatform/shell/mainwindow_p.h
+@@ -25,7 +25,7 @@ Boston, MA 02110-1301, USA.
+ #include <QObject>
+ #include <QPointer>
+ #include <QWidget>
+-
++#include <QMap>
+ #include <KXMLGUIClient>
+ 
+ #include <language/util/navigationtooltip.h>
+-- 
+cgit v1.1
diff --git a/dev-util/kdevelop/kdevelop-5.3.3.ebuild b/dev-util/kdevelop/kdevelop-5.3.3.ebuild
index 9f502160d9d4..0e818dc362fa 100644
--- a/dev-util/kdevelop/kdevelop-5.3.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.3.3.ebuild
@@ -93,6 +93,8 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT+=" test"
 # see bug 366471
 
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)
diff --git a/dev-util/kdevelop/kdevelop-5.4.2.ebuild b/dev-util/kdevelop/kdevelop-5.4.2.ebuild
new file mode 100644
index 000000000000..5ed1e8f93f5d
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.4.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5/54" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
+IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(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 kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(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 kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep threadweaver)
+	$(add_kdeapps_dep libkomparediff2)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qthelp)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	>=dev-util/astyle-3.1:=
+	>=sys-devel/clang-3.8.0:=
+	gdbui? ( $(add_plasma_dep libksysguard) )
+	hex? ( app-editors/okteta:5 )
+	plasma? (
+		$(add_frameworks_dep krunner)
+		$(add_frameworks_dep plasma)
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	reviewboard? ( $(add_frameworks_dep purpose) )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
+	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kio-extras)
+	$(add_qt_dep qdbus)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
+	dev-util/ninja
+	>=sys-devel/gdb-7.0[python]
+	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
+	!dev-util/kdevelop-clang-tidy
+	!dev-util/kdevplatform
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake-utils_use_find_package plasma KF5Plasma)
+		$(cmake-utils_use_find_package hex OktetaKastenControllers)
+		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake-utils_use_find_package reviewboard KF5Purpose)
+		$(cmake-utils_use_find_package subversion SubversionLibrary)
+		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
+	)
+
+	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/konsole" ; then
+		elog "For konsole view, please install kde-apps/konsole"
+	fi
+
+	if ! has_version "dev-util/cppcheck" ; then
+		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
+	fi
+
+	if ! has_version "dev-util/heaptrack[qt5]" ; then
+		elog "For heap memory profiling support, please install dev-util/heaptrack"
+	fi
+
+	if ! has_version "dev-util/clazy" ; then
+		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
+	fi
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index c2db450b7710..b03e50f44506 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,11 +1,8 @@
-AUX meson-0.49-python3.5-tests.patch 1228 BLAKE2B 1cf444e239ec6c24f0fef9d20edf92e364c5c55debf61c115559cacb676596e98a9e01970661b16c4a95bfbf161d6c02e314bbe746979cb77c8f7f6dc5ce7fa6 SHA512 c856436331f6d80912e0519303051e49f4c2c08d348e575ff71b2628621ce752148bccf7aa348d0f27d7df11ff15ee96439d4438d0a2755e1f6c66d2be0ac942
-DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f
-DIST meson-0.49.2.tar.gz 1340730 BLAKE2B 07931bca42907eb961f5f15da5216448d33539a091de4e7df53f0713471f2b0c581d1e3f9ba7eac2a87b61861e5408a5af1a5cb8c17c9561f81cd377b2ea7fc3 SHA512 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d
 DIST meson-0.50.1.tar.gz 1402160 BLAKE2B 051e9949f3a216c1074ec826c6a232124a3d2615dc03f83f57bfe96427cd44aa95e2ec7c688e87252d0179882f91e0ccf440eda4b47ff2f0d3af7382a530e011 SHA512 0dcc19007b3b1626e198c0a4ddb0f37dfdfe25f447e511a772b302bffc02187a3e56046daea01a0ad5cf611d557bae12d5b858bb7a44f69919b9ac9ad696aafd
 DIST meson-0.51.1.tar.gz 1451234 BLAKE2B 8a925bfa3d622f75eb180226311a6531cde435a5a6573663f44ba67dbefa63f76b8bd17eb23d291594fe66a379ebc8aef5f1e680973a59b0b52c41fe09e4cdcf SHA512 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c
-EBUILD meson-0.48.2.ebuild 1737 BLAKE2B eb62b3cb156cd4c686bc9da4b5e69a4ab21dbcf61ca48740724e3fb88468c479f23c9e524825d18c528cc38f4aba067c8f5144530911fac94b0b1344d26ad57f SHA512 161336944be7a6bbe552f63d2712f24aaabe634b73a0bf5631bb73c5001164755f6488c1cf6590e5ef060cc7bd02af35863d147ea753f2ac4a090898030519a0
-EBUILD meson-0.49.2.ebuild 1764 BLAKE2B 897dc3089b7a4e645dafe38e407a02723e182f53102b6a0a953eac810124bfbf34c6495638dee835fd940957bd69dbc3887c67dfe81490282c839dc0fdeebfad SHA512 490420403cc9c56b6d652beba7f89964020dbdae40781b83385160a09d3ee797a9c2589fff2fc359fb9f955d0575b58d30b3e9ae9dd8b3b6c480665d0efe1667
+DIST meson-0.51.2.tar.gz 1453328 BLAKE2B 514995ba8db534ecd488e99fb1aed25d33de73ca65fdfaf18584bd8c113eca3602a73ac42f2ae5ddd4362f8989a02d3d3aa75487ba665706c75039e3f039056c SHA512 332fa0801accd91dc8f3cc1e4e701b1139fdb17c4ae8371fab419e83305ef41534e5f367fbd9323936afb6912d5c3e7cffa9cef658550fad0861ccca9812d5b0
 EBUILD meson-0.50.1.ebuild 1717 BLAKE2B fef0e6f1b04e505a25759907af4a0839241a0e3334ee08525f1e91f2ec47dcc36f08ec29cfc80a9b28e0863550724b19590dea1c182c079871a432b36b06a63d SHA512 81d3c76ca483b5ab174a5ba1b1b3b61dff1a03405668f0ee03ba265049684da03c3abe02241135d48d5ca957d7b94095e1749684eba258b88cb7d854239a507b
-EBUILD meson-0.51.1.ebuild 1730 BLAKE2B 768a89b9e09b19ccb667d701d4bd7ac3c33a98aa75857c474d5044dbcd7b95050d1918309ec82e0eff5edd9271fa1aef03b1c9645a8f759fa30cd96cf9177de3 SHA512 578b995135b68899d65eac8710eeab1c58f1f89be03710c38386e5d1c6bc0b6e50fca920421e322692cc7543b42dc17e642f8cab0d1726b8e4fc7917ce4a70a0
-EBUILD meson-9999.ebuild 1730 BLAKE2B 768a89b9e09b19ccb667d701d4bd7ac3c33a98aa75857c474d5044dbcd7b95050d1918309ec82e0eff5edd9271fa1aef03b1c9645a8f759fa30cd96cf9177de3 SHA512 578b995135b68899d65eac8710eeab1c58f1f89be03710c38386e5d1c6bc0b6e50fca920421e322692cc7543b42dc17e642f8cab0d1726b8e4fc7917ce4a70a0
+EBUILD meson-0.51.1.ebuild 1955 BLAKE2B 262d70d7d4321213248c7fecf2370f921d882c4571d904079605838b3d21815825e265346bfb33f115be6127264a58c495476ed335650c9345bd03433c985584 SHA512 61912689b45e4823e62da762b65d0063267fef830595a94cf29fe1a2e95cc9fca8db2fff72df70fc2abd4a68177f4d8cb365dc7dfd41d2238a3488d92d3a4799
+EBUILD meson-0.51.2.ebuild 1965 BLAKE2B 2957586ed283d5dcb684753b39785e3c02d72acbc7b3d6565cd9e1cd3f76000435c550cff900afc7daa4ab802a56bbc37a465bcfa78ce878630ac02d875cdbb9 SHA512 1ddf31161fe432c40bec328543a3c3c31d3f9d9ca198edf2607fb03555ed48e6610ae167e0226277d59139a2d50c87031268d1041422b5820065dda1cd1baf4f
+EBUILD meson-9999.ebuild 1965 BLAKE2B 2957586ed283d5dcb684753b39785e3c02d72acbc7b3d6565cd9e1cd3f76000435c550cff900afc7daa4ab802a56bbc37a465bcfa78ce878630ac02d875cdbb9 SHA512 1ddf31161fe432c40bec328543a3c3c31d3f9d9ca198edf2607fb03555ed48e6610ae167e0226277d59139a2d50c87031268d1041422b5820065dda1cd1baf4f
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/files/meson-0.49-python3.5-tests.patch b/dev-util/meson/files/meson-0.49-python3.5-tests.patch
deleted file mode 100644
index 640348b2bc2d..000000000000
--- a/dev-util/meson/files/meson-0.49-python3.5-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 65192af2ff62a032a3f19d065c95e12b83aae709 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@collabora.com>
-Date: Fri, 11 Jan 2019 18:03:15 +0000
-Subject: [PATCH] run_unittests: Use Python 3.5-compatible subprocess
- invocation
-
-subprocess.run() didn't get the encoding parameter until 3.6.
-
-Signed-off-by: Simon McVittie <smcv@collabora.com>
----
- run_unittests.py | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 342ad883..e1246140 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -5029,10 +5029,9 @@ class NativeFileTests(BasePlatformTests):
-                     ret = subprocess.run(
-                         ["{}"] + extra_args,
-                         stdout=subprocess.PIPE,
--                        stderr=subprocess.PIPE,
--                        encoding='utf-8')
--                    print(ret.stdout)
--                    print(ret.stderr, file=sys.stderr)
-+                        stderr=subprocess.PIPE)
-+                    print(ret.stdout.decode('utf-8'))
-+                    print(ret.stderr.decode('utf-8'), file=sys.stderr)
-                     sys.exit(ret.returncode)
- 
-                 if __name__ == '__main__':
--- 
-2.21.0
-
diff --git a/dev-util/meson/meson-0.48.2.ebuild b/dev-util/meson/meson-0.48.2.ebuild
deleted file mode 100644
index b6374c8e969f..000000000000
--- a/dev-util/meson/meson-0.48.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2016-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 ~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-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild
deleted file mode 100644
index 795f89a188d2..000000000000
--- a/dev-util/meson/meson-0.49.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2016-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
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/meson-0.49-python3.5-tests.patch"
-)
-
-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() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		distutils-r1_src_test
-	fi
-}
-
-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.51.1.ebuild b/dev-util/meson/meson-0.51.1.ebuild
index 33a23e5a8708..74eddfbf1864 100644
--- a/dev-util/meson/meson-0.51.1.ebuild
+++ b/dev-util/meson/meson-0.51.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 		dev-libs/gobject-introspection
 		dev-util/ninja
 		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
 	)
 "
@@ -38,6 +39,10 @@ python_prepare_all() {
 	# https://bugs.gentoo.org/673016
 	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
 
+	# ASAN is unsupported on some targets
+	# https://bugs.gentoo.org/692822
+	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
+
 	distutils-r1_python_prepare_all
 }
 
@@ -46,6 +51,8 @@ src_test() {
 	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
 		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
 	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
 		distutils-r1_src_test
 	fi
 }
diff --git a/dev-util/meson/meson-0.51.2.ebuild b/dev-util/meson/meson-0.51.2.ebuild
new file mode 100644
index 000000000000..782127bd368c
--- /dev/null
+++ b/dev-util/meson/meson-0.51.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~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
+		sys-libs/zlib[static-libs(+)]
+		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
+
+	# ASAN is unsupported on some targets
+	# https://bugs.gentoo.org/692822
+	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+		distutils-r1_src_test
+	fi
+}
+
+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 33a23e5a8708..782127bd368c 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 		dev-libs/gobject-introspection
 		dev-util/ninja
 		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
 		virtual/pkgconfig
 	)
 "
@@ -38,6 +39,10 @@ python_prepare_all() {
 	# https://bugs.gentoo.org/673016
 	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
 
+	# ASAN is unsupported on some targets
+	# https://bugs.gentoo.org/692822
+	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
+
 	distutils-r1_python_prepare_all
 }
 
@@ -46,6 +51,8 @@ src_test() {
 	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
 		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
 	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
 		distutils-r1_src_test
 	fi
 }
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 685ef582535c..668c820ce682 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,4 +1,6 @@
-DIST pkgcheck-0.5.4.tar.gz 95354 BLAKE2B ce39854d494db7a7d3412690b8a789f3d78d2a7d0519f11397ec8b02bd03118f171eeba8fe37207e9c18bdf28e7e321ec06d8bb84f9302c07b5238c0851df1e3 SHA512 3c196ce170bb01f0a9f15caa8557e30cad8e088ab9bc733ac754e9c5f6d9078a70a4d14649ee5342848cc170f3c34d7575b35872c5d1a5693fb7aad207727b1b
-EBUILD pkgcheck-0.5.4.ebuild 1329 BLAKE2B 06d0c18872ff72005cf1f613d3dbace72cab4378e1ea60747e18fa665e4314671c235d8a999beed28cd8957097fcc3cb5099e023042f1fcc8ff87f90a5410d3c SHA512 91fbef02f96fb1c3110f9b58d3ba47dcefe9fa0b0b1b434ffdb5b6f44a7336431816392b0fa38a47393e41ab22fe8d141bf184e45fe9e32dd8c36140e2c31223
-EBUILD pkgcheck-9999.ebuild 1277 BLAKE2B a51bd3b1a5edf2635fa804a1bc8ae49488d3e5a9dc22e40741e879d44f27409474872a89d5501f39e73eb1379372f1646255a03aa6ac9b3817dddc9c3f1beb1d SHA512 beae01defca87158c5a00cad2e4f22a7e537c1fb96412e023ff6e581bdbe555ef5b67f6dd6f9a582b7aa57a98d98b8d0daa3b5d03acfe0373466626f41a3dfd1
+DIST pkgcheck-0.6.2.tar.gz 169107 BLAKE2B cd7570924b6b115aae467275bc4e1b26a7c20454860d614c23f96c45f5856d6cc8874aa4ba6d250591eae2f5ef0da8102124a924dfdeba5ca75a17fc1005eaaf SHA512 8684fd40694f4348150bd10e4ad4cfb99cf4978595ccd77e117b50abb54060ef1f9d2a9889279ce139b95c39b6b755ccb8c9604a84ea62892e519552e27ca5af
+DIST pkgcheck-0.6.3.tar.gz 171317 BLAKE2B 76e74cb7b7ce093aec6eff210b4984b195adfa615bdfa9937d47725246a8f0f4074a5d7fe0537e9b556df08906cb738f109eb0bcd980966b1baba4f754888285 SHA512 888bcbe66603de97f92f0bd9a35de6b177724b752e70f55a04cb1ae17c32a476986b9d5165cbf92819c1945bf481529943ef6fe3cfd72739749149760c9809c3
+EBUILD pkgcheck-0.6.2.ebuild 1344 BLAKE2B a84d785972b55a4dfe414c9afbfcb66a436dfa3f1f05b5ac5937e3296dadd315587de3becf3c789bb1cfe2321583272923cdadf0e71490457256ca44d8627699 SHA512 17df39ba1a46e6efeab2fcc6b8188591b837e29c18a128d9b7489fcf19ba12512fbc080f93004b2f9922f520fbf51fbff24961fc35b9bd708f317ada8296e53f
+EBUILD pkgcheck-0.6.3.ebuild 1344 BLAKE2B 6aae272faa382357c84dc6318f7c0965c1619d4e128ba34b7e85a3cc3a1a78c754f55f9e4df614e3800ec9fafc169e0a2e62d61c0c87d442804ad1f90ec0c6a2 SHA512 d3a92545b88cd224088a13b3255824ea3200af1561df632ad15113f032bcaeb67848cd1ec038af5145524ec88041e79b590733be74f4110d26315c130ed5603a
+EBUILD pkgcheck-9999.ebuild 1344 BLAKE2B 6aae272faa382357c84dc6318f7c0965c1619d4e128ba34b7e85a3cc3a1a78c754f55f9e4df614e3800ec9fafc169e0a2e62d61c0c87d442804ad1f90ec0c6a2 SHA512 d3a92545b88cd224088a13b3255824ea3200af1561df632ad15113f032bcaeb67848cd1ec038af5145524ec88041e79b590733be74f4110d26315c130ed5603a
 MISC metadata.xml 337 BLAKE2B 515d4c48bd17aa665f445ee52a54bef10f3ea5c35ca4ca51e7d4389fe99d86685b9bafbab38f390a4b6fbb0df5d504a1468888d3fec5383e686ff19345658f86 SHA512 e2f31f9cc7fe4296758b15b222f7f14ff04a78d28850bc48f67af0fba4a561f6da63191ebaba73fc6623d12296ad6137ec84b74a5eb9b6b76c929d7029468a71
diff --git a/dev-util/pkgcheck/pkgcheck-0.5.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.5.4.ebuild
deleted file mode 100644
index aeeac7fcdedf..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.5.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		=dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		=sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.7.2[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.9.5[${PYTHON_USEDEP}]"
-fi
-RDEPEND+=" dev-python/lxml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-}
-
-python_compile_all() {
-	esetup.py build_man
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	distutils-r1_python_install install_man
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	python_foreach_impl pplugincache pkgcheck.plugins
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.6.2.ebuild b/dev-util/pkgcheck/pkgcheck-0.6.2.ebuild
new file mode 100644
index 000000000000..f244fafd53a3
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.6.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.1[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	use doc && esetup.py build_man
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS NEWS.rst )
+	esetup.py install_docs \
+		--docdir="${ED%/}/usr/share/doc/${PF}" \
+		--mandir="${ED%/}/usr/share/man"
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.6.3.ebuild b/dev-util/pkgcheck/pkgcheck-0.6.3.ebuild
new file mode 100644
index 000000000000..1a07b1b270b2
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.6.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.2[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	use doc && esetup.py build_man
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS NEWS.rst )
+	esetup.py install_docs \
+		--docdir="${ED%/}/usr/share/doc/${PF}" \
+		--mandir="${ED%/}/usr/share/man"
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 75dc351a4f38..1a07b1b270b2 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -17,9 +17,10 @@ fi
 DESCRIPTION="pkgcore-based QA utility"
 HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
-LICENSE="|| ( BSD GPL-2 )"
+LICENSE="BSD"
 SLOT="0"
-IUSE="doc"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="
@@ -27,16 +28,18 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.0[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.2[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
 
 python_compile_all() {
 	use doc && esetup.py build_man
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 423cceea6b91..4d979346db7d 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,6 +1,6 @@
 DIST pkgconf-1.5.4.tar.xz 290380 BLAKE2B 8353901e9fe86f05abc82c5906b24ec902086f5c9a08ffdc9f6d53ecdebcf7c52eb9bbaef019285332182ca8f489cfe872f25bfe110e280031a553331df09bcb SHA512 795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93
 DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
 EBUILD pkgconf-1.5.4.ebuild 1393 BLAKE2B 07808f0e52d9fe36b5a3a54758d956e1fc726bcad1110cc17c0b065afd8fc3727b293682d590ab6d3bf3af35ed3112c1aad3485f37a0520e0d041056f1e19b55 SHA512 0da4bc185049ad5387261fb80979ced945f3c5f8b75d3d310f6a282bf5323035e06b345fb3c92f56cf58cdbfc9dc8b3513bf4d587c98a5265bc6df9775698105
-EBUILD pkgconf-1.6.3.ebuild 1676 BLAKE2B e002af8ed8e0fd66befdc63c6da948f317814cca96a9a05b621152f7275f602bdf51675c6efb42298d281bebb89fc40c547831a3831b2a82c79d1d9e5808d0ed SHA512 a34a92898fd598e3eadd092c63750fcba010d64aaa366a231f790a6323a462c54416c02a7d7002dfe0439ab2e1192b60a099051a7fbffed2779c8e79c11a95f6
+EBUILD pkgconf-1.6.3.ebuild 1667 BLAKE2B adf15678d3c814f2d2afeafacaea8ddd636f6a19680cca166e26e7eb6822dda6832c4d29a9e81f82746d74c36ef25d8980f67686f5f8d3c81bab4ee008da3874 SHA512 fd509030288c89acb4ec955af4373b15d6311519518cf4dc0984d854ecf95ea0fcc732fb37e0dc4c044203ccb8a492f83b774e8a281aebc91c5e183dc029779e
 EBUILD pkgconf-9999.ebuild 1676 BLAKE2B e002af8ed8e0fd66befdc63c6da948f317814cca96a9a05b621152f7275f602bdf51675c6efb42298d281bebb89fc40c547831a3831b2a82c79d1d9e5808d0ed SHA512 a34a92898fd598e3eadd092c63750fcba010d64aaa366a231f790a6323a462c54416c02a7d7002dfe0439ab2e1192b60a099051a7fbffed2779c8e79c11a95f6
 MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
index 5f58337eda71..8cf602f946e1 100644
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/pscan/Manifest b/dev-util/pscan/Manifest
index 7f379a832363..b419922f5eed 100644
--- a/dev-util/pscan/Manifest
+++ b/dev-util/pscan/Manifest
@@ -1,3 +1,4 @@
-DIST pscan.tar.gz 14555 BLAKE2B 8e1a8ea91bc2a1b323dc607f703565579e596a3001151609e46a09160766b3b913610a15b64859dc88031a3acf2e3c147dcbd7b033517d3786976ab3cb1bc9f4 SHA512 83196cc9c450217fc2287d38fd1a0b9d1d9951b8f6328b6b9f7f50b680f653b099af04d4c448f3cb2b2a96871eec8772557851e887faa2f41dc259f01c031e78
-EBUILD pscan-20000721-r1.ebuild 843 BLAKE2B 3fd9ff6066f1e57413c5c2aa1ec6e69102653d88e6713267b3e70b533bcd68ddde2b5dc84ffc5f169baca72379c116b2ab321b36c47dcf25232f1135f8bb4d3f SHA512 bd81029aeaae61446dbf2f4e8ac3b94b689a51ea30a9b0ef99c9a5435bc6aa90b2a655df5f43db91ab912e9854629fecdaf6bb1499f57e3857af376c4e05d8d7
+AUX pscan-20000721-fix-build-system.patch 380 BLAKE2B 93c29ae8c17a798bd7b0a28c43dfed21410f336fa17c7ba58c2c9b5588831ad6ca6e056d2cf9d6375bc2ba1e043665525aa58e903545691f9d6bd21616d11b5d SHA512 9c0e2b237553ae396398c0e0727b5eed7879ea112d940289c60be4e3f289dbcddeedbbfb4c9563e558dbc96d0f7420e672b9d70cc488be86b00ef42b5abbf76c
+DIST pscan-20000721.tar.gz 14555 BLAKE2B 8e1a8ea91bc2a1b323dc607f703565579e596a3001151609e46a09160766b3b913610a15b64859dc88031a3acf2e3c147dcbd7b033517d3786976ab3cb1bc9f4 SHA512 83196cc9c450217fc2287d38fd1a0b9d1d9951b8f6328b6b9f7f50b680f653b099af04d4c448f3cb2b2a96871eec8772557851e887faa2f41dc259f01c031e78
+EBUILD pscan-20000721-r1.ebuild 743 BLAKE2B f7020c464af54a911d5d51d240371895799cf89d40d210b388d9c0fe568616d359187432ff4612df1ff4f0fe9addb7c68288b3346d8b7f783f9544bafbae73dd SHA512 0aaf95f7a7e037aba1d0fc24fb8045ee9cd08fbf3f27299c0ce995729519f1f788bb3d3addf98f82eaec101f79a0a82c6ee6352f999e68b8ac5b30a1e35d7b4b
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/dev-util/pscan/files/pscan-20000721-fix-build-system.patch b/dev-util/pscan/files/pscan-20000721-fix-build-system.patch
new file mode 100644
index 000000000000..cd22fc2eb195
--- /dev/null
+++ b/dev-util/pscan/files/pscan-20000721-fix-build-system.patch
@@ -0,0 +1,20 @@
+--- a/Makefile
++++ b/Makefile
+@@ -13,16 +13,10 @@
+ #CC=gcc -Wall -g
+ #LEX=flex
+ 
+-pscan: scanner.yy.o pscan.o
+-	$(CC) scanner.yy.o pscan.o -o pscan
+-
+-scanner.yy.o: scanner.yy.c
+-	$(CC) -c scanner.yy.c -o scanner.yy.o
++pscan: scanner.yy.o
+ 
+ scanner.yy.c: scanner.l
+ 	$(LEX) -t scanner.l > scanner.yy.c
+ 
+-pscan.o: pscan.c pscan.h
+-
+ clean:
+ 	rm -f *.o *~ pscan scanner.yy.c core
diff --git a/dev-util/pscan/pscan-20000721-r1.ebuild b/dev-util/pscan/pscan-20000721-r1.ebuild
index 11c078d3650b..e63242af2bde 100644
--- a/dev-util/pscan/pscan-20000721-r1.ebuild
+++ b/dev-util/pscan/pscan-20000721-r1.ebuild
@@ -1,34 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit toolchain-funcs
 
 DESCRIPTION="A limited problem scanner for C source files"
 HOMEPAGE="http://www.striker.ottawa.on.ca/~aland/pscan/"
-# I wish upstream would version their files, even if it's only with a date
-SRC_URI="http://www.striker.ottawa.on.ca/~aland/pscan/pscan.tar.gz"
+SRC_URI="mirror://gentoo/pscan.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
-
 # Does NOT contain a testsuite, but does contain a test.c that confuses src_test
 RESTRICT="test"
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-devel/flex"
+BDEPEND="sys-devel/flex"
 
 S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
-src_compile() {
-	emake CC="$(tc-getCC) ${CFLAGS}" || die
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	newbin pscan printf-scan || die
-	dodoc README find_formats.sh test.c wu-ftpd.pscan || die
+	newbin pscan printf-scan
+	dodoc README find_formats.sh test.c wu-ftpd.pscan
 }
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 1bfe1f4d9abe..f0c19c8fde7d 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -5,9 +5,11 @@ DIST radare2-3.5.1.tar.gz 7083677 BLAKE2B 3d84e79d4e20e031b6cfdbabcf80922f977328
 DIST radare2-3.6.0.tar.gz 7339427 BLAKE2B 60ecd110ac4cafa38dd10f49321e984e98f189398f15196614fb096970cc2f24981ffbbd161fdd55621b65c45a8fb9f843f273bf245ac0ea2b4493981ab0477d SHA512 15c02b744892934bd0b4beeb146d8a0289244405214b62892d7e307cd42f6706aca16c1e02b6b2beb5b6869c5c5920cc291ffec8a690b5338c6973a5e1d7900e
 DIST radare2-3.7.0.tar.gz 7478494 BLAKE2B 547efda30a65783758b132f4b241039b83bb274904a1f69616e60ec83547b22da486e97df06a74cd82f855650dbc3802d31bf3cb00ebd12d956848efd4b6ff5e SHA512 8e4d1b89d0d1e717403ba0bc2ce47e2644d12303ed5391fe4b9efc11b86a0b9c9356fdea1caecabe16d88ded9577fe77c182225adf2fdbd63b2e48f9c9c9f52d
 DIST radare2-3.7.1.tar.gz 7481103 BLAKE2B 4bae07dad298a45704ee45740bc3376902dfa35631efc94874666ead0b9c3dbb407558f4c02283d0909970247bc7730754cad9c6b6859a23ab40f408eff9102e SHA512 972c137e20d73a4cc8001c6d3e3b0c68874ed4a837d2ec20f26bc164a5451dbd46264471adc93332eecadd86d8023579fa69b42fce0291f49979b451118c7673
+DIST radare2-3.8.0.tar.gz 7510078 BLAKE2B c3dcc28c0cda8c7c5f8dbc6d35c3d15fa73fec8402acfd5de0b3ea85ef0295608d2332efbb29a41e75239acafb66b1c3b946f58523d9e5bb605b70ddce3ce38d SHA512 c9a1a4e7743b54026990d7473f05fb8eb25d7a7f0fd985172587ce82b8f6fefb53dd181b0bdb8463d2460c71e4a9eb377ead4ef7379615c90aa858d8fcadeadb
 EBUILD radare2-3.5.1-r1.ebuild 1210 BLAKE2B 8bbc76b7d1097416f53e8d70c12e5460d1c2971ff2d3cbf05718be0397b014f9b456dfda8411048d48ccd28de37919a9e79e6d8970228c8a9de91ff993c73ecb SHA512 9b54f5aa235c1b693235833618e822a67790773cde3847a65216dd832ef29fba8a43db7ca770d5791f03c976fe5a8b11ab9f64c79ad374947af8b34d6e4bfb0b
 EBUILD radare2-3.6.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 EBUILD radare2-3.7.0.ebuild 1220 BLAKE2B b47051fd9c3a4f0b819f86daaaecfbb95747cda74811c73d788ea055a611eb2e9248e6c80026b0f2a2958397a49b73e20f305b9cf5967522c89c26a35f32e322 SHA512 f423501872f7e672de464ad9f46d06f1fb07511c85939c015c37d89b1a44bcde0e934e324b47aadb446c6e5f8a8044fa73b751f234e1dddb64294a36e36efc84
 EBUILD radare2-3.7.1.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
+EBUILD radare2-3.8.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 EBUILD radare2-9999.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/radare2-3.8.0.ebuild b/dev-util/radare2/radare2-3.8.0.ebuild
new file mode 100644
index 000000000000..0b3f4cfb432b
--- /dev/null
+++ b/dev-util/radare2/radare2-3.8.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 bash-completion-r1 eutils
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radare/radare2"
+else
+	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+	dev-libs/capstone:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d $d ]]; then
+			rm -rfv "$d" || die "failed to delete '$d'"
+		fi
+	done
+}
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 342b79f9b920..774cf0e64b78 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,4 +1,7 @@
 AUX rocminfo-2.6.0-cmake-variables.patch 1107 BLAKE2B b613dee2b0b44cf4d31afbe3647ebc2c511903c5a6a6a0f74b6c5b419ab17f81b1d92f5802667bfce4444f839f3dedaea0785e2cdac14b7b49be6a9b97c12971 SHA512 59fcf341a381a1fc3c60c8f4f33050f6e31f0f29f53bb9abf2d0c2d0ed28c18f799ed49bf64ebe30a8e94c463aa88a735b1895df955c671f7e589350ea010ebe
+AUX rocminfo-2.7.0-sizeof.patch 1083 BLAKE2B c86e9f90660afa39b2cfcd6c5362734db31d0492ce4e9a39e9f1ca438c124f5f7e280232a1a3d0123ab2034d9fda504d8b766931638b6bba2cd883703df95183 SHA512 e32fb0cdb750780c011d032f44ae64186ad02c24cf9de8506b3224c49439d167b1c4b2f8c850765db8a210a308481bd8a69d5577bb0244ef75d68778972d791a
 DIST rocminfo-2.6.0.tar.gz 12293 BLAKE2B b08725b45f48e78841da9d6e57bb19a441a423e20f853d16024c620914059abf3cb2e61c12ae6fdfdb85eb3e984d488ae9975ab3fd2fcc529ecb576c6816fc92 SHA512 e2dae7e2e02b674b3ad959a3dffdcd8f550842edfd0eac5866259a6a12de1a5f935afbdcb37845fa189d0937c41186f0eb8be08e7b346ddef959d5dd7b62dca7
+DIST rocminfo-2.7.0.tar.gz 12671 BLAKE2B 6cb6e2fa458224654f4b672d117e2a6c71c7d5aeed8ac71cf7ecddb76d9209f25596521b31465a94fde1c91744fc9bf68e637f7ff4f67a000cbfbe4793c5fa4b SHA512 ffdaa3d11d85475c7600c6b25d8eb7f90cbda13b820f33c250a7ac9b90f92d4d5352d8baee765b4bd3b9c7389b5ab6d3b87df77bf62d6696ed8cd96bfc6be1a0
 EBUILD rocminfo-2.6.0.ebuild 859 BLAKE2B 4e9d3a3472d368d74969ed7bfd5d269343a9612f0ee558d201d5ba24e033c9ad62ce8717abc282147c35dc01cef93e86770a89923ea8fe434bc569a6393be080 SHA512 c10a8cd4a853d7d343d907502c0064f6453cc876e6b34f6c63aec7a355f5114f598478f83d723dcc86d45c0e620b71d6e1d7bf18da429d8619fd0d699bdda88f
+EBUILD rocminfo-2.7.0.ebuild 899 BLAKE2B d353500d57cf39ce63a8caccf6f9ed29d6181aa532a2054fb9ebab01502ac7a5a44d8b871d5763ee5af0111c7d11b7c6f3d1173eac6bbe75267a4513d1cd12c1 SHA512 57b2c8f3f806bde49656a749855c0797559d4d05800d62d8cce295292d11ff51315f871f14ee5c7d2c5294ccd065343134c8e3ba96bc1a60ccf16e03b5601da2
 MISC metadata.xml 475 BLAKE2B c1ca0f1d0ec94ae012d3a6c2e5b0a896de75fae32ab8af40d2d0e8747544c15f11ce76cc45bd429d4b5b3b3abde5c896fed362641abf995c4bf9f10077e6933d SHA512 f84d5a379fc07d3410bf6cf946c91056295dccad64f100be02959d94e39eaa47d4fcfed84ea2bd596b2ecccb4ad3267bd86cd76b50d938b235655220fcef1549
diff --git a/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch b/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch
new file mode 100644
index 000000000000..2d96bb227791
--- /dev/null
+++ b/dev-util/rocminfo/files/rocminfo-2.7.0-sizeof.patch
@@ -0,0 +1,23 @@
+From cf96f42165fe76b98f653f979b4c182279dcac64 Mon Sep 17 00:00:00 2001
+From: Wilfried Holzke <gentoo@holzke.net>
+Date: Fri, 16 Aug 2019 22:04:52 +0200
+Subject: [PATCH] Fixed sizeof(err_val) to return the number of characters in
+ the array
+
+---
+ rocminfo.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rocminfo.cc b/rocminfo.cc
+index 9fddcfb..ee20da8 100755
+--- a/rocminfo.cc
++++ b/rocminfo.cc
+@@ -72,7 +72,7 @@
+     char* err_str = NULL;                                                     \
+     if (hsa_status_string(err,                                                \
+             (const char**)&err_str) != HSA_STATUS_SUCCESS) {                  \
+-      snprintf(&(err_val[0]), sizeof(err_val[12]), "%#x", (uint32_t)err);     \
++      snprintf(&(err_val[0]), sizeof(err_val), "%#x", (uint32_t)err);         \
+       err_str = &(err_val[0]);                                                \
+     }                                                                         \
+     printf("%shsa api call failure at: %s:%d\n",                              \
diff --git a/dev-util/rocminfo/rocminfo-2.7.0.ebuild b/dev-util/rocminfo/rocminfo-2.7.0.ebuild
new file mode 100644
index 000000000000..6a46a0806b11
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-2.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocminfo-roc-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.0-cmake-variables.patch"
+	"${FILESDIR}/${P}-sizeof.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DROCM_DIR="${ESYSROOT}/usr"
+		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
+		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index d67856a63443..d670506f37d5 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -3,4 +3,4 @@ AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4
 DIST schroot_1.6.10-2.debian.tar.xz 34296 BLAKE2B 5c712bca72f938d01a9927d846ab48bca83f7f7ed01cee7b7d4caf9c6b5b38ad650152f68dd989fd93032fb669b8208fff09eaf83be7b7e712fcd41caafbc191 SHA512 ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
 EBUILD schroot-1.6.10-r4.ebuild 3759 BLAKE2B f389b68a46ca5edb2054ecaff03d28873d689b3d6f8a8a0cce45e65a5be7cec4e78fc5346c2e4f33572d41b0b6934fb607a201bc294a47ba595211c062c171b9 SHA512 a9dd8c9c35e5d64bc0e686cfedce9295cd24589758d966dd15b9046f588973822c4f97c2cb288f9e98654e6167c4786109d7c859e47c3836d6286d35c4d1401a
-MISC metadata.xml 451 BLAKE2B c37cf286c387974fb9d4d9145724da0340d8846ee772548915fbfc24530567b7fda09fdb845a6918ff70e55c6d33621d586da51a8ed222de820035a1eea71eb1 SHA512 372b1bc77d13fde4eff8f5e45bab2a3c75152d05c7fbc272e5bb119e2edf9f8931acb426ca06b413cbcd7b4476424fdbc9eec49b865dd9cd2990bed88201d40a
+MISC metadata.xml 535 BLAKE2B d75765d4d0f53fbf6469382c1c55285343ce910b13c50997b7840cdaf1f4735af9411f76b18c048db9309f98e63906388836e15cb9cd47ce2c6c437e80220aaa SHA512 1b2ee12df6e663938c1dd3de76ef2597d82f179b3ad8bfea277094a132482b57bb5241a2001919c4b1e94c5569786f2c1d03e3aa567048a0eeaadeb483e93d1f
diff --git a/dev-util/schroot/metadata.xml b/dev-util/schroot/metadata.xml
index cc3f6c238b48..2cca4eb6a236 100644
--- a/dev-util/schroot/metadata.xml
+++ b/dev-util/schroot/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-  <flag name="btrfs">Enable support for chroots using btrfs snapshots.</flag>
-  <flag name="dchroot">Enables the building of a wrapper named "dchroot", replacing <pkg>sys-apps/dchroot</pkg>.</flag>
-  <flag name="lvm">Enable support for chroots using LVM snapshots.</flag>
-</use>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<use>
+		<flag name="btrfs">Enable support for chroots using btrfs snapshots</flag>
+		<flag name="dchroot">Enables the building of a wrapper named "dchroot", replacing <pkg>sys-apps/dchroot</pkg></flag>
+		<flag name="lvm">Enable support for chroots using LVM snapshots</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index d2db0db0c601..7b8c7a5f0cda 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,9 +1,4 @@
 AUX spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch 533 BLAKE2B 4d0d1b4c605681b2dbfc4c52730c9f20f8290f11a2be9c37db78e533a996c22140faafc2691c732b49b9de28a59644bd5e39a2b7d4209eb44486cdeee1338de8 SHA512 db4786a10e4380f4575d52cf861a82d0aa9f69cec7d47d574f453d159396e993527ba4e469fab75fabc36b977ee4b61abb9e3787ee2af45af8f5865b3b06e10c
-DIST spirv-llvm-translator-8.0.0.1-LowerOpenCL_new_block_representation.patch.xz 10108 BLAKE2B 96492a7d3ab25e1fe837ced225d50c7450595af52bc3aa6c17e02dc08c1cccaf7ca8dc5949da17da7cc6ea5fcae8688a5994a50bb7693a52493520e57981bc48 SHA512 574ca7b7fe054e82ee154556555e2d184f102faa7da08ce9d6ca5d2ca37463c7a86b3861b93969f9c886544551af8c8f95e57363ea017f7fc426b56d97eb7cf2
-DIST spirv-llvm-translator-8.0.0.1.tar.gz 437384 BLAKE2B bca52bfec04d0adc08b00f5fdbcb6cf953be00f835d2a393545e77bd8776063ef91e8fb62c232b50cbeab58a0a01bea6e47b89c1756699bf35481e87823995de SHA512 85faf176d1ce79d19f10c88055f4a102a5952dcdcd6709e5e5cfdbf69eb958d51020a3ad34198c7c874b42ee8e318f1ce3169ea92853134dfff3dc5843f84414
 DIST spirv-llvm-translator-8.0.1.1.tar.gz 451282 BLAKE2B 6c1a5f7b9d280b040a48d987304f11c743180cb53d7068705a5be2c66a5235fd04344e31e3538cded1e9c5bce81155e00089de65b2b8baceebe54598a1305dd3 SHA512 b0e06b967caecf9b47921e7df1fef42c5c112ccf7962888c6e2f34358e9c27acb4a549cd855625fc942c4a6bcf0e5992e4c7e4d40ff962115733fc8901d04bcc
-EBUILD spirv-llvm-translator-8.0.0.1-r1.ebuild 1650 BLAKE2B 84b0fc6c6846382d5d172f59128f7d80d058537d4cf9f9fa4105756cf3f94e034d18a48a7f156a0976b80ae4f57e371c4aadc0975397f39efc79a5ebf39cd9ad SHA512 3a4f9e284d4007d8bae05b81ee220cd963e4e26e74fc5489d9d4de77d43409e81a18948b084f71ff2eae87d1418bbed20bddaccaf37a4972b8ac074fa97193a1
-EBUILD spirv-llvm-translator-8.0.0.1.ebuild 1474 BLAKE2B 4c0f80f4ad6ca1d465fbbbe46062f9f29cd5348deadd472e5346f56329dc3a420d98d534c2490a3632ecd199798fc79753b54aaa4a4a7c44b23a33cb93158dc4 SHA512 00070420d028527cd178430ddcda231643cbf4683fbc4c547640e2651f2bcea12f44fa4fa99aadd039b889a73011fb1e293ee3d84eb0226291e6e03e42f1aae8
 EBUILD spirv-llvm-translator-8.0.1.1-r1.ebuild 1250 BLAKE2B 568a8a0e02081fed98ea15d4056cc5d13a1f90675e48110f3b016b48fc0a27a7e5911b07eb9f285d17567fff09863b7db7a35d36344acdeef97b29c66c60e370 SHA512 644ec589dcbe8b048b38f725d870f25b4eca9e2443c3e432ac27c36bee7721e2a27b2a9546caabd8c4cc17ff589b6f2eb34fcfa469073798332609176fe6ed7e
-EBUILD spirv-llvm-translator-8.0.1.1.ebuild 1464 BLAKE2B 14a3c2e8bd66418b5d99ea983b28a83577430fd16931f4c5eb83aa8e206fc33ebf8f9bd411200d8e270e0e3e3704ceae0ea4b1890fbe210c81305071e4e9b89e SHA512 8fa0fe60fbfb0329d024733d75855c5eeae9bba1f925ffae0583b7456de4299894dcd34179d3288c9dca44f161effcf7d80f1ec23618bdd3466dee915c882451
 MISC metadata.xml 442 BLAKE2B c63b20489865e563e064525b8df310eca993f15ff03cd533458729e5d6611b678e2f797d6efbe177e1bdeaed84e9bcf63921cb67318e948d579b57cc7f1cd28c SHA512 b036abe761b1aeb68ce5668eb3d501d2e5530be3456e85f51bee15c0aa8387a8be89c212308d7997a5f60bb0301bcdd22a7cb44a27324c05533aed94215b4721
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-r1.ebuild
deleted file mode 100644
index 3412d8cf4a0c..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib flag-o-matic llvm eapi7-ver
-
-MY_PN="SPIRV-LLVM-Translator"
-MY_PV="$(ver_rs 3 -)"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~marecki/dists/${PN}/${PN}-8.0.0.1-LowerOpenCL_new_block_representation.patch.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="8"
-KEYWORDS="~amd64"
-IUSE="test"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}
-	test? ( dev-python/lit )"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-8.0.0.1-LowerOpenCL_new_block_representation.patch
-	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
-)
-
-src_prepare() {
-	append-flags -fPIC
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile llvm-spirv
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	# CMake does not install the executable so do it by hand
-	if multilib_is_native_abi; then
-		exeinto "$(get_llvm_prefix)"/bin
-		doexe "${BUILD_DIR}"/tools/llvm-spirv/llvm-spirv
-	fi
-}
-
-multilib_src_test() {
-	# TODO: figure out why some tests fail on amd64 when ABI==x86
-	if multilib_is_native_abi; then
-		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
-	fi
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild
deleted file mode 100644
index 9e8e3b39fed5..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib flag-o-matic llvm eapi7-ver
-
-MY_PN="SPIRV-LLVM-Translator"
-MY_PV="$(ver_rs 3 -)"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="8"
-KEYWORDS="~amd64"
-IUSE="test"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}
-	test? ( dev-python/lit )"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
-)
-
-src_prepare() {
-	append-flags -fPIC
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile llvm-spirv
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	# CMake does not install the executable so do it by hand
-	if multilib_is_native_abi; then
-		exeinto "$(get_llvm_prefix)"/bin
-		doexe "${BUILD_DIR}"/tools/llvm-spirv/llvm-spirv
-	fi
-}
-
-multilib_src_test() {
-	# TODO: figure out why some tests fail on amd64 when ABI==x86
-	if multilib_is_native_abi; then
-		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
-	fi
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.1.ebuild
deleted file mode 100644
index cbf22d71b618..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib flag-o-matic llvm
-
-MY_PN="SPIRV-LLVM-Translator"
-MY_PV="$(ver_rs 3 -)"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="8"
-KEYWORDS="~amd64"
-IUSE="test"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}
-	test? ( dev-python/lit )"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
-)
-
-src_prepare() {
-	append-flags -fPIC
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile llvm-spirv
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	# CMake does not install the executable so do it by hand
-	if multilib_is_native_abi; then
-		exeinto "$(get_llvm_prefix)"/bin
-		doexe "${BUILD_DIR}"/tools/llvm-spirv/llvm-spirv
-	fi
-}
-
-multilib_src_test() {
-	# TODO: figure out why some tests fail on amd64 when ABI==x86
-	if multilib_is_native_abi; then
-		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
-	fi
-}
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index cbfdc165a637..9676f91dc4f4 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,6 +1,5 @@
-AUX sysdig-0.26.0-build-fixes.patch 1545 BLAKE2B f182cf721180ee624deeefafff54a48fc4e5024cff00e26f178960d9f7a3d7e8a481dee028fe1dac789f77ec8ba772cc5da82c4d0ebc388f1aa711824d42a2d1 SHA512 2d34ab81da7d3a07e9c7116dc1d25e6db93b5faf2be2a4fe1710efba43293892255591284bc1d2c39953c4cf73ebcacb73b5626cc2d649a0505e351165c9b8d7
-DIST sysdig-0.26.1.tar.gz 892441 BLAKE2B 38302458c54a10719fadaf5e5bb6d29931a262550eaf44350543e99cd33e6a90889d81f49096d2f57fcc903bc9245a1f782b438a48613f9fc9f90273c46f0f39 SHA512 817573dd2945e20094c548a481205d7ae700e8242a12c75bcab41c52330fb6f508214d71f3d3ba4ecc86576e555c8c2a0c155921d61d29a5861bbf982600f6fb
-DIST sysdig-0.26.2.tar.gz 907496 BLAKE2B ce489d7c1a54aa2930599aa7141b1a3d4815c0395b4a444dea565334a1b39a36d339eb2bc9d0c2b3924e8c54f9c3adec6b31278017cfee955fe9ed9d3c29977f SHA512 1a2476060f43559ec89663377361d1fcaace7fe3aa3b472629dca78557e6d5868d8f5cfce3411c46804b501d6a56dcb074f6becf3d8e756b7f7fd943087cd3ae
-EBUILD sysdig-0.26.1.ebuild 1998 BLAKE2B 52ae3ad4e180a6640c613d6d5adba3e11d0485e7ee235f79eeadd19291e1291927fb6666c66555b0239d9015de9c56dcbca5f9a922a37422d155dd88e48f5097 SHA512 e6299a6be79367693680df3f2a5bc2555731ffad9dba8c333a1a4553120705a62be74127f0163c41343bf8b63d74c73d6b895a173812c57df394b64f1941368a
-EBUILD sysdig-0.26.2.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
+DIST sysdig-0.26.3.tar.gz 902206 BLAKE2B ec25d0441c69b8c4c4fc431d073d2f93e476ece7add98412e54ce4286bcd7e32d4b1ff89f75dd728dc66c7d77da157bed2182bad85557c0dcec09648f86abb3d SHA512 f700d1ddae687a3474a8bf6816d2fef6c69e963a269a90a8362287dee698ac9799da18f01f383368c906d294ceb046160a8b0792292a72a3b08fc614b5b69d32
+DIST sysdig-0.26.4.tar.gz 902181 BLAKE2B a7ac38be2f7a3d7e4f4fdec6a2fbf5305a8224ee27352da70f509139ebefd14616f84c7b8860f50d2546819a94deb1117034bceddd22128fcf25386b835274f2 SHA512 f56f5d0a522b861df4803bfdafcaf8db3fc9c0e751d06c321082757f6828a210cb86bab4550a3b35bf6412f930e44ab0f5cf709a30651c57dd7064a68e273a88
+EBUILD sysdig-0.26.3.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
+EBUILD sysdig-0.26.4.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch b/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch
deleted file mode 100644
index 8e0dfd606a16..000000000000
--- a/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/userspace/libscap/scap_fds.c b/userspace/libscap/scap_fds.c
-index 452353a6..6eb7cd16 100644
---- a/userspace/libscap/scap_fds.c
-+++ b/userspace/libscap/scap_fds.c
-@@ -49,6 +49,7 @@ limitations under the License.
- #include <errno.h>
- #include <netinet/tcp.h>
- #if defined(__linux__)
-+#include <sys/sysmacros.h>
- #include <linux/netlink.h>
- #include <linux/rtnetlink.h>
- //#include <linux/sock_diag.h>
-diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
-index bc851319..ec454de7 100644
---- a/userspace/libsinsp/CMakeLists.txt
-+++ b/userspace/libsinsp/CMakeLists.txt
-@@ -145,7 +145,9 @@ add_library(sinsp STATIC ${SINSP_SOURCES})
- 
- target_link_libraries(sinsp 
- 	scap
--	"${JSONCPP_LIB}")
-+	"${CURL_LIBRARIES}"
-+	"${JSONCPP_LIB}"
-+	"${TBB_LIB}")
- 
- if(USE_BUNDLED_LUAJIT)
- 	add_dependencies(sinsp luajit)
-@@ -157,13 +159,12 @@ if(NOT WIN32)
- 	endif()
- 	if(USE_BUNDLED_CURL)
- 		add_dependencies(sinsp curl)
--		target_link_libraries(sinsp
--			"${CURL_LIBRARIES}")
- 	endif()
- 	if(USE_BUNDLED_TBB)
- 		add_dependencies(sinsp tbb)
--		target_link_libraries(sinsp
--			"${TBB_LIB}")
-+	endif()
-+	if(USE_BUNDLED_GRPC)
-+		add_dependencies(sinsp grpc)
- 	endif()
- 
- 	if(NOT APPLE)
-@@ -177,7 +178,6 @@ if(NOT WIN32)
- 				COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --grpc_out=. --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} ${CMAKE_CURRENT_SOURCE_DIR}/cri.proto
- 				WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- 
--		add_dependencies(sinsp grpc)
- 		target_link_libraries(sinsp
- 			"${GRPCPP_LIB}"
- 			"${GRPC_LIB}"
diff --git a/dev-util/sysdig/sysdig-0.26.1.ebuild b/dev-util/sysdig/sysdig-0.26.1.ebuild
deleted file mode 100644
index a6c3bad4d48f..000000000000
--- a/dev-util/sysdig/sysdig-0.26.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0
-	modules? ( || ( MIT GPL-2 ) )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-cpp/tbb:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	dev-libs/protobuf:0=
-	net-dns/c-ares:0=
-	net-libs/grpc:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	eapply "${FILESDIR}"/sysdig-0.26.0-build-fixes.patch
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED}"/usr/etc || die
-}
diff --git a/dev-util/sysdig/sysdig-0.26.2.ebuild b/dev-util/sysdig/sysdig-0.26.3.ebuild
index 2d4c0de2f51f..2d4c0de2f51f 100644
--- a/dev-util/sysdig/sysdig-0.26.2.ebuild
+++ b/dev-util/sysdig/sysdig-0.26.3.ebuild
diff --git a/dev-util/sysdig/sysdig-0.26.4.ebuild b/dev-util/sysdig/sysdig-0.26.4.ebuild
new file mode 100644
index 000000000000..2d4c0de2f51f
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.26.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MODULES_OPTIONAL_USE=modules
+inherit linux-mod bash-completion-r1 cmake-utils
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://www.sysdig.org/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0
+	modules? ( || ( MIT GPL-2 ) )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +modules"
+
+RDEPEND="
+	app-misc/jq:0=
+	dev-cpp/tbb:0=
+	dev-lang/luajit:2=
+	>=dev-libs/jsoncpp-0.6_pre:0=
+	dev-libs/libb64:0=
+	dev-libs/protobuf:0=
+	net-dns/c-ares:0=
+	net-libs/grpc:0=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:0=
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	net-misc/curl:0="
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/os-headers"
+
+# needed for the kernel module
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+pkg_pretend() {
+	linux-mod_pkg_setup
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod for that
+		-DBUILD_DRIVER=OFF
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# unbundle the deps
+		-DUSE_BUNDLED_DEPS=OFF
+	)
+
+	cmake-utils_src_configure
+
+	# setup linux-mod ugliness
+	MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver/src:)"
+	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
+	BUILD_TARGETS="all"
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	linux-mod_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	linux-mod_src_install
+
+	# remove sources
+	rm -r "${ED}"/usr/src || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED}"/usr/etc || die
+}
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 1fb8f64baee8..cd2e16bbe57e 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -2,6 +2,6 @@ AUX trace-cmd-2.8-python-pkgconfig-name.patch 987 BLAKE2B b7fcb2f8813f924692647f
 AUX trace-cmd-2.8.3-python3-warnings.patch 1281 BLAKE2B 66540f016d1ca3a7f5a803bd0753ac9c458fcee43056ec05e420fbeaee8b21cd0c4d38e67286d86ddeb6e478fa1e82d45203f538921bd066aa4ef2ad1222e4d7 SHA512 5446a13e82c9be3c6ed2bdc17b91495499b9f28eaa4045869bbf847ca14953cf36411e86136133b22bba05dae46325b522c00939c33943d5135c17e845fad94a
 AUX trace-cmd-2.8.3-soname.patch 392 BLAKE2B 334e2289dd1132798b1b704b071868715b38ad9308e1ab13abc7417ef55d06f9c07dd62fa3380e55d07020ffafe7d1adea10be6013b731c46583ed21d2cc1f33 SHA512 37096da570d3a926f06ef08731ff4adecc5cdaa2d3035668aa62d813db9facaa5b78189a2a7c9066c4291a90460978886e7f24759a865514335cd3ba1680b6f2
 DIST trace-cmd-v2.8.3.tar.gz 1996617 BLAKE2B 0ab77649af90a0a9368ff118dc94e6fd003b18ceb2065ae3a4559a1d2cfa93be44d87bfb97e2e2f06898508699ff5ce18face4edefd7e40b3b9cca405a626cff SHA512 51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b
-EBUILD trace-cmd-2.8.3.ebuild 2473 BLAKE2B 6c68ed92d821004814532e05052e8a2b883b03177d649460a22f1b9d703a893d0b2fca0fccd9d394d176857050edbc6c35098411719d6d23f3bce382f46414ee SHA512 0604c47e022cb8f24bb23cddf9844f06d354a14aaabc1ef6298af83d0640bacefdd76d586a4a78def495da7ee35efe8702b7e8712690138f1e41ed28095fe9f6
+EBUILD trace-cmd-2.8.3.ebuild 2472 BLAKE2B 5b5ba47290bb699ef3b89ebbcc9cf5c6d952584e3a6022fe905ac7a052ae426cfe08e7172c56fe0a69185b5e696ec1315cb664e3323debddf9d8f3f561cbf549 SHA512 aa4c06e10a04a9cae92c0f48f8c6a3c04ce12a857e629be55e7c6040b4646dd4c9fd407521354784fe199f51f9479ada185af5cafb861e6c02145e3007d5b87f
 EBUILD trace-cmd-9999.ebuild 2226 BLAKE2B f45c9cde1aeda622e0c6786a65bd8c92f4c2372e2b73cbb9518467e0a7b90b15e41f7df71bbd2ed8f2246d8eaed684db5af9236ccb102e9a3d2d15b5ae6ca1fe SHA512 51e521dcc22ffca22d9f348d2ff9f14ac5473302200cf526d7eff092dd0ec39e2fed52bb6f654aa3615b1b295c527e6089122930216249eaa4848bc96ecbdc53
 MISC metadata.xml 349 BLAKE2B 1e1c9812f4cfe7bb90e2637dcf21947f2702244cabc78ac2283112af7a51064d5a4732db71aaa360e6f111f5e6e5b8492e04252e84379cd21424113d2779ea71 SHA512 0a6322fba3de56559284a0f1e4abc83791cf089a74cb369d167b30dadaa019353c8eef0e09e91ad84b130f0660c1dfa665e4252987903884029f4d08fe80c552
diff --git a/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
index 81b74d429056..accd695be067 100644
--- a/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
diff --git a/dev-util/wxglade/Manifest b/dev-util/wxglade/Manifest
index 6a700504cc4d..aef8af074a06 100644
--- a/dev-util/wxglade/Manifest
+++ b/dev-util/wxglade/Manifest
@@ -1,4 +1,4 @@
 AUX wxglade-0.6.3-wxversion.patch 357 BLAKE2B bd9f6ca3ad8b33d8f152aa067617cdee4b9b2e9302f7585ce9dfe84f7ac3c2c4cb5fbe0719eff92c61bb918a616a03a058a13e7efe6bfba404cf71bd4c165914 SHA512 6a3ab0d1365d7c511d3d360a95ded27abb4eebc1cf605712603934134c6da96d8d2fe4aea71c9b6d3a2fa1b0ff280f3cfc1b9198608b1e7b6a450ac7b62b06b0
 DIST wxGlade-0.8.2.zip 4682765 BLAKE2B b9c6a0fe5ca89dce4ba8236c1db079df76777ecff34c00b9251088f39e5c853c8b775a2d941fa7f45a4f607354b85ab6cb26b387bd7e81f4db9cf458944fecc0 SHA512 d74f0b88509232b5f573af70f643af840c96e810060fdffc413f71ad03acca0fdb0324fefe43ab2a36473d8b053259099883d4aae51afff0c1c0b0ece492f9d7
-EBUILD wxglade-0.8.2.ebuild 1101 BLAKE2B 25326cd03c46e54954bf83618bf898439115977fcf191a135522acd3b8aaab437d483545bf53a507da067abaf24f0347055584c843b4e7b1b65256a4424ea71f SHA512 9609d6234b87d9f7c39bdfa24b9858fd538b3b1ea941e14875871384ff294339355dbd520abf6230b24320872896035ffe5e600b7bc1a684985d8e8a65493aec
+EBUILD wxglade-0.8.2.ebuild 1115 BLAKE2B 40eb1248f22f394e4cf3f55507f8918ef3a1f24ab70ef5381fe655ea325a7f2556f9abcaefbaad14d1923ae9556f75487b539069b4e7960812d43013bcddb2ad SHA512 8148a0c55e80d6257d5dc815c64130eea2b67fe58fa65d080cfd3df0db0777dc33e0f2078d57163325461f25ae66abe812ff246419ba00108b8cba3ea29fb28a
 MISC metadata.xml 338 BLAKE2B 646f91107076526a1d1e8c838869a20f69f0a13ed96a209ede0fedc8b10151ee18becd720646193994281de671a7d51ae7dc99c8652acda63bc73e72c6e57d33 SHA512 a5c2365b0607137be3ea999914329a9ffb3390065163f1f4bc818247ee9d8bfb7b4494c533f739870a31bd5ee484b9ff4199f279a9202708c1742513b0a48b97
diff --git a/dev-util/wxglade/wxglade-0.8.2.ebuild b/dev-util/wxglade/wxglade-0.8.2.ebuild
index 98df5e4d387e..2cd38d3eaa2d 100644
--- a/dev-util/wxglade/wxglade-0.8.2.ebuild
+++ b/dev-util/wxglade/wxglade-0.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
@@ -22,7 +22,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
 
 RESTRICT="test" #656934
 
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 475451fcddc3..8a98bfdfd196 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 5c1a4397edd3..362aec297d14 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -16,23 +16,23 @@ DIST git-2.19.2.tar.xz 5235608 BLAKE2B ece292b8cf41deafc63c00e6176b0de39936f7d84
 DIST git-2.21.0.tar.xz 5491296 BLAKE2B c5e66f4d4045f99bb4306e8f096ae9299908383df78bdf2a954cd415f4778eb59ea0ee7d501689313617de7dc1d2ee4ae15ab70dee564add5de877109073ddff SHA512 83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973
 DIST git-2.22.0.tar.xz 5609772 BLAKE2B 3fd84987eba4873d7eca56cc2d28e15cc22e5c382f47e831f12c06b05c1a971d5713e7096b609ec5321e5ae4c63c78ebc7747f7e0948d12bf1ac19a911405d6d SHA512 75b3dcac36f80281effcd099944de34050a35f3599ce42f86ce60455b6c952039fb0f6438d296e0cc9c0651d4a17f467780dc475669227d3c98ddefe91723d42
 DIST git-2.22.1.tar.xz 5616124 BLAKE2B 2856bf5dc446921eab0fb92db6c6505de870d75f2baf7e95cf5796acba3198db789f26bc617da2a1f736fa3a22ee91b77524213ba880f959ea71c449b604f7c2 SHA512 8fa0900e1a583cdacbafa2e0d00a4cb50ad225c11227f6a811b721e56677b62b1354995e2b7117a66b1e89dbcb2cddc1eee7ef1e57723d9615a063a318095f14
-DIST git-2.23.0.rc2.tar.xz 5677896 BLAKE2B 72c8dabb7de4dbde7967f2865adf65e6877ab9322b6dd9c3c1d6f1a918b7e85f800223584739dc56caf4d17b9c24f831719f37f3869bd6bdc4df95cd632b7769 SHA512 5ce0581982858e80f12ce35a1e64803392b88d63cc79e45ab9c6f930324e248128d3ee9a158ded08b80e97fa01146759cec214bd6316b1cc51c19dc37d770a39
+DIST git-2.23.0.tar.xz 5707148 BLAKE2B a57642cfc297615c9510d9d746d83fc4174195bfefe22fc77098419e424d4f6e383896ad5509370c8cc35b2f4b531dcf5c5a4e9c2d2e99041ad15a40399ec4d2 SHA512 c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671
 DIST git-htmldocs-2.19.2.tar.xz 1223848 BLAKE2B 6f30192cb101988fdfcce3bb79c684c6d1ac08cdc929caa049102fba10277fa8cc908904fe7472e40d60707c1b23145d95c441c1401c8697c37a81456d79aab8 SHA512 830e780beea10bde750d09a335fd9986c5ffbf47a724cbbeed5a1a2c94bc81d9c9223e415c5888faf81ab6404e460565434988f6635312039b88282a46014634
 DIST git-htmldocs-2.21.0.tar.xz 1234956 BLAKE2B d8ef32acbad7eeb8758f711e09c380dbf3ca72526067b3a86ed0865e37351c4fac1f0c7e845e7b0c27a1d955c64622f10c999389446b53191acdc05a44647847 SHA512 4537b3f67d03050e5daefaa6f274d3acdf6e116dc8c7f76566b33100e76a445c3e3894b5ff63b5ddb024e1c691a3bf08acea42dbec681da1b0f1de2e5736c9c4
 DIST git-htmldocs-2.22.0.tar.xz 1262136 BLAKE2B 0fea02449e73a9e1b125895f0e319704ccc5949cd68820cadb1a71fc06d182c3ce0629149c9d7f19bdab782fd8c0e1ac8661fc774253caf897fc8fd58e497d9e SHA512 2feab5d3bc70914d7980c8a22f950a9604cbaace2e867119776715f1ba7bdb3c742fbd9aaa827210b234e6381d98611e02dec4e50db4cae4e20bb72116afecb1
 DIST git-htmldocs-2.22.1.tar.xz 1264164 BLAKE2B 88722e4438c75bf875477caaa40060955f52ddadaa13f506fe975eaa92748fc44e2ba1ccfe15d88843013e931975176eb6b7433efe4d71bbbc3cca2ac6afd037 SHA512 b78d5a59df2ec4beff3915b15c0c6af0e54dbf457f0e29c8d92c49880259f03a91b12b40787a1d0b7c9751f42e48a9a3fd1258818121d5d0f45b1cc8d45b3715
-DIST git-htmldocs-2.23.0.rc2.tar.xz 1294236 BLAKE2B 1370b0c97af1fb0d24d0c8081e158e8c5a629e4ab6a6ef8d95e8c38f17945fea15a16940ef1251f45706dfc96e25107e04d7576d6059248d98bcbab4585015a5 SHA512 fd4f88a8172ea917375760dbd66fb14d863903aea4a39dad5d0b7f482d864a068925c70a3f3a3e315fda4f6f885e8174c63786f5a50ea1fb7c0f6edd52aae6b2
+DIST git-htmldocs-2.23.0.tar.xz 1294240 BLAKE2B 7420eb836d582448a996d8302d1e4873316baadd3a1baae555935443028af6a9c9e1fa629d5e0667901b8c63cce19bbf5e46c5fcb09b50382751e6b2cbc3d514 SHA512 165c8989ed9c0c09125e2e99beeddd1f2bb4d00ecae4aa58bcbfb1f1a8cd5a6ad646035e984471484fd1e943437d5d42d917e8c32b1207c590a1fc7c9bebc2dc
 DIST git-manpages-2.19.2.tar.xz 432200 BLAKE2B 92b4c87c40e20133c4b6d9b7f3d56952556470855543a329ea0fb7a91382396376755656ded029d68df8291b0ffecc3e6b2b4c6f71cb8694d44c5f02da7357f8 SHA512 329ea9a6de4a5352c57d2ea3df0cf6caf9dcf03728416a3bca5a5ebc5dc133abe1faffd5e5b5ae11cc91412baff93df83ff684f3626bbac0770ca94bc79d2cb1
 DIST git-manpages-2.21.0.tar.xz 440096 BLAKE2B 6cbedf6e497b0d13c62003b166293a0d438d163255bce845eaf75e08a3eec49060c314e73d24c1c015101868d9149e9b0cd1c2e8cb3ce2245b8acae5701fe8ba SHA512 61e01cd312dbade8aac0144e32edc5eea2708b274273c207889a291cea18d131c9c2d83cc405ba8a955d387fd1e6dd74b7bdae4003f2062501073a0844122d30
 DIST git-manpages-2.22.0.tar.xz 443320 BLAKE2B 900efc3c90ab949bea4655a82febd01a8ec9dfdd39cff3d9cffb5912925bdc60567c3f8cc3fe63a42eb4c390d795b02f30608f672481e41a2aaae8ce9edc109a SHA512 ed9d2ba78fe5081c80a1ffb911ce0e0d883a76b3b4b3d1469c46932e710d1565cf223f74f1402fe94430e3eda514406829b2c422f31ced63ff5126004fdb36d9
 DIST git-manpages-2.22.1.tar.xz 443912 BLAKE2B 794f2edaf2cd4436b9dd19005dfe6e8b92d994fee49ac0b38ccc12cbc9fc0a7bc95c1d6fe6882a91f72ceb3cb1729c0a6d7abcd1f5d00f2e7ab36af6c604718e SHA512 e7d2c9c868fc57271e9c70771a0da527597428a55647d0779fce818988c8f74fc61dba0804cb789e1200c9147c7853bd7f89c241e5c477fd30a119d0104905d6
-DIST git-manpages-2.23.0.rc2.tar.xz 448328 BLAKE2B da7222e5578d86627a037f4385b8b4b49a58e85af1f3c1a974d202b37bce0da1b69b89323b3a66b486e57686568cb6e74b488a3425a21d5706d9b5edf3547ac1 SHA512 fbc770b33a33e00faa974b972f04b7c3124a359585dceae4ab187281d38c26ae1a021ede70499b5c36d3a5369ccf10862fd048121f8a77df4ff0dbc306f8df6c
+DIST git-manpages-2.23.0.tar.xz 448272 BLAKE2B 34dcb535caf54bfa9ea8e9f2d8104fe74e4c38398d685a712735c0199dab59cfeac16f863c6285a1122139cb2be99cfad4ba7c3f71e88603284815536172ccbc SHA512 f4316f28d8f462804cee3e6f5d19a1426087dbeb0e6141148d9b021562c86723cbd4f96d30cc650b2b41230e097c3a1f574055b8b7e5025cbb90089484bf9e96
 EBUILD git-2.19.2.ebuild 19013 BLAKE2B 5ac67e85648aeaca6ccf506c0348b7d21509c7f9a463309a5657f2f4dcdf1136c65559c6b8aa3159fb2b91c39d5dc4af35755bb32498645ec554e769bedf72cf SHA512 99bfefa79aa4b00a0dbcfcb944efb6dcc5fdbfa5927c6b6d84ce03a1410f206e753f1a62c4ca960b3b016081b37c30280436cbf4028caf18ea27c454bb9b0dac
 EBUILD git-2.21.0-r2.ebuild 19251 BLAKE2B 536737c9f0380b649019ee5fcfb1e4294cef7231c876ec05d095699fbe3538c75178f6861d7e37ec8b9a13a1d4f7cf588410044cfe6c8f1b71cb5a50f7d1aa25 SHA512 24ef89e02273ce490068da570eb6c9808a9672d38db68140e6e3c2e5c83974f7d1f55d33caf060514bccd801d488752fd9fc0670de6df6c18821d8fc2206cd01
 EBUILD git-2.21.0.ebuild 19070 BLAKE2B fb5bca963913d9994c90e553cb27ae70596e180ed97d029adf38ae01ed27f48b19b52607df31b93b0485bcdbcac433d5b935e580230b2986a1ecf4af30c3d92e SHA512 f071bca6a089fb96ea19615d4919c5e52538bcdb92251b85741fe6d61d4fce3ea5892f040058c90d3ea89805630f1725f5d0795086a713ffa323a1212ac3406a
 EBUILD git-2.22.0.ebuild 19499 BLAKE2B 1a8e4642b8c8ea44640e46d8302a7c13367ad9a7ea2ff9bf9152c015308f92e9c7743d78bf00dc89e91ad037072512f416b95c2e8f05eab982c2403122fe30be SHA512 7bb5c95a0775648ddf88389e5ec51dc95a77815b53f9c57731ad7b13787672a19ee47470c271c128f67b49b2a5fb89780d956eb1e1f3d45f650273982cad7c44
 EBUILD git-2.22.1.ebuild 19499 BLAKE2B 1a8e4642b8c8ea44640e46d8302a7c13367ad9a7ea2ff9bf9152c015308f92e9c7743d78bf00dc89e91ad037072512f416b95c2e8f05eab982c2403122fe30be SHA512 7bb5c95a0775648ddf88389e5ec51dc95a77815b53f9c57731ad7b13787672a19ee47470c271c128f67b49b2a5fb89780d956eb1e1f3d45f650273982cad7c44
-EBUILD git-2.23.0_rc2.ebuild 19499 BLAKE2B 1a8e4642b8c8ea44640e46d8302a7c13367ad9a7ea2ff9bf9152c015308f92e9c7743d78bf00dc89e91ad037072512f416b95c2e8f05eab982c2403122fe30be SHA512 7bb5c95a0775648ddf88389e5ec51dc95a77815b53f9c57731ad7b13787672a19ee47470c271c128f67b49b2a5fb89780d956eb1e1f3d45f650273982cad7c44
+EBUILD git-2.23.0.ebuild 19499 BLAKE2B 1a8e4642b8c8ea44640e46d8302a7c13367ad9a7ea2ff9bf9152c015308f92e9c7743d78bf00dc89e91ad037072512f416b95c2e8f05eab982c2403122fe30be SHA512 7bb5c95a0775648ddf88389e5ec51dc95a77815b53f9c57731ad7b13787672a19ee47470c271c128f67b49b2a5fb89780d956eb1e1f3d45f650273982cad7c44
 EBUILD git-9999-r1.ebuild 19499 BLAKE2B 1a8e4642b8c8ea44640e46d8302a7c13367ad9a7ea2ff9bf9152c015308f92e9c7743d78bf00dc89e91ad037072512f416b95c2e8f05eab982c2403122fe30be SHA512 7bb5c95a0775648ddf88389e5ec51dc95a77815b53f9c57731ad7b13787672a19ee47470c271c128f67b49b2a5fb89780d956eb1e1f3d45f650273982cad7c44
 EBUILD git-9999-r2.ebuild 19499 BLAKE2B 1a8e4642b8c8ea44640e46d8302a7c13367ad9a7ea2ff9bf9152c015308f92e9c7743d78bf00dc89e91ad037072512f416b95c2e8f05eab982c2403122fe30be SHA512 7bb5c95a0775648ddf88389e5ec51dc95a77815b53f9c57731ad7b13787672a19ee47470c271c128f67b49b2a5fb89780d956eb1e1f3d45f650273982cad7c44
 EBUILD git-9999-r3.ebuild 19499 BLAKE2B 1a8e4642b8c8ea44640e46d8302a7c13367ad9a7ea2ff9bf9152c015308f92e9c7743d78bf00dc89e91ad037072512f416b95c2e8f05eab982c2403122fe30be SHA512 7bb5c95a0775648ddf88389e5ec51dc95a77815b53f9c57731ad7b13787672a19ee47470c271c128f67b49b2a5fb89780d956eb1e1f3d45f650273982cad7c44
diff --git a/dev-vcs/git/git-2.23.0_rc2.ebuild b/dev-vcs/git/git-2.23.0.ebuild
index f3b738828c17..f3b738828c17 100644
--- a/dev-vcs/git/git-2.23.0_rc2.ebuild
+++ b/dev-vcs/git/git-2.23.0.ebuild
diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index 79e5cff7da04..e79f68f49b7e 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1,7 +1,3 @@
-DIST gitg-3.26.0.tar.xz 1551308 BLAKE2B 45a9fd3df8eb891c4e07eefb6cf8f9b517c78dccc63dd08498b4c847614e164472e0605a01c81515ea349366e56c21c99a4558e73b6548b18bb94f578c0fc9bd SHA512 782aa02e2f0f4d8c86ad726045502d545877d835f0449d2ec646d93a78bbfa50f84662d3a437c922eb168b2737c00ec088dc2c73487742f332e3910f041b519d
-DIST gitg-3.30.1.tar.xz 10555888 BLAKE2B 02e8f957eee82bbf0702ca39b5b336929c131a93a94f5e28a2e4aa7c2c473c5d8bda072eba184cef37d6ad2fa7bfa21c007c86204a0a81b6d401487d752952fd SHA512 0d9241422dda6bf1840632fbcabf6b640554081ba995eba59ce90f893654e42c0ca8953e814533b90f362abb13b002e7a74b5f6841aee1f33c2834d2acab869f
 DIST gitg-3.32.1.tar.xz 10613836 BLAKE2B 43c2c37f5c06cb6155906d5988f0787334af7a9091e537fa7b0fc1a9de3138f261a3e3c578afc663c7b57a33f39c19318a53daf7896c465922138197c3bbb778 SHA512 243e630b3e5bb1919dc307e6b3fed1b1b0e3884d2a2507e4526b4af61e86f1cd7004a3dbb96001ffb0280cefe7cdb9b109c39996718913c7410224830c0145a4
-EBUILD gitg-3.26.0.ebuild 1922 BLAKE2B 7b86abf6af11e82908ddabe99737ee663a63b407b80562545b34b6b9252937185e85c9cc2fa7007f33bcbdcfc2865daf30361b77b849c298624cc5ff1e02cf1b SHA512 b99a42a88bc033d5425d7dfb21054f594f1a1255ca77befc387320d33d4df92c54c41d7bf322363fe5b93bb669ba4729e68f9992d382c7e644065dddf1fdc5c4
-EBUILD gitg-3.30.1.ebuild 1942 BLAKE2B 12feca54eaaf676b14aac41a4f4c805a2a2f5df5acab6e4be8e7dc3fe54a8aaea067d8e74e8cba9d3da760edbfbce0e103553380ea5b504ed80c376cd95f4988 SHA512 090749745016a612ad59308ffe1d80507f81e4cc4170fd1bfacbcb061a5572215592d2378734bf00426c9cb0171396a62517c93f0671fa2be3346cb170081540
-EBUILD gitg-3.32.1.ebuild 1931 BLAKE2B 83b768bd55b676e5b9783663ab30afadea233cb4d738592920ddca57f6b10c37015df233b4347b2510502103305f73431bc52a98c24f950fc8ec008e54ffb847 SHA512 6b1aa1008563a6a31a3be45ad63eeb11200ddc6706c8cdc69f99ac94f169b6181842a35f8e17139e8f9474cfb9a0d110fa5c876b17982fd80a940bdacc9d26ca
+EBUILD gitg-3.32.1.ebuild 1956 BLAKE2B 5b2e6dbe5794956e98b08a3e44717b79c2713dbb598978fec46f29eb234107699525d904da0e45d6d08d6eee7bab99fd85be7fc5667025bc114211b89e6e64cd SHA512 f0fcda0136c7c940edc9ae5e787aa3c56243217cfb4b57ac94441cf1d929a217317fbe215d136b586bf0a22693eadf947b28a1e62971193f8513e5dae66fdcb1
 MISC metadata.xml 927 BLAKE2B f967c30f2442bbbef782e69c044900db8bd733c5463b2aeff35496225be549827e8e8f9b7d072ae9396500cdcaecc9f7b4902524b5a3768848736d0bab8adc35 SHA512 889733c311b2ab0e35aadc3fff1bcb50c3dad59186293e2f46e81ba4a0041137938e38f12bcfa40d793a04462bbce25aa476bc9241fb5c7a5c4a25611e371d30
diff --git a/dev-vcs/gitg/gitg-3.26.0.ebuild b/dev-vcs/gitg/gitg-3.26.0.ebuild
deleted file mode 100644
index 46818ef6d31e..000000000000
--- a/dev-vcs/gitg/gitg-3.26.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{5,6} )
-VALA_MIN_API_VERSION="0.32" # Needed when gtk+-3.20 is found
-
-inherit gnome2 pax-utils python-r1 vala
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="glade +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test if unbundling of libgd is possible
-# Currently it seems not to be (unstable API/ABI)
-RDEPEND="
-	app-crypt/libsecret
-	dev-libs/libgee:0.8[introspection]
-	>=app-text/gtkspell-3.0.3:3
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	dev-libs/libgit2:=[threads]
-
-	>=dev-libs/libgit2-glib-0.25.0[ssh]
-	<dev-libs/libgit2-glib-0.27.0
-
-	>=dev-libs/libpeas-1.5.0[gtk]
-	>=dev-libs/libxml2-2.9.0:2
-	net-libs/libsoup:2.4
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	>=x11-libs/gtk+-3.20.0:3
-	>=x11-libs/gtksourceview-3.10:3.0
-	x11-themes/adwaita-icon-theme
-	glade? ( >=dev-util/glade-3.2:3.10 )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-libs/libgit2-glib-0.24.4[vala]
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-deprecations \
-		$(use_enable glade glade-catalog) \
-		$(use_enable python)
-}
-
-src_install() {
-	# -j1: bug #???
-	gnome2_src_install -j1
-
-	if use python ; then
-		install_gi_override() {
-			python_moduleinto "$(python_get_sitedir)/gi/overrides"
-			python_domodule "${S}"/libgitg-ext/GitgExt.py
-		}
-		python_foreach_impl install_gi_override
-	fi
-}
diff --git a/dev-vcs/gitg/gitg-3.30.1.ebuild b/dev-vcs/gitg/gitg-3.30.1.ebuild
deleted file mode 100644
index 82d402136f84..000000000000
--- a/dev-vcs/gitg/gitg-3.30.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-VALA_MIN_API_VERSION="0.32" # Needed when gtk+-3.20 is found
-
-inherit gnome.org gnome2-utils meson python-r1 vala xdg-utils
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="glade +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test if unbundling of libgd is possible
-# Currently it seems not to be (unstable API/ABI)
-RDEPEND="
-	app-crypt/libsecret[vala]
-	>=app-text/gtkspell-3.0.3:3[vala]
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	dev-libs/libgee:0.8[introspection]
-	dev-libs/libgit2:=[threads]
-
-	>=dev-libs/libgit2-glib-0.26.4[ssh]
-	<dev-libs/libgit2-glib-0.27.0
-
-	>=dev-libs/libpeas-1.5.0[gtk]
-	>=dev-libs/libxml2-2.9.0:2
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	net-libs/libsoup:2.4
-	>=x11-libs/gtk+-3.20.0:3
-	>=x11-libs/gtksourceview-3.10:3.0
-	x11-themes/adwaita-icon-theme
-	glade? ( >=dev-util/glade-3.2:3.10 )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-libs/libgit2-glib-0.24.4[vala]
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	vala_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use glade glade_catalog)
-		# we install the module manually anyway
-		-Dpython=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule libgitg-ext/GitgExt.py
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
diff --git a/dev-vcs/gitg/gitg-3.32.1.ebuild b/dev-vcs/gitg/gitg-3.32.1.ebuild
index 71a425bcce9b..5fee531ed8b8 100644
--- a/dev-vcs/gitg/gitg-3.32.1.ebuild
+++ b/dev-vcs/gitg/gitg-3.32.1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
-VALA_MIN_API_VERSION="0.32" # Needed when gtk+-3.20 is found
+# vala-0.36 fails to build, https://bugs.gentoo.org/692538
+VALA_MIN_API_VERSION="0.40"
 
 inherit gnome.org gnome2-utils meson python-r1 vala xdg-utils
 
@@ -12,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="glade +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index f396a1b21217..2535aa437de7 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/acct-group.eclass b/eclass/acct-group.eclass
index d5ccd209c9e3..99919789b2c7 100644
--- a/eclass/acct-group.eclass
+++ b/eclass/acct-group.eclass
@@ -7,6 +7,7 @@
 # @AUTHOR:
 # Michael Orlitzky <mjo@gentoo.org>
 # Michał Górny <mgorny@gentoo.org>
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Eclass used to create and maintain a single group entry
 # @DESCRIPTION:
 # This eclass represents and creates a single group entry.  The name
@@ -35,7 +36,7 @@ _ACCT_GROUP_ECLASS=1
 
 case ${EAPI:-0} in
 	7) ;;
-	*) die "EAPI=${EAPI} not supported";;
+	*) die "EAPI=${EAPI:-0} not supported";;
 esac
 
 inherit user
diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass
index fa4f9daef8f7..0ce7545cd1c5 100644
--- a/eclass/acct-user.eclass
+++ b/eclass/acct-user.eclass
@@ -7,6 +7,7 @@
 # @AUTHOR:
 # Michael Orlitzky <mjo@gentoo.org>
 # Michał Górny <mgorny@gentoo.org>
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Eclass used to create and maintain a single user entry
 # @DESCRIPTION:
 # This eclass represents and creates a single user entry.  The name
@@ -43,7 +44,7 @@ _ACCT_USER_ECLASS=1
 
 case ${EAPI:-0} in
 	7) ;;
-	*) die "EAPI=${EAPI} not supported";;
+	*) die "EAPI=${EAPI:-0} not supported";;
 esac
 
 inherit user
@@ -107,7 +108,7 @@ readonly ACCT_USER_NAME
 # @REQUIRED
 # @DESCRIPTION:
 # List of groups the user should belong to.  This must be a bash
-# array. 
+# array.
 
 
 # << Boilerplate ebuild variables >>
@@ -167,8 +168,8 @@ eislocked() {
 	*)
 		# NB: 'no password' and 'locked' are indistinguishable
 		# but we also expire the account which is more clear
-		[[ $(getent shadow ftp | cut -d: -f2) == '!'* ]] &&
-			[[ $(getent shadow ftp | cut -d: -f8) == 1 ]]
+		[[ $(getent shadow "$1" | cut -d: -f2) == '!'* ]] &&
+			[[ $(getent shadow "$1" | cut -d: -f8) == 1 ]]
 		;;
 	esac
 }
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index b16e0e9d6336..44d11cdb8380 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -12,7 +12,12 @@
 if [[ -z ${_CARGO_ECLASS} ]]; then
 _CARGO_ECLASS=1
 
-CARGO_DEPEND="virtual/cargo"
+if [[ ${PV} == *9999* ]]; then
+	# we need at least this for cargo vendor subommand
+	CARGO_DEPEND=">=virtual/cargo-1.37.0"
+else
+	CARGO_DEPEND="virtual/cargo"
+fi
 
 case ${EAPI} in
 	6) DEPEND="${CARGO_DEPEND}";;
@@ -97,6 +102,26 @@ cargo_src_unpack() {
 	cargo_gen_config
 }
 
+# @FUNCTION: cargo_live_src_unpack
+# @DESCRIPTION:
+# Runs 'cargo fetch' and vendors downloaded crates for offline use, used in live ebuilds
+
+cargo_live_src_unpack() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ "${PV}" == *9999* ]] || die "${FUNCNAME} only allowed in live/9999 ebuilds"
+	[[ "${EBUILD_PHASE}" == unpack ]] || die "${FUNCNAME} only allowed in src_unpack"
+
+	mkdir -p "${S}" || die
+
+	pushd "${S}" > /dev/null || die
+	CARGO_HOME="${ECARGO_HOME}" cargo fetch || die
+	CARGO_HOME="${ECARGO_HOME}" cargo vendor "${ECARGO_VENDOR}" || die
+	popd > /dev/null || die
+
+	cargo_gen_config
+}
+
 # @FUNCTION: cargo_gen_config
 # @DESCRIPTION:
 # Generate the $CARGO_HOME/config necessary to use our local registry
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
index 689944c87700..192d6fa740dc 100644
--- a/eclass/check-reqs.eclass
+++ b/eclass/check-reqs.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2004-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: check-reqs.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Bo Ørsted Andresen <zlin@gentoo.org>
 # Original Author: Ciaran McCreesh <ciaranm@gentoo.org>
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
+# @SUPPORTED_EAPIS: 4 5 6 7
 # @BLURB: Provides a uniform way of handling ebuild which have very high build requirements
 # @DESCRIPTION:
 # This eclass provides a uniform way of handling ebuilds which have very high
@@ -60,13 +60,13 @@ if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then
 # @DESCRIPTION:
 # How much space is needed in /var? Eg.: CHECKREQS_DISK_VAR=3000M
 
-EXPORT_FUNCTIONS pkg_setup
-case "${EAPI:-0}" in
-	0|1|2|3) ;;
-	4|5|6|7) EXPORT_FUNCTIONS pkg_pretend ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
+case ${EAPI:-0} in
+	4|5|6|7) ;;
+	*) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
 esac
 
+EXPORT_FUNCTIONS pkg_pretend pkg_setup
+
 # Obsolete function executing all the checks and printing out results
 check_reqs() {
 	eerror "Package calling old ${FUNCNAME} function."
@@ -123,9 +123,6 @@ check-reqs_run() {
 	# some people are *censored*
 	unset CHECKREQS_FAILED
 
-	[[ ${EAPI:-0} == [0123] ]] && local MERGE_TYPE=""
-
-	# use != in test, because MERGE_TYPE only exists in EAPI 4 and later
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		[[ -n ${CHECKREQS_MEMORY} ]] && \
 			check-reqs_memory \
@@ -140,12 +137,12 @@ check-reqs_run() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		[[ -n ${CHECKREQS_DISK_USR} ]] && \
 			check-reqs_disk \
-				"${EROOT}/usr" \
+				"${EROOT%/}/usr" \
 				"${CHECKREQS_DISK_USR}"
 
 		[[ -n ${CHECKREQS_DISK_VAR} ]] && \
 			check-reqs_disk \
-				"${EROOT}/var" \
+				"${EROOT%/}/var" \
 				"${CHECKREQS_DISK_VAR}"
 	fi
 }
@@ -245,6 +242,7 @@ check-reqs_memory() {
 
 	local size=${1}
 	local actual_memory
+	local actual_swap
 
 	check-reqs_start_phase \
 		${size} \
@@ -252,19 +250,29 @@ check-reqs_memory() {
 
 	if [[ -r /proc/meminfo ]] ; then
 		actual_memory=$(awk '/MemTotal/ { print $2 }' /proc/meminfo)
+		actual_swap=$(awk '/SwapTotal/ { print $2 }' /proc/meminfo)
 	else
-		actual_memory=$(sysctl hw.physmem 2>/dev/null )
-		[[ "$?" == "0" ]] &&
-			actual_memory=$(echo $actual_memory | sed -e 's/^[^:=]*[:=]//' )
+		actual_memory=$(sysctl hw.physmem 2>/dev/null)
+		[[ $? -eq 0 ]] && actual_memory=$(echo "${actual_memory}" \
+			| sed -e 's/^[^:=]*[:=][[:space:]]*//')
+		actual_swap=$(sysctl vm.swap_total 2>/dev/null)
+		[[ $? -eq 0 ]] && actual_swap=$(echo "${actual_swap}" \
+			| sed -e 's/^[^:=]*[:=][[:space:]]*//')
 	fi
 	if [[ -n ${actual_memory} ]] ; then
-		if [[ ${actual_memory} -lt $(check-reqs_get_kibibytes ${size}) ]] ; then
+		if [[ ${actual_memory} -ge $(check-reqs_get_kibibytes ${size}) ]] ; then
+			eend 0
+		elif [[ -n ${actual_swap} && $((${actual_memory} + ${actual_swap})) \
+				-ge $(check-reqs_get_kibibytes ${size}) ]] ; then
+			ewarn "Amount of main memory is insufficient, but amount"
+			ewarn "of main memory combined with swap is sufficient."
+			ewarn "Build process may make computer very slow!"
+			eend 0
+		else
 			eend 1
 			check-reqs_unsatisfied \
 				${size} \
 				"RAM"
-		else
-			eend 0
 		fi
 	else
 		eend 1
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 95011df82d87..784b3929d436 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1233,17 +1233,31 @@ unipatch() {
 			local GCC_MINOR_VER=$(gcc-minor-version)
 
 			# optimization patch for gcc < 8.X and kernel > 4.13
-			if [[ ${GCC_MAJOR_VER} -lt 8 ]] && [[ ${GCC_MAJOR_VER} -gt 4 ]]; then
-				if kernel_is ge 4 13 ; then
+			if kernel_is ge 4 13 ; then 
+				if [[ ${GCC_MAJOR_VER} -lt 8 ]] && [[ ${GCC_MAJOR_VER} -gt 4 ]]; then
 					UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
-				fi
-			# optimization patch for gcc >= 8 and kernel ge 4.13
-			elif [[ "${GCC_MAJOR_VER}" -ge 8 ]]; then
-				if kernel_is ge 4 13; then
+					UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
+				# optimization patch for gcc >= 8 and kernel ge 4.13
+				elif [[ "${GCC_MAJOR_VER}" -eq 8 ]]; then
 					# support old kernels for a period. For now, remove as all gcc versions required are masked
 					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
 					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
+					UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
+				elif [[ "${GCC_MAJOR_VER}" -eq 9 ]] && [[ ${GCC_MINOR_VER} -ge 1 ]]; then
+					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
+					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
+					UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
+				else
+					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
+					UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
+					UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
+					UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
 				fi
+			else
+				UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
+				UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
+				UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
+				UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
 			fi
 		fi
 	done
diff --git a/eclass/kodi-addon.eclass b/eclass/kodi-addon.eclass
index 8f34ccd92a56..e924dbdd6972 100644
--- a/eclass/kodi-addon.eclass
+++ b/eclass/kodi-addon.eclass
@@ -4,27 +4,31 @@
 # @ECLASS: kodi-addon.eclass
 # @MAINTAINER:
 # candrews@gentoo.org
-# @SUPPORTED_EAPIS: 4 5 6
+# @SUPPORTED_EAPIS: 4 5 6 7
 # @BLURB: Helper for correct building and (importantly) installing Kodi addon packages.
 # @DESCRIPTION:
 # Provides a src_configure function for correct CMake configuration
 
-inherit multilib cmake-utils
+inherit cmake-utils
 
 case "${EAPI:-0}" in
 	4|5|6)
-		EXPORT_FUNCTIONS src_configure
+		inherit multilib
+		;;
+	7)
 		;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
+EXPORT_FUNCTIONS src_configure
+
 # @FUNCTION: kodi-addon_src_configure
 # @DESCRIPTION:
 # Configure handling for Kodi addons
 kodi-addon_src_configure() {
 
 	mycmakeargs+=(
-		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)/kodi
+		-DCMAKE_INSTALL_LIBDIR=${EPREFIX%/}/usr/$(get_libdir)/kodi
 	)
 
 	cmake-utils_src_configure
diff --git a/eclass/libretro-core.eclass b/eclass/libretro-core.eclass
index 6825ef24ddab..61713a84b90a 100644
--- a/eclass/libretro-core.eclass
+++ b/eclass/libretro-core.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: libretro-core.eclass
@@ -44,9 +44,13 @@ IUSE="debug"
 # @DESCRIPTION:
 # Name of this Libretro core. The libretro-core_src_install() phase function
 # will install the shared library "${S}/${LIBRETRO_CORE_NAME}_libretro.so" as a
-# Libretro core. Defaults to the name of the current package excluding the
-# "libretro-" prefix (e.g., "mgba" for the package "libretro-mgba").
-: ${LIBRETRO_CORE_NAME:=${PN#libretro-}}
+# Libretro core. Defaults to the name of the current package with the
+# "libretro-" prefix excluded and hyphens replaced with underscores
+# (e.g. genesis_plus_gx for libretro-genesis-plus-gx)
+if [[ -z "${LIBRETRO_CORE_NAME}" ]]; then
+	LIBRETRO_CORE_NAME=${PN#libretro-}
+	LIBRETRO_CORE_NAME=${LIBRETRO_CORE_NAME//-/_}
+fi
 
 # @ECLASS-VARIABLE: LIBRETRO_COMMIT_SHA
 # @DESCRIPTION:
@@ -72,12 +76,6 @@ else
 fi
 inherit flag-o-matic
 
-# @ECLASS-VARIABLE: LIBRETRO_CORE_LIB_FILE
-# @REQUIRED
-# @DESCRIPTION:
-# Absolute path of this Libretro core's shared library.
-: ${LIBRETRO_CORE_LIB_FILE:="${S}/${LIBRETRO_CORE_NAME}_libretro.so"}
-
 case "${EAPI:-0}" in
 	6|7)
 		EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install
@@ -130,6 +128,7 @@ libretro-core_src_prepare() {
 			-e 's/\r$//g' \
 			-e "/flags.*=/s:-O[[:digit:]]:${CFLAGS}:g" \
 			-e "/CFLAGS.*=/s:-O[[:digit:]]:${CFLAGS}:g" \
+			-e "/CXXFLAGS.*=/s:-O[[:digit:]]:${CXXFLAGS}:g" \
 			-e "/.*,--version-script=.*/s:$: ${LDFLAGS} ${LIBS}:g" \
 			-e "/\$(CC)/s:\(\$(SHARED)\):\1 ${LDFLAGS} ${LIBS}:" \
 			-e 's:\(\$(CC)\):\1 \$(CFLAGS):g' \
@@ -168,12 +167,27 @@ libretro-core_src_compile() {
 		$([[ -f Makefile.libretro ]] && echo '-f Makefile.libretro')
 }
 
+# @VARIABLE: LIBRETRO_CORE_LIB_FILE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Absolute path of this Libretro core's shared library.
+# src_install.
+# @CODE
+# src_install() {
+# 	local LIBRETRO_CORE_LIB_FILE="${S}/somecore_libretro.so"
+#
+# 	libretro-core_src_install
+# }
+# @CODE
+
 # @FUNCTION: libretro-core_src_install
 # @DESCRIPTION:
 # The libretro-core src_install function which is exported.
 #
 # This function installs the shared library for this Libretro core.
 libretro-core_src_install() {
+	local LIBRETRO_CORE_LIB_FILE=${LIBRETRO_CORE_LIB_FILE:-"${S}/${LIBRETRO_CORE_NAME}_libretro.so"}
+
 	# Absolute path of the directory containing Libretro shared libraries.
 	local libretro_lib_dir="/usr/$(get_libdir)/libretro"
 	# If this core's shared library exists, install that.
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index cb213e15e12e..fa859ace996f 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -244,12 +244,13 @@ meson_src_configure() {
 }
 
 # @FUNCTION: meson_src_compile
+# @USAGE: [extra ninja arguments]
 # @DESCRIPTION:
 # This is the meson_src_compile function.
 meson_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	eninja -C "${BUILD_DIR}"
+	eninja -C "${BUILD_DIR}" "$@"
 }
 
 # @FUNCTION: meson_src_test
@@ -276,12 +277,13 @@ meson_src_test() {
 }
 
 # @FUNCTION: meson_src_install
+# @USAGE: [extra ninja install arguments]
 # @DESCRIPTION:
 # This is the meson_src_install function.
 meson_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	DESTDIR="${D}" eninja -C "${BUILD_DIR}" install
+	DESTDIR="${D}" eninja -C "${BUILD_DIR}" install "$@"
 	einstalldocs
 }
 
diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass
index b5c3537eaf4d..2789e6046b9f 100644
--- a/eclass/mozcoreconf-v6.eclass
+++ b/eclass/mozcoreconf-v6.eclass
@@ -212,7 +212,7 @@ mozconfig_init() {
 		if use clang ; then
 			# Nothing to do
 			:;
-		elif tc-ld-is-gold ; then
+		elif tc-ld-is-gold || use lto; then
 			append-ldflags -Wl,--no-keep-memory
 		else
 			append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
@@ -229,12 +229,12 @@ mozconfig_init() {
 		append-flags -fPIC
 		;;
 	ppc64)
-		append-flags -fPIC -mminimal-toc
+		append-flags -fPIC
 		# Reduce the memory requirements for linking
 		if use clang ; then
 			# Nothing to do
 			:;
-		elif tc-ld-is-gold ; then
+		elif tc-ld-is-gold || use lto; then
 			append-ldflags -Wl,--no-keep-memory
 		else
 			append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index d7f6f1993652..bc7d7b1c2609 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -136,7 +136,7 @@ else
 	# is commonly used as a main compiler.
 	GCC_EBUILD_TEST_FLAG='regression-test'
 fi
-IUSE="${GCC_EBUILD_TEST_FLAG} vanilla +nls +nptl"
+IUSE="${GCC_EBUILD_TEST_FLAG} vanilla +nls"
 
 TC_FEATURES=()
 
@@ -145,7 +145,7 @@ tc_has_feature() {
 }
 
 if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
-	IUSE+=" altivec debug +cxx +fortran" TC_FEATURES+=(fortran)
+	IUSE+=" altivec debug +cxx +fortran +nptl" TC_FEATURES+=(fortran nptl)
 	[[ -n ${PIE_VER} ]] && IUSE+=" nopie"
 	[[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
 	[[ -n ${D_VER}   ]] && IUSE+=" d"
@@ -1100,10 +1100,12 @@ toolchain_src_configure() {
 	# destructors", but apparently requires glibc.
 	case ${CTARGET} in
 	*-uclibc*)
-		confgcc+=(
-			--disable-__cxa_atexit
-			$(use_enable nptl tls)
-		)
+		if tc_has_feature nptl ; then
+			confgcc+=(
+				--disable-__cxa_atexit
+				$(use_enable nptl tls)
+			)
+		fi
 		tc_version_is_between 3.3 3.4 && confgcc+=( --enable-sjlj-exceptions )
 		if tc_version_is_between 3.4 4.3 ; then
 			confgcc+=( --enable-clocale=uclibc )
@@ -1238,10 +1240,11 @@ toolchain_src_configure() {
 	### library options
 
 	if tc_version_is_between 3.0 7.0 ; then
-		if ! is_gcj ; then
+		if is_gcj ; then
+			confgcc+=( --disable-gjdoc )
+			use awt && confgcc+=( --enable-java-awt=gtk )
+		else
 			confgcc+=( --disable-libgcj )
-		elif use awt ; then
-			confgcc+=( --enable-java-awt=gtk )
 		fi
 	fi
 
@@ -1815,6 +1818,7 @@ toolchain_src_install() {
 
 	dodir /etc/env.d/gcc
 	create_gcc_env_entry
+	create_revdep_rebuild_entry
 
 	# Setup the gcc_env_entry for hardened gcc 4 with minispecs
 	want_minispecs && copy_minispecs_gcc_specs
@@ -1961,8 +1965,8 @@ toolchain_src_install() {
 	# for people who are testing as non-root.
 	chown -R root:0 "${D}${LIBPATH}" 2>/dev/null
 
-	# Move pretty-printers to gdb datadir to shut ldconfig up
-	local py gdbdir=/usr/share/gdb/auto-load${LIBPATH/\/lib\//\/$(get_libdir)\/}
+	# Installing gdb pretty-printers into gdb-specific location.
+	local py gdbdir=/usr/share/gdb/auto-load${LIBPATH}
 	pushd "${D}${LIBPATH}" >/dev/null
 	for py in $(find . -name '*-gdb.py') ; do
 		local multidir=${py%/*}
@@ -2122,8 +2126,6 @@ create_gcc_env_entry() {
 	fi
 
 	cat <<-EOF > ${gcc_envd_file}
-	PATH="${BINPATH}"
-	ROOTPATH="${BINPATH}"
 	GCC_PATH="${BINPATH}"
 	LDPATH="${ldpaths}"
 	MANPATH="${DATAPATH}/man"
@@ -2135,6 +2137,20 @@ create_gcc_env_entry() {
 	EOF
 }
 
+create_revdep_rebuild_entry() {
+	local revdep_rebuild_base="/etc/revdep-rebuild/05cross-${CTARGET}-${GCC_CONFIG_VER}"
+	local revdep_rebuild_file="${ED}${revdep_rebuild_base}"
+
+	is_crosscompile || return 0
+
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${revdep_rebuild_file}"
+	# Generated by ${CATEGORY}/${PF}
+	# Ignore libraries built for ${CTARGET}, https://bugs.gentoo.org/692844.
+	SEARCH_DIRS_MASK="${LIBPATH}"
+	EOF
+}
+
 copy_minispecs_gcc_specs() {
 	# on gcc 6 we don't need minispecs
 	if tc_version_is_at_least 6.0 ; then
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
index 217aadecb3b3..b8dca22726d1 100644
--- a/eclass/xorg-3.eclass
+++ b/eclass/xorg-3.eclass
@@ -72,6 +72,7 @@ IUSE=""
 if [[ ${XORG_MODULE} == auto ]]; then
 	case ${CATEGORY} in
 		app-doc)             XORG_MODULE=doc/     ;;
+		media-fonts)         XORG_MODULE=font/    ;;
 		x11-apps|x11-wm)     XORG_MODULE=app/     ;;
 		x11-misc|x11-themes) XORG_MODULE=util/    ;;
 		x11-base)            XORG_MODULE=xserver/ ;;
@@ -140,6 +141,7 @@ if [[ ${XORG_STATIC} == yes \
 		&& ${CATEGORY} != app-doc \
 		&& ${CATEGORY} != x11-apps \
 		&& ${CATEGORY} != x11-drivers \
+		&& ${CATEGORY} != media-fonts \
 		&& ${PN} != util-macros \
 		&& ${PN} != xbitmaps \
 		&& ${PN} != xorg-cf-files \
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 1a0940212f21..3efb3dff4ea3 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/shovel-knight/Manifest b/games-arcade/shovel-knight/Manifest
new file mode 100644
index 000000000000..31066ff3de8e
--- /dev/null
+++ b/games-arcade/shovel-knight/Manifest
@@ -0,0 +1,3 @@
+DIST shovel_knight_treasure_trove_en_3_3_15418.sh 226753557 BLAKE2B 3103871333f5dec931b109ccc8a8820054f8bd934d01daf97bb5ad84e9dfaebd2c79d1943fb7049468f49c9db87c51dec0e08d38469e364bafb8bc50fbd9d40d SHA512 6832593440cc5059f0df37be991bb2e87c071c7ed566b2c6d0f6cc418190be92c4f793f2c694f620b9378914cde13abf9049eba8cdd90b9dfe961ae9a65dc42a
+EBUILD shovel-knight-3.3.ebuild 1612 BLAKE2B 8fef8cc68fe987156e8e5f9ee1db3b8893019678070b4ac2b4e0580cb6a584871c125c6825cf63cec44edce605ce5bac29df4b4210c2c30f1f12605d09111752 SHA512 44e1bac52bb7bedf3fdc288fb8d739e6dbc215fb222c65ee5ec3886f13b5c98f8d2e552794ffbd6cca177472f74164dcafc415db700af5b8368fa699d28cd759
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-arcade/shovel-knight/metadata.xml b/games-arcade/shovel-knight/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-arcade/shovel-knight/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/games-arcade/shovel-knight/shovel-knight-3.3.ebuild b/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
new file mode 100644
index 000000000000..656b2c154484
--- /dev/null
+++ b/games-arcade/shovel-knight/shovel-knight-3.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils desktop unpacker xdg-utils
+
+MY_PN="ShovelKnight"
+DESCRIPTION="Sweeping classic action adventure with an 8-bit retro aesthetic"
+HOMEPAGE="https://yachtclubgames.com/shovel-knight/"
+SRC_URI="${PN//-/_}_treasure_trove_en_3_3_15418.sh"
+LICENSE="Yacht-Club-Games-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch splitdebug"
+
+# I packaged Box2D in the hope of unbundling it but it turns out this
+# game uses a custom version. -- Chewi :(
+
+RDEPEND="
+	media-libs/glew:1.10
+	media-libs/libsdl2[opengl,sound,video]
+	virtual/opengl
+"
+
+S="${WORKDIR}/data/noarch/game"
+
+DIR="/opt/${PN}"
+QA_PREBUILT="${DIR#/}/*"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  https://www.gog.com/game/${PN//-/_}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_install() {
+	local BITS=$(usex amd64 64 32) LIB=
+
+	exeinto "${DIR}"
+	doexe ${BITS}/${MY_PN}
+	make_wrapper ${MY_PN} ./${MY_PN} "${DIR}"
+
+	exeinto "${DIR}"/lib
+	doexe ${BITS}/lib/lib{Box2D.so.*,fmod*-*.so}
+
+	# The FMOD libraries are duplicated rather than symlinked, which is
+	# silly, so create our own symlinks. Both sets of names are needed.
+	for LIB in ${BITS}/lib/libfmod*-*.so; do
+		LIB=${LIB##*/}
+		dosym "${LIB}" "${DIR}/lib/${LIB%-*}.so"
+	done
+
+	insinto "${DIR}"
+	doins -r data/
+
+	newicon -s 256 ../support/icon.png ${PN}.png
+	make_desktop_entry ${MY_PN} "Shovel Knight"
+}
+
+pkg_postinst() { xdg_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }
diff --git a/games-arcade/xbill/Manifest b/games-arcade/xbill/Manifest
index 3aa4155109d8..7010d3e68e53 100644
--- a/games-arcade/xbill/Manifest
+++ b/games-arcade/xbill/Manifest
@@ -1,5 +1,5 @@
 AUX xbill-2.1-gentoo.patch 9281 BLAKE2B 852ac415c5525daeb47f321c2e91d76a2af842b5e934a0082e481a940919cffff3c600cd373c76564741346d580db01eba8ce502ba7f47c627a3c66bf042aa5a SHA512 81bdcb950260b6d8b52b9857d1d09b351b422df5789319873ea6e6f2431559c6a0a5a963a87313ed23b2a496d570c6c02e50df2c22f4195c48506f7711a740b8
-AUX xbill-2.1-gtk2.patch 582 BLAKE2B 6f1c3a23a672f4b1f2acd7fbb3e26df4b762eadbbdbb94fc9d2b0b12afe09cafdef6d6834bfb8cd5b7467575a4be72b985c804e95389a36061b676bd31c1abaa SHA512 628db81665e33431391f8756969c97bcb4514ad91c3248470204c41b386b01b3e2733d7a8a524f282b304e7fa5eafdf77ec6a7e4f1c45cadc09e6a3a355359f7
+AUX xbill-2.1-gtk2.patch 582 BLAKE2B d577b0ba7e6247594c616d0d439136d9e0a6378518085e5d29303dbdce065d21ab623d12a18716ce03c35bd00e2a73aa865553c3f541cfe48eacebf60116d467 SHA512 f25980493ccc86f42c0ac4d996b6ec1580011b7764e7b1ad80dd04698a094c0c1842512e544d62ffd527b9a08109f7389c1741f4837e5320accc128786dbc546
 DIST xbill-2.1.tar.gz 77610 BLAKE2B aeadc62fa01a3d37b1ae6388987e5d5e3a2d73b9c5afa99b9a2c61155eeb5fb2efc4a36dd2cbeb3fd2f677b385550146d75964afa5f7e83a27f6dc7a16db83c9 SHA512 127604d88258db0ec47084209c656f8817146d70b0fe16f5a1d79883415cf38200594834b39080d78c627104ae6d204f3c12caf127fa094108c4edfbfa98d966
-EBUILD xbill-2.1-r2.ebuild 788 BLAKE2B 956b073a41e85d3529c1bd7ac1881de3c46edabefcff01ab5f073c23fa046fdc5fc39718f128cff2973f88cad9441e6b7290f38d6cd437106bee185d9fc497f1 SHA512 7bb90ea958abc709616dcc1997499d348cca76b6a844620435ec8051b221cda99a9ac70d5cd5dc5593491a5f70c29e5782cf06320a64cbf80d231ef43edbbe3a
+EBUILD xbill-2.1-r3.ebuild 939 BLAKE2B e4b6236c6232c20f640f9328b9dd68b66da60a3d37256e1de9d78998db9fd22ef5ef738ecd48952a46887dcbbcb5e66873dc05bd4ccd00ef4ace7373934ef035 SHA512 a6c977e4b9b309b01eb01744aa0d5053c3d5fd068dfb7bff7e8c14481e6fd55e093a82091305ab189ad5d5651eeeab919098ddee14961ed87fb003908d9bcd39
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xbill/files/xbill-2.1-gtk2.patch b/games-arcade/xbill/files/xbill-2.1-gtk2.patch
index 70817b09c7ab..829475badd72 100644
--- a/games-arcade/xbill/files/xbill-2.1-gtk2.patch
+++ b/games-arcade/xbill/files/xbill-2.1-gtk2.patch
@@ -1,5 +1,5 @@
---- configure.in.old	2007-12-05 22:37:57.000000000 +0100
-+++ configure.in	2007-12-05 22:54:57.000000000 +0100
+--- a/configure.in	2007-12-05 22:37:57.000000000 +0100
++++ b/configure.in	2007-12-05 22:54:57.000000000 +0100
 @@ -88,12 +88,11 @@
  	[  --enable-gtk            build with the GTK widget set])
  
diff --git a/games-arcade/xbill/xbill-2.1-r2.ebuild b/games-arcade/xbill/xbill-2.1-r2.ebuild
deleted file mode 100644
index 1152f2caca38..000000000000
--- a/games-arcade/xbill/xbill-2.1-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools games
-
-DESCRIPTION="A game about an evil hacker called Bill!"
-HOMEPAGE="http://www.xbill.org/"
-SRC_URI="http://www.xbill.org/download/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	!gtk? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gtk2.patch \
-		"${FILESDIR}"/${P}-gentoo.patch
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--disable-motif \
-		$(use_enable gtk) \
-		$(use_enable !gtk athena)
-}
-
-src_install() {
-	default
-	newicon pixmaps/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} XBill ${PN}
-	prepgamesdirs
-}
diff --git a/games-arcade/xbill/xbill-2.1-r3.ebuild b/games-arcade/xbill/xbill-2.1-r3.ebuild
new file mode 100644
index 000000000000..70378b00ceb9
--- /dev/null
+++ b/games-arcade/xbill/xbill-2.1-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop
+
+DESCRIPTION="A game about an evil hacker called Bill!"
+HOMEPAGE="http://www.xbill.org/"
+SRC_URI="http://www.xbill.org/download/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="acct-group/gamestat
+	media-fonts/font-misc-misc
+	gtk? ( x11-libs/gtk+:2 )
+	!gtk? ( x11-libs/libXaw )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gtk2.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-motif \
+		$(use_enable gtk) \
+		$(use_enable !gtk athena)
+}
+
+src_install() {
+	default
+	newicon pixmaps/icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} XBill ${PN}
+	fowners :gamestat /var/lib/xbill/scores
+	fperms 664 /var/lib/xbill/scores
+}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index e9aeb919ed2c..e02ec752264e 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 92183ba77703..9946c1db6a59 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -2,5 +2,6 @@ AUX pcsx2-1.4.0-gcc5.patch 694 BLAKE2B d523ed4b60730d38febceda5a4ddea3aad9678818
 AUX pcsx2-1.4.0-xgetbv.patch 1361 BLAKE2B f6e28703f59dbf79c38812e9a61828f1c40b00982e86b7f3d8b507c54a331b38febbafc98012bc43a84b5ba077af56d73cfb9f1c036c0b619ace1129b91ad031 SHA512 03bc1059dbca73382c3d708e92eef270bbf7958736010d8ffcb92c81972e34e1603007b2aad41b70694791760f9323353815f3468392e39e3893c06327824022
 DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb
 EBUILD pcsx2-1.4.0-r1.ebuild 2862 BLAKE2B 3d18870ff5ea8f0cfe42ac5d4c42b513e004a46b6540bc7bcf25c29b28cfaefb07ee3da983112f54442714c5a1551a89c8b8fcf9fe5b00c6729c4c75c63a6c84 SHA512 bea798521b7978df7a06a1130c38d8b57e68902e03915a2efde51cf541c9ab2da3f67ac3a1c90f86acdd7904c13bbb19369247c39ce436ac79674f67e15a89ad
-EBUILD pcsx2-9999.ebuild 2566 BLAKE2B a209364e3ac61ec3ae458b623be12a0c59b1b80d5572029f633ce039bc7e2955ae56b2d2e7401c75367a35f1362edb2308c4a5692fc71910cf211187e75328e4 SHA512 377835b46f97571801cb8e6477c8dce49ddf16b57e8ae71c6bd7f6a3b830e420c82ecbf8d4b67efd1878cd7d5ee9755eba346cf3b9ecaec11c2b85840050a4c0
+EBUILD pcsx2-1.4.0-r2.ebuild 2166 BLAKE2B 5d593177c67c44de721f699fd08192b3f56b0263bc58856c15a92db6b0535d5f6052b849216493539ae2c4c52cd5304d65d5afff7d6f0f3dc1769575af573014 SHA512 49bad15b3a7078b89adf2286b408867c85f7f71c9d1bde53b2a5bc5e2146c201e26baa81391e011c751971cee2926d08dc377fb0d951a1a06dd43fe88039bd24
+EBUILD pcsx2-9999.ebuild 2594 BLAKE2B 9fe5376db2d34d2c527120214331c7cfae9b72c03152194aca7bc52f65c125f26de130fb18b61f15a90e43d37337769f534b01ea5dc6bca8c2fbb89ac37ae7d2 SHA512 310cb64880e9104e4ef3efe395ca64b4f3dc7550e7953825855d2dfdb8d62ce2dc9d503ff7cf1326bead5b981cc6dc19bef72d3ef4a0870a8114119c1d84a3d4
 MISC metadata.xml 502 BLAKE2B 26415faa56f60d794446f9354475331a0006a25cfa380fc69aabd3adc01622c425b934ebd94bbc283d749f7a06ef9ddcc123371aefc33b4b6ae0ce5b14c907d3 SHA512 1b095d48c5f126e53f865b982fa337dc25ce736ffda219c0812d86d9120c928d577b588a4587b9eea4c0315bfec67fbd4b281b224182ef2cb8ffb0c231dd83d3
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..d31cad3370ad
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PV="${PV/_/-}"
+
+inherit cmake-utils multilib wxwidgets
+
+DESCRIPTION="A PlayStation 2 emulator"
+HOMEPAGE="https://www.pcsx2.net"
+SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	app-arch/bzip2[abi_x86_32(-)]
+	app-arch/xz-utils[abi_x86_32(-)]
+	dev-libs/libaio[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/libpng:=[abi_x86_32(-)]
+	media-libs/libsdl[abi_x86_32(-),joystick,sound]
+	media-libs/libsoundtouch[abi_x86_32(-)]
+	media-libs/portaudio[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/gtk+:2[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/wxGTK:3.0[abi_x86_32(-),X]
+"
+DEPEND="${RDEPEND}
+	dev-cpp/pngpp
+	dev-cpp/sparsehash
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-xgetbv.patch
+)
+
+src_configure() {
+	multilib_toolchain_setup x86
+
+	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
+	# if it something other than "Devel|Debug|Release"
+	local CMAKE_BUILD_TYPE="Release"
+
+	if use amd64; then
+		# Passing correct CMAKE_TOOLCHAIN_FILE for amd64
+		# https://github.com/PCSX2/pcsx2/pull/422
+		local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake)
+	fi
+
+	local mycmakeargs=(
+		-DARCH_FLAG=
+		-DDISABLE_BUILD_DATE=TRUE
+		-DDISABLE_PCSX2_WRAPPER=TRUE
+		-DEXTRA_PLUGINS=FALSE
+		-DOPTIMIZATION_FLAG=
+		-DPACKAGE_MODE=TRUE
+		-DXDG_STD=TRUE
+
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
+		-DDOC_DIR=/usr/share/doc/"${PF}"
+		-DEGL_API=FALSE
+		-DGTK3_API=FALSE
+		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
+		# wxGTK must be built against same sdl version
+		-DSDL2_API=FALSE
+		-DWX28_API=FALSE
+	)
+
+	WX_GTK_VER="3.0" setup-wxwidgets
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
+	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
+	cmake-utils_src_install
+}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f79952eccb67..9e646daf5853 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils git-r3 multilib toolchain-funcs wxwidgets
 
@@ -25,20 +25,19 @@ RDEPEND="
 	media-libs/libsoundtouch[abi_x86_32(-)]
 	media-libs/portaudio[abi_x86_32(-)]
 	net-libs/libpcap[abi_x86_32(-)]
-	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
 	virtual/libudev[abi_x86_32(-)]
 	virtual/opengl[abi_x86_32(-)]
 	x11-libs/gtk+:2[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/wxGTK:3.0[abi_x86_32(-),-sdl,X]
+	x11-libs/wxGTK:3.0-gtk3[abi_x86_32(-),-sdl,X]
 "
 # Ensure no incompatible headers from eselect-opengl are installed, bug #510730
 DEPEND="${RDEPEND}
-	>=app-eselect/eselect-opengl-1.3.1
 	dev-cpp/pngpp
-	>=dev-cpp/sparsehash-1.5
+	dev-cpp/sparsehash
 "
 
 pkg_setup() {
@@ -77,20 +76,21 @@ src_configure() {
 		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
 		-DDOC_DIR=/usr/share/doc/"${PF}"
 		-DEGL_API=FALSE
-		-DGTK3_API=FALSE
+		-DGTK3_API=TRUE
 		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
 		# wxGTK must be built against same sdl version
 		-DSDL2_API=TRUE
-		-DWX28_API=FALSE
 	)
 
-	WX_GTK_VER="3.0" need-wxwidgets unicode
+	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
 	cmake-utils_src_configure
 }
 
 src_install() {
-	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*"
-
+	# Upstream issues:
+	#  https://github.com/PCSX2/pcsx2/issues/417
+	#  https://github.com/PCSX2/pcsx2/issues/3077
+	QA_EXECSTACK="usr/bin/PCSX2"
+	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
 	cmake-utils_src_install
 }
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 833ff44e3b7d..18910577e6e9 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
new file mode 100644
index 000000000000..fa03c45c4cd7
--- /dev/null
+++ b/games-engines/devilutionx/Manifest
@@ -0,0 +1,3 @@
+AUX devilutionx-facebookincubator_find_libsodium.patch 3401 BLAKE2B 3f721056ffd63cb063affb4a54641859e3a45360aa1695fc31f3aecd94fa47ddfb986f5fc35a8c5fd5d706e7f1dce5d8dae4d6def5ed163dda8957ab61728818 SHA512 91ba2f33dec4ea56f0ed5aec334fab2a97bbae82ca425c9962c62d6aedf67b16821bfe47f7abfbdb737e5685531be55442972aabcf39b36092f59b79752dbcbc
+EBUILD devilutionx-9999.ebuild 1354 BLAKE2B 642a915685356f4726d28b07b8186149cb1df7a0b0f1310fe24ce6fc286cdb6c65641b6845d17dd9a52f58703c1b80f9a8be5a798e720b4e327b1dcbd5abf897 SHA512 e6399058fe35c9bb6b4c1771e3b6e008561d53887eed8ed452524a507a50c4ba58ec0ee36a60d944394be863b320e4cc0ced0a2549fea20fdab362d55a8a1c2d
+MISC metadata.xml 349 BLAKE2B 11288d110457dff20a74658a3405aadc17fe8acce67069fd5493f0f81e8e2aa59f45ed5808377362f6840670ae6153b199c724b2801b4689394cadb98a8061a1 SHA512 b759e6fb2533964a7226df5a5877f70eb303689f7c0fd598d1d002444ee71ac0b83747a7c8c262f2ad1d087b232de2c1c7bd3b512bbcf3469eec037009ea7f4d
diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
new file mode 100644
index 000000000000..3070232b1069
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/diasurgical/devilutionX.git"
+else
+	SRC_URI="https://github.com/diasurgical/devilutionX/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libsodium
+	media-libs/libsdl2[haptic]
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# https://github.com/diasurgical/devilutionX/issues/225
+	eapply -R "${FILESDIR}"/${PN}-facebookincubator_find_libsodium.patch
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_RELEASE=ON
+		-DDEBUG="$(usex debug)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}/${PN}"
+	make_desktop_entry ${PN} "Diablo devolved"
+}
+
+pkg_postinst() {
+	einfo "In order to play the game you need to install the file"
+	einfo "  diabdat.mpq"
+	einfo "from the original game CD into the following directory:"
+	einfo "  \${HOME}/.local/share/diasurgical/devilution/"
+	einfo "and make sure it's writeable (chmod u+w)."
+}
diff --git a/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch b/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch
new file mode 100644
index 000000000000..e81de974c4db
--- /dev/null
+++ b/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch
@@ -0,0 +1,88 @@
+From 1f7f5bf3dccee957e23bdf4d976883b155d5e81a Mon Sep 17 00:00:00 2001
+From: Anders Jenbo <anders@jenbo.dk>
+Date: Tue, 23 Jul 2019 21:34:08 +0200
+Subject: [PATCH] Use facebookincubator findflindsodium cmake helper
+
+https://github.com/facebookincubator/fizz/blob/master/fizz/cmake/FindSodium.cmake
+---
+ CMake/Findsodium.cmake | 34 ++++++++++++++++++++--------------
+ 1 file changed, 20 insertions(+), 14 deletions(-)
+
+diff --git a/CMake/Findsodium.cmake b/CMake/Findsodium.cmake
+index 0667920c..c664ccbe 100644
+--- a/CMake/Findsodium.cmake
++++ b/CMake/Findsodium.cmake
+@@ -55,22 +55,22 @@ if (UNIX)
+     endif()
+ 
+     if(sodium_USE_STATIC_LIBS)
+-        if (sodium_PKG_STATIC_LIBRARIES)
+-            foreach(_libname ${sodium_PKG_STATIC_LIBRARIES})
+-                if (NOT _libname MATCHES "^lib.*\\.a$") # ignore strings already ending with .a
+-                    list(INSERT sodium_PKG_STATIC_LIBRARIES 0 "lib${_libname}.a")
+-                endif()
+-            endforeach()
+-            list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
+-        else()
+-            # if pkgconfig for libsodium doesn't provide
+-            # static lib info, then override PKG_STATIC here..
++        foreach(_libname ${sodium_PKG_STATIC_LIBRARIES})
++            if (NOT _libname MATCHES "^lib.*\\.a$") # ignore strings already ending with .a
++                list(INSERT sodium_PKG_STATIC_LIBRARIES 0 "lib${_libname}.a")
++            endif()
++        endforeach()
++        list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
++
++        # if pkgconfig for libsodium doesn't provide
++        # static lib info, then override PKG_STATIC here..
++        if (NOT sodium_PKG_STATIC_FOUND)
+             set(sodium_PKG_STATIC_LIBRARIES libsodium.a)
+         endif()
+ 
+         set(XPREFIX sodium_PKG_STATIC)
+     else()
+-        if (sodium_PKG_LIBRARIES STREQUAL "")
++        if (NOT sodium_PKG_FOUND)
+             set(sodium_PKG_LIBRARIES sodium)
+         endif()
+ 
+@@ -101,7 +101,7 @@ elseif (WIN32)
+ 
+     if (MSVC)
+         # detect target architecture
+-        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.c" [=[
++        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp" [=[
+             #if defined _M_IX86
+             #error ARCH_VALUE x86_32
+             #elif defined _M_X64
+@@ -109,7 +109,7 @@ elseif (WIN32)
+             #endif
+             #error ARCH_VALUE unknown
+         ]=])
+-        try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/arch.c"
++        try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp"
+             OUTPUT_VARIABLE _COMPILATION_LOG
+         )
+         string(REGEX REPLACE ".*ARCH_VALUE ([a-zA-Z0-9_]+).*" "\\1" _TARGET_ARCH "${_COMPILATION_LOG}")
+@@ -224,7 +224,8 @@ endif()
+ 
+ # communicate results
+ include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(sodium
++find_package_handle_standard_args(
++    Sodium # The name must be either uppercase or match the filename case.
+     REQUIRED_VARS
+         sodium_LIBRARY_RELEASE
+         sodium_LIBRARY_DEBUG
+@@ -233,6 +234,11 @@ find_package_handle_standard_args(sodium
+         sodium_VERSION
+ )
+ 
++if(Sodium_FOUND)
++    set(sodium_LIBRARIES
++        optimized ${sodium_LIBRARY_RELEASE} debug ${sodium_LIBRARY_DEBUG})
++endif()
++
+ # mark file paths as advanced
+ mark_as_advanced(sodium_INCLUDE_DIR)
+ mark_as_advanced(sodium_LIBRARY_DEBUG)
diff --git a/games-engines/devilutionx/metadata.xml b/games-engines/devilutionx/metadata.xml
new file mode 100644
index 000000000000..81aca5b1e557
--- /dev/null
+++ b/games-engines/devilutionx/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>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">diasurgical/devilutionX</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index fa77a80eb365..4a7f7d99fc9b 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1,5 +1,3 @@
-AUX frotz-2.43-glibc2.10.patch 859 BLAKE2B 6d8994a0bc80d9bc24ed76e6016f549b7c6b9cbcf9ed081b3ba4ebedee872bf9e04a7b62a1d8995da5942f3a8c271cf67287d4d4d96b5f3998b9561ea7c6ede6 SHA512 467477b2740667b1f8356845f7ec30a8318120313dc2bbfa2bcbde2c9cde77269349b6e7076397a7c837d9a1e72aa8fe59007fd73bd0de14b6c8244514fb81d2
-AUX frotz-2.43-ldflags.patch 665 BLAKE2B 0c744231190a308761c73f847ea6842259f424cb5ae33f1cc8311e7dc77a3ac9dd85bfc7f99070980042ab83418dd2b3b5a17c4ff29527065eb9d473ded85cff SHA512 9d750679169daa67fcd6580edd5dd53f80ab490e2637d524be9525f99764b5203242a9f9e93262d9c1abcc6d62b994f7d943040931b30ab2ce1ac9a6b772e107
-DIST frotz-2.43.tar.gz 160771 BLAKE2B edee48050b247320df3d02ea4682579d4f933a5853cc9a31f56c4d12596d5e5657e79e176ed1725e72028497a843db1d0b13833ffe44e41ec7f532f0d40ccaf9 SHA512 654f2ca2d1a625df8f88b5629e09a873668cea42688acdf154636b066b94fc9d70b7f45acb33a71d234c19b59c394c63aee38d6224245b3b329210e6b4a58409
-EBUILD frotz-2.43-r1.ebuild 1075 BLAKE2B a3ff1a05881e507a648516abc200721ecedb9ab7cf87f4b6b7673fdcd0114228309274c64f67a242404c21af16bea3cd3319f3c586e4a22e7cf69ef163e6f66f SHA512 00953652ed45fe80f9332758e5399afbbb479d2ef74f1e4e50e7eddda4566e57b4aaf2d51649f792f91abc75a580b8e3ccd677a3fc9bf1af5f07f2c710ad7e16
-MISC metadata.xml 328 BLAKE2B 650d86497c2eb4a36a16c14f088d691a6a586917592b4e3192bb321bb7007f402cbfc45cb272556a78831bab46fe57bde78f6db6b459d26064856f8308a9c19a SHA512 37fcc943d9d2700b5d88e71666af1a3ebe5baf905095d864066ebe20ac7edd54bfcafacc31684ae1eeed5197096cecbfec57c01ff5be1b567af1cc21c7294d6a
+DIST frotz-57e915b5f5b8997d1e4a1e0dac4ace2e62b7f6e9.tar.bz2 281258 BLAKE2B d85a53157e539bb1e79aade97726b5b6f752d7799faea0f35063c3321c97ddbadf7bb9318533badb212b49b397c52e3fd458d5d08868d90b564002de3ffe4324 SHA512 45fc40f4eebb338e4e4cba8ef446726a9126d45b6646ffcf3a2679dfde5630500e492667363c63f7806630d4b8d88a225080c0a2696c4170d86b1cf4d8b0a06c
+EBUILD frotz-2.45_pre20190903.ebuild 1653 BLAKE2B 7d63a13020282e13680e122beaed3026c3e9cfe919cd3199641e6463e73c29dc3bda7e66ae73d09c9909bb4bbe0d4515b19fa1cc9da36b03c9f022087400a1be SHA512 1aece9a3243fe109de57b22ccc8d2f5c77c68a8439bbc17ea1e984f338df2ff1cbe5864a3be6e0e24f7262bc5e1c6ca19e928a540bbe4623ad19ed8b9abdc00b
+MISC metadata.xml 337 BLAKE2B 58dbc1d02cdf6768759edb274b556b608135d088ab1b827abbe23726435e2595a9008a377bd27ebb1b4a517dc9e5ef74a9dcd2e08d829e0aacaa854fc258f830 SHA512 ace3f8702420d20cb543c88e0e22fae40cea97be5d86c40657107b9621c72ef462480a790f26735d212aec7fdffb27a1b00bd48f70d0e030f28efa53f51e0217
diff --git a/games-engines/frotz/files/frotz-2.43-glibc2.10.patch b/games-engines/frotz/files/frotz-2.43-glibc2.10.patch
deleted file mode 100644
index 3f2639ec47d0..000000000000
--- a/games-engines/frotz/files/frotz-2.43-glibc2.10.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/dumb/dumb_input.c
-+++ b/src/dumb/dumb_input.c
-@@ -79,7 +79,7 @@
- /* Read one line, including the newline, into s.  Safely avoids buffer
-  * overruns (but that's kind of pointless because there are several
-  * other places where I'm not so careful).  */
--static void getline(char *s)
-+static void get_line(char *s)
- {
-   int c;
-   char *p = s;
-@@ -203,7 +203,7 @@
-       fputs(prompt, stdout);
-     else
-       dumb_show_prompt(show_cursor, (timeout ? "tTD" : ")>}")[type]);
--    getline(s);
-+    get_line(s);
-     if ((s[0] != '\\') || ((s[1] != '\0') && !islower(s[1]))) {
-       /* Is not a command line.  */
-       translate_special_chars(s);
-@@ -265,7 +265,7 @@
- 	  if (!*current_page)
- 	    break;
- 	  printf("HELP: Type <return> for more, or q <return> to stop: ");
--	  getline(s);
-+	  get_line(s);
- 	  if (!strcmp(s, "q\n"))
- 	    break;
- 	}
diff --git a/games-engines/frotz/files/frotz-2.43-ldflags.patch b/games-engines/frotz/files/frotz-2.43-ldflags.patch
deleted file mode 100644
index c8b4e35eee20..000000000000
--- a/games-engines/frotz/files/frotz-2.43-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile	2010-10-04 14:13:37.000000000 +0200
-+++ b/Makefile	2010-10-04 14:14:06.000000000 +0200
-@@ -162,7 +162,7 @@
- $(NAME): $(NAME)-curses
- 
- $(NAME)-curses:		soundcard.h  $(COMMON_TARGET) $(CURSES_TARGET)
--	$(CC) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) \
-+	$(CC) $(LDFLAGS) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) \
- 		$(SOUND_LIB)
- 
- all:	$(NAME) d$(NAME)
-@@ -170,7 +170,7 @@
- dumb:		$(NAME)-dumb
- d$(NAME):	$(NAME)-dumb
- $(NAME)-dumb:		$(COMMON_TARGET) $(DUMB_TARGET)
--	$(CC) -o d$(BINNAME)$(EXTENSION) $(COMMON_TARGET) \
-+	$(CC) $(LDFLAGS) -o d$(BINNAME)$(EXTENSION) $(COMMON_TARGET) \
- 		$(DUMB_TARGET) $(LIB)
- 
- .SUFFIXES:
diff --git a/games-engines/frotz/frotz-2.43-r1.ebuild b/games-engines/frotz/frotz-2.43-r1.ebuild
deleted file mode 100644
index 08d19d78526c..000000000000
--- a/games-engines/frotz/frotz-2.43-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Curses based interpreter for Z-code based text games"
-HOMEPAGE="http://frotz.sourceforge.net/"
-SRC_URI="http://www.ifarchive.org/if-archive/infocom/interpreters/frotz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa oss"
-
-DEPEND="sys-libs/ncurses:0
-	alsa? ( oss? ( media-libs/alsa-oss ) )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc2.10.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CC /d' \
-		Makefile \
-		|| die
-}
-
-src_compile() {
-	local OPTS="CONFIG_DIR=/etc"
-	use oss && OPTS="${OPTS} SOUND_DEFS=-DOSS_SOUND SOUND_DEV=/dev/dsp"
-	emake ${OPTS} all
-}
-
-src_install () {
-	dobin {d,}frotz
-	doman doc/*.6
-	dodoc AUTHORS BUGS ChangeLog HOW_TO_PLAY README TODO \
-		doc/{frotz.conf-big,frotz.conf-small}
-}
-
-pkg_postinst() {
-	echo
-	elog "Global config file can be installed in /etc/frotz.conf"
-	elog "Sample config files are in /usr/share/doc/${PF}"
-	echo
-}
diff --git a/games-engines/frotz/frotz-2.45_pre20190903.ebuild b/games-engines/frotz/frotz-2.45_pre20190903.ebuild
new file mode 100644
index 000000000000..f2a3485e522a
--- /dev/null
+++ b/games-engines/frotz/frotz-2.45_pre20190903.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="57e915b5f5b8997d1e4a1e0dac4ace2e62b7f6e9"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Interpreter for Z-code based text games"
+HOMEPAGE="https://661.org/proj/if/frotz/"
+SRC_URI="https://gitlab.com/DavidGriffith/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ncurses sdl sound unicode"
+REQUIRED_USE="sound? ( || ( ncurses sdl ) )"
+
+DEPEND="
+	ncurses? (
+		sys-libs/ncurses:0=[unicode?]
+		sound? ( media-libs/libao )
+	)
+	sdl? (
+		media-libs/freetype:2
+		media-libs/libpng:0=
+		media-libs/libsdl2[sound,threads,video]
+		media-libs/sdl2-mixer
+		sys-libs/zlib
+		virtual/jpeg:0=
+	)
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	emake \
+		dumb \
+		$(use ncurses && echo ncurses) \
+		$(use sdl && echo sdl) \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CURSES=$(usex unicode ncursesw ncurses) \
+		USE_UTF8=$(usex unicode yes "") \
+		SOUND=$(usex sound ao none) \
+		PREFIX="${EPREFIX}/usr" \
+		SYSCONFDIR="${EPREFIX}/etc"
+}
+
+src_install () {
+	emake \
+		install_dumb \
+		$(use ncurses && echo install) \
+		$(use sdl && echo install_sdl) \
+		PREFIX="${EPREFIX}/usr" \
+		DESTDIR="${D}"
+
+	dodoc \
+		AUTHORS ChangeLog CONTRIBUTORS DUMB HOW_TO_PLAY README TODO \
+		doc/frotz.conf-{big,small}
+}
+
+pkg_postinst() {
+	echo
+	elog "Global config file can be installed in ${EPREFIX}/etc/frotz.conf"
+	elog "Sample config files are in ${EPREFIX}/usr/share/doc/${PF}"
+	echo
+}
diff --git a/games-engines/frotz/metadata.xml b/games-engines/frotz/metadata.xml
index 051541926fbb..455473e4c7c5 100644
--- a/games-engines/frotz/metadata.xml
+++ b/games-engines/frotz/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">frotz</remote-id>
+		<remote-id type="gitlab">DavidGriffith/frotz</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 81883734596a..9057569a8c16 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 91b1dc86a7aa..67dfb05ab3aa 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -1,7 +1,7 @@
 AUX eduke32-20190419.7615-wad2map-buildfix.patch 539 BLAKE2B 92fe0ec1c1d126eee7f48b4c403194e8b375f28dc9581cb20b393ea4e7464938aacea760075e6c845d45edcf98df476bb3254026d3304f3c52a98f32cf7f7b00 SHA512 983f847af630456ae61dfa65a6fcd890a04e2b14722efd11bc25a3f9e3ac33b9bd5559b6a1e3927471a45196c417a1e17c0b2dd7f177c44b7aa81aa7e224fa92
+AUX eduke32-20190820.8043-log-to-tmpdir.patch 356 BLAKE2B 9cdb65c0e15270b4970144d57e126bef5c5b468c8142b797717536852c71f5f8183f63c5a6adffd6d411b2972831320d5a4f214e05d54bca67129ab84c3b0608 SHA512 f1ac030d0d9bed2cc4e67d33563dc7d2f34d2cda75835ec875ce0c3957191c7a61b8d9a16a1d040ee7d5ca8e98e8a2660fe9ff1d8047bbd86953425124140512
+AUX eduke32-20190820.8043-search-duke3d-path.patch 485 BLAKE2B 5a21dec8abc4cc13922a306107d968d1ad6341e5a0c62802d3069a6ad9d2378ae8d19ab6018c86b9e9ec9553a053bbbd45a04d9dd32eb5a31bc1dd1afb4aa757 SHA512 2c3fa40564bfd8c99090f46aaa03f0ff38f965a65e6e03c93f5c469dbcb1feb32c0092ff7aa13b15f5a531731045ab2cbeb6ec746ca56197d28439b36f591a96
 AUX eduke32-bin 268 BLAKE2B 20941b736b5062f237a39d769a28bbbe1442116259bfe8ff5de4e4c5d9ea2a6139a10efcfd687ee681f56a99382e817f9ad00c2eb2da9c0f1e817912b783261e SHA512 f7a472eb7225800f09d22b617aa12d75dca50892a462a128f901f8df1efc3684d324948f553e1fb44a1e9b786aa60279311ee52d1a6d695cdac0b457a8eee937
-AUX log-to-tmpdir.patch 356 BLAKE2B 9cdb65c0e15270b4970144d57e126bef5c5b468c8142b797717536852c71f5f8183f63c5a6adffd6d411b2972831320d5a4f214e05d54bca67129ab84c3b0608 SHA512 f1ac030d0d9bed2cc4e67d33563dc7d2f34d2cda75835ec875ce0c3957191c7a61b8d9a16a1d040ee7d5ca8e98e8a2660fe9ff1d8047bbd86953425124140512
-AUX search-duke3d-path.patch 485 BLAKE2B 5a21dec8abc4cc13922a306107d968d1ad6341e5a0c62802d3069a6ad9d2378ae8d19ab6018c86b9e9ec9553a053bbbd45a04d9dd32eb5a31bc1dd1afb4aa757 SHA512 2c3fa40564bfd8c99090f46aaa03f0ff38f965a65e6e03c93f5c469dbcb1feb32c0092ff7aa13b15f5a531731045ab2cbeb6ec746ca56197d28439b36f591a96
 DIST duke3d_hrp-5.4.zip 933440151 BLAKE2B 20749d6e1bdd07d0e5f28ac2f7e3aff60e8638223b934795320046922311533d6ecaefa3923650568aaa4e026927b53087032415d2d343fc4bd179c9e9ddd640 SHA512 fd5aba0a09193ccd49781d3f06a040000a134ad90f099ab7bf10a8abe474c3a742f922f8fa31522b8993828d516bdd0b5ded327e9c4615c2c101fe655d533f4d
 DIST duke3d_music-sc55-4.02.zip 155441427 BLAKE2B 7fa0c98927dd9a18411ad473269a795d1bc809fa8f9479deef06e12cd0dc97953680e7519c9d22e2d32b6ff79726682746820f78429ad11cb5edf1b64d2e4fe7 SHA512 70d3d7b4705e30cdb19ddc95e11a88afff1dc01dfc6495a488ea665f8097c1200695ec67246ac47a2480d0e68cd7d74e1d61c2120485f53bb93d9c0fb16ba9b2
 DIST duke3d_musopl-2.01.zip 266444823 BLAKE2B 5255c671782279c7723fb1f848a331645a89fdc8dd5336250d06e6eed5b63511c37bfbb07d22d7e7ce29707efe2c55406f2ee81522374de3633f2b448c7dbd6b SHA512 08308b672516a6f3a3b9b85fd836f2a29a24c8fa5f353953f5f55a281dea370046817ccfb8467b4ce25385277ced8afd83c00882e8a246b03afa5e0e349efd35
@@ -9,6 +9,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_20190719-7814.tar.xz 14751836 BLAKE2B 95017d0fbb4a3d4db3bb64657671bad58f368af5f4c1d52cfc805d99bbfc77019dfc372d3aa82e9c216a783a41993d6c8e539b2861b72604c0397cfc52f046c4 SHA512 cf8783e36b73ee76ba7c824d9322a64b87ae48ddb7002e3e4b61120c03c03a03bb0205f790483421c5992e536adee0be1c497cd7aa8357fa0aa518f50a4ba861
-EBUILD eduke32-20190719.7814.ebuild 5972 BLAKE2B a212513a58223dfc35ef3cdb50937a3d6294ed5fafe6fd6ed5804d5c27b479c34b9e4b2a39431b1272848cf547b1275cb5b295b8efe6a2b1c5009d0906573391 SHA512 df0fbf71fe5ee81e75f476f5baa42e6fffccb314928b1ba563683ba431bc040a20866ccafb8edde4ccf1bc7f177b48cfcdf3f235a80687b143836e22b90a629d
+DIST eduke32_src_20190820-8043.tar.xz 15922344 BLAKE2B 5414087f8c88c04438b2db5f5323bf82853353f05e00481be596de0e6c981bd651d53515f674d8c128865aba79d6d62a530e3346d215fc67caa36e8afb10c22e SHA512 5bfb6134acbb33e3c4c702306dfe2b005766910efe78b38e9ab1aa3221ccccf6b1e97ddc193222f25b8cd8b23a0f6fd6e13a4b4ae48589e24d8a0de958b5616a
+EBUILD eduke32-20190820.8043.ebuild 6012 BLAKE2B 118c08659973f2cdbfba5b22cfa3df3771344d4d838b2974a17bdc732af0e58cbce5fb651a3c59a3de11b5c5ba1c3a27aca20f049cc484bf9600c812ca44a8fd SHA512 3311884582e9ededa714dfd8a53cabbffc15b750879a87d06ea05db4804e8e583d843812af30e05ca14ca5d3091597691cb9d9fd448788d7f5e1743151018373
 MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
diff --git a/games-fps/eduke32/eduke32-20190719.7814.ebuild b/games-fps/eduke32/eduke32-20190719.7814.ebuild
deleted file mode 100644
index 196f0653f812..000000000000
--- a/games-fps/eduke32/eduke32-20190719.7814.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs xdg-utils
-
-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 )
-"
-
-LICENSE="BUILDLIC GPL-2 HRP"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-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]
-	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}/${PN}-20190419.7615-wad2map-buildfix.patch"
-	"${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() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-fps/eduke32/eduke32-20190820.8043.ebuild b/games-fps/eduke32/eduke32-20190820.8043.ebuild
new file mode 100644
index 000000000000..9f03ea77a4ef
--- /dev/null
+++ b/games-fps/eduke32/eduke32-20190820.8043.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs xdg-utils
+
+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 )
+"
+
+LICENSE="BUILDLIC GPL-2 HRP"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+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]
+	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}/${PN}-20190419.7615-wad2map-buildfix.patch"
+	"${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch"
+	"${FILESDIR}/${PN}-20190820.8043-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() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-fps/eduke32/files/log-to-tmpdir.patch b/games-fps/eduke32/files/eduke32-20190820.8043-log-to-tmpdir.patch
index 24cec1b00af1..24cec1b00af1 100644
--- a/games-fps/eduke32/files/log-to-tmpdir.patch
+++ b/games-fps/eduke32/files/eduke32-20190820.8043-log-to-tmpdir.patch
diff --git a/games-fps/eduke32/files/search-duke3d-path.patch b/games-fps/eduke32/files/eduke32-20190820.8043-search-duke3d-path.patch
index c35af40c749e..c35af40c749e 100644
--- a/games-fps/eduke32/files/search-duke3d-path.patch
+++ b/games-fps/eduke32/files/eduke32-20190820.8043-search-duke3d-path.patch
diff --git a/games-fps/freedm-data/Manifest b/games-fps/freedm-data/Manifest
index 7975d84ec2f7..b62a254c9d68 100644
--- a/games-fps/freedm-data/Manifest
+++ b/games-fps/freedm-data/Manifest
@@ -1,3 +1,4 @@
-DIST freedm-0.11.3.zip 7853186 BLAKE2B 5f399233e0d1f1c61d8170dc8e13ca0c6efe79255a87511027ad69e9ab7cf21045e9bc7f40fec6fa3604b3c77590cde8e85b2e9a53e1d89c5aeaf67bffa7023e SHA512 263f126e519a883b828b4f321363fe0f8c557ae58b76c6b3e28aa60e86c15fcc78c866bf003fc523276cefbb431023de64f09b026e85b0a0c7c85a88d1f47cd0
-EBUILD freedm-data-0.11.3.ebuild 588 BLAKE2B 58f96cb841b50dc6d8042d3d5f891a689dbefff0ed38ad284ad5278dc70cadc23c2374d6465dbbceba0654c4ab18171b9885eeb65a1e4696b1e09c066dbf9979 SHA512 6ee871e952c8cbcdeba69b807bca9bba5532f077954429db08f82ed05bb65285c1756423f0aaccdd1ba99c5e42a60593a9ea50e0ca0629a015edba0ab831b4b7
+AUX ImageMagick/policy.xml 127 BLAKE2B fc13d41dc99e848f79af5e42c9e0ccd28bd07a69c97174e1c70bc6d58eae44b56495bd2c8698e0651ddeba63bcad7bf698c51aca7d7e932013a80a221b8696c2 SHA512 057f150e101344e3f29c654250353304b668bcb225b563f6b6e252e598123e1a634812d9cbbe7a28c2e271f9ee93d0303e66c23231f51f74fbaaaf6ef8fd1677
+DIST freedoom-0.11.3.tar.gz 17010131 BLAKE2B a0b601575da8516cf9f83466fe2146b708aa3cb21a3df2f7cbcd018a560f65b9b89c85907115050c4985b64eff29a3a9d2cfb7d31e93043e9d3c35fe7749d749 SHA512 51e0d5f7ca7c846c556fcba36b0f9c815090bfc76a80200aebd1526291da16b71145fbe254100cc5ad37ffc044d4380ef07b8bd4bdb811f00b9150e7b34dd636
+EBUILD freedm-data-0.11.3-r1.ebuild 1220 BLAKE2B fadf4a1f5757a51c41a0691cdb4dba3c11e557c937086310a26c244c3164be1096d60f409147cb12a88cb8b9bc671c4e1a93885c124af4cc6f1487453a8bbef8 SHA512 6be1782d8577cea151040186cf402911cf4bacda8f025aae1297784499b6adf4a14927e87e4a503b2355613388ca55d2b3ff28611bd4c0318c1863869ab146fb
 MISC metadata.xml 1480 BLAKE2B 0755aba8cc597778e420a8142e5febd305e317057870abdaa2f5761e2b45f86c139f63aa096fdb20a5984552d886b47ba7b458ed7f3e971ce4442d03f31e75f9 SHA512 d5847035c6bfa72c3af95a8af203df5909236616726a474dcc33c051de8149f82f4d8c9d1bc8be05b6b05ae1f3a8ec3064f400aa120a6c87d43358ab2e7e20f3
diff --git a/games-fps/freedm-data/files/ImageMagick/policy.xml b/games-fps/freedm-data/files/ImageMagick/policy.xml
new file mode 100644
index 000000000000..ffacb9209fb3
--- /dev/null
+++ b/games-fps/freedm-data/files/ImageMagick/policy.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<policymap>
+  <policy domain="coder" rights="read | write" pattern="PS" />
+</policymap>
diff --git a/games-fps/freedm-data/freedm-data-0.11.3-r1.ebuild b/games-fps/freedm-data/freedm-data-0.11.3-r1.ebuild
new file mode 100644
index 000000000000..99ce657c7869
--- /dev/null
+++ b/games-fps/freedm-data/freedm-data-0.11.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit python-any-r1 xdg
+
+DESCRIPTION="Game resources for FreeDM"
+HOMEPAGE="https://freedoom.github.io"
+SRC_URI="https://github.com/freedoom/freedoom/archive/v${PV}.tar.gz -> freedoom-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP}]')
+	app-text/asciidoc
+	games-util/deutex
+	virtual/imagemagick-tools[png]"
+
+S="${WORKDIR}/freedoom-${PV}"
+
+DOOMWADPATH=share/doom
+
+python_check_deps() {
+	has_version -b "dev-python/pillow[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	# This is to enable usage of the 'PS' coder, which is
+	# disabled by default (https://bugs.gentoo.org/664236)
+	install -D -t ~/.config/ImageMagick "${FILESDIR}"/ImageMagick/policy.xml || die
+
+	xdg_src_prepare
+	eapply_user
+}
+
+src_compile() {
+	emake wads/freedm.wad
+}
+
+src_install() {
+	emake install-freedm \
+		prefix="${ED}/usr/" \
+		bindir="bin/" \
+		mandir="share/man/" \
+		waddir="${DOOMWADPATH}/"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "FreeDM WAD file installed into ${EPREFIX}/usr/${DOOMWADPATH} directory."
+}
diff --git a/games-fps/freedm-data/freedm-data-0.11.3.ebuild b/games-fps/freedm-data/freedm-data-0.11.3.ebuild
deleted file mode 100644
index 43ac7804c6a0..000000000000
--- a/games-fps/freedm-data/freedm-data-0.11.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Game resources for FreeDM"
-HOMEPAGE="https://freedoom.github.io"
-SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedm-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/freedm-${PV}"
-
-DOOMWADPATH=/usr/share/doom
-
-src_install() {
-	insinto ${DOOMWADPATH}
-	doins freedm.wad
-	dodoc CREDITS.txt README.html
-}
-
-pkg_postinst() {
-	elog "FreeDM WAD file installed into ${DOOMWADPATH} directory."
-}
diff --git a/games-fps/freedm/Manifest b/games-fps/freedm/Manifest
index bc206eae18fe..a9f4fe12674c 100644
--- a/games-fps/freedm/Manifest
+++ b/games-fps/freedm/Manifest
@@ -1,2 +1,2 @@
-EBUILD freedm-0.11.3.ebuild 525 BLAKE2B 25f0efebab82c86cee9ecb2ac7984097d511db2f96efa1316eb44622e503e1b913c6b871b09a29ef05dbb408719e69047dbfa46ca5577bc321f7a711737206f3 SHA512 27432177099fcd42ee3c72d4e2ab5dd8569fe75d23d85174d44629377ed38ed3d5336203b333f39ea5ec181a4d604e9cbb44e12e88e5dcbf3647133f5152b0b3
+EBUILD freedm-0.11.3-r1.ebuild 537 BLAKE2B bbb92634756b06c366a717d0436d77473800b01556bb613d49869567edf36c2025c5577cd65b4c210c6539578459d3fe6babc87b3244d9dd67166c5181bbd314 SHA512 6c6cde2b143e2ce2ec99d05bb1612d2baee4a54e0fcc5a295f986ff527eb6afcd7b875d3167e22e588d92b2cfee60a280fb6aff1f88e4902f38e21382524dcf9
 MISC metadata.xml 1480 BLAKE2B 0755aba8cc597778e420a8142e5febd305e317057870abdaa2f5761e2b45f86c139f63aa096fdb20a5984552d886b47ba7b458ed7f3e971ce4442d03f31e75f9 SHA512 d5847035c6bfa72c3af95a8af203df5909236616726a474dcc33c051de8149f82f4d8c9d1bc8be05b6b05ae1f3a8ec3064f400aa120a6c87d43358ab2e7e20f3
diff --git a/games-fps/freedm/freedm-0.11.3-r1.ebuild b/games-fps/freedm/freedm-0.11.3-r1.ebuild
new file mode 100644
index 000000000000..fe8bae6ec409
--- /dev/null
+++ b/games-fps/freedm/freedm-0.11.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A 32-level game designed for competitive deathmatch play."
+HOMEPAGE="https://freedoom.github.io"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	~games-fps/freedm-data-${PV}
+	|| (
+		games-fps/gzdoom[nonfree(+)]
+		games-engines/odamex
+		games-fps/doomsday
+		games-fps/prboom-plus
+	)
+"
+
+pkg_postinst() {
+	elog "If you are looking for a single-player focused game, please install games-fps/freedoom."
+}
diff --git a/games-fps/freedm/freedm-0.11.3.ebuild b/games-fps/freedm/freedm-0.11.3.ebuild
deleted file mode 100644
index 47c3ee76f4c5..000000000000
--- a/games-fps/freedm/freedm-0.11.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A 32-level game designed for competitive deathmatch play."
-HOMEPAGE="https://freedoom.github.io"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	~games-fps/freedm-data-${PV}
-	|| (
-		games-fps/gzdoom
-		games-engines/odamex
-		games-fps/doomsday
-		games-fps/prboom-plus
-	)
-"
-
-pkg_postinst() {
-	elog "If you are looking for a single-player focused game, please install games-fps/freedoom."
-}
diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index b667bef450be..35676af223af 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1,3 +1,4 @@
-DIST freedoom-0.11.3.zip 18889307 BLAKE2B 052d7f58d1beb7947f4fff3021ec0229c9746bfb7970a52d23fa44fc881d8cf3c314b8ecf0dc400c2da4e28c623695874ae75dcd1e45933fdb1826ea04f0e24b SHA512 c67fc69bca87cba2ba40b91f578724feaabbd6cd64c6845fa567d6901b7a9e3145185011731c677a71f7b5a6f8707855fb573c0c09b6d47fef83b1577b211816
-EBUILD freedoom-data-0.11.3.ebuild 632 BLAKE2B a65af31246cf206f39dfd031caffa57a04b35f3cec7471a2515ed4b35646ea6f13c3ec2ee66dbdadbbe61d15af0f3cf871f69b1ffd28fd8c9defeeaa7b10a81f SHA512 b2c47cfed880ab80ff4c8ceaa0926871ace5fe4cd2d812922273466c91125cf7e1f64e3543c74c77750be9873c0cbe6cd5a144f90bc01ead6e3576e977289425
+AUX ImageMagick/policy.xml 127 BLAKE2B fc13d41dc99e848f79af5e42c9e0ccd28bd07a69c97174e1c70bc6d58eae44b56495bd2c8698e0651ddeba63bcad7bf698c51aca7d7e932013a80a221b8696c2 SHA512 057f150e101344e3f29c654250353304b668bcb225b563f6b6e252e598123e1a634812d9cbbe7a28c2e271f9ee93d0303e66c23231f51f74fbaaaf6ef8fd1677
+DIST freedoom-0.11.3.tar.gz 17010131 BLAKE2B a0b601575da8516cf9f83466fe2146b708aa3cb21a3df2f7cbcd018a560f65b9b89c85907115050c4985b64eff29a3a9d2cfb7d31e93043e9d3c35fe7749d749 SHA512 51e0d5f7ca7c846c556fcba36b0f9c815090bfc76a80200aebd1526291da16b71145fbe254100cc5ad37ffc044d4380ef07b8bd4bdb811f00b9150e7b34dd636
+EBUILD freedoom-data-0.11.3-r1.ebuild 1250 BLAKE2B b674b2bd7a51e0d65d562a1e866b1e7ce5d188e754cb6ca67f5e332aeb8b60d2171d240da9a5d7141732a5699b13a2a672417963b02a312b185171288d54d942 SHA512 ced60b234184624e6d0297f6b231a2af37bcdcb65bc89831c71b4430f0ffb41ca4c56164fe3b8602fb0ffcac58a27f313196f52fa64ad845cd34c74b939f5bd3
 MISC metadata.xml 1809 BLAKE2B 84960851e0fcb2354c71c796ebd28f3c1bea2762e1810d851c04d375cbc90bf6a6cddd9629f802829bb495cea44260b352291e2d3adbb17516c8cb97697da450 SHA512 a1e68567ab9be93d88e5debbba73e2704e5ef9f063bc98f30bc480064e9037b3841fdd3cec24a8f61ba0c76a68d20b63a329dd880d8c99a8c11a3ba39c3de89d
diff --git a/games-fps/freedoom-data/files/ImageMagick/policy.xml b/games-fps/freedoom-data/files/ImageMagick/policy.xml
new file mode 100644
index 000000000000..ffacb9209fb3
--- /dev/null
+++ b/games-fps/freedoom-data/files/ImageMagick/policy.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<policymap>
+  <policy domain="coder" rights="read | write" pattern="PS" />
+</policymap>
diff --git a/games-fps/freedoom-data/freedoom-data-0.11.3-r1.ebuild b/games-fps/freedoom-data/freedoom-data-0.11.3-r1.ebuild
new file mode 100644
index 000000000000..ed2ae707e1a1
--- /dev/null
+++ b/games-fps/freedoom-data/freedoom-data-0.11.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit python-any-r1 xdg
+
+DESCRIPTION="Game resources for Freedoom: Phase 1+2"
+HOMEPAGE="https://freedoom.github.io"
+SRC_URI="https://github.com/freedoom/freedoom/archive/v${PV}.tar.gz -> freedoom-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP}]')
+	app-text/asciidoc
+	games-util/deutex
+	virtual/imagemagick-tools[png]"
+
+S="${WORKDIR}/freedoom-${PV}"
+
+DOOMWADPATH=share/doom
+
+python_check_deps() {
+	has_version -b "dev-python/pillow[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	# This is to enable usage of the 'PS' coder, which is
+	# disabled by default (https://bugs.gentoo.org/664236)
+	install -D -t ~/.config/ImageMagick "${FILESDIR}"/ImageMagick/policy.xml || die
+
+	xdg_src_prepare
+	eapply_user
+}
+
+src_compile() {
+	emake wads/freedoom{1,2}.wad
+}
+
+src_install() {
+	emake install-freedoom{1,2} \
+		prefix="${ED}/usr/" \
+		bindir="bin/" \
+		mandir="share/man/" \
+		waddir="${DOOMWADPATH}/"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Freedoom WAD files installed into ${EPREFIX}/usr/${DOOMWADPATH} directory."
+}
diff --git a/games-fps/freedoom-data/freedoom-data-0.11.3.ebuild b/games-fps/freedoom-data/freedoom-data-0.11.3.ebuild
deleted file mode 100644
index 5e38d534c7e2..000000000000
--- a/games-fps/freedoom-data/freedoom-data-0.11.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Game resources for Freedoom: Phase 1+2"
-HOMEPAGE="https://freedoom.github.io"
-SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedoom-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/freedoom-${PV}"
-
-DOOMWADPATH=/usr/share/doom
-
-src_install() {
-	insinto ${DOOMWADPATH}
-	doins freedoom1.wad
-	doins freedoom2.wad
-	dodoc CREDITS.txt README.html
-}
-
-pkg_postinst() {
-	elog "Freedoom WAD files installed into ${DOOMWADPATH} directory."
-}
diff --git a/games-fps/freedoom/Manifest b/games-fps/freedoom/Manifest
index 641f15e1ccc3..01b696c9ad31 100644
--- a/games-fps/freedoom/Manifest
+++ b/games-fps/freedoom/Manifest
@@ -1,2 +1,2 @@
-EBUILD freedoom-0.11.3-r1.ebuild 552 BLAKE2B 47c4ad551c551538d5e04564f1f978015a97deb1b4060940d76ae2524ef04654ed38d22537e5281987b0eb881444d7115789c0bc1f8638f027025e51b456a2ae SHA512 689a084fcf603877e13ab96222c9c5f352ec6c767906056ce43098ab32cff23fb8f5509ffd76aa3acf4fd6153fedf1b44e71f6f57c7490cc50587b97f2626bb5
+EBUILD freedoom-0.11.3-r2.ebuild 564 BLAKE2B 5bab0eaf05d093ae852d870826ff936532d62c75e20919cb93fbb3dcf50941f02766bb70b3510e14ae7da5c5d2b54d92f224b9309b8056c6f1f9c680f3ad55fa SHA512 78a42263ead6ee8b3c80e79e97e09ff6752e186db46221f86b0df35cb18c3b0869d7ee2bb16ad27c49922f8860df2bf0736f2625dbc84e21f186f5da07122d41
 MISC metadata.xml 1809 BLAKE2B 84960851e0fcb2354c71c796ebd28f3c1bea2762e1810d851c04d375cbc90bf6a6cddd9629f802829bb495cea44260b352291e2d3adbb17516c8cb97697da450 SHA512 a1e68567ab9be93d88e5debbba73e2704e5ef9f063bc98f30bc480064e9037b3841fdd3cec24a8f61ba0c76a68d20b63a329dd880d8c99a8c11a3ba39c3de89d
diff --git a/games-fps/freedoom/freedoom-0.11.3-r1.ebuild b/games-fps/freedoom/freedoom-0.11.3-r1.ebuild
deleted file mode 100644
index b0297a0238e1..000000000000
--- a/games-fps/freedoom/freedoom-0.11.3-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A complete free-content single-player focused game based on the Doom engine"
-HOMEPAGE="https://freedoom.github.io"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	~games-fps/freedoom-data-${PV}
-	|| (
-		games-fps/gzdoom
-		games-engines/odamex
-		games-fps/doomsday
-		games-fps/prboom-plus
-	)
-"
-
-pkg_postinst() {
-	elog "If you are looking for a multiplayer-focused deathmatch game, please install games-fps/freedm."
-}
diff --git a/games-fps/freedoom/freedoom-0.11.3-r2.ebuild b/games-fps/freedoom/freedoom-0.11.3-r2.ebuild
new file mode 100644
index 000000000000..0006bb365ced
--- /dev/null
+++ b/games-fps/freedoom/freedoom-0.11.3-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A complete free-content single-player focused game based on the Doom engine"
+HOMEPAGE="https://freedoom.github.io"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	~games-fps/freedoom-data-${PV}
+	|| (
+		games-fps/gzdoom[nonfree(+)]
+		games-engines/odamex
+		games-fps/doomsday
+		games-fps/prboom-plus
+	)
+"
+
+pkg_postinst() {
+	elog "If you are looking for a multiplayer-focused deathmatch game, please install games-fps/freedm."
+}
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index e2476e917539..526e49c179a6 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,5 +1,6 @@
-AUX gzdoom-4.1.3-fluidsynth2.patch 1047 BLAKE2B c56fbc64aa85fef15415415b87ad2246b831b6c412ddf3a1e5f841530a0dc42a8feb1f16bca4a6c888d97590d7659cd5694029e893cfb4e72b3fc833554028f5 SHA512 6ef599283753d744345ce91c5556edcc6ee369c6cc2dd478b3e8ec95926b06f0875ce009d78afb9c45ba9da3b22755460f5d0c5d7fbf56322b361390c59fcda1
-AUX gzdoom-4.1.3-install_soundfonts.patch 1379 BLAKE2B 5ce4ee6fe06d5185a1b2fae5b70ed195e61d405d5c5b5973a1409244e657a4899017e16c28574add1d9ff37d4ee02444ff3e162197ad222d5c0990e7c40a9f91 SHA512 2ce0032b5246337c8e1ae80b254ec676460a54d19366902ad30042bfd9c2ae2c92354ab13631affa514bb7c47100c38bdec7b9d76695f2fd0281486a7d7d85dd
-DIST gzdoom-4.1.3.tar.gz 13084313 BLAKE2B d082efacc99264eff92f51dac1a4ff742ee00c65fec769cd143e1ffa7a1527060735efc7325a5fd5d0950bdce52cf28941837c1a32e3e88483ece574de1fba64 SHA512 16d3db1320eaaf39477971e3724228850abe216fa792d79e288f3551ab635344c22699c10ccf9e7da4dc49543e1b5ff8be7f0053b79dc53e274e33cc17a667ac
-EBUILD gzdoom-4.1.3.ebuild 1416 BLAKE2B d60d589c185e3b675a92329231eabe06139b0acc236df0f31a87ef5b49e547e5e7654ffca00ca1e4b7413cdf5bb6ab7cc600fed0f0cc2216e5b99c8b1d8c2505 SHA512 4be692cbc8c360b7c897723f2b7e61fdd14190424bdee602cf195fdf2f8c018159a004a6fb7fdfc8094d0f96752f7e6522559ef99c8c9d1d343b59ee53d7a80c
-MISC metadata.xml 883 BLAKE2B 3d019a0bf36020e6588fea81419fdf87d1e6e9571dcaac4a38fde6a4a0e2dc9b0fe9784fb2539e20c22a93bd689e997f8e195ba8ed1bf42a897397f8fe9b36ca SHA512 61d4477fa1c674118bf347b237cdb31ef00b2410cda123fc1fa5178c47528d14fb22d65f99ec1a2b41c021b676628fe70d74640074f91d4c5d76beee01415ca2
+AUX gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch 1045 BLAKE2B 642f7d083c577f71336865396cba1c07a68bdf0766033825168689069a12ce18ad062fa4e631f9ce545b392cee35d05f348b5ee41f853c6b374f16e114235380 SHA512 5cae0b86d045285a86f79ed63d7dfa047412241de724f948e6a0cc98412ef1f9f5c119971dfa38fcd2009a00a5bae57e72c8d25b2aedbd7e8eac284e73a53129
+AUX gzdoom-4.2.0-fluidsynth2.patch 1047 BLAKE2B c56fbc64aa85fef15415415b87ad2246b831b6c412ddf3a1e5f841530a0dc42a8feb1f16bca4a6c888d97590d7659cd5694029e893cfb4e72b3fc833554028f5 SHA512 6ef599283753d744345ce91c5556edcc6ee369c6cc2dd478b3e8ec95926b06f0875ce009d78afb9c45ba9da3b22755460f5d0c5d7fbf56322b361390c59fcda1
+AUX gzdoom-4.2.0-install_soundfonts.patch 1379 BLAKE2B 5ce4ee6fe06d5185a1b2fae5b70ed195e61d405d5c5b5973a1409244e657a4899017e16c28574add1d9ff37d4ee02444ff3e162197ad222d5c0990e7c40a9f91 SHA512 2ce0032b5246337c8e1ae80b254ec676460a54d19366902ad30042bfd9c2ae2c92354ab13631affa514bb7c47100c38bdec7b9d76695f2fd0281486a7d7d85dd
+DIST gzdoom-4.2.0.tar.gz 13482879 BLAKE2B 5c68718b840ce00a752179b4c735f064ed2ea669eff5e4bd71e3ccea3bb9af238287ddffc297cbfbe6069c658ec1d203b73790c973f836f8aa9ba33ac3ec2803 SHA512 07ad674eb22eb1388a5e3a6bd91d769fef90cb52728034e30d2967c484acaa41cfc7fc9ed486f4dbd0e86ea4d32bbafde402b771fc2fceb0708551328ef08f0d
+EBUILD gzdoom-4.2.0.ebuild 1968 BLAKE2B daf0b5dc863b64406f8ae41911ea0489f3e437ace6e8ee4d8d645ba50f1dd4ec63faf5313c5bf440953303c2db913693f804fcb196f38fc2cac4c6833aaaf97a SHA512 5cdeecb97701af6413bafa2178a24d29548d1cea3c13d88535cac0041373ecde8c68a0b4557ee4672fdacaefeadbbff7f35c22747e53cddea743f5e4bb4e290d
+MISC metadata.xml 940 BLAKE2B 85d6dcb7986f8a27f1ad929abe60899e01709bb8778668a0cda11ac7c3c4f33349bb832dcdc369e7c136ba022d6ac6673565cb674cb9f642157fc89c9b678e72 SHA512 c27939efdfa612bfea201fd4f1e4399c050b5d0244cb7be914dc1b033f4f09c5614b5f226a9ce29c07cfb31247133a8b69bc81274ddf5b38e159287a85a97a30
diff --git a/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch
new file mode 100644
index 000000000000..c74d08a24a47
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch
@@ -0,0 +1,36 @@
+From 1e09b211a000c649aae6eea736647daa650141bc Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Sat, 31 Aug 2019 21:23:23 +0900
+Subject: [PATCH] Introduce the BUILD_NONFREE option
+
+This allow users to disable building nonfree components (brightmaps.pk3
+and game_support.pk3) if they so desire.
+---
+ CMakeLists.txt | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7860358ef..23d317f42 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -404,10 +404,15 @@ add_subdirectory( libraries/lzma )
+ add_subdirectory( tools )
+ add_subdirectory( libraries/dumb )
+ add_subdirectory( libraries/gdtoa )
++
+ add_subdirectory( wadsrc )
+-add_subdirectory( wadsrc_bm )
+ add_subdirectory( wadsrc_lights )
+-add_subdirectory( wadsrc_extra )
++option (BUILD_NONFREE "Build nonfree components" ON)
++if( BUILD_NONFREE )
++	add_subdirectory( wadsrc_bm )
++	add_subdirectory( wadsrc_extra )
++endif()
++
+ add_subdirectory( src )
+ 
+ if( NOT CMAKE_CROSSCOMPILING )
+-- 
+2.23.0
+
diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch
index 1ae12a832b4b..1ae12a832b4b 100644
--- a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch
+++ b/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch
diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch
index 1fe0b99d9a8e..1fe0b99d9a8e 100644
--- a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch
+++ b/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch
diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
deleted file mode 100644
index 242bd4e92879..000000000000
--- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop xdg
-
-DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
-HOMEPAGE="https://zdoom.org"
-SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk gtk2 openmp"
-
-DEPEND="
-	media-libs/libsdl2[opengl]
-	media-libs/libsndfile
-	media-libs/openal
-	media-sound/fluidsynth:=
-	media-sound/mpg123
-	sys-libs/zlib
-	virtual/jpeg:0
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-PATCHES=(
-	"${FILESDIR}/${P}-fluidsynth2.patch"
-	"${FILESDIR}/${P}-install_soundfonts.patch"
-)
-
-src_prepare() {
-	rm -rf docs/licenses || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
-		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
-		-DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
-		-DDYN_FLUIDSYNTH=OFF
-		-DDYN_OPENAL=OFF
-		-DDYN_SNDFILE=OFF
-		-DDYN_MPG123=OFF
-		-DNO_GTK="$(usex !gtk)"
-		-DNO_OPENAL=OFF
-		-DNO_OPENMP="$(usex !openmp)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	newicon src/posix/zdoom.xpm "${PN}.xpm"
-	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-	cmake-utils_src_install
-}
diff --git a/games-fps/gzdoom/gzdoom-4.2.0.ebuild b/games-fps/gzdoom/gzdoom-4.2.0.ebuild
new file mode 100644
index 000000000000..4fbfe9b905b2
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.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 cmake-utils desktop xdg
+
+DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
+HOMEPAGE="https://zdoom.org"
+SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT
+	nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk gtk2 +nonfree openmp"
+
+DEPEND="
+	media-libs/libsdl2[opengl]
+	media-libs/libsndfile
+	media-libs/openal
+	media-sound/fluidsynth:=
+	media-sound/mpg123
+	sys-libs/zlib
+	virtual/jpeg:0
+	gtk? (
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3 )
+	)"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+PATCHES=(
+	"${FILESDIR}/${P}-fluidsynth2.patch"
+	"${FILESDIR}/${P}-install_soundfonts.patch"
+	"${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
+)
+
+src_prepare() {
+	rm -rf docs/licenses || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+		-DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
+		-DDYN_FLUIDSYNTH=OFF
+		-DDYN_OPENAL=OFF
+		-DDYN_SNDFILE=OFF
+		-DDYN_MPG123=OFF
+		-DNO_GTK="$(usex !gtk)"
+		-DNO_OPENAL=OFF
+		-DNO_OPENMP="$(usex !openmp)"
+		-DBUILD_NONFREE="$(usex nonfree)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	newicon src/posix/zdoom.xpm "${PN}.xpm"
+	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use nonfree ; then
+		elog
+		elog "GZDoom installed without nonfree components."
+		elog "Note: The nonfree game_support.pk3 file is needed to play"
+		elog "      games natively supported by GZDoom."
+		elog "A list of games natively supported by GZDoom may be found"
+		elog "on the ZDoom wiki: https://zdoom.org/wiki/IWAD"
+		elog
+	fi
+}
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index cfd1b5ffe560..5b213dc39913 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -18,6 +18,7 @@
 	</maintainer>
 	<use>
 		<flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag>
+		<flag name="nonfree">Enable non-free components</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://forum.zdoom.org/viewforum.php?f=2</bugs-to>
diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index 660c453d572b..b459320adebd 100644
--- a/games-kids/Manifest.gz
+++ b/games-kids/Manifest.gz
diff --git a/games-kids/tuxmathscrabble/Manifest b/games-kids/tuxmathscrabble/Manifest
index 7eb47af153d7..9b7a877315da 100644
--- a/games-kids/tuxmathscrabble/Manifest
+++ b/games-kids/tuxmathscrabble/Manifest
@@ -1,4 +1,4 @@
 AUX tuxmathscrabble-0.8.1-gentoo.patch 2770 BLAKE2B 8d5134f7cb2285728545352bc79d240c1a5e5dcbc268fd72a3b9c7ef798997756f70387f34144ff82feed2f82f089b7035c68eb7e70fc99f0886241ac7e79be8 SHA512 11633dbaae261d007638fc7f6dd2e934654fa699d5f08d6fd01552c62de2b7e52e95ecd737920b62cbf3d289f5b8da0eeef2416a0f45d1d54a9aca4432684c4d
 DIST tuxmathscrabble-0.8.1.tar.gz 9376820 BLAKE2B 40746d4e9b9ee81b09e563a522f6d1ae839a4729b7b38c9a96758553766b2597360c7391d42f09c8de494871ce086883f47186a17e9ee4b61c8a0afdc0f07b11 SHA512 70a48b078af170c4008beca495576afc6e0dd72239b2b57543a98642ee9e8d13a2ae48aa5afab77015c8c56cd9a2d80865645504a620b2e2b798ed40f653533c
-EBUILD tuxmathscrabble-0.8.1-r1.ebuild 1314 BLAKE2B c890aacaf3678c71f18d1c189222486eb5c1b0ffc5436bc911f3fc2823c5003dc6d4ca6cfbdeb9ebd08f4a80a3347798f39e6f82de73779969353700cbf9464d SHA512 82134dc3fc4cafccbf9812871016971a518b1ee5f002ff3faa67fde4d7dfea596121f2a2555dc3adfbb76818b6bc1e0aba484a5a2b62b485cc1c49e59af10171
+EBUILD tuxmathscrabble-0.8.1-r1.ebuild 1290 BLAKE2B 2a05a36d32190b6c9e6f87d587f41e7b428240b775f6d396c97fbdef3c2a6d810a9c6057b3ca65b0663a60840c318a40fc265b2edde4092a204d481a4ec5882a SHA512 486e5adf16c5f4f0479a5c3938014586d0c43774ab87a1766f22bfce0e325660df437c7a02c792656c1caf3c58782cf9f73952c0ac80fb1959203d7cf2dd2782
 MISC metadata.xml 344 BLAKE2B 0a845bf521bec0b1539b3397218a41a64e7d5bbd91796bfbde2cba1fcb22f2d4e50831f52a1f0ccd8b4fcf39f358668b95eee64d635c685efe69635ae2e18453 SHA512 28b2c2b0b4de1a63524eeda1048d8bf7149bfb7eec23a39e22503143c9d68f449d7e40ec60f5529ce882670875961197ccdb5d8cf49d5c099f3392877a77d64d
diff --git a/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1-r1.ebuild b/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1-r1.ebuild
index 53a209e1052b..a8201b815b36 100644
--- a/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1-r1.ebuild
+++ b/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1-r1.ebuild
@@ -49,8 +49,7 @@ src_prepare() {
 src_install() {
 	newbin ${PN}.py ${PN}
 
-	insinto $(python_get_sitedir)
-	doins -r ${MY_PN}
+	python_domodule ${MY_PN}
 
 	insinto /usr/share/${MY_PN}
 	doins -r .tms_config_master Font
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 1be5c4524425..e25156c64fae 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/braincurses/Manifest b/games-puzzle/braincurses/Manifest
index 5e43960fc63c..b8390c738157 100644
--- a/games-puzzle/braincurses/Manifest
+++ b/games-puzzle/braincurses/Manifest
@@ -1,5 +1,7 @@
 AUX braincurses-0.5b-as-needed.patch 696 BLAKE2B e0d234562842a30aceec3b686c9315be7f856e14b0398c14a3f7c7350a9ccf34d9bd96d7a10e62978b372a28e99178ce81b54960416e08c23bb347935eebd2c3 SHA512 8788fe4ef94d3b501104e66dc31a4df43b55b0949ef35b1fe9d6acf936e178d8a7bacbc331af6db093a056218658e845a816e51746000085581f8e623fbcd42c
 AUX braincurses-0.5b-gcc43.patch 192 BLAKE2B 4f557c7666e4d1b772feb1de5a793868aaf38dcdec583f9feb795bc72b98262078924a5734e137cd5719cdd77cc35c596f758677d0682035859f6575b6c8eb6d SHA512 94a6664162be766918280af07201ba3eb55c22e0eabbf8701aecb5c7f0eb5151e24d7b65aadb6db4262373c1323b170c332f3700f5e90a74f048511600f88f64
 DIST braincurses-0.5b.tar.gz 18487 BLAKE2B 4d3874eb6625781e866ba2250da45ff165d662abaeabda2c4525bb300479b33e1efb91f997165310b7a4edc61f81ac841b00b940d319ef0c18b8684dd5355d60 SHA512 7f90da3a5c480e0bf736dd4a53efc08abeb85969e727882e3d06f888b2a4b6002f9fd9bc1554ac2256c9821dea5fabf2638eba4a672046a09c1adb8690803a0e
+DIST braincurses-1.1.0.tar.gz 12996 BLAKE2B 3f0c5edabd65175e581280413f7fea841d4d4b7ff9f4b39c4c3a0084e0e4c0a159605fe9ed320769a9bc85d671845af115456df33305e20f1eef6c53626c01a4 SHA512 7f27512c321ca2f2c3b38a891fc4e1ab0e2371412ada827f69dc262e27abbf750861b7ab859d0d8407ba25e4814ea6c33bc36a2c8ccdeda4977fa4bebb5457cd
 EBUILD braincurses-0.5b-r1.ebuild 643 BLAKE2B cdec155c182c713d4d603ccf1f258f22961243bbc7e5765d86ea0b0a02e4e0a2b70d3bfa3ce466987d7231b3113afab3df78387cb19ea57da0e1bedab3544c43 SHA512 a369e231f9a396d5c019ae0741cd4f980cfd1655ae68f357293740fd65a11a9452fe494ecc3e003059a41e8bcaca70b2e2dbac2f00f82c5871e5a6dfad496208
-MISC metadata.xml 393 BLAKE2B dbff21a77d1682325bb3bda0698d8e524d8d4aee12cd1a419de245c67fd3a6e80a0d15f0868239cbb2e0ac70f49d652279cec8d9b09c8538d7fbb50d1e8aa1ea SHA512 d3922c11ee1f21e10c346cd61b19968d3b4f7571020d0370823b9d7c9e93605d71d9391b7efb5b95858165dbd7d6799408623c3ea599f225c688057a69e17ec9
+EBUILD braincurses-1.1.0.ebuild 558 BLAKE2B 5b1a24a0829a14aa2e7e379a543d9e84dd1edef5ab336ff8e82f8e33ac59eed7e4849dfa0641b6463e516d9270ea5743162c57dfaf40fcf1c5530b2bade2874e SHA512 61e780d9d20ec31c8cfc87389c00dfcfe63cf35c119c6112039cf5e0caa0fa6d7d30da718a0d6ae4efe513456abb88ba62641320eee29eae791e9d0330f868b4
+MISC metadata.xml 337 BLAKE2B d32672d3c35740ec028a8cf238945686d62c66a374eaf02e785a098505d5b3533a40dd3d90d0c20c7544ee50253aab1e7db89adf4e156726f524d2ca44a9e409 SHA512 90b46ca1664d9f5b6f4f51f0c988a258293c3d60f0ec0a0708da360df1e21872d603f5dc5a84ff1dbff52d8b1146b5248f8ce42ee47313dc86f1a47ec03a9c7b
diff --git a/games-puzzle/braincurses/braincurses-1.1.0.ebuild b/games-puzzle/braincurses/braincurses-1.1.0.ebuild
new file mode 100644
index 000000000000..94f0c4ab55b1
--- /dev/null
+++ b/games-puzzle/braincurses/braincurses-1.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A version of the classic game Mastermind"
+HOMEPAGE="https://github.com/bderrly/braincurses"
+SRC_URI="https://github.com/bderrly/braincurses/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+	emake CXX=$(tc-getCXX) LDLIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+}
+
+src_install() {
+	dobin braincurses
+	einstalldocs
+}
diff --git a/games-puzzle/braincurses/metadata.xml b/games-puzzle/braincurses/metadata.xml
index 53c5ddea1c78..9749ebc73548 100644
--- a/games-puzzle/braincurses/metadata.xml
+++ b/games-puzzle/braincurses/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">braincurses</remote-id>
 		<remote-id type="github">bderrly/braincurses</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 79b558d4b57d..b40a5e84515c 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 899797c3ba66..42b2c9c7f225 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,4 +1,6 @@
 AUX angband-4.1.3-tinfo.patch 824 BLAKE2B cfcc662b6837c84b7758931744b446c269a7a2958c183a3cf86368231116aaed065b37d93aca2a1d6e42af5a04c2bbf4db96a0aa2f188cd96eb81b01bcbcadc2 SHA512 00770084dcbab766384cbb5617efd8ae73191c46b59e64658b063c51c49d8d82c9d03e9b995bab8a609a67b5f9e92c77fa92aff987fdc2ecfbcfae38b6d7f638
 DIST angband-4.1.3.tar.gz 19924395 BLAKE2B 573181ab9b3a01abdc34cfac9e69a757eb7558c67c9490240890bc920c6c2a8ebea6268b733f06a6e421829d807fa135131c1512edfc344610a269139cc5ac47 SHA512 7810e1f04e337c1b5d1ddb6013785c953e0149dfa536c75dd8816fdfd304c37a09103d653cee0c150225c6ba702e121300a65012d8034079cd41f86a730f9c2a
+DIST angband-4.2.0.tar.gz 24727127 BLAKE2B 4bdd5cfe49080fc38b988e6606eadddc2e872ca7b01f34e692ca299a420689310e9e972355986e802e654a27837ac2621eb3bc0823b7e771dc0a851a5c5a8bc6 SHA512 b5c4884ce765bc45d7c21b8be06bc29c7d84c16e48341967b5d6a847f250db104ef509fc28e8887d4f1cd9ed545e504781186936a1f38931d5113e2fb58b32c3
 EBUILD angband-4.1.3.ebuild 2229 BLAKE2B d38bbb531edaae78e632eb0d9d74dfbdc3238d89005d1c9df1cecb54c8572d3932c5209042803ad1e5d58c684360cecd8276be99a0cae6bf720d570f372e8450 SHA512 b9425cf626ce9b4c5b4dd1d525c5373a6f68c63cc7240c4ea68446ae242a7c288365c43fdf67f126134f12d0bb6aaed7d4455cdbdf4763e7aec37a56d33e1f69
-MISC metadata.xml 430 BLAKE2B 7245504be968d4ce51d4a782520dd8e8b1acda9c16aeeea78674b350df8a15f88a6338ad8fe3852c5f8290c1198af0b32372fce2f3e13f7dac8063d0816f5431 SHA512 4cb61f2b253a390e59abb74f1d67171f73ec30cf38a3d05bdd23f36faf2b4a639f8dd117ec87b69a19faed0e7d117060c4aabae543aef988348591dd4c01a0f6
+EBUILD angband-4.2.0.ebuild 2608 BLAKE2B 80906623c96b7130985d04e919abe35731b6d204215c30d4f50e757fb0972868fb719b9b8f42ce61440a043e1eae0561d0687a192ca390e7e72b8c28c374dd8f SHA512 a4ccbb2cd36206024c4a28d8ab4e0f6c3f75bb538c89dc2481991e2c286f4d82c59a12b4a596f64da0a15dfc71b545f6f0259647e633330095dfc14efc7b5e8a
+MISC metadata.xml 487 BLAKE2B 4b3f298db150c90e551d7ce2c46b9f3929eec0cc8ebd3c0e601841afae7234ab5f7369ea2d3a7189a3f407ffec918d612f238133166f3a565c2f056d9e7f443a SHA512 16308369154cd36398eae5339bfa8c8f387919635678be9b11040a0bad027a5df6d895ff9d598dc000af46751468d9964fac636794cb3c56438d10fc99b95af3
diff --git a/games-roguelike/angband/angband-4.2.0.ebuild b/games-roguelike/angband/angband-4.2.0.ebuild
new file mode 100644
index 000000000000..acb1f3d093ca
--- /dev/null
+++ b/games-roguelike/angband/angband-4.2.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop xdg-utils
+
+MAJOR_PV=$(ver_cut 1-2)
+
+DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien"
+HOMEPAGE="https://rephial.org/"
+SRC_URI="https://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ncurses sdl sdl2 sound +X"
+
+REQUIRED_USE="sdl2? ( sdl )
+	sound? ( sdl )
+	|| ( X ncurses )"
+
+RDEPEND="X? (
+		media-fonts/font-misc-misc
+		x11-libs/libX11
+	)
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	sdl? (
+		!sdl2? (
+			media-libs/libsdl[video,X]
+			media-libs/sdl-image
+			media-libs/sdl-ttf
+			sound? (
+				media-libs/libsdl[sound]
+				media-libs/sdl-mixer[mp3]
+			)
+		)
+		sdl2? (
+			media-libs/libsdl2[video,X]
+			media-libs/sdl2-image
+			media-libs/sdl2-ttf
+			sound? (
+				media-libs/libsdl2[sound]
+				media-libs/sdl2-mixer[mp3]
+			)
+		)
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
+	sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
+
+	if use !sound ; then
+		sed -i -e 's/sounds//' lib/Makefile || die
+	fi
+
+	# Game constant files are now system config files in Angband, but
+	# users will be hidden from applying updates by default
+	{
+		echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/customize/\""
+		echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/gamedata/\""
+	} > "${T}"/99${PN} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--bindir="${EPREFIX}"/usr/bin
+		--with-private-dirs
+		$(use_enable X x11)
+		$(use_enable ncurses curses)
+	)
+	if use sdl; then
+		if use sdl2; then
+			myconf+=(
+				--enable-sdl2
+				$(use_enable sound sdl2-mixer)
+			)
+		else
+			myconf+=(
+				--enable-sdl
+				$(use_enable sound sdl-mixer)
+			)
+		fi
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc changes.txt readme.txt
+	dodoc docs/{a-quick-demo,attack,birth,command,customize,dungeon,faq,guide}.rst
+	doenvd "${T}"/99${PN}
+
+	if use X || use sdl; then
+		use X && make_desktop_entry "angband -mx11" "Angband (X11)" "${PN}"
+		if use sdl; then
+			use sdl2 && make_desktop_entry "angband -msdl2" "Angband (SDL2)" "${PN}" \
+				 || make_desktop_entry "angband -msdl" "Angband (SDL)" "${PN}"
+		fi
+
+		local s
+		for s in 16 32 128 256 512; do
+			newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
+		done
+		newicon -s scalable lib/icons/att.svg "${PN}.svg"
+	fi
+}
+
+pkg_postinst() {
+	if use X || use sdl; then
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use X || use sdl; then
+		xdg_icon_cache_update
+	fi
+}
diff --git a/games-roguelike/angband/metadata.xml b/games-roguelike/angband/metadata.xml
index 3f75f809dba5..a3f5689683f2 100644
--- a/games-roguelike/angband/metadata.xml
+++ b/games-roguelike/angband/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Stefan Strogin</name>
 	</maintainer>
 	<use>
+		<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
 		<flag name="sound">Enable and install sounds</flag>
 	</use>
 </pkgmetadata>
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index b83140c38cd5..f5cafac6db51 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 6998c43be05a..083fe8f65ddf 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,12 +1,6 @@
 AUX el-wrapper 1646 BLAKE2B b4ddf1c5873b765af1c58a57cdb99b164f6e2558e1523253d4ed7a321ae9dc167dcb6f25271353d90549e24ff15387e087db88fda18f6832549a7e71168c4d98 SHA512 fc4e19608f40155f4e5014595b5497f6ebc0df0378bc430b9cd64c3a3139bcc8101e5831ef53e07866b456000c17d7e8209ff0d16e067fa434240bfc4851ee9e
-AUX eternal-lands-1.9.3-build.patch 16222 BLAKE2B c7da08215575f6a39fd586842f6a872706356f8c203abdb8865de325651d5e9e9e2976da5720cbe05144cc49bf9908667ce910b09bbc32e8a32e6ec82bd2b287 SHA512 b268c0f1dab0f86bfcea3d13122983c4efdbf9941d1851618a01986b2fc36139350e830c6838c229f7ffbb69fd51a46d06277eb43167a47e192b86db710dcfc7
-AUX eternal-lands-1.9.3-glbuild.patch 581 BLAKE2B 448e86a18de71390225c4bacb5d824da63db9c0213629c618856de0634d7b9fca97c22558031d79c2a7f69c273b7e68d02fde04c82d2d42b339227ebd7e5b35c SHA512 583b306f98975e8d86314519cfd0034870d07a2d908de9ac2fae9eba50ce90acc7f8949fbe40379a13308ebfdf33379f5801ccfe83d67c318b8edc3ddc0a9ed5
-AUX eternal-lands-1.9.3-minizip.patch 2142 BLAKE2B 6b3e12d4cfe47f5e808c7218b72f1f3ce571cacc5e916951068f1e589d8f00056add853d0d45ad72d060cd787f25c0d5f839359c39dbffc29ebfe7ef1a92c759 SHA512 2a560c99504a649de7d01d08bb4d92cdd803e6c91b2ef2d1e82449268e8248b468fb8bb855e8e73396e8d4e5e2def44bda9df07f654b730bb25b509550d0f826
 AUX eternal-lands-1.9.5.3-build.patch 2629 BLAKE2B 2151293ed631e75345fb2c264113e28d11ccf42471599ab4784f1ae19091602a0b2d1ef56da4a0396a263b7e8672810e12d96d0341666a8589037c41793b3342 SHA512 dba8288ee3309f97d779e0005f6f6234ce39de02badad78fe2b642ed120a09b2cda4b1558acf5bb3478a844c964454f935b407c02f0067ca837ab26c860494a1
 AUX eternal-lands-1.9.5.3-minizip.patch 2944 BLAKE2B be3ff1adb91681bbe826a409f2ec3c855c7dcb49d7aab076ab65c6c1145fa70e6cf98ae25a6d18b77fed63395c552047dae1407885758186ef7f3f9e737fd25a SHA512 feaf805e16bbbf33aaf15d6eb4e6303f1c80f135809952b59da2decdc8f1f2b65487031b7b9b29f969e631afa5bfc124741b385f4adff66d65cc1b0cf983f149
-DIST elc_1.9.3-20120213.tar.bz2 2401172 BLAKE2B 496315a0d09d0b7cb99a77c77965d3d85a675659ae1970dc2c7c7560146b165a48a35f6dfd7eb461d4347ee2023df91ba47c05120957f52f777ea530e868b8d9 SHA512 3580d3ceb94094443ef25f6e4880c9ffe3fff256c8d8e6657b4e0683a05184da9e6a76264557d2065a8187e3d36febd9d30ff5adff83a17607b1e478be90fabc
 DIST eternal-lands-1.9.5.3.tar.gz 2814562 BLAKE2B ccb3dd78d12817912293f8babbd5f5dde6f0e3ea0cb34526edd7a3f0371f5313f94ff2d6b22cf472442869dfcf9893c19ec72d7ccf879b0e6a3dbfa05249c38f SHA512 bf0da70080377a76c66d6201da6032aae2967051e23f8aa433d450ec845bcd91145b965632fa63f66feebc15eaa9a65ff8f33884cc1b7c3605125f1536d91563
-DIST eternal-lands.png 9955 BLAKE2B 376f6826bab88e798c39d79f00bd8c8758798b70beb980d44bfcdf0c4afb696ea15f58177267ddf189ce53ef6c2c33efdcf507f5135ccc000b56ca28de078f80 SHA512 c77571c949bb43fa7f95ae58f863ed972cfc76e184de5d0fa0a3599e4f7539f6334b843233b61fc807c90ef270d87cd57494510ce559427b592d255c198729bf
-EBUILD eternal-lands-1.9.3-r2.ebuild 2853 BLAKE2B 4431c51b3390d8b9bbe525d3c5a246ba3ca87a35e1a1d0fd0c54a83e81dd535062d693bd34b526e86502499d14a91a44ec9f302ed4d2e1e278a5ac4c5c30eb49 SHA512 d67cbfb1b521709f783ddb4429de88500efe327c89cf1a9c37043efa8a86fa28877621c158cd867a600b9b7e93818fc5b78aefa3cb967cb631d76321ec37bfcf
 EBUILD eternal-lands-1.9.5.3.ebuild 1613 BLAKE2B 7a15e0303d1aa003cf094dcdc8abc5576adb4146db6ea244c9cde78676136f70a5246dfbfafd0a2df3b2c6ee5f53c14f9c1dd10d0c783724cfed743e76e859e6 SHA512 4cd53ef77085a43503ba54ce78a58ab374eeec854ba3e95ca8d489c3651dbcd681c6d217d6fc6e8ba5a8c33e0e2ea4af963a46eecb7d2b5bcf57094ec6bbdd97
 MISC metadata.xml 385 BLAKE2B 5f7b3fd58c620d6dda10b183473856241e1ade18bdd190865a4c0a8432d1bbead7da0801acc99dd9b42c77757625a4cd145f615435317d0329e0028af8ece506 SHA512 a3b44275d69059374a2dbf2761b2ff68afdb3fb195f714f1d797c7551bae5c488249dd5dba9bd370e982e69d7ba347306c64a82d1894bf66fbf55a5db985df9c
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
deleted file mode 100644
index 02a7b89440be..000000000000
--- a/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils games
-
-DESCRIPTION="An online MMORPG written in C and SDL"
-HOMEPAGE="http://www.eternal-lands.com"
-SRC_URI="mirror://gentoo/elc_1.9.3-20120213.tar.bz2
-	https://dev.gentoo.org/~rich0/distfiles/${PN}.png"
-
-LICENSE="eternal_lands"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="debug doc kernel_linux"
-
-RDEPEND="dev-libs/libxml2:=
-	media-libs/cal3d:=[-16bit-indices]
-	media-libs/freealut
-	media-libs/libpng:0=
-	media-libs/libsdl:=[X,opengl,video]
-	media-libs/libvorbis:=
-	media-libs/openal:=
-	media-libs/sdl-image:=
-	media-libs/sdl-net:=
-	>=games-rpg/eternal-lands-data-1.9.3
-	sys-libs/zlib:=[minizip]
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11:=
-	x11-libs/libXau:=
-	x11-libs/libXdmcp:=
-	x11-libs/libXext:="
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-opengl-1.0.6-r1
-	app-arch/unzip
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen
-		media-gfx/graphviz )
-	media-libs/glew"
-
-S="${WORKDIR}/elc"
-
-src_prepare() {
-	local BROWSER="firefox"
-
-	sed -i \
-		-e 's/#browser/browser/g' \
-		-e "s/browser = mozilla/#browser = ${BROWSER}/g" \
-		-e "s@#data_dir = /usr/local/games/el/@#data_dir = ${GAMES_DATADIR}/${PN}/@g" \
-		el.ini || die "sed failed"
-
-	# Finally, update the server
-	sed -i -e '/#server_address =/ s/.*/#server_address = game.eternal-lands.com/' \
-		el.ini || die "sed failed"
-
-	epatch "${FILESDIR}/${PN}-1.9.3-glbuild.patch"
-	epatch "${FILESDIR}/${PN}-1.9.3-build.patch"
-	epatch "${FILESDIR}/${PN}-1.9.3-minizip.patch"
-
-	# remove bundled minizip
-	rm io/{crypt,ioapi,unzip,zip}.h || die
-	rm io/{ioapi,unzip,zip}.c || die
-
-	cp Makefile.linux Makefile
-}
-
-src_compile() {
-	emake \
-		DEBUG="$(usex debug)" \
-		BSD_KERNEL="$(usex !kernel_linux)" \
-		DATADIR="${GAMES_DATADIR}/${PN}/"
-
-	if use doc; then
-		emake docs
-		mv ./docs/html/ ../client || die "Failed to move documentation directory"
-	fi
-}
-
-src_install() {
-	dogamesbin el
-	make_desktop_entry el "Eternal Lands"
-
-	insopts -m 0660
-	insinto "${GAMES_DATADIR}/${PN}"
-
-	doins -r *.ini *.txt commands.lst
-
-	if use doc ; then
-		dohtml -r "${WORKDIR}"/client/*
-	fi
-
-	doicon -s 64 "${DISTDIR}/${PN}.png"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-	elog "Auto Update is now enabled in Eternal Lands"
-	elog "If an update occurs then the client will suddenly exit"
-	elog "Updates only happen when the game first loads"
-	elog "Please don't report this behaviour as a bug"
-
-	# Ensure that the files are writable by the game group for auto
-	# updating.
-	chmod -R g+rw "${ROOT}/${GAMES_DATADIR}/${PN}"
-
-	# Make sure new files stay in games group
-	find "${ROOT}/${GAMES_DATADIR}/${PN}" -type d -exec chmod g+sx {} \;
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch
deleted file mode 100644
index 989bf2700d88..000000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Jun 24 13:32:38 UTC 2012
-Subject: build system
-
-respect all flags
-respect compiler
-add options for DATADIR, BSD_KERNEL and DEBUG
-use proper pkgconfig calls
-remove needless build types
-rename EXE to "el"
-
---- elc/Makefile.linux
-+++ elc/Makefile.linux
-@@ -3,16 +3,54 @@
- -include make.conf
- 
- # basic compiling and linking - rarely changed
--OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
--CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--_CFLAGS=$(PLATFORM) -O2 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--
--PNG_SCREENSHOT_LIBS = -lpng
--LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \
--	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS))
--_LDFLAGS=$(XDIR) -lGL -lpthread -lstdc++
-+CC ?= gcc
-+CXX ?= g++
-+
-+# some options
-+DATADIR ?= /usr/share/games/eternal-lands
-+
-+CPPFLAGS += -DDATA_DIR=\"$(DATADIR)\" \
-+	    -DLINUX \
-+	    -DELC \
-+	    $(foreach FEATURE, $(EL_FEATURES), -D$(FEATURE)) \
-+	    -D_7ZIP_ST
-+
-+ifeq ($(BSD_KERNEL),yes)
-+CPPFLAGS += -DBSD
-+endif
-+
-+ifeq ($(DEBUG),yes)
-+CPPFLAGS += -DMEMORY_DEBUG
-+endif
-+
-+CFLAGS += $(shell sdl-config --cflags) \
-+	  $(shell xml2-config --cflags) \
-+	  -fno-strict-aliasing \
-+	  $(EXTRA_INCLUDES)
-+
-+CXXFLAGS += $(shell sdl-config --cflags) \
-+	    $(shell xml2-config --cflags) \
-+	    -fno-strict-aliasing \
-+	    $(EXTRA_INCLUDES)
-+
-+LIBS += $(shell pkg-config --libs x11) \
-+	$(shell sdl-config --libs) \
-+	$(shell xml2-config --libs) \
-+	$(shell pkg-config --libs SDL_net) \
-+	$(shell pkg-config --libs SDL_image) \
-+	$(shell pkg-config --libs openal) \
-+	$(shell pkg-config --libs freealut) \
-+	$(shell pkg-config --libs gl) \
-+	$(shell pkg-config --libs glu) \
-+	$(shell pkg-config --libs cal3d) \
-+	$(shell pkg-config --libs libpng) \
-+	$(shell pkg-config --libs vorbis) \
-+	$(shell pkg-config --libs vorbisfile) \
-+	$(shell pkg-config --libs zlib) \
-+	-lm \
-+	$(EXTRA_LIBS) \
-+	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_LIBS)) \
-+	-lstdc++
- 
- # This works on Ubuntu 8.04 (LTS) at least
- # Install these packages in addition to those required for a standard build
-@@ -59,7 +97,7 @@
- 	xz/CpuArch.o xz/Delta.o xz/LzFind.o xz/Lzma2Dec.o xz/Lzma2Enc.o	\
- 	xz/LzmaDec.o xz/LzmaEnc.o xz/Sha256.o xz/Xz.o xz/XzCrc64.o xz/XzDec.o	\
- 	xz/XzEnc.o	\
--	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_COBJ))
-+	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_COBJ))
- 	
- CXXOBJS=actor_init.o cal3d_wrapper.o context_menu.o optimizer.o sendvideoinfo.o	\
- 	exceptions/extendedexception.o xml/xmlhelper.o quest_log.o	\
-@@ -80,7 +118,7 @@
- 	eye_candy/effect_mines.o eye_candy/effect_missile.o \
- 	eye_candy/orbital_mover.o eye_candy/kepler_orbit.o	\
- 	eye_candy/effect_staff.o \
--	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_CXXOBJ))
-+	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_CXXOBJ))
- 
- OBJS=$(COBJS) $(CXXOBJS)
- HEADER_DIRS = . books eye_candy io pawn fsaa engine xz
-@@ -89,24 +127,13 @@
- DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P)
- #(shell echo $OBJ |sed s/\.o/\.P/))
- 
--EXE=el.x86.linux.bin
--
--ifndef CC
--CC=gcc
--endif
--ifndef CXX
--CXX=g++
--endif
--ifndef LINK
--LINK=gcc
--endif
-+EXE=el
- 
- all: $(EXE)
- 
- # the compile targets
- $(EXE): $(OBJS)
--	@echo "  LINK $(EXE)"
--	@$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(EXE) $(OBJS) $(LIBS)
- 
- #recompile on Makefile or conf change
- #.depend $(OBJS): Makefile.linux make.conf
-@@ -114,25 +141,19 @@
- DEPS_MAGIC := $(shell mkdir .deps .deps/io .deps/shader .deps/eye_candy .deps/exceptions .deps/xz .deps/xml .deps/fsaa .deps/engine > /dev/null 2>&1 || :)
- 
- $(COBJS): %.o: %.c Makefile.linux make.conf
--	@echo "  CC   $@"
--	@if $(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
-+	@echo "$(CC) $(CFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
-+	@if $(CC) $(CFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
- 		mv ".deps/$@.pp" ".deps/$@.P"; \
- 	else rm -f ".deps/$@.pp"; exit 1; \
- 	fi
- 
- $(CXXOBJS): %.o: %.cpp Makefile.linux make.conf
--	@echo "  CXX  $@"
--	@if $(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
-+	@echo "$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
-+	@if $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
- 		mv ".deps/$@.pp" ".deps/$@.P"; \
- 	else rm -f ".deps/$@.pp"; exit 1; \
- 	fi
- 
--release:
--	@$(MAKE) -f Makefile.linux 'CFLAGS=$(_CFLAGS)' 'CXXFLAGS=$(_CXXFLAGS)'
--
--static:
--	@$(MAKE) -f Makefile.linux 'CFLAGS=$(_CFLAGS)' 'CXXFLAGS=$(_CXXFLAGS)' 'LDFLAGS=$(_LDFLAGS)' 'OBJS=$(OBJS) $(STATICLIBS)'
--
- clean:
- 	rm -f $(OBJS) $(EXE) 
- 
-@@ -140,8 +161,8 @@
- 	cd docs && doxygen Doxyfile
- 
- .depend: $(foreach HEADER_DIR, $(HEADER_DIRS), $(wildcard $(HEADER_DIR)/*.h))
--	$(CC) $(CFLAGS) -MM $(patsubst %.o, %.c, $(COBJS)) >.depend
--	$(CXX) $(CXXFLAGS) -MM $(patsubst %.o, %.cpp, $(CXXOBJS)) >>.depend
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(patsubst %.o, %.c, $(COBJS)) >.depend
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM $(patsubst %.o, %.cpp, $(CXXOBJS)) >>.depend
- 
- make.conf: make.defaults
- 	@if (test -f $@ -a '$(UPDATE_CONF)' != 'yes'); \
-@@ -161,7 +182,7 @@
- 	echo "\t#endinput" >> $@; \
- 	echo "#endif" >> $@; \
- 	echo "#define _features_included" >> $@; \
--	for feature in $(FEATURES); do \
-+	for feature in $(EL_FEATURES); do \
- 		echo "#define $$feature" >> $@; \
- 	done
- 
---- elc/make.defaults
-+++ elc/make.defaults
-@@ -1,71 +1,82 @@
- # set this to "no" if you don't want this file to be overwritten
- UPDATE_CONF=yes
- 
-+# set to 'yes' for BSD support
-+BSD_KERNEL=no
-+
-+# set to 'yes' to enable debug support
-+DEBUG=no
-+
- # tune these for your setup & compile options
- # IMPORTANT: if you are using a linker that needs libraries in correct order, make sure you list EYE_CANDY before PNG_SCREENSHOT if you use both
- 
- ### Current release default options ###
--FEATURES += CLUSTER_INSIDES		# Group objects into separate clusters for clipping on inside maps
--FEATURES += CUSTOM_LOOK			# allows you to customize your look.
--FEATURES += CUSTOM_UPDATE		# allows autoupdating of custom look information
--FEATURES += FUZZY_PATHS			# Makes Tab Map walking not always follow exaclty the same path
--FEATURES += NEW_SOUND			# Enables extended sound effects system
--FEATURES += PNG_SCREENSHOT		# make screenshots in W3C's PNG format in game, requires libpng
--FEATURES += TEXT_ALIASES		# Text aliases
--FEATURES += USE_INLINE			# enable some optimizations to use inline functions instead of pure function calls
-+EL_FEATURES += CLUSTER_INSIDES		# Group objects into separate clusters for clipping on inside maps
-+EL_FEATURES += CUSTOM_LOOK			# allows you to customize your look.
-+EL_FEATURES += CUSTOM_UPDATE		# allows autoupdating of custom look information
-+EL_FEATURES += FUZZY_PATHS			# Makes Tab Map walking not always follow exaclty the same path
-+EL_FEATURES += NEW_SOUND			# Enables extended sound effects system
-+EL_FEATURES += PNG_SCREENSHOT		# make screenshots in W3C's PNG format in game, requires libpng
-+EL_FEATURES += TEXT_ALIASES		# Text aliases
-+EL_FEATURES += USE_INLINE			# enable some optimizations to use inline functions instead of pure function calls
- # new for 1.9.0 release
--FEATURES += BANDWIDTH_SAVINGS		# enable bandwidth saving changes for message protocol
-+EL_FEATURES += BANDWIDTH_SAVINGS		# enable bandwidth saving changes for message protocol
- # new for 1.9.2 release
--FEATURES += ANIMATION_SCALING		# Adds support for animation scaling, depending on the number of animation commands in the actor queue.
--FEATURES += ENCYCL_NAVIGATION		# Adds context menus to encyclopedia windows with search and bookmark functions
--FEATURES += FSAA			# Adds support for full screen anti-aliasing using OpenGL multisampling.
--FEATURES += NEW_NEW_CHAR_WINDOW		# Use the new character creation window; controls always on-screen
--FEATURES += NEW_TEXTURES		# Enables the new texture loading and caching system (http://www.eternal-lands.com/forum/index.php?showtopic=54756)
-+EL_FEATURES += ANIMATION_SCALING		# Adds support for animation scaling, depending on the number of animation commands in the actor queue.
-+EL_FEATURES += ENCYCL_NAVIGATION		# Adds context menus to encyclopedia windows with search and bookmark functions
-+EL_FEATURES += FSAA			# Adds support for full screen anti-aliasing using OpenGL multisampling.
-+EL_FEATURES += NEW_NEW_CHAR_WINDOW		# Use the new character creation window; controls always on-screen
-+EL_FEATURES += NEW_TEXTURES		# Enables the new texture loading and caching system (http://www.eternal-lands.com/forum/index.php?showtopic=54756)
- # new for 1.9.3 release
--FEATURES += FASTER_MAP_LOAD		# Enables optimizations to speed up the process of switching between maps
--FEATURES += FASTER_STARTUP		# An attempt to reduce the startup time of EL somewhat
--FEATURES += MIDDLE_MOUSE_PASTE	# Paste using the middle mouse button from the primary buffer on X systems
-+EL_FEATURES += FASTER_MAP_LOAD		# Enables optimizations to speed up the process of switching between maps
-+EL_FEATURES += FASTER_STARTUP		# An attempt to reduce the startup time of EL somewhat
-+EL_FEATURES += MIDDLE_MOUSE_PASTE	# Paste using the middle mouse button from the primary buffer on X systems
- 
- ### Testing options (these options are possible for the next release and should be tested) ###
--#FEATURES += ANTI_ALIAS			# allows to enable/disable anti-aliasing in el.ini
--#FEATURES += DYNAMIC_ANIMATIONS		# (appears broken) Synchronizes animation to FPS instead of a fixed timer
--#FEATURES += EXT_ACTOR_DICT		# Removes remaining hard-coded actor def dictionaries - requires updated actor defs files (http://el.grug.redirectme.net/actor_defs.zip)
--#FEATURES += NEW_ALPHA			# (undocumented)
--#FEATURES += USE_SIMD			# Enables usage of simd instructions
-+#EL_FEATURES += ANTI_ALIAS			# allows to enable/disable anti-aliasing in el.ini
-+#EL_FEATURES += DYNAMIC_ANIMATIONS		# (appears broken) Synchronizes animation to FPS instead of a fixed timer
-+#EL_FEATURES += EXT_ACTOR_DICT		# Removes remaining hard-coded actor def dictionaries - requires updated actor defs files (http://el.grug.redirectme.net/actor_defs.zip)
-+#EL_FEATURES += NEW_ALPHA			# (undocumented)
-+#EL_FEATURES += USE_SIMD			# Enables usage of simd instructions
- 
- ### Machine specific options (fixes or performance enhancements) ###
--#FEATURES += EL_BIG_ENDIAN		# Enable big-endian code (automatically detected for OSX)
--#FEATURES += NO_PF_MACRO		# Use a function instead of a macro for pf_get_tile()
--#FEATURES += SIMPLE_LOD			# enable a simplistic distance culling to improve performance
-+#EL_FEATURES += EL_BIG_ENDIAN		# Enable big-endian code (automatically detected for OSX)
-+#EL_FEATURES += NO_PF_MACRO		# Use a function instead of a macro for pf_get_tile()
-+#EL_FEATURES += SIMPLE_LOD			# enable a simplistic distance culling to improve performance
- 
- 
- ### Debug options ###
--#FEATURES += CONTEXT_MENUS_TEST		# Enable "#cmtest" command to help test/demo the context menu code
--#FEATURES += DEBUG			# (undocumented)
--#FEATURES += DEBUG_XML			# Enables missing (optional) XML string property messages
--#FEATURES += DEBUG_POINT_PARTICLES	# (undocumented)
--#FEATURES += DEBUG_TIME			# Fakes the acceleration of time for use in debugging shadows and the like.
--#FEATURES += DEBUG_MAP_SOUND		# Adds (some??) map boundary areas to tab maps and additional logging to stdout
--#FEATURES += ECDEBUGWIN			# press ctrl-alt-c to open the Eye Candy debug window: trigger most effects without casting spells or server side events
--#FEATURES += EXTRA_DEBUG		# (undocumented)
--#FEATURES += MEMORY_DEBUG		# gather information about memory allocation and freeing
--#FEATURES += MISSILES_DEBUG		# Enables debug for missiles feature. It will create a file missiles_log.txt file in your settings directory.
--#FEATURES += MUTEX_DEBUG		# (undocumented)
--#FEATURES += OPENGL_TRACE		# make far more frequent checks for OpenGL errors (requires -DDEBUG to be of any use). Will make error_log.txt a lot larger.
--#FEATURES += TIMER_CHECK		# (undocumented)
--#FEATURES += _EXTRA_SOUND_DEBUG		# Enable debug for sound effects
-+#EL_FEATURES += CONTEXT_MENUS_TEST		# Enable "#cmtest" command to help test/demo the context menu code
-+#EL_FEATURES += DEBUG			# (undocumented)
-+#EL_FEATURES += DEBUG_XML			# Enables missing (optional) XML string property messages
-+#EL_FEATURES += DEBUG_POINT_PARTICLES	# (undocumented)
-+#EL_FEATURES += DEBUG_TIME			# Fakes the acceleration of time for use in debugging shadows and the like.
-+#EL_FEATURES += DEBUG_MAP_SOUND		# Adds (some??) map boundary areas to tab maps and additional logging to stdout
-+#EL_FEATURES += ECDEBUGWIN			# press ctrl-alt-c to open the Eye Candy debug window: trigger most effects without casting spells or server side events
-+#EL_FEATURES += EXTRA_DEBUG		# (undocumented)
-+
-+# gather information about memory allocation and freeing
-+ifeq ($(DEBUG),yes)
-+EL_FEATURES += MEMORY_DEBUG
-+endif
-+
-+#EL_FEATURES += MISSILES_DEBUG		# Enables debug for missiles feature. It will create a file missiles_log.txt file in your settings directory.
-+#EL_FEATURES += MUTEX_DEBUG		# (undocumented)
-+#EL_FEATURES += OPENGL_TRACE		# make far more frequent checks for OpenGL errors (requires -DDEBUG to be of any use). Will make error_log.txt a lot larger.
-+#EL_FEATURES += TIMER_CHECK		# (undocumented)
-+#EL_FEATURES += _EXTRA_SOUND_DEBUG		# Enable debug for sound effects
- 
- 
- ### Other options (Experimental, unfinished, defunct or otherwise unknown) ###
--#FEATURES += NEW_CURSOR			# New coloured cursors made by Emajekral (Experimental) Extract http://users.on.net/~gingerman/sky_cursor-textures.zip into datadir/textures/
--#FEATURES += PAWN			# Experimental, not for release, will need server support to function properly. This *will* eat your cat. You've been warned. Enables the Pawn abstract machine.
--#FEATURES += UID			# use unique ID sent from server for custom looks. (INCOMPLETE)
--#FEATURES += USE_ACTORS_OPTIMIZER	# Enables actor optimizations
--#FEATURES += USE_BOOST
--#FEATURES += USE_TR1			# Needs tr1 version of c++ stl, used for NEW_FILE_IO
--#FEATURES += WRITE_XML			# dangerous to use, will wipe out some XML files that are part of the main game download
--#FEATURES += ZLIBW			# Enables being able to write gzip compressed files, requires -lzlib/-lz needed for map_editor
--#FEATURES += OLD_MISC_OBJ_DIR		# if not defined, ./3dobjects/misc_objects/ paths becomes ./3dobjects/
-+#EL_FEATURES += NEW_CURSOR			# New coloured cursors made by Emajekral (Experimental) Extract http://users.on.net/~gingerman/sky_cursor-textures.zip into datadir/textures/
-+#EL_FEATURES += PAWN			# Experimental, not for release, will need server support to function properly. This *will* eat your cat. You've been warned. Enables the Pawn abstract machine.
-+#EL_FEATURES += UID			# use unique ID sent from server for custom looks. (INCOMPLETE)
-+#EL_FEATURES += USE_ACTORS_OPTIMIZER	# Enables actor optimizations
-+#EL_FEATURES += USE_BOOST
-+#EL_FEATURES += USE_TR1			# Needs tr1 version of c++ stl, used for NEW_FILE_IO
-+#EL_FEATURES += WRITE_XML			# dangerous to use, will wipe out some XML files that are part of the main game download
-+#EL_FEATURES += ZLIBW			# Enables being able to write gzip compressed files, requires -lzlib/-lz needed for map_editor
-+#EL_FEATURES += OLD_MISC_OBJ_DIR		# if not defined, ./3dobjects/misc_objects/ paths becomes ./3dobjects/
- 
- 
- 
-@@ -86,7 +97,3 @@
- #EXTRA_INCLUDES=-IC:\\Programme\\Dev-Cpp\\Include
- #EXTRA_LIBS=-lz
- #EXTRA_STATICLIBS=libs/zlib.a
--
--CC=gcc
--CXX=g++
--LINK=gcc
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch
deleted file mode 100644
index 972abd9b0d2b..000000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- gl_init.c	2012-02-13 22:01:54.000000000 -0500
-+++ gl_init.c	2012-12-02 18:09:41.274014922 -0500
-@@ -27,6 +27,8 @@
- #include "fsaa/fsaa.h"
- #endif	/* FSAA */
- 
-+#define APIENTRY
-+
- Uint32 flags;
- 
- int window_width=640;
---- platform.h	2012-02-13 22:01:54.000000000 -0500
-+++ platform.h	2012-12-02 17:32:46.017627957 -0500
-@@ -87,9 +87,10 @@
-  #define APIENTRYP *
- #elif !defined(BSD)
-  #define GL_GLEXT_LEGACY
-+ #include <GL/glew.h>
-  #include <GL/gl.h>
-  #include <GL/glu.h>
-- #include "glext.h"
-+ #include <GL/glext.h>
- #else // BSD
-  #include <GL/gl.h>
-  #include <GL/glu.h>
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch
deleted file mode 100644
index 9edb22254502..000000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Jun 24 16:33:08 UTC 2012
-Subject: unbundle minizip
-
-https://bugs.gentoo.org/show_bug.cgi?id=423327
-applied on top of eternal-lands-1.9.3-build.patch
-
---- elc/new_update.c
-+++ elc/new_update.c
-@@ -5,8 +5,8 @@
- #include <string.h>
- #include "md5.h"
- #include "elc_private.h"
--#include "io/zip.h"
--#include "io/unzip.h"
-+#include <zip.h>
-+#include <unzip.h>
- #include "io/ziputil.h"
- #include "io/fileutil.h"
- #include "io/elfilewrapper.h"
---- elc/io/ziputil.h
-+++ elc/io/ziputil.h
-@@ -8,8 +8,8 @@
- 
- #include <SDL.h>
- #include "../md5.h"
--#include "zip.h"
--#include "unzip.h"
-+#include <zip.h>
-+#include <unzip.h>
- 
- #ifdef __cplusplus
- extern "C"
---- elc/io/elfilewrapper.c
-+++ elc/io/elfilewrapper.c
-@@ -1,5 +1,5 @@
- #include "elfilewrapper.h"
--#include "unzip.h"
-+#include <unzip.h>
- #include "elpathwrapper.h"
- #include "fileutil.h"
- #include <sys/stat.h>
---- elc/Makefile.linux
-+++ elc/Makefile.linux
-@@ -25,11 +25,13 @@
- 
- CFLAGS += $(shell sdl-config --cflags) \
- 	  $(shell xml2-config --cflags) \
-+	  $(shell pkg-config --cflags minizip) \
- 	  -fno-strict-aliasing \
- 	  $(EXTRA_INCLUDES)
- 
- CXXFLAGS += $(shell sdl-config --cflags) \
- 	    $(shell xml2-config --cflags) \
-+	    $(shell pkg-config --cflags minizip) \
- 	    -fno-strict-aliasing \
- 	    $(EXTRA_INCLUDES)
- 
-@@ -47,6 +49,7 @@
- 	$(shell pkg-config --libs vorbis) \
- 	$(shell pkg-config --libs vorbisfile) \
- 	$(shell pkg-config --libs zlib) \
-+	$(shell pkg-config --libs minizip) \
- 	-lm \
- 	$(EXTRA_LIBS) \
- 	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_LIBS)) \
-@@ -80,7 +83,7 @@
- 	gamewin.o gl_init.o hud.o help.o highlight.o	\
- 	ignore.o init.o interface.o items.o io/fileutil.o	\
- 	io/e3d_io.o io/elc_io.o	io/map_io.o io/elpathwrapper.o io/xmlcallbacks.o \
--	io/half.o io/normal.o io/elfilewrapper.o io/unzip.o io/ioapi.o io/zip.o io/ziputil.o	\
-+	io/half.o io/normal.o io/elfilewrapper.o io/ziputil.o	\
- 	keys.o knowledge.o langselwin.o lights.o list.o load_gl_extensions.o loginwin.o loading_win.o	\
- 	main.o manufacture.o map.o mapwin.o memory.o	\
- 	md5.o mines.o minimap.o misc.o missiles.o multiplayer.o	\
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 596f5d29ceac..374fa890b129 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/monopd/Manifest b/games-server/monopd/Manifest
index e7f9cdedc1c4..6350488fecd3 100644
--- a/games-server/monopd/Manifest
+++ b/games-server/monopd/Manifest
@@ -1,4 +1,4 @@
 AUX monopd.in 391 BLAKE2B 8bf1681e070ef5240ced7cf15dae52ee2c690f93f9dd5c94ba4ae3390fe9b79c2084d83129d1add3e24ee05a81a54bd8de8315f170b448e48d8ade9d5c513805 SHA512 55b9fd625039b72032b4d0ea6769c2b5a2690ede1f5445e72900a4d423a2ea51c768cdc1f08f69577f7776f9638983d23a1e0f5afe20a174ccc2d44ef77271ab
 DIST monopd-0.10.2.tar.gz 180317 BLAKE2B a2955149963b63d4839cc65be464c8989f2816bccf8e122833cd5be8be9ded7789e72f59c5f3bb6e2c20d4565cb3553e64dfd2670b003fc5868c40da02948731 SHA512 f47d9623e110a98d9d32b522484944998fb6e7e8644e1f2b439428a1e12b3b514b902e52e7135150135a3e3251aa38604434347d06533f3cf3ffb28a2a81ede3
-EBUILD monopd-0.10.2-r1.ebuild 902 BLAKE2B 3b9f048fe4b746d28729294015c427f376e72ab7ad8d8deb6e11c7acbdebced153d7659c04b84c01e20c08acec59ded82ff425096ce2c123ece9720e752c8a44 SHA512 db67b071b77926d6f9dece68fa2f0e83579d221dad71c4de843c6f272273c9e2e39a8d7300ac6cc1038d633d08f367fde589ccf0f0593cb19f47431a662db6b2
+EBUILD monopd-0.10.2-r1.ebuild 955 BLAKE2B 1bd67145b7b9df06d5a1f067a7aeab5e059bf772269a2ec479bc7900297d70825f3e1e90ad0c82ed2f5129c8cbc5833ab52818837f5e79281388a627cfa58206 SHA512 3c87216004be2c57b7961ca1a73120603787945120caa264b53c470a6489a79711b17e118d120b6442efdc1b8f48cf68f0b27c1ea340cadaf78d89ed3a4326d2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-server/monopd/monopd-0.10.2-r1.ebuild b/games-server/monopd/monopd-0.10.2-r1.ebuild
index c0776e83d646..83037a0574f6 100644
--- a/games-server/monopd/monopd-0.10.2-r1.ebuild
+++ b/games-server/monopd/monopd-0.10.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils systemd
+
+inherit autotools eutils flag-o-matic systemd
 
 DESCRIPTION="server for atlantik games"
 HOMEPAGE="http://gtkatlantic.gradator.net/"
@@ -33,6 +34,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cppflags -I"/usr/include/utf8cpp"
 	econf $(use_with systemd systemd-daemon)
 }
 
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 46ea90dc4cc2..e2b49cba4e49 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/crrcsim/Manifest b/games-simulation/crrcsim/Manifest
index fb97b3cc53ee..8402d7d24450 100644
--- a/games-simulation/crrcsim/Manifest
+++ b/games-simulation/crrcsim/Manifest
@@ -2,5 +2,5 @@ AUX crrcsim-0.9.13-buildsystem.patch 2183 BLAKE2B 2f1fb768f93e7d3db1fbd7a2a30c82
 AUX crrcsim-0.9.13-gcc6.patch 461 BLAKE2B 7e2016db5781e0158e27d999fb1d88d07dc6294740466c736a2e42eb46547fdb35ac112b6c8e93a5571103d28d6037a6acdb2be752bfb2650cc349538e72c3f4 SHA512 34bda65c0791622adb8436d08b60e6a877c2a3bbb12f93379686c39c2c572364c0fa265011bbc788229fa2ddaa3bfa3be8397d2ff98ea967f423fa3cd48465e9
 AUX crrcsim-cgal_gmp.patch 352 BLAKE2B 1a9cf7250753c1a0099dd07b5020b7c5af89dffa8387d68f71c51e21a7803ecb2395144de65915ce84cf077b522fecc5790d26190abf9673fef687d1e16f0d6b SHA512 1b8302f71e220df54b73819988f866a7e35ec6b11d271a6a57ad886372fba4eb1a02367ab9942030baf04fbeb5fa093d23e38de2614c39c2c75e76795ec69274
 DIST crrcsim-0.9.13.tar.gz 8337392 BLAKE2B ccaaf3a4255b2082fc52712d49302c7de1347b87e9489c6d859662365f1cd5af538fe76cee232aed61b0c1b68138c47a2e34e128071c3e098e20f1d51c1c409c SHA512 b687837e07abc07606404d920288984abe7e304afb69158fd840d83bcfe1e9acc4afd8462c0c759df67d50a15ca3753eaf48c4526b201e64a2d641fa3aa8c1ab
-EBUILD crrcsim-0.9.13.ebuild 1232 BLAKE2B ccf89f098cff67e93ee091af11464fd63878c32b052218acb944c0b22934fc27be1d89c45fbcecdb2c616d4fc30c8c4cc460c6085a41868104bd28dc1dbcc5d4 SHA512 ab16d675e3135e65b649ab7cc9a912c84e4d90881042531b89a06e9ce25cfa44fd5e23f525a6b41396c2b907c25db867e7329e96f0f015bc8c0b1c85098c5adb
+EBUILD crrcsim-0.9.13.ebuild 1209 BLAKE2B 909e462a8c52b7039ca8ce5a0d3aca5aa52bb21e2dca7893ee5d17f08627b444f76c13c1b8fe6ebe5e91ad3c193aa353bfbff241821dffe038eca498446a836a SHA512 cf82ae112798b1b6002adbcd379ce4288acedfed5bdd1d560b983193d876eb2afd3274437d8aff6dcaa7b544c4111708fb698c9d7109cec02c909f34e11e0f60
 MISC metadata.xml 330 BLAKE2B 24c61e826448ee0ceecc562776289a0a80c259c718cce5dc0f23523b5091a329933eb6a98c46ecd038b856db3f1d86588d82d62924b5d40dd0ee64c569c1e9ff SHA512 a57fe17fafb1d4cca975665b68283233a1f6b62e25bf903cd5ef7954572f3963471d453da9c569044405ab005105f6d35ae28b679d35eebd01ba61d0166349c8
diff --git a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
index ef5b5ce752df..4d20e437844b 100644
--- a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
+++ b/games-simulation/crrcsim/crrcsim-0.9.13.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
-WANT_AUTOMAKE="1.10"
+
 inherit autotools eutils gnome2-utils
 
 DESCRIPTION="model-airplane flight simulation program"
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index a25b8d6f86ab..1025aa07261d 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,8 +1,9 @@
 AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
+AUX flightgear-2018.3.2-cmake.patch 1322 BLAKE2B 4b68e744cf0cd7ea9582025980d055f8def5d5d1c82cabf133d4d1f9e35d501e28fdba1fca51ed409caa6398043fa52a82f68f77ce8f34a3f0a3ce45fa526352 SHA512 5ae183a04df6f12e23e87649210249a0857d5915aba40198507d2e45ee6fba6b997575df40457cb8e214b9fe9f4b81f4bec8fadb3875f1bbebf0c3181ba4fce3
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2018.3.1.tar.bz2 8404294 BLAKE2B b90d64bc7381baef3adf3f2b77acb6822562d76319e85bebeda977754c281cd48b4ce137d910cc9f96947cfe1b7612c6ff45f2ed49775348b651944bb8796ba4 SHA512 ad07cdf90b1890519a22a1f79374b2d11e70191d85bc76d50913708a250801c3e091228999011367e374572a46c60f572f8b138d6a7c9fd2155f63107667d93c
 DIST flightgear-2018.3.2.tar.bz2 8405351 BLAKE2B 8abc3cc37281f1cc30c51518570e7278722f1d804f6568d7619150e7ddf13eef784314873571ea99d039ca4a94968e8e96779e26d8618eee4b1ed248e88dc52a SHA512 76a127949351fe48d847a1471002ecbc3daa769952fef7a7a141e83031771e87f4e23c329e9d03ddd2e99b4b96fb6af2ebe5ab90ca50c0111217c62492cd516d
 EBUILD flightgear-2018.3.1.ebuild 4086 BLAKE2B 3d9658d8fce4a0854aeafe8efac28fadd4e3b1a177909d6818aaf729fe94c40dcfc374ae3e394bb158e73140eeac7031a348fdaf921504bef9da2ec26984e691 SHA512 131765eefaf7b02e93bc09544561da9764565bc9d56c0d0fce017e7b3d1e58ae867eed46992b219d495093dd689571e63f3f6c14ec9512fa25344748456f0cee
-EBUILD flightgear-2018.3.2.ebuild 4215 BLAKE2B 0362ec9d7ab6fb6e7f52831d078f39672de6dc2d1672f21c04cbdcbcd0fcaf7c981beb733c450422bf71dc7cc8e25291b8f56d2b712ff23e879f34817bed246e SHA512 af935b2863dddbf78814881d452ca7c445e789e65cdb57def3875a5992fee56cbbe1dac65df749a73ca589bfffb48c1b5edebcd8d9182346114563e89ce254c5
-EBUILD flightgear-9999.ebuild 4136 BLAKE2B 3dbc2079f3300ff513da9397faed098f85f054018536d6b5a0c13ba6cf14668a26702077cf9f0098a0e5b49bb04d145feeaebad3c409af6c160350440ed46f54 SHA512 ea5de4dc344b3b7833efe737ede0caf063c03621db29b57cd063f0a98c3785e7428658afcf15d571abefe0726c3846a960c7f682711c6302ada2f2fdd3b2d465
+EBUILD flightgear-2018.3.2.ebuild 4309 BLAKE2B 57dd4e69c206f7aaf14b951d1a8274afdad34db8f9586f6a32416674aa357a5d9036d6dd7e7bf162feb9fe199187ae63ebdf539d621fb13c5e6301c54e9119fd SHA512 c639424a0be0f38362bcb8a744da37dd42a891f15df125e834d0921111aafaa300b431c3b12d0723f32cc9140f64ba11137b8ec56d5bc053b5aba34e1794da68
+EBUILD flightgear-9999.ebuild 4230 BLAKE2B 2d64e5ab90eef73665975514fd1845fbdcc143cb08fbacf34989e81c403d0fd946995ab8104d48e6948235cf97819c0675da3a51b595a30f3d6ac515c4029c59 SHA512 0f485ac4e40961867c8f895d42eecc3147cdb2c68961f5ed1bd6e1e1a65d8ce36d6bb280392d8252cbb31f2d722dced09e1ffb008c785565a1b3429cdaee8899
 MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch
new file mode 100644
index 000000000000..97747e8b7487
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch
@@ -0,0 +1,24 @@
+diff -ruN flightgear-2018.3.2/CMakeLists.txt my/CMakeLists.txt
+--- flightgear-2018.3.2/CMakeLists.txt	2019-01-29 14:17:49.000000000 +0100
++++ my/CMakeLists.txt	2019-08-18 05:29:04.762138013 +0200
+@@ -323,7 +323,7 @@
+ ## Qt5 setup setup
+ if (ENABLE_QT)
+     message(STATUS "Qt launcher enabled, checking for Qt >= 5.4 / qmake")
+-    find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick Svg)
++    find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick)
+     if (Qt5Widgets_FOUND)
+         message(STATUS "Will enable Qt launcher GUI")
+         message(STATUS "  Qt5Widgets version: ${Qt5Widgets_VERSION_STRING}")
+diff -ruN flightgear-2018.3.2/src/GUI/CMakeLists.txt my/src/GUI/CMakeLists.txt
+--- flightgear-2018.3.2/src/GUI/CMakeLists.txt	2019-01-29 14:17:50.000000000 +0100
++++ my/src/GUI/CMakeLists.txt	2019-08-18 05:38:19.607822998 +0200
+@@ -127,7 +127,7 @@
+                             ${qml_sources})
+ 
+     set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
+-    target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore)
++    target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick SimGearCore)
+     target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
+ 
+     add_library(fgqmlui QQuickDrawable.cxx
diff --git a/games-simulation/flightgear/flightgear-2018.3.2.ebuild b/games-simulation/flightgear/flightgear-2018.3.2.ebuild
index 31cb9fe151d2..ddec50a3ac88 100644
--- a/games-simulation/flightgear/flightgear-2018.3.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.3.2.ebuild
@@ -53,6 +53,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.44
 	>=media-libs/plib-1.8.5
+	qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
 	utils? (
 		x11-libs/libXi
 		x11-libs/libXmu
@@ -62,6 +63,8 @@ RDEPEND="${COMMON_DEPEND}
 	~games-simulation/${PN}-data-${PV}
 "
 
+PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch")
+
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 
 pkg_pretend() {
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index e485d9af2d35..0243250482c9 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -55,6 +55,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.44
 	>=media-libs/plib-1.8.5
+	qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )
 	utils? (
 		x11-libs/libXi
 		x11-libs/libXmu
@@ -64,6 +65,8 @@ RDEPEND="${COMMON_DEPEND}
 	~games-simulation/${PN}-data-${PV}
 "
 
+PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch")
+
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
 
 pkg_pretend() {
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 8d620bde08ba..a327e11a560e 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/outerspace/Manifest b/games-strategy/outerspace/Manifest
index feafc91522f6..6e874a997db0 100644
--- a/games-strategy/outerspace/Manifest
+++ b/games-strategy/outerspace/Manifest
@@ -2,5 +2,5 @@ AUX outerspace 169 BLAKE2B 432402aa2fa9b80c2a5d22f22e5858dd6d618145d37abe54736d7
 AUX outerspace-0.5.68-setup.patch 1652 BLAKE2B 60d940c6c6c8c95452288abc13873aceff6d8cd6dd1216a61ca02de5bd1e834365fd2bbc0d6dd38500b1e2b764ccd1d629831871b40d2d45c708460939d23120 SHA512 b3d7f604724e6990436808dc62214a55325278cc04006fbe8438a213e772615a46b2969f88b03364332154af3cf996c7bdce05cc40dd5d24938bf6b537f9884b
 DIST outerspace-0.5.68.tar.gz 2249703 BLAKE2B 16b8c2d6c4e0516867d9a07a2762112da39f9a1074dffad9a9a3c343dd75662cba74d50f2a028b530013f320ffd7481317d061a3ebb449e9acf2f41bf56312a3 SHA512 dc2cbebf16fefabcc3356efb496766b90a5eabbf218f085fdc83cf956ca9503e99ef3154e0905c2432a3bf7caabd1f2af585a43397ba368581cd66546fcddc6b
 DIST outerspace_0.5.68-0ubuntu1_all.deb 2634188 BLAKE2B fd1667ae130e9a0ed603c369e9751d0b83414f20dd06c2f7e9941e2c465bdad0ff050ca41a928906bc5cc755eb05c0a5dfa18a8c35c868650c3fec6cf2e4f1f8 SHA512 9520cf1207a59497d6253b42bc34d580f9b805cf4ae55a5c921082e965892aa67921c4624ea94a5145c911dc2b24a1cca2806c06770ef8d1ded10855fb42666c
-EBUILD outerspace-0.5.68-r1.ebuild 1607 BLAKE2B 0f40261cf16d047c90c3bc49591b5e510c282eb2267e591ad027f80a537f33bc1f579bac8c2f179a230b7d9d2bcecdb31ccc9873f0c40b705b21d988a3a78666 SHA512 778a9c0879b0c03ff527f6918f0e8bf8ebaec479aa02d5a43fe791e6c73d8daa912dc37cd19f35d2e36191b7fb2f5155fcdbc03a432dd5b8969d92f177247ae7
+EBUILD outerspace-0.5.68-r1.ebuild 1603 BLAKE2B be05cbb59ec93992e875d9ef8d685dfb7b51f5d00634a8503fd57a81593a16f4aa5a1d53fc3d10affda9abfbbca1eff4846c0c059f72224965ecb2a57364b2c4 SHA512 d3b95c85a666a5c99345e0ea56130dc2eb784b84fd6da717d0faf2a881630a4ef0bbf126d5fd69e5ed9badd0a04ba96330d1f1e1f6a6571e1d2420bf14af9383
 MISC metadata.xml 831 BLAKE2B 2eb39d75eca89288ab8dcb4ff274891d62e4c9a9540ceb2a2f887e2743c28c4d04b8692a093e24c0226b88d2dbe938b268ef17de4974e5c127422ed387bac6a7 SHA512 d607343f2cc56162b694e28523cf256339a306b03bcca9c0148c59700491249a9acc6cfc193467cbdd04d8ea9bb564816747276143b3e4e1bf3dc7deab480d1e
diff --git a/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild b/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
index a7d5680c16a5..ca9da045166c 100644
--- a/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
+++ b/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
@@ -35,8 +35,8 @@ python_install() {
 
 	# source tarball is missing files
 	# get them from ubuntu.deb
-	insinto "$(python_get_sitedir)"/ige/ospace/Rules
-	doins "${WORKDIR}"/usr/share/games/outerspace/libsrvr/ige/ospace/Rules/{Tech,techs}.spf
+	python_moduleinto ige.ospace.Rules
+	python_domodule "${WORKDIR}"/usr/share/games/outerspace/libsrvr/ige/ospace/Rules/{Tech,techs}.spf
 }
 
 src_prepare() {
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index aa7e7485e0ba..6321b6051e1e 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,8 +1,7 @@
-AUX warzone2100-3.3.0_beta1-gettext_version.patch 1166 BLAKE2B f90e299a287698b1b4c84dd6aa44166a151e737843cac2099ba8051c02e2001a473dc21dc4c97aa1eb7908d13e48abdff59cfec0f4adf4814823dcc403e0a4c5 SHA512 70bdd3446913e982ac6592c243d2c8976103c893a79762993aa665a3e65b821f30c6e41d7e48eaeec2df8971ba6bfc412b0e72493bae979e493823907eab67d2
 DIST warzone2100-3.2.3-qt_compile_fix.patch 680 BLAKE2B 1073ea1619640455326c63dc55bf031579c8e9cb0b1b159e4fb1f9e8aa63bfcc6985e91cb2667149e7cc4b354bf96726fc6b8f8a8f519375e0a88c4be21dcb69 SHA512 766698c25c02b4254424efdafb8aa7b37360c3c05d3cd2d6c7f9127cbdd6a25840f98e8e3aadd5d6af494b4632584e564214c1f20c0bd74eb637da305552e067
 DIST warzone2100-3.2.3.tar.xz 81314060 BLAKE2B 231be8c24d1c0967adb0a76ac9e441c2ea9f835720df9951f74227988473d100b24bccbfe4b5882a36c63a798368ed1a1f871751b6b363d90a82fea48c44ba65 SHA512 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746
-DIST warzone2100-3.3.0_beta1.tar.xz 85916776 BLAKE2B ec94e6fafff103e014e063f554b6a40411577d9c415733eb7857c4cd470195f1ab9878c2d5afd6c154e1f058c2f2a645a46738518d307da42ae97e0898fdf75a SHA512 17e9d81e7eadc71ad285147ff76517a92e8ea8747a05a6a08373d994725efa6bae11f87cd6bc9068cbfd78aa24d26fea95929c65a0906d03605b96469d972f4a
+DIST warzone2100-3.3.0_src.tar.xz 86605304 BLAKE2B 70bad66966e31009de7f16a039525b2bc3e84a9991e7d95227f8789ceca7313a219044f41c0ceec0ce357e8368a30833d7dc1cc35e9575d9b56efa20b9e35c03 SHA512 876e36578472d9de4c00651af9b26a79bbbc85161d03c58e381aac90be710999b9091524425332e950ed42b79d872ace6848798829e7d3d7bb6ae7dae0003559
 DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
 EBUILD warzone2100-3.2.3.ebuild 2609 BLAKE2B 05ae8aea178cb29c3776e5c0fcab5ba4442765ec76766689bc35f5cfc23c51bb7524f2dc6b12abdd07e77e87688f74fa13d8fbb705f7a76a7f3acea95b7151ea SHA512 9dcc1c4b6b095ee4ef895abf5b3a5a5d1c4d1e5c371baeced194a2592304aaf71b005a6ecdc0443d0b32f3cfb7998897f6c63d5cf909f5855f0127e91920294c
-EBUILD warzone2100-3.3.0_beta1.ebuild 2407 BLAKE2B e908251343eb1425062650e8cef112ac119ef1abc65e350d421cff8ba7fdb8883b6e0a3111923c0db458b270a570a7942ac2517be516d1c65eb764e0a9aac963 SHA512 700929dc28d77a9a86053fd8739015463f9c03c06cc5cc3a2c669c08709ec7e129d61def20e1accfa8540f70681e49abde7c1f7c2200aea39b6b8c28b2b1839f
+EBUILD warzone2100-3.3.0.ebuild 2346 BLAKE2B a45c71a3e0f6b6592513e37d66658db108420f69a6ebc0a47213d151d3713c85d377ecb21bd07461b8affaee604f11410db0fe09d6a36d3400d8ce6dae9a9538 SHA512 0ae2aed3202e84c34f35fe77b16cfc903ce9aad6333c7a2974fd5cd3df98606c465bf27091de177ea38bf3d27aba648019be954df681aa352869e870135292dc
 MISC metadata.xml 674 BLAKE2B b0c40e88934cfbdbcbb7ffdbc277abcc3da3400de71f7508af51301f7ec5b6e00083ff2b59f59f7435a8e3f588291d7e5dbde19fa193b6fc78677b842cfb44ee SHA512 00aa4a109f41a0469e2b0e5daadcd33f9f3b255fdd2a724b7d116912ecb0b5fa4eb5e0dd7e4ae3e45f00c062c1034aa7d40143e48da0e66bab48da3d4e047dcc
diff --git a/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch b/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch
deleted file mode 100644
index 2d4b6c50a485..000000000000
--- a/games-strategy/warzone2100/files/warzone2100-3.3.0_beta1-gettext_version.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5539b080824bd4bcd0f212829012993ef193dc41 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Thu, 1 Aug 2019 04:53:14 +0200
-Subject: [PATCH] configure.ac: Raise AM_GNU_GETTEXT_VERSION to 0.17
-
-the shipped copy of po/Makefile.in.in comes from gettext-0.17 and since
-m4/po.m4 has been changed to use AC_PROG_MKDIR_P (Trac ticket #4701)
-autopoint from gettext would produce a broken po/Makefile.in.in which has
-no MKDIR_P definition. This again would result in "make install" throwing
-the following error when invoking install-data-yes target in /po/ dir:
-
-  make[1]: execvp: /usr/share: Permission denied
-
-Raising AM_GNU_GETTEXT_VERSION fixes the described issue.
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7e9c31433..30a732447 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,7 +71,7 @@ AC_CHECK_HEADERS(alloca.h sys/ucontext.h)
- 
- # Check for gettext
- AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.15])
-+AM_GNU_GETTEXT_VERSION([0.17])
- 
- # Check for pkg-config
- PKG_PROG_PKG_CONFIG
--- 
-2.22.0
-
diff --git a/games-strategy/warzone2100/warzone2100-3.3.0.ebuild b/games-strategy/warzone2100/warzone2100-3.3.0.ebuild
new file mode 100644
index 000000000000..fe91974e0f39
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-3.3.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs xdg
+
+MY_PV="$(ver_cut 1-2)"
+VIDEOS_PV=2.2
+VIDEOS_P="${PN}-videos-${VIDEOS_PV}.wz"
+DESCRIPTION="3D real-time strategy game"
+HOMEPAGE="http://wz2100.net/"
+SRC_URI="mirror://sourceforge/warzone2100/${P}_src.tar.xz
+	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || \
+KEYWORDS="~amd64 ~x86"
+# upstream requested debug support
+IUSE="debug nls videos"
+
+# TODO: unbundle miniupnpc and quesoglc
+# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828
+CDEPEND="
+	>=dev-games/physfs-2[zip]
+	dev-libs/openssl:0=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/freetype:2
+	media-libs/glew:=
+	media-libs/harfbuzz
+	media-libs/libogg
+	media-libs/libpng:0
+	media-libs/libsdl2[opengl,video,X]
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/openal
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXrandr
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${CDEPEND}
+	app-text/asciidoc
+	dev-libs/fribidi
+	media-libs/fontconfig
+"
+RDEPEND="
+	${CDEPEND}
+	media-fonts/dejavu
+"
+BDEPEND="
+	app-arch/zip
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+
+	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
+	sed '/appdata\.xml/d' -i icons/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localedir="${EPREFIX}"/usr/share/locale
+		--with-distributor="Gentoo ${PF}"
+		--with-icondir="${EPREFIX}"/usr/share/icons/hicolor/128x128/apps
+		--with-applicationdir="${EPREFIX}"/usr/share/applications
+		$(use_enable debug debug relaxed)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local HTML_DOCS=( doc/quickstartguide.html )
+	default
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+	if use videos ; then
+		insinto /usr/share/${PN}
+		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
+	fi
+	doman doc/warzone2100.6
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild b/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild
deleted file mode 100644
index d8ab1ae7bb7d..000000000000
--- a/games-strategy/warzone2100/warzone2100-3.3.0_beta1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs xdg
-
-MY_PV=$(ver_cut 1-2)
-VIDEOS_PV=2.2
-VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
-DESCRIPTION="3D real-time strategy game"
-HOMEPAGE="http://wz2100.net/"
-SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.xz
-	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
-SLOT="0"
-#[[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~amd64 ~x86"
-# upstream requested debug support
-IUSE="debug nls videos"
-
-# TODO: unbundle miniupnpc and quesoglc
-# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828
-CDEPEND="
-	>=dev-games/physfs-2[zip]
-	dev-libs/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/freetype:2
-	media-libs/glew:=
-	media-libs/harfbuzz
-	media-libs/libogg
-	media-libs/libpng:0
-	media-libs/libsdl2[opengl,video,X]
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/openal
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXrandr
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${CDEPEND}
-	app-text/asciidoc
-	dev-libs/fribidi
-	media-libs/fontconfig
-"
-RDEPEND="
-	${CDEPEND}
-	media-fonts/dejavu
-"
-BDEPEND="
-	app-arch/zip
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.0_beta1-gettext_version.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
-	sed '/appdata\.xml/d' -i icons/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localedir="${EPREFIX}"/usr/share/locale
-		--with-distributor="Gentoo ${PF}"
-		--with-icondir="${EPREFIX}"/usr/share/icons/hicolor/128x128/apps
-		--with-applicationdir="${EPREFIX}"/usr/share/applications
-		$(use_enable debug debug relaxed)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	local HTML_DOCS=( doc/quickstartguide.html )
-	default
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
-	if use videos ; then
-		insinto /usr/share/${PN}
-		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
-	fi
-	doman doc/warzone2100.6
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index d0f7b724a36c..6328ad8d970d 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,7 +1,7 @@
 AUX wesnoth-1.14.7-boost-1.70.patch 914 BLAKE2B a5e4a48eb7c5ee75fb23348a396f86b8ca754f7fec1b4f4eac42e31b5956cfb56c43d6b70cdf91d12b22ad70508d3142e3f94965ae432ada1dfa7fd4931e43bb SHA512 5c37986c12ece8b11301bbf69e3b7111bf50da91157c066f954f9bf7062fe064fa7ddc9e858fa3c1413bfeb13f29a4cce63a45676c662a3d7de9e4331b88701e
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.14.6.tar.gz 491891860 BLAKE2B e15512eefbb7b118ec80a5612c23edce41555fc2869b652d4799bc052f26592852a2b4d1cb76dee3203d8a26c18c4cf9de58dea1ee81403b9881642e902cf2f3 SHA512 f29b78605f5e3c2e9af8884925b43a262d6fce469bf30a4697e2c8bef8a49d0fea17bd6dc1a3e78113a50e6f21e29aedb5ee26ff2b0493371120f8c64b894096
 DIST wesnoth-1.14.7.tar.gz 493837595 BLAKE2B a80781d4f9ec79514c6431c5d45a6cdcb913aabc6329cefe46e7980805d06b60d479110bb6432f2c35a058e551da6b6fa8e0e4f6f1bdf9a159f6329ddb74aa2a SHA512 dbca2b904147f592cc712b11d6414a47bd557d3c677e6b3eacb4fc1ca5420a264f15fdbe45c8c3469ecfb5d1ffa1ac19cceb58c1378aec0e8b4597baa348ca3b
-EBUILD wesnoth-1.14.6.ebuild 2682 BLAKE2B 6d395a57de1c5244a68cef436135b15d0fbde4502437d688bc3acec6bfd2106dcdb1f89388975f7f34b44d48e7e2fb6f3d8570b14e44ad65bf9a55d12aaa6bb6 SHA512 e372ea2192d70c90c8000755580b64f5b127e6f27c765c42e2d8ef7ca7dc6becc6658404ed037d4c99581883a98dcb4a3fb23f24ce1da6d13b171fcffe0320de
-EBUILD wesnoth-1.14.7.ebuild 2731 BLAKE2B dbb292c86d40fe75acb4668ad1a4afa8794b338a59de45c7c44efc296ea9c7982d178f1e943629d9a4e14038ef19503a24b394956e25a6a079488fefafb4919f SHA512 104d6de80ffd977b0591999dc089e200242969ebbc15c373a4cde8d5209ace402969f174a928f8ac123ee9c2cfb5ecae426f19bb9e05760acf31dff5a9a5d0c4
+DIST wesnoth-1.15.1.tar.gz 499339559 BLAKE2B f382411ee01444b603edeaf1d64187716d0dce6a3fa99d18862818289b9f0e0a48bfe1dcd98cbad5cfe2099d1e51755a9bd9f3e847243a3cd193334a8589218c SHA512 abc76a1cd4b459ee28736d1160ba91d4c18b2ee1dbc68c2165f9c27b872e4c8b11246a85ece2c3aa7eeb1f0fc9d5817c56b2a211c0e49ad3952186bac433ecd2
+EBUILD wesnoth-1.14.7.ebuild 2829 BLAKE2B d3ee24ef0b04a246b5ff79fd54e8186f220c97789c81f18a2f901d7c89c5ea79622d121c0b79a9c787f341fcb9a88bea7d15bf0e0931d271d15acaea0527bc2c SHA512 2482c67554292f868c25f498ccd570bd3c8c1bc2722d99eb655b8c7fe6487bde535119795df934306cbcadd29d6de374de07ec0c3a27e45ebd72fbf0a633dcd4
+EBUILD wesnoth-1.15.1.ebuild 2648 BLAKE2B 4332f4ae7797f9db6b399291017c2f0dcb8bdf8eb6230e890cc2ae3ba3a43cc65824a66820a3973dec1f5e390e01c29f0bb1094801655623d3e1ca1fd777e2e5 SHA512 b6a50672a0e1854cfb5df8f51051c947a9ab28c446261303a1ceb1eb90396149c0dccfe372d776fac0eee1d9d9a6477b323ac53acf5bece1f7988d8264d77618
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.14.6.ebuild b/games-strategy/wesnoth/wesnoth-1.14.6.ebuild
deleted file mode 100644
index 971ba1f87a94..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.14.6.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils user
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-	https://github.com/wesnoth/wesnoth"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi libressl nls openmp server"
-
-RDEPEND="
-	>=dev-libs/boost-1.50:=[nls,threads,icu]
-	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-	!dedicated? (
-		dev-libs/glib:2
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-		>=media-libs/fontconfig-2.4.1
-		>=media-libs/sdl2-image-2.0.0[jpeg,png]
-		>=media-libs/sdl2-mixer-2.0.0[vorbis]
-		>=media-libs/sdl2-ttf-2.0.12
-		media-libs/libvorbis
-		>=x11-libs/pango-1.22.0
-		>=x11-libs/cairo-1.10.0
-		sys-libs/readline:0=
-		dbus? ( sys-apps/dbus )
-		fribidi? ( dev-libs/fribidi )
-	)"
-DEPEND="${RDEPEND}
-	x11-libs/libX11
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-
-	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
-		local lang langs=()
-		for lang in $(cat po/LINGUAS) ; do
-			has ${lang} ${LINGUAS} && langs+=( ${lang} )
-		done
-		echo "${langs[@]}" > po/LINGUAS || die
-	fi
-}
-
-src_configure() {
-	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
-
-	# Work around eclass
-	append-flags -UNDEBUG
-
-	if use dedicated || use server ; then
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="ON"
-			-DENABLE_SERVER="ON"
-			-DSERVER_UID="${PN}"
-			-DSERVER_GID="${PN}"
-			-DFIFO_DIR="/run/wesnothd"
-			)
-	else
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="OFF"
-			-DENABLE_SERVER="OFF"
-			)
-	fi
-	mycmakeargs+=(
-		-Wno-dev
-		-DENABLE_GAME="$(usex !dedicated)"
-		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_FRIBIDI="$(usex fribidi)"
-		-DENABLE_OMP="$(usex openmp)"
-		-DENABLE_STRICT_COMPILATION="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( README.md changelog.md )
-	cmake-utils_src_install
-	if use dedicated || use server; then
-		rmdir "${ED}/run/wesnothd" || die
-		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
-	fi
-}
diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
index e0b1b37602ec..e4bfda3bc803 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
@@ -11,7 +11,10 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+fi
 IUSE="dbus dedicated doc fribidi libressl nls openmp server"
 
 RDEPEND="
diff --git a/games-strategy/wesnoth/wesnoth-1.15.1.ebuild b/games-strategy/wesnoth/wesnoth-1.15.1.ebuild
new file mode 100644
index 000000000000..24ae216df067
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.15.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils user xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+	https://github.com/wesnoth/wesnoth"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+fi
+IUSE="dbus dedicated doc fribidi libressl nls server"
+
+RDEPEND="
+	>=dev-libs/boost-1.50:=[nls,threads,icu]
+	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+	!dedicated? (
+		dev-libs/glib:2
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+		>=media-libs/fontconfig-2.4.1
+		>=media-libs/sdl2-image-2.0.0[jpeg,png]
+		>=media-libs/sdl2-mixer-2.0.0[vorbis]
+		>=media-libs/sdl2-ttf-2.0.12
+		media-libs/libvorbis
+		>=x11-libs/pango-1.22.0
+		>=x11-libs/cairo-1.10.0
+		sys-libs/readline:0=
+		dbus? ( sys-apps/dbus )
+		fribidi? ( dev-libs/fribidi )
+	)"
+DEPEND="${RDEPEND}
+	x11-libs/libX11
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash -1 ${PN}
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use doc ; then
+		sed -i \
+			-e '/manual/d' \
+			doc/CMakeLists.txt || die
+	fi
+
+	# respect LINGUAS (bug #483316)
+	if [[ ${LINGUAS+set} ]] ; then
+		local lang langs=()
+		for lang in $(cat po/LINGUAS) ; do
+			has ${lang} ${LINGUAS} && langs+=( ${lang} )
+		done
+		echo "${langs[@]}" > po/LINGUAS || die
+	fi
+}
+
+src_configure() {
+	filter-flags -ftracer -fomit-frame-pointer
+	if [[ $(gcc-major-version) -eq 3 ]] ; then
+		filter-flags -fstack-protector
+		append-flags -fno-stack-protector
+	fi
+
+	# Work around eclass
+	append-flags -UNDEBUG
+
+	if use dedicated || use server ; then
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="ON"
+			-DENABLE_SERVER="ON"
+			-DSERVER_UID="${PN}"
+			-DSERVER_GID="${PN}"
+			-DFIFO_DIR="/run/wesnothd"
+			)
+	else
+		mycmakeargs=(
+			-DENABLE_CAMPAIGN_SERVER="OFF"
+			-DENABLE_SERVER="OFF"
+			)
+	fi
+	mycmakeargs+=(
+		-Wno-dev
+		-DENABLE_GAME="$(usex !dedicated)"
+		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_NOTIFICATIONS="$(usex dbus)"
+		-DENABLE_FRIBIDI="$(usex fribidi)"
+		-DENABLE_STRICT_COMPILATION="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	local DOCS=( README.md changelog.md )
+	cmake-utils_src_install
+	if use dedicated || use server; then
+		rmdir "${ED}/run/wesnothd" || die
+		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
+	fi
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 80831a80bb5f..efd4487c1145 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 4099ac19a0a9..bf546f4435b1 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,11 +1,8 @@
 AUX gnome-desktop-2.32.1-gold.patch 493 BLAKE2B 4a7e5a1d834bb2a8f753e279a96875a34e25126a4a51167a37bcc2d749e1c28694bc53ee32ffe5490e20f6dc1a4f82e9201b5d9753928119be2ff2f3e19ba53b SHA512 1ceb79f150cc271547766044277cb38c45cb8ebaab9edaf5fd7bfc29ed25920c80d4a0331fdc6ed91f5b47cb51d820270714d72d3bec7cd55939f1a1ef7a9c0b
 AUX gnome-desktop-2.32.1-thumbnails.patch 3530 BLAKE2B 5ebed12840808f13e8116ff6e55c08269813dcc5f6acd863c2f845b75efb1879c36539c7690e9812ed034a4756da6b04bd271ecd9f3f07e22831edd6c7e81734 SHA512 8683aae51ba9a97074442b226d24267857d64a911608fc1c8a207fadc69222583c26281d4c16dddfbf7c975eb76fc6d5c08291ff594468dbee6dd92ef0313263
 DIST gnome-desktop-2.32.1.tar.bz2 1633847 BLAKE2B 9c69504b0f904fe04bdaa2e2fd3c6fbdd0cdd67033bae6e21377cce2deb68f05ed85bc735547c036923978ebdb8952c262676a01a33f8d7acffb0b964f97366a SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28
-DIST gnome-desktop-3.26.2-patchset-r1.tar.xz 13336 BLAKE2B a90b0e223d3187e616819a6cc5b0b972dec62e2dfdefde6284d2f0526a651865b72143d900cc2b9e9a3758bd23288d9f99a0084f353bcaaa2821f19519be32fd SHA512 f5a0b756c52e4307f3dad6092685b2c178a04467c483322bc9b7a47b3545bd75a70f56658e5cc90422bbf715601fcda7d3e48ab129c778dd7c34ac9d35783c1d
-DIST gnome-desktop-3.26.2.tar.xz 969500 BLAKE2B fb1e671d8fb890d9aabbd351b824b76f13ed7ba62dd3f82a36fca7cbe590af8901fc7bd8ef1be6a5c9b978569b306eba5c3d2f9545856389438a43539b1ed9e4 SHA512 1425bead81a63d9d19f09fb8d23cd2611645898a910887c2b6a672bfbec3dd956e29e1d8c5f941d06929febc7734dec0550f7a15336583fcf9be41f1a4e9c783
-DIST gnome-desktop-3.30.2.1-patchset.tar.xz 3572 BLAKE2B e8a681ea7a3eab8186c89d8ec8d346129c8e85f0b78f5ad1b7658a4f8014601614c14d5686eeb51382af72fe138c1df73f5c86b120f46bb2e4d98339a2fc33f8 SHA512 02d7b19109bde647874c1b63079872a3df28fc4f5ce486e174cb4b16f5a56ca948150f5b02640fac6e33141ca1da428e38ea0a6a1b8cf4c864d143253f75ed18
-DIST gnome-desktop-3.30.2.1.tar.xz 1052492 BLAKE2B 064ca0580e00e7561bba73a4ae14fb642fb3c66e9619cf3690df996bbcace27188da0bc33384f06147f69653f43ea7bf73adddeb4477a7d231db66e6dca444ed SHA512 dddce479ccbb7245c6bea0638199118a88ba6d4f8f61e0c673aec2e738c26d9a99053499b3db190f731cf48ef8967feab5e4b253fc96ae68aa19d235bb52b31f
+DIST gnome-desktop-3.30.2.3-patchset.tar.xz 3568 BLAKE2B 20d13d7e396d7cddcfb6f761815df7ce6a2d910be5e9588eac519ade536848cfc09d1aca0e4478f97177b8ee26f8049da21542d502b427973991b47c7097bbe3 SHA512 8b9eab01e79e3d67dec51ed07a086f04df1890e638a0c1696742cf5e3b6a42dccbd514fc3cfd3610791c4905346847af83e813845ad14e0b57b790fedd0ae8e0
+DIST gnome-desktop-3.30.2.3.tar.xz 1164500 BLAKE2B e78256bc3319ea9794b4666c82eb466a0c884fd43c3c776fd08aaf789905893ff93acec35a1fb6903c0049b3a169afe5b43a71ac1e93e8c63c013682c3316fa8 SHA512 36303de8fa70e65c40aeb7862156fa404b965d1724171ec5bb0a00cb1049efbfba79cdcff76278f53e4e27199f1ef9dcb574b0f465b0f4e04bb46c50d516ad0f
 EBUILD gnome-desktop-2.32.1-r2.ebuild 2296 BLAKE2B fbd9347c8215cc512b0a510da35b4e12425f7c33a40a6081f714ba3cf4d71eabf66c27c230eb08147d9c56c1d15ac9586c7ecaa894baffc6721fbba35bcda062 SHA512 427f8dca28ce505920a02e0f540b3c311baff2fc03dcac908d07d4d4e463f70dbb3b642ae53129ff7c4a2892efc34ca84683316cb15f493c89968ed390e4b74e
-EBUILD gnome-desktop-3.26.2-r2.ebuild 2060 BLAKE2B 162338d1095af7c06f71f74a3041530a94697a028ba0280b2d1b636f8232963abb13334ce6aa67a64844d3e587ba851ee3fecd5a11f4a31c3201b472a6070cb6 SHA512 09979d7241039cc5f2a82c614b3d0cbbcc7850eb744958645cffb68a64b314a43b21ff53fb8f01610af6066edf8a6b9c63b4509e010985a8ee465818ce8eaf36
-EBUILD gnome-desktop-3.30.2.1.ebuild 2004 BLAKE2B b2248519f1261b4f9834b50b2fe006e770a8a3948be1ea0893659a63ae5d92f110311264065e44c4b53827e9f02db4cc853ddfc1cf7aaa659b68df3d004ebe53 SHA512 5ca8b210b320029bb7924d7188f272b1b10a1b0b3bf58f1fc71c1dc0666c565cb2af80322851f1725030c3b6a72a93946e1d4e1e19a32d13377c52fd9480a4cc
+EBUILD gnome-desktop-3.30.2.3.ebuild 2004 BLAKE2B 2fe4f1c41abf2dfd931dcdb196bb1c71d056aeef2c59d774325b79d0d5ea03e8ec9b8cc6b6983ac47cb25d4a6cff1db002fd619de5dadaca70a6baaebbd9b24c SHA512 954954c7d409a2a2fe4c97e353e4dc00431a03d213f30170b57256755c60b8159dc002559f45d022d6819ab5cf1493c0c684a66fba6819c0c6fa1011df8cfceb
 MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild
deleted file mode 100644
index aabc9847f481..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-inherit gnome2 virtualx
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-r1.tar.xz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/12" # subslot = libgnome-desktop-3 soname version
-IUSE="debug +introspection seccomp udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.53.0:2
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	seccomp? ( sys-libs/libseccomp )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-	seccomp? ( sys-apps/bubblewrap )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.6
-	dev-util/itstool
-	sys-devel/gettext
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	app-text/yelp-tools
-	gnome-base/gnome-common
-" # yelp-tools and gnome-common for eautoreconf
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
-	"${WORKDIR}"/patches/ # Requires eautoreconf. Various backports for sandboxed thumbnailer, leak fixes and more - https://gitlab.gnome.org/Community/gentoo/gnome-desktop/commits/gentoo-3.26.2
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-distributor=Gentoo \
-		--enable-desktop-docs \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable debug debug-tools) \
-		$(use_enable introspection) \
-		$(use_enable udev)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.30.2.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.30.2.1.ebuild
deleted file mode 100644
index c876ea13a3cc..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.30.2.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-inherit gnome2 virtualx
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/17" # subslot = libgnome-desktop-3 soname version
-IUSE="debug +introspection seccomp udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.53.0:2
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.27.0
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	seccomp? ( sys-libs/libseccomp )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-	seccomp? ( sys-apps/bubblewrap )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	media-libs/fontconfig
-	app-text/yelp-tools
-	sys-devel/autoconf-archive
-" # yelp-tools and autoconf-archive for eautoreconf
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
-	"${WORKDIR}"/patches/ # Requires eautoreconf. https://gitlab.gnome.org/Community/gentoo/gnome-desktop/compare/3.30.2.1...gentoo-3.30.2.1
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-distributor=Gentoo \
-		--enable-desktop-docs \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable debug debug-tools) \
-		$(use_enable introspection) \
-		$(use_enable udev)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.30.2.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.30.2.3.ebuild
new file mode 100644
index 000000000000..2ed6a694e4be
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.30.2.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+inherit gnome2 virtualx
+
+DESCRIPTION="Library with common API for various GNOME modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="3/17" # subslot = libgnome-desktop-3 soname version
+IUSE="debug +introspection seccomp udev"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# cairo[X] needed for gnome-bg
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.53.0:2
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.27.0
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	seccomp? ( sys-libs/libseccomp )
+	udev? (
+		sys-apps/hwids
+		virtual/libudev:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
+	seccomp? ( sys-apps/bubblewrap )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.14
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	x11-base/xorg-proto
+	virtual/pkgconfig
+	media-libs/fontconfig
+	app-text/yelp-tools
+	sys-devel/autoconf-archive
+" # yelp-tools and autoconf-archive for eautoreconf
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
+
+PATCHES=(
+	"${WORKDIR}"/patches/ # Requires eautoreconf. https://gitlab.gnome.org/Community/gentoo/gnome-desktop/compare/3.30.2.3...gentoo-3.30.2.3
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-gnome-distributor=Gentoo \
+		--enable-desktop-docs \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable debug debug-tools) \
+		$(use_enable introspection) \
+		$(use_enable udev)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 9419cd83666a..c8dffd4236f1 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,5 +1,8 @@
+AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705
 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
 DIST gsettings-desktop-schemas-3.28.1.tar.xz 652416 BLAKE2B a9ddf44153a83fa188f873e6bca29499e1abc7dea310c6eda3193233e363607781c93bca64a9ddf2f31137e22e54e23b0f139e90ef99c181aac9a976409b6c94 SHA512 2bf3260e976943e9d1e51feda62ef1e432870a6d9b34881afbdf99ddbe4954e5dd679697e152e793a0b38492dbbc4891018f7aa8cd4e703d05a8647cc5a56785
+DIST gsettings-desktop-schemas-3.32.0.tar.xz 628888 BLAKE2B 7d675597d861ee8ee8258f037d06d6f728e9705c7e121508a811bbad000b1ef10a7e2ef23066cec01c34865648f4f0a204716306643db1a4cbd505801ce939c1 SHA512 cf1d78a8f9f1697e20c995286b50d556c2ecc83bf4b28be19b3258a724494a2827fb9567cabf29cda1c590488fd2645e905072e08321766c8bdddd22ac3710dc
 EBUILD gsettings-desktop-schemas-3.24.1.ebuild 773 BLAKE2B 0e1ae32f96f19282f026d4247c1dc95000525836c0d8528d1ee275ae5bbe4511cf2f23fdf693a56480e83ad22f620d03c8f24bd9a8d0b236f5bd976f404c5892 SHA512 e8b192cb63c0a765b79c14db77b6fe7d205dfacb78875ef3038d8eea5a54c180bb6db3e6c8664c20960f7aea38b39df2b968003abd56ef2f4273e7c78df08e23
 EBUILD gsettings-desktop-schemas-3.28.1.ebuild 774 BLAKE2B 9d1190a947d62b14390a6a89588a6eeebd7555e2af8fdf24195a047f496eb8f60ed281776118fe2815f1dc7474e717b2e7121c3e8c6343eca706316512155fe2 SHA512 6554ac3ddc2149e8cbeb6723f197cb5f467e774404d6caba1178a04b121cbc0e2ecbd73d946dbd9ede5a3224e9bb0cfb1caee7fa5af2eafe81661fe4205a0e20
+EBUILD gsettings-desktop-schemas-3.32.0.ebuild 1051 BLAKE2B 8bd8a0a8679e29dd23acc20446fda9084779f9258e47ac0cf9a5c93119ba1af48cd85a32e28ec38f55fab366442de879e4b6d1370ded7df6f9b9c3e92b764731 SHA512 dff9c3f5772cc31a6b5a26b6ddc7160013d1efd80a90ad978e3a2c3726104f95ae69ac507b0015ef57aaf8a80ea733d2940889e2ebd728fbc8dd4ea80a1a8d87
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/files/3.32.0-default-fonts.patch b/gnome-base/gsettings-desktop-schemas/files/3.32.0-default-fonts.patch
new file mode 100644
index 000000000000..105ba088f9e1
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/files/3.32.0-default-fonts.patch
@@ -0,0 +1,38 @@
+From 63563ee0e65c1d2ae9aa0ae5530035605fed0f1c Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 1 Sep 2019 20:34:44 +0300
+Subject: [PATCH] Revert "schemas: change default monospaced and document
+ fonts"
+
+This reverts commit 965062de47f5171727c1e4f7f0aac2ad40e3484a.
+
+It is not GNOME business to override distribution choices for default
+monospace and document font.
+---
+ schemas/org.gnome.desktop.interface.gschema.xml.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/schemas/org.gnome.desktop.interface.gschema.xml.in b/schemas/org.gnome.desktop.interface.gschema.xml.in
+index 22ef50d..1713f25 100644
+--- a/schemas/org.gnome.desktop.interface.gschema.xml.in
++++ b/schemas/org.gnome.desktop.interface.gschema.xml.in
+@@ -149,14 +149,14 @@
+       </description>
+     </key>
+     <key name="document-font-name" type="s">
+-      <default>'Cantarell 11'</default>
++      <default>'Sans 11'</default>
+       <summary>Document font</summary>
+       <description>
+         Name of the default font used for reading documents.
+       </description>
+     </key>
+     <key name="monospace-font-name" type="s">
+-      <default>'Source Code Pro 10'</default>
++      <default>'Monospace 11'</default>
+       <summary>Monospace font</summary>
+       <description>
+         Name of a monospaced (fixed-width) font for use in locations like
+-- 
+2.20.1
+
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
new file mode 100644
index 000000000000..d03664abab07
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
+HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+
+DEPEND="!<gnome-base/gdm-3.8"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
+	"${FILESDIR}"/${PV}-default-fonts.patch
+)
+
+src_configure() {
+	meson_src_configure $(meson_use introspection)
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 4f905c0fc81b..5f4701b40e4c 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -7,5 +7,5 @@ DIST gvfs-1.38.3.tar.xz 1202280 BLAKE2B fb4d4f6d0187f4f1bdfdff42f496402c64077958
 DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c
 EBUILD gvfs-1.32.2.ebuild 3811 BLAKE2B e0980669a87db9f15e07e81e281ecec55ce72aa98f924acf182fbf9aef851dc8b7566ae15b81f635fca1150da730aa17f1d20e5242e4116f08d16117cd80d174 SHA512 a7e156297e36658b14b9c76c2c78318ea135a4be914ff06f587cafe3cedd5b9c44d6e946117ad520a65551b15fba5fdfd65de2862f3d8ad10fd6f729f983ddb4
 EBUILD gvfs-1.38.3.ebuild 3769 BLAKE2B b8d9a194313ffcf85e4e4364bcc658f5c8e8874fa0c24338f0214685a7d3f4f3930220bc9764bdd06fcf5de70b1babd7e12a2d2c86247288074db30b46af41e8 SHA512 352e5b0800c192ab6e629318c2b975d2d1149e5d9613bee39812d6a7ae3213a0cf1b92397bc46c1a7b59643cc8eff197773306c8ed4ebd7c7293db37e2dff77c
-EBUILD gvfs-1.40.2.ebuild 3811 BLAKE2B 79fb1bbf68b45ecc1f12522f9a5e626529b397aef69f34a1e15715de265cc43e3d2d64637fb38bf644bedd240e2aa506f63c6fedab96d3bc90f131320e3d20f7 SHA512 6756c476d138b0bb561e16bb418c5b8bd18c8c0d5bea60ee2db58340a2ecbc7264493249b80f643d171f1c4597cf169a44d2828e23fef5aedcd8515565f8d64b
+EBUILD gvfs-1.40.2.ebuild 3806 BLAKE2B 3bc05beb1d4d25c5c41a8f90905a22a106831fb2b7b34c004aab2be6c456d250a6d46f8038d660c9aeac4b486e0a52934de0510700229dd5df0dcea95e9a7308 SHA512 9646b5c0d32fdcba4b62f848790b3d2a9a1a6a3722807a729bcf6cb8711faad179afe40a3bc4c00d957e4d61b24f730f4719ef23ae08593d45e1aafa6769996e
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/gvfs-1.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild
index fab749fb5a6d..9bd7d4c8cd88 100644
--- a/gnome-base/gvfs/gvfs-1.40.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.40.2.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.57.2:2
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index f4412b2402e8..f55e6a7fc394 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,11 +1,8 @@
-AUX 3.28.1-docs-build.patch 1049 BLAKE2B d79a2a9a91ae549386a5c484692c690301af7e181351ab4fd530947d4663d15f0cbfff1ee7f4ecdce390cdb1eb31db03d6df821ffffadb3e570f002433538c7a SHA512 069d669be97913e9177b456e9cfa67f0498ec3905a3e884f9373b375eb82b40ed43c9ca4d483d2eabd1ca91127d43dc2981234cbaac08f67e7fa124d8827a68b
+AUX 3.30.5-CVE-2019-11461.patch 1099 BLAKE2B 8f906c2076f7f2c630bcc5a56f76ec18814932055eebea12b41335d3770403efa34f8350bd9bb2fbabeec36ed7249f5363d689d6ea8a9e1e1babebe19c36e6af SHA512 91c927814ae3763a634d26ccb357276b570bc57f176969e43b7e99dcb9f720bfec43003295e5058c43b512c94af2e4afc7b960e1b10009e1b0d365440e3eb37f
 AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459
 AUX 3.30.5-seccomp-sparc32.patch 675 BLAKE2B e8d9d9c4299cd700ea02656bf66f1ddec1801901161f026f78b88cc393793392c0e0af97a8de47a851545b5cd6305160233b952c1a0ba86ccc1d1f7dadf1dea0 SHA512 fe91a78d17a9142b8964d6d52778b32ac0b88e85dc0b1b05b838a1d90396f7c73927f9dce63ebe8585f8d1cdf94ebdc6a123b58196dc1248ce5aa6dce5d73990
 AUX 3.30.5-thumbnailer-updates.patch 3978 BLAKE2B 0c7c7147d5bf947617f32d6f1ec1949941f5f9cf77dd351ddeb3c41871e247eac10855b3075f81f4d3dfe0f692f76e25590d5db5d4823ec4d264b6a65ee3177e SHA512 2a14f9256c3ff5d2744038ede78fafdd27b033ee6576885faab35aff77b60c69035e3aa1400c183f9f0497b0bbb8890e3be6dfae5fa3a77df180601c185939d7
 AUX 3.30.5-thumbnailer-updates2.patch 1841 BLAKE2B 261cabfc7ee8334bbf00b469a601ba61f2ff78f3a4ed6fb860b7854c4198963769df5673cb5cdf2753fbfeeb540aa31f7fd29deda0431075747860068b468dff SHA512 44011606a10bb6d8f45cbc2b20b802ea347d930c44959de33bc0f395dd050e01884ec1b6a85b899b1b30aa6fde07fff8d6ff4dcb4d1a7fe86d27a9721668e8ab
-DIST nautilus-3.28.1-patchset.tar.xz 129360 BLAKE2B 18e94e83132a8ce2e07491ce6b5cb9499141bf93e0c3ef44f2e5ac891e59d334cf310d863e8e7450fa385a6a49873d790e4f8c36a1ef8e009b1f2be2361586b4 SHA512 6c3385b4bc7020601f47dc66c0b1cabd6dadcd9f986bdaec42aeca9b43a6b8a2362651958d4e6a4738b78fbd546071678ba15ab87c268e33cfc1cca49229da48
-DIST nautilus-3.28.1.tar.xz 3262520 BLAKE2B 6f007e2327ffb108c5195737c02c7be12b874f5bc3bdfc1c84a3ba2176ff36e1843057522a54e569a7c09a056ccd888e1ddf099d6f2b527dfa109370cbe1a3a9 SHA512 6b695c097e5082062afe8cb036e819c837ce1e2570f581f81860f378e34f38f3020b8802e6a4285243c111d5208e892c419ac92621cdb1d35b2df205a3ccaa13
 DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf
-EBUILD nautilus-3.28.1.ebuild 2656 BLAKE2B cd1f74358d8e23af670c498ad510c27e261423ef560b59559be4ceb79745b0db16f61da3580edae7998ca88eb7983401ba656c0a105aca362770f6ad2a08c206 SHA512 6ab0cbc44f446eb9e82d9046aaaee77f1bb34768c2583ed5143fd17f12af7d2f46027f08732f9483fce151091d6cf167e13879e301360056ded4a2326bb9c4d5
-EBUILD nautilus-3.30.5.ebuild 2780 BLAKE2B 89428170b804da39250b721558dc568700549d1b0cbf7b35989074b7402d8271ca8b684b5d1b9e7a318f2984bcfaa51e67dd4c392109403dd9481a1e21723283 SHA512 1e182d99407ac7464b2d68801a2a49200f4bd3a7e781bc7506a7c97045ca8dcffc382b088fe2b5c96d0de6d94f0066fe0c3b889f68495a075f7fd64e85bd2f4e
+EBUILD nautilus-3.30.5-r1.ebuild 2822 BLAKE2B 6b115495fb078e7eee306575f3a177fad9dee08b898e28980319656d8dd6624e568042ecca60ba164e474eb71fbe24834797460edaaf2ddfaea6d3ec608d195e SHA512 4c3a802cfa10e8315ecd854dc64f7a2bde19c3e2a3a196ff670aa01a40de83abca7ab27c98bae8898343316333192920f3f12450d267e9d38e04b77e1aa2f0e5
 MISC metadata.xml 577 BLAKE2B 16a9d9904b6a1cb02d844b3a90cd87e4398024a16d4cef1a5106190a06b6d60058db172d1ae1ae0b424c3a2c864dfacbedaca696e847f88a1a5ae300a2cb04b7 SHA512 c42d9a07ac2a05a5da2c6c10c49c3810ed3409ac00d5d7e744d15232fb62ec0f84d2ebcb36c5a819a476ae922900d1d8270101b26a766e85c35d3fa2d6531747
diff --git a/gnome-base/nautilus/files/3.28.1-docs-build.patch b/gnome-base/nautilus/files/3.28.1-docs-build.patch
deleted file mode 100644
index a2cb07aa23e3..000000000000
--- a/gnome-base/nautilus/files/3.28.1-docs-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From eaf8435005e2637ce76690c71f729e6b3685d973 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 5 Mar 2019 19:22:58 +0200
-Subject: [PATCH] build: Always install man page
-
-It's already generated and shouldn't be thrown in the same pot as
-full gtk-doc generation. It should be either a separate `man` option,
-or just always installed.
----
- docs/meson.build | 4 +++-
- meson.build      | 4 +---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/docs/meson.build b/docs/meson.build
-index b039cb631..2b1800be6 100644
---- a/docs/meson.build
-+++ b/docs/meson.build
-@@ -1,3 +1,5 @@
- install_man('nautilus.1')
- 
--subdir('reference')
-+if get_option('docs')
-+  subdir('reference')
-+endif
-diff --git a/meson.build b/meson.build
-index 4b64239ac..88fe73237 100644
---- a/meson.build
-+++ b/meson.build
-@@ -152,9 +152,7 @@ if get_option('tests') != 'none'
- endif
- subdir('data')
- subdir('po')
--if get_option('docs')
--  subdir('docs')
--endif
-+subdir('docs')
- if get_option('extensions')
-   subdir('extensions')
- endif
--- 
-2.17.0
-
diff --git a/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch b/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch
new file mode 100644
index 000000000000..6c2d061123fa
--- /dev/null
+++ b/gnome-base/nautilus/files/3.30.5-CVE-2019-11461.patch
@@ -0,0 +1,30 @@
+From 83949ed5800ec99953f5ee8d2bf8b90a69daa850 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@igalia.com>
+Date: Sat, 13 Apr 2019 13:57:36 -0500
+Subject: [PATCH] thumbnailer: fix incomplete TIOCSTI filtering
+
+Fixes #112
+
+See also: https://github.com/flatpak/flatpak/issues/2782
+---
+ libgnome-desktop/gnome-desktop-thumbnail-script.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+leio: Adjusted to apply to nautilus copy
+
+diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
+index 9468b51c..3b3d1ea9 100644
+--- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
++++ b/src/gnome-desktop/gnome-desktop-thumbnail-script.c
+@@ -343,7 +343,7 @@ setup_seccomp (GPtrArray  *argv_array,
+     {SCMP_SYS (clone), &SCMP_A0 (SCMP_CMP_MASKED_EQ, CLONE_NEWUSER, CLONE_NEWUSER)},
+ 
+     /* Don't allow faking input to the controlling tty (CVE-2017-5226) */
+-    {SCMP_SYS (ioctl), &SCMP_A1(SCMP_CMP_EQ, (int)TIOCSTI)},
++    {SCMP_SYS (ioctl), &SCMP_A1(SCMP_CMP_MASKED_EQ, 0xFFFFFFFFu, (int)TIOCSTI)},
+   };
+ 
+   struct
+-- 
+2.20.1
+
diff --git a/gnome-base/nautilus/nautilus-3.28.1.ebuild b/gnome-base/nautilus/nautilus-3.28.1.ebuild
deleted file mode 100644
index 40dd98c4c84d..000000000000
--- a/gnome-base/nautilus/nautilus-3.28.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="Default file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="gnome gtk-doc +introspection packagekit +previewer selinux sendto"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.55.1:2
-	>=media-libs/gexiv2-0.10.0
-	>=app-arch/gnome-autoar-0.2.1
-	>=gnome-base/gnome-desktop-3.0.0:3=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.22.26:3[X,introspection?]
-	selinux? ( >=sys-libs/libselinux-2.0 )
-	>=app-misc/tracker-2.0:=
-	x11-libs/libX11
-	>=dev-libs/libxml2-2.7.8:2
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gdbus-codegen-2.51.2
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.10
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-PDEPEND="
-	gnome? ( x11-themes/adwaita-icon-theme )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk(+)]
-" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
-
-PATCHES=(
-	"${WORKDIR}"/patches # gnome-3-28 + optional introspection
-	"${FILESDIR}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
-)
-
-src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection)
-		-Dprofiling=false
-		-Dextensions=true # image file properties, sendto support
-		$(meson_use packagekit)
-		$(meson_use selinux)
-		-Dtests=$(usex test all none)
-		-Dprofile=default
-	)
-	meson_src_configure
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	meson_src_install
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild b/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild
new file mode 100644
index 000000000000..eeea495a5de9
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="Default file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome gtk-doc +introspection packagekit +previewer seccomp selinux sendto"
+
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.55.1:2
+	>=media-libs/gexiv2-0.10.0
+	>=app-arch/gnome-autoar-0.2.1
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
+	seccomp? ( sys-libs/libseccomp )
+	>=x11-libs/pango-1.28.3
+	selinux? ( >=sys-libs/libselinux-2.0 )
+	>=app-misc/tracker-2.0:=
+	x11-libs/libX11
+	>=dev-libs/libxml2-2.7.8:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gdbus-codegen-2.51.2
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	packagekit? ( app-admin/packagekit-base )
+	seccomp? ( >=sys-apps/bubblewrap-0.3.1 )
+	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+"
+
+PDEPEND="
+	gnome? ( x11-themes/adwaita-icon-theme )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk(+)]
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+	"${FILESDIR}"/${PV}-thumbnailer-updates{,2}.patch # syncs with gnome-desktop; fixes the ld.so.cache for us
+	"${FILESDIR}"/${PV}-seccomp-sparc32.patch # 32-bit sparc doesn't have seccomp either
+	"${FILESDIR}"/${PV}-CVE-2019-11461.patch
+)
+
+src_prepare() {
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dextensions=true # image file properties, sendto support
+		$(meson_use introspection)
+		$(meson_use packagekit)
+		$(meson_use selinux)
+		-Dprofiling=false
+		-Dtests=$(usex test all none)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	meson_src_install
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/nautilus/nautilus-3.30.5.ebuild b/gnome-base/nautilus/nautilus-3.30.5.ebuild
deleted file mode 100644
index 4fd2e7af0498..000000000000
--- a/gnome-base/nautilus/nautilus-3.30.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="Default file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="gnome gtk-doc +introspection packagekit +previewer seccomp selinux sendto"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.55.1:2
-	>=media-libs/gexiv2-0.10.0
-	>=app-arch/gnome-autoar-0.2.1
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
-	seccomp? ( sys-libs/libseccomp )
-	>=x11-libs/pango-1.28.3
-	selinux? ( >=sys-libs/libselinux-2.0 )
-	>=app-misc/tracker-2.0:=
-	x11-libs/libX11
-	>=dev-libs/libxml2-2.7.8:2
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gdbus-codegen-2.51.2
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.10
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	seccomp? ( >=sys-apps/bubblewrap-0.3.1 )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-PDEPEND="
-	gnome? ( x11-themes/adwaita-icon-theme )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk(+)]
-" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
-	"${FILESDIR}"/${PV}-thumbnailer-updates{,2}.patch # syncs with gnome-desktop; fixes the ld.so.cache for us
-	"${FILESDIR}"/${PV}-seccomp-sparc32.patch # 32-bit sparc doesn't have seccomp either
-)
-
-src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dextensions=true # image file properties, sendto support
-		$(meson_use introspection)
-		$(meson_use packagekit)
-		$(meson_use selinux)
-		-Dprofiling=false
-		-Dtests=$(usex test all none)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	meson_src_install
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index f11247d39cbc..4e303196e787 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 0467a7a735a5..aa42815b6ce6 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-boxes-3.30.3.tar.xz 1198224 BLAKE2B 1c65d3f051d32dc85284da4d392e3ec418edf028b61f1166173ac6ced3e6cba687b297ea135a4e54058c561eb5fe69d767e9ee698fb6b16f6bd4cd09b00d5c3a SHA512 fc8a06bb8c71356d50002468f7722aee14abe8432ccce319ada3032746b53eb2f679a93f991c04ae34832a315fc95d561ffc169c4560a23573c046705b5446b4
-EBUILD gnome-boxes-3.30.3.ebuild 3588 BLAKE2B 1db75d21d704d8b70716b274129798517bac3ca0a1b1a81df5580b4ba5b221e0edad68d5ce0d520703318b1a5d035f639df73afb99ea8c2dd177c54264c1b4a4 SHA512 fb3a47a8c5f9398a0a74fd4c966f12e805f03f2ad754b56a10463ea54bacae0165bc7c56850d15179f6ee9cec8205effb7d60b1157f45dbf3f9331dffed0f6db
+EBUILD gnome-boxes-3.30.3.ebuild 3826 BLAKE2B 9c49866a52df0f5c864ce8696c54fbfc40011a0533acc11f6326c2de4d85a265c640adcf05b4c11caa10354f1bf6e13e3bd51cceb41de3219772d2b01002730a SHA512 4eea0fb45ee782b18d0c0b69399c6db6d44d8e8ad6f5a7b8da9f23c707e67f399d0fd2390be8323d13dcf63351c32fa0ea3fcd102098ddb54f9a487dcf516eb2
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild
index 03f1201b29d4..c8bae0bf8db4 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild
@@ -4,6 +4,8 @@
 EAPI=6
 VALA_USE_DEPEND="vapigen"
 VALA_MIN_API_VERSION="0.36"
+# 0.46 has problems with spice-client-glib-2.0.vapi exposing a bad constructor
+VALA_MAX_API_VERSION="0.44"
 
 inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
 
@@ -26,14 +28,14 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.52:2
 	>=dev-libs/gobject-introspection-1.54:=
 	>=x11-libs/gtk+-3.22.20:3[introspection]
-	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+),vala]
-	>=sys-libs/libosinfo-1.1.0[vala]
-	app-crypt/libsecret[vala]
-	>=net-libs/libsoup-2.44:2.4[vala]
+	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
+	>=sys-libs/libosinfo-1.1.0
+	app-crypt/libsecret
+	>=net-libs/libsoup-2.44:2.4
 	virtual/libusb:1
-	>=app-emulation/libvirt-glib-0.2.3[vala]
+	>=app-emulation/libvirt-glib-0.2.3
 	>=dev-libs/libxml2-2.7.8:2
-	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir,vala]
+	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
 	app-misc/tracker:0/2.0
 	net-libs/webkit-gtk:4
 	>=virtual/libgudev-165:=
@@ -41,6 +43,12 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	$(vala_depend)
+	net-libs/gtk-vnc[vala]
+	sys-libs/libosinfo[vala]
+	app-crypt/libsecret[vala]
+	net-libs/libsoup:2.4[vala]
+	app-emulation/libvirt-glib[vala]
+	net-misc/spice-gtk[vala]
 	dev-libs/appstream-glib
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index 2e69153fafcf..70bec757a19a 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-dash-to-panel-19.tar.gz 21031128 BLAKE2B f2df2fa7f4967b03cb99e86740f0738ec805427ef13d7dd1e86296b4ffd1dd2a154ffb7eb8c6a36a8d589b16635fe8f608182ebc11f2708eb1436bdf72097b01 SHA512 f5ab8d5aa397dbf4a7fc5d9e4584016fc5382c026cef6f58649923edf28f0c1f46cb1ec6ff32466ee4cb84b6b0ed30eac1b1924608ad02f34b1c24ec7bb91635
-DIST gnome-shell-extension-dash-to-panel-20.tar.gz 21070416 BLAKE2B 139571ff33413827624c566dd636766d3362b790c55b151dc666446a1719b4c848d2b5bb83822683cfc567f46b71e8ab99faede0c373979ccb941a032187d528 SHA512 42c9c84f05fc5de8bbe425c3dd3ea25c84ed2f670e165c77e53ff97a5e674d5bf04ab8b0b7bf766b91ecd4ae5e7f496e05de0c78ff5a45f980ee456f6389e479
+DIST gnome-shell-extension-dash-to-panel-23.tar.gz 21075058 BLAKE2B 66a48a2ca1379fb423fbd55e68b13dc8e649aceb89676d80893b56e6bda860937946bc981bca110634c975c8712378e5dbdc67f5749a4f5aa70622b75304b71b SHA512 0f8ea1b5b92213046195e88cd6433f15cf05d73712c88def4ffcfe43e75e8fad11df5a25a2b4e2ace9ac0e4b56c151e20931cfa233c39589ee33d1fec1a8499a
 EBUILD gnome-shell-extension-dash-to-panel-19.ebuild 1108 BLAKE2B bc85fc91f2df994f869bbe49c14495d94dec8a8f504488683974f4b1c4ec7d939386ba3f4669b07d97c13879cb0fb646266d09236f469c1f24d401ae952b4b57 SHA512 769eac439990aaffdfa614b5a5b545f991c5b5bd47b54fbb9ec712ec8293043a49c26c48424b20f05f2387797fd27df72e0489cbb3af23b64205b7c181041033
-EBUILD gnome-shell-extension-dash-to-panel-20.ebuild 1114 BLAKE2B ce837677d59cc786647a9e0aa6a247ed8c8e04566a267d01542d0eeb24e768f640a470c5a91acfc61398ad97f5a7dc620d889a44e540a21ef9e9abbfeb5eaec4 SHA512 0c046cd94bbb945323955f5898654a24c81feed16494e36f7212174e278e0a6419927b8c9d554bb77c508df6a80c8ea30c14917bd3abc425933a0fe8e9ecdcc3
+EBUILD gnome-shell-extension-dash-to-panel-23.ebuild 1114 BLAKE2B ce837677d59cc786647a9e0aa6a247ed8c8e04566a267d01542d0eeb24e768f640a470c5a91acfc61398ad97f5a7dc620d889a44e540a21ef9e9abbfeb5eaec4 SHA512 0c046cd94bbb945323955f5898654a24c81feed16494e36f7212174e278e0a6419927b8c9d554bb77c508df6a80c8ea30c14917bd3abc425933a0fe8e9ecdcc3
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-20.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-23.ebuild
index 853e1e9bd641..853e1e9bd641 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-20.ebuild
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-23.ebuild
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
index 465ad32d68b3..2289103f30d6 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
@@ -1,3 +1,5 @@
 DIST desktop-icons-19.01.3.tar.xz 45528 BLAKE2B d556669b521f6d86623c97d89c6b89cba4e9dea4ec512205eee8032dfdccfe39fd2e315367cc2b256b836b48b4ae1ecffa7d6b46a4b016226c485cc3db8d6a53 SHA512 cc8c086672a4537d4ae730b4a139a7148b509dfc148fefb450531c6f2291f02b7a4962df05a07f2b94949d2f68bf72c07fec497a32d0928498bbd345769021c5
+DIST desktop-icons-19.01.4.tar.xz 46712 BLAKE2B 6991d45bf7e8e0373fa42985d5e6a416a3cdbe90abe539dcfc474bbae58763843ec73fb379f4ed69637c31916b1a11ee3e08f4166b691e76691a03d77be33d08 SHA512 db840b2a5a5848c1bf151b59c3c35dba163f23026cc0d0a859cab5746ed15569153c70357dcc9d38637ef1af27a2df0d2e942a97521e4f750265ae4bc6bc1666
 EBUILD gnome-shell-extension-desktop-icons-19.01.3.ebuild 998 BLAKE2B a94fdb5d86683792822ddc4fec086987286528a42f8359ba6620e18286443d11e260c4563e9b873e0b2bfbe484509b99a6289c452a66a94ede216a68a9f8b0ff SHA512 2ecd741492faf9679d6f07f85a9ac94fb770fc567c9817d749be2641704d20fe7eb7e8612e83b8aad7685a33a2aa276fa99deccbdb86001abed3968111705596
+EBUILD gnome-shell-extension-desktop-icons-19.01.4.ebuild 999 BLAKE2B 2aa9797925ebf09ee9fc18e0720119956ec2d1dd8520df88538cc6afd127285b58dbb63331c37656fa1b30dcd4e5e6d226ce8315af76feaa23e28b53c79a742d SHA512 673f051be797936b4d318d6d5fe566246f41f22bcd78da18e784bb8002d73e8be86682385282ec1eb0be0376eac2baf453bab167071500a57615913d43330b37
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-19.01.4.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-19.01.4.ebuild
new file mode 100644
index 000000000000..a84c1a1a3842
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-19.01.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils meson
+
+MY_PN="${PN/gnome-shell-extension-/}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A GNOME Shell extension for providing desktop icons"
+HOMEPAGE="https://gitlab.gnome.org/World/ShellExtensions/desktop-icons"
+SRC_URI="https://gitlab.gnome.org/World/ShellExtensions/${MY_PN}/uploads/2b03561a7d22912930d40a04ddb2bed9/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.30.0
+	>=gnome-base/nautilus-3.30.4
+	sys-apps/xdg-desktop-portal
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index de6761a44938..f21a5ce988f1 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -5,6 +5,6 @@ DIST gucharmap-12.0.1.tar.xz 1678524 BLAKE2B 90923dcb85f132f607007b272f56d091cd5
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
 EBUILD gucharmap-10.0.3.ebuild 1671 BLAKE2B d8c12bc00d5b338edbe768d815b0ba41837c997bf19e1c4f7a74819bd25d4e1f915c95d49b3910f3b334f7659a7f99862fda0a057188f33d364ad9a1439bc096 SHA512 679a8133e468d0925106087accb8e110fb43ca6377d96b7fa2ecbb4168f043f8ed09258c1461ce46a756d49d78879719a2876b44a0a0fca542c5143df837b526
 EBUILD gucharmap-11.0.3.ebuild 1750 BLAKE2B 2b4012a0943298096d79961d2b30d5d4d456dbcda1c075058ed2dc60edc3ecf536647d2eddc8737ba6677e9b3fe066308c37043aace54a6527ee951dafb267d3 SHA512 667b0f42fa95f50f74781f07e81d2c7879ca475781239a89eedab1b2f19be3cb70364c640bf58d2c6eba6756b23847ea0d4cdd9db99efe00786fe380224e730d
-EBUILD gucharmap-12.0.1.ebuild 1735 BLAKE2B 2fb73b3b1a917637f4754988a31c1935d75ca624c52f8eaaf24775ba4d95fd183943e959cfd05100ab751c3d33101640a29f2e2577189b5496231c44b66e8e3b SHA512 f5e68b59f8f785ce1bfb377f352635e2f552d78a63166faca5faacd243a68cc454c030f8844321672fd0960ddb1f6bc3f097ad4f5711c7fd4200388ca5428932
+EBUILD gucharmap-12.0.1.ebuild 1727 BLAKE2B f25892a3d8842b28c5aa3029a9d2b0d5f52a049206685b3823854c21579bd61c16591c692408d494692f459728cb890a57afe5e0caf41321ad3dc49da81a3c79 SHA512 ccde49b6f0696b5a15c2a67b4e92ec4a2dac20c12044bed0c4bf3e911a5d3790c458e26e13b237dab3fb26624ef090c6201d5c41a2c5b208e63db3c73f7100cd
 EBUILD gucharmap-3.0.1-r200.ebuild 1491 BLAKE2B 3ecdcc4e40b9c05ea876c1a25ff8f578144f33905c0ee86b3a384992c16e1169ee24ce6f376e0fdf892d47472a353ab3ecb5ed8e7528bff887be1728100b65ad SHA512 35fadc3a1efac5e157e1215a79b0f05cc1ad20ec1a7b38f6fa382ec6e4de450004a2c3b48a47059e6777b17bfc67bcb05e69a016fb32c7a76f6c5f4e667196ce
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild b/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild
index 5e774f1d6f60..33690218ba8a 100644
--- a/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
 
 LICENSE="GPL-3+"
 SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 
 IUSE="debug +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index a6ae8227648c..55f1e65388b2 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,5 +1,7 @@
 DIST libgsf-1.14.43.tar.xz 618272 BLAKE2B a381125ce75d06ae4bf1c9dbe9b2e207534ff7c3310e40984e482bc5120eae45a7e3ed4cfd878890037f31ee540c700dea3120119b9a533fa79cab317a0c83a8 SHA512 bb487de9358c057fc73f3414c9515726315be9b6d78456253daaca1cbd58281de8766e0b72914532d63fab04d3ae2cf90f711f436c7b4f70620d77e8a7802ac9
 DIST libgsf-1.14.45.tar.xz 618476 BLAKE2B f577859578de6ca359a7377dcced424e95779d3fd155cdbeb1c2874f7a0d0c7a09a2322d2538452b48798ea979e8260be77215140f298dc58ee32a0b9ead0e47 SHA512 2e993150b6fec336a14fd85d5c631e4a3b43187039dab0cba3b8badf62873f39814392db92bb737b92aa9a6d8b4ba41f1fb248c1fe07b88cddd28ded5e4d9ebd
+DIST libgsf-1.14.46.tar.xz 689360 BLAKE2B d5d66e96dc74fa68111781ce9bcbfaed2b8a99f9d2bcb16e32a650e103716633b5def7c93f133538449a3b6d9299e4709ba29bc6a520d5c7fe144bcbf78d3ae1 SHA512 130331f63d48455cc2ce60756e2ac703f8a7f5fa8f1243d9d9321fb87e01bf1d616d085d100a3e5d1cf34fb851ffb77bc642aff6c674ace167b9aa117f4fb1b0
 EBUILD libgsf-1.14.43.ebuild 1000 BLAKE2B ab04bfba11ed11f061bf2074d72b20086e9b3b41edf4ffcd8cf0ce3dc7a8816f61f15c9ed20544123e3f928289782d6f3f61c4ace27a539abe76545b73c38062 SHA512 0426fd92c203dd7a38a1b8a63f169c38d89b8e18d52b7c51db433540619d20574075fa2bccd2ff64eb1fea8b583773d364ac049f7e19782058b9b05c88d08233
-EBUILD libgsf-1.14.45.ebuild 1010 BLAKE2B 8043a19be833dcde9f5a1c1ac239d540fcf5dda856e16ba27de0e6edbd49695e39017ef4b7b60dfe51d4d48e7eb0c5cfaf656fe4f982a89b5347d35945552878 SHA512 bf1a134582156ebd7d88a89fd6d6bcdec9734c5dbe07bf7862716312c3dc04b1ed3b9544b2eb6ceb005b515c80dc6e791f03d52c0d0769299872aa7020308bb0
+EBUILD libgsf-1.14.45.ebuild 1005 BLAKE2B f6112cd864eceb569d3bd719951f2c4a219d787d82dde357f579ac7857381ae12f1e4f751cf76997341457e0f05710cd99a7631d1dba3bc0588cda047c873735 SHA512 68c849f28c5eff6526f7197436431b136e4ae296dacd87cc405d60fa57e5b1970913c64acf45bed51afe115424d9547b12021d603896d9ed737e69d86d131c23
+EBUILD libgsf-1.14.46.ebuild 1010 BLAKE2B 8916d0707ff006845f3c0d103e178567743615103c0f13323eec85d8d072eedf082022216fe580c1517df920fa3efc3da5132f1e90f9263676fd656a219c1218 SHA512 17594b7634342c69976bd1f5e9fe6cc5fedb017c72ae58979e8408b2b56efa2bfe2e554c4bcc1d3d2721c0cf4687bdfdaa70e0acd23bd98c801220b0a684259a
 MISC metadata.xml 320 BLAKE2B 0724d11438ccaab9b8665d8bc0c9787fce2fc77c1d7b45b8400a66bfcf82c904c73dda016327ab27c81eb2c1574a0f568bcc04ed579c5cc0f8f15dc6d52762a7 SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0
diff --git a/gnome-extra/libgsf/libgsf-1.14.45.ebuild b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
index 331e37c87816..e36f75f51eaa 100644
--- a/gnome-extra/libgsf/libgsf-1.14.45.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
@@ -9,11 +9,11 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="
-	>=dev-libs/glib-2.26:2
+	>=dev-libs/glib-2.34:2
 	>=dev-libs/libxml2-2.4.16:2
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
diff --git a/gnome-extra/libgsf/libgsf-1.14.46.ebuild b/gnome-extra/libgsf/libgsf-1.14.46.ebuild
new file mode 100644
index 000000000000..1f6481f81894
--- /dev/null
+++ b/gnome-extra/libgsf/libgsf-1.14.46.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="The GNOME Structured File Library"
+HOMEPAGE="https://developer.gnome.org/gsf/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/114" # libgsf-1.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 gtk +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.34:2
+	>=dev-libs/libxml2-2.4.16:2
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	gtk? (
+		x11-libs/gdk-pixbuf:2
+		virtual/imagemagick-tools
+		)
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	dev-libs/gobject-introspection-common
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_with bzip2 bz2) \
+		$(use_enable introspection) \
+		$(use_with gtk gdk-pixbuf)
+}
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 933e3a21a078..dd43357690d0 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,5 +1,5 @@
 DIST network-manager-applet-1.8.20.tar.xz 1551392 BLAKE2B 91258012715f226467126e4eefdfcd6ebde36958be80ae5e264dbf5168e0b772ce04404030d3f7dac9a6f72088918a2c5160aba694b6b7f7d4d6289b716b76f1 SHA512 5020aefe1803ad3b59562478e793737b52a3e5fd294470cfb430c73937cdbc0be6ecba5f3f8e8dbcc5bb5ac293df2866ecc919dd5019a3e681a434078d235a41
 DIST network-manager-applet-1.8.22.tar.xz 2058500 BLAKE2B e4b31ea3dfe91f07a61b7dd4c34521bc4fc2d7a1b7e5649690336cce0c425d57128ff8011b18a6505893982bfd81170eb8239b9e83de6f91afa11190cfac3b4d SHA512 d2f679a67b79b011762f9249798c5a4ccad3d0fdd01d8d45956a65ab75398ccc07167fc5452748a12294315f729b10115edcb9f11e05475bb0b15b2ade638dd3
 EBUILD nm-applet-1.8.20.ebuild 1652 BLAKE2B 7c46f50db0ade503045cb33d9d267d879718809d4e68f5c810a90acc26293be0e328b3bb81fcf0488292b3439e1aec00fa43ef4da4c2baa6db3f66fbb3ba8355 SHA512 0afd250aa5b7a857f16b37624aa34a5ab8ec85edb0a952757c54ee7221958b5ce2439d23714423d5916d090e9df0d14ab97d2f8fc8d1e117614da9ee0534e87b
-EBUILD nm-applet-1.8.22.ebuild 1654 BLAKE2B e5c25bc5c9f390c8fe6b7edea11097621e5548d191b49a20cae17192edcc174459d4ddb6faf6df91d95122a5edb98c81fd42273253aa6873522b5a59c7735417 SHA512 da8d7c1ff8c3d3f3e6e3121d169ead87d12da1ca510b698aac0a2dce27124750306b1c182a8ee878eeda912d7778fdd0f47c46237e11f33a43f55257bfe4d082
+EBUILD nm-applet-1.8.22.ebuild 1651 BLAKE2B 9cc6a6aec6201209f7c721934bc74810b477ba3df709aad033ff5737c6fcc7ef80459d148fa5ab014769c9aab0cd533cbcfc86bd94da6786225dcb981d56bc78 SHA512 e529d282af870ce6d2b439d8b778fdd2dc948f7ce9234a5c1a793a3731fe5e4c2929909c027d930abe8c5c11bd7037e3fc06efb254c1bdafdb428a77cc44e1cb
 MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild
index 601b8b123ea7..a9669752da59 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=app-crypt/libsecret-0.18
@@ -41,7 +41,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.0
-	>=dev-util/intltool-0.50.1
+	>=sys-devel/gettext-0.18
 	virtual/pkgconfig
 "
 
diff --git a/gnustep-base/Manifest.gz b/gnustep-base/Manifest.gz
index 42c9a5ae0c76..4bce2fd7fe9e 100644
--- a/gnustep-base/Manifest.gz
+++ b/gnustep-base/Manifest.gz
diff --git a/gnustep-base/libobjc2/Manifest b/gnustep-base/libobjc2/Manifest
index dcbe88c07f23..b64c622a9985 100644
--- a/gnustep-base/libobjc2/Manifest
+++ b/gnustep-base/libobjc2/Manifest
@@ -1,6 +1,8 @@
 AUX libobjc2-1.7-fix_soname.patch 1827 BLAKE2B fa716ca39eaa0cb78214922ed5bfac139d1ba1f510791938ffcbad2c1a5c096b04056cda1f25baf3ade2b37d0757516c14a9ac2c77684438852ddf38b11d9e09 SHA512 d6ce4a6840e7f3ea22db3f63574a08fe9fad2fd3ebeaac764097935b322f038baa4ec9d0f19124dd84cb6ffe010e267bdb60f76f5d24dd508f520bdb38124ead
 DIST libobjc2-1.8.1.tar.gz 173635 BLAKE2B 1ed9df6ee934a56dd8565904f9a402f5687bac6f876bcef538fed60c4ebd34af8f35921bdabbdf1ad97fb371e591aea3e47170afaffe65056af07c88e01f0b37 SHA512 518f36e96a82a076fc67fe384226bd97310cd10a53c7b0951db9f3658aa534582b245d5cb97956fe91c38338c3fc8f1e569dd8af36f6d12e32bf1460251d02eb
 DIST libobjc2-1.8.tar.gz 173512 BLAKE2B ba494dd2db2bfdcc2cfce906014d75146368f049ebe4ea6b83024705af2b78f916252a084b95be43c245c5fd6574d00db75853d291193ea70cc48a6b5dbeab93 SHA512 1562e42dc43a24c1655d02db7aa101a48a7b026bec23252c8eec3893fbac0d67368685291df0954ee79f07b92ecc13c68ee7c7b0f351428a31e99ed05ed2230d
+DIST libobjc2-2.0.tar.gz 191800 BLAKE2B 71f54b1410e20bb638dce4cae8c2cc48ea07acf31a97f1994587a9f6401b725ac393abaef355e9476ef6a0622d80fb6fbe4b3c7f39294e7bedbba17cd4108278 SHA512 2b72506204b8fea6a76688ee96611613c4b7cf98942acc89905c531f4dc997ae0482ff10fa819c2471df6c06d5ebcd251167d8903a4f18d47507cd42baec3748
 EBUILD libobjc2-1.8.1.ebuild 967 BLAKE2B 2a889a88c29b8442f65361cbfbbc1bf2cda8323685ef3fa8c9643e46e34d523f1bafa4a663a9565426973c87c07cbb4d8e14ff0b10a46dab5c83c280ee8717ac SHA512 d7118b2b81816fd965251a3d19e246b1b6393c6f3fc8b83772dae17e3a61ea9be39f9714e8c4fbb26f861fafdb7f677bf8728a36cd4eaf252650b6c8a4f9ef20
 EBUILD libobjc2-1.8.ebuild 967 BLAKE2B 2a889a88c29b8442f65361cbfbbc1bf2cda8323685ef3fa8c9643e46e34d523f1bafa4a663a9565426973c87c07cbb4d8e14ff0b10a46dab5c83c280ee8717ac SHA512 d7118b2b81816fd965251a3d19e246b1b6393c6f3fc8b83772dae17e3a61ea9be39f9714e8c4fbb26f861fafdb7f677bf8728a36cd4eaf252650b6c8a4f9ef20
+EBUILD libobjc2-2.0.ebuild 675 BLAKE2B 73f3d5ab07fe2fccee156224dd423e1bcf80863c158589e5d2b565aeab82e999a94c965af461b04c47bd19c5702ac08556be4ecf05923fe70e897656e09d4e18 SHA512 8986ecb091a02f44fcc0cbfc5195638fa07ba72743e639b61f58b78e750f8f8de1b8886b10469f626333777c8ad7835eeb8183b7ee5a21768a75f740cd48eb84
 MISC metadata.xml 1348 BLAKE2B b5eec1f6af50d0a90d62c6dce21fe14b6c20ec7d534ac49030bbc89bb2f5665af7d40750386f84d3aedb67802807e25ad04f824c7b6908e41a3de256c07dead3 SHA512 5adcc9a3d5527c5e86da2ae7884f334d68ebd884b26e9f0d3329af7c877921c90bef4f77d8c535c82102e3bacb5a199e5fd940471036004f66858850040ee936
diff --git a/gnustep-base/libobjc2/libobjc2-2.0.ebuild b/gnustep-base/libobjc2/libobjc2-2.0.ebuild
new file mode 100644
index 000000000000..2d26e238d117
--- /dev/null
+++ b/gnustep-base/libobjc2/libobjc2-2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils eutils
+
+DESCRIPTION="GNUstep Objective-C runtime"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="https://github.com/gnustep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boehm-gc test"
+
+RDEPEND="boehm-gc? ( dev-libs/boehm-gc )
+	sys-libs/libcxx"
+BDEPEND="${RDEPEND}
+	sys-devel/clang"
+
+src_configure() {
+	export CC="clang"
+	export CXX="clang++"
+	local mycmakeargs=(
+		-DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND
+		-DBOEHM_GC="$(usex boehm-gc)"
+		-DTESTS="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/gnustep-libs/Manifest.gz b/gnustep-libs/Manifest.gz
index 98dd03aa81d3..6f3182dca80d 100644
--- a/gnustep-libs/Manifest.gz
+++ b/gnustep-libs/Manifest.gz
diff --git a/gnustep-libs/sope/Manifest b/gnustep-libs/sope/Manifest
index 1654d5648693..e36d4a2630cd 100644
--- a/gnustep-libs/sope/Manifest
+++ b/gnustep-libs/sope/Manifest
@@ -1,7 +1,7 @@
 DIST sope-3.2.10.tar.gz 2197170 BLAKE2B 29c3400d3162b2bd659d06fbd806fcfa3307fbf6f00048567e26c3fdac5e492bd511773b402f79b92db457e9dc995b5dadd5dc84baf6cbd89b463ae5e4d65457 SHA512 09c0e8ca7333e89c48e30b19dc3bbacca5a28688145848ff332ff304f92a791b3895774e5fd1f77c6d4c8615ecb5a461ba348792502fc7c5bbd9d445a191bccf
 DIST sope-3.2.9.tar.gz 2196831 BLAKE2B 9f62310ed61893d85d38f192b5639de44a8e6240463563c64e9c0551624c9bfafdddad5e6a819f15cf7fa12842d55fe417bff3972fe42fe07ac8e99655d90730 SHA512 ffa3d63eed5862aba9740ab84408297218ad6cd75b0dc7e40f2810366281bf139c55e27c11405b51dc1cf640d5f5434ee14c2d5f1d0384ad50684c23d8bc58b7
 DIST sope-4.0.7.tar.gz 2200743 BLAKE2B 1ab31ca92821b5febbcfa7776292a565216e40d6fdbe9afdf8bb97bb445a654716d3abd4736821b881cb464c3b7e46353910ab38fd853f89581eb248db0155d3 SHA512 6d723278f714f01b215e7b0cf046008b6448c84daddde4ad1f3434b8154a8bcede3adaa11c980b4f4b9c4950a07d545185483cf8ba75a8bac91e86437dc6e74b
-EBUILD sope-3.2.10.ebuild 1414 BLAKE2B e2cb7e5db51c0cc02c34a5bac89443227d319b3a8cd83aaf93b55c9147633a3b15036c5d92ccca93d061f0a0542dc2169152849e52048bbea094c4f92f7984ba SHA512 631d0864daf4e5ff495e1d5f99ce2421ec811d8501a8f340ee21125ff4e1adf0040e43d674a62bdee192b8536c0292321dfc922845547eeb15175b7d5879288c
-EBUILD sope-3.2.9.ebuild 1414 BLAKE2B e2cb7e5db51c0cc02c34a5bac89443227d319b3a8cd83aaf93b55c9147633a3b15036c5d92ccca93d061f0a0542dc2169152849e52048bbea094c4f92f7984ba SHA512 631d0864daf4e5ff495e1d5f99ce2421ec811d8501a8f340ee21125ff4e1adf0040e43d674a62bdee192b8536c0292321dfc922845547eeb15175b7d5879288c
-EBUILD sope-4.0.7.ebuild 1404 BLAKE2B c67faff9b6a46bc792906d16a793baedaef7224e7229a765327baade767c264114f27f25e817ed00f29ebbfef9b94d143496fea5084e5349ada4720f5a2b34ca SHA512 caef9ecda7869040693f6a78e100f74ff14feac1fde4c5a1b05d5789788ddf94db2059f39802d36aa4db3c4642b4bfe9d9f28132c46bec71cda0dd9fc31d83fa
+EBUILD sope-3.2.10-r1.ebuild 1413 BLAKE2B 3013864e19a8b6310d6b7a82060cb276a3c43260174e9a39f57ee5b7a4c5796b179c5ec91d9c24beeb8620e44331a17419a5f854f51e0c287e3b6f1d84f16d89 SHA512 262f3192d8bde623aa21e9cc933bfda5baf82a3e36e4e257d287ad297c78261152bc6d4d31b9dead888adea4d09202954831a1a558ebb05d2783d5d302e2c5be
+EBUILD sope-3.2.9-r1.ebuild 1413 BLAKE2B 3013864e19a8b6310d6b7a82060cb276a3c43260174e9a39f57ee5b7a4c5796b179c5ec91d9c24beeb8620e44331a17419a5f854f51e0c287e3b6f1d84f16d89 SHA512 262f3192d8bde623aa21e9cc933bfda5baf82a3e36e4e257d287ad297c78261152bc6d4d31b9dead888adea4d09202954831a1a558ebb05d2783d5d302e2c5be
+EBUILD sope-4.0.7-r1.ebuild 1406 BLAKE2B 8af61ba1053bf903820f6ee4b0664f28717f81fce7cc632b8324047560f28004b1c043e7ba3041b6d3f64a227eae889b3e545012d43a36b8cdb7a729d0ffa2f2 SHA512 adbfbbe520d2d80cc55a6951ef77d629c9274101f8e96965542b46598c2c0aa356c78d76e7bf7addede71c21f285bb0f0b9e554b2b91a88cd8f8a34546100f79
 MISC metadata.xml 338 BLAKE2B 778923ce9f2ef340d1f94591335d22e66ded0142a5bb7df161623cc91500b6007075be983ea922332fa4ee589df24f19af02ffe0dbf0f210e19c9b97fa606ab1 SHA512 a7c98f2d5afa3daa9258b11fd90b3d68c44d523594736a4374df888ad2180147c6bdcf53d8195f69c6b1f2c05ba69d7da266af7f7d18d0e155580ab606f4524c
diff --git a/gnustep-libs/sope/sope-3.2.10-r1.ebuild b/gnustep-libs/sope/sope-3.2.10-r1.ebuild
new file mode 100644
index 000000000000..7e1b88530cab
--- /dev/null
+++ b/gnustep-libs/sope/sope-3.2.10-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnustep-2 vcs-snapshot
+
+DESCRIPTION="A set of frameworks forming a complete Web application server environment"
+HOMEPAGE="http://www.sogo.nu/"
+SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
+
+RDEPEND="
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	xml? ( dev-libs/libxml2:2 )
+"
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+src_configure() {
+	local ssl_provider
+	if use ssl ; then
+		if use gnutls ; then
+			ssl_provider=gnutls
+		else
+			ssl_provider=ssl
+		fi
+	else
+		ssl_provider=none
+	fi
+
+	egnustep_env
+
+	# Non-standard configure script
+	./configure \
+		--disable-strip \
+		$(use_enable debug) \
+		$(use_enable ldap openldap) \
+		$(use_enable mysql) \
+		$(use_enable postgres postgresql) \
+		$(use_enable xml) \
+		--with-ssl="${ssl_provider}" \
+		--with-gnustep || die "configure failed"
+}
diff --git a/gnustep-libs/sope/sope-3.2.10.ebuild b/gnustep-libs/sope/sope-3.2.10.ebuild
deleted file mode 100644
index 550358b4884d..000000000000
--- a/gnustep-libs/sope/sope-3.2.10.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnustep-2 vcs-snapshot
-
-DESCRIPTION="A set of frameworks forming a complete Web application server environment"
-HOMEPAGE="http://www.sogo.nu/"
-SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
-
-RDEPEND="
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	mysql? ( virtual/libmysqlclient:= )
-	postgres? ( dev-db/postgresql:= )
-	xml? ( dev-libs/libxml2:2 )
-"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	if use ssl && use gnutls && use libressl ; then
-		ewarn "You have enabled both gnutls and libressl, but only"
-		ewarn "one provider can be active. Using gnutls!"
-	fi
-}
-
-src_configure() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	# Non-standard configure script
-	./configure \
-		--disable-strip \
-		$(use_enable debug) \
-		$(use_enable ldap openldap) \
-		$(use_enable mysql) \
-		$(use_enable postgres postgresql) \
-		$(use_enable xml) \
-		--with-ssl="${ssl_provider}" \
-		--with-gnustep || die "configure failed"
-}
diff --git a/gnustep-libs/sope/sope-3.2.9-r1.ebuild b/gnustep-libs/sope/sope-3.2.9-r1.ebuild
new file mode 100644
index 000000000000..7e1b88530cab
--- /dev/null
+++ b/gnustep-libs/sope/sope-3.2.9-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnustep-2 vcs-snapshot
+
+DESCRIPTION="A set of frameworks forming a complete Web application server environment"
+HOMEPAGE="http://www.sogo.nu/"
+SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
+
+RDEPEND="
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	xml? ( dev-libs/libxml2:2 )
+"
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+src_configure() {
+	local ssl_provider
+	if use ssl ; then
+		if use gnutls ; then
+			ssl_provider=gnutls
+		else
+			ssl_provider=ssl
+		fi
+	else
+		ssl_provider=none
+	fi
+
+	egnustep_env
+
+	# Non-standard configure script
+	./configure \
+		--disable-strip \
+		$(use_enable debug) \
+		$(use_enable ldap openldap) \
+		$(use_enable mysql) \
+		$(use_enable postgres postgresql) \
+		$(use_enable xml) \
+		--with-ssl="${ssl_provider}" \
+		--with-gnustep || die "configure failed"
+}
diff --git a/gnustep-libs/sope/sope-3.2.9.ebuild b/gnustep-libs/sope/sope-3.2.9.ebuild
deleted file mode 100644
index 550358b4884d..000000000000
--- a/gnustep-libs/sope/sope-3.2.9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnustep-2 vcs-snapshot
-
-DESCRIPTION="A set of frameworks forming a complete Web application server environment"
-HOMEPAGE="http://www.sogo.nu/"
-SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
-
-RDEPEND="
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	mysql? ( virtual/libmysqlclient:= )
-	postgres? ( dev-db/postgresql:= )
-	xml? ( dev-libs/libxml2:2 )
-"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	if use ssl && use gnutls && use libressl ; then
-		ewarn "You have enabled both gnutls and libressl, but only"
-		ewarn "one provider can be active. Using gnutls!"
-	fi
-}
-
-src_configure() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	# Non-standard configure script
-	./configure \
-		--disable-strip \
-		$(use_enable debug) \
-		$(use_enable ldap openldap) \
-		$(use_enable mysql) \
-		$(use_enable postgres postgresql) \
-		$(use_enable xml) \
-		--with-ssl="${ssl_provider}" \
-		--with-gnustep || die "configure failed"
-}
diff --git a/gnustep-libs/sope/sope-4.0.7-r1.ebuild b/gnustep-libs/sope/sope-4.0.7-r1.ebuild
new file mode 100644
index 000000000000..cbe33b68f8f9
--- /dev/null
+++ b/gnustep-libs/sope/sope-4.0.7-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnustep-2 vcs-snapshot
+
+DESCRIPTION="A set of frameworks forming a complete Web application server environment"
+HOMEPAGE="http://www.sogo.nu/"
+SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
+
+RDEPEND="
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	xml? ( dev-libs/libxml2:2 )
+"
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+src_configure() {
+	local ssl_provider
+	if use ssl ; then
+		if use gnutls ; then
+			ssl_provider=gnutls
+		else
+			ssl_provider=ssl
+		fi
+	else
+		ssl_provider=none
+	fi
+
+	egnustep_env
+
+	# Non-standard configure script
+	./configure \
+		--disable-strip \
+		$(use_enable debug) \
+		$(use_enable ldap openldap) \
+		$(use_enable mysql) \
+		$(use_enable postgres postgresql) \
+		$(use_enable xml) \
+		--with-ssl="${ssl_provider}" \
+		--with-gnustep || die "configure failed"
+}
diff --git a/gnustep-libs/sope/sope-4.0.7.ebuild b/gnustep-libs/sope/sope-4.0.7.ebuild
deleted file mode 100644
index 65255d6c6297..000000000000
--- a/gnustep-libs/sope/sope-4.0.7.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
-
-inherit gnustep-2 vcs-snapshot
-
-DESCRIPTION="A set of frameworks forming a complete Web application server environment"
-HOMEPAGE="http://www.sogo.nu/"
-SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
-
-RDEPEND="
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	mysql? ( virtual/libmysqlclient:= )
-	postgres? ( dev-db/postgresql:= )
-	xml? ( dev-libs/libxml2:2 )
-"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	if use ssl && use gnutls && use libressl ; then
-		ewarn "You have enabled both gnutls and libressl, but only"
-		ewarn "one provider can be active. Using gnutls!"
-	fi
-}
-
-src_configure() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	# Non-standard configure script
-	./configure \
-		--disable-strip \
-		$(use_enable debug) \
-		$(use_enable ldap openldap) \
-		$(use_enable mysql) \
-		$(use_enable postgres postgresql) \
-		$(use_enable xml) \
-		--with-ssl="${ssl_provider}" \
-		--with-gnustep || die "configure failed"
-}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index fbbae298e37b..6454fda74001 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/mako/Manifest b/gui-apps/mako/Manifest
index 0edbf0d97915..dd3eae60b60a 100644
--- a/gui-apps/mako/Manifest
+++ b/gui-apps/mako/Manifest
@@ -1,6 +1,6 @@
 DIST mako-1.3.tar.gz 46482 BLAKE2B ea7699f713aded0476f3a9b88d90fa8d3bbd4e64e888caa68a98208625cdd15f1261c389dcb8ab43c6fbc77e1ebc0840b378443a1b350ff16adc59b98b9be0a8 SHA512 efada6ac413d80949669df3124ab9979537dcedd535132de57338b484ff2c81da8da59503a14dc2e9bbb266101659dd1d399d66456d383fdd1853d9137587259
 DIST mako-1.4.tar.gz 48418 BLAKE2B ebd3c2f6fb7d51df826cab469c3e12477ec4503e3dfdfb4e9700393c0d994f6d7fcce6f3471d5faf90c5eb4bfa766941b97b0c8a8a556b5639ad5f3612df3082 SHA512 6059103e3a0c0cca5b0f717fbd7522f9a13f3dd3d65fe674e65cc175122a3372041bee2050d253ccb47a2adaa1dfa3180a19276bcdcb20c1e00813d75e1b3683
 EBUILD mako-1.3.ebuild 891 BLAKE2B 428e070928f0ed53fcd04655625b5098a639adb7bc5cf5ca6a2e355799147d9b4e7d7d81c87aeaac01f90a6a01be2cd6853097025879193b86cec3642cf44432 SHA512 48c897b77b1cb6ca55124eba4b9c7763878e48a70ae84514f57f64e66c8f7376b79f64f99ab9c52b92d973f1bb5814ee4ac0dc2ca0cb88afeb6597626b387175
-EBUILD mako-1.4.ebuild 894 BLAKE2B 5d7a5aa5cbac293bc0b1f9e0e5bed07c38a2c2548da92a95c907f48c2ce310fd20f88e695bbd956be3044178a268198abcffb62c104b1ca075318528981baa50 SHA512 c30b91982ab4b20a31831a16df7807a14ad46fcfab6ad5f6b7a7ff6ca28b54188abc95dec2c08aac90bbd132a815b1ec88fd106d6a3a1d682938b645791524c0
+EBUILD mako-1.4.ebuild 891 BLAKE2B 428e070928f0ed53fcd04655625b5098a639adb7bc5cf5ca6a2e355799147d9b4e7d7d81c87aeaac01f90a6a01be2cd6853097025879193b86cec3642cf44432 SHA512 48c897b77b1cb6ca55124eba4b9c7763878e48a70ae84514f57f64e66c8f7376b79f64f99ab9c52b92d973f1bb5814ee4ac0dc2ca0cb88afeb6597626b387175
 EBUILD mako-9999.ebuild 894 BLAKE2B 5d7a5aa5cbac293bc0b1f9e0e5bed07c38a2c2548da92a95c907f48c2ce310fd20f88e695bbd956be3044178a268198abcffb62c104b1ca075318528981baa50 SHA512 c30b91982ab4b20a31831a16df7807a14ad46fcfab6ad5f6b7a7ff6ca28b54188abc95dec2c08aac90bbd132a815b1ec88fd106d6a3a1d682938b645791524c0
 MISC metadata.xml 642 BLAKE2B 4b96d18b0cf351347a12d6e520d7aace4de2f7df8532953288dcfa2549cde936417b73499e0d0b7debd7716d1b49431db6529a213da0b69491df081400af8ae8 SHA512 51c3f7458f486883613916701f721045c3f7f82c9be1b8feb781632e38489e08c1d84411daaf56e01bc07d06c3b1c1683f55a79a51b4d6fd0f522ce97d303c8a
diff --git a/gui-apps/mako/mako-1.4.ebuild b/gui-apps/mako/mako-1.4.ebuild
index 60eca46bf3e5..3b9ffdde2139 100644
--- a/gui-apps/mako/mako-1.4.ebuild
+++ b/gui-apps/mako/mako-1.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
 else
 	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index 0091a7abf7cc..78f183f467f4 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,4 +1,4 @@
 DIST waybar-0.7.2.tar.gz 101206 BLAKE2B d44b46c840094340e1e5f70d4ef3d01faf483a8c744ce6b549c1fa8767bf455c4c0ef67b564c61795e44c652d37c09848cce6f50ee3664de73477da6b4bce84e SHA512 d83f92d0111cdd01b276907fad18344dbf35be1e0bbbce2208f928e0d5e0fcccfa65ff2279de5a7e4dad5f04a6c99521670d75d65e32a0382bec2bf32eea00e2
-EBUILD waybar-0.7.2.ebuild 1306 BLAKE2B 2b228ed2e336e1a189c9133e52a8fa1b787655948e53282e77bd03f3c278306c9296bb2cb3ae822d925f8f4d1d122cd9445e7a84de83e20e8b3dd06f4d8b2179 SHA512 62faf6e28f4f5ee0aa25557bffc898357a169f30b87f59baa598403c92e58f8e7574b2c3a58aa48eb353ebac9d44ce1db746ab715ec75f45b3de0ad4526681a4
-EBUILD waybar-9999.ebuild 1306 BLAKE2B 2b228ed2e336e1a189c9133e52a8fa1b787655948e53282e77bd03f3c278306c9296bb2cb3ae822d925f8f4d1d122cd9445e7a84de83e20e8b3dd06f4d8b2179 SHA512 62faf6e28f4f5ee0aa25557bffc898357a169f30b87f59baa598403c92e58f8e7574b2c3a58aa48eb353ebac9d44ce1db746ab715ec75f45b3de0ad4526681a4
+EBUILD waybar-0.7.2-r1.ebuild 1308 BLAKE2B 82a7f8be5413cd2a4c72344853ff8a8ce9a9889ff72f0603c0f4b222479cc9d192e52923171fe16f5d076f240c6c693d9e9db2af75e96aba39bc8c44ea645853 SHA512 14f9d375ec051c64eeb38891283bf9cf4068db4c8954feb490a87e26d987f19517f0c44fbbbb68c37627a20d0d757245276b76962baa58cd74a83acfd466db16
+EBUILD waybar-9999.ebuild 1308 BLAKE2B 82a7f8be5413cd2a4c72344853ff8a8ce9a9889ff72f0603c0f4b222479cc9d192e52923171fe16f5d076f240c6c693d9e9db2af75e96aba39bc8c44ea645853 SHA512 14f9d375ec051c64eeb38891283bf9cf4068db4c8954feb490a87e26d987f19517f0c44fbbbb68c37627a20d0d757245276b76962baa58cd74a83acfd466db16
 MISC metadata.xml 1090 BLAKE2B 5715f34c1493cb3c3b32697c30abe64c40dd28eec3cac3db8bd9c12b288c11d32ed21b8e11f744b8d9401965e29807a2126885f441f038e923b6c2357b8adea7 SHA512 b8dd49c8c049fcc4bf914e1aaa3ec178f59a3cb1094bb0130b2127016033fd2fb1e684e263412d1527159569c899dbe1720ccb5886dc31cb7a54da4f72ccabea
diff --git a/gui-apps/waybar/waybar-0.7.2-r1.ebuild b/gui-apps/waybar/waybar-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..c26192592d71
--- /dev/null
+++ b/gui-apps/waybar/waybar-0.7.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Highly customizable Wayland bar for Sway and Wlroots based compositors."
+HOMEPAGE="https://github.com/Alexays/Waybar"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Alexays/${PN^}.git"
+else
+	SRC_URI="https://github.com/Alexays/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="libcxx mpd network pulseaudio tray +udev"
+
+DEPEND="
+	dev-cpp/gtkmm:3.0
+	dev-libs/jsoncpp:=
+	dev-libs/libinput:=
+	dev-libs/libsigc++:2
+	>=dev-libs/libfmt-5.3.0:0/5
+	>=dev-libs/spdlog-1.3.1:=
+	dev-libs/wayland
+	dev-libs/wayland-protocols
+	gui-libs/wlroots
+	libcxx? ( sys-libs/libcxx )
+	mpd? ( media-libs/libmpdclient )
+	network? ( dev-libs/libnl:3 )
+	pulseaudio? ( media-sound/pulseaudio )
+	tray? ( dev-libs/libdbusmenu[gtk3] )
+	udev? ( virtual/libudev:= )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} != 9999 ]]; then
+	S="${WORKDIR}/${PN^}-${PV}"
+fi
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use libcxx)
+		$(meson_feature mpd)
+		$(meson_feature network libnl)
+		$(meson_feature pulseaudio)
+		$(meson_feature tray dbusmenu-gtk)
+		$(meson_feature udev libudev)
+	)
+	meson_src_configure
+}
diff --git a/gui-apps/waybar/waybar-0.7.2.ebuild b/gui-apps/waybar/waybar-0.7.2.ebuild
deleted file mode 100644
index fc844ec121d2..000000000000
--- a/gui-apps/waybar/waybar-0.7.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Highly customizable Wayland bar for Sway and Wlroots based compositors."
-HOMEPAGE="https://github.com/Alexays/Waybar"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Alexays/${PN^}.git"
-else
-	SRC_URI="https://github.com/Alexays/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="libcxx mpd network pulseaudio tray +udev"
-
-DEPEND="
-	dev-cpp/gtkmm:3.0
-	dev-libs/jsoncpp:=
-	dev-libs/libinput:=
-	dev-libs/libsigc++:2
-	>=dev-libs/libfmt-5.3.0:=
-	>=dev-libs/spdlog-1.3.1:=
-	dev-libs/wayland
-	dev-libs/wayland-protocols
-	gui-libs/wlroots
-	libcxx? ( sys-libs/libcxx )
-	mpd? ( media-libs/libmpdclient )
-	network? ( dev-libs/libnl:3 )
-	pulseaudio? ( media-sound/pulseaudio )
-	tray? ( dev-libs/libdbusmenu[gtk3] )
-	udev? ( virtual/libudev:= )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-if [[ ${PV} != 9999 ]]; then
-	S="${WORKDIR}/${PN^}-${PV}"
-fi
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use libcxx)
-		$(meson_feature mpd)
-		$(meson_feature network libnl)
-		$(meson_feature pulseaudio)
-		$(meson_feature tray dbusmenu-gtk)
-		$(meson_feature udev libudev)
-	)
-	meson_src_configure
-}
diff --git a/gui-apps/waybar/waybar-9999.ebuild b/gui-apps/waybar/waybar-9999.ebuild
index fc844ec121d2..c26192592d71 100644
--- a/gui-apps/waybar/waybar-9999.ebuild
+++ b/gui-apps/waybar/waybar-9999.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	dev-libs/jsoncpp:=
 	dev-libs/libinput:=
 	dev-libs/libsigc++:2
-	>=dev-libs/libfmt-5.3.0:=
+	>=dev-libs/libfmt-5.3.0:0/5
 	>=dev-libs/spdlog-1.3.1:=
 	dev-libs/wayland
 	dev-libs/wayland-protocols
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 659243237d37..8338bc601fa8 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index d8de0083499f..1a0037ddc33f 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,3 +1,3 @@
 DIST libhandy-v0.0.9.tar.bz2 110100 BLAKE2B c1abf60b37d76a0b2f0ed82152decc9a87c9feff664af8df91ede192018a70003ac7ff3c1307668e7196089f59bb5dc21d1449ccc1deb3e2e362f32ff8f9f30b SHA512 d3256c2ff49a7fd0ccfec14ba3e34ed51577841c1670902d25f2a0166e63820428e689c722dddbccf787e1380c7f9a8ddc5b9042a1632b688b151ecce0f6d262
-EBUILD libhandy-0.0.9.ebuild 1488 BLAKE2B 6884b6ab7e679f9e377a07fade5656f0a6eff48c571c7e7a8705a745569bd1db9f04611567bfd92dcd4fb2fd47274671c6b3e1a4bf16b00dd3741c4d13f8e4ec SHA512 2316886ff4e88d850e1f2692536e25605e739a3347905ed010a17fbf06ea2e575184c5955f12ea5a931af3278616f78c897292efcbe9d5d554b1d1f4233c8afd
+EBUILD libhandy-0.0.9.ebuild 1495 BLAKE2B 7eb524a9c74404b33949bc8370794e5dde32301e30b9341960d53a329a952fe244e3d39d0c415d9640d019e7c779701722a5d1683beba0645b5c9bec46b03a4b SHA512 7a8aa99457caa98ce6aba13b5507df42ae16045bfe083519efd320cd22e4dd8e3f87c340db479b156a67c51c2022727c04e6ccf8cc2047f7fd9be89f5e3bfdf4
 MISC metadata.xml 474 BLAKE2B b8fba1ac64b79eaadbd70099133bc57a69be78738b9da3742ac9381286f62e5198b5b6dc5bf51dd5a11e0ea06819d3ccc00157f7f69939f18db18016db47705a SHA512 d9c79fbc1e8549dcdf6e42263040844efd729440d725df7c8f06bdf5e6c8da0de8f24186c94a2444e03f4396aaa1e4043d1893996770cfa2e5ea9f1b0ca71b4a
diff --git a/gui-libs/libhandy/libhandy-0.0.9.ebuild b/gui-libs/libhandy/libhandy-0.0.9.ebuild
index 06eafda4c3dc..5e89a43e4027 100644
--- a/gui-libs/libhandy/libhandy-0.0.9.ebuild
+++ b/gui-libs/libhandy/libhandy-0.0.9.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2.1+"
 SLOT="0.0/0" # It may or may not break ABI in future versions at this point; if new
 # SLOT happens, it'll likely file conflict on gtk-doc and glade library and catalog
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 IUSE="examples glade gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index 8df1a1788c27..41599b95fa79 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,8 +1,10 @@
 DIST wlroots-0.4.1.tar.gz 480127 BLAKE2B f193860ef9e0852b053270bdaa44b491a8c65a76dc01c71690f7a006eac46e606cca95675e6dec4d65487d9b98bcabb7cd12578f028a9cb9c5cd648e47754df4 SHA512 bd8863c7f285579d81b9372f1335c10eb2d0fd7b46b7589e6b2acad53fa373f2e3b549d2c31876d87d66851af0415a12a011a05953ffe2384b718db6d95cba2e
 DIST wlroots-0.5.0.tar.gz 481154 BLAKE2B 094c7c92191ea9c581debc90fa7b0117ed15328c11a098e53cec05b326e84c54481a69382ef9a592337ade370ffb55ea98b545794471808dee9f41ee9db8194f SHA512 4defecff91a6179d3a6b7d05c92c14b20c7fa69263a889869912e913a5d1e29f9fd4684f9816b03e2427a21c004d64236f35d8282e02e8d27d826442f1f8b3a7
 DIST wlroots-0.6.0.tar.gz 497934 BLAKE2B a0b631831752e533f83ed62e402ef69b0994df050fd643cf2ef89556face4a822b3936bc758b70ab160eedda8ced16c0992dc209600914095784bba97bd26ee2 SHA512 c205d4303a381e11ef2f4db2faac1ddf9ad85c675824aae9cfe62d9f8bd313f1568d4810db1d006416783b50c8364198648a46d1ba453a0d8f659d6920618286
+DIST wlroots-0.7.0.tar.gz 446392 BLAKE2B ed69ae2e5484428222cd430d7c74935b0801044cacab804ffe3673c5ecf08104a5fbfbaa930c8ef4df3e43de1073910ba970028307a0a3c57483c5d502832292 SHA512 20e7e81bb945cc683c793f1258e83dbeea5e933faa066125f16a24aa7151000c620f9f47cad21540f8bea7d053d181cb89a2803c30fac1b1b9f3345065b9ba9c
 EBUILD wlroots-0.4.1.ebuild 2556 BLAKE2B 387bad0c2177db317674eca833112491e6a9fb78dfe1f6f652450a557bcc5ef65c575f0024b069e6b93122b94e6fc180f8d046ee4d83c2be571150458fdb8868 SHA512 4c57f85f868d258bbe8168137f4e5f639dd617ab994a93324a115ed31e3ff2dddd802bc787cada563df8df780cd7a4ad3d1a57cf2b64c6408c862ffa64178c41
 EBUILD wlroots-0.5.0.ebuild 2560 BLAKE2B 888dbb482966d512c7c448ef30061acf9bf19f311cb1cede67eb51d4969236f366980b2d13a852a6a19e5ed0dfd3969abb739796b3ba77556a70447245ec6ac2 SHA512 60e2b90b688e7e62e1a34077e5edbf07c1103da4d9198fb224b511b01a78c98011a835e6f547388646b337509f912d93ef674e919a08da2c24a6383ce74d0f21
 EBUILD wlroots-0.6.0.ebuild 2560 BLAKE2B 76b28e33dbe932fe89160a4806a46d3f1de2118ea05545d2248f3c7ddf59609bcd339dbe34673054943e7ca37360d3dec773630f0e2a4dde803062aa14facab3 SHA512 aebd49d399a8989d56bd2e08291da1af80432ec9cf642446bc5aa6f71c8c63d9f3467243fd43d216693831dfa432e1ba4be494a79b999254e6a741e730559ff6
-EBUILD wlroots-9999.ebuild 2563 BLAKE2B 3702306601cfb39e3d3e6719cfa75e6c23ee7f35814c804a4eb9997bcc004b5ff57f328d17625bd1313ca7898ee86211a3f1857c401886e39d9971443ccd478e SHA512 9c69220a61469efe672e06414dbdac04e7dbf25eb5b3e8cda4696752b0604421144b167cf5836ef413d500427edcc5a7d02dbc821027f3952bcb385cb310d6ad
+EBUILD wlroots-0.7.0.ebuild 1833 BLAKE2B 96d2a4b32d8edf49397d7fdcbedbbc1940779b8e3189ec3698ebd73edb60b6350f8afe1559b0aa05a8abf29ae4d491e1f44df23b96fd5f07c134110c5148cef6 SHA512 99359af1e856d3fcad3537784419ae30d9eb51c7e40be94c84ad271b259d33f283ba1b43517120add1a9806d4d6390bf345b24956e8044035b5fff4f428264a3
+EBUILD wlroots-9999.ebuild 1836 BLAKE2B f18c1cba6f5a79b8824fa62280360efbd4c89c67f0b4ae1a83fc3aa5fd2a9dc5e5e12855c8e6a542b66b682405dd98c479d7043b2e687f7bf8b37305c7d6c6f3 SHA512 291b7060c3f782d26176fc38af7286c902283b3b20c64a50726368549f048e26b1b6666e442dc445f7a54a6f266f2e525cfd42a1e0615d52e4010108f217da81
 MISC metadata.xml 1680 BLAKE2B efccd1082ca2c3a0b815c52b1879ba2b98eddf23fd0fe493084b174b2dd04cf91857df06b9e4751df102af1fa9162575e0912949421f72036b59fe725d39f82a SHA512 85106bc31308eebe98a297c5860734a756005ed80d9e2b3506d3785e96cb4b0424d622f926330883178e4020b902eafee9ce696eee3f16103ce058ca053f341e
diff --git a/gui-libs/wlroots/wlroots-0.7.0.ebuild b/gui-libs/wlroots/wlroots-0.7.0.ebuild
new file mode 100644
index 000000000000..2e9ec3279126
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.7.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://github.com/swaywm/wlroots"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/7"
+IUSE="elogind icccm systemd x11-backend X"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=dev-libs/libinput-1.9.0:0=
+	>=dev-libs/wayland-1.17.0
+	media-libs/mesa[egl,gles2,gbm]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	elogind? ( >=sys-auth/elogind-237 )
+	icccm? ( x11-libs/xcb-util-wm )
+	systemd? ( >=sys-apps/systemd-237 )
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xorg-server[wayland]
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.17
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		-Dlibcap=$(usex filecaps enabled disabled)
+		-Dxcb-icccm=$(usex icccm enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
+		"-Dexamples=false"
+		"-Dwerror=false"
+	)
+	if use systemd; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
+	elif use elogind; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
+	else
+		emesonargs+=("-Dlogind=disabled")
+	fi
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+}
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index db03b0f1e012..b9431381dd79 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -17,8 +17,8 @@ else
 fi
 
 LICENSE="MIT"
-SLOT="0"
-IUSE="elogind icccm rootston systemd x11-backend X"
+SLOT="0/9999"
+IUSE="elogind icccm systemd x11-backend X"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -47,8 +47,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-FILECAPS=( cap_sys_admin usr/bin/rootston )
-
 src_configure() {
 	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
 	local emesonargs=(
@@ -57,7 +55,6 @@ src_configure() {
 		-Dxcb-icccm=$(usex icccm enabled disabled)
 		-Dxwayland=$(usex X enabled disabled)
 		-Dx11-backend=$(usex x11-backend enabled disabled)
-		$(meson_use rootston)
 		"-Dexamples=false"
 		"-Dwerror=false"
 	)
@@ -72,30 +69,7 @@ src_configure() {
 	meson_src_configure
 }
 
-src_install() {
-	if use rootston; then
-		dobin "${BUILD_DIR}"/rootston/rootston
-		newdoc rootston/rootston.ini.example rootston.ini
-	fi
-
-	meson_src_install
-}
-
 pkg_postinst() {
 	elog "You must be in the input group to allow your compositor"
 	elog "to access input devices via libinput."
-	if use rootston; then
-		elog ""
-		elog "You should copy (and decompress) the example configuration file"
-		elog "from ${EROOT:-${ROOT}}/usr/share/doc/${PF}/rootston.ini"
-		elog "to the working directory from where you launch rootston"
-		elog "(or pass the '-C path-to-config' option to rootston)."
-		if ! use systemd && ! use elogind; then
-			elog ""
-			elog "If you use ConsoleKit2, remember to launch rootston using:"
-			elog "exec ck-launch-session rootston"
-
-			fcaps_pkg_postinst
-		fi
-	fi
 }
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index ef0348823c12..d0a25f940063 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 4e37ee02f9e1..e4035a35aac3 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,6 +1,8 @@
 DIST sway-1.0.tar.gz 5474548 BLAKE2B bea0a72c374b75f027e466d83e8c06abe32205e0cda80776b0e48e327a6da4e965a6a575595e5a38bcb125294c509b5d9a1db17604dd9e9032acef404366bdb9 SHA512 57e2610244c8bcd2b09bb5396113176d118ee5a0688aea297d4c191eda70ce29b36ff64e05c57d1a32a31cc4f2ac2562fd3cb3890508a8f3c7cbcb9fb017171d
 DIST sway-1.1.1.tar.gz 5480615 BLAKE2B 2cc55535a030d5d057c332a8b2647f394ec8f08a3a5aebe48e0bd21da718eac23bdbcc5a2ce26624efb9360518e5f14eaafe406e1c7d9b3eb81621bab7b6c39c SHA512 2585446ca0936df41c7959b6b48487b25c86f1a8a3bedcd146aab023a873a416ce750698e3cabcd9cb861e35bbd7e280574ff477152906669af9b17d3e54028e
+DIST sway-1.2.tar.gz 5493376 BLAKE2B f059ec7c3db7ff048129c9d701e8730b04f01670dc3b1be826ef3d609f2881ddf1e3bfd82c39bebf5e7e99127f7250239b2af76292f60cfa208fc465f14cd779 SHA512 b43f625d35145a3377e64ea942f8b005946bb0925f08deace2da73ab504038b29331df9943296c97141e2283cd9b55e6cb3bca18c5c3999ecbd461325e36165b
 EBUILD sway-1.0.ebuild 3085 BLAKE2B 62c575e078c9078faca0d58cc0adc18fd52b10f648fdf6cc8cc18b5080fc8844d92a7bdf80141c03bae5d1dac8ccc62b0f263a05b82a407d4ee3e25c573470b5 SHA512 10aeba287ad9113010d60b1e07af1ba6291c575109f89c9501bd42370e8bc1afb148bb6604d95048b4d390b9d66213249c25b5f8867599e5cdce53db0967550b
 EBUILD sway-1.1.1.ebuild 2950 BLAKE2B 9658c0b1282956f91bfa19bce0d0a7bc04cffeac562a4a5c73bf2dc40aa2f15ec1e180d48a66bc7a41bcf03738c2bd7cd926dde5af7cfe46e1ac6fce862d392b SHA512 415489fc1450e4aded50e663cc6f3a96153e56376318fe097ec9419913f65d5f44712ddaaf9ec42b9cdf9e7e20f60b90243804bc074719106141d5ceca447e04
-EBUILD sway-9999.ebuild 2953 BLAKE2B 0146efd670edbafed4df718383d9c059cced7dc7178d407e46c3ee3a3b260464972e2a485fd34f511bfc276a1cd41e41ba14e2a76058a626c222c06e8a32fb02 SHA512 b6fc5f65a764a2fc6e31e8b828bcccfca3b85d5d6b1d39ee7096b0dee22de36385d9432bd4bd90358c84e6cf7d17efdcf077c0513ced9d0be4e18ed8467b6d68
+EBUILD sway-1.2.ebuild 2957 BLAKE2B 2e804aca2d401061e25d9f26fcce12a201303056338434c886a3666bfe44933fa301765152f9d80c52f21895dcf3938475f0d29a37906edead9ad651be0d7c97 SHA512 2bba05be79c29100f880a29eaf5c51126a753ded96dc5142b91f559cfc40d55d55c480ae54ccda115ed692bb9de3b3674b93e74af7320258eddb3b38c27f7a7f
+EBUILD sway-9999.ebuild 2957 BLAKE2B 2e804aca2d401061e25d9f26fcce12a201303056338434c886a3666bfe44933fa301765152f9d80c52f21895dcf3938475f0d29a37906edead9ad651be0d7c97 SHA512 2bba05be79c29100f880a29eaf5c51126a753ded96dc5142b91f559cfc40d55d55c480ae54ccda115ed692bb9de3b3674b93e74af7320258eddb3b38c27f7a7f
 MISC metadata.xml 2486 BLAKE2B 2d34da83a8d8726b91189d27a400e705a1b0259a1ca577a85e7c21784274a08a0adccc134cd523e193f8635b26dcb1802e37bfa1831f58c922285341b1eadd5e SHA512 9d382307136a126a614a8361828cb018865243b1a8c2a4dd08fbd484afc53320abf6d64dd82dd93a47d8de284552f1857c028c6c72db06199152e1458b636ec0
diff --git a/gui-wm/sway/sway-1.2.ebuild b/gui-wm/sway/sway-1.2.ebuild
new file mode 100644
index 000000000000..e4d011fc2064
--- /dev/null
+++ b/gui-wm/sway/sway-1.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils meson
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="https://swaywm.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion"
+REQUIRED_USE="?? ( elogind systemd )
+	tray? ( || ( elogind systemd ) )"
+
+DEPEND="
+	>=dev-libs/json-c-0.13:0=
+	>=dev-libs/libinput-1.6.0:0=
+	dev-libs/libpcre
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	elogind? ( >=sys-auth/elogind-239 )
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	swaybg? ( gui-apps/swaybg )
+	swayidle? ( gui-apps/swayidle )
+	swaylock? ( gui-apps/swaylock )
+	systemd? ( >=sys-apps/systemd-239 )
+	X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]"
+else
+	DEPEND+=">=gui-libs/wlroots-0.7.0:=[elogind=,systemd=,X=]"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
+fi
+
+src_prepare() {
+	default
+
+	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
+	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
+	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
+		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		-Dtray=$(usex tray enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		$(meson_use wallpapers default-wallpaper)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use zsh-completion zsh-completions)
+		"-Dbash-completions=true"
+		"-Dwerror=false"
+	)
+
+	if use swaybar; then
+		emesonargs+=("-Dgdk-pixbuf=enabled")
+	else
+		emesonargs+=("-Dgdk-pixbuf=disabled")
+	fi
+
+	meson_src_configure
+}
+
+pkg_preinst() {
+	if ! use systemd && ! use elogind; then
+		fowners root:0 /usr/bin/sway
+		fperms 4511 /usr/bin/sway
+	fi
+}
+
+pkg_postinst() {
+	if ! use systemd && ! use elogind; then
+		elog ""
+		elog "If you use ConsoleKit2, remember to launch sway using:"
+		elog "exec ck-launch-session sway"
+		elog ""
+		elog "If your system does not set the XDG_RUNTIME_DIR environment"
+		elog "variable, you must set it manually to run Sway. See wiki"
+		elog "for details: https://wiki.gentoo.org/wiki/Sway"
+	fi
+}
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index 5293b993a7d5..e4d011fc2064 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -42,9 +42,9 @@ DEPEND="
 	X? ( x11-libs/libxcb:0= )
 "
 if [[ ${PV} == 9999 ]]; then
-	DEPEND+="~gui-libs/wlroots-9999[elogind=,systemd=,X=]"
+	DEPEND+="~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]"
 else
-	DEPEND+=">=gui-libs/wlroots-0.6.0[elogind=,systemd=,X=]"
+	DEPEND+=">=gui-libs/wlroots-0.7.0:=[elogind=,systemd=,X=]"
 fi
 RDEPEND="
 	x11-misc/xkeyboard-config
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 92e96bc389c8..0333c02e9878 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index 5a10ee4fc2b3..19c8e7321322 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,6 +1,6 @@
 DIST kross-interpreters-19.04.3.tar.xz 150404 BLAKE2B 36e620728e390f6d26887ae6e80324ba5cbeae16d7b6f423abba3cdcf74955320eafe9921cc2fc34fbdf0d95feec87c0eae8883d5a5f767fb29092c19934bdb9 SHA512 3c9810d9870b69af984d416d031ac30cbe26514ea9734feee70a32d915acafea531a621a085adcd95e0d0e67c92f8508de94e749aae89c825520c2adf6a674a3
 DIST kross-interpreters-19.08.0.tar.xz 151572 BLAKE2B d515eeb11d055068756715b3fd8b8ac901dab23d58ea6c574cff6d82bd064cb1bac5caeee83cf3d7fb7ea3aae9344df45f31cf7b87ac1a88fd53af645d603201 SHA512 9b0738902b299c2c9874d88c6a46bb4415aa5a24ce9cbc3174680d28205a09c0d26792d2bb434312a598fb1e8368ec20eaaeed2af1b2b4e01d81df0a21a6e472
-EBUILD kross-interpreters-19.04.3-r1.ebuild 748 BLAKE2B ca4319bd98e46729cd907e9ef3dc9c781c038c8aad1c75a5c4f63dd181fd2c0cc4061fc9f982f7b5eba0d80aa33d281ac5c7bcae7a7fb3e5201c8c114f152003 SHA512 0070562e50866457108c306ff9dee0c729bda0d9853afeaf61b033715b9b0a1f0dd4179e97e3819b27354177ee79829fe8dabe7f50571e7683ed51eb4bdbf9c1
+EBUILD kross-interpreters-19.04.3-r1.ebuild 745 BLAKE2B 7739d19773cb05b232e432bae0d736035444b6cb67ae2bb350b5108c506157b2027cd7e1dea7bd51ddcc9d386532a245277d31c740afea45329f9c9237d6d58b SHA512 5b5e7e4660f3f3b153e393b2fa49b0b758e953bf21d3b95b08971c5efe847db96cb922fc74ffd82ebdb2f03a8bfc549a52d113bda42d24d0e274794126347511
 EBUILD kross-interpreters-19.04.3.ebuild 745 BLAKE2B 124f482ddb10eed49a45deccc1332e79b0408a5f8c311586d5b780592b387f52bea23b80e2fd38a7b16b8a9f4221dc984686aec5ff9258ef1f531b64bb0cad62 SHA512 1f7a675e3f45eccc3cbd63af5d1a60e2298fbcd031986dc9130653ac0e8ff10106da932e7bfbe7d57e0bfe077122fa04af187280d2e3b5a26b85b73c98e7c67a
 EBUILD kross-interpreters-19.08.0.ebuild 748 BLAKE2B ca4319bd98e46729cd907e9ef3dc9c781c038c8aad1c75a5c4f63dd181fd2c0cc4061fc9f982f7b5eba0d80aa33d281ac5c7bcae7a7fb3e5201c8c114f152003 SHA512 0070562e50866457108c306ff9dee0c729bda0d9853afeaf61b033715b9b0a1f0dd4179e97e3819b27354177ee79829fe8dabe7f50571e7683ed51eb4bdbf9c1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-19.04.3-r1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-19.04.3-r1.ebuild
index 4b577776782d..b2cd075da1da 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-19.04.3-r1.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-19.04.3-r1.ebuild
@@ -8,7 +8,7 @@ USE_RUBY="ruby25"
 inherit kde5 python-single-r1 ruby-single
 
 DESCRIPTION="Kross interpreter plugins for programming languages"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+python ruby"
 
 REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index afe10bfefd08..1fda2a5ab1b9 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 4d396fdf258b..b82b8b072d6e 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,7 +1,6 @@
-AUX kio-gdrive-1.2.6-libkgapi-19.08-1.patch 5510 BLAKE2B 2f75ff59a8f53bb55f824031161114e2230a2c5e0f987eb43e906d54c6df8f2e7c7aa346624d6dcc9d0f007242184506d3f57d272f7ef2189f95b4b26bac85e6 SHA512 e53ef54ac5006bb9dc7e729d3bfa041abb257558ac976754de342ea8f73d40472331eb9255e47abc93efc3746de52401d31634a54c0d05f384f545cb1a836a8e
-AUX kio-gdrive-1.2.6-libkgapi-19.08-2.patch 1825 BLAKE2B 7fd17ef8b92ca569531d16d91a99bc29483015040b4dbcbd9ab994e3bb06e1cdc80e89b34f7941270b277f1997a5ca442e536a8369011cfc0cb5c50d8f9c604f SHA512 2a5d672a060befb388696e4787fb692f6e219bd0a904875fa756b50d53436b7c281c120ba455fc4be98237eda869d6fe790ddff3848914a262d5082fb7c2f6a2
 AUX kio-gdrive-1.2.6-refresh-credentials.patch 4224 BLAKE2B f70a40eef14d31f296effb554308303fe9b82c21b8e3c3a56020d5548dfbd9a967ef27d24ac4b44398c681db64dabff87a088ad3e47fe9e5f962af2080471f31 SHA512 8fc99adb52f1e9b9c49c94357103a51d3de367ea1d5a98afe361910307fe1a424b9f0c5fb0ec1e5f0cc2183ac87f2d6cb1730ed12fecc76b68e8860317dfbedf
 DIST kio-gdrive-1.2.6.tar.xz 46464 BLAKE2B 266245d0e640627ff98e33719d668b6e0b310ca17dd87106906ac9fe41294ce5722965c40695d1068e6d6e04c8746b79fecc8bf510c5e2f6e24d17871eb00fa1 SHA512 10a1d7a18d2fed5864543951a512a758eaed8f31bcd7130257bf7d3e66e88d477e3349d9337ee0c5f3437eaa7b93d020f51ff063b940387137d872f6e5fca3f0
-EBUILD kio-gdrive-1.2.6-r1.ebuild 1192 BLAKE2B 85bdc028110052b6be956180004a4eec47bb22a6a0b61a6be93ed0264c422302291d0c0db763a70fab6aa0bb1ef418c98902907d8a976b0e3e14cda185350033 SHA512 7ddf6d7f9da2967365218f06522224664564f4c4b10d7fc4d6dbe7668adbd8563c2bb1332ced44d6e51415074cbe30b4482ffcc8c3cf99e0cee38b545643b78a
+DIST kio-gdrive-1.2.7.tar.xz 46748 BLAKE2B 308c7d8d55c4eef175e2ef6030f1fbcdb59fdc6cd33f6c0bd5c35efe7bd21cf7f6cf7293b355f30b7b05effae79b91e357cc5a93ed866db850953f392bd65e0f SHA512 f1eedad2cd244e38f6cdf397e9488cb7f31fe7c4b17825f3b0882ff46f7f62f087e7b2bc59db434b4a55641920b8b03f3dec6adf7031ccc2277c7a0b166f9c80
 EBUILD kio-gdrive-1.2.6.ebuild 1059 BLAKE2B 79253f2bb8832acb48eb275035e6bc333eb8375acf4df42ecb1791bedbf3547646097723623e62dc12b258225bdba9dd73e72aa3df2b9508431b114a31c602c4 SHA512 052b7a83a17de28f8fc2d2d0c1ed871fdabcd7ca010596d516b5d97da3ba50ddd2c9969b97490d9c24215a885a757ea98b408f2dc777557e757341b1c3af966c
+EBUILD kio-gdrive-1.2.7.ebuild 1151 BLAKE2B 27d1e59b234704bbbd18f549283d4b4b8436c9e9e1990b49527fc4e73546b13814d39e958974799fb92da758f56973ef5f57e9728badaf53d34b98f5bf970638 SHA512 697969824d532f2ebfcd42e5ff125e57c096c559badc386c281ed69d19ea70a85312953de87eb0a7ce65603c10384bef5db71bf54839e32de92cb810d2466cfa
 MISC metadata.xml 402 BLAKE2B 80f60bca3fa59b7e22727709066453e1002c786c2eda688aa437f86fd99d73aa4b8c35a22571d3f774c55d16b1a4267fb0242253fd38a45890701755cca72afa SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21
diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.6-libkgapi-19.08-1.patch b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.6-libkgapi-19.08-1.patch
deleted file mode 100644
index 03352081b73f..000000000000
--- a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.6-libkgapi-19.08-1.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 01ec4d87b2e28de5eb3c23ec469c6c746f573520 Mon Sep 17 00:00:00 2001
-From: David Barchiesi <david@barchie.si>
-Date: Sun, 19 May 2019 12:38:24 +0200
-Subject: Adapt to LibKGAPI setFields() changes.
-
-Summary:
-In the next release, LibKGAPI has changed the way it sets fields in `FileFetchJob` and in general allows setting response fields for all `Job`s (see [[ https://phabricator.kde.org/D20886 | D20886 Add fields standard query parameter to Job and use it in FileFetchJob ]]).
-
-This patch adjusts KIO Gdrive to this change and limits the response in `AboutFetchJob`s.
-
-Reviewers: dvratil, elvisangelaccio
-
-Subscribers: #libkgapi, #kio_gdrive
-
-Tags: #kio_gdrive, #libkgapi
-
-Differential Revision: https://phabricator.kde.org/D20888
----
- CMakeLists.txt     |  2 +-
- src/kio_gdrive.cpp | 30 ++++++++++++++++++------------
- 2 files changed, 19 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a830925..680ae3e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,7 +5,7 @@ project(kio-gdrive VERSION ${GDRIVE_VERSION})
- 
- set(QT_MIN_VERSION 5.2.0)
- set(KF5_MIN_VERSION 5.14.0)
--set(KGAPI_MIN_VERSION 5.5.0)
-+set(KGAPI_MIN_VERSION 5.11.41)
- set(KACCOUNTS_MIN_VERSION 17.04.0)
- set(QTKEYCHAIN_MIN_VERSION 0.6.0)
- 
-diff --git a/src/kio_gdrive.cpp b/src/kio_gdrive.cpp
-index 9ab146f..e01fef6 100644
---- a/src/kio_gdrive.cpp
-+++ b/src/kio_gdrive.cpp
-@@ -146,6 +146,12 @@ void KIOGDrive::fileSystemFreeSpace(const QUrl &url)
-     }
-     if (!gdriveUrl.isRoot()) {
-         AboutFetchJob aboutFetch(getAccount(accountId));
-+        aboutFetch.setFields({
-+            About::Fields::Kind,
-+            About::Fields::QuotaBytesTotal,
-+            About::Fields::QuotaBytesUsedAggregate,
-+            About::Fields::CanCreateTeamDrives,
-+        });
-         if (runJob(aboutFetch, url, accountId)) {
-             const AboutPtr about = aboutFetch.aboutData();
-             if (about) {
-@@ -379,7 +385,7 @@ QString KIOGDrive::resolveFileIdFromPath(const QString &path, PathFlags flags)
- 
-     const QString accountId = gdriveUrl.account();
-     FileFetchJob fetchJob(query, getAccount(accountId));
--    fetchJob.setFields(FileFetchJob::Id | FileFetchJob::Title | FileFetchJob::Labels);
-+    fetchJob.setFields({File::Fields::Id, File::Fields::Title, File::Fields::Labels});
-     if (!runJob(fetchJob, url, accountId)) {
-         return QString();
-     }
-@@ -404,6 +410,7 @@ QString KIOGDrive::rootFolderId(const QString &accountId)
-     auto it = m_rootIds.constFind(accountId);
-     if (it == m_rootIds.cend()) {
-         AboutFetchJob aboutFetch(getAccount(accountId));
-+        aboutFetch.setFields({About::Fields::Kind, About::Fields::RootFolderId});
-         QUrl url;
-         if (!runJob(aboutFetch, url, accountId)) {
-             return QString();
-@@ -455,10 +462,13 @@ void KIOGDrive::listDir(const QUrl &url)
-     query.addQuery(FileSearchQuery::Trashed, FileSearchQuery::Equals, false);
-     query.addQuery(FileSearchQuery::Parents, FileSearchQuery::In, folderId);
-     FileFetchJob fileFetchJob(query, getAccount(accountId));
--    fileFetchJob.setFields((FileFetchJob::BasicFields & ~FileFetchJob::Permissions)
--                            | FileFetchJob::Labels
--                            | FileFetchJob::ExportLinks
--                            | FileFetchJob::LastViewedByMeDate);
-+    const auto extraFields =
-+        KGAPI2::Drive::FileFetchJob::FieldShorthands::BasicFields +
-+            QStringList({ KGAPI2::Drive::File::Fields::Labels,
-+                          KGAPI2::Drive::File::Fields::ExportLinks,
-+                          KGAPI2::Drive::File::Fields::LastViewedByMeDate,
-+            });
-+    fileFetchJob.setFields(KGAPI2::Drive::FileFetchJob::FieldShorthands::BasicFields + extraFields);
-     runJob(fileFetchJob, url, accountId);
- 
-     ObjectsList objects = fileFetchJob.items();
-@@ -607,10 +617,7 @@ void KIOGDrive::get(const QUrl &url)
-     }
- 
-     FileFetchJob fileFetchJob(fileId, getAccount(accountId));
--    fileFetchJob.setFields(FileFetchJob::Id
--                            | FileFetchJob::MimeType
--                            | FileFetchJob::ExportLinks
--                            | FileFetchJob::DownloadUrl);
-+    fileFetchJob.setFields({File::Fields::Id, File::Fields::MimeType, File::Fields::ExportLinks, File::Fields::DownloadUrl});
-     runJob(fileFetchJob, url, accountId);
- 
-     const ObjectsList objects = fileFetchJob.items();
-@@ -866,8 +873,7 @@ void KIOGDrive::copy(const QUrl &src, const QUrl &dest, int permissions, KIO::Jo
-         return;
-     }
-     FileFetchJob sourceFileFetchJob(sourceFileId, getAccount(sourceAccountId));
--    sourceFileFetchJob.setFields(FileFetchJob::Id | FileFetchJob::ModifiedDate |
--                                 FileFetchJob::LastViewedByMeDate | FileFetchJob::Description);
-+    sourceFileFetchJob.setFields({File::Fields::Id, File::Fields::ModifiedDate, File::Fields::LastViewedByMeDate, File::Fields::Description});
-     runJob(sourceFileFetchJob, src, sourceAccountId);
- 
-     const ObjectsList objects = sourceFileFetchJob.items();
-@@ -1086,7 +1092,7 @@ void KIOGDrive::mimetype(const QUrl &url)
-     const QString accountId = GDriveUrl(url).account();
- 
-     FileFetchJob fileFetchJob(fileId, getAccount(accountId));
--    fileFetchJob.setFields(FileFetchJob::Id | FileFetchJob::MimeType);
-+    fileFetchJob.setFields({File::Fields::Id, File::Fields::MimeType});
-     runJob(fileFetchJob, url, accountId);
- 
-     const ObjectsList objects = fileFetchJob.items();
--- 
-cgit v1.1
diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.6-libkgapi-19.08-2.patch b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.6-libkgapi-19.08-2.patch
deleted file mode 100644
index 65d181ca7a5f..000000000000
--- a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.6-libkgapi-19.08-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f81aed7bd13fd1d7fcd1f37baade3f1f6f34c54d Mon Sep 17 00:00:00 2001
-From: David Barchiesi <david@barchie.si>
-Date: Wed, 3 Jul 2019 20:18:59 +0200
-Subject: Remove useless FileFetchJob field specifications. Fixes D21838
- related issues.
-
----
- src/kio_gdrive.cpp | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/src/kio_gdrive.cpp b/src/kio_gdrive.cpp
-index 4d80baf..5add144 100644
---- a/src/kio_gdrive.cpp
-+++ b/src/kio_gdrive.cpp
-@@ -149,8 +149,7 @@ void KIOGDrive::fileSystemFreeSpace(const QUrl &url)
-         aboutFetch.setFields({
-             About::Fields::Kind,
-             About::Fields::QuotaBytesTotal,
--            About::Fields::QuotaBytesUsedAggregate,
--            About::Fields::CanCreateTeamDrives,
-+            About::Fields::QuotaBytesUsedAggregate
-         });
-         if (runJob(aboutFetch, url, accountId)) {
-             const AboutPtr about = aboutFetch.aboutData();
-@@ -462,11 +461,10 @@ void KIOGDrive::listDir(const QUrl &url)
-     query.addQuery(FileSearchQuery::Parents, FileSearchQuery::In, folderId);
-     FileFetchJob fileFetchJob(query, getAccount(accountId));
-     const auto extraFields =
--        KGAPI2::Drive::FileFetchJob::FieldShorthands::BasicFields +
--            QStringList({ KGAPI2::Drive::File::Fields::Labels,
--                          KGAPI2::Drive::File::Fields::ExportLinks,
--                          KGAPI2::Drive::File::Fields::LastViewedByMeDate,
--            });
-+        QStringList({ KGAPI2::Drive::File::Fields::Labels,
-+                      KGAPI2::Drive::File::Fields::ExportLinks,
-+                      KGAPI2::Drive::File::Fields::LastViewedByMeDate,
-+        });
-     fileFetchJob.setFields(KGAPI2::Drive::FileFetchJob::FieldShorthands::BasicFields + extraFields);
-     runJob(fileFetchJob, url, accountId);
- 
--- 
-cgit v1.1
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.6-r1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.6-r1.ebuild
deleted file mode 100644
index f6f2fa71b1fa..000000000000
--- a/kde-misc/kio-gdrive/kio-gdrive-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_APPS_MINIMAL=19.08.0
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-inherit kde5
-
-DESCRIPTION="KIO Slave for Google Drive service"
-HOMEPAGE="https://phabricator.kde.org/project/profile/72/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]] ; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="+kaccounts"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_kdeapps_dep libkgapi)
-	$(add_qt_dep qtwidgets)
-	kaccounts? ( $(add_kdeapps_dep kaccounts-integration) )
-	!kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-"
-RDEPEND="${COMMON_DEPEND}
-	kaccounts? ( $(add_kdeapps_dep kaccounts-providers) )
-"
-BDEPEND="dev-util/intltool"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libkgapi-19.08-{1,2}.patch
-	"${FILESDIR}"/${P}-refresh-credentials.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kaccounts KAccounts)
-	)
-	kde5_src_configure
-}
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild
new file mode 100644
index 000000000000..76951521c762
--- /dev/null
+++ b/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_APPS_MINIMAL=19.08.0
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+inherit kde5
+
+DESCRIPTION="KIO Slave for Google Drive service"
+HOMEPAGE="https://phabricator.kde.org/project/profile/72/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]] ; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="+kaccounts"
+
+BDEPEND="dev-util/intltool"
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_kdeapps_dep libkgapi)
+	$(add_qt_dep qtwidgets)
+	kaccounts? ( $(add_kdeapps_dep kaccounts-integration) )
+	!kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+"
+RDEPEND="${COMMON_DEPEND}
+	kaccounts? ( $(add_kdeapps_dep kaccounts-providers) )
+"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.2.6-refresh-credentials.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kaccounts KAccounts)
+	)
+	kde5_src_configure
+}
diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest
index 895e2978f0da..584bf6d73e42 100644
--- a/kde-misc/krusader/Manifest
+++ b/kde-misc/krusader/Manifest
@@ -1,3 +1,5 @@
 DIST krusader-2.7.1.tar.xz 2889568 BLAKE2B f5ed5753d1f5285ff2ff8510429d3b07ef32ab06b37fc20300eb3544f5a44572d5c66067e0031fc767c93cd3517b12062c7c7a91f7ff0bb707d1e20b16d07f55 SHA512 860908fd960ae45d298ade30bd4962eea44d126b5a3bb28d04540a0e4fbc0645de2394490fdb624b5fcc7005841c0ce392cda896dc4b1d3d2de3a1e44171222d
+DIST krusader-2.7.2.tar.xz 2912396 BLAKE2B d2675dbde007f002e7dd3730b806e30443ae9e6923d7255ea6c5582370aeb5783822ca0893fc01985fccca209cd0e88e8ada2234d18011d3f90a7e74bffe84ae SHA512 8af90a9067c7c92abc9dcc866e1eb1e1f1bd2a4c45968c260b6b01cc079d3125d6db6d49b530d90a2f91d3c99c577fa7f1ff47d12abc3400a75e2d52e7ae477b
 EBUILD krusader-2.7.1-r1.ebuild 1864 BLAKE2B 6c5d23394c154b321983a4164e8feb8392a25cc1b44ad89409e2fdcc9d6545a2fec80b60b9c7e112e674abf7d08e970249268de38a4d50becd0e500ddb855b42 SHA512 90f83961be03c046269d18c2f8fbb05db0197d9e886e9ec4eee10a6857a9d24e4da41e57c4eea3f7b21614827a0bfc8e67d6c8fee054b3af418752f5e1ddd427
+EBUILD krusader-2.7.2.ebuild 1866 BLAKE2B 745a71e3d1ba87e4f7d76025c2561dd9733765018060a616c9038207d0ad3061a4da97b3c9d0e6c590adc782f4bd88f206d312e742c50b8734c3e0e5f71666ff SHA512 9b88c2917707bbd4c65cb6f2250eea358427366747b04a2cd1c4942fcb542e01610c81d532d160477e3dbccf25d59c4d8d14296db57fcc7206d546551f8b123f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/krusader/krusader-2.7.2.ebuild b/kde-misc/krusader/krusader-2.7.2.ebuild
new file mode 100644
index 000000000000..d1cc1161c39e
--- /dev/null
+++ b/kde-misc/krusader/krusader-2.7.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Advanced twin-panel (commander-style) file-manager with many extras"
+HOMEPAGE="https://krusader.org/"
+LICENSE="GPL-2+"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(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 knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	sys-apps/acl
+	sys-libs/zlib
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kio-extras)
+"
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version kde-apps/thumbnailers:${SLOT} ||
+			! has_version kde-apps/ffmpegthumbs:${SLOT} ; then
+		elog "For PDF/PS, RAW and video thumbnails support, install:"
+		elog "   kde-apps/thumbnailers:${SLOT}"
+		elog "   kde-apps/ffmpegthumbs:${SLOT}"
+	fi
+
+	if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
+		elog "For bookmarks support, install kde-apps/keditbookmarks:${SLOT}"
+	fi
+}
diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index 94771f71c122..27ded795045c 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -1,7 +1,7 @@
 DIST latte-dock-0.8.9.tar.xz 668104 BLAKE2B 65844b3f90ea6ca105b026fb17825438e5fbb1320b735454fb93a5428b376de55fb5385b56df6a334b15531d83ed9e8cd9718de4e9a4f4a0eb48ef7e04db0c5e SHA512 4a542df07cfb760c4413eeefe65ebbc5405cc31f5de9039464e2390c84c60611e3a58d2458bf6750ea43e97959df68a75fa068c6b1fc5fdaf33f5b6745d08fd5
-DIST latte-dock-0.9.0.tar.xz 694972 BLAKE2B 977d4d0ae81ad9a9cd69ef14c52bac7ffb66767edea6b90ad4d0484d45c19659ce74209826fdca53f5e5e699584eda032f056b7bba9a8dba42fe8a06e1fe38cd SHA512 115a37566b0bfe7493fbee558f5627f4c4165ecfbffe8bf392ff177f8f3caa8e50d82098566f655ab52e056d6fbee4b19d74a37e608f1aec88f63b9c24f24976
 DIST latte-dock-0.9.1.tar.xz 696660 BLAKE2B f7e9caf466c23fd2dd776eae6ec1e3ad0312291816cdcd7502b8bfe8a29b31e0f75ad7b5c0e440c3e391bcd9eba48e26c2831ab9a2b76578ec6afb1cf41be6d6 SHA512 e9884e27f7b638b73447ae62bcf1eafb0f6299bdeb6e8515bd23a64bf295e65baa7883b7c14907991dcf83d7b07680357d411c1653d7facc057f2ff0ce7ea51f
+DIST latte-dock-0.9.2.tar.xz 708436 BLAKE2B a54d11e5d98e4e9238f26ccee8f3ea67822f44f015a93cf0a4e2a202a5569e766ce0dd651f9ddf2f1251dca9d342dbb3fa58c2cf29bec04f7e24574136b46621 SHA512 3537ec6b9503802a7efbbea7ae6ddf864188ba3b73c8121b434efc527f3c3e8d8f5e68447541a867b4422ccc5e3d2af85f491807a597bdb747960e8ab983bebd
 EBUILD latte-dock-0.8.9.ebuild 1266 BLAKE2B 227d7f56709a963e39ecff99c860b2a440b60a9b660b0b498d338c2d34179659a220e210ad35031c6b9b5486865bc1139991daa60c8afdfa3f0d1c91356577fe SHA512 59e378fdf29a8ede564433e2a59c02500a3788a9cbaacad78c3cef9c41f965f0564e4caa1abc649d6fc5dbdb16a0590d7c6c246a61f7541815dbfd6f4bb58f99
-EBUILD latte-dock-0.9.0.ebuild 1334 BLAKE2B 2d5a692b4c16b59dc517d8d5dcdfec2bec52245f1d69512f6dff42f2a7897ca80472ee8601263a5aa8254954d16f30aac4e4701f1fb36af193801248c21ca567 SHA512 b7d4dcb88fd8f85055847f45d21df2cfa328e98e407db19c693f2994dbda67111c0cd71f317dd6d309af3c958472962a32596d2861fc1768ea02e79a8344dcc0
 EBUILD latte-dock-0.9.1.ebuild 1334 BLAKE2B 2d5a692b4c16b59dc517d8d5dcdfec2bec52245f1d69512f6dff42f2a7897ca80472ee8601263a5aa8254954d16f30aac4e4701f1fb36af193801248c21ca567 SHA512 b7d4dcb88fd8f85055847f45d21df2cfa328e98e407db19c693f2994dbda67111c0cd71f317dd6d309af3c958472962a32596d2861fc1768ea02e79a8344dcc0
+EBUILD latte-dock-0.9.2.ebuild 1334 BLAKE2B 2d5a692b4c16b59dc517d8d5dcdfec2bec52245f1d69512f6dff42f2a7897ca80472ee8601263a5aa8254954d16f30aac4e4701f1fb36af193801248c21ca567 SHA512 b7d4dcb88fd8f85055847f45d21df2cfa328e98e407db19c693f2994dbda67111c0cd71f317dd6d309af3c958472962a32596d2861fc1768ea02e79a8344dcc0
 MISC metadata.xml 453 BLAKE2B a49e759f4ce30c2730a4bf082b8f953e0e93f95f2de3b567798d4bea8229558ed72cd774c5d9b1356bd066dc92400d17f05d830746d87386c8c2921fcc484c80 SHA512 5fd22fbf848fbbc76422a4002e5efdddb8a387c406fc45b580e1ec93c36cd2407582770d5d842367fa0d7dd7fceaec196cf0202f56bd5144f89b4f573c2d9c35
diff --git a/kde-misc/latte-dock/latte-dock-0.9.0.ebuild b/kde-misc/latte-dock/latte-dock-0.9.2.ebuild
index 561330830242..561330830242 100644
--- a/kde-misc/latte-dock/latte-dock-0.9.0.ebuild
+++ b/kde-misc/latte-dock/latte-dock-0.9.2.ebuild
diff --git a/kde-misc/plasma-active-window-control/Manifest b/kde-misc/plasma-active-window-control/Manifest
deleted file mode 100644
index 155453946e7b..000000000000
--- a/kde-misc/plasma-active-window-control/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST plasma-active-window-control-1.7.3.tar.gz 53994 BLAKE2B 9aabc42cee71aab9010674e1527a04aac94af9f9fd7756244ec4d8067a3a79332b88b83a93ce8b3b68ae341376a45ff586eafc653dd429c2cc30d82145770870 SHA512 ee6992aa9f1313b79d37b2f75823d3f68443d0de2a5fb428634089cad104652ab6101aa3667d5011da7fc57fbdd8ab168ab3d292190e93ae3412a8fad24bc9fe
-EBUILD plasma-active-window-control-1.7.3.ebuild 911 BLAKE2B 597dd4e045ac768ecc49f3531581371d79e150f1ce306d6768d58511bc107d872093b9b0c80d70c8a08b6535c9dc0b13b2da1dd647a07b5bede5d783698b6fdc SHA512 f132d5f060b2d1b61ecf93f14bcccefc597579872ae2d756b2a38f5c82a94e93a66095d005a41dc97705d0f2df93ae490f7f4a93108799831f7a3007e8976da2
-MISC metadata.xml 354 BLAKE2B b5170b01f150c050091597ae4b5e84247835103aa61269afbe322790302e8fafe7279dab9f47508638185c24ea83b7dfad8f27b671e2ce1cb9f4f4c80e4b3882 SHA512 da16f2b5da5247e9483bb15b9e4e4998b55d9837b5ebdd4c1718cf3f10fec7a7676881639e743dc8883ed4fc959ecb8733473ac60233b305067f769611f49320
diff --git a/kde-misc/plasma-active-window-control/metadata.xml b/kde-misc/plasma-active-window-control/metadata.xml
deleted file mode 100644
index 6903cbcaebb3..000000000000
--- a/kde-misc/plasma-active-window-control/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>petross404@gmail.com</email>
-		<name>Petros S</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/kde-misc/plasma-active-window-control/plasma-active-window-control-1.7.3.ebuild b/kde-misc/plasma-active-window-control/plasma-active-window-control-1.7.3.ebuild
deleted file mode 100644
index 3f8a3ec76351..000000000000
--- a/kde-misc/plasma-active-window-control/plasma-active-window-control-1.7.3.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
-
-inherit cmake-utils kde5-functions
-
-DESCRIPTION="Plasma 5 applet for controlling currently active window"
-HOMEPAGE="https://store.kde.org/p/998910/"
-SRC_URI="https://github.com/kotelnik/plasma-applet-active-window-control/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="5"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma X)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
-
-#ebuilds for releases > 1.7.3 will be copied from live ebuild
-S="${WORKDIR}/plasma-applet-active-window-control-${PV}"
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index b27ed18d9e9f..394940b3a620 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 1790ef6e38ac..e3b1b3064d96 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,5 @@
 DIST bluedevil-5.15.5.tar.xz 158216 BLAKE2B 0f7fdf6cf700e09a7b3468163e65bbc314960531f6e6d73f599bae98f52f19287a25fc71bf4349dd27791de35a992235ae2a884950217640253e15ab6c92609b SHA512 fdcf1a203ca78f6f36e22fc8bbabb2ea8c3f3fd63d4ba6c37453ea6b32a41311347685be68454c25e4e238926dcc1b6cbdbeefaad3ed384b488054a6a4e0d54e
-DIST bluedevil-5.16.4.tar.xz 158340 BLAKE2B 54c443953bfeb8c1e88dabb1ebe649e00438b0e523bc36343e8d1d8f42cb24c151c44f163b8847e3c004d86320173b0923689de82aa9d3f0cd33ea4d949e1d57 SHA512 0a86024b75c81938d20dabb922324e8b39120553c1491dcced559f389ed974e65ed389a75db2bfc6425fa984f5ae6e540c053bfabca5365f5bdaa2773157ff41
+DIST bluedevil-5.16.5.tar.xz 160136 BLAKE2B 19b39ce147a7678d8740a9c209e5af5c80d1affebb349f03b49e48f170fa1323410399c32b56b844b522e75056680e926bb1a432b69567cbede256dfc977b6f9 SHA512 de3c767413ede046ef39bc249c728c50f22db04ce1062956f9462214cf0d9dda0468ea3e463330663da720226a97b3bf935c5c138d282d066181faf0b6e55828
 EBUILD bluedevil-5.15.5.ebuild 854 BLAKE2B f8d5f9ab71706527cf2dd6291e53c2d6bee0e7ede681bba227191eb0822e8aecbdbb7c1b32ba02f639b1f54b8c0818d78158cd1c52aa425b35127195d7717c11 SHA512 08f883f38ccc2fbd166ede36864cfbfc8da52eed34b6eb253249bb91c7f1b8b76e01e1490c66e4682db4f94cad8050cf88210a71f72ac876566e5839fd2bb41b
-EBUILD bluedevil-5.16.4.ebuild 857 BLAKE2B 6799750b181547e7a98ad6f3cddc675b40b9ceeb84d2226ffa752cd1c10fd76c14f24245ab5a045c60cca4608a30c3747c41beca311c0a8c6378a49ed6db5602 SHA512 9eb659f90c92b1798c15b81ca801e56da628aa0f1826a0d0477e5528b5cd8f217463a112c9bb3a322cdcb7d9a2fe249d1bfd443368d8111981ee5a07d530d8a0
+EBUILD bluedevil-5.16.5.ebuild 857 BLAKE2B 6799750b181547e7a98ad6f3cddc675b40b9ceeb84d2226ffa752cd1c10fd76c14f24245ab5a045c60cca4608a30c3747c41beca311c0a8c6378a49ed6db5602 SHA512 9eb659f90c92b1798c15b81ca801e56da628aa0f1826a0d0477e5528b5cd8f217463a112c9bb3a322cdcb7d9a2fe249d1bfd443368d8111981ee5a07d530d8a0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.16.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.16.5.ebuild
index 15fef8b7b306..15fef8b7b306 100644
--- a/kde-plasma/bluedevil/bluedevil-5.16.4.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.16.5.ebuild
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index b2d1c49afe3d..7f3bc16d18a0 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-grub-5.15.5.tar.xz 3127888 BLAKE2B 0ee6733509a8e82e272e17ea6247dc3d32420e243c4989a04271a17b30e614d5b35f19a14aebc676fdffbcfe66130352ddde4b5c31acbb890e5a6aa8868d1db7 SHA512 fa95f67ab63382c12f9d5448fe114145c485b73ebc7eeefb4b3199c582707f88fdbc68dbd9c996a46d44004f0a0f759fe44b49d03391a399f8113b4494b64420
-DIST breeze-grub-5.16.4.tar.xz 3166128 BLAKE2B 15d885c59bdbe17836a61051bf5de7ff58c706a563792402b5c65bc3513c0933c1b4ff53a5badf08c5e1e34a77d30bb89ec5025ac515e2abecddf93d9954f744 SHA512 fffa785e2b3423bf55b45d051f17b5c1bbf8657ae4b91f772b3ed64608c68f2e1322b3a93356297073a75b3afd00bd2c7246545bfdaf85ace2ae6e8da9254ea4
+DIST breeze-grub-5.16.5.tar.xz 3136380 BLAKE2B 922e97a8f921ee43f163c861a2424f3f4cb290d669dc5fe372eac654cd9ddf2bcbc0f26cf831c4452c463f2f5c768d7f3aef945873e1edea818c6ba332b78318 SHA512 3fb6c8dfde319a62234a7f1dbb6306b159a42c5d7c910fc09ef202f3e3e89500a0bf70664f013059c0e113d2e1ebcf46698acc9909d7b6398fcf3bacba000746
 EBUILD breeze-grub-5.15.5.ebuild 399 BLAKE2B 03712756bec77cdd2ed02d4c1da83cc7c4efb71c492b14b70cad9c4911a8b662877c61692e0ea6ed0e24a1db490d5514c61619d4e47ae765e9670cd6abf28ff7 SHA512 e77a7122822f5805cb76bf40f336b08f3dc6f546cfac45dceff0f85a63d2c81735d07240f83b4ec5ecb26bef63b1a7d2fc9c846d4febfffa3c5ed599216d03f7
-EBUILD breeze-grub-5.16.4.ebuild 402 BLAKE2B 85bf08549b8819e1ba5713657f43d4062bd5b38d8a10acc1bd4b9dedee7b2e94c78cc3efa1305acfe9b38e16382ff8d78b09193cdbbad0b28b23090150ee0717 SHA512 9cad5052c680c5881c9227385adb693a9adca4a69f84db3512b19dc33678b3504d32458757919795fd43ecbd27472a9d418da726b5dea19eabc22173434e79f3
+EBUILD breeze-grub-5.16.5.ebuild 402 BLAKE2B 85bf08549b8819e1ba5713657f43d4062bd5b38d8a10acc1bd4b9dedee7b2e94c78cc3efa1305acfe9b38e16382ff8d78b09193cdbbad0b28b23090150ee0717 SHA512 9cad5052c680c5881c9227385adb693a9adca4a69f84db3512b19dc33678b3504d32458757919795fd43ecbd27472a9d418da726b5dea19eabc22173434e79f3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.16.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.16.5.ebuild
index 5bd1b8ebfeab..5bd1b8ebfeab 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.16.4.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.16.5.ebuild
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 1fb253c3aea1..280e8c9f315d 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-gtk-5.15.5.tar.xz 47504 BLAKE2B 3a6d4c656e652004e1c3268978e31f476c08a78fcf27de178edd94c1b1f568fcef26b971e52b89037922eb7be86ff5eb6189e8816a6ce6dab5a50c7d951da84a SHA512 61416aa88b50cca55df03b6eb95f6d5f6f7700fb64730668d777155c5ec0a892d00b9dd659f8a4ab86ba0c857d7bb52954563cdb8df2498f8fdfbea95c1cdd59
-DIST breeze-gtk-5.16.4.tar.xz 47560 BLAKE2B 6bd7a4299f00cdf10b16eb9447b7ffb475971d99e41b5531afb0c675fb7bb8426ad313048ac3ce841108141d1e58fd99dd53da4996e26a6ab291329eac63380c SHA512 aae792d9b46034faf67539e9ba940119b4982b4ce76e881b5ce95c8c4079794a69d15e4b314ef37d91f804a5fbca2a4b0340bf657dba96c541fa253763e98c42
+DIST breeze-gtk-5.16.5.tar.xz 47412 BLAKE2B d995d6b542c517785b33b4c1178d513ac5faa391b1de9f8605b1ad55f392e9eb8b9d2951cdde173854f25fd9d27ea3099f4505b5701a054eb3c350187d1f294a SHA512 deb172423d0e22d20305d1229b0f7c679c8707f56c0fd1e4589a068d295b5a17eeb3342ab174e94d0399fc357f091c9229f126b58bd1e9f4d45deefd0f6c41aa
 EBUILD breeze-gtk-5.15.5.ebuild 613 BLAKE2B 53e90c7de4aaf18b8ca28b389c8778e8a1c9bff95f0ac8b12390a56309780ec8463073ecca20fe946da2c2c8277d4baf3cf5fc5c35cfb93a6eed76331246e46d SHA512 65f365d7b5d198981232627426a11441f3f0dbda52a832a27905e23292b647ae37a06c0d0fd1e103de96ea28e200fb73e76d58c0a1f311ebbcd0ce5d560c4e98
-EBUILD breeze-gtk-5.16.4.ebuild 616 BLAKE2B 3476eeb759816e4eddd8bea516d4d6b0ea9483ad9a8abcc89f71a64e27de36d89472b63363f9b49b745d7e47ea4b5fea16a1bc63c3a576d8b50ca62f9d8bd90d SHA512 062d1ff0e823d078181708e12c90eff06fecc4c23ace953cc459cca6ecb2802becd4e399b4c98dcb714895f3a4196483ca90fd40687081c8b9cf582e830cad2f
+EBUILD breeze-gtk-5.16.5.ebuild 616 BLAKE2B 3476eeb759816e4eddd8bea516d4d6b0ea9483ad9a8abcc89f71a64e27de36d89472b63363f9b49b745d7e47ea4b5fea16a1bc63c3a576d8b50ca62f9d8bd90d SHA512 062d1ff0e823d078181708e12c90eff06fecc4c23ace953cc459cca6ecb2802becd4e399b4c98dcb714895f3a4196483ca90fd40687081c8b9cf582e830cad2f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.16.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild
index 3e90156692c1..3e90156692c1 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.16.4.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index b19321767790..4107be83ad08 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-plymouth-5.15.5.tar.xz 105724 BLAKE2B 2ba7c8daf2997bf8f422e687ff5636398eb5d84867814177c73a2d004baacbc2a25131585757efd615069dabaadd23641d646806d884228b2ac95805576198db SHA512 74df266881cebf5f1378975f6768e43e73a3ca4f6d8f1d73a4026eb1d046b9386887d40e8e8ad59fb9c96c45a6f63aa9b6c41a8d1740eaab4db515ab4c5a5310
-DIST breeze-plymouth-5.16.4.tar.xz 105708 BLAKE2B f3007e7534a9d58f904d4f449a6db5197a96e23b54282fea209d04cec0d2555192bb4d78b6ca4ad1290cba29d02db4013aa5bb39b098859974b4c8bc352156da SHA512 8b39f62338c18f1e7c0506b2fde36e2c235f14003328eb44870f0aad041808e3c3247bf4d6368d7f520fdc95b6fc840c1df916a62304fc52fe09a84f4476a43f
+DIST breeze-plymouth-5.16.5.tar.xz 105440 BLAKE2B 9a9e86347d4b683253266831a10b21162c01155e03de3195dd1ece75c97bf6e698c8bfd9876e5a8ccc1c5a6d525fe3d7ae95e689ad2c5d4235f348e2a19cd895 SHA512 2934d43c44b5683964fd14b3a5498c41989c5fb69182b29cef9bc588470c299f16662028e8c2101228a3c3299789ffdc21e33ed49d90965a2add2d9bd79a4ee6
 EBUILD breeze-plymouth-5.15.5.ebuild 496 BLAKE2B 019435f2ff2f1c3fcc1b8cdb4ef9f87e9e92c05ba6076a5a79224b3da19ae33be9ccc4787a7f8e0923ee98cb693bd028f108bb1e04409c7480f3988f762f3204 SHA512 a3348aa5226431aff0e64e3379ec7319ad8a5c05f94ee5ccedc6c63e167e2f09983677673d9fd0d944c129c20d07f0855aafce716e9d7112d500ecb8467d2d54
-EBUILD breeze-plymouth-5.16.4.ebuild 499 BLAKE2B 705edef310ca348127517e40c4e1ca6653187de5c002c9fff8a6cae10769e1c79cb559be63a23232c9852c6d247511f300aa40223f895c457db8820bcbacf6d7 SHA512 e4965983b73483e888c1086fd1669fe8dbb2c6ab644758c3f8d125f9a2e01161b839cd3540bc2e2deff87ab525ddd5dc5a0d4c311020149400243d30feb4ce75
+EBUILD breeze-plymouth-5.16.5.ebuild 499 BLAKE2B 705edef310ca348127517e40c4e1ca6653187de5c002c9fff8a6cae10769e1c79cb559be63a23232c9852c6d247511f300aa40223f895c457db8820bcbacf6d7 SHA512 e4965983b73483e888c1086fd1669fe8dbb2c6ab644758c3f8d125f9a2e01161b839cd3540bc2e2deff87ab525ddd5dc5a0d4c311020149400243d30feb4ce75
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.16.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.16.5.ebuild
index 54b797803dcd..54b797803dcd 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.16.4.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.16.5.ebuild
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 06d5be3b1952..395d49c53d34 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-5.15.5.tar.xz 25144812 BLAKE2B 00a477883384924cf9d77d659e9df4e31d442b94bbb2ad7b502e4cfd4aa5f40a01918654a738ef92db6ada834a10a7197d56ecb2994218a24d2ec0b0830f887c SHA512 a83ab125ed55f5da6b4e74ceecea5bbf5dc0f2b589b88764b2c0e501bfdc514e7b911e8a93b6e491f9ff0a22055fe8fa6611203f50b75fd624d7427e6c532391
-DIST breeze-5.16.4.tar.xz 16593792 BLAKE2B f8ade16340253fa28c8bc0b9061c7255050d2303e9ce8e4188e8c9f6688496bc3d6963f5086e6e10e2bc64796c9a44b21ee703f677716c215b1e14ee62463479 SHA512 35e0d06b2bbd954d261709cecb7e59cd30f3cfe848df2323e74637d7034e066c8bd19e06aa0b5bfa901b42df1060d1867c6de67632b4b68cb3a8cec8004d1d8e
+DIST breeze-5.16.5.tar.xz 16588516 BLAKE2B 25956c6d3293d4a8aab96ab2fc8e0ca6c73c5ac5329693ff8e728638ca42f3e07194a4b78d9f39c791ab1e5b0ccf8f2d8c350718d4649480aafccc9fac823d93 SHA512 28c1236078da8a9de21469ff1a01391512afb84bbd8beafb2dbc6dcb1dd955caa758a6dc6869fd11396fd5eed203e9f62b0b6e9e093e47e54d399cd61d52c8d6
 EBUILD breeze-5.15.5.ebuild 1147 BLAKE2B cb4dd4a77ad2127928d0ccc7d9c68c2157262d00be6dab67a23f69aefbee1e73292f3969841b09a6cc417b3f0b05687d502a882900a9cd4acb92db038016d900 SHA512 d65378322946d4cedcccd1e09b5146667cbb311785845da84936299d45d3187cf0451b5dd18ad4b698f2c1d006963555bcba2c8c27b2fea4275a89a18fd30e0f
-EBUILD breeze-5.16.4.ebuild 1150 BLAKE2B 839997e771c31e43b446f2d872837d998381d9ae287c8139860f6cd0f1919e353bac25cd9765f63388dc15ed63cebfb77e51e49e8f071dbadf546378d7404b58 SHA512 5c0e5a72ca0a2bc6a59293ac5e57440ca0c7a0aa6774ca553da7a77cd9135eee3b1579b1271959fa1ee1f6126d094dc3e829ebcb6553f6aaa57ec392de1309be
+EBUILD breeze-5.16.5.ebuild 1150 BLAKE2B 839997e771c31e43b446f2d872837d998381d9ae287c8139860f6cd0f1919e353bac25cd9765f63388dc15ed63cebfb77e51e49e8f071dbadf546378d7404b58 SHA512 5c0e5a72ca0a2bc6a59293ac5e57440ca0c7a0aa6774ca553da7a77cd9135eee3b1579b1271959fa1ee1f6126d094dc3e829ebcb6553f6aaa57ec392de1309be
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.16.4.ebuild b/kde-plasma/breeze/breeze-5.16.5.ebuild
index f94b9f2596a0..f94b9f2596a0 100644
--- a/kde-plasma/breeze/breeze-5.16.4.ebuild
+++ b/kde-plasma/breeze/breeze-5.16.5.ebuild
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 17ae81224ce1..3d42d402559e 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,6 +1,6 @@
 AUX discover-5.15.5-tests.patch 1208 BLAKE2B 287a2e6ac59f012577df87ea3358514813c958e085a6aaac552add865671bf02cbaba8bc770234b5e647c02d7f097c8749d8053a8e463d5605449686a03ad6b0 SHA512 a51541e75d056c1ea6cfa16a20aca221bb56ae8a940601ea4b1d4b5431366b807d5bf6832733a86028dae9901a4eca8aaf89929ffac896bcfc5fb20eec55d914
 DIST discover-5.15.5.tar.xz 10447644 BLAKE2B 456acc6bbbea216cde7a535fa591ef76316ee07f5ba57e6b3c6c20536b21877eb210f381cba8cc7c114110f3f7ffc4244163174bf8ae95cd022ca05a4be16bed SHA512 fc94bf3d93423d6327951c8ba76c2a08c7bd19aafbca7333e159af7500d1a78b464f7b5824b9168c522f052ca6cd322e9b5a26abd74657b99c734bbc7b864a3d
-DIST discover-5.16.4.tar.xz 10452088 BLAKE2B 0c0632a900c7907d9f10b9470ebf291c7c47d50220bfc73c887d3689fd5f88e711751e4d7d45bd4132d986da9d0a986985aeed44a606b8e219235edba1986c29 SHA512 7fe80436f7998d7ae54143377b11dc909c1e14346dea55e7c6a5649331102812dcd69f3eb600a06ab28b83ac6827300a4fc3cbc0afc83187e418c6eef44a0262
+DIST discover-5.16.5.tar.xz 10453308 BLAKE2B 03d497f9dd1685a356081bf43228c5859d80c40f3b45616e9919f6b3a50e193ca608a14e3175168c77d9b5e234e34ab4eb97c2294a366e47328044bdea98b231 SHA512 69fcfc9f8576dc5933f4e0c36ac25c518e2cd41158c5c171f760a4cd883018a6dd01ffa8984c80e5002830d6b9d706abbb7cedf3d2144317e482404bb821055e
 EBUILD discover-5.15.5.ebuild 1602 BLAKE2B b39611d39bd78d229a7bd5870ea61f6cc43c7a62a37ecc9c096fa74d38e781a3c5e97438b8da4c39329c6ba7bb5df7e93a14599e380669954f9c1d4945d0c004 SHA512 443155262ea5be8ee25ac4484e73c469b7c0192bae03ec1afd4cc80ee2330720141257b96fa6eb19a3b7edb1ba6e15fc9a4367b608f76e9f94b912431eac93a9
-EBUILD discover-5.16.4.ebuild 1654 BLAKE2B a654cecba7799c95c1c447863ead8cf6cd3e470bd6a928857252adb71e5e837acf6935e29eaa5aec789ccc3e5af60c5aacaeb8d16a7eb0b3c8391adadc307016 SHA512 1d8c74b715eee55f7e9653e5625bc106a164991c9496b99bf2333299573e3950513619a74a38ab62ca3f00add2b689709d901ce9f90e19fa84724a4ac9d6fd04
+EBUILD discover-5.16.5.ebuild 1654 BLAKE2B a654cecba7799c95c1c447863ead8cf6cd3e470bd6a928857252adb71e5e837acf6935e29eaa5aec789ccc3e5af60c5aacaeb8d16a7eb0b3c8391adadc307016 SHA512 1d8c74b715eee55f7e9653e5625bc106a164991c9496b99bf2333299573e3950513619a74a38ab62ca3f00add2b689709d901ce9f90e19fa84724a4ac9d6fd04
 MISC metadata.xml 364 BLAKE2B 4ed8b5937febc1af9515c186ab7eefbfb7d7520c8befc9a6397e6bc69bb355715e1a1b536909a7966962d0791a7a272c5591facee0901256862322d2d984a4f0 SHA512 27da3a4431c2f81e442980f8044f93276f7c4e005d5fc2dc92ebc6ec008fa25a441b03185426587f6357da764262c305cbbf998de2fe6c82b3f56a903d88e15b
diff --git a/kde-plasma/discover/discover-5.16.4.ebuild b/kde-plasma/discover/discover-5.16.5.ebuild
index 3de7eec2f778..3de7eec2f778 100644
--- a/kde-plasma/discover/discover-5.16.4.ebuild
+++ b/kde-plasma/discover/discover-5.16.5.ebuild
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 1657b864f0db..09211848ecc3 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,5 +1,5 @@
 DIST drkonqi-5.15.5.tar.xz 738752 BLAKE2B e0a48064a1881079f44c727a1bc08b9e8906b2c3e83a3def8b5fd406b6aa4d2982ebb885f3038692568293da2d933d521735724b34b40fbbcc96b139c1595740 SHA512 812206194f095a4862023a085ac2975c107e2774010598a6bf1b9b88b8dfa1e78819ac4012854d607a61bcba6dc954554ac178ccb3fd304ed27adddefa1fe8c9
-DIST drkonqi-5.16.4.tar.xz 744380 BLAKE2B 550ba55d3e385c0c89347611d791af4280db3303ff8519c4a33346e7f43d3a8c149e5c96d0316e0d08e6998495d1c916e92dee1d5f02737d83886bbf394557e9 SHA512 8623981b26cceea0238c7aa265453125970093d7edefe2cf2865b2e9384f59f44bd2f103c64f05c074c3f49d6691c22735d1884f86bead59f564544064b39f15
+DIST drkonqi-5.16.5.tar.xz 743220 BLAKE2B d878bcde06693b309be7ed9b8f6a9de952f41c00701fe4a4b84df7a557e8b0e996a9f37402c1d8f10363822220deccf71416412895336abee4acc77fef6c5610 SHA512 4d42e69301e4af88c292d6072055384ebf79b91240504c23f393abba9f7def5b15da9f252efa76232535ce6bdfe77238131c88b98f89afdc38a7a107e7dc8c40
 EBUILD drkonqi-5.15.5.ebuild 1339 BLAKE2B dcbcce6cbf6b138ffe393635fc24d883dfff5372bdc8e7498f51a151d5f29ac3c0f2b8712cc72d128ed07c4e741aa190f280ccc32575710934a6dd2629218465 SHA512 bf96866bde31e85e6f74da029b35980c549cf3fda7d7fa9c32b0896f71bd0fec3aa32288bebe97470b8411c37f27c17bd4b6059db6bda7f8c81c78bda042358d
-EBUILD drkonqi-5.16.4.ebuild 1342 BLAKE2B 85216515d8c91aec7461a95e0f988e0b4abf414b7ae0fd7a861099f55130300b1102ca0146e5c0cbabb40f22c51136929951a70769843d129de78ad98039fe10 SHA512 ddb22ec28d8da6ef2e42deb5187d295ad8a333f86bbec7705307d34708cfa8777921296eb9f3bf258af831593e1fe224cca7ce58a487c4a6923b721e28bc2ab8
+EBUILD drkonqi-5.16.5.ebuild 1342 BLAKE2B 85216515d8c91aec7461a95e0f988e0b4abf414b7ae0fd7a861099f55130300b1102ca0146e5c0cbabb40f22c51136929951a70769843d129de78ad98039fe10 SHA512 ddb22ec28d8da6ef2e42deb5187d295ad8a333f86bbec7705307d34708cfa8777921296eb9f3bf258af831593e1fe224cca7ce58a487c4a6923b721e28bc2ab8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.16.4.ebuild b/kde-plasma/drkonqi/drkonqi-5.16.5.ebuild
index 8dbc6989fc44..8dbc6989fc44 100644
--- a/kde-plasma/drkonqi/drkonqi-5.16.4.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.16.5.ebuild
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 206c918a5517..cb21240d8ab3 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
 DIST kactivitymanagerd-5.15.5.tar.xz 84756 BLAKE2B de13492cec3c4bdb29a8be01777c21cfc5c36c7f644d6d6fd7ef2bc502620031be1c94397e5b7806095a93e9e5eae7a5acfa149c3bc809635f3f3f43b01b1aa6 SHA512 9c9c066ccf7b56ecb0816be5db82dec7d89f9a834ef75a0f96d073d0d15470a57a84f811c17feb4edbf262fc44275d943fd7e06ec2bdb53860a4f6a4ea1b64d3
-DIST kactivitymanagerd-5.16.4.tar.xz 84772 BLAKE2B 399d7f3268722fc81ef387b9bac084a542d7a9b81a4c3421436c62d85d3b02ec091902c3a914599ea8ccfb65f106fa2e686d567c2644798cbb0168d5f2a30520 SHA512 78e363c7c5efe2d64bb26006eb94f24893e80e17596aa0d64d47d2d7a749ce3f34b18d350aac08ec5d53780806e9be7c142126831c3b7505c2fe1f05f69a1d3d
+DIST kactivitymanagerd-5.16.5.tar.xz 84736 BLAKE2B a3a83899abb2042b8d5891f7ad2f894b3242acdbc7bb8d4a0f06b4673ffc9eb68da9b93384e95e093ac519327f03101609a318d7e98ada0fe5440ef0820bc3f9 SHA512 bf305e7b8c095361eab9f621fbe2525f74880385c0ccd664e39588b9774f9ef2f4032e0cbc62017827927086ab98de2c2bf0d54802e7b6ca7ddf05724a16ecf5
 EBUILD kactivitymanagerd-5.15.5.ebuild 837 BLAKE2B 2a3cbe80bfe87d04be976a3d5cb0f9f3e3374620a76d1ac6c07933021a4f6b9d05294fbc9b7bfe088a2af491f6acc584e5b4896ecfacd4e8c309a67d0c2f129f SHA512 ce10a062c7f60a6b44691624dc82ccacb900ff43a88e812a2b1ee74304702b67412996a345dcf011a6fdcf905dd9d6c1c6785f4afc9b84d6e4edc6aa054dc1d6
-EBUILD kactivitymanagerd-5.16.4.ebuild 758 BLAKE2B de633f25fcf5a353d2c4ec71df7189058f7da0e9b45f85c185d53ee39e67b4ac05add8c8380269445b364c48b7f25c9c36b5032a71b3db386a800a934a95b172 SHA512 cfc0dd56d75092faf0b9a3065020ddcf57a5cfeb6765f32ff85741bf7986fa0d7bb037519cda357aac6cf86ddecab09ab6dbdc5b609f10f76b78708bee3170f9
+EBUILD kactivitymanagerd-5.16.5.ebuild 758 BLAKE2B de633f25fcf5a353d2c4ec71df7189058f7da0e9b45f85c185d53ee39e67b4ac05add8c8380269445b364c48b7f25c9c36b5032a71b3db386a800a934a95b172 SHA512 cfc0dd56d75092faf0b9a3065020ddcf57a5cfeb6765f32ff85741bf7986fa0d7bb037519cda357aac6cf86ddecab09ab6dbdc5b609f10f76b78708bee3170f9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.5.ebuild
index 0532eb4c192a..0532eb4c192a 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.4.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.5.ebuild
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index efa843ee69e5..c0a302002685 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
 DIST kde-cli-tools-5.15.5.tar.xz 585788 BLAKE2B 67693b592af030aac0b130b4233fe770eee2d4d4b82c7ee1997770403e7eb9138f997681a564e349a16ba9e119e95ceb7dba037f39f950f48a0a01a63f447770 SHA512 f7f9f8af72e6fe421a22bde996b5abd5ab194b7fb6b7252e63761658b143b98e8f49783b2a53f15b45c16a6dba6b064293237bd51ef7a61371293bdaea9359ff
-DIST kde-cli-tools-5.16.4.tar.xz 587576 BLAKE2B cf34f95a72ec46f2c8b50de832e40dde56d5e064e000189fcf3c77305b934ecb1a082ebe4ed26cb3d9d347d68ea364b0776f0d95af09e313b6c451c0b8eb502c SHA512 6855b7640b2c272a2dd40f40a85dcedb75e3a83d09cb58f6d3ba3f966c3a0f7e534d5516e52e2387105cabeeec4cd8732d5cf8562d35a58a9fd7aa43c70a5827
+DIST kde-cli-tools-5.16.5.tar.xz 587312 BLAKE2B 03b2188eb4ffefdc790c16fe791ec4e1748acae310655510490c8950ec03ef69f565d83d5d645a20f1d0cec2f52a27943dd0617036e99f3ca0e83d714bc085ef SHA512 11b5acd6bb0a6a7e566e8b6e6f24299bf23128ba1ed9cb0ae78c8e344da3c0769791b5543fac2152cae638b90615cf6b8c4b455a95f6d09afa515eb391370406
 EBUILD kde-cli-tools-5.15.5.ebuild 1542 BLAKE2B d45ca4e837e59a2b0b26142c7d2f9dd28129d64c499751ec1a086edfc49edef97546b6fa914ade07c60da96b37d2da52152ebccb909650c6bde968d41e072fad SHA512 aa02bbf48bb5c79186006e68fde4d08120c6c5b0ec4ed973a52dfbfa53c756e571a7cc58f2fbd31462e66b487e5ff25ad40fabbee15bf7a0c0e8ea12fa3a371b
-EBUILD kde-cli-tools-5.16.4.ebuild 1514 BLAKE2B 09618b35b7c272a71a932abff94324ea963f23dbb92431e790aa33a154f42a4f616a54dd82bdd20da30b5e95bbe2dfd541bfc483cb038e3432ba3e003adfda0f SHA512 eabdfd68a32c9edf0b41ec6351afc93c9c7e571e25706022a43a3c9f1f3c9cd29787a705dbe86ce8fa5c0473557c97f0b7a501a7229dd590de903ecba41e79d6
+EBUILD kde-cli-tools-5.16.5.ebuild 1514 BLAKE2B 09618b35b7c272a71a932abff94324ea963f23dbb92431e790aa33a154f42a4f616a54dd82bdd20da30b5e95bbe2dfd541bfc483cb038e3432ba3e003adfda0f SHA512 eabdfd68a32c9edf0b41ec6351afc93c9c7e571e25706022a43a3c9f1f3c9cd29787a705dbe86ce8fa5c0473557c97f0b7a501a7229dd590de903ecba41e79d6
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.5.ebuild
index fe466b4b22c8..fe466b4b22c8 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.4.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.5.ebuild
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 775c4bb894e6..7e10765f8f79 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,5 +1,5 @@
 DIST kde-gtk-config-5.15.5.tar.xz 156704 BLAKE2B 8c53c009c028ff15ab7ec1c8d8e5283c3b734ea92265962b3bb2459def86fbfe1f5b42af2b60eda1c92244e40b8ab5c0471e937ecdbd5564ab4551961400d78b SHA512 b783dd7451fe52a79e92e19c40f932456baa0522b81d982794f8677a26f0907bbf1f7817cf54c988d4aeb0e09f761e665e9f70dab270a7bacf54c391ff31f8df
-DIST kde-gtk-config-5.16.4.tar.xz 154228 BLAKE2B d719d3eaf5d89a74dedf1752f7e2eafddd6fd382ac267e0198a5abea1615a681207fd1f1ef2992cdae1976b59bf3acfa697b335923cbcbfc10a128f7aff6afbd SHA512 e3ecadaf706fe27e7fec0248266c4aab50c15358c19e79f253816c373902613e70448f2878814ca938a8fc7e217d4782d3f72640a99a4326f44e2260b4cfff6c
+DIST kde-gtk-config-5.16.5.tar.xz 154292 BLAKE2B 32dc80f3b77e502c5a5ae55e9b0071282c10b7a2bb47311b89d2a2242d8398cfb74ef18e4c50bdb3c458816fb1508e85f7b2bd90497b7a9d3cc9e92d3ff24e27 SHA512 42f02f1784a428cd7b83a8aa774aaaa57a867c18c7f0b23493639559d93f9410172cfd1d9b87226c6eb112135d9bee346f111023b70c41ced04ebc67891778f3
 EBUILD kde-gtk-config-5.15.5.ebuild 1245 BLAKE2B 3d1291f02a58851e8f39158a767323d4ae2c8318a4e1eed082c7ce7a4f9525ec08f2b19ae2e9da8db166870f24e35a8b3b352c57295d7439cabb47972b46e01b SHA512 839b86c955d8e5c004bb6fa62eca8fdc757b31f134ffcce8ca27dff70d70acafa263b22b7edc4a75733c9f9909fdcd248dacc7508cde8f93fdc770e997b6fd89
-EBUILD kde-gtk-config-5.16.4.ebuild 1248 BLAKE2B de32fe02e40e091ebbbdf3522f72e67c73327568d7d69c22c71660e399a31b0df151d17d9c6426d4e51712fe4ddafa15cde80a8eb6afe7efc48d075e8a82864e SHA512 24630089d989bed4293e731c40712c01f3cbfe22067b709ff1e7aff2931e11519852cc5b08d896d12ec203ef207334715b4694127c62e3bdbffe6099097b17cf
+EBUILD kde-gtk-config-5.16.5.ebuild 1248 BLAKE2B de32fe02e40e091ebbbdf3522f72e67c73327568d7d69c22c71660e399a31b0df151d17d9c6426d4e51712fe4ddafa15cde80a8eb6afe7efc48d075e8a82864e SHA512 24630089d989bed4293e731c40712c01f3cbfe22067b709ff1e7aff2931e11519852cc5b08d896d12ec203ef207334715b4694127c62e3bdbffe6099097b17cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.16.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.16.5.ebuild
index 03f067d76fe8..03f067d76fe8 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.16.4.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.16.5.ebuild
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 52577ad19780..6523de556e88 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,5 @@
 DIST kdecoration-5.15.5.tar.xz 42492 BLAKE2B c4b458e7b174b6ef395edca08e0c0d3787bb30596f76c538a8a537e31314f4f00f55751de92df80058e12ae0a3bc504af5c32aae7ee1b4664bb4495b71d4138a SHA512 8d004eacbf43726511eedfccd489eb91c2324aea948e9ecd111eb20b5bf89b4b88c3fefc237fe1d44029093e52bfa0cf58dcd641701364e51661b0ecff5f67e0
-DIST kdecoration-5.16.4.tar.xz 42784 BLAKE2B 9761cd12db3cc18857a8c19ad7e5f77b25778ec91c08d2690867fba6b99f4f140b533a0a1e7c5c16c291c840d3174670c30ca5a5a7af499d121b3cfdb9eac177 SHA512 c22e1e89ba11c18dede7dbab94f103a19e8956b2afb7b90464b44b2781297e355bb7aeb581b1ddfb735ae193fb48fdb8e2ae871029c3365212da9f26cf462311
+DIST kdecoration-5.16.5.tar.xz 42780 BLAKE2B 4e96b007550f5913c1c0d08b76a882a4ec8196340fec74c8c626c65f9ef8f84a80503945c506117961431aad18c4fa9e2794e9c111f36befde3292aab379ec1d SHA512 aaf7c24f7f6c77661902bc219ac1448cf2542645fb96fcc18f5751ed775a722c745f6d71c2d6b0285103a99b68446bb3ae59ff9bd8279dcb635dee6927fc000e
 EBUILD kdecoration-5.15.5.ebuild 396 BLAKE2B def1e5cbd94c4458d72e54b32a30ca73db9e4874796fd410b62847c4127d300ad814172da1e2e11f14197ed186152ee784e89c8986a7ef1216f5eab2f3cdb783 SHA512 577f92c9bf3ac7da92fa8f493a2ad4995c27855b21ec36b1de4cc307fe1972dabbcfa72a60aed125017e4144e67037721860dbb170a3210b8e4b5c545732721b
-EBUILD kdecoration-5.16.4.ebuild 399 BLAKE2B 5c28f9d7bd472162787cee9838c0a54d2b416798fed701d08b9ac414bafa4a0c0b662678fdee46244de13d513295ab9dd53c85f5cbf1066a01a1bd1b36687ba8 SHA512 e9aaed45941f0256229df553e2b11f147f6c07e5985ae738e2c6df879f8d14f6bb8a998a0979b8380147ff91007bed2f2c55ef344e4cde3d2307e5bdd81b3087
+EBUILD kdecoration-5.16.5.ebuild 399 BLAKE2B 5c28f9d7bd472162787cee9838c0a54d2b416798fed701d08b9ac414bafa4a0c0b662678fdee46244de13d513295ab9dd53c85f5cbf1066a01a1bd1b36687ba8 SHA512 e9aaed45941f0256229df553e2b11f147f6c07e5985ae738e2c6df879f8d14f6bb8a998a0979b8380147ff91007bed2f2c55ef344e4cde3d2307e5bdd81b3087
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.16.4.ebuild b/kde-plasma/kdecoration/kdecoration-5.16.5.ebuild
index 7b8168624497..7b8168624497 100644
--- a/kde-plasma/kdecoration/kdecoration-5.16.4.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.16.5.ebuild
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 6c9ab360243c..73f0fa233a89 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdeplasma-addons-5.15.5.tar.xz 604584 BLAKE2B aab24f3f8fee18f4e54a7fdf4edbe35923bf96751f27a656d60b141987174f257ae19b77301dc9b77999ef0f8c439cc3cf71be75a2d4a0b9623e2d23e9ec66d7 SHA512 cc0dff694c71645072c6a56bedaa9067a4947906e5167cd55012868a1554beaa5278d2e4f41092be784c8cd9290c03b807f6622a24941dc0b0f733442355fc80
-DIST kdeplasma-addons-5.16.4.tar.xz 594756 BLAKE2B 84cab97dd0454304a3f2039fd80b81f4cedfa2188873aa202041dd9651d8523461a0008bd572bde4a23ad2d8f87a68883b49399a3f1cf73324f4e5cc36105038 SHA512 d32daa32f7ff85798f5e17c302a9e47f8350107f924e1caf5921d4c081f42c548594d5bdce79d13de37fe567881b0ad5f343fbc30e2290602839563b6b49d6a3
+DIST kdeplasma-addons-5.16.5.tar.xz 600480 BLAKE2B 146c7ba77eb4ff973afb5e051d3000baebdea317b9e17482fa07cf575b2d4d8bce69590c66b0b4756cb971109ff701e8786a25108729aa7d65bdcb89cc945a40 SHA512 0bcbff113d71bb33a6542d78a250dacb8eff66c5f8bc84f9ec0055fe74ccb7ad2b5706ef3782e754909c75a95b133f3233b93cd7290d354df1d54dca1401d875
 EBUILD kdeplasma-addons-5.15.5.ebuild 1502 BLAKE2B 76742e80bfe694ba50e6a6939bec9d92343393cd3703e368cbc954dc9015bfe2a1e97117f5afee0420246ce8293431e07c7746ec8362008f9000dc8f10f4e6d2 SHA512 77ce447aff550b73bfbcc83d09f2df741d81d94a54101908f3de22226cb85aef5fa7107da7e0cb8c78056a5b76b0feb32ae55eda179f62d5e8206e90c65ea19a
-EBUILD kdeplasma-addons-5.16.4.ebuild 1505 BLAKE2B 3d3971f25ec03a4a4e9c83f57995a891535bb79c79dbc35554cff926235e4450e2963dd3b2d2db9f2ac01347565429416dde37d8420719fad1854b10801fbaaa SHA512 d3c15de9936142b51903cf1d87d88bba3ac21475a7bf93616776a5212dab5c16fab5828cdc597a83ebe71f329e6bde5a01f6219c83bf6cf882fa692e7d57a944
+EBUILD kdeplasma-addons-5.16.5.ebuild 1505 BLAKE2B 3d3971f25ec03a4a4e9c83f57995a891535bb79c79dbc35554cff926235e4450e2963dd3b2d2db9f2ac01347565429416dde37d8420719fad1854b10801fbaaa SHA512 d3c15de9936142b51903cf1d87d88bba3ac21475a7bf93616776a5212dab5c16fab5828cdc597a83ebe71f329e6bde5a01f6219c83bf6cf882fa692e7d57a944
 MISC metadata.xml 465 BLAKE2B 94fe9737b3b632b7c4cb0907ebe49ada7f7216ed88f5132f0b24f5f0b9532993744f9167c775a265bfe827d6b4d430c3949d82da49af275c286003f1d6f25bbc SHA512 c4800f7c56aad0ee306380ddc0f09f39c48565320d38349fa3d3a11e466b40bf35d2bc593fa70c3768dc940f635319ad848724f0ae537d12fa680e24d83110a8
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.5.ebuild
index 0d8ba38af27c..0d8ba38af27c 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.4.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.5.ebuild
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 3b3210b7447b..3de7f6911101 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,5 @@
 DIST kgamma5-5.15.5.tar.xz 79316 BLAKE2B 369445730b506756e0f18d0bf78106d1795ea2a426996c7e8f9cb8b335e26e427c5d0ce2f4abb3edf8948096058cb4f09e8a7ea82a22291c5bb2326dd01ac5f2 SHA512 fea6a5242aecf366b9c3e908b4d273efc8cae66ed0077d526d8e508425265cf4155503a999035ab5e73a646ed68131b783510634d553f653a964a5f8d8ac4fa0
-DIST kgamma5-5.16.4.tar.xz 79252 BLAKE2B 858bd9dbed0ed64f2896914d78da02fe2aab83d4954ba3cacdec2eb26ea38ef9290c3ef071fa00437cb2e25aa3e90325e6b11cc725e94b5cbcf808e9516275bd SHA512 633128b71a6a72a81b41697ac65a26f916e2da3272291a5197b7af2bf0059a9b900fc2bd8304519ced54015c71d7266c63ee628bd9d60265334fbca982ba3961
+DIST kgamma5-5.16.5.tar.xz 79436 BLAKE2B 7e07e8d25f16f220c5cbb0dd7615bf46e0f41bbc884f30bf6faa875bfb1aced21f49bbd79d07a3491e098b440dfa46917662989cb18aaf4886ae7ed8d0585c1b SHA512 0cbf4162dec3653710f9e2c8cbeb2e7c6780a3fac75f0abd3c63124ac538d8bec065fbadf0765155e77954be4b7c7375e565c1c834e5bc775fcb8dfad677328a
 EBUILD kgamma-5.15.5.ebuild 534 BLAKE2B b61bce78381c052fd20126557860beaade74fd4e71fb04ac2afd3d2d39a24d447cdd567fd098c9455f022f2fb7ddf4ae22fbd304d6590f5a4e2f4c4e3bfd0c07 SHA512 ab62a94185bb03aeef4ce999e01e937006b977ec4e2739590d6599b7fb4f775853bb6557db78a257312e5e2e66ebd101af36beb9fc6a9f14ef2dd187923f39a3
-EBUILD kgamma-5.16.4.ebuild 537 BLAKE2B 14670debd45ec35c56d3a1661fb6fe164211928d1c30b97170b1f284cab24e545932744c03f11d1a84f1d927f0e1233aac026b3d48f7ff78d2d3bf128510f8e2 SHA512 d9ea4e53f3e3a01661db05ae4abc408b09e55a1734531173f2035096f3ad97fb120224ce66e2238396fff4ec9561694aba184ddc6dceffac3ec9253ad4254a81
+EBUILD kgamma-5.16.5.ebuild 537 BLAKE2B 14670debd45ec35c56d3a1661fb6fe164211928d1c30b97170b1f284cab24e545932744c03f11d1a84f1d927f0e1233aac026b3d48f7ff78d2d3bf128510f8e2 SHA512 d9ea4e53f3e3a01661db05ae4abc408b09e55a1734531173f2035096f3ad97fb120224ce66e2238396fff4ec9561694aba184ddc6dceffac3ec9253ad4254a81
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.16.4.ebuild b/kde-plasma/kgamma/kgamma-5.16.5.ebuild
index 63ac5289c98d..63ac5289c98d 100644
--- a/kde-plasma/kgamma/kgamma-5.16.4.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.16.5.ebuild
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index d8036fdcd7d8..8c94c9e24782 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,5 @@
 DIST khotkeys-5.15.5.tar.xz 1865968 BLAKE2B 109748767e2119b9b54d29eade0bda4d5c696e67b35c549b10d0de19b890dc07a24e4108c3877046ab7468a4f98b6fffa03a818da11c00febf1f168fba7cfec5 SHA512 ad6f99053d7be4c530233d5384f59cc77b3463e1864135cd45ca17ee3eb483f8d503c089963bb758905d0c9e80a3248331905af117e01bd10a24fb4a61be8f08
-DIST khotkeys-5.16.4.tar.xz 1866004 BLAKE2B baa94056332ec4b06fed6085b01717c2c9c6a28a676dad7957099a248261b4b55cf7e710f7856e4e96a129fb21a3a27df4d1faf8e6bf1cfffa9fe658586343a7 SHA512 ea38d8822d83703ea6bb58d9a3ff1517c97b544ceba16094ef34eafff62fdc47bb8a2c02411699d34365ec077d41f02063cf28b9aecb5875833aa0eb117ad48f
+DIST khotkeys-5.16.5.tar.xz 1846184 BLAKE2B 3eb83840c540e64d9c30616bb366580f4e9c606a9f8ec3fb613019fac3112460a95059526a067af92fa005a175fa5bb72906e087451484a55fcae25b86feedd2 SHA512 f389396c058dc261a16f6a73f88babc24dc1d7226e35d798c77629bd3e15f1dc9bc2923f2eedb601df6517b168c251c8c6341f364ee14facf4d267e9e5358f34
 EBUILD khotkeys-5.15.5.ebuild 1118 BLAKE2B 85f6887495e61d2b0fd9febe31963455c8144d9f22b8baa69a7e5e7a7daba6333fb940d8219a94166241949b778f684ab9ce2b0c2ef5cdd5be4f031bf0a379e2 SHA512 aee5200908e2dbdbfecefeb6d4dcb8638d176fbf31771bb8221d409e91065ed117ff91e9e731c4cec3a0cf034330452d8ee5b7ee2d9435a01b98daae84812353
-EBUILD khotkeys-5.16.4.ebuild 1121 BLAKE2B 9e2dbf7571f711170c6671b6c63b638593b66480010c24ecd499e35221d7875917f09144ca6382bd946d925f95cfed565a31fc2d297d098fe0694ff340f85ed1 SHA512 fbcbeb7b6ff60ace5124f594c828fa5f7c86d15fab82cf27fb14e426757ba4a2e6db1778cac8c9f0b72923512f54a25a14fad7e65a2da1fccf570ae3912b3719
+EBUILD khotkeys-5.16.5.ebuild 1121 BLAKE2B 9e2dbf7571f711170c6671b6c63b638593b66480010c24ecd499e35221d7875917f09144ca6382bd946d925f95cfed565a31fc2d297d098fe0694ff340f85ed1 SHA512 fbcbeb7b6ff60ace5124f594c828fa5f7c86d15fab82cf27fb14e426757ba4a2e6db1778cac8c9f0b72923512f54a25a14fad7e65a2da1fccf570ae3912b3719
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.16.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.16.5.ebuild
index 90c8ca75d47e..90c8ca75d47e 100644
--- a/kde-plasma/khotkeys/khotkeys-5.16.4.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.16.5.ebuild
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index ca9b174262a7..0418dd79e323 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.15.5.tar.xz 1321684 BLAKE2B 51a3b49a5b724d187f58513c87f0618b1ee71d00e4ed51019017ae427602b7135d6bd9419714c431e3440f8a27152c4a72951d929b727f200c5cf1d72fc3ac84 SHA512 d75561edc65701097e4c9249f1cb7208e14ee1e99acbd6521606c99ac8e4ebe9ab42a804d8ef7bcde138d3189e3dbd9aaad088563ae6364418e6119639ac3974
-DIST kinfocenter-5.16.4.tar.xz 1322888 BLAKE2B 4b4b605afac333c5ba8aa0dd08aeb025f0effe4a8e7d47ceb793a5d7a9903e9181441abcacd15066903ad9587a5140a3767b9ab3b717e03e089dad4b371281c3 SHA512 407686f5bba77c5907e550e0c83fb6dcdb2095c87ba9654f1483eb784847a67f58c26c9ceaed1844353ab495c01326f6bf840eb9c20f11a20dc48bed99e1c732
+DIST kinfocenter-5.16.5.tar.xz 1321040 BLAKE2B b8c1e699d23175bc1048233aa589e91c31625f8a93da2b3ade5f71bf410723c853f2b4f0654a78be1f2c7a2350e66a8f932c4c0c7db9bbc2c22ac3ef9ff5b2a6 SHA512 1b98515beac87ff5394c06dd6029a2688db27a900f4c85fd4884d332a20120d553c25b98ae5ccfd7da2e6cbaa866edb84809f49c1c19922f25241acdc9e56832
 EBUILD kinfocenter-5.15.5.ebuild 2594 BLAKE2B c65d7fb8b06d293b2148eb0fc7f24578f498718f530efd7cb0c5a34dbcdf15c853fe1156bdd5837e08ea23ad3679eaaa217bd87d9aa8f72dfd65c0bac9f585a2 SHA512 3f61f49de206c55be60d96324573cc7e13e7b162898f2b48769b7396b9ba9b889d390d73af1255423a10aa9e57e967700372a2d2fcd398eb743ceaf38f422e1c
-EBUILD kinfocenter-5.16.4.ebuild 2559 BLAKE2B 3f11ac44d0cbc64aa532d6da8c500050777a24063bdd6b6aec7e375561d49e85a5884e288acfc9a9a4924acdb8e211332120f3d37b2e99575ccd388f5daad65b SHA512 ed2481b3a29e22a27284a42137ea18f87f9802331956d2de129b66cd0fb2529d5a5a44a141153a61c18a35cd2c78faec038785f1fa4420ca05ddc77b5d9c36f3
+EBUILD kinfocenter-5.16.5.ebuild 2559 BLAKE2B 3f11ac44d0cbc64aa532d6da8c500050777a24063bdd6b6aec7e375561d49e85a5884e288acfc9a9a4924acdb8e211332120f3d37b2e99575ccd388f5daad65b SHA512 ed2481b3a29e22a27284a42137ea18f87f9802331956d2de129b66cd0fb2529d5a5a44a141153a61c18a35cd2c78faec038785f1fa4420ca05ddc77b5d9c36f3
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.16.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.16.5.ebuild
index 7bfec63201e8..7bfec63201e8 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.16.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.16.5.ebuild
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index e47f6ac9e9cf..70932bf74721 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
 DIST kmenuedit-5.15.5.tar.xz 810152 BLAKE2B 16471f36f678e628079901b66161fc81dc20ebef03d70d64716b618050068949ed790f2ab299a89c7a7f61534bb0fa325ac2277518a70f4a46de19bd9f5a03f0 SHA512 ef6883e554de54a3391653db8b9d307f39f2fb35401f3c1cca733641f0f2578d3dc0763c62ff4bb581b816b4699a693d9c5db6b52b2feaeece301f1777b9c818
-DIST kmenuedit-5.16.4.tar.xz 811496 BLAKE2B feef1227149028f6c4626ac7e600fdcae0519cd56b20c01a79fe3b15777567c31380d83d70557c84b213722ae8693c08516ee2c36fc3e561da0f56a2bfac20ac SHA512 5eb55894e912281983fb40e6c0d524803c5941217d9446123941d3ef7667b2e87eb956cc941029968c10ed2a618e571243d4fd8e5b7716dea9a4dde307e8c5fd
+DIST kmenuedit-5.16.5.tar.xz 810148 BLAKE2B 8fff866e2e98958c1a933b894eb1108f78d4150627e3bce9c3acb40a8bf6cb81ae946b38f8e783c9f37a7ec2c51655df29a26ba21b840db5c18930ee054ab6ba SHA512 a244585f6846ceb5ea4f207bb840effcaec86762e1ce36c30f3324a2bae2cea49f43697d7a7649293879d0e63b71ee5dca5e38c7bb8728e1dc5bff1c3a31e7e6
 EBUILD kmenuedit-5.15.5.ebuild 1045 BLAKE2B 2b4171b9a7a27c95ac9337cfefcad9fef0ea9a28acb3ef39e4b2ebd16dc858762030b356e1298ff0dc98452d8833a591b214562355070b24acd10d6f0acf44ec SHA512 f1c29537e2356fd1b24f994b018e7cd7401470ea5162f13fde5c26e8ac6ede7f9b44a397d84fc45f410ec0b3aec14268e57c76d7d2f81420387b57ef635ab097
-EBUILD kmenuedit-5.16.4.ebuild 1048 BLAKE2B 33b5773bc483dea75151a025d1fc2079175730d16eb812a973d9d52cb5c3e1a8b32d663c21bf672dd7b1e040d138230f5a08bbc62251c0d59b4f3f08684b3aba SHA512 74443cee4c3d33a3d7da865dd6729983717025557748ce16be8b7943b9670813f64f1a62bcff883811e183c251c5fc4577e1c3637bafc75c1518e19e4c65c329
+EBUILD kmenuedit-5.16.5.ebuild 1048 BLAKE2B 33b5773bc483dea75151a025d1fc2079175730d16eb812a973d9d52cb5c3e1a8b32d663c21bf672dd7b1e040d138230f5a08bbc62251c0d59b4f3f08684b3aba SHA512 74443cee4c3d33a3d7da865dd6729983717025557748ce16be8b7943b9670813f64f1a62bcff883811e183c251c5fc4577e1c3637bafc75c1518e19e4c65c329
 MISC metadata.xml 328 BLAKE2B cc8d80521bd21c44133754342167f505138a6950cddbb2ebd25a8c5d33aed81ae968049931a5a0b959e7cdf70625e41e0d7e2ea87658d628a1b35da5203d955c SHA512 9286db1913899ebcf8b0da8ae3ebd12b760e2b3631399538210ff9d4b15c7b62e28fd138e75689c5bd03a5d6ee4e412036ac7f10a45a56bee9cb04184036a2e9
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.16.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.16.5.ebuild
index dd5d4133f0ee..dd5d4133f0ee 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.16.4.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.16.5.ebuild
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 30dc9e9a5c95..55a897dbac1e 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
 DIST kscreen-5.15.5.tar.xz 123736 BLAKE2B 038e67270053fcae648ed90a277c0b04455afa9dd788943b135ebad1d57bf7b0bc9d5c70629e530b900747454aec829e476245340f08c8d5aa855e677765318a SHA512 29776af422e5948f9563b94609472155e2c5ea762ba40d362cf76469f5f9347f56103b819ccbd2a4b9e8b88080c1d573adae6dd6648a36d817ba71eb93ade809
-DIST kscreen-5.16.4.tar.xz 122644 BLAKE2B 42b94797a067cef30e0fa7a153cfd5e5edc396ee447c730f39c25780619f26419cbb74cde218e31475c9ca51254268bc791b6f7a4c52a29f00f9fd40d0010639 SHA512 2881f04df3dcb04fd4028ce43497efcc6d6d3d7ddb83f75077c7afbe0b0656064cc272868305a52116a2f3d5cf09c272b5fb034b0be5d4c792df38d15c81b012
+DIST kscreen-5.16.5.tar.xz 122200 BLAKE2B b404cd9c23004398f19513dbcb941958ef09a8cc28e149a370b297a4d49eccea484da89ed0fbda827c634ac00fa0651fcd9131c4949bb8de644945e0865acbc0 SHA512 4c3307894698ce8e781cf6ce27b0394725d1ada5e46c599ef6c4380a2213a0059004943b795edf9bab7b343576d4dc8e1d18add3b539f40381286d1b7e4ea726
 EBUILD kscreen-5.15.5.ebuild 944 BLAKE2B e3efb10975048d182736edc78a5fb7ed55170a41fbaba70b8ab3e566df19c9e138f5ce60094ce5418e6270ab225eea0dfbd0374fa554038e005a3f0a70ebfb7e SHA512 f81c103d465ee6fb15d791b014b14c311bb63e594314648945f68bcfe691f6308cd78c6eb8bb550461e1bc915d6b14a54a88a2173cd375a495487da5b4e03fe6
-EBUILD kscreen-5.16.4.ebuild 947 BLAKE2B 6a1f76d5d8db45cd7059ce70e1c081136a5c9f28fb0a40a9d92fdb942a4fab95df1720294e6bfde7a34e17d1d75ccee5b64eb1c74677642a842370848858cf0f SHA512 be541dd716d8226fb899acfd9de37190ff6e47d9532a18ba10ecb5d195d2648e8881e07c7002ff7eaec04902f530b26f6d0b07a01d123fe5773116038465f95d
+EBUILD kscreen-5.16.5.ebuild 947 BLAKE2B 6a1f76d5d8db45cd7059ce70e1c081136a5c9f28fb0a40a9d92fdb942a4fab95df1720294e6bfde7a34e17d1d75ccee5b64eb1c74677642a842370848858cf0f SHA512 be541dd716d8226fb899acfd9de37190ff6e47d9532a18ba10ecb5d195d2648e8881e07c7002ff7eaec04902f530b26f6d0b07a01d123fe5773116038465f95d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.16.4.ebuild b/kde-plasma/kscreen/kscreen-5.16.5.ebuild
index 1210d802105b..1210d802105b 100644
--- a/kde-plasma/kscreen/kscreen-5.16.4.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.16.5.ebuild
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index ee1d1a20d0d5..f75396510e06 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.15.5.tar.xz 122620 BLAKE2B bb9cc80585c74690227f2f72961ff2ee707778fd4eee541840df85d04da7b5a3e8f75c7378cc4de8e45c41e1b29b67725e9b23461a0e8ff4bb00aa046100f851 SHA512 95325d3ab07afea22a10e17a2bc0f4412d57b96385b6fc058d1b9785a07914e1ce89af7a8c773615f884263dc2136fd7c7eb112dcec9d516a267262c37d15d12
-DIST kscreenlocker-5.16.4.tar.xz 122620 BLAKE2B aa45eaf40bcb45d31d2cac121bdda2b8cf628444f98060932ea6595493e940bc8bb29a3cce227ee13e1549c8ee5c7e02686d04a936c9382e67a0c509b7eb8054 SHA512 04c5d695d428fe0363277e8cc20a1d39b1fb662157ef42d0f74c3cf802bd39a8fd3ff35cc64bfa3ebaa5aa89fbe84d752809c24c8e3321b31abe8c2ebb7dc72d
+DIST kscreenlocker-5.16.5.tar.xz 122872 BLAKE2B 0a25fcad963696394de880b2dcf8263cc8d8bfaf9ab7ff70aaae497cb46f47574dcc180568967ae05ee95b9a818f5e66e243f35cfcfe29756632bef12ad56d18 SHA512 ce7cef6ca4bcd94f716b70df26691dc70b7709421d56827ef2e355a3350af71779168cf17c0437e53ef0fc930f20590a7e7ffa5f11ea01d3a4f2f25e1fa00549
 EBUILD kscreenlocker-5.15.5.ebuild 2135 BLAKE2B a14c5c11963076d1a03a4fbf1ba8985e102cf9c4e6e6b0b2b7f304e25d36c508d591e2926dd407478bb76618236a3e070b1a4c286bad0b9c15b52a8b44307311 SHA512 32322bdf390d97b2d110423055e4232e15fdaea889c30e9d84b808edab65f0e6515c110e9a9d8842fee2f94a55db25bc182ca14ab2c5439b4046156b15553e59
-EBUILD kscreenlocker-5.16.4.ebuild 2138 BLAKE2B a50326029f9ac096289a2188b747006fc645b7fb5182147db1df00d4a499b578d1ceec7550e05968d9cb6005feb4dfa2784c35dbb27afe0e1a1ccbd0ebb285f1 SHA512 ffbdcf42ebdd791a16d6c1351a739a2a8ca9e0322facaec57b7ae290667d10ef76f2d6460eec5d7328a9a07a11ddc95939c0746677c0336c9028010ec5c958d3
+EBUILD kscreenlocker-5.16.5.ebuild 2138 BLAKE2B a50326029f9ac096289a2188b747006fc645b7fb5182147db1df00d4a499b578d1ceec7550e05968d9cb6005feb4dfa2784c35dbb27afe0e1a1ccbd0ebb285f1 SHA512 ffbdcf42ebdd791a16d6c1351a739a2a8ca9e0322facaec57b7ae290667d10ef76f2d6460eec5d7328a9a07a11ddc95939c0746677c0336c9028010ec5c958d3
 MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.16.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.16.5.ebuild
index 7c403e5a5574..7c403e5a5574 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.16.4.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.16.5.ebuild
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 69d4a955ea6d..a23f1a342d4e 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.15.5.tar.xz 21304 BLAKE2B 8664f783d08d789aab81e40cc6d0a7248f0fe25bab20803579ce0c3869a412d2fc8fecf709b4bfe7d900dc7b9af59042d4e648d5b5730a8fb7108f4ac39ba362 SHA512 296581dafc7068a0e536fb3f10dbd56bd288bec5b93f96e5f7d7b03be6cf9f279dbdeccc8c53da21316fa18d758e92513d8f5441d9e80dfee452c26ef1dddcbc
-DIST ksshaskpass-5.16.4.tar.xz 21352 BLAKE2B 3de1328110a9eb699f68ec99bfc1906f856e1518da212305beeca9feb8a85fe8ee757ca8006a7d66a0cc5d49788a1ebdfbd020c054ee97a26276858a68eaaf6b SHA512 4dbda2809cb6a8d5dad072200b48695e45014fdaee873eb4e078f80dcd230ae5509c5465cc492db117eac61a072a57a90fa75b7c79a61648dd8863763a4053c0
+DIST ksshaskpass-5.16.5.tar.xz 21416 BLAKE2B 832f4fcce536feea013ae3b71f1346e6dc6ddddc6036b000979d0860181a40f2eaf016c0ba59ac1fac929eabeed51a494fa55f8da062d58c27bf9cc711787f72 SHA512 b2ca1245ca55fce2fdd722b5b318bf137efffb9d6ee8ece30706cc369b51e1943f738cd95be29a01fd74e184175f4ce0d6fefdc58a2a621d80358dbfe293cfb9
 EBUILD ksshaskpass-5.15.5.ebuild 1208 BLAKE2B ea2987af04a4d3f03040a66a782090fd7e6be7194b30bb9dadaf2f0bb01e95b12616efa562563f4171ebbb9489828a37dc44416b394b5d242e1c17ec77d4b43b SHA512 a1cddc2234d04f3df3ad15f81c50e2935c752e9913d69da6b0bb6e0c7a1c6319bc63031a33c183d7b66456fc628fd62f166b020db34562aa1ea6ebedb0012306
-EBUILD ksshaskpass-5.16.4.ebuild 1211 BLAKE2B 587e6fc37bb3ecd4f9d3fe17b11cc22228f41dadf34f3fabdf51dcfae453f22dd2a0b63c18897763a62f2ebddf697e6e2ebfbd39429ce99f43efc63f91795947 SHA512 34b197bf82cf085c5fd9c2f5af3ae895260af6ceeaff95e95f46f41116762ef57376fe129ceb27a9c5cbe5cc8f212d9c897555df64a443ca22ca452a9f98fc67
+EBUILD ksshaskpass-5.16.5.ebuild 1211 BLAKE2B 587e6fc37bb3ecd4f9d3fe17b11cc22228f41dadf34f3fabdf51dcfae453f22dd2a0b63c18897763a62f2ebddf697e6e2ebfbd39429ce99f43efc63f91795947 SHA512 34b197bf82cf085c5fd9c2f5af3ae895260af6ceeaff95e95f46f41116762ef57376fe129ceb27a9c5cbe5cc8f212d9c897555df64a443ca22ca452a9f98fc67
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.16.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.16.5.ebuild
index 55652bdcf792..55652bdcf792 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.16.4.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.16.5.ebuild
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 3ff739244fc1..a343a224239a 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.15.5.tar.xz 500116 BLAKE2B 1a22e419af79685e241265d392eed7502998df88168adc4292c8500a152a8d1142d56c4a34dee409b29745d8a07f889c241b3ab9ab8f09f3eec68d1ec5826c79 SHA512 ae74adac0a4b20d9ddcf9b172542a3c96de46adb66b2f6c1d4e5f97562572e365f777d1daffd82e677ca1be37e868425112f69bd6e85e51118dc557f66ab5b8e
-DIST ksysguard-5.16.4.tar.xz 500548 BLAKE2B 61f83de8dc95ab662b68b834b0cadb3ff2fea1dfbd9ebf3f928a8e6f4bfe0f551e05c32ad7738b71d0580317bce84d541ad691e6280cb15e99c03310a3aaec72 SHA512 177a6ca6b3937275959f2855184e805f09e643f04787ea077ef137d0561150e2deabbe1bd0388045640f0e88c01f031804a1060ad4df14bdafb91f7daed4c427
+DIST ksysguard-5.16.5.tar.xz 500304 BLAKE2B f2e5cb8dd43df8fc16365a0f263bd769e2b01e071ac8e4e49260aa7de5a6e63c70a95b87831a0b2910f523a37ba64d923a20b8e02866fbe8f0aac0f73d85ed7a SHA512 579175da2cc4d9255b36890b716e1f060106a24c609d4cd92accc38aa2c47bf9723e1a19dfa80678619db811b59b40c853655bf678c187d802e137978c3a970b
 EBUILD ksysguard-5.15.5.ebuild 1115 BLAKE2B b111aeed28af34f6abec20f61a9fa7b3c6e3ea4705d50d351a726f3d7078885250f60fbe6b4dc82ee9971365eaf441030ea2ead6142e0f21532cd1b922e66b05 SHA512 3f84a0ef64d5b2741e31599d2fe79ce886967cb3e232a63faaffd07439567c1390804524be22353ed8f26c7bd90a64aadc1a2e99aacb2a5fca81035bbd47ac9e
-EBUILD ksysguard-5.16.4.ebuild 1118 BLAKE2B fd549508418aa805e816b357bc16f349774921dc3566e16a9b95afdafdaa3074da54a073285407d5677c3a1432e3f2b2b2fda8e270273ff6a4259e30389abd1e SHA512 a825e54d5730326648c702866c2bad500554bfc0f890d0c7590c9a21e3ee7cef352648f7396c71fb04abb421a4cac66c96c8a8a809691a457288fb652cf76ff6
+EBUILD ksysguard-5.16.5.ebuild 1118 BLAKE2B fd549508418aa805e816b357bc16f349774921dc3566e16a9b95afdafdaa3074da54a073285407d5677c3a1432e3f2b2b2fda8e270273ff6a4259e30389abd1e SHA512 a825e54d5730326648c702866c2bad500554bfc0f890d0c7590c9a21e3ee7cef352648f7396c71fb04abb421a4cac66c96c8a8a809691a457288fb652cf76ff6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksysguard/ksysguard-5.16.4.ebuild b/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild
index dc21acd63e69..dc21acd63e69 100644
--- a/kde-plasma/ksysguard/ksysguard-5.16.4.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 0e51d3e6956f..d9e85353deef 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-pam-5.15.5.tar.xz 19332 BLAKE2B b5d552500584888d6fd2662e7332623f51ec4a90885c983f492fbff8768b144a5d0bfff8e7466f68b833bbea436b9424b55f221402e1c9ddc8626be63910b521 SHA512 4a1a0b6f4d607a71b2dee3317acd0af1c76991a628be50d67c8231d756255577fe90e0f938050c8f6d6f295d5299deb8a88afbd7eac28050d3b905267bfd7636
-DIST kwallet-pam-5.16.4.tar.xz 19644 BLAKE2B e40cbd3ec345b9fd3d43d2d1a53eb72d3c6dfd6413d787c5b4680566477a164a2f8bf0c2c82b0a6d8d71cc8bc6c5e06d171642cf1b60645c3a70482cd9bf9dc7 SHA512 5072afd940bc0fac823a6a050868c41bba27eb48a5a04b83e70a975c744dff64d23e1a1c2fcadcdd45712be94d0395ba13d6f8565abc9767d68eff6ede4fdcab
+DIST kwallet-pam-5.16.5.tar.xz 19512 BLAKE2B dc053b8b02d44a3b94fe16d50b03bf91718392bdce60e69b956e5a84406012b567f4216b08b4d05c215cfa0e9e16c7537b60420a80bf501402a7cf302b853d9b SHA512 6a3c09b645a193bd5164525c6ca0c807a0adc141566db7436101784fef8def79e121c599a837dac32393f8e5ab2c33a9473a29013d07bd64e6a8eab32308d3d1
 EBUILD kwallet-pam-5.15.5.ebuild 640 BLAKE2B 1eb4773d6f5e02a860e49fa0582fe49067b89169479f41cbcaa4b2a27b39529d7e4a9ce2f7d882501aa8c19b7b6a89c7f814ea337602546eecf39f282cac5094 SHA512 be24e213ee8eda14bf0e4a2c49af3203755c4b3fe126500b4895270baf8aa3577473c0e58c2b800759761f5f6b4ce746776b5b5af33147f7691acb8a7526be15
-EBUILD kwallet-pam-5.16.4.ebuild 659 BLAKE2B 87db00836f71e415e22d55d4d3b41dd7430275056fce5f4b05f2a1ecf73479e2dc1289caa83d70e33d0127942ec4f164d128da9e8f362ab5d313e3c75464f559 SHA512 4aa973782be2130b979df7a3ee0af73ca8276ee0f79c3553d0cb25e02338d99bf13b4ca70a4d77a354f4c42ddc4d22eed7c40e882f4d37dcb53a83720c874245
+EBUILD kwallet-pam-5.16.5.ebuild 659 BLAKE2B 87db00836f71e415e22d55d4d3b41dd7430275056fce5f4b05f2a1ecf73479e2dc1289caa83d70e33d0127942ec4f164d128da9e8f362ab5d313e3c75464f559 SHA512 4aa973782be2130b979df7a3ee0af73ca8276ee0f79c3553d0cb25e02338d99bf13b4ca70a4d77a354f4c42ddc4d22eed7c40e882f4d37dcb53a83720c874245
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.16.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.16.5.ebuild
index f3e1c598ec6c..f3e1c598ec6c 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.16.4.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.16.5.ebuild
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index e44615ac6029..15327022faa9 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-integration-5.15.5.tar.xz 18820 BLAKE2B b71beaff2c0722e1d824f833d130e2577c48716302210bf34f74fc3b5c9defd5b7501998a7f3e3bf922ca488ec16c36a18a7d881b53aff46e8e6bc60f34a0d45 SHA512 87051e785cedaf373c36cd17519e7e86d3110e6cd6c08fbff27b8fe4a890c1a935dbd6d096291dad2788be849c1c4e17bdb8014fdeb3383678a6b36cd30bab1c
-DIST kwayland-integration-5.16.4.tar.xz 19340 BLAKE2B 99a775daee2772bb5d1c1d8249f4efaf9af1599b96bd0c2a0c848c93ee6f23b66c552dbab6559713ac5e4f48a08e66700f8ddff212778139db61ae1eb7b8fca5 SHA512 055e74073dcea0559e2fd92c98433d6cc053ff4adf7a69384f09a4e8de73f71c58e6da4f32c5103166f4ad28cebf8f6dcbb63ea871040d3a3bebe79a8a400c39
+DIST kwayland-integration-5.16.5.tar.xz 19320 BLAKE2B 8c803397cf1bb0f94332c768911e0d5f91841bcd8491acb0169ac738550ac1bfae3990cb6d7966b9067cba9f86fc1e838b4b9732fbfd06e2bc040a4e170d3009 SHA512 c37faf39de7712c59ca1bb3c3df737bb660e7457cb66e60ff505d0484f2d0c1376306c822b63e19c5f5e578f44deea69739baea5c19039e562bd50aac47c9156
 EBUILD kwayland-integration-5.15.5.ebuild 554 BLAKE2B d28247ea10e8f9f971e66720bf70d7ffb84f0707d8c8a301ec5b80b3944c1b58850f2ee4863f3525104f1fbe6504ab661711bed51e306e958dd39f8bbf82854e SHA512 d27d7657ffa91e210bcb979a02223146041c1b98dc8e67cb62db28de28d368203a0af2316cdda2d8c1d70c9feb6a4b21c07e0d4448551831d4942b4460f46a59
-EBUILD kwayland-integration-5.16.4.ebuild 557 BLAKE2B 9dbf387f99e3286af76e7acd3b1ccc6e7ad5d4052f9e5dc3fb033e8393de851c5be13d42c2d470aef691b5b876c9cc4ced2ab73e5fb4ae976f69aa7cc9ddd6a2 SHA512 ee90cb760a7240b6712179af0cc2f815b2d5f809a7aafd1259cc013cf92b6137ba2926e8f8056e1be7bf1a64a4f18c8c348b2980a1a097d815f606b02f1334b6
+EBUILD kwayland-integration-5.16.5.ebuild 557 BLAKE2B 9dbf387f99e3286af76e7acd3b1ccc6e7ad5d4052f9e5dc3fb033e8393de851c5be13d42c2d470aef691b5b876c9cc4ced2ab73e5fb4ae976f69aa7cc9ddd6a2 SHA512 ee90cb760a7240b6712179af0cc2f815b2d5f809a7aafd1259cc013cf92b6137ba2926e8f8056e1be7bf1a64a4f18c8c348b2980a1a097d815f606b02f1334b6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.16.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.16.5.ebuild
index bbef91320933..bbef91320933 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.16.4.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.16.5.ebuild
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index ce4048cfd852..60a15d44cc56 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,7 +1,7 @@
 AUX kwin-5.15.80-gstreamer-optional.patch 469 BLAKE2B a231355b487c290d69100212ff14a420c48dc68395bbf4cefe7e166c03ebd529e3ad4eb366cb05188759416ef09e180d92ee3aa4d47feb37b58b5f266d370dbd SHA512 c27fd413a279e46ebf6392b138a8916588a51747aa452dc1affa80aa261bd117e05c28029cc7dc57c5ca19fc4f2ed162ef25a527c89491b2ba22a73082335333
 AUX kwin-gstreamer-optional.patch 523 BLAKE2B 471af1885be73ef7ea48054ff9451faba750008117903cedb073e2ba217cb48f386b48824af95813e81646afebddcc99e01646d507b26a94e8c55fb5b90f9c40 SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3
 DIST kwin-5.15.5.tar.xz 6237440 BLAKE2B 6e1b2bccb9450a15cccdf258c9b75e5651539cb05619dec72f4c02ba555ca3a98f57d8565d1ba59a0e85436bffc7e1960f36dff7b7945789f577c28892a5871c SHA512 2ea3af33cf79e7acde996c87507d277f114f2491ff3090cb0335ce6d026ae06c6ad83aa3fd5b86bbb01791cca747291ce801fc2d93d20e6d7b88f709893a3f53
-DIST kwin-5.16.4.tar.xz 6262844 BLAKE2B 064f1409a3ee098f2c492b19ec185a56d36d2c65432f6d62bb750026760a846b75aa36413db6478a8061eb58c1c38c3f92d734ffad23c71ccaf86918f8762c10 SHA512 da008c2fb31e0aab23dcefbdc53d9d53b53ee0aed3546585a93e87e1857fc929be3d013c7e75b8aee5651c54249a798afb1612535d03c189aeed9ad3c6b528e5
+DIST kwin-5.16.5.tar.xz 6250592 BLAKE2B 3bb7e18f993ddc405d1d6ba20e6e8c1770206f7adeec34f60e3f015a7ddf01c7e28d0908e3c590e7a98fca526fe4698b30d116132f668924e58618efb7e32a92 SHA512 26792c58dbdb6d4c452c7953f16ebd67a0115547e5cd537f4e0facf94e461845df8261a106260c30ea6a2ab9b4b98c748ddbe35ecd6de78ba3a87a1d62e05a93
 EBUILD kwin-5.15.5.ebuild 2633 BLAKE2B 39301fd6779ab223bb51997ee4f3423fc0546c2c73f7cdeef5f51d60e9cea13d30b67c419bbcf4089d43b5f30ce22acbf35fe02e2cf521fe4b395d08eb6f08bd SHA512 a53e58cc6c5f7edb45176ed6b5ce3ad8e858ef40134395e3840d4594c028543d7a68084fc52d72a3c623599107bc83bdae3d054474dbcc781562777d4bf4db8d
-EBUILD kwin-5.16.4.ebuild 2676 BLAKE2B 15fd92b6b859f074748860c3bfc6a38a580a8ec3e38d10f6947c76bb70bbf6208eb486eef57f5921542ce9d08e9a1c27dd2869b265f067c6177ae3ad8c55950a SHA512 126a25e6e09045bb2aa684ef59792b9a2319eab9b2d2c2037a584c10894c4946cfe1005e87422fb33273d4bbb4d21d28a3f5f398d905159da2048ce4a9aa5026
+EBUILD kwin-5.16.5.ebuild 2676 BLAKE2B 15fd92b6b859f074748860c3bfc6a38a580a8ec3e38d10f6947c76bb70bbf6208eb486eef57f5921542ce9d08e9a1c27dd2869b265f067c6177ae3ad8c55950a SHA512 126a25e6e09045bb2aa684ef59792b9a2319eab9b2d2c2037a584c10894c4946cfe1005e87422fb33273d4bbb4d21d28a3f5f398d905159da2048ce4a9aa5026
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/kwin-5.16.4.ebuild b/kde-plasma/kwin/kwin-5.16.5.ebuild
index 79cb991cb41a..79cb991cb41a 100644
--- a/kde-plasma/kwin/kwin-5.16.4.ebuild
+++ b/kde-plasma/kwin/kwin-5.16.5.ebuild
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 9af3966e809c..92c8bafb7928 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,5 @@
 DIST kwrited-5.15.5.tar.xz 20024 BLAKE2B 58648cd5867f0a07636e2ed9e299cea98237ccb4845aa1cd9897cb910ede6baff6def2e2f4ad42b4c90de0b5117c0c269efbc69a44636690a80b36235916236c SHA512 0c59ac76a64a20e49e14681bdf7a67194749a84ebb2224bcf183943d29f4e3669198d2a82a156a9d86b4865e1110e542dd5243045844ebc0e0bfa98bd6134089
-DIST kwrited-5.16.4.tar.xz 20016 BLAKE2B bc873b99ef79dbc9ed5cf592b335a8e54bccb322d9f40de7be7c5b95b918c5ad68b2d1bf28f1ffac8a26ee8e861f688cd7cc4ab7e2ce513b9cdc991c536ff4fd SHA512 7307d12f197033cf7cb820c5a0579cd33b872c7f5c55a48903dbee9fff7a8c547d3d8dfe8586fa227e25a8ae365c5d006c8c6d22a092c504c276d2eee4eb205b
+DIST kwrited-5.16.5.tar.xz 20032 BLAKE2B 0647833467e49bc9ef0d94d6750f6d8a73149a7afb6271d5c06cb08217231a59fba5c2557b71d76f12c0f54ceb1d635ac8967a9bff64a264d51be987ab6e474f SHA512 fdd3d148b3467392c6475a6d86735e7a10114e700b50badf572fb378c0ee20e280421fb43944cfe33d164ff7c94e11e5c8bf67d484ebffabc5a8cba21a4ef96e
 EBUILD kwrited-5.15.5.ebuild 480 BLAKE2B a6dbe8ff13271f2749d8be7b30edb1b95df36671f12a75886e10c11070d5886e6680a7387a9b3d484fab03eb88abf9c9dede01b0e66a945f5e5cccf5c981c277 SHA512 afa3ce11dc93eea3e08af463ff22af8f37350e774f1c967f4e80cc36cf4e0a5d9538834e9b455f131ba3c74471383ab286099b58334fb7e6100cfdb8ccfbb14c
-EBUILD kwrited-5.16.4.ebuild 483 BLAKE2B 08e0c850fae43382431b7d5bb3f913e2be9f51cbec877230144233807ef03af2a5bbdf4448779c9326416b6f6456c5e3e935130b450acc3b6e543478a927bc21 SHA512 6bdb6d91af25c404bdd7ca370b277d3a51f832ea8ab8ab42c7afa651513daefff89db63d19cedb134a62c0ed5bd3f227d286ca7486187e46c6379ea2a4dd560e
+EBUILD kwrited-5.16.5.ebuild 483 BLAKE2B 08e0c850fae43382431b7d5bb3f913e2be9f51cbec877230144233807ef03af2a5bbdf4448779c9326416b6f6456c5e3e935130b450acc3b6e543478a927bc21 SHA512 6bdb6d91af25c404bdd7ca370b277d3a51f832ea8ab8ab42c7afa651513daefff89db63d19cedb134a62c0ed5bd3f227d286ca7486187e46c6379ea2a4dd560e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.16.4.ebuild b/kde-plasma/kwrited/kwrited-5.16.5.ebuild
index f94eff2f3ae3..f94eff2f3ae3 100644
--- a/kde-plasma/kwrited/kwrited-5.16.4.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.16.5.ebuild
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 432bfe2cf0fa..a89290c722cf 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.15.5.tar.xz 81000 BLAKE2B 53193ee41d81576c8f87053dfb388ff1e13c1fc7800956228e9f3d5e776789d4649e41f39829152bd51ba0de9a1ca6fe87b63e0870327947dea939da05488c81 SHA512 038ea60f534edfd1ceaf523a2d00ecb53f62b6f64ce9900b1313f9ab25b7099146167cbce50b31c799644fb0d5c9522a9bcbaad81e9022feb7532c911b2ec030
-DIST libkscreen-5.16.4.tar.xz 80988 BLAKE2B 56b76114e52e44c52656829f772e6301ed655f20998389b6c8a0b79f61e17358b7510c752ff0e998d058cafa39eff5473875b2ea0796f88159215d512efd8808 SHA512 84b7e0af12f95a385575ec71cbbd1dc189d463dd7ad189a2adc49b8dc665018e36325f86d0a949310e07b90e67bc8c5ff8f75e914947a013064377579862b9e7
+DIST libkscreen-5.16.5.tar.xz 81028 BLAKE2B 9afeb4f96c39ce7bf4771ec704da7d8f639af478ce04a0e761b29a13b6cadf010a88a06d9becfec76873b2c7c23c9419605914088b72fe86fbb946d73f8cadef SHA512 f9dd46052cb5b45d896c6c366383d912e659ec617a0214c0c887d4f78951f620c5d368fc55ea615f9999920b010bbbda4a34f7fabc2fcf6fa106cc3561f9e007
 EBUILD libkscreen-5.15.5.ebuild 490 BLAKE2B 650b346825abe5e379592b4054ee2fdcc5f2bbe5ff081550a8179f2d48f6d85e47d8e960b9c3105cc8b9c817c519ff7774dd091e6e17d0ae20c3ff7caecb1084 SHA512 becc6a71c9cf15fd0ca4782dc6a7afbd94f938994ab33925401d5ce9d2d87b4389b2cbbb569f354d7dc6e16d06626decad627856b6405f5ed1572e7d0c854310
-EBUILD libkscreen-5.16.4.ebuild 493 BLAKE2B 2146aa1a0295483478cdc4eaa1edcb55dbd43b1267c9a694a2e4d668475caa6ce656639ff4cd3ffdf767a1c6f8caa41bbc12beaa3251299f36dc93b488666b46 SHA512 7f0247e2c714f26ab403edd2f1bf9f310dbd9abeb5ebe292580bdcf2f8c8e05572f0088f95b4d5a6a9bc4942c33c28835c1d5c174b3c4b2e41b4e42d6773df78
+EBUILD libkscreen-5.16.5.ebuild 493 BLAKE2B 2146aa1a0295483478cdc4eaa1edcb55dbd43b1267c9a694a2e4d668475caa6ce656639ff4cd3ffdf767a1c6f8caa41bbc12beaa3251299f36dc93b488666b46 SHA512 7f0247e2c714f26ab403edd2f1bf9f310dbd9abeb5ebe292580bdcf2f8c8e05572f0088f95b4d5a6a9bc4942c33c28835c1d5c174b3c4b2e41b4e42d6773df78
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.16.4.ebuild b/kde-plasma/libkscreen/libkscreen-5.16.5.ebuild
index 175530ee8c02..175530ee8c02 100644
--- a/kde-plasma/libkscreen/libkscreen-5.16.4.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.16.5.ebuild
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index b6f34d556e0a..436bcb20cb8f 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,6 +1,6 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
 DIST libksysguard-5.15.5.tar.xz 575900 BLAKE2B 0ebe2ae85bce2b11f8be215112504fea728e9f60e272813b9f6d2c54e51b3d60a77885ea8c95eccadaade8f929353342249bd0e7148558c0c1965ebbf7e0aac1 SHA512 a87f58c6a9237261e05b4fb1c315383fb3eacb294279c3ab3b553c0dca5e7e416a31bd685d47da4a8cc777bbcc09d9bac076b26340cf6262c7aaee903baf127f
-DIST libksysguard-5.16.4.tar.xz 580356 BLAKE2B 9dc8ad34fb8c5beb5a960c21d993cb488da80745607bf9be6d6c4ddd549f5a9e51339deb18c9044fb507b6f01db1cc7b3b2138d1c74320946713881502dc26ad SHA512 51143a73cc9c2fb0c13ba51dcaa430689cd1b6562c1af934972fd849d58492aab89b481c1ce91a00e25ac36b6a55915080432fc70cdac27d56a9d44ad62ff555
+DIST libksysguard-5.16.5.tar.xz 579572 BLAKE2B b2236c7d2e8c3886852ef9fe09465cc000863691b68245697a7424983dc82b3cd50dc47c0fb8d69bd37f4ddb2c3a07ec0de77619ffd87d3631867223ae9ab1ee SHA512 be6d4806108b26613686ff06d9d9ea10610c87c556a90c0c8a233e0190de00d9b3d87489ffbb378d64ee7fd29eb9c58faeb2a9269d8f4963f8c5866b19388cd5
 EBUILD libksysguard-5.15.5.ebuild 1165 BLAKE2B f3ca2e5c826808b483398da5a851ba59d0f06b231cab2b57de6b6a628647feda3ee04be3ea8afc952bea4c3ed97d336e9b2b25183d4f96ab44b4fbc019aab8be SHA512 422afe6d04e6ebcda915a9b0dcebbf9c5889d80c61e3cf5e3f9a23e0c019134aa6343bbb6093076fb34a0efb412a4e4597def775ddbb3d3102ee14dcf4e5749d
-EBUILD libksysguard-5.16.4.ebuild 1238 BLAKE2B 0ee2706a766e4981ae4cb11c2c841f5d3dbb6724a78954d345bf5f4f1c7d67dacc4450679da4de10b020124b3cdcd1c1ddbaa25e03ae11d87f576826a219c6cf SHA512 a0c8e27d7924bc5ad3a77462a69f65f83629913abc8d82d2c80fce3d3f21af6255906223253c4cbc41a8aa5a7eba43e78462291cc2735a0238aa0a1ab4e25345
+EBUILD libksysguard-5.16.5.ebuild 1238 BLAKE2B 0ee2706a766e4981ae4cb11c2c841f5d3dbb6724a78954d345bf5f4f1c7d67dacc4450679da4de10b020124b3cdcd1c1ddbaa25e03ae11d87f576826a219c6cf SHA512 a0c8e27d7924bc5ad3a77462a69f65f83629913abc8d82d2c80fce3d3f21af6255906223253c4cbc41a8aa5a7eba43e78462291cc2735a0238aa0a1ab4e25345
 MISC metadata.xml 379 BLAKE2B 98ef8b13c4f1d761a090ac8b0cb33cfb87b25625955018d7c91d6250b5f83d299058c87944004581eaf13649614667bf2b0301eb00e92a9ef6913dedb753e44f SHA512 036552355dd07f9e255bfb3bee4cd8949cfb437c9df36a85467735c5e4d63f7d7239015f83dbfae9b5151f9cb34b4b4f59a62f893da48f68ed82852411013a86
diff --git a/kde-plasma/libksysguard/libksysguard-5.16.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.16.5.ebuild
index 4256bfb8e1a2..4256bfb8e1a2 100644
--- a/kde-plasma/libksysguard/libksysguard-5.16.4.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.16.5.ebuild
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index b1063af7a93f..dc864c2ecdd9 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,6 +1,6 @@
 AUX libkworkspace-5.14.90-standalone.patch 3376 BLAKE2B c76206c19939ebe7209dba4172ada0d0aab01f2520cc5ab465c40173d3e6c92cbb7ad9b0bc73e2e229d33792ee6313872fcab73994818e9100e0efdea64b78ae SHA512 6c6ddeca6e2178189b3d63ae77f7bee1b900842a72392fba812bd9231ac6f701fd1655d1212a286d914202c7182223742bb1cc93916f373db99925fb9a9411b2
 DIST plasma-workspace-5.15.5.tar.xz 4713728 BLAKE2B 7ce14912bf0dc2556484b7b719b00e7296fb67d78faabb9e3c00fbfb56a41db04e27b5f94636142f07e88e24d51ff308025a50d719a940e1287943a35db93e79 SHA512 5d5429114a733d4328f7db6c8e3c7dfe5e04862f8083fcad40b21390efb309c58fd1b13cf63aa57f2842c38936b9fe1c60ad61fc601cf4f592b86285c2270bed
-DIST plasma-workspace-5.16.4.tar.xz 4896860 BLAKE2B fb3f6c89db5bc5142ccb68ab6ebd13d7e0d878c999160301385d163fba0e97bfcfae9bda38dc07547171cfe8823b4375815f1371958ba35c8c9a69272dbaf572 SHA512 d597738c1122fcbe327a1917706e86ed0acc550ddbe2ef4eb776f1a064b09095c0f5d634675787353b90b8b37d24bbd454fa1d8354078bd4ceaa3875471a3bb4
+DIST plasma-workspace-5.16.5.tar.xz 4905748 BLAKE2B 049a4ff618aade78ac130c1496f6add0ddc391db5b025045eaee91fbcac0a0b9e7b44a06757c94699c1038b18a96a06eb31d4ab6518bfda6d308e12b1269ca04 SHA512 e55e89b6a8e3dcf68bb7ad4f62f284cd819c7461eff1269f84df086a2516401c26363cc6c3c8e6cc8e27788222b3ed81098d765a25e5d96d9274e3b342816369
 EBUILD libkworkspace-5.15.5.ebuild 1269 BLAKE2B ea0f0ead80950429ff9a2ff46fa5c65974b36c04287278cde657420259f3b182fe5fdb7775db38eb02e2535b175b5ac5936266688e362ff621ec011c72584887 SHA512 f137931810e653df1b8d3d7cebec3c4ddb819df4c91fc999aba19a597b35b8be183dd5c488315a03fcf48f395b9fb219c0f19ec24f8be5526ce077852c05dcf3
-EBUILD libkworkspace-5.16.4.ebuild 1272 BLAKE2B 85e7913af4bcdba91d15292e2bbc35f58fa84d65713fd356039fd2ab8023bcb0e90eb174363a1364ee6df7a48899ee2fac5b6e9de4313058fbec38c285887f88 SHA512 ffe9f2b168f20c9b5f8686170504d0714dbf3e082b628bc29934b325fc79f228a789b75a0b433d7c44fa37eeb85118353fb495285b5690123db14d298eae7df2
+EBUILD libkworkspace-5.16.5.ebuild 1272 BLAKE2B 85e7913af4bcdba91d15292e2bbc35f58fa84d65713fd356039fd2ab8023bcb0e90eb174363a1364ee6df7a48899ee2fac5b6e9de4313058fbec38c285887f88 SHA512 ffe9f2b168f20c9b5f8686170504d0714dbf3e082b628bc29934b325fc79f228a789b75a0b433d7c44fa37eeb85118353fb495285b5690123db14d298eae7df2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.16.4.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.16.5.ebuild
index 3dfe68f80a2c..3dfe68f80a2c 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.16.4.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.16.5.ebuild
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index e50b5b7855db..ffee844e4b8f 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,5 @@
 DIST milou-5.15.5.tar.xz 57296 BLAKE2B 7dd8fa3da98836354072bd4eb67a92173d839ac0432da5bbedbbb3c68c3d1022cb572864e3c0b0335a36efd364676416d07b7258b0e5d17db6306884e8bacd82 SHA512 4b0a7a3edc1d50c64a226ae49e3660635838bd899939004d42a33492ba9f2255ef0c3575e2155f1ff7713c8396a95afcd8659bb61c48dee639962359a562565a
-DIST milou-5.16.4.tar.xz 57452 BLAKE2B ea75b4bb8fac6943a5ecfac881329b63682e1305a2e7303db4cec8f628855dd30d0f2fc479a2daa918dd7c032fd9ae251928f5e1502db695913639f4c4f5dfc5 SHA512 8093bda2a19137a7faffe308bd040c2b4574c4c2bcbe794b9340f33204a3dd200f8d31affde6fb592c288cdaa36d3e291b7dc42a294f1fe62ee4e5cd203a20cc
+DIST milou-5.16.5.tar.xz 57700 BLAKE2B b813af1c1e0082c1a077464eb9db51fc4e526a63915a86d4b6c8b351c23590012ba12d6cbcf38e6c580346aa1b1eca7e6ab29a203035a2568833705cd28ee84d SHA512 70f8ab1c7dc1d3724e385cc959f3ad4b80efbd200c0dd9028cb123a07304b0c866c3a8a474cb5dcd0d2358a6b0ed888c85f0f6b8f43d8e057b16152406ea8ead
 EBUILD milou-5.15.5.ebuild 666 BLAKE2B 351ffaa6d72f89053cf4a167462f08ad39ac9064f9c1b93d2f09f0d402f9b0a6ae0c5a277e36ddbb2b2d0df52c7b202e536c79885d9db5496a8337a7fb2e16e8 SHA512 02413ffc787a664d9a23f07561942ed26943fd050967b7f51566bab98bb341b19811b24bc09332b53a5d7549e9f32c4d476d1ed61efc0cdbb4bbf3e9c6847360
-EBUILD milou-5.16.4.ebuild 669 BLAKE2B b818224c34f27697e7ac86cb4c17c183fe0c041a7f847ab7a70966a4e4843730daa82db0452b3d983a73502723b248a0e9d46d7d22a74a4711163dbd467b167d SHA512 27001ad5ef00737b43039cd77fb02c2507614c991aab955c71e023f6e73df1cdc2646e55927b498fb8576c5dd86236dfa83b606fe928257cd19ca74638974dae
+EBUILD milou-5.16.5.ebuild 669 BLAKE2B b818224c34f27697e7ac86cb4c17c183fe0c041a7f847ab7a70966a4e4843730daa82db0452b3d983a73502723b248a0e9d46d7d22a74a4711163dbd467b167d SHA512 27001ad5ef00737b43039cd77fb02c2507614c991aab955c71e023f6e73df1cdc2646e55927b498fb8576c5dd86236dfa83b606fe928257cd19ca74638974dae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.16.4.ebuild b/kde-plasma/milou/milou-5.16.5.ebuild
index 7662755476bf..7662755476bf 100644
--- a/kde-plasma/milou/milou-5.16.4.ebuild
+++ b/kde-plasma/milou/milou-5.16.5.ebuild
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 6975e6e66cb4..b55cbddf9b91 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-5.15.5.tar.xz 4473020 BLAKE2B 1c7fbaac142e80ba14b7fa99645590299b3b0dbc973ff12aa23114d50a4cf61fffc274c066ad90925e7796e3475a00752926b417f18705fe5712a5bb120b0c67 SHA512 fed946bf50e7f58ee247bd63dab2a5c371bf6d2c75cc64924e3de8e9b00faa003e2949dc78cc1babb352a043389d7f285d96731cedf0200b660d99131db0ecd0
-DIST oxygen-5.16.4.tar.xz 4473512 BLAKE2B f1d61cb3c7bc127ac992d000bd0c38a03a7bea87957546f41d534cf3a7993e793a852458354f2727bdcbdc520bd859b09c58d9c6e2e6a975733cececeb8c6558 SHA512 86d52bb0b490331d10535c2b27d8279b82aabc68c6de8638cbe4f52d14a6b9b8206a95b0982ac3ec68026f522082b2733478bfddfc7566cc395690c4180a2d95
+DIST oxygen-5.16.5.tar.xz 4466432 BLAKE2B 99ffbf358ebe687402d2ad08b01f0043c4c2510762a4eed9556d97727000d9a6144c712775c206cc4b98f4c247ed6d4fa96aceda0af6e82c2e75b69250ce8490 SHA512 6ed14b6fc454e22e837525efa7298245d62cd7c86a0f8b608960141f8820722fa9996214848309cb89d4212d9a8ad1384ce82e7917b62114aea8d65247b68951
 EBUILD oxygen-5.15.5.ebuild 1073 BLAKE2B faad900e7ec0be9d415095aecfd9c11fe83453779ef573e1fefe590dd2a6785e4702e8c5d7df833496f687ed3ff0a25d154eb48708114e5999630b2109ab44f0 SHA512 27d0986cd09174ab2aa82754e63d77bfac2ef61f86f66a9755e70fc52178f304d40e4612d322864d25c96921ffebfa9303421b14bbb4871a66076121f5337d6f
-EBUILD oxygen-5.16.4.ebuild 1076 BLAKE2B feff596c810b622049d8b155c6f101a29c8616372edaafa6529a3bf0562fb978eef0c8d55f414eff009eb6fea40292a66097292db70dda522097868bda8e5d30 SHA512 85299d2824ab0d4e436ab31897c051b735adabcb460d27ba501b14efe555a91873b7ed1d5960bdb46eb3a87156f61dfe95f36af09e22f21fc11ef9f2c7adea84
+EBUILD oxygen-5.16.5.ebuild 1076 BLAKE2B feff596c810b622049d8b155c6f101a29c8616372edaafa6529a3bf0562fb978eef0c8d55f414eff009eb6fea40292a66097292db70dda522097868bda8e5d30 SHA512 85299d2824ab0d4e436ab31897c051b735adabcb460d27ba501b14efe555a91873b7ed1d5960bdb46eb3a87156f61dfe95f36af09e22f21fc11ef9f2c7adea84
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.16.4.ebuild b/kde-plasma/oxygen/oxygen-5.16.5.ebuild
index fd828b90b4c1..fd828b90b4c1 100644
--- a/kde-plasma/oxygen/oxygen-5.16.4.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.16.5.ebuild
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index b053b9576e04..789aebe86179 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-browser-integration-5.15.5.tar.xz 118136 BLAKE2B fc5ead642b561ef383307fca9c06424ea17278fc951bb46f6555d31e7d9d7762a2e211054ba61a6ac83fcb817017745f9773402fdfb1a286fde5be301aadcb44 SHA512 c3f1ec7ebcb06ee6dc807e639cffb373cfe2d2eb549b18f7028e13991154107f474d923fcceea809399836bc3af6299993f91e7bfa85ce80e85c212640b1750c
-DIST plasma-browser-integration-5.16.4.tar.xz 122968 BLAKE2B 49dd562b2875a1b05085ad0e1eba43930f07a47403607eafdfadfe50307586343e6bdc1b50e0cd446c6d067bf493d5a3faa5e32f6f6692bfb67521def3b92442 SHA512 c4225e351ac9f465ea4db635d2f982d1d8f0dc72f9278da28eb548ec535a0f3ee73050620455f40e89f19d9c11c9902516bdcf6248fcf1f829a4d0161a5ea216
+DIST plasma-browser-integration-5.16.5.tar.xz 123784 BLAKE2B dedcc770ea524e5a10ae7c231ea800ae69ffe707dec135aabec3acad36c6270e0dd45ec82e8c0e4f0ca7bea758fbc63b0f380b718077b52dba9eec042fa5803a SHA512 667c5ef2dd0529e6c567e9d3e34e8e6df73e0101605ccc4a6712e7f47b6824407495102ddc9b800e411f53a1fdf0132caebf6d955c39e7a80b7ab6569d02d1b4
 EBUILD plasma-browser-integration-5.15.5.ebuild 789 BLAKE2B 7ebacc54feabf28effc14b439a1f989d0092930984b4ed18ce5aa5d2ce41467b9c2fd64fa540a5ef765610d7270b9df4569a9942d90a61de1eb66a04b1f4829f SHA512 e22cd5349e52f11afb652c1add7b9964f67a7129709a9ae70429f9d84206c27aa36bd413f7e13269991cc63b64e8505162969af255cceca92f1baa2a58b22d01
-EBUILD plasma-browser-integration-5.16.4.ebuild 755 BLAKE2B 8ac1592ba992838e1f3600b922ef6c2951876fcae50de6670b521f7baf1219f6994bd07cbbfb97b6358662f876cd531e9244b9544ed0bb53121a0a29425a9a06 SHA512 4ca521c04651d590db676a9eef3d4b1634022edd68265f084de978b2c5610d73a2a82398a3950fca4c2e74dbdd915255ba0f41beeaf37eaf3355e113b5a78704
+EBUILD plasma-browser-integration-5.16.5.ebuild 755 BLAKE2B 8ac1592ba992838e1f3600b922ef6c2951876fcae50de6670b521f7baf1219f6994bd07cbbfb97b6358662f876cd531e9244b9544ed0bb53121a0a29425a9a06 SHA512 4ca521c04651d590db676a9eef3d4b1634022edd68265f084de978b2c5610d73a2a82398a3950fca4c2e74dbdd915255ba0f41beeaf37eaf3355e113b5a78704
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.16.4.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.16.5.ebuild
index a07f080cec11..a07f080cec11 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.16.4.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.16.5.ebuild
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index ca1cb1226538..2fad4ebbad02 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-desktop-5.15.5.tar.xz 9285792 BLAKE2B 27e44bf35b6c317e8e7d3074c089d1cf5106066e52d5be5fbec36096e1df86d5004fc84bc9693d8d396711f7a94ce5d709ee8c9a5b867ccdfaa5dd016ad14964 SHA512 ed7578d92a908bebc3bc42cd7900704253a7066f667deeed35d5efb291711a364a7026bf9d12510a8113f9d52d6e9297f500c5b04bd8f9522f071da0f240432c
-DIST plasma-desktop-5.16.4.tar.xz 9493536 BLAKE2B 4b893891a2c484943996d251817011675747322103561756156de9d2a1975cdef1baa97bb7e0e0bd3ec14ed91e3f9f31006c17eb8942b01988f2d4dd17946590 SHA512 3f91cfd2519340e54f575707bb2c46a4a21e5ddbd55e554ae5c931bed412cfc48d9dc8c84baba26a909bf98e4e2586c692737efa8903fb4f22541209718937d7
+DIST plasma-desktop-5.16.5.tar.xz 9556104 BLAKE2B 8e825692dc09897daa9eb6977991ae9d559284b066a662b4bd40faae575068866c6f82a7fab899e5b06312ae3910aea7ccd50ce895ea0371b2346f2fd69c4786 SHA512 7a4678928ccfd511746ceea53a4c31d15dfddafdeef3d9b169088a186ea1f5787eb3589ad5dbd3892b4669a7a833311da41795562fc94a58ac7aa2f02a741192
 EBUILD plasma-desktop-5.15.5.ebuild 3776 BLAKE2B 67b884879ce313c04c6af99f6a78eecc54deef27dabb82173910f352d64d2995e45d017b2940707bbd0b9494f9a67d3f208f0ce7e213216ed6d15f2548f1a135 SHA512 8200a34a5bbf6ce047175099c7734c5122121950880460ed64a2a5bafa9a9d76601cdb93809d499bb8ffa85dd4c90d88c23617905bc7f992e306135f299ec2a8
-EBUILD plasma-desktop-5.16.4.ebuild 3733 BLAKE2B 2031d2ec46488b30f64d8cf9f9bb1f2d05861beef58c83988c71a0c58e816f679391e5541fd2edba6fea8efd2e5fbc094f74f26485670d987bd542d64fc75b1b SHA512 6b4609a5602602ef4c93944931f076cd3f7419ea077296e8e15ecec91d10a83e7fd38765924180c3bae1d171e24b84cfd7e2b39c83296454aadc805c5eeebb5e
+EBUILD plasma-desktop-5.16.5.ebuild 3733 BLAKE2B 2031d2ec46488b30f64d8cf9f9bb1f2d05861beef58c83988c71a0c58e816f679391e5541fd2edba6fea8efd2e5fbc094f74f26485670d987bd542d64fc75b1b SHA512 6b4609a5602602ef4c93944931f076cd3f7419ea077296e8e15ecec91d10a83e7fd38765924180c3bae1d171e24b84cfd7e2b39c83296454aadc805c5eeebb5e
 MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.16.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.16.5.ebuild
index efb25ab3770e..efb25ab3770e 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.16.4.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.16.5.ebuild
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 4ede400b9e6f..45846e7fe69c 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-integration-5.15.5.tar.xz 55380 BLAKE2B 8388641685477a1778d0ba455c4d2bbff36b0c64224c9a616e6174b1be4e7b7d1b800ac976f1ec90f84ca5945ec4ccac4db5c84d5a3862f6e485d55f8d134486 SHA512 544fce9aae17eb9bbf07267a6d05a8ca34bcb8d33fddb9021dd844e1f20f26df985ddc659b2996be01e49023650893c56748c7d5572810fab7e3e8b6d74b3837
-DIST plasma-integration-5.16.4.tar.xz 55812 BLAKE2B 03a22c27688ba1b2152ab45affd75b7cce5ed03af1b633fe4c96c66af0c40725b62895998e3ede2a620b7415687671ea370b7a39fe6b08ed2cabe5fab24363b6 SHA512 a106aa1fb36faeb022501361434c66dbdc68a9506c395df2246fbb263ab69753dc243690b31292c35da44505482373078dad60cbaa1d5169840edf31b5b8103b
+DIST plasma-integration-5.16.5.tar.xz 55672 BLAKE2B a953d06cb13cb6c248124fbdeb8ed7e52d82bb8411e53a7c86b95c8e3fe90464f9e9fdc0a271a697bd95df0865ee7939f8a71d973b82bf5016b64c369a95ba70 SHA512 f974db9c85fb22e7dfeb8154d5c51c7106f2b95aeb783843701234a4b7186fd6b4be6298809d73b1a776399420a0e451908e5466aca622fd69800f0cfa2e3a91
 EBUILD plasma-integration-5.15.5.ebuild 1058 BLAKE2B d1d62b1350c810f7aac2f1d4666656b566f3e752e771a37f8edfafdc507dcd6249a2fe21fa90fe89fe61aa4b3506afd6a99ac5ec0fea843cf3c0859ae21b1322 SHA512 6762712e8391d4eb0d9812b14caa2009d5d9976820e417150ad363be69f04a19cca3cfe5fca4922b2c4763ed26f48635fac0f746f1cb25d5a4dafa864fec78ad
-EBUILD plasma-integration-5.16.4.ebuild 1061 BLAKE2B de6dba39b5478dfc17cfc75db01423227c38493b7121db0bc60eadbb32ef618ed4e465ad373b86e5e418db261e53f9b634e7b56c6e2e2ac3b8ea99f6fa6ff831 SHA512 acae6a3285cfb9813155eea32abb7593fcf80b547405de1e4603c7509df0078877df4e00c4d7aaceb74bcaba6b6df073214591e99328fc3cabcbb36714fa5bf2
+EBUILD plasma-integration-5.16.5.ebuild 1061 BLAKE2B de6dba39b5478dfc17cfc75db01423227c38493b7121db0bc60eadbb32ef618ed4e465ad373b86e5e418db261e53f9b634e7b56c6e2e2ac3b8ea99f6fa6ff831 SHA512 acae6a3285cfb9813155eea32abb7593fcf80b547405de1e4603c7509df0078877df4e00c4d7aaceb74bcaba6b6df073214591e99328fc3cabcbb36714fa5bf2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.16.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.16.5.ebuild
index b28163426a43..b28163426a43 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.16.4.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.16.5.ebuild
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 5dd6c7dbcec8..120340a0ae20 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.15.5.ebuild 3832 BLAKE2B 19e6f30fca31b3a3c77b13628497ff1ef48e5048c7b3bb59a4fb77d0dfd777d28bf792886ac34ceb3750113880a618c43e4459b24d63dce2a7b4437c2ee7d369 SHA512 c98d716c46660212508f411bc13c747363f06112338c981d98bf014c802689136ad2395984a1e2141154832cbc0d803898c709c5c2a064ce7e868f2fd7316b10
-EBUILD plasma-meta-5.16.4.ebuild 3835 BLAKE2B 2d85741ad7485e1b9aab2c052884347263fa2166e7c34d41e2567b3e41639a4878db5551756646a37a01a9f6ba26854e3bcca7279d514941c21b58f656b30ca3 SHA512 611d6acf557233f5034ba03b31db8b871e31ca6cd745d3c16058867d200f3fc343716ed1eee9f890b2bf081ffb0ed1cb2ba00d6c78e1074825c8076a6da05a37
+EBUILD plasma-meta-5.16.5.ebuild 3835 BLAKE2B 2d85741ad7485e1b9aab2c052884347263fa2166e7c34d41e2567b3e41639a4878db5551756646a37a01a9f6ba26854e3bcca7279d514941c21b58f656b30ca3 SHA512 611d6acf557233f5034ba03b31db8b871e31ca6cd745d3c16058867d200f3fc343716ed1eee9f890b2bf081ffb0ed1cb2ba00d6c78e1074825c8076a6da05a37
 MISC metadata.xml 1917 BLAKE2B 065db6335ecc51b0de9a52c3b44c77c6936ce27e765c960d908ffa87a84e2d88d584988d14689277b0577627127def243252d5b827d81856717e4f57f4e67092 SHA512 16224a45e1475917b3618b19f0e00d537d4183efee8d7a98c73fd7b1736ecc9471a64a2e130d2a4b385a139be40623e61c9bac20ec1b64502bc85b2dd8a2df9a
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.16.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.16.5.ebuild
index bf10189218bc..bf10189218bc 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.16.4.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.16.5.ebuild
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index fdacab1d1105..675373cacb2a 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-nm-5.15.5.tar.xz 777140 BLAKE2B d75ad6c04587f5bc115268f2bef50e0f6dd2b8b86957ab1f43e284988039fb7d9530cb03d86f5c49bdf6747bbb6ad123c7bc527643fe7461ed91efc93c63e563 SHA512 f3f78f40b754de5afbd63c5713e684fe3d37ae25af5a9e6ba808647e0d7d4f23456ed4b94aa8138e1fab99e7f7d7e0dffb697e0e46c99bd312bad5e2a7b9833f
-DIST plasma-nm-5.16.4.tar.xz 788152 BLAKE2B 4bcc58f365ebf428d80c85783e11e23916efcef697902daf966f7a959824e542333ff87c3e475eb76ef6cf61de6272629031267b25676d2a68411f0584f95d48 SHA512 ebc6864e533179bf8cb85d8010c85c4180d93954a1d97072c550db391167068c78e29e7529b3d1f323fd1131d8a375cf2bf542c02a7c2a2098d827e311ce4e9d
+DIST plasma-nm-5.16.5.tar.xz 787892 BLAKE2B 030840885c35ad9a2d370fddb4cad6b593512b68a958d4f94677c42506ed5c6c184d8b391bd0a47a8bb9cc6ede246163035099abe0629e437b4906cbc5de08d1 SHA512 cc52ed0b1933d0c8c86bd3188ee77d155adc2392dadbc311daf222c4e0c4c4a484b6748e1f5d52b643cc7fc55db947aff0f0a4c5ef14742d4211969e65b85d3f
 EBUILD plasma-nm-5.15.5.ebuild 1982 BLAKE2B 56527f9910d7ed2ef8d8e3cc13564d4d99cdd5dfa8813f6e22e8ac309adff498a142c2cc7b00ea1e7efd696bc16a2d1a67e1ccbd0ca93e3a0ad0e3585ac8ff65 SHA512 97d12474943bfb5aabed75d3f385a11cf1c4b4d9c6f94fbb3e7c457e0a51cf3bb74f7ef2991199ab1ce026338c00cc57d403ac2576b20924d251cb14c8ef3146
-EBUILD plasma-nm-5.16.4.ebuild 1985 BLAKE2B 37662da4de5f18e91d296b4bb22beb634405104a6dc2b6f092a9ee7fffcc362d8d1005e10028b4e428077078e83fd8d86cfc0fccd4f00c8172a789e7429ac394 SHA512 c79a67b74db0314be108d5e1eefdc8e8fcac66f6dc3d9b396b3d717ace8d1a30e79fb72365eae5c0b42d906106f5e70c6795bf842d56b35a4f8172bbe1302210
+EBUILD plasma-nm-5.16.5.ebuild 1985 BLAKE2B 37662da4de5f18e91d296b4bb22beb634405104a6dc2b6f092a9ee7fffcc362d8d1005e10028b4e428077078e83fd8d86cfc0fccd4f00c8172a789e7429ac394 SHA512 c79a67b74db0314be108d5e1eefdc8e8fcac66f6dc3d9b396b3d717ace8d1a30e79fb72365eae5c0b42d906106f5e70c6795bf842d56b35a4f8172bbe1302210
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.16.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild
index 995f4b6b6b89..995f4b6b6b89 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.16.4.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 5a69237e5340..48a492629d09 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,6 +1,6 @@
 AUX plasma-pa-5.15.4-gsettings.patch 20407 BLAKE2B 872458be40b049d415e24559f9d285554f5449d26bde238bf09488c6f1453c0e040561425e188cf926a76a15e3957da2e8ff106e5f8d074a19b7453d43cc91ed SHA512 19b42891eaf3f53ee582fb96d63b2def3e28c037252f11dabf17e2b00a7b84c763fefd71e779a421fc6706809fdad8800625e94b6ea276e03d6461d3e566dd66
 DIST plasma-pa-5.15.5.tar.xz 95964 BLAKE2B 5177f5aa9944d1c61058791e977b8c2dcd92e8b8d0efffe0a80eba9123443e13683e26ffd94ade01fd6be585a5598953f2d4bfbd3775944d9e81148bbac793cc SHA512 e66c9ac36c7964738f7f2947120f6a243191c75faef2c9b4831410487b6274da782f8a51d29a1f6d3b7ae81a96eaa6115d0629fded0700777856a9307a15b5f6
-DIST plasma-pa-5.16.4.tar.xz 100748 BLAKE2B c604cc351095a045a941ed003b645f74c53388f8cf5ef3fed0e499e8213f4b7655b56347d6ee4cf3427b4ca00f258f195370f5efe6cb26a01b95c05101108988 SHA512 cb26f7b0ab9373a71f90a63a8baf5a9f7733e58377983b3b4403f528704dcc37b0ad5511028770cc036baf01816bc2a00c5fe831b1425f0eb4543585b3b5969d
+DIST plasma-pa-5.16.5.tar.xz 101100 BLAKE2B ca09d7974638d6a730dd79794d167e5223ef13d5efdb63f9c0aacb288a873f9a769aaa00bc8253ea6cda293be2f6f0f84751528f426207d0a3d45f98637772d4 SHA512 393cc05b8999b10213fd608863d16f14c3d38fe8d82b01a1869bb37a4c8ce4d023deaac11a12a087f79bea5ffca9ff4e3dd846fd2ba195df8513e9ea8d3a8618
 EBUILD plasma-pa-5.15.5.ebuild 849 BLAKE2B 544c6d525c4cd28d89448ecd32a33430be771a412727ebe51a26fba6fa1db407ee8c24bbf4272564a561f5884ffe3c0a17b1a22c6faa56c33853ad518dd5647f SHA512 79fd3a894b4912d685e258df6ae38400f15a8dc441a70b8737c480d4ee420e617bce00f92f491e4249a655364938b48bc694cfd135a73db5e6336a83122b95b4
-EBUILD plasma-pa-5.16.4.ebuild 757 BLAKE2B bb3539b4d519d0766c2f8dcf0e57893f9a1cfe23a752da06dd5bfb0e8f3527562c7db799bd6af6038089dc53af63cbf941e724ae969b057f9b34cc3a30b52fa3 SHA512 0496e13cdecfb82f7da72c0b44b16510f81166c8fa3ea23914fb1e2cd20b33f1881b5cf3a5ed1dd754c5b15d6086f65817e59838bb2ea9015466508d30dc5aed
+EBUILD plasma-pa-5.16.5.ebuild 757 BLAKE2B bb3539b4d519d0766c2f8dcf0e57893f9a1cfe23a752da06dd5bfb0e8f3527562c7db799bd6af6038089dc53af63cbf941e724ae969b057f9b34cc3a30b52fa3 SHA512 0496e13cdecfb82f7da72c0b44b16510f81166c8fa3ea23914fb1e2cd20b33f1881b5cf3a5ed1dd754c5b15d6086f65817e59838bb2ea9015466508d30dc5aed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.16.4.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.16.5.ebuild
index 4da0d3e26d87..4da0d3e26d87 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.16.4.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.16.5.ebuild
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index ded9b0a52371..3461821a0c7c 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-sdk-5.15.5.tar.xz 249732 BLAKE2B 305794c1c6098c2f5750dfd3b10506b5494e84256c6c1198b78668fa9d304d9af314e23ec026d4e5774f4c277a65911a109424839bd4b6c39f8a5fcfeb41eb3e SHA512 aff109eeb879b66b6e076ec333703f4e9202ea73f4c97fb05538755f1c0d96d41d2b01a2ff48c050632dbbd848cac4e528aa90be374fd4f2503140490a16753d
-DIST plasma-sdk-5.16.4.tar.xz 250456 BLAKE2B d8453be4398f1ebb69210ccc1c7fcdb87c7bbdba19448cfa3a5b104f7dbb7c3c7df1ef2e0b81c808ab7a13f6af4050bc981a6dc8167df780e31f7d52d10b2ab5 SHA512 872aa5436667e2d772bf149cb3bd40c1d2559559211907226ae3cb23728336c665870f1f9bcca49886ea3472eb012af2bb96ef20f1ec160c30f93c5aeb7e50ed
+DIST plasma-sdk-5.16.5.tar.xz 250148 BLAKE2B 29fad7533515756df87865cfd55b1531ba30de77eb52115475fe352ee9df12b144dff2e9bebe44b76f742e903f75edd7e91ee2b7a53ce1154f1b8143748a855f SHA512 95ed00eebe787ec36d68f47e01f717cb5929c7c15c89b33be5b8edac7c9c4d700af6b81c6353e1b5bc783360f542b8284b78706f4c4de398d10db1bcaf23e4fe
 EBUILD plasma-sdk-5.15.5.ebuild 952 BLAKE2B dc3bbcc3dde15d2dd670d560e1f528db474c979c79bbbdc4482d2e0a195f99eedfd99424249466181c837b231bacdccbc2630847c04cc097b7bad7b167790fda SHA512 572378e3210c1fd8793745e5dacafd8ae0df0dbd56c583334f27d58d53e889b735404cc6d023433d5a3d622a7868f7e32b3529cdc5b82a2956956e2dcfb50f97
-EBUILD plasma-sdk-5.16.4.ebuild 955 BLAKE2B 416777a1f2e77a4362238ebeb4fc6e19b74d23c777aec1440c23609500c808bf3c6ca837214d20b58278115e47db9438d700bd160bfd1726848dc993070f7bf7 SHA512 64b78163e0d3508fb7855b947b85cb02752619467e8c1b3d9de1f68f089f8311e2a11208b17f20106eebfa621b32d4dd9af2d95c5b6e38de8853f4e4f0a8a144
+EBUILD plasma-sdk-5.16.5.ebuild 955 BLAKE2B 416777a1f2e77a4362238ebeb4fc6e19b74d23c777aec1440c23609500c808bf3c6ca837214d20b58278115e47db9438d700bd160bfd1726848dc993070f7bf7 SHA512 64b78163e0d3508fb7855b947b85cb02752619467e8c1b3d9de1f68f089f8311e2a11208b17f20106eebfa621b32d4dd9af2d95c5b6e38de8853f4e4f0a8a144
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.16.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.16.5.ebuild
index 370965cfc720..370965cfc720 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.16.4.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.16.5.ebuild
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 2dc2b70cd21a..44b9d5124ecd 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-vault-5.15.5.tar.xz 123880 BLAKE2B d844b31bb0d40a61cc3df1a493730495a73adc2f7e9582279a4ca6d87aac15f45128340093c06b8e1c841abec7a0806acaa6a99525a1793202f3644359699ca2 SHA512 815f45163225ba692fb2b1745c7f99e1ae06509850e82f46807b17664728c2f3667844c42035000d04da6a360913a217edf6f6768bb50a910d316eb7770d929b
-DIST plasma-vault-5.16.4.tar.xz 127008 BLAKE2B 6b66022e4037cb49bd4c733c2ff108e67a337bf52c77c6e89a5aa842fbd81ec173410a49bd9de85335893f107490becf0853e965e1d2fc675cb36593224e99fd SHA512 a782b92489edd0ec3ef8f582c8fa92c567365aae51c896f1166eaccb2ff250e5974be5186686824afbc5c74d0daaa399ea36ddf61d7d573473a9e360aced7852
+DIST plasma-vault-5.16.5.tar.xz 127376 BLAKE2B 94f6360ab8bbff5210a516d020250f4fffe1c61bcaa579d4f9d4fad1caa15a2dcaf749e04919a0e36fa08acb28fcb614820408008bee8249397410e81cae847e SHA512 bb5d06af090b9659cf9d253b8469e3b7264d7a820c6bbdce7db414d3a8e5aef5dc1122d11285194afa0b2d1aff2a0a2dd8a74036674541abd7938d38521afbd5
 EBUILD plasma-vault-5.15.5.ebuild 1077 BLAKE2B b1438da912bef60253a671afd9121d7b78f7541645600730477bf1df40cf3b91923b7e873b6afb1590c363cadd06c6328e7e8f9d222743b92deb25bc13ec28d7 SHA512 192b5ef7ed418b69c4f687d3489a4cd51c5de7432211aceabe122992afe445f606b5eb7b3131d2900590c842fed7041b3da11ae6d8050e9e7ea20f6b44dd2e94
-EBUILD plasma-vault-5.16.4.ebuild 1080 BLAKE2B 3e12c53bf5ce48478cf6d3b88643de735e87bab5c385a2f09ebb40eb6385fd67e54216fd33ee14052ac8b1f821a10dd4de359b44f0921f0da10eaec8fd501c63 SHA512 43c76110fc2fd3b201ea3569621acfa0b0f3db82717be3fd8bae27d67b3336d0e1023b827313e693341a04385818f78c1844850d741e448132650d196fb84217
+EBUILD plasma-vault-5.16.5.ebuild 1080 BLAKE2B 3e12c53bf5ce48478cf6d3b88643de735e87bab5c385a2f09ebb40eb6385fd67e54216fd33ee14052ac8b1f821a10dd4de359b44f0921f0da10eaec8fd501c63 SHA512 43c76110fc2fd3b201ea3569621acfa0b0f3db82717be3fd8bae27d67b3336d0e1023b827313e693341a04385818f78c1844850d741e448132650d196fb84217
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.16.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.16.5.ebuild
index 2399168d9896..2399168d9896 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.16.4.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.16.5.ebuild
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index df0e315d3723..3c14685a12ac 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-workspace-wallpapers-5.15.5.tar.xz 24354892 BLAKE2B b3beb39f377d0fc8265ac2c2f18c07806b548b44cc0df6e3b69727d876235dd434019e2e4721168942454e08612f271e555bf76355f121edc1def03a1c4fa32c SHA512 088e22bea249be02c72c1fda974be1f9de3bfcfe009003de5bdddd256834679fe644ae4ff4e9090a99fd75d4c8b8681113e29f13b015bfdafe568a1871a43704
-DIST plasma-workspace-wallpapers-5.16.4.tar.xz 34173424 BLAKE2B e57b5448ca4dab1a84ebfa6eefffd775d722d2669961a291ec758f17ca618b1e3ebc5f2c22f33e7661f93dccc227ad23ed4bc40856ac3bbda4c0a56c556914dc SHA512 9bf9e7d6380e145b28b6d67ff33df2096729fbfa492c5e467faae2468199727735c383abdd960a012aa00b555632b1497448f8150d7279aaa9557501e8d5d3fb
+DIST plasma-workspace-wallpapers-5.16.5.tar.xz 34172180 BLAKE2B 8fe56bba584ed4c64035a81d6431d4c71a869f97fbd1b9ca9df0b53481653af475bab6d093e68c1b7ce6e4e6b5e40825caf6f1b0e2558497774aa7cb7bbc9be8 SHA512 88cda8d89371d0b8e689432656047fba1a83a15356b6007999bcbacfc4f12ad4f5d4323c89026ae50cd71298fd4d52ac52ac7c39a27d5f1109f51cf07b6f2648
 EBUILD plasma-workspace-wallpapers-5.15.5.ebuild 352 BLAKE2B fc2880c1709d2536cd641f0834546470636e8939323eac5ac19e75dd9603e91129b82293912a06f695e08f3ec84d2eee79c5d49a594fe3a077b37395a32bbd51 SHA512 312a12f19ff9c33022f081630768e442a0f8d4440c7eb6b029d493003f0a18e8021030f930033a76f500ce2dfbf5d5c4d9b0020e86719ae2819dada1e12e224c
-EBUILD plasma-workspace-wallpapers-5.16.4.ebuild 355 BLAKE2B 316f4c1122c50aaea629d71d948f899e357b2dffbec7f8d2e505b046e7fb6cdd7481a250d089abc1b2291e90a37244cdc466eaf94edeab561560350657a33a06 SHA512 e92414131c34322c80cab7d7b3fc968810028af98c09143213cf9d7a9047ab7043eea60d1d80117b6d2b763696630be1359d4bfde548feb3aa0f832bb0674ee5
+EBUILD plasma-workspace-wallpapers-5.16.5.ebuild 355 BLAKE2B 316f4c1122c50aaea629d71d948f899e357b2dffbec7f8d2e505b046e7fb6cdd7481a250d089abc1b2291e90a37244cdc466eaf94edeab561560350657a33a06 SHA512 e92414131c34322c80cab7d7b3fc968810028af98c09143213cf9d7a9047ab7043eea60d1d80117b6d2b763696630be1359d4bfde548feb3aa0f832bb0674ee5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.16.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.16.5.ebuild
index 1a0e2576494f..1a0e2576494f 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.16.4.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.16.5.ebuild
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index d8e671765e9a..a850cded45ee 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -7,7 +7,7 @@ AUX plasma-workspace-5.14.80-startkde-script.patch 1207 BLAKE2B ee59b775f3ffb3d8
 AUX plasma-workspace-5.16.3-x11sessionrename.patch 2435 BLAKE2B 3ec4c08af77f24dd264e547ed1f33e2dcd21a501fe83638c56c51e3ea17502b7622b1d6829927cd1396f01356957f686fb76a825de272541afc7e67436d20a46 SHA512 69eaa3393b3e0dd0251df4a577002e4bcef4604b4293f08e5ad9a5ef98367a5ce67d2238e3f84acb8845e4fdd80d570a651ff5f475e43439763ad3dbc994241e
 AUX plasma-workspace-5.16.4-no-share-dataengine.patch 904 BLAKE2B ea9c8b6505e3bfd9b35a0ef02f4e6fcb4ba5ad011872bf3803ac12dd07115bceed58fce5d9a7b8042c0bd7c26a592561dc120e8f4f908cd352c46ff6f9d86db3 SHA512 bc79f69a50119d11035c0644a6d05281ea23ae29e662808a0a3384f3ec63049121b73bc1bb8c06b58c5b3f42fec8d5d45c9139e50466c628aa1261edb45b877a
 DIST plasma-workspace-5.15.5.tar.xz 4713728 BLAKE2B 7ce14912bf0dc2556484b7b719b00e7296fb67d78faabb9e3c00fbfb56a41db04e27b5f94636142f07e88e24d51ff308025a50d719a940e1287943a35db93e79 SHA512 5d5429114a733d4328f7db6c8e3c7dfe5e04862f8083fcad40b21390efb309c58fd1b13cf63aa57f2842c38936b9fe1c60ad61fc601cf4f592b86285c2270bed
-DIST plasma-workspace-5.16.4.tar.xz 4896860 BLAKE2B fb3f6c89db5bc5142ccb68ab6ebd13d7e0d878c999160301385d163fba0e97bfcfae9bda38dc07547171cfe8823b4375815f1371958ba35c8c9a69272dbaf572 SHA512 d597738c1122fcbe327a1917706e86ed0acc550ddbe2ef4eb776f1a064b09095c0f5d634675787353b90b8b37d24bbd454fa1d8354078bd4ceaa3875471a3bb4
+DIST plasma-workspace-5.16.5.tar.xz 4905748 BLAKE2B 049a4ff618aade78ac130c1496f6add0ddc391db5b025045eaee91fbcac0a0b9e7b44a06757c94699c1038b18a96a06eb31d4ab6518bfda6d308e12b1269ca04 SHA512 e55e89b6a8e3dcf68bb7ad4f62f284cd819c7461eff1269f84df086a2516401c26363cc6c3c8e6cc8e27788222b3ed81098d765a25e5d96d9274e3b342816369
 EBUILD plasma-workspace-5.15.5.ebuild 4827 BLAKE2B c5650f76b65ed3307d8c523eb530d26275a7be8964ab86a24813b9ee449c866ecfc4231996594e6a41453d8b2496fa352c2c999d257aee83ff5af46b9cd0b748 SHA512 c83a13992946a5c4842bef073798616581e390b401ed69be32ca372240b442aa8a575c1fd1658876b4d8334c95aa51f69a13a0df3131239beb870e3283148f8a
-EBUILD plasma-workspace-5.16.4.ebuild 4699 BLAKE2B 85c1c7693cef26e646c52632f3caff10c30b6dff4a42f52ddf93cf75a6f6704a31a20f132406882d636ffab7a6f1d3a7543f0d5804dc06304196bd320a3aeb02 SHA512 24a7a337c7a03f3205ab80ca542e79e76b02cd359634d7e5e5eecc58451aaf8b159fb515c52a889341c8ee1c1d7e52995977516734bd0db510a030ccef85e4ca
+EBUILD plasma-workspace-5.16.5.ebuild 4699 BLAKE2B 85c1c7693cef26e646c52632f3caff10c30b6dff4a42f52ddf93cf75a6f6704a31a20f132406882d636ffab7a6f1d3a7543f0d5804dc06304196bd320a3aeb02 SHA512 24a7a337c7a03f3205ab80ca542e79e76b02cd359634d7e5e5eecc58451aaf8b159fb515c52a889341c8ee1c1d7e52995977516734bd0db510a030ccef85e4ca
 MISC metadata.xml 708 BLAKE2B f63263b1645f6fa916f39a52c20e88668cc97344aa5c35b9be7867522e19dd164486468ca236cd85df169a8d8936ec93efed6d2bda85378ded780b2880ef9e41 SHA512 f10a644861ab6f53bc23d77f95341b18561ef4dbebdee9682dfac62b06982d49f269ba7d35881e52d3cac6849abc643ea57cb60d986daa96b5b44e203563eda9
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.16.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.16.5.ebuild
index cbfa3e41d201..cbfa3e41d201 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.16.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.16.5.ebuild
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index b77acabf2e76..c1a836cd461f 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST plymouth-kcm-5.15.5.tar.xz 39588 BLAKE2B e7e418dda806645a4d1ae47f817208faebda82ff5670c20473ed19b9a939cfc9ce0be8b29e4bb04b412ade09c6e8fae2a19170d26414f6a22043e64aeee1145d SHA512 f38af7e5fa715531f2515c4452dcc5534c63b8cd6bd444232527a1ba3c1011289ef8b0cb772d40594a040ebd044652de1f8d9e3fd1146e2688fbbe8882a040ed
-DIST plymouth-kcm-5.16.4.tar.xz 40032 BLAKE2B 0b9c967efa9edcb99a67f7ce8c7bb6fdc8607bcd04ae16ae4087a7a7f0029ff32b316a385c70ad2015340805bd5935e0a1215fbbc10dcd1a80c613cd9a74dba1 SHA512 6137fc3868e07a8db7ecaba97d720471fc88cc77d5c29db1957b181d0fd892fd8919f704afe065b3eb73b9c0b1bb61115761c59d81fd89dc0c595d8558525a18
+DIST plymouth-kcm-5.16.5.tar.xz 40180 BLAKE2B e30bc3b3ce93ff6338470de3121bcbbbf499b3f353c7f6295d4c8aa142eedf0541c0a84970d630074008c8fa859ed8754d320c137220687796d31f4413339083 SHA512 9544cd44cddb5736b38be649e61bf0ed0c7553ac0fa8e7de978e297cfa3d0046339832937ee8ca2e83f610b5516b90c512ebaeb20a9c66c7ea47fb93c1d3fd36
 EBUILD plymouth-kcm-5.15.5.ebuild 799 BLAKE2B 9860b4921f67b4fceff4fdee47b6f1e056cc567ff545de71c2e41f979e291a702db009705cd2f26f6c25263200cb350def1fd1f0f2e8838b28b8a25ccbe40835 SHA512 c53bc03e8707855afbeab7a4f73e0df4a43e553fba3c9e438ca33b7c4429166e0520ba9ff3e76cef2777dc17bc3874c825ef710277b44de1d57f883bd9e52524
-EBUILD plymouth-kcm-5.16.4.ebuild 802 BLAKE2B 4562d806b1e4922fc795bd504b96fa7c1cb478821f7beaca2480366a953783c084162671a6038de9ca019ce9e5b63fdb6e1f4e5c34118a8fac3ef533e03ba53e SHA512 4b67c4ae1e598a0e14d53a9be383af2d2aeeffbb73a8eccb993471aef07efda8540497b4469b817f105e6b39a9323266b062fa43a00efd7357994787461bbf77
+EBUILD plymouth-kcm-5.16.5.ebuild 802 BLAKE2B 4562d806b1e4922fc795bd504b96fa7c1cb478821f7beaca2480366a953783c084162671a6038de9ca019ce9e5b63fdb6e1f4e5c34118a8fac3ef533e03ba53e SHA512 4b67c4ae1e598a0e14d53a9be383af2d2aeeffbb73a8eccb993471aef07efda8540497b4469b817f105e6b39a9323266b062fa43a00efd7357994787461bbf77
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.16.4.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.16.5.ebuild
index f22846300564..f22846300564 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.16.4.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.16.5.ebuild
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 87adc63c4b7d..dceb0890bed9 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,5 @@
 DIST polkit-kde-agent-1-5.15.5.tar.xz 42612 BLAKE2B 22ca9adad609eb5603aa7d50fbfcbf6cf17d96dc3f822acdd91d79b855396b32fa2261086269548a302cbd116cf3eb848a5bf1dc08640bbf678428044baee711 SHA512 030bbff94517a02f40bfdbaf0142834d95fc5299fcb126f3014268233e24598aecbad8b04ac1b6c4d3a0d4821a73b10ecba84f2e80af53782bf137e151455ed9
-DIST polkit-kde-agent-1-5.16.4.tar.xz 42988 BLAKE2B fd5b5d4257bfd91fa80a35b5acf8d2ba7fe040b232fb872be0419597e4d9c0897adf0f8618c376e53c8a0d20e32b576ff2bc44f71c74148e93138a912a6d6686 SHA512 b85dc7a7883d98014681ad12c9d2f79e8deeb8df6f29b1bdcd5f0e4048cfa7188140e4f7808dba4db9392cf5fe49bda79f4b52caca8d8c4f51953166833046da
+DIST polkit-kde-agent-1-5.16.5.tar.xz 43152 BLAKE2B 689a070fd1758a52b97d8865fca3c87603653c6029d90631c5be7a81df652333bc1ef13b80bad220de73030c5bc23d4109335e2609b535df2f9e6054fc0f02d1 SHA512 cf5ba2318ce69127af031abe16ec4b61f69ce0075ef05d6b68b9bf21b9c911a687393d6844cc1a755a0a859a2fcfe8390f6d58e468240a8d1d909bc027692dab
 EBUILD polkit-kde-agent-5.15.5.ebuild 712 BLAKE2B 114708a883034888a022880199334ed832eadd2f965e332c4627b4bca7292a217a17afc972678a8f106fd0ad294ee7b8bf9e2d615a29cf58ef4ccf5af9ced829 SHA512 c3572e743514d78ca99982a369a95833cc70de75ce17f7b5e0584fc3a38c1b5db15c05bba07764a29e061392464029385c811f62675f9f6d16cfc19d25ea9200
-EBUILD polkit-kde-agent-5.16.4.ebuild 641 BLAKE2B 0c9cf84ffd74210e0cae963299a907aeac85d3720f60e0c07a0f1fda52363762df1ae5e5206997f5790f823567581e00e0315bf0ca8df515b7661c5021bd6cba SHA512 09be8a6b2a2fdff05387237c80ff23382000d1a92a431de89293d89df4f8765b1ce7553c1bc9024935b0dae1104b4e2cabde404bcd831ef320854fbeb58f98fb
+EBUILD polkit-kde-agent-5.16.5.ebuild 641 BLAKE2B 0c9cf84ffd74210e0cae963299a907aeac85d3720f60e0c07a0f1fda52363762df1ae5e5206997f5790f823567581e00e0315bf0ca8df515b7661c5021bd6cba SHA512 09be8a6b2a2fdff05387237c80ff23382000d1a92a431de89293d89df4f8765b1ce7553c1bc9024935b0dae1104b4e2cabde404bcd831ef320854fbeb58f98fb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.5.ebuild
index 3a7ae6ac0aba..3a7ae6ac0aba 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.4.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.5.ebuild
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 7b6da870b109..55a8e5dbd22d 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,5 @@
 DIST powerdevil-5.15.5.tar.xz 599676 BLAKE2B baf8789982b640f8b09ddd66f2f5722df1da2c570267218e1216b8c4fec8160dc933da3cc2355d45ff475de4a5d0357f00ed84d1562f91a0534636bb092c863e SHA512 bc0a1af8eff7da7801b6644a2d28ff595b3052ebe0d59aa808c51dc1c3c3c787c7d7569cc59cca216757e57a67a4a957845792af78aeafb9a71d4ce37723b3b3
-DIST powerdevil-5.16.4.tar.xz 590444 BLAKE2B 583496575c2604128face46ef84312857b012024d93059ecd77c8ade703339548d5b4344e3459b041c722f01999df9e089e293066a87856425696faeea6e9c6f SHA512 15c7c2d4bc7eba68a59c538f8ea62b3fde8e62320dd9144e96534aaccafabc5cea5bb38900cec90a4946b0b531c83cd7c59db7d0d1fc186b216916b5a5d6a743
+DIST powerdevil-5.16.5.tar.xz 590400 BLAKE2B 8c6286d9b3f59b0a66cbe6955848bce2b4bd288cd88ef564dccf3fc20a57399e2758d5c2c497155032c6af90ace0faa23f47fad62b0283462c6b0e84a5773423 SHA512 26e08324d25f099636309cd9bbabf4a5b7f8eb3a86bc0db8a9973169c00687063c031117aef5e75959b319eaf4d0c60688ec8acead936eec8a6653b242a82db1
 EBUILD powerdevil-5.15.5.ebuild 1610 BLAKE2B 1c5abd49c4a29990610e81283c61035476d1916317df0c0886f0b087a2b2e324b229851b9688f1c3a199ba35b451513ba1c7dcf78ad97209f89c377efd170a2e SHA512 31b011a765e18c30b6ad9fd7c3a7d38b4eb79fad9c7cc94c6e973e65cd5fb29d4f22a408fc899b295b4fceae9f6ae0fe858099aaefddc004fa7db0ba6b5b1cd4
-EBUILD powerdevil-5.16.4.ebuild 1613 BLAKE2B dd905191e73a3acae0274851476ec84a38a70df68e723e162d09537125fae8943fd6655b103bfb3865f94978a0a2698a8c86167d45909a8abb1f17854ed70c4b SHA512 dc85fbc9424eae8ab96dd5b51d62511bf1b6d61210dfe3903db2d736a0256ee43cb742828a03966006e761a4106ee48ba6fe61c3b46a2507adb3ac3f37b7ff35
+EBUILD powerdevil-5.16.5.ebuild 1613 BLAKE2B dd905191e73a3acae0274851476ec84a38a70df68e723e162d09537125fae8943fd6655b103bfb3865f94978a0a2698a8c86167d45909a8abb1f17854ed70c4b SHA512 dc85fbc9424eae8ab96dd5b51d62511bf1b6d61210dfe3903db2d736a0256ee43cb742828a03966006e761a4106ee48ba6fe61c3b46a2507adb3ac3f37b7ff35
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/powerdevil-5.16.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.16.5.ebuild
index 752e8c8dbc3b..752e8c8dbc3b 100644
--- a/kde-plasma/powerdevil/powerdevil-5.16.4.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.16.5.ebuild
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 43d21adafe8a..f849751065c4 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST sddm-kcm-5.15.5.tar.xz 61728 BLAKE2B 358de0f9a3e39f7bdc4f5ea46bb9f7f5fad6601a0eee91bcdb939313bfb24dd84e5df46fb8d9beaf97e3030f63cb0622ab5d3e1a1ec9452937a72661ccbc61dd SHA512 728dedc49670e2b80f48719f3b9f20407cfb580723e1b443eee789c0908d1b7ca70b6d083244df0c4d9db29a90707df50a148f775568abae417c4dfa53607535
-DIST sddm-kcm-5.16.4.tar.xz 62176 BLAKE2B 9ebdc6c5fbf804adef736cdcea04d6f599372da0c179f18ea77927cdea4155d46f3f2047add6ab90e567dc30b03fa5ce451625025e4b83847d00e5db4dfd7658 SHA512 30811b0f6906578fce7cb497468fc0e0c7828f58222fde28fa9129b043a3adcd87e45b7ab4b207d795fcdd6a713391788717e1b36e227920fd8f8bbc9e1da2b2
+DIST sddm-kcm-5.16.5.tar.xz 62164 BLAKE2B 67e404f8c111f5bd70dfea6f495d94bd63cc702a8c3cbe76c129c21ce320383bdd07d2c137dc6c85e02744f2d1659083914829390d73cff19d72db21cb9dbaee SHA512 98178c96ccf2405b1811a896053ed1ae371f4e52f0a5c7db6016a506498be1a0eff9c4c6030350aaafe4d9daeacb9386be8bd79f2b80abe1114d098bb6eddbfd
 EBUILD sddm-kcm-5.15.5.ebuild 886 BLAKE2B e23150a39b9958ed42d574d19bcf2e7bd6be18425d4fdde741b4c9b4eed8ab7373bb816c6d028e2e21fa2a9d539560324785538f4ec881b668e42682a098fb2b SHA512 f1dc68580e781468ba23e3bc69d6a4fd885b0d5380faf073a57a5c17cdef696aea8569afa5eecf1fef51dceb4b62156dabfb2fe492cf72b5729833f0111ceee9
-EBUILD sddm-kcm-5.16.4.ebuild 889 BLAKE2B 9cf76771e6bafac8173613f5817cdf682a38946f3583d0d1b8288c895b3355b899db6f83fe2965b13cf1b344b1ec904634e5826a290690b94c4499d8a4cadb6e SHA512 acacc72361d37c860e3f038a21a3e1b234896148b8c4f07e8448d2bb1ad5e9941df73cf7efa1388a5e73854aa2a58041aeb424957114b69c9287d336741c6b64
+EBUILD sddm-kcm-5.16.5.ebuild 889 BLAKE2B 9cf76771e6bafac8173613f5817cdf682a38946f3583d0d1b8288c895b3355b899db6f83fe2965b13cf1b344b1ec904634e5826a290690b94c4499d8a4cadb6e SHA512 acacc72361d37c860e3f038a21a3e1b234896148b8c4f07e8448d2bb1ad5e9941df73cf7efa1388a5e73854aa2a58041aeb424957114b69c9287d336741c6b64
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.16.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.16.5.ebuild
index 79f6fc4663dc..79f6fc4663dc 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.16.4.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.16.5.ebuild
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index d51a398b5fb0..23611cdc45b0 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
 DIST systemsettings-5.15.5.tar.xz 182452 BLAKE2B 215706f06d842a4be26e5032087ab6eca7b19a93ba998eb46d90593796b351bde893234d7cb097326a58d78a30584312eaae9e0ce3addf44ecfee0553e6075d7 SHA512 9bf486096c8e22779354ce1cf1028f7e55c1dae98da2bd9fcfe496c761e819d26756490d75e531049e519c0ffc0eeb643577004e022c0b0a988730d833ce6ec7
-DIST systemsettings-5.16.4.tar.xz 178620 BLAKE2B 3fbe153d14fc945cdeace3fd6ad8e19c60ead651f7b1d26a0f96c4228f285d3e16f122702b4e880f2a71c920a8398d34ab44696357220ade3ded38bf8652f3ba SHA512 8bd4ffbda585e76bff8b42a588b6ce476ca46671e258a34b294859aea2d0a00e40425f783ee39ca139f54f858067c5ded109f8280193bd22e19ae01904744ae8
+DIST systemsettings-5.16.5.tar.xz 180252 BLAKE2B 75860a6aad43dc2804cdb4eaa649dedeaba9fbb3d5a78bb4c49309e2e452cbb08b29040426643d5a07ff904041787d72ec0e924b4e0b81b5ad17aa0599139e8e SHA512 b9899ff13a16fcc59d3daf47d327e2711ec544c672e61ac875a4cfb02716849d735b8aaed20e4e38ac5f8f9f926ee01065d2d2d6db76f74e72ad5333c96cfb0e
 EBUILD systemsettings-5.15.5.ebuild 1492 BLAKE2B 05805262ba9a7c1cd84a9fdec25abf7d929fba64d084bb7a462a55ad07717d4a01d882324a16d752676593b4c590968c5c2d0095b5c924a590677af3df6d127f SHA512 9615a4a30efafacc73e646775e06b166423d27ee0b2961b573b5fc9bc546abd1cadffd16bd9606c08fe927b05fac7f1fb9f206dc50c151eddc128e3bcbb9973f
-EBUILD systemsettings-5.16.4.ebuild 1495 BLAKE2B 051f196d1b22dc8ad122babf77457cdfa40e5a9ecb6c35697513d89c59aefe4524583e4dea340302a6b2e32a9da12f2bd7621efb6ffe5d605d79fbe668d9c364 SHA512 36912552a68f2207fb681a9ea853453742e06f014b6cb66a38c43fa7c8da891d3283dec231c6b843302ff1712970fa541d28e4705cc92cefcadb874a7efe595c
+EBUILD systemsettings-5.16.5.ebuild 1495 BLAKE2B 051f196d1b22dc8ad122babf77457cdfa40e5a9ecb6c35697513d89c59aefe4524583e4dea340302a6b2e32a9da12f2bd7621efb6ffe5d605d79fbe668d9c364 SHA512 36912552a68f2207fb681a9ea853453742e06f014b6cb66a38c43fa7c8da891d3283dec231c6b843302ff1712970fa541d28e4705cc92cefcadb874a7efe595c
 MISC metadata.xml 363 BLAKE2B f3d12ec4c4202f55b6f32033a4bb62d41da1cd188c5661a308c315f8eb86fc7190cb3c4316d4a393f686b722f09e5a3415a48c5216ad8818579d7bd9db8022cd SHA512 c90aba5c6ae443cbdbd45523a53548a5fde61d0eca8af6180eee3f9e0e92e546df3533abf58c9ac2b1a60ffb6dc6751b64f6128be1e8d623e5fc90aff90771eb
diff --git a/kde-plasma/systemsettings/systemsettings-5.16.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild
index 3822242a75c3..3822242a75c3 100644
--- a/kde-plasma/systemsettings/systemsettings-5.16.4.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 08984ebd7d46..b047ecd27738 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,5 +1,5 @@
 DIST user-manager-5.15.5.tar.xz 546156 BLAKE2B 9b37eee3f88ce182aef023efedf288aed43edd7fa3212ba6549c2cc659e891f45cf20ebc8b573286c5b52cdee42d5367835c06c74d31fdb2d6eb7f20fe9a81f0 SHA512 7a8cc2e37fdfc0f99c317db4f4433559e662f0ae03faae9844d4c51b298fcc8906efd457c17898193687c088664008e41c1e158e64fd0af0c581bbb1f98a924d
-DIST user-manager-5.16.4.tar.xz 547132 BLAKE2B dbaa24aca37e131a64aa8833f222fc53d42a41b785984ad2432b2669529ba0a34d568e5b0d4f418ede4d18162480c586fd7440c667a126742874ee38a1d7ed64 SHA512 38ebbbd3683df30d1146e8d58b5f4f980edb8cdb3fd54617b2b21cfe5a9d07cd190d86dcd2567092000d92213a8024529ebdeae5c1869b340d3ccef7395cbb64
+DIST user-manager-5.16.5.tar.xz 547036 BLAKE2B a7fa24996e5e2f30c85f70301238359736ad1b98db00dccc96c669afd61512805ea81f0a015e47d1292dc053fd0ec0b8928a65f09cf646bd330521e9cc1868a2 SHA512 4a99446165ec06606752a388979caac367addc2e5f5e899a1d91665c632db04d073d91d353317bf5fcb5684966e65ca614f4e9582b11b7641e774dd6d49c57d1
 EBUILD user-manager-5.15.5.ebuild 698 BLAKE2B 47ff0768c259489898cfb2c38dc9597f0fa98c058c6daf70fce8ad4b033e2d230df2af6ec317770a60585fac97f3003bcff051c182380f876f6bb5c95478a5f6 SHA512 0de5e8cb97e348b07195f1e6780d688fcd51521a47a810dfcae8eb87ed2a07d8778963b6eaffd692c2168139f33660b0591e12c7f6feef6b90d2ad66e6435191
-EBUILD user-manager-5.16.4.ebuild 701 BLAKE2B defe57c9c19dec67b10a08ec033c69da01a059227fb8e6a2ad67c1b5e7eb1629bf1ad2cd85d4ffd6e4ff8ed71ae3ae28b65d8c8bae6c5d5c82dcb62ee0447d08 SHA512 9c7ac4d55f49829bca31a7f82a416dad2a9d1744bd35401637624a783c3c63184be551ff8f5ab619411ea670539f80b89439f59af17b52a67e094f4202e5df97
+EBUILD user-manager-5.16.5.ebuild 701 BLAKE2B defe57c9c19dec67b10a08ec033c69da01a059227fb8e6a2ad67c1b5e7eb1629bf1ad2cd85d4ffd6e4ff8ed71ae3ae28b65d8c8bae6c5d5c82dcb62ee0447d08 SHA512 9c7ac4d55f49829bca31a7f82a416dad2a9d1744bd35401637624a783c3c63184be551ff8f5ab619411ea670539f80b89439f59af17b52a67e094f4202e5df97
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.16.4.ebuild b/kde-plasma/user-manager/user-manager-5.16.5.ebuild
index 20a0bceeb947..20a0bceeb947 100644
--- a/kde-plasma/user-manager/user-manager-5.16.4.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.16.5.ebuild
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 93a22b955878..49798e048b9d 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,6 +1,6 @@
 AUX xdg-desktop-portal-kde-5.15.5-appchooser.patch 2385 BLAKE2B c8917416ae9ed68910e6e19e90116c36ceeb4bf04faa4a9c4fbdfceb39d034bf05961559f8f672c8e75fe16b524aab5a811e52f2ffa10a5a308bd6041f9a2b89 SHA512 de598d043539fee25d29f11439003eda5babcde7fe8b017f4eea975334b297c5faf7f9d21bf49d247415bdf1d953df4187a627cbffa2b2cd0f8774c6bd9cadeb
 DIST xdg-desktop-portal-kde-5.15.5.tar.xz 60292 BLAKE2B 5e0f07ec5e57d978c444fc65e1aa70b04dea458d34d9c091da5699501995499fb877e90ae0272634fc7dd62fa192a99d7f800bf7627612e2eafb6763e3f732ca SHA512 f575c9a5273cef3ab34a7eb4be520cdec3344fd6729f79d4475f200a177fba40b265815136c4af18ce6e48c9736bb835af4d972c5563171ead2e4390e938fcbf
-DIST xdg-desktop-portal-kde-5.16.4.tar.xz 61804 BLAKE2B b32366b815c076b24350c65fd86ad7cbbf0063c9167b5694b897257b4dc1aa78fd9e4bd2be34027d9f9b8f3514503334802475fb1e6410e8c60c0240b055ce76 SHA512 401d25bff09c844f9f214234bc8a2ce0975f03adc959079744a4550f56e4b2d38db2105e1392559c681ff04eb9e586d1916cbf7fc59ba6758e610eba927c8009
+DIST xdg-desktop-portal-kde-5.16.5.tar.xz 61576 BLAKE2B b9d186e3269aae6c079bae8abf01e790300da5ba255ecaa37ca2b139bb5c017f0cc118adbaca8d4f846cfbf5d563d574cddca4703e9d917f7001468b27734db6 SHA512 381298cc001795902343512f8bb08c363acfb6e3ef398e0f170f305572ca9a5caaf458e85b6f48ac84bcd963a34e535c666b0ddc1bb910a894a8b8de8801467e
 EBUILD xdg-desktop-portal-kde-5.15.5-r1.ebuild 914 BLAKE2B 3130c056671cbd57b0272fef327b809bc2318fbc98264278e21d5132f4fc6e60aafaa7a31d74141b5e2b41339c76a061f8cdb2513f02c81a46a3ff78e910c37c SHA512 67660f2388e54c873ac53058810ea298373c5f67f936cf2651986c20d6b17b8e0e4874e5fd32dcaa28bab7d5ff3467d9ca56308b0b9e665e52ed110bce15d784
-EBUILD xdg-desktop-portal-kde-5.16.4.ebuild 1200 BLAKE2B 93e441e1db662cbede549dbeb578fd656bae0b82acba68e7b51db0dd25c22b36e910fdc23c8fb12981171818f2a24ad8933d4fdcc445283e0e0c46dc82f07bf3 SHA512 4d5a30b3dce44570a2ba2655f6038751950255623f2d33a158fd6e4569dd2cc219cca60e6433fbc4923e16d2d51723e83b7f4c6e248df2daef8b60bc8fab6c89
+EBUILD xdg-desktop-portal-kde-5.16.5.ebuild 1200 BLAKE2B 93e441e1db662cbede549dbeb578fd656bae0b82acba68e7b51db0dd25c22b36e910fdc23c8fb12981171818f2a24ad8933d4fdcc445283e0e0c46dc82f07bf3 SHA512 4d5a30b3dce44570a2ba2655f6038751950255623f2d33a158fd6e4569dd2cc219cca60e6433fbc4923e16d2d51723e83b7f4c6e248df2daef8b60bc8fab6c89
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.4.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.5.ebuild
index ac89d1e1c4f0..ac89d1e1c4f0 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.4.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.5.ebuild
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 2f2b562c1a4b..84b63e3207aa 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,6 @@
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
 DIST plasma-workspace-5.15.5.tar.xz 4713728 BLAKE2B 7ce14912bf0dc2556484b7b719b00e7296fb67d78faabb9e3c00fbfb56a41db04e27b5f94636142f07e88e24d51ff308025a50d719a940e1287943a35db93e79 SHA512 5d5429114a733d4328f7db6c8e3c7dfe5e04862f8083fcad40b21390efb309c58fd1b13cf63aa57f2842c38936b9fe1c60ad61fc601cf4f592b86285c2270bed
-DIST plasma-workspace-5.16.4.tar.xz 4896860 BLAKE2B fb3f6c89db5bc5142ccb68ab6ebd13d7e0d878c999160301385d163fba0e97bfcfae9bda38dc07547171cfe8823b4375815f1371958ba35c8c9a69272dbaf572 SHA512 d597738c1122fcbe327a1917706e86ed0acc550ddbe2ef4eb776f1a064b09095c0f5d634675787353b90b8b37d24bbd454fa1d8354078bd4ceaa3875471a3bb4
+DIST plasma-workspace-5.16.5.tar.xz 4905748 BLAKE2B 049a4ff618aade78ac130c1496f6add0ddc391db5b025045eaee91fbcac0a0b9e7b44a06757c94699c1038b18a96a06eb31d4ab6518bfda6d308e12b1269ca04 SHA512 e55e89b6a8e3dcf68bb7ad4f62f284cd819c7461eff1269f84df086a2516401c26363cc6c3c8e6cc8e27788222b3ed81098d765a25e5d96d9274e3b342816369
 EBUILD xembed-sni-proxy-5.15.5.ebuild 937 BLAKE2B 6473e8e3eab0f3bd10a1d074ef32929e1f4a5f9e01ea48182df4afc3f1b1350a5631fbf275e934696b2237588a3559a429261d1cf1392b3c354846560be0ce08 SHA512 28b2489919c5487c64eea3f31c94e4d0b1b90072e7ce0d6f77e8b1403b997d95c86cc07634628b049dde96f42f4e9df984e49a7eef529b06ec55fd245f8182c3
-EBUILD xembed-sni-proxy-5.16.4.ebuild 940 BLAKE2B 225160f7ba08e33c4153cd2e431d1ad89d731ca85eb128355268838c1516d142316335d65b1fab6782e653780a1a43f884caf3dda1f3b330c57689208029f571 SHA512 eb25848f0110495fcc2da70a3d0af063bbd764a513540976cf0f3a7e2a9e7a5a15c10535024ae6fb53db902e78106740f2a504149c8a516aaf7cd6243eb71892
+EBUILD xembed-sni-proxy-5.16.5.ebuild 940 BLAKE2B 225160f7ba08e33c4153cd2e431d1ad89d731ca85eb128355268838c1516d142316335d65b1fab6782e653780a1a43f884caf3dda1f3b330c57689208029f571 SHA512 eb25848f0110495fcc2da70a3d0af063bbd764a513540976cf0f3a7e2a9e7a5a15c10535024ae6fb53db902e78106740f2a504149c8a516aaf7cd6243eb71892
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.16.4.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.16.5.ebuild
index 54a97db0e7e7..54a97db0e7e7 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.16.4.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.16.5.ebuild
diff --git a/licenses/Activision b/licenses/Activision
new file mode 100644
index 000000000000..e7c5e01123a5
--- /dev/null
+++ b/licenses/Activision
@@ -0,0 +1,139 @@
+SOFTWARE LICENSE AGREEMENT
+
+IMPORTANT - READ CAREFULLY: USE OF THIS PROGRAM IS SUBJECT TO THE SOFTWARE
+LICENSE TERMS SET FORTH BELOW. "PROGRAM" INCLUDES ALL SOFTWARE INCLUDED WITH
+THIS AGREEMENT, THE ASSOCIATED MEDIA, ANY PRINTED MATERIALS, AND ANY ON-LINE OR
+ELECTRONIC DOCUMENTATION, AND ANY AND ALL COPIES OF SUCH SOFTWARE AND MATERIALS.
+BY OPENING THIS PACKAGE, INSTALLING, AND/OR USING THE PROGRAM AND ANY SOFTWARE
+PRGRAMS INCLUDED WITHIN, YOU ACCEPT THE TERMS OF THIS LICENSE WITH ACTIVISION,
+INC. ("ACTIVISION").
+
+   LIMITED USE LICENSE. Subject to the conditions described below, Activision
+grants you the non-exclusive, non-transferable, limited right and license to
+install and use one copy of this Program solely and exclusively for your
+personal use. All rights not specifically granted under this Agreement are
+reserved by Activision and, as applicable, Activision's licensors. This Program
+is licensed, not sold, for your use. Your license confers no title or ownership
+in this Program and should not be construed as a sale of any rights in this
+Program.
+
+   LICENSE CONDITIONS.
+You shall not:
+o  Exploit this Program or any of its parts commercially.
+o  Use this Program, or permit use of this Program, on more than one computer,
+computer terminal, or workstation at the same time.
+o  Make copies of this Program or any part thereof, or make copies of the
+materials accompanying this Program.
+o  Use the program, or permit use of this Program, in a network, multi-user
+arrangement or remote access arrangement, including any online use, except as
+otherwise explicitly provided by this Program.
+o  Sell, rent, lease or license any copies of this Program, without the express
+prior written consent of Activision.
+o  Remove, disable or circumvent any proprietary notices or labels contained on
+or within the Program.
+
+   OWNERSHIP.  All title, ownership rights and intellectual property rights in and
+to this Program and any and all copies thereof (including but not limited to any
+titles, computer code, themes, objects, characters, character names, stories,
+dialog, catch phrases, locations, concepts, artwork, animation, sounds, musical
+compositions, audio-visual effects, methods of operation, moral rights, any
+related documentation, and "applets" incorporated into this Program) are owned
+by Activision, affiliates of Activision or Activision's licensors. This Program
+is protected by the copyright laws of the United States, international copyright
+treaties and conventions and other laws. This Program contains certain licensed
+materials and Activision's licensors may protect their rights in the event of
+any violation of this Agreement.
+
+PROGRAM UTILITIES. This Program contains certain design, programming and
+processing utilities, tools, assets and other resources ("Program Utilities")
+for use with this Program that allow you to create customized new game levels
+and other related game materials for personal use in connection with the Program
+("New Game Materials"). The use of the Program Utilities is subject to the
+following additional license restrictions:
+
+"   You agree that, as a condition to your using the Program Utilities, you will
+not use or allow third parties to use the Program Utilities and the New Game
+Materials created by you for any commercial purposes, including but not limited
+to selling, renting, leasing, licensing, distributing, or otherwise transferring
+the ownership of such New Game Materials, whether on a stand alone basis or
+packaged in combination with the New Game Materials created by others, through
+any and all distribution channels, including, without limitation, retail sales
+and on-line electronic distribution. You agree not to solicit, initiate or
+encourage any proposal or offer from any person or entity to create any New Game
+Materials for commercial distribution. You agree to promptly inform Activision
+in writing of any instances of your receipt of any such proposal or offer.
+"   If you decide to make available the use of the New Game Materials created by
+you to other gamers, you agree to do so solely without charge.
+"   New Game Materials may be created only if such New Game Materials can be used
+exclusively in combination with the retail version of the Program. New Game
+Materials may not be designed to be used as a stand-alone product.
+"   New Game Materials must not contain any illegal, obscene or defamatory
+materials, materials that infringe rights of privacy and publicity of third
+parties or (without appropriate irrevocable licenses granted specifically for
+that purpose) any trademarks, copyright-protected works or other properties of
+third parties.
+"   All New Game Materials must contain prominent identification at least in any
+on-line description and with reasonable duration on the opening screen: (a) the
+name and E-mail address of the New Game Materials' creator(s) and (b) the words
+"THIS MATERIAL IS NOT MADE OR SUPPORTED BY ACTIVISION."
+
+WARRANTY INFORMATION.  THIS PROGRAM IS PROVIDED AS IS. ACTIVISION AND ITS
+AFFILIATES MAKE NO WARRANTIES OF ANY KIND, WHETHER ORAL OR WRITTEN, EXPRESS OR
+IMPLIED, INCLUDING ANY WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE OR NON-INFRINGEMENT, AND NO OTHER REPRESENTATIONS OR CLAIMS OF ANY KIND
+SHALL BE BINDING ON OR OBLIGATE ACTIVISION OR ITS AFFILIATES.
+
+LIMITATION ON DAMAGES.  IN NO EVENT WILL ACTIVISION OR ANY AFFILIATES OF
+ACTIVISION BE LIABLE FOR SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES RESULTING
+FROM POSSESSION, USE OR MALFUNCTION OF THE PROGRAM, INCLUDING DAMAGES TO
+PROPERTY, LOSS OF GOODWILL, COMPUTER FAILURE OR MALFUNCTION AND, TO THE EXTENT
+PERMITTED BY LAW, DAMAGES FOR PERSONAL INJURIES, EVEN IF ACTIVISION HAS BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. ACTIVISION'S LIABILITY SHALL NOT
+EXCEED THE ACTUAL PRICE PAID FOR THE LICENSE TO USE THIS PROGRAM. SOME
+STATES/COUNTRIES DO NOT ALLOW LIMITATIONS ON HOW LONG AN IMPLIED WARRANTY LASTS
+AND/OR THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+THE ABOVE LIMITAIONS AND/OR EXCLUSION OR LIMITATION OF LIABILITY MAY NOT APPLY
+TO YOU. THIS WARRANTY GIVES YOU SPECIFIC LEGAL RIGHTS, AND YOU MAY HAVE OTHER
+RIGHTS WHICH VARY FROM JURISDICTION TO JURISDICTION.
+
+TERMINATION. Without prejudice to any other rights of Activision, this Agreement
+will terminate automatically if you fail to comply with its terms and
+conditions. In such event, you must destroy all copies of this Program and all
+of its component parts.
+U.S. GOVERNMENT RESTRICTED RIGHTS. The Program and documentation have been
+developed entirely at private expense and are provided as "Commercial Computer
+Software" or "restricted computer software." Use, duplication or disclosure by
+the U.S. Government or a U.S. Government subcontractor is subject to the
+restrictions set forth in subparagraph (c)(1)(ii) of the Rights in Technical
+Data and Computer Software clauses in DFARS 252.227-7013 or as set forth in
+subparagraph (c)(1) and (2) of the Commercial Computer Software Restricted
+Rights clauses at FAR 52.227-19, as applicable. The Contractor/Manufacturer is
+Activision, Inc., 3100 Ocean Park Boulevard, Santa Monica, California 90405.
+
+INJUNCTION. Because Activision would be irreparably damaged if the terms of this
+Agreement were not specifically enforced, you agree that Activision shall be
+entitled, without bond, other security or proof of damages, to appropriate
+equitable remedies with respect to breaches of this Agreement, in addition to
+such other remedies as Activision may otherwise have under applicable laws.
+
+INDEMNITY.  You agree to indemnify, defend and hold Activision, its partners,
+affiliates, licensors, contractors, officers, directors, employees and agents
+harmless from all damages, losses and expenses arising directly or indirectly
+from your acts and omissions to act in using the Product pursuant to the terms
+of this Agreement
+
+MISCELLANEOUS. This Agreement represents the complete agreement concerning this
+license between the parties and supersedes all prior agreements and
+representations between them. It may be amended only by a writing executed by
+both parties. If any provision of this Agreement is held to be unenforceable for
+any reason, such provision shall be reformed only to the extent necessary to
+make it enforceable and the remaining provisions of this Agreement shall not be
+affected. This Agreement shall be construed under California law as such law is
+applied to agreements between California residents entered into and to be
+performed within California, except as governed by federal law and you consent
+to the exclusive jurisdiction of the state and federal courts in Los Angeles,
+California.
+
+If you have any questions concerning this license, you may contact Activision at
+3100 Ocean Park Boulevard, Santa Monica, California 90405, (310) 255-2000,
+Attn. Business and Legal Affairs, legal@activision.com
diff --git a/licenses/ChexQuest3 b/licenses/ChexQuest3
new file mode 100644
index 000000000000..7faed0324d8e
--- /dev/null
+++ b/licenses/ChexQuest3
@@ -0,0 +1 @@
+Chex (R) and Chex Quest (R) are trademarks of General Mills, Inc. Chex Quest 3 cannot be bought or sold under any circumstances.
diff --git a/licenses/DOOM-COLLECTORS-EDITION b/licenses/DOOM-COLLECTORS-EDITION
new file mode 100644
index 000000000000..7ff691d41b56
--- /dev/null
+++ b/licenses/DOOM-COLLECTORS-EDITION
@@ -0,0 +1,88 @@
+LIMITED USE SOFTWARE LICENSE AGREEMENT
+
+This Limited Use Software License Agreement (the "Agreement") is a legal agreement between you, the end-user, and Id Software, Inc. ("ID") and Activision, Inc. ("Activision").  BY CONTINUING THE INSTALLATION OF THE FULL VERSION GAME PROGRAM ENTITLED DOOM COLLECTOR'S EDITION (THE "SOFTWARE"), BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE, COMPUTER RAM OR OTHER STORAGE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS AGREEMENT.  
+
+1. Grant of License for Software.  Subject to the terms and provisions of this Agreement and so long as you fully comply at all times with this Agreement, ID grants to you the non-exclusive and limited right to use the Software in executable or object code form.  The term "Software" includes all elements of the Software such as data files, images appearing in the Software, and screen displays.  You are not receiving any ownership or proprietary right, title or interest in or to the Software or the copyrights, trademarks, or other rights related thereto.  For purposes of the first sentence of this section, "use" means loading the Software into RAM and/or onto computer hard drive, as well as installation of the Software on a hard disk or other storage device, and means the uses permitted in sections 2. and 4. hereinbelow.  You agree that the Software will not be shipped, transferred or exported into any country in violation of the U.S. Export Administration Act (or any other law governing such matters) by you or any one at your direction and that you will not utilize and will not authorize anyone to utilize, in any other manner, the Software in violation of any applicable law.  The Software shall not be exported or re-exported into (or to a national or resident of) any country to which the U.S. has embargoed goods or to anyone or into any country who/which are prohibited, by applicable law, from receiving such property.
+
+2. Permitted New Creations.  Subject to the terms and provisions of this Agreement and so long as you fully comply at all times with this Agreement, ID grants to you the non-exclusive and limited right to create for the Software (except any Software code) your own modifications (the "New Creations") which shall operate only with the Software (but not any demo, test or other version of the Software).  ID reserves all rights not granted in this Agreement, including, without limitation, all rights to ID's trademarks. You may include within the New Creations certain textures and other images (the "ID Images") from the Software.  You shall not create any New Creations which infringe against any third party right or which are libelous, defamatory, obscene, false, misleading, or otherwise illegal or unlawful. You agree that the New Creations will not be shipped, transferred or exported into any country in violation of the U.S. Export Administration Act
+(or any other law governing such matters) by you or anyone at your direction and that you will not utilize and will not authorize anyone to utilize, in any other manner, the New Creations in violation of any applicable law.  The New Creations shall not be downloaded or otherwise exported or re-exported into (or to a national or resident of) any country to which the U.S. has embargoed goods or to anyone or into any country who/which are prohibited, by applicable law, from receiving such property.  You shall not rent, sell, lease, lend, offer on a pay-per-play basis or otherwise commercially exploit or commercially distribute the New Creations.  You are only permitted to distribute, without any cost or charge, the New Creations to other end-users so long as such distribution is not infringing against any third party right and is not otherwise illegal or unlawful.  As noted below, in the event you commit any breach of this Agreement, your license and
+this Agreement shall automatically terminate, without notice.  You hereby agree to indemnify, defend and hold harmless ID and Activision and ID's and Activision's respective officers, employees, directors, agents, licensees (excluding you), sub-licensees (excluding you), successors and assigns from and against all losses, lawsuits, damages, causes of action and claims relating to and/or arising from the New Creations or the distribution or other use of the New Creations or relating to and/or arising from your breach of this Agreement.  Your obligations set forth in the immediately preceding sentence shall survive the cancellation or termination of this Agreement.
+
+3. Prohibitions with Regard to Software. You, whether directly or indirectly, shall not do any of the following acts:
+
+a. rent the Software;
+
+b. sell the Software;
+
+c. lease or lend the Software;
+
+d. offer the Software on a pay-per-play basis;
+
+e. distribute the Software by any means, including, but not limited to, Internet or other electronic distribution, direct mail, retail, mail order or other means;
+
+f. in any other manner and through any medium whatsoever commercially exploit the Software or use the Software for any commercial purpose;
+
+g. disassemble, reverse engineer, decompile, modify (except as permitted by section 2. hereinabove) or alter the Software;
+
+h. translate the Software;
+
+i. reproduce or copy the Software (except as permitted by section 4. hereinbelow);
+
+j. publicly display the Software; or
+
+k. prepare or develop derivative works based upon the Software.
+
+4. Permitted Copying.  You may make only the following copies of the Software:   (i) you may copy the Software from the CD ROM which you purchase onto your computer hard drive; (ii) you may copy the Software from your computer hard drive into your computer RAM; and (iii) you may make one (1) "back up" or archival copy of the Software on one (1) hard disk.
+
+5. Intellectual Property Rights.  Certain printed materials (the "Printed Materials") accompany the Software. The Software and the Printed Materials  and all copyrights, trademarks and all other conceivable intellectual property rights related to the Software and  the Printed Materials are owned by ID and are protected by United States copyright laws, international treaty provisions and all applicable law, such as the Lanham Act.  You must treat the Software and the Printed Materials like any other copyrighted material, as required by 17 U.S.C., §101 et seq. and other applicable law.  You agree to use your best efforts to see that any user of the Software licensed hereunder, the Printed Materials or the New Creations complies with this Agreement.  You agree that you are receiving a copy of the Software and the Printed Materials by license only and not by sale and that the "first sale" doctrine of 17 U.S.C. §109 does not apply to your receipt or use of the
+Software or the Printed Materials. This section 5. shall survive the cancellation or termination of this Agreement.
+
+6. No ID Warranties.  
+ID DISCLAIMS ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY WARRANTY OF NON-INFRINGEMENT, WITH RESPECT TO THE SOFTWARE, THE PRINTED MATERIALS AND THE ID IMAGES.  ID DOES NOT WARRANT THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE WILL MEET YOUR SPECIFIC REQUIREMENTS.  ADDITIONAL STATEMENTS, WHETHER ORAL OR WRITTEN, DO NOT CONSTITUTE WARRANTIES BY ID AND SHOULD NOT BE RELIED UPON.  This section 6. shall survive the cancellation or termination of this Agreement. 
+
+7. Limited Activision Warranty.  Activision warrants to the original consumer purchaser of the Software that the recording medium on which the Software is recorded will be free from defects in material and workmanship for 90 days from the date of purchase.  If the recording medium is found defective within 90 days of original purchase, Activision agrees to replace, free of charge, any Software discovered to be defective within such period upon its receipt of the Software, postage paid, with the proof of the date of purchase, as long as the Software is still being manufactured by Activision.  In the event that the Software is no longer available, Activision retains the right to substitute a similar game program of equal or greater value.  This warranty is limited to the recording medium containing the Software as originally provided by Activision and is not applicable to normal wear and tear. This warranty shall not be applicable and shall be void if the
+defect has arisen through abuse, mistreatment or neglect.
+
+EXCEPT AS SET FORTH ABOVE, THIS WARRANTY IS IN LIEU OF ALL OTHER WARRANTIES, WHETHER ORAL OR WRITTEN, EXPRESS OR IMPLIED, INCLUDING ANY WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT, AND NO OTHER REPRESENTATIONS OR CLAIMS OF ANY KIND SHALL BE BINDING ON OR OBLIGATE ACTIVISION.
+
+When returning the Software for warranty replacement, the original Software disks must be sent only in a protective packaging and include:   (1) photocopy of your dated sales receipt; (2) your name and return address typed or clearly printed; (3) a brief note describing the defect, the problem(s) you are encountering and the system on which you are running the Software; (4) if you are returning the Software after the 90-day warranty period, but within one year after the date of purchase, please include check or money order for $10 U.S. (A$17 for Australia, or £10.00 for Europe) currency per CD or floppy disk replacement.  Note:   Certified mail recommend.
+
+In the U.S. send to
+Warranty Replacements
+Activision, Inc.
+P.O. Box 67713
+Los Angeles, CA 90067
+
+In Europe send to:
+
+WARRANTY REPLACEMENTS
+ACTIVISION (UK) Ltd.
+Parliament House
+St Laurence Way
+Slough, Berkshire
+SL1 2BW
+United Kingdom
+Disc Replacement: + (44) 1753 756 189
+
+In Australia and Asia Pacific territories send to:
+
+Warranty Replacements
+Activision
+Century Plaza
+41 Rawson Street
+Epping, NSW 2121
+Australia
+
+
+8. Governing Law, Venue, and Liability Limitation.  This Agreement shall be construed in accordance with and governed by the applicable laws of the State of Texas and applicable United States federal law.  Copyright and other proprietary matters will be governed by applicable United States laws and international treaties.  Except as set forth below, exclusive venue for all litigation regarding this Agreement shall be in Dallas County, Texas and you agree to submit to the jurisdiction of the courts in Dallas, Texas for any such litigation. Exclusive venue for all litigation involving Activision, but not involving ID, with regard to this Agreement shall be in Los Angeles County, California and you agree to submit to the jurisdiction of the courts in Los Angeles, California for any such litigation.  You agree that your unauthorized use of the ID Images, the Printed Materials, or the Software, or any part thereof, may immediately and irreparably damage ID such that ID
+could not be adequately compensated solely by a monetary award and that at ID's option ID shall be entitled to an injunctive order, in addition to all other available remedies including a monetary award, appropriately restraining and/or prohibiting such unauthorized use without the necessity of ID posting bond or other security.   
+
+IN ANY CASE, ID, ACTIVISION, AND ID'S AND ACTIVISION'S RESPECTIVE OFFICERS, EMPLOYEES, DIRECTORS, AGENTS, LICENSEES (EXCLUDING YOU), SUBLICENSEES (EXCLUDING YOU), SUCCESSORS OR ASSIGNS SHALL NOT BE LIABLE FOR LOSS OF DATA, LOSS OF PROFITS, LOST SAVINGS, SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT, PUNITIVE OR OTHER SIMILAR DAMAGES ARISING FROM ANY ALLEGED CLAIM FOR BREACH OF WARRANTY, BREACH OF CONTRACT, NEGLIGENCE, STRICT PRODUCT  LIABILITY, OR OTHER LEGAL THEORY EVEN IF ID, ACTIVISION OR THEIR RESPECTIVE AGENT(S) HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES OR EVEN IF SUCH DAMAGES ARE FORESEEABLE, OR LIABLE FOR ANY CLAIM BY ANY OTHER
+PARTY.  Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so the above limitation or exclusion may not apply to you.  This section 8. shall survive the cancellation or termination of this Agreement.
+
+9. U.S. Government Restricted Rights.  To the extent applicable, the United States Government shall only have those rights to use the Software and the Printed Materials as expressly stated and expressly limited and restricted in this Agreement, as provided in 48 C.F.R. §§ 227.7201 through 227.7204, inclusive.
+
+10. General Provisions.  Neither this Agreement nor any part or portion hereof shall be assigned or sublicensed by you.  ID and Activision each may assign its respective rights under this Agreement in the assigning party's sole discretion.  Should any provision of this Agreement be held to be void, invalid, unenforceable or illegal by a court of competent jurisdiction, the validity and enforceability of the other provisions shall not be affected thereby.  If any provision is determined to be unenforceable by a court of competent jurisdiction, you agree to a modification of such provision to provide for enforcement of the provision's intent, to the extent permitted by applicable law.  Failure of ID or Activision to enforce any provision of this Agreement shall not constitute or be construed as a waiver of such provision or of the right to enforce such provision.  Immediately upon your failure to comply with or breach of any term or provision of this Agreement, 
+YOUR LICENSE AND THIS AGREEMENT SHALL AUTOMATICALLY TERMINATE, WITHOUT NOTICE,  AND ID AND ACTIVISION MAY PURSUE ALL RELIEF AND REMEDIES AGAINST YOU WHICH ARE AVAILABLE UNDER APPLICABLE LAW AND/OR THIS AGREEMENT.  In the event this Agreement is terminated, you shall have no right to use the Software, the Printed Materials or the New Creations, in any manner, and you shall immediately destroy all copies of the Software, the Printed Materials and the New Creations in your possession, custody or control.
+
+YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT, THAT YOU UNDERSTAND THIS AGREEMENT, AND UNDERSTAND THAT BY CONTINUING THE INSTALLATION OF THE SOFTWARE, BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE OR RAM, YOU AGREE TO BE BOUND BY THE TERMS AND CONDITIONS OF THIS AGREEMENT.  YOU FURTHER AGREE THAT, EXCEPT FOR WRITTEN SEPARATE AGREEMENTS BETWEEN ID, ACTIVISION AND YOU, IF ANY, THIS AGREEMENT IS A COMPLETE AND EXCLUSIVE STATEMENT OF THE RIGHTS AND LIABILITIES OF THE PARTIES HERETO.  THIS AGREEMENT SUPERSEDES ALL PRIOR ORAL AGREEMENTS, PROPOSALS OR UNDERSTANDINGS, AND ANY OTHER COMMUNICATIONS BETWEEN ID, ACTIVISION AND YOU RELATING TO THE SUBJECT MATTER OF THIS AGREEMENT.
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 6d3f94f30264..033d868ae982 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/licenses/Yacht-Club-Games-EULA b/licenses/Yacht-Club-Games-EULA
new file mode 100644
index 000000000000..ee8d30a1fefa
--- /dev/null
+++ b/licenses/Yacht-Club-Games-EULA
@@ -0,0 +1,40 @@
+Yacht Club Games, LLC
+End User License Agreement
+
+THIS END USER LICENSE AGREEMENT ("EULA") IS A BINDING LEGAL AGREEMENT BETWEEN Yacht Club Games, LLC ("Yacht Club Games") AND YOU AND, IF APPLICABLE, THE COMPANY OR OTHER LEGAL ENTITY YOU REPRESENT (COLLECTIVELY, "YOU" AND "YOUR") REGARDING THE GAME SOFTWARE THAT YOU ARE INSTALLING, INCLUDING ANY ACCOMPANYING MANUAL OR OTHER RELATED MATERIAL PROVIDED BY Yacht Club Games AS PART OF, OR IN CONNECTION, THEREWITH (COLLECTIVELY, THE "GAME").
+
+BY CLICKING THE "I AGREE" BUTTON BELOW, OR BY OTHERWISE CONTINUING TO INSTALL, DOWNLOAD, COPY, ACCESS OR USE THE GAME, YOU ACKNOWLEDGE THAT YOU UNDERSTAND AND AGREE TO BE BOUND BY THE TERMS OF THIS EULA.  IF YOU DO NOT AGREE, YOU MUST SELECT THE "I DON'T AGREE" BUTTON AND YOU MAY NOT CONTINUE TO INSTALL, DOWNLOAD, COPY, ACCESS OR USE THE GAME.
+
+1. 	LICENSE GRANT AND RESTRICTIONS.
+
+	1.1	License Grant. Yacht Club Games hereby grants to you a non-exclusive license to use a single copy of the object code version of the Game for your personal, non-commercial home entertainment use on one personal computer or other compatible electronic device.  You may sell or transfer your copy of the Game to another person along with, and subject to, your rights under this EULA, only if you do not retain any copies.
+
+	1.2	Restrictions. You may not (i) decompile, disassemble or reverse engineer the Game or otherwise attempt to gain access to its source code, except to the extent that such restrictions are expressly prohibited by law; (ii) copy, offer for public display or create derivative works thereof, except to the extent that such restrictions are expressly prohibited by law; (iii) rent, lease, loan, sublicense or distribute the Game, or offer it on a pay-per-play, coin-op or other for charge (or free) basis; (iv) use the Game to infringe the copyrights or other intellectual property rights of others in any way; (v) modify or delete the copyright and other proprietary rights notices on or in the Game.
+
+	1.3  	Game Specific Terms and Conditions. For additional terms and conditions that may apply to the Game, such as third-party copyright notices and license information, please review the Readme file included with the Game.  The ReadMe file for the Game is hereby incorporated into this EULA by this reference.
+
+2.  	TERMINATION. This EULA is effective until terminated. You may terminate this EULA at any time by uninstalling the Game and destroying all copies of the Game in your possession or control.  Yacht Club Games may terminate this EULA immediately upon notice to you if you breach any of its terms or conditions.  Upon termination of this EULA, you agree to immediately uninstall the Game and destroy all copies of the Game.
+
+3.  	GAME OWNERSHIP. The Game is the copyrighted proprietary material of Yacht Club Games and/or its third-party licensors and is subject to copyright protection under U.S. copyright law and international copyright treaties, as well as other intellectual property laws and treaties. Yacht Club Games and/or its third-party licensors retain all right, title, and interest in the Game (and any copies thereof) and specifically reserve all rights not expressly granted under this EULA.
+
+4.  LIMITED WARRANTIES BY Yacht Club Games.
+
+	4.1 	Limited Warranty. Yacht Club Games WARRANTS TO YOU, THE ORIGINAL PURCHASER OF THE GAME, THAT THE GAME WILL BE FREE FROM DEFECTS IN MATERIALS AND WORKMANSHIP FOR A PERIOD OF NINETY (90) DAYS FROM THE DATE OF PURCHASE (THE "WARRANTY PERIOD").  THIS LIMITED WARRANTY IS VOID IF THE GAME HAS BEEN SUBJECT TO MISUSE, DAMAGE OR IF YOU HAVE VIOLATED THIS EULA. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, ALL OTHER WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT, OR WARRANTIES THAT THE GAME WILL BE ERROR-FREE, SECURE OR VIRUS-FREE, ARE HEREBY EXPRESSLY DISCLAIMED.
+
+	4.2 	Additional Warranty for Retail Product. IF YOU PURCHASED THE GAME ON A DISC OR OTHER RECORDING MEDIUM, THEN YOU MUST MAKE ANY WARRANTY CLAIM TO THE RETAILER FROM WHICH YOU PURCHASED THE GAME BY PROVIDING A COPY OF YOUR ORIGINAL SALES RECEIPT AND ANY OTHER DETAILS REQUIRED BY THE RETAILER. THE RETAILER, AT ITS OPTION, MAY REFUND YOUR PURCHASE PRICE, REPAIR OR REPLACE THE DISC OR OTHER MEDIA CONTAINING THE GAME. ANY REPLACEMENT WILL BE WARRANTED FOR THE REMAINDER OF THE ORIGINAL WARRANTY PERIOD OR THIRTY (30) DAYS, WHICHEVER IS LONGER. YOUR EXCLUSIVE REMEDY, AND THE ENTIRE LIABILITY OF Yacht Club Games, ITS AFFILIATES, LICENSORS AND SUPPLIERS (COLLECTIVELY, "THE Yacht Club Games PARTIES"), FOR BREACH OF THIS WARRANTY, SHALL BE THE REFUND, REPAIR OR REPLACEMENT DESCRIBED ABOVE.
+
+5. LIMITATION OF LIABILITY. NO PROVISIONS OF THIS EULA SHALL APPLY TO LIMIT LIABILITY ARISING FROM DEATH OR PERSONAL INJURY CAUSED BY NEGLIGENCE OR FOR FRAUD. OTHERWISE, IN NO EVENT WILL THE Yacht Club Games PARTIES' TOTAL AGGREGATE LIABILITY TO YOU FOR DIRECT DAMAGES, LOSSES, AND CAUSES OF ACTION ARISING OUT OF OR RELATING TO THIS EULA AND/OR YOUR USE OF THE GAME EXCEED THE AMOUNT PAID BY YOU FOR THE GAME.  IN NO EVENT WILL THE Yacht Club Games PARTIES BE LIABLE FOR ANY INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR ANY OTHER TYPE OF DAMAGES (INCLUDING WITHOUT LIMITATION DAMAGES RELATING TO LOST PROFITS, LOSS OF DATA, PRIVACY, NEGLIGENCE OR OTHER DUTY OF CARE), EVEN IF ONE OR MORE OF THE Yacht Club Games PARTIES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+6. BASIS OF THE BARGAIN; EXCLUSIONS. The disclaimers of warranties and limitations of liability set forth above are fundamental elements of the basis of the agreement between you and Yacht Club Games.  You understand and agree that Yacht Club Games would not be able to economically or reasonably provide the Game to you without these limitations. HOWEVER, SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES AND/OR THE LIMITATION OF INDIRECT DAMAGES AS SET FORTH IN SECTIONS 4 AND 5 ABOVE, SO THE ABOVE EXCLUSIONS AND LIMITATIONS MAY NOT APPLY TO YOU.
+
+7. INDEMNIFICATION.  You agree to indemnify, defend and hold harmless the Yacht Club Games Parties, including their respective employees, officers, directors and personnel from any claims, losses, damages, liabilities, including attorneys' fees, arising out of your violation of this EULA and/or your use or misuse of the Game.
+
+8. EXPORT CONTROL.  The Game originates in the United States and is subject to United States export laws and regulations. You may not export or re-export, in whole or in part, the Game to certain countries, persons or entities prohibited from receiving exports from the United States.  Additionally, the Game may be subject to the import and export laws of other countries, and you agree that you will comply with any such foreign import and export laws, as applicable.
+
+9. MISCELLANEOUS.  You agree to comply with all United States and foreign laws related to your use of the Game.  This is the entire agreement between you and Yacht Club Games relating to the subject matter herein and replaces any and all previous representations, agreements, understandings or communications, whether written or oral.  This EULA may not be modified except in writing, signed by both parties. If a court of competent jurisdiction declares any provision of this EULA to be void or unenforceable, then such provision will be interpreted, construed or reformed to the extent reasonably required to render it valid, enforceable and consistent with the original intent underlying such provision, and such invalidity or unenforceability will not affect any other provision of this EULA.   The English language version of this EULA will control its interpretation.
+
+10.  GOVERNING LAW AND VENUE.
+
+This EULA will be governed by and construed in accordance with the laws of the State of California, USA, excluding its conflicts of law rules and specifically excluding the United Nations Convention on Contracts for the International Sale of Goods.  Venue for any action hereunder shall lie exclusively in the state and federal courts located in San Francisco County, California USA and you hereby consent and submit to the personal jurisdiction of such courts.
+
+11.  NOTICES; HOW TO CONTACT Yacht Club Games.  The Game is made available to you by Yacht Club Games, LLC.  Yacht Club Games may be contacted via its website (http://yachtclubgames.com).
diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index aa87d16aa03d..56497602ae6d 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index 9e10f97491ad..fa123c14afff 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -5,5 +5,6 @@ AUX lxsession-0.5.2-reload.patch 1324 BLAKE2B 9457c86d228db27eef0f32149af14acf75
 DIST lxsession-0.5.2.tar.xz 354092 BLAKE2B 3acbf1be74ed461d331ea8ed10e5c403057671d5f7f32c72951ba89681ad4b0b1a104c2962805738e5b414549e84db3e12327172ffe1b7c6f13a09e09c44fd0f SHA512 2e08e5263bb4ef9d8051e84997347a12d2f1ba75cf4e70f9e3ba783a509246f0d6efd672ac1cc1d0fffc8707710ddb148298449b5365deb6785623d596bc3da1
 DIST lxsession-0.5.4.tar.xz 422756 BLAKE2B a04c67dbbb9da6405e165a05eb43d82f9d7ecc943147a8c5ab4fb5edf50b40b408db102ea1e96e142f61fcc2d1ead023685c33e1c26c09a4183882cfe9c5c930 SHA512 5b92d6e703ef692e3788554a3a34eca7bb4b7bb23d735af838c35bfaab142238eaeee3095176e5e4a7464468ab5478a596c670b0e2488f8599091f3e2fc8482b
 EBUILD lxsession-0.5.2.ebuild 1757 BLAKE2B 47b9ba8b2df76bba57ac7d9f7703679dd12e403ea594af067834251425cc0ec3f310217612ab42f25ef0e6e7c5911ad3bd2828833f71026bc166a14eb1696f58 SHA512 2d9aecf337f2db774aad29ea4ef92d40e05b46d6a081ea784bb8a400f6d2d1445d409a381ae85be989551196cd1324d12fc87d50b48f2bd98d40bae8f0955775
+EBUILD lxsession-0.5.4-r1.ebuild 1292 BLAKE2B af57ffb14fe4df7680a46b76aa47c4fd9c856342e231de0f01672fea8c499cbf737e6374d2c2af9d468e106a8cec94f1a31da35f020b469c1c3eb631eb0029eb SHA512 5acf67d297c12c91b6313e4075565555c20bf6c68cc6afc633d125f663ea7c90ccb296233f9e2dddfcac26dc9760e929dce93068e0d679315454d76e7b7b8000
 EBUILD lxsession-0.5.4.ebuild 1311 BLAKE2B 01b9d7d65131918545a0290174e75ec1085b9d282c6a5c20897942dbe7b36474b3462849307044159f4d0d36c72c2b612bc6bf900b2a98979471fa212949d15f SHA512 be85604140af0e52cd71695bdab0b315322cbc8e69253181821227c33f3df3d58c9b386763749cb6d2056a54f014da05e87c14ffc11baf16f592fedd46a38f0b
 MISC metadata.xml 335 BLAKE2B 8cda3e7dd4b3668ffc5c311b5f002afaaff19143f058eb873d5d917c63f6752fec6da156d869061939803ea0bacbed80ea0a56e92d53b6e06025ed9b3f3c9462 SHA512 4c2d3c8ed34571ef578e11a64d7cfebe44e87353c59e1711f61ecaf224bf8596e8693651b1f3c185c87275f6b980d4ccbedc16828f30a16ee3899a2f020c53f7
diff --git a/lxde-base/lxsession/lxsession-0.5.4-r1.ebuild b/lxde-base/lxsession/lxsession-0.5.4-r1.ebuild
new file mode 100644
index 000000000000..3c2f2eae2188
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.5.4-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit vala autotools
+
+DESCRIPTION="LXDE session manager"
+HOMEPAGE="https://wiki.lxde.org/en/LXSession"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux"
+SLOT="0"
+
+# upower USE flag is enabled by default in the desktop profile
+IUSE="nls upower"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/dbus-glib
+	dev-libs/libunique:1
+	lxde-base/lxde-common
+	sys-auth/polkit
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	sys-apps/dbus
+"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxsession-edit
+	sys-apps/lsb-release
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	# Fedora patches
+	"${FILESDIR}"/${PN}-0.5.2-reload.patch
+	"${FILESDIR}"/${PN}-0.5.2-notify-daemon-default.patch
+	"${FILESDIR}"/${PN}-0.5.2-fix-invalid-memcpy.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+	# gtk3 looks to not be ready, follow what other distributions are
+	# doing
+	econf \
+		$(use_enable nls) \
+		--disable-gtk3
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 2f6ce90d72ec..ee74e28f6c6e 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/s-nail/Manifest b/mail-client/s-nail/Manifest
index d4cec66a5c15..a5325e7323ba 100644
--- a/mail-client/s-nail/Manifest
+++ b/mail-client/s-nail/Manifest
@@ -1,3 +1,6 @@
+AUX s-nail-14.9.15-havenet.patch 6648 BLAKE2B e5c47d116f78eb007b86b5c907782c8c77e61dedb9dbc98e10d2a2975409c6495c0c370a82108cf5832737cc75b5e0bba268cf97703a6e41c7fa207e24bf83a8 SHA512 3f5cbfe1b8b1450150e7b17a700693ae9083944e9a096aae08af9b08ceae3b3c46d240528a3ccdea579353406a2b5328b506668e54488455aaac9aad70dc1c00
 DIST s-nail-14.9.13.tar.xz 734416 BLAKE2B b23de9c32357d5b88ecb723dc875d3366b2b4c57dd654a4f2422e8bb81b781a76568eb0955990d4166f034bf40459fa5d2992da6e7f2b403a641a4d4c0c1e200 SHA512 6467846fab5752c708886ba7a66cd2038effc0cf8d72e2feb670283cf1d5436c27037087eeaa201c074964476ff0c213cffe74169fb03089ebf964fcc766e6ea
+DIST s-nail-14.9.15.tar.xz 757180 BLAKE2B 9d3efe43e6f1f4486bb66bb0060a6b656097c4b6d95e5f22e209e7464bd92bc9cf42a36009d674a3ee032ab32f64ecef2aa0cc1b09519a7760bf5d1145e35c5d SHA512 ca95c544890a13b475fb12f882a172942f29517319956eccab1fbc2a67625fe53e3f0cc10c31daac98e28bb1fae48364d80db9ec35f0e6cc71d748290a2635df
 EBUILD s-nail-14.9.13.ebuild 1935 BLAKE2B d6a22d55c96af91e1d73527421e0e4330f120eaf616647f6584022322e5d43bda9d440376829321d4aa5c449453711ea1937fd0749e2d807deaa57b1ee990be6 SHA512 bd5093554a5467ec80e1fe391123f32799487ef9a90823b891199c443db19928e646b6eb01adf5600638ae8d5b1310b557a7d6f05cc6e716d4ce3261942bb6b2
+EBUILD s-nail-14.9.15.ebuild 2009 BLAKE2B 737eb36cfae90f8b5ca02490878d6230d04472d68b55f79e248698aa293e1a7c540c695bd065caef390500edb3fc9e20adb5a77ac15a0b2573f5b52b70c024c1 SHA512 b2576216c3ecdef61ff5260a2d3c5f5ee1fb49d023fe261fbf9a9b015b3ada6aed05d423a3d75c367371065060d25a9310fa733f3d8731e55eb73726c5587728
 MISC metadata.xml 827 BLAKE2B 60255cc3fe6eacd232600dc62ec110994d63025c0a378dc0853cf6111ec087859274a158e1a9719ae7853eb0b752e806b1c3ad3304256cba2c75ad21a7bda059 SHA512 0c0d5ece2c20d666bca54d14288ecf0bf61fcb7c3d0b65145c77f353f24382c35643eae9ac7b6d48657b795dbdbe7256d8b0ad4dcf54c55888cc289ed9e67d55
diff --git a/mail-client/s-nail/files/s-nail-14.9.15-havenet.patch b/mail-client/s-nail/files/s-nail-14.9.15-havenet.patch
new file mode 100644
index 000000000000..386e03e174d8
--- /dev/null
+++ b/mail-client/s-nail/files/s-nail-14.9.15-havenet.patch
@@ -0,0 +1,205 @@
+diff --git a/THANKS b/THANKS

+index 9613133d..1d4dfd0d 100644

+--- a/THANKS

++++ b/THANKS

+@@ -43,6 +43,7 @@ Erich Eckner              erich dot eckner at gmx dot de

+ Paul Eggert               eggert at cs dot ucla dot edu

+ Justin Ellingwood         JustinEllingwood at gmail dot com

+ Robert Elz                kre at munnari dot OZ dot AU

++Brian Evans               grknight at gentoo dot org

+ Rich Felker               dalias at libc dot org

+ Dr. Werner Fink           werner at suse dot de

+ Felix Fontein             felix at fontein dot de

+diff --git a/mx-test.sh b/mx-test.sh

+index 4a60a1b0..201b00e7 100755

+--- a/mx-test.sh

++++ b/mx-test.sh

+@@ -5442,12 +5442,17 @@ t_mta_aliases() {

+    ## xxx The following are actually *expandaddr* tests!!

+ 

+    # May not send plain names over SMTP!

+-   echo | ${MAILX} ${ARGS} -Smta=smtp://laber.backe \

+-      -Smta-aliases=./.tali \

+-      -b a3 -c a2 a1 > ./.tall 2>&1

+-   check_exn0 3

+-   check 4 - "${MBOX}" '1172368381 238'

+-   if have_feat uistrings; then

++   mtaali=

++   if have_feat smtp; then

++      echo | ${MAILX} ${ARGS} \

++         -Smta=smtp://laber.backe -Ssmtp-auth=none \

++         -Smta-aliases=./.tali \

++         -b a3 -c a2 a1 > ./.tall 2>&1

++      check_exn0 3

++      check 4 - "${MBOX}" '1172368381 238'

++      mtaali=1

++   fi

++   if [ -n "${mtaali}" ] && have_feat uistrings; then

+       check 5 - .tall '771616226 179'

+    else

+       t_echoskip '5:[test unsupported]'

+diff --git a/src/mx/cmd-resend.c b/src/mx/cmd-resend.c

+index 488c9b78..31f20609 100644

+--- a/src/mx/cmd-resend.c

++++ b/src/mx/cmd-resend.c

+@@ -723,7 +723,11 @@ jleave:

+ 

+ static int

+ a_crese_resend1(void *vp, boole add_resent){

+-   struct mx_url url;

++#ifdef mx_HAVE_NET

++   struct mx_url url, *urlp = &url;

++#else

++   struct mx_url *urlp = NIL;

++#endif

+    struct header head;

+    struct mx_name *myto, *myrawto;

+    boole mta_isexe;

+@@ -747,7 +751,7 @@ jedar:

+       goto jleave;

+    }

+ 

+-   if(!(mta_isexe = mx_sendout_mta_url(&url)))

++   if(!(mta_isexe = mx_sendout_mta_url(urlp)))

+       goto jleave;

+    mta_isexe = (mta_isexe != TRU1);

+ 

+@@ -794,7 +798,7 @@ jedar:

+       head.h_mailx_orig_cc = lextract(hfield1("cc", mp), GCC | gf);

+       head.h_mailx_orig_bcc = lextract(hfield1("bcc", mp), GBCC | gf);

+ 

+-      if(n_resend_msg(mp, (mta_isexe ? NIL : &url), &head, add_resent

++      if(n_resend_msg(mp, (mta_isexe ? NIL : urlp), &head, add_resent

+             ) != OKAY){

+          /* n_autorec_relax_gut(); XXX but is handled automatically? */

+          goto jleave;

+diff --git a/src/mx/sendout.c b/src/mx/sendout.c

+index 2b0e8bf0..c4f373c1 100644

+--- a/src/mx/sendout.c

++++ b/src/mx/sendout.c

+@@ -2060,9 +2060,13 @@ FL enum okay

+ n_mail1(enum n_mailsend_flags msf, struct header *hp, struct message *quote,

+    char const *quotefile)

+ {

+-   struct n_sigman sm;

++#ifdef mx_HAVE_NET

+    struct mx_cred_ctx cc;

+-   struct mx_url url;

++   struct mx_url url, *urlp = &url;

++#else

++   struct mx_url *urlp = NIL;

++#endif

++   struct n_sigman sm;

+    struct sendbundle sb;

+    struct mx_name *to;

+    boole dosign, mta_isexe;

+@@ -2121,7 +2125,7 @@ n_mail1(enum n_mailsend_flags msf, struct header *hp, struct message *quote,

+ #ifndef mx_HAVE_SMIME

+    if (dosign) {

+       n_err(_("No S/MIME support compiled in\n"));

+-      goto jleave;

++      goto jfail_dead;

+    }

+ #endif

+ 

+@@ -2139,8 +2143,8 @@ n_mail1(enum n_mailsend_flags msf, struct header *hp, struct message *quote,

+     * TODO header fields ONCE, call that ONCE after user editing etc. has

+     * TODO completed (one edit cycle) */

+ 

+-   if(!(mta_isexe = mx_sendout_mta_url(&url)))

+-      goto jleave;

++   if(!(mta_isexe = mx_sendout_mta_url(urlp)))

++      goto jfail_dead;

+    mta_isexe = (mta_isexe != TRU1);

+ 

+    /* Take the user names from the combined to and cc lists and do all the

+@@ -2174,8 +2178,10 @@ n_mail1(enum n_mailsend_flags msf, struct header *hp, struct message *quote,

+    sb.sb_hp = hp;

+    sb.sb_to = to;

+    sb.sb_input = mtf;

+-   sb.sb_urlp = mta_isexe ? NIL : &url;

++   sb.sb_urlp = mta_isexe ? NIL : urlp;

++#ifdef mx_HAVE_NET

+    sb.sb_credp = &cc;

++#endif

+ 

+    if((dosign || count_nonlocal(to) > 0) &&

+          !_sendbundle_setup_creds(&sb, (dosign > 0))){

+@@ -2728,8 +2734,10 @@ FL enum okay

+ n_resend_msg(struct message *mp, struct mx_url *urlp, struct header *hp,

+    boole add_resent)

+ {

+-   struct n_sigman sm;

++#ifdef mx_HAVE_NET

+    struct mx_cred_ctx cc;

++#endif

++   struct n_sigman sm;

+    struct sendbundle sb;

+    FILE * volatile ibuf, *nfo, * volatile nfi;

+    struct mx_fs_tmp_ctx *fstcp;

+@@ -2794,7 +2802,9 @@ n_resend_msg(struct message *mp, struct mx_url *urlp, struct header *hp,

+    sb.sb_to = to;

+    sb.sb_input = nfi;

+    sb.sb_urlp = urlp;

++#ifdef mx_HAVE_NET

+    sb.sb_credp = &cc;

++#endif

+ 

+    if(!_sendout_error &&

+          count_nonlocal(to) > 0 && !_sendbundle_setup_creds(&sb, FAL0)){

+diff --git a/src/mx/url.c b/src/mx/url.c

+index 574e7c56..4bd55fb5 100644

+--- a/src/mx/url.c

++++ b/src/mx/url.c

+@@ -321,29 +321,33 @@ mx_url_parse(struct mx_url *urlp, enum cproto cproto, char const *data){

+ 

+    rv = FAL0;

+ 

++#ifdef mx_HAVE_TLS

++# define a_OUCH 0

++#else

++# define a_OUCH 1

++#endif

++

+    /* Network protocol */

+ #define a_PROTOX(X,Y,Z) \

+    urlp->url_portno = Y;\

+    su_mem_copy(urlp->url_proto, X "://\0", sizeof(X "://\0"));\

+    urlp->url_proto[sizeof(X) -1] = '\0';\

+    urlp->url_proto_len = sizeof(X) -1;\

+-   do{ Z; }while(0)

++   if(a_OUCH){ Z; }

+ #define a_PRIVPROTOX(X,Y,Z) \

+    do{ a_PROTOX(X, Y, Z); }while(0)

+-#define a__IF(X,Y,Z)  \

++

++#define a__IF(T,X,Y,Z)  \

+    if(!su_cs_cmp_case_n(data, X "://", sizeof(X "://") -1)){\

++      if(a_OUCH && T)\

++         goto jeproto;\

+       a_PROTOX(X, Y, Z);\

+       data += sizeof(X "://") -1;\

+       goto juser;\

+    }

+-#define a_IF(X,Y) a__IF(X, Y, (void)0)

+-#ifdef mx_HAVE_TLS

+-# define a_IFS(X,Y) a__IF(X, Y, urlp->url_flags |= mx_URL_TLS_REQUIRED)

+-# define a_IFs(X,Y) a__IF(X, Y, urlp->url_flags |= mx_URL_TLS_OPTIONAL)

+-#else

+-# define a_IFS(X,Y) goto jeproto;

+-# define a_IFs(X,Y) a_IF(X, Y)

+-#endif

++#define a_IF(X,Y) a__IF(0, X, Y, (void)0)

++#define a_IFS(X,Y) a__IF(1, X, Y, urlp->url_flags |= mx_URL_TLS_REQUIRED)

++#define a_IFs(X,Y) a__IF(0, X, Y, urlp->url_flags |= mx_URL_TLS_OPTIONAL)

+ 

+    switch(cproto){

+    case CPROTO_CERTINFO:

+@@ -413,6 +417,7 @@ mx_url_parse(struct mx_url *urlp, enum cproto cproto, char const *data){

+ #endif

+    }

+ 

++#undef a_OUCH

+ #undef a_PRIVPROTOX

+ #undef a_PROTOX

+ #undef a__IF

diff --git a/mail-client/s-nail/s-nail-14.9.15.ebuild b/mail-client/s-nail/s-nail-14.9.15.ebuild
new file mode 100644
index 000000000000..7ca0db136c29
--- /dev/null
+++ b/mail-client/s-nail/s-nail-14.9.15.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+HOMEPAGE="https://www.sdaoden.eu/code.html"
+DESCRIPTION="Enhanced mailx-compatible mail client based on Hierloom mailx (nail)"
+LICENSE="BSD BSD-4 ISC RSA"
+
+SRC_URI="https://ftp.sdaoden.eu/${P}.tar.xz"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="idn kerberos libressl net ssl"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	virtual/libiconv
+	idn? ( net-dns/libidn2 )
+	net? (
+		ssl? (
+			!libressl? ( dev-libs/openssl:0 )
+			libressl? ( dev-libs/libressl )
+		)
+		kerberos? ( virtual/krb5 )
+	)
+	!mail-client/mailx
+	!net-mail/mailutils
+	!mail-client/nail
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/awk"
+
+PATCHES=( "${FILESDIR}/s-nail-14.9.15-havenet.patch" )
+
+src_configure() {
+	local confopts=(
+		CC=$(tc-getCC)
+		EXTRA_CFLAGS=-std=c99
+		strip=/bin/true
+		OPT_AUTOCC=no
+		VAL_PREFIX="${EPREFIX}"/usr
+		VAL_SYSCONFDIR="${EPREFIX}"/etc
+		VAL_MTA="${EPREFIX}/usr/sbin/sendmail"
+		VAL_MAIL='/var/spool/mail'
+		VAL_PAGER=less
+		$(usex idn VAL_IDNA=idn2 OPT_IDNA=no)
+		VERBOSE=1
+	)
+
+	if use net; then
+		confopts+=( OPT_TLS=$(usex ssl require no)
+			OPT_GSSAPI=$(usex kerberos require no)
+		)
+	else
+		confopts+=( OPT_NET=no )
+	fi
+
+	tc-is-cross-compiler && confopts+=( OPT_CROSS_BUILD=yes )
+
+	emake "${confopts[@]}" config
+}
+
+src_compile() {
+	emake build
+}
+
+src_install () {
+	# Use /usr/sbin/sendmail by default and provide an example
+	cat <<- EOSMTP >> nail.rc
+
+		# Use the local sendmail (/usr/sbin/sendmail) binary by default.
+		# (Uncomment the following line to use a SMTP server)
+		#set smtp=localhost
+
+		# Ask for CC: list too.
+		set askcc
+	EOSMTP
+
+	emake DESTDIR="${D}" install
+
+	dodoc INSTALL NEWS README THANKS
+
+	dodir /bin
+	dosym ../usr/bin/mailx /bin/mail
+	dosym s-nail /usr/bin/mailx
+	dosym mailx /usr/bin/mail
+	dosym mailx /usr/bin/Mail
+
+	dosym s-nail.1 /usr/share/man/man1/mailx.1
+	dosym mailx.1 /usr/share/man/man1/mail.1
+	dosym mailx.1 /usr/share/man/man1/Mail.1
+}
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index e256f3497de7..14cc65d5dff0 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -4,6 +4,7 @@ AUX thunderbird-gentoo-default-prefs-r1.js 425 BLAKE2B 407ac0280bf3716b7bbf12293
 AUX thunderbird-gentoo-default-prefs.js 310 BLAKE2B fb6473176d37e6377fe556a27c3dda154c93fc8a6cce228536a9d571ccbda1b60b38938a6c83b3f34f0a848b5e255f9b56c0d3ca04377a00013977b5212fdf2f SHA512 cf4192686bb07702239b14976cf42abd33dda539382f489d589fe6e35d926df019a16de86868cc7db0eeb15d4fa6ed1df770c973dbb89024eea9e054df5064ed
 DIST lightning-5.4.9.tar.xz 1891752 BLAKE2B 90b777814db2962ff669430cea5a29ba1612a842fbb0edaca597539e6e2d728a9d90114ec6196fe0d4758a4738a15bc0c985a345e1062cb125617eb84ecf79e1 SHA512 8e54865d50118154c3918d5dec5dade4fb026c24bc697ad2e360db9741509cbdbb71ba9477508a9b209be6c8a8190fb0b5e03d2e8fedcc2cae18f5c9e5a3a496
 DIST lightning-6.2.5.tar.xz 1745976 BLAKE2B 31e237f8d34ab2a2ac522767460467257d1f49d15fbe24f5b80dde9fb709ffafd0c0442d99c6643ce434cf7bdf0d670447f86da9fcdadc7ada6814431ef41e8a SHA512 1e997bb91d484908f225cc6e971874d308e8a8e2451a3e678f8a74bcb9e360babbd1f8aebcafb3e628ef5b10eb697ee47af2bfedbc956fee71d99084c8816235
+DIST lightning-68.0b6.tar.xz 1786960 BLAKE2B 96d09f3743796aca6b01bb84d3b93f9e25e4ce92f10fbab026ab64c1e5c0a67f97f71c73df52ba1f2ea7f9acb4fdf62436843a88c501a7ce6dd1fb9d7c02bdc6 SHA512 876efa20219b83fc5c6badd8e7fac5e8395cbeb25cb0ed0d8971d57df4962949d9c5a1de386540fb175a1ce6ff5e9de2e36cd6c7829e97375c9c190ed56aaded
 DIST thunderbird-52.9.1-ar.xpi 604235 BLAKE2B 7981734de83b22d428e4b988adb938cf7b0ad0b54142ca14cc7e7bdf38729b57f4c9c56a22c939d322ce03aed55d6f1b726bf6fa23d5f35347602691a2b435e9 SHA512 03d93c275c0e38b07519bfbd893118ace69928eedde0d236e72c6900aafe2137641f76155a0e02fcb4b9185ff8e49c04937022b75b0e85d7ea9de05b90e2d727
 DIST thunderbird-52.9.1-ast.xpi 541173 BLAKE2B 060a8ee63b93bdd230aa49328f37c109458c4caf3b4b719b10f461ec3b9f5141ce61d67d8ac1ac3c83ef098a8d4b6afdcb695cf895fa94e1de23ecdb555f257b SHA512 689911ecf9a92e3dd25eb305fc3d1179b4739f608e3be67c5367da3fdf0508951b816547333e1b2f16dbc20afd0407996b933309b6eaa3bca2340993a6d475a8
 DIST thunderbird-52.9.1-be.xpi 570931 BLAKE2B f5a58a51bcd00cc256bc7d97813d89c46feef2ffdea07be3f9509b2dd1787fbde81f49d64e1a1c63d2a09d54a07de9fa8f2c958f74609293f61af9fb971c1ff8 SHA512 6ca311620b04a604801771a40a7405aabb2499624dcb3bb10eaa3f0a6dcec1cb8c2db3f9ab51b1f505b164be89bcafaac1dc0cba3f3f8067f48c4dd61852c469
@@ -113,10 +114,66 @@ DIST thunderbird-60.8.0-uk.xpi 684155 BLAKE2B 14fab464620240a30a650c4371ce790d91
 DIST thunderbird-60.8.0-vi.xpi 637187 BLAKE2B 7ecd85e521b230a2de85382f0ca2588523e6a0a819124bd440cc34859230d89f827fc2ad3e193dcc5049bedf21fd1ce3bc177c6451278eee13623532828d72a7 SHA512 47dd90cae041761fd58db8a9c9b1c97e7df1933cb6f2e36f11376d683cd7f802fcfb74d8887b5333222484daa1e6c925608d54a4ec30f1ba8d6b234dba324407
 DIST thunderbird-60.8.0-zh-CN.xpi 626284 BLAKE2B 90576f52f491b6af98489ee02fd48a7e27ca25eb4090986abe0ae67edc866240fc77e3b9aeeb768759eef9f2cc0b138f6aa60f59473ad2e6d786e578ff5da194 SHA512 35fc72b7894b7a678c57e8b89332a3478bd8eb49db01e8cd74f9a347466f577ddbcfa07dde487478e9c120d462ada430b0a569ab50114a0f603cbceb8223a137
 DIST thunderbird-60.8.0-zh-TW.xpi 626190 BLAKE2B e388d36ca6963d406372af7d26e9ea612cc69633a162fdf96f298a4d61753058cabdc5c4f400345751e7485a4f1bd5d75cb129dc993722f796936f3659da0ef0 SHA512 41abd5e0a83bb8da396e1b3f469be9c89a09aef74f2a6e9ee7cde27b8d09980b2539d1c36571b65cdafb1bbf765c671105c519db63aa33131781125dacdb3a83
+DIST thunderbird-68.0-ar.xpi 617171 BLAKE2B 27a411e4d5cee4044ff1bf0d0354aa935fda5eb07b3654e5e001aa23ee4cd1f02c957eb77ac9c6562ff7f80a113ebd5756d121cb8b8032b9353b5b300ff87241 SHA512 1ee4620a960802fc8d73d0ab1afa89bca2b2f835004442ffd76a2fc0e48ab3ea3bd353f6b3e5a9b7111dbcb5b663c8b13e8c48ab3d06b8c7031b004e869e9908
+DIST thunderbird-68.0-ast.xpi 551303 BLAKE2B 9ecbf665a1b108c61836566cdfa6808c6f153b56b0295e476567e695f11eacd921cb06eb224736f783d501bcff14a2e01db02668c9d2497cba22e126996f36c3 SHA512 5deb769bcee2826d8e5d35bbaaa1c9df0006d4c83c3c0a008c09f3447b3d4c0972b87dd05b07bd9aadb75053973d837bda1fd469b50c6d21b71b6f42390e547f
+DIST thunderbird-68.0-be.xpi 646284 BLAKE2B ffdac9dc29ad762c5b0a204590ffacaf1f072277749695544554d7050ad84611f37106572f80a5a0c473d5ad5d07ac50c5d5beb537014b4b7ea7ef00ce619e1b SHA512 0fd2e939807cd1ede38308b0c931c1b9bf805f48c625fddb7d51f8b01067f68242c77726f442fd662259389bf580550fea92defca9fc1a508c394ef3ac2cddf8
+DIST thunderbird-68.0-bg.xpi 646231 BLAKE2B 1bdf1354b9016f65427158b7cdc6a579fca36b2371b822c67a865fe00730a3d27382a2cc95714907b079d98d5c751d6e47c3e50e7213a3745805baa32648f342 SHA512 4dc0f6cb5d9000a6fb247dc838ad0aa78403ec1cd877343e44dd21b3a8538017a697ca17a56305e242e9a4e5b463ff90f97eab4dceac96b7944c42464642b96c
+DIST thunderbird-68.0-br.xpi 574856 BLAKE2B 34beea12df59f89e4effc02e2cf80d4c1b6cf2bfc6295e8e0f978f5c50c2db3ef7607a5a9b5cd3729751c183628863f64c64c7ff2db9b9be085f2cf70b0608a2 SHA512 d7da4b12c55a0b5bf708c7ff1d479467fa66a2cc48e3478316b8137d4fd813bc479214a9a2b85633e886237dfa78330ee9ddd4ab8548939ad72cfb1aefee79e3
+DIST thunderbird-68.0-ca.xpi 578443 BLAKE2B 115c2a57bbe4a6c87310ac0bf23091db01e03428d8f3daf9c48b785abfca0533677927021d6731a42171f3d603f487708d7374e80025b9fccb744dc5f21a1066 SHA512 240fc2a770c70c8e86fe5b80efb8224d0ad7ab32df94da7ff995a0182a865d167d46410b0f2ac08569ad706340ca44d783e09d29716dac7ad19f21487b8f2f95
+DIST thunderbird-68.0-cs.xpi 603044 BLAKE2B b72472d609e23b5f1a1c77152daef006cd2813485240bd7350055a0a7f257becdd675b076d4a9365d997a80dc248c8ae2379a3ebaad1a0e0fb08aa790f47dd29 SHA512 2ad612175d867332907512aa3905bd4662d25c4ff2bd6d9b91ecdb5b4144f98dadd033dca289ec2e1ddbfc7ee381f2ee4e2eef6c0d1d1dee212a404333cdf8a4
+DIST thunderbird-68.0-cy.xpi 589906 BLAKE2B 822528f6a5600a62054397fcb0dbe6b1f544560160953de6ef7002e3400b899f648acecf3bc286359561222db6b7377da76cdabcbd3e4402cfd62b2c541d39fa SHA512 9981ad7b33a035d04d90fcdce7a537a08150671f6e81e2dccf61d2a6da213b2b1b7091ef93d80904dfd6cd7bbf978460f3f045384ae9cd5adbcdf747b434ce14
+DIST thunderbird-68.0-da.xpi 588353 BLAKE2B 8e45fd37b250e504f58094667704cf5c9d282943c64f8c2a2ee624eba0018b5a0c51897704ba6ce29a4ab3600fe89fb23528300415ce66b2f8d131f0631fa165 SHA512 1c210cebf73d21d59215a54e09b20ec08479e0c4058a92815c2e17c7f9713e3c6387f41194e2f562d3c7500a3e9cf0d0cadce5da83b972a51164a7334888b890
+DIST thunderbird-68.0-de.xpi 597808 BLAKE2B 64b275b262c402859e17b2a9caa7099349301a48d8c1370e3eaefcef46e4920933f98cdadcb8dfec4ede0881fd575fd7427a2e4a013a888cfe61c62c62b3732f SHA512 820a94b15c2cf1012739e44f6ff9c475ad60e67622931c696f0443d19892db2b697886452f0a9f9fba7d40611d5700ba602b8acdc6833122524e3aff0b05a976
+DIST thunderbird-68.0-el.xpi 699225 BLAKE2B e62dee23e0e92e087adbce7e37ee0e0f79f0ceaddbb0a701e78c17e7772fe611e0969f55614f049af10b688fc1ed2af4dc6d0aced35ea31bd1e3b045015dbfff SHA512 fa73410538d0576f596cc0595961183d81ff786f392a9a8dbaa8f269e16bbc968964be584d50d2170f18295c1b1a4a73514c7134a9d510e5cb2bbc662dc98659
+DIST thunderbird-68.0-en-GB.xpi 556407 BLAKE2B 764f6f0e8c81ccdbd5b1e2b362b18c2098b3dfe003afb9fc29f50cf6601d16cbf8d6823a62ee3795ee9a2fed593ed806d07d5c6ecdb373ae39534346d097211c SHA512 1bfe3e4ba5b7458656d96b9aff69c8bf33708f112616c87008081da5ef9c1295b224e828f5e738e1c729433ef2387ed8d9f09fcf4a479a86c73422dd50ae98a5
+DIST thunderbird-68.0-es-AR.xpi 596555 BLAKE2B 655546f97c74560c92071a5efb3c4c63328dbdf65951553fd4fc779c5f35f1865d5fe180e87991885f965444abeb3428c24a6f142baa38863fdbada4ef65929f SHA512 3b1e33d1f5bb76a0ea5f361f5d09624294eda230322bd350b1199e7d5ab691ce2a720e2c222bfc0244b537f695e8268529f69b5aeeab3ecdc356a7922e02a49c
+DIST thunderbird-68.0-es-ES.xpi 518355 BLAKE2B 6a1157a67f667260b6ec5e16320f9b04793be1a2efacaeb516f96d26aa1e247a3e519ea6c1bfea860df4f33ad25c0ae4db969aaeca2ebafc2629dd3d5f415c74 SHA512 3d24445196608d307a6aa4df261c1d4a6473f2bfb82530bdafdd0203587dccb38443e056abb14d735bf9d5ec1e022dc58e0b595c23c4e197195fbd4985200a50
+DIST thunderbird-68.0-et.xpi 573585 BLAKE2B 7ec4dc001da15c653f34f6a809e8ff6f9714013130545843aea23b8daad96a2d910416aeb22e67585e01442de81f433762e3251fc9fc0133d3d4c0de3068d174 SHA512 f540fe0ceab68782c781e81a43d1a425bbcdfa1af49f24113b6b30933cf86e9be7b3e8c34983a5f20311da29f4be90058d07b90297c06d886bcb580ff52fa0b6
+DIST thunderbird-68.0-eu.xpi 579949 BLAKE2B 132bd384dc626a26786b45e3bdd67bac278f9d31d3edcc658c707b3981e94a00303a2a79f10632706fa3394447e4941d71dcbc7563f02a44b678fd9f3a4adce8 SHA512 e2472954fd3b309c182f4359d4e34b029008441f4ec17cde94dd6e3ce97bbfc7a3c523f54ad7bcec5df1a4c36fa3190c8908416b6353fa069c50ec59d28e0ff7
+DIST thunderbird-68.0-fi.xpi 578422 BLAKE2B db7598b706edf7f28399a72a6b30f2f4ca75a4ac4af4e775086f93c39baeb70abd782b41e2034263e962ec24249b5d7256e2ffbc149e3200501bc600c2ddb57b SHA512 f61565baebe3fe086faf3f77724a27d2494bef6dff6d2c3592559a86871104484807d9760283eb6864c92207ceb12bd8d93f699da71ebd9a6aaaa48b729e40e9
+DIST thunderbird-68.0-fr.xpi 607814 BLAKE2B 7a12719e8a8418218b19655d71ca6727628f3841ee7ca857ee3b48926321b29d234863742968e0dfd82f0740ec2a1e92cd1d0b77b230161372cabf1f76deee46 SHA512 8ee94e558cd2854d5d3548f8808b56f4a7c81c57183278b823702499ae186ea2a9ddf91d2a9bc6d0a3b5cf70464a2e5827e8e26daa14ce30623f75d0d324f018
+DIST thunderbird-68.0-fy-NL.xpi 594471 BLAKE2B 6f7f9e5a8692efbcd8f487829fbfa7c15d6f330fa5799375f64a4992b16da299902c5bb20277e557ee775ef4b8f8e87b3ebf29b6823dc13a2dbed11af725fe03 SHA512 aa43427cb603bc5deab2c13cc8565aecc8e2bc505961c527e5eab2406868c0f798876501c9e3960bdffdbe4e13b1936a4b18bc728efb9413c3c67e91c9850384
+DIST thunderbird-68.0-ga-IE.xpi 588714 BLAKE2B f02c68d432e10d17a497fb08657ede02bbc1ee1e8c34b9c33ea315667241b9f8878558ddf98b4f3398f1dc77042cf501288681b527d92faed2148b3e5070ed29 SHA512 d3a71503480f5116e5224a7f9d46d2c5e7a96e2ae9bcc72db264fd89aaf14f85e3dd901fe8258c3f3cfce3a3f5fe8c1c9682eef08908bbd075374b0a9c56cc50
+DIST thunderbird-68.0-gd.xpi 587113 BLAKE2B 80b223cf0e2ce8fa45fb0d1d58a83c729c70a2058c8e115acc9773080c65c42ee8a2fef83572749c89abfb4fd9b73ddf7c4f599cc42e6b125f7d7a0f62346fd6 SHA512 34325901aab83cf273529c0039b9b1b66efc020f1e5f627d7e4b7542bef4fa1ce1bf072ebecd018350d8243929b76bede698157286bd1766472b733950b3853d
+DIST thunderbird-68.0-gl.xpi 568400 BLAKE2B 71c7dfd30cff2db1b8ae050bbe5e84dbf7af7bfdec7a344708ddcd08a9fd9af99c1970a3b38488593155c476e4c96172af389fc5f069157685a38cf89437c62f SHA512 0cce294684abe602884f39f06cdf9b757ce42424c1a85baaebbfaeb9db72d90f300706c3e1603d5fad147711d72c0b3e52295a4cd99145298bf3e71f94c0146f
+DIST thunderbird-68.0-he.xpi 604792 BLAKE2B 70e298a02f0fdaf532ef460e902aa104d97f2cf379367693ad7ca6c4846267cc56c479a8e9418661a62602a89e9282e5623fafa629ba7bcd204e541ecf1644c6 SHA512 aad7763b63011161bee42d8e1a8dddf118d3ea71b39d135cb049eccf97199ffaf2d10a8211ab1afcebaa2e3492672f98498da7e37eb197168e402964d3917dca
+DIST thunderbird-68.0-hr.xpi 583787 BLAKE2B af98f536e0cf26e2d949450efdcc79529056c38cd0eb267b2a3ab5ac5c895ca0ac97b0d78ea3853e03ac0eee51d2b0a45afe2cbe2850da17b7873608f0fa6f85 SHA512 ef327533082e6e8f35ecba996d0ae73c4d2e1f18d4dac7d323f7de2296394ad5ab26ecb2b996210c5d28319546d287addad74623ffed801ac548f8529624d04f
+DIST thunderbird-68.0-hsb.xpi 616039 BLAKE2B fedeef8593a328aa262985cd3982a1c23cf2e9da2f3ab119ef5424a71ca2fba23bc76d1534b682ef92212a58fef150266d3240ee934a53e8e5a8118b4203a41a SHA512 9254218b7628cdaf97af82239a05b8287cd3e07c01958a923d67a5f3b681f52c3ae96b8c33127b289f080eaf69e651218cfe9ebaa49f9c55303784658e79a4f2
+DIST thunderbird-68.0-hu.xpi 618159 BLAKE2B d215510661fbfc91345e3a4fab6bc97b22f2cc980c8b121c7403f2ecbaef75e9036f962316f0f4d1ff5afba20faac95f7e1efb205532bb6e25bc3d558b145cab SHA512 4da44d0f54ab8832e8eb5b4484fc06fb3bce0588fd0a4a01ebcc8f42f44c2600df368c7b9a7ecd55fb0473e6f1ce91fd26b6e6cf82f62d6f34c96345b4139027
+DIST thunderbird-68.0-hy-AM.xpi 630527 BLAKE2B fd238ef369849e74a4302dfd9835d9cfc7a9086182d2f06597a34a54b25d15b433b6f29472df25c638ba7722b597115f56f08b604c1e56354d07e6f0d1a0acdc SHA512 1884f9a7ee6ca9b5fd3104b446bc1779a5021de275ca245a7796dda487622ffb35f92b3693a48bcc9983bb79a82be700878546aa5321e29e7aaa7d63cb63362e
+DIST thunderbird-68.0-id.xpi 567750 BLAKE2B 829b7d86b6a7f486a0500fb76d8fe20a7de1e4e18cf2b817bdd23c6b3b26c3b518fb647c7d983be3812c59427700c1cabd1761a7c1428f8c3400dcc98d4eeb9e SHA512 e154cddeb48cbbbe090f42ae5fea785bca4086b753b6eecb958568a30c7970c761d672b164c970f2b06e6c446da34e5a70935e54c3886195b946b6c66dc1aac7
+DIST thunderbird-68.0-is.xpi 575444 BLAKE2B e1469a504c02d13c0229146c5e95dc411c7881a2dd73e3b83b32872526a8ced983e4c41f08efba7ca193027b9c4e3ef85e836303ddd889b35a87c676c654609a SHA512 e7fa884cea521f95f70840ab1e5c01ef0ae73c8c352b8201df95182864f2fb467dede7c1de5b8ee8a4b09212b1581f4e52fcc608e6463b581af0976a35c9685d
+DIST thunderbird-68.0-it.xpi 489522 BLAKE2B b48cf65017df7a97576d58e69c89e22e5d4b919a167a7cb11c942511150ae96fb7727e74ae053ce8192b93173c655ebd9d11c5befe331266d0b9ff48dd0f3eb9 SHA512 2242f359661904027afad7ca3edaa0af3e7ba2737b4e7a217efae55d3d7caae629dcd913945ae417de04197e70bc121370ddc92e11fd888dc57977ae803fde2d
+DIST thunderbird-68.0-ja.xpi 643578 BLAKE2B 86ea1d5494d69d5bf5c9ef33baf627c807f15b3da5fef79ade76a320e42bd163d2bf26bac8c3b58e103b4b68e5f729f281cc0a898a073e300069c26bc07b76bf SHA512 cbbf432c8f0eef14bd30d080187ed366c391ce98b963a7f413c2bcbf816a4c032c73daedd061cfde8088e6b8538a5286d74464762d56bfe709f737b4622dc277
+DIST thunderbird-68.0-ko.xpi 620532 BLAKE2B 640c4a4718e9fb75e4e57e48cc72e3ea69a59d45cb2755aeed44503bee1a6727615eeb06f46dec8aa10e98fb3a1ed27e70fc2b8b8e3bf47f342640c7b0c6ed64 SHA512 44b3714893997448cd6cb08793af861a434f1aedd9b52ff5ad4b461634fc8506958b2b4721cec906b623de91cd3fb948500f7d4633878c0331b7f98b529d4242
+DIST thunderbird-68.0-lt.xpi 603849 BLAKE2B f3ba5e2f40a4d4e1ed6819559248f65cd738fa35db56a3ca24eaa5a32721867abb28a16d61c1087f3397a8a63c01830cc1d35c0ce51d1487fb4d581241ddc7e1 SHA512 43cdc2e96c2d4897274c7e54efd64bb0ffc13f0ef7cd782937426df3f6f60d6bf45ec1f8e1f5a474b946c3a5c7e3ce055dae4d7526cc2462178d1f3f474145de
+DIST thunderbird-68.0-nb-NO.xpi 574024 BLAKE2B 95b409936005b7d94a3c1c54ea6b3032e47d4ffbee731b06e1dddee9e0077e4eded55ab3b76e1cfde619a6e4aed586a7f396c85db2026c358a1240f81f332320 SHA512 9dbf9ef59a3366d6901a30ef6511e41e32cb37d507c8867128394028f06f69fbd85de5d3fd7a1a3b1a18e60a40d91d66f569fcfa33c28f3de42f4a402a148e9d
+DIST thunderbird-68.0-nl.xpi 581358 BLAKE2B 35d574bbcb2348dcd864a9035d63189b0b5c6bca22b6123d04a234b7ee74a1542b80e9317aaaa83056ee435829284fd006d102ada8482bbd438721d55b29a203 SHA512 d421b341edda4a6fca9907df21a86a69d69f8c67a74fa8ccfa6eb9ed12971ffaca17ef28ce9002888d7dbccb99b29312a53277e29fab080009a0ebc0a67d4399
+DIST thunderbird-68.0-nn-NO.xpi 574952 BLAKE2B 15be15620ffbf34bf2149d1ebf9f7fa539478253a0ce06234cc011a5076efa4cd70f6739997cc131e300657bea2c91e9b4399b136da712ddebd1eb0f4cb81cbf SHA512 f2eb82d0364883d683e99c1fbc8d31ff7275d72a439859eb51b6e190c3411333f0102736ee206547d9578d4e6aa33f9ac7843c0b18ed2d4e1bb52cb5b4aa37fa
+DIST thunderbird-68.0-pl.xpi 576090 BLAKE2B aad0754f3e0d7ea994f71e46160d71bd54573a0765dc5978022f6255eb3f04cf28ec1ce7eafb2450c9fcfae3c0bb1897afb85459da9febfc6770458ff8421223 SHA512 73d931350b429fa61b822ec19fd169abeefbbf66dc496e2cc694763e28c2f3264996ca07deaf6819f91cc08e3fc11377e1a67dd98df5de2fcdc2e0ef053f35b0
+DIST thunderbird-68.0-pt-BR.xpi 589839 BLAKE2B 65402956dc9b102716c1ef7ffd2fdd9ac1236aa85aca8e5765fc8c720ae34b0bdab98077dc42fe1a6560c67fec5a06d62283b89217c1e5ff3c5fac2100e94313 SHA512 7a0d71960eb5d23bb1f5979d321c463cfcf8ebce5b60fc370e922468e8d3d4e95230549b447c32e70d75d39aa1a5b4ea2d793f423e1da8dc62a9a2be54796701
+DIST thunderbird-68.0-pt-PT.xpi 588106 BLAKE2B 741c7b0bedd2219bd8c274d1a192624c107344a0e8ce77c0f7a9f20db30d58a4519502cec617119d5fedd9ba1b47a2bd692762841c1654ab0bac28c314378aad SHA512 483d732c54bf516b9b06cdfaa48c246799ffa8cdb1dfb1fe67231a83abd0d2e5f5470133528f1fd297e6d961cff98404f6db3701bf48c48d25be7517e4965f0f
+DIST thunderbird-68.0-rm.xpi 578053 BLAKE2B 0864fd59d6a96a17f486a5570d69ea7e933e11225415357d02b11d01d3cfd24e9d627b312913fbb8a276d59aa504b875e1fdbfff987cf1ff8619ba74ee13484f SHA512 1bbe684e3a696103190d926dc1ec1e27453911b7267c36b87f615f1c97d6720513320f90992c48cd1293f37fd009f338da6c6832b49b0597af97d928058271c8
+DIST thunderbird-68.0-ro.xpi 594844 BLAKE2B a6ecaafcde838a1f2a6e33cfadc5f8bf2f6c873740677b9e0de75ee9c3b0b973f806407857ea27876f57149b1d7aadec31a9bb3216dfa494be52851c2ba66d1b SHA512 fa8c7e41fa9e15e2bb248fb2960221d3b5c45aae1e094593e7f7b03645d1a85d93de2d46002a2cf31a487e0d25079905372acbf22f9484bfe747a26ca90724f2
+DIST thunderbird-68.0-ru.xpi 683329 BLAKE2B 17b19ec36e586d4c515bd86a2dfa3041b5d6ddbe64c1e45d252eeecc9693bf6b70855f750960231eb2bef64e3a5f944b24f414f967634bc6c7b4024bdca293ab SHA512 ab70a04185bbcef1722bc6ac127289acce4bc6410c7732d3fe653d35d3a23b14eed9c51feed317efec47ffb5e8e560c3faa80550043beddff94be90c8be9ad9d
+DIST thunderbird-68.0-si.xpi 637408 BLAKE2B 5bd47ea8a09a76cb2aaf58e1e9acde919dad7de34cc86989cfe054689e13514f027061c36d2bf27122875db4c0406e759b72a8bd9117637af1bf60cfb6c6ee1a SHA512 1eb0f6728c205faee0c5e88c3801eda8f35a03e0fd5c20b7fbfa6c29aa2f804ef1d157342c17666b086c33305dbf53b706144b26b4172d6e8c91c782037f0d47
+DIST thunderbird-68.0-sk.xpi 609756 BLAKE2B 20d73444d2ae0abb41561cafff118a5a00451b7b52848c102801f9d4a860a8959ce969bf5ff1bea1e82dd909d2b853b2406d03742580ff2d74e684c00e25b137 SHA512 53f2fd7c22ee9381b38fa75290c65c57a452335944cb13cf710c064811207af2ffdbd11177f378d0cab6a5a5ac4ee3709b427f1c42b09ba3931bd73a3d503526
+DIST thunderbird-68.0-sl.xpi 590632 BLAKE2B 1cf13e500189398ce3bbaa495c0c1c69ed23443ec3fe3f96598ff3fd54b576715ca2d2c5691ac0c279b417effa1e4a477170ade32169ca93d932223642bf4a75 SHA512 b47d6ca7e6e110447e76f90d5e0d7ed23533da369a74578bb664c8a25539e4fd8583747fd4efa8ffafcfa5a01b2ed9c66c5a152fdd1f468ab2da00f6946078b6
+DIST thunderbird-68.0-sq.xpi 598904 BLAKE2B d34cda28594747e4a6ad699c071aebb599e3bb12bed97545dfb9baf3e852ec6c207e88dbfa553ab411e6d7ff5fc7b415c2f359e55102ef67e2fd42bed3422085 SHA512 7beafb5e1da2355866d4d14e38d6d0712fc6f10215a4923a941c1d1c775e79414b0ba58b647f79a4d36cf07c825d69e108d581c0ff2471a76500714499d9f57a
+DIST thunderbird-68.0-sr.xpi 624900 BLAKE2B 86950081a0b20b1db3df4c140fcdf1e9fcc3cbf8cf1287942a889dc6e18ccdb71e60e738f1e8968c265484166aea1fc6dec1398ad6377ae53c7d7753c812381f SHA512 f6b925a53e37ab50431a0062dd53171a1e59c5927c82706eea337d9eb7f3b03090bc383b1b8da5dddbbc67e3677962c0b1d79196ad839af7e7aa56cec73ea44f
+DIST thunderbird-68.0-sv-SE.xpi 591599 BLAKE2B c9ad5ffb39cca198da8b9ad3c9599c0be400d0eae6901c4acb82b9c71472ca78e4765fed1f85d2c1ea74fdcdd24670dce8340c392f1c71463e076566ee0c686c SHA512 24834d4e6a8badc3a4edf5d93e5a83249b96fff3cc9b918eae06c99457ae9ee399a2ac479ef3ab0cabb4d06dca44e56576913162dce643f725ecb051b5b6f283
+DIST thunderbird-68.0-tr.xpi 599711 BLAKE2B bb852ad1127ba445fd5f64f6b2cc90723cfc10a396915a73fc2c297872720abd9a166a6a24993fc08b5eb0d4ccfc8905e374886a13040e151e65e7921c584373 SHA512 83bcec20d0a137f5a7f480bfe3b05d32549fa7a4e07b449d96023a7b6b0b8a7e87ee0202de2a6e6b77e825ce048b021f27a243f7a8f6bce09fb0a8bd6dcc8306
+DIST thunderbird-68.0-uk.xpi 671458 BLAKE2B bd66d58c1a0770e4d4453d8b5d305943aa5012d365b4520670ee61cad1b569945bde7540a5747f66d6ad9cd56f8499e1111d90d2666d91b9149e7f34653f6f9d SHA512 55330dbd8bce9cdef80a081ab7219991e30da74a4e68eb7447c9a01f6a07db9f7fb12d2a7a826767cb70c112274c36119c9fe77f7896af9e2e28211bfc75f0e5
+DIST thunderbird-68.0-vi.xpi 623426 BLAKE2B 7692f160aa39dd0c221e6037074d02eaab8bcdc8f0f8c9a809211824fb0340be7ed7587eeb0c7bff27ced9b06f7f084a46d0d25354f0d5ea905bd7562625d701 SHA512 4fa2b202881d45680da6fed5e3c9332b64c6aa539e6f19f4568f06ec0819e7157392270a4009db2e45ba9815ce696a87179b2709839d68236405e88542892857
+DIST thunderbird-68.0-zh-CN.xpi 626822 BLAKE2B f752bbef52690476470161486e4ace8daaae45941f4f501341c70794ffcda1e3ee40436083eb543271cf0f6325e5a18c2ec912284ab89ca598a404e32e58e27d SHA512 5941448b8971b54ae783c7dcff796375aa60e9ae40f9d4e22bb4ae6d25454031defe8c49fdbfe9bccd397d41c74b860677ebdeded9471e0d90335036964ec74d
+DIST thunderbird-68.0-zh-TW.xpi 627478 BLAKE2B a2c827e9cdc6f6fa2fa2a59a31b3e719de2120d4d5e83ca1773e77191f343b81764bd7eba8cf7c806579dadf67b792f490a8ff3312ef9018be75e31c7f1e6013 SHA512 69780086f4749b01bf6b3a3c27422d239c78851de371eeea6212c69d347ede4620edba5f59045bfb1b008a083535c348056be1b44d61c188afb9c207f1513e9f
 DIST thunderbird-bin_i686-52.9.1.tar.bz2 51223475 BLAKE2B a30b4679ff844fc9f9752fc6048b266662708217021b65406d587c0f8e8c0793eae3f171465bee58bdfcd635a909398bc65d3d4f07c3cd986f9edcf069d06612 SHA512 69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78
 DIST thunderbird-bin_i686-60.8.0.tar.bz2 52674194 BLAKE2B 06ecf87d3788db44a2d15de33e64fbb5c4ea530c4d638167e6e1e01543c349c36a6d9160c98509c9fceaf38719206780100053e83d837454da46e027b774dc0d SHA512 5f989316cfe29ff75adae5feb34e6914f25e6e7980c17fe902d70deede44ebe54052d2540cfbe3d4629e927d9f2129edf19f659bb2cae9f09ab984be7d47aaaa
+DIST thunderbird-bin_i686-68.0.tar.bz2 57137293 BLAKE2B 38c0cec86dfddc46c192faf93596f747ea827aba1ea685757c53c42766e974430886486ec1eb4bda73e8a880e3cb6a7ee6548adf4c27b1630c662c270402c339 SHA512 6004186b0b27165a4d54191a9c2daef34b580c2d97b1e0472e8d8d863e3df51ed56ef17abb7c6944f4da214772780b5c69785b9ad22ca26ba1a8f0390beedc19
 DIST thunderbird-bin_x86_64-52.9.1.tar.bz2 49930254 BLAKE2B d0029fc31e02f6790953fa5bdd6057be9d9aa68151bc70c6effa91c17812604998cddd14ef71f2458331ecc85422dcc069311de944e7b10019f422e50fc88fff SHA512 98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7
 DIST thunderbird-bin_x86_64-60.8.0.tar.bz2 50477272 BLAKE2B 60c8c33d5eab011c6eeef44288d0a483927a0793818633fdaf5800beb6223a675c39b8a3a4c4bdca6f307ac5e47bde2bb672eb034c421092ba1188a9c6d4359d SHA512 c0eeec28c235be86760dca83941a202475846153a1b186ad948eb673e0c6b1e870cb1c485f5a1dd9ed885eaac52f36cdde4417ba86dca388c43c03299b0adcea
+DIST thunderbird-bin_x86_64-68.0.tar.bz2 54593293 BLAKE2B c5975073a9fd4343dee9d1b4eec2e4b830d0107ed8e743349f4663f4ca83511215847c8865348575aeac2a47a8275de91e9ee1052b449c95e6dec08498e018a7 SHA512 257528761f0eca38528ded4b31329886093418f562aa2fac73b3a5bedda51fe80b34758c10afae1735cf37b37a86413dcf08642aecb1e8bea1fb6b0b94ade5c7
 EBUILD thunderbird-bin-52.9.1-r1.ebuild 4736 BLAKE2B 2002dc9eba63e845b7fe90f03796c55afe556300f5728e75af8656de46e4f6c0298087ae8ca953e807eb7fa7a9b62440396298fb4b711b884b0a8934d709528b SHA512 9212c41221a8c0a1fc860f01ef15a839f8f50619b1b2eb7e70518425e119081ca6c7d9ec8a96558b92e369ed47d04449b489f8ae9ab3ddc9e64db64dadc29e58
 EBUILD thunderbird-bin-60.8.0.ebuild 5365 BLAKE2B 5159852639ac25b76c22a5d2162e03c54f925db8ddfd6c9feef1996788cadbdc3d6d34e8701e0e2775dea85b48246052468253e9c637bedcf54b4a5583d6f918 SHA512 c284a8827c47e5b81e8481b5fe86fe64045b79619ddf353c49f9cb7ec7c6e90ca8a30c4e1901313a0e5cd2af0b7cb172aa2a6d61ba4e086eeaa5d2f529df9ca6
+EBUILD thunderbird-bin-68.0.ebuild 5280 BLAKE2B a43977f8a4628326b80c1b53986953a30d8fe58688fa72cf9ee6c7019454724dd5cb0deb417c9553a5652826abafe7ac1764e111a73408e7b9c0b67ce665cbab SHA512 2076cf2bcf38d7e527e02a63637f1da5d68594353e15476429e716ffcb7a6993b14767454e0cef0139db968062a738b844603cdb9f1115eeba1b96d70e35dda1
 MISC metadata.xml 448 BLAKE2B 6bc86854f6ee50c3cbb028baebbed3da9d37342aca5a628b8d25de7553c0ef76eca88f54daa2d60d7e27564d6ebbd6c342aa69f2b99d4eee0d1a783fda8eb601 SHA512 bb5d5bed37f9880afbba222abcdd39b344e359098825954ead9052ee75b5bcf360cfa9af323480e81fe1c70eb9b3e5d79547772080294495e7c1db7c53d46d53
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-68.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-68.0.ebuild
new file mode 100644
index 000000000000..a890fcb69d7e
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-68.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="68.0b6"
+
+# 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 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/~juippis/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="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
+	virtual/freedesktop-icon-theme
+	>=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}/pingsender
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/minidump-analyzer
+	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
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	newbin - thunderbird-bin <<- _EOF_
+		#!/bin/sh
+		unset LD_PRELOAD
+		LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
+		exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+	_EOF_
+
+	# 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_postinst() {
+	xdg_desktop_database_update
+	xdg_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() {
+	xdg_icon_cache_update
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index a78c05246256..646d34705ee6 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,11 +1,14 @@
 AUX 1000_fix_gentoo_preferences.patch 866 BLAKE2B 836e42f394db6233ec4ad8550fd68b427f12474a7dbbe6671da4b60ebccbb762bb8e4096838569e58b2860bc3ad49dae7e66fa03a3a994228f043c7b17a6de95 SHA512 60693c96667dc6bf34bf0b58e4e06a50041b69656c1ea3b945521866a1ae86887169d7afb1afbe54e6b5b6ebb87eb6138fcba716509627966374a933b8a00016
-AUX icon/thunderbird-unbranded.desktop 247 BLAKE2B 1aacd7241115766c0ef34d4ac523a4c9f55133eb6124418d4bf20460bbe5dadc2bf6247a1276746aee51357bacedb88b8260fb6c81b818d798764e07ad9d4f71 SHA512 ac7750a6c1ac316ba1143d0cbf17d7fa7f5ba8127c0db299c02efe7e9d8d1543d1ff763071ac65f2b91f139dd90ab36f4e12e7ac7cc41b26ed07c93555e03c73
-AUX icon/thunderbird.desktop 237 BLAKE2B c402882c5599fee29b0f02001a9d52da762969e6546f406eb95ccbb020b0fb478779900b27c64cdc8514c6c37f75f4e04a7ec61b1aeb2e85695742ab64201f6a SHA512 cee5170f010437af68291bfb8d199a2d63c645846268a4312398f9400a227c8e3bf7d3aa605e095b837ce793bc437cf5a240336ac1ff44ffcb5feda95adcac18
+AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
+AUX icon/thunderbird-unbranded.desktop 281 BLAKE2B e2d0eb949dee413112021cdd0b8f5f1428aef25750fcba1424da747478ffbba2ea5b70f9ed8c8eee0bec2cd4ae0ea962389a899cefd9c6ca1b7d3841b9932fbc SHA512 a96d276aeb995d8f082bdad692406247548fb261c4d91acd9dd6e15d83fe35aef8bdf595d6150cb9789da0e7af57fa9fb8cc99a5be9b7e1d46ab1131e0adf62a
+AUX icon/thunderbird.desktop 270 BLAKE2B 6598b4fcf7f898a2a9beff9304db1c25a9906253569a24e593391946d14910e2235b16735439d967831f601fcfafd783064cc5f2330ba38d4868320a86dce57e SHA512 caf020e8af0df7b51d67649889b04d3af481850c4355dd0bd17a17e8681790731458648576a3a2a6c9ef7d0ab6d149eb9dca54d1362ccfc796e8c36d87c41d3f
+AUX mozilla-bug1554949-linux-headers-5.2.patch 1652 BLAKE2B 7c671f8c5cf1da0ee768ece0bec598a34867acbcfba1fba6fdfb6c463788f3e30009ecf00d44630d5d9165b753ad6bfbec7b24699a37d8709bcbf32d65f799df SHA512 789d9fa585ae642088b36adcc70c451b6a3921cad6ac22c704cd73fc565f5d8877b7aae1c84099201deb0d94e76e8f761cbe844d0dc8fa8321ea3dd84d3134c4
 AUX thunderbird-60-sqlite3-fts3-tokenizer.patch 3721 BLAKE2B 585af92daf9db441e065510b6dde64280fd6098ff2e9a53d1346ade91c279fbb75d4c8979b36ce61244a43fdc4c51142419deba7dd4a7c8a1ef1a987d5000c10 SHA512 0796db157f5c871c8871d2515ffae943e60ee4b3fbff60ef8f1ef535e5401a4a23ac69042b08c35cc27ccb4049daa92e0ba52dbff0abb6a6a49732f2b3f59003
 AUX thunderbird-gentoo-default-prefs-1.js-1 426 BLAKE2B 2cade86c23902fe439018a79847ffef69f82041c35b4a473dbf62b59b17bfe3422abdae604026f8ed14dd1fddc525cb2c49516d2d003bfd3edc075021f24576d SHA512 b40e7b4789b7f43c382589f7d0eaa6043072bce86ab79fb3dda4800e9ab6a43af11f43b0cb3b6ab1c71d887aa1cf9356ac858f0a81dad013cef5b8a4b2107983
 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.6-patches-07.tar.xz 37404 BLAKE2B 5516ff768bee0253131381fdba3e08785ab31bb29e44ad7f7e2956fb7624fafc9bf22f892ddbd0617e5e7d18500686a9975a60ea77d23a2853f35936cd142030 SHA512 3c4160e632155b0a239e22d0c1b1c701545b0f6d0915f9bdcf3b8431cee1abf650191ffafc5c3224a61279c8b1b52a80444c811a3914e16127411991c963292b
+DIST firefox-68.0-patches-11.tar.xz 15404 BLAKE2B 5322c64f7605e30aa1daf650cea19b66ce6c305d2862d76c4a4103676392cbd3029a8f35cbe8ed8077ac7cfe8194c08a0cd3cf25fef75c62a086077d0c5a419a SHA512 1897303b6864ca941afe6ee1d95fd975fb29a01f52d68f9f42c1a9a62d7e4fee0a797aa169b58dc4cf068916e01edaf5c9ad8ade23a997e52c37bd393a142ade
 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 +125,61 @@ DIST thunderbird-60.8.0-vi.xpi 637187 BLAKE2B 7ecd85e521b230a2de85382f0ca2588523
 DIST thunderbird-60.8.0-zh-CN.xpi 626284 BLAKE2B 90576f52f491b6af98489ee02fd48a7e27ca25eb4090986abe0ae67edc866240fc77e3b9aeeb768759eef9f2cc0b138f6aa60f59473ad2e6d786e578ff5da194 SHA512 35fc72b7894b7a678c57e8b89332a3478bd8eb49db01e8cd74f9a347466f577ddbcfa07dde487478e9c120d462ada430b0a569ab50114a0f603cbceb8223a137
 DIST thunderbird-60.8.0-zh-TW.xpi 626190 BLAKE2B e388d36ca6963d406372af7d26e9ea612cc69633a162fdf96f298a4d61753058cabdc5c4f400345751e7485a4f1bd5d75cb129dc993722f796936f3659da0ef0 SHA512 41abd5e0a83bb8da396e1b3f469be9c89a09aef74f2a6e9ee7cde27b8d09980b2539d1c36571b65cdafb1bbf765c671105c519db63aa33131781125dacdb3a83
 DIST thunderbird-60.8.0.source.tar.xz 285643576 BLAKE2B 223915c001c19908db5a4d6a580ff210f45b5c61a06212ba630a2d1b348b49b7067985b3ef42ee1f69fdc14725aecafd36ecea55af42cb6f6e4e00197ffc2178 SHA512 b465544a8cbedf0aff0f737cf98e2d030331f1ea016b2e541dfe30a5cf3172f9075e5a9c8d6b7e0f97ffc2e0d3eebbaf9a39e76a499b9fc976bbc0c944dfd058
+DIST thunderbird-68.0-ar.xpi 617171 BLAKE2B 27a411e4d5cee4044ff1bf0d0354aa935fda5eb07b3654e5e001aa23ee4cd1f02c957eb77ac9c6562ff7f80a113ebd5756d121cb8b8032b9353b5b300ff87241 SHA512 1ee4620a960802fc8d73d0ab1afa89bca2b2f835004442ffd76a2fc0e48ab3ea3bd353f6b3e5a9b7111dbcb5b663c8b13e8c48ab3d06b8c7031b004e869e9908
+DIST thunderbird-68.0-ast.xpi 551303 BLAKE2B 9ecbf665a1b108c61836566cdfa6808c6f153b56b0295e476567e695f11eacd921cb06eb224736f783d501bcff14a2e01db02668c9d2497cba22e126996f36c3 SHA512 5deb769bcee2826d8e5d35bbaaa1c9df0006d4c83c3c0a008c09f3447b3d4c0972b87dd05b07bd9aadb75053973d837bda1fd469b50c6d21b71b6f42390e547f
+DIST thunderbird-68.0-be.xpi 646284 BLAKE2B ffdac9dc29ad762c5b0a204590ffacaf1f072277749695544554d7050ad84611f37106572f80a5a0c473d5ad5d07ac50c5d5beb537014b4b7ea7ef00ce619e1b SHA512 0fd2e939807cd1ede38308b0c931c1b9bf805f48c625fddb7d51f8b01067f68242c77726f442fd662259389bf580550fea92defca9fc1a508c394ef3ac2cddf8
+DIST thunderbird-68.0-bg.xpi 646231 BLAKE2B 1bdf1354b9016f65427158b7cdc6a579fca36b2371b822c67a865fe00730a3d27382a2cc95714907b079d98d5c751d6e47c3e50e7213a3745805baa32648f342 SHA512 4dc0f6cb5d9000a6fb247dc838ad0aa78403ec1cd877343e44dd21b3a8538017a697ca17a56305e242e9a4e5b463ff90f97eab4dceac96b7944c42464642b96c
+DIST thunderbird-68.0-br.xpi 574856 BLAKE2B 34beea12df59f89e4effc02e2cf80d4c1b6cf2bfc6295e8e0f978f5c50c2db3ef7607a5a9b5cd3729751c183628863f64c64c7ff2db9b9be085f2cf70b0608a2 SHA512 d7da4b12c55a0b5bf708c7ff1d479467fa66a2cc48e3478316b8137d4fd813bc479214a9a2b85633e886237dfa78330ee9ddd4ab8548939ad72cfb1aefee79e3
+DIST thunderbird-68.0-ca.xpi 578443 BLAKE2B 115c2a57bbe4a6c87310ac0bf23091db01e03428d8f3daf9c48b785abfca0533677927021d6731a42171f3d603f487708d7374e80025b9fccb744dc5f21a1066 SHA512 240fc2a770c70c8e86fe5b80efb8224d0ad7ab32df94da7ff995a0182a865d167d46410b0f2ac08569ad706340ca44d783e09d29716dac7ad19f21487b8f2f95
+DIST thunderbird-68.0-cs.xpi 603044 BLAKE2B b72472d609e23b5f1a1c77152daef006cd2813485240bd7350055a0a7f257becdd675b076d4a9365d997a80dc248c8ae2379a3ebaad1a0e0fb08aa790f47dd29 SHA512 2ad612175d867332907512aa3905bd4662d25c4ff2bd6d9b91ecdb5b4144f98dadd033dca289ec2e1ddbfc7ee381f2ee4e2eef6c0d1d1dee212a404333cdf8a4
+DIST thunderbird-68.0-cy.xpi 589906 BLAKE2B 822528f6a5600a62054397fcb0dbe6b1f544560160953de6ef7002e3400b899f648acecf3bc286359561222db6b7377da76cdabcbd3e4402cfd62b2c541d39fa SHA512 9981ad7b33a035d04d90fcdce7a537a08150671f6e81e2dccf61d2a6da213b2b1b7091ef93d80904dfd6cd7bbf978460f3f045384ae9cd5adbcdf747b434ce14
+DIST thunderbird-68.0-da.xpi 588353 BLAKE2B 8e45fd37b250e504f58094667704cf5c9d282943c64f8c2a2ee624eba0018b5a0c51897704ba6ce29a4ab3600fe89fb23528300415ce66b2f8d131f0631fa165 SHA512 1c210cebf73d21d59215a54e09b20ec08479e0c4058a92815c2e17c7f9713e3c6387f41194e2f562d3c7500a3e9cf0d0cadce5da83b972a51164a7334888b890
+DIST thunderbird-68.0-de.xpi 597808 BLAKE2B 64b275b262c402859e17b2a9caa7099349301a48d8c1370e3eaefcef46e4920933f98cdadcb8dfec4ede0881fd575fd7427a2e4a013a888cfe61c62c62b3732f SHA512 820a94b15c2cf1012739e44f6ff9c475ad60e67622931c696f0443d19892db2b697886452f0a9f9fba7d40611d5700ba602b8acdc6833122524e3aff0b05a976
+DIST thunderbird-68.0-el.xpi 699225 BLAKE2B e62dee23e0e92e087adbce7e37ee0e0f79f0ceaddbb0a701e78c17e7772fe611e0969f55614f049af10b688fc1ed2af4dc6d0aced35ea31bd1e3b045015dbfff SHA512 fa73410538d0576f596cc0595961183d81ff786f392a9a8dbaa8f269e16bbc968964be584d50d2170f18295c1b1a4a73514c7134a9d510e5cb2bbc662dc98659
+DIST thunderbird-68.0-en-GB.xpi 556407 BLAKE2B 764f6f0e8c81ccdbd5b1e2b362b18c2098b3dfe003afb9fc29f50cf6601d16cbf8d6823a62ee3795ee9a2fed593ed806d07d5c6ecdb373ae39534346d097211c SHA512 1bfe3e4ba5b7458656d96b9aff69c8bf33708f112616c87008081da5ef9c1295b224e828f5e738e1c729433ef2387ed8d9f09fcf4a479a86c73422dd50ae98a5
+DIST thunderbird-68.0-es-AR.xpi 596555 BLAKE2B 655546f97c74560c92071a5efb3c4c63328dbdf65951553fd4fc779c5f35f1865d5fe180e87991885f965444abeb3428c24a6f142baa38863fdbada4ef65929f SHA512 3b1e33d1f5bb76a0ea5f361f5d09624294eda230322bd350b1199e7d5ab691ce2a720e2c222bfc0244b537f695e8268529f69b5aeeab3ecdc356a7922e02a49c
+DIST thunderbird-68.0-es-ES.xpi 518355 BLAKE2B 6a1157a67f667260b6ec5e16320f9b04793be1a2efacaeb516f96d26aa1e247a3e519ea6c1bfea860df4f33ad25c0ae4db969aaeca2ebafc2629dd3d5f415c74 SHA512 3d24445196608d307a6aa4df261c1d4a6473f2bfb82530bdafdd0203587dccb38443e056abb14d735bf9d5ec1e022dc58e0b595c23c4e197195fbd4985200a50
+DIST thunderbird-68.0-et.xpi 573585 BLAKE2B 7ec4dc001da15c653f34f6a809e8ff6f9714013130545843aea23b8daad96a2d910416aeb22e67585e01442de81f433762e3251fc9fc0133d3d4c0de3068d174 SHA512 f540fe0ceab68782c781e81a43d1a425bbcdfa1af49f24113b6b30933cf86e9be7b3e8c34983a5f20311da29f4be90058d07b90297c06d886bcb580ff52fa0b6
+DIST thunderbird-68.0-eu.xpi 579949 BLAKE2B 132bd384dc626a26786b45e3bdd67bac278f9d31d3edcc658c707b3981e94a00303a2a79f10632706fa3394447e4941d71dcbc7563f02a44b678fd9f3a4adce8 SHA512 e2472954fd3b309c182f4359d4e34b029008441f4ec17cde94dd6e3ce97bbfc7a3c523f54ad7bcec5df1a4c36fa3190c8908416b6353fa069c50ec59d28e0ff7
+DIST thunderbird-68.0-fi.xpi 578422 BLAKE2B db7598b706edf7f28399a72a6b30f2f4ca75a4ac4af4e775086f93c39baeb70abd782b41e2034263e962ec24249b5d7256e2ffbc149e3200501bc600c2ddb57b SHA512 f61565baebe3fe086faf3f77724a27d2494bef6dff6d2c3592559a86871104484807d9760283eb6864c92207ceb12bd8d93f699da71ebd9a6aaaa48b729e40e9
+DIST thunderbird-68.0-fr.xpi 607814 BLAKE2B 7a12719e8a8418218b19655d71ca6727628f3841ee7ca857ee3b48926321b29d234863742968e0dfd82f0740ec2a1e92cd1d0b77b230161372cabf1f76deee46 SHA512 8ee94e558cd2854d5d3548f8808b56f4a7c81c57183278b823702499ae186ea2a9ddf91d2a9bc6d0a3b5cf70464a2e5827e8e26daa14ce30623f75d0d324f018
+DIST thunderbird-68.0-fy-NL.xpi 594471 BLAKE2B 6f7f9e5a8692efbcd8f487829fbfa7c15d6f330fa5799375f64a4992b16da299902c5bb20277e557ee775ef4b8f8e87b3ebf29b6823dc13a2dbed11af725fe03 SHA512 aa43427cb603bc5deab2c13cc8565aecc8e2bc505961c527e5eab2406868c0f798876501c9e3960bdffdbe4e13b1936a4b18bc728efb9413c3c67e91c9850384
+DIST thunderbird-68.0-ga-IE.xpi 588714 BLAKE2B f02c68d432e10d17a497fb08657ede02bbc1ee1e8c34b9c33ea315667241b9f8878558ddf98b4f3398f1dc77042cf501288681b527d92faed2148b3e5070ed29 SHA512 d3a71503480f5116e5224a7f9d46d2c5e7a96e2ae9bcc72db264fd89aaf14f85e3dd901fe8258c3f3cfce3a3f5fe8c1c9682eef08908bbd075374b0a9c56cc50
+DIST thunderbird-68.0-gd.xpi 587113 BLAKE2B 80b223cf0e2ce8fa45fb0d1d58a83c729c70a2058c8e115acc9773080c65c42ee8a2fef83572749c89abfb4fd9b73ddf7c4f599cc42e6b125f7d7a0f62346fd6 SHA512 34325901aab83cf273529c0039b9b1b66efc020f1e5f627d7e4b7542bef4fa1ce1bf072ebecd018350d8243929b76bede698157286bd1766472b733950b3853d
+DIST thunderbird-68.0-gl.xpi 568400 BLAKE2B 71c7dfd30cff2db1b8ae050bbe5e84dbf7af7bfdec7a344708ddcd08a9fd9af99c1970a3b38488593155c476e4c96172af389fc5f069157685a38cf89437c62f SHA512 0cce294684abe602884f39f06cdf9b757ce42424c1a85baaebbfaeb9db72d90f300706c3e1603d5fad147711d72c0b3e52295a4cd99145298bf3e71f94c0146f
+DIST thunderbird-68.0-he.xpi 604792 BLAKE2B 70e298a02f0fdaf532ef460e902aa104d97f2cf379367693ad7ca6c4846267cc56c479a8e9418661a62602a89e9282e5623fafa629ba7bcd204e541ecf1644c6 SHA512 aad7763b63011161bee42d8e1a8dddf118d3ea71b39d135cb049eccf97199ffaf2d10a8211ab1afcebaa2e3492672f98498da7e37eb197168e402964d3917dca
+DIST thunderbird-68.0-hr.xpi 583787 BLAKE2B af98f536e0cf26e2d949450efdcc79529056c38cd0eb267b2a3ab5ac5c895ca0ac97b0d78ea3853e03ac0eee51d2b0a45afe2cbe2850da17b7873608f0fa6f85 SHA512 ef327533082e6e8f35ecba996d0ae73c4d2e1f18d4dac7d323f7de2296394ad5ab26ecb2b996210c5d28319546d287addad74623ffed801ac548f8529624d04f
+DIST thunderbird-68.0-hsb.xpi 616039 BLAKE2B fedeef8593a328aa262985cd3982a1c23cf2e9da2f3ab119ef5424a71ca2fba23bc76d1534b682ef92212a58fef150266d3240ee934a53e8e5a8118b4203a41a SHA512 9254218b7628cdaf97af82239a05b8287cd3e07c01958a923d67a5f3b681f52c3ae96b8c33127b289f080eaf69e651218cfe9ebaa49f9c55303784658e79a4f2
+DIST thunderbird-68.0-hu.xpi 618159 BLAKE2B d215510661fbfc91345e3a4fab6bc97b22f2cc980c8b121c7403f2ecbaef75e9036f962316f0f4d1ff5afba20faac95f7e1efb205532bb6e25bc3d558b145cab SHA512 4da44d0f54ab8832e8eb5b4484fc06fb3bce0588fd0a4a01ebcc8f42f44c2600df368c7b9a7ecd55fb0473e6f1ce91fd26b6e6cf82f62d6f34c96345b4139027
+DIST thunderbird-68.0-hy-AM.xpi 630527 BLAKE2B fd238ef369849e74a4302dfd9835d9cfc7a9086182d2f06597a34a54b25d15b433b6f29472df25c638ba7722b597115f56f08b604c1e56354d07e6f0d1a0acdc SHA512 1884f9a7ee6ca9b5fd3104b446bc1779a5021de275ca245a7796dda487622ffb35f92b3693a48bcc9983bb79a82be700878546aa5321e29e7aaa7d63cb63362e
+DIST thunderbird-68.0-id.xpi 567750 BLAKE2B 829b7d86b6a7f486a0500fb76d8fe20a7de1e4e18cf2b817bdd23c6b3b26c3b518fb647c7d983be3812c59427700c1cabd1761a7c1428f8c3400dcc98d4eeb9e SHA512 e154cddeb48cbbbe090f42ae5fea785bca4086b753b6eecb958568a30c7970c761d672b164c970f2b06e6c446da34e5a70935e54c3886195b946b6c66dc1aac7
+DIST thunderbird-68.0-is.xpi 575444 BLAKE2B e1469a504c02d13c0229146c5e95dc411c7881a2dd73e3b83b32872526a8ced983e4c41f08efba7ca193027b9c4e3ef85e836303ddd889b35a87c676c654609a SHA512 e7fa884cea521f95f70840ab1e5c01ef0ae73c8c352b8201df95182864f2fb467dede7c1de5b8ee8a4b09212b1581f4e52fcc608e6463b581af0976a35c9685d
+DIST thunderbird-68.0-it.xpi 489522 BLAKE2B b48cf65017df7a97576d58e69c89e22e5d4b919a167a7cb11c942511150ae96fb7727e74ae053ce8192b93173c655ebd9d11c5befe331266d0b9ff48dd0f3eb9 SHA512 2242f359661904027afad7ca3edaa0af3e7ba2737b4e7a217efae55d3d7caae629dcd913945ae417de04197e70bc121370ddc92e11fd888dc57977ae803fde2d
+DIST thunderbird-68.0-ja.xpi 643578 BLAKE2B 86ea1d5494d69d5bf5c9ef33baf627c807f15b3da5fef79ade76a320e42bd163d2bf26bac8c3b58e103b4b68e5f729f281cc0a898a073e300069c26bc07b76bf SHA512 cbbf432c8f0eef14bd30d080187ed366c391ce98b963a7f413c2bcbf816a4c032c73daedd061cfde8088e6b8538a5286d74464762d56bfe709f737b4622dc277
+DIST thunderbird-68.0-ko.xpi 620532 BLAKE2B 640c4a4718e9fb75e4e57e48cc72e3ea69a59d45cb2755aeed44503bee1a6727615eeb06f46dec8aa10e98fb3a1ed27e70fc2b8b8e3bf47f342640c7b0c6ed64 SHA512 44b3714893997448cd6cb08793af861a434f1aedd9b52ff5ad4b461634fc8506958b2b4721cec906b623de91cd3fb948500f7d4633878c0331b7f98b529d4242
+DIST thunderbird-68.0-lt.xpi 603849 BLAKE2B f3ba5e2f40a4d4e1ed6819559248f65cd738fa35db56a3ca24eaa5a32721867abb28a16d61c1087f3397a8a63c01830cc1d35c0ce51d1487fb4d581241ddc7e1 SHA512 43cdc2e96c2d4897274c7e54efd64bb0ffc13f0ef7cd782937426df3f6f60d6bf45ec1f8e1f5a474b946c3a5c7e3ce055dae4d7526cc2462178d1f3f474145de
+DIST thunderbird-68.0-nb-NO.xpi 574024 BLAKE2B 95b409936005b7d94a3c1c54ea6b3032e47d4ffbee731b06e1dddee9e0077e4eded55ab3b76e1cfde619a6e4aed586a7f396c85db2026c358a1240f81f332320 SHA512 9dbf9ef59a3366d6901a30ef6511e41e32cb37d507c8867128394028f06f69fbd85de5d3fd7a1a3b1a18e60a40d91d66f569fcfa33c28f3de42f4a402a148e9d
+DIST thunderbird-68.0-nl.xpi 581358 BLAKE2B 35d574bbcb2348dcd864a9035d63189b0b5c6bca22b6123d04a234b7ee74a1542b80e9317aaaa83056ee435829284fd006d102ada8482bbd438721d55b29a203 SHA512 d421b341edda4a6fca9907df21a86a69d69f8c67a74fa8ccfa6eb9ed12971ffaca17ef28ce9002888d7dbccb99b29312a53277e29fab080009a0ebc0a67d4399
+DIST thunderbird-68.0-nn-NO.xpi 574952 BLAKE2B 15be15620ffbf34bf2149d1ebf9f7fa539478253a0ce06234cc011a5076efa4cd70f6739997cc131e300657bea2c91e9b4399b136da712ddebd1eb0f4cb81cbf SHA512 f2eb82d0364883d683e99c1fbc8d31ff7275d72a439859eb51b6e190c3411333f0102736ee206547d9578d4e6aa33f9ac7843c0b18ed2d4e1bb52cb5b4aa37fa
+DIST thunderbird-68.0-pl.xpi 576090 BLAKE2B aad0754f3e0d7ea994f71e46160d71bd54573a0765dc5978022f6255eb3f04cf28ec1ce7eafb2450c9fcfae3c0bb1897afb85459da9febfc6770458ff8421223 SHA512 73d931350b429fa61b822ec19fd169abeefbbf66dc496e2cc694763e28c2f3264996ca07deaf6819f91cc08e3fc11377e1a67dd98df5de2fcdc2e0ef053f35b0
+DIST thunderbird-68.0-pt-BR.xpi 589839 BLAKE2B 65402956dc9b102716c1ef7ffd2fdd9ac1236aa85aca8e5765fc8c720ae34b0bdab98077dc42fe1a6560c67fec5a06d62283b89217c1e5ff3c5fac2100e94313 SHA512 7a0d71960eb5d23bb1f5979d321c463cfcf8ebce5b60fc370e922468e8d3d4e95230549b447c32e70d75d39aa1a5b4ea2d793f423e1da8dc62a9a2be54796701
+DIST thunderbird-68.0-pt-PT.xpi 588106 BLAKE2B 741c7b0bedd2219bd8c274d1a192624c107344a0e8ce77c0f7a9f20db30d58a4519502cec617119d5fedd9ba1b47a2bd692762841c1654ab0bac28c314378aad SHA512 483d732c54bf516b9b06cdfaa48c246799ffa8cdb1dfb1fe67231a83abd0d2e5f5470133528f1fd297e6d961cff98404f6db3701bf48c48d25be7517e4965f0f
+DIST thunderbird-68.0-rm.xpi 578053 BLAKE2B 0864fd59d6a96a17f486a5570d69ea7e933e11225415357d02b11d01d3cfd24e9d627b312913fbb8a276d59aa504b875e1fdbfff987cf1ff8619ba74ee13484f SHA512 1bbe684e3a696103190d926dc1ec1e27453911b7267c36b87f615f1c97d6720513320f90992c48cd1293f37fd009f338da6c6832b49b0597af97d928058271c8
+DIST thunderbird-68.0-ro.xpi 594844 BLAKE2B a6ecaafcde838a1f2a6e33cfadc5f8bf2f6c873740677b9e0de75ee9c3b0b973f806407857ea27876f57149b1d7aadec31a9bb3216dfa494be52851c2ba66d1b SHA512 fa8c7e41fa9e15e2bb248fb2960221d3b5c45aae1e094593e7f7b03645d1a85d93de2d46002a2cf31a487e0d25079905372acbf22f9484bfe747a26ca90724f2
+DIST thunderbird-68.0-ru.xpi 683329 BLAKE2B 17b19ec36e586d4c515bd86a2dfa3041b5d6ddbe64c1e45d252eeecc9693bf6b70855f750960231eb2bef64e3a5f944b24f414f967634bc6c7b4024bdca293ab SHA512 ab70a04185bbcef1722bc6ac127289acce4bc6410c7732d3fe653d35d3a23b14eed9c51feed317efec47ffb5e8e560c3faa80550043beddff94be90c8be9ad9d
+DIST thunderbird-68.0-si.xpi 637408 BLAKE2B 5bd47ea8a09a76cb2aaf58e1e9acde919dad7de34cc86989cfe054689e13514f027061c36d2bf27122875db4c0406e759b72a8bd9117637af1bf60cfb6c6ee1a SHA512 1eb0f6728c205faee0c5e88c3801eda8f35a03e0fd5c20b7fbfa6c29aa2f804ef1d157342c17666b086c33305dbf53b706144b26b4172d6e8c91c782037f0d47
+DIST thunderbird-68.0-sk.xpi 609756 BLAKE2B 20d73444d2ae0abb41561cafff118a5a00451b7b52848c102801f9d4a860a8959ce969bf5ff1bea1e82dd909d2b853b2406d03742580ff2d74e684c00e25b137 SHA512 53f2fd7c22ee9381b38fa75290c65c57a452335944cb13cf710c064811207af2ffdbd11177f378d0cab6a5a5ac4ee3709b427f1c42b09ba3931bd73a3d503526
+DIST thunderbird-68.0-sl.xpi 590632 BLAKE2B 1cf13e500189398ce3bbaa495c0c1c69ed23443ec3fe3f96598ff3fd54b576715ca2d2c5691ac0c279b417effa1e4a477170ade32169ca93d932223642bf4a75 SHA512 b47d6ca7e6e110447e76f90d5e0d7ed23533da369a74578bb664c8a25539e4fd8583747fd4efa8ffafcfa5a01b2ed9c66c5a152fdd1f468ab2da00f6946078b6
+DIST thunderbird-68.0-sq.xpi 598904 BLAKE2B d34cda28594747e4a6ad699c071aebb599e3bb12bed97545dfb9baf3e852ec6c207e88dbfa553ab411e6d7ff5fc7b415c2f359e55102ef67e2fd42bed3422085 SHA512 7beafb5e1da2355866d4d14e38d6d0712fc6f10215a4923a941c1d1c775e79414b0ba58b647f79a4d36cf07c825d69e108d581c0ff2471a76500714499d9f57a
+DIST thunderbird-68.0-sr.xpi 624900 BLAKE2B 86950081a0b20b1db3df4c140fcdf1e9fcc3cbf8cf1287942a889dc6e18ccdb71e60e738f1e8968c265484166aea1fc6dec1398ad6377ae53c7d7753c812381f SHA512 f6b925a53e37ab50431a0062dd53171a1e59c5927c82706eea337d9eb7f3b03090bc383b1b8da5dddbbc67e3677962c0b1d79196ad839af7e7aa56cec73ea44f
+DIST thunderbird-68.0-sv-SE.xpi 591599 BLAKE2B c9ad5ffb39cca198da8b9ad3c9599c0be400d0eae6901c4acb82b9c71472ca78e4765fed1f85d2c1ea74fdcdd24670dce8340c392f1c71463e076566ee0c686c SHA512 24834d4e6a8badc3a4edf5d93e5a83249b96fff3cc9b918eae06c99457ae9ee399a2ac479ef3ab0cabb4d06dca44e56576913162dce643f725ecb051b5b6f283
+DIST thunderbird-68.0-tr.xpi 599711 BLAKE2B bb852ad1127ba445fd5f64f6b2cc90723cfc10a396915a73fc2c297872720abd9a166a6a24993fc08b5eb0d4ccfc8905e374886a13040e151e65e7921c584373 SHA512 83bcec20d0a137f5a7f480bfe3b05d32549fa7a4e07b449d96023a7b6b0b8a7e87ee0202de2a6e6b77e825ce048b021f27a243f7a8f6bce09fb0a8bd6dcc8306
+DIST thunderbird-68.0-uk.xpi 671458 BLAKE2B bd66d58c1a0770e4d4453d8b5d305943aa5012d365b4520670ee61cad1b569945bde7540a5747f66d6ad9cd56f8499e1111d90d2666d91b9149e7f34653f6f9d SHA512 55330dbd8bce9cdef80a081ab7219991e30da74a4e68eb7447c9a01f6a07db9f7fb12d2a7a826767cb70c112274c36119c9fe77f7896af9e2e28211bfc75f0e5
+DIST thunderbird-68.0-vi.xpi 623426 BLAKE2B 7692f160aa39dd0c221e6037074d02eaab8bcdc8f0f8c9a809211824fb0340be7ed7587eeb0c7bff27ced9b06f7f084a46d0d25354f0d5ea905bd7562625d701 SHA512 4fa2b202881d45680da6fed5e3c9332b64c6aa539e6f19f4568f06ec0819e7157392270a4009db2e45ba9815ce696a87179b2709839d68236405e88542892857
+DIST thunderbird-68.0-zh-CN.xpi 626822 BLAKE2B f752bbef52690476470161486e4ace8daaae45941f4f501341c70794ffcda1e3ee40436083eb543271cf0f6325e5a18c2ec912284ab89ca598a404e32e58e27d SHA512 5941448b8971b54ae783c7dcff796375aa60e9ae40f9d4e22bb4ae6d25454031defe8c49fdbfe9bccd397d41c74b860677ebdeded9471e0d90335036964ec74d
+DIST thunderbird-68.0-zh-TW.xpi 627478 BLAKE2B a2c827e9cdc6f6fa2fa2a59a31b3e719de2120d4d5e83ca1773e77191f343b81764bd7eba8cf7c806579dadf67b792f490a8ff3312ef9018be75e31c7f1e6013 SHA512 69780086f4749b01bf6b3a3c27422d239c78851de371eeea6212c69d347ede4620edba5f59045bfb1b008a083535c348056be1b44d61c188afb9c207f1513e9f
+DIST thunderbird-68.0.source.tar.xz 338451344 BLAKE2B 02e262b860076fe84adcfde2e208868576a48e63ceef4327e9a5196532e50c2a2b5069868d3b91d683373899257f377daf7a86d33eee1a0d4b8174e6eece2fea SHA512 91f82016b71d65b58c1383248ac6f7a8cd8217409323eb14e8aabf2e509391bba4d18e0aa6d0cdac191d10e9794977f22f509078b7c5e3ac7c22afe379a0f299
 EBUILD thunderbird-52.9.1.ebuild 10477 BLAKE2B afcc8251288a25fab08a79fa124a4160885c1f0649c5288c170a87de543144c89086aa1c1299cc7bf73edc2c8ff445d9f4805f7c85e698c307181956017398fe SHA512 0e5ec531150c4803e9fdbed0065ecba4817c5fce5c61cc5c5b89e0cf1e7e66cf77b5d10c441fa8da44242261c42b843a0613bfb119db997163f26e87cb27ef90
-EBUILD thunderbird-60.8.0.ebuild 18260 BLAKE2B b7a2e026d021b0cf5874cf7a037e8ed7c15e293ac45ec3c20ce28a2555da4a2f4dde221288ff46fd590be13d145e3394935944c5493b3e2ca765712db18e6a39 SHA512 1efadef67250615f60ad26f31bc6bf9e3934051a8e7d9ad8c5fc4f923e5a0c54b531eb6adb90cbe5aacb1715084a6c485bd253bbe60994f0726907e7b8b252b4
-MISC metadata.xml 1922 BLAKE2B ab89f183e54a3b58bd9b4b8df547c1172f264d00e3e8d753869d0d421c413bcc8ff06a24dd0910c28c70fd5b05cbc5154fc73ebfddf26e3db4d58d80e6e7d2c7 SHA512 0bdec29294b4b1aa77b965ecf78e2267ac75821c7ba7600783b5190755bd4380c675afbcfcb718a50a765dc35cb88112b8fa4956d298c467e91d21ec84509101
+EBUILD thunderbird-60.8.0.ebuild 18267 BLAKE2B 24d2b3c67258cf244ac039b564be2745b9e2db9bec34997f206b90a8f6a572e5902665daebc3ab9b7649f55e6a4d2a355e5408ae9c07463989bc332666b7c466 SHA512 0aea16f24405ba73b053a30838058f69863d51f9ea7a152151b90c5cf8155ae53fbaac5deaabcdc9177e71253df997d81ce9fff809713f8f0eefd1144cda5c2e
+EBUILD thunderbird-68.0-r2.ebuild 24653 BLAKE2B 009a1a7465bddce618cf082bec03ac5b6d8f1fff7d0696b112f2b347315884e519d171bc7d8b376b41e35c8b42daac977f2ab852b149239c03d82145a02be4bc SHA512 d13fe6cfd4596ae58e2ba1b8554777e57d0ebd978022651d6e95141c58807416eafe2a068bc809ca3a1ca0f4153b04e0ff78bcaab9caaf862054b85004424316
+MISC metadata.xml 2542 BLAKE2B 1e617a66e86efb25f296a8a143e8af392527084920dc1df71d542b982ac688a5e86b323f74e57efe06315cd34448b57fe1c7a04d9d14ec7737d0d9bf6649b517 SHA512 f0bd9d7c97448dec77ace57252598714a86d334e355adb1c61b3eccc1a2a702ab7e81667ceaa50558f9e3a61310d8d3193dbffcb777d3543b815632cd3502d63
diff --git a/mail-client/thunderbird/files/disable-auto-update.policy.json b/mail-client/thunderbird/files/disable-auto-update.policy.json
new file mode 100644
index 000000000000..f36622021fcd
--- /dev/null
+++ b/mail-client/thunderbird/files/disable-auto-update.policy.json
@@ -0,0 +1,5 @@
+{
+  "policies": {
+    "DisableAppUpdate": true
+  }
+}
diff --git a/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop b/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop
index c9daa1b1d87d..055bca45ef80 100644
--- a/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop
+++ b/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop
@@ -5,6 +5,6 @@ Exec=/usr/bin/thunderbird %u
 Icon=thunderbird-icon-unbranded
 Terminal=false
 Type=Application
-Categories=Office;Network;Email;
-MimeType=x-scheme-handler/mailto;
-StartupNotify=true
+Categories=Office;Email;
+MimeType=text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;
+
diff --git a/mail-client/thunderbird/files/icon/thunderbird.desktop b/mail-client/thunderbird/files/icon/thunderbird.desktop
index 97c17a3f2b9e..3ab5826de9fd 100644
--- a/mail-client/thunderbird/files/icon/thunderbird.desktop
+++ b/mail-client/thunderbird/files/icon/thunderbird.desktop
@@ -5,6 +5,5 @@ Exec=/usr/bin/thunderbird %u
 Icon=thunderbird-icon
 Terminal=false
 Type=Application
-Categories=Office;Network;Email;
-MimeType=x-scheme-handler/mailto;
-StartupNotify=true
+Categories=Office;Email;
+MimeType=text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;
diff --git a/mail-client/thunderbird/files/mozilla-bug1554949-linux-headers-5.2.patch b/mail-client/thunderbird/files/mozilla-bug1554949-linux-headers-5.2.patch
new file mode 100644
index 000000000000..2de125003949
--- /dev/null
+++ b/mail-client/thunderbird/files/mozilla-bug1554949-linux-headers-5.2.patch
@@ -0,0 +1,46 @@
+# HG changeset patch
+# User Emilio Cobos Álvarez <emilio@crisal.io>
+# Date 1559048542 0
+# Node ID 03fe96d5969ac6885ca539bf7759780ed75a1375
+# Parent  e6cf9d0df0793e7f76cb2877989fc5aeca98e530
+Bug 1554949 - Fix WebRTC build failure with newer linux kernel. r=dminor, a=RyanVM DONTBUILD
+
+Recent kernel commit[1] moved a bit the define for this constant. This revealed
+a missing include in WebRTC.
+
+I filed this upstream in:
+
+ * https://bugs.chromium.org/p/webrtc/issues/detail?id=10677
+
+And sent a patch in:
+
+ * https://webrtc-review.googlesource.com/c/src/+/138270
+
+[1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0768e17073dc5
+
+Differential Revision: https://phabricator.services.mozilla.com/D32809
+
+diff --git a/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc b/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc
+--- a/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc
++++ b/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc
+@@ -56,16 +56,19 @@
+ #if defined(WEBRTC_POSIX)
+ #include <netinet/tcp.h>  // for TCP_NODELAY
+ #define IP_MTU 14 // Until this is integrated from linux/in.h to netinet/in.h
+ typedef void* SockOptArg;
+ 
+ #endif  // WEBRTC_POSIX
+ 
+ #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) && !defined(__native_client__)
++#if defined(WEBRTC_LINUX)
++#include <linux/sockios.h>
++#endif
+ 
+ int64_t GetSocketRecvTimestamp(int socket) {
+   struct timeval tv_ioctl;
+   int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl);
+   if (ret != 0)
+     return -1;
+   int64_t timestamp =
+       rtc::kNumMicrosecsPerSec * static_cast<int64_t>(tv_ioctl.tv_sec) +
+
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index 5216de1435e0..66075b13cee0 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -6,17 +6,25 @@
 	<name>Gentoo Mozilla Team</name>
 </maintainer>
 <use>
-	<flag name="bindist">Disable official Thunderbird branding (icons, name) which 
+	<flag name="bindist">Disable official Firefox/Thunderbird branding (icons, name) which 
 		are not binary-redistributable according to upstream.</flag>
 	<flag name="clang">Use Clang compiler instead of GCC</flag>
-	<flag name="crypt"> Enable encryption support with enigmail</flag>
-	<flag name="mozdom">Enable Mozilla's DOM inspector</flag>
-	<flag name="lightning">Enable app-global calendar support
-		(note 38.0 and above bundles calendar support when this flag is off)</flag>
 	<flag name="custom-optimization">Build with user-specified compiler optimizations
 		(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
+	<flag name="eme-free">Disable EME (DRM plugin) cabability at build time</flag>
+	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
+		downloaded and kept up-to-date in user profiles</flag>
 	<flag name="gtk2">Use the cairo-gtk2 rendering engine instead of the default cairo-gtk3</flag>
+	<flag name="lightning">Enable app-global calendar support
+		(note 38.0 and above bundles calendar support when this flag is off)</flag>
+	<flag name="lto">Enable Link Time Optimization (LTO). Requires Gold linker when using GCC
+		or LDD linker when using Clang</flag>
+	<flag name="mozdom">Enable Mozilla's DOM inspector</flag>
+	<flag name="pgo">Add support for profile-guided optimization using gcc-4.5,
+		for faster binaries. This option will double the compile time.</flag>
 	<flag name="rust">Enable support for using rust compiler  (experimental)</flag>
+	<flag name="system-av1">Use the system-wide <pkg>media-libs/dav1d</pkg>
+		and <pkg>media-libs/libaom</pkg> library instead of bundled.</flag>
 	<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
 		instead of bundled.</flag>
 	<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg>
@@ -31,6 +39,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="minimal">Remove the software development kit and headers</flag>
+	<flag name="system-webp">Use the system-wide <pkg>media-libs/libwebp</pkg>
+		instead of bundled.</flag>
+
+
 </use>
 </pkgmetadata>
diff --git a/mail-client/thunderbird/thunderbird-60.8.0.ebuild b/mail-client/thunderbird/thunderbird-60.8.0.ebuild
index 4629cdc73f85..8a3a5aa36de0 100644
--- a/mail-client/thunderbird/thunderbird-60.8.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-60.8.0.ebuild
@@ -39,7 +39,7 @@ inherit check-reqs flag-o-matic toolchain-funcs gnome2-utils llvm mozcoreconf-v6
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="https://www.mozilla.org/thunderbird"
 
-KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 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
diff --git a/mail-client/thunderbird/thunderbird-68.0-r2.ebuild b/mail-client/thunderbird/thunderbird-68.0-r2.ebuild
new file mode 100644
index 000000000000..ce7354369c7d
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-68.0-r2.ebuild
@@ -0,0 +1,767 @@
+# 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.5"
+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
+PATCHFF="firefox-68.0-patches-11"
+
+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}"
+
+LLVM_MAX_SLOT=8
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.mozilla.org/thunderbird"
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
+	+gmp-autoupdate hardened jack lightning lto neon pgo pulseaudio
+	 selinux startup-notification +system-av1 +system-harfbuzz +system-icu
+	+system-jpeg +system-libevent +system-sqlite +system-libvpx
+	+system-webp test wayland wifi"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${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[@]}"
+
+inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
+		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
+		autotools mozlinguas-v2 virtualx
+
+CDEPEND="
+	>=dev-libs/nss-3.44.1
+	>=dev-libs/nspr-4.21
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	dbus? ( >=sys-apps/dbus-0.60
+		>=dev-libs/dbus-glib-0.72 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=virtual/libffi-3.0.10:=
+	virtual/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
+	system-icu? ( >=dev-libs/icu-63.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? (
+		>=media-libs/libvpx-1.7.0:0=[postproc]
+		<media-libs/libvpx-1.8:0=[postproc]
+	)
+	system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
+	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
+	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager ) )
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+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.8.7
+	>=net-libs/nodejs-8.11.0
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	|| (
+		(
+			sys-devel/clang:8
+			!clang? ( sys-devel/llvm:8 )
+			clang? (
+				=sys-devel/lld-8*
+				sys-devel/llvm:8[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:7
+			!clang? ( sys-devel/llvm:7 )
+			clang? (
+				=sys-devel/lld-7*
+				sys-devel/llvm:7[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:6
+			!clang? ( sys-devel/llvm:6 )
+			clang? (
+				=sys-devel/lld-6*
+				sys-devel/llvm:6[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
+			)
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	>=virtual/cargo-1.34.0
+	>=virtual/rust-1.34.0
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+REQUIRED_USE="wifi? ( dbus )
+	pgo? ( lto )"
+
+S="${WORKDIR}/${MOZ_P%b[0-9]*}"
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+# 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() {
+	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+		return 1
+	fi
+
+	if use pgo ; then
+		if ! has usersandbox $FEATURES ; then
+			eerror "You must enable usersandbox as X server can not run as root!"
+		fi
+	fi
+
+	if use clang ; then
+		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Will use LLVM slot ${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() {
+	# Apply firefox patchset then apply thunderbird patches
+	eapply "${WORKDIR}/firefox"
+	eapply "${FILESDIR}/mozilla-bug1554949-linux-headers-5.2.patch"
+	pushd "${S}"/comm &>/dev/null || die
+	eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
+	popd &>/dev/null || die
+
+	# 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
+
+	# 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}"/comm/mail/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
+
+	if use pgo ; then
+		if ! has userpriv $FEATURES ; then
+			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
+		fi
+	fi
+
+	# 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
+
+			# Bug 689358
+			append-cxxflags -flto
+
+			if ! use cpu_flags_x86_avx2 ; then
+				local _gcc_version_with_ipa_cdtor_fix="8.3"
+				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
+
+				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
+					# due to a GCC bug, GCC will produce AVX2 instructions
+					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
+					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
+					append-ldflags -fdisable-ipa-cdtor
+				else
+					einfo "No GCC workaround required, GCC version is already patched!"
+				fi
+			else
+				einfo "No GCC workaround required, system supports AVX2"
+			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
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
+	if use wayland ; then
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	mozconfig_use_enable startup-notification
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-av1
+	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
+
+	# 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
+
+	# Enable/Disable eme support
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-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
+
+	# allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		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
+
+	# Finalize and report settings
+	mozconfig_final
+
+	mkdir -p "${S}"/third_party/rust/libloading/.deps
+
+	# 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
+
+	GDK_BACKEND=x11 \
+		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
+		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+		MOZ_NOSPAM=1 \
+		${_virtx} \
+		./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	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
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/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/defaults/pref/all-gentoo.js" \
+			|| die
+	done
+
+	cd "${S}"
+	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
+
+	# 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
+
+	# 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"
+
+	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
+		mkdir -p "${ED}"/${MOZILLA_FIVE_HOME}/extensions
+		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() {
+	# 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() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	if ! use gmp-autoupdate && ! use eme-free ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+		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() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index b42186888eb7..5b64ad589275 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/anubis/Manifest b/mail-filter/anubis/Manifest
deleted file mode 100644
index 566810dadd44..000000000000
--- a/mail-filter/anubis/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX 4.1.1-gnutls.patch 527 BLAKE2B 88137a7780e596cab930cbca35f5a8b9f7dcd2897c58ffc7ab495a4c3448d990a6ddba6fe60e52ec891716ccf2c82adb3ca231f9e3e09fbace9a279522525e15 SHA512 0bba97cd43a74a92c6761ce2fb245efd0098af99157eb70c1b8a5cc8a8edbb2f2ca53f67c5f8e817207b9363e5ae38f572be6b2b85d26e5f29e1998394bb75e7
-AUX 4.1.1-gnutls3.patch 434 BLAKE2B 3c019fb67ec2ec827a31511956e7f2e165ea414501c73d4f8201456c4df78df1c29793de2cb3e909a228adfaa6791debec7c48d0e6a563726383e2faba3a99df SHA512 58349bac378699b667e0e5b1b24d9538e0c1d590d27a2413ffae884ab2828713e78933eead41cdf9d9ee7cece4a0587feb1820713594bd70e473edf7267af19c
-AUX 4.1.1-gpgme.patch 973 BLAKE2B 59c959298a6d1cb52ccd99c1d8b8fe0c9ae8c28393bdeb7784e5be6cedbe1cf1c1d7329d94ffe8a27f366800c7db5d51d11629ec63063daffd5534c4acb507da SHA512 c5812e752498abce76ed54df08198d832b887c1b3713a07f2ab1e09087d8bad73598edb9359bc26255ff5ab2b787319f89408eee1b86abe9b53dd709782cbaf3
-AUX 4.1.1-testsuite.patch 570 BLAKE2B 8ee5a2c8d95cac0ecb9d69961850fb140cb7e117bcdca245b91541d25eca7982966eb05decd574365b3825a4180d7e8b7028412c2f09a0c857419dab8cccd106 SHA512 c61a64a990ff4e6eb80118adb44681dd348afdb2d59aeb782a9d05db0cf8eefcb52d93108e243eda164a79d02f96780b9097380f1e73f8021952018a8222fc55
-AUX anubis-4.2-gdbm.patch 540 BLAKE2B 571303e31a9199e508ebc39a5a643edbaaf8990923ff026b7635df8cb950efd4c582cd330155b80a98531fcfef1b9913236825e807c57d5fd1416a3295bf3542 SHA512 7e087be62a5a04b1bf5abe1df9b355391278ca09f97883070da986974ef2ffcee2475ac5b1e7db227781a82b96414f75071b4884c674b9d0bc3a383b371d0bc7
-DIST anubis-4.1.1.tar.gz 1104272 BLAKE2B e4aac5ea5b38314bbf82231d3e93183906cd321c653cf6a0c07cc364a962d4a09f2aeb865e3f2fb40a93c8a45321ddb69f23b206d8dde2f830b803c65df94109 SHA512 51e9c3a4cc4f217348522ba196daf26908f5ebed1abbe8c3f4c876847284e1f43f19d5cc68cde3cae5aacc55d42b7a6786f9afb23856c647ddf6d6c4b6c0a7a7
-DIST anubis-4.2.tar.gz 1623768 BLAKE2B bb9c6db5f3c79571b71d1256fe45cf65604738e367902cce0ad113c464d4067ef56100cde30ef12c547728a27b6b1fbc387d9bb55c7dd052e9aaef9f766af542 SHA512 cd16b67780b37f02a31374875763a1d54107289fbaf53160de5778f095b56bdb390c72a06fc067d87556b1158b0134c0fc88d30edbe124a71d8c80a89595e75f
-EBUILD anubis-4.1.1-r1.ebuild 2109 BLAKE2B 8ad8dbb19a7ec4b68c59ff3f879baec2aad8609a777ae4a1bb8c5db5a6a0c3fa0141ad82dd9eec2e7016ce978c19a80fe0439b43f4ede99db692de0c928760d8 SHA512 519ab2982b392687d5f616579a50d71ef2d83a7b714928b148725b38bffe8053aaeb8468189e32882e3a5c8810b18beed7d6f32c708d2237b2d59476c34b9394
-EBUILD anubis-4.1.1.ebuild 2029 BLAKE2B ab1dc1db19713d3dc3ca5649f74e5efbfd2596bd5cbd538c43e8430eb625d738f75b5f670402d8f0a888bd7e6bf15c90c13f7ff1c4a2f5bb40124d74212d82b8 SHA512 1cc5409d4f0af6723ade89512f8d7b5215ea6a6af622b9b2f30f6ed13b33e861ab5d618a9c3ee44456461d294ea036906bb76b648eabfb9c603d530771c10afe
-EBUILD anubis-4.2-r1.ebuild 1515 BLAKE2B b3e1eadc4ca7980f32392215535dda7552ba71581b9b8e4a3547df6117781d27d0d530a7062e6aea31346bc806eaa8b1737b1be2e5bd172c515509eb1f12c0c1 SHA512 db58d2e10e53945a1f2fc58c2889bf9e18dd045e85f6693e4a8654138cb9d910035ef5bd3a12f8e8c3d9ba912a75259050f533e9e9b5e107efea29397f0b65a3
-EBUILD anubis-4.2.ebuild 1479 BLAKE2B 6333d27ccb9c59bc7d38382b475124f68ffe018f5ac702633bea5c3be46ce73ed85cec004af55e428af29339a8dab399c41c96f614cb350400245be95747acdd SHA512 e5089735a8c0ed305711cee229356c22af0983183100248bf6c5b620c5ee902cd42274defe39083b2a1ac5ea53dc1c8ff0e8a62d2651a173599db29211e59f26
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-filter/anubis/anubis-4.1.1-r1.ebuild b/mail-filter/anubis/anubis-4.1.1-r1.ebuild
deleted file mode 100644
index c229420bab38..000000000000
--- a/mail-filter/anubis/anubis-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils autotools pam toolchain-funcs user
-
-DESCRIPTION="GNU Anubis is an outgoing mail processor"
-HOMEPAGE="https://www.gnu.org/software/anubis/"
-
-SRC_URI="mirror://gnu/anubis/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="crypt guile mysql postgres nls pam pcre sasl socks5 +gnutls tcpd test"
-
-RDEPEND="sys-libs/gdbm
-	crypt? ( >=app-crypt/gpgme-0.9.0 )
-	guile? ( >=dev-scheme/guile-1.8 )
-	mysql? ( virtual/mysql )
-	pam?   ( virtual/pam )
-	postgres? ( dev-db/postgresql[server] )
-	nls? ( sys-devel/gettext )
-	pcre? ( >=dev-libs/libpcre-3.9 )
-	sasl? ( virtual/gsasl )
-	gnutls?   ( net-libs/gnutls )
-	tcpd?  ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )"
-
-REQUIRED_USE="mysql? ( sasl )
-	postgres? ( sasl )"
-
-pkg_setup() {
-	enewuser anubis
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gnutls.patch
-	epatch "${FILESDIR}"/${PV}-gpgme.patch
-	epatch "${FILESDIR}"/${PV}-testsuite.patch
-	epatch "${FILESDIR}"/${PV}-gnutls3.patch
-	sed -i -e "s/1024-bit ELG-E/1024-bit ELG/" \
-		testsuite/etc/{gpgcrypt.pat,gpgse.pat}
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use crypt ; then
-		myconf="--with-gpgme --with-gpgme-prefix=$(gpgme-config --prefix)"
-	else
-		myconf="--without-gpgme"
-	fi
-	econf --with-unprivileged-user=anubis \
-		--disable-rpath \
-		$(use_with mysql) \
-		$(use_with postgres) \
-		$(use_with pam) \
-		$(use_with pcre) \
-		$(use_enable nls) \
-		$(use_with guile) \
-		$(use_with sasl gsasl) \
-		$(use_with gnutls) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_with socks5 socks-proxy) \
-		${myconf}
-}
-
-src_compile() {
-	# parallel make fails
-	emake AR=$(tc-getAR) -j1
-}
-
-src_test() {
-	cd "${S}/testsuite"
-	emake -j1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README* THANKS TODO
-	docinto examples
-	dodoc examples/*anubis*
-	docinto guile
-	dodoc guile/*.scm
-
-	if use pam ; then
-		pamd_mimic system-auth anubis auth account session
-	fi
-
-	rm -rf "${D}"/usr/share/anubis
-}
diff --git a/mail-filter/anubis/anubis-4.1.1.ebuild b/mail-filter/anubis/anubis-4.1.1.ebuild
deleted file mode 100644
index 96fda178e73f..000000000000
--- a/mail-filter/anubis/anubis-4.1.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils autotools pam user
-
-DESCRIPTION="GNU Anubis is an outgoing mail processor"
-HOMEPAGE="https://www.gnu.org/software/anubis/"
-
-SRC_URI="mirror://gnu/anubis/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE="crypt guile mysql postgres nls pam pcre sasl socks5 +gnutls tcpd test"
-
-RDEPEND="sys-libs/gdbm
-	crypt? ( >=app-crypt/gpgme-0.9.0 )
-	guile? ( >=dev-scheme/guile-1.8 )
-	mysql? ( virtual/mysql )
-	pam?   ( virtual/pam )
-	postgres? ( dev-db/postgresql[server] )
-	nls? ( sys-devel/gettext )
-	pcre? ( >=dev-libs/libpcre-3.9 )
-	sasl? ( virtual/gsasl )
-	gnutls?   ( net-libs/gnutls )
-	tcpd?  ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )"
-
-REQUIRED_USE="mysql? ( sasl )
-	postgres? ( sasl )"
-
-pkg_setup() {
-	enewuser anubis
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gnutls.patch
-	epatch "${FILESDIR}"/${PV}-gpgme.patch
-	epatch "${FILESDIR}"/${PV}-testsuite.patch
-	sed -i -e "s/1024-bit ELG-E/1024-bit ELG/" \
-		testsuite/etc/{gpgcrypt.pat,gpgse.pat}
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use crypt ; then
-		myconf="--with-gpgme --with-gpgme-prefix=$(gpgme-config --prefix)"
-	else
-		myconf="--without-gpgme"
-	fi
-	econf --with-unprivileged-user=anubis \
-		--disable-rpath \
-		$(use_with mysql) \
-		$(use_with postgres) \
-		$(use_with pam) \
-		$(use_with pcre) \
-		$(use_enable nls) \
-		$(use_with guile) \
-		$(use_with sasl gsasl) \
-		$(use_with gnutls) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_with socks5 socks-proxy) \
-		${myconf}
-}
-
-src_compile() {
-	# parallel make fails
-	emake -j1
-}
-
-src_test() {
-	cd "${S}/testsuite"
-	emake -j1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README* THANKS TODO
-	docinto examples
-	dodoc examples/*anubis*
-	docinto guile
-	dodoc guile/*.scm
-
-	if use pam ; then
-		pamd_mimic system-auth anubis auth account session
-	fi
-
-	rm -rf "${D}"/usr/share/anubis
-}
diff --git a/mail-filter/anubis/anubis-4.2-r1.ebuild b/mail-filter/anubis/anubis-4.2-r1.ebuild
deleted file mode 100644
index ef65b9481c14..000000000000
--- a/mail-filter/anubis/anubis-4.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pam user
-
-DESCRIPTION="GNU Anubis is an outgoing mail processor"
-HOMEPAGE="https://www.gnu.org/software/anubis/"
-
-SRC_URI="mirror://gnu/anubis/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="crypt guile mysql postgres nls pam pcre sasl socks5 +gnutls tcpd test"
-
-RDEPEND="sys-libs/gdbm
-	crypt? ( >=app-crypt/gpgme-1.8.0 )
-	guile? ( >=dev-scheme/guile-1.8 )
-	mysql? ( dev-db/mysql-connector-c )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:*[server] )
-	nls? ( sys-devel/gettext )
-	pcre? ( >=dev-libs/libpcre-3.9 )
-	sasl? ( virtual/gsasl )
-	gnutls? ( net-libs/gnutls )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )"
-
-REQUIRED_USE="mysql? ( sasl )
-	postgres? ( sasl )"
-
-PATCHES=( "${FILESDIR}/anubis-4.2-gdbm.patch" )
-
-pkg_setup() {
-	enewuser anubis
-}
-
-src_configure() {
-	econf --with-unprivileged-user=anubis \
-		--disable-rpath \
-		$(use_with mysql) \
-		$(use_with postgres) \
-		$(use_with pam) \
-		$(use_with pcre) \
-		$(use_enable nls) \
-		$(use_with guile) \
-		$(use_with sasl gsasl) \
-		$(use_with gnutls) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_with socks5 socks-proxy) \
-		$(use_with crypt gpgme)
-}
-
-src_test() {
-	emake -C testsuite check
-}
-
-src_install() {
-	default
-	docinto examples
-	dodoc examples/*anubis*
-	docinto guile
-	dodoc guile/*.scm
-
-	use pam  && pamd_mimic system-auth anubis auth account session
-}
diff --git a/mail-filter/anubis/anubis-4.2.ebuild b/mail-filter/anubis/anubis-4.2.ebuild
deleted file mode 100644
index 17ae62c4609d..000000000000
--- a/mail-filter/anubis/anubis-4.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pam toolchain-funcs user
-
-DESCRIPTION="GNU Anubis is an outgoing mail processor"
-HOMEPAGE="https://www.gnu.org/software/anubis/"
-
-SRC_URI="mirror://gnu/anubis/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="crypt guile mysql postgres nls pam pcre sasl socks5 +gnutls tcpd test"
-
-RDEPEND="sys-libs/gdbm
-	crypt? ( >=app-crypt/gpgme-1.8.0 )
-	guile? ( >=dev-scheme/guile-1.8 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:*[server] )
-	nls? ( sys-devel/gettext )
-	pcre? ( >=dev-libs/libpcre-3.9 )
-	sasl? ( virtual/gsasl )
-	gnutls? ( net-libs/gnutls )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )"
-
-REQUIRED_USE="mysql? ( sasl )
-	postgres? ( sasl )"
-
-pkg_setup() {
-	enewuser anubis
-}
-
-src_configure() {
-	econf --with-unprivileged-user=anubis \
-		--disable-rpath \
-		$(use_with mysql) \
-		$(use_with postgres) \
-		$(use_with pam) \
-		$(use_with pcre) \
-		$(use_enable nls) \
-		$(use_with guile) \
-		$(use_with sasl gsasl) \
-		$(use_with gnutls) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_with socks5 socks-proxy) \
-		$(use_with crypt gpgme)
-}
-
-src_test() {
-	emake -C testsuite check
-}
-
-src_install() {
-	default
-	docinto examples
-	dodoc examples/*anubis*
-	docinto guile
-	dodoc guile/*.scm
-
-	use pam  && pamd_mimic system-auth anubis auth account session
-}
diff --git a/mail-filter/anubis/files/4.1.1-gnutls.patch b/mail-filter/anubis/files/4.1.1-gnutls.patch
deleted file mode 100644
index c4dd28bff693..000000000000
--- a/mail-filter/anubis/files/4.1.1-gnutls.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac	2011-06-13 13:46:22.817856139 +0300
-+++ configure.ac	2011-06-13 13:47:56.000000000 +0300
-@@ -277,7 +277,7 @@
- if test $with_gnutls = yes; then
-   AC_CHECK_HEADERS(gnutls/gnutls.h)
-   if test $ac_cv_header_gnutls_gnutls_h != no; then
--    AM_PATH_LIBGNUTLS("1.0.0",
-+    PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0,
-                       [M4_DEFS="$M4_DEFS -DWITH_SSL -DWITH_GNUTLS"
-                       AC_DEFINE(USE_GNUTLS, 1,
-                                 [Define to 1 if USE_GNUTLS is requested.])],
diff --git a/mail-filter/anubis/files/4.1.1-gnutls3.patch b/mail-filter/anubis/files/4.1.1-gnutls3.patch
deleted file mode 100644
index c9d9197a2184..000000000000
--- a/mail-filter/anubis/files/4.1.1-gnutls3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/tls.c	2008-12-16 16:21:54.000000000 +0000
-+++ src/tls.c	2012-10-30 09:06:37.387243098 +0000
-@@ -294,7 +294,10 @@
- static void
- verify_certificate (gnutls_session session)
- {
--  int status = gnutls_certificate_verify_peers (session);
-+  int status, verify_ret;
-+  verify_ret = gnutls_certificate_verify_peers2 (session, &status);
-+  if (!verify_ret)
-+    return status;
- 
-   if (status == GNUTLS_E_NO_CERTIFICATE_FOUND)
-     {
diff --git a/mail-filter/anubis/files/4.1.1-gpgme.patch b/mail-filter/anubis/files/4.1.1-gpgme.patch
deleted file mode 100644
index 7aa8ba578eec..000000000000
--- a/mail-filter/anubis/files/4.1.1-gpgme.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.ac	2011-06-13 19:40:37.856822010 +0300
-+++ configure.ac	2011-06-13 19:43:27.000000000 +0300
-@@ -149,10 +149,18 @@
-    AC_MSG_CHECKING(for $1/include/gpgme.h)
-    AC_MSG_RESULT([yes])
-    return 0
-+  else
-+   if test -f "$1/include/gpgme/gpgme.h"; then
-+    gpgmedir=1
-+    INCLUDES="$INCLUDES -I$1/include/gpgme"
-+    AC_MSG_CHECKING(for $1/include/gpgme/gpgme.h)
-+    AC_MSG_RESULT([yes])
-+    return 0
-+   fi
-   fi
-   return 1
-  }
-- for maindir in /usr/pkg /opt /sw; do
-+ for maindir in /usr/pkg /opt /sw /usr; do
-   findgpgmedir $maindir && break 2
-  done
-  if test $gpgmedir; then
---- configure.ac	2011-06-17 11:54:29.000000000 +0000
-+++ configure.ac	2011-06-17 11:56:22.000000000 +0000
-@@ -137,6 +137,7 @@
- else
-  AM_PATH_GPGME([1.0.0], with_gpgme=yes, with_gpgme=no)
-  AC_CHECK_LIB(gpgme, main,, with_gpgme=no)
-+ AC_CHECK_LIB(gpg-error, gpg_err_init,, with_gpgme=no)
- fi
- if test "$with_gpgme" = "no"; then
-  AC_MSG_RESULT([Disabling GPGME support...])
diff --git a/mail-filter/anubis/files/4.1.1-testsuite.patch b/mail-filter/anubis/files/4.1.1-testsuite.patch
deleted file mode 100644
index 5b1c656fa0af..000000000000
--- a/mail-filter/anubis/files/4.1.1-testsuite.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- testsuite/data/Makefile.am	2011-06-13 14:29:38.843665225 +0300
-+++ testsuite/data/Makefile.am	2011-06-13 14:31:16.000000000 +0300
-@@ -22,8 +22,10 @@
- EXTRA_DIST = pubring.asc secring.asc anubis.pem append.txt users
- CLEANFILES = *.gpg random_seed *~ text.db
- 
--pubring.gpg secring.gpg: $(srcdir)/pubring.asc $(srcdir)/secring.asc
-+pubring.gpg: $(srcdir)/pubring.asc
- 	$(GPG) --homedir . --import < $(srcdir)/pubring.asc
-+
-+secring.gpg: $(srcdir)/secring.asc
- 	$(GPG) --homedir . --allow-secret-key-import --import < $(srcdir)/secring.asc
- 
- text.db: $(srcdir)/users
diff --git a/mail-filter/anubis/files/anubis-4.2-gdbm.patch b/mail-filter/anubis/files/anubis-4.2-gdbm.patch
deleted file mode 100644
index 5c54560ff940..000000000000
--- a/mail-filter/anubis/files/anubis-4.2-gdbm.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aurN a/src/gdbm.c b/src/gdbm.c
---- a/src/gdbm.c	2014-05-22 01:39:58.000000000 -0400
-+++ b/src/gdbm.c	2019-02-12 13:29:39.270414662 -0500
-@@ -209,7 +209,7 @@
- }
- 
- const char *
--gdbm_db_strerror (void *d, int rc)
-+anubis_gdbm_db_strerror (void *d, int rc)
- {
-   return gdbm_strerror (rc);
- }
-@@ -222,7 +222,7 @@
- 		      gdbm_db_close,
- 		      gdbm_db_get,
- 		      gdbm_db_put,
--		      gdbm_db_delete, gdbm_db_list, gdbm_db_strerror);
-+		      gdbm_db_delete, gdbm_db_list, anubis_gdbm_db_strerror);
- }
- 
- #endif /* HAVE_LIBGDBM */
diff --git a/mail-filter/anubis/metadata.xml b/mail-filter/anubis/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/mail-filter/anubis/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index cf6507c6a231..0c33fcf29c5b 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index f59902974d61..4e778953455c 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -22,7 +22,7 @@ DIST exim-4.92.tar.xz 1767136 BLAKE2B 6c97578807073a782112218c65de460cc94f046d80
 DIST exim-pdf-4.92.1.tar.xz 2038948 BLAKE2B 6624fb8930944f79e0c7e52a001727cfcff508ac69cb4107247201b8598d6e223cac7c7eda14c3102d0eabc151a547b6cc5ef11a6c4a830f31dfd88e24907c1d SHA512 437b868cd7dedae59e32b9245c8c1ca3375605eb4911846bc3508b627acf32c99bda644b3c3e84eb539a39b3c2cc4f83314eebe55160b3da617ccaec2f1623a2
 DIST exim-pdf-4.92.tar.xz 2038812 BLAKE2B d5966a27f980a2ceb31293d92049a6691a08262bd20ae7315f41929f0d7a45b5d66c7000f9596b193e74d0c17f91c56a3262602047673c49649f1cad6b216547 SHA512 3a40818025fceaa7ac17f8e7ce06a61e3cf65267c821aea93e1a1a659782b047ab177b88a38c9b2271c0a296e1dc7939e23fe0f89415a11cd45693cb8af10c15
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.92-r2.ebuild 13521 BLAKE2B 46c96a9b259e46d838c6809a60f3846ddce7156712caae4715d9c2ff0917266b502de4a10c0e8a342e839041fd18293c3410d93c40335a86f5c67923bdfa821b SHA512 e51b3108b802a882c9523e30d40b3358de1185333629bbe1fdbfccedda8ed86d3b4e92df2a526b717c69094b2cd5665271a4ae32b79ed62549e2a804e0c60c99
-EBUILD exim-4.92.1.ebuild 13529 BLAKE2B e0232142fc1a3706abcc243f5faebabee2311d8721a2e946523c58091968c9c3b525e7e62eeb89a012ada285600845f5893eb2f2061a05eb9df3a541fc1ffeb4 SHA512 bab630b31bbe51d191311bde0aef9fee9041b3b23d0ea226ed1f711f6bf2830e6eff04f745d37839b825dfad3e3976266bea9d42ea0b25c23bff34c32cfd59dc
-EBUILD exim-4.92.ebuild 13221 BLAKE2B 1f4ade06d4aee9795a0c1647796fb2976f35f8fd2c2f2c320b03c570cc46b41b09184f0dde19a4cec887a98b20a375f2b11472dee4bc08ee18e91d40b4a97e4d SHA512 b02c7dd557552755d9484fb892bccca708208cb99a6c5e534f1cfc0ec1c9a44230dfb4aeb0548c88171a4d72b67d72c1e26289096c627060b7b79dec0831cdb8
+EBUILD exim-4.92-r3.ebuild 13225 BLAKE2B 3ffd746469baaaaa28f0f82246adf6aae895b4ccd50ea01831a2303dd17874d2aa700306345827e37facf44772d7f6bc4fc19d8cd521a46cbbbb97c993adf3ea SHA512 2f638601cad3cfa2b7bfab588ffe2ba03cf35cd3b1d0511ba60cd67327f8d5ad98939c81784058799253602e72fb17ea11237e1638f2da7b2f9efaddac361c90
+EBUILD exim-4.92-r4.ebuild 13525 BLAKE2B 402675112b870144268e9be64b82fe691dfe9547fbc47442748949e6a9ab9e74a4133224913de5888098c346755ff0fe6d783cfb971ce991af9d550fdcf74d0b SHA512 6653b2746ec357e2def6121116a4d5575ba8652bd92524f54073c3930e45b1d284e71781985e0acd06a69b7002f679b1c7bf1f45fb96b37caaaf09583626e560
+EBUILD exim-4.92.1-r1.ebuild 13533 BLAKE2B d3c0b9419bf863bc12cd3bcee53f8680bceaedebb4696b75f8467ebc3814046b3c84256ef38d6299ab2247cd447c5af51f52b1b416ea87540582a13ff4ea925e SHA512 018c5a14cf2425fe98ad136c81d2f4f83dccc517efc16aa6ff53691b3b73833491a8ead9eb03d45688e78317e043f439fba92e0f19f500b428e56aa8df281356
 MISC metadata.xml 2457 BLAKE2B c1dcbaedd069b41c4cfb190806b44014229d53cf6d6f72e04b99dc91f223567cb4f30100792aae72658780da0579fa26e6fb8a0266565bcc0c307996d59ac3ed SHA512 9044abccd15525c7676fc218b62d9b663bd155482894eced9c0cfc8a22e8cd7353009adc75a9f3de15b14f267e6ee6b4f4c91d8bd9260931c0b9de6bf48c762f
diff --git a/mail-mta/exim/exim-4.92-r2.ebuild b/mail-mta/exim/exim-4.92-r2.ebuild
deleted file mode 100644
index d6949b4d5eb3..000000000000
--- a/mail-mta/exim/exim-4.92-r2.ebuild
+++ /dev/null
@@ -1,578 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit db-use eutils toolchain-funcs multilib pam systemd
-
-IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X"
-REQUIRED_USE="
-	arc? ( dkim spf )
-	dane? ( ssl !gnutls )
-	dmarc? ( dkim spf )
-	gnutls? ( ssl )
-	pkcs11? ( ssl )
-	spf? ( exiscan-acl )
-	srs? ( exiscan-acl )
-	!ssl? ( !dkim )
-"
-# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
-# for x86 and amd64 only, due to this, repoman won't allow depending on
-# gnutls[dane] for all else.  Because we cannot express USE=dane when
-# USE=gnutls is in effect only in package.use.mask, the only option we
-# have left is to a) ignore the dependency (but that results in bug
-# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
-# incorrect, but b) is the only "correct" view from repoman.
-
-COMM_URI="https://downloads.exim.org/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
-	mirror://gentoo/system_filter.exim.gz
-	doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
-	dev-libs/libpcre
-	idn? ( net-dns/libidn:= net-dns/libidn2:= )
-	perl? ( dev-lang/perl:= )
-	pam? ( virtual/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	gnutls? (
-		net-libs/gnutls:0=[pkcs11?]
-		dev-libs/libtasn1
-	)
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	nis? (
-		elibc_glibc? (
-			net-libs/libtirpc
-			>=net-libs/libnsl-1:=
-		)
-	)
-	mysql? ( virtual/libmysqlclient )
-	postgres? ( dev-db/postgresql:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
-	redis? ( dev-libs/hiredis )
-	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
-	dmarc? ( mail-filter/opendmarc )
-	srs? ( mail-filter/libsrs_alt )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-libs/libXaw
-	)
-	sqlite? ( dev-db/sqlite )
-	radius? ( net-dialup/freeradius-client )
-	virtual/libiconv
-	elibc_glibc? ( net-libs/libnsl )
-	"
-	# added X check for #57206
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/mini-qmail
-	!<mail-mta/msmtp-1.4.19-r1
-	!>=mail-mta/msmtp-1.4.19-r1[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5
-	virtual/logger
-	dcc? ( mail-filter/dcc )
-	selinux? ( sec-policy/selinux-exim )
-	"
-
-S=${WORKDIR}/${P//rc/RC}
-
-src_prepare() {
-	epatch "${FILESDIR}"/exim-4.14-tail.patch
-	epatch "${FILESDIR}"/exim-4.92-localscan_dlopen.patch
-	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
-	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
-	epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
-	epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279
-	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-	epatch "${FILESDIR}"/exim-4.92-fix-eval-expansion-32bit.patch #687554
-
-	if use maildir ; then
-		epatch "${FILESDIR}"/exim-4.20-maildir.patch
-	else
-		epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
-	fi
-
-	eapply_user
-
-	# user Exim believes it should be
-	MAILUSER=mail
-	MAILGROUP=mail
-	if use prefix && [[ ${EUID} != 0 ]] ; then
-		MAILUSER=$(id -un)
-		MAILGROUP=$(id -gn)
-	fi
-}
-
-src_configure() {
-	# general config and paths
-
-	local aliases="${EPREFIX}/etc/mail/aliases"
-	sed -i \
-		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
-		src/configure.default || die
-
-	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
-
-	if use elibc_musl; then
-		sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
-	fi
-
-	local conffile="${EPREFIX}/etc/exim/exim.conf"
-	sed -e "48i\CFLAGS=${CFLAGS}" \
-		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-		-e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
-		-e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
-		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
-		src/EDITME > Local/Makefile || die
-
-	# work on Local/Makefile from now on
-	cd Local
-
-	cat >> Makefile <<- EOC
-		INFO_DIRECTORY=${EPREFIX}/usr/share/info
-		PID_FILE_PATH=${EPREFIX}/run/exim.pid
-		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
-		HAVE_ICONV=yes
-	EOC
-
-	# if we use libiconv, now is the time to tell so
-	use !elibc_glibc && use !elibc_musl && \
-		echo "EXTRALIBS_EXIM=-liconv" >> Makefile
-
-	# support for IPv6
-	if use ipv6; then
-		cat >> Makefile <<- EOC
-			HAVE_IPV6=YES
-		EOC
-	fi
-
-	# support i18n/IDNA
-	if use idn; then
-		cat >> Makefile <<- EOC
-			SUPPORT_I18N=yes
-			SUPPORT_I18N_2008=yes
-			EXTRALIBS_EXIM += -lidn -lidn2
-		EOC
-	fi
-
-	#
-	# mail storage formats
-	#
-
-	# mailstore is Exim's traditional storage format
-	cat >> Makefile <<- EOC
-		SUPPORT_MAILSTORE=yes
-	EOC
-
-	# mbox
-	if use mbx; then
-		cat >> Makefile <<- EOC
-			SUPPORT_MBX=yes
-		EOC
-	fi
-
-	# maildir
-	if use maildir; then
-		cat >> Makefile <<- EOC
-			SUPPORT_MAILDIR=yes
-		EOC
-	fi
-
-	#
-	# lookup methods
-
-	# use the "native" interfaces to the DBM and CDB libraries, support
-	# passwd and directory lookups by default
-	local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
-	cat >> Makefile <<- EOC
-		USE_DB=yes
-		CFLAGS+=-I$(db_includedir ${DB_VERS})
-		DBMLIB=-l$(db_libname ${DB_VERS})
-		LOOKUP_CDB=yes
-		LOOKUP_PASSWD=yes
-		LOOKUP_DSEARCH=yes
-	EOC
-
-	if ! use dnsdb; then
-		# DNSDB lookup is enabled by default
-		sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die
-	fi
-
-	if use ldap; then
-		cat >> Makefile <<- EOC
-			LOOKUP_LDAP=yes
-			LDAP_LIB_TYPE=OPENLDAP2
-			LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
-			LOOKUP_LIBS += -lldap -llber
-		EOC
-	fi
-
-	if use mysql; then
-		cat >> Makefile <<- EOC
-			LOOKUP_MYSQL=yes
-			LOOKUP_INCLUDE += $(mysql_config --include)
-			LOOKUP_LIBS += $(mysql_config --libs)
-		EOC
-	fi
-
-	if use nis; then
-		cat >> Makefile <<- EOC
-			LOOKUP_NIS=yes
-			LOOKUP_NISPLUS=yes
-		EOC
-		if use elibc_glibc ; then
-			cat >> Makefile <<- EOC
-				CFLAGS += -I"${EPREFIX}"/usr/include/tirpc
-			EOC
-		fi
-	fi
-
-	if use postgres; then
-		cat >> Makefile <<- EOC
-			LOOKUP_PGSQL=yes
-			LOOKUP_INCLUDE += -I$(pg_config --includedir)
-			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
-		EOC
-	fi
-
-	if use sqlite; then
-		cat >> Makefile <<- EOC
-			LOOKUP_SQLITE=yes
-			LOOKUP_SQLITE_PC=sqlite3
-		EOC
-	fi
-
-	if use redis; then
-		cat >> Makefile <<- EOC
-			LOOKUP_REDIS=yes
-			LOOKUP_LIBS += -lhiredis
-		EOC
-	fi
-
-	# Exim monitor, enabled by default, controlled via X USE-flag,
-	# disable if not requested, bug #46778
-	if use X; then
-		cp ../exim_monitor/EDITME eximon.conf || die
-	else
-		sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile || die
-	fi
-
-	#
-	# features
-	#
-
-	# content scanning support
-	if use exiscan-acl; then
-		cat >> Makefile <<- EOC
-			WITH_CONTENT_SCAN=yes
-		EOC
-	fi
-
-	# DomainKeys Identified Mail, RFC4871
-	if ! use dkim; then
-		# DKIM is enabled by default
-		cat >> Makefile <<- EOC
-			DISABLE_DKIM=yes
-		EOC
-	fi
-
-	# Per-Recipient-Data-Response
-	if ! use prdr; then
-		# PRDR is enabled by default
-		cat >> Makefile <<- EOC
-			DISABLE_PRDR=yes
-		EOC
-	fi
-
-	# Transport post-delivery actions
-	if use !tpda && use !dane; then
-		# EVENT is enabled by default
-		cat >> Makefile <<- EOC
-			DISABLE_EVENT=yes
-		EOC
-	fi
-
-	# log to syslog
-	if use syslog; then
-		local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
-		sed -i \
-			-e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
-			Makefile || die
-		cat >> Makefile <<- EOC
-			LOG_FILE_PATH=syslog
-		EOC
-	else
-		cat >> Makefile <<- EOC
-			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
-		EOC
-	fi
-
-	# starttls support (ssl)
-	if use ssl; then
-		echo "SUPPORT_TLS=yes" >> Makefile
-		if use gnutls; then
-			echo "USE_GNUTLS=yes" >> Makefile
-			echo "USE_GNUTLS_PC=gnutls" >> Makefile
-			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
-		else
-			echo "USE_OPENSSL_PC=openssl" >> Makefile
-		fi
-	fi
-
-	# TCP wrappers
-	if use tcpd; then
-		cat >> Makefile <<- EOC
-			USE_TCP_WRAPPERS=yes
-			EXTRALIBS_EXIM += -lwrap
-		EOC
-	fi
-
-	# Light Mail Transport Protocol
-	if use lmtp; then
-		cat >> Makefile <<- EOC
-			TRANSPORT_LMTP=yes
-		EOC
-	fi
-
-	# embedded Perl
-	if use perl; then
-		cat >> Makefile <<- EOC
-			EXIM_PERL=perl.o
-		EOC
-	fi
-
-	# dlfunc
-	if use dlfunc; then
-		cat >> Makefile <<- EOC
-			EXPAND_DLFUNC=yes
-			HAVE_LOCAL_SCAN=yes
-			DLOPEN_LOCAL_SCAN=yes
-		EOC
-	fi
-
-	# Proxy Protocol
-	if use proxy; then
-		cat >> Makefile <<- EOC
-			SUPPORT_PROXY=yes
-		EOC
-	fi
-
-	# DANE
-	if use dane; then
-		cat >> Makefile <<- EOC
-			SUPPORT_DANE=yes
-		EOC
-	fi
-
-	# Sender Policy Framework
-	if use spf; then
-		cat >> Makefile <<- EOC
-			SUPPORT_SPF=yes
-			EXTRALIBS_EXIM += -lspf2
-		EOC
-	fi
-
-	#
-	# experimental features
-	#
-
-	# Authenticated Receive Chain
-	if use arc; then
-		echo "EXPERIMENTAL_ARC=yes">> Makefile
-	fi
-
-	# Distributed Checksum Clearinghouse
-	if use dcc; then
-		echo "EXPERIMENTAL_DCC=yes">> Makefile
-	fi
-
-	# Sender Rewriting Scheme
-	if use srs; then
-		cat >> Makefile <<- EOC
-			EXPERIMENTAL_SRS=yes
-			EXTRALIBS_EXIM += -lsrs_alt
-		EOC
-	fi
-
-	# DMARC
-	if use dmarc; then
-		cat >> Makefile <<- EOC
-			EXPERIMENTAL_DMARC=yes
-			EXTRALIBS_EXIM += -lopendmarc
-		EOC
-	fi
-
-	# Delivery Sender Notifications extra information in fail message
-	if use dsn; then
-		cat >> Makefile <<- EOC
-			EXPERIMENTAL_DSN_INFO=yes
-		EOC
-	fi
-
-	#
-	# authentication (SMTP AUTH)
-	#
-
-	# standard bits
-	cat >> Makefile <<- EOC
-		AUTH_SPA=yes
-		AUTH_CRAM_MD5=yes
-		AUTH_PLAINTEXT=yes
-	EOC
-
-	# Cyrus SASL
-	if use sasl; then
-		cat >> Makefile <<- EOC
-			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
-			AUTH_CYRUS_SASL=yes
-			AUTH_LIBS += -lsasl2
-		EOC
-	fi
-
-	# Dovecot
-	if use dovecot-sasl; then
-		cat >> Makefile <<- EOC
-			AUTH_DOVECOT=yes
-		EOC
-	fi
-
-	# Pluggable Authentication Modules
-	if use pam; then
-		cat >> Makefile <<- EOC
-			SUPPORT_PAM=yes
-			AUTH_LIBS += -lpam
-		EOC
-	fi
-
-	# Radius
-	if use radius; then
-		cat >> Makefile <<- EOC
-			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
-			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
-			AUTH_LIBS += -lfreeradius-client
-		EOC
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
-		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
-		|| die "make failed"
-}
-
-src_install () {
-	cd "${S}"/build-exim-gentoo || die
-	dosbin exim
-	if use X; then
-		dosbin eximon.bin
-		dosbin eximon
-	fi
-	fperms 4755 /usr/sbin/exim
-
-	dosym exim /usr/sbin/sendmail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym ../sbin/exim /usr/bin/mailq
-	dosym ../sbin/exim /usr/bin/newaliases
-	dosym ../sbin/sendmail /usr/lib/sendmail
-
-	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
-		convert4r3 convert4r4 exipick
-	do
-		dosbin $i
-	done
-
-	dodoc "${S}"/doc/*
-	doman "${S}"/doc/exim.8
-	use dsn && dodoc "${S}"/README.DSN
-	use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
-
-	# conf files
-	insinto /etc/exim
-	newins "${S}"/src/configure.default exim.conf.dist
-	if use exiscan-acl; then
-		newins "${S}"/src/configure.default exim.conf.exiscan-acl
-	fi
-	doins "${WORKDIR}"/system_filter.exim
-	doins "${FILESDIR}"/auth_conf.sub
-
-	pamd_mimic system-auth exim auth account
-
-	# headers, #436406
-	if use dlfunc ; then
-		# fixup includes so they actually can be found when including
-		sed -i \
-			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
-			local_scan.h || die
-		insinto /usr/include/exim
-		doins {config,local_scan}.h ../src/{mytypes,store}.h
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/exim.logrotate" exim
-
-	newinitd "${FILESDIR}"/exim.rc10 exim
-	newconfd "${FILESDIR}"/exim.confd exim
-
-	systemd_dounit \
-		"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
-	systemd_newunit \
-		"${FILESDIR}"/exim_at.service 'exim@.service'
-	systemd_newunit \
-		"${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
-
-	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
-	keepdir /var/log/${PN}
-}
-
-pkg_postinst() {
-	if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then
-		einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
-		einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub"
-		einfo "for using smtp auth."
-		einfo "Please create ${EROOT}etc/exim/exim.conf from"
-		einfo "  ${EROOT}etc/exim/exim.conf.dist."
-	fi
-	if use dcc ; then
-		einfo "DCC support is experimental, you can find some limited"
-		einfo "documentation at the bottom of this prerelease message:"
-		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
-	fi
-	use srs && einfo "SRS support is experimental"
-	if use dmarc ; then
-		einfo "DMARC support is experimental.  See global settings to"
-		einfo "configure DMARC, for usage see the documentation at "
-		einfo "experimental-spec.txt."
-	fi
-	use dsn && einfo "extra information in fail DSN message is experimental"
-	elog "The obsolete acl condition 'demime' is removed, the replacements"
-	elog "are the ACLs acl_smtp_mime and acl_not_smtp_mime"
-}
diff --git a/mail-mta/exim/exim-4.92-r3.ebuild b/mail-mta/exim/exim-4.92-r3.ebuild
new file mode 100644
index 000000000000..90a6e8765fab
--- /dev/null
+++ b/mail-mta/exim/exim-4.92-r3.ebuild
@@ -0,0 +1,563 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit db-use eutils toolchain-funcs multilib pam systemd
+
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X"
+REQUIRED_USE="
+	arc? ( dkim spf )
+	dane? ( ssl !gnutls )
+	dmarc? ( dkim spf )
+	gnutls? ( ssl )
+	pkcs11? ( ssl )
+	spf? ( exiscan-acl )
+	srs? ( exiscan-acl )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
+# incorrect, but b) is the only "correct" view from repoman.
+
+COMM_URI="https://downloads.exim.org/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
+	mirror://gentoo/system_filter.exim.gz
+	doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
+HOMEPAGE="http://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
+	dev-libs/libpcre
+	idn? ( net-dns/libidn:= net-dns/libidn2:= )
+	perl? ( dev-lang/perl:= )
+	pam? ( virtual/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	gnutls? (
+		net-libs/gnutls:0=[pkcs11?]
+		dev-libs/libtasn1
+	)
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	nis? (
+		elibc_glibc? (
+			net-libs/libtirpc
+			>=net-libs/libnsl-1:=
+		)
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+	redis? ( dev-libs/hiredis )
+	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+	dmarc? ( mail-filter/opendmarc )
+	srs? ( mail-filter/libsrs_alt )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+	)
+	sqlite? ( dev-db/sqlite )
+	radius? ( net-dialup/freeradius-client )
+	virtual/libiconv
+	elibc_glibc? ( net-libs/libnsl )
+	"
+	# added X check for #57206
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/mini-qmail
+	!<mail-mta/msmtp-1.4.19-r1
+	!>=mail-mta/msmtp-1.4.19-r1[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/mailwrapper
+	>=net-mail/mailbase-0.00-r5
+	virtual/logger
+	dcc? ( mail-filter/dcc )
+	selinux? ( sec-policy/selinux-exim )
+	"
+
+S=${WORKDIR}/${P//rc/RC}
+
+src_prepare() {
+	epatch "${FILESDIR}"/exim-4.14-tail.patch
+	epatch "${FILESDIR}"/exim-4.92-localscan_dlopen.patch
+	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
+	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+	epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
+	epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279
+	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+
+	if use maildir ; then
+		epatch "${FILESDIR}"/exim-4.20-maildir.patch
+	else
+		epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+	fi
+
+	eapply_user
+
+	# user Exim believes it should be
+	MAILUSER=mail
+	MAILGROUP=mail
+	if use prefix && [[ ${EUID} != 0 ]] ; then
+		MAILUSER=$(id -un)
+		MAILGROUP=$(id -gn)
+	fi
+}
+
+src_configure() {
+	# general config and paths
+
+	sed -i.orig \
+		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" \
+		"${S}"/src/configure.default || die
+
+	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile || die
+
+	sed -e "48i\CFLAGS=${CFLAGS}" \
+		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
+		-e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
+		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:" \
+		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
+		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
+		src/EDITME > Local/Makefile
+
+	if use elibc_musl; then
+		sed -e 's/^LIBS = -lnsl/LIBS =/g' \
+		-i OS/Makefile-Linux
+	fi
+
+	cd Local
+
+	cat >> Makefile <<- EOC
+		INFO_DIRECTORY=${EPREFIX}/usr/share/info
+		PID_FILE_PATH=${EPREFIX}/run/exim.pid
+		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
+		HAVE_ICONV=yes
+	EOC
+
+	# if we use libiconv, now is the time to tell so
+	use !elibc_glibc && use !elibc_musl && \
+		echo "EXTRALIBS_EXIM=-liconv" >> Makefile
+
+	# support for IPv6
+	if use ipv6; then
+		cat >> Makefile <<- EOC
+			HAVE_IPV6=YES
+		EOC
+	fi
+
+	# support i18n/IDNA
+	if use idn; then
+		cat >> Makefile <<- EOC
+			SUPPORT_I18N=yes
+			SUPPORT_I18N_2008=yes
+			EXTRALIBS_EXIM += -lidn -lidn2
+		EOC
+	fi
+
+	#
+	# mail storage formats
+
+	# mailstore is Exim's traditional storage format
+	cat >> Makefile <<- EOC
+		SUPPORT_MAILSTORE=yes
+	EOC
+
+	# mbox
+	if use mbx; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MBX=yes
+		EOC
+	fi
+
+	# maildir
+	if use maildir; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MAILDIR=yes
+		EOC
+	fi
+
+	#
+	# lookup methods
+
+	# use the "native" interfaces to the DBM and CDB libraries, support
+	# passwd and directory lookups by default
+	local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
+	cat >> Makefile <<- EOC
+		USE_DB=yes
+		CFLAGS+=-I$(db_includedir ${DB_VERS})
+		DBMLIB=-l$(db_libname ${DB_VERS})
+		LOOKUP_CDB=yes
+		LOOKUP_PASSWD=yes
+		LOOKUP_DSEARCH=yes
+	EOC
+
+	if ! use dnsdb; then
+		# DNSDB lookup is enabled by default
+		sed -i "s:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:" Makefile
+	fi
+
+	if use ldap; then
+		cat >> Makefile <<- EOC
+			LOOKUP_LDAP=yes
+			LDAP_LIB_TYPE=OPENLDAP2
+			LOOKUP_INCLUDE += -I"${EROOT}"usr/include/ldap
+			LOOKUP_LIBS += -lldap -llber
+		EOC
+	fi
+
+	if use mysql; then
+		cat >> Makefile <<- EOC
+			LOOKUP_MYSQL=yes
+			LOOKUP_INCLUDE += $(mysql_config --include)
+			LOOKUP_LIBS += $(mysql_config --libs)
+		EOC
+	fi
+
+	if use nis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_NIS=yes
+			LOOKUP_NISPLUS=yes
+		EOC
+		if use elibc_glibc ; then
+			cat >> Makefile <<- EOC
+				CFLAGS += -I/usr/include/tirpc
+			EOC
+		fi
+	fi
+
+	if use postgres; then
+		cat >> Makefile <<- EOC
+			LOOKUP_PGSQL=yes
+			LOOKUP_INCLUDE += -I$(pg_config --includedir)
+			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
+		EOC
+	fi
+
+	if use sqlite; then
+		cat >> Makefile <<- EOC
+			LOOKUP_SQLITE=yes
+			LOOKUP_SQLITE_PC=sqlite3
+		EOC
+	fi
+
+	if use redis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_REDIS=yes
+			LOOKUP_LIBS += -lhiredis
+		EOC
+	fi
+
+	#
+	# Exim monitor, enabled by default, controlled via X USE-flag,
+	# disable if not requested, bug #46778
+	if use X; then
+		cp ../exim_monitor/EDITME eximon.conf || die
+	else
+		sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile
+	fi
+
+	#
+	# features
+
+	# content scanning support
+	if use exiscan-acl; then
+		cat >> Makefile <<- EOC
+			WITH_CONTENT_SCAN=yes
+		EOC
+	fi
+
+	# DomainKeys Identified Mail, RFC4871
+	if ! use dkim; then
+		# DKIM is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_DKIM=yes
+		EOC
+	fi
+
+	# Per-Recipient-Data-Response
+	if ! use prdr; then
+		# PRDR is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_PRDR=yes
+		EOC
+	fi
+
+	# Transport post-delivery actions
+	if use !tpda && use !dane; then
+		# EVENT is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_EVENT=yes
+		EOC
+	fi
+
+	# log to syslog
+	if use syslog; then
+		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=syslog
+		EOC
+	else
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
+		EOC
+	fi
+
+	# starttls support (ssl)
+	if use ssl; then
+		echo "SUPPORT_TLS=yes" >> Makefile
+		if use gnutls; then
+			echo "USE_GNUTLS=yes" >> Makefile
+			echo "USE_GNUTLS_PC=gnutls" >> Makefile
+			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
+		else
+			echo "USE_OPENSSL_PC=openssl" >> Makefile
+		fi
+	fi
+
+	# TCP wrappers
+	if use tcpd; then
+		cat >> Makefile <<- EOC
+			USE_TCP_WRAPPERS=yes
+			EXTRALIBS_EXIM += -lwrap
+		EOC
+	fi
+
+	# Light Mail Transport Protocol
+	if use lmtp; then
+		cat >> Makefile <<- EOC
+			TRANSPORT_LMTP=yes
+		EOC
+	fi
+
+	# embedded Perl
+	if use perl; then
+		cat >> Makefile <<- EOC
+			EXIM_PERL=perl.o
+		EOC
+	fi
+
+	# dlfunc
+	if use dlfunc; then
+		cat >> Makefile <<- EOC
+			EXPAND_DLFUNC=yes
+			HAVE_LOCAL_SCAN=yes
+			DLOPEN_LOCAL_SCAN=yes
+		EOC
+	fi
+
+	# Proxy Protocol
+	if use proxy; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PROXY=yes
+		EOC
+	fi
+
+	# DANE
+	if use dane; then
+		cat >> Makefile <<- EOC
+			SUPPORT_DANE=yes
+		EOC
+	fi
+
+	# Sender Policy Framework
+	if use spf; then
+		cat >> Makefile <<- EOC
+			SUPPORT_SPF=yes
+			EXTRALIBS_EXIM += -lspf2
+		EOC
+	fi
+
+	#
+	# experimental features
+
+	# Authenticated Receive Chain
+	if use arc; then
+		echo "EXPERIMENTAL_ARC=yes">> Makefile
+	fi
+
+	# Distributed Checksum Clearinghouse
+	if use dcc; then
+		echo "EXPERIMENTAL_DCC=yes">> Makefile
+	fi
+
+	# Sender Rewriting Scheme
+	if use srs; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_SRS=yes
+			EXTRALIBS_EXIM += -lsrs_alt
+		EOC
+	fi
+
+	# DMARC
+	if use dmarc; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DMARC=yes
+			EXTRALIBS_EXIM += -lopendmarc
+		EOC
+	fi
+
+	# Delivery Sender Notifications extra information in fail message
+	if use dsn; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DSN_INFO=yes
+		EOC
+	fi
+
+	#
+	# authentication (SMTP AUTH)
+
+	# standard bits
+	cat >> Makefile <<- EOC
+		AUTH_SPA=yes
+		AUTH_CRAM_MD5=yes
+		AUTH_PLAINTEXT=yes
+	EOC
+
+	# Cyrus SASL
+	if use sasl; then
+		cat >> Makefile <<- EOC
+			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
+			AUTH_CYRUS_SASL=yes
+			AUTH_LIBS += -lsasl2
+		EOC
+	fi
+
+	# Dovecot
+	if use dovecot-sasl; then
+		cat >> Makefile <<- EOC
+			AUTH_DOVECOT=yes
+		EOC
+	fi
+
+	# Pluggable Authentication Modules
+	if use pam; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PAM=yes
+			AUTH_LIBS += -lpam
+		EOC
+	fi
+
+	# Radius
+	if use radius; then
+		cat >> Makefile <<- EOC
+			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
+			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
+			AUTH_LIBS += -lfreeradius-client
+		EOC
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
+		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
+		|| die "make failed"
+}
+
+src_install () {
+	cd "${S}"/build-exim-gentoo || die
+	dosbin exim
+	if use X; then
+		dosbin eximon.bin
+		dosbin eximon
+	fi
+	fperms 4755 /usr/sbin/exim
+
+	dosym exim /usr/sbin/sendmail
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	dosym ../sbin/sendmail /usr/lib/sendmail
+
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+		convert4r3 convert4r4 exipick
+	do
+		dosbin $i
+	done
+
+	dodoc "${S}"/doc/*
+	doman "${S}"/doc/exim.8
+	use dsn && dodoc "${S}"/README.DSN
+	use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
+
+	# conf files
+	insinto /etc/exim
+	newins "${S}"/src/configure.default exim.conf.dist
+	if use exiscan-acl; then
+		newins "${S}"/src/configure.default exim.conf.exiscan-acl
+	fi
+	doins "${WORKDIR}"/system_filter.exim
+	doins "${FILESDIR}"/auth_conf.sub
+
+	pamd_mimic system-auth exim auth account
+
+	# headers, #436406
+	if use dlfunc ; then
+		# fixup includes so they actually can be found when including
+		sed -i \
+			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
+			local_scan.h || die
+		insinto /usr/include/exim
+		doins {config,local_scan}.h ../src/{mytypes,store}.h
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/exim.logrotate" exim
+
+	newinitd "${FILESDIR}"/exim.rc10 exim
+	newconfd "${FILESDIR}"/exim.confd exim
+
+	systemd_dounit "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
+	systemd_newunit "${FILESDIR}"/exim_at.service 'exim@.service'
+	systemd_newunit "${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
+
+	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
+	keepdir /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then
+		einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
+		einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
+		einfo "Please create ${EROOT}etc/exim/exim.conf from ${EROOT}etc/exim/exim.conf.dist."
+	fi
+	if use dcc ; then
+		einfo "DCC support is experimental, you can find some limited"
+		einfo "documentation at the bottom of this prerelease message:"
+		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
+	fi
+	use srs && einfo "SRS support is experimental"
+	if use dmarc ; then
+		einfo "DMARC support is experimental.  See global settings to"
+		einfo "configure DMARC, for usage see the documentation at "
+		einfo "experimental-spec.txt."
+	fi
+	use dsn && einfo "extra information in fail DSN message is experimental"
+	elog "The obsolete acl condition 'demime' is removed, the replacements"
+	elog "are the ACLs acl_smtp_mime and acl_not_smtp_mime"
+}
diff --git a/mail-mta/exim/exim-4.92-r4.ebuild b/mail-mta/exim/exim-4.92-r4.ebuild
new file mode 100644
index 000000000000..e63e0643c3e1
--- /dev/null
+++ b/mail-mta/exim/exim-4.92-r4.ebuild
@@ -0,0 +1,578 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit db-use eutils toolchain-funcs multilib pam systemd
+
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X"
+REQUIRED_USE="
+	arc? ( dkim spf )
+	dane? ( ssl !gnutls )
+	dmarc? ( dkim spf )
+	gnutls? ( ssl )
+	pkcs11? ( ssl )
+	spf? ( exiscan-acl )
+	srs? ( exiscan-acl )
+	!ssl? ( !dkim )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
+# incorrect, but b) is the only "correct" view from repoman.
+
+COMM_URI="https://downloads.exim.org/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
+	mirror://gentoo/system_filter.exim.gz
+	doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
+HOMEPAGE="http://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
+	dev-libs/libpcre
+	idn? ( net-dns/libidn:= net-dns/libidn2:= )
+	perl? ( dev-lang/perl:= )
+	pam? ( virtual/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	gnutls? (
+		net-libs/gnutls:0=[pkcs11?]
+		dev-libs/libtasn1
+	)
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	nis? (
+		elibc_glibc? (
+			net-libs/libtirpc
+			>=net-libs/libnsl-1:=
+		)
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+	redis? ( dev-libs/hiredis )
+	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+	dmarc? ( mail-filter/opendmarc )
+	srs? ( mail-filter/libsrs_alt )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+	)
+	sqlite? ( dev-db/sqlite )
+	radius? ( net-dialup/freeradius-client )
+	virtual/libiconv
+	elibc_glibc? ( net-libs/libnsl )
+	"
+	# added X check for #57206
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/mini-qmail
+	!<mail-mta/msmtp-1.4.19-r1
+	!>=mail-mta/msmtp-1.4.19-r1[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/mailwrapper
+	>=net-mail/mailbase-0.00-r5
+	virtual/logger
+	dcc? ( mail-filter/dcc )
+	selinux? ( sec-policy/selinux-exim )
+	"
+
+S=${WORKDIR}/${P//rc/RC}
+
+src_prepare() {
+	epatch "${FILESDIR}"/exim-4.14-tail.patch
+	epatch "${FILESDIR}"/exim-4.92-localscan_dlopen.patch
+	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
+	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+	epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
+	epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279
+	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+	epatch "${FILESDIR}"/exim-4.92-fix-eval-expansion-32bit.patch #687554
+
+	if use maildir ; then
+		epatch "${FILESDIR}"/exim-4.20-maildir.patch
+	else
+		epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+	fi
+
+	eapply_user
+
+	# user Exim believes it should be
+	MAILUSER=mail
+	MAILGROUP=mail
+	if use prefix && [[ ${EUID} != 0 ]] ; then
+		MAILUSER=$(id -un)
+		MAILGROUP=$(id -gn)
+	fi
+}
+
+src_configure() {
+	# general config and paths
+
+	local aliases="${EPREFIX}/etc/mail/aliases"
+	sed -i \
+		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
+		src/configure.default || die
+
+	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
+
+	if use elibc_musl; then
+		sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
+	fi
+
+	local conffile="${EPREFIX}/etc/exim/exim.conf"
+	sed -e "48i\CFLAGS=${CFLAGS}" \
+		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
+		-e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
+		-e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
+		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
+		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
+		src/EDITME > Local/Makefile || die
+
+	# work on Local/Makefile from now on
+	cd Local
+
+	cat >> Makefile <<- EOC
+		INFO_DIRECTORY=${EPREFIX}/usr/share/info
+		PID_FILE_PATH=${EPREFIX}/run/exim.pid
+		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
+		HAVE_ICONV=yes
+	EOC
+
+	# if we use libiconv, now is the time to tell so
+	use !elibc_glibc && use !elibc_musl && \
+		echo "EXTRALIBS_EXIM=-liconv" >> Makefile
+
+	# support for IPv6
+	if use ipv6; then
+		cat >> Makefile <<- EOC
+			HAVE_IPV6=YES
+		EOC
+	fi
+
+	# support i18n/IDNA
+	if use idn; then
+		cat >> Makefile <<- EOC
+			SUPPORT_I18N=yes
+			SUPPORT_I18N_2008=yes
+			EXTRALIBS_EXIM += -lidn -lidn2
+		EOC
+	fi
+
+	#
+	# mail storage formats
+	#
+
+	# mailstore is Exim's traditional storage format
+	cat >> Makefile <<- EOC
+		SUPPORT_MAILSTORE=yes
+	EOC
+
+	# mbox
+	if use mbx; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MBX=yes
+		EOC
+	fi
+
+	# maildir
+	if use maildir; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MAILDIR=yes
+		EOC
+	fi
+
+	#
+	# lookup methods
+
+	# use the "native" interfaces to the DBM and CDB libraries, support
+	# passwd and directory lookups by default
+	local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
+	cat >> Makefile <<- EOC
+		USE_DB=yes
+		CFLAGS+=-I$(db_includedir ${DB_VERS})
+		DBMLIB=-l$(db_libname ${DB_VERS})
+		LOOKUP_CDB=yes
+		LOOKUP_PASSWD=yes
+		LOOKUP_DSEARCH=yes
+	EOC
+
+	if ! use dnsdb; then
+		# DNSDB lookup is enabled by default
+		sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die
+	fi
+
+	if use ldap; then
+		cat >> Makefile <<- EOC
+			LOOKUP_LDAP=yes
+			LDAP_LIB_TYPE=OPENLDAP2
+			LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
+			LOOKUP_LIBS += -lldap -llber
+		EOC
+	fi
+
+	if use mysql; then
+		cat >> Makefile <<- EOC
+			LOOKUP_MYSQL=yes
+			LOOKUP_INCLUDE += $(mysql_config --include)
+			LOOKUP_LIBS += $(mysql_config --libs)
+		EOC
+	fi
+
+	if use nis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_NIS=yes
+			LOOKUP_NISPLUS=yes
+		EOC
+		if use elibc_glibc ; then
+			cat >> Makefile <<- EOC
+				CFLAGS += -I"${EPREFIX}"/usr/include/tirpc
+			EOC
+		fi
+	fi
+
+	if use postgres; then
+		cat >> Makefile <<- EOC
+			LOOKUP_PGSQL=yes
+			LOOKUP_INCLUDE += -I$(pg_config --includedir)
+			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
+		EOC
+	fi
+
+	if use sqlite; then
+		cat >> Makefile <<- EOC
+			LOOKUP_SQLITE=yes
+			LOOKUP_SQLITE_PC=sqlite3
+		EOC
+	fi
+
+	if use redis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_REDIS=yes
+			LOOKUP_LIBS += -lhiredis
+		EOC
+	fi
+
+	# Exim monitor, enabled by default, controlled via X USE-flag,
+	# disable if not requested, bug #46778
+	if use X; then
+		cp ../exim_monitor/EDITME eximon.conf || die
+	else
+		sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile || die
+	fi
+
+	#
+	# features
+	#
+
+	# content scanning support
+	if use exiscan-acl; then
+		cat >> Makefile <<- EOC
+			WITH_CONTENT_SCAN=yes
+		EOC
+	fi
+
+	# DomainKeys Identified Mail, RFC4871
+	if ! use dkim; then
+		# DKIM is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_DKIM=yes
+		EOC
+	fi
+
+	# Per-Recipient-Data-Response
+	if ! use prdr; then
+		# PRDR is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_PRDR=yes
+		EOC
+	fi
+
+	# Transport post-delivery actions
+	if use !tpda && use !dane; then
+		# EVENT is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_EVENT=yes
+		EOC
+	fi
+
+	# log to syslog
+	if use syslog; then
+		local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
+		sed -i \
+			-e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
+			Makefile || die
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=syslog
+		EOC
+	else
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
+		EOC
+	fi
+
+	# starttls support (ssl)
+	if use ssl; then
+		echo "SUPPORT_TLS=yes" >> Makefile
+		if use gnutls; then
+			echo "USE_GNUTLS=yes" >> Makefile
+			echo "USE_GNUTLS_PC=gnutls" >> Makefile
+			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
+		else
+			echo "USE_OPENSSL_PC=openssl" >> Makefile
+		fi
+	fi
+
+	# TCP wrappers
+	if use tcpd; then
+		cat >> Makefile <<- EOC
+			USE_TCP_WRAPPERS=yes
+			EXTRALIBS_EXIM += -lwrap
+		EOC
+	fi
+
+	# Light Mail Transport Protocol
+	if use lmtp; then
+		cat >> Makefile <<- EOC
+			TRANSPORT_LMTP=yes
+		EOC
+	fi
+
+	# embedded Perl
+	if use perl; then
+		cat >> Makefile <<- EOC
+			EXIM_PERL=perl.o
+		EOC
+	fi
+
+	# dlfunc
+	if use dlfunc; then
+		cat >> Makefile <<- EOC
+			EXPAND_DLFUNC=yes
+			HAVE_LOCAL_SCAN=yes
+			DLOPEN_LOCAL_SCAN=yes
+		EOC
+	fi
+
+	# Proxy Protocol
+	if use proxy; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PROXY=yes
+		EOC
+	fi
+
+	# DANE
+	if use dane; then
+		cat >> Makefile <<- EOC
+			SUPPORT_DANE=yes
+		EOC
+	fi
+
+	# Sender Policy Framework
+	if use spf; then
+		cat >> Makefile <<- EOC
+			SUPPORT_SPF=yes
+			EXTRALIBS_EXIM += -lspf2
+		EOC
+	fi
+
+	#
+	# experimental features
+	#
+
+	# Authenticated Receive Chain
+	if use arc; then
+		echo "EXPERIMENTAL_ARC=yes">> Makefile
+	fi
+
+	# Distributed Checksum Clearinghouse
+	if use dcc; then
+		echo "EXPERIMENTAL_DCC=yes">> Makefile
+	fi
+
+	# Sender Rewriting Scheme
+	if use srs; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_SRS=yes
+			EXTRALIBS_EXIM += -lsrs_alt
+		EOC
+	fi
+
+	# DMARC
+	if use dmarc; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DMARC=yes
+			EXTRALIBS_EXIM += -lopendmarc
+		EOC
+	fi
+
+	# Delivery Sender Notifications extra information in fail message
+	if use dsn; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DSN_INFO=yes
+		EOC
+	fi
+
+	#
+	# authentication (SMTP AUTH)
+	#
+
+	# standard bits
+	cat >> Makefile <<- EOC
+		AUTH_SPA=yes
+		AUTH_CRAM_MD5=yes
+		AUTH_PLAINTEXT=yes
+	EOC
+
+	# Cyrus SASL
+	if use sasl; then
+		cat >> Makefile <<- EOC
+			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
+			AUTH_CYRUS_SASL=yes
+			AUTH_LIBS += -lsasl2
+		EOC
+	fi
+
+	# Dovecot
+	if use dovecot-sasl; then
+		cat >> Makefile <<- EOC
+			AUTH_DOVECOT=yes
+		EOC
+	fi
+
+	# Pluggable Authentication Modules
+	if use pam; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PAM=yes
+			AUTH_LIBS += -lpam
+		EOC
+	fi
+
+	# Radius
+	if use radius; then
+		cat >> Makefile <<- EOC
+			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
+			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
+			AUTH_LIBS += -lfreeradius-client
+		EOC
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
+		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
+		|| die "make failed"
+}
+
+src_install () {
+	cd "${S}"/build-exim-gentoo || die
+	dosbin exim
+	if use X; then
+		dosbin eximon.bin
+		dosbin eximon
+	fi
+	fperms 4755 /usr/sbin/exim
+
+	dosym exim /usr/sbin/sendmail
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	dosym ../sbin/sendmail /usr/lib/sendmail
+
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+		convert4r3 convert4r4 exipick
+	do
+		dosbin $i
+	done
+
+	dodoc "${S}"/doc/*
+	doman "${S}"/doc/exim.8
+	use dsn && dodoc "${S}"/README.DSN
+	use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
+
+	# conf files
+	insinto /etc/exim
+	newins "${S}"/src/configure.default exim.conf.dist
+	if use exiscan-acl; then
+		newins "${S}"/src/configure.default exim.conf.exiscan-acl
+	fi
+	doins "${WORKDIR}"/system_filter.exim
+	doins "${FILESDIR}"/auth_conf.sub
+
+	pamd_mimic system-auth exim auth account
+
+	# headers, #436406
+	if use dlfunc ; then
+		# fixup includes so they actually can be found when including
+		sed -i \
+			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
+			local_scan.h || die
+		insinto /usr/include/exim
+		doins {config,local_scan}.h ../src/{mytypes,store}.h
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/exim.logrotate" exim
+
+	newinitd "${FILESDIR}"/exim.rc10 exim
+	newconfd "${FILESDIR}"/exim.confd exim
+
+	systemd_dounit \
+		"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
+	systemd_newunit \
+		"${FILESDIR}"/exim_at.service 'exim@.service'
+	systemd_newunit \
+		"${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
+
+	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
+	keepdir /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then
+		einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
+		einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub"
+		einfo "for using smtp auth."
+		einfo "Please create ${EROOT}etc/exim/exim.conf from"
+		einfo "  ${EROOT}etc/exim/exim.conf.dist."
+	fi
+	if use dcc ; then
+		einfo "DCC support is experimental, you can find some limited"
+		einfo "documentation at the bottom of this prerelease message:"
+		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
+	fi
+	use srs && einfo "SRS support is experimental"
+	if use dmarc ; then
+		einfo "DMARC support is experimental.  See global settings to"
+		einfo "configure DMARC, for usage see the documentation at "
+		einfo "experimental-spec.txt."
+	fi
+	use dsn && einfo "extra information in fail DSN message is experimental"
+	elog "The obsolete acl condition 'demime' is removed, the replacements"
+	elog "are the ACLs acl_smtp_mime and acl_not_smtp_mime"
+}
diff --git a/mail-mta/exim/exim-4.92.1-r1.ebuild b/mail-mta/exim/exim-4.92.1-r1.ebuild
new file mode 100644
index 000000000000..34e7b79bd72b
--- /dev/null
+++ b/mail-mta/exim/exim-4.92.1-r1.ebuild
@@ -0,0 +1,578 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit db-use eutils toolchain-funcs multilib pam systemd
+
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X"
+REQUIRED_USE="
+	arc? ( dkim spf )
+	dane? ( ssl !gnutls )
+	dmarc? ( dkim spf )
+	gnutls? ( ssl )
+	pkcs11? ( ssl )
+	spf? ( exiscan-acl )
+	srs? ( exiscan-acl )
+	!ssl? ( !dkim )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
+# incorrect, but b) is the only "correct" view from repoman.
+
+COMM_URI="https://downloads.exim.org/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
+	mirror://gentoo/system_filter.exim.gz
+	doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
+HOMEPAGE="http://www.exim.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
+	dev-libs/libpcre
+	idn? ( net-dns/libidn:= net-dns/libidn2:= )
+	perl? ( dev-lang/perl:= )
+	pam? ( virtual/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	gnutls? (
+		net-libs/gnutls:0=[pkcs11?]
+		dev-libs/libtasn1
+	)
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	nis? (
+		elibc_glibc? (
+			net-libs/libtirpc
+			>=net-libs/libnsl-1:=
+		)
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+	redis? ( dev-libs/hiredis )
+	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+	dmarc? ( mail-filter/opendmarc )
+	srs? ( mail-filter/libsrs_alt )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXaw
+	)
+	sqlite? ( dev-db/sqlite )
+	radius? ( net-dialup/freeradius-client )
+	virtual/libiconv
+	elibc_glibc? ( net-libs/libnsl )
+	"
+	# added X check for #57206
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/mini-qmail
+	!<mail-mta/msmtp-1.4.19-r1
+	!>=mail-mta/msmtp-1.4.19-r1[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/mailwrapper
+	>=net-mail/mailbase-0.00-r5
+	virtual/logger
+	dcc? ( mail-filter/dcc )
+	selinux? ( sec-policy/selinux-exim )
+	"
+
+S=${WORKDIR}/${P//rc/RC}
+
+src_prepare() {
+	epatch "${FILESDIR}"/exim-4.14-tail.patch
+	epatch "${FILESDIR}"/exim-4.92-localscan_dlopen.patch
+	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
+	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+	epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
+	epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279
+	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+	epatch "${FILESDIR}"/exim-4.92-fix-eval-expansion-32bit.patch #687554
+
+	if use maildir ; then
+		epatch "${FILESDIR}"/exim-4.20-maildir.patch
+	else
+		epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+	fi
+
+	eapply_user
+
+	# user Exim believes it should be
+	MAILUSER=mail
+	MAILGROUP=mail
+	if use prefix && [[ ${EUID} != 0 ]] ; then
+		MAILUSER=$(id -un)
+		MAILGROUP=$(id -gn)
+	fi
+}
+
+src_configure() {
+	# general config and paths
+
+	local aliases="${EPREFIX}/etc/mail/aliases"
+	sed -i \
+		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
+		src/configure.default || die
+
+	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
+
+	if use elibc_musl; then
+		sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
+	fi
+
+	local conffile="${EPREFIX}/etc/exim/exim.conf"
+	sed -e "48i\CFLAGS=${CFLAGS}" \
+		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
+		-e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
+		-e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
+		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
+		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
+		src/EDITME > Local/Makefile || die
+
+	# work on Local/Makefile from now on
+	cd Local
+
+	cat >> Makefile <<- EOC
+		INFO_DIRECTORY=${EPREFIX}/usr/share/info
+		PID_FILE_PATH=${EPREFIX}/run/exim.pid
+		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
+		HAVE_ICONV=yes
+	EOC
+
+	# if we use libiconv, now is the time to tell so
+	use !elibc_glibc && use !elibc_musl && \
+		echo "EXTRALIBS_EXIM=-liconv" >> Makefile
+
+	# support for IPv6
+	if use ipv6; then
+		cat >> Makefile <<- EOC
+			HAVE_IPV6=YES
+		EOC
+	fi
+
+	# support i18n/IDNA
+	if use idn; then
+		cat >> Makefile <<- EOC
+			SUPPORT_I18N=yes
+			SUPPORT_I18N_2008=yes
+			EXTRALIBS_EXIM += -lidn -lidn2
+		EOC
+	fi
+
+	#
+	# mail storage formats
+	#
+
+	# mailstore is Exim's traditional storage format
+	cat >> Makefile <<- EOC
+		SUPPORT_MAILSTORE=yes
+	EOC
+
+	# mbox
+	if use mbx; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MBX=yes
+		EOC
+	fi
+
+	# maildir
+	if use maildir; then
+		cat >> Makefile <<- EOC
+			SUPPORT_MAILDIR=yes
+		EOC
+	fi
+
+	#
+	# lookup methods
+
+	# use the "native" interfaces to the DBM and CDB libraries, support
+	# passwd and directory lookups by default
+	local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
+	cat >> Makefile <<- EOC
+		USE_DB=yes
+		CFLAGS+=-I$(db_includedir ${DB_VERS})
+		DBMLIB=-l$(db_libname ${DB_VERS})
+		LOOKUP_CDB=yes
+		LOOKUP_PASSWD=yes
+		LOOKUP_DSEARCH=yes
+	EOC
+
+	if ! use dnsdb; then
+		# DNSDB lookup is enabled by default
+		sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die
+	fi
+
+	if use ldap; then
+		cat >> Makefile <<- EOC
+			LOOKUP_LDAP=yes
+			LDAP_LIB_TYPE=OPENLDAP2
+			LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
+			LOOKUP_LIBS += -lldap -llber
+		EOC
+	fi
+
+	if use mysql; then
+		cat >> Makefile <<- EOC
+			LOOKUP_MYSQL=yes
+			LOOKUP_INCLUDE += $(mysql_config --include)
+			LOOKUP_LIBS += $(mysql_config --libs)
+		EOC
+	fi
+
+	if use nis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_NIS=yes
+			LOOKUP_NISPLUS=yes
+		EOC
+		if use elibc_glibc ; then
+			cat >> Makefile <<- EOC
+				CFLAGS += -I"${EPREFIX}"/usr/include/tirpc
+			EOC
+		fi
+	fi
+
+	if use postgres; then
+		cat >> Makefile <<- EOC
+			LOOKUP_PGSQL=yes
+			LOOKUP_INCLUDE += -I$(pg_config --includedir)
+			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
+		EOC
+	fi
+
+	if use sqlite; then
+		cat >> Makefile <<- EOC
+			LOOKUP_SQLITE=yes
+			LOOKUP_SQLITE_PC=sqlite3
+		EOC
+	fi
+
+	if use redis; then
+		cat >> Makefile <<- EOC
+			LOOKUP_REDIS=yes
+			LOOKUP_LIBS += -lhiredis
+		EOC
+	fi
+
+	# Exim monitor, enabled by default, controlled via X USE-flag,
+	# disable if not requested, bug #46778
+	if use X; then
+		cp ../exim_monitor/EDITME eximon.conf || die
+	else
+		sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile || die
+	fi
+
+	#
+	# features
+	#
+
+	# content scanning support
+	if use exiscan-acl; then
+		cat >> Makefile <<- EOC
+			WITH_CONTENT_SCAN=yes
+		EOC
+	fi
+
+	# DomainKeys Identified Mail, RFC4871
+	if ! use dkim; then
+		# DKIM is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_DKIM=yes
+		EOC
+	fi
+
+	# Per-Recipient-Data-Response
+	if ! use prdr; then
+		# PRDR is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_PRDR=yes
+		EOC
+	fi
+
+	# Transport post-delivery actions
+	if use !tpda && use !dane; then
+		# EVENT is enabled by default
+		cat >> Makefile <<- EOC
+			DISABLE_EVENT=yes
+		EOC
+	fi
+
+	# log to syslog
+	if use syslog; then
+		local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
+		sed -i \
+			-e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
+			Makefile || die
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=syslog
+		EOC
+	else
+		cat >> Makefile <<- EOC
+			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
+		EOC
+	fi
+
+	# starttls support (ssl)
+	if use ssl; then
+		echo "SUPPORT_TLS=yes" >> Makefile
+		if use gnutls; then
+			echo "USE_GNUTLS=yes" >> Makefile
+			echo "USE_GNUTLS_PC=gnutls" >> Makefile
+			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
+		else
+			echo "USE_OPENSSL_PC=openssl" >> Makefile
+		fi
+	fi
+
+	# TCP wrappers
+	if use tcpd; then
+		cat >> Makefile <<- EOC
+			USE_TCP_WRAPPERS=yes
+			EXTRALIBS_EXIM += -lwrap
+		EOC
+	fi
+
+	# Light Mail Transport Protocol
+	if use lmtp; then
+		cat >> Makefile <<- EOC
+			TRANSPORT_LMTP=yes
+		EOC
+	fi
+
+	# embedded Perl
+	if use perl; then
+		cat >> Makefile <<- EOC
+			EXIM_PERL=perl.o
+		EOC
+	fi
+
+	# dlfunc
+	if use dlfunc; then
+		cat >> Makefile <<- EOC
+			EXPAND_DLFUNC=yes
+			HAVE_LOCAL_SCAN=yes
+			DLOPEN_LOCAL_SCAN=yes
+		EOC
+	fi
+
+	# Proxy Protocol
+	if use proxy; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PROXY=yes
+		EOC
+	fi
+
+	# DANE
+	if use dane; then
+		cat >> Makefile <<- EOC
+			SUPPORT_DANE=yes
+		EOC
+	fi
+
+	# Sender Policy Framework
+	if use spf; then
+		cat >> Makefile <<- EOC
+			SUPPORT_SPF=yes
+			EXTRALIBS_EXIM += -lspf2
+		EOC
+	fi
+
+	#
+	# experimental features
+	#
+
+	# Authenticated Receive Chain
+	if use arc; then
+		echo "EXPERIMENTAL_ARC=yes">> Makefile
+	fi
+
+	# Distributed Checksum Clearinghouse
+	if use dcc; then
+		echo "EXPERIMENTAL_DCC=yes">> Makefile
+	fi
+
+	# Sender Rewriting Scheme
+	if use srs; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_SRS=yes
+			EXTRALIBS_EXIM += -lsrs_alt
+		EOC
+	fi
+
+	# DMARC
+	if use dmarc; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DMARC=yes
+			EXTRALIBS_EXIM += -lopendmarc
+		EOC
+	fi
+
+	# Delivery Sender Notifications extra information in fail message
+	if use dsn; then
+		cat >> Makefile <<- EOC
+			EXPERIMENTAL_DSN_INFO=yes
+		EOC
+	fi
+
+	#
+	# authentication (SMTP AUTH)
+	#
+
+	# standard bits
+	cat >> Makefile <<- EOC
+		AUTH_SPA=yes
+		AUTH_CRAM_MD5=yes
+		AUTH_PLAINTEXT=yes
+	EOC
+
+	# Cyrus SASL
+	if use sasl; then
+		cat >> Makefile <<- EOC
+			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
+			AUTH_CYRUS_SASL=yes
+			AUTH_LIBS += -lsasl2
+		EOC
+	fi
+
+	# Dovecot
+	if use dovecot-sasl; then
+		cat >> Makefile <<- EOC
+			AUTH_DOVECOT=yes
+		EOC
+	fi
+
+	# Pluggable Authentication Modules
+	if use pam; then
+		cat >> Makefile <<- EOC
+			SUPPORT_PAM=yes
+			AUTH_LIBS += -lpam
+		EOC
+	fi
+
+	# Radius
+	if use radius; then
+		cat >> Makefile <<- EOC
+			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
+			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
+			AUTH_LIBS += -lfreeradius-client
+		EOC
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
+		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
+		|| die "make failed"
+}
+
+src_install () {
+	cd "${S}"/build-exim-gentoo || die
+	dosbin exim
+	if use X; then
+		dosbin eximon.bin
+		dosbin eximon
+	fi
+	fperms 4755 /usr/sbin/exim
+
+	dosym exim /usr/sbin/sendmail
+	dosym exim /usr/sbin/rsmtp
+	dosym exim /usr/sbin/rmail
+	dosym ../sbin/exim /usr/bin/mailq
+	dosym ../sbin/exim /usr/bin/newaliases
+	dosym ../sbin/sendmail /usr/lib/sendmail
+
+	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
+		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
+		convert4r3 convert4r4 exipick
+	do
+		dosbin $i
+	done
+
+	dodoc "${S}"/doc/*
+	doman "${S}"/doc/exim.8
+	use dsn && dodoc "${S}"/README.DSN
+	use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
+
+	# conf files
+	insinto /etc/exim
+	newins "${S}"/src/configure.default exim.conf.dist
+	if use exiscan-acl; then
+		newins "${S}"/src/configure.default exim.conf.exiscan-acl
+	fi
+	doins "${WORKDIR}"/system_filter.exim
+	doins "${FILESDIR}"/auth_conf.sub
+
+	pamd_mimic system-auth exim auth account
+
+	# headers, #436406
+	if use dlfunc ; then
+		# fixup includes so they actually can be found when including
+		sed -i \
+			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
+			local_scan.h || die
+		insinto /usr/include/exim
+		doins {config,local_scan}.h ../src/{mytypes,store}.h
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/exim.logrotate" exim
+
+	newinitd "${FILESDIR}"/exim.rc10 exim
+	newconfd "${FILESDIR}"/exim.confd exim
+
+	systemd_dounit \
+		"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
+	systemd_newunit \
+		"${FILESDIR}"/exim_at.service 'exim@.service'
+	systemd_newunit \
+		"${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
+
+	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
+	keepdir /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then
+		einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
+		einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub"
+		einfo "for using smtp auth."
+		einfo "Please create ${EROOT}etc/exim/exim.conf from"
+		einfo "  ${EROOT}etc/exim/exim.conf.dist."
+	fi
+	if use dcc ; then
+		einfo "DCC support is experimental, you can find some limited"
+		einfo "documentation at the bottom of this prerelease message:"
+		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
+	fi
+	use srs && einfo "SRS support is experimental"
+	if use dmarc ; then
+		einfo "DMARC support is experimental.  See global settings to"
+		einfo "configure DMARC, for usage see the documentation at "
+		einfo "experimental-spec.txt."
+	fi
+	use dsn && einfo "extra information in fail DSN message is experimental"
+	elog "The obsolete acl condition 'demime' is removed, the replacements"
+	elog "are the ACLs acl_smtp_mime and acl_not_smtp_mime"
+}
diff --git a/mail-mta/exim/exim-4.92.1.ebuild b/mail-mta/exim/exim-4.92.1.ebuild
deleted file mode 100644
index 9d74e713de0f..000000000000
--- a/mail-mta/exim/exim-4.92.1.ebuild
+++ /dev/null
@@ -1,578 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit db-use eutils toolchain-funcs multilib pam systemd
-
-IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X"
-REQUIRED_USE="
-	arc? ( dkim spf )
-	dane? ( ssl !gnutls )
-	dmarc? ( dkim spf )
-	gnutls? ( ssl )
-	pkcs11? ( ssl )
-	spf? ( exiscan-acl )
-	srs? ( exiscan-acl )
-	!ssl? ( !dkim )
-"
-# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
-# for x86 and amd64 only, due to this, repoman won't allow depending on
-# gnutls[dane] for all else.  Because we cannot express USE=dane when
-# USE=gnutls is in effect only in package.use.mask, the only option we
-# have left is to a) ignore the dependency (but that results in bug
-# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
-# incorrect, but b) is the only "correct" view from repoman.
-
-COMM_URI="https://downloads.exim.org/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
-	mirror://gentoo/system_filter.exim.gz
-	doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
-	dev-libs/libpcre
-	idn? ( net-dns/libidn:= net-dns/libidn2:= )
-	perl? ( dev-lang/perl:= )
-	pam? ( virtual/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	gnutls? (
-		net-libs/gnutls:0=[pkcs11?]
-		dev-libs/libtasn1
-	)
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	nis? (
-		elibc_glibc? (
-			net-libs/libtirpc
-			>=net-libs/libnsl-1:=
-		)
-	)
-	mysql? ( virtual/libmysqlclient )
-	postgres? ( dev-db/postgresql:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
-	redis? ( dev-libs/hiredis )
-	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
-	dmarc? ( mail-filter/opendmarc )
-	srs? ( mail-filter/libsrs_alt )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-libs/libXaw
-	)
-	sqlite? ( dev-db/sqlite )
-	radius? ( net-dialup/freeradius-client )
-	virtual/libiconv
-	elibc_glibc? ( net-libs/libnsl )
-	"
-	# added X check for #57206
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/mini-qmail
-	!<mail-mta/msmtp-1.4.19-r1
-	!>=mail-mta/msmtp-1.4.19-r1[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5
-	virtual/logger
-	dcc? ( mail-filter/dcc )
-	selinux? ( sec-policy/selinux-exim )
-	"
-
-S=${WORKDIR}/${P//rc/RC}
-
-src_prepare() {
-	epatch "${FILESDIR}"/exim-4.14-tail.patch
-	epatch "${FILESDIR}"/exim-4.92-localscan_dlopen.patch
-	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
-	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
-	epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
-	epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279
-	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-	epatch "${FILESDIR}"/exim-4.92-fix-eval-expansion-32bit.patch #687554
-
-	if use maildir ; then
-		epatch "${FILESDIR}"/exim-4.20-maildir.patch
-	else
-		epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
-	fi
-
-	eapply_user
-
-	# user Exim believes it should be
-	MAILUSER=mail
-	MAILGROUP=mail
-	if use prefix && [[ ${EUID} != 0 ]] ; then
-		MAILUSER=$(id -un)
-		MAILGROUP=$(id -gn)
-	fi
-}
-
-src_configure() {
-	# general config and paths
-
-	local aliases="${EPREFIX}/etc/mail/aliases"
-	sed -i \
-		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
-		src/configure.default || die
-
-	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
-
-	if use elibc_musl; then
-		sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
-	fi
-
-	local conffile="${EPREFIX}/etc/exim/exim.conf"
-	sed -e "48i\CFLAGS=${CFLAGS}" \
-		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-		-e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
-		-e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
-		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
-		src/EDITME > Local/Makefile || die
-
-	# work on Local/Makefile from now on
-	cd Local
-
-	cat >> Makefile <<- EOC
-		INFO_DIRECTORY=${EPREFIX}/usr/share/info
-		PID_FILE_PATH=${EPREFIX}/run/exim.pid
-		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
-		HAVE_ICONV=yes
-	EOC
-
-	# if we use libiconv, now is the time to tell so
-	use !elibc_glibc && use !elibc_musl && \
-		echo "EXTRALIBS_EXIM=-liconv" >> Makefile
-
-	# support for IPv6
-	if use ipv6; then
-		cat >> Makefile <<- EOC
-			HAVE_IPV6=YES
-		EOC
-	fi
-
-	# support i18n/IDNA
-	if use idn; then
-		cat >> Makefile <<- EOC
-			SUPPORT_I18N=yes
-			SUPPORT_I18N_2008=yes
-			EXTRALIBS_EXIM += -lidn -lidn2
-		EOC
-	fi
-
-	#
-	# mail storage formats
-	#
-
-	# mailstore is Exim's traditional storage format
-	cat >> Makefile <<- EOC
-		SUPPORT_MAILSTORE=yes
-	EOC
-
-	# mbox
-	if use mbx; then
-		cat >> Makefile <<- EOC
-			SUPPORT_MBX=yes
-		EOC
-	fi
-
-	# maildir
-	if use maildir; then
-		cat >> Makefile <<- EOC
-			SUPPORT_MAILDIR=yes
-		EOC
-	fi
-
-	#
-	# lookup methods
-
-	# use the "native" interfaces to the DBM and CDB libraries, support
-	# passwd and directory lookups by default
-	local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
-	cat >> Makefile <<- EOC
-		USE_DB=yes
-		CFLAGS+=-I$(db_includedir ${DB_VERS})
-		DBMLIB=-l$(db_libname ${DB_VERS})
-		LOOKUP_CDB=yes
-		LOOKUP_PASSWD=yes
-		LOOKUP_DSEARCH=yes
-	EOC
-
-	if ! use dnsdb; then
-		# DNSDB lookup is enabled by default
-		sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die
-	fi
-
-	if use ldap; then
-		cat >> Makefile <<- EOC
-			LOOKUP_LDAP=yes
-			LDAP_LIB_TYPE=OPENLDAP2
-			LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
-			LOOKUP_LIBS += -lldap -llber
-		EOC
-	fi
-
-	if use mysql; then
-		cat >> Makefile <<- EOC
-			LOOKUP_MYSQL=yes
-			LOOKUP_INCLUDE += $(mysql_config --include)
-			LOOKUP_LIBS += $(mysql_config --libs)
-		EOC
-	fi
-
-	if use nis; then
-		cat >> Makefile <<- EOC
-			LOOKUP_NIS=yes
-			LOOKUP_NISPLUS=yes
-		EOC
-		if use elibc_glibc ; then
-			cat >> Makefile <<- EOC
-				CFLAGS += -I"${EPREFIX}"/usr/include/tirpc
-			EOC
-		fi
-	fi
-
-	if use postgres; then
-		cat >> Makefile <<- EOC
-			LOOKUP_PGSQL=yes
-			LOOKUP_INCLUDE += -I$(pg_config --includedir)
-			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
-		EOC
-	fi
-
-	if use sqlite; then
-		cat >> Makefile <<- EOC
-			LOOKUP_SQLITE=yes
-			LOOKUP_SQLITE_PC=sqlite3
-		EOC
-	fi
-
-	if use redis; then
-		cat >> Makefile <<- EOC
-			LOOKUP_REDIS=yes
-			LOOKUP_LIBS += -lhiredis
-		EOC
-	fi
-
-	# Exim monitor, enabled by default, controlled via X USE-flag,
-	# disable if not requested, bug #46778
-	if use X; then
-		cp ../exim_monitor/EDITME eximon.conf || die
-	else
-		sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile || die
-	fi
-
-	#
-	# features
-	#
-
-	# content scanning support
-	if use exiscan-acl; then
-		cat >> Makefile <<- EOC
-			WITH_CONTENT_SCAN=yes
-		EOC
-	fi
-
-	# DomainKeys Identified Mail, RFC4871
-	if ! use dkim; then
-		# DKIM is enabled by default
-		cat >> Makefile <<- EOC
-			DISABLE_DKIM=yes
-		EOC
-	fi
-
-	# Per-Recipient-Data-Response
-	if ! use prdr; then
-		# PRDR is enabled by default
-		cat >> Makefile <<- EOC
-			DISABLE_PRDR=yes
-		EOC
-	fi
-
-	# Transport post-delivery actions
-	if use !tpda && use !dane; then
-		# EVENT is enabled by default
-		cat >> Makefile <<- EOC
-			DISABLE_EVENT=yes
-		EOC
-	fi
-
-	# log to syslog
-	if use syslog; then
-		local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
-		sed -i \
-			-e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
-			Makefile || die
-		cat >> Makefile <<- EOC
-			LOG_FILE_PATH=syslog
-		EOC
-	else
-		cat >> Makefile <<- EOC
-			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
-		EOC
-	fi
-
-	# starttls support (ssl)
-	if use ssl; then
-		echo "SUPPORT_TLS=yes" >> Makefile
-		if use gnutls; then
-			echo "USE_GNUTLS=yes" >> Makefile
-			echo "USE_GNUTLS_PC=gnutls" >> Makefile
-			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
-		else
-			echo "USE_OPENSSL_PC=openssl" >> Makefile
-		fi
-	fi
-
-	# TCP wrappers
-	if use tcpd; then
-		cat >> Makefile <<- EOC
-			USE_TCP_WRAPPERS=yes
-			EXTRALIBS_EXIM += -lwrap
-		EOC
-	fi
-
-	# Light Mail Transport Protocol
-	if use lmtp; then
-		cat >> Makefile <<- EOC
-			TRANSPORT_LMTP=yes
-		EOC
-	fi
-
-	# embedded Perl
-	if use perl; then
-		cat >> Makefile <<- EOC
-			EXIM_PERL=perl.o
-		EOC
-	fi
-
-	# dlfunc
-	if use dlfunc; then
-		cat >> Makefile <<- EOC
-			EXPAND_DLFUNC=yes
-			HAVE_LOCAL_SCAN=yes
-			DLOPEN_LOCAL_SCAN=yes
-		EOC
-	fi
-
-	# Proxy Protocol
-	if use proxy; then
-		cat >> Makefile <<- EOC
-			SUPPORT_PROXY=yes
-		EOC
-	fi
-
-	# DANE
-	if use dane; then
-		cat >> Makefile <<- EOC
-			SUPPORT_DANE=yes
-		EOC
-	fi
-
-	# Sender Policy Framework
-	if use spf; then
-		cat >> Makefile <<- EOC
-			SUPPORT_SPF=yes
-			EXTRALIBS_EXIM += -lspf2
-		EOC
-	fi
-
-	#
-	# experimental features
-	#
-
-	# Authenticated Receive Chain
-	if use arc; then
-		echo "EXPERIMENTAL_ARC=yes">> Makefile
-	fi
-
-	# Distributed Checksum Clearinghouse
-	if use dcc; then
-		echo "EXPERIMENTAL_DCC=yes">> Makefile
-	fi
-
-	# Sender Rewriting Scheme
-	if use srs; then
-		cat >> Makefile <<- EOC
-			EXPERIMENTAL_SRS=yes
-			EXTRALIBS_EXIM += -lsrs_alt
-		EOC
-	fi
-
-	# DMARC
-	if use dmarc; then
-		cat >> Makefile <<- EOC
-			EXPERIMENTAL_DMARC=yes
-			EXTRALIBS_EXIM += -lopendmarc
-		EOC
-	fi
-
-	# Delivery Sender Notifications extra information in fail message
-	if use dsn; then
-		cat >> Makefile <<- EOC
-			EXPERIMENTAL_DSN_INFO=yes
-		EOC
-	fi
-
-	#
-	# authentication (SMTP AUTH)
-	#
-
-	# standard bits
-	cat >> Makefile <<- EOC
-		AUTH_SPA=yes
-		AUTH_CRAM_MD5=yes
-		AUTH_PLAINTEXT=yes
-	EOC
-
-	# Cyrus SASL
-	if use sasl; then
-		cat >> Makefile <<- EOC
-			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
-			AUTH_CYRUS_SASL=yes
-			AUTH_LIBS += -lsasl2
-		EOC
-	fi
-
-	# Dovecot
-	if use dovecot-sasl; then
-		cat >> Makefile <<- EOC
-			AUTH_DOVECOT=yes
-		EOC
-	fi
-
-	# Pluggable Authentication Modules
-	if use pam; then
-		cat >> Makefile <<- EOC
-			SUPPORT_PAM=yes
-			AUTH_LIBS += -lpam
-		EOC
-	fi
-
-	# Radius
-	if use radius; then
-		cat >> Makefile <<- EOC
-			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
-			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
-			AUTH_LIBS += -lfreeradius-client
-		EOC
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
-		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
-		|| die "make failed"
-}
-
-src_install () {
-	cd "${S}"/build-exim-gentoo || die
-	dosbin exim
-	if use X; then
-		dosbin eximon.bin
-		dosbin eximon
-	fi
-	fperms 4755 /usr/sbin/exim
-
-	dosym exim /usr/sbin/sendmail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym ../sbin/exim /usr/bin/mailq
-	dosym ../sbin/exim /usr/bin/newaliases
-	dosym ../sbin/sendmail /usr/lib/sendmail
-
-	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
-		convert4r3 convert4r4 exipick
-	do
-		dosbin $i
-	done
-
-	dodoc "${S}"/doc/*
-	doman "${S}"/doc/exim.8
-	use dsn && dodoc "${S}"/README.DSN
-	use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
-
-	# conf files
-	insinto /etc/exim
-	newins "${S}"/src/configure.default exim.conf.dist
-	if use exiscan-acl; then
-		newins "${S}"/src/configure.default exim.conf.exiscan-acl
-	fi
-	doins "${WORKDIR}"/system_filter.exim
-	doins "${FILESDIR}"/auth_conf.sub
-
-	pamd_mimic system-auth exim auth account
-
-	# headers, #436406
-	if use dlfunc ; then
-		# fixup includes so they actually can be found when including
-		sed -i \
-			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
-			local_scan.h || die
-		insinto /usr/include/exim
-		doins {config,local_scan}.h ../src/{mytypes,store}.h
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/exim.logrotate" exim
-
-	newinitd "${FILESDIR}"/exim.rc10 exim
-	newconfd "${FILESDIR}"/exim.confd exim
-
-	systemd_dounit \
-		"${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
-	systemd_newunit \
-		"${FILESDIR}"/exim_at.service 'exim@.service'
-	systemd_newunit \
-		"${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
-
-	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
-	keepdir /var/log/${PN}
-}
-
-pkg_postinst() {
-	if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then
-		einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
-		einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub"
-		einfo "for using smtp auth."
-		einfo "Please create ${EROOT}etc/exim/exim.conf from"
-		einfo "  ${EROOT}etc/exim/exim.conf.dist."
-	fi
-	if use dcc ; then
-		einfo "DCC support is experimental, you can find some limited"
-		einfo "documentation at the bottom of this prerelease message:"
-		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
-	fi
-	use srs && einfo "SRS support is experimental"
-	if use dmarc ; then
-		einfo "DMARC support is experimental.  See global settings to"
-		einfo "configure DMARC, for usage see the documentation at "
-		einfo "experimental-spec.txt."
-	fi
-	use dsn && einfo "extra information in fail DSN message is experimental"
-	elog "The obsolete acl condition 'demime' is removed, the replacements"
-	elog "are the ACLs acl_smtp_mime and acl_not_smtp_mime"
-}
diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild
deleted file mode 100644
index fe6cf5e40f1d..000000000000
--- a/mail-mta/exim/exim-4.92.ebuild
+++ /dev/null
@@ -1,563 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit db-use eutils toolchain-funcs multilib pam systemd
-
-IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X"
-REQUIRED_USE="
-	arc? ( dkim spf )
-	dane? ( ssl !gnutls )
-	dmarc? ( dkim spf )
-	gnutls? ( ssl )
-	pkcs11? ( ssl )
-	spf? ( exiscan-acl )
-	srs? ( exiscan-acl )
-"
-# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
-# for x86 and amd64 only, due to this, repoman won't allow depending on
-# gnutls[dane] for all else.  Because we cannot express USE=dane when
-# USE=gnutls is in effect only in package.use.mask, the only option we
-# have left is to a) ignore the dependency (but that results in bug
-# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
-# incorrect, but b) is the only "correct" view from repoman.
-
-COMM_URI="https://downloads.exim.org/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
-	mirror://gentoo/system_filter.exim.gz
-	doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
-	dev-libs/libpcre
-	idn? ( net-dns/libidn:= net-dns/libidn2:= )
-	perl? ( dev-lang/perl:= )
-	pam? ( virtual/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	gnutls? (
-		net-libs/gnutls:0=[pkcs11?]
-		dev-libs/libtasn1
-	)
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	nis? (
-		elibc_glibc? (
-			net-libs/libtirpc
-			>=net-libs/libnsl-1:=
-		)
-	)
-	mysql? ( virtual/libmysqlclient )
-	postgres? ( dev-db/postgresql:= )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
-	redis? ( dev-libs/hiredis )
-	spf? ( >=mail-filter/libspf2-1.2.5-r1 )
-	dmarc? ( mail-filter/opendmarc )
-	srs? ( mail-filter/libsrs_alt )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-libs/libXaw
-	)
-	sqlite? ( dev-db/sqlite )
-	radius? ( net-dialup/freeradius-client )
-	virtual/libiconv
-	elibc_glibc? ( net-libs/libnsl )
-	"
-	# added X check for #57206
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/mini-qmail
-	!<mail-mta/msmtp-1.4.19-r1
-	!>=mail-mta/msmtp-1.4.19-r1[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/mailwrapper
-	>=net-mail/mailbase-0.00-r5
-	virtual/logger
-	dcc? ( mail-filter/dcc )
-	selinux? ( sec-policy/selinux-exim )
-	"
-
-S=${WORKDIR}/${P//rc/RC}
-
-src_prepare() {
-	epatch "${FILESDIR}"/exim-4.14-tail.patch
-	epatch "${FILESDIR}"/exim-4.92-localscan_dlopen.patch
-	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
-	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
-	epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
-	epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279
-	epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-
-	if use maildir ; then
-		epatch "${FILESDIR}"/exim-4.20-maildir.patch
-	else
-		epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
-	fi
-
-	eapply_user
-
-	# user Exim believes it should be
-	MAILUSER=mail
-	MAILGROUP=mail
-	if use prefix && [[ ${EUID} != 0 ]] ; then
-		MAILUSER=$(id -un)
-		MAILGROUP=$(id -gn)
-	fi
-}
-
-src_configure() {
-	# general config and paths
-
-	sed -i.orig \
-		-e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" \
-		"${S}"/src/configure.default || die
-
-	sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile || die
-
-	sed -e "48i\CFLAGS=${CFLAGS}" \
-		-e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-		-e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
-		-e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:" \
-		-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-		-e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
-		src/EDITME > Local/Makefile
-
-	if use elibc_musl; then
-		sed -e 's/^LIBS = -lnsl/LIBS =/g' \
-		-i OS/Makefile-Linux
-	fi
-
-	cd Local
-
-	cat >> Makefile <<- EOC
-		INFO_DIRECTORY=${EPREFIX}/usr/share/info
-		PID_FILE_PATH=${EPREFIX}/run/exim.pid
-		SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
-		HAVE_ICONV=yes
-	EOC
-
-	# if we use libiconv, now is the time to tell so
-	use !elibc_glibc && use !elibc_musl && \
-		echo "EXTRALIBS_EXIM=-liconv" >> Makefile
-
-	# support for IPv6
-	if use ipv6; then
-		cat >> Makefile <<- EOC
-			HAVE_IPV6=YES
-		EOC
-	fi
-
-	# support i18n/IDNA
-	if use idn; then
-		cat >> Makefile <<- EOC
-			SUPPORT_I18N=yes
-			SUPPORT_I18N_2008=yes
-			EXTRALIBS_EXIM += -lidn -lidn2
-		EOC
-	fi
-
-	#
-	# mail storage formats
-
-	# mailstore is Exim's traditional storage format
-	cat >> Makefile <<- EOC
-		SUPPORT_MAILSTORE=yes
-	EOC
-
-	# mbox
-	if use mbx; then
-		cat >> Makefile <<- EOC
-			SUPPORT_MBX=yes
-		EOC
-	fi
-
-	# maildir
-	if use maildir; then
-		cat >> Makefile <<- EOC
-			SUPPORT_MAILDIR=yes
-		EOC
-	fi
-
-	#
-	# lookup methods
-
-	# use the "native" interfaces to the DBM and CDB libraries, support
-	# passwd and directory lookups by default
-	local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
-	cat >> Makefile <<- EOC
-		USE_DB=yes
-		CFLAGS+=-I$(db_includedir ${DB_VERS})
-		DBMLIB=-l$(db_libname ${DB_VERS})
-		LOOKUP_CDB=yes
-		LOOKUP_PASSWD=yes
-		LOOKUP_DSEARCH=yes
-	EOC
-
-	if ! use dnsdb; then
-		# DNSDB lookup is enabled by default
-		sed -i "s:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:" Makefile
-	fi
-
-	if use ldap; then
-		cat >> Makefile <<- EOC
-			LOOKUP_LDAP=yes
-			LDAP_LIB_TYPE=OPENLDAP2
-			LOOKUP_INCLUDE += -I"${EROOT}"usr/include/ldap
-			LOOKUP_LIBS += -lldap -llber
-		EOC
-	fi
-
-	if use mysql; then
-		cat >> Makefile <<- EOC
-			LOOKUP_MYSQL=yes
-			LOOKUP_INCLUDE += $(mysql_config --include)
-			LOOKUP_LIBS += $(mysql_config --libs)
-		EOC
-	fi
-
-	if use nis; then
-		cat >> Makefile <<- EOC
-			LOOKUP_NIS=yes
-			LOOKUP_NISPLUS=yes
-		EOC
-		if use elibc_glibc ; then
-			cat >> Makefile <<- EOC
-				CFLAGS += -I/usr/include/tirpc
-			EOC
-		fi
-	fi
-
-	if use postgres; then
-		cat >> Makefile <<- EOC
-			LOOKUP_PGSQL=yes
-			LOOKUP_INCLUDE += -I$(pg_config --includedir)
-			LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
-		EOC
-	fi
-
-	if use sqlite; then
-		cat >> Makefile <<- EOC
-			LOOKUP_SQLITE=yes
-			LOOKUP_SQLITE_PC=sqlite3
-		EOC
-	fi
-
-	if use redis; then
-		cat >> Makefile <<- EOC
-			LOOKUP_REDIS=yes
-			LOOKUP_LIBS += -lhiredis
-		EOC
-	fi
-
-	#
-	# Exim monitor, enabled by default, controlled via X USE-flag,
-	# disable if not requested, bug #46778
-	if use X; then
-		cp ../exim_monitor/EDITME eximon.conf || die
-	else
-		sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile
-	fi
-
-	#
-	# features
-
-	# content scanning support
-	if use exiscan-acl; then
-		cat >> Makefile <<- EOC
-			WITH_CONTENT_SCAN=yes
-		EOC
-	fi
-
-	# DomainKeys Identified Mail, RFC4871
-	if ! use dkim; then
-		# DKIM is enabled by default
-		cat >> Makefile <<- EOC
-			DISABLE_DKIM=yes
-		EOC
-	fi
-
-	# Per-Recipient-Data-Response
-	if ! use prdr; then
-		# PRDR is enabled by default
-		cat >> Makefile <<- EOC
-			DISABLE_PRDR=yes
-		EOC
-	fi
-
-	# Transport post-delivery actions
-	if use !tpda && use !dane; then
-		# EVENT is enabled by default
-		cat >> Makefile <<- EOC
-			DISABLE_EVENT=yes
-		EOC
-	fi
-
-	# log to syslog
-	if use syslog; then
-		sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
-		cat >> Makefile <<- EOC
-			LOG_FILE_PATH=syslog
-		EOC
-	else
-		cat >> Makefile <<- EOC
-			LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
-		EOC
-	fi
-
-	# starttls support (ssl)
-	if use ssl; then
-		echo "SUPPORT_TLS=yes" >> Makefile
-		if use gnutls; then
-			echo "USE_GNUTLS=yes" >> Makefile
-			echo "USE_GNUTLS_PC=gnutls" >> Makefile
-			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
-		else
-			echo "USE_OPENSSL_PC=openssl" >> Makefile
-		fi
-	fi
-
-	# TCP wrappers
-	if use tcpd; then
-		cat >> Makefile <<- EOC
-			USE_TCP_WRAPPERS=yes
-			EXTRALIBS_EXIM += -lwrap
-		EOC
-	fi
-
-	# Light Mail Transport Protocol
-	if use lmtp; then
-		cat >> Makefile <<- EOC
-			TRANSPORT_LMTP=yes
-		EOC
-	fi
-
-	# embedded Perl
-	if use perl; then
-		cat >> Makefile <<- EOC
-			EXIM_PERL=perl.o
-		EOC
-	fi
-
-	# dlfunc
-	if use dlfunc; then
-		cat >> Makefile <<- EOC
-			EXPAND_DLFUNC=yes
-			HAVE_LOCAL_SCAN=yes
-			DLOPEN_LOCAL_SCAN=yes
-		EOC
-	fi
-
-	# Proxy Protocol
-	if use proxy; then
-		cat >> Makefile <<- EOC
-			SUPPORT_PROXY=yes
-		EOC
-	fi
-
-	# DANE
-	if use dane; then
-		cat >> Makefile <<- EOC
-			SUPPORT_DANE=yes
-		EOC
-	fi
-
-	# Sender Policy Framework
-	if use spf; then
-		cat >> Makefile <<- EOC
-			SUPPORT_SPF=yes
-			EXTRALIBS_EXIM += -lspf2
-		EOC
-	fi
-
-	#
-	# experimental features
-
-	# Authenticated Receive Chain
-	if use arc; then
-		echo "EXPERIMENTAL_ARC=yes">> Makefile
-	fi
-
-	# Distributed Checksum Clearinghouse
-	if use dcc; then
-		echo "EXPERIMENTAL_DCC=yes">> Makefile
-	fi
-
-	# Sender Rewriting Scheme
-	if use srs; then
-		cat >> Makefile <<- EOC
-			EXPERIMENTAL_SRS=yes
-			EXTRALIBS_EXIM += -lsrs_alt
-		EOC
-	fi
-
-	# DMARC
-	if use dmarc; then
-		cat >> Makefile <<- EOC
-			EXPERIMENTAL_DMARC=yes
-			EXTRALIBS_EXIM += -lopendmarc
-		EOC
-	fi
-
-	# Delivery Sender Notifications extra information in fail message
-	if use dsn; then
-		cat >> Makefile <<- EOC
-			EXPERIMENTAL_DSN_INFO=yes
-		EOC
-	fi
-
-	#
-	# authentication (SMTP AUTH)
-
-	# standard bits
-	cat >> Makefile <<- EOC
-		AUTH_SPA=yes
-		AUTH_CRAM_MD5=yes
-		AUTH_PLAINTEXT=yes
-	EOC
-
-	# Cyrus SASL
-	if use sasl; then
-		cat >> Makefile <<- EOC
-			CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
-			AUTH_CYRUS_SASL=yes
-			AUTH_LIBS += -lsasl2
-		EOC
-	fi
-
-	# Dovecot
-	if use dovecot-sasl; then
-		cat >> Makefile <<- EOC
-			AUTH_DOVECOT=yes
-		EOC
-	fi
-
-	# Pluggable Authentication Modules
-	if use pam; then
-		cat >> Makefile <<- EOC
-			SUPPORT_PAM=yes
-			AUTH_LIBS += -lpam
-		EOC
-	fi
-
-	# Radius
-	if use radius; then
-		cat >> Makefile <<- EOC
-			RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
-			RADIUS_LIB_TYPE=RADIUSCLIENTNEW
-			AUTH_LIBS += -lfreeradius-client
-		EOC
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
-		AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
-		|| die "make failed"
-}
-
-src_install () {
-	cd "${S}"/build-exim-gentoo || die
-	dosbin exim
-	if use X; then
-		dosbin eximon.bin
-		dosbin eximon
-	fi
-	fperms 4755 /usr/sbin/exim
-
-	dosym exim /usr/sbin/sendmail
-	dosym exim /usr/sbin/rsmtp
-	dosym exim /usr/sbin/rmail
-	dosym ../sbin/exim /usr/bin/mailq
-	dosym ../sbin/exim /usr/bin/newaliases
-	dosym ../sbin/sendmail /usr/lib/sendmail
-
-	for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
-		exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
-		convert4r3 convert4r4 exipick
-	do
-		dosbin $i
-	done
-
-	dodoc "${S}"/doc/*
-	doman "${S}"/doc/exim.8
-	use dsn && dodoc "${S}"/README.DSN
-	use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf
-
-	# conf files
-	insinto /etc/exim
-	newins "${S}"/src/configure.default exim.conf.dist
-	if use exiscan-acl; then
-		newins "${S}"/src/configure.default exim.conf.exiscan-acl
-	fi
-	doins "${WORKDIR}"/system_filter.exim
-	doins "${FILESDIR}"/auth_conf.sub
-
-	pamd_mimic system-auth exim auth account
-
-	# headers, #436406
-	if use dlfunc ; then
-		# fixup includes so they actually can be found when including
-		sed -i \
-			-e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
-			local_scan.h || die
-		insinto /usr/include/exim
-		doins {config,local_scan}.h ../src/{mytypes,store}.h
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/exim.logrotate" exim
-
-	newinitd "${FILESDIR}"/exim.rc10 exim
-	newconfd "${FILESDIR}"/exim.confd exim
-
-	systemd_dounit "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
-	systemd_newunit "${FILESDIR}"/exim_at.service 'exim@.service'
-	systemd_newunit "${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
-
-	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
-	keepdir /var/log/${PN}
-}
-
-pkg_postinst() {
-	if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then
-		einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
-		einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
-		einfo "Please create ${EROOT}etc/exim/exim.conf from ${EROOT}etc/exim/exim.conf.dist."
-	fi
-	if use dcc ; then
-		einfo "DCC support is experimental, you can find some limited"
-		einfo "documentation at the bottom of this prerelease message:"
-		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
-	fi
-	use srs && einfo "SRS support is experimental"
-	if use dmarc ; then
-		einfo "DMARC support is experimental.  See global settings to"
-		einfo "configure DMARC, for usage see the documentation at "
-		einfo "experimental-spec.txt."
-	fi
-	use dsn && einfo "extra information in fail DSN message is experimental"
-	elog "The obsolete acl condition 'demime' is removed, the replacements"
-	elog "are the ACLs acl_smtp_mime and acl_not_smtp_mime"
-}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 6416945f2332..f2de94c65ddc 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index 5cafaa675f89..0a43550b9618 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,3 +1,5 @@
 DIST font-util-1.3.1.tar.bz2 153289 BLAKE2B b85b2dbbe3ed97e22d765b73a9fee7472790ff037878967ee6865e3122c651ff5e3b6aeb99492b1330bb77d2518157abcc45e503419b21f2cc76a3196d505f22 SHA512 9fd6dd4c0a01ede5f0b09ec0f9d316267ca086e2ee9526a43a4e4d6ce3cd67c977293bd3cf440328ca417292fcae1579888b24b7259eaf012230890210d74889
+DIST font-util-1.3.2.tar.bz2 158480 BLAKE2B 490aa54fdbf0e7060a17261e6ac06d30ef374c0ef40ae7473680c192898305c86617667c59f334d54e3ba3eb2464e925a12a5ad4bc74c73f6a62b0500d7c0da0 SHA512 7cac529b12ae71185b89c72c1569b9826f52eeaecc1c76010338e7c42c4078ae339f18220b580bbd68fb5dc09df6ecf169a47c32e6104d8ee53bd443fa21d167
 EBUILD font-util-1.3.1.ebuild 629 BLAKE2B 6f16c24073627c15aa14752e806178c7a335caf5955062831434bb9cc520180e8ab4c675ef15c3c6c6d8bc61b215ad7302379e47e7fc7f67773694455877c733 SHA512 6f5f9dad2a49e6e0ba1d4e643d8510622f2b4ff5112800fa69e47f797e29a3bda4fe7eb3702b1be1ff475f588740a8b774ffe0d173a527d24f21ce0cc6b20314
+EBUILD font-util-1.3.2-r1.ebuild 648 BLAKE2B e6628b4677668c1b6ab2b649a74d80bb66f7b686b82fc86f1f5cf72ef630e8f7c0b991155665db1f7936e3285e18dccff729c56e009f54a398a1489296cc3bb6 SHA512 7379ed9b03fe0aac0949f8a48085a28e444f072f55e16fb11edd19c19ef650b1293f672e6f1e5bb6db46da86bdf723f6515c6f0671c7444d6e63d2d430be0a9f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-util/font-util-1.3.2-r1.ebuild b/media-fonts/font-util/font-util-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..c5c64bd6fcf7
--- /dev/null
+++ b/media-fonts/font-util/font-util-1.3.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2005-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit xorg-3
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
+DESCRIPTION="X.Org font utilities"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-fontrootdir="${EPREFIX}/usr/share/fonts"
+	--with-mapdir="${EPREFIX}/usr/share/fonts/util"
+)
diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index a9fd0d25db80..87cfc8fbc77b 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -1,11 +1,7 @@
 DIST fontawesome-4.7.0.tar.gz 2672776 BLAKE2B c20474c0167665d82fcbe74984ad9c44fa1155a2a5363222981d6c32f40a3bf13bfc2c582d78e8d36e57939f8af3810fa823f2241d1924a83a05c79ed08cface SHA512 913e5eec2211111e9601c92059745344766f4c3a6f3563cbc6f8a5f3850a0101bab8f3f992a97c6f1c264a2bbb5163f3feecc6b3f64fcb22c9592d2d38cc777d
 DIST fontawesome-5.1.0.tar.gz 10505651 BLAKE2B 0ec84cdf36855ba43e5858b2e8b12a93c9ec950216b64fa307e1fa058e05f83f08c820e4a3b95432e30c33ee4efe5931bee7077ff182d52725068c53bf387b6f SHA512 1f35f0d326e1f896b606d851577fe99639c164101f236c47966289a8a7e3b1e64fea3f1338d12f327777db56ec35b1fcb5d6de250276bcb468fec114d4c3928f
-DIST fontawesome-5.10.1.tar.gz 10460219 BLAKE2B 6e1fc8e56cbc8bdbb4be3df6c8f397a69a6fbedc628418a26514df099d9f1c152ef6c5be7f5893a65628ded1553352c6dc55f47cf49f51f983a448483b0f5457 SHA512 74053b61e742def0cab8a74f90c4d08035093011afb5de65419e162a9502b367e3b3bb98d422ceac6e1289e5181d613582bf3e6dfe05be7fdde065dc96564009
-DIST fontawesome-5.9.0.tar.gz 10407351 BLAKE2B 2e55f8237033c0daad7028a2e10d5f893b03aeb3c49c26c367c5e8107c2c17900694d424ca76e262f15750e21a74d5a747798da4e21a5c69a809bb89594d755f SHA512 6347f21fb47d779f2a39b9205e8edbac09b3feef88cee103052d5bbba7f857d97e485c659c69edd6053f9af7561f0b260b38eb90b570a3d0a74fe634d723c0cf
-DIST fontawesome-free-5.0.6.zip 21098097 BLAKE2B 981220261e29dc9894eee1b829af4815176d566ce6309a3d356fdb8c5e5e9a1f4ccadd522c70f51088aebfcbb4c85ea593916ce09a129a85ef9ebf711f253ccb SHA512 cb5ad12b2b40687bca0624e9424ff483e5af4c7da1ef032b58698d00bb32c5385c0d5fe40892c252af66a5470843a092442aa14d7936cb6af30066efd07b53b5
+DIST fontawesome-5.10.2.tar.gz 10458602 BLAKE2B f4adc84a352a4ca4fb3fe0216f5672c36d4f972ce4ff7785f088afcef5c0049310116a188325508be23a5949dd75a2bc8504dcf94d614d66e8f73b9ce1674b7e SHA512 dec887c9379972cd6e4d5eb06a947cd2d6b418ef9db5526759b653ca163377d3a0634d300e24b1d3c8bdfec6ea062dad4da191045ce5fa245100f16dd2e657ca
 EBUILD fontawesome-4.7.0.ebuild 599 BLAKE2B c5df5a5878a75ed80d1c9fba6341a451f6b0851cea7086fb3559ae650d774f1fbde7a04ef624c69381d5791af4297222addf84930403c9c868f240bef7818c06 SHA512 21b0109d6deb9e8cba6d43b4a9faaef02ce5bb325744d34d7f723a93eeaa4b46d05cd0a4e35f68a9abd6c22f4e6f064ce370e7e884e122189de11ca802a33372
-EBUILD fontawesome-5.0.6.ebuild 790 BLAKE2B b6fe16fc5ef3ac0ec831760e68fad46861037149282551a162ec608e8fee867c33cca1d030a1ec7dfa3133dd24c42d88bcecbbf72c0fc7039b8aa94c6d6ba172 SHA512 43f42587eac345820ea069905d5c5ed3d843157397b72f08cd62f02ea5cedccb4163535b8dd6562416eba99140e01d3d96aaeee91e2cb98a1e453eab632814ff
 EBUILD fontawesome-5.1.0.ebuild 693 BLAKE2B 7136a16eda143e81654f40f4da627e2860a9e0fa44a3fe448a469b57c71861aacfd55b678023583b163b6973daf9b8ca30a5369be01d4b66d551a735ab68ef06 SHA512 394d61d25dc52ef6a224f2a4a44d2db372980e583ec5f5f48003c2e1ec60fab5d299419f77cb85977fb0f96f06c3cea368f4add6a93d8fed53207b3e18d0b82b
-EBUILD fontawesome-5.10.1.ebuild 668 BLAKE2B 561c5d1ada4ce06a8d5691e247d7d400eebea4b9f3e6ab8d55f9ccd7ccdea043c47b77432fa69b45b4e8c96d3a694443377799815bffc52389ffe0d298081491 SHA512 a2f60fce3c14edfa6367b3a95e2475cc905043213fbb153c84add6fa97b9d397540de6c70dce863a63253517bfa399ab0cb66ff378a4b14eab8f674db23fad13
-EBUILD fontawesome-5.9.0.ebuild 668 BLAKE2B 561c5d1ada4ce06a8d5691e247d7d400eebea4b9f3e6ab8d55f9ccd7ccdea043c47b77432fa69b45b4e8c96d3a694443377799815bffc52389ffe0d298081491 SHA512 a2f60fce3c14edfa6367b3a95e2475cc905043213fbb153c84add6fa97b9d397540de6c70dce863a63253517bfa399ab0cb66ff378a4b14eab8f674db23fad13
+EBUILD fontawesome-5.10.2.ebuild 668 BLAKE2B 561c5d1ada4ce06a8d5691e247d7d400eebea4b9f3e6ab8d55f9ccd7ccdea043c47b77432fa69b45b4e8c96d3a694443377799815bffc52389ffe0d298081491 SHA512 a2f60fce3c14edfa6367b3a95e2475cc905043213fbb153c84add6fa97b9d397540de6c70dce863a63253517bfa399ab0cb66ff378a4b14eab8f674db23fad13
 MISC metadata.xml 757 BLAKE2B 0052f352b2dd2ecf94c93033fb785bffac4f9d002257f7e6ecd5119c0df2c79add5cbad191ea4a2e1299ff52d045ed7e393344e15a4bccc59f8eb38be78266b3 SHA512 5527f5537b93e9ded68263ac22ad8f959efd923c221cfc882dc8f77bb5ed87e2657f01eabe18b7019fd5556927574c576448d08f65db473f47c2df3a3fcf0e4d
diff --git a/media-fonts/fontawesome/fontawesome-5.0.6.ebuild b/media-fonts/fontawesome/fontawesome-5.0.6.ebuild
deleted file mode 100644
index aafd04922e96..000000000000
--- a/media-fonts/fontawesome/fontawesome-5.0.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-REPO_PN="Font-Awesome"
-
-MY_P="${PN}-free-${PV}"
-
-DESCRIPTION="The iconic font"
-HOMEPAGE="https://fontawesome.com"
-SRC_URI="https://github.com/FortAwesome/${REPO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://use.fontawesome.com/releases/v${PV}/${MY_P}.zip"
-
-LICENSE="CC-BY-3.0 OFL-1.1"
-SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+otf +ttf"
-
-REQUIRED_USE="|| ( otf ttf )"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	if use otf; then
-		FONT_S="${S}/use-on-desktop" FONT_SUFFIX="otf" font_src_install
-	fi
-	if use ttf; then
-		FONT_S="${S}/web-fonts-with-css/webfonts" FONT_SUFFIX="ttf" font_src_install
-	fi
-}
diff --git a/media-fonts/fontawesome/fontawesome-5.10.1.ebuild b/media-fonts/fontawesome/fontawesome-5.10.2.ebuild
index 18ae5f0a3c4f..18ae5f0a3c4f 100644
--- a/media-fonts/fontawesome/fontawesome-5.10.1.ebuild
+++ b/media-fonts/fontawesome/fontawesome-5.10.2.ebuild
diff --git a/media-fonts/fontawesome/fontawesome-5.9.0.ebuild b/media-fonts/fontawesome/fontawesome-5.9.0.ebuild
deleted file mode 100644
index 18ae5f0a3c4f..000000000000
--- a/media-fonts/fontawesome/fontawesome-5.9.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="Font-Awesome"
-inherit font
-
-DESCRIPTION="The iconic font"
-HOMEPAGE="https://fontawesome.com"
-SRC_URI="https://github.com/FortAwesome/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 OFL-1.1"
-SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+otf +ttf"
-
-REQUIRED_USE="|| ( otf ttf )"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	if use otf; then
-		FONT_S="${S}/otfs" FONT_SUFFIX="otf" font_src_install
-	fi
-	if use ttf; then
-		FONT_S="${S}/webfonts" FONT_SUFFIX="ttf" font_src_install
-	fi
-}
diff --git a/media-fonts/ipamonafont/Manifest b/media-fonts/ipamonafont/Manifest
index 401954785059..c81a826380fe 100644
--- a/media-fonts/ipamonafont/Manifest
+++ b/media-fonts/ipamonafont/Manifest
@@ -1,3 +1,3 @@
 DIST opfc-ModuleHP-1.1.1_withIPAMonaFonts-1.0.8.tar.gz 11563203 BLAKE2B 74d9501a47730ea651d05b6de973926c9c78b3fb61640eeac023a68b99a71684d934a17a54eebb8cb4b19d1c16f8fccb794dbb6f582f9e0853bf6328d3de9ddd SHA512 b46b09bb44497275d8949bcd6d0c472c7bc8a26f20113e97f6379a10e8f4d5d072e4c517aa1c69e24efd980644d8298d220abbcccb6e9af3c65794dc31f7ec7b
-EBUILD ipamonafont-1.0.8.ebuild 607 BLAKE2B d053e8b49869e21169e683c2ff74ec4758030a0fdad708b61b37f9f8fc38bcdf57050ac939269e94f703982b21c93aa9c65648f107f84735cf34d29f8c98b219 SHA512 3540c6af1490b17a11250d736fd09f407162e9f63b07e36783e2073a9254cce2062cf4493eec534229e49dded5d10a4a75bc97020880205fda95fd75e9d37d68
+EBUILD ipamonafont-1.0.8.ebuild 681 BLAKE2B addc3811ecae48ec6c6ffc80c9652be20accf0ce3f08637374b32c1a38923c71f320b65b244759416dc9a27ccdf31f189dbaf58acadbf690c11f0ee3b0c08aea SHA512 2d1469ee9acac15f62b029a62bc939b931b7adb526a9d854179ee50411f9581c1186b0d96f4f17efea6e32ea941d8176bbcc4bf278f0cd9a17d355794bc84b85
 MISC metadata.xml 325 BLAKE2B 23152e65f27b271d7bf65bdc6441a3ed2788f95efd9b59a463054c74e39f57e0be4124a52c1d34fde0fcbea3cba763740dfb745201bb4bf06db310b3bc822c44 SHA512 da7a53ea557206d262ea9596322cee71cf5a5f433b8c96a353305b343000cb782ccc7f73197786cb7b1664b3cc7d85dbf84670f4d4dbcf3f57d428d4dae5d0b4
diff --git a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
index e8d745c17279..eff1b88faa20 100644
--- a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
+++ b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
@@ -6,9 +6,9 @@ EAPI=0
 inherit font
 
 DESCRIPTION="Hacked version of IPA fonts, which is suitable for browsing 2ch"
-HOMEPAGE="http://www.geocities.jp/ipa_mona/index.html"
+HOMEPAGE="https://web.archive.org/web/20190326123924/http://www.geocities.jp/ipa_mona/"
 MY_PN="opfc-ModuleHP-1.1.1_withIPAMonaFonts"
-SRC_URI="http://www.geocities.jp/ipa_mona/${MY_PN}-${PV}.tar.gz"
+SRC_URI="http://freebsd.sin.openmirrors.asia/pub/FreeBSD/ports/local-distfiles/hrs/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="grass-ipafonts mplus-fonts public-domain"
 SLOT="0"
diff --git a/media-fonts/noto-cjk/Manifest b/media-fonts/noto-cjk/Manifest
index a144f2d574c7..ffa63ab28371 100644
--- a/media-fonts/noto-cjk/Manifest
+++ b/media-fonts/noto-cjk/Manifest
@@ -4,5 +4,5 @@ DIST noto-cjk-20170602.tar.gz 1667938394 BLAKE2B 51ed7c48bccef0dff75ddc5ec108b61
 DIST noto-cjk-20190416.tar.gz 1882149745 BLAKE2B 0936414381624db8a601cb2af53928658c9f74ed3dac34955f5597e7cb14cdacc517c8b7bffe203d73e03a2c2d4013d3cfc47ce13ae3aa497c6547cd8dcce430 SHA512 8abebae9412622f50adb0f755621d97002233d8db367f8fc38dda6a0828c3ea879e9ac780a3b09239b0570ada1091b0a7889bb7301a9486da9dfdca7200e50da
 EBUILD noto-cjk-20150615.ebuild 756 BLAKE2B c1ee13c7340cf90d0dcd9130c3377332e9772828df9948cf8eb5d3df337c77e67bde57d53c2cdd1ad6129e1cceaec8e5e28179535036ef98c970c602ca95b411 SHA512 c8696b1655b25cfcb1004898d80d757e5cd2273fbe71e01cead68b379643259072917b03cd893de3213d9d76f8fab245255f030b48e5cb39b9d1eccdfe81cc14
 EBUILD noto-cjk-20170602.ebuild 644 BLAKE2B b996054820cc1fe2621968a4a4c91267823af08b4e3dd6a61953c336361d963172d701408c3ed391f942b30c472b8ffab4217e3a864fcc380087913fd99c5f0a SHA512 d4750ab9746e8c7be333f547d07973e2f31d415b6baffe32a8511aa176fd45cd62a5678d2b7bc57db9c3f6baa35aeeed07e29622f330c53b7676a13c90ecfda7
-EBUILD noto-cjk-20190416.ebuild 648 BLAKE2B b4106f5bed38fa146ec7c380cd0ae1927f5c5fbb5b8ad15afd2e2ec61c3933d9aa186baccd9a3beac254c79ad1fb7bf1fb014e1f8545f0b23fdb14f88dc8df81 SHA512 e25e896dd5049dee3c929cf13fdd58713b408b593b42b5a68c5b3db00cba6dd4ee13f22d1c9353716bc2f8e1ecca182728a2093443c085e44483d111af0ffa34
+EBUILD noto-cjk-20190416.ebuild 641 BLAKE2B e3de6ff6c19fc0fc7fba77c08318abe59b5e3ac0291cd41a78e6f6ce2b155feb047e71f5d669b0be1a162803a1f4bda79eef3a537526289b20f08020b918c860 SHA512 1f9810be6b46b20691cf92b2f2668e6253368ebdc57e43e63a1f533cc9eb6c922f62f8e23b7637c9e03437175dccec5a2e3353911dd62b4a01914f5cc0446a6e
 MISC metadata.xml 449 BLAKE2B f30d4df6c9ddc672a839eeb6433bd9583fa4af65c32190b09bca261e1a53e0c9bb396808811a3591c8b90337002fba8433d8eb816af4475f57339c299b8eaa06 SHA512 04d7f718df7e4d83823b778f09f1cb4e78ffceb154030dc1f8980cd9ca9cf8ed0140d0354b44e6523952e6ddae3e4879a467a1855092cfb7052ea97e099c98d4
diff --git a/media-fonts/noto-cjk/noto-cjk-20190416.ebuild b/media-fonts/noto-cjk/noto-cjk-20190416.ebuild
index 7802ca32336e..46aa0dde424d 100644
--- a/media-fonts/noto-cjk/noto-cjk-20190416.ebuild
+++ b/media-fonts/noto-cjk/noto-cjk-20190416.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googlei18n/noto-cjk/archive/${COMMIT}.tar.gz -> ${P}
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm arm64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RESTRICT="binchecks strip"
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index ad0ad360837d..640e2d7ca20c 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -6,5 +6,5 @@ DIST noto-20181024.tar.gz 726721580 BLAKE2B d19d32d98419395df1bb3ca360bd67a50487
 DIST noto-20190524.tar.gz 740252290 BLAKE2B e169ee60c9a83c13656ebd5dbce32aad183bbebc057035c69723788725a1c14a016c37bea7ccf30fc9d776e421515c2fa03f929b5f7bf95d9e3abb1abbeccbbf SHA512 668f7d015da420b3c32f8c0313037bab731bd915875f476beb47e6c3e8d33a30cd608d2f351194607afbf28f8f3efc1eb5f8470c03fd88a83df33b478fa78147
 EBUILD noto-20170403.ebuild 819 BLAKE2B 3bf921503660437c91da43ac3e7e9e05fff70ff95e9842b1c5d884d005a28286a929cc66772afa8f9c74d919045f9e45218ce8f2bfa0eb9539b1ceea26c8762e SHA512 728276eef93954d03eb649f2772d4cde19b3080e7bdff2da344d70026d992f5dd1d521f6786c50f32f38c1780988288463705fdd522cec298ba4c8d51bd6b8d7
 EBUILD noto-20181024.ebuild 928 BLAKE2B 394b9decc5153dad3d77a2ef0078ca4be32ecdd3c7048a80a5e4566994fa9cef0d5059f092649341014737c877cafbd0f791937ba2350ebf7440ecabc06d38df SHA512 eae13a5c8ed1e8cfc7dbc63cb1eb4ea6398f1c0cc4a25b3babe0f93c9dfb2f0d0a1a200519490e562a1b25f05f7c2273ebe42f4290feef7617421777fb173809
-EBUILD noto-20190524.ebuild 1281 BLAKE2B ec8fd536d5b50004161f8dc45744fc7c53a8e1134936106392f8561afbd92f5b566b37587e400ccb9df499eede6803d735c921af73efb3e0cb71e864bec373b6 SHA512 8f7708b4d0c8006eb139bea43dcdbdadb0bf595bf8022f2bb6a39589b8c1392b0c40d2b0164bedcc0759c4f977004ba45c6ea60c23cbd55bdb8b297dbd017cca
+EBUILD noto-20190524.ebuild 1274 BLAKE2B c0f35b51bae35ce82be1658007c492b9e3bb6102b3c72d57f58375a6a20fb98f0792f41ad34895c34ae8c584f59ff8b98a4d0caf7dcec83017c716f7a583055a SHA512 62f86fadc4fba9b696b368b034ffed3b212ac843b6685fa70c8969637778f614660c328ee5407885447725354bb351d39e5084d77e7b6fa50b9ccab2e3b2c313
 MISC metadata.xml 523 BLAKE2B f44295f5bef7ef8248755f8dce32e6916bfcf3f4a6058c2cca7cf449cecfcd3b40ce134c01931190c2b9ca00349891d9ad3b2ba828d550d0344fb8b8c70960ce SHA512 3b876b78c73894a6c51b4026cb0fd9aeb816710ebaf85e297cc2dc627fd7cbfd934a75f6cc1e1bd75857171f1259a01ee71b0665928792f025047cc97cb63e5c
diff --git a/media-fonts/noto/noto-20190524.ebuild b/media-fonts/noto/noto-20190524.ebuild
index e845a0f67467..ce6cb392d75b 100644
--- a/media-fonts/noto/noto-20190524.ebuild
+++ b/media-fonts/noto/noto-20190524.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm arm64 ~mips ppc ppc64 sparc x86"
 # Extra allows to optionally reduce disk usage even returning to tofu
 # issue as described in https://www.google.com/get/noto/
 IUSE="cjk +extra"
diff --git a/media-fonts/pigiarniq/Manifest b/media-fonts/pigiarniq/Manifest
index f2ea29b9ce51..56b94eab34c2 100644
--- a/media-fonts/pigiarniq/Manifest
+++ b/media-fonts/pigiarniq/Manifest
@@ -1,3 +1,5 @@
-DIST pigiarniq.zip 358252 BLAKE2B 1e040e1bcf71f398e7fa2c98e77c6a44a4a2bfc4454d2bc720fa3604f10df27c6743b04c46bf4422087f77c25da7b1f2a1c06611e8ed524808513e052715e10c SHA512 56b6048a44c046cd7350cbe426d520ed81074e4f4ee3ed342e30a9a6a1efecdd466646c1e274da03fa205753ea0c94109c52228d860575f52002c2cccf09b075
-EBUILD pigiarniq-1.ebuild 423 BLAKE2B cffafe05b5eb3d76206fafb7233a3a357e65acbffb3cb1368ce111ffaa4325fc168b9bd978f41d8bc001f59070c30b97ae4fb3b4becce468d53660966bdb6686 SHA512 5ca98c9155097e409182a84f41f4b4ac4377cdf33eb30dff31756751430a0982c118ee6b8423c435642e75a3c9888c6253dc5f87cb80d0590868e1ec44d34f8f
+DIST pigiarniq-1.zip 358252 BLAKE2B 1e040e1bcf71f398e7fa2c98e77c6a44a4a2bfc4454d2bc720fa3604f10df27c6743b04c46bf4422087f77c25da7b1f2a1c06611e8ed524808513e052715e10c SHA512 56b6048a44c046cd7350cbe426d520ed81074e4f4ee3ed342e30a9a6a1efecdd466646c1e274da03fa205753ea0c94109c52228d860575f52002c2cccf09b075
+DIST pigiarniq-2.zip 375948 BLAKE2B 6e1ce0c054c8e5ac6dda5453d24c543a4e1117a6a39e5e50bf567be2d24c419be8a87baca6632874655a815d3e9f95f475e33620d1f6ab3e4ec06ca2e6d29d1d SHA512 73789818671781ce9c5ea21fa4586e564ea8cae554559a55cbb7ef2406f5f8794677039ee299f3029073492d9f6f1052fe99ba34fe942e9d570044e6d7690d0e
+EBUILD pigiarniq-1.ebuild 417 BLAKE2B f5a03b3dea60c6561e37ecdb358468389570c6af2cd8a7beaa80cf89e2b21c0f9cbbffdcb76c35cfce8a3897ce6ed05f36f8caa0926ae489aa16f6e588d12f96 SHA512 58cbb90fc3671b88fcda5a66947b4e2011acd2b39a549ca45c194dfc1a4bb7fb7ce540dcd6f6e60ab4e4c9d5e4ce5fc404a60d92818a1314c3248e9fd1279695
+EBUILD pigiarniq-2.ebuild 437 BLAKE2B 85110bb513eb966e191e08bb44e403ef0db92580bac02a3b7147d980292e04ecdb98489d6b05ee47cfcf5ff38d43ebf839c5c040459e808d9f00f6b483da7974 SHA512 b8ffc99021d85dddf0976c3a6b105511ecb281674ea336ec34c7b6b61fc2580aff1a342240d99b1cb33b1c52141af9907d82c11d95c4e59174ae73a8e74789f3
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/pigiarniq/pigiarniq-1.ebuild b/media-fonts/pigiarniq/pigiarniq-1.ebuild
index 3134e36ed9ba..d99be98956ff 100644
--- a/media-fonts/pigiarniq/pigiarniq-1.ebuild
+++ b/media-fonts/pigiarniq/pigiarniq-1.ebuild
@@ -7,7 +7,7 @@ inherit font
 
 DESCRIPTION="Nunavut's official Inuktitut font"
 HOMEPAGE="http://www.gov.nu.ca/english/font/"
-SRC_URI="http://www.gov.nu.ca/documents/fonts/pigiarniq.zip"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.zip"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86"
diff --git a/media-fonts/pigiarniq/pigiarniq-2.ebuild b/media-fonts/pigiarniq/pigiarniq-2.ebuild
new file mode 100644
index 000000000000..f078462e88d7
--- /dev/null
+++ b/media-fonts/pigiarniq/pigiarniq-2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit font
+
+DESCRIPTION="Nunavut's official Inuktitut font"
+HOMEPAGE="http://www.ch.gov.nu.ca/en/ComputerTools.aspx"
+SRC_URI="http://ch.gov.nu.ca/fonts/pigiarniq.zip -> ${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}
+FONT_S=${WORKDIR}
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/texcm-ttf/Manifest b/media-fonts/texcm-ttf/Manifest
index e02945c8b740..1889d3e3a168 100644
--- a/media-fonts/texcm-ttf/Manifest
+++ b/media-fonts/texcm-ttf/Manifest
@@ -1,3 +1,3 @@
-DIST texcm-ttf.zip 75261 BLAKE2B d212682074cd379a90be1b585d64ef62248999dfa71fff4c5e858ce927893301ac651d0716b9f588f31b266ed9fbd03a8898b21d26a03abf3bfe2a78a64ef63d SHA512 5dfa793a632d427635f1f38f1b57974dec2d24cd6848565893b821489bf8c5ccad544d6aaddf05e85cc9e77bf800a8f1a1d8f40b57d9d004e47824f78371d34c
-EBUILD texcm-ttf-1.0.ebuild 572 BLAKE2B 8bdd2abd3849d245b49afe2581b865b861b1c8713098fc47736547b367fcc2e219cfaf0b05dfdf2c0254fed871891fbcb358531944f3e4ed1c34001e588ce579 SHA512 b36549dbe2d8be1eae87dd64f5fb6f8e07ba630cc6f93babf02c3a547899579874d87053a9ca3ecbf55ea78082773857d02c0d0cf275186b78107c73d8fcefc0
+DIST texcm-ttf-1.0.zip 75261 BLAKE2B d212682074cd379a90be1b585d64ef62248999dfa71fff4c5e858ce927893301ac651d0716b9f588f31b266ed9fbd03a8898b21d26a03abf3bfe2a78a64ef63d SHA512 5dfa793a632d427635f1f38f1b57974dec2d24cd6848565893b821489bf8c5ccad544d6aaddf05e85cc9e77bf800a8f1a1d8f40b57d9d004e47824f78371d34c
+EBUILD texcm-ttf-1.0.ebuild 552 BLAKE2B cb0220829b64cf1b3990c4809dd0a1d1004407c6377013a95e15b97eb213d5f1eed1702e94f800c1afe23d404d9f1b3b544707eaca9a6db01a92157da984ae7a SHA512 08bbb12461963e48b0fcda2bc7341fd979d4913dac9bdbdc086169ff19e64f5d0c4b02a503343f7417100fc544f9b6ddf1132aa4e9397d14ac67bc012d3bd651
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
index eeac4de41d4b..5cf87bbc624c 100644
--- a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
+++ b/media-fonts/texcm-ttf/texcm-ttf-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=0
@@ -7,7 +7,7 @@ inherit font
 
 DESCRIPTION="TeX's Computer Modern Fonts for MathML"
 HOMEPAGE="http://www.mozilla.org/projects/mathml/fonts/"
-SRC_URI="http://www.mozilla.org/projects/mathml/fonts/bakoma/${PN}.zip"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.zip"
 
 LICENSE="bakoma"
 SLOT="0"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index f29d93affa67..cc361c028990 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index bfe0aab0ecc2..d6bc84abb0f6 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,3 +1,5 @@
 DIST chafa-1.0.1.tar.xz 311616 BLAKE2B c7060cf1b20f7c2eaa6eb8265422031dea1b3b80c106b08b11b431336044e154609ad73c7654a0085a8ca0b71bc01e06377ded638081bdfaeb96aac054577ed8 SHA512 fe0dc8ecec77c7b1b4c694d6dd3f4de895a07faf39519f47c2284d76261e2c6298943fa5309cdca6d41ef0a22fe0321a2ef890f319903596bdfaad10394e7ec2
+DIST chafa-1.2.1.tar.xz 354784 BLAKE2B a37561506edd1117093ad8d2543e8d8779a5edb346d6277baf31a15dabb1f5279234a36822d7f4225bb75ea6f75ff67966b1be832e90e5da03a02b6f140ab576 SHA512 71aee87618961a5910b9bb7a76b50df6f78df3621adc3ea7c462ba26df0147f0cb32f428fb7f6e5dc26968ee9bd3ee902762a7cb8735d1c51fd0ebd107c4226e
 EBUILD chafa-1.0.1.ebuild 813 BLAKE2B 2cb840de743f45a829c1adae53fd15713a7ec84fe187e068695ddf24c2d3dc316257b0148db87af0b8794eefd5350f46bf611df30c911ec0d706b60975c5db5d SHA512 18e9f8347098a84b0c27cf9bc0091c8ca041048ef745d470b01dd7e6c5494c871daf994e541b11b3b62d29b0d91602b4647a80248770c4b6b8c647b21d44ab71
+EBUILD chafa-1.2.1.ebuild 822 BLAKE2B d2e2cfd7873f788eebc36e237f28969e71f14fa2aca89e27cf159f5456a6f26e23062dba56f26409a27b9878b28f092ff41461f4f17d05beb250d27a01dff8dc SHA512 e402d5d7e43ad25ed6d2621cfdd50de25838fc64fd9ec375ffb9062cc5a025f12eaf71b8630a6ea6b0edbdda69f82b8add9e1e4189f189ede29de2c4fef50502
 MISC metadata.xml 407 BLAKE2B ac815b6d037374042188d98d563fe87dd98fd052284d42fe594c77d58c97ff3154b0117b982adac9c0831a3b1baf85db7fd721f8dffe7c6b230ba9bb933d2ca9 SHA512 2fbb72618e83f62147fe9ad65115cd979876a461bd8a0601acb990043ce01842ad74e1a1a079759322d97c16295ad321e60fb16361b5b64345be85ebe070b2b8
diff --git a/media-gfx/chafa/chafa-1.2.1.ebuild b/media-gfx/chafa/chafa-1.2.1.ebuild
new file mode 100644
index 000000000000..25cab4182d69
--- /dev/null
+++ b/media-gfx/chafa/chafa-1.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
+HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
+SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs +tools"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-gfx/imagemagick:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local econfargs=(
+		$(use_enable static-libs static)
+		# install manpage manually
+		--disable-man
+		$(use_with tools)
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	local DOCS=( AUTHORS NEWS README TODO )
+	default
+
+	use tools && doman docs/chafa.1
+
+	find "${ED}"/usr/lib* -name '*.la' -delete || die
+}
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index ba29bdaa050c..9c7e0a740320 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,6 +1,9 @@
 AUX cura-3.3.0-fix-install-paths.patch 1663 BLAKE2B 293bdecb0e6ef130e80bc078f89470908bdc74f9ede901405e8b99953dc5927986d51db3f3494004c44ea543621328c24860ff3ab0c1ff4452d2347f082a53fb SHA512 0c42638c0f0f0cc108c0aec19b0319037c4a17ac4fc6d05920191a927ee32ea4901ca4cb2ae5473c3ded2afbcabd2cad55b6cbaf3ad986ad205fc22936c31fa2
+AUX cura-4.2.1-fix-install-paths.patch 1824 BLAKE2B 423ee2da55c69fa7fda2d93931f00460f16f5539dcf22e0db93210a90be533a1dfa7dabc4ae787bb404ff7ca38c7b4fdb0113cdfdf0f20a2f7907bfcb827dbcf SHA512 d88923ae9baef2889b952f6fe85e312890390228afb8ab27edab5e0abac48eba57b5a78ae0a913c96bf420fcc9f98a5281ede19c0d23d784104c85715d6bb7aa
 DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728 SHA512 5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1
 DIST cura-3.6.0.tar.gz 23388945 BLAKE2B bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86 SHA512 b56e5575cb0eb15d759999dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
+DIST cura-4.2.1.tar.gz 29288696 BLAKE2B 1332030e63d7056dcb8dd680208b0da8dd33e5c7809957779849bac808fccad9a222505ddbe80d4071474d10ace842aa4459f14560198a9f3eebb5be53f923e1 SHA512 4f47f3f5597d1a56d88207eacacece49edb766c75ae18ddc9fb8689b76c16fd4decc9c8af7cab485aac3c9cffe13095aaad34e1c60634249ae2923ead771ac52
 EBUILD cura-3.4.1.ebuild 1678 BLAKE2B 5c05b4777d95bf1427f4314e7cd6790a0879ce55da89a8b04cc2a7a991f55cdd1b6fd61f454a59986e743ff7209cb8437382b92ac689245687b82da155c71ea9 SHA512 25c727be6b867f5af5baadc1718ea3492aa80679a0bb5331794fb8ea19af10af6e2da5d6a7908d9e8e0ba4aca2d9cda46baf2c2abd5c5bbe5fef95933ac2ecdb
 EBUILD cura-3.6.0.ebuild 1675 BLAKE2B 2ba6d31604abc1bd1a6e9f128b0d892c7dc12b0ad65210a8d504104fff2662d28a2f0df5d4825826e53b7b88ce78ef9c690fe64cd866f7db2741e4d7432c11e1 SHA512 43e21fbf81985e482fbccab4d679bc5d3e2539f7b6b2cf585ad4cb7b207246efa3fdca59a0ef2d2a999c6491c071deafe418a0c9de372a9df9a9e15791c5f840
+EBUILD cura-4.2.1.ebuild 1385 BLAKE2B c1f6c35fac146da9338befb41a4d7cd71b3ff20df9a1a18f742671393b782384639612997c84167ef3b8327b08dd06fe83be7eb3e880d57396cb375787db0f78 SHA512 8dfb2a1fcb402f797aa760453b25cec10d4fe6fc0e9b6295c57248f0f61949d9a56e3b2aacdeaff4a4cef8e02f432baf519a7130088d2c9f1b3b194d69d1fdc6
 MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
diff --git a/media-gfx/cura/cura-4.2.1.ebuild b/media-gfx/cura/cura-4.2.1.ebuild
new file mode 100644
index 000000000000..aed51febac2c
--- /dev/null
+++ b/media-gfx/cura/cura-4.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils desktop python-single-r1 xdg
+
+MY_PN=Cura
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+usb zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="sys-devel/gettext"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}]
+	>=media-gfx/curaengine-${PV:0:3}
+	>=media-gfx/fdm-materials-${PV:0:3}
+	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}]
+	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}]
+	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+	zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+PATCHES=( "${FILESDIR}/${PN}-4.2.1-fix-install-paths.patch" )
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon icons/*.png
+	python_optimize "${D}${get_libdir}"
+}
diff --git a/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch b/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch
new file mode 100644
index 000000000000..fc10d727d130
--- /dev/null
+++ b/media-gfx/cura/files/cura-4.2.1-fix-install-paths.patch
@@ -0,0 +1,41 @@
+diff -urN Cura-4.2.1-orig/CMakeLists.txt Cura-4.2.1/CMakeLists.txt
+--- Cura-4.2.1-orig/CMakeLists.txt	2019-07-31 15:34:07.000000000 +0300
++++ Cura-4.2.1/CMakeLists.txt	2019-08-04 18:39:24.106917187 +0300
+@@ -47,6 +47,15 @@
+     find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
+ endif()
+ 
++if(NOT PYTHON_SITE_PACKAGES_DIR)
++   if(APPLE OR WIN32)
++       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++           CACHE STRING "Directory to install Python bindings to")
++   else()
++       set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages
++           CACHE STRING "Directory to install Python bindings to")
++   endif()
++endif()
+ 
+ if(NOT ${URANIUM_DIR} STREQUAL "")
+     set(CMAKE_MODULE_PATH "${URANIUM_DIR}/cmake")
+@@ -64,7 +73,7 @@
+ install(DIRECTORY resources
+         DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
+ install(DIRECTORY plugins
+-        DESTINATION lib${LIB_SUFFIX}/cura)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
+ 
+ if(NOT APPLE AND NOT WIN32)
+     install(FILES cura_app.py
+@@ -79,10 +88,10 @@
+             DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}/dist-packages/cura)
+     else()
+         install(DIRECTORY cura
+-            DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages
++            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
+             FILES_MATCHING PATTERN *.py)
+         install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
+-            DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura)
++            DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
+     endif()
+     install(FILES ${CMAKE_BINARY_DIR}/cura.desktop
+             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 519140d78e54..d7405f30d7c0 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,5 +1,7 @@
 DIST curaengine-3.4.1.tar.gz 949312 BLAKE2B 4902575c40002ab49e3ef13c94c8531b6975ff62e58012dc48744e2d27e9d1767e8f7768250179a374ed24da5a5e2085e9c194068ad6ffb98fff0595a314f7b0 SHA512 51c75e299ef7728101a4c61aa033c9b07112b0955d2ec72ba6173684513ed3c503a744fab487efe2c19da01eb97bd1297b5b8724b4f767639c8e82eefcdd01be
 DIST curaengine-3.6.0.tar.gz 1390109 BLAKE2B a0a6b8016bb5fa2f772634a671fc391df45875fc36cdf100f00ce34b9d5495f32986c473b1ba4c184cb77e50a64e2648c5d4f31053790182e657b0c981e1412c SHA512 340dad4c697fb0d7b633091715a904ae7df8973626e217ae2528d0121723c07a6cf0bbc740b9ad9980f3b288fa690c9c3ee43d90914264855dace007bbb334c8
+DIST curaengine-4.2.0.tar.gz 1654657 BLAKE2B c11f77a126e49c1c63550accd42c3616ab647d2575de0f11e64cb2188e7c565a54f3613e296c3f19e8534a7a758162fe29cdd62e8d62d691a7d9c9e6430545ce SHA512 6c3edac5a21068b50a31d3ab37dac58b986e18be2d24711d77cf210da62b521d62dc92a1b4e8865a26e5c394119349f03b3816d19d67ebee670424cc4a7b2500
 EBUILD curaengine-3.4.1.ebuild 875 BLAKE2B 943c5d77bb91f833a42005edff60824935bc9cc0d6707035ee5ab2fe29d8d631c51fc7678b96dbebf468ea2e5bbb9cfb233999ffaadcf9f196ec824ba2f3d83f SHA512 4ec5e4cb05f236ff9052ecf6455967d05ae668002d255af0d8435960080882ec687de6d7547074d4fee1fd435a04796a26dc4bcdd595ad5748e8d3b0c052f39e
 EBUILD curaengine-3.6.0.ebuild 875 BLAKE2B 943c5d77bb91f833a42005edff60824935bc9cc0d6707035ee5ab2fe29d8d631c51fc7678b96dbebf468ea2e5bbb9cfb233999ffaadcf9f196ec824ba2f3d83f SHA512 4ec5e4cb05f236ff9052ecf6455967d05ae668002d255af0d8435960080882ec687de6d7547074d4fee1fd435a04796a26dc4bcdd595ad5748e8d3b0c052f39e
+EBUILD curaengine-4.2.0.ebuild 1507 BLAKE2B fc44669821417480266caea7e305b363f60042b0d6d5f5c440e327f05f12fcef151d80e0cc2d1652ee79976866225b95cbc55ee255c30139c16f98e4153669c9 SHA512 12ff9ce73c0c1471bd9ea9fc1d3cd83198ae5a83c5fa42a41d2dbdd6a28b3763c80539f8b2bd6b01a96723473a1a62aab4ee179db613203ff56ef1d35de53290
 MISC metadata.xml 862 BLAKE2B 233eef15a865c598451d8a6100a8dc99f4c9a4c4ae4f8692a473ad2b8de5c2bc5216052b2bbf698e98f1c7f8156512084beaebc6148b9bc333d5c09d9bfda3ba SHA512 92e4cf75b949ac201537780bc5acf295720da8a342f6d882e2ca3b36aaa5691a3df31e6cf79e44b25f88d2f1177a1b6227165cbe8b9da8762b35560927239382
diff --git a/media-gfx/curaengine/curaengine-4.2.0.ebuild b/media-gfx/curaengine/curaengine-4.2.0.ebuild
new file mode 100644
index 000000000000..30ee0ee8564f
--- /dev/null
+++ b/media-gfx/curaengine/curaengine-4.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils toolchain-funcs
+
+MY_PN="CuraEngine"
+
+DESCRIPTION="A 3D model slicing engine for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+BDEPEND="|| ( <sys-devel/gcc-9 <sys-devel/clang-8 )
+	doc? ( app-doc/doxygen )"
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:*
+	dev-libs/protobuf
+	dev-libs/stb"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_pretend() {
+	if [[ $(tc-getCC) == clang ]] && [[ $(clang-major-version) -ge 8 ]]; then
+		eerror "Compilation with sys-devel/clang-8 or newer is not supported"
+		eerror "See https://github.com/Ultimaker/CuraEngine/issues/984 for more information"
+		eerror ""
+		die "Incompatible clang version found"
+	elif [[ $(gcc-major-version) -ge 9 ]]; then
+		eerror "Compilation with sys-devel/gcc-9 or newer is not supported"
+		eerror "See https://github.com/Ultimaker/CuraEngine/issues/984 for more information"
+		eerror ""
+		die "Incompatible gcc version found"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_make
+	if use doc; then
+		doxygen
+		mv docs/html . || die
+		find html -name '*.md5' -or -name '*.map' -delete || die
+		DOCS+=( html )
+	fi
+}
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 9a9a67e7f5e6..1676b198a7bd 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -4,5 +4,5 @@ AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7
 DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30
 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.28.0-r1.ebuild 3081 BLAKE2B 49aef9bd9403a4d932f28c1ea3161c7d5b52f96b13be0bc577e70b82d84afce0bc103371f2c06c7c9be88ad1a84147f27798a056f899dc750eb120d6e235cbc3 SHA512 9da641206d34ad5faa6394722a64d0d5477d66913b7a8638e95cc41800ad2c3e80b912cf24a40c676df0b760954d8d5790655516e62d0fab10aeab6c77712452
+EBUILD dcraw-9.28.0-r1.ebuild 2985 BLAKE2B 96bb1af7612b64d9a8bcbc70f240092189e8a88ba19bf558d92e5877ebbdfc0f58a398b1dfd919e2bfc8ea082c958815766edc69e0f84045a39b9ba70b59a7ec SHA512 b653248aa049035f3e11c2e0d3e972a10985abd4c6bffe54477b171eec650f648cc8e4e9e506da76099e98e57e4118e81173df09b303c842687c1e930411f4b7
 MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
diff --git a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
index 0ec0faab0d99..6f0ec1521e68 100644
--- a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
+++ b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild
@@ -14,12 +14,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 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"
+IUSE="nls gimp jpeg lcms"
 
 COMMON_DEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
-	jpeg2k? ( media-libs/jasper:= )
 	gimp? ( media-gfx/gimp )
 "
 DEPEND="${COMMON_DEPEND}"
@@ -61,12 +60,11 @@ src_prepare() {
 }
 
 src_compile() {
-	local ECFLAGS="-O2" # Without optimisation build fails
+	local ECFLAGS="-O2 -DNO_JASPER=yes" # Without optimisation build fails
 	local ELIBS="-lm"
 
 	use lcms && ELIBS="-llcms2 ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes"
 	use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=yes"
-	use jpeg2k && ELIBS="-ljasper ${ELIBS}" || ECFLAGS+=" -DNO_JASPER=yes"
 	use nls && ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\""
 
 	run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} -o dcraw dcraw.c ${ELIBS}
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 8cd14dfa580e..9bc47295120b 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,8 +1,9 @@
 AUX digikam-6.0.0-cmake.patch 1972 BLAKE2B 103f282e8cdc33d6e7cc3982bb15b290ff2381846d6262005922b97df1b54d9dd7572fb95eee01a3cf413dda9eed28e0201123bfedddc7beda6dc4ddc99e5d55 SHA512 8efe171f763692efd7c8449e1365e2d531a4d1b6da79fe1f5048dbe1b328f70b6e923298015f2a162751843eb88db2dd1af744a2b2cd3219e0f44aea4d3a569a
 AUX digikam-6.2.0-cmake.patch 2011 BLAKE2B da9e459cd8c7f89d986166cf19dde36d599565f573831057c0d68706c05f4b49240215e159d36e377f16b178c7de04e713bdfb3214bd83e114cbbd5b40f4f37a SHA512 44a63a08da538bee35efc965789b463455646c3ee9ed8fbe6f22591155c20b623e48838af52f8b521a35b3548fe44909516a15a4d815347e61de71d07bbfad17
 AUX digikam-6.2.0-googlephoto-upload.patch 1072 BLAKE2B 5384a259b2fdd15cf195fed8f5aa1a16a0af3932af1e2226b3bfd2be95d19f6fee003fd9d3344c0921ff5655d22ea4f30f98e8ed7c1e5dee1d4b91d4d031562e SHA512 c71ab51371e45538f33ba9603eabdc8e3e518f7e38aa274407d90f216a14f6071066f388291d072fca46eb6589e3cafe0eb5b78f3bb3520ca9aa85add092d265
+AUX digikam-6.2.0-imagemagick-7.0.8.60.patch 641 BLAKE2B c2a7261a92cb757aa39f2ccb5a561b8cb34563540e1c0e84662a056dad66e17c941a77ee9d42b168e83d18f72786e9bf49e741f73bf20c714496fad80ad22987 SHA512 d1ecf5a25a3cdf542ababa6d4306bf6bce25b5f04e8f880460a8a67f4f4eac283f139b82848a085a28dc16b0a8a9310a3ed294d110105b0562239ef21ce6e442
 DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B 93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba SHA512 b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
 DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
-EBUILD digikam-6.0.0.ebuild 3951 BLAKE2B b7bcf74012b240e5864298c82e18e5f1d3a52f0df16c90896b9d2ba295e396f757f10e3c4a14dd8359086acfde797013d68bcfae57f4105de933d16790d0fd24 SHA512 50c11d1925a65f4d9c307bc1a32fb615176b7c14dd4ec3b30b4080b30f93845b732f725cae2a6fc188ea43982396a44acaf6e4fc64c1f47b95a4070f39ef8913
-EBUILD digikam-6.2.0.ebuild 4121 BLAKE2B 36f16c7a7168d1bedf989377b4886c94d7660d7f86f79287d688cb29db19c3cb8751beca6d68b4b47006c78b7aaf4623ee32d8a2e16138856de95e5fdbbc188c SHA512 f052bedfdbe74291228db64118db730314ac371dc06efe85485826638c385cf44e438aba9a91532b1f6b132957844ca707378dd4170cf83add81385ea74f8cd6
+EBUILD digikam-6.0.0.ebuild 3904 BLAKE2B d3184396f4e28bd1eb765074fcac1a5b29eac28444375502b09cbc6b74d36a24f62febe9a28e360ce25783223fe4c533d156b41f19a2a4e468cc63894be38b5d SHA512 7524e08ea4e8daa15786e3d5bf4f2fa085d88bf5687b9f1cb6809c3fb9b732f0532e1240a43d14da473d6221706fb19bc679f254b9d78b118561d3376792cf60
+EBUILD digikam-6.2.0.ebuild 4168 BLAKE2B 2dc5aca210c12e1db89de79b8acf11826b03daf345b567242a19f6168c01c9cf9583cffc2f3d58401f8b9bba44c03f91187b5ec33aa378ce9b2b8db773cfe245 SHA512 d3cc7c962538921676518de8d18e57aecf9e6d766be53b75b4d2c34bf18eb519c633e07dab7271308622a8654e2464e9d617af7a48cd1261fe762679a2c1ba61
 MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f
diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild b/media-gfx/digikam/digikam-6.0.0.ebuild
index f44c5dbd4ce8..2e6852810eb2 100644
--- a/media-gfx/digikam/digikam-6.0.0.ebuild
+++ b/media-gfx/digikam/digikam-6.0.0.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="Digital photo management application"
 HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
+IUSE="addressbook calendar gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
 
 BDEPEND="
 	sys-devel/gettext
@@ -66,7 +66,6 @@ COMMON_DEPEND="
 	)
 	calendar? ( $(add_kdeapps_dep kcalcore) )
 	gphoto2? ( media-libs/libgphoto2:= )
-	jpeg2k? ( media-libs/jasper:= )
 	lensfun? ( media-libs/lensfun )
 	marble? (
 		$(add_frameworks_dep kbookmarks)
@@ -124,7 +123,7 @@ src_configure() {
 		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
 		$(cmake-utils_use_find_package calendar KF5CalendarCore)
 		$(cmake-utils_use_find_package gphoto2 Gphoto2)
-		$(cmake-utils_use_find_package jpeg2k Jasper)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
 		$(cmake-utils_use_find_package lensfun LensFun)
 		$(cmake-utils_use_find_package marble Marble)
 		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild b/media-gfx/digikam/digikam-6.2.0.ebuild
index 4478b85ae239..d28773546dc8 100644
--- a/media-gfx/digikam/digikam-6.2.0.ebuild
+++ b/media-gfx/digikam/digikam-6.2.0.ebuild
@@ -109,6 +109,7 @@ RESTRICT+=" test"
 PATCHES=(
 	"${FILESDIR}/${P}-googlephoto-upload.patch"
 	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-imagemagick-7.0.8.60.patch"
 )
 
 pkg_pretend() {
diff --git a/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch b/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch
new file mode 100644
index 000000000000..264da2c34f29
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch
@@ -0,0 +1,14 @@
+--- a/core/tests/dimg/magickloader.cpp	
++++ a/core/tests/dimg/magickloader.cpp	
+@@ -139,7 +139,11 @@ int main(int argc, char** argv)
+         if (inf->encoder) mode.append(QLatin1Char('W'));
+         else              mode.append(QLatin1Char('-'));
+ 
++#if( (MagickLibVersion >= 0x708) && defined(magick_module) ) /* defined since 7.0.8.60 */
++        QString module = QLatin1String(inf->magick_module);
++#else
+         QString module = QLatin1String(inf->module);
++#endif
+         QString mime   = QMimeDatabase().mimeTypeForFile(QFileInfo(QString::fromLatin1("foo.%1").arg(module))).name();
+ 
+         if (module != QLatin1String("DNG")  &&
\ No newline at end of file
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index ecd67d93ecd3..2a141d808c7a 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,7 +1,9 @@
 DIST DisplayCAL-3.7.2.0.tar.gz 10536990 BLAKE2B c3e0c1b75c10911b1624d56f4e5d612eba8c257b5abd8a4632f13d91285283d870d928ad3eb17a9cd620b7fed4b9e5414495e12227fb2b94e3da2551d14042bd SHA512 f516376a84680daa2baffa0b4738f52e5dc6df374ae5d97ed385430e2744a087e044faa4929fdc84b01d79878b44e15eda5fa75b40b8a78e6962f66fc06876d4
 DIST DisplayCAL-3.8.1.1.tar.gz 10611516 BLAKE2B 797c20aa7d26014ce5d039de352639b6d9f045eb06701044a0cb4a1b34c9744b0ca4f659a33cd23d16fe918e5d7e270def4ecd5007ddfc82682b486d3a413e44 SHA512 75d4ff038ad4f98b2d234b99d473a9e951983a607c28bc4eadcaa89bcfaa02ca13ed18fca8d4608cd881f215cbb37c36f91f7862a8c83541423524aca35b4688
 DIST DisplayCAL-3.8.3.0.tar.gz 10602825 BLAKE2B f74df1b9c1c9a63c84c3f78e1d38324075a65c54e289fe6c1a1871af69046f49e2b893f82db0542ad6062cd5bab4c3ffa98a25f21f428a9cb50483337a84e3c6 SHA512 8ede8200910dbef3d81e7d3aee89dd67f1f7ee3f22a8205780c63a05673ca7273e9e4138c418c7bc1e6c57240aab79453949d97a0651fbbbc4926b80cd50a8cd
+DIST DisplayCAL-3.8.5.0.tar.gz 10605505 BLAKE2B fa268780e34f485e7c90caccc5a76b70131520730be41b74f7b855e843c32ee10af1aad64412842dc85c9a1fbe28e74b9062f23183fa7cf3cde0381c64c8b7d4 SHA512 8c44a4524796174755d306a93e9f03c06b1c219b5173c081ed6456d6bcbb725a8e9c424acdf420dc444f10eedcff935bc93e399f1609b6d8a454e486e8207974
 EBUILD displaycal-3.7.2.0-r1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
 EBUILD displaycal-3.8.1.1.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
 EBUILD displaycal-3.8.3.0.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
+EBUILD displaycal-3.8.5.0.ebuild 1597 BLAKE2B b916779c94482492e7c5afb4c14df42112e57aacc9abd225ff6734aa1b826329a60077dfcf4f36ca2a0d423036e16126a151226b47a992770b1048735c7a07d0 SHA512 6be4e0594baa19567b31f7a1daeabcfc1bb6a9a21c8212003de604588dfcff97ec97c17f18c2dd7ab910e6dcf69697c0f50a1e4be623e3f798bc8661bceb3e82
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.8.5.0.ebuild b/media-gfx/displaycal/displaycal-3.8.5.0.ebuild
new file mode 100644
index 000000000000..6d9baac97b2a
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.8.5.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils xdg
+
+MY_PN="DisplayCAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
+HOMEPAGE="https://displaycal.net/"
+SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=media-gfx/argyllcms-1.1.0
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	>=x11-libs/libX11-1.3.3
+	>=x11-apps/xrandr-1.3.2
+	>=x11-libs/libXxf86vm-1.1.0
+	>=x11-libs/libXinerama-1.1
+"
+RDEPEND="${DEPEND}
+	dev-python/faulthandler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.2.1[${PYTHON_USEDEP}]
+"
+
+# Just in case someone renames the ebuild
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Do not generate udev/hotplug files
+	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
+		-i DisplayCAL/setup.py || die
+	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
+	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
+		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
+		-i DisplayCAL/postinstall.py || die
+
+	# Remove deprecated Encoding key from .desktop file
+	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
+
+	# Remove x-world Media Type
+	sed -e 's/x\-world\/x\-vrml\;//g' \
+		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index ba666d4345ed..9944bc61dbfa 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -2,5 +2,5 @@ AUX exact-image-0.7.5-libpng14.patch 2435 BLAKE2B ca832920ad7bd1b2f1def6faa04e0b
 AUX exact-image-0.8.1-gcc6.patch 6101 BLAKE2B 3dba7f2688a5c59282486f492131edaf104c3c9e7d335f1893467ef6d968b466e344ae1c1992ea080cee4d267001dd6555aaea3a23dfbb0a5748c5262d364fbb SHA512 e11a9dca3c5c6ac4ca5557e6ca212354346b307c38abe77ceaea9f15ef35f5a8de8d24628b290c4ecfdaf84dee44af49414d57c89b067e78b60a02d4e09a5dd4
 AUX exact-image-0.8.1-libpng15.patch 754 BLAKE2B 81b47c6198103f37cc5f0a382001129a10140bead8f98119eb52079ed97d67d9bfd56b60278023f680d66107aaa6f2dea4a035a194c404e33e548f2e37f90f49 SHA512 7f3d271d908e55e3731b38e072dcadcb0d99cbf3de327d5bd486e232c2827055b8f712052e04c9bc81b20fd42d27cc18627a6bc118c9d1ece58b91c18fa9bf13
 DIST exact-image-0.8.1.tar.bz2 283660 BLAKE2B 49aa68640b785da59fd0e04d0a0892ad06adbc286a98bf908e60e77cfd273263e83dce3c9eb75c30f422c2b6eef2178dd0585aada63f992291abf298b369f3aa SHA512 0adc51c5a29415e236a963cfdaf8f5527e628e9a645e87d00c69a7185e60639cfcd9b1c2b4c3abe1826c5364f0c5d45a0ebb8923cfed53d041d1d36b2604b565
-EBUILD exact-image-0.8.1-r3.ebuild 2641 BLAKE2B 098d5785cf1ee6cb3c534e105a4c83a91d4ba95b24ebb5cd7ab5e35b2ec43d1d8ce1f9e4d907445234297859a7e634bfcec99befc12a8177b4ec75d79d37fa09 SHA512 102ecdbbface34c0b8f773095bdf97284e76c4eaa9baf3180afc3f0a66cca8a931c4864aaa8809d0ecdcce29329f3075e2d6e13d375f181d755bd4507778e44c
+EBUILD exact-image-0.8.1-r3.ebuild 2591 BLAKE2B 07f2f6c12f8407e28d566194fd625b6f7883859442c5720a33cfa4448e518ae5d04d5d9453c70426db0fbde4fc51fe172181f408c5f33676c33ce7caf2db5b66 SHA512 49c37dac5ce842452dd001842cb957ef892fb2a8b6f9d13d7bd52515146dad5b330d8e9fa7d4b438f4a5d1533ba97766a642708a056d07eed8f0d516879ef488
 MISC metadata.xml 337 BLAKE2B fa437dc19cd237e491f57598a2305280c39b6218eded9646d51220eb6f914ae5928946495f1441c3cfb2c3b6a3b57a3d0b5c22ca5ed5685ccc37e00282cc1a1b SHA512 733bb28cd21c30454b7e0f62ab91f88d6b4df6694eee70d9854336421d905c5babfb7e1d169849ca5109253a16c8fe5c8b7482c65cb1de1bbae038024c2934f0
diff --git a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
index 7aae44b93438..5eaeb57c3e47 100644
--- a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
+++ b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,13 +13,12 @@ SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="expat jpeg jpeg2k lua openexr php perl png python ruby swig tiff truetype X"
+IUSE="expat jpeg lua openexr php perl png python ruby swig tiff truetype X"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="x11-libs/agg[truetype]
 	sys-libs/zlib
 	expat? ( dev-libs/expat )
-	jpeg2k? ( media-libs/jasper )
 	jpeg? ( virtual/jpeg )
 	lua? ( dev-lang/lua )
 	openexr? ( media-libs/openexr )
@@ -91,7 +90,7 @@ src_configure() {
 		$(use_with tiff libtiff) \
 		$(use_with png libpng) \
 		--without-libungif \
-		$(use_with jpeg2k jasper) \
+		--without-jasper \
 		$(use_with openexr) \
 		$(use_with expat) \
 		--without-lcms \
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index af2527309d7b..b3ca9b82f5a9 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -1,5 +1,7 @@
 DIST fdm-materials-3.4.1.tar.gz 20852 BLAKE2B 7ad125e62c1a1cf2a05440c6ef593bf5115e6998d1a2d190063eaaadf8b9d0d93a1c98a1f2fdf672657e2c47159cc49ba6402e47ef5b55b880a8f0a7bffc9969 SHA512 c635bb3d3875e10abdc8f54c22ee74abf678cf8409ebeda6f083ac368025f90bd1871f9b13ad94c843f80073e0ae20d1dc08e80bed37ea7e2bfb3161d8ee8f0d
 DIST fdm-materials-3.6.0.tar.gz 23037 BLAKE2B 842edbbef94dbf8a775d81bae3b6621dfeff9ba5cc8d9986ad672f95fe864007c931ef37d38c8702201d286c1cdb9770ab5709e364335833fd40c8c1e4c0f68f SHA512 1f868b716135a3b81495ed6445794c4d5cddc618dbf7a19b29ccdddbcd1d6f9d49190be7cea99c6dd2b8c07f1126973f1c43b223ff213ce04b6fe8811c71a577
+DIST fdm-materials-4.2.0.tar.gz 29011 BLAKE2B cd167506070e5609b0e464cb547271008b9f500312e378c9d8a16ae71cdcbde0efbd91bc0149f56ea9d9c9cf97f4a946810c542a4a0d8350344b48393dacc070 SHA512 02981374d4abcbfbcbace5b6b5d5542d4a5cc65ddf3a47569e34ad94284df56fdcc5f674801ee74c12034c502df8e5cca84a077f648f81557067f0044bf7bf9c
 EBUILD fdm-materials-3.4.1.ebuild 427 BLAKE2B f0c2ffd1704db661214fadee859f5ecb9a1653c7921649d5f75a7d90d1c22a5441cc614fc664943b4e2b1805d6d2a9e38a48c1ec6de8f029ff3df78ffed6587b SHA512 3ddb73a72ae39f3061c813f367cc5088b11617fde22acb7c77d43977174b4f00b156e1cf923ebe231c3a261e3684e9bbfecdc7bb9f08c08de3398a83b8c7ac44
 EBUILD fdm-materials-3.6.0.ebuild 424 BLAKE2B 86abac9f2f32f709c5e2dde549df6758108d22945a55fff32f4be6c2bf3842c210af686f00a6c403f0ae13611062e300cb4e235d4bd8fd25c0cf281fcda31f7e SHA512 aaaf876fe1c373061e94067ba1c89af62fb4836c44c7115c55d7684f01be6f11653850b94b029fdc56e70fc861eb44325aa946feac81d1ac0f06c3d48d8a7264
+EBUILD fdm-materials-4.2.0.ebuild 424 BLAKE2B 8caa956e8d16c27729c9f36acacdeba194635770824e8f110ff642b38bd7d37b958fa197aed9cd991c71f5fd696597329f872771a403c5df3715917465bdf1ac SHA512 9815bdcb1df46f6b37ef20761bfe9e8b9a954773072ac9eb316bc34e3320ca8bc3714d42c7de06bbba6ec9a45c0476187701943de93e3e275cedd6bad97c08f2
 MISC metadata.xml 865 BLAKE2B faf20efb80033c67c5b6cacbb3679368e6f7e8a63587aebb6a5e1569a2594620d3b657f14baee3bc39046993a0e285ccd3a02e888bd19bd885735f5a731b16fc SHA512 a083d711722c5896ebe0b9f2f8d5084e3e8fb2456c8b201eb2aae775c2e6a0b8a596a6e37f8b0e2015ed0e5095b05331257f916a77ca4df739af82d9a3802738
diff --git a/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild
new file mode 100644
index 000000000000..e2cea43f6d83
--- /dev/null
+++ b/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+MY_PN="fdm_materials"
+
+DESCRIPTION="FDM materials for media-gfx/cura"
+HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index a31f41a92635..1440366ac25b 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -6,6 +6,6 @@ DIST feh-3.2.1.tar.bz2 2112281 BLAKE2B 2918d2714f0557e1b67284709bce22c5e14d8f7f5
 DIST feh-3.2.tar.bz2 2111743 BLAKE2B 2fd9838845bb86cc17d99650ac595c2b9f573be30d6ea86512a37a2f0439b10d6fe0b6bc028b81d03219530db2c0c58b1e6642834c32a621b191a310d53c7499 SHA512 f87d07edb9aa098a6c71b37306c42fdfe2b9cdb8cafcd72dd04f82b5a79da47c4e55979a0a8365fe22681f857215120009c84cde34b6f36e599522a2c4af6f70
 EBUILD feh-3.1.1.ebuild 1497 BLAKE2B f6e2659966cface0e1f154b219101caf560c075699545d52611e5c5f4f49fa8caafe9b96a06e7a8b06712cf5023feef0433fea82c377a08b737c41fb70dded2d SHA512 73681572193a12dfdb2c7bbb8bd99a29ebfda1ef01be4664ca7664afa00e8633ddaeb0a7929859882f9c0f8cf8a10b09c40efcd0fa9fdb1b877d49e4acdd18e9
 EBUILD feh-3.1.3.ebuild 1501 BLAKE2B 1e2bfdded6414e79a76ba2365246e9baf5d525b999e0a3f61a692b1724b3d2455567e924b6c2c675519c78d1ad3845479429e149328140854f02d78f9d9d9932 SHA512 702a19de9be1bb591d2daadd4285bd9a942de5ebda401de2f62ca03984ee0f68bc437689b405c35aa405e641638e98ef8c9d765b6f8c107a7e19d9c2181bc764
-EBUILD feh-3.2.1.ebuild 1499 BLAKE2B 489e7f623f23880664087c68d4b25eb5e9b4330074e64c30a2f01e2964aa36e4deb3f5ef1004665efb0f3e70340822ffac01a62732cf938a3595b33722bf8007 SHA512 9cf8fdc24b77d0d4b12ef3747d832c2d845c96bf66e0de6c452b315f81c99985ae1f12d6f1f8f1bcf96c9a36cac0549e9cbd642b34450d7196331a6160919b52
+EBUILD feh-3.2.1.ebuild 1522 BLAKE2B 79c8a59656764fc43e28f15616dc26ffd40b81b1417d885e5c1b89e32a6ff854c7b6af763acddd0897ce58bf0231eb7250319090c48fa282f14218dfb477edd2 SHA512 6e4ef3a5b5a962510bbce7957b09b11d46111ffd10593159d965bd86e09c7da7800175459b8cdc553a58ac616d146a7752253cf72afd6be003cf93be81eb5409
 EBUILD feh-3.2.ebuild 1494 BLAKE2B af02b7ba7319db9101fd13ed9e3bf797b11aff36591802cd7a3bf3a6f32b728ed392d6e9ae579a2f7e0fec94709e6ba0da9885c205ef56610b8e0cab070a22d9 SHA512 17ec2bf6d4ae373e9dcf32d2235e2cd3d5149c9e363c71da207c27076073d9f8c6140f8b0538165e96d9cd7cc284fb012c3047a4902e5349af9fdf2e45104d41
 MISC metadata.xml 358 BLAKE2B 602fb8b872f5f209abd20adbb141035c0d0396a7712839c950cfa19e78201c0c39e88fa5e8bebc6224459bb8e328e732ff30db848f6c84510f91830951f2087c SHA512 51fad9cc41f31b03f42e0ac4254ea05a848df755091cdd47ee4ce73f7189acd83e8956c230329ea0053d1f794b529e498525f6ce282a947c9809c4954a5b9a19
diff --git a/media-gfx/feh/feh-3.2.1.ebuild b/media-gfx/feh/feh-3.2.1.ebuild
index c7cdfa51f1d6..42797f5ec3bc 100644
--- a/media-gfx/feh/feh-3.2.1.ebuild
+++ b/media-gfx/feh/feh-3.2.1.ebuild
@@ -10,8 +10,9 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
 IUSE="debug curl exif test xinerama"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="media-libs/imlib2[X]
 	>=media-libs/libpng-1.2:0=
diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest
index e4165582d364..201da58d4720 100644
--- a/media-gfx/fim/Manifest
+++ b/media-gfx/fim/Manifest
@@ -3,5 +3,5 @@ AUX fim-0.5_rc3-jpeg-9c.patch 723 BLAKE2B de59fa7a985fb38900ae3089bbbb20e2efeff2
 AUX fim-0.5_rc3-jpeg.patch 434 BLAKE2B a0de955643df8602a940f42f1727b4d7ae4ed1d65ce62ee32b0bf9882b1143aecf1566bc0328ae2ca7e6fd21d5331b78e43638fb2a295da09a816854e2e22f53 SHA512 e7918287d59a6677f2c0701a3e03871c2913aacb525438e56daf26064192606ff50b82b8334a3f96e1651fce895d7018606e24a06408fe1981a241f8b874dc7c
 AUX fim-0.5_rc3-libsdl.patch 905 BLAKE2B 5ee899dfa13c362ff4b5de243968376bd9c602f1c4d34763c99556fa0aa8ed523480fe4a65043124d5d65ebf67f376768647284db4a8ccfb812b62b33deee858 SHA512 b96dff8e07f44f24aa2324344889c6828f0d913f40a0b9eab8dffc58e3fddecafa36baa18eee08e19cbf5d1ad3996b1cbcda195c3f58f91537ce309a1345150c
 DIST fim-0.5-rc3.tar.bz2 564226 BLAKE2B 117e4a8644f1b7133f8a5337ce1a606017bee81180ff9a6fbd0c19d3056d2e670a84db20f2a0080ff5bf8e6e91108fdc952b77e4799f47968b38a108f145871e SHA512 946825e683a9020740b6e2115e44e4cd99b4d6bf59fde53d08d90666f00cdb8d98797d4e88b4513dd0e8d8fe5fbab3073cb1aae72117d129688050adf73da306
-EBUILD fim-0.5_rc3.ebuild 2714 BLAKE2B 931cad86c682320640e635d81afee47cddf15aa28261c0902c81ddc699cfba0a650ffa5072bf15dde38134f3deadf2a5ae786e7ea81599cc7e18f2babd2e0a38 SHA512 8f0bba1ac27b1a619c046a99a00dcfe043f50a3103855669606459a2f60a6adcfebbbc3eaab404240cb5e89df894e85a45ee5ffe6efadd8695dd8cb0ce2faa69
+EBUILD fim-0.5_rc3.ebuild 2663 BLAKE2B e4e889c479a1e30e50d7c7be2e6e35a028e3f49019532eecbf4ef4194e8e12c6cd52547e91de701dc7e7bbe13f6f2e1da6eed514b59ea9d25d9e73364c36902e SHA512 4237acd6fd0e3df020e764f8666df76240ea68bc99d83745e771a636eeecd29b064db7de2237669ab271a751baf67d5e233b93595ab5fe7a1afebee4044a2d4c
 MISC metadata.xml 610 BLAKE2B ef1a0623bedf204e2f261325be02fbb452355b2a9266afc320f81298cd1ae6b4bcb15f44713cb8640abcbf00b977294a6ca38f702e40fc5b6ce0c78b98b2b267 SHA512 4fdac65cfd930aac84e304c61addb77f7e19db8436ea477035615c93411449b5f3d314ee8b02864caed85d743d0f97c9d93e14dc4e513c048dd65223f788cef0
diff --git a/media-gfx/fim/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild
index 3e4bdf97f88a..dc44d837674e 100644
--- a/media-gfx/fim/fim-0.5_rc3.ebuild
+++ b/media-gfx/fim/fim-0.5_rc3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/fbi-improved/${P/_rc/-rc}.tar
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="aalib bmp dia djvu exif fbcon gif graphicsmagick imagemagick jpeg jpeg2k pcx pdf png postscript readline sdl static svg tiff xfig"
+IUSE="aalib bmp dia djvu exif fbcon gif graphicsmagick imagemagick jpeg pcx pdf png postscript readline sdl static svg tiff xfig"
 
 RDEPEND="media-fonts/terminus-font
 	aalib? ( media-libs/aalib[slang] )
@@ -23,7 +23,6 @@ RDEPEND="media-fonts/terminus-font
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	imagemagick? ( virtual/imagemagick-tools )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
 	pdf? ( >=app-text/poppler-0.31 )
 	png? ( media-libs/libpng:0= )
 	postscript? ( app-text/libspectre )
@@ -62,7 +61,6 @@ src_configure() {
 		$(use_enable graphicsmagick) \
 		$(use_enable imagemagick convert) \
 		$(use_enable jpeg) \
-		$(use_enable jpeg2k jasper) \
 		$(use_enable pcx) \
 		$(use_enable pdf poppler) \
 		$(use_enable png) \
@@ -75,6 +73,7 @@ src_configure() {
 		$(use_enable xfig) \
 		--disable-hardcoded-font \
 		--disable-imlib2 \
+		--disable-jasper \
 		--disable-matrices-rendering \
 		--disable-xcftopnm \
 		--enable-fimrc \
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index e488afff7d1e..1690771ed8d8 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,7 +1,9 @@
 AUX geeqie-1.4-exiv2-0.27.patch 2052 BLAKE2B db7bb4d2631d566e4c9dbc89cad262cfb173df96b92ea83a690bdcdbbb7d3c873e9e5bd5a581c45b3a4af42c3c7711c65080e1822eaa31be97632b57d4e34713 SHA512 b8108f9a77022f1a0d1354883d1f7a1981a8079e675e765aa67fac16606ed42ecc169ad5cb8a6baf86e919d6ddf018ed54bf5950b9601d2cd1ff647f7fa47bca
 DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
+DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac
 DIST geeqie-1.5.tar.xz 1585780 BLAKE2B 6dc0a30c26f25988cbd3fa81a916642504e9f6f280b03d78c820cbf5b453d8a392d3c8da8d482de24b3c39e7e9ba0663879d651c60a8061b8034d2c526007944 SHA512 2b87d543d8d77a4fec331fd1b73ca2038912362fc1f94c9b0f163dcc7c2dd58118e175c5540aecafb0581708ea5c2a5a321dde09f644e2322bd4ca5c0284b722
 EBUILD geeqie-1.4-r1.ebuild 2396 BLAKE2B 4fe4b8aee881eb138f5b8bf2a7199c18858d45586220c549173d13d8ab5e200b143e8aca3ab623bb9e507419d6b5e5027c63a47d72d4606355a3e9adc03381ea SHA512 5b4b13476620aeee811cd06f357c2fc49a1e732f68a0508715ba113b02688440738edb4799f53adf2a79c713e22c3ed19ef376981b2aed9be884bedd70880bf0
+EBUILD geeqie-1.5.1.ebuild 2277 BLAKE2B da3871fd0cf5af559c1443bb711c2b4a2b78402c4b7b1310930dafdeb41775adfee11862471bbb829531901d5f0bc518de56933880507d6de1aebf713163e2f4 SHA512 b1106f2714c659432ccf384671bd15a0f39cf5bd5d1a883088a15f0bac57ca2749184ed795103d21e6ff48e45818c6330b91702724deb37cb06033cd36f8c87b
 EBUILD geeqie-1.5.ebuild 2277 BLAKE2B da3871fd0cf5af559c1443bb711c2b4a2b78402c4b7b1310930dafdeb41775adfee11862471bbb829531901d5f0bc518de56933880507d6de1aebf713163e2f4 SHA512 b1106f2714c659432ccf384671bd15a0f39cf5bd5d1a883088a15f0bac57ca2749184ed795103d21e6ff48e45818c6330b91702724deb37cb06033cd36f8c87b
 EBUILD geeqie-9999.ebuild 2269 BLAKE2B 719319e9805f58a4f1dfaea869c911f1ade15e762ba46add49975f17b38a6e3909b74e0db223082c06ae55c0aa655389ab5a10e75d4d1dc85552e55105fe29d0 SHA512 8435b9882a9a767af7592bfb59e32d47f0f01e932eac23f920bf0933ae1ae3044302205dd6902fe490c6f995d669b1eaf62b141cc66538444bd5d57d39d896b4
 MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/geeqie-1.5.1.ebuild b/media-gfx/geeqie/geeqie-1.5.1.ebuild
new file mode 100644
index 000000000000..5323596a4a94
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.5.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg-utils
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="http://www.geeqie.org/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
+
+RDEPEND="
+	virtual/libintl
+	doc? ( app-text/gnome-doc-utils )
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	gpu-accel? ( media-libs/clutter-gtk )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	lirc? ( app-misc/lirc )
+	lua? ( >=dev-lang/lua-5.1:= )
+	map? ( media-libs/libchamplain:0.12 )
+	pdf? ( >=app-text/poppler-0.62[cairo] )
+	tiff? ( media-libs/tiff:0 )
+	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="gpu-accel? ( gtk3 )
+	map? ( gpu-accel )"
+
+src_prepare() {
+	default
+
+	# Remove -Werror (gcc changes may add new warnings)
+	sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--disable-dependency-tracking
+		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable debug debug-log)
+		$(use_enable ffmpegthumbnailer)
+		$(use_enable gpu-accel)
+		$(use_enable gtk3)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable lua)
+		$(use_enable lirc)
+		$(use_enable map)
+		$(use_enable nls)
+		$(use_enable pdf)
+		$(use_enable tiff)"
+
+	if use exif || use xmp; then
+		myconf="${myconf} --enable-exiv2"
+	else
+		myconf="${myconf} --disable-exiv2"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -f "${D}/usr/share/doc/${PF}/COPYING"
+	# Application needs access to the uncompressed file
+	docompress -x /usr/share/doc/${PF}/README.md
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog "Some plugins may require additional packages"
+	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
+	elog "- RAW images plugin: media-gfx/ufraw"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 17b51fa580b0..9afbbf7a7b9f 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -17,7 +17,7 @@ DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26
 EBUILD gimp-2.10.10-r1.ebuild 6019 BLAKE2B 95f0b465a05852fa14ee4ec2ba24cd9e950a3f8ca177934ad44a557612eb05401c83bb178d76d82993fce4fd4d44ff07ba6c49b67c1474a42a1ead89aa4303e7 SHA512 67daa7288ced9a24f25be60b66774a3a62c9b65625b00b7928a3de80dec36e1bd951614e32c55df47a1f48a7a5997961b435f96a95b0afd17b37e8a3d3ff8f68
 EBUILD gimp-2.10.12.ebuild 6019 BLAKE2B aa9cfa85ba3ac683e7ca56565f15faf6487fc59824ab6d7127b86f10e93277e14fda86aee22cdb81c4f864c0cf8158df13257519f323ab5e96deed817f7b2805 SHA512 43865076a7ce5fe24c732fd95d3e12ca70b712fd0b87a8a96c0377eb73a5ae395b4407c5edfdf69923d9d71ec6db1b3093476ac07d96ef5d6a183787208859ae
 EBUILD gimp-2.10.8-r1.ebuild 6103 BLAKE2B 6425ca47c627119df035049ad207952a63a73db746d5a0555c039db4005eeb50c43751957eacbf47e75ec7ecd2d76a07194241fff733126bc9c0a13eb9bb94f2 SHA512 ff9dc9525d10911d121e44e8c613497771d74f7f271642f58a8c2381c41aae1ef3dc8430161035f551db1a570ee59859a94ed23816d21f9f5a4f405de0b2844c
-EBUILD gimp-2.8.22-r1.ebuild 5175 BLAKE2B 01d76aae6190f14fdc12ad47a22109610a6622b0ee45e2d00ad352ff2a5e1f5b37ee36f15e6bf270cb842ce7f87ec13e92ce386ac908628115a8453706e95bc2 SHA512 f34e4a3d1e7ae474e07b985e5a0c9162bbdb6beec2e65473e0bb421d188e5fae37fe5a2618b9479511b625e3798f29e500f82d0e392b0b820257ebc542cf281c
-EBUILD gimp-2.9.8-r1.ebuild 5712 BLAKE2B f09f553f5d7eb8e8df0af0a316d2d98e9b0a32a204bb43c563927eae5a6dcb3bb4f5ff882bc05ce6ef3f8914939be6296683c382af45bcab877889042c96bc66 SHA512 7474ecdd5a1c785684b79c0007d77f45e475d7220f74960c48e686e7f6b15d82145b154caa802e2774eb34b46b03c5c4a1fc43a8ebc3716fb5f836be4d412886
+EBUILD gimp-2.8.22-r1.ebuild 5123 BLAKE2B e3bc8adfa913bccfdf030ef2a12529a4ca130f033b5cdd0fcb435b99e2a8b0d33ee8ddc73a79e23e031d9474fff35ea8e69fe31568189c5f8a6c2dc605e14744 SHA512 255a75d03da42e7685790dec17afe29185341a7393fe4f5c2166f5dfa0f3eef470f014ccd04d00803a3fc1b1da46402c41773a18019bae05e4e0e1d88531d7e9
+EBUILD gimp-2.9.8-r1.ebuild 5660 BLAKE2B 7ec76e1a703cd5534741651016f86f2d1eb4787f3a93cc52e02b1337c0730b1e08ec7c6a033b96d9e6172754fa8da14ef0e5511d872e09dfe3dcc0016f89a54a SHA512 9266ba66630e65f58c3eb36cb17299ce7bc548e3c9a8f1583160d942d6bfdd59a4284ee7e2d6a7205bf66f3140caecb0e8ad11af3a22727d6866275de93741ea
 EBUILD gimp-9999.ebuild 6006 BLAKE2B 32d782ef463075d2d38662dfba2b04efc4ca2cffa68daecac66cafd496d7466ee5c16ca0dd6ef23b2907562d2297b55265588773745630810e34baca105f7dae SHA512 662bf161d64551f1ce1727ea7be016cb6bbd4ab354c1b3734c87eb3f18d41255158f68cf17a55094791542ea41b6a05537f4ace9f1ba326e919ff02b827e9479
 MISC metadata.xml 474 BLAKE2B 7beaaa52a35415b9460b23f5031f71464008417e589105db607f0f86519cb7f19c9621dc77acea9aa9e67a1bf8f5887415761a69a29eb77aa205a89cc8b586ac SHA512 f1a58ab4fc0c7a4257648f35027d0860ee7b088ebd61703dde7622078bcc345168f3b747e79d71206ae36c479334925aac137e96c0d2134413f9e62aa27cee53
diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
index e81e1b0f1e14..34511189e6a0 100644
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-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=5
@@ -14,7 +14,7 @@ SLOT="2"
 KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
+IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.30.2:2
 	>=dev-libs/atk-2.2.0
@@ -38,7 +38,6 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	dbus? ( dev-libs/dbus-glib )
 	gnome? ( gnome-base/gvfs )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
 	exif? ( >=media-libs/libexif-0.6.15 )
 	lcms? ( >=media-libs/lcms-2.2:2 )
 	mng? ( media-libs/libmng )
@@ -85,7 +84,7 @@ pkg_setup() {
 		$(use_with gnome gvfs) \
 		--without-webkit \
 		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
+		--without-libjasper \
 		$(use_with exif libexif) \
 		$(use_with lcms lcms lcms2) \
 		$(use_with postscript gs) \
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
index 73c30b3307ba..1898a4be6a86 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.40.0:2
 	>=dev-libs/atk-2.2.0
@@ -40,7 +40,6 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	aqua? ( x11-libs/gtk-mac-integration )
 	gnome? ( gnome-base/gvfs )
 	virtual/jpeg:0
-	jpeg2k? ( media-libs/jasper:= )
 	>=media-libs/lcms-2.8:2
 	mng? ( media-libs/libmng )
 	openexr? ( >=media-libs/openexr-1.6.1 )
@@ -119,7 +118,7 @@ src_configure() {
 		$(use_enable altivec)
 		--with-appdata-test
 		--without-webkit
-		$(use_with jpeg2k libjasper)
+		--without-libjasper
 		$(use_with postscript gs)
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_with mng libmng)
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 12bf46c23e08..19d77de7d636 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,7 +1,8 @@
 AUX gmic-2.4.3-curl.patch 2527 BLAKE2B 8bb6a9fb4aff5a1ae19437f93ec4336d87ab61f334a56c1d2083b0a8c02c37697795ea82f37d4caaf23edb37111d201db75315169a12f256571ad081f60b9890 SHA512 1c5cef3879749ab9a62e52ae5ac1c26ab60ff4b323352af9e7fb0f55b3ca7804290d03bd63dcaedb68c3d6fe43da332681a1eeb84543a1ac30163169ccee6368
 AUX gmic-2.6.7-qt-cmake.patch 1765 BLAKE2B ca0f8cd00d2c89f1868a853b18107de20c6fbc192826b1aad2edb3f20bc7619db8cde701e402f0a5e059b0ec54d0a124314d04eb91cdf1992b42d177635c5d72 SHA512 2c6a092cf0ec7e5c613fb673a6008398e470fa018e781cbfa860de6acccd0eb2472d5d787acef29b67176f95b837320db3a9f51726a97c525d21e3e4a3ea5dc0
-DIST gmic_2.5.3.tar.gz 5278154 BLAKE2B 9549798eac0cf0cd869dcaeb14fca184bee3587ec8ac03f80e7f48002dfcd0afe4ad61f2c6a6f1929fb91c010aee3960d6301a0c6c6b6a2f32a7b62db9ddecb0 SHA512 fede101892d6867b83a8995dbc2b7f9e502401bf1ea952fbf95c459c932bb447693d6434e9562b00c9d96f109cbbb35d9ee876fa1f6ec9dfc52186276033e5a5
-DIST gmic_2.6.7.tar.gz 5810623 BLAKE2B 407349683a7871937a37735aef81665ef5b06e5a88d5135e0d4264ce231ddba7ab088645049b1378dd73a7e6b45ada58958986b3282916aba19f7d7735c8bdaa SHA512 18088e33c133ddfa9642295af331d1808e0a618df8a7d3bb7f93d9933d4b6ec2f53a96e5a0f2bca5f1a53b4c7c0628ac7906503be007860fc37907db47029567
-EBUILD gmic-2.5.3.ebuild 4346 BLAKE2B 7d403804948db22dec88c15ac345b8b76237370bbd879a1711154dee5d654b203b20d0416db23d2f313678b6965a42df033c678656d01e7b096fd1e180977d26 SHA512 53fb2252a564a6060587594498277037d3844ee5cf3837ae754104a7304895f3ca9d18fb779cf131b335d346d6b73ab255a3aa301b57b04b754a08457224438e
-EBUILD gmic-2.6.7.ebuild 4381 BLAKE2B 645896b90bcec3677700bc5d7cd633117c3ee7d34be7d146410aaf8aa60aa70bbaeaeac8a274e9ea51eb25f1df7fe664f48a1a2824255b4c3b56ab9b8a106822 SHA512 7b5bb5d476a24ff1f7ece4617482cc4e86cea7931932307671a33f36ba67662f5a7ec64459adf475a0678588690c69d3ce24e743f6040eee27fa45c5f3d63295
+AUX gmic-2.7.1-qt-cmake.patch 1005 BLAKE2B 2b7e5f60788db611859b803cebd5e6e44ee7fac791d97e37fc22290e813c43b7b5d93e8725da2648c19999234f650399eb5fa7c973932f9bb1407fb88a955f58 SHA512 05fd4675cc1b65e4e504ae4c9913566b59b4c69467775a73734f01f9af842b87696c244203e9be75ef26876c452b34edfdfe1ed201ee6cdc934b2ea786c45a86
+DIST gmic_2.7.0.tar.gz 5823828 BLAKE2B 5a59e247ca5eb5f1aad841597fb008d9816e3c968224b8f59e51bc443218292601f8b5eea76353429677eb3ddc3fcf8f8ff28eaedd3a8ec66d84ebeb825fe7d3 SHA512 8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4
+DIST gmic_2.7.1.tar.gz 5843308 BLAKE2B 8a348d9444ba0879816a438161c130e9fc706178f93c6a1202586209f2d3779dfce48d2bd3147b47dec9614e4a3687108913b45e6c91afc8bc6266aabee26012 SHA512 9a2f8536217ba449207022bb1dfc92d3826bea80f8e7a048880c5c4451070e7a09b21c0c17199941284040b8f3661dc93737d0f67975c58b6a7015038c49465e
+EBUILD gmic-2.7.0.ebuild 4397 BLAKE2B da553fd50d27145cdc0fbfac7633e6c3e1c3421e36e59eff0b3635a5ee149d460ab3afa47e094d62ef73231b21f8e3578b43ce829e30d08545c6792bea0a279e SHA512 23b26101bb327a78d2ae907d0de5600835861024bffc0cd75b77e9a571daab212d12812b995f72e213967320d797ed4bab2484ff7f63bf931a6cc24fc86a9a04
+EBUILD gmic-2.7.1.ebuild 4397 BLAKE2B 4cab4b7f8ac92099459cc9c5830cb9adde000943474c3fc246639cce86fae71750a44145ddccb98af24848d047806cd4988d74ba2fa704e09adaeccafdf60726 SHA512 142736b44fe0df5ea579fa8bdf3ad973d6e7c40887c9e47fd06ce7dc5071f980368fdfae8a6c0d50d39bd1654867c47b15688d47a131eeb68f08eb516dc659cf
 MISC metadata.xml 547 BLAKE2B 0da3088e531217099bf3f690059d3725ba3c62ad9337dfbf3817584f95594a328b647b0a81eb4d58c2cbc030026bf2aa94e01c817b04072aea1caee435f6ef9f SHA512 e58e976f8e80eea8e3620888858d6386e5d922c842e08c39f7ad611a5fc96e5fb85e39864bc0e805dd20a2c19e02b9fb8d1a5eaaa470075ed73759dcdcd4fbee
diff --git a/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch b/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch
new file mode 100644
index 000000000000..caf22d04ce94
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch
@@ -0,0 +1,35 @@
+Fix linking with fftw when thread support is enabled.
+
+--- gmic-qt/CMakeLists.txt
++++ gmic-qt/CMakeLists.txt
+@@ -13,6 +13,7 @@
+ set(CMAKE_AUTOUIC OFF)
+ set(CMAKE_AUTORCC ON)
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
++set(EXTRA_LIBRARIES)
+ 
+ set (GMIC_QT_HOST "gimp" CACHE STRING "Define for which host qmic-qt will be built: gimp, krita, none, paintdotnet, or digikam.")
+ if (${GMIC_QT_HOST} STREQUAL "none")
+@@ -145,8 +146,13 @@
+ #
+ find_package(FFTW3 REQUIRED)
+ add_definitions(-Dcimg_use_fftw3 )
+-add_definitions(-Dcimg_use_fftw3_singlethread )
+ include_directories(${FFTW3_INCLUDE_DIR})
++find_library(FFTW3_THREADS_LIB fftw3_threads PATHS ${FFTW3_LIBRARY_DIRS})
++if(FFTW3_THREADS_LIB STREQUAL "FFTW3_THREADS_LIB-NOTFOUND")
++    add_definitions(-Dcimg_use_fftw3_singlethread)
++else()
++    list(APPEND EXTRA_LIBRARIES "-lfftw3_threads")
++endif()
+ 
+ #
+ # CURL
+@@ -187,6 +193,7 @@
+         ${PNG_LIBRARIES}
+         ${FFTW3_LIBRARIES}
+         ${ZLIB_LIBRARIES}
++        ${EXTRA_LIBRARIES}
+ )
+ 
+ if (CURL_FOUND)
diff --git a/media-gfx/gmic/gmic-2.5.3.ebuild b/media-gfx/gmic/gmic-2.5.3.ebuild
deleted file mode 100644
index bfd30752357e..000000000000
--- a/media-gfx/gmic/gmic-2.5.3.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake-utils_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		PATCHES=()
-		cmake-utils_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake-utils_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}
diff --git a/media-gfx/gmic/gmic-2.6.7.ebuild b/media-gfx/gmic/gmic-2.6.7.ebuild
deleted file mode 100644
index 2a1fe822e6ef..000000000000
--- a/media-gfx/gmic/gmic-2.6.7.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
-	inherit git-r3
-else
-	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
-	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
-	qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5=
-	>=dev-qt/qtgui-${MIN_QT_VER}:5=
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		>=media-gfx/gimp-2.8.0
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:0= )
-	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-	openexr? (
-		media-libs/ilmbase:0=
-		media-libs/openexr:0=
-	)
-	png? ( media-libs/libpng:0= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
-	qt5? ( dev-qt/linguist-tools )
-"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
-	cmake-utils_src_prepare
-	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-	if use gimp || use krita || use qt5; then
-		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
-		local S="${S}/gmic-qt"
-		PATCHES=( "${FILESDIR}"/${P}-qt-cmake.patch )
-		cmake-utils_src_prepare
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
-		-DBUILD_CLI=$(usex cli)
-		-DBUILD_MAN=$(usex cli)
-		-DBUILD_BASH_COMPLETION=$(usex cli)
-		-DCUSTOM_CFLAGS=ON
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_X=$(usex X)
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FFTW=$(usex fftw)
-		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DENABLE_JPEG=$(usex jpeg)
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_OPENEXR=$(usex openexr)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PNG=$(usex png)
-		-DENABLE_TIFF=$(usex tiff)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_DYNAMIC_LINKING=ON
-	)
-
-	cmake-utils_src_configure
-
-	# configure gmic-qt frontends
-	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
-		-DENABLE_DYNAMIC_LINKING=ON
-		-DENABLE_CURL=$(usex curl)
-		-DGMIC_LIB_PATH="${BUILD_DIR}"
-		-DGMIC_PATH="${S}/src"
-	)
-
-	if use gimp; then
-		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
-	fi
-
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
-	fi
-
-	if use qt5; then
-		mycmakeargs+=( -DGMIC_QT_HOST=none )
-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	# build gmic-qt frontends
-	local S="${S}/gmic-qt"
-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README
-	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
-
-	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-	insinto "${PLUGINDIR}"
-	doins resources/gmic_cluts.gmz
-
-	# install gmic-qt frontends
-	if use gimp; then
-		exeinto "${PLUGINDIR}"
-		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
-	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
-}
diff --git a/media-gfx/gmic/gmic-2.7.0.ebuild b/media-gfx/gmic/gmic-2.7.0.ebuild
new file mode 100644
index 000000000000..d4bacf387446
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.7.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+CMAKE_MIN_VERSION=3.9
+
+inherit cmake-utils bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
+	cmake-utils_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )
+		cmake-utils_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake-utils_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}
diff --git a/media-gfx/gmic/gmic-2.7.1.ebuild b/media-gfx/gmic/gmic-2.7.1.ebuild
new file mode 100644
index 000000000000..bd8a5d1a186b
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.7.1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+CMAKE_MIN_VERSION=3.9
+
+inherit cmake-utils bash-completion-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	|| ( cli gimp krita qt5 )
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		>=media-gfx/gimp-2.8.0
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
+	cmake-utils_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
+		cmake-utils_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake-utils_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index fe0b948280d2..56d401164784 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -2,7 +2,7 @@ AUX graphicsmagick-1.3.19-flags.patch 1800 BLAKE2B 50f4f0de0cb3842fb84e136038bc0
 AUX graphicsmagick-1.3.19-perl.patch 491 BLAKE2B 6a6465162d9a4d7d09b1edb425cc7114cd4e0fc65e48f15c8c2a854fe835fd1fe94c56611c6d2744d9e26884c57b1f67353bfd32abe2f25a145dd7abbf5479f0 SHA512 da114b891ec923253048d90ee14f136742072bcb70e512e8d2838bbcac57b5fe6ea580cdccfd1bba5156777623c43e946ce2a8661f88612d4c24849bef0fb865
 DIST GraphicsMagick-1.3.30.tar.xz 5496116 BLAKE2B 408f68334b290ae30d06e4b0efa6e11e89ffa9c00781e2f0ceb25cd6fc308f1be86b5ed9bd52f594e1abd3351f1b7dbfb12e87117ba85f4b4c01d07d7480772a SHA512 4f04245b8abef85de96a1527ad4adc1fadea144a1917db3ea21632a9fe732bdaa7021ffdbbeb7c2ead814ca7b6a14e81bb68a962bbfb64fa6809a235f1b0be5c
 DIST GraphicsMagick-1.3.32.tar.xz 5535224 BLAKE2B 96fd7bfe62b4b1b25f9ffc0ff8e2ac023f0528b9af857fc27a5a9cd1123eeb6533b868c7bad8dca5b58e114a674dda009a62904df64622d7b5f3c0d72156283d SHA512 f84cdb9318962aed1dc25d70db4d0ca102e4f88748f468f8a56b77d228fd315b772afa48e90a396d32e8226eba9105717bcb94166bbe43723afeec58ead53e09
-EBUILD graphicsmagick-1.3.30.ebuild 3251 BLAKE2B 78eecba484d87f81e0ee12d119a84fabc3c052ab7b63b92acff37c0b9b751a4e99fde3c1bd14c6e8dc20a97ecbd94c0f0c558d28a13e4b1523b29c75d61899cd SHA512 165fc7bad883df3be55c9b5714d6a284d9c97e5c06f0e13a08ac783fd946e39b6b929bd9ea17b4284c312830f46edfb536131bf730eec52bd2249c5420569519
-EBUILD graphicsmagick-1.3.32.ebuild 3127 BLAKE2B 2a4540afca44015cfc62abf58ffb8fe2dbab6ba0ede0d7c88e69d0a2fdc1cfb455f8e7d431d21a66484c281d97df9c723e3dfb26c8594e7f9b5fc76e9d0b5075 SHA512 af8dee65ba2968c97ef395bc8f98108a0458915cfe5ac4f121562c5449f9610f17a83fc0a2f43e435d313a565c51ed93198053b910c638695ed8e521d918e70c
-EBUILD graphicsmagick-9999.ebuild 3135 BLAKE2B fdfe63bdefa557c18eb456ca5df0e962f35cb581b6b598bdd607e5fc2b96157b7a004d052286a843541fe68437990cd6116688b5311ee6bab3a4b980a8a6030d SHA512 4212db1adb020fcbf49780bcc446379d4463a446b74e98e0c1105ff08864526a931de33f3b869145c7af2bc093c281329349b6617a762d29a915a4efbad7ebe6
+EBUILD graphicsmagick-1.3.30.ebuild 3199 BLAKE2B 597ef8d64f543bff9608fa6da4ddf4dce970f442f6d63379b852334034af8c77d31fd1c991d3a417f1c3d2cb85efde9d172855033d179efa63180ee16985ed3a SHA512 e0d56fe46e7db5d4edb6daba05f67d1b8195e9848853d18758f90c84b940f603a3dd7ab87cd551411463427c34a0e15d05a1ff689561ff61cdb6f2f0ef7e51f8
+EBUILD graphicsmagick-1.3.32.ebuild 3078 BLAKE2B 1cd7cb306fbf4d3baa486f7e67c04e90bcfa9f935eb575081a8bfc466ba9c765a9611dc11ac3934ba564acb219fdd99a6274a9121bec82833cbd576b3f16ce80 SHA512 b190ef3600306bcbf7f8b4f6ea9cbdf95df6a28006432e0ca64744235115ddff555b4bca0567e8f68a6052791a200c65dd9f1470caeb55a895016286ee7cc6f3
+EBUILD graphicsmagick-9999.ebuild 3086 BLAKE2B b35c96dce03fc5a79984dac377e06c6bb1d2e1296259e41f7950246477c37812844216213de7a1cd8acb93b09f4704b34861082e1b7bce368d0f596bb7541ef5 SHA512 cb157997a92053a7db43f06fa5577a00e0e552569e014e4d9e00be0bbf7c67863a01cef9038ced632881625defc468e954bc516a5c64cd52678c0576e89fb100
 MISC metadata.xml 1154 BLAKE2B f94864df05c239bd37ec05d00068e934e60e8dcbe03e52020df7d830842be94c08dbf339eca919c4e7fe18d5ad62bf3077ac9877b18ef6f09fd2b9f52c31aba0 SHA512 9bdbcace99fd11f192bea183b5d84bc9b2d06979db21d1a9a3e57677a4438f24a5812619c73a0becfc7fb81140414199fde3d0e8811abf1a92322535529f5d2c
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild
index c2e602abf0f9..b25de4573ef1 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ else
 	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
-IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
+IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
 	perl png postscript q16 q32 static-libs svg test threads tiff truetype
 	webp wmf X zlib"
 
@@ -29,7 +29,6 @@ RDEPEND="dev-libs/libltdl:0
 	imagemagick? ( !media-gfx/imagemagick )
 	jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
 	lcms? ( media-libs/lcms:2 )
 	lzma? ( app-arch/xz-utils )
 	perl? ( dev-lang/perl )
@@ -96,7 +95,7 @@ src_configure() {
 		$(use_with jbig)
 		$(use_with webp)
 		$(use_with jpeg)
-		$(use_with jpeg2k jp2)
+		--without-jp2
 		$(use_with lcms lcms2)
 		$(use_with lzma)
 		$(use_with png)
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
index bded4bb6077f..a6c6969f857d 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.32.ebuild
@@ -19,7 +19,7 @@ else
 	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
-IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
+IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
 	perl png postscript q16 q32 static-libs svg threads tiff truetype
 	webp wmf X zlib"
 
@@ -29,7 +29,6 @@ RDEPEND="dev-libs/libltdl:0
 	imagemagick? ( !media-gfx/imagemagick )
 	jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
 	lcms? ( media-libs/lcms:2 )
 	lzma? ( app-arch/xz-utils )
 	perl? ( dev-lang/perl )
@@ -93,7 +92,7 @@ src_configure() {
 		$(use_with jbig)
 		$(use_with webp)
 		$(use_with jpeg)
-		$(use_with jpeg2k jp2)
+		--without-jp2
 		$(use_with lcms lcms2)
 		$(use_with lzma)
 		$(use_with png)
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index 996bba55fa4f..4f5912885556 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -19,7 +19,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
-IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
+IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
 	perl png postscript q16 q32 static-libs svg threads tiff truetype
 	webp wmf X zlib"
 
@@ -29,7 +29,6 @@ RDEPEND="dev-libs/libltdl:0
 	imagemagick? ( !media-gfx/imagemagick )
 	jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
 	lcms? ( media-libs/lcms:2 )
 	lzma? ( app-arch/xz-utils )
 	perl? ( dev-lang/perl )
@@ -93,7 +92,7 @@ src_configure() {
 		$(use_with jbig)
 		$(use_with webp)
 		$(use_with jpeg)
-		$(use_with jpeg2k jp2)
+		--without-jp2
 		$(use_with lcms lcms2)
 		$(use_with lzma)
 		$(use_with png)
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 673496a8aa02..7ff479ae65da 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -5,5 +5,5 @@ DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 EBUILD libimagequant-2.11.7.ebuild 1191 BLAKE2B 61db0687381d1ad9c124e94be50b93bba3d70a3758dfdde81bbf3fe2a9a9ffd26cc73ef29ee1fc7bbd3fdab8947b7316c76622ca1c5f28f923212c63ca2c81fa SHA512 38db43ddfb6c4e8aad817dde0cc20ccf5397f4bcc4a3183a33d1256122a42a79ba6b079677746b31d17625b275f2e3d9e346e314a1311981b86d4add48238dce
 EBUILD libimagequant-2.12.2.ebuild 1451 BLAKE2B c2864c295cca60262bd47c613d60fafa2f6f5cb3f3fdf6db13c334fd7470d8109fff3a75b2fa95ba267dd528e25ac5ffa0cb5c32ea241e179d76108b56a2e010 SHA512 132f76b9be03b93143f7117de9923f2f79d8e1b05843320bcfc57cffc5ee5f8b89890a4edc964f08d389c801f4f9be298548be297c4507e001f555602901a378
-EBUILD libimagequant-2.12.3.ebuild 1458 BLAKE2B b700b2e73c2a8429d9c8f171fb0279c2644baced6ed32b00c11af4f77bfaeb1b52ff09474ab91c1eed67aec08cb8c4d85299fa58dc6584e396891076f9c34092 SHA512 9a36392be28772244fc8785d919a91e1d7cef28815808c804d4ec40c862c895cdd7bc659eea278a7ace57153079cff914ad632930602d910548ef0f86795f7ff
+EBUILD libimagequant-2.12.3.ebuild 1456 BLAKE2B f3400340107b79c3bcd48a0a3e3a5fa5301e5a60e4dbeb79db8abdd38458d8b5d4389ad640b36155a94f0b01be4bde38189df1049c66a688e124f0be04842f13 SHA512 6d9f45019a623cada80bbf431a7ae5dddcf96e04443623b1e7ffb25df3d93136024dd23aff46875de73279bf1ce515cabced4be87916958a302462290e525e5d
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
index a68ab9c18f02..e769cc8778cc 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/pycam/Manifest b/media-gfx/pycam/Manifest
index 36f2ec0ea5e9..b8c48bc88de0 100644
--- a/media-gfx/pycam/Manifest
+++ b/media-gfx/pycam/Manifest
@@ -1,5 +1,7 @@
 DIST pycam-0.5.1.tar.gz 1680577 BLAKE2B 06d30496146a96bd4613c1674890de7073c32eb78ba3a879124fe74b613259629a20d032fb5cb1be1cfd18b3cf7dc6c7e99fb57763d1af1b1907e46509e577ff SHA512 f880d960f82eb374465a593f3b27e9f72148b3ceb99fde15bee4ccf1078acc8ef44ddfd9ee12f89e5b5e5ee14706b6e5d76eff7d0334c9526866ff263a057994
 DIST pycam-0.6.2.tar.gz 3070572 BLAKE2B 3dbc6123f92035de1a9fa23453463ee1f45543c72f4f92b6d367d1031abd4cda638ff6b5bb261c8ae127c2cf875cf44837e76b73777acc8d58aaa3d95ec67894 SHA512 ff96a40aacf92ffd20e729912fc81177ffc01d688cfca300d31dd71399d91754dfbf5b864d95a88f938286e38c759c372968e53c29041653c85f446c6c9eca42
+DIST pycam-0.6.4.tar.gz 3079871 BLAKE2B 41368b177e8ead933e898d316349adc40d40e23d5c7b56943f3f46acf2ff3634e797636e0723b9470453bb2e12f8fd9c70fd4aaedc207ea4638d9d422948f3dc SHA512 4095d45b6c561c2e706469f12772ede8063fa0216cef4a52412fe4d5e892882aa62a65a6159d97c6c066aec20d4915a7a05724dc0e2b66f2309e0fa3bbc0253f
 EBUILD pycam-0.5.1.ebuild 486 BLAKE2B c721319cffbe6ed1d25722792d06bee4877aed0a17b71a1ee92449274267f16c78d0ac8bdaf073d8cf7f65372bb68605e5bcc7f71e166553b75a0e68cfb46961 SHA512 ef68e5b6c3204756789d460865702d2e64cb65b5a4e182908bb7ef0a85f1f5ec024d36cb3d9eed73276398aa2a140bc082e9e90b218b1fbb2232f9ced51d9569
 EBUILD pycam-0.6.2.ebuild 549 BLAKE2B 338b8eb2ccc7256efd5358231e5c3ed0b956cecaaace505742af220aeaad923389a6d6902a4491a3981855cb56f2d74fe371e1d2f9a171260c3b73cd9de4d038 SHA512 297de082c61cf2317757fbf49285b85072001154cd1ece0c6389ec5efb0ed2b5ec80ae4f8f5a02bc521291133640557aab0d4a906fb91e4fe68ce2891af524aa
+EBUILD pycam-0.6.4.ebuild 618 BLAKE2B b74e2f58cda5a1ca5c822e2de5fb2df9debee0645bc47a7c4e8d1a95fc584393278533115298baf213771b0ec64f01a7f5a2d952a6acea16c8f1c5a4811d1237 SHA512 091cc13aa72c87d0b7212a3d9784ab1d592750f1aff4c477de6d86fe5f04572f68a6b460a89e3c15aa13c8ab65290e1e62512228a60f86459f405384e56de430
 MISC metadata.xml 290 BLAKE2B 15f25f9b0eb3e58221cf49040cf9b0f923bc8936ceb3040de236b57206df3547e88f28cfd4666cc83c2021f4e23012ed33e352282aa3f6b668a2b9568f4b5a5d SHA512 b3ebcaa51728a7fe09029f792e3ad7dbaa50b30e98d4e523d7258ab2d70824f3722c40ba60cda6feae303dd3779cb65cefe560c9740f1b07e6d2c905660bf2eb
diff --git a/media-gfx/pycam/pycam-0.6.4.ebuild b/media-gfx/pycam/pycam-0.6.4.ebuild
new file mode 100644
index 000000000000..ec46298199f0
--- /dev/null
+++ b/media-gfx/pycam/pycam-0.6.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 python-r1
+
+DESCRIPTION="Open Source CAM - Toolpath Generation for 3-Axis CNC machining"
+HOMEPAGE="http://pycam.sourceforge.net/"
+SRC_URI="https://github.com/SebKuzminsky/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DEPEND="
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pygtkglext[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	dev-python/librsvg-python[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest
index 1968a85fa9c1..da7c0a301152 100644
--- a/media-gfx/qiv/Manifest
+++ b/media-gfx/qiv/Manifest
@@ -1,4 +1,4 @@
 AUX qiv-2.3.2-optional-tiff.patch 519 BLAKE2B 1c2f4d4d79f3d746927f4c5af05769992460c30cdd438096d4c4d0c39a9460bcb921ddd854786ec394fc9e229ad239c541cc97f5468cd6934c15a0557275270a SHA512 c492b902bbd7771648deaffc7eafb8fccf86d294c0e2597999f2fff02ed1e02f6fc158ea95fe25c2a9b27d15dffe724c85654c99e7769254abb40e9fdcb8f358
 DIST qiv-2.3.2.tar.gz 135164 BLAKE2B b6b82c3007cd3214bb0b812026d22ab0a3c7fce87e51c1f2e19634fe131656f7adc1e92d2e1fcdcc563f1fd8b7c298307e48823bb26e077b336a6983f31894ac SHA512 a6750ecf26bc5b78fbebfdfcfd7a8ab0a5d3ba4e4b19c4a5563e1631dfaf8cc98f7a0bc9449956bc06f8b98cb307b31f78178676ddc9df4fa03429fa31c174e8
 EBUILD qiv-2.3.2.ebuild 1223 BLAKE2B 586921fac938875cfb54525bb00b134478287143d4f824d5521ca875dfc256fd8ca3252caf2e1b879153837aed78900ab75d0f92ce7da965d63030609281ae82 SHA512 7cb91c24aa67ffab9bf6884a9b4ebc9fec5122ded9638ab76e1e71d66affea869742a266dffbcebee6f8b5bb4cd083fef2c22793804ee3eb6c6a1e7c8f8acc84
-MISC metadata.xml 419 BLAKE2B 91296f38a94e37a97e1925e348d13de307b5d72e78002e3e5e396658b8ab4f96c909c530947a154317f0e354063f36c8ea4093efed599ed6ffe3c9089827cdea SHA512 d9ae3b413f335a277b97e98ca245a3ffe1982cd777c08062ac43642f76cd8b567b815163738807ff5a826ef1c14ca24e20ae1041394db6b998f02fdd2dbad216
+MISC metadata.xml 340 BLAKE2B 60db54083682115072d97b6de47547140bc053790702f949cf84a6a56c5ad30c03de44062e9f4713c60441f11296118623d8757f158659b7fad0ad42ba0359c9 SHA512 dbcb9ab316253fd10aea1ed236e1543c387f3b87a561bdcb7e60899eac0375fe1a197dcee3bed98a0177b6648fb54fb04769faa9809abf875aefc27f00e3a4a8
diff --git a/media-gfx/qiv/metadata.xml b/media-gfx/qiv/metadata.xml
index 55247542f391..f1be52d03dbc 100644
--- a/media-gfx/qiv/metadata.xml
+++ b/media-gfx/qiv/metadata.xml
@@ -5,9 +5,6 @@
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
-	<use>
-		<flag name="magic">Use libmagic to determine mimetypes</flag>
-	</use>
 	<upstream>
 		<remote-id type="bitbucket">ciberandy/qiv</remote-id>
 	</upstream>
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index e332c80d0ae7..b32bf6823754 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,3 +1,5 @@
 DIST shotwell-0.30.2.tar.xz 6461648 BLAKE2B d54f34c05dcb092149129977bf59f0434ec4082929e3c87d9b4e774f85b47d73ecce1e80a6a29965194e9791eecb018405b43f082fb8b334c8d012f06a00b817 SHA512 ee74b9d3fbc5b2a5ca87cbc351fa99f6afaec4ce717166f55d79f41f1b039c272ed9028eb3919874f086f934197806738a54f428e790bca50dd8c9af61c21c36
-EBUILD shotwell-0.30.2.ebuild 1817 BLAKE2B d8ef0c824f1990ede37a4e2c81fd3fabcbf1a5809685076f3fdc90c0db62b05732d6c06e259781f6cfd953b8655fe4c796424202f7cee20226da46db49a51f63 SHA512 d91d0dcb6a3230bd109c3225c8f9c71cb294619058f09d74bbd7e461161094eb614545d058fa9f2a8ad13668e46b1c40bead4af849dfe453ec29dd0ad212584e
+DIST shotwell-0.30.7.tar.xz 6455860 BLAKE2B 81da055e1092b9aed8c635e3e18e9c4bfa5820bb915c17cbb26942ce627179ed6b158c0785f54a2e15049150c3569035f58916483505449d55a2b3822276c44d SHA512 960574212d622c29d7617b874466e639d5a292eefdd2cac00ebcbf96d7db06002b9423440ee47ed84da7064d3eb70ba388b573a94c9e44c07d3b8f87faf09c58
+EBUILD shotwell-0.30.2.ebuild 1842 BLAKE2B 28a6d7ed2ed68e1e95cd331bd57fc159022292b50d0a8c32e9deb17dbda3ea283646b8726558b74b6a7401be34e2e64d1e4acf7e0039c16f66ce1654ede2b4f1 SHA512 5b3a7be65f11ce5a0b35a3188c75532e5646334db0666bca15e19a6be05ee45fb5a66792b5b9ee00914cc53339560e791f08f5b623dfb36e693d53dbf5bdc36e
+EBUILD shotwell-0.30.7.ebuild 1762 BLAKE2B e2c724c7875d59fadb9fc73566998e77e0918b5b79f507ae416682fe4390dd625ef508de3f6018301545d41fd13351d9c8e30a3a4e719e9cb8dd284fc95ccc5c SHA512 c5a3d2ce382ae02d84e1b9bc0ae0138cc5f081a35c2c075376156ddb4392dabb249764dabdc1aed886768a9d8606a4e140dbdc17df3aae17e72fb4e68ecd0e27
 MISC metadata.xml 915 BLAKE2B 7f83fe936f9a575c6dd12b014007cd97c5a8ada9aa5e55ddeaddefa4eb05d724a068c81d2f6f41c5b1bae01ed2c4326eb5eba5d4bdccf48619edeb43a8eaabfd SHA512 1b226f7fabfd7f5ee4d82b28ce2998273225319b055c01509cc5e493fdc037941c0edd0099df5dada00228fb225bf5e35d0035d3cd244890ad0cbd929b84d214
diff --git a/media-gfx/shotwell/shotwell-0.30.2.ebuild b/media-gfx/shotwell/shotwell-0.30.2.ebuild
index ccd5ad48e5f4..0856b633805b 100644
--- a/media-gfx/shotwell/shotwell-0.30.2.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.2.ebuild
@@ -29,6 +29,7 @@ COMMON_DEPEND="
 	>=media-libs/libgphoto2-2.5:=
 	udev? ( >=virtual/libgudev-145:= )
 	>=media-libs/gexiv2-0.10.4
+	<media-libs/gexiv2-0.11
 	>=media-libs/libraw-0.13.2:=
 	>=media-libs/libexif-0.6.16:=
 	dev-libs/libgdata
diff --git a/media-gfx/shotwell/shotwell-0.30.7.ebuild b/media-gfx/shotwell/shotwell-0.30.7.ebuild
new file mode 100644
index 000000000000..84cb2d000fea
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.30.7.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="opencv udev"
+
+DEPEND="
+	>=x11-libs/gtk+-3.22.0:3
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libgee-0.8.5:0.8
+	>=net-libs/webkit-gtk-2.4:4
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libxml2-2.6.32:2
+	x11-libs/gdk-pixbuf:2
+	>=dev-db/sqlite-3.5.9:3
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libgphoto2-2.5:=
+	udev? ( >=virtual/libgudev-145:= )
+	>=media-libs/gexiv2-0.10.4
+	>=media-libs/libraw-0.13.2:=
+	>=media-libs/libexif-0.6.16:=
+	dev-libs/libgdata
+	>=app-crypt/gcr-3:=[gtk]
+	x11-libs/cairo
+	opencv? ( >=media-libs/opencv-2.3.0:= )
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-gdkpixbuf:1.0
+	media-plugins/gst-plugins-meta:1.0
+"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	net-libs/libsoup:2.4[vala]
+	media-libs/gexiv2[vala]
+	app-crypt/gcr[vala]
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dunity-support=false
+		# -Dpublishers # In 0.30.2 all get compiled in anyways, even if restricted list, affects only runtime support
+		-Dextra-plugins=true
+		#trace
+		#measure
+		-Ddupe-detection=true
+		$(meson_use udev)
+		-Dinstall-apport-hook=false
+		$(meson_use opencv face-detection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index dcb4bfcf640f..0a237843410c 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -6,5 +6,5 @@ AUX ufraw-0.22-fix-unsigned-char.patch 748 BLAKE2B 30a8dfcfb71f78449838ade5f7707
 AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a738378788b2ab11665c0c8ab2f3246c821a176dba8b26cea354e8b0d127d2c601c21b0ac94f5264327916d0f8779618165 SHA512 855337bf109ebc0ea7b9bd429bcc429bd9caa561e2a815352c51e860a6e405d500913b70414ded7f47e053332c89b964d1817c8f22627504cf157f1565f3c7a4
 AUX ufraw-0.22-jpeg9.patch 1076 BLAKE2B 84448c537706d7b29f54d4735a75bf9501eac7927529c6d8e43d6cd746763ab753715d54cf943bb8bb5ddd8a29891f7522a680426acd2eb52af450492656ae3e SHA512 520e9351d7b8aa84f79a7c2841c2f56eaca849e67e448dc9503d248e31c1aa9fecaa64a332c0a155b6ba1ab7debec8734f3f2ef710bcb534a5fca34e9b5c8f7c
 DIST ufraw-0.22.tar.gz 1103554 BLAKE2B 5ffa4c660602553853221d7b31bfb78b02644bfeb4461cf752186d83ed8087b7905e414c7d741916ca9460c05849ab679b2f3098c99e5246f54a49b6a915268f SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2
-EBUILD ufraw-0.22-r2.ebuild 2002 BLAKE2B c3c54bbcc51a514f98f540d410cc93cd509af6686ada5a8c948d9c9d38bab063189881a99bfbd9b88ed3fbe6b5ce96e55903ed3e9ab1f6020d6e43b9a0331973 SHA512 9f455ad03021159f589bb3a78b718854395ce56f937cd18169f1a2f3ed11ee59566c4203574d7feff3d466cf91f39beafa825b7fcda9237a7ae125ed90449405
+EBUILD ufraw-0.22-r2.ebuild 1951 BLAKE2B bedb97bbc87eb73770146b8fa6f27689cf000aa3b29611222e2f73ae1bd5de6b3dbedcb807c683c26f1c1aff52abf160ad78ff2d45e280b8e64ca5de771ae6bf SHA512 8f720c4a740dfa8b3df0f0868f5d2a03a22ac08765308eb2ca79f9e70686e800ef636062c277eef21bf21d34ade891037a8c5879739183dfe2d7aa66646d3d6a
 MISC metadata.xml 588 BLAKE2B 3e6ec0c8b11a3c30d1b20b5df4303fc1bc10b4e6459a24358ac50bcfaa414b307efe6d392d23fd7ce1443917865deae0dfa89cc7a068567f227cdc387f99d1cb SHA512 3d161ddfe0da5620312603d66acbc24244317da4dcb905558eddda9d54bf96024881ffbdcaa49f9daf73d779d5e7dbb47a523e05cc6c614756b468f14ef66ab9
diff --git a/media-gfx/ufraw/ufraw-0.22-r2.ebuild b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
index 9bbc7e771218..f791b1bfa2d8 100644
--- a/media-gfx/ufraw/ufraw-0.22-r2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="contrast fits gimp gnome gtk jpeg2k openmp timezone"
+IUSE="contrast fits gimp gnome gtk openmp timezone"
 
 REQUIRED_USE="gimp? ( gtk )"
 
@@ -31,7 +31,6 @@ RDEPEND="
 		>=media-gfx/gtkimageview-1.5
 		>=x11-libs/gtk+-2.6:2
 	)
-	jpeg2k? ( media-libs/jasper:= )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -59,7 +58,7 @@ src_configure() {
 		$(use_with gimp) \
 		$(use_enable gnome mime) \
 		$(use_with gtk) \
-		$(use_enable jpeg2k jasper) \
+		--disable-jasper \
 		$(use_enable openmp) \
 		$(use_enable timezone dst-correction)
 }
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 51a99f259c29..131186d254db 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 4ef585c13358..233fed1ca70e 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -5,6 +5,6 @@ DIST alsa-lib-1.1.8.tar.bz2 1002562 BLAKE2B a531ab501943924d007f7ae0e4489deea805
 DIST alsa-lib-1.1.9.tar.bz2 1058187 BLAKE2B 60454be162a0f36334602586762f8ce657d2883636bcb65ae91dedce62297bd40f3dbdc6213ef773542708b367f8796e143b1fc987c40de6d5d5a69a648f6b18 SHA512 402e39cca82d17555e3e52ef06b8ed9dcf58531da393809a7b5cf18658299fa90ee8a60bfc5213482d7a02b13140c441f1333b144556f44ab4adb786a2fb3c49
 EBUILD alsa-lib-1.1.2.ebuild 2105 BLAKE2B 2be4af40e69e4b3e06ce8ea954848c143090ed275f19dcbfd49b867d1edd03e497a248a2f16f5ed9181ea409be5ca46864445f729d634174e8376b256b877b8f SHA512 6f02e3234a638ebf9e88f5c6db7f6edca4f6f76acb1e7c09bc120825a6d1c994f83baa22d5c9b6c2f07fc6717a4e32714d7cab13ccddbc653e57ea489b17fdde
 EBUILD alsa-lib-1.1.6-r1.ebuild 2047 BLAKE2B 106e4eec3488a7f76a505f8afb0ed4687f11893aadec2afc393a2c198f387d848052954a110617cbbc451fc446a3a166b445eed101db544bfb9c44859ef92d05 SHA512 8c95080b33d5360f66e586544223f94bae816bcc94115c3f3a6b03c065ef9f54354ccdefcebd6f306facc05f258a89a80cf48465db9369492a88234ee17723ed
-EBUILD alsa-lib-1.1.8.ebuild 2056 BLAKE2B 9ce599763ab63174ccbca4951590517b56ed44c76ca0ac3c823ad57cb270fc1dbab55c6fc7c6c2d7565506c8b3e95e3060b51747f812ae995eb7f6d78d89ed2a SHA512 bf38eaaf66b1970dedc03f767e7e5f75da365fac7b724b3487b93169c9edf9c897db2cfedd2c01c275cc76e870c54565794cd318d6468ed1413286664e590683
+EBUILD alsa-lib-1.1.8.ebuild 2054 BLAKE2B ef917bf820c98222c6261d119ff8ca6ab4c456835d72d696a17e7ffe2acfa58cff6011c1b28b06c0e75b53f48ffde12858b3149ac3c296ea1d0995e62f878e8c SHA512 fd96a3e11f9dc9978ffbc81b0ffcad643da78f8d8fc74d22fbe2207461e113b2a0836acc092b674c24003102563b6ea7fb41690ad2a463d82953debf2fb0667c
 EBUILD alsa-lib-1.1.9.ebuild 2060 BLAKE2B 862171dadddc859c404a2f7fbd795b72d64f9e76bdf44900eca9827fdcddb91bafde3120089dbe47d76c063aa94d1bf3b1b742f66a5e2dca11b9a9a2c69f8668 SHA512 7db838e58d526853a13174e92ee54f5250be04edd352facd471208d752cba2937069191669a4efbc416ac70a13f10e82d5377e6ed1366f2d86e554d6fc6673c7
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
index 61f20eec56ab..80efa633f902 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index dc83b08ac94b..7f7a53f3cd3a 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -4,5 +4,5 @@ DIST alsa-oss-1.1.6.tar.bz2 291588 BLAKE2B 2db4b6d80a17518aeadff8a8f12a40eb4f9e5
 DIST alsa-oss-1.1.8.tar.bz2 291800 BLAKE2B 47124c4edd14878b202e6ff6866b5441ffa0991ac3011a3db1efcd1dd2a0c27c9f2b8b38c2a51e8b46cb5714a97393a462154cdfaf89f1238244f7b2635a7740 SHA512 42966af0ca1be33b4ab1e20b2e3320056ad6caf6ecc5ecde3ae19571809a2fa924dd91d9b2a5d5b6f345b29d937b079400d2a165dbe2b8a33b857cd406c4ac7c
 EBUILD alsa-oss-1.0.28.ebuild 876 BLAKE2B e322d42d78583a296b49e32e316d4f7e0bc41fd4cc40bbc8873e5bfe0cc47a46c84af4813cfe9f916da8d5cf30a0577e0fe9030f2387f62b99cc8ac2a2a675c5 SHA512 519092dd88cb74fdb8a2fb9e87de716dcbbf9e19c0c75f82245535c2827467f9a1f429f4477f68f23a9804026b90e265fef20b31db48db41396fcfaaf37a417a
 EBUILD alsa-oss-1.1.6.ebuild 914 BLAKE2B f4d40c1a5ba78451221491f5eb7da72cc3e228cf306dd0bd82097ba3a1b6e34a9896c34e903da06486752b893d116a243e89cca6fdc1b99dbe47b5ac2759fba0 SHA512 a05bfc6a2ee9e964c79f831a3854c4183781124250ca70110fe91ce03a2f3955a89417623c7798d89304e4431fd4fde670f31b5e82cc426515bf3a65589904da
-EBUILD alsa-oss-1.1.8.ebuild 1019 BLAKE2B 887d47483c9be353c15d590c9432e92dfd0e42966f1ef3627e88cb93024bed4965553a3335082e9e50678e7b38def54a457a5714c6a48d826097aba17d2e9d24 SHA512 1016e23ada908d18062b5fda3453a2a69b496d4c203b05f12a512b2930412a9178769627b06c8cc12d2a066ca7d5a59654e26b830f5af6c2a12a00b8900fd5a3
+EBUILD alsa-oss-1.1.8.ebuild 1017 BLAKE2B 5573474b04d9cb1db0356cc877599ff6d2d0b2f259bac78b67e461e1760e1ee9a04a2bdd05087a8758dfd6ca06d1ca17957d20c5bcdb1679f4bf8e51529bc304 SHA512 c956b8a1fa829550caed1960ff0b5001f8712440dc29b161c3fcba93aa17cce5b19826c73f13e60e290b73267b77c3dd51454ef3385ffd95bb163bb7afbf7fc8
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
index d48c49881f0e..ae4797fb418d 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]"
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 842793072946..c1c7188e2017 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,6 +1,11 @@
 AUX assimp-4.0.1-disabletest.patch 298 BLAKE2B 49444fb1fdd3cb2aafd9b29de7a454ce8720707bb6f569d9697cd82303df7edf08d909ef8d8926b17203ad1126f13a6445080191649a96af837d1d7e02fa7667 SHA512 320f2f76ffbebf3a5d3064faa3bc16e0cb597ad994c35b1344aa3a60a07839e67a9d68b80f8723b663d491c6a37b6c95510e987acd04dd519d489a82e3d7e729
 AUX assimp-4.0.1-qt-5.11.0.patch 2230 BLAKE2B e99a1e8dcd5f3c5d8f2b5f116ccd2b5f9a7377e3c17f9d7fc6d4962c4a573c5fa68fced8a714c94cdc1e0bdeb7f2a0b2c4fb714f7c54bbe776efc68911ad5455 SHA512 44bd08a59de45bd6431e97c8165ab7d9c08fccc2bcf704fbf063db143152f9e4aa1e9f5ff7c104bd312a643a42259af6e370caaac92f40d369972b21e692c928
+AUX assimp-4.1.0-disabletest.patch 298 BLAKE2B 49444fb1fdd3cb2aafd9b29de7a454ce8720707bb6f569d9697cd82303df7edf08d909ef8d8926b17203ad1126f13a6445080191649a96af837d1d7e02fa7667 SHA512 320f2f76ffbebf3a5d3064faa3bc16e0cb597ad994c35b1344aa3a60a07839e67a9d68b80f8723b663d491c6a37b6c95510e987acd04dd519d489a82e3d7e729
+AUX assimp-4.1.0-unzip-of.patch 242 BLAKE2B c977c94d4ef44d9e185738e7f3c2e5bda59ea52e11c5900387f9e590201f4ffff3aa6dc9a60452f8f782ce37a510cb85cecd1f8df8b23b331688b75f69ea3890 SHA512 e8908f0c44afc4969b9fe670de418ae9df592cab47b0c9a67958c37414740c527a7ee1ef6d61de19c926f08bf20663be66dc54fc6e3d9164e6ecf34360dff37b
 AUX findassimp-3.3.1.patch 624 BLAKE2B 6e1df31dc55739e01807eacf90558be6af791c4054b438f765cd733639c5c6fb34046871577ddbc7194284f81228000e48218a5a890d21390976778928362d94 SHA512 5f8f7e061da89e7fb4705148b171e631e16a3b7ba7156b1cd3a4b8987adc066f0b4a36f7d70a9b174f3bb27ebe13353435d81cbe85a1166c75148e8419311be1
 DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
+DIST assimp-4.1.0.tar.gz 45417293 BLAKE2B 74170ab48b64ab357ddd9da58f1218d0c3c0a4039345dcd7ae396aca3bb47c2f5ea2ee8b61b7d81c68c2e1237cd3ba516b816038400e9960b6c0cfe031a41e54 SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a
+EBUILD assimp-4.0.1-r1.ebuild 1385 BLAKE2B c658a4892def26404509ced1538aa9635da5b5dda3ba00b53d5bfcc14efce0803e045aa687bb116dcdda93ad933fdaeea655dbb6f9c25160ded30d90638338db SHA512 8e003f3e6bb196f1085a7903add296153119d1fbb948f87c00332f3c970853f429406d037eed52449126fdc5566cc19b6650a518ba8fc9a6129735dda0ecfede
 EBUILD assimp-4.0.1.ebuild 1334 BLAKE2B 69cba811c5f5b0957c36b257c1bc52c30b15c58ade44c5cff8a1e3697eeda607d8ed5885362a5ad8e1b8ba1c982dd8155f325ae3798a982a39a8d0132e68cd4d SHA512 c47fddb39ed30f9c8cdd9fcdf5b43703c07134a8e7dd187518eaec8392792614716252d39f19262278b8cfe832cf92df602b08855d1d0724b74796f851068d7a
+EBUILD assimp-4.1.0.ebuild 1298 BLAKE2B 19052951f2e7af644bc6987b0960bbf778e265d6e3daa1db6531c0a84086d47f09e21cd15ba339882ae3a2506291048924ef8b416af3ebe9f43c192c8802df4f SHA512 1792c1643fe99b57c3a9ba5619a5e318b1533e405aa78eb6572bb35364cc1e8a18173bded6b1932d94e442794f83bbf6a52ec635b46843449ca8f39af0e39567
 MISC metadata.xml 463 BLAKE2B e8815466468672f2ebf597e0155adf205234f603ae9287a5743005d26ec240429ea5b98d006554abc69e08251613257130a258fe6cd5e1a79865005d98475eb5 SHA512 8daf9f83564ce1357b6a99441fc733b9d7a00db2071cb2fc47f1a0c6a1842cea57a1ec4aa628b86271abbdaaf5c17c60092f1e2de42e9604a5165e81b2f4bf2a
diff --git a/media-libs/assimp/assimp-4.0.1-r1.ebuild b/media-libs/assimp/assimp-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..0e4e53c35722
--- /dev/null
+++ b/media-libs/assimp/assimp-4.0.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Importer library to import assets from 3D files"
+HOMEPAGE="https://github.com/assimp/assimp"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="samples static test tools"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/boost:=
+	sys-libs/zlib:=[minizip]
+	samples? (
+		media-libs/freeglut
+		virtual/opengl
+		x11-libs/libX11
+	)
+	tools? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+		media-libs/devil
+		virtual/opengl
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/findassimp-3.3.1.patch"
+	"${FILESDIR}/${P}-qt-5.11.0.patch"
+	"${FILESDIR}/${P}-disabletest.patch" # bug 659122
+)
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	local mycmakeargs=(
+		-DASSIMP_BUILD_SAMPLES=$(usex samples)
+		-DASSIMP_BUILD_STATIC_LIB=$(usex static)
+		-DASSIMP_BUILD_TESTS=$(usex test)
+		-DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
+		-DCMAKE_DEBUG_POSTFIX=""
+		-DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/cmake/Modules
+	doins cmake-modules/Findassimp.cmake
+}
+
+src_test() {
+	"${BUILD_DIR}/test/unit" || die
+}
diff --git a/media-libs/assimp/assimp-4.1.0.ebuild b/media-libs/assimp/assimp-4.1.0.ebuild
new file mode 100644
index 000000000000..050200305045
--- /dev/null
+++ b/media-libs/assimp/assimp-4.1.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Importer library to import assets from 3D files"
+HOMEPAGE="https://github.com/assimp/assimp"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="samples static test tools"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/boost:=
+	sys-libs/zlib:=[minizip]
+	samples? (
+		media-libs/freeglut
+		virtual/opengl
+		x11-libs/libX11
+	)
+	tools? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+		media-libs/devil
+		virtual/opengl
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disabletest.patch" # bug 659122
+	"${FILESDIR}/${P}-unzip-of.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DASSIMP_BUILD_SAMPLES=$(usex samples)
+		-DASSIMP_BUILD_STATIC_LIB=$(usex static)
+		-DASSIMP_BUILD_TESTS=$(usex test)
+		-DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
+		-DCMAKE_DEBUG_POSTFIX=""
+		-DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/cmake/Modules
+	doins cmake-modules/Findassimp.cmake
+}
+
+src_test() {
+	"${BUILD_DIR}/test/unit" || die
+}
diff --git a/media-libs/assimp/files/assimp-4.1.0-disabletest.patch b/media-libs/assimp/files/assimp-4.1.0-disabletest.patch
new file mode 100644
index 000000000000..4afe5bbd26ba
--- /dev/null
+++ b/media-libs/assimp/files/assimp-4.1.0-disabletest.patch
@@ -0,0 +1,10 @@
+--- a/test/unit/utVersion.cpp	2017-07-28 22:33:41.000000000 +0200
++++ b/test/unit/utVersion.cpp	2018-08-26 01:48:54.935116440 +0200
+@@ -65,7 +65,3 @@
+     EXPECT_NE( aiGetCompileFlags(), 0U );
+ }
+ 
+-TEST_F( utVersion, aiGetVersionRevisionTest ) {
+-    EXPECT_NE( aiGetVersionRevision(), 0U );
+-}
+-
diff --git a/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch b/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch
new file mode 100644
index 000000000000..e75b47a1af4b
--- /dev/null
+++ b/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch
@@ -0,0 +1,11 @@
+--- a/contrib/unzip/unzip.h	2019-08-21 21:38:10.991542891 +0200
++++ b/contrib/unzip/unzip.h	2019-08-21 21:38:24.507543226 +0200
+@@ -45,6 +45,8 @@
+ #ifndef _unz_H
+ #define _unz_H
+ 
++#define OF _Z_OF
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 0722d0810566..c988bbf140ea 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,6 +1,6 @@
 AUX avidemux-core-2.7.3-permissions.patch 1079 BLAKE2B 64e4b1718ef91051253b0d09a69acbd11fb2467d48a62443b4ccd2ca89feee454d1ed35542c49fbf94c217397bd363e6aefc6a3bf13498af9a57eb6fdf32b5ba SHA512 d9c316b76cedd2119a3fdae1810846358f7addf21258021ba896f0e1dd7d68d27db5f7e97b53e284806482334ccd016833a2f8b24f50cddd28ac6cfdf28dfce3
 DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
-DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
-EBUILD avidemux-core-2.7.0.ebuild 2527 BLAKE2B 549e0e7a6d68296215452e813468dcf511c5b46115c0e51e9e369fe3f119fa11542ed28dd2a336123776b773bcbc83ff95896a24b7769aeb1e4249cfddbd0f78 SHA512 f20b5c6c6956998f6164e4d72d40e1acd54d8a926c03158dd7131733eab421170deb356bef16f6fa7e0311bb2e21d0598120fe526870114c63db872fdba8d8e5
+DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
 EBUILD avidemux-core-2.7.3.ebuild 2291 BLAKE2B 913b26cac99698593a555fe360896f0c158bc8e17e4658694525eea6f37570c4aa39e6465cf4a3a1394a42d4762eb570b7771cf926649ea1523648d36810a634 SHA512 432d8cf723d97a360b7a1a702e61bcb64760edd7391a23cea1e3784133514538b31283716049b1cc9de1addc187bddb4f0a7c07a48f84287467551db5d6b9d50
+EBUILD avidemux-core-2.7.4.ebuild 2228 BLAKE2B 7fb455e6abbc8d444be1b90d30ff40a245955d2f6e58210f3c6813f5ae6baf0e9c99929867c88330b905ed00d5073051511a085f8dbb4a21befa7d28ee79c538 SHA512 5182e13e491f401d9e53c9cbd898088d17459fac291fb6e08bb9e3303a585fb954ba283dc11813794c35a00e638a5d03fa322907335bbc1c7b3d755af2bd1c19
 MISC metadata.xml 569 BLAKE2B 19e9f892bf6e5c63f2054dfd44beef6b394fcdeecbb2e91edf01e7e9370b7a32c21529ad566921d46992f14d00943ac69e5f0f55cff8406d48ee84dc6515619c SHA512 58e100ccdc3e1145703d4feef2776bdf4ccfcc44dc9e04f1e79f5ea1b89f6ae59c386794028328f27d8715cd00abb410cb6970f1b72c1646750babf742fe3270
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild
deleted file mode 100644
index d1169d3d75ce..000000000000
--- a/media-libs/avidemux-core/avidemux-core-2.7.0.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
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}
-	inherit git-r3
-else
-	MY_PN="${PN/-core/}"
-	MY_P="${MY_PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake-utils
-
-DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	nvenc? ( media-video/nvidia_video_sdk )
-	sdl? ( media-libs/libsdl:0 )
-	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
-	vaapi? ( x11-libs/libva:0= )
-	vdpau? ( x11-libs/libvdpau:0 )
-	xv? ( x11-libs/libXv:0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<media-libs/avidemux-core-${PV}
-	!<media-video/avidemux-${PV}
-	nls? ( virtual/libintl:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	!system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/${MY_P}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-ffmpeg ; then
-		# Preparations to support the system ffmpeg. Currently fails because
-		# it depends on files the system ffmpeg doesn't install.
-		local error="Failed to remove bundled ffmpeg."
-
-		rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
-			buildCore/ffmpeg || die "${error}"
-		sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
-			-i avidemux/commonCmakeApplication.cmake || die "${error}"
-		sed -e 's/include(admFFmpegBuild)//g' \
-			-i avidemux_core/CMakeLists.txt || die "${error}"
-	fi
-}
-
-src_configure() {
-	# Add lax vector typing for PowerPC.
-	if use ppc || use ppc64 ; then
-		append-cflags -flax-vector-conversions
-	fi
-
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-
-	local mycmakeargs=(
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DGETTEXT="$(usex nls)"
-		-DNVENC="$(usex nvenc)"
-		-DSDL="$(usex sdl)"
-		-DLIBVA="$(usex vaapi)"
-		-DVDPAU="$(usex vdpau)"
-		-DXVIDEO="$(usex xv)"
-	)
-
-	if use debug ; then
-		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -j1
-}
-
-src_install() {
-	cmake-utils_src_install -j1
-}
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild
new file mode 100644
index 000000000000..b47c3bc01646
--- /dev/null
+++ b/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-utils
+
+DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
+
+# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
+DEPEND="dev-db/sqlite:3
+	nvenc? ( media-video/nvidia_video_sdk )
+	sdl? ( media-libs/libsdl:0 )
+	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
+	vaapi? ( x11-libs/libva:0= )
+	vdpau? ( x11-libs/libvdpau:0 )
+	xv? ( x11-libs/libXv:0 )
+"
+RDEPEND="${DEPEND}
+	!<media-libs/avidemux-core-${PV}
+	!<media-video/avidemux-${PV}
+	nls? ( virtual/libintl:0 )
+"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	!system-ffmpeg? ( dev-lang/yasm[nls=] )
+"
+
+S="${WORKDIR}/avidemux2-${PV}"
+CMAKE_USE_DIR="${S}/${PN/-/_}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use system-ffmpeg ; then
+		# Preparations to support the system ffmpeg. Currently fails because
+		# it depends on files the system ffmpeg doesn't install.
+		local error="Failed to remove bundled ffmpeg."
+
+		rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
+			buildCore/ffmpeg || die "${error}"
+		sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
+			-i avidemux/commonCmakeApplication.cmake || die "${error}"
+		sed -e 's/include(admFFmpegBuild)//g' \
+			-i avidemux_core/CMakeLists.txt || die "${error}"
+	fi
+}
+
+src_configure() {
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	local mycmakeargs=(
+		-DAVIDEMUX_SOURCE_DIR='${S}'
+		-DGETTEXT="$(usex nls)"
+		-DNVENC="$(usex nvenc)"
+		-DSDL="$(usex sdl)"
+		-DLIBVA="$(usex vaapi)"
+		-DVDPAU="$(usex vdpau)"
+		-DXVIDEO="$(usex xv)"
+	)
+
+	use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index d50777dc1a24..fb487b504620 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,7 +1,6 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
-AUX avidemux-plugins-2.7.0-qt-5.11.patch 1664 BLAKE2B 080497a678e869e143eb350ecdca2b77d5e5906a8a469e24f16fc58853665791dbbd94880418b492df6816b8f420d54ee7ecd06c805b0aab16e8d05ab43f545d SHA512 49186e7648db60e081f78e1257ea788313cac6e991c995249701189ab344744f0c410203b39b49e5530a8dd33de937582099eb8b615d19fe7d0e3731254d535c
 DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
-DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
-EBUILD avidemux-plugins-2.7.0.ebuild 4871 BLAKE2B ba2b03b69c02011be5930397b2229e4d51d3f8b350a31a12f923d50f11ba1008ce7d6ccac62d25d787fed704c1af2c08a4847c5fad8faa9fce14787bb09bb359 SHA512 99945e92b65aa422c701818763aee164fba1e3ab0b345f29266b8151d159d9b636ae8e0b23393fb6cba7fa5f81bed6e6e413e9da56ece76d94d641b73078cf18
+DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
 EBUILD avidemux-plugins-2.7.3.ebuild 4351 BLAKE2B 04bdb03c46a5856ff9ba97d71f89c1d6c1caa7387696875169124420e69cb93538791e6249d8e9362f1f84a04d9600e947f430f736bac0bf6889357528d64cc4 SHA512 1b1e071e03002acf313dabfde1da4a367b78892a215ec98f7d8b27e1259870e3ca40748bd7b45c0b51333b3fbe8f1956f77158ca298b5e49542f0f65d11e6edd
+EBUILD avidemux-plugins-2.7.4.ebuild 4267 BLAKE2B 8575dac5383482f1560e627cdef936d1ce34411103adc74b45ae80826bcab3aab782f2540e6f7d1b0571207cbb9c9715f80561abba7a36148c02bf70218eb6f6 SHA512 04c83316ac5252303ff346c150eb3935c753b7827c3d084c0725f3710e1ad0dc22aa2f7a82f54cbf8d88f77083d296c2445bcfc2770729fa81cbeaef8614cfcb
 MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
deleted file mode 100644
index a2730251a4a4..000000000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# 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://github.com/mean00/avidemux2.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}
-	inherit git-r3
-else
-	MY_PN="${PN/-plugins/}"
-	MY_P="${MY_PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Plugins for the video editor media-video/avidemux"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
-	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
-	>=dev-lang/spidermonkey-1.5-r2:0=
-	dev-libs/libxml2:2
-	media-libs/a52dec:0
-	media-libs/libass:0=
-	media-libs/libmad:0
-	media-libs/libmp4v2:0
-	media-libs/libpng:0=
-	virtual/libiconv:0
-	aac? (
-		>=media-libs/faac-1.29.9.2:0
-		media-libs/faad2:0
-	)
-	aften? ( media-libs/aften:0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 )
-	amr? ( media-libs/opencore-amr:0 )
-	dcaenc? ( media-sound/dcaenc:0 )
-	dts? ( media-libs/libdca:0 )
-	fdk? ( media-libs/fdk-aac:0= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	fribidi? ( dev-libs/fribidi:0 )
-	jack? (
-		media-sound/jack-audio-connection-kit:0
-		libsamplerate? ( media-libs/libsamplerate:0 )
-	)
-	lame? ( media-sound/lame:0 )
-	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
-	opus? ( media-libs/opus:0 )
-	pulseaudio? ( media-sound/pulseaudio:0 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	truetype? ( media-libs/freetype:2 )
-	twolame? ( media-sound/twolame:0 )
-	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( media-libs/libvpx:0= )
-	x264? ( media-libs/x264:0= )
-	x265? ( media-libs/x265:0= )
-	xv? (
-		x11-libs/libX11:0
-		x11-libs/libXext:0
-		x11-libs/libXv:0
-	)
-	xvid? ( media-libs/xvid:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	oss? ( virtual/os-headers:0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<media-libs/avidemux-plugins-${PV}
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch
-	"${FILESDIR}"/${P}-qt-5.11.patch
-)
-
-src_prepare() {
-	default
-
-	# Don't reapply PATCHES during cmake-utils_src_prepare
-	unset PATCHES
-
-	processes="buildPluginsCommon:avidemux_plugins
-		buildPluginsCLI:avidemux_plugins"
-	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
-
-	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
-	done
-}
-
-src_configure() {
-	# Add lax vector typing for PowerPC.
-	if use ppc || use ppc64 ; then
-		append-cflags -flax-vector-conversions
-	fi
-
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-
-		local mycmakeargs=(
-			-DAVIDEMUX_SOURCE_DIR='${S}'
-			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
-			-DFAAC="$(usex aac)"
-			-DFAAD="$(usex aac)"
-			-DALSA="$(usex alsa)"
-			-DAFTEN="$(usex aften)"
-			-DDCAENC="$(usex dcaenc)"
-			-DFDK_AAC="$(usex fdk)"
-			-DOPENCORE_AMRWB="$(usex amr)"
-			-DOPENCORE_AMRNB="$(usex amr)"
-			-DLIBDCA="$(usex dts)"
-			-DFONTCONFIG="$(usex fontconfig)"
-			-DJACK="$(usex jack)"
-			-DLAME="$(usex lame)"
-			-DNVENC="$(usex nvenc)"
-			-DOPUS="$(usex opus)"
-			-DOSS="$(usex oss)"
-			-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
-			-DQT4=OFF
-			-DFREETYPE2="$(usex truetype)"
-			-DTWOLAME="$(usex twolame)"
-			-DX264="$(usex x264)"
-			-DX265="$(usex x265)"
-			-DXVIDEO="$(usex xv)"
-			-DXVID="$(usex xvid)"
-			-DVDPAU="$(usex vdpau)"
-			-DVORBIS="$(usex vorbis)"
-			-DLIBVORBIS="$(usex vorbis)"
-			-DVPXDEC="$(usex vpx)"
-			-DUSE_EXTERNAL_LIBA52=yes
-			-DUSE_EXTERNAL_LIBASS=yes
-			-DUSE_EXTERNAL_LIBMAD=yes
-			-DUSE_EXTERNAL_LIBMP4V2=yes
-		)
-
-		if use qt5 ; then
-			mycmakeargs+=( -DENABLE_QT5=True )
-		fi
-
-		if use debug ; then
-			mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-		fi
-
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
-	done
-}
-
-src_compile() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_compile
-	done
-}
-
-src_install() {
-	for process in ${processes} ; do
-		# cmake-utils_src_install doesn't respect BUILD_DIR
-		# and there sometimes is a preinstall phase present.
-		pushd "${WORKDIR}/${P}_build/${process%%:*}" > /dev/null || die
-			grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast
-			grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast
-		popd > /dev/null || die
-	done
-}
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
new file mode 100644
index 000000000000..2a7b0e7ee510
--- /dev/null
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Plugins for the video editor media-video/avidemux"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
+	~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
+	dev-lang/spidermonkey:0=
+	dev-libs/libxml2:2
+	media-libs/a52dec
+	media-libs/libass:0=
+	media-libs/libmad
+	media-libs/libmp4v2
+	media-libs/libpng:0=
+	virtual/libiconv
+	aac? (
+		media-libs/faac
+		media-libs/faad2
+	)
+	aften? ( media-libs/aften )
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	dcaenc? ( media-sound/dcaenc )
+	dts? ( media-libs/libdca )
+	fdk? ( media-libs/fdk-aac:0= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	fribidi? ( dev-libs/fribidi )
+	jack? (
+		media-sound/jack-audio-connection-kit
+		libsamplerate? ( media-libs/libsamplerate )
+	)
+	lame? ( media-sound/lame )
+	nvenc? ( amd64? ( media-video/nvidia_video_sdk ) )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	truetype? ( media-libs/freetype:2 )
+	twolame? ( media-sound/twolame )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx:0= )
+	x264? ( media-libs/x264:0= )
+	x265? ( media-libs/x265:0= )
+	xv? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXv
+	)
+	xvid? ( media-libs/xvid )
+"
+DEPEND="${COMMON_DEPEND}
+	oss? ( virtual/os-headers )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<media-libs/avidemux-plugins-${PV}
+"
+
+S="${WORKDIR}/avidemux2-${PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
+
+src_prepare() {
+	default
+
+	# Don't reapply PATCHES during cmake-utils_src_prepare
+	unset PATCHES
+
+	processes="buildPluginsCommon:avidemux_plugins
+		buildPluginsCLI:avidemux_plugins"
+	use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
+
+	for process in ${processes} ; do
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+	done
+}
+
+src_configure() {
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+
+		local mycmakeargs=(
+			-DAVIDEMUX_SOURCE_DIR='${S}'
+			-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
+			-DFAAC="$(usex aac)"
+			-DFAAD="$(usex aac)"
+			-DALSA="$(usex alsa)"
+			-DAFTEN="$(usex aften)"
+			-DDCAENC="$(usex dcaenc)"
+			-DFDK_AAC="$(usex fdk)"
+			-DOPENCORE_AMRWB="$(usex amr)"
+			-DOPENCORE_AMRNB="$(usex amr)"
+			-DLIBDCA="$(usex dts)"
+			-DFONTCONFIG="$(usex fontconfig)"
+			-DJACK="$(usex jack)"
+			-DLAME="$(usex lame)"
+			-DNVENC="$(usex nvenc)"
+			-DOPENGL="$(usex opengl)"
+			-DOPUS="$(usex opus)"
+			-DOSS="$(usex oss)"
+			-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
+			-DQT4=OFF
+			-DFREETYPE2="$(usex truetype)"
+			-DTWOLAME="$(usex twolame)"
+			-DX264="$(usex x264)"
+			-DX265="$(usex x265)"
+			-DXVIDEO="$(usex xv)"
+			-DXVID="$(usex xvid)"
+			-DVDPAU="$(usex vdpau)"
+			-DVORBIS="$(usex vorbis)"
+			-DLIBVORBIS="$(usex vorbis)"
+			-DVPXDEC="$(usex vpx)"
+			-DUSE_EXTERNAL_LIBA52=yes
+			-DUSE_EXTERNAL_LIBASS=yes
+			-DUSE_EXTERNAL_LIBMAD=yes
+			-DUSE_EXTERNAL_LIBMP4V2=yes
+		)
+
+		use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
+		use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+	done
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_compile
+	done
+}
+
+src_install() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_install
+	done
+}
diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch
deleted file mode 100644
index 8ac9bbc3b4ac..000000000000
--- a/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ba667da44fcb88ee660339e52859bb90dc1b00d3 Mon Sep 17 00:00:00 2001
-From: mean <fixounet@free.fr>
-Date: Wed, 30 May 2018 07:31:03 +0200
-Subject: [PATCH] [Qt] Compatibilty patch with newer qt (>=5.11), patch by
- Chris Clayton
-
----
- avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp         | 1 +
- avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp               | 1 +
- avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-index 256f69d5e..54b0ac639 100644
---- a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-+++ b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-@@ -17,6 +17,7 @@
- #include "ADM_coreJobs.h"
- #include "DIA_coreToolkit.h"
- #include <QtCore/QDir>
-+#include <QAction>
- 
- extern void loadTranslator(void);
- extern void initTranslator(void);
-diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
-index 85cec5f9a..f537995ca 100644
---- a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
-+++ b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
-@@ -21,6 +21,7 @@
- #include "ADM_memsupport.h"
- #include "ADM_crashdump.h"
- #include "ADM_win32.h"
-+#include <QAction>
- 
- void onexit( void );
- 
-diff --git a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
-index 94bdd577e..b2a01e54b 100644
---- a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
-+++ b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
-@@ -17,6 +17,7 @@
- #include "Q_eq2.h"
- #include "ADM_toolkitQt.h"
- #include <QSignalMapper>
-+#include <QAction>
- 
- //
- //	Video is in YV12 Colorspace
\ No newline at end of file
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index aad9dccd6d40..36f70deea6dc 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,5 +1,7 @@
 DIST cimg-2.6.5.tar.gz 11071672 BLAKE2B 61fa37c2f78e09d6aba0eb867c3797f86ed5a685a114dae779e439c76f4cc9768fada70affd2b14139c7fe7b2e79b61e653165abc47833e3a5cf857af0eb4ca4 SHA512 d8c1e10f702b47f6788fedf27681fe8e7ab3994c8018f96d4964694edda6acb1ca040244d7d1436a5381ec5a12e7a2b991ede6d9ea6d961ae6c4842feb2bf141
 DIST cimg-2.6.7.tar.gz 11072149 BLAKE2B 0695215eb57375ed216ab1b148bb09316af8f6e0191589e4a9a91b25355857a75d2f351d2e52584e626c8ff1f2aad940df4f8f0ee4c331ded62582804c3ce765 SHA512 9dadc0b7b1017ba19fb36232a32278c30628930b7c76a646ca343751754e10e1a1eb8a0c670ab308c437738ec28ceb324f6511ffb9c3bceabede01eb34b8a2e6
+DIST cimg-2.7.0.tar.gz 11076642 BLAKE2B db2c8715f25ec160cdf41ac2cc1bee366ef49dbd0b3e5bd5bf6b4b8a0ba4c880f6af4cbd78d843abf0edd99ca45337fd1bd5dc25779b94984a64f5217c3430a5 SHA512 b1b12f4b36d7d799da330bb2854732e6207aa73b4d28bf9a13408154664c2d518652065738d1964da00a022449a3b618b25b72ec17deec6df463ff6811c21b21
 EBUILD cimg-2.6.5.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
 EBUILD cimg-2.6.7.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
+EBUILD cimg-2.7.0.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
 MISC metadata.xml 386 BLAKE2B f7a15bc91bb1eb327b7a491dcf59b1ebadac6e36560bfbecaa07f7d3b189bfb86df12f1c2214b86cc83e70bce941f44a9424f13865c963ba38e9d992ca89075d SHA512 7273a9131bce0af6a2ae93e4893be6beadf25ed510dd3d32c267ea4400e0524929c49df92627fa3aa83ab539075d3404c7e5a2df77628261253aaced1216d59f
diff --git a/media-libs/cimg/cimg-2.7.0.ebuild b/media-libs/cimg/cimg-2.7.0.ebuild
new file mode 100644
index 000000000000..a3f01bc9ba22
--- /dev/null
+++ b/media-libs/cimg/cimg-2.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ template image processing toolkit"
+HOMEPAGE="https://cimg.eu/ https://github.com/dtschump/CImg"
+SRC_URI="https://github.com/dtschump/CImg/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CeCILL-2 CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+S=${WORKDIR}/CImg-v.${PV}
+
+src_install() {
+	doheader CImg.h
+	dodoc README.txt
+
+	use doc && dodoc -r html
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 99a5c146c383..1be2a5ad5271 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -3,10 +3,12 @@ DIST dav1d-0.2.0.tar.bz2 408361 BLAKE2B 2c5f4d7777d85ab1453a744335ee5047b2e108a7
 DIST dav1d-0.2.1.tar.bz2 412003 BLAKE2B 51520f355f51f7fdc8c6e7981fd29f8d5339c2c72058ea05dff6bf0c3b191cf3c077fee1b46813f229d1bee16d1b884e834a5d61bf78459d83113aafe63bca89 SHA512 38d0a9e639579bf2046d3afd7ba0d4205081d8e26955be0216acc84ee2adcc81c790c858932009965b61a66fc3df66ed6b14da9d0e61e2505418c17bc4b75004
 DIST dav1d-0.3.0.tar.bz2 435690 BLAKE2B 57124b2a5bcde8a2de8e4ee8155ec736d2f4c13dc7347029c517d70495de1943feef7f0c7ce1d1051304fe9f3141775fbe07ceec0733fdca3dca166cbab6c417 SHA512 bc0933bbc7064555e8973c82390e414aca8f52a14c5de7ee3ff92c263722d5c9cc472ba5f1f8d1dd60c4ce9ab0ed880c8b4a53b3d33d3aff24bc8e7fb18b0b84
 DIST dav1d-0.3.1.tar.bz2 438676 BLAKE2B f51c997fb95abc5b2721d67feb2023daf6bdab8d725b2b52b6c25440dcfab637b8543b8622c18da678eff20bbed155e86da9c9040a98160e5b9381ba7ab5ecf8 SHA512 b810c993a2a262f75ea0d4404428bc5660ac0d4c4d41aa311bc2180abecc40b36e73858f436b27372f4a1a0b7c700df4f8cc535130c663d6bfba2206d549e0f2
+DIST dav1d-0.4.0.tar.bz2 493854 BLAKE2B 8ae022054ab9827306f6e8501e0bfbc03a04e280a3e155c12ae2dfef474eab976097ce3ed990bd5cdbc3ac79018138a156f0701973ac40357224feb75149332a SHA512 7d2ad9959649321e86f9d0dcf44b274251c103fce9f02964d898b6d9da69e38e93bbed86a7ea217c93e0ee89e1ad43bc31dc217535c4b1cc37761191a6585fc1
 EBUILD dav1d-0.1.0.ebuild 1128 BLAKE2B 20202e1f79289bf576003933bfae0e417974df92f810c2a6ed873e1143af297c2af37918fed3ead030206a4d96fe22722a943b11f2b66a8e1dce210256f7f2c1 SHA512 d25a735d98e03391640d290669a69fe225d28ec3a8a3a1137919d4cd47e97e11f03e1c30f0f2123153b4c0a34f6e8539da94b100a05c0c42e98247b1aabb2d38
 EBUILD dav1d-0.2.0-r1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
 EBUILD dav1d-0.2.1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
 EBUILD dav1d-0.3.0.ebuild 1147 BLAKE2B fbceacf787e296094352daa0382eba35447e6c09aa5fa087cc25102a846537f08852fb86f1592fb06aa23a36acfab93ac6b40fd0af86f305663322076d4b1016 SHA512 50524008230f23b520ae3401af3ce65822b238c3300a4a3715034ac5f584bf76a3f1fd4e1591a539ca07f4f3005564b22bcbe07c30b4ce809ef928bfa00d6a82
 EBUILD dav1d-0.3.1.ebuild 1154 BLAKE2B 344aa8b94ac7f54d056ecc0f43089618f55067e957c5337854759183668174a435d0cfa893320983cf57556020e568854890efa255ada5ff7ead5c5af357d6b6 SHA512 c0904a26810c5efbb493f6f43344047c26777bed07210861b2776f5fca6cf566d544c6b56206cb6112d28e58412cf47df1c31b52c06410e286e36cedd8487823
-EBUILD dav1d-9999.ebuild 1159 BLAKE2B 029caf1d3950e395f7b3a8c9e144992c730d4a7a44f73794b08e0e028989c439137b8a23a42045102796b89c958b8bbdb4c8de63129c989363a9b63c512f9608 SHA512 88eeb6a6cc54b4bdc1305fc73d3c4b6f4ba40963fcf40bbc485d658d205ed30368e455cf2c74214342c2fb2a4ce37b38abef040da0a423939262fdec9291487a
+EBUILD dav1d-0.4.0.ebuild 1159 BLAKE2B 6e4c9ecdb5482e1cd1537b713d7914b539d97e17f9f002f4f3201a7d299547a722509f5a16ba7e477d3a00b3151d7a9aab3c6dd3a87d8e79000fc9219c9fad6f SHA512 8ed036c471e654901a0b6a9d9780e90ecbde36d01390e752a08805c77b2df1632f0503d17d66dc621f12385ec3883b6c6e8f92cdb573f5b93c47665d172f9cec
+EBUILD dav1d-9999.ebuild 1159 BLAKE2B 6e4c9ecdb5482e1cd1537b713d7914b539d97e17f9f002f4f3201a7d299547a722509f5a16ba7e477d3a00b3151d7a9aab3c6dd3a87d8e79000fc9219c9fad6f SHA512 8ed036c471e654901a0b6a9d9780e90ecbde36d01390e752a08805c77b2df1632f0503d17d66dc621f12385ec3883b6c6e8f92cdb573f5b93c47665d172f9cec
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.4.0.ebuild b/media-libs/dav1d/dav1d-0.4.0.ebuild
new file mode 100644
index 000000000000..2ac427eee5dc
--- /dev/null
+++ b/media-libs/dav1d/dav1d-0.4.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+if [[ "${PV}" == "9999" ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
+fi
+
+inherit ${SCM} meson ninja-utils multilib-minimal
+
+DESCRIPTION="dav1d is an AV1 Decoder :)"
+HOMEPAGE="https://code.videolan.org/videolan/dav1d"
+
+LICENSE="BSD-2"
+SLOT="0/2"
+IUSE="+8bit +10bit +asm"
+
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	asm? (
+		abi_x86_32? ( ${ASM_DEPEND} )
+		abi_x86_64? ( ${ASM_DEPEND} )
+	)"
+
+DOCS=( README.md doc/PATENTS )
+
+multilib_src_configure() {
+	local -a bits=()
+	use 8bit  && bits+=( 8 )
+	use 10bit && bits+=( 16 )
+
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
+		build_asm=false
+	else
+		build_asm=$(usex asm true false)
+	fi
+
+	local emesonargs=(
+		-D bitdepths=$(IFS=,; echo "${bits[*]}")
+		-D build_asm=$build_asm
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index 3315a0dfa4c3..2ac427eee5dc 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="dav1d is an AV1 Decoder :)"
 HOMEPAGE="https://code.videolan.org/videolan/dav1d"
 
 LICENSE="BSD-2"
-SLOT="0/1"
+SLOT="0/2"
 IUSE="+8bit +10bit +asm"
 
 ASM_DEPEND=">=dev-lang/nasm-2.13"
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index 5e92d8290724..c17688bb2659 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -6,5 +6,5 @@ AUX devil-1.7.8-libpng14.patch 1221 BLAKE2B 970fa563cbfc333b7529392d52d1cd640ed7
 AUX devil-1.7.8-nvtt-glut.patch 2493 BLAKE2B 4f96f75a6a49c1cdd4b3b89101be693ce4aa851c54aed3d09db752cece3c909085a53ef26e530dad70c70c00b522656ee4b2d6f5c3f83a22244d7eb4999d6566 SHA512 c9adacd0b2c2c1d8980ee87b69b27f0bd3f7f3285ef695499ee90bf4aff55cd8f65c990590478a45d02257c8bb9f01ccc463afe9313efe31a02ee67e15b3207f
 AUX devil-1.7.8-restrict.patch 587 BLAKE2B 265496bb262c945812182764903497d3b4b851eb48980d32197a7d732337ded032272544f7aef1cd725a796093ed274bf38b43bb4138b3bf199de2601a9c5732 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db
 DIST DevIL-1.7.8.tar.gz 2051993 BLAKE2B 7c06549f7d90965fe6dcd7c6b460119a8491ca50f3103c745195fa5483885878717e9ae417eda51f25cbb60c0a96be180b12727115212709199ded13156ecb3e SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e
-EBUILD devil-1.7.8-r2.ebuild 2179 BLAKE2B bebf9505ef4a83d834503cb4e6adf9ec0c79ebfb06256d4fb30bf3de847ad7247dd5cded55f2fe928df18b95a1bb63403f95c5873edd8244d63a52c9dd076056 SHA512 aaed7e62676e65f3d18fc98bc7740bded30e9e32e60911e71cdbfb9518e568d23cdc867c454952812fe74074780418fb84ada8d12880c318c41db86977f81690
+EBUILD devil-1.7.8-r2.ebuild 2127 BLAKE2B 2182ec8999f3ec83b93dc1e247a61f5ed2f383d54b8901f40ec1c11e933916235d725e60f8a8423a6f7cc4eb131f225014c015187dcd3fa28d1a600b3372c570 SHA512 e98887fbb86ee933bba86c1b3538e34a3ebb0b6361b4e49b554a85a69feeb1dd652233565c13043c5763781a6a63330c12f0d3b15ff91951b23b7a46fab9778f
 MISC metadata.xml 499 BLAKE2B 44a05534504849bd393e8b60ca5d7ce0e1b7862fea7bf120ca7f1d4f38d21e9d4566b3037fc9dc9d403f7b8732c175693d3594fb1603d53642354f3a07cf8951 SHA512 68440791a1c641a6983d297e924bee78038905b1ee383592b220f0ef51980d8f9eb237a6d70b0d848781d08e72fe02f4b4f36691d37a72b4003ea59fe3764cfc
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
index 15e294645407..fad8f814c325 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -14,14 +14,13 @@ SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86"
-IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl static-libs tiff X xpm"
+IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt openexr opengl png sdl static-libs tiff X xpm"
 
 RDEPEND="
 	allegro? ( media-libs/allegro:0 )
 	gif? ( media-libs/giflib:= )
 	glut? ( media-libs/freeglut )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
 	mng? ( media-libs/libmng:= )
 	nvtt? ( media-gfx/nvidia-texture-tools )
 	openexr? ( media-libs/openexr:= )
@@ -65,7 +64,7 @@ src_configure() {
 		$(use_enable openexr exr) \
 		$(use_enable gif) \
 		$(use_enable jpeg) \
-		$(use_enable jpeg2k jp2) \
+		--enable-jp2 \
 		$(use_enable mng) \
 		$(use_enable png) \
 		$(use_enable tiff) \
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 8e54e7662e93..ca1d388fa7b4 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,7 +1,7 @@
-DIST Image-ExifTool-11.54.tar.gz 4598312 BLAKE2B 2543f56a9d7b59d085bf147a51f90be3764093853a66f522cc8ea96caefa0389a64cc1c2ae18d9eb1d79dd97f406c13a561c495a249c025b5cb6bd3af3acd5c6 SHA512 3d21ac6208b2410b9e39afc21738da14528fa891a4115472b66a489345bcc9580c922924c6060c413cef30671a7508bc5ec1ce9ec6c3645838210f025059d37f
 DIST Image-ExifTool-11.60.tar.gz 4610485 BLAKE2B 25cd45b20a1089be4894ccc645cee81b55099f46eed55b8d67f624bbac8618f46e1bb78ad19dc88c330231fa974a1a96311d305e09bd13f0dce2d69cf1acbb21 SHA512 e5d104a4b849af903f721bd9cc2898d84f4e7ea6d7a1e3619ba99626ac29ec8e0c02e7a63347787385af3262e77e6da7dbaec06d63c33a931ad1ffce059613fc
-DIST Image-ExifTool-11.61.tar.gz 4611695 BLAKE2B 560d9512a2d89f5e959d44088fa340a53b26c57cef729aab2f5975d85b8415fc0c4d160657d98b20aa4d03b144f274ce67458cc48dcbe969aacdf9f75073e0b1 SHA512 b0a39cf2afee0fec4e8f881a7a8e2660527bf92e97078fb456a4798c3f8091830ee46366c1d3ad106eed529967ed078179ac1e37220facf3319a186582f83d2f
-EBUILD exiftool-11.54.ebuild 605 BLAKE2B 321361a04e5d97128b6d1bfcb845150b287b4a47e57b8a512d7fda58684b67393a1455f6a40eee426c5240dd1160bbd656783c1c4b02966a7808be9b73d40c78 SHA512 88d9ba9249f429d2d36c516298b9461f36bfea90f6025b770fc9012ee4d182f83ffcce76e0010f19eaa1b8bfe5b80de1c7c07d76ff127a044f78e42accc1768a
-EBUILD exiftool-11.60.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
-EBUILD exiftool-11.61.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
+DIST Image-ExifTool-11.63.tar.gz 4616559 BLAKE2B 343d3b19f18d1fc1b0c4073bd24bf596bea35ed3ef4c98899df89d8cc0ce24f07571333208a98b274a50726a051e84d7d1e02f25ed65201a7798320970afb0c6 SHA512 ba58e36c5ec55c521e5610bbbf39831cc76e64f3d9cd2179d0540b987dc4f182e39edf76a7ffa4270473f9eb41800390946b3ca567eef38b023b71ceabc48a3b
+DIST Image-ExifTool-11.65.tar.gz 4622048 BLAKE2B ed8359f40c897b9296450b1cbda1f107a2ee7bc40012e4c74e07712e002be29fd73dd6efa8ea1af5ede2ea868ff5ceab0ff375a9be576bf7277414a6b49854e5 SHA512 7e76fddf9e25b80dfa6c0d59c5ef80708261e1d5529d40051e43ebb476bf8ed1716892075d3faaa3ee2239bde236acb46b4a7906fb689707b90080a752f55011
+EBUILD exiftool-11.60.ebuild 605 BLAKE2B 321361a04e5d97128b6d1bfcb845150b287b4a47e57b8a512d7fda58684b67393a1455f6a40eee426c5240dd1160bbd656783c1c4b02966a7808be9b73d40c78 SHA512 88d9ba9249f429d2d36c516298b9461f36bfea90f6025b770fc9012ee4d182f83ffcce76e0010f19eaa1b8bfe5b80de1c7c07d76ff127a044f78e42accc1768a
+EBUILD exiftool-11.63.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
+EBUILD exiftool-11.65.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.54.ebuild b/media-libs/exiftool/exiftool-11.54.ebuild
deleted file mode 100644
index 3afc7ec316dc..000000000000
--- a/media-libs/exiftool/exiftool-11.54.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-
-	insinto /usr/share/${PN}
-	doins -r fmt_files config_files arg_files
-}
diff --git a/media-libs/exiftool/exiftool-11.60.ebuild b/media-libs/exiftool/exiftool-11.60.ebuild
index d65975820b77..3afc7ec316dc 100644
--- a/media-libs/exiftool/exiftool-11.60.ebuild
+++ b/media-libs/exiftool/exiftool-11.60.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
 SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-11.61.ebuild b/media-libs/exiftool/exiftool-11.63.ebuild
index d65975820b77..d65975820b77 100644
--- a/media-libs/exiftool/exiftool-11.61.ebuild
+++ b/media-libs/exiftool/exiftool-11.63.ebuild
diff --git a/media-libs/exiftool/exiftool-11.65.ebuild b/media-libs/exiftool/exiftool-11.65.ebuild
new file mode 100644
index 000000000000..d65975820b77
--- /dev/null
+++ b/media-libs/exiftool/exiftool-11.65.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+
+	insinto /usr/share/${PN}
+	doins -r fmt_files config_files arg_files
+}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index a97f6184b67e..45e00a33dbf2 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -17,14 +17,14 @@ DIST gegl-0.3.26.tar.bz2 6530788 BLAKE2B 1cd1a61737ec94cb30fdf16ca8dcb5667ebaa48
 DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
 DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66ffed68072add3ea6afc9da3b47c9854eb4e1799c61f451287b244bee4dfc8942365f556a0e820dd7485b9fc305 SHA512 1fcec83a961c0b9c98487de99d26893f98a5401816fa6d7238af4c645672d0eb0474cdb7251b8ebcd344aff589e8979bee0304b50fcfae9513fdbf8a02068e3b
 DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
-EBUILD gegl-0.2.0-r2.ebuild 4777 BLAKE2B ed7a2d4ee08e7b0b9ca6f657e7cbec1acb5a1269f0eec3cd3cb6861f585c3be38381a3f754e16ab5243b4bc0c05f3db7912dd204b31fe1c9439c7050b1c941c9 SHA512 ab067c5e98dc06f8de2cf6d3f6e4914485c2c9845a7d7840d7d51ddb0f7875bcd40fdf0a0c1331271f70c1326c95839b10ce1167bc9d86c647e31c212fdbfe80
-EBUILD gegl-0.2.0-r5.ebuild 4984 BLAKE2B 46d4f811b53c6db09ca75f93bb07c68cc9094e4e790e6fbdbcad29680c1e39173577b06474dfaefe1abab0b0e14d6bd836adbfb33dbb9f0907b6ef2fc507990b SHA512 da64b73c555f36830d5e6641eef87008d868c566ed5adaed7de3bad519a1d091c189643859b1b30ee025eadb54a1add9847a67839a5006b207bf558e423f2f32
-EBUILD gegl-0.2.0-r6.ebuild 5028 BLAKE2B 88cc7d5f327c6379555f7b6a6843d72e505b72ce6515b008762e1255298d05d4b11a6e14ac17bc9975e3963d91145b7dd1d0b3b1c63e6de285fc8afd23e766e8 SHA512 4e2a290c7c0c627a8bb9f96ae401fd78522ec1da7281a57583bbf34f3c65096a3706a86ea63e7f2d46ad9df227c83a2c1ed3a17a29436bf49d42523ecb06a4c5
-EBUILD gegl-0.3.0-r1.ebuild 5383 BLAKE2B ed633ea1a6331b918632a11811b248872508891fa40c21cd17d4f0b19f1463d675b5b1b7180acf904ee9f08dfa1420ae881c5c4cc7e7ff7d71e92e1e70e00e98 SHA512 21587a2c02c1d5f96ee346251271f188ea5fe1cd2711e0005c583535cd90e47d4c8ac119c2d95efa6ff5767e1c5e53802c0b25a9e0dd0b8a2124b629305e9c70
-EBUILD gegl-0.3.0.ebuild 5302 BLAKE2B 9af5ed46f899c5b2bc34c8da9763ac0fb777135bfda816b53a29b2a4dbaa67a441d26b27ce9112cc686c11f2b182bde320b46bb0dacb519a365a7083051949d0 SHA512 089ef4ca7d2833248af322062bdc05f3f155fd7cc9aa67c89e0567d0c7b6a08bb2ab2bceb54e8c0bb790f8caab4bd2418f3885f7f7cc288014f05064163eb6af
-EBUILD gegl-0.3.26.ebuild 5233 BLAKE2B 26efbb8ea85b7b55231801f735b689ff0fccc93fa64c9dfaad33b8819c786f16c57cb7af9bc8da1b74ede6ca72e2dd2e67712dc5c5a2fc26bc833177a9e98f93 SHA512 7516b2ceb2c18b90ae48306765154a33405a38cba39c9531a18d7827408f4a0286e72f51e21fea37493df5f143af8fd302d82f2287de296d6e817947ad6f1f10
-EBUILD gegl-0.3.34.ebuild 5366 BLAKE2B 5de40f7719f3e7376c3fca95eefc3f7a45a1312eb7430df7d192771ca48c614995b50340fab56bb70deb489d51f5666817a9c80b646170c34cb52d3f1ac05b5a SHA512 09cafab516cc80478674476c579fedd38a202c6eac0517fe8f9b3078126708b670714bd00145236be819a9c7fe8d959eb6dd2c189383889d9783ec20b3acd104
-EBUILD gegl-0.4.14.ebuild 5034 BLAKE2B ff04f06bfa647db99ea4fc75aa783f003abf31966704139f7b6af679830b1b66d84b32496a19cb85db0b934dacb552ace42f3a07f435d837851a98dbfe5b8a36 SHA512 1e90df3fa07e59a75daec2d4d9eaebb43179b5cd4ffeff74203869288d20c8eeeb6b6cd6462f1f356b51e50a15cf7861e290a5d8c7d5d5848e604fa794748e54
-EBUILD gegl-0.4.16.ebuild 4921 BLAKE2B d2b59d69d4aedf53471cd4a5eef5728a4b2c75f58239f70d4452fe00c22619a28d64df1563a9c4570426f7441bee9bbc6d5652745a472a0d5fc2591b7021e05c SHA512 842175c0de307c8ce8f7ae617ade970ac18f071dd42cf250a9f27d7bd0fd7db38a09a6c1f3a0496b62d45ad2cd1d3516cf8b185b8952225877920a4674954adb
-EBUILD gegl-9999.ebuild 4860 BLAKE2B 9155550f7e4b13980aeb6ea781e817c690c5d0ba79e03adcd8cd3d1e4bc2dbd3d17eaf5e5f6eab5a387d10304376168194696aa43dffd80c777015c6647e1604 SHA512 eaf89e93e24839fb7f2523e10d6a6a714106a4d48d38aca7267d817ece01041f383fe4efddf8bf925ba9d9aab81f0f0fa1444a6d670e382d697afdad7812a043
+EBUILD gegl-0.2.0-r2.ebuild 4715 BLAKE2B 4c6e8445587cff6ad1c44eee4b40bcbf57e5d573242e8794aedeba19b6065a58d02c72a1951f2b31a5601c6b124e30ebb207a06f5aadc5e4b846294f717ec906 SHA512 16048b6ac471d9af936df2285380303012fd538d57b35c67b073ff54ad952417260cbea51403c11844547a4f69c16e65eb460fbfb43ef05bbb9e8dd338102b00
+EBUILD gegl-0.2.0-r5.ebuild 4922 BLAKE2B ede5b2bd0934ab7a5c82ce33532925f8c0b10b30bbc8cb89744cd9603c066398a787a99b308635760315aa231dae4eb35da1db25adb17ccf93c11f0c00b9e79e SHA512 d493f0217dc590c8b1df84fe43b08f44c6f55d6e720edf7a091b36cf7ea6c36ad06b4df2c930d6a7ff9595d15d220c8cf1d4256db2fef90d5bdf1b3ac8bf5a3d
+EBUILD gegl-0.2.0-r6.ebuild 4969 BLAKE2B 495c5c1be600b709fe63af6e20702368a307766f7175c7f5b953bd00c1df6e91c8ffd13f32be27abdc1450f9a548c8f7566543719476028dc92ed51b61d6dbce SHA512 a8fd04a2449fbd2cbbc4227c797aaf0d5dd42167e87b599f0203f24e61516318a242a091180de5956d8a473f76520123bb661c123b20a00cd72102e2e788f2b6
+EBUILD gegl-0.3.0-r1.ebuild 5321 BLAKE2B 917874f80c58690d7053366b5cbf11ebe10fca3d775515d9255b4d966c2d894617d75dc2134af61f497c5d09c4fe05c7b9bb156e3783fbab628ff89adb947257 SHA512 c01caae58f8008909e131ee03fcd92d225703d13a442df9371e77d0dafb3245778a244930b6827c714d66beb297e8829d220ed2a51bd02416ec010bd726aa35a
+EBUILD gegl-0.3.0.ebuild 5240 BLAKE2B 46019ac823a517365f33f28231b6f77b93c4b10eb9378e511a453b795eb5ba9ef08391e6a2687e724357befead82bce42cd4bf3c71962774f0e128c668191782 SHA512 31a7619e95d995f6fc4ae46bd404cd1a526970c4e49869c4b78623528588b708da6c8db60c2bbe010bae0601e3ca387bee520adcd3eea42c21cb02bf290ac9d3
+EBUILD gegl-0.3.26.ebuild 5174 BLAKE2B c7808b15a796bedce4067ab5ba961edad3f370119aedf81b17faf7d70a5a5f3da2f58acbe2f3c41edf59859a822cb07f7684d56db0bbec25f32b39854a4b4f6a SHA512 ff10de4870e4393e38036cd0dc81e2dfafd2ad713ba98f8c3847b96e5aac4e9ea842232f8c2dffe134eb08975dfd8063fc4dc7ec513e80d113916f84411977c6
+EBUILD gegl-0.3.34.ebuild 5307 BLAKE2B 6c03b2f9499b47e8b1986b0196cf4fa7ea8fb0df2c6e82e8508bda61591660e213269bf604d059718f7f9581c2e7661722521ce83c2f88e63bbef68c06966479 SHA512 b1b5c080f80c981b0a5ea2d40567ff283f181e08983401abfad5ec4449ed8509766a509f17b46eb5ddd00566a031d6371139b57c330ef978b6c57d8ce88261cf
+EBUILD gegl-0.4.14.ebuild 4975 BLAKE2B 7b035e9b96710d3dcb30b7d88d18deea3722ac491cdefce7c9b7d3d1611ba7ef30f700202f44d8a558b8f7b7116c6f7b9622e18e6b7df29b4baa8a9155533a5c SHA512 587511473e344d4b4e7b5b78c0830aa2982a1537f8e089a05775aa0b09d299b13e64b0b00fb4fe3ad9fce626442d9c12172eb8ea0705657e6767a844503ad0b0
+EBUILD gegl-0.4.16.ebuild 4862 BLAKE2B 14985dd5ed6c6979bdc62eb0920485b5d71a551c30485836db6996c74de00f215c6a5db1a6f672d127d28495fe69c7e8638f736d3a68c63421a7232016bd6e78 SHA512 10bb8071022ace6d447a5854d142527daf72763cf954a92dcb02a634e39e0fd9b3baadf1f472b50e0eb02706e98bcfebf88fae03e6f2af37a905a11b9c142678
+EBUILD gegl-9999.ebuild 4801 BLAKE2B a503b8a5be5862b6f574a794b77d160780982cae9e70d9a832888a97dc51e954193726e74ee9fa468fcc2fb2376614defb2f8c21766b35cf233c342fa88baf84 SHA512 63d36d57ae51e86b9ad9aca49af8616b4a1b2fd86c5b554aa12ad335a9c077aa32295c5fec0c6fd189744bd4bb8a9a74f4158c3ca96b416cf6041e7bab522ff2
 MISC metadata.xml 396 BLAKE2B aeb29a940e3747b4ea2418e3723c549291cbfd49d8152c75fcc9116b46892eac29338b36875b32c7f3968deecf142296b0f9725d02a80a0380dfba6fba17d810 SHA512 7530e0bc7d86a57334d1dc6fc75b6acc1eb3512c2618d1ed47bbc025aa95f72fa1d41b78765ae53721ea794538d22df1be22189dd54e30fa4bf94e7f0cdced1a
diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
index f0d4ba5afc4a..aad4c1cd8862 100644
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
-IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
 RDEPEND="
 	>=media-libs/babl-0.1.10
@@ -32,7 +32,6 @@ RDEPEND="
 		!libav? ( media-video/ffmpeg:0= )
 	)
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
 	openexr? ( media-libs/openexr )
 	png? ( media-libs/libpng:0= )
 	raw? ( =media-libs/libopenraw-0.0.9 )
@@ -125,7 +124,7 @@ src_configure() {
 		$(use_with ffmpeg libavformat) \
 		--without-graphviz \
 		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k jasper) \
+		--without-jasper \
 		--without-lua \
 		$(use_with openexr) \
 		$(use_with png libpng) \
diff --git a/media-libs/gegl/gegl-0.2.0-r5.ebuild b/media-libs/gegl/gegl-0.2.0-r5.ebuild
index fff2f22ff18a..6f8434819a09 100644
--- a/media-libs/gegl/gegl-0.2.0-r5.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
-IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
 RDEPEND="
 	>=media-libs/babl-0.1.10
@@ -32,7 +32,6 @@ RDEPEND="
 		!libav? ( media-video/ffmpeg:0= )
 	)
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
 	openexr? ( media-libs/openexr )
 	png? ( media-libs/libpng:0= )
 	raw? ( >=media-libs/libopenraw-0.1:0= )
@@ -135,7 +134,7 @@ src_configure() {
 		$(use_with ffmpeg libavformat) \
 		--without-graphviz \
 		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k jasper) \
+		--without-jasper \
 		--without-lua \
 		$(use_with openexr) \
 		$(use_with png libpng) \
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
index cf53c1f3df96..9aeec0f2c2e2 100644
--- a/media-libs/gegl/gegl-0.2.0-r6.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r6.ebuild
@@ -18,7 +18,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
-IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 
 RDEPEND="
 	>=media-libs/babl-0.1.10
@@ -32,7 +32,6 @@ RDEPEND="
 		!libav? ( >=media-video/ffmpeg-4:0= )
 	)
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
 	openexr? ( media-libs/openexr )
 	png? ( media-libs/libpng:0= )
 	raw? ( >=media-libs/libopenraw-0.1:0= )
@@ -136,7 +135,7 @@ src_configure() {
 		$(use_with ffmpeg libavformat) \
 		--without-graphviz \
 		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k jasper) \
+		--without-jasper \
 		--without-lua \
 		$(use_with openexr) \
 		$(use_with png libpng) \
diff --git a/media-libs/gegl/gegl-0.3.0-r1.ebuild b/media-libs/gegl/gegl-0.3.0-r1.ebuild
index d3ddca6e6f44..ce9b36b0372a 100644
--- a/media-libs/gegl/gegl-0.3.0-r1.ebuild
+++ b/media-libs/gegl/gegl-0.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=5
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0.3"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
@@ -44,7 +44,6 @@ RDEPEND="
 	)
 	introspection? ( >=dev-libs/gobject-introspection-1.32 )
 	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
 	lcms? ( >=media-libs/lcms-2.2:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
 	openexr? ( media-libs/openexr )
@@ -148,7 +147,7 @@ src_configure() {
 		$(use_with ffmpeg libavformat) \
 		--without-graphviz \
 		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k jasper) \
+		--without-jasper \
 		$(use_with lcms) \
 		$(use_with lensfun) \
 		--without-lua \
diff --git a/media-libs/gegl/gegl-0.3.0.ebuild b/media-libs/gegl/gegl-0.3.0.ebuild
index e106b3ee26bc..b86bd58c0880 100644
--- a/media-libs/gegl/gegl-0.3.0.ebuild
+++ b/media-libs/gegl/gegl-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0.3"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
@@ -44,7 +44,6 @@ RDEPEND="
 	)
 	introspection? ( >=dev-libs/gobject-introspection-1.32 )
 	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
 	lcms? ( >=media-libs/lcms-2.2:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
 	openexr? ( media-libs/openexr )
@@ -146,7 +145,7 @@ src_configure() {
 		$(use_with ffmpeg libavformat) \
 		--without-graphviz \
 		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k jasper) \
+		--without-jasper \
 		$(use_with lcms) \
 		$(use_with lensfun) \
 		--without-lua \
diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild
index f39cb535af1a..2efd65a82028 100644
--- a/media-libs/gegl/gegl-0.3.26.ebuild
+++ b/media-libs/gegl/gegl-0.3.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0.3"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
 REQUIRED_USE="
 	svg? ( cairo )
 	vala? ( introspection )
@@ -47,7 +47,6 @@ RDEPEND="
 	)
 	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
 	virtual/jpeg:0=
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
 	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
 	openexr? ( >=media-libs/openexr-1.6.1:= )
@@ -149,7 +148,7 @@ src_configure() {
 		$(use_with ffmpeg libavformat) \
 		--without-gexiv2 \
 		--without-graphviz \
-		$(use_with jpeg2k jasper) \
+		--without-jasper \
 		$(use_with lcms) \
 		$(use_with lensfun) \
 		--without-lua \
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index f8d856ccf08c..5c8d5871daa0 100644
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0.3"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
 REQUIRED_USE="
 	svg? ( cairo )
 	vala? ( introspection )
@@ -47,7 +47,6 @@ RDEPEND="
 	)
 	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
 	virtual/jpeg:0=
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
 	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
 	openexr? ( >=media-libs/openexr-1.6.1:= )
@@ -151,7 +150,7 @@ src_configure() {
 		$(use_with ffmpeg libavformat) \
 		--without-gexiv2 \
 		--without-graphviz \
-		$(use_with jpeg2k jasper) \
+		--without-jasper \
 		$(use_with lcms) \
 		$(use_with lensfun) \
 		--without-lua \
diff --git a/media-libs/gegl/gegl-0.4.14.ebuild b/media-libs/gegl/gegl-0.4.14.ebuild
index 5bd3966b05ee..aa1e3dfdf967 100644
--- a/media-libs/gegl/gegl-0.4.14.ebuild
+++ b/media-libs/gegl/gegl-0.4.14.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
 REQUIRED_USE="
 	svg? ( cairo )
 	vala? ( introspection )
@@ -47,7 +47,6 @@ RDEPEND="
 		!libav? ( media-video/ffmpeg:0= )
 	)
 	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
 	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
 	openexr? ( >=media-libs/openexr-2.2.0:= )
@@ -136,7 +135,7 @@ src_configure() {
 		$(use_with cairo)
 		$(use_with cairo pangocairo)
 		$(use_with ffmpeg libavformat)
-		$(use_with jpeg2k jasper)
+		--without-jasper
 		$(use_with lcms)
 		$(use_with lensfun)
 		$(use_with openexr)
diff --git a/media-libs/gegl/gegl-0.4.16.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild
index c45193011d15..53a84339c68b 100644
--- a/media-libs/gegl/gegl-0.4.16.ebuild
+++ b/media-libs/gegl/gegl-0.4.16.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
 REQUIRED_USE="
 	svg? ( cairo )
 	vala? ( introspection )
@@ -47,7 +47,6 @@ RDEPEND="
 		!libav? ( media-video/ffmpeg:0= )
 	)
 	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
 	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
 	openexr? ( >=media-libs/openexr-2.2.0:= )
@@ -133,7 +132,7 @@ src_configure() {
 		$(use_with cairo)
 		$(use_with cairo pangocairo)
 		$(use_with ffmpeg libavformat)
-		$(use_with jpeg2k jasper)
+		--without-jasper
 		$(use_with lcms)
 		$(use_with lensfun)
 		$(use_with openexr)
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 2a01f502b352..9655bb544e66 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
 REQUIRED_USE="
 	svg? ( cairo )
 	vala? ( introspection )
@@ -47,7 +47,6 @@ RDEPEND="
 		!libav? ( media-video/ffmpeg:0= )
 	)
 	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
 	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
 	openexr? ( >=media-libs/openexr-2.2.0:= )
@@ -129,7 +128,7 @@ src_configure() {
 		$(use_with cairo)
 		$(use_with cairo pangocairo)
 		$(use_with ffmpeg libavformat)
-		$(use_with jpeg2k jasper)
+		--without-jasper
 		$(use_with lcms)
 		$(use_with lensfun)
 		$(use_with openexr)
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index b1e0b9513837..1a4488ad1954 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,3 +1,5 @@
 DIST grilo-0.3.7.tar.xz 232544 BLAKE2B 2d1f7942b09808bb5e09040b4a633a6bd354220ba1369d31ff6160c12ab15c1e2642617ae7f35c8320d7a5842736d8714c6e7dc7f3cb0651d841b6513633f5c9 SHA512 82c41d63edc23c056e189a73b0de87db342bba575d42efeda78ed4bf78fb8994111a2e9457e6f2453045b9b7b2d171b9e89d71c3a107cfa06af24644d9cb71df
+DIST grilo-0.3.9.tar.xz 233616 BLAKE2B c22b868d5bcb6731024b212d6bc1502b493950e363127202ded0ed80f3e937bf78062ba6f2803e29f686ff8cfc521147e69b8f4a7b33060d81e30f34a231e37b SHA512 250596f277ea76d8f6a071fb0e48dd7ea735a534f48a4f2e3f69f7c62a2b5b4c995714a8435ffa9107345e86bba5b21fc136cc47b956f461723a00d0e6ede9bf
 EBUILD grilo-0.3.7.ebuild 2053 BLAKE2B 13132593347bd779208414302a0268478867e98ac583673bcb71608f9c72c420e9dae73025bbb5e33994e6ef6c0c3d27c53bd2ed46802df80a10661c6255f23e SHA512 3ec448ba94ee9206379ca5f7676e14471a472ae761edd077ec306fb9aa48841ca4e342fb8c141b1056a6d964f5b3c9dcd5bd0ba0c1bdb968b634472ec2cf130f
+EBUILD grilo-0.3.9.ebuild 2193 BLAKE2B 26b2d5b383080e9068ffff02008fd4df78a2a960abd8fdc63006cd6e3ab01c2942f9fb1a90fd56b737d25d16fee0081671785cb8d7000be4fda6d2ee61b47e57 SHA512 e948ffb4f03d4009a3a8c3a264ce9eeaeb01b27649e53b675ac35949b8bd2e83903492bf330d7c9c3ac8651c0c61127b4eeb378bfbabebb1b162aa91454dd56e
 MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
diff --git a/media-libs/grilo/grilo-0.3.9.ebuild b/media-libs/grilo/grilo-0.3.9.ebuild
new file mode 100644
index 000000000000..f07a46d3c8d4
--- /dev/null
+++ b/media-libs/grilo/grilo-0.3.9.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson python-any-r1 vala xdg
+
+DESCRIPTION="A framework for easy media discovery and browsing"
+HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk gtk-doc +introspection +network +playlist test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+# oauth could be optional if meson is patched - used for flickr oauth in grilo-test-ui tool
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	dev-libs/libxml2:2
+	network? ( >=net-libs/libsoup-2.41.3:2.4[introspection?] )
+	playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+
+	gtk? (
+		net-libs/liboauth
+		>=x11-libs/gtk+-3.14:3 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.3 )
+	${PYTHON_DEPS}
+	test? ( sys-apps/dbus )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-${SLOT%/*}':" meson.build || die
+	sed -i -e "s:meson.project_name():'grilo-${SLOT%/*}':" po/meson.build || die
+	sed -i -e "s:'grilo':'grilo-${SLOT%/*}':" doc/grilo/meson.build || die
+
+	# Drop explicit unversioned vapigen check
+	sed -i -e "/vapigen.*=.*find_program/d" meson.build || die
+
+	# Don't build examples; they get embedded in gtk-doc, thus we don't install the sources with USE=examples either
+	sed -i -e "/subdir('examples')/d" meson.build || die
+
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use network enable-grl-net)
+		$(meson_use playlist enable-grl-pls)
+		$(meson_use gtk-doc enable-gtk-doc)
+		$(meson_use introspection enable-introspection)
+		$(meson_use gtk enable-test-ui)
+		$(meson_use vala enable-vala)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 197a06acda0f..b385d2e5df09 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-bad-1.14.3.ebuild 2626 BLAKE2B bb5337c926fb53f010b1f3898c2a85a08ca429c1dff7bcfb7f88a00259a78b803c660948c3ff635b49725333ddd0dabef3b3373b433ef1af30e54489300a7d85 SHA512 7dfa4c012a4dd7b73b31ba59352c90a3a6ec5aebde1cce1b7262d4f2e6cb832e9bacdd90a82a71b8a8080a4c5b774d6f9088c44954e748267dce09c90cd23202
+EBUILD gst-plugins-bad-1.14.5.ebuild 2634 BLAKE2B 2c25a8926cc468bad259672fab60a9028340b2bf31d21cbfd62b7d7e5967decb0d0ed3ab37f60c03278a7cfd89122bf39520079cac4dc1c53461d6f7f5c6d222 SHA512 a6134e8969f7fa8eba3a7f46fa6e19b16c96e561fe8010260823d0d05a840d40719a2e9950b701013b99126963e512df63bd701ebb57d30b9247895f3c8ad6a5
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
new file mode 100644
index 000000000000..1c39a3a7fbd8
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit flag-o-matic gstreamer virtualx
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# TODO: egl and gtk IUSE only for transition
+IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
+
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
+	wayland? (
+		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.4
+	)
+
+	gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+	local myconf=()
+	if use opengl || use gles2; then
+		myconf+=( --enable-gl )
+	else
+		myconf+=( --disable-gl )
+	fi
+
+	# Always enable shm (shm_open) and ipcpipeline (sys/socket.h); no extra deps
+	gstreamer_multilib_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable bzip2 bz2) \
+		$(use_enable orc) \
+		$(use_enable vcd) \
+		$(use_enable vnc librfb) \
+		$(use_enable wayland) \
+		--disable-examples \
+		--disable-debug \
+		--without-player-tests \
+		--enable-shm \
+		--enable-ipcpipeline \
+		"${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	unset DISPLAY
+	# Tests are slower than upstream expects
+	virtx emake check CK_DEFAULT_TIMEOUT=300
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index b56a78891830..166de97f7166 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,4 +1,7 @@
 DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
+DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 EBUILD gst-plugins-base-1.14.4-r1.ebuild 5919 BLAKE2B eb497ebed24ba4775e90d05236714a5c65c9576d6c61a7df3ca25b9677a614db7fcdcaf3f6afb61751fee435e0df296b878dd383c142d7d5d3c39e8a6cab7623 SHA512 298e7adb9daa3447aed8d67c9d3d3672c356d20b11b82fbe51bfb970833baa27c8f9be63ebab3913f34c98c2c50872369831177e307750a181b3962190f210f2
 EBUILD gst-plugins-base-1.14.4.ebuild 6061 BLAKE2B bf46ef975e9675c8d55bd807e11074cff4b31dc7d308750ceedd43bb67889473183dc1c83109f4783af4564180b23e14b92787bd4ac2ccc75d28917b03dc14e5 SHA512 9493adf3513a16e4f07fe15d9572e60285817396f43a8ec79fba0a3b37f1e35bf845e3edab2e92454d9b59bcaa69c21702e8de62243905cab45427d6a123f9c1
+EBUILD gst-plugins-base-1.14.5-r1.ebuild 5925 BLAKE2B a18cda341f3165e7b07babd24c5da5b79da835577b8df698f0e9e5a63b9356c88040d1c0ab638eb2489a93c9d042062cf3e34c8129f0f450bd2dde763867d804 SHA512 86332c0a762c8c19002245b7df5b2f117696c7f28ce74541d6e11107ef1c006b6e5abdd2022e04f0f97d3247e8a6bbbb397bfa27d32cc0340ae126f273abc900
+EBUILD gst-plugins-base-1.14.5.ebuild 6063 BLAKE2B dcd3142fe16e772125bf4f178b019c40e58c98ef293e9afac8e68d18ec6228a653acf11377f70071f50869b4d1fdbf0594d87ef13c8b816030cdbbd768fc6462 SHA512 77acc4ddcca654ce6bbc21f28038cd2d4b7a1aca8afecfb330d2889d43a9fa0e0ecb2fb86559ac077dc867cb121f316d8e2f36ae520f13f593bbd501b6336ada
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
new file mode 100644
index 000000000000..9f40a8032600
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+#  * glx platform requires opengl API
+#  * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+#  and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+	|| ( gbm wayland X )
+	wayland? ( egl )
+	gbm? ( egl )
+"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+	gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+	>=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
+	egl? (
+		x11-libs/libdrm
+	)
+	gbm? (
+		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+	)
+
+	>=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+	media-libs/libpng:0[${MULTILIB_USEDEP}]
+	virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	X? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	# Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
+	sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
+	default
+}
+
+multilib_src_configure() {
+	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+	local myconf=()
+	# FIXME: Automagic gbm and x11 wsi
+	if use opengl || use gles2; then
+		myconf+=(
+			--enable-gl
+			$(use_enable egl)
+			$(use_enable gles2)
+			$(use_enable opengl)
+			$(use_enable wayland)
+			$(use_enable X x11)
+		)
+	else
+		myconf+=(
+			--disable-gl
+			--disable-egl
+			--disable-gles2
+			--disable-opengl
+			--disable-wayland
+			--disable-x11
+		)
+	fi
+
+	if use opengl && use X; then
+		# GLX requires desktop OpenGL and X
+		myconf+=( --enable-glx )
+	else
+		myconf+=( --disable-glx )
+	fi
+
+	myconf+=(
+		--disable-cocoa
+		--disable-dispmanx
+		--disable-wgl
+	)
+
+	gstreamer_multilib_src_configure \
+		$(use_enable alsa) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable ivorbis) \
+		$(use_enable ogg) \
+		$(use_enable orc) \
+		$(use_enable pango) \
+		$(use_enable theora) \
+		$(use_enable vorbis) \
+		$(use_enable X x) \
+		$(use_enable X xshm) \
+		$(use_enable X xvideo) \
+		--enable-iso-codes \
+		--enable-zlib \
+		--disable-debug \
+		--disable-examples \
+		--disable-static \
+		"${myconf[@]}"
+
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
+
+multilib_src_test() {
+	unset GSETTINGS_BACKEND
+	emake check
+}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
new file mode 100644
index 000000000000..b0288166ffca
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+#  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+#  * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+#  * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+#  * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+#  * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+#  * glx platform requires opengl API
+#  * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+#  and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+#  and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+	|| ( gbm wayland X )
+	wayland? ( egl )
+	gbm? ( egl )
+"
+REQUIRED_USE="
+	ivorbis? ( ogg )
+	theora? ( ogg )
+	vorbis? ( ogg )
+	opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+	gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+	>=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
+	egl? (
+		x11-libs/libdrm
+	)
+	gbm? (
+		>=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+	)
+
+	media-libs/libpng:0[${MULTILIB_USEDEP}]
+	virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+	ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+	pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+	theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	X? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	# Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
+	sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
+	default
+}
+
+multilib_src_configure() {
+	filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+	local myconf=()
+	# FIXME: Automagic gbm and x11 wsi
+	if use opengl || use gles2; then
+		myconf+=(
+			--enable-gl
+			$(use_enable egl)
+			$(use_enable gles2)
+			$(use_enable opengl)
+			$(use_enable wayland)
+			$(use_enable X x11)
+		)
+	else
+		myconf+=(
+			--disable-gl
+			--disable-egl
+			--disable-gles2
+			--disable-opengl
+			--disable-wayland
+			--disable-x11
+		)
+	fi
+
+	if use opengl && use X; then
+		# GLX requires desktop OpenGL and X
+		myconf+=( --enable-glx )
+	else
+		myconf+=( --disable-glx )
+	fi
+
+	myconf+=(
+		--disable-cocoa
+		--disable-dispmanx
+		--disable-wgl
+	)
+
+	gstreamer_multilib_src_configure \
+		$(use_enable alsa) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable ivorbis) \
+		$(use_enable ogg) \
+		$(use_enable orc) \
+		$(use_enable pango) \
+		$(use_enable theora) \
+		$(use_enable vorbis) \
+		$(use_enable X x) \
+		$(use_enable X xshm) \
+		$(use_enable X xvideo) \
+		--enable-iso-codes \
+		--enable-zlib \
+		--disable-debug \
+		--disable-examples \
+		--disable-static \
+		"${myconf[@]}"
+
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi
+
+	if multilib_is_native_abi; then
+		local x
+		for x in libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
+
+multilib_src_test() {
+	unset GSETTINGS_BACKEND
+	emake check
+}
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index d67ce1110d0f..975106b8634d 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-good-1.14.4.ebuild 1431 BLAKE2B 7a88c207f331b2893d3ce9e8a245b45a6300d127eccb0b2a4680f8cc9e39d54874a4e24076fe4d990c094ffb79864ec662adb4a7bc009bfdc8f3bac05aec300c SHA512 8a4f1e7c155d1a55f2f93f98aceb1ff56cf2295a409891e6342ba9357d04c4be4d9bd1411447c992530ab98d4afe868bf4883805e11ea39f0e82cc22701d16ed
+EBUILD gst-plugins-good-1.14.5.ebuild 1439 BLAKE2B 0409679b2c37345ec80fe1bf49d40f690c44edee6cc78092d8748fd22ed9b30d292398758e63941ec1c6f90cbb7b34b08ad614c6a3c0e2efd3ec6bc31ee3add8 SHA512 bac683ae56efb8b9ab7dab3badfd457913f32e236f4770fff081ccb4386208c8f9ed677d6660b4f72aed39582e404ee42a7790487681542f6babc896d7f7bb8e
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
new file mode 100644
index 000000000000..d4b054018540
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+multilib_src_configure() {
+	# Always enable optional bz2 support for matroska
+	# Always enable optional zlib support for qtdemux and matroska
+	# Many media files require these to work, as some container headers are often
+	# compressed, bug #291154
+	gstreamer_multilib_src_configure \
+		--enable-bz2 \
+		--enable-zlib \
+		--disable-examples \
+		--with-default-audiosink=autoaudiosink \
+		--with-default-visualizer=goom
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/plugins/html docs/plugins/html || die
+	fi
+
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index 81e614273b6e..1d0483155880 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -1,3 +1,5 @@
 DIST gst-rtsp-server-1.14.2.tar.xz 665904 BLAKE2B 3f9ab3c1579d34ec8877bcc6da2802cc69aa444ef1fabfe548e2acf3b1c58eb0e29ffb09c250fb6d2ae61e4847bf2098c22874ec43266d46d5b402cbbbcda892 SHA512 81c64c31cef45479ec23d57b11d09950ca8c04820b6cf422af6caabccd71ad648e210a114f9f020136ddfdfc9e942c3eb15f055778d493d54c8770ed4f93634c
+DIST gst-rtsp-server-1.14.5.tar.xz 672180 BLAKE2B 3e67f703c190e46580cf7c08a9437d51e9c1e009dd27cf359ecd5aa301ddda6cd70c0d5567e72c6e5f9443318e899a9b55e6883c71c9fc021f77286afd89bbc9 SHA512 dbfb63fb219808d2a32d710bef33d2b3b9906300d4c527c72534a4cb6db0f5ce4f4fadcedf7f6a3a5f46005f4408717d9aafa1a510c4aed18f5d07d6b3646492
 EBUILD gst-rtsp-server-1.14.2.ebuild 1983 BLAKE2B 44bbb19d0691a24c72f5dd0237fbfecfc6aaf89d6dbc3d346e4bf828ee0543427da5df4c443bd2c634a56716ebff70c67c8edac30f586cd5ecbf607854749a1e SHA512 9f3e868ca8b2aff1d64ba01a6747268643c2c98304db63a117c18c9250af699dcbf3854390c320d05e8620807ca08bb4994f8822ceb09a0fdfbfb73077cdde8f
+EBUILD gst-rtsp-server-1.14.5.ebuild 1985 BLAKE2B 385b06fef47504a0b5ee5435d09de826b1594bc9ee1371ca440c4bcebb5e16a4d3d7a285bbc7968c500550e55ac2a5e2d54f77467b549ea25e5f76d240d96674 SHA512 c4f3d1be98944daae9b9251f5a48436cc03eefc886b99935dff42ffd121c5217e465d2e9e016790d8318940341db8c9df5ef0045ea6a668483a8aa986d5fab58
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.5.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.5.ebuild
new file mode 100644
index 000000000000..e31415b887ee
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gstreamer
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +introspection static-libs test"
+
+# gst-plugins-base for many used elements and API
+# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more
+# gst-plugins-srtp for srtpenc and srtpdec elements
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+# Due to gstreamer src_configure
+QA_CONFIGURE_OPTIONS="--enable-nls"
+
+multilib_src_configure() {
+	# debug: only adds -g to CFLAGS
+	# docbook: nothing behind that switch
+	# libcgroup is automagic and only used in examples
+	gstreamer_multilib_src_configure \
+		--disable-debug \
+		--disable-valgrind \
+		--disable-examples \
+		--disable-docbook \
+		--disable-gtk-doc \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests) \
+		LIBCGROUP_LIBS= \
+		LIBCGROUP_FLAGS=
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi ; then
+		ln -s "${S}"/docs/libs/${d}/html docs/libs/${d}/html || die
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+	# Handle broken upstream modifications to defaults of gtk-doc
+	emake install -C docs/libs DESTDIR="${D}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*.c
+	fi
+}
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index a6ba570fab0b..35f06a1c0642 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,3 +1,5 @@
 DIST gstreamer-editing-services-1.14.3.tar.xz 1066740 BLAKE2B c5511ca12eccb08d49733540e2d264290a6ca53ec0d5e9007d354e10808568727ed10bfb205c425fd56d334ef12e30324d67b0dcff8115b3c13d1123fe6026b9 SHA512 5dc4fc65c7ce9604b75516774c4481f3214ed703c0d3bb2a6fa348e5a8a09c963ac711e81e5c91f12f57ab3df63a94d7d178fcd4aab4d4d429f32e055c14a205
+DIST gstreamer-editing-services-1.14.5.tar.xz 1069356 BLAKE2B 95ddff56b56b3ae59872a340258af0277d9b5c3619fe25861ce3f65238d3802bdda3c51cf84f0a206f7ccf095ab81ff3f178b7c0322dc7687741626c3b8da947 SHA512 9b3d0336e596004a51069900c61f293eaf213a83655799139373c77cf5637a3511ba4ec6a1c75f53d81643539e32f7d130fd0cd58090b948f81e8e081226b5c3
 EBUILD gstreamer-editing-services-1.14.3.ebuild 1539 BLAKE2B 6f6a6a961099c57bea9c0a0c4c9b3b91c88ffdc51ae078657edbb2ff956a7faa2eb392db1e9a71758d2229ae3bc54959f6ca9a90291bbf647ad7660f9630bb57 SHA512 6a06f9007b0383ce3fa5fbd04fc78be2e0bb2389e43817855864688a3d807f8e02818859b6c0948a96e9228e5eeb3656adabf7cea76099bc33bddbc4dd37a45f
+EBUILD gstreamer-editing-services-1.14.5.ebuild 1541 BLAKE2B e620b4f7bacb9b43107a9b48872c8c9d308420fc634b2f4970c67c4fa37bdf563e2276045757b907fecd173a97ff090377a3ebffc210d12e0c797ed3b3fb0e9c SHA512 afd9010114a91001a7113426c6cd36679c46fa59644cc6e6f3095e42c0f08f4b6207c3bea9bcca025b14d2fbfd0002240500c41d85e9c10a0c71ab7abe27f379
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild
new file mode 100644
index 000000000000..5dcedc7b4efe
--- /dev/null
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild
@@ -0,0 +1,55 @@
+# 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} )
+GNOME2_LA_PUNT="yes"
+
+inherit bash-completion-r1 gnome2 python-r1
+
+DESCRIPTION="SDK for making video editors and more"
+HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+introspection"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=media-libs/gstreamer-${PV}:1.0[introspection?]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.3
+	virtual/pkgconfig
+"
+# XXX: tests do pass but need g-e-s to be installed due to missing
+# AM_TEST_ENVIRONMENT setup.
+RESTRICT="test"
+
+src_configure() {
+	# gtk is only used for examples
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--disable-examples \
+		--without-gtk \
+		--with-bash-completion-dir="$(get_bashcompdir)" \
+		--with-package-name="GStreamer editing services ebuild for Gentoo" \
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services"
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #538888
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	addpredict /dev
+	gnome2_src_compile
+}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index f63fcf8acd80..954cd197dac4 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,3 +1,6 @@
+AUX 1.14-glib-2.60-tests-compat.patch 2173 BLAKE2B 1e7e3320d2eb52f968280e8204e5cbdb2d4fe085fcf77bd798cb474216b758bff3a70f6b0e3f93d656a6e41b44be6c3f931ed5543e4ca10b51d19b4f4f153bc9 SHA512 f559150ac5e40a2fe259a8346ed085a20df86d93e5292c9dcc024274f12e0beb90266395538943946ca01a2a5f56be3ab32f1f850e1c8c047848aebc13ab2350
 DIST gstreamer-1.14.4.tar.xz 3264324 BLAKE2B d51febcd7c317964a09dadb4d3bd3ee7a60ac38bef28cdd7d42f49a7b710d6f6180ca7edee1765c8d146f7e3e852e93d0d5f69962089a653cfc3e6bd4ab42f89 SHA512 7ece9f01d40df7c8358482eac94536c5e15261e9568962008e2029e1ee1b3ebb220d2e4802ed1c81c40d897576fafe52234065e273724bfb4df3a3ddf2711abe
-EBUILD gstreamer-1.14.4.ebuild 3395 BLAKE2B 49480169ecdbb0a596bb597f13b8de548bab1b4740cbc60b3d7d824151c05ccc744d969ed17a115d10b165ef7dea78d7bb2db0d09c93e0521c75282ee073fbf2 SHA512 c284e281626f657e3c32c3d96e4403c34efc46131455cabd4e0babd4cf3beddb3401654ddf0b78d427b2d6a490573a52ed7e8b381283d91e8b9c7f7e0db86701
+DIST gstreamer-1.14.5.tar.xz 3268756 BLAKE2B 6ef5bdcb103b4d8fd581ae7342d6d467f4c6919610bdd620e4a531755347d8e3276a50f2e637045b9b97cbf7726495608437c180d37a1019ec8a79ab1bc4e4d6 SHA512 1a97ae17f8fff041db5e24d712d33c7116e408be1fabc2abd7b652b067b6ebe6c0943845a33a21335a5b4fa0a1ba178873158659f761f1e3aab04a969029c5d8
+EBUILD gstreamer-1.14.4.ebuild 3457 BLAKE2B 120784600fd144634542473b1e538a9209e0a851374620404160605ecc8922012136d6ce1d762d8600061d3564ef43b498a5671917d13773fff7074c6bb38ffe SHA512 346cf940cf8931f1cb41eda98ff700f5b7bc8aecc462d753af9456ea5f41ae742dac1d3fe20774653ae108b1e8dfe336d10bbbfb9f44ffa1362895a8a5489eed
+EBUILD gstreamer-1.14.5.ebuild 3465 BLAKE2B ac4e74ddcbaac9b30728ba1a4593ae4a20407d3e2d0d413f0b96713cea178ad4dc2bb42b0779bea45ae2e1b8b26ebd80a81f49ef439c14e0c0419bd019715897 SHA512 8e548d5dc6df7b1363652e0d497c6c841a41410feeee095d7e9ac9843efb595b00f47fc7e8d6b4a076dac945b73b0dd08feb4a5a17f0c863928f51589e95a46f
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch b/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch
new file mode 100644
index 000000000000..ca74bf0cc2e6
--- /dev/null
+++ b/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch
@@ -0,0 +1,56 @@
+From 4a7739f4b6442814696bbd0706ab9a1ce1462d80 Mon Sep 17 00:00:00 2001
+From: Havard Graff <havard.graff@gmail.com>
+Date: Wed, 31 Oct 2018 10:27:23 +0100
+Subject: [PATCH] tests/uri: fix test after GHashTable changes in GLib 2.59
+
+Maybe the implementation should not be dependent on a "random" hash-table
+ordering, but at least this shows the problem clearly.
+---
+ tests/check/gst/gsturi.c | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/tests/check/gst/gsturi.c b/tests/check/gst/gsturi.c
+index ee623dbcf..fa87c7c77 100644
+--- a/tests/check/gst/gsturi.c
++++ b/tests/check/gst/gsturi.c
+@@ -414,7 +414,11 @@ static const struct URITest url_presenting_tests[] = {
+   {.uri = {"scheme", "user:pass", "host", 1234, "/path/to/dir",
+           {{"query", NULL}, {"key", "value"}}, "fragment"},
+       .str =
++#if GLIB_CHECK_VERSION(2, 59, 0)
++      "scheme://user:pass@host:1234/path/to/dir?key=value&query#fragment"},
++#else
+       "scheme://user:pass@host:1234/path/to/dir?query&key=value#fragment"},
++#endif
+ 
+   /* IPv6 literal should render in square brackets */
+   {.uri = {"scheme", "user:pass", "12:34:56:78:9a:bc:de:f0", 1234,
+@@ -977,14 +981,24 @@ GST_START_TEST (test_url_get_set)
+ 
+   fail_unless (gst_uri_set_query_value (url, "key", "value"));
+   tmp_str = gst_uri_to_string (url);
++#if GLIB_CHECK_VERSION(2, 59, 0)
++  fail_unless_equals_string (tmp_str,
++     "//example.com/path/to/file/there/segment?key=value&query#fragment");
++#else
+   fail_unless_equals_string (tmp_str,
+-      "//example.com/path/to/file/there/segment?query&key=value#fragment");
++     "//example.com/path/to/file/there/segment?query&key=value#fragment");
++#endif
+   g_free (tmp_str);
+ 
+   fail_unless (gst_uri_set_query_value (url, "key", NULL));
+   tmp_str = gst_uri_to_string (url);
++#if GLIB_CHECK_VERSION(2, 59, 0)
++  fail_unless_equals_string (tmp_str,
++      "//example.com/path/to/file/there/segment?key&query#fragment");
++#else
+   fail_unless_equals_string (tmp_str,
+       "//example.com/path/to/file/there/segment?query&key#fragment");
++#endif
+   g_free (tmp_str);
+ 
+   fail_unless (!gst_uri_set_query_value (NULL, "key", "value"));
+-- 
+2.20.1
+
diff --git a/media-libs/gstreamer/gstreamer-1.14.4.ebuild b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
index 7bb095742b0f..19677ed3d4f0 100644
--- a/media-libs/gstreamer/gstreamer-1.14.4.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
@@ -34,6 +34,10 @@ DEPEND="${RDEPEND}
 "
 # gtk-doc-am to install API docs
 
+PATCHES=(
+	"${FILESDIR}"/1.14-glib-2.60-tests-compat.patch
+)
+
 src_configure() {
 	if [[ ${CHOST} == *-interix* ]] ; then
 		export ac_cv_lib_dl_dladdr=no
diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
new file mode 100644
index 000000000000..c57c39da037f
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 multilib-minimal pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps +introspection nls +orc test unwind"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+	unwind? (
+		>=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
+		dev-libs/elfutils[${MULTILIB_USEDEP}]
+	)
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	sys-devel/bison
+	sys-devel/flex
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	nls? ( sys-devel/gettext )
+"
+# gtk-doc-am to install API docs
+
+PATCHES=(
+	"${FILESDIR}"/1.14-glib-2.60-tests-compat.patch
+)
+
+src_configure() {
+	if [[ ${CHOST} == *-interix* ]] ; then
+		export ac_cv_lib_dl_dladdr=no
+		export ac_cv_func_poll=no
+	fi
+	if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
+		# GCC groks this, but then refers to an implementation (___multi3,
+		# ___udivti3) that don't exist (at least I can't find it), so force
+		# this one to be off, such that we use 2x64bit emulation code.
+		export gst_cv_uint128_t=no
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local completiondir=$(get_bashcompdir)
+	# Set 'libexecdir' to ABI-specific location for the library spawns
+	# helpers from there.
+	# Disable static archives and examples to speed up build time
+	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
+	local myconf=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		--disable-benchmarks
+		--disable-debug
+		--disable-examples
+		--disable-static
+		--disable-valgrind
+		--enable-check
+		$(use_with unwind)
+		$(use_with unwind dw)
+		$(multilib_native_use_enable introspection)
+		$(use_enable nls)
+		$(use_enable test tests)
+		--with-bash-completion-dir="${completiondir%/*}"
+		--with-package-name="GStreamer ebuild for Gentoo"
+		--with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
+	)
+
+	if use caps ; then
+		myconf+=( --with-ptp-helper-permissions=capabilities )
+	else
+		myconf+=(
+			--with-ptp-helper-permissions=setuid-root
+			--with-ptp-helper-setuid-user=nobody
+			--with-ptp-helper-setuid-group=nobody
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		local x
+		for x in gst libs plugins; do
+			ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+		done
+	fi
+}
+
+multilib_src_install() {
+	# can't do "default", we want to install docs in multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+
+	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 4a1ce3f3d7ae..496b8988a60c 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,10 @@
 DIST harfbuzz-2.3.1.tar.bz2 17942960 BLAKE2B b1a29144b608463fa668bb66572c1530e90338ac1968b0747011637a91bed4030d77e8fa22e5a229374a0bc1976922e2e8de452e9017917f7c09ae94c3a52570 SHA512 78a8f05bfcc95cfe3fc0f1a595bdc7298c9c1456db6c7ef70914051fda43f37aaff15eac75aa6922eca82d2291baeb8385e02e6aacb44ca05b4873c311a662ac
 DIST harfbuzz-2.5.3.tar.xz 5685712 BLAKE2B a9d8a46b6a0667c598ea011f020b09d8fd795105483a8b307ee2a9399de2b84bf3b29659f9a3f7500250879bbb412003ee6f68aaba01b68824bd489615f737e6 SHA512 a2e6cedbe0e505fa31b540e0d0bc6c0b07080bd39879c27e04d351103e21201d75a809dd2fad559bf994b82b311f67ad85778cbbfb670d7e2580beafa09e93ff
 DIST harfbuzz-2.6.0.tar.xz 5736808 BLAKE2B 3dcdf71cce8cdb4596d6e622f6fbaeae1a36cf17c219a1bafe077a472f9d25f0a8b8ea7eb36a1e20558d982b36479ce5d3e19f022a5b7dadd563a017b5037767 SHA512 ab055183ae248710f7baee7ef45ac1a6cbd3522eb1e26b78248ac7bc9e421f5495b8fbbd19a339a26bd119f33624eb8742c15c2053407fbb74cce8dcf6c4b3a2
+DIST harfbuzz-2.6.1.tar.xz 5741372 BLAKE2B bb763eba23a37bd20d0ddb39824d5a0c655d6e098aea2e44b6943e7bd5cb1f9a5cd94e3de5520d962e3c476defac43af58f98d0a5b80e5c1506d00bc716ec876 SHA512 cea531ab9db0ae1b188ac56c3ea6e0344192c4321b97d4425f4a53e6bb34c88463a7453fd69fcadccb8574506c1fb5505422019e41a7938a04e7823e3f484c06
 EBUILD harfbuzz-2.3.1.ebuild 3023 BLAKE2B b9a3d08627e11d8b78a5b1c293e3fb929d5796527d4986796235e3e4a0f6ce54d90096eb931bbd6bfb943a36fca9db2ac207be4fdabbc355be407b89831bd9e3 SHA512 0774d1f803551979890e15ce733f400aeb1343af66bd5569c4ca23b3d90131ce82afb3ade7e516b3e5cbf36af0c7fafdd9b07a465b20654aab76eeaeaa6c2004
 EBUILD harfbuzz-2.5.3.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
 EBUILD harfbuzz-2.6.0.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
+EBUILD harfbuzz-2.6.1.ebuild 3026 BLAKE2B 742a9ee45486beec33ba97221f397509ef8d92496e6a7252d727656316bf86e0f5f394235a0fc36d5013503b7f31157fe70bb1c5e35b75f73d369cacad3d5086 SHA512 1fee9c8ddc17338fa5610c27da9d42b1b13c2b1533bd602eddd2e4e0d5d360ae1ac717958f7ee3afa4088aa2da18790337a07aea581bf46390a5abb166ce2392
 EBUILD harfbuzz-9999.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
new file mode 100644
index 000000000000..993d7a268f8b
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+		sed -i \
+			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+			test/api/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+	elibtoolize # for Solaris
+
+	# bug 618772
+	append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for instrospection, bug #535852
+	local myeconfargs=(
+		--without-coretext
+		--without-fontconfig #609300
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
+		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/html docs/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
deleted file mode 100644
index 844e3468529f..000000000000
--- a/media-libs/jasper/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX jasper-2.0.14-fix-test-suite.patch 1097 BLAKE2B 050311299ad9e247663b045f87b022d290f30c58595c1f0b163175ef4d755e09aa956a2ec810b2239aeb1a7d9c85eadd3057c9157515e7681e6836389644c4a7 SHA512 667aa54ddd6b76af225b32c9d1cf0bb3f0d8a00c7a83695f12179778d8f08b9c910717ded58f7368384f0d925ae90ac42e91344966d01716d722625b25e90d30
-DIST jasper-2.0.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940
-DIST jasper-2.0.16.tar.gz 1311944 BLAKE2B 7402a3f08911e375ab51d531c8bcc57ccb3266763f2d92f45070e52697b99ca41dab4032a3d795105c05ddccd0641a6de24a6d7b148635efce37cd0be07c3e65 SHA512 b3bca227f833567c9061c4a29c0599784ed6a131b5cceddfd1696542d19add821eda445ce6d83782b454b266723b24d0f028cbc644a25c0e3a75304e615b34ee
-EBUILD jasper-2.0.14.ebuild 1899 BLAKE2B f9f034ecb4e7cb7362957b91ae6712853cefafad55d069adcc893a5094ebb91a7a35aeb75178d5002fa9ff04f41ceb89d9fc36c53c575addb99e9bf0d0142ace SHA512 0f6f272f0428aaebfe568fdc5d898f36c93df54ecb91001b1302344e67f7386fd11694ec652c57d8437436946e0c7bf8bf4203fbe285f978f067036d3fe3224b
-EBUILD jasper-2.0.16.ebuild 1828 BLAKE2B 45da6d7171e35e4eed1d28e79f51e05ce652e54592dcf7553b0dc33eee6a518263557b648a59f3046c393f14e15fe905bb61e9a98dca511abd2a58aa2360164e SHA512 2b4b5c71d9177c96ff1d12cc1855b4128e9517430335584c054754d49828665bba9fbd096544cb79c0d9e65c0911c8161ed4c4ca9435cfd25f277ab0b4ab1579
-EBUILD jasper-9999.ebuild 1828 BLAKE2B 45da6d7171e35e4eed1d28e79f51e05ce652e54592dcf7553b0dc33eee6a518263557b648a59f3046c393f14e15fe905bb61e9a98dca511abd2a58aa2360164e SHA512 2b4b5c71d9177c96ff1d12cc1855b4128e9517430335584c054754d49828665bba9fbd096544cb79c0d9e65c0911c8161ed4c4ca9435cfd25f277ab0b4ab1579
-MISC metadata.xml 342 BLAKE2B 4260ac1403a844c48b72bd62c04073de06da73cecca8bbab9fdd7de36b4a462feabee08d933b0098c451691b17aa3ff7d7e3eb25052461381a37198b12225c55 SHA512 a01344f985dc6b7a24ca568fe859f2a593b55df39ba7b711c4db62eb7df5389007cb6c8dd1ab399f70bf8cb221a22681a9eab279ce8ab1ea6b198fa65f1b8a20
diff --git a/media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch b/media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch
deleted file mode 100644
index 9af83c67c6f6..000000000000
--- a/media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Disable tests which will require LIBJPEG when Jasper was
-built without LIBJPEG.
-
-Bug: https://bugs.gentoo.org/629898
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -393,12 +393,14 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/test/bin/wrapper.in"
-   "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper" @ONLY)
- 
- if (BASH_PROGRAM)
--	add_test(run_test_1
--	  "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
--	  "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_1")
--	add_test(run_test_2
--	  "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
--	  "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_2")
-+	if (JAS_ENABLE_LIBJPEG)
-+		add_test(run_test_1
-+		  "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
-+		  "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_1")
-+		add_test(run_test_2
-+		  "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
-+		  "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_2")
-+	endif()
- 	add_test(run_test_3
- 	  "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
- 	  "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_3")
diff --git a/media-libs/jasper/jasper-2.0.14.ebuild b/media-libs/jasper/jasper-2.0.14.ebuild
deleted file mode 100644
index 1a72b593b949..000000000000
--- a/media-libs/jasper/jasper-2.0.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
-HOMEPAGE="https://www.ece.uvic.ca/~mdadams/jasper/"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# We limit memory usage to 128 MiB by default, specified in bytes
-: ${JASPER_MEM_LIMIT:=134217728}
-
-LICENSE="JasPer2.0"
-SLOT="0/4"
-IUSE="doc jpeg opengl test"
-
-RDEPEND="
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	opengl? (
-		>=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}]
-		>=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXmu[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.14-fix-test-suite.patch )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DALLOW_IN_SOURCE_BUILD=OFF
-		-DBASH_PROGRAM="${EPREFIX}"/bin/bash
-		-DJAS_ENABLE_ASAN=OFF
-		-DJAS_ENABLE_LSAN=OFF
-		-DJAS_ENABLE_MSAN=OFF
-		-DJAS_ENABLE_SHARED=ON
-		-DJAS_ENABLE_STRICT=ON
-		-DJAS_ENABLE_USAN=OFF
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-
-		# JPEG
-		-DJAS_ENABLE_LIBJPEG=$(usex jpeg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-
-		# OpenGL
-		-DJAS_ENABLE_OPENGL=$(usex opengl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(usex !opengl)
-
-		# Doxygen
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
-
-		#-DJAS_ENABLE_PROGRAMS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/jasper/jasper-2.0.16.ebuild b/media-libs/jasper/jasper-2.0.16.ebuild
deleted file mode 100644
index e38d99a4ea70..000000000000
--- a/media-libs/jasper/jasper-2.0.16.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
-HOMEPAGE="https://www.ece.uvic.ca/~mdadams/jasper/"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
-else
-	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-	S="${WORKDIR}/${PN}-version-${PV}"
-fi
-
-# We limit memory usage to 128 MiB by default, specified in bytes
-: ${JASPER_MEM_LIMIT:=134217728}
-
-LICENSE="JasPer2.0"
-SLOT="0/4"
-IUSE="doc jpeg opengl"
-
-RDEPEND="
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	opengl? (
-		>=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}]
-		>=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXmu[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DALLOW_IN_SOURCE_BUILD=OFF
-		-DBASH_PROGRAM="${EPREFIX}"/bin/bash
-		-DJAS_ENABLE_ASAN=OFF
-		-DJAS_ENABLE_LSAN=OFF
-		-DJAS_ENABLE_MSAN=OFF
-		-DJAS_ENABLE_SHARED=ON
-		-DJAS_ENABLE_STRICT=ON
-		-DJAS_ENABLE_USAN=OFF
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-
-		# JPEG
-		-DJAS_ENABLE_LIBJPEG=$(usex jpeg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-
-		# OpenGL
-		-DJAS_ENABLE_OPENGL=$(usex opengl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(usex !opengl)
-
-		# Doxygen
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/jasper/jasper-9999.ebuild b/media-libs/jasper/jasper-9999.ebuild
deleted file mode 100644
index e38d99a4ea70..000000000000
--- a/media-libs/jasper/jasper-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
-HOMEPAGE="https://www.ece.uvic.ca/~mdadams/jasper/"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
-else
-	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-	S="${WORKDIR}/${PN}-version-${PV}"
-fi
-
-# We limit memory usage to 128 MiB by default, specified in bytes
-: ${JASPER_MEM_LIMIT:=134217728}
-
-LICENSE="JasPer2.0"
-SLOT="0/4"
-IUSE="doc jpeg opengl"
-
-RDEPEND="
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	opengl? (
-		>=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}]
-		>=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXmu[${MULTILIB_USEDEP}]
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DALLOW_IN_SOURCE_BUILD=OFF
-		-DBASH_PROGRAM="${EPREFIX}"/bin/bash
-		-DJAS_ENABLE_ASAN=OFF
-		-DJAS_ENABLE_LSAN=OFF
-		-DJAS_ENABLE_MSAN=OFF
-		-DJAS_ENABLE_SHARED=ON
-		-DJAS_ENABLE_STRICT=ON
-		-DJAS_ENABLE_USAN=OFF
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-
-		# JPEG
-		-DJAS_ENABLE_LIBJPEG=$(usex jpeg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-
-		# OpenGL
-		-DJAS_ENABLE_OPENGL=$(usex opengl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(usex !opengl)
-
-		# Doxygen
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/jasper/metadata.xml b/media-libs/jasper/metadata.xml
deleted file mode 100644
index 2925a2331766..000000000000
--- a/media-libs/jasper/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>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mdadams/jasper</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-libs/kodi-platform/Manifest b/media-libs/kodi-platform/Manifest
index 35a21d78ba25..e7ae3e171ee0 100644
--- a/media-libs/kodi-platform/Manifest
+++ b/media-libs/kodi-platform/Manifest
@@ -1,7 +1,5 @@
-DIST kodi-platform-17.1.0.1.tar.gz 8538 BLAKE2B 3264ef2b480d6b8e0f3c0b7dbf6427a39cdd3b882ccb50d76977e169d49fa46e7716969a15f0de1bdf787f327a2a551027be762c1d16eb0482747531c89e45d1 SHA512 c3501b30d6e643239d1a5726eae79d734392709240b21fd314c97fa8a98b0c4ba912c8a246bd53e7049fadde0f695274ae4d1920442ab9a22337258388f80bcb
 DIST kodi-platform-18.0_pre20180301.tar.gz 8605 BLAKE2B 8486c0777373de75c0120b3e62ef1ff43107b36471696a7329f15fc62670f230737ee382695dbcb61ca5215fa2898cf3c6ecdfc0b48043b57f48cf15adc9fbf5 SHA512 35bb8d27db3b1e9debef647e02c2cf4ba7f2b2bdde07cb57eedd5859800d0614426d82f4be9cdeb11dba6576cad93e43095a05047411dcbcb749609d51f53ec7
 DIST kodi-platform-18.0_pre20190429.tar.gz 8616 BLAKE2B 424fa1da5f2dda5343ebe8414555382be6391d9467e73a07088a9e46674508bd83aeec59277f5d0b6e4bf0e1a6c56910a338f1774b17ef4ad21ca7b1e4198fef SHA512 acbe478c2167cbd90ef8cd0ba6ea9ac657a4140f5337e840e960358b26cb3d7880e52527c0d7f6d0ae8068b92b3a3cc5719110163ecfa4520469fc64b8e1b9b7
-EBUILD kodi-platform-17.1.0.1.ebuild 631 BLAKE2B 9802aacfb11ba042ade388a72d0edd1072cba7262748f2617a81b91c62496400490bcd2e57a65c9a04a69610c8b83ffa58a0d9e1594352531b5855a93a7741c0 SHA512 ba397a196de116bee6806c9a5b4a2917731c204a0ef12b00bbdede133793806a13087558ee63c1f032614ca29e6cf02864332d507c03fe86357fe304926924e2
 EBUILD kodi-platform-18.0_pre20180301.ebuild 628 BLAKE2B 03929d9e7863fc872d5cda7d580a6d91539846f213ef5bbb1e0bd572c9fa9211ec249d8e6fadc3b8b3bd26c7bd206268ebac6c995073d9063c0edca9fcb5e0f2 SHA512 466496d3c19431d76f9760460b36d69219627c9a4af7c3ec79aa53f62ced3c884770f0ce1e82c02b24cf5e72ee073b4421f0f1648ecee9b113c7cda8601d57f2
 EBUILD kodi-platform-18.0_pre20190429.ebuild 628 BLAKE2B df78d9e7544b8322f55637615ddc0c7be309616d9f8b39fc03b125b547c9759520c099c8ca8816cd4148f4eca73e3a1f94905f6f6efd95dd4afa38ef9b249996 SHA512 6bece6573b6d767e53ca96f91fb3f0456117321e8660c9521ac25df6a7550f06c65f03670a1031e76de4c76e564c2302da5b2aadc613bff13ebe864b51620c33
 EBUILD kodi-platform-9999.ebuild 629 BLAKE2B 3d38ae45b6948b1dc6e8cfbdc408542b48fa34af8e46417aca223042ffcba9ff4cf229044fc030bd50822227611b851d1edc671d771f5cba9feaac0ec5bf52bc SHA512 b0571f8ad5b50694fb1daae48ce34cc58f2e4f1a4884786a53b80625aa2f221cb3a5568c4f6f609ed19baaab80fa877bc4c8fc080fb61ba829293da0265c3c8d
diff --git a/media-libs/kodi-platform/kodi-platform-17.1.0.1.ebuild b/media-libs/kodi-platform/kodi-platform-17.1.0.1.ebuild
deleted file mode 100644
index b70d6dcab99c..000000000000
--- a/media-libs/kodi-platform/kodi-platform-17.1.0.1.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
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	GIT_COMMIT="c8188d8"
-	SRC_URI="https://github.com/xbmc/${PN}/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
-	S="${WORKDIR}/xbmc-kodi-platform-${GIT_COMMIT}"
-fi
-
-DESCRIPTION="Kodi platform support library"
-HOMEPAGE="https://kodi.tv"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=dev-libs/libplatform-2*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="${DEPEND}"
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index f62f4b4f98c8..feabad8accfb 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -3,4 +3,4 @@ AUX libextractor-1.8-CVE-2018-20431.patch 998 BLAKE2B 44e77c7f53c8ea2b134af14aa0
 AUX libextractor-1.8-exiv2-0.27.patch 3364 BLAKE2B da55735ccab9a3cf868f274b82951cf548a2f1340ee24c180244f8ba2bbd85c7002c963d06257aac0b0457c2afeda755d0aaacb501280b995001f7bbd49d6de9 SHA512 6411df1498fd3594088b3488e490b25009e9243684b777d35fa26189c20f410b42496b5fb42f762c468df746a9bdcd6a310f645db5ab0bbe3bd121e82aa9d48c
 DIST libextractor-1.8.tar.gz 8315688 BLAKE2B 2c617cfa667f79faef33e5f445f8d1f38dac61a7d1abd064165f0171b2fcdd812b42f1a5ee78def075383ab74b686f5de6864ce9b9a1983262a3d251ea271dc0 SHA512 770a0f1711964657ffb570c0509996b0a109886bfa0652c3a9ca63aa645f495fe5919215cf17da68e8a81a09de54bc937b61c82ec03c9e3998149c780f93451a
 EBUILD libextractor-1.8-r1.ebuild 2838 BLAKE2B c3d9688ded6bb3803d3e06d1ba82959e9965b2ff488cebd0c7314428bb042514bddb88c1911170c31faef4e1b7434903e891d57692d7a80af1b92aa1739785de SHA512 fd100d837c2f31f3e87607d9216a05537edaf1f095f83b3948b980bea18e0b80b4bbc4b2477231fa6c012280b0ce6a2e4655dd2ad8be1c5c67de4bb08a93e3b2
-MISC metadata.xml 642 BLAKE2B ca8c76e74d895ac221a98f0c8641c7a4d33a3cb299188da86afc4eb16f0e86994a8d4b5c0d5a825127561fc97a4f05ea0d0a55f08afb2ea161e45c7d63222dc3 SHA512 1dee41e58396433f7031afd2916c8cf1d107d453ebbffff2990843baa05e3abc23569ba535b849173f78ac5608977a2b8d5ade0604999292d515deac401a1b20
+MISC metadata.xml 560 BLAKE2B dc882ee2f4322f67c307f2ed919fd25d64505185f8046d94ca2680b060a01ee81a774aba5a96eb86f2a449c503683a2a92b4668e414149ffd109721d3bb7666c SHA512 9a290ce121dfa7d5a96cc3337e936b4cd21755d7becd2ae8fa0ddac07a536c9c05aa2501c5adf136ae454b4a85ded6e0e523fd4be248feec729bbc09f7f7749b
diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml
index 110fdbd61259..20d2532512b1 100644
--- a/media-libs/libextractor/metadata.xml
+++ b/media-libs/libextractor/metadata.xml
@@ -6,7 +6,6 @@
     <flag name="apparmor">Enable apparmor support using <pkg>sys-libs/libapparmor</pkg></flag>
     <flag name="archive">Enable archive support using <pkg>app-arch/libarchive</pkg></flag>
     <flag name="gsf">Enable OLE2 (MS Office) plug-in support using <pkg>gnome-extra/libgsf</pkg></flag>
-    <flag name="magic">Enable magic support using <pkg>sys-apps/file</pkg></flag>
     <flag name="midi">Enable MIDI support through <pkg>media-libs/libsmf</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index e7f54991fb63..5fb2d79c8c9d 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,6 @@
 DIST libglvnd-1.1.0.20190213.tar.gz 829094 BLAKE2B cf977846693a5de3485e23fe8b4c8e2bc0472d994dc85530ecd85c685d71abd7aa69e815292141f60fd69a299cf39ac16dda5822128295747bfd42db3408df66 SHA512 772445cbb5574c1900109b3e0d8aab442b8c8d9790c4d91e1400fccdff4a53b653b59120e4fb631a45fc47af02949288924e62a22c3d877d4f741d5596736e37
+DIST libglvnd-1.1.1.tar.gz 1851222 BLAKE2B 58a6e997b64bd22c4af0136fb37959f45df4a738bfcff205d7efb7ac08e7897a19164cb36f11d556c5a1bd3d46f0f1df3f89a36b7352b8a880c3570b2cf462cf SHA512 9106ae3cd3bdce8f4def3c7e08645f76e1a65f51e184510088e79b834899061d357422376e0efd56e1bc9dc7d3150f74837f43bd3e6c4c44faa3859844ab21b7
 EBUILD libglvnd-1.1.0.20190213.ebuild 1073 BLAKE2B 0d0724d15fd6e1589235e5b1cdb8f39590535ea741c3213b20af42a1572b73e155b72e927cfa4a832b525b568e810a9d3785316d8152dddb61bb8632e06d2f45 SHA512 291b176d21ad08b26b427273ec0827b83e3cc6a660aef187457691c2768299b88175b78da8266b50e38295674b6d91d5540b5fbe98a17f030e3cffa012ee07fb
-EBUILD libglvnd-9999.ebuild 1033 BLAKE2B 3c69ab9bec691b032a39217e45e61a9f76c6bb28624e0829744b84bc4022788fbe923d827d792704743580c0349b5e61a6f5ec314afea79564be5415917f10a5 SHA512 ab87158b8d88c37964dcde6e27228691548d8c6e815d9d35cf1b516163c62106d787f7b5df9c3b8c05faf78f54a924965afa41a4b8668ec1f1c1609d125ed3a6
+EBUILD libglvnd-1.1.1.ebuild 943 BLAKE2B 398dce9c19a9776302b05cec211a2697a4fa44aabfb1e922fa37a6a4a666af4fe1967246bae025025003afb9377f3b4dcab1f1ebe4973ef9a842f96cb2f245a8 SHA512 6a63feb7ac9e92ab15e5cb7e50da5802dc5c8912a1927aa516f1b6e4ad6f2983c11a36301b38451cbe185079a216299cbbbd0e63732ebbf4629a6259bfdbb014
+EBUILD libglvnd-9999.ebuild 987 BLAKE2B 2bfa2707e24c90bb9945715f256a956328a00e981e380670320166e516c9d4820ec2a6d706758e069a2b5c28aa91f374969dd470c8770607bf0970a3ccb67090 SHA512 f8c41a37fa7874d1d3e3a15261d555640c1ce87df8e35dec09f9855c493777fb44af0bfcd510f63c7d5c82aae7f335b8d2781e2e9322d9d3fd27967f5fad66cc
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-1.1.1.ebuild b/media-libs/libglvnd/libglvnd-1.1.1.ebuild
new file mode 100644
index 000000000000..89d10684b842
--- /dev/null
+++ b/media-libs/libglvnd/libglvnd-1.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools ${GIT_ECLASS} multilib-minimal python-any-r1
+
+DESCRIPTION="The GL Vendor-Neutral Dispatch library"
+HOMEPAGE="https://github.com/NVIDIA/libglvnd"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/NVIDIA/${PN}/releases/download/v${PV}/${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	!media-libs/mesa[-libglvnd(-)]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	"
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}"
+
+src_prepare() {
+	default
+	[[ $PV = 9999* ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_test() {
+	emake check
+}
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index f62514e30584..494820dda945 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -34,14 +34,9 @@ RDEPEND="
 DEPEND="${PYTHON_DEPS}
 	${RDEPEND}"
 
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
 src_prepare() {
 	default
-	eautoreconf
+	[[ $PV = 9999* ]] && eautoreconf
 }
 
 multilib_src_configure() {
diff --git a/media-libs/libinsane/Manifest b/media-libs/libinsane/Manifest
new file mode 100644
index 000000000000..d41f5ba02bf2
--- /dev/null
+++ b/media-libs/libinsane/Manifest
@@ -0,0 +1,4 @@
+AUX libinsane-1.0.1-meson_options.patch 2038 BLAKE2B b14ba254604f214c2cd1a15e705ea361b635bac7faae4995811477456ea8a8d8bf969fefb4330b3b6f05cd498cd2f01b8b065c2f8f3c88e21e62ea6ef204de15 SHA512 c0d5d3ce5d763d04327ea500229c9f26d989aa8072dec569adb3766c70e0cab9e00629e3099c5ab8bd4e3c84b86925ad108fe78eeae9066164de1302e2226572
+DIST libinsane-1.0.1.tar.gz 706575 BLAKE2B 32ae63c275e6e9c709aefd0c6ed2237df70ad027626cf6ded2009071c74ce925d50ab730bd36b677915d2bd6e606d6337e890cfcc3e8bf4a1f281e026140537a SHA512 1b7091b207b8ea559f21084aa8231c62f34dfa6043e9f358d55708006989c50ee131011dbe5bd03bcd1212cd0219ae9d65a544e57cf3a71c4c2f65e5d89257bc
+EBUILD libinsane-1.0.1.ebuild 901 BLAKE2B a2f67af896828a3526f5494b508148d16ebef09c42afe67253fa40533bdba236ed0e34d069977994cef1953ff99ce2148ef85accf3498b86fc62481c877a76b9 SHA512 8c10f60d79fa4852442545c5b16ac7c240875dddd7e7ac0b0dda162cf8194976f7c7b2581d817324a32525e0327509b7f0cc0e096104fa786611693f27e0ab9e
+MISC metadata.xml 1015 BLAKE2B 2e8221fd55bcf22db23935d2150a4832c32c8e7b7703b7305797da9f63eda012261a8dbd25a00a92964a2b4e3fc22b9e2252133431582ae27964f091161d1176 SHA512 2de5a23ff82cc957941ac4e21d1261743a7f4f36a13ff6402224989eb613fa3a5138b3a464b79017e1c17cc4b7bd553e16e3cb5d9f575b57a362ab4c7d2d1fc9
diff --git a/media-libs/libinsane/files/libinsane-1.0.1-meson_options.patch b/media-libs/libinsane/files/libinsane-1.0.1-meson_options.patch
new file mode 100644
index 000000000000..a56bba0c16fa
--- /dev/null
+++ b/media-libs/libinsane/files/libinsane-1.0.1-meson_options.patch
@@ -0,0 +1,39 @@
+diff -Naur libinsane-1.0.1.orig/meson_options.txt libinsane-1.0.1/meson_options.txt
+--- libinsane-1.0.1.orig/meson_options.txt	1970-01-01 01:00:00.000000000 +0100
++++ libinsane-1.0.1/meson_options.txt	2019-08-23 15:14:21.374086921 +0200
+@@ -0,0 +1 @@
++option('doc', type: 'boolean', value: true, yield: true)
+diff -Naur libinsane-1.0.1.orig/subprojects/libinsane/meson.build libinsane-1.0.1/subprojects/libinsane/meson.build
+--- libinsane-1.0.1.orig/subprojects/libinsane/meson.build	2019-08-18 13:09:37.000000000 +0200
++++ libinsane-1.0.1/subprojects/libinsane/meson.build	2019-08-23 15:16:14.289190985 +0200
+@@ -22,6 +22,8 @@
+ subdir('include')
+ subdir('src')
+ 
+-subdir('doc')
++if get_option('doc')
++    subdir('doc')
++endif
+ subdir('examples')
+ subdir('tests')
+diff -Naur libinsane-1.0.1.orig/subprojects/libinsane/meson_options.txt libinsane-1.0.1/subprojects/libinsane/meson_options.txt
+--- libinsane-1.0.1.orig/subprojects/libinsane/meson_options.txt	1970-01-01 01:00:00.000000000 +0100
++++ libinsane-1.0.1/subprojects/libinsane/meson_options.txt	2019-08-23 15:14:51.290114436 +0200
+@@ -0,0 +1 @@
++option('doc', type: 'boolean', value: true, yield: true)
+diff -Naur libinsane-1.0.1.orig/subprojects/libinsane-gobject/meson.build libinsane-1.0.1/subprojects/libinsane-gobject/meson.build
+--- libinsane-1.0.1.orig/subprojects/libinsane-gobject/meson.build	2019-08-18 13:09:37.000000000 +0200
++++ libinsane-1.0.1/subprojects/libinsane-gobject/meson.build	2019-08-23 15:15:25.593146036 +0200
+@@ -9,4 +9,6 @@
+ 
+ subdir('include')
+ subdir('src')
+-subdir('doc')
++if get_option('doc')
++    subdir('doc')
++endif
+diff -Naur libinsane-1.0.1.orig/subprojects/libinsane-gobject/meson_options.txt libinsane-1.0.1/subprojects/libinsane-gobject/meson_options.txt
+--- libinsane-1.0.1.orig/subprojects/libinsane-gobject/meson_options.txt	1970-01-01 01:00:00.000000000 +0100
++++ libinsane-1.0.1/subprojects/libinsane-gobject/meson_options.txt	2019-08-23 15:14:53.859116801 +0200
+@@ -0,0 +1 @@
++option('doc', type: 'boolean', value: true, yield: true)
diff --git a/media-libs/libinsane/libinsane-1.0.1.ebuild b/media-libs/libinsane/libinsane-1.0.1.ebuild
new file mode 100644
index 000000000000..a2d1169ab994
--- /dev/null
+++ b/media-libs/libinsane/libinsane-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson vala
+
+DESCRIPTION="Crossplatform access to image scanners"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane"
+SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gtk-doc test"
+
+RDEPEND="media-gfx/sane-backends"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		dev-util/gtk-doc
+	)
+	test? (
+		dev-util/cunit
+		dev-util/valgrind
+	)"
+
+BDEPEND="virtual/pkgconfig
+	$(vala_depend)"
+
+# Tests require an operational valgrind
+# https://wiki.gentoo.org/wiki/Debugging
+RESTRICT="test"
+:
+PATCHES=( "${FILESDIR}"/${P}-meson_options.patch )
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc doc)
+	)
+	meson_src_configure
+}
diff --git a/media-libs/libinsane/metadata.xml b/media-libs/libinsane/metadata.xml
new file mode 100644
index 000000000000..2b345ff1a9ab
--- /dev/null
+++ b/media-libs/libinsane/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
+  <longdescription lang="en">
+Libinsane is the library to access scanners on both Linux and Windows. It's cross-platform, cross-programming languages, cross-scanners :-). It takes care of all the quirks of all the platforms and scanners
+
+It has however some limitations:
+
+* It is only designed to work with scanners, not webcams, not USB keys, etc (think paper-eaters only)
+* TWAIN API may display some dialogs. Libinsane cannot prevent them.
+* Full bed page scan only: Presence of the option to set the scan area cannot be guaranteed. You may have to crop the image later in your own application (see Paperwork for example).
+* 24 bits color scans only (may be fixed later)
+
+It is the successor of Pyinsane2 but shares no code with it.
+  </longdescription>
+</pkgmetadata>
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 9b54025fb198..999551cb0eca 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,6 +1,4 @@
 AUX libmediainfo-0.7.63-pkgconfig.patch 291 BLAKE2B b13ee095a9f1f322222bb10013ffda778eef68dd2f161553b96bdd24f0c0ba81281185604547c355c14190580fd36cbb019778674e8c72a02ef3e3fda9229f76 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb
-DIST libmediainfo_19.04.tar.xz 1684320 BLAKE2B 04c468b74fe0f886ed0a1bd5d0d1ff4b430d5a2fbb8e17ff23bd6bf53143e99cb811220a76c6741b17dbab8917219211c87bff6b20285c5375a6f67cc3dc5bc0 SHA512 7fdacc206f1db57605fc41b717740e6c6ce245d432faef15abb48e646bc05743ce72ee117519464d0341d83e0b306ddab79c9d34fd348897d4b0d15cb2f7db04
 DIST libmediainfo_19.07.tar.xz 1685616 BLAKE2B 15f2663557735f50537fbf69d974cd6a21af337540c87de67f03276eb14f14ab72bd235d9f289bb6431792d08a8c7b7063ae37453c83ea043376fa6a4a370d73 SHA512 b16a161be548ae86e5e1fe54f86614f6f3b151b86afb657cf0ea96aa0278b0158309e0382dac0dd0ada5e5af7a2f58369e6fa97bfc7306a3bbc82792c0a29ecc
-EBUILD libmediainfo-19.04.ebuild 1844 BLAKE2B 4e560ddc0e84ed20bccbae4471f713533839e810e66d1ff1f320cd9a2c5694121c2b261ee58d144f47899354b69f89f3306d6c3d5f3817592040c10b86603911 SHA512 47771d8b21dad97f726e4de800d0608d6e55d06958c5255e36e6fb0bbf02d9d71a5a7851996aeaa21bee999dae9007b4347413e697273605a1275389a0c430ae
-EBUILD libmediainfo-19.07.ebuild 1846 BLAKE2B 6fc56ff465cc0fdedba9114959d9b5facabfd4b70bc1c8098724419e04758cd30a3783658a9fd4b843d6038537a5c5363173db1364a4d74c4e4ff8acb96f5cb5 SHA512 6fb8aff87af0f0df3c546feca2cb72840483661cf5b81055837860dc923987a0c3da70f870cfcd4b7d936b7037d3bda4dde5f05d30e8a400910b91d095ceea57
+EBUILD libmediainfo-19.07.ebuild 1844 BLAKE2B 4e560ddc0e84ed20bccbae4471f713533839e810e66d1ff1f320cd9a2c5694121c2b261ee58d144f47899354b69f89f3306d6c3d5f3817592040c10b86603911 SHA512 47771d8b21dad97f726e4de800d0608d6e55d06958c5255e36e6fb0bbf02d9d71a5a7851996aeaa21bee999dae9007b4347413e697273605a1275389a0c430ae
 MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93
diff --git a/media-libs/libmediainfo/libmediainfo-19.04.ebuild b/media-libs/libmediainfo/libmediainfo-19.04.ebuild
deleted file mode 100644
index 8272ecf1c95a..000000000000
--- a/media-libs/libmediainfo/libmediainfo-19.04.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2:=
-	>=media-libs/libzen-0.4.37[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# tests try to fetch data from online sources
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
-	eapply_user
-
-	sed -i 's:-O2::' configure.ac || die
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
-	fi
-
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libmediainfo/libmediainfo-19.07.ebuild b/media-libs/libmediainfo/libmediainfo-19.07.ebuild
index 66497326e1f1..8272ecf1c95a 100644
--- a/media-libs/libmediainfo/libmediainfo-19.07.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-19.07.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl doc mms static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 5761aee28f26..4f479b1f8d01 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,3 +1,5 @@
 DIST libogg-1.3.3.tar.xz 417636 BLAKE2B 2fc69580ed94be520c8e6b764e6271ec60e9d83d4265ca0408df4b2e6233a0f1d68e79400bc3871cc130034697ba97cedc453a574b9c6f618c9b819a93a2d3e8 SHA512 37d8e4329bf7a997a95d84a55c325a5a893ec84bb4d5b7ea638e5cb13201a0619e71ecd9710a8371def69f092c62dcc59ec0a607db246028ee8a62678386260b
+DIST libogg-1.3.4.tar.xz 428696 BLAKE2B 21814db2d45e32be56da1b56afacce4b906b34c7b71e7915ceb7b4a240b9a1c271085a4d19362c97c5bb825569094bd2940a92140204f0449eeeadaa40cc6b30 SHA512 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
 EBUILD libogg-1.3.3.ebuild 884 BLAKE2B 16850456835208a7d115e7d8412618fa7dce0133fb3a367828c829c237677f89cdf64b679eeb973174467d3bb22485476907779661cf70dd861db725a570a76e SHA512 23fdda66a88d23f3e11c71368357733abc3065a147b122ee1f9aac640bf9ba1c69c97d389e060aafca6b4562d3663db234a149d0eeb4a059225ecd332b1898cb
+EBUILD libogg-1.3.4.ebuild 899 BLAKE2B d92381ec4a5e39700be5360c656adebc91a0e471e0eb3a38502b41242668df1e260e04e6b98fb2e055aae6524a80c9f79f063d6a08550be1f01d4beb59f05e74 SHA512 e9ef61c0bf92544be27cfad8464673d8c1067c5cce79b287f5ab28afcd1e6a60539b4ec3d5d2db76b36e4152d0b8730d1ac76f419eab529e1f06d5d57c30623f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/libogg-1.3.4.ebuild b/media-libs/libogg/libogg-1.3.4.ebuild
new file mode 100644
index 000000000000..87444316d676
--- /dev/null
+++ b/media-libs/libogg/libogg-1.3.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+DESCRIPTION="the Ogg media file format library"
+HOMEPAGE="https://xiph.org/ogg/"
+SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DOCS=( AUTHORS CHANGES )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ogg/config_types.h
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		$(use_enable static-libs static)
+		)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 9e88668784ff..b8d536f82715 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,5 +1,7 @@
 DIST LibRaw-0.19.3.tar.gz 1302745 BLAKE2B 3db3a07c5535a325c69d65ccc75e6a8c7d04e7b1c1d87506fd1c56a0d8f4a7c581467f6350922a4c62d4bc49372f31c86ae2a26a087c4ec11c3ab69763403a0b SHA512 e025695fb7f0016aeec76c0843a94387633457eee838cc48e65d1e84e703c8530b3fdd1e31d85dc322d3f2f6092b7c313fa6d1c3009fe1257c3d9411128b6fe2
 DIST LibRaw-0.19.4.tar.gz 1303047 BLAKE2B daa65c86ca81bee80ced5fcc3a048ef54cc5256b4b80bdda006a2b3d64c8c10436b906a238dd22c8623465288df5a86d65a4d6e2668ba5fc3ef3ad23c7e205d2 SHA512 e9f0b18b8be52119ff504d2645a011eca391a62bf651064dcbec4b6e16b3b09fda49e632453b051d3aae2ac3a8be021e5b71d7202913759ad1d61641d3318c4c
-EBUILD libraw-0.19.3.ebuild 1488 BLAKE2B 1b47f7da7acc3011b7557ab3c724d1dd5fd6195557a3d928dad9885252e5761064f2b03cb4ec746537951cf8d007cbf7af11ca9fa69f56129aeeca8fdb4746db SHA512 e2fc80e686eced406f1bfa55836c645510c84a8fdb9a372e431fc6646fd5e76adb2580189ac3b4cae527ab90fddcf6d43a0e598eaf7a5fa33aa11819d4c7647d
-EBUILD libraw-0.19.4.ebuild 1496 BLAKE2B f9c5512ddbc8264786424136abe8ef82546f79df15b1b1727f59417d06bff1df27d74b5eb89aaa5f133b90489884ba8524e10ba83cacec095b5b026674426052 SHA512 5ad61fc6e0e3e0d3bcf91a2eb2792ca5073a00cad3099b33d8be14759c9679816bf6b813c71ce1092f56fd855f0637bd87c12639bcb0404fd6d76c8945642918
+DIST LibRaw-0.19.5.tar.gz 1303806 BLAKE2B 7ab6e30d88aa4aed2ed6825898f8de02f0d139eedec0756cd184822548a7aa69416f5f599542bb264a791f8b6284d6922a160063496f0e7b682333e847cc9b32 SHA512 4560045f75e6d2ab0d1d8686075f3a0e26a5d7ce693b48508110a2c31d19055d58983c24852da0abb64fa90db5e20f24b87aa7537ed04d958c38c8b265a7e826
+EBUILD libraw-0.19.3.ebuild 1404 BLAKE2B e1d3788d35e44272b2132118a3d76e1614ec1c1846b613ac5ab7ac37b7fa78489a03fa2135d0b3b617d04df9f59c3e8754bde77165ca306f70c65b105ec1bd1c SHA512 0d841a2621039f12e17077ef3969ece028e3d412d9f921fbebbab4a3626858ae346799325499de30e09cb991c797be6d9b2bc091ceb9b23d6d864dea77a610e7
+EBUILD libraw-0.19.4.ebuild 1412 BLAKE2B 06bb6d87b38e4b45f5184bfe5a82beb34562d58d829933508cef9bab6a6434a4b13e3e81146ca2843368020df93ea0909e6f99d8fb0acddaec579dc81dbdfccc SHA512 29b2b405a6f22339afb37cbcd7eff2b99a3c1695873746a189553028d1ecbc20d399d3ef028e34043e7abb7279d949e44397fa17654e9838dabdec26119bbc99
+EBUILD libraw-0.19.5.ebuild 1412 BLAKE2B 06bb6d87b38e4b45f5184bfe5a82beb34562d58d829933508cef9bab6a6434a4b13e3e81146ca2843368020df93ea0909e6f99d8fb0acddaec579dc81dbdfccc SHA512 29b2b405a6f22339afb37cbcd7eff2b99a3c1695873746a189553028d1ecbc20d399d3ef028e34043e7abb7279d949e44397fa17654e9838dabdec26119bbc99
 MISC metadata.xml 337 BLAKE2B 895688be926ca12497ac0fa00495cdecb0cbc5547e495bc52b394a3ed8fe6e27dce2e891daa46aa5caff8b710e680d1f54e3035a5cd89af504b2d1005950a434 SHA512 982fc145a755a52aba352b0cac94f6d32caf2b74f86d24da90466955330177f94d2e9135e9bda4a17d9e9a554c7dab9ac6e5b3a8a042434989c5dbf7975c9062
diff --git a/media-libs/libraw/libraw-0.19.3.ebuild b/media-libs/libraw/libraw-0.19.3.ebuild
index dac5a5a9ced5..581803b9face 100644
--- a/media-libs/libraw/libraw-0.19.3.ebuild
+++ b/media-libs/libraw/libraw-0.19.3.ebuild
@@ -16,10 +16,9 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0/19" # subslot = libraw soname version
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples jpeg jpeg2k +lcms openmp"
+IUSE="examples jpeg +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
 	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -44,9 +43,9 @@ src_prepare() {
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-static
+		--disable-jasper
 		$(use_enable examples)
 		$(use_enable jpeg)
-		$(use_enable jpeg2k jasper)
 		$(use_enable lcms)
 		$(use_enable openmp)
 	)
diff --git a/media-libs/libraw/libraw-0.19.4.ebuild b/media-libs/libraw/libraw-0.19.4.ebuild
index 053b22516abf..de9464c5f187 100644
--- a/media-libs/libraw/libraw-0.19.4.ebuild
+++ b/media-libs/libraw/libraw-0.19.4.ebuild
@@ -16,10 +16,9 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0/19" # subslot = libraw soname version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples jpeg jpeg2k +lcms openmp"
+IUSE="examples jpeg +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
 	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -44,9 +43,9 @@ src_prepare() {
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-static
+		--disable-jasper
 		$(use_enable examples)
 		$(use_enable jpeg)
-		$(use_enable jpeg2k jasper)
 		$(use_enable lcms)
 		$(use_enable openmp)
 	)
diff --git a/media-libs/libraw/libraw-0.19.5.ebuild b/media-libs/libraw/libraw-0.19.5.ebuild
new file mode 100644
index 000000000000..de9464c5f187
--- /dev/null
+++ b/media-libs/libraw/libraw-0.19.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal toolchain-funcs
+
+MY_PN=LibRaw
+MY_PV="${PV/_b/-B}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
+HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
+SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0/19" # subslot = libraw soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples jpeg +lcms openmp"
+
+RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog.txt README.md )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--disable-jasper
+		$(use_enable examples)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable openmp)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index eb0cbdf81090..5227588f8b8e 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -6,6 +6,6 @@ DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5
 DIST v4l-utils-1.6.2.tar.bz2 1148309 BLAKE2B 8153a1e3803b9e59eae064f2c88e4b865a56193788a8cb204dc34e9ae50e66794ba7f020ad4b0ff9af995f57d9b9a9e0225e0f8a09eeefae42d063131d7e549a SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2
 EBUILD libv4l-1.10.1.ebuild 1395 BLAKE2B 602ce585cbee9b33735055789353ff1f2296cb1216095cab81a0b4b015ff0ceb7015b2af933bbc238d0e628afdfa61af9d38080e4b407b649b974f24a7dac059 SHA512 c9f1863b392b2a24aa5e2b8d7941fb5bf3f67c142e36da3999db6a442934d68306b8b45adc73a43cb17e399ea506004a4cbba978b792fd5ba4c70ee393810edf
 EBUILD libv4l-1.16.3.ebuild 1360 BLAKE2B 6a8cba7641759011fba00aa6e7d9ea052b33e4537008dec7f6616ddcddceee9040047225dc0ab470c6033f140787b1a4c3ef30c30466b55d0532bc7049480048 SHA512 d3e79e71b17e3d5f020a92962f18446a907acb1e8e19fb87d5b7e076104629c32707bea9afe5b61667f9985ac090c4f0279c39f7cf681081bfa6d1d7edb95400
-EBUILD libv4l-1.16.6.ebuild 1404 BLAKE2B 64d53c95476e04b6ab8af333d063c7fc826234d08a534730811a1c93dda6709683309ddee29fbc967dedf065f61f52b383dd99241f034a1d84c8f585e3d467e4 SHA512 0c8bdf7c6f3c847854d1720527712d254d431b377a49637b5bacf750d4243a905fc6ce369c6951b14c35d0dab990d93d97d9113dc0d6a4c1fe821d13e18e34d6
+EBUILD libv4l-1.16.6.ebuild 1403 BLAKE2B 4f8976c580c1f6ae3058de20eddf1762d3179e4457a5ad17a65ff105cb9f79051a802ceaa08ac0f951bc5c693ffef1d5622f313e8ff52c8392a5e5bf9260d4e2 SHA512 81a1fdc1d60a5e7324717901d9cc5442b1a126c88528b3cea23bd8b0d8b1a2971723d873af415b74d750e532948c99e6a773271d50b6eac8c931ba7a8daf0c3d
 EBUILD libv4l-1.6.2.ebuild 1366 BLAKE2B 4b4d13e9e8723e0a846cde04627ea6a4af400633146b3e424b794264f9b6eaa8fec10d0e2d1d12b6572de3e96caaaa80368242cf59d33131c0afda86127e9f37 SHA512 24ae9e13eb1efc7a7e071c8a8102c065f1e9feadf8e02f4477c004403d5b94eeaba13510970bdfe48852e723619ce0579f82dc25b9c2975104fef97d1d3ba8f6
 MISC metadata.xml 1120 BLAKE2B b8854ccbfdb3674f5dd2657270945dcea8f9b48e501a07e8589bb04e0b99f927b8499afb979cb34a8d79a04e9813335188853db768dfe774fc5ab2919e9a34ee SHA512 09c21dcc53a675a4e04506dcf8b14b81947806dc761346a4bcb6a6ffdda7b60fb1adf0a778d7e4f060327aea55ec92b7fb700af7a874355d86b64a96541c8c5e
diff --git a/media-libs/libv4l/libv4l-1.16.6.ebuild b/media-libs/libv4l/libv4l-1.16.6.ebuild
index 55507d9ba819..3fafe417aecc 100644
--- a/media-libs/libv4l/libv4l-1.16.6.ebuild
+++ b/media-libs/libv4l/libv4l-1.16.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/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="jpeg"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 1eff1ab5b753..eb2b32167bd0 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -13,7 +13,7 @@ DIST libvpx-testdata-1.8.0.tar.xz 418337232 BLAKE2B 1336e522f18a8f7812b4e7e4de7b
 EBUILD libvpx-1.5.0.ebuild 3954 BLAKE2B f83ffbdd1a1f157f57f28184e1103bc172d6330d6e1146ae6014fe7792a118d8c7a4237ad638af4b4e441c81a6d0dc9e1edb0e430eb5155921c77d6f2c39283a SHA512 ae28b6eafcbb42b447a715236594c0cd72665925cf763c8579a668d0424ec86f6258ec10a8bdd0baa0ce332f792e9cb919223e5e4b1fedd2fcd49dce14b15c1c
 EBUILD libvpx-1.6.0-r1.ebuild 3566 BLAKE2B a3d55b41879c3b407bc8fdda418574c4d4a3bb5fc4cd6000af3841c28384f50e8d5f2faf72d33cafa65c6a3037876c471b660e6d48d0de26351c9d038555e1c2 SHA512 8b69bee233977ba30075c2330c0713f9e5615a4bb4c6668af182eb622a1cdb6aeb8318659e1fb397330ebfddb096bd158fddfecf8b6680aabb146a69f173dee6
 EBUILD libvpx-1.6.1.ebuild 3920 BLAKE2B e1350052f0e7542d4e5458305eb7b93b8e9f2399894ca52cbdad78145189429b338deafdfd63b5ef42c55a3e0da9d8c6182113e65cdc60f5608e0bf39ada8abe SHA512 fe68cbf448458d1b36434e5ecc5902577d6e557c06a090cb5695360cd32795052d74ffc1994e6e263c896fa463097224d9ec8d6b08f2a187efa6664b2a1f55ad
-EBUILD libvpx-1.7.0.ebuild 3884 BLAKE2B c6dbf1dc57c1a7e667e21ab1f9e95d191b18efc1b25d1dc76960151f5db2c2ce21ad6e150e78c503966956dff17ea95b31126295edd76ed2a1e6277ce644afbe SHA512 2b9c5422a14f74c827742db43e32da8a8d572624be28ed0d6e652fd9416dd5981daa67b4b01790655bc4d965adb5c38613937dca38de11cf851a2472c34b33ed
+EBUILD libvpx-1.7.0.ebuild 3879 BLAKE2B 76860ba6f79982627fc9294783d2fb9b532f2e12465d1ae17ba4e3ee52982a116c21814342e38f1a32de979a12e8f54636aaf4a56a56e235ae9c43ee87bb2ae3 SHA512 25aec6be6cd163592d11a558bb33b7ab1a45824f44c07385f7707748a1403c01accf7b51f9ffc73ca8638bfc362b454ec3c43dbecb060242c789c57fa17f61a8
 EBUILD libvpx-1.8.0-r1.ebuild 3352 BLAKE2B 2c43ff1789cdfe7858b17435f7e14db4a32c357d8f63d5c32ade679e088d6e8382552b2238ab84b2d608198bf8b7fa60dc73042ac9df64b83ed346c18fe5cffe SHA512 38e95bac7f2bdf989fcebf4f41c609424d1a27771e105e65ab6daa17639a5e3c0465a3ec5c6821e96e110d47df020e812ef2b5c59520dbd4fb8c46362f4ecdca
 EBUILD libvpx-1.8.0.ebuild 3917 BLAKE2B 7519a4bb61ceede17f50345bc1746cd6fef84f4942e8647bf74360ee6c42500351acef6ac0099a6400a902f910fc636db3be03c1fefe1a0f39b9a1ad02c3cdf7 SHA512 798f2eeb93e0e13539c1dea71d34516c31e95d4d3330f5d9e5adbacb26c8eb5be6b421b98a5a1559aba6e600bf7b71031e31e660cf4a77a09c00dd79b214a30d
 MISC metadata.xml 575 BLAKE2B f8e5f9a2663a651155da3bde8284ace9c5c9394842c279a83b58e61f5bbdbcb279b71609b1129c7e1ebd61b02ca6d6f7374313815ea33d98d60affda0144c54f SHA512 748b5a315632723c78b1db5eaa0f62e331d28874a9dbc42ebc66089eee1e2e54fc19f33c7188c4b84977b35762c94c2319787cb7528f7c22382bccd715b247a5
diff --git a/media-libs/libvpx/libvpx-1.7.0.ebuild b/media-libs/libvpx/libvpx-1.7.0.ebuild
index 319c2f4e00c0..e37ec4d62fa8 100644
--- a/media-libs/libvpx/libvpx-1.7.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.7.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
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
 
 REQUIRED_USE="
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 4262a938e2cb..4768075f8e97 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,16 @@
 DIST mesa-19.0.8.tar.xz 11967592 BLAKE2B 91a46b67bdb8cb3ab4c7337be7c2b0dc6ab5ec8cc126afc2d8af8d056bff0392a5b443c26304bf4c68472eb6ba16d29ca248c1fc0c0f2dd6af03d3e10d3ec1b3 SHA512 fbddc3a74f223564343027380af776b3fa5d63fe1af4e34121273235d1c6eced96439f601eb19bf658eb927aff3965b520f0329fcbd4650f3112167303e1746d
 DIST mesa-19.1.3.tar.xz 10935604 BLAKE2B 4dfda4b3ef7a2d53b20a7a0c81b08901d6b88431b6b56679b8d97d6f2f57ce18f6dcdbae9b79c5d02b9175f47db629833da6012658295fe456829ef07a5ff087 SHA512 787310c43089142209ff7db298489b0815b630577680d5ce1bc3f796eed3772ba41f03e5e773b77ae084c191ed4e365eac1753166ce60f12b8f5974d55762eeb
 DIST mesa-19.1.4.tar.xz 10938008 BLAKE2B 4745fc7e844397378fe1adf61bcd5b54aad11ec0b375ced85fd80ced01227432b491ad8b7ba7d9013190cfbb451bc11cdb7c8af0e1f298dd5d793d3ce43aa92b SHA512 234032d917c9b378c3f6ceb921677b64e549344c3957331810b50fd73e0dccd2f4f62e2bd39e619590f389bc58fdab10fab4b88f7c117557cbeb1dda049b9fc5
+DIST mesa-19.1.5.tar.xz 10938452 BLAKE2B 7d21cad04c8172006e73d84148cfeb785b3d5f90f63d8474e4d0d6ec8658142bc2b6a639415d90b0c8d541f004c374603ae1230dfddd293118ed584c6ca74818 SHA512 4d4b3733c13e5c9b3172127f2565b827dc46aab69bdc86791c457ad137a5571c51e3c3a26d5a99e11fe552829a1220028a3968f3086959e038c615f2d75675a4
+DIST mesa-19.1.6.tar.xz 10939908 BLAKE2B cd7204614898621f3b242788667fc64e0ca00f3a5650e60cb8e74ef2760300245734741355874e05c97d482f3bd06a1755fc5e9cee804a6d5a050f20c8bc70a9 SHA512 399ce97a293769893ef9a4a6af1f77c7d835f5405bdbc03bbf9b73e052e4ff3b43dec5dafd6b9fedaaf2c59531aeccaa0f685a8bfdc5719a26c3815fc7f68024
+DIST mesa-19.2.0-rc1.tar.xz 11452972 BLAKE2B 64a844a06110c64f4badd8d64a63cee4fbb25c6e2bb17062277e54094c8a5342eac7058ae7ba7b0aefc4e0795aac371caac26e54cc3612afaf54d41b94e09b18 SHA512 babafb6ec668834e041a62e966452fe315e4f5afef8e1f7d35e038993c73b32ea6ad9929399edae4686f44cd11704fd9a8801821befc1d1767bc0662d4c39fac
+DIST mesa-19.2.0-rc2.tar.xz 11456920 BLAKE2B 673ff105395731ca65cc99bee1f73c582b40e05983bd08c46f07384e579c8d449e7f5371461542ebbcfc32022382f206adf7dcc43ed8713cb35e37c1cc69e03c SHA512 a42f7add01afd327838bd57ea4086ad4b9de669c6caf443129e325171bc53e3321c898d8d0075c7e50c4e0fdd094d66a60e35a0620e25e6c52648c5ac0008dcc
 EBUILD mesa-19.0.8.ebuild 13852 BLAKE2B b828c73a96f85de9c392444fb1a697d86ebc7d98d6b7571757e2900c84f16c62bf82e11fdcf037757ffcd7cf5a560b638da5bc6c51d3086493741fd3f00e286d SHA512 24fbbc005fd0fa7376dc960d6388861c041a5320f6b58f3fd55ffd15d2d09816aff3034154a2047734c0ce9596c1c9187b01973fd45e87a64e04325074463973
 EBUILD mesa-19.1.3.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
 EBUILD mesa-19.1.4.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
-EBUILD mesa-9999.ebuild 14485 BLAKE2B 4c897388a3e48ba1b7639c7449101e560b4f807af64ca197665485dd445293a79cb1ab4a4176e24d6258c0b1e40a21e18602021f209e92c68b9e7c60ae4e7d85 SHA512 7d71637292295eb2cd9898609458a2a815b15ea90701a0193c24ca94781413b8c32191e36c16af3ac054166b96252c4d7d4435da4b721c0244534d9afe9c7edb
+EBUILD mesa-19.1.5.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
+EBUILD mesa-19.1.6.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
+EBUILD mesa-19.2.0_rc1.ebuild 14394 BLAKE2B 5ef689540560ea18a770fc323bc2b0db34a592c5852c83f9dac2ddc7f5e0cef0f835f10894d42476f68b06fa7599fcfbadfdbf251e7904e7f915a75b443ccf46 SHA512 730dd456b2ad407e699f38f977d78804f60093f609937b3a2ae56f7014a63421c62d967ba31475df5ecafc76f89749079dce034d4f45f53eb41660e24d7fb32a
+EBUILD mesa-19.2.0_rc2.ebuild 14394 BLAKE2B e74b64fb5cba5b96b954e5c5a85ac751eb33cba282833d59a03466bb48bbafdfe3299c5724380ad8794703ebf7082d04dd429f32572e1dff25f79de19367fa19 SHA512 09d6cab0d1dd2c14934e8e0803528638128b94bb7e1d15516eae7b740aff9ee298e35e270ae8f4b963223efe6c3974117a527c3ec10c0b2dc265f41cacccc06e
+EBUILD mesa-9999.ebuild 14394 BLAKE2B e74b64fb5cba5b96b954e5c5a85ac751eb33cba282833d59a03466bb48bbafdfe3299c5724380ad8794703ebf7082d04dd429f32572e1dff25f79de19367fa19 SHA512 09d6cab0d1dd2c14934e8e0803528638128b94bb7e1d15516eae7b740aff9ee298e35e270ae8f4b963223efe6c3974117a527c3ec10c0b2dc265f41cacccc06e
 MISC metadata.xml 1945 BLAKE2B 9661d981c3472b6726f603982e94ba9a00066994bee201fcd0127eb8a7b436ea9112d55097054e079ba98f35f12826230e33f4bbb9ed23e19453bcb70d2140f9 SHA512 849994334f6ff6fa8e737e9b33eac509b21d50b0f71e4c0f1f6d7d1d13c7dfbc47611185562fa91a183b4411e9c10352d172ce065bd76c41bf83ac6929950c45
diff --git a/media-libs/mesa/mesa-19.1.5.ebuild b/media-libs/mesa/mesa-19.1.5.ebuild
new file mode 100644
index 000000000000..0fd4ae716a5f
--- /dev/null
+++ b/media-libs/mesa/mesa-19.1.5.ebuild
@@ -0,0 +1,540 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="9"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-base/xorg-proto
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-19.1.6.ebuild b/media-libs/mesa/mesa-19.1.6.ebuild
new file mode 100644
index 000000000000..0fd4ae716a5f
--- /dev/null
+++ b/media-libs/mesa/mesa-19.1.6.ebuild
@@ -0,0 +1,540 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="9"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-base/xorg-proto
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-19.2.0_rc1.ebuild b/media-libs/mesa/mesa-19.2.0_rc1.ebuild
new file mode 100644
index 000000000000..f226c4813d78
--- /dev/null
+++ b/media-libs/mesa/mesa-19.2.0_rc1.ebuild
@@ -0,0 +1,543 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="10"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.0.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-19.2.0_rc2.ebuild b/media-libs/mesa/mesa-19.2.0_rc2.ebuild
new file mode 100644
index 000000000000..631e1efea884
--- /dev/null
+++ b/media-libs/mesa/mesa-19.2.0_rc2.ebuild
@@ -0,0 +1,543 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="10"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b28120fdcc83..631e1efea884 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -16,7 +16,6 @@ HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	EXPERIMENTAL="true"
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
@@ -240,7 +239,7 @@ EGIT_CHECKOUT_DIR=${S}
 QA_WX_LOAD="
 x86? (
 	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
 	usr/lib*/libGLESv2.so.2.0.0
 	usr/lib*/libGL.so.1.2.0
 	usr/lib*/libOSMesa.so.8.0.0
@@ -504,8 +503,6 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	meson_src_install
-
-	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
 }
 
 multilib_src_install_all() {
diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
deleted file mode 100644
index f743c45f24db..000000000000
--- a/media-libs/ming/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ming-0.20181112.tar.gz 14889061 BLAKE2B a276f7aaf386f0233b9e92a95daf22b7fd192654275e99f70106b7abf2ec3963ae8d70a82addd2690e6c7038a0a52e41a27fbd5c9b38cc96d1ab617a3bfc522d SHA512 a4d3ed04c96ffc6d040ace3451f2d99a3fdda0726b45cee30913ca2dc8d9f24ff156a643eeb888d05eb199dd9f2caf4ce4f84fe40e1b95bf2f6c9e038155fdc3
-EBUILD ming-0.20181112.ebuild 2235 BLAKE2B dd03b461949a5a080c55228e87a4eddef83ff0cf163c5a662aedf47f3005573ed8bd4fe2c622dbdb57619b2ec91bb0730bceea2721217a5102c0b87871b894b1 SHA512 ee714e3fd1aff9c0e453b06f7f219b440e8c6c5464777e0adf7eb0da405478eaf28a99df8fd9db22d2b65b123afaac21d350853b7c6f476269384144cfee57da
-MISC metadata.xml 388 BLAKE2B 7083db03bf7efad4015f4aa3838925123a71bae6d57ed318232622e96c8590ef1f770520da535c9efc94f33b416430dccecc9a81fa81df936d4e15933a1dd041 SHA512 0efbb0ad1eadfd764bdf6e182cf8865994ca8e96ccc6e14845829638730e1ce6ff7ac2777e9ad3d396e7e29d77e034b818c95259eb8aab53a23b3c0815f787d0
diff --git a/media-libs/ming/metadata.xml b/media-libs/ming/metadata.xml
deleted file mode 100644
index e85491fe7d63..000000000000
--- a/media-libs/ming/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ming</remote-id>
-		<remote-id type="github">libming/libming</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/ming/ming-0.20181112.ebuild b/media-libs/ming/ming-0.20181112.ebuild
deleted file mode 100644
index b185a867bd79..000000000000
--- a/media-libs/ming/ming-0.20181112.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PHP_EXT_NAME=ming
-PHP_EXT_OPTIONAL_USE=php
-AUTOTOOLS_AUTORECONF=yes
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools distutils-r1 flag-o-matic multilib perl-module vcs-snapshot
-
-EGIT_COMMIT="50098023446a5412efcfbd40552821a8cba983a6"
-
-DESCRIPTION="An Open Source library for Flash movie generation"
-HOMEPAGE="http://ming.sourceforge.net/"
-SRC_URI="https://github.com/libming/libming/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+perl php +python static-libs"
-
-RDEPEND="perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	media-libs/freetype:=
-	media-libs/libpng:0=
-	media-libs/giflib:=
-	sys-libs/zlib:=
-	!media-libs/libswf"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-PDEPEND="php? ( dev-php/ming-php )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests only work when the package is tested on a system
-# which does not presently have any version of ming installed.
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# Let's get rid of the TEXTRELS, link dynamic. Use gif.
-	sed -i \
-		-e 's/libming.a/libming.so/' \
-		-e 's/lungif/lgif/' \
-		perl_ext/Makefile.PL || die "sed #1 failed"
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die "sed #2 failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	# build is sensitive to -O3 (bug #297437)
-	replace-flags -O3 -O2
-
-	# build python via distutils calls, disable here
-	# php is done in dev-php/ming-php
-	local myconf=(
-		--disable-python
-		--disable-php
-		$(use_enable static-libs static)
-		$(use_enable perl)
-	)
-	econf "${myconf[@]}"
-}
-
-run_distutils() {
-	if use python; then
-		pushd py_ext > /dev/null || die
-		distutils-r1_"${@}"
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	# some parallel make issues on flex/bison
-	emake -C src/actioncompiler -j1
-	emake
-
-	run_distutils ${FUNCNAME}
-}
-
-src_install() {
-	run_distutils ${FUNCNAME}
-
-	emake DESTDIR="${D}" INSTALLDIRS="vendor" install
-	einstalldocs
-
-	perl_delete_localpod
-	find "${ED}"usr/lib* -name '*.la' -delete
-}
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 985fc08ee167..383c808b7a4f 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -5,6 +5,6 @@ AUX mlt-6.16.0-crop-filter.patch 1420 BLAKE2B 359f02e95c7afd66c412e8b1e8dbd59d67
 AUX mlt-6.16.0-mlt_consumer-race-condition.patch 936 BLAKE2B 1ac34744d8bab9cc18c37092bb7f62a92cd297ab7a31b3ce4927f08257bf0fb87bf33c533df6a12c045c6573f5d8d0ce4105c99a740dd75e9b9e4ab3764c8abd SHA512 3bbcd1172263e8e6048e329075a0ea521dab7f27f6f92496f4e39f8ddd48d6c3b65c96f4ea0620aa1ab5dca886aeb5b58ad09b757acd2ad33ea3cb5729e7bc2f
 AUX mlt-6.16.0-rotoscoping-interpolation.patch 998 BLAKE2B 22ae634e46fa61cc60113a4d8f35454ecabd73f4f9de0c0a9c385aad44a941610ed075bd278d0b45f9101bb3939b82a0565938d4e3c4f29f320d93334cfad4b0 SHA512 f785df6e7db75018c05f57f49537e57e86fbd0b3cf2aad705c0179f36d2cb1115cd8f20f2b4977db0c32b485fef3ba32283fc68c817db4eddcc161e549a63685
 DIST mlt-6.16.0.tar.gz 1414374 BLAKE2B 6c031360721d535e95cbaf890c1f42f5f5dd914e0c6c20992bd3aec4ecbcc0b53370fe6b82b5d11c8242bb0a1f2d94f28bc61b4e5a920e5afb41ca8bb5229433 SHA512 554e8b9baa7a8578cc52315fe0583c61762bf6fbbcdd4a1e4f25753846d92f013e7d74745498625fcc781de993aa0526fd761920450b4314e67105783b9bde26
-EBUILD mlt-6.16.0-r1.ebuild 5754 BLAKE2B 57bb4869541c355e1ba55cb57cfbe584fe7aa411c10fb8ec3851867a239da2be3ad89376980666628b1056a0a051db099f160b64e55be0d9286237b60269c7c0 SHA512 32f956e6c3088152058bced2d37ecb736409a5c2a9e5530c4622df518099a9970f854ca3bce4e4cd4680208f1a4b2294b6d28b352cd138b4253ab9be45f0da08
-EBUILD mlt-6.16.0-r2.ebuild 5757 BLAKE2B c8719b417038fad701b9a8a4f7d0a6298e5cc9ec8ce0d9dbf8d87f1926bab0c2515e103857ac36cc376609eebb78a9bf34ad9ab9ccb101fa70eebb4616c72163 SHA512 7c9c6bd8d79c452b5f1589249a500b814912f790ead14779675ad3128215d9ad0da57445f09490b563ebb4759495a5577789966e3a3a173553ddcded3657db28
+EBUILD mlt-6.16.0-r1.ebuild 5786 BLAKE2B ae4e3dfe044d0152c8a8ccb66537a04cdf0fa08e869363b532de982a043febba7995922c6fe0f2a01b946794c1fcf936dc0120f7e7edc5359b17956cd78a42e8 SHA512 10f48c97e90a2be760c4f720c391f3b399811ba6b0deca9e3035b9d6cb5c5c39c29fc17f6731c620d160709de32031e5bd49f469db7399ee2d834973794ef01c
+EBUILD mlt-6.16.0-r2.ebuild 5786 BLAKE2B 0da11c4a284784930dfd45e5ecb2090db7362b58fb3f30c62fe10f936dd93d672342d4891eb95a852476d31b83f792fdf878dd8a9c7c3685eb77eaa2ecb5115d SHA512 1937fb2777d0b6fedd732d1ae1f14ad2c05d2b6ee045472819882d9bdd5ed73f282421a3a07c2d606e7f7ac03ff03cca1a31ff57630bfb152e8f313b3c74b865
 MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
diff --git a/media-libs/mlt/mlt-6.16.0-r1.ebuild b/media-libs/mlt/mlt-6.16.0-r1.ebuild
index 76fc970c2228..dc4435ed3601 100644
--- a/media-libs/mlt/mlt-6.16.0-r1.ebuild
+++ b/media-libs/mlt/mlt-6.16.0-r1.ebuild
@@ -209,17 +209,16 @@ src_install() {
 
 	if use python; then
 		cd "${S}"/src/swig/python || die
-		insinto $(python_get_sitedir)
-		doins mlt.py
-		exeinto $(python_get_sitedir)
-		doexe _mlt.so
+		python_domodule mlt.py _mlt.so
+		chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
 		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"]')
+		local rubydir=$("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
+		exeinto "${rubydir#${EPREFIX}}"
 		doexe mlt.so
 		dodoc play.rb thumbs.rb
 	fi
diff --git a/media-libs/mlt/mlt-6.16.0-r2.ebuild b/media-libs/mlt/mlt-6.16.0-r2.ebuild
index 31ed25573ff9..2046009e1216 100644
--- a/media-libs/mlt/mlt-6.16.0-r2.ebuild
+++ b/media-libs/mlt/mlt-6.16.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~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 kernel_linux libav libsamplerate lua melt opencv opengl python
 qt5 rtaudio ruby sdl vdpau vidstab xine xml"
@@ -209,17 +209,16 @@ src_install() {
 
 	if use python; then
 		cd "${S}"/src/swig/python || die
-		insinto $(python_get_sitedir)
-		doins mlt.py
-		exeinto $(python_get_sitedir)
-		doexe _mlt.so
+		python_domodule mlt.py _mlt.so
+		chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
 		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"]')
+		local rubydir=$("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
+		exeinto "${rubydir#${EPREFIX}}"
 		doexe mlt.so
 		dodoc play.rb thumbs.rb
 	fi
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index c96965569e87..e8f6b63dea9f 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -15,7 +15,7 @@ AUX netpbm-10.76.00-test.patch 6005 BLAKE2B 0c8b0d9b1d7a0c5b139f85eb3a91838cc496
 DIST netpbm-10.66.00.tar.xz 2575356 BLAKE2B db6336aaf6051d6b651b57d8d6692792698840546e82e61e4bff6c2dfa55041e8441eb3e4b7f09279181720bcbbaf3676903daf5ae85327b5cf742ec150df61c SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af
 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
 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 5269 BLAKE2B aeb0adb71ffec5f6d1d0f3fc3b6adcdad5aaa64c61111b775d68b130314c68de512ae4e997af72d0105c7ada16057891aa98d7fdd30a3b612e226689749b9e54 SHA512 1da8159a4911df0b233632c3a2b955384efb369bd4d4f521203fdef3809ce872ea423721cd2e59ab8d3706886c47be88c6939d5718e2b03d542ae2580e6d4efe
+EBUILD netpbm-10.66.00.ebuild 5574 BLAKE2B 493ee7587d52bd88f2f64e6cd07707f69181aa8043016845fce991553c2c4387a0b46b62878850246a4682f77bf7f1fe787e65605ffd513dd14c49b61597c2a4 SHA512 177862ad6c682bb5ed506abefbdbdc7fe709f4013663c6858fdcd0f4b5aad57fcf1593e504c673062e8c8394a5b2bf05e7c78aa51a5200c27684c1f2ad2635eb
+EBUILD netpbm-10.70.00.ebuild 5315 BLAKE2B bfa0d92288326dd24e7603f52fd0fce2b1da33748c3285670748ebb2db186f0fb4788d2905199081736c526a778c6a681216f43bf5dbf05580b9f50264126e7c SHA512 9f1c6e869297c52d1232cfdbffd7ebb14343d96ab49c620896e0a69fcfac32be0b34731e7a5a67ca60aa981f4aba6787b74cdd3233150957195c84909a2949d4
+EBUILD netpbm-10.76.00.ebuild 5205 BLAKE2B 27bfe092440c6889d3d43c1c31e5ede375ac856d01d602fb3ffde2cc08ea68e52bc5d12cefe486c9155b870fc60be1b74ba9ae7cedfa34267131affa26bb524d SHA512 4d70735e1029fd633d4cbde1c9f768ce71030dd48dc7c0f27045671cb9bff0a288bbb157e2ac123c09090162ca5a73360217f4ed1af46f540327465768181bbe
 MISC metadata.xml 434 BLAKE2B 255ab7ddedd5e4558e9303c0c9fe5d1d6e13096e3ef7ba269d68908f1cb74d63af273ef9b2ceb97a7462750fa795a6d6f54dae1e70972b44cfbb749250ed65e6 SHA512 41fe0623d1efe7cff26ed9307756f045bd40f275abd38095affc9394efc2c940e63978c79328e43583d5bb466fad0d5339d158422037587cebd3b1f4c22a459f
diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild
index 9beba62062d6..82fe3af25620 100644
--- a/media-libs/netpbm/netpbm-10.66.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.66.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="4"
@@ -12,11 +12,10 @@ 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"
-IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper )
 	png? ( >=media-libs/libpng-1.4:0 )
 	rle? ( media-libs/urt )
 	svga? ( media-libs/svgalib )
@@ -81,7 +80,7 @@ src_prepare() {
 	del=(
 		pnmtofiasco fiascotopnm # We always disable fiasco
 		$(usex jbig '' 'jbigtopnm pnmtojbig')
-		$(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k')
+		jpeg2ktopam pamtojpeg2k # jasper has been removed
 		$(usex rle '' 'pnmtorle rletopnm')
 		$(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
 	)
@@ -148,7 +147,7 @@ src_configure() {
 	XML2_LIBS = $(netpbm_config xml xml2)
 	JBIGLIB = $(netpbm_config jbig)
 	JBIGHDR_DIR =
-	JASPERLIB = $(netpbm_config jpeg2k jasper)
+	JASPERLIB = NONE
 	JASPERHDR_DIR =
 	URTLIB = $(netpbm_config rle)
 	URTHDR_DIR =
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
index d43ef5f78bfc..97a05287f209 100644
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.70.00.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"
@@ -12,11 +12,10 @@ 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"
-IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper )
 	png? ( >=media-libs/libpng-1.4:0 )
 	rle? ( media-libs/urt )
 	svga? ( media-libs/svgalib )
@@ -74,7 +73,7 @@ src_prepare() {
 		pnmtofiasco fiascotopnm # We always disable fiasco
 		$(usex jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg')
 		$(usex jbig '' 'jbigtopnm pnmtojbig')
-		$(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k')
+		jpeg2ktopam pamtojpeg2k # jasper has been removed
 		$(usex rle '' 'pnmtorle rletopnm')
 		$(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
 	)
@@ -141,7 +140,7 @@ src_configure() {
 	XML2_LIBS = $(netpbm_config xml xml2)
 	JBIGLIB = $(netpbm_config jbig)
 	JBIGHDR_DIR =
-	JASPERLIB = $(netpbm_config jpeg2k jasper)
+	JASPERLIB = NONE
 	JASPERHDR_DIR =
 	URTLIB = $(netpbm_config rle)
 	URTHDR_DIR =
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index af7d4100ce2d..10dd2b062d5d 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -12,11 +12,10 @@ 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"
-IUSE="doc jbig jpeg jpeg2k png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 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 )
@@ -137,7 +136,7 @@ src_configure() {
 	XML2_LIBS = $(netpbm_config xml xml2)
 	JBIGLIB = $(netpbm_config jbig)
 	JBIGHDR_DIR =
-	JASPERLIB = $(netpbm_config jpeg2k jasper)
+	JASPERLIB = NONE
 	JASPERHDR_DIR =
 	URTLIB = $(netpbm_config rle)
 	URTHDR_DIR =
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index b53b8922ddbd..b5c029fb4152 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -23,7 +23,7 @@ DIST opencv-3.4.1.tar.gz 87051748 BLAKE2B 87c83ab9b3d7fb048263f047aa5d6e95b153e1
 DIST opencv-3.4.1_contrib.tar.gz 57126844 BLAKE2B 63d9d5cb088371754eb132607789c8f1d4820f3e0e486593d6f64ee8f918ea4362152f050baec16f17904c03a6cdc0abc6e5fb2510308dcbabebe97b29285fbc SHA512 431dfba0f413071d7faa18bc6e6f5e4f015285e2cc730c5dd69b2a4d6aa4250b7e0bcb1814ac6f06f5c76f103aea1f93f72f32aee6bc0cd7ddacdaf1f40075c1
 DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562 SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-2.4.13-r3.ebuild 5972 BLAKE2B e8cf37172bb279877c88e4a25564d58f0cc39e46ea185587033922083ff6f34c774f2d9dd0220831db040b8f3654f95a0cb6e28aef0cf3893392000f45c10bba SHA512 2ee9f1749172d504dafb927b9310c30c92300b9ecc19999421e0e891bc0dfb436871ad7fb35466f84275370877240a222aa71d1f6f47808726d5ba1875606e3b
-EBUILD opencv-3.4.1-r5.ebuild 18715 BLAKE2B 2725dc4ce46a4cbb047c5ea3aea493b3bab516bb5300f75d59859913412f694a138ae0946844ccb09dc202f53a1f558871f4d0e2ec999823daacf2f303138d40 SHA512 3016dd9480077e9b87fcdf8e9dc3fabf729b4b9e1d540173ad761499a79f6a36dd80bbed02d3ac3c101809e9c0c055e1b2752e2e324c0042547ed297563b6b9f
-EBUILD opencv-3.4.1-r6.ebuild 18788 BLAKE2B 5b28c0f355d7bd66f8de7d3dfc12bbd8c3be2a9e8fd065ef44ad69306e74616b86c486f77abc96b36f659c1a5b5960a2dfa43526d7ec6cd553f7cbdd359a9df9 SHA512 66e0a1688e83c64735df8b402ad9d21e074031c89df74d21a8450695b0a52f9d0bd2a5a1ea522866fb52a05507f6545d0cb8f4550add1e10e5fe96b2466f7d9c
+EBUILD opencv-2.4.13-r3.ebuild 5918 BLAKE2B 3ffd92b751e983cddd74e26d48e532973110a8fcd715641ead732bf4a1ed4802ac2c0385769d061f6632e33dfc1bf26758815bf1a896d020ef628de7df28c8d2 SHA512 0fae932f9326429f7c37a698c89b9cbf4da0c2e73640992211d9a8b7a5ce8b61d5e75d30f4f376345a992285fe40395b117c968daaf9e7db9b4cc52ff621bee8
+EBUILD opencv-3.4.1-r5.ebuild 18644 BLAKE2B 51d5bdf871fb91c0b89db7dd33e52d357c26fceb575631abc63d9bbaed98a583d8731c0deb1e0e5d39745d01ab9a32a78aaa6922d231b1ec7b1cff0ec6976557 SHA512 512add3c726f89329d3fda55d541d68ca8099aa537ebed6833d0667bd8304c8f3af7d45bac23991be5b99e6559b771546a6b69e4c6a9a72a108b695d0f93ef36
+EBUILD opencv-3.4.1-r6.ebuild 18717 BLAKE2B 419a8c987559d22076ddd3154172c2ae11c4986dcded798c46da3569f46c3cc78f9a1e602ef5d91c3760ea4ba8ae6e2240bf20d007d77af7d1226794e2da77ef SHA512 510a0a6d6266961d88097c39146fe19488fad8c2539c2ae02440dee8623d17d36c010b5e6305a04e52c68c421e6d2942534d7aa1e652fe7ea09b3a5a5735089c
 MISC metadata.xml 2401 BLAKE2B 3d37ef4879324890e702119fffaaf075021fb22ee0b9393a58df46cf937a60403f0f48f90483bfc078079cb9f1177f866cfcee63d592ba93915fa96a438d064c SHA512 691287c588e60df6158ea070f61100214dc54c267f9f2c7ffbeabb75595e72641ced7cc33f119fed9bbf98df8832f977557fb4a1017eb65d9081ac1350d783b8
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
index 37b41c40568e..d4379a93e73c 100644
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/2.4"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
+IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -43,7 +43,6 @@ RDEPEND="
 	)
 	java? ( >=virtual/jre-1.6:* )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
 	ieee1394? (
 		media-libs/libdc1394
 		sys-libs/libraw1394
@@ -122,7 +121,7 @@ src_configure() {
 		-DWITH_GTK=$(usex gtk)
 		-DWITH_IMAGEIO=OFF
 		-DWITH_IPP=OFF
-		-DWITH_JASPER=$(usex jpeg2k)
+		-DWITH_JASPER=OFF
 		-DWITH_JPEG=$(usex jpeg)
 		-DWITH_OPENEXR=$(usex openexr)
 		-DWITH_OPENGL=$(usex opengl)
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index d096c1963ffa..662a0e1a266e 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD"
 SLOT="0/3.4.1" # subslot = libopencv* soname version
 KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it Wwithout the user knowing, which defeats the
 # purpose of the opengl use flag.
@@ -77,7 +77,6 @@ RDEPEND="
 	)
 	java? ( >=virtual/jre-1.6:* )
 	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
 	lapack? ( virtual/lapack )
 	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
 	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
@@ -293,7 +292,7 @@ multilib_src_configure() {
 		-DWITH_GTK=$(usex gtk)
 		-DWITH_GTK_2_X=$(usex gtk)
 		-DWITH_IPP=OFF
-		-DWITH_JASPER=$(usex jpeg2k)
+		-DWITH_JASPER=OFF
 		-DWITH_JPEG=$(usex jpeg)
 		-DWITH_WEBP=$(usex webp)
 		-DWITH_OPENEXR=$(usex openexr)
diff --git a/media-libs/opencv/opencv-3.4.1-r6.ebuild b/media-libs/opencv/opencv-3.4.1-r6.ebuild
index 1f5783f96215..92376a497c45 100644
--- a/media-libs/opencv/opencv-3.4.1-r6.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r6.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD"
 SLOT="0/3.4.1" # subslot = libopencv* soname version
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it Wwithout the user knowing, which defeats the
 # purpose of the opengl use flag.
@@ -78,7 +78,6 @@ RDEPEND="
 	)
 	java? ( >=virtual/jre-1.6:* )
 	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
 	lapack? ( virtual/lapack )
 	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
 	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
@@ -295,7 +294,7 @@ multilib_src_configure() {
 		-DWITH_GTK=$(usex gtk)
 		-DWITH_GTK_2_X=$(usex gtk)
 		-DWITH_IPP=OFF
-		-DWITH_JASPER=$(usex jpeg2k)
+		-DWITH_JASPER=OFF
 		-DWITH_JPEG=$(usex jpeg)
 		-DWITH_WEBP=$(usex webp)
 		-DWITH_OPENEXR=$(usex openexr)
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 56ddde0cab75..ff5aa2f1bffb 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,8 +1,7 @@
 AUX phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch 998 BLAKE2B 6f659a6a6aad157ad708934a165f17ca4766dec3baf3cdd03e5b10b41201751f17008b43b6183df9afeba7303603fc9c1fcc413bb16a2e97cd571196ce2e6905 SHA512 c97a88e86ef3f56fdcdb12d3256afce34381ec1072ebbeda7c427db7a9c000feecab5f84a44d9a86fd099b26cda6a8a50a0a4c20139167e4e8b96c96368feddb
 AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a41f55231ac2175372077b302b033bbf7483030e763e50e8dce00886394ce94feb205b75d3bf5f4ea4b0c11f3e0c0fba42f14f3 SHA512 b13fe80bf493d33ef942babf084f823e9d6314f489496007dd43e9c0efba4c8e354067cba5ccae53806156d631a8bbf115b84e654052086aeb1d5d32f15b6f08
+DIST phonon-backend-gstreamer-4.10.0.tar.xz 98532 BLAKE2B b9182a50810536c46999266bd40996bb59ac982e44d2066c2afd897d3a2feb99e5570e36dcc869098f5b171018f4c339a2e3b8df124eaeb88236073245069859 SHA512 3beaba9ea3a332a6908ebdaa966958e8e8056d79cfb210e82a8edaf08f0a8bacbf8094e91b1b1b936406aa634dabb962e6c1468e4dde3febd9efac1a63ea70a4
 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
-DIST phonon-backend-gstreamer-4.9.1.tar.xz 88460 BLAKE2B 236a1ecdc5fcb96d041e9e743993c1f613e6a9fde8b2c8a094216f00f5862f1a5617bc87d2a5b6b8dc935de6538233b6c6ee54ca67ae7796f3f6b96be835c2b5 SHA512 c7ad71c4273d3037cb245abffeba679e4920b0797b72cf5876b0b9a5a76be200de317a7d5da5dd9eaf46932030fd8ff9e5c64975d1258319d6c8ad1c17d773e0
+EBUILD phonon-gstreamer-4.10.0.ebuild 964 BLAKE2B 24f9747529e4038e764e5979f03bf7431f755042a12a2fcfaf2dff165533225897e60794af3aa52ed5ceb9be2e3d759f3164e0f7aa31d8f0bd837edb2982b43f SHA512 127701917ba63d4a52fba8d88f692b5a18dd5ce1107750d6f84bb968a3016f27f3cfdbec12a7b1d1fbb6c329591552315cdf1d90c3a28c6a68bb61a71d464133
 EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1262 BLAKE2B a3b5ea35d373f02fae13ab3461f31b12a629e3017375de6ec7112686d11b8b87aad215377aa26671fbbbd16a33cfa94d517874101195123a2b1b689fb5f46f80 SHA512 1aa2be3410239b3549cac802f74f61309a6a06cd01bbfcb5e805e8e012ebbb945e1e4a0d24fd0533a8e8cc3395df212a65a7f850f5710b7480e573e3e4d31b1f
-EBUILD phonon-gstreamer-4.9.1.ebuild 1167 BLAKE2B 2573fbb5833c6ae70cefcef07c19e8e500dd23e19ee01cf6bd29bc3b04106470eaac01e6b0e205faa5422976d7928feebec3642c09ef41b2cb4b4d3473f0c77d SHA512 f5c466442aacc222459148efb3d877e623c86314bb7483ea68f0f95aa442e1af5df4519c9131274603f720c787211cb809056b716b0386573338639d1881f306
-EBUILD phonon-gstreamer-9999.ebuild 932 BLAKE2B 058991aa20da444ff1d248a694e24df3bed4a5784119d9c7fb4b3f4b413bd1720faeaa1387cab19e255fafe785570cfa30a7ae54baf05645418bc2a00999b87d SHA512 3dc4437dcaa8f1ba154047feb40284627db0a2273db10d088c4e2338b49e3fc2affd38727b7f69a36d990f104e0b0aafd23dc830e359b7e456fd237d8cd188da
 MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
new file mode 100644
index 000000000000..34230a07d8eb
--- /dev/null
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="phonon-backend-gstreamer"
+inherit kde5
+
+DESCRIPTION="GStreamer backend for the Phonon multimedia library"
+HOMEPAGE="https://phonon.kde.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="alsa debug +network"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	>=media-libs/phonon-4.10.60
+	media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
+	virtual/opengl
+"
+RDEPEND="${DEPEND}
+	network? ( media-plugins/gst-plugins-soup:1.0 )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.1.ebuild
deleted file mode 100644
index 84a04fda0ae0..000000000000
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="phonon-backend-gstreamer"
-MY_P=${MY_PN}-${PV}
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
-fi
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Phonon GStreamer backend"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="alsa debug +network"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	=media-libs/phonon-4.10*
-	media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
-	virtual/opengl
-	network? ( media-plugins/gst-plugins-soup:1.0 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
deleted file mode 100644
index 777afe2e954d..000000000000
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="GStreamer backend for the Phonon multimedia library"
-HOMEPAGE="https://phonon.kde.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/phonon/phonon-backend-gstreamer/${PV}/phonon-backend-gstreamer-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-fi
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="alsa debug +network"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/gst-plugins-base:1.0
-	media-libs/gstreamer:1.0
-	>=media-libs/phonon-4.10.60
-	media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
-	virtual/opengl
-"
-RDEPEND="${DEPEND}
-	network? ( media-plugins/gst-plugins-soup:1.0 )
-"
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 2731dfa40054..7e34304d91b7 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,7 +1,6 @@
 AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c
 DIST phonon-backend-vlc-0.10.2.tar.xz 60568 BLAKE2B 7ee5ea6cc627ec2bd872b4c60f9c915f383e9b2826b30c4b0db96e8348b1a26ea4f710076b68892c28c73d45dae118f06a315093b6e954d48967891f1e31eec4 SHA512 3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5
-DIST phonon-backend-vlc-0.10.3.tar.xz 66488 BLAKE2B d7e50a24f47117a0e00741457e9526e3042c7a2a0492a13a67a23f5dd7e2c9db89f6b9cce71d7bebed41327315e222a4a6b4637731dc15416be002ff47bad3fe SHA512 77f66536b9debc62807ca952173640a40ab9b82e17a2ac85e524c1f5dada16a39c7bb1c72230f3ca14a9c826adaf79b9439aa223be960cded634dbd00e91127f
+DIST phonon-backend-vlc-0.11.0.tar.xz 69824 BLAKE2B 3a206e642f0a2a95ac96f065c5f353a41956786dfdfba5eded3b4d64d26f58df936b893bb77bd16bc0652f42e8eead008dbbfc7b17abd3e77387fff01bd0ed01 SHA512 3f82b0c306ea1fdfbcc7b33a227f360961532b736146c96c2fff8fdf8157fd2f8e5e047f491fd1f4124dbf3bb9fa288265ea5d35d8ae6100214589c70e4d716b
 EBUILD phonon-vlc-0.10.2.ebuild 887 BLAKE2B 97ac0090629d73ac4c0cdc17540fbeaf4258869ad16934b0277887c8bcf1de1ca4346a35b360089c029d289cd979dd11f6256794e418c0ff7fc3234de1c39c9b SHA512 33d774dc5a0c613d96de315754dc274fe9297eae6e7b08c42e7c6ebd283eb99674ec98b5afc480054265dfb0b5f6d39160b06a8fe101427de68b17e7c4b7b3e4
-EBUILD phonon-vlc-0.10.3.ebuild 802 BLAKE2B 6f7fe5759e163a6158ba53037622d7c53878fc55a405c32f6c76f71168adec399fae630ead0075674772b74765ccf24062ae34b9fc18890b6021cc32edfd646e SHA512 8a4513f2058c65bc5826df9e0d025c488a2a05913c88605fb8e2fc5a4e369e77a4c83bcdec448eeba158bf3fa27479948951fb00d35444cf34ee0bf496f69a4a
-EBUILD phonon-vlc-9999.ebuild 642 BLAKE2B f76700a5f6676377a6d06649b83303b21fb75bb6f12dd1932925609579b05feca28b5261cf5e0edfaebe443209812fe1cf11d9afaf83f27a5acf2e13bc9ff24c SHA512 99de38dffed059d4486f6580be528dae63c32ce7d2873f66f7f3fc2d1504eec7d7d8719e715e8c494bc0ace030838bb693a881ef8a7d91578a93c303b560a468
+EBUILD phonon-vlc-0.11.0.ebuild 680 BLAKE2B 8a9f7b3c3cd89677716c66ceae47d85ed2edc8dd039d9bff8b7d62bfb6ca67cf2b616df8027fe12ea61de151f05e87b34c7511c37e624571668deb7c8f694cfa SHA512 8e1b9fa5fbb43a87a30cc61233d702551df09e134506fcf2ff926c48ab74a8c6f013311628fe8208714289331fbe16ff17a9001ea55d3650971c05d8f6653376
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.3.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.3.ebuild
deleted file mode 100644
index 1314578be051..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="phonon-backend-vlc"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
-fi
-
-inherit cmake-utils
-
-DESCRIPTION="Phonon VLC backend"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	=media-libs/phonon-4.10*
-	media-video/vlc:=[dbus,ogg,vorbis]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.11.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.11.0.ebuild
new file mode 100644
index 000000000000..566bc66ad00b
--- /dev/null
+++ b/media-libs/phonon-vlc/phonon-vlc-0.11.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="phonon-backend-vlc"
+inherit kde5
+
+DESCRIPTION="VLC backend for the Phonon multimedia library"
+HOMEPAGE="https://phonon.kde.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="debug"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=media-libs/phonon-4.10.60
+	media-video/vlc:=[dbus,ogg,vorbis]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
deleted file mode 100644
index 890afef5f158..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="VLC backend for the Phonon multimedia library"
-HOMEPAGE="https://phonon.kde.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=media-libs/phonon-4.10.60
-	media-video/vlc:=[dbus,ogg,vorbis]
-"
-RDEPEND="${DEPEND}"
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 8eba8b3784e2..cb24184b65c6 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,6 +1,5 @@
 DIST phonon-4.10.2.tar.xz 322176 BLAKE2B a73fa78e732ba56745e0791559a1ab195e9a5d867d368935ebc779cc1705a405dfd8302f6b5d92678098da8b6fdb52ec4cc2d553c361c3fefc738d502e3c38b6 SHA512 205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e
-DIST phonon-4.10.3.tar.xz 336724 BLAKE2B 33ac87fa15985bb57672da0e29389a396e8f5662ca94d475eaa111a5a1fef16f9fc90cdee696b80d131fc53abd9500fbb7907ecb483d81e422e339660e19900d SHA512 2619ac0d7873205a2773bdb226695b5a9e2deb4f47b1a0bb9dbf9a905e3f82f7834ced1b4b1e7a6dadf50fca289f92a5749e3057546c3e16a41e1d6420b594c6
+DIST phonon-4.11.0.tar.xz 397768 BLAKE2B eeadfb8e080d52a29b0cc3d7fe728376a1580b7c008361ec62fb135738c32812401f797d93a8d87e338affdbb4b0ccefc8de0736d5cff15ee85899269a4c0243 SHA512 d7302aa9d0e9d3a8c408cf2787911b49808f58f5052dbca19e9b93b68a6f829dd31ede0ac10de4a9a3cf11e4ab1986e76e0d4cc02142b2f50ffecf285b3eb897
 EBUILD phonon-4.10.2.ebuild 1323 BLAKE2B 005ac868e7b70caed892e2996cc8f670aac6c1f570d8509a7a82daabae23d59bf5f5165d5ca504fcfe450c802fb6770e1f274ba48c2dc097f3d36d4045dfd6d9 SHA512 cd537e3be7548d6db5d847d35f0ad22a4823772e2f5cd42ae89f0fb90c919752a9a55d5324d29d90aaaf8497b0518b2c5aca373607edf4df3e75b0df6dfeb413
-EBUILD phonon-4.10.3.ebuild 1331 BLAKE2B fce18c94194e5ad0de090677b1e3690fa9859381e0ac05fefaf1f6f30cc9f2b5148c7ac6951881f8a3827d53b7f7421d628cff9a399f646cedbed3fccae08f7b SHA512 f5605768a9e626fb1334d6b13f0882c136181887948227aa3a8a68b24c17fe1081e17812b1a177035b292fa893db5c14c2567d59f72ad0562e026772e14126a5
-EBUILD phonon-9999.ebuild 1158 BLAKE2B 48544fc9edf14295faf58e68708936ef3c6618319f50a224f94cba044aa5ed9f87933cd4c789b2dc923fd99672c8ee35aff7bc4ca0e63912c0fb6affc9e2c2f2 SHA512 b10e9dc36774d5625571be17354de01a7754dc3a60524788f5f015e4ac355662e9efb184919f7a48833b22b571fd9334e1606a0d0cfa948c03eb53c3a5c5b827
-MISC metadata.xml 472 BLAKE2B a4dd94a8883dceef6cbd2297e395c8e5fb287831d1bd0b69e74ea8c7977508123637177e8df2562ba1b8cfd9459738ab92f981bd926afb109433484d124937ee SHA512 8008de6bbc92f27fa741b915fef5f593aabac9921730d8238dd5f464bf3e54a8061d89107a77cb5d8e6e874479bfba3e013d5b2ba96b6afe17c32673b52d4a58
+EBUILD phonon-4.11.0.ebuild 1255 BLAKE2B 002cd7347317a831560e5619a2e68f538aba2d80b4ab326df66b7906eb5c04755f3d18116efd7028fd756a644fe4958e7f75360cfa0970f4a2c25e417f27de3b SHA512 acd0120942cb22978790babc84aafd913d9845dd230a1ed4f5b394ac0099f531956b2ff66f28a622b1c7541670be3e0e897a927cf30943935724bce699820bff
+MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
diff --git a/media-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml
index 206f8e058c2c..c965ebc5d239 100644
--- a/media-libs/phonon/metadata.xml
+++ b/media-libs/phonon/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="gui">Install device preferences and backend settings GUI</flag>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
 		<flag name="vlc">Install VLC Phonon backend</flag>
 	</use>
diff --git a/media-libs/phonon/phonon-4.10.3.ebuild b/media-libs/phonon/phonon-4.10.3.ebuild
deleted file mode 100644
index b6079f78857f..000000000000
--- a/media-libs/phonon/phonon-4.10.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
-fi
-
-inherit cmake-utils qmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug designer gstreamer pulseaudio +vlc"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig
-"
-DEPEND="
-	!!dev-qt/qtphonon:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
-	gstreamer? ( =media-libs/phonon-gstreamer-4.9* )
-	vlc? ( =media-libs/phonon-vlc-0.10* )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPHONON_BUILD_PHONON4QT5=ON
-		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-		-DWITH_GLIB2=$(usex pulseaudio)
-		-DWITH_PulseAudio=$(usex pulseaudio)
-		-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/phonon/phonon-4.11.0.ebuild b/media-libs/phonon/phonon-4.11.0.ebuild
new file mode 100644
index 000000000000..6edaf832b5a2
--- /dev/null
+++ b/media-libs/phonon/phonon-4.11.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop kde5
+
+DESCRIPTION="KDE multimedia abstraction library"
+HOMEPAGE="https://phonon.kde.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="debug designer gstreamer pulseaudio +vlc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	!!dev-qt/qtphonon:4
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	designer? ( dev-qt/designer:5 )
+	pulseaudio? (
+		dev-libs/glib:2
+		media-sound/pulseaudio[glib]
+	)
+"
+RDEPEND="${DEPEND}"
+PDEPEND="
+	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.60 )
+	vlc? ( >=media-libs/phonon-vlc-0.9.60 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
+		-DPHONON_BUILD_SETTINGS=$(usex !pulseaudio)
+	)
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+	use pulseaudio || \
+		make_desktop_entry "${PN}settings" \
+			"Phonon Audio and Video" preferences-desktop-sound
+}
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
deleted file mode 100644
index cee83b281de2..000000000000
--- a/media-libs/phonon/phonon-9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE multimedia abstraction library"
-HOMEPAGE="https://phonon.kde.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-fi
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug designer gstreamer gui pulseaudio +vlc"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	!!dev-qt/qtphonon:4
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-sound/pulseaudio[glib]
-	)
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.60 )
-	vlc? ( >=media-libs/phonon-vlc-0.9.60 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
-		-DPHONON_BUILD_SETTINGS=$(usex gui)
-	)
-	kde5_src_configure
-}
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index 1058487a33d4..abc2bbd847b5 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,5 +1,5 @@
 DIST pa_stable_v190600_20161030.tgz 1450572 BLAKE2B 3cd63cca55ff222f452d306a1ab9035739545f48dbc9bc58196052cb51e518d86568059c7528533a6932c39c68d1a5210e06470a16343b92c7e4132b71cc552e SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
 DIST portaudio-19.06.00-audacity-portmixer.patch 8722 BLAKE2B 2b69bcf26e55be46d354dc44756fd03b16031fa86a334b776eb4326a4c64a7e22abd6bf60794847526102391c8e65813b41338cf94c647e3e9b68d82ea5dc5f5 SHA512 f693aef477b516c7a03eb021260cbecb23200422a927a117e3e59a1b4e6c6c2983fbea8ee3a3714ebc55728933654bd7909327a0bab4450ccf4e6a02c86a63b5
-EBUILD portaudio-19.06.00-r1.ebuild 1300 BLAKE2B 4306155bc45797c73ffddf3eb5b0e71d99b4d8184b1d3008fe07206c4aac2f3cae4933847b5c02ae82f4edac09bd5cbb5a0b7b8dee7fff2b5532f7fbbb797ef3 SHA512 6007702b517a2fb73dad8108d4336ef8bbf619dad98768b8b67b2d47d29a1728cbe5ae3b2e79466962d68ce3c7c3ceaa58504adbc9a79b73d3ea16a19ffd0497
+EBUILD portaudio-19.06.00-r1.ebuild 1299 BLAKE2B 65b2ccc4ac4352593fad8e42d7d5ff80b67f9e82f6f0b7f92434dfbaf55ce305fc8c190eccd26f6983b35e0b0c0ad63df7cbb1ece95d945f72804a4b71bc257e SHA512 3413bc83d334aa5092a0365f7e9cf69011736c450041e48f25604cbca2f69457fc91182339899ac964343ed705c51e7675a3b306308bd0f4a78c6c9d381e9d96
 EBUILD portaudio-19.06.00-r2.ebuild 1547 BLAKE2B 80c4c05d4039e408ab4ff6f7b331deecbf3c76f2cac2087e26cfae75d80444830310f214696c0c44db5d6eecdca8b9cb89554cbd95e2484a4bd10f4a3b1e4f50 SHA512 e3c4a4f27f3ef9837589b4825a12d55b039884c669564e2919410cba6d64fd25139c297295463185d6471d483adeaa34e6d15bd774ed3ec86b558336252b0868
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
index 0b4f1938c3a8..91a5125e11ac 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="alsa +cxx debug doc jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 30b487c5b493..8b2984f4ef1b 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -3,6 +3,6 @@ AUX simage-1.7.0-pkgconfig-partial.patch 467 BLAKE2B a2957c1d5fc6939df7ecb1bb157
 AUX simage-1.7.1-cmake-automagic-deps.patch 14873 BLAKE2B a65d862adea4d9f8064b0fccec538047820a134155489cb790d0eae095d7a078f4e4593bf56e532dc3ac03bfff7f0a20a2c81658adddde36faa24cb8fec6df94 SHA512 d80f999d57eddd6eea7b92bb421c2b9bf0f577cdffd0574afbfd2b9c1d25a9dea555d64587be8c96fea203486740ce563b35eaf35da16b6abb4f4b0707cc0916
 DIST Coin3D-simage-3bd369da8f08.tar.bz2 630229 BLAKE2B 6231dde891c07d8a4a37eebd5f89d9e445c048bf48d1718a5f1e2b12f488ad6c806edd04fd4eb30b5e041f978fbb65ea0b1d3b1263d7006bbda4568f4bef87c6 SHA512 61793a728c66dc4f427b1f853e0dcf38a71dced68814c8438e6653a4a1486d8066ce50a7c088d476cf796b4872c724687b3ca9d51ec0ed74f54d5d7e47c89b34
 DIST simage-1.7.0.tar.gz 752602 BLAKE2B feca31f8d41ae67271e43c9c664243d872985068ffc8496d43c9b59a47ae5c3067956acced3ff9abbdc5a360aec662e3972a93d8523a704a72ac9d12dd4cfaa0 SHA512 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f
-EBUILD simage-1.7.0-r1.ebuild 1824 BLAKE2B bcfb522e6e0036d1d357e4c5180949fb0c29141c19137e2f2018b7b588490cd676a98fea8552dd1f4db5166981b03586ba2b8d13186c4b5337fd437568802711 SHA512 b660387c2752af77fd04252ee3cc2270a44cbd11f893847a7e74a3eae65542395ddc5a0f3cf53a2c97000c6b097f066ebf1a275239d878dbcfc20c92e75f7aa2
-EBUILD simage-1.7.1a_beta_pre20180312.ebuild 1758 BLAKE2B 6235580fb576b72f1497843d266cff696d589abbe1e48f72a63a4ad2d5ef587289c3bb34aedbb1a8bd02621b5ecb838f429a75eb1d178fc3703a0e4007112219 SHA512 b90b684e4ecef03f88be837d004e0503fef28a2bac26981affc791da52f2a416a77df5d626a42646978104c4ee436e10ffd82056d2be3a7a693c68d82b76f5ad
+EBUILD simage-1.7.0-r1.ebuild 1774 BLAKE2B 672761903a9a91db1c92d6cd0248902b1c9c5612cc95bb8f7b543991672b9dfc761c29ea89f432f02c119170c8c7539830d00fa811dc06675ba19dd2d9cdb0d4 SHA512 609cdd06c38fab358d4f6aaa469dec35e14789a7ec2ab459f80f3065ca9341a9801d7c6e48490fd436d667f71dfda51396474f25fe4481dbadfca27928c3f394
+EBUILD simage-1.7.1a_beta_pre20180312.ebuild 1706 BLAKE2B e95c98f8416c56a04e844bf1ded6cd67b330918f814ad327d6f6659e435375f20c914e4823e75372a2a0e45be5330e1ef7f17a1d5fff928655541cdb41eb2527 SHA512 e0edd930cfad848030c36659cd880da8761a8dc42961912008edaeb7cba6121ac851dba1fd6b4d1c2d5179eabcefb202719ffcba9870b617c4697801ed471321
 MISC metadata.xml 298 BLAKE2B 312f7a48552438ce1231a58486f19aca02bbb281b72733645ffad42a3f82df778145bfc66a61c1216e47bd68e54668725fe08274482be7fb3997c99bf3089fdc SHA512 b72572413e5e40d55658049b4624de687dd1011553fc384deb0c837830b6f82d060b6356ad25e803f27d3be697b07a8c3fbc45932d20d89e4d9918ed6fecd84a
diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild
index 88bffba3a7b5..f491e59cb38b 100644
--- a/media-libs/simage/simage-1.7.0-r1.ebuild
+++ b/media-libs/simage/simage-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,13 +10,12 @@ SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz"
 LICENSE="public-domain mpeg2enc"
 KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
-IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib"
+IUSE="debug gif jpeg png sndfile static-libs tiff vorbis zlib"
 RESTRICT="mirror bindist" #465086
 
 RDEPEND="
 	gif? ( media-libs/giflib )
 	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/jasper )
 	png? ( media-libs/libpng:0= )
 	sndfile? ( media-libs/libsndfile )
 	tiff? ( media-libs/tiff:0= )
@@ -54,7 +53,7 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable debug symbols) \
 		$(use_with jpeg) \
-		$(use_with jpeg2k jasper) \
+		--without-jasper \
 		$(use_with png) \
 		$(use_with sndfile libsndfile) \
 		$(use_enable static-libs static) \
diff --git a/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild b/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild
index 01635618aef0..4ced5ba29613 100644
--- a/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild
+++ b/media-libs/simage/simage-1.7.1a_beta_pre20180312.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,12 +14,11 @@ SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.tar.bz2"
 LICENSE="public-domain mpeg2enc"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 SLOT="0"
-IUSE="debug gif jpeg jpeg2k png qt5 sndfile tiff vorbis"
+IUSE="debug gif jpeg png qt5 sndfile tiff vorbis"
 
 RDEPEND="
 	gif? ( media-libs/giflib )
 	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/jasper )
 	png? ( media-libs/libpng:0= )
 	qt5? (
 		dev-qt/qtcore:5
@@ -52,7 +51,7 @@ src_configure() {
 		-DSIMAGE_EPS_SUPPORT=ON
 		-DSIMAGE_GDIPLUS_SUPPORT=OFF # Windows only
 		-DSIMAGE_GIF_SUPPORT=$(usex gif)
-		-DSIMAGE_JASPER_SUPPORT=$(usex jpeg2k)
+		-DSIMAGE_JASPER_SUPPORT=OFF
 		-DSIMAGE_JPEG_SUPPORT=$(usex jpeg)
 		-DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile)
 		-DSIMAGE_MPEG2ENC_SUPPORT=ON
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index a3cc5dc282db..0cbacf20a82b 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,9 +1,11 @@
 AUX tiff-4.0.10-CVE-2018-17000-tif_dirwrite-null-dereference.patch 1301 BLAKE2B 0f4875ff1f4ae06c56018f6ecfe4ce7dc015f9cf77475f61e4b9c898afdfebbeda53ea1cef1d5a7a6237af77dcf8eaa4884ecf8fa9593f2513e84021b47efd02 SHA512 902a01411b8b45bb16757aa34b27cbac9f1f01981a169538b97f3a4cb47fb6597c753c0660182cf4f2cb8a7156049cdf93c5fa8b9c202e89d6cdb44204d94df1
+AUX tiff-4.0.10-CVE-2019-14973-fix-integer-overflow.patch 12754 BLAKE2B c2f6c8964b493e1d9965a95dea7463b1052809ec9fa529502f976ebe396195010b5cc132318c68b1e8f34695831006f5764ef7f40f42ead031b9263c83e7d395 SHA512 803dc0dfc139dac9e25163dc4b592a6158dfa076788840cbfd1abba85af6571e15cb7f6444d23abb70c738db835fb7412a9b200b2b3cea9ef5a86f4e2b97f9d0
 AUX tiff-4.0.10-CVE-2019-6128-pal2rgb-leak.patch 1427 BLAKE2B e2c392cd2bfe6f90dc510403d5cc1c383a8ee77e5ce2c1435acdbb9f9bb4c9010e85f19b9f2329f14fb82d0dab4cacdc2e6a5367ff95f940b5535eefd1b24903 SHA512 0a3103dae94b3362da1c5ebf087926ec82bf4e16ba7b5bc13e998fad1e9a970604dd80554f5b0a45d2d4f55a4b6e68dfb180b032f83b4b1335d011e25eb754b5
 AUX tiff-4.0.10-CVE-2019-7663-tiffcpIntegerOverflow.patch 1996 BLAKE2B 1e654cc81d66b050e17a1234016b103332dcfcf03f3d7670d35942efc56fbeff0d66d9b6cc71a059ff6602a7c7cef1a3644ae7ea4ca59e88e9004914bea1be32 SHA512 93d386c62d29715b7e84177c7caaba0a9e284f8b9c730db93cf8fbc76faab2e798c81aab20b1210f0342fa6651e56fcbd07655205957b06bf9236ed0903f00a4
 AUX tiff-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch 930 BLAKE2B 52d77fcdd773ce52232257da2c60f8b90417f102238df2039262e3afa7275908c74817ddd6958e430d7cfcff58d2d04ebd6ddd49f553f0f261883b67f557c599 SHA512 822ccc22304d23b4f50efe1f0fb7890fda8b9edf2075b8add814c0bac0a153fa0ed5d7ee5f47e23799b24f11678c8e0bf9c90ad59c5cc61fd9546b2dca4714a9
 AUX tiff-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch 924 BLAKE2B 03160ce33639620b1deb918d358f559b8bc6296d28530b440d0d770438453c25aecc393b8cfcc582ed2d0ec1decd557a212c91f43f7923c9e94387e235680021 SHA512 43973cc5512eb8fe2e0beab1a98ff0d3bd999ed1adbf7c08c344b3442559cc2cdc99a9f2e9c1bb2bffa4be027945b12b120fa27ec6c8006367932039b8d8dd37
 DIST tiff-4.0.10.tar.gz 2402867 BLAKE2B 0305453f22150c31d00d2de756736f58c49a288e19b2a66bdd01319ce4688742f6eab4009eaf1817125d41f53a23de17eb6265a3ebae458ec24f5dbb3d49764e SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8
 EBUILD tiff-4.0.10-r1.ebuild 2491 BLAKE2B f6be096bf9b99b9dd9626043df11d965e5282b87c6ae48098efa30a565604e16c21fa81a5723925ec8061b332b68fd0da43fb3782b59b446b739234ccfb929f1 SHA512 da78f5770d10676770ab31d8c5fe490a5ba41a49f9ba7db5da6f26f52be988125425168e8ff163692373d35df17f29ba7f1a1c16a12c0b4a750ead111eef840a
+EBUILD tiff-4.0.10-r2.ebuild 2368 BLAKE2B 0aa9495f391255146ea6834142f4030906dd33af9a5540e9eb7365f51c9207bae817cf481a009b83ca3a445d626bca1086f1f6d59e14061e3695b5b030ac0cbe SHA512 bb2735a0051540c8d69a0a0fa6ff98562732b76e8a068f4f4d7e623b5f2c939ec028b01463557b98a9db680a16d27fa6f011795f33ed3d6037d2ae7c06e5d43f
 EBUILD tiff-4.0.10.ebuild 2278 BLAKE2B 590019a51d49fe8486427702957bbf51680a69fc4e4158f74fdfde44bc85d7243ff1fbc08cec658287a742f14069a3c231df5d5388b7ad1db7940c3cc3d2cf3f SHA512 3d6285a44f2744091f2e321c96934986fbdfeb81eee94f340fa969a81f462c7c4a2658821827d317f2313319de079dc08217c2f3849701fba391845b1e09b2b1
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/files/tiff-4.0.10-CVE-2019-14973-fix-integer-overflow.patch b/media-libs/tiff/files/tiff-4.0.10-CVE-2019-14973-fix-integer-overflow.patch
new file mode 100644
index 000000000000..cbcbfd9d7f02
--- /dev/null
+++ b/media-libs/tiff/files/tiff-4.0.10-CVE-2019-14973-fix-integer-overflow.patch
@@ -0,0 +1,395 @@
+From 6ebfcac47224d3b8661c501967d495135449883e Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Sat, 10 Aug 2019 18:25:03 +0200
+Subject: [PATCH] Fix integer overflow in _TIFFCheckMalloc() and other
+ implementation-defined behaviour (CVE-2019-14973)
+
+_TIFFCheckMalloc()/_TIFFCheckRealloc() used a unsafe way to detect overflow
+in the multiplication of nmemb and elem_size (which are of type tmsize_t, thus
+signed), which was especially easily triggered on 32-bit builds (with recent
+enough compilers that assume that signed multiplication cannot overflow, since
+this is undefined behaviour by the C standard). The original issue which lead to
+this fix was trigged from tif_fax3.c
+
+There were also unsafe (implementation defied), and broken in practice on 64bit
+builds, ways of checking that a uint64 fits of a (signed) tmsize_t by doing
+(uint64)(tmsize_t)uint64_var != uint64_var comparisons. Those have no known
+at that time exploits, but are better to fix in a more bullet-proof way.
+Or similarly use of (int64)uint64_var <= 0.
+
+--- a/libtiff/tif_aux.c
++++ b/libtiff/tif_aux.c
+@@ -57,18 +57,57 @@ _TIFFMultiply64(TIFF* tif, uint64 first, uint64 second, const char* where)
+ 	return bytes;
+ }
+ 
++tmsize_t
++_TIFFMultiplySSize(TIFF* tif, tmsize_t first, tmsize_t second, const char* where)
++{
++    if( first <= 0 || second <= 0 )
++    {
++        if( tif != NULL && where != NULL )
++        {
++            TIFFErrorExt(tif->tif_clientdata, where,
++                        "Invalid argument to _TIFFMultiplySSize() in %s", where);
++        }
++        return 0;
++    }
++
++    if( first > TIFF_TMSIZE_T_MAX / second )
++    {
++        if( tif != NULL && where != NULL )
++        {
++            TIFFErrorExt(tif->tif_clientdata, where,
++                        "Integer overflow in %s", where);
++        }
++        return 0;
++    }
++    return first * second;
++}
++
++tmsize_t _TIFFCastUInt64ToSSize(TIFF* tif, uint64 val, const char* module)
++{
++    if( val > (uint64)TIFF_TMSIZE_T_MAX )
++    {
++        if( tif != NULL && module != NULL )
++        {
++            TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
++        }
++        return 0;
++    }
++    return (tmsize_t)val;
++}
++
+ void*
+ _TIFFCheckRealloc(TIFF* tif, void* buffer,
+ 		  tmsize_t nmemb, tmsize_t elem_size, const char* what)
+ {
+ 	void* cp = NULL;
+-	tmsize_t bytes = nmemb * elem_size;
+-
++        tmsize_t count = _TIFFMultiplySSize(tif, nmemb, elem_size, NULL);
+ 	/*
+-	 * XXX: Check for integer overflow.
++	 * Check for integer overflow.
+ 	 */
+-	if (nmemb && elem_size && bytes / elem_size == nmemb)
+-		cp = _TIFFrealloc(buffer, bytes);
++	if (count != 0)
++	{
++		cp = _TIFFrealloc(buffer, count);
++	}
+ 
+ 	if (cp == NULL) {
+ 		TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+--- a/libtiff/tif_getimage.c
++++ b/libtiff/tif_getimage.c
+@@ -755,9 +755,8 @@ gtTileSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
+ 	uint32 leftmost_tw;
+ 
+ 	tilesize = TIFFTileSize(tif);  
+-	bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,tilesize);
++	bufsize = _TIFFMultiplySSize(tif, alpha?4:3,tilesize, "gtTileSeparate");
+ 	if (bufsize == 0) {
+-		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtTileSeparate");
+ 		return (0);
+ 	}
+ 
+@@ -1019,9 +1018,8 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
+         uint16 colorchannels;
+ 
+ 	stripsize = TIFFStripSize(tif);  
+-	bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,stripsize);
++	bufsize = _TIFFMultiplySSize(tif,alpha?4:3,stripsize, "gtStripSeparate");
+ 	if (bufsize == 0) {
+-		TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtStripSeparate");
+ 		return (0);
+ 	}
+ 
+--- a/libtiff/tif_luv.c
++++ b/libtiff/tif_luv.c
+@@ -1264,16 +1264,10 @@ LogL16GuessDataFmt(TIFFDirectory *td)
+ 	return (SGILOGDATAFMT_UNKNOWN);
+ }
+ 
+-
+-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
+-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
+-
+ static tmsize_t
+ multiply_ms(tmsize_t m1, tmsize_t m2)
+ {
+-        if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 )
+-            return 0;
+-        return m1 * m2;
++        return _TIFFMultiplySSize(NULL, m1, m2, NULL);
+ }
+ 
+ static int
+--- a/libtiff/tif_pixarlog.c
++++ b/libtiff/tif_pixarlog.c
+@@ -634,15 +634,10 @@ PixarLogGuessDataFmt(TIFFDirectory *td)
+ 	return guess;
+ }
+ 
+-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
+-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
+-
+ static tmsize_t
+ multiply_ms(tmsize_t m1, tmsize_t m2)
+ {
+-        if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 )
+-            return 0;
+-        return m1 * m2;
++        return _TIFFMultiplySSize(NULL, m1, m2, NULL);
+ }
+ 
+ static tmsize_t
+--- a/libtiff/tif_read.c
++++ b/libtiff/tif_read.c
+@@ -29,9 +29,6 @@
+ #include "tiffiop.h"
+ #include <stdio.h>
+ 
+-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
+-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
+-
+ int TIFFFillStrip(TIFF* tif, uint32 strip);
+ int TIFFFillTile(TIFF* tif, uint32 tile);
+ static int TIFFStartStrip(TIFF* tif, uint32 strip);
+@@ -49,6 +46,8 @@ TIFFReadRawTile1(TIFF* tif, uint32 tile, void* buf, tmsize_t size, const char* m
+ #define THRESHOLD_MULTIPLIER 10
+ #define MAX_THRESHOLD (THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * INITIAL_THRESHOLD)
+ 
++#define TIFF_INT64_MAX ((((int64)0x7FFFFFFF) << 32) | 0xFFFFFFFF)
++
+ /* Read 'size' bytes in tif_rawdata buffer starting at offset 'rawdata_offset'
+  * Returns 1 in case of success, 0 otherwise. */
+ static int TIFFReadAndRealloc( TIFF* tif, tmsize_t size,
+@@ -734,23 +733,8 @@ TIFFReadRawStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size)
+ 		return ((tmsize_t)(-1));
+ 	}
+ 	bytecount = td->td_stripbytecount[strip];
+-	if ((int64)bytecount <= 0) {
+-#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
+-		TIFFErrorExt(tif->tif_clientdata, module,
+-			     "%I64u: Invalid strip byte count, strip %lu",
+-			     (unsigned __int64) bytecount,
+-			     (unsigned long) strip);
+-#else
+-		TIFFErrorExt(tif->tif_clientdata, module,
+-			     "%llu: Invalid strip byte count, strip %lu",
+-			     (unsigned long long) bytecount,
+-			     (unsigned long) strip);
+-#endif
+-		return ((tmsize_t)(-1));
+-	}
+-	bytecountm = (tmsize_t)bytecount;
+-	if ((uint64)bytecountm!=bytecount) {
+-		TIFFErrorExt(tif->tif_clientdata, module, "Integer overflow");
++        bytecountm = _TIFFCastUInt64ToSSize(tif, bytecount, module);
++	if (bytecountm == 0) {
+ 		return ((tmsize_t)(-1));
+ 	}
+ 	if (size != (tmsize_t)(-1) && size < bytecountm)
+@@ -774,7 +758,7 @@ TIFFFillStrip(TIFF* tif, uint32 strip)
+ 	if ((tif->tif_flags&TIFF_NOREADRAW)==0)
+ 	{
+ 		uint64 bytecount = td->td_stripbytecount[strip];
+-		if ((int64)bytecount <= 0) {
++		if( bytecount == 0 || bytecount > (uint64)TIFF_INT64_MAX ) {
+ #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
+ 			TIFFErrorExt(tif->tif_clientdata, module,
+ 				"Invalid strip byte count %I64u, strip %lu",
+@@ -801,7 +785,7 @@ TIFFFillStrip(TIFF* tif, uint32 strip)
+ 			    (bytecount - 4096) / 10 > (uint64)stripsize  )
+ 			{
+ 				uint64 newbytecount = (uint64)stripsize * 10 + 4096;
+-				if( (int64)newbytecount >= 0 )
++				if( newbytecount == 0 || newbytecount > (uint64)TIFF_INT64_MAX )
+ 				{
+ #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
+ 					TIFFWarningExt(tif->tif_clientdata, module,
+@@ -1196,10 +1180,8 @@ TIFFReadRawTile(TIFF* tif, uint32 tile, void* buf, tmsize_t size)
+ 	bytecount64 = td->td_stripbytecount[tile];
+ 	if (size != (tmsize_t)(-1) && (uint64)size < bytecount64)
+ 		bytecount64 = (uint64)size;
+-	bytecountm = (tmsize_t)bytecount64;
+-	if ((uint64)bytecountm!=bytecount64)
+-	{
+-		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
++	bytecountm = _TIFFCastUInt64ToSSize(tif, bytecount64, module);
++        if( bytecountm == 0 ) {
+ 		return ((tmsize_t)(-1));
+ 	}
+ 	return (TIFFReadRawTile1(tif, tile, buf, bytecountm, module));
+@@ -1221,7 +1203,7 @@ TIFFFillTile(TIFF* tif, uint32 tile)
+ 	if ((tif->tif_flags&TIFF_NOREADRAW)==0)
+ 	{
+ 		uint64 bytecount = td->td_stripbytecount[tile];
+-		if ((int64)bytecount <= 0) {
++		if( bytecount == 0 || bytecount > (uint64)TIFF_INT64_MAX ) {
+ #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
+ 			TIFFErrorExt(tif->tif_clientdata, module,
+ 				"%I64u: Invalid tile byte count, tile %lu",
+@@ -1248,7 +1230,7 @@ TIFFFillTile(TIFF* tif, uint32 tile)
+ 			    (bytecount - 4096) / 10 > (uint64)stripsize  )
+ 			{
+ 				uint64 newbytecount = (uint64)stripsize * 10 + 4096;
+-				if( (int64)newbytecount >= 0 )
++				if( newbytecount == 0 || newbytecount > (uint64)TIFF_INT64_MAX )
+ 				{
+ #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
+ 					TIFFWarningExt(tif->tif_clientdata, module,
+--- a/libtiff/tif_strip.c
++++ b/libtiff/tif_strip.c
+@@ -129,15 +129,8 @@ TIFFVStripSize(TIFF* tif, uint32 nrows)
+ {
+ 	static const char module[] = "TIFFVStripSize";
+ 	uint64 m;
+-	tmsize_t n;
+ 	m=TIFFVStripSize64(tif,nrows);
+-	n=(tmsize_t)m;
+-	if ((uint64)n!=m)
+-	{
+-		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
+-		n=0;
+-	}
+-	return(n);
++        return _TIFFCastUInt64ToSSize(tif, m, module);
+ }
+ 
+ /*
+@@ -211,15 +204,8 @@ TIFFStripSize(TIFF* tif)
+ {
+ 	static const char module[] = "TIFFStripSize";
+ 	uint64 m;
+-	tmsize_t n;
+ 	m=TIFFStripSize64(tif);
+-	n=(tmsize_t)m;
+-	if ((uint64)n!=m)
+-	{
+-		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
+-		n=0;
+-	}
+-	return(n);
++	return _TIFFCastUInt64ToSSize(tif, m, module);
+ }
+ 
+ /*
+@@ -330,14 +316,8 @@ TIFFScanlineSize(TIFF* tif)
+ {
+ 	static const char module[] = "TIFFScanlineSize";
+ 	uint64 m;
+-	tmsize_t n;
+ 	m=TIFFScanlineSize64(tif);
+-	n=(tmsize_t)m;
+-	if ((uint64)n!=m) {
+-		TIFFErrorExt(tif->tif_clientdata,module,"Integer arithmetic overflow");
+-		n=0;
+-	}
+-	return(n);
++	return _TIFFCastUInt64ToSSize(tif, m, module);
+ }
+ 
+ /*
+@@ -366,15 +346,8 @@ TIFFRasterScanlineSize(TIFF* tif)
+ {
+ 	static const char module[] = "TIFFRasterScanlineSize";
+ 	uint64 m;
+-	tmsize_t n;
+ 	m=TIFFRasterScanlineSize64(tif);
+-	n=(tmsize_t)m;
+-	if ((uint64)n!=m)
+-	{
+-		TIFFErrorExt(tif->tif_clientdata,module,"Integer arithmetic overflow");
+-		n=0;
+-	}
+-	return(n);
++	return _TIFFCastUInt64ToSSize(tif, m, module);
+ }
+ 
+ /* vim: set ts=8 sts=8 sw=8 noet: */
+--- a/libtiff/tif_tile.c
++++ b/libtiff/tif_tile.c
+@@ -181,15 +181,8 @@ TIFFTileRowSize(TIFF* tif)
+ {
+ 	static const char module[] = "TIFFTileRowSize";
+ 	uint64 m;
+-	tmsize_t n;
+ 	m=TIFFTileRowSize64(tif);
+-	n=(tmsize_t)m;
+-	if ((uint64)n!=m)
+-	{
+-		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
+-		n=0;
+-	}
+-	return(n);
++	return _TIFFCastUInt64ToSSize(tif, m, module);
+ }
+ 
+ /*
+@@ -248,15 +241,8 @@ TIFFVTileSize(TIFF* tif, uint32 nrows)
+ {
+ 	static const char module[] = "TIFFVTileSize";
+ 	uint64 m;
+-	tmsize_t n;
+ 	m=TIFFVTileSize64(tif,nrows);
+-	n=(tmsize_t)m;
+-	if ((uint64)n!=m)
+-	{
+-		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
+-		n=0;
+-	}
+-	return(n);
++	return _TIFFCastUInt64ToSSize(tif, m, module);
+ }
+ 
+ /*
+@@ -272,15 +258,8 @@ TIFFTileSize(TIFF* tif)
+ {
+ 	static const char module[] = "TIFFTileSize";
+ 	uint64 m;
+-	tmsize_t n;
+ 	m=TIFFTileSize64(tif);
+-	n=(tmsize_t)m;
+-	if ((uint64)n!=m)
+-	{
+-		TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
+-		n=0;
+-	}
+-	return(n);
++	return _TIFFCastUInt64ToSSize(tif, m, module);
+ }
+ 
+ /*
+--- a/libtiff/tiffiop.h
++++ b/libtiff/tiffiop.h
+@@ -77,6 +77,9 @@ extern int snprintf(char* str, size_t size, const char* format, ...);
+ #define	FALSE	0
+ #endif
+ 
++#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
++#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
++
+ typedef struct client_info {
+     struct client_info *next;
+     void *data;
+@@ -258,7 +261,7 @@ struct tiff {
+ #define TIFFhowmany8_64(x) (((x)&0x07)?((uint64)(x)>>3)+1:(uint64)(x)>>3)
+ #define TIFFroundup_64(x, y) (TIFFhowmany_64(x,y)*(y))
+ 
+-/* Safe multiply which returns zero if there is an integer overflow */
++/* Safe multiply which returns zero if there is an *unsigned* integer overflow. This macro is not safe for *signed* integer types */
+ #define TIFFSafeMultiply(t,v,m) ((((t)(m) != (t)0) && (((t)(((v)*(m))/(m))) == (t)(v))) ? (t)((v)*(m)) : (t)0)
+ 
+ #define TIFFmax(A,B) ((A)>(B)?(A):(B))
+@@ -368,6 +371,8 @@ extern TIFFErrorHandlerExt _TIFFerrorHandlerExt;
+ 
+ extern uint32 _TIFFMultiply32(TIFF*, uint32, uint32, const char*);
+ extern uint64 _TIFFMultiply64(TIFF*, uint64, uint64, const char*);
++extern tmsize_t _TIFFMultiplySSize(TIFF*, tmsize_t, tmsize_t, const char*);
++extern tmsize_t _TIFFCastUInt64ToSSize(TIFF*, uint64, const char*);
+ extern void* _TIFFCheckMalloc(TIFF*, tmsize_t, tmsize_t, const char*);
+ extern void* _TIFFCheckRealloc(TIFF*, void*, tmsize_t, tmsize_t, const char*);
+ 
diff --git a/media-libs/tiff/tiff-4.0.10-r2.ebuild b/media-libs/tiff/tiff-4.0.10-r2.ebuild
new file mode 100644
index 000000000000..9f1174ee30f8
--- /dev/null
+++ b/media-libs/tiff/tiff-4.0.10-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib-minimal
+
+DESCRIPTION="Tag Image File Format (TIFF) library"
+HOMEPAGE="http://libtiff.maptools.org"
+SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
+
+LICENSE="libtiff"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
+
+RDEPEND="
+	jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="test? ( jpeg )" #483132
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.10-CVE-2018-17000-tif_dirwrite-null-dereference.patch
+	"${FILESDIR}"/${PN}-4.0.10-CVE-2019-6128-pal2rgb-leak.patch
+	"${FILESDIR}"/${PN}-4.0.10-CVE-2019-7663-tiffcpIntegerOverflow.patch
+	"${FILESDIR}"/${P}-CVE-2019-14973-fix-integer-overflow.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/tiffconf.h
+)
+
+src_prepare() {
+	default
+
+	# tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
+	sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--without-x
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable cxx)
+		$(use_enable jbig)
+		$(use_enable jpeg)
+		$(use_enable lzma)
+		$(use_enable static-libs static)
+		$(use_enable webp)
+		$(use_enable zlib)
+		$(use_enable zstd)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	# remove useless subdirs
+	if ! multilib_is_native_abi ; then
+		sed -i \
+			-e 's/ tools//' \
+			-e 's/ contrib//' \
+			-e 's/ man//' \
+			-e 's/ html//' \
+			Makefile || die
+	fi
+}
+
+multilib_src_test() {
+	if ! multilib_is_native_abi ; then
+		emake -C tools
+	fi
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
+}
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 4d5b6895271e..2d8329a310d9 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,4 +1,6 @@
 DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
+DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
 EBUILD x264-0.0.20190214.ebuild 1815 BLAKE2B ef9a8e82e7859922afc7f496a7a70b5ebdd01442bd11b5990b14b6a5384faf87123529398ed8bdc21f1685eed839aeb5cbd4ad9614c6073d0dd0e0f04651d9b1 SHA512 9d1e2c6ae46dd73d71929e1d46eea7f8e63517653b17aa3d88b884cd59a1b3fb1646560363e52c517eaf33afc11ca9f6b36d094162259faea8b2aee94bbf8f58
+EBUILD x264-0.0.20190903.ebuild 1824 BLAKE2B dc38712d74f047f47b84e99ad9f2c78c5d452fbc7dd8e503d0f74136559fe5e5b3e858a7edb1dc7210e46935d1af02fd0966b984cd2dcfc8ad20c8c1d6cc5286 SHA512 8b4d908028140b4b592e556a338abbe92143b80381008e34b9a2e822e009537c22a2544d36b9ab5cf1bcbc5d33ad329cf6353c099201cd3365bde9258f6a4cd4
 EBUILD x264-9999.ebuild 1824 BLAKE2B dc38712d74f047f47b84e99ad9f2c78c5d452fbc7dd8e503d0f74136559fe5e5b3e858a7edb1dc7210e46935d1af02fd0966b984cd2dcfc8ad20c8c1d6cc5286 SHA512 8b4d908028140b4b592e556a338abbe92143b80381008e34b9a2e822e009537c22a2544d36b9ab5cf1bcbc5d33ad329cf6353c099201cd3365bde9258f6a4cd4
 MISC metadata.xml 488 BLAKE2B 3e6982e1bbd45194bb664ddb4b34e307ef4030f4fba9905d0a292c8a5ce73e27bc1c687758cc4fb18d38cc2c93ed21b64dfa35b2aaa63dc6fbd1110b9e1daf1f SHA512 2dc9d360de31770d2e8eebc3bab9662a00ad328ba41380052c3e7502a4da85c7b0ce29cf229670d917c93d7b508282dd9f1694a718da65f1110c785a2bc68394
diff --git a/media-libs/x264/x264-0.0.20190903.ebuild b/media-libs/x264/x264-0.0.20190903.ebuild
new file mode 100644
index 000000000000..ee5e6ace2cd2
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20190903.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="A free library for encoding X264/AVC streams"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
+else
+	MY_P="x264-snapshot-$(ver_cut 3)-2245"
+	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+SLOT="0/157" # SONAME
+
+LICENSE="GPL-2"
+IUSE="altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
+
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="abi_x86_32? ( ${ASM_DEP} )
+	abi_x86_64? ( ${ASM_DEP} )
+	opencl? ( dev-lang/perl )"
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
+
+DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
+
+multilib_src_configure() {
+	tc-export CC
+	local asm_conf=""
+
+	if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !altivec ; }; then
+		asm_conf=" --disable-asm"
+	fi
+
+	"${S}/configure" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-cli \
+		--disable-avs \
+		--disable-lavf \
+		--disable-swscale \
+		--disable-ffms \
+		--disable-gpac \
+		--enable-pic \
+		--enable-shared \
+		--host="${CHOST}" \
+		$(usex interlaced "" "--disable-interlaced") \
+		$(usex opencl "" "--disable-opencl") \
+		$(usex static-libs "--enable-static" "") \
+		$(usex threads "" "--disable-thread") \
+		${asm_conf} || die
+}
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 49fb22b37db7..3e512c821843 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -6,10 +6,12 @@ AUX x265-2.9-detect512.patch 374 BLAKE2B 7123069c19e85ac5953434eb6c4a80135e60178
 DIST x265_2.8.tar.gz 1379551 BLAKE2B c124864a08492739cdde89e44d72c84ad94a0b236d2c59d995e53a26d1a5fb9ec1557a03640a3065a727be69bfb0c0633b50351dc875c9706a1550f488c8ee24 SHA512 c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714
 DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805939fc3a049911ebae459eee097349f074dcd224bef97d6140dbc37ee9bd3db54c5473b158e135784d2179 SHA512 270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3
 DIST x265_3.0.tar.gz 1398519 BLAKE2B e3ac28b01e89ce8a428f294c759644a8177e1b79941aba5e1b53033c236e3445f9afeea96f8adf7e5cdcfff8c790ca9fcadcc8b2de6c31ba3fe9ba87321a8ca8 SHA512 bb7665194ddd4bccbb91c16337463ad4ef32111a1e7779e4cc16964df0992aa99e578cb74fef0edbf41119105e4085574247f60541b0558cc36730ea12d2c6ba
+DIST x265_3.1.2.tar.gz 1419864 BLAKE2B 1eeb210e58d6977f9a048b84e924d690868aa350b6e736f577b5c1a62b9c5b71cfb2b03f004f26839ea44b9db871313bc9888af95999a576dcc167e79d297c61 SHA512 00fc2d8460657c0d2edcc54fd8c4521785c632f8811b74d0cd0a3efa0f06f1fb8cdd6233ad4917c1f40b3c1f1660a6c97ad947e656b7c3e9a51f8ae84afef65a
 DIST x265_3.1.tar.gz 1419649 BLAKE2B b9151f136fdc6c0512f481af6c8d4d575ce4c75ef8891b42ca24ddfd1f4802bfe8cd47bb07dfc1834243560a8d36ddd5ca4d79d7b9f140fbd411b5b80ea6b8d4 SHA512 81905b6286a61fada7cb1632d7f8461295a28e8d53ccd53d3c26c60c7d8091df47a1b694de28caa721f632d66940f5ceeb44d3405dc3b079edd17d21c30e7a7d
 EBUILD x265-2.8.ebuild 5680 BLAKE2B 0ee62251a5dc184a5cda01be4d0c779e5101b3f90f1d9a5921c5ba300798fac1acb298e7066d715d6923ce4505292ebafdf005b04745b1e3f615f0d8319fd3a3 SHA512 9e75cf8f636fa69550739f0fa56cb94b564a257d97f776df22e9c90a79adbf3ebcf86a0a62e3cec9e672caeb6798e1ffa639d15edd293b7f2e068fdfb3ac8d98
 EBUILD x265-2.9.ebuild 5699 BLAKE2B 7ee30b5f06d51afdebf6ee278eb0e7ca8908fc703e2fcdb80c0b7095d9ae9edd83393e61c699343a53bc0d0786f1e558431e826a281d8ebd943ae5825e6bfb20 SHA512 cf9da7ce4f15df6afd31915869f426bde0306a381d8a7f1fb05987ccf2a618123d361c553d24d28681382022223e8775342cb575e387df87c28a327c5237f0d6
 EBUILD x265-3.0.ebuild 5657 BLAKE2B eb173bf8779ed016deb3f86abdcf9c9aaa1b82e36676f82f730928f66dc0861ad6e2ada815b9269643ce8f3384429271ebe08bac82720b1cb06304de891c4fa6 SHA512 939fb4ec038b6ce4c226a0ca3e58650a9891d9b1a06f15b5276c649773454d1265c115816b3a98ab894a17363b107407e8fda71004e3f4f408e7a69062292c61
+EBUILD x265-3.1.2.ebuild 5658 BLAKE2B e5e0a591c1e9898bf5b63856b06b6d8798f48e9a8dda35d2d5c9765282496f423488277f6a7cb7daac0836a5ef89e5beb284dc3c793d76be9722bd6538207d34 SHA512 29ccdbc5900a9aede013a39c81f7c7f3a7ddcf7aa8ae619df08e69a112b4df93ae7682eeb39344751bc3504afe4f9a1a9c5934b689e3e736001cb8249d0d8bf8
 EBUILD x265-3.1.ebuild 5658 BLAKE2B e5e0a591c1e9898bf5b63856b06b6d8798f48e9a8dda35d2d5c9765282496f423488277f6a7cb7daac0836a5ef89e5beb284dc3c793d76be9722bd6538207d34 SHA512 29ccdbc5900a9aede013a39c81f7c7f3a7ddcf7aa8ae619df08e69a112b4df93ae7682eeb39344751bc3504afe4f9a1a9c5934b689e3e736001cb8249d0d8bf8
 EBUILD x265-9999.ebuild 5658 BLAKE2B e5e0a591c1e9898bf5b63856b06b6d8798f48e9a8dda35d2d5c9765282496f423488277f6a7cb7daac0836a5ef89e5beb284dc3c793d76be9722bd6538207d34 SHA512 29ccdbc5900a9aede013a39c81f7c7f3a7ddcf7aa8ae619df08e69a112b4df93ae7682eeb39344751bc3504afe4f9a1a9c5934b689e3e736001cb8249d0d8bf8
 MISC metadata.xml 703 BLAKE2B c71ecd74be6e4fcdf70dcdc197e6830875f6cae0b1ee4e96b0edc4b16db4e512b2b8e8962fa75c7f4f380d74ff713158fd6124d4a22229b3c213c197124a59c6 SHA512 b9f2ac6ed88fce31fa7459321cc7cc2114caee48066b0ae1773a8711f2d652370d154a6167d8c8eb0dc47f55ca211812b99d11c4a1941a3a2553c62a6f21abf6
diff --git a/media-libs/x265/x265-3.1.2.ebuild b/media-libs/x265/x265-3.1.2.ebuild
new file mode 100644
index 000000000000..599c13412516
--- /dev/null
+++ b/media-libs/x265/x265-3.1.2.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+	SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/"
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/176"
+IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+
+ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	abi_x86_32? ( ${ASM_DEPEND} )
+	abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}/arm.patch"
+	"${FILESDIR}/neon.patch"
+	"${FILESDIR}/ppc64.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		mercurial_src_unpack
+		# Can't set it at global scope due to mercurial.eclass limitations...
+		export S=${WORKDIR}/${P}/source
+	else
+		unpack ${A}
+		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
+	fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+	local variants=""
+	use 12bit && variants+="main12 "
+	use 10bit && variants+="main10 "
+	variants+="main"
+	echo "${variants}"
+}
+
+x265_variant_src_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	local mycmakeargs=( "${myabicmakeargs[@]}" )
+	case "${MULTIBUILD_VARIANT}" in
+		"main12")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+				-DMAIN12=ON
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = ppc64 ]] ; then
+				# https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+			fi
+			;;
+		"main10")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = ppc64 ]] ; then
+				# https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+			fi
+			;;
+		"main")
+			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+				local liblist=""
+				for v in "${myvariants[@]}" ; do
+					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
+					liblist+="libx265_${v}.a;"
+				done
+				mycmakeargs+=(
+					-DEXTRA_LIB="${liblist}"
+					-DEXTRA_LINK_FLAGS=-L.
+					-DLINKED_10BIT=$(usex 10bit)
+					-DLINKED_12BIT=$(usex 12bit)
+				)
+			fi
+			;;
+		*)
+			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+	esac
+	cmake-utils_src_configure
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	append-cflags -fPIC
+	append-cxxflags -fPIC
+	local myabicmakeargs=(
+		$(cmake-utils_use_enable test TESTS)
+		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+		-DENABLE_LIBNUMA=$(usex numa ON OFF)
+		-DCPU_POWER8=$(usex power8 ON OFF)
+		-DENABLE_ALTIVEC=$(usex power8 ON OFF)
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	if [[ ${ABI} = x86 ]] ; then
+		# Bug #528202
+		if use pic ; then
+			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+		fi
+	elif [[ ${ABI} = x32 ]] ; then
+		# bug #510890
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	elif [[ ${ABI} = arm ]] ; then
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+		use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+	fi
+
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+x265_variant_src_test() {
+	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly."
+		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+		einfo "Skipping tests."
+	fi
+}
+
+multilib_src_test() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+	# Install only "main" variant since the others are already linked into it.
+	local MULTIBUILD_VARIANTS=( "main" )
+	multibuild_foreach_variant cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	dodoc -r "${S}/../doc/"*
+}
diff --git a/media-libs/zita-convolver/Manifest b/media-libs/zita-convolver/Manifest
index 8db9b9547c9d..79d3f2876f7a 100644
--- a/media-libs/zita-convolver/Manifest
+++ b/media-libs/zita-convolver/Manifest
@@ -6,5 +6,5 @@ DIST zita-convolver-3.1.0.tar.bz2 21485 BLAKE2B 7976bac136bef04091b76b55fd4afd5a
 DIST zita-convolver-4.0.3.tar.bz2 19591 BLAKE2B 3bd77cbc46d93c2200329451634dc48b94183aaa17034aa4b3dd03c33ad7982e9bed85e164f5c0e34666a1a6443199afe24222d41477368c4b366335e9767b91 SHA512 62d7841757f10c094e43ed755e187f947c5743f302ed2a1ee6064a850c18921466f4505d8a2a7b3ad23619db7f1ad7307e1dfb2e8a1e7685e60ece2ffff4f6ca
 EBUILD zita-convolver-2.0.0-r1.ebuild 958 BLAKE2B 29d71ecce58a60f5ccd52484fdaa6908a7bd0c65f5bb6e6c4b817f713fc49238847e43483e9e614141795626f8d64c0903e22e8cb1934e0cbab299d580cb8d00 SHA512 9a5d86ff5ebac7b440541e5d314c7ee0a87bc17c3a9b2f9c5b454203064cf15d0b4bedac91b1d50211285536391c866bf648f2f4f753557c5aa91ec49b74cbb4
 EBUILD zita-convolver-3.1.0.ebuild 1004 BLAKE2B 323f97cf35298f0803d54ca880f1ea9579d7ecd5bc5ce691f211188d0ce6405490f24a900c2038f4e6b1a1678e4c592c70965270f7678c2dd739f52331f6c8bf SHA512 8a56f6073c521e046299cb73b9fb6a91e8f4588e7f2b2d55160be83c4f55a09733c86ab847e111d794bc4d960e89e2dc608f206619b972bd9115f0ff72e0e525
-EBUILD zita-convolver-4.0.3.ebuild 742 BLAKE2B 110b973c34b9d47d279d17c08edfa4bb8f6c210824340a9ab4bb74df4d0342fe7ffbcfac0b8068b4aa246564442770a397fecff18ce56de791b7636b1c88faec SHA512 bd0b38930d33cb29b69094e12645a4e680e1c4a9566b6d5f9f510494f0711c12c1d7f5f44e9fa426259cefca9cb2f3a07186a0df1942b61265fc032804ca086e
+EBUILD zita-convolver-4.0.3.ebuild 740 BLAKE2B f4d6f1d4c70924dc799d3d7891b95bf8c2aa7330b7a998f57997140b0e172ba863a34a9a98c3be6c7761d975457fec35c0186f24635d2b333cf0dcfedb7e18b5 SHA512 b6788a671a26e322dd205996fb0d211e4e9e139167d93008224dd8c4291641dfca490983c45610b94119a0f4bc9c446ae607d42c23456e7954a977676c4a5bf0
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild b/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild
index 000640840e9c..391c6bbf3478 100644
--- a/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild
+++ b/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0/4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="sci-libs/fftw:3.0="
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 943e9f1dea05..9940218985c7 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index bf210abcef01..2d873cdbe3a0 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -9,7 +9,7 @@ DIST alsa-plugins-1.1.8.tar.bz2 375346 BLAKE2B 65c161ee375e7aed85dbe918a39bc2aa4
 DIST alsa-plugins-1.1.9.tar.bz2 406127 BLAKE2B 10bf3e96289a88edabfa3018d33ab4666982fe409eb41c486e6b9eee0dde87e926f3241c31e240b3bab114c8ab2c6d6bab92dd6192bceb467a01fcb6adc44b8e SHA512 1969dfe8f2bb4283e81a18da73d2f7f86d8788d1a8764d7195b4830b2f4704c208eacb50a1e26e20c9fe57e7d5bb06a004112d84cc86b4682b4180d2fec4d5d9
 EBUILD alsa-plugins-1.1.1-r1.ebuild 2698 BLAKE2B 3fac1377af069760efcc93fe6daa55a3d821742e7ffd5c0976dc0f3a066151ff087d20a65803aa59f253f27f8077d20345da879f92fd3dc28398440e31b3d148 SHA512 9df4f03ae71fe97423bdb37cd28755873a915f210ce92f5f394e15bcecd6662f321acff20b9f212fdb06b63337a7f58d2fb25a6c18eac2be3c5820bc21394860
 EBUILD alsa-plugins-1.1.6.ebuild 2870 BLAKE2B 4dbfa2bf67ebcaf0102e3e000965acb1a7ddebd9a4cc2071c6e40046d5d2f40c0a9939b55559563880c384620ab4b49d8c5fa54bf795d7edc4ad373d94919034 SHA512 4ee600a04dc60852a8a05948434c53e72c500773bf0ef9b569125787e32f934723588bffea4dea1500aad4a2e974c77cd6e5d63110244154aa23b2d8b53556f8
-EBUILD alsa-plugins-1.1.8.ebuild 2815 BLAKE2B 546f3205d96e8092cbed55c4d714a95655c30d7b44240a04d1a10d904fb73819385209501fc18c5b41d62a0f15b5f03d9c5c0566ca8ebf1866964cd7abee8753 SHA512 94a5a351db83cfc28830f01ad0014b423e87980e2768f2c3fc37c6665b36e451dab946769cdf77bd30c56dddf73277075a77d9c931abc1f9ce19365c632cfcea
+EBUILD alsa-plugins-1.1.8.ebuild 2813 BLAKE2B f28fcb8e2c41d7ba7e9a6da1d80fd0213749df1953895cd7eb23a5a8bc01cd2f38015e9ef0c3d1116214fc92e3531a7024e5f5d2bb08fa8baac9d79313dba041 SHA512 e49546ff0c2ac87531d67121f700bb8188b91a5cd2bd2aa4413c40ce97f64fd2b06a7c63c4cf2db340bbc4f4306820a656b063dc842a6e434008bb04e22c489f
 EBUILD alsa-plugins-1.1.9-r1.ebuild 3047 BLAKE2B 4135cf5a6aa0fb97e3599e3df3aeffe1773ecfd5c7ca0508af6f98bc383cc0da22405610c4ea5af836e4380d298ae97a0403c619ae546ad8529e8d00b8fd6956 SHA512 5faa9b98b87a54c530c943faea4f2ef0f994141c5e6c784b8af0ef4806e88ad18bcf0ebb8ac4b02fe2a5e62f47b1ded3ab5f74539287fe36cb5aefdd3437620e
 EBUILD alsa-plugins-1.1.9.ebuild 2921 BLAKE2B 082e1bb7fdfdac8ea826cabd171eeaf25445dc9b9520527b479357440ea4b9b29690e835fb6b097e23f3fc415cfbd5dd2e53ffb98233e49b853be8f3d8e1dcf6 SHA512 8c6413bc5e31b14a9fc2b44974b8a3587db8626ce2ef5287b2add5fc1bcc1c4dff18a48ed6eaff67ee9668cddb5e22164c74d85217fa39e18c94c74754adadb6
 MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.8.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.8.ebuild
index c7ae1efcfda6..dbf6c097e522 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.8.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux"
 IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
 
 RDEPEND="
diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index b51b2aa2fc81..ed2019b69cc6 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -1,4 +1,6 @@
 AUX 0.3.8-meson-goa.patch 2086 BLAKE2B 82bcd7de7d96caeed6f5448e36666acbb3870e4e8361c8890a73e031cb241261b98d8c97a3caf45187d2a7deebdf712a5447ccb29f96509a256eff8b5c257b6a SHA512 b5a6942092b32c91518e6142e7b0fbb46994eaa0f03eb83b0fbb561bf1ee27d435c1f0982cb036700fcff04bab27cf1080cb068bfdce44eeb6238f4f642c486d
 DIST grilo-plugins-0.3.8.tar.xz 1408952 BLAKE2B 3375275189a25289406b5d9fd6dd42b6c0ad92779b081ce2f480b464929302af7b52fc758f2f6277c94fad38a2b0bbfc8fe9fd668ff98fc0ac7fbeda69a5ac42 SHA512 c5a0a80fd7c871ce69a06bdcab2b3d8986708e4e6b9c9020d7e938d4450655f962db7f84da0b40ed38ba197f65fc2a561e06a92cdca593620d66c2b153eb4879
+DIST grilo-plugins-0.3.9.tar.xz 1418148 BLAKE2B 438aac490f2e099c40f5df15d8b3958dc29c4344e4846a3ff452561f60bf041fe2975b6c67b634f5f54721fd69e53f86c5008eadb3a402cbc8b479e805ab8221 SHA512 4700b08cab53afe0899edf7859a2e18608f6ed2016a9139694e8f1eb628c5b7318b04fe1633406fd1685a8dd54d1632b886352eac3192d52a1c1a1ac55896479
 EBUILD grilo-plugins-0.3.8.ebuild 2983 BLAKE2B e6981ac32540f0b919e4d256e1695c3752e65c32a5b1c42efc4720cc9243b5f6b54d444a61950defa5b8cf4f5138b060b635b80988c60140184d4c07c7fdc0c6 SHA512 2b65bbdaa3c4fb2fedf3cb22144d5979b7b47a561574919341388ab1eecbf568eddf3eaa0f226df17fda8361f9fa83a553dce273930d8f4f7c2d148e09eade0d
+EBUILD grilo-plugins-0.3.9.ebuild 2996 BLAKE2B 9c6192b4c8d3e50ecbd8b6b75631fec937e7fa516fe010fc3845caa8d789eea6a0627f6392e977e2142813377b620b2fd35a72c680f1c2cb721d712e15fbf5a6 SHA512 acbda6891b9605fa29743f506514e400abb909a463af5868ff1f02c8469a3ae8b6bcfa6b870894334e04ed048272cb693c984d25881a2ce1baf312fc9ca64f5b
 MISC metadata.xml 920 BLAKE2B c6119dc73ede7e500e3113f03677f81d65d4a2a524e84847f010e6c9215b96feed5fcaf400166471c25075742268cbe7639e23cd11447e0e795146b29dec797e SHA512 322b01e064c5656e9d9c7e2343d7feb76f35bd9ea6e5174ce3702747e5c4dd5de9ab60e9c91d72db171ad62a90f84eedcc03b3547ef7bc8e231090c7eaef9ac7
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.9.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.9.ebuild
new file mode 100644
index 000000000000..b5e655269161
--- /dev/null
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.9.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=( python{2_7,3_5,3_6,3_7} )
+
+inherit gnome.org meson xdg
+
+DESCRIPTION="A collection of plugins for the Grilo framework"
+HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb tracker upnp-av +youtube"
+
+# GOA is only optionally used by flickr and lua-factory plugins (checked at v0.3.8)
+# json-glib used by tmdb and lua; tmdb currently non-optional
+# TODO: validate upnp-av dleyna deps
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=media-libs/grilo-0.3.8:${SLOT}=[network,playlist]
+	freebox? (
+		net-dns/avahi )
+	>=dev-libs/gom-0.3.2-r1
+	chromaprint? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-chromaprint:1.0 )
+	dev-libs/json-glib
+	daap? (
+		>=net-libs/libdmapsharing-2.9.12:3.0 )
+	media-libs/libmediaart:2.0
+	net-libs/libsoup:2.4
+	dev-libs/libxml2:2
+	flickr? (
+		net-libs/liboauth )
+	dev-db/sqlite:3
+	>=dev-libs/totem-pl-parser-3.4.1
+	tracker? (
+		>=app-misc/tracker-0.10.5:= )
+	upnp-av? (
+		net-libs/dleyna-connector-dbus
+		net-misc/dleyna-server )
+	lua? (
+		>=dev-lang/lua-5.3
+		app-arch/libarchive
+		dev-libs/libxml2:2 )
+	thetvdb? (
+		app-arch/libarchive )
+	youtube? (
+		>=dev-libs/libgdata-0.9.1:= )
+
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	upnp-av? ( >=dev-util/gdbus-codegen-2.44 )
+	virtual/pkgconfig
+	lua? ( dev-util/gperf )
+"
+
+PATCHES=(
+	"${FILESDIR}"/0.3.8-meson-goa.patch # Support controlling g-o-a dep via 'goa' meson_options
+)
+
+src_prepare() {
+	xdg_src_prepare
+	sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-plugins-${SLOT%/*}':" meson.build || die
+	sed -i -e "s:meson.project_name():'grilo-plugins-${SLOT%/*}':" po/meson.build || die
+	sed -i -e "s:meson.project_name():'grilo-plugins-${SLOT%/*}':" help/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable-bookmarks=yes
+		-Denable-chromaprint=$(usex chromaprint yes no)
+		-Denable-dleyna=$(usex upnp-av yes no)
+		-Denable-dmap=$(usex daap yes no)
+		-Denable-filesystem=yes
+		-Denable-flickr=$(usex flickr yes no)
+		-Denable-freebox=$(usex freebox yes no)
+		-Denable-gravatar=yes
+		-Denable-jamendo=yes
+		-Denable-local-metadata=yes
+		-Denable-lua-factory=$(usex lua yes no)
+		-Denable-magnatune=yes
+		-Denable-metadata-store=yes
+		-Denable-opensubtitles=yes
+		-Denable-optical-media=yes
+		-Denable-podcasts=yes
+		-Denable-raitv=yes
+		-Denable-shoutcast=yes
+		-Denable-thetvdb=$(usex thetvdb yes no)
+		-Denable-tmdb=yes
+		-Denable-tracker=$(usex tracker yes no)
+		-Denable-vimeo=yes
+		-Denable-youtube=$(usex youtube yes no)
+		-Dgoa=$(usex gnome-online-accounts enabled disabled)
+	)
+	meson_src_configure
+}
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index 372ddf7994c2..f23c7cb00f3a 100644
--- a/media-plugins/gst-plugins-assrender/Manifest
+++ b/media-plugins/gst-plugins-assrender/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-assrender-1.14.3.ebuild 408 BLAKE2B 3368af61edc30f07a3dae8c24a7a57931864a0c24b99c0cab175a86d26fbaf6203a4cdc1cc6917e772c3d986c776c496c3d682fcf154bb84aac709161ef43f29 SHA512 73df7c65b2ae72d8cc82341f66f259e2e5d8b7277f1a69a8a616e0edc75212fe6c067b44c95f8d892b99a0808b4ee535ceb0c81fec1cd8545bb67f6febdb5523
+EBUILD gst-plugins-assrender-1.14.5.ebuild 416 BLAKE2B 9207b91fe83881342c8a74c0651b45ab0d45f1cf19e17518419a5a796591074cd1fc7a6e4cbc0d0e563a19485bd9bbcc430ee6ea475f3d8bd9970749f7deb909 SHA512 3e91c392f7fe6d0563d78dc89d7b43486f7b2a13a18e485bb3a182ab95bd36d6b33e03c25b365a59b9276e5dcafb2bc832c3b56db69303296064d3bb8ce880f0
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.5.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.5.ebuild
new file mode 100644
index 000000000000..fa8ebe87cd88
--- /dev/null
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-bluez/Manifest b/media-plugins/gst-plugins-bluez/Manifest
index 7b1c33ea54e9..1b0979e80d66 100644
--- a/media-plugins/gst-plugins-bluez/Manifest
+++ b/media-plugins/gst-plugins-bluez/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-bluez-1.14.3.ebuild 361 BLAKE2B 01dc807429ce2f5818ede7ad6f842ed8a2e18dd2b2edac4608e1b8f2841bea0bdea546082e0531ce02ab0b3f23ca1036a6fcebf06978e70fe3176a51335f7051 SHA512 e651a5ce9fe6b175f0bef8d38a2406c68ab4b4991d5a4e5aa8c1619ccb67c933a347328ed4de360fb73a259535dbb60a3921c4c5192c114ba00abf5c55a1a678
+EBUILD gst-plugins-bluez-1.14.5.ebuild 363 BLAKE2B 87ba3d38138e4867f8a700426bdc64667f09bf6ad325e0bec1e65780c20822e67b52310a13a61d475cdc8c24f419d401a4a646346ac54f035a701e2201f22fc4 SHA512 43e6aa5e724f069a39834a6c10efc44a59b1c56c12d102d0a39805298360e2fc78b400114e89812d7ae60b6d1ca24dd402742e21ef92fd4369bea247f5883831
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.14.5.ebuild b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.14.5.ebuild
new file mode 100644
index 000000000000..4677ef941fec
--- /dev/null
+++ b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.14.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AVDTP source/sink and A2DP sink plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-wireless/bluez-5[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+"
diff --git a/media-plugins/gst-plugins-bs2b/Manifest b/media-plugins/gst-plugins-bs2b/Manifest
index 1f51fdf1c717..dc3cba2be062 100644
--- a/media-plugins/gst-plugins-bs2b/Manifest
+++ b/media-plugins/gst-plugins-bs2b/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-bs2b-1.14.3.ebuild 307 BLAKE2B 9ce161dc51a6581ebd198ec5595aa3fe36e706511166f33321370d51f4dc703d341ca859082f0d6f90a8d64fd44473db4986cce060166f487f14bc1546484c99 SHA512 0e2e4116b8e9c3906de2de4645765a7931fa0a323504f1871a40d14b5f9542ab9f35a7b2d92683ec40401597ea8c479b4dd9a0a79582f5be045bd660b77c569a
+EBUILD gst-plugins-bs2b-1.14.5.ebuild 309 BLAKE2B a60632e83754bc285c5730dae62b45e629631e2dd5b6aa9f02c76f1169bb12e63c20edd494bc58c8c1a6acc90392594ea1df4c8240dc6a103b580e0182de26d6 SHA512 71a51777eef0230bd38165e789f881a8039420cbdc411388c8b5cc8f4bd29cb9d0a3caf7ce2158721158503a4a14f57eb3f7f94f7a6cf4df3462d141aa20153e
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.14.5.ebuild b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.14.5.ebuild
new file mode 100644
index 000000000000..5436754b9d98
--- /dev/null
+++ b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.14.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="bs2b elements for Gstreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libbs2b[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cairo/Manifest b/media-plugins/gst-plugins-cairo/Manifest
index 19e046ead758..cb484cbf82de 100644
--- a/media-plugins/gst-plugins-cairo/Manifest
+++ b/media-plugins/gst-plugins-cairo/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-cairo-1.14.4.ebuild 332 BLAKE2B 00608d0cb0131592e49a8ec528265b74238723a5d042c33b33081c0a426385ec7783329e66c15e399d74e5b9fad131d1a552aa1384411a0a6da250a55226d9ac SHA512 c6a35459b758c89c0ef27f1d096022fb212d665eacd8b8539317e3818a4940cd66c6884b8472a9bf560ece227530c024b7be24ba1a520b177ef4526d3f1498ea
+EBUILD gst-plugins-cairo-1.14.5.ebuild 332 BLAKE2B 37511ecb76bb4467c35f46f113e28be5f81f3160b0e7bcd51623741ebf22b0da202b5eff81945b6da332ed8cf7b78f34604c4634aedbc29165ffaedefd56d819 SHA512 1de3e39624aeda7911200d37ec8167d1deb7f9367f7b68b8a3f6b0ca8a4aa9a0616b8325275ff8cad245738ad5aa8bbdfa59ea26fd9e7271bdfea276cc8ef2a1
 MISC metadata.xml 478 BLAKE2B e9563654e8e62fab3969a394c62a847c1e87617f8e1bbb0042850709ccb7f450f31283e2bb563aa51b14f0599f69147be29aaa2af2ac57f2b56f162b50f3bc62 SHA512 07528fb30c717b584e9fd9381ad9d71829de406a7f20994876703a7164b84529d21b35e8bdf0880216e6b308e96bb83294ab4ddf9f3ed05a4e20f8d5d2b35708
diff --git a/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.14.5.ebuild b/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.14.5.ebuild
new file mode 100644
index 000000000000..2d48c8e9bb0b
--- /dev/null
+++ b/media-plugins/gst-plugins-cairo/gst-plugins-cairo-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Video overlay plugin based on cairo for GStreamer"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=x11-libs/cairo-1.10[glib,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index a4b4d96b0b90..8dfe2d222404 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
+DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 EBUILD gst-plugins-cdparanoia-1.14.4.ebuild 473 BLAKE2B ff93502a8f090ac1a47b62bf1ddf608b1b176d7ebdac5f14f69cf39324d7bd5bcc5f1a03a3786194ee954ae2f8ecc084fe9aa4096648796b5c79a0b95c38e8d5 SHA512 bdb67ce87f3b3e53008006f4345537490fab616700b35dc61c7e3451a5cb4842f9398b6aa8dcbde231452923aab1a28b444e8b99c4a8801b21a3474dccc39f02
+EBUILD gst-plugins-cdparanoia-1.14.5.ebuild 481 BLAKE2B ff7d4f34451e03848c71bd0ee7d956c9431130ad60ffbc94474b840ab07f7825f77eae1a41f1f3fcf33c2beebc494431ad02b0e510a5adf53e3d3d5919ac7697 SHA512 6cad17aa69724dc10aa16eb5c5f242b18875a1cd7e157986720580a4832f16baf9e80a18d25599c7efff98709dbcf549ac6b54b0d23fa1d6ebd9d78a43270d7a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.5.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.5.ebuild
new file mode 100644
index 000000000000..f3d57351508e
--- /dev/null
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer
+
+DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_link gst-libs/gst/audio:gstreamer-audio
+}
diff --git a/media-plugins/gst-plugins-chromaprint/Manifest b/media-plugins/gst-plugins-chromaprint/Manifest
index 1cdc77e17fed..eda24cbeee0b 100644
--- a/media-plugins/gst-plugins-chromaprint/Manifest
+++ b/media-plugins/gst-plugins-chromaprint/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-chromaprint-1.14.3.ebuild 383 BLAKE2B 0466f0b61418310c66e7a034359d2c1462dcab8a1288cc28a904dacda47c0eee92ca9ab46aadb8cc1b2ae81c06f6a7e2a3811bc4776b0d1069322d485d3378e2 SHA512 ee14449f182a93fb3c4ecb00e3d028f4382a9d899d43fc61c1834fc37d752e3e5508429734a1ba9f62107219786045e840f7c2e94e4a5333c856acee3395a71b
+EBUILD gst-plugins-chromaprint-1.14.5.ebuild 383 BLAKE2B 0466f0b61418310c66e7a034359d2c1462dcab8a1288cc28a904dacda47c0eee92ca9ab46aadb8cc1b2ae81c06f6a7e2a3811bc4776b0d1069322d485d3378e2 SHA512 ee14449f182a93fb3c4ecb00e3d028f4382a9d899d43fc61c1834fc37d752e3e5508429734a1ba9f62107219786045e840f7c2e94e4a5333c856acee3395a71b
 MISC metadata.xml 493 BLAKE2B 2a86d0343178b353fec290f550a1442e2e1492e1e5bfb3bbbbc24a9f18cad04c12c582f5fb3deb5c845dd7633c2b6d0c30566ff86c68bd60635c49d0b46a8058 SHA512 2eba41dd2cd60d1101e79a68553188fd8d6a43711de3121e7ce230c1b09e598d3123aa2b1e65a415af80182848cc0ea17433a39b34d6d6cbeb8aa3f8644eee4c
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.5.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.5.ebuild
new file mode 100644
index 000000000000..7b3362629eec
--- /dev/null
+++ b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-colormanagement/Manifest b/media-plugins/gst-plugins-colormanagement/Manifest
index 0d15f0cc57ea..8cabdbd9812c 100644
--- a/media-plugins/gst-plugins-colormanagement/Manifest
+++ b/media-plugins/gst-plugins-colormanagement/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-colormanagement-1.14.3.ebuild 346 BLAKE2B e907a768964d48685a931a5085a19ee4cb853a30da0230051d6a1c081556f5a753327610888cab4396b69d8098054bb7a348288c8fa5c8bfcf44c3c9664c6c7a SHA512 1462da28d450aa93bdfc0ff19bc8b6b4dc91218a2adeb955278d21b0d9f3c1967cf28442f309cd06c42f22eb2a2d54fd8c8bc878cc41830c1fd197d6daf5e901
+EBUILD gst-plugins-colormanagement-1.14.5.ebuild 343 BLAKE2B 4bbb50acb250359fa7f6755f15a72d9ce38d9829f77a7a2afddeb16095d48835e87cc7895c11e9a5fb65712c6452f7377eeddbc50e3f8aa5ba0bb2cbf15529d2 SHA512 2d13b1a1715731ca32ade98f94ce3ccb06683b09b2644fb5243623f53a68cd01fb03efabdf75ca639a93cd8bb77730d699858406dd9afaca390981bae654322c
 MISC metadata.xml 456 BLAKE2B 85f88de4f97a4f6790b0f6ad7336dbddc1e494e00350454d647dd7acfdf97d1a4ac6265803ab162aff060dca2272ea581dd0cc45280d9f274dc6d45609119419 SHA512 0a37048c0f940a25d9de2e1dc46c2d825c362ef44f9a34be1c5d49c12ff55ab8ff60cccba7c6c7a95d307fe1407452e1b2638c474bac3d62324b23c263681c24
diff --git a/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.14.5.ebuild b/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.14.5.ebuild
new file mode 100644
index 000000000000..49873558bfc0
--- /dev/null
+++ b/media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.14.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Color management correction GStreamer plugins"
+KEYWORDS="~amd64"
+
+RDEPEND=">=media-libs/lcms-2.7:2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="lcms2"
diff --git a/media-plugins/gst-plugins-dash/Manifest b/media-plugins/gst-plugins-dash/Manifest
index 350823744ea2..f79c0a619744 100644
--- a/media-plugins/gst-plugins-dash/Manifest
+++ b/media-plugins/gst-plugins-dash/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-dash-1.14.3.ebuild 1265 BLAKE2B e85c74465d9040f73bf987bc953b8780cc57841e09eb6f5c03939dd6c216450922b24268291ca7e911a0b822ff0b7a39f1b9d08b494674579638ae7f5685d511 SHA512 75606fb32c828c269d6f71fa33ef0236ff514cf74b4c26a990665a4ab655d1ca6c766c8dadbef93b6ffb093210abfcf610bd69490fcc4df01bc6349765b6bf8d
+EBUILD gst-plugins-dash-1.14.5.ebuild 1267 BLAKE2B cfe4edbd377fc3619771dc26cc196c525ce5327f71010ad8eebfb068260b7085f7a6c0392d4f5825e40bd46e2efaefd73a0b944dc9e442bec42b72897916c778 SHA512 d74e57744f13ad8a8fac0b8af511db422b8faa8d6b515c54f19e1ec5386e3a58a16e0f63dbcc7c8bfe795128024662e46f1f72cf02fea54741bbd26709fabda8
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.14.5.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.14.5.ebuild
new file mode 100644
index 000000000000..10b6999fa76d
--- /dev/null
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.14.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MPEG-DASH plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# FIXME: gsturidownloader does not have a .pc
+	# gstreamer_system_link \
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptivedemux:gstadaptivedemux \
+	#	gst-libs/gst/isoff:gstisoff
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/dash/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgsturidownloader-1.0 -lgstapp-1.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/dash/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/isoff"
+	libs="-lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstisoff-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/dash/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-dtls/Manifest b/media-plugins/gst-plugins-dtls/Manifest
index 54169cb265e3..bd33f29a9410 100644
--- a/media-plugins/gst-plugins-dtls/Manifest
+++ b/media-plugins/gst-plugins-dtls/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-dtls-1.14.3.ebuild 426 BLAKE2B 3978a7c398acbba159f5e2e0145b5c2c878ad47cb392f5e871acd953dc0d766c05228f052b70bc4a41f7eb5c1321ac2d884fb040e6cab1e5cb004f5715b5b7b8 SHA512 688e6aae0385bf212dde3102131678fb0638728d810da2e1f7127207ede3d38320ae805036cfa15c9e0b075c8a7980f78ddad7ab027e5643ab485c69ac487067
+EBUILD gst-plugins-dtls-1.14.5.ebuild 428 BLAKE2B 023bd610d39b9468cdc71d09949a016533d5885c8ac86ef270265c35ba52f8b9f2dcf2d379974150a9fe62f4789c1d24c615ebfe4c752b26533d5f663d981200 SHA512 9004fac8e2344529e3a8dd72a515052b3108c9e8a4fa52d65ed1cf8c6f2ae122095e6f5b9c666d64b83e6d9908fbfac9e6cd6155b49d01283811c9ce0f7db20a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.14.5.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.14.5.ebuild
new file mode 100644
index 000000000000..46367907c81e
--- /dev/null
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="DTLS encoder/decoder with SRTP support plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="
+	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dts/Manifest b/media-plugins/gst-plugins-dts/Manifest
index fe4a57636bd3..eab2e88b2d45 100644
--- a/media-plugins/gst-plugins-dts/Manifest
+++ b/media-plugins/gst-plugins-dts/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-dts-1.14.3.ebuild 427 BLAKE2B d636ec060d753c9d595966e5c5fee3286e3528d9505ee6cdc352afc610aef4a387d5521247f535c48388bf3b491f7374d8323730289aed2bfed1b182aed2f74b SHA512 5ebe8f644b2961996e24a71f61a425d812ee7d3e7cb25d3b9e391b20173cc4205cd3e1f22f86f41c2772f9e6964c2d61b3c1e64817aeb018229e30a320bec658
+EBUILD gst-plugins-dts-1.14.5.ebuild 429 BLAKE2B 8f8811ce2acb4e2d4af8944ac56bbf0b656f2919f43f7c8932ea8a449bb7fb2e0afc086104d50fd1a9fdc47a41da8e7c9ed8a70ea9136c0c6c07e5d60b723213 SHA512 b58b492f6454ebb77535e3c13c6f64e895862ece9f088d07c140a0b9cd724fd52f48e8e15ffb36f5fcb0a12c8a333f492f3b14025f0653bd42aede2ae2f995a9
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.14.5.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.14.5.ebuild
new file mode 100644
index 000000000000..ef9b7fc44b42
--- /dev/null
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="DTS audio decoder plugin for Gstreamer"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	>=media-libs/libdca-0.0.5-r3[${MULTILIB_USEDEP}]
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dv/Manifest b/media-plugins/gst-plugins-dv/Manifest
index 0ebc4e941271..6048b9d474de 100644
--- a/media-plugins/gst-plugins-dv/Manifest
+++ b/media-plugins/gst-plugins-dv/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-dv-1.14.4.ebuild 417 BLAKE2B 62a8380b6888cf0675a3897f4a10a38860603c65e218e181dfd81ffc4f3ce1a2582b2ab3114923e0cbfe947405856a7df9d2817b9f0d2b6b6a542e029acbe3f9 SHA512 76160966a2fea0b5fb0a08efda8680e6ed6ec6cfdf66cb8329973a83af7e55737e615db6c6fd5f6e31e0c716341608303ee0061503559f033680d66da7db67ae
+EBUILD gst-plugins-dv-1.14.5.ebuild 422 BLAKE2B cce03405c7fa735bf6caf8010fe13c608a4ae61cedae377f7b206610a2551ac02fe78a732ef3f0fc3b15d05e35e6b7febb19ef019ccd75e38aee2de359aed332 SHA512 aa906f037dad85d0a35513f6729abf4c38affd96bfb8956e224373b0a227b152f79a8a3e5a58c6364822635291f201cb9fd65fd3de6513d59f94f2d5b1bf04b1
 MISC metadata.xml 380 BLAKE2B e30d4f36d092c662f4b2caf33ae705dcee14cadb22174b125686c45a8724a880b291d4683fbf6b06a1e8003cf18be831a368d617d872904a58b1e3fe70ae7ca6 SHA512 bcbeccb0d35ae268383fd3cff3c5739301777233f6769556b5793b3b34a0c5c6e6bbcafcad392e22a8ee441698dc508d9638c1c53eaa17b692ecf5a40ee6f27c
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.5.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.5.ebuild
new file mode 100644
index 000000000000..465e0b03d153
--- /dev/null
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="libdv"
diff --git a/media-plugins/gst-plugins-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest
index fefd18ba9de9..de0897678f4d 100644
--- a/media-plugins/gst-plugins-dvb/Manifest
+++ b/media-plugins/gst-plugins-dvb/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-dvb-1.14.3.ebuild 410 BLAKE2B 0d3f17d0e7ef10d8e312010c90c92cd9aa9e570bffe7fe93f496e8f8fee444276f9bc23c37e23da3b36fd3222e00117a1f64a847c89460d6c114632e8071d9af SHA512 7006863c78c8139b58b15f351b132457413a0244c02cb7334f5e595ab855367afb6c2a278abb45a2164759dbc65f3d2b392471a5416b65c0f84c3328ec666ae9
+EBUILD gst-plugins-dvb-1.14.5.ebuild 416 BLAKE2B 62b29f77967c44963584c82d5c8623c1b4516b31851e209579ef8269ce1ecbbfd1653fd2c0e3ac80cf754b259163d6170d0ea2e2a24e6d118ddd56a1d027f3ca SHA512 7f1db889d2c6501fb72e68ceca8c12e144547f09103d4070d0743d779e60c7958915be789d902fe65e0b9c0b640aa55cfbdd3598adb4a2aac0b1114775296b97
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.5.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.5.ebuild
new file mode 100644
index 000000000000..86fc62f5fffb
--- /dev/null
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPION="DVB device capture plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
+
+src_prepare() {
+	default
+	gstreamer_system_link \
+		gst-libs/gst/mpegts:gstreamer-mpegts
+}
diff --git a/media-plugins/gst-plugins-faac/Manifest b/media-plugins/gst-plugins-faac/Manifest
index fb24fef74ace..2e5bfcba97f1 100644
--- a/media-plugins/gst-plugins-faac/Manifest
+++ b/media-plugins/gst-plugins-faac/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-faac-1.14.3.ebuild 356 BLAKE2B c996b11529180a9f598d908476ebe6d643af9b20303eb3a8bfd077776b9cfe0d08446c636945f314a396aa98b09624e95da56ac96248f608ca17d2f6e5f17a53 SHA512 ab2ec9b516cfd376565bb345206074f8e891c7c8cc0cac8564ca020f38d7322e157c087295764078e378838f7f1103428898680bbdee9f03b16e4c523bcd00b2
+EBUILD gst-plugins-faac-1.14.5.ebuild 361 BLAKE2B a3cfbfbd96ff53be0a529b329b1ae0783f0f117fdf721f26158c4efb95fd180e70f3ea2179e171ab7689bba32a43fe1f599ce78245b43c0e7d545d48852307bb SHA512 137ff6f9a413f2f45b1d44f03eb2182bafe3dd23fe846b53e0f95590017c43c717484dbda17f69ad586ee2a507e61d2bce35400fd28cc240d66989743ecc0d63
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.5.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.5.ebuild
new file mode 100644
index 000000000000..c87efdcf6c90
--- /dev/null
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AAC audio encoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest
index 50ea08c5eccd..5950f385e39b 100644
--- a/media-plugins/gst-plugins-faad/Manifest
+++ b/media-plugins/gst-plugins-faad/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-faad-1.14.3.ebuild 383 BLAKE2B b15cae1004f230ae03cbe4c9e6a21d67816857435382d2bbc1351f7553d1da4720d0c03fde762706e743817ac4c7440e3d7b3b4da23a750a4dd96aab609c3052 SHA512 c8edb29487e0de0adf6659d8188deab21261b330a234ecbb7f67c61400dc00bfeac02d5b109df2d60be9732ee84cc28a2c5d22ae685a4f466d1a8e47fb54835c
+EBUILD gst-plugins-faad-1.14.5.ebuild 389 BLAKE2B 8e1559413c82b54164833a3dddd741bfabfd54c2301e6e5e4ed2bb99735acf55715d21aa588dd5d0d0cf724e9dcf5d4ada6bd9995f222fe8e70cbf5cd8ee364d SHA512 186b5de09fcd6e6cfc8e65633942d06cd839b50c57fd8d1ac9f6e8aa99135caa8672f2f6fcc953ff39db2c5bcac7c6683f1ee5376a2ccbbf57272d26e1ff28a2
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.5.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.5.ebuild
new file mode 100644
index 000000000000..66fadd19f6f1
--- /dev/null
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AAC audio decoder plugin."
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest
index 84a6f815c743..1d29e0589c0b 100644
--- a/media-plugins/gst-plugins-flac/Manifest
+++ b/media-plugins/gst-plugins-flac/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-flac-1.14.4.ebuild 410 BLAKE2B c648cc6326c14d01b2f27a130ce8bb928ae7f9b9c808134158377e7ce3f6b79b9e11ac0d432ef13297d786f92b4e697433dfa77735893e234afef83fae4b9001 SHA512 a066d2b9eea601930b5e0482db463f5057e8758c82367325533003772a18ef74f96cb8aed710395a5d4e894192afde878372f9d1ec7e8364e05a3ddd4ad54767
+EBUILD gst-plugins-flac-1.14.5.ebuild 418 BLAKE2B 9426ad39be3a7ea0f9533692daabf90a6762fa9fe3c024b69f13343a3f380a41ab49ee2cb4403065fb0c0d36f17fc559f512fff7025f52f10178bd621e9f2295 SHA512 5b6afae196878fc3c7485a20fd88fe1089d2f4d1993efd2eb16d186bfc12e133a7f1941bc9fd85233004cd0db19f2c98f2c6dbd31d5d5c80641638e90c7440e6
 MISC metadata.xml 555 BLAKE2B 0a6c97712429505d543caaa732d716a95e4f6f5256aeb202da38bd2399ceb335e1fc6079279c96848d479d3fa3e2b8bb1c92b37ba284204b1936078d0175caf3 SHA512 2ffe5f5f8ef59e30a7da2efe1b5e88858c5f27776b7f48a7748f9cd72a18d5c97ddb239609c7bab808de874f0a51bf886ec24e395641fac995c8d3f041271e7d
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild
new file mode 100644
index 000000000000..16f41aeecc3e
--- /dev/null
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/Manifest b/media-plugins/gst-plugins-gdkpixbuf/Manifest
index c54d3dfe95f8..3235e2a3f243 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/Manifest
+++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-gdkpixbuf-1.14.4.ebuild 485 BLAKE2B 606da6ea898771fa63c0e1868330ec6788ac5f0ae0260d68afdf412219925c01598e9f573cd2bbc24007f46fb2cbba863341e5aee31314104673d95bc94aaf9a SHA512 e11212f66c0fcf1fde76a3dadbbce4093790e3f5a631830e7f247f9beac112dadba7c25eb6e0a887c2a187a58b19016b891d510c32595e3798dca89293d8a965
+EBUILD gst-plugins-gdkpixbuf-1.14.5.ebuild 492 BLAKE2B 40c59ea3d1e786077221aece54fd43bc311a9b4eb3c1252d4704ad71c8bc365edba152ec52856213ffa27fd646d7dd92baae64edcc02766ee322b7b3f1e65432 SHA512 fef7f6ba5dee43ec8e39b37295d4f60293b63449917b2e89c4fd3af6d2c750eadf54b54d2badbc745e31b9c08ccc2f6d70d45c5c7bc629f18a2989fe54fc7e90
 MISC metadata.xml 610 BLAKE2B e0597a0e835fd058d1d172bef6cb6616efbd83b3f97e9b9d644afa6a68956dc97b37385ba7b5996468911f9da16e54b2dec18d9657ad8b1b6a4dcd71cb229f7e SHA512 472dddb540087c89be5a85ab67733d345bf039a95fc1a7bd2ec6ce3b08b8556b2676af77b93ee903bc8ace178963935b21dfcfc6c1c0a6ecab5a7429d60e5cbd
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild
new file mode 100644
index 000000000000..3ca715fb4ec5
--- /dev/null
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="gdk_pixbuf"
+GST_PLUGINS_BUILD_DIR="gdk_pixbuf"
diff --git a/media-plugins/gst-plugins-gtk/Manifest b/media-plugins/gst-plugins-gtk/Manifest
index a2b8cf083136..a3328d7f43e7 100644
--- a/media-plugins/gst-plugins-gtk/Manifest
+++ b/media-plugins/gst-plugins-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-gtk-1.14.4.ebuild 1198 BLAKE2B 043b5ad75eece99caa732e1baab41066c647e5d43ab1d41dde493372dbcea6ad01f431b20ddd764bb1f334414d9b24de934a3dd7015f5dfb2b79e7db5c12b11d SHA512 306dad8ddb3652f3860ad5495f3539471346476604dbd653358913693c0979c1f4b9dc3600473aaa4f9292aa8b35213256387ee80d8214d0e8f367c45b6b6134
+EBUILD gst-plugins-gtk-1.14.5.ebuild 1206 BLAKE2B 4e3df571fa2292b2bfaa4d8e4101a27d53a4f6086a6d35bb39438aacad707abed0b08402eff26204d8396c1b1ab05f0608901f21ca64072fd417c327a233d678 SHA512 f32f9a4275c046e39debf6fb45dc9eaa322f1742769af84921e252e96dcd161eebbdefe85fdf977b51e029f2b9393396f9559ef365b24ef258e3b0a051b75588
 MISC metadata.xml 790 BLAKE2B 609210afdad563f5d63ea609ac6a65301907d447a137537aa9451ce6bf5774f9a15a8294a4e11b72697e123a4ffac44cefa5f6cf820a78bd998cd581e7ec720b SHA512 8ca80354a5c57ccbc941bc62cd7fc1b3bfbd2223901c24afac0ade01ab751e790cf9bafc4e0d4a3074606be99ac7aae10a45a9f7c65068342495f2995c956fa5
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.5.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.5.ebuild
new file mode 100644
index 000000000000..c7162ff5ab83
--- /dev/null
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+egl gles2 +opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
+# egl, wayland and X only matters if gst-plugins-bad is build with USE=opengl and/or USE=gles2
+# We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
+# we don't care about matching egl/wayland/X if both opengl and gles2 are disabled here and on
+# gst-plugins-base, but no way to express that.
+
+# We only need gtk+ matching backend flags when GL is enabled
+GL_DEPS="
+	>=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl=,gles2=,opengl=,wayland=,X=]
+	>=x11-libs/gtk+-3.15:3[${MULTILIB_USEDEP}]
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+
+	!<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="gtk3"
diff --git a/media-plugins/gst-plugins-hls/Manifest b/media-plugins/gst-plugins-hls/Manifest
index b880c76555c7..45fd21a1cd51 100644
--- a/media-plugins/gst-plugins-hls/Manifest
+++ b/media-plugins/gst-plugins-hls/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-hls-1.14.3.ebuild 1120 BLAKE2B 2441b6b9f7e2b8d9aa2c08eea70d1a6fcdc2217ffad71027662ab1303e9b441f243da35844935785d09142e43c67778cc8347e62ea49ad12d455d4b38073f74d SHA512 c2bb1322a221b6e78f03dc7597f321db63a05fbcbee864f1c0f5bc5f3ff26dc1efc046210af1b710eff1b4a89f46633055156f3bd79703e830d084a35e30f8e5
+EBUILD gst-plugins-hls-1.14.5.ebuild 1122 BLAKE2B 5eaebb1e0907ccf4df50232140df19147c9ec693e4f717977ea4f83092f11eb38067438bfa2dfc92497a3880dd19dbd6daad40874424dde4c404c95e4347a358 SHA512 3ec9196283711d56f5d4e3286abb1aaa9c49b5258c15f6d849be0487b718c0ebe9e18794bd4ec079cdca48b3e8ab6f72277c17a58413b04404a0c2dcbe4a9a52
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.14.5.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.14.5.ebuild
new file mode 100644
index 000000000000..24632b55ea69
--- /dev/null
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.14.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="HTTP live streaming plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# FIXME: gsturidownloader does not have a .pc
+	# gstreamer_system_link \
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptativedemux:gstadaptivedemux
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/hls/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgsturidownloader-1.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/hls/Makefile.{am,in} || die
+}
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure \
+		--with-hls-crypto=nettle
+}
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index 6433bd776972..064d702b2950 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-jack-1.14.4.ebuild 377 BLAKE2B ca497e06d8a606f1679f302d0734565f74e273ce66d4070848b3e781059621fd693657fc5da9be777d6721c008100908aa25badb4b32cfabddc4f96f97c99352 SHA512 4547ee57176a6de05c4c7798c9ad80cce4d758f5e670f7ef808ff9da08d2a6c1c8d94f00c3b830809b27d641d6b3f6d66a4b554848fe77c7ff7f0694f5b09e54
+EBUILD gst-plugins-jack-1.14.5.ebuild 385 BLAKE2B d789e4292075e815e1c87d17017554a54c19b71ca060a21d6f2c34a6860429b9d575aa03a4d86c8b7c43f23369a98118dbd5786dc014d6eea96a0bdd88733227 SHA512 9e7a0bf6a2fc8b7666286035389d6f3012bc66b7c6cd4e13f45034d3969d5b29b0360a96c63fd1e7f57887775cb11a864371c100825e051198646ef29a3cd7c3
 MISC metadata.xml 487 BLAKE2B 182c55b79c188f12dcc000cecf9c507933183ab62a78c806b6f43918af528c1c7bf3adf435ad077f689a2b64706b7517b14393500dc4d1b7f2cc14b45dd6b764 SHA512 811374b3dabbff1084c5b1b6fb502197f58da02da195b922ce7556ca6e0f3668f266a14ba1a03ff352edb89a0cff9550e7d59f3f4e116ff63a22c6e8436ef6b8
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.5.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.5.ebuild
new file mode 100644
index 000000000000..df37943d312b
--- /dev/null
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPION="JACK audio server source/sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-jpeg/Manifest b/media-plugins/gst-plugins-jpeg/Manifest
index 8cb4b96f4830..1dc3e1b63e2d 100644
--- a/media-plugins/gst-plugins-jpeg/Manifest
+++ b/media-plugins/gst-plugins-jpeg/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-jpeg-1.14.4.ebuild 372 BLAKE2B 44998cbc3fb08920cddf20c4d088141ed84bdc611b0a3be2523e03c77246ed05a4ead0614aee16e7d983c1c5dbcc745f8b98e32944a329e3fac844ae291d4035 SHA512 eab6f9a1d2e3bd85a72148232e12b9c6a2f7c50191e16c7be152b33fe3d0d38c1f1585cdc8e238fd6828ce80479649055e5d652a77c5ea87002e2a935010ff49
+EBUILD gst-plugins-jpeg-1.14.5.ebuild 380 BLAKE2B d1641575758bd70b5142df2fd87b0c4f45a11879de9533210e8eca036d9c02594731cf627293b19a3a9c7bac100f5ed4a21b862dc733a417b327edded8c8aaac SHA512 10b0e72b199ca568597d95fd23b41cbaff67298ef6ee09dc3a92fb85e91cae2b0c0c6855da76a7cdcbefca02292dc9efc0780f62b6356a6e9a0df848f9f017ed
 MISC metadata.xml 659 BLAKE2B 8da81502aaf3eecb4ef62469b494598b329cb7e134511df9bd4269807882564e052ec76ddb50640203d96c08fa80deb3cb96d2b2c3c8dfae21fe296b87351ff5 SHA512 c4d076bdd3a4cf70540a9cc56c91a8e805f0a809065b629970158ca002f3cc03f3b7b91615121813030f510eb2e9a912aa4ca79504a20e023cc36f1fa3acf329
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.5.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.5.ebuild
new file mode 100644
index 000000000000..c5eb6356831b
--- /dev/null
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-kate/Manifest b/media-plugins/gst-plugins-kate/Manifest
index 2a74e57c2b24..429180d011a0 100644
--- a/media-plugins/gst-plugins-kate/Manifest
+++ b/media-plugins/gst-plugins-kate/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-kate-1.14.3.ebuild 390 BLAKE2B 8795d832c281c2a40864e3297a037f6f5942f0c25cb67fd01d4612dce9817a6bf961a6d0b93a7c403eb7f647a48f724eebfc727c797e2038de181d2996511738 SHA512 30b6266fb339b27d10267efc8b285fa42646eac68f976cdb730a56dbe7366c1687488b357f716a938b9328b3a7bcee2f33b164ef646a422370cce815a254277d
+EBUILD gst-plugins-kate-1.14.5.ebuild 387 BLAKE2B 338a156291cd670bd4ec0f3adfd0bdeaed80e2614dd4c67a8c1d3fac80e90d0d013b572bd4d92cdc0bed7280b2e0f3896265f704f3e0867de3ca9473e889a786 SHA512 ce64c73c0321e7928a6e184cb83f255b2e2f3550d1590d8c9f755be80a040e1eea31fb98d818907a80d43710d583d70c02099d4692ed282571e2497f93e340d5
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-kate/gst-plugins-kate-1.14.5.ebuild b/media-plugins/gst-plugins-kate/gst-plugins-kate-1.14.5.ebuild
new file mode 100644
index 000000000000..9b34138051e7
--- /dev/null
+++ b/media-plugins/gst-plugins-kate/gst-plugins-kate-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Kate overlay codec suppport plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libkate-0.1.7[${MULTILIB_USEDEP}]
+	>=media-libs/libtiger-0.3.2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ladspa/Manifest b/media-plugins/gst-plugins-ladspa/Manifest
index 294983d943af..46561295a04a 100644
--- a/media-plugins/gst-plugins-ladspa/Manifest
+++ b/media-plugins/gst-plugins-ladspa/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-ladspa-1.14.3.ebuild 319 BLAKE2B d8015bae153cabbb1fb5cb8d13f67143eed82669910a0305f5a020005d5025cd1431be16a2bd21bad3c15e5667d7f16918c75f96cf7aa92cd22491968453579a SHA512 e225f08586703a6f693149503c2b36340d7cbc6c195edb0c900e718406f5adb460f33bcf0a597b7836c4bb3ca74ff76b1b0868c8df9ae9cce69d7dad0fce6643
+EBUILD gst-plugins-ladspa-1.14.5.ebuild 321 BLAKE2B 95f42022e5b6024f91d7ae187bb5502fb78e5d2a433c2db2727a1bdf82c170eed809cd39148efdaaff981c90a9ad77ef0fc48080eb2cfa6ad44639fea3c3c2e4 SHA512 e281fe575a2fd400e23c035a3c0fab32a0f798aefca4422156cd42e2de8e991b0c0395e42e3a46a50ac8cb5497f84b2379b99c252b052be581b10fd91c4a2e1f
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.14.5.ebuild b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.14.5.ebuild
new file mode 100644
index 000000000000..5e1289c3a3a5
--- /dev/null
+++ b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Ladspa elements for Gstreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest
index dfa910744d77..4bdc3977ea93 100644
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-lame-1.14.4.ebuild 395 BLAKE2B e4df2159637a426ddf6386117ab430b4d5156acedc6dfb742e792c02f8366858eb7dd552db44edf21aaf78b4837288f4657da8e19004a0d4d8ff9cd618fb2eea SHA512 55624898934b267b1a53d717a05bf560e1babd624fadcd40667da008a677b9c6614ee4e4a98bb07106c556974adab7178b5879f088b93e88328622ec769baf2c
+EBUILD gst-plugins-lame-1.14.5.ebuild 400 BLAKE2B 462d66216c8075af340581b9751c8d0acf3505d5a9d342e811b3e8399467da1b35925cd6ae6589eaa23c188c9a94dc2c07d62844a5828310656c22d08618b643 SHA512 02c9a20a465e743c7bee8db4dc84c0e7141445413985519459507d9f7ab1255b791396858bb56453aabb3c3bbb642fa4fee70860b2c72865eea28e46a7e425db
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.5.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.5.ebuild
new file mode 100644
index 000000000000..91dd83b61602
--- /dev/null
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="MP3 encoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libde265/Manifest b/media-plugins/gst-plugins-libde265/Manifest
index 76c21024b912..7b446a41bb82 100644
--- a/media-plugins/gst-plugins-libde265/Manifest
+++ b/media-plugins/gst-plugins-libde265/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-libde265-1.14.3.ebuild 321 BLAKE2B 7ec911e89386954858c840e4f23d8eb50e1082a43c063b99e26b88621252433caa294498588d2d22f2dc37d9a707de3610ada82ab22992702582c20d4cf78d8b SHA512 7303f743823d9fdd4cda1391f7f119080e508bb2fd9165d7a3affd1d519fd4f70db5ef3e33bbe70a45487b35b0b022a12ca20f54132dd64aef55535753e46e81
+EBUILD gst-plugins-libde265-1.14.5.ebuild 323 BLAKE2B 85406462615a7b91ca7912d047041f6a92a50bd2aaaaa85d3f5e616fb95bcb15d3676dd5715319fdf2f89754c1e84678aa38ae39f9d932ea14d30523544c3131 SHA512 19b546e7d640d29543d41adf699c2a4f5d25027ec2e4c380834823068771536ee69fe313ca41e9893c207e4d2f918057d1a33a83db04cfce0325451899f7948d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.14.5.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.14.5.ebuild
new file mode 100644
index 000000000000..fe6e528f0445
--- /dev/null
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.14.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="H.265 decoder plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libde265-0.9[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libmms/Manifest b/media-plugins/gst-plugins-libmms/Manifest
index c3e866da833a..f3004c7557a6 100644
--- a/media-plugins/gst-plugins-libmms/Manifest
+++ b/media-plugins/gst-plugins-libmms/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-libmms-1.14.3.ebuild 408 BLAKE2B 3e0b4142548c3188d77a1e949980ad8bef258de17869053274026160e886e66b16470e46107983ab7fa8a7cd39f286500c1f6909501acd48e1667da55dcdf36c SHA512 abd69100668e74c8e205aa3631ff2b4019979267ea9df2ca2b9076bad5d2c37254b5ee875e7b146a6ede283ea319d6b2b1bd0f5cbf5bf78242655b1c296e462b
+EBUILD gst-plugins-libmms-1.14.5.ebuild 413 BLAKE2B 53ca0d6350435c4de2a050dde7c3db97142ce63cb11f03c3e66ec3f5a68f3c09dc5278cda5281a9d1175c87780d2695353fb13aff03e76652e0921c3d491a5fb SHA512 b66ec2de612e3f0c8c9ac863b859337ef09a8140dc5e52b2603856aac3b195965fce7e5037b1ac616eab535e80c9a79c501dd0849639de4ff7db2b7f0c977f74
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.5.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.5.ebuild
new file mode 100644
index 000000000000..b298ff380c46
--- /dev/null
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Microsoft Multi Media Server source plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest
index a65215b5c824..351541af993f 100644
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-libpng-1.14.4.ebuild 369 BLAKE2B 4e208156afc16ca1e64c073cceadd08acbfb7020021e7c739120787cbce779c87fac19c743b0544076cfc7d20b5a06e1702075404764bd376ada9c8b50c24eca SHA512 33b405b800e2cb18f2ae74532a52fc02b7a4d2d16be18609988121fbe1f106f74531b2e2e4e347a64208549e7cfe857139b43500352842cac29a47069725cef4
+EBUILD gst-plugins-libpng-1.14.5.ebuild 375 BLAKE2B 33cfcc5fc73c91eb729d682ca3ea3ea1ddfa8bf9437856c7cf42971307aeba10d26e997bf088a0f9278e4850c9e0e5f756857c9d2045031e127638372cf905cd SHA512 1cc791464695aede1aa97087d03a1c0fddc83209dcd3be05581d8a7148ebb8b0c8a3880fd4b2b395d7ebc0b63a4cf995351bcb11148bc56401e04614f3b209da
 MISC metadata.xml 483 BLAKE2B 3c07bc4538ab8a6e0f2ca484f7b67a41d60f672714f17a1555eb2ebbcbbf14fe8e16f21360007789400352d3c1540c1644fd1402a12b639306a3068e5c9be822 SHA512 6d536bf8813f1f4d6b402487852ef1372172cb42c01d0a57af6b70166896deea5db36bed91f78ea18c1cdb8f809e5b5514f2b91a7668efeea170bee422d8a3a7
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.5.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.5.ebuild
new file mode 100644
index 000000000000..f176c7b8710c
--- /dev/null
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index 6321591b6bb3..dfbef43d5d68 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
+DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 EBUILD gst-plugins-libvisual-1.14.4.ebuild 627 BLAKE2B 6d26d67a7dbff2acb9406f991d410f5a012c36523e6ff51b50aab44dafdcbce8f37d56705784a58528b3ddfd6daf81f6631a39e34e7d844fdb0818a0cbb8dda6 SHA512 e645d1a44fe4c866fc468361e93e560c47a56b153ba2d8d9946c71ce0079470e5d1734294039ff89207e2bd22a5d4177cd63faa65ae42a3839a882b84a2a5695
+EBUILD gst-plugins-libvisual-1.14.5.ebuild 631 BLAKE2B 9ee4fc9b90762d2f0e9d354d286972d6b23d67c44dd408be5f9ac8db02476c8802c284590cedcd01a5f569a8e6a55013a72820b2a2ca77664a76d0f1d2c3636f SHA512 e6e00bcddae2c11b397856b740814835fd0304dced6f1b22f4a342aeb8e67acf49f448c37ea9acf253088c96887b08f21f676ac0abfa8f8ca924a452dc0508ef
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.5.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.5.ebuild
new file mode 100644
index 000000000000..671698877065
--- /dev/null
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer
+
+DESCRIPTION="Visualization elements for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}]
+	>=media-plugins/libvisual-plugins-0.4.0-r3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_link \
+		gst-libs/gst/audio:gstreamer-audio \
+		gst-libs/gst/video:gstreamer-video \
+		gst-libs/gst/pbutils:gstreamer-pbutils
+}
diff --git a/media-plugins/gst-plugins-lv2/Manifest b/media-plugins/gst-plugins-lv2/Manifest
index 61429881d22c..dd94d35a20e8 100644
--- a/media-plugins/gst-plugins-lv2/Manifest
+++ b/media-plugins/gst-plugins-lv2/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-lv2-1.14.3.ebuild 363 BLAKE2B d01960509cb629f29b87e578b11b7bd1f6f23e89134f30494cfe4d900d10c4fd38ddf37d83e0ffc50e3691d3c1933a8fc109622da6912dc4970ca50d396ef749 SHA512 780c562eafdb72c3b32ced3f9f03834dd584f0a36d43a0d1287183596d7d721b51cfe7769371b063740dc3d34029a2ee75895ee15516c8acac2026b0677ecf4a
+EBUILD gst-plugins-lv2-1.14.5.ebuild 365 BLAKE2B 469472ede8feb17bf4db250a998295a087eefa7072ef4eecf309f923c1aea9e3f9dbaf3970e99125d649761b8c7787ffaedf33cfb53e75ff520286d41fa640ea SHA512 a5f10ec83e8ee427bc492c3a1bdee70165cf578bde1de7a35463919df1ba20f28c740ba90a985860214cfb0c3b333817a71248a64f80ba2da00aa3c10428c217
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.14.5.ebuild b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.14.5.ebuild
new file mode 100644
index 000000000000..e492e0f0ac16
--- /dev/null
+++ b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Lv2 elements for Gstreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/lilv-0.24.2-r2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-modplug/Manifest b/media-plugins/gst-plugins-modplug/Manifest
index 07cf95a1f94d..b2e2de71ba88 100644
--- a/media-plugins/gst-plugins-modplug/Manifest
+++ b/media-plugins/gst-plugins-modplug/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-modplug-1.14.3.ebuild 366 BLAKE2B 347cbb40659f69dbb3df4ca316e91e1c7a6c5ee8521dcaae94df6e1d2cf8b61283ecd275c27acb3239758f58cee7d6812870818a678e3926a81417e5d26776bf SHA512 4f344b4963b0ee7f615079073722ba6c71eca2633924e457fe1c71b63763edc2c1739a920f89ce67b3a75895a44e55cc0d05ba4034115afd01f6ac34edc9a12e
+EBUILD gst-plugins-modplug-1.14.5.ebuild 371 BLAKE2B b5fa40220e069adb81f8c9cc43e8f1313e2f409efedb261bb8b0cf7efc3b15439d2e660afdd843aa192920dab1ef1a4041dec65678fe46b8ea254701e8532d63 SHA512 39943c4c11ba456fc3e73e45b8bca9c3c6cd9b0a3e77bdb4152b15a17e1629ef9c083b383755fd9f3c441516fe34236fe659287da8ff485ef7219a5ca68b0fc4
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.5.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.5.ebuild
new file mode 100644
index 000000000000..eb2a94adde71
--- /dev/null
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MOD audio decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpeg2enc/Manifest b/media-plugins/gst-plugins-mpeg2enc/Manifest
index f86b36a307e2..01496278d80e 100644
--- a/media-plugins/gst-plugins-mpeg2enc/Manifest
+++ b/media-plugins/gst-plugins-mpeg2enc/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-mpeg2enc-1.14.3.ebuild 336 BLAKE2B 91af84a87c7b6e038b617ff47b5a89eeb7d38e6e6ed8071052ab1c5788809ffdeaed4761d0d28bb4b3dea81c364f646362473c9919a8e7eb4725f9223f317256 SHA512 41684e4cb9e05c6f7b207135e6e3abc900fcc5acc0d71f1f5b9d9d647d67d0100ecb1f2dfc98dcc449e8969d830b5fd83e96625e68d7743a54961d52a54cb39e
+EBUILD gst-plugins-mpeg2enc-1.14.5.ebuild 338 BLAKE2B d9f7606e2f158dcccdd04fedbc47accdaaf65e0d17caf39b9878cc0e0af378c9712c4643660f784704bc209230d53419453b8cbb15c83560029a97dfc3996e94 SHA512 c743292089c61e07d7a67f68d104a98888105cb15a945bbbff455b36483ddf1682300f6bd59ed2ea614287573e37ad0306925bd6a4e63a44dbab4c31f96d06d1
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.14.5.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.14.5.ebuild
new file mode 100644
index 000000000000..251924e182d4
--- /dev/null
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MPEG-1/2 video encoding plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpg123/Manifest b/media-plugins/gst-plugins-mpg123/Manifest
index b9c22719d344..43cb0513d180 100644
--- a/media-plugins/gst-plugins-mpg123/Manifest
+++ b/media-plugins/gst-plugins-mpg123/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-mpg123-1.14.4.ebuild 382 BLAKE2B 6e8a4f46ea58a2d55e6db9028bdbc0f0c854b484ae4c2a419dfebcbce89ffc75a625c3851f7209f912e76018c587ac4dbd41637617ee0d1f7cb23dc4d25f63b7 SHA512 feb34596b20e947a2d9724b992c3756518a032536a5f940073cceb12cc7341ebca3512aec7b6bf9ca67afcfe3c772c4f53e9fe13459662fa31cbdbc703a2b4f9
+EBUILD gst-plugins-mpg123-1.14.5.ebuild 390 BLAKE2B edfbee4a1e46fdf63ab1455a9d732e927ea0c180394340fba8e70e8c379878d4893cedcd7bf38db3b10f5055aa273492f456ce156b9e58ddc263b1dcce959eff SHA512 e454cccb273f2648eddd283b9f9f287dfb3cddf9290c6d469f027cd3ba2cdf5d9b852dbcacb1cb1d0661838687b633cd08c898a364affd72ab23551122e49d23
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.5.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.5.ebuild
new file mode 100644
index 000000000000..ec432bb0210b
--- /dev/null
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="MP3 decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=media-sound/mpg123-1.23[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mplex/Manifest b/media-plugins/gst-plugins-mplex/Manifest
index 85c3648e46d1..38d062cd7b2f 100644
--- a/media-plugins/gst-plugins-mplex/Manifest
+++ b/media-plugins/gst-plugins-mplex/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-mplex-1.14.3.ebuild 417 BLAKE2B 2e1d5f8bb388c861c1dc8dfbcaa38e7bafb4b2ea3f36d688cce9334c0227dfcc2665aa26704f0639ed95b8e44a9399b5767152f3933e09d227b8a28d6797b315 SHA512 e334deafc02bf04426988678cbd6e81e06c43e93b8c1e2f4ffe58f354b64a1c818ba28b14072dc51ad1a0d897474ce00a95a2d202f0f9a43b67cff24c4bdef7b
+EBUILD gst-plugins-mplex-1.14.5.ebuild 420 BLAKE2B 7308d13b610d1704c4d14b9b6d1c383acb1fa99105d92c6aa1de3257ba34e70636feb675428c0951e49f2c3f530a44a8897016a8307a16a15d52df325ec25f27 SHA512 42b93f155e8c9ba0d0957d2aa189653c7686bd898c290762a10199dd016bfab2d1f5f01f487c75b26071da0036f033b4d5a3472a7745499a27fd7b4f1dfd6980
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.5.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.5.ebuild
new file mode 100644
index 000000000000..a9ae2c4c94ea
--- /dev/null
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-neon/Manifest b/media-plugins/gst-plugins-neon/Manifest
index 3eb123a3b0e8..050573ecfe59 100644
--- a/media-plugins/gst-plugins-neon/Manifest
+++ b/media-plugins/gst-plugins-neon/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-neon-1.14.3.ebuild 336 BLAKE2B 1d3b7ac4b8be7cbdec72c3b1e3a1256850483287d33255796ac32272f5a1da802354377a793d027119ca88fcf8e69faa6bb17f9a4e7b8baebf5b7275f67d8440 SHA512 0d198455770058ed4a462c926278a293af665f88f7d8a41ed6367e4e54e1b7834e9e035368bec7e9a6eebdf0a9eb71c6e0bba2883b777c43f90afbffc881e6a3
+EBUILD gst-plugins-neon-1.14.5.ebuild 341 BLAKE2B 943dd27b69f27284bbf7c6728d5e41eebbc14ca3cc3c1f3c1940d4f4f9eb36b9b4e79fc7b9eb8a4ee595b445b51047870f689d432d9a5aa0d110bf2ebf907121 SHA512 572db11e0d7c6f7ad5a34e99f8223c496b87510600c0b2724281752aac5715f30bc9bee52670e64cda0fa1f13c529d240baaf4c68b7996d7f2611a944c5e73ab
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.5.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.5.ebuild
new file mode 100644
index 000000000000..d96d4946cf01
--- /dev/null
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="HTTP client source plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ofa/Manifest b/media-plugins/gst-plugins-ofa/Manifest
index b2f88c0dad2a..12b531acd13b 100644
--- a/media-plugins/gst-plugins-ofa/Manifest
+++ b/media-plugins/gst-plugins-ofa/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-ofa-1.14.3.ebuild 385 BLAKE2B b8830639822d7aebf1f15011e73f5264e46c33776bc1eba49481fc755fa2c2c555ff8f745f1f4e3820fc45f5dc6812814b34f9a0873b62c79202847481b3549b SHA512 c93f156cb16f5029391ff9ee81c4516340abf446bfb6be573102a8a9564c89a2f6681a7051be0d34d04e1c3efde2531ec735b18f91bdeda586073e2fce459f9e
+EBUILD gst-plugins-ofa-1.14.5.ebuild 387 BLAKE2B d0b3f76277edb0256e995443db3f08d8a0f216bc3e8f1b2cbd43615481e17fd59ec84d857f6a9daa5d1e283da591958e0b325527ad01188bc3829bc442ec9b33 SHA512 62e4774316dc037fae0830d668e0c2a69fca50138ca7bdfe2a24a3f698366c7bd3aec45abb61b44fb3e04c439dbda76563d411666921cad858d36848ce373a3c
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.14.5.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.14.5.ebuild
new file mode 100644
index 000000000000..a4e7faf73803
--- /dev/null
+++ b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="MusicIP audio fingerprinting plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index 80f40887878f..e1ddfa549312 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-opencv-1.14.3.ebuild 656 BLAKE2B 46f4180df979524651d4fcb9f518b706e86380b4fea552556af0dabfd86c051d88bcb9afa9a20b8d5a622f64d17212c6141a06797883f31893fd5fc15d6561a5 SHA512 c7d027e0b5b69b54448fe7917f6332e8199c2ffb5269189cd09413d5050d77a83f7eaded9bad9a09cafc88e946cee94ab80ad32d23d58a01172ac4b0b0176df5
+EBUILD gst-plugins-opencv-1.14.5.ebuild 653 BLAKE2B 05ecce2928ca20f9219972e6fcdd021cb0bf2aaef253b908b1627abb6e48fdf245268ab55c660f32ffc63203d04bb7e28cf40475457f7a29c8d8220027102ca7 SHA512 94d76147f6be27b1e7ff6b321adfbc6a94cc1a9b99a8c9ea575b4ff6417eec2c00cf8e6a3b54370c5ab8801a237ff6180d6c969d8b4e909948b322ce22c6bb0e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.14.5.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.14.5.ebuild
new file mode 100644
index 000000000000..ca235c56e79f
--- /dev/null
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.14.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="OpenCV elements for Gstreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/opencv-2.3.0[contrib(+),${MULTILIB_USEDEP}]
+	<media-libs/opencv-3.5
+"
+DEPEND="${RDEPEND}"
+
+# Ships the opencv separate helper library as part of gst-plugins-opencv as it depends on OpenCV
+multilib_src_compile() {
+	emake -C gst-libs/gst/opencv
+	gstreamer_multilib_src_compile
+}
+
+multilib_src_install() {
+	emake -C gst-libs/gst/opencv DESTDIR="${D}" install
+	gstreamer_multilib_src_install
+}
diff --git a/media-plugins/gst-plugins-openh264/Manifest b/media-plugins/gst-plugins-openh264/Manifest
index 15972cbcfb34..ee9964ebac02 100644
--- a/media-plugins/gst-plugins-openh264/Manifest
+++ b/media-plugins/gst-plugins-openh264/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-openh264-1.14.3.ebuild 330 BLAKE2B ca7a30601574cc92a178ff2d2c42c08675a886ee253fb023b64432ec67b9d5974484ab4be01310b17179ce1da8a3ea9e755884ace8bd2e08f000dc4ee673d674 SHA512 6f5f785ff6191cc09ee7c38caab00e2fc4e3ff3b44554539bf32ac042dbb9f1a93a9663c710395a8fcc87d49315ef5969cb51b4ae59a94b0724a94b43b0e7269
+EBUILD gst-plugins-openh264-1.14.5.ebuild 332 BLAKE2B 18c1cdee92f2c5d6b67da749501b102d83d3438d1c3876004e75ca17573aab1ab61f297df7a6cbcb4e9ca67e6e8593648addb6f943978a9da68bb844b7359599 SHA512 7c37d44e1aa7dce2b639281484d569a78210426e49e25c9ebedea1e568cbfd8c17b6396e9f836d9e7776affd6db3415729618dab16b49ca23c717b3353e998fd
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.14.5.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.14.5.ebuild
new file mode 100644
index 000000000000..537152c10af2
--- /dev/null
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.14.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="H.264 encoder/decoder plugin for GStreamer."
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/openh264-1.3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index a8c06c084743..154dcd33da03 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -1,4 +1,7 @@
 DIST gst-plugins-bad-1.14.4.tar.xz 4678032 BLAKE2B 098d0b0600efb9f7926295fdc34d448bf9c9a719b9061d5be2282c6f5d09550b52f7ee78e90398577c21db2bf05510d74a5880d1d401a4931a0dea2b81509973 SHA512 a5bef1863110ae25ef4c75ad2cdbbde011e1d1a722754cc0372e8de9c81aee9159e2301d90d6f9b04b66a20887abe20de20d74dbe207d20102e8081130eaf839
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
+DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
 EBUILD gst-plugins-opus-1.14.4-r1.ebuild 1248 BLAKE2B 3d4e072c529f8ed0c0310c7f371f273af4ef74226b41eb350ef2a3bc5fd17b5b953c17884e3f95ffdfaa34b6f8dc56d6bbcf048225c606436b856f0e8373f75a SHA512 f91065bb4a536ec9e7fb65f18daed71c1e3367f1b69adf60c51d56461e0b88843660eadf5bc08f2264c8329f63997bfb29447ecb2e0c565c0645383324eabb11
+EBUILD gst-plugins-opus-1.14.5.ebuild 1256 BLAKE2B 38fe7b8760c8dfcd38a42e936d2f2cbfd268cfa89d9356874c83b4caff253734042c4a695d400243ca7854cb8ccf167c0770343077c58cdd17c47f7c070139f0 SHA512 172cfea4aa5a889a28d7de316787b42bc1109d1e3077c85afc454220f7981a4fbc6878b211447df02fa199c693bb0e3266b7765a1b827000385ed4b2e63a859d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.5.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.5.ebuild
new file mode 100644
index 000000000000..070d047fd926
--- /dev/null
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-base
+
+inherit gstreamer
+
+DESCRIPTION="Opus audio parser plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
+
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg]
+"
+DEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_link \
+		gst-libs/gst/tag:gstreamer-tag \
+		gst-libs/gst/pbutils:gstreamer-pbutils \
+		gst-libs/gst/audio:gstreamer-audio
+}
+
+# Everything below is for building opusparse from gst-plugins-bad. Once it moves into -base, all below can be removed
+SRC_URI+=" https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.${GST_TARBALL_SUFFIX}"
+
+src_configure() {
+	multilib-minimal_src_configure
+	S="${WORKDIR}/gst-plugins-bad-${PV}" multilib-minimal_src_configure
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+	S="${WORKDIR}/gst-plugins-bad-${PV}" multilib-minimal_src_compile
+}
+
+src_install() {
+	multilib-minimal_src_install
+	S="${WORKDIR}/gst-plugins-bad-${PV}" multilib-minimal_src_install
+}
diff --git a/media-plugins/gst-plugins-oss/Manifest b/media-plugins/gst-plugins-oss/Manifest
index 79aa619021e6..79998eb903cb 100644
--- a/media-plugins/gst-plugins-oss/Manifest
+++ b/media-plugins/gst-plugins-oss/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-oss-1.14.4.ebuild 376 BLAKE2B 6b401a5a47f045a671f4790268d967c5f8c9ab0cb3a7900e7403231eb82b8eb0e78bbc7273d461892da2163de35844bea9e49ad738366e990caa4071aca7e75d SHA512 70d98f7b864776e4dc8111c13bacb8407ab4df55210f064aa8da5772fbd427107bbbf93b97b3f195dbf42b91e061c0ebef966a8710b4be2ffcb13e3ca34a47b2
+EBUILD gst-plugins-oss-1.14.5.ebuild 384 BLAKE2B 0e16b02b270bdca98cf535c1daf2174b075c190a351717f53e1c392c1eac7dd85e82e8115e63b35b53aa11a562a36c0a26a8004b2c229104bf00712ee8347f9b SHA512 73afae7f4333ecde42e555a45410d8112d34ec3237204f3eb5d324cc8eb01f9a673debe7bdeb7b648a11ae1f487bb53a41b1228f06e55a09fc68cd093f77e708
 MISC metadata.xml 488 BLAKE2B 72817781f31070fbba548a5a0e724d3a3a419f55b2c1ba1155e88f66b0f779d34fc5705c39d60ecc5c40a9ba47ed568aa2458c0557de1795ddacadf54b39a436 SHA512 6ab36e28308e33d9b2e74a419ed558c913510f23bee1fd1a58ff87c6937dc2c3b4c8c683831e771460258424e89797a6b8c5ebed95cb87506ae7d67c11b2c243
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild
new file mode 100644
index 000000000000..e1e671a3613b
--- /dev/null
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index c61622668bfa..dbdcfb2009c6 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-pulse-1.14.4.ebuild 457 BLAKE2B 710029c2982bfdfe57f2af044e868234a7eb6dbe7a40b5fbc246d4627ed3109eb10d570755da7f1d20b4ba2280635cc0654fa0be8143894902e7a2d323ece4b2 SHA512 c17bc2ff852a4773a0e11183e545d4732f3ec69c46f8f7aa579f5ae13a5ba2521996836f3a735cf162f58f28c56df57cdad586ef64c4a183d407cb0e3f534943
+EBUILD gst-plugins-pulse-1.14.5.ebuild 465 BLAKE2B 81b961900796868c39c80c04640f18c75fb62aa3287beaab7da830e1b9264e20952bce0ad3e93d3335c036b10ec338c59dc8f342feb1056e0a3872250d9e1815 SHA512 7e3383e55407e10d0935ffa4558caeecb7102ba4a4d12234f46b37691afea52d9d41fbfe7c2e627ac7f690b6010e2a872ec3f46a4cb33a3aa8f238ace3671f88
 MISC metadata.xml 610 BLAKE2B c8d30b8baa2a2dc5dc43b2a0f5badcb212567f7ce4873f58b1662b3454c8232a4916f10470bb98c3dae745f818f0e02d7266542d44d3fd4b9eb7edf99bf2a419 SHA512 0f0fa4496446fbaa649c3d76538c4960ca0d7918b40e305aa0da8516e79ef25c10136b0097fd687cb968c37de636b57ae667be1bc3197a571f557400a9c0c478
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild
new file mode 100644
index 000000000000..bdab9cb1ba14
--- /dev/null
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="PulseAudio sound server plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-raw1394/Manifest b/media-plugins/gst-plugins-raw1394/Manifest
index d4afb340aee2..ae40e0d556b6 100644
--- a/media-plugins/gst-plugins-raw1394/Manifest
+++ b/media-plugins/gst-plugins-raw1394/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-raw1394-1.14.4.ebuild 514 BLAKE2B d499ca202c465c73bb7dd0713e6f73326cefa36d228db31ac47db5bb8e6b296fcabbb53895100902a24f0b26d3d73b2f224a43c6d4ea74268196e76dd3741f6a SHA512 77b2bbf8e74f73dfef7652c7b8085a80720fd0d44fe15bf8af80d8078b05e466614ddca19be0b542969f0b295cb170786fb1b4f3f83beef3afcfee660b10fc0d
+EBUILD gst-plugins-raw1394-1.14.5.ebuild 518 BLAKE2B d9a8701ce1d81ec76c7f83fa0d5d02ee8824117fed3165f7931046f48904b138a4b24730c72cd17f00eb5fdf2ff5cb8437110f3b03b14d80bf22e4a9a2735306 SHA512 92aac9526c5035e8da04773b11d25d57a461f642356159dcafb91f88e18ebd9cfba360fd81048963833653dbdb50c353866a9ad1f2d4e9cec43aca29d02c06e4
 MISC metadata.xml 548 BLAKE2B affa90bfebf1a2616bfe7262f0850227bdb4aac3580924c58fda8c1c9c89fb288252c921c73404149d02c8f1d38f61840301bdfdea01608a3db14e5e8b0b08a6 SHA512 ad3c3f4e095d868f0df4f869fe521f3c51ada956f578b995bd9e7161ef679c5c395434a76f4ddcfe1242dc37790e8f1ffe0167c8a50c686d434747563c151031
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.5.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.5.ebuild
new file mode 100644
index 000000000000..16a16e5a4dd9
--- /dev/null
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="dv1394"
+GST_PLUGINS_BUILD_DIR="raw1394"
diff --git a/media-plugins/gst-plugins-resindvd/Manifest b/media-plugins/gst-plugins-resindvd/Manifest
index 4e05275a807b..a6fbea039a18 100644
--- a/media-plugins/gst-plugins-resindvd/Manifest
+++ b/media-plugins/gst-plugins-resindvd/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-resindvd-1.14.3.ebuild 452 BLAKE2B d9a19027ecebd7ebedbf32f72874bf4f79bb071193afc969a8d7a1c4254c30f1dff52545791746b6a40b18c1cc7be8bec568f5028e9782a0f0f943e7fa5247e2 SHA512 c5c585e79b1736762b647fbcf3d49257238d8d008d2e71b8c8c1c2cda3202d002e592a0403428f5d3e7b506f48b74dfc9c126af6f070e8250eef03f57f3a1f14
+EBUILD gst-plugins-resindvd-1.14.5.ebuild 458 BLAKE2B 78fe119f9c09aec03376108252323c51c1d0a9dfb0cf949774541e71ffa60c18b5daeec983eddff7775ff45d3410f9cf5b86b1f8098d80fcecd41ab6e41b5bcc SHA512 4cb5f9e7d829886735d8beb22cc74926d96d845571d3c288414696527d2257a431312251c7722b9c641ab98251d19a2dea43f1fbdccee168b69727a3a02e2255
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.5.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.5.ebuild
new file mode 100644
index 000000000000..ab22ad1bedcd
--- /dev/null
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="DVD playback support plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libdvdnav-4.2.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-rtmp/Manifest b/media-plugins/gst-plugins-rtmp/Manifest
index 61479f06aecd..29ecdc5f80e1 100644
--- a/media-plugins/gst-plugins-rtmp/Manifest
+++ b/media-plugins/gst-plugins-rtmp/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-rtmp-1.14.3.ebuild 332 BLAKE2B a06f090240d6d552c0d8b8cfec19a0b3dd8c3018677036619f27d04ffea008b074afb61b158a404abdafa773c948020cfec3c6ef9e362ba8d7bdfd8767ddaa80 SHA512 c08539c5e593a9aa6c95e84e537657a203b2b3a6e9830f66a94e9b6789141892411036dae076c6fb00ce978dc3a85b27cf24017b62698c79c3d9d36eef89ef45
+EBUILD gst-plugins-rtmp-1.14.5.ebuild 334 BLAKE2B 9049dfb3d5201f983f52fe820474be110875b42a460a24462c9b9ab7eeae6a6ecd3c7252a9d2138366b2453a370d1b2ed4d84d0c59fd9feb19f1134c330d01b1 SHA512 2a850656f8e725a129c9e4ff40ab0ae146f270bf01d0c268602fa903644be42a4bc1affb9140621752b30988eb2811c0e909d2ded3b81874d2f875ae5e715b15
 MISC metadata.xml 419 BLAKE2B 8e461a2732df916b2d78bf38497df7061a3617920e155157f6cd62e5658187ea94d4ad328533c950a9554bbd9f3c427a1b616a7a882bfc977b349746ced681fb SHA512 c157a5142e10bd93420db567edc321580c57872558473b0181fed12b688164dcd928cb19c983b61602583edcbf333ac685dec141be5cfc5a207f8b849f64046d
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.14.5.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.14.5.ebuild
new file mode 100644
index 000000000000..939b7ec9a0f5
--- /dev/null
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="RTMP source/sink plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-shout2/Manifest b/media-plugins/gst-plugins-shout2/Manifest
index 8a2f99872f4c..8bb4826196d5 100644
--- a/media-plugins/gst-plugins-shout2/Manifest
+++ b/media-plugins/gst-plugins-shout2/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-shout2-1.14.4.ebuild 346 BLAKE2B 43d9409aec1c930a7ab170f0469426de65e97f64d3580e3d8c8855b7281ab4b517b2607ecd58dc76ef4fe3de4f25279aee001f75f383d2b2143d6917f364cbfb SHA512 d2230cdd0ed2e995fbd1f0269a4cc22e6574f0d3b2d9a60aa77ae424b7209e84371c37887a0a0b2b81e3aba32c8c5f841d9fd573692cf2d797d547f4949c94f7
+EBUILD gst-plugins-shout2-1.14.5.ebuild 351 BLAKE2B 93c9978e167b928204be1bd1b083f7c508547417533a6293decfbdaec48d851da24f0131ec3d412b31868b5c98ebe9f9afb3cb1ff446ca74ad0cb3b3be7db013 SHA512 730db94b1a3dd102b040a664af80fe4b4eafa859418048c51470f36bd372cc4597d408bf9496ed368aa7060dd885b1417947e8c3807e74210059d6c743808edd
 MISC metadata.xml 478 BLAKE2B 4c7e5bbe6d79d01544434b93b998847f6c5e3fa7bf2b979c9ff0238d75c0f1ac5693cb4224073926b6cf098a661fc5064f9ba2db3dd2b121093ee78cf905b1ea SHA512 a24a36ebfdfc159df5e23891118ea4e21855a4db31c1ddee9a081c55597be4f34014adbf0a46712d202f1557f2a63e776382c86ce5193465f35868c91114cc52
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.5.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.5.ebuild
new file mode 100644
index 000000000000..095bac7572b9
--- /dev/null
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Icecast server sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-smoothstreaming/Manifest b/media-plugins/gst-plugins-smoothstreaming/Manifest
index 03ba44d3c6f9..3af040482621 100644
--- a/media-plugins/gst-plugins-smoothstreaming/Manifest
+++ b/media-plugins/gst-plugins-smoothstreaming/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-smoothstreaming-1.14.3.ebuild 1356 BLAKE2B 13243bf1f53db280eb0f8076e84ade16e91341404cef5343883afe4fd49d432cc7bc5bae11e6a9ba8920a91a8bd8eac9a5d0b4a411000c8de01859099e572621 SHA512 d470e7f1c6f1b10b90bb703c03e00f8e90a52f296d9a52a4680bab34972397a5ba643cee922d4d871a7caa09df7d05980905ea1315490889d51a437cd6d4b8c2
+EBUILD gst-plugins-smoothstreaming-1.14.5.ebuild 1358 BLAKE2B fbecb012ba9f34875c616f057b9731a0ffd7d9dacffef8d1a82afaf03f8f5dfd1e7102b972d8451cefdaf947a502f33c5e2c52c4ccf08aba04a704cad06a68d5 SHA512 39b98f6487664c325709bd1875203ca8e652d84a7774ad81791aa47271970b032818b691fa3ff28489952914ea982e010d5592d02e97a4ef3146e66bf529f870
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.14.5.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.14.5.ebuild
new file mode 100644
index 000000000000..3b3c77f7d046
--- /dev/null
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.14.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Smooth Streaming plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# FIXME: gsturidownloader does not have a .pc
+	#	gst-libs/gst/uridownloader:gsturidownloader \
+	#	gst-libs/gst/adaptativedemux:gstadaptivedemux \
+	#	gst-libs/gst/isoff:gstisoff
+	gstreamer_system_link \
+		gst-libs/gst/codecparsers:gstreamer-codecparsers
+
+	local directory libs
+	directory="gst-libs/gst/uridownloader"
+	libs="-lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgsturidownloader-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/smoothstreaming/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/adaptivedemux"
+	libs="-lgsturidownloader-1.0 -lgstapp-1.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstadaptivedemux-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/smoothstreaming/Makefile.{am,in} || die
+
+	directory="gst-libs/gst/isoff"
+	libs="-lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstisoff-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i ext/smoothstreaming/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-soundtouch/Manifest b/media-plugins/gst-plugins-soundtouch/Manifest
index 63153806487e..08d9e960b875 100644
--- a/media-plugins/gst-plugins-soundtouch/Manifest
+++ b/media-plugins/gst-plugins-soundtouch/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-soundtouch-1.14.3.ebuild 360 BLAKE2B 206ce13fa48219b2ff90a26e5981fae94b6a5735e999c88a634a515669934b217ef8f643a978e47bcde632179aacb14386b399ba66480c294ce44786be6a161f SHA512 c787f1aaf44156b972be8ba60ecb1424297c970c4662706cd40fc19d23a4fbe757ba2bc8d698ce56797d44d076bfc5c01b3ca2ea853498d00020fb64d42385e4
+EBUILD gst-plugins-soundtouch-1.14.5.ebuild 362 BLAKE2B 434e603dd8d05c6eb2868dc2965e193dd01880780c91ed9675cab55f67be9eec20099603d8246f2dbe530041e24cca982f2ad93d9724e05318667c81cddce524 SHA512 9450875a185e178a76ab3c22d18f1ce46173d65591d73590a97b221f9c234ac51afa1defc2034fe77dc88581cf55b4691319f6ab22da6f2a534e2f31d2e60264
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.14.5.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.14.5.ebuild
new file mode 100644
index 000000000000..78edac2abb96
--- /dev/null
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Beats-per-minute detection and pitch controlling plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest
index dcc7cba2e8b4..9a3616e348f0 100644
--- a/media-plugins/gst-plugins-soup/Manifest
+++ b/media-plugins/gst-plugins-soup/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-soup-1.14.4.ebuild 414 BLAKE2B 81b9d822b76f819543d331bd8fe485e499ec45c7bd74fd45d99dc2750f44bfc67f9617c00be1596741c50f39069f468bdf79bb4b2369cd71b857ee35422eb706 SHA512 a45790c8666caa22d828c672ab0acde3bc5dae5ea5656fc6096fab55b40b15d930ff1a7b65049d55628596071ed6a8593fcbecbe089f4dbd0316e68c10b0323f
+EBUILD gst-plugins-soup-1.14.5.ebuild 422 BLAKE2B 62f1a843223eba150b5511bc10959fa8de2d13590171f9c0f8174dbad127cad43614c718a2eb8a1a0c1acd0e86df591caac9839578e71127a5c1239016bf7862 SHA512 4aa1f41c686edf3a7e7d45baeb63de3731bd9163668d5f35bf915cb45435ceae113dd2b2910d84dcd0c5392de214c0400d61f7e06ebdb73ae3c858bc7aef2025
 MISC metadata.xml 552 BLAKE2B d1dddafba0b921d7484d1c52567a8b9fbecc611b5234bc602cef79c7953a2a3a9bb423bc929055127ab894506409ddd8e8a71cb432169b1370e65b83b2e4341e SHA512 ce8b5a2a0d33e00ef141b82b3c6d192e31b681f016f431f1306d2066677d7fac66135129f57d25f9d13644c9d3976baf74fa6e6f65f5feebee045b82d04e2d8c
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.5.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.5.ebuild
new file mode 100644
index 000000000000..925ff0d4dd6d
--- /dev/null
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="HTTP client source/sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+IUSE=""
+
+RDEPEND=">=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-speex/Manifest b/media-plugins/gst-plugins-speex/Manifest
index 072184544fbc..3482b0d4094a 100644
--- a/media-plugins/gst-plugins-speex/Manifest
+++ b/media-plugins/gst-plugins-speex/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-speex-1.14.4.ebuild 380 BLAKE2B 2470d4caf3708cfc7ede8dfbd3df039b49dc802e6315527d714a5889d6232895e02a54e921cc35dedf5e9c17babd38cf5ea5b78545fd5e6125a18c7c352deed7 SHA512 aad10e56466c57b9ac77b0965ba7ade9b18928590a74ede9e41ee1eca34475aa5ebc48d3f801b8e313fe901962a28029c1c7f6a77373c7d006850b472557a752
+EBUILD gst-plugins-speex-1.14.5.ebuild 386 BLAKE2B f7efd28934d5cb22115f37c1717959fa5d0734c6d30bad7079aa82cfe930de4a68eccc27cb370ddd268d6dab6c1a3ed12d16110cc64fcfd45c371fa275814818 SHA512 1766a4cde3ec3f76717f820628e62e0e8796d6ba2d29ba0688f634d175b0e6970bca62812f4a4eec0548164164d0ec6f8c62197a8f35fc2aef2bf62d0c64bf9a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.5.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.5.ebuild
new file mode 100644
index 000000000000..891214b2286a
--- /dev/null
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest
index 9d597efa33d8..7dae5440a294 100644
--- a/media-plugins/gst-plugins-srtp/Manifest
+++ b/media-plugins/gst-plugins-srtp/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-srtp-1.14.3.ebuild 383 BLAKE2B a7b0328ce6ef8bede9a9f21759571b469a67e66399363ad58795a135956049bcf5f94d752fa77d49a2a56389053415e6dec1984fe2e029ef9d4577100426fde6 SHA512 125381a656a7d8e29b2aee9ff2bf72a6541ce65949afde23e15f7b7d7ce46b52f1cf28f5fa22df18d264807844d3a0bb3e5d57dd18017ef3c677e28ce8128456
+EBUILD gst-plugins-srtp-1.14.5.ebuild 390 BLAKE2B d0db5ce7f3b360486cead14fe6ba7c9a09336a096c12ef312dfe672346a9dde121f68a4c729894ac273b31dac869c81a4f2775d4c830cc6e1e522c2adbc0dbf9 SHA512 68f1ca735880982fb9dda75b6bcf1da6f22dd57360ff5586456a9a3b60dbeabd6cbbd5485aaccfc8ac8cebe5a8b4aee4d1c634049cfb31c6593183d5fe8bc1ff
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.5.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.5.ebuild
new file mode 100644
index 000000000000..60100c4ef669
--- /dev/null
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-libs/libsrtp-2.1.0:2=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils"
diff --git a/media-plugins/gst-plugins-taglib/Manifest b/media-plugins/gst-plugins-taglib/Manifest
index 626e42f4a8f6..ae8ad3c3e6bd 100644
--- a/media-plugins/gst-plugins-taglib/Manifest
+++ b/media-plugins/gst-plugins-taglib/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-taglib-1.14.4.ebuild 397 BLAKE2B 65c28267767dd74cabe5b0d626f3fd12464f9d323b389575f8fbc6c43f9ad0d99aea5a615808147621ab615c3611710c2768ef3152be9ee535621b225cddd7ef SHA512 e65c02d4bae55ee441c8f015a0ad7042f067a049bbabc8da4f40ab76b50ce982530b8379ee0448edc3e13fdefbec9069c2e270a289a9474600eb0219f3c5a2d3
+EBUILD gst-plugins-taglib-1.14.5.ebuild 404 BLAKE2B a1b15792fbe0d7fc6a6f7049c3dcbb807b103a648f2007548619ede192b2e4aa31adceaa36339b93bc195a9336937d97167cf3997d1d5ea4c78a50a944a23528 SHA512 dfe1848b53772c85d2d9e5017d72c3aa18e0477fc57ebd4fff88d82f710dd126220056a49a0cf717c0c974132e08e606c9156d2fa6de0bb5dff5f37d88358fe8
 MISC metadata.xml 472 BLAKE2B 2ddad354e550883322f2276a979d7cace56275d6b0ebe9301c40a6204043c0a05b0efae27cea079bdf1c0c04b8f588ab39e080d8b0e4f405c0d0287a00c4c746 SHA512 8ddf53f0cf2e92dbc2adc5f4910b2a6fab0b0ac68eb9c9c33fd94809714d0f10d0d9d546df012a70c5d9a13adce7cccc232be4fc107b63c4649ba3ff0ff32444
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.5.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.5.ebuild
new file mode 100644
index 000000000000..adb3bd6f2856
--- /dev/null
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest
index d66775870c2e..a87198364c66 100644
--- a/media-plugins/gst-plugins-twolame/Manifest
+++ b/media-plugins/gst-plugins-twolame/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-twolame-1.14.4.ebuild 359 BLAKE2B b2c6acbc01e825bce562e533131297990c7741e9225bcd5b2c0ad24c3ee814ed6dd6d52cec0db3492a1b537acb42541a90bbe52dd356e8cbb8b07d7a175819fa SHA512 242ade188f67cc8b3f92914396943207ee40f15f2005593a937fe8e7affd833f84cf8066aeee72b2dc2adeea9ebb58bc18ca4582a70a91c5700a7aa493f658a1
+EBUILD gst-plugins-twolame-1.14.5.ebuild 364 BLAKE2B 16875bff3d1dbe6a404764000c266191c4c69cbbbdd1a72a72e6cb0caa1084f84374bfe09a994eb549445037bea74a8b756a16e86e9e7174bdceeca7b81fc017 SHA512 792565377d730aab878f0260e2379ae32878b99daec248453ca0d51bde0960b3f53a0d02e776cf2bc25f1e50930b48eeab0f9ba3c6f19f38ea7d20aa84b2d7f0
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.5.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.5.ebuild
new file mode 100644
index 000000000000..0eaeaae17fd0
--- /dev/null
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="MPEG2 encoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-uvch264/Manifest b/media-plugins/gst-plugins-uvch264/Manifest
index 1575b33de68e..7946dc7c45c4 100644
--- a/media-plugins/gst-plugins-uvch264/Manifest
+++ b/media-plugins/gst-plugins-uvch264/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-uvch264-1.14.3.ebuild 801 BLAKE2B 3b1a58f9d31cac0bab20a2fb75a99b9c126350b63c4f17513e62c9929051d27a270f1edbca728093c6436cf18db08011978ee413b05a17eaa8e18a24fe5f5390 SHA512 5c042179d5a2a557ff759c1f9fb3c426abb6969de0a31302981dd451345348b6d87d359582709393dc039ed540a8a5b038562b99d77fc7541f8680117c367355
+EBUILD gst-plugins-uvch264-1.14.5.ebuild 803 BLAKE2B 6a9b60be07ace1a2d71f09b356f46497a673a7ca6a53a7acb604b193079a7fc2badd843cf9eb4a072226772ec86da07457e9d254024817fd21fc360c372dd8d2 SHA512 ecfa625f59f73250f3e4c72d5a9582b5a40c4b238537502fabfb78fc6e8903ea5229714361e8bd96912f0e8c629f34e5b30b42f4aa06032914127cb4be4dfb5c
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.14.5.ebuild b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.14.5.ebuild
new file mode 100644
index 000000000000..b2560f32fb95
--- /dev/null
+++ b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.14.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="UVC compliant H264 encoding cameras plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/libgudev:=[${MULTILIB_USEDEP}]
+	virtual/libusb:1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# FIXME: gstbasecamerabin does not have a .pc
+	# gstreamer_system_link \
+	#   gst-libs/gst/basecamerabinsrc:gstbasecamerabinsrc
+
+	local directory libs
+	directory="gst-libs/gst/basecamerabinsrc"
+	libs="-lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgstbase-1.0 -lgstapp-1.0 -lgstbasecamerabinsrc-1.0"
+	sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+		-i sys/uvch264/Makefile.{am,in} || die
+}
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index 1f7ec698bcb2..307c1060564b 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-v4l2-1.14.4.ebuild 660 BLAKE2B b226340d7270d0582203a7dba0572b952f47f04db95cf1da23fd4b6628c13fa8dac334b404ff3306088998d8988fb05174a3785ae20de97bca1d052a08f47495 SHA512 d6e45c89226b36bdafb2c9713cf01735f2cf45127bd5e299cabbb8b8c6bb0f3bcbb068b917b1ad3e136ce09dea1bdf5b189ab68c80db769dbdefa0089b02c897
+EBUILD gst-plugins-v4l2-1.14.5.ebuild 668 BLAKE2B 815b2d5ad9472a2bf3e47fd4bff34f22d1392458772497ea893a02d426d22ea98d8faf72008947ad67480230ca213e2ad4261714ec3385b1f9839941467179b6 SHA512 c1862d3a57603627fd52d0ed3b53fed430780655ced9f95b7bff2e8107910e837bf0f6748a143f673daf32661c40e8f15e597e6e5524ed7249e613e7c9fc230e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild
new file mode 100644
index 000000000000..b64ad19c99a0
--- /dev/null
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPION="V4L2 source/sink plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="udev"
+
+RDEPEND="
+	>=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	udev? ( >=virtual/libgudev-208:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+"
+
+GST_PLUGINS_BUILD="gst_v4l2"
+
+multilib_src_configure() {
+	gstreamer_multilib_src_configure \
+		--with-libv4l2 \
+		$(use_with udev gudev)
+}
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index 7df7b599ae40..84c486fcc8d5 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1,6 +1,8 @@
 AUX 1.14.1-fix_no_GL.patch 968 BLAKE2B 31c0857fd971f574455d9fb74ae73590f868c50f60d145fb16a2370ed84a34d3069b68ec3d4b810e023f4fe76dc0608281a0d68f5169ec1e7fa17c0424b09eb1 SHA512 56bb4fcede23a85b52efdd4c008665caef1c78097c899261c8ea702bf04cb91a12175eedcf00b0b3f74de43b80d83dee2a043f1552e2f852f7d372e7b112f5e0
 DIST gstreamer-vaapi-1.14.1.tar.xz 1064992 BLAKE2B bae42e3cafc6d1e5799a8ef795f9e1f6a6ac60b6878aea1aed81550fd7e408c5104b5ea89d6e5f7535ac8d21fe5f14fccf061e15eb68a7c1c60c29ad4a4deabb SHA512 f1eecb61cb92439d93a47ac162a5cda8a456dbb205594f378e8adf98c45e4cd59553ccfd3bbcf1c6a568c6af5e7834bbfb0ea17610f0c7e7c9e268a4eeb5b020
 DIST gstreamer-vaapi-1.14.3.tar.xz 1070536 BLAKE2B 7e3458702072d96acc31c1ac5c4ec9f23f6d618ba922884fb141a0897a04959da7f34c7abff7765f086357d3f8f7532a1582508d117c199f76338ebd3723c6ae SHA512 b89acf63c2900b0cd588cce1a06d959a4f8bbe929c237fce985d3cfce7b94d43a3317f06a42fa77e3ff790fff8a81c8bbeeed7ac797794e4cc3342f18faa69e3
+DIST gstreamer-vaapi-1.14.5.tar.xz 1068344 BLAKE2B b98363981dc7f111fc8c15188d31dea394b7f6cf300050b95d564b75020931a0f8690d11410f2d3d18d6649ef2ee290c933c3731b4bc3ca43bffb57a4c1bf542 SHA512 287df56ad9bb3fd0754b9f307082eb180c8f0b622e2c9436c5dcf2272a5fb620cb18970726d231688837d52cb169a10e98e14160e51fd82198c34ea612c0d60b
 EBUILD gst-plugins-vaapi-1.14.1.ebuild 4370 BLAKE2B 8d60914ba1e5e0bd34b52b475e9983ef3b3a87a0ac6b7c0eb6371ecb117d0815d9b95ce3e77204d244fd89646f4a2192951a905e9344876dd0ec4e488e9baa50 SHA512 d06e03d685ec3ef91910528bd64bdefe62f57d01bddc1fda9c86a74db7c36a638e229dd6beaa76b52ed4c6889a79d5e2cfa761b72fcd864b06be202924dd6f9c
 EBUILD gst-plugins-vaapi-1.14.3.ebuild 4319 BLAKE2B 3ca09ab2034b20d6d7743bc4bb20a1fd5ffe3f70f67033ff8f368f902c0dff118bac399c1d5276ecb57cf33dd9edb6efb946554d36886c59023cdc09e36cde1f SHA512 c7099d59ec2f42addba8f79ccdeb6737fa9f509455d16be184960166281129922fa6c455d09af63cae90b53a7efd0ee350f7e2f474421208d1feb1380436cb99
+EBUILD gst-plugins-vaapi-1.14.5.ebuild 4322 BLAKE2B 18b1906fb1217bd45a1f52905231b991be440ddf6003ba5af446048f343da23f851a28bc46812eed214a1e1be26c0536f41390e8c029e54d5a81f37da72ffbb2 SHA512 fea91142756160de127c068ce792083cad21952f8278aea31191541235c763bd979eb2e1dc4daf3beec73e65395320ee17a5ef704c86fc843e086915eec64a6c
 MISC metadata.xml 433 BLAKE2B d46828441b89363cce84ff10747ad13f30329aea96cf2acd2fc7deb786c3f3ec0ec5a86011657d39ac905f9f33a3904b38860b16f53cfb150530cc4142f1beed SHA512 366bbe78a862a65a8b82ee43521508db5766cde3a72f4ad8e7f0b703dc23347589e07dcfdb3f3ec12e62ac91adb38b2a58cee5dff4732069ac2b8724524a405b
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.5.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.5.ebuild
new file mode 100644
index 000000000000..7212411033f3
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.5.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+MY_PN="gstreamer-vaapi"
+DESCRIPTION="Hardware accelerated video decoding through VA-API plugin for GStreamer"
+HOMEPAGE="https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi"
+SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+drm +egl gles2 +opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
+
+# gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
+# we design gst-vaapi ebuild in terms of GL API as main choice as well, meaning that USE opengl and/or gles2 is required to
+# enable opengl support at all and choices get chained from there.
+# One or multiple video output are required: drm, x11, glx, egl and/or wayland;
+# but GL API is our main trigger, thus USE=egl should be ineffective if neither gles2 or opengl is enabled;
+# So "|| ( drm egl opengl wayland X )" would be wrong, because egl isn't built with USE="egl -opengl -gles2", ending up with no video outputs.
+# As we ensure at least one working GL output with other REQUIRED_USE, we can put gles2/opengl in REQUIRED_USE instead of egl, solving the issue.
+# gles2 API only supported windowing system (on linux) is EGL, so require it
+# opengl API only supported windowing systems (on linux) are EGL and GLX, so require one of them (glx is enabled with USE="opengl X")
+REQUIRED_USE="
+	|| ( drm gles2 opengl wayland X )
+	gles2? ( egl )
+	opengl? ( || ( egl X ) )
+"
+
+# glx doesn't require libva-glx (libva[opengl]) afaics, only by tests/test-display.c
+# USE flag behavior:
+# 'drm' enables vaapi drm support
+# 'egl' enables EGL platform support (but only if also 'opengl||gles2')
+# - 'egl' is exposed as a USE flag mainly to get EGL support instead of or in addition to GLX support with desktop GL while keeping it optional for pure GLX cases;
+#   it's always required with USE=gles2, thus USE="gles2 opengl X" will require and build desktop GL EGL platform support as well on top of GLX, which doesn't add extra deps at that point.
+# 'gles2' enables GLESv2 or GLESv3 based GL API support
+# 'opengl' enables desktop OpenGL based GL API support
+# 'wayland' enables non-GL Wayland support; wayland EGL support when combined with 'egl' (but only if also 'opengl||gles2')
+# 'X' enables non-GL X support; GLX support when combined with 'opengl'
+# gst-plugins-bad still needed for codecparsers (GL libraries moved to -base); checked for 1.14 (recheck for 1.16)
+GST_REQ="${PV}"
+GL_DEPS="
+	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
+	media-libs/mesa[gles2?,egl?,X(+),${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-bad-${GST_REQ}:${SLOT}[${MULTILIB_USEDEP}]
+	>=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,${MULTILIB_USEDEP}]
+	drm? (
+		>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	)
+	gles2? ( ${GL_DEPS} )
+	opengl? ( ${GL_DEPS} )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+multilib_src_configure() {
+	local myconf=()
+	if use opengl || use gles2; then
+		myconf+=(
+			$(use_enable egl)
+			--with-glapi=$(usex opengl 'gl,' '')$(usex gles2 'gles2,gles3' '') # It's fine to have extra commas passed
+		)
+	else
+		myconf+=(
+			--disable-egl
+			--without-glapi
+		)
+	fi
+
+	if use opengl && use X; then
+		myconf+=( --enable-glx )
+	else
+		myconf+=( --disable-glx )
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		--disable-debug \
+		--disable-examples \
+		--enable-encoders \
+		$(use_enable drm) \
+		$(use_enable X x11) \
+		$(use_enable wayland) \
+		--without-gtk \
+		"${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-plugins/gst-plugins-voaacenc/Manifest b/media-plugins/gst-plugins-voaacenc/Manifest
index 98876667fba0..ce99691ca2e8 100644
--- a/media-plugins/gst-plugins-voaacenc/Manifest
+++ b/media-plugins/gst-plugins-voaacenc/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-voaacenc-1.14.3.ebuild 319 BLAKE2B f88aacd8bfad7c6e95848c6f874784109629cfefe5564408d8d5a02cd65cb2a69a3a1b1df6f484ebcc31c62b78476aeaddc05af9fe08f6ee61667dce347d905d SHA512 8889792a4f5c405bf46f6af72ab1661923d30b56de4c03391325a3fd75c8f147b43c41623d7eb3afaad0a5a0af7db8f9b7bf21f4b71d212f47797c24da1d2f81
+EBUILD gst-plugins-voaacenc-1.14.5.ebuild 321 BLAKE2B 0069f1603caff5ccda14bdf0f303d1322910b6798a1f7fae27aa84ab1293bd96fb50706783635ca7cd003e7e6ae8f5840074ae26e645229cf461dc34ebc0cf35 SHA512 87839b051ac5eb714b01c9e88d1c4def2e1926f5d70d8743b304f75942daea4c77aee192dd7d360bc1d59927834e7366bed0c8faa92efae6e2d25d3f05071212
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.14.5.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.14.5.ebuild
new file mode 100644
index 000000000000..b1e3d1b3008a
--- /dev/null
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AAC encoder plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-voamrwbenc/Manifest b/media-plugins/gst-plugins-voamrwbenc/Manifest
index 234b7d21fb72..7ee2ab0f1b29 100644
--- a/media-plugins/gst-plugins-voamrwbenc/Manifest
+++ b/media-plugins/gst-plugins-voamrwbenc/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-voamrwbenc-1.14.3.ebuild 333 BLAKE2B 849e58b02cb05640c9a4dda1bc2691334811b202c375c7ff574efa1fd67bfa347f483cc23c72fb4b7bb02c231dfb57ac7b5ed91a25945d0211856dc193eef753 SHA512 12d3776153e1dbdeeac37b8ca9b7cff50109c201fb6ac3f5b288f8c859d7f67ac43fd74db0e3535528c003ec2f7214fb93b7e0ef11cd3487361caf6eda5c9322
+EBUILD gst-plugins-voamrwbenc-1.14.5.ebuild 335 BLAKE2B b035f5ebe469e10483235ee984f6f4c745ca566ce182cf3de3281f00722a9bc2242327fdce2db258ca62182757e5b7fe99d3b5c33c815e93cff187a967bfc7d9 SHA512 d648b7bd11eb431ecda11e7ecf949727658deeae32740f2c551169d16de1c21cad25db9556729f6108c727c788915008a8ff95b42efaddf57e0cc48fdf0f46a7
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.14.5.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.14.5.ebuild
new file mode 100644
index 000000000000..a202cf5447bc
--- /dev/null
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="AMR-WB audio encoder plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index 76d34616294e..8191a2764e04 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -1,4 +1,6 @@
 AUX 1.14.4-libvpx-1.8-compat.patch 2149 BLAKE2B 870fc4b5eeaffa7f735f76b706f84ab2c69687df4c3fe788932278ba8d3870c0b385976471c6e95e3cc081ce50b11324505079f7d966890527627d35169b2bc9 SHA512 bd35100ed2659daca956d6775d58c068852fa2a4f38e53746a5e1abd5fc156ca2d876638e4b39d8d62df520b73ea2aac8b5582363a182263d0cbb4184f900825
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-vpx-1.14.4.ebuild 508 BLAKE2B 3f0db9c5914223a7cff2018083b1bd4f19072ea379cd5b829fc2216973a47945f309606fdb9451045b9815f29fb9496e65f6ff5ee91bdfff3633982bf2435a4d SHA512 943bd41bf9eee702696411b9d960b0d88ff9a0ab48b192728317091b5cacfd543872be7c0322b62e990f0ddaf752ab92b97689199799219f031526958dbb35dd
+EBUILD gst-plugins-vpx-1.14.5.ebuild 417 BLAKE2B 0abff71d0004afc59234e87c0278b4e02863faf71d936fd76aca6b043ba80cfda5dc1bef4790394e87651183af87c35dc0ffbdddd30b4f634d089c58c335c5d2 SHA512 df97b262b2f66f382e1d92ebc17a34a6c6da1f0799c1b88701ff8ee60cbb96145ed70d635d1b026faf4dda4b7592a91f71244a81e693091941b8338a8c608edd
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.5.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.5.ebuild
new file mode 100644
index 000000000000..71267c125c09
--- /dev/null
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit autotools gstreamer
+
+DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-wavpack/Manifest b/media-plugins/gst-plugins-wavpack/Manifest
index a202114c8427..306f9f100f58 100644
--- a/media-plugins/gst-plugins-wavpack/Manifest
+++ b/media-plugins/gst-plugins-wavpack/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-wavpack-1.14.4.ebuild 401 BLAKE2B 3b6d875403846c934d35516b9d86576dae9db78d66884200b07f4868ec331ad02da8ba371b490a76241b671b126bcacb66278aeddadba06991fd112c8ef4171b SHA512 020d8531595e4c90272c63461e47a4f37d9385bfaf8577cef271c63d2f40f7c4db506fde158619930110659dfdcc2e736587d7b47a0a58817f892d346316748e
+EBUILD gst-plugins-wavpack-1.14.5.ebuild 406 BLAKE2B 04864aa291b52f4b7c003869955eb0ba1b688afe22618f9c1e98c4c129d8dab871c0b060b90fd251cac2d82ad75869dda776cbb0d9a25d6f0a137cf617ff2edd SHA512 09d97c12c4b4788ea9bb0e2eb97df1452077f877814ddad30a486a25555cdd0447296c81e88d9d00f07d5c8b0be32bc5882462a6d6173fcc01644f3e6cbfa8d2
 MISC metadata.xml 529 BLAKE2B 137cd943fda3cba7c57ece2b4eff3c1beb0c694dd564f11a82249171fc2bf17448a18aabd2ebf4eb21dfefef07c9a0a8a749df48e79e7709b56634d4ad8a8250 SHA512 31c1c1b8f7e462a53d6bd6cc68c310f5236c6ba52f3fac37775a30dcc0448b2fba900c1b2ef16f31566f03a3b823aa6de02ccaf033f6ec587d64a175aa57ade4
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.5.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.5.ebuild
new file mode 100644
index 000000000000..cd005f562b61
--- /dev/null
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-x265/Manifest b/media-plugins/gst-plugins-x265/Manifest
index 7b6295340a20..d93fafc916dc 100644
--- a/media-plugins/gst-plugins-x265/Manifest
+++ b/media-plugins/gst-plugins-x265/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-x265-1.14.3.ebuild 315 BLAKE2B 7cb878e6f3b8b087bf7c8d0ac47bdae273e1435772a3aab655a568046b2ff34f0625b2b11e94da0c970de3e0af00b68c3f448662f5b8b6bdb339f9db4581394c SHA512 16495d7f764218030a9500c07afc138c5eaec9c55a34970b1f37c8c9f37118888f96aba8d1093f402f64243b3665361dbf9550e148dfbc3d5bee997c62e8a3b1
+EBUILD gst-plugins-x265-1.14.5.ebuild 317 BLAKE2B 53cb53c379fc5672e1ff5cedd110320e914b4c04fedcfef096c2cb8290be0f84f3c0a34e8aab8584d91730bf9eaf8cea1a9860cb4591f556fea58dd13a6face2 SHA512 a6ed59c7b288bd60098e3ab050922d4bb6f4a3d167646bd657e30a489eace4512634d35c10b82d710fae222ae857d9cd903edfc8bafab3e060d6bd8b24b29e1d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.14.5.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.14.5.ebuild
new file mode 100644
index 000000000000..be64d7ebefdf
--- /dev/null
+++ b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.14.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit gstreamer
+
+DESCRIPTION="H.265 encoder plugin for GStreamer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/x265:=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ximagesrc/Manifest b/media-plugins/gst-plugins-ximagesrc/Manifest
index 19a308810173..c67d76258010 100644
--- a/media-plugins/gst-plugins-ximagesrc/Manifest
+++ b/media-plugins/gst-plugins-ximagesrc/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
 EBUILD gst-plugins-ximagesrc-1.14.4.ebuild 682 BLAKE2B 6acddf4e35c62bcb10de90e4c1658026dae67f41863a5a7c2f907963309d9140b93f846b37b84090865f212d33d76a65845ee1c20c72ce0ce3671d4b754204a0 SHA512 c719b4485e3237c2a4b428d39f5514bd82ee52417bec84bbbea39d59d8744d9cda454c8c833c7c04df6f37bb2029a422d66482b63d5e8811a1c3504557a2b8e7
+EBUILD gst-plugins-ximagesrc-1.14.5.ebuild 686 BLAKE2B 5849bc32debe8c596a8df37b6151d9991d366202b4b914fc5db1185ccc8c7c4e73554bfdb7fb27f9b6cbf67e5c57b4495c6a5fa5f79db3564350a7d3cad493f1 SHA512 af8ee5b5d165226b739610bcb3f60c99657d5c9ac4f889b882355c5024c4be569fb840361285bb75bdeae7da2bb77e194239c83f9cba1654348ddb0dc1bd3a32
 MISC metadata.xml 457 BLAKE2B 6af6de3816b28b279400abcc8e9fce070ce8ac5ce2f4ccbecff7d16ba0081bb277db520bd4efaeb07e48b220cf35baf09e0c68e7d99fab59eefc57c0881af49b SHA512 52d8e5e5f48b1e6a0f0e5742307348d66ec3302ffa32dc1dde2f98078621c242d431bf2354902f5ca17b277910cb733336219bc8c1598a1b4ea2c149fcbcf559
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.5.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.5.ebuild
new file mode 100644
index 000000000000..8ebedca57d22
--- /dev/null
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer
+
+DESCRIPTION="X11 video capture stream plugin for GStreamer"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+
+# xshm is a compile time option of ximage
+GST_PLUGINS_BUILD="x xshm"
+GST_PLUGINS_BUILD_DIR="ximage"
diff --git a/media-plugins/gst-plugins-zbar/Manifest b/media-plugins/gst-plugins-zbar/Manifest
index bc439085a1dd..a06f7c0ebd77 100644
--- a/media-plugins/gst-plugins-zbar/Manifest
+++ b/media-plugins/gst-plugins-zbar/Manifest
@@ -1,3 +1,5 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
 EBUILD gst-plugins-zbar-1.14.3.ebuild 343 BLAKE2B 6c271e87a5cb16ec20cadf1781378bb78b763122413c13f6660cbae764c268c612a02e563d862953d8d0677f6afad035cfa5562fc2fb2adff6452d8d1e9244a3 SHA512 81ba6f608b3a02b81be984f5f834fe8a13515b4cd9cfa51ed8c640ff926682b22629c68a74c63b884f2ad1f4c895953b62206c1a2ec03caffdce988d0f01453b
+EBUILD gst-plugins-zbar-1.14.5.ebuild 340 BLAKE2B cbf2f8b7c76d6981415a00a18c8f52dfa387da6bc6d4adecce3f76bd9dddd8233ba838c2a345d76f2a7db0e0d529b59c5d6df2b734c716a42e1723eabb45d823 SHA512 41be0ddf118b5242aa144dcf0083a4137bad74ff900c1527cf7bda997d5e7e58087a21eb02fc37ce7c150841bed0017fed726c26f891bbf1239fff6cf3cc369a
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.14.5.ebuild b/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.14.5.ebuild
new file mode 100644
index 000000000000..8ac232303b10
--- /dev/null
+++ b/media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.14.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="Bar codes detection in video streams for GStreamer"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=media-gfx/zbar-0.10_p20121015-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/kodi-audiodecoder-modplug/Manifest b/media-plugins/kodi-audiodecoder-modplug/Manifest
index 1268fe428af3..caa87870aa13 100644
--- a/media-plugins/kodi-audiodecoder-modplug/Manifest
+++ b/media-plugins/kodi-audiodecoder-modplug/Manifest
@@ -1,6 +1,6 @@
-DIST kodi-audiodecoder-modplug-1.1.0.tar.gz 25619 BLAKE2B ca431badbfa6c7e765543b0e386895bce9ac7a2f6104e72713c146e5097e382ff8e56c1483e4688f1e373c2f6e97a76d95a78e2cab26141116c224a5c5f1e10b SHA512 38ddb6a86019cba493790df6a09de553fadec84943de98dd18dd8bc1b1741b498fc1e621adfb8d6b2dd983e7bd7014951cdcb8bd5d82c980594363c6626cff5e
 DIST kodi-audiodecoder-modplug-2.0.0.tar.gz 30001 BLAKE2B 9ce90103a9b50a37c3f6c8671ecf9986f2b31320fc483dfee6d97331cb56829a9641c8cd1efe1fa9edf6ada360bc1b10bfcff0022022f4ba097a191b52dae0e6 SHA512 8f1cbd95b4fd6dcd560dc615c161e733d7b3413a80abf91c19eb59137e7acf250c9bfd5561a722ddeb52afcc4cf7e2ab0d4f6d8bc5143ef18e0b2c431635063a
-EBUILD kodi-audiodecoder-modplug-1.1.0-r1.ebuild 706 BLAKE2B 92862756b7b7044744599432610e183623d3cad30fa27d087951ee3cccc0a7cc2f429e573e2dd6e257b5d609c907b7be1a1ea82ed380e4430ab7646b3a46d6a2 SHA512 fafce743382edf211c6787e2da919df3ec0f22820e2df2c3f00de683d78a3c5f70a4ebf3f7b3dfeb9f9d744034064164cb2aaa6593eda8a2a9d1085843f9e0df
+DIST kodi-audiodecoder-modplug-2.0.1.tar.gz 29996 BLAKE2B cf0f4e5f0ca74b3014ebdf4d539f8e9b27cb0b8c5f753866dd2955b1ddabdd60b444cb0b24db1de78b996dd982a6dabcb553a37a105455a399b25b3347961d87 SHA512 ad771a03726f8622f5bba2b98b5ee6484f83c8c66eded57d0d941551ba572c1014ca6f8f29a09a0cf3876db8b046c77db4ac81db6d5a7d51f5048e8aa37a2c77
 EBUILD kodi-audiodecoder-modplug-2.0.0.ebuild 746 BLAKE2B 6100bfca367bfb618d12a59bedfcb19d3930d574dbb502815b7ea04ae1413532369a8cf510020f318f911d16d17b073c6439c2f991b70c1a4d3c2fa6a17eb4eb SHA512 cd60e7b2c102078b7f49b851a221ebc3602fb41c8876947b88efd75e2931369d92163802c62e40a7e768753c53b089ed5a29e86908796384914b236fdb28792c
-EBUILD kodi-audiodecoder-modplug-9999.ebuild 748 BLAKE2B 1c32d152f205d12c546b935629dfaf1a4aa34ed861534c3d0ab23088b6c6a27cd605fb923540d6e784b8819191881a9c432ddb8a1ae2829a40a1496ca62c4cd7 SHA512 0afef5a333c6441e201fab8f45ab544152c6b6af6711c5fa3c716c9172a9d35df2e3db801879d13f5d2e05b0eec169aedc586443050e44b21d3bf6c97ab1adf3
+EBUILD kodi-audiodecoder-modplug-2.0.1.ebuild 715 BLAKE2B b90fffd3454f4bb47b10a751283fc640ba22049fa7217a486dfabcb7eac2b1cb6ac79c1fb8b20ee6bebb1e461568f488a11e6aeba91757747e941638604d63b8 SHA512 8edf72c5b5902e96549f7570bbbf846daff3984d030afd0a7eb131f9da0e26d8b0896197e11c0ea954f9cedd4020d4967ac03b5cb403646e7058f45e0247b0d1
+EBUILD kodi-audiodecoder-modplug-9999.ebuild 716 BLAKE2B 008424e46e420ae2f1953f70357d33a4c9a9df3b28d1178feef6e209a0b550a3306a2562e4a3de189ae02caa7acb259ff465435b328836515d9dbac28d4873de SHA512 9613bec71fbffa2cee9d76f9e72480a223573fbeac77dafc0af3030fab290086f22274e8b29d11247f0e0887324759f88c53ac0163bea3910c3d096d84976d8c
 MISC metadata.xml 442 BLAKE2B 7ac417393f7d1a671942b34984b98caf86a36c6b58ef5ad5eb49806e47ba2e5efad0f208c81343fc63c1949831fb9f8e5b83a16138d7a607ca900a0dce649709 SHA512 5b54a7fba19f53f9b07621207d7c71a95ee934e453bebd00a8a9c4f44831ac51f4055c033872ae937b9df9a9aba6d708bc067bb89f68284fff730dc349c2949b
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-1.1.0-r1.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-1.1.0-r1.ebuild
deleted file mode 100644
index eee4b14ab81d..000000000000
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Modplug decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.modplug"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.modplug.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.modplug-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	media-libs/libmodplug
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.1.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.1.ebuild
new file mode 100644
index 000000000000..29fdbe5ef39b
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Modplug decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.modplug"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.modplug.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.modplug-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	media-libs/libmodplug
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
index 4077a1296a9d..da4abae4e8bf 100644
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -29,7 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	media-libs/libmodplug
 	"
 
diff --git a/media-plugins/kodi-audiodecoder-nosefart/Manifest b/media-plugins/kodi-audiodecoder-nosefart/Manifest
index 06b326948329..92d2e2cf496c 100644
--- a/media-plugins/kodi-audiodecoder-nosefart/Manifest
+++ b/media-plugins/kodi-audiodecoder-nosefart/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audiodecoder-nosefart-1.1.0.tar.gz 59921 BLAKE2B 617b001325a43e25ab6541534a33b7e43d4f67d754bb741e0172705b27413bdc98a93afbcf3e00bae25f1d4709f589a9588d70109a1c4c2cb89b4d8be9dce2d1 SHA512 c85768e3b7b31607429d85f6d2f9254bb42a4500a0e42b0a76d953a87b6d2275cef4ed922eb7a2af51770b90cb35403171df6258dae9157683be0a07304f6e6b
 DIST kodi-audiodecoder-nosefart-2.0.0.tar.gz 61006 BLAKE2B 8c3499b8820eb124f6532f722fae39c10880b31d58dce81a1170ae18005047b2ecdb7f9963e1a957de61beaf4a89d682580ea62e739bdc3045e0cd6402685394 SHA512 8dfcae6e81553bccb093dac2aefdbea6e405ebcf3c3505b4647a4970f46ec8aa2f45690a0fd73ff356d074c86c670ab0a60ff5a049dd1e54de3100457fbae935
-EBUILD kodi-audiodecoder-nosefart-1.1.0-r1.ebuild 683 BLAKE2B df56a62216666abde98c9750250b2702cc1f4664ab2ca24b09344e88f362a0448168eb197f408f82f2d954311bebf6bf596257f13b78c34f9d05eadd53634669 SHA512 cffffb04e7b7b91be4b5e3a51669c8b3c8f96c7b33e2396a8314c518b865a33ff05760f9a538c23313070d7bddda89fd94e2182f411d62a6c5a554c2339fe16b
 EBUILD kodi-audiodecoder-nosefart-2.0.0.ebuild 723 BLAKE2B 710cb2781dd91060752684b0ff799c13bfabb5ae90c6b420008d929257291a6900af663935c4194d4d0a5e6e396a84e05748febb0bc393864bb44da55186c5f3 SHA512 b929e8f7c3b793755b3a43452b3023215c891500f0455678218601aba2e67af4666ccfbc1ac6ce2e380a3c8d39130318e4269acc384d5dc8a44cc4d8fdf6f92d
-EBUILD kodi-audiodecoder-nosefart-9999.ebuild 725 BLAKE2B 1e61761fa789b3c4e900828b718fa45225b2a55115069dde7cfdabcb2062478efa0061cc1c539f574879ff474231770a9c36da8b968a8700fa5db73cb3e67ede SHA512 beae47b0245e11940a3896876309b7e43497b0f85048d91230683926c52f7aaf7833cd6c931f839213d7b511ab077491dc28c169cd1dff9f03a7c06701388b0a
+EBUILD kodi-audiodecoder-nosefart-9999.ebuild 725 BLAKE2B 9c3b4acc7004c09a20a122a02d1f21872be18c94c09ab19f056f540a6d72a648eb72cce004817156b501b913033db5d65a5a0a6441c458d82fc35e9405f02260 SHA512 7b3086f71fe8f502e0355e42779dd36f0c600bb2771257b3e6815b79a08a403af24135a68b72cf1d945c27445aa36fa90ef2925cfe17310f61e358122513fc9c
 MISC metadata.xml 444 BLAKE2B f2946063cbdf62c0e0eddbb32b3a9f42a7e03c52975934a191a19e0bd59c97bf8bc70b55eeaf45ad3cad54a7081d238cfbbe1e235cc23855d8a7404cac2d436d SHA512 9a6295c8af39d75437b1f56b8a91e234ac1578110e1e64b52ee5ade240bd43764a52ec843735e7e3814fea6a662937315db4ae5e0988c9c016c1f72ab12fe91a
diff --git a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-1.1.0-r1.ebuild b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-1.1.0-r1.ebuild
deleted file mode 100644
index b043af12512e..000000000000
--- a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-1.1.0-r1.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 cmake-utils kodi-addon
-
-DESCRIPTION="Nosefart decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.nosefart"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.nosefart"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.nosefart/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.nosefart-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
index 1266bc7680ef..d52c566cfceb 100644
--- a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audiodecoder-sidplay/Manifest b/media-plugins/kodi-audiodecoder-sidplay/Manifest
index f5cc9e7858b9..f3ad1bc403a4 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/Manifest
+++ b/media-plugins/kodi-audiodecoder-sidplay/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audiodecoder-sidplay-1.1.0.tar.gz 9120 BLAKE2B aad141a6b3b6145906fd482149ab72345c86c692cea0b7cf92c52cf015d158aa54de0644f83080f5a25b5690c0e4d12c008924fe78793ac5fc1cbc8c555f114f SHA512 a6874cd7de1c3b0e33593b5c349f64303690f0d56a881bd399c300f8d22ea361ebc995b38f97be39af6bc006a6f0e11b905e70cc671857bcb989dcff90a2d0ee
 DIST kodi-audiodecoder-sidplay-1.1.3.tar.gz 10362 BLAKE2B e34853b875b8e328d06d67986609b40f31308c4e914f332420c8ce855c1d594b0bdd112689e874a663f189c722db6811ec12bfa64eb1e9b8907045776821d515 SHA512 8d3f43746328999ea817cd52e4e8f0f1454ffb1e243de4941752cfd7ea6f48848fe7d0855e7a9207934cb61e633389fed79379d3302d58c7c9e8c53784fc2adc
-EBUILD kodi-audiodecoder-sidplay-1.1.0-r1.ebuild 708 BLAKE2B 5ca178a36de3d50611842b932c4f584e80b9f1129b5143ffe1e08ed79d36b44140ea4311734ad6a228b55e4ecd15ad998276404aab1103ef921bb9250097cd30 SHA512 0aae80a150d5bd9157cae53d6ef948be79c3909a072f36f0bc05e8254d72c7d8bae5d984e7a11ff98d7ecda14a67e7d997bdb0c25efb4f30197d26a30ca9dfb1
 EBUILD kodi-audiodecoder-sidplay-1.1.3.ebuild 748 BLAKE2B 81a7a05ea5322372334887f5487246d69d98b473fe974114575b2bbdd982f1610e60a5f5fb33a2bf3e47f3f8af9dcf3f84525c949cb3ade5278e058b633d55db SHA512 a303cc4bd142ea7214d8dd60510e2c55ee77b999eb85404b71b00589c7fa5dda1322df48ed593a0e2fab5aeac7c221dfdc047ef7ec901d3e55061241d1912957
-EBUILD kodi-audiodecoder-sidplay-9999.ebuild 750 BLAKE2B f42174ba15150d832d063e0520bc43a7aeb8ab95a90237137f1eb84b4420130ed58498c28bf359f6a9d6e7da265d29eca23db3eb5dc41180de67ccab5ce3f8f3 SHA512 a08d681efce548bd835ea8835e5eeb1eceba49c8d05c4b4e8b83fb84dad24cd984734015743fe91a866e10f9b085d591cd98fb114457ca313bd01a1859d246e4
+EBUILD kodi-audiodecoder-sidplay-9999.ebuild 750 BLAKE2B a8afdeaabb49d72b60c89cf250868999a8fff67169657a6c3df9b0f6881ab12f7b2462831dff8aeb86af2135314b686dd828f51ede62922d9ba0af9664f0575a SHA512 c2755f549fd80636e6d1ca1b6b29e66d33f63125d1a608bf4a2bc31ae110adc1747e20c812f6ac0246586c23cbf5f0141af6944fed8b343bd13b6802ad8bd64c
 MISC metadata.xml 442 BLAKE2B afc3ae3f9157185ec41cbd144cce22ddd50be0f1409ccb2c764a88a0e448d6504904522d0a18bcf089ca85bbc4a8b05f51e795ec30fb9f7614479835b1ec1185 SHA512 4046b1455fe5c4cb63127751d2fbcc21b3b124609fbe0798c9675e50a837cabf1ef8d7d48103162633a6b47b36394feb1f15d45fc92f6266760de36ea614d6ea
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.0-r1.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.0-r1.ebuild
deleted file mode 100644
index 882888415e09..000000000000
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="SidPlay decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.sidplay.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.sidplay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.sidplay-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	media-libs/libsidplay:2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
index 092cc74d4d6d..3efad63660e9 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audiodecoder-snesapu/Manifest b/media-plugins/kodi-audiodecoder-snesapu/Manifest
index c587f1f7d266..04ed4a55bf5b 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/Manifest
+++ b/media-plugins/kodi-audiodecoder-snesapu/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audiodecoder-snesapu-1.1.0.tar.gz 38567 BLAKE2B 461164cfc9f81c5c4e644e7905b40a475cb19aeb2b9c91912d8a8e7fd2505141fe7d513e4986922c374226025226257b00415953379ec071f95c37ea2db0fb1e SHA512 f58d87ddc2da1734399872543f18a1a77f5bfd2b3adce42c8e4211a7e4e199a51a59aaccfbd7dff24e4599c9457276014233ab6213c231e2be7e6c7d09e08ffe
 DIST kodi-audiodecoder-snesapu-2.0.0.tar.gz 39499 BLAKE2B 5185eaa4e658a443aad400403be827289807b804ba574907a14b0bf5ee3cb5877cd360a0f100f75b309c9214047236723a079b0172d916ca9c4ebea740a5628e SHA512 d1b164a063ae983c49e24a48ed7fdba10f39343e1ed5aad60e0e141f20c8f3bd8115359ccc97bf4583fac7bc1fd9b1dedc800e34cb3d9ee8749c345396696724
-EBUILD kodi-audiodecoder-snesapu-1.1.0-r1.ebuild 678 BLAKE2B 9753713d54d097e33c0565165ba903ebee16f5f5c9749100ed077eede7b200ef924eb30b4a3b6ca624c6d584237f9b9426d9f1ca811651ab4321b5d29a8c3722 SHA512 80e277866745284ea673a159086cdabf897b455daab367b25eb9995fb51b5b38e401438b70714730104fce1849dbf1041b93e61e6676e21942a4450c71b5a236
 EBUILD kodi-audiodecoder-snesapu-2.0.0.ebuild 718 BLAKE2B 7b5b99a2d25eabd68267d06716a5aa6713b8901c5ab018fc269c563c0978ef2956754f90e677f820a3b50665e359467584d83a4e8dfb29b543fd6828c74674f0 SHA512 6a31ee44c729433ac50a202d97f3865c7e0f92e0df66e6452bb6f6ba783900c453df7fae77c9cffbbda8fe08f04eab984c767d1a1e35139afde15fe873ea2fdf
-EBUILD kodi-audiodecoder-snesapu-9999.ebuild 720 BLAKE2B 150b15ec1aa7defedf97a2d2b9d2410dcf9ee9c6a2d6d8526ce0d2406cd1f1aec4a66540a4ca9b514442d38fbccb0c51ea25858a56142436d27329ece55c6828 SHA512 b13e1651cf93e0df0306e57fc64c639b744b65639988ca0047c5863fe5379eb30e0d6e62570844385b716c62c838bfb64e2f611aad38c8acc439b22747b2dce9
+EBUILD kodi-audiodecoder-snesapu-9999.ebuild 720 BLAKE2B 87c2e57d1c3e0f56607529c8458409482f4d1470b2b7cf90358415d76ee450dd7e57ac05b9b7c219b442156627f0dba6ca36439f8f31b3ed396e996a2579e0fa SHA512 ce68dbf1877bb4e00edfb8fe8603da5a218a9c52a1198dd57f8c8899e7d818c217739693eb00221ef94baefdb36d236fdb9dbddd44906d53c246b59641ea71b3
 MISC metadata.xml 438 BLAKE2B 0b8c0545fe3ec7e6ead7eea42baa9255946bf7d27762d392899356ed45e1e7182d7087c25a56b34d114e6de8b95c8a5311fe90b0d52a9e7d007851ec22ab970e SHA512 9561349a81107c52fe83cada11fb8ab55c176fa4e410556741f5259503b7d43732bcf7debfa30a7c98fc7d1e5336abef914a7c31b9663556cd10fc7daf3dab14
diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-1.1.0-r1.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-1.1.0-r1.ebuild
deleted file mode 100644
index f549197c1b8c..000000000000
--- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-1.1.0-r1.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 cmake-utils kodi-addon
-
-DESCRIPTION="SPC decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.snesapu"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.snesapu.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.snesapu/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.snesapu-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
index 4f9e8c3888ec..666a54134efe 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audiodecoder-stsound/Manifest b/media-plugins/kodi-audiodecoder-stsound/Manifest
index 7dc6e0a21812..c32a164a50f6 100644
--- a/media-plugins/kodi-audiodecoder-stsound/Manifest
+++ b/media-plugins/kodi-audiodecoder-stsound/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audiodecoder-stsound-1.1.0.tar.gz 62033 BLAKE2B 1aaf55b732ae2ac0a647963979afc3db79fc58ef0baee42ba15245c6a8d353cffd24bc9101113cbf302e7cf73bc504c621b480bcf3a09bd543601e0fbd691602 SHA512 462403bc3221cef4b64b12f25765fe89567e873a0aa9df7dfb4e649132500b5fec43f0551f7d359c2b4ee38ab8fcf03bc010e84d20bdd4b8665ad254568f9f60
 DIST kodi-audiodecoder-stsound-2.0.0.tar.gz 63097 BLAKE2B c797c7fad5811aaa12217cd6c4caf4167581940e25fc2684c04578e06a04e44d683e0871d6847c6cc3367ee5f5925de4e5640b9eb2b4381a713a3ba6c5860dce SHA512 2770da6d379499fc53d013163e28aeb2c1ffdbbe1cb54f2f2a4d5bac33b68d867a8de0865fe72d283f28ded1f3bd79efee7c98fb79f04ff99459d5bcf3f0f1e9
-EBUILD kodi-audiodecoder-stsound-1.1.0-r1.ebuild 678 BLAKE2B a6ad83ddf2f38638241072a2764837e68603854c021711546e0e80b33a2026e6abe83ffe8b1f01f267f4dcc3adcafd8e19a9cf7a9b3af635194567e1efb781a1 SHA512 8a20bdde4f264e6d592e89bb95f5338395536e4e8064ce7c9f93c5a05c5f1b614c29ec0b43af9a9d535057ca240853fdd4a6fdd345e53a84c981dc3244b53aed
 EBUILD kodi-audiodecoder-stsound-2.0.0.ebuild 718 BLAKE2B 71873f38dc0906481f5f18d83fa6af3ec610f746bace3ba211957efddd902ecbb4a8d4a20f870e81bba94fce0e85e667836828d5a5f06f8136000221df056cf6 SHA512 15e356df7a512f9ed1036bb67b3e86defff69c0f077c751444ea66c847352ea9ca25aac3c61a39cd8c96b4023ae308ef7e418fb234e76fc8bd17dcf15eda393a
-EBUILD kodi-audiodecoder-stsound-9999.ebuild 720 BLAKE2B 8f60348ca48816e77c2c14f1017f2737b83994966c62b13f5e6d3535cf3f4735f7c7bfbd8535ff8212c00a47f04ab8ded0f16985d9ecef4d0c3152f84df76995 SHA512 6e86d0f3be3a8c29e59693b514ccef87b79eefbbd15bc1f01912fb5d2ca2a3f9a1887acbe1761ad18dd19e56df23cdfaac2a9d9020000e717c48e6271c49a6a8
+EBUILD kodi-audiodecoder-stsound-9999.ebuild 720 BLAKE2B 8a6a4d1b8b2a9836586ad18006d1858fb50a4dbd4d4eea306b0ad84a76428553339d8786e29e1f3e273f39989d491d69044627edcda9fe4dc23b95b29e4b4f16 SHA512 34050281fca972539c94cc799a58caba1ad8a6ff0e5601ade2803587028966a5e59e7cb04126bd90e83bb18d5c83b0963bbe2db357670677da4a9f8e8a775b77
 MISC metadata.xml 437 BLAKE2B 36e61faf2f1098a85827d6f81536b35d874e325a7094d535b742c71b30afaf671ed77cf9d84993ebe5e2407ee316d72453a3e18b3cfe55c0d5ccd9691f3cf12f SHA512 a985c629c36655238f0125134c4f64ffae47add726888adf934b8b66aeb9622a12ac256703206b98ed39f29ecd0a0f9ad9043af80160a8d545a982c9fe659504
diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-1.1.0-r1.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-1.1.0-r1.ebuild
deleted file mode 100644
index bcb6ded7e4ca..000000000000
--- a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-1.1.0-r1.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 cmake-utils kodi-addon
-
-DESCRIPTION="SPC decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.stsound"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.stsound.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.stsound/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.stsound-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
index 09c82e122719..3443ac784761 100644
--- a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audiodecoder-timidity/Manifest b/media-plugins/kodi-audiodecoder-timidity/Manifest
index de2bda2ab760..1de642d16f14 100644
--- a/media-plugins/kodi-audiodecoder-timidity/Manifest
+++ b/media-plugins/kodi-audiodecoder-timidity/Manifest
@@ -1,7 +1,5 @@
-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 735 BLAKE2B bf90509fac7e82b7cebecb1c4ca237059b9de46d1eb9bd552578603577685e0319ef27ee5713a9ac7fe8ebf72eb66e6ae1f02a9c2447496ba808dc9ae5d15d4b SHA512 622ba2fa10dbe9e69ade56372288455ec6ebec90948556ba4cebf52dccdb195f4da6baba6c58be20212d945f62b26b018b6d7c9fa8294b4d1e70b495793fe899
+EBUILD kodi-audiodecoder-timidity-9999.ebuild 735 BLAKE2B 9ceeaeebaf1ffa79e1b5be963fd01efaad56ef0524c96c38e8cd99a1c57ed7e694156448f125f27afa6bbe6a8124f117594687f525b120f41c1396374af77e74 SHA512 2a2c5cd84d5b587a298f0a0c0de69eaa1674570c4a35eeae20cea512e420b4f1cf4a2e25a2c0be7c3cdeae27d266fbeb70692c4588f379d777f31280a03145e9
 MISC metadata.xml 444 BLAKE2B a8bc29439b6fada05640522f57d0c97d905ce14abee08f1cff2ab2e1fc36c20ca4491e836b9092ca4d0c7a2b9e66e66d6882b1c5c77b4973d038b294e7d82503 SHA512 924f94fe1923314c5ab70873705dd30874bdf52c5f2f1d13282c140b0080a71a483206c7554dacf0c4dbfcec9f4f4ac340e024b32fd9286f8ce69d52caa8aaa2
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-1.1.0-r1.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-1.1.0-r1.ebuild
deleted file mode 100644
index c539371a7f9a..000000000000
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-1.1.0-r1.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
-
-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
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.timidity/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.timidity-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	"
-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 e99b24fbb324..2fb758e00408 100644
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/Manifest b/media-plugins/kodi-audiodecoder-vgmstream/Manifest
index a1da64c29c2e..1eef317b60d7 100644
--- a/media-plugins/kodi-audiodecoder-vgmstream/Manifest
+++ b/media-plugins/kodi-audiodecoder-vgmstream/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audiodecoder-vgmstream-1.1.0.tar.gz 235215 BLAKE2B de8253b3a619e0a9a3ab954967fe73081d72aaef37318862745e1378d21001cb9950a2849c0ae6320e9c968d2d0f2c16ca394315e30d08c5fda94e8faf599f45 SHA512 a0549ad7ef94a68bf3e1d77d222790acc15be06f124e148e980aa2f96956da659d5967e0ac034db9ccbb34416cd3a607e7607ec91d00ec12e4bf287766b76d0d
 DIST kodi-audiodecoder-vgmstream-1.1.3.tar.gz 236276 BLAKE2B 4323a96ab7d899f40b0cc3243ed9047ca32b2669a845213e7a5703e79e3a4c10d1a37039b0d627d9b636dc1128b49da28e6ba798b44584411b9bb8bd84cc043a SHA512 7f855019e04156b5601a7be0f71a833b241c52bc2dd63f44f2c0c5f3a28b70e14ee9677e5e381ee283d332f167d1dc6e27f1f6cfc5212acb9854cfd93f2b4005
-EBUILD kodi-audiodecoder-vgmstream-1.1.0-r1.ebuild 688 BLAKE2B bfbfee18b46f19dcd42418f35238e5faedf15cf3916c0cc4324de1658302c79ee133b9f2b385d031004150dc67aa4eea8ce9ba9902c3f72149b29372c4e31d9f SHA512 cf7d35d15e305991ffed6589b78617a2e49476a2d01765f4ad0f74a66ea1ea1f425590984387280b64e853f98c54fd75b5adf5f6adcb5f7e5ffac5c233907a34
 EBUILD kodi-audiodecoder-vgmstream-1.1.3.ebuild 728 BLAKE2B 6af6cca76ee3aeb860bfcaa606edd22385991eb920396ea860a44d34a701a4915d2f3326f14a3e82d9f2fefa885f40649644fef6cd45d3678f23ab6cdb7ed7b7 SHA512 3518755dba1f5db9f6d571c7e3d52e83bb1c790c9b1df844c5152ea0d1a0a370bc4d5bc1efec35b3be642fa64764e962f3ccaa8a5c4c6ef591d449739a1f4fac
-EBUILD kodi-audiodecoder-vgmstream-9999.ebuild 730 BLAKE2B c53958e3168747f6abb5d723a72a0561f61d876b6613b6eedb6e5b0cff387d632f6d92150809180d4cdfe3199ebc3bad19cae5e2adcbb8f110a9fb78668cffb7 SHA512 75977913e6f35994654da714f6c349fd0a9eec4c0d267154b1440f5746b10741079dc18d7c092bee8523b8ab34f6fcf489ccfc928573265f0f3fe2667c7b4f96
+EBUILD kodi-audiodecoder-vgmstream-9999.ebuild 730 BLAKE2B e941ee6eeb3c1e19555b14bf68d0f704b877dae129f4237bc0cfa70c9ebc76a84f5fc686f0e961c90bff1036b76ed73d7c2aadc6145bc56fa5a1646b72bc2e57 SHA512 fe5c5592a130bbd3e7a64b17573b717823b1c2916c560fdf7d38b47cedeb4d0c7c2a9fc2945148d276625a8884d8b0ed40989f764e202ca76db45a8179fd9e18
 MISC metadata.xml 440 BLAKE2B 534e3b04fc69fd47da8b492744fc924ab8e3ffca3b8bb4ab06853dfd5e707f3131630ff06272548c3b05227a9d1cb110441a6b39315203918aca4dfc9fd1c52e SHA512 280074c2c911f1df1c0fbfaead6f51f49992accac7cff643e3d03a0b52f6b64cce156937430d950bc1c875c48c15632d703e5eb69a6c270bdbb25ea7faf7f03d
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.0-r1.ebuild b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.0-r1.ebuild
deleted file mode 100644
index d655d51c8f1d..000000000000
--- a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.0-r1.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 cmake-utils kodi-addon
-
-DESCRIPTION="vgmstream decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.vgmstream"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.vgmstream"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.vgmstream/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.vgmstream-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
index dbd2e565982c..5406db9b4dd5 100644
--- a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audioencoder-flac/Manifest b/media-plugins/kodi-audioencoder-flac/Manifest
index a2e4a5daac56..6aa55b3e29d4 100644
--- a/media-plugins/kodi-audioencoder-flac/Manifest
+++ b/media-plugins/kodi-audioencoder-flac/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audioencoder-flac-1.1.0.tar.gz 18508 BLAKE2B 35c85811b4cc0c37bc14d28afc3c8189ee694bd6be0a4c547c0a930398cbc404d687a45b575e77f9b570170acad1df09b59d9c5823202fb4bc9dd19bcb9bff6d SHA512 1a89cd5cd02305b4121582e06a7e88dd745133fa0676d01a9c5f15af025050875a9fa59e74efa71bc5a9d85cb845050edecac507ccd8f4f1f3300016e74331b3
 DIST kodi-audioencoder-flac-2.0.1.tar.gz 20523 BLAKE2B 6ef8f51df7d0c0113389508e3d295b9adf7757684e42ab01ed19f4837881b2f9adfcfd6950f01fb0de54a772a7ea907afd3c4595b0df4b8fd2be647149a5a510 SHA512 4fcbfd4efe52b6983622367eefbbf09a9392c460160d6b4659df0e8b86a565a23f140a22728a2e40b033ad8cdbab68b786e90120dca034dd690217f8ba2b5c01
-EBUILD kodi-audioencoder-flac-1.1.0-r1.ebuild 660 BLAKE2B 50950c9cc03cae3969c4115ba8314ab6f3a3928b1c05e7d2037359c7cbced6a66c0e5615a3f26ab920e4936b2109965365538113a756e624e6f390f0b0625603 SHA512 d4f02a799422b55c5e5433eb135ccde8315a56d412ab8aa6f9d1fcc92bb8796a86506f871d98baa9866ad5170712a841e7c3ea74d1bedffd98ac85eedb72629c
 EBUILD kodi-audioencoder-flac-2.0.1.ebuild 660 BLAKE2B 18fb51dc940f5ef49f33a29304e0b4f4ced49a6337c9a46eeac530474d4dc84a8cfd43513ed14b6ee446e4d7b2efa584dd2e924ac8f396ddbb6ce7325b471785 SHA512 954d4337b5ddc2cb0e20c8ca658b9b8b520638f7a613dcc3265a884cca2f2c28042e9dad96a875fab1cac00e952e8dca17575af2bb3b8b76ed065ca91b95bd79
-EBUILD kodi-audioencoder-flac-9999.ebuild 661 BLAKE2B 54e3cabc5b1346cc543819651a904dca3f12eb719da6e4dd1dc35a847445e90d1789616e6fdb30d20a87b610538cd6b3b0b67ac5ebfbad77d9007462fb39a817 SHA512 7aca5a57f24763ab1ffea13a9eef71a40f392d9dd109ecc16885de4060b8f245fc9201f3153b6339da8bc8cb8c49559367159fc695a2e2d4a3e82309faa351ed
+EBUILD kodi-audioencoder-flac-9999.ebuild 661 BLAKE2B 7de9b563671d42b63a9878c9c3460a759b13c3681c467df8191678b3b4d3c9dd5d09be172bdd347d36d3752176449805e3da0c85ae7e532b8401dec98b913d56 SHA512 917e16cb442068946acebe3d1d61452c4c9df45c4c9c56de0ad2d3c9530a52cf2dc5e9c422cb6383702108b46e8a075286712f7686aa9c88fc8875da9bbbe5b0
 MISC metadata.xml 432 BLAKE2B 08bd867e97f6d3b7a103a557f95103159b2df2be3ef336f02d1f2551acc722d59331f981d4069451e33439730f0e9648cabb6c2f8559e214b421467759202c3b SHA512 2ef0c92e158ae0677b431163a8ca974a90c9d8acdf9fc95c563b152f1250657fcc0d64a212ff20ddd46585284ffd2e732088426b1e033b07862bfa889b7a4058
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-1.1.0-r1.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-1.1.0-r1.ebuild
deleted file mode 100644
index 949c5bd8e25c..000000000000
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-1.1.0-r1.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 cmake-utils kodi-addon
-
-DESCRIPTION="Flac encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.flac-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	media-libs/libogg
-	media-libs/flac
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
index 29993fc9d89b..326c9466c5e3 100644
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audioencoder-lame/Manifest b/media-plugins/kodi-audioencoder-lame/Manifest
index 763fb7043054..89da42f5fbca 100644
--- a/media-plugins/kodi-audioencoder-lame/Manifest
+++ b/media-plugins/kodi-audioencoder-lame/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audioencoder-lame-1.2.0.tar.gz 23109 BLAKE2B 9734a09e6ad3627080161114bd748e40fa15c0146cb8c16d805b902503aa28c85c9b337ad5bd66ed756204362ddb7ea9003313523920bc0975ca83fbd3296b8d SHA512 4f4ce910f9831e6f86615b0dc97c77ce60a834d5fd4e000976c6cd84d411eaa65e1a9b8a38edae7ff7c52d1a24c99f794b65c76432cfe4eeb286050e495190c1
 DIST kodi-audioencoder-lame-2.0.1.tar.gz 23505 BLAKE2B 706cefee19bfdc19caa7c65101d61a3032f70033b4c8adf40c90009aed81c8b69c30e0a8982cf633267c26ea568b19adbefaf6c035617573fa09ae486a6d8e80 SHA512 eb780f31e96a0c745cb2598212aab39a065cc85b186b579ba2ace4732640588dabf9a6ef2e6ee57ddd793a2790cab0b8c2a1068714b80ecbfa4ae4a6eaf2f4b1
-EBUILD kodi-audioencoder-lame-1.2.0-r1.ebuild 647 BLAKE2B b78bca9b11558b0c0964227640cf7ee46212a10546933b8a2086e57bd13ff308d6f2846edb9b60f41d48bdb54ce0eb02d38d2bb350bd3d80c59fc562850817c6 SHA512 38d1b98a75d1781e66eec1c74a0b5a5279d5a5980ffd2c9bcb7b3b6b8c79c6b7099e25c9c17bf09236a44e50edece274affac1c7b4e5be6150fea33d2b42e99e
 EBUILD kodi-audioencoder-lame-2.0.1.ebuild 647 BLAKE2B de177cc8b6520999c840a786a31e56d715cce0f815ddccfadba9f6f15e21c5c4931720c4bff995d2dff1a45179018f3d363c585b9ad054a658114d1ae2c4085f SHA512 3f17ff30706653b26f130e6323f0ec22d1bb0933667efde7280d7e97c22a908c651d193f5242115bb4b4af294da7285171104d6b62356d690c0906de1564a422
-EBUILD kodi-audioencoder-lame-9999.ebuild 648 BLAKE2B befe206451df8640829ddd4d18555291426fbe5c80c87b7e4875948d0866c4656c964d4b4fc984759e1379befacec44cd3ba1495cd1c6734be072d2ba3829068 SHA512 9222b29f7125751c9db86ba24558e8cc654db5d5ab885380b6a329c2b021276d87e98023513f64840ec84da6c5dc230ec9341d7ab388639643b0f24b664c54a2
+EBUILD kodi-audioencoder-lame-9999.ebuild 648 BLAKE2B 1687f98de60926bb17ff9b6b2a465d9134ae2f671a82da9a0768198d4a374b39358214164077e4b9f261bf1dbd13b70b6609ba853db268c3c2248bde146196ac SHA512 3e8d4f9eaab56a67d65616a3145ae50eefcaa30ff5aa5c3aca8138d4ede1f6f38b2e243318debfccb8e74c5a9193abae0c1f166359b00a7ad06ef65d24f7242c
 MISC metadata.xml 436 BLAKE2B 89eb2bd7916bd6c206439984ddc7f84b5c04cdfe923b28f911f919720aec90449d40ffaa7d85306e486357d9e2b8b9681b3f3b79624dde542f2cdac218ffa75a SHA512 15bf6ae63d3265efca6ede0b1fd0849d266e58b555b2f1e593eb85752ddd62e56a1684ba33c0194368b564228c88fa55349e7ed088ac376f5b020045f3c4239f
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-1.2.0-r1.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-1.2.0-r1.ebuild
deleted file mode 100644
index 12208477a618..000000000000
--- a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-1.2.0-r1.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 cmake-utils kodi-addon
-
-DESCRIPTION="Lame MP3 encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.lame.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audioencoder.lame/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.lame-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	media-sound/lame
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
index a30148d62097..0d70f244b676 100644
--- a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-audioencoder-vorbis/Manifest b/media-plugins/kodi-audioencoder-vorbis/Manifest
index e8b20b2660c4..ce582f1b365a 100644
--- a/media-plugins/kodi-audioencoder-vorbis/Manifest
+++ b/media-plugins/kodi-audioencoder-vorbis/Manifest
@@ -1,6 +1,6 @@
-DIST kodi-audioencoder-vorbis-1.1.0.tar.gz 14964 BLAKE2B df97adfd06660f95d060ddc18105a7279f09488f16ba2fd9ef640bcfbc92e676a9ff3b782a4aeae98a8dc9b169b4197221b5136798969995ceea85bdf569950c SHA512 db07cead7c814003ce231e650b9e66718b9dc3860363f5d1019e73ba3763b1e8d6dd68d0e4f37b3f0eafd6504b60f69ddd7414f8e790956036a350196a360408
 DIST kodi-audioencoder-vorbis-2.0.1.tar.gz 15878 BLAKE2B 66bed287d8af393d914678a3e8da13e73d969fe8dabdaa3ed3c579851f40456d12f32f7edf416eb2a9b8734a2868ed8c0d4eb0a22b70fbb74167f3de1cdca2e5 SHA512 ed560a014d135dc9bc57f0185afd3fc4636158309eb4029b0fa1392ef2109c7795902eb37ce051d99199e5834d530c67b63362fdfb9db500a27e10c39d49e1d9
-EBUILD kodi-audioencoder-vorbis-1.1.0-r1.ebuild 676 BLAKE2B 67c8dd994662554a3a6f7c6c5979ff1ca410de4619a7a6fbbe394531b96424d91b4704c23af5032252291a8eef61839dda95d4772ec39cdd7297bb0599203d18 SHA512 cceabc4aa4362734b44511207c8fdbb6bef546277c0eda87529d0b4b9652ccc959d438256d9c749c9c653cb78271648b52ced33c87eb7850e45ef43ed68ebfd2
+DIST kodi-audioencoder-vorbis-2.0.2.tar.gz 15881 BLAKE2B 78181ec315abbbc7a3594f11c5730d8e9913f4529ba449c230e18d8d0bdffcb26e756dd6af6ea390a575a5c47e7f34483cd93dbfc0f13e50e1b0fab0eb7b843d SHA512 9f6262cbd39735b6492e9d5a4f2fb0e0277d32428fab2aca463d104e7f49e68ce922c4ee633a830eb855aa42a7cff6392a98637bcc09e5dc19ee57807af02dd2
 EBUILD kodi-audioencoder-vorbis-2.0.1.ebuild 676 BLAKE2B a88b02c3d1675debe95a216a9f798fdd9d5a30963807d89869590fedaf4ef2fa6d2e69b52c540519a9bb18abdd4bf783d3b0afd0f185a74ee90fb02f6126664c SHA512 1d4172c6815c00d4ae4cb27a3f0616b39911defe8f0bc3ca2bfbbc14e28e6aad8d807759f220ae77424d80585cec21451a8229758eed08ecec710ffc1d2f345c
-EBUILD kodi-audioencoder-vorbis-9999.ebuild 677 BLAKE2B 686fdc05b819c57ac78fcea264c6f6c2da6bb61082943abfa6611107763b046b04502be68e6801b0a7cda8626927dd785bca0de5edf16a5ae209da01d9d5d51e SHA512 39a5479aa92049f2cb17378d83b194249a86b15f4e72ec6a2160178c878f7f37cdd2eb05a754ad6c4a03c08b9e8eb0f3d42fa2c91f0dc3e1a567cdf6c91318a2
+EBUILD kodi-audioencoder-vorbis-2.0.2.ebuild 801 BLAKE2B bc2db3d68cb7259d7b0e680fd556e0fb76b693b87514fe7b3f916840998b4cc733d9fa597f8e2f2adc377f62ba38bac0c22ca3c0f6c5d50bba48ba10b0f86379 SHA512 1608c55ec61d7c917e45dfc52da9a3ccd536554edb0b7eb552ee7319716e7deb020437e616476a716c097de03ed3fabc783029302a62aa956f3b993b39deef7c
+EBUILD kodi-audioencoder-vorbis-9999.ebuild 802 BLAKE2B 115475d322bc58f926678408804c8bb43547cf0fee6f6d78555a136c6c34767a8f74a20210c7fa45c07f4ed595bf62e80dfe34f051e6bc57f60a8fb16e378b32 SHA512 060d2897e8f8e13fb37e297088cc7484b9defc4286933607dd51e0d80767418228fbe77f631a9182def445a8bd70c469233a70a816591be5702c44ee44e7efd6
 MISC metadata.xml 436 BLAKE2B 3c9c2bb8e781568176bb6635269e8c7fb2761f0f64a192e04fc53f325a79e99b474220c5787d5c2f28dc3e3cbcb3e4aea177d561aa63c6d866f261382126a01d SHA512 e92cafa5a635c7e1ee82d7da9eb48138f7f5267d7b91983f9da417ed25435d87cf5dcc47192df499a8acaaefc0c38713a869a4ec6351dda4dddcdfd5a7d15cce
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-1.1.0-r1.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-1.1.0-r1.ebuild
deleted file mode 100644
index ee8720fcd3b1..000000000000
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Vorbis encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.vorbis-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	media-libs/libogg
-	media-libs/libvorbis
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.2.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.2.ebuild
new file mode 100644
index 000000000000..23e049537e7e
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Vorbis encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/v${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	media-libs/libogg
+	media-libs/libvorbis
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake-utils_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
index 45b19d3b5cd7..d7c8a7af95c8 100644
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -17,8 +17,9 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.vorbis-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/v${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -35,3 +36,8 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake-utils_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-wav/Manifest b/media-plugins/kodi-audioencoder-wav/Manifest
index a1259b3a4671..4409ed95d4bf 100644
--- a/media-plugins/kodi-audioencoder-wav/Manifest
+++ b/media-plugins/kodi-audioencoder-wav/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-audioencoder-wav-1.1.0.tar.gz 9743 BLAKE2B 912e5662338b9229c077e12fde9e9b7d7ffd0faea6dabc04cde315fe03aedb3c0d3305906fa5996254633e29418048e15d8ac0ec27735a19ac018cfea16d1f32 SHA512 002894dfebf427a86419f211f67abb34f68286573434272c39033ee281ad63d53acbe1d9288acd49abc991c770c577347512e018bebd627e0f722f300e961d85
 DIST kodi-audioencoder-wav-2.0.1.tar.gz 9850 BLAKE2B 08275b37e033eea178054c2f8e6eab1b1af3073d7c88f8406de54bcc8a57791f55126b8d595d543520e214fc41dec7e2c8d45e64263071a98b01e7ea72ef8d01 SHA512 27746034397fe87bcfb81a429350e234be5fe793ef37f1c4f58ab87c91ef11fec8c808874183e59b325228289d519f948dddd5c9587911f3ffca36ca53641f8d
-EBUILD kodi-audioencoder-wav-1.1.0-r1.ebuild 595 BLAKE2B 4890e2b2b8e9e929fc1cab5210bbf4149b876a33565e70a01da40f90c57cd813ec620c134f0c4de65f626aba49d563c75d181ee7ab5a870087db58091ec60924 SHA512 0e998ce14fb65fca0e37da1b3d86da6bd1e0349ee0bc669b1eef648d8b4eaeae0ad8eb7dedc83762e3ac055ea2b9d352c8e63f3d6289ddd61565e500a479e2bb
 EBUILD kodi-audioencoder-wav-2.0.1.ebuild 619 BLAKE2B 85236318958ef404e09e37f37880a9ae4f1fc875e197dd10b4ac9651eca03975b6015d774d006f4eba8bb7b057c924ea9381c8788bd45d507ca8f705a563c440 SHA512 457ee9c98394779b65e4697d84773313778ef65881ab508352312027af420821a3cdef2d2172bf1143b8a5ecf618736fb6b7e6c85bded6be884d11c6eef0a3e2
-EBUILD kodi-audioencoder-wav-9999.ebuild 620 BLAKE2B 26681c856f6f0099a85a2fb482dc3aae661c9e6e7ea89a33c8be14869af4c3302f6457ad52093e609c1c2f169a65a00d2ba1394bca9b99ed1f871d3ddbf35a1f SHA512 a77f909150aad47c42e98638f5fa1e8d27b44c9fb1916869bac6db8139f3a63788cf85367608edd88e9e596bc95baccb958517c70e00c5c75e784eaf3d6ea0d2
+EBUILD kodi-audioencoder-wav-9999.ebuild 620 BLAKE2B c2733ee92ea2d147cacf7b79babe024850397d5d900a0d8a518f627eb855a45338aae40acdff3dd82b745d81cf39d4458b007f4a1900769a66e356140ac818f7 SHA512 597cb2a460515f0a6f0cfb086002b9e65df68f42b6f1ba49ce2b11ee149b5f42ffcb590bd141a419e91eb4cf03a7a1f11c6a407a8b74059fb8771288e72d43d4
 MISC metadata.xml 436 BLAKE2B 3c9c2bb8e781568176bb6635269e8c7fb2761f0f64a192e04fc53f325a79e99b474220c5787d5c2f28dc3e3cbcb3e4aea177d561aa63c6d866f261382126a01d SHA512 e92cafa5a635c7e1ee82d7da9eb48138f7f5267d7b91983f9da417ed25435d87cf5dcc47192df499a8acaaefc0c38713a869a4ec6351dda4dddcdfd5a7d15cce
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-1.1.0-r1.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-1.1.0-r1.ebuild
deleted file mode 100644
index cac731125098..000000000000
--- a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="WAV encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.wav"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.wav.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audioencoder.wav/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.wav-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	"
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
index f53f0fe8eb8a..0b8fe73582e8 100644
--- a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
+++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-game-libretro-bnes/Manifest b/media-plugins/kodi-game-libretro-bnes/Manifest
index 7ee8d8908130..0d9359f42475 100644
--- a/media-plugins/kodi-game-libretro-bnes/Manifest
+++ b/media-plugins/kodi-game-libretro-bnes/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-game-libretro-bnes-0.83.0.3.tar.gz 809447 BLAKE2B 4efcc72c60ceb433f755afe39058cffc2c39f9ad3726bd407b832b39fc4e4eb85287f6fc25cdbbebfe1b21db4b567fcd260544c1de544ddff2a94ab190c643d8 SHA512 371830f91cf3f7f47b45cd86ec7438a697e0acf886881e87c6dc9218d599e983cac0a540065b6d45b9228b20dd2c1bc264345ee454b55f68d13c62e33944bfd4
 DIST kodi-game-libretro-bnes-0.83.0.4.tar.gz 810686 BLAKE2B fc64d07a3629f00d658028a1f63ef4be640d511968bbd165019431563c84989c07fe11a132757b0ab64d0127e0b39d853525f615e25fea319bef2e8cb3435ea1 SHA512 5add79554a0064dfe9287961a20b80a5c8fd63598f173e254320b78347881f23c87653b742d6b759a1faa280496155c1822ef7ed4631c94fc35a99e7ca22932d
+DIST kodi-game-libretro-bnes-0.83.0.5.tar.gz 810684 BLAKE2B 803197c0f196c460d02b683874e2f47e986155310c1c2f7f8f7af74540965e9f94239b561e7143fcd878ba3be6612b441cc9f09ba351c3ddd5eef40a5b8c6ed3 SHA512 46851fe5665f4f69acfbb51b5ebdbc6fdd86016893d3c93956ef690956df127920229f3e9029337da6af388ef9e615fc17b969e3660d22c8a01a3f7116866483
 EBUILD kodi-game-libretro-bnes-0.83.0.3.ebuild 918 BLAKE2B c9c761aedbe59015af7a6fc15402c3c34a3a3e3c423267acb12d757a97050a96301c21c664aebe72d984e6a2b5e63595d789bc9cc034ae64cac93c19f6a300ca SHA512 8b1171895be885275766865df440a6308bf83af6b2a6ee491b18e0d64541be9094bba8f0bf1ac53d641b537462bfdaa9844ebf76953b07c11ada393160264963
 EBUILD kodi-game-libretro-bnes-0.83.0.4.ebuild 918 BLAKE2B c9c761aedbe59015af7a6fc15402c3c34a3a3e3c423267acb12d757a97050a96301c21c664aebe72d984e6a2b5e63595d789bc9cc034ae64cac93c19f6a300ca SHA512 8b1171895be885275766865df440a6308bf83af6b2a6ee491b18e0d64541be9094bba8f0bf1ac53d641b537462bfdaa9844ebf76953b07c11ada393160264963
-EBUILD kodi-game-libretro-bnes-9999.ebuild 919 BLAKE2B 9d2f6496eb711f031e755f08f7abeb65224d0c2b194cba1e74a91cfdfaafa83c27a65d54b9c65dd9da5b1dd885c0024020046d371d6e644f4ffce8a5f736d34f SHA512 fede4229be5f0fc1c176f81dca2584c27704bb535550fa9d7e9c5f35507b3ec60e8fd3772be5f832d8b318e2b9459611f1d57736de12d753a5635b451fe47fd0
+EBUILD kodi-game-libretro-bnes-0.83.0.5.ebuild 918 BLAKE2B c9c761aedbe59015af7a6fc15402c3c34a3a3e3c423267acb12d757a97050a96301c21c664aebe72d984e6a2b5e63595d789bc9cc034ae64cac93c19f6a300ca SHA512 8b1171895be885275766865df440a6308bf83af6b2a6ee491b18e0d64541be9094bba8f0bf1ac53d641b537462bfdaa9844ebf76953b07c11ada393160264963
+EBUILD kodi-game-libretro-bnes-9999.ebuild 935 BLAKE2B 83a8e87c7a6e4e9fe02a7fb941c9363ed81dd8b961387816909f28108eb52eb02ee34ac7544281f7831e62632921860b107499d3e097dda4fff394db2fd5c57a SHA512 89305fd524ed2d6d692659841495913cf02de54e62e01f7fff2167cbd38184311eba4ae7e8ec2ca2c6d7282339132682b425127f378827b7ffd288255e6a2512
 MISC metadata.xml 435 BLAKE2B 95279e9ee10da6bbfb0230876ffa825de81092b99616b91914710f9cb8f91b2db8ecac3c05f142f5b20d127775261fd474f504d57f6eec01d71e2a30c3617100 SHA512 90fd8905a33a079be3b487801b241b7e6c8ab7cb40c76136ab6ecd1edff19f60665ef74ed8d321db4c92b3fb8f821ec7a124b6882b10ba11bb78f5217b0d4c5b
diff --git a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.5.ebuild b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.5.ebuild
new file mode 100644
index 000000000000..960b86f16f9f
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.5.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="bNES GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.bnes"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.bnes.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.bnes/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.bnes-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-bnes
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(BNES_LIB NAMES bnes_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-bnes.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
index bdef35c1c517..c4ec85a581c1 100644
--- a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(BNES_LIB NAMES bnes_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-bnes.cmake" || die
-	default
+	cmake-utils_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-dosbox/Manifest b/media-plugins/kodi-game-libretro-dosbox/Manifest
index 3dc866f3f658..a25d735411d9 100644
--- a/media-plugins/kodi-game-libretro-dosbox/Manifest
+++ b/media-plugins/kodi-game-libretro-dosbox/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-game-libretro-dosbox-0.74.0.3.tar.gz 53861 BLAKE2B bba95d96c9a313a96df7e3774573fdf43040efd23629242f1400a5a5ca8c2ebe948b68fba7d780ccd4cb3ca7cc4db74e23fece9d192e6988493a89eec19cdca7 SHA512 e802f5bdb1c9b82c5fa3224138f1956e4210aa532bea3ead20fba1a9349ef780f52d966b334beb498ab3433bd3822df7ae9e5cdcddbbf5b97318a5b65f4fc277
+DIST kodi-game-libretro-dosbox-0.74.0.4.tar.gz 54671 BLAKE2B d3bbea8b7ee5f7122f929af44632181d3ec59153573298027524ddfbe29f9bff69ff239172881f2e9315de4087f31dfb492de9f12a54b08859a1ed6a576b49fd SHA512 bb74b6cc535b95ca088140c3e39cafcce04b3f01917e126e403c1e9d35a4c581b92dcdad57c28c76acfedbf5ee331a7e9ea5cef48010145be638f606e3f8e9ab
 EBUILD kodi-game-libretro-dosbox-0.74.0.3.ebuild 936 BLAKE2B 1c14d09fdc0826fe59374b74ecbfe34d0bea34c7bc68311643aa0392de6a880b49ae01c2b0301f3fd71eff2cda3044250ab478635afa842e93b49c6d81d7d848 SHA512 c009b2dcc6c8e97cc41ff6b2c16757984d280e43813e1080cf535e75686c07d4fa3b73600795a954a1150de4c625813eb15a17fdf4d58afe99e401bd719986b7
-EBUILD kodi-game-libretro-dosbox-9999.ebuild 937 BLAKE2B 576962426c884f6dc83e1cfc5e4f0cae601a864f76953edc89b13d60921171bc125a96d2aaaf867ffa787274e8383d95af18481cabae85560729cf66c76ac3dd SHA512 5c000097c03656e34a99fb444414823852a0095b281d1f7e9471c542c2d0a703992d2eceea70dbffe9425dd50b5b73f335b66dec804a6e13604e2b3633da7932
+EBUILD kodi-game-libretro-dosbox-0.74.0.4.ebuild 936 BLAKE2B 1c14d09fdc0826fe59374b74ecbfe34d0bea34c7bc68311643aa0392de6a880b49ae01c2b0301f3fd71eff2cda3044250ab478635afa842e93b49c6d81d7d848 SHA512 c009b2dcc6c8e97cc41ff6b2c16757984d280e43813e1080cf535e75686c07d4fa3b73600795a954a1150de4c625813eb15a17fdf4d58afe99e401bd719986b7
+EBUILD kodi-game-libretro-dosbox-9999.ebuild 953 BLAKE2B 8254d5fa5c587479fd56c93d1db04a3b84fff450fedd59e1998452956e6ea026f9abea68835c180332d7aef0a90d744cd6fa8beed53e0d1349bddce4e9ca3d89 SHA512 e096b1bb90b90bdd2b8fe1cf62c47583eefff38f356b1555f84feb5fce333dd4c995f943735360fb27ff9b3d9043f5422240c23feb8f84eb6eac822c78352ac2
 MISC metadata.xml 439 BLAKE2B 26e660170befb49f4f8cecc4e47a11a4edce7447eecfe8318dc00d5ce6aa4b1a54e6484a50ddf2004caefdaa8c56869e377c2607f2213e73cbcc95d67ae90fee SHA512 fc9f630ac1c8cb229608ac0ee16398a529e1698a254abaa79f786c9ffb543558577ae06c02f2142bd9f3d405457c73a0b8be0f46bf656af1d24c645704d2f560
diff --git a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-0.74.0.4.ebuild b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-0.74.0.4.ebuild
new file mode 100644
index 000000000000..8d15e745cc22
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-0.74.0.4.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="DOSBox GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.dosbox"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.dosbox.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.dosbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.dosbox-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-dosbox
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(DOSBOX_LIB NAMES dosbox_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-dosbox.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
index 3e5fcb2608a7..5023eb5cc6e6 100644
--- a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(DOSBOX_LIB NAMES dosbox_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-dosbox.cmake" || die
-	default
+	cmake-utils_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-fceumm/Manifest b/media-plugins/kodi-game-libretro-fceumm/Manifest
index 100e748d20c0..dba05cb362a5 100644
--- a/media-plugins/kodi-game-libretro-fceumm/Manifest
+++ b/media-plugins/kodi-game-libretro-fceumm/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-game-libretro-fceumm-0.0.1.9.tar.gz 778156 BLAKE2B a7a03d2df6cc4fbf89aa0a8b4320deb7ced5d452c045d3583fdd17dcdc2dbcf59a99ea323bc0b15355889522e2f3bf572d4b0c260dc381c2630bf58c8c7cd2ec SHA512 772b69afff01e26d04fcc33d06e35da0329a1315f0e3ef01b51cc8459d145af782b6dd72b5b460de8dd7a59e308bf4922b2d77b62be1c5561b9debf3bbe36b60
 EBUILD kodi-game-libretro-fceumm-0.0.1.9.ebuild 939 BLAKE2B 48ab5737ea23f7669568b95628117efa263cd71978374638d09909acd254b555baa3ea59e00c55f7877e358d9272177ef6a4ee18a9aa71fbf5ccaf59f9ecf3c5 SHA512 cb953d2002b8de35a222bc6e581899d560a615e9895edcf33d5f1c5e5d19d022447818d75bc58b9505b98ed4e5efb0e4dd0a9eabaed593c1ff615f60ae2a3756
-EBUILD kodi-game-libretro-fceumm-9999.ebuild 940 BLAKE2B 2d2caab71b14297b2a835c7c05a2895d2d223af07957595fc74c7333207128c7ed8b2ccf820e033b4e855d7c755b19ae7917ced1406ca1a23148e42c8ea91ae0 SHA512 ee17de7c977e863fd355e354e356c4dd9a1dbb97858132aa92e971bf8924a2a22ed9adc5470c1f82e32467fbbfe91c7063526041083b03b708f973cfbfde549b
+EBUILD kodi-game-libretro-fceumm-9999.ebuild 956 BLAKE2B 62043d9d5b2f043f9e106a6c7c6b5606ff28460f7d5d17f9dc9cdc9ebe487ad16d9738d7e299df33b22322e616e022e3e3a7960ca1151e4f0a81ed4510c4e6ed SHA512 e2313d5ff32efd5ee12ae96b9a57b63415bf70aa10539b7e4596915c5b9ab2260076cf539120fe8642d5826f3be2a17292983fea8bf7705b6b41e561b471d264
 MISC metadata.xml 442 BLAKE2B 4667a846f933ec1e23c3ec051912d1ba46d1ee1ca41d082928efa5fe9cf89e9e1d50ccdb589e63426c2103f2580c782e4cbe0a59ca9396099c7a669838645dc5 SHA512 92e19b68682d05f6b51ba04e0478419d7f940ed29b28595f0698cbb2fef0c89c7aa44f30acaf90fa21121f8ebf018012391766e33563eea3bee606ca0532a76e
diff --git a/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild b/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
index e80efcb5cc4f..dd15a631b6bb 100644
--- a/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(FCEUMM_LIB NAMES fceumm_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-fceumm.cmake" || die
-	default
+	cmake-utils_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-nestopia/Manifest b/media-plugins/kodi-game-libretro-nestopia/Manifest
index b10c1fbba8ff..ca8d3a0fb108 100644
--- a/media-plugins/kodi-game-libretro-nestopia/Manifest
+++ b/media-plugins/kodi-game-libretro-nestopia/Manifest
@@ -1,6 +1,10 @@
 DIST kodi-game-libretro-nestopia-1.50.0.3.tar.gz 793893 BLAKE2B 89015bb8c687685264e4a8c34cf1caad87cfa1a3611cbd67b540ddb31e9e75049eed328b51c69702e92e358a659d4e503ccdac1b52b7db70688e1236529536ad SHA512 4c41db8c77d24301f00b9d0283c948ae3c4176228e733a316fa5b2eba60ceea4dd094f48270d545008f144d3316cf5f8f190017f70e8378b9fbcbcdb2d8220e6
 DIST kodi-game-libretro-nestopia-1.50.0.4.tar.gz 793616 BLAKE2B 29bbf63f7ef66abf0756399760d882685b4b58cf8a2ac23ce879ea7c7941425828f2bc2d929326ffc3dd7eb51259fdba49264594f2d0759bc20cc6a05a8ca5ac SHA512 58535b305d1aa6ba498c07cbfad09efcfd0e8dd7f251fb973188beeacd07d3ebfa48c639e73a07501019acb88e29cf1ff1b8a685235d7ef69cedb127bba6e44e
+DIST kodi-game-libretro-nestopia-1.50.0.5.tar.gz 793600 BLAKE2B 68bca2ce1790df5f820d5e883b95781b31e6e81d48148da1b2e32ab6016712aff3423db41da3267ad3f6cdfdfc7842ba27ef9f74d5febdb1b42e753847edbe29 SHA512 69a0511dfb4e81de976931c3aeb0d7cab3de3f503816193c7688565faa287b4501e20f11caa4ba85383487ea0ce2156d71bf39076f664e31b42d33c406ef4239
+DIST kodi-game-libretro-nestopia-1.50.0.6.tar.gz 793622 BLAKE2B 5415c0c23f06432b0a0a01b8f9959301432b5221c340f540a440c52ec7fa6dbcb40a77f4894324473f6deba39a0e3af53cedce75e2f173e102d7ccded2852333 SHA512 264fe60a586f27c29175172218f6cd205d7558b4848e95a19808f326ce52f32a2d5f60e6b22ef27417739ec40ba766e7cc9e6fd360bdd167d946f3e2ce19333c
 EBUILD kodi-game-libretro-nestopia-1.50.0.3.ebuild 954 BLAKE2B b7551d165e179efe08fd9a61514b63930d61863f1680d32419882df58bc41a8798287955ea552581beec39627c56e78e63ddd6081be4af3d6335479eb8dc5cee SHA512 e49b56f835dcb3afcef6a5a4fa7e1afa74ac656cf978e6f7800b9a686d96aa69a813d501e9213110907a9a9efbcf757d78659b20b306a19369e213fa2d0e3628
 EBUILD kodi-game-libretro-nestopia-1.50.0.4.ebuild 954 BLAKE2B b7551d165e179efe08fd9a61514b63930d61863f1680d32419882df58bc41a8798287955ea552581beec39627c56e78e63ddd6081be4af3d6335479eb8dc5cee SHA512 e49b56f835dcb3afcef6a5a4fa7e1afa74ac656cf978e6f7800b9a686d96aa69a813d501e9213110907a9a9efbcf757d78659b20b306a19369e213fa2d0e3628
-EBUILD kodi-game-libretro-nestopia-9999.ebuild 955 BLAKE2B 151a5f1b37ce54d2b6bf0203388e64c66ef777d02e3cd34a194546a136f74b0734cdcecb25720d1844f8451e4982b960db8d837d74ec2a0cdc57baae41ee3a0d SHA512 6359f6a364e4575dec5d6cfc4e566af5f845afba932935c91d8c27cdde24557b4cdb06841b5721fe1494404a014ba0b0d1217881dbd0c1abac1ed5d24832e32d
+EBUILD kodi-game-libretro-nestopia-1.50.0.5.ebuild 954 BLAKE2B b7551d165e179efe08fd9a61514b63930d61863f1680d32419882df58bc41a8798287955ea552581beec39627c56e78e63ddd6081be4af3d6335479eb8dc5cee SHA512 e49b56f835dcb3afcef6a5a4fa7e1afa74ac656cf978e6f7800b9a686d96aa69a813d501e9213110907a9a9efbcf757d78659b20b306a19369e213fa2d0e3628
+EBUILD kodi-game-libretro-nestopia-1.50.0.6.ebuild 954 BLAKE2B b7551d165e179efe08fd9a61514b63930d61863f1680d32419882df58bc41a8798287955ea552581beec39627c56e78e63ddd6081be4af3d6335479eb8dc5cee SHA512 e49b56f835dcb3afcef6a5a4fa7e1afa74ac656cf978e6f7800b9a686d96aa69a813d501e9213110907a9a9efbcf757d78659b20b306a19369e213fa2d0e3628
+EBUILD kodi-game-libretro-nestopia-9999.ebuild 971 BLAKE2B b1dcdef31d772cf2a95f9e4fd514ac44c32840deb8948be9de84770ab97471cc2fef205d84bce8a4d29e242adf52e2fc2fbd1edef2df8b9ebf9e4881e422524e SHA512 bbb4f9a461c1753506cafaede37c16bfa04e2e06b7cfca841c8be082de5324c509b8820bd00322fda8cf517ea53a709adf35558b3ee27827ca64b9e8e548fd96
 MISC metadata.xml 443 BLAKE2B f63ddf38e72790cb7ca64c570672adf8d71bbd68d747c15f5c09b353af76eb4aa65c5eb3f3ce18f6bf93cec3657c9b01bae2958e03dcd658053fc314f97bc10b SHA512 c77d6255db65c02a2b74208198f1807982529ee6c7f2d4ba6538e5d35ccf0683757730c0e7b9a713712172ad059540eb6d4b614f9ff16293f1eaaa1631500d1a
diff --git a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.5.ebuild b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.5.ebuild
new file mode 100644
index 000000000000..49c4284c2283
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.5.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="Nestopia GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.nestopia"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.nestopia.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.nestopia/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.nestopia-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-nestopia
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(NESTOPIA_LIB NAMES nestopia_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-nestopia.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.6.ebuild b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.6.ebuild
new file mode 100644
index 000000000000..49c4284c2283
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.6.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="Nestopia GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.nestopia"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.nestopia.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.nestopia/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.nestopia-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-nestopia
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(NESTOPIA_LIB NAMES nestopia_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-nestopia.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
index f57205d81698..d08d797471c4 100644
--- a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(NESTOPIA_LIB NAMES nestopia_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-nestopia.cmake" || die
-	default
+	cmake-utils_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-snes9x/Manifest b/media-plugins/kodi-game-libretro-snes9x/Manifest
index 92ce114f42e4..0cf471b345cb 100644
--- a/media-plugins/kodi-game-libretro-snes9x/Manifest
+++ b/media-plugins/kodi-game-libretro-snes9x/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-game-libretro-snes9x-1.58.0.6.tar.gz 1373392 BLAKE2B 6d17ac222eeae8e23aa76ab0b1aafe805f260b14c210715275afb370c2c52381013b48805477d01389fa1067e14f24465f35449dd95e309dfec7ac93b090df72 SHA512 3cc3b5eda830223a447dda4efb0438db679222200cae07d59f0879f95b1d252972186a241a74d0fa4668697a4ef8d2860923a43c7f4223af4ce794e937f255aa
 DIST kodi-game-libretro-snes9x-1.60.0.7.tar.gz 1374792 BLAKE2B f6a253ece719f1bbdbcf85b8333c4b329dbe4c7fac20da924c263d4cca97d64c1912d0d63390dbe83e49efe32fb4c99f3f6a63dbd5bcd98b7b549ab5e586fb79 SHA512 aa85be7de5030e7b7600e0e3295e22dbad24a1989c58b515bc39adbdb044270588c7848705c04586e37a6419d06efea38983973e8f6870c48dc979a2b3fc9101
+DIST kodi-game-libretro-snes9x-1.60.0.8.tar.gz 1374781 BLAKE2B 9b99c943aef5c74400a270495cbe0326e2523ebefa78e5f8f76bd1b6a6de163b5ffc8da09c1b3773f7dc31efae7005a1925c10bba6e326dd25319cc4dcfc9121 SHA512 62ae9a66d95650f067458c0ecb9a82d9e69b06b62ac80de5c13274ce4dff49966e4a2a9b7c8ac4c754dc1f11718a729e3bed042cb5afa6c9f1ed05026118193c
 EBUILD kodi-game-libretro-snes9x-1.58.0.6.ebuild 936 BLAKE2B 07dbe84fc0d58fd3df1bfe6454b158affbcf427bb6956e84917e03c2dbc2dd9d82a1ab12bc845d77b273d23997047c8701b3555539997913d9a164a7379bcd68 SHA512 4506b2c017c187e1acd3b6768bfa7118a3b68200e414db52f396cc9ef9988ecaae3e0302284ae9afda2060316b5facee44d2ee9f502a146f8bc46dc23c84aab0
 EBUILD kodi-game-libretro-snes9x-1.60.0.7.ebuild 936 BLAKE2B 07dbe84fc0d58fd3df1bfe6454b158affbcf427bb6956e84917e03c2dbc2dd9d82a1ab12bc845d77b273d23997047c8701b3555539997913d9a164a7379bcd68 SHA512 4506b2c017c187e1acd3b6768bfa7118a3b68200e414db52f396cc9ef9988ecaae3e0302284ae9afda2060316b5facee44d2ee9f502a146f8bc46dc23c84aab0
-EBUILD kodi-game-libretro-snes9x-9999.ebuild 937 BLAKE2B a78c39328e36a75286f8b6c96c85078c63f8c19247f69de5a12ab59cc87260b68d1d6659d17516ac309749e1a2a96b233c941e7af8ae125a4766b2d6724cc2b4 SHA512 029868005baedc33272ffa0f8b6de702c75ed0058e176b986e87d1e2f7c1b1a501313eca57f79c37e60783aeb68b33ce2464393f66dec36ed6e870fd77c2d4bd
+EBUILD kodi-game-libretro-snes9x-1.60.0.8.ebuild 936 BLAKE2B 07dbe84fc0d58fd3df1bfe6454b158affbcf427bb6956e84917e03c2dbc2dd9d82a1ab12bc845d77b273d23997047c8701b3555539997913d9a164a7379bcd68 SHA512 4506b2c017c187e1acd3b6768bfa7118a3b68200e414db52f396cc9ef9988ecaae3e0302284ae9afda2060316b5facee44d2ee9f502a146f8bc46dc23c84aab0
+EBUILD kodi-game-libretro-snes9x-9999.ebuild 953 BLAKE2B 9eee743aed38fcb6da06ab1a38523f8edcfe55e9e6f5b555a00a4d76219cbe8fa9745c00579fe1f1d0476100da85041fe17913d17748ddd5023eee347fd7e931 SHA512 d8b2098aa85d814193824b5667b79a79c4d1dbbba54673a380b6a5b78208595cd42f1a08564566d02ef77f018a148afe5f40ae5e12f4e98babd7a988664f37c1
 MISC metadata.xml 439 BLAKE2B 6cec6faa75fdb35edf1f33f2a47d370318b8ab96f2c712571b33d22bc30130826cade398c3f7b4aee986e78baf9c3161b342215457b38d09994a1793b8704fdc SHA512 e3c0f999e2123aa2b23b0b29d1d6d24da0d804e435351c5971a2c60390c33bc3bf001571025cfe4ea7a76680a45be27f18169b201d16c8d8dcad9dbb55e9ebcb
diff --git a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.60.0.8.ebuild b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.60.0.8.ebuild
new file mode 100644
index 000000000000..de406700e0d6
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.60.0.8.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="Snes9x GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.snes9x"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.snes9x.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.snes9x/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.snes9x-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-snes9x
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(SNES9X_LIB NAMES snes9x_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-snes9x.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
index 7dee71b48dd0..4b6e38acdc5c 100644
--- a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -34,5 +34,5 @@ RDEPEND="
 	"
 src_prepare() {
 	echo 'find_library(SNES9X_LIB NAMES snes9x_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-snes9x.cmake" || die
-	default
+	cmake-utils_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest b/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
index d016db5ecec1..64ee509390cf 100644
--- a/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-game-libretro-twentyfortyeight-1.0.0.106.tar.gz 94621 BLAKE2B 584e66eedb9956e75997fc8792652e0c5982150657169687976f0a52ecd07da1d50d2c43aed9379379a8cf1c668a1e9fda2c4c375910bbe02101d67f7813ff65 SHA512 2a30089b617bbbe62af7b17821e69d8c7bc8a393abbfdff5980b62753763595a93e6c326ee4ff17f4d48801399b325634d72c13ca22a30c4c490dfcc7c21952a
 DIST kodi-game-libretro-twentyfortyeight-1.0.0.107.tar.gz 94629 BLAKE2B e821c3ec34d46555048d8b76e8f6ddeb8afd6bcaaace32e057e8238eda9bc16ee3a24f2dab5c1d9e2bb94d5823c9c9eb51d912b5f1ebd061404566197a8bb037 SHA512 5a5a7ad82f42673cdc53595a06e484a2bc06ba93ba1a41e26a8d817dc70d342c3a5d74efead426504a5953b92dd5cb95048bf14bda4a4f96a881ffb3d1d2aa23
+DIST kodi-game-libretro-twentyfortyeight-1.0.0.108.tar.gz 94631 BLAKE2B 26d089df923d9c4cb09a84b17bdaeb9b847b6a199fc216a96000e5bb96065cab54ca7d51f38161ed02c2a47d4602385cad2ba8369947ed7b751fec4f76a34622 SHA512 ba9de6ea5434617d5cb36ed6d49c15dfe4603f73dc928c74e6a6c1dad83611eeecaabc0a9dce9ff19d410991c479385880ebe69f8ecd625781362d27df29feb8
 EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.106.ebuild 920 BLAKE2B 3835705d8c3b3ce2f4c5d55a148a3b6fa675f7abd41541c1fdff6db29dca6fb646831c28ec12b5949dbe7d1624661e2cbd2ee0d2619442951d1ac0cc1d130240 SHA512 e7c20cb44039fd2eeebbfe89f84fa29690eb6239f2ecf17dde8b3831c2f71cb493a3ee62ac29e767715e2722c2ed930b3e8546c76faf050d4d57e907c8a5afc8
 EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.107.ebuild 920 BLAKE2B 3835705d8c3b3ce2f4c5d55a148a3b6fa675f7abd41541c1fdff6db29dca6fb646831c28ec12b5949dbe7d1624661e2cbd2ee0d2619442951d1ac0cc1d130240 SHA512 e7c20cb44039fd2eeebbfe89f84fa29690eb6239f2ecf17dde8b3831c2f71cb493a3ee62ac29e767715e2722c2ed930b3e8546c76faf050d4d57e907c8a5afc8
-EBUILD kodi-game-libretro-twentyfortyeight-9999.ebuild 921 BLAKE2B 0a94bb2bb97930db926812cfd9689f82cf7c4d6dc3fd7db7b29243eb096c3016b3b46511ce885f2ccf8c037af054077a14192b25cb4b1ae4b5f5a368494e0b47 SHA512 6cffa64b7047b63ff251bd9efd5c126f6b0e05324e05192cb88e981865a0a4271a3a7a34de9e296ae98516fe02665e69de71d49e4a1a33211f6a0311a11ff761
+EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.108.ebuild 920 BLAKE2B 3835705d8c3b3ce2f4c5d55a148a3b6fa675f7abd41541c1fdff6db29dca6fb646831c28ec12b5949dbe7d1624661e2cbd2ee0d2619442951d1ac0cc1d130240 SHA512 e7c20cb44039fd2eeebbfe89f84fa29690eb6239f2ecf17dde8b3831c2f71cb493a3ee62ac29e767715e2722c2ed930b3e8546c76faf050d4d57e907c8a5afc8
+EBUILD kodi-game-libretro-twentyfortyeight-9999.ebuild 937 BLAKE2B eb61dba3fedf6ba5810e8dd5071dc810a545e26d45cc756384eec2296cd3b8cc8f5adae9d285cb3a443694f6b139105e37d328624af3c49fcf31b26e1afe778f SHA512 949ec0841266d1584068fc0a086878d6b85afdd239187847ab32da627c8b905fb28101cb3dceef7d1b8ca552930979ef58c53f1bf28dec485a21fdc63759d87d
 MISC metadata.xml 424 BLAKE2B ebec5842d30789985a87b437a5684959fbd41f0d93389726be3bf30b07e49fb851c095f0b1e2edcd6245241f83bf37668ce6494ebcbb90b7e9d6421cbd15ce03 SHA512 3b407c1fad96600c9f9ce0c1f8cf0f3695a5cb41d66762e79b0e0428ad36af0eca33a0ee421d364fb979b661fbe62a047f48ed10f71fbd963e64c205d0174b5e
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.108.ebuild b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.108.ebuild
new file mode 100644
index 000000000000..b31e25621de2
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.108.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="2048 for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.2048"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.2048.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.2048/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.2048-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-twentyfortyeight
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+
+src_prepare() {
+	echo 'find_library(2048_LIB NAMES 2048_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-2048.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
index a01c322557c3..852f780f1e27 100644
--- a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -35,5 +35,5 @@ RDEPEND="
 
 src_prepare() {
 	echo 'find_library(2048_LIB NAMES 2048_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-2048.cmake" || die
-	default
+	cmake-utils_src_prepare
 }
diff --git a/media-plugins/kodi-game-libretro/Manifest b/media-plugins/kodi-game-libretro/Manifest
index 0714147695b0..89f6e79ae0c5 100644
--- a/media-plugins/kodi-game-libretro/Manifest
+++ b/media-plugins/kodi-game-libretro/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-game-libretro-1.1.0.tar.gz 101454 BLAKE2B 8fcd65c8221b0ec4d24a41361eebcf1a144906e86b46749625462d507ca2813b6fdd0cb63ef0fcbe29b1f11039dc5b9cdf3d24eae788e4c275200c93855eed7b SHA512 80cc868d57d4284085a7cd736930da6f1b2440cbd8667a20634c329c282e7f0b79158d4d510504a230427fae4d84d9ae29c7a76fab5e2a23820bfa72d75a8e91
 EBUILD kodi-game-libretro-1.1.0.ebuild 743 BLAKE2B bb123ac3ef9eddaa24ee8fe6f0bd1670705778107e1f72c7cfa951d0605b17b022810f92ac9beb943aa7ebf4f60558a5dea5ca7b5906e5e34a6488a25e5ff600 SHA512 fad956837ce81f71ea4329c9ef5df34e92ad1dc380ebe23329b537652180931bb4cb7d5ddb8653bbdd03cfbeb983eec6a3ca37ac22e6aaa85a1e4b5b2381aa8a
-EBUILD kodi-game-libretro-9999.ebuild 745 BLAKE2B 44e73ead231efe935fc1b9621d68a12610b862b3ca34e2eab70984dd02080d0b7b3c0e3addcdb6e468398bba74746f5e687a2a341107b5a3a607bf3815494742 SHA512 a406649f73ea82cd97d107316bd5b59a9464ddc597ff6153c8291f640f41d78ef29eb48979bcf4c25d3bf846609b7feb4b8ec87eb2885357b4764d1be5fe9a8b
+EBUILD kodi-game-libretro-9999.ebuild 745 BLAKE2B 53d49e0c582be13b34fa688409533dcaa8afe910f9c7464029129e12a49401843b507a800014ff3a3d580bc50b34c8e042a259e825ebb2219783d789c493d1f7 SHA512 6f58f179d5424becae61c19e3c8c677df41834032fcb7c5ef1d90e248e8570e5897cffa0a58a02cfb223211ab91942aa77b054dfacad14f489025a1e13bf5dc7
 MISC metadata.xml 436 BLAKE2B 89eb2bd7916bd6c206439984ddc7f84b5c04cdfe923b28f911f919720aec90449d40ffaa7d85306e486357d9e2b8b9681b3f3b79624dde542f2cdac218ffa75a SHA512 15bf6ae63d3265efca6ede0b1fd0849d266e58b555b2f1e593eb85752ddd62e56a1684ba33c0194368b564228c88fa55349e7ed088ac376f5b020045f3c4239f
diff --git a/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild b/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
index 5f5c3e528872..7a362f9d0276 100644
--- a/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
+++ b/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index 090f7de77d46..8b6ca21d3eba 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,24 +1,4 @@
-DIST kodi-inputstream-adaptive-2.0.25.tar.gz 881743 BLAKE2B 210b23fe42a262696b2dc10efeee5303b3c859a5d1cb4a94cb3628f6d2ca17fb29d170c728a51e1ea6767ecaa79b2c56831169d960da569fe71f18fc474cb2d5 SHA512 51d65fc83f50f7544198666123eb82bcd55a6524b7bbbec403375013264d24ecf8c3f326c815df98f77458af121dc4d81e863cd5f6b9ae49a1fcd50207a37bbe
-DIST kodi-inputstream-adaptive-2.3.13.tar.gz 485053 BLAKE2B 1729ad38332ea00763eec342de37047cbc9d3d276cbf8e6586b716f26bca4048f36da58ed3ca8f1b77247616a6d2c111481d6b78f0510dc465923cab83d4fe9e SHA512 3a3891a0fc8439aab47014954e90cf72a6c373f250ead02dd91e00c43860fdb91ee8688e6e0776470056f55287d4c4c11cbd762065fa52e7e3c9dcaa12efcfbe
-DIST kodi-inputstream-adaptive-2.3.14.tar.gz 709587 BLAKE2B 3130ddd367cdbe0edbc5f14e060292ff66a864049a16dc10d6dd5500178c8f07a3f20fce5f95a8b5a44a57ee7ec7cdd782515b95f2e2dd79ee01a0fe37a9588c SHA512 3427d0552260580766e756f0800290c59d6cd1c48ba87f9e4397676fdfff19509bd3a0cf986447b228be7bb6c355b1aeb739b456b29a99f54934c4b6bfd822c6
-DIST kodi-inputstream-adaptive-2.3.15.tar.gz 709544 BLAKE2B 5e1d52c28f935dc8dde6cb15d800402bce5740e1b99ebe4c6210e07b34ba455a6af1883dae8c30013d3fd8bf03732d086aa38012f8daccc89ec805e67aea2850 SHA512 74dba29e6b9982257a4156416331fbaf189ef54c04c4f3b8d87dd1fea703ed29e70ff58f52af35735e3fea31f7a84127c34211cb5f6a11f1ba1d8c6586464fd3
-DIST kodi-inputstream-adaptive-2.3.16.tar.gz 709687 BLAKE2B 9462cc7d77c20f2b63ca22ddf284fbec1f90e672c1bc3251bc1eb57067832d9eac8111533820e5f7e50e4d26df2e9bf43c6b059b09c9f47a24e769539efc1755 SHA512 c4ab48af774ade61d36e44f459235956110354b3bc3b010a7ea6ccbf1309c0fe52917c72fd03ce0388afe5813f1571f2d0b89df59ff00101a8342b4ba45f9335
-DIST kodi-inputstream-adaptive-2.3.17.tar.gz 709839 BLAKE2B 55383716f7cd9e0b21b55cd86d2819b08fae7857ea88768311400401c90c1280a36b9dd404f769f30cff46eeb5d36b855064db1dd8c265d4d1231cc73bc0a1f2 SHA512 055fb4baccba713c7195fb7285053514006459ca3ba0197e0ca1bf507472161e4d449e30a8e6b77825c480c405dfee177ad6070f21f1ffacd6248e9e6288e18e
-DIST kodi-inputstream-adaptive-2.3.18.tar.gz 709886 BLAKE2B 5b96786aead7f51172f363018977a879c6ea7a490cb8908e6c201a64b6af88c0eb4ee2eac6fa8ca4305f7a2762f65cd5e9427e4de5c5c637ee60e4eb1cc501a4 SHA512 fbe281e9f89ce5987429231ca7ee2c42aec1016a9742a1783e9852a462ba6d209978096666536c9768cc580482abd1bb1767e3b63002329f90869206c4e297cc
-DIST kodi-inputstream-adaptive-2.3.19.tar.gz 712487 BLAKE2B df01185d734a3dd9f241e91fa392dd7696a37a34575715e46eb503fad82ffd5ceb1ded38531a8fa1a4055edcdd84a1b284fa3c7daf1b12106f7b6be390e87598 SHA512 a76c4a472fd4ecd756eb2936ebf0d1f49dad348747d40c80771bdaafb999bd6e9e32ca333d1d16fef3837e46ed60bef47ff68dccafcd4166e57e240a1d7b255c
-DIST kodi-inputstream-adaptive-2.3.20.tar.gz 712611 BLAKE2B 7771fd15e230e76cd9786348b86a0a561afbe250f7d78e2418f1fc189e52b46ee249316770fdd9aea7fb16c73df6f9579c73510e658a29aaa53c5c02c04bee9a SHA512 5a5bc68d6f10187d2ac8d7a0e196a6615b75642ffdae67efac16d7aa718a42c13df3f3485029876eff42fca415039549ead60db381477de9df2bde5fc7f34718
-DIST kodi-inputstream-adaptive-2.3.21.tar.gz 712611 BLAKE2B 129622e050d8881b2921d7cd730453ecd697d3041b7d4d1fed3449734a9923effe9f5e53dc6a72901b57b953df391908d9f7adbe5fe054320ea2b14b56719ed9 SHA512 a5f059e08c5002c42ec1a6ff2ceceecbcc4f9943d4dd4a7c87097ad58eed7827240bd6c2e4acd414ce6fd3326a2ef8d85372e245bea712d45148dc5328ff83a4
-DIST kodi-inputstream-adaptive-2.3.22.tar.gz 711950 BLAKE2B 5a3bf2df9492707f586b52d9ca556eafda69c7167e6bee17b3de749fbfc1b59c215550b5eb9f47c92b77641a29c88d9dfdea9359bde1968ffaf089b93a4ac5f1 SHA512 6dd73776b2962a6432202738d167ea3169cdbdd470672066bed39d12366cc33a28dd2809edb9ceb9255022d6076b1c3dd31828f60fee8e2d2dceffc0d58a6d6f
-EBUILD kodi-inputstream-adaptive-2.0.25.ebuild 799 BLAKE2B 49612b21ce2fce4f3fd32f5f15ef872ac3738bbee99210e68f68083e413c2bdc6a5eab012fde212e1ec6ab2fd998214a9ad30162ff60aebe52611892afb6ec4f SHA512 a088a71d77ced70bf1e697412f56f92ae3108d2e88a5a3cc1855b35ee89e2fd603f325e5efb70ceaf74af05b0003e9af55aa6511cede51195dcf9cb80e264336
-EBUILD kodi-inputstream-adaptive-2.3.13.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
-EBUILD kodi-inputstream-adaptive-2.3.14.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
-EBUILD kodi-inputstream-adaptive-2.3.15.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
-EBUILD kodi-inputstream-adaptive-2.3.16.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
-EBUILD kodi-inputstream-adaptive-2.3.17.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
-EBUILD kodi-inputstream-adaptive-2.3.18.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
-EBUILD kodi-inputstream-adaptive-2.3.19.ebuild 765 BLAKE2B cfe5860064cfc2b6c4731c60d2ac56431bb68395ba1ee9b63c0dff5ed0cf78487273530a22c6c84e561dc92b87feb382c7e20f6c30ad1100e1fbeea05cb7b674 SHA512 073856271b66d3e2754fba8d6b97efcde97ca3e22b6ceeb260f14495bf5ce7a029d13afb90159b2f79358131cc986942a87a01ddc56e965a596ae3370a8499e9
-EBUILD kodi-inputstream-adaptive-2.3.20.ebuild 765 BLAKE2B cfe5860064cfc2b6c4731c60d2ac56431bb68395ba1ee9b63c0dff5ed0cf78487273530a22c6c84e561dc92b87feb382c7e20f6c30ad1100e1fbeea05cb7b674 SHA512 073856271b66d3e2754fba8d6b97efcde97ca3e22b6ceeb260f14495bf5ce7a029d13afb90159b2f79358131cc986942a87a01ddc56e965a596ae3370a8499e9
-EBUILD kodi-inputstream-adaptive-2.3.21.ebuild 765 BLAKE2B cfe5860064cfc2b6c4731c60d2ac56431bb68395ba1ee9b63c0dff5ed0cf78487273530a22c6c84e561dc92b87feb382c7e20f6c30ad1100e1fbeea05cb7b674 SHA512 073856271b66d3e2754fba8d6b97efcde97ca3e22b6ceeb260f14495bf5ce7a029d13afb90159b2f79358131cc986942a87a01ddc56e965a596ae3370a8499e9
-EBUILD kodi-inputstream-adaptive-2.3.22.ebuild 765 BLAKE2B cfe5860064cfc2b6c4731c60d2ac56431bb68395ba1ee9b63c0dff5ed0cf78487273530a22c6c84e561dc92b87feb382c7e20f6c30ad1100e1fbeea05cb7b674 SHA512 073856271b66d3e2754fba8d6b97efcde97ca3e22b6ceeb260f14495bf5ce7a029d13afb90159b2f79358131cc986942a87a01ddc56e965a596ae3370a8499e9
-EBUILD kodi-inputstream-adaptive-9999.ebuild 767 BLAKE2B b2900266ac7b915fde25ba54d771751a6943d60546fdef8fdad322a1f9aebe9a85ba0ceb6945bbe4316959059af6ec6ccdd261fd86ef080a07b483ef4d35d59f SHA512 e02c3aee34a8b06658f03300cc3fe0766e0acc1cb9b1c3eae49ae787288b9788547c9325572ed9671dbbea8ec95d6f98daccb980991d0bd6c0dfed9afa7b7852
+DIST kodi-inputstream-adaptive-2.4.2.tar.gz 711951 BLAKE2B 17f29ffb9f6e0f0e109af85afba16e92fe8f0cef2d660b6e4abcda0265e8096fca83ad947de213a83eaea8b94cebf94da4f3266f32fce28776dbabc05477ef3c SHA512 218be820b4e7f05d9a3ffd330db785997afe225a994ed4187a1aaa13b28189453d4a82e3553210613aa644f9f98b30bfc7bc048a1ad9674521053ef21e2e26e0
+EBUILD kodi-inputstream-adaptive-2.4.2.ebuild 765 BLAKE2B cfe5860064cfc2b6c4731c60d2ac56431bb68395ba1ee9b63c0dff5ed0cf78487273530a22c6c84e561dc92b87feb382c7e20f6c30ad1100e1fbeea05cb7b674 SHA512 073856271b66d3e2754fba8d6b97efcde97ca3e22b6ceeb260f14495bf5ce7a029d13afb90159b2f79358131cc986942a87a01ddc56e965a596ae3370a8499e9
+EBUILD kodi-inputstream-adaptive-9999.ebuild 825 BLAKE2B 2a7eb0a26485c9eb5209c1f8ab8cb9ed332a61d7a0fc3f9b6d679558169a8f4a72fdbc6be25ee3df56a1b722ea310e85f6b45ff91c3bbeec0bdfd1374c25bc26 SHA512 03610785d2f6cca04d7862ebf5a3f79b20d536d33ff48d557fa612946eac5d25abfd6e01cc538528e5499c98ba5264fcef53d3431a421f474b587af4f93cfb67
 MISC metadata.xml 459 BLAKE2B eeb0ec3e241775f1953b2846edd160fcbe72d5990a256f5374e9aae5e45eef5f4c50225c72d371c0ca3d11a3b81eabd87a5de35952aa5f7676b4d7b79854ba71 SHA512 748df555db70e268d7f67b408428d949ecc04c49fcd143d984b47597c3c4ee86fd8066bf294598df926889525213f34182a790d442aced5fc2f39346f13e4d5c
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.25.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.25.ebuild
deleted file mode 100644
index 962f5efbfe14..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.25.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Adaptive inputstream addon"
-HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	GIT_COMMIT="c51b9a9b58a645f820883e6d99982277fc58aac5"
-	SRC_URI="https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz/${GIT_COMMIT} -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${GIT_COMMIT}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.13.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.13.ebuild
deleted file mode 100644
index 85e10272539d..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Adaptive inputstream addon"
-HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.14.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.14.ebuild
deleted file mode 100644
index 85e10272539d..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Adaptive inputstream addon"
-HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.15.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.15.ebuild
deleted file mode 100644
index 85e10272539d..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.15.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Adaptive inputstream addon"
-HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.16.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.16.ebuild
deleted file mode 100644
index 85e10272539d..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.16.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Adaptive inputstream addon"
-HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.17.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.17.ebuild
deleted file mode 100644
index 85e10272539d..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.17.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Adaptive inputstream addon"
-HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.18.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.18.ebuild
deleted file mode 100644
index 85e10272539d..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.18.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Adaptive inputstream addon"
-HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.20.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.20.ebuild
deleted file mode 100644
index 039105147964..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.20.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Adaptive inputstream addon"
-HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.21.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.21.ebuild
deleted file mode 100644
index 039105147964..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.21.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Adaptive inputstream addon"
-HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.22.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.22.ebuild
deleted file mode 100644
index 039105147964..000000000000
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.22.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Adaptive inputstream addon"
-HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/expat
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.19.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.2.ebuild
index 039105147964..039105147964 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.19.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.4.2.ebuild
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
index 2fb43d0af921..8c3da94fa9c1 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -31,8 +31,12 @@ DEPEND="
 	dev-libs/expat
 	~media-tv/kodi-9999
 	~media-libs/kodi-platform-9999
-	=dev-libs/libplatform-2*
 	"
 RDEPEND="
 	${DEPEND}
 	"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake-utils_src_prepare
+}
diff --git a/media-plugins/kodi-inputstream-rtmp/Manifest b/media-plugins/kodi-inputstream-rtmp/Manifest
index 6273170f9f6c..5a8470508752 100644
--- a/media-plugins/kodi-inputstream-rtmp/Manifest
+++ b/media-plugins/kodi-inputstream-rtmp/Manifest
@@ -1,10 +1,6 @@
-DIST kodi-inputstream-rtmp-1.0.4.tar.gz 7271 BLAKE2B c76b46fc1ba1bbe45084071ee0521b8f421a87886723abce3103867f8c542dbee364c9cb64a3e7237c59cfcc9afd910bb4ba5b749d5e1f6efa4ac215b1ced26d SHA512 659990b2cbe6e9119c650e151aaae0ccd33f8b9f5d6efd1436f4cb6c78beb51c8fae528b844278348066e1b10fe2a7fa6c05e32b54be82f5a750a5a14c8bd9d2
-DIST kodi-inputstream-rtmp-1.0.5.tar.gz 7271 BLAKE2B dfc7a80684d0c872761baf4e8603b491b6530cb0e8a5aad782f18165cb15ec54aaf7557b877eab74c87a46d68481aefecde2f0b15fc748c5a7800593f9033a45 SHA512 7a58ec265586fc0ffc8b1021aa1529d171c8ea14202f80b443d51dbfbfd8f0424a2b5f94687d302a3681e2931ac268e89e8d2e82635ac5b792cc8c9bd8f020af
 DIST kodi-inputstream-rtmp-2.0.4.tar.gz 18259 BLAKE2B 714090d52b1e46e79b88b34b3a400edb444668be2856eb92b61769ecec802be4a7fc1ab73380febbf0cb277b6a1758f2f4f81efb6d1c6c1d266691de6071f7cb SHA512 ac7a7f3f40f4c7d4ec176299ae0d8dd389f1e041d6633a65190e7e8a0a87e87142ebf4f80a36b7429524f7d1571ce5d1708ac753edae695b1d1d84de73e5d88f
 DIST kodi-inputstream-rtmp-2.0.5.tar.gz 18280 BLAKE2B ce906740bebaa33ffa813a94f8b73cc9640e9a7f08059d972c23dee5d811c57e33c43d7e41b690d693de86f238ff2c936f2375baae3db1b40033a539e6c0587a SHA512 178ecfedae24b2ca0b13de997861e89063eff929a6a1a2b0b6b3e32a45bddd238304466a9f1f52b6213db3faee93144ae77fc9c4045c3783780a50bc1ae11166
-EBUILD kodi-inputstream-rtmp-1.0.4.ebuild 659 BLAKE2B a2b0e2a99fa914ae03ab14db0f6d0aea5ef561c1bcf4d8885751096d0df4f99250388168066c391c24df2b56c60275c55045e1fb0a35d9484201c21c8079ef01 SHA512 4877df994ca70060b38976fa956ce5e8bfc196dc17c08c79e8c437468a7885fdab7752e9c6a550b861a84322b82d25d186d462f5ef7c613bc5f7fc931bac935b
-EBUILD kodi-inputstream-rtmp-1.0.5.ebuild 659 BLAKE2B a24a3762a845bfcf1f4096962c2fdd4d69101cda354ae3ff8436ccaa965cf203b6d5b102771112468cd86bca6b722ac909c73e2571a3d2d496d2e95ffa9109cc SHA512 956a5fefa57ad78b53e7ff85ee65e581e8abaa37c3e15ea3dcfd67c23fe0d5d2bda887e9e1c0a17d42e0a6e71e5117ae19689c7d1ec3ba1a5812d01f118c14d6
 EBUILD kodi-inputstream-rtmp-2.0.4.ebuild 684 BLAKE2B f8f25f5846d5576b656555155f213c817a18de0c20cb0a4c55952d694dc2e21420c5b8e21813c2744dfe23877ea408c3876efe66fbbc2e54642d6eefd5686c5a SHA512 39147f7f41ab05b76de6c4aa800b3ea292a6b4dfa6fde6d322f30822ba8319f0f08e9a090c4b45cc5d3bf59ab0fb0b5c9a621fc831f12d972e61d8057f73e2d6
 EBUILD kodi-inputstream-rtmp-2.0.5.ebuild 684 BLAKE2B 8e409021b820b4754f8e94ce3437bbab0716905d04d83a771d5a829fcf65741b4faf76c2d95c44eea74c3300cf7577059c072911c79b1ae426bf90e3f8c76d88 SHA512 e5665cee8ce8cb69436f18b0dfc891bfa780f4c770c3c074bc8bbf76ad54f3dee69cbd5eb345b503b475c4f6e67ac79546ad42cc7b1c70927867370aadb321b6
-EBUILD kodi-inputstream-rtmp-9999.ebuild 685 BLAKE2B 374e8719bcda88ec5c7f36aac819825302775dc1eca54d4c2027eddc3fbafc2096ec756103f51bd1e84f0a7523368813a66354edd980c2feef81a5a7a7b5cc65 SHA512 5440ea6b458366246f9d035854e7b990047eb10f347289ef0855375c9dde4f565104039aa516c79ea2ed8df92a56373f6328ac1189d21ed9c72db3607044d5c9
+EBUILD kodi-inputstream-rtmp-9999.ebuild 685 BLAKE2B 0545f647f9245492150b46328a66d62f3c7fdc07c485f5afbc0206e85ccbe6cd50215f6aa168f9b5c50ec44cc7ceb46fcbce1e6c611e3fdf211060a5da03e8b9 SHA512 5f055647e8ed89b0d65b48cf8ae436f5879377f8ed5e5c2dc724771509607f13290d299edd4b40e6dc73c551d0202b2117b9a7fab2a82b06c0505457ff9f6e70
 MISC metadata.xml 433 BLAKE2B 5b159068b2431fb4b669662f4e36d8768afbda1e076e866678c193590945ff0ba4d6c03228475dda7bb7ca5d204d09e0e5d5804baacbfa653563f199045a1c80 SHA512 0cb47e468304977fd3624c4ec07d254271406897eb4601eac57a68167463a8379e3d8cf4d4e0e4988ae78d832ae39da9a457ba30a7c0fbbe8a32fab4e5e94f53
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.4.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.4.ebuild
deleted file mode 100644
index 8381ea523095..000000000000
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's RTMP inputstream addon"
-HOMEPAGE="https://github.com/notspiff/inputstream.rtmp"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/inputstream.rtmp.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/inputstream.rtmp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.rtmp-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	media-video/rtmpdump
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.5.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.5.ebuild
deleted file mode 100644
index c3055b7ab919..000000000000
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-1.0.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's RTMP inputstream addon"
-HOMEPAGE="https://github.com/notspiff/inputstream.rtmp"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/inputstream.rtmp.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/inputstream.rtmp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.rtmp-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	media-video/rtmpdump
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
index c866d60112af..9ca061b69f16 100644
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-peripheral-joystick/Manifest b/media-plugins/kodi-peripheral-joystick/Manifest
index 18f5f1e6e3fa..6e8e833ad27e 100644
--- a/media-plugins/kodi-peripheral-joystick/Manifest
+++ b/media-plugins/kodi-peripheral-joystick/Manifest
@@ -1,10 +1,8 @@
-DIST kodi-peripheral-joystick-1.3.2.tar.gz 82787 BLAKE2B c3edcc037161e7f1b865b1761a1296e15d6428ac6f32907569f8b32d3a7ecd7e2c27103ce72079b92b4329818d6709209d8f7caea386223fef6e59df281774fd SHA512 9aa2e5d1af51b83abc0691fb9f6c7603d07c37b61fde898e2010d6370b9dca44275bd53caa2252479128360bc97eb8bd904d268a9c0cab7f2958c0b31f64ba1f
-DIST kodi-peripheral-joystick-1.3.3.tar.gz 84408 BLAKE2B 53ac931708319945c132c7a835fd37e4fcd2c003d64db32c7a888af116625746b96685563dd732873810f28adec20ff5dbed37bd66dcb6bff74cdd192f5a45bb SHA512 e566cfab838b471f4d5cd6d1bde48479868bf1e401e2d5512627f6cfad606c9ec359fade3612dc32424b4a5baffad82278d25906e59062bea9e8aea009754a78
 DIST kodi-peripheral-joystick-1.4.6.tar.gz 91142 BLAKE2B c80daf4e9a425c88ecb323d7f5ab7538aa5a8af06758723310f133f63ac65b74650f6374e4361e9086813474a6b84cf54bb8bc054d54eaec19c1ab32da5181e9 SHA512 ae42a295e548c6bda7a258d02d7a68ec3f34c66e88b1e3848181d8fb76da6ff83f19f8adc007e2697c096052fdd1ea9879b178aab9f8f4118f4d2d57691c2a7c
 DIST kodi-peripheral-joystick-1.4.7.tar.gz 90671 BLAKE2B 281a1d821586224ad155ac621fe5fd48c189733277c877799355bf432a580311967c7300cdd201ca9561f149b42b3327a320bd3641108d8c69cbfd27242ed4dc SHA512 89d9c993f598f7660fccfcc1926ad3b944d88586b0399b3e47524fe5a68665eec8fc7b196acd6d59e36488f830afef50c402ecd05d69cee75c21a69c538e9acd
-EBUILD kodi-peripheral-joystick-1.3.2.ebuild 763 BLAKE2B 529b4ab8aad7d7dca87cafbfec5bfd153a625da49b7a4bdfaa45593b2043abf3a3d3c526e94a0fd179aa768e90a6eceb13db3271bc25dd160a3379c6f5950259 SHA512 b3e15fc2640315e8df3e45a5554dd61a893f668c5aec593b37d82b4f15676ddaeb8c681a7e9a721c8ddfee40ea5ad2cd3692a1525f164d4ad563751565aa5460
-EBUILD kodi-peripheral-joystick-1.3.3.ebuild 763 BLAKE2B 529b4ab8aad7d7dca87cafbfec5bfd153a625da49b7a4bdfaa45593b2043abf3a3d3c526e94a0fd179aa768e90a6eceb13db3271bc25dd160a3379c6f5950259 SHA512 b3e15fc2640315e8df3e45a5554dd61a893f668c5aec593b37d82b4f15676ddaeb8c681a7e9a721c8ddfee40ea5ad2cd3692a1525f164d4ad563751565aa5460
+DIST kodi-peripheral-joystick-1.4.8.tar.gz 90965 BLAKE2B b9bb3aa6e1a5531c304f2f3466bac8f00cffcd771065052d41645f48316c7b246fa07823395aeaa484ca9839d1b8025e6640e7cb504d29642d52c02a1fb21553 SHA512 4ca692589050c225bb9ec45b79f3532a4c572c57b3c2400dd4afa398c3d77194136ffde7bc85b7d24700d7eafb0f813cc3fce5dc48d4de51869fad0f68679939
 EBUILD kodi-peripheral-joystick-1.4.6.ebuild 730 BLAKE2B 76309930faf2294995b1df7eef268c6ee8fea244a129bdc2c2a65e30018cd6fa4e9afb32398eb5e17c8a8956cec8439d321a01eb4015058f54e52ad06be52b69 SHA512 6fabf1aae054025f89177e8bf00672ef62679e31238c048bf7598e92391d82b43fc5815356bc083f3986c0256762c40f85c6849bb00ff5ed4442f0ed4d39ce95
 EBUILD kodi-peripheral-joystick-1.4.7.ebuild 730 BLAKE2B 475b3113d4f0edf85c7221641e8253a20d5c571a890a7e88f6e5e0df7d4ce73bbc5863e6938b921191f721d7d88e293ea3040bff8027f8340a47c08992849106 SHA512 2d4b90e94341f6b0435589c62505a02369081557e6fd71c30b90602c1991da05e2c36c8bde04cdd1eb0f0376beced8e9217421d9c0991cbfa34f9e04d83d02c5
-EBUILD kodi-peripheral-joystick-9999.ebuild 706 BLAKE2B 13ca341650081a44e85af4ef28ae8cdf8dcdd971aea9afdbb827044a842b95975de84eaf6f5b016588d32e8dff033ba3dee9cc08cd36aa99cb787ca636d60aa1 SHA512 4c476cd6488070ca7edda5be0d9dd55121d45a2aa9ec9787e08698cf56a1284cdee65dd231985b0c6d170327a8abe46a37ef36d7ab074ef9ef25abba8f8ed80e
+EBUILD kodi-peripheral-joystick-1.4.8.ebuild 770 BLAKE2B 1abec17a88f9daa0bf27aac34a59e7be3aa4bfe9e46b58c1f8eb8f280a882723459945444da1e6291a8769f5582f9a95b4d21a710e8657efd6376033256b8d51 SHA512 4d76e61711b1523c3817c694d34fba20fde4b6a838c43849f9e8dd20120f25a6720ad1695e72ad3c97da2e735e17b594b7469db7ffa9e943ef97f8ef7a4ed7dd
+EBUILD kodi-peripheral-joystick-9999.ebuild 746 BLAKE2B 8587f64e5d25b69e37dca398f428cf136e61e44db423dc46592acd3980479dbd7d35d4f3b1ffd417aa47f1a53d6de9a3f52fc3461e6d11885e9fa68cd83daf90 SHA512 d55628f1f733d9b88d6958f889e8f40dfb159c116d4d75c9a5d250571915286e2f9c006006891d44b65c68f48580af6f38fe8af472f3a99be85be6af6ebf8edb
 MISC metadata.xml 439 BLAKE2B 4713d97899dd9cb12cf064f17d88b197f872a38952d435445b0097c9cacd297dface9c9efbe034eafe595c7cccc3a37773fbf025c0fc45fe3283ea406785c47d SHA512 1489ac3199dbc3033892af4d492e843fff379a18a93059e4c0e164e9140411f8f7756d275b70214c375f4ee649d48786255aa6500c2b6b218f843295ebd6c29e
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.2.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.2.ebuild
deleted file mode 100644
index 019a5d3f0305..000000000000
--- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.2.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
-HOMEPAGE="https://github.com/xbmc/peripheral.joystick"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/peripheral.joystick.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/peripheral.joystick-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>media-tv/kodi-17.0.9999:0
-	=media-tv/kodi-17*:0
-	=media-libs/kodi-platform-17*
-	=dev-libs/libplatform-2*
-	dev-libs/libpcre
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.3.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.3.ebuild
deleted file mode 100644
index 019a5d3f0305..000000000000
--- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.3.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
-HOMEPAGE="https://github.com/xbmc/peripheral.joystick"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/peripheral.joystick.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/peripheral.joystick-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>media-tv/kodi-17.0.9999:0
-	=media-tv/kodi-17*:0
-	=media-libs/kodi-platform-17*
-	=dev-libs/libplatform-2*
-	dev-libs/libpcre
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.4.8.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.4.8.ebuild
new file mode 100644
index 000000000000..c7d5c665839c
--- /dev/null
+++ b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.4.8.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="Libretro compatibility layer for the Kodi Game API"
+HOMEPAGE="https://github.com/xbmc/peripheral.joystick"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/peripheral.joystick.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/peripheral.joystick-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	=dev-libs/libplatform-2*
+	dev-libs/libpcre
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
index db97e72f5d19..fd7b1226a274 100644
--- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
+++ b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -17,8 +17,9 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/peripheral.joystick-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/peripheral.joystick-${PV}-${CODENAME}"
 	;;
 esac
 
diff --git a/media-plugins/kodi-peripheral-steamcontroller/Manifest b/media-plugins/kodi-peripheral-steamcontroller/Manifest
index 578609d33bdb..6d350d953369 100644
--- a/media-plugins/kodi-peripheral-steamcontroller/Manifest
+++ b/media-plugins/kodi-peripheral-steamcontroller/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-peripheral-steamcontroller-9999.ebuild 757 BLAKE2B ec03f723fc37b77d073f3aed78e14be76fe97695c4da20e7e1f931b7f3fe32370fbfc7e7a2601f24239c54cb5120774cd6d56653bfd171eb79c35e922c9b6034 SHA512 c2daecee1b673e1b0e2532be5d870fc7f1c687bbb984fcc9d9d705a27977111263862279d278192b02ded3593900aea75f601b69fdcfa4609cf56fe3343ab6aa
+EBUILD kodi-peripheral-steamcontroller-9999.ebuild 757 BLAKE2B 7f8c7c591c6b7f450b60b37765d6b51c0b7ae38b1c416f47e31db8de66fd9fa2ed2f28bebe4210e7c17b69edaa69177bb056a88625d2ccdceec194c59b70df66 SHA512 6952c9ec0c5cfebdd33b5e1881634fe18e36637817e976598bc3b64d69c922b61ea1759f0adaf43ffc5360c23631bbcefe5e5eb7c96d7621c6c5726759f66865
 MISC metadata.xml 451 BLAKE2B 693a4209127aafd693b5d826563ea913406cdd3445ac138426c18f3c1e8de2d3fd76ff590d51e9df1986f6f0bad0529e56faa32799cceb9fda3ef94d9022d92e SHA512 2e596edc4ed91a27b5fcee8b99a7defbe08a2ee6a4579635484631dbf64b539854418921b393e63e68f045415e998d0a3facb70a786b87c5a4dc40409d2fa807
diff --git a/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild b/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
index d357c789b6dd..a2853221614c 100644
--- a/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
+++ b/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-argustv/Manifest b/media-plugins/kodi-pvr-argustv/Manifest
index 524a47f33a36..a37f6ebb3d18 100644
--- a/media-plugins/kodi-pvr-argustv/Manifest
+++ b/media-plugins/kodi-pvr-argustv/Manifest
@@ -1,8 +1,4 @@
-DIST kodi-pvr-argustv-2.5.4.tar.gz 150573 BLAKE2B 66c248c2410f30f253f345bcf1611b5e88afee70e38b2c89100653817cf91ccc8f6e0d3a1a74668b23d7fb41ae341ad74dd11edc6ab0ae8644491a78f0293964 SHA512 30b7eaec52fbbfaf47e031b42f7c51c463f43e863b458cead67c21cd1677897726d90f1d687937919d174bc615ddc6d4082afdaf3bca0cf075be66968efd2667
-DIST kodi-pvr-argustv-2.5.6.tar.gz 150669 BLAKE2B 4fc29e21d9cf9fe00a04aedd93daa5af014900f5e76c5d2dc58b66cd324dd7df6e1f0c51cfbe887cfe767c504e64735ee2c24e20a4e9709bb0fcb13b72d0df22 SHA512 009cd43cf8b040b3144f77f8e442d73ee96de217dcc123abd77b77affd7732edf4e1fa6f548889be62f3eea7aba58ab7b132d076c30195fd2f4a0bf19605ef81
 DIST kodi-pvr-argustv-3.5.4.tar.gz 149660 BLAKE2B 0afd36f8e7c153bb5d00235664ab40e7fa165d658b0491a271f9cc04c7ccf2f3bf9666c949b43c03b86ab8d6479863c7df9e05d75b8e18676526bb1d30f8b62e SHA512 37ae3fa9d3e0f49ce87429de56f16e875bcbb289f94e019822c9e8661f54cd62d11d6cebe195f29871d7c24241d859e88fde988fc6ed6dd2a3f64cd7e8efe1d3
-EBUILD kodi-pvr-argustv-2.5.4-r1.ebuild 709 BLAKE2B d6d9022b7d6b682d2790bb10ad2de99a4b7bc8bf43f6e5c436e7bfb5ee109b4b1cf47e20483f0ac3a2da7a9d1713d35fe7ad683a5db72e8a5e880661a77b0fa4 SHA512 a68ba3e8fdf339b00669afa6ba1984dff0d436b0f770ddf54becf87b5e874d18f173470de814ee9fb82d08ac44eadbcaa3ddf39d1350199201348f7d0c0d788d
-EBUILD kodi-pvr-argustv-2.5.6.ebuild 709 BLAKE2B d6d9022b7d6b682d2790bb10ad2de99a4b7bc8bf43f6e5c436e7bfb5ee109b4b1cf47e20483f0ac3a2da7a9d1713d35fe7ad683a5db72e8a5e880661a77b0fa4 SHA512 a68ba3e8fdf339b00669afa6ba1984dff0d436b0f770ddf54becf87b5e874d18f173470de814ee9fb82d08ac44eadbcaa3ddf39d1350199201348f7d0c0d788d
 EBUILD kodi-pvr-argustv-3.5.4.ebuild 703 BLAKE2B 88426f2bd633dba02be419e2067a5860fba8ac022d16961ed2216eb34a1e7a8feae2520da95a1fa0bcd118c951a0ddbf36dcfccb016404eebba946849a4eb418 SHA512 b12ce181413e81ed518c09d8820985b1dd54a5aa64e64413f993a426c6bda743f52c6203e8769b198d446ed5f8a2248acdecbf95d8f9891cc2afdb9b17e8e4f0
-EBUILD kodi-pvr-argustv-9999.ebuild 705 BLAKE2B 3d5d932ddfca45f6066f6cd968350b378477b0accdda2aae9765dd09f132ecb153e1f4963873dac2a5845cf3c51e3ad58c4cfd5d916a2d20c02bf31143e6da74 SHA512 b52e751947d6fb1d8c723ce2b51e1f4355223088f33938881bdb6ef937d8dd8ea3af98cc3a3beacd2de805ae316f5c8640e31f2a444ed836085a56b781fd872a
+EBUILD kodi-pvr-argustv-9999.ebuild 705 BLAKE2B c9ec6b97b136d764164dbb6a33c5483aaf5dbbf4865e614b20a1b6408f5662a2523dc6ec04e1121bf3ae435e8f13ec41e529bf2ef23f1b3109f0a6434462006a SHA512 6b4c30f999371ef02e182974d8938f807cf935363a25ac005206209a0044a9391b4d7458039cefea5852975d67e190245d4709fad97302eb611d808276766c70
 MISC metadata.xml 431 BLAKE2B 7cf6fe3e6a6c6cec6b72acbe12ed6b95b8204c33f9f8473f6ed48831e189063b9b5584b579365bd5551cf9ba109bcf85b6ee1dc77eeb18871f049fa5490215f3 SHA512 ee08e760ff80ed37cbc40ea35ef0daebd9b8b7dd7a532123787a022fea25c9441912103dfb154491b81aab1f79675408c4fe4022c4937b03433df826bdfa90bb
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-2.5.4-r1.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-2.5.4-r1.ebuild
deleted file mode 100644
index 885a31c1a377..000000000000
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-2.5.4-r1.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's ARGUS TV client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.argustv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-2.5.6.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-2.5.6.ebuild
deleted file mode 100644
index 885a31c1a377..000000000000
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-2.5.6.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's ARGUS TV client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.argustv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
index d1169d9e78b2..64d10d3212cb 100644
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
+++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -28,8 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-9999
-	=media-libs/kodi-platform-9999
+	~media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
 	dev-libs/jsoncpp
 	"
 
diff --git a/media-plugins/kodi-pvr-demo/Manifest b/media-plugins/kodi-pvr-demo/Manifest
index 302b60cbe309..1ef537114acd 100644
--- a/media-plugins/kodi-pvr-demo/Manifest
+++ b/media-plugins/kodi-pvr-demo/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-pvr-demo-2.4.3.tar.gz 33550 BLAKE2B 8ef109600dbd405f8425cb2a7ebb450282ab552a87e573f55867b0db30beb274a31d223715be24d578580e38c205958e0733a2f6ae37d7a38ad9c092a58b4322 SHA512 14d6abfdc6225d19873b60a118f6f777dfb442f410a057a1f7fdbf0764203088ee337cd0e15a4d4a3814e949776e38b8f91ec7ff99526163e8bf5b82a114e745
-DIST kodi-pvr-demo-2.4.6.tar.gz 33566 BLAKE2B 76438109320456da61315eafa5485b1c4601fa4b77da156c62f220a6cf41820cb27e9ea1975a5c1e2f4df2d337baa04616665114bd35a098e1fc75e076eb854b SHA512 d78baa3abc5a014be631395e599c85e2a49ef9bf683aef74848030a0b60e872ec35b55da4658013430eaea99640bbb146d1ccff7c596eb5339e1c45eb5e4b7ea
-EBUILD kodi-pvr-demo-2.4.3.ebuild 686 BLAKE2B e032700db8dafbf355298974a10f3f2df1bbe6e5da88c698b7bdbb4c93ece2069043cc1b148d9f2f1936f3cac67c8a41eb73bccbb51dd3cc50c7e9c95c423705 SHA512 ca3c9c634e3aa2690f07797667d0f75a637c96b882ad221cdef8216681c8a861832380f9e0439158cd35433d6f7c43d17ab4d23e015c63727a08411e3411cfa1
-EBUILD kodi-pvr-demo-2.4.6.ebuild 686 BLAKE2B e032700db8dafbf355298974a10f3f2df1bbe6e5da88c698b7bdbb4c93ece2069043cc1b148d9f2f1936f3cac67c8a41eb73bccbb51dd3cc50c7e9c95c423705 SHA512 ca3c9c634e3aa2690f07797667d0f75a637c96b882ad221cdef8216681c8a861832380f9e0439158cd35433d6f7c43d17ab4d23e015c63727a08411e3411cfa1
-EBUILD kodi-pvr-demo-9999.ebuild 688 BLAKE2B ac740eba5d1f8defde063ffaebdd57a2966809411b47264d174b55d6346e06dcdd6c3506cc6ce50ed067874e19880b5bf072be2f3daf50d75a58bb37789ead67 SHA512 3cc29b7e96d78727f2a2376c5f67e2a310be9f18389bef0caaba94a919989ee5efbe874f7cbf6ba3682245aac10e08a60a1f5e3ca63d3ae45867029533c06551
+DIST kodi-pvr-demo-3.6.1.tar.gz 35070 BLAKE2B f916f89dd701c5fa9b6f9ad4950115433382c94ec5cc73afb0c753b80c1850947ba4776e494842e9181595b5a8bdb0e38f3a6b0baeaa6b19dfe2fe104b2ac06b SHA512 ddcc0c91b9173920ab5a9e05622312e7363b85be74254e451cff7d415d09fe9b60f59acb75c66359eabc3e737921116c2232042a76dcabcf9e2d52d4d3e31a09
+EBUILD kodi-pvr-demo-3.6.1.ebuild 680 BLAKE2B 87d12755a3a90adfc581a0a25e01a0be13e52551fe3114fb0cb8f5329adfe5011480df5c9bf54ca4aa449c0f13157b7adc1b2c23b8e2bba212249c5dc105a16e SHA512 b9507d10a7ae7f5dbbff1970e7c88edb3e76d3a84b6ccf3927eaf2f457d9ed651c773735b996ebd84803176e4362e8b943990cff810fd1b95b7c9ff71a653b33
+EBUILD kodi-pvr-demo-9999.ebuild 682 BLAKE2B 6a571d5a90500dadd816e3221e77f73511026a1009958beebd03b93a89c3800652aa9da82c6e5be7beb50918116e1ce9701fb983a95e12c34c185f004b2d8895 SHA512 44e997dff56aeaa6a77d27a5b57693a5f5b9542b0c9294677b2f3375f816049be26691268a1a7ba95888174d4d307af74e2e20acf915110d498dfea206d92f6d
 MISC metadata.xml 436 BLAKE2B 657769c7828eb3034e2d71aba8377aa2f7d9e4d314904e24e17f08659c2e58ade1c24d1903b9b30c5f96322c4c9ab85c92fceb41c468afda496d52bc9f4c5a7e SHA512 a60cfa34672d7940ea934fbc3dc6c2b0e11c0ff59cecd7d41dae08d040172c65e70117748ced3a74c5a772af9ebd00259e91db26cb73d635502d85ed48ff4538
diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-2.4.3.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-2.4.3.ebuild
deleted file mode 100644
index 29a0024da0f5..000000000000
--- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-2.4.3.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Demo PVR for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.demo"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.demo.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.demo/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.demo-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-2.4.6.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-2.4.6.ebuild
deleted file mode 100644
index 29a0024da0f5..000000000000
--- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-2.4.6.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Demo PVR for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.demo"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.demo.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.demo/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.demo-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild
new file mode 100644
index 000000000000..5a8fd9899663
--- /dev/null
+++ b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Demo PVR for Kodi"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.demo"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.demo.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.demo/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.demo-${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-pvr-demo/kodi-pvr-demo-9999.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
index 268cfaa74f37..6d694e9aa2d2 100644
--- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
+++ b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -16,8 +16,8 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	CODENAME="Krypton"
-	KEYWORDS="~x86 ~amd64"
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kodi-pvr/pvr.demo/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/pvr.demo-${PV}-${CODENAME}"
 	;;
@@ -28,8 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-9999
-	=media-libs/kodi-platform-9999
+	~media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-dvblink/Manifest b/media-plugins/kodi-pvr-dvblink/Manifest
index 621e6bc36db1..85bccbc8aefe 100644
--- a/media-plugins/kodi-pvr-dvblink/Manifest
+++ b/media-plugins/kodi-pvr-dvblink/Manifest
@@ -1,10 +1,6 @@
-DIST kodi-pvr-dvblink-3.3.11.tar.gz 150155 BLAKE2B a3c3a224885324f82d19d6b4fb467699cccacefa21729ee736c57f8823228a8b701335aba06c393542c5f4080a445b9a244c6c420e7134c5ef74284f70e8035f SHA512 4bc6b6c468c4578528e105003d37bf1b18d6decfd61144ec6e92cb9cc4c05e03d5fb0e475d48674f43b7feb5957f1d891cda6afe72e9f50c0834bdf4519074bb
-DIST kodi-pvr-dvblink-3.4.5.tar.gz 152982 BLAKE2B d74d7c33aeddbbbe588cb61e84ee06590a324ceace3c6cf1cd83d8f14ed7888376a237a9b5d6fc795e980da5f9f63fe9a4ed096dcccb8aed3fe549f07acedd1f SHA512 094781e1c944c7a64797f092404aa5eaa267fe31dcbf266441bcbe003362ca78e1732bf80ee26f703f3cdbe8f375f82131a0e6e2865b678e3c99c67220bb38e9
 DIST kodi-pvr-dvblink-4.7.1.tar.gz 181247 BLAKE2B a9368ed515f942a7144a50e02c5ada8029d3b87a61230ad9021065c90587afd449ef56e402e36e0cb0c9aefa226486ac793b11c2d509c9559a91c81b50753cab SHA512 66e132274632c10034c8dff78e1b72cf273b6e9e3dffff4ab2efb877ed509a88c8afda600734c93cb228ad7879a5e6815e89ae83d8b5e8d9d88c0c8b8dd3e25e
 DIST kodi-pvr-dvblink-4.7.2.tar.gz 180347 BLAKE2B 83ca3cf04de7cfda420da8f068022062ee08920d5313cf2e740c1512bc5c1ec3dc8cd1613f5aa1f30049193d777773d5e73ae66e616dc3e5ea4064cac72b4f01 SHA512 9057a066fa228a271e4b21935bf1b823bd7184d3cea62bdb358932d3a8018c86a1129548c5e54414bf068bcdaad7726a8355d5bc5c61f64130396fef8e089be5
-EBUILD kodi-pvr-dvblink-3.3.11-r1.ebuild 709 BLAKE2B 333110dd5935caf528768476dde4c629c196df9ba727d579cb0359a9b1054c7a7a93a0cf266e863b7804eefd4f56975b88f0f5a0f2e0926d41610c7346774e01 SHA512 e2ab0390cc48c019fd3c6858f52f972855ff1a580ed58404ca2ad5dbfea92e841b3cc1e7cda56153f918ec11793d14c4719bb0ca3bbe1264bd75981ab6724f97
-EBUILD kodi-pvr-dvblink-3.4.5.ebuild 709 BLAKE2B 333110dd5935caf528768476dde4c629c196df9ba727d579cb0359a9b1054c7a7a93a0cf266e863b7804eefd4f56975b88f0f5a0f2e0926d41610c7346774e01 SHA512 e2ab0390cc48c019fd3c6858f52f972855ff1a580ed58404ca2ad5dbfea92e841b3cc1e7cda56153f918ec11793d14c4719bb0ca3bbe1264bd75981ab6724f97
 EBUILD kodi-pvr-dvblink-4.7.1.ebuild 703 BLAKE2B ce4cd6664c4c53521badd438ecd5c5ed74280957fd63ddc8de33bf6e32292d96061bf82cd10ec45727ddc93c00239ca64d67eb3209a0d6e85e7b0456111f3192 SHA512 36295772140306413f42eae3fe3f8984d5a5948704ac8aa14567783eb7688e4d132059a768ebbfadde615f7ddf8fef4acfbee072b04d23993329788796f2fa30
 EBUILD kodi-pvr-dvblink-4.7.2.ebuild 703 BLAKE2B ce4cd6664c4c53521badd438ecd5c5ed74280957fd63ddc8de33bf6e32292d96061bf82cd10ec45727ddc93c00239ca64d67eb3209a0d6e85e7b0456111f3192 SHA512 36295772140306413f42eae3fe3f8984d5a5948704ac8aa14567783eb7688e4d132059a768ebbfadde615f7ddf8fef4acfbee072b04d23993329788796f2fa30
-EBUILD kodi-pvr-dvblink-9999.ebuild 708 BLAKE2B d69dbaaf73ee284c01bf1d19a638d995c354ebf105cf37748ea6645119747a57b7e32d6f0b470c64c5b79783c83cbb4d6d4a545fc36daa2dd40cdf7b0e3cd671 SHA512 fd4a02e348ac4d7e06665f360444b425ea1f5b63040e2b924421a919991fdf43263bcf3a6f7b211c98fc41f6bb3967a66ddde08717b3f14ba85ea09bcdf83606
+EBUILD kodi-pvr-dvblink-9999.ebuild 708 BLAKE2B a04b56d6f3793730ef5d90237125f7548c358e920f1934123047a6658271975d7c5a53573281fa919fe5f99690afbffd69a5ce91988d08be1e79fa96756432a3 SHA512 c1ce8332e924dbad56db9e7d25b572ec61e36ff5d8306829db642fdfe039eda0f524676e31ac66925b898c7e9a7df1e1167cf022fd9d675c3080011eea94e639
 MISC metadata.xml 430 BLAKE2B 3e8e91274af301f44e000e54762c98b68a732dcb24bab5f8114df0bfa2b82485cace8c2dec1258efc202b227f946820aa0833dfd7c4647968756b84feea3311f SHA512 f5087df98e004c6319dbb7bf9b4428e5e52636e129cd34f3450d23b7b21b6dc36e7d935c3921e08796831082d4bd101d4c4b185a70236eb1a4b8c6b8522691b7
diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-3.3.11-r1.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-3.3.11-r1.ebuild
deleted file mode 100644
index dd3eb8b311ea..000000000000
--- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-3.3.11-r1.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's DVBLink client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvblink"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvblink.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvblink/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.dvblink-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-3.4.5.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-3.4.5.ebuild
deleted file mode 100644
index dd3eb8b311ea..000000000000
--- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-3.4.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's DVBLink client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvblink"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvblink.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvblink/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.dvblink-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
index e3061438fd15..dc3768c88ed1 100644
--- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
+++ b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-dvbviewer/Manifest b/media-plugins/kodi-pvr-dvbviewer/Manifest
index 39b17a86ee2f..34d54ce40be7 100644
--- a/media-plugins/kodi-pvr-dvbviewer/Manifest
+++ b/media-plugins/kodi-pvr-dvbviewer/Manifest
@@ -1,12 +1,8 @@
-DIST kodi-pvr-dvbviewer-2.4.11.tar.gz 97354 BLAKE2B 6f9c04c0a0a4dd2ce9cab06e1ed96cdc0c674bcb3665db7df6525a2c5ed8e46023e050a4ff9c378fd80a494b34015d37b995f0692c2c8ebfaa1c4e333fbc7468 SHA512 282e11e6ec3bb6a0fdb8b7001a18d335b2cf7c9c28dc1f965ecbcef50b38d2ae52e7aff54508765eeb107ceff67ba0c5b5aa620e792ef88ad86930432cb37a02
-DIST kodi-pvr-dvbviewer-2.4.7.tar.gz 94802 BLAKE2B a2d952b56cf3dcf06563c0a63741026bb77c1f91e0b854d1c3e8f4b06923d71487a835497342955ef2f77af883d94dcc0b5e1363430cf20874b7af29ffe8b964 SHA512 b88dcba491af5f4bb66c3e6f38f28446978fdc7046ff1cc5579957316310e55cf9f00b9162decc0b701a95dd7e76260175d9d66dacc5357930a3f144c48e1ad1
 DIST kodi-pvr-dvbviewer-3.7.11-Leia.tar.gz 128370 BLAKE2B baa4a6bdab5fc96b8e34c73beebf7959fa20575fec87e7ce8f4634462704ec7eb1dc354da55f8073f7393dbdfe422f9b3fd328ef986d40fd6b8aaf68dc838997 SHA512 f20eb91641df1c56782884622b0a60f9c65bb0384b72bf5e1d71d38fc092a954866935658edc36873272b060a8ce8e712b997666012608745b52d91a474d5f7b
 DIST kodi-pvr-dvbviewer-3.7.5-Leia.tar.gz 125918 BLAKE2B 413a752c092ff250e01db404dcd8c35f522546c42c33d93c66f2b5dd7ade1b62fc1686f5b4453260155fd4e1c6b624318a8aeebabccf9041d90952308cc04570 SHA512 03aa18b4946d2d3c345feb5fc26d999a0ca2a929f2ec0bf92450a170f4ceea085fbd16d5daec3782090ffa054bcec8ca02d997716854b493b4f9b8373f2321eb
 DIST kodi-pvr-dvbviewer-3.7.8-Leia.tar.gz 127666 BLAKE2B a1f73598ec8b3c6db067b6c991ea829ebfeae526e4575f9392c0fe36280b467ccee46eadc65f14309bf422e06f9ce9754ae3b2d3444f58fe0c938541be9130d3 SHA512 8d0c16c21b6b80f16801d0d253987f292aaa324f0eabd508c0023e87fce9502ebecbcc89f8fb00007dbd792ced83a8925e280f6cb1dbf0a5f319699a8b7d95d8
-EBUILD kodi-pvr-dvbviewer-2.4.11.ebuild 718 BLAKE2B a048aa4e0eaf017f36140c071626a62b3fb25e1e2eb2d2d539f56a4b43d6b7d680b7dedde4af93971a99000f4c039281f33b167aba05269a8cfa53e1209775b1 SHA512 c8ae47ba0e89c0e3eba50ee7ea7e80318b2b321fbafbab85ff1b8c1d80b10feabb34716333f58418c51b3746bf0fd9570a9f0b5b2a6ada7029f30fdc716327b0
-EBUILD kodi-pvr-dvbviewer-2.4.7.ebuild 674 BLAKE2B 63d7528276796aeda1bb86784ac02d7ec0d3c83f6d9d4691ba8a961706f648cab6460133f63d2b937f1fde2513a7aecf30680aab6b6bd9db5fcd6e9589695ebd SHA512 71fb7d624ba2e71a4632daf8545dbb2c01759f7cc739c4cfcd6b99ab56203c827c30805dec183cc3f6626377f92ded174d113de8d202f00f12680ea272acbe83
 EBUILD kodi-pvr-dvbviewer-3.7.11.ebuild 724 BLAKE2B a47e2cefca993930953e681d990454e3ed7523033a12eafa3d7b1666ccaa02ce4ec463a855ab6efcaf3a0b8aa11e21fceebd0e5479e2533a2e9779221746ea57 SHA512 cd00eb63545a5786958b0c88e0f7cc95d59b1356b1a9de780a81402aa69ac9f4b4a5691d3844c7b27fc832b54d68ba0d1e7a4b13f997a12aea53770d654e8cd1
 EBUILD kodi-pvr-dvbviewer-3.7.5.ebuild 724 BLAKE2B 06c88eeb74096b98f317afcc10aab898af34159be154be5dd99713f0d6e33be9d49c0a3e4a06c3f6e40b8a43cb3a2427c527fec6f53cf71e7e24b0c0439174bc SHA512 1a7b983a71f4f8702e65534c9fac156aef3f343914064ffa2326841798b5aff8d16a5c4dd6d2af8aba766aa87d134e526f94b2dc057db2eafb75b5d5d2d54dd3
 EBUILD kodi-pvr-dvbviewer-3.7.8.ebuild 724 BLAKE2B 06c88eeb74096b98f317afcc10aab898af34159be154be5dd99713f0d6e33be9d49c0a3e4a06c3f6e40b8a43cb3a2427c527fec6f53cf71e7e24b0c0439174bc SHA512 1a7b983a71f4f8702e65534c9fac156aef3f343914064ffa2326841798b5aff8d16a5c4dd6d2af8aba766aa87d134e526f94b2dc057db2eafb75b5d5d2d54dd3
-EBUILD kodi-pvr-dvbviewer-9999.ebuild 726 BLAKE2B faa78ff1a46d710284b2043c26f458fc279161d53f6632ec320e5583b9c6576156ea5f52b1409ada64c32a6a52f79c5245c7d2dbdd6b81cae8a5101a3a2d4405 SHA512 59c05d893f445fef677587cfe13fc5340ad571f9a3856e6eb23ec119da39bfd5b863ce0051977bc4a5d3a4684a639af2e82670d0cdd99d16b225f8ee22326698
+EBUILD kodi-pvr-dvbviewer-9999.ebuild 726 BLAKE2B 32ab0af08b1579412f50e22f2e4509693bd143bbc23308ee753a6c0817a7c7f3cc8e9ab1531cdeae4a4d82c05d9750a9ae0a48a3bd3d20a1286079b17511e6af SHA512 7faf4553275cf0576517a3f81da6b5cfa32c30ba8c3821b2b0e0d42dd00d0ab9842c7e300a3b4520f1a3f21a2ce9255f1f10deb65aa8e91c7e70166e4da7f073
 MISC metadata.xml 434 BLAKE2B 8c6842bc4a5a0dc248402680bb06f034883ec52717aff60b0d8a55a27619f288719caf002056bb6c36f09506e8ecf0b45a173f7cfe85699db9477b30fdd380cd SHA512 9e817d4a01a0c99faf30fcbee42cf386310ee8e2a74799d5384bca834ee88c534740bd304b5febae834536c6283e6570199d6692b7091e5c2b9ebe35c1d717c4
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-2.4.11.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-2.4.11.ebuild
deleted file mode 100644
index 7947b15e7ecf..000000000000
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-2.4.11.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's DVBViewer client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvbviewer"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvbviewer.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/pvr.dvbviewer-${PV}-${CODENAME}"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-2.4.7.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-2.4.7.ebuild
deleted file mode 100644
index 95fec515a619..000000000000
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-2.4.7.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's DVBViewer client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvbviewer"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvbviewer.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/pvr.dvbviewer-${PV}"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
index 56e77f938fb0..0c4eb9081cdf 100644
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
+++ b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-filmon/Manifest b/media-plugins/kodi-pvr-filmon/Manifest
index 88a6e4a1b264..31dd41e5ccca 100644
--- a/media-plugins/kodi-pvr-filmon/Manifest
+++ b/media-plugins/kodi-pvr-filmon/Manifest
@@ -1,8 +1,4 @@
-DIST kodi-pvr-filmon-1.4.7.tar.gz 103691 BLAKE2B 660ef1777451bbcf0abcd38c66ff3df2829cd0010eb8a0b8f4b69b4e4cf6d83506743aef9ca52276723b76c97fcab1e019ff01d4f15e929b796141a70df3d6a7 SHA512 86bbfbe56607888983e7b80800680c2b955a743def3aedd9ba1a4cee8543af327b737b1c9a04dc03b09a950774a31c0ce9af8a0431103fca937b6f0fa7b76280
-DIST kodi-pvr-filmon-1.4.8.tar.gz 103709 BLAKE2B a31125631ef8e26702a132814d72468b4f731ea1b01c6ce0edd1459c96895ee5aa06631783af45ad4235308ea914c9f0295e34e1b758b471e8a5a17c30413eea SHA512 dd2069c221c12a0415140f108889de937b6d65c950a9dc57a73d8615c221c4f56c4bc7b3190ddbe54739b6f85204fcd0a5214c45b57db3fa71d83e0c4bf4de5d
 DIST kodi-pvr-filmon-2.4.4.tar.gz 104862 BLAKE2B 8333be55812ec5cb18535aa696c07e16cc02712522b540bef346bd030fdbd572daae47d81bed78be243014fb920911309d5f924079d323104c60090d0ca2c72b SHA512 f6d7c90842ca59ebb3b254860b47d7c1b7e6e5bd70f06744341eaf30a4bc2847027818a2bb097e56398354315753cfea7878cf2b82c3fc69b0aeed106b8d8e80
-EBUILD kodi-pvr-filmon-1.4.7.ebuild 703 BLAKE2B 3d33b39f584941ab92305bece0925e1c8d52cbf54c747116a0771118ee70b91f34351f9e08c36a9b235a2a82e7fd94ee2263106bade703155b14c62b32b8250c SHA512 153a5a0dcce9db0425490839c919f273332a5cb8882c6954f4b12fe0e172d0e6f2fe21447709ad195cb83a31bd5b44c6d568ed83e7ff57aa6e90b58791d8d32c
-EBUILD kodi-pvr-filmon-1.4.8.ebuild 703 BLAKE2B 3d33b39f584941ab92305bece0925e1c8d52cbf54c747116a0771118ee70b91f34351f9e08c36a9b235a2a82e7fd94ee2263106bade703155b14c62b32b8250c SHA512 153a5a0dcce9db0425490839c919f273332a5cb8882c6954f4b12fe0e172d0e6f2fe21447709ad195cb83a31bd5b44c6d568ed83e7ff57aa6e90b58791d8d32c
 EBUILD kodi-pvr-filmon-2.4.4.ebuild 697 BLAKE2B 40d100012cb3c7583684aebf7741c4629291a227af15627c4d9dac9a2b47ae2bbbf322ab34b70f03dab4c026ebb70e7bbcf6688468d81df840e151dcb9700760 SHA512 162b3053e55f4ca20f5586592b96538a4640dc32c5ed682262899880699b2097b013533eda33c3cf74d35b7a8aa6ce595188c16dea1054811e0cd8cfd2c0614e
-EBUILD kodi-pvr-filmon-9999.ebuild 699 BLAKE2B 883ffc7d43f5f599a4385c81c5326a0aae077bf819849d406ef8482d34589e4f23006365daf6da2460fbf45ef6bd6cb0eb8048f29fd9f8b0ddf319d0772166ab SHA512 87e2fd1de9e07f613d8418f6d2b825a6ca200bc7f020952f5f3e57ae5381cf0e85a9f16f978f34247c93526612a568571390a1efee6a24b60ab7ac558e75e275
+EBUILD kodi-pvr-filmon-9999.ebuild 699 BLAKE2B 3e6a1930f857d4a9361f3438f81c94cf346972f077d734882a9b88d5bfcabb2b1baf5d1cafe852af0ba066b9609fc63a81b29520e57bfc41a6d2b9ac2babae43 SHA512 c07dace498aaa0412428b76e3b2af92f1cb62f9c8707687a1a66f5a915eb534bbff5b9c2b9baa0c59da91a427228593edc008082e1d074da77489db0d1867d63
 MISC metadata.xml 429 BLAKE2B 5432fd7942694c454c239f39e4835bb6430f8e5dbc14b4bb11d32f6aa618822be12b1fa6a6b39422f4fb5c0d7a1b8203ce7fc3f2090a7d2a7253ee65fca11439 SHA512 dea6258c8509740209e941e13d258d165e72fee1902dba1d5364ce3c453e53de4698df34cff64f591f192336a46e69278ae7409c187788df6ef1a0bb4cf10ee4
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-1.4.7.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-1.4.7.ebuild
deleted file mode 100644
index 4cb0060831e3..000000000000
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-1.4.7.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Filmon client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.filmon"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.filmon.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.filmon/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.filmon-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-1.4.8.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-1.4.8.ebuild
deleted file mode 100644
index 4cb0060831e3..000000000000
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-1.4.8.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Filmon client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.filmon"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.filmon.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.filmon/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.filmon-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
index d4bba9c02f3a..c8a6715f02e4 100644
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
+++ b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index 7052ad605a4c..4d0765aa4c74 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -1,16 +1,14 @@
-DIST kodi-pvr-hts-3.4.24.tar.gz 201592 BLAKE2B ad4db20f002c006f9c5dbeec65b136287fe6f7b6d973794e90c1e7c2edb3d13717db077edc91172a94c709afc623ce5fc29ccfa88ff34e8c6694b164a9223497 SHA512 66d0c0f090a1c22f748a2cf70a9790dc1fa74c05bbb3ad478cce92b2a116c8f2c25dbc72a9d6f2269a19da94c0ea9f7123bfffeebb9d2d6f29dd17411410fe16
 DIST kodi-pvr-hts-4.4.12.tar.gz 160405 BLAKE2B 7d192bf7a19672595cc0a6ca042943f5a59cc530596df65c848e940eba516c0cf429f59418f8f50d5ec930b36e8d496f2ed444b0d0c254941f4fb2b10407c087 SHA512 c04d9e72de8d4bae5699b48c4aa8839a468b81f5ff21b4f2607fee1bb10fe47f1de4574d7ace945a894e46246b9ee5c6b4df6f290b98ff77937a7c6edca675bf
 DIST kodi-pvr-hts-4.4.13.tar.gz 160588 BLAKE2B 2042237ab0804ecf8684f3a20a6f0397e5a890636a2f82ebd04be28a06ad2b79aba53f69c22de9a92d64022354af6e879822b74af37c488adfaf5e3bb6bea81b SHA512 7fe4b5519400c36609de9704087d59f60e44a226fa4d8457b9ace084fed5bd58669091cb05b38c705033e6d5c99a525541b87267d4bbbfed690a4eed043e232c
 DIST kodi-pvr-hts-4.4.14.tar.gz 160561 BLAKE2B dda8728a411b95039a4132e2ca4c882e36011a0c510bbc8e7bed093b778c1c2ab55d8356b25e04bc378bd4036b6ad6f43a0f13ffd7587cfbbb16ff5a7eaae350 SHA512 ad42dce7ed715e99ab4541d993128ceda194a9fa9e0fffb1a8ba170b719c977e32804a5d94a07d1d00f29346189708847df69540decabf1fe8d95b616c4c34a5
 DIST kodi-pvr-hts-4.4.16.tar.gz 160594 BLAKE2B 5ae9bff9ec9460c860b6333f93748d70c18987f51adf248482c2125610ea5a034f2d00312722b4d86d6435f5679e110451f1b6fc9743ed4c4cf79cb079d8f287 SHA512 f2e7ebdfa18f0b191b32964c18782ce0ee76497b141057c29aedb555dac932b1099aff319f4de61166f3fe7e1ab58b723acd2e1f284745f42d6174e7f3e8a31e
 DIST kodi-pvr-hts-4.4.17.tar.gz 161495 BLAKE2B 494d63cd77d6ada7090418140e7aebdb678941236fe45fc46464b213090a2cb5e386d0a59b589afc36cc4cbe020bd3205341b6d893de61c106aee55747172e18 SHA512 0c9eeb8194e4c5b54d5d4df86dc794604d8df91ef172eff9207001ece9a485f7eea40ece449c28bb4cbb414a5a195e6fc50b9571744420c76da104f5fadff377
 DIST kodi-pvr-hts-4.4.18.tar.gz 161525 BLAKE2B 22d869989fc2151ca5ec39c7802d4612d2dcf5e29065bb27a45f528b939f94835585a6a5d427c29a79bea31f5cae811e450be6d80a30d0a18d6934eb63eff395 SHA512 1a0fd0fdec46178262c3f03544d02d13601858043d58ff71bae97c60514f3b11edf12fa53e4436a0de13dcb6877e937d37a5a02f7d6b9ebebbcec9c39e357ce9
-EBUILD kodi-pvr-hts-3.4.24.ebuild 727 BLAKE2B 3b4ffb79aa912e1ec28482085cfda46969140da62410bb2c6698aaa6176b76b980aada914920dc2dafd170d155ab6ab586ef43c7f16c2629763b90561809b787 SHA512 469accb72b3fbf8085cd1d0d823c20a837442ac44d748bf352cadf5706952a9c3af4948753a236ac78bfc0f430d340710ff657f39fe65bbcd8b3c7ab3a58ac13
 EBUILD kodi-pvr-hts-4.4.12.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.13.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.14.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.16.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.17.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.18.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
-EBUILD kodi-pvr-hts-9999.ebuild 723 BLAKE2B c40ccaf825c6162a565463bfe008d827e96ee2663422904ad086eed69f239a240133e4d10ac889e2acaa640c800e4d37edf3e44763b89381e7ff80729a7642a5 SHA512 ca35fceee8d9d6a8f8d622dd6bc6b5e1fc06043522954f6e36656d420b3983b345865ebe3e417f6f0cba50850332356b03e5c16c84fab521ac2531ac4bc4f03b
+EBUILD kodi-pvr-hts-9999.ebuild 723 BLAKE2B f51359291a40dada764e447982851b60e6433f3a8ffbbdcc307e2dd4ae2d9c69e98819406a85bd2e4d1614a748c98e679a6b72364f2b1212ec86efadcb48961d SHA512 65d6b27730ee77d64919fb8885c175e2cd4ee2ee416b44e8d501f4d8d39e3d149a9774687538559e92c65cbfd53c3f8f79e62fa58ccfb206a6875d2752fc6ca4
 MISC metadata.xml 529 BLAKE2B 75957634fa1689db9429bec1f25738c6700813d2714a4c80a4381fa9dec88a126144ef661cbdf1ba7ceb94cddde73bcdc376714abd08f9c205fdc8156e3fed55 SHA512 e6eab8498b684a786e899769dca6949b3252e7534fed233cf7b59f9eef8de4180b676445f455d1736713738c4ebbbbc3e761e8b2af86e386b93e20cfd04f0439
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-3.4.24.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-3.4.24.ebuild
deleted file mode 100644
index 3de6600a8328..000000000000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-3.4.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
-SRC_URI=""
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
-	inherit git-r3
-else
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=dev-libs/libplatform-2*
-	=media-libs/kodi-platform-17*
-	=media-tv/kodi-17*
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
index 0e79994348d2..2e9cd82c3232 100644
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest
index 134b56265cc3..0f48befdf9b9 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -1,12 +1,4 @@
-DIST kodi-pvr-iptvsimple-2.4.11.tar.gz 159750 BLAKE2B 806766c4753e657a031a2e067cf9d245e75aab6009fce97b718a095b3dcd2e18121ee9dd2ebd86d864da0de8816d02bba9111826752c01a9b73f572180f1ff78 SHA512 019fac3454c3e5c76055c5ce4785cf6129c79cd8d6c9d8343bc24781e72ea8598039cffec7f19f0ad32ae86acf7fab222ea304a70dd1a13a125ac6e38ca7370d
-DIST kodi-pvr-iptvsimple-2.4.14.tar.gz 160222 BLAKE2B ced35cccbcd4a1652aa63c3a83932c6da218e9ff2f09016bdf36f0ec478b88d07e42db270aeee891b19c0b80351e61e5ba7b442e3d56ca22a68511926db1933b SHA512 bcdc1060a871891b46b113f00edb84e99049205042d655bb936b672d318b611da9ab1a3e729efc06feb2554f9359d2d1bfeec3e4713f44259534f4f6ce21791e
-DIST kodi-pvr-iptvsimple-2.4.8.tar.gz 159663 BLAKE2B 73d2bdcee79ea38714fa772045b1a593bc32e28711eef155750fa052655b509a563cdce27c1eb0047feb6ded0c17e3fb3f800815a1cd589dc860213411626d7a SHA512 da4e287f8c72b014b36fe2379f85568551e4d479a311479347de36aa7f4f497f344b0d8443c5646a0cfbe20db0ec25c90a653e6030c59faee7040f8c8341cbf7
-DIST kodi-pvr-iptvsimple-3.5.7.tar.gz 116264 BLAKE2B 557fce9cfc4ac55562d938e63afdff3347c51b452869f34e705ea5dd912576eb210ffaf213a176dc605fa98ca2ff6862adac69be1afb4379ac2f90639d692156 SHA512 eaa26d84193c67bcb97c65b46f89c29acaabc121e650cf517cc2ded2831106ec8c66d0b9e59e7d423c79bcec3be2863dda1dffa89a71b3ab4548302fbad6e023
-DIST kodi-pvr-iptvsimple-3.5.8.tar.gz 116658 BLAKE2B df871b9e2b3c464ce226308e3cccaa195f8db1a118ce5349ce5640e3b7cd5792c093f18a1f28d3dfe4d91e1dca9b54317aa7a0c36db111eab86f7e1fae7c38f7 SHA512 e9de8e693b2804ca1323ad4c5ed9b0a3f10679bc92193f149769a89ed3af5282002ab986b849da42db8f5962e07a066d363bd00bf05e41dfbd43f546ebee1e9f
-EBUILD kodi-pvr-iptvsimple-2.4.11.ebuild 746 BLAKE2B b7d48cb12940c02a1becd6f11ca5fd075c739fdc5045b759f7cbf1b137952219b5e4af9349a943d06d3aba6db6155fd3eff61479a6f2557126fad0d46d293eec SHA512 12583cb932a5d9a39533ce58ae0d89b2ad0d814256dcc2c0f49ca0fa9f6b8c3af93b9277b60f8fb41810fdb1694ed85fbf84452a4134e99a835ddfeaeacda3b4
-EBUILD kodi-pvr-iptvsimple-2.4.14.ebuild 746 BLAKE2B b7d48cb12940c02a1becd6f11ca5fd075c739fdc5045b759f7cbf1b137952219b5e4af9349a943d06d3aba6db6155fd3eff61479a6f2557126fad0d46d293eec SHA512 12583cb932a5d9a39533ce58ae0d89b2ad0d814256dcc2c0f49ca0fa9f6b8c3af93b9277b60f8fb41810fdb1694ed85fbf84452a4134e99a835ddfeaeacda3b4
-EBUILD kodi-pvr-iptvsimple-2.4.8.ebuild 746 BLAKE2B b7d48cb12940c02a1becd6f11ca5fd075c739fdc5045b759f7cbf1b137952219b5e4af9349a943d06d3aba6db6155fd3eff61479a6f2557126fad0d46d293eec SHA512 12583cb932a5d9a39533ce58ae0d89b2ad0d814256dcc2c0f49ca0fa9f6b8c3af93b9277b60f8fb41810fdb1694ed85fbf84452a4134e99a835ddfeaeacda3b4
-EBUILD kodi-pvr-iptvsimple-3.5.7.ebuild 759 BLAKE2B d093efa3739157820d9a53f361be71540be969b1ca00a5ef798c61b54d5573095710888c16f2b940e1168e684319fb84607bbb47af7ed703c1fed047960b376d SHA512 e2ff98d231306be33cefd09631d4f512452e62fb46be55e246ba671feeddba96e5b67375f8f7bfade6c12be189d6a50eff35ab0e065165c5130a42ee2f00be49
-EBUILD kodi-pvr-iptvsimple-3.5.8.ebuild 759 BLAKE2B d093efa3739157820d9a53f361be71540be969b1ca00a5ef798c61b54d5573095710888c16f2b940e1168e684319fb84607bbb47af7ed703c1fed047960b376d SHA512 e2ff98d231306be33cefd09631d4f512452e62fb46be55e246ba671feeddba96e5b67375f8f7bfade6c12be189d6a50eff35ab0e065165c5130a42ee2f00be49
-EBUILD kodi-pvr-iptvsimple-9999.ebuild 761 BLAKE2B a2db9b475185a9a4a838a369ff4b79842f1f085b1d254d9ece7a4460126777bf089fa764f0e7e37f17ba308c3d2b338cf331099105ef742bfc9444b01504b148 SHA512 488548d789fb5d2871026c33b278ce6aa8f2c6a7a525d9512d946f71e8a1d4ed7dd822dad1e45dfe52097c54c3108bb8cdf198b4918db4186934a6f787064ddd
+DIST kodi-pvr-iptvsimple-3.8.0.tar.gz 124269 BLAKE2B 290eba76c3aad4cd2a2b03bf1f5d153173e168b372e4f9dfb25a236aa01f644371fc5371bc109c0474e3604da53663b21401adf551011369148f706b28a5a340 SHA512 1d7995ff2bc8506c38effece68f1aadee4238e56de49cee7b09e86e6b197cadebac44a3a1cea0590593c76db66eeb59f3ef17fc91b19ef1cb0480eef003ebaf3
+EBUILD kodi-pvr-iptvsimple-3.8.0.ebuild 759 BLAKE2B d093efa3739157820d9a53f361be71540be969b1ca00a5ef798c61b54d5573095710888c16f2b940e1168e684319fb84607bbb47af7ed703c1fed047960b376d SHA512 e2ff98d231306be33cefd09631d4f512452e62fb46be55e246ba671feeddba96e5b67375f8f7bfade6c12be189d6a50eff35ab0e065165c5130a42ee2f00be49
+EBUILD kodi-pvr-iptvsimple-9999.ebuild 761 BLAKE2B 0241ed10e0ab41194a0607c09edc6a8784da8ca397931f7efabee75650a8bc4b22722c695cee0b0821778a61d6413b0c22ecf223cbaee03942b2a6b607ea1f86 SHA512 037f8811dbe2461543389428ba0608cd16fbd0a00f8163ecc041aa931ba168e3a5aed949439017c8d8986ebe6cd82f22da9d92fcbee72ba1ac22b29d3c0c63ae
 MISC metadata.xml 436 BLAKE2B 657769c7828eb3034e2d71aba8377aa2f7d9e4d314904e24e17f08659c2e58ade1c24d1903b9b30c5f96322c4c9ab85c92fceb41c468afda496d52bc9f4c5a7e SHA512 a60cfa34672d7940ea934fbc3dc6c2b0e11c0ff59cecd7d41dae08d040172c65e70117748ced3a74c5a772af9ebd00259e91db26cb73d635502d85ed48ff4538
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.11.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.11.ebuild
deleted file mode 100644
index f46484a6eaec..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=dev-libs/libplatform-2*
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.14.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.14.ebuild
deleted file mode 100644
index f46484a6eaec..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=dev-libs/libplatform-2*
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.8.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.8.ebuild
deleted file mode 100644
index f46484a6eaec..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-2.4.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=dev-libs/libplatform-2*
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.5.8.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.5.8.ebuild
deleted file mode 100644
index 8aaf1e253888..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.5.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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 IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=dev-libs/libplatform-2*
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	sys-libs/zlib
-	dev-libs/rapidxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.5.7.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.0.ebuild
index 8aaf1e253888..8aaf1e253888 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.5.7.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.0.ebuild
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
index 66b869c31f5c..5decc98ab21b 100644
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
index aef7a7cf338a..7a057bda4e03 100644
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
@@ -1,8 +1,6 @@
-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
+EBUILD kodi-pvr-mediaportal-tvserver-9999.ebuild 769 BLAKE2B d509027a696d3a3073631217861bff99c08c088b1c734bb30b81c66573274239984399e1183f831bedf6ce5da9c36ff82be5fcc066aafd035dfab0a5f247a7f1 SHA512 3d84ad37d4eda7a45db8c8c6334dc09379f1684232ed4da488c5259796b51a6bae151cb964a9682db87a4d3246b0afe205cb6d153ae6cd73cfe6638ba185f1c8
 MISC metadata.xml 456 BLAKE2B 79a150e9808ea82b402897e6b22c8da560055cae8a82dd38f2564895f417edb195720ddf7c9823eb9a001a8b9fae1626cc9704032b571c4f2e60906767b501b5 SHA512 dc787d33279a0b9f0fb8290f722f25f7cee998781de3d4d7bc16bf24ed0165ba0f967eee97a6e03865b5b3822952b545debd8ebec9f7dc0c18e1bf06b2486121
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-2.4.19.ebuild b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-2.4.19.ebuild
deleted file mode 100644
index a42283a39e96..000000000000
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-2.4.19.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
-
-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="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/${PV}v2-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mediaportal.tvserver-${PV}v2-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
index 277ea63d5233..7a797bda8176 100644
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-mythtv/Manifest b/media-plugins/kodi-pvr-mythtv/Manifest
index f87a501e1ed7..9168e5addda6 100644
--- a/media-plugins/kodi-pvr-mythtv/Manifest
+++ b/media-plugins/kodi-pvr-mythtv/Manifest
@@ -1,12 +1,4 @@
-DIST kodi-pvr-mythtv-4.15.3.tar.gz 650217 BLAKE2B ddc6b11039bd8e5e6b46331030909063e127f681f4059e604734644a3159c10f10c3dbed770ba8a58bb5ea3b7e543dfba042b28f347c842d963d7966e35cad32 SHA512 1171f4e6a05878660795b585185d35707ef713e310f3508e7fb3327caf79feb6a941e4b4f4d9f2331ef13492c141a4d36157547e350642eee900f3fad1d46b55
-DIST kodi-pvr-mythtv-5.10.4.tar.gz 700724 BLAKE2B 51b30945bc24c5b66be2543ca95f7f86663e238554051735ab84f70742d78b15beee434feb7620241f36a65b279967b7e99e3f6c94708dbbc68447aaf9908418 SHA512 d7267f71a65f9a25c10bd2b8ebe114f9e9ab0b8575f1d60c58be70a6a7fae3a6abd8777186e092555b89d4911b5ef4639cc48874f189f4839fdf70d6bf07eae4
-DIST kodi-pvr-mythtv-5.10.5.tar.gz 701110 BLAKE2B 7aa1148cdc5b0c187b0c4c077c5a882493bc081e27ea2210fc0b02fa7757007d3f7081ca35bc155e9d019601b1d51b89fd358c094a30202309e6cfa218636e9b SHA512 9c3b5fc208693bfbded7e6376131aa06bf94b2019c111d40c254a7505c0b4641d66f7a57ad55fe0c174756811983250ce68e4d074619413d04d1b46d66759d7e
-DIST kodi-pvr-mythtv-5.10.6.tar.gz 701798 BLAKE2B e99fe7e4959e44238184b85fb8a6b22ff7f375f1ef6f1035d119edbfd0df65909e4e656ad0c008e34c5bd841b6379760a81e194f2b66bfdc087914647f69ae99 SHA512 14577d686f18698bd7fc9fcaf74bf3eb6dbb01e630782054a6045060bcead6878654d5427c7e6b37632a75de92b9a4dffecbecbd7b60004fdaf2763415919401
-DIST kodi-pvr-mythtv-5.10.7.tar.gz 701835 BLAKE2B 148f3bea1b034376c848c10c434987ef9265d722c028f8af1a5307f989a344114137111affae617f9012a5efaa6b1e772cf630fdfedd9d033474dadfd5512ce5 SHA512 3329737dda3141fe8cb0bcdb19a9f817d2320128e0db36b0255e8f8eaad00c4ab1149cf2ec3d617464c645c5030fe96cb22ac94fdf29d6ecc9533f7c0295a9f5
-EBUILD kodi-pvr-mythtv-4.15.3.ebuild 642 BLAKE2B 6b294e422af541a0867bf05d2bbb49e97f343d441b528836deca12cd1f919ecd7504978e5378713ec7019675a50f973dec956d6d93ad2de1d5a3308f3c37f789 SHA512 a5538514f1395a1f736ab751d46cadf5472c3db443ed8ee61b6ed021c358b93b5262cf1cc123c032e4ce3883a73ee677f4e7872190ff971506f2130f4c859283
-EBUILD kodi-pvr-mythtv-5.10.4.ebuild 680 BLAKE2B c6fdc907d8303a6a656e22aeace84f66dbe235babda827c1b70e42c18120fd9ead176c38de20649076857f8e7f3be1c85887c3efb67c09196a31f51d195ab314 SHA512 d3c7cc92c8b5ac95c985b8cb1ada86d1ec11dd627f9c378578dffc6b3035aa63996912fcf0fdf53bd46d976e7d22fce0cd55dcd8490a1590eec265c6c74d87ca
-EBUILD kodi-pvr-mythtv-5.10.5.ebuild 680 BLAKE2B c6fdc907d8303a6a656e22aeace84f66dbe235babda827c1b70e42c18120fd9ead176c38de20649076857f8e7f3be1c85887c3efb67c09196a31f51d195ab314 SHA512 d3c7cc92c8b5ac95c985b8cb1ada86d1ec11dd627f9c378578dffc6b3035aa63996912fcf0fdf53bd46d976e7d22fce0cd55dcd8490a1590eec265c6c74d87ca
-EBUILD kodi-pvr-mythtv-5.10.6.ebuild 680 BLAKE2B c6fdc907d8303a6a656e22aeace84f66dbe235babda827c1b70e42c18120fd9ead176c38de20649076857f8e7f3be1c85887c3efb67c09196a31f51d195ab314 SHA512 d3c7cc92c8b5ac95c985b8cb1ada86d1ec11dd627f9c378578dffc6b3035aa63996912fcf0fdf53bd46d976e7d22fce0cd55dcd8490a1590eec265c6c74d87ca
-EBUILD kodi-pvr-mythtv-5.10.7.ebuild 680 BLAKE2B c6fdc907d8303a6a656e22aeace84f66dbe235babda827c1b70e42c18120fd9ead176c38de20649076857f8e7f3be1c85887c3efb67c09196a31f51d195ab314 SHA512 d3c7cc92c8b5ac95c985b8cb1ada86d1ec11dd627f9c378578dffc6b3035aa63996912fcf0fdf53bd46d976e7d22fce0cd55dcd8490a1590eec265c6c74d87ca
-EBUILD kodi-pvr-mythtv-9999.ebuild 682 BLAKE2B 4d6be5c4849cce45961fccb26fce2c62c207b2983766a874e49f66cb8fc8719da23cd5dff6d843ec0792bb044275631fc357fb5fa85872455913637fe07a8eb9 SHA512 b65d91251b7fd381ee76bed85df2843548c0f044528887ed52338f6d5933f0f6c1dbd52997f90d744eef314a17826efa8ea9d981553222c13cc0715f429b9106
+DIST kodi-pvr-mythtv-5.10.9.tar.gz 702493 BLAKE2B 457be0137a95d1abe0ad4a5634bcf21bad8d2f9261879468e2c5ba598a41b7eb71ed1bbf9992f45db8ad82d4da25bf87067199c57e71b64c9255608350874a2c SHA512 b497f79de6ca42638af0ac3c76c18343236db26af2901b60f49ddc71f9c0f4c68c293a50dc57a80e0ecf81df2629ad7695a842e63e1e8ebc2b22de082a5e39c6
+EBUILD kodi-pvr-mythtv-5.10.9.ebuild 680 BLAKE2B 66b37356d675cb42969d92ab77bf2f0583d671d7002ccc180c721556458cb3b325bc8ec4f4d23ed9089754d2c6e07b09ae98c6b0318479c954979bae1d6af64d SHA512 497511d5ebcaacfbe8e406de0e660f97014e411dba76c45b33c19725264c1b2a912c29aba0f8ec4403634f91b0769db96132dff8dd230b8b7a1ec4ffcdd4b22c
+EBUILD kodi-pvr-mythtv-9999.ebuild 682 BLAKE2B 47852fae69c4351fc4d5a25d34f7f4fb327bd1093b28476985b0b99d7e73de016a84cc76f48ee6912ed28002eef83c8855d8556d84f09ab3adb650a5429713f4 SHA512 4803880b777e613c728e542265078e41ea076bc101c4c5af3bfb78902ac4b0bae0a6aafcc0e744a4e2e1157828e961c03adc780c116d8811904c2c0fb1625039
 MISC metadata.xml 419 BLAKE2B 71f7f4424dbf1c992fab169ce530ce61ff39399842089905618bfc800011ed7960c92428cb9e6e89b084872fa61d08da8df0c4179c483ec6dc2ab745d684f15e SHA512 5b6c21c0e780ed90e92fb080f0a15cf62fee13e8b8597081f7b5480eb21f3f013495aafb389a302a227e6e22b757cc6b83d3dd56d7cd74ed16587edb09ef871e
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-4.15.3.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-4.15.3.ebuild
deleted file mode 100644
index 0b183188b03a..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-4.15.3.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 cmake-utils kodi-addon
-
-DESCRIPTION="MythTV PVR for Kodi"
-HOMEPAGE="https://github.com/janbar/pvr.mythtv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.4.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.4.ebuild
deleted file mode 100644
index 8b96d7f0430d..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="MythTV PVR for Kodi"
-HOMEPAGE="https://github.com/janbar/pvr.mythtv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.5.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.5.ebuild
deleted file mode 100644
index 8b96d7f0430d..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="MythTV PVR for Kodi"
-HOMEPAGE="https://github.com/janbar/pvr.mythtv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.6.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.6.ebuild
deleted file mode 100644
index 8b96d7f0430d..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="MythTV PVR for Kodi"
-HOMEPAGE="https://github.com/janbar/pvr.mythtv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.7.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.7.ebuild
deleted file mode 100644
index 8b96d7f0430d..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="MythTV PVR for Kodi"
-HOMEPAGE="https://github.com/janbar/pvr.mythtv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	sys-libs/zlib
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.9.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.9.ebuild
new file mode 100644
index 000000000000..4ff772b69275
--- /dev/null
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="MythTV PVR for Kodi"
+HOMEPAGE="https://github.com/janbar/pvr.mythtv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	sys-libs/zlib
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
index d0a95543a96a..f829825e052b 100644
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index dbb4b91ca8b9..60f0a0776689 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -1,18 +1,14 @@
-DIST kodi-pvr-nextpvr-2.4.11.tar.gz 111677 BLAKE2B ce1279641f4ed1bd5e1a0731198775c2ca6358ac8de846bc57588988eb415bfbaf9fe069b84717368eafb9fa01b232b833888c8580bdd886d1331618c369faab SHA512 2c9e98cb6b99aca8c582d4751096c7ef445f97b09fb6d51c798767c7a7b54632bd4e5c7fb2d723b023eeb335daa73e53ba455156bd8e8ea863c3a98659e5e906
-DIST kodi-pvr-nextpvr-2.4.13.tar.gz 111692 BLAKE2B 5199c9fb8b767eeaf116ed87abafe0d5f0e1e252fae945589413c002b313a222090c9cc12db02e927f168f6217c2fcff55f20adef984e54bceed92755e9922a5 SHA512 314217bca4ce7bf43900e8572fca158874c90bba50ca78b7541e804a3b00216bb39ef7624a270ceb4407f33d85b2711c7b58ea9b4ec1a0386d3d7697cac29c2a
 DIST kodi-pvr-nextpvr-3.3.11.tar.gz 119455 BLAKE2B 1a1eaedaada67267ac63776e0ff4c668a6f2484c73e37ce94cc825ac07507fec3a4d4970b556bff1ab8a0a74231b38525773492b91cd4ed4bba98b213a15b9ea SHA512 145c71c0eeb7b9cea03b1fa1c4c18f6b69e6d775519e1565160efd32a38642eb351b608fb54f285281a36ee4841e8242e1ff7c2aa384dbee17dabfe8ba13bd65
 DIST kodi-pvr-nextpvr-3.3.12.tar.gz 119592 BLAKE2B 6522790e6bb6dabecd010d34fdd1ee9590b541e8fd5a539f586cb81635f5f3729f813514355306042180e7482d0e1c350639d285ce591fc1c35d560e50f903e2 SHA512 bda38c256a9d49f72ec6c8ac9942670942edd8ac095c5f6eee120f52189a9d5466c28f2a7dcb525987da5df05d5ebc4e3b2d93778807370c8d16ac936c616293
 DIST kodi-pvr-nextpvr-3.3.13.tar.gz 127574 BLAKE2B c2460352ce24099553a2610002bfb499555bde180d557dd19fcfd905bd4a38ddf7c6f9cc4e53636287197690b778eaf74afafb78c44fab1cb24a20df709e6648 SHA512 b75bd7d127e3e3f4e103dc9dfd3f681706c298c1d216904c0c0088cf8a02301b3dcaee0d0dd976568c14be59c78e8d98a60d0806465b08f130452c52cdb836cc
 DIST kodi-pvr-nextpvr-3.3.14.tar.gz 127995 BLAKE2B bacf139b2d7338db08016cc81e66cad1716c686d3f45b71612a591a00653457a47964e6e08727da0fe39da09dcaf643f9da529288a9c6e42db3343842e9a7050 SHA512 6da83088f652710363d7bd37f38328ec364e5313168a6a2c624b34c3276eaf99223d28eb8a2bd90a4e68fa0669aa974fccf979e5bf7a6e61a8b8262c954896c4
 DIST kodi-pvr-nextpvr-3.3.15.tar.gz 128304 BLAKE2B 7df4b212afb4c8a16bba2a31787c88296990055d02a7e249003eaedf8c737d54bff2f5d2ce1b00f0357bfc8cf5ad28f060f22ace192d8e0d1eb9ff69a4cd415f SHA512 27a4e5198adbb4d4465d25086ebe76209b2f311dee422480271f85ae420dbdbaeff54b64330b1e71f1276f1b441d74598d5ee9b94d3652b9013bb855719aff77
 DIST kodi-pvr-nextpvr-3.3.8.tar.gz 118717 BLAKE2B ea72f205121b050355fcd194fc8c28a2bce62504187372128b7397841f03a411d9ae1419aa1cee36acf391e098fed04b58f3312a74cf3dadf48726cd72da59bb SHA512 3cf8de69091946c9678c73f0254be9d49b51ecffe8153f675e62198aa97fa952bc5c1b5a4ccabbf7de5c05e8ca9e0c01d1ee5fd5988504430acec37a5b2edf3e
-EBUILD kodi-pvr-nextpvr-2.4.11.ebuild 708 BLAKE2B cd6f8a585a17a0d94015dfc76680e1e204b4624fb829c892cd1adbd0bf977386badc5d709e28f129b833e8fe5578b58e711b837ac7830c0b6f241c64f6e1fcb4 SHA512 4066099029ac535ecb90d98617e396d5138286298d48cb7b13b5d0641add49e220ab1cc28ca9438cb92c39ca08f64938d87b1925adcaac948c1f965fc8b2ee9a
-EBUILD kodi-pvr-nextpvr-2.4.13.ebuild 708 BLAKE2B cd6f8a585a17a0d94015dfc76680e1e204b4624fb829c892cd1adbd0bf977386badc5d709e28f129b833e8fe5578b58e711b837ac7830c0b6f241c64f6e1fcb4 SHA512 4066099029ac535ecb90d98617e396d5138286298d48cb7b13b5d0641add49e220ab1cc28ca9438cb92c39ca08f64938d87b1925adcaac948c1f965fc8b2ee9a
 EBUILD kodi-pvr-nextpvr-3.3.11.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.12.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.13.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.14.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.15.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.8.ebuild 702 BLAKE2B 6d087756fb0b2e5bef01e78f2e986fddfb4f02c2dfbd8803410d3fb0d1b0e260a2370bc8034737d31ae1e2df2ffcd119fd5d02127b383e1518f674a8b9b87943 SHA512 d5d8320f1fa4f1e3baf3a7cda383d6453a44ca4e1816926212818469d01161f3348ca634ad5a7c95c148fc491fec9ce3e4f2b507b2cf4d07b4cf99960cda4e18
-EBUILD kodi-pvr-nextpvr-9999.ebuild 704 BLAKE2B 9bfe109a644ca55ceadedcbbb6cd8a48679afd67ffd9128eccbe9081bcf611aa5da06f1ec3b3d0d2bc59b279f2c8bbc90aa7e0b190868dcadb622625a60e4596 SHA512 dfe5613b50d14ab632d80dda8041ec11f7a7bf5996a8cd824b56f51490f9fc1678ef914f68f9e2f4f58def0af50f23d143069d622cc3b861e97d1c6cfba97294
+EBUILD kodi-pvr-nextpvr-9999.ebuild 704 BLAKE2B b5f583dc1c8d853cbf51e5dcb15866aed8d024464ca9417605d3b15936d0db40cda8bb278c940d1dd443e2d57f1e65030e34120653bd60f9c94c66cd73f26824 SHA512 d3b742d8f4f7cfccdce8cdb019dc9ce9711fb75a137ca93d1118b041df93f1c40fd89f165a4fdf4e818ff700b2590c5f44722daa1e4b06dba4f5084ebfcae3cd
 MISC metadata.xml 430 BLAKE2B 60ef7af47e0cd7d264fd19275a356b83cd9fd4e5ed4e237658c47152315d4abcf807377bd8c94d88ec3088530a5fd9ab2d9482336328eeb9ff380963364644a9 SHA512 b0bd41b39d6e1379e1b3c36124432716cb222205ed587246523a8a48c42e2d9922b1b24c87ef601bf5f7452cfb874710c1ec7b558b9224c95c921b80967e02e3
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.11.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.11.ebuild
deleted file mode 100644
index 2a2aee92451c..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.11.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.13.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.13.ebuild
deleted file mode 100644
index 2a2aee92451c..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.13.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
index 8d192c0897ff..3055e0e70599 100644
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-njoy/Manifest b/media-plugins/kodi-pvr-njoy/Manifest
index 2ed0ce5d4a3c..f5d7636cf234 100644
--- a/media-plugins/kodi-pvr-njoy/Manifest
+++ b/media-plugins/kodi-pvr-njoy/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-pvr-njoy-2.4.2.tar.gz 47118 BLAKE2B f14dfe99aa1866f6ec08616120ecf2252cdb5b6c8e358736c208203aa7d9ff8c4af1b2338bf34c7ab77860b80f7a718b1c3e10123efdf70a068ddcdac82d46bb SHA512 2f36aed57c51dbba853c7e57775b2374d072028b1d02978d44f519adb72c6605ea0f1b19721411dc6a6f7c4b4cd0e36517f646c9ae901cfe2dd6e64916f0ba8d
-DIST kodi-pvr-njoy-2.4.3.tar.gz 47126 BLAKE2B ba5a3fb7267822824d507b6865740b8646c167cebca64cd63d004368081af467dd9f7e6eca0eb62fa926bac1f99c463bc1cfed17b557630ae850dd61cd088274 SHA512 e08595942e6c7d51422730156e7d3d110657c5ed8db2c5563d3cc03f03f17719e325c5d31bf627af9b71373edcd86b05cfa2f5d8d3854b56d2ea7395733137df
-EBUILD kodi-pvr-njoy-2.4.2.ebuild 696 BLAKE2B 9896f399e4e4dbe382409cafacf5794cdbc2a91fe4923089445bf1a428934512b0713a570358500967b89f6637b51e519c634bbff8361568c2b6fcd75ab1f15e SHA512 350a90c27a53ea739cfd9e4fb2039f7c03da9b2b1c04821a18a4ca7efe884211be2df5ab0b824b9dfb7e95675a02636e5cbc68bc0028fdaffb42dd6aba37d839
-EBUILD kodi-pvr-njoy-2.4.3.ebuild 696 BLAKE2B 9896f399e4e4dbe382409cafacf5794cdbc2a91fe4923089445bf1a428934512b0713a570358500967b89f6637b51e519c634bbff8361568c2b6fcd75ab1f15e SHA512 350a90c27a53ea739cfd9e4fb2039f7c03da9b2b1c04821a18a4ca7efe884211be2df5ab0b824b9dfb7e95675a02636e5cbc68bc0028fdaffb42dd6aba37d839
-EBUILD kodi-pvr-njoy-9999.ebuild 698 BLAKE2B 48cfee609b0faebf26413a1c6e4b6d5fd22b1ce1559b5340fea3943cbbd7ad9b592114a7c43157361e5e155f763fd08f7f4a0e469b812a8406cdad27a3ed3c37 SHA512 65435065df46a266e91a197cad6c3acc7e81cff5e2c204c2f2f8168ef2c459ad2f18a401feedb10db24052100b24d857f04d267103c33a2e3922111c0c9e28e0
+DIST kodi-pvr-njoy-3.4.2.tar.gz 47637 BLAKE2B 258dc10c06b68b6812b320aab5236a2ddb3f565ce616efb9ec6cc7710f60b58c24b827b61109af89e41430d4ef33a1daf6cb526ad8d449b954589c82783f5035 SHA512 5f30afb07c8c683920cce9acc2aa182273943e1381304e4e17f396fb42f1c464884e9134f507d7e787d9f271d24193eeb20c72870d2c7012a07aef94e1a686c4
+EBUILD kodi-pvr-njoy-3.4.2.ebuild 690 BLAKE2B 6cef3885570f60230d5207fb4feae064f6eec1285c045d8592ceb46f85d8ff71f5421d74340af6d732279ceb8e0b5e96956f086711b574ca41c108913fb0de9b SHA512 ebf3c386ff7094c317fa221dd64f7a98b9335c0ad4d994885f3e04b5f9357091b163afc8705eb6f0405729a52896f05798d589fbf493eea2626ca9462b902dfe
+EBUILD kodi-pvr-njoy-9999.ebuild 695 BLAKE2B c769f1c1a51d29d507b56a6d9a930a9ee433d1852ef351c5418dc82d7f2c3687c0d91bd20037efb37339eee47faf37a86a777192dcae3fd28a2c5babd08d6d5b SHA512 98cd6dc241e0a6782b761975b7d0c718b96ce72022612d17a32a17da4e58e7a4cb76e33231481e5ba4b800ea245889bef39317ba5ee05d89f83238d56805d277
 MISC metadata.xml 427 BLAKE2B 8fbaad407c2e34375e6dcb350d39071fe3b022e4d2799fbe97746d2afb7f80fe70f4ec51161bd3751097c4de98da76b07a79dd1cefaf9bb5c449beb4faaa5817 SHA512 4e03412ca3ca3e739de135eafb479c6479f0260f2bab7a69cff6913556bf6d101f306388fbcfa0e61b3c8037ae39f08d246106fcad3d0f8281b3259f6d2a1c36
diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-2.4.2.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-2.4.2.ebuild
deleted file mode 100644
index 2e5f3ab319e0..000000000000
--- a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-2.4.2.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Njoy N7 client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.njoy"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.njoy.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.njoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.njoy-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-2.4.3.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-2.4.3.ebuild
deleted file mode 100644
index 2e5f3ab319e0..000000000000
--- a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-2.4.3.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Njoy N7 client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.njoy"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.njoy.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.njoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.njoy-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild
new file mode 100644
index 000000000000..7554c5d1acae
--- /dev/null
+++ b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's Njoy N7 client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.njoy"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.njoy.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.njoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.njoy-${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-pvr-njoy/kodi-pvr-njoy-9999.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
index 0f882d4a419e..959e619083ec 100644
--- a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
+++ b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -28,8 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-9999
-	=media-libs/kodi-platform-9999
+	~media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
 	dev-libs/tinyxml
 	"
 
diff --git a/media-plugins/kodi-pvr-pctv/Manifest b/media-plugins/kodi-pvr-pctv/Manifest
index 86511a1873ad..3383069fb2a3 100644
--- a/media-plugins/kodi-pvr-pctv/Manifest
+++ b/media-plugins/kodi-pvr-pctv/Manifest
@@ -1,8 +1,4 @@
-DIST kodi-pvr-pctv-1.4.5.tar.gz 64968 BLAKE2B e73230dc79b7891c13d7e0a4a46cf3f56c072610d87f1c10738acff24add4d763ff318054d2a96c06513eeb951c5ffea63273d07d3c5e6ccaf2d3b90f0fa432b SHA512 75d61d0520536a4d6dc9d50953b7f98b08aec18f0d1bba30207332efb50acd920af1ca4380c47696edf88c1544950ec2b3b0ac559b672e84e4108fbcd8ba1780
-DIST kodi-pvr-pctv-1.4.7.tar.gz 65031 BLAKE2B fb240b1845755273a553efa040ec7f487435129a1924dac0b2b923243d75ae8eb80592cf1186dd3f5082b0bf610c392d305c87a02b515f713ba42919767c5c12 SHA512 f9989b5d90c115de9ac32254cd2ff2f1b5a7a78416ee66db8606afa63b21793f2164fed0ffabbf56e8ee041da011e18f48be70eb3ebe8a952f1c71be205085f1
 DIST kodi-pvr-pctv-2.4.5.tar.gz 67169 BLAKE2B 99861fadf9fba102fb45b9d095cf8ccaa58ca53b5182f714f8666dddecc43f98ce57583b3e7b3d156aaece9f63acc7fb653d2b3763104c280d9ef30dfff6d664 SHA512 288446a04b9dca623ab12759500123d3bc548b131a3cf6757431e99571611834408da2918085d52c29380e5d5f856a6c4dede7a9793ac427123291346a28ed62
-EBUILD kodi-pvr-pctv-1.4.5.ebuild 693 BLAKE2B 2c6e64ab264e373510e388cd8ea9d556a8b965ffa2ff5a25c195839c17ce36ae7ef4797965effc789aa1965ddab59a0430108125c43563a984418d1f642ea70d SHA512 7024bf36f5224b8c32cce63e7cce213643ae3b2d970fccb0d56f4dd8d6a8a5d09d3cb59a88a33033249ba394067575b0cea404fb78e7608b89c1759c8b23ec8f
-EBUILD kodi-pvr-pctv-1.4.7.ebuild 693 BLAKE2B 2c6e64ab264e373510e388cd8ea9d556a8b965ffa2ff5a25c195839c17ce36ae7ef4797965effc789aa1965ddab59a0430108125c43563a984418d1f642ea70d SHA512 7024bf36f5224b8c32cce63e7cce213643ae3b2d970fccb0d56f4dd8d6a8a5d09d3cb59a88a33033249ba394067575b0cea404fb78e7608b89c1759c8b23ec8f
 EBUILD kodi-pvr-pctv-2.4.5.ebuild 687 BLAKE2B f794a38cd128e6693c201becfc7c50743c47b28bac56724800490c8a707f72c39975ab26a16198d26a71a41c7a3e1860a9d3d95ebab1c28b255aa1e807d59e91 SHA512 2d853652a23ba3be606befad46257b9173c63b5ab1852f5df5fd4545eb41653ebb38fd48726c4e55bc4cdf01b98d8dbddc76b796bd3d775cddeb5b59a0c88ca6
-EBUILD kodi-pvr-pctv-9999.ebuild 689 BLAKE2B 98afe970dd3d70abe6ac80be709d4f6cbbce01dd4c4603ae23fa9cb49c00b917b23bbce806048e416ff9c6e7916b57cd480e8d14a350206fa250e9cde40d19f2 SHA512 2e9f0ca882abec3f2698c8fc023c3decfef8016713ca80589486b0a5a3a7972edaab68385f4440a29b1dc53965764a61d55f48afe04bd058c4bee323c6cdc876
+EBUILD kodi-pvr-pctv-9999.ebuild 689 BLAKE2B b3ea9f0a6c214cb886770a7b55df9c7f2cc73cd2a8c2794fadcec78ae58d2635ce6c954cd72251c383d018a3b706093e308fa27082a1612c38a59e6f3d4dadc1 SHA512 9c832096efb7287e2ec488f8aedcecd3082df32c65dcd52d3b854e48111dfb1bb66eaabc53288ae3b1bed3d4460059bf3becc1b4106068bddf5c7456c1ccdd8c
 MISC metadata.xml 424 BLAKE2B 0637f01f1175e2d607d0e590535ef8d262173f71d42c265b5225d396bfe9783d03b6a231de1f75a9f548487769db28f9b9988ed27aadb5838ad5b37734405959 SHA512 91f472cc7c5eb36bfd24c3565a0679af173643011140133c98f6782fc6a14aef3ac30f30e86429bbe0b361c696998fca96ea968f97963eb08a64d14655f1b344
diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-1.4.5.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-1.4.5.ebuild
deleted file mode 100644
index 3c212c8dc3d0..000000000000
--- a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-1.4.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's PCTV client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.pctv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.pctv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.pctv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.pctv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-1.4.7.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-1.4.7.ebuild
deleted file mode 100644
index 3c212c8dc3d0..000000000000
--- a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-1.4.7.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's PCTV client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.pctv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.pctv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.pctv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.pctv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
index cdec4c9ca49f..c1d659d31e3b 100644
--- a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
+++ b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-stalker/Manifest b/media-plugins/kodi-pvr-stalker/Manifest
index 8771fe35b8dc..30fedb154cae 100644
--- a/media-plugins/kodi-pvr-stalker/Manifest
+++ b/media-plugins/kodi-pvr-stalker/Manifest
@@ -1,10 +1,6 @@
-DIST kodi-pvr-stalker-2.8.3.tar.gz 111738 BLAKE2B 49fa5ca9fc3b3dedff9c82b7886bcc4539e07c53907960a60f0d55f37a5d7a2d7bcf22aa1280d36c9d38c63f65f0f701a2c9df7af6f31939fe0ed5dc35f3fe29 SHA512 26fdc7560e0e39c774115fe021a4ef9bc34bafeeead425935a8ea26b5a95cd3a4b4d1a60be466f89d6bbd0f16350cc8d3245409942164b4b55c969e4ecc9149e
-DIST kodi-pvr-stalker-2.8.6.tar.gz 112121 BLAKE2B 9093ccff3060333a88f26a33e2f27795bcf9692d1f5026c2204d87a52da2937d55a18eb2d35ada66a029f782e97d104bc12ca522dc0eab0e71660eb3851dd1ea SHA512 cb7c04a78de7ff1300765a77a5343092ee27231373f91c7f638dcb3bc76f6ed074403a362000964d360c936174cb4e7586ad91bad8c6ef30f4b412dadc8ceafa
 DIST kodi-pvr-stalker-3.4.8.tar.gz 115254 BLAKE2B 865ac0123b54369bbe73e67855d915efbd3af82d9cac5669099895efec8410eee7acf8d20f6904a0b939bdbba0feab8ec7aa3e953d816914407673c2bebd3c05 SHA512 f4fd2965199a0a5a31b37c2afa60e3cd6746c25dcfa80d8ddbedb2236b92f3c243dddfdff92fd9e6ffafd434c53124b89b8bd2c636856c62cb78b84e446a3292
 DIST kodi-pvr-stalker-3.4.9.tar.gz 115275 BLAKE2B bd9df715d3f5e630d4a47fe24f24515085f8a6a151545c27d5bc6b3bf4e4876672cddbd7c2d6fbd6a999b285afc6a48a29030ac72b4ed32cf10e8448235ef0b1 SHA512 16107f60529b4ef3730f7a3deb5a7cd9ee645678647248d2fff01dbc94dc7a53029a67a3709955a9be8483a13e13048dadf73a32489725b60b5c07c3a0b6a979
-EBUILD kodi-pvr-stalker-2.8.3.ebuild 726 BLAKE2B f252d370b42ff45310e303f9ab651331df74c3165573e75ba89025741cba5f0cdc26496c1a693c603f3927fbe9dc7bbcbdd000f9db35ae7b84357e7faa1a2a6d SHA512 ee86d0522b61116f43a6467a5a233bbfb7fc676d1ccb3cb2b4f39fe1322d3f8a848b7f857d5d71e48376a445be2dba0a69208ecf6f528a02234633c53b6937f1
-EBUILD kodi-pvr-stalker-2.8.6.ebuild 726 BLAKE2B f252d370b42ff45310e303f9ab651331df74c3165573e75ba89025741cba5f0cdc26496c1a693c603f3927fbe9dc7bbcbdd000f9db35ae7b84357e7faa1a2a6d SHA512 ee86d0522b61116f43a6467a5a233bbfb7fc676d1ccb3cb2b4f39fe1322d3f8a848b7f857d5d71e48376a445be2dba0a69208ecf6f528a02234633c53b6937f1
 EBUILD kodi-pvr-stalker-3.4.8.ebuild 720 BLAKE2B b343088cf996082adfdf0fe0eabdaf2306a1574f47174896aad8da4a0ec8005315d3d764681ef8db07d12b31510c010123f915e9a55b1c4bff57fc6f28066f1a SHA512 d343af5481e62426bd4dac77c778296be9c09561c7ca0789145607b55f47333ad20a79c6dcc5ade746b925eafb9a55afca3c4f0e55dd92a586c35f67ddf8af0f
 EBUILD kodi-pvr-stalker-3.4.9.ebuild 720 BLAKE2B 43b023fbde024a5d62b884936eaff910983d90a3d391226b71a4f7f24903fb554fb7cea228ada1137292779c49a8a55699d96d956ab8c1bac05e9de10778d05d SHA512 327f30ae993028aa4c18c14525999ec9bb8da0bafe8567a6ad1a88b821989d84e8dffe59e8c43c239ab0e67167e3d4b0122e5cc5e033be4e4dfb1c8acca5ccbe
-EBUILD kodi-pvr-stalker-9999.ebuild 722 BLAKE2B 86605983551c7768c2e0df7bce7f8322bc345818bdc7a74df292633b61435035d93c69c70f0530f00354f9df4be8603527a9ef493e39ca52aa345f1a77fa2c4d SHA512 637d968a23bdfa1c84799c2a3e1eefcdc352d55908920af89cdcad1dfa41bb0b54d0957ab0474c3d046082a35c5287b24169648015a5ed0169c3c8844513afcf
+EBUILD kodi-pvr-stalker-9999.ebuild 722 BLAKE2B 9a355b73fd86c5d5aa9cba4014eb2fb4963ce730f3d3ec1f63bbda5a81bd648629884308c902dd5fea70171755749a871ce52039b08dccbf2d7d63dac63d94e8 SHA512 ac3c8d265e557f3bc853eeaf2e5c4194146015f05c77516f6a8c1fe16e29c1f5c2ad43e83b3f0826f2d6f4e41d95d3d59fc3a961110b9bb5984079c9d44d6e85
 MISC metadata.xml 430 BLAKE2B 65eb48c9c9d6e307c0ce5950a5e79b705cf5cdb3e1032f97805dd5dec7ed9c302acedac823b4cc9d263156936576257a3097f7535d017f3c4cfb9bfc08b200df SHA512 b461665fc6954e9377b3afd38861852becea318284dd6ff089153679b4fd93dd92523d633299942314e439624d7516c466f57029025a7d4618f1e51919b09263
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.3.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.3.ebuild
deleted file mode 100644
index 01b9331e3ff7..000000000000
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Stalker client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.stalker.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.stalker/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.stalker-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/jsoncpp
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.6.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.6.ebuild
deleted file mode 100644
index 01b9331e3ff7..000000000000
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-2.8.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Stalker client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.stalker.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.stalker/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.stalker-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/jsoncpp
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
index 3b5070346d7e..98779948846f 100644
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
+++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-vbox/Manifest b/media-plugins/kodi-pvr-vbox/Manifest
index 0f0f1cdb6b48..b57f5ccb5af0 100644
--- a/media-plugins/kodi-pvr-vbox/Manifest
+++ b/media-plugins/kodi-pvr-vbox/Manifest
@@ -1,10 +1,8 @@
-DIST kodi-pvr-vbox-4.0.2.tar.gz 150156 BLAKE2B 82751404d60b8064ad4c56c5de2bb2745cf1d3bbf6a10c6c96391e3021353a1c64c1d7c54ecbd53722b3e39edaecd97716877ad6738bdbb9c0a3ff1f10c35d42 SHA512 2b46cd6090764660c25a8c229bc11c23b0b200e4eecc6682a89f2754f6869217b93600ac5eb7a48b7d9183ca6eb237e1a396902b84493668c7045a6b4eb23a6e
 DIST kodi-pvr-vbox-4.4.6.tar.gz 155719 BLAKE2B 178ec1adfd17f8afc80daf526fec863b93c17ec13b5a54c7a2aa166c6a73cbe5d57a3e349f2c6522c2081af6b4f892a731b49a0aee2a6e5686a2adf5f95d5fc9 SHA512 b34b2ddc9bdae9a51e44a7dbe483f9a21d6d4de951e0c996a2f82e63b87718b7f56a3bfbeb45c0cc7a6d828d279bb1f6ab25292b328b1853a09e1267c22026fe
 DIST kodi-pvr-vbox-4.4.7.tar.gz 155710 BLAKE2B b8de69b536ef265afb5e30123555918a071517f2b61999889397b93ae1e06d0a695de0f604f66c011017bfe14ab251f95e75a5aec83fa0b13b69761b24914872 SHA512 07aae037b72c643ff0ca7c7fd911d77e04246caaa475a55e2ce71ee2075da68f8824d7babdfcfa31e64c27893e122c337a1fe48c769daad6acbd482e4b78297d
 DIST kodi-pvr-vbox-4.4.8.tar.gz 155911 BLAKE2B bcfd48ebfa0a6378367794df5789e8cc80768a12292f88c26eef52a99007edadbb7da016109e7d29566563176e87dc75ff19e78d8777b8f263d78a23a9d4a274 SHA512 27c0d7143d70cb42ec2c57e553622cbc785e1d01aef09600030b6cb3a23a4c974d51700e80da1f3480a7e0fbacef1db3ff955fe2beab79f6ee0613065a0e556a
-EBUILD kodi-pvr-vbox-4.0.2-r1.ebuild 667 BLAKE2B 3495ff192480eb5a64efb21b4b261013da980d23e4381e37968583f3cf05484ffd26829f40d30c68ec88ad87f38f5e0e09f645afcfc3eefbff95ea7569560994 SHA512 14f2541702cb41201518a39d05bc96800e70c9d194cf43b13353489335c0eca745041ee601ac70c3b2278998fb168469d606d336b775c08b22315d007748b53a
 EBUILD kodi-pvr-vbox-4.4.6.ebuild 708 BLAKE2B becb6df88da03e58ceba1bacf22755e9e61f164fc59304fc9f7202683024d18a79ba1f1d443711950d347ff61c46adb8ed9b358f8074670305e6721c4f7f65cc SHA512 e324b196bd485d805988aa23c2a4895e83da9ea03e7b357b0151201a10046220a1821b67e70ead7ada4cc3c4ff7e53ff6f173a78f1b5ccab2e999b0558ffe7ce
 EBUILD kodi-pvr-vbox-4.4.7.ebuild 708 BLAKE2B becb6df88da03e58ceba1bacf22755e9e61f164fc59304fc9f7202683024d18a79ba1f1d443711950d347ff61c46adb8ed9b358f8074670305e6721c4f7f65cc SHA512 e324b196bd485d805988aa23c2a4895e83da9ea03e7b357b0151201a10046220a1821b67e70ead7ada4cc3c4ff7e53ff6f173a78f1b5ccab2e999b0558ffe7ce
 EBUILD kodi-pvr-vbox-4.4.8.ebuild 708 BLAKE2B 82da36b12438ffe48516af25339aaca3ec0c6c83ff99abc1cfc167ae407c1d559009a2f0be7f348e6997c76caf98ca789b02dfa25b2a0fe4f56cd33b60e8d781 SHA512 59818b2236c903f2bec98ffd83dbf0c97d370f208adf40154440377f4dabf1286acbb3aacf968915e14c4dad53b6f38e88e8f8e034342366553ec03a93dcbc10
-EBUILD kodi-pvr-vbox-9999.ebuild 710 BLAKE2B 11fabe5a61dec61e501671c7ce7e3cca3562d558f7dd7fda6a8bea6266b878a44874e8fa856ccc8020fef253d27d63e466dedece18439a36a044e51eb86a51e5 SHA512 c1d3a417fd6384478332eacbb1e080c6b85581c2f257b14a07533c331424b6dc41e84e99127e77700cea1cf2a9c70a469ae5da5757436c181479e66f496f8a96
+EBUILD kodi-pvr-vbox-9999.ebuild 710 BLAKE2B a56773cc1ea387b4c8a305e0994790d43c40e36f47e16b41ab415112cc2a443ad744e6a6f1d7287ac253c9e59192c1c4b6c2139d298c27fc274f5c671d5ea31e SHA512 d6c7d9adcbbf071f8ee95210f0f18c9b2500d497fb67b59b1c5532eda77b800e68a023558a3233c223c42cdafee07e44463c0981010cd4893d4258d94cdbeb3d
 MISC metadata.xml 444 BLAKE2B c614b42e40b284fb6433935458137624ec0bdb22db86221922d82ad2fdde06eaaef60f430ad871998fc54792a03decb577167a3e1c9e9ea048e0c1fd7faf33ac SHA512 9c7992961c43a1e7bbc60018b282f41796dd8d0ba1127d6cafe0945127c2e65653fad5e47b2f283bf04ef9d3436d8693b6aee31513ae17fc98c245f97c9e3dbc
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.0.2-r1.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.0.2-r1.ebuild
deleted file mode 100644
index 5bc893a7257f..000000000000
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vbox.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vbox-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
index 0836a8ab7ea2..f5b74f9b320d 100644
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
+++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/Manifest b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
index c568633c37cc..7ccee1161f3f 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/Manifest
+++ b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
@@ -1,8 +1,6 @@
-DIST kodi-pvr-vdr-vnsi-2.6.17.tar.gz 145541 BLAKE2B 3682369144e75de78728c2b4c04f0edc4af470c696a96ab2204817173c507900de26810fa02a25111efa86a57090bbf8cdb1466e8ec375e69fb86ccc120e398d SHA512 43b9196d9cc08dc115638145ed06359cb78616534535b266f96c320ce8f7c808820654ae313a735a0a41a0ec71d5bceb50ed53bb869829c6bc79e434bb1dd653
 DIST kodi-pvr-vdr-vnsi-3.6.2.tar.gz 145275 BLAKE2B 40f1f21b80411c772b093a4a117522b31d93d3bc87d876154f46cfa58781e56e10d92e0dc67ca40be07a8e3e2b7c1c0a9716bd7a9b81ff21601b921b5a21f343 SHA512 ed76ba60188f513a6c43b21985522cb5e8eb8da3ffdf35ee88e95cec94c078cfc322c2e267a8837626c60242082bd61214c9ec26bff844967ce9f28f1cf885f8
 DIST kodi-pvr-vdr-vnsi-3.6.3.tar.gz 146568 BLAKE2B 375cacf90a8a7fa430f7b06a12397293df3d5aff07ce5c5fc254440bbb2a2b6f3f4e0b49687dd81a069a76801fc6ede3adcca9de11a126bb6ddae9ed7c35f4f4 SHA512 8f060373c43493ccde0e3d199470fcbf9c6e33f0457f31eb64bab4dde06e6cdbce5de0cefc9018aa7d35d8608d74fdf0f2f6e5e2b8d0a741683fa2091b4fe954
-EBUILD kodi-pvr-vdr-vnsi-2.6.17.ebuild 659 BLAKE2B 1010fbd87812331d707e2a9ad43ee76317b1d6df79d0e7960cab0ce11e26087dbc5c285213a5aee68a87dfdd30192782ad6d5eac8f3bdedfc5b1efa836a21342 SHA512 5635dd1a75f25cba9059d03c6acb08723b99d70ad9c1cac6180bf947e9d6e60d9ef5632e768f0a0cfcc566b79c13e03c03f3ae30405d40c26d08c2f5c56071f3
 EBUILD kodi-pvr-vdr-vnsi-3.6.2.ebuild 665 BLAKE2B 549c00829a828235bac2455a2f62aada5733940bf13a5cbc02c373cc61c9a4998e13849744b81b1f880a627d528c0d04f5eaabce8b9946043fd560ed92c66df5 SHA512 fb1cb4333073c7b9fee9e7919e975f85f75206e80877c76e6793310283be36ab591cf1054c1f20ecb0d184ef99b860263c749e1e29aeaebe64a3e62ec1e74b5a
 EBUILD kodi-pvr-vdr-vnsi-3.6.3.ebuild 696 BLAKE2B 616070d579738d34d9f4349642e14792433904b0cf3ab7f826b6c5fda9e29b7007eb4dcbd1854973988afe84cf49dbccd77041600d6686889f1ccb0757c68ca6 SHA512 bdb1549c09488af7b71a8af6e116603eba7c6169ae010d6a505df8451be70cfb4876b0af41ec150084c612b6b200080622b7b923c86e8e22da3fe50cd2d3fa4b
-EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 698 BLAKE2B 8df7e4781b2fa661955e4078d9948951d7b7a1ed81ef4614e9bc9afa67a09eb86e97cda8899da629490d25d0c3a01789792618c4d0c8fd455bf351920ea52358 SHA512 5ece01a123f9a402738bdf8c965b9157b145402760ef1610f6e844c3ec03ad40812a8189ccb304cf385b90c42a38362fcec1c0935bf968d9baca9f08ff17dedf
+EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 698 BLAKE2B 8cfd7a0c01597c946c11a169a5c8ddda0284ab949a4ef83494b7e5e54d4f0df32ae1491d4e6284c40b502d02672da24ad1e0012c9248f454c2e1b3ebfae40634 SHA512 ebdd798ccfc8cffe021cca650a355de67b257cad563b32abc3aeda0cd256355c34b3c7892316707c02e529fda6f14efa3403b005e3608b72587d8a8816686d30
 MISC metadata.xml 423 BLAKE2B ff5a21d61f4516f52b4a139f695048b1483aca09426e249c3165ecfbdef8770a47bd98d4bbea582e06e21c8d508884f67389d69ad126a3c7d46de1bce2b48207 SHA512 e81e80ae101dbd4b405ff3b8056c8cc901d5fcf2ff2d1eb595e26f5f59954d6931c5acce9fadb94bfbb533865017f17fb579bf382ce6c226ca32a2dc10f1e0a8
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-2.6.17.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-2.6.17.ebuild
deleted file mode 100644
index 583023f5daab..000000000000
--- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-2.6.17.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi PVR addon VNSI"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vdr.vnsi-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
index 635a11dfdd45..565b26fff2a0 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
+++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index 474e7d35fac6..097078dbe18e 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -1,4 +1,3 @@
-DIST kodi-pvr-vuplus-2.4.10.tar.gz 80514 BLAKE2B d84f0da7f8473456ce6258b2602fb2ddc7631080d951ac33f603d9b649369c6cfd1fc36421ac200de7aaacd09cd23797c70e9f187bb011353889144aa8014f70 SHA512 b9569a85a6cb2c02b72f9494148f55874acc7c4a826704abfd4bd1d29c96b6221dbc62510c3823947b6496bd3465d6d9cd2089009d984fa706efc5b8ea882fa1
 DIST kodi-pvr-vuplus-3.17.0.tar.gz 160410 BLAKE2B 0eae7616abf01713148f6ac5370ccc2de9ee47dcb4b024119c16b1417fe1c655a8f1e9d9af188ae5106399cd321303f2ceb232b037f220411b15990986a6cea9 SHA512 a9c7e46af9bc1cdc18aeacac6f219c3c4210854287e086870e64b1cf2350b69b32d8ec3e980805be00093020ff3423b1cf7eb47dabcca4b14eee1f1cbe49e9f1
 DIST kodi-pvr-vuplus-3.18.1.tar.gz 163398 BLAKE2B 30cab3bcd9e0750c116f2e95170fd5d9fdc5c1be0f8068ed58aafc265454105d70504c6bf661d0b4c2e21eb9ca9e1868ec8da8e32bd39a054feae5bf8804ab46 SHA512 eadfb01b5a9d478d03bf720133c5de163b5fc1b8789dd2f756724dd180bc00ae593c43a4e727d6f6c9646a99626cc8dd6ee72cb054db65c2a49acc08ebb00ccc
 DIST kodi-pvr-vuplus-3.19.0.tar.gz 168331 BLAKE2B 141de1df21ae4149be56be3d952edd15792567aae39b337671c8f53cf28b1208dd69993a3680deb25b006b1d92eaa1a5b151ebc394f84d041d7cf99e56c206a4 SHA512 3a59aa691b0982cfbae466a3fa148a9ab71c7daeaeff1b91fdb71da4fbb406a6fa0346551bf7da37a4ba4dd6c1f58a2a3e41b0533b69afa4e28ecdf52be0029c
@@ -10,7 +9,7 @@ DIST kodi-pvr-vuplus-3.24.0.tar.gz 189303 BLAKE2B e1d1276b460d54722f80144d0e186b
 DIST kodi-pvr-vuplus-3.25.0.tar.gz 190314 BLAKE2B fba8e3438bc7475f0c4e4cf1afe02fc356b7cdc78c756c30cd541f71215c741fe56e436b934cc22ac0157ccf919159526f41625421995198157a1f0d8802366c SHA512 b94d6f846eb04cc241ae1a954f5d4fd07edd70b3389d9068bb9dc23083e3476bc46a17fd66e7f5d7ce04e361b1d9165672d7ada515f6251af86a5f3f18fa28b1
 DIST kodi-pvr-vuplus-3.26.0.tar.gz 192488 BLAKE2B 71909a13cc640c2509405a2ca954536b3ecf767dd607223fe0555860da270d710896fbb0e62922465dc7d22e817c39e183813c8064498e21783548aa85369744 SHA512 c0cb5e0fab716d20d7a6bbc81a8caaca5325938190742e15fc86fe475f93b915623cd3589b4990ebbd1caeb3924365d2872a598fd8e9dbe1822c37e3b2e288f8
 DIST kodi-pvr-vuplus-3.27.0.tar.gz 192727 BLAKE2B 0060d29cfae4217dd718d02836373d5829ee327a2ad6826d77fce22621758d0c48774a6a39b2907f462d4d778e9b308de7ca42f0c11fdb57381f6a3f50ac4e15 SHA512 e94a27c497e6b35a102897cccf3376bbb1e2aee056c5cef498a5db9f1a6c5e1c4d7a8c8060bfca5d5d2856067564ccabcd2cbaae1248021a9379c311bc84cb26
-EBUILD kodi-pvr-vuplus-2.4.10.ebuild 703 BLAKE2B e0553ee884be358337c235140046d8268c38d2f1a3d324469e45999fc8e3376d48fdd22222ffc1655fe45a30738f828254a291fcbb1e0a3e9e36ab4e6362a21b SHA512 79b1c4362a9a0dd8e5d41f3e006bec07bf7799b5746804a0a9a47d9f343d76bd7fbd6a82ef4734d7ba596e402fcb5acf349c1de9787aa90286778a9524061667
+DIST kodi-pvr-vuplus-3.27.1.tar.gz 193036 BLAKE2B 5c1f1422eab403748f4668e10f5ef27214857817851f1e4f14028256961927af741b211e5548d79c9a1dcaee21f4f05449dcd1835fd3688e632b0252c8cb8d13 SHA512 8efa1c00d953656ea97d9e923e0b7d380071047d138252edf14982f151c33132d3c57a0826e2e2abae82ba6beea06a8404bb79ff608ce1969f127649a1b0acc3
 EBUILD kodi-pvr-vuplus-3.17.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
 EBUILD kodi-pvr-vuplus-3.18.1.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
 EBUILD kodi-pvr-vuplus-3.19.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
@@ -22,5 +21,6 @@ EBUILD kodi-pvr-vuplus-3.24.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d5
 EBUILD kodi-pvr-vuplus-3.25.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
 EBUILD kodi-pvr-vuplus-3.26.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
 EBUILD kodi-pvr-vuplus-3.27.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
-EBUILD kodi-pvr-vuplus-9999.ebuild 722 BLAKE2B 9f205d55328bb0a326bb099167a7a837104f853a978e6ea7c21c6863467bbc0f4053166c69a5a350a8faa26332e6be7711b6c54a1f06daf84cc201410b0b6c1d SHA512 a7868c1239630426628ca131c0dfd42a8d33e47709030489a56db0cdd8bfc241f83062d652a3578ebf3d081e8c95a84edc45ca2f00d9a272596343973696851a
+EBUILD kodi-pvr-vuplus-3.27.1.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
+EBUILD kodi-pvr-vuplus-9999.ebuild 722 BLAKE2B 1723620626a0fb522a9014ebbadd1c111a789da35d744598b4cfa397ba7a6cd4391ba25210cfee1d80b4c1615384dfc7411d14cbcd81bf48d97de1fff0ec1cf9 SHA512 0feb5fea81f0bee24d99ce4333252cb068cbea17e9b77cea042ce140f1ce65063101b65f6d25b9bb199b419d8314a1421ea1ee31200499abf734c535beda3af4
 MISC metadata.xml 428 BLAKE2B ac264c6bbfc925ff772eda61b1b4069b52ed5bf12836af8d8e86a72fe42bd852be1d00f74056c1d6b925fa2a026ea7df57ee57e7434a797884741b70762ff173 SHA512 573f803447cb7a7d0095eb21caa9f55c41fa4fb68c0f40aabad63df2ee262ce168fc75f28f3a3ae6aa7bf41f258be771c6a6dd06d1f2e2486b3d557d89f28f4f
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-2.4.10.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-2.4.10.ebuild
deleted file mode 100644
index ebf04407c57c..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-2.4.10.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.27.1.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.27.1.ebuild
new file mode 100644
index 000000000000..f77cda466527
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.27.1.ebuild
@@ -0,0 +1,39 @@
+# 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 VuPlus client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	dev-cpp/nlohmann_json
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
index c93c8dd503db..138bdd5a99d8 100644
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-pvr-wmc/Manifest b/media-plugins/kodi-pvr-wmc/Manifest
index 90871e9e42ee..dd5bdc6ec691 100644
--- a/media-plugins/kodi-pvr-wmc/Manifest
+++ b/media-plugins/kodi-pvr-wmc/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-pvr-wmc-1.4.9.tar.gz 177965 BLAKE2B 680896d2f519977a0dbaaffdb6fe92f815787615dc9014934e2415eb817ac1a1f5dd5669f3d8ba1a0d6a98f0518062b285cdddb5cdf54efac4ec79aa3795ab73 SHA512 51ddfb064df5861b3fa89decdf78a499f8251fee3f18ffcf09fcdfbe9c3c741536cafce460486b38bd8abb447e3494f819aef3a2d0764b8e1579d649f386503f
 DIST kodi-pvr-wmc-2.4.4.tar.gz 178508 BLAKE2B e1d80860ade2a639dd65a9dd541657ee29032facf95c427fd38038f5df28f5cc93622f00809228ae7968786b0d5499606c38eb79adc7ed9200b4e94e2de26206 SHA512 9932d3c44dd91ff371ef34cd9fbbbe1485629116b102c31dc7292e32f82869727423195ae9c78969d96e3a03dd22d481cc0708212921acba0524759a4acaad8d
-EBUILD kodi-pvr-wmc-1.4.9.ebuild 690 BLAKE2B e6037d104fa02dc06a3003cf36c7600c9d310024f5050629736d8e7c1089f6ad99e2508d422179b87310dec03a3feab39b81feddf7efb9ff46247609f593dd20 SHA512 e28b7fe4354f8b12ffd0d15add45459231f9c458489de444b4d817196df14c0ad9ece62a0cc0b49cb7ab951241030a789eab47b65c0df50dbafb0ee7ba65c145
 EBUILD kodi-pvr-wmc-2.4.4.ebuild 680 BLAKE2B 7e2ceda9bcb53bc2c284d9876226abf5f87455e3e69eb1fb8cd3dc151f2a09b7312adae0ea0272ae2945d3df85bb3bb2464f7cf3b80483836ff6419037928aab SHA512 50105fb1457f40160a5f08546baccc73042e842738ea81b96904a68a5d60e9a87ad056d4db292ff391ca7c6ad2326682fb3ca6a84186d96beaf86d0526c85dce
-EBUILD kodi-pvr-wmc-9999.ebuild 682 BLAKE2B 0929f6e052949fe8c50fe6ec872fdfdf30dce2424f067b5bc0004e7364a3506fb4f5a096a728718ff61b010d4072cf8a1a01d41762f7349f36f1629229f337f7 SHA512 8ba688262ae557058d090fd1e289223d396f697e0f67aeaa563745ae5fb952eb276efa42fb499996bb76dec88c16b17efe7816606231abfa2bd23528634b0bb7
+EBUILD kodi-pvr-wmc-9999.ebuild 682 BLAKE2B 11fac4b803c51bb1464601a5dbef9b21e5bb0f8d2069f049163ab9c86ab9085fb1a67b2c137aeba1d98c0d5a5bedccb709b88e38e8df686a68d87e1a643f7f10 SHA512 24d91a68e9597556600aad597248d320f00f70d12ce94bade439c22385fe2aea922c78049cc3fb57110e950b2eda38f1448c2bd19aa434a5c81f6b29aef33b22
 MISC metadata.xml 439 BLAKE2B e9d6404796d298720abff6d7afd2db18b95007cb65ee3ff471b83ee7e7e864eb648a37e3d9d8405842c6b8fe3c409096abad8c8b6c3b1eb2e7df15d4865bfcae SHA512 d85d185c415264b312fc1cccf1155b4f49d1091795989e617c68a4a910f0c85e19b8e34764b4a4a31bc825c927f5a939a7bd7b2f4d1412263aff6d0e50b3fdf6
diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-1.4.9.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-1.4.9.ebuild
deleted file mode 100644
index 50c278f7f89c..000000000000
--- a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-1.4.9.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 cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's Windows Media Center client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.wmc"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.wmc.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Krypton"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.wmc/archive/${PV}v2-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.wmc-${PV}v2-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
index 416de5a5756a..60b21dc3a53d 100644
--- a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
+++ b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-screensaver-asteroids/Manifest b/media-plugins/kodi-screensaver-asteroids/Manifest
index 656cf1fb8add..6d894191b2fa 100644
--- a/media-plugins/kodi-screensaver-asteroids/Manifest
+++ b/media-plugins/kodi-screensaver-asteroids/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-screensaver-asteroids-1.1.0.tar.gz 9762 BLAKE2B 5d4da0beb5f344732432b0cf9b8fb8d92e0428bffde6ad384e0fd837d9c12ec1ff96e3eb78c3fc639983b91ce0b405d8e77179d88e6f8d71c022663cf51a92c9 SHA512 38cbdae262ac9136654699dffaa51f9c854557c3aa0bb0abf038d3f5d4f94045f73aa054498b0283d7a38a6a985a49ab2df80f9b4d5f3fae6b4cc09794ddc838
 DIST kodi-screensaver-asteroids-2.1.0.tar.gz 18838 BLAKE2B 26504e8a10afed55a780fc18e127df7029adabff913baf4da89e76ebc1ee1bea46431e4a578f8273335a40a30b0bf8e678c86624e75fd3419696c3cb9d494a69 SHA512 61d848aa136ab3a9896446d92c5bc8d02867bcdc67b8eed58cff0b9c3573c52a19b4d16de5494dc45c0f69946075749d73e8681858d534f8cbbe31d005a9a5c3
-EBUILD kodi-screensaver-asteroids-1.1.0-r1.ebuild 631 BLAKE2B 539b660c4b02a9feef43ba53d9789784719b79c47fc5943dd15ac6d1e8256a92a43af1de724460e25ed8814707cc6c779fb797756e65d8df3172c65f0574204a SHA512 372b1efa7c17b65f106db41358794c18a67dac7693cabaf80443c5adc5189b5206ac1018a96bfbc0284681f39d4b1feb0ffc2ac32c732df0aa01a456de2c7a85
 EBUILD kodi-screensaver-asteroids-2.1.0.ebuild 659 BLAKE2B b7b187fc3f12ebcafa40a29f58707a472761e8e3a0bd36fa4c38b2d700493696816c928a5e7e79dbf080e9a7de57c721ed31c937885aa3b88526b2aaa1196cb6 SHA512 3511ec63d44bb7f1123c4a564fee3e21ce121b6f01d167b9a552de6c0d2a7522305c314f5a0bd2cd1b11460b339839ef62661eac701487d13265d8492e4c7eeb
-EBUILD kodi-screensaver-asteroids-9999.ebuild 660 BLAKE2B 1cd8195ec37d29c1e70710426f6b356df5e4e4813cabbafc50e16ef69d9263416dbcbb58deaac2c6bdd25db24d705f7e710674d889a5ac0a1d5baf2ce71c8dca SHA512 d6476debc0eed1e10853c6cb9840f06f182317a535bb6a78e20085a33135fa10dacab98560d605afff4d25a7b90cb22629955bc538e9852877283e3cf42a09ce
+EBUILD kodi-screensaver-asteroids-9999.ebuild 660 BLAKE2B 6c7e0b2750ff98c43c9e8a4fa3812426d8788ab9669c0cd3e373a5f085b67f2a9b6a9a254adf5b8ab5208284552710e9582bae20b4c3d5e511b39aed6e362dad SHA512 dc6d6c7c8e6a335202aea8aa127cc03d485de3185f75f32f2cd276edf735e503deb9fbb93b0d59a15181958245d2f9dbad1fed13ef2d5bf0cbcd6ba034cc2f5b
 MISC metadata.xml 439 BLAKE2B 3c290b112eb05ae33fa636fae123220ea920409b8e0a99101e12450d0d3af1c3effbbbbd96ea92969f6534139851f5ec4ce19b930c00f326578296ed0d6747d7 SHA512 47e672fd702cdaddcfb42c3f792a74159756c945a9b86f26144a889d8b46fffad3c2f57305a0d7be9e7390f9dda975d4cb5663657e0640ccf80ca50cc9d51bb1
diff --git a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-1.1.0-r1.ebuild b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-1.1.0-r1.ebuild
deleted file mode 100644
index 89339cd2eef0..000000000000
--- a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Asteroids screensaver for Kodi"
-HOMEPAGE="https://github.com/notspiff/screensaver.asteroids"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/screensaver.asteroids.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/screensaver.asteroids/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.asteroids-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	"
diff --git a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
index 58c3b5bf9593..e3614ec88ae0 100644
--- a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
+++ b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-screensaver-biogenesis/Manifest b/media-plugins/kodi-screensaver-biogenesis/Manifest
index 398e96e9f9ca..884e6c1d4bef 100644
--- a/media-plugins/kodi-screensaver-biogenesis/Manifest
+++ b/media-plugins/kodi-screensaver-biogenesis/Manifest
@@ -2,5 +2,5 @@ DIST kodi-screensaver-biogenesis-1.1.0.tar.gz 8792 BLAKE2B 7e6d64cd5e4e53fc3c53a
 DIST kodi-screensaver-biogenesis-2.0.0.tar.gz 10579 BLAKE2B f6dbd9f99b453f33b3cd2650d901c4fa39b98ce77382362fa93b1d2e31a54a23394677006b3be97b8bd1626c97564ae812f3452bd17f9cb165914d8793e2e00a SHA512 3aa4668f009561b3615d68d7a61d47a86970e32ff97012f1a9a7ad8dab367008267949d736c47a913f878aced1daae8768c2531d3af6239419470baa2e9f835c
 EBUILD kodi-screensaver-biogenesis-1.1.0.ebuild 634 BLAKE2B 4b4dcef78e103d861517ee394c647d7acec70d748e39fedc2fd1537d7e5f1d7195e62038646ccebd397af177a7c3b8b6e6ad1bc946eccb22637bfd3418f23b6f SHA512 75f7f8e6ac7560e2fce53cd347a7141ff0ad81ede49d84907b30378d60c1700968ba47478db3ac4a2aa453d3d112d43ee685db9b39aac9c0bbc2130b4022448f
 EBUILD kodi-screensaver-biogenesis-2.0.0.ebuild 664 BLAKE2B a8f0fb5e6a227876991f24f7f7fa24f7d24bbafa311aa2b3ee75d7a2ddd916c34162ec5e24f0b9a2b1dcbfa6c92c69a8d1075748e8053713f2a2d68c4b8ffa56 SHA512 9ff72d54ece2a4e4f224d6b641aa601f351358eee14908f15bd86cf9991ef1b3afb1f073b5b0bb87c88ee8bb5c04ccd9fa4e4f3d4dc4bb4233c31260459766df
-EBUILD kodi-screensaver-biogenesis-9999.ebuild 665 BLAKE2B e7812ab99f0cd8905c4d3304cbeedfb6406158cf23b0e6d897cc932c00df5cabb1096a588f66eafddb58be0fb600ba1d53308693ff0b1c57272e89a9c2fdadb5 SHA512 5a60343b906157af49ad248922e113afead82f363310a9364b1be175393e1cbef82f3912be15833c6f4bcdeb2835b46540e87cda24c2d2fce1afca194da4e365
+EBUILD kodi-screensaver-biogenesis-9999.ebuild 665 BLAKE2B f0f356fa771feb50e421c4a2407ad7b07846a2b8c4c068da76c811cd2c0b7d28ce7db6cf7b69ee567379534588e633365cc6f6002d371a5f25f8f68615592347 SHA512 a62b659b80d1385ceab66ba87546ce053b527349a5143046f762eda553d02df40b7f06a5bb9281f39c1865f87c3d512db0fd784ccf6620709013fba56fffd24d
 MISC metadata.xml 441 BLAKE2B f5c19cf70bcc5dddc98d5d1f01403fe32e05e859fd18cd972e8df08b76e4356bce05910535a336dff4f11554f9e8cd7a69addb00b0c5efc2bc021d68a8198624 SHA512 ed6d1fe10c992d7f28c115e86eb2565b6dd2a753d670dae7815ecaa717b208d762a62504aa67a2bc1853a203fdb49d1763ac03e00effddf4db81567f20100791
diff --git a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
index 75a3fbf914aa..01b0cdea74f6 100644
--- a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
+++ b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-screensaver-crystalmorph/Manifest b/media-plugins/kodi-screensaver-crystalmorph/Manifest
index d9783935b457..0252a957aa48 100644
--- a/media-plugins/kodi-screensaver-crystalmorph/Manifest
+++ b/media-plugins/kodi-screensaver-crystalmorph/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-screensaver-crystalmorph-9999.ebuild 647 BLAKE2B d78c7ecee8c07f04c03699999059f4fb2a7ddd3ea46f0b5992e120ded078d1673667999d6fa0e50687a13cc5192c4d798b5b76fb1b439fb3b89dfe254ead3a71 SHA512 a4be58663dc15f31629877af82ac0679e9587c1372220b42c0101a17b01b4932c896d8c8017c1340b32b9b5238e0946181c021d3fa5aa4d0f1e27a026c253715
+EBUILD kodi-screensaver-crystalmorph-9999.ebuild 647 BLAKE2B c605e3b72e3a46538fef6fc7e5e49a954f54d2ef89487f58ee5bbcb10e95bdf7ae1666b02a5f20a28021a8c557cef6792940489114cf765bde119c1339abc64a SHA512 92c667d811bba26b3cd051e6f78b8fe6cd7e80b43f6e82ecfc4e36617f088d6f1b964bea993c8284b57270db10c463690351fc370c0a76ad2017cc5ce1bcccf0
 MISC metadata.xml 449 BLAKE2B 15af0e3dc5f50626dfd4f43e02160639c2bae863302674f6455c707e44d39dacddd0d7fa06e0cde6a42f00d8ff658e0a043fe7384d105fa69bbdc5232f14823c SHA512 e91fe6087a08df65eb9bb92906561fee28b7273dd55d87b0efabb16e9df665c49e0d37cf6e8a4f6734007b788a47290bc772bca4daca8ccef38b7a5012ba9a3c
diff --git a/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild b/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild
index 607de5eaf26c..67b977f36cab 100644
--- a/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild
+++ b/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-screensaver-greynetic/Manifest b/media-plugins/kodi-screensaver-greynetic/Manifest
index 504625677fd9..5542c00037f7 100644
--- a/media-plugins/kodi-screensaver-greynetic/Manifest
+++ b/media-plugins/kodi-screensaver-greynetic/Manifest
@@ -2,5 +2,5 @@ DIST kodi-screensaver-greynetic-1.1.0.tar.gz 5115 BLAKE2B 357a4d51b2271c4181a335
 DIST kodi-screensaver-greynetic-2.0.0.tar.gz 6608 BLAKE2B bb48adc922d3949670d3685ca4adba7d608a42e9f9c0c659ca91a26e9181568f4a6d1f1f9aa707eedb395a9eb54c4aa40a83b36b6594bef5f9159ead5585381a SHA512 15a577bb9e10f81d86582eb43c20b4e2dcf430f478c76b3c18c1800532e38d9dc87754b7e0df669ca8df4e1d4d589224c561688a4fd14528c70dc6728c7be16f
 EBUILD kodi-screensaver-greynetic-1.1.0.ebuild 629 BLAKE2B d903f527a0c14316a872b1741cd44ddf02339a73a58b888482b40135d2b46ab35c4d388905475d3ba6262fb68050a7d56adf0786fd99f9c51749b52ad3761c8d SHA512 0afdf7c85059546e955d443a9a3b54c805712c8882d1e61a3e93025b1108aceb335ac06a6f6ee322daa760a7196404881054024431d5d765dba5fcadc076837e
 EBUILD kodi-screensaver-greynetic-2.0.0.ebuild 659 BLAKE2B 8175e6f35ff1710cca777c1f3450404f1e91c722239090bae403964432c9c15abbcb7085dcc4283c4e3f6c9186d184e2d4b591dc102afb939dde526a56751a05 SHA512 3cd27f42ffda2a43db0362e01ce7ecab2c092702412cc3995f17baedb91a51b6eaa13c4a5da3363eaa8f24da4be735e083d8fe28b042a63b60c8e42b2bc85570
-EBUILD kodi-screensaver-greynetic-9999.ebuild 660 BLAKE2B f76147a93694f01d93f5d412ae7f65303297e398dedb00ab9a76788834fbf29fa90e7b397864225ac4142aecccd79de0e53c1201e7856a55f63f147c222e8ab8 SHA512 0abbfcb95de736591e1120dbde8327a4921c1cd8b91f611ad69ee859a9e93451abef93beba66cfb8d6c5098098af742b7aaff863354d1f33ddc1762ecbecfc5c
+EBUILD kodi-screensaver-greynetic-9999.ebuild 660 BLAKE2B 4c4587857bb9c8324449e0e54a0368c220b8b8b5f4ecefc4f114649e1ce42bf71fe8bdcdec00bf9bea7839674636e1bc1f26a91ae98ec5f025ae90ac9a7908bf SHA512 208060e2634c8bdfcd130b9b1aecbfa0ecdd791cb1f3a7af43b9483f3abbc92b884775dd1ae6e3c4a086c8b433f75d963c043b642cc1787a4cfc4a7748c31435
 MISC metadata.xml 439 BLAKE2B 61919ac2fc5a3efc8278e1dd40f196fcd000ac12cdbe633b4f53bd0653978f4030fd3dcaeecb6f17a86c4e8fbabdb8e9d6e11e7ec245693c54baf57ac1042445 SHA512 56833abb5a30439a7c4736e4f695f555e79bcdd0cad2d53a87897c35d4c3efedb65a4bc5818572c5fbb7768eedc635659299186339d3557d98d86de7a54885c4
diff --git a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
index fc568b0174aa..f312ca7ebc25 100644
--- a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
+++ b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-screensaver-pingpong/Manifest b/media-plugins/kodi-screensaver-pingpong/Manifest
index 4fb15b6068c6..84f3f1adb366 100644
--- a/media-plugins/kodi-screensaver-pingpong/Manifest
+++ b/media-plugins/kodi-screensaver-pingpong/Manifest
@@ -2,5 +2,5 @@ DIST kodi-screensaver-pingpong-1.1.0.tar.gz 14476 BLAKE2B ce9a13968394ff607beff2
 DIST kodi-screensaver-pingpong-2.0.0.tar.gz 16768 BLAKE2B 1b4864ae3b88245733dec758cd815ff7a9f4673e1ab249275239c4ac1cdf04fbd256001d5ee984bd509730094b91cfe1d2e683169624f87192dbebcd4dc98f74 SHA512 c754b38a549589488e524e6b61088b3d9afe8f2f76bd65aa72901c7004880087cc7cb614f4b1cde49b0200a11f2f57181be913523a8b339abb6c26589a6a3d39
 EBUILD kodi-screensaver-pingpong-1.1.0.ebuild 625 BLAKE2B 9de8a58bac01aaa057c80d232bd4f0546be2855c76608da93a52d15f054c8adb7f2dffb1a31708a3a88a7766dc439f47ef8118b061946787144bba8be6d3f4b3 SHA512 13986351400280f6b9224110789dca0b5ac6930ee7214bbcf80d8f25a961c0c1a57bce5fa43fefef333ae2bd4c6129410a7eb55245ed8a05d0b5816b817b3fcd
 EBUILD kodi-screensaver-pingpong-2.0.0.ebuild 655 BLAKE2B 609c646adb52ee425e66f4dcef2a3e1512e0631e2833c6331351b9db4e43fe1c51160a994287d5047e591919de71f552b1ac8cfd63792b5944a1ef227ec7c009 SHA512 c76cb1d6db4bb84d464735d6bbce7cac16e70329479a0a47d966d1ac78dad8850a28d6c7b45b553bfe7dfd0e999042837dd33c00b7a39715ea48d96be29baee8
-EBUILD kodi-screensaver-pingpong-9999.ebuild 656 BLAKE2B 70488f9d4a6a331dc9137b3ceba30132abbad5ea903a3be39b23164d8ee732148c8d8980bd5cfb6622500e09c4aebdd09aa397d61bbc29a3a58b6dc26c53895e SHA512 955d4924e6f88601d51416e8e82731d9748a676153625476aa7394cbf9f6c1bf748d251f9d8ecab1abc472100dfaa016fa530d6556040067a6c8e61494f1b887
+EBUILD kodi-screensaver-pingpong-9999.ebuild 656 BLAKE2B 84a55f0a2e3a8672da97490bee171b36b1899f9b9a18c0ad908158a0e43d1aa1e43e9a98d6778f887710d27ad495314028839a7ad1b2619c3f5e7c2d6b3a6bf3 SHA512 347b8bb8a92144778673970ef274fc3b17dbe6b703827c5cfd5777747e3b2406685cd1cc1a679f991afdece9ebbcff041f8ca8e5aabd684130bcb7ffbf88e700
 MISC metadata.xml 439 BLAKE2B 3c290b112eb05ae33fa636fae123220ea920409b8e0a99101e12450d0d3af1c3effbbbbd96ea92969f6534139851f5ec4ce19b930c00f326578296ed0d6747d7 SHA512 47e672fd702cdaddcfb42c3f792a74159756c945a9b86f26144a889d8b46fffad3c2f57305a0d7be9e7390f9dda975d4cb5663657e0640ccf80ca50cc9d51bb1
diff --git a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
index a28bd3f5f731..41a80f39ef05 100644
--- a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
+++ b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-screensaver-pyro/Manifest b/media-plugins/kodi-screensaver-pyro/Manifest
index 1eb0a42614e3..53a9b11cb4aa 100644
--- a/media-plugins/kodi-screensaver-pyro/Manifest
+++ b/media-plugins/kodi-screensaver-pyro/Manifest
@@ -1,8 +1,6 @@
-DIST kodi-screensaver-pyro-1.1.0.tar.gz 4664 BLAKE2B 92ebff9b42ca257d24e52bad267a301fd9b85bcae9a0db254b2d679722c63dc32abb94c7fce7a0cef7da35cfdc60a44b0f07d0f139332b086c0ff924ea6daff8 SHA512 93cbf40393dc2c50c927daffbdc10756c4a8e4a9a960e07edd6841ae4b0ac5c49beb097ce0710ca38720963e77859b7ed0198dc611c6990a73e066c8ee91bcb2
 DIST kodi-screensaver-pyro-2.0.0.tar.gz 6502 BLAKE2B a0ccc3346f6482db303d4d12104b09611fcc21658eefd23a6af7610cfcff996e2e6507f90da1a8ae3b853a5104da1d4d2a316ae5a335c14e1af4c88b5ac6a7fb SHA512 383fd40fc2bde9a1fe52126300b6279ec78ceab773bd6a763c8b72c3d3ed9b04e5b15eaa0de6da34af7e1d86046807e4734f75e524fa8335bf18cc8bc3965360
 DIST kodi-screensaver-pyro-3.0.0.tar.gz 81858 BLAKE2B 4d48cfeee5d51c45e0caa99e742226ed6f6b0704391d657be8863ffe76acfeb2e3f3740903cec89e0dcaa2dcbff6109fb91e582c5855598b9fd75549880ab87a SHA512 92335e156950f7da5800dc9c9fd57262a2d608d63cb2015e3f5711686b657930f05651a35e043480ed64f40cb34a3228c44b6c641b63a8d0438e0944abc09515
-EBUILD kodi-screensaver-pyro-1.1.0-r1.ebuild 606 BLAKE2B 73c62c65f456e4ea047e898a9e39f6a971e0afee6e73f4e4057fdfc9b86a867e16a2b989dfe82a7b709143c5f677bad08b52a84621e2530b91b9132bea03ff61 SHA512 0d27ffb34e88e354f1e37f1b354ea0d2e23f1a4678a0d77aa20caa4ad9c21bbeae470a2de6844fb902c66bc628db69466288b7efbe614d80ed01904edd779b43
 EBUILD kodi-screensaver-pyro-2.0.0.ebuild 634 BLAKE2B 4f29003cdfb6c264d5f9f3b40eb802775eae4671846f1b4013c59465d1658548d2dac77f82c0e374a00d120095b6804e129a9b9a3ec92287af7e0233e3dd3672 SHA512 791bf456b3a17cea6dd22dcb5c100002240e2de81176fa7f0b020f0c1216df208e400c17b721726691f8a75d806195502eb1fd0bb96cf537cb0bde2714dc5274
 EBUILD kodi-screensaver-pyro-3.0.0.ebuild 634 BLAKE2B 0803976a5267983685007edda398af6fa33ec76c5ce63cf48c724fbb2056298cb0bef6e76ae682c78716f5be2afee7742d2ce25ef54c677f093c07b79b948a0d SHA512 fc89e6b3af290ca3ae3a7b5bbf6f83e875cdd560ffc1f80dcd53b890b83cdddfa4a7e10a22de4a21ec332dff090a007d95d590e9ae07f8d048b4cbdea132cdfc
-EBUILD kodi-screensaver-pyro-9999.ebuild 635 BLAKE2B af92ccaa044443360519d3549bab476bcc2d39442a043a1eed6ce40a419653915e9c2143b12c31deebcf61e22677401b8bf867a983e59d8ab8c54953eedb6525 SHA512 b707ec722debfa1b9a3739a7ae25041fc4424d2329f748132656579d751ba9f4370c16b1d6117977d3ef633fb9acbfe9fa002e3fcaec7b07d811ec61c12dada8
+EBUILD kodi-screensaver-pyro-9999.ebuild 635 BLAKE2B 70cd088be5230883b967030d23a6a734c7323008803f91dc98153337ddd92273f5314263af525394bc3c862a8e4299da94522656417c0a19999f203e5bedb1aa SHA512 4c57f4ac7d956e8ea07f5dbd217d77c32b529b3f1f758cc66fffa7f774dc15d2c7d0357190406e9ccd4a4f052fce163cee6f7d9caedb86f5439dd4d7ac46a0bc
 MISC metadata.xml 429 BLAKE2B 75a3ac26d3c3383485d3aa0b9a674f6bc249d95f13b637d9d07fb64f7ab46226301f8abf8a4194b3a30ea8dd6815d6565382a0e1e342bccf880ea0ca6a3d11f1 SHA512 df4dd73cbdb3c1d9a32ee398273356b506391363fee7d5e799a1bfed2765a1cea5c40ddc60716aebd272c4ee91d4d72d148a0644d3e47a84d3b31d03fa739f3d
diff --git a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-1.1.0-r1.ebuild b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-1.1.0-r1.ebuild
deleted file mode 100644
index c1ca09124946..000000000000
--- a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Pyro screensaver for Kodi"
-HOMEPAGE="https://github.com/notspiff/screensaver.pyro"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/screensaver.pyro.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/screensaver.pyro/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensaver.pyro-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	"
diff --git a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
index 2587a2913dfd..7caf62b15621 100644
--- a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
+++ b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-screensaver-rsxs/Manifest b/media-plugins/kodi-screensaver-rsxs/Manifest
index 6adf52a32efb..36088c365264 100644
--- a/media-plugins/kodi-screensaver-rsxs/Manifest
+++ b/media-plugins/kodi-screensaver-rsxs/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-screensaver-rsxs-1.4.0.tar.gz 6181175 BLAKE2B 4873027b5f3583129a243c90fd7b3770c43cbba22428301778835e9cd62123a4248a0bf9199c3727f30f61cb7df6b6b1268ff7a1211405c0b72be75462a6781b SHA512 95d553e54be91b914b40d4616d2a6a127404215ceb4fbdf40abc4b6c9d981b33681dbe88c6def34d0bf80a8c0188c59d3760a5804a5189dce1257e5242568497
-EBUILD kodi-screensaver-rsxs-1.4.0-r1.ebuild 760 BLAKE2B 0033a65dcb6a49befd3a5dde38e5f36f626fd068defe31761fec2f824d8a1b9b24432d08f14af0d13ce1ae8538b3d7b482aded2225bf23fc406df4306fd03866 SHA512 dfb2e37d5f259bfa5631263e51897edd5b5f9c0c6f6af4c150a370a93a43021d7ba82da842300df7861f5a4bee4b5262cf06dc8b76c25661d364d02dfc3333d6
-EBUILD kodi-screensaver-rsxs-9999.ebuild 761 BLAKE2B 42809d2b2e8eda32c4f703c5e2ec306974beac7541d2222b2296207c06fb502a7f0b99e00e6d9cda66eda800d402c5275a8e3463521c8be84fb11939ab7f80eb SHA512 567159422fed2e727331a858947984f41e533b6609f665f3fc1c230096dc78cc5509ee180ab91f21b29e9784157176a88e4df93b3843604fe6be07de4f405e26
+EBUILD kodi-screensaver-rsxs-9999.ebuild 761 BLAKE2B 2a81721cd5fdd48cce06b1b4d8db31648c79995e6763b13c185c67e5cd28ae76e951acce46cb502604e08ffa1f9bf6cf6209340c6ba77e5db96a05d4429b3174 SHA512 537bc0b40cac9661394414f6b59171130aee4b06e5c2cd922eb27a3b0c99ed30219ac0ff64e27e50bdb21063b2b30c16b52f1129cdcde6bd01a2ab0ca9cd2323
 MISC metadata.xml 433 BLAKE2B eb81b1aba0ed7b5e827682e7db8752b045c0db57c5323b676ac117020a3c7f4b5cfd26801f6a3b9b6ad9c43f525790c646b9cb8bff3a65c2cea23e7560192d5a SHA512 24139a96ed95abd60bea9b882f8aee0166953652a3f187045c9fb691e295b97bc55f00b7911b2bc60c41cf3926c3900654e1ab1e0cc59f0705cea5d75bb0b2c7
diff --git a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-1.4.0-r1.ebuild b/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-1.4.0-r1.ebuild
deleted file mode 100644
index d4a92cb85d14..000000000000
--- a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="RSXS screensaver for Kodi"
-HOMEPAGE="https://github.com/notspiff/screensavers.rsxs"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/screensavers.rsxs.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/screensavers.rsxs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/screensavers.rsxs-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	media-libs/libpng:=
-	sys-libs/zlib
-	media-libs/glu
-	virtual/opengl
-	"
-
-RDEPEND="
-	media-libs/libpng:=
-	sys-libs/zlib
-	virtual/opengl
-	media-libs/glu
-	"
diff --git a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild b/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
index 2945bf22cc7d..4ffc1f4f3c89 100644
--- a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
+++ b/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-vfs-libarchive/Manifest b/media-plugins/kodi-vfs-libarchive/Manifest
index 94a029fb5733..e74ae096d50e 100644
--- a/media-plugins/kodi-vfs-libarchive/Manifest
+++ b/media-plugins/kodi-vfs-libarchive/Manifest
@@ -2,5 +2,5 @@ DIST kodi-vfs-libarchive-1.0.2.tar.gz 21985 BLAKE2B 0d3b8d7405cc7ea1a766a138b432
 DIST kodi-vfs-libarchive-1.0.5.tar.gz 32808 BLAKE2B f822cfb188d5d6ff2f5237fc3d242b7e9095d967314d9701a1a1635ff7865b9fd4d836686af5dd6afc90fd52c097952937d0ed7c02eb56c4c51b335d8f9b328c SHA512 3d9c5d1b8cba0545ca2b30a3a72d2ed930324329968f17a1fe3c145b54632d8d60dee45efdc1d7e74f7872503ce893101c71b6d9063b372de912a60980c762c7
 EBUILD kodi-vfs-libarchive-1.0.2.ebuild 877 BLAKE2B ab0ef79088afd96837f796f1b9ac8bac696aab214fd234b370ad3bbfee4998441e3140622ae683370a1e0086d6db784272e5fb63a4f057d5218d07c73235728e SHA512 e349e72aec6646445782a6b49b8588eaca41d2f9683408835a49e89b17e7f0618126ccf650bdd7a935db2367025e569465f0243e8bf45a31f1040f7d2c076ce1
 EBUILD kodi-vfs-libarchive-1.0.5.ebuild 877 BLAKE2B 7c842ae4877d93da9551f87c3be125adbf91f3266f1da136dd5a96f7f3e58532a0d9599b2438857a6222a4c1d0ef0e5cba2f4c576682946d12a5dc334b454e3b SHA512 ac4dc317c7d5d1957cd1e9009d9c2bc1616f5c9c74ae51be371ad381c9569670373ecb46b705bde78c04b39b32a00e69e2b1d905a4d21bcfbee87e6fae8a0980
-EBUILD kodi-vfs-libarchive-9999.ebuild 878 BLAKE2B 37b51c472a676c5daabad879cf891cb4faea77fd5b63fc71e4ab4ebb2c4c70d285647d6d3dde18ccd21c22c061be8b382ee627efb4824746c2b303aacf38e5e7 SHA512 16e19b3f5a283940b11e387e5f17fc12cee32d4214b82de07635783c3b4afd5035e7057bf93c8da2010b03d1cb14595cc175c8139e5a93ca7a12e70e51086d7d
+EBUILD kodi-vfs-libarchive-9999.ebuild 878 BLAKE2B 94110ec751196bac8ad6c921862c5ee4301b0aa9c70cd110ab3225f6160e46903a261f33747aa5b69f5b14238dff5cb4f2e1ed3ee4542da544d24d69493ca4b0 SHA512 840bdab3320c54e0f8dda6197ea5be0385ba8a4c768a0a766ab0ef99772b466b7328fe5c39b4efde6f69efb8188866031cf6d0a72a388f9b2068165d2041f092
 MISC metadata.xml 432 BLAKE2B 3006fcd638bfffcaa3100d40c3b1ffad2afa58ac1141edc5baa79640a1835db8104753cb64161530396f1d9549726044653ecbef6d4096769751f00dcba8b6c1 SHA512 553da085bf4fcc70c1b4ab666004ce9d0e68ad95b185d78713381392e6c0590f5aa8a23cd8f022e3a12b77cc96ef06ccc54e262233326921ad45a921a32af135
diff --git a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
index 1c03b73032f0..d38dfe7343fc 100644
--- a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
+++ b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-vfs-rar/Manifest b/media-plugins/kodi-vfs-rar/Manifest
index 3257d4dff2da..43c522575087 100644
--- a/media-plugins/kodi-vfs-rar/Manifest
+++ b/media-plugins/kodi-vfs-rar/Manifest
@@ -4,5 +4,5 @@ DIST kodi-vfs-rar-2.0.7.tar.gz 132225 BLAKE2B 62f75acba3b06a7eb179eedf31fffa2397
 EBUILD kodi-vfs-rar-2.0.5.ebuild 652 BLAKE2B b36b05c304dd57e616c1f8d30024a34f6eacb9bbebf4f40ff9c8a92f7bffa8f9252e289a1e4d32536ed13c7836be14c14fcae036e469337393b0f6f02edc826c SHA512 923b6dcae197faa632bef703cce6959f10c5480a76bddd3e188667859b4ee265ad3f1fee57ca91b6caeacc08315cb5f1fcf53598d792de46e5d5539d1844c5fa
 EBUILD kodi-vfs-rar-2.0.6.ebuild 652 BLAKE2B a3c9536ae1c17c721ff0a69fb3c54e4f7626122dfae57a633ee10ac33de556578c3a53a614c0500a96050bae184bc07bc66cc853cdd6bc91adc6cee3b0847b4d SHA512 deafe614fc3c89790f3d3b5c52c888f4a41969ac98afacbb0f616aacd7bd3f8ceea573d7b59ef5d8ef7a268e8926f00e34046e007f98eb00e058393bd0454dd3
 EBUILD kodi-vfs-rar-2.0.7.ebuild 652 BLAKE2B a3c9536ae1c17c721ff0a69fb3c54e4f7626122dfae57a633ee10ac33de556578c3a53a614c0500a96050bae184bc07bc66cc853cdd6bc91adc6cee3b0847b4d SHA512 deafe614fc3c89790f3d3b5c52c888f4a41969ac98afacbb0f616aacd7bd3f8ceea573d7b59ef5d8ef7a268e8926f00e34046e007f98eb00e058393bd0454dd3
-EBUILD kodi-vfs-rar-9999.ebuild 654 BLAKE2B 8a5694ad5196e0fa332ad6dec7c3c4aa9566db66b78538ba4ee33ba1695f8e1737200d269368d8dcca1f55d1eecbdc50a3480c788a45472a24351a889157a423 SHA512 181f2742355e8c0c0532d8f6a9fe5a1a47e9305c48768bff2ebc2abf24d83a40e6833f4aa131a72bc847b434be9424435b0faf9191b3ece49b106b0c9093cfc0
+EBUILD kodi-vfs-rar-9999.ebuild 654 BLAKE2B 15ae6eb5ef52ddd3a99cbbf7f5b1c945914cb4e843c469fd03a7a93498399cd6c0d3792a66c3de7554c7bf4fbafbdf0833940d6f13fb00814669a603c0321989 SHA512 adffd338796c88e1bc09da234c2330eebb41e6667b0aeba49c041dc23b037dc4ab32b931246a4575ced70546e9c99c4f9f9abd459e92ac94e320ca9d60aca75f
 MISC metadata.xml 417 BLAKE2B 848739e38b8064c10732cc179fd55c24c49fa32bd9067706443b0efec47f697a66d330a52733033271638d3b0ba7ef1661f372052bb6dc1a25f5e0dd745f83ed SHA512 70d2ec7f4f00ef2c208db31180e4520f26bd059cd12084e7764297542f75798d2bbe55a3558971fde8709b403968da29011f271bc6f3c4b4a63ae2589c0ae76f
diff --git a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
index f64d451adecd..0e1a57116e68 100644
--- a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
+++ b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-vfs-sacd/Manifest b/media-plugins/kodi-vfs-sacd/Manifest
index d36ed41c0f8d..127d14aef6b6 100644
--- a/media-plugins/kodi-vfs-sacd/Manifest
+++ b/media-plugins/kodi-vfs-sacd/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-vfs-sacd-9999.ebuild 619 BLAKE2B 21533067c84024081864be400b104ad63667110e52bf04c2d41edc3af4b850b75520d7ea5df1d95e7d5c269a50e02bf848f148623c6d581aa6d53d7ee67ef5fb SHA512 b542ff2148ffc439b8eb35e9e070598789a96959f1b3ed3e2868b2ca31bd360b0da7ff3aefcaa2ead1e1a94d348a5d255006b52b080c635bd50f76b06a8ae31a
+EBUILD kodi-vfs-sacd-9999.ebuild 619 BLAKE2B 67a2ff8f85e17c25cee8dc8100ae8348944c6322fac2a60a5c379a467932237e5473a00d724977eb7f4ea7b760f5830f9cac9f737442c2e8b4a2680d2ed86a1b SHA512 54061667f3371b3324cc378e6cf9909c6d9cab5a6bd149be251ff284c3b5c6c7dfe7995e08760295490870cde536c3ffda8111a8b8fa6388e9e80e30395a69d0
 MISC metadata.xml 419 BLAKE2B 18019581cc35ab24aed35e146674d26ab57c18ad0d0468954f8dff16c2bff757d9a7acf718e5655fa96e02be9fd1a05d8f87f3c46b83fe09692b6f71677d89d4 SHA512 931961ed7c4a909bd1f15c7e02a3a37e7815b9ff293708aab813eaecca25ab38b8fc98872295b8dc6d46029d570dd238d68259f57504cba67601099f3f30dd55
diff --git a/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild b/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
index 5c8b40fee8b3..a5726083a310 100644
--- a/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
+++ b/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-vfs-sftp/Manifest b/media-plugins/kodi-vfs-sftp/Manifest
index 45c5fa3744bd..378c1310a0e3 100644
--- a/media-plugins/kodi-vfs-sftp/Manifest
+++ b/media-plugins/kodi-vfs-sftp/Manifest
@@ -1,4 +1,4 @@
 DIST kodi-vfs-sftp-1.0.1.tar.gz 20059 BLAKE2B 3ff2178738dbb85de731d5268d80cad079f684234ff39ca1141337c384377ca75dd5ad51026471af4e8a1229c6739fa9212b6fd6253cad9be6d9b19a7dc7081a SHA512 e51aeae2bf6e611e679b38401add778fc5605ededb8b8b9d2f6732eda4b87fdee5ea352d2c491cf1ff671c0299395de1cc689404e2924266ffef84c4e7cc71c3
 EBUILD kodi-vfs-sftp-1.0.1.ebuild 678 BLAKE2B 629a085af07b523d098035fc5344b6956e8876f271a2b33e58b7d7bb5e4bfafbcd94d8932cc4ae4a11440189dd92c52bad52e2a956e609fa3559721fd120e2c9 SHA512 c6d4b2b2d7226736e98b155a5c8e1875aa9bff8fe3daf3a1749d795d4a0cb4e404ddb5640aaf772ad84da745bfefd312464d42fc50a72679a5b86aee60e0774b
-EBUILD kodi-vfs-sftp-9999.ebuild 682 BLAKE2B 1a7ba9b858a0d09d940f17bc8d0b2c2df25efcbeea1fa27c31af0395510f058105574d8391cd6701fd8c53eda8ef34e135137785cefd9f7fcfa9b7c185c4219d SHA512 0699f0e74fc860d1f2868e86d2606acd829a0d136e7c9cdf88facb66cac229976ab27d8aeb66a4b8d196c48052f7bb48b922da476c94fd837f22659d535d26d9
+EBUILD kodi-vfs-sftp-9999.ebuild 682 BLAKE2B 978d74aada2807908ffcc09b141d326ad936c338bf40ee08c3da4fb19d322be8946e532ab47637a5aefb91d5478ad812d9c30463fbe1ef6624edec750f2c0fbf SHA512 435a5760e15703d692698e6712d13cb9e76e8c4e97bd91932cac4a97a57df309fc8ea263dc315934d5efb238838134f0f6de8128b4a7b9474ff5cde72ca221b3
 MISC metadata.xml 419 BLAKE2B 7167e481bfec9e94de9e9bdb25f4a5d3d77596a73e3cabeafa265322f0da3043de844f2db94c8767e3b5657c37ba1e77643acac9970f509fe956399ccadb1e36 SHA512 31d530be90d385a7d6756296909e5dd5454a2efc2a83d83c47cff14fc2260c1bc772bc23b95fd6bcb91511c0be21d9297074367aa445642ae477623f8f545a21
diff --git a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
index 4bb7e369a978..aa38c3ff2d60 100644
--- a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
+++ b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-visualization-fishbmc/Manifest b/media-plugins/kodi-visualization-fishbmc/Manifest
index 994df2980ad0..00ff67533860 100644
--- a/media-plugins/kodi-visualization-fishbmc/Manifest
+++ b/media-plugins/kodi-visualization-fishbmc/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-visualization-fishbmc-4.1.0.tar.gz 58536 BLAKE2B e0e573d6fdf3b461606e9335e64e531a92497201918bf22a26b5f2e0220bc8fdef199383e63f31f5acadd5d5091ead7edfae62ad3c20fa5174638e9d07f5fda5 SHA512 6107228b8a3f92a047003ef3a34dc57d187d9c6b1f28e2f8d326fd71e7e7b586750c02a3bb9b11cdda322cbdc5d3fe0146c08364029da028fd65d0f3a13a3358
-EBUILD kodi-visualization-fishbmc-4.1.0-r1.ebuild 668 BLAKE2B 89f071ea9bee7ecd6d2771a85fcafc1b89df6b323887b90f5fa9f9055ec96112135aed78dd89af2671876c77ce52a00fdc3c96495cc0ff76022c190f0c9c91b7 SHA512 b0c7ddd970f2997ec9f055a2c2d71c185f9f3f5b4eaa40ddc56b100ff1cc3809fc6063029e7e641fdb39b241924f7a2f57c1abe0d6d23604e666401754376915
-EBUILD kodi-visualization-fishbmc-9999.ebuild 669 BLAKE2B d73cad224cd4436741c0cf19f72e6adc7301912eb61cee169f618e84622a29e4a231b2c90257453cc4d2500cc88b30c40ecd4fedbae1bbaa7af1c2a4a02a7520 SHA512 5f2f171281e4c716248d0e5dc3082e4d2647c09177d8827a522b89f0b181918857e636f6d9c5e7aff10964c0f034a60a9776f8ac3fc55e0e0db0886b17e2d445
+EBUILD kodi-visualization-fishbmc-9999.ebuild 669 BLAKE2B 626748f31be9c21f258698142acfdbb74cb9651116266ab0bf5c01ddebc212e412ac1a43c316bf8f376ce39b5a85f8b71e634cdafc22c83f5434baff07d0ac2a SHA512 999424cdbeea6260165f4c001d47e8d8e7e33e7a974fdcab281d41db77dd8c1df8dadb0c07a61f9ac1e863b4c9f623a9d59e3228c7e1d73ab138fafb79f65b07
 MISC metadata.xml 439 BLAKE2B 538bd3c4a9323c884584cefda4f84d01e1ac2d677ac8c0f4b57a8b81dae2ac3cf6632769ffb50d46a5e162cb3571034fee417ece1878102dcaa8838e839495ac SHA512 0bdb34edf345e638dc3bd557a77adf3745d9332bd0858c40bc003511df26d87597932d2d2987e2245345c44b95d0d03696b61443c1eafaf95b0e151ddcc921d5
diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.1.0-r1.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.1.0-r1.ebuild
deleted file mode 100644
index 1646b899e334..000000000000
--- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-4.1.0-r1.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 cmake-utils kodi-addon
-
-DESCRIPTION="Fische visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.fishbmc"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.fishbmc.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.fishbmc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.fishbmc-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
index e0bb237b4e91..27ce97f09bd2 100644
--- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
+++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-visualization-goom/Manifest b/media-plugins/kodi-visualization-goom/Manifest
index 0ae68d735b07..1a0170d95cf5 100644
--- a/media-plugins/kodi-visualization-goom/Manifest
+++ b/media-plugins/kodi-visualization-goom/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-visualization-goom-1.1.0.tar.gz 493839 BLAKE2B 97e99f0f8bc657b5f92464bd80c591de48c48839982005e5996ea949e6e6a4db24de0c31ed010becad29da8f4eb5d9b579006b2a4c28ee567f094460cc4aa063 SHA512 d0e7ab3931ad32f16f4b97f3746e2e5ec9ed08ba23184ac880ab4da1c0da16511c6a9e1ea595ccbbac3c7c8f385fa5dced1e554d0a1a8122db4f35223eb66ace
-EBUILD kodi-visualization-goom-1.1.0-r1.ebuild 654 BLAKE2B c3ad3c7d1e9c3f62d92177401ebb1911fcc12ef0c61cc2275565c7da2167ead0a7c7f155db60ff285a83be910f01c4e6f072202bba9d03b59a29a693d8237cf8 SHA512 73fb6db3760dc2325f26425be499bf004402cd84a9e5e75b2e9083851f889f4b09af19d1a826df950326561abf34d630d2165c34979e67940afa841740faefe7
-EBUILD kodi-visualization-goom-9999.ebuild 655 BLAKE2B b5dde5a0b1eb8c109fb24347f7aeff0e42aff6a5b0e7af262826c6afe5a8a72b9891912f4468b9528584ca708c1fe67f5f0aaa0dc549c09b1a2ba45bb29b502b SHA512 f87123ec302d660acea6508a5e826139b8d95e089e34359542b4b4de3a0dcd2cc8f0196453365bb7232d68bd5ac769bf5f451fec70e97af931bc7b10a59fffba
+EBUILD kodi-visualization-goom-9999.ebuild 655 BLAKE2B 9d8c43fe1484c1b9e9240baa487fe78658cc18b6be3b1503b213170eb2cbf98d6c9adc3a0af5315086c7a74416a6adceb0ccebf0fdb6363cf3e907704e1fe2ff SHA512 25ab09204e6054e1f79fe92eedd0be138ee46ad26741d276ec0cf364d853506089761eb0ae78b95ba20e1edbaac25058d095ece1d3aed8e0e45471cd789f8f03
 MISC metadata.xml 434 BLAKE2B 14ffadbe7c568eb11922b64df1f82c0404092fc971b8e8181955fc21989c70d3c2198a4beb7ab426cf6cf2356d2bd89d71e3ed7155ba35fb647303b231d45a26 SHA512 614347e4b283abd727a963d2b276fc6e0e1477ba1e5571957b123670be073a50e14e4c0460aba90b5f01380fd40f8f1e334b2b6a9409e038b3c9dd79ee2fc15c
diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-1.1.0-r1.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-1.1.0-r1.ebuild
deleted file mode 100644
index 15d76968e81f..000000000000
--- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-1.1.0-r1.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 cmake-utils kodi-addon
-
-DESCRIPTION="Goom visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.goom"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.goom.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.goom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.goom-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
index 9e658ae6affc..fd87d5665eb3 100644
--- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
+++ b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-visualization-nastyfft/Manifest b/media-plugins/kodi-visualization-nastyfft/Manifest
index 2906e617ce0a..4152580c77a8 100644
--- a/media-plugins/kodi-visualization-nastyfft/Manifest
+++ b/media-plugins/kodi-visualization-nastyfft/Manifest
@@ -1,4 +1,2 @@
-DIST kodi-visualization-nastyfft-1.1.0.tar.gz 22375 BLAKE2B 3cd1c7362479e218259631dcf8af38f4f3bd32ef02e56fb5df8f9b3c9648096ac0e341eb9b9bd1567fc0e7ab2f690775289d2a39a7d59fd7f7923c56840a690b SHA512 fd32db6e39558102d6d9959b51029ceda250c5e3174689718ec78b095294cabda3d1459db753507245f96d7798273df23a197e82a9dea5a050147c6133a4b2e3
-EBUILD kodi-visualization-nastyfft-1.1.0-r1.ebuild 674 BLAKE2B 7e9e3a84ae77be0be24dcefff0bc6fd9ef85ddda8ab92aaf926a6aa951181da66db284970ff3bc0e7ca48439244f67e1610a5879afbcf6b1fe9ec1822ac6673a SHA512 66639f30c77f11a50661582334e371f6615faf754edf20b6831dbdf62a6ac2dd310efc86ba1f7f0a1a37f1a0d838a6d8ddbcf4ab776036509e90046ade32780b
-EBUILD kodi-visualization-nastyfft-9999.ebuild 675 BLAKE2B 4878d31daf10995e01b8a3cb552e52f937d617c61b74121fe9c84ad01d9e59b72d26eefea6f428972257da77e849e942624f4348455acfc6ac9fa6748313ba71 SHA512 28eaf82009fe0921f6d6b2eef8f1bb21a365e862e70ef224e305a933b5a2afc4a4777be92b2c320ec8d1181d49275d8b85b2743e00728dd18176d09115cefcee
+EBUILD kodi-visualization-nastyfft-9999.ebuild 675 BLAKE2B 9619e0bb01fe6d9f8b36521adcd7a81eee2b9dfaa98756e06e4c102fed430ffe69cc9b96f7e5e96d8c69438e411ab3f8b070aa1cd893532b2ea1072cbc167544 SHA512 cde967e3d227cea4a41d50251a105a60745cdb89f1f925ef1eb8dd5d76c93aa4faa4d22c7a3bd45b9c7223c2e8442a777963a0717a1eb47385a9a153ebf6c6d5
 MISC metadata.xml 442 BLAKE2B 9574b720a624b850e3aad20a4b3c03108b5b208d8a823d023408b415091ce2120eb135ce3a5369d7d554a17e89b2bb57fe7d20c3354b1612aeef4dcb1750ab20 SHA512 16f85f34283637601a3d32d268ff21a97ebe697e3830f082d39f4c1a401f123ce449c4943e1f8942aa9922404a7a4b86f36561e65db43a4788b9bdb8d700851b
diff --git a/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-1.1.0-r1.ebuild b/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-1.1.0-r1.ebuild
deleted file mode 100644
index 09baa294d4dd..000000000000
--- a/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-1.1.0-r1.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 cmake-utils kodi-addon
-
-DESCRIPTION="NastyFFT visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.nastyfft"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.nastyfft.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.nastyfft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.nastyfft-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild b/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild
index 0aaa3f8336c6..23fd5802f066 100644
--- a/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild
+++ b/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-visualization-projectm/Manifest b/media-plugins/kodi-visualization-projectm/Manifest
index d9d29fed18b4..95a8fb92e70b 100644
--- a/media-plugins/kodi-visualization-projectm/Manifest
+++ b/media-plugins/kodi-visualization-projectm/Manifest
@@ -1,10 +1,6 @@
-DIST kodi-visualization-projectm-1.2.0.tar.gz 450058 BLAKE2B cd612cf2680bd5d1ef13bba41e9bcd20245ed40b0fbf4396259ad850232a4fed739f99738b118e6603512b155e73d487e94ff4f0077bdb22d8604a151d221b7d SHA512 9ad106cb97ac9c626908988a5c9cf7a9b18b23585f7c905cb8298a93afaf1e735eb3b582152e30e4e5bdd83625608228a9abaf233c8bbb765b7031c4a2d5a44e
-DIST kodi-visualization-projectm-1.2.1.tar.gz 450055 BLAKE2B 36be46629f927f4e9555f4e76521c2d55a2603f438b0dc5b9f4e83ea95a5b6b27ad20c02f211fa38298f08cd789bd5c4edd14215066575dd5e41d5cab603c2c6 SHA512 37091b7656c791434c80572d57424bfc7161c0f2b752adffc2c4d837c93d733e104f7b68893544f3efc32c67e607882063c34ecae240754b1c71856d83ba4c2e
 DIST kodi-visualization-projectm-2.1.0.tar.gz 2479742 BLAKE2B e0fc2953ef1d242aa89d3e0afe7804b22460c70a2f98758bd252fa6aa1978001b60cc167878e725f09e2e38e0ebf2c013b3edad88ca015e54148da73a0fceb51 SHA512 74924f524d8e4d5c108cf23ae52d034404db9d1d5f63866cda920f552de93f524c6bd7eaff894295c2dae779be11dc17808540f22ad5f2536ec90166d2a95cec
 DIST kodi-visualization-projectm-2.2.0.tar.gz 2478953 BLAKE2B 89e4d75de74b920dcb4829303c20cbafa5bcf843279c98817c35aca547408b961e6df9d1fd8f0bbdd3113ab2f5836c6b5f353e6f363f896b79341742d4850bf2 SHA512 6b16f6d186d7ab3bcc84ef60a1227f61a6244c2328ba685d606a29dd6b8e08270e58de26498af274970c3e2ad0a41597cd091a30209ad05c88bb8313995ae3a7
-EBUILD kodi-visualization-projectm-1.2.0.ebuild 732 BLAKE2B 8fe53b114aa9adc38334c521e1592b50fff5473ed2b48a79cd9b06873fc59b5b4fd9322b35622d94c2ca057f1db0f4e2be62c8043fc9bdedbb822ab5d76dd253 SHA512 66ed3a37a1b0caeee1704afa91f075af8a7dc6536c56da12e38c9e4e3ca510848f9a235a97d4e10e7dc46a2838a6a578863fdf87cab1ae3bd2ac78bc56578b5c
-EBUILD kodi-visualization-projectm-1.2.1.ebuild 732 BLAKE2B 8fe53b114aa9adc38334c521e1592b50fff5473ed2b48a79cd9b06873fc59b5b4fd9322b35622d94c2ca057f1db0f4e2be62c8043fc9bdedbb822ab5d76dd253 SHA512 66ed3a37a1b0caeee1704afa91f075af8a7dc6536c56da12e38c9e4e3ca510848f9a235a97d4e10e7dc46a2838a6a578863fdf87cab1ae3bd2ac78bc56578b5c
 EBUILD kodi-visualization-projectm-2.1.0.ebuild 814 BLAKE2B fd77790e57dab6507fdcc83c2029a7e56e548349c5616927ea874eaf595aeeed965ca748828e23fc3a464a56ed46f500c0056c30316332f4623d3c8a0f1c6d78 SHA512 f10a72588fa5c93ededd7361a0648d83464eea10dcdcb4582360eac559716b510a2905b11626046bdbad38dd47975e4eb9c535ce80238b79526a7974925a913c
 EBUILD kodi-visualization-projectm-2.2.0.ebuild 814 BLAKE2B 76517973886c0518175ce20cd8e9f58ea338a0b9f4533e78313f0ac2dc3f1439ad93f0d342f8948ef27e69f80e328fc82dfb93156ba6b7ed69ec910503ff75af SHA512 61c90555f83f7d7440731c0de1d61a72b970a5c675a19f913d292bb8faded746231416cce63da822ee65f6ce1eeaae441b6819de13a6eb009cd841cf4e380720
-EBUILD kodi-visualization-projectm-9999.ebuild 816 BLAKE2B 44b79eb51e5c066cd454163d76f49b09c214c89b744d71e5401a6598414ecd6b21b04bd149953e8a9c707cac397975aac8cb86e04530b3e9b673226cc46196cf SHA512 1e69d9bfac921de937b912441681af7d31ef977702e340970859d274fd66a2cf3631023f8812d739983a65852f244c636adda7fa9c9e170085a2cc9109b5c40f
+EBUILD kodi-visualization-projectm-9999.ebuild 832 BLAKE2B 48782e3a0a435464c47ad97ce0c7d55496ab3daa73452567ea2bff6b2f498167d43c7270cc204b69a9b733347044a5561d5b2dc34d3a37f5355b73f9648341d2 SHA512 44f0ba8257913e56650acb707a4e6a6b6a2546368ce8848cc491c07e90557ffb08f4908435b25ddf8f96bddeb32b83ef55481f2e25905efecf40691278b72f81
 MISC metadata.xml 438 BLAKE2B 7869da7be1eac18bc4e35672134270f92ae7dc4178edc4b62399dac713fe14eb83fecbb14d8712677d802742eed9d34df1f0eda581117dc0649a929a903ba823 SHA512 2e7259aa9e981c4a6a72e3f055e1475bb140e07785976fa586d8ebef2fe6013fb373cacee9500320cdf0a4cae56486555612ed2d9109415cf9016359b9cdba0a
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-1.2.0.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-1.2.0.ebuild
deleted file mode 100644
index cc8110b82d20..000000000000
--- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-1.2.0.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="ProjectM visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.projectm"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.projectm.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.projectm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.projectm-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	media-libs/libprojectm
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-1.2.1.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-1.2.1.ebuild
deleted file mode 100644
index cc8110b82d20..000000000000
--- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-1.2.1.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
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="ProjectM visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.projectm"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.projectm.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.projectm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.projectm-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	=media-libs/kodi-platform-17*
-	media-libs/libprojectm
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
index f19d564570c0..663819949187 100644
--- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
+++ b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -40,5 +40,5 @@ RDEPEND="
 src_prepare() {
 	# Delete bundled libprojectM
 	rm src/libprojectM -rf || die
-	default
+	cmake-utils_src_prepare
 }
diff --git a/media-plugins/kodi-visualization-shadertoy/Manifest b/media-plugins/kodi-visualization-shadertoy/Manifest
index e5884c51b6af..52c497ddd2ff 100644
--- a/media-plugins/kodi-visualization-shadertoy/Manifest
+++ b/media-plugins/kodi-visualization-shadertoy/Manifest
@@ -6,5 +6,5 @@ EBUILD kodi-visualization-shadertoy-1.1.10.ebuild 733 BLAKE2B b70e59671f5d3a92be
 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
+EBUILD kodi-visualization-shadertoy-9999.ebuild 734 BLAKE2B df26130578666e09bf24a7cc76261569c3e79616a4d95bf54153bb8110ec3fad194b54cd264f1de0669273d0852253b11df64880ea7aea502e91817c6907eb2c SHA512 4eb6df4e12712a14d2e2866f4b7fc921f8de94b7416e88b2b015835e26d353219e486bdc8ecb3f9a4f347ce4b36b5fec4b1035055d46edeadc053191186f5807
 MISC metadata.xml 440 BLAKE2B 8ca7ad0546c9c0590eff12d403b863109b99964ac6d5a9f73d05253ed65719f53ff8a043f1ef1a2f3ce4fb7a06d0e2ad3a5586c49308f22ab7e9690979d88050 SHA512 76e524e7318f8137a70002b265388a1cd107c8e970688ad5616b8895d38108760a06fa3a4e00abe46463ce7d346ef19756237eadb677c4ace52b44bff8a81f17
diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
index a3666ad91cb2..6ba8e7afe389 100644
--- a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
+++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-visualization-spectrum/Manifest b/media-plugins/kodi-visualization-spectrum/Manifest
index 15c05d3f2fe9..6d183b825af5 100644
--- a/media-plugins/kodi-visualization-spectrum/Manifest
+++ b/media-plugins/kodi-visualization-spectrum/Manifest
@@ -4,5 +4,5 @@ DIST kodi-visualization-spectrum-2.0.4.tar.gz 3087543 BLAKE2B c8a40d8c4c71b308ef
 EBUILD kodi-visualization-spectrum-1.1.1.ebuild 672 BLAKE2B 81047ebd915b86eb518afa2459cc2f1203e94e4df524bae8adf1033698e14cc893db3b4d2bb3fa4aebec20268b128844ce475595a12b98c73a897fbfdeaacd8b SHA512 adc631d17f89638df6548fe27cbef9acbe1e1753bed353bc1cbcdbe2a376688260bfa9bdc80c9fab1e991304a2fc9e2ee54bb70f4c36fff122ec605822f83562
 EBUILD kodi-visualization-spectrum-2.0.3.ebuild 662 BLAKE2B 87d284e6e59f235cda37e1b339dc8d1332f32d4e597ef4c9a540bf27e2b65110c6224660fe5e3908d3c9852932544ddcf661fe4c23d668ad6fd28a1eead91a1e SHA512 6b4eed836e15512d719153450f5b4fd73c31b2cedcba9e4d1377ee122abb7d5d273d289dc4565c28eb341610b6d49910e4ab20ac667f359cf8bd818ae3810211
 EBUILD kodi-visualization-spectrum-2.0.4.ebuild 703 BLAKE2B e187602ba9703a33d69a076489a5b7bb00d98615b0c08d63229242593e0dff58e443b8676dda3658cfeb6af8b18a86c6d0bb304b88b7b1b6f554daf9e4754a28 SHA512 99e3037b0591dcf123f2f43ea543f4f996ffafc24ba210f6c781dc81bb56055bc155b16fec94f4a644f34d63c069d9a77c2966063b21cd7a963dbe59c929f386
-EBUILD kodi-visualization-spectrum-9999.ebuild 704 BLAKE2B c7333638eb750c0ffea1adaf9689a6eacb912ab8964547657fd5fd4c61ce2882b5d483981814dfa2d349f663c967612fa9f870ab98025730ddada91c784a6986 SHA512 03885aebce6cde0afd0ef447f0683cadbba12993c5b6c36acf4b87cee2adbc4a4b6a6387188e4b604f37e2b6d98a36be578764b6e35fd736ef575cf011c4fa30
+EBUILD kodi-visualization-spectrum-9999.ebuild 704 BLAKE2B c6bd0cd3252850041fb6d5b420d4aea70077158c45d6df2dce91a58a24c7c6a7ee594aa2b75ada41a35799e743e6c7e0b7aa59fa86d99a20db28a34afd49fdbb SHA512 7f3760863995d09ab82d4f1bd060b00ba7646a47ae8096b0cf24bcd48dae89307d6eb875fbcd5450c19e6c3424b11822feaeb4362873652b840c2021eec6cefb
 MISC metadata.xml 438 BLAKE2B 8662b3f30cdc08223e10e8fc8515a3afb59e199f33e645f1dd011465f2d0b02201f2b64e5aa0c269cde77f20e3ca091d4e72afd817985198da5e3bd8c0f054da SHA512 8d683f5aa11f95edbf8a91e43c85c1882e19400dc55a79116ce9527f9f89ea552da28ccf65ea9aec8a5b166d18638c01def152dcee57fb054575cc636c0f0a0a
diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
index 3ec3bd96f69e..71fdf47e5d4f 100644
--- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
+++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-visualization-starburst/Manifest b/media-plugins/kodi-visualization-starburst/Manifest
index 36ecea229d92..a6c7375adc08 100644
--- a/media-plugins/kodi-visualization-starburst/Manifest
+++ b/media-plugins/kodi-visualization-starburst/Manifest
@@ -1,2 +1,2 @@
-EBUILD kodi-visualization-starburst-9999.ebuild 677 BLAKE2B 478c522772ff1aa0022ec7e34bc2f3c4457b3884b3d33192af903308b6face918368c1dd8dbc7d18298fbf4173178510e510826655165e0108b40781b3977aba SHA512 21e0801e0b4f3777ac83470333c394227f71cc769fb6c1e8a66260270b8c6742a692eec226a451a87a2feda390334efe504c40949e8fe3940aefc06e1a44318e
+EBUILD kodi-visualization-starburst-9999.ebuild 674 BLAKE2B 6ee26bc4da5867293ec27d0b0f6121ca22674caab969179234d6d6bb5c3f59fc5748065854ed551690dd99b6b211c32b8124a17341ea436a614175930877f138 SHA512 5b2c302238a826ac81504d0702a30a7249927ecd3d1f9bfa7b5928d6a6d96d96605016b8107824e259fc65f1b64ebfb085e8c6e7281a9caec3b08daab6071216
 MISC metadata.xml 444 BLAKE2B 5f3221e98532824daa5b94268b4b1891206428444a4d0a82f6d388d05ed28d264171b34b0d13d58099dd0075879f9d0e85f52c80a1311adf75c879358722898a SHA512 c263072074bffb4a1665ebc90aba169c61f836e51d7778c3192b7ba6a370d4eb17691aaa1e3efbc869a4f64e367aea8795e93439e9d82515be443c1f66a77464
diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild
index 4b1bf1f00f4d..044417ae7cd6 100644
--- a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild
+++ b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/kodi-visualization-waveform/Manifest b/media-plugins/kodi-visualization-waveform/Manifest
index 4d6ae6be9a86..9def41a4f38f 100644
--- a/media-plugins/kodi-visualization-waveform/Manifest
+++ b/media-plugins/kodi-visualization-waveform/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-visualization-waveform-1.1.0.tar.gz 42636 BLAKE2B 82a77554c57de7348823fce645fa6bc16bec384c345619997a24c93088b81b5703e20da4cfc3626eb651fe8403564d6aca23861a55adf2e84ba9a82ac5e1d536 SHA512 243696af3388506a52c46c8e636f5cbe973c916e1b03f24ad58327642721cf1a492fb16a7a0e69cd80732b8b435b009862dffca78dc8974f86cbb092a6aff195
 DIST kodi-visualization-waveform-2.0.1.tar.gz 43929 BLAKE2B 5ef24c80ca035ffe92e9c96b8d5a509bca7ce68679bc3e723fcd76b6a5eea70702caa6a8b802b26058131993d8b7f42e41a2cb43073ba2fff65356cdf5e333f3 SHA512 3ba3a3b92d7bbe5e82374daf92fe1054ee80fc316e8b63d0543248406ab7c341831f085f50221aa0bf9ea534c2eb37221c8c165aa553b8c8dbe5cae1b58c3229
-EBUILD kodi-visualization-waveform-1.1.0-r1.ebuild 674 BLAKE2B 8eb70ca28ff280213f446fbb306f5fca23f19c5d4a877a1019eac699f1a4db98ac95ab4a2726237ccc26e24cf4834a81f4717129acf6656449851ed2843b28e5 SHA512 7c69e490b081e6a09397dcb12f2597dbcfeae9d476a73d35e3243ac3a5e61323950dc56e5b89754992a249fd42aa9006c44adc511998937fc87bdac95527e4a2
 EBUILD kodi-visualization-waveform-2.0.1.ebuild 702 BLAKE2B f6fc517ed61febf3197a735e36d0e31b27de4b9ebdde134c59350ef35b71bf7d6dc5d419dcfa597562ccb084f81c8ffe5c1da14fabddb478bed780f2d122dd09 SHA512 9789f3388ecb56378b1a8ce097b06d30c2bca2bb5aff926b127e3935b5c9fd52283a658a4b87213ce57958fa4f4df43ce0b1004418539441f5f206f12cdf5ddd
-EBUILD kodi-visualization-waveform-9999.ebuild 703 BLAKE2B 6533a4bbca2c9b792c8b3770579eebfb95a6802992617e05ab65d33e69da92d8ce942ac070b341289fc5bd7108b4de594ff3b6dbfd36cf269c8c56366329f5f4 SHA512 eb086c9db9eaefc78a30cab4d7b7382dc0f4db0b5efc5863c199c93f034af1a1d0125f5090dd1bac62afb0542d271b06804ad7cde656a80e6d2f6f04ca819530
+EBUILD kodi-visualization-waveform-9999.ebuild 703 BLAKE2B 027bc9bbd5ca08c3faadece3198ffa66336f4823b8b3e85cb9131b731a99d93ddea72a74f93734fece2c39635333795084cdf6066fb7f0bff573347ac2780ac4 SHA512 6c526e04290b2ba17e508f20813f52f1bbc2349942ab62395cd9681d077aa56ec8f6a3bf26159d8150b5327baec34542c1fafb2f7026bedc5d1c07f7bc5f86c3
 MISC metadata.xml 438 BLAKE2B 223c9bc0d06814774f32141ee66b19a512091bbcd1658eacb1a1ecdeaeb2c450ddaaa301f2e6914abaa98d34dfbb456c5bf5a94ac9fadfbf84e75421d6233b45 SHA512 7bb4e6ec9690bfe2742cfe205f1e88db4f51f67bc05ee918ca9e181fb707fae8e75887bea9128a3b2d1e8c6cdf5613599b912816bd9b5093877d311bfec8f851
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-1.1.0-r1.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-1.1.0-r1.ebuild
deleted file mode 100644
index c3e77106f082..000000000000
--- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-1.1.0-r1.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 cmake-utils kodi-addon
-
-DESCRIPTION="Waveform visualizer for Kodi"
-HOMEPAGE="https://github.com/notspiff/visualization.waveform"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/visualization.waveform.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/visualization.waveform/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/visualization.waveform-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-17*
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
index 745379d28395..7b72c55cc1fc 100644
--- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
+++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
diff --git a/media-plugins/mda-lv2/Manifest b/media-plugins/mda-lv2/Manifest
index a06e09da0d3e..f0f3a0ce713b 100644
--- a/media-plugins/mda-lv2/Manifest
+++ b/media-plugins/mda-lv2/Manifest
@@ -1,5 +1,5 @@
 DIST mda-lv2-1.0.0.tar.bz2 2154530 BLAKE2B 4053f7e8c861487ce32fb5e4b94e643084f9a6aa91423011c52c0b8938308abff12a3804b194d7ac2a30a1e5d13e1b69add1b5c18927b4dff687a79b250d42e2 SHA512 3ee521d916eeaec14c64d3cc84d036e3c2152441cb1c266d8971e823a7e498039a210e49af5f1a9a773ac85cb49c620acf64e46a0625c6969f559b4c99786575
 DIST mda-lv2-1.2.2.tar.bz2 2160906 BLAKE2B 2b0660395b3508247558305a1ec80c27c8e23ae4db3fb6eb30a06df54bca822256f712961dbaf9e318966be8f4c90824ea4246499fa2343a59376ef80f862eb5 SHA512 da9960462a896f8412cc1918e3a7c0bf9d33d5431a1264035705ca21295d52de1e6b5360369b9da519376a78f72b0c750d133d89b04240f3e35a210e4551854a
 EBUILD mda-lv2-1.0.0.ebuild 517 BLAKE2B 81cb2ee49daa43b22a5c3e8f38eeffac71b4b633ae20a860f0a146028ba5368850a5323bd4ae549f717c6484ac9407c6cf1e9a62e1065434086a75b1e1a0f3d8 SHA512 345b3c159873e56e2a919082dbff9fdf78295eb05e4b197fabcf68fe0cf2c3ff0c8b9d0d3ff3dd734eb66fc3a7b26e45684ccc75f94219eaa286aa1e731b3ace
-EBUILD mda-lv2-1.2.2.ebuild 528 BLAKE2B 0dc5dc15604f9ef81e89c3f97afdedbb01ef8f2b606ada540bdf9efff6e6ed7a52cc3d9235ec2dafa74fd39e5007596d05746b9f6e4e0c6da70a857ed5c95480 SHA512 a1822ad07c8348bf4c1f1658df908616915052969e14b87eddd44ed4ea0249a77cc87ce3bedced824cf078769e7c345cdc3069bbe494633af6bc25b32334109a
+EBUILD mda-lv2-1.2.2.ebuild 527 BLAKE2B bfd459b9758fb088dab6fa345d13eb19b04e8509dff503a9ddf1fcb2d68fd3171dab9f69a2fd802309b2b3b51d547cad0448689df475a4ebb546c22262a62078 SHA512 08e0869b5355ba2bc3f863db53f12d74e4cebde7a1cddcc331577bd5894cc81aa7ed9e4c8cbc79c663be21da947fbd2c7ba5410a2212a350e539a9a7905d5c47
 MISC metadata.xml 1639 BLAKE2B a4ef48117da13a3372fc3edd7a2f5c5a720e710f192193647842d5f1435d1a6976e6d229845c22e372f30313d6fb47cb1915855c529241e1b7a9bcfbc448d600 SHA512 aab04b98a5b005f186f2f81444f24899a2204a79971deb638b7fb8f4907a622c538fc01d5a606d4471a7650539993ee2b668324834f11dde9479d140d7edee19
diff --git a/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild b/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
index e144613bd492..2b587a9d9efb 100644
--- a/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
+++ b/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="media-libs/lv2"
diff --git a/media-plugins/vdr-dvbhddevice/Manifest b/media-plugins/vdr-dvbhddevice/Manifest
index dd1546cc5afe..acfefa3df494 100644
--- a/media-plugins/vdr-dvbhddevice/Manifest
+++ b/media-plugins/vdr-dvbhddevice/Manifest
@@ -1,6 +1,9 @@
+AUX define_AUDIO_GET_PTS.patch 360 BLAKE2B 59b15a5667e71df36ffca863dbcc5952ee9cc813c715fa4affd93de1a1988a5ce0e7d323739013e47567f96576c05292ba82ed2a44a4328139320467dbe201ad SHA512 16b020c92b33c481ea7b41205f048870df2bd3ae38cd5ba388a505e43d9893c20de7baa5aa298de42d83276d01630eb6a1ac949b18aee5226869b2b57264b5cc
 DIST dvbhddevice-2.1.3_p20140115.tar.gz 40424 BLAKE2B 99d5fece7557c7c9f2b0174c9b1f01ac7628f0f0b6aa954f3e829de4653e10cbed6d0516b966f69737aff9ffafd224b3558bd868e972b64ab60c965ba569555a SHA512 29729325affec5e1330cf361a0c82ee5ef9f48f9a6a5032881b331a6451c05c8d99831c43e3eb08129053a7549dd4cd73a5e0afc6fe04d35956c8fecad48d2f4
 DIST vdr-dvbhddevice-2.1.6_p20141116.tar.gz 40902 BLAKE2B 60829c76226c1f0254ac6cdd940fcbcbf08d4cf0a50bfd9ab992db80f63f07389ab29cd4a04aec6319744a39e86cce7dbfee240ab77e819726facd9dbc6d7964 SHA512 0189cf5bfd1d9648915ec65427b4eeeb85ac80281a07a910e65381d86913c37d5840abd8984f17028afe63eae457c7ce398a446e3ad4b70ae4deada316c14b5b
+DIST vdr-dvbhddevice-2.2.0_p20180420.tar.gz 42772 BLAKE2B c70842be34181b15aab69f5a62ba98f4cc72ad5148db684a45ae5c6b74431517b70cda72dbfb6abc371675fd2742f86000b02c645bfba5b6a6b64817f5c59b35 SHA512 bc6ede24897a7704ecefcfdca92eeaf1bf9f8ed2410a478a21cc712730bfe94616c01379a172214f664481fba636ee3aea33540a6cf258597015dfb73720c408
 EBUILD vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild 1044 BLAKE2B 2bd45c2b8c14ee05aa378c7252f04470f66ce4724adaa5a55ce7eaf9ee15d893c80ccc77eabd29514243269192458ee41ecbfc2a6698967f78584b1b05e219d0 SHA512 8740268eb2f76b2625deaca9eccfa70df15b0322951e3ddda633f577dd9ee0ad3b4db4dc92479b6e704aea5269856c60cf0d045df8d09f0805b295c735d3c52e
 EBUILD vdr-dvbhddevice-2.1.3_p20140115.ebuild 842 BLAKE2B c487d9dc3d33893c57612bb0b0e29e0a2c3863675f4f0b2c45a1b62df449e07ecf7ad66a4f90febd8437ce6a822a396ad4aa6b8835aaa5bb38cea07edac5412b SHA512 ecda86c62b7f9049222f8714ce3e4d159e7d94cdb6ddf98669172c5ee2458d3c9245efd4127044d7feeb0b9de6da5251c7d98584c603f457c3cba12df4e0b8e6
 EBUILD vdr-dvbhddevice-2.1.6_p20141116-r1.ebuild 1004 BLAKE2B eef06e5956e37469ce7cc895cdf6d0bb1267dd181127c83ddb8b30ef7b85d3829a713bde5799299134135967e9fd46b378bf7c1ca24d1485702b559316b4816d SHA512 2e9b744bae3e1f0754bfb321af762422258effca238e2e6092fd7895923225eb6ed9415dc4cd835b89eb866013df59624a5acff9725bd862385d756115b79b58
-MISC metadata.xml 347 BLAKE2B 753b1fe019258fc38b15a39c9cca1c99c2048330e4126ec70473ea9801a3af52484efc92afec8c5d0120c79081e9dd966a399f9daad5af4a3c4826f43cc96837 SHA512 97f8bbb17d1fb015e5eaf9903da1f49a98018ba361abbde44ac759076a9947ace147d7a7f6f35ccf7e26b428e1c3279605fac36239117974b2c4e98f3f6d5c2a
+EBUILD vdr-dvbhddevice-2.2.0_p20180420.ebuild 864 BLAKE2B caee5aed7525c2ca82f14567c3171fe3c1e4fbe75c1354a5188c334ef24e19204689efa788d001627e39842a8d0245843112ecaea5e306490b20fc4cfae71659 SHA512 e77fbd39d863137ca39d36e0a859c002e2a10cf8a0a06d45432c481aba7a1af19b2c599180f81c962204084e4e506206261621031effc271974eef2e79808e0c
+MISC metadata.xml 565 BLAKE2B a629f35ce42591e8d978f8a6d5876f709fecbbef016776b2f7dbbac1c35dd4b22507398532db75be26b84cf4d0bc611bdcfe7e8219c11918be6bfb2e5580e96c SHA512 1d507d140eab426dc90ef53fe5f842f97128052a6c6ec27eb09fc5ccf23378e76567a59ee7830d8f195b0557308e67286144855ec22e28f8a113c700d8e53d59
diff --git a/media-plugins/vdr-dvbhddevice/files/define_AUDIO_GET_PTS.patch b/media-plugins/vdr-dvbhddevice/files/define_AUDIO_GET_PTS.patch
new file mode 100644
index 000000000000..4107608797f5
--- /dev/null
+++ b/media-plugins/vdr-dvbhddevice/files/define_AUDIO_GET_PTS.patch
@@ -0,0 +1,11 @@
+--- a/dvbhdffdevice.h	2018-10-10 09:03:47.464147905 +0200
++++ b/dvbhdffdevice.h	2018-10-10 09:04:59.353350738 +0200
+@@ -4,6 +4,9 @@
+  * See the README file for copyright information and how to reach the author.
+  */
+ 
++#ifndef AUDIO_GET_PTS
++#define AUDIO_GET_PTS              _IOR('o', 19, __u64)
++#endif
+ #ifndef __DVBHDFFDEVICE_H
+ #define __DVBHDFFDEVICE_H
diff --git a/media-plugins/vdr-dvbhddevice/metadata.xml b/media-plugins/vdr-dvbhddevice/metadata.xml
index 2223ff4c5ead..25143612c470 100644
--- a/media-plugins/vdr-dvbhddevice/metadata.xml
+++ b/media-plugins/vdr-dvbhddevice/metadata.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>vdr@gentoo.org</email>
-    <name>Gentoo VDR Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="bitbucket">powARman/dvbhddevice</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">powARman/dvbhddevice</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild
new file mode 100644
index 000000000000..9f21531f038a
--- /dev/null
+++ b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+HG_REVISION="2ea854ae8c7a"
+HG_REVISION_DATE="20180420"
+
+DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend
+S2-6400 DVB Card"
+HOMEPAGE="https://bitbucket.org/powARman/dvbhddevice"
+SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${HG_REVISION}.tar.gz ->
+		${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-2.0.0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/powARman-${VDRPLUGIN}-${HG_REVISION}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	eapply "${FILESDIR}/define_AUDIO_GET_PTS.patch"
+	fix_vdr_libsi_include dvbhdffdevice.c
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	doheader dvbhdffdevice.h hdffcmd.h
+	insinto /usr/include/libhdffcmd
+	doins libhdffcmd/*.h
+}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 23f45b6c105d..535e1533c39b 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/dxcc/Manifest b/media-radio/dxcc/Manifest
index ae8df714d3fa..61121e82d6b9 100644
--- a/media-radio/dxcc/Manifest
+++ b/media-radio/dxcc/Manifest
@@ -3,5 +3,5 @@ AUX dxcc-20190309-Makefile.patch 919 BLAKE2B 457e5178742fb6247a0769df96ec65b3c80
 DIST dxcc-20080225.tar.gz 110774 BLAKE2B 45673644fc3fdc0eb3ec072df64ee79441a1c7e5afcbce7e5b33c159eef75c254fe2796086fe9a1781293e8a1671e9cfe872f6ef8446d34f6168ec9cbd9f9fcc SHA512 ef976d5c94b488d3dec132850f9c4da34caf02eee77a8c38a3fce5ccb033ffb848d5814eb72756d04235b9cc454f17f4c31aa47295c9e9cecec716ff32bf3df7
 DIST dxcc-20190309.tar.gz 175488 BLAKE2B 46ef8e87e0c70b4d58f3a6533f651aff078502705206f145dc25b5380db0019faa49dbb9003896c4ace33f35d59b349155bb77584d235700ea4532f71744fb44 SHA512 c7bad51ade05d60aa077b24c87bf5370728038503e190808eb774b307089269fe21d068f86487455ec1b23e5b90a560ef53794834ffe7e6eefc6fd78effdec21
 EBUILD dxcc-20080225-r1.ebuild 513 BLAKE2B 3b299ad409dafcb006b54521cf35328563a450e69e540576616fe6b00f372d4f535672a3e724e527b19714546b7d298a8a8c6db31a069bd9367603ef6886d45d SHA512 edb644fb8adbf188e7cc5ec6f0d2e043808b777ca3023ed7aae9e74028a39b22b9b3488540f26c9e6b4e17887d5d422736bd8db245926830873cba8f9673f3fb
-EBUILD dxcc-20190309.ebuild 488 BLAKE2B 41efbd39845de0aab544324db3ee3bd524fe38342e0ddf14edefbd26f9d77ccd5995045ae0bbfebc7068ca2c2ab7549ab911ba3860479cb1559200b5bbc88193 SHA512 53357c397fa7bf6bfb46beeddabd309f77830ec1d4cdfd2b5886c3c648a42166680d4f8e92ad6b10463328fd3f71cd2f4ca8d9186f719aa02aca7d380a3130b0
+EBUILD dxcc-20190309.ebuild 486 BLAKE2B df95d11696f305009e3ace3edb3cf115a152c90c1b6e5db58f7616df21a0c64c4f88ee57c12c4e511ba64114d15fa0d3f1f867fdc18cdd1a8f1fa5c26465edaf SHA512 bccf02d2b8b67d7374cccc137400b08f9aeb1fb54d04f26cfe89e6e78a5c1919c61e885801c088cf4ef9eeb84fdeb9f2fd37d9aaa3f641fd1185b5bc52be3e92
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/dxcc/dxcc-20190309.ebuild b/media-radio/dxcc/dxcc-20190309.ebuild
index 15db7073ef8c..0a84f1ca439a 100644
--- a/media-radio/dxcc/dxcc-20190309.ebuild
+++ b/media-radio/dxcc/dxcc-20190309.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://fkurz.net/ham/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="tk"
 
 RDEPEND="dev-lang/perl
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index b515b9701b4e..542a679cb14e 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,14 +1,6 @@
 AUX fldigi-c++11.patch 1140 BLAKE2B 987d33126e80340d7687cc1e346a8cc8b5701c9f6a4259357c08c8ab828eb71d871e1bb70652f4d35a57243fbb0738db2c59717a822f178bf2c7afb960305c42 SHA512 a2399caf67947b129d32563d3deb0f209f0814e39ea48ea46f664bacf7b64a2639f9c237889004af45df6553ef5668ec9d5c389d3ea7a6fb9922f54654bcc9ee
-DIST fldigi-4.1.01.tar.gz 3916445 BLAKE2B 53fe35d579ea7ac5c62fa83af794c6b1f36a40ae9bc65d19b20f5a923a3c45a79a866eb0e7cda12d3bba713f371115142aef6dca5afefc301d331403a6c7667f SHA512 f0fa33714b56d396dea59511083546765a34c645aa03875d0c6bb38af89ff79ecad6b5556895a6615d18b6340d50d94beb69e92c4a488fed346863fa1e378633
-DIST fldigi-4.1.02.tar.gz 4681621 BLAKE2B d9ec93332d26f1db959f5d56388ebba63dd68aa78b1e68131a7c292326a734c361d5b564c34b540887dc2c10194c3ea69e564a69a46b06f2e4973df69c1462ef SHA512 2c99718062231b7ced1695075ffb2dfd7f628a712561c5dc9cbfb73c6b0282d54bddc1e8e417912368aba5165296e55ab1b02e122d8d0e5b213b5b9c39a9f87f
-DIST fldigi-4.1.03.tar.gz 4682813 BLAKE2B cf9f032844c46de1e6712e2bfdebe624693f873eed9e9babd21f0dbaee70348ddf8d3fd235b2e3b9fc3d99ca1432c5d7b62a4bb2d4fdb25a5841ee451c9ff1ca SHA512 058089fcc3aeef688ba867159b0d7d8ebd1e13c7164db95b0aacadec7509b8a76d415e86783197d009e575bff168a86152066f8454b87274b746bfaaf43a9f94
-DIST fldigi-4.1.04.tar.gz 4689833 BLAKE2B 7d793f8dba75320e02f2f432c69573638dc4ba495859d78a368c90bb353e8aaa06cc71a4f7275bde40670fcf5ef8b4d17ea0133e87a399f880a89d444f32230a SHA512 fba42a60ed9e524f3387f9911d5734749afa11e941a7d002ad519a5019fafafdb3c4d91416f5b51c73ba3d20bd9c18d3cfb0863bc21ca715d6197b559c56ed25
-DIST fldigi-4.1.05.tar.gz 4636043 BLAKE2B f0378dbddba91f31eed49c2465b4fea68e3a4553ad5ab4c758d815dc06b84b1db26c81ebfc49b3e25d93e1225a0d4e09d34b57c61a0c549017a36b6c5d1e4756 SHA512 079f6404117381dbfef3ffcf31de527a6edb8d46223e00c8f331d860008ad737e8d51bd0cc18242e34c6835f92cb35887807a7089b40a70f8ebf83c626e84a55
 DIST fldigi-4.1.06.tar.gz 4633753 BLAKE2B 2eed9be5c1e0d0fdb29b9a2d5b7c7eedca7cdb5dc9149532776083cd56d67cbbfea1760f2287d9de2880508e950c4a87e96b4d818f56b3ce4f2f4025057eb54e SHA512 fc3ef66e9ce8c231af27d17f098e1767ba35038afac124be2a1db846246bf2e6d86ba078cd82e28d73b7389079eff87545c2f3e81bef95c525b90a8886c612be
-EBUILD fldigi-4.1.01.ebuild 1288 BLAKE2B cfdfc65149ae821a9c8ea5a56ae7876999115e74dff72f4ed92b0a988b625ffd689d7eb23c0f06297ab4b2f144f5437a8a0765f7b6bd54677cef3ea951050196 SHA512 05654807edbb91a8d35073962f8d525e498bd3c233949759cb8ca1f4abebf3b02c3ec60b5c87c070bb5ec64ab00bb3b58528ddcb8f8ed2c43d6e81384c5ee8f6
-EBUILD fldigi-4.1.02.ebuild 1290 BLAKE2B ec9e779275fed3b2c5b7464a2b1062b1a4ab98290e78449b47687e2fb2fa7b4adfaea6533607976af298a84ad2844c507d9765f2e37463b6051abebc929be497 SHA512 b86cf76fe0ae34cd02285f5ed1da2abf09081017f9213d7ffdc299f8195e94c31556da0303a308c2a9a9e1cbcc0101f51c54b4159f3aefa7158592363caf75f7
-EBUILD fldigi-4.1.03.ebuild 1290 BLAKE2B ec9e779275fed3b2c5b7464a2b1062b1a4ab98290e78449b47687e2fb2fa7b4adfaea6533607976af298a84ad2844c507d9765f2e37463b6051abebc929be497 SHA512 b86cf76fe0ae34cd02285f5ed1da2abf09081017f9213d7ffdc299f8195e94c31556da0303a308c2a9a9e1cbcc0101f51c54b4159f3aefa7158592363caf75f7
-EBUILD fldigi-4.1.04.ebuild 1290 BLAKE2B 3a7295846fc1523f1ffa312e4cdc010adab6c0f72639f5976130df3caa4b8a8e111c72473ab979d636c86e901929cdc89ce46bf364a305f6095858d3800b3c20 SHA512 2490596ae8f595473f2343ef7b20d26a40e1dedbc0af85c119711a342243fd590b5b37849055426ea9cc8e72867cb4d2db197643265e01c7bd51d2c8d1091dc9
-EBUILD fldigi-4.1.05.ebuild 1290 BLAKE2B 3a7295846fc1523f1ffa312e4cdc010adab6c0f72639f5976130df3caa4b8a8e111c72473ab979d636c86e901929cdc89ce46bf364a305f6095858d3800b3c20 SHA512 2490596ae8f595473f2343ef7b20d26a40e1dedbc0af85c119711a342243fd590b5b37849055426ea9cc8e72867cb4d2db197643265e01c7bd51d2c8d1091dc9
-EBUILD fldigi-4.1.06.ebuild 1290 BLAKE2B 3a7295846fc1523f1ffa312e4cdc010adab6c0f72639f5976130df3caa4b8a8e111c72473ab979d636c86e901929cdc89ce46bf364a305f6095858d3800b3c20 SHA512 2490596ae8f595473f2343ef7b20d26a40e1dedbc0af85c119711a342243fd590b5b37849055426ea9cc8e72867cb4d2db197643265e01c7bd51d2c8d1091dc9
+DIST fldigi-4.1.08.tar.gz 4633597 BLAKE2B 853569115aa33e768a4e7a9caba0675dfc8235bdc889317d44f2d3896c287f7117ef6983b8e41be5ec4d967cabb1c7a506a1488aa200cdab6aabef48c24986b3 SHA512 e1262aa87ddeed0618cd74327696ef9542afc3c6c4529db0224d8278ef8a270f83c51a64b0957d17f6ada07ba0d99bdd4124e453e3d0268ffa283e90fbe322d2
+EBUILD fldigi-4.1.06.ebuild 1288 BLAKE2B 335fba25a3c2809814737f583b8db2e6651b4c4b04c938666f466cf18a4ae432edb1c5194dc33aad0d306cb74a12a26e529b8fadebed3f531a79dde41799efb1 SHA512 ebdf9ae81997d15d7817c3d065541cc2b2f2e2cc20972a0c5462912a95b12bc793c8e14f851b029a32e4ee3c623b0f44dff69be76b8e5cb8a5854de758e027b2
+EBUILD fldigi-4.1.08.ebuild 1290 BLAKE2B 3a7295846fc1523f1ffa312e4cdc010adab6c0f72639f5976130df3caa4b8a8e111c72473ab979d636c86e901929cdc89ce46bf364a305f6095858d3800b3c20 SHA512 2490596ae8f595473f2343ef7b20d26a40e1dedbc0af85c119711a342243fd590b5b37849055426ea9cc8e72867cb4d2db197643265e01c7bd51d2c8d1091dc9
 MISC metadata.xml 495 BLAKE2B 9c6f1b29ffb13a553b74ded93c11d29ffdc5a02336adb8fef55b862800a1856e712cdcb06c4e7d90858712d43aafce79f6cf9a357dc0a3c3ca0fc5cdb0ff770e SHA512 fdd9bc3f065ccb354ed0ad5c6544ca70f2011828870b942f2bf2f7001bf1342f858d60a6031cf005623795d1f1d2ccbc3a42fb54dcbd465c3c73f29a928d9091
diff --git a/media-radio/fldigi/fldigi-4.1.01.ebuild b/media-radio/fldigi/fldigi-4.1.01.ebuild
deleted file mode 100644
index 008a39f15d77..000000000000
--- a/media-radio/fldigi/fldigi-4.1.01.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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-radio/fldigi/fldigi-4.1.02.ebuild b/media-radio/fldigi/fldigi-4.1.02.ebuild
deleted file mode 100644
index 8f56029eafdc..000000000000
--- a/media-radio/fldigi/fldigi-4.1.02.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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-radio/fldigi/fldigi-4.1.03.ebuild b/media-radio/fldigi/fldigi-4.1.03.ebuild
deleted file mode 100644
index 8f56029eafdc..000000000000
--- a/media-radio/fldigi/fldigi-4.1.03.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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-radio/fldigi/fldigi-4.1.05.ebuild b/media-radio/fldigi/fldigi-4.1.05.ebuild
deleted file mode 100644
index 17d2911234fa..000000000000
--- a/media-radio/fldigi/fldigi-4.1.05.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.06.ebuild b/media-radio/fldigi/fldigi-4.1.06.ebuild
index 17d2911234fa..f29b642e623f 100644
--- a/media-radio/fldigi/fldigi-4.1.06.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.06.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="hamlib nls pulseaudio"
 IUSE_CPU_FLAGS=" sse sse2 sse3"
 IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
diff --git a/media-radio/fldigi/fldigi-4.1.04.ebuild b/media-radio/fldigi/fldigi-4.1.08.ebuild
index 17d2911234fa..17d2911234fa 100644
--- a/media-radio/fldigi/fldigi-4.1.04.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.08.ebuild
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index 9bf4c5df1834..582597ae92b5 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,12 +1,6 @@
 AUX fix-bashism.patch 547 BLAKE2B b04673f95b56dc9258b2953e90aabf81b2ef3d2b7bc7e3aee736dad07c96bbb962ddb37061713ddebf39f543bc1ad46c2667345660e07aed37576487e95d8dd8 SHA512 4e37cac97a340171fbe995fa17b63827e278ce1b46fdafbd82ed03c5967565e1e09348d43fec9801a500e3d3793dde3111fb4c3bd4b0541cb2a0696e78f645a9
-DIST flrig-1.3.42.tar.gz 785256 BLAKE2B 43e4053b4d12ec436294aca5dc096b2fe81673635924f3a7adef4e3fe6529d4577e1c69b1aed847142878dd9ee5b673c098e1f47c590d887632b6dda7ebd9fa7 SHA512 5787f61c5a5c55bd3c5a2c1876582d2cd02a5b1e689c40a6854fd26cb0df9e1e3260325d721dd91ac23cc3cc4c790ffcecfdc98659d4ae62dbcfb8275318f9a4
-DIST flrig-1.3.43.tar.gz 792283 BLAKE2B 28055c13e5d930913825ca75481f93a91b553f74cdfb4af1b8d136223b6d46ae0c3864e0772730fd9538e79ebede8314a4f18b6de06bbd0a9e8a33ba5d5b7c0a SHA512 a4e769ef0358e82b882a47416841d044024373fdea0f1bc576d7c0f91593a166388d315165563f2b9ebd8f999f24df1a6192978c21adb1d01443334f5053a2c5
-DIST flrig-1.3.44.tar.gz 792305 BLAKE2B 8fe7292045eddd5f1e5adc7cf54edf5acf5d4d2a0635d7b22f1ab9009b3c9e8f89afccff6924ddd21e4a91490f7d80cd27f37588f55b4556fb671b055e11572a SHA512 0b7cc12411a4e6b197975e047c55c55590975600904e40dfe7192f0a131347f459e6fc4f778ecd1cb0e5dc89174af4d4fa7f566a4015a8e6b8e8bf86966d5937
-DIST flrig-1.3.45.tar.gz 799650 BLAKE2B 013ed1205dde577593cd644bcb65e17a68e450f9e7c882cbf141db26890105fdc2777f9e3ac25035d54297020b12d9fb9be643f089ae8afa1a7b6d33a00cf325 SHA512 966e5113313c1d2dfa4e3a86dac247be44ede8576d8a4ac88f12d5cac9d247e03ba62710126fcf153f78f72045ed6ffaa3536b2b2d4b7a7418a44895c7d67b4b
 DIST flrig-1.3.46.tar.gz 813126 BLAKE2B e88186958eb7f4492a564135144d77abae782e8d249c9678663625a0cab9b9f716f1fa616062eecfb8b0c26952e2399a9120cc0a7ddcc5ad43f8bfdde400afde SHA512 e5d02632806d5f899abecc84fe7f8d1610153ace260d9c812221a37a781dd9dffe48602507f798c98d510d79657f4deec69ce2e1513f7b51f3d60888d9c07071
-EBUILD flrig-1.3.42.ebuild 583 BLAKE2B 8edc5d77cb5e7f30f60ebc2ed75bc25324c5f66e84a15c7ff3ebac0d639bdacffa0f5659ab678b4c653a2c86473458c02968672a1cbc9c3dfcdc96739c36a927 SHA512 565f552847addee93ad7e897a06d4fe50c6438ca4b2ea8b546c4315aa0bda9478e9cd0cd002300b66651dce807afacc21cef7a5b79db227bd4607fd5c27062ed
-EBUILD flrig-1.3.43.ebuild 585 BLAKE2B a381a713c336b70d51a070b54307aa022a00ee995cdda63413b324c7674a790e5cd5b4ee389da78c61662406a098fbfbe42aaddc6ca60f1b4debd134286c591f SHA512 51af267974b437e74f12ab762cb029c8453fdb55f46efe7d932dac2568aad7d674d25df3c07f8adaa39d972d8f6af758492820ec41cd9ac774315679543c3a9a
-EBUILD flrig-1.3.44.ebuild 585 BLAKE2B edc49c5ae640ace981cd71b734dd194ee2c9b2163ad86fcd022844c37553553992f133d5d9e47f81f97c834a87b3cb04a89a9e39c28c406516a7328bc279f555 SHA512 3f90f1dbff22b366b3d89a46831671c5a23b78fb7736f246cc1634b506bd45fdb26d68b67eb44c6742b74b6c40d8ab22e29376496669cd7dfc7118af8252a1b4
-EBUILD flrig-1.3.45.ebuild 585 BLAKE2B edc49c5ae640ace981cd71b734dd194ee2c9b2163ad86fcd022844c37553553992f133d5d9e47f81f97c834a87b3cb04a89a9e39c28c406516a7328bc279f555 SHA512 3f90f1dbff22b366b3d89a46831671c5a23b78fb7736f246cc1634b506bd45fdb26d68b67eb44c6742b74b6c40d8ab22e29376496669cd7dfc7118af8252a1b4
-EBUILD flrig-1.3.46.ebuild 585 BLAKE2B edc49c5ae640ace981cd71b734dd194ee2c9b2163ad86fcd022844c37553553992f133d5d9e47f81f97c834a87b3cb04a89a9e39c28c406516a7328bc279f555 SHA512 3f90f1dbff22b366b3d89a46831671c5a23b78fb7736f246cc1634b506bd45fdb26d68b67eb44c6742b74b6c40d8ab22e29376496669cd7dfc7118af8252a1b4
+DIST flrig-1.3.48.tar.gz 813746 BLAKE2B f86effa913ade23c50c3e1fb663e0c9daff0aaefa0e4457e10e1ac67a666e548dc1668a6e1a496cc1407a267e8f047829dcee1b0930fd1db04b28c2458a3da69 SHA512 2336c3ccb4112cea52daf07d2fdf0ced400c3b32e82b13faa8287fdac0634ac8f4596f4cd0efc8b30083a16859539d9da066c51f74f32e05d77bf02bbcdb087e
+EBUILD flrig-1.3.46.ebuild 583 BLAKE2B d01710a47858736fb029b80964358f04fc97e1ae43910dd30bcfe9215a7b25f1d12f6cb2c3770b955842a3b556f3dd42bd5f57dbd42207b50190a69175220109 SHA512 abd6e1edcec87c95f922b66225286ed16134e57ec8a304bd38a7cb52ae5190f3042dabac4629a7d41d870d444f32e485208c769f57fd79c00625d67e1d67ba79
+EBUILD flrig-1.3.48.ebuild 585 BLAKE2B edc49c5ae640ace981cd71b734dd194ee2c9b2163ad86fcd022844c37553553992f133d5d9e47f81f97c834a87b3cb04a89a9e39c28c406516a7328bc279f555 SHA512 3f90f1dbff22b366b3d89a46831671c5a23b78fb7736f246cc1634b506bd45fdb26d68b67eb44c6742b74b6c40d8ab22e29376496669cd7dfc7118af8252a1b4
 MISC metadata.xml 325 BLAKE2B c4c98ed723dff91c8935c44ee552e25a08366edb7b73593d29d790622a49e130ef56137de21e1df16e1f968b1d5a0c984ce6df5b817a39f38523fb71353a3e1f SHA512 ca601e14e79450d08e0679e86827071a323fbc60cdf89412257747490046ca6efb2e78ae27f69c0e3ad449427049a35d478f2a7524a0606658ef9b302d9c0d43
diff --git a/media-radio/flrig/flrig-1.3.42.ebuild b/media-radio/flrig/flrig-1.3.42.ebuild
deleted file mode 100644
index f78c12ba1736..000000000000
--- a/media-radio/flrig/flrig-1.3.42.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-DOCS=(AUTHORS ChangeLog README)
-
-RDEPEND="x11-libs/libX11
-	x11-libs/fltk:1
-	x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_prepare() {
-	eapply_user
-	eapply -p0 "${FILESDIR}"/fix-bashism.patch
-	eautoreconf
-}
diff --git a/media-radio/flrig/flrig-1.3.43.ebuild b/media-radio/flrig/flrig-1.3.43.ebuild
deleted file mode 100644
index 00d3b2ed3ff1..000000000000
--- a/media-radio/flrig/flrig-1.3.43.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-DOCS=(AUTHORS ChangeLog README)
-
-RDEPEND="x11-libs/libX11
-	x11-libs/fltk:1
-	x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_prepare() {
-	eapply_user
-	eapply -p0 "${FILESDIR}"/fix-bashism.patch
-	eautoreconf
-}
diff --git a/media-radio/flrig/flrig-1.3.45.ebuild b/media-radio/flrig/flrig-1.3.45.ebuild
deleted file mode 100644
index 5020c2bffaf7..000000000000
--- a/media-radio/flrig/flrig-1.3.45.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-DOCS=(AUTHORS ChangeLog README)
-
-RDEPEND="x11-libs/libX11
-	x11-libs/fltk:1
-	x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_prepare() {
-	eapply_user
-	eapply -p0 "${FILESDIR}"/fix-bashism.patch
-	eautoreconf
-}
diff --git a/media-radio/flrig/flrig-1.3.46.ebuild b/media-radio/flrig/flrig-1.3.46.ebuild
index 5020c2bffaf7..e6f8b25a04c3 100644
--- a/media-radio/flrig/flrig-1.3.46.ebuild
+++ b/media-radio/flrig/flrig-1.3.46.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 DOCS=(AUTHORS ChangeLog README)
diff --git a/media-radio/flrig/flrig-1.3.44.ebuild b/media-radio/flrig/flrig-1.3.48.ebuild
index 5020c2bffaf7..5020c2bffaf7 100644
--- a/media-radio/flrig/flrig-1.3.44.ebuild
+++ b/media-radio/flrig/flrig-1.3.48.ebuild
diff --git a/media-radio/qrq/Manifest b/media-radio/qrq/Manifest
index 40c483c264e9..544a710292c9 100644
--- a/media-radio/qrq/Manifest
+++ b/media-radio/qrq/Manifest
@@ -5,5 +5,5 @@ DIST qrq-0.3.2.tar.gz 132546 BLAKE2B a19be5742deb719471c43e873c387995ab51a776d0f
 DIST qrq-0.3.3.tar.gz 159832 BLAKE2B 7af974175777f6166303ece0e0cfa0a035d49e0c265cd513b771a280dc7ac0772a979f45923a14737ff58a64147f8c97a3978ccd7e4cd81fe4a38f3156766057 SHA512 025f0a350600a9f3f24cb00afcaa0e99c0be881e40684cc7ccbb9927d883372336c0b668bae21f232ce52dd221eb4ed950d306a32bab34e65f9f3cba9f28a484
 EBUILD qrq-0.3.1-r1.ebuild 940 BLAKE2B 14bb28d8fe65d5c50a513bb7bdf93efeefa10d8903de614c608a534384c53ba8b25b01db7c19119e96ac8a4a18eb26b2d83ae397098b8d3f77a7db057dfd0916 SHA512 d6aac6e98701cd5f95e0b166abfc46f614262a2a598fa40b645131a1208ec308327af3a5775503f66aa075cec3adb7ae68ebd7abacfd3dd9bde354dc8a2955ed
 EBUILD qrq-0.3.2.ebuild 872 BLAKE2B 5b585a3327491e70e62b7353533cbc8e2e220a89d869ef0e974fcd41efe392b2b57ef2db57e7d85623bfecc892257e3e7a38a2c149089521949b3b11e695abba SHA512 e71ea9543b733b2204bc14ed41fb0f074ae1e393ffb67ce377a553744ccaa32850a554d538db2728c6ea2738b743a9533bdd2bab672b86c8853ac8dbfb6dc7cd
-EBUILD qrq-0.3.3.ebuild 879 BLAKE2B ca27593c478c80c19e75e946c0dda6f87f44e5ffea9da2b3ff7306c66415e4980fdaf9bf40077c1d08b3b2af82919b69ff37a13de48bd9da0bb98e1e849d96e2 SHA512 ac2f908216b74218d9c0d39d6860063fe65ee98fd82bb7092be9640c19d90477c481fc887723549ff864508cd7a48bf8697e66422ff130c2cff67e7c5029cf42
+EBUILD qrq-0.3.3.ebuild 877 BLAKE2B f8e4bb17454196463e77f5dfd3751749ee72f96e8de6ebf692afe0f4fc92d7b53a47fc19b8b4947e7b6e9424f479743a0c6c8d6891774fb9f88e8744dfb2a61c SHA512 0bbb9845fbba79a6222464ede0b6e40f5727dc349044c8b8912b2523a2a8e9207dc308ea8860ff56ba004125387c670ebeedd106ed39fbea956c900626bcf116
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/qrq/qrq-0.3.3.ebuild b/media-radio/qrq/qrq-0.3.3.ebuild
index f718c220fa2f..18cee98d5be7 100644
--- a/media-radio/qrq/qrq-0.3.3.ebuild
+++ b/media-radio/qrq/qrq-0.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fkurz.net/ham/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pulseaudio"
 
 DEPEND="sys-libs/ncurses:=
diff --git a/media-radio/qsstv/Manifest b/media-radio/qsstv/Manifest
index d16c5579e079..29f6ce989825 100644
--- a/media-radio/qsstv/Manifest
+++ b/media-radio/qsstv/Manifest
@@ -1,5 +1,5 @@
 DIST qsstv_9.2.6.tar.gz 11385735 BLAKE2B b7192255a3df32d5fbf07f54e1a8b7a7fd092fc4f7cca794df66d73687342e2169cdf8a2e08e7d665e6c27cefa3e9e4574c10c685cc9647caae1156d5c88522f SHA512 10ad86db8a4db432dc757314375487d4128a612a54496105c2acaadce4f2cba8d044f1c5bf1d38534664ef7c065742606027306b3542ae834673ffce58885557
 DIST qsstv_9.4.2.tar.gz 7409123 BLAKE2B d20c81f8a84ffc21d2afa2f481f2aa5313668beb922fe27e97b8b68f9420edad4544358b6166296183e2b8806f32bba54e25a035ec82481ed24a3dc1c343694e SHA512 e7e5fe925dd925fef4e2fcff15b33634aa0ea1f50ca01db2c2dcdd428b4c4c1f45cf5aaa9ad2c3b9374c588bb6f65bf99924537012ecf2065a03b3f4d1c46db9
 EBUILD qsstv-9.2.6.ebuild 1011 BLAKE2B d24f2e9717a4532f25e7f0428948186cf8f94a1a85c668f944a7450118a35c22a4ce72927b16fd7d94588ddc324ec904b199cd7a87eafd6feb4b588adbc66271 SHA512 26a7cda1fca6b68af89406b4764cc6df62e39d0465f30fc8d95268c63a89dfd700f71be28c2ec30d8e8f6e6041c8440cc6f202ff334e1169503d8a5947872b1a
-EBUILD qsstv-9.4.2.ebuild 1024 BLAKE2B f348d81601411138e40afacb047bc2f94807970f3ed04364df930e619adb38b63aaee46047c3c6c485159e8475fee247a531b921718886a645133ad63c1e7dd2 SHA512 d7951062d18bcd4505286206146cdaf01f37e85b0efc350f7f6883dc9bc72707dc748774e682f440d8d9c927461a6595076a0386252e5ca966560d0e4fa86b5c
+EBUILD qsstv-9.4.2.ebuild 1022 BLAKE2B 44dccc88a935574850e264d856b3afacdfe0c8f65e6384b71fa2003691ae52d82a47091ea8fc2def42e10fd2404f9ebc947de07b9c8c93a9e80da50dc7ca87f4 SHA512 4e4016ce9adddef9ff6c34f1ca9dc5a875165800ff1d7ad503023289e79ca0a10929faa895afd80b3bea15e516907a2232b3f65df26c93f55121831138e6c913
 MISC metadata.xml 410 BLAKE2B ce47d5a977b2b6b76940c5b2c74434ea382d4188f319234935a12fa4927f4b493ea664ec6fca2302aea1a31b8234d20819b585f5e56384085541445f4e8bab2d SHA512 2c6aca4abe5c944966fd5c63f9534024453cd67560f406971d6281604bfed5800f384cee8d1aadb0b85bf636530a2b7eb5c2ba002a499eb41f2670d38a89b69c
diff --git a/media-radio/qsstv/qsstv-9.4.2.ebuild b/media-radio/qsstv/qsstv-9.4.2.ebuild
index 9df5484486f1..6963627f6646 100644
--- a/media-radio/qsstv/qsstv-9.4.2.ebuild
+++ b/media-radio/qsstv/qsstv-9.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://users.telenet.be/on4qz/qsstv/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="dev-qt/qtcore:5
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index 13a4cf0bae8b..181b1d7f7445 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,7 +1,5 @@
-DIST tucnak-4.14.tar.gz 3514740 BLAKE2B f147eff8ef5a001309261b463c4334bdb82aedf5b262309336069592bff6473f93403c26b03470adc049cd337fac04eb5eed1f1eaf43414d023606d8bcbc0848 SHA512 f37895b08d302b71c345dc58df5590c3909edc8182047bd8b1a67218cc8159c9ab25b267adc6a05bd625d44dda3f21a45296611c91ce1cd974f95c6776552a49
-DIST tucnak-4.15.tar.gz 3523096 BLAKE2B 38524dfee88511e2e31c0ba2302e8ced214285650b8069d953ef91420ea3c58ff4bc1026d843cefa0f6cc9de599dbd3216b54c17ad906151005352a903e3e195 SHA512 2bbe3d2dadd4f47848e559d26484bfc1cd0cf88d130330ba19a03b43be2b643a7245641c7185072285b5320af50ef1e3826089599e4b2c9f2d8331618016a862
 DIST tucnak-4.16.tar.gz 3526223 BLAKE2B 1e88157a2fc023cc115a9cadfffa7516eac2ff23e4fa5aef7d7f4a959899cf5d7be99a6d934eaee1c32c1b702ca5b5e37a82dd91b7ea03d7ac21815c2e8c0c63 SHA512 65547fd4f83d41bdf312d61c0b6d750c5f949399821c5298731ee6941de0bc95290e90a004c22d731319b0bbd7b55f0d512c2e616ebd43f0c35698cc940594ce
-EBUILD tucnak-4.14.ebuild 1966 BLAKE2B 5a3e16571235292dde79113b8bbbf9a411570018d46356b53923848813727ed6515d55f768c532f89b5c59922ae4f5ff7edf1c638f18ed429ce372f596c9d0c2 SHA512 1efcc0138afcf1f5878fd8459746277398dd1e3d88f84c74d56515e760683b427e597cbbe8779e9bb4b4d535e8da8cb958a5c9bb037c8c5a91133e30a99b2d8c
-EBUILD tucnak-4.15.ebuild 1966 BLAKE2B b918e611e92f3d68bae29f3f5a8ff297e98f6db7a2908bd2de4078d960220a82bed0e60d5e5677418bcb6b5f6375b760710cfe057c7d475185bfa2b728abe50e SHA512 2d3cebfb599a2f255d2ed81c3c955d728b6e4806074772898a3adb90a8cf814a420c2976040dbb6b0b9dcbe82bbe74ace3c5151d90f3b0cefa7db7a7134bfdff
-EBUILD tucnak-4.16.ebuild 1968 BLAKE2B ab961c009dfce4480636df84be8d15fe78978bc0d6c687c97cf6177de6953bbd7796e99431cb42fdf22ed4ce13826ab3e6a9aa7d374503e06281efecfcbfc5c1 SHA512 bafc882e0672d04191c4993515d4e93d3de70f8531333f8925c46cabd2d842bfa2eed63c0e791d960540af64a4b4b5894d7c61e817e8faec598ac79e9c1d1ed1
+DIST tucnak-4.17.tar.gz 3520755 BLAKE2B 6628d628cfc7770fdc02611ec7d21410dd910601c8159052f0d2c2d5754de7f3c9360b8f43b60ae3a27eac92808a0a8254efdba5198684b19662b8fdb32a43a8 SHA512 1f59bb47c302df03ac2f6420c71d3708b94efbb74642eb403f0ee6e29bb6826f11cb606d1542d287d776908af8f9c3d9724b20d4678fb8c3ea1cadb22255ec20
+EBUILD tucnak-4.16.ebuild 1966 BLAKE2B b918e611e92f3d68bae29f3f5a8ff297e98f6db7a2908bd2de4078d960220a82bed0e60d5e5677418bcb6b5f6375b760710cfe057c7d475185bfa2b728abe50e SHA512 2d3cebfb599a2f255d2ed81c3c955d728b6e4806074772898a3adb90a8cf814a420c2976040dbb6b0b9dcbe82bbe74ace3c5151d90f3b0cefa7db7a7134bfdff
+EBUILD tucnak-4.17.ebuild 1968 BLAKE2B ab961c009dfce4480636df84be8d15fe78978bc0d6c687c97cf6177de6953bbd7796e99431cb42fdf22ed4ce13826ab3e6a9aa7d374503e06281efecfcbfc5c1 SHA512 bafc882e0672d04191c4993515d4e93d3de70f8531333f8925c46cabd2d842bfa2eed63c0e791d960540af64a4b4b5894d7c61e817e8faec598ac79e9c1d1ed1
 MISC metadata.xml 408 BLAKE2B 80978177d2257cefae04860fc52e43ea7f0d2221bf4a5b3050fe8057acda81625117b1ba74e7357d40d00cc7fbd44f2dac713494cd8d20679c690cf851e1b678 SHA512 ad015a404c42d5cd0f160907400f545698045bb6c7c3da59816830ec6ed51938a02988c59d4a9ade472a78fd39feeb49ebe6c2a9c625e535a37e44bf19db1b17
diff --git a/media-radio/tucnak/tucnak-4.14.ebuild b/media-radio/tucnak/tucnak-4.14.ebuild
deleted file mode 100644
index 66bd02fa912a..000000000000
--- a/media-radio/tucnak/tucnak-4.14.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic multilib
-
-DESCRIPTION="Amateur Radio VHF Contest Logbook"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa fftw gpm hamlib suid"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libzia
-	media-libs/libsndfile
-	>=media-libs/libsdl-1.2
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0 )
-	gpm? ( sys-libs/gpm )
-	hamlib? ( media-libs/hamlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply_user
-	# fix destop file
-	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
-	# fix doc install path
-	sed -i -e "s/docsdir/# docsdir/" \
-		-e "s/docs_DATA =/# docs_DATA/" \
-		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf $(use_with alsa) \
-		$(use_with gpm) $(use_with hamlib) \
-		$(use_with fftw fftw3)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
-	if use suid ; then
-		fperms 4711 /usr/bin/soundwrapper
-	fi
-}
-
-pkg_postinst() {
-	elog "In order to use sound with tucnak add yourself to the 'audio' group"
-	elog "and to key your rig via the parport add yourself to the 'lp' group"
-	elog ""
-	elog "tucnak can be used with the following additional packages:"
-	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
-	elog "                             (No need to recompile)"
-	if use suid ; then
-		ewarn "You have choosen to install the little helper program 'soundwrapper'"
-		ewarn "setuid by setting USE=suid. That helper is only needed if you"
-		ewarn "want to use morse sidetone output via the PC speaker."
-		ewarn ""
-		ewarn "While the helper should be safe by design be aware that setting"
-		ewarn "any program setuid is a security risk."
-	fi
-}
diff --git a/media-radio/tucnak/tucnak-4.15.ebuild b/media-radio/tucnak/tucnak-4.15.ebuild
deleted file mode 100644
index b78b8fb5f572..000000000000
--- a/media-radio/tucnak/tucnak-4.15.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic multilib
-
-DESCRIPTION="Amateur Radio VHF Contest Logbook"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa fftw gpm hamlib suid"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libzia
-	media-libs/libsndfile
-	>=media-libs/libsdl-1.2
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0 )
-	gpm? ( sys-libs/gpm )
-	hamlib? ( media-libs/hamlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply_user
-	# fix destop file
-	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
-	# fix doc install path
-	sed -i -e "s/docsdir/# docsdir/" \
-		-e "s/docs_DATA =/# docs_DATA/" \
-		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf $(use_with alsa) \
-		$(use_with gpm) $(use_with hamlib) \
-		$(use_with fftw fftw3)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
-	if use suid ; then
-		fperms 4711 /usr/bin/soundwrapper
-	fi
-}
-
-pkg_postinst() {
-	elog "In order to use sound with tucnak add yourself to the 'audio' group"
-	elog "and to key your rig via the parport add yourself to the 'lp' group"
-	elog ""
-	elog "tucnak can be used with the following additional packages:"
-	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
-	elog "                             (No need to recompile)"
-	if use suid ; then
-		ewarn "You have choosen to install the little helper program 'soundwrapper'"
-		ewarn "setuid by setting USE=suid. That helper is only needed if you"
-		ewarn "want to use morse sidetone output via the PC speaker."
-		ewarn ""
-		ewarn "While the helper should be safe by design be aware that setting"
-		ewarn "any program setuid is a security risk."
-	fi
-}
diff --git a/media-radio/tucnak/tucnak-4.16.ebuild b/media-radio/tucnak/tucnak-4.16.ebuild
index f97b30dca3c3..b78b8fb5f572 100644
--- a/media-radio/tucnak/tucnak-4.16.ebuild
+++ b/media-radio/tucnak/tucnak-4.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa fftw gpm hamlib suid"
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-radio/tucnak/tucnak-4.17.ebuild b/media-radio/tucnak/tucnak-4.17.ebuild
new file mode 100644
index 000000000000..f97b30dca3c3
--- /dev/null
+++ b/media-radio/tucnak/tucnak-4.17.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic multilib
+
+DESCRIPTION="Amateur Radio VHF Contest Logbook"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa fftw gpm hamlib suid"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libzia
+	media-libs/libsndfile
+	>=media-libs/libsdl-1.2
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( sci-libs/fftw:3.0 )
+	gpm? ( sys-libs/gpm )
+	hamlib? ( media-libs/hamlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	# fix destop file
+	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
+	# fix doc install path
+	sed -i -e "s/docsdir/# docsdir/" \
+		-e "s/docs_DATA =/# docs_DATA/" \
+		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/hamlib
+	econf $(use_with alsa) \
+		$(use_with gpm) $(use_with hamlib) \
+		$(use_with fftw fftw3)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
+	if use suid ; then
+		fperms 4711 /usr/bin/soundwrapper
+	fi
+}
+
+pkg_postinst() {
+	elog "In order to use sound with tucnak add yourself to the 'audio' group"
+	elog "and to key your rig via the parport add yourself to the 'lp' group"
+	elog ""
+	elog "tucnak can be used with the following additional packages:"
+	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
+	elog "                             (No need to recompile)"
+	if use suid ; then
+		ewarn "You have choosen to install the little helper program 'soundwrapper'"
+		ewarn "setuid by setting USE=suid. That helper is only needed if you"
+		ewarn "want to use morse sidetone output via the PC speaker."
+		ewarn ""
+		ewarn "While the helper should be safe by design be aware that setting"
+		ewarn "any program setuid is a security risk."
+	fi
+}
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 2535ff5709be..8b27a6e834ff 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -7,6 +7,6 @@ AUX xastir-2.1.0-scripts.diff 3506 BLAKE2B 64dcad59b08bb50a558e80b889eb25fec2c36
 AUX xastir-2.1.2-scripts.diff 3766 BLAKE2B fbad015655864f26dfed1b50ea6c1399fc70088ff092a2cdd1a173879db4bdbba43aea9107cc961890012682d0e265f888b908d553c50018d34ea040dc08243e SHA512 aef4410c53aa3d80c4f3ea48a50759a9a1813801d18fb6dd0cf4e90b8e49358c9f6040cca964b5ce4eefcea2966f197207b25e67dd1b69e1bbd5cf0ba640ae46
 DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B 12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f
 DIST xastir-2.1.4.tar.gz 2694124 BLAKE2B 90fd8ef340fc5bad43c9501c6530dcd4bd60eaab9c04638c68f80add46f0df24c45db334549915edaee95cbdcc9b7580d6343d81d84cb819f4ef5a76c9f79242 SHA512 e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1
-EBUILD xastir-2.0.8-r1.ebuild 2310 BLAKE2B ddb69cb6ee6d93e096154d8c4a672cde7dd6c49566cd5e74bf13f5721d272394a9aa850fcb4cf51b87dcc47021ee412e4d5f32956352cdf359f95b8cc056f137 SHA512 84a90b62785b15199933ae4ed0812e993cf8c25666a2f885b4eb7e7b94daf238a355e261e187c88bb922e309587f91f5d2831616f21d61748c065c2ba73509d9
-EBUILD xastir-2.1.4.ebuild 2010 BLAKE2B b6e8f50069e874c74beff4540ca9a4765a9178459b4a335d3e650559a6ec6676f35299412878c84fa422c5a775578b284d3f0d5a3d6d56484cfcbfc3bca2179c SHA512 0c9909ee954c111d8f5df49c0f79ca5b90242f524fa2fe8724322332a284b07e57e3546b490d72fed678113bbdc2e077c9ad26c0430c63e2b32f4660087bd977
-MISC metadata.xml 598 BLAKE2B f264d0c4da8a00f68c94e83e15dd698a5f2332d92711347337a71fa11290570ca582ec6826ca7b62cab3d1935cb370ad71e6d8db893bc92f195fbef3fc06c4c3 SHA512 e1d392c11713b0cf692ac91df33eec85a4b47f2836851ca9d7dcd16c41a5a9540b67950731c8b943ecc1de6792449972971e295f39eda81f007c6521d6944ebb
+EBUILD xastir-2.0.8-r1.ebuild 2257 BLAKE2B 090d1625ac5caf048c4765ebd505264624f70dde36a02d8cee9f8444dfcb9dd135e108cf99a40eb29267a7744fbd624355a642ae15a07ee77d38646440a97377 SHA512 9725bfc7e33b60189441c5da81017eb9d5f79e07d27cb55f59a7834992cd93d9d3db9326e30e64f2955b677f046b4839ac6fe348ce6e171ff1a01be2f2746518
+EBUILD xastir-2.1.4.ebuild 1955 BLAKE2B 7c03b17aeba557689ba2cfbc61a51161a18034cdb253741398cf528f429409240b30eec9f45ed6afbe5092f3142fc7087783170347a7a82bfd326bd533d6610f SHA512 cb087cfcc9251c4163e339644eb932efe1b4ff6e3bda221691ecdc4020e10969e1b52a513011c90357f33a9ac58fcc536e700cdb802829ecb2a38a49b657d9de
+MISC metadata.xml 533 BLAKE2B 78ef77d6fa8e34acb3f3a4b1d01fa72fa1dbca850938561fe22ef8c0ab8e17128f2c2174ad72e55915c42f37a9f441314cbbc80c49df7406418b57b7319fb7e6 SHA512 efdef63c89df43ea0761e6f84ec3d285a6592fc199820084767905f66945140a624c117a0bf7b0ec982e47dbe9445252115e31c92a4bc7b006055c0c030c0ff5
diff --git a/media-radio/xastir/metadata.xml b/media-radio/xastir/metadata.xml
index be15613be578..e44c45094ca1 100644
--- a/media-radio/xastir/metadata.xml
+++ b/media-radio/xastir/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Thomas Beierlein</name>
 	</maintainer>
 	<use>
-		<flag name="festival">Enable text to speech synthesizer</flag>
 		<flag name="gdal">Support for some further map formats</flag>
 		<flag name="geotiff">Install geotiff support. Allows using USGS DRG topo
 			maps or other types of geotiff mapes/images</flag>
diff --git a/media-radio/xastir/xastir-2.0.8-r1.ebuild b/media-radio/xastir/xastir-2.0.8-r1.ebuild
index c16d857f5d69..4d12a2c14255 100644
--- a/media-radio/xastir/xastir-2.0.8-r1.ebuild
+++ b/media-radio/xastir/xastir-2.0.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="festival gdal geotiff +graphicsmagick"
+IUSE="gdal geotiff +graphicsmagick"
 
 DEPEND=">=x11-libs/motif-2.3:0
 	x11-libs/libXt
@@ -27,8 +27,7 @@ DEPEND=">=x11-libs/motif-2.3:0
 	geotiff? ( sci-libs/proj
 		sci-libs/libgeotiff
 		media-libs/tiff:0 )
-	gdal? ( sci-libs/gdal )
-	festival? ( app-accessibility/festival )"
+	gdal? ( sci-libs/gdal )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -58,13 +57,13 @@ src_configure() {
 		--with-shapelib \
 		--with-dbfawk \
 		--without-ax25 \
+		--without-festival \
 		--without-gpsman \
 		$(use_with !graphicsmagick imagemagick) \
 		$(use_with graphicsmagick) \
 		$(use_with geotiff libproj) \
 		$(use_with geotiff) \
-		$(use_with gdal) \
-		$(use_with festival)
+		$(use_with gdal)
 }
 
 src_compile() {
diff --git a/media-radio/xastir/xastir-2.1.4.ebuild b/media-radio/xastir/xastir-2.1.4.ebuild
index b9b5bdb7a8cd..c3f29e3674c3 100644
--- a/media-radio/xastir/xastir-2.1.4.ebuild
+++ b/media-radio/xastir/xastir-2.1.4.ebuild
@@ -13,8 +13,8 @@ SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="festival geotiff +graphicsmagick"
+KEYWORDS="amd64 x86"
+IUSE="geotiff +graphicsmagick"
 
 DEPEND=">=x11-libs/motif-2.3:0
 	x11-libs/libXt
@@ -29,8 +29,7 @@ DEPEND=">=x11-libs/motif-2.3:0
 	graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
 	geotiff? ( sci-libs/proj
 		sci-libs/libgeotiff:=
-		media-libs/tiff:0 )
-	festival? ( app-accessibility/festival )"
+		media-libs/tiff:0 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MY_P}
@@ -54,12 +53,12 @@ src_configure() {
 		--with-shapelib \
 		--with-dbfawk \
 		--without-ax25 \
+		--without-festival \
 		--without-gpsman \
 		$(use_with !graphicsmagick imagemagick) \
 		$(use_with graphicsmagick) \
 		$(use_with geotiff libproj) \
-		$(use_with geotiff) \
-		$(use_with festival)
+		$(use_with geotiff)
 }
 
 src_compile() {
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1ec1e0d8383b..ee71383fc30e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 963b1bb4833d..f22f38b2807a 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -4,5 +4,5 @@ DIST alsa-tools-1.1.6.tar.bz2 1778330 BLAKE2B 256ffaef47f78c07f1d8cd86df57b2f75c
 DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c
 EBUILD alsa-tools-1.1.0.ebuild 3491 BLAKE2B 6c4c591a1025f18d1b8e7e2058fbb227f200ec5c50334ae400a9cff94d5630d05f5298faf91c2c76451b09ef9b90d1e3b1b04aad70871eb79d55a6f66b683f53 SHA512 704b16d093923c138ea05bfbeebd96be74987ea0ea076f40e2260e32765074bbde1bfe08f3b231fc6fb6b7b32a5eb2241c980f9d62294475df8e848e46393284
 EBUILD alsa-tools-1.1.6.ebuild 3551 BLAKE2B f47b5d46525d70fe5f6147be5c1c15a387c13a01248dc23587af8262d73fba73afd546e5dbf9c55a8370d457e5d0c15d75b9c62ea82e9400ad8750fe3a2fbc74 SHA512 adddcc1c52a9facee00e8e9d1db6a197f32f43b3a1ccd3aabda33a46987ba1bbea16cbbd8015fe0875e8661ef305480f0dbf2f633a32aed173d44d57466ecad1
-EBUILD alsa-tools-1.1.7.ebuild 3553 BLAKE2B ba97574834462eaa72a24e750ee6ae3431ef6e7ecb0368d6a5503dcfa2b061244a8c75a673dbcbe77ef8cd47ce4ee2f6c2b85148e33864665d80867dead6cd4b SHA512 8d359e5818d028d66362681ad6be69eaaaa2fbe4be65d7c78d5a2ab4d16dc32ee24f301e1933534d574ca5db42234c03aa558a82b7511e24483d0f537e8635fb
+EBUILD alsa-tools-1.1.7.ebuild 3551 BLAKE2B 4bb9c47f6316a1c39dc4220cdc8215dac6043ccbeb206ac830bb451bcb7ff5313438603c6ca910327fddc569eeec2ef090b4bc4518d6da0866c001541ece06cd SHA512 5e53d00ff59bfc547e2e23e88e0f36517a3bfd2de3c5eae8b137eaa87c3bbf19ce0f69de9d41bbd16c8ded73980a3229ff32b8b2d1ca55adb6cf684e9f91d9a7
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
index 73eb0a6576f2..110266eb8793 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="amd64 ~hppa ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ~mips ppc ppc64 sparc x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 3fff70e93906..b52e24c70dde 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -10,6 +10,6 @@ DIST alsa-utils-1.1.8.tar.bz2 1262174 BLAKE2B 643017f8f31d88356a2a55b5b1249d5b70
 DIST alsa-utils-1.1.9.tar.bz2 1268833 BLAKE2B 56fe00bd7dce21969f9f91d1d82a6644da338208bfa646fc2a46d38f2d1d937b55b90acc5f75bb630aa288dee458c9f555a5727990c5cd7a59b627cb1ecf1e2c SHA512 92fa689ea5897150972d5376e7999ff060cad09cb0b06991d81c87b61a243ecec944e2a4c7ad38878596cd8b4246e44c5a3a35e5bc6452c02ebf35c9bed91970
 EBUILD alsa-utils-1.1.2.ebuild 2199 BLAKE2B 110899e375e20f25067db6dcc21b3302ac119dc9656c88946f0fa304084571f61ab6335536336d874dedad465dfcb0b4b1c39e3a7b0b502082dbb90ca5a32abf SHA512 e0253fbba1c48e7318d5b9ab5bceebccd303ac09e6e2687a3947788e90491a7c88952209128ece17ffeb6255330118d3a43e245513e4c1dca9254bbeed72394f
 EBUILD alsa-utils-1.1.6.ebuild 2249 BLAKE2B 9e754eb263685924e5897018242cea86a4a4b9d3fbc5aad66aa17e6df23d01d99854058e624139db257384d9cbd5c4d2722cf26dda8c0f89daffc4894e58c192 SHA512 14caac4da6c061bdf718e93465ffe09963aad438e7b83c5d82ce8b743620774d3e38aa0a8c91d9e949b35371a55d99fc6d10d0e52f209e3435b1d6d84f537dad
-EBUILD alsa-utils-1.1.8.ebuild 2324 BLAKE2B f060b776cbdfcc0abbc3db65ae9f248a7abea99e0fee67dc52c9459449318f713831063367ccd19554096ebebad692de238ac9639ae42bdadeb40bff138ac85e SHA512 aa64ad1cdaa7a7a8d252b6dd7d43dc0102b9512349c7fa64114aa551b526e0db4e6dd1d7ca1ef19a22a6a77631c2d2c254e0139bc6bc3e4640c5406b6a87f1c0
+EBUILD alsa-utils-1.1.8.ebuild 2322 BLAKE2B 1489975be3ec7e6f19aabbcd589cb9451cd6ef41433f8f7b1e3c4ac122cc519fb265ca7aa840cfa98ceba29fbd0ac241a6bd727ea1f69063bdd6533b60dc7416 SHA512 c1b10d7b427c14f422b372be500c031fa4c6a1c7f5c8108f5252b982833d6d659a710fd0c5328a357ba86cefc5ff00d7b2a2f0a32582b5812ac59d99afd56410
 EBUILD alsa-utils-1.1.9.ebuild 2327 BLAKE2B 62ae048c8852d50917feb356949280f22811786e3d092795c2a044f460d32cd8be5bf125f53ad7710dfda5ac057ec591da162cb2d6004621af2b4a3ff630484b SHA512 eda801263d829c4a39b6070f79ec28d895895b983572186a0de4bc6cb90219031f7f54fef0317cdd1f19624dcce8d027bdaecb3d04b5c726a631d4dd02bc29b0
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
index 0dcb43c06530..f25b06af8d7b 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index d0e36965da94..6986f9116b87 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,3 +1,5 @@
 DIST asunder-2.9.3.tar.bz2 275527 BLAKE2B a113fc2c380555550a5903919b78d5c7f304c3938665318d86dbbdd01d503641413bccc755621cefd948b10fb352f6995252fb548cc5730e1ff50d4b2d6a3634 SHA512 b6546e16c936285584480cf378be11e96717aeedc22a7c5163cc0791a41498597d8437369d00823710c56faabe1dea23e4be9c839eb1ee371415104f13d61296
+DIST asunder-2.9.4.tar.bz2 272740 BLAKE2B 64d0850afb0ea5f30a7522a9709f57cec4ab0d67eca235b75ae4ffac2dcc293438b99827eadd63052e9ea4d98fe97684d4b367255e24692af79a0efd1ed30ea7 SHA512 9410b96f27e7ea46e7a3f290caf17ddee69da9b92770346e10ae8e9403d21a527ba763163cf92e879cefb32f219e7d22d3f9b4dc2d81a3aab2a7676b859cfb71
 EBUILD asunder-2.9.3-r1.ebuild 914 BLAKE2B c45c833d0f76953116802aab8c345209843fa28362fd321b7e643b2d726ab8febdef70fb6795a49f1433ffc514e86dff90a09c9775c323c430ab18bfcc5a29ee SHA512 50dd1394d95d7b441fd5a128e66155b312b5d5438ce568e660248bd5e732300154826e0abfcfa073f355eac44eccbfb785b9ca57cd711948816607948ead7de3
+EBUILD asunder-2.9.4.ebuild 916 BLAKE2B d0667f09a4408d0a2506cdac7e28a7a9bf55d60660d2d583ff240e3421da12917a76711c25584b52c9e70eedca1e24f1cd8431c71df60e2820228a20fb260774 SHA512 15602f1ce1ec6be393d591c88743a34c01a15ddff8d40087077906aad551f2ee6f7cd24082b269e2b64acdbee74c4e069125a3e59aaf9742c2ff1d868bcac1a7
 MISC metadata.xml 345 BLAKE2B dc144dfa8d94c1293b6b84f24ecdedc8530c4fa19105e3deca1670ca1a43a261094635bb31abec0d027d1caaa4c72c884e4690f43d7af1b9f5b2dc9685502bf1 SHA512 aa6a8d66e2961a176722a5ab0d2db6a1edb246403ac81f2b282d14d0b4a231449d052c48c59f622c04b7582af0545fb97bb430ca89c33924ce24b354b0e2e47a
diff --git a/media-sound/asunder/asunder-2.9.4.ebuild b/media-sound/asunder/asunder-2.9.4.ebuild
new file mode 100644
index 000000000000..df537f03bf42
--- /dev/null
+++ b/media-sound/asunder/asunder-2.9.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="Graphical Audio CD ripper and encoder with support for many output formats"
+HOMEPAGE="http://littlesvr.ca/asunder/"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="flac mac mp3 musepack opus vorbis wavpack"
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+DEPEND=">=media-libs/libcddb-0.9.5
+	media-sound/cdparanoia
+	x11-libs/gtk+:2"
+RDEPEND="${DEPEND}
+	flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	mp3? ( media-sound/lame )
+	musepack? ( media-sound/musepack-tools )
+	opus? ( media-sound/opus-tools )
+	vorbis? ( media-sound/vorbis-tools )
+	wavpack? ( media-sound/wavpack )"
+
+src_prepare() {
+	default
+	sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
+}
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index cbafc6d1ce5d..e71d51ff7e64 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,7 +1,12 @@
 AUX audacity-2.2.1-portmixer.patch 776 BLAKE2B 18e5e3a3394c2a56afd9314993bde41376a59bc7c480b159ca9d14ff812f507de32018d5b28ee9a2cdd4f3b5f1a6e420e85f3d8660c0fa0e28941f6fdce9fb6a SHA512 f00fdd46150181873bc4aa24f95b3491471198429f47fae2d4f79f0f360a642adf94936dcf63bb02e84f9581d87c05dc8d93ed37eddaf43e31d900d505b50805
 AUX audacity-2.2.2-automake.patch 916 BLAKE2B 8de3bb400bebcfcd1b2e51ce8ada2d24e9524b56219f31bd9181e6c6c6c7382aee3d32bfb2024b7d3155f9f2464c541c5e12c7e395ce3fd9197234db8347b4d1 SHA512 2e89f45595674c3388648a6aeac4f43b82fdda2f5ba8efda2d2d98a11be2a76cab5cd0d8a87d8e581810a6ed3984d88b01e7462b51544dea550952ab563defca
 AUX audacity-2.2.2-midi.patch 4999 BLAKE2B 74e99c16abbd64f4f74ccc1dc4e76a156d492e0f8d929e8e47bf12f574741fdf052ad7c9b780fb8c578790c505990d42712239470bacc5ba132dbdcb8fa3bc78 SHA512 5c0f9ca7d25ac2c15cc12a643408066eb7b320fb7c1476d9169be25128b3a4b682ed77e9d101923c7c6df187571874b9e67635d98472e875b7520053909b271a
+AUX audacity-2.3.2-Fix-building-without-midi.patch 1845 BLAKE2B 482cf34d9a43d7fcd9b9104ad5e5a0a5ebe5b744cbc9cd9f2e267e591c822781acf601c355665a0bdb95ee94a758eac72fe4d74b6f9f72cb48b40c7f0cd0a2ac SHA512 d2fcf0c57a7c9a13a15daf6c901430e114193c0cdf395fbacaaf10be6717a6c74dcb1284ede3d12eca1c418f2948483f84fc75c78e80176531c3adbfbbeeae31
+AUX audacity-2.3.2-fix_building_against_system_portaudio.patch 1991 BLAKE2B 2e9609542728d3d5c80471d95a49f3051c061a3a06290820db90a0cad346c759c666ae66a36c26b7005f727f73049c40423fbb2c86c6492f0b89023c80972bf1 SHA512 7b7612249ec7f1eb765fd40b15b89e90fe7e251cd6a49d54643c43e8e2ab6e319b5a49c8432abe6d2440a610a306c6553538835a018ecb0c832aab88cc3f033a
+DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B 968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802 SHA512 a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53 SHA512 a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
+DIST audacity-manual-2.3.2.zip 21163508 BLAKE2B 6a0ec89567db63164e897aad21af6fb31557e2519640788c781b21e885c0f704174529d9abf3e8645ccb3bca0f7b987fa708b1ce64597b282357b823e8addd44 SHA512 5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
 EBUILD audacity-2.2.2.ebuild 3343 BLAKE2B 11ad65e95ea0a16b6434017246b0b5063c13df6821a856bcc4116de082f5a673394480a1a15e63065ccded4d8bdea786eb7988dc747440b11d5fbb6fb4504601 SHA512 80136688f1ef9a75424f24bdb98ccfbb8ad7c1dfdabd7a8ede9c4ba837de7039c2109e92fe7b1e13e5e0fa05e6f39af109bc779b20dc04af0ee96b93ba3af660
+EBUILD audacity-2.3.2.ebuild 3308 BLAKE2B 26a4dbfbfa65f793da903e9856925df8f5cfa3dab66f2af941862152769a591c1a1943f2375e4120548b7bbc31c09db1d0fa02209e8e989c4444551e7ac61170 SHA512 1635af065e989252de42db1cd9089d4584b7e4691b4bcb6541657e57abaefef13decc48f4aabee759b02b8471f5c93842336ce7abb77db66edc224b202c77f1f
 MISC metadata.xml 1175 BLAKE2B 4579a87e1bc8a5b420f05774e640471e859e76d0526e581d6dbfbf1f39b36462d3d87677cd98d67b458486f32c34c215c69c9318069732c722cf4ef351a7803b SHA512 5d522d5b6d837f7632f8e1bb25d13d4f134880c7ddd12c637dd1235054c234f0679d02c7b6a0e3caa0c9d20782d5621bfa312239c177e4db4298e3f38d6d80ae
diff --git a/media-sound/audacity/audacity-2.3.2.ebuild b/media-sound/audacity/audacity-2.3.2.ebuild
new file mode 100644
index 000000000000..1f561978a5fe
--- /dev/null
+++ b/media-sound/audacity/audacity-2.3.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://web.audacityteam.org/"
+# wget doesn't seem to work on FossHub links, so we mirror
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+	doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+	+lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
+
+RESTRICT="test"
+
+RDEPEND=">=app-arch/zip-2.3
+	dev-libs/expat
+	>=media-libs/libsndfile-1.0.0
+	>=media-libs/portaudio-19.06.00-r2[alsa?]
+	<media-libs/portaudio-20
+	media-libs/soxr
+	x11-libs/wxGTK:3.0[X]
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( >=media-video/ffmpeg-1.2:= )
+	)
+	flac? ( >=media-libs/flac-1.3.1[cxx] )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( >=media-sound/lame-3.70 )
+	lv2? (
+		media-libs/lilv
+		media-libs/lv2
+		media-libs/suil
+	)
+	mad? ( >=media-libs/libmad-0.14.2b )
+	sbsms? ( media-libs/libsbsms )
+	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+	twolame? ( media-sound/twolame )
+	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.2-fix_building_against_system_portaudio.patch
+	"${FILESDIR}"/${PN}-2.3.2-Fix-building-without-midi.patch
+)
+
+src_prepare() {
+	default
+
+	use midi || sed -i \
+		-e 's:^\(#define EXPERIMENTAL_MIDI_OUT\):// \1:' \
+		src/Experimental.h || die
+}
+
+src_configure() {
+	local WX_GTK_VER="3.0"
+	setup-wxwidgets
+	append-cxxflags -std=gnu++14
+
+	# * always use system libraries if possible
+	# * options listed in the order that configure --help lists them
+	local myeconfargs=(
+		--disable-dynamic-loading
+		--enable-nyquist=local
+		--enable-unicode
+		--with-expat
+		--with-lib-preference=system
+		--with-libsndfile
+		--with-libsoxr
+		--with-mod-script-pipe
+		--with-mod-nyq-bench
+		--with-portaudio
+		--with-widgetextra=local
+		--with-wx-version=${WX_GTK_VER}
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable ladspa)
+		$(use_enable nls)
+		$(use_enable vst)
+		$(use_with ffmpeg)
+		$(use_with flac libflac)
+		$(use_with id3tag libid3tag)
+		$(use_with lame)
+		$(use_with lv2)
+		$(use_with mad libmad)
+		$(use_with midi portmidi local)
+		$(use_with midi "" local)
+		$(use_with portmixer)
+		$(use_with sbsms)
+		$(use_with soundtouch)
+		$(use_with twolame libtwolame)
+		$(use_with vamp libvamp)
+		$(use_with vorbis libvorbis)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Remove bad doc install
+	rm -r "${ED}"/usr/share/doc || die
+
+	# Install our docs
+	einstalldocs
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${WORKDIR}"/help/manual/{m,man,manual}
+		dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
+		dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch b/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch
new file mode 100644
index 000000000000..d4ec1a7320f6
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch
@@ -0,0 +1,71 @@
+diff -urpN a/src/Track.h b/src/Track.h
+--- a/src/Track.h	2019-05-04 13:38:57.000000000 +0300
++++ b/src/Track.h	2019-08-27 19:32:36.937551831 +0300
+@@ -53,10 +53,6 @@ using WaveTrackConstArray = std::vector
+ 
+ using NoteTrackConstArray = std::vector < std::shared_ptr< const NoteTrack > >;
+ 
+-#if defined(USE_MIDI)
+-class NoteTrack;
+-#endif
+-
+ class TrackList;
+ 
+ using ListOfTracks = std::list< std::shared_ptr< Track > >;
+@@ -74,9 +70,7 @@ enum class TrackKind
+ {
+    None,
+    Wave,
+-#if defined(USE_MIDI)
+    Note,
+-#endif
+    Label,
+    Time,
+    Audio,
+diff -urpN a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp
+--- a/src/menus/FileMenus.cpp	2019-05-04 13:38:57.000000000 +0300
++++ b/src/menus/FileMenus.cpp	2019-08-27 19:32:36.939551720 +0300
+@@ -141,8 +141,6 @@ AudacityProject *DoImportMIDI(
+ }
+ #endif
+ 
+-#ifdef USE_MIDI
+-
+ // Menu handler functions
+ 
+ struct Handler : CommandHandlerObject {
+@@ -480,6 +478,7 @@ void OnImportLabels(const CommandContext
+    }
+ }
+ 
++#ifdef USE_MIDI
+ void OnImportMIDI(const CommandContext &context)
+ {
+    auto &project = context.project;
+@@ -496,7 +495,7 @@ void OnImportMIDI(const CommandContext &
+    if (!fileName.empty())
+       DoImportMIDI(&project, fileName);
+ }
+-#endif
++#endif // USE_MIDI
+ 
+ void OnImportRaw(const CommandContext &context)
+ {
+diff -urpN a/src/tracks/ui/TimeShiftHandle.cpp b/src/tracks/ui/TimeShiftHandle.cpp
+--- a/src/tracks/ui/TimeShiftHandle.cpp	2019-05-04 13:38:57.000000000 +0300
++++ b/src/tracks/ui/TimeShiftHandle.cpp	2019-08-27 19:32:36.940551665 +0300
+@@ -393,12 +393,12 @@ UIHandle::Result TimeShiftHandle::Click
+                ok = false;
+             else
+                captureClips = true;
+-         },
+ #ifdef USE_MIDI
++         },
+          [&](NoteTrack *) {
+             captureClips = true;
+-         }
+ #endif
++         }
+       );
+ 
+    if ( ! ok )
diff --git a/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch b/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch
new file mode 100644
index 000000000000..fa785fdd6c5e
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch
@@ -0,0 +1,56 @@
+From 5f9482a191359f2c477763a36d2c865c5f186602 Mon Sep 17 00:00:00 2001
+From: Antonio Ospite <ao2@ao2.it>
+Date: Tue, 7 Nov 2017 13:06:33 +0100
+Subject: [PATCH] Fix building against the system portaudio library
+
+Building against the system portaudio results in this error:
+
+./src/AudioIO.cpp:983: undefined reference to `PaUtil_GetTime'
+audacity-AudioIO.o: In function `audacityAudioCallback(void const*, void*,
+unsigned long, PaStreamCallbackTimeInfo const*, unsigned long, void*)':
+./src/AudioIO.cpp:4630: undefined reference to `PaUtil_GetTime'
+collect2: error: ld returned 1 exit status
+Makefile:2349: recipe for target 'audacity' failed
+make[3]: *** [audacity] Error 1
+
+This is because PaUtil_GetTime is declared as a C symbol in pa_util.h
+but is resolved as a C++ symbol at link time.
+
+Audacity fixes this in the local tree with this change:
+https://github.com/audacity/audacity/commit/38fd97b8e26060332ab3e9e000a8882326a70ba7
+
+However this is not general enough for the portaudio debian package.
+
+Since PaUtil_GetTime() is the only function causing problems, just copy
+over the code where it's used.
+---
+ src/AudioIO.cpp | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+--- a/src/AudioIO.cpp
++++ b/src/AudioIO.cpp
+@@ -465,8 +465,23 @@ TimeTrack and AudioIOListener and whethe
+    #define ROUND(x) (int) ((x)+0.5)
+    //#include <string.h>
+    #include "../lib-src/portmidi/pm_common/portmidi.h"
+-   #include "../lib-src/portaudio-v19/src/common/pa_util.h"
+    #include "NoteTrack.h"
++
++PaTime PaUtil_GetTime( void )
++{
++#ifdef HAVE_MACH_ABSOLUTE_TIME
++    return mach_absolute_time() * machSecondsConversionScaler_;
++#elif defined(HAVE_CLOCK_GETTIME)
++    struct timespec tp;
++    clock_gettime(CLOCK_REALTIME, &tp);
++    return (PaTime)(tp.tv_sec + tp.tv_nsec * 1e-9);
++#else
++    struct timeval tv;
++    gettimeofday( &tv, NULL );
++    return (PaTime) tv.tv_usec * 1e-6 + tv.tv_sec;
++#endif
++}
++
+ #endif
+ 
+ #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index e80cf1741f7d..366c4e371379 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,4 +1,6 @@
 AUX beets-1.4.8-imagemagick-detection.patch 770 BLAKE2B 120e0af71fe9c63548f49bf20fa94ec20f8b0cfb8395b319d6f8e2a62b5212adb229691c35297615a3b0272b215c87e1ff861e1887d227fc9460501900edae48 SHA512 6c5da1591e0bfc0936dca52c48f74b80b57c18bb0398877d38deb7d448df9466a8544628e0ce6948204a8deae4679c8dd454dab9a2f0778a236eaa60387a1751
 DIST beets-1.4.8.tar.gz 1493539 BLAKE2B 63c44f05bbf139cd43b5f5ada972fd30beeea2303c6b479b1be35ea21fabb0039b3c8eb6e90f8f1b2a61fed36d97ce09a32c6346cbd3b84c7c978e796505f4b4 SHA512 449bed88185a5ecb4781719e092c2428ddc52fb8084033db64a4c0eca8899154192e7cea82517993d60326c7fe39b26429584ba368ffc35800f722d8d6a03217
+DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
 EBUILD beets-1.4.8-r1.ebuild 3664 BLAKE2B 094cc8dfbf32cea571e4789db182a60ad07eeb772a47be47d45843eefe70c20e619f7524e98f533d14e899983b534d7b5c7aeeeed4e8aa00a723ec325d4449de SHA512 62f4c4d9619fc07388427830fc3a8248e7b7477c6a18a451b75e4291dd928adf40db39ddf606b2b1a9feeaa5e4728796d184b2e905aadec09ff0946a7961d8c0
-MISC metadata.xml 2395 BLAKE2B 0df8a5d3fa7b94b5b8e3e45f25e2c4dc0716c438dd51a6061f2276e20bf9779847c34bc571bcdd8948289c75c879cae6ef76fa8432a550855e9f74966fb80374 SHA512 ea2c961e7380a8c05e0e90b34f50323ca932e06ba33d5a214a633e8eba4281577993a870a7d294f286a90c0492256d3142b9e17aa02e2ea129c9c28e24bf90ec
+EBUILD beets-1.4.9.ebuild 3614 BLAKE2B ea994ce3c35058ab24813c663b5182650c06e9d5f0f3e875065ba09abdb413031a0a80047b3c9d179887be9db6d765e6ecc868b236aa550ab502b1a39227b9e4 SHA512 8185506e4c7c3b343bd072c169d352c39507fc83dcbffe9e15752a227ce03532c14439dd63e03707e98c3f17201149a1b785fd3512d9ad9aa53b0012197d6230
+MISC metadata.xml 2707 BLAKE2B f178a50b9b107e6c5083cc255750416751d0e077f95fc8111b826e458e30d72ce978fe8c8a29056ad076b121fe2690fd636212eb68c758eedb4f380afd29a6d9 SHA512 58ea485657e54c0f1aecbbed49a6c3ce683ef5560f66a02d95c7c89de597a038499b8268771db9fe344dd9baaafe4af750c9402f1725bb791c89dbf4de90d705
diff --git a/media-sound/beets/beets-1.4.9.ebuild b/media-sound/beets/beets-1.4.9.ebuild
new file mode 100644
index 000000000000..e2da8e5f2f7f
--- /dev/null
+++ b/media-sound/beets/beets-1.4.9.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MIT"
+IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
+	dev-python/munkres[${PYTHON_USEDEP}]
+	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	badfiles? (
+		media-libs/flac
+		media-sound/mp3val
+	)
+	chromaprint? (
+		dev-python/pyacoustid[${PYTHON_USEDEP}]
+		media-libs/chromaprint[tools]
+	)
+	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
+	ffmpeg? ( media-video/ffmpeg:0[encode] )
+	gstreamer? (
+		media-libs/gst-plugins-good:1.0
+		media-libs/gst-plugins-bad:1.0
+	)
+	icu? ( dev-db/sqlite[icu] )
+	lastfm? ( dev-python/pylast[${PYTHON_USEDEP}] )
+	mpd? (
+		dev-python/bluelet[${PYTHON_USEDEP}]
+		dev-python/python-mpd[${PYTHON_USEDEP}]
+	)
+	replaygain? (
+		gstreamer? (
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			media-plugins/gst-plugins-libav:1.0
+		)
+		!gstreamer? ( media-sound/mp3gain )
+	)
+	thumbnail? (
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		virtual/python-pathlib[${PYTHON_USEDEP}]
+		|| (
+			dev-python/pillow[${PYTHON_USEDEP}]
+			media-gfx/imagemagick
+		)
+	)
+	webserver? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/flask-cors[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test" # tests broken in 1.4.3 already
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	rm_use_plugins() {
+		[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
+		local use=${1}
+		local plugins=${use}
+		use ${use} && return
+		einfo "no ${use}:"
+		[[ $# -gt 1 ]] && plugins="${@:2}"
+		for arg in ${plugins[@]}; do
+			einfo "  removing ${arg}"
+			if [[ -e "beetsplug/${arg}.py" ]]; then
+				rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
+			fi
+			if [[ -d "beetsplug/${arg}" ]]; then
+				rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
+			fi
+			sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
+				die "Unable to disable ${arg} plugin "
+		done
+	}
+
+	default
+
+	rm_use_plugins chromaprint chroma
+	rm_use_plugins ffmpeg convert
+	rm_use_plugins icu loadext
+	rm_use_plugins lastfm lastgenre lastimport
+	rm_use_plugins mpd bpd mpdstats
+	rm_use_plugins webserver web
+	rm_use_plugins thumbnail thumbnails
+
+	# remove plugins that do not have appropriate dependencies installed
+	for flag in badfiles discogs replaygain; do
+		rm_use_plugins ${flag}
+	done
+
+	if ! use mpd; then
+		rm test/test_player.py || die
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd test || die
+	if ! use webserver; then
+		rm test_web.py || die "Failed to remove test_web.py"
+	fi
+	"${EPYTHON}" testall.py || die "Testsuite failed"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman man/beet.1 man/beetsconfig.5
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	einstalldocs
+}
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index a30fde9062e0..c94e37c4b59b 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -1,43 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-		The purpose of beets is to get your music collection right once and for
-		all. It catalogs your collection, automatically improving its metadata as
-		it goes using the MusicBrainz database. (It also downloads cover art for
-		albums it imports.) Then it provides a bouquet of tools for manipulating
-		and accessing your music.
+  <maintainer type="person">
+    <email>bernardo@standard.ai</email>
+    <name>Bernardo Meurer</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Gentoo Proxy Maintainers Project</name>
+  </maintainer>
+  <longdescription lang="en">
+        The purpose of beets is to get your music collection right once and for
+        all. It catalogs your collection, automatically improving its metadata as
+        it goes using the MusicBrainz database. (It also downloads cover art for
+        albums it imports.) Then it provides a bouquet of tools for manipulating
+        and accessing your music.
 
-		Because beets is designed as a library, it can do almost anything you can
-		imagine for your music collection. Via plugins, beets becomes a panacea:
-		* Embed and extract album art from files’ tags.
-		* Listen to your library with a music player that speaks the MPD protocol
-		and works with a staggering variety of interfaces.
-		* Fetch lyrics for all your songs from databases on the Web.
-		* Manage your MusicBrainz music collection.
-		* Analyze music files’ metadata from the command line.
-		* Clean up crufty tags left behind by other, less-awesome tools.
-		* Browse your music library graphically through a Web browser and play it
-		in any browser that supports HTML5 Audio.
+        Because beets is designed as a library, it can do almost anything you can
+        imagine for your music collection. Via plugins, beets becomes a panacea:
+        * Embed and extract album art from files’ tags.
+        * Listen to your library with a music player that speaks the MPD protocol
+        and works with a staggering variety of interfaces.
+        * Fetch lyrics for all your songs from databases on the Web.
+        * Manage your MusicBrainz music collection.
+        * Analyze music files’ metadata from the command line.
+        * Clean up crufty tags left behind by other, less-awesome tools.
+        * Browse your music library graphically through a Web browser and play it
+        in any browser that supports HTML5 Audio.
 
-		If beets doesn’t do what you want yet, writing your own plugin is
-		shockingly simple if you know a little Python.
-	</longdescription>
-	<use>
-		<flag name="badfiles">Validate MP3 &amp; FLAC files</flag>
-		<flag name="chromaprint">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
-		<flag name="ffmpeg">Enable support for the convert plugin to transcode files via <pkg>media-video/ffmpeg</pkg></flag>
-		<flag name="discogs">Enable support for the discogs API plugin</flag>
-		<flag name="lastfm">Enable support for importing personal last.fm playcounts and music genres from last.fm tags</flag>
-		<flag name="mpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation and statistic gathered from <pkg>media-sound/mpd</pkg></flag>
-		<flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
-		<flag name="thumbnail">Enable album thumbnails generation</flag>
-		<flag name="webserver">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="pypi">beets</remote-id>
-	</upstream>
+        If beets doesn’t do what you want yet, writing your own plugin is
+        shockingly simple if you know a little Python.
+  </longdescription>
+  <use>
+    <flag name="badfiles">Validate MP3 &amp; FLAC files</flag>
+    <flag name="chromaprint">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
+    <flag name="ffmpeg">Enable support for the convert plugin to transcode files via <pkg>media-video/ffmpeg</pkg></flag>
+    <flag name="discogs">Enable support for the discogs API plugin</flag>
+    <flag name="lastfm">Enable support for importing personal last.fm playcounts and music genres from last.fm tags</flag>
+    <flag name="mpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation and statistic gathered from <pkg>media-sound/mpd</pkg></flag>
+    <flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
+    <flag name="thumbnail">Enable album thumbnails generation</flag>
+    <flag name="webserver">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">beets</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index 033cfa9beaff..09f5a6d0bee7 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,5 +1,3 @@
 DIST exaile-4.0.0.tar.gz 3635774 BLAKE2B 91a5a0a4b8f3c55ec1c8f6487f30bbc8193b1e8b861bbc4bf3cba18dcef91c8a58c937e7a581378eec9da518565826c35e55b7ab157b7ee4634d36cd71a85c4e SHA512 50ab8ec7a65dc431f2bc71a302d21e59ac3d5939b89a90ec161527e1d5c0b80b8c396f8f323b2959e0b807f577e021863fe423bf26a8f7165a6dd112afca6e45
-DIST exaile-4.0.0rc3.tar.gz 3627782 BLAKE2B 1c986309798d4cb78969a7443e4c29e02ca3a9c8e316264641ffafe97dd46b6a1745988230c13469ce2d9c37aadf7b07eee5bcd5836f33b1b2d25e3ebb69f574 SHA512 d3822a7d88934c90a2856074f177a346b19896ecca54f33e7506d37a0b25170983c057feaae162c2685780e7f0d1a6edc8ce7addbcc04cacf2d2b25e0c9f36de
-EBUILD exaile-4.0.0.ebuild 1811 BLAKE2B c62c2eed506ece4a3fad27f6261de1eb0a9b04ce9364b076342fcccc5b5b75dc3761301095bfa80aad27ba87b051d6b1893c7f604ba9ae1a922bae1111f8ac9c SHA512 aadd4278b8dbf4baa484df7959101371b92e8d48fff122142b385a77a3f8ff5f7e5ff8976864c153adb10821e9fe756ad401503734064b3b61394b94f74e593f
-EBUILD exaile-4.0.0_rc3.ebuild 1862 BLAKE2B d8ba6122dffff7ce1e40d26e14aaf23515226498f6e7c2af96764da0bcc64d2b73095a3e999219764c0423ffd3a30dcdd8077955e230887ffe75a5ae12e015f4 SHA512 2eac12361e1f281e88c1473442f5810bd22e9d32685ab177884bd3d38182cb81458a6efae41e0da3cad058b6678761bb1f44aa4c606344b02027b27fbb63839d
+EBUILD exaile-4.0.0.ebuild 1809 BLAKE2B b799a034b2784190ed920d3c03cc6986be811b0d738b3ad67e632cb01edbb5f398b741d04d947c4808de4c28ea76972ce1139da89c9908e9a0638f688473ef16 SHA512 f8a6621eb7829c469db9f2cb4aa7e3860bb19c2ea664c10934b0c4438b868f9a3f0d7dd29f9e8ad1e831b9121464d8de635f7c4006d3c006d3b507913d1defac
 MISC metadata.xml 465 BLAKE2B 1524388af85ca2f4b928ad4670fa8cc2a86a69f51d72c0dc0a755ca22a05ec95587bab11cfa9f10c9f65cd9a4b08c91ec1fb445f69f9163f54b4a86e2fb99746 SHA512 4185b5a40189086940aa0139e953f39d0af627af73ef2c34f77727e7b8ce596f6f69350531cc7b85cbea4968b7b4413f923f9eda61738a8e1c1dee3b85809942
diff --git a/media-sound/exaile/exaile-4.0.0.ebuild b/media-sound/exaile/exaile-4.0.0.ebuild
index 304677b17949..57c248e3ab85 100644
--- a/media-sound/exaile/exaile-4.0.0.ebuild
+++ b/media-sound/exaile/exaile-4.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
-	KEYWORDS="~amd64 ~sparc ~x86"
+	KEYWORDS="amd64 ~sparc x86"
 	S="${WORKDIR}/${PN}-${PV/_/}"
 fi
 
diff --git a/media-sound/exaile/exaile-4.0.0_rc3.ebuild b/media-sound/exaile/exaile-4.0.0_rc3.ebuild
deleted file mode 100644
index f16131d4e058..000000000000
--- a/media-sound/exaile/exaile-4.0.0_rc3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
-	KEYWORDS="amd64 ~sparc x86"
-	S="${WORKDIR}/${PN}-${PV/_/}"
-fi
-
-DESCRIPTION="GTK+ based media player aiming to be similar to Amarok"
-HOMEPAGE="https://www.exaile.org/"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="cddb libnotify nls scrobbler"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/gobject-introspection[${PYTHON_USEDEP}]
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.13.2:3[${PYTHON_USEDEP}]
-	>=media-libs/gst-plugins-base-1.6:1.0
-	>=media-libs/gst-plugins-good-1.4:1.0
-	>=media-libs/mutagen-1.10[${PYTHON_USEDEP}]
-	media-plugins/gst-plugins-meta:1.0
-	>=x11-libs/gtk+-3.10:3[introspection]
-	cddb? ( dev-python/cddb-py )
-	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-
-RESTRICT="test" #315589
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_compile() {
-	use nls && emake locale
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		LIBINSTALLDIR=/usr/$(get_libdir) \
-		DESTDIR="${D}" \
-		install$(use nls || echo _no_locale)
-
-	python_optimize "${D}/usr/$(get_libdir)/${PN}"
-	python_optimize "${D}/usr/share/${PN}"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index d206b92cb2ba..58d2edf4424d 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,7 @@
 DIST fluidsynth-1.1.11.tar.gz 634566 BLAKE2B ed135533c9e3e807794e0eca8117d430aa299b8772b2b6c85f6233e7e497d69f43381d9c7cf2de5ce8638f5dc616339bd28cecc3cdc23408bf5883a0b14fee79 SHA512 ad7c634426b29e5a05d67addf32d43a9ccb11a1fe3cfc09ad617416b9df3dc99a48191377f5027232521380737dde2d9b59833516d1bffb90f410bab3bbe140c
 DIST fluidsynth-2.0.4.tar.gz 1378042 BLAKE2B 0fc75ea68169c47d64bdf727b8d78e311b36cb04509832f449a52d05e085908bd1ef837dd4c5e23edc25286b8ff3fdf69a9d042520c8eb2a3234fb929bed8de5 SHA512 d58ddc5f4da9bb5954a82749617548ef32edd25f6ca5c6d5c2b06d23090784ec175d2422553a66776f543c6b253f037a6cf1e717a853344ffb899fa53752eec0
+DIST fluidsynth-2.0.6.tar.gz 1315138 BLAKE2B ce6d1717d56d61b83bef6c30254c584ddb9ee3e74fa49422881c96c969068ebe7965de507547e8bfa025da4376f52499413ff66b56607aac107576754980a0de SHA512 c160e3d7c6ad62d5cc014642eb18a0f65eb90b5ad91db4049e1b45446034e989a4f9e5b805270967d4eaf47a6e2da0e81bdb5ae95500cc80d7021e8e61cd7107
 EBUILD fluidsynth-1.1.11.ebuild 2193 BLAKE2B 4d66cef4db9220271baa5dbf8d1577e80b78fb568490cd52d2ce6bf58b3656a983be6c444a6b798b7563273c54f27a7e4dd937f1e692389fc768edc524a719cb SHA512 4f3925eb3aaf0ecf92f9ffc3435331c3f81588a46632de368d17eee9a4bd37f282772c962956882e46879526e4b79e3b7a38ee9cc0ce9302e32e96e16bf80431
 EBUILD fluidsynth-2.0.4.ebuild 1970 BLAKE2B 6f9833e43b733a366eb3e7f3b32defa96378e2a88635d43ef6b2df2f9528d9a3914ef8b232db9e17f65134e5dc79e1d6e6159a6b068e1f98fc64f170a6a43759 SHA512 6c48d02f66896260659c9d139501cb181fb468d3f4b7e4f43ffa45e3035d61194362c70db099a96b3f7713fdc415a78b92b1f2c25d8c951be18a7f790c99ecf9
+EBUILD fluidsynth-2.0.6.ebuild 2554 BLAKE2B 64d09be869880b78e7d9edaf6daadd784975ba4f77e2db30af834305a18c4db18eda6323e181692b3318a2a4dd74eacfa1eabbd8677fad5a029a286f66d02e64 SHA512 a536bc87c0826739c05df317eb23adb795684c7700e929d0eb9bb1a36d4b29dc3452f4717dab547ac8b6953a5e8a3ea0a224789c905d82100188461eb23b3df1
 MISC metadata.xml 339 BLAKE2B 4bc7678ba8ccc3e97a79dda9294b31ffc1950212619ace448def22e50852b20e3b716368d9c5b7127aff381aab85d7fa104404fcd409144452855a4b5d41b529 SHA512 abac43fa8ab39fe41adf6c34a4f0e3aa605dbe834555b2eac4abcaadb6556cc08555197aadc43e51733cf8d4e30c7f7be3efb724536d54604069055836a36980
diff --git a/media-sound/fluidsynth/fluidsynth-2.0.6.ebuild b/media-sound/fluidsynth/fluidsynth-2.0.6.ebuild
new file mode 100644
index 000000000000..1fafcdd0ad95
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-2.0.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib systemd
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
+HOMEPAGE="http://www.fluidsynth.org/"
+SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash oss portaudio pulseaudio +readline +sndfile systemd"
+
+BDEPEND="
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	alsa? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	ladspa? (
+		media-libs/ladspa-cmt[${MULTILIB_USEDEP}]
+		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+	)
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README.md THANKS TODO doc/{fluidsynth-v20-devdoc,xtrafluid}.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-Denable-alsa=$(usex alsa)
+		-Denable-dbus=$(usex dbus)
+		-Denable-debug=$(usex debug)
+		-Denable-ipv6=$(usex ipv6)
+		-Denable-jack=$(usex jack)
+		-Denable-ladspa=$(usex ladspa)
+		-Denable-oss=$(usex oss)
+		-Denable-libsndfile=$(usex sndfile)
+		-Denable-portaudio=$(usex portaudio)
+		-Denable-pulseaudio=$(usex pulseaudio)
+		-Denable-readline=$(usex readline)
+		-Denable-systemd=$(usex systemd)
+	)
+
+	if use alsa; then
+		mycmakeargs+=( -Denable-lash=$(usex lash) )
+	else
+		mycmakeargs+=( -Denable-lash=OFF )
+	fi
+
+	if use systemd; then
+		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+install_systemd_files() {
+	if multilib_is_native_abi; then
+		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
+		insinto /etc
+		doins "${BUILD_DIR}/fluidsynth.conf"
+	fi
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	docinto pdf
+	dodoc doc/*.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc doc/*.c
+	fi
+
+	if use systemd; then
+		multilib_foreach_abi install_systemd_files
+
+		elog "When using fluidsynth as a systemd service, make sure"
+		elog "to configure your fluidsynth settings globally in "
+		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
+	fi
+}
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index a494953394b0..fcaa91cc44a2 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,7 +1,7 @@
-DIST grip-3.10.0.tar.gz 980402 BLAKE2B fe5cd88d170c64916abffb69fe07b66452a11ae13d75d0f24ae1cdae3bf87c1dd811f5d30be2379cd2bcd4a47ef8e7f6603c5573ffead6c94105585533645b85 SHA512 61253be210d006b778d9a071cc8701f11f03ee2f29179a7ba69f5d9309de0e113ab7b0bca5491d8f7603d1df9b912048c4b1a502bcb38c5b54664516be4acdc6
 DIST grip-3.10.1.tar.gz 980748 BLAKE2B 75f8bd4a3a22ca0dc9c03f5a7a3d501d054a1443735a684296fefef95c4ab500034724d7f9fabab3ea1bafbb45653f068615b941d6b5845d2e0edac63270ab2d SHA512 627f55e69a06ee21ef3f21900c22903a70cdb7d25f9340d6c9bbf92317e2b0ba0160cda825bc370f9854c96ea81c96684a82bfd000f890d016d5a858095a9eb2
+DIST grip-3.10.2.tar.gz 980804 BLAKE2B d7dd2585d379733a60215705b5d91ffb3ba292bf78b6728c0ce4ccd98eeb79a5c26131b1023e884d51810857c25a18066e89e726d6d08e2b8b125840b0c30016 SHA512 ee17d5842ff4d13b812e5863ce5d0c516d6bf6bffc8131c685056e1f4bb003ebbc9cad99d48d0dc9d3657d0b13d63c2bf09a67db0d37ea47c8ce715c70cfd3fa
 DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c964018a04a8646ce5f1f4734b21103f31612bac4cc45c8c03eeca2080ba88d60a2cfe51d161ef61758639b SHA512 748821f59c90d7239bb711a4a7e1df4e9f2b67ff7bd5c635a2c49389efc7836cca6672cdd93e727f8b97c4e2221f895cc7b4110aa0d3419a5fbe56530ca1b1d0
-EBUILD grip-3.10.0.ebuild 1232 BLAKE2B 458a4cd5560f48c872a19d0359563054a2b961176789329c0370eb3d72093ebe826a9c048dc25c7f3133355c02464095754057a664471656d1b5059f1d9246f4 SHA512 3bceff62a4ac1c85845c318cc5e8ab43b9b17c37dbb05f6d63b4608c6232a951c2ec37748939c1fb94d979f4caf9a6c0d336622ea873ba9a8dcb5ba4f29ece9e
 EBUILD grip-3.10.1.ebuild 1232 BLAKE2B 458a4cd5560f48c872a19d0359563054a2b961176789329c0370eb3d72093ebe826a9c048dc25c7f3133355c02464095754057a664471656d1b5059f1d9246f4 SHA512 3bceff62a4ac1c85845c318cc5e8ab43b9b17c37dbb05f6d63b4608c6232a951c2ec37748939c1fb94d979f4caf9a6c0d336622ea873ba9a8dcb5ba4f29ece9e
+EBUILD grip-3.10.2.ebuild 1232 BLAKE2B 458a4cd5560f48c872a19d0359563054a2b961176789329c0370eb3d72093ebe826a9c048dc25c7f3133355c02464095754057a664471656d1b5059f1d9246f4 SHA512 3bceff62a4ac1c85845c318cc5e8ab43b9b17c37dbb05f6d63b4608c6232a951c2ec37748939c1fb94d979f4caf9a6c0d336622ea873ba9a8dcb5ba4f29ece9e
 EBUILD grip-3.9.0.ebuild 1218 BLAKE2B c6c424d05651474333d322dd1bac779418f3b446c5f28397820fa07ea4c0edca60bfe478d56825fbc5a2a669dd98e4712b191c864a10582bb0d00d2c2f1122a8 SHA512 68f067ef88b5572a6338397e7c8be9a7f200da93b7d3a49d4e2a533082ee7b65c85a8999b8110de8a8e6e69e6d2c925dc132197d9a59459fde9cfc732d323f30
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.10.0.ebuild b/media-sound/grip/grip-3.10.2.ebuild
index 4f7ac3d6b08f..4f7ac3d6b08f 100644
--- a/media-sound/grip/grip-3.10.0.ebuild
+++ b/media-sound/grip/grip-3.10.2.ebuild
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index cc839f5bbd8c..072199e01e83 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,3 +1,5 @@
 DIST kid3-3.7.1.tar.gz 1486532 BLAKE2B aec19ca9792ab5a3ae975d64b581074f6505507027bc52483a95b8570fdf7484fadd63a5cc740b59817b6b2b7227f02637aeb3e9611d206a536138c6db083198 SHA512 68b1d4978e5e984d180981d02df5efa247d50da79e5c6a41010eb3c5369b6cdc023042333865f4730e47814c4b4b69dc2f1bcbe1566396b72637fd576f5e543c
+DIST kid3-3.8.0.tar.gz 1509430 BLAKE2B 492690f4e9ba70a981c273f6fc93912d24b8e9ecf6e4d95473baee2ab581ca8a6939a88d9237ae985f34cb0a599e80c5fd9a6af7588ad35ec928089b5e205748 SHA512 ff4d5533ed9538c589d2e8a75bbbabd21add38b51d6a442987ee70f3721eda8aefb597f51e82033c2a04fd19c86d5e57c194409ec71bbf77da405626b5484d44
 EBUILD kid3-3.7.1.ebuild 1678 BLAKE2B ba1c3630a8ceabdf0e85564a714a8a7383f3627eab3757600cce110c5c4bf62befb0d560bf4039ca47ef929e07066562606dd556037b255f434711b448d5fc3a SHA512 1b03581e83c83748d027088b8ab358800d462a4ac699d1023ce938ebc747f4ed04598886327beca6a970d522dc293919468a7d41bab1e6e25f57da3cce8bbf03
+EBUILD kid3-3.8.0.ebuild 1680 BLAKE2B fa795f01b39326776e2a5fa53270ac3d9bc3abae7638bc967d9d420963b81de580ba365b9890668b6ef1fb0598b923c3f75fbac3fdb57c6069ff2ba05ade4833 SHA512 4994c5dec92a220dfc1ca1d37d3f2e8c1747ce5bb70e0f721e45ca62b8aa1ce2f21d2de95b710bbc97e17c2669b89faffe7d1d9f0f84f6076b81d0711e93bce0
 MISC metadata.xml 737 BLAKE2B eec3a25f3041a1174f4d43780344e5dcee09313461e18ecc7ad94400858d84e406934ee5924318539547ead7ad0dfc98af87e333cc62b2653a675598c15d9694 SHA512 6d4dc69756971b2db5d12116db5644b9cda51ea44f06b6e840246ca1d1cc0f53ed37240a1b71e6bd8b3cf6f31975ed9b5ec2a4f7d6a9d0d3dc5130259fce98b1
diff --git a/media-sound/kid3/kid3-3.8.0.ebuild b/media-sound/kid3/kid3-3.8.0.ebuild
new file mode 100644
index 000000000000..3ce477229e93
--- /dev/null
+++ b/media-sound/kid3/kid3-3.8.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="Simple tag editor based on Qt"
+HOMEPAGE="https://kid3.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/readline:0=
+	acoustid? (
+		media-libs/chromaprint
+		virtual/ffmpeg
+	)
+	flac? (
+		media-libs/flac[cxx]
+		media-libs/libvorbis
+	)
+	kde? (
+		kde-frameworks/kconfig:5
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+	)
+	mp3? ( media-libs/id3lib )
+	mp4? ( media-libs/libmp4v2:0 )
+	mpris? ( dev-qt/qtdbus:5 )
+	taglib? ( >=media-libs/taglib-1.9.1 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${DEPEND}
+	!media-sound/kid3:4
+"
+
+src_prepare() {
+	# overengineered upstream build system
+	cmake-utils_src_prepare
+	# applies broken python hacks, bug #614950
+	cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CHROMAPRINT=$(usex acoustid)
+		-DWITH_DBUS=$(usex mpris)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_ID3LIB=$(usex mp3)
+		-DWITH_MP4V2=$(usex mp4)
+		-DWITH_TAGLIB=$(usex taglib)
+		-DWITH_VORBIS=$(usex vorbis)
+	)
+
+	if use kde ; then
+		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+	else
+		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index bdfbff9ce019..adacedf6bea6 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
 DIST lollypop-1.0.12.tar.xz 448864 BLAKE2B 65681bc29f8256ad8f9d6dadac7a6d147150a8f779e25c85744a39428176c6887e3a9f90f0af81f432db771806351301712ec2431c3a79bcb230c8c0e6fb055b SHA512 d6ad6fb638ac994c2c0367234c8ab35b79d619b3669c46f27bc1df221e41410f464a0a157faccf0ed1b2b5fbdb9f1ecad10ec7466bdff03231e4724948c8c3a2
-DIST lollypop-1.1.4.14.tar.xz 455404 BLAKE2B f7b3f781af5b5a5a070b1fabf288056209a02cfbeafd1b07fdd54a74a28c77d716907eabd90ba1dd7c3571c7eee82aaeac5a9f6d151b30e1c0ae7d5c9bb40ca5 SHA512 868a1183b030b207f3ffadd8788d4dec97ff16a758b0752b9d366e2d04138f5782d682ee7794d263a4412e276f1eaccb13e821546b8b35fc9900c66c40219662
+DIST lollypop-1.1.4.15.tar.xz 455360 BLAKE2B 7bce337740d1f02c0b25e156a82a876726df2199c8dd1f751b58addd2fabd07674f883588ba9a26591777cc088566d38d904aed5bbc6ffaaf1e9c134e01ed5f0 SHA512 a4841006a9ebb2c385f52c91cdff0897f139035ab3d58727fb3dc91248d879f8ca99e67d025b84ad50ef3f2f8bd69ef9785d337856788b0328b0180c0e683b84
 EBUILD lollypop-1.0.12.ebuild 1402 BLAKE2B 59520ce1f04d7248a2193f6f2b7206995ab1c2bd76c407ed23c301aa0ac4e3df011070c53291ba6b155214351fbe0cb53a0754394c7ab8c79ddb906ab994ef43 SHA512 d6270ceb393b89098522143716916b0e0c1418b87ff50dbfd22a3f7aff4699f40c14be0786c77e598727a0df50c0e0839416350c120f09a337bc331fde4dff7f
-EBUILD lollypop-1.1.4.14.ebuild 1403 BLAKE2B 723694a3d546406c3d9cefb45c4964dcfdbbb40ce4f98519b08727a5c2979ee5b5f7c27fccd3773b4f643e155b982a1616e25625e4f6a8a75afd3499ad0064cb SHA512 26fc8a7758218eb480fe9f2c6828becbecb73bfc82714b50c6f45e655e2960635d61c8b24fcac1428d307c4da2f2ee967300119bb05b895a69aacc3ee7b6b82a
+EBUILD lollypop-1.1.4.15.ebuild 1403 BLAKE2B 4064f322ed95465411ece22d7829ffe219209cbded8c0219d683f8ce403b16d9474d7b6e4b4b67b068d063c357be924c94fc19c3b487bcac61c47619ac65c456 SHA512 46890cfd6315ef4a7aff1ad7d2429fc35aa6396822877643c343dedb3919f9bb7b093dad4d99ef509790e8af53cb0c5fc4d1b528ae1e00da0a9f99e534d20566
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.1.4.14.ebuild b/media-sound/lollypop/lollypop-1.1.4.14.ebuild
deleted file mode 100644
index fe34d473e7f4..000000000000
--- a/media-sound/lollypop/lollypop-1.1.4.14.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-HASH="2ce8e3ae7569bda628da8db822d08df7"
-inherit python-r1 gnome2-utils meson xdg-utils
-
-DESCRIPTION="Modern music player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
-SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3"
-SLOT="0"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="${PYTHON_DEPS}
-	dev-libs/appstream-glib[introspection]
-	dev-libs/glib:2
-	dev-libs/gobject-introspection[cairo]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	gnome-base/gnome-common
-	x11-libs/gtk+:3
-"
-BDEPEND="${DEPEND}
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	dev-util/intltool
-"
-RDEPEND="${DEPEND}
-	app-crypt/libsecret[introspection]
-	dev-libs/totem-pl-parser
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/dbus-python
-	dev-python/pillow[${PYTHON_USEDEP}]
-	>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
-	media-libs/gst-plugins-base:1.0[introspection]
-"
-
-RESTRICT="test"
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/lollypop/lollypop-1.1.4.15.ebuild b/media-sound/lollypop/lollypop-1.1.4.15.ebuild
new file mode 100644
index 000000000000..fa4f2737c6a6
--- /dev/null
+++ b/media-sound/lollypop/lollypop-1.1.4.15.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+HASH="93fcc0dd47b06c2f4f54f88c0e67e993"
+inherit python-r1 gnome2-utils meson xdg-utils
+
+DESCRIPTION="Modern music player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
+SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/appstream-glib[introspection]
+	dev-libs/glib:2
+	dev-libs/gobject-introspection[cairo]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	gnome-base/gnome-common
+	x11-libs/gtk+:3
+"
+BDEPEND="${DEPEND}
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	dev-util/intltool
+"
+RDEPEND="${DEPEND}
+	app-crypt/libsecret[introspection]
+	dev-libs/totem-pl-parser
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/dbus-python
+	dev-python/pillow[${PYTHON_USEDEP}]
+	>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
+	media-libs/gst-plugins-base:1.0[introspection]
+"
+
+RESTRICT="test"
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index da23750f35c5..b89f6049f69f 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,10 +1,10 @@
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
 AUX mixxx-2.2.0-lilv_include_fix.patch 1006 BLAKE2B 1541ecc32cb20d02d71577615b96605938a2d38e40e04fc43e864c8a85722475b795c807ccda1df0ff86c6268d1d1425934e3b413fdedc2effcbd6a2ab584ad6 SHA512 e15980f9861a61bf965636182fe3f0d41d25d569d2d4b43e167e53e33fe7e8f533878e93db237e90551ac409811de497e3313e32fc62462bf963b7f1f29c4a11
 DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab SHA512 c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
-DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530 SHA512 8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134
 DIST mixxx-2.2.1.tar.gz 34763333 BLAKE2B 246bd01fe346298ea27d1cf64a597ddf009f31fe7edb004a2b5ffd4a2c4a09843e5c47d38acb6428ed2b8f3bb4e5618b1e97d64ff1b9721682a6b34fbd49b73a SHA512 16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3
+DIST mixxx-2.2.2.tar.gz 35050389 BLAKE2B 7d1f7fa3de7aa31bdc4e13110ceec4a07ae776aa995c191e467ece403b66dc930ab2632fb0705d204a416b3e64b87af13583f307b227626facb02a88f777c259 SHA512 3b9365bd9d9a7d387cd8791d7d9f6315116e04322370db103998d5e055a6de5e159a4605c7de96cbcf13e7d0653cbe53140dca18a8c3f1b688b227be2c4aeb6f
 EBUILD mixxx-2.1.8.ebuild 3001 BLAKE2B e1812e508163883035ad68d507c9b186646fd8d49801cef7948dbeb3b6c3b4312285ad71ec8dd85966ce875f2706d3ee31f6233689327600f23a13eaafbda37d SHA512 858f7b5f84d9a95f48541da198d89691dae24267a3efc4846ec950602d4106a4f46df9387ca97fc6305c85fdd8b492bad48a57029f267c22b6700ad6a8351d61
-EBUILD mixxx-2.2.0.ebuild 3159 BLAKE2B 01478993c3cf731fba6ec0df3a53492cd8e932100d9b37ed398c231eb91be7179f3244715d7db0351b6a3a71dfc29c23b6f5b1e819509a90e97d4d6292b98098 SHA512 194f76c1d2aeb32a331abde710ada213879b80e0c18afe7cb2164c542ee084466496d5c7a5a21db46b07c41bc3d4a9ef439bf05e20b2f6221467d990a5d21cb6
 EBUILD mixxx-2.2.1.ebuild 3159 BLAKE2B ab14ada19b18cf85144ac82b915ce3b16e2df4516587d7b11765f2f8c7d13db2c342d1a3e6d3f79b66a58a9a1dfddd1fcaf6b8a34f2f7d3179d61c73fced3f8b SHA512 8a124c7d2fa60b726707bf181f38193f36cf77ce6608343d13bc9ef9c78e32318837dccc8115233f44da637699327a9cd6aac2f8697c04d0fd466ded07ed9622
+EBUILD mixxx-2.2.2.ebuild 3159 BLAKE2B ab14ada19b18cf85144ac82b915ce3b16e2df4516587d7b11765f2f8c7d13db2c342d1a3e6d3f79b66a58a9a1dfddd1fcaf6b8a34f2f7d3179d61c73fced3f8b SHA512 8a124c7d2fa60b726707bf181f38193f36cf77ce6608343d13bc9ef9c78e32318837dccc8115233f44da637699327a9cd6aac2f8697c04d0fd466ded07ed9622
 EBUILD mixxx-9999.ebuild 3156 BLAKE2B 9251127fa8cab40f36aa43f999478b2bda2a4e99ab7939f1f758efd59fd58716e938b4e0128820996bd9bad616e35cf209eee4c9134fe229a296910db45dfa28 SHA512 ae54684c8970ad8068fd97674e4972326c14006c1c1e48d4563ab3b574a215d140eaa3c88f2ee6fa4ad3ebe9479c3bc1ffe5e855016605106d8ea30ab71e5af1
 MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f
diff --git a/media-sound/mixxx/mixxx-2.2.0.ebuild b/media-sound/mixxx/mixxx-2.2.0.ebuild
deleted file mode 100644
index 7de8d9c94349..000000000000
--- a/media-sound/mixxx/mixxx-2.2.0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic scons-utils toolchain-funcs
-
-DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
-else
-	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
-	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac doc ffmpeg hid lv2 mp3 mp4 opus shout wavpack"
-
-# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
-# got fixed
-RDEPEND="
-	dev-db/sqlite
-	dev-libs/glib:2
-	dev-libs/protobuf:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5[scripttools]
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	media-libs/chromaprint
-	media-libs/flac
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libsndfile
-	>=media-libs/libsoundtouch-1.5
-	media-libs/libvorbis
-	>=media-libs/portaudio-19_pre
-	media-libs/portmidi
-	media-libs/rubberband
-	media-libs/taglib
-	media-libs/vamp-plugin-sdk
-	sci-libs/fftw:3.0=
-	sys-power/upower
-	virtual/libusb:1
-	virtual/opengl
-	x11-libs/libX11
-	aac? (
-		media-libs/faad2
-		media-libs/libmp4v2:0
-	)
-	hid? ( dev-libs/hidapi )
-	lv2? ( >=media-libs/lilv-0.24.2-r3 )
-	mp3? ( media-libs/libmad )
-	mp4? ( media-libs/libmp4v2:= )
-	opus? (	media-libs/opusfile )
-	shout? ( media-libs/libshout )
-	wavpack? ( media-sound/wavpack )
-	ffmpeg? ( media-video/ffmpeg:0= )
-"
-# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.0-docs.patch
-	"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
-)
-
-src_prepare() {
-	# use multilib compatible directory for plugins
-	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
-
-	default
-}
-
-src_configure() {
-	local myoptimize=0
-
-	# Required for >=qt-5.7.0 (bug #590690)
-	append-cxxflags -std=c++11
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #591968
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		if [[ ${i} = native ]] ; then
-			myoptimize="native"
-			break
-		fi
-	done
-
-	myesconsargs=(
-		prefix="${EPREFIX}/usr"
-		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
-		faad="$(usex aac 1 0)"
-		ffmpeg="$(usex ffmpeg 1 0)"
-		hid="$(usex hid 1 0)"
-		hifieq=1
-		lilv="$(usex lv2 1 0)"
-		m4a="$(usex mp4 1 0)"
-		mad="$(usex mp3 1 0)"
-		optimize="${myoptimize}"
-		opus="$(usex opus 1 0)"
-		qt5=1
-		shoutcast="$(usex shout 1 0)"
-		vinylcontrol=1
-		wv="$(usex wavpack 1 0)"
-	)
-}
-
-src_compile() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
-}
-
-src_install() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
-	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
-		install_root="${ED%/}"/usr install
-
-	dodoc README Mixxx-Manual.pdf
-}
diff --git a/media-sound/mixxx/mixxx-2.2.2.ebuild b/media-sound/mixxx/mixxx-2.2.2.ebuild
new file mode 100644
index 000000000000..87572640dcad
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.2.2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic scons-utils toolchain-funcs
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac doc ffmpeg hid lv2 mp3 mp4 opus shout wavpack"
+
+# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
+# got fixed
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	sys-power/upower
+	virtual/libusb:1
+	virtual/opengl
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	lv2? ( >=media-libs/lilv-0.24.2-r3 )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+	"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
+)
+
+src_prepare() {
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	default
+}
+
+src_configure() {
+	local myoptimize=0
+
+	# Required for >=qt-5.7.0 (bug #590690)
+	append-cxxflags -std=c++11
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #591968
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		if [[ ${i} = native ]] ; then
+			myoptimize="native"
+			break
+		fi
+	done
+
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
+		faad="$(usex aac 1 0)"
+		ffmpeg="$(usex ffmpeg 1 0)"
+		hid="$(usex hid 1 0)"
+		hifieq=1
+		lilv="$(usex lv2 1 0)"
+		m4a="$(usex mp4 1 0)"
+		mad="$(usex mp3 1 0)"
+		optimize="${myoptimize}"
+		opus="$(usex opus 1 0)"
+		qt5=1
+		shoutcast="$(usex shout 1 0)"
+		vinylcontrol=1
+		wv="$(usex wavpack 1 0)"
+	)
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
+		install_root="${ED%/}"/usr install
+
+	dodoc README Mixxx-Manual.pdf
+}
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 4449ea2b914f..37f96ed653ec 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -3,4 +3,4 @@ DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
 EBUILD moc-2.5.2.ebuild 2148 BLAKE2B 3039de5a7faa6b92c6b9c836a5268896eec61657dc9ce98075f39096df8b3b21494b2bcc1fe7b3178d6870be7505bd8db5aec1b9e08118ded7c315f4dcfec172 SHA512 9680c784f3dcf4a1ceb57c5df5b6c92e27bd3f144ff49d3805fbe8a3afb614b72c40160da15f3a204738a935d6fb84aa16dd329002c59a461e0550c15a80ed5b
 EBUILD moc-2.6_alpha3.ebuild 2311 BLAKE2B a33ac63830fb03ebeb5fe6938546e9e8ead84bd6ac6861b52fb51e0c53d0d7558ba9535fc6f852cb50f4eaabb411f2cab9d8334419f6cc1dca99490293aebd7e SHA512 b6c43e2a0be7d2eb7357f942070d875962fd4a91057db291e35a8c56df5f9886116484729ded2cf5f7d2b58dfcac266fb37fb17a00d3387232354a040c62c026
-MISC metadata.xml 596 BLAKE2B 4ebc0826f9a0352909b2dfcfcbd7712d0af6b484b5801ee8e0b73be7a5966968af27d5fc4d56893d407e0bbb3809376f8336291901bc36aeb2e43e549e60bc44 SHA512 f2ca529805ed93256100396a8ee414ba1098097eb4a8379144d52fbdf02d98a05c399cb1be861c64eb712bd5160f3286c30e73875dce05ce2e974f7123b40699
+MISC metadata.xml 532 BLAKE2B 79a7280e9bb412be2a57f13259d34ff2d2501bd3a34bc74c6fe5ce2529842dae5f199a674224b0b13883af8536fea947e98c6054c3039141a60dbc436ad4a5e2 SHA512 62746eb7250465ef0099c8b9c8e906e932d1bb5c9ac41b1a0192ee3cd4fa79698342b6fac2e7646d65197ebc9f7a504ab733eb2b889b7e84d1a8a9fadfc2ac57
diff --git a/media-sound/moc/metadata.xml b/media-sound/moc/metadata.xml
index 67fb1868a11d..5d50f496122e 100644
--- a/media-sound/moc/metadata.xml
+++ b/media-sound/moc/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="cache">Enable tags caching support</flag>
-		<flag name="magic">Use libmagic to determine mimetypes</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 		<flag name="tremor">Build vorbis support using an integer implementation
 			of the vorbis library (<pkg>media-libs/tremor</pkg>)</flag>
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index e9004eadc92b..38e906a7bfd1 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -5,8 +5,10 @@ DIST mpd-0.21.10.tar.xz 670952 BLAKE2B efebbd5202b82e52800ff7e4f60fb9e7606e0b07c
 DIST mpd-0.21.11.tar.xz 671444 BLAKE2B d10e65103e9c0c6dfc44f8d4858c202ad68a5e7a44bd7dd473b7f78c697b20ab7d52d2bff0f7e7434ce06b1afb9a68e6f71ca6148efdf51e122c463506b356b2 SHA512 40e25428295f1bded618872c1450f6836c46b2e788dca06d0af134b939a25a7a9a215273bb005306df288e5dc5ccb44d4054c47e5583e54b970fa252e4b030a7
 DIST mpd-0.21.12.tar.xz 672144 BLAKE2B 06eda513314fcb028784115cfc378d0d6482174565ee843a2025af7b2af1fdd7dfadc05b08981e227d11b615aa457f979e80170bc1a91886648f464772240ece SHA512 d35eb7162cfb50c10d57d1d4b035f6c4f7088fb930add97c2159c7b29ab9d7ed33a8b4d22640af78527387305b9f5d380c7c03b98cf957dc1519f772d842e7e3
 DIST mpd-0.21.13.tar.xz 672184 BLAKE2B 5aad54f0d747034f3e43f741ecaeff8317a91192c125a4631e99978f7f9c7274a921a05b92a4496fb53f70ee428321f5ae92f96386e439733c028664d80c4dc1 SHA512 626e658b4d53408be5419ce3a93a19005da5c5386119b241c1572eaaba96a628f941d5f46977de08e1de736eeab6cd6ba274d5df8f1df3e3f4b0df064a6ec43d
+DIST mpd-0.21.14.tar.xz 673036 BLAKE2B 73eed90c0d48e26d747e26b0cd000d3e0a12dfebb015f865fe9d3ddbe5f7fa564b1655b7e0639951e9aeb2554185063b11d6bc818813ca6366688ea05705ba4a SHA512 d5ce06741444d545c7334f4c4ab32dbfacaa264df5a1ac61b73d951e0a6f952c8ea1e4df1b5bfc827e7faa35a6b8026e78cbf3a057ee35adf448fa7204389cd9
 EBUILD mpd-0.21.10.ebuild 8127 BLAKE2B b1b725c5704f4b7ae9eabd50ab31543f1f0893c2377a9eb62acb97109bdac197a898de0597dbc13778932d22a769f613890f1bd3e5b49e55312dd81779f1c8f9 SHA512 61c95152724bcc672d0dbc8597b83802928edefb74bbd6cfaf74735d06683cded78fac33a7bec08de1b5d23e3f8ea6e213e223d2a634e2f67e09d575391ad3cf
 EBUILD mpd-0.21.11.ebuild 8130 BLAKE2B 1ec6da3cd0207ab701ef1571cc2a3ec1711302104eb480b456f0c507c1819f2be28b8e8c6c9913afdc4181bae4b3d25970aab94ab51711aa6f9f865f72e4cd62 SHA512 6ec92a3c7f9d0676d733c3b14fe2c936aacce2dc585f3b6d078170964664add5a2f94ac53a978c6db417cf32791f5af7bf91c4291fe1597c98db3bca1c908c62
 EBUILD mpd-0.21.12.ebuild 8130 BLAKE2B 1ec6da3cd0207ab701ef1571cc2a3ec1711302104eb480b456f0c507c1819f2be28b8e8c6c9913afdc4181bae4b3d25970aab94ab51711aa6f9f865f72e4cd62 SHA512 6ec92a3c7f9d0676d733c3b14fe2c936aacce2dc585f3b6d078170964664add5a2f94ac53a978c6db417cf32791f5af7bf91c4291fe1597c98db3bca1c908c62
 EBUILD mpd-0.21.13.ebuild 8130 BLAKE2B 1ec6da3cd0207ab701ef1571cc2a3ec1711302104eb480b456f0c507c1819f2be28b8e8c6c9913afdc4181bae4b3d25970aab94ab51711aa6f9f865f72e4cd62 SHA512 6ec92a3c7f9d0676d733c3b14fe2c936aacce2dc585f3b6d078170964664add5a2f94ac53a978c6db417cf32791f5af7bf91c4291fe1597c98db3bca1c908c62
+EBUILD mpd-0.21.14.ebuild 8130 BLAKE2B 1ec6da3cd0207ab701ef1571cc2a3ec1711302104eb480b456f0c507c1819f2be28b8e8c6c9913afdc4181bae4b3d25970aab94ab51711aa6f9f865f72e4cd62 SHA512 6ec92a3c7f9d0676d733c3b14fe2c936aacce2dc585f3b6d078170964664add5a2f94ac53a978c6db417cf32791f5af7bf91c4291fe1597c98db3bca1c908c62
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.14.ebuild b/media-sound/mpd/mpd-0.21.14.ebuild
new file mode 100644
index 000000000000..984310bc5363
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.14.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	adplug? ( media-libs/adplug:= )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		-Dadplug=$(usex adplug enabled disabled)
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index a4c74c827dea..b9bd1bf9d5b7 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,5 +1,7 @@
 DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09
 DIST mpg123-1.25.11.tar.bz2 909478 BLAKE2B e821826c91acd3c0b4b9e6b83df6c5625f86611ecfdedd2dcc12b0ce8b3389199aa4cf7eea48b597e5b7f740bbe2c7612d27e75897e34bed2a2407e98b2b7a43 SHA512 986338d0f4829ec9e40990cb384746c7abfa80d3b3d5656b6dda73d03e2441c1f28ffbe7f3f82b0008a1c4ebcfa07aeffb493e95f13f7d04cbc818a09f1008ed
+DIST mpg123-1.25.12.tar.bz2 910149 BLAKE2B 4e1b6329fafb4d1e018c6f5fc0846480ef8cfb6811f92d745f7e88d45fa6a8704ad707d110b12709763ac79fe095603c8ece0bbecb54cc2cde4de819083a2078 SHA512 fa3c719c68dbe45b265fd7677d0932b07f6a14e7ffe365ede965ff1637e655c4b57c86f7e4cd60cace7df5fcc93d48e0d44f082931394b7c6ef19f5d11638eff
 EBUILD mpg123-1.25.10-r1.ebuild 2860 BLAKE2B 0d25dbccc63c6788dd6c1e0c3a15fc8766d5e5616decfbcaa8f3567a53b98c01c6fcbbf23a4aab85369b14d8eb30498be411cf3cc1a8d577bf2f73dbc08849cd SHA512 20f23de51561b06b5dc1c6ef2923afb7f855caa234033847259223d8076588197f7c9f84be7421bf70d01f2cef3bacfa6b21cdb05e36c59539e06f9d3918bd44
 EBUILD mpg123-1.25.11.ebuild 2884 BLAKE2B c3d89fc5a388dedd602be32569f3d1269d1b30b1ca4728abb5e14b979a37ae1a29c11e76b0afdb5fd231419750d6707e6b2844485e867479f9c7f3a244d64898 SHA512 95c204f1ea1e0ff2406daef4114d21cdd74d62842215f977abdec3736c6e626345e112aaa8d035d67aec0306cb121f25f5c3b02c834c874e1965883d50fd3f1b
+EBUILD mpg123-1.25.12.ebuild 2884 BLAKE2B c3d89fc5a388dedd602be32569f3d1269d1b30b1ca4728abb5e14b979a37ae1a29c11e76b0afdb5fd231419750d6707e6b2844485e867479f9c7f3a244d64898 SHA512 95c204f1ea1e0ff2406daef4114d21cdd74d62842215f977abdec3736c6e626345e112aaa8d035d67aec0306cb121f25f5c3b02c834c874e1965883d50fd3f1b
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.12.ebuild b/media-sound/mpg123/mpg123-1.25.12.ebuild
new file mode 100644
index 000000000000..b0eac0164fa8
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.25.12.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="
+	app-eselect/eselect-mpg123
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+pkg_setup() {
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+}
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	if $(multilib_is_native_abi) ; then
+		local flag
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		_cpu=generic_fpu
+	elif use x86-macos ; then
+		# ASM doesn't work quite as expected with the Darwin linker
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=(
+		--with-optimization=0
+		--with-audio="${_audio}"
+		--with-default-audio=${_output}
+		--with-cpu=${_cpu}
+		--enable-network
+		$(use_enable ipv6)
+		--enable-int-quality=$(usex int-quality)
+	)
+	multilib_is_native_abi || myconf+=( --disable-modules )
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 9b645b8cd7d8..b5644b7d922c 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -3,5 +3,5 @@ AUX musescore-3.0.1-porttime.patch 637 BLAKE2B 2272e64f8b6944fd25567dc1eafcded49
 DIST MuseScore_General-0.1.3.tar.bz2 33164726 BLAKE2B 88f41b76a11bc33dcaf2c8b41571f65c495b2b35095ad02f9549e98cb4bfe820e0a38dcbfa6fc1fe956fb284288eecf72b76895fec83799a5aa8ecdc3b63d7f5 SHA512 91e38a48ecb60c010f0b833bec790071db29ffa5c7895f653a8467eea1d179139c85415e8858eefc7eba22355d0a4887f462e1a1f0cca87b054bc5e1f8e4d38b
 DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9 SHA512 d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d
 EBUILD musescore-3.0.1-r1.ebuild 2433 BLAKE2B b41f19798c7702f5b31c29f2feee04e4c2973846e40ab08d3c1b5db7449448b9a14dc90aa16f5af3374b1d359227721f853a3e5d80468087bebe502b7f5398c0 SHA512 db33d86a72952ec81318fde0775ac70ea612928ff14b5b422b770299d09c2e05ff7a79e1c2784e15ba1739e2f3990595177b43cbe1a5b0d34b07fc78e099ffd2
-EBUILD musescore-9999.ebuild 2634 BLAKE2B b97c89d8ce5b5b63c762030be4d2912d8f7c658c568fb06210d06964ea046f7f189ab9685792cd328abee7d0b9eb2cb186e639e3f40b410fe0b41a5ce38e54dd SHA512 6de966e26fe26664bf7348fa35d0ce027c6703f4f23c86c131f3419ba72dc803caee766fb821339d84521175be2691c301ccec1e8c0d6b6379f5dbd0ada58454
+EBUILD musescore-9999.ebuild 2592 BLAKE2B 79b11923eccd097e55d417755551c127eb7250b0d828f6dcf4144ea0125412094e1d016057d248e3de7d53b0f46f4b5731cf60c28b8f325d275fb6990c2a6ade SHA512 7d46cbb33797f26dc67879531d0504fd49f78ead44acf2f2352fff37146735771beefb65123c0b71ed3c6bb5d392c47be32365cfeabd04092cd4be58d06c734c
 MISC metadata.xml 685 BLAKE2B 1ab11b407c05d18fa7fea53e4965f37dad96d2845fefc0ead84dab785a8c7684866e6455e500035d88a26ab3a59d18509e85811a5cc5a291bb033a78b55455b0 SHA512 3c9ad5c65edfafa2019ffeeabe13df04bbf5ef3dcee206284cf7e8b79543782da1312f7f443e4ab569248216410c4ac302ded74e074606f6ed8a3930344f483b
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index cd2dec78e2d4..54404ac316e9 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -51,7 +51,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-	"${FILESDIR}/${PN}-3.0.1-porttime.patch"
 )
 
 src_unpack() {
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 17f07069d8ca..a37dc2b78801 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -8,6 +8,6 @@ AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
 EBUILD pulseaudio-12.2-r1.ebuild 11536 BLAKE2B 28892f7980092e0a314c5d69edcc88d5d9be7dd7a8845f4396f2d4a885ab69b1cb9298f3bb720beed253b5a3ed796ba8e55c94c63f7a4e1ec9b4ae7e369f69b5 SHA512 529c755ecbc2c8596cf295fc56c095dd7b987a5b7e1eea9b35ec04993ca0967e1afa52027e3a7a864d12f362f25d2cc1e2190b6d4c91a5cb730535c6bdd403b2
-EBUILD pulseaudio-12.2-r2.ebuild 11724 BLAKE2B dbca0d7b5fca05d32e44aa9e97f9b5a5587afe208bd836880a7b626317b4f7a79e27592aeae7fd887ff8914dde86a4d70570ecfae91b9d0bc2fa7ce01a6e2a88 SHA512 699936b7847cbe78665773f8330c237dfba7004df1c107d71c310a0b99f54d207267a4bfa2088d2eea937a1f55cc19b98f164f68e1de632498be42d1447525f0
+EBUILD pulseaudio-12.2-r2.ebuild 11719 BLAKE2B 1ad6d74fe06e3138c497dbf0020eed28ee958f41c0048b55c882516c5116a2afa49749b670ede6db471c3782b8ba99712dfa5bf45cb606e9dbd928c530576eb8 SHA512 99af1eef5dc60f3a6494329d495fa0d446893f3de7918d816089bb7349c56c88fe49eecf52f90ec167a05c319e68b3da5f710136185736547c4136df0d277db3
 EBUILD pulseaudio-12.2.ebuild 11111 BLAKE2B bd002a2bf9d7c0521eed3baec7d2b602302e8cd4bd7acd6ea22abeff54ee1be8042b44bcfd64a7f4d57f2855a958235d5b16fcf018f0377cd5f5faee040c84e2 SHA512 dd20835fb783428209dcffa07b0b4c1ec9f3e42b91faf07052df5f77f3eac388ee91dfbfe2da7f07890ae3631234a8a14bfafc41875c6716c6b8b9e839ba0f21
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
index 4e7497c6168c..2a4cc0e9089f 100644
--- a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 75d43af04945..3fd2dd5c6ff9 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -3,6 +3,6 @@ DIST pulseeffects-4.6.5.tar.gz 1881685 BLAKE2B 25f9fd27f2cb66ed32664aa5aaf6e6a7f
 DIST pulseeffects-4.6.6.tar.gz 1881680 BLAKE2B 9bb1048b3870824d19f72e29da2ee274ed387bea7fae0036a104694defd47f754fda3fa1668a95ddb8c2ea066c457bb469c3c32292dc7a378625c6f19d9339ff SHA512 ed6482169bb06490bbcbc57f293723089e5750279a74d6ec5ba2693cb1a71df88262e6fd7d91c852ba5a75b07c246992f619299017e856fca38ad5c619486963
 EBUILD pulseeffects-3.2.3-r1.ebuild 1542 BLAKE2B b98afac0e18f40b4d50578aaa766cf077b73157aefb380fc766e63cd6e1c43b2ea1026ca30b9fbcdf24aa3d150b6f835664668dded8e025e9b2b4b94c558aacc SHA512 14edbfdc37cebc7bd6bf0b9f1f1ac0217da3df742e52b1762d186274eca7cb05ea953c2289059836417430c0bc528f3327859a4f2c4f8d4e5ff99f2ee2d42d4b
 EBUILD pulseeffects-4.6.5.ebuild 1804 BLAKE2B 440b75afc189ccd5efa34f187de3dd83401ea5d756e8a8bf1fbe6878d1d47ddcf1e0cc910346dbbe34ea3390924d2906c8c91a2733d80b2aca2e0aed5f42aed2 SHA512 49381d15e31c49220443f35b4f31fd1bc46f1c74d4989dc8dbc8f1b635e7ef485d0ba106c1f99cd98c129f60914ede3a7820f692114e40ca4edeacbe8fb844e2
-EBUILD pulseeffects-4.6.6.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
+EBUILD pulseeffects-4.6.6.ebuild 1803 BLAKE2B 62eb4d5b56e930df0ceda31bdeebf26ae89f80108f1754c6718342468481768dd5dcf8a5b0006a77ced1a92c3d8504142b65dc558b26defb4295caf20699e9c4 SHA512 052459a1211ea7a74265723b6d4352d0c79346195aab43136b74f3be7a3cd29a4cb8b53874b9106419d7cc3dc3e194dc36c7f7b67aa53450872eaf614f305a33
 EBUILD pulseeffects-9999.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.6.ebuild
index 0e6624cf2428..9ff4d83fe6d1 100644
--- a/media-sound/pulseeffects/pulseeffects-4.6.6.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.6.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="${HOMEPAGE}"
 else
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 3864a887dd72..aa5a5bae9d96 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,6 +1,8 @@
 DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4
 DIST qmmp-1.3.3.tar.bz2 1244817 BLAKE2B 913f52915f30607044168d906b151cde8e7ac5e3c5b82c452b4f297c5e5eaa05ff2fe139c671a46beba351f34bfb013a8eb4d98483dcfe260fd63d8f6b09e244 SHA512 92deda33ed90d5e802258ae014452e5ce384c6ce0d437675b28ead8a838bcbbb2d0b4242b98b2a0f32cc922e7af69b72479fdf8a7946f1fe041a6803a6934c8c
+DIST qmmp-1.3.4.tar.bz2 1246048 BLAKE2B 8108e1b5f0098ee1338ccb72889614d6876855f22159e48cb54a3000a855e843d623a3a491ebcb2e7b627c014946190117bfed586729b424dd5a3564cfdc5ba0 SHA512 520a7b50a3e0bd17418bd3137a4e73a52f644ad38d7fe86647a8781ed3036cdbbd14d5311b9471443f8a2cb42422b5fa11e22acee72ff5b670a7508b55364bb5
 EBUILD qmmp-1.3.2.ebuild 4268 BLAKE2B 9027930e327d56248e1d4d83e69895a3ad9b0ffc9d26d67ce8ec073b72a8392de89509e59041f79e778c2e1664c4a62fdab3df8645a0cb8edf724f2879575310 SHA512 1786f3400aa0d8426744149bfd0ea1c7c2a3180be002972c52e800d33747f8beb8efca9e4a86065e944aba709b73673dc4f056ea9540828cfaacbdbf76186cf2
 EBUILD qmmp-1.3.3.ebuild 4270 BLAKE2B c9e7ba05de9d12abdca56bcaee34767960e656be3461c52c5e01dd2d6a0c7272938d245f75500e4258bb111feb3efe538bb14673fed0bf192d25fd0b5015b743 SHA512 affd8b3ecd07dffdea15558805788a8082e490f991922dfc3a612ab523010c4c21f0ff172e9f6db955c30643eb94d2a2df923c02f1878ac03a4ab36f93b99c19
+EBUILD qmmp-1.3.4.ebuild 4270 BLAKE2B c9e7ba05de9d12abdca56bcaee34767960e656be3461c52c5e01dd2d6a0c7272938d245f75500e4258bb111feb3efe538bb14673fed0bf192d25fd0b5015b743 SHA512 affd8b3ecd07dffdea15558805788a8082e490f991922dfc3a612ab523010c4c21f0ff172e9f6db955c30643eb94d2a2df923c02f1878ac03a4ab36f93b99c19
 EBUILD qmmp-9999.ebuild 4270 BLAKE2B c9e7ba05de9d12abdca56bcaee34767960e656be3461c52c5e01dd2d6a0c7272938d245f75500e4258bb111feb3efe538bb14673fed0bf192d25fd0b5015b743 SHA512 affd8b3ecd07dffdea15558805788a8082e490f991922dfc3a612ab523010c4c21f0ff172e9f6db955c30643eb94d2a2df923c02f1878ac03a4ab36f93b99c19
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.3.4.ebuild b/media-sound/qmmp/qmmp-1.3.4.ebuild
new file mode 100644
index 000000000000..13f7bd0c2f20
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.3.4.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.3"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
+gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( || (
+		media-libs/libmad
+		media-sound/mpg123
+	) )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/sfc/Manifest b/media-sound/sfc/Manifest
deleted file mode 100644
index bafd5cf1b51d..000000000000
--- a/media-sound/sfc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sfc-0.018.tar.gz 125680 BLAKE2B e46d66196eb8686b3140b4dc5090b72ab12d07395aa335fbf6d9fd6e4f6bad0ed7906107e6c544689c5e4f1abddfe609a8d9c633fa02c2d2b8acd101b435c0ff SHA512 9007f00d19acee7150b48718a742cf05df471c69a2f36cdfa9572aece80e1711dde03f9e31ad32892ef8bfc4b33a145d17ccabc29c63cacc40bb071a8b8b6262
-EBUILD sfc-0.018-r1.ebuild 589 BLAKE2B d0217d9a297d4f5988e8ac6b929c87b7b8d1f85049e40d6c532d096e4b87fe816d1868f037d000d7fbc39a012092d8e4a403ee56057c84bba538fd2cc76ea5a9 SHA512 fd4e67b686fdca772b334265ce35e6cdb831b05ee36e1768287e7701dbbeeb5c3d48d6542e1f8a069502958ae88cf6be519f8b3632bec5b1940f7069ebddfcfa
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/sfc/metadata.xml b/media-sound/sfc/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/media-sound/sfc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/sfc/sfc-0.018-r1.ebuild b/media-sound/sfc/sfc-0.018-r1.ebuild
deleted file mode 100644
index 58a1f87d34c6..000000000000
--- a/media-sound/sfc/sfc-0.018-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils
-
-DESCRIPTION="SoundFontCombi is an opensource software pseudo synthesizer"
-HOMEPAGE="http://personal.telefonica.terra.es/web/soudfontcombi/"
-SRC_URI="http://personal.telefonica.terra.es/web/soudfontcombi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	media-libs/alsa-lib
-	x11-libs/fltk:1"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" configure.in || die
-	epatch_user
-	eautoreconf
-}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index b65253c1da9d..ce18023f9516 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 74a69e7a562e..048aeb0e3869 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,55 +1,11 @@
-AUX generate.sh 803 BLAKE2B 67f5af566254df6205fb4a97eeae72c3d4e6a49b3eee48d828ba8894462cf7fa658469701d03bd3a0616795f61cb3375689d137fc2b2537cf2800a782a1188d2 SHA512 064b11416be5583202d92ab0c87156b7098bf4a97c7875ad3a0b11e048ebcfd69aeb22653e8175e7ad0cd400ed2d9c27aa8d1d25be04d34438f4c4f86e329986
-AUX kodi-17-adapt-to-deprecated-symbols-and-functions.patch 17601 BLAKE2B 480fea66d1151b4fc03c6006ad8a3a9239c0a527b02f3d2ec6afbc42cb1a5e747b3be73ed49b6b727cefd044f002987dc27d2ee086242edc2b4198b0f6791f0f SHA512 733c86a24eb3b38e03187d929ff997b3f0174eae6adf61a4558a8bc0fdc4fcfc70e879d0fdc6594a8e116f801f18ec07faab04bfd00727878872b6fd357fa453
-AUX kodi-17-fix-audio-with-latest-ffmpeg.patch 580 BLAKE2B f979e3ff53e6ff08b6852059c3a82779b8688976f593fd480c1b4d464fa5f1edb21d103a24809ba435db69aca4acf03d4b0002c716caf9f3a1fad5d8b18ed71e SHA512 3c35ef05b79cf0af9bacc74bb79dd1178efb1cb6de0354b7a35c732c2006cc7071748a062f3b274591dcb30179d4cc0af527a223dcad2919426bac663f038dbb
-AUX kodi-17.3-ftpparse_string.patch 2076 BLAKE2B 9f00998669c07637eddcf829075babe11d69ed779c30e6364115fdeab83b8d95be63a9f123934909e708f19769d0260f4e47e5857ba76c139fd59ce59526ecb5 SHA512 d23865fe6624291d88c0a7674aa52b7e15889a96eb41590827248d8215643f773d0f02871efa858d2c533674627d4e6ebc69cba56be6ec9b58277bb2d6c204df
-AUX kodi-17.3-unrar-vulnerability.patch 1883 BLAKE2B 1e522f0e2637f7e3aec1077f2cef07ba7b2feb5987ec1ad6674c769ab590b36eecb198a52bec1d46903de608f206839a2f0742adf33ce624bb0fbfd1a939057e SHA512 5c59a3c47ea9bcd21712da0ca0dc6bf0618f2f9cad6fd011ebcc94ae90868159e528237727e174a5b137b2e6ef2cb895c01c1b4be91cae0c402697a7d85791aa
-AUX kodi-17.6-nmblookup.patch 988 BLAKE2B 7ed3a0fc32d8eb60d0eb84f325ceed5e6c450e199efe2dcec94dad5aeacc9879ab6b25d893798e1d4951846dd64f53146ce3a75a3b0fda05b0d6b79ddf65e802 SHA512 bed33a4abc79cbd8318e11157041db94a1f56d13b70db8440f5890ad070784821f7f4382f74398ab478663ab9812eee105f2e0a3653ce5b79a4e29536a0899d3
-AUX kodi-17.6-wrapper.patch 1422 BLAKE2B 9b0ae9c7c67c5b6c1a8a19ac9ca8308d544ad2a495fbf7662a8b1b4a492ea44f2771cd88900ebc598a9fb7d29e66b837fad6cb5063bdfb610b1978649e927a23 SHA512 1e23b4a90ce4ba29d0ea3285157b1ea44be625264448a08213ec6b2c659dc6c5af1f32f51ab059318d913144d14ff9a4a763dd6707e2c2a7824752a3ec480c2c
-AUX kodi-cmake-no-java.patch 2297 BLAKE2B a993f526c3d3c72ed4623655effaf27fb6f2cff89e0c10847a74ee0231a20fd12c175adcd5e0f9c54e2f6d6643966bb4d56c10112ad3cea37f519f7092f20e04 SHA512 9eb7d64694411ce7e47976291fabce96b055c8b4b60bdd7cd37f992d8a3c813de1ef828464e6996124303b015b5c64eccbade10290747180f4ac1fe6a1747d19
-DIST ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz 11188798 BLAKE2B bb91a89a47f3ea6894f28834b477cc2c2db64590e0202b784182f724e89fb385385218463404076565bedcd41a81797c2f340ce579aee75e09f2c99ae494031d SHA512 b28bb6970c6767213f34e5f4f3e48ad5219a6c668a5264ff7de0a42712cb7393f389ddd88f56785a2dc8089f8231ae5fd05adfa10dbf15ea3e0ad7bc2ccd4d73
-DIST ffmpeg-kodi-3.1.6-Krypton.tar.gz 11170735 BLAKE2B b78a1825ea9a85a91bd9244f93eee1ccd603d5150ee26f08e2de3d04d8a2bb945b1fc16a12d6da98deaaf1bdf5b5a78d75f8814a0cb3d7177980cf1f19440069 SHA512 060d06946ee71106196587b36eccf7fb7d0710d6ee72dae2e08f23e5bf7e223a3bac77f1730121f494ecf5f860a40635978023317a06f27a3b28752fa537f1a1
-DIST ffmpeg-kodi-4.0.1-Leia-Alpha3-1.tar.gz 12417851 BLAKE2B 5275ca29c926c42f0597d9cc4847d597aca0c1ca3efbf3f64d97bde8040386187fbeab5a482179af85977aa72bfd495aa4ea40a34264e2cf29ace3f281da85ca SHA512 f22dd1bb177c218ed049697f3483bfa19a88d36e99d9bdb6ae423c7ea3b9e8fc6e21827c17109bf4b6e7edee1016c3a24168ac2282da19c91a0f07c6c0af9d55
 DIST ffmpeg-kodi-4.0.3-Leia-18.2.tar.gz 12426917 BLAKE2B 83da9511d7b4ef6a8c813561a061c4fe86712e4424c30c9005500751c6c79f4232910caaf13cd34d2db1867f592b042dd291d6c32a77f80107ce87a3a7db1760 SHA512 b4d4bf16f05b953ba81769446c8fd90246e1919b9ef671fb212008151c83d8445e4123ad37c352aa6243074962832e817749d2de318eb721d5bb5d655fd77ab2
-DIST ffmpeg-kodi-4.0.3-Leia-RC5.tar.gz 12426965 BLAKE2B 6f255b7d0cbd12eb066a63e443ba4017b05410c7ea79fa6eb5577a12c373e06dcd6a6999c98eb6a797a4b015ec627bf7cb52647e285b017539c587a2b72d5ad4 SHA512 a95eaeca26baa9dca4343f1ed6dc068e0800199997a5ad1a28664061e533aa8b0e6d0ad53c18009e21bdd09177b7eda8e59a5a98a10f0f6a081cf03803ee9277
 DIST ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz 12430413 BLAKE2B 6de6fde2c16264f851466b46f87c23c34e7d503203f69d47342d46034f153860190d196da51221f866315405c8a33325b2160283333256ee5d5e293336afae99 SHA512 c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078
-DIST kodi-17.3-generated-addons.tar.xz 57548 BLAKE2B 794c20a2e494d02ee21260080ea4363953a44f424113ef92aaa2aa6e55a1ce51ce9fb84dee4acd10a3bf18af53c22e198a785ddcaf900f31f79b3a272bec08e9 SHA512 56d1912f5e24d3fcda3010783a5b32728ece9c81c718ac6f8db2cbbd096059fe97b8d1971b34bbde1216558a8e5db874f7b2179e1f18942774ae5486167bca9a
-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
-DIST kodi-18.0rc5.tar.gz 50988431 BLAKE2B 4abf13057e04f1cc3f600bbedaa9f5d641a0af59d283817410aa38c41141d8835b8ce59ac3a851e1f59752396236dd195e7ace5f233ad22127597c8a964986f4 SHA512 d5eca9c4c7380c93d1339187017c36ad8424a7484cbe0f77281c561e37896e44a36da534a894ecd30fc4eea43fc0b1703bb0e545d04d5f8c7c93eaae23066884
-DIST kodi-18.1.tar.gz 51001112 BLAKE2B 65de0adff0e387821f0043156a20da2d99feb6c1d2390efa5d16c7e3bdc1f724024c0d00781be59b16a78a73b5ebb2d16602f806d32c95362732114279d42d71 SHA512 2df32e14e1138474cf0a1b8102b4c734e1a54799b1aab049cfe9f623f467e0c9eb87237b4c81ded280e72bc4655a27a887904d164927b3fd227a9c9311531ebc
-DIST kodi-18.1rc1.tar.gz 51006614 BLAKE2B f547b72d84943ea48be54640c2569df11a779f5fd0e8f7ca822e6c85d78f20f1945d67dc277dc175a7f5534bf2694e6f6893e6e22a3002382ed7924b8b6b8cdc SHA512 1d9fff991ec0e72f9a23179269c0ea6ab5729bf0904eaeb7154a200ee8acf38043a7ef319eb603fef9db02367b7a98356f571df8397a23672673bc0f26070cec
-DIST kodi-18.2.tar.gz 51012621 BLAKE2B 363e7a36c236bec3a962a786ac1f2ba27cf45aa32046f5f66196e8ed4786631e00c525b4ddd975abd419b9fd1f5831aac52a18187cead8e54527cf67159859fb SHA512 7b63dc9c082f538690d28dd6da10999888af2b9de2e532bca54420753f64238f42e1c2aa0f7481c823e544260a1e4d68e1ba50f84db53307d08f0749992dff2f
-DIST kodi-18.2rc1.tar.gz 51014723 BLAKE2B 36d3c54a8af64e3f3db0fd03b900cc210361da10a5db60321334b6eec5f9c8c1b8aba47884a3f0dd3744af4ebfe6d0a05d7b0dfd3eb023a9679d4b5f9c118552 SHA512 d668b315e9fe5cd694fd061a422e9a01071882f757a6fd0fa15280dcc70c0ef440de16c9208242e1df1f3225faf2f15fae02de978baf638fe44138c1f9f52607
 DIST kodi-18.3.tar.gz 51013397 BLAKE2B cce29d481397dddd3c942f83a034bc6d73eafc1be2a50436e1e5611ccf04c27e6110c4b4f99f7f7d1cf8da3e2550209c8bee3db6e98136b8fa9738c4b1fc7e43 SHA512 4e898e28238dcbc67e106c5a0ef88bd6a82f8c0ad00e77e3ddbe2da6181b37d9ca1ba6bda57206223cfa119c5291edb4410d3e773d97b5ab67660e49929437ec
+DIST kodi-18.4.tar.gz 51027569 BLAKE2B 47e3377abb4a1e5a3c26b1519f45ab9347127467594841ac689b857a3f4163731951d4e1e4960bce5c2af4fa224acf4a3887f42bdc41a603bba4979d3bcbcda8 SHA512 ae08fc29d20387d9352dc1ae4a89da19962a279b89705ff8f7869377281589d44a685cebaa8509d3252ae79215dcdaadb72e9fa752e6d2bce59974bc23276aad
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
-DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 BLAKE2B fb3973e098201d177309ad7ca50131725eee4bc6f30f425efa5fea406411f6143ba03abd82cd6c91a250419d3e0a29aafcbf981ba015f6e14cd0ceb001222c12 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9
-DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 BLAKE2B 0a211fcedb216567bcd929048af01486ff91efbb8d31592fd116676b6ae95de3cd7bfab7cd79853b3d15e96c27e62cce8c79eeb9baee68a1bad4f3fce8a207a0 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
-DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 BLAKE2B 37521d50f9983290df5209db417e39ea4f3dcf5c36eafe9f75a8c23689c7302c29c4197e40eebb0f1b35cd16e5264e251a72548a0ce2ec2ba1a3a22c1768adaf SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
-EBUILD kodi-17.3-r1.ebuild 8485 BLAKE2B 2fdfafabdecca8dec1d06695a25d6f96f48058173bc11d370f325fe67d9e2ed219f63ec8b52399c5f2494d110edc4af3353f2360335dea1e5f2f47f34359ea62 SHA512 a64b804fee9c685c976a29fe739d807f0d34a329aabda2d5f7596b87a68357e4c8d2f1bdd9fb51d99b18e6e0b7727cbbccad7f0ae7a73bb67e15913ab4b0848f
-EBUILD kodi-17.6-r10.ebuild 8203 BLAKE2B df4c784b7bd8d41367c223927ad7a74d61a7e6564ed46c38d4683c8fa5d3fd13515d5c1d36d653ab27ffb9d4a51b34d13c0fb4083461e6b5067ddfd8995c8101 SHA512 7040db101865fdcf2365d1c6a7f64361423f68a3e773cf737e83ad5f3e28a6501d5dd9bfbe6cad6533758e281c47c2789257614ff45a56829332c6329ca8ce3f
-EBUILD kodi-17.6-r11.ebuild 8175 BLAKE2B 45cbc5b940fcdf2a3d6a410574b7ee02707dc2a48a44d370daaa61fc9697b74d956728b7d4780baa8cfa0750d19160e49f4eb664f1943b5eced286ce6a4d699e SHA512 5283a2f69376e12da2c750abb75deb127a3dfa66320e4d49182297cc48a4b48b856a6fcbacc4d63e0f34934e7e9a122d242eeb537e3230dbee7d085afa4bd6c7
-EBUILD kodi-17.6-r6.ebuild 8690 BLAKE2B 6aa3eb87547491d76fe0e59c0aebc7ee6324a6d92ffe98cf953a46f66230999bea4fad45b5f73bc6a05d3862077397b5624e7a1e2b567f13dca409d87aa03d76 SHA512 fedd01acba40784b4fde629d0444928dd48d99653d3aee4c641d8be3349878ee081b6887c2cf055075df70d9be56ee3f4a4bb95b66eb8650e9c45dc1ae0377fe
-EBUILD kodi-17.6-r7.ebuild 8773 BLAKE2B bf3db1d000186a7dfd46e099a823972d9df12cba0f79505e89044e9ff3f02f137ffd353514b05e8b0fafe8a57a04d269f7efa8be361ede60f6c125c201f838bd SHA512 73d68a91e7f1dda0be45a285254c3034adb15dde12a4df8b1a7b91254e19ed6f1cb153d81a44d701752460e134840efc38dc75d17a527f82f65319e295cf4494
-EBUILD kodi-17.6-r8.ebuild 8777 BLAKE2B 7df540991cb7dac31726d80ca7a0c4f3e4afa88c0c0198adf81e04ff3a08df302ff368d62336fc6787d916337e6d1a49d21e37d253e1c7e52d4bc12b1b5913db SHA512 20901f119eab830125e7148108c222ad6b0e505a219c97110e611cc7069a438a3202bc74652acd3d131151c01ed82eafd910f22ff58d930adb5be9f6cde229e5
-EBUILD kodi-17.6-r9.ebuild 8994 BLAKE2B 2b306b859497c171c237784af7999d47532678dce0463d3df15991022145fc7d50f9563c3779a5fde8a9311e054913169f0fefc8497cc4ef65a328477533e3b9 SHA512 bf344acf34e04c31b6f0a15e6f4360521ccda35102a2dc9322b68ec4c06c27cf19011238826a096d077dc4ceb781d3f5c680508501a5196606c4dc99186de307
-EBUILD kodi-17.6.ebuild 8675 BLAKE2B 18cf544064a9ca5316c65ca770bb09b6d1e33dfbba892242e25cef6d0635a01e6f119956c82f4fe72bac538a4e3e084bd632b7bcd73784a86cd7be676d7c2be6 SHA512 9d28ad2828cc78273fcb80eeaedeb93edcf160bb6e7779e0cce56ad8c4bf9fa2b7b234d2882220c0b81eaf796efd23a062c819d3b95f69f74d9d441a442ee171
-EBUILD kodi-18.0.ebuild 9403 BLAKE2B fefe13f053cfeaabc30483bb3cf4362ac3cf398c741f3834ac3e929c17207ca804bf9d2bf3776c27f6c64850b83e1ba3dfc4560ca3702ac246fc5c187d6d1262 SHA512 7840657d4e0cbfb5e7e855caeebcfa00449d3465030c0e30b3390ce2e5bd2061eb750a0805c5c31f9c21c17944ef2cb569753811ed00cdae53482155702f63ab
-EBUILD kodi-18.0_rc2.ebuild 9371 BLAKE2B c774adc97d0bb56f5bb76eed7437b13abfd30c2d1554516cb750bca6efab481ddc12c790eecc1d7bf86071c6d3acf8e33c08f237ef963264b4be2496bae21a3e SHA512 94e6e4a49578f1fa4c638a8684d21a7d5fa5d61da1633cc011e7c1cddfcca71e999f2c41bea1345317fb8717bcf76f4a8816be2b527ad662f1b29e959be21982
-EBUILD kodi-18.0_rc3.ebuild 9408 BLAKE2B 5bc12b7bda3ea32d9fa70537f29abfb4dc96f26d646dbc4f2bbfcc3b9f719aa73c4859554a7718c89a458c89842b6e2329c4cdeece4407d142f4206d2ee1b8bb SHA512 b62699d1fa66d25ccd533bb079bdbc181e783c70a672fd043b481a8fe1ece7d1bfab68197cfa382187f4587858ab931513035fd2bf8a088d7f039af83833d823
-EBUILD kodi-18.0_rc4.ebuild 9408 BLAKE2B 5bc12b7bda3ea32d9fa70537f29abfb4dc96f26d646dbc4f2bbfcc3b9f719aa73c4859554a7718c89a458c89842b6e2329c4cdeece4407d142f4206d2ee1b8bb SHA512 b62699d1fa66d25ccd533bb079bdbc181e783c70a672fd043b481a8fe1ece7d1bfab68197cfa382187f4587858ab931513035fd2bf8a088d7f039af83833d823
-EBUILD kodi-18.0_rc5.ebuild 9408 BLAKE2B fa6487204102b9cb4e66d0c4491b26f0896458d027a69b1d3dab3a155f252b585054249156f69507a4a694e93867d8083261ff1f513924b2bee82fe2bd97ab63 SHA512 801cf45d9f8b4b7a2f238a5ab10fcee885fd7d6257ec7a40db8e817672aa8c350c6066df4182266af43a39b4fc42aaf8ee6bcb07fa3cca791bc12433723ec40b
-EBUILD kodi-18.1.ebuild 9397 BLAKE2B 17df7924e6b055eebd75581df040755b264f8439e8e3d90d8a1a6eb03c5decb66df0f13bd8a83e26f707c6051d142338974291ccaaaaa574dacc16508d987084 SHA512 fddfac0e773895749ce50ed9e4c11eba27bec7e99567552a315297adde37bb95cda9ed0d386d26592a1a05a193a30f6da407e64a73784d419e7acec65ac0085a
-EBUILD kodi-18.1_rc1.ebuild 9403 BLAKE2B fefe13f053cfeaabc30483bb3cf4362ac3cf398c741f3834ac3e929c17207ca804bf9d2bf3776c27f6c64850b83e1ba3dfc4560ca3702ac246fc5c187d6d1262 SHA512 7840657d4e0cbfb5e7e855caeebcfa00449d3465030c0e30b3390ce2e5bd2061eb750a0805c5c31f9c21c17944ef2cb569753811ed00cdae53482155702f63ab
-EBUILD kodi-18.2.ebuild 9405 BLAKE2B 7e4929e4c2812823eb88a338972430767f40089a61bdc735434d7aecd4ffc6c1eebbd49b495c24e2ebbe337a2a8e95b8165b17401d35fe01d5949028db4dd7e4 SHA512 ce9fea754be75f20c41d8eb1e90ab64d61b691d65210e00713e298ec3910f80348ffe80e49faed3669ad031a838a8b13fec611ad6da5f7a2d9f4f0c5f05790ad
-EBUILD kodi-18.2_rc1.ebuild 9405 BLAKE2B 7e4929e4c2812823eb88a338972430767f40089a61bdc735434d7aecd4ffc6c1eebbd49b495c24e2ebbe337a2a8e95b8165b17401d35fe01d5949028db4dd7e4 SHA512 ce9fea754be75f20c41d8eb1e90ab64d61b691d65210e00713e298ec3910f80348ffe80e49faed3669ad031a838a8b13fec611ad6da5f7a2d9f4f0c5f05790ad
-EBUILD kodi-18.3-r1.ebuild 9664 BLAKE2B 37b425e091f20d9a4475208a0f2317b024a5187c5f4f8a232e5eedab0b15e0ee92a8ee1c863623395c799b39104c8b3428209d01dd231592c5b3abedcf93230f SHA512 69d646f0e38d7979b5bc722ae430ab9880867e1371c6c749c7f181b2bdf791ac7d1e0bd061e650b895e2935438021133db8347d5649da5b3293eca6fcf26314e
-EBUILD kodi-18.3.ebuild 9367 BLAKE2B 9650f1bf1bd435c7ffbd6475811497e7712ef541743e08c790922e175053861efd6043d1790847d2a6dd46c424965afb278df3db8e38280e2521cd4b6000a000 SHA512 64b876da649183b8b9e820f6276965c96e55af058a22fe8b6e838bac18a7d9b45fb8e9036476eed339fae4ce52077a375c60eff27b9ea35d0bb6861c144e23d5
-EBUILD kodi-9999.ebuild 9602 BLAKE2B 457a2d5ea848fa7fa39d2d77921addbd2a8ec566d9e06f64591ae168365e2eaad6d7ac9cc6861348a602ae5cab3ed2ebfb9f2248a3d523a4019729cd58c590ca SHA512 06944512ae8d10adb7724af95cf06b7d5ccd80e29a02e713ef29d8c6174c0560908c294954a510299d0cbfd66400aa4a36749f0da86bc9bb5e9a371f51de2228
-MISC metadata.xml 1837 BLAKE2B 7052432c77adf9951a0f6e18334034236db79bbf364a0003c9ed5dfe715219ed4165b66a6e6a74a065616956d2f32d450dd4f2f73161c47a7e71fe6a72bc323b SHA512 8a2761b8c4fdf0f0da113bba03fe36b1a7a28193e90b1b1c281f6fc452ba6879f385a37781b43c1022c2e51c4c0db173441343bf165779fa0bd92d80e1e94113
+EBUILD kodi-18.3-r1.ebuild 9615 BLAKE2B 9b507cab8dcf05014fa2c35af477afeca13c9c09e699da7af7d199974f603ebe900e59f25f7f7cf5443d1a8cc1d1dbc871f21509eefa826c237042d2270872cd SHA512 d53a257d5552965e26ee3e9037dbb58ec1661c8a5964160822d14fc63c736d6304e3622369378ba1888c587241c75e4fbbb7345a7082047bf59d2e315aaa1cb1
+EBUILD kodi-18.4.ebuild 9447 BLAKE2B c7b046a250efdc94f21e184cc598eae63385f7a2f9c1c6284c7f99ef35c63805dbf57cdad3868f46a32268ad185e843bf43f89e3993cc38fb2b13d90ff722af5 SHA512 90a84232549ef0fc88a4259aa75d891079d3c83c1fe82aaa645740b3922257a77721d23a8a7a70bff281d89409964dd0862abd474347944987f4a5b51e0a7330
+EBUILD kodi-9999.ebuild 9396 BLAKE2B 224a84d4c8dc2174f600400d56995ccc668a9070832d10e13eb739e3f3a1774875e6b4db4b97504bc1248bae325c8ca539739c0d20b101bd19f6ba138d6c989a SHA512 c38ca1ff3a8a059914f51c9f81ba6f5d61b1ebcb84762d54b500daadd179006c1982a1f665c55481096136264da3d0f5e22626a472e3e98fc11b4017c05f3576
+MISC metadata.xml 1720 BLAKE2B 3158b87065286649496de2edf821c37042cafe7e729f7ba31c571ade72cf8f9fbce218485ac721ad896fa5ef751becfd2f3b4ce1645e97b4db673ec879884834 SHA512 f8d52358276ad8c2eb23632451f025ac45f799fa392bd59fcfd4417d9e9e76cf9ce066ac50cd8ee563319d7f2248b28c45fee3059a4e069ebb862e41d230b1da
diff --git a/media-tv/kodi/files/generate.sh b/media-tv/kodi/files/generate.sh
deleted file mode 100755
index 2e5b67fb90e1..000000000000
--- a/media-tv/kodi/files/generate.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-# Generate the various interface files that normally requires java.
-# This makes building the release versions much nicer.
-
-set -eux
-
-PV=$1
-PN=kodi
-P="${PN}-${PV}"
-DISTDIR="/usr/portage/distfiles"
-GITDIR="/usr/local/src/kodi/git"
-
-if [[ ${PV} != "9999" ]] ; then
-	rm -rf xbmc-*/
-	tar xf ${DISTDIR}/${P}.tar.gz
-	d=$(echo xbmc-*/)
-else
-	stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d)
-	P+="-${stamp}"
-	cd ${GITDIR}
-	d=.
-fi
-#cd ${d} && git init . && git add . && git commit -qmm && cd ..
-make -C ${d} -j -f codegenerator.mk
-tar="${DISTDIR}/${P}-generated-addons.tar.xz"
-tar cf - \
-	${d}/xbmc/interfaces/python/generated/*.cpp \
-	${d}/xbmc/interfaces/json-rpc/ServiceDescription.h \
-	| xz > "${tar}"
-if [[ ${PV} != "9999" ]] ; then
-	rm -rf xbmc-*/
-fi
-
-du -b "${tar}"
diff --git a/media-tv/kodi/files/kodi-17-adapt-to-deprecated-symbols-and-functions.patch b/media-tv/kodi/files/kodi-17-adapt-to-deprecated-symbols-and-functions.patch
deleted file mode 100644
index 0ec08810db5e..000000000000
--- a/media-tv/kodi/files/kodi-17-adapt-to-deprecated-symbols-and-functions.patch
+++ /dev/null
@@ -1,401 +0,0 @@
-From 19f28e88a5dfed82e9844f69210f7c045f18ca8e Mon Sep 17 00:00:00 2001
-From: Rainer Hochecker <fernetmenta@online.de>
-Date: Wed, 1 Nov 2017 16:12:13 +0100
-Subject: [PATCH] ffmpeg: drop deprecated symbols and functions
-
----
- xbmc/cdrip/EncoderFFmpeg.cpp                  |  4 +-
- .../AudioEngine/Encoders/AEEncoderFFmpeg.h    |  2 +-
- .../AudioEngine/Engines/ActiveAE/ActiveAE.cpp |  2 +-
- .../Engines/ActiveAE/ActiveAEFilter.cpp       |  6 +--
- .../DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp   |  6 +--
- .../Overlay/DVDOverlayCodecFFmpeg.cpp         |  2 +-
- .../DVDCodecs/Video/DVDVideoCodec.h           |  1 +
- .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp   | 39 +++++--------------
- .../DVDCodecs/Video/DVDVideoPPFFmpeg.cpp      |  5 +--
- .../VideoPlayer/DVDCodecs/Video/VAAPI.cpp     |  4 +-
- .../DVDDemuxers/DVDDemuxClient.cpp            |  6 +--
- .../DVDDemuxers/DVDDemuxFFmpeg.cpp            |  6 +--
- .../VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp |  4 +-
- xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp   |  1 -
- xbmc/guilib/FFmpegImage.cpp                   |  4 +-
- xbmc/utils/BitstreamConverter.cpp             | 12 +++---
- 16 files changed, 40 insertions(+), 64 deletions(-)
-
-Index: kodi-17.6+dfsg1/xbmc/cdrip/EncoderFFmpeg.cpp
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/cdrip/EncoderFFmpeg.cpp
-+++ kodi-17.6+dfsg1/xbmc/cdrip/EncoderFFmpeg.cpp
-@@ -119,8 +119,8 @@
- 
-   if(m_Format->oformat->flags & AVFMT_GLOBALHEADER)
-   {
--    m_CodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
--    m_Format->flags   |= CODEC_FLAG_GLOBAL_HEADER;
-+    m_CodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+    m_Format->flags   |= AV_CODEC_FLAG_GLOBAL_HEADER;
-   }
- 
-   switch(m_iInBitsPerSample)
-Index: kodi-17.6+dfsg1/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h
-+++ kodi-17.6+dfsg1/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h
-@@ -56,7 +56,7 @@
-   SwrContext *m_SwrCtx;
-   CAEChannelInfo m_Layout;
-   AVPacket m_Pkt;
--  uint8_t m_Buffer[8 + FF_MIN_BUFFER_SIZE];
-+  uint8_t m_Buffer[8 + AV_INPUT_BUFFER_MIN_SIZE];
-   int m_BufferSize;
-   int m_OutputSize;
-   double m_OutputRatio;
-Index: kodi-17.6+dfsg1/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
-+++ kodi-17.6+dfsg1/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
-@@ -2955,7 +2955,7 @@
-   int fileSize = sound->GetFileSize();
- 
-   fmt_ctx = avformat_alloc_context();
--  unsigned char* buffer = (unsigned char*)av_malloc(SOUNDBUFFER_SIZE+FF_INPUT_BUFFER_PADDING_SIZE);
-+  unsigned char* buffer = (unsigned char*)av_malloc(SOUNDBUFFER_SIZE+AV_INPUT_BUFFER_PADDING_SIZE);
-   io_ctx = avio_alloc_context(buffer, SOUNDBUFFER_SIZE, 0,
-                                             sound, CActiveAESound::Read, NULL, CActiveAESound::Seek);
-   io_ctx->max_packet_size = sound->GetChunkSize();
-Index: kodi-17.6+dfsg1/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEFilter.cpp
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEFilter.cpp
-+++ kodi-17.6+dfsg1/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEFilter.cpp
-@@ -91,8 +91,8 @@
-     return false;
-   }
- 
--  AVFilter* srcFilter = avfilter_get_by_name("abuffer");
--  AVFilter* outFilter = avfilter_get_by_name("abuffersink");
-+  const AVFilter* srcFilter = avfilter_get_by_name("abuffer");
-+  const AVFilter* outFilter = avfilter_get_by_name("abuffersink");
- 
-   std::string args = StringUtils::Format("time_base=1/%d:sample_rate=%d:sample_fmt=%s:channel_layout=0x%" PRIx64,
-                                          m_sampleRate,
-@@ -121,7 +121,7 @@
- 
- bool CActiveAEFilter::CreateAtempoFilter()
- {
--  AVFilter *atempo;
-+  const AVFilter *atempo;
- 
-   atempo = avfilter_get_by_name("atempo");
-   m_pFilterCtxAtempo = avfilter_graph_alloc_filter(m_pFilterGraph, atempo, "atempo");
-Index: kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
-+++ kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
-@@ -82,8 +82,8 @@
-   m_pCodecContext->debug = 0;
-   m_pCodecContext->workaround_bugs = 1;
- 
--  if (pCodec->capabilities & CODEC_CAP_TRUNCATED)
--    m_pCodecContext->flags |= CODEC_FLAG_TRUNCATED;
-+  if (pCodec->capabilities & AV_CODEC_CAP_TRUNCATED)
-+    m_pCodecContext->flags |= AV_CODEC_FLAG_TRUNCATED;
- 
-   m_matrixEncoding = AV_MATRIX_ENCODING_NONE;
-   m_channels = 0;
-@@ -98,7 +98,7 @@
- 
-   if( hints.extradata && hints.extrasize > 0 )
-   {
--    m_pCodecContext->extradata = (uint8_t*)av_mallocz(hints.extrasize + FF_INPUT_BUFFER_PADDING_SIZE);
-+    m_pCodecContext->extradata = (uint8_t*)av_mallocz(hints.extrasize + AV_INPUT_BUFFER_PADDING_SIZE);
-     if(m_pCodecContext->extradata)
-     {
-       m_pCodecContext->extradata_size = hints.extrasize;
-Index: kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp
-+++ kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp
-@@ -73,7 +73,7 @@
-   if( hints.extradata && hints.extrasize > 0 )
-   {
-     m_pCodecContext->extradata_size = hints.extrasize;
--    m_pCodecContext->extradata = (uint8_t*)av_mallocz(hints.extrasize + FF_INPUT_BUFFER_PADDING_SIZE);
-+    m_pCodecContext->extradata = (uint8_t*)av_mallocz(hints.extrasize + AV_INPUT_BUFFER_PADDING_SIZE);
-     memcpy(m_pCodecContext->extradata, hints.extradata, hints.extrasize);
- 
-     // start parsing of extra data - create a copy to be safe and make it zero-terminating to avoid access violations!
-Index: kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h
-+++ kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h
-@@ -118,6 +118,7 @@
-   int8_t*      qp_table;                //< Quantization parameters, primarily used by filters
-   int          qstride;
-   int          qscale_type;
-+  int          pict_type;
- 
-   unsigned int iWidth;
-   unsigned int iHeight;
-Index: kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-+++ kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-@@ -171,7 +171,7 @@
-     ctx->SetHardware(NULL);
-     avctx->get_buffer2 = avcodec_default_get_buffer2;
-     avctx->slice_flags = 0;
--    avctx->hwaccel_context = 0;
-+    av_buffer_unref(&avctx->hw_frames_ctx);
-   }
- 
-   const AVPixelFormat * cur = fmt;
-@@ -382,16 +382,6 @@
-   else
-     m_decoderState = STATE_SW_SINGLE;
- 
--#if defined(TARGET_DARWIN_IOS)
--  // ffmpeg with enabled neon will crash and burn if this is enabled
--  m_pCodecContext->flags &= CODEC_FLAG_EMU_EDGE;
--#else
--  if (pCodec->id != AV_CODEC_ID_H264 && pCodec->capabilities & CODEC_CAP_DR1
--      && pCodec->id != AV_CODEC_ID_VP8
--     )
--    m_pCodecContext->flags |= CODEC_FLAG_EMU_EDGE;
--#endif
--
-   // if we don't do this, then some codecs seem to fail.
-   m_pCodecContext->coded_height = hints.height;
-   m_pCodecContext->coded_width = hints.width;
-@@ -400,7 +390,7 @@
-   if( hints.extradata && hints.extrasize > 0 )
-   {
-     m_pCodecContext->extradata_size = hints.extrasize;
--    m_pCodecContext->extradata = (uint8_t*)av_mallocz(hints.extrasize + FF_INPUT_BUFFER_PADDING_SIZE);
-+    m_pCodecContext->extradata = (uint8_t*)av_mallocz(hints.extrasize + AV_INPUT_BUFFER_PADDING_SIZE);
-     memcpy(m_pCodecContext->extradata, hints.extradata, hints.extrasize);
-   }
- 
-@@ -791,6 +781,7 @@
-   m_droppedFrames = 0;
-   m_iLastKeyframe = m_pCodecContext->has_b_frames;
-   avcodec_flush_buffers(m_pCodecContext);
-+  av_frame_unref(m_pFrame);
- 
-   if (m_pHardware)
-     m_pHardware->Reset();
-@@ -883,22 +874,10 @@
-     pDvdVideoPicture->color_range = 0;
- 
-   int qscale_type;
--  pDvdVideoPicture->qp_table = av_frame_get_qp_table(m_pFrame, &pDvdVideoPicture->qstride, &qscale_type);
--
--  switch (qscale_type)
--  {
--  case FF_QSCALE_TYPE_MPEG1:
--    pDvdVideoPicture->qscale_type = DVP_QSCALE_MPEG1;
--    break;
--  case FF_QSCALE_TYPE_MPEG2:
--    pDvdVideoPicture->qscale_type = DVP_QSCALE_MPEG2;
--    break;
--  case FF_QSCALE_TYPE_H264:
--    pDvdVideoPicture->qscale_type = DVP_QSCALE_H264;
--    break;
--  default:
--    pDvdVideoPicture->qscale_type = DVP_QSCALE_UNKNOWN;
--  }
-+  pDvdVideoPicture->qp_table = av_frame_get_qp_table(m_pFrame,
-+                                                  &pDvdVideoPicture->qstride,
-+                                                  &pDvdVideoPicture->qscale_type);
-+  pDvdVideoPicture->pict_type = m_pFrame->pict_type;
- 
-   if (pDvdVideoPicture->iRepeatPicture)
-     pDvdVideoPicture->dts = DVD_NOPTS_VALUE;
-@@ -989,8 +968,8 @@
-     return -1;
-   }
- 
--  AVFilter* srcFilter = avfilter_get_by_name("buffer");
--  AVFilter* outFilter = avfilter_get_by_name("buffersink"); // should be last filter in the graph for now
-+  const AVFilter* srcFilter = avfilter_get_by_name("buffer");
-+  const AVFilter* outFilter = avfilter_get_by_name("buffersink"); // should be last filter in the graph for now
- 
-   std::string args = StringUtils::Format("%d:%d:%d:%d:%d:%d:%d",
-                                         m_pCodecContext->width,
-Index: kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp
-+++ kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp
-@@ -132,15 +132,12 @@
-     }
-   }
- 
--  int pict_type = (m_pSource->qscale_type != DVP_QSCALE_MPEG1) ?
--                   PP_PICT_TYPE_QP2 : 0;
--
-   pp_postprocess((const uint8_t**)m_pSource->data, m_pSource->iLineSize,
-                 m_pTarget->data, m_pTarget->iLineSize,
-                 m_pSource->iWidth, m_pSource->iHeight,
-                 m_pSource->qp_table, m_pSource->qstride,
-                 m_pMode, m_pContext,
--                pict_type); //m_pSource->iFrameType);
-+                m_pSource->pict_type | m_pSource->qscale_type ? PP_PICT_TYPE_QP2 : 0);
- 
-   //Copy frame information over to target, but make sure it is set as allocated should decoder have forgotten
-   m_pTarget->iFlags = m_pSource->iFlags | DVP_FLAG_ALLOCATED;
-Index: kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
-+++ kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
-@@ -3090,8 +3090,8 @@
-     return false;
-   }
- 
--  AVFilter* srcFilter = avfilter_get_by_name("buffer");
--  AVFilter* outFilter = avfilter_get_by_name("buffersink");
-+  const AVFilter* srcFilter = avfilter_get_by_name("buffer");
-+  const AVFilter* outFilter = avfilter_get_by_name("buffersink");
- 
-   std::string args = StringUtils::Format("%d:%d:%d:%d:%d:%d:%d",
-                                         m_config.vidWidth,
-Index: kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp
-+++ kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp
-@@ -25,7 +25,7 @@
- #include "settings/Settings.h"
- #include "../DVDClock.h"
- 
--#define FF_MAX_EXTRADATA_SIZE ((1 << 28) - FF_INPUT_BUFFER_PADDING_SIZE)
-+#define FF_MAX_EXTRADATA_SIZE ((1 << 28) - AV_INPUT_BUFFER_PADDING_SIZE)
- 
- 
- class CDemuxStreamClientInternal
-@@ -179,9 +179,9 @@
-       st->changes++;
-       st->disabled = false;
-       st->ExtraSize = len;
--      st->ExtraData = new uint8_t[len+FF_INPUT_BUFFER_PADDING_SIZE];
-+      st->ExtraData = new uint8_t[len+AV_INPUT_BUFFER_PADDING_SIZE];
-       memcpy(st->ExtraData, pkt->pData, len);
--      memset((uint8_t*)st->ExtraData + len, 0 , FF_INPUT_BUFFER_PADDING_SIZE);
-+      memset((uint8_t*)st->ExtraData + len, 0 , AV_INPUT_BUFFER_PADDING_SIZE);
-       stream->m_parser_split = false;
-     }
-   }
-Index: kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-+++ kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-@@ -78,7 +78,7 @@
-   {}
- };
- 
--#define FF_MAX_EXTRADATA_SIZE ((1 << 28) - FF_INPUT_BUFFER_PADDING_SIZE)
-+#define FF_MAX_EXTRADATA_SIZE ((1 << 28) - AV_INPUT_BUFFER_PADDING_SIZE)
- 
- std::string CDemuxStreamAudioFFmpeg::GetStreamName()
- {
-@@ -1881,12 +1881,12 @@
-       // Found extradata, fill it in. This will cause
-       // a new stream to be created and used.
-       st->codec->extradata_size = i;
--      st->codec->extradata = (uint8_t*)av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+      st->codec->extradata = (uint8_t*)av_malloc(st->codec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
-       if (st->codec->extradata)
-       {
-         CLog::Log(LOGDEBUG, "CDVDDemuxFFmpeg::Read() fetching extradata, extradata_size(%d)", st->codec->extradata_size);
-         memcpy(st->codec->extradata, pkt->data, st->codec->extradata_size);
--        memset(st->codec->extradata + i, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+        memset(st->codec->extradata + i, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-       }
-       else
-       {
-Index: kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp
-+++ kodi-17.6+dfsg1/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp
-@@ -68,7 +68,7 @@
-         * Note, if the first 23 bits of the additional bytes are not 0 then damaged
-         * MPEG bitstreams could cause overread and segfault
-         */
--      pPacket->pData =(uint8_t*)_aligned_malloc(iDataSize + FF_INPUT_BUFFER_PADDING_SIZE, 16);
-+      pPacket->pData =(uint8_t*)_aligned_malloc(iDataSize + AV_INPUT_BUFFER_PADDING_SIZE, 16);
-       if (!pPacket->pData)
-       {
-         FreeDemuxPacket(pPacket);
-@@ -76,7 +76,7 @@
-       }
- 
-       // reset the last 8 bytes to 0;
--      memset(pPacket->pData + iDataSize, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+      memset(pPacket->pData + iDataSize, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-     }
- 
-     // setup defaults
-Index: kodi-17.6+dfsg1/xbmc/guilib/FFmpegImage.cpp
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/guilib/FFmpegImage.cpp
-+++ kodi-17.6+dfsg1/xbmc/guilib/FFmpegImage.cpp
-@@ -551,7 +551,7 @@
-   tdm.avOutctx->time_base.num = 1;
-   tdm.avOutctx->time_base.den = 1;
-   tdm.avOutctx->pix_fmt = jpg_output ? AV_PIX_FMT_YUVJ420P : AV_PIX_FMT_RGBA;
--  tdm.avOutctx->flags = CODEC_FLAG_QSCALE;
-+  tdm.avOutctx->flags = AV_CODEC_FLAG_QSCALE;
-   tdm.avOutctx->mb_lmin = tdm.avOutctx->qmin * FF_QP2LAMBDA;
-   tdm.avOutctx->mb_lmax = tdm.avOutctx->qmax * FF_QP2LAMBDA;
-   tdm.avOutctx->global_quality = tdm.avOutctx->qmin * FF_QP2LAMBDA;
-Index: kodi-17.6+dfsg1/xbmc/utils/BitstreamConverter.cpp
-===================================================================
---- kodi-17.6+dfsg1.orig/xbmc/utils/BitstreamConverter.cpp
-+++ kodi-17.6+dfsg1/xbmc/utils/BitstreamConverter.cpp
-@@ -686,13 +686,13 @@
-     unit_size = extradata[0] << 8 | extradata[1];
-     total_size += unit_size + 4;
- 
--    if (total_size > INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE ||
-+    if (total_size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE ||
-       (extradata + 2 + unit_size) > ((uint8_t*)in_extradata + in_extrasize))
-     {
-       av_free(out);
-       return false;
-     }
--    tmp = av_realloc(out, total_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+    tmp = av_realloc(out, total_size + AV_INPUT_BUFFER_PADDING_SIZE);
-     if (!tmp)
-     {
-       av_free(out);
-@@ -713,7 +713,7 @@
-   }
- 
-   if (out)
--    memset(out + total_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(out + total_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- 
-   if (!sps_seen)
-       CLog::Log(LOGDEBUG, "SPS NALU missing or invalid. The resulting stream may not play");
-@@ -776,13 +776,13 @@
-       }
-       total_size += unit_size + 4;
- 
--      if (total_size > INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE ||
-+      if (total_size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE ||
-         (extradata + unit_size) > ((uint8_t*)in_extradata + in_extrasize))
-       {
-         av_free(out);
-         return false;
-       }
--      tmp = av_realloc(out, total_size + FF_INPUT_BUFFER_PADDING_SIZE);
-+      tmp = av_realloc(out, total_size + AV_INPUT_BUFFER_PADDING_SIZE);
-       if (!tmp)
-       {
-         av_free(out);
-@@ -796,7 +796,7 @@
-   }
- 
-   if (out)
--    memset(out + total_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-+    memset(out + total_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- 
-   if (!sps_seen)
-       CLog::Log(LOGDEBUG, "SPS NALU missing or invalid. The resulting stream may not play");
diff --git a/media-tv/kodi/files/kodi-17-fix-audio-with-latest-ffmpeg.patch b/media-tv/kodi/files/kodi-17-fix-audio-with-latest-ffmpeg.patch
deleted file mode 100644
index 5f5e613bed2d..000000000000
--- a/media-tv/kodi/files/kodi-17-fix-audio-with-latest-ffmpeg.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Stefan Hachmann <stefan@hachmann-it.de>
-To: 881536@bugs.debian.org
-Subject: Re: Bug#881536: ffmpeg: Breaks sound in kodi
-
---- a/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp
-+++ b/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp
-@@ -486,7 +486,7 @@
-         // guess next pts
-         m_audioClock += audioframe.duration;
- 
--        int ret = m_pAudioCodec->Decode(nullptr, 0, DVD_NOPTS_VALUE, DVD_NOPTS_VALUE);
-+        int ret = 0;
-         if (ret < 0)
-         {
-           CLog::Log(LOGERROR, "CVideoPlayerAudio::DecodeFrame - Decode Error. Skipping audio packet (%d)", ret);
diff --git a/media-tv/kodi/files/kodi-17.3-ftpparse_string.patch b/media-tv/kodi/files/kodi-17.3-ftpparse_string.patch
deleted file mode 100644
index da8d57a3d6b2..000000000000
--- a/media-tv/kodi/files/kodi-17.3-ftpparse_string.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 634153c85115b44015cdb1ddd6263f5a87e4e41b Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Sun, 7 May 2017 17:30:47 +0300
-Subject: [PATCH] FTPParse.cpp: use std::string
-
----
- xbmc/filesystem/FTPParse.cpp | 44 ++++++++++++++++++++++----------------------
- 1 file changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/xbmc/filesystem/FTPParse.cpp b/xbmc/filesystem/FTPParse.cpp
-index 8dd9633ae19e..d78349adb580 100644
---- a/xbmc/filesystem/FTPParse.cpp
-+++ b/xbmc/filesystem/FTPParse.cpp
-@@ -30,7 +30,7 @@ CFTPParse::CFTPParse()
-   m_time = 0;
- }
- 
--string CFTPParse::getName()
-+std::string CFTPParse::getName()
- {
-   return m_name;
- }
-@@ -55,16 +55,16 @@ time_t CFTPParse::getTime()
-   return m_time;
- }
- 
--void CFTPParse::setTime(string str)
-+void CFTPParse::setTime(std::string str)
- {
-   /* Variables used to capture patterns via the regexes */
--  string month;
--  string day;
--  string year;
--  string hour;
--  string minute;
--  string second;
--  string am_or_pm;
-+  std::string month;
-+  std::string day;
-+  std::string year;
-+  std::string hour;
-+  std::string minute;
-+  std::string second;
-+  std::string am_or_pm;
- 
-   /* time struct used to set the time_t variable */
-   struct tm time_struct = {};
-@@ -334,21 +334,21 @@ int CFTPParse::getDayOfWeek(int month, int date, int year)
-   return day_of_week;
- }
- 
--int CFTPParse::FTPParse(string str)
-+int CFTPParse::FTPParse(std::string str)
- {
-   /* Various variable to capture patterns via the regexes */
--  string permissions;
--  string link_count;
--  string owner;
--  string group;
--  string size;
--  string date;
--  string name;
--  string type;
--  string stuff;
--  string facts;
--  string version;
--  string file_id;
-+  std::string permissions;
-+  std::string link_count;
-+  std::string owner;
-+  std::string group;
-+  std::string size;
-+  std::string date;
-+  std::string name;
-+  std::string type;
-+  std::string stuff;
-+  std::string facts;
-+  std::string version;
-+  std::string file_id;
- 
-   /* Regex for standard Unix listing formats */
-   pcrecpp::RE unix_re("^([-bcdlps])" // type
diff --git a/media-tv/kodi/files/kodi-17.3-unrar-vulnerability.patch b/media-tv/kodi/files/kodi-17.3-unrar-vulnerability.patch
deleted file mode 100644
index 95644d6921e7..000000000000
--- a/media-tv/kodi/files/kodi-17.3-unrar-vulnerability.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-See https://trac.kodi.tv/ticket/17510
-diff --git a/lib/UnrarXLib/rarvm.cpp b/lib/UnrarXLib/rarvm.cpp
-index 901c35dcb4..42df0a0110 100644
---- a/lib/UnrarXLib/rarvm.cpp
-+++ b/lib/UnrarXLib/rarvm.cpp
-@@ -873,14 +873,16 @@ void RarVM::ExecuteStandardFilter(VM_StandardFilters FilterType)
-       break;
-     case VMSF_DELTA:
-       {
--        int DataSize=R[4],Channels=R[0],SrcPos=0,Border=DataSize*2;
--        SET_VALUE(false,&Mem[VM_GLOBALMEMADDR+0x20],DataSize);
--        if (DataSize>=VM_GLOBALMEMADDR/2)
--          break;
--        for (int CurChannel=0;CurChannel<Channels;CurChannel++)
-+        uint DataSize=R[4],Channels=R[0],SrcPos=0,Border=DataSize*2;
-+        if (DataSize>VM_MEMSIZE/2 || Channels>MAX3_UNPACK_CHANNELS || Channels==0)
-+          break;
-+
-+        // Bytes from same channels are grouped to continual data blocks,
-+        // so we need to place them back to their interleaving positions.
-+        for (uint CurChannel=0;CurChannel<Channels;CurChannel++)
-         {
-           byte PrevByte=0;
--          for (int DestPos=DataSize+CurChannel;DestPos<Border;DestPos+=Channels)
-+          for (uint DestPos=DataSize+CurChannel;DestPos<Border;DestPos+=Channels)
-             Mem[DestPos]=(PrevByte-=Mem[SrcPos++]);
-         }
-       }
-diff --git a/lib/UnrarXLib/unpack.hpp b/lib/UnrarXLib/unpack.hpp
-index 83fb0f0254..36ac30d181 100644
---- a/lib/UnrarXLib/unpack.hpp
-+++ b/lib/UnrarXLib/unpack.hpp
-@@ -1,6 +1,12 @@
- #ifndef _RAR_UNPACK_
- #define _RAR_UNPACK_
- 
-+// Limit maximum number of channels in RAR3 delta filter to some reasonable
-+// value to prevent too slow processing of corrupt archives with invalid
-+// channels number. Must be equal or larger than v3_MAX_FILTER_CHANNELS.
-+// No need to provide it for RAR5, which uses only 5 bits to store channels.
-+#define MAX3_UNPACK_CHANNELS      1024
-+
- enum BLOCK_TYPES {BLOCK_LZ,BLOCK_PPM};
- 
- struct Decode
diff --git a/media-tv/kodi/files/kodi-17.6-nmblookup.patch b/media-tv/kodi/files/kodi-17.6-nmblookup.patch
deleted file mode 100644
index 29737f980ec1..000000000000
--- a/media-tv/kodi/files/kodi-17.6-nmblookup.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ba2cb820f32994482a1918bd16bd0a548bb394ac Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Tue, 12 Jun 2018 12:28:41 -0400
-Subject: [PATCH] [dns-cache] Only use nmblookup if HAS_FILESYSTEM_SMB
-
-nmblookup is part of SmbClient so only use it if SmbClient is present.
-
-Fixes https://trac.kodi.tv/ticket/17916
----
- xbmc/network/DNSNameCache.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xbmc/network/DNSNameCache.cpp b/xbmc/network/DNSNameCache.cpp
-index e993c536bf41..b30c60baf738 100644
---- a/xbmc/network/DNSNameCache.cpp
-+++ b/xbmc/network/DNSNameCache.cpp
-@@ -54,7 +54,7 @@ bool CDNSNameCache::Lookup(const std::string& strHostName, std::string& strIpAdd
-   if(g_DNSCache.GetCached(strHostName, strIpAddress))
-     return true;
- 
--#ifndef TARGET_WINDOWS
-+#if !defined(TARGET_WINDOWS) && defined(HAS_FILESYSTEM_SMB)
-   // perform netbios lookup (win32 is handling this via gethostbyname)
-   char nmb_ip[100];
-   char line[200];
diff --git a/media-tv/kodi/files/kodi-17.6-wrapper.patch b/media-tv/kodi/files/kodi-17.6-wrapper.patch
deleted file mode 100644
index dc3e9887da94..000000000000
--- a/media-tv/kodi/files/kodi-17.6-wrapper.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bbc7a53911f1ef8a4a24b76d88c5b0e5899e082f Mon Sep 17 00:00:00 2001
-From: Michael Cronenworth <mike@cchtml.com>
-Date: Fri, 16 Mar 2018 13:48:34 -0500
-Subject: [PATCH] DllLoader: Update variable to use standard va_list type
-
-The _G_ types were ancient, internal-only types defined in _G_config.h
-and are now deprecated.
-
-https://sourceware.org/ml/libc-announce/2018/msg00000.html
-https://sourceware.org/git/?p=glibc.git;a=commit;h=48a8f8328122ab8d06b7333cb87be46feeaf7cca
-
-Signed-off-by: Michael Cronenworth <mike@cchtml.com>
----
- xbmc/cores/DllLoader/exports/wrapper.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/xbmc/cores/DllLoader/exports/wrapper.c b/xbmc/cores/DllLoader/exports/wrapper.c
-index 1980bfe65cac..7c7d4ac6131d 100644
---- a/xbmc/cores/DllLoader/exports/wrapper.c
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -45,9 +45,6 @@ typedef int64_t   off64_t;
- typedef off64_t   __off64_t;
- typedef fpos_t    fpos64_t;
- #define stat64    stat
--#if defined(TARGET_DARWIN) || defined(TARGET_ANDROID)
--#define _G_va_list va_list
--#endif
- #endif
- 
- #ifdef TARGET_POSIX
-@@ -485,7 +482,7 @@ int __wrap___printf_chk(int flag, const char *format, ...)
-   return res;
- }
- 
--int __wrap___vfprintf_chk(FILE* stream, int flag, const char *format, _G_va_list ap)
-+int __wrap___vfprintf_chk(FILE* stream, int flag, const char *format, va_list ap)
- {
-   return dll_vfprintf(stream, format, ap);
- }
diff --git a/media-tv/kodi/files/kodi-cmake-no-java.patch b/media-tv/kodi/files/kodi-cmake-no-java.patch
deleted file mode 100644
index 2d965ab351ee..000000000000
--- a/media-tv/kodi/files/kodi-cmake-no-java.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/xbmc/interfaces/swig/CMakeLists.txt b/xbmc/interfaces/swig/CMakeLists.txt
-index 6e676159eb..d45a2ecbab 100644
---- a/xbmc/interfaces/swig/CMakeLists.txt
-+++ b/xbmc/interfaces/swig/CMakeLists.txt
-@@ -1,43 +1,21 @@
- function(generate_file file)
--  set(classpath ${GROOVY_DIR}/groovy-all-${GROOVY_VER}.jar
--                ${GROOVY_DIR}/commons-lang-${COMMONS_VER}.jar
--                ${CORE_SOURCE_DIR}/tools/codegenerator
--                ${CMAKE_CURRENT_SOURCE_DIR}/../python)
--  if(NOT CORE_SYSTEM_NAME STREQUAL windows)
--    set(devnull "/dev/null")
--    string(REPLACE ";" ":" classpath "${classpath}")
--  else()
--    set(devnull "nul")
--  endif()
--
--  set(CPP_FILE ${file}.cpp)
--  add_custom_command(OUTPUT ${CPP_FILE}
--                     COMMAND ${SWIG_EXECUTABLE}
--                     ARGS -w401 -c++ -o ${file}.xml -xml -I${CORE_SOURCE_DIR}/xbmc -xmllang python ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file}
--                     COMMAND ${Java_JAVA_EXECUTABLE}
--                     ARGS -cp "${classpath}" groovy.ui.GroovyMain ${CORE_SOURCE_DIR}/tools/codegenerator/Generator.groovy ${file}.xml ${CMAKE_CURRENT_SOURCE_DIR}/../python/PythonSwig.cpp.template ${file}.cpp > ${devnull}
--                     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file})
-+  set(CPP_FILE ${CORE_SOURCE_DIR}/xbmc/interfaces/python/generated/${file}.cpp)
-   set(SOURCES ${SOURCES} "${CPP_FILE}" PARENT_SCOPE)
- endfunction()
- 
--find_package(Java COMPONENTS Runtime REQUIRED)
- find_package(SWIG REQUIRED)
- 
- # The generated bindings
--set(INPUTS AddonModuleXbmcaddon.i
--           AddonModuleXbmcgui.i
--           AddonModuleXbmc.i
--           AddonModuleXbmcplugin.i
--           AddonModuleXbmcvfs.i
--           AddonModuleXbmcwsgi.i)
--
--set(GROOVY_DIR ${CORE_SOURCE_DIR}/tools/codegenerator/groovy)
--set(GROOVY_VER 2.4.4)
--set(COMMONS_VER 2.6)
-+set(INPUTS AddonModuleXbmcaddon
-+           AddonModuleXbmcgui
-+           AddonModuleXbmc
-+           AddonModuleXbmcplugin
-+           AddonModuleXbmcvfs
-+           AddonModuleXbmcwsgi)
- 
- foreach(INPUT IN LISTS INPUTS)
-   generate_file(${INPUT})
--  list(APPEND GEN_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${INPUT}.cpp)
-+  list(APPEND GEN_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${INPUT}.i.cpp)
- endforeach()
- 
- add_library(python_binding STATIC ${SOURCES})
diff --git a/media-tv/kodi/kodi-17.3-r1.ebuild b/media-tv/kodi/kodi-17.3-r1.ebuild
deleted file mode 100644
index fd33fd85b95f..000000000000
--- a/media-tv/kodi/kodi-17.3-r1.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.6"
-CODENAME="Krypton"
-PATCHES=(
-	"${FILESDIR}/${P}-ftpparse_string.patch"
-	"${FILESDIR}/${P}-unrar-vulnerability.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )"
-
-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 gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	gles? ( X )
-	opengl? ( X )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	libusb? ( virtual/libusb:1 )
-	media-fonts/corefonts
-	>=media-fonts/noto-20160531
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl,X(+)]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] )
-	mysql? ( virtual/mysql )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	X? (
-		x11-libs/libdrm
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXrender
-	)
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( sys-power/upower )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	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
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	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
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="amd64 x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	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/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}"/project/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_CAP=$(usex caps)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" )
-
-	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
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-
-	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/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.6-r10.ebuild b/media-tv/kodi/kodi-17.6-r10.ebuild
deleted file mode 100644
index f7b60b768a63..000000000000
--- a/media-tv/kodi/kodi-17.6-r10.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.11"
-FFMPEG_KODI_VERSION="17.5"
-CODENAME="Krypton"
-PATCHES=(
-	"${FILESDIR}/${P}-nmblookup.patch"
-	"${FILESDIR}/${P}-wrapper.patch"
-	"${FILESDIR}/${PN}-17-adapt-to-deprecated-symbols-and-functions.patch"
-	"${FILESDIR}/${PN}-17-fix-audio-with-latest-ffmpeg.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.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 )"
-
-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 gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	?? ( mariadb mysql )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl,X(+)]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
-		<media-video/ffmpeg-3.4
-	)
-	mysql? ( dev-db/mysql-connector-c:= )
-	mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva:=[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( sys-power/upower )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	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
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	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
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	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/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}"/project/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_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=ON
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	if use mysql || use mariadb ; then
-		mycmakeargs+=( -DENABLE_MYSQLCLIENT="yes" )
-	else
-		mycmakeargs+=( -DENABLE_MYSQLCLIENT="no" )
-	fi
-
-	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
-
-	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
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.6-r11.ebuild b/media-tv/kodi/kodi-17.6-r11.ebuild
deleted file mode 100644
index 30817ba59e84..000000000000
--- a/media-tv/kodi/kodi-17.6-r11.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.11"
-FFMPEG_KODI_VERSION="17.5"
-CODENAME="Krypton"
-PATCHES=(
-	"${FILESDIR}/${P}-nmblookup.patch"
-	"${FILESDIR}/${P}-wrapper.patch"
-	"${FILESDIR}/${PN}-17-adapt-to-deprecated-symbols-and-functions.patch"
-	"${FILESDIR}/${PN}-17-fix-audio-with-latest-ffmpeg.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.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 )"
-
-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 gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	?? ( mariadb mysql )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl,X(+)]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
-	)
-	mysql? ( dev-db/mysql-connector-c:= )
-	mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva:=[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( sys-power/upower )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	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
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	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
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="amd64 x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	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/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}"/project/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_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=ON
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	if use mysql || use mariadb ; then
-		mycmakeargs+=( -DENABLE_MYSQLCLIENT="yes" )
-	else
-		mycmakeargs+=( -DENABLE_MYSQLCLIENT="no" )
-	fi
-
-	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
-
-	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
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.6-r6.ebuild b/media-tv/kodi/kodi-17.6-r6.ebuild
deleted file mode 100644
index c0c368f27a5b..000000000000
--- a/media-tv/kodi/kodi-17.6-r6.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.11"
-FFMPEG_KODI_VERSION="17.5"
-CODENAME="Krypton"
-PATCHES=(
-	"${FILESDIR}/${P}-nmblookup.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.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 )"
-
-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 gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	?? ( mariadb mysql )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	>=media-fonts/noto-20160531
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl,X(+)]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
-		<media-video/ffmpeg-3.4
-	)
-	mysql? (
-		!mariadb? ( dev-db/mysql-connector-c:= )
-		mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] )
-	)
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva:=[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( sys-power/upower )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	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
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	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
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	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/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}"/project/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_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=ON
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.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
-
-	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
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-
-	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/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.6-r7.ebuild b/media-tv/kodi/kodi-17.6-r7.ebuild
deleted file mode 100644
index 92c273771952..000000000000
--- a/media-tv/kodi/kodi-17.6-r7.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.11"
-FFMPEG_KODI_VERSION="17.5"
-CODENAME="Krypton"
-PATCHES=(
-	"${FILESDIR}/${P}-nmblookup.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.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 )"
-
-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 gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	?? ( mariadb mysql )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	>=media-fonts/noto-20160531
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl,X(+)]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
-		<media-video/ffmpeg-3.4
-	)
-	mysql? ( dev-db/mysql-connector-c:= )
-	mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva:=[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( sys-power/upower )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	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
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	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
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	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/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}"/project/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_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=ON
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	if use mysql || use mariadb ; then
-		mycmakeargs+=( -DENABLE_MYSQLCLIENT="yes" )
-	else
-		mycmakeargs+=( -DENABLE_MYSQLCLIENT="no" )
-	fi
-
-	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
-
-	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
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-
-	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/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.6-r8.ebuild b/media-tv/kodi/kodi-17.6-r8.ebuild
deleted file mode 100644
index 04b5dde24bbe..000000000000
--- a/media-tv/kodi/kodi-17.6-r8.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.11"
-FFMPEG_KODI_VERSION="17.5"
-CODENAME="Krypton"
-PATCHES=(
-	"${FILESDIR}/${P}-nmblookup.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.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 )"
-
-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 gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	?? ( mariadb mysql )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	>=media-fonts/noto-20180905
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl,X(+)]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
-		<media-video/ffmpeg-3.4
-	)
-	mysql? ( dev-db/mysql-connector-c:= )
-	mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva:=[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( sys-power/upower )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	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
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	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
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	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/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}"/project/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_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=ON
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	if use mysql || use mariadb ; then
-		mycmakeargs+=( -DENABLE_MYSQLCLIENT="yes" )
-	else
-		mycmakeargs+=( -DENABLE_MYSQLCLIENT="no" )
-	fi
-
-	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
-
-	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
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSansMono-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-
-	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/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.6-r9.ebuild b/media-tv/kodi/kodi-17.6-r9.ebuild
deleted file mode 100644
index 7e72f8b7ab80..000000000000
--- a/media-tv/kodi/kodi-17.6-r9.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
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.11"
-FFMPEG_KODI_VERSION="17.5"
-CODENAME="Krypton"
-PATCHES=(
-	"${FILESDIR}/${P}-nmblookup.patch"
-	"${FILESDIR}/${P}-wrapper.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.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 )"
-
-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 gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	?? ( mariadb mysql )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	>=media-fonts/noto-20180905
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl,X(+)]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
-		<media-video/ffmpeg-3.4
-	)
-	mysql? ( dev-db/mysql-connector-c:= )
-	mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva:=[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( sys-power/upower )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	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
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	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
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	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/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}"/project/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_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=ON
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
-	)
-
-	if use mysql || use mariadb ; then
-		mycmakeargs+=( -DENABLE_MYSQLCLIENT="yes" )
-	else
-		mycmakeargs+=( -DENABLE_MYSQLCLIENT="no" )
-	fi
-
-	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
-
-	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
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSansMono-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSansMono-Regular.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/NotoSans-Regular.ttf
-
-	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/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.6.ebuild b/media-tv/kodi/kodi-17.6.ebuild
deleted file mode 100644
index 989f73609c30..000000000000
--- a/media-tv/kodi/kodi-17.6.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.11"
-FFMPEG_KODI_VERSION="17.5"
-CODENAME="Krypton"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.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 )"
-
-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 gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	gles? ( X )
-	opengl? ( X )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		app-pda/libplist
-		net-libs/shairplay
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-0.7.0 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/fribidi
-	cec? ( >=dev-libs/libcec-4.0 )
-	dev-libs/libpcre[cxx]
-	dev-libs/libxml2
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	>=dev-libs/yajl-2
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-libs/libcdio
-	gles? ( media-libs/mesa[gles2] )
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	media-fonts/corefonts
-	>=media-fonts/noto-20160531
-	media-fonts/roboto
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/libass-0.13.4
-	media-libs/mesa[egl,X(+)]
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
-		<media-video/ffmpeg-3.4
-	)
-	mysql? ( virtual/mysql )
-	>=net-misc/curl-7.51.0
-	nfs? ( net-fs/libnfs:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	sftp? ( net-libs/libssh[sftp] )
-	sys-libs/zlib
-	udev? ( virtual/udev )
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
-	X? (
-		x11-libs/libdrm
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXrender
-	)
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? (
-		|| ( app-misc/lirc app-misc/inputlircd )
-	)
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( sys-power/upower )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	dev-lang/swig
-	dev-libs/crossguid
-	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
-	x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-	# Force java for latest git version to avoid having to hand maintain the
-	# generated addons package.  #488118
-	DEPEND+="
-		virtual/jre
-		"
-	;;
-*)
-	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
-		 !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	IUSE+=" java"
-	DEPEND+="
-		java? ( virtual/jre )
-		"
-
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-	;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if in_iuse java && use !java; then
-		eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
-	fi
-	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/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}"/project/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_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql "yes" $(usex mariadb))
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_NONFREE=$(usex nonfree)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=ON
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SSH=$(usex sftp)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.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
-
-	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
-
-	rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
-	newicon media/icon48x48.png kodi.png
-
-	# Replace bundled fonts with system ones.
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
-	dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
-		usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
-	local f
-	for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
-		rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
-		dosym ../../../../fonts/noto/"${f}" \
-			usr/share/kodi/addons/skin.estuary/fonts/"${f}"
-	done
-
-	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/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-18.0.ebuild b/media-tv/kodi/kodi-18.0.ebuild
deleted file mode 100644
index f9473d30cd92..000000000000
--- a/media-tv/kodi/kodi-18.0.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# 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,X(+)]
-	>=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/kodi/kodi-18.0_rc2.ebuild b/media-tv/kodi/kodi-18.0_rc2.ebuild
deleted file mode 100644
index 8de21cc07850..000000000000
--- a/media-tv/kodi/kodi-18.0_rc2.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.1"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="Alpha3-1"
-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,X(+)]
-	>=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/kodi/kodi-18.0_rc3.ebuild b/media-tv/kodi/kodi-18.0_rc3.ebuild
deleted file mode 100644
index 317663803c62..000000000000
--- a/media-tv/kodi/kodi-18.0_rc3.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2018 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.1"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="Alpha3-1"
-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,X(+)]
-	>=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/kodi/kodi-18.0_rc4.ebuild b/media-tv/kodi/kodi-18.0_rc4.ebuild
deleted file mode 100644
index 317663803c62..000000000000
--- a/media-tv/kodi/kodi-18.0_rc4.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2018 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.1"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="Alpha3-1"
-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,X(+)]
-	>=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/kodi/kodi-18.0_rc5.ebuild b/media-tv/kodi/kodi-18.0_rc5.ebuild
deleted file mode 100644
index 2867bb4a2b2c..000000000000
--- a/media-tv/kodi/kodi-18.0_rc5.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# 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.1"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="Alpha3-1"
-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,X(+)]
-	>=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/kodi/kodi-18.1.ebuild b/media-tv/kodi/kodi-18.1.ebuild
deleted file mode 100644
index 899c513845ae..000000000000
--- a/media-tv/kodi/kodi-18.1.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# 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 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,X(+)]
-	>=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/kodi/kodi-18.1_rc1.ebuild b/media-tv/kodi/kodi-18.1_rc1.ebuild
deleted file mode 100644
index f9473d30cd92..000000000000
--- a/media-tv/kodi/kodi-18.1_rc1.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# 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,X(+)]
-	>=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/kodi/kodi-18.2.ebuild b/media-tv/kodi/kodi-18.2.ebuild
deleted file mode 100644
index 6956d36d8dd6..000000000000
--- a/media-tv/kodi/kodi-18.2.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# 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="18.2"
-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 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,X(+)]
-	>=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[http2]
-	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/kodi/kodi-18.2_rc1.ebuild b/media-tv/kodi/kodi-18.2_rc1.ebuild
deleted file mode 100644
index 6956d36d8dd6..000000000000
--- a/media-tv/kodi/kodi-18.2_rc1.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# 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="18.2"
-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 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,X(+)]
-	>=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[http2]
-	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/kodi/kodi-18.3-r1.ebuild b/media-tv/kodi/kodi-18.3-r1.ebuild
index 767fad722fe7..188afca674df 100644
--- a/media-tv/kodi/kodi-18.3-r1.ebuild
+++ b/media-tv/kodi/kodi-18.3-r1.ebuild
@@ -295,11 +295,10 @@ src_configure() {
 
 src_compile() {
 	cmake-utils_src_compile all
-	use test && emake -C "${BUILD_DIR}" kodi-test
 }
 
 src_test() {
-	emake -C "${BUILD_DIR}" test
+	cmake-utils_src_make check
 }
 
 src_install() {
diff --git a/media-tv/kodi/kodi-18.3.ebuild b/media-tv/kodi/kodi-18.3.ebuild
deleted file mode 100644
index 6ee3c6e00631..000000000000
--- a/media-tv/kodi/kodi-18.3.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="18.2"
-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 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,X(+)]
-	>=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[http2]
-	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
-	)
-	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
-	>=x11-libs/libxkbcommon-0.4.1
-	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/kodi/kodi-18.4.ebuild b/media-tv/kodi/kodi-18.4.ebuild
new file mode 100644
index 000000000000..1af63f9e8720
--- /dev/null
+++ b/media-tv/kodi/kodi-18.4.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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.4"
+CODENAME="Leia"
+FFMPEG_KODI_VERSION="18.4"
+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 desktop linux-info pax-utils python-single-r1 xdg
+
+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 dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	^^ ( gbm raspberry-pi 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[raspberry-pi?] )
+	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-3.0.1
+	dev-libs/libfstrcmp
+	gbm? (	media-libs/mesa[gbm] )
+	gles? (
+		!raspberry-pi? ( 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
+	!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
+	>=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[http2]
+	nfs? ( >=net-fs/libnfs-2.0.0:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
+	libressl? ( dev-libs/libressl:0= )
+	raspberry-pi? (
+		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] )
+	)
+	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
+	)
+	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
+	>=x11-libs/libxkbcommon-0.4.1
+	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 raspberry-pi; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
+	fi
+
+	if use X; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all
+}
+
+src_test() {
+	cmake-utils_src_make check
+}
+
+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
+}
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 9e46a9c2f04d..7435fb7face0 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -31,7 +31,7 @@ else
 	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
 fi
 
-inherit autotools cmake-utils eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils
+inherit autotools cmake-utils desktop linux-info pax-utils python-single-r1 xdg
 
 DESCRIPTION="A free and open source media-player and entertainment hub"
 HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
@@ -64,7 +64,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dbus? ( sys-apps/dbus )
 	dev-db/sqlite
 	dev-libs/expat
-	dev-libs/flatbuffers
+	>=dev-libs/flatbuffers-1.11.0
 	>=dev-libs/fribidi-0.19.7
 	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
 	dev-libs/libpcre[cxx]
@@ -293,11 +293,10 @@ src_configure() {
 
 src_compile() {
 	cmake-utils_src_compile all
-	use test && emake -C "${BUILD_DIR}" kodi-test
 }
 
 src_test() {
-	emake -C "${BUILD_DIR}" test
+	cmake-utils_src_make check
 }
 
 src_install() {
@@ -314,13 +313,3 @@ src_install() {
 	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/kodi/metadata.xml b/media-tv/kodi/metadata.xml
index 2ddce6793684..269b8bfc2c46 100644
--- a/media-tv/kodi/metadata.xml
+++ b/media-tv/kodi/metadata.xml
@@ -14,10 +14,8 @@
 		<flag name="lirc">Enable support for controlling Totem with a remote control using <pkg>app-misc/lirc</pkg></flag>
 		<flag name="mariadb">Add MariaDB support</flag>
 		<flag name="nfs">Enable NFS client support</flag>
-		<flag name="nonfree">Enable non-free components</flag>
 		<flag name="dvd">Enable optical (CD/DVD drive) support</flag>
 		<flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
-		<flag name="sftp">Support browsing files over SFTP</flag>
 		<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag>
 		<flag name="libusb">Use <pkg>virtual/libusb</pkg> for usb device hotplug support. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use <pkg>sys-fs/udev</pkg>.</flag>
 		<flag name="udev">Use <pkg>sys-fs/udev</pkg> rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness.</flag>
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 94f06d441fd4..5d3627762f1d 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -6,5 +6,5 @@ DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5
 EBUILD v4l-utils-1.10.1.ebuild 1675 BLAKE2B 69daa4e235f777b1f7005c19925f33aadc16c7d89425e061150050800399109506738157b5ca364a6ffaea398c90806c12a6208be12965236ea0f7a6370de89e SHA512 bcb4480a20b25d7c9f5d7e4cea0fa9b07e4af1fd2a3775ab932c47b49360328f07c15020f6baf309cc62fb87f28abb7ca3a299a16f43192b93976e15192511cd
 EBUILD v4l-utils-1.16.3-r1.ebuild 1843 BLAKE2B 46f25960bd80a69c923cfa3ea1a62bd2eed6a2c20d5ad61164dec5ce0dbd6da656e526cbcd094b3bb40e77d6a0ba24f61f6c904887ab70fd1ca949af531fdd12 SHA512 9ea267b9ed6d2abe7d04e6a53df4a1337dcebf133f42783b7fc5ef853f26e560bf10f94965e203e14e56f8da46357275b23eed59c243823dd9dfcb2091377c42
 EBUILD v4l-utils-1.16.3.ebuild 1768 BLAKE2B ed5b2f5884fa03440735d060ad8fac1931bafafb53eb14aaa68ff68a163c038592d7d099c00c0886050b7a751a1d163d09613886bd72f57e4003d55733af840b SHA512 9063665b2994026a6087f80630fc5d351f93be02d87afa69a7ddd72832185e1d06cd1163a3c2e636409845770e1cb8caf52da6cc5af4274912d2f0c38fcc3b0e
-EBUILD v4l-utils-1.16.6.ebuild 1843 BLAKE2B 7a651bc953e6576bdbb21c1659acfe66175daf9ee70c5e6f85500a680412874a3971b53284e4f5bc29ae33595ca96f5cba402d5c5a5b1f42397b25fbdcc91b9f SHA512 6892df308935d940619ba47c1975f031dbf35f0b50d0f8be7f0d141b5a81aa9477225c71faf1163383afa59e326143bd8f148459d7976da8f52983d71a3f72c7
+EBUILD v4l-utils-1.16.6.ebuild 1842 BLAKE2B e451ebba2c6b61568944c482bd0a5631ce59db238b6ba56fd84b529cfea66b7f2594cda88395146aabe85efe6b119633ee0453debf29c204e3ccd2203b665812 SHA512 faafb1198ce491cdd892e5839d5a2d8844023fac82373969ebd16241514ea3a5f45e6e4374b3e4509971b33177d82334ab0dccb8cd76f19e984bfcdc0e3681ed
 MISC metadata.xml 326 BLAKE2B b2b3aecf2ef313c08d06033344cc470302df8031246a7a919d01419f6d40f5a708ea6cfc222a0b7b2ac442f761f90b49fb414ffe6342a500cb446cdf0c562d70 SHA512 2f4cabeecc98ba82d51fe56871e3b950be0baa58a73c11067f91a0b5dce02bde063d32617ed68ee68d4c2a0af92e6d80a306e3b95548aad6d9734d4577cfafab
diff --git a/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild b/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
index 4cf1f9bdb063..b756dca8b45e 100644
--- a/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
 IUSE="+bpf opengl qt5"
 
 RDEPEND=">=media-libs/libv4l-${PV}[jpeg]
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 89716eada2ea..06d0bccc9e05 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 388c79387757..a16109db27cf 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,8 +1,6 @@
-AUX avidemux-2.7.0-glibc-2.27.patch 872 BLAKE2B 2edd751aa7de1d6b4ed6d6dc12bff1f02e54e4950b8402cd531776bba7be1481c205ee3b11249addfe759c2d730db0831280e6bdcafb470a683220242ee79937 SHA512 3bf0bc7b15cb50141b5ec771dcee97971d2889af8913c9d825a3d6cc929143eabf04af76d033257722cb6be90f966a34e3ba2c069470cfb6097bc959bb0feead
-AUX avidemux-2.7.0-qt-5.11.patch 1664 BLAKE2B 080497a678e869e143eb350ecdca2b77d5e5906a8a469e24f16fc58853665791dbbd94880418b492df6816b8f420d54ee7ecd06c805b0aab16e8d05ab43f545d SHA512 49186e7648db60e081f78e1257ea788313cac6e991c995249701189ab344744f0c410203b39b49e5530a8dd33de937582099eb8b615d19fe7d0e3731254d535c
 AUX avidemux-2.7.3-desktop.patch 678 BLAKE2B f903203996fddbe798f990b3092f4a0c578407933df153e05da19aa0a6bbfaa1bbd96f25b61787514c4272f94a0525e5fc5c0171744c2f87b04effc1a2907974 SHA512 68e6a0d3272ecf00aec63f513f50d39b7702eb59ecd85190483a93b03e7461964e9533656f2279bc00312c95418f415d159e15646790a1b0b9eb2ebd7f520b4f
 DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
-DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
-EBUILD avidemux-2.7.0.ebuild 4518 BLAKE2B 6eb480a6467eb5a734891ffeefbbb0a37abbb83469ca12a090c18502e3a3836701ef43439681e51ac5f3259af368f6b045c830207b05b5df7febbbf70a534b66 SHA512 5d7c46c56e237386d0c9e8c74ddfe5f25aa3e510a0e7683c91880a863fe40d51e3d5d4661cb670af25c6ff7a43264a303f74e9a7c9033bf0daa3d3d55968a8d0
+DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
 EBUILD avidemux-2.7.3.ebuild 3866 BLAKE2B 63c7cdc7d023d62356ae47198a6e22236b45199b1d1dfad06ce7d0343a76e51e379f69871ce4ed2018d74da92806639c975deeead8fe1900070bb4341de2e4c1 SHA512 2b579a10245f6fa062ee88b6d991ded8c77ef3fa5713387836ccb19dbe9270667875716baa48cd6fd10e4570f7d60151c45a6df17ca8b4879dc536c76d21a111
+EBUILD avidemux-2.7.4-r1.ebuild 3676 BLAKE2B 259d76cf3e50e6733645538959732cf4be512b326d3d5fe5c34be1c16532c8979d1113a5deb9e18d55271d689c2bfd61e34b37dbe9f57429d7358da146ac4a93 SHA512 077e1f9950fbb6e88c74bf6c9687f72bb39b56dbd2b17ba96f4b37d35ad5ad03af0595403f68992ccfd961f3726bdbdec4dbb95db55dab6a48233ddb04ce85cf
 MISC metadata.xml 489 BLAKE2B 51c28e4d932facf14fe99d0d18e736f16c754961e8fde468505f03c989e8ec3cb9afab9c916752468a5f9f0a07ad8d25da01e64cb987cfed1db835f657512b1e SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d
diff --git a/media-video/avidemux/avidemux-2.7.0.ebuild b/media-video/avidemux/avidemux-2.7.0.ebuild
deleted file mode 100644
index 3a66ade975eb..000000000000
--- a/media-video/avidemux/avidemux-2.7.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]] ; then
-	MY_P="${P}"
-	EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
-	inherit git-r3
-else
-	MY_P="${PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake-utils qmake-utils xdg-utils
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
-
-COMMON_DEPEND="
-	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
-	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
-	opengl? ( virtual/opengl:0 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-	vaapi? ( x11-libs/libva:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	nls? ( virtual/libintl:0 )
-	!<media-video/avidemux-${PV}
-"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-glibc-2.27.patch"
-	eapply "${FILESDIR}/${P}-qt-5.11.patch"
-
-	processes="buildCli:avidemux/cli"
-	if use qt5 ; then
-		processes+=" buildQt4:avidemux/qt4"
-	fi
-
-	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
-	done
-
-	# Fix icon name -> avidemux-2.7.png
-	sed -i -e "/^Icon/ s:${PN}:${PN}-${SLOT}:" ${PN}2.desktop || \
-		die "Icon name fix failed."
-
-	# The desktop file is broken. It uses avidemux2 instead of avidemux3
-	# so it will actually launch avidemux-2.7 if it is installed.
-	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || \
-		die "Desktop file fix failed."
-	if use qt5; then
-		sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' ${PN}2.desktop || \
-			die "Desktop file fix failed."
-	fi
-
-	# QA warnings: missing trailing ';' and 'Application' is deprecated.
-	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || \
-		die "Desktop file fix failed."
-
-	# Now rename the desktop file to not collide with 2.6.
-	mv ${PN}2.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed."
-
-	# Remove "Build Option" dialog because it doesn't reflect
-	# what the GUI can or has been built with. (Bug #463628)
-	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || \
-		die "Couldn't remove \"Build Option\" dialog."
-}
-
-src_configure() {
-	# Add lax vector typing for PowerPC.
-	if use ppc || use ppc64 ; then
-		append-cflags -flax-vector-conversions
-	fi
-
-	# See bug 432322.
-	use x86 && replace-flags -O0 -O1
-
-	# The build relies on an avidemux-core header that uses 'nullptr'
-	# which is from >=C++11. Let's use the GCC-6 default C++ dialect.
-	append-cxxflags -std=c++14
-
-	local mycmakeargs=(
-		-DGETTEXT="$(usex nls)"
-		-DSDL="$(usex sdl)"
-		-DLibVA="$(usex vaapi)"
-		-DVDPAU="$(usex vdpau)"
-		-DXVIDEO="$(usex xv)"
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DENABLE_QT5="$(usex qt5)"
-			-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-		)
-	fi
-
-	if use debug ; then
-		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-	fi
-
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
-	done
-}
-
-src_compile() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_test
-	done
-}
-
-src_install() {
-	for process in ${processes} ; do
-		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_install
-	done
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
-		fperms +x /usr/bin/avidemux3_cli
-	fi
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
-		fperms +x /usr/bin/avidemux3_jobs
-	fi
-
-	cd "${S}" || die "Can't enter source folder."
-	newicon ${PN}_icon.png ${PN}-${SLOT}.png
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then
-		fperms +x /usr/bin/avidemux3_qt5
-	fi
-
-	if [[ -f "${ED}"/usr/bin/avidemux3_jobs_qt5 ]] ; then
-		fperms +x /usr/bin/avidemux3_jobs_qt5
-	fi
-
-	if use qt5 ; then
-		domenu ${PN}-${SLOT}.desktop
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-video/avidemux/avidemux-2.7.4-r1.ebuild b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
new file mode 100644
index 000000000000..16632727c8d9
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-utils desktop qmake-utils xdg
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+SLOT="2.7"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
+
+COMMON_DEPEND="
+	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
+	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
+	opengl? ( virtual/opengl:0 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	vaapi? ( x11-libs/libva:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	nls? ( virtual/libintl:0 )
+	!<media-video/avidemux-${PV}
+"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
+
+S="${WORKDIR}/avidemux2-${PV}"
+
+src_prepare() {
+	processes="buildCli:avidemux/cli"
+	use qt5 && processes+=" buildQt4:avidemux/qt4"
+
+	for process in ${processes} ; do
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+	done
+
+	if use qt5; then
+		# Fix icon name -> avidemux-2.7
+		sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/${PN}.desktop || \
+			die "Icon name fix failed."
+
+		# The desktop file is broken. It uses avidemux3_portable instead of avidemux3_qt5
+		sed -i -re '/^Exec/ s:(avidemux3_)portable:\1qt5:' appImage/${PN}.desktop || \
+			die "Desktop file fix failed."
+
+		# QA warnings: missing trailing ';' and 'Application' is deprecated.
+		sed -i -e 's/Application;AudioVideo/AudioVideo;/g' appImage/${PN}.desktop || \
+			die "Desktop file fix failed."
+
+		# Now rename the desktop file to not collide with 2.6.
+		mv appImage/${PN}.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed."
+	fi
+
+	# Remove "Build Option" dialog because it doesn't reflect
+	# what the GUI can or has been built with. (Bug #463628)
+	sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || \
+		die "Couldn't remove \"Build Option\" dialog."
+}
+
+src_configure() {
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	# The build relies on an avidemux-core header that uses 'nullptr'
+	# which is from >=C++11. Let's use the GCC-6 default C++ dialect.
+	append-cxxflags -std=c++14
+
+	local mycmakeargs=(
+		-DGETTEXT="$(usex nls)"
+		-DSDL="$(usex sdl)"
+		-DLibVA="$(usex vaapi)"
+		-DOPENGL="$(usex opengl)"
+		-DVDPAU="$(usex vdpau)"
+		-DXVIDEO="$(usex xv)"
+	)
+
+	use qt5 && mycmakeargs+=(
+			-DENABLE_QT5="$(usex qt5)"
+			-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+	)
+
+	use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
+
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+	done
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_compile
+	done
+}
+
+src_test() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_test
+	done
+}
+
+src_install() {
+	for process in ${processes} ; do
+		local build="${WORKDIR}/${P}_build/${process%%:*}"
+		BUILD_DIR="${build}" cmake-utils_src_install
+	done
+
+	if use qt5; then
+		cd "${S}" || die "Can't enter source folder"
+		newicon ${PN}_icon.png ${PN}-${SLOT}.png
+		domenu ${PN}-${SLOT}.desktop
+	fi
+}
diff --git a/media-video/avidemux/files/avidemux-2.7.0-glibc-2.27.patch b/media-video/avidemux/files/avidemux-2.7.0-glibc-2.27.patch
deleted file mode 100644
index 166791f4774a..000000000000
--- a/media-video/avidemux/files/avidemux-2.7.0-glibc-2.27.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From afdd9c4b876d77a4974d3fa7d9f25caeffbdf13d Mon Sep 17 00:00:00 2001
-From: eumagga0x2a <eumagga0x2a@users.noreply.github.com>
-Date: Fri, 29 Sep 2017 15:53:14 +0200
-Subject: [PATCH] [build] Fix compilation with glibc >= 2.27
-
----
- avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp b/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
-index c6cb43bb6..269c2d2e3 100644
---- a/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
-+++ b/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
-@@ -35,7 +35,7 @@
- #elif defined(ADM_BSD_FAMILY) || defined(__sun__)
- #define POW10(x) powf(10.0,x)
- #else
--#define POW10(x)  pow10f(x)
-+#define POW10(x) exp10f(x)
- #endif
- 
- #define LINEAR_TO_DB(x) (20.*log10(x))
diff --git a/media-video/avidemux/files/avidemux-2.7.0-qt-5.11.patch b/media-video/avidemux/files/avidemux-2.7.0-qt-5.11.patch
deleted file mode 100644
index 8ac9bbc3b4ac..000000000000
--- a/media-video/avidemux/files/avidemux-2.7.0-qt-5.11.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ba667da44fcb88ee660339e52859bb90dc1b00d3 Mon Sep 17 00:00:00 2001
-From: mean <fixounet@free.fr>
-Date: Wed, 30 May 2018 07:31:03 +0200
-Subject: [PATCH] [Qt] Compatibilty patch with newer qt (>=5.11), patch by
- Chris Clayton
-
----
- avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp         | 1 +
- avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp               | 1 +
- avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-index 256f69d5e..54b0ac639 100644
---- a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-+++ b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-@@ -17,6 +17,7 @@
- #include "ADM_coreJobs.h"
- #include "DIA_coreToolkit.h"
- #include <QtCore/QDir>
-+#include <QAction>
- 
- extern void loadTranslator(void);
- extern void initTranslator(void);
-diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
-index 85cec5f9a..f537995ca 100644
---- a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
-+++ b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
-@@ -21,6 +21,7 @@
- #include "ADM_memsupport.h"
- #include "ADM_crashdump.h"
- #include "ADM_win32.h"
-+#include <QAction>
- 
- void onexit( void );
- 
-diff --git a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
-index 94bdd577e..b2a01e54b 100644
---- a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
-+++ b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
-@@ -17,6 +17,7 @@
- #include "Q_eq2.h"
- #include "ADM_toolkitQt.h"
- #include <QSignalMapper>
-+#include <QAction>
- 
- //
- //	Video is in YV12 Colorspace
\ No newline at end of file
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 757d36321388..cf4d28665d12 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,31 +1,13 @@
 AUX chromium-r1.patch 1582 BLAKE2B 48547a7d53fd1f0f44b682c7e2306e79f007f8e96b36253f76775c4a3ced54ffaaf403dfaae94e81aa26c60887677b2dabdd2c5cef9fc4553e203f8259453910 SHA512 808daad5afed13a6d3926c9f9ab5cb58f80e16969533022c7ee959147908bb2c12d066d2125a6b6975ef9304d9b8d49c39aeb0a047009adabb4529e3cf54498f
 AUX chromium.patch 1420 BLAKE2B 1acf931cd2e635b0b6c2c42d649d1bc92ac59321acc451501c70076d84449fd17b3a95c24a33208994df9aac8f8959a084f0ebaedaf0c997f535008594872bd8 SHA512 1f3f6d08aac64bb8c9d8a974170064b8a3531a6d06cea6fb208439dc687addeaf0c90f7f407dd7e71f50cd524f69c110c92d5276d04fe3bcaf7fb1ff2494ec59
 AUX ffmpeg-3.4.6-fix-building-against-fdk-aac-2.patch 2820 BLAKE2B 05c0dc79d8e34de518625d4dff4c08f529ee85062da9185f1312e3b32ea2577a249cfbd40e665cbc185ca5acb68cf5cdc9891a0454428bc0f2a602491df59589 SHA512 d9918a659e4548f0da6ef5621d8ab2face7e9382e3ac008e47014691aebafd5e7b2f5e059b8fcf41a4a39c2efc408dda0015905f8d7cca874c0104f20327e511
-AUX ffmpeg32-openjpeg22.patch 4777 BLAKE2B 4ea7ed6b6b31c6d0d3e99358231ce27f18423aab866ceed75c10bf2c4b514ae4d023f9b0f4dd91346773f2ef2014943a08e6093e53266fa307557da69d766c8b SHA512 0d619b0e353ee9f80dffdb94bedd31b55fb4e6a18a0e60d8ef7119e5012583c1c0531b0b200b41c32caaa71cbade4899f74c9d0ae70d15403ef0aa6f3d77e07d
-AUX openjpeg22.patch 4770 BLAKE2B b5fd034e2af9d180b2e0ee76e5227fcc948e20bacc5e463c8d7d640db3c3e52dd0f12149e5a095388c3b8db0d7c37bb4080be3141b90fd554c46aa4650585b27 SHA512 8a198910cdf43df83fdf50e372c2ec5d911637dd61768d5ac3a1984f99d1f374f594af9ff6c501b248c390a22898e4964f7d07c81eb3586fa1bebad2c9e00730
-AUX openjpeg23.patch 5105 BLAKE2B 64aab97ec21e44f7ab94c9513ebf63e60a76698889ed3cafebec3a25adb07dddffe9358c4c3b29f89b0d0b4c8bb54d9197a5b8ca2e4105c539fd6b513ad5c247 SHA512 a1e3b91add49a80633e19eb49870ecb7ef1493cf3503d121bdeb74f2fcd0320b8e5f04a3505241f7375f4a598f5da651afb92350e3b92412977f55b9193409a7
-DIST ffmpeg-3.2.6.tar.bz2 9623111 BLAKE2B 76ed10d969ec5e85c0ad23fee1118ccfd66689b07062dc51526fca5427507124751d957b57b1a002ba585b9d35afc80cc6f3113c559b160b2751fc526b3d304f SHA512 eca75524374003eac78033bd2a744b459a4dc631c59150b6c9291e06a693bdd14e0b11cae9c800446f0648edccc066480c2b869bcb456a74eeabb91ab41f8285
-DIST ffmpeg-3.2.7.tar.bz2 9622391 BLAKE2B 7d6f094ca0bd5e2cab02e051acc8e554873bca2d165fc9326de0b12e145ec939567aed95c01589c47291970a89fb3462c75d32db1c4c2c8cf6d4a14956cd8a79 SHA512 a5b6df77d2d4ede0cc2f398b763d7405f43f43e37c11a596ec1a2a8921714875fd8fa9ffbcff84355854780872ab7313c859a4a19bf419298b4d3bc797ad8ac4
-DIST ffmpeg-3.3.4.tar.bz2 9944256 BLAKE2B 72d42a16396882b30641fb057bb597f8e98ecfa482a087ece48189acba8a80a72e931e70ad961db8c01c93a556f619ebdecb39bae9d4559cc504d0f7eabf15a7 SHA512 d2257a71f9ae7856390b807d70bf643d4360fe4f2ad7c76af3ac5332cda353a1a543cdcdea0c510dbb6141f7a3a36ffbf26ae87b0ffc9ce4b3b7641814a40e3a
-DIST ffmpeg-3.3.6.tar.bz2 9943322 BLAKE2B 2526fdf9580045131426e554a9bf44fdc6567c12213ea4d5b78aa27f14513f14e07f38b8380183686fa1a62440fe4108eaecddca96f4dec3c74c410b1f90ee03 SHA512 1305760fa981bcb43c8fcb5dd1bf7dd8d3f405a124975f062062b741d49e12386e4d3eec3de6a032fc93cd7f6086d939275a669a9997ffa400f70c20f7eb3d23
-DIST ffmpeg-3.3.8.tar.bz2 9953307 BLAKE2B edd3c2ce9730494455a05ec9d81b6c2ceb0ebf526124f95a530214cdb113ffe91aa13b80a66501aefa4f571c5b8f2eedb97f8086370d08e3b4e2a98d517eb92b SHA512 a793f6d0a06ff5244a580d9e54e1252d3ac88e2513dad4d137081103327ae4440ebe9b0d60a13f93536cb6b35097982ea76acc4056bfa31683063eef5c211ede
-DIST ffmpeg-3.4.5.tar.bz2 10183082 BLAKE2B f72157baefcd6a0ca8f389309bbe947ad21996e0f2eb3c46c6bfc90f1ebbb14bfd007d001e46ea51efef5db5f9fcee24b1a90b6862136aeebecdc95bb61b23a5 SHA512 e12707d47404a9ce02790b77d2852fc1a1573c8108e980c7355fa48ba891d1649464d4fe4d08394ecd6d871f651ac4388486b7654cb54a7aaeedaf05c55513ec
 DIST ffmpeg-3.4.6.tar.bz2 10190001 BLAKE2B 4c7842900171cf871f8524f08f435797b1a168faa11877100fe74c3ecd4a2c2e004a5110dc23bda818f69b0a484f63d8f34c7904c4827c88894d877cdd70c6fe SHA512 0228751b288096e368f9049854936930b7c1fd89aac31a5382f5de78d3282b4e86a6f562c79833d1635222f0ad56b2e5401a150574714e1b7e0ab4f5d8939812
-DIST ffmpeg-4.1.1.tar.bz2 10686360 BLAKE2B 47f4716d7e184d7318eb1a99ab1cdc188009464e973162e583f7ca4ae79fa3b103f9d5329c8993b72d20667e42e5a749123709a4640f07762568300b5c3c897f SHA512 0241c44e1dffd0d890a3d30a1b2387ea167d578bb39ba0c804fb417e132d343a9e43da9247b205e18b893d8cf75d8528e9971569be67ac380b88618ef0a75ed4
-DIST ffmpeg-4.1.2.tar.bz2 10687366 BLAKE2B c69cc693078f40610c4414f01ed20f89a85db398b3177d8d79a6f58f2d48b6a8049a2bc622933e0ae0a2889f635c25ccf1c5856cb86a4d98bb0bc2308188ae86 SHA512 6c3bf20d46772a80299c9d385919a745e4022c0a9b3c438c0504d3c94bb8d472f2c9026105330fa7c50c2f23f511eb853f32e4387f73c0b7b0d0761c20cb8b31
 DIST ffmpeg-4.1.3.tar.bz2 10689073 BLAKE2B 8486e21c8df116af802bb7f9208e702ec1feaa4f292f14021e0b6bfb3957b13ddacfa87db361e677ae0583cc2bd1d402a66b0c8507cbed79a001c9b8462100bf SHA512 d0f8b3ee7b55e67b1c7ad9610a7b19a15acfc35dc843683502e536ebcc2e8678b55325532c0039b764cc978e95f83afb48bd24304abaee26f26d3247a8310bfe
 DIST ffmpeg-4.1.4.tar.bz2 10691784 BLAKE2B 5f1f0b3c78cdd913e44bef448ff4d26fc5ea01e1a002baf98461fe0d8870bc2b0f29a1770377df8ff4f0c45febd532d6436c6627f5d1fb97125e92d9929f9284 SHA512 0c2d5bf4873b2bf12aff8c8b576d58dc3c5984ca727f48e1247293cbebda382e9070e8b7fac99870ec2ae0cef3be0a187d5ec5d58ee3e861cd673cae961b5947
-EBUILD ffmpeg-3.2.6.ebuild 14779 BLAKE2B b79fb9e74ed3eaf3d84bb14823cd305dde3f14d5cd5bcf236bfac6443daa4d6c678ad2aea23559021af33afc0488c3fa845c4da52e1c27988a3f504a10475b3f SHA512 31fbf5b2294c6ba34960298347bb7c9523070bead6215b2f17ea7f7cf0b46878d14e22f1888959a4586550630e2f3b3e81ce7feae1270aad12a5cf5e297e51c1
-EBUILD ffmpeg-3.2.7.ebuild 14784 BLAKE2B 709df5de9f58af7d57a01a4a90f5eb3eacc132a6dbed7d7f86a74c984774ad119febd904cede6b77f9ef4b05ae48538b6d18a1b50e5c7406a07dcfe567370a52 SHA512 e9b1439ffbdb2299ddffccf9a6fd43a5ee4a99e39c461a82393ae71226623c042e7a73c093a9c4d70b175aba7fd0eccd3926fb9a9d8de24afd97ac44f189ea9f
-EBUILD ffmpeg-3.3.4.ebuild 15808 BLAKE2B c64f1cd480d0bf2e8834073571f40eef01093b6384003653d3da534534f4a23fa1e5315de5e05dc808b1743dedc587439b4959ae843feee252f848b826308d9a SHA512 a29e5beb75cdacb1ce07b34910b419013c7dc8b906c5927aff6492338e02ec9d8ec0813e2d2aabce4d0aca70e027001c8aa50be23e9cfabc1f6aa860975e1b4b
-EBUILD ffmpeg-3.3.6.ebuild 15809 BLAKE2B b78701e736d5b1a8c029bbbec3c5ce40356223c35e78e160cb93a3e30732441abe1a14ab5940d302556abffde9d798de3ad160a98cd274334d467b0e9ba5de80 SHA512 b71dfc45bf7e29e8a5e70402c1dccfe2148223e60a1270a58918c3c3486472193e269e81cd8a1074a792b12b3d24d7a8733f62e3ef5002689d46ce9ce588f605
-EBUILD ffmpeg-3.3.8.ebuild 15815 BLAKE2B 2bce668121996c1bbdf472dcede998450fa4b53b36dfa25ef62b1eaa988cb6b7f8ab216ef29ebefae026ee06b9d4ad001ecb90076efb61e1c6bbaff9b09dce1f SHA512 8650a978d1283d35f37b549e937f9c04cdc860540f7e7ee1871c07b21c13c3c165322075dd00ffbbeaf629d2c79b445b0fd715ae88fba3e59b0fd217b4c3dc72
-EBUILD ffmpeg-3.4.5.ebuild 15589 BLAKE2B 4c0a74578c7e93f007e149a0874a3bde915d5037f9d7ae038eaae815b86254341045bb4d730ae0726c09b61c50622544afb548776476e8d7118b9c64dbc8c6f3 SHA512 e71404901e95550401dc6a0a58e74778327d7a0f32d154ea05e6e5537e5ce629bed613bf9c7a4d6844e501231e1775d8005846ad8698c03e7028f6661c06ce70
+DIST ffmpeg-4.2.tar.bz2 10954171 BLAKE2B 1c2dfeb000a0cc85ca23d255163336db132b5f16cb184a0f3363f68108f5bde0220050b351f9c50273ef6642f86f1a43832f4b831928d95dd991a908c7c25e2e SHA512 74d06a420af61e05d9e076f4f433e8316590c3b850ada96e74c1df39431db1595f74315bdef624153edb160b8bef8683a4e9f35d69714cde4b5ec72aeb1d28e1
 EBUILD ffmpeg-3.4.6-r1.ebuild 15659 BLAKE2B d2dcdc4da728c0466d9cdd8c1e3f92253dbb4381d8f179a48761e631d79f727a95e6b4bff104189054e5a391786c1060ccdd257bf19b60df63df973c34883a77 SHA512 75460743011065d4f2e29e56029991c42f499bffdd66c3aa2ada3792c4449f193ac2a8a5dfcee234b170a9d4e5f9e889c24ec86fbf6713b853357e00d05e27e9
-EBUILD ffmpeg-3.4.6.ebuild 15588 BLAKE2B d49f5b8411ee48a41af83136a8f0ec673f4feb3a13e194d72716c5d220b929688ff1bb20555091ee113546669ba385df7d1cd880fb724556f90420bffcdb00c7 SHA512 8497f50238398bb270e20bf3a896c95fac17ffae62482d3475aa28df27f7ac23c5d230a0a68de089a9f3230826345cbf9b12cd38a2f6fdbdf76b533fa50b1d84
-EBUILD ffmpeg-4.1.1.ebuild 17072 BLAKE2B 4e3d25a7b01920c2e89740ef5847b3f99aa283e8926efcb641687ce9064f69aac5a25132f1295fd0c1dd1dff0f532d12acda72acaf09671549adb8d626266229 SHA512 3e2f5362b30dc2dc9a14356887304af89768774efb3025c4af7276da03ee75ae0a0ed85afd43c0a04b59c687aee901eba4db868720d130b0e282d25324e77977
-EBUILD ffmpeg-4.1.2.ebuild 17072 BLAKE2B 4e3d25a7b01920c2e89740ef5847b3f99aa283e8926efcb641687ce9064f69aac5a25132f1295fd0c1dd1dff0f532d12acda72acaf09671549adb8d626266229 SHA512 3e2f5362b30dc2dc9a14356887304af89768774efb3025c4af7276da03ee75ae0a0ed85afd43c0a04b59c687aee901eba4db868720d130b0e282d25324e77977
-EBUILD ffmpeg-4.1.3.ebuild 17068 BLAKE2B ae2c9f969c0326afa128a43fc3fc8598ea708de98c1a147703fa9c7e99bdfc30a0988671d2131e260df4d695092a00574a7c5f313a0e58581f83bb2e12fb77e4 SHA512 f37ba40940d3719dff9f0b069b71012f8a155602f36a5b30e825026b43275eec3dad659900907bfe18a3479785d04813dae8a2916fd5fe349b70a963580b8f96
-EBUILD ffmpeg-4.1.4.ebuild 17071 BLAKE2B f45c4190b2bb52f491bc9ddc82d0db8334908768bb15d0f45751dac8e8301c4df5edb6ab90e8d28811a23dfe81ed1600b5ccf4bb567ee93e6f0ce4532ec60b27 SHA512 c7a41a6c11806a7a0f4139f5aa56f1a7988df83537f3e003258584d97e44021268f1885cde4694757e41c24be67653283b543f63d649db656a73dd35a6ba5a16
-EBUILD ffmpeg-9999.ebuild 17208 BLAKE2B 0c9c9bbbdf2238d995008d6ac8f6a357993abd976958738747edca1e966caabf6dd5816a70c9da34072157fe08b3fad6b04bf2cc65cfe5a548144d968a116938 SHA512 b6e99a8d554b18afc5719468f80d46b5d6a1f3e71ec1c68beb17797f3c7ef301418afdbf9f365db554617564b290d3596e1ad0e355b4b08da47f76c747ad9aec
-MISC metadata.xml 5992 BLAKE2B 640b4b6e9904cc8653cd5c7788cbd5b0b48579e7a87fdd58b98e5ad88d3e34f05aa181a89830aabca4f9262c1ce9e07ed1b1c323352d40b1da6800b5e0e41fe7 SHA512 542bf49855f46b3391a9061b3c5e8c025ea5fb67af6046f0aa2bd6fb5cdf17bff92d5c2fea181f7e2f7dffb84452f8876ed8ef744b41b7828d0188ce57b184ae
+EBUILD ffmpeg-4.1.3.ebuild 17089 BLAKE2B e22a868b41cb850c62dc6d17086b3926f643c729143cb73a337751429327eba78e790f4ef83347ec29a722edacae2623f62457d413a6c50bebd8be7470f085b3 SHA512 f5f10320019873ef08deb6cf9f3ffe4a3c75722657bbcd3f3a644a99a23fe257e9bf4b211f2f3648ef8a489e0b81e83dd44dc34f988bc9768b7e8647c55b2af4
+EBUILD ffmpeg-4.1.4.ebuild 17092 BLAKE2B 550aa1315c42bc58dd3b218134b0f0bc486ba3657a7aeea214b65e413be6fda5ecd22fb3dd9e50125710ee8eca550311aa7ebd5aaf28b852a5ac493d0d521a8c SHA512 8d401aff8819f6d66dfa01ae89aef2714b689a28ada474dc5bfe7932b9b67c8b71ac9799d8377ecc5c01f412ea292754543e52c88bcc17716d164b2be4cb2136
+EBUILD ffmpeg-4.2.ebuild 17511 BLAKE2B 22e044dec3c97a91ea2cef13145f355df952148acd904a2accae6473c35a246b157cb47ab0ae08845a72f5ebb334d0e953412ec9e48fca2461fec0a5d6c163c3 SHA512 4ac3fc07895b5179ab908aec1f47b73acf046e8bd32299f1e3b718d3e707816632467cfae6734a819b6b4d957a22c9128f49e2b0a588685273c617fa36cf9404
+EBUILD ffmpeg-9999.ebuild 17517 BLAKE2B 6830417610687f3a32657be10d94cc9475dcb53b5009a4a1e1c30ebfce5c12ce9033ffb7e9f985d369acf91650f646c76037f40250c4dd6921c07e9517b1621a SHA512 2a6b0e7793c9e135fccfa828ddff21d14eaf7153e43e01fa4fda2c166fc75eb396919a76385f2a1a21bad97a17286f5ba0890d3179762a6d69f72d84960bff9b
+MISC metadata.xml 5728 BLAKE2B c5e24e8b81b147d84f7204c9dd1cca5eb45a0bf9b46c25c39670b1c59432e8c6e65bb472bbf3c4b57451d8dff4f8663cfa0abd9fda9c13f57e3eed82945da0cf SHA512 2822c0df5018e1003b7be90b8579747024e05732a1fa698a1f85f4e8362a3e76b4add6c6bb39036eeb5b0483241b55a7300c65350f7b774fcc7dff33cd0061a4
diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
deleted file mode 100644
index a6291d34e905..000000000000
--- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
-		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
-		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex vorbis:libvorbis vpx:libvpx
-		zvbi:libzvbi
-		# libavfilter options
-		bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-		rubberband:librubberband zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar nvenc:nvenc
-	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa doc +encode jack oss pic static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp )
-MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-IUSE="${IUSE}
-	${ARM_CPU_FEATURES[@]%:*}
-	${MIPS_CPU_FEATURES[@]%:*}
-	${PPC_CPU_FEATURES[@]%:*}
-	${X86_CPU_FEATURES[@]%:*}
-"
-
-CPU_REQUIRED_USE="
-	${X86_CPU_REQUIRED_USE}
-"
-
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
-# $(tc-arch).
-CPU_FEATURES_MAP="
-	arm:ARM
-	arm64:ARM
-	mips:MIPS
-	ppc:PPC
-	ppc64:PPC
-	x86:X86
-	amd64:X86
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		nvenc? ( media-video/nvidia_video_sdk )
-		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		!xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-	zimg? ( media-libs/zimg[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	postproc? ( !media-libs/libpostproc )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
-	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-PATCHES=( "${FILESDIR}/ffmpeg32-openjpeg22.patch" )
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	default
-
-	# the version script on Solaris causes invalid symbol version problems
-	# we don't want their hacky workarounds, we're having a GNU ld
-	sed -i -e 's/sunos)/sunos) network_extralibs="-lsocket -lnsl"; add_cppflags -D__EXTENSIONS__; enable pic; disable symver ;; no-sunos)/' configure || die
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl && use gpl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use xcb || ffuse+=( X:x11grab )
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES_MAP} ; do
-		if [ "$(tc-arch)" = "${i%:*}" ] ; then
-			local var="${i#*:}_CPU_FEATURES[@]"
-			for j in ${!var} ; do
-				use ${j%:*} || myconf+=( --disable-${j#*:} )
-			done
-		fi
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282
-	is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		--disable-libcelt # bug #664158
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
deleted file mode 100644
index ac8492a79dff..000000000000
--- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
-		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
-		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex vorbis:libvorbis vpx:libvpx
-		zvbi:libzvbi
-		# libavfilter options
-		bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-		rubberband:librubberband zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar nvenc:nvenc
-	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa doc +encode jack oss pic static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp )
-MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-IUSE="${IUSE}
-	${ARM_CPU_FEATURES[@]%:*}
-	${MIPS_CPU_FEATURES[@]%:*}
-	${PPC_CPU_FEATURES[@]%:*}
-	${X86_CPU_FEATURES[@]%:*}
-"
-
-CPU_REQUIRED_USE="
-	${X86_CPU_REQUIRED_USE}
-"
-
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
-# $(tc-arch).
-CPU_FEATURES_MAP="
-	arm:ARM
-	arm64:ARM
-	mips:MIPS
-	ppc:PPC
-	ppc64:PPC
-	x86:X86
-	amd64:X86
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		nvenc? ( media-video/nvidia_video_sdk )
-		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		!xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-	zimg? ( media-libs/zimg[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	postproc? ( !media-libs/libpostproc )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
-	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-PATCHES=( "${FILESDIR}/ffmpeg32-openjpeg22.patch" )
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	default
-
-	# the version script on Solaris causes invalid symbol version problems
-	# we don't want their hacky workarounds, we're having a GNU ld
-	sed -i -e 's/sunos)/sunos) network_extralibs="-lsocket -lnsl"; add_cppflags -D__EXTENSIONS__; enable pic; disable symver ;; no-sunos)/' configure || die
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl && use gpl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use xcb || ffuse+=( X:x11grab )
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES_MAP} ; do
-		if [ "$(tc-arch)" = "${i%:*}" ] ; then
-			local var="${i#*:}_CPU_FEATURES[@]"
-			for j in ${!var} ; do
-				use ${j%:*} || myconf+=( --disable-${j#*:} )
-			done
-		fi
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282
-	is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		--disable-libcelt # bug #664158
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
deleted file mode 100644
index d55a0875bac5..000000000000
--- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
+++ /dev/null
@@ -1,505 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
-		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
-		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex vorbis:libvorbis vpx:libvpx
-		zvbi:libzvbi
-		# libavfilter options
-		bs2b:libbs2b chromaprint flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-		rubberband:librubberband sofalizer:netcdf zeromq:libzmq zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar nvenc:nvenc
-	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa chromium doc +encode jack oss pic static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_thumb:armv5te
-	cpu_flags_arm_v6:armv6
-	cpu_flags_arm_thumb2:armv6t2
-	cpu_flags_arm_neon:neon
-	cpu_flags_arm_vfp:vfp
-	cpu_flags_arm_vfpv3:vfpv3
-	cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-	arm64? ( cpu_flags_arm_v8 )
-	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-IUSE="${IUSE}
-	${ARM_CPU_FEATURES[@]%:*}
-	${MIPS_CPU_FEATURES[@]%:*}
-	${PPC_CPU_FEATURES[@]%:*}
-	${X86_CPU_FEATURES[@]%:*}
-"
-
-CPU_REQUIRED_USE="
-	${ARM_CPU_REQUIRED_USE}
-	${X86_CPU_REQUIRED_USE}
-"
-
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
-# $(tc-arch).
-CPU_FEATURES_MAP="
-	arm:ARM
-	arm64:ARM
-	mips:MIPS
-	ppc:PPC
-	ppc64:PPC
-	x86:X86
-	amd64:X86
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		nvenc? ( media-video/nvidia_video_sdk )
-		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	sofalizer? (
-		>=sci-libs/netcdf-4.3.2-r1[hdf5]
-		>=sci-libs/hdf5-1.8.18[hl]
-	)
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-	zeromq? ( >=net-libs/zeromq-4.1.6 )
-	zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	postproc? ( !media-libs/libpostproc )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
-	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/openjpeg22.patch
-	"${FILESDIR}"/openjpeg23.patch
-	"${FILESDIR}"/chromium.patch
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	default
-	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl && use gpl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r netcdf libzmq ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES_MAP} ; do
-		if [ "$(tc-arch)" = "${i%:*}" ] ; then
-			local var="${i#*:}_CPU_FEATURES[@]"
-			for j in ${!var} ; do
-				use ${j%:*} || myconf+=( --disable-${j#*:} )
-			done
-		fi
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282
-	is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		--disable-libcelt # bug #664158
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-
-	if multilib_is_native_abi && use chromium; then
-		einfo "Configuring for Chromium"
-		mkdir -p ../chromium || die
-		pushd ../chromium >/dev/null || die
-		set -- "${@}" \
-			--disable-shared \
-			--enable-static \
-			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
-		echo "${@}"
-		"${@}" || die
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
deleted file mode 100644
index c86f3c9aece9..000000000000
--- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
+++ /dev/null
@@ -1,505 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
-		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
-		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex vorbis:libvorbis vpx:libvpx
-		zvbi:libzvbi
-		# libavfilter options
-		bs2b:libbs2b chromaprint flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-		rubberband:librubberband sofalizer:netcdf zeromq:libzmq zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar nvenc:nvenc
-	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa chromium doc +encode jack oss pic static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_thumb:armv5te
-	cpu_flags_arm_v6:armv6
-	cpu_flags_arm_thumb2:armv6t2
-	cpu_flags_arm_neon:neon
-	cpu_flags_arm_vfp:vfp
-	cpu_flags_arm_vfpv3:vfpv3
-	cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-	arm64? ( cpu_flags_arm_v8 )
-	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-IUSE="${IUSE}
-	${ARM_CPU_FEATURES[@]%:*}
-	${MIPS_CPU_FEATURES[@]%:*}
-	${PPC_CPU_FEATURES[@]%:*}
-	${X86_CPU_FEATURES[@]%:*}
-"
-
-CPU_REQUIRED_USE="
-	${ARM_CPU_REQUIRED_USE}
-	${X86_CPU_REQUIRED_USE}
-"
-
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
-# $(tc-arch).
-CPU_FEATURES_MAP="
-	arm:ARM
-	arm64:ARM
-	mips:MIPS
-	ppc:PPC
-	ppc64:PPC
-	x86:X86
-	amd64:X86
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		nvenc? ( media-video/nvidia_video_sdk )
-		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	sofalizer? (
-		>=sci-libs/netcdf-4.3.2-r1[hdf5]
-		>=sci-libs/hdf5-1.8.18[hl]
-	)
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-	zeromq? ( >=net-libs/zeromq-4.1.6 )
-	zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	postproc? ( !media-libs/libpostproc )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
-	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/openjpeg22.patch
-	"${FILESDIR}"/openjpeg23.patch
-	"${FILESDIR}"/chromium.patch
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	default
-	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl && use gpl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r netcdf libzmq ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES_MAP} ; do
-		if [ "$(tc-arch)" = "${i%:*}" ] ; then
-			local var="${i#*:}_CPU_FEATURES[@]"
-			for j in ${!var} ; do
-				use ${j%:*} || myconf+=( --disable-${j#*:} )
-			done
-		fi
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282
-	is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		--disable-libcelt # bug #664158
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-
-	if multilib_is_native_abi && use chromium; then
-		einfo "Configuring for Chromium"
-		mkdir -p ../chromium || die
-		pushd ../chromium >/dev/null || die
-		set -- "${@}" \
-			--disable-shared \
-			--enable-static \
-			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
-		echo "${@}"
-		"${@}" || die
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
deleted file mode 100644
index fe80b8d12625..000000000000
--- a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
+++ /dev/null
@@ -1,505 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
-		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
-		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex vorbis:libvorbis vpx:libvpx
-		zvbi:libzvbi
-		# libavfilter options
-		bs2b:libbs2b chromaprint flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-		rubberband:librubberband sofalizer:netcdf zeromq:libzmq zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar nvenc:nvenc
-	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa chromium doc +encode jack oss pic static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_thumb:armv5te
-	cpu_flags_arm_v6:armv6
-	cpu_flags_arm_thumb2:armv6t2
-	cpu_flags_arm_neon:neon
-	cpu_flags_arm_vfp:vfp
-	cpu_flags_arm_vfpv3:vfpv3
-	cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-	arm64? ( cpu_flags_arm_v8 )
-	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-IUSE="${IUSE}
-	${ARM_CPU_FEATURES[@]%:*}
-	${MIPS_CPU_FEATURES[@]%:*}
-	${PPC_CPU_FEATURES[@]%:*}
-	${X86_CPU_FEATURES[@]%:*}
-"
-
-CPU_REQUIRED_USE="
-	${ARM_CPU_REQUIRED_USE}
-	${X86_CPU_REQUIRED_USE}
-"
-
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
-# $(tc-arch).
-CPU_FEATURES_MAP="
-	arm:ARM
-	arm64:ARM
-	mips:MIPS
-	ppc:PPC
-	ppc64:PPC
-	x86:X86
-	amd64:X86
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		nvenc? ( media-video/nvidia_video_sdk )
-		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	sofalizer? (
-		>=sci-libs/netcdf-4.3.2-r1[hdf5]
-		>=sci-libs/hdf5-1.8.18[hl]
-	)
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-	zeromq? ( >=net-libs/zeromq-4.1.6 )
-	zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	postproc? ( !media-libs/libpostproc )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
-	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/openjpeg22.patch
-	"${FILESDIR}"/openjpeg23.patch
-	"${FILESDIR}"/chromium.patch
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	default
-	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl && use gpl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r netcdf libzmq ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES_MAP} ; do
-		if [ "$(tc-arch)" = "${i%:*}" ] ; then
-			local var="${i#*:}_CPU_FEATURES[@]"
-			for j in ${!var} ; do
-				use ${j%:*} || myconf+=( --disable-${j#*:} )
-			done
-		fi
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282
-	is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		--disable-libcelt # bug #664158
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-
-	if multilib_is_native_abi && use chromium; then
-		einfo "Configuring for Chromium"
-		mkdir -p ../chromium || die
-		pushd ../chromium >/dev/null || die
-		set -- "${@}" \
-			--disable-shared \
-			--enable-static \
-			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
-		echo "${@}"
-		"${@}" || die
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
deleted file mode 100644
index 6718843acf2a..000000000000
--- a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
+++ /dev/null
@@ -1,488 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv lzma +network opencl openssl +postproc
-		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
-		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse libdrm
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex svg:librsvg vorbis:libvorbis
-		vpx:libvpx zvbi:libzvbi
-		# libavfilter options
-		appkit
-		bs2b:libbs2b chromaprint flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-		rubberband:librubberband zeromq:libzmq zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar nvenc:nvenc
-	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa chromium doc +encode jack oss pic static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_thumb:armv5te
-	cpu_flags_arm_v6:armv6
-	cpu_flags_arm_thumb2:armv6t2
-	cpu_flags_arm_neon:neon
-	cpu_flags_arm_vfp:vfp
-	cpu_flags_arm_vfpv3:vfpv3
-	cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-	arm64? ( cpu_flags_arm_v8 )
-	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${MIPS_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
-	${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
-	${ARM_CPU_REQUIRED_USE}
-	${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		nvenc? ( media-video/nvidia_video_sdk )
-		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-	zeromq? ( >=net-libs/zeromq-4.1.6 )
-	zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	postproc? ( !media-libs/libpostproc )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/chromium.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	default
-	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl && use gpl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r libzmq ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282
-	is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		--disable-libcelt # bug #664158
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-
-	if multilib_is_native_abi && use chromium; then
-		einfo "Configuring for Chromium"
-		mkdir -p ../chromium || die
-		pushd ../chromium >/dev/null || die
-		set -- "${@}" \
-			--disable-shared \
-			--enable-static \
-			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
-		echo "${@}"
-		"${@}" || die
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-3.4.6.ebuild b/media-video/ffmpeg/ffmpeg-3.4.6.ebuild
deleted file mode 100644
index 4456cb1e7c4f..000000000000
--- a/media-video/ffmpeg/ffmpeg-3.4.6.ebuild
+++ /dev/null
@@ -1,488 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv lzma +network opencl openssl +postproc
-		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
-		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse libdrm
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex svg:librsvg vorbis:libvorbis
-		vpx:libvpx zvbi:libzvbi
-		# libavfilter options
-		appkit
-		bs2b:libbs2b chromaprint flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-		rubberband:librubberband zeromq:libzmq zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar nvenc:nvenc
-	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa chromium doc +encode jack oss pic static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_thumb:armv5te
-	cpu_flags_arm_v6:armv6
-	cpu_flags_arm_thumb2:armv6t2
-	cpu_flags_arm_neon:neon
-	cpu_flags_arm_vfp:vfp
-	cpu_flags_arm_vfpv3:vfpv3
-	cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-	arm64? ( cpu_flags_arm_v8 )
-	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${MIPS_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
-	${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
-	${ARM_CPU_REQUIRED_USE}
-	${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		nvenc? ( media-video/nvidia_video_sdk )
-		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-	zeromq? ( >=net-libs/zeromq-4.1.6 )
-	zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	postproc? ( !media-libs/libpostproc )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/chromium.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	default
-	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl && use gpl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r libzmq ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282
-	is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		--disable-libcelt # bug #664158
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-
-	if multilib_is_native_abi && use chromium; then
-		einfo "Configuring for Chromium"
-		mkdir -p ../chromium || die
-		pushd ../chromium >/dev/null || die
-		set -- "${@}" \
-			--disable-shared \
-			--enable-static \
-			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
-		echo "${@}"
-		"${@}" || die
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-4.1.1.ebuild b/media-video/ffmpeg/ffmpeg-4.1.1.ebuild
deleted file mode 100644
index 12b71fa688bb..000000000000
--- a/media-video/ffmpeg/ffmpeg-4.1.1.ebuild
+++ /dev/null
@@ -1,528 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=56.58.58
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_MIN_CLONE_TYPE="single"
-	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="https://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
-		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
-		X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
-		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
-		# libavfilter options
-		appkit
-		bs2b:libbs2b chromaprint flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype
-		rubberband:librubberband zeromq:libzmq zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar libaom
-	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa chromium doc +encode oss pic static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_thumb:armv5te
-	cpu_flags_arm_v6:armv6
-	cpu_flags_arm_thumb2:armv6t2
-	cpu_flags_arm_neon:neon
-	cpu_flags_arm_vfp:vfp
-	cpu_flags_arm_vfpv3:vfpv3
-	cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-	arm64? ( cpu_flags_arm_v8 )
-	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${MIPS_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
-	${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
-	${ARM_CPU_REQUIRED_USE}
-	${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
-	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	srt? ( >=net-libs/srt-1.3.0[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	video_cards_nvidia? ( >=media-libs/nv-codec-headers-8.1.24.2[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-	zeromq? ( >=net-libs/zeromq-4.1.6 )
-	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	postproc? ( !media-libs/libpostproc )
-"
-
-# Crypto & co provider magic
-# - libressl is a useflag meaning it should always favor libressl over openssl
-# - libressl and openssl provide more features to ffmpeg than gnutls
-#
-# The ordering is thus: libressl > openssl > gnutls
-RDEPEND="${RDEPEND}
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	!libressl? (
-		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-	)
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/chromium-r1.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-build_separate_libffmpeg() {
-	use opencl
-}
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	default
-	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# Incompatible features: openssl or libressl and gnutls
-	if use libressl ; then
-		myconf+=( --disable-gnutls --disable-openssl )
-	elif use openssl ; then
-		myconf+=( --disable-gnutls )
-	fi
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r libzmq ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282
-	is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		# This is only for hardcoded cflags; those are used in configure checks that may
-		# interfere with proper detections, bug #671746 and bug #645778
-		# We use optflags, so that overrides them anyway.
-		--disable-optimizations
-		--disable-libcelt # bug #664158
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-
-	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
-		einfo "Configuring for Chromium"
-		mkdir -p ../chromium || die
-		pushd ../chromium >/dev/null || die
-		set -- "${@}" \
-			--disable-shared \
-			--enable-static \
-			--enable-pic \
-			--disable-opencl
-		echo "${@}"
-		"${@}" || die
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			if build_separate_libffmpeg; then
-				einfo "Compiling for Chromium"
-				pushd ../chromium >/dev/null || die
-				emake V=1 libffmpeg
-				popd >/dev/null || die
-			else
-				emake V=1 libffmpeg
-			fi
-		fi
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			if build_separate_libffmpeg; then
-				einfo "Installing for Chromium"
-				pushd ../chromium >/dev/null || die
-				emake V=1 DESTDIR="${D}" install-libffmpeg
-				popd >/dev/null || die
-			else
-				emake V=1 DESTDIR="${D}" install-libffmpeg
-			fi
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-4.1.2.ebuild b/media-video/ffmpeg/ffmpeg-4.1.2.ebuild
deleted file mode 100644
index 12b71fa688bb..000000000000
--- a/media-video/ffmpeg/ffmpeg-4.1.2.ebuild
+++ /dev/null
@@ -1,528 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=56.58.58
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_MIN_CLONE_TYPE="single"
-	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="https://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
-		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
-		X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
-		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
-		# libavfilter options
-		appkit
-		bs2b:libbs2b chromaprint flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype
-		rubberband:librubberband zeromq:libzmq zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar libaom
-	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa chromium doc +encode oss pic static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_thumb:armv5te
-	cpu_flags_arm_v6:armv6
-	cpu_flags_arm_thumb2:armv6t2
-	cpu_flags_arm_neon:neon
-	cpu_flags_arm_vfp:vfp
-	cpu_flags_arm_vfpv3:vfpv3
-	cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-	arm64? ( cpu_flags_arm_v8 )
-	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${MIPS_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
-	${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
-	${ARM_CPU_REQUIRED_USE}
-	${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
-	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	srt? ( >=net-libs/srt-1.3.0[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	video_cards_nvidia? ( >=media-libs/nv-codec-headers-8.1.24.2[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-	zeromq? ( >=net-libs/zeromq-4.1.6 )
-	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	postproc? ( !media-libs/libpostproc )
-"
-
-# Crypto & co provider magic
-# - libressl is a useflag meaning it should always favor libressl over openssl
-# - libressl and openssl provide more features to ffmpeg than gnutls
-#
-# The ordering is thus: libressl > openssl > gnutls
-RDEPEND="${RDEPEND}
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	!libressl? (
-		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-	)
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/chromium-r1.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-build_separate_libffmpeg() {
-	use opencl
-}
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	default
-	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# Incompatible features: openssl or libressl and gnutls
-	if use libressl ; then
-		myconf+=( --disable-gnutls --disable-openssl )
-	elif use openssl ; then
-		myconf+=( --disable-gnutls )
-	fi
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r libzmq ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282
-	is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		# This is only for hardcoded cflags; those are used in configure checks that may
-		# interfere with proper detections, bug #671746 and bug #645778
-		# We use optflags, so that overrides them anyway.
-		--disable-optimizations
-		--disable-libcelt # bug #664158
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-
-	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
-		einfo "Configuring for Chromium"
-		mkdir -p ../chromium || die
-		pushd ../chromium >/dev/null || die
-		set -- "${@}" \
-			--disable-shared \
-			--enable-static \
-			--enable-pic \
-			--disable-opencl
-		echo "${@}"
-		"${@}" || die
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			if build_separate_libffmpeg; then
-				einfo "Compiling for Chromium"
-				pushd ../chromium >/dev/null || die
-				emake V=1 libffmpeg
-				popd >/dev/null || die
-			else
-				emake V=1 libffmpeg
-			fi
-		fi
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			if build_separate_libffmpeg; then
-				einfo "Installing for Chromium"
-				pushd ../chromium >/dev/null || die
-				emake V=1 DESTDIR="${D}" install-libffmpeg
-				popd >/dev/null || die
-			else
-				emake V=1 DESTDIR="${D}" install-libffmpeg
-			fi
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
index e608f7f769d9..f291a15cbd53 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
@@ -284,6 +284,7 @@ GPL_REQUIRED_USE="
 	postproc? ( gpl )
 	frei0r? ( gpl )
 	cdio? ( gpl )
+	rubberband? ( gpl )
 	samba? ( gpl )
 	encode? (
 		x264? ( gpl )
diff --git a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
index 46cb0d7e1ef8..6052be327bcd 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
@@ -284,6 +284,7 @@ GPL_REQUIRED_USE="
 	postproc? ( gpl )
 	frei0r? ( gpl )
 	cdio? ( gpl )
+	rubberband? ( gpl )
 	samba? ( gpl )
 	encode? (
 		x264? ( gpl )
diff --git a/media-video/ffmpeg/ffmpeg-4.2.ebuild b/media-video/ffmpeg/ffmpeg-4.2.ebuild
new file mode 100644
index 000000000000..ffac01d6fe81
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-4.2.ebuild
@@ -0,0 +1,541 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=56.58.58
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_MIN_CLONE_TYPE="single"
+	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="https://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	gmp? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	libaribb24? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
+		+gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
+		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
+		X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 dav1d:libdav1d fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
+		libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
+		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
+		# libavfilter options
+		appkit
+		bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
+		fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype vidstab:libvidstab
+		rubberband:librubberband zeromq:libzmq zimg:libzimg
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	amrenc:libvo-amrwbenc mp3:libmp3lame
+	kvazaar:libkvazaar libaom
+	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+)
+
+IUSE="
+	alsa chromium doc +encode oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${MIPS_CPU_FEATURES[@]}
+	${PPC_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+	${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
+	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
+	dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] )
+	encode? (
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+	libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] )
+	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
+	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
+	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	mmal? ( media-libs/raspberrypi-userland )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	srt? ( >=net-libs/srt-1.3.0[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zeromq? ( >=net-libs/zeromq-4.1.6 )
+	zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	postproc? ( !media-libs/libpostproc )
+"
+
+# Crypto & co provider magic
+# - libressl is a useflag meaning it should always favor libressl over openssl
+# - libressl and openssl provide more features to ffmpeg than gnutls
+#
+# The ordering is thus: libressl > openssl > gnutls
+RDEPEND="${RDEPEND}
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	!libressl? (
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		!openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
+	)
+"
+
+DEPEND="${RDEPEND}
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
+	>=sys-devel/make-3.81
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
+	doc? ( sys-apps/texinfo )
+	test? ( net-misc/wget sys-devel/bc )
+"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	rubberband? ( gpl )
+	samba? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+		X? ( !xcb? ( gpl ) )
+	)
+"
+REQUIRED_USE="
+	cuda? ( video_cards_nvidia )
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/chromium-r1.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+build_separate_libffmpeg() {
+	use opencl
+}
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use gmp && myconf+=( --enable-version3 )
+	use libaribb24 && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# Incompatible features: openssl or libressl and gnutls
+	if use libressl ; then
+		myconf+=( --disable-gnutls --disable-openssl )
+	elif use openssl ; then
+		myconf+=( --disable-gnutls )
+	fi
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r libzmq ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		# This is only for hardcoded cflags; those are used in configure checks that may
+		# interfere with proper detections, bug #671746 and bug #645778
+		# We use optflags, so that overrides them anyway.
+		--disable-optimizations
+		--disable-libcelt # bug #664158
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	# doc
+	myconf+=(
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable doc htmlpages)
+		$(multilib_native_enable manpages)
+	)
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+
+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
+		einfo "Configuring for Chromium"
+		mkdir -p ../chromium || die
+		pushd ../chromium >/dev/null || die
+		set -- "${@}" \
+			--disable-shared \
+			--enable-static \
+			--enable-pic \
+			--disable-opencl
+		echo "${@}"
+		"${@}" || die
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			if build_separate_libffmpeg; then
+				einfo "Compiling for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 libffmpeg
+			fi
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-doc
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}$(get_exeext)
+			fi
+		done
+
+		if use chromium; then
+			if build_separate_libffmpeg; then
+				einfo "Installing for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+			fi
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 7c83f6a4c05e..5df73abbc922 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # Subslot: libavutil major.libavcodec major.libavformat major
 # Since FFmpeg ships several libraries, subslot is kind of limited here.
@@ -46,6 +46,10 @@ LICENSE="
 		gpl? ( GPL-3 )
 		!gpl? ( LGPL-3 )
 	)
+	libaribb24? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
 	encode? (
 		amrenc? (
 			gpl? ( GPL-3 )
@@ -64,7 +68,7 @@ fi
 # foo is added to IUSE.
 FFMPEG_FLAG_MAP=(
 		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
+		+gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
 		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
 		X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib
 		# libavdevice options
@@ -75,12 +79,12 @@ FFMPEG_FLAG_MAP=(
 		# decoders
 		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 dav1d:libdav1d fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
+		libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
 		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
 		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
 		# libavfilter options
 		appkit
-		bs2b:libbs2b chromaprint flite:libflite frei0r
+		bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
 		fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype vidstab:libvidstab
 		rubberband:librubberband zeromq:libzmq zimg:libzimg
 		# libswresample options
@@ -170,7 +174,7 @@ RDEPEND="
 	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
 	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
 	codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
-	dav1d? ( >=media-libs/dav1d-0.2.1:0=[${MULTILIB_USEDEP}] )
+	dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] )
 	encode? (
 		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
 		kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
@@ -210,6 +214,7 @@ RDEPEND="
 	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
 	libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] )
+	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
 	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
 	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
@@ -272,13 +277,16 @@ RDEPEND="${RDEPEND}
 "
 
 DEPEND="${RDEPEND}
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+BDEPEND="
 	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
 	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+	cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
+	doc? ( sys-apps/texinfo )
 	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
 "
 
 # Code requiring FFmpeg to be built under gpl license
@@ -286,6 +294,7 @@ GPL_REQUIRED_USE="
 	postproc? ( gpl )
 	frei0r? ( gpl )
 	cdio? ( gpl )
+	rubberband? ( gpl )
 	samba? ( gpl )
 	encode? (
 		x264? ( gpl )
@@ -295,6 +304,7 @@ GPL_REQUIRED_USE="
 	)
 "
 REQUIRED_USE="
+	cuda? ( video_cards_nvidia )
 	libv4l? ( v4l )
 	fftools_cws2fws? ( zlib )
 	test? ( encode )
@@ -359,6 +369,7 @@ multilib_src_configure() {
 	# Decoders
 	use amr && myconf+=( --enable-version3 )
 	use gmp && myconf+=( --enable-version3 )
+	use libaribb24 && myconf+=( --enable-version3 )
 	use fdk && use gpl && myconf+=( --enable-nonfree )
 
 	for i in "${ffuse[@]#+}" ; do
diff --git a/media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch b/media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch
deleted file mode 100644
index 0ee648641be4..000000000000
--- a/media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-commit 078322f33ced4b2db6ac3e5002f98233d6fbf643
-Author: Reino17 <rwijnsma@xs4all.nl>
-Date:   Fri Jun 23 23:49:31 2017 +0200
-
-    Add support for LibOpenJPEG v2.2/git
-    
-    Signed-off-by: Michael Bradshaw <mjbshaw@google.com>
-
-Index: ffmpeg-3.2.7/configure
-===================================================================
---- ffmpeg-3.2.7.orig/configure
-+++ ffmpeg-3.2.7/configure
-@@ -1831,6 +1831,7 @@ HEADERS_LIST="
-     machine_ioctl_meteor_h
-     malloc_h
-     opencv2_core_core_c_h
-+    openjpeg_2_2_openjpeg_h
-     openjpeg_2_1_openjpeg_h
-     openjpeg_2_0_openjpeg_h
-     openjpeg_1_5_openjpeg_h
-@@ -5721,7 +5722,9 @@ enabled libopencv         && { check_hea
-                                  require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
-                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
--enabled libopenjpeg       && { { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+enabled libopenjpeg       && { { check_lib2 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+                               check_lib2 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
-+                               { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
-                                { check_lib2 openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                { check_lib2 openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-Index: ffmpeg-3.2.7/libavcodec/libopenjpegdec.c
-===================================================================
---- ffmpeg-3.2.7.orig/libavcodec/libopenjpegdec.c
-+++ ffmpeg-3.2.7/libavcodec/libopenjpegdec.c
-@@ -34,7 +34,9 @@
- #include "internal.h"
- #include "thread.h"
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#  include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  include <openjpeg-2.0/openjpeg.h>
-@@ -44,7 +46,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCo
-     opj_stream_set_read_function(stream, stream_read);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader);
-Index: ffmpeg-3.2.7/libavcodec/libopenjpegenc.c
-===================================================================
---- ffmpeg-3.2.7.orig/libavcodec/libopenjpegenc.c
-+++ ffmpeg-3.2.7/libavcodec/libopenjpegenc.c
-@@ -32,7 +32,9 @@
- #include "avcodec.h"
- #include "internal.h"
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#  include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  include <openjpeg-2.0/openjpeg.h>
-@@ -42,7 +44,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -306,7 +308,7 @@ static av_cold int libopenjpeg_encode_in
- 
-     opj_set_default_encoder_parameters(&ctx->enc_params);
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     switch (ctx->cinema_mode) {
-     case OPJ_CINEMA2K_24:
-         ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
-@@ -771,7 +773,7 @@ static int libopenjpeg_encode_frame(AVCo
-     opj_stream_set_write_function(stream, stream_write);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer);
diff --git a/media-video/ffmpeg/files/openjpeg22.patch b/media-video/ffmpeg/files/openjpeg22.patch
deleted file mode 100644
index a458c15208a9..000000000000
--- a/media-video/ffmpeg/files/openjpeg22.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-commit 078322f33ced4b2db6ac3e5002f98233d6fbf643
-Author: Reino17 <rwijnsma@xs4all.nl>
-Date:   Fri Jun 23 23:49:31 2017 +0200
-
-    Add support for LibOpenJPEG v2.2/git
-    
-    Signed-off-by: Michael Bradshaw <mjbshaw@google.com>
-
-Index: ffmpeg-3.3.3/configure
-===================================================================
---- ffmpeg-3.3.3.orig/configure
-+++ ffmpeg-3.3.3/configure
-@@ -1875,6 +1875,7 @@ HEADERS_LIST="
-     machine_ioctl_meteor_h
-     malloc_h
-     opencv2_core_core_c_h
-+    openjpeg_2_2_openjpeg_h
-     openjpeg_2_1_openjpeg_h
-     openjpeg_2_0_openjpeg_h
-     openjpeg_1_5_openjpeg_h
-@@ -5805,7 +5806,9 @@ enabled libopencv         && { check_hea
-                                  require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
-                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
--enabled libopenjpeg       && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+enabled libopenjpeg       && { { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+                               check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
-+                               { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
-                                { check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-Index: ffmpeg-3.3.3/libavcodec/libopenjpegdec.c
-===================================================================
---- ffmpeg-3.3.3.orig/libavcodec/libopenjpegdec.c
-+++ ffmpeg-3.3.3/libavcodec/libopenjpegdec.c
-@@ -34,7 +34,9 @@
- #include "internal.h"
- #include "thread.h"
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#  include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  include <openjpeg-2.0/openjpeg.h>
-@@ -44,7 +46,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCo
-     opj_stream_set_read_function(stream, stream_read);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader);
-Index: ffmpeg-3.3.3/libavcodec/libopenjpegenc.c
-===================================================================
---- ffmpeg-3.3.3.orig/libavcodec/libopenjpegenc.c
-+++ ffmpeg-3.3.3/libavcodec/libopenjpegenc.c
-@@ -32,7 +32,9 @@
- #include "avcodec.h"
- #include "internal.h"
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#  include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  include <openjpeg-2.0/openjpeg.h>
-@@ -42,7 +44,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -305,7 +307,7 @@ static av_cold int libopenjpeg_encode_in
- 
-     opj_set_default_encoder_parameters(&ctx->enc_params);
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     switch (ctx->cinema_mode) {
-     case OPJ_CINEMA2K_24:
-         ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
-@@ -769,7 +771,7 @@ static int libopenjpeg_encode_frame(AVCo
-     opj_stream_set_write_function(stream, stream_write);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer);
diff --git a/media-video/ffmpeg/files/openjpeg23.patch b/media-video/ffmpeg/files/openjpeg23.patch
deleted file mode 100644
index 4398769a22ca..000000000000
--- a/media-video/ffmpeg/files/openjpeg23.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From: Michael Bradshaw <mjbshaw at google.com>
-
-Signed-off-by: Michael Bradshaw <mjbshaw at google.com>
----
- configure                   |  5 ++++-
- libavcodec/libopenjpegdec.c |  8 +++++---
- libavcodec/libopenjpegenc.c | 10 ++++++----
- 3 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/configure b/configure
-index 391c141e7a..77c9a18c3c 100755
---- a/configure
-+++ b/configure
-@@ -1930,6 +1930,7 @@ HEADERS_LIST="
-     machine_ioctl_meteor_h
-     malloc_h
-     opencv2_core_core_c_h
-+    openjpeg_2_3_openjpeg_h
-     openjpeg_2_2_openjpeg_h
-     openjpeg_2_1_openjpeg_h
-     openjpeg_2_0_openjpeg_h
-@@ -5950,7 +5951,9 @@ enabled libopencv         && { check_header opencv2/core/core_c.h &&
-                                  require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
-                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
--enabled libopenjpeg       && { { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+enabled libopenjpeg       && { { check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+                               check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
-+                               { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
-                                { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
-diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
-index 1210123265..67d47bd6a0 100644
---- a/libavcodec/libopenjpegdec.c
-+++ b/libavcodec/libopenjpegdec.c
-@@ -34,7 +34,9 @@
- #include "internal.h"
- #include "thread.h"
- 
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
-+#  include <openjpeg-2.3/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
- #  include <openjpeg-2.2/openjpeg.h>
- #elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
-@@ -46,7 +48,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -431,7 +433,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
-     opj_stream_set_read_function(stream, stream_read);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader);
-diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
-index b67e533d1d..92b4433b04 100644
---- a/libavcodec/libopenjpegenc.c
-+++ b/libavcodec/libopenjpegenc.c
-@@ -32,7 +32,9 @@
- #include "avcodec.h"
- #include "internal.h"
- 
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
-+#  include <openjpeg-2.3/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
- #  include <openjpeg-2.2/openjpeg.h>
- #elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
-@@ -44,7 +46,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -307,7 +309,7 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx)
- 
-     opj_set_default_encoder_parameters(&ctx->enc_params);
- 
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     switch (ctx->cinema_mode) {
-     case OPJ_CINEMA2K_24:
-         ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
-@@ -771,7 +773,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
-     opj_stream_set_write_function(stream, stream_write);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer);
--- 
-2.13.5 (Apple Git-94)
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index b2f6fd8bc470..183c78718dcd 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -8,10 +8,6 @@
 	<flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
 	<flag name="amrenc">Enables Adaptive Multi-Rate Audio encoding support with <pkg>media-libs/vo-amrwbenc</pkg>.</flag>
 	<flag name="appkit">Enables Apple AppKit framework</flag>
-	<flag name="armv5te">Enables optimizations for armv5te processors.</flag>
-	<flag name="armv6">Enables optimizations for armv6 processors.</flag>
-	<flag name="armv6t2">Enables optimizations for armv6t2 processors.</flag>
-	<flag name="armvfp">Enables VFP optimizations for ARM processors.</flag>
 	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
 	<flag name="bs2b">Enables <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural filter.</flag>
 	<flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
@@ -19,8 +15,8 @@
 	<flag name="chromium">Builds libffmpeg.so to enable media playback in Chromium-based browsers like Opera and Vivaldi.</flag>
 	<flag name="codec2">Enables codec2 low bit rate speech codec support via <pkg>media-libs/codec2</pkg>.</flag>
 	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
-	<flag name="dav1d">Enables AV1 decoding via<pkg>media-libs/dav1d</pkg>.</flag>
-	<flag name="ebur128">Enables EBU R128 loudness normalization filter via <pkg>media-libs/libebur128</pkg></flag>
+	<flag name="cuda">Enables CUDA-based acceleration. Mostly used for specific filters.</flag>
+	<flag name="dav1d">Enables AV1 decoding via <pkg>media-libs/dav1d</pkg>.</flag>
 	<flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
 	<flag name="flite">Adds a text-to-speech filter based on <pkg>app-accessibility/flite</pkg>.</flag>
 	<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
@@ -32,6 +28,7 @@
 	<flag name="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</flag>
 	<flag name="kvazaar">Enables <pkg>media-libs/kvazaar</pkg> based HEVC encoder.</flag>
 	<flag name="libaom">Enables <pkg>media-libs/libaom</pkg> based AV1 codec support.</flag>
+	<flag name="libaribb24">Enables ARIB text and caption decoding via <pkg>media-libs/aribb24</pkg>.</flag>
 	<flag name="libdrm">Enables <pkg>x11-libs/libdrm</pkg> support for better screen grabbing and hardware accelerated codecs.</flag>
 	<flag name="libilbc">Enables iLBC de/encoding via <pkg>media-libs/libilbc</pkg>.</flag>
 	<flag name="librtmp">Enables Real Time Messaging Protocol using librtmp (<pkg>media-video/rtmpdump</pkg>) in addition to FFmpeg's native implementation.</flag>
@@ -52,7 +49,6 @@
 	<flag name="postproc">Build and install libpostproc.</flag>
 	<flag name="rubberband">Adds time-stretching and pitch-shifting audio filter based on <pkg>media-libs/rubberband</pkg>.</flag>
 	<flag name="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required for e.g. Vidvox Hap encoder.</flag>
-	<flag name="sofalizer">Enables Sofalizer filter</flag>
 	<flag name="srt">Enable support for Secure Reliable Transport (SRT) via <pkg>net-libs/srt</pkg></flag>
 	<flag name="ssh">Enable SSH/sftp support via <pkg>net-libs/libssh</pkg>.</flag>
 	<flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index a5da082b2925..14853a43a91a 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,5 +1,5 @@
 AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d384a347379dd9ea80b650ea9755c641be0253c9d5b269f9aa4d2774ace89ea598b5206391794263530a84a SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95
-DIST makemkv-bin-1.14.4.tar.gz 9135402 BLAKE2B 0564ec01067c39fa2c538f4923f010fc4bda555c84e1c054ff04fe8be958fe596adedc272d755958ae192883b28cd914af5e177d87f9274879ce9f49f135fa20 SHA512 ef48c09f56b3c46edd25a690b27dd0216b701ff84133e99742c263157f5ea032fd76286b9d8e3979cdd0da8ddceacab4fe0981e056df65228394ac91228c3c09
-DIST makemkv-oss-1.14.4.tar.gz 4385464 BLAKE2B 1645014ce87fff2f6eedea8059fc3d2db5f9f371272453b6d86162163c7b4fe46362af14310b6f3ce628c22e6b552cf99c780368c4384afa772fe17b44f18dd0 SHA512 05fab5d97fe0f0678c2000dd7580532ccafa6c0232bc61a5f17e79f1c02577b6317a78bb12af481d5fdc8eff2e0633aa58a430c256d6d72f04247774e2044b20
-EBUILD makemkv-1.14.4.ebuild 2931 BLAKE2B d32a0e0c147ce15c20e5beb5a14dc8447a5396cb1f51c0624f73284112c4f58a4e9a54711dfc8873e02753c84eecea75ffefddd437f4356480ddd90dcf8daa1a SHA512 e094e299de88f22e1254ba636a48a5c89c8a3434ec8e960bc23c339e43c572529f6bfa5136b1fd2be4ac1307c0ea97038890096f3f0ad4c3ab09771a499fe9d0
+DIST makemkv-bin-1.14.5.tar.gz 9465109 BLAKE2B 8eccfd5bee60cf1994b96e8f513a1b439193b0e76bda32399afabae922d1ea208e0b41e78c1af37c3fee3c0fde7f46f33dbd6caef3165399e4797c5bed689950 SHA512 9086444f30de71a83d93cf9814f4485b5ebe78940acd722a549029af89408fd39a2a25a145ce2444fb97de90bc3c3acdf2df323865e74bada6e5052d23d94d30
+DIST makemkv-oss-1.14.5.tar.gz 4384596 BLAKE2B 86e684c10c74272be7f4a7f93f41ab9fc1604fcc631bcb42ae78160a74cbd43067a5f1c049beee3c011ebe36b08bf6595d9a74606919ff9d5265d3c69c0225d0 SHA512 22097b70c3cee56bd58fc93e65a2acd0556f1a89717ca8ceda7b3b795692086d88d0a01f875fa9cea9b5fe08f19351e6a03997233ff4eb55fe462bc7ff3bcdc7
+EBUILD makemkv-1.14.5.ebuild 2922 BLAKE2B 5d133b12fe815f3b84ce125ef5c7cc680c3236ac64d7a872d2c2230bf5d712ac6c49c911ebe848fd8b7a71cb4a63bfb04e0816bf76a1cf70a2d8a01e0e031bd3 SHA512 50751938c6bdce72239e22c827fcad151697118b7371feca3b16129779ea4225d08f887dd08d400b32dc84dff8caa91646e61a0e90cfc5c487e034784e14913a
 MISC metadata.xml 1225 BLAKE2B c65dc32de4283f661bb1725d24d7346ad93a5cc77fc794cb41ef95174eaabd3fe17fac4ae7c4a4791170563e7ae0596c37ec734880723f9a9e81b5d991646b4d SHA512 b5730528c0efef8dc5d98248d0eaa85625b292e610cb7aa294d87f968fabdd45a6d240e66d7d2a4f0cdfc7642ad11dbaf36417b36b8895b8e50b307202ac1bb9
diff --git a/media-video/makemkv/makemkv-1.14.4.ebuild b/media-video/makemkv/makemkv-1.14.4.ebuild
deleted file mode 100644
index 3668bf07c790..000000000000
--- a/media-video/makemkv/makemkv-1.14.4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic gnome2-utils linux-info
-
-MY_P=makemkv-oss-${PV}
-MY_PB=makemkv-bin-${PV}
-
-DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
-HOMEPAGE="http://www.makemkv.com/"
-SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
-	http://www.makemkv.com/download/${MY_PB}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui libav libressl"
-
-QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
-
-DEPEND="
-	sys-libs/glibc
-	dev-libs/expat
-	sys-libs/zlib
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	!libav? ( >=media-video/ffmpeg-1.0.0:0= )
-	libav? ( >=media-video/libav-0.8.9:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist(-)] )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}
-	media-video/ccextractor
-	net-misc/wget"
-
-CONFIG_CHECK="~CHR_DEV_SG"
-S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-path.patch )
-
-src_configure() {
-	# See bug #439380.
-	replace-flags -O* -Os
-
-	econf \
-		--enable-debug \
-		--disable-noec \
-		--disable-qt4 \
-		$(use_enable gui) \
-		$(use_enable gui qt5)
-}
-
-src_install() {
-	default
-
-	# add missing symlinks for QA
-	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
-	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
-	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
-	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
-	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so
-	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so.0.${PV}
-
-	cd "${WORKDIR}"/${MY_PB} || die
-
-	# install prebuilt bin
-	dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon
-
-	# install profiles and locales
-	insinto /usr/share/MakeMKV
-	doins src/share/*
-
-	# add symlink rather than relying on MMCCEXTRACTOR env var
-	dosym ccextractor /usr/bin/mmccextr
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "While MakeMKV is in beta mode, upstream has provided a license"
-	elog "to use if you do not want to purchase one."
-	elog ""
-	elog "See this forum thread for more information, including the key:"
-	elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053"
-	elog ""
-	elog "Note that beta license may have an expiration date and you will"
-	elog "need to check for newer licenses/releases. "
-	elog ""
-	elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
-	elog "is no longer necessary and you should delete it from there to"
-	elog "avoid warning messages."
-	elog ""
-	elog "MakeMKV can also act as a drop-in replacement for libaacs and"
-	elog "libbdplus, allowing transparent decryption of a wider range of"
-	elog "titles under players like VLC and mplayer. To enable this, set"
-	elog "the following variables when launching the player:"
-	elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-video/makemkv/makemkv-1.14.5.ebuild b/media-video/makemkv/makemkv-1.14.5.ebuild
new file mode 100644
index 000000000000..84c2ac2f4b41
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.14.5.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info xdg-utils
+
+MY_P=makemkv-oss-${PV}
+MY_PB=makemkv-bin-${PV}
+
+DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
+HOMEPAGE="http://www.makemkv.com/"
+SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
+	http://www.makemkv.com/download/${MY_PB}.tar.gz"
+
+LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+gui libav libressl"
+
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
+
+DEPEND="
+	sys-libs/glibc
+	dev-libs/expat
+	sys-libs/zlib
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	!libav? ( >=media-video/ffmpeg-1.0.0:0= )
+	libav? ( >=media-video/libav-0.8.9:0= )
+	!libressl? ( dev-libs/openssl:0=[-bindist(-)] )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}
+	media-video/ccextractor
+	net-misc/wget"
+
+CONFIG_CHECK="~CHR_DEV_SG"
+S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${PN}-path.patch )
+
+src_configure() {
+	# See bug #439380.
+	replace-flags -O* -Os
+
+	econf \
+		--enable-debug \
+		--disable-noec \
+		--disable-qt4 \
+		$(use_enable gui) \
+		$(use_enable gui qt5)
+}
+
+src_install() {
+	default
+
+	# add missing symlinks for QA
+	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
+	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
+	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
+	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so
+	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so.0.${PV}
+
+	cd "${WORKDIR}"/${MY_PB} || die
+
+	# install prebuilt bin
+	dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon
+
+	# install profiles and locales
+	insinto /usr/share/MakeMKV
+	doins src/share/*
+
+	# add symlink rather than relying on MMCCEXTRACTOR env var
+	dosym ccextractor /usr/bin/mmccextr
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	elog "While MakeMKV is in beta mode, upstream has provided a license"
+	elog "to use if you do not want to purchase one."
+	elog ""
+	elog "See this forum thread for more information, including the key:"
+	elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053"
+	elog ""
+	elog "Note that beta license may have an expiration date and you will"
+	elog "need to check for newer licenses/releases. "
+	elog ""
+	elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
+	elog "is no longer necessary and you should delete it from there to"
+	elog "avoid warning messages."
+	elog ""
+	elog "MakeMKV can also act as a drop-in replacement for libaacs and"
+	elog "libbdplus, allowing transparent decryption of a wider range of"
+	elog "titles under players like VLC and mplayer. To enable this, set"
+	elog "the following variables when launching the player:"
+	elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 8734a6f5359b..dabfa3efb3dc 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,5 +1,3 @@
-DIST mediainfo_19.04.tar.xz 1732860 BLAKE2B d4bded273b8dce2be2c578d263f2d442ad5b4a37f5d8b292d34dd80ed7fe83fbacce69a4ce740f9527f2fdb9a304b6dd91c96bfe747c023ce0dddac2244eb7f4 SHA512 cb6cb3c4bc3a037267684bd850babe3ca5998954f93e86d5b25aad7c4641918546a012cf7c6df4ef8d6017c85ab159dc5ae0b18f166385f8c5cc940a6fb0b3ce
 DIST mediainfo_19.07.tar.xz 1903620 BLAKE2B 68487713e0c540022d2a5ee8416cb8e1c87ed2a4479f8d7c247d75137a62d3ae2994d02cd8853080837a23d582ce4acab497646bf2307a0b2b4d398635738baa SHA512 ef543b2b3fa61347adaa510fc3b051ff148e24ef6461e25b9f1d158f3c4b57ce96826d0c0e8ae46996092e0eb84e99308ba87d95dd0392b99f05b704438c5983
-EBUILD mediainfo-19.04.ebuild 1600 BLAKE2B 73ddba373cd77ac61a13705931958022ea238e16482a6d8d859b43b26e70ccd9c587b7b08c9db574e013b6e577524d76220c1301983458d65e9ef8a2712a647e SHA512 3ccaf944aadde48141b9971e8e6ee547ba1fe5d32f8303a672178a86edb2b5dc8a360c457cc10ff178d0d92a67e9c15dbc4162973bcb21ff68aa39b3760a0e22
-EBUILD mediainfo-19.07.ebuild 1602 BLAKE2B ba4076c82d812b436c9c707c36043e1f2a5c493fa23c78ab2b545dc1e207f1d42e49cc3795fd5675820ef4e614f37c94128e9e4c5e3a82ccb79e416338950ae7 SHA512 30306ad04a63f72802532bcc3bfbf9bac6cba5306af8d6f693052a17b24f033ab089a7dc1f928cb6fe5c569c5f73d71206fb8d6d0d1f9b4d135cabf8bc109637
+EBUILD mediainfo-19.07.ebuild 1600 BLAKE2B 73ddba373cd77ac61a13705931958022ea238e16482a6d8d859b43b26e70ccd9c587b7b08c9db574e013b6e577524d76220c1301983458d65e9ef8a2712a647e SHA512 3ccaf944aadde48141b9971e8e6ee547ba1fe5d32f8303a672178a86edb2b5dc8a360c457cc10ff178d0d92a67e9c15dbc4162973bcb21ff68aa39b3760a0e22
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-19.04.ebuild b/media-video/mediainfo/mediainfo-19.04.ebuild
deleted file mode 100644
index 37cd73d53baf..000000000000
--- a/media-video/mediainfo/mediainfo-19.04.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit gnome2-utils xdg-utils autotools wxwidgets
-
-DESCRIPTION="MediaInfo supplies technical and tag information about media files"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/libzen-0.4.37
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-pkg_setup() {
-	TARGETS="CLI"
-	if use wxwidgets; then
-		TARGETS+=" GUI"
-		setup-wxwidgets
-	fi
-}
-
-src_prepare() {
-	default
-
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		sed -i -e "s:-O2::" configure.ac || die
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		local args=""
-		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
-		econf ${args}
-	done
-}
-
-src_compile() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		default
-	done
-}
-src_install() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		default
-		dodoc "${S}"/History_${target}.txt
-	done
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/mediainfo/mediainfo-19.07.ebuild b/media-video/mediainfo/mediainfo-19.07.ebuild
index 255a3010c595..37cd73d53baf 100644
--- a/media-video/mediainfo/mediainfo-19.07.ebuild
+++ b/media-video/mediainfo/mediainfo-19.07.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl mms wxwidgets"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index fb18d18c8393..bba21626a306 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,8 +3,8 @@ AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386
 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
-DIST vlc-3.0.7.1.tar.xz 26052372 BLAKE2B 349e967ff00db2fd5ea1a62deb12009ff0d85c56a82774aa4fedf7bffecd21b0c8c745f41eb4b9b4d36aaddcce95e79146901f318d18eab99f08e347841a8008 SHA512 6b99ae0564630a7a7ca9187c3bb954c601e384522ce93460b73f2dbf31787ce5828daca9f31c781b97db77872d76b6a3e871ff3401d70f1b5829fee7c4e847fd
-EBUILD vlc-3.0.7.1.ebuild 13046 BLAKE2B 6de613f51251180988b9c307d0a819e62962e951ca27241f75ae633938857023c0971c3742c018f9c300c3953bee22d1a73310445256ce1aa98a98214ff54fe6 SHA512 a3c171357af06df86a077f467b497fdfe3ab4d6da41fd4336ea314b8afb82fd9b6e0adf3f999ae6f213cc979b11acbbe7947e967caf5af434c49493728ec2fde
-EBUILD vlc-3.0.9999.ebuild 13051 BLAKE2B 2e824fb9cdff5b9622e4321a40173a87487aee437539d87a3811a676e3523dfc5e9f494ec9e7e2de6f8062e50d5298eb77ebe520b7c6bb19b18ce25be979a038 SHA512 cb0b69d3902b78ab6b767d4ad23a240d048f1839b89a41760dbde5df01cf9837f2e2e823e9e599e10b068728000d5b700b89e1689dacd15c8070f77bb03f7196
-EBUILD vlc-9999.ebuild 12990 BLAKE2B a55dc13a60632cbdb925007c8dd52ebc964125e8d4412557ff281cc206143c35ef9d41ba813b68d1976e5dd1224bc0c030b0bf0819ec7921b2d196da4e0b8820 SHA512 86e8e1e2d58d59d6c3ae5999fa27b025e4b1304c000a10c9935f013bb9c77379a2397b0a13d5447c7f04167a1de9938ded9ea60baf9e071d411ff8a117ffddb4
+DIST vlc-3.0.8.tar.xz 26041520 BLAKE2B 4a507206e5a183fe036a95c84d7e94592973a0bd913aa764881bf73928b3c770a776fde1fce7878c4385cf11876813c7d7d48dfe219e71b0e13a9f6be9aa701a SHA512 5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70
+EBUILD vlc-3.0.8.ebuild 13064 BLAKE2B 75dd207495eb869ce5a4bb5c19a896250ec08363ee24e3e16c555a5c70e75d929c105a202f1a6f946c99ac2b80379eeaa024a86963f231ea8d96e2c6b0571118 SHA512 72aee17a30b21880c8118c463012b7aa02e40f014afabe0019eb45bb5d5dcd1b05a3b7cce46180908b669ee6e011b0554ef1b36e1b9327850abd2498d19eee2f
+EBUILD vlc-3.0.9999.ebuild 13069 BLAKE2B ad1b1b4830bccdee31dec6640b8fb3dfee35082f15cecf66117e4341dfbc4b137bf8fb6738683a72f09a3b78b8d0d3e3998db08a0a0a5f0cecdf60a6037b018a SHA512 b97ba0c1fac40a3e9d6601c853b440b174d81d1cf7a4e5f48ff4d32f164673ab34234d37343241b1386e1e272d51c188d9e64ac27eee804739e89df0fb6eca1d
+EBUILD vlc-9999.ebuild 13008 BLAKE2B 780b62d33b6f61a2a6f652cf8d08cc8559d597cb09a91bccdc3f87472675c9935ca013b8dad4660c8e6b92b7b1d1a2c9b4eecb6686089897020237d6cbac6ed5 SHA512 d4f741600a0a9f133f811087f54e748b78e7817c02d8761822ae59d9fce15683f098185ac3716278ed475d14e33a621473f59b25e8e1f6112b21a7edca6386d4
 MISC metadata.xml 4914 BLAKE2B 9cc2e2e3d4da8bb4c5ec63bc5c0e4b7b9e6e5c567ba0b1c515d806e0ec0fe4a90b15406a6c978a2e37b91805ef922182cc09057364203b641c64365d95b2a9b8 SHA512 37ef990f0444d819d8b68da62a5929964e3d247339347c84ddc929b608b358efa94503caeb379ce1c39dfda4fac3c679db33a7d590d8dd09d7e2552f482cd889
diff --git a/media-video/vlc/vlc-3.0.7.1.ebuild b/media-video/vlc/vlc-3.0.7.1.ebuild
deleted file mode 100644
index 52a230d3d179..000000000000
--- a/media-video/vlc/vlc-3.0.7.1.ebuild
+++ /dev/null
@@ -1,494 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	inherit git-r3
-else
-	if [[ ${MY_P} = ${P} ]] ; then
-		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	else
-		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	fi
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86 ~x86-fbsd"
-fi
-inherit autotools flag-o-matic toolchain-funcs virtualx xdg
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-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 mad matroska modplug mp3 mpeg mtp musepack ncurses
-	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio
-	+qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl
-	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
-	wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
-"
-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 )
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-"
-RDEPEND="
-	net-dns/libidn:=
-	sys-libs/zlib[minizip]
-	virtual/libintl
-	virtual/opengl
-	a52? ( media-libs/a52dec )
-	alsa? ( media-libs/alsa-lib )
-	aom? ( media-libs/libaom:= )
-	archive? ( app-arch/libarchive:= )
-	aribsub? ( media-libs/aribb24 )
-	bidi? (
-		dev-libs/fribidi
-		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
-		virtual/ttf-fonts
-	)
-	bluray? ( media-libs/libbluray:= )
-	cddb? ( media-libs/libcddb )
-	chromaprint? ( media-libs/chromaprint:= )
-	chromecast? (
-		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.0.9:=
-	)
-	dav1d? ( media-libs/dav1d )
-	dbus? ( sys-apps/dbus )
-	dc1394? (
-		media-libs/libdc1394:2
-		sys-libs/libraw1394
-	)
-	dts? ( media-libs/libdca )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
-	dvd? (
-		>=media-libs/libdvdnav-4.9
-		>=media-libs/libdvdread-4.9
-	)
-	faad? ( media-libs/faad2 )
-	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
-		libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
-	)
-	flac? (
-		media-libs/flac
-		media-libs/libogg
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	gme? ( media-libs/game-music-emu )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? (
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate )
-	libass? (
-		media-libs/fontconfig:1.0
-		media-libs/libass:=
-	)
-	libcaca? ( media-libs/libcaca )
-	libnotify? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libnotify
-	)
-	libsamplerate? ( media-libs/libsamplerate )
-	libtar? ( dev-libs/libtar )
-	libtiger? ( media-libs/libtiger )
-	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc )
-	live? ( media-plugins/live:= )
-	lua? ( >=dev-lang/lua-5.1:0= )
-	mad? ( media-libs/libmad )
-	matroska? (
-		dev-libs/libebml:=
-		media-libs/libmatroska:=
-	)
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-sound/mpg123 )
-	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:= )
-	musepack? ( media-sound/musepack-tools )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg )
-	opencv? ( media-libs/opencv:= )
-	opus? ( >=media-libs/opus-1.0.3 )
-	png? ( media-libs/libpng:0= )
-	postproc? ( libav? ( media-libs/libpostproc ) )
-	projectm? (
-		media-fonts/dejavu
-		media-libs/libprojectm
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image )
-	sftp? ( net-libs/libssh2 )
-	shout? ( media-libs/libshout )
-	sid? ( media-libs/libsidplay:2 )
-	skins? (
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXpm
-	)
-	soxr? ( >=media-libs/soxr-0.1.2 )
-	speex? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-	)
-	srt? ( net-libs/srt )
-	ssl? ( net-libs/gnutls:= )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)
-	taglib? ( >=media-libs/taglib-1.9 )
-	theora? ( media-libs/libtheora )
-	tremor? ( media-libs/tremor )
-	truetype? (
-		media-libs/freetype:2
-		virtual/ttf-fonts
-		!fontconfig? ( media-fonts/dejavu )
-	)
-	twolame? ( media-sound/twolame )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/libupnp:= )
-	v4l? ( media-libs/libv4l:= )
-	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
-	vdpau? ( x11-libs/libvdpau )
-	vnc? ( net-libs/libvncserver )
-	vorbis? ( media-libs/libvorbis )
-	vpx? ( media-libs/libvpx:= )
-	wayland? (
-		>=dev-libs/wayland-1.15
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-	)
-	x264? ( >=media-libs/x264-0.0.20190214:= )
-	x265? ( media-libs/x265:= )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_src_prepare # bug 608256
-
-	has_version '>=net-libs/libupnp-1.8.0' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-aa
-		--disable-dependency-tracking
-		--disable-optimizations
-		--disable-rpath
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vcd
-		--enable-vlc
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable altivec)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable aribsub)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable chromecast microdns)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dav1d)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable gnome-keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(use_enable ieee1394 dv1394)
-		$(use_enable jack)
-		$(use_enable jpeg)
-		$(use_enable kate)
-		$(use_enable libass)
-		$(use_enable libcaca caca)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable libtar)
-		$(use_enable libtiger tiger)
-		$(use_enable linsys)
-		$(use_enable lirc)
-		$(use_enable live live555)
-		$(use_enable lua)
-		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable mad)
-		$(use_enable matroska)
-		$(use_enable modplug mod)
-		$(use_enable mp3 mpg123)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mtp)
-		$(use_enable musepack mpc)
-		$(use_enable ncurses)
-		$(use_enable neon)
-		$(use_enable ogg)
-		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable opencv)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable postproc)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
-		$(use_enable rdp freerdp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable srt)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vorbis)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x264 x26410b)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--with-kde-solid=/usr/share/solid/actions
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-macosx-qtkit
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-schroedinger
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-vsxu
-		--disable-wasapi
-		--disable-wma-fixed
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
-	append-cxxflags -std=c++11
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	if use truetype || use bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--with-default-font=${dejavu}/DejaVuSans.ttf
-			--with-default-font-family=Sans
-			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-			--with-default-monospace-font-family=Monospace
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	xdg_pkg_postrm
-}
diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild
new file mode 100644
index 000000000000..2adb5c449a1b
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.8.ebuild
@@ -0,0 +1,494 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	inherit git-r3
+else
+	if [[ ${MY_P} = ${P} ]] ; then
+		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	else
+		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	fi
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86 ~x86-fbsd"
+fi
+inherit autotools flag-o-matic toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+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 mad matroska modplug mp3 mpeg mtp musepack ncurses
+	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio
+	+qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl
+	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
+	wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+"
+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 )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
+RDEPEND="
+	net-dns/libidn:=
+	sys-libs/zlib[minizip]
+	virtual/libintl
+	virtual/opengl
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	aribsub? ( media-libs/aribb24 )
+	bidi? (
+		dev-libs/fribidi
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz
+		virtual/ttf-fonts
+	)
+	bluray? ( media-libs/libbluray:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
+	chromecast? (
+		>=dev-libs/protobuf-2.5.0:=
+		>=net-libs/libmicrodns-0.0.9:=
+	)
+	dav1d? ( media-libs/dav1d )
+	dbus? ( sys-apps/dbus )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394
+	)
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+	dvd? (
+		>=media-libs/libdvdnav-4.9
+		>=media-libs/libdvdread-4.9
+	)
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
+	ffmpeg? (
+		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
+		libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
+	)
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gme? ( media-libs/game-music-emu )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? (
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( media-libs/libkate )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:=
+	)
+	libcaca? ( media-libs/libcaca )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify
+	)
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live:= )
+	lua? ( >=dev-lang/lua-5.1:0= )
+	mad? ( media-libs/libmad )
+	matroska? (
+		>=dev-libs/libebml-1.3.6:=
+		media-libs/libmatroska:=
+	)
+	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( media-libs/libogg )
+	opencv? ( media-libs/opencv:= )
+	opus? ( >=media-libs/opus-1.0.3 )
+	png? ( media-libs/libpng:0= )
+	postproc? ( libav? ( media-libs/libpostproc ) )
+	projectm? (
+		media-fonts/dejavu
+		media-libs/libprojectm
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
+	)
+	soxr? ( >=media-libs/soxr-0.1.2 )
+	speex? (
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
+	)
+	srt? ( net-libs/srt )
+	ssl? ( net-libs/gnutls:= )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
+	)
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/libupnp:= )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx:= )
+	wayland? (
+		>=dev-libs/wayland-1.15
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	xdg_src_prepare # bug 608256
+
+	has_version '>=net-libs/libupnp-1.8.0' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-aa
+		--disable-dependency-tracking
+		--disable-optimizations
+		--disable-rpath
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vcd
+		--enable-vlc
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable altivec)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable aribsub)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dav1d)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable mad)
+		$(use_enable matroska)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mpg123)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable neon)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable opencv)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable postproc)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable srt)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vorbis)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
+		$(use_enable x264)
+		$(use_enable x264 x26410b)
+		$(use_enable x265)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--with-kde-solid=/usr/share/solid/actions
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-macosx-qtkit
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-schroedinger
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-vsxu
+		--disable-wasapi
+		--disable-wma-fixed
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	xdg_pkg_postrm
+}
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 329fb3dedb9b..8a0363090c55 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -139,10 +139,10 @@ RDEPEND="
 	lua? ( >=dev-lang/lua-5.1:0= )
 	mad? ( media-libs/libmad )
 	matroska? (
-		dev-libs/libebml:=
+		>=dev-libs/libebml-1.3.6:=
 		media-libs/libmatroska:=
 	)
-	modplug? ( media-libs/libmodplug )
+	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
 	mp3? ( media-sound/mpg123 )
 	mpeg? ( media-libs/libmpeg2 )
 	mtp? ( media-libs/libmtp:= )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index dea92a28a05c..aabafcaad22e 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -141,10 +141,10 @@ RDEPEND="
 	lua? ( >=dev-lang/lua-5.1:0= )
 	mad? ( media-libs/libmad )
 	matroska? (
-		dev-libs/libebml:=
+		>=dev-libs/libebml-1.3.6:=
 		media-libs/libmatroska:=
 	)
-	modplug? ( media-libs/libmodplug )
+	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
 	mp3? ( media-sound/mpg123 )
 	mpeg? ( media-libs/libmpeg2 )
 	mtp? ( media-libs/libmtp:= )
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 32323b4657fa..c4b83b85433d 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,5 +1,7 @@
 AUX gpac.patch 507 BLAKE2B 7872c56ed87e96a247b63b92c6a23c094346fea9ee5127a6086a45efd064b4c00ddf2cd2191772bcbd54365c56ef550f3f5e0ecf2c2ab35a2e0c9dc3197ec9b9 SHA512 9da7a1ffe637e39863e5828547923424b9c072d194d3ddadcc9a6c31f7803f5456b3ba88d470458a84d37b0c07374983adc124f3710ae7122a81a13ea9b4ae0e
 DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
+DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
 EBUILD x264-encoder-0.0.20190214.ebuild 2133 BLAKE2B 60e4e1dd5a5625fdb17d37c551d42ce983b7c6e3b7e2f76fb1c2be19bc3bfdd10883c7e75f5ab623e458bf9cfe7b637007e12f340025666bc610535c0be90676 SHA512 e45fb0e38ca9fb60b800c3def2bb01d30597ff3de369a98289d5ead339fc8ace562f559674f29723d7bd320de12d6f39170609b85e6ad290b26773f2864d13aa
+EBUILD x264-encoder-0.0.20190903.ebuild 2135 BLAKE2B 6e2999f14ba5ebd68ec86eb00f8039c21159aae811241c77ea09de8ca61c7e103d5567f29f973eba549b1650506ee0cd8110e321209e25f79ca7ac2607766d8c SHA512 4ed53d1b52d17ec1c3dc8aa1ed20bd350b00b300ebb707894e0ad4596bb5b551a0c8841eba02350d838e97a4f40adb68bfe1b2e3f42fd62d02f91174773855a5
 EBUILD x264-encoder-9999.ebuild 2135 BLAKE2B 6e2999f14ba5ebd68ec86eb00f8039c21159aae811241c77ea09de8ca61c7e103d5567f29f973eba549b1650506ee0cd8110e321209e25f79ca7ac2607766d8c SHA512 4ed53d1b52d17ec1c3dc8aa1ed20bd350b00b300ebb707894e0ad4596bb5b551a0c8841eba02350d838e97a4f40adb68bfe1b2e3f42fd62d02f91174773855a5
 MISC metadata.xml 530 BLAKE2B 19afea6649cc9611b31fce82055c949d8bbb8de99df320d390591d0e3abe27126b54af9c91bc7b96a8d2fac705427ba2c8cc19bdcddfadc304419a7966c40617 SHA512 01eabe2c536c89cc9ed8cd4295ce68941a626b6675c808294a4828704f9f3c89c87d70f5898f60f326c783a77d7e1dc8213e3bfbadbbca8b71f268959232a577
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
new file mode 100644
index 000000000000..207434fe1c32
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
@@ -0,0 +1,74 @@
+# 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="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
+	SRC_URI=""
+else
+	MY_P="x264-snapshot-$(ver_cut 3)-2245"
+	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="
+	~media-libs/x264-${PV}[interlaced=,threads=]
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	ffmpegsource? ( media-libs/ffmpegsource )
+	mp4? ( >=media-video/gpac-0.5.2:= )"
+
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="${RDEPEND}
+	amd64? ( ${ASM_DEP} )
+	x86? ( ${ASM_DEP} )
+	x86-fbsd? ( ${ASM_DEP} )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/gpac.patch" )
+
+src_configure() {
+	tc-export CC
+
+	# let upstream pick the optimization level by default
+	use custom-cflags || filter-flags -O?
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--system-libx264 \
+		--host="${CHOST}" \
+		--disable-lsmash \
+		$(usex avs "" "--disable-avs") \
+		$(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+		$(usex ffmpegsource "" "--disable-ffms") \
+		$(usex interlaced "" "--disable-interlaced") \
+		$(usex mp4 "" "--disable-gpac") \
+		$(usex threads "" "--disable-thread") || die
+
+	# this is a nasty workaround for bug #376925 for x264 that also applies
+	# here, needed because as upstream doesn't like us fiddling with their CFLAGS
+	if use custom-cflags; then
+		local cflags
+		cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+		cflags="${cflags//$(get-flag O)/}"
+		cflags="${cflags//-O? /$(get-flag O) }"
+		cflags="${cflags//-g /}"
+		sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+	fi
+}
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
new file mode 100644
index 000000000000..315406e431bd
--- /dev/null
+++ b/media-video/yle-dl/Manifest
@@ -0,0 +1,3 @@
+DIST yle-dl-20190614.tar.gz 83579 BLAKE2B 9117ab32d3e037f22cc209d3686e23d14802438f77203f08e102901d825c06e7c332d1f6ca33bce3af3d4042e9c543fec60e261153be8ab738b038cc1cf4069b SHA512 6a4bfdb93229f48580d8acf742e1e253aa3da79f84ecc3886c32757ddc46608795c58cd02cb0aaa2f7d42188456eac50a243b815baa3752ac6a1b12b9632109c
+EBUILD yle-dl-20190614.ebuild 1750 BLAKE2B 992a1ac48b8554679e3266e9ad3c5d2c5f1e6b293e382fc4a63ae17c1f657a391da6a1e867bc4b8227335d895cd5016d05e0a11862abde2096fcd871287fb7b0 SHA512 73aba786351d47c70450f0b1f54c93727eee82eda4a062c0b58fc3d45e071312413afd34fbe5db975fb204c3e8e309b68043b83ae850db868f9bad562fc9d296
+MISC metadata.xml 415 BLAKE2B 3961cdbc02847f65011c6987b811207c31c49ae40c3bea44b481f35ac04e75dabfa8ceae74f6adc816f211129efb8faaa0ba63700d95eec569b3f51cfe64bd42 SHA512 96f1afba4a47f7b5dca75ba1d5300baf9815bdcf3eda12f5b6044aea7cfc09683c76db210a0b4965626aac050016fc39f44c4e5c63597894e0ae6457dc2aeb90
diff --git a/media-video/yle-dl/metadata.xml b/media-video/yle-dl/metadata.xml
new file mode 100644
index 000000000000..025d4dde75df
--- /dev/null
+++ b/media-video/yle-dl/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>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+  <use>
+    <flag name='php'>Use a PHP script as download backend</flag>
+    <flag name='youtube-dl'>Use youtube-dl script as a download backend</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-video/yle-dl/yle-dl-20190614.ebuild b/media-video/yle-dl/yle-dl-20190614.ebuild
new file mode 100644
index 000000000000..ecd14071a70f
--- /dev/null
+++ b/media-video/yle-dl/yle-dl-20190614.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5..6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Download media files from Yle Areena"
+HOMEPAGE="http://aajanki.github.io/yle-dl/"
+SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="libav php test +youtube-dl"
+
+# Requires an active internet connection during tests
+RESTRICT="test"
+
+RDEPEND="
+	!libav? ( media-video/ffmpeg )
+	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
+	<dev-python/attrs-18.3.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/mini-amf[${PYTHON_USEDEP}]
+	dev-python/progress[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	net-misc/wget
+	php? (
+		dev-lang/php:*[bcmath,cli,curl,simplexml]
+		>=dev-libs/openssl-1.0.2:0=
+		media-video/rtmpdump
+	)
+	youtube-dl? ( net-misc/youtube-dl[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
+
+src_prepare() {
+	default
+
+	# Gentoo doesn't ship pycryptodomex with pycryptodome
+	sed -i 's/pycryptodomex/pycryptodome/g' setup.py || die
+}
+
+python_test() {
+	# For tests to run succesfully, you need to disable network stricting 
+	# feature first.
+	#  FEATURES="-network-sandbox test" emerge -a yle-dl
+	esetup.py test
+}
+
+pkg_postinst() {
+	einfo "Sample configuration file has been installed in "
+	einfo " /usr/share/doc/yle-dl-2.37/yledl.conf.sample.bz2"
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d347cac3b679..f3d8e2dc1af6 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7a755efccb78..4a41a1781084 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Aug 2019 16:08:59 +0000
+Fri, 06 Sep 2019 08:39:00 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 43909281f0ca..14342aa9db71 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 446941 BLAKE2B 27348febfa1e8b0c37a6262b9e1c30afa2668e0702870fc19e3e8e049c8aa3fce3a0a847ecfdfa1843e08f25b1c541365b360bee2789c88b7c7abd1d0af7a0a4 SHA512 b604df11b0bda8c02e03d8c0f183f427ec63dd525e2cbd5b7473a5dbfd7112d964e04f46efec437421b06496482ba2148b26225bcbd4b736cd57023d4aeb1ea7
-TIMESTAMP 2019-08-18T16:09:02Z
+MANIFEST Manifest.files.gz 447571 BLAKE2B 5dcbf22acab4aa936027b65cb350fd1f2f1c1e2537d9521e947b1cbe33f4d7b2b6fbb6bb4805bdf0c5ff45c77fcb33345e4c8d8b89729f3fa2275febb0067a24 SHA512 85251d26f1a84f633b1f394aeaeb284222b79a86f4ce32b3e4e3dbc431b1a27e54bd1e6b1023f766bdacf2a7c3226992247aab3e13dd008f70ff63b9b31dcd87
+TIMESTAMP 2019-09-06T08:39:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl1ZeB5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl1yGyhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAlMw//Y9l50sTL8BwL9tH0qPOFngKNjcjMJzJGgU69fY+GrSyTWN0U1GMQzpcR
-KqaTOuUJiSAxYhm8AZueZ73wGp21lm4qFUvKGHjWvTLT7YtlMqenG6kX/HeKoaM/
-5U1KHEAHVFgXOyQOD/h9ETZNnvB/oJhjXUgf46nYUnZi5UXrj73b8Z0G6jfNERO6
-9VQ3+VkOFYp6oOKplqDfyxrDCqwTzQRXap2dpmdozxVbydpr6BfquEbYy+0NijYC
-FNsEWNCwEo8GeWSdYFS8Q/eB3Vp6oCVAwBtW6+GZwsMEpt7/yGQe1Y9Zat1VGze2
-MsCQ06nnL/G/lnRpe1LtfzEugKh1RPzv78ZruY6dqkqo/wfrIkMksM2l9IU8zsE1
-XQgI/cFLfZoMNe7DhYvWPhe9Jj8jgIjiXY5F2RuiVt+B3K8DcJoBB0LeyrTSs9w+
-1q3eOiunW4Z6wTfeYpXmnIrW/ZDM0xw0SU/fgAKmf/u1QRy9ctNVGwB02u/Oif/o
-xbX5yfRQxEA7qK3RN6tPU1r+9QYbbyIUBePFXbbMCEv41QUpj9shNh3g5kC1LQPQ
-VG7l+/ewS57u6wUBRAEFosLVcU5zKZydHkmqJTY4mCpGbDcJQ/q16Es/kNBprEsM
-GkSyKT4EJrp8XUnqfXBVVADUP2aGqiJTQ8GPsBn5CUkb33fO2gY=
-=z3VN
+klCTtxAAhLPXP6XvR+/h9wHgS6IrEhLTQ3N5A5s8veo5JxxSv6qrosvcmz5D1Enx
+1TjSiBhfKZMacSjIbDbwn0LZ5r5e7RcZnY8wPpieL7xcYhgRF935Py4CTsjkEZXR
+EjCQWPbsSsPgTSya/RkMowmHib4ruGJtqKc12MJFB4XXGizIfGxT5sE278hJ4kKn
+oysYDsJgdq4Md9KRwr04f59oncNx3cvtfDCNfYDl9G1m57GZC/A/uuCdyx6wRk8B
+jdKDwxE7Yz3rJAHDnbiN629i3HaaN1Csu1IVgXKbUToCaKwRwno5W4uJE9tnNZjk
+RIFsdPrV/C62PdZXyxB8koPk5pVx/fmwn8hdh3Q23pITZXnUKQdEHg5gqV447KGk
+WlNi40qMmw5npaUmKWUGNCyNj4211BGPzbjn4xOKGQwZOAZZkE3eyNBWiS6kNALL
+2LkBmHjPe8It97gXBBfdyMElxMUhK1GljNFF7K8X10kT4Tnqy04q2heRN7e2pcaH
+y8H9iQlzFvi0fJt2yZZfKmc/ktlHwXiQJeFzk9ym+PiM2dmr35roCfR26aKF7yio
+LMCmGWvAW7WDxpAKDzfSmS05oavvtT9nI7H1MjZHSoHHescL6vVQU2drelNIyCuQ
+QVoSn7xRqg3yPU6F2lwhGCNKq95XcprgmmRseY8RnxHOEdddRXA=
+=x/mL
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 8dde4ddcf57d..8045ca98ae1e 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-201908-03.xml b/metadata/glsa/glsa-201908-03.xml
index 2b768c68c862..4a5520a3d11c 100644
--- a/metadata/glsa/glsa-201908-03.xml
+++ b/metadata/glsa/glsa-201908-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">jasper</product>
   <announced>2019-08-09</announced>
-  <revised count="2">2019-08-09</revised>
+  <revised count="3">2019-08-28</revised>
   <bug>614028</bug>
   <bug>614032</bug>
   <bug>624988</bug>
@@ -63,7 +63,6 @@
     <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-13753">CVE-2017-13753</uri>
     <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-14132">CVE-2017-14132</uri>
     <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-14229">CVE-2017-14229</uri>
-    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-14232">CVE-2017-14232</uri>
     <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-5503">CVE-2017-5503</uri>
     <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-5504">CVE-2017-5504</uri>
     <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-5505">CVE-2017-5505</uri>
@@ -76,5 +75,5 @@
     <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-9154">CVE-2018-9154</uri>
   </references>
   <metadata tag="requester" timestamp="2019-08-04T18:37:11Z">b-man</metadata>
-  <metadata tag="submitter" timestamp="2019-08-09T22:17:32Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2019-08-28T22:02:05Z">b-man</metadata>
 </glsa>
diff --git a/metadata/glsa/glsa-201908-26.xml b/metadata/glsa/glsa-201908-26.xml
new file mode 100644
index 000000000000..9a757dd8348d
--- /dev/null
+++ b/metadata/glsa/glsa-201908-26.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201908-26">
+  <title>libofx: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in libofx, the worst of
+    which could result in the arbitrary execution of code.
+  </synopsis>
+  <product type="ebuild">libofx</product>
+  <announced>2019-08-31</announced>
+  <revised count="1">2019-08-31</revised>
+  <bug>631304</bug>
+  <bug>636062</bug>
+  <bug>662910</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-libs/libofx" auto="yes" arch="*">
+      <unaffected range="ge">0.9.14</unaffected>
+      <vulnerable range="lt">0.9.14</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>A library to support the Open Financial eXchange XML format</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in libofx. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to process a specially crafted
+      file using an application linked against libofx, possibly resulting in
+      execution of arbitrary code with the privileges of the process or a
+      Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All libofx users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-libs/libofx-0.9.14"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-14731">CVE-2017-14731</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-2816">CVE-2017-2816</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2017-2920">CVE-2017-2920</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-08-18T02:20:40Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2019-08-31T15:00:19Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201908-27.xml b/metadata/glsa/glsa-201908-27.xml
new file mode 100644
index 000000000000..6f7af7bbed67
--- /dev/null
+++ b/metadata/glsa/glsa-201908-27.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201908-27">
+  <title>Nautilus: Security bypass</title>
+  <synopsis>A vulnerability in Nautilus may allow attackers to escape the
+    sandbox.
+  </synopsis>
+  <product type="ebuild">nautilus</product>
+  <announced>2019-08-31</announced>
+  <revised count="1">2019-08-31</revised>
+  <bug>692784</bug>
+  <access>local</access>
+  <affected>
+    <package name="gnome-base/nautilus" auto="yes" arch="*">
+      <unaffected range="ge">3.30.5-r1</unaffected>
+      <vulnerable range="lt">3.30.5-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Default file manager for the GNOME desktop</p>
+  </background>
+  <description>
+    <p>A vulnerability was discovered in Nautilus which allows an attacker to
+      escape the sandbox.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A local attacker could possibly bypass sandbox protection.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Nautilus users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=gnome-base/nautilus-3.30.5-r1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-11461">CVE-2019-11461</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-08-26T21:48:06Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2019-08-31T15:00:33Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201908-28.xml b/metadata/glsa/glsa-201908-28.xml
new file mode 100644
index 000000000000..19818590fbcb
--- /dev/null
+++ b/metadata/glsa/glsa-201908-28.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201908-28">
+  <title>GNOME desktop library: Security bypass</title>
+  <synopsis>A vulnerability in the GNOME desktop library may allow attackers to
+    escape the sandbox.
+  </synopsis>
+  <product type="ebuild">gnome-desktop</product>
+  <announced>2019-08-31</announced>
+  <revised count="1">2019-08-31</revised>
+  <bug>692782</bug>
+  <access>local</access>
+  <affected>
+    <package name="gnome-base/gnome-desktop" auto="yes" arch="*">
+      <unaffected range="ge">3.30.2.3</unaffected>
+      <vulnerable range="lt">3.30.2.3</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Library with common API for various GNOME modules.</p>
+  </background>
+  <description>
+    <p>A vulnerability was discovered in the GNOME desktop library which allows
+      an attacker to escape the sandbox.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A local attacker could possibly bypass sandbox protection.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All GNOME desktop library users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=gnome-base/gnome-desktop-3.30.2.3"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-11460">CVE-2019-11460</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-08-31T14:55:07Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2019-08-31T21:05:16Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201908-29.xml b/metadata/glsa/glsa-201908-29.xml
new file mode 100644
index 000000000000..4b86c592f6fa
--- /dev/null
+++ b/metadata/glsa/glsa-201908-29.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201908-29">
+  <title>Dovecot: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Dovecot, the worst of
+    which could result in the arbitrary execution of code.
+  </synopsis>
+  <product type="ebuild">dovecot</product>
+  <announced>2019-08-31</announced>
+  <revised count="1">2019-08-31</revised>
+  <bug>683732</bug>
+  <bug>692572</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="net-mail/dovecot" auto="yes" arch="*">
+      <unaffected range="ge">2.3.7.2</unaffected>
+      <vulnerable range="lt">2.3.7.2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Dovecot is an open source IMAP and POP3 email server.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Dovecot. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>An unauthenticated remote attacker could send a specially crafted mail
+      or use crafted IMAP commands possibly resulting in the execution of
+      arbitrary code with the privileges of the process or a Denial of Service
+      condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Dovecot users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-mail/dovecot-2.3.7.2"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-10691">CVE-2019-10691</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-11500">CVE-2019-11500</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-08-31T14:29:36Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2019-08-31T21:05:29Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7a755efccb78..2f6a7762bf94 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Aug 2019 16:08:59 +0000
+Fri, 06 Sep 2019 08:39:01 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index a0dca6b11934..ac1358016db9 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-55b0fff2f98b275d6a6bcaf8e12164157936324c 1566095478 2019-08-18T02:31:18+00:00
+b3e8c925d3f6eb29b568169ff67ed18a2ff264c2 1567285941 2019-08-31T21:12:21+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 746a169ed463..47baf7d85fb5 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 7a56be3602ae..32a7fe83c030 100644
--- a/metadata/md5-cache/acct-group/Manifest.gz
+++ b/metadata/md5-cache/acct-group/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/adm-0 b/metadata/md5-cache/acct-group/adm-0
index d0caa7683b1e..8d5361a25d83 100644
--- a/metadata/md5-cache/acct-group/adm-0
+++ b/metadata/md5-cache/acct-group/adm-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: adm
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=39d71964f4abdd9dbcb7e1d46f8465ff
diff --git a/metadata/md5-cache/acct-group/audio-0 b/metadata/md5-cache/acct-group/audio-0
index 7be191bd47a6..398f98f7a723 100644
--- a/metadata/md5-cache/acct-group/audio-0
+++ b/metadata/md5-cache/acct-group/audio-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: audio
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=b73f5838fb249b20a45bae74eb578ea6
diff --git a/metadata/md5-cache/acct-group/burp-0 b/metadata/md5-cache/acct-group/burp-0
index 6c53ff79e5ab..6ee655837644 100644
--- a/metadata/md5-cache/acct-group/burp-0
+++ b/metadata/md5-cache/acct-group/burp-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the app-backup/burp server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=e3d5e39d1b95bf9351ca5517d737081b
diff --git a/metadata/md5-cache/acct-group/cdrom-0 b/metadata/md5-cache/acct-group/cdrom-0
index 368ddf1f874b..f12f76aa8647 100644
--- a/metadata/md5-cache/acct-group/cdrom-0
+++ b/metadata/md5-cache/acct-group/cdrom-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: cdrom
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=b9858db51d09305b00374dd08cbb7889
diff --git a/metadata/md5-cache/acct-group/dialout-0 b/metadata/md5-cache/acct-group/dialout-0
index c9faca8b8996..f7a4c24e00c8 100644
--- a/metadata/md5-cache/acct-group/dialout-0
+++ b/metadata/md5-cache/acct-group/dialout-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: dialout
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=a1ad90b55d7bd6ef91bc53934e20abd3
diff --git a/metadata/md5-cache/acct-group/disk-0 b/metadata/md5-cache/acct-group/disk-0
index 2243f0390606..691dc139b0d4 100644
--- a/metadata/md5-cache/acct-group/disk-0
+++ b/metadata/md5-cache/acct-group/disk-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: disk
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=a20b02cceaa021d9949929392bf56367
diff --git a/metadata/md5-cache/acct-group/dnscrypt-proxy-0 b/metadata/md5-cache/acct-group/dnscrypt-proxy-0
index 5a30661d4710..14065a896448 100644
--- a/metadata/md5-cache/acct-group/dnscrypt-proxy-0
+++ b/metadata/md5-cache/acct-group/dnscrypt-proxy-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for net-dns/dnscrypt-proxy
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=06f43a467097deec8d1d5e97e07d40a2
diff --git a/metadata/md5-cache/acct-group/ftp-0 b/metadata/md5-cache/acct-group/ftp-0
index e33918c19e55..bcc07faa26f0 100644
--- a/metadata/md5-cache/acct-group/ftp-0
+++ b/metadata/md5-cache/acct-group/ftp-0
@@ -3,5 +3,5 @@ DESCRIPTION=File Transfer Protocol server user
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=e770669756dc3ee4457445a05f65adbf
diff --git a/metadata/md5-cache/acct-group/gamestat-0 b/metadata/md5-cache/acct-group/gamestat-0
index 023a60436fb1..0e553fc9afcc 100644
--- a/metadata/md5-cache/acct-group/gamestat-0
+++ b/metadata/md5-cache/acct-group/gamestat-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for shared high-score and game state files
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=388e0905310bf778877ef5218d2fa759
diff --git a/metadata/md5-cache/acct-group/gkrellmd-0 b/metadata/md5-cache/acct-group/gkrellmd-0
index 8dff7259919c..836aa5b2815c 100644
--- a/metadata/md5-cache/acct-group/gkrellmd-0
+++ b/metadata/md5-cache/acct-group/gkrellmd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: gkrellmd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=6e73e70bcd8ec52941c349a38f8257d2
diff --git a/metadata/md5-cache/acct-group/i2pd-0 b/metadata/md5-cache/acct-group/i2pd-0
index a9fab11cf7c5..9309f4bee06f 100644
--- a/metadata/md5-cache/acct-group/i2pd-0
+++ b/metadata/md5-cache/acct-group/i2pd-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the system-wide net-vpn/i2pd server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=453194474be9865bd9669c2dd708e289
diff --git a/metadata/md5-cache/acct-group/input-0 b/metadata/md5-cache/acct-group/input-0
index 37f3c53fd06d..68fd32afb32e 100644
--- a/metadata/md5-cache/acct-group/input-0
+++ b/metadata/md5-cache/acct-group/input-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: input
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=facd231a70bee907d514147f6adddc94
diff --git a/metadata/md5-cache/acct-group/inspircd-0 b/metadata/md5-cache/acct-group/inspircd-0
new file mode 100644
index 000000000000..894ac6cb620c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/inspircd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: inspircd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=a795520ec5641579d481dd2b0697614d
diff --git a/metadata/md5-cache/acct-group/kmem-0 b/metadata/md5-cache/acct-group/kmem-0
index 26cb1830732e..fa6285c7eb85 100644
--- a/metadata/md5-cache/acct-group/kmem-0
+++ b/metadata/md5-cache/acct-group/kmem-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: kmem
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=10127a30128142690669f5c03c937f4e
diff --git a/metadata/md5-cache/acct-group/knot-0 b/metadata/md5-cache/acct-group/knot-0
new file mode 100644
index 000000000000..f2168804bf76
--- /dev/null
+++ b/metadata/md5-cache/acct-group/knot-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: knot
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=2d26cd7f45a3e7ddb78f0fa0f149bd4f
diff --git a/metadata/md5-cache/acct-group/kvm-0 b/metadata/md5-cache/acct-group/kvm-0
index ac9961b0d8cb..1c5ed5ce6c27 100644
--- a/metadata/md5-cache/acct-group/kvm-0
+++ b/metadata/md5-cache/acct-group/kvm-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: kvm
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=067b2dfd01914e403a4c31ea6f6bb8c4
diff --git a/metadata/md5-cache/acct-group/libvirt-0 b/metadata/md5-cache/acct-group/libvirt-0
index 1723b519ba4f..a9d2396458ee 100644
--- a/metadata/md5-cache/acct-group/libvirt-0
+++ b/metadata/md5-cache/acct-group/libvirt-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: libvirt
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=002df7e4906cff6a8f6f26394482abaa
diff --git a/metadata/md5-cache/acct-group/logstash-0 b/metadata/md5-cache/acct-group/logstash-0
index b3a31316fe53..83586a39998a 100644
--- a/metadata/md5-cache/acct-group/logstash-0
+++ b/metadata/md5-cache/acct-group/logstash-0
@@ -3,5 +3,5 @@ DESCRIPTION=Logstash program group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=861a900d93d5467bb8da8fd0adac01f9
diff --git a/metadata/md5-cache/acct-group/lp-0 b/metadata/md5-cache/acct-group/lp-0
index abf1dcf456e6..e540047a5164 100644
--- a/metadata/md5-cache/acct-group/lp-0
+++ b/metadata/md5-cache/acct-group/lp-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: lp
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=699dd3f5942b4f58c8a27283ad495391
diff --git a/metadata/md5-cache/acct-group/mail-0 b/metadata/md5-cache/acct-group/mail-0
index c9f327616089..b4d5904544a0 100644
--- a/metadata/md5-cache/acct-group/mail-0
+++ b/metadata/md5-cache/acct-group/mail-0
@@ -3,5 +3,5 @@ DESCRIPTION=Mail program group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=e3067d3d912fccf59b2f4b2256a57add
diff --git a/metadata/md5-cache/acct-group/man-0 b/metadata/md5-cache/acct-group/man-0
index fd816c7ac2d0..d95f564b3191 100644
--- a/metadata/md5-cache/acct-group/man-0
+++ b/metadata/md5-cache/acct-group/man-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: man
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=4c96f51f1389cf6ecdcdb10758ffad62
diff --git a/metadata/md5-cache/acct-group/messagebus-0 b/metadata/md5-cache/acct-group/messagebus-0
index 01fe8212404c..6fb0eb51a2b0 100644
--- a/metadata/md5-cache/acct-group/messagebus-0
+++ b/metadata/md5-cache/acct-group/messagebus-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: messagebus
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=1534290a1fff9dabea91ec6f8b5facd7
diff --git a/metadata/md5-cache/acct-group/minecraft-0 b/metadata/md5-cache/acct-group/minecraft-0
index e62b999bc6e3..103dd2eed0b1 100644
--- a/metadata/md5-cache/acct-group/minecraft-0
+++ b/metadata/md5-cache/acct-group/minecraft-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the Minecraft server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=0ac2f37208671fa68c6faeb53e64a554
diff --git a/metadata/md5-cache/acct-group/msmtpd-0 b/metadata/md5-cache/acct-group/msmtpd-0
index d3e00c1d623e..23960c2efe41 100644
--- a/metadata/md5-cache/acct-group/msmtpd-0
+++ b/metadata/md5-cache/acct-group/msmtpd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: msmtpd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=ad9ddb1047b6e114f628220b4b8ab4d5
diff --git a/metadata/md5-cache/acct-group/murmur-0 b/metadata/md5-cache/acct-group/murmur-0
index 53d20fd43b97..c2d80a127e8b 100644
--- a/metadata/md5-cache/acct-group/murmur-0
+++ b/metadata/md5-cache/acct-group/murmur-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: murmur
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=870bb9cb21b6dfa6dbbe73789d526c4c
diff --git a/metadata/md5-cache/acct-group/mysql-0 b/metadata/md5-cache/acct-group/mysql-0
index f62e5da2f06b..40f1628f8783 100644
--- a/metadata/md5-cache/acct-group/mysql-0
+++ b/metadata/md5-cache/acct-group/mysql-0
@@ -3,5 +3,5 @@ DESCRIPTION=MySQL program group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=d8c9ba10da6756eb6b8d6be422784cf0
diff --git a/metadata/md5-cache/acct-group/nsd-0 b/metadata/md5-cache/acct-group/nsd-0
index 020c68a5ea0a..6a6aafb23b7f 100644
--- a/metadata/md5-cache/acct-group/nsd-0
+++ b/metadata/md5-cache/acct-group/nsd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: nsd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=42c98ec2b9cb3d0ebf575318637d6302
diff --git a/metadata/md5-cache/acct-group/ntp-0 b/metadata/md5-cache/acct-group/ntp-0
new file mode 100644
index 000000000000..4c3ea9a69f4b
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ntp-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: ntp
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=55a88933342b8dbd93a66a73f0a50945
diff --git a/metadata/md5-cache/acct-group/pdnsd-0 b/metadata/md5-cache/acct-group/pdnsd-0
index 76639003c307..5cd02473df4c 100644
--- a/metadata/md5-cache/acct-group/pdnsd-0
+++ b/metadata/md5-cache/acct-group/pdnsd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: pdnsd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=d553e3ed473ad56db2ff48168ecac299
diff --git a/metadata/md5-cache/acct-group/polkitd-0 b/metadata/md5-cache/acct-group/polkitd-0
index d1e8adabe39b..19e5fe242545 100644
--- a/metadata/md5-cache/acct-group/polkitd-0
+++ b/metadata/md5-cache/acct-group/polkitd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: polkitd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=d217390593e0ce31f04ccb30a5e83e2d
diff --git a/metadata/md5-cache/acct-group/qemu-0 b/metadata/md5-cache/acct-group/qemu-0
index e24a911d5a43..8f1b84e9c432 100644
--- a/metadata/md5-cache/acct-group/qemu-0
+++ b/metadata/md5-cache/acct-group/qemu-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: qemu
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=a8bc544ee75754c59983fd84f9c7f6f4
diff --git a/metadata/md5-cache/acct-group/render-0 b/metadata/md5-cache/acct-group/render-0
index 377775eee44f..2350fc4861ef 100644
--- a/metadata/md5-cache/acct-group/render-0
+++ b/metadata/md5-cache/acct-group/render-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: render
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=141ce6e52ae209dc1e4812a47c68c24c
diff --git a/metadata/md5-cache/acct-group/rtkit-0 b/metadata/md5-cache/acct-group/rtkit-0
index 04211548df94..d26c50007616 100644
--- a/metadata/md5-cache/acct-group/rtkit-0
+++ b/metadata/md5-cache/acct-group/rtkit-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the Realtime Policy and Watchdog Daemon
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=544ef464e978937b47790cdd5f445b9f
diff --git a/metadata/md5-cache/acct-group/spire-0 b/metadata/md5-cache/acct-group/spire-0
new file mode 100644
index 000000000000..d7cc7b68e6a3
--- /dev/null
+++ b/metadata/md5-cache/acct-group/spire-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: spire
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=796313075561b9165534a586dc7ec080
diff --git a/metadata/md5-cache/acct-group/stdiscosrv-0 b/metadata/md5-cache/acct-group/stdiscosrv-0
index 13a1762923db..60badb9bb7f5 100644
--- a/metadata/md5-cache/acct-group/stdiscosrv-0
+++ b/metadata/md5-cache/acct-group/stdiscosrv-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the Syncthing discovery server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=5eac0e1089e8a2a06ba47f663a9ac5be
diff --git a/metadata/md5-cache/acct-group/strelaysrv-0 b/metadata/md5-cache/acct-group/strelaysrv-0
index 9e4b2693e329..3d57b3157a74 100644
--- a/metadata/md5-cache/acct-group/strelaysrv-0
+++ b/metadata/md5-cache/acct-group/strelaysrv-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the Syncthing relay server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=6962ba1fd37accc2190900fee6eea651
diff --git a/metadata/md5-cache/acct-group/syncthing-0 b/metadata/md5-cache/acct-group/syncthing-0
index e5eb5db37080..47362012ec9f 100644
--- a/metadata/md5-cache/acct-group/syncthing-0
+++ b/metadata/md5-cache/acct-group/syncthing-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the system-wide net-p2p/syncthing server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=9bab7067558a254e4301f6e26b97f00c
diff --git a/metadata/md5-cache/acct-group/systemd-coredump-0 b/metadata/md5-cache/acct-group/systemd-coredump-0
index c772e8d579ee..065eaba6d7a2 100644
--- a/metadata/md5-cache/acct-group/systemd-coredump-0
+++ b/metadata/md5-cache/acct-group/systemd-coredump-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-coredump
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=ba03881d70141240f8785a9ebe9b635a
diff --git a/metadata/md5-cache/acct-group/systemd-journal-0 b/metadata/md5-cache/acct-group/systemd-journal-0
index a0bfdb16e5af..d733d2c90739 100644
--- a/metadata/md5-cache/acct-group/systemd-journal-0
+++ b/metadata/md5-cache/acct-group/systemd-journal-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-journal
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=ee731e89b3add67d993214231cd448f4
diff --git a/metadata/md5-cache/acct-group/systemd-journal-remote-0 b/metadata/md5-cache/acct-group/systemd-journal-remote-0
index 787d90a85dac..7c5a7d6853c6 100644
--- a/metadata/md5-cache/acct-group/systemd-journal-remote-0
+++ b/metadata/md5-cache/acct-group/systemd-journal-remote-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-journal-remote
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=b35bee456dacb3def84bb3102b9b9e16
diff --git a/metadata/md5-cache/acct-group/systemd-network-0 b/metadata/md5-cache/acct-group/systemd-network-0
index 38cdaaede07a..8e0652072004 100644
--- a/metadata/md5-cache/acct-group/systemd-network-0
+++ b/metadata/md5-cache/acct-group/systemd-network-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-network
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=6105dc422955de35899eb33e050ed61d
diff --git a/metadata/md5-cache/acct-group/systemd-resolve-0 b/metadata/md5-cache/acct-group/systemd-resolve-0
index bbfc4067be30..2ae2985377b0 100644
--- a/metadata/md5-cache/acct-group/systemd-resolve-0
+++ b/metadata/md5-cache/acct-group/systemd-resolve-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-resolve
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=e4c7a1f08798faad650421105d7f17ec
diff --git a/metadata/md5-cache/acct-group/systemd-timesync-0 b/metadata/md5-cache/acct-group/systemd-timesync-0
index 242fa35bd5dc..ff2bdffc2ee3 100644
--- a/metadata/md5-cache/acct-group/systemd-timesync-0
+++ b/metadata/md5-cache/acct-group/systemd-timesync-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-timesync
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=783e72d966ed013fde696067340924fd
diff --git a/metadata/md5-cache/acct-group/tape-0 b/metadata/md5-cache/acct-group/tape-0
index 52653cefda42..7f1b314f2df6 100644
--- a/metadata/md5-cache/acct-group/tape-0
+++ b/metadata/md5-cache/acct-group/tape-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: tape
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=a34fcb3d861044abe1f10d14972f679b
diff --git a/metadata/md5-cache/acct-group/transmission-0 b/metadata/md5-cache/acct-group/transmission-0
index 20873edc22c9..a1596f8831ed 100644
--- a/metadata/md5-cache/acct-group/transmission-0
+++ b/metadata/md5-cache/acct-group/transmission-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: transmission
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=52e48d456339135bb9b1f5353a1e32bc
diff --git a/metadata/md5-cache/acct-group/tty-0 b/metadata/md5-cache/acct-group/tty-0
index 28e082b2552b..24916e1a7236 100644
--- a/metadata/md5-cache/acct-group/tty-0
+++ b/metadata/md5-cache/acct-group/tty-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: tty
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=98be503d8e76c6be62c7f29d4f87d16d
diff --git a/metadata/md5-cache/acct-group/unrealircd-0 b/metadata/md5-cache/acct-group/unrealircd-0
index b395f3245aa1..c03e77813b9d 100644
--- a/metadata/md5-cache/acct-group/unrealircd-0
+++ b/metadata/md5-cache/acct-group/unrealircd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: unrealircd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=260b93e0bc769d63e90462b952aebf54
diff --git a/metadata/md5-cache/acct-group/uptimed-0 b/metadata/md5-cache/acct-group/uptimed-0
index b4a84e99775f..d3222777a05a 100644
--- a/metadata/md5-cache/acct-group/uptimed-0
+++ b/metadata/md5-cache/acct-group/uptimed-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: uptimed
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=8c781ce9bdbe5f5e6dabcf07ab1f663c
diff --git a/metadata/md5-cache/acct-group/utmp-0 b/metadata/md5-cache/acct-group/utmp-0
index 3c8b3a75b63c..1835a739fd0c 100644
--- a/metadata/md5-cache/acct-group/utmp-0
+++ b/metadata/md5-cache/acct-group/utmp-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: utmp
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=8aa5529f38fbd076d459ebaab1b8d848
diff --git a/metadata/md5-cache/acct-group/video-0 b/metadata/md5-cache/acct-group/video-0
index 1607a6316c80..3c5036ec3cdc 100644
--- a/metadata/md5-cache/acct-group/video-0
+++ b/metadata/md5-cache/acct-group/video-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: video
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=a5f2bb515d6492d449d0c5ebee5ec612
diff --git a/metadata/md5-cache/acct-group/wheel-0 b/metadata/md5-cache/acct-group/wheel-0
index b8ca5e58a985..4247595e6473 100644
--- a/metadata/md5-cache/acct-group/wheel-0
+++ b/metadata/md5-cache/acct-group/wheel-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: wheel
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 SLOT=0
-_eclasses_=acct-group	d27bf4b80911d248719bbdba83ec4fb4	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=8bf40a3acada0f03317db54cd1ba0704
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 9df4b15b9286..7a1bfbe9cf84 100644
--- a/metadata/md5-cache/acct-user/Manifest.gz
+++ b/metadata/md5-cache/acct-user/Manifest.gz
diff --git a/metadata/md5-cache/acct-user/burp-0 b/metadata/md5-cache/acct-user/burp-0
index a2b8ae8e6b13..f707d204f0ce 100644
--- a/metadata/md5-cache/acct-user/burp-0
+++ b/metadata/md5-cache/acct-user/burp-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/burp
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=6d5ad09bfdcb80ddfad920300080b71c
diff --git a/metadata/md5-cache/acct-user/dnscrypt-proxy-0 b/metadata/md5-cache/acct-user/dnscrypt-proxy-0
index bea7b9f80284..d146bf3d2d8a 100644
--- a/metadata/md5-cache/acct-user/dnscrypt-proxy-0
+++ b/metadata/md5-cache/acct-user/dnscrypt-proxy-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/dnscrypt-proxy
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=664f3ddcc9b1899890ab516f81480642
diff --git a/metadata/md5-cache/acct-user/ftp-0 b/metadata/md5-cache/acct-user/ftp-0
index 163e20c5c039..d0e2aaf35d95 100644
--- a/metadata/md5-cache/acct-user/ftp-0
+++ b/metadata/md5-cache/acct-user/ftp-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/ftp
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=c4f7d3e9113e45d0b587307d6bfd74d0
diff --git a/metadata/md5-cache/acct-user/gkrellmd-0 b/metadata/md5-cache/acct-user/gkrellmd-0
index 69733c975933..e74828ff7370 100644
--- a/metadata/md5-cache/acct-user/gkrellmd-0
+++ b/metadata/md5-cache/acct-user/gkrellmd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/gkrellmd
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=95088eb9093ebb5b9a0eea9f07b01fbd
diff --git a/metadata/md5-cache/acct-user/i2pd-0 b/metadata/md5-cache/acct-user/i2pd-0
index f122114aa49d..fdce83f1a433 100644
--- a/metadata/md5-cache/acct-user/i2pd-0
+++ b/metadata/md5-cache/acct-user/i2pd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/i2pd
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=876c9cfdec60e447bf4070dd2d4b07c5
diff --git a/metadata/md5-cache/acct-user/inspircd-0 b/metadata/md5-cache/acct-user/inspircd-0
new file mode 100644
index 000000000000..013e4b21cb9f
--- /dev/null
+++ b/metadata/md5-cache/acct-user/inspircd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for InspIRCd server daemon
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/inspircd
+SLOT=0
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=e040a118122eb50acb419310a419f329
diff --git a/metadata/md5-cache/acct-user/knot-0 b/metadata/md5-cache/acct-user/knot-0
new file mode 100644
index 000000000000..d4a60421429c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/knot-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for knot DNS server
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/knot
+SLOT=0
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=19cc5d10a4269199806b14aaa3a2733b
diff --git a/metadata/md5-cache/acct-user/logstash-0 b/metadata/md5-cache/acct-user/logstash-0
index a568f01c0581..ae1304fc0bed 100644
--- a/metadata/md5-cache/acct-user/logstash-0
+++ b/metadata/md5-cache/acct-user/logstash-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/logstash
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=6d0dd20248b7b73eba0835bdf2613f2a
diff --git a/metadata/md5-cache/acct-user/mail-0 b/metadata/md5-cache/acct-user/mail-0
index 5cf0f9fb51ea..d0d4dc51a2ef 100644
--- a/metadata/md5-cache/acct-user/mail-0
+++ b/metadata/md5-cache/acct-user/mail-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/mail
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=1d648f45e2af351c6b06ac91ecc6f5e6
diff --git a/metadata/md5-cache/acct-user/man-1 b/metadata/md5-cache/acct-user/man-1
index d9076446cc55..6e2dcfc18916 100644
--- a/metadata/md5-cache/acct-user/man-1
+++ b/metadata/md5-cache/acct-user/man-1
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/man
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=f4f877dbc66a56f26588e4322cff4b53
diff --git a/metadata/md5-cache/acct-user/messagebus-0 b/metadata/md5-cache/acct-user/messagebus-0
index 7fd0081ca93e..ffb92171b3e8 100644
--- a/metadata/md5-cache/acct-user/messagebus-0
+++ b/metadata/md5-cache/acct-user/messagebus-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/messagebus
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=c6ab10cec28a405c686c8707a0441c32
diff --git a/metadata/md5-cache/acct-user/minecraft-0 b/metadata/md5-cache/acct-user/minecraft-0
index 3c43d153c240..cdca48c7de75 100644
--- a/metadata/md5-cache/acct-user/minecraft-0
+++ b/metadata/md5-cache/acct-user/minecraft-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/minecraft
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=c18cfc57e0d08d970e7644237883921e
diff --git a/metadata/md5-cache/acct-user/msmtpd-0 b/metadata/md5-cache/acct-user/msmtpd-0
index 1e0278267c06..9140246d8613 100644
--- a/metadata/md5-cache/acct-user/msmtpd-0
+++ b/metadata/md5-cache/acct-user/msmtpd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/msmtpd
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=1e86c8bfdb0678c2fee1fdd75c5c990b
diff --git a/metadata/md5-cache/acct-user/murmur-0 b/metadata/md5-cache/acct-user/murmur-0
index 4606f014f76e..4294f28a4919 100644
--- a/metadata/md5-cache/acct-user/murmur-0
+++ b/metadata/md5-cache/acct-user/murmur-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/murmur
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=12f204ef54bfecc67ed3baced394ea62
diff --git a/metadata/md5-cache/acct-user/mysql-0 b/metadata/md5-cache/acct-user/mysql-0
index 5c1231f2f605..735adb817aea 100644
--- a/metadata/md5-cache/acct-user/mysql-0
+++ b/metadata/md5-cache/acct-user/mysql-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/mysql
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=2239e70edb93016adb4f07506c64ee6f
diff --git a/metadata/md5-cache/acct-user/nsd-0 b/metadata/md5-cache/acct-user/nsd-0
index 3090ba6ce9af..fc1bc33d5385 100644
--- a/metadata/md5-cache/acct-user/nsd-0
+++ b/metadata/md5-cache/acct-user/nsd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/nsd
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=ba4d4367098caae927e815d356790903
diff --git a/metadata/md5-cache/acct-user/ntp-0 b/metadata/md5-cache/acct-user/ntp-0
new file mode 100644
index 000000000000..57a2504fb9a9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ntp-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for ntp daemon
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/ntp
+SLOT=0
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=3004c4f4ed33c8637fec813897554580
diff --git a/metadata/md5-cache/acct-user/pdnsd-0 b/metadata/md5-cache/acct-user/pdnsd-0
index 4dc1178433d5..6fcea8040501 100644
--- a/metadata/md5-cache/acct-user/pdnsd-0
+++ b/metadata/md5-cache/acct-user/pdnsd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/pdnsd
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=964d062348fa7d70ba4f5b0f6c20b9f1
diff --git a/metadata/md5-cache/acct-user/polkitd-0 b/metadata/md5-cache/acct-user/polkitd-0
index 0f8b6f514c29..a4166036fe6b 100644
--- a/metadata/md5-cache/acct-user/polkitd-0
+++ b/metadata/md5-cache/acct-user/polkitd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/polkitd
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=3463586ac30a8004b934afdd01793c63
diff --git a/metadata/md5-cache/acct-user/postmaster-0 b/metadata/md5-cache/acct-user/postmaster-0
index 1825e3564e0a..4d009cd42cb1 100644
--- a/metadata/md5-cache/acct-user/postmaster-0
+++ b/metadata/md5-cache/acct-user/postmaster-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/mail
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=4215e7d391c4c711aba698a9da6a2d73
diff --git a/metadata/md5-cache/acct-user/qemu-0 b/metadata/md5-cache/acct-user/qemu-0
index d64ed95ed46c..643afe38fd96 100644
--- a/metadata/md5-cache/acct-user/qemu-0
+++ b/metadata/md5-cache/acct-user/qemu-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/qemu acct-group/kvm
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=304c14d1dbbc88dfb27654b70a662ec8
diff --git a/metadata/md5-cache/acct-user/rtkit-0 b/metadata/md5-cache/acct-user/rtkit-0
index a0c22cfcc111..9d64fb3f2793 100644
--- a/metadata/md5-cache/acct-user/rtkit-0
+++ b/metadata/md5-cache/acct-user/rtkit-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/rtkit
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=ce8e63018323dcc6970bb34d49f6ea6c
diff --git a/metadata/md5-cache/acct-user/spire-0 b/metadata/md5-cache/acct-user/spire-0
new file mode 100644
index 000000000000..d2e130e63f99
--- /dev/null
+++ b/metadata/md5-cache/acct-user/spire-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for spiffe runtime environment
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/spire
+SLOT=0
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=9f81947a940b670dab44596013c4050f
diff --git a/metadata/md5-cache/acct-user/stdiscosrv-0 b/metadata/md5-cache/acct-user/stdiscosrv-0
index 13c9f51bb968..b87e5eba866d 100644
--- a/metadata/md5-cache/acct-user/stdiscosrv-0
+++ b/metadata/md5-cache/acct-user/stdiscosrv-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/stdiscosrv
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=af44b8606b4a40dab02f5496afe79489
diff --git a/metadata/md5-cache/acct-user/strelaysrv-0 b/metadata/md5-cache/acct-user/strelaysrv-0
index 0b191b3e855c..1564d2678b0c 100644
--- a/metadata/md5-cache/acct-user/strelaysrv-0
+++ b/metadata/md5-cache/acct-user/strelaysrv-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/strelaysrv
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=6f884243bd1b2d10493d2442712e1830
diff --git a/metadata/md5-cache/acct-user/syncthing-0 b/metadata/md5-cache/acct-user/syncthing-0
index 63488a60176b..1105c1839421 100644
--- a/metadata/md5-cache/acct-user/syncthing-0
+++ b/metadata/md5-cache/acct-user/syncthing-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/syncthing
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=28de358efd6c5e041eec5a14fe5c25b3
diff --git a/metadata/md5-cache/acct-user/systemd-coredump-0 b/metadata/md5-cache/acct-user/systemd-coredump-0
index 8eaeceef245f..d56867d9e286 100644
--- a/metadata/md5-cache/acct-user/systemd-coredump-0
+++ b/metadata/md5-cache/acct-user/systemd-coredump-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/systemd-coredump
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=3c1db608ce4a5189047921934cb12aab
diff --git a/metadata/md5-cache/acct-user/systemd-journal-remote-0 b/metadata/md5-cache/acct-user/systemd-journal-remote-0
index 9ae899d6bec2..0f2cfbf58fe1 100644
--- a/metadata/md5-cache/acct-user/systemd-journal-remote-0
+++ b/metadata/md5-cache/acct-user/systemd-journal-remote-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/systemd-journal-remote
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=2c76c24b248182149eb428205a72a917
diff --git a/metadata/md5-cache/acct-user/systemd-network-0 b/metadata/md5-cache/acct-user/systemd-network-0
index 3b0248925b95..b253f47f242b 100644
--- a/metadata/md5-cache/acct-user/systemd-network-0
+++ b/metadata/md5-cache/acct-user/systemd-network-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/systemd-network
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=3eab8e08499459d01f181d06e7d2950c
diff --git a/metadata/md5-cache/acct-user/systemd-resolve-0 b/metadata/md5-cache/acct-user/systemd-resolve-0
index 1564d45b9ac1..c5548fee47bf 100644
--- a/metadata/md5-cache/acct-user/systemd-resolve-0
+++ b/metadata/md5-cache/acct-user/systemd-resolve-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/systemd-resolve
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=3f1c651b891b7a8f654b421abfe5d4e9
diff --git a/metadata/md5-cache/acct-user/systemd-timesync-0 b/metadata/md5-cache/acct-user/systemd-timesync-0
index 74915dc7a0de..0228d4a26634 100644
--- a/metadata/md5-cache/acct-user/systemd-timesync-0
+++ b/metadata/md5-cache/acct-user/systemd-timesync-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/systemd-timesync
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=bb13fbcbb1217c0817d90f47c25a46c6
diff --git a/metadata/md5-cache/acct-user/transmission-0 b/metadata/md5-cache/acct-user/transmission-0
deleted file mode 100644
index c6de3b44dbb4..000000000000
--- a/metadata/md5-cache/acct-user/transmission-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=System user: transmission
-EAPI=7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=acct-group/transmission
-SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=97dd9fc4552dd6b5db6b2939dcb78ff0
diff --git a/metadata/md5-cache/acct-user/transmission-1 b/metadata/md5-cache/acct-user/transmission-1
new file mode 100644
index 000000000000..702d4bb380bd
--- /dev/null
+++ b/metadata/md5-cache/acct-user/transmission-1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=System user: transmission
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/transmission
+SLOT=0
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=0b44ab1a37773fa981c764be3a1a84d7
diff --git a/metadata/md5-cache/acct-user/unrealircd-0 b/metadata/md5-cache/acct-user/unrealircd-0
index 7104a515d553..ab4e41de965e 100644
--- a/metadata/md5-cache/acct-user/unrealircd-0
+++ b/metadata/md5-cache/acct-user/unrealircd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/unrealircd
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=b186b3ee3ae34799a7b3a365e580b64c
diff --git a/metadata/md5-cache/acct-user/uptimed-0 b/metadata/md5-cache/acct-user/uptimed-0
index c3ba33ccabda..631b7fe27f67 100644
--- a/metadata/md5-cache/acct-user/uptimed-0
+++ b/metadata/md5-cache/acct-user/uptimed-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/uptimed
 SLOT=0
-_eclasses_=acct-user	40b4f7f2fc90566db9c17a13ef893243	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=51d9d153c86d94b7131084e6848be1f1
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 907cef5ea76e..bfd833f57e61 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.30.1 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.30.1
index 2958eb732a90..4195bab2d66b 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.30.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.30.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-accessibility/at-spi2-core-2.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.30/at-spi2-atk-2.30.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0c75daab0ae30b325a906784ddfa7dc
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.30.1 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.30.1
index a98719fbdace..5f2d9aa60575 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.30.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.30.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.30/at-spi2-core-2.30.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4dfae61017741a74e111c0c55a25b75
diff --git a/metadata/md5-cache/app-accessibility/festival-2.1-r1 b/metadata/md5-cache/app-accessibility/festival-2.1-r1
deleted file mode 100644
index 72f917072ff3..000000000000
--- a/metadata/md5-cache/app-accessibility/festival-2.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=~app-accessibility/speech-tools-2.1 >=sys-libs/ncurses-5.6-r2
-DESCRIPTION=Festival Text to Speech engine
-EAPI=2
-HOMEPAGE=http://www.cstr.ed.ac.uk/projects/festival/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=FESTIVAL HPND BSD rc regexp-UofT free-noncomm
-RDEPEND=~app-accessibility/speech-tools-2.1 >=sys-libs/ncurses-5.6-r2 media-sound/alsa-utils
-SLOT=0
-SRC_URI=http://www.festvox.org/packed/festival/2.1/festival-2.1-release.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_CMU.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_OALD.tar.gz http://www.festvox.org/packed/festival/2.1/festlex_POSLEX.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_awb_cg.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_rms_cg.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_cmu_us_slt_arctic_hts.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_rablpc16k.tar.gz http://www.festvox.org/packed/festival/2.1/festvox_kallpc16k.tar.gz http://www.festvox.org/packed/festival/2.1/speech_tools-2.1-release.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=21d0b3a89e0def8a62b1b9246c363f5b
diff --git a/metadata/md5-cache/app-accessibility/festival-fi-20041119 b/metadata/md5-cache/app-accessibility/festival-fi-20041119
deleted file mode 100644
index 5d078a8fb453..000000000000
--- a/metadata/md5-cache/app-accessibility/festival-fi-20041119
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Finnish diphones and text to speech script for festival
-EAPI=6
-HOMEPAGE=http://www.ling.helsinki.fi/suopuhe
-IUSE=perl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=app-accessibility/festival-1.96_beta dev-lang/perl
-SLOT=0
-SRC_URI=http://www.ling.helsinki.fi/suopuhe/download/hy_fi_mv_diphone-20041119.tgz http://phon.joensuu.fi/suopuhe/tulosaineisto/suo_fi_lj-1.0g-20051204.tgz http://www.ling.helsinki.fi/suopuhe/download/lavennin-20041119.tgz
-_md5_=fd95a5a0edd734635bbabb19a2620b55
diff --git a/metadata/md5-cache/app-accessibility/festival-freebsoft-utils-0.10 b/metadata/md5-cache/app-accessibility/festival-freebsoft-utils-0.10
deleted file mode 100644
index 0f6b7f394572..000000000000
--- a/metadata/md5-cache/app-accessibility/festival-freebsoft-utils-0.10
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=a collection of Festival functions for speech-dispatcher
-EAPI=4
-HOMEPAGE=http://www.freebsoft.org/festival-freebsoft-utils
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=app-accessibility/festival-1.4.3 media-sound/sox virtual/libiconv
-SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/festival-freebsoft-utils/festival-freebsoft-utils-0.10.tar.gz
-_md5_=bdc1960b17ae5a3519889b4ff883f8ab
diff --git a/metadata/md5-cache/app-accessibility/festival-freebsoft-utils-0.2 b/metadata/md5-cache/app-accessibility/festival-freebsoft-utils-0.2
deleted file mode 100644
index 68751e739504..000000000000
--- a/metadata/md5-cache/app-accessibility/festival-freebsoft-utils-0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=app-accessibility/festival-1.4.3
-DESCRIPTION=a collection of Festival functions for speech-dispatcher
-EAPI=0
-HOMEPAGE=http://www.freebsoft.org/festival-freebsoft-utils
-KEYWORDS=ppc x86
-LICENSE=GPL-2
-RDEPEND=>=app-accessibility/festival-1.4.3
-SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/festival-freebsoft-utils/festival-freebsoft-utils-0.2.tar.gz
-_md5_=91f70e8c880a0d57ec96bb86b03b7715
diff --git a/metadata/md5-cache/app-accessibility/festival-hts-2.1 b/metadata/md5-cache/app-accessibility/festival-hts-2.1
deleted file mode 100644
index a11f519fdf27..000000000000
--- a/metadata/md5-cache/app-accessibility/festival-hts-2.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTS voices for Festival
-EAPI=6
-HOMEPAGE=http://hts.sp.nitech.ac.jp/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/festival-1.96
-SLOT=0
-SRC_URI=http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_awb_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_bdl_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_clb_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_jmk_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_rms_arctic_hts-2.1.tar.bz2 http://hts.sp.nitech.ac.jp/archives/2.1/festvox_nitech_us_slt_arctic_hts-2.1.tar.bz2
-_md5_=a11215364cab7d6ec6dda0df611b135e
diff --git a/metadata/md5-cache/app-accessibility/festival-it-1.0-r2 b/metadata/md5-cache/app-accessibility/festival-it-1.0-r2
deleted file mode 100644
index c4f65090cbfc..000000000000
--- a/metadata/md5-cache/app-accessibility/festival-it-1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=A collection of italian voices for Festival TTS
-EAPI=4
-HOMEPAGE=http://www2.pd.istc.cnr.it/FESTIVAL/home
-IUSE=mbrola
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-accessibility/festival-2.1 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r4[l10n_it] )
-SLOT=0
-SRC_URI=mirror://sourceforge/it-festival/Italian-FESTIVAL.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=69fee88894df5ecc12343f13dcbfe474
diff --git a/metadata/md5-cache/app-accessibility/festival-ru-0.5 b/metadata/md5-cache/app-accessibility/festival-ru-0.5
deleted file mode 100644
index 8337581b0a87..000000000000
--- a/metadata/md5-cache/app-accessibility/festival-ru-0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Russian voices for Festival
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/festlang.berlios/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/festival-1.96_beta
-SLOT=0
-SRC_URI=mirror://sourceforge/project/festlang.berlios/msu_ru_nsh_clunits-0.5.tar.bz2
-_md5_=fcd3930f7ccb503093d7d84ea0a37c0c
diff --git a/metadata/md5-cache/app-accessibility/perlbox-voice-0.09-r2 b/metadata/md5-cache/app-accessibility/perlbox-voice-0.09-r2
deleted file mode 100644
index c15e3e55a3ee..000000000000
--- a/metadata/md5-cache/app-accessibility/perlbox-voice-0.09-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A voice enabled application to bring your desktop under your command
-EAPI=6
-HOMEPAGE=http://perlbox.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/Tk app-accessibility/sphinx2 app-accessibility/festival app-accessibility/mbrola
-SLOT=0
-SRC_URI=mirror://sourceforge/perlbox/perlbox-voice-0.09.noarch.tgz
-_md5_=73633848e089f3582f3e5ad480947bfd
diff --git a/metadata/md5-cache/app-accessibility/pidgin-festival-2.4 b/metadata/md5-cache/app-accessibility/pidgin-festival-2.4
deleted file mode 100644
index 71fa7da84436..000000000000
--- a/metadata/md5-cache/app-accessibility/pidgin-festival-2.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=app-accessibility/festival net-im/pidgin[gtk] x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=A plugin which enables text-to-speech output of conversations using festival
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/pidgin-festival/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=app-accessibility/festival net-im/pidgin[gtk] x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/pidgin-festival/pidgin-festival-2.4.tar.gz
-_md5_=df1ff6e8830bbe0b82a733cb5746fd95
diff --git a/metadata/md5-cache/app-accessibility/sound-icons-0.1 b/metadata/md5-cache/app-accessibility/sound-icons-0.1
index cfb6e37a628a..f2a6a81f6ecd 100644
--- a/metadata/md5-cache/app-accessibility/sound-icons-0.1
+++ b/metadata/md5-cache/app-accessibility/sound-icons-0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=a collection of Sound Icons for speech-dispatcher
-EAPI=0
+EAPI=7
 HOMEPAGE=http://www.freebsoft.org
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-accessibility/speech-dispatcher
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/sound-icons/sound-icons-0.1.tar.gz
-_md5_=2dcaabc6ab513048d18801487902ec20
+_md5_=b78c985b8482208b60598f1ec4896abc
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 92528c215fd4..ffe0ccfe7cf8 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.12 b/metadata/md5-cache/app-admin/ansible-2.7.12
deleted file mode 100644
index b7409e0255b6..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.7.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=7
-HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.7.12.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f17412c18b2fa596842cb635aae88465
diff --git a/metadata/md5-cache/app-admin/ansible-2.7.13 b/metadata/md5-cache/app-admin/ansible-2.7.13
index e59bc80a1b1c..2f74d337cc29 100644
--- a/metadata/md5-cache/app-admin/ansible-2.7.13
+++ b/metadata/md5-cache/app-admin/ansible-2.7.13
@@ -5,7 +5,7 @@ DESCRIPTION=Model-driven deployment, config management, and command execution fr
 EAPI=7
 HOMEPAGE=https://ansible.com/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible/ansible-2.7.13.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=00ae625629357bd1c36f973a124cedb2
+_md5_=f17412c18b2fa596842cb635aae88465
diff --git a/metadata/md5-cache/app-admin/ansible-2.8.2 b/metadata/md5-cache/app-admin/ansible-2.8.2
deleted file mode 100644
index aa86ee580059..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.8.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=7
-HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.8.2.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=87275482a0852f06e421ef6591a32dd6
diff --git a/metadata/md5-cache/app-admin/ansible-2.8.3 b/metadata/md5-cache/app-admin/ansible-2.8.3
deleted file mode 100644
index aaa4611959ed..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.8.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx-notfound-page[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=7
-HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.8.3.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b980d28ef675608eb48e7bee192ed2b1
diff --git a/metadata/md5-cache/app-admin/ansible-2.8.4 b/metadata/md5-cache/app-admin/ansible-2.8.4
index 6e18a6066f48..2863b1f1b6e1 100644
--- a/metadata/md5-cache/app-admin/ansible-2.8.4
+++ b/metadata/md5-cache/app-admin/ansible-2.8.4
@@ -5,7 +5,7 @@ DESCRIPTION=Model-driven deployment, config management, and command execution fr
 EAPI=7
 HOMEPAGE=https://ansible.com/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible/ansible-2.8.4.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b980d28ef675608eb48e7bee192ed2b1
+_md5_=2867c8c0a95d52060975b86beb782b61
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.39 b/metadata/md5-cache/app-admin/apache-tools-2.4.39
deleted file mode 100644
index 18405dc95cb3..000000000000
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.39
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/libtool
-DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
-EAPI=7
-HOMEPAGE=https://httpd.apache.org/
-IUSE=libressl ssl
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/httpd/httpd-2.4.39.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=42240db232b78fe20b574ccc8b13f8e8
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.41 b/metadata/md5-cache/app-admin/apache-tools-2.4.41
index c0c52d600ed9..c55fadf10c8c 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.41
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.41
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=7
 HOMEPAGE=https://httpd.apache.org/
 IUSE=libressl ssl
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.41.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7983de377dc03faa485c78175a5bbf36
+_md5_=44007cf09a10ffd075aa034fe36a2cb1
diff --git a/metadata/md5-cache/app-admin/consul-1.5.3 b/metadata/md5-cache/app-admin/consul-1.5.3
index 0758fda9086b..552208ed60e9 100644
--- a/metadata/md5-cache/app-admin/consul-1.5.3
+++ b/metadata/md5-cache/app-admin/consul-1.5.3
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v1.5.3.tar.gz -> consul-1.5.3.tar.gz
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=25283f0afcc1334d8a114dd1dc893abe
+_md5_=d204c3595d0577875eb97a8313116cd8
diff --git a/metadata/md5-cache/app-admin/consul-1.6.0 b/metadata/md5-cache/app-admin/consul-1.6.0
new file mode 100644
index 000000000000..b9ba44cc5010
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.6.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
+DEFINED_PHASES=compile install prepare setup unpack
+DEPEND=dev-go/gox >=dev-lang/go-1.11:= >=dev-go/go-tools-0_pre20160121
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=7
+HOMEPAGE=https://www.consul.io
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.6.0.tar.gz -> consul-1.6.0.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=247206ba26a3e0c2e29af0594761112f
diff --git a/metadata/md5-cache/app-admin/emacs-updater-1.16 b/metadata/md5-cache/app-admin/emacs-updater-1.16
new file mode 100644
index 000000000000..048b5ccd848e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/emacs-updater-1.16
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=|| ( sys-apps/util-linux app-misc/getopt )
+DESCRIPTION=Rebuild Emacs packages
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2+
+RDEPEND=|| ( sys-apps/util-linux app-misc/getopt ) >=app-portage/portage-utils-0.3 virtual/emacs
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-updater-1.16.tar.xz
+_md5_=ccd84b54e6e62fa8d802cc3745aef0b6
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.15 b/metadata/md5-cache/app-admin/eselect-1.4.15
new file mode 100644
index 000000000000..3e2593d4a154
--- /dev/null
+++ b/metadata/md5-cache/app-admin/eselect-1.4.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) doc? ( dev-python/docutils )
+DESCRIPTION=Gentoo's multi-purpose configuration and management tool
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
+IUSE=doc emacs vim-syntax
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
+PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
+RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.15.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ea7220498e202fb2f27f278c86a45bf8
diff --git a/metadata/md5-cache/app-admin/exo-1.4.1 b/metadata/md5-cache/app-admin/exo-1.4.1
deleted file mode 100644
index 3aa0a298a812..000000000000
--- a/metadata/md5-cache/app-admin/exo-1.4.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/go:=
-DESCRIPTION=Command-line tool for everything at Exoscale: compute, storage, dns.
-EAPI=7
-HOMEPAGE=https://exoscale.github.io/cli
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/exoscale/cli/archive/v1.4.1.tar.gz -> exo-1.4.1.tar.gz
-_md5_=6e13fa26f9aee1428d7782c0c1ad2182
diff --git a/metadata/md5-cache/app-admin/exo-1.5.0 b/metadata/md5-cache/app-admin/exo-1.5.0
new file mode 100644
index 000000000000..33002e5bf1bc
--- /dev/null
+++ b/metadata/md5-cache/app-admin/exo-1.5.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/go:=
+DESCRIPTION=Command-line tool for everything at Exoscale: compute, storage, dns.
+EAPI=7
+HOMEPAGE=https://exoscale.github.io/cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/exoscale/cli/archive/v1.5.0.tar.gz -> exo-1.5.0.tar.gz
+_md5_=6e13fa26f9aee1428d7782c0c1ad2182
diff --git a/metadata/md5-cache/app-admin/filebeat-5.6.13 b/metadata/md5-cache/app-admin/filebeat-5.6.13
index 40a20087e55a..b9dbd4d0961d 100644
--- a/metadata/md5-cache/app-admin/filebeat-5.6.13
+++ b/metadata/md5-cache/app-admin/filebeat-5.6.13
@@ -9,4 +9,4 @@ RDEPEND=!app-admin/filebeat-bin
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elastic/beats/archive/v5.6.13.tar.gz -> filebeat-5.6.13.tar.gz
-_md5_=cb24c2b369bbb3a5a80ef6fac6319734
+_md5_=62dabaed52b39f949b3881584b0ddc23
diff --git a/metadata/md5-cache/app-admin/gopass-1.8.3 b/metadata/md5-cache/app-admin/gopass-1.8.3
deleted file mode 100644
index 918e09f84c07..000000000000
--- a/metadata/md5-cache/app-admin/gopass-1.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=a simple but powerful password manager for the terminal
-EAPI=6
-HOMEPAGE=https://www.gopass.pw/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/gopasspw/gopass/archive/v1.8.3.tar.gz -> gopass-1.8.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=df00cf1362b16779fc1e4c2560e4ef7e
diff --git a/metadata/md5-cache/app-admin/gopass-1.8.4 b/metadata/md5-cache/app-admin/gopass-1.8.4
deleted file mode 100644
index 95864bba0fe7..000000000000
--- a/metadata/md5-cache/app-admin/gopass-1.8.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=a simple but powerful password manager for the terminal
-EAPI=6
-HOMEPAGE=https://www.gopass.pw/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/gopasspw/gopass/archive/v1.8.4.tar.gz -> gopass-1.8.4.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=813e93a516e62a49470114741e77e166
diff --git a/metadata/md5-cache/app-admin/gopass-1.8.6 b/metadata/md5-cache/app-admin/gopass-1.8.6
new file mode 100644
index 000000000000..ace7fab9d6f4
--- /dev/null
+++ b/metadata/md5-cache/app-admin/gopass-1.8.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=a simple but powerful password manager for the terminal
+EAPI=6
+HOMEPAGE=https://www.gopass.pw/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-vcs/git >=app-crypt/gnupg-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/gopasspw/gopass/archive/v1.8.6.tar.gz -> gopass-1.8.6.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=480f1e8e3ed7dd66348f08d47f8aa1b5
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.0.27 b/metadata/md5-cache/app-admin/kube-bench-0.0.27
deleted file mode 100644
index c0f9a84a348d..000000000000
--- a/metadata/md5-cache/app-admin/kube-bench-0.0.27
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Bench for Security runs the CIS Kubernetes Benchmark
-EAPI=6
-HOMEPAGE=https://github.com/aquasecurity/kube-bench
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/aquasecurity/kube-bench/archive/0.0.27.tar.gz -> kube-bench-0.0.27.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/go-yaml/yaml/archive/c95af922eae69f190717a0b7148960af8c55a072.tar.gz -> github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=03d80aeaf1a6e48e7181f510c484a695
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.0.28 b/metadata/md5-cache/app-admin/kube-bench-0.0.28
deleted file mode 100644
index e81ffeea0476..000000000000
--- a/metadata/md5-cache/app-admin/kube-bench-0.0.28
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Bench for Security runs the CIS Kubernetes Benchmark
-EAPI=6
-HOMEPAGE=https://github.com/aquasecurity/kube-bench
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.28.tar.gz -> kube-bench-0.0.28.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/go-yaml/yaml/archive/c95af922eae69f190717a0b7148960af8c55a072.tar.gz -> github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3e86b238d0b54f643d45b6909ea5ea13
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.0.30 b/metadata/md5-cache/app-admin/kube-bench-0.0.30
deleted file mode 100644
index ba2392dfef46..000000000000
--- a/metadata/md5-cache/app-admin/kube-bench-0.0.30
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Bench for Security runs the CIS Kubernetes Benchmark
-EAPI=6
-HOMEPAGE=https://github.com/aquasecurity/kube-bench
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.30.tar.gz -> kube-bench-0.0.30.tar.gz https://github.com/fatih/color/archive/v1.5.0.tar.gz -> github.com-fatih-color-v1.5.0.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/v1.0.0.tar.gz -> github.com-inconshreveable-mousetrap-v1.0.0.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/v1.1.0.tar.gz -> github.com-spf13-cast-v1.1.0.tar.gz https://github.com/spf13/cobra/archive/v0.0.1.tar.gz -> github.com-spf13-cobra-v0.0.1.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/v1.0.0.tar.gz -> github.com-spf13-viper-v1.0.0.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/17ff2d5776d2.tar.gz -> github.com-golang-text-17ff2d5776d2.tar.gz https://github.com/go-yaml/yaml/archive/v2.2.2.tar.gz -> github.com-go-yaml-yaml-v2.2.2.tar.gz https://github.com/kubernetes/client-go/archive/v10.0.0.tar.gz -> github.com-kubernetes-client-go-v10.0.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=00bd1592bea11defc19769d7a818d40a
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.0.34 b/metadata/md5-cache/app-admin/kube-bench-0.0.34
new file mode 100644
index 000000000000..d0231ecb57bc
--- /dev/null
+++ b/metadata/md5-cache/app-admin/kube-bench-0.0.34
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Bench for Security runs the CIS Kubernetes Benchmark
+EAPI=6
+HOMEPAGE=https://github.com/aquasecurity/kube-bench
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.34.tar.gz -> kube-bench-0.0.34.tar.gz https://github.com/fatih/color/archive/v1.5.0.tar.gz -> github.com-fatih-color-v1.5.0.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/v1.0.0.tar.gz -> github.com-inconshreveable-mousetrap-v1.0.0.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/v1.1.0.tar.gz -> github.com-spf13-cast-v1.1.0.tar.gz https://github.com/spf13/cobra/archive/v0.0.1.tar.gz -> github.com-spf13-cobra-v0.0.1.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/v1.0.0.tar.gz -> github.com-spf13-viper-v1.0.0.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/17ff2d5776d2.tar.gz -> github.com-golang-text-17ff2d5776d2.tar.gz https://github.com/go-yaml/yaml/archive/v2.2.2.tar.gz -> github.com-go-yaml-yaml-v2.2.2.tar.gz https://github.com/kubernetes/client-go/archive/v10.0.0.tar.gz -> github.com-kubernetes-client-go-v10.0.0.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=00bd1592bea11defc19769d7a818d40a
diff --git a/metadata/md5-cache/app-admin/logrotate-3.15.1 b/metadata/md5-cache/app-admin/logrotate-3.15.1
new file mode 100644
index 000000000000..94f371d4b909
--- /dev/null
+++ b/metadata/md5-cache/app-admin/logrotate-3.15.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=Rotates, compresses, and mails system logs
+EAPI=6
+HOMEPAGE=https://github.com/logrotate/logrotate
+IUSE=acl +cron selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )
+SLOT=0
+SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.15.1/logrotate-3.15.1.tar.gz -> logrotate-3.15.1.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=84cb60b82aa96699aeaf745a5249a7d2
diff --git a/metadata/md5-cache/app-admin/logrotate-3.9.1 b/metadata/md5-cache/app-admin/logrotate-3.9.1
deleted file mode 100644
index 944b7ac59740..000000000000
--- a/metadata/md5-cache/app-admin/logrotate-3.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) >=sys-apps/sed-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=Rotates, compresses, and mails system logs
-EAPI=5
-HOMEPAGE=https://github.com/logrotate/logrotate
-IUSE=acl +cron selinux
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )
-SLOT=0
-SRC_URI=mirror://gentoo/logrotate-3.9.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=73d865f5efae3460303a9e80a119da8a
diff --git a/metadata/md5-cache/app-admin/logstash-bin-6.8.1 b/metadata/md5-cache/app-admin/logstash-bin-6.8.1
index 473555de01dc..3f602abc006a 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-6.8.1
+++ b/metadata/md5-cache/app-admin/logstash-bin-6.8.1
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-6.8.1.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-6.8.1.tar.gz )
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=d44fe281105f9ab66b9d3063c1981c63
+_md5_=095e31a4af002f59792ac24e5d5abe67
diff --git a/metadata/md5-cache/app-admin/logstash-bin-7.2.0 b/metadata/md5-cache/app-admin/logstash-bin-7.2.0
index c27fe90acc24..1b211fb4b5e8 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-7.2.0
+++ b/metadata/md5-cache/app-admin/logstash-bin-7.2.0
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-7.2.0.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.2.0.tar.gz )
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=f8f132d75744731b47c5e090b8cd6281
+_md5_=0fba9988629bb49f974845c35ecd1689
diff --git a/metadata/md5-cache/app-admin/pass-otp-1.2.0 b/metadata/md5-cache/app-admin/pass-otp-1.2.0
index 52d23f1013ee..bfc3a8711523 100644
--- a/metadata/md5-cache/app-admin/pass-otp-1.2.0
+++ b/metadata/md5-cache/app-admin/pass-otp-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=A pass extension for managing one-time-password (OTP) tokens.
 EAPI=7
 HOMEPAGE=https://github.com/tadfisher/pass-otp
 IUSE=qrcode test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=app-admin/pass-1.7 sys-auth/oath-toolkit qrcode? ( media-gfx/qrencode )
 SLOT=0
 SRC_URI=https://github.com/tadfisher/pass-otp/releases/download/v1.2.0/pass-otp-1.2.0.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=51aabc09e582e25636b35440847760e4
+_md5_=380cafb5223cc50f50a7bb61063adebf
diff --git a/metadata/md5-cache/app-admin/puppet-6.4.2 b/metadata/md5-cache/app-admin/puppet-6.4.2
deleted file mode 100644
index 6a71afdea09a..000000000000
--- a/metadata/md5-cache/app-admin/puppet-6.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/mocha[ruby_targets_ruby25] dev-ruby/rack[ruby_targets_ruby25] dev-ruby/rspec-its[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=https://puppet.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=70c623682cd5484a872eb381e70de3f8
diff --git a/metadata/md5-cache/app-admin/puppet-6.7.2 b/metadata/md5-cache/app-admin/puppet-6.7.2
index 1f189231afe9..ed16285a1d96 100644
--- a/metadata/md5-cache/app-admin/puppet-6.7.2
+++ b/metadata/md5-cache/app-admin/puppet-6.7.2
@@ -4,7 +4,7 @@ DESCRIPTION=A system automation and configuration management software.
 EAPI=6
 HOMEPAGE=https://puppet.com/
 IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=Apache-2.0 GPL-2
 PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.7.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4e5230f206fcf1e1e66817ab80dd2e4e
+_md5_=70c623682cd5484a872eb381e70de3f8
diff --git a/metadata/md5-cache/app-admin/puppet-6.8.0 b/metadata/md5-cache/app-admin/puppet-6.8.0
new file mode 100644
index 000000000000..563c6816ddb6
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-6.8.0
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) test? ( dev-ruby/mocha[ruby_targets_ruby25] dev-ruby/rack[ruby_targets_ruby25] dev-ruby/rspec-its[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A system automation and configuration management software.
+EAPI=6
+HOMEPAGE=https://puppet.com/
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] dev-ruby/semantic_puppet[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25] dev-ruby/json:=[ruby_targets_ruby25] dev-ruby/semantic_puppet[ruby_targets_ruby25] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25] ) virtual/ruby-ssl[ruby_targets_ruby25] dev-ruby/hocon[ruby_targets_ruby25] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.8.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4e5230f206fcf1e1e66817ab80dd2e4e
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.4.2 b/metadata/md5-cache/app-admin/puppet-agent-6.4.2
deleted file mode 100644
index f39519cb231e..000000000000
--- a/metadata/md5-cache/app-admin/puppet-agent-6.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-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.4.2-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.4.2-1stretch_i386.deb )
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=6fec500f7f22479f58edda1fa128dd18
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.7.2 b/metadata/md5-cache/app-admin/puppet-agent-6.7.2
index b7a6daa23b89..c7ae492ac002 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.7.2
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.7.2
@@ -5,11 +5,11 @@ DESCRIPTION=general puppet client utils along with hiera and facter
 EAPI=7
 HOMEPAGE=https://puppetlabs.com/
 IUSE=puppetdb selinux
-KEYWORDS=~amd64 ~x86
+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.7.2-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.7.2-1stretch_i386.deb )
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=016066072d84907cd2a8cf6320d23290
+_md5_=6fec500f7f22479f58edda1fa128dd18
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.8.0 b/metadata/md5-cache/app-admin/puppet-agent-6.8.0
new file mode 100644
index 000000000000..554c47dbbeb6
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.8.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.8.0-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.8.0-1stretch_i386.deb )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=016066072d84907cd2a8cf6320d23290
diff --git a/metadata/md5-cache/app-admin/puppetdb-6.3.2 b/metadata/md5-cache/app-admin/puppetdb-6.3.2
deleted file mode 100644
index 38da75c714f2..000000000000
--- a/metadata/md5-cache/app-admin/puppetdb-6.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-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.3.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=f9c7186e96e99f02d8d5f1ba966f562e
diff --git a/metadata/md5-cache/app-admin/puppetdb-6.4.0 b/metadata/md5-cache/app-admin/puppetdb-6.4.0
index 13b438cea603..a2ffa4998769 100644
--- a/metadata/md5-cache/app-admin/puppetdb-6.4.0
+++ b/metadata/md5-cache/app-admin/puppetdb-6.4.0
@@ -3,10 +3,10 @@ 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
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-6.4.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=2dbd0a1d6c7f672e73a59b6c1237c488
+_md5_=f9c7186e96e99f02d8d5f1ba966f562e
diff --git a/metadata/md5-cache/app-admin/puppetdb-6.5.0 b/metadata/md5-cache/app-admin/puppetdb-6.5.0
new file mode 100644
index 000000000000..9fded2504681
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppetdb-6.5.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.5.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=2dbd0a1d6c7f672e73a59b6c1237c488
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.3.0 b/metadata/md5-cache/app-admin/puppetserver-6.3.0
deleted file mode 100644
index 8400c44517e6..000000000000
--- a/metadata/md5-cache/app-admin/puppetserver-6.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-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.3.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=19dff933218c6ba1970f0bdad067bf04
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.5.0 b/metadata/md5-cache/app-admin/puppetserver-6.5.0
index ff7c62857efc..0f08d991a9c6 100644
--- a/metadata/md5-cache/app-admin/puppetserver-6.5.0
+++ b/metadata/md5-cache/app-admin/puppetserver-6.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=Puppet Server is the next-generation application for managing Puppet
 EAPI=7
 HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
 IUSE=puppetdb
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.5.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=a99574843bbee27fb252e045def777a7
+_md5_=fa702ae8989388d55af3aa54db7f5997
diff --git a/metadata/md5-cache/app-admin/pwgen-2.07 b/metadata/md5-cache/app-admin/pwgen-2.07
deleted file mode 100644
index 3e3c838e74d2..000000000000
--- a/metadata/md5-cache/app-admin/pwgen-2.07
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Password Generator
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/pwgen/
-IUSE=livecd
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/pwgen/pwgen-2.07.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9a7600470fd4a5d5c92496ade908b8c7
diff --git a/metadata/md5-cache/app-admin/r10k-3.3.1 b/metadata/md5-cache/app-admin/r10k-3.3.1
new file mode 100644
index 000000000000..25b421ad5c04
--- /dev/null
+++ b/metadata/md5-cache/app-admin/r10k-3.3.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( ~dev-ruby/colored-1.2[ruby_targets_ruby24] ~dev-ruby/cri-2.15.6[ruby_targets_ruby24] >=dev-ruby/gettext-setup-0.24:0[ruby_targets_ruby24] ~dev-ruby/log4r-1.1.10[ruby_targets_ruby24] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby24] =dev-ruby/puppet_forge-2.3*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/colored-1.2[ruby_targets_ruby25] ~dev-ruby/cri-2.15.6[ruby_targets_ruby25] >=dev-ruby/gettext-setup-0.24:0[ruby_targets_ruby25] ~dev-ruby/log4r-1.1.10[ruby_targets_ruby25] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby25] =dev-ruby/puppet_forge-2.3*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/colored-1.2[ruby_targets_ruby26] ~dev-ruby/cri-2.15.6[ruby_targets_ruby26] >=dev-ruby/gettext-setup-0.24:0[ruby_targets_ruby26] ~dev-ruby/log4r-1.1.10[ruby_targets_ruby26] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby26] =dev-ruby/puppet_forge-2.3*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Puppet environment and module deployment
+EAPI=7
+HOMEPAGE=https://github.com/puppetlabs/r10k
+IUSE=+git test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby24? ( ~dev-ruby/colored-1.2[ruby_targets_ruby24] ~dev-ruby/cri-2.15.6[ruby_targets_ruby24] >=dev-ruby/gettext-setup-0.24:0[ruby_targets_ruby24] ~dev-ruby/log4r-1.1.10[ruby_targets_ruby24] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby24] =dev-ruby/puppet_forge-2.3*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/colored-1.2[ruby_targets_ruby25] ~dev-ruby/cri-2.15.6[ruby_targets_ruby25] >=dev-ruby/gettext-setup-0.24:0[ruby_targets_ruby25] ~dev-ruby/log4r-1.1.10[ruby_targets_ruby25] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby25] =dev-ruby/puppet_forge-2.3*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/colored-1.2[ruby_targets_ruby26] ~dev-ruby/cri-2.15.6[ruby_targets_ruby26] >=dev-ruby/gettext-setup-0.24:0[ruby_targets_ruby26] ~dev-ruby/log4r-1.1.10[ruby_targets_ruby26] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby26] =dev-ruby/puppet_forge-2.3*[ruby_targets_ruby26] ) git? ( >=dev-vcs/git-1.6.6 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_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/r10k-3.3.1.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=44ee6b4d6a6ed20c6de71fd0e0612bd5
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.1904.0 b/metadata/md5-cache/app-admin/rsyslog-8.1904.0
deleted file mode 100644
index 4d9b5b604d9a..000000000000
--- a/metadata/md5-cache/app-admin/rsyslog-8.1904.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=6
-HOMEPAGE=https://www.rsyslog.com/
-IUSE=curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq kernel_linux
-KEYWORDS=amd64 arm ~arm64 hppa x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 )
-REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.1904.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.1904.0.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1064c1b0643ea5fb36f84cb00773b977
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.1904.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.1904.0-r1
new file mode 100644
index 000000000000..d5ef6f3c3483
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.1904.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
+EAPI=6
+HOMEPAGE=https://www.rsyslog.com/
+IUSE=curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq kernel_linux
+KEYWORDS=amd64 arm ~arm64 hppa x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) 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.1904.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.1904.0.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cab5163d874fc7454b717417cd387061
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.1907.0 b/metadata/md5-cache/app-admin/rsyslog-8.1907.0
deleted file mode 100644
index 89b34a5e8048..000000000000
--- a/metadata/md5-cache/app-admin/rsyslog-8.1907.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
-EAPI=6
-HOMEPAGE=https://www.rsyslog.com/
-IUSE=curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa x86
-LICENSE=GPL-3 LGPL-3 Apache-2.0
-RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/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.1907.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.1907.0.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9d64c673f3c2336e50f51572c3d5674b
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.1907.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.1907.0-r1
new file mode 100644
index 000000000000..fafa0c3cef49
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.1907.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
+EAPI=6
+HOMEPAGE=https://www.rsyslog.com/
+IUSE=curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 hppa x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=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.1907.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.1907.0.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1f2355515aed7191d13ebf2ed37da86b
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.1908.0 b/metadata/md5-cache/app-admin/rsyslog-8.1908.0
new file mode 100644
index 000000000000..453a4bfd2684
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.1908.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
+EAPI=6
+HOMEPAGE=https://www.rsyslog.com/
+IUSE=curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=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.1908.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.1908.0.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1a06a19ffb72d27202c8a3028ad843df
diff --git a/metadata/md5-cache/app-admin/salt-2019.2.0 b/metadata/md5-cache/app-admin/salt-2019.2.0
deleted file mode 100644
index 180ca1fbf9e5..000000000000
--- a/metadata/md5-cache/app-admin/salt-2019.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pytest-salt-2018.12.8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-helpers-namespace[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-catchlog[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pip[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] !x86? ( >=dev-python/boto3-1.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/libnacl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.3[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/markupsafe[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) vim-syntax? ( app-vim/salt-vim ) )
-DESCRIPTION=Salt is a remote execution and configuration manager
-EAPI=7
-HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
-IUSE=cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova openssl portage profile redis selinux test timelib raet +zeromq vim-syntax python_targets_python2_7 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/libnacl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.3[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/markupsafe[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) vim-syntax? ( app-vim/salt-vim ) 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=|| ( raet zeromq ) || ( python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=x86? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/salt/salt-2019.2.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b115d322676333a93f8c806e6e3a3797
diff --git a/metadata/md5-cache/app-admin/salt-2019.2.0-r1 b/metadata/md5-cache/app-admin/salt-2019.2.0-r1
new file mode 100644
index 000000000000..0574e72ade02
--- /dev/null
+++ b/metadata/md5-cache/app-admin/salt-2019.2.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pytest-salt-2018.12.8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-helpers-namespace[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-catchlog[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pip[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] !x86? ( >=dev-python/boto3-1.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/libnacl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.3[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/markupsafe[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) vim-syntax? ( app-vim/salt-vim ) )
+DESCRIPTION=Salt is a remote execution and configuration manager
+EAPI=7
+HOMEPAGE=https://www.saltstack.com/resources/community/ https://github.com/saltstack
+IUSE=cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova openssl portage profile redis selinux test timelib raet +zeromq vim-syntax python_targets_python2_7 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/libnacl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.3[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/markupsafe[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) vim-syntax? ( app-vim/salt-vim ) 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=|| ( raet zeromq ) || ( python_targets_python2_7 python_targets_python3_6 )
+RESTRICT=x86? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/salt/salt-2019.2.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a664dc3f2c528c9697b894f03057cabf
diff --git a/metadata/md5-cache/app-admin/setools-4.2.1 b/metadata/md5-cache/app-admin/setools-4.2.1
index af240d1f5984..a2fd6f568142 100644
--- a/metadata/md5-cache/app-admin/setools-4.2.1
+++ b/metadata/md5-cache/app-admin/setools-4.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/setools/archive/4.2.1.tar.gz -> setools-4.2.1.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07546730a845a96c7b4fca2d7f4c04e2
+_md5_=855fe0294835ce74e5e68e94ba5ccf14
diff --git a/metadata/md5-cache/app-admin/setools-4.2.2 b/metadata/md5-cache/app-admin/setools-4.2.2
index 1db41a081480..904e90ec204f 100644
--- a/metadata/md5-cache/app-admin/setools-4.2.2
+++ b/metadata/md5-cache/app-admin/setools-4.2.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/setools/releases/download/4.2.2/setools-4.2.2.tar.bz2
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b702290ae46277543499dea1cc2f344f
+_md5_=c8325e9696055f1ae67741452d9d25d0
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.27-r1 b/metadata/md5-cache/app-admin/sudo-1.8.27-r1
index 3579311d4be2..0dab046fdeb2 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.27-r1
+++ b/metadata/md5-cache/app-admin/sudo-1.8.27-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=6
 HOMEPAGE=https://www.sudo.ws/
 IUSE=gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=sys-libs/zlib:= ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) sssd? ( sys-auth/sssd[sudo] ) system-digest? ( gcrypt? ( dev-libs/libgcrypt:= ) !gcrypt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.27.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.27.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6f3e12384998a21cd055cb30b08718f0
+_md5_=2adc035d8cbf90624198058c7d6ebbed
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.28_beta2 b/metadata/md5-cache/app-admin/sudo-1.8.28_beta2
deleted file mode 100644
index 820df6ab8504..000000000000
--- a/metadata/md5-cache/app-admin/sudo-1.8.28_beta2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/bison >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/zlib:= ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) sssd? ( sys-auth/sssd[sudo] ) system-digest? ( gcrypt? ( dev-libs/libgcrypt:= ) !gcrypt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=7
-HOMEPAGE=https://www.sudo.ws/
-IUSE=gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest
-LICENSE=ISC BSD
-RDEPEND=sys-libs/zlib:= ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) sssd? ( sys-auth/sssd[sudo] ) system-digest? ( gcrypt? ( dev-libs/libgcrypt:= ) !gcrypt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
-REQUIRED_USE=pam? ( !skey ) skey? ( !pam )
-SLOT=0
-SRC_URI=https://www.sudo.ws/sudo/dist/beta/sudo-1.8.28b2.tar.gz ftp://ftp.sudo.ws/pub/sudo/beta/sudo-1.8.28b2.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8254efba6226aa33a98b9ce5828404ac
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.28_beta3 b/metadata/md5-cache/app-admin/sudo-1.8.28_beta3
new file mode 100644
index 000000000000..b594db5fcdcf
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.8.28_beta3
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-libs/zlib:= ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) sssd? ( sys-auth/sssd[sudo] ) system-digest? ( gcrypt? ( dev-libs/libgcrypt:= ) !gcrypt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
+DESCRIPTION=Allows users or groups to run commands as other users
+EAPI=7
+HOMEPAGE=https://www.sudo.ws/
+IUSE=gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest
+LICENSE=ISC BSD
+RDEPEND=sys-libs/zlib:= ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) sssd? ( sys-auth/sssd[sudo] ) system-digest? ( gcrypt? ( dev-libs/libgcrypt:= ) !gcrypt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
+REQUIRED_USE=pam? ( !skey ) skey? ( !pam )
+SLOT=0
+SRC_URI=https://www.sudo.ws/sudo/dist/beta/sudo-1.8.28b3.tar.gz ftp://ftp.sudo.ws/pub/sudo/beta/sudo-1.8.28b3.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8254efba6226aa33a98b9ce5828404ac
diff --git a/metadata/md5-cache/app-admin/vault-1.2.2 b/metadata/md5-cache/app-admin/vault-1.2.2
new file mode 100644
index 000000000000..7260512e90dc
--- /dev/null
+++ b/metadata/md5-cache/app-admin/vault-1.2.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=>=dev-lang/go-1.11:= dev-go/gox filecaps? ( sys-libs/libcap )
+DESCRIPTION=A tool for managing secrets
+EAPI=7
+HOMEPAGE=https://vaultproject.io/
+IUSE=+webui +filecaps
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vault/archive/v1.2.2.tar.gz -> vault-1.2.2.tar.gz webui? ( mirror://gentoo/vault-1.2.2-webui.tar.xz https://dev.gentoo.org/~zmedico/dist/vault-1.2.2-webui.tar.xz )
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=8d5d45195b20b7af8d15fba108f519dd
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index e80fc6d60d81..92c82213a4ea 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.101.4 b/metadata/md5-cache/app-antivirus/clamav-0.101.4
new file mode 100644
index 000000000000..0c1611414420
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamav-0.101.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) >=sys-libs/zlib-1.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/libmspack xml? ( dev-libs/libxml2 ) elibc_musl? ( sys-libs/fts-standalone ) !!<app-antivirus/clamav-0.99 virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Clam Anti-Virus Scanner
+EAPI=6
+HOMEPAGE=https://www.clamav.net/
+IUSE=bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virtual/libiconv ) metadata-analysis-api? ( dev-libs/json-c:= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) >=sys-libs/zlib-1.2.2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/libtool || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/libmspack xml? ( dev-libs/libxml2 ) elibc_musl? ( sys-libs/fts-standalone ) !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
+SLOT=0
+SRC_URI=https://www.clamav.net/downloads/production/clamav-0.101.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=805cb3ed5c7f1c4dc20f6fe2875856fb
diff --git a/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.6.2 b/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.6.2
index 6253903b43e9..0d37f7835633 100644
--- a/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.6.2
+++ b/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.6.2
@@ -8,4 +8,4 @@ RDEPEND=app-crypt/gnupg dev-lang/perl net-dns/bind-tools || ( net-misc/wget net-
 SLOT=0
 SRC_URI=https://github.com/extremeshok/clamav-unofficial-sigs/archive/5.6.2.tar.gz -> clamav-unofficial-sigs-5.6.2.tar.gz
 _eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=47a93b823bbb1aeb447c7c6f54279cab
+_md5_=dac90635d7671743d0fbd45283cbb557
diff --git a/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-6.0.1 b/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-6.0.1
index d003e966f8e2..82aa64224739 100644
--- a/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-6.0.1
+++ b/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-6.0.1
@@ -8,4 +8,4 @@ RDEPEND=app-crypt/gnupg dev-lang/perl net-dns/bind-tools || ( net-misc/wget net-
 SLOT=0
 SRC_URI=https://github.com/extremeshok/clamav-unofficial-sigs/archive/6.0.1.tar.gz -> clamav-unofficial-sigs-6.0.1.tar.gz
 _eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=90dd54163ede1e4a277fc7c7dbdb9091
+_md5_=a22db3087179ab56e1c8b5cb07c29911
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 953dd61de2cb..a6a4c33715dc 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/bzip2-9999 b/metadata/md5-cache/app-arch/bzip2-9999
index 88af2452f2c7..10e003693156 100644
--- a/metadata/md5-cache/app-arch/bzip2-9999
+++ b/metadata/md5-cache/app-arch/bzip2-9999
@@ -7,5 +7,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 LICENSE=BZIP2
 PROPERTIES=live
 SLOT=0/1
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
 _md5_=4ac16fe7abdce0ee0d221563520d7f77
diff --git a/metadata/md5-cache/app-arch/file-roller-3.30.1 b/metadata/md5-cache/app-arch/file-roller-3.30.1
index 5520d9ab1325..ebcc8c3aa4d1 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.30.1
+++ b/metadata/md5-cache/app-arch/file-roller-3.30.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.36:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.13.2:3 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-2.22.2 ) packagekit? ( app-admin/packagekit-base )
 SLOT=0
 SRC_URI=mirror://gnome/sources/file-roller/3.30/file-roller-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e425a72d8c4d36e278c71da21a1b4861
diff --git a/metadata/md5-cache/app-arch/gcab-1.2 b/metadata/md5-cache/app-arch/gcab-1.2
index c065406a8118..319420f3d80b 100644
--- a/metadata/md5-cache/app-arch/gcab-1.2
+++ b/metadata/md5-cache/app-arch/gcab-1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gcab/1.2/gcab-1.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e891c6da18aa885dd6ca82139f6ab27
diff --git a/metadata/md5-cache/app-arch/libarchive-3.4.0 b/metadata/md5-cache/app-arch/libarchive-3.4.0
new file mode 100644
index 000000000000..ed1230110071
--- /dev/null
+++ b/metadata/md5-cache/app-arch/libarchive-3.4.0
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs ) )
+DESCRIPTION=Multi-format archive and compression library
+EAPI=7
+HOMEPAGE=https://www.libarchive.org/
+IUSE=acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD BSD-2 BSD-4 public-domain
+RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=test
+SLOT=0/13
+SRC_URI=https://www.libarchive.org/downloads/libarchive-3.4.0.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=7a0ef8231e9c90e499bedd36f0c63557
diff --git a/metadata/md5-cache/app-arch/lz4-1.9.2 b/metadata/md5-cache/app-arch/lz4-1.9.2
new file mode 100644
index 000000000000..4f4be574882c
--- /dev/null
+++ b/metadata/md5-cache/app-arch/lz4-1.9.2
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extremely Fast Compression algorithm
+EAPI=7
+HOMEPAGE=https://github.com/lz4/lz4
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2 GPL-2
+SLOT=0/r132
+SRC_URI=https://github.com/Cyan4973/lz4/archive/v1.9.2.tar.gz -> lz4-1.9.2.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=24774fdc4d588105ef8f9bab600f1de0
diff --git a/metadata/md5-cache/app-arch/mt-st-1.3 b/metadata/md5-cache/app-arch/mt-st-1.3
index 119915cd540e..3b9864cf982d 100644
--- a/metadata/md5-cache/app-arch/mt-st-1.3
+++ b/metadata/md5-cache/app-arch/mt-st-1.3
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/iustin/mt-st/releases/download/mt-st-1.3/mt-st-1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6dae3610c0f8baa8dfec95fb20654880
+_md5_=0613a13b608cc891b2a9c2620c72a123
diff --git a/metadata/md5-cache/app-arch/mt-st-9999 b/metadata/md5-cache/app-arch/mt-st-9999
index d2edde5af720..3b1e7192922f 100644
--- a/metadata/md5-cache/app-arch/mt-st-9999
+++ b/metadata/md5-cache/app-arch/mt-st-9999
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ff2e9e9d295fa94ce781257e1ece6e76
+_md5_=c97bcbbb91033f562d4b8885c1107f51
diff --git a/metadata/md5-cache/app-arch/pigz-2.4 b/metadata/md5-cache/app-arch/pigz-2.4
index 16169f6554a3..8873a6717ed7 100644
--- a/metadata/md5-cache/app-arch/pigz-2.4
+++ b/metadata/md5-cache/app-arch/pigz-2.4
@@ -4,11 +4,11 @@ DESCRIPTION=A parallel implementation of gzip
 EAPI=6
 HOMEPAGE=http://www.zlib.net/pigz/
 IUSE=static symlink test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris
 LICENSE=ZLIB
 RDEPEND=!static? ( sys-libs/zlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.zlib.net/pigz/pigz-2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=df26a0388c22d72a463d25ff1f5889a0
+_md5_=396e55474615785b7be4d6949ae88667
diff --git a/metadata/md5-cache/app-arch/pixz-1.0.6 b/metadata/md5-cache/app-arch/pixz-1.0.6
deleted file mode 100644
index b29f4b47ac39..000000000000
--- a/metadata/md5-cache/app-arch/pixz-1.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 ) static? ( >=app-arch/libarchive-2.8:=[static-libs(+)] >=app-arch/xz-utils-5[static-libs(+)] )
-DESCRIPTION=Parallel Indexed XZ compressor
-EAPI=6
-HOMEPAGE=https://github.com/vasi/pixz
-IUSE=static
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
-LICENSE=BSD-2
-RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
-SLOT=0
-SRC_URI=https://github.com/vasi/pixz/releases/download/v1.0.6/pixz-1.0.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0a940f391b034a333142c25da3e85ee5
diff --git a/metadata/md5-cache/app-arch/pixz-1.0.6-r1 b/metadata/md5-cache/app-arch/pixz-1.0.6-r1
new file mode 100644
index 000000000000..4b396f76fe21
--- /dev/null
+++ b/metadata/md5-cache/app-arch/pixz-1.0.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 ) static? ( >=app-arch/libarchive-2.8:=[static-libs(+)] >=app-arch/xz-utils-5[static-libs(+)] )
+DESCRIPTION=Parallel Indexed XZ compressor
+EAPI=6
+HOMEPAGE=https://github.com/vasi/pixz
+IUSE=static
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+LICENSE=BSD-2
+RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
+SLOT=0
+SRC_URI=https://github.com/vasi/pixz/releases/download/v1.0.6/pixz-1.0.6.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=591174c8b851b00c919dc8b5091370e3
diff --git a/metadata/md5-cache/app-arch/qpress-1.1 b/metadata/md5-cache/app-arch/qpress-1.1
index 5d6a52ba6e32..be68bfef2292 100644
--- a/metadata/md5-cache/app-arch/qpress-1.1
+++ b/metadata/md5-cache/app-arch/qpress-1.1
@@ -1,9 +1,11 @@
-DEFINED_PHASES=install prepare
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=configure install
 DESCRIPTION=A portable file archiver using QuickLZ algorithm
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.quicklz.com/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://www.quicklz.com/qpress-11-source.zip
-_md5_=e92ea3f4b9ee00f68149971605d30df1
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=88a838eb4f3d16bccf0b1ff0102f0f12
diff --git a/metadata/md5-cache/app-arch/rpm-4.14.2.1 b/metadata/md5-cache/app-arch/rpm-4.14.2.1
index 1ab99baf472c..1823eaafae7f 100644
--- a/metadata/md5-cache/app-arch/rpm-4.14.2.1
+++ b/metadata/md5-cache/app-arch/rpm-4.14.2.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.2.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=772656f30778cbf54e763490fb642410
+_md5_=c2a581908ef23b636ccdbad70528edcf
diff --git a/metadata/md5-cache/app-arch/unar-1.10.1 b/metadata/md5-cache/app-arch/unar-1.10.1
index 234fb547961c..b36056a6d66e 100644
--- a/metadata/md5-cache/app-arch/unar-1.10.1
+++ b/metadata/md5-cache/app-arch/unar-1.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/bzip2:= dev-libs/icu:= gnustep-base/gnustep-base sys-libs/zlib:= >=gnustep-base/gnustep-make-2.6.0[native-exceptions] sys-devel/gcc[objc]
+DEPEND=app-arch/bzip2:= dev-libs/icu:= gnustep-base/gnustep-base sys-libs/zlib:= app-arch/unzip >=gnustep-base/gnustep-make-2.6.0[native-exceptions] sys-devel/gcc[objc]
 DESCRIPTION=unpacker for various archiving formats, e.g. rar v3
 EAPI=6
 HOMEPAGE=https://unarchiver.c3.cx/
@@ -9,4 +9,4 @@ RDEPEND=app-arch/bzip2:= dev-libs/icu:= gnustep-base/gnustep-base sys-libs/zlib:
 SLOT=0
 SRC_URI=https://unarchiver.c3.cx/downloads/unar1.10.1_src.zip
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=385bd468d63b2816ee534d304e2d7f19
+_md5_=b95734d327ee0ac76156ba78dc8af775
diff --git a/metadata/md5-cache/app-arch/unrar-5.8.1 b/metadata/md5-cache/app-arch/unrar-5.8.1
new file mode 100644
index 000000000000..97144fba20ba
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unrar-5.8.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Uncompress rar files
+EAPI=7
+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.8.1.tar.gz -> unrar-5.8.1.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=3f7784d7001e09a5d6c3ad6b4f871f73
diff --git a/metadata/md5-cache/app-arch/unshield-1.4.3 b/metadata/md5-cache/app-arch/unshield-1.4.3
index 9f5a7cb26a5c..7c155a4ce101 100644
--- a/metadata/md5-cache/app-arch/unshield-1.4.3
+++ b/metadata/md5-cache/app-arch/unshield-1.4.3
@@ -11,4 +11,4 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sy
 SLOT=0
 SRC_URI=https://github.com/twogood/unshield/archive/1.4.3.tar.gz -> unshield-1.4.3.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5655d622e4e946284e6f794d9c7c598a
+_md5_=325a0ecea37c0c7cc786b13bb594e6cc
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 527881415c6f..4597d92acc17 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/borgbackup-1.1.10-r1 b/metadata/md5-cache/app-backup/borgbackup-1.1.10-r1
new file mode 100644
index 000000000000..e56acccf3095
--- /dev/null
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.10-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools_scm[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/msgpack-0.5.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
+EAPI=7
+HOMEPAGE=https://borgbackup.readthedocs.io/
+IUSE=libressl python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/msgpack-0.5.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.10.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=7036a2ff0f8d69a0f83988cf6fee2630
diff --git a/metadata/md5-cache/app-backup/borgbackup-9999 b/metadata/md5-cache/app-backup/borgbackup-9999
index 9def0f121729..a273e289222f 100644
--- a/metadata/md5-cache/app-backup/borgbackup-9999
+++ b/metadata/md5-cache/app-backup/borgbackup-9999
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-python/pkgconfig python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-python/setuptools_scm[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
@@ -11,4 +11,4 @@ RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targ
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9e9bb27d98dd7b5337e274562c2a350d
+_md5_=362eabe058b97d9cd13db72c23569499
diff --git a/metadata/md5-cache/app-backup/rdedup-1.0.2 b/metadata/md5-cache/app-backup/rdedup-1.0.2
index 176201fee92c..10dd74f06b81 100644
--- a/metadata/md5-cache/app-backup/rdedup-1.0.2
+++ b/metadata/md5-cache/app-backup/rdedup-1.0.2
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RDEPEND=>=dev-libs/libsodium-1.0.11
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/argparse/0.2.1/download -> argparse-0.2.1.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/flate2/0.2.17/download -> flate2-0.2.17.crate https://crates.io/api/v1/crates/fs2/0.2.5/download -> fs2-0.2.5.crate https://crates.io/api/v1/crates/gcc/0.3.43/download -> gcc-0.3.43.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.20/download -> libc-0.2.20.crate https://crates.io/api/v1/crates/libsodium-sys/0.0.12/download -> libsodium-sys-0.0.12.crate https://crates.io/api/v1/crates/log/0.3.6/download -> log-0.3.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/miniz-sys/0.1.9/download -> miniz-sys-0.1.9.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/rdedup-lib/1.0.2/download -> rdedup-lib-1.0.2.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/rollsum/0.2.1/download -> rollsum-0.2.1.crate https://crates.io/api/v1/crates/rpassword/0.2.3/download -> rpassword-0.2.3.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-serialize/0.3.22/download -> rustc-serialize-0.3.22.crate https://crates.io/api/v1/crates/serde/0.7.15/download -> serde-0.7.15.crate https://crates.io/api/v1/crates/sodiumoxide/0.0.12/download -> sodiumoxide-0.0.12.crate https://crates.io/api/v1/crates/termios/0.2.2/download -> termios-0.2.2.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/time/0.1.36/download -> time-0.1.36.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/rdedup/1.0.2/download -> rdedup-1.0.2.crate https://crates.io/api/v1/crates/rdedup-lib/1.0.2/download -> rdedup-lib-1.0.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.16/download -> redox_syscall-0.1.16.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=958dc843c0bb13509bff3a0c563d4bea
diff --git a/metadata/md5-cache/app-backup/rdumpfs-0.1 b/metadata/md5-cache/app-backup/rdumpfs-0.1
index e8e9f58b3cb7..43d578df0cd5 100644
--- a/metadata/md5-cache/app-backup/rdumpfs-0.1
+++ b/metadata/md5-cache/app-backup/rdumpfs-0.1
@@ -9,4 +9,4 @@ RDEPEND=net-misc/rsync[xattr?]
 SLOT=0
 SRC_URI=https://github.com/chneukirchen/rdumpfs/archive/v0.1.tar.gz -> rdumpfs-0.1.tar.gz
 _eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=7a6f9626218f2fc5b069264f93058b16
+_md5_=316c8a6ed3d85fd006cd050adf706525
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 48156e95c68b..bb03aac51761 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/sysbench-1.0.15 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.15
deleted file mode 100644
index e4adb7730b42..000000000000
--- a/metadata/md5-cache/app-benchmarks/sysbench-1.0.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool virtual/pkgconfig test? ( dev-util/cram ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=System performance benchmark
-EAPI=6
-HOMEPAGE=https://github.com/akopytov/sysbench
-IUSE=aio mysql postgres test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
-SLOT=0
-SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.15.tar.gz -> sysbench-1.0.15.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b2d658ea72de1dd8e81db7ff26054f79
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.15-r1 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.15-r1
new file mode 100644
index 000000000000..424bef677bae
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/sysbench-1.0.15-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=aio? ( dev-libs/libaio ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool virtual/pkgconfig test? ( dev-util/cram ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=System performance benchmark
+EAPI=6
+HOMEPAGE=https://github.com/akopytov/sysbench
+IUSE=aio mysql postgres test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=aio? ( dev-libs/libaio ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
+SLOT=0
+SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.15.tar.gz -> sysbench-1.0.15.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=91db1313386b0c0594e28a1bec56f45d
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.16 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.16
deleted file mode 100644
index 79a5affecd0d..000000000000
--- a/metadata/md5-cache/app-benchmarks/sysbench-1.0.16
+++ /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 test
-DEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool virtual/pkgconfig test? ( dev-util/cram )
-DESCRIPTION=System performance benchmark
-EAPI=7
-HOMEPAGE=https://github.com/akopytov/sysbench
-IUSE=aio mysql postgres test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
-SLOT=0
-SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.16.tar.gz -> sysbench-1.0.16.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=eceee1459374722268a07cefc22c79f0
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.16-r1 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.16-r1
new file mode 100644
index 000000000000..890614592b3b
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/sysbench-1.0.16-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DEPEND=aio? ( dev-libs/libaio ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool virtual/pkgconfig test? ( dev-util/cram )
+DESCRIPTION=System performance benchmark
+EAPI=7
+HOMEPAGE=https://github.com/akopytov/sysbench
+IUSE=aio mysql postgres test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=aio? ( dev-libs/libaio ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
+SLOT=0
+SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.16.tar.gz -> sysbench-1.0.16.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9a5220cb3b905b6c9e23fa01d2fd760c
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.17 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.17
deleted file mode 100644
index 4d597774eb0d..000000000000
--- a/metadata/md5-cache/app-benchmarks/sysbench-1.0.17
+++ /dev/null
@@ -1,15 +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 test
-DEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool virtual/pkgconfig test? ( dev-util/cram )
-DESCRIPTION=System performance benchmark
-EAPI=7
-HOMEPAGE=https://github.com/akopytov/sysbench
-IUSE=aio mysql postgres test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.17.tar.gz -> sysbench-1.0.17.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1413af9be86f9d57986e784ebfde2765
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.17-r1 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.17-r1
new file mode 100644
index 000000000000..584a064b5358
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/sysbench-1.0.17-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DEPEND=aio? ( dev-libs/libaio ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool virtual/pkgconfig test? ( dev-util/cram )
+DESCRIPTION=System performance benchmark
+EAPI=7
+HOMEPAGE=https://github.com/akopytov/sysbench
+IUSE=aio mysql postgres test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=aio? ( dev-libs/libaio ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.17.tar.gz -> sysbench-1.0.17.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=18249241680440135788194b661e96bb
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-9999 b/metadata/md5-cache/app-benchmarks/sysbench-9999
index b9af313071a1..8d104e46c375 100644
--- a/metadata/md5-cache/app-benchmarks/sysbench-9999
+++ b/metadata/md5-cache/app-benchmarks/sysbench-9999
@@ -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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare test unpack
-DEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool virtual/pkgconfig test? ( dev-util/cram )
+DEPEND=aio? ( dev-libs/libaio ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool virtual/pkgconfig test? ( dev-util/cram )
 DESCRIPTION=System performance benchmark
 EAPI=7
 HOMEPAGE=https://github.com/akopytov/sysbench
 IUSE=aio mysql postgres test
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
+RDEPEND=aio? ( dev-libs/libaio ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=93f5ba45362237ce3d1bf81e0cb281ad
+_md5_=22967f9ca2488dd46b4f39cc977aecee
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index ff93e0bb7b14..4089fd208051 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/bchunk-1.2.0-r4 b/metadata/md5-cache/app-cdr/bchunk-1.2.0-r4
index e79628e3c321..ea3827037900 100644
--- a/metadata/md5-cache/app-cdr/bchunk-1.2.0-r4
+++ b/metadata/md5-cache/app-cdr/bchunk-1.2.0-r4
@@ -6,4 +6,4 @@ KEYWORDS=amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-maco
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://he.fi/bchunk/bchunk-1.2.0.tar.gz
-_md5_=3617d162735c5ec89ee15b63541a9753
+_md5_=729cec6383a0dcf97f6fdab5a6730656
diff --git a/metadata/md5-cache/app-cdr/cdemu-3.2.2 b/metadata/md5-cache/app-cdr/cdemu-3.2.2
new file mode 100644
index 000000000000..187a0443c34e
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/cdemu-3.2.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-util/desktop-file-utils >=dev-util/intltool-0.21 >=sys-devel/gettext-0.18 virtual/pkgconfig
+DESCRIPTION=Command-line tool for controlling cdemu-daemon
+EAPI=7
+HOMEPAGE=http://cdemu.org
+IUSE=+cdemu-daemon python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/cdemu/cdemu-client-3.2.2.tar.bz2
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b147e563f0999396dc292ed4be796b15
diff --git a/metadata/md5-cache/app-cdr/cdemu-3.2.3 b/metadata/md5-cache/app-cdr/cdemu-3.2.3
new file mode 100644
index 000000000000..9640e93f67c3
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/cdemu-3.2.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-util/desktop-file-utils >=dev-util/intltool-0.21 >=sys-devel/gettext-0.18 virtual/pkgconfig
+DESCRIPTION=Command-line tool for controlling cdemu-daemon
+EAPI=7
+HOMEPAGE=https://cdemu.sourceforge.io
+IUSE=+cdemu-daemon python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://download.sourceforge.net/cdemu/cdemu-client/cdemu-client-3.2.3.tar.bz2
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=635c1df8d9348f6d87b129d8cf366b5e
diff --git a/metadata/md5-cache/app-cdr/cdemu-daemon-3.2.3 b/metadata/md5-cache/app-cdr/cdemu-daemon-3.2.3
new file mode 100644
index 000000000000..de20c87a2e4d
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/cdemu-daemon-3.2.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libmirage-3.2.0:= >=media-libs/libao-0.8.0:= dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Daemon of the CDEmu optical media image mounting suite
+EAPI=7
+HOMEPAGE=https://cdemu.sourceforge.io
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libmirage-3.2.0:= >=media-libs/libao-0.8.0:= sys-apps/dbus >=sys-fs/vhba-20130607
+SLOT=0/7
+SRC_URI=https://download.sourceforge.net/cdemu/cdemu-daemon/cdemu-daemon-3.2.3.tar.bz2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c21331dbf9a9ebc19e3f904e86fb3cb6
diff --git a/metadata/md5-cache/app-cdr/gcdemu-3.2.2 b/metadata/md5-cache/app-cdr/gcdemu-3.2.2
new file mode 100644
index 000000000000..a951cbc358a4
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/gcdemu-3.2.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-util/desktop-file-utils >=dev-util/intltool-0.21 sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Gtk+ GUI for controlling cdemu-daemon
+EAPI=7
+HOMEPAGE=http://cdemu.org/
+IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-cdr/cdemu-daemon:0/7 dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gnome-base/librsvg:2 x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection]
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/cdemu/gcdemu-3.2.2.tar.bz2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5c45ad6be45cb9a407d0e6ae0008c8c7
diff --git a/metadata/md5-cache/app-cdr/gcdemu-3.2.3 b/metadata/md5-cache/app-cdr/gcdemu-3.2.3
new file mode 100644
index 000000000000..912569a66ea7
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/gcdemu-3.2.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-util/desktop-file-utils >=dev-util/intltool-0.21 sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Gtk+ GUI for controlling cdemu-daemon
+EAPI=7
+HOMEPAGE=https://cdemu.sourceforge.io
+IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-cdr/cdemu-daemon:0/7 dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gnome-base/librsvg:2 x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection]
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://download.sourceforge.net/cdemu/gcdemu/gcdemu-3.2.3.tar.bz2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b6751d7ad8546dd8a642aeec1f275fc
diff --git a/metadata/md5-cache/app-cdr/isoimagewriter-0.8 b/metadata/md5-cache/app-cdr/isoimagewriter-0.8
new file mode 100644
index 000000000000..5b2237a68781
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/isoimagewriter-0.8
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-crypt/gpgme[cxx,qt5] virtual/libudev:= dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Write hybrid ISO files onto a USB disk
+EAPI=7
+HOMEPAGE=http://wiki.rosalab.com/en/index.php/Blog:ROSA_Planet/ROSA_Image_Writer
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-crypt/gpgme[cxx,qt5] virtual/libudev:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/unstable/isoimagewriter/0.8/isoimagewriter-0.8.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a116ae9e5da32a5708eba3fa47c459e6
diff --git a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r2 b/metadata/md5-cache/app-cdr/xbiso-0.6.1-r2
index 0efef344c22e..c244346d5a2a 100644
--- a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r2
+++ b/metadata/md5-cache/app-cdr/xbiso-0.6.1-r2
@@ -1,13 +1,11 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=ftp? ( <net-libs/ftplib-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
+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=Xbox xdvdfs ISO extraction utility
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/xbiso/
-IUSE=ftp
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
-RDEPEND=ftp? ( <net-libs/ftplib-4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xbiso/xbiso-0.6.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66f7969f9e4a7a4b8216b8d2df15f161
+_md5_=3ff035fe921d42a91653bf7f979652f6
diff --git a/metadata/md5-cache/app-cdr/xfburn-0.5.5-r1 b/metadata/md5-cache/app-cdr/xfburn-0.5.5-r1
index 7699b2761db1..468e27d19097 100644
--- a/metadata/md5-cache/app-cdr/xfburn-0.5.5-r1
+++ b/metadata/md5-cache/app-cdr/xfburn-0.5.5-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.32:= >=dev-libs/libburn-0.4.2:= >=dev-libs/libisofs-0.6.2:= >=x11-libs/gtk+-2.24:2= <xfce-base/exo-0.12.5-r100:= >=xfce-base/libxfce4ui-4.10:= gstreamer? ( media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= ) udev? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.32:= >=dev-libs/libburn-0.4.2:= >=dev-libs/libisofs-0.6.2:= >=x11-libs/gtk+-2.24:2= <xfce-base/exo-0.12.5-r100:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] gstreamer? ( media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= ) udev? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=GTK+ based CD and DVD burning application
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfburn
 IUSE=gstreamer +udev
 KEYWORDS=amd64 arm ~ppc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32:= >=dev-libs/libburn-0.4.2:= >=dev-libs/libisofs-0.6.2:= >=x11-libs/gtk+-2.24:2= <xfce-base/exo-0.12.5-r100:= >=xfce-base/libxfce4ui-4.10:= gstreamer? ( media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= ) udev? ( virtual/libgudev:= )
+RDEPEND=>=dev-libs/glib-2.32:= >=dev-libs/libburn-0.4.2:= >=dev-libs/libisofs-0.6.2:= >=x11-libs/gtk+-2.24:2= <xfce-base/exo-0.12.5-r100:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] gstreamer? ( media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= ) udev? ( virtual/libgudev:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfburn/0.5/xfburn-0.5.5.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e04a257bea90f4494ada54c7f6a3a69
+_md5_=2fbfc76047a0d3d9e47a2f142a6ade7d
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index b9f835a6a6b4..d528db97ff37 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.37.0 b/metadata/md5-cache/app-crypt/acme-0.37.0
index e3395351c997..22310e1fb5d6 100644
--- a/metadata/md5-cache/app-crypt/acme-0.37.0
+++ b/metadata/md5-cache/app-crypt/acme-0.37.0
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of the ACME protocol
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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/certbot/certbot/archive/v0.37.0.tar.gz -> certbot-0.37.0.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b6c4dd4d981e09d5f383f348e46c63fa
+_md5_=eb838983bc9366b9df45d3528ca83803
diff --git a/metadata/md5-cache/app-crypt/acme-0.38.0 b/metadata/md5-cache/app-crypt/acme-0.38.0
new file mode 100644
index 000000000000..1c18cc0424cf
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-0.38.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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/certbot/certbot/archive/v0.38.0.tar.gz -> certbot-0.38.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e8bbad4a91c25c7c97d58a67e390f60c
diff --git a/metadata/md5-cache/app-crypt/asekey-3.7 b/metadata/md5-cache/app-crypt/asekey-3.7
index 4d8c294a933d..d41e5f45d624 100644
--- a/metadata/md5-cache/app-crypt/asekey-3.7
+++ b/metadata/md5-cache/app-crypt/asekey-3.7
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD LGPL-2.1
 RDEPEND=sys-apps/pcsc-lite[udev] virtual/libusb:0
 SLOT=0
-SRC_URI=http://www.athena-scs.com//docs/reader-drivers/asekey-3-7-tar.bz2 -> asekey-3.7.tar.bz2
+SRC_URI=http://www.athena-scs.com/docs/reader-drivers/asekey-3-7-tar.bz2 -> asekey-3.7.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=771333b09b5fe3bcfca0fc1da7b145bd
+_md5_=73bf059896dbddd3b13422fd602253ab
diff --git a/metadata/md5-cache/app-crypt/certbot-0.37.0 b/metadata/md5-cache/app-crypt/certbot-0.37.0
index cd32e2ebed53..648e664ccf1a 100644
--- a/metadata/md5-cache/app-crypt/certbot-0.37.0
+++ b/metadata/md5-cache/app-crypt/certbot-0.37.0
@@ -5,11 +5,11 @@ DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.29.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/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/certbot/certbot/archive/v0.37.0.tar.gz -> certbot-0.37.0.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a70ce176b18e8421b39dba6fd970e7c8
+_md5_=20eeecc6c6813440a6cedb4311ebb3d4
diff --git a/metadata/md5-cache/app-crypt/certbot-0.38.0 b/metadata/md5-cache/app-crypt/certbot-0.38.0
new file mode 100644
index 000000000000..65768d871108
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-0.38.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.29.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/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-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/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/certbot/certbot/archive/v0.38.0.tar.gz -> certbot-0.38.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=fc2e34706bf53060670b4199e972d5da
diff --git a/metadata/md5-cache/app-crypt/certbot-9999 b/metadata/md5-cache/app-crypt/certbot-9999
index 34c952d3330e..cc6a91900527 100644
--- a/metadata/md5-cache/app-crypt/certbot-9999
+++ b/metadata/md5-cache/app-crypt/certbot-9999
@@ -7,8 +7,8 @@ HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.29.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/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.29.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/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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-1.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-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/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a70ce176b18e8421b39dba6fd970e7c8
+_md5_=fc2e34706bf53060670b4199e972d5da
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.37.0 b/metadata/md5-cache/app-crypt/certbot-apache-0.37.0
deleted file mode 100644
index c6cf835c3ee2..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-apache-0.37.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-0.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-0.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/certbot/certbot/archive/v0.37.0.tar.gz -> certbot-0.37.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c8ed0d33c5cbbd27b991e9a02841ca1f
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.37.2 b/metadata/md5-cache/app-crypt/certbot-apache-0.37.2
new file mode 100644
index 000000000000..93f77948827d
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.37.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-0.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-0.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/certbot/certbot/archive/v0.37.2.tar.gz -> certbot-0.37.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8c357e8c44f1dc8a8c0168d28c47927c
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.38.0 b/metadata/md5-cache/app-crypt/certbot-apache-0.38.0
new file mode 100644
index 000000000000..91ea973cf1b8
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.38.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-0.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-0.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-component[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/certbot/certbot/archive/v0.38.0.tar.gz -> certbot-0.38.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c8ed0d33c5cbbd27b991e9a02841ca1f
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.37.0 b/metadata/md5-cache/app-crypt/certbot-nginx-0.37.0
deleted file mode 100644
index d1917934ac2f..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-nginx-0.37.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-0.35.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/pyparsing-1.5.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(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/certbot/certbot/archive/v0.37.0.tar.gz -> certbot-0.37.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=811e21278dfdf0b71d5e7f2e579b050e
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.37.2 b/metadata/md5-cache/app-crypt/certbot-nginx-0.37.2
new file mode 100644
index 000000000000..a2f52fe3b2ea
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-0.37.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-0.35.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/pyparsing-1.5.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(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/certbot/certbot/archive/v0.37.2.tar.gz -> certbot-0.37.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=73a5448c06e2c4f0e17e7b96642c37c2
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.38.0 b/metadata/md5-cache/app-crypt/certbot-nginx-0.38.0
new file mode 100644
index 000000000000..711c3314054a
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-0.38.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.29.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(-)] >=app-crypt/certbot-0.35.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/pyparsing-1.5.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(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/certbot/certbot/archive/v0.38.0.tar.gz -> certbot-0.38.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=811e21278dfdf0b71d5e7f2e579b050e
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.6.0 b/metadata/md5-cache/app-crypt/heimdal-7.6.0
index f5824f844e65..1d42483fd2ee 100644
--- a/metadata/md5-cache/app-crypt/heimdal-7.6.0
+++ b/metadata/md5-cache/app-crypt/heimdal-7.6.0
@@ -11,4 +11,4 @@ RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x
 SLOT=0
 SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.6.0/heimdal-7.6.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=c957ab8363103f3accdc8b47760ac3fc
+_md5_=7ca0db2ec9b49e85ec943a8c86541d8e
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.7.0-r1 b/metadata/md5-cache/app-crypt/heimdal-7.7.0-r1
index 6cd98c5b51ae..d632c94a20a1 100644
--- a/metadata/md5-cache/app-crypt/heimdal-7.7.0-r1
+++ b/metadata/md5-cache/app-crypt/heimdal-7.7.0-r1
@@ -11,4 +11,4 @@ RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x
 SLOT=0
 SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.7.0/heimdal-7.7.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=e05313d429c8a92cace23314be6aa59a
+_md5_=e7a93416e434cb48006c3387ff7c6f8f
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.2.3-r1 b/metadata/md5-cache/app-crypt/nitrocli-0.2.3-r1
index 89d7fde86367..cc1a02386caf 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.2.3-r1
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.2.3-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/argparse/0.2.2/download -> argparse-0.2.2.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cc/1.0.28/download -> cc-1.0.28.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.47/download -> libc-0.2.47.crate https://crates.io/api/v1/crates/memchr/2.1.2/download -> memchr-2.1.2.crate https://crates.io/api/v1/crates/nitrocli/0.2.3/download -> nitrocli-0.2.3.crate https://crates.io/api/v1/crates/nitrokey/0.3.4/download -> nitrokey-0.3.4.crate https://crates.io/api/v1/crates/nitrokey-sys/3.4.3/download -> nitrokey-sys-3.4.3.crate https://crates.io/api/v1/crates/nitrokey-test/0.1.1/download -> nitrokey-test-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/0.4.24/download -> proc-macro2-0.4.24.crate https://crates.io/api/v1/crates/quote/0.6.10/download -> quote-0.6.10.crate https://crates.io/api/v1/crates/rand_core/0.3.0/download -> rand_core-0.3.0.crate https://crates.io/api/v1/crates/rand_os/0.1.1/download -> rand_os-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/regex/1.1.0/download -> regex-1.1.0.crate https://crates.io/api/v1/crates/regex-syntax/0.6.4/download -> regex-syntax-0.6.4.crate https://crates.io/api/v1/crates/syn/0.15.23/download -> syn-0.15.23.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=4488b532e30a242bafb1b42731c3697d
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.2.4 b/metadata/md5-cache/app-crypt/nitrocli-0.2.4
index 5117e210ff70..1c8557e8cce9 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.2.4
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.2.4
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/argparse/0.2.2/download -> argparse-0.2.2.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cc/1.0.37/download -> cc-1.0.37.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.57/download -> libc-0.2.57.crate https://crates.io/api/v1/crates/memchr/2.1.3/download -> memchr-2.1.3.crate https://crates.io/api/v1/crates/nitrocli/0.2.4/download -> nitrocli-0.2.4.crate https://crates.io/api/v1/crates/nitrokey/0.3.4/download -> nitrokey-0.3.4.crate https://crates.io/api/v1/crates/nitrokey-sys/3.4.3/download -> nitrokey-sys-3.4.3.crate https://crates.io/api/v1/crates/nitrokey-test/0.1.1/download -> nitrokey-test-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/0.4.26/download -> proc-macro2-0.4.26.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.0/download -> rand_core-0.4.0.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/regex/1.1.0/download -> regex-1.1.0.crate https://crates.io/api/v1/crates/regex-syntax/0.6.5/download -> regex-syntax-0.6.5.crate https://crates.io/api/v1/crates/syn/0.15.26/download -> syn-0.15.26.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=b08bfdf44737433d301b9370dfd933ef
diff --git a/metadata/md5-cache/app-crypt/seahorse-3.30.1.1 b/metadata/md5-cache/app-crypt/seahorse-3.30.1.1
index 0590b7576a59..cbaefd311d71 100644
--- a/metadata/md5-cache/app-crypt/seahorse-3.30.1.1
+++ b/metadata/md5-cache/app-crypt/seahorse-3.30.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=app-crypt/gcr-3.11.91:= >=app-crypt/gpgme-1.7.0 >=x11-libs/gtk+-3.22.0:3 >=app-crypt/gnupg-2.0.12 >=app-crypt/libsecret-0.16 net-misc/openssh ldap? ( net-nds/openldap:= ) >=net-libs/libsoup-2.33.92:2.4 zeroconf? ( >=net-dns/avahi-0.6:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/seahorse/3.30/seahorse-3.30.1.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fdf9a622cb9b96ba9e73b40bec75964d
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 1c6c6fff49d6..6f210da05fd0 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/gnome-dictionary-3.26.1 b/metadata/md5-cache/app-dicts/gnome-dictionary-3.26.1
index 011177da9671..c04b6a2d56c6 100644
--- a/metadata/md5-cache/app-dicts/gnome-dictionary-3.26.1
+++ b/metadata/md5-cache/app-dicts/gnome-dictionary-3.26.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.42:2 >=x11-libs/gtk+-3.21.2:3 gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-dictionary/3.26/gnome-dictionary-3.26.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=667dab73580f460cbec9cdcab772d6ac
diff --git a/metadata/md5-cache/app-dicts/mecab-unidic-2.1.2 b/metadata/md5-cache/app-dicts/mecab-unidic-2.1.2
index 78e47e31bc1d..0b8a353c62b9 100644
--- a/metadata/md5-cache/app-dicts/mecab-unidic-2.1.2
+++ b/metadata/md5-cache/app-dicts/mecab-unidic-2.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=-
-DEPEND=app-text/mecab
+DEPEND=app-arch/unzip app-text/mecab
 DESCRIPTION=IPA dictionary for MeCab
 EAPI=6
 HOMEPAGE=https://osdn.jp/projects/unidic/
@@ -7,4 +7,4 @@ KEYWORDS=~amd64
 LICENSE=|| ( BSD GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/unidic/58338/unidic-mecab-2.1.2_src.zip
-_md5_=17140555159260536d52167f3bdfc4d4
+_md5_=01e0a661c2a892cb9e435e58113b4588
diff --git a/metadata/md5-cache/app-dicts/myspell-cs-20110224 b/metadata/md5-cache/app-dicts/myspell-cs-20110224
index 8dfe12e7a3cf..4aba7612bea5 100644
--- a/metadata/md5-cache/app-dicts/myspell-cs-20110224
+++ b/metadata/md5-cache/app-dicts/myspell-cs-20110224
@@ -6,6 +6,6 @@ HOMEPAGE=http://www.liberix.cz/doplnky/slovniky/ooo/
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 MIT
 SLOT=0
-SRC_URI=http://www.liberix.cz/doplnky/slovniky/ooo//dict-cs-2.oxt -> myspell-cs-20110224.zip
+SRC_URI=http://www.liberix.cz/doplnky/slovniky/ooo/dict-cs-2.oxt -> myspell-cs-20110224.zip
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=cb57ff4a36c0b6034fb872367434bdf5
+_md5_=17f69b2b75d93dfad32d1505e7661d47
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 90cd45587190..248b2a120e35 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/diveintopython-2 b/metadata/md5-cache/app-doc/diveintopython-2
index 16291c9c29cd..64db8f3b311d 100644
--- a/metadata/md5-cache/app-doc/diveintopython-2
+++ b/metadata/md5-cache/app-doc/diveintopython-2
@@ -1,4 +1,5 @@
 DEFINED_PHASES=install
+DEPEND=app-arch/unzip
 DESCRIPTION='Dive Into Python' by Mark Pilgrim - Python 2
 EAPI=6
 HOMEPAGE=http://www.diveintopython.net/
@@ -7,4 +8,4 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=FDL-1.1
 SLOT=2
 SRC_URI=http://www.diveintopython.net/download/diveintopython-html-5.4.zip -> diveintopython-2.zip pdf? ( http://www.diveintopython.net/download/diveintopython-pdf-5.4.zip -> diveintopython-2-pdf.zip )
-_md5_=f9c811fbfe1b588ef881a0bb9336c4ca
+_md5_=9c9cee6c88556cb41c499991f7418456
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-3.2-r1 b/metadata/md5-cache/app-doc/gnucash-docs-3.2-r1
deleted file mode 100644
index ba47b92d4768..000000000000
--- a/metadata/md5-cache/app-doc/gnucash-docs-3.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Documentation package for GnuCash
-EAPI=6
-HOMEPAGE=http://www.gnucash.org/
-IUSE=l10n_C l10n_de l10n_it l10n_ja l10n_pt l10n_ru
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2 FDL-1.1
-SLOT=0
-SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/3.2.tar.gz -> gnucash-docs-3.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7d47c3117463c1acfaaddfc8f849b73
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-3.2-r2 b/metadata/md5-cache/app-doc/gnucash-docs-3.2-r2
new file mode 100644
index 000000000000..5fae5a95a3c9
--- /dev/null
+++ b/metadata/md5-cache/app-doc/gnucash-docs-3.2-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Documentation package for GnuCash
+EAPI=6
+HOMEPAGE=http://www.gnucash.org/
+IUSE=l10n_de l10n_it l10n_ja l10n_pt l10n_ru
+KEYWORDS=amd64 ~ppc ~ppc64 x86
+LICENSE=GPL-2 FDL-1.1
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/3.2.tar.gz -> gnucash-docs-3.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b4137515f166a4329f59132e16d25f6f
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-3.3 b/metadata/md5-cache/app-doc/gnucash-docs-3.3
deleted file mode 100644
index 0d4ebac37dee..000000000000
--- a/metadata/md5-cache/app-doc/gnucash-docs-3.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Documentation package for GnuCash
-EAPI=6
-HOMEPAGE=http://www.gnucash.org/
-IUSE=l10n_C l10n_de l10n_it l10n_ja l10n_pt l10n_ru
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 FDL-1.1
-SLOT=0
-SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/3.3.tar.gz -> gnucash-docs-3.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=97eb88fcf2d6f60cab858677a71ef201
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-3.3-r1 b/metadata/md5-cache/app-doc/gnucash-docs-3.3-r1
new file mode 100644
index 000000000000..359a197be172
--- /dev/null
+++ b/metadata/md5-cache/app-doc/gnucash-docs-3.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Documentation package for GnuCash
+EAPI=6
+HOMEPAGE=http://www.gnucash.org/
+IUSE=l10n_de l10n_it l10n_ja l10n_pt l10n_ru
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 FDL-1.1
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/3.3.tar.gz -> gnucash-docs-3.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b4c82c572f6a12d0edb8e152c8f6a2e4
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-3.4 b/metadata/md5-cache/app-doc/gnucash-docs-3.4
deleted file mode 100644
index b1a1b846066f..000000000000
--- a/metadata/md5-cache/app-doc/gnucash-docs-3.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Documentation package for GnuCash
-EAPI=6
-HOMEPAGE=http://www.gnucash.org/
-IUSE=l10n_C l10n_de l10n_it l10n_ja l10n_pt l10n_ru
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 FDL-1.1
-SLOT=0
-SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/3.4.tar.gz -> gnucash-docs-3.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=51d5d0a82e501e518950c86084f7b770
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-3.4-r1 b/metadata/md5-cache/app-doc/gnucash-docs-3.4-r1
new file mode 100644
index 000000000000..d00caca78537
--- /dev/null
+++ b/metadata/md5-cache/app-doc/gnucash-docs-3.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Documentation package for GnuCash
+EAPI=6
+HOMEPAGE=http://www.gnucash.org/
+IUSE=l10n_de l10n_it l10n_ja l10n_pt l10n_ru
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 FDL-1.1
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/3.4.tar.gz -> gnucash-docs-3.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=25b63512b3c4d1813b26489cad1c6898
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-3.5 b/metadata/md5-cache/app-doc/gnucash-docs-3.5
deleted file mode 100644
index eb75690a3a8e..000000000000
--- a/metadata/md5-cache/app-doc/gnucash-docs-3.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Documentation package for GnuCash
-EAPI=6
-HOMEPAGE=http://www.gnucash.org/
-IUSE=l10n_C l10n_de l10n_it l10n_ja l10n_pt l10n_ru
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 FDL-1.1
-SLOT=0
-SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/3.5.tar.gz -> gnucash-docs-3.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=51d5d0a82e501e518950c86084f7b770
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-3.5-r1 b/metadata/md5-cache/app-doc/gnucash-docs-3.5-r1
new file mode 100644
index 000000000000..45fe9fae0860
--- /dev/null
+++ b/metadata/md5-cache/app-doc/gnucash-docs-3.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Documentation package for GnuCash
+EAPI=6
+HOMEPAGE=http://www.gnucash.org/
+IUSE=l10n_de l10n_it l10n_ja l10n_pt l10n_ru
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 FDL-1.1
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/3.5.tar.gz -> gnucash-docs-3.5.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=25b63512b3c4d1813b26489cad1c6898
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 299bd2491a99..3719c1c1f081 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/e3-2.8.2 b/metadata/md5-cache/app-editors/e3-2.8.2
new file mode 100644
index 000000000000..6d1565e688fc
--- /dev/null
+++ b/metadata/md5-cache/app-editors/e3-2.8.2
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-lang/nasm-2.09.04
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Very tiny editor in ASM with emacs, pico, wordstar, and vi keybindings
+EAPI=7
+HOMEPAGE=https://sites.google.com/site/e3editor/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2+
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://sites.google.com/site/e3editor/Home/e3-2.82.tgz
+_md5_=546632bb3dbbe9e7d402081d071d86df
diff --git a/metadata/md5-cache/app-editors/emacs-18.59-r12 b/metadata/md5-cache/app-editors/emacs-18.59-r12
index b8bfcbd6e339..89367c38efa4 100644
--- a/metadata/md5-cache/app-editors/emacs-18.59-r12
+++ b/metadata/md5-cache/app-editors/emacs-18.59-r12
@@ -9,6 +9,6 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-1+ GPL-2+ BSD HPND
 RDEPEND=>=app-eselect/eselect-emacs-1.16 sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) X? ( x11-libs/libX11 )
 SLOT=18
-SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/emacs-18.59.tar.gz ftp://ftp.splode.com/pub/users/friedman/emacs/emacs-18.59-linux22x-elf-glibc21.diff.gz https://dev.gentoo.org/~ulm/emacs/emacs-18.59-patches-11.tar.xz
+SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/emacs-18.59.tar.gz ftp://ftp.splode.com/pub/users/friedman/emacs/emacs-18.59-linux22x-elf-glibc21.diff.gz https://dev.gentoo.org/~ulm/emacs/emacs-18.59-patches-12.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3b225bd63c3ba841eeef0ceb66103263
+_md5_=8f22fe9506375fe9b4cb2c455b36cbb1
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r5 b/metadata/md5-cache/app-editors/emacs-24.5-r5
deleted file mode 100644
index bfade81e35a7..000000000000
--- a/metadata/md5-cache/app-editors/emacs-24.5-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= <media-gfx/imagemagick-7:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) 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
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= <media-gfx/imagemagick-7:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !<app-editors/emacs-vcs-24.5
-REQUIRED_USE=?? ( aqua X )
-SLOT=24
-SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-4.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a74af085c4706ab51f9a10d1bc5a0eb5
diff --git a/metadata/md5-cache/app-editors/emacs-26.3 b/metadata/md5-cache/app-editors/emacs-26.3
new file mode 100644
index 000000000000..61b037d15417
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-26.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-base/xorg-proto )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !<app-editors/emacs-vcs-26.3
+REQUIRED_USE=?? ( aqua X )
+SLOT=26
+SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c03e32a515302f29855c25326cc3f510
diff --git a/metadata/md5-cache/app-editors/ersatz-emacs-20060515-r1 b/metadata/md5-cache/app-editors/ersatz-emacs-20060515-r1
new file mode 100644
index 000000000000..ecabe5c2f7c2
--- /dev/null
+++ b/metadata/md5-cache/app-editors/ersatz-emacs-20060515-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=A very minimal imitation of the famous GNU Emacs editor
+EAPI=7
+HOMEPAGE=https://web.archive.org/web/20171126221613/http://hunter.apana.org.au/~cjb/Code/
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=sys-libs/ncurses:0= !app-editors/ee
+SLOT=0
+SRC_URI=mirror://gentoo/ersatz-emacs-20060515.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e35140033f5f2d1e26ced2917c821dba
diff --git a/metadata/md5-cache/app-editors/gedit-3.32.2 b/metadata/md5-cache/app-editors/gedit-3.32.2
index f4a1d111c2a7..502201a14d3d 100644
--- a/metadata/md5-cache/app-editors/gedit-3.32.2
+++ b/metadata/md5-cache/app-editors/gedit-3.32.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-
 REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) spell? ( python )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gedit/3.32/gedit-3.32.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4e46f030e0825d40d2cc94df3a071ea
diff --git a/metadata/md5-cache/app-editors/ghex-3.18.4-r1 b/metadata/md5-cache/app-editors/ghex-3.18.4-r1
index 82da6e69cffe..288bbe46490c 100644
--- a/metadata/md5-cache/app-editors/ghex-3.18.4-r1
+++ b/metadata/md5-cache/app-editors/ghex-3.18.4-r1
@@ -4,11 +4,11 @@ DEPEND=>=dev-libs/atk-1.0.0 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3 de
 DESCRIPTION=GNOME hexadecimal editor
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Ghex
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/atk-1.0.0 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/ghex/3.18/ghex-3.18.4.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b0bf5dbc5eee99f3a1fe2089308d476
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b06f0fa4a7a5a01903d3daead42a8388
diff --git a/metadata/md5-cache/app-editors/ghostwriter-1.7.4-r1 b/metadata/md5-cache/app-editors/ghostwriter-1.7.4-r1
deleted file mode 100644
index eaf36cd70079..000000000000
--- a/metadata/md5-cache/app-editors/ghostwriter-1.7.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=app-text/hunspell dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5
-DESCRIPTION=Cross-platform, aesthetic, distraction-free markdown editor
-EAPI=7
-HOMEPAGE=https://wereturtle.github.io/ghostwriter/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=app-text/hunspell dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://github.com/wereturtle/ghostwriter/archive/v1.7.4.tar.gz -> ghostwriter-1.7.4.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8b22f0055799d637df33d1ee2f8317a
diff --git a/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3 b/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3
index 94855c7d7d61..7ef583eef9a3 100644
--- a/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3
+++ b/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 xpm? ( x11-libs/libXpm ) ) nanoemacs? ( !app-editors/ne )
 SLOT=0
 SRC_URI=http://www.jasspa.com/release_20090909/jasspa-mesrc-20091011.tar.gz !nanoemacs? ( http://www.jasspa.com/release_20090909/jasspa-memacros-20091017.tar.gz http://www.jasspa.com/release_20090909/jasspa-mehtml-20091011.tar.gz http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b88acd8cee25ffb5c2bf8943c4b5ce3f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4724408915858dbf1b9729787af9bce1
diff --git a/metadata/md5-cache/app-editors/jed-0.99.19-r1 b/metadata/md5-cache/app-editors/jed-0.99.19-r1
new file mode 100644
index 000000000000..f7deaf28d98b
--- /dev/null
+++ b/metadata/md5-cache/app-editors/jed-0.99.19-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=sys-libs/slang-2 gpm? ( sys-libs/gpm ) X? ( x11-libs/libX11 xft? ( >=media-libs/freetype-2 x11-libs/libXft ) ) X? ( x11-libs/libXt x11-base/xorg-proto )
+DESCRIPTION=Console S-Lang-based editor
+EAPI=7
+HOMEPAGE=http://www.jedsoft.org/jed/
+IUSE=X gpm xft
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2+
+RDEPEND=>=sys-libs/slang-2 gpm? ( sys-libs/gpm ) X? ( x11-libs/libX11 xft? ( >=media-libs/freetype-2 x11-libs/libXft ) )
+SLOT=0
+SRC_URI=ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-19.tar.bz2
+_md5_=e9f3eb1005351b3d276f12339d0bffc8
diff --git a/metadata/md5-cache/app-editors/jove-4.16.0.73 b/metadata/md5-cache/app-editors/jove-4.16.0.73
deleted file mode 100644
index 31e18549e69c..000000000000
--- a/metadata/md5-cache/app-editors/jove-4.16.0.73
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses virtual/pkgconfig
-DESCRIPTION=Jonathan's Own Version of Emacs, a light emacs-like editor without LISP bindings
-EAPI=4
-HOMEPAGE=ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/
-IUSE=doc
-KEYWORDS=amd64 ppc x86
-LICENSE=JOVE
-RDEPEND=sys-libs/ncurses
-SLOT=0
-SRC_URI=ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/jove4.16.0.73.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0f5832cf466402d06b6ce5ea2fdbc75e
diff --git a/metadata/md5-cache/app-editors/jove-4.16.0.73-r1 b/metadata/md5-cache/app-editors/jove-4.16.0.73-r1
index 4215f321d2a3..8849c53d37aa 100644
--- a/metadata/md5-cache/app-editors/jove-4.16.0.73-r1
+++ b/metadata/md5-cache/app-editors/jove-4.16.0.73-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Jonathan's Own Version of Emacs, a light emacs-like editor without L
 EAPI=7
 HOMEPAGE=ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=JOVE
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/jove4.16.0.73.tgz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=59dda64123491e3141b5f10c7a0ac7b3
+_md5_=0e048e1299ad161ef7950180847ee08a
diff --git a/metadata/md5-cache/app-editors/nano-4.4 b/metadata/md5-cache/app-editors/nano-4.4
new file mode 100644
index 000000000000..f3072e160c45
--- /dev/null
+++ b/metadata/md5-cache/app-editors/nano-4.4
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) ) static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) ) )
+DESCRIPTION=GNU GPL'd Pico clone with more functionality
+EAPI=7
+HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
+IUSE=debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
+SLOT=0
+SRC_URI=https://www.nano-editor.org/dist/v4/nano-4.4.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=cf2452976731e963c88b7c42accc39fa
diff --git a/metadata/md5-cache/app-editors/ne-3.1.1 b/metadata/md5-cache/app-editors/ne-3.1.1
index 493269291db5..52195ba369f8 100644
--- a/metadata/md5-cache/app-editors/ne-3.1.1
+++ b/metadata/md5-cache/app-editors/ne-3.1.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0=[tinfo?] dev-lang/perl
 SLOT=0
-SRC_URI=http://ne.di.unimi.it//ne-3.1.1.tar.gz
+SRC_URI=http://ne.di.unimi.it/ne-3.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3906e384cec294ef47a6b1f6f6779c7
+_md5_=81cb12c71fc18b265fe83ab42f25990e
diff --git a/metadata/md5-cache/app-editors/teco-1.00-r4 b/metadata/md5-cache/app-editors/teco-1.00-r4
deleted file mode 100644
index 8e15acdc2354..000000000000
--- a/metadata/md5-cache/app-editors/teco-1.00-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
-DESCRIPTION=Classic TECO editor, Predecessor to EMACS
-EAPI=5
-HOMEPAGE=http://www.ibiblio.org/pub/linux/apps/editors/tty/ http://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco
-IUSE=doc
-KEYWORDS=alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=freedist
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz doc? ( mirror://gentoo/tecolore.txt.gz mirror://gentoo/tech.txt.gz mirror://gentoo/teco.doc.gz mirror://gentoo/tecoprog.doc.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7cdf10c9a324f6d92a4173917c19fcbf
diff --git a/metadata/md5-cache/app-editors/teco-36_p19940820 b/metadata/md5-cache/app-editors/teco-36_p19940820
index 54acef9297da..7fdc587a597d 100644
--- a/metadata/md5-cache/app-editors/teco-36_p19940820
+++ b/metadata/md5-cache/app-editors/teco-36_p19940820
@@ -5,10 +5,10 @@ DESCRIPTION=Classic TECO editor, Predecessor to EMACS
 EAPI=7
 HOMEPAGE=http://www.ibiblio.org/pub/linux/apps/editors/tty/ http://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=freedist
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz -> teco-36_p19940820.tar.gz doc? ( https://dev.gentoo.org/~ulm/distfiles/tecodoc.tar.gz )
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f6be1c6c930001a1e54eef9028a086bf
+_md5_=3c49a166c77449877c4edeaaa9debc0e
diff --git a/metadata/md5-cache/app-editors/texworks-0.6.3 b/metadata/md5-cache/app-editors/texworks-0.6.3
index 4cf46b23c1e9..fc002e452554 100644
--- a/metadata/md5-cache/app-editors/texworks-0.6.3
+++ b/metadata/md5-cache/app-editors/texworks-0.6.3
@@ -5,11 +5,11 @@ DESCRIPTION=A simple interface for working with TeX documents
 EAPI=7
 HOMEPAGE=http://tug.org/texworks/
 IUSE=lua python python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtscript:5[scripttools] lua? ( dev-lang/lua:0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/TeXworks/texworks/archive/release-0.6.3.tar.gz -> texworks-0.6.3.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0ae594cf38f0eb6092c8dfe169778a4
+_md5_=b3685c5ac566225468c989b86503771a
diff --git a/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180719 b/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180719
index 400b6d4c4b23..d5050ef2c57d 100644
--- a/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180719
+++ b/metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180719
@@ -4,10 +4,10 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=uEmacs/PK is an enhanced version of MicroEMACS
 EAPI=7
 HOMEPAGE=https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=free-noncomm
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/uemacs-4.0.15_p20180719.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f70f924517afe482e38ff7f2fcffd8c2
+_md5_=6fef739d32609cf621fbe308192d2a0d
diff --git a/metadata/md5-cache/app-editors/wily-1.0-r2 b/metadata/md5-cache/app-editors/wily-1.0-r2
index b0a9878256a6..79558d55727e 100644
--- a/metadata/md5-cache/app-editors/wily-1.0-r2
+++ b/metadata/md5-cache/app-editors/wily-1.0-r2
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/9libs
 SLOT=0
 SRC_URI=https://www.netlib.org/research/9libs/wily-9libs.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0d75399cb2eaac7e6e2e776d49951f69
+_md5_=1389911fc33a3f7da6b25057a89971a4
diff --git a/metadata/md5-cache/app-editors/zile-2.4.14 b/metadata/md5-cache/app-editors/zile-2.4.14
index 9b55a687063d..505f23009dbe 100644
--- a/metadata/md5-cache/app-editors/zile-2.4.14
+++ b/metadata/md5-cache/app-editors/zile-2.4.14
@@ -4,11 +4,11 @@ DESCRIPTION=Zile is a small Emacs clone
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/zile/
 IUSE=acl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/boehm-gc-7.2:= sys-libs/ncurses:0= acl? ( virtual/acl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/zile/zile-2.4.14.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c5f3941b4acc4feb901c5b4fc69c16dd
+_md5_=8ad5e32150bf789bf4f7aab428dce431
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 3e04f094dbca..409a12c84dc0 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20120405 b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20120405
deleted file mode 100644
index 01433b6f5130..000000000000
--- a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20120405
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A major mode for GNU Emacs for editing Actionscript 3 files
-EAPI=4
-HOMEPAGE=https://github.com/austinhaas/actionscript-mode
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/austinhaas/actionscript-mode/tarball/aa7e63d566a815152e7e652010becd46a406abb2 -> actionscript-mode-7.2.2_p20120405.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=e0966953bb0ee16ca2ffabe326c95be6
diff --git a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527 b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
new file mode 100644
index 000000000000..c58034d20d5a
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=A major mode for GNU Emacs for editing Actionscript 3 files
+EAPI=7
+HOMEPAGE=https://github.com/austinhaas/actionscript-mode
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/austinhaas/actionscript-mode/archive/65abd58e198458a8e46748c5962c41d80d60c4ea.tar.gz -> actionscript-mode-7.2.2_p20180527.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=e6ea45c8f98d76fd35975669c93e9def
diff --git a/metadata/md5-cache/app-emacs/analog-1.9.99 b/metadata/md5-cache/app-emacs/analog-1.9.99
index 755a3e349321..2c336960860c 100644
--- a/metadata/md5-cache/app-emacs/analog-1.9.99
+++ b/metadata/md5-cache/app-emacs/analog-1.9.99
@@ -1,12 +1,12 @@
+BDEPEND=>=virtual/emacs-23
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
 DESCRIPTION=Monitor lists of files or command output
-EAPI=4
-HOMEPAGE=http://mph-emacs-pkgs.alioth.debian.org/AnalogEl.html
+EAPI=7
+HOMEPAGE=https://web.archive.org/web/20150919120435/http://mph-emacs-pkgs.alioth.debian.org/AnalogEl.html
 KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/analog-1.9.99.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=75f704bb9b2d72766e7d87f624b783d6
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=922905ad92a1fb4d4a4bef6c2b782c52
diff --git a/metadata/md5-cache/app-emacs/apache-mode-1.1 b/metadata/md5-cache/app-emacs/apache-mode-1.1
deleted file mode 100644
index bd8b9fc46d6f..000000000000
--- a/metadata/md5-cache/app-emacs/apache-mode-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Major mode for editing Apache configuration files
-EAPI=4
-HOMEPAGE=http://www.keelhaul.me.uk/linux/#apachemode
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/apache-mode-1.1.el.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=ab97577be0a372ee3bc4f90f14faa3f1
diff --git a/metadata/md5-cache/app-emacs/apache-mode-2.2.0 b/metadata/md5-cache/app-emacs/apache-mode-2.2.0
index 550318d2fd01..18eb9d34bca5 100644
--- a/metadata/md5-cache/app-emacs/apache-mode-2.2.0
+++ b/metadata/md5-cache/app-emacs/apache-mode-2.2.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Major mode for editing Apache configuration files
 EAPI=7
 HOMEPAGE=https://github.com/emacs-php/apache-mode
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/emacs-php/apache-mode/archive/2.2.0.tar.gz -> apache-mode-2.2.0.tar.gz
 _eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=66279cc210459d43589fe204a085ab2f
+_md5_=9014031c259b08e4280c27eddfc7ae53
diff --git a/metadata/md5-cache/app-emacs/apel-10.8_p20190407 b/metadata/md5-cache/app-emacs/apel-10.8_p20190407
index 264d35699438..0e59970fa713 100644
--- a/metadata/md5-cache/app-emacs/apel-10.8_p20190407
+++ b/metadata/md5-cache/app-emacs/apel-10.8_p20190407
@@ -9,4 +9,4 @@ RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/wanderlust/apel/archive/d146ddbf8818e81d3577d5eee7825d377bec0c73.tar.gz -> apel-10.8_p20190407.tar.gz
 _eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=2fdbceee060694e303c67211607db00c
+_md5_=38c16dbe679c1e939d0aab9a1636cd4f
diff --git a/metadata/md5-cache/app-emacs/auctex-12.1-r1 b/metadata/md5-cache/app-emacs/auctex-12.1-r1
new file mode 100644
index 000000000000..342bdb7c7ebf
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/auctex-12.1-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-24
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Extensible package for writing and formatting TeX files in Emacs
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/auctex/
+IUSE=preview-latex
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+LICENSE=GPL-3+ FDL-1.3+
+RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-24
+SLOT=0
+SRC_URI=mirror://gnu/auctex/auctex-12.1.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=cd8deb389af022223b67285533d1d800
diff --git a/metadata/md5-cache/app-emacs/autoconf-mode-2.69 b/metadata/md5-cache/app-emacs/autoconf-mode-2.69
deleted file mode 100644
index 9b042ad1391a..000000000000
--- a/metadata/md5-cache/app-emacs/autoconf-mode-2.69
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major modes for editing autoconf and autotest input
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=6883968e48b6cdb41ed513afc0e82ae0
diff --git a/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1 b/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
new file mode 100644
index 000000000000..c84fe7f2a92a
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Emacs major modes for editing autoconf and autotest input
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=9742209413a91c496eebe0fea9320c50
diff --git a/metadata/md5-cache/app-emacs/bbdb-2.35-r1 b/metadata/md5-cache/app-emacs/bbdb-2.35-r1
deleted file mode 100644
index 34a1b4da6203..000000000000
--- a/metadata/md5-cache/app-emacs/bbdb-2.35-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=The Insidious Big Brother Database
-EAPI=4
-HOMEPAGE=http://bbdb.sourceforge.net/
-IUSE=tex
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2+ Texinfo-manual
-RDEPEND=tex? ( virtual/tex-base ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://bbdb.sourceforge.net/bbdb-2.35.tar.gz http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/point-at.el http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/dates.el
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=c7c46092f21d39aef87dd8af20b24bca
diff --git a/metadata/md5-cache/app-emacs/bbdb-3.1.2 b/metadata/md5-cache/app-emacs/bbdb-3.1.2
deleted file mode 100644
index 08cb4d1c7e81..000000000000
--- a/metadata/md5-cache/app-emacs/bbdb-3.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=tex? ( virtual/tex-base ) vm? ( app-emacs/vm ) >=virtual/emacs-23 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The Insidious Big Brother Database
-EAPI=5
-HOMEPAGE=https://savannah.nongnu.org/projects/bbdb/
-IUSE=tex vm
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-3+ GPL-1+ FDL-1.3+
-RDEPEND=tex? ( virtual/tex-base ) vm? ( app-emacs/vm ) >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/bbdb/bbdb-3.1.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c5d64fbd5cc261242cd6c4bdb4690a31
diff --git a/metadata/md5-cache/app-emacs/bbdb-3.1.2-r1 b/metadata/md5-cache/app-emacs/bbdb-3.1.2-r1
new file mode 100644
index 000000000000..154a5c5d6587
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/bbdb-3.1.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=vm? ( app-emacs/vm ) >=virtual/emacs-23 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=The Insidious Big Brother Database
+EAPI=7
+HOMEPAGE=https://savannah.nongnu.org/projects/bbdb/
+IUSE=tex vm
+KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=GPL-3+ GPL-1+ FDL-1.3+
+RDEPEND=vm? ( app-emacs/vm ) tex? ( virtual/tex-base ) >=virtual/emacs-23
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.savannah.gnu.org/releases/bbdb/bbdb-3.1.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=27eb84331619eccf9ff3e7efaf5d5a84
diff --git a/metadata/md5-cache/app-emacs/binclock-1.11 b/metadata/md5-cache/app-emacs/binclock-1.11
new file mode 100644
index 000000000000..6b84805645e2
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/binclock-1.11
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Display the current time using a binary clock
+EAPI=7
+HOMEPAGE=http://www.davep.org/emacs/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/davep/binclock.el/archive/v1.11.tar.gz -> binclock-1.11.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=8f04ab3f0d8b20437db0dabded846107
diff --git a/metadata/md5-cache/app-emacs/bongo-1.1 b/metadata/md5-cache/app-emacs/bongo-1.1
new file mode 100644
index 000000000000..8319f2d1498c
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/bongo-1.1
@@ -0,0 +1,13 @@
+BDEPEND=app-emacs/volume sys-apps/texinfo >=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Buffer-oriented media player for Emacs
+EAPI=7
+HOMEPAGE=https://www.emacswiki.org/emacs/Bongo
+IUSE=mplayer
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ FDL-1.2+
+RDEPEND=app-emacs/volume >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/dbrock/bongo/archive/1.1.tar.gz -> bongo-1.1.tar.gz mplayer? ( mirror://gentoo/bongo-mplayer-20070204.tar.bz2 )
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=71c654d9d1d75d8b68daa86b08e67684
diff --git a/metadata/md5-cache/app-emacs/bongo-20110621 b/metadata/md5-cache/app-emacs/bongo-20110621
deleted file mode 100644
index a4171f20259b..000000000000
--- a/metadata/md5-cache/app-emacs/bongo-20110621
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/volume sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Buffer-oriented media player for Emacs
-EAPI=5
-HOMEPAGE=http://www.brockman.se/software/bongo/
-IUSE=mplayer
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ FDL-1.2+
-RDEPEND=app-emacs/volume >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/bongo-20110621.tar.xz mplayer? ( mirror://gentoo/bongo-mplayer-20070204.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5f0bf496d9ab7628f9cc714088551254
diff --git a/metadata/md5-cache/app-emacs/browse-kill-ring-1.3c b/metadata/md5-cache/app-emacs/browse-kill-ring-1.3c
index 741c2a897570..94ba66df427f 100644
--- a/metadata/md5-cache/app-emacs/browse-kill-ring-1.3c
+++ b/metadata/md5-cache/app-emacs/browse-kill-ring-1.3c
@@ -4,9 +4,9 @@ DESCRIPTION=An improved interface to kill-ring
 EAPI=4
 HOMEPAGE=https://www.emacswiki.org/emacs/BrowseKillRing https://github.com/T-J-Teru/browse-kill-ring
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/browse-kill-ring-1.3c.el.bz2
 _eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=be646652641940aa5dc7128e2f3358a1
+_md5_=217c8dd94c2f1d2549821ac5f889acbd
diff --git a/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0 b/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0
new file mode 100644
index 000000000000..e55073e9ae23
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=An improved interface to kill-ring
+EAPI=7
+HOMEPAGE=https://www.emacswiki.org/emacs/BrowseKillRing https://github.com/browse-kill-ring/browse-kill-ring
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/browse-kill-ring/browse-kill-ring/archive/2.0.0.tar.gz -> browse-kill-ring-2.0.0.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=e8cce377e266a6ecc29a5ea15aa18920
diff --git a/metadata/md5-cache/app-emacs/calfw-1.6 b/metadata/md5-cache/app-emacs/calfw-1.6
new file mode 100644
index 000000000000..585678d4972e
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/calfw-1.6
@@ -0,0 +1,13 @@
+BDEPEND=howm? ( app-emacs/howm ) >=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=A calendar framework for Emacs
+EAPI=7
+HOMEPAGE=https://github.com/kiwanami/emacs-calfw
+IUSE=howm
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=howm? ( app-emacs/howm ) >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/kiwanami/emacs-calfw/archive/v1.6.tar.gz -> calfw-1.6.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=39c928de96cdb0ec10e4c0aa9b786aa2
diff --git a/metadata/md5-cache/app-emacs/df-mode-20050509 b/metadata/md5-cache/app-emacs/df-mode-20050509
deleted file mode 100644
index f17044f2c503..000000000000
--- a/metadata/md5-cache/app-emacs/df-mode-20050509
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Minor mode to show space left on devices in the mode line
-EAPI=4
-HOMEPAGE=https://web.archive.org/web/20061001221337/http://www.coli.uni-saarland.de/~fouvry/software.html https://www.emacswiki.org/emacs/DfMode
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/df-mode-20050509.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=9bbc4fbdede67fdfe43d2becb8296e58
diff --git a/metadata/md5-cache/app-emacs/df-mode-20050509-r1 b/metadata/md5-cache/app-emacs/df-mode-20050509-r1
new file mode 100644
index 000000000000..b475f99164c3
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/df-mode-20050509-r1
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Minor mode to show space left on devices in the mode line
+EAPI=7
+HOMEPAGE=https://web.archive.org/web/20061001221337/http://www.coli.uni-saarland.de/~fouvry/software.html https://www.emacswiki.org/emacs/DfMode
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=mirror://gentoo/df-mode-20050509.el.bz2
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=9d0cfa22df387422eb3c3b3c23065f41
diff --git a/metadata/md5-cache/app-emacs/distel-4.1.1 b/metadata/md5-cache/app-emacs/distel-4.1.1
new file mode 100644
index 000000000000..2da2ece7965b
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/distel-4.1.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/erlang-11.2.5[emacs] >=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Distributed Emacs Lisp for Erlang
+EAPI=7
+HOMEPAGE=https://massemanet.github.io/distel/ https://www.emacswiki.org/emacs/DistributedEmacsLisp
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD MIT
+RDEPEND=>=dev-lang/erlang-11.2.5[emacs] >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/massemanet/distel/archive/4.1.1.tar.gz -> distel-4.1.1.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=8bbad2669cec464d5be5b9ed3114bc73
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.47 b/metadata/md5-cache/app-emacs/ebuild-mode-1.47
index ac3898df383e..7d945f1ec77d 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.47
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.47
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.47.tar.xz
 _eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=6ead25a47faac32c200bc51a26064252
+_md5_=9a0d8ebb7868dba1079b3782cdcbf268
diff --git a/metadata/md5-cache/app-emacs/elscreen-20180321 b/metadata/md5-cache/app-emacs/elscreen-20180321
new file mode 100644
index 000000000000..c23e3fef1181
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/elscreen-20180321
@@ -0,0 +1,13 @@
+BDEPEND=wanderlust? ( app-emacs/wanderlust ) >=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Frame configuration management for GNU Emacs modelled after GNU Screen
+EAPI=7
+HOMEPAGE=https://www.emacswiki.org/emacs/EmacsLispScreen https://github.com/knu/elscreen
+IUSE=wanderlust
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=wanderlust? ( app-emacs/wanderlust ) >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/knu/elscreen/archive/20180321.tar.gz -> elscreen-20180321.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=6c74efa88945c09264057a8ce6acc1f4
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
new file mode 100644
index 000000000000..1fc0b6df24fb
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst setup
+DESCRIPTION=Common files needed by all GNU Emacs versions
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+IUSE=games 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 ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3+
+PDEPEND=virtual/emacs
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.6.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8d2a442b04c2b7697ac90c2e56238a31
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r2 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r2
deleted file mode 100644
index c04be02a26fd..000000000000
--- a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=games? ( acct-group/gamestat )
-DESCRIPTION=Common files needed by all GNU Emacs versions
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-IUSE=games X
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3+
-PDEPEND=virtual/emacs
-RDEPEND=games? ( acct-group/gamestat )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a30366481a63544904f6d41c0306ca05
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r3 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r3
new file mode 100644
index 000000000000..b71b6fdddf6a
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=games? ( acct-group/gamestat )
+DESCRIPTION=Common files needed by all GNU Emacs versions
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+IUSE=games X
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3+
+PDEPEND=virtual/emacs
+RDEPEND=games? ( acct-group/gamestat )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.6.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=84ff9ac51c3ad01bcee65af124907bf0
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.15 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.15
new file mode 100644
index 000000000000..3d9a96c936ab
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.15
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-23
+DESCRIPTION=Emacs major mode for editing eselect files
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.15.tar.xz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=a0e2f8c2c900a15d68eeccb41818f323
diff --git a/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526 b/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
index 93615a43b45e..e58d5a701fc3 100644
--- a/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
+++ b/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
@@ -4,10 +4,10 @@ DEPEND=>=app-emacs/apel-10.8
 DESCRIPTION=A library to provide basic features about message representation or encoding
 EAPI=7
 HOMEPAGE=https://github.com/wanderlust/flim
-KEYWORDS=alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 !app-emacs/limit >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/wanderlust/flim/archive/e4bd54fd7d335215b54f7ef27ed974c8cd68d472.tar.gz -> flim-1.14.9_p20190526.tar.gz
 _eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=00fd5163162850c73fc33f3c08d6f32c
+_md5_=afa62858b3f7815c7b8e2e11b83c3512
diff --git a/metadata/md5-cache/app-emacs/google-c-style-20091009-r1 b/metadata/md5-cache/app-emacs/google-c-style-20091009-r1
index f0806edfa4c0..ca24f933993e 100644
--- a/metadata/md5-cache/app-emacs/google-c-style-20091009-r1
+++ b/metadata/md5-cache/app-emacs/google-c-style-20091009-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Provides the google C/C++ coding style
 EAPI=4
 HOMEPAGE=https://github.com/google/styleguide
 KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/google-c-style-20091009.tar.bz2
 _eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=bee802399350b6667d0152ca4a2e277c
+_md5_=f5f4df922a23cdcab3cfcafa622f5b94
diff --git a/metadata/md5-cache/app-emacs/google-c-style-20140929 b/metadata/md5-cache/app-emacs/google-c-style-20140929
new file mode 100644
index 000000000000..100a90d40f71
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/google-c-style-20140929
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Provides the google C/C++ coding style
+EAPI=7
+HOMEPAGE=https://github.com/google/styleguide
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-1+ Artistic )
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/google-c-style-20140929.el.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=1226815b2749b18e28de71123a7118b5
diff --git a/metadata/md5-cache/app-emacs/htmlize-1.43 b/metadata/md5-cache/app-emacs/htmlize-1.43
deleted file mode 100644
index ee7a6281f8e1..000000000000
--- a/metadata/md5-cache/app-emacs/htmlize-1.43
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=HTML-ize font-lock buffers in Emacs
-EAPI=4
-HOMEPAGE=https://www.emacswiki.org/emacs/Htmlize http://fly.srk.fer.hr/~hniksic/emacs/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/htmlize-1.43.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=b473dcc8260b44e56ffe5fb92afec84e
diff --git a/metadata/md5-cache/app-emacs/htmlize-1.54 b/metadata/md5-cache/app-emacs/htmlize-1.54
new file mode 100644
index 000000000000..af27515a60cb
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/htmlize-1.54
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=HTML-ize font-lock buffers in Emacs
+EAPI=7
+HOMEPAGE=https://www.emacswiki.org/emacs/Htmlize https://github.com/hniksic/emacs-htmlize
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/hniksic/emacs-htmlize/archive/release/1.54.tar.gz -> htmlize-1.54.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=f1416b665bda247f0fadb9f5031bb399
diff --git a/metadata/md5-cache/app-emacs/ledger-mode-3.1.1 b/metadata/md5-cache/app-emacs/ledger-mode-3.1.1
index 6191599382f8..f06e85a34f5a 100644
--- a/metadata/md5-cache/app-emacs/ledger-mode-3.1.1
+++ b/metadata/md5-cache/app-emacs/ledger-mode-3.1.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=An Emacs major mode for editing ledger files
 EAPI=7
 HOMEPAGE=https://github.com/ledger/ledger-mode
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ BSD
 RDEPEND=!<app-office/ledger-3.1.2[emacs(-)] >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger-mode/archive/v3.1.1.tar.gz -> ledger-mode-3.1.1.tar.gz
 _eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=f1e9a3f241aa2c41901a99fcf8e5bf45
+_md5_=ed80baa66e1aac1716bf72854d6e0bca
diff --git a/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209 b/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
new file mode 100644
index 000000000000..3cd1dfabd837
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
@@ -0,0 +1,12 @@
+BDEPEND=sys-apps/texinfo >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=An interface to search CD-ROM books and network dictionaries
+EAPI=7
+HOMEPAGE=https://lookup2.github.io/lookup2/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/lookup2/lookup2/archive/c4f4986aac6c339e03b9e56a5dfc7c8f5c0bb5e0.tar.gz -> lookup-1.99.96_pre20180209.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=84ad96d2ad8edc2c753b5688061fc94b
diff --git a/metadata/md5-cache/app-emacs/mew-6.5 b/metadata/md5-cache/app-emacs/mew-6.5
deleted file mode 100644
index 6eaa80b3099d..000000000000
--- a/metadata/md5-cache/app-emacs/mew-6.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-libs/zlib >=virtual/emacs-23
-DESCRIPTION=Great MIME mail reader for Emacs/XEmacs
-EAPI=4
-HOMEPAGE=http://www.mew.org/
-IUSE=ssl l10n_ja
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib ssl? ( net-misc/stunnel ) >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.mew.org/Release/mew-6.5.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=725eefd02e6e75a1c7e7a57aff4df574
diff --git a/metadata/md5-cache/app-emacs/mew-6.8 b/metadata/md5-cache/app-emacs/mew-6.8
new file mode 100644
index 000000000000..51259c7c1e10
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/mew-6.8
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/emacs-24
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=sys-libs/zlib
+DESCRIPTION=Great MIME mail reader for Emacs/XEmacs
+EAPI=7
+HOMEPAGE=https://www.mew.org/
+IUSE=ssl l10n_ja
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=BSD
+RDEPEND=sys-libs/zlib ssl? ( net-misc/stunnel ) >=virtual/emacs-24
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.mew.org/Release/mew-6.8.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=4e00a32d212b3f703bb8db3dab5d504c
diff --git a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2 b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2
new file mode 100644
index 000000000000..e8f906fdf4bc
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=An Emacs Lisp interface to the MLDonkey core
+EAPI=7
+HOMEPAGE=https://www.emacswiki.org/emacs/MlDonkey http://web.archive.org/web/20070107165326/www.physik.fu-berlin.de/~dhansen/mldonkey/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/mldonkey-el-0.0.4b.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=6e4fd8a0ad385fbc6e1b55bf2783a5dc
diff --git a/metadata/md5-cache/app-emacs/mmm-mode-0.5.7 b/metadata/md5-cache/app-emacs/mmm-mode-0.5.7
new file mode 100644
index 000000000000..450897e867e7
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/mmm-mode-0.5.7
@@ -0,0 +1,12 @@
+BDEPEND=sys-apps/texinfo >=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Enables the user to edit different parts of a file in different major modes
+EAPI=7
+HOMEPAGE=http://mmm-mode.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2+ Texinfo-manual
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/purcell/mmm-mode/archive/0.5.7.tar.gz -> mmm-mode-0.5.7.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=29cda52d9d89e9fb6bee09bc6e9f0f5f
diff --git a/metadata/md5-cache/app-emacs/muse-3.20 b/metadata/md5-cache/app-emacs/muse-3.20
index 7f2c80371ec1..381211e11818 100644
--- a/metadata/md5-cache/app-emacs/muse-3.20
+++ b/metadata/md5-cache/app-emacs/muse-3.20
@@ -1,14 +1,13 @@
+BDEPEND=>=virtual/emacs-23
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=test? ( app-emacs/htmlize ) >=virtual/emacs-23
 DESCRIPTION=An authoring and publishing environment for Emacs
-EAPI=4
-HOMEPAGE=http://mwolson.org/projects/EmacsMuse.html
-IUSE=test
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs-muse/
 KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=GPL-3 FDL-1.2 GPL-2 MIT
+LICENSE=GPL-3+ FDL-1.2+ GPL-2 MIT
 RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.gna.org/muse-el/muse-3.20.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=786cec026029bd3dcad409eacfa548ed
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=d5895126e7f2ac923f8e71a386723fff
diff --git a/metadata/md5-cache/app-emacs/nagios-mode-0.3 b/metadata/md5-cache/app-emacs/nagios-mode-0.3
deleted file mode 100644
index e9ffd7c4aab6..000000000000
--- a/metadata/md5-cache/app-emacs/nagios-mode-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Major mode for editing Nagios configuration files
-EAPI=4
-HOMEPAGE=http://michael.orlitzky.com/code/nagios-mode.php
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://michael.orlitzky.com/code/releases/nagios-mode-0.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=5aa3ef0fb9e20d021d212835860a5b5d
diff --git a/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1 b/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1
new file mode 100644
index 000000000000..f403e61f62ea
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Major mode for editing Nagios configuration files
+EAPI=7
+HOMEPAGE=http://michael.orlitzky.com/code/nagios-mode.php
+KEYWORDS=amd64 x86 ~x86-fbsd
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=http://michael.orlitzky.com/code/releases/nagios-mode-0.3.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=10eeec30800214c86bebbee3b1700ccb
diff --git a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-20080922 b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-20080922
deleted file mode 100644
index b6cadc74e0ec..000000000000
--- a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-20080922
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Add support for DocBook 5 schemas to NXML
-EAPI=4
-HOMEPAGE=http://www.docbook.org/schemas/5x.html
-KEYWORDS=amd64 x86
-LICENSE=HPND
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.docbook.org/xml/5.0/rng/docbookxi.rnc
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=a85f9f24520d9c2f44c2008d4d215a1c
diff --git a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0 b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0
new file mode 100644
index 000000000000..c48fcf3a8518
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Add support for DocBook 5 schemas to NXML
+EAPI=7
+HOMEPAGE=https://docbook.org/schemas/5x.html
+KEYWORDS=amd64 x86
+LICENSE=HPND
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://docbook.org/xml/5.0/rng/docbookxi.rnc -> docbookxi-5.0.rnc
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=719e1af9bd0b431db9e5af672913bd04
diff --git a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1 b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1
new file mode 100644
index 000000000000..a35e1a4cfe3e
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Add support for DocBook 5 schemas to NXML
+EAPI=7
+HOMEPAGE=https://docbook.org/schemas/5x.html
+KEYWORDS=~amd64 ~x86
+LICENSE=HPND
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://docbook.org/xml/5.1/rng/docbookxi.rnc -> docbookxi-5.1.rnc
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=de247933d3787de21aab71a9ea272606
diff --git a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-0.9.7 b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-0.9.7
deleted file mode 100644
index 0f7e1f68fe1a..000000000000
--- a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-0.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-text/trang >=virtual/emacs-23
-DESCRIPTION=Extension for nxml-mode with libvirt schemas
-EAPI=4
-HOMEPAGE=http://www.libvirt.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://libvirt.org/sources/libvirt-0.9.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a81945731cb659d17938e5be416f6834
diff --git a/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123 b/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123
index 79de071837b7..29434df3bd24 100644
--- a/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123
+++ b/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-text/trang >=virtual/emacs-23
+DEPEND=app-arch/unzip app-text/trang >=virtual/emacs-23
 DESCRIPTION=Extension for nxml-mode with SVG 1.1 schemas
 EAPI=4
 HOMEPAGE=http://www.w3.org/TR/SVG11/
@@ -9,4 +9,4 @@ RDEPEND=>=virtual/emacs-23
 SLOT=1.1
 SRC_URI=http://www.flameeyes.eu/gentoo-distfiles/w3c-svg-rng-1.1.20081123.zip
 _eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=4beb092b9449b517a8894a3ded799f47
+_md5_=ae44e986a887ae91347b7cd55fe3b8d2
diff --git a/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1 b/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1
deleted file mode 100644
index b0c2f9705642..000000000000
--- a/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs mode for OCaml
-EAPI=4
-HOMEPAGE=http://www.ocaml.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://caml.inria.fr/distrib/ocaml-3.12/ocaml-3.12.1.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=c9d57ce29db7be196ab7606b037fa77c
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.0.4 b/metadata/md5-cache/app-emacs/org-mode-9.0.4
deleted file mode 100644
index f141e94007da..000000000000
--- a/metadata/md5-cache/app-emacs/org-mode-9.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=doc? ( virtual/texi2dvi ) >=virtual/emacs-24
-DESCRIPTION=An Emacs mode for notes and project planning
-EAPI=6
-HOMEPAGE=https://www.orgmode.org/
-IUSE=contrib doc odt-schema
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )
-RDEPEND=>=virtual/emacs-24
-RESTRICT=test
-SLOT=0
-SRC_URI=http://orgmode.org/org-9.0.4.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=333be05cf5593ba73f84af361938e32f
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.2.6 b/metadata/md5-cache/app-emacs/org-mode-9.2.6
new file mode 100644
index 000000000000..89679eadb8f2
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/org-mode-9.2.6
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( virtual/texi2dvi ) >=virtual/emacs-24
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=An Emacs mode for notes and project planning
+EAPI=7
+HOMEPAGE=https://www.orgmode.org/
+IUSE=contrib doc odt-schema
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos
+LICENSE=GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )
+RDEPEND=>=virtual/emacs-24
+RESTRICT=test
+SLOT=0
+SRC_URI=http://orgmode.org/org-9.2.6.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=ecb4290edca58d4d9e3738ff2b57bd5f
diff --git a/metadata/md5-cache/app-emacs/popwin-1.0.0 b/metadata/md5-cache/app-emacs/popwin-1.0.0
new file mode 100644
index 000000000000..4d2f0781e87a
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/popwin-1.0.0
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Popup window manager for Emacs
+EAPI=7
+HOMEPAGE=https://github.com/m2ym/popwin-el
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-23
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/m2ym/popwin-el/archive/v1.0.0.tar.gz -> popwin-1.0.0.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=5c43cabeca2c46d5ddc270e090a292aa
diff --git a/metadata/md5-cache/app-emacs/pov-mode-3.3 b/metadata/md5-cache/app-emacs/pov-mode-3.3
deleted file mode 100644
index fef4b67fc5f4..000000000000
--- a/metadata/md5-cache/app-emacs/pov-mode-3.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Emacs mode for povray
-EAPI=4
-HOMEPAGE=http://gitorious.org/pov-mode/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 FDL-1.2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://gitorious.org/pov-mode/pov-mode/archive-tarball/v3.3 -> pov-mode-3.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=1d3e447754238df65c797f171522473f
diff --git a/metadata/md5-cache/app-emacs/pov-mode-3.3-r1 b/metadata/md5-cache/app-emacs/pov-mode-3.3-r1
new file mode 100644
index 000000000000..f5c007327d54
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/pov-mode-3.3-r1
@@ -0,0 +1,12 @@
+BDEPEND=sys-apps/texinfo >=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Major mode for Povray scene files
+EAPI=7
+HOMEPAGE=https://github.com/emacsmirror/pov-mode
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ FDL-1.2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/emacsmirror/pov-mode/archive/v3.3.tar.gz -> pov-mode-3.3.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=312448465a6b35031145ec99e081ed8e
diff --git a/metadata/md5-cache/app-emacs/proofgeneral-4.4 b/metadata/md5-cache/app-emacs/proofgeneral-4.4
new file mode 100644
index 000000000000..b6ded0f510ab
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/proofgeneral-4.4
@@ -0,0 +1,12 @@
+BDEPEND=>=app-emacs/mmm-mode-0.4.8-r2 >=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=A generic interface for proof assistants
+EAPI=7
+HOMEPAGE=https://proofgeneral.github.io/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0
+RDEPEND=>=app-emacs/mmm-mode-0.4.8-r2 >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/ProofGeneral/PG/archive/v4.4.tar.gz -> proofgeneral-4.4.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=afd8dd96beeb45171cc7da245daa00d5
diff --git a/metadata/md5-cache/app-emacs/quilt-el-0.66 b/metadata/md5-cache/app-emacs/quilt-el-0.66
new file mode 100644
index 000000000000..edfea6220c67
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/quilt-el-0.66
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Quilt mode for Emacs
+EAPI=7
+HOMEPAGE=https://savannah.nongnu.org/projects/quilt http://satoru-takeuchi.org/dev/quilt-el/
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-1+
+RDEPEND=dev-util/quilt >=virtual/emacs-23
+SLOT=0
+SRC_URI=mirror://nongnu/quilt/quilt-0.66.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=ac6a82bc6824ada4f8bcc6704d552ea8
diff --git a/metadata/md5-cache/app-emacs/riece-8.0.0 b/metadata/md5-cache/app-emacs/riece-8.0.0
deleted file mode 100644
index 2d7560d1cd13..000000000000
--- a/metadata/md5-cache/app-emacs/riece-8.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A redesign of Liece IRC client
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/riece/
-IUSE=l10n_ja
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+ FDL-1.1+
-RDEPEND=>=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/riece/riece-8.0.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=71a44dbf6f3b2ddb5f7ecf394be66aa7
diff --git a/metadata/md5-cache/app-emacs/scheme-complete-0.8.10 b/metadata/md5-cache/app-emacs/scheme-complete-0.8.10
deleted file mode 100644
index aace17a114c4..000000000000
--- a/metadata/md5-cache/app-emacs/scheme-complete-0.8.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Scheme tab-completion and word-completion for Emacs
-EAPI=4
-HOMEPAGE=http://synthcode.com/
-KEYWORDS=alpha amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=public-domain
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://synthcode.com/emacs/scheme-complete-0.8.10.el.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=906795cc2b7a92d9bc18e9ee60499e78
diff --git a/metadata/md5-cache/app-emacs/scheme-complete-0.9.8 b/metadata/md5-cache/app-emacs/scheme-complete-0.9.8
new file mode 100644
index 000000000000..d0d89386f2fd
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/scheme-complete-0.9.8
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Scheme tab-completion and word-completion for Emacs
+EAPI=7
+HOMEPAGE=http://synthcode.com/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=public-domain
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=http://synthcode.com/emacs/scheme-complete-0.9.8.el.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=a4238fbf61393fde1f7420a692b0b6fb
diff --git a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107 b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107
new file mode 100644
index 000000000000..8cb2b56cf7a7
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Major mode for editing SCSS files in Emacs
+EAPI=7
+HOMEPAGE=https://github.com/antonj/scss-mode
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-ruby/sass >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/antonj/scss-mode/archive/b010d134f499c4b4ad33fe8a669a81e9a531b0b2.tar.gz -> scss-mode-0.5.0_p20150107.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=8b3f623a618bf25d264112a35f2b6433
diff --git a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1 b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1
new file mode 100644
index 000000000000..de48b37af596
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Major mode for editing SCSS files in Emacs
+EAPI=7
+HOMEPAGE=https://github.com/antonj/scss-mode
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-ruby/sass >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/antonj/scss-mode/archive/cf58dbec5394280503eb5502938f3b5445d1b53d.tar.gz -> scss-mode-0.5.0_p20180123.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=f21b6da45eb524b1fa5e5a33f95afd56
diff --git a/metadata/md5-cache/app-emacs/scss-mode-20130215 b/metadata/md5-cache/app-emacs/scss-mode-20130215
deleted file mode 100644
index 090620c15a0e..000000000000
--- a/metadata/md5-cache/app-emacs/scss-mode-20130215
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=dev-ruby/sass >=virtual/emacs-23
-DESCRIPTION=Major mode for editing SCSS files in Emacs
-EAPI=4
-HOMEPAGE=https://github.com/antonj/scss-mode
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/antonj/scss-mode/archive/3452e92800c345690195f55a74ba4118c5c4d004.tar.gz -> scss-mode-20130215-git.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=6772d534b6630f63890d4b1a043b76fb
diff --git a/metadata/md5-cache/app-emacs/scss-mode-20150107 b/metadata/md5-cache/app-emacs/scss-mode-20150107
deleted file mode 100644
index 8ea010c2169f..000000000000
--- a/metadata/md5-cache/app-emacs/scss-mode-20150107
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=dev-ruby/sass >=virtual/emacs-23
-DESCRIPTION=Major mode for editing SCSS files in Emacs
-EAPI=5
-HOMEPAGE=https://github.com/antonj/scss-mode
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/antonj/scss-mode/archive/b010d134f499c4b4ad33fe8a669a81e9a531b0b2.tar.gz -> scss-mode-20150107-git.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=cad1c8757e7d3264459320be90051a21
diff --git a/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517 b/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
index ad4951dfef65..cb4f9733d8de 100644
--- a/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
+++ b/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
@@ -5,10 +5,10 @@ DESCRIPTION=A library to provide MIME feature for GNU Emacs
 EAPI=7
 HOMEPAGE=https://github.com/wanderlust/semi
 IUSE=l10n_ja
-KEYWORDS=alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/wanderlust/semi/archive/4cf114c95fb49ad75eb6916f678b45b04bad8122.tar.gz -> semi-1.14.7_p20190517.tar.gz
 _eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=04c406e0997c8cf43d4d12f13ba627ad
+_md5_=b62f0b3e5b56ee3fd5063e89620eb163
diff --git a/metadata/md5-cache/app-emacs/tuareg-mode-2.0.8 b/metadata/md5-cache/app-emacs/tuareg-mode-2.0.8
deleted file mode 100644
index 971c1c0ff8c9..000000000000
--- a/metadata/md5-cache/app-emacs/tuareg-mode-2.0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Objective Caml/Camllight mode for Emacs
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/tuareg/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/ocaml/tuareg/releases/download/2.0.8/tuareg-2.0.8.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=074873e1907f2bb1248c5bafd187dc53
diff --git a/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0 b/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
new file mode 100644
index 000000000000..db409b50d538
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=An Objective Caml/Camllight mode for Emacs
+EAPI=7
+HOMEPAGE=http://forge.ocamlcore.org/projects/tuareg/
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=GPL-2+ GPL-3+ ISC
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/ocaml/tuareg/archive/2.2.0.tar.gz -> tuareg-mode-2.2.0.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=cc3901a5b658ac4fd7501d0a1cea8669
diff --git a/metadata/md5-cache/app-emacs/vm-8.1.2 b/metadata/md5-cache/app-emacs/vm-8.1.2
deleted file mode 100644
index bbdd684213f3..000000000000
--- a/metadata/md5-cache/app-emacs/vm-8.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=bbdb? ( app-emacs/bbdb ) >=virtual/emacs-23
-DESCRIPTION=The VM mail reader for Emacs
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/viewmail/
-IUSE=bbdb ssl
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2+
-RDEPEND=!app-emacs/u-vm-color bbdb? ( app-emacs/bbdb ) ssl? ( net-misc/stunnel ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://launchpad.net/vm/8.1.x/8.1.2/+download/vm-8.1.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=db9380550dd2e066b0b95c55431a4875
diff --git a/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1 b/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
index 736ec96a2668..69086111cd6a 100644
--- a/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
+++ b/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
@@ -5,10 +5,10 @@ DESCRIPTION=The VM mail reader for Emacs
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/viewmail/
 IUSE=bbdb ssl
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=bbdb? ( app-emacs/bbdb ) ssl? ( net-misc/stunnel ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://launchpad.net/vm/8.2.x/8.2.0b/+download/vm-8.2.0b.tgz
 _eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=6d05f7e463cff22e634dc5681cde8818
+_md5_=d2de21c69870a3cc1f3bc33896ca824b
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814
index a145646efc42..cb4166e6dc3e 100644
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814
@@ -10,4 +10,4 @@ RDEPEND=>=app-emacs/apel-10.6 app-emacs/flim app-emacs/semi bbdb? ( app-emacs/bb
 SLOT=0
 SRC_URI=https://github.com/wanderlust/wanderlust/archive/395826e99b84051396d503392f52462b6cb683a5.tar.gz -> wanderlust-2.15.9_p20180814-git.tar.gz
 _eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=4455ac7c0a7d3b3e7c5f55b112e8a62a
+_md5_=53d1699af8d77de085d5e7eac3257e2d
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
index 5552355631dc..945879fb2e41 100644
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
@@ -5,10 +5,10 @@ DESCRIPTION=Yet Another Message Interface on Emacsen
 EAPI=7
 HOMEPAGE=https://github.com/wanderlust/wanderlust
 IUSE=bbdb ssl l10n_ja
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-emacs/semi-1.14.7 bbdb? ( app-emacs/bbdb ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/wanderlust/wanderlust/archive/b9a529a54b9e7eafa4ed230ad28efffe0d25a20e.tar.gz -> wanderlust-2.15.9_p20190623.tar.gz
 _eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=38bf9129f97b3862185b37821281982e
+_md5_=7490372a61eea0fc18608be25b0564f9
diff --git a/metadata/md5-cache/app-emacs/xclip-1.9 b/metadata/md5-cache/app-emacs/xclip-1.9
new file mode 100644
index 000000000000..7899307bf4da
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/xclip-1.9
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Emacs Interface to XClip
+EAPI=7
+HOMEPAGE=https://elpa.gnu.org/packages/xclip.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=x11-misc/xclip >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xclip-1.9.el.xz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=57b70a562ce082462abc1dc0139f38f1
diff --git a/metadata/md5-cache/app-emacs/xslide-0.2.2-r1 b/metadata/md5-cache/app-emacs/xslide-0.2.2-r1
new file mode 100644
index 000000000000..498bf642ebc4
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/xslide-0.2.2-r1
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=An Emacs major mode for editing XSL stylesheets and running XSL processes
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/xslide/
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=mirror://sourceforge/xslide/xslide-0.2.2.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=ee9e3488b1194abd77a4d6025bd7f0ba
diff --git a/metadata/md5-cache/app-emacs/zenburn-20110907-r1 b/metadata/md5-cache/app-emacs/zenburn-20110907-r1
new file mode 100644
index 000000000000..9a73ce719945
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/zenburn-20110907-r1
@@ -0,0 +1,12 @@
+BDEPEND=app-emacs/color-theme >=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Zenburn color theme for Emacs
+EAPI=7
+HOMEPAGE=https://web.archive.org/web/20140612104441/http://slinky.imukuppi.org/zenburnpage/ https://github.com/dbrock/zenburn-el
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-emacs/color-theme >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/dbrock/zenburn-el/archive/2b0672b04ef3e95c25f849dceb10d669296a188b.tar.gz -> zenburn-20110907.tar.gz
+_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=963e4f4a9bb96baefd406ce2cb3ab734
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 4438858a60d3..06a04b188fc0 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/buildah-1.11.0 b/metadata/md5-cache/app-emulation/buildah-1.11.0
new file mode 100644
index 000000000000..c60a969377f3
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/buildah-1.11.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+DESCRIPTION=A tool that facilitates building OCI images
+EAPI=7
+HOMEPAGE=https://github.com/containers/buildah
+IUSE=ostree selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+REQUIRED_USE=!selinux? ( !ostree )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/buildah/archive/v1.11.0.tar.gz -> buildah-1.11.0.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=2e98a45feae31f3f381271dedda99657
diff --git a/metadata/md5-cache/app-emulation/cadvisor-0.34.0 b/metadata/md5-cache/app-emulation/cadvisor-0.34.0
new file mode 100644
index 000000000000..89c474b14b06
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/cadvisor-0.34.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.10
+DESCRIPTION=Analyzes resource usage and performance characteristics of running containers
+EAPI=6
+HOMEPAGE=https://github.com/google/cadvisor
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/google/cadvisor/archive/v0.34.0.tar.gz -> cadvisor-0.34.0.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=aea99d19eb8df67cbda5cb2900fe606d
diff --git a/metadata/md5-cache/app-emulation/conmon-0.2.0 b/metadata/md5-cache/app-emulation/conmon-0.2.0
deleted file mode 100644
index ffc71447a96d..000000000000
--- a/metadata/md5-cache/app-emulation/conmon-0.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
-DESCRIPTION=An OCI container runtime monitor
-EAPI=7
-HOMEPAGE=https://github.com/containers/conmon
-IUSE=systemd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
-SLOT=0
-SRC_URI=https://github.com/containers/conmon/archive/v0.2.0.tar.gz -> conmon-0.2.0.tar.gz
-_md5_=a0de61d8ab95b06df3f7cf7d0d50f187
diff --git a/metadata/md5-cache/app-emulation/conmon-0.3.0 b/metadata/md5-cache/app-emulation/conmon-0.3.0
index 950d3f6d953c..fde308559be3 100644
--- a/metadata/md5-cache/app-emulation/conmon-0.3.0
+++ b/metadata/md5-cache/app-emulation/conmon-0.3.0
@@ -9,4 +9,4 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
 SLOT=0
 SRC_URI=https://github.com/containers/conmon/archive/v0.3.0.tar.gz -> conmon-0.3.0.tar.gz
-_md5_=f079d4e172fb4c27b78dfc1a5755eb57
+_md5_=8f9f62d8ebfdb04167434c6c55ea737d
diff --git a/metadata/md5-cache/app-emulation/conmon-0.4.0 b/metadata/md5-cache/app-emulation/conmon-0.4.0
new file mode 100644
index 000000000000..0b961bf245c0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/conmon-0.4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
+DESCRIPTION=An OCI container runtime monitor
+EAPI=7
+HOMEPAGE=https://github.com/containers/conmon
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
+SLOT=0
+SRC_URI=https://github.com/containers/conmon/archive/v0.4.0.tar.gz -> conmon-0.4.0.tar.gz
+_md5_=776280005b673aa50c80693720c8a038
diff --git a/metadata/md5-cache/app-emulation/conmon-2.0.0 b/metadata/md5-cache/app-emulation/conmon-2.0.0
new file mode 100644
index 000000000000..4bc37b96c783
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/conmon-2.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
+DESCRIPTION=An OCI container runtime monitor
+EAPI=7
+HOMEPAGE=https://github.com/containers/conmon
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
+SLOT=0
+SRC_URI=https://github.com/containers/conmon/archive/v2.0.0.tar.gz -> conmon-2.0.0.tar.gz
+_md5_=d45b564c929612b19d14dad417deaf10
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.26.1 b/metadata/md5-cache/app-emulation/diskimage-builder-2.26.1
new file mode 100644
index 000000000000..f137288dc05a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-2.26.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pbr-2.0.0[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/pbr-2.1.0[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[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Golden Disk Image builder.
+EAPI=7
+HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[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/pbr-2.1.0[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/Babel-2.3.4[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/Babel-2.4.0[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/networkx-1.10[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/networkx-2.3[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/pyyaml-3.12[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/flake8-2.5.4[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/flake8-2.6.0[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/six-1.10.0[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/stevedore-1.20.0[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(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[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=mirror://pypi/d/diskimage-builder/diskimage-builder-2.26.1.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=289d8821949768cc2f10aedf84e6d6bc
diff --git a/metadata/md5-cache/app-emulation/docker-18.09.9 b/metadata/md5-cache/app-emulation/docker-18.09.9
new file mode 100644
index 000000000000..986df1018e54
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-18.09.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.10 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=6
+HOMEPAGE=https://dockerproject.org
+IUSE=apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.2.6 ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20190513 container-init? ( >=sys-process/tini-0.18.0[static] )
+RESTRICT=installsources strip
+SLOT=0
+SRC_URI=https://github.com/docker/docker-ce/archive/v18.09.9.tar.gz -> docker-18.09.9.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=84649449b43a02bde56528c10910e243
diff --git a/metadata/md5-cache/app-emulation/docker-19.03.2 b/metadata/md5-cache/app-emulation/docker-19.03.2
new file mode 100644
index 000000000000..a0c740800e70
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-19.03.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.10 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=6
+HOMEPAGE=https://dockerproject.org
+IUSE=apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.2.6 ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20190604 container-init? ( >=sys-process/tini-0.18.0[static] )
+RESTRICT=installsources strip
+SLOT=0
+SRC_URI=https://github.com/docker/docker-ce/archive/v19.03.2.tar.gz -> docker-19.03.2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=b97742ba524778fddf06e68bc99e4c87
diff --git a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5 b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
index 7b42b73b2dd3..8cd49f53e04a 100644
--- a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
+++ b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXau x11-libs/libXext x11-libs/libXdmcp x11-apps/xset x11-apps/xlsfonts x11-apps/bdftopcf x11-apps/mkfontdir ) svga? ( media-libs/svgalib ) gpm? ( sys-libs/gpm ) alsa? ( media-libs/alsa-lib ) sndfile? ( media-libs/libsndfile ) fluidsynth? ( media-sound/fluidsynth media-sound/fluid-soundfont ) media-libs/libsdl >=sys-libs/slang-1.4 X? ( x11-base/xorg-proto ) >=sys-devel/autoconf-2.57 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXau x11-libs/libXext x11-libs/libXdmcp x11-apps/xset x11-apps/xlsfonts x11-apps/bdftopcf x11-apps/mkfontdir ) svga? ( media-libs/svgalib ) gpm? ( sys-libs/gpm ) alsa? ( media-libs/alsa-lib ) sndfile? ( media-libs/libsndfile ) fluidsynth? ( media-sound/fluidsynth media-sound/fluid-soundfont ) media-libs/libsdl >=sys-libs/slang-1.4 app-arch/unzip X? ( x11-base/xorg-proto ) >=sys-devel/autoconf-2.57 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=DOS Emulator
 EAPI=6
 HOMEPAGE=http://www.dosemu.org/
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXau x11-libs/libXex
 SLOT=0
 SRC_URI=mirror://sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz https://dev.gentoo.org/~slyfox/distfiles/dosemu-1.4.1_pre20130107.zip
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fa50b6b34f5f8359c97269643d7ecd84
+_md5_=1ab90861b6ee53135478d37318179d3d
diff --git a/metadata/md5-cache/app-emulation/free42-2.5.3 b/metadata/md5-cache/app-emulation/free42-2.5.3
new file mode 100644
index 000000000000..1d4f384d7fdc
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/free42-2.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib )
+DESCRIPTION=An HP-42S Calculator Simulator
+EAPI=7
+HOMEPAGE=http://thomasokken.com/free42/
+IUSE=+alsa
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib ) x11-libs/libX11 x11-libs/libXmu
+SLOT=0
+SRC_URI=http://thomasokken.com/free42/upstream/free42-nologo-2.5.3.tgz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=fecf4b5dc36b9aacf052d43761eae1a0
diff --git a/metadata/md5-cache/app-emulation/fs-uae-3.0.0 b/metadata/md5-cache/app-emulation/fs-uae-3.0.0
index fcc1b61f47a8..18e43588775b 100644
--- a/metadata/md5-cache/app-emulation/fs-uae-3.0.0
+++ b/metadata/md5-cache/app-emulation/fs-uae-3.0.0
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-libs/glib:2 media-libs/libpng:0= media-libs/libsdl2[opengl] media-libs/openal virtual/opengl x11-libs/libdrm x11-libs/libX11 fmv? ( media-libs/libmpeg2 ) glew? ( media-libs/glew:0= ) x11-base/xorg-proto
+DEPEND=dev-libs/glib:2 media-libs/libpng:0= media-libs/libsdl2[opengl,X] media-libs/openal virtual/opengl x11-libs/libdrm x11-libs/libX11 fmv? ( media-libs/libmpeg2 ) glew? ( media-libs/glew:0= ) x11-base/xorg-proto
 DESCRIPTION=Integrates the most accurate Amiga emulation code available from WinUAE
 EAPI=7
 HOMEPAGE=https://fs-uae.net/
 IUSE=fmv glew
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 media-libs/libpng:0= media-libs/libsdl2[opengl] media-libs/openal virtual/opengl x11-libs/libdrm x11-libs/libX11 fmv? ( media-libs/libmpeg2 ) glew? ( media-libs/glew:0= )
+RDEPEND=dev-libs/glib:2 media-libs/libpng:0= media-libs/libsdl2[opengl,X] media-libs/openal virtual/opengl x11-libs/libdrm x11-libs/libX11 fmv? ( media-libs/libmpeg2 ) glew? ( media-libs/glew:0= )
 SLOT=0
 SRC_URI=https://fs-uae.net/stable/3.0.0/fs-uae-3.0.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fbc90b5879a0ca2bab43a394e4836edb
+_md5_=1056575c89464285fb7d081b60d834a9
diff --git a/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.3 b/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.3
index e08e86984c9c..4d7ae2e7c5f4 100644
--- a/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.3
+++ b/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=media-libs/mesa[d3d9,dri3,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/iXit/wine-nine-standalone/archive/v0.3.tar.gz -> gallium-nine-standalone-0.3.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=4ec31a69a29fec14628e9587a2cfddde
diff --git a/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.4 b/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.4
index 877beb2888b0..3a574638787e 100644
--- a/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.4
+++ b/metadata/md5-cache/app-emulation/gallium-nine-standalone-0.4
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=media-libs/mesa[d3d9,dri3,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/iXit/wine-nine-standalone/archive/v0.4.tar.gz -> gallium-nine-standalone-0.4.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=c1aa62916b2c42612015d6f93f5a15af
diff --git a/metadata/md5-cache/app-emulation/gallium-nine-standalone-9999 b/metadata/md5-cache/app-emulation/gallium-nine-standalone-9999
index d6064ff0bd59..3e5e2a880804 100644
--- a/metadata/md5-cache/app-emulation/gallium-nine-standalone-9999
+++ b/metadata/md5-cache/app-emulation/gallium-nine-standalone-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 PROPERTIES=live
 RDEPEND=media-libs/mesa[d3d9,dri3,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=c1aa62916b2c42612015d6f93f5a15af
diff --git a/metadata/md5-cache/app-emulation/ganeti-os-noop-0.2 b/metadata/md5-cache/app-emulation/ganeti-os-noop-0.2
index 5841bb5dcb06..9104a52dba5b 100644
--- a/metadata/md5-cache/app-emulation/ganeti-os-noop-0.2
+++ b/metadata/md5-cache/app-emulation/ganeti-os-noop-0.2
@@ -6,4 +6,4 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/grnet/ganeti-os-noop/archive/v0.2.tar.gz -> ganeti-os-noop-0.2.tar.gz
-_md5_=7cd38a2cfe2344b55f99f4dca70016b5
+_md5_=fda29813f6a2904af92b2704c301a57f
diff --git a/metadata/md5-cache/app-emulation/img-0.4.8 b/metadata/md5-cache/app-emulation/img-0.4.8
deleted file mode 100644
index 0dcd75ce798c..000000000000
--- a/metadata/md5-cache/app-emulation/img-0.4.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Standalone daemon-less unprivileged Dockerfile and OCI container image builder
-EAPI=6
-HOMEPAGE=https://github.com/genuinetools/img
-IUSE=seccomp
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/genuinetools/img/archive/v0.4.8.tar.gz -> img-0.4.8.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=0e720b6a9726cd5b190f76ab8f2d7609
diff --git a/metadata/md5-cache/app-emulation/img-0.4.9 b/metadata/md5-cache/app-emulation/img-0.4.9
deleted file mode 100644
index 367f88f97d6e..000000000000
--- a/metadata/md5-cache/app-emulation/img-0.4.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Standalone daemon-less unprivileged Dockerfile and OCI container image builder
-EAPI=6
-HOMEPAGE=https://github.com/genuinetools/img
-IUSE=seccomp
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/genuinetools/img/archive/v0.4.9.tar.gz -> img-0.4.9.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=8c99f717eddf4583e6d71b909488bfc7
diff --git a/metadata/md5-cache/app-emulation/img-0.5.1 b/metadata/md5-cache/app-emulation/img-0.5.1
deleted file mode 100644
index fec60a6c90ce..000000000000
--- a/metadata/md5-cache/app-emulation/img-0.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Standalone daemon-less unprivileged Dockerfile and OCI container image builder
-EAPI=6
-HOMEPAGE=https://github.com/genuinetools/img
-IUSE=seccomp
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/genuinetools/img/archive/v0.5.1.tar.gz -> img-0.5.1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=9b0590df9053f92f048b2551d6e46a5a
diff --git a/metadata/md5-cache/app-emulation/img-0.5.2 b/metadata/md5-cache/app-emulation/img-0.5.2
deleted file mode 100644
index 42452a976277..000000000000
--- a/metadata/md5-cache/app-emulation/img-0.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Standalone daemon-less unprivileged Dockerfile and OCI container image builder
-EAPI=6
-HOMEPAGE=https://github.com/genuinetools/img
-IUSE=seccomp
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/genuinetools/img/archive/v0.5.2.tar.gz -> img-0.5.2.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=a8b1c4c0ceb5682bdd5d0ffef3d17653
diff --git a/metadata/md5-cache/app-emulation/img-0.5.4 b/metadata/md5-cache/app-emulation/img-0.5.4
deleted file mode 100644
index 90dff6a02cd8..000000000000
--- a/metadata/md5-cache/app-emulation/img-0.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Standalone daemon-less unprivileged Dockerfile and OCI container image builder
-EAPI=6
-HOMEPAGE=https://github.com/genuinetools/img
-IUSE=seccomp
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/genuinetools/img/archive/v0.5.4.tar.gz -> img-0.5.4.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=534dc167610a275a3ef30fd6d79a7dbd
diff --git a/metadata/md5-cache/app-emulation/libguestfs-appliance-1.36.1 b/metadata/md5-cache/app-emulation/libguestfs-appliance-1.36.1
index 305182ad797c..30192e42a9d4 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-appliance-1.36.1
+++ b/metadata/md5-cache/app-emulation/libguestfs-appliance-1.36.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!<app-emulation/libguestfs-1.36.1
 SLOT=0
 SRC_URI=http://libguestfs.org/download/binaries/appliance/appliance-1.36.1.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73
 _md5_=648d972e2c97732e649f844c664fa3ef
diff --git a/metadata/md5-cache/app-emulation/libguestfs-appliance-1.38.0 b/metadata/md5-cache/app-emulation/libguestfs-appliance-1.38.0
index b1c7685d4ea4..1ac2f87cf22b 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-appliance-1.38.0
+++ b/metadata/md5-cache/app-emulation/libguestfs-appliance-1.38.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!<app-emulation/libguestfs-1.38.0
 SLOT=0
 SRC_URI=http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73
 _md5_=620c84be8dd5e26fc666fa152a4ec8a5
diff --git a/metadata/md5-cache/app-emulation/libpod-1.5.1 b/metadata/md5-cache/app-emulation/libpod-1.5.1
new file mode 100644
index 000000000000..05285657b036
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libpod-1.5.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install postinst preinst prepare unpack
+DEPEND=app-crypt/gpgme:= >=app-emulation/conmon-2.0.0 >=app-emulation/runc-1.0.0_rc6 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man
+DESCRIPTION=Library and podman tool for running OCI-based containers in Pods
+EAPI=7
+HOMEPAGE=https://github.com/containers/libpod/
+IUSE=apparmor btrfs ostree +rootless selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-crypt/gpgme:= >=app-emulation/conmon-2.0.0 >=app-emulation/runc-1.0.0_rc6 dev-libs/libassuan:= dev-libs/libgpg-error:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= )
+REQUIRED_USE=!selinux? ( !ostree )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/libpod/archive/v1.5.1.tar.gz -> libpod-1.5.1.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=03c04434ab224435c8919eebade23731
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 29caa38c9718..12e9c3f67241 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -11,4 +11,4 @@ RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub dev-libs
 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	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=419d7b9ee630fb90aa746a7a27737a69
+_md5_=8c70a114bd83e781b20a244d69c1cb86
diff --git a/metadata/md5-cache/app-emulation/openstack-guest-agents-unix-1.39.1_p20170227 b/metadata/md5-cache/app-emulation/openstack-guest-agents-unix-1.39.1_p20170227
index 15c7bd49f2c5..a4932c955911 100644
--- a/metadata/md5-cache/app-emulation/openstack-guest-agents-unix-1.39.1_p20170227
+++ b/metadata/md5-cache/app-emulation/openstack-guest-agents-unix-1.39.1_p20170227
@@ -10,6 +10,6 @@ RDEPEND=app-emulation/xe-guest-utilities dev-python/pyxenstore[python_targets_py
 REQUIRED_USE=python_targets_python2_7
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=https://github.com/rackerlabs/openstack-guest-agents-unix/archive/c9a4f15b8c8f2349601d3073cc95e30d3b91af13.zip -> openstack-guest-agents-unix-1.39.1_p20170227.zip
+SRC_URI=https://github.com/rackerlabs/openstack-guest-agents-unix/archive/c9a4f15b8c8f2349601d3073cc95e30d3b91af13.tar.gz -> openstack-guest-agents-unix-1.39.1_p20170227.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=95b11fe675182ad612741b361700f5c9
+_md5_=d2c30f09d62b659fb648c2d60526b5e7
diff --git a/metadata/md5-cache/app-emulation/qemu-4.0.0-r3 b/metadata/md5-cache/app-emulation/qemu-4.0.0-r3
deleted file mode 100644
index 154f067436c3..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-4.0.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) dev-lang/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig
-DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] x11-libs/libxkbcommon[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) filecaps? ( sys-libs/libcap )
-DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
-EAPI=7
-HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +filecaps
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
-LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
-SLOT=0
-SRC_URI=http://wiki.qemu-project.org/download/qemu-4.0.0.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bce98ad44cf08b860eb160c12cb2c130
diff --git a/metadata/md5-cache/app-emulation/qemu-4.0.0-r50 b/metadata/md5-cache/app-emulation/qemu-4.0.0-r50
index 549d0e90d9bb..39a20b2edbc5 100644
--- a/metadata/md5-cache/app-emulation/qemu-4.0.0-r50
+++ b/metadata/md5-cache/app-emulation/qemu-4.0.0-r50
@@ -5,11 +5,11 @@ DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=7
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
 IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +filecaps
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.12.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-4.0.0.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f56b7e2a7194766a2321af0709439183
+_md5_=c2265e283ed94ba3ff44ead1a15abc37
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index 38ca22f09cf5..4b7c9060b4d0 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -1,14 +1,14 @@
 BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) dev-lang/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test unpack
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] x11-libs/libxkbcommon[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) filecaps? ( sys-libs/libcap )
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] x11-libs/libxkbcommon[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) filecaps? ( sys-libs/libcap )
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=7
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
 IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +filecaps
 LICENSE=GPL-2 LGPL-2 BSD-2
 PROPERTIES=live
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu )
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	562b380fc59ae6a8622171d0acb777d1	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c515a798c16e49a025588967606a306
+_md5_=d1e2e171fa003a8fc890b050bf9c0a2f
diff --git a/metadata/md5-cache/app-emulation/rkt-1.29.0 b/metadata/md5-cache/app-emulation/rkt-1.29.0
deleted file mode 100644
index 4423f41525d1..000000000000
--- a/metadata/md5-cache/app-emulation/rkt-1.29.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=dev-lang/go-1.5 app-arch/cpio app-crypt/trousers sys-fs/squashfs-tools dev-perl/Capture-Tiny rkt_stage1_src? ( >=sys-apps/util-linux-2.27 ) rkt_stage1_kvm_qemu? ( sys-apps/attr[static-libs(+)] sys-libs/libcap[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=rkt is an App Container runtime for Linux
-EAPI=6
-HOMEPAGE=https://github.com/coreos/rkt
-IUSE=doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src +actool systemd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!app-emulation/rocket rkt_stage1_host? ( systemd? ( >=sys-apps/systemd-222 app-shells/bash:0 ) )
-REQUIRED_USE=!systemd? ( !rkt_stage1_host ) || ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src ) !rkt_stage1_kvm
-RESTRICT=test rkt_stage1_src? ( userpriv )
-SLOT=0
-SRC_URI=https://github.com/coreos/rkt/archive/v1.29.0.tar.gz -> rkt-1.29.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1478.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1478.0.0.img ) rkt_stage1_kvm_lkvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz -> kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=c0a985531f49c06fd05069024f4664740e6a0baf -> kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=1cc05b24bfe0211bb408f3264af8e0c42dcdde9c -> kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patch mirror://kernel/linux/kernel/v4.x/linux-4.9.2.tar.xz http://alpha.release.core-os.net/amd64-usr/1478.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1478.0.0.img ) rkt_stage1_kvm_qemu? ( http://wiki.qemu-project.org/download/qemu-2.8.0.tar.bz2 mirror://kernel/linux/kernel/v4.x/linux-4.9.2.tar.xz http://alpha.release.core-os.net/amd64-usr/1478.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1478.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v233.tar.gz -> systemd-233.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=61879a24600af22b42f58a27ab3ed4eb
diff --git a/metadata/md5-cache/app-emulation/rkt-1.30.0 b/metadata/md5-cache/app-emulation/rkt-1.30.0
deleted file mode 100644
index cbaf94b2f981..000000000000
--- a/metadata/md5-cache/app-emulation/rkt-1.30.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=dev-lang/go-1.5 app-arch/cpio app-crypt/trousers sys-fs/squashfs-tools dev-perl/Capture-Tiny rkt_stage1_kvm_qemu? ( sys-apps/attr[static-libs(+)] sys-libs/libcap[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=rkt is an App Container runtime for Linux
-EAPI=6
-HOMEPAGE=https://github.com/coreos/rkt
-IUSE=doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu +actool systemd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!app-emulation/rocket rkt_stage1_host? ( systemd? ( >=sys-apps/systemd-222 app-shells/bash:0 ) )
-REQUIRED_USE=!systemd? ( !rkt_stage1_host ) || ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu ) !rkt_stage1_kvm
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/coreos/rkt/archive/v1.30.0.tar.gz -> rkt-1.30.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1478.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1478.0.0.img ) rkt_stage1_kvm_lkvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz -> kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=c0a985531f49c06fd05069024f4664740e6a0baf -> kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=1cc05b24bfe0211bb408f3264af8e0c42dcdde9c -> kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patch mirror://kernel/linux/kernel/v4.x/linux-4.9.2.tar.xz http://alpha.release.core-os.net/amd64-usr/1478.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1478.0.0.img ) rkt_stage1_kvm_qemu? ( http://wiki.qemu-project.org/download/qemu-2.8.0.tar.bz2 mirror://kernel/linux/kernel/v4.x/linux-4.9.2.tar.xz http://alpha.release.core-os.net/amd64-usr/1478.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1478.0.0.img )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e4642bad581bd584dea497a17e7902b
diff --git a/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181011 b/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181011
deleted file mode 100644
index 3eb13a065a69..000000000000
--- a/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181011
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Simple virtual machine manager for Linux (QEMU/KVM)
-EAPI=6
-HOMEPAGE=https://github.com/rafaelmartins/simplevirt
-IUSE=kernel_linux
-LICENSE=BSD
-RDEPEND=virtual/logger app-emulation/qemu
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/rafaelmartins/simplevirt/archive/2427500bce5bf9b365dc601790704694cd6c772e.tar.gz -> simplevirt-0.0_p20181011.tar.gz https://github.com/inconshreveable/mousetrap/archive/v1.0.0.tar.gz -> github.com-inconshreveable-mousetrap-v1.0.0.tar.gz https://github.com/spf13/cobra/archive/v0.0.3.tar.gz -> github.com-spf13-cobra-v0.0.3.tar.gz https://github.com/spf13/pflag/archive/v1.0.2.tar.gz -> github.com-spf13-pflag-v1.0.2.tar.gz https://github.com/go-check/check/archive/20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz -> github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz https://github.com/go-yaml/yaml/archive/v2.2.1.tar.gz -> github.com-go-yaml-yaml-v2.2.1.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=a325c84a5962b6054211f030baa8fa95
diff --git a/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012 b/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012
new file mode 100644
index 000000000000..bdb2ba4d3fb5
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst setup test unpack
+DEPEND=>=dev-lang/go-1.10
+DESCRIPTION=Simple virtual machine manager for Linux (QEMU/KVM)
+EAPI=6
+HOMEPAGE=https://github.com/rafaelmartins/simplevirt
+IUSE=kernel_linux
+LICENSE=BSD
+RDEPEND=virtual/logger app-emulation/qemu
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/rafaelmartins/simplevirt/archive/78d29d8fa11ce72af5f897430af7bb7d2947a32f.tar.gz -> simplevirt-0.0_p20181012.tar.gz https://github.com/inconshreveable/mousetrap/archive/v1.0.0.tar.gz -> github.com-inconshreveable-mousetrap-v1.0.0.tar.gz https://github.com/spf13/cobra/archive/v0.0.3.tar.gz -> github.com-spf13-cobra-v0.0.3.tar.gz https://github.com/spf13/pflag/archive/v1.0.2.tar.gz -> github.com-spf13-pflag-v1.0.2.tar.gz https://github.com/go-check/check/archive/20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz -> github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz https://github.com/go-yaml/yaml/archive/v2.2.1.tar.gz -> github.com-go-yaml-yaml-v2.2.1.tar.gz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=5037b5d144669ca9a4337508148fe323
diff --git a/metadata/md5-cache/app-emulation/slirp4netns-0.3.1 b/metadata/md5-cache/app-emulation/slirp4netns-0.3.1
deleted file mode 100644
index bd732390e504..000000000000
--- a/metadata/md5-cache/app-emulation/slirp4netns-0.3.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=postinst prepare
-DEPEND=dev-libs/glib:2= dev-libs/libpcre:=
-DESCRIPTION=User-mode networking for unprivileged network namespaces
-EAPI=7
-HOMEPAGE=https://github.com/rootless-containers/slirp4netns
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2= dev-libs/libpcre:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rootless-containers/slirp4netns/archive/v0.3.1.tar.gz -> slirp4netns-0.3.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6ea858baed4e0eec72038bcc0fea3bb1
diff --git a/metadata/md5-cache/app-emulation/slirp4netns-0.3.3 b/metadata/md5-cache/app-emulation/slirp4netns-0.3.3
new file mode 100644
index 000000000000..62f9ddb1fd9f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/slirp4netns-0.3.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=postinst prepare
+DEPEND=dev-libs/glib:2= dev-libs/libpcre:=
+DESCRIPTION=User-mode networking for unprivileged network namespaces
+EAPI=7
+HOMEPAGE=https://github.com/rootless-containers/slirp4netns
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2= dev-libs/libpcre:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rootless-containers/slirp4netns/archive/v0.3.3.tar.gz -> slirp4netns-0.3.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=6ea858baed4e0eec72038bcc0fea3bb1
diff --git a/metadata/md5-cache/app-emulation/slirp4netns-0.4.0_beta2 b/metadata/md5-cache/app-emulation/slirp4netns-0.4.0_beta2
deleted file mode 100644
index d37746fd1824..000000000000
--- a/metadata/md5-cache/app-emulation/slirp4netns-0.4.0_beta2
+++ /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=postinst prepare
-DEPEND=dev-libs/glib:2= dev-libs/libpcre:=
-DESCRIPTION=User-mode networking for unprivileged network namespaces
-EAPI=7
-HOMEPAGE=https://github.com/rootless-containers/slirp4netns
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2= dev-libs/libpcre:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rootless-containers/slirp4netns/archive/v0.4.0-beta.2.tar.gz -> slirp4netns-0.4.0_beta2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b4daad259ce5f3543c015e66badf71c4
diff --git a/metadata/md5-cache/app-emulation/slirp4netns-0.4.0_beta3 b/metadata/md5-cache/app-emulation/slirp4netns-0.4.0_beta3
deleted file mode 100644
index 984601594486..000000000000
--- a/metadata/md5-cache/app-emulation/slirp4netns-0.4.0_beta3
+++ /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=postinst prepare
-DEPEND=dev-libs/glib:2= dev-libs/libpcre:=
-DESCRIPTION=User-mode networking for unprivileged network namespaces
-EAPI=7
-HOMEPAGE=https://github.com/rootless-containers/slirp4netns
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2= dev-libs/libpcre:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rootless-containers/slirp4netns/archive/v0.4.0-beta.3.tar.gz -> slirp4netns-0.4.0_beta3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b4daad259ce5f3543c015e66badf71c4
diff --git a/metadata/md5-cache/app-emulation/slirp4netns-0.4.0_beta4 b/metadata/md5-cache/app-emulation/slirp4netns-0.4.0_beta4
new file mode 100644
index 000000000000..3cea0a26da23
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/slirp4netns-0.4.0_beta4
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=postinst prepare
+DEPEND=dev-libs/glib:2= dev-libs/libpcre:=
+DESCRIPTION=User-mode networking for unprivileged network namespaces
+EAPI=7
+HOMEPAGE=https://github.com/rootless-containers/slirp4netns
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2= dev-libs/libpcre:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rootless-containers/slirp4netns/archive/v0.4.0-beta.4.tar.gz -> slirp4netns-0.4.0_beta4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b4daad259ce5f3543c015e66badf71c4
diff --git a/metadata/md5-cache/app-emulation/slirp4netns-0.4.1 b/metadata/md5-cache/app-emulation/slirp4netns-0.4.1
new file mode 100644
index 000000000000..4f2f41e80bfb
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/slirp4netns-0.4.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=postinst prepare
+DEPEND=dev-libs/glib:2= dev-libs/libpcre:=
+DESCRIPTION=User-mode networking for unprivileged network namespaces
+EAPI=7
+HOMEPAGE=https://github.com/rootless-containers/slirp4netns
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2= dev-libs/libpcre:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rootless-containers/slirp4netns/archive/v0.4.1.tar.gz -> slirp4netns-0.4.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=6ea858baed4e0eec72038bcc0fea3bb1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.30 b/metadata/md5-cache/app-emulation/virtualbox-5.2.30
deleted file mode 100644
index 2a38084399c3..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.30
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.30 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/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 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-util/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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc dtrace 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 dtrace? ( CDDL )
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.30 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/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 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] 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.30/VirtualBox-5.2.30.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	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=17250859f4251c8d7c64b3e3470e669f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.0.10-r2 b/metadata/md5-cache/app-emulation/virtualbox-6.0.10-r2
index 03aec264cfba..2afde224dbe8 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.0.10-r2
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.0.10-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/6.0.10/VirtualBox-6.0.10.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f46a248c6e1bd5c5cbbbb14fec244219
+_md5_=b394308c92c5864f842ddd52cd827012
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.0.12 b/metadata/md5-cache/app-emulation/virtualbox-6.0.12
new file mode 100644
index 000000000000..e8b8618c2f6b
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.0.12
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig 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 ) java? ( >=virtual/jdk-1.6 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] !app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.0.12 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 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=alsa debug doc dtrace 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 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 dtrace? ( CDDL )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] !app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.0.12 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_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/6.0.12/VirtualBox-6.0.12.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=aac7b6db1f56ca64dc781979707cb974
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.0.8 b/metadata/md5-cache/app-emulation/virtualbox-6.0.8
deleted file mode 100644
index ccc525a4aa55..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-6.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.0.8 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 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc dtrace 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 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 dtrace? ( CDDL )
-RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.0.8 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 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] 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_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/6.0.8/VirtualBox-6.0.8.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	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae422260ede5e0c89db69c8b00b6a525
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.30 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.30
deleted file mode 100644
index af6b31ded2eb..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.30
+++ /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/5.2.30/VBoxGuestAdditions_5.2.30.iso
-_md5_=e697797f7cd34a655b887c25856ae439
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.12 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.12
new file mode 100644
index 000000000000..812cb1852c43
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.12
@@ -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.12/VBoxGuestAdditions_6.0.12.iso
+_md5_=7fb05fb584defd089dcca5df3be13f9e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.8 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.8
deleted file mode 100644
index 62cb5bce05db..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.8
+++ /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.8/VBoxGuestAdditions_6.0.8.iso
-_md5_=7fb05fb584defd089dcca5df3be13f9e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.30.130521 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.30.130521
deleted file mode 100644
index 8186daea7445..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.30.130521
+++ /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 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.30 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.30/VirtualBox-5.2.30-130521-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.30/VirtualBox-5.2.30-130521-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.30/Oracle_VM_VirtualBox_Extension_Pack-5.2.30-130521.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.30-130521.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.30/VirtualBoxSDK-5.2.30-130521.zip )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79dadbe62585534b0491b914139f88d1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.12.133076 b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.12.133076
new file mode 100644
index 000000000000..5d9d80bf94de
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.12.133076
@@ -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 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.12 !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.12/VirtualBox-6.0.12-133076-Linux_amd64.run ) https://download.virtualbox.org/virtualbox/6.0.12/Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/6.0.12/VirtualBoxSDK-6.0.12-133076.zip )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3a5868a443cebca912511404e10eeae8
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.8.130520 b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.8.130520
deleted file mode 100644
index 75f8c8d0d3b2..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.8.130520
+++ /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 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.8 !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.8/VirtualBox-6.0.8-130520-Linux_amd64.run ) https://download.virtualbox.org/virtualbox/6.0.8/Oracle_VM_VirtualBox_Extension_Pack-6.0.8-130520.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.8-130520.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/6.0.8/VirtualBoxSDK-6.0.8-130520.zip )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a5868a443cebca912511404e10eeae8
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.30.130521 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.30.130521
deleted file mode 100644
index 2b1f0063f663..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.30.130521
+++ /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-5.2.30
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/5.2.30/Oracle_VM_VirtualBox_Extension_Pack-5.2.30-130521.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.30-130521.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=751667edca637916b127d6edf32f380f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.12.133076 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.12.133076
new file mode 100644
index 000000000000..b1919be25f54
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.12.133076
@@ -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.12
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/6.0.12/Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=5d58e9732f1ac2629bd2814f42da839b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.8.130520 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.8.130520
deleted file mode 100644
index 8b90bad588d4..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.8.130520
+++ /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.8
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=https://download.virtualbox.org/virtualbox/6.0.8/Oracle_VM_VirtualBox_Extension_Pack-6.0.8-130520.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.8-130520.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_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
index 54ec30d6d8ac..0e1077210157 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.26
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.26
@@ -12,4 +12,4 @@ RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x
 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	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=800d314a31bdfe9bd70d8de2d521e24d
+_md5_=02bca1d027682671ce42214fb3c23515
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.30 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.30
deleted file mode 100644
index e1bdc95ac0b6..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.30
+++ /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/5.2.30/VirtualBox-5.2.30.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	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=ab767e5c3864b883ec51616acb55f60d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.32 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.32
index d86c11f4b941..084d15500357 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.32
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.32
@@ -12,4 +12,4 @@ RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.32/VirtualBox-5.2.32.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	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=ab767e5c3864b883ec51616acb55f60d
+_md5_=b3a3fb966d07a6c657e59fbff143262a
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.10 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.10
index f40bf0d10790..b1ad15dcde9f 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.10
@@ -12,4 +12,4 @@ RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/6.0.10/VirtualBox-6.0.10.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	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=fedec4ed725d102cc7d0047d8ec910ce
+_md5_=f342b805f0120efc63ee3878b44d156c
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.12 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.12
new file mode 100644
index 000000000000..c9d2c01e6da5
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.12
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+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.12/VirtualBox-6.0.12.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	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=f342b805f0120efc63ee3878b44d156c
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.8 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.8
deleted file mode 100644
index 635c3defa5cb..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-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.8/VirtualBox-6.0.8.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	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=fedec4ed725d102cc7d0047d8ec910ce
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.30 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.30
deleted file mode 100644
index cb529da2c12f..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources 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.30.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c210b247d11681c3ac34a330572aa81d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.12 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.12
new file mode 100644
index 000000000000..fbfde78e1d95
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.12
@@ -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.12.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=6daaa9b032c655fed3eae07cbb451483
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.8 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.8
deleted file mode 100644
index 5bbb8359f190..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.8
+++ /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.8.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=6daaa9b032c655fed3eae07cbb451483
diff --git a/metadata/md5-cache/app-emulation/wine-staging-4.11 b/metadata/md5-cache/app-emulation/wine-staging-4.11
deleted file mode 100644
index 90844c4494bf..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-4.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.9.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=4.11
-SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.11.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190511.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v4.11.tar.gz -> wine-staging-4.11.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47e6f962f3f46f3b26ea587a80a4bec7
diff --git a/metadata/md5-cache/app-emulation/wine-staging-4.14 b/metadata/md5-cache/app-emulation/wine-staging-4.14
index aba53add0124..b4c6228dbc4a 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-4.14
+++ b/metadata/md5-cache/app-emulation/wine-staging-4.14
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4.14
 SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.14.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190511.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v4.14.tar.gz -> wine-staging-4.14.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9811c2ae059f5b58b4cb2ca2db7fc87f
+_md5_=16025f70956e6e626c40c1aa92948613
diff --git a/metadata/md5-cache/app-emulation/wine-staging-4.15 b/metadata/md5-cache/app-emulation/wine-staging-4.15
new file mode 100644
index 000000000000..73794ff9bb37
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-4.15
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.9.2 ) 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.15
+SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.15.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190511.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v4.15.tar.gz -> wine-staging-4.15.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=16025f70956e6e626c40c1aa92948613
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index 2dca92d7437c..6b37ba0e6ea2 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190511.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9811c2ae059f5b58b4cb2ca2db7fc87f
+_md5_=16025f70956e6e626c40c1aa92948613
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-4.0.2 b/metadata/md5-cache/app-emulation/wine-vanilla-4.0.2
new file mode 100644
index 000000000000..c279ea0c60c0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-4.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.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.2
+SRC_URI=https://dl.winehq.org/wine/source/4.0/wine-4.0.2.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	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ed7edcd81676eea8a95c385cbc6c72a7
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-4.11 b/metadata/md5-cache/app-emulation/wine-vanilla-4.11
deleted file mode 100644
index beedaaf9ac48..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-4.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.9.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=4.11
-SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.11.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190511.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e13b33c1c00ae17f2a411986b282ab69
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-4.14 b/metadata/md5-cache/app-emulation/wine-vanilla-4.14
index 8497e75d2aaf..73d59c118de5 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-4.14
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-4.14
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4.14
 SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.14.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190511.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0b2a3fdb25b1424a7006753af527b31
+_md5_=e53336d0d1c0c5df961812b354bffae6
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-4.15 b/metadata/md5-cache/app-emulation/wine-vanilla-4.15
new file mode 100644
index 000000000000..a4990890958e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-4.15
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.9.2 ) 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.15
+SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.15.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190511.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e53336d0d1c0c5df961812b354bffae6
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index c485c9557740..2943fbf782c5 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190511.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0b2a3fdb25b1424a7006753af527b31
+_md5_=e53336d0d1c0c5df961812b354bffae6
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 2770257a2abf..aaf550226ef3 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-infinality-1-r1 b/metadata/md5-cache/app-eselect/eselect-infinality-1-r1
index 8f36a2d765d6..8e9231cc8681 100644
--- a/metadata/md5-cache/app-eselect/eselect-infinality-1-r1
+++ b/metadata/md5-cache/app-eselect/eselect-infinality-1-r1
@@ -8,4 +8,4 @@ RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://github.com/yngwin/eselect-infinality/tarball/v1 -> eselect-infinality-1.tar.gz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=63809b4be36662b1922aa2d363035505
+_md5_=7c144030297a1d113a3e3465a58ed858
diff --git a/metadata/md5-cache/app-eselect/eselect-infinality-1.1 b/metadata/md5-cache/app-eselect/eselect-infinality-1.1
index 07699b7092c4..0318e566c0ff 100644
--- a/metadata/md5-cache/app-eselect/eselect-infinality-1.1
+++ b/metadata/md5-cache/app-eselect/eselect-infinality-1.1
@@ -8,4 +8,4 @@ RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://github.com/amadio/eselect-infinality/archive/v1.1.tar.gz -> eselect-infinality-1.1.tar.gz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=2170cd5d68a1d62219c760e120fb5c0b
+_md5_=3fc5ec66477f4e03a9ae8afeb5b5948c
diff --git a/metadata/md5-cache/app-eselect/eselect-lcdfilter-1 b/metadata/md5-cache/app-eselect/eselect-lcdfilter-1
index 68c545022758..0122ab747064 100644
--- a/metadata/md5-cache/app-eselect/eselect-lcdfilter-1
+++ b/metadata/md5-cache/app-eselect/eselect-lcdfilter-1
@@ -9,4 +9,4 @@ RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://github.com/yngwin/eselect-lcdfilter/tarball/v1 -> eselect-lcdfilter-1.tar.gz
 _eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=c532b57646d7ed5f57f80176ac8b1f29
+_md5_=703bc35b61bfed13e3e4b827ceca79d1
diff --git a/metadata/md5-cache/app-eselect/eselect-lcdfilter-2 b/metadata/md5-cache/app-eselect/eselect-lcdfilter-2
index 775234f43c89..5b37636e07bb 100644
--- a/metadata/md5-cache/app-eselect/eselect-lcdfilter-2
+++ b/metadata/md5-cache/app-eselect/eselect-lcdfilter-2
@@ -9,4 +9,4 @@ RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://github.com/yngwin/eselect-lcdfilter/tarball/v2 -> eselect-lcdfilter-2.tar.gz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=d542143bc173cdcc5fdc7de55a88a02d
+_md5_=5b93d59aaa4a9314d1e5d3dfa7ddf90d
diff --git a/metadata/md5-cache/app-eselect/eselect-opencl-1.1.0-r4 b/metadata/md5-cache/app-eselect/eselect-opencl-1.1.0-r4
index bfad39aa2d0a..aeaca1299f6a 100644
--- a/metadata/md5-cache/app-eselect/eselect-opencl-1.1.0-r4
+++ b/metadata/md5-cache/app-eselect/eselect-opencl-1.1.0-r4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst
-DEPEND=app-arch/xz-utils
+DEPEND=app-arch/unzip app-arch/xz-utils
 DESCRIPTION=Utility to change the OpenCL implementation being used
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
@@ -9,4 +9,4 @@ RDEPEND=>=app-admin/eselect-1.2.4
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~xarthisius/distfiles/eselect-opencl-1.1.0-r1.tar.xz https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl10.zip https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl11.zip https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl12.zip https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl20.zip https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl21.zip http://packages.gentooexperimental.org/opencl-cpp-headers.tar
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3f96aa488b33fcb435ce6530e8b15745
+_md5_=0007cc35b6f57b759592852e8bd1fc16
diff --git a/metadata/md5-cache/app-eselect/eselect-ruby-20190121 b/metadata/md5-cache/app-eselect/eselect-ruby-20190121
index e3e39e3e068a..e79f723a621e 100644
--- a/metadata/md5-cache/app-eselect/eselect-ruby-20190121
+++ b/metadata/md5-cache/app-eselect/eselect-ruby-20190121
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages multiple Ruby versions
 EAPI=6
 HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-20190121.xz
-_md5_=af284bcd2368e5238cd7b0391765e175
+_md5_=e794b63c5c7d932605d18e19deb47706
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index b869cb613c1e..64d33a23782f 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/lynis-2.7.3 b/metadata/md5-cache/app-forensics/lynis-2.7.3
deleted file mode 100644
index a5087b1c3828..000000000000
--- a/metadata/md5-cache/app-forensics/lynis-2.7.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Security and system auditing tool
-EAPI=6
-HOMEPAGE=https://cisofy.com/lynis/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-shells/bash
-SLOT=0
-SRC_URI=https://cisofy.com/files/lynis-2.7.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=251cb38bdafd7a0bb6be58aec7c7f135
diff --git a/metadata/md5-cache/app-forensics/lynis-2.7.5 b/metadata/md5-cache/app-forensics/lynis-2.7.5
new file mode 100644
index 000000000000..3c5a25247325
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/lynis-2.7.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Security and system auditing tool
+EAPI=6
+HOMEPAGE=https://cisofy.com/lynis/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-shells/bash
+SLOT=0
+SRC_URI=https://cisofy.com/files/lynis-2.7.5.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=251cb38bdafd7a0bb6be58aec7c7f135
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 9f3ef681f28a..23f0d31be80d 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/librime-1.5.3 b/metadata/md5-cache/app-i18n/librime-1.5.3
index 40ba6f8d8854..b5d6a96c5138 100644
--- a/metadata/md5-cache/app-i18n/librime-1.5.3
+++ b/metadata/md5-cache/app-i18n/librime-1.5.3
@@ -5,11 +5,11 @@ DESCRIPTION=RIME (Rime Input Method Engine) core library
 EAPI=7
 HOMEPAGE=https://rime.im/ https://github.com/rime/librime
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=app-i18n/opencc:0= dev-cpp/glog:0= dev-cpp/yaml-cpp:0= dev-libs/boost:0=[threads] dev-libs/leveldb:0= dev-libs/marisa:0=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/rime/librime/archive/1.5.3.tar.gz -> librime-1.5.3.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=467a71d08f29faf0848bc428bfbde9e5
+_md5_=98362f71479e46faeae2d576d8302549
diff --git a/metadata/md5-cache/app-i18n/opencc-1.0.5 b/metadata/md5-cache/app-i18n/opencc-1.0.5
index aacf257e7132..9aabdc3522c0 100644
--- a/metadata/md5-cache/app-i18n/opencc-1.0.5
+++ b/metadata/md5-cache/app-i18n/opencc-1.0.5
@@ -4,9 +4,9 @@ DESCRIPTION=Libraries for conversion between Traditional and Simplified Chinese
 EAPI=6
 HOMEPAGE=https://github.com/BYVoid/OpenCC
 IUSE=doc test
-KEYWORDS=amd64 ~arm64 hppa ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 hppa ppc ppc64 ~sparc x86
 LICENSE=Apache-2.0
 SLOT=0/2
 SRC_URI=https://github.com/BYVoid/OpenCC/archive/ver.1.0.5.tar.gz -> opencc-1.0.5.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f313255a8411d80a7583ed12fb1545a0
+_md5_=7b5da7811f8596b1980d85c6cdfcf31e
diff --git a/metadata/md5-cache/app-i18n/rime-data-0.38.20180515 b/metadata/md5-cache/app-i18n/rime-data-0.38.20180515
index 86b2faf31846..b8d9059fd153 100644
--- a/metadata/md5-cache/app-i18n/rime-data-0.38.20180515
+++ b/metadata/md5-cache/app-i18n/rime-data-0.38.20180515
@@ -4,9 +4,9 @@ DESCRIPTION=Data resources for Rime Input Method Engine
 EAPI=6
 HOMEPAGE=https://rime.im/ https://github.com/rime/brise
 IUSE=extra
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 ~sparc x86
 LICENSE=GPL-3 LGPL-3 extra? ( Apache-2.0 )
 RDEPEND=app-i18n/librime
 SLOT=0
 SRC_URI=https://github.com/rime/brise/releases/download/brise-0.38/brise-0.38.20180515.tar.gz
-_md5_=539a0e622159271767a991d868e07d00
+_md5_=687ac261310d0cbc78335930f55c024a
diff --git a/metadata/md5-cache/app-i18n/tegaki-zinnia-japanese-0.3 b/metadata/md5-cache/app-i18n/tegaki-zinnia-japanese-0.3
index 6c983f1cf364..4fef4d54d695 100644
--- a/metadata/md5-cache/app-i18n/tegaki-zinnia-japanese-0.3
+++ b/metadata/md5-cache/app-i18n/tegaki-zinnia-japanese-0.3
@@ -1,4 +1,5 @@
 DEFINED_PHASES=compile prepare
+DEPEND=app-arch/unzip
 DESCRIPTION=Handwriting model data of Japanese
 EAPI=5
 HOMEPAGE=http://tegaki.org/
@@ -6,4 +7,4 @@ KEYWORDS=amd64 ~ppc64 x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=http://www.tegaki.org/releases/0.3/models/tegaki-zinnia-japanese-0.3.zip
-_md5_=04f038721ae8a8646175edfaeeb319d2
+_md5_=c587f6a8f6c15e3d90925be2836bbd64
diff --git a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r3 b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r3
deleted file mode 100644
index 26c29b12eb45..000000000000
--- a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( virtual/libmysqlclient ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion ) dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool 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=Japanese handwriting recognition engine
-EAPI=6
-HOMEPAGE=http://tomoe.osdn.jp/
-IUSE=hyperestraier mysql python ruby ruby_targets_ruby24 static-libs subversion python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( virtual/libmysqlclient ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion )
-REQUIRED_USE=python? ( python_targets_python2_7 ) ruby? ( || ( ruby_targets_ruby24 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/tomoe/tomoe-0.6.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=595f327a92d837d0a4a84067e2da4d1b
diff --git a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r4 b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r4
new file mode 100644
index 000000000000..d0bcf41b97fc
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( dev-db/mysql-connector-c:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion ) dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool 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=Japanese handwriting recognition engine
+EAPI=6
+HOMEPAGE=http://tomoe.osdn.jp/
+IUSE=hyperestraier mysql python ruby ruby_targets_ruby24 static-libs subversion python_targets_python2_7
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( dev-db/mysql-connector-c:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion )
+REQUIRED_USE=python? ( python_targets_python2_7 ) ruby? ( || ( ruby_targets_ruby24 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/tomoe/tomoe-0.6.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a2fd01e4b018c1149a9a9c3c30bf98f9
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index c7cc39eb32bc..14ef940a744a 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/msi-keyboard-1.0 b/metadata/md5-cache/app-laptop/msi-keyboard-1.0
new file mode 100644
index 000000000000..374a17e2aaaf
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/msi-keyboard-1.0
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DESCRIPTION=Control backlight of MSI laptop keyboards
+EAPI=7
+HOMEPAGE=https://github.com/makkarpov/msi-keyboard
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-libs/hidapi
+SLOT=0
+SRC_URI=https://github.com/makkarpov/msi-keyboard/archive/v1.0.tar.gz -> msi-keyboard-1.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=33a1217ab9ce1c71f6822f2712b6f052
diff --git a/metadata/md5-cache/app-laptop/tp_smapi-0.43 b/metadata/md5-cache/app-laptop/tp_smapi-0.43
index 292d7027f0f4..8dcc39ed6455 100644
--- a/metadata/md5-cache/app-laptop/tp_smapi-0.43
+++ b/metadata/md5-cache/app-laptop/tp_smapi-0.43
@@ -10,4 +10,4 @@ RDEPEND=sys-apps/dmidecode kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://github.com/evgeni/tp_smapi/releases/download/tp-smapi/0.43/tp_smapi-0.43.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ce8d4f291a62d0c7571a72d116ebc00c
+_md5_=ea4b1ffcb1311290f86958e87b4a087b
diff --git a/metadata/md5-cache/app-leechcraft/Manifest.gz b/metadata/md5-cache/app-leechcraft/Manifest.gz
index 33eb7ee0cf66..6be4bc280dfc 100644
--- a/metadata/md5-cache/app-leechcraft/Manifest.gz
+++ b/metadata/md5-cache/app-leechcraft/Manifest.gz
diff --git a/metadata/md5-cache/app-leechcraft/liblaretz-0.1.2 b/metadata/md5-cache/app-leechcraft/liblaretz-0.1.2
new file mode 100644
index 000000000000..5399fb4abf9b
--- /dev/null
+++ b/metadata/md5-cache/app-leechcraft/liblaretz-0.1.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=
+DESCRIPTION=Shared library to be used by the Laretz sync server and its clients
+EAPI=7
+HOMEPAGE=https://leechcraft.org
+KEYWORDS=~amd64 ~x86
+LICENSE=Boost-1.0
+RDEPEND=dev-libs/boost:=
+SLOT=0
+SRC_URI=https://github.com/0xd34df00d/laretz/archive/0.1.2.tar.gz -> liblaretz-0.1.2.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7797322fe8230f9a3c52f262a031fa99
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index b22b9e56275f..408f4075fbf2 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/alertmanager-0.16.2 b/metadata/md5-cache/app-metrics/alertmanager-0.16.2
deleted file mode 100644
index 14ae204201eb..000000000000
--- a/metadata/md5-cache/app-metrics/alertmanager-0.16.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.11 dev-util/promu >=dev-lang/go-1.10
-DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/alertmanager
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.16.2.tar.gz -> alertmanager-0.16.2.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=436f003036c57f8f626f1c00d95fc8b8
diff --git a/metadata/md5-cache/app-metrics/alertmanager-0.17.0 b/metadata/md5-cache/app-metrics/alertmanager-0.17.0
deleted file mode 100644
index 299323b3c2c7..000000000000
--- a/metadata/md5-cache/app-metrics/alertmanager-0.17.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.11 dev-util/promu >=dev-lang/go-1.10
-DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/alertmanager
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.17.0.tar.gz -> alertmanager-0.17.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=a375ba5b891cd15adfe3c2eb9d41e8bc
diff --git a/metadata/md5-cache/app-metrics/alertmanager-0.19.0 b/metadata/md5-cache/app-metrics/alertmanager-0.19.0
new file mode 100644
index 000000000000..3e999063a9e2
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/alertmanager-0.19.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.11 dev-util/promu >=dev-lang/go-1.10
+DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/alertmanager
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.19.0.tar.gz -> alertmanager-0.19.0.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=ba05e656b3d143a3ad2d51b15112a116
diff --git a/metadata/md5-cache/app-metrics/collectd-5.8.1 b/metadata/md5-cache/app-metrics/collectd-5.8.1
deleted file mode 100644
index 397891f0e68d..000000000000
--- a/metadata/md5-cache/app-metrics/collectd-5.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( virtual/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_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) 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_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) collectd_plugins_java? ( >=virtual/jdk-1.6 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Collects system statistics and provides mechanisms to store the values
-EAPI=6
-HOMEPAGE=https://collectd.org/
-IUSE=contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs collectd_plugins_aggregation collectd_plugins_amqp collectd_plugins_apache collectd_plugins_apcups collectd_plugins_ascent collectd_plugins_battery collectd_plugins_bind collectd_plugins_ceph collectd_plugins_cgroups collectd_plugins_chrony collectd_plugins_conntrack collectd_plugins_contextswitch collectd_plugins_cpu collectd_plugins_cpufreq collectd_plugins_cpusleep collectd_plugins_csv collectd_plugins_curl collectd_plugins_curl_json collectd_plugins_curl_xml collectd_plugins_dbi collectd_plugins_df collectd_plugins_disk collectd_plugins_dns collectd_plugins_drbd collectd_plugins_email collectd_plugins_entropy collectd_plugins_ethstat collectd_plugins_exec collectd_plugins_fhcount collectd_plugins_filecount collectd_plugins_fscache collectd_plugins_gmond collectd_plugins_gps collectd_plugins_hddtemp collectd_plugins_hugepages collectd_plugins_interface collectd_plugins_ipc collectd_plugins_ipmi collectd_plugins_iptables collectd_plugins_ipvs collectd_plugins_irq collectd_plugins_java collectd_plugins_lua collectd_plugins_load collectd_plugins_logfile collectd_plugins_log_logstash collectd_plugins_lvm collectd_plugins_madwifi collectd_plugins_match_empty_counter collectd_plugins_match_hashed collectd_plugins_match_regex collectd_plugins_match_timediff collectd_plugins_match_value collectd_plugins_mbmon collectd_plugins_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_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=alpha amd64 arm 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_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) 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_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) 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	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c767e13b061c04a314b40f75a1f54239
diff --git a/metadata/md5-cache/app-metrics/collectd-5.8.1-r1 b/metadata/md5-cache/app-metrics/collectd-5.8.1-r1
new file mode 100644
index 000000000000..2f0c94d06db4
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/collectd-5.8.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) 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_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) 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_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) collectd_plugins_java? ( >=virtual/jdk-1.6 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Collects system statistics and provides mechanisms to store the values
+EAPI=6
+HOMEPAGE=https://collectd.org/
+IUSE=contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs collectd_plugins_aggregation collectd_plugins_amqp collectd_plugins_apache collectd_plugins_apcups collectd_plugins_ascent collectd_plugins_battery collectd_plugins_bind collectd_plugins_ceph collectd_plugins_cgroups collectd_plugins_chrony collectd_plugins_conntrack collectd_plugins_contextswitch collectd_plugins_cpu collectd_plugins_cpufreq collectd_plugins_cpusleep collectd_plugins_csv collectd_plugins_curl collectd_plugins_curl_json collectd_plugins_curl_xml collectd_plugins_dbi collectd_plugins_df collectd_plugins_disk collectd_plugins_dns collectd_plugins_drbd collectd_plugins_email collectd_plugins_entropy collectd_plugins_ethstat collectd_plugins_exec collectd_plugins_fhcount collectd_plugins_filecount collectd_plugins_fscache collectd_plugins_gmond collectd_plugins_gps collectd_plugins_hddtemp collectd_plugins_hugepages collectd_plugins_interface collectd_plugins_ipc collectd_plugins_ipmi collectd_plugins_iptables collectd_plugins_ipvs collectd_plugins_irq collectd_plugins_java collectd_plugins_lua collectd_plugins_load collectd_plugins_logfile collectd_plugins_log_logstash collectd_plugins_lvm collectd_plugins_madwifi collectd_plugins_match_empty_counter collectd_plugins_match_hashed collectd_plugins_match_regex collectd_plugins_match_timediff collectd_plugins_match_value collectd_plugins_mbmon collectd_plugins_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_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=alpha amd64 arm 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? ( dev-db/mysql-connector-c:= ) 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_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) 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_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) 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	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=9d13dd071b915e1b5dc94973fd239949
diff --git a/metadata/md5-cache/app-metrics/collectd-5.9.1 b/metadata/md5-cache/app-metrics/collectd-5.9.1
deleted file mode 100644
index b5282ce3d374..000000000000
--- a/metadata/md5-cache/app-metrics/collectd-5.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( virtual/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_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) 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_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) collectd_plugins_java? ( >=virtual/jdk-1.6 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Collects system statistics and provides mechanisms to store the values
-EAPI=6
-HOMEPAGE=https://collectd.org/
-IUSE=contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs collectd_plugins_aggregation collectd_plugins_amqp collectd_plugins_apache collectd_plugins_apcups collectd_plugins_ascent collectd_plugins_battery collectd_plugins_bind collectd_plugins_ceph collectd_plugins_cgroups collectd_plugins_chrony collectd_plugins_conntrack collectd_plugins_contextswitch collectd_plugins_cpu collectd_plugins_cpufreq collectd_plugins_cpusleep collectd_plugins_csv collectd_plugins_curl collectd_plugins_curl_json collectd_plugins_curl_xml collectd_plugins_dbi collectd_plugins_df collectd_plugins_disk collectd_plugins_dns collectd_plugins_drbd collectd_plugins_email collectd_plugins_entropy collectd_plugins_ethstat collectd_plugins_exec collectd_plugins_fhcount collectd_plugins_filecount collectd_plugins_fscache collectd_plugins_gmond collectd_plugins_gps collectd_plugins_hddtemp collectd_plugins_hugepages collectd_plugins_interface collectd_plugins_ipc collectd_plugins_ipmi collectd_plugins_iptables collectd_plugins_ipvs collectd_plugins_irq collectd_plugins_java collectd_plugins_lua collectd_plugins_load collectd_plugins_logfile collectd_plugins_log_logstash collectd_plugins_lvm collectd_plugins_madwifi collectd_plugins_match_empty_counter collectd_plugins_match_hashed collectd_plugins_match_regex collectd_plugins_match_timediff collectd_plugins_match_value collectd_plugins_mbmon collectd_plugins_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_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~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_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) 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_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) collectd_plugins_smart? ( udev )
-SLOT=0
-SRC_URI=https://github.com/collectd/collectd/archive/collectd-5.9.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6ee64abc4f1e13e788b1fd9cc2a6ae22
diff --git a/metadata/md5-cache/app-metrics/collectd-5.9.1-r2 b/metadata/md5-cache/app-metrics/collectd-5.9.1-r2
new file mode 100644
index 000000000000..d1bf5cd21999
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/collectd-5.9.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) 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_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) 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_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) collectd_plugins_java? ( >=virtual/jdk-1.6 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Collects system statistics and provides mechanisms to store the values
+EAPI=6
+HOMEPAGE=https://collectd.org/
+IUSE=contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs collectd_plugins_aggregation collectd_plugins_amqp collectd_plugins_apache collectd_plugins_apcups collectd_plugins_ascent collectd_plugins_battery collectd_plugins_bind collectd_plugins_ceph collectd_plugins_cgroups collectd_plugins_chrony collectd_plugins_conntrack collectd_plugins_contextswitch collectd_plugins_cpu collectd_plugins_cpufreq collectd_plugins_cpusleep collectd_plugins_csv collectd_plugins_curl collectd_plugins_curl_json collectd_plugins_curl_xml collectd_plugins_dbi collectd_plugins_df collectd_plugins_disk collectd_plugins_dns collectd_plugins_drbd collectd_plugins_email collectd_plugins_entropy collectd_plugins_ethstat collectd_plugins_exec collectd_plugins_fhcount collectd_plugins_filecount collectd_plugins_fscache collectd_plugins_gmond collectd_plugins_gps collectd_plugins_hddtemp collectd_plugins_hugepages collectd_plugins_interface collectd_plugins_ipc collectd_plugins_ipmi collectd_plugins_iptables collectd_plugins_ipvs collectd_plugins_irq collectd_plugins_java collectd_plugins_lua collectd_plugins_load collectd_plugins_logfile collectd_plugins_log_logstash collectd_plugins_lvm collectd_plugins_madwifi collectd_plugins_match_empty_counter collectd_plugins_match_hashed collectd_plugins_match_regex collectd_plugins_match_timediff collectd_plugins_match_value collectd_plugins_mbmon collectd_plugins_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_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~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? ( dev-db/mysql-connector-c:= ) 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_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) 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_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) collectd_plugins_smart? ( udev )
+SLOT=0
+SRC_URI=https://github.com/collectd/collectd/archive/collectd-5.9.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=bf0de220a0a26b690ca1dfcdceddc1c2
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.12.0 b/metadata/md5-cache/app-metrics/prometheus-2.12.0
new file mode 100644
index 000000000000..520cf78d60e1
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/prometheus-2.12.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=>=dev-lang/go-1.12 >=dev-util/promu-0.3.0 >=dev-lang/go-1.10
+DESCRIPTION=Prometheus monitoring system and time series database
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/prometheus
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/prometheus/prometheus/archive/v2.12.0.tar.gz -> prometheus-2.12.0.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=e7aa3aaf8146185d52baa1409851743e
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 0b6a01abd2a1..a8072787326d 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/banner-1.3.4 b/metadata/md5-cache/app-misc/banner-1.3.4
new file mode 100644
index 000000000000..2dc6b6fa9d67
--- /dev/null
+++ b/metadata/md5-cache/app-misc/banner-1.3.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=The well known banner program for Linux
+EAPI=7
+HOMEPAGE=http://cedar-solutions.com/
+KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!games-misc/bsd-games
+SLOT=0
+SRC_URI=http://cedar-solutions.com/ftp/software/banner-1.3.4.tar.gz
+_md5_=2325683541ea477cac709d5df6f7a4ae
diff --git a/metadata/md5-cache/app-misc/btail-0.3-r1 b/metadata/md5-cache/app-misc/btail-0.3-r1
index 20341b0cff07..a1193906f17b 100644
--- a/metadata/md5-cache/app-misc/btail-0.3-r1
+++ b/metadata/md5-cache/app-misc/btail-0.3-r1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/gdbm
 SLOT=0
-SRC_URI=https://www.vanheusden.com/btail//btail-0.3.tgz
+SRC_URI=https://www.vanheusden.com/btail/btail-0.3.tgz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=5f1ff992b0e635b7045e0452f8cc6237
+_md5_=f30c7efb6c79426dbffe1ad67d07c524
diff --git a/metadata/md5-cache/app-misc/clockywock-0.3.1a b/metadata/md5-cache/app-misc/clockywock-0.3.1a
index 239f51edcacf..b36cffd02f34 100644
--- a/metadata/md5-cache/app-misc/clockywock-0.3.1a
+++ b/metadata/md5-cache/app-misc/clockywock-0.3.1a
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0=
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
 DESCRIPTION=ncurses based analog clock
-EAPI=6
+EAPI=7
 HOMEPAGE=https://soomka.com/clockywock
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://soomka.com/clockywock-0.3.1a.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=96744eaa0fa59d1c29abe9a6f1a42b81
+_md5_=dcd5d84a40708de1ec28cdf8b0897707
diff --git a/metadata/md5-cache/app-misc/editor-wrapper-4 b/metadata/md5-cache/app-misc/editor-wrapper-4
deleted file mode 100644
index b426d9b7bc52..000000000000
--- a/metadata/md5-cache/app-misc/editor-wrapper-4
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Wrapper scripts that will execute EDITOR or PAGER
-EAPI=4
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-_md5_=07cbaf28ffbf821068942093c9d8e80a
diff --git a/metadata/md5-cache/app-misc/editor-wrapper-4-r1 b/metadata/md5-cache/app-misc/editor-wrapper-4-r1
new file mode 100644
index 000000000000..588a216fdbc7
--- /dev/null
+++ b/metadata/md5-cache/app-misc/editor-wrapper-4-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Wrapper scripts that will execute EDITOR or PAGER
+EAPI=7
+HOMEPAGE=https://www.gentoo.org/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+SLOT=0
+_md5_=d1bad254578304813b79f28f4034c59d
diff --git a/metadata/md5-cache/app-misc/fslint-2.46 b/metadata/md5-cache/app-misc/fslint-2.46
index 8e51625a0246..0dc74fb85edc 100644
--- a/metadata/md5-cache/app-misc/fslint-2.46
+++ b/metadata/md5-cache/app-misc/fslint-2.46
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.pixelbeat.org/fslint/fslint-2.46.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4d584da5dd805813e14b99e69296afe6
+_md5_=7504c56f858a4b31e868a6842dfac5b7
diff --git a/metadata/md5-cache/app-misc/geoclue-2.5.3-r2 b/metadata/md5-cache/app-misc/geoclue-2.5.3-r2
index 308b0c6bea8d..612f70716996 100644
--- a/metadata/md5-cache/app-misc/geoclue-2.5.3-r2
+++ b/metadata/md5-cache/app-misc/geoclue-2.5.3-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.14.0 >=net-libs/libsoup-2.
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.0
 SRC_URI=https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/2.5.3/geoclue-2.5.3.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d94099e7012de710a15e5e0518b0816b
diff --git a/metadata/md5-cache/app-misc/glcdprocdriver-0.1.2 b/metadata/md5-cache/app-misc/glcdprocdriver-0.1.2
index e3d5eea3237c..f4873e4b4b32 100644
--- a/metadata/md5-cache/app-misc/glcdprocdriver-0.1.2
+++ b/metadata/md5-cache/app-misc/glcdprocdriver-0.1.2
@@ -9,4 +9,4 @@ RDEPEND=>=app-misc/graphlcd-base-1.0.0
 SLOT=0
 SRC_URI=https://github.com/lucianm/GLCDprocDriver/archive/0.1.2.tar.gz -> GLCDprocDriver-0.1.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6df53dfd9541a85f17680dfae419848a
+_md5_=adcb4bcf0a64bc225254b99f3d52f9f7
diff --git a/metadata/md5-cache/app-misc/hello-2.10 b/metadata/md5-cache/app-misc/hello-2.10
deleted file mode 100644
index e9c55825df15..000000000000
--- a/metadata/md5-cache/app-misc/hello-2.10
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=GNU "Hello, world" application
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/hello/
-IUSE=nls
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=FDL-1.3 GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/hello/hello-2.10.tar.gz
-_md5_=1b2dc791e417a7356b4e09fbe8bbb2c3
diff --git a/metadata/md5-cache/app-misc/hello-2.10-r1 b/metadata/md5-cache/app-misc/hello-2.10-r1
new file mode 100644
index 000000000000..29df25d565c3
--- /dev/null
+++ b/metadata/md5-cache/app-misc/hello-2.10-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure
+DESCRIPTION=GNU "Hello, world" application
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/hello/
+IUSE=nls
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=FDL-1.3 GPL-3
+SLOT=0
+SRC_URI=mirror://gnu/hello/hello-2.10.tar.gz
+_md5_=d8938362b38024a53c337559d866d8ea
diff --git a/metadata/md5-cache/app-misc/lcdproc-0.5.9 b/metadata/md5-cache/app-misc/lcdproc-0.5.9
index a8c75bfba056..ca687a3b9c18 100644
--- a/metadata/md5-cache/app-misc/lcdproc-0.5.9
+++ b/metadata/md5-cache/app-misc/lcdproc-0.5.9
@@ -4,11 +4,11 @@ DESCRIPTION=Displays real-time system information from your Linux/*BSD box on a
 EAPI=6
 HOMEPAGE=http://www.lcdproc.org/
 IUSE=debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontzpacket lcd_devices_curses lcd_devices_cwlnx lcd_devices_ea65 lcd_devices_eyeboxone lcd_devices_futaba lcd_devices_g15 lcd_devices_glcd lcd_devices_glcdlib lcd_devices_glk lcd_devices_hd44780 lcd_devices_i2500vfd lcd_devices_icp_a106 lcd_devices_imon lcd_devices_imonlcd lcd_devices_iowarrior lcd_devices_irman lcd_devices_irtrans lcd_devices_joy lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_lcterm lcd_devices_linux_input lcd_devices_lirc lcd_devices_lis lcd_devices_md8800 lcd_devices_mdm166a lcd_devices_ms6931 lcd_devices_mtc_s16209x lcd_devices_mtxorb lcd_devices_mx5000 lcd_devices_noritakevfd lcd_devices_olimex_mod_lcd1x9 lcd_devices_picolcd lcd_devices_pyramid lcd_devices_rawserial lcd_devices_sdeclcd lcd_devices_sed1330 lcd_devices_sed1520 lcd_devices_serialpos lcd_devices_serialvfd lcd_devices_shuttlevfd lcd_devices_sli lcd_devices_stv5730 lcd_devices_sureelec lcd_devices_t6963 lcd_devices_text lcd_devices_tyan lcd_devices_ula200 lcd_devices_vlsys_m428 lcd_devices_xosd lcd_devices_yard2lcd
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=lcd_devices_cfontz? ( dev-libs/libhid:= ) lcd_devices_cfontzpacket? ( dev-libs/libhid:= ) lcd_devices_cwlnx? ( dev-libs/libhid:= ) lcd_devices_futaba? ( virtual/libusb:1= ) lcd_devices_g15? ( app-misc/g15daemon dev-libs/libg15render:= virtual/libusb:0= ) lcd_devices_glcd? ( app-misc/glcdprocdriver:= dev-embedded/libftdi:1= dev-libs/libhid:= dev-libs/serdisplib:= virtual/libusb:0= x11-libs/libX11:= ) lcd_devices_hd44780? ( dev-embedded/libftdi:1= dev-libs/libugpio:= virtual/libusb:0= ) lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= ) lcd_devices_irman? ( media-libs/libirman:= ) lcd_devices_iowarrior? ( virtual/libusb:0= ) lcd_devices_lirc? ( app-misc/lirc ) lcd_devices_lis? ( dev-embedded/libftdi:1= ) lcd_devices_lb216? ( dev-libs/libhid:= ) lcd_devices_mdm166a? ( dev-libs/libhid:= ) lcd_devices_mtc_s16209x? ( dev-libs/libhid:= ) lcd_devices_mx5000? ( app-misc/mx5000tools ) lcd_devices_noritakevfd? ( dev-libs/libhid:= ) lcd_devices_picolcd? ( virtual/libusb:1= ) lcd_devices_shuttlevfd? ( virtual/libusb:0= ) lcd_devices_ula200? ( dev-embedded/libftdi:1= ) lcd_devices_xosd? ( x11-libs/libX11:= x11-libs/xosd:= )
 REQUIRED_USE=ethlcd? ( lcd_devices_hd44780 ) freetype? ( lcd_devices_glcd ) png? ( lcd_devices_glcd ) || ( lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontzpacket lcd_devices_curses lcd_devices_cwlnx lcd_devices_ea65 lcd_devices_eyeboxone lcd_devices_futaba lcd_devices_g15 lcd_devices_glcd lcd_devices_glcdlib lcd_devices_glk lcd_devices_hd44780 lcd_devices_i2500vfd lcd_devices_icp_a106 lcd_devices_imon lcd_devices_imonlcd lcd_devices_iowarrior lcd_devices_irman lcd_devices_irtrans lcd_devices_joy lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_lcterm lcd_devices_linux_input lcd_devices_lirc lcd_devices_lis lcd_devices_md8800 lcd_devices_mdm166a lcd_devices_ms6931 lcd_devices_mtc_s16209x lcd_devices_mtxorb lcd_devices_mx5000 lcd_devices_noritakevfd lcd_devices_olimex_mod_lcd1x9 lcd_devices_picolcd lcd_devices_pyramid lcd_devices_rawserial lcd_devices_sdeclcd lcd_devices_sed1330 lcd_devices_sed1520 lcd_devices_serialpos lcd_devices_serialvfd lcd_devices_shuttlevfd lcd_devices_sli lcd_devices_stv5730 lcd_devices_sureelec lcd_devices_t6963 lcd_devices_text lcd_devices_tyan lcd_devices_ula200 lcd_devices_vlsys_m428 lcd_devices_xosd lcd_devices_yard2lcd )
 SLOT=0
 SRC_URI=https://github.com/lcdproc/lcdproc/releases/download/v0.5.9/lcdproc-0.5.9.tar.gz https://raw.githubusercontent.com/lcdproc/lcdproc/master/docs/lcdproc-user/drivers/linux_input.docbook
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6d99eda0c021c6812c65999655b65a78
+_md5_=5b92071a14153f421d8a45fc88b8c8a5
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1-r1 b/metadata/md5-cache/app-misc/lirc-0.10.1-r1
index 416a8613603c..c9c66c6e78a1 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.1-r1
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0338281df54d1c9680c1ddcbd00abd7a
+_md5_=9042384cdb20e17513e7526ba9d86428
diff --git a/metadata/md5-cache/app-misc/mc-4.8.22 b/metadata/md5-cache/app-misc/mc-4.8.22
index b345c0b3450e..0beae574837d 100644
--- a/metadata/md5-cache/app-misc/mc-4.8.22
+++ b/metadata/md5-cache/app-misc/mc-4.8.22
@@ -11,4 +11,4 @@ REQUIRED_USE=spell? ( edit )
 SLOT=0
 SRC_URI=http://ftp.midnight-commander.org/mc-4.8.22.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2abc4e1f7fa31e608f2668968d448321
+_md5_=89f89a7e37df7863825edd3ed7f0256e
diff --git a/metadata/md5-cache/app-misc/mc-4.8.23 b/metadata/md5-cache/app-misc/mc-4.8.23
index 49f0b9482997..6cb45f3cdc47 100644
--- a/metadata/md5-cache/app-misc/mc-4.8.23
+++ b/metadata/md5-cache/app-misc/mc-4.8.23
@@ -11,4 +11,4 @@ REQUIRED_USE=spell? ( edit )
 SLOT=0
 SRC_URI=http://ftp.midnight-commander.org/mc-4.8.23.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=fbe03225cabcdf9c5badeb21f56fac12
+_md5_=05eda1ff9abad78b46e8c1e6570d3285
diff --git a/metadata/md5-cache/app-misc/mc-4.8.23-r1 b/metadata/md5-cache/app-misc/mc-4.8.23-r1
index 4fdf26f57fc1..2e449e41750e 100644
--- a/metadata/md5-cache/app-misc/mc-4.8.23-r1
+++ b/metadata/md5-cache/app-misc/mc-4.8.23-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=spell? ( edit )
 SLOT=0
 SRC_URI=http://ftp.midnight-commander.org/mc-4.8.23.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=ec73afa0a538c24a54c9704a9c365d23
+_md5_=ccb66ea5b173c41d8e9713d908c05ffb
diff --git a/metadata/md5-cache/app-misc/media-player-info-23 b/metadata/md5-cache/app-misc/media-player-info-23
index 09b0639c8266..8d48f5cbed51 100644
--- a/metadata/md5-cache/app-misc/media-player-info-23
+++ b/metadata/md5-cache/app-misc/media-player-info-23
@@ -10,4 +10,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/media-player-info/media-player-info-23.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2b090c1dede8aa4b9751993e43646ea1
+_md5_=083a4599d3910c7e7d06c2f5bee46fd9
diff --git a/metadata/md5-cache/app-misc/neofetch-6.1.0 b/metadata/md5-cache/app-misc/neofetch-6.1.0
new file mode 100644
index 000000000000..68fdb686ca88
--- /dev/null
+++ b/metadata/md5-cache/app-misc/neofetch-6.1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Simple information system script
+EAPI=7
+HOMEPAGE=https://github.com/dylanaraps/neofetch
+IUSE=X
+KEYWORDS=~amd64 ~mips ~x86 ~amd64-fbsd
+LICENSE=MIT-with-advertising
+RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
+SLOT=0
+SRC_URI=https://github.com/dylanaraps/neofetch/archive/6.1.0/neofetch-6.1.0.tar.gz
+_md5_=636101049b78792c533539e13fcd210d
diff --git a/metadata/md5-cache/app-misc/oneko-1.2_p5 b/metadata/md5-cache/app-misc/oneko-1.2_p5
index 4a826e4e356d..855a4aef71f3 100644
--- a/metadata/md5-cache/app-misc/oneko-1.2_p5
+++ b/metadata/md5-cache/app-misc/oneko-1.2_p5
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://www.daidouji.com/oneko/distfiles/oneko-1.2.sakura.5.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png mirror://gentoo/oneko-1.2-sakura-nobsd.patch.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=302ddc8b5758f61b49e4eae558c51e30
+_md5_=582e5c2559ba186d31e2a8093fa03ccd
diff --git a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14 b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14
new file mode 100644
index 000000000000..14f8e3ff2aef
--- /dev/null
+++ b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
+DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen
+EAPI=7
+HOMEPAGE=http://www.daidouji.com/oneko/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=public-domain
+RDEPEND=x11-libs/libX11 x11-libs/libXext
+SLOT=0
+SRC_URI=mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6-14.debian.tar.xz mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6.orig.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ea6025fa68a4c64222d354d28f9af0a3
diff --git a/metadata/md5-cache/app-misc/remind-03.01.16 b/metadata/md5-cache/app-misc/remind-03.01.16
new file mode 100644
index 000000000000..bf85fb67b817
--- /dev/null
+++ b/metadata/md5-cache/app-misc/remind-03.01.16
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare test
+DESCRIPTION=Ridiculously functional reminder program
+EAPI=7
+HOMEPAGE=https://dianne.skoll.ca/projects/remind/
+IUSE=tk
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=tk? ( dev-lang/tk dev-tcltk/tcllib )
+SLOT=0
+SRC_URI=https://dianne.skoll.ca/projects/remind/download/remind-03.01.16.tar.gz
+_md5_=afe2d725e06e5a7c1773cb4a255a5d5c
diff --git a/metadata/md5-cache/app-misc/rox-filer-2.11 b/metadata/md5-cache/app-misc/rox-filer-2.11
index 59d3918bad51..d4e7409b9283 100644
--- a/metadata/md5-cache/app-misc/rox-filer-2.11
+++ b/metadata/md5-cache/app-misc/rox-filer-2.11
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl dev-libs/libxml2:2 gnome-base/libglade:2.0 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/rox/rox-filer-2.11.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=5f820861c42c6aa9c95c34244f440c50
+_md5_=43f7e136e349be3edd8c36126028b98e
diff --git a/metadata/md5-cache/app-misc/rq-0.10.4 b/metadata/md5-cache/app-misc/rq-0.10.4
index 51c2694d6b91..86b72c187bd6 100644
--- a/metadata/md5-cache/app-misc/rq-0.10.4
+++ b/metadata/md5-cache/app-misc/rq-0.10.4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/dflemstr/rq/archive/v0.10.4.tar.gz -> rq-0.10.4.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/aho-corasick/0.6.2/download -> aho-corasick-0.6.2.crate https://crates.io/api/v1/crates/ansi_term/0.9.0/download -> ansi_term-0.9.0.crate https://crates.io/api/v1/crates/aster/0.38.0/download -> aster-0.38.0.crate https://crates.io/api/v1/crates/atty/0.2.2/download -> atty-0.2.2.crate https://crates.io/api/v1/crates/backtrace/0.3.0/download -> backtrace-0.3.0.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.10/download -> backtrace-sys-0.1.10.crate https://crates.io/api/v1/crates/bindgen/0.22.1/download -> bindgen-0.22.1.crate https://crates.io/api/v1/crates/bitflags/0.4.0/download -> bitflags-0.4.0.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/bitflags/0.8.0/download -> bitflags-0.8.0.crate https://crates.io/api/v1/crates/byteorder/1.0.0/download -> byteorder-1.0.0.crate https://crates.io/api/v1/crates/cexpr/0.2.0/download -> cexpr-0.2.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.0/download -> cfg-if-0.1.0.crate https://crates.io/api/v1/crates/clang/0.15.0/download -> clang-0.15.0.crate https://crates.io/api/v1/crates/clang-sys/0.14.0/download -> clang-sys-0.14.0.crate https://crates.io/api/v1/crates/clap/2.21.1/download -> clap-2.21.1.crate https://crates.io/api/v1/crates/crc/1.4.0/download -> crc-1.4.0.crate https://crates.io/api/v1/crates/dbghelp-sys/0.2.0/download -> dbghelp-sys-0.2.0.crate https://crates.io/api/v1/crates/docopt/0.7.0/download -> docopt-0.7.0.crate https://crates.io/api/v1/crates/dtoa/0.4.1/download -> dtoa-0.4.1.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/env_logger/0.4.2/download -> env_logger-0.4.2.crate https://crates.io/api/v1/crates/error-chain/0.9.0/download -> error-chain-0.9.0.crate https://crates.io/api/v1/crates/flate2/0.2.17/download -> flate2-0.2.17.crate https://crates.io/api/v1/crates/gcc/0.3.43/download -> gcc-0.3.43.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/itoa/0.3.1/download -> itoa-0.3.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/lazy_static/0.2.4/download -> lazy_static-0.2.4.crate https://crates.io/api/v1/crates/libc/0.2.21/download -> libc-0.2.21.crate https://crates.io/api/v1/crates/libloading/0.3.2/download -> libloading-0.3.2.crate https://crates.io/api/v1/crates/linked-hash-map/0.3.0/download -> linked-hash-map-0.3.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.4.1/download -> linked-hash-map-0.4.1.crate https://crates.io/api/v1/crates/log/0.3.7/download -> log-0.3.7.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/memchr/1.0.1/download -> memchr-1.0.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.9/download -> miniz-sys-0.1.9.crate https://crates.io/api/v1/crates/nix/0.7.0/download -> nix-0.7.0.crate https://crates.io/api/v1/crates/nom/1.2.4/download -> nom-1.2.4.crate https://crates.io/api/v1/crates/num-traits/0.1.37/download -> num-traits-0.1.37.crate https://crates.io/api/v1/crates/num_cpus/1.3.0/download -> num_cpus-1.3.0.crate https://crates.io/api/v1/crates/ordered-float/0.4.0/download -> ordered-float-0.4.0.crate https://crates.io/api/v1/crates/pest/0.4.1/download -> pest-0.4.1.crate https://crates.io/api/v1/crates/phf/0.7.21/download -> phf-0.7.21.crate https://crates.io/api/v1/crates/phf_codegen/0.7.21/download -> phf_codegen-0.7.21.crate https://crates.io/api/v1/crates/phf_generator/0.7.21/download -> phf_generator-0.7.21.crate https://crates.io/api/v1/crates/phf_shared/0.7.21/download -> phf_shared-0.7.21.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/protobuf/1.2.2/download -> protobuf-1.2.2.crate https://crates.io/api/v1/crates/quasi/0.29.0/download -> quasi-0.29.0.crate https://crates.io/api/v1/crates/quasi_codegen/0.29.0/download -> quasi_codegen-0.29.0.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex/0.2.1/download -> regex-0.2.1.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.4.0/download -> regex-syntax-0.4.0.crate https://crates.io/api/v1/crates/rmp/0.8.5/download -> rmp-0.8.5.crate https://crates.io/api/v1/crates/rmpv/0.2.0/download -> rmpv-0.2.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.4/download -> rustc-demangle-0.1.4.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.22/download -> rustc-serialize-0.3.22.crate https://crates.io/api/v1/crates/rustc_version/0.1.7/download -> rustc_version-0.1.7.crate https://crates.io/api/v1/crates/semver/0.1.20/download -> semver-0.1.20.crate https://crates.io/api/v1/crates/serde/0.8.23/download -> serde-0.8.23.crate https://crates.io/api/v1/crates/serde/0.9.11/download -> serde-0.9.11.crate https://crates.io/api/v1/crates/serde-hjson/0.8.1/download -> serde-hjson-0.8.1.crate https://crates.io/api/v1/crates/serde-value/0.4.0/download -> serde-value-0.4.0.crate https://crates.io/api/v1/crates/serde_cbor/0.5.2/download -> serde_cbor-0.5.2.crate https://crates.io/api/v1/crates/serde_codegen_internals/0.14.1/download -> serde_codegen_internals-0.14.1.crate https://crates.io/api/v1/crates/serde_derive/0.9.11/download -> serde_derive-0.9.11.crate https://crates.io/api/v1/crates/serde_json/0.9.9/download -> serde_json-0.9.9.crate https://crates.io/api/v1/crates/serde_test/0.8.23/download -> serde_test-0.8.23.crate https://crates.io/api/v1/crates/serde_yaml/0.6.2/download -> serde_yaml-0.6.2.crate https://crates.io/api/v1/crates/siphasher/0.2.1/download -> siphasher-0.2.1.crate https://crates.io/api/v1/crates/snap/0.2.1/download -> snap-0.2.1.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/syn/0.11.9/download -> syn-0.11.9.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/syntex/0.54.0/download -> syntex-0.54.0.crate https://crates.io/api/v1/crates/syntex_errors/0.54.0/download -> syntex_errors-0.54.0.crate https://crates.io/api/v1/crates/syntex_pos/0.54.0/download -> syntex_pos-0.54.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.54.0/download -> syntex_syntax-0.54.0.crate https://crates.io/api/v1/crates/target_build_utils/0.3.0/download -> target_build_utils-0.3.0.crate https://crates.io/api/v1/crates/term/0.4.5/download -> term-0.4.5.crate https://crates.io/api/v1/crates/term_size/0.2.3/download -> term_size-0.2.3.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread-id/3.0.0/download -> thread-id-3.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/thread_local/0.3.3/download -> thread_local-0.3.3.crate https://crates.io/api/v1/crates/toml/0.3.1/download -> toml-0.3.1.crate https://crates.io/api/v1/crates/unicode-segmentation/1.1.0/download -> unicode-segmentation-1.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unreachable/0.1.1/download -> unreachable-0.1.1.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/v8/0.9.6/download -> v8-0.9.6.crate https://crates.io/api/v1/crates/v8-api/0.7.3/download -> v8-api-0.7.3.crate https://crates.io/api/v1/crates/v8-sys/0.14.7/download -> v8-sys-0.14.7.crate https://crates.io/api/v1/crates/vec_map/0.7.0/download -> vec_map-0.7.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/xdg-basedir/1.0.0/download -> xdg-basedir-1.0.0.crate https://crates.io/api/v1/crates/yaml-rust/0.3.5/download -> yaml-rust-0.3.5.crate amd64? ( https://s3-eu-west-1.amazonaws.com/record-query/v8/x86_64-unknown-linux-gnu/5.6.222/v8-build.tar.gz -> rq-v8-5.6.222-x86_64-build.tar.gz ) x86? ( https://s3-eu-west-1.amazonaws.com/record-query/v8/i686-unknown-linux-gnu/5.6.222/v8-build.tar.gz -> rq-v8-5.6.222-i686-build.tar.gz )
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=c7c9f90ed7ffdff91bdb5ba8e4d8c42b
diff --git a/metadata/md5-cache/app-misc/screenfetch-3.8.0-r1 b/metadata/md5-cache/app-misc/screenfetch-3.8.0-r1
index 7eb90f5bdb90..a1aca4b1fd25 100644
--- a/metadata/md5-cache/app-misc/screenfetch-3.8.0-r1
+++ b/metadata/md5-cache/app-misc/screenfetch-3.8.0-r1
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 RDEPEND=curl? ( net-misc/curl ) X? ( media-gfx/scrot x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=https://github.com/KittyKatt/screenFetch/archive/v3.8.0.tar.gz -> screenfetch-3.8.0.tar.gz
-_md5_=7246e9b9a16089b961c6f23d73fa5cb3
+_md5_=6179460e8ff8d522feb6768af7b535a2
diff --git a/metadata/md5-cache/app-misc/screenfetch-9999 b/metadata/md5-cache/app-misc/screenfetch-9999
index 245434979111..8eaaa4cdefd1 100644
--- a/metadata/md5-cache/app-misc/screenfetch-9999
+++ b/metadata/md5-cache/app-misc/screenfetch-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=curl? ( net-misc/curl ) X? ( media-gfx/scrot x11-apps/xdpyinfo )
 SLOT=0
 _eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1
-_md5_=ea8c3afac38be58aca1be9f29ac27f24
+_md5_=f84cc4cdabf23621de28685485dbbb01
diff --git a/metadata/md5-cache/app-misc/skim-0.5.2 b/metadata/md5-cache/app-misc/skim-0.5.2
index f7d59166674c..8bc33712aa66 100644
--- a/metadata/md5-cache/app-misc/skim-0.5.2
+++ b/metadata/md5-cache/app-misc/skim-0.5.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/lotabout/skim/archive/v0.5.2.tar.gz -> skim-0.5.2.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.10.2/download -> ansi_term-0.10.2.crate https://crates.io/api/v1/crates/atty/0.2.3/download -> atty-0.2.3.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/cc/1.0.17/download -> cc-1.0.17.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.28.0/download -> clap-2.28.0.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.32/download -> redox_syscall-0.1.32.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.3/download -> regex-0.2.3.crate https://crates.io/api/v1/crates/regex-syntax/0.4.1/download -> regex-syntax-0.4.1.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.4/download -> thread_local-0.3.4.crate https://crates.io/api/v1/crates/time/0.1.38/download -> time-0.1.38.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.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.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vec_map/0.8.0/download -> vec_map-0.8.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=1e7e033341b431f8f2e850afe3f8958e
diff --git a/metadata/md5-cache/app-misc/skim-0.5.4 b/metadata/md5-cache/app-misc/skim-0.5.4
index b02769ae6010..aaf5d7e91211 100644
--- a/metadata/md5-cache/app-misc/skim-0.5.4
+++ b/metadata/md5-cache/app-misc/skim-0.5.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/lotabout/skim/archive/v0.5.4.tar.gz -> skim-0.5.4.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.10.2/download -> ansi_term-0.10.2.crate https://crates.io/api/v1/crates/atty/0.2.3/download -> atty-0.2.3.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/cc/1.0.17/download -> cc-1.0.17.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.28.0/download -> clap-2.28.0.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.32/download -> redox_syscall-0.1.32.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.3/download -> regex-0.2.3.crate https://crates.io/api/v1/crates/regex-syntax/0.4.1/download -> regex-syntax-0.4.1.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.4/download -> thread_local-0.3.4.crate https://crates.io/api/v1/crates/time/0.1.38/download -> time-0.1.38.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.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.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vec_map/0.8.0/download -> vec_map-0.8.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=e6e1bc2a258eef0f1747b620e8b79135
diff --git a/metadata/md5-cache/app-misc/skim-0.5.5 b/metadata/md5-cache/app-misc/skim-0.5.5
index eded18ae81de..04cf79a08f34 100644
--- a/metadata/md5-cache/app-misc/skim-0.5.5
+++ b/metadata/md5-cache/app-misc/skim-0.5.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/lotabout/skim/archive/v0.5.5.tar.gz -> skim-0.5.5.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.10.2/download -> ansi_term-0.10.2.crate https://crates.io/api/v1/crates/atty/0.2.3/download -> atty-0.2.3.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/cc/1.0.17/download -> cc-1.0.17.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.28.0/download -> clap-2.28.0.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.32/download -> redox_syscall-0.1.32.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.3/download -> regex-0.2.3.crate https://crates.io/api/v1/crates/regex-syntax/0.4.1/download -> regex-syntax-0.4.1.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.4/download -> thread_local-0.3.4.crate https://crates.io/api/v1/crates/time/0.1.38/download -> time-0.1.38.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.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.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vec_map/0.8.0/download -> vec_map-0.8.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=d8fe8ce3e2b76154d1ce36098a31e08f
diff --git a/metadata/md5-cache/app-misc/skim-0.6.4 b/metadata/md5-cache/app-misc/skim-0.6.4
index 6c494ea42346..dcea03adcab4 100644
--- a/metadata/md5-cache/app-misc/skim-0.6.4
+++ b/metadata/md5-cache/app-misc/skim-0.6.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/lotabout/skim/archive/v0.6.4.tar.gz -> skim-0.6.4.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.10/download -> aho-corasick-0.6.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/cc/1.0.31/download -> cc-1.0.31.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/darling/0.8.6/download -> darling-0.8.6.crate https://crates.io/api/v1/crates/darling_core/0.8.6/download -> darling_core-0.8.6.crate https://crates.io/api/v1/crates/darling_macro/0.8.6/download -> darling_macro-0.8.6.crate https://crates.io/api/v1/crates/derive_builder/0.7.1/download -> derive_builder-0.7.1.crate https://crates.io/api/v1/crates/derive_builder_core/0.4.1/download -> derive_builder_core-0.4.1.crate https://crates.io/api/v1/crates/either/1.5.1/download -> either-1.5.1.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.2.1/download -> fuzzy-matcher-0.2.1.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.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.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.50/download -> libc-0.2.50.crate https://crates.io/api/v1/crates/log/0.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/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.29/download -> syn-0.15.29.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/tuikit/0.2.4/download -> tuikit-0.2.4.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=8f663486b42a55db21d098c752e2a51f
diff --git a/metadata/md5-cache/app-misc/skim-0.6.6 b/metadata/md5-cache/app-misc/skim-0.6.6
index cdfa09cc1a2d..431a6ee209ad 100644
--- a/metadata/md5-cache/app-misc/skim-0.6.6
+++ b/metadata/md5-cache/app-misc/skim-0.6.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/lotabout/skim/archive/v0.6.6.tar.gz -> skim-0.6.6.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.10/download -> aho-corasick-0.6.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/cc/1.0.31/download -> cc-1.0.31.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/darling/0.8.6/download -> darling-0.8.6.crate https://crates.io/api/v1/crates/darling_core/0.8.6/download -> darling_core-0.8.6.crate https://crates.io/api/v1/crates/darling_macro/0.8.6/download -> darling_macro-0.8.6.crate https://crates.io/api/v1/crates/derive_builder/0.7.1/download -> derive_builder-0.7.1.crate https://crates.io/api/v1/crates/derive_builder_core/0.4.1/download -> derive_builder_core-0.4.1.crate https://crates.io/api/v1/crates/either/1.5.1/download -> either-1.5.1.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.2.1/download -> fuzzy-matcher-0.2.1.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.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.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.50/download -> libc-0.2.50.crate https://crates.io/api/v1/crates/log/0.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/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.29/download -> syn-0.15.29.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timer/0.2.0/download -> timer-0.2.0.crate https://crates.io/api/v1/crates/tuikit/0.2.6/download -> tuikit-0.2.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=2becda80d622a090a8c208a5883f9ef2
diff --git a/metadata/md5-cache/app-misc/skim-0.6.7 b/metadata/md5-cache/app-misc/skim-0.6.7
index 123130760bbc..7ad848416d5c 100644
--- a/metadata/md5-cache/app-misc/skim-0.6.7
+++ b/metadata/md5-cache/app-misc/skim-0.6.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/cc/1.0.31/download -> cc-1.0.31.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/darling/0.8.6/download -> darling-0.8.6.crate https://crates.io/api/v1/crates/darling_core/0.8.6/download -> darling_core-0.8.6.crate https://crates.io/api/v1/crates/darling_macro/0.8.6/download -> darling_macro-0.8.6.crate https://crates.io/api/v1/crates/derive_builder/0.7.1/download -> derive_builder-0.7.1.crate https://crates.io/api/v1/crates/derive_builder_core/0.4.1/download -> derive_builder_core-0.4.1.crate https://crates.io/api/v1/crates/either/1.5.1/download -> either-1.5.1.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.2.1/download -> fuzzy-matcher-0.2.1.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.50/download -> libc-0.2.50.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/nix/0.13.0/download -> nix-0.13.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/skim/0.6.7/download -> skim-0.6.7.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.29/download -> syn-0.15.29.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timer/0.2.0/download -> timer-0.2.0.crate https://crates.io/api/v1/crates/tuikit/0.2.6/download -> tuikit-0.2.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=a2d16e635f5e458f0f17453910040832
diff --git a/metadata/md5-cache/app-misc/skim-0.6.8 b/metadata/md5-cache/app-misc/skim-0.6.8
index 039b2acbfab6..fe525a2f7823 100644
--- a/metadata/md5-cache/app-misc/skim-0.6.8
+++ b/metadata/md5-cache/app-misc/skim-0.6.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/cc/1.0.31/download -> cc-1.0.31.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/darling/0.8.6/download -> darling-0.8.6.crate https://crates.io/api/v1/crates/darling_core/0.8.6/download -> darling_core-0.8.6.crate https://crates.io/api/v1/crates/darling_macro/0.8.6/download -> darling_macro-0.8.6.crate https://crates.io/api/v1/crates/derive_builder/0.7.1/download -> derive_builder-0.7.1.crate https://crates.io/api/v1/crates/derive_builder_core/0.4.1/download -> derive_builder_core-0.4.1.crate https://crates.io/api/v1/crates/either/1.5.1/download -> either-1.5.1.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.2.1/download -> fuzzy-matcher-0.2.1.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.58/download -> libc-0.2.58.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/nix/0.14.0/download -> nix-0.14.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/skim/0.6.8/download -> skim-0.6.8.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.29/download -> syn-0.15.29.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timer/0.2.0/download -> timer-0.2.0.crate https://crates.io/api/v1/crates/tuikit/0.2.8/download -> tuikit-0.2.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/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=97120ff209c0d71d88a92d99f57fa7f2
diff --git a/metadata/md5-cache/app-misc/spire-0.8.1 b/metadata/md5-cache/app-misc/spire-0.8.1
new file mode 100644
index 000000000000..1445928d7737
--- /dev/null
+++ b/metadata/md5-cache/app-misc/spire-0.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=acct-group/spire acct-user/spire dev-lang/go
+DESCRIPTION=the spiffe runtime environment
+EAPI=7
+HOMEPAGE=https://github.com/spiffe/spire
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/spire acct-user/spire
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/spiffe/spire/archive/0.8.1.tar.gz -> spire-0.8.1.tar.gz https://dev.gentoo.org/~whubbs/dist/spire-0.8.1-vendor.tar.gz
+_md5_=fbeea40212ae520e37ca3731892714e4
diff --git a/metadata/md5-cache/app-misc/tmate-2.3.0 b/metadata/md5-cache/app-misc/tmate-2.3.0
new file mode 100644
index 000000000000..16e0fbfbe3e1
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tmate-2.3.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?] !libressl? ( dev-libs/openssl:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] )
+DESCRIPTION=Instant terminal sharing
+EAPI=7
+HOMEPAGE=https://tmate.io/
+IUSE=debug libressl static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?] !libressl? ( dev-libs/openssl:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] )
+SLOT=0
+SRC_URI=https://github.com/tmate-io/tmate/archive/2.3.0.tar.gz -> tmate-2.3.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=997987075070a17f1dbb8ac964984675
diff --git a/metadata/md5-cache/app-misc/tracker-2.1.8 b/metadata/md5-cache/app-misc/tracker-2.1.8
index 77038c81d5e6..44c9abcf68a3 100644
--- a/metadata/md5-cache/app-misc/tracker-2.1.8
+++ b/metadata/md5-cache/app-misc/tracker-2.1.8
@@ -10,5 +10,5 @@ PDEPEND=miners? ( >=app-misc/tracker-miners-2.1 )
 RDEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.20.0 networkmanager? ( >=net-misc/networkmanager-0.8 ) stemmer? ( dev-libs/snowball-stemmer ) sys-apps/util-linux
 SLOT=0/2.0
 SRC_URI=mirror://gnome/sources/tracker/2.1/tracker-2.1.8.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c65c72e5e9f342933dc218271c6fbc98
diff --git a/metadata/md5-cache/app-misc/tracker-2.2.2 b/metadata/md5-cache/app-misc/tracker-2.2.2
new file mode 100644
index 000000000000..70b874230932
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tracker-2.2.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) gtk-doc? ( >=dev-util/gtk-doc-1.8 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.20.0 networkmanager? ( >=net-misc/networkmanager-0.8 ) stemmer? ( dev-libs/snowball-stemmer ) sys-apps/util-linux dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A tagging metadata database, search tool and indexer
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
+IUSE=gtk-doc +miners networkmanager stemmer kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+PDEPEND=miners? ( >=app-misc/tracker-miners-2.2 )
+RDEPEND=>=dev-libs/glib-2.46:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.0 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.20.0 networkmanager? ( >=net-misc/networkmanager-0.8 ) stemmer? ( dev-libs/snowball-stemmer ) sys-apps/util-linux
+SLOT=0/2.0
+SRC_URI=mirror://gnome/sources/tracker/2.2/tracker-2.2.2.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=59be111464e49565688e004807b748eb
diff --git a/metadata/md5-cache/app-misc/tracker-miners-2.1.6 b/metadata/md5-cache/app-misc/tracker-miners-2.1.6
index 0036785061b7..eb2508e07ed4 100644
--- a/metadata/md5-cache/app-misc/tracker-miners-2.1.6
+++ b/metadata/md5-cache/app-misc/tracker-miners-2.1.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.1.0:= gstreamer? ( media-lib
 REQUIRED_USE=cue? ( gstreamer )
 SLOT=0
 SRC_URI=mirror://gnome/sources/tracker-miners/2.1/tracker-miners-2.1.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6fe4c6e6cb4d2a7ac9ba2af7fb588226
diff --git a/metadata/md5-cache/app-misc/tracker-miners-2.2.2 b/metadata/md5-cache/app-misc/tracker-miners-2.2.2
new file mode 100644
index 000000000000..2928439f9e8f
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tracker-miners-2.2.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.2.0:= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) taglib? ( >=media-libs/taglib-1.6 ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip dev-util/glib-utils >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) gstreamer? ( || ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-openh264:1.0 ) ) ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Collection of data extractors for Tracker/Nepomuk
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
+IUSE=cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playlist raw +rss seccomp test +taglib +tiff upower +xml xmp xps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.2.0:= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) taglib? ( >=media-libs/taglib-1.6 ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
+REQUIRED_USE=cue? ( gstreamer )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/tracker-miners/2.2/tracker-miners-2.2.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6525c0302007ae0c3e8bc87c69dd2336
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.0-r1 b/metadata/md5-cache/app-misc/uptimed-0.4.0-r1
deleted file mode 100644
index ef6d90d11e84..000000000000
--- a/metadata/md5-cache/app-misc/uptimed-0.4.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-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 virtual/pkgconfig
-DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
-EAPI=6
-HOMEPAGE=https://github.com/rpodgorny/uptimed/
-IUSE=static-libs
-KEYWORDS=alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.0.tar.gz -> uptimed-0.4.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=0f3a5f66103e615d910b817497e27359
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.2 b/metadata/md5-cache/app-misc/uptimed-0.4.2
new file mode 100644
index 000000000000..c1522f29192d
--- /dev/null
+++ b/metadata/md5-cache/app-misc/uptimed-0.4.2
@@ -0,0 +1,14 @@
+BDEPEND=acct-group/uptimed acct-user/uptimed >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/uptimed acct-user/uptimed
+DESCRIPTION=System uptime record daemon that keeps track of your highest uptimes
+EAPI=7
+HOMEPAGE=https://github.com/rpodgorny/uptimed/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=acct-group/uptimed acct-user/uptimed
+SLOT=0
+SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.2.tar.gz -> uptimed-0.4.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f504b5be17ba1dc6a9dc40f5573595db
diff --git a/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2 b/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
index 18d3b90b67b4..68ad412d69ec 100644
--- a/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
+++ b/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
@@ -1,4 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst
+DEPEND=app-arch/unzip
 DESCRIPTION=A brainstorming and mind mapping software tool
 EAPI=5
 HOMEPAGE=https://www.xmind.net
@@ -8,4 +9,4 @@ RDEPEND=>=virtual/jre-1.5 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-portable-3.5.3.201506180105.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b61b2695899d930261580226def15a24
+_md5_=980a30f2c5f0942b176905ad98ce7ca0
diff --git a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814 b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
index 5242c2c66964..78bd89424b3c 100644
--- a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
+++ b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=A brainstorming and mind mapping software tool
 EAPI=6
 HOMEPAGE=https://www.xmind.net
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.8 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-update7-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e64b2bf1d92151d2ecba9a0a3844d7f8
+_md5_=5d504e92de06c1ffc574af2ada3cdf61
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index a8ad766ab56d..8e10e0b1b49b 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/gnocky-0.0.7 b/metadata/md5-cache/app-mobilephone/gnocky-0.0.7
index 84610bb4678d..7db86e50dc61 100644
--- a/metadata/md5-cache/app-mobilephone/gnocky-0.0.7
+++ b/metadata/md5-cache/app-mobilephone/gnocky-0.0.7
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=app-mobilephone/gnokii dev-libs/glib:2 gnome-base/libglade:2.0 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.gnokii.org/download/gnocky/gnocky-0.0.7.tar.bz2
-_md5_=840d7047ceb53a15d4d64fa77737ba15
+_md5_=5877f92f443db263cdba3d11478ec63a
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 11acd84fe288..73e42c44f330 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/calligra-3.1.0-r4 b/metadata/md5-cache/app-office/calligra-3.1.0-r4
index 571a195ed096..9695f2eabdb0 100644
--- a/metadata/md5-cache/app-office/calligra-3.1.0-r4
+++ b/metadata/md5-cache/app-office/calligra-3.1.0-r4
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/calligra/3.1.0/calligra-3.1.0.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35eae8d17d5e0c0dc3f532d94da84606
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.43 b/metadata/md5-cache/app-office/gnumeric-1.12.43
index 138ebff83e06..d673a885aa5d 100644
--- a/metadata/md5-cache/app-office/gnumeric-1.12.43
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.43
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.42:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-3: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(-)] ) libgda? ( gnome-extra/libgda:5[gtk] ) app-text/docbook-xml-dtd:4.5 app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.42:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-python/pygobject-3: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(-)] ) libgda? ( gnome-extra/libgda:5[gtk] ) app-text/docbook-xml-dtd:4.5 app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=The GNOME Spreadsheet
 EAPI=6
 HOMEPAGE=http://www.gnumeric.org/
 IUSE=+introspection libgda perl python python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.42:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-3: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(-)] ) libgda? ( gnome-extra/libgda:5[gtk] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
+RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.42:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-python/pygobject-3: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(-)] ) libgda? ( gnome-extra/libgda:5[gtk] )
+REQUIRED_USE=introspection? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) ) python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.43.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=52c801ee64b5d385c53faf3037fc78af
+_md5_=9392390fe458b967f3af112aaeeeb642
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.44 b/metadata/md5-cache/app-office/gnumeric-1.12.44
index 4ba8233a96ad..d92fd02e7390 100644
--- a/metadata/md5-cache/app-office/gnumeric-1.12.44
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.44
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.42:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-3: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(-)] ) libgda? ( gnome-extra/libgda:5[gtk] ) app-text/docbook-xml-dtd:4.5 app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.42:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-python/pygobject-3: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(-)] ) libgda? ( gnome-extra/libgda:5[gtk] ) app-text/docbook-xml-dtd:4.5 app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=The GNOME Spreadsheet
 EAPI=6
 HOMEPAGE=http://www.gnumeric.org/
 IUSE=+introspection libgda perl python python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.42:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-3: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(-)] ) libgda? ( gnome-extra/libgda:5[gtk] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
+RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.42:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-python/pygobject-3: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(-)] ) libgda? ( gnome-extra/libgda:5[gtk] )
+REQUIRED_USE=introspection? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) ) python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.44.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=52c801ee64b5d385c53faf3037fc78af
+_md5_=9392390fe458b967f3af112aaeeeb642
diff --git a/metadata/md5-cache/app-office/kexi-3.2.0 b/metadata/md5-cache/app-office/kexi-3.2.0
deleted file mode 100644
index ba2807cc2147..000000000000
--- a/metadata/md5-cache/app-office/kexi-3.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/breeze-icons-rcc-5.60.0:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?] >=dev-libs/kproperty-3.1.0:5= >=dev-libs/kreport-3.1.0:5=[scripting] marble? ( >=kde-apps/marble-19.04.3:5 ) mdb? ( dev-libs/glib:2 virtual/libiconv ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Visual database applications creator
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/kexi/ http://www.kexi-project.org/
-IUSE=debug experimental marble mdb mysql postgres sqlite webkit debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/breeze-icons-rcc-5.60.0:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?] >=dev-libs/kproperty-3.1.0:5= >=dev-libs/kreport-3.1.0:5=[scripting] marble? ( >=kde-apps/marble-19.04.3:5 ) mdb? ( dev-libs/glib:2 virtual/libiconv ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kexi/src/kexi-3.2.0.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d38d60889bef2a8ebe1754f20088d39d
diff --git a/metadata/md5-cache/app-office/kexi-3.2.0-r1 b/metadata/md5-cache/app-office/kexi-3.2.0-r1
new file mode 100644
index 000000000000..81a1e7fbb048
--- /dev/null
+++ b/metadata/md5-cache/app-office/kexi-3.2.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/breeze-icons-rcc-5.60.0:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?] >=dev-libs/kproperty-3.1.0:5= >=dev-libs/kreport-3.1.0:5=[scripting] marble? ( >=kde-apps/marble-19.04.3:5 ) mdb? ( dev-libs/glib:2 virtual/libiconv ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Visual database applications creator
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/kexi/ http://www.kexi-project.org/
+IUSE=debug experimental marble mdb mysql postgres sqlite webkit debug test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/breeze-icons-rcc-5.60.0:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?] >=dev-libs/kproperty-3.1.0:5= >=dev-libs/kreport-3.1.0:5=[scripting] marble? ( >=kde-apps/marble-19.04.3:5 ) mdb? ( dev-libs/glib:2 virtual/libiconv ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kexi/src/kexi-3.2.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0b1ebfe227f30f47a58cd0f51842ab0f
diff --git a/metadata/md5-cache/app-office/kmymoney-5.0.6 b/metadata/md5-cache/app-office/kmymoney-5.0.6
new file mode 100644
index 000000000000..36a1eb66df85
--- /dev/null
+++ b/metadata/md5-cache/app-office/kmymoney-5.0.6
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error activities? ( >=kde-frameworks/kactivities-5.60.0:5 ) addressbook? ( >=kde-apps/akonadi-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kidentitymanagement-19.04.3:5 ) calendar? ( dev-libs/libical:= ) holidays? ( >=kde-frameworks/kholidays-5.60.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) weboob? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-qt/qtconcurrent-5.12.3:5 www-client/weboob[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Personal finance manager based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kmymoney.org
+IUSE=activities addressbook calendar holidays ofx quotes webkit weboob test debug +handbook test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error activities? ( >=kde-frameworks/kactivities-5.60.0:5 ) addressbook? ( >=kde-apps/akonadi-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 >=kde-apps/kidentitymanagement-19.04.3:5 ) calendar? ( dev-libs/libical:= ) holidays? ( >=kde-frameworks/kholidays-5.60.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) weboob? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-qt/qtconcurrent-5.12.3:5 www-client/weboob[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !app-office/kmymoney:4 quotes? ( dev-perl/Finance-Quote ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+REQUIRED_USE=weboob? ( python_targets_python2_7 )
+SLOT=5
+SRC_URI=mirror://kde/stable/kmymoney/5.0.6/src/kmymoney-5.0.6.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a3d9938af2013f21ecdbf5bd567d59c1
diff --git a/metadata/md5-cache/app-office/ledger-3.1.2 b/metadata/md5-cache/app-office/ledger-3.1.2
index 74c8135fa5e4..2e29ad2b8cb8 100644
--- a/metadata/md5-cache/app-office/ledger-3.1.2
+++ b/metadata/md5-cache/app-office/ledger-3.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger/archive/v3.1.2.tar.gz -> ledger-3.1.2.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4e22ba5eee4409dac476285d99baa88
diff --git a/metadata/md5-cache/app-office/libreoffice-6.2.5.2 b/metadata/md5-cache/app-office/libreoffice-6.2.5.2
index ca1045a9d7c8..b5fe7cbd9a69 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.2.5.2
+++ b/metadata/md5-cache/app-office/libreoffice-6.2.5.2
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.2.5.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.2.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.5//libreoffice-6.2.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.5//libreoffice-help-6.2.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.5.2/src/libreoffice-6.2.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.5.2/src/libreoffice-help-6.2.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	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e02f77249a7792e20366d333e2154f30
diff --git a/metadata/md5-cache/app-office/libreoffice-6.2.6.2 b/metadata/md5-cache/app-office/libreoffice-6.2.6.2
index c63e42eec1dc..805152ac5f3f 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.2.6.2
+++ b/metadata/md5-cache/app-office/libreoffice-6.2.6.2
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.2.6.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.2.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.6//libreoffice-6.2.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.6//libreoffice-help-6.2.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.6.2/src/libreoffice-6.2.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.6.2/src/libreoffice-help-6.2.6.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56854f2ea0deb2692a91fea23e996ed0
diff --git a/metadata/md5-cache/app-office/libreoffice-6.3.0.4 b/metadata/md5-cache/app-office/libreoffice-6.3.0.4
index 6e2633e95e0e..faed1f350396 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.3.0.4
+++ b/metadata/md5-cache/app-office/libreoffice-6.3.0.4
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.3.0.4.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.3.0.4.tar.xz https://download.documentfoundation.org/libreoffice/src/6.3.0//libreoffice-6.3.0.4.tar.xz https://download.documentfoundation.org/libreoffice/src/6.3.0//libreoffice-help-6.3.0.4.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.3.0.4/src/libreoffice-6.3.0.4.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.3.0.4/src/libreoffice-help-6.3.0.4.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5aee7174982f0855d17e2c1e150943ba
diff --git a/metadata/md5-cache/app-office/libreoffice-6.3.9999 b/metadata/md5-cache/app-office/libreoffice-6.3.9999
index 2c3ad9550920..e3951b99b075 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.3.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.3.9999
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5aee7174982f0855d17e2c1e150943ba
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 5e78dec1d459..a61fd035f9e4 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a795ef03d6523b31f2049ef47b4b3a5
diff --git a/metadata/md5-cache/app-office/openoffice-bin-4.1.6 b/metadata/md5-cache/app-office/openoffice-bin-4.1.6
index 189596cd868a..1288686d4160 100644
--- a/metadata/md5-cache/app-office/openoffice-bin-4.1.6
+++ b/metadata/md5-cache/app-office/openoffice-bin-4.1.6
@@ -1,15 +1,16 @@
 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 >=app-arch/rpm2targz-9.0.0.3g
+DEPEND=!app-office/openoffice !prefix? ( sys-libs/glibc ) app-arch/unzip app-arch/zip >=dev-lang/perl-5.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=media-libs/freetype-2.1.10-r2 sys-libs/ncurses:5/5 x11-libs/libXaw x11-libs/libXinerama sys-apps/findutils >=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
+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 python_targets_python2_7
 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
+RDEPEND=!app-office/openoffice !prefix? ( sys-libs/glibc ) app-arch/unzip app-arch/zip >=dev-lang/perl-5.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=media-libs/freetype-2.1.10-r2 sys-libs/ncurses:5/5 x11-libs/libXaw x11-libs/libXinerama
+REQUIRED_USE=python_targets_python2_7
 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	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=215da10fd25818996633c32b5727e333
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=beaa41ac3ed31e9e106e6c8d17aaaae3
diff --git a/metadata/md5-cache/app-office/pybliographer-1.2.18 b/metadata/md5-cache/app-office/pybliographer-1.2.18
deleted file mode 100644
index 344928c6d9de..000000000000
--- a/metadata/md5-cache/app-office/pybliographer-1.2.18
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/recode-3.6-r1 app-text/rarian dev-libs/glib:2 dev-python/gconf-python:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/gnome-vfs-python:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/libgnome-python:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-bibtex-1.2.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/yelp-tools >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Pybliographer is a tool for working with bibliographic databases
-EAPI=6
-HOMEPAGE=https://pybliographer.org
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/recode-3.6-r1 app-text/rarian dev-libs/glib:2 dev-python/gconf-python:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/gnome-vfs-python:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/libgnome-python:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-bibtex-1.2.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/pybliographer/pybliographer-1.2.18.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0349306464ce76054e88d764ba294b18
diff --git a/metadata/md5-cache/app-office/pybliographer-1.4.0-r1 b/metadata/md5-cache/app-office/pybliographer-1.4.0-r1
deleted file mode 100644
index dcb54a863676..000000000000
--- a/metadata/md5-cache/app-office/pybliographer-1.4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/recode-3.6-r1 app-text/rarian dev-libs/glib:2 dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.24.0:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-bibtex-1.2.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/yelp-tools >=sys-devel/gettext-0.19.8 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Pybliographer is a tool for working with bibliographic databases
-EAPI=6
-HOMEPAGE=https://pybliographer.org
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/recode-3.6-r1 app-text/rarian dev-libs/glib:2 dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.24.0:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-bibtex-1.2.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/pybliographer/1.4/pybliographer-1.4.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a7f86915ddb7b3271382f13924565e2
diff --git a/metadata/md5-cache/app-office/pybliographer-1.4.0-r2 b/metadata/md5-cache/app-office/pybliographer-1.4.0-r2
new file mode 100644
index 000000000000..786027475082
--- /dev/null
+++ b/metadata/md5-cache/app-office/pybliographer-1.4.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/recode-3.6-r1 app-text/rarian dev-libs/glib:2 dev-python/gconf-python:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.24.0:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-bibtex-1.2.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/yelp-tools >=sys-devel/gettext-0.19.8 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Pybliographer is a tool for working with bibliographic databases
+EAPI=6
+HOMEPAGE=https://pybliographer.org
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/recode-3.6-r1 app-text/rarian dev-libs/glib:2 dev-python/gconf-python:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.24.0:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-bibtex-1.2.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/pybliographer/1.4/pybliographer-1.4.0.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ba2d1b9105395ed560b85f4209513bab
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 92386bb348a8..7521ce5a490f 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/gentoolkit-0.4.5 b/metadata/md5-cache/app-portage/gentoolkit-0.4.5
index 9f337e3b9840..cf2f3a3d56a4 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.5
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.5
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.5.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f8284f965997bfdac0e50740e2d6e20d
+_md5_=1f86dbde2baff621746b977943c533b0
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.6 b/metadata/md5-cache/app-portage/gentoolkit-0.4.6
new file mode 100644
index 000000000000..4b6384f26c36
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.6
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Collection of administration scripts for Gentoo
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage-Tools
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.6.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=1f86dbde2baff621746b977943c533b0
diff --git a/metadata/md5-cache/app-portage/gentoolkit-9999 b/metadata/md5-cache/app-portage/gentoolkit-9999
index 6cbd1d6e99f9..297c17a8dab9 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-9999
+++ b/metadata/md5-cache/app-portage/gentoolkit-9999
@@ -11,4 +11,4 @@ RDEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=aef136c0540a05f8474233dea9803b43
+_md5_=6f0f56be96a6cbced976c5676db0e33c
diff --git a/metadata/md5-cache/app-portage/pfl-3.0.1-r3 b/metadata/md5-cache/app-portage/pfl-3.0.1-r3
new file mode 100644
index 000000000000..24f81d7e1c54
--- /dev/null
+++ b/metadata/md5-cache/app-portage/pfl-3.0.1-r3
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Searchable online file/package database for Gentoo
+EAPI=7
+HOMEPAGE=http://www.portagefilelist.de
+IUSE=+network-cron python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-2
+RDEPEND=>=dev-python/ssl-fetch-0.4[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(-)] net-misc/curl sys-apps/portage[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(-)] network-cron? ( sys-apps/util-linux[caps] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~billie/distfiles/pfl-3.0.1.tar.bz2
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=69213073c74a210e509bdab0fdd4fe71
diff --git a/metadata/md5-cache/app-portage/prefix-toolkit-3 b/metadata/md5-cache/app-portage/prefix-toolkit-3
deleted file mode 100644
index 5624041a80be..000000000000
--- a/metadata/md5-cache/app-portage/prefix-toolkit-3
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils >sys-apps/portage-2.3.62
-DEFINED_PHASES=configure install preinst unpack
-DEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils
-DESCRIPTION=Utilities for users of Gentoo Prefix
-EAPI=7
-HOMEPAGE=https://prefix.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=GPL-3
-RDEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils prefix-stack? ( >=sys-apps/baselayout-prefix-2.6 sys-apps/gentoo-functions app-portage/elt-patches sys-devel/gnuconfig sys-devel/gcc-config )
-SLOT=0
-_md5_=e22e7f2e7f08451553443671c97249e2
diff --git a/metadata/md5-cache/app-portage/prefix-toolkit-5 b/metadata/md5-cache/app-portage/prefix-toolkit-5
new file mode 100644
index 000000000000..b1aba9f4c3df
--- /dev/null
+++ b/metadata/md5-cache/app-portage/prefix-toolkit-5
@@ -0,0 +1,11 @@
+BDEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils >sys-apps/portage-2.3.62
+DEFINED_PHASES=configure install preinst unpack
+DEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils
+DESCRIPTION=Utilities for users of Gentoo Prefix
+EAPI=7
+HOMEPAGE=https://prefix.gentoo.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=GPL-3
+RDEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils prefix-stack? ( >=sys-apps/baselayout-prefix-2.6 sys-apps/gentoo-functions app-portage/elt-patches sys-devel/gnuconfig sys-devel/gcc-config )
+SLOT=0
+_md5_=4d1f2cbe09bf354a755da9bd7fb20236
diff --git a/metadata/md5-cache/app-portage/splat-0.08-r1 b/metadata/md5-cache/app-portage/splat-0.08-r1
index 3bbc7d3b58ea..9c449bfd8526 100644
--- a/metadata/md5-cache/app-portage/splat-0.08-r1
+++ b/metadata/md5-cache/app-portage/splat-0.08-r1
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Simple Portage Log Analyzer Tool
 EAPI=5
 HOMEPAGE=http://www.l8nite.net/projects/splat/
-KEYWORDS=alpha amd64 hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.l8nite.net/projects/splat/downloads/splat-0.08.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=009c52e4c6fade1a8c156c13978c80fc
+_md5_=1056df4348b72e386218b4355e574193
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 61a56598bc2e..25ad87ebf639 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-5.0_p11 b/metadata/md5-cache/app-shells/bash-5.0_p11
new file mode 100644
index 000000000000..94b5ad687b49
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-5.0_p11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.0:0= )
+DESCRIPTION=The standard GNU Bourne again shell
+EAPI=7
+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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.0:0= ) !<sys-apps/portage-2.1.6.7_p1
+SLOT=0
+SRC_URI=mirror://gnu/bash/bash-5.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-001 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-002 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-003 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-004 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-005 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-006 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-007 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-008 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-009 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-010 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-011 mirror://gnu/bash/bash-5.0-patches/bash50-001 mirror://gnu/bash/bash-5.0-patches/bash50-002 mirror://gnu/bash/bash-5.0-patches/bash50-003 mirror://gnu/bash/bash-5.0-patches/bash50-004 mirror://gnu/bash/bash-5.0-patches/bash50-005 mirror://gnu/bash/bash-5.0-patches/bash50-006 mirror://gnu/bash/bash-5.0-patches/bash50-007 mirror://gnu/bash/bash-5.0-patches/bash50-008 mirror://gnu/bash/bash-5.0-patches/bash50-009 mirror://gnu/bash/bash-5.0-patches/bash50-010 mirror://gnu/bash/bash-5.0-patches/bash50-011
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=3d7445cdbf344709cb398d42f0a0f505
diff --git a/metadata/md5-cache/app-shells/bash-5.0_p7 b/metadata/md5-cache/app-shells/bash-5.0_p7
deleted file mode 100644
index b826a84bc7f4..000000000000
--- a/metadata/md5-cache/app-shells/bash-5.0_p7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-8.0:0= ) nls? ( virtual/libintl )
-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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-8.0:0= ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1
-SLOT=0
-SRC_URI=mirror://gnu/bash/bash-5.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-001 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-002 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-003 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-004 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-005 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-006 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-007 mirror://gnu/bash/bash-5.0-patches/bash50-001 mirror://gnu/bash/bash-5.0-patches/bash50-002 mirror://gnu/bash/bash-5.0-patches/bash50-003 mirror://gnu/bash/bash-5.0-patches/bash50-004 mirror://gnu/bash/bash-5.0-patches/bash50-005 mirror://gnu/bash/bash-5.0-patches/bash50-006 mirror://gnu/bash/bash-5.0-patches/bash50-007
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d4b4abef3ac44a84ce192d3cfe0871ff
diff --git a/metadata/md5-cache/app-shells/bash-5.0_p9 b/metadata/md5-cache/app-shells/bash-5.0_p9
index 4115dccb8ddf..610e7b7bcb3b 100644
--- a/metadata/md5-cache/app-shells/bash-5.0_p9
+++ b/metadata/md5-cache/app-shells/bash-5.0_p9
@@ -1,14 +1,13 @@
-BDEPEND=nls? ( virtual/libintl )
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-8.0:0= )
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.0:0= )
 DESCRIPTION=The standard GNU Bourne again shell
 EAPI=7
 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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-8.0:0= ) !<sys-apps/portage-2.1.6.7_p1
+RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.0:0= ) !<sys-apps/portage-2.1.6.7_p1
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-5.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-001 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-002 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-003 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-004 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-005 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-006 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-007 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-008 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-009 mirror://gnu/bash/bash-5.0-patches/bash50-001 mirror://gnu/bash/bash-5.0-patches/bash50-002 mirror://gnu/bash/bash-5.0-patches/bash50-003 mirror://gnu/bash/bash-5.0-patches/bash50-004 mirror://gnu/bash/bash-5.0-patches/bash50-005 mirror://gnu/bash/bash-5.0-patches/bash50-006 mirror://gnu/bash/bash-5.0-patches/bash50-007 mirror://gnu/bash/bash-5.0-patches/bash50-008 mirror://gnu/bash/bash-5.0-patches/bash50-009
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2ab5637543f8c9990a80648df402ac12
+_md5_=cfa86434499ae4c1fd830359eb91c120
diff --git a/metadata/md5-cache/app-shells/ksh-2020.0.0_alpha1 b/metadata/md5-cache/app-shells/ksh-2020.0.0_alpha1
index 82cd061340cb..914f055a24de 100644
--- a/metadata/md5-cache/app-shells/ksh-2020.0.0_alpha1
+++ b/metadata/md5-cache/app-shells/ksh-2020.0.0_alpha1
@@ -7,6 +7,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=CPL-1.0 EPL-1.0
 RDEPEND=!app-shells/pdksh
 SLOT=0
-SRC_URI=https://github.com/att/ast/releases/download/2020.0.0-alpha1/ksh-2020.0.0-alpha1.tar.gz https://github.com/att/ast/commit/db7fe39b744d071bb0428c91e2eb84877f068dac.patch -> ksh-solaris.patch https://github.com/att/ast/commit/63e9edcb6084d4b164439065e2d71f3e900ec3c7.patch -> ksh-conftab.patch
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6fd7090e5b6c65a25a140690861bfd3c
+SRC_URI=https://github.com/att/ast/releases/download/2020.0.0-alpha1/ksh-2020.0.0-alpha1.tar.gz https://github.com/att/ast/commit/db7fe39b744d071bb0428c91e2eb84877f068dac.patch -> ksh-2020.0.0-alpha1-solaris.patch https://github.com/att/ast/commit/63e9edcb6084d4b164439065e2d71f3e900ec3c7.patch -> ksh-2020.0.0-alpha1-conftab.patch
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=75bc2e0a602e99b1c11a2c43a50416a1
diff --git a/metadata/md5-cache/app-shells/ksh-2020.0.0_beta1 b/metadata/md5-cache/app-shells/ksh-2020.0.0_beta1
new file mode 100644
index 000000000000..58a544b94c30
--- /dev/null
+++ b/metadata/md5-cache/app-shells/ksh-2020.0.0_beta1
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=The Original Korn Shell, 1993 revision (ksh93)
+EAPI=7
+HOMEPAGE=https://github.com/att/ast
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=CPL-1.0 EPL-1.0
+RDEPEND=!app-shells/pdksh
+SLOT=0
+SRC_URI=https://github.com/att/ast/releases/download/2020.0.0-beta1/ksh-2020.0.0-beta1.tar.gz
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=cfc1f80be1cefdc4ade28e30b58f0cec
diff --git a/metadata/md5-cache/app-shells/localshell-1.3.4-r1 b/metadata/md5-cache/app-shells/localshell-1.3.4-r1
index 73fd3577f756..7a80cf067cf3 100644
--- a/metadata/md5-cache/app-shells/localshell-1.3.4-r1
+++ b/metadata/md5-cache/app-shells/localshell-1.3.4-r1
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://git.orbis-terrarum.net/?p=infrastructure/localshellc.git;a=summary/localshell-1.3.4.tar.bz2
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ef7bebb3408f829c2f9acfc048fc65da
+_md5_=bc17f42f4a3e04561662b15fbcf6b9ac
diff --git a/metadata/md5-cache/app-shells/mcfly-0.3.4 b/metadata/md5-cache/app-shells/mcfly-0.3.4
index 8b9247669365..350e98fae538 100644
--- a/metadata/md5-cache/app-shells/mcfly-0.3.4
+++ b/metadata/md5-cache/app-shells/mcfly-0.3.4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/cantino/mcfly/archive/v0.3.4.tar.gz -> mcfly-0.3.4.tar.gz https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/atty/0.2.10/download -> atty-0.2.10.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.24/download -> backtrace-sys-0.1.24.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/cc/1.0.18/download -> cc-1.0.18.crate https://crates.io/api/v1/crates/cfg-if/0.1.5/download -> cfg-if-0.1.5.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/csv/1.0.1/download -> csv-1.0.1.crate https://crates.io/api/v1/crates/csv-core/0.1.4/download -> csv-core-0.1.4.crate https://crates.io/api/v1/crates/dirs/1.0.4/download -> dirs-1.0.4.crate https://crates.io/api/v1/crates/failure/0.1.2/download -> failure-0.1.2.crate https://crates.io/api/v1/crates/failure_derive/0.1.2/download -> failure_derive-0.1.2.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.10.0/download -> libsqlite3-sys-0.10.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.4.2/download -> linked-hash-map-0.4.2.crate https://crates.io/api/v1/crates/lru-cache/0.1.1/download -> lru-cache-0.1.1.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/nodrop/0.1.12/download -> nodrop-0.1.12.crate https://crates.io/api/v1/crates/pkg-config/0.3.11/download -> pkg-config-0.3.11.crate https://crates.io/api/v1/crates/proc-macro2/0.4.20/download -> proc-macro2-0.4.20.crate https://crates.io/api/v1/crates/quote/0.6.8/download -> quote-0.6.8.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand_core/0.2.1/download -> rand_core-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.2.0/download -> redox_users-0.2.0.crate https://crates.io/api/v1/crates/relative-path/0.4.0/download -> relative-path-0.4.0.crate https://crates.io/api/v1/crates/rusqlite/0.15.0/download -> rusqlite-0.15.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/serde/1.0.75/download -> serde-1.0.75.crate https://crates.io/api/v1/crates/shellexpand/1.0.0/download -> shellexpand-1.0.0.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.14.9/download -> syn-0.14.9.crate https://crates.io/api/v1/crates/synstructure/0.9.0/download -> synstructure-0.9.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/unicode-segmentation/1.2.1/download -> unicode-segmentation-1.2.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.4/download -> vcpkg-0.2.4.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=036ebaadba4a26450ef5d21f14bee786
diff --git a/metadata/md5-cache/app-shells/powerline-2.7 b/metadata/md5-cache/app-shells/powerline-2.7
new file mode 100644
index 000000000000..3ff3ed411d65
--- /dev/null
+++ b/metadata/md5-cache/app-shells/powerline-2.7
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=The ultimate statusline/prompt utility.
+EAPI=7
+HOMEPAGE=https://github.com/powerline/powerline
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/powerline-status/powerline-status-2.7.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8db27524d81b54fa35606f10dde68f04
diff --git a/metadata/md5-cache/app-shells/powerline-9999 b/metadata/md5-cache/app-shells/powerline-9999
new file mode 100644
index 000000000000..46c83c6c7d60
--- /dev/null
+++ b/metadata/md5-cache/app-shells/powerline-9999
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=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_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=The ultimate statusline/prompt utility.
+EAPI=7
+HOMEPAGE=https://github.com/powerline/powerline
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+LICENSE=Apache-2.0
+PROPERTIES=live
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8db27524d81b54fa35606f10dde68f04
diff --git a/metadata/md5-cache/app-shells/rrs-1.70-r2 b/metadata/md5-cache/app-shells/rrs-1.70-r2
index e2f7af9fe5d1..c6e0c81842f5 100644
--- a/metadata/md5-cache/app-shells/rrs-1.70-r2
+++ b/metadata/md5-cache/app-shells/rrs-1.70-r2
@@ -10,4 +10,4 @@ RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://www.cycom.se/uploads/36/19/rrs-1.70.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b477d3d09b924d49c7f8c26809dcefbd
+_md5_=bac0e36366fb50599178ed9249d937f7
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 0c6b8fdd7720..a888307a796f 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/XML-Schema-learner-1.0.1 b/metadata/md5-cache/app-text/XML-Schema-learner-1.0.1
index 368354fa2f21..294dcfd06842 100644
--- a/metadata/md5-cache/app-text/XML-Schema-learner-1.0.1
+++ b/metadata/md5-cache/app-text/XML-Schema-learner-1.0.1
@@ -9,4 +9,4 @@ LICENSE=GPL-3
 RDEPEND=dev-lang/php:*[cli,xml,xmlreader]
 SLOT=0
 SRC_URI=https://github.com/kore/XML-Schema-learner/archive/1.0.1.tar.gz -> XML-Schema-learner-1.0.1.tar.gz
-_md5_=48ae91e0ca348f34d4a5368cdc4de725
+_md5_=866a2e6f07605846fbdc529391f0b575
diff --git a/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016 b/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016
index 00bc9414f072..ef6e14ab1570 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_5 pyth
 SLOT=0
 SRC_URI=https://github.com/asciidoc/asciidoc-py3/archive/618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0.tar.gz -> asciidoc-8.6.10_p20181016.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7d513a8fbdfe1cf117e4d1d4df4b6f2b
+_md5_=4936965bfe64dc74313159baead6e8fa
diff --git a/metadata/md5-cache/app-text/calibre-3.47.0 b/metadata/md5-cache/app-text/calibre-3.47.0
new file mode 100644
index 000000000000..c98ade178da8
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-3.47.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DESCRIPTION=Ebook management application
+EAPI=7
+HOMEPAGE=https://calibre-ebook.com/
+IUSE=ios +udisks python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/3.47.0/calibre-3.47.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=62a0f605fe87e08323c9be30abd41fd2
diff --git a/metadata/md5-cache/app-text/calibre-3.47.1 b/metadata/md5-cache/app-text/calibre-3.47.1
new file mode 100644
index 000000000000..aaf49254ba62
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-3.47.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DESCRIPTION=Ebook management application
+EAPI=7
+HOMEPAGE=https://calibre-ebook.com/
+IUSE=ios +udisks python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/3.47.1/calibre-3.47.1.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=62a0f605fe87e08323c9be30abd41fd2
diff --git a/metadata/md5-cache/app-text/fblog-1.3.1 b/metadata/md5-cache/app-text/fblog-1.3.1
index cd965914257b..39c7b82cd864 100644
--- a/metadata/md5-cache/app-text/fblog-1.3.1
+++ b/metadata/md5-cache/app-text/fblog-1.3.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/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/cc/1.0.37/download -> cc-1.0.37.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/fblog/1.3.1/download -> fblog-1.3.1.crate https://crates.io/api/v1/crates/hlua/0.4.1/download -> hlua-0.4.1.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.54/download -> libc-0.2.54.crate https://crates.io/api/v1/crates/lua52-sys/0.1.2/download -> lua52-sys-0.1.2.crate https://crates.io/api/v1/crates/maplit/1.0.1/download -> maplit-1.0.1.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.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/redox_syscall/0.1.54/download -> redox_syscall-0.1.54.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/ryu/0.2.8/download -> ryu-0.2.8.crate https://crates.io/api/v1/crates/serde/1.0.91/download -> serde-1.0.91.crate https://crates.io/api/v1/crates/serde_json/1.0.39/download -> serde_json-1.0.39.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/termion/1.5.2/download -> termion-1.5.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.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.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.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.7/download -> winapi-0.3.7.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	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=f9ffb47aee3c4c2da5c846fa05eaed9c
diff --git a/metadata/md5-cache/app-text/grip-4.2.0 b/metadata/md5-cache/app-text/grip-4.2.0
index 3885f6182282..89279e2afb02 100644
--- a/metadata/md5-cache/app-text/grip-4.2.0
+++ b/metadata/md5-cache/app-text/grip-4.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=app-arch/unzip python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Preview GitHub Markdown files like Readme locally before committing them
 EAPI=6
 HOMEPAGE=https://github.com/joeyespo/grip
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/g/grip/grip-4.2.0.zip
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9b6c94525d3822e21966c49682902c3
+_md5_=b7da424364b4efb353879c6ec9c3f2c3
diff --git a/metadata/md5-cache/app-text/gtranslator-3.32.0 b/metadata/md5-cache/app-text/gtranslator-3.32.0
index 6b25a96ecfda..6b0233dc03b5 100644
--- a/metadata/md5-cache/app-text/gtranslator-3.32.0
+++ b/metadata/md5-cache/app-text/gtranslator-3.32.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.36.0:2 >=x11-libs/gtk+-3.22.20:3 gnome-extra/libgda:5= gnome-base/gsettings-desktop-schemas >=app-text/gspell-1.2.0:= >=x11-libs/gtksourceview-4.0.2:4 >=dev-libs/libxml2-2.4.12:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtranslator/3.32/gtranslator-3.32.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01253e58b3a7eda54f75ee3a37b70149
diff --git a/metadata/md5-cache/app-text/hunspell-1.7.0-r1 b/metadata/md5-cache/app-text/hunspell-1.7.0-r1
new file mode 100644
index 000000000000..69333544e092
--- /dev/null
+++ b/metadata/md5-cache/app-text/hunspell-1.7.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:= ) sys-devel/gettext
+DESCRIPTION=Hunspell spell checker - an improved replacement for myspell in OOo
+EAPI=7
+HOMEPAGE=https://github.com/hunspell
+IUSE=ncurses nls readline static-libs l10n_af l10n_bg l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_kk l10n_km l10n_ku l10n_lt l10n_lv l10n_mi l10n_mk l10n_ms l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sv l10n_sw l10n_tn l10n_uk l10n_zu
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MPL-1.1 GPL-2 LGPL-2.1
+PDEPEND=l10n_af? ( app-dicts/myspell-af ) l10n_bg? ( app-dicts/myspell-bg ) l10n_ca? ( app-dicts/myspell-ca ) l10n_cs? ( app-dicts/myspell-cs ) l10n_cy? ( app-dicts/myspell-cy ) l10n_da? ( app-dicts/myspell-da ) l10n_de? ( app-dicts/myspell-de ) l10n_de-1901? ( app-dicts/myspell-de_1901 ) l10n_el? ( app-dicts/myspell-el ) l10n_en? ( app-dicts/myspell-en ) l10n_eo? ( app-dicts/myspell-eo ) l10n_es? ( app-dicts/myspell-es ) l10n_et? ( app-dicts/myspell-et ) l10n_fo? ( app-dicts/myspell-fo ) l10n_fr? ( app-dicts/myspell-fr ) l10n_ga? ( app-dicts/myspell-ga ) l10n_gl? ( app-dicts/myspell-gl ) l10n_he? ( app-dicts/myspell-he ) l10n_hr? ( app-dicts/myspell-hr ) l10n_hu? ( app-dicts/myspell-hu ) l10n_ia? ( app-dicts/myspell-ia ) l10n_id? ( app-dicts/myspell-id ) l10n_is? ( app-dicts/myspell-is ) l10n_it? ( app-dicts/myspell-it ) l10n_kk? ( app-dicts/myspell-kk ) l10n_km? ( app-dicts/myspell-km ) l10n_ku? ( app-dicts/myspell-ku ) l10n_lt? ( app-dicts/myspell-lt ) l10n_lv? ( app-dicts/myspell-lv ) l10n_mi? ( app-dicts/myspell-mi ) l10n_mk? ( app-dicts/myspell-mk ) l10n_ms? ( app-dicts/myspell-ms ) l10n_nb? ( app-dicts/myspell-nb ) l10n_nl? ( app-dicts/myspell-nl ) l10n_nn? ( app-dicts/myspell-nn ) l10n_pl? ( app-dicts/myspell-pl ) l10n_pt? ( app-dicts/myspell-pt ) l10n_pt-BR? ( app-dicts/myspell-pt-br ) l10n_ro? ( app-dicts/myspell-ro ) l10n_ru? ( app-dicts/myspell-ru ) l10n_sk? ( app-dicts/myspell-sk ) l10n_sl? ( app-dicts/myspell-sl ) l10n_sq? ( app-dicts/myspell-sq ) l10n_sv? ( app-dicts/myspell-sv ) l10n_sw? ( app-dicts/myspell-sw ) l10n_tn? ( app-dicts/myspell-tn ) l10n_uk? ( app-dicts/myspell-uk ) l10n_zu? ( app-dicts/myspell-zu )
+RDEPEND=ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:= )
+SLOT=0/1.7
+SRC_URI=https://github.com/hunspell/hunspell/archive/v1.7.0.tar.gz -> hunspell-1.7.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=7829d26ef72a102f3ebdf46cbe52507d
diff --git a/metadata/md5-cache/app-text/jo-1.1 b/metadata/md5-cache/app-text/jo-1.1
index b630bca05389..81c6502069bb 100644
--- a/metadata/md5-cache/app-text/jo-1.1
+++ b/metadata/md5-cache/app-text/jo-1.1
@@ -8,4 +8,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/jpmens/jo/archive/v1.1.tar.gz -> jo-1.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=66467e3c07e011680c5ac7b7b5ad3984
+_md5_=fc698fc686dba975c9e538c798bc94e9
diff --git a/metadata/md5-cache/app-text/libgepub-0.6.0 b/metadata/md5-cache/app-text/libgepub-0.6.0
index f12f980f1a0d..2a9282df6a10 100644
--- a/metadata/md5-cache/app-text/libgepub-0.6.0
+++ b/metadata/md5-cache/app-text/libgepub-0.6.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgepub/0.6/libgepub-0.6.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e68e9dc71f380d698c27d7bdceef9938
diff --git a/metadata/md5-cache/app-text/libgxps-0.3.0 b/metadata/md5-cache/app-text/libgxps-0.3.0
index 452363b4b422..0e44828d555c 100644
--- a/metadata/md5-cache/app-text/libgxps-0.3.0
+++ b/metadata/md5-cache/app-text/libgxps-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 m
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgxps/0.3/libgxps-0.3.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4113e566613036100fbb60914d9a6f8b
diff --git a/metadata/md5-cache/app-text/libgxps-0.3.1 b/metadata/md5-cache/app-text/libgxps-0.3.1
index d815e7f1e30f..c3cb4a707e94 100644
--- a/metadata/md5-cache/app-text/libgxps-0.3.1
+++ b/metadata/md5-cache/app-text/libgxps-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 m
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgxps/0.3/libgxps-0.3.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c056d7fa396c352dfb2acfc3b1f2f284
diff --git a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73 b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73
index f7c15aef6456..780d3701e53a 100644
--- a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73
+++ b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73
@@ -4,10 +4,10 @@ DESCRIPTION=A toolset for processing LinuxDoc DTD SGML files
 EAPI=5
 HOMEPAGE=https://gitlab.com/agmartin/linuxdoc-tools
 IUSE=doc
-KEYWORDS=amd64 ~ia64 ppc x86 ~x86-fbsd
+KEYWORDS=amd64 ~ia64 ppc ~sparc x86 ~x86-fbsd
 LICENSE=GPL-3+ MIT SGMLUG
 RDEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff virtual/latex-base
 SLOT=0
 SRC_URI=https://gitlab.com/agmartin/linuxdoc-tools/-/archive/0.9.73/linuxdoc-tools-0.9.73.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	a1731744d7cca1d14638e0e054ceea6e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=99d0176ae6305f89e33a430dc037039e
+_md5_=8e54c9d3c9614201f813e8c76c065c9e
diff --git a/metadata/md5-cache/app-text/mathtex-1.04 b/metadata/md5-cache/app-text/mathtex-1.04
index 45b3045ebf9e..c1b2d5d249f4 100644
--- a/metadata/md5-cache/app-text/mathtex-1.04
+++ b/metadata/md5-cache/app-text/mathtex-1.04
@@ -1,4 +1,5 @@
 DEFINED_PHASES=compile install postinst
+DEPEND=app-arch/unzip
 DESCRIPTION=Lets you easily embed LaTeX math in your own html pages, blogs, wikis, etc
 EAPI=5
 HOMEPAGE=http://www.forkosh.com/mathtex.html
@@ -9,4 +10,4 @@ RDEPEND=app-text/dvipng virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/mathtex-1.04.zip
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=281b388871719a289bde5719351fe907
+_md5_=8ce0f810325782c48905fcc7a93c7db4
diff --git a/metadata/md5-cache/app-text/paperwork-1.3.0 b/metadata/md5-cache/app-text/paperwork-1.3.0
new file mode 100644
index 000000000000..ba8d812fdf4c
--- /dev/null
+++ b/metadata/md5-cache/app-text/paperwork-1.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~app-text/paperwork-backend-1.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libpillowfight[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libinsane x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=a personal document manager for scanned documents (and PDFs)
+EAPI=6
+HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork
+IUSE=python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=~app-text/paperwork-backend-1.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libpillowfight[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libinsane x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/paperwork/paperwork-1.3.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=700fb97cbed2dfbb61abad1d4b792b8f
diff --git a/metadata/md5-cache/app-text/paperwork-backend-1.3.0 b/metadata/md5-cache/app-text/paperwork-backend-1.3.0
new file mode 100644
index 000000000000..aaf46685c8e0
--- /dev/null
+++ b/metadata/md5-cache/app-text/paperwork-backend-1.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/natsort[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycountry[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-levenshtein[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/whoosh[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=Backend part of Paperwork (Python API, no UI)
+EAPI=6
+HOMEPAGE=https://github.com/openpaperwork/paperwork-backend
+IUSE=python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/natsort[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycountry[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-levenshtein[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/whoosh[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-1.3.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f5125b8a7e979285c8930ddd55640d8f
diff --git a/metadata/md5-cache/app-text/pinfo-0.6.13 b/metadata/md5-cache/app-text/pinfo-0.6.13
index 410aaf0faaf9..50f31749b604 100644
--- a/metadata/md5-cache/app-text/pinfo-0.6.13
+++ b/metadata/md5-cache/app-text/pinfo-0.6.13
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/baszoetekouw/pinfo/archive/v0.6.13.tar.gz -> pinfo-0.6.13.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e13a6d498573c43dc5de7a69ec8010f3
+_md5_=11e811aa1fa9b4253b333a8577d889a7
diff --git a/metadata/md5-cache/app-text/pinfo-99999 b/metadata/md5-cache/app-text/pinfo-99999
index 46aa2b4f2024..0adeb50d69fd 100644
--- a/metadata/md5-cache/app-text/pinfo-99999
+++ b/metadata/md5-cache/app-text/pinfo-99999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b2b260dd4b88149761af3246e3dc593c
+_md5_=b9f9735a7050a2e3b7833faae8479229
diff --git a/metadata/md5-cache/app-text/poppler-0.77.0 b/metadata/md5-cache/app-text/poppler-0.77.0
deleted file mode 100644
index 061f7d30ec97..000000000000
--- a/metadata/md5-cache/app-text/poppler-0.77.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 )
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=7
-HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
-RESTRICT=test
-SLOT=0/88
-SRC_URI=https://poppler.freedesktop.org/poppler-0.77.0.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f66155ddc5c9793b1afeab5eec00268c
diff --git a/metadata/md5-cache/app-text/poppler-0.79.0-r1 b/metadata/md5-cache/app-text/poppler-0.79.0-r1
index 358cf82b9738..e2af1a136a1b 100644
--- a/metadata/md5-cache/app-text/poppler-0.79.0-r1
+++ b/metadata/md5-cache/app-text/poppler-0.79.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=7
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 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/89
 SRC_URI=https://poppler.freedesktop.org/poppler-0.79.0.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0667be58a2024a5d46e6bae74e3868fe
+_md5_=a46028674eea91884eed3c05ad890fcb
diff --git a/metadata/md5-cache/app-text/poppler-0.80.0 b/metadata/md5-cache/app-text/poppler-0.80.0
new file mode 100644
index 000000000000..3541f0fd6c54
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-0.80.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 )
+DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
+EAPI=7
+HOMEPAGE=https://poppler.freedesktop.org/
+IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
+RESTRICT=test
+SLOT=0/90
+SRC_URI=https://poppler.freedesktop.org/poppler-0.80.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=28eb3d252fb178483d9ce1fca6b4796b
diff --git a/metadata/md5-cache/app-text/poppler-9999 b/metadata/md5-cache/app-text/poppler-9999
index 3dd4ad7bb94a..c3cb4f031275 100644
--- a/metadata/md5-cache/app-text/poppler-9999
+++ b/metadata/md5-cache/app-text/poppler-9999
@@ -11,4 +11,4 @@ RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-lib
 RESTRICT=test
 SLOT=0/9999
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d85a8de57e3403537acca37080c65f55
+_md5_=28eb3d252fb178483d9ce1fca6b4796b
diff --git a/metadata/md5-cache/app-text/qpdf-8.2.1 b/metadata/md5-cache/app-text/qpdf-8.2.1
index 23a1bdba7e6e..02f79595db53 100644
--- a/metadata/md5-cache/app-text/qpdf-8.2.1
+++ b/metadata/md5-cache/app-text/qpdf-8.2.1
@@ -9,4 +9,4 @@ LICENSE=|| ( Apache-2.0 Artistic-2 )
 RDEPEND=sys-libs/zlib virtual/jpeg:0= perl? ( >=dev-lang/perl-5.8 )
 SLOT=0/21
 SRC_URI=mirror://sourceforge/qpdf/qpdf-8.2.1.tar.gz
-_md5_=98b81ba2287f5dd085dbd799fdaba88e
+_md5_=85dd512da19a0e2d3968434a1a00afbf
diff --git a/metadata/md5-cache/app-text/qpdf-8.4.0 b/metadata/md5-cache/app-text/qpdf-8.4.0
deleted file mode 100644
index 49d4298c6bf5..000000000000
--- a/metadata/md5-cache/app-text/qpdf-8.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib virtual/jpeg:0= test? ( sys-apps/diffutils media-libs/tiff app-text/ghostscript-gpl[tiff] )
-DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
-EAPI=7
-HOMEPAGE=http://qpdf.sourceforge.net/
-IUSE=doc examples perl static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
-LICENSE=|| ( Apache-2.0 Artistic-2 )
-RDEPEND=sys-libs/zlib virtual/jpeg:0= perl? ( >=dev-lang/perl-5.8 )
-SLOT=0/21
-SRC_URI=mirror://sourceforge/qpdf/qpdf-8.4.0.tar.gz
-_md5_=8e61c1191544ed5d10484437d78dcbc6
diff --git a/metadata/md5-cache/app-text/qpdf-9.0.0 b/metadata/md5-cache/app-text/qpdf-9.0.0
new file mode 100644
index 000000000000..033171e5ec97
--- /dev/null
+++ b/metadata/md5-cache/app-text/qpdf-9.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-libs/zlib virtual/jpeg:0= test? ( sys-apps/diffutils media-libs/tiff app-text/ghostscript-gpl[tiff] )
+DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
+EAPI=7
+HOMEPAGE=http://qpdf.sourceforge.net/
+IUSE=doc examples perl static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
+LICENSE=|| ( Apache-2.0 Artistic-2 )
+RDEPEND=sys-libs/zlib virtual/jpeg:0= perl? ( >=dev-lang/perl-5.8 )
+SLOT=0/26
+SRC_URI=mirror://sourceforge/qpdf/qpdf-9.0.0.tar.gz
+_md5_=e012dd6d87b9d9224365ae6c12ecdfaa
diff --git a/metadata/md5-cache/app-text/recode-3.7_pre20140303 b/metadata/md5-cache/app-text/recode-3.7_pre20140303
index be498284027c..b05140702cbc 100644
--- a/metadata/md5-cache/app-text/recode-3.7_pre20140303
+++ b/metadata/md5-cache/app-text/recode-3.7_pre20140303
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/pinard/Recode/archive/2d7092a9999194fc0e9449717a8048c8d8e26c18.zip -> recode-3.7_pre20140303.zip
+SRC_URI=https://github.com/pinard/Recode/archive/2d7092a9999194fc0e9449717a8048c8d8e26c18.tar.gz -> recode-3.7_pre20140303.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=177a9b2843de74457ca31f60b70dd878
+_md5_=4e95009e12665f4f84e28894e0438cc9
diff --git a/metadata/md5-cache/app-text/restview-2.7.0 b/metadata/md5-cache/app-text/restview-2.7.0
deleted file mode 100644
index bcdb8e66453d..000000000000
--- a/metadata/md5-cache/app-text/restview-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=reStructuredText viewer
-EAPI=6
-HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview/
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/restview/restview-2.7.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13cea3509a9f8ecd67760449f365720a
diff --git a/metadata/md5-cache/app-text/restview-2.8.0 b/metadata/md5-cache/app-text/restview-2.8.0
deleted file mode 100644
index 0c56687c1d5d..000000000000
--- a/metadata/md5-cache/app-text/restview-2.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=reStructuredText viewer
-EAPI=6
-HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview/
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/restview/restview-2.8.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13cea3509a9f8ecd67760449f365720a
diff --git a/metadata/md5-cache/app-text/restview-2.9.2 b/metadata/md5-cache/app-text/restview-2.9.2
new file mode 100644
index 000000000000..b7b7a060aedd
--- /dev/null
+++ b/metadata/md5-cache/app-text/restview-2.9.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=reStructuredText viewer
+EAPI=7
+HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview/
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/restview/restview-2.9.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ffdbe0b0c3b1a1242989d2d18abf9178
diff --git a/metadata/md5-cache/app-text/sigil-0.9.16 b/metadata/md5-cache/app-text/sigil-0.9.16
index 65565b40e219..c3fe2a2d0d41 100644
--- a/metadata/md5-cache/app-text/sigil-0.9.16
+++ b/metadata/md5-cache/app-text/sigil-0.9.16
@@ -5,11 +5,11 @@ DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
 EAPI=7
 HOMEPAGE=https://sigil-ebook.com/
 IUSE=+plugins system-mathjax python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+ Apache-2.0
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[tk] ) python_single_target_python3_6? ( dev-lang/python:3.6[tk] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] dev-python/css-parser[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 >=dev-qt/qtxmlpatterns-5.12:5 sys-libs/zlib[minizip] plugins? ( dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssselect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/html5lib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) system-mathjax? ( dev-libs/mathjax )
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/0.9.16.tar.gz -> sigil-0.9.16.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0395a7af11f08fe611dc1130a7bc00e9
+_md5_=cd3470471d4b06483056330a6e2d948d
diff --git a/metadata/md5-cache/app-text/sigil-0.9.18 b/metadata/md5-cache/app-text/sigil-0.9.18
new file mode 100644
index 000000000000..690c23a23a82
--- /dev/null
+++ b/metadata/md5-cache/app-text/sigil-0.9.18
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[tk] ) python_single_target_python3_6? ( dev-lang/python:3.6[tk] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] dev-python/css-parser[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 sys-libs/zlib[minizip] plugins? ( dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssselect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/html5lib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) system-mathjax? ( dev-libs/mathjax )
+DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
+EAPI=7
+HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
+IUSE=+plugins system-mathjax python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ Apache-2.0
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[tk] ) python_single_target_python3_6? ( dev-lang/python:3.6[tk] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] dev-python/css-parser[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 sys-libs/zlib[minizip] plugins? ( dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssselect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/html5lib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) system-mathjax? ( dev-libs/mathjax )
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/0.9.18.tar.gz -> sigil-0.9.18.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c0e705076551335bb71657d3af3d6abc
diff --git a/metadata/md5-cache/app-text/sigil-0.9.8 b/metadata/md5-cache/app-text/sigil-0.9.8
deleted file mode 100644
index 9793390cc5e3..000000000000
--- a/metadata/md5-cache/app-text/sigil-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-text/hunspell dev-libs/boost[threads] dev-libs/libpcre[pcre16] dev-libs/xerces-c[icu] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/cssselect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/cssutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/html5lib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/regex[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 sys-libs/zlib[minizip] >=sys-devel/gcc-4.8 virtual/pkgconfig >=dev-qt/linguist-tools-5.4:5 app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Sigil is a multi-platform WYSIWYG ebook editor for ePub format
-EAPI=6
-HOMEPAGE=https://sigil-ebook.com/
-IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-text/hunspell dev-libs/boost[threads] dev-libs/libpcre[pcre16] dev-libs/xerces-c[icu] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/cssselect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/cssutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/html5lib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/regex[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtconcurrent-5.4:5 >=dev-qt/qtcore-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 sys-libs/zlib[minizip]
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/Sigil-Ebook/Sigil/releases/download/0.9.8/Sigil-0.9.8-Code.zip
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c2a4533693883ac8a2c8daac16b01c2
diff --git a/metadata/md5-cache/app-text/tesseract-4.1.0-r1 b/metadata/md5-cache/app-text/tesseract-4.1.0-r1
new file mode 100644
index 000000000000..3b92ce5efd2c
--- /dev/null
+++ b/metadata/md5-cache/app-text/tesseract-4.1.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=media-libs/leptonica-1.74:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/leptonica:=[tiff] ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) app-text/asciidoc app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( app-doc/doxygen )
+DESCRIPTION=An OCR Engine, orginally developed at HP, now open source.
+EAPI=7
+HOMEPAGE=https://github.com/tesseract-ocr
+IUSE=doc jpeg opencl openmp png static-libs tiff training webp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=media-libs/leptonica-1.74:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/leptonica:=[tiff] ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) || ( >=app-text/tessdata_fast-4.0.0 >=app-text/tessdata_best-4.0.0 >=app-text/tessdata_legacy-4.0.0 )
+SLOT=0
+SRC_URI=https://github.com/tesseract-ocr/tesseract/archive/4.1.0.tar.gz -> tesseract-4.1.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=357ff890d96296445593d27aebebde00
diff --git a/metadata/md5-cache/app-text/tokyodystopia-0.9.15 b/metadata/md5-cache/app-text/tokyodystopia-0.9.15
index 14e05bd28813..d6d6a2ea0946 100644
--- a/metadata/md5-cache/app-text/tokyodystopia-0.9.15
+++ b/metadata/md5-cache/app-text/tokyodystopia-0.9.15
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-db/tokyocabinet
 SLOT=0
 SRC_URI=https://fallabs.com/tokyodystopia/tokyodystopia-0.9.15.tar.gz
-_md5_=10e0dae3570a57300ffb1600d6ac3e63
+_md5_=6d1ba6a0bb49a9b3f9391e0047b4b405
diff --git a/metadata/md5-cache/app-text/wgetpaste-2.29 b/metadata/md5-cache/app-text/wgetpaste-2.29
deleted file mode 100644
index 2a74298a03e7..000000000000
--- a/metadata/md5-cache/app-text/wgetpaste-2.29
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Command-line interface to various pastebins
-EAPI=7
-HOMEPAGE=http://wgetpaste.zlin.dk/
-IUSE=+ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=net-misc/wget[ssl?]
-SLOT=0
-SRC_URI=http://wgetpaste.zlin.dk/wgetpaste-2.29.tar.bz2
-_md5_=d6a1f22da747f57f016f4449432419e7
diff --git a/metadata/md5-cache/app-text/wgetpaste-2.29-r1 b/metadata/md5-cache/app-text/wgetpaste-2.29-r1
new file mode 100644
index 000000000000..3c43a897e76c
--- /dev/null
+++ b/metadata/md5-cache/app-text/wgetpaste-2.29-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Command-line interface to various pastebins
+EAPI=7
+HOMEPAGE=http://wgetpaste.zlin.dk/
+IUSE=+ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=net-misc/wget[ssl?]
+SLOT=0
+SRC_URI=http://wgetpaste.zlin.dk/wgetpaste-2.29.tar.bz2
+_md5_=e00496ef03b94fb761621cbd9c36bd96
diff --git a/metadata/md5-cache/app-text/winefish-1.3.3-r2 b/metadata/md5-cache/app-text/winefish-1.3.3-r2
deleted file mode 100644
index 42e1e17a6e9a..000000000000
--- a/metadata/md5-cache/app-text/winefish-1.3.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/libpcre-6.3 >=x11-libs/gtk+-2.4:2 spell? ( app-text/aspell ) 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=LaTeX editor based on Bluefish
-EAPI=6
-HOMEPAGE=https://github.com/viettug/winefish
-IUSE=spell
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libpcre-6.3 >=x11-libs/gtk+-2.4:2 spell? ( app-text/aspell )
-SLOT=0
-SRC_URI=https://github.com/viettug/winefish/archive/1.3.3.tar.gz -> winefish-1.3.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0fcc927597b8f1acc397ae3dccb53df5
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.12 b/metadata/md5-cache/app-text/xapian-omega-1.4.12
new file mode 100644
index 000000000000..51ab8211a262
--- /dev/null
+++ b/metadata/md5-cache/app-text/xapian-omega-1.4.12
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
+DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
+EAPI=7
+HOMEPAGE=https://xapian.org/
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
+SLOT=0
+SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.12/xapian-omega-1.4.12.tar.xz
+_md5_=9df469e12b34d784168ad20e663dc45a
diff --git a/metadata/md5-cache/app-text/xchm-1.29 b/metadata/md5-cache/app-text/xchm-1.29
index 0db2d1daddc3..5566d26a0c25 100644
--- a/metadata/md5-cache/app-text/xchm-1.29
+++ b/metadata/md5-cache/app-text/xchm-1.29
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0-gtk3[X] nls? ( virtual/libintl
 SLOT=0
 SRC_URI=https://github.com/rzvncj/xCHM/releases/download/1.29/xchm-1.29.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5e4f1ca736a60cad98d16c369f82de88
+_md5_=949b020e1c8c8607d1a9d51bbb8ab9ce
diff --git a/metadata/md5-cache/app-text/xchm-1.30 b/metadata/md5-cache/app-text/xchm-1.30
index 68da4ff43dc8..c37939ebe38a 100644
--- a/metadata/md5-cache/app-text/xchm-1.30
+++ b/metadata/md5-cache/app-text/xchm-1.30
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0-gtk3[X] nls? ( virtual/libintl
 SLOT=0
 SRC_URI=https://github.com/rzvncj/xCHM/releases/download/1.30/xchm-1.30.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce1a8470930580aad53d00076a4f3d28
+_md5_=1dfb9837511b99ef21f5f4aef58775b8
diff --git a/metadata/md5-cache/app-text/zathura-0.4.3 b/metadata/md5-cache/app-text/zathura-0.4.3
index 1f08f2709679..392bcea6c0ce 100644
--- a/metadata/md5-cache/app-text/zathura-0.4.3
+++ b/metadata/md5-cache/app-text/zathura-0.4.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/girara-0.3.2 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura/download/zathura-0.4.3.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=e580603c7b894a6f339c72335b0898da
diff --git a/metadata/md5-cache/app-text/zathura-9999 b/metadata/md5-cache/app-text/zathura-9999
index da8e80086808..1aa9dc25ae20 100644
--- a/metadata/md5-cache/app-text/zathura-9999
+++ b/metadata/md5-cache/app-text/zathura-9999
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=>=dev-libs/girara-0.3.1 >=dev-libs/glib-2.50:2 dev-python/sphinx >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=656a70a34b53fc0317e44750307d7c3a
diff --git a/metadata/md5-cache/app-text/zathura-cb-0.1.8 b/metadata/md5-cache/app-text/zathura-cb-0.1.8
index dc84cb2be930..612d507f07fc 100644
--- a/metadata/md5-cache/app-text/zathura-cb-0.1.8
+++ b/metadata/md5-cache/app-text/zathura-cb-0.1.8
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=>=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-cb-0.1.8.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=526e00e157e33151ddbc6580c01cffa1
diff --git a/metadata/md5-cache/app-text/zathura-cb-9999 b/metadata/md5-cache/app-text/zathura-cb-9999
index b929358cb239..9193495b7d63 100644
--- a/metadata/md5-cache/app-text/zathura-cb-9999
+++ b/metadata/md5-cache/app-text/zathura-cb-9999
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=>=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=e198d1472d4f71941f3c4eced3a5a37b
diff --git a/metadata/md5-cache/app-text/zathura-djvu-0.2.8 b/metadata/md5-cache/app-text/zathura-djvu-0.2.8
index 3d8abae9c995..492f415c0007 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-0.2.8
+++ b/metadata/md5-cache/app-text/zathura-djvu-0.2.8
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-0.2.8.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41cd223d1d1e6596a503773c2a7f6f91
diff --git a/metadata/md5-cache/app-text/zathura-djvu-9999 b/metadata/md5-cache/app-text/zathura-djvu-9999
index 4ffd37fe1ec9..2adbc3c12746 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-9999
+++ b/metadata/md5-cache/app-text/zathura-djvu-9999
@@ -7,5 +7,5 @@ LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d2e07420725cfbf2c9ea4d1f5c6383f
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.4 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.4
index 78d97ac2a009..4ef7c4103ca7 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.4
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.4
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=app-text/mupdf >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-0.3.4.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=c24ad1bd0b43f6370af5c14a8274a3eb
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.5 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.5
new file mode 100644
index 000000000000..f247afa9ad7b
--- /dev/null
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.5
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/mupdf >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo
+DESCRIPTION=PDF plug-in for zathura
+EAPI=7
+HOMEPAGE=https://pwmt.org/projects/zathura-pdf-mupdf/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ZLIB
+RDEPEND=app-text/mupdf >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo
+SLOT=0
+SRC_URI=https://github.com/pwmt/zathura-pdf-mupdf/archive/0.3.5.tar.gz -> zathura-pdf-mupdf-0.3.5.tar.gz
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f4ae4244c165df8fcf99ebe6718194eb
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
index 5d7dcc3c9a15..13a16519147d 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=app-text/mupdf >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=f912bd89fd597846894ff65ee351cb32
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9
index 5eb22b327f00..a444c54f8329 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.9
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.9.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4a1b0d4d2227e2e7ca9c2582b12a33b4
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999 b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
index 6a087f218351..793e3f2d0044 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=59468750cee85eef2335e0a86adb72f7
diff --git a/metadata/md5-cache/app-text/zathura-ps-0.2.6 b/metadata/md5-cache/app-text/zathura-ps-0.2.6
index 75b3c8284567..5e875e29f7dc 100644
--- a/metadata/md5-cache/app-text/zathura-ps-0.2.6
+++ b/metadata/md5-cache/app-text/zathura-ps-0.2.6
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-ps-0.2.6.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=60425c18b2f2d4576c39334b5eff40fe
diff --git a/metadata/md5-cache/app-text/zathura-ps-9999 b/metadata/md5-cache/app-text/zathura-ps-9999
index 8cf1496e30e6..cd8cb56dd48e 100644
--- a/metadata/md5-cache/app-text/zathura-ps-9999
+++ b/metadata/md5-cache/app-text/zathura-ps-9999
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=app-text/libspectre >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=e8bf62c43a8e00070eb9b865af785044
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 8d2983d71863..4d374bd63423 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/cream-0.43 b/metadata/md5-cache/app-vim/cream-0.43
index 54d1126ae973..5b9e1770f403 100644
--- a/metadata/md5-cache/app-vim/cream-0.43
+++ b/metadata/md5-cache/app-vim/cream-0.43
@@ -10,4 +10,4 @@ RDEPEND=>=app-editors/gvim-7.0 dev-util/ctags || ( >=app-editors/vim-7.3 >=app-e
 SLOT=0
 SRC_URI=mirror://sourceforge/cream/cream-0.43.tar.gz l10n_de? ( http://cream.sourceforge.net/cream-spell-dict-ger_2.0.1.zip ) l10n_en? ( http://cream.sourceforge.net/cream-spell-dict-eng_2.0.2.zip ) l10n_es? ( http://cream.sourceforge.net/cream-spell-dict-spa_3.0.zip ) l10n_fr? ( http://cream.sourceforge.net/cream-spell-dict-fre_2.1.zip )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=2cc7b7569d676cf5cc239b732ad52117
+_md5_=af830b94a9b892ba8ab7a4fa764c669b
diff --git a/metadata/md5-cache/app-vim/csscomplete-1.0 b/metadata/md5-cache/app-vim/csscomplete-1.0
index 331ff6bfc84d..2539fedbce5d 100644
--- a/metadata/md5-cache/app-vim/csscomplete-1.0
+++ b/metadata/md5-cache/app-vim/csscomplete-1.0
@@ -7,6 +7,6 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-SRC_URI=https://github.com/othree/csscomplete.vim/archive/1.0.zip -> csscomplete-1.0.zip
+SRC_URI=https://github.com/othree/csscomplete.vim/archive/1.0.tar.gz -> csscomplete-1.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=754f50aecd97a0209959aae3ace84c65
+_md5_=aae23390f5ef3ecf55e69d6caf7f0808
diff --git a/metadata/md5-cache/app-vim/jedi-0.8_p20171015-r1 b/metadata/md5-cache/app-vim/jedi-0.8_p20171015-r1
index d3b4402754af..dbb9dd0c5fd7 100644
--- a/metadata/md5-cache/app-vim/jedi-0.8_p20171015-r1
+++ b/metadata/md5-cache/app-vim/jedi-0.8_p20171015-r1
@@ -10,6 +10,6 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/davidhalter/jedi-vim/archive/77924398bd594e238766153cec97ace62650f082.zip -> jedi-0.8_p20171015.zip
+SRC_URI=https://github.com/davidhalter/jedi-vim/archive/77924398bd594e238766153cec97ace62650f082.tar.gz -> jedi-0.8_p20171015.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=fcbab061f81b8b240f9f37eb28ba96de
+_md5_=a4b2ef3e01bd567066b7ad0de6f2b0da
diff --git a/metadata/md5-cache/app-vim/perlomni-2.5 b/metadata/md5-cache/app-vim/perlomni-2.5
index 3c401c50d534..55b8cda95429 100644
--- a/metadata/md5-cache/app-vim/perlomni-2.5
+++ b/metadata/md5-cache/app-vim/perlomni-2.5
@@ -7,6 +7,6 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=vim.org
 RDEPEND=app-arch/unzip dev-lang/perl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-SRC_URI=https://github.com/c9s/perlomni.vim/archive/v2.5.zip -> perlomni-2.5.zip
+SRC_URI=https://github.com/c9s/perlomni.vim/archive/v2.5.tar.gz -> perlomni-2.5.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=4753a6cc44a7dd9de7f2713e25e495f4
+_md5_=613de7dcc5795594c68d98c67e0f7482
diff --git a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1 b/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
index 7b96e8c54a82..85741e692d64 100644
--- a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
+++ b/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
@@ -7,6 +7,6 @@ KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/v0.3.6.zip -> vimoutliner-0.3.6.zip
+SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/v0.3.6.tar.gz -> vimoutliner-0.3.6.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=0751bc668f9f8163d4ad82a85a1498cf
+_md5_=9471fe9b96c2b441fb389b1238e34944
diff --git a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r2 b/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r2
index 08e2cd5fbec8..41debf0d0414 100644
--- a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r2
+++ b/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r2
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/autopep8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
-SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/v0.3.6.zip -> vimoutliner-0.3.6.zip
+SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/v0.3.6.tar.gz -> vimoutliner-0.3.6.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=9f4af702983fb2d0a9de6c85fc2138fd
+_md5_=8a60815132044bab0f1b4fd5f3c99439
diff --git a/metadata/md5-cache/app-vim/zenburn-2.25 b/metadata/md5-cache/app-vim/zenburn-2.25
index b3c7d854a4b7..8c88744d6269 100644
--- a/metadata/md5-cache/app-vim/zenburn-2.25
+++ b/metadata/md5-cache/app-vim/zenburn-2.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=Low-contrast color scheme for Vim
 EAPI=6
 HOMEPAGE=https://github.com/jnurmine/Zenburn
@@ -7,6 +7,6 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-1
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-SRC_URI=https://github.com/jnurmine/Zenburn/archive/v2.25.zip -> zenburn-2.25.zip
+SRC_URI=https://github.com/jnurmine/Zenburn/archive/v2.25.tar.gz -> zenburn-2.25.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=a17776a3858eea144a9ef68823b5c1ee
+_md5_=7d545dea0f2efee36138a7f60e737960
diff --git a/metadata/md5-cache/app-xemacs/Manifest.gz b/metadata/md5-cache/app-xemacs/Manifest.gz
index d17e9642cb07..06e79e7e362c 100644
--- a/metadata/md5-cache/app-xemacs/Manifest.gz
+++ b/metadata/md5-cache/app-xemacs/Manifest.gz
diff --git a/metadata/md5-cache/app-xemacs/ebuild-mode-1.47 b/metadata/md5-cache/app-xemacs/ebuild-mode-1.47
index ad9024a166c7..5c233c1c54f5 100644
--- a/metadata/md5-cache/app-xemacs/ebuild-mode-1.47
+++ b/metadata/md5-cache/app-xemacs/ebuild-mode-1.47
@@ -3,10 +3,10 @@ DEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script app-editors/xemacs
 DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=amd64 hppa x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.47.tar.xz
 _eclasses_=xemacs-elisp	ec6a89e5b3d4b998d328d445d1c7ec06	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=98ee536473607b4193a07fe815c1546c
+_md5_=5e9529cca01e5d6e45db61ed9d758d3d
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 3dc20c3a8673..59c36ed9a6a3 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/asis-2016 b/metadata/md5-cache/dev-ada/asis-2016
index b55b8035dc5b..3bdeb1f13eff 100644
--- a/metadata/md5-cache/dev-ada/asis-2016
+++ b/metadata/md5-cache/dev-ada/asis-2016
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-ada/gnat_util[gnat_2016=,gnat_2017=] || ( dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared] dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,shared] ) dev-ada/gprbuild[gnat_2016=,gnat_2017=]
+DEPEND=dev-ada/gnat_util[gnat_2016(-)?,gnat_2017(-)?] || ( dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared] dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,shared] ) dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]
 DESCRIPTION=To develop tools for Ada software
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/
 IUSE=+gnat_2016 gnat_2017 gnat_2018
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/gnat_util[gnat_2016=,gnat_2017=] || ( dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared] dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,shared] )
+RDEPEND=dev-ada/gnat_util[gnat_2016(-)?,gnat_2017(-)?] || ( dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared] dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,shared] )
 REQUIRED_USE=^^ ( gnat_2016 gnat_2017 ) !gnat_2018
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/57399029c7a447658e0aff71 -> asis-gpl-2016-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=ff422ccba4e7210cee589af355dc0dac
+_md5_=711c96c193f476ba56b06954a1baa9ae
diff --git a/metadata/md5-cache/dev-ada/asis-2018 b/metadata/md5-cache/dev-ada/asis-2018
index 640a82d56be9..f7761db740cc 100644
--- a/metadata/md5-cache/dev-ada/asis-2018
+++ b/metadata/md5-cache/dev-ada/asis-2018
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-ada/gnat_util[gnat_2017(-)?,gnat_2018(-)?] || ( dev-ada/gnatcoll-core[gnat_2017=,gnat_2018=,shared] dev-ada/gnatcoll[gnat_2017=,gnat_2018=,projects,shared] ) dev-ada/gprbuild[gnat_2017=,gnat_2018=]
+DEPEND=dev-ada/gnat_util[gnat_2017(-)?,gnat_2018(-)?] || ( dev-ada/gnatcoll-core[gnat_2017(-)?,gnat_2018(-)?,shared] dev-ada/gnatcoll[gnat_2017(-)?,gnat_2018(-)?,projects,shared] ) dev-ada/gprbuild[gnat_2017(-)?,gnat_2018(-)?]
 DESCRIPTION=To develop tools for Ada software
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/
 IUSE=gnat_2017 +gnat_2018
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/gnat_util[gnat_2017(-)?,gnat_2018(-)?] || ( dev-ada/gnatcoll-core[gnat_2017=,gnat_2018=,shared] dev-ada/gnatcoll[gnat_2017=,gnat_2018=,projects,shared] )
+RDEPEND=dev-ada/gnat_util[gnat_2017(-)?,gnat_2018(-)?] || ( dev-ada/gnatcoll-core[gnat_2017(-)?,gnat_2018(-)?,shared] dev-ada/gnatcoll[gnat_2017(-)?,gnat_2018(-)?,projects,shared] )
 REQUIRED_USE=|| ( gnat_2017 gnat_2018 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab8 -> asis-gpl-2018-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=de51858ff2296ffc549305125f1ce8b5
+_md5_=d5f70abc783a03d15de80d7d7e770535
diff --git a/metadata/md5-cache/dev-ada/aunit-2018 b/metadata/md5-cache/dev-ada/aunit-2018
index 444e72fb9088..5d704598ea38 100644
--- a/metadata/md5-cache/dev-ada/aunit-2018
+++ b/metadata/md5-cache/dev-ada/aunit-2018
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]
+DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
 DESCRIPTION=Ada unit testing framework
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/tools/aunit/
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( gnat_2016 gnat_2017 gnat_2018 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab3 -> aunit-gpl-2018-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=093d1fe8219caf1323b165587e167bf6
+_md5_=63f7880b6b0a4e36472a825ab0aef102
diff --git a/metadata/md5-cache/dev-ada/aunit-2019 b/metadata/md5-cache/dev-ada/aunit-2019
index 2cdf9edabb13..b4bc85339fcb 100644
--- a/metadata/md5-cache/dev-ada/aunit-2019
+++ b/metadata/md5-cache/dev-ada/aunit-2019
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] dev-ada/gprbuild[gnat_2019(-)?]
 DESCRIPTION=Ada unit testing framework
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aunit/
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf859431e87aa2cdf16b18 -> aunit-2019-20190429-18B77-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=499d23714cf0d3ca123beb228f42e51a
+_md5_=0830040ea306585a728b8022e8440cae
diff --git a/metadata/md5-cache/dev-ada/aws-2017 b/metadata/md5-cache/dev-ada/aws-2017
index bf389b5c9a26..d7f46dd668c7 100644
--- a/metadata/md5-cache/dev-ada/aws-2017
+++ b/metadata/md5-cache/dev-ada/aws-2017
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs] dev-ada/gnat_util[gnat_2016=,gnat_2017=,static-libs] dev-ada/asis[gnat_2016=,gnat_2017=] dev-ada/gprbuild[gnat_2016=,gnat_2017=]
+DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs] dev-ada/gnat_util[gnat_2016(-)?,gnat_2017(-)?,static-libs] dev-ada/asis[gnat_2016(-)?,gnat_2017(-)?] dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]
 DESCRIPTION=A complete Web development framework
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/tools/aws/
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed001 -> aws-gpl-2017-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=86b807b2be2ec6b8237d4d1ec03c8dcf
+_md5_=6e07555d8b2812eed82836a56ac7a953
diff --git a/metadata/md5-cache/dev-ada/aws-2018 b/metadata/md5-cache/dev-ada/aws-2018
index 7edcae7ffc6d..015b26b0a8a0 100644
--- a/metadata/md5-cache/dev-ada/aws-2018
+++ b/metadata/md5-cache/dev-ada/aws-2018
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=] dev-ada/xmlada[shared,static-libs] dev-ada/asis[gnat_2016(-)=,gnat_2017(-)=,gnat_2018(-)=] dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=]
+DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=] dev-ada/xmlada[shared,static-libs] dev-ada/asis[gnat_2016(-)=,gnat_2017(-)=,gnat_2018(-)=] dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
 DESCRIPTION=A complete Web development framework
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/tools/aws/
@@ -10,4 +10,4 @@ RDEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=] dev-ada/xmlada[share
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27abd -> aws-gpl-2018-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=d02ca020dde6d21b571b795cf20c4704
+_md5_=66ea54544969f574021b53745e833e5f
diff --git a/metadata/md5-cache/dev-ada/aws-2018-r1 b/metadata/md5-cache/dev-ada/aws-2018-r1
index 5006daeea26f..d9599a06c17c 100644
--- a/metadata/md5-cache/dev-ada/aws-2018-r1
+++ b/metadata/md5-cache/dev-ada/aws-2018-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/xmlada[shared,static-libs] dev-ada/asis[gnat_2016(-)?] dev-ada/asis[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+DEPEND=dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/xmlada[shared,static-libs] dev-ada/asis[gnat_2016(-)?] dev-ada/asis[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] dev-ada/gprbuild[gnat_2019(-)?]
 DESCRIPTION=A complete Web development framework
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/tools/aws/
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27abd -> aws-gpl-2018-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=7d5f3b15fb15fa49c9206796bd3e4b38
+_md5_=c34ea2e53cc95ccbfc14fe89e689f704
diff --git a/metadata/md5-cache/dev-ada/gnat_util-2017 b/metadata/md5-cache/dev-ada/gnat_util-2017
deleted file mode 100644
index 38f514202bba..000000000000
--- a/metadata/md5-cache/dev-ada/gnat_util-2017
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-ada/gprbuild[gnat_2016=,gnat_2017=]
-DESCRIPTION=Provides access to GNAT compiler internals for AdaCore utilities
-EAPI=6
-HOMEPAGE=http://libre.adacore.com
-IUSE=gnat_2016 +gnat_2017 +shared static-libs static-pic
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
-REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037 -> gnat_util-gpl-2017-src.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=02c3c86f1a75ce64a844f18d0562dd58
diff --git a/metadata/md5-cache/dev-ada/gnat_util-2017-r1 b/metadata/md5-cache/dev-ada/gnat_util-2017-r1
index 38c23c5d7a24..964d4e18834b 100644
--- a/metadata/md5-cache/dev-ada/gnat_util-2017-r1
+++ b/metadata/md5-cache/dev-ada/gnat_util-2017-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Provides access to GNAT compiler internals for AdaCore utilities
 EAPI=6
 HOMEPAGE=http://libre.adacore.com
 IUSE=gnat_2016 +gnat_2017 +shared static-libs static-pic
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
 REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037 -> gnat_util-gpl-2017-src.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=18eda1f3de11c3c1ff51a7a994033362
+_md5_=89d5d35c67b1e65d55bc5d0f53329cd7
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-2017 b/metadata/md5-cache/dev-ada/gnatcoll-2017
index 6327c7cc4743..d4ab2fff410d 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-2017
+++ b/metadata/md5-cache/dev-ada/gnatcoll-2017
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( ~dev-ada/libgpr-2018[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-ada/xmlada[shared?,static-libs?] ) !dev-ada/gnatcoll-core !dev-ada/gnatcoll-bindings !dev-ada/gnatcoll-db dev-ada/gprbuild[gnat_2016=,gnat_2017=] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( >=dev-ada/libgpr-2018[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-ada/xmlada[shared?,static-libs?] ) !dev-ada/gnatcoll-core !dev-ada/gnatcoll-bindings !dev-ada/gnatcoll-db dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GNAT Component Collection
 EAPI=6
 HOMEPAGE=http://libre.adacore.com
 IUSE=gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline +shared sqlite static-libs syslog tools python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( ~dev-ada/libgpr-2018[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-ada/xmlada[shared?,static-libs?] ) !dev-ada/gnatcoll-core !dev-ada/gnatcoll-bindings !dev-ada/gnatcoll-db
+RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gmp? ( dev-libs/gmp:* ) gtk? ( dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango ) pygobject? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( >=dev-ada/libgpr-2018[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-ada/xmlada[shared?,static-libs?] ) !dev-ada/gnatcoll-core !dev-ada/gnatcoll-bindings !dev-ada/gnatcoll-db
 REQUIRED_USE=python_targets_python2_7 tools? ( static-libs ) pygobject? ( gtk ) ^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed016 -> gnatcoll-gpl-2017-src.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=5c074d743c2c5aa31bddf3841465f68a
+_md5_=72d6e5cecb96e9f5b6d511684f82322d
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2018 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2018
deleted file mode 100644
index 29fd6f46e2e1..000000000000
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2018
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]
-DESCRIPTION=GNAT Component Collection
-EAPI=6
-HOMEPAGE=http://libre.adacore.com
-IUSE=gnat_2016 gnat_2017 +gnat_2018 gmp iconv python readline +shared static-libs static-pic syslog python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0ce9cfc7a4475261f97ca5 -> gnatcoll-bindings-gpl-2018-src.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c4cddc2ed1e8b4d358cbe479c8613821
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2018-r1 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2018-r1
index 8d2bfceb0dd7..ca1425362940 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2018-r1
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2018-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] dev-ada/gprbuild[gnat_2019(-)?]
 DESCRIPTION=GNAT Component Collection
 EAPI=6
 HOMEPAGE=http://libre.adacore.com
 IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gmp iconv python readline +shared static-libs static-pic syslog python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
 REQUIRED_USE=python? ( python_targets_python2_7 ) ^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0ce9cfc7a4475261f97ca5 -> gnatcoll-bindings-gpl-2018-src.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=128c4d7bb613e96c68b172d299010393
+_md5_=e653317448e7850f56ece13112629595
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2019 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2019
index 262a4cc5f615..967c68a84d1b 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2019
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2019
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup
-DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* ) dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] dev-ada/gprbuild[gnat_2019(-)?]
 DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) ^^ ( gnat_2016 gnat_2017 gnat_
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8afa31e87a8f1d425054 -> gnatcoll-bindings-2019-20190430-1928C-src.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f7f292dc11d227d7d7b715b287e2c175
+_md5_=b3616072f13db44b71672ee94728b9da
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-core-2018 b/metadata/md5-cache/dev-ada/gnatcoll-core-2018
deleted file mode 100644
index 28494eadef6d..000000000000
--- a/metadata/md5-cache/dev-ada/gnatcoll-core-2018
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-ada/libgpr[gnat_2016=,gnat_2017=,gnat_2018=] dev-ada/libgpr[shared?,static-libs?,static-pic?] !dev-ada/gnatcoll dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]
-DESCRIPTION=GNAT Component Collection Core packages
-EAPI=6
-HOMEPAGE=http://libre.adacore.com
-IUSE=gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-ada/libgpr[gnat_2016=,gnat_2017=,gnat_2018=] dev-ada/libgpr[shared?,static-libs?,static-pic?] !dev-ada/gnatcoll
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99 -> gnatcoll-core-gpl-2018-src.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=88bc680dfe4bb53a04d20b09f73f5080
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-core-2018-r1 b/metadata/md5-cache/dev-ada/gnatcoll-core-2018-r1
index 45c57a66efc8..7adb91cdaff7 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-core-2018-r1
+++ b/metadata/md5-cache/dev-ada/gnatcoll-core-2018-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-ada/libgpr[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/libgpr[shared?,static-libs?,static-pic?] !dev-ada/gnatcoll dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+DEPEND=dev-ada/libgpr[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/libgpr[shared?,static-libs?,static-pic?] !dev-ada/gnatcoll dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] dev-ada/gprbuild[gnat_2019(-)?]
 DESCRIPTION=GNAT Component Collection Core packages
 EAPI=6
 HOMEPAGE=http://libre.adacore.com
 IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-ada/libgpr[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/libgpr[shared?,static-libs?,static-pic?] !dev-ada/gnatcoll
 REQUIRED_USE=^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99 -> gnatcoll-core-gpl-2018-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=85a3c7beb5d62767d5a3dca5e93b2f55
+_md5_=75e33efd2a58084e416ad3cca4da6db8
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-core-2019 b/metadata/md5-cache/dev-ada/gnatcoll-core-2019
index e772d2e12486..9ef1681d436b 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-core-2019
+++ b/metadata/md5-cache/dev-ada/gnatcoll-core-2019
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-ada/libgpr[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/libgpr[shared?,static-libs?,static-pic?] !dev-ada/gnatcoll dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+DEPEND=dev-ada/libgpr[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/libgpr[shared?,static-libs?,static-pic?] !dev-ada/gnatcoll dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] dev-ada/gprbuild[gnat_2019(-)?]
 DESCRIPTION=GNAT Component Collection Core packages
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8ae231e87a8f1d425052 -> gnatcoll-core-2019-20190515-24AD8-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=55f99f4778fc31d207f0a872f37557cc
+_md5_=6d2b30831aa267fc2cb59c93c17a46f0
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-db-2018 b/metadata/md5-cache/dev-ada/gnatcoll-db-2018
deleted file mode 100644
index 9a08ccb8e612..000000000000
--- a/metadata/md5-cache/dev-ada/gnatcoll-db-2018
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) xref? ( dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?] dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=] ) dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GNAT Component Collection
-EAPI=6
-HOMEPAGE=http://libre.adacore.com
-IUSE=gnat_2016 gnat_2017 +gnat_2018 gnatcoll_db2ada gnatinspect postgres +shared sql sqlite static-libs static-pic xref python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) xref? ( dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?] dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=] )
-REQUIRED_USE=gnatinspect? ( xref ) xref? ( sqlite ) sqlite? ( sql ) gnatcoll_db2ada? ( sql )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0ce9cbc7a4475263382be6 -> gnatcoll-db-gpl-2018-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9056586a5a4d00ea722276f2339454ce
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-db-2018-r1 b/metadata/md5-cache/dev-ada/gnatcoll-db-2018-r1
index ba7f3f4bb504..f10b542df7db 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-db-2018-r1
+++ b/metadata/md5-cache/dev-ada/gnatcoll-db-2018-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) xref? ( dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?] dev-ada/gnatcoll-bindings[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) xref? ( dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?] dev-ada/gnatcoll-bindings[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] dev-ada/gprbuild[gnat_2019(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GNAT Component Collection
 EAPI=6
 HOMEPAGE=http://libre.adacore.com
 IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gnatcoll_db2ada gnatinspect postgres +shared sql sqlite static-libs static-pic xref python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) xref? ( dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?] dev-ada/gnatcoll-bindings[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
 REQUIRED_USE=gnatinspect? ( xref ) xref? ( sqlite ) sqlite? ( sql ) gnatcoll_db2ada? ( sql ) ^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0ce9cbc7a4475263382be6 -> gnatcoll-db-gpl-2018-src.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=200edeb783cb47a2752cb1101169c8ea
+_md5_=5f8662d9e93a7128363d2338603d9a77
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2018 b/metadata/md5-cache/dev-ada/gnatmem-2018
deleted file mode 100644
index 1cacbe1ed30d..000000000000
--- a/metadata/md5-cache/dev-ada/gnatmem-2018
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=] sys-libs/binutils-libs >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Monitors dynamic allocation and deallocation activity in a program
-EAPI=6
-HOMEPAGE=http://libre.adacore.com/
-IUSE=gnat_2016 gnat_2017 +gnat_2018
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-REQUIRED_USE=^^ ( gnat_2016 gnat_2017 gnat_2018 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a72 -> gnatmem-gpl-2018-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=42a40808af86426812f934ea2fa8f18f
diff --git a/metadata/md5-cache/dev-ada/gnatmem-2019 b/metadata/md5-cache/dev-ada/gnatmem-2019
index 6e3a1859deab..653f6d9c9d18 100644
--- a/metadata/md5-cache/dev-ada/gnatmem-2019
+++ b/metadata/md5-cache/dev-ada/gnatmem-2019
@@ -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=compile install prepare
-DEPEND=dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] sys-libs/binutils-libs
+DEPEND=dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] dev-ada/gprbuild[gnat_2019(-)?] sys-libs/binutils-libs
 DESCRIPTION=Monitors dynamic allocation and deallocation activity in a program
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 IUSE=gnat_2016 gnat_2017 gnat_2018 +gnat_2019
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 REQUIRED_USE=^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8e1431e87a8f1d425089 -> gnatmem-2019-20190429-19745-src.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=acaf725f0dee1229e932a7ac6eecf6da
+_md5_=130083013eeb55f1601437f4782e813a
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2018-r3 b/metadata/md5-cache/dev-ada/gprbuild-2018-r3
deleted file mode 100644
index 7586b01c9018..000000000000
--- a/metadata/md5-cache/dev-ada/gprbuild-2018-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
-DESCRIPTION=Multi-Language Management
-EAPI=6
-HOMEPAGE=http://libre.adacore.com/
-IUSE=gnat_2016 gnat_2017 +gnat_2018
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
-REQUIRED_USE=!gnat_2016 ^^ ( gnat_2017 gnat_2018 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 -> gprbuild-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40 -> xmlada-gpl-2018-src.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b530b56eebdd7b2b3ba3d8265c8e474e
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2018-r4 b/metadata/md5-cache/dev-ada/gprbuild-2018-r4
deleted file mode 100644
index 0ec07a23b513..000000000000
--- a/metadata/md5-cache/dev-ada/gprbuild-2018-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
-DESCRIPTION=Multi-Language Management
-EAPI=6
-HOMEPAGE=http://libre.adacore.com/
-IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
-REQUIRED_USE=!gnat_2016 ^^ ( gnat_2017 gnat_2018 gnat_2019 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 -> gprbuild-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40 -> xmlada-gpl-2018-src.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=397fb63ecf435894d0d32f7251c9653b
diff --git a/metadata/md5-cache/dev-ada/gtkada-2017 b/metadata/md5-cache/dev-ada/gtkada-2017
index 971d51277f36..f77c90283ff2 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2017
+++ b/metadata/md5-cache/dev-ada/gtkada-2017
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[gnat_2016=,gnat_2017=] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=6
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( gnat_2016 gnat_2017 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9 -> gtkada-gpl-2017-src.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=ce7f6a8c587cd919048f8e00176ed77c
+_md5_=23dfa8600783105b89440dd19468422e
diff --git a/metadata/md5-cache/dev-ada/gtkada-2018 b/metadata/md5-cache/dev-ada/gtkada-2018
deleted file mode 100644
index 48a00160104e..000000000000
--- a/metadata/md5-cache/dev-ada/gtkada-2018
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A complete Ada graphical toolkit
-EAPI=6
-HOMEPAGE=http://libre.adacore.com//tools/gtkada/
-IUSE=gnat_2016 gnat_2017 +gnat_2018 +shared static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( gnat_2016 gnat_2017 gnat_2018 )
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced -> gtkada-gpl-2018-src.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=680fdffedb3470de780e0ce4efc4c850
diff --git a/metadata/md5-cache/dev-ada/gtkada-2018-r1 b/metadata/md5-cache/dev-ada/gtkada-2018-r1
index 6e66ca809249..59111ca7b323 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2018-r1
+++ b/metadata/md5-cache/dev-ada/gtkada-2018-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] dev-ada/gprbuild[gnat_2019(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=6
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
 IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
 REQUIRED_USE=^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced -> gtkada-gpl-2018-src.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7e43718570162b214dc665c0eb488953
+_md5_=b6976658dc3f8d4cc51228efc03ef0e4
diff --git a/metadata/md5-cache/dev-ada/gtkada-2019 b/metadata/md5-cache/dev-ada/gtkada-2019
index 20eede319d21..a6f4b0d5a554 100644
--- a/metadata/md5-cache/dev-ada/gtkada-2019
+++ b/metadata/md5-cache/dev-ada/gtkada-2019
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] dev-ada/gprbuild[gnat_2019(-)?]
 DESCRIPTION=A complete Ada graphical toolkit
 EAPI=7
 HOMEPAGE=http://libre.adacore.com//tools/gtkada/
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53 -> gtkada-2019-20190424-19D98-src.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8ad505987b7d1b0627a7bfea3db371e1
+_md5_=f8c2495f07089a354cf4071bacd37f07
diff --git a/metadata/md5-cache/dev-ada/libadalang-tools-2018 b/metadata/md5-cache/dev-ada/libadalang-tools-2018
index 89824f0743e0..ffad94c6e0c8 100644
--- a/metadata/md5-cache/dev-ada/libadalang-tools-2018
+++ b/metadata/md5-cache/dev-ada/libadalang-tools-2018
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ada/libadalang[gnat_2016=,gnat_2017=,gnat_2018=,static-libs]
+DEPEND=dev-ada/libadalang[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,static-libs]
 DESCRIPTION=Libadalang-based tools: gnatpp, gnatmetric and gnatstub
 EAPI=6
 HOMEPAGE=https://www.adacore.com/community
@@ -8,4 +8,4 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 -> libadalang-tools-gpl-2018-src.tar.gz
-_md5_=ba2e91573c3707d1674883651deb0753
+_md5_=8c7bb3c5913360b3f730f1198fc51fb1
diff --git a/metadata/md5-cache/dev-ada/libadalang-tools-2019 b/metadata/md5-cache/dev-ada/libadalang-tools-2019
index f571218dd1e8..c3c25148293b 100644
--- a/metadata/md5-cache/dev-ada/libadalang-tools-2019
+++ b/metadata/md5-cache/dev-ada/libadalang-tools-2019
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-ada/libadalang[gnat_2016(-)?] dev-ada/libadalang[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?,static-libs] dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+DEPEND=dev-ada/libadalang[gnat_2016(-)?] dev-ada/libadalang[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?,static-libs] dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] dev-ada/gprbuild[gnat_2019(-)?]
 DESCRIPTION=Libadalang-based tools: gnatpp, gnatmetric and gnatstub
 EAPI=7
 HOMEPAGE=https://www.adacore.com/community
@@ -9,4 +9,4 @@ LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8f4e31e87a8f1d42509f -> libadalang-tools-2019-20190517-195C4-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=dcf1c89c4354aa745419b3dd7e27bdf9
+_md5_=b65b846c8c7612a2d20ceaeb9cff72b9
diff --git a/metadata/md5-cache/dev-ada/libgpr-2018 b/metadata/md5-cache/dev-ada/libgpr-2018
deleted file mode 100644
index 2d99952b335f..000000000000
--- a/metadata/md5-cache/dev-ada/libgpr-2018
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=] !net-libs/grpc dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]
-DESCRIPTION=Ada library to handle GPRbuild project files
-EAPI=6
-HOMEPAGE=http://libre.adacore.com/
-IUSE=gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=] !net-libs/grpc
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 -> gprbuild-gpl-2018-src.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a7770e76dafcd8db1dba698b769e3744
diff --git a/metadata/md5-cache/dev-ada/libgpr-2018-r1 b/metadata/md5-cache/dev-ada/libgpr-2018-r1
index 6495a25d5eda..0035eb6c507f 100644
--- a/metadata/md5-cache/dev-ada/libgpr-2018-r1
+++ b/metadata/md5-cache/dev-ada/libgpr-2018-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] !net-libs/grpc dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] !net-libs/grpc dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] dev-ada/gprbuild[gnat_2019(-)?]
 DESCRIPTION=Ada library to handle GPRbuild project files
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/
 IUSE=gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] !net-libs/grpc
+RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] !net-libs/grpc
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 -> gprbuild-gpl-2018-src.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=aeef14d42f141cf6e20d4f9e4b31df0d
+_md5_=f3cafd2f8f3e7e199ec14de4c2c46b78
diff --git a/metadata/md5-cache/dev-ada/libgpr-2019 b/metadata/md5-cache/dev-ada/libgpr-2019
index 01e4ac5a13c5..5cc6670589e7 100644
--- a/metadata/md5-cache/dev-ada/libgpr-2019
+++ b/metadata/md5-cache/dev-ada/libgpr-2019
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] !net-libs/grpc dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] !net-libs/grpc dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] dev-ada/gprbuild[gnat_2019(-)?]
 DESCRIPTION=Ada library to handle GPRbuild project files
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 IUSE=gnat_2016 gnat_2017 gnat_2018 +gnat_2019 +shared static-libs static-pic
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] !net-libs/grpc
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093 -> gprbuild-2019-20190517-194D8-src.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=88940d79c0f1951e84055ed869bd542b
+_md5_=36b383d76a642d6d13a6081eb84e3317
diff --git a/metadata/md5-cache/dev-ada/xmlada-2019 b/metadata/md5-cache/dev-ada/xmlada-2019
index ce633ba46e61..672ec3d0958f 100644
--- a/metadata/md5-cache/dev-ada/xmlada-2019
+++ b/metadata/md5-cache/dev-ada/xmlada-2019
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]
+DEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] dev-ada/gprbuild[gnat_2019(-)?]
 DESCRIPTION=Set of modules that provide a simple manipulation of XML streams
 EAPI=7
 HOMEPAGE=http://libre.adacore.com/
 IUSE=gnat_2016 gnat_2017 gnat_2018 +gnat_2019 +shared static-libs static-pic
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
 REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5 -> xmlada-2019-20190429-19B9D-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=2340024e0ec66066a8ea1ab296b77d95
+_md5_=574c2b7c21360dcfa6ed271ae9fe29ab
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index b30f537610f3..3a2438f9fc45 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/asio-1.12.1 b/metadata/md5-cache/dev-cpp/asio-1.12.1
deleted file mode 100644
index 68173ca73bd9..000000000000
--- a/metadata/md5-cache/dev-cpp/asio-1.12.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/boost ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-DESCRIPTION=Asynchronous Network Library
-EAPI=6
-HOMEPAGE=http://asio.sourceforge.net/
-IUSE=doc examples libressl ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Boost-1.0
-RDEPEND=dev-libs/boost ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/asio/asio/asio-1.12.1.tar.bz2
-_md5_=f171b32e521466b210e6d9284619b722
diff --git a/metadata/md5-cache/dev-cpp/asio-1.14.0 b/metadata/md5-cache/dev-cpp/asio-1.14.0
new file mode 100644
index 000000000000..f1fe51b0011d
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/asio-1.14.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/boost ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+DESCRIPTION=Asynchronous Network Library
+EAPI=7
+HOMEPAGE=https://think-async.com
+IUSE=doc examples libressl ssl test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Boost-1.0
+RDEPEND=dev-libs/boost ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/asio/asio/asio-1.14.0.tar.bz2
+_md5_=3122c29f746d13100a84dc0eccdbfb26
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.7.0-r1 b/metadata/md5-cache/dev-cpp/gtest-1.7.0-r1
deleted file mode 100644
index 9780096c0941..000000000000
--- a/metadata/md5-cache/dev-cpp/gtest-1.7.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( >=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
-DESCRIPTION=Google C++ Testing Framework
-EAPI=5
-HOMEPAGE=https://github.com/google/googletest
-IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/google/googletest/archive/release-1.7.0.tar.gz -> gtest-1.7.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b09a9e4eead7c6dcc0d49d2bf29df914
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607 b/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607
index 254909f43331..9671164a64e6 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607
+++ b/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607
@@ -5,10 +5,10 @@ DESCRIPTION=Google C++ Testing Framework
 EAPI=7
 HOMEPAGE=https://github.com/google/googletest
 IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=!dev-cpp/gmock
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/da10da05c262af0a9e8fa91789a272a3dec67655.tar.gz -> gtest-1.9.0_pre20190607.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13308b33d06c4114f5da7305e081a92a
+_md5_=6e2f57af15ad0a029132c0f01163bf72
diff --git a/metadata/md5-cache/dev-cpp/gtest-9999 b/metadata/md5-cache/dev-cpp/gtest-9999
index 1042d2050466..c8b9d122306c 100644
--- a/metadata/md5-cache/dev-cpp/gtest-9999
+++ b/metadata/md5-cache/dev-cpp/gtest-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=!dev-cpp/gmock
 SLOT=0
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f869efa0ad389e9f4948f200627e40a
+_md5_=c820990d4ad9c9014a9741a859d7d339
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.5.0 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.5.0
index 659e29aa75f4..9131c3b7b189 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.5.0
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.5.0
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.5.0.tar.gz -> nlohmann_json-3.5.0.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=0ce3f42f9991f3c61b8c566b517d3184
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1
index 9823ebc8959b..2fc8832d220a 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.6.1.tar.gz -> nlohmann_json-3.6.1.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=0ce3f42f9991f3c61b8c566b517d3184
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 27104aca45d1..6c5e93e41920 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/clickhouse-18.10.3 b/metadata/md5-cache/dev-db/clickhouse-18.10.3
deleted file mode 100644
index 229c9199e0e7..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-18.10.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= dev-libs/zookeeper-c kafka? ( dev-libs/librdkafka:= ) mysql? ( virtual/libmysqlclient ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/double-conversion[static-libs] dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:7[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-libs/zookeeper-c[static-libs] virtual/libmysqlclient[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 || ( >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 ) dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= dev-libs/zookeeper-c kafka? ( dev-libs/librdkafka:= ) mysql? ( virtual/libmysqlclient ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre
-REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
-SLOT=0/stable
-SRC_URI=https://github.com/yandex/ClickHouse/archive/v18.10.3-stable.tar.gz -> clickhouse-18.10.3.tar.gz https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de7aae4f254778f550cb8f1cebc524f7
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.10.3-r1 b/metadata/md5-cache/dev-db/clickhouse-18.10.3-r1
new file mode 100644
index 000000000000..1063a9ccdffc
--- /dev/null
+++ b/metadata/md5-cache/dev-db/clickhouse-18.10.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
+DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= dev-libs/zookeeper-c kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/double-conversion[static-libs] dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:7[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-libs/zookeeper-c[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 || ( >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 ) dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
+EAPI=6
+HOMEPAGE=https://clickhouse.yandex
+IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= dev-libs/zookeeper-c kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre
+REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+SLOT=0/stable
+SRC_URI=https://github.com/yandex/ClickHouse/archive/v18.10.3-stable.tar.gz -> clickhouse-18.10.3.tar.gz https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9ca30dcbd7c8b462ab36a63f3a26d918
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.12.17 b/metadata/md5-cache/dev-db/clickhouse-18.12.17
deleted file mode 100644
index 50ef634c8418..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-18.12.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( virtual/libmysqlclient ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/double-conversion[static-libs] dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:7[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] virtual/libmysqlclient[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 || ( >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 ) dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( virtual/libmysqlclient ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre
-REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
-SLOT=0/stable
-SRC_URI=https://github.com/yandex/ClickHouse/archive/v18.12.17-stable.tar.gz -> clickhouse-18.12.17.tar.gz https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c49090335927a6a254442ff5ce6bc714
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.12.17-r1 b/metadata/md5-cache/dev-db/clickhouse-18.12.17-r1
new file mode 100644
index 000000000000..55448387a8b6
--- /dev/null
+++ b/metadata/md5-cache/dev-db/clickhouse-18.12.17-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
+DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/double-conversion[static-libs] dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:7[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 || ( >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 ) dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
+EAPI=6
+HOMEPAGE=https://clickhouse.yandex
+IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre
+REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+SLOT=0/stable
+SRC_URI=https://github.com/yandex/ClickHouse/archive/v18.12.17-stable.tar.gz -> clickhouse-18.12.17.tar.gz https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8308970a89497578e63befdefaeec412
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.6.0 b/metadata/md5-cache/dev-db/clickhouse-18.6.0
deleted file mode 100644
index 9d06eb058fff..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-18.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= dev-libs/zookeeper-c kafka? ( dev-libs/librdkafka:= ) mysql? ( virtual/libmysqlclient ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre doc? ( >=dev-python/mkdocs-0.17.3 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/double-conversion[static-libs] dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:7[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-libs/zookeeper-c[static-libs] virtual/libmysqlclient[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 || ( >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 ) dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= dev-libs/zookeeper-c kafka? ( dev-libs/librdkafka:= ) mysql? ( virtual/libmysqlclient ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre
-REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
-SLOT=0/stable
-SRC_URI=https://github.com/yandex/ClickHouse/archive/v18.6.0-stable.tar.gz -> clickhouse-18.6.0.tar.gz https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=433a2b382a92fe10f9a61f030b7f77fb
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.6.0-r1 b/metadata/md5-cache/dev-db/clickhouse-18.6.0-r1
new file mode 100644
index 000000000000..d3002a6cd08d
--- /dev/null
+++ b/metadata/md5-cache/dev-db/clickhouse-18.6.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
+DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= dev-libs/zookeeper-c kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre doc? ( >=dev-python/mkdocs-0.17.3 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/double-conversion[static-libs] dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:7[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-libs/zookeeper-c[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 || ( >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 ) dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
+EAPI=6
+HOMEPAGE=https://clickhouse.yandex
+IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib || ( dev-db/unixODBC dev-libs/poco[odbc] ) dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= dev-libs/zookeeper-c kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre
+REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+SLOT=0/stable
+SRC_URI=https://github.com/yandex/ClickHouse/archive/v18.6.0-stable.tar.gz -> clickhouse-18.6.0.tar.gz https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4dd577d8ac39a38817ebb3569ccfae5d
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11 b/metadata/md5-cache/dev-db/clickhouse-19.13.1.11
deleted file mode 100644
index d63ad77e98fd..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( virtual/libmysqlclient ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/double-conversion[static-libs] dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:7[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] virtual/libmysqlclient[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( virtual/libmysqlclient ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf
-REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
-SLOT=0/stable
-SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.13.1.11-stable.zip -> clickhouse-19.13.1.11.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=115c97b93ebd6b1f69192e5ac808b33a
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r1 b/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r1
deleted file mode 100644
index 6deddaf1a26a..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( virtual/libmysqlclient ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/double-conversion[static-libs] dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:7[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] virtual/libmysqlclient[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) =dev-cpp/gtest-1.8* sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( virtual/libmysqlclient ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf
-REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
-SLOT=0/stable
-SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.13.1.11-stable.zip -> clickhouse-19.13.1.11.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80eb9f483e82aae62f57aa2198b7a880
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r2 b/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r2
new file mode 100644
index 000000000000..3e9aebe5365d
--- /dev/null
+++ b/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
+DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/double-conversion[static-libs] dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:7[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
+EAPI=6
+HOMEPAGE=https://clickhouse.yandex
+IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf
+REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+SLOT=0/stable
+SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.13.1.11-stable.zip -> clickhouse-19.13.1.11.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=62a5248d128100a61a104580dc64bfe7
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r3 b/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r3
new file mode 100644
index 000000000000..7861a15504e6
--- /dev/null
+++ b/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
+DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/double-conversion[static-libs] dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:7[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) =dev-cpp/gtest-1.8* sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
+EAPI=6
+HOMEPAGE=https://clickhouse.yandex
+IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc dev-libs/protobuf
+REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+SLOT=0/stable
+SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.13.1.11-stable.zip -> clickhouse-19.13.1.11.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1d0213c96428a5edb5a1dd56674bd189
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.5.3.8 b/metadata/md5-cache/dev-db/clickhouse-19.5.3.8
deleted file mode 100644
index 647624c395c3..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-19.5.3.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( virtual/libmysqlclient ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/double-conversion[static-libs] dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:7[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] virtual/libmysqlclient[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( virtual/libmysqlclient ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc
-REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
-SLOT=0/stable
-SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.5.3.8-stable.zip -> clickhouse-19.5.3.8.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=583174b055f410f0f1f6c134bec41e89
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.5.3.8-r1 b/metadata/md5-cache/dev-db/clickhouse-19.5.3.8-r1
new file mode 100644
index 000000000000..a6d8a5eb4bdb
--- /dev/null
+++ b/metadata/md5-cache/dev-db/clickhouse-19.5.3.8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
+DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/double-conversion[static-libs] dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:7[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
+EAPI=6
+HOMEPAGE=https://clickhouse.yandex
+IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc
+REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+SLOT=0/stable
+SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.5.3.8-stable.zip -> clickhouse-19.5.3.8.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d061222671e44e8b128c8eef5edfad2f
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.9.5.36 b/metadata/md5-cache/dev-db/clickhouse-19.9.5.36
deleted file mode 100644
index 9a86c5f45797..000000000000
--- a/metadata/md5-cache/dev-db/clickhouse-19.9.5.36
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
-DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( virtual/libmysqlclient ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/double-conversion[static-libs] dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:7[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] virtual/libmysqlclient[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
-EAPI=6
-HOMEPAGE=https://clickhouse.yandex
-IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( virtual/libmysqlclient ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc
-REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
-SLOT=0/stable
-SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.9.5.36-stable.zip -> clickhouse-19.9.5.36.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=583174b055f410f0f1f6c134bec41e89
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.9.5.36-r1 b/metadata/md5-cache/dev-db/clickhouse-19.9.5.36-r1
new file mode 100644
index 000000000000..318afad8e8b5
--- /dev/null
+++ b/metadata/md5-cache/dev-db/clickhouse-19.9.5.36-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend test unpack
+DEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc doc? ( >=dev-python/mkdocs-1.0.1 ) static? ( >=app-arch/lz4-1.8.0[static-libs] >=app-arch/zstd-1.3.4[static-libs] client? ( sys-libs/ncurses:0=[static-libs] sys-libs/readline:0=[static-libs] ) dev-libs/double-conversion[static-libs] dev-libs/capnproto[static-libs] dev-libs/libltdl[static-libs] sys-libs/libunwind:7[static-libs] sys-libs/zlib[static-libs] || ( dev-db/unixODBC[static-libs] dev-libs/poco[odbc] ) dev-libs/icu[static-libs] dev-libs/glib[static-libs] >=dev-libs/boost-1.65.0[static-libs] dev-libs/openssl[static-libs] dev-db/mysql-connector-c[static-libs] kafka? ( dev-libs/librdkafka[static-libs] ) ) sys-libs/libtermcap-compat dev-util/patchelf >=sys-devel/lld-6.0.0 >=sys-devel/gcc-7.0 >=sys-devel/clang-6.0 dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=An OSS column-oriented database management system for real-time data analysis
+EAPI=6
+HOMEPAGE=https://clickhouse.yandex
+IUSE=+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/re2:0= !static? ( >=app-arch/lz4-1.8.0:= >=app-arch/zstd-1.3.4:= client? ( sys-libs/ncurses:0= sys-libs/readline:0= ) dev-libs/double-conversion dev-libs/capnproto dev-libs/libltdl:0 sys-libs/libunwind:7 sys-libs/zlib dev-libs/poco[odbc] dev-libs/icu:= dev-libs/glib >=dev-libs/boost-1.65.0:= dev-libs/openssl:0= kafka? ( dev-libs/librdkafka:= ) mysql? ( dev-db/mysql-connector-c:= ) ) >=dev-libs/poco-1.9.0 dev-libs/libpcre dev-libs/jemalloc
+REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
+SLOT=0/stable
+SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.9.5.36-stable.zip -> clickhouse-19.9.5.36.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d061222671e44e8b128c8eef5edfad2f
diff --git a/metadata/md5-cache/dev-db/cockroach-19.1.1 b/metadata/md5-cache/dev-db/cockroach-19.1.1
index 6f0cf60af328..f39d0bdb22d1 100644
--- a/metadata/md5-cache/dev-db/cockroach-19.1.1
+++ b/metadata/md5-cache/dev-db/cockroach-19.1.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Cockroach Apache-2.0
 SLOT=0
 SRC_URI=https://binaries.cockroachdb.com/cockroach-v19.1.1.src.tgz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=0ddcc8c3dedadf84dfee1429c331d89e
diff --git a/metadata/md5-cache/dev-db/cockroach-2.1.5 b/metadata/md5-cache/dev-db/cockroach-2.1.5
index ee1bf501a15e..25a68bef1c38 100644
--- a/metadata/md5-cache/dev-db/cockroach-2.1.5
+++ b/metadata/md5-cache/dev-db/cockroach-2.1.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Cockroach Apache-2.0
 SLOT=0
 SRC_URI=https://binaries.cockroachdb.com/cockroach-v2.1.5.src.tgz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=5d463d1d71238c798ac4b5ce271b31c8
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.13 b/metadata/md5-cache/dev-db/etcd-3.3.13
deleted file mode 100644
index 3e92a2ff95e5..000000000000
--- a/metadata/md5-cache/dev-db/etcd-3.3.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.10:= virtual/pkgconfig >=dev-lang/go-1.10
-DESCRIPTION=Highly-available key value store for shared configuration and service discovery
-EAPI=6
-HOMEPAGE=https://github.com/etcd-io/etcd
-IUSE=doc +server
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=!dev-db/etcdctl
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/etcd-io/etcd/archive/v3.3.13.tar.gz -> etcd-3.3.13.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=bb7e855b1b6f57d6b3bd26ba1cebce4e
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.14 b/metadata/md5-cache/dev-db/etcd-3.3.14
deleted file mode 100644
index c02f2fda3246..000000000000
--- a/metadata/md5-cache/dev-db/etcd-3.3.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.12:= virtual/pkgconfig >=dev-lang/go-1.10
-DESCRIPTION=Highly-available key value store for shared configuration and service discovery
-EAPI=6
-HOMEPAGE=https://github.com/etcd-io/etcd
-IUSE=doc +server
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!dev-db/etcdctl
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/coreos/etcd/archive/v3.3.14.tar.gz -> etcd-3.3.14.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=e483f311775fcaca7ce8c23c4a84e3e4
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.15 b/metadata/md5-cache/dev-db/etcd-3.3.15
new file mode 100644
index 000000000000..9a2c1fa3ea87
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.3.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.12:= virtual/pkgconfig >=dev-lang/go-1.10
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=6
+HOMEPAGE=https://github.com/etcd-io/etcd
+IUSE=doc +server
+KEYWORDS=amd64
+LICENSE=Apache-2.0
+RDEPEND=!dev-db/etcdctl
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/coreos/etcd/archive/v3.3.15.tar.gz -> etcd-3.3.15.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=dd843eb984cd218cb5984d4bb5c1f74d
diff --git a/metadata/md5-cache/dev-db/etcd-3.4.0 b/metadata/md5-cache/dev-db/etcd-3.4.0
new file mode 100644
index 000000000000..4904cb9b2d52
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.12:= virtual/pkgconfig >=dev-lang/go-1.10
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=6
+HOMEPAGE=https://github.com/etcd-io/etcd
+IUSE=doc +server
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!dev-db/etcdctl
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/etcd-io/etcd/archive/v3.4.0.tar.gz -> etcd-3.4.0.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=245b1224236f52c02db142f52102a69f
diff --git a/metadata/md5-cache/dev-db/kyotocabinet-1.2.76-r1 b/metadata/md5-cache/dev-db/kyotocabinet-1.2.76-r1
index e6d53039024c..803c53c2db23 100644
--- a/metadata/md5-cache/dev-db/kyotocabinet-1.2.76-r1
+++ b/metadata/md5-cache/dev-db/kyotocabinet-1.2.76-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A straightforward implementation of DBM
 EAPI=6
 HOMEPAGE=http://fallabs.com/kyotocabinet/
 IUSE=debug doc examples static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 ~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 ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=sys-libs/zlib[static-libs?] app-arch/xz-utils[static-libs?]
 SLOT=0
 SRC_URI=http://fallabs.com/kyotocabinet/pkg/kyotocabinet-1.2.76.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=30673fa405d75ea2c20f9b561a584ecc
+_md5_=befa3cb4ac5e59a06af5937b12b0b5a9
diff --git a/metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1 b/metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1
new file mode 100644
index 000000000000..93172525efeb
--- /dev/null
+++ b/metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-text/openjade ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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 test
+DEPEND=>=dev-db/libdbi-0.9.0 firebird? ( dev-db/firebird ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
+DESCRIPTION=The libdbi-drivers project maintains drivers for libdbi
+EAPI=7
+HOMEPAGE=http://libdbi-drivers.sourceforge.net/
+IUSE=doc firebird mysql oci8 postgres +sqlite static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-db/libdbi-0.9.0 firebird? ( dev-db/firebird ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=|| ( mysql postgres sqlite firebird oci8 )
+RESTRICT=firebird? ( bindist )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/libdbi-drivers/libdbi-drivers/libdbi-drivers-0.9.0/libdbi-drivers-0.9.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=05be750399979577d1767b4b83e43b31
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.13 b/metadata/md5-cache/dev-db/mongodb-3.6.13
index 20d4cdf0a2ca..654e7fcdd004 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.13
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.13
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
+BDEPEND=|| ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-util/scons-2.5.0[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/cheetah[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pymongo[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
 DESCRIPTION=A high-performance, open source, schema-free document-oriented database
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
-IUSE=debug kerberos libressl lto mms-agent ssl test +tools python_targets_python2_7
+IUSE=debug kerberos libressl lto mms-agent ssl test +tools
 KEYWORDS=amd64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.13 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.13.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=d1ba4448fa9c533bf4c8135f0b97f26e
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=9f927f76b3495bca20fc306c7c353daa
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.8 b/metadata/md5-cache/dev-db/mongodb-3.6.8
index 1b4e8fb6d861..bc709867752e 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.8
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
+DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/cheetah[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pymongo[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-util/scons-2.5.0[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig
 DESCRIPTION=A high-performance, open source, schema-free document-oriented database
 EAPI=6
 HOMEPAGE=https://www.mongodb.com
-IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
+IUSE=debug kerberos libressl mms-agent ssl test +tools
 KEYWORDS=amd64
 LICENSE=AGPL-3 Apache-2.0
 PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.8 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.8.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f40b8aa6995bf3b1b612b5bed4376764
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2140e8e16785195fed3f894fd23fdc9f
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.10 b/metadata/md5-cache/dev-db/mongodb-4.0.10
index 182f62b78d49..48d4050a9218 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.0.10
+++ b/metadata/md5-cache/dev-db/mongodb-4.0.10
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
+BDEPEND=|| ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-util/scons-2.5.0[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/cheetah[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pymongo[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
 DESCRIPTION=A high-performance, open source, schema-free document-oriented database
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
-IUSE=debug kerberos libressl lto mms-agent ssl test +tools python_targets_python2_7
+IUSE=debug kerberos libressl lto mms-agent ssl test +tools
 KEYWORDS=amd64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-4.0.10 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.10.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=8ea61d77abf57676bc207fabe639b520
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=434bd2fbd79777ca5b28d712d3692f59
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.12 b/metadata/md5-cache/dev-db/mongodb-4.0.12
index c93baddfe9dd..50b78f8d1c4a 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.0.12
+++ b/metadata/md5-cache/dev-db/mongodb-4.0.12
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
+BDEPEND=|| ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-util/scons-2.5.0[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/cheetah[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pymongo[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
 DESCRIPTION=A high-performance, open source, schema-free document-oriented database
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
-IUSE=debug kerberos libressl lto mms-agent ssl test +tools python_targets_python2_7
+IUSE=debug kerberos libressl lto mms-agent ssl test +tools
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-4.0.12 )
 RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.12.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=372b5300412d88c97c0317b1258920e7
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=77ddf89cf0dc29c7f12a2f7e0019c4d3
diff --git a/metadata/md5-cache/dev-db/mycli-1.15.0-r2 b/metadata/md5-cache/dev-db/mycli-1.15.0-r2
deleted file mode 100644
index 14690be39181..000000000000
--- a/metadata/md5-cache/dev-db/mycli-1.15.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=CLI for MySQL Database with auto-completion and syntax highlighting
-EAPI=6
-HOMEPAGE=https://www.mycli.net
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/cli_helpers-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/click-4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configobj-5.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !>=dev-python/prompt_toolkit-1.1.0 >=dev-python/pygments-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pymysql-0.6.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !>=dev-python/python-sqlparse-0.3.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/dbcli/mycli/archive/v1.15.0.tar.gz -> mycli-1.15.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a5d219f4a5d149dcaddb183b2ae3f7a2
diff --git a/metadata/md5-cache/dev-db/mycli-1.17.0-r1 b/metadata/md5-cache/dev-db/mycli-1.17.0-r1
deleted file mode 100644
index 0871ae9c32a9..000000000000
--- a/metadata/md5-cache/dev-db/mycli-1.17.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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cli_helpers-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/click-4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configobj-5.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prompt_toolkit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pymysql-0.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/python-sqlparse-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-DESCRIPTION=CLI for MySQL Database with auto-completion and syntax highlighting
-EAPI=7
-HOMEPAGE=https://www.mycli.net
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/cli_helpers-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/click-4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configobj-5.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/prompt_toolkit-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pymysql-0.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/python-sqlparse-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/dbcli/mycli/archive/v1.17.0.tar.gz -> mycli-1.17.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=925aa82ea20ac203bf52c4968c5b8794
diff --git a/metadata/md5-cache/dev-db/mycli-1.20.1 b/metadata/md5-cache/dev-db/mycli-1.20.1
new file mode 100644
index 000000000000..cd8f6a7fc868
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mycli-1.20.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cli_helpers-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-7.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/configobj-5.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-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/prompt_toolkit-2.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-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/pymysql-0.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/python-sqlparse-0.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(-)] ssh? ( 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(-)] ) )
+DESCRIPTION=CLI for MySQL Database with auto-completion and syntax highlighting
+EAPI=7
+HOMEPAGE=https://www.mycli.net
+IUSE=ssh test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/cli_helpers-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-7.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/configobj-5.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-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/prompt_toolkit-2.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-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/pymysql-0.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/python-sqlparse-0.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(-)] ssh? ( 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(-)] ) 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/dbcli/mycli/archive/v1.20.1.tar.gz -> mycli-1.20.1.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=983b50ee1fa893eb9a10c5d4fb8049e2
diff --git a/metadata/md5-cache/dev-db/mycli-9999 b/metadata/md5-cache/dev-db/mycli-9999
index b8789b2539a6..4ec72dc24d04 100644
--- a/metadata/md5-cache/dev-db/mycli-9999
+++ b/metadata/md5-cache/dev-db/mycli-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=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(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cli_helpers-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/click-7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configobj-5.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-2.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pymysql-0.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/python-sqlparse-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ssh? ( 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(-)] ) )
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cli_helpers-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-7.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/configobj-5.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-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/prompt_toolkit-2.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-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/pymysql-0.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/python-sqlparse-0.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(-)] ssh? ( 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(-)] ) )
 DESCRIPTION=CLI for MySQL Database with auto-completion and syntax highlighting
 EAPI=7
 HOMEPAGE=https://www.mycli.net
-IUSE=ssh test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=ssh test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 LICENSE=BSD MIT
 PROPERTIES=live
-RDEPEND=>=dev-python/cli_helpers-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/click-7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configobj-5.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-2.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pymysql-0.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/python-sqlparse-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ssh? ( 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(-)] ) 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/cli_helpers-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-7.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/configobj-5.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-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/prompt_toolkit-2.0.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-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/pymysql-0.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/python-sqlparse-0.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(-)] ssh? ( 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(-)] ) 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	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=09c43dc5d20b951b6e7ea2a14f71a2da
+_md5_=3dc434493702c797f086ce1c20c71936
diff --git a/metadata/md5-cache/dev-db/myodbc-5.3.10-r2 b/metadata/md5-cache/dev-db/myodbc-5.3.10-r2
deleted file mode 100644
index 27ddd38329dc..000000000000
--- a/metadata/md5-cache/dev-db/myodbc-5.3.10-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~virtual/libmysqlclient-18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !>=dev-db/mariadb-10.2.0[client-libs(+)] !dev-db/mariadb-connector-c[mysqlcompat(-)] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=ODBC driver for MySQL
-EAPI=6
-HOMEPAGE=http://www.mysql.com/products/myodbc/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~virtual/libmysqlclient-18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !>=dev-db/mariadb-10.2.0[client-libs(+)] !dev-db/mariadb-connector-c[mysqlcompat(-)]
-SLOT=5.3
-SRC_URI=https://dev.mysql.com/get/Downloads/Connector-ODBC/5.3/mysql-connector-odbc-5.3.10-src.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a8c490ff61251092aea2fff5cfd5a95
diff --git a/metadata/md5-cache/dev-db/myodbc-5.3.10-r3 b/metadata/md5-cache/dev-db/myodbc-5.3.10-r3
new file mode 100644
index 000000000000..a95595ccc50a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/myodbc-5.3.10-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst prepare test
+DEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <dev-db/mysql-connector-c-8.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !>=dev-db/mariadb-10.2.0[client-libs(+)] !dev-db/mariadb-connector-c[mysqlcompat(-)] sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=ODBC driver for MySQL
+EAPI=6
+HOMEPAGE=http://www.mysql.com/products/myodbc/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <dev-db/mysql-connector-c-8.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !>=dev-db/mariadb-10.2.0[client-libs(+)] !dev-db/mariadb-connector-c[mysqlcompat(-)]
+SLOT=5.3
+SRC_URI=https://dev.mysql.com/get/Downloads/Connector-ODBC/5.3/mysql-connector-odbc-5.3.10-src.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c1083bec939ab39664c233e54e8a5d11
diff --git a/metadata/md5-cache/dev-db/mysql++-3.2.3 b/metadata/md5-cache/dev-db/mysql++-3.2.3
deleted file mode 100644
index 9348f8c5b160..000000000000
--- a/metadata/md5-cache/dev-db/mysql++-3.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=virtual/libmysqlclient:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=C++ API interface to the MySQL database
-EAPI=6
-HOMEPAGE=http://tangentsoft.net/mysql++/
-IUSE=doc
-KEYWORDS=alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LGPL-2
-RDEPEND=virtual/libmysqlclient:=
-SLOT=0/3
-SRC_URI=http://www.tangentsoft.net/mysqlpp/releases/mysql++-3.2.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f27c8d41fa25cf75bc4ae88f0a72da6b
diff --git a/metadata/md5-cache/dev-db/mysql++-3.2.3-r1 b/metadata/md5-cache/dev-db/mysql++-3.2.3-r1
new file mode 100644
index 000000000000..7c55bd356bcc
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql++-3.2.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-db/mysql-connector-c:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=C++ API interface to the MySQL database
+EAPI=6
+HOMEPAGE=http://tangentsoft.net/mysql++/
+IUSE=doc
+KEYWORDS=alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=LGPL-2
+RDEPEND=dev-db/mysql-connector-c:=
+SLOT=0/3
+SRC_URI=http://www.tangentsoft.net/mysqlpp/releases/mysql++-3.2.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bce4ecd7e28ba435a421ce23b00a6268
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.61 b/metadata/md5-cache/dev-db/mysql-5.5.61
deleted file mode 100644
index e1f52e8a4c6f..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.5.61
+++ /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= ) !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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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://mysql.com/
-IUSE=bindist client-libs debug extraengine jemalloc latin1 libressl +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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~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/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= ) >=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= ) !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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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=?? ( tcmalloc jemalloc ) static? ( yassl )
-RESTRICT=!bindist? ( bindist ) libressl? ( test )
-SLOT=0/18
-SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.5/mysql-5.5.61.tar.gz https://downloads.mysql.com/archives/MySQL-5.5/mysql-5.5.61.tar.gz mirror://gentoo/mysql-extras-20180804-2323Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180804-2323Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ee86b1e0fd05d643115ff3fa09d2f0a
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.62 b/metadata/md5-cache/dev-db/mysql-5.5.62
deleted file mode 100644
index 3daa086cbac9..000000000000
--- a/metadata/md5-cache/dev-db/mysql-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= ) !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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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://mysql.com/
-IUSE=bindist client-libs debug extraengine jemalloc latin1 libressl +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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~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/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= ) >=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= ) !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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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=?? ( tcmalloc jemalloc ) static? ( yassl )
-RESTRICT=!bindist? ( bindist ) libressl? ( test )
-SLOT=0/18
-SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.5/mysql-5.5.62.tar.gz https://downloads.mysql.com/archives/MySQL-5.5/mysql-5.5.62.tar.gz mirror://gentoo/mysql-extras-20180804-2323Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180804-2323Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180804-2323Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfb1084ef84b1dd26f5a2fd1220ae2e5
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.40-r2 b/metadata/md5-cache/dev-db/mysql-5.6.40-r2
deleted file mode 100644
index c9c3d48b4552..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.6.40-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup test unpack
-DEPEND=virtual/yacc static? ( sys-libs/ncurses[static-libs] ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d abi_riscv_lp64 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.40.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.40.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.40.tar.gz mirror://gentoo/mysql-extras-20181111-2314Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20181111-2314Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20181111-2314Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20181111-2314Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20181111-2314Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=732353da17dcb777a3430a756c3ef7fd
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.42 b/metadata/md5-cache/dev-db/mysql-5.6.42
deleted file mode 100644
index e284a8097074..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.6.42
+++ /dev/null
@@ -1,16 +0,0 @@
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d abi_riscv_lp64 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.42.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.42.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.42.tar.gz mirror://gentoo/mysql-extras-20181111-2314Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20181111-2314Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20181111-2314Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20181111-2314Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20181111-2314Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=309fe4f7a344ab0f26317a02fb1ea00a
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.43 b/metadata/md5-cache/dev-db/mysql-5.6.43
deleted file mode 100644
index ba37d8e6c7c3..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.6.43
+++ /dev/null
@@ -1,16 +0,0 @@
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d abi_riscv_lp64 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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-20190303-1852Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190303-1852Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190303-1852Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190303-1852Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190303-1852Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2721b076e130d500c9608ac98794e0f6
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.44-r1 b/metadata/md5-cache/dev-db/mysql-5.6.44-r1
index 86864c62f142..d818460a763a 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.44-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.6.44-r1
@@ -4,7 +4,7 @@ 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_riscv_lp64d abi_riscv_lp64 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
+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-2.6.5*: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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] )
@@ -13,4 +13,4 @@ RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.44.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.44.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.44.tar.gz mirror://gentoo/mysql-extras-20190817-0024Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190817-0024Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190817-0024Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190817-0024Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190817-0024Z.tar.bz2
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69c3ab67e3055e1203be1323a8858f84
+_md5_=675afda089f8ab52eea6f29264198146
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.45-r1 b/metadata/md5-cache/dev-db/mysql-5.6.45-r1
deleted file mode 100644
index ca70f5666f0a..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.6.45-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-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-2.6.5*: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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d abi_riscv_lp64 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-2.6.5*: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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.45.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.45.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.45.tar.gz mirror://gentoo/mysql-extras-20190817-0024Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190817-0024Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190817-0024Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190817-0024Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190817-0024Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a1da6a422f34d7e2f9a54c380bcb9063
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.45-r2 b/metadata/md5-cache/dev-db/mysql-5.6.45-r2
new file mode 100644
index 000000000000..637a4715a216
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-5.6.45-r2
@@ -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? ( acct-group/mysql acct-user/mysql 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-2.6.5*: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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d abi_riscv_lp64 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? ( acct-group/mysql acct-user/mysql 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-2.6.5*: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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.45.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.45.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.45.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190822-1908Z.tar.bz2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=91a147bb66e2a249b2841ef0d38ef1e9
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.23-r2 b/metadata/md5-cache/dev-db/mysql-5.7.23-r2
deleted file mode 100644
index d320caba1dc2..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.7.23-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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] ) 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_riscv_lp64d abi_riscv_lp64 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.23.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.23.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.23.tar.gz mirror://gentoo/mysql-extras-20181023-0012Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20181023-0012Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8bc36c5c418b71dd04a2feb56c924790
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.24 b/metadata/md5-cache/dev-db/mysql-5.7.24
deleted file mode 100644
index e70ec4a25dfa..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.7.24
+++ /dev/null
@@ -1,16 +0,0 @@
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d abi_riscv_lp64 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.24.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.24.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.24.tar.gz mirror://gentoo/mysql-extras-20181023-0012Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20181023-0012Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ae73fe07650d2b713a1d9449bff62d7
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.25 b/metadata/md5-cache/dev-db/mysql-5.7.25
deleted file mode 100644
index f7aaa1bf65c7..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.7.25
+++ /dev/null
@@ -1,16 +0,0 @@
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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-20190524-1046Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190524-1046Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=66c791aa6f4c72bbd52ee9052d947208
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.26 b/metadata/md5-cache/dev-db/mysql-5.7.26
deleted file mode 100644
index 73652f85f620..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.7.26
+++ /dev/null
@@ -1,16 +0,0 @@
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.26.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.26.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.26.tar.gz mirror://gentoo/mysql-extras-20190524-1046Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190524-1046Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=776ee37a20c74941650028a5116f12b5
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.26-r1 b/metadata/md5-cache/dev-db/mysql-5.7.26-r1
new file mode 100644
index 000000000000..d5b2e9fad106
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-5.7.26-r1
@@ -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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.26.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.26.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.26.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0321dec52b25347fff7dfdbbe166681b
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.27 b/metadata/md5-cache/dev-db/mysql-5.7.27
deleted file mode 100644
index 05416fc6afa9..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.7.27
+++ /dev/null
@@ -1,16 +0,0 @@
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.27.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.27.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.27.tar.gz mirror://gentoo/mysql-extras-20190604-1109Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190604-1109Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d2d6783c1d82fe742be51b029530aa7d
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.27-r1 b/metadata/md5-cache/dev-db/mysql-5.7.27-r1
new file mode 100644
index 000000000000..a59c66d69a67
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-5.7.27-r1
@@ -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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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? ( acct-group/mysql acct-user/mysql 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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? ( acct-group/mysql acct-user/mysql 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.27.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.27.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.27.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2bc6c2007bb7a7880ba61500b0483a44
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.17 b/metadata/md5-cache/dev-db/mysql-8.0.17
index 70d6255dcdeb..c7608f596ca4 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.17
+++ b/metadata/md5-cache/dev-db/mysql-8.0.17
@@ -14,4 +14,4 @@ RESTRICT=libressl? ( test )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.17.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.17.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.17.tar.gz mirror://gentoo/mysql-extras-20190817-0024Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190817-0024Z.tar.bz2
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95f55494b3adb58787060d595e56a2d7
+_md5_=0ebf1aa7cea897e54001cdeda4a3e602
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.11 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.11
deleted file mode 100644
index e3e4cdcd0a1f..000000000000
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.11
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/mysql-connector-c-6.1.8
-DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
-EAPI=7
-HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
-IUSE=debug examples gcov static-libs
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/mysql-connector-c-6.1.8
-SLOT=0
-SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.11.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd4b3983333c071f1a325a9c9104a54b
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.11-r1 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.11-r1
new file mode 100644
index 000000000000..3e1492478e1a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.11-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-db/mysql-connector-c:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/mysql-connector-c-6.1.8
+DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
+EAPI=7
+HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
+IUSE=debug examples gcov static-libs
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-db/mysql-connector-c:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/mysql-connector-c-6.1.8
+SLOT=0
+SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.11.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d9d9be8266b557c818aefe5313d77914
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.12 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.12
deleted file mode 100644
index 1efc36559f33..000000000000
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.12
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libmysqlclient:= dev-libs/boost:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !<dev-db/mysql-connector-c-6.1.8
-DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
-EAPI=7
-HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
-IUSE=debug examples gcov libressl static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Artistic GPL-2
-RDEPEND=virtual/libmysqlclient:= dev-libs/boost:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !<dev-db/mysql-connector-c-6.1.8
-SLOT=0/7
-SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.12.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db0feb602bd9ad04af251ca3d3def3bc
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.12-r1 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.12-r1
new file mode 100644
index 000000000000..43546c8fa15a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.12-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-db/mysql-connector-c:= dev-libs/boost:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !<dev-db/mysql-connector-c-6.1.8
+DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
+EAPI=7
+HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
+IUSE=debug examples gcov libressl static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Artistic GPL-2
+RDEPEND=dev-db/mysql-connector-c:= dev-libs/boost:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !<dev-db/mysql-connector-c-6.1.8
+SLOT=0/7
+SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.12.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=aca4257c8898c74bf74e4ffd2c85d041
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9
deleted file mode 100644
index a640d61eb5c4..000000000000
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/mysql-connector-c-6.1.8 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
-EAPI=6
-HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
-IUSE=debug examples gcov static-libs
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/mysql-connector-c-6.1.8
-SLOT=0
-SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.9.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53e394ce819f65f1794ccfe1e414544e
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9-r1 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9-r1
new file mode 100644
index 000000000000..7ee5a146184a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-db/mysql-connector-c:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/mysql-connector-c-6.1.8 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
+EAPI=6
+HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
+IUSE=debug examples gcov static-libs
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-db/mysql-connector-c:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/mysql-connector-c-6.1.8
+SLOT=0
+SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.9.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=74f283c9f3ce7cc875772da7cbd8cc04
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.17-r1 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.17-r1
deleted file mode 100644
index 09084a5ec7d7..000000000000
--- a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.17-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=C client library for MariaDB/MySQL
-EAPI=7
-HOMEPAGE=https://dev.mysql.com/downloads/
-IUSE=ldap libressl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/21
-SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.17.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c5e0fab0b0da8164b71d7261cc59e03
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.17-r3 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.17-r3
new file mode 100644
index 000000000000..ea692549f278
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.17-r3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-arch/lz4-0_p131:= sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=C client library for MariaDB/MySQL
+EAPI=7
+HOMEPAGE=https://dev.mysql.com/downloads/
+IUSE=ldap libressl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-arch/lz4-0_p131:= sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<dev-db/mysql-5.6.45-r1 !=dev-db/mysql-5.7.23* !=dev-db/mysql-5.7.24* !=dev-db/mysql-5.7.25* !=dev-db/mysql-5.7.26-r0 !=dev-db/mysql-5.7.27-r0 !<dev-db/percona-server-5.7.26.29-r1
+SLOT=0/21
+SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.17.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=86faa0e61af92b8d829c176c607b02fd
diff --git a/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r3 b/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r3
deleted file mode 100644
index 697219a83028..000000000000
--- a/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Gentoo MySQL init scripts.
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=!<dev-db/mysql-5.1 !<sys-apps/openrc-0.16.2 virtual/tmpfiles
-SLOT=0
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	s6	77dc4ae04ca4f45f43b492f80a8fa2ea	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0972f285a6417d8a6a7a165d203b5dcc
diff --git a/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r4 b/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r4
deleted file mode 100644
index c0beac8ecdcc..000000000000
--- a/metadata/md5-cache/dev-db/mysql-init-scripts-2.2-r4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Gentoo MySQL init scripts.
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=!<dev-db/mysql-5.1 !<sys-apps/openrc-0.16.2 dev-db/mysql-connector-c virtual/tmpfiles
-SLOT=0
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	s6	77dc4ae04ca4f45f43b492f80a8fa2ea	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=4a467cf98b3d64852b1c1ff5b6cac394
diff --git a/metadata/md5-cache/dev-db/mysql-init-scripts-2.3 b/metadata/md5-cache/dev-db/mysql-init-scripts-2.3
deleted file mode 100644
index 5925309657be..000000000000
--- a/metadata/md5-cache/dev-db/mysql-init-scripts-2.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Gentoo MySQL init scripts.
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=!<dev-db/mysql-5.1 !<sys-apps/openrc-0.16.2 dev-db/mysql-connector-c virtual/tmpfiles
-SLOT=0
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	s6	77dc4ae04ca4f45f43b492f80a8fa2ea	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8f725ec5be6b840ed3edee7140e4e695
diff --git a/metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r1 b/metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r1
deleted file mode 100644
index a7fb5341d0ae..000000000000
--- a/metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Gentoo MySQL init scripts.
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=!<dev-db/mysql-5.1 !<sys-apps/openrc-0.16.2 dev-db/mysql-connector-c virtual/tmpfiles
-SLOT=0
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	s6	77dc4ae04ca4f45f43b492f80a8fa2ea	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=69e901b40b392bb01919a4ca0334d380
diff --git a/metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r3 b/metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r3
new file mode 100644
index 000000000000..91f8cc8d69dc
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Gentoo MySQL init scripts.
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=!<dev-db/mysql-5.1 !<sys-apps/openrc-0.16.2 dev-db/mysql-connector-c !prefix? ( acct-group/mysql acct-user/mysql ) virtual/tmpfiles
+SLOT=0
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	s6	77dc4ae04ca4f45f43b492f80a8fa2ea	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=1b12f8a9c5e67b16b87877785071131a
diff --git a/metadata/md5-cache/dev-db/percona-server-5.7.26.29 b/metadata/md5-cache/dev-db/percona-server-5.7.26.29
deleted file mode 100644
index d128c88ecb14..000000000000
--- a/metadata/md5-cache/dev-db/percona-server-5.7.26.29
+++ /dev/null
@@ -1,16 +0,0 @@
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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 ) pam? ( virtual/pam:0= ) rocksdb? ( app-arch/zstd:= dev-libs/protobuf:= ) tokudb? ( app-arch/snappy:= app-arch/xz-utils:= ) tokudb-backup-plugin? ( dev-util/valgrind ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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-lang/python-2.7.5-r2:2.7 dev-python/mysql-python[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) 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.percona.com/software/mysql-database/percona-server
-IUSE=cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa pam +perl profiling rocksdb selinux +server static static-libs systemtap tcmalloc test tokudb tokudb-backup-plugin yassl kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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 ) pam? ( virtual/pam:0= ) rocksdb? ( app-arch/zstd:= dev-libs/protobuf:= ) tokudb? ( app-arch/snappy:= app-arch/xz-utils:= ) tokudb-backup-plugin? ( dev-util/valgrind ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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/mysql !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://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-5.7.26-29/source/tarball/percona-server-5.7.26-29.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz mirror://gentoo/mysql-extras-20190524-1046Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190524-1046Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=89d12ba2c40386e371859f544d5d3a38
diff --git a/metadata/md5-cache/dev-db/percona-server-5.7.26.29-r1 b/metadata/md5-cache/dev-db/percona-server-5.7.26.29-r1
new file mode 100644
index 000000000000..a249010596c4
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-server-5.7.26.29-r1
@@ -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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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 ) pam? ( virtual/pam:0= ) rocksdb? ( app-arch/zstd:= dev-libs/protobuf:= ) tokudb? ( app-arch/snappy:= app-arch/xz-utils:= ) tokudb-backup-plugin? ( dev-util/valgrind ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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? ( acct-group/mysql acct-user/mysql dev-perl/JSON || ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysqlclient[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysql-python[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
+EAPI=6
+HOMEPAGE=https://www.percona.com/software/mysql-database/percona-server
+IUSE=cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa pam +perl profiling rocksdb selinux +server static static-libs systemtap tcmalloc test tokudb tokudb-backup-plugin yassl kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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 ) pam? ( virtual/pam:0= ) rocksdb? ( app-arch/zstd:= dev-libs/protobuf:= ) tokudb? ( app-arch/snappy:= app-arch/xz-utils:= ) tokudb-backup-plugin? ( dev-util/valgrind ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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/mysql !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? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts ) )
+REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
+RESTRICT=libressl? ( test )
+SLOT=0/18
+SRC_URI=https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-5.7.26-29/source/tarball/percona-server-5.7.26-29.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9289a8c960de01a05f0d3111ff9f77b9
diff --git a/metadata/md5-cache/dev-db/percona-server-5.7.27.30 b/metadata/md5-cache/dev-db/percona-server-5.7.27.30
new file mode 100644
index 000000000000..2d2b07413933
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-server-5.7.27.30
@@ -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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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 ) pam? ( virtual/pam:0= ) rocksdb? ( app-arch/zstd:= dev-libs/protobuf:= ) tokudb? ( app-arch/snappy:= app-arch/xz-utils:= ) tokudb-backup-plugin? ( dev-util/valgrind ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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? ( acct-group/mysql acct-user/mysql dev-perl/JSON || ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysqlclient[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/mysql-python[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
+EAPI=6
+HOMEPAGE=https://www.percona.com/software/mysql-database/percona-server
+IUSE=cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa pam +perl profiling rocksdb selinux +server static static-libs systemtap tcmalloc test tokudb tokudb-backup-plugin yassl kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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 ) pam? ( virtual/pam:0= ) rocksdb? ( app-arch/zstd:= dev-libs/protobuf:= ) tokudb? ( app-arch/snappy:= app-arch/xz-utils:= ) tokudb-backup-plugin? ( dev-util/valgrind ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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/mysql !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? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts ) )
+REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
+RESTRICT=libressl? ( test )
+SLOT=0/18
+SRC_URI=https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-5.7.27-30/source/tarball/percona-server-5.7.27-30.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b0262a30eeeb09a5cbbfd6b78a6f1e65
diff --git a/metadata/md5-cache/dev-db/pgbadger-11.0 b/metadata/md5-cache/dev-db/pgbadger-11.0
index 5a5ab9c60758..90e7892445c4 100644
--- a/metadata/md5-cache/dev-db/pgbadger-11.0
+++ b/metadata/md5-cache/dev-db/pgbadger-11.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/JSON-XS dev-perl/Text-CSV_XS dev-lang/perl
 DESCRIPTION=pgBadger is a PostgreSQL log analyzer.
 EAPI=6
 HOMEPAGE=https://pgbadger.darold.net/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=dev-perl/JSON-XS dev-perl/Text-CSV_XS dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/darold/pgbadger/archive/v11.0.tar.gz -> pgbadger-11.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
-_md5_=0ed728e7ebdf70640d0fb3a915f7ea31
+_md5_=07c0e5ca9a5ef747d8109252d7b5151e
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.10.0 b/metadata/md5-cache/dev-db/pgbouncer-1.10.0
index 192f83989d39..ca56a9267354 100644
--- a/metadata/md5-cache/dev-db/pgbouncer-1.10.0
+++ b/metadata/md5-cache/dev-db/pgbouncer-1.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight connection pooler for PostgreSQL
 EAPI=7
 HOMEPAGE=https://pgbouncer.github.io
 IUSE=+c-ares debug doc pam ssl -udns
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-2.0 >=sys-libs/glibc-2.10 c-ares? ( >=net-dns/c-ares-1.10 ) ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] ) udns? ( >=net-libs/udns-0.1 )
 REQUIRED_USE=?? ( c-ares udns )
 SLOT=0
 SRC_URI=https://pgbouncer.github.io/downloads/files/1.10.0/pgbouncer-1.10.0.tar.gz
 _eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c4a775373308ec000ba76b773165d04b
+_md5_=b00c3089de6d89947e541d500bcf0ccb
diff --git a/metadata/md5-cache/dev-db/spatialite-4.3.0a b/metadata/md5-cache/dev-db/spatialite-4.3.0a
index e86b0ec51938..2f0164f7edf7 100644
--- a/metadata/md5-cache/dev-db/spatialite-4.3.0a
+++ b/metadata/md5-cache/dev-db/spatialite-4.3.0a
@@ -4,10 +4,10 @@ DESCRIPTION=A complete Spatial DBMS in a nutshell built upon sqlite
 EAPI=6
 HOMEPAGE=https://www.gaia-gis.it/gaia-sins/
 IUSE=+geos iconv +proj test +xls +xml
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=MPL-1.1
 RDEPEND=>=dev-db/sqlite-3.7.5:3[extensions(+)] sys-libs/zlib geos? ( >=sci-libs/geos-3.4 ) proj? ( sci-libs/proj ) xls? ( dev-libs/freexl ) xml? ( dev-libs/libxml2 )
 REQUIRED_USE=test? ( iconv )
 SLOT=0
 SRC_URI=https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-4.3.0a.tar.gz
-_md5_=4a4665b32f359f477a8229e09b32117d
+_md5_=220a756a0ba1bb2f9bd5aafce56f7673
diff --git a/metadata/md5-cache/dev-db/sqlcipher-4.0.1 b/metadata/md5-cache/dev-db/sqlcipher-4.0.1
index 4c00603933b3..51de88991578 100644
--- a/metadata/md5-cache/dev-db/sqlcipher-4.0.1
+++ b/metadata/md5-cache/dev-db/sqlcipher-4.0.1
@@ -5,11 +5,12 @@ DESCRIPTION=Full Database Encryption for SQLite
 EAPI=7
 HOMEPAGE=https://www.zetetic.net/sqlcipher/
 IUSE=debug libedit readline libressl static-libs tcl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=libedit? ( dev-libs/libedit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=libedit? ( !readline ) test? ( tcl )
+RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sqlcipher/sqlcipher/archive/v4.0.1.tar.gz -> sqlcipher-4.0.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=aed9483bce7c27bbd84f50236810174d
+_md5_=ba7dc3970e1ae5139d49b7d413b7f6d5
diff --git a/metadata/md5-cache/dev-db/tokumx-2.0.2-r2 b/metadata/md5-cache/dev-db/tokumx-2.0.2-r2
index f34e9634d30a..b4ba75580c6d 100644
--- a/metadata/md5-cache/dev-db/tokumx-2.0.2-r2
+++ b/metadata/md5-cache/dev-db/tokumx-2.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=!app-admin/mongo-tools !dev-db/mongodb !dev-libs/mongo-cxx-driver python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/percona-tokumx/tokumx-enterprise-2.0.2/source/tarball/tokumx-enterprise-2.0.2.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a3cfd6de9bc2f667117fd3c054d61a0
diff --git a/metadata/md5-cache/dev-dotnet/Manifest.gz b/metadata/md5-cache/dev-dotnet/Manifest.gz
index 48b35d78ff9e..45b7844c1c28 100644
--- a/metadata/md5-cache/dev-dotnet/Manifest.gz
+++ b/metadata/md5-cache/dev-dotnet/Manifest.gz
diff --git a/metadata/md5-cache/dev-dotnet/libgdiplus-6.0.2 b/metadata/md5-cache/dev-dotnet/libgdiplus-6.0.2
new file mode 100644
index 000000000000..8352d49cbc39
--- /dev/null
+++ b/metadata/md5-cache/dev-dotnet/libgdiplus-6.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install setup
+DEPEND=dev-libs/glib media-libs/freetype media-libs/fontconfig >=media-libs/giflib-5.1.2 media-libs/libexif media-libs/libpng:0= media-libs/tiff x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXrender x11-libs/libXt virtual/jpeg:0 !cairo? ( x11-libs/pango ) dev-lang/mono
+DESCRIPTION=Library for using System.Drawing with Mono
+EAPI=6
+HOMEPAGE=https://www.mono-project.com
+IUSE=cairo
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=MIT
+RDEPEND=dev-libs/glib media-libs/freetype media-libs/fontconfig >=media-libs/giflib-5.1.2 media-libs/libexif media-libs/libpng:0= media-libs/tiff x11-libs/cairo[X] x11-libs/libX11 x11-libs/libXrender x11-libs/libXt virtual/jpeg:0 !cairo? ( x11-libs/pango )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.mono-project.com/sources/libgdiplus/libgdiplus-6.0.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	dotnet	8450be93278197249eb06f5abffaee0d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=cffa3bc63f299d17b590d18779ffef6a
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 79b7fcfe1b36..2e9fffd1f2bd 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/openocd-0.10.0-r1 b/metadata/md5-cache/dev-embedded/openocd-0.10.0-r1
index 589f4b9d1a3f..d5ca2ae236ac 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.10.0-r1
+++ b/metadata/md5-cache/dev-embedded/openocd-0.10.0-r1
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.10.0/openocd-0.10.0.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7fd14e4ba743814156c985f2e66ee878
+_md5_=c4bd2d93efced62e2950b58c4598743b
diff --git a/metadata/md5-cache/dev-embedded/openocd-9999 b/metadata/md5-cache/dev-embedded/openocd-9999
index 0587a97ab98e..4e2b408fdc1c 100644
--- a/metadata/md5-cache/dev-embedded/openocd-9999
+++ b/metadata/md5-cache/dev-embedded/openocd-9999
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-em
 RESTRICT=strip
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7fd14e4ba743814156c985f2e66ee878
+_md5_=c4bd2d93efced62e2950b58c4598743b
diff --git a/metadata/md5-cache/dev-embedded/platformio-4.0.0 b/metadata/md5-cache/dev-embedded/platformio-4.0.0
deleted file mode 100644
index 3c0b32740cda..000000000000
--- a/metadata/md5-cache/dev-embedded/platformio-4.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DESCRIPTION=An open source ecosystem for IoT development
-EAPI=7
-HOMEPAGE=https://platformio.org/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/bottle-0.13[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/click-5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/click-8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pyserial-3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/pyserial-4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/requests-2.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/requests-3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/semantic_version-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/semantic_version-3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/platformio/platformio-4.0.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7b1978ff1586265514a6024acfcfbf10
diff --git a/metadata/md5-cache/dev-embedded/platformio-4.0.1 b/metadata/md5-cache/dev-embedded/platformio-4.0.1
new file mode 100644
index 000000000000..3a92fc43864c
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/platformio-4.0.1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+DESCRIPTION=An open source ecosystem for IoT development
+EAPI=7
+HOMEPAGE=https://platformio.org/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/bottle-0.13[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/click-5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/click-8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pyserial-3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/pyserial-4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/requests-2.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/requests-3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/semantic_version-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/semantic_version-3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/platformio/platformio-4.0.1.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=2936fd0072c5926c0fbcca8b302ba799
diff --git a/metadata/md5-cache/dev-embedded/sdcc-3.8.0-r1 b/metadata/md5-cache/dev-embedded/sdcc-3.8.0-r1
index 1088e953ed3c..a759ddc67f91 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-3.8.0-r1
+++ b/metadata/md5-cache/dev-embedded/sdcc-3.8.0-r1
@@ -13,4 +13,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/sdcc/sdcc-src-3.8.0.tar.bz2 doc? ( mirror://sourceforge/sdcc/sdcc-doc-3.8.0.tar.bz2 )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=29e2d01ea921071fe748f0ed3cb3e418
+_md5_=9b06de908a22c32d87c5980e5ba08ab1
diff --git a/metadata/md5-cache/dev-embedded/sdcc-9999 b/metadata/md5-cache/dev-embedded/sdcc-9999
index 3a0aec1047b7..f6b776667681 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-9999
+++ b/metadata/md5-cache/dev-embedded/sdcc-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=dev-libs/boost:= sys-libs/ncurses:= sys-libs/readline:0= >=dev-embedded/gputils-0.13.7 boehm-gc? ( dev-libs/boehm-gc:= ) !dev-embedded/sdcc-svn dev-util/gperf >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=dev-libs/boost:= sys-libs/ncurses:= sys-libs/readline:0= >=dev-embedded/gputils-0.13.7 boehm-gc? ( dev-libs/boehm-gc:= ) !dev-embedded/sdcc-svn dev-util/gperf
 DESCRIPTION=Small device C compiler (for various microprocessors)
-EAPI=6
+EAPI=7
 HOMEPAGE=http://sdcc.sourceforge.net/
 IUSE=avr ds390 ds400 gbz80 hc08 mcs51 pic14 pic16 r2k r3ka s08 stm8 tlcs90 z180 z80 +boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
 LICENSE=GPL-2 ZLIB non-free? ( MicroChip-SDCC ) packihx? ( public-domain )
@@ -11,4 +12,4 @@ REQUIRED_USE=avr? ( sdbinutils ) ds390? ( sdbinutils ) ds400? ( sdbinutils ) gbz
 RESTRICT=strip
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	subversion	76e4ab6ae9cda8407c34d0b9a086f81c	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=54d426ab5af5b7dffa62c51b4ea4e48a
+_md5_=fd9dd1dba018caba24de7450476b03ae
diff --git a/metadata/md5-cache/dev-embedded/u-boot-tools-2019.01 b/metadata/md5-cache/dev-embedded/u-boot-tools-2019.01
index acec5fc3c928..564b100148e9 100644
--- a/metadata/md5-cache/dev-embedded/u-boot-tools-2019.01
+++ b/metadata/md5-cache/dev-embedded/u-boot-tools-2019.01
@@ -3,9 +3,9 @@ DEPEND=sys-devel/flex sys-devel/bison
 DESCRIPTION=utilities for working with Das U-Boot
 EAPI=6
 HOMEPAGE=http://www.denx.de/wiki/U-Boot/WebHome
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.denx.de/pub/u-boot/u-boot-2019.01.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=253a17f631d1dcc79f3f5660636aefd4
+_md5_=97aac41f70f12bc9a0dc97546f9b9ae2
diff --git a/metadata/md5-cache/dev-erlang/Manifest.gz b/metadata/md5-cache/dev-erlang/Manifest.gz
index a84344fb3c6b..1321e7d008b8 100644
--- a/metadata/md5-cache/dev-erlang/Manifest.gz
+++ b/metadata/md5-cache/dev-erlang/Manifest.gz
diff --git a/metadata/md5-cache/dev-erlang/base64url-1.0.1 b/metadata/md5-cache/dev-erlang/base64url-1.0.1
new file mode 100644
index 000000000000..d6c9966c2f1e
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/base64url-1.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=URL safe base64-compatible codec
+EAPI=6
+HOMEPAGE=https://github.com/dvv/base64url
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/dvv/base64url/archive/1.0.1.tar.gz -> base64url-1.0.1.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=9f5053460e938df158a51a0569a0ab80
diff --git a/metadata/md5-cache/dev-erlang/cache_tab-1.0.20 b/metadata/md5-cache/dev-erlang/cache_tab-1.0.20
new file mode 100644
index 000000000000..170058f78e92
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/cache_tab-1.0.20
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.16 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=In-memory cache Erlang and Elixir library
+EAPI=6
+HOMEPAGE=https://github.com/processone/cache_tab
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.16 >=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/cache_tab/archive/1.0.20.tar.gz -> cache_tab-1.0.20.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=f6244e6ab239a56eec264f60a745e512
diff --git a/metadata/md5-cache/dev-erlang/epam-1.0.6 b/metadata/md5-cache/dev-erlang/epam-1.0.6
new file mode 100644
index 000000000000..c986199375c7
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/epam-1.0.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test
+DEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=epam for ejabberd to help with PAM authentication support
+EAPI=6
+HOMEPAGE=https://github.com/processone/epam
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/epam/archive/1.0.6.tar.gz -> epam-1.0.6.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=b82aaf8ab376112b3d51a443ce1bd7e4
diff --git a/metadata/md5-cache/dev-erlang/ezlib-1.0.6 b/metadata/md5-cache/dev-erlang/ezlib-1.0.6
new file mode 100644
index 000000000000..4f87ff7a67d4
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/ezlib-1.0.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 sys-libs/zlib dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Native zlib driver for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/ezlib
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.1 sys-libs/zlib dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/ezlib/archive/1.0.6.tar.gz -> ezlib-1.0.6.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=b51fffcf435bf5ac4c2a676b24e559cf
diff --git a/metadata/md5-cache/dev-erlang/fast_tls-1.1.2 b/metadata/md5-cache/dev-erlang/fast_tls-1.1.2
new file mode 100644
index 000000000000..1b59911df9b4
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/fast_tls-1.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.16 >=dev-lang/erlang-17.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=TLS/SSL native driver for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/fast_tls
+IUSE=libressl
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.16 >=dev-lang/erlang-17.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/fast_tls/archive/1.1.2.tar.gz -> fast_tls-1.1.2.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=0cd97174dd9f7dbf0aa6ad28ba9ce9b6
diff --git a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.20 b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.20
new file mode 100644
index 000000000000..a76aa0f7ce62
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.20
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.16 >=dev-lang/erlang-18.0 dev-libs/libyaml dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Fast Yaml native library for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/fast_yaml
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.16 >=dev-lang/erlang-18.0 dev-libs/libyaml dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/fast_yaml/archive/1.0.20.tar.gz -> fast_yaml-1.0.20.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=454526a47496fb165b41d9faba6490b4
diff --git a/metadata/md5-cache/dev-erlang/jose-1.9.0 b/metadata/md5-cache/dev-erlang/jose-1.9.0
new file mode 100644
index 000000000000..9b8d957c43ae
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/jose-1.9.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-19.0 >=dev-erlang/base64url-1.0 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=JSON Object Signing and Encryption (JOSE) for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/potatosalad/erlang-jose
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/erlang-19.0 >=dev-erlang/base64url-1.0 dev-lang/erlang
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/potatosalad/erlang-jose/archive/1.9.0.tar.gz -> erlang-jose-1.9.0.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=02d2d383c4fc22926b470a3900f5f99b
diff --git a/metadata/md5-cache/dev-erlang/lager-3.8.0 b/metadata/md5-cache/dev-erlang/lager-3.8.0
new file mode 100644
index 000000000000..3177800aa81b
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/lager-3.8.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/goldrush-0.1.9 >=dev-lang/erlang-20.0 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Logging framework for Erlang/OTP
+EAPI=6
+HOMEPAGE=https://github.com/erlang-lager/lager
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/goldrush-0.1.9 >=dev-lang/erlang-20.0 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/erlang-lager/lager/archive/3.8.0.tar.gz -> lager-3.8.0.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=33770935b8535d8c401d2ed8d30de5d6
diff --git a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.11 b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.11
new file mode 100644
index 000000000000..7310ebc94996
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.11
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Pure Erlang MySQL driver
+EAPI=6
+HOMEPAGE=https://github.com/processone/p1_mysql
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/p1_mysql/archive/1.0.11.tar.gz -> p1_mysql-1.0.11.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=ba75164c7a488069f100ba36d8cda2ba
diff --git a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.5 b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.5
new file mode 100644
index 000000000000..50acf24e8705
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 test? ( >=dev-erlang/meck-0.8.7 >=dev-erlang/proper-1.3 ) dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Erlang OAuth 2.0 implementation
+EAPI=6
+HOMEPAGE=https://github.com/processone/p1_oauth2
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/p1_oauth2/archive/0.6.5.tar.gz -> p1_oauth2-0.6.5.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=cce3d0976973d605d2cc0e023c1a1ede
diff --git a/metadata/md5-cache/dev-erlang/p1_utils-1.0.16 b/metadata/md5-cache/dev-erlang/p1_utils-1.0.16
new file mode 100644
index 000000000000..b0f46b5dc563
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/p1_utils-1.0.16
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Erlang utility modules from ProcessOne
+EAPI=6
+HOMEPAGE=https://github.com/processone/p1_utils
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/p1_utils/archive/1.0.16.tar.gz -> p1_utils-1.0.16.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=d380e0d889e9676a4fbf8036b7892b71
diff --git a/metadata/md5-cache/dev-erlang/stringprep-1.0.17 b/metadata/md5-cache/dev-erlang/stringprep-1.0.17
new file mode 100644
index 000000000000..2f73e70be0f0
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/stringprep-1.0.17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.16 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Fast Stringprep implementation for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/stringprep
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0 tcltk
+RDEPEND=>=dev-erlang/p1_utils-1.0.16 >=dev-lang/erlang-17.1 dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/stringprep/archive/1.0.17.tar.gz -> stringprep-1.0.17.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=d096a826709d365fe018e665cbed8776
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 3ffcffe88968..d52ff8f916ed 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/openscenegraph-3.5.5 b/metadata/md5-cache/dev-games/openscenegraph-3.5.5
index 1f393c63c852..3c2c568fa747 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.5.5
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.5.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0[opengl,X] ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) app-arch/unzip virtual/pkgconfig x11-base/xorg-proto doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0[opengl,X] ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) app-arch/unzip virtual/pkgconfig x11-base/xorg-proto doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Open source high performance 3D graphics toolkit
 EAPI=6
 HOMEPAGE=http://www.openscenegraph.org/
-IUSE=asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xine xrandr zlib
+IUSE=asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xine xrandr zlib
 KEYWORDS=amd64 ~hppa ~ia64 ppc ppc64 x86
 LICENSE=wxWinLL-3 LGPL-2.1
-RDEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0[opengl,X] ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
+RDEPEND=x11-libs/libSM x11-libs/libXext virtual/glu virtual/opengl asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0[opengl,X] ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xine? ( media-libs/xine-lib ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=sdl2? ( sdl )
 SLOT=0/145
 SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.5.5.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c7f952b6920913aa5a6f2598813664dc
+_md5_=a40d00ff647ac3927153bcd5dec974fb
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.3 b/metadata/md5-cache/dev-games/openscenegraph-3.6.3
index 93d3a19f36d0..8cd4442d1389 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.6.3
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.6.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0[opengl,X] ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) app-arch/unzip virtual/pkgconfig x11-base/xorg-proto doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0[opengl,X] ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) app-arch/unzip virtual/pkgconfig x11-base/xorg-proto doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Open source high performance 3D graphics toolkit
 EAPI=6
 HOMEPAGE=http://www.openscenegraph.org/
-IUSE=asio curl debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr zlib
+IUSE=asio curl debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr zlib
 KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=wxWinLL-3 LGPL-2.1
-RDEPEND=media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0[opengl,X] ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
+RDEPEND=media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtkglext ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0[opengl,X] ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=sdl2? ( sdl )
 SLOT=0/158
 SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.3.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4cc61b98e608106b52c42742792c8655
+_md5_=e4f4b063ad967ec82b37aa846e73bdf9
diff --git a/metadata/md5-cache/dev-games/vamos-0.7.1 b/metadata/md5-cache/dev-games/vamos-0.7.1
deleted file mode 100644
index a99f51903d37..000000000000
--- a/metadata/md5-cache/dev-games/vamos-0.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=virtual/opengl virtual/glu media-libs/freeglut media-libs/libpng:0 media-libs/libsdl[joystick,video] media-libs/openal dev-libs/boost media-libs/freealut virtual/pkgconfig
-DESCRIPTION=an automotive simulation framework
-EAPI=5
-HOMEPAGE=http://vamos.sourceforge.net/
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/glu media-libs/freeglut media-libs/libpng:0 media-libs/libsdl[joystick,video] media-libs/openal dev-libs/boost media-libs/freealut
-SLOT=0
-SRC_URI=mirror://sourceforge/vamos/vamos-0.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d587a1f18bd3b3bce92edaa4e9fa7065
diff --git a/metadata/md5-cache/dev-games/vamos-0.8.2 b/metadata/md5-cache/dev-games/vamos-0.8.2
deleted file mode 100644
index af12e7c2a177..000000000000
--- a/metadata/md5-cache/dev-games/vamos-0.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/boost:=[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] media-libs/freealut media-libs/freeglut media-libs/libpng:0= media-libs/libsdl[joystick,video] media-libs/openal virtual/glu virtual/opengl >=sys-devel/autoconf-archive-2016.09.16 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=An automotive simulation framework
-EAPI=6
-HOMEPAGE=http://vamos.sourceforge.net/
-IUSE=test 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=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/boost:=[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] media-libs/freealut media-libs/freeglut media-libs/libpng:0= media-libs/libsdl[joystick,video] media-libs/openal virtual/glu virtual/opengl
-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://sourceforge/vamos/vamos-0.8.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=ab34a5fac88c037851de246e1c2d8c7a
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index 2c01a5c12814..50c60e0ba5d3 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/go-oauth2-0_pre20160222 b/metadata/md5-cache/dev-go/go-oauth2-0_pre20160222
index eabb111721ab..639c51f40629 100644
--- a/metadata/md5-cache/dev-go/go-oauth2-0_pre20160222
+++ b/metadata/md5-cache/dev-go/go-oauth2-0_pre20160222
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0/0_pre20160222
 SRC_URI=https://github.com/golang/oauth2/archive/2cd4472c321b6cba78e029d99f0e7fe51032fd21.tar.gz -> go-oauth2-0_pre20160222.tar.gz https://github.com/golang/net/archive/b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed.tar.gz -> go-net-0_pre20160216.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz -> gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8d7908b9abbe3c525b5d3893fcfa9161
+_md5_=6d3d88e853ce1a8688871fe75343d626
diff --git a/metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160307 b/metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160307
index cfbc09674e1d..00431f75b3dc 100644
--- a/metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160307
+++ b/metadata/md5-cache/dev-go/go-sqlite3-1.1.0_p20160307
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0/1.1.0_p20160307
 SRC_URI=https://github.com/mattn/go-sqlite3/archive/10876d7dac65f02064c03d7372a2f1dfb90043fe.tar.gz -> go-sqlite3-1.1.0_p20160307.tar.gz
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=098b20af94b2700b54a3ebf4874fd0d0
+_md5_=c9c11eb121fedf74e6bd81f7c281eafc
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 7f979d0dde00..7a0ac6b31d48 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/logict-0.6.0.2 b/metadata/md5-cache/dev-haskell/logict-0.6.0.2
index 0e761603cf9f..29c3629fba74 100644
--- a/metadata/md5-cache/dev-haskell/logict-0.6.0.2
+++ b/metadata/md5-cache/dev-haskell/logict-0.6.0.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.9.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A backtracking logic-programming monad
 EAPI=5
-HOMEPAGE=http://code.haskell.org/~dolio/
+HOMEPAGE=https://github.com/Bodigrim/logict
 IUSE=doc hscolour profile
 KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-l
 SLOT=0/0.6.0.2
 SRC_URI=mirror://hackage/packages/archive/logict/0.6.0.2/logict-0.6.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8ecb31c8f904ca7ca54ed1bb2a5445ec
+_md5_=019294c9cf59af3cc5a8dfee60b2d8af
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 37ed4d1ef300..10ed1bc392ad 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-3.10.0 b/metadata/md5-cache/dev-java/icedtea-3.10.0
deleted file mode 100644
index 13eb683e81e6..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-3.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) sunec? ( >=dev-libs/nss-3.16.1-r1 ) system-lcms? ( >=media-libs/lcms-2.9:2= ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/icedtea-bin:8 dev-java/icedtea-bin:7 dev-java/icedtea:8 dev-java/icedtea:7 dev-java/openjdk:8 dev-java/openjdk-bin:8 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax_kernel? ( sys-apps/elfix ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
-EAPI=6
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch pulseaudio sctp selinux shenandoah smartcard +source +sunec +system-lcms test +webstart zero elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
-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=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) sunec? ( >=dev-libs/nss-3.16.1-r1 ) system-lcms? ( >=media-libs/lcms-2.9:2= ) !dev-java/icedtea:0 !dev-java/icedtea-web:7 >=gnome-base/gsettings-desktop-schemas-3.12.2 virtual/ttf-fonts alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) !headless-awt? ( >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=gtk? ( !headless-awt )
-SLOT=8
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea-3.10.0.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.10.0/openjdk.tar.xz -> icedtea-3.10-openjdk-90de74e82bfb.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.10.0/corba.tar.xz -> icedtea-3.10-corba-8249f00d6619.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.10.0/jaxp.tar.xz -> icedtea-3.10-jaxp-a1b060ef4f06.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.10.0/jaxws.tar.xz -> icedtea-3.10-jaxws-c0f01861a7fd.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.10.0/jdk.tar.xz -> icedtea-3.10-jdk-6e67500d0ed8.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.10.0/hotspot.tar.xz -> icedtea-3.10-hotspot-4e4ead43a282.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.10.0/nashorn.tar.xz -> icedtea-3.10-nashorn-6cf21321f367.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.10.0/langtools.tar.xz -> icedtea-3.10-langtools-7036a6fa432e.tar.xz shenandoah? ( http://icedtea.classpath.org/download/drops/icedtea8/3.10.0/shenandoah.tar.xz -> icedtea-3.10-shenandoah-bc4deb768b1d.tar.xz ) arm? ( http://icedtea.classpath.org/download/drops/icedtea8/3.10.0/aarch32.tar.xz -> icedtea-3.10-aarch32-f38b47a322eb.tar.xz ) http://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=66ca4c5d9ba6f9c119fef541cf783dcc
diff --git a/metadata/md5-cache/dev-java/icedtea-3.11.0 b/metadata/md5-cache/dev-java/icedtea-3.11.0
deleted file mode 100644
index 8c1c35a432f5..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-3.11.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) system-lcms? ( >=media-libs/lcms-2.9:2= ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/icedtea-bin:8 dev-java/icedtea-bin:7 dev-java/icedtea:8 dev-java/icedtea:7 dev-java/openjdk:8 dev-java/openjdk-bin:8 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax_kernel? ( sys-apps/elfix ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
-EAPI=6
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test +webstart zero elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
-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=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) system-lcms? ( >=media-libs/lcms-2.9:2= ) !dev-java/icedtea:0 !dev-java/icedtea-web:7 >=gnome-base/gsettings-desktop-schemas-3.12.2 virtual/ttf-fonts alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) !headless-awt? ( >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=gtk? ( !headless-awt )
-SLOT=8
-SRC_URI=http://icedtea.classpath.org/download/source/icedtea-3.11.0.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.11.0/openjdk.tar.xz -> icedtea-3.11-openjdk-9edccdd36f81.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.11.0/corba.tar.xz -> icedtea-3.11-corba-cfc35c4598d9.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.11.0/jaxp.tar.xz -> icedtea-3.11-jaxp-1c01fbb460ba.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.11.0/jaxws.tar.xz -> icedtea-3.11-jaxws-cf4d2b27895c.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.11.0/jdk.tar.xz -> icedtea-3.11-jdk-34ade0cd2dd5.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.11.0/hotspot.tar.xz -> icedtea-3.11-hotspot-a24b4e46303e.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.11.0/nashorn.tar.xz -> icedtea-3.11-nashorn-3cb2fe2b1b7d.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.11.0/langtools.tar.xz -> icedtea-3.11-langtools-78414f4f0172.tar.xz shenandoah? ( http://icedtea.classpath.org/download/drops/icedtea8/3.11.0/shenandoah.tar.xz -> icedtea-3.11-shenandoah-1e8639cc8075.tar.xz ) arm? ( http://icedtea.classpath.org/download/drops/icedtea8/3.11.0/aarch32.tar.xz -> icedtea-3.11-aarch32-5caf41da4f93.tar.xz ) http://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c25ca5d9f7ca036ccb2c5471717ed83f
diff --git a/metadata/md5-cache/dev-java/icedtea-3.12.0 b/metadata/md5-cache/dev-java/icedtea-3.12.0
deleted file mode 100644
index 1a698d16a7bd..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-3.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) system-lcms? ( >=media-libs/lcms-2.9:2= ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/icedtea-bin:8 dev-java/icedtea-bin:7 dev-java/icedtea:8 dev-java/icedtea:7 dev-java/openjdk:8 dev-java/openjdk-bin:8 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax_kernel? ( sys-apps/elfix ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
-EAPI=6
-HOMEPAGE=https://icedtea.classpath.org
-IUSE=+alsa cacao +cups doc examples +gtk headless-awt jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test +webstart zero elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C
-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=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) system-lcms? ( >=media-libs/lcms-2.9:2= ) !dev-java/icedtea:0 !dev-java/icedtea-web:7 >=gnome-base/gsettings-desktop-schemas-3.12.2 virtual/ttf-fonts alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) gtk? ( >=dev-libs/atk-1.30.0 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/pango-1.24.5 ) !headless-awt? ( >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=gtk? ( !headless-awt )
-SLOT=8
-SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.12.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.12.0/openjdk.tar.xz -> icedtea-3.12-openjdk-f0482b9b7f7b.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.12.0/corba.tar.xz -> icedtea-3.12-corba-fa1553d2f23e.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.12.0/jaxp.tar.xz -> icedtea-3.12-jaxp-7a977b82f34c.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.12.0/jaxws.tar.xz -> icedtea-3.12-jaxws-752d9e54c69a.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.12.0/jdk.tar.xz -> icedtea-3.12-jdk-bfaa5c6df4a8.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.12.0/hotspot.tar.xz -> icedtea-3.12-hotspot-3f9a60eb8ef0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.12.0/nashorn.tar.xz -> icedtea-3.12-nashorn-93462e8b4f4f.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.12.0/langtools.tar.xz -> icedtea-3.12-langtools-fb494039358f.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.12.0/shenandoah.tar.xz -> icedtea-3.12-shenandoah-adb62c0031b8.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.12.0/aarch32.tar.xz -> icedtea-3.12-aarch32-57f4048a925b.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f2895e110575933364641016410598d
diff --git a/metadata/md5-cache/dev-java/icedtea-3.13.0 b/metadata/md5-cache/dev-java/icedtea-3.13.0
index 8e9c850b1f58..aeba3233b3d1 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.13.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.13.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0
 REQUIRED_USE=gtk? ( !headless-awt )
 SLOT=8
 SRC_URI=https://icedtea.classpath.org/download/source/icedtea-3.13.0.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/openjdk.tar.xz -> icedtea-3.13-openjdk-c8f86954855a.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/corba.tar.xz -> icedtea-3.13-corba-24a4cc7d7de6.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/jaxp.tar.xz -> icedtea-3.13-jaxp-7f4569c121d6.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/jaxws.tar.xz -> icedtea-3.13-jaxws-1c6f4ebde697.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/jdk.tar.xz -> icedtea-3.13-jdk-51afcf17e031.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/hotspot.tar.xz -> icedtea-3.13-hotspot-ab8fadcbbde6.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/nashorn.tar.xz -> icedtea-3.13-nashorn-69b1da223d93.tar.xz https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/langtools.tar.xz -> icedtea-3.13-langtools-2008b12a91d1.tar.xz shenandoah? ( https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/shenandoah.tar.xz -> icedtea-3.13-shenandoah-ff69edbcd7ae.tar.xz ) arm? ( https://icedtea.classpath.org/download/drops/icedtea8/3.13.0/aarch32.tar.xz -> icedtea-3.13-aarch32-26d64a5c4b9a.tar.xz ) https://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz https://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=04c70ea37970d3cfd1bcfd87fbdd880b
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.10.0-r2 b/metadata/md5-cache/dev-java/icedtea-bin-3.10.0-r2
deleted file mode 100644
index 1d7bd0e20e88..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.10.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
-EAPI=6
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64 ~arm arm64 ppc64 x86
-LICENSE=GPL-2-with-classpath-exception
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
-RDEPEND=>=sys-devel/gcc-6.4.0[multilib?] >=sys-libs/glibc-2.26[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.42:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.11:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg-compat:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=dev-libs/atk-2.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !headless-awt? ( media-libs/giflib:0/7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =media-libs/libpng-1.6*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXtst-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !multilib? ( >=dev-libs/glib-2.42:2 >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.9:2 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg-compat:62 alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.16.0 >=x11-libs/cairo-1.14.2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.36 ) !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
-RESTRICT=preserve-libs strip
-SLOT=8
-SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.10.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.10.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-r1-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.10.0-r1-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.10.0-r1-x86.tar.xz ) )
-_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6727ea8ae1d0cd7a44dd35f689841e5f
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.12.0-r1 b/metadata/md5-cache/dev-java/icedtea-bin-3.12.0-r1
deleted file mode 100644
index fe046dd173c5..000000000000
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.12.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
-EAPI=6
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64 ~arm arm64 ppc64 x86
-LICENSE=GPL-2-with-classpath-exception
-PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
-RDEPEND=>=sys-devel/gcc-8.2.0[multilib?] >=sys-libs/glibc-2.28[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.58:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.13:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg-compat:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=dev-libs/atk-2.28.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.42[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !headless-awt? ( media-libs/giflib:0/7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =media-libs/libpng-1.6*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXtst-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !multilib? ( >=dev-libs/glib-2.58:2 >=media-libs/fontconfig-2.13:1.0 >=media-libs/freetype-2.9.1:2 >=media-libs/lcms-2.9:2 >=sys-libs/zlib-1.2.11-r1 virtual/jpeg-compat:62 alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.28.1 >=x11-libs/cairo-1.16.0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.42 ) !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
-RESTRICT=preserve-libs strip
-SLOT=8
-SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.12.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.12.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.12.0-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.12.0-x86.tar.xz ) )
-_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=854df1d4bfaf489d717bd5f9863443c7
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.13.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.13.0
index 92b4d10538d0..240289249d68 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.13.0
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.13.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_riscv_lp64d abi_riscv_lp64 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-8.3.0[multilib?] >=sys-libs/glibc-2.29[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.58:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.13:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lcms-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg-compat:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( >=dev-libs/atk-2.28.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.42[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !headless-awt? ( media-libs/giflib:0/7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =media-libs/libpng-1.6*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXtst-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !multilib? ( >=dev-libs/glib-2.58:2 >=media-libs/fontconfig-2.13:1.0 >=media-libs/freetype-2.9.1:2 >=media-libs/lcms-2.9:2 >=sys-libs/zlib-1.2.11-r1 virtual/jpeg-compat:62 alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.28.1 >=x11-libs/cairo-1.16.0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.42 ) !headless-awt? ( media-libs/giflib:0/7 =media-libs/libpng-1.6* >=x11-libs/libX11-1.6 >=x11-libs/libXcomposite-0.4 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.10 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
@@ -13,4 +13,4 @@ RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.13.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.13.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.13.0-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.13.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.13.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.13.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.13.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.13.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.13.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.13.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.13.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.13.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.13.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.13.0-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.13.0-x86.tar.xz ) )
 _eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0a7551f5b96afd1fe32dcf4292810ba
+_md5_=4ae5d9697806e25d9d312805c88c2b07
diff --git a/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2 b/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
index 980b34f92ef6..86d3ca36fa7f 100644
--- a/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
+++ b/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jdk-1.4 >=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=Jar Bundler Ant Task
 EAPI=5
-HOMEPAGE=http://www.loomcom.com/jarbundler/
+HOMEPAGE=https://github.com/UltraMixer/JarBundler
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
-SRC_URI=mirror://sourceforge/jarbundler/jarbundler-1.8.1.tar.gz
+SRC_URI=mirror://gentoo/jarbundler-1.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=604efa718fb813941e554cc7f432d387
+_md5_=c84f6e95c222e45c1145ee42b835c240
diff --git a/metadata/md5-cache/dev-java/jarbundler-2.3.1 b/metadata/md5-cache/dev-java/jarbundler-2.3.1
index 24771004ea25..20cccaf70e7f 100644
--- a/metadata/md5-cache/dev-java/jarbundler-2.3.1
+++ b/metadata/md5-cache/dev-java/jarbundler-2.3.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=dev-java/xerces-2.8.1:2 >=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=Jar Bundler Ant Task
 EAPI=5
-HOMEPAGE=http://www.loomcom.com/jarbundler/
+HOMEPAGE=https://github.com/UltraMixer/JarBundler
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jre-1.6 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/jarbundler/JarBundler/v2.3.1/jarbundler.zip
+SRC_URI=mirror://gentoo/jarbundler.zip -> jarbundler-2.3.1.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9e5f0098d42f148a36869dfc16bcbe73
+_md5_=9a85f6141dc9b9fc6c6badb5a45bdb72
diff --git a/metadata/md5-cache/dev-java/jsr173-1.0-r4 b/metadata/md5-cache/dev-java/jsr173-1.0-r4
index bc1a40c25a5b..23dd045c0d5b 100644
--- a/metadata/md5-cache/dev-java/jsr173-1.0-r4
+++ b/metadata/md5-cache/dev-java/jsr173-1.0-r4
@@ -8,6 +8,6 @@ KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-so
 LICENSE=bea.ri.jsr173
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
-SRC_URI=http://ftpna2.bea.com/pub/downloads/jsr173.jar
+SRC_URI=mirror://gentoo/jsr173.jar -> jsr173-1.0.jar
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3b43cff1a53b2529a78e908828e8996f
+_md5_=fb9b81fc922170c42b7e4452b3f6b20c
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4 b/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4
index 863def795235..8d16aade21e0 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4
@@ -11,5 +11,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-
 REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.3+7.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b98401d405619a0001e7ab87532e357a
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.4_p11 b/metadata/md5-cache/dev-java/openjdk-11.0.4_p11
index a986965f8fbb..6fd4abb05e38 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.4_p11
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.4_p11
@@ -11,5 +11,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-
 REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.4+11.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5d16edf24330bc638ee2488d27bf895
diff --git a/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3 b/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3
index 29edc21ff428..db701d8f1855 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3
+++ b/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3
@@ -10,5 +10,5 @@ PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/iced
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=8
 SRC_URI=https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u212-b03.tar.bz2 -> openjdk-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u212-b03.tar.bz2 -> openjdk-corba-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u212-b03.tar.bz2 -> openjdk-hotspot-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u212-b03.tar.bz2 -> openjdk-jaxp-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u212-b03.tar.bz2 -> openjdk-jaxws-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u212-b03.tar.bz2 -> openjdk-jdk-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u212-b03.tar.bz2 -> openjdk-langtools-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u212-b03.tar.bz2 -> openjdk-nashorn-8.212_p03.tar.bz2
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80bad89b35f460248e65b95562f69aed
diff --git a/metadata/md5-cache/dev-java/openjdk-8.222_p10 b/metadata/md5-cache/dev-java/openjdk-8.222_p10
index a22e607b5a45..5825d74f75fb 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.222_p10
+++ b/metadata/md5-cache/dev-java/openjdk-8.222_p10
@@ -10,5 +10,5 @@ PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/iced
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=8
 SRC_URI=https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u222-b10.tar.bz2 -> openjdk-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u222-b10.tar.bz2 -> openjdk-corba-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u222-b10.tar.bz2 -> openjdk-hotspot-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u222-b10.tar.bz2 -> openjdk-jaxp-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u222-b10.tar.bz2 -> openjdk-jaxws-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u222-b10.tar.bz2 -> openjdk-jdk-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u222-b10.tar.bz2 -> openjdk-langtools-8.222_p10.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u222-b10.tar.bz2 -> openjdk-nashorn-8.222_p10.tar.bz2
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66de0df8a6b61392094e56d30f1a4237
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.8.0 b/metadata/md5-cache/dev-java/protobuf-java-3.8.0
index 3863cd12b4a7..0e3c37d78288 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.8.0
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers - Java bindings
 EAPI=6
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/19
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz -> protobuf-3.8.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3104a50ed1ac6496ab49086bcb6e0519
+_md5_=e6a32da7a79db52bed777039c1aa325e
diff --git a/metadata/md5-cache/dev-java/tablelayout-1.0 b/metadata/md5-cache/dev-java/tablelayout-1.0
index 809bcc7a1a78..3e6cc11c97ff 100644
--- a/metadata/md5-cache/dev-java/tablelayout-1.0
+++ b/metadata/md5-cache/dev-java/tablelayout-1.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install preinst prepare setup
 DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Layout manager that makes creating user interfaces fast and easy
 EAPI=5
-HOMEPAGE=https://tablelayout.dev.java.net/
+HOMEPAGE=https://www.oracle.com/technetwork/java/tablelayout-141489.html
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
-SRC_URI=http://www.oracle.com/technetwork/java/tablelayout.jar
+SRC_URI=https://www.oracle.com/technetwork/java/tablelayout.jar -> tablelayout-1.0.jar
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=84d2c101a460d304e77098775687b994
+_md5_=2ca45e2ca838e0da0c6be0c9235fd044
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.45 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.45
new file mode 100644
index 000000000000..3cffc23d30a1
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.45
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.45/src/apache-tomcat-8.5.45-src.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=5b88961dd8b21b2a816c9c773bfb68be
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.24 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.24
new file mode 100644
index 000000000000..bc75a3ca2a86
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.24/src/apache-tomcat-9.0.24-src.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=7f25840b5524705229b9a7688e1c190e
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 72f27196f02f..7976d57a0319 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/ghc-8.0.2 b/metadata/md5-cache/dev-lang/ghc-8.0.2
index fb0b1ad04062..0fe277b98318 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.0.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.0.2
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-src.tar.xz ) !ghcbootstrap? ( alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-alpha.tbz2 ) arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-arm64.tbz2 ) amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-x86_64-pc-linux-gnu.tbz2 ) ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ia64-unknown-linux-gnu.tbz2 ) ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ppc.tbz2 ) ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ppc64.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6cbe1e9c9dbe7ad4d422ff52f8913f3f
diff --git a/metadata/md5-cache/dev-lang/ghc-8.2.1 b/metadata/md5-cache/dev-lang/ghc-8.2.1
index 206d6b207f78..25acce30b9f3 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.2.1
+++ b/metadata/md5-cache/dev-lang/ghc-8.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.2.1
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.2.1/ghc-8.2.1-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e70e31eb35104195802dfb783b8457f9
diff --git a/metadata/md5-cache/dev-lang/ghc-8.2.2 b/metadata/md5-cache/dev-lang/ghc-8.2.2
index cfa236a7ae1d..76943b2a3764 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.2.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.2.2
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.2-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=af30fc285821b5160788e8be56ad6829
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.1 b/metadata/md5-cache/dev-lang/ghc-8.4.1
index 5b0cf74da662..a44b0ca3aff8 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.4.1
+++ b/metadata/md5-cache/dev-lang/ghc-8.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.4.1
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.4.1/ghc-8.4.1-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6a73b2c94375d9bb29aad201c59a213a
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.2 b/metadata/md5-cache/dev-lang/ghc-8.4.2
index ce994472157d..7d1eaa70dcf0 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.4.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.4.2
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.4.2/ghc-8.4.2-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.2-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d01224da03d360b81dccfa6a8eb74148
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.3 b/metadata/md5-cache/dev-lang/ghc-8.4.3
index 6bed021fb11f..074be764932c 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.4.3
+++ b/metadata/md5-cache/dev-lang/ghc-8.4.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.4.3
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.3-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.3-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b29c3d5fce15a1cdccbe23dfad78ecaf
diff --git a/metadata/md5-cache/dev-lang/ghc-8.6.4 b/metadata/md5-cache/dev-lang/ghc-8.6.4
index e703e5036561..a8391b95a69a 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.6.4
+++ b/metadata/md5-cache/dev-lang/ghc-8.6.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.6.4
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-src.tar.xz test? ( http://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.4-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=dce05597ad2ace227bf5f0bec0a00ab1
diff --git a/metadata/md5-cache/dev-lang/ghc-8.6.5 b/metadata/md5-cache/dev-lang/ghc-8.6.5
index ab3382d7048f..aab54e01ffc5 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.6.5
+++ b/metadata/md5-cache/dev-lang/ghc-8.6.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.6.5
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-src.tar.xz test? ( http://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.5-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.5-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=1cd6dc5d22ab46dded7a4bf4dab13bd3
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3 b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3
index 880a466d0c0b..7bc4fc3bdc02 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3
@@ -3,7 +3,7 @@ DEPEND=!sys-devel/gcc:4.9.4 elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/bi
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=5
 HOMEPAGE=http://libre.adacore.com/
-IUSE=bootstrap regression-test vanilla +nls +nptl altivec debug +cxx +fortran nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv
+IUSE=bootstrap regression-test vanilla +nls altivec debug +cxx +fortran +nptl nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:4.9.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f -> gnat-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db -> gcc-4.9-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d -> gcc-interface-4.9-gpl-2016-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=45183572c51e158467a6161304134d93
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017 b/metadata/md5-cache/dev-lang/gnat-gpl-2017
index db710fd8136b..6b9d773509c5 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017
@@ -3,7 +3,7 @@ DEPEND=!sys-devel/gcc:6.3.0 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/b
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=5
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+bootstrap regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
+IUSE=+bootstrap regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=6.3.0
 SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac -> gcc-6-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae -> gcc-interface-6-gpl-2017-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=46eb2db9f037d2010b3b227fef795fdd
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2 b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2
index 8bfc448895b1..88b53b3365dc 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2
@@ -3,7 +3,7 @@ DEPEND=!sys-devel/gcc:7.3.1 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/b
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=5
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+bootstrap regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
+IUSE=+bootstrap regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:7.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=7.3.1
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7 -> gcc-7-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6 -> gcc-interface-7-gpl-2018-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=58f1045786d345e6bba40cebaff1afb3
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2019 b/metadata/md5-cache/dev-lang/gnat-gpl-2019
index dbbe8f3bf9f4..9c504de9f1ba 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2019
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2019
@@ -3,7 +3,7 @@ DEPEND=!sys-devel/gcc:8.3.1 elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/b
 DESCRIPTION=GNAT Ada Compiler - GPL version
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/
-IUSE=+bootstrap test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit mpx +pie +ssp +pch systemtap
+IUSE=+bootstrap test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit mpx +pie +ssp +pch systemtap
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+ GPL-2 GPL-3
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:8.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=8.3.1
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.1.tar.bz2 http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49 -> gnat-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf8a0731e87a8f1d425049 -> gcc-8-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50 -> gcc-interface-8-2019-20190510-18F59-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0df7746e240f3f517173fff5dc9a631f
diff --git a/metadata/md5-cache/dev-lang/go-1.11.13 b/metadata/md5-cache/dev-lang/go-1.11.13
index 73cfb53151d5..b62bf9edf081 100644
--- a/metadata/md5-cache/dev-lang/go-1.11.13
+++ b/metadata/md5-cache/dev-lang/go-1.11.13
@@ -4,11 +4,11 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=7
 HOMEPAGE=https://golang.org
 IUSE=gccgo system-bootstrap
-KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.11.13
 SRC_URI=https://storage.googleapis.com/golang/go1.11.13.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=12deb001e55ae6b1887b5e07d313b019
+_md5_=251147e45e958a498862292290d5455e
diff --git a/metadata/md5-cache/dev-lang/go-1.12.8 b/metadata/md5-cache/dev-lang/go-1.12.8
index 573d602b8c90..eeff8b6f1be7 100644
--- a/metadata/md5-cache/dev-lang/go-1.12.8
+++ b/metadata/md5-cache/dev-lang/go-1.12.8
@@ -4,11 +4,11 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=7
 HOMEPAGE=https://golang.org
 IUSE=gccgo system-bootstrap
-KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.12.8
 SRC_URI=https://storage.googleapis.com/golang/go1.12.8.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f7b512d961655f72b7181782491b490f
+_md5_=4961a1602f174df046180a6be9b3e2bb
diff --git a/metadata/md5-cache/dev-lang/go-1.12.9 b/metadata/md5-cache/dev-lang/go-1.12.9
new file mode 100644
index 000000000000..8ae00cdd5465
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.12.9
@@ -0,0 +1,14 @@
+BDEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
+DEFINED_PHASES=compile install pretend test unpack
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+IUSE=gccgo system-bootstrap
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=test strip
+SLOT=0/1.12.9
+SRC_URI=https://storage.googleapis.com/golang/go1.12.9.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b8e527abfa6a79987ca58ac1e0dcf7a3
diff --git a/metadata/md5-cache/dev-lang/go-1.13 b/metadata/md5-cache/dev-lang/go-1.13
new file mode 100644
index 000000000000..6d06d4c83675
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.13
@@ -0,0 +1,14 @@
+BDEPEND=gccgo? ( >=sys-devel/gcc-5[go] )
+DEFINED_PHASES=compile install pretend test unpack
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+IUSE=gccgo system-bootstrap
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=test strip
+SLOT=0/1.13
+SRC_URI=https://storage.googleapis.com/golang/go1.13.src.tar.gz !gccgo? ( !system-bootstrap? ( https://dev.gentoo.org/~williamh/dist/go-linux-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-arm64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-ppc64le-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-s390x-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-linux-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-freebsd-386-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-darwin-amd64-bootstrap-1.8.tbz https://dev.gentoo.org/~williamh/dist/go-solaris-amd64-bootstrap-1.8.tbz ) )
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b8e527abfa6a79987ca58ac1e0dcf7a3
diff --git a/metadata/md5-cache/dev-lang/mlton-20130715 b/metadata/md5-cache/dev-lang/mlton-20130715
index 7c86a6106889..5a79c817b7d4 100644
--- a/metadata/md5-cache/dev-lang/mlton-20130715
+++ b/metadata/md5-cache/dev-lang/mlton-20130715
@@ -9,5 +9,5 @@ LICENSE=HPND MIT
 RDEPEND=dev-libs/gmp:*
 SLOT=0/20130715
 SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20130715.src.tgz ) binary? ( amd64? ( mirror://sourceforge/mlton/mlton-20130715-1.amd64-linux.tgz ) x86? ( mirror://sourceforge/mlton/mlton-20130715-1.x86-linux.tgz ) )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a976f4b6d4499101a152057b106cb9fd
diff --git a/metadata/md5-cache/dev-lang/mlton-20180207 b/metadata/md5-cache/dev-lang/mlton-20180207
index 5d6d702aa062..c4d7efce5c0d 100644
--- a/metadata/md5-cache/dev-lang/mlton-20180207
+++ b/metadata/md5-cache/dev-lang/mlton-20180207
@@ -9,5 +9,5 @@ LICENSE=HPND MIT
 RDEPEND=dev-libs/gmp:*
 SLOT=0/20180207
 SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20180207.src.tgz ) !bootstrap-smlnj? ( amd64? ( mirror://sourceforge/mlton/mlton-20180207-1.amd64-linux.tgz ) )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=730f246811de2c2f669af658cffd0fcc
diff --git a/metadata/md5-cache/dev-lang/pasm-1.7 b/metadata/md5-cache/dev-lang/pasm-1.7
index 3fd453fe3578..50301e8d14de 100644
--- a/metadata/md5-cache/dev-lang/pasm-1.7
+++ b/metadata/md5-cache/dev-lang/pasm-1.7
@@ -5,6 +5,6 @@ HOMEPAGE=http://sun.hasenbraten.de/~frank/projects/
 KEYWORDS=~ppc ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://devnull.owl.de/~frank/pasm.tar.gz
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/pasm-1.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=27e80e9fd6ed29348d2b1635d2c34e75
+_md5_=d63158136600c8c163fabf45b7d1539c
diff --git a/metadata/md5-cache/dev-lang/php-5.6.40-r5 b/metadata/md5-cache/dev-lang/php-5.6.40-r5
deleted file mode 100644
index 22fceecf878d..000000000000
--- a/metadata/md5-cache/dev-lang/php-5.6.40-r5
+++ /dev/null
@@ -1,15 +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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
-DESCRIPTION=The PHP language runtime engine
-EAPI=7
-HOMEPAGE=https://secure.php.net/
-IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) vpx? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
-SLOT=5.6
-SRC_URI=https://php.net/distributions/php-5.6.40.tar.xz https://gitweb.gentoo.org/proj/php-patches.git/snapshot/php-patches-7.1.31bp.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0f07946d2c62a481206244acb194153b
diff --git a/metadata/md5-cache/dev-lang/php-5.6.40-r6 b/metadata/md5-cache/dev-lang/php-5.6.40-r6
new file mode 100644
index 000000000000..68198fc2ba0f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.6.40-r6
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( <dev-db/mysql-connector-c-8.0:0= ) mysqli? ( <dev-db/mysql-connector-c-8.0:0= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( <dev-db/mysql-connector-c-8.0:0= ) mysqli? ( <dev-db/mysql-connector-c-8.0:0= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) vpx? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
+SLOT=5.6
+SRC_URI=https://php.net/distributions/php-5.6.40.tar.xz https://gitweb.gentoo.org/proj/php-patches.git/snapshot/php-patches-7.1.31bp.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=12e659ffcad9b2b835416c57e94aefb6
diff --git a/metadata/md5-cache/dev-lang/php-7.2.22 b/metadata/md5-cache/dev-lang/php-7.2.22
new file mode 100644
index 000000000000..2707bfb0f4b8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.2.22
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
+RESTRICT=!test? ( test )
+SLOT=7.2
+SRC_URI=https://php.net/distributions/php-7.2.22.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=d189ff0a82f3d6e4cf2d6af112860cc4
diff --git a/metadata/md5-cache/dev-lang/php-7.3.9 b/metadata/md5-cache/dev-lang/php-7.3.9
new file mode 100644
index 000000000000..fe1966d59b9f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.3.9
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
+SLOT=7.3
+SRC_URI=https://php.net/distributions/php-7.3.9.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=54513d62aa5957eed7dbfb44f1416950
diff --git a/metadata/md5-cache/dev-lang/php-7.4.0_beta4 b/metadata/md5-cache/dev-lang/php-7.4.0_beta4
new file mode 100644
index 000000000000..f0982f7d5062
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.4.0_beta4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=virtual/libffi-3.0.11 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng: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:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) 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? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +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 selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=virtual/libffi-3.0.11 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng: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:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) 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? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+SLOT=7.4
+SRC_URI=https://downloads.php.net/~derick/php-7.4.0beta4.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=28ea30e91800946ddd1b81103faebe83
diff --git a/metadata/md5-cache/dev-lang/python-exec-2.4.6 b/metadata/md5-cache/dev-lang/python-exec-2.4.6
deleted file mode 100644
index 1a4c3f4c931c..000000000000
--- a/metadata/md5-cache/dev-lang/python-exec-2.4.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install preinst
-DESCRIPTION=Python script wrapper
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/python-exec/
-IUSE=python_targets_jython2_7 python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2
-RDEPEND=!<app-eselect/eselect-python-20160206 !<dev-lang/python-2.7.10-r4:2.7 !<dev-lang/python-3.3.5-r4:3.3 !<dev-lang/python-3.4.3-r4:3.4 !<dev-lang/python-3.5.0-r3:3.5
-SLOT=2
-SRC_URI=https://github.com/mgorny/python-exec/releases/download/v2.4.6/python-exec-2.4.6.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d8dbe22c4b55c1332891ae94f7d86af6
diff --git a/metadata/md5-cache/dev-lang/python-exec-2.4.6-r1 b/metadata/md5-cache/dev-lang/python-exec-2.4.6-r1
index 287c381d178c..1d3be6eda871 100644
--- a/metadata/md5-cache/dev-lang/python-exec-2.4.6-r1
+++ b/metadata/md5-cache/dev-lang/python-exec-2.4.6-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Python script wrapper
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/python-exec/
 IUSE=python_targets_jython2_7 python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=!<app-eselect/eselect-python-20160206 !<dev-lang/python-2.7.10-r4:2.7 !<dev-lang/python-3.3.5-r4:3.3 !<dev-lang/python-3.4.3-r4:3.4 !<dev-lang/python-3.5.0-r3:3.5
 SLOT=2
 SRC_URI=https://github.com/mgorny/python-exec/releases/download/v2.4.6/python-exec-2.4.6.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=dfed6e9a9fe90624f2b583e932cc679d
+_md5_=cd96b3ab3104a4dd65c46ae972665f7b
diff --git a/metadata/md5-cache/dev-lang/ruby-2.4.7 b/metadata/md5-cache/dev-lang/ruby-2.4.7
new file mode 100644
index 000000000000..6341d61f20bd
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-2.4.7
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
+DESCRIPTION=An object-oriented scripting language
+EAPI=7
+HOMEPAGE=https://www.ruby-lang.org/
+IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=|| ( Ruby-BSD BSD-2 )
+PDEPEND=>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24] >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24] >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24] >=dev-ruby/rake-12.0.0[ruby_targets_ruby24] >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24] >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24] virtual/rubygems[ruby_targets_ruby24] >=dev-ruby/json-2.0.2[ruby_targets_ruby24] rdoc? ( >=dev-ruby/rdoc-5.1.0-r1[ruby_targets_ruby24] ) xemacs? ( app-xemacs/ruby-modes )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
+SLOT=2.4
+SRC_URI=mirror://ruby/2.4/ruby-2.4.7.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=af38e0b530263abedc0f7a778768505d
diff --git a/metadata/md5-cache/dev-lang/ruby-2.5.5 b/metadata/md5-cache/dev-lang/ruby-2.5.5
index 2d934864d450..4979d5fd1c74 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.5.5
+++ b/metadata/md5-cache/dev-lang/ruby-2.5.5
@@ -5,11 +5,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25] >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25] >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25] >=dev-ruby/rake-12.3.0[ruby_targets_ruby25] >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25] virtual/rubygems[ruby_targets_ruby25] >=dev-ruby/json-2.0.2[ruby_targets_ruby25] rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby25] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
 SLOT=2.5
 SRC_URI=mirror://ruby/2.5/ruby-2.5.5.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c65e4ec7c21359167bdabca686e68665
+_md5_=93a1501de1219d34caa01207f1bddb5a
diff --git a/metadata/md5-cache/dev-lang/ruby-2.5.6 b/metadata/md5-cache/dev-lang/ruby-2.5.6
new file mode 100644
index 000000000000..db1335c7aa7a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-2.5.6
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
+DESCRIPTION=An object-oriented scripting language
+EAPI=7
+HOMEPAGE=https://www.ruby-lang.org/
+IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=|| ( Ruby-BSD BSD-2 )
+PDEPEND=>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25] >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25] >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25] >=dev-ruby/rake-12.3.0[ruby_targets_ruby25] >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25] virtual/rubygems[ruby_targets_ruby25] >=dev-ruby/json-2.0.2[ruby_targets_ruby25] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby25] ) xemacs? ( app-xemacs/ruby-modes )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
+SLOT=2.5
+SRC_URI=mirror://ruby/2.5/ruby-2.5.6.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=933e34d1b5eb73670424a4bb1bee200c
diff --git a/metadata/md5-cache/dev-lang/ruby-2.6.4 b/metadata/md5-cache/dev-lang/ruby-2.6.4
new file mode 100644
index 000000000000..68d12a6d615a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-2.6.4
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
+DESCRIPTION=An object-oriented scripting language
+EAPI=7
+HOMEPAGE=https://www.ruby-lang.org/
+IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=|| ( Ruby-BSD BSD-2 )
+PDEPEND=>=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26] >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26] >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26] >=dev-ruby/rake-12.3.2[ruby_targets_ruby26] >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26] virtual/rubygems[ruby_targets_ruby26] >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26] >=dev-ruby/json-2.0.2[ruby_targets_ruby26] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] ) xemacs? ( app-xemacs/ruby-modes )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
+SLOT=2.6
+SRC_URI=mirror://ruby/2.6/ruby-2.6.4.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=24b63e31004f5501cebf93d58c11e6f2
diff --git a/metadata/md5-cache/dev-lang/rust-1.34.2 b/metadata/md5-cache/dev-lang/rust-1.34.2
index d8e462608e2e..16321298a0d9 100644
--- a/metadata/md5-cache/dev-lang/rust-1.34.2
+++ b/metadata/md5-cache/dev-lang/rust-1.34.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.34
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.34.2-src.tar.xz -> rustc-1.34.2-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.33.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.33.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.33.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.33.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.33.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.33.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.33.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.33.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d32fe326156fe3f637530261c3611972
diff --git a/metadata/md5-cache/dev-lang/rust-1.35.0 b/metadata/md5-cache/dev-lang/rust-1.35.0
index f48129930cd4..6eee9585037e 100644
--- a/metadata/md5-cache/dev-lang/rust-1.35.0
+++ b/metadata/md5-cache/dev-lang/rust-1.35.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.35
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.35.0-src.tar.xz -> rustc-1.35.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.34.2-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.34.2-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.34.2-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.34.2-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.34.2-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.34.2-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.34.2-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.34.2-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.34.2-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=25019437cfde4e859d6d899bfba8ee6f
diff --git a/metadata/md5-cache/dev-lang/rust-1.36.0 b/metadata/md5-cache/dev-lang/rust-1.36.0
index 0016694aa5e4..26b0e33f5310 100644
--- a/metadata/md5-cache/dev-lang/rust-1.36.0
+++ b/metadata/md5-cache/dev-lang/rust-1.36.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.36
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.36.0-src.tar.xz -> rustc-1.36.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.35.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.35.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.35.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.35.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.35.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.35.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.35.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.35.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.35.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=49cd3a6a5151328675a232cc7f30da24
diff --git a/metadata/md5-cache/dev-lang/rust-1.37.0 b/metadata/md5-cache/dev-lang/rust-1.37.0
index 1d90e8eec703..e5486ea38659 100644
--- a/metadata/md5-cache/dev-lang/rust-1.37.0
+++ b/metadata/md5-cache/dev-lang/rust-1.37.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
 SLOT=stable/1.37
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.37.0-src.tar.xz -> rustc-1.37.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.36.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.36.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.36.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.36.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.36.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.36.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.36.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.36.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rust-toolchain	cba902d8aa4b389d95100f64bf4fa34b	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=e27606f68aa725f6676dbad9d78bc12d
diff --git a/metadata/md5-cache/dev-lang/scala-2.12.4 b/metadata/md5-cache/dev-lang/scala-2.12.4
index 77957041393d..58fb7eb46ab0 100644
--- a/metadata/md5-cache/dev-lang/scala-2.12.4
+++ b/metadata/md5-cache/dev-lang/scala-2.12.4
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/jline:2 >=virtual/jre-1.8 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.12/2.12.4
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.12.4.tar.gz -> scala-2.12.4.tar.gz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.4-ivy2-deps.tar.xz https://dev.gentoo.org/~gienah/snapshots/scala-2.12.4-sbt-deps.tar.xz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.12.4-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.12.4-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.12.4-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.12.4-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.12.4-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.12.4-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.12.4-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.12.4-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.12.4-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.12.4-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.12.4-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.12.4-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.12.4-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.12.4-instrumented.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.12.4-gentoo-binary.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=447c81773bd0dd28ad1bd786c5cee2f2
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r2 b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r2
index ecb0904a762b..581071443edc 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r2
+++ b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zl
 RESTRICT=ia64? ( test )
 SLOT=60
 SRC_URI=https://dev.gentoo.org/~axs/distfiles/mozjs-60.5.2.tar.bz2 https://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-60.0-patches-04.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f9594b971c384f4489a2cdc01057ff2a
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r3 b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r3
index 5561d6f558e7..99f8cd091d4a 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r3
+++ b/metadata/md5-cache/dev-lang/spidermonkey-60.5.2_p0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zl
 RESTRICT=ia64? ( test )
 SLOT=60
 SRC_URI=https://dev.gentoo.org/~axs/distfiles/mozjs-60.5.2.tar.bz2 https://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-60.0-patches-04.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=932d4dba79ca82837aa7fa6fc04ab09c
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.1.11 b/metadata/md5-cache/dev-lang/swi-prolog-8.1.11
new file mode 100644
index 000000000000..4ef81a8700c4
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.1.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=versatile implementation of the Prolog programming language
+EAPI=6
+HOMEPAGE=http://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
+SLOT=0
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.11.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=70c536ffb2489bc355f88e238ebb32af
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.1.12 b/metadata/md5-cache/dev-lang/swi-prolog-8.1.12
new file mode 100644
index 000000000000..15c1e218d76f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.1.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=versatile implementation of the Prolog programming language
+EAPI=6
+HOMEPAGE=http://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
+SLOT=0
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.12.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=70c536ffb2489bc355f88e238ebb32af
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.1.8 b/metadata/md5-cache/dev-lang/swi-prolog-8.1.8
deleted file mode 100644
index da0fbf865520..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=versatile implementation of the Prolog programming language
-EAPI=6
-HOMEPAGE=http://www.swi-prolog.org/
-IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.8.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=70c536ffb2489bc355f88e238ebb32af
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.1.9 b/metadata/md5-cache/dev-lang/swi-prolog-8.1.9
deleted file mode 100644
index 4510588df92f..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.1.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=versatile implementation of the Prolog programming language
-EAPI=6
-HOMEPAGE=http://www.swi-prolog.org/
-IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-8.1.9.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=70c536ffb2489bc355f88e238ebb32af
diff --git a/metadata/md5-cache/dev-lang/teyjus-2.0.2 b/metadata/md5-cache/dev-lang/teyjus-2.0.2
deleted file mode 100644
index 4b8099f36183..000000000000
--- a/metadata/md5-cache/dev-lang/teyjus-2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.10[ocamlopt?] emacs? ( virtual/emacs ) dev-util/omake
-DESCRIPTION=Higher-order logic programming language Lambda Prolog
-EAPI=6
-HOMEPAGE=http://teyjus.cs.umn.edu/
-IUSE=emacs examples +ocamlopt
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.10[ocamlopt?] emacs? ( virtual/emacs )
-SLOT=0/2.0.2
-SRC_URI=https://teyjus.googlecode.com/files/teyjus-source-2.0-b2.tar.gz
-_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3e12cb1732c52252357475f2988149e8
diff --git a/metadata/md5-cache/dev-lang/teyjus-2.1-r1 b/metadata/md5-cache/dev-lang/teyjus-2.1-r1
new file mode 100644
index 000000000000..8aff8e6f1c9e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/teyjus-2.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.10[ocamlopt?] emacs? ( virtual/emacs ) app-text/dos2unix dev-util/omake
+DESCRIPTION=Higher-order logic programming language Lambda Prolog
+EAPI=7
+HOMEPAGE=http://teyjus.cs.umn.edu/
+IUSE=emacs examples +ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.10[ocamlopt?] emacs? ( virtual/emacs )
+SLOT=0/2.1
+SRC_URI=https://github.com/teyjus/teyjus/archive/v2.1.tar.gz -> teyjus-2.1.tar.gz
+_eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0ae09af8f2d2f8419c3f91bd6ea29b5c
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.20 b/metadata/md5-cache/dev-lang/vala-0.36.20
new file mode 100644
index 000000000000..3210e0afc617
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.36.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.20 !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+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
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.20
+SLOT=0.36
+SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.20.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a19b94a7de2c3c09ec3a4226ba9bf728
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.16 b/metadata/md5-cache/dev-lang/vala-0.40.16
new file mode 100644
index 000000000000..0af3208551d9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.40.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.16 valadoc? ( >=media-gfx/graphviz-2.16 ) !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Compiler for the GObject type system
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+IUSE=test valadoc
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.16 valadoc? ( >=media-gfx/graphviz-2.16 )
+SLOT=0.40
+SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.16.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=974e66f7fba315dfc4c9c463df1a7144
diff --git a/metadata/md5-cache/dev-lang/vala-0.45.90 b/metadata/md5-cache/dev-lang/vala-0.45.90
deleted file mode 100644
index ff49570165fc..000000000000
--- a/metadata/md5-cache/dev-lang/vala-0.45.90
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.45.90 valadoc? ( >=media-gfx/graphviz-2.16 ) dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Compiler for the GObject type system
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-IUSE=test valadoc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.45.90 valadoc? ( >=media-gfx/graphviz-2.16 )
-SLOT=0.46
-SRC_URI=mirror://gnome/sources/vala/0.45/vala-0.45.90.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b192c5d6f0d06cfa3530dd307619b0d
diff --git a/metadata/md5-cache/dev-lang/vala-0.45.91 b/metadata/md5-cache/dev-lang/vala-0.45.91
new file mode 100644
index 000000000000..3bf9c5985d1a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.45.91
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.45.91 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala] dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Compiler for the GObject type system
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+IUSE=test valadoc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.45.91 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
+SLOT=0.46
+SRC_URI=mirror://gnome/sources/vala/0.45/vala-0.45.91.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9bbc70b2f1e12e2c1b9b695580e58264
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 48d90383d7a5..c3df7d095af7 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
index f48918ee7899..cd09ca070f8c 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
@@ -12,4 +12,4 @@ RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=amdgpu-pro-18.20-684755-ubuntu-16.04.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=88ee88aac46e6224d3e49202575ec1f9
+_md5_=1f63d474019e4406ae501442801dff77
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.10.785425 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.10.785425
deleted file mode 100644
index 5c9723a6e40b..000000000000
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.10.785425
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=compile configure install nofetch postinst test unpack
-DEPEND=app-eselect/eselect-opencl dev-libs/ocl-icd
-DESCRIPTION=Proprietary OpenCL implementation for AMD GPUs
-EAPI=7
-HOMEPAGE=https://www.amd.com/en/support/kb/release-notes/rn-rad-lin-19-10-unified
-IUSE=abi_x86_32 abi_x86_64
-KEYWORDS=~amd64
-LICENSE=AMD-GPU-PRO-EULA
-RDEPEND=app-eselect/eselect-opencl dev-libs/ocl-icd
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
-RESTRICT=mirror fetch strip
-SLOT=0
-SRC_URI=amdgpu-pro-19.10-785425-ubuntu-18.04.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=d8b5d7b34451af23c563fafbf6ffbf45
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.10.785425-r1 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.10.785425-r1
deleted file mode 100644
index e1e43afa1071..000000000000
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.10.785425-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=compile configure install nofetch postinst test unpack
-DEPEND=app-eselect/eselect-opencl dev-libs/ocl-icd
-DESCRIPTION=Proprietary OpenCL implementation for AMD GPUs
-EAPI=7
-HOMEPAGE=https://www.amd.com/en/support/kb/release-notes/rn-rad-lin-19-10-unified
-IUSE=abi_x86_32 abi_x86_64
-KEYWORDS=~amd64 ~x86
-LICENSE=AMD-GPU-PRO-EULA
-RDEPEND=app-eselect/eselect-opencl dev-libs/ocl-icd !media-libs/mesa[opencl]
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
-RESTRICT=mirror fetch strip
-SLOT=0
-SRC_URI=amdgpu-pro-19.10-785425-ubuntu-18.04.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=690af1cb7276a839df6bd7566199c9e0
diff --git a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629 b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629
index 309775493f97..c570cabf685e 100644
--- a/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629
+++ b/metadata/md5-cache/dev-libs/amdgpu-pro-opencl-19.30.838629
@@ -13,4 +13,4 @@ RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=amdgpu-pro-19.30-838629-ubuntu-18.04.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=4c87d437aac82a892a4db5d4c090e81e
+_md5_=aaeda8d4c58549478d559ae9fb1c1ae2
diff --git a/metadata/md5-cache/dev-libs/appstream-0.12.6 b/metadata/md5-cache/dev-libs/appstream-0.12.6
index 10ec5518a433..d5ad8dfb408b 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.12.6
+++ b/metadata/md5-cache/dev-libs/appstream-0.12.6
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.54:2 dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer introspection? ( >=dev-libs/gobject-introspection-1.56:= ) qt5? ( dev-qt/qtcore:5 )
 SLOT=0/4
 SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-0.12.6.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae161722806f8a196d91516d9d1ba548
diff --git a/metadata/md5-cache/dev-libs/appstream-0.12.7 b/metadata/md5-cache/dev-libs/appstream-0.12.7
index 60b82e6ee142..54796797f9d1 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.12.7
+++ b/metadata/md5-cache/dev-libs/appstream-0.12.7
@@ -5,10 +5,10 @@ DESCRIPTION=Cross-distro effort for providing metadata for software in the Linux
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Distributions/AppStream/
 IUSE=apt +introspection qt5 test
-KEYWORDS=amd64 ~arm arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=dev-db/lmdb:= >=dev-libs/glib-2.54:2 dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer introspection? ( >=dev-libs/gobject-introspection-1.56:= ) qt5? ( dev-qt/qtcore:5 )
 SLOT=0/4
 SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-0.12.7.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e7d5ae2d50e7b884c8ae4c88b45c70b
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1572ece993de41aa69e4f8a8de6dffe9
diff --git a/metadata/md5-cache/dev-libs/appstream-0.12.8 b/metadata/md5-cache/dev-libs/appstream-0.12.8
index f3e1dc1a582d..59ec81e4075a 100644
--- a/metadata/md5-cache/dev-libs/appstream-0.12.8
+++ b/metadata/md5-cache/dev-libs/appstream-0.12.8
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=dev-db/lmdb:= >=dev-libs/glib-2.54:2 dev-libs/libxml2:2 dev-libs/libyaml dev-libs/snowball-stemmer introspection? ( >=dev-libs/gobject-introspection-1.56:= ) qt5? ( dev-qt/qtcore:5 )
 SLOT=0/4
 SRC_URI=https://www.freedesktop.org/software/appstream/releases/AppStream-0.12.8.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3baa58071c736d103b8249732559015b
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.7.15 b/metadata/md5-cache/dev-libs/appstream-glib-0.7.15
index 439ee4daf93a..b95dfca0c86e 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.15
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.7.15
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.45.8:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<dev-util/appdata-tools-0.1.8-r1
 SLOT=0/8
 SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.7.15.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b20e5c29a02f9b737005edcf725a9862
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.7.9 b/metadata/md5-cache/dev-libs/appstream-glib-0.7.9
index 13394e5131a9..2c889d7cabca 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.9
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.7.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.45.8:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] app-arch/gcab x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<dev-util/appdata-tools-0.1.8-r1
 SLOT=0/8
 SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.7.9.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44ac19025a8a4c8c9de82edb7cf35955
diff --git a/metadata/md5-cache/dev-libs/atk-2.30.0 b/metadata/md5-cache/dev-libs/atk-2.30.0
index 62c7bd7c1444..a97ff5225f22 100644
--- a/metadata/md5-cache/dev-libs/atk-2.30.0
+++ b/metadata/md5-cache/dev-libs/atk-2.30.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.30/atk-2.30.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ec712ce22c7e7a2063fa98e654f15ab2
diff --git a/metadata/md5-cache/dev-libs/efl-1.21.1-r3 b/metadata/md5-cache/dev-libs/efl-1.21.1-r3
deleted file mode 100644
index 596e321a1b65..000000000000
--- a/metadata/md5-cache/dev-libs/efl-1.21.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi ) virtual/pkgconfig
-DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
-EAPI=6
-HOMEPAGE=https://www.enlightenment.org
-IUSE=+bmp dds connman debug drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
-RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=?? ( gles2 opengl ) fbcon? ( !tslib ) gles2? ( || ( wayland X ) !sdl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) vnc? ( fbcon X ) wayland? ( gles2 !opengl ) xim? ( X ) xpresent? ( X )
-SLOT=0
-SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.21.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c42ff457065172e39539ba342c636ed3
diff --git a/metadata/md5-cache/dev-libs/efl-1.22.2 b/metadata/md5-cache/dev-libs/efl-1.22.2
index 63d0bb175e4b..d4808b1065a3 100644
--- a/metadata/md5-cache/dev-libs/efl-1.22.2
+++ b/metadata/md5-cache/dev-libs/efl-1.22.2
@@ -5,11 +5,11 @@ DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=7
 HOMEPAGE=https://www.enlightenment.org
 IUSE=+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
 RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
 REQUIRED_USE=?? ( elogind systemd ) ?? ( gles2 opengl ) fbcon? ( !tslib ) gles2? ( || ( wayland X ) !sdl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) vnc? ( fbcon X ) wayland? ( gles2 !opengl ) xim? ( X ) xpresent? ( X )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.22.2.tar.xz
 _eclasses_=pax-utils	db85a3c508cf82c45f24b2723791cc93	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7087ca1cfc6694e97ecf0c80d0160c9c
+_md5_=f95a862c2020f4acab7ec785280210a7
diff --git a/metadata/md5-cache/dev-libs/efl-1.22.3 b/metadata/md5-cache/dev-libs/efl-1.22.3
new file mode 100644
index 000000000000..5d4dcb9bb784
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/efl-1.22.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org
+IUSE=+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
+RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
+REQUIRED_USE=?? ( elogind systemd ) ?? ( gles2 opengl ) fbcon? ( !tslib ) gles2? ( || ( wayland X ) !sdl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) vnc? ( fbcon X ) wayland? ( gles2 !opengl ) xim? ( X ) xpresent? ( X )
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.22.3.tar.xz
+_eclasses_=pax-utils	db85a3c508cf82c45f24b2723791cc93	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4dffcd4ee05960a0c7641b8ae1f43e6
diff --git a/metadata/md5-cache/dev-libs/efl-1.22.4 b/metadata/md5-cache/dev-libs/efl-1.22.4
new file mode 100644
index 000000000000..0f302e31c3dd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/efl-1.22.4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org
+IUSE=+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
+RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
+REQUIRED_USE=?? ( elogind systemd ) ?? ( gles2 opengl ) fbcon? ( !tslib ) gles2? ( || ( wayland X ) !sdl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) vnc? ( fbcon X ) wayland? ( gles2 !opengl ) xim? ( X ) xpresent? ( X )
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.22.4.tar.xz
+_eclasses_=pax-utils	db85a3c508cf82c45f24b2723791cc93	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4dffcd4ee05960a0c7641b8ae1f43e6
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.176-r1 b/metadata/md5-cache/dev-libs/elfutils-0.176-r1
index bb1736329772..34f227840d38 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.176-r1
+++ b/metadata/md5-cache/dev-libs/elfutils-0.176-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for l
 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-libs/libelf
 SLOT=0
 SRC_URI=https://sourceware.org/elfutils/ftp/0.176/elfutils-0.176.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=623357e6210a3584f7857a5fd5c8e034
+_md5_=a93a232c1dc8b3e438e0b34d939dfc29
diff --git a/metadata/md5-cache/dev-libs/ell-0.22 b/metadata/md5-cache/dev-libs/ell-0.22
new file mode 100644
index 000000000000..df7446075747
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ell-0.22
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
+EAPI=7
+HOMEPAGE=https://01.org/ell
+IUSE=glib pie abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.22.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=abccb2a5a62c4f4a00f2fa35575488a9
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.1 b/metadata/md5-cache/dev-libs/girara-0.3.1
index ec7cca7d786e..5258eae3207b 100644
--- a/metadata/md5-cache/dev-libs/girara-0.3.1
+++ b/metadata/md5-cache/dev-libs/girara-0.3.1
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=dev-libs/glib:2 dev-libs/json-c >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.14 libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.1.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=fc28f39c73b104bfb78310380cec4a16
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.2 b/metadata/md5-cache/dev-libs/girara-0.3.2
index b0f21d44b752..3545a1581f62 100644
--- a/metadata/md5-cache/dev-libs/girara-0.3.2
+++ b/metadata/md5-cache/dev-libs/girara-0.3.2
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=dev-libs/glib:2 dev-libs/json-c >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.14 libnotify? ( x11-libs/libnotify )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.2.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=410ae53982d05ca88efd780687e2f231
diff --git a/metadata/md5-cache/dev-libs/girara-9999 b/metadata/md5-cache/dev-libs/girara-9999
index 08dc77190446..4c518b988e1c 100644
--- a/metadata/md5-cache/dev-libs/girara-9999
+++ b/metadata/md5-cache/dev-libs/girara-9999
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dev-libs/json-c >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.14 libnotify? ( x11-libs/libnotify )
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=8f6aa51bbc5c6103abb0f4ccb50cc43e
diff --git a/metadata/md5-cache/dev-libs/gjs-1.56.2 b/metadata/md5-cache/dev-libs/gjs-1.56.2
new file mode 100644
index 000000000000..9d58946a1bee
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/gjs-1.56.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.54.0 >=dev-libs/gobject-introspection-1.57.2:= readline? ( sys-libs/readline:0= ) dev-lang/spidermonkey:60 virtual/libffi:= cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Javascript bindings for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
+IUSE=+cairo examples gtk readline test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
+RDEPEND=>=dev-libs/glib-2.54.0 >=dev-libs/gobject-introspection-1.57.2:= readline? ( sys-libs/readline:0= ) dev-lang/spidermonkey:60 virtual/libffi:= cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gjs/1.56/gjs-1.56.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d18b93b81275b45138b4fe50df0aa338
diff --git a/metadata/md5-cache/dev-libs/glib-2.60.6 b/metadata/md5-cache/dev-libs/glib-2.60.6
index 71c32c0bcf72..5d0614e93071 100644
--- a/metadata/md5-cache/dev-libs/glib-2.60.6
+++ b/metadata/md5-cache/dev-libs/glib-2.60.6
@@ -5,11 +5,11 @@ DESCRIPTION=The GLib library of C routines
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.60.6 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) virtual/libelf:0= fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.60/glib-2.60.6.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d07e8c4a4f514eccfbcfdb6d6bb21877
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=75714e1f7fc63a16b54414af590c8eee
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2 b/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2
index a2a993af80c6..137cf0b2790b 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2
@@ -4,7 +4,7 @@ DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 IUSE=cairo doctool test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 PDEPEND=cairo? ( x11-libs/cairo[glib] )
 RDEPEND=>=dev-libs/gobject-introspection-common-1.60.2 >=dev-libs/glib-2.58.0:2 doctool? ( dev-python/mako[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/markdown[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) virtual/libffi:= virtual/pkgconfig !<dev-lang/vala-0.20.0 python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.60/gobject-introspection-1.60.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=23b4429e31ed877daaf41b9cc8ec8a47
+_md5_=61c5cfcfbe411f4153d7d6705c6d8127
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.60.2 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.60.2
index a2958c445f1e..f357f7057cb3 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.60.2
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.60.2
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.60.2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.60/gobject-introspection-1.60.2.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=27b06ecaf74acef78addb9b88d6740a2
+_md5_=8147f2dd1edf4f3555c5c42825600585
diff --git a/metadata/md5-cache/dev-libs/granite-5.2.4 b/metadata/md5-cache/dev-libs/granite-5.2.4
new file mode 100644
index 000000000000..e98aa0e8654a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/granite-5.2.4
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 ) >=dev-util/meson-0.48.2 virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/glib-2.50:2 dev-libs/libgee:0.8[introspection] >=x11-libs/gtk+-3.22:3[introspection]
+DESCRIPTION=Elementary OS library that extends GTK+
+EAPI=7
+HOMEPAGE=https://github.com/elementary/granite
+IUSE=test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-libs/glib-2.50:2 dev-libs/libgee:0.8[introspection] >=x11-libs/gtk+-3.22:3[introspection]
+SLOT=0
+SRC_URI=https://github.com/elementary/granite/archive/5.2.4.tar.gz -> granite-5.2.4.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d22e3bdf4554cca92320d114b0bd5e6b
diff --git a/metadata/md5-cache/dev-libs/hsa-ext-rocr-1.1.9.99 b/metadata/md5-cache/dev-libs/hsa-ext-rocr-1.1.9.99
new file mode 100644
index 000000000000..03eac877979d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/hsa-ext-rocr-1.1.9.99
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Proprietary image-support library for Radeon Open Compute
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm#closed-source-components
+IUSE=-deprecated
+KEYWORDS=~amd64
+LICENSE=AMD-GPU-PRO-EULA
+RESTRICT=mirror fetch strip
+SLOT=0
+SRC_URI=http://repo.radeon.com/rocm/apt/debian/pool/main/h/hsa-ext-rocr-dev/hsa-ext-rocr-dev_1.1.9-99-g835b876_amd64.deb
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=d3a5e493876ec207e7134843e3878137
diff --git a/metadata/md5-cache/dev-libs/ilbc-rfc3951-0-r1 b/metadata/md5-cache/dev-libs/ilbc-rfc3951-0-r1
index cd1391dd254e..8af17c79a2ad 100644
--- a/metadata/md5-cache/dev-libs/ilbc-rfc3951-0-r1
+++ b/metadata/md5-cache/dev-libs/ilbc-rfc3951-0-r1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
 DESCRIPTION=iLBC is a speech codec suitable for robust voice communication over IP
-EAPI=0
+EAPI=7
 HOMEPAGE=https://webrtc.org/license/ilbc-freeware/
 KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
-SRC_URI=http://simon.morlat.free.fr/download/1.1.x/source/ilbc-rfc3951.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9cd1b1d83747ffaa59c8cd5f8cd16d56
+SRC_URI=http://simon.morlat.free.fr/download/1.1.x/source/ilbc-rfc3951.tar.gz -> ilbc-rfc3951-0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=dcf03120b05edb70b8952a8f32b8c0c6
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.4.4 b/metadata/md5-cache/dev-libs/json-glib-1.4.4
index 611b778863c9..932bd1031824 100644
--- a/metadata/md5-cache/dev-libs/json-glib-1.4.4
+++ b/metadata/md5-cache/dev-libs/json-glib-1.4.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/json-glib/1.4/json-glib-1.4.4.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=332e21467acd5a1963d07a24070c5e1d
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.1 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.1
index 7bffbbcc183d..4d42717730b5 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.9.1
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.1
@@ -10,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0/21
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.9.1.tar.gz -> jsoncpp-1.9.1.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88c6a5d133899f711995c48dda417869
+_md5_=139e462dc8e6af632f5eb63f34d156a4
diff --git a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.30.1 b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.30.1
index 3009b1be1464..cef8e462c6e7 100644
--- a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.30.1
+++ b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.30.1
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/jsonrpc-glib/3.30/jsonrpc-glib-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae9e17b2ca77a4edb442e90ec7b656ac
diff --git a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.32.0 b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.32.0
index ba5a9554e477..197107809f5c 100644
--- a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.32.0
+++ b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.32.0
@@ -12,5 +12,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/jsonrpc-glib/3.32/jsonrpc-glib-3.32.0.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e39524dc783efae7aeffb688a50a3992
diff --git a/metadata/md5-cache/dev-libs/kasync-0.3.0 b/metadata/md5-cache/dev-libs/kasync-0.3.0
new file mode 100644
index 000000000000..62b30f69d597
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/kasync-0.3.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=C++ library for controlling asynchronous tasks
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/unstable/kasync/0.3.0/src/kasync-0.3.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ecee1f70c1d7f49e4cbe498a13254db3
diff --git a/metadata/md5-cache/dev-libs/leveldb-1.20 b/metadata/md5-cache/dev-libs/leveldb-1.20
index 2c405ca3def8..c3143e1a8972 100644
--- a/metadata/md5-cache/dev-libs/leveldb-1.20
+++ b/metadata/md5-cache/dev-libs/leveldb-1.20
@@ -4,11 +4,11 @@ DESCRIPTION=a fast key-value storage library written at Google
 EAPI=7
 HOMEPAGE=http://leveldb.org/ https://github.com/google/leveldb
 IUSE=+snappy static-libs kernel_FreeBSD +tcmalloc test
-KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=tcmalloc? ( dev-util/google-perftools ) snappy? ( app-arch/snappy:= )
 REQUIRED_USE=snappy? ( !static-libs )
 SLOT=0/1
 SRC_URI=https://github.com/google/leveldb/archive/v1.20.tar.gz -> leveldb-1.20.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0277af1e750e9f6871f1a2a0aa64b888
+_md5_=d4ddd7f395f0a03a8710925e57d88a50
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.2.0 b/metadata/md5-cache/dev-libs/libarcus-4.2.0
new file mode 100644
index 000000000000..641aaf596cd5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libarcus-4.2.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+DESCRIPTION=This library facilitates communication between Cura and its backend
+EAPI=7
+HOMEPAGE=https://github.com/Ultimaker/libArcus
+IUSE=examples python static-libs python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0/3
+SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.2.0.tar.gz -> libarcus-4.2.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc9a024c30d53ddaa6010f6ce9ed14f8
diff --git a/metadata/md5-cache/dev-libs/libassuan-2.4.3-r1 b/metadata/md5-cache/dev-libs/libassuan-2.4.3-r1
deleted file mode 100644
index f7523f328574..000000000000
--- a/metadata/md5-cache/dev-libs/libassuan-2.4.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libgpg-error-1.8 >=app-portage/elt-patches-20170815
-DESCRIPTION=IPC library used by GnuPG and GPGME
-EAPI=6
-HOMEPAGE=http://www.gnupg.org/related_software/libassuan/index.en.html
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3 LGPL-2.1
-RDEPEND=>=dev-libs/libgpg-error-1.8
-SLOT=0
-SRC_URI=mirror://gnupg/libassuan/libassuan-2.4.3.tar.bz2
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c1646c9d41d16b8ab9b9d8df6220afcc
diff --git a/metadata/md5-cache/dev-libs/libassuan-2.5.3 b/metadata/md5-cache/dev-libs/libassuan-2.5.3
new file mode 100644
index 000000000000..bbc68171a225
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libassuan-2.5.3
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/libgpg-error-1.8
+DESCRIPTION=IPC library used by GnuPG and GPGME
+EAPI=7
+HOMEPAGE=http://www.gnupg.org/related_software/libassuan/index.en.html
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3 LGPL-2.1
+RDEPEND=>=dev-libs/libgpg-error-1.8
+SLOT=0
+SRC_URI=mirror://gnupg/libassuan/libassuan-2.5.3.tar.bz2
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=58986b1e3fc7b7a461669cf86bb59490
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.10.0 b/metadata/md5-cache/dev-libs/libbsd-0.10.0
new file mode 100644
index 000000000000..4aa89a893b97
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libbsd-0.10.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install setup test
+DEPEND=>=sys-kernel/linux-headers-3.17
+DESCRIPTION=An library to provide useful functions commonly found on BSD systems
+EAPI=7
+HOMEPAGE=https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD BSD-2 BSD-4 ISC
+SLOT=0
+SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.10.0.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8b9b7a2069aace3c380e09d38c3eb794
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.8.6 b/metadata/md5-cache/dev-libs/libbsd-0.8.6
deleted file mode 100644
index fe6c8a4710e3..000000000000
--- a/metadata/md5-cache/dev-libs/libbsd-0.8.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=sys-kernel/linux-headers-3.17
-DESCRIPTION=An library to provide useful functions commonly found on BSD systems
-EAPI=6
-HOMEPAGE=https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD BSD-2 BSD-4 ISC
-SLOT=0
-SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.8.6.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=10576af69c8f2980d132e7fe032e20e9
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.8.7 b/metadata/md5-cache/dev-libs/libbsd-0.8.7
deleted file mode 100644
index 01e1700c511b..000000000000
--- a/metadata/md5-cache/dev-libs/libbsd-0.8.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=sys-kernel/linux-headers-3.17
-DESCRIPTION=An library to provide useful functions commonly found on BSD systems
-EAPI=6
-HOMEPAGE=https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD BSD-2 BSD-4 ISC
-SLOT=0
-SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.8.7.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9d14f0c300ebf92a5e2b1a2eda7fdac8
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.2.0 b/metadata/md5-cache/dev-libs/libcharon-4.2.0
new file mode 100644
index 000000000000..77271582c88f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcharon-4.2.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=This library facilitates communication between Cura and its backend
+EAPI=7
+HOMEPAGE=https://github.com/Ultimaker/libCharon
+IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+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/3
+SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.2.0.tar.gz -> libcharon-4.2.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=736d7f24fe41dcdb49887fdac7c1a8f3
diff --git a/metadata/md5-cache/dev-libs/libdazzle-3.30.2 b/metadata/md5-cache/dev-libs/libdazzle-3.30.2
index 2a1cf4033576..dc048e5cd7de 100644
--- a/metadata/md5-cache/dev-libs/libdazzle-3.30.2
+++ b/metadata/md5-cache/dev-libs/libdazzle-3.30.2
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libdazzle/3.30/libdazzle-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94931e45aee080f93eba60b6d76797fe
diff --git a/metadata/md5-cache/dev-libs/libdazzle-3.32.3 b/metadata/md5-cache/dev-libs/libdazzle-3.32.3
index fde2989b27b8..a55d7fe44556 100644
--- a/metadata/md5-cache/dev-libs/libdazzle-3.32.3
+++ b/metadata/md5-cache/dev-libs/libdazzle-3.32.3
@@ -12,5 +12,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libdazzle/3.32/libdazzle-3.32.3.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=86b98c016f88ae870f3ec620e746c009
diff --git a/metadata/md5-cache/dev-libs/libev-4.27 b/metadata/md5-cache/dev-libs/libev-4.27
new file mode 100644
index 000000000000..b1946457a805
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libev-4.27
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )
+DESCRIPTION=A high-performance event loop/event model with lots of feature
+EAPI=7
+HOMEPAGE=http://software.schmorp.de/pkg/libev.html
+IUSE=elibc_glibc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )
+SLOT=0
+SRC_URI=http://dist.schmorp.de/libev/libev-4.27.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.27.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0f3f5386aa1aa98eb6b61816f0243645
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.8.0 b/metadata/md5-cache/dev-libs/libevdev-1.8.0
new file mode 100644
index 000000000000..e9bb0d45bbc5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libevdev-1.8.0
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) doc? ( app-doc/doxygen ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Handler library for evdev events
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev
+IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.8.0.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=98e0ab77000f7fdca90e93531aa71ee5
diff --git a/metadata/md5-cache/dev-libs/libflatarray-0.2.0 b/metadata/md5-cache/dev-libs/libflatarray-0.2.0
new file mode 100644
index 000000000000..4be5b14fbd6f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libflatarray-0.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-doc/doxygen ) cuda? ( dev-util/nvidia-cuda-toolkit ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Struct of arrays library with object oriented interface for C++
+EAPI=6
+HOMEPAGE=http://www.libgeodecomp.org/libflatarray.html
+IUSE=cuda doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Boost-1.0
+SLOT=0
+SRC_URI=http://www.libgeodecomp.org/archive/libflatarray-0.2.0.tar.bz2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=20201310b60810f3ca1ad48dff2fb65e
diff --git a/metadata/md5-cache/dev-libs/libfmt-6.0.0 b/metadata/md5-cache/dev-libs/libfmt-6.0.0
new file mode 100644
index 000000000000..990a43a411de
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfmt-6.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Small, safe and fast formatting library
+EAPI=6
+HOMEPAGE=https://github.com/fmtlib/fmt
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+SLOT=0/6
+SRC_URI=https://github.com/fmtlib/fmt/archive/6.0.0.tar.gz -> libfmt-6.0.0.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=176fc558e155c388091db775d264b293
diff --git a/metadata/md5-cache/dev-libs/libfmt-9999 b/metadata/md5-cache/dev-libs/libfmt-9999
index 777ed3165ee1..426ad51cc0ed 100644
--- a/metadata/md5-cache/dev-libs/libfmt-9999
+++ b/metadata/md5-cache/dev-libs/libfmt-9999
@@ -4,8 +4,8 @@ DESCRIPTION=Small, safe and fast formatting library
 EAPI=6
 HOMEPAGE=https://github.com/fmtlib/fmt
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-LICENSE=BSD-2
+LICENSE=MIT
 PROPERTIES=live
 SLOT=0/9999
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c0f819bb4757b52f724ca1090a18356f
+_md5_=176fc558e155c388091db775d264b293
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.8.5 b/metadata/md5-cache/dev-libs/libgcrypt-1.8.5
new file mode 100644
index 000000000000..29094c9faa24
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.8.5
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( virtual/texi2dvi ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=General purpose crypto library based on the code used in GnuPG
+EAPI=7
+HOMEPAGE=http://www.gnupg.org/
+IUSE=doc o-flag-munging static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1 MIT
+RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/20
+SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.8.5.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0d177650fb47b3215d13974552b692b6
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.17.10 b/metadata/md5-cache/dev-libs/libgdata-0.17.10
deleted file mode 100644
index 7f9317b5f6b0..000000000000
--- a/metadata/md5-cache/dev-libs/libgdata-0.17.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-1[introspection?] >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.55.90:2.4[introspection?] gtk? ( x11-libs/gtk+:3 ) crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 sys-devel/gettext virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) test? ( >=net-libs/uhttpmock-0.5 >=x11-libs/gdk-pixbuf-2.14:2 ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GLib-based library for accessing online service APIs using the GData protocol
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/libgdata
-IUSE=+crypt gnome-online-accounts gtk gtk-doc +introspection test vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-1[introspection?] >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.55.90:2.4[introspection?] gtk? ( x11-libs/gtk+:3 ) crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-REQUIRED_USE=gnome-online-accounts? ( crypt ) vala? ( introspection )
-RESTRICT=test
-SLOT=0/22
-SRC_URI=mirror://gnome/sources/libgdata/0.17/libgdata-0.17.10.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7fbb6ff56f09cb8753d29b44842e420
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.17.11 b/metadata/md5-cache/dev-libs/libgdata-0.17.11
new file mode 100644
index 000000000000..259216f2856c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgdata-0.17.11
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.50.0 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( >=net-libs/uhttpmock-0.5.0 >=x11-libs/gdk-pixbuf-2.14:2 ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-0.15[introspection?] >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.55.90:2.4[introspection?,vala?] crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GLib-based library for accessing online service APIs using the GData protocol
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/libgdata
+IUSE=+crypt gnome-online-accounts gtk-doc +introspection test vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-0.15[introspection?] >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.55.90:2.4[introspection?,vala?] crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0/22
+SRC_URI=mirror://gnome/sources/libgdata/0.17/libgdata-0.17.11.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce18e49300fdd91a46bebdbacb72a26d
diff --git a/metadata/md5-cache/dev-libs/libgee-0.20.2 b/metadata/md5-cache/dev-libs/libgee-0.20.2
index 46c255ae069b..393ebf189e5f 100644
--- a/metadata/md5-cache/dev-libs/libgee-0.20.2
+++ b/metadata/md5-cache/dev-libs/libgee-0.20.2
@@ -4,10 +4,10 @@ DESCRIPTION=GObject-based interfaces and classes for commonly used data structur
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgee
 IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 SLOT=0.8/2
 SRC_URI=mirror://gnome/sources/libgee/0.20/libgee-0.20.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4112651bba9a9e5ea9f861cc95a7eb57
+_md5_=d43920d74d243198fa2d3a198f19d74f
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.26.8 b/metadata/md5-cache/dev-libs/libgit2-0.26.8
deleted file mode 100644
index 0a3caa8b3667..000000000000
--- a/metadata/md5-cache/dev-libs/libgit2-0.26.8
+++ /dev/null
@@ -1,13 +0,0 @@
-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-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/26
-SRC_URI=https://github.com/libgit2/libgit2/archive/v0.26.8.tar.gz -> libgit2-0.26.8.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e91e0eeb221a43b4b82cbe896b6912ef
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.28.2 b/metadata/md5-cache/dev-libs/libgit2-0.28.2
deleted file mode 100644
index e491f770e63f..000000000000
--- a/metadata/md5-cache/dev-libs/libgit2-0.28.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig
-DESCRIPTION=A linkable library for Git
-EAPI=7
-HOMEPAGE=https://libgit2.github.com/
-IUSE=examples gssapi libressl +ssh test +threads trace
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
-RESTRICT=!test? ( test )
-SLOT=0/28
-SRC_URI=https://github.com/libgit2/libgit2/archive/v0.28.2.tar.gz -> libgit2-0.28.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81482d9897f76f8972074f3dcda5ba71
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.28.3 b/metadata/md5-cache/dev-libs/libgit2-0.28.3
index 522e267b6319..0a5c09c7ad99 100644
--- a/metadata/md5-cache/dev-libs/libgit2-0.28.3
+++ b/metadata/md5-cache/dev-libs/libgit2-0.28.3
@@ -5,11 +5,11 @@ DESCRIPTION=A linkable library for Git
 EAPI=7
 HOMEPAGE=https://libgit2.github.com/
 IUSE=examples gssapi libressl +ssh test +threads trace
-KEYWORDS=~amd64 ~arm arm64 ~ppc x86 ~ppc-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 RESTRICT=!test? ( test )
 SLOT=0/28
 SRC_URI=https://github.com/libgit2/libgit2/archive/v0.28.3.tar.gz -> libgit2-0.28.3.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e9f429e97e7e7ec6693afb41cd15d8e
+_md5_=5f116f7b260b547fc1da63a358d6704f
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.26.4 b/metadata/md5-cache/dev-libs/libgit2-glib-0.26.4
deleted file mode 100644
index 457458bec17e..000000000000
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.26.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgit2-0.26.0:0/26[ssh?] python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-util/glib-utils virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=Git library for GLib
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
-IUSE=python +ssh +vala python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgit2-0.26.0:0/26[ssh?] python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c864bda5a791da42c38cd38f98ab03fa
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.28.0.1 b/metadata/md5-cache/dev-libs/libgit2-glib-0.28.0.1
index 13e33c3e56d9..ef729c0e9135 100644
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.28.0.1
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.28.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Git library for GLib
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
 IUSE=python +ssh +vala python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 <dev-libs/libgit2-0.29:0=[ssh?] >=dev-libs/libgit2-0.26.0:0 python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgit2-glib/0.28/libgit2-glib-0.28.0.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0a4acd1e72a65c6c0f1954b23afc6869
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=003074c9e621113bfee2d7e73181194b
diff --git a/metadata/md5-cache/dev-libs/libgudev-233 b/metadata/md5-cache/dev-libs/libgudev-233
index 40fc20771a34..7c5cdf38b1e1 100644
--- a/metadata/md5-cache/dev-libs/libgudev-233
+++ b/metadata/md5-cache/dev-libs/libgudev-233
@@ -4,11 +4,11 @@ DESCRIPTION=GObject bindings for libudev
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
 IUSE=introspection static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=virtual/libudev-199:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) !sys-fs/eudev[gudev(-)] !sys-fs/udev[gudev(-)] !sys-apps/systemd[gudev(-)]
 RESTRICT=test
 SLOT=0/0
 SRC_URI=mirror://gnome/sources/libgudev/233/libgudev-233.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=717a808055357c780fe75884f7914513
+_md5_=2821308de644bdbd2719d48f5403362f
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.28.3 b/metadata/md5-cache/dev-libs/libgweather-3.28.3
index dd03655371a6..2bf3c619fc55 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.28.3
+++ b/metadata/md5-cache/dev-libs/libgweather-3.28.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.35.1:2 >=x11-libs/gtk+-3.13.5:3[introspection?] >=net-
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-15
 SRC_URI=mirror://gnome/sources/libgweather/3.28/libgweather-3.28.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=462613ce5725639b303108922a0869e7
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.32.1 b/metadata/md5-cache/dev-libs/libgweather-3.32.1
index 9539f73370ef..ab2adb39eec4 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.32.1
+++ b/metadata/md5-cache/dev-libs/libgweather-3.32.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.35.1:2 >=x11-libs/gtk+-3.13.5:3[introspection?] >=net-
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-15
 SRC_URI=mirror://gnome/sources/libgweather/3.32/libgweather-3.32.1.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=066baf71f77a20327d64b692548d5a55
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.32.2-r1 b/metadata/md5-cache/dev-libs/libgweather-3.32.2-r1
index dc3a1a78b218..214877553ba7 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.32.2-r1
+++ b/metadata/md5-cache/dev-libs/libgweather-3.32.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.44.0:2 >=x11-libs/gtk+-3.13.5:3[introspection?] >=net-
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-15-2
 SRC_URI=mirror://gnome/sources/libgweather/3.32/libgweather-3.32.2.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c9b195665be4d2cb3b951d01950927fa
diff --git a/metadata/md5-cache/dev-libs/libinput-1.13.4 b/metadata/md5-cache/dev-libs/libinput-1.13.4
index 1b1e330f1f4e..5bd035a78f8c 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.13.4
+++ b/metadata/md5-cache/dev-libs/libinput-1.13.4
@@ -11,5 +11,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.13.4.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=a52c284601391693240190ec73306f40
diff --git a/metadata/md5-cache/dev-libs/libinput-1.14.0 b/metadata/md5-cache/dev-libs/libinput-1.14.0
index 5cabc45de8d5..fb33cbc35edc 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.14.0
+++ b/metadata/md5-cache/dev-libs/libinput-1.14.0
@@ -11,5 +11,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.14.0.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=9ddcaa01fb5d70ce3e95d68510702186
diff --git a/metadata/md5-cache/dev-libs/libinput-1.14.1 b/metadata/md5-cache/dev-libs/libinput-1.14.1
new file mode 100644
index 000000000000..d88bae20854f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-1.14.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/commonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/commonmark[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/recommonmark[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/sphinx[python_targets_python3_5(-),python_single_target_python3_5(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/commonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
+DESCRIPTION=Library to handle input devices in Wayland
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
+IUSE=doc input_devices_wacom
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
+RESTRICT=test
+SLOT=0/10
+SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.14.1.tar.xz
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=9ddcaa01fb5d70ce3e95d68510702186
diff --git a/metadata/md5-cache/dev-libs/liblouis-2.5.3 b/metadata/md5-cache/dev-libs/liblouis-2.5.3
deleted file mode 100644
index 394020f4c9e7..000000000000
--- a/metadata/md5-cache/dev-libs/liblouis-2.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[wide-unicode(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[wide-unicode(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[wide-unicode(+)] ) >=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 open-source braille translator and back-translator
-EAPI=5
-HOMEPAGE=https://github.com/liblouis/liblouis
-IUSE=python python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-3
-RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[wide-unicode(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[wide-unicode(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[wide-unicode(+)] ) >=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? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://liblouis.googlecode.com/files/liblouis-2.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e112539d02347bf766701883bc3f1f41
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.10.0 b/metadata/md5-cache/dev-libs/liblouis-3.10.0
new file mode 100644
index 000000000000..bc6a1dde164f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/liblouis-3.10.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/help2man >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[wide-unicode(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[wide-unicode(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[wide-unicode(+)] ) >=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 open-source braille translator and back-translator
+EAPI=7
+HOMEPAGE=https://github.com/liblouis/liblouis
+IUSE=python python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86
+LICENSE=LGPL-2.1+
+RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[wide-unicode(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[wide-unicode(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[wide-unicode(+)] ) >=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? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/liblouis/liblouis/archive/v3.10.0.tar.gz -> liblouis-3.10.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	9838160d624a44b2d56d1266a69fd473	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=47b86e8b2f063420189f4767d7d2039c
diff --git a/metadata/md5-cache/dev-libs/libmirage-3.2.3 b/metadata/md5-cache/dev-libs/libmirage-3.2.3
new file mode 100644
index 000000000000..b8240c8ec176
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libmirage-3.2.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.38:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-util/desktop-file-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( dev-util/gtk-doc )
+DESCRIPTION=CD and DVD image access library
+EAPI=7
+HOMEPAGE=https://cdemu.sourceforge.io
+IUSE=doc +introspection
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.38:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 )
+SLOT=0/11
+SRC_URI=https://download.sourceforge.net/cdemu/libmirage/libmirage-3.2.3.tar.bz2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e3be3377700f1f3515103f40819a7b9c
diff --git a/metadata/md5-cache/dev-libs/libmissing-1.0.0-r1 b/metadata/md5-cache/dev-libs/libmissing-1.0.0-r1
new file mode 100644
index 000000000000..d0531549173d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libmissing-1.0.0-r1
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Library with missing functions based on GNUlib
+EAPI=7
+HOMEPAGE=https://prefix.gentoo.org
+IUSE=static-libs
+KEYWORDS=~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-b451121ab45497e78cb6f612c8673a9705193391.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=dad79fa1ada7a18ba1dce5dae7498241
diff --git a/metadata/md5-cache/dev-libs/libnl-3.5.0 b/metadata/md5-cache/dev-libs/libnl-3.5.0
new file mode 100644
index 000000000000..79d6acf610df
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libnl-3.5.0
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python? ( dev-lang/swig ) sys-devel/bison sys-devel/flex
+DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
+EAPI=7
+HOMEPAGE=http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
+IUSE=+debug static-libs python +threads utils python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1 utils? ( GPL-2 )
+RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+SLOT=3
+SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=4ba8e2b48054ae3d8a3ba1d55c32a595
diff --git a/metadata/md5-cache/dev-libs/libofx-0.9.10 b/metadata/md5-cache/dev-libs/libofx-0.9.10
index ff222fc46776..3c2b3ac6e8ec 100644
--- a/metadata/md5-cache/dev-libs/libofx-0.9.10
+++ b/metadata/md5-cache/dev-libs/libofx-0.9.10
@@ -4,10 +4,10 @@ DESCRIPTION=A library to support the Open Financial eXchange XML format
 EAPI=5
 HOMEPAGE=http://libofx.sourceforge.net/
 IUSE=static-libs test
-KEYWORDS=amd64 hppa ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/opensp-1.5 dev-cpp/libxmlpp:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
 SLOT=0
 SRC_URI=mirror://sourceforge/libofx/libofx-0.9.10.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d740d58ec97910ef9f84a4a4861bb675
+_md5_=251c0901f5566874e88addec795f5a1f
diff --git a/metadata/md5-cache/dev-libs/libofx-0.9.14 b/metadata/md5-cache/dev-libs/libofx-0.9.14
index fda2ecf494f9..8fabbc9c4daa 100644
--- a/metadata/md5-cache/dev-libs/libofx-0.9.14
+++ b/metadata/md5-cache/dev-libs/libofx-0.9.14
@@ -5,10 +5,10 @@ DESCRIPTION=A library to support the Open Financial eXchange XML format
 EAPI=7
 HOMEPAGE=https://github.com/libofx/libofx
 IUSE=static-libs test
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-misc/curl-7.9.7 virtual/libiconv
-SLOT=0
+SLOT=0/7
 SRC_URI=https://github.com/libofx/libofx/archive/0.9.14.tar.gz -> libofx-0.9.14.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a6dda142cdca784314ae6ea1739cfbd8
+_md5_=b044587d835ade5a614d3041bd659ef9
diff --git a/metadata/md5-cache/dev-libs/libofx-0.9.14-r1 b/metadata/md5-cache/dev-libs/libofx-0.9.14-r1
new file mode 100644
index 000000000000..706287985fea
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libofx-0.9.14-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gengetopt sys-apps/help2man virtual/pkgconfig test? ( app-crypt/gnupg ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv >app-text/opensp-1.5
+DESCRIPTION=A library to support the Open Financial eXchange XML format
+EAPI=7
+HOMEPAGE=https://github.com/libofx/libofx
+IUSE=static-libs test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
+SLOT=0/7
+SRC_URI=https://github.com/libofx/libofx/archive/0.9.14.tar.gz -> libofx-0.9.14.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e5c8a49bf12dd36f74491475bf72c54e
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-3.0.0 b/metadata/md5-cache/dev-libs/libpreludedb-3.0.0
deleted file mode 100644
index b230c88c5143..000000000000
--- a/metadata/md5-cache/dev-libs/libpreludedb-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls dev-libs/libprelude python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) doc? ( dev-util/gtk-doc ) sys-devel/flex virtual/yacc >=dev-lang/swig-3.0.7 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=Framework to easy access to the Prelude database
-EAPI=6
-HOMEPAGE=https://www.prelude-siem.org
-IUSE=doc python mysql postgres sqlite python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls dev-libs/libprelude python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 ) )
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/3.0.0/libpreludedb-3.0.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=de89492976778bd32ce582893f85ea23
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-3.0.0-r1 b/metadata/md5-cache/dev-libs/libpreludedb-3.0.0-r1
new file mode 100644
index 000000000000..a45983ed7376
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpreludedb-3.0.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls dev-libs/libprelude python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) doc? ( dev-util/gtk-doc ) sys-devel/flex virtual/yacc >=dev-lang/swig-3.0.7 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=Framework to easy access to the Prelude database
+EAPI=6
+HOMEPAGE=https://www.prelude-siem.org
+IUSE=doc python mysql postgres sqlite python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls dev-libs/libprelude python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 ) )
+SLOT=0
+SRC_URI=https://www.prelude-siem.org/pkg/src/3.0.0/libpreludedb-3.0.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2b02d40b9b0f3d555ec5ab7d3913b916
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-3.1.0 b/metadata/md5-cache/dev-libs/libpreludedb-3.1.0
deleted file mode 100644
index fba1fcbba30a..000000000000
--- a/metadata/md5-cache/dev-libs/libpreludedb-3.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= ~dev-libs/libprelude-3.1.0 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) doc? ( dev-util/gtk-doc ) sys-devel/flex virtual/yacc >=dev-lang/swig-3.0.7 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=Framework to easy access to the Prelude database
-EAPI=6
-HOMEPAGE=https://www.prelude-siem.org
-IUSE=doc python mysql postgres sqlite python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= ~dev-libs/libprelude-3.1.0 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 ) )
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/3.1.0/libpreludedb-3.1.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1ac2a0f3f39e9108ed2604fb472353d5
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-3.1.0-r1 b/metadata/md5-cache/dev-libs/libpreludedb-3.1.0-r1
new file mode 100644
index 000000000000..91ce8062ac81
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpreludedb-3.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= ~dev-libs/libprelude-3.1.0 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) doc? ( dev-util/gtk-doc ) sys-devel/flex virtual/yacc >=dev-lang/swig-3.0.7 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=Framework to easy access to the Prelude database
+EAPI=6
+HOMEPAGE=https://www.prelude-siem.org
+IUSE=doc python mysql postgres sqlite python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= ~dev-libs/libprelude-3.1.0 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 ) )
+SLOT=0
+SRC_URI=https://www.prelude-siem.org/pkg/src/3.1.0/libpreludedb-3.1.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=29cdcb3b14ab7871c7c904145511f25c
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-4.0.0 b/metadata/md5-cache/dev-libs/libpreludedb-4.0.0
deleted file mode 100644
index 9c43c0566a93..000000000000
--- a/metadata/md5-cache/dev-libs/libpreludedb-4.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=~dev-libs/libprelude-4.0.0 net-libs/gnutls:= mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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(-)] ) sqlite? ( dev-db/sqlite:3 ) >=dev-lang/swig-3.0.7 dev-util/gtk-doc-am sys-devel/flex virtual/pkgconfig virtual/yacc >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Framework to easy access to the Prelude database
-EAPI=6
-HOMEPAGE=https://www.prelude-siem.org
-IUSE=mysql postgres python sqlite python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=~dev-libs/libprelude-4.0.0 net-libs/gnutls:= mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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(-)] ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/4.0.0/libpreludedb-4.0.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	9838160d624a44b2d56d1266a69fd473	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42e1d73f5332eb9762187d55030121f6
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-4.0.0-r1 b/metadata/md5-cache/dev-libs/libpreludedb-4.0.0-r1
new file mode 100644
index 000000000000..f3e625e80aa5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpreludedb-4.0.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=~dev-libs/libprelude-4.0.0 net-libs/gnutls:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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(-)] ) sqlite? ( dev-db/sqlite:3 ) >=dev-lang/swig-3.0.7 dev-util/gtk-doc-am sys-devel/flex virtual/pkgconfig virtual/yacc >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Framework to easy access to the Prelude database
+EAPI=6
+HOMEPAGE=https://www.prelude-siem.org
+IUSE=mysql postgres python sqlite python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=~dev-libs/libprelude-4.0.0 net-libs/gnutls:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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(-)] ) sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://www.prelude-siem.org/pkg/src/4.0.0/libpreludedb-4.0.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	9838160d624a44b2d56d1266a69fd473	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a13d578bbf23c0cb28d1c4331027d845
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-4.1.0 b/metadata/md5-cache/dev-libs/libpreludedb-4.1.0
deleted file mode 100644
index 46c8a8c5a587..000000000000
--- a/metadata/md5-cache/dev-libs/libpreludedb-4.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=~dev-libs/libprelude-4.1.0 net-libs/gnutls:= mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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(-)] ) sqlite? ( dev-db/sqlite:3 ) >=dev-lang/swig-3.0.11 dev-util/gtk-doc-am sys-devel/flex virtual/pkgconfig virtual/yacc >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Framework to easy access to the Prelude database
-EAPI=6
-HOMEPAGE=https://www.prelude-siem.org
-IUSE=mysql postgres python sqlite python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=~dev-libs/libprelude-4.1.0 net-libs/gnutls:= mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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(-)] ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://www.prelude-siem.org/pkg/src/4.1.0/libpreludedb-4.1.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	9838160d624a44b2d56d1266a69fd473	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=98920b7ea190cdea1c0320f48c5d1c47
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-4.1.0-r1 b/metadata/md5-cache/dev-libs/libpreludedb-4.1.0-r1
new file mode 100644
index 000000000000..45ec302b0d08
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpreludedb-4.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=~dev-libs/libprelude-4.1.0 net-libs/gnutls:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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(-)] ) sqlite? ( dev-db/sqlite:3 ) >=dev-lang/swig-3.0.11 dev-util/gtk-doc-am sys-devel/flex virtual/pkgconfig virtual/yacc >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Framework to easy access to the Prelude database
+EAPI=6
+HOMEPAGE=https://www.prelude-siem.org
+IUSE=mysql postgres python sqlite python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=~dev-libs/libprelude-4.1.0 net-libs/gnutls:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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(-)] ) sqlite? ( dev-db/sqlite:3 )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://www.prelude-siem.org/pkg/src/4.1.0/libpreludedb-4.1.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	9838160d624a44b2d56d1266a69fd473	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1cb2c75f3a790660c075eda3ccdf9005
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.9 b/metadata/md5-cache/dev-libs/libratbag-0.9
index 0e187b0f8632..beb883875de2 100644
--- a/metadata/md5-cache/dev-libs/libratbag-0.9
+++ b/metadata/md5-cache/dev-libs/libratbag-0.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libevdev virtual/libudev
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.9.tar.gz -> libratbag-0.9.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=44850f6152995a59cceb90d025aaa2c5
diff --git a/metadata/md5-cache/dev-libs/libsass-3.6.1 b/metadata/md5-cache/dev-libs/libsass-3.6.1
new file mode 100644
index 000000000000..3e6987c541b5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libsass-3.6.1
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A C/C++ implementation of a Sass CSS compiler
+EAPI=7
+HOMEPAGE=https://github.com/sass/libsass
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT
+SLOT=0/1
+SRC_URI=https://github.com/sass/libsass/archive/3.6.1.tar.gz -> libsass-3.6.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=dee64203a728fd5c11a68203367c402c
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.2.0 b/metadata/md5-cache/dev-libs/libsavitar-4.2.0
new file mode 100644
index 000000000000..d49366385d2c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libsavitar-4.2.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/pugixml dev-python/sip[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
+EAPI=7
+HOMEPAGE=https://github.com/Ultimaker/libSavitar
+IUSE=+python static-libs python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/pugixml dev-python/sip[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0/3
+SRC_URI=https://github.com/Ultimaker/libSavitar/archive/4.2.0.tar.gz -> libsavitar-4.2.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b243ba8dea8d985bdb2b39cbb00f5f29
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.14 b/metadata/md5-cache/dev-libs/libtasn1-4.14
new file mode 100644
index 000000000000..3bb22b316598
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.14
@@ -0,0 +1,12 @@
+BDEPEND=sys-apps/help2man virtual/yacc test? ( valgrind? ( dev-util/valgrind ) ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=ASN.1 library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libtasn1/
+IUSE=doc static-libs test valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3 LGPL-2.1
+SLOT=0/6
+SRC_URI=mirror://gnu/libtasn1/libtasn1-4.14.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=bee0d65efd6ac098c189479af51de3d7
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.23 b/metadata/md5-cache/dev-libs/libusb-1.0.23
new file mode 100644
index 000000000000..fa7cda32898d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.23
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) doc? ( app-doc/doxygen ) !udev? ( virtual/os-headers )
+DESCRIPTION=Userspace access to USB devices
+EAPI=7
+HOMEPAGE=https://libusb.info/ https://github.com/libusb/libusb
+IUSE=debug doc examples static-libs test udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1
+RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] )
+SLOT=1
+SRC_URI=https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.tar.bz2
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=6dfcebe97acc2131646a3a4c15d62209
diff --git a/metadata/md5-cache/dev-libs/libvarlink-16 b/metadata/md5-cache/dev-libs/libvarlink-16
index 046e5f895009..e9cc7a7e4af2 100644
--- a/metadata/md5-cache/dev-libs/libvarlink-16
+++ b/metadata/md5-cache/dev-libs/libvarlink-16
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/varlink/libvarlink/archive/16.tar.gz -> libvarlink-16.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=34baba02f809adce677a03829d3bf935
diff --git a/metadata/md5-cache/dev-libs/libwacom-0.33 b/metadata/md5-cache/dev-libs/libwacom-0.33
index 09f331695b92..b40d1ab8bac7 100644
--- a/metadata/md5-cache/dev-libs/libwacom-0.33
+++ b/metadata/md5-cache/dev-libs/libwacom-0.33
@@ -5,10 +5,10 @@ DESCRIPTION=Library for identifying Wacom tablets and their model-specific featu
 EAPI=7
 HOMEPAGE=https://github.com/linuxwacom/libwacom
 IUSE=doc static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 virtual/libgudev:=
 SLOT=0
 SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-0.33/libwacom-0.33.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=d438c0e4f0b9969b43a6d2e9fcde3f48
+_md5_=4ed07f98341cd2b8d20b6333f18a4a3c
diff --git a/metadata/md5-cache/dev-libs/libwacom-1.0 b/metadata/md5-cache/dev-libs/libwacom-1.0
new file mode 100644
index 000000000000..bedc5bba98c8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libwacom-1.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 virtual/libgudev:=
+DESCRIPTION=Library for identifying Wacom tablets and their model-specific features
+EAPI=7
+HOMEPAGE=https://github.com/linuxwacom/libwacom
+IUSE=doc static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 virtual/libgudev:=
+SLOT=0
+SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.0/libwacom-1.0.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=d4a3b0bd28e830208cf3f5824eedfc78
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.1.10 b/metadata/md5-cache/dev-libs/libxmlb-0.1.10
index e6a1d8c36c7b..786b77e36483 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.1.10
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.1.10
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libxmlb/archive/0.1.10.tar.gz -> libxmlb-0.1.10.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=1115e4afaf382d9b1ee930602b2b1102
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.1.11 b/metadata/md5-cache/dev-libs/libxmlb-0.1.11
index 0ab652fae0a9..1758c973cef2 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.1.11
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.1.11
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libxmlb/archive/0.1.11.tar.gz -> libxmlb-0.1.11.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=1115e4afaf382d9b1ee930602b2b1102
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.1.8 b/metadata/md5-cache/dev-libs/libxmlb-0.1.8
index c28f6ae9885d..c2c8298c8b81 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.1.8
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.1.8
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer )
 SLOT=0
 SRC_URI=https://github.com/hughsie/libxmlb/archive/0.1.8.tar.gz -> libxmlb-0.1.8.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=7d32ebbd9abaf28d7a17179bac5a3168
diff --git a/metadata/md5-cache/dev-libs/libyaml-0.1.7 b/metadata/md5-cache/dev-libs/libyaml-0.1.7
deleted file mode 100644
index d6e80e899340..000000000000
--- a/metadata/md5-cache/dev-libs/libyaml-0.1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170815
-DESCRIPTION=YAML 1.1 parser and emitter written in C
-EAPI=6
-HOMEPAGE=http://pyyaml.org/wiki/LibYAML
-IUSE=doc examples test 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://pyyaml.org/download/libyaml/yaml-0.1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=acf118b17c6a21e05840ea8f55819ceb
diff --git a/metadata/md5-cache/dev-libs/libyaml-0.1.7-r1 b/metadata/md5-cache/dev-libs/libyaml-0.1.7-r1
deleted file mode 100644
index a51663df6647..000000000000
--- a/metadata/md5-cache/dev-libs/libyaml-0.1.7-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170815
-DESCRIPTION=YAML 1.1 parser and emitter written in C
-EAPI=6
-HOMEPAGE=http://pyyaml.org/wiki/LibYAML
-IUSE=doc 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://pyyaml.org/download/libyaml/yaml-0.1.7.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=bb60790ef02b348944f6d8006916a0e1
diff --git a/metadata/md5-cache/dev-libs/libyaml-0.2.1 b/metadata/md5-cache/dev-libs/libyaml-0.2.1
deleted file mode 100644
index cf92d3af424d..000000000000
--- a/metadata/md5-cache/dev-libs/libyaml-0.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170815
-DESCRIPTION=YAML 1.1 parser and emitter written in C
-EAPI=6
-HOMEPAGE=https://github.com/yaml/libyaml
-IUSE=doc 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/yaml/libyaml/archive/dist-0.2.1.tar.gz -> libyaml-0.2.1.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=50b6b3a20f17b67709877160136374f3
diff --git a/metadata/md5-cache/dev-libs/libyaml-0.2.2 b/metadata/md5-cache/dev-libs/libyaml-0.2.2
index 4111c3c71e60..cb5ab7f1eb8b 100644
--- a/metadata/md5-cache/dev-libs/libyaml-0.2.2
+++ b/metadata/md5-cache/dev-libs/libyaml-0.2.2
@@ -5,9 +5,9 @@ DESCRIPTION=YAML 1.1 parser and emitter written in C
 EAPI=7
 HOMEPAGE=https://github.com/yaml/libyaml
 IUSE=doc static-libs test
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/yaml/libyaml/archive/0.2.2.tar.gz -> libyaml-0.2.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2e7f96e201fe7dee98955db3304f8f90
+_md5_=8229403c680e32bb88fa216d9fd82a94
diff --git a/metadata/md5-cache/dev-libs/libzia-4.14 b/metadata/md5-cache/dev-libs/libzia-4.14
deleted file mode 100644
index 9fb41f38691a..000000000000
--- a/metadata/md5-cache/dev-libs/libzia-4.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi: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
-DESCRIPTION=platform abstraction code for tucnak package
-EAPI=6
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=ftdi
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:0 )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/libzia-4.14.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c051d1289a9c89f7185dbecd8bc059e4
diff --git a/metadata/md5-cache/dev-libs/libzia-4.15 b/metadata/md5-cache/dev-libs/libzia-4.15
deleted file mode 100644
index 517c052d0a15..000000000000
--- a/metadata/md5-cache/dev-libs/libzia-4.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi: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
-DESCRIPTION=platform abstraction code for tucnak package
-EAPI=6
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=ftdi
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:0 )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/libzia-4.15.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=103707e9c13095340630d0c890251474
diff --git a/metadata/md5-cache/dev-libs/libzia-4.16 b/metadata/md5-cache/dev-libs/libzia-4.16
index cf83df361cc1..63fb904a23b5 100644
--- a/metadata/md5-cache/dev-libs/libzia-4.16
+++ b/metadata/md5-cache/dev-libs/libzia-4.16
@@ -4,10 +4,10 @@ DESCRIPTION=platform abstraction code for tucnak package
 EAPI=6
 HOMEPAGE=http://tucnak.nagano.cz
 IUSE=ftdi
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:0 )
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/libzia-4.16.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7c28f27675841b862e05cf4f79b7c577
+_md5_=103707e9c13095340630d0c890251474
diff --git a/metadata/md5-cache/dev-libs/libzia-4.17 b/metadata/md5-cache/dev-libs/libzia-4.17
new file mode 100644
index 000000000000..2f2d0d480450
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzia-4.17
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi: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
+DESCRIPTION=platform abstraction code for tucnak package
+EAPI=6
+HOMEPAGE=http://tucnak.nagano.cz
+IUSE=ftdi
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:0 )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/libzia-4.17.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=7c28f27675841b862e05cf4f79b7c577
diff --git a/metadata/md5-cache/dev-libs/marisa-0.2.4 b/metadata/md5-cache/dev-libs/marisa-0.2.4
index 2ae49104aaf3..217572cc317e 100644
--- a/metadata/md5-cache/dev-libs/marisa-0.2.4
+++ b/metadata/md5-cache/dev-libs/marisa-0.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=Matching Algorithm with Recursively Implemented StorAge
 EAPI=5
 HOMEPAGE=https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/
 IUSE=python doc static-libs cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_sse4a cpu_flags_x86_popcnt python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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=cpu_flags_x86_popcnt? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse4a? ( cpu_flags_x86_popcnt cpu_flags_x86_sse3 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_popcnt cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://marisa-trie.googlecode.com/files/marisa-0.2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=986ceeb43953c3ee9a9c5053f32060f4
+_md5_=74cb4fa925a6b608acfe8d1588309cf5
diff --git a/metadata/md5-cache/dev-libs/nspr-4.22 b/metadata/md5-cache/dev-libs/nspr-4.22
new file mode 100644
index 000000000000..e4c976468bc1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nspr-4.22
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Netscape Portable Runtime
+EAPI=7
+HOMEPAGE=http://www.mozilla.org/projects/nspr/
+IUSE=debug elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.22/src/nspr-4.22.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0f8481694f6faf07406c72066e3b8a4f
diff --git a/metadata/md5-cache/dev-libs/nss-3.45 b/metadata/md5-cache/dev-libs/nss-3.45
deleted file mode 100644
index 04d02d8d2490..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.45
+++ /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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_45_RTM/src/nss-3.45.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	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d73bb1037f547cbea93db5d753fc4113
diff --git a/metadata/md5-cache/dev-libs/nss-3.46 b/metadata/md5-cache/dev-libs/nss-3.46
new file mode 100644
index 000000000000..0a04044c8070
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nss-3.46
@@ -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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nspr-4.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+RDEPEND=>=dev-libs/nspr-4.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_46_RTM/src/nss-3.46.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	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=6a6f2b948494614caf25f5d608e67761
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.9.3 b/metadata/md5-cache/dev-libs/oniguruma-6.9.3
index b8505584ba36..ae33b30c7908 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-6.9.3
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.9.3
@@ -3,9 +3,9 @@ DESCRIPTION=Regular expression library for different character encodings
 EAPI=7
 HOMEPAGE=https://github.com/kkos/oniguruma
 IUSE=crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
 SLOT=0/5
 SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.9.3/onig-6.9.3.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=af054dce93653fb07e37b966dc511c8a
+_md5_=b282c1f6798dda4e001d96d5201c57eb
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2s b/metadata/md5-cache/dev-libs/openssl-1.0.2s
deleted file mode 100644
index 681ef60d5cc9..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2s
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=6
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=mirror://openssl/source/openssl-1.0.2s.tar.gz !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2s_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2s_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2s_ectest.c )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b54ea3fa2cc25ef7af324eec5c1d8a82
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2s-r1 b/metadata/md5-cache/dev-libs/openssl-1.0.2s-r1
new file mode 100644
index 000000000000..627e305ae29e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2s-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=mirror://openssl/source/openssl-1.0.2s.tar.gz !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2s_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2s_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2s_ectest.c )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9781c967aeccec1522f978b55ec199f5
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2s-r200 b/metadata/md5-cache/dev-libs/openssl-1.0.2s-r200
deleted file mode 100644
index d5b3bd69b197..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2s-r200
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !=dev-libs/openssl-1.0.2*:0 >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=6
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
-LICENSE=openssl
-RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !=dev-libs/openssl-1.0.2*:0
-RESTRICT=test
-SLOT=1.0.0
-SRC_URI=mirror://openssl/source/openssl-1.0.2s.tar.gz !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2s_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2s_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2s_ectest.c )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9f5d5f2d59872a2f4c47b9c2e5e2e596
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.0j-r1 b/metadata/md5-cache/dev-libs/openssl-1.1.0j-r1
deleted file mode 100644
index c9a4ab143074..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.0j-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=6
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!bindist? ( bindist )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.0j.tar.gz bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_ectest.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.0-build.patch?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0-build_d2ede125556ac99aa0faa7744c703af3f559094e.patch https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.0-ec-curves.patch?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0-ec-curves_d2ede125556ac99aa0faa7744c703af3f559094e.patch )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66dc2e1688a753015ee95c9816b644a3
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.0k b/metadata/md5-cache/dev-libs/openssl-1.1.0k
deleted file mode 100644
index c176a3d73c28..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.0k
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=6
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!bindist? ( bindist )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.0k.tar.gz bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0k_d2ede125556ac99aa0faa7744c703af3f559094e_ectest.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.0-build.patch?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0-build_d2ede125556ac99aa0faa7744c703af3f559094e.patch https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.0-ec-curves.patch?h=f28&id=d2ede125556ac99aa0faa7744c703af3f559094e -> openssl-1.1.0-ec-curves_d2ede125556ac99aa0faa7744c703af3f559094e.patch )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=baa5a14fb15711dbad0ce5f08749aee4
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.0k-r1 b/metadata/md5-cache/dev-libs/openssl-1.1.0k-r1
new file mode 100644
index 000000000000..fdd8bf111946
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.0k-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.0k.tar.gz bindist? ( https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.1.0k-bindist-1.0.tar.xz )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=5070308ca490220e6112d567edf37e50
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1b-r2 b/metadata/md5-cache/dev-libs/openssl-1.1.1b-r2
deleted file mode 100644
index 72a11a86f3c5..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1b-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=6
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!bindist? ( bindist )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1b.tar.gz bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f29 -> openssl-1.1.1b_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f29 -> openssl-1.1.1b_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f29 -> openssl-1.1.1b_ectest.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.1-ec-curves.patch?h=f29 -> openssl-1.1.1-ec-curves.patch )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=49c8a50b31cc52f21e9a8cceaeb588b6
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1c b/metadata/md5-cache/dev-libs/openssl-1.1.1c
deleted file mode 100644
index e5ca149bb244..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1c
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=7
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!bindist? ( bindist )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1c.tar.gz bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f29 -> openssl-1.1.1c_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f29 -> openssl-1.1.1c_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f29 -> openssl-1.1.1c_ectest.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.1-ec-curves.patch?h=f29 -> openssl-1.1.1-ec-curves.patch )
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=667116b833897db9ecbadb599282a8d9
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1c-r1 b/metadata/md5-cache/dev-libs/openssl-1.1.1c-r1
new file mode 100644
index 000000000000..c5a108623ce5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1c-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.1c.tar.gz bindist? ( https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.1.1c-bindist-1.0.tar.xz )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=3e9a3472bb2d042611d0a8aa70e86779
diff --git a/metadata/md5-cache/dev-libs/openssl-compat-1.0.2s b/metadata/md5-cache/dev-libs/openssl-compat-1.0.2s
new file mode 100644
index 000000000000..b27bc525035d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-compat-1.0.2s
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !=dev-libs/openssl-1.0.2*:0
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=openssl
+RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !=dev-libs/openssl-1.0.2*:0
+RESTRICT=test
+SLOT=1.0.0
+SRC_URI=mirror://openssl/source/openssl-1.0.2s.tar.gz !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2s_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2s_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2s_ectest.c )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9716715ead6a8127090bc148a121ce1b
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.8.0 b/metadata/md5-cache/dev-libs/protobuf-3.8.0
index 0e7e3e28f35d..78e5bf94e6fc 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.8.0
+++ b/metadata/md5-cache/dev-libs/protobuf-3.8.0
@@ -5,11 +5,11 @@ DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing str
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=emacs? ( virtual/emacs ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz -> protobuf-3.8.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=51df91ebc47b6270d9b3b9f679e18bed
+_md5_=cace988459772b8fb446caceea1dea34
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.2 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.2
new file mode 100644
index 000000000000..89fcf4dba89b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.3.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/protobuf:0 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/protobuf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Protocol Buffers implementation in C
+EAPI=7
+HOMEPAGE=https://github.com/protobuf-c/protobuf-c
+IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=dev-libs/protobuf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/1.0.0
+SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.2/protobuf-c-1.3.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f63130c0ea395ae6f6e24b2d5a33fe59
diff --git a/metadata/md5-cache/dev-libs/re2-0.2019.08.01 b/metadata/md5-cache/dev-libs/re2-0.2019.08.01
new file mode 100644
index 000000000000..7abaef5e4aec
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/re2-0.2019.08.01
@@ -0,0 +1,14 @@
+BDEPEND=icu? ( virtual/pkgconfig )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=An efficient, principled regular expression library
+EAPI=7
+HOMEPAGE=https://github.com/google/re2
+IUSE=icu abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/gentoo-2019-01-01
+SRC_URI=https://github.com/google/re2/archive/2019-08-01.tar.gz -> re2-2019-08-01.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=2dfec918243c6d87ef2cfb374a5a452c
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.7.0 b/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.7.0
index b5ca76b28c93..d52ec6f92940 100644
--- a/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.7.0
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-driver-2.7.0
@@ -11,4 +11,4 @@ RDEPEND=>=sys-devel/llvm-roc-2.7.0:= >=dev-libs/rocr-runtime-2.7.0
 SLOT=0/2.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-2.7.0.tar.gz -> rocm-opencl-driver-2.7.0.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a944331e2c6789edf6bfcbd69755d0c1
+_md5_=fc7303c36cb2736ad92faecb1fc58585
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-2.7.0 b/metadata/md5-cache/dev-libs/rocr-runtime-2.7.0
index 1725594014ee..d1f2d1f68e7d 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-2.7.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-2.7.0
@@ -4,10 +4,11 @@ DEPEND=sys-process/numactl >=dev-libs/roct-thunk-interface-2.7.0
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+IUSE=nonfree
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=sys-process/numactl
+RDEPEND=sys-process/numactl nonfree? ( dev-libs/hsa-ext-rocr )
 SLOT=0/2.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-2.7.0.tar.gz -> rocr-runtime-2.7.0.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9382253461de32b781ccef4067966003
+_md5_=bf45285107933f0b9aabc995724c5d7d
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-9999 b/metadata/md5-cache/dev-libs/rocr-runtime-9999
index 760f8fc68cca..96d0ae0e43d7 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-9999
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-9999
@@ -1,12 +1,13 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-process/numactl dev-libs/roct-thunk-interface
+DEPEND=sys-process/numactl >=dev-libs/roct-thunk-interface-9999
 DESCRIPTION=Radeon Open Compute Runtime
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCR-Runtime
+IUSE=nonfree
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=sys-process/numactl
+RDEPEND=sys-process/numactl nonfree? ( dev-libs/hsa-ext-rocr )
 SLOT=0/9999
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0684db1188a899f8f24110b64d5ece7c
+_md5_=d26c762e9f4ec86f4002ceee2266382c
diff --git a/metadata/md5-cache/dev-libs/template-glib-3.32.0 b/metadata/md5-cache/dev-libs/template-glib-3.32.0
index cb51515f3cef..a2c03887abc1 100644
--- a/metadata/md5-cache/dev-libs/template-glib-3.32.0
+++ b/metadata/md5-cache/dev-libs/template-glib-3.32.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:=
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/template-glib/3.32/template-glib-3.32.0.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f18a5ab49283b0d4fc09364402978cd7
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-7.1.0 b/metadata/md5-cache/dev-libs/tinyxml2-7.1.0
new file mode 100644
index 000000000000..6af943d5d971
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tinyxml2-7.1.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A simple, small, efficient, C++ XML parser
+EAPI=7
+HOMEPAGE=http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+LICENSE=ZLIB
+RESTRICT=!test? ( test )
+SLOT=0/7
+SRC_URI=https://github.com/leethomason/tinyxml2/archive/7.1.0.tar.gz -> tinyxml2-7.1.0.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8eeafcc03712d332bebfaeb9519d3ce8
diff --git a/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.3 b/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.3
index 471bc8e7740c..99c1e6eef24f 100644
--- a/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.3
+++ b/metadata/md5-cache/dev-libs/totem-pl-parser-3.26.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 quvi? ( >=media-libs/libquvi-0.9.1:0= ) archive? ( >=app-arch/libarchive-3:0= ) dev-libs/libxml2:2 crypt? ( dev-libs/libgcrypt:0= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 SLOT=0/18
 SRC_URI=mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.3.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85d1cb7afcf50a65392705fd033511dc
diff --git a/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.4 b/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.4
new file mode 100644
index 000000000000..b61fdd19094a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=URDF (U-Robot Description Format) headers
+EAPI=5
+HOMEPAGE=http://ros.org/wiki/urdf
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/ros/urdfdom_headers/archive/1.0.4.tar.gz -> urdfdom_headers-1.0.4.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3c9efd7c44ae058e2c579c7251a32dfc
diff --git a/metadata/md5-cache/dev-libs/utfcpp-3.1 b/metadata/md5-cache/dev-libs/utfcpp-3.1
index 121d5a9be96f..2a6998e48706 100644
--- a/metadata/md5-cache/dev-libs/utfcpp-3.1
+++ b/metadata/md5-cache/dev-libs/utfcpp-3.1
@@ -5,10 +5,10 @@ DESCRIPTION=UTF-8 C++ library
 EAPI=7
 HOMEPAGE=https://github.com/nemtrif/utfcpp
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nemtrif/utfcpp/archive/v3.1.tar.gz -> utfcpp-3.1.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a5995559bc7e5ae6c437576432f95b37
+_md5_=a9523254a1bb33c79ff2e855d9bc2b0e
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.45.90 b/metadata/md5-cache/dev-libs/vala-common-0.45.90
deleted file mode 100644
index 584cfd91abeb..000000000000
--- a/metadata/md5-cache/dev-libs/vala-common-0.45.90
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Build infrastructure for packages that use Vala
-EAPI=7
-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
-LICENSE=LGPL-2.1+
-SLOT=0
-SRC_URI=mirror://gnome/sources/vala/0.45/vala-0.45.90.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
-_md5_=7c082ee016416faa8e0120ec0219081d
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.45.91 b/metadata/md5-cache/dev-libs/vala-common-0.45.91
new file mode 100644
index 000000000000..27f7ae156f4a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/vala-common-0.45.91
@@ -0,0 +1,11 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Build infrastructure for packages that use Vala
+EAPI=7
+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
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=mirror://gnome/sources/vala/0.45/vala-0.45.91.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
+_md5_=7c082ee016416faa8e0120ec0219081d
diff --git a/metadata/md5-cache/dev-libs/weston-6.0.1 b/metadata/md5-cache/dev-libs/weston-6.0.1
deleted file mode 100644
index bfd5c8f95672..000000000000
--- a/metadata/md5-cache/dev-libs/weston-6.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.17 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
-DESCRIPTION=Wayland reference compositor
-EAPI=7
-HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
-IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT CC-BY-SA-3.0
-RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.17 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
-REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/weston-6.0.1.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b40b10f27368325238c39081cc44e1a6
diff --git a/metadata/md5-cache/dev-libs/weston-6.0.93 b/metadata/md5-cache/dev-libs/weston-6.0.93
deleted file mode 100644
index 7bd0bbff5024..000000000000
--- a/metadata/md5-cache/dev-libs/weston-6.0.93
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2 ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
-DESCRIPTION=Wayland reference compositor
-EAPI=7
-HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
-IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms pipewire rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT CC-BY-SA-3.0
-RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2 ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
-REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
-SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/wayland/weston/-/archive/6.0.93/weston-6.0.93.tar.bz2
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0298d09a264414df69fbbdd589818b16
diff --git a/metadata/md5-cache/dev-libs/weston-7.0.0 b/metadata/md5-cache/dev-libs/weston-7.0.0
new file mode 100644
index 000000000000..4c1cd9fe3544
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/weston-7.0.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2 ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+DESCRIPTION=Wayland reference compositor
+EAPI=7
+HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
+IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms pipewire rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT CC-BY-SA-3.0
+RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2 ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
+SLOT=0
+SRC_URI=https://wayland.freedesktop.org/releases/weston-7.0.0.tar.xz
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=34d35a1526333f4e29bc027794044150
diff --git a/metadata/md5-cache/dev-libs/weston-9999 b/metadata/md5-cache/dev-libs/weston-9999
index 85ab6b0d4586..b2b76742e6d2 100644
--- a/metadata/md5-cache/dev-libs/weston-9999
+++ b/metadata/md5-cache/dev-libs/weston-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.18 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.2 ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=34d35a1526333f4e29bc027794044150
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.12 b/metadata/md5-cache/dev-libs/xapian-1.4.12
new file mode 100644
index 000000000000..593c743f03c3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=sys-libs/zlib
+DESCRIPTION=Xapian Probabilistic Information Retrieval library
+EAPI=7
+HOMEPAGE=https://www.xapian.org/
+IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +inmemory +remote abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib
+SLOT=0/30
+SRC_URI=https://oligarchy.co.uk/xapian/1.4.12/xapian-core-1.4.12.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=97e3adde8e2102e1b433acb6fc783d2a
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.12 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.12
new file mode 100644
index 000000000000..a6bd942c1c76
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test unpack
+DEPEND=>=dev-libs/xapian-1.4.9:0/30 lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( 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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) virtual/pkgconfig java? ( >=virtual/jdk-1.6 ) 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 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) )
+DESCRIPTION=SWIG and JNI bindings for Xapian
+EAPI=6
+HOMEPAGE=https://www.xapian.org/
+IUSE=java lua mono perl php python ruby tcl elibc_FreeBSD java php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/xapian-1.4.9:0/30 lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( 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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) )
+REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) ) ruby? ( || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ) ) php? ( || ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 ) )
+SLOT=0
+SRC_URI=https://oligarchy.co.uk/xapian/1.4.12/xapian-bindings-1.4.12.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-source-r3	637effc08278f9652b9c14911810c5cf	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=2e2e170bab1dd6f469b3814073ff3354
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index b1975df65dc0..7c299dd24372 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/luv-1.30.1_p0 b/metadata/md5-cache/dev-lua/luv-1.30.1_p0
new file mode 100644
index 000000000000..9752c0476578
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luv-1.30.1_p0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig test? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/libuv:=
+DESCRIPTION=Bare libuv bindings for lua
+EAPI=7
+HOMEPAGE=https://github.com/luvit/luv
+IUSE=luajit test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/libuv:=
+SLOT=0
+SRC_URI=https://github.com/luvit/luv/archive/1.30.1-0.tar.gz -> luv-1.30.1_p0.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/daebe77a2f498817713df37f0bb316db1d82222f.zip -> luv-lua-compat-1.30.1_p0.zip
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5df11cbce9c0f0d53c39ca5a9cb84223
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 8c19649eff4c..ad354d39607a 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/seq-0.1 b/metadata/md5-cache/dev-ml/seq-0.1
index 95f00df3c9f2..8786c3223ab7 100644
--- a/metadata/md5-cache/dev-ml/seq-0.1
+++ b/metadata/md5-cache/dev-ml/seq-0.1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-ml/ocamlbuild
+DEPEND=dev-ml/findlib dev-ml/ocamlbuild
 DESCRIPTION=Compatibility package for the standard OCaml iterator type
 EAPI=7
 HOMEPAGE=https://github.com/c-cube/seq
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-ml/ocamlbuild
+RDEPEND=dev-ml/findlib dev-ml/ocamlbuild
 SLOT=0
 SRC_URI=https://github.com/c-cube/seq/archive/0.1.tar.gz -> seq-0.1.tar.gz
-_md5_=3d6b923cb4d59495e5994f71471ad601
+_md5_=434c39dde90dac3a79d8b7e66062466c
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 535f0aba0619..0c44b05ca049 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
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/DBI dev-perl/Test-Deep virtual/libmysqlclient:= embedded? ( virtual/mysql[embedded] ) dev-lang/perl:=[-build(-)]
+DEPEND=dev-perl/DBI dev-perl/Test-Deep <dev-db/mysql-connector-c-8.0:0= embedded? ( virtual/mysql[embedded] ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=The Perl DBD:mysql Module
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/DBD-mysql
 IUSE=embedded test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/DBI dev-perl/Test-Deep virtual/libmysqlclient:= embedded? ( virtual/mysql[embedded] ) dev-lang/perl:=[-build(-)]
+RDEPEND=dev-perl/DBI dev-perl/Test-Deep <dev-db/mysql-connector-c-8.0:0= 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	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a84eee36d6e507c3ec5d2778c88d54e
+_md5_=df8c378d2cb9934c74e9ba384c868a6f
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.37.0 b/metadata/md5-cache/dev-perl/DBD-mysql-4.37.0
index bdc137b10d5f..6fa73224d946 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.37.0
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.37.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= embedded? ( virtual/mysql[embedded] ) virtual/perl-ExtUtils-MakeMaker virtual/perl-Data-Dumper test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes ) dev-lang/perl
+DEPEND=>=dev-perl/DBI-1.609.0 <dev-db/mysql-connector-c-8.0:0= embedded? ( virtual/mysql[embedded] ) virtual/perl-ExtUtils-MakeMaker virtual/perl-Data-Dumper test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes ) dev-lang/perl
 DESCRIPTION=MySQL driver for the Perl5 Database Interface (DBI)
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/DBD-mysql
 IUSE=embedded test +ssl
 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 ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= embedded? ( virtual/mysql[embedded] ) dev-lang/perl:=
+RDEPEND=>=dev-perl/DBI-1.609.0 <dev-db/mysql-connector-c-8.0:0= embedded? ( virtual/mysql[embedded] ) dev-lang/perl:=
 REQUIRED_USE=?? ( embedded ssl )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/DBD-mysql-4.037.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d208ede57984c2adf8cc0f1e6852cb12
+_md5_=d727d861a2004765c24ec97c014a3f2b
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0 b/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0
index d16d2933fe5f..acbd91cbb1cc 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= embedded? ( virtual/mysql[embedded] ) virtual/perl-ExtUtils-MakeMaker virtual/perl-Data-Dumper test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes ) dev-lang/perl
+DEPEND=>=dev-perl/DBI-1.609.0 <dev-db/mysql-connector-c-8.0:0= embedded? ( virtual/mysql[embedded] ) virtual/perl-ExtUtils-MakeMaker virtual/perl-Data-Dumper test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes ) dev-lang/perl
 DESCRIPTION=MySQL driver for the Perl5 Database Interface (DBI)
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/DBD-mysql
 IUSE=embedded test +ssl
 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 ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= embedded? ( virtual/mysql[embedded] ) dev-lang/perl:=
+RDEPEND=>=dev-perl/DBI-1.609.0 <dev-db/mysql-connector-c-8.0:0= embedded? ( virtual/mysql[embedded] ) dev-lang/perl:=
 REQUIRED_USE=?? ( embedded ssl )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/DBD-mysql-4.041.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ff00e5cedfac7da4821df61ddad79c2
+_md5_=220498515e9c763e16152573626b881b
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0-r2 b/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0-r2
index 72f431d2a4cd..d1647175f106 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0-r2
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.41.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= embedded? ( virtual/mysql[embedded] ) virtual/perl-ExtUtils-MakeMaker virtual/perl-Data-Dumper test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes ) dev-lang/perl
+DEPEND=>=dev-perl/DBI-1.609.0 <dev-db/mysql-connector-c-8.0:0= embedded? ( virtual/mysql[embedded] ) virtual/perl-ExtUtils-MakeMaker virtual/perl-Data-Dumper test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes ) dev-lang/perl
 DESCRIPTION=MySQL driver for the Perl5 Database Interface (DBI)
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/DBD-mysql
 IUSE=embedded test +ssl
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= embedded? ( virtual/mysql[embedded] ) dev-lang/perl:=
+RDEPEND=>=dev-perl/DBI-1.609.0 <dev-db/mysql-connector-c-8.0:0= embedded? ( virtual/mysql[embedded] ) dev-lang/perl:=
 REQUIRED_USE=?? ( embedded ssl )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/DBD-mysql-4.041.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1fd612803731af6f7e04d7c369af1761
+_md5_=a700f1f1cc982c42a136bf02443cadc3
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.42.0 b/metadata/md5-cache/dev-perl/DBD-mysql-4.42.0
index 3beac346f34e..bb34d5db4e50 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.42.0
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.42.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= embedded? ( virtual/mysql[embedded] ) virtual/perl-ExtUtils-MakeMaker virtual/perl-Data-Dumper dev-perl/Devel-CheckLib test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes ) dev-lang/perl
+DEPEND=>=dev-perl/DBI-1.609.0 <dev-db/mysql-connector-c-8.0:0= embedded? ( virtual/mysql[embedded] ) virtual/perl-ExtUtils-MakeMaker virtual/perl-Data-Dumper dev-perl/Devel-CheckLib test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes ) dev-lang/perl
 DESCRIPTION=MySQL driver for the Perl5 Database Interface (DBI)
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/DBD-mysql
 IUSE=embedded test +ssl
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= embedded? ( virtual/mysql[embedded] ) dev-lang/perl:=
+RDEPEND=>=dev-perl/DBI-1.609.0 <dev-db/mysql-connector-c-8.0:0= embedded? ( virtual/mysql[embedded] ) dev-lang/perl:=
 REQUIRED_USE=?? ( embedded ssl )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MICHIELB/DBD-mysql-4.042.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9a5f199e75766c8d0b1821f8b4e00c0a
+_md5_=d035e54f0f5a565ab1976d3c720696fc
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0 b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0
deleted file mode 100644
index 89fec2250347..000000000000
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= virtual/perl-ExtUtils-MakeMaker virtual/perl-Data-Dumper test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes ) dev-lang/perl
-DESCRIPTION=MySQL driver for the Perl5 Database Interface (DBI)
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/DBD-mysql
-IUSE=test +ssl
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/DBI-1.609.0 virtual/libmysqlclient:= dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.044.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=55d33e10c925e4d812224148da657c64
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r1 b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r1
new file mode 100644
index 000000000000..cba80ed9fe44
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/DBI-1.609.0 dev-db/mysql-connector-c:= virtual/perl-ExtUtils-MakeMaker virtual/perl-Data-Dumper test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes ) dev-lang/perl
+DESCRIPTION=MySQL driver for the Perl5 Database Interface (DBI)
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/DBD-mysql
+IUSE=test +ssl
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/DBI-1.609.0 dev-db/mysql-connector-c:= dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.044.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7afeede5e24da57152dd6a8d6d97ee3a
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r2 b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r2
new file mode 100644
index 000000000000..890b0ef7d5cb
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/DBI-1.609.0 mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[ssl(+)?] ) virtual/perl-ExtUtils-MakeMaker virtual/perl-Data-Dumper test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes ) dev-lang/perl
+DESCRIPTION=MySQL driver for the Perl5 Database Interface (DBI)
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/DBD-mysql
+IUSE=mariadb +mysql test +ssl
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/DBI-1.609.0 mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[ssl(+)?] ) dev-lang/perl:=
+REQUIRED_USE=^^ ( mysql mariadb )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.044.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1c9a53a4e1705808df3d6e7b19490266
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0 b/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0
new file mode 100644
index 000000000000..53a905fc0cde
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/DBI-1.609.0 >=dev-perl/Devel-CheckLib-1.109.0 mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[ssl(+)?] ) virtual/perl-ExtUtils-MakeMaker virtual/perl-Data-Dumper test? ( dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 virtual/perl-Time-HiRes ) dev-lang/perl
+DESCRIPTION=MySQL driver for the Perl5 Database Interface (DBI)
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/DBD-mysql
+IUSE=mariadb +mysql test +ssl
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/DBI-1.609.0 >=dev-perl/Devel-CheckLib-1.109.0 mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[ssl(+)?] ) dev-lang/perl:=
+REQUIRED_USE=^^ ( mysql mariadb )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DV/DVEEDEN/DBD-mysql-4.050.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=188ebfa391e717bb2f02855ccda41627
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
deleted file mode 100644
index ab74c06a4a11..000000000000
--- a/metadata/md5-cache/dev-perl/File-Slurp-Unicode-0.7.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/File-Slurp dev-perl/Module-Build dev-lang/perl:=[-build(-)]
-DESCRIPTION=Reading/Writing of Complete Files with Character Encoding Support
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/File-Slurp-Unicode
-KEYWORDS=amd64 ~arm ~x86
-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	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=edf2764159a9565147ac17165ece1683
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index c485713ef045..bed6067f102f 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/Net-Pcap-0.180.0-r1 b/metadata/md5-cache/dev-perl/Net-Pcap-0.180.0-r1
new file mode 100644
index 000000000000..55ee0b19c211
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-Pcap-0.180.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-libs/libpcap dev-perl/IO-Interface dev-lang/perl
+DESCRIPTION=Interface to the pcap(3) LBL packet capture library
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Net-Pcap
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=net-libs/libpcap dev-perl/IO-Interface dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Net-Pcap-0.18.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
+_md5_=d938d46e667bad7403e1865a535ba2ce
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
deleted file mode 100644
index d02c48e4c0e6..000000000000
--- a/metadata/md5-cache/dev-perl/libvorbis-perl-0.50.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/libogg media-libs/libvorbis dev-lang/perl:=[-build(-)]
-DESCRIPTION=Ogg::Vorbis - Perl extension for Ogg Vorbis streams
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/libvorbis-perl
-KEYWORDS=amd64 ia64 ppc sparc x86
-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	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=90dff7d5c33557d4f8ccc9ce2f89ffed
diff --git a/metadata/md5-cache/dev-perl/libvorbis-perl-0.50.0-r2 b/metadata/md5-cache/dev-perl/libvorbis-perl-0.50.0-r2
deleted file mode 100644
index 90fef5bd9b14..000000000000
--- a/metadata/md5-cache/dev-perl/libvorbis-perl-0.50.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libogg media-libs/libvorbis dev-lang/perl
-DESCRIPTION=Ogg::Vorbis - Perl extension for Ogg Vorbis streams
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/libvorbis-perl
-KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=media-libs/libogg media-libs/libvorbis dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FO/FOOF/libvorbis-perl-0.05.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
-_md5_=3a91ac20729f7eff06bd23195456c789
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 2ae1f8fba528..5ff9f56b1dee 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r2 b/metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r2
new file mode 100644
index 000000000000..a8e88ee6509c
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=Database Abstraction Layer
+EAPI=7
+HOMEPAGE=https://pear.php.net/package/MDB2
+IUSE=mssql mysql mysqli oci8 oci8-instant-client postgres sqlite
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+PDEPEND=mssql? ( >=dev-php/PEAR-MDB2_Driver_mssql-1.3.0_beta4 ) mysql? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4 ) mysqli? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4 ) oci8? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 ) oci8-instant-client? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 ) postgres? ( >=dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4 )
+RDEPEND=>=dev-php/PEAR-PEAR-1.9.1 >=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://pear.php.net/get/MDB2-2.5.0b5.tgz
+_eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
+_md5_=584db943c6756e98b0e185921aead80f
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.14 b/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.14
new file mode 100644
index 000000000000..e4dfc174ad16
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=PHP class to communicate with IRC networks
+EAPI=7
+HOMEPAGE=https://pear.php.net/package/Net_SmartIRC
+IUSE=doc examples
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://pear.php.net/get/Net_SmartIRC-1.1.14.tgz
+_eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
+_md5_=4140301a09bd8bd3da832a4ffab662ac
diff --git a/metadata/md5-cache/dev-php/ming-php-0.4.8 b/metadata/md5-cache/dev-php/ming-php-0.4.8
deleted file mode 100644
index 51c3a9e97cca..000000000000
--- a/metadata/md5-cache/dev-php/ming-php-0.4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/ming >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
-DESCRIPTION=PHP extension for the ming Flash movie generation library
-EAPI=6
-HOMEPAGE=http://ming.sourceforge.net/
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=media-libs/ming php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
-SLOT=0
-SRC_URI=https://github.com/libming/libming/archive/ming-0_4_8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-source-r3	637effc08278f9652b9c14911810c5cf	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=def16a50925a01a95f72c2f0e0b91613
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-5.1.12 b/metadata/md5-cache/dev-php/pecl-apcu-5.1.12
index a452f102f672..9dcc5a5307ce 100644
--- a/metadata/md5-cache/dev-php/pecl-apcu-5.1.12
+++ b/metadata/md5-cache/dev-php/pecl-apcu-5.1.12
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore
 SLOT=7
 SRC_URI=https://pecl.php.net/get/apcu-5.1.12.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	637effc08278f9652b9c14911810c5cf	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7bb1d758462ece03e6e31ce95b9c314f
+_md5_=b7ab395ab311d2a83af4b203363e89c2
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-5.1.17 b/metadata/md5-cache/dev-php/pecl-apcu-5.1.17
index 65f7f16a3f05..103495507e8d 100644
--- a/metadata/md5-cache/dev-php/pecl-apcu-5.1.17
+++ b/metadata/md5-cache/dev-php/pecl-apcu-5.1.17
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore
 SLOT=7
 SRC_URI=https://pecl.php.net/get/apcu-5.1.17.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	637effc08278f9652b9c14911810c5cf	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=156ff33fb7a11c7d862b512b1cab32e2
+_md5_=5bfd071310a52c70a3cd483482669463
diff --git a/metadata/md5-cache/dev-php/pecl-radius-1.3.0-r1 b/metadata/md5-cache/dev-php/pecl-radius-1.3.0-r1
deleted file mode 100644
index be8258d163c4..000000000000
--- a/metadata/md5-cache/dev-php/pecl-radius-1.3.0-r1
+++ /dev/null
@@ -1,14 +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 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)
-EAPI=6
-HOMEPAGE=https://pecl.php.net/radius
-IUSE=examples php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[pcntl,sockets] ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/radius-1.3.0.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	637effc08278f9652b9c14911810c5cf	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=5627c8fbf89a1b68d042462482b6ad84
diff --git a/metadata/md5-cache/dev-php/pecl-yaz-1.2.3 b/metadata/md5-cache/dev-php/pecl-yaz-1.2.3
index 0f1781b29920..1aa3a22f95ed 100644
--- a/metadata/md5-cache/dev-php/pecl-yaz-1.2.3
+++ b/metadata/md5-cache/dev-php/pecl-yaz-1.2.3
@@ -4,7 +4,7 @@ DESCRIPTION=This extension implements a Z39.50 client for PHP using the YAZ tool
 EAPI=6
 HOMEPAGE=https://pecl.php.net/yaz
 IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/yaz-1.2.3.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	637effc08278f9652b9c14911810c5cf	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f155936cf0f3c2ec61fb92c93d4b46f8
+_md5_=96db350c75ab5d1b38c86f429ebcac07
diff --git a/metadata/md5-cache/dev-php/twig-1.40.1 b/metadata/md5-cache/dev-php/twig-1.40.1
deleted file mode 100644
index 2f9a86609073..000000000000
--- a/metadata/md5-cache/dev-php/twig-1.40.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-php/phpunit ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool extension? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
-DESCRIPTION=PHP templating engine with syntax similar to Django
-EAPI=6
-HOMEPAGE=http://twig.sensiolabs.org/
-IUSE=doc extension test php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php extension? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
-REQUIRED_USE=extension? ( || ( php_targets_php5-6 ) )
-SLOT=0
-SRC_URI=https://github.com/twigphp/Twig/archive/v1.40.1.tar.gz -> twig-1.40.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-source-r3	637effc08278f9652b9c14911810c5cf	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eae2fea32c389bbfb42459c9faff84b9
diff --git a/metadata/md5-cache/dev-php/twig-1.42.2 b/metadata/md5-cache/dev-php/twig-1.42.2
deleted file mode 100644
index 881e46a8090a..000000000000
--- a/metadata/md5-cache/dev-php/twig-1.42.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-php/phpunit ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool extension? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
-DESCRIPTION=PHP templating engine with syntax similar to Django
-EAPI=6
-HOMEPAGE=http://twig.sensiolabs.org/
-IUSE=doc extension test php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php extension? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
-REQUIRED_USE=extension? ( || ( php_targets_php5-6 ) )
-SLOT=0
-SRC_URI=https://github.com/twigphp/Twig/archive/v1.42.2.tar.gz -> twig-1.42.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-source-r3	637effc08278f9652b9c14911810c5cf	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e256a096f7077c7eae446658c489a8c
diff --git a/metadata/md5-cache/dev-php/twig-1.42.3 b/metadata/md5-cache/dev-php/twig-1.42.3
new file mode 100644
index 000000000000..09fb41133ad4
--- /dev/null
+++ b/metadata/md5-cache/dev-php/twig-1.42.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst test
+DEPEND=test? ( dev-php/phpunit dev-lang/php:*[ctype] dev-php/fedora-autoloader )
+DESCRIPTION=PHP templating engine with syntax similar to Django
+EAPI=7
+HOMEPAGE=http://twig.sensiolabs.org/
+IUSE=doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/php:*[ctype] dev-php/fedora-autoloader
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/twigphp/Twig/archive/v1.42.3.tar.gz -> twig-1.42.3.tar.gz
+_md5_=3239ed1cc471ec45e9beb7f29c012521
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 47e89e687579..68b1680bb57f 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/aiohttp-1.3.3 b/metadata/md5-cache/dev-python/aiohttp-1.3.3
deleted file mode 100644
index b0e6660a36e0..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-1.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install 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(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/async_timeout[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-2.1.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-0.9.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/yarl-0.10[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-timeout[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[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=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.org/project/aiohttp/
-IUSE=doc test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/async_timeout[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-2.1.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-0.9.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/yarl-0.10[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp/aiohttp-1.3.3.tar.gz -> aiohttp-1.3.3.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44003af41bb9582626d8bd10f9daa825
diff --git a/metadata/md5-cache/dev-python/aiohttp-1.3.5 b/metadata/md5-cache/dev-python/aiohttp-1.3.5
deleted file mode 100644
index c21be877ee2f..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-1.3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install 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(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/async_timeout[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-2.1.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-0.9.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/yarl-0.10[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-timeout[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[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=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.org/project/aiohttp/
-IUSE=doc test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/async_timeout[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-2.1.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-0.9.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/yarl-0.10[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp/aiohttp-1.3.5.tar.gz -> aiohttp-1.3.5.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44003af41bb9582626d8bd10f9daa825
diff --git a/metadata/md5-cache/dev-python/aiohttp-2.3.2 b/metadata/md5-cache/dev-python/aiohttp-2.3.2
deleted file mode 100644
index a04fc7dd9662..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-2.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install 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(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/async_timeout-1.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-3.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-0.11[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-timeout[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[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=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.org/project/aiohttp/
-IUSE=doc test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/async_timeout-1.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-3.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-0.11[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp/aiohttp-2.3.2.tar.gz -> aiohttp-2.3.2.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1c66e63a32be2e6586731e412a8ce40
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.0.6 b/metadata/md5-cache/dev-python/aiohttp-3.0.6
deleted file mode 100644
index b634f83cbdfd..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-3.0.6
+++ /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_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/async_timeout-1.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/attrs-17.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-4.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna-ssl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-3.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-timeout[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[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=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.org/project/aiohttp/
-IUSE=doc test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/async_timeout-1.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/attrs-17.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-4.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna-ssl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.0.6.tar.gz -> aiohttp-3.0.6.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=90316cea8786dbfe12e62da1080c2f3a
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.3.0 b/metadata/md5-cache/dev-python/aiohttp-3.3.0
deleted file mode 100644
index d111a067d0e2..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-3.3.0
+++ /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_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/async_timeout-3.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/attrs-17.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-4.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna-ssl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-3.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-timeout[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[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=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.org/project/aiohttp/
-IUSE=doc test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/async_timeout-3.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/attrs-17.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-4.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna-ssl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.3.0.tar.gz -> aiohttp-3.3.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=487ebb22e61057ff46a2219422fc29d6
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.4.4 b/metadata/md5-cache/dev-python/aiohttp-3.4.4
deleted file mode 100644
index ccb451c9ebfb..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-3.4.4
+++ /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(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/async_timeout-3.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/attrs-17.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-4.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna-ssl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/async_generator[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-3.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-timeout[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[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=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.org/project/aiohttp/
-IUSE=doc test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/async_timeout-3.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/attrs-17.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-4.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna-ssl[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? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.4.4.tar.gz -> aiohttp-3.4.4.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ec94982236cedbd9ddb5a34838ff0b8d
diff --git a/metadata/md5-cache/dev-python/async_timeout-1.0.0 b/metadata/md5-cache/dev-python/async_timeout-1.0.0
deleted file mode 100644
index ca6606b4982a..000000000000
--- a/metadata/md5-cache/dev-python/async_timeout-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pytest-runner[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/setuptools_scm[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
-DESCRIPTION=Timeout context manager for asyncio programs
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/async_timeout/
-IUSE=python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/a/async_timeout/async_timeout-1.0.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb4d272d84e3f21224cf1efb155f450a
diff --git a/metadata/md5-cache/dev-python/async_timeout-1.1.0 b/metadata/md5-cache/dev-python/async_timeout-1.1.0
deleted file mode 100644
index fecb21fbbe81..000000000000
--- a/metadata/md5-cache/dev-python/async_timeout-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pytest-runner[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[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=Timeout context manager for asyncio programs
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/async_timeout/
-IUSE=python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-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/a/async_timeout/async-timeout-1.1.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7356f5fec080408056172044cdd6ac76
diff --git a/metadata/md5-cache/dev-python/async_timeout-1.2.0 b/metadata/md5-cache/dev-python/async_timeout-1.2.0
deleted file mode 100644
index 42e0f54ecf88..000000000000
--- a/metadata/md5-cache/dev-python/async_timeout-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pytest-runner[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest-aiohttp[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=Timeout context manager for asyncio programs
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/async_timeout/
-IUSE=test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-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 )
-SLOT=0
-SRC_URI=mirror://pypi/a/async_timeout/async-timeout-1.2.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=467826aafe88d766755c118a37e9da02
diff --git a/metadata/md5-cache/dev-python/async_timeout-2.0.1 b/metadata/md5-cache/dev-python/async_timeout-2.0.1
new file mode 100644
index 000000000000..09506a7e741f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/async_timeout-2.0.1
@@ -0,0 +1,16 @@
+BDEPEND=python_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(-)]
+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(-)] dev-python/setuptools_scm[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( <dev-python/aiohttp-3.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pytest-aiohttp-0.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Timeout context manager for asyncio programs
+EAPI=7
+HOMEPAGE=https://github.com/aio-libs/async-timeout
+IUSE=test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+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? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/async_timeout/async-timeout-2.0.1.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=248fbde4538bd5982a1e996eba74e617
diff --git a/metadata/md5-cache/dev-python/async_timeout-3.0.0 b/metadata/md5-cache/dev-python/async_timeout-3.0.0
deleted file mode 100644
index 78faaafdb1d1..000000000000
--- a/metadata/md5-cache/dev-python/async_timeout-3.0.0
+++ /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_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest-aiohttp[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=Timeout context manager for asyncio programs
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/async-timeout
-IUSE=test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-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 )
-SLOT=0
-SRC_URI=mirror://pypi/a/async_timeout/async-timeout-3.0.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8b8d7d8706a66d8305e341a8df590493
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.5 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.5
new file mode 100644
index 000000000000..5178b2cea165
--- /dev/null
+++ b/metadata/md5-cache/dev-python/backports-unittest-mock-1.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.5.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/backports[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Backport of unittest.mock
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/backports.unittest_mock
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+LICENSE=MIT
+RDEPEND=dev-python/backports[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.5.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8814cf2cd9f08dfcc8335a8dd8b9388d
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.10 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.10
deleted file mode 100644
index ca0ce31832aa..000000000000
--- a/metadata/md5-cache/dev-python/catkin_pkg-0.4.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-DESCRIPTION=Standalone Python library for the catkin package system
-EAPI=7
-HOMEPAGE=http://wiki.ros.org/catkin_pkg
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-util/catkin-0.7.14 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.4.10.tar.gz -> catkin_pkg-0.4.10-gh.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7937f164e274ef90f3ae9fcf84d5faee
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.13 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.13
new file mode 100644
index 000000000000..66bb2f8ac47f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/catkin_pkg-0.4.13
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Standalone Python library for the catkin package system
+EAPI=7
+HOMEPAGE=http://wiki.ros.org/catkin_pkg
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-util/catkin-0.7.14 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.4.13.tar.gz -> catkin_pkg-0.4.13-gh.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=7937f164e274ef90f3ae9fcf84d5faee
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.9 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.9
deleted file mode 100644
index 14a4e0a18f70..000000000000
--- a/metadata/md5-cache/dev-python/catkin_pkg-0.4.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/flake8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-DESCRIPTION=Standalone Python library for the catkin package system
-EAPI=7
-HOMEPAGE=http://wiki.ros.org/catkin_pkg
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-util/catkin-0.7.14 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.4.9.tar.gz -> catkin_pkg-0.4.9-gh.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7937f164e274ef90f3ae9fcf84d5faee
diff --git a/metadata/md5-cache/dev-python/cryptography-2.7 b/metadata/md5-cache/dev-python/cryptography-2.7
new file mode 100644
index 000000000000..bb827235c38a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cryptography-2.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.0.2o-r6:0 ) ) ) libressl? ( dev-libs/libressl:0= ) idna? ( >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-python/cffi-1.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),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.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),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.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),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.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),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-python/cffi-1.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),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.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),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.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),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.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),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/cryptography-vectors-2.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pretend[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/iso8601[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hypothesis-1.11.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/hypothesis-3.79.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.9.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Library providing cryptographic recipes and primitives
+EAPI=6
+HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
+IUSE=libressl idna test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=|| ( Apache-2.0 BSD )
+RDEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.0.2o-r6:0 ) ) ) libressl? ( dev-libs/libressl:0= ) idna? ( >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cryptography/cryptography-2.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=217f3c0e1332dac8c4dd7f3101fbae20
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-2.7 b/metadata/md5-cache/dev-python/cryptography-vectors-2.7
new file mode 100644
index 000000000000..d8fc67030e1e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-2.7
@@ -0,0 +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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Test vectors for the cryptography package
+EAPI=6
+HOMEPAGE=https://pypi.org/project/cryptography-vectors/
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=|| ( Apache-2.0 BSD )
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-2.7.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0bce30db257255e9fbcde26e62cd0991
diff --git a/metadata/md5-cache/dev-python/css-parser-1.0.4-r1 b/metadata/md5-cache/dev-python/css-parser-1.0.4-r1
index 8c9939570e4a..16ad3d3bda9c 100644
--- a/metadata/md5-cache/dev-python/css-parser-1.0.4-r1
+++ b/metadata/md5-cache/dev-python/css-parser-1.0.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A CSS Cascading Style Sheets library (fork of cssutils)
 EAPI=7
 HOMEPAGE=https://pypi.org/project/css-parser/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-3
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/css-parser/css-parser-1.0.4.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=5b0bdcc537270b13d8706480b17b5c9c
+_md5_=3523b6b43cc96bd2cc0ef2fe1ca08842
diff --git a/metadata/md5-cache/dev-python/cython-0.29.13 b/metadata/md5-cache/dev-python/cython-0.29.13
index 4d38ecca0c8b..adaca9a9079c 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.13
+++ b/metadata/md5-cache/dev-python/cython-0.29.13
@@ -1,6 +1,6 @@
 BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( virtual/emacs ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/numpy[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=emacs? ( virtual/emacs ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( python_targets_python2_7? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),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_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_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_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) )
 DESCRIPTION=A Python to C compiler
 EAPI=7
 HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.13.tar.gz -> cython-0.29.13.gh.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	elisp-common	23f47b2e1de7abf387105eddd1318738	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7f24b4ccf60677b8fc83aaa401e50018
+_md5_=45a3b226820387079e455b19cdd58dec
diff --git a/metadata/md5-cache/dev-python/denonavr-0.7.10 b/metadata/md5-cache/dev-python/denonavr-0.7.10
new file mode 100644
index 000000000000..b376d9d67106
--- /dev/null
+++ b/metadata/md5-cache/dev-python/denonavr-0.7.10
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests-mock[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[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_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Automation Library for Denon AVR receivers
+EAPI=7
+HOMEPAGE=https://github.com/scarface-4711/denonavr
+IUSE=test python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0=[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_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/d/denonavr/denonavr-0.7.10.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=321d19353649f85b3993e5f458491934
diff --git a/metadata/md5-cache/dev-python/denonavr-0.7.8 b/metadata/md5-cache/dev-python/denonavr-0.7.8
deleted file mode 100644
index 412f00b24711..000000000000
--- a/metadata/md5-cache/dev-python/denonavr-0.7.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests-mock[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[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_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Automation Library for Denon AVR receivers
-EAPI=7
-HOMEPAGE=https://github.com/scarface-4711/denonavr
-IUSE=test python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0=[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_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/d/denonavr/denonavr-0.7.8.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=321d19353649f85b3993e5f458491934
diff --git a/metadata/md5-cache/dev-python/distro-1.0.4 b/metadata/md5-cache/dev-python/distro-1.0.4
index 177db7903c84..cef2d302a028 100644
--- a/metadata/md5-cache/dev-python/distro-1.0.4
+++ b/metadata/md5-cache/dev-python/distro-1.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Reliable machine-readable Linux distribution information for Python
 EAPI=6
 HOMEPAGE=https://distro.readthedocs.io/en/latest/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/distro/distro-1.0.4.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ebe8e5a33a50ea11752e7f1056dc432
+_md5_=d2bc6d2fffe04f005c0350ac9c57ae3f
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-6.4.0 b/metadata/md5-cache/dev-python/elasticsearch-py-6.4.0
new file mode 100644
index 000000000000..013f4f4d6406
--- /dev/null
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-6.4.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.3.1-r1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/urllib3-1.21.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/requests-3.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pretty-yaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nosexcover[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/jre:1.8 )
+DESCRIPTION=Official Python low-level client for Elasticsearch
+EAPI=7
+HOMEPAGE=https://github.com/elastic/elasticsearch-py
+IUSE=doc examples test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/urllib3-1.21.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/v6.4.0.tar.gz -> elasticsearch-py-6.4.0.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.4.0.tar.gz )
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=1cf0ef808c6230d292bc6d45fb460e89
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-7.0.2 b/metadata/md5-cache/dev-python/elasticsearch-py-7.0.2
new file mode 100644
index 000000000000..3701c399e5ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-7.0.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.3.1-r1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/urllib3-1.21.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/requests-3.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pretty-yaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/jre:1.8 )
+DESCRIPTION=Official Python low-level client for Elasticsearch
+EAPI=7
+HOMEPAGE=https://github.com/elastic/elasticsearch-py
+IUSE=doc examples test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/urllib3-1.21.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/7.0.2.tar.gz -> elasticsearch-py-7.0.2.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.0.1-no-jdk-linux-x86_64.tar.gz )
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=1380b15abe841dd473afcafeb4bdc1d0
diff --git a/metadata/md5-cache/dev-python/eventlet-0.25.0 b/metadata/md5-cache/dev-python/eventlet-0.25.0
deleted file mode 100644
index a661b5d35f48..000000000000
--- a/metadata/md5-cache/dev-python/eventlet-0.25.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-docs-2.7.6-r1:2.7 ) test? ( >=dev-python/dnspython-1.15.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(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-1.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/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/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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(-)] )
-DESCRIPTION=Highly concurrent networking library
-EAPI=7
-HOMEPAGE=https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/dnspython-1.15.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(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-1.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/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(-)] 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/e/eventlet/eventlet-0.25.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8794b03748addbdffd88b001bb6ec957
diff --git a/metadata/md5-cache/dev-python/eventlet-0.25.1 b/metadata/md5-cache/dev-python/eventlet-0.25.1
new file mode 100644
index 000000000000..19d56c793894
--- /dev/null
+++ b/metadata/md5-cache/dev-python/eventlet-0.25.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-docs-2.7.6-r1:2.7 ) test? ( >=dev-python/dnspython-1.15.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(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-1.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/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/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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(-)] )
+DESCRIPTION=Highly concurrent networking library
+EAPI=7
+HOMEPAGE=https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=MIT
+RDEPEND=>=dev-python/dnspython-1.15.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(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-1.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/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(-)] 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/e/eventlet/eventlet-0.25.1.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a9024ab456c4e240150e5fc8447b8fc0
diff --git a/metadata/md5-cache/dev-python/flask-1.0.4 b/metadata/md5-cache/dev-python/flask-1.0.4
new file mode 100644
index 000000000000..a50d1ba8a87d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-1.0.4
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/click[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/itsdangerous[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/werkzeug-0.15[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=A microframework based on Werkzeug, Jinja2 and good intentions
+EAPI=7
+HOMEPAGE=https://github.com/pallets/flask/
+IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/click[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/itsdangerous[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/werkzeug-0.15[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask/Flask-1.0.4.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f03d2b79d145f6c01889ebdf854a31a9
diff --git a/metadata/md5-cache/dev-python/flask-1.1.1 b/metadata/md5-cache/dev-python/flask-1.1.1
new file mode 100644
index 000000000000..501a5a6682f8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-1.1.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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/click[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/itsdangerous[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/werkzeug-0.15[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=A microframework based on Werkzeug, Jinja2 and good intentions
+EAPI=7
+HOMEPAGE=https://github.com/pallets/flask/
+IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/click[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/itsdangerous[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/werkzeug-0.15[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask/Flask-1.1.1.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f03d2b79d145f6c01889ebdf854a31a9
diff --git a/metadata/md5-cache/dev-python/flask-9999 b/metadata/md5-cache/dev-python/flask-9999
index 629702cd449e..292c66f72ce2 100644
--- a/metadata/md5-cache/dev-python/flask-9999
+++ b/metadata/md5-cache/dev-python/flask-9999
@@ -1,14 +1,14 @@
 BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/click[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/itsdangerous[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/werkzeug-0.14[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/click[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/itsdangerous[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/werkzeug-0.15[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=A microframework based on Werkzeug, Jinja2 and good intentions
 EAPI=7
 HOMEPAGE=https://github.com/pallets/flask/
 IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/click[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/itsdangerous[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/werkzeug-0.14[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=dev-python/click[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/itsdangerous[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/werkzeug-0.15[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6fdf64b828e0fd5ac16f3f691fcdb930
+_md5_=f03d2b79d145f6c01889ebdf854a31a9
diff --git a/metadata/md5-cache/dev-python/graph-tool-2.27 b/metadata/md5-cache/dev-python/graph-tool-2.27
index 058eae9ca097..15a9bcb4c0aa 100644
--- a/metadata/md5-cache/dev-python/graph-tool-2.27
+++ b/metadata/md5-cache/dev-python/graph-tool-2.27
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://downloads.skewed.de/graph-tool/graph-tool-2.27.tar.bz2
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2d0deef174d74abe1fe55fc6efa74a60
diff --git a/metadata/md5-cache/dev-python/graph-tool-9999 b/metadata/md5-cache/dev-python/graph-tool-9999
index 6d40bb91e350..97b5cc8611d8 100644
--- a/metadata/md5-cache/dev-python/graph-tool-9999
+++ b/metadata/md5-cache/dev-python/graph-tool-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/boost-1.70:=[context,python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/expat:= dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-mathematics/cgal:= cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2d0deef174d74abe1fe55fc6efa74a60
diff --git a/metadata/md5-cache/dev-python/hcloud-python-1.4.1 b/metadata/md5-cache/dev-python/hcloud-python-1.4.1
new file mode 100644
index 000000000000..274c625f4d4c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hcloud-python-1.4.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.20[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/requests-2.23[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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(-)] )
+DESCRIPTION=Official Hetzner Cloud python library
+EAPI=7
+HOMEPAGE=https://github.com/hetznercloud/hcloud-python
+IUSE=doc examples python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.20[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/requests-2.23[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/hetznercloud/hcloud-python/archive/v1.4.1.tar.gz -> hcloud-python-1.4.1.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=62138ed596f2894941befbb3e24de0af
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-0.18 b/metadata/md5-cache/dev-python/importlib_metadata-0.18
deleted file mode 100644
index 879ef8fde642..000000000000
--- a/metadata/md5-cache/dev-python/importlib_metadata-0.18
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/zipp[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ) doc? ( >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read metadata from Python packages
-EAPI=7
-HOMEPAGE=https://importlib-metadata.readthedocs.io/
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/zipp[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[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_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-0.18.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=ccf4f5f09ac7a2d070ef60b30ab26c2f
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-0.20 b/metadata/md5-cache/dev-python/importlib_metadata-0.20
new file mode 100644
index 000000000000..8a99a5d254ae
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_metadata-0.20
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/zipp[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ) doc? ( >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read metadata from Python packages
+EAPI=7
+HOMEPAGE=https://importlib-metadata.readthedocs.io/
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/zipp[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[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_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-0.20.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=02b5b5979d69368fe8ac9d5492425c23
diff --git a/metadata/md5-cache/dev-python/loguru-0.2.6_pre20190412 b/metadata/md5-cache/dev-python/loguru-0.2.6_pre20190412
deleted file mode 100644
index 5f8045cc90de..000000000000
--- a/metadata/md5-cache/dev-python/loguru-0.2.6_pre20190412
+++ /dev/null
@@ -1,15 +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(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/ansimarkup-1.4.0[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/colorama-0.3.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[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/isort-4.3.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.9.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Python logging made (stupidly) simple
-EAPI=7
-HOMEPAGE=https://github.com/Delgan/loguru
-IUSE=doc test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/ansimarkup-1.4.0[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/colorama-0.3.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[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/isort-4.3.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.9.0[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=https://github.com/Delgan/loguru/archive/6571879c37904e3a18567e694d70651c6886b860.tar.gz -> loguru-0.2.6_pre20190412.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c006e90901827eaaf00d13b2c61c479e
diff --git a/metadata/md5-cache/dev-python/loguru-0.3.1 b/metadata/md5-cache/dev-python/loguru-0.3.1
deleted file mode 100644
index 33adfced4991..000000000000
--- a/metadata/md5-cache/dev-python/loguru-0.3.1
+++ /dev/null
@@ -1,15 +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(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[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/colorama-0.3.4[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/colorama-0.3.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-4.5.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Python logging made (stupidly) simple
-EAPI=7
-HOMEPAGE=https://github.com/Delgan/loguru
-IUSE=doc test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/colorama-0.3.4[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=https://github.com/Delgan/loguru/archive/0.3.1.tar.gz -> loguru-0.3.1.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9b9664438624c1be29809c8373cf1ab4
diff --git a/metadata/md5-cache/dev-python/loguru-0.3.2 b/metadata/md5-cache/dev-python/loguru-0.3.2
new file mode 100644
index 000000000000..753dba876dc8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/loguru-0.3.2
@@ -0,0 +1,15 @@
+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(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[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/colorama-0.3.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-4.5.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Python logging made (stupidly) simple
+EAPI=7
+HOMEPAGE=https://github.com/Delgan/loguru
+IUSE=doc test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/colorama-0.3.4[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=https://github.com/Delgan/loguru/archive/0.3.2.tar.gz -> loguru-0.3.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=d00bb84c39c94cf12220cb3b496145a3
diff --git a/metadata/md5-cache/dev-python/marshmallow-2.20.2 b/metadata/md5-cache/dev-python/marshmallow-2.20.2
new file mode 100644
index 000000000000..bf9517ffb63a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/marshmallow-2.20.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplejson[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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 lightweight library for converting complex datatypes to and from native Python datatypes.
+EAPI=7
+HOMEPAGE=https://github.com/marshmallow-code/marshmallow/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/marshmallow/marshmallow-2.20.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8618f5e9aa2c965f560ae0a39b70e6f1
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.0.0_beta12 b/metadata/md5-cache/dev-python/marshmallow-3.0.0_beta12
deleted file mode 100644
index c3dea940af88..000000000000
--- a/metadata/md5-cache/dev-python/marshmallow-3.0.0_beta12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplejson[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A lightweight library for converting complex datatypes to and from native Python datatypes.
-EAPI=6
-HOMEPAGE=https://github.com/marshmallow-code/marshmallow/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.0.0b12.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd7b3e4d57f5726b8bef21ac742a54d1
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.0.0_beta8 b/metadata/md5-cache/dev-python/marshmallow-3.0.0_beta8
deleted file mode 100644
index ff36a954501d..000000000000
--- a/metadata/md5-cache/dev-python/marshmallow-3.0.0_beta8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A lightweight library for converting complex datatypes to and from native Python datatypes.
-EAPI=6
-HOMEPAGE=https://github.com/marshmallow-code/marshmallow/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.0.0b8.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=17087238dba29bc21128af3d6f264b19
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.0.1 b/metadata/md5-cache/dev-python/marshmallow-3.0.1
new file mode 100644
index 000000000000..be4fb0a815a1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/marshmallow-3.0.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/python-dateutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplejson[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=A lightweight library for converting complex datatypes to and from native Python datatypes.
+EAPI=7
+HOMEPAGE=https://github.com/marshmallow-code/marshmallow/
+IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/python-dateutil[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/marshmallow/marshmallow-3.0.1.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0b70bb63e80b25a3f3f8a79947286966
diff --git a/metadata/md5-cache/dev-python/mini-amf-0.9.1 b/metadata/md5-cache/dev-python/mini-amf-0.9.1
new file mode 100644
index 000000000000..637f8a3d9217
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mini-amf-0.9.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( dev-python/sphinx ) 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/defusedxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/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/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(-)] )
+DESCRIPTION=Minimal AMF encoder and decoder for Python
+EAPI=7
+HOMEPAGE=https://pypi.python.org/pypi/Mini-AMF
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/zackw/mini-amf/archive/v0.9.1.tar.gz -> mini-amf-0.9.1.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=da6f2331a74388576de47b29d094e373
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.1.20190408 b/metadata/md5-cache/dev-python/miniupnpc-2.1.20190408
deleted file mode 100644
index 3a36c8db26bd..000000000000
--- a/metadata/md5-cache/dev-python/miniupnpc-2.1.20190408
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/miniupnpc-2.1.20190408:0= dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python bindings for UPnP client library
-EAPI=6
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=>=net-libs/miniupnpc-2.1.20190408:0= python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20190408.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8aebb2e0e03bd33ecf55360a06acbc4
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.1.20190824 b/metadata/md5-cache/dev-python/miniupnpc-2.1.20190824
new file mode 100644
index 000000000000..983fe50a5884
--- /dev/null
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.1.20190824
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-libs/miniupnpc-2.1.20190824:0= dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Python bindings for UPnP client library
+EAPI=7
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=net-libs/miniupnpc-2.1.20190824:0= python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20190824.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=04da8c5e2af8be93dff92d0e117e595e
diff --git a/metadata/md5-cache/dev-python/mpi4py-3.0.2 b/metadata/md5-cache/dev-python/mpi4py-3.0.2
index 9e76717e8f1d..18bece60dd03 100644
--- a/metadata/md5-cache/dev-python/mpi4py-3.0.2
+++ b/metadata/md5-cache/dev-python/mpi4py-3.0.2
@@ -5,11 +5,11 @@ DESCRIPTION=Message Passing Interface for Python
 EAPI=7
 HOMEPAGE=https://bitbucket.org/mpi4py/ https://pypi.org/project/mpi4py/
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/mpi 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/m/mpi4py/mpi4py-3.0.2.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=cda6603d22f83e5c3d2b96656ca656c1
+_md5_=34243676def6af9b9899de4d8a3f3af6
diff --git a/metadata/md5-cache/dev-python/multidict-1.3.0_alpha1 b/metadata/md5-cache/dev-python/multidict-1.3.0_alpha1
deleted file mode 100644
index 1ce4be8f7c3c..000000000000
--- a/metadata/md5-cache/dev-python/multidict-1.3.0_alpha1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) test? ( dev-python/pytest[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
-DESCRIPTION=multidict implementation
-EAPI=5
-HOMEPAGE=https://github.com/aio-libs/multidict/
-IUSE=doc test python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/aio-libs/multidict/archive/v1.3.0a1.tar.gz -> multidict-1.3.0_alpha1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b94bb9df8a6df23c45b2362c021a636
diff --git a/metadata/md5-cache/dev-python/multidict-2.0.1 b/metadata/md5-cache/dev-python/multidict-2.0.1
deleted file mode 100644
index 0684b8305b87..000000000000
--- a/metadata/md5-cache/dev-python/multidict-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/cython[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) test? ( dev-python/pytest[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
-DESCRIPTION=multidict implementation
-EAPI=5
-HOMEPAGE=https://github.com/aio-libs/multidict/
-IUSE=doc test python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/aio-libs/multidict/archive/v2.0.1.tar.gz -> multidict-2.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75aa724dfeca314bbf968e4f0e032d6a
diff --git a/metadata/md5-cache/dev-python/multidict-2.1.0 b/metadata/md5-cache/dev-python/multidict-2.1.0
deleted file mode 100644
index ef31d87c1803..000000000000
--- a/metadata/md5-cache/dev-python/multidict-2.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/cython[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) test? ( dev-python/pytest[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
-DESCRIPTION=multidict implementation
-EAPI=5
-HOMEPAGE=https://github.com/aio-libs/multidict/
-IUSE=doc test python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/aio-libs/multidict/archive/v2.1.0.tar.gz -> multidict-2.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75aa724dfeca314bbf968e4f0e032d6a
diff --git a/metadata/md5-cache/dev-python/multidict-2.1.2 b/metadata/md5-cache/dev-python/multidict-2.1.2
deleted file mode 100644
index 0631836c6b9f..000000000000
--- a/metadata/md5-cache/dev-python/multidict-2.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/cython[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) test? ( dev-python/pytest[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
-DESCRIPTION=multidict implementation
-EAPI=5
-HOMEPAGE=https://github.com/aio-libs/multidict/
-IUSE=doc test python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/aio-libs/multidict/archive/v2.1.2.tar.gz -> multidict-2.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75aa724dfeca314bbf968e4f0e032d6a
diff --git a/metadata/md5-cache/dev-python/multidict-2.1.4 b/metadata/md5-cache/dev-python/multidict-2.1.4
deleted file mode 100644
index 9f9267f69fb9..000000000000
--- a/metadata/md5-cache/dev-python/multidict-2.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install 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(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=multidict implementation
-EAPI=5
-HOMEPAGE=https://github.com/aio-libs/multidict/
-IUSE=doc test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-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 )
-SLOT=0
-SRC_URI=https://github.com/aio-libs/multidict/archive/v2.1.4.tar.gz -> multidict-2.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b337a69c33562166a1a4e35caf08a1b
diff --git a/metadata/md5-cache/dev-python/multidict-2.1.5 b/metadata/md5-cache/dev-python/multidict-2.1.5
deleted file mode 100644
index 494015f4e5af..000000000000
--- a/metadata/md5-cache/dev-python/multidict-2.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install 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(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=multidict implementation
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/multidict/
-IUSE=doc test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-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 )
-SLOT=0
-SRC_URI=https://github.com/aio-libs/multidict/archive/v2.1.5.tar.gz -> multidict-2.1.5.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0542cd211a0c5f93ce1a203ee48636c9
diff --git a/metadata/md5-cache/dev-python/multidict-3.3.2 b/metadata/md5-cache/dev-python/multidict-3.3.2
deleted file mode 100644
index 243866901601..000000000000
--- a/metadata/md5-cache/dev-python/multidict-3.3.2
+++ /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_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[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=multidict implementation
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/multidict/
-IUSE=doc test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-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 )
-SLOT=0
-SRC_URI=https://github.com/aio-libs/multidict/archive/v3.3.2.tar.gz -> multidict-3.3.2.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4ba7683aacc9baa32328eb4395d2ceb
diff --git a/metadata/md5-cache/dev-python/notify2-0.3.1-r1 b/metadata/md5-cache/dev-python/notify2-0.3.1-r1
new file mode 100644
index 000000000000..d6433e79d132
--- /dev/null
+++ b/metadata/md5-cache/dev-python/notify2-0.3.1-r1
@@ -0,0 +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_5? ( dev-lang/python:3.5 ) python_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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Python interface to DBus notifications.
+EAPI=6
+HOMEPAGE=https://bitbucket.org/takluyver/pynotify2
+IUSE=examples python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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/n/notify2/notify2-0.3.1.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=44014c2ab4121f0db4110664cc12728d
diff --git a/metadata/md5-cache/dev-python/ntlm-auth-1.4.0 b/metadata/md5-cache/dev-python/ntlm-auth-1.4.0
new file mode 100644
index 000000000000..602a86754e19
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ntlm-auth-1.4.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/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/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-python/ordereddict[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Calculates NTLM Authentication codes
+EAPI=7
+HOMEPAGE=https://github.com/jborean93/ntlm-auth
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/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-python/ordereddict[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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/jborean93/ntlm-auth/archive/v1.4.0.tar.gz -> ntlm-auth-1.4.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b9437de61c92fbe80c375c42cb1ac4ae
diff --git a/metadata/md5-cache/dev-python/numpy-1.16.1 b/metadata/md5-cache/dev-python/numpy-1.16.1
index aac9da6043ea..9505435fd6ff 100644
--- a/metadata/md5-cache/dev-python/numpy-1.16.1
+++ b/metadata/md5-cache/dev-python/numpy-1.16.1
@@ -1,15 +1,15 @@
-BDEPEND=app-arch/unzip dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/pkgconfig ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=app-arch/unzip 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(-)] lapack? ( virtual/pkgconfig ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=lapack? ( virtual/cblas virtual/lapack ) lapack? ( virtual/fortran )
 DESCRIPTION=Fast array and numerical python library
 EAPI=7
 HOMEPAGE=https://www.numpy.org
-IUSE=doc lapack test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+IUSE=doc lapack test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.16.1.zip doc? ( https://docs.scipy.org/doc/numpy-1.16.1/numpy-html-1.16.1.zip https://docs.scipy.org/doc/numpy-1.16.1/numpy-ref-1.16.1.pdf https://docs.scipy.org/doc/numpy-1.16.1/numpy-user-1.16.1.pdf )
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a12f63e18f7ffa2ee5c29b3d5ec82237
+_md5_=6610fe0d06e40260968882c49ce82078
diff --git a/metadata/md5-cache/dev-python/numpy-1.16.5 b/metadata/md5-cache/dev-python/numpy-1.16.5
new file mode 100644
index 000000000000..7ade5a917d5f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numpy-1.16.5
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip 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(-)] lapack? ( virtual/pkgconfig ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=lapack? ( virtual/cblas virtual/lapack ) lapack? ( virtual/fortran )
+DESCRIPTION=Fast array and numerical python library
+EAPI=7
+HOMEPAGE=https://www.numpy.org
+IUSE=doc lapack test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/numpy/numpy-1.16.5.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=d91e1056f2b22981b954900fb3a580f9
diff --git a/metadata/md5-cache/dev-python/pecan-1.3.3-r1 b/metadata/md5-cache/dev-python/pecan-1.3.3-r1
new file mode 100644
index 000000000000..2c1887af67e3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pecan-1.3.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=A WSGI object-dispatching web framework, lean, fast, with few dependencies.
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pecan/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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-python/ordereddict[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/webob-1.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/mako-0.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/webtest-1.3.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/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/logutils-0.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pecan/pecan-1.3.3.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=57951882f277a91cc3ba9619adb76d90
diff --git a/metadata/md5-cache/dev-python/pgmagick-0.6.7 b/metadata/md5-cache/dev-python/pgmagick-0.6.7
deleted file mode 100644
index 6eb15bea51e2..000000000000
--- a/metadata/md5-cache/dev-python/pgmagick-0.6.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-gfx/graphicsmagick:=[cxx] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( media-fonts/corefonts ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Yet another boost.python based wrapper for GraphicsMagick
-EAPI=6
-HOMEPAGE=https://pypi.org/project/pgmagick/ https://bitbucket.org/hhatto/pgmagick/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-gfx/graphicsmagick:=[cxx] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pgmagick/pgmagick-0.6.7.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=84005a1a466eef48ecd6966967e235e3
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.18 b/metadata/md5-cache/dev-python/pocketlint-0.18
deleted file mode 100644
index 53b15ce60787..000000000000
--- a/metadata/md5-cache/dev-python/pocketlint-0.18
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Shared code for running pylint against rhinstaller projects
-EAPI=7
-HOMEPAGE=https://github.com/rhinstaller/pocketlint
-IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/rhinstaller/pocketlint/archive/0.18.tar.gz -> pocketlint-0.18.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=15605c24236fd38f6d6ba02b94ee9876
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.20 b/metadata/md5-cache/dev-python/pocketlint-0.20
new file mode 100644
index 000000000000..413eda553cff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pocketlint-0.20
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Shared code for running pylint against rhinstaller projects
+EAPI=7
+HOMEPAGE=https://github.com/rhinstaller/pocketlint
+IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/rhinstaller/pocketlint/archive/0.20.tar.gz -> pocketlint-0.20.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=15605c24236fd38f6d6ba02b94ee9876
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.8.0 b/metadata/md5-cache/dev-python/protobuf-python-3.8.0
index 679ba0667472..b02c3fc77280 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.8.0
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.8.0
@@ -5,11 +5,11 @@ DESCRIPTION=Google's Protocol Buffers - Python bindings
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-libs/protobuf-3.8.0 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/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-libs/protobuf-3[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0/19
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz -> protobuf-3.8.0.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b34b732f365727ef2bc6d98a1893beca
+_md5_=d7925067a57ee6ea86a37ae8fd46e62a
diff --git a/metadata/md5-cache/dev-python/pycanberra-0_pre20130515 b/metadata/md5-cache/dev-python/pycanberra-0_pre20130515
index a0d848dab533..f812544aad80 100644
--- a/metadata/md5-cache/dev-python/pycanberra-0_pre20130515
+++ b/metadata/md5-cache/dev-python/pycanberra-0_pre20130515
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=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(-)] app-arch/unzip
 DESCRIPTION=Basic Python wrapper for libcanberra
 EAPI=5
 HOMEPAGE=https://github.com/psykoyiko/pycanberra/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 SLOT=0
 SRC_URI=https://github.com/psykoyiko/pycanberra/archive/88c53cd44a626ede3b07dab0b548f8bcfda42867.zip -> pycanberra-0_pre20130515.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=212d1fbca4c91eb3c97e859a4faed714
+_md5_=cb2c1313ec31faa969120f8805d086a1
diff --git a/metadata/md5-cache/dev-python/pychroot-0.10.0 b/metadata/md5-cache/dev-python/pychroot-0.10.0
new file mode 100644
index 000000000000..002dbf1af9a4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pychroot-0.10.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/snakeoil-0.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=a python library and cli tool that simplify chroot handling
+EAPI=7
+HOMEPAGE=https://github.com/pkgcore/pychroot
+IUSE=test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/snakeoil-0.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pychroot/pychroot-0.10.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e92f44edd56e62644e3a868bf3d1c950
diff --git a/metadata/md5-cache/dev-python/pychroot-9999 b/metadata/md5-cache/dev-python/pychroot-9999
index eb036057ff90..09a506bee59d 100644
--- a/metadata/md5-cache/dev-python/pychroot-9999
+++ b/metadata/md5-cache/dev-python/pychroot-9999
@@ -9,6 +9,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=633290f36c98e53bc32ca4934a4f8f30
+_md5_=e92f44edd56e62644e3a868bf3d1c950
diff --git a/metadata/md5-cache/dev-python/pygit2-0.26.4 b/metadata/md5-cache/dev-python/pygit2-0.26.4
deleted file mode 100644
index 907c8f0187f8..000000000000
--- a/metadata/md5-cache/dev-python/pygit2-0.26.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/libgit2-0.26* >=dev-python/cffi-1.0:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python bindings for libgit2
-EAPI=6
-HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND==dev-libs/libgit2-0.26* >=dev-python/cffi-1.0:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pygit2/pygit2-0.26.4.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b62fe0830590e2daf4628e64a3d19d18
diff --git a/metadata/md5-cache/dev-python/pygit2-0.28.2 b/metadata/md5-cache/dev-python/pygit2-0.28.2
index 1585645b99e9..61eff6ffc172 100644
--- a/metadata/md5-cache/dev-python/pygit2-0.28.2
+++ b/metadata/md5-cache/dev-python/pygit2-0.28.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for libgit2
 EAPI=6
 HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2-with-linking-exception
 RDEPEND==dev-libs/libgit2-0.28* >=dev-python/cffi-1.0:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygit2/pygit2-0.28.2.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0bd895ad705650e7d475cd05f3773e89
+_md5_=1dbae60fa87e0aad532fd776c3dec30f
diff --git a/metadata/md5-cache/dev-python/pygobject-3.32.1 b/metadata/md5-cache/dev-python/pygobject-3.32.1
index d6cad07a9fda..1d60edcdbc91 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.32.1
+++ b/metadata/md5-cache/dev-python/pygobject-3.32.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.32/pygobject-3.32.1.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4db5cd009f9b4d57358c48257f648e0e
diff --git a/metadata/md5-cache/dev-python/pymongo-3.4.0 b/metadata/md5-cache/dev-python/pymongo-3.4.0
index eadd0c33094c..6dbc8757713c 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.4.0
+++ b/metadata/md5-cache/dev-python/pymongo-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-3.4.0.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f3d270c83fb5e2e7c12fdb218bd17bf
diff --git a/metadata/md5-cache/dev-python/pymongo-3.5.1 b/metadata/md5-cache/dev-python/pymongo-3.5.1
index 4c6f82c38eb4..fe5411ae6f52 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.5.1
+++ b/metadata/md5-cache/dev-python/pymongo-3.5.1
@@ -10,5 +10,5 @@ RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-3.5.1.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac83fbecb36b7816024b9bd8985454bc
diff --git a/metadata/md5-cache/dev-python/pymongo-3.7.1 b/metadata/md5-cache/dev-python/pymongo-3.7.1
index 3af924c15ff0..28d8a3c458d7 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.7.1
+++ b/metadata/md5-cache/dev-python/pymongo-3.7.1
@@ -10,5 +10,5 @@ RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-3.7.1.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a757391c387f61b0b23a867ca755c838
diff --git a/metadata/md5-cache/dev-python/pymongo-3.7.2 b/metadata/md5-cache/dev-python/pymongo-3.7.2
index 8a534601b383..a5ea9c5451eb 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.7.2
+++ b/metadata/md5-cache/dev-python/pymongo-3.7.2
@@ -11,5 +11,5 @@ RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_pypy(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-3.7.2.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2251c03ef448dbf2340755e5d20947cb
diff --git a/metadata/md5-cache/dev-python/pypy-7.1.1 b/metadata/md5-cache/dev-python/pypy-7.1.1
index 89499974bff0..920f96e9225c 100644
--- a/metadata/md5-cache/dev-python/pypy-7.1.1
+++ b/metadata/md5-cache/dev-python/pypy-7.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0
 SLOT=0/41-py27
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.1.1-src.tar.bz2 https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.15.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=636a9817f52b09788fb8d99650f20815
diff --git a/metadata/md5-cache/dev-python/pypy-9999 b/metadata/md5-cache/dev-python/pypy-9999
index b4c2fbe3d2fd..f4a9a9a6e2eb 100644
--- a/metadata/md5-cache/dev-python/pypy-9999
+++ b/metadata/md5-cache/dev-python/pypy-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0
 SLOT=0/41-py27
 SRC_URI=https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.15.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	mercurial	d22fe98ea362174612a57c233239102f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	mercurial	d22fe98ea362174612a57c233239102f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=7ac196116a370d3cae8794169048ef6e
diff --git a/metadata/md5-cache/dev-python/pypy3-7.1.1 b/metadata/md5-cache/dev-python/pypy3-7.1.1
index 208a4dabe73c..432ed47c6a84 100644
--- a/metadata/md5-cache/dev-python/pypy3-7.1.1
+++ b/metadata/md5-cache/dev-python/pypy3-7.1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0
 SLOT=0/71-py36
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.1.1-src.tar.bz2
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=17ece7b657c087caf43856717a8b3412
diff --git a/metadata/md5-cache/dev-python/pypy3-9999 b/metadata/md5-cache/dev-python/pypy3-9999
index 4c438e36fc92..9c7581235834 100644
--- a/metadata/md5-cache/dev-python/pypy3-9999
+++ b/metadata/md5-cache/dev-python/pypy3-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0
 SLOT=0/71-py36
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	mercurial	d22fe98ea362174612a57c233239102f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	mercurial	d22fe98ea362174612a57c233239102f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=ef95be9f1a3f759edfcbb5f85799f44f
diff --git a/metadata/md5-cache/dev-python/python-efl-1.21.0 b/metadata/md5-cache/dev-python/python-efl-1.21.0
deleted file mode 100644
index df0f9064807c..000000000000
--- a/metadata/md5-cache/dev-python/python-efl-1.21.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/efl-1.21* dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cython-0.28.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/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig 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(-)] media-gfx/graphviz )
-DESCRIPTION=Python bindings for Enlightenment Foundation Libraries
-EAPI=7
-HOMEPAGE=https://phab.enlightenment.org/w/projects/python_bindings_for_efl/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND==dev-libs/efl-1.21* dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.enlightenment.org/rel/bindings/python/python-efl-1.21.0.tar.xz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=23d0b4a4df2a6e36db7b251347a3aabe
diff --git a/metadata/md5-cache/dev-python/python-efl-1.22.0 b/metadata/md5-cache/dev-python/python-efl-1.22.0
index 4ce22d405304..3e862141330e 100644
--- a/metadata/md5-cache/dev-python/python-efl-1.22.0
+++ b/metadata/md5-cache/dev-python/python-efl-1.22.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for Enlightenment Foundation Libraries
 EAPI=7
 HOMEPAGE=https://phab.enlightenment.org/w/projects/python_bindings_for_efl/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND==dev-libs/efl-1.22* dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/bindings/python/python-efl-1.22.0.tar.xz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6366447cd4a5d7ad4f48709ad35c7005
+_md5_=d67284cc6f9bde8dff656fff8ce68c95
diff --git a/metadata/md5-cache/dev-python/readme_renderer-24.0 b/metadata/md5-cache/dev-python/readme_renderer-24.0
new file mode 100644
index 000000000000..b5b0568f3062
--- /dev/null
+++ b/metadata/md5-cache/dev-python/readme_renderer-24.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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/bleach-2.1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/docutils-0.13.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=a library for rendering "readme" descriptions for Warehouse
+EAPI=7
+HOMEPAGE=https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/bleach-2.1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/docutils-0.13.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/readme_renderer/readme_renderer-24.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f089592cf783c71275334e1309540e93
diff --git a/metadata/md5-cache/dev-python/rospkg-1.1.10 b/metadata/md5-cache/dev-python/rospkg-1.1.10
new file mode 100644
index 000000000000..cc3b8bbc8eda
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rospkg-1.1.10
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Standalone Python library for the ROS package system
+EAPI=7
+HOMEPAGE=http://wiki.ros.org/rospkg
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.1.10.tar.gz -> rospkg-1.1.10.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=6bfb39267d9ead1b01c3b550b6f9b37f
diff --git a/metadata/md5-cache/dev-python/rospkg-1.1.4 b/metadata/md5-cache/dev-python/rospkg-1.1.4
deleted file mode 100644
index 6f63786e9862..000000000000
--- a/metadata/md5-cache/dev-python/rospkg-1.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Standalone Python library for the ROS package system
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/rospkg
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.1.4.tar.gz -> rospkg-1.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7420dad8ce4daf3d19dc1f587403311b
diff --git a/metadata/md5-cache/dev-python/rospkg-1.1.7 b/metadata/md5-cache/dev-python/rospkg-1.1.7
deleted file mode 100644
index c7204d47fb19..000000000000
--- a/metadata/md5-cache/dev-python/rospkg-1.1.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/coverage[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-DESCRIPTION=Standalone Python library for the ROS package system
-EAPI=7
-HOMEPAGE=http://wiki.ros.org/rospkg
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.1.7.tar.gz -> rospkg-1.1.7.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6bfb39267d9ead1b01c3b550b6f9b37f
diff --git a/metadata/md5-cache/dev-python/rply-0.7.6 b/metadata/md5-cache/dev-python/rply-0.7.6
index 77b03aea014b..47b287cbd5ed 100644
--- a/metadata/md5-cache/dev-python/rply-0.7.6
+++ b/metadata/md5-cache/dev-python/rply-0.7.6
@@ -8,7 +8,8 @@ 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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alex/rply/archive/v0.7.6.tar.gz -> rply-0.7.6.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=43caf2e1596b83185d8b9b42a4e95a76
+_md5_=4a55abb23c1d824f33dc1ce70625a52c
diff --git a/metadata/md5-cache/dev-python/rply-0.7.7 b/metadata/md5-cache/dev-python/rply-0.7.7
new file mode 100644
index 000000000000..f15330800453
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rply-0.7.7
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/appdirs[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/py[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Pure python parser generator that also works with RPython
+EAPI=7
+HOMEPAGE=https://github.com/alex/rply
+IUSE=test python_targets_pypy python_targets_python2_7 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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/alex/rply/archive/v0.7.7.tar.gz -> rply-0.7.7.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=51b78e2595033a0ccdedfa650122a0a7
diff --git a/metadata/md5-cache/dev-python/setuptools-40.7.3 b/metadata/md5-cache/dev-python/setuptools-40.7.3
deleted file mode 100644
index 01b13899b7ec..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-40.7.3
+++ /dev/null
@@ -1,16 +0,0 @@
-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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pytest-4 dev-python/pytest-virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-40.7.3.zip
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a91a88d12c806c4dd81a6c3a56c08b96
diff --git a/metadata/md5-cache/dev-python/setuptools-40.8.0 b/metadata/md5-cache/dev-python/setuptools-40.8.0
deleted file mode 100644
index cd964ba9b27f..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-40.8.0
+++ /dev/null
@@ -1,17 +0,0 @@
-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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pytest-4 dev-python/pytest-virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-40.8.0.zip
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f44de9041d34d7eafb7b80a545cb687e
diff --git a/metadata/md5-cache/dev-python/setuptools-40.9.0 b/metadata/md5-cache/dev-python/setuptools-40.9.0
deleted file mode 100644
index 45c390fbe0f5..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-40.9.0
+++ /dev/null
@@ -1,17 +0,0 @@
-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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pytest-4 dev-python/pytest-fixture-config[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-40.9.0.zip
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=cbe9cf783522a711c87018a5270b1c7f
diff --git a/metadata/md5-cache/dev-python/setuptools-41.0.0 b/metadata/md5-cache/dev-python/setuptools-41.0.0
deleted file mode 100644
index 9d735f606cdf..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-41.0.0
+++ /dev/null
@@ -1,17 +0,0 @@
-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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pytest-4 dev-python/pytest-fixture-config[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=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_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
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-41.0.0.zip
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=863accb492cffb1b6f15377a4d33b68f
diff --git a/metadata/md5-cache/dev-python/setuptools-41.0.1 b/metadata/md5-cache/dev-python/setuptools-41.0.1
deleted file mode 100644
index a30fc31da09b..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-41.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pytest-4 dev-python/pytest-fixture-config[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=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_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-41.0.1.zip
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7d50f93f8534c6ac1d0c44864eeae844
diff --git a/metadata/md5-cache/dev-python/setuptools-41.2.0 b/metadata/md5-cache/dev-python/setuptools-41.2.0
new file mode 100644
index 000000000000..1964df2c6137
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-41.2.0
@@ -0,0 +1,17 @@
+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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/unzip test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.7.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pytest-4 dev-python/pytest-fixture-config[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=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_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools/setuptools-41.2.0.zip
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=7d50f93f8534c6ac1d0c44864eeae844
diff --git a/metadata/md5-cache/dev-python/simplecv-1.3 b/metadata/md5-cache/dev-python/simplecv-1.3
deleted file mode 100644
index cada156d7b71..000000000000
--- a/metadata/md5-cache/dev-python/simplecv-1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Python interface to several powerful open source computer vision libraries
-EAPI=5
-HOMEPAGE=http://simplecv.org/
-IUSE=shell test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=media-libs/opencv-2.4.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] shell? ( dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/sightmachine/SimpleCV/archive/1.3.tar.gz -> simplecv-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7dc9c487c6dff27cda9af9c7c748e6a0
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.8.1 b/metadata/md5-cache/dev-python/snakeoil-0.8.1
new file mode 100644
index 000000000000..6b7e5df4d0c8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/snakeoil-0.8.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=misc common functionality and useful optimizations
+EAPI=6
+HOMEPAGE=https://github.com/pkgcore/snakeoil
+IUSE=test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.8.1.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eabe4ce473f9a7a7cd6b1959f91a5d9c
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.8.2 b/metadata/md5-cache/dev-python/snakeoil-0.8.2
new file mode 100644
index 000000000000..4df4276cb560
--- /dev/null
+++ b/metadata/md5-cache/dev-python/snakeoil-0.8.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=misc common functionality and useful optimizations
+EAPI=6
+HOMEPAGE=https://github.com/pkgcore/snakeoil
+IUSE=test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.8.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eabe4ce473f9a7a7cd6b1959f91a5d9c
diff --git a/metadata/md5-cache/dev-python/snakeoil-9999 b/metadata/md5-cache/dev-python/snakeoil-9999
index 9611ee2dc961..3a10a01b508c 100644
--- a/metadata/md5-cache/dev-python/snakeoil-9999
+++ b/metadata/md5-cache/dev-python/snakeoil-9999
@@ -8,6 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e492001fb1abeb3875dda9eb06db6801
+_md5_=eabe4ce473f9a7a7cd6b1959f91a5d9c
diff --git a/metadata/md5-cache/dev-python/sphinx-notfound-page-0.4 b/metadata/md5-cache/dev-python/sphinx-notfound-page-0.4
index 2fc9e0a54c83..2ecb8d28ae8f 100644
--- a/metadata/md5-cache/dev-python/sphinx-notfound-page-0.4
+++ b/metadata/md5-cache/dev-python/sphinx-notfound-page-0.4
@@ -5,11 +5,11 @@ DESCRIPTION=Create a custom 404 page with absolute URLs hardcoded.
 EAPI=7
 HOMEPAGE=https://sphinx-notfound-page.readthedocs.io/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-notfound-page/sphinx-notfound-page-0.4.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=119f89a0af9db0c900cd5645ecc58994
+_md5_=54c72144729aaa235ec7acc9c008c85c
diff --git a/metadata/md5-cache/dev-python/swagger-spec-validator-2.4.3 b/metadata/md5-cache/dev-python/swagger-spec-validator-2.4.3
index ea4e8e02f7b1..3a1c5002a598 100644
--- a/metadata/md5-cache/dev-python/swagger-spec-validator-2.4.3
+++ b/metadata/md5-cache/dev-python/swagger-spec-validator-2.4.3
@@ -1,15 +1,16 @@
-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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/jsonschema[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(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/jsonschema[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/pyyaml[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/six[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[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=validate Swagger specs against Swagger 1.1 or 2.0 specification
 EAPI=7
 HOMEPAGE=https://github.com/Yelp/swagger_spec_validator
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-python/jsonschema[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=dev-python/jsonschema[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/pyyaml[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/six[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 )
+RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/swagger-spec-validator/swagger-spec-validator-2.4.3.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8f2c028c336880f30336229159a225fc
+_md5_=3c3e44df223ce9c02717cd93eb685d9f
diff --git a/metadata/md5-cache/dev-python/uranium-4.2.0 b/metadata/md5-cache/dev-python/uranium-4.2.0
new file mode 100644
index 000000000000..0372e248124f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uranium-4.2.0
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/gettext doc? ( app-doc/doxygen ) test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ~dev-libs/libarcus-4.2.0:=[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sci-libs/Shapely[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
+DESCRIPTION=A Python framework for building 3D printing related applications
+EAPI=7
+HOMEPAGE=https://github.com/Ultimaker/Uranium
+IUSE=debug doc test python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ~dev-libs/libarcus-4.2.0:=[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sci-libs/Shapely[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/Ultimaker/Uranium/archive/4.2.0.tar.gz -> uranium-4.2.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fb60034ea6558fd1b1c23d30dbfaedc8
diff --git a/metadata/md5-cache/dev-python/vcstools-0.1.38 b/metadata/md5-cache/dev-python/vcstools-0.1.38
deleted file mode 100644
index 088934d9fc12..000000000000
--- a/metadata/md5-cache/dev-python/vcstools-0.1.38
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python library for interacting with various VCS systems
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/vcstools
-IUSE=test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://download.ros.org/downloads/vcstools/vcstools-0.1.38.tar.gz https://github.com/vcstools/vcstools/archive/0.1.38.tar.gz -> vcstools-0.1.38.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0bdc0fc8cd262fbf16852f07b80fa592
diff --git a/metadata/md5-cache/dev-python/vcstools-0.1.39 b/metadata/md5-cache/dev-python/vcstools-0.1.39
deleted file mode 100644
index bcf8ee1d8008..000000000000
--- a/metadata/md5-cache/dev-python/vcstools-0.1.39
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python library for interacting with various VCS systems
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/vcstools
-IUSE=test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://download.ros.org/downloads/vcstools/vcstools-0.1.39.tar.gz https://github.com/vcstools/vcstools/archive/0.1.39.tar.gz -> vcstools-0.1.39.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0bdc0fc8cd262fbf16852f07b80fa592
diff --git a/metadata/md5-cache/dev-python/vcstools-0.1.42 b/metadata/md5-cache/dev-python/vcstools-0.1.42
new file mode 100644
index 000000000000..3f6026ec374a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/vcstools-0.1.42
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python library for interacting with various VCS systems
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/vcstools
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=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/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://download.ros.org/downloads/vcstools/vcstools-0.1.42.tar.gz https://github.com/vcstools/vcstools/archive/0.1.42.tar.gz -> vcstools-0.1.42.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=68bd8f1f194c5947ea1a2c5e2d91a672
diff --git a/metadata/md5-cache/dev-python/weasyprint-0.41 b/metadata/md5-cache/dev-python/weasyprint-0.41
index 65196b39e450..3d3614526777 100644
--- a/metadata/md5-cache/dev-python/weasyprint-0.41
+++ b/metadata/md5-cache/dev-python/weasyprint-0.41
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( x11-libs/cairo x11-libs/gdk-pixbuf[jpeg?,jpeg2k?,tiff?] x11-libs/pango:0/0 >=dev-python/cairocffi-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-0.6:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cssselect2-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/html5lib-0.999999999[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyphen-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tinycss2-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-gfx/cairosvg-1.0.20[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pdfrw-0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/ahem ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( x11-libs/cairo x11-libs/gdk-pixbuf[jpeg?,tiff?] x11-libs/pango:0/0 >=dev-python/cairocffi-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-0.6:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cssselect2-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/html5lib-0.999999999[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyphen-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tinycss2-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-gfx/cairosvg-1.0.20[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pdfrw-0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/ahem ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Visual rendering engine for HTML and CSS that can export to PDF
 EAPI=6
 HOMEPAGE=https://weasyprint.org https://github.com/Kozea/WeasyPrint
-IUSE=jpeg jpeg2k test tiff python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=jpeg test tiff python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=x11-libs/cairo x11-libs/gdk-pixbuf[jpeg?,jpeg2k?,tiff?] x11-libs/pango:0/0 >=dev-python/cairocffi-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-0.6:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cssselect2-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/html5lib-0.999999999[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyphen-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tinycss2-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-gfx/cairosvg-1.0.20[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pdfrw-0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=x11-libs/cairo x11-libs/gdk-pixbuf[jpeg?,tiff?] x11-libs/pango:0/0 >=dev-python/cairocffi-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-0.6:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cssselect2-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/html5lib-0.999999999[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyphen-0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tinycss2-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-gfx/cairosvg-1.0.20[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pdfrw-0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/W/WeasyPrint/WeasyPrint-0.41.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4f8999c1a75c8e6c4ec7a4dd37caa786
+_md5_=79a09bcc0ab215767acd082b257a6dc2
diff --git a/metadata/md5-cache/dev-python/weasyprint-43 b/metadata/md5-cache/dev-python/weasyprint-43
index 62e6e0c92de4..cfc16cc30652 100644
--- a/metadata/md5-cache/dev-python/weasyprint-43
+++ b/metadata/md5-cache/dev-python/weasyprint-43
@@ -1,15 +1,15 @@
 BDEPEND=python_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(-)]
 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(-)] test? ( >=x11-libs/cairo-1.15.4 x11-libs/gdk-pixbuf[jpeg?,jpeg2k?,tiff?] x11-libs/pango:0/0 >=dev-python/cairocffi-0.9[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-0.6:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cssselect2-0.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/html5lib-0.999999999[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyphen-0.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tinycss2-0.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-gfx/cairosvg-1.0.20[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/ahem )
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=x11-libs/cairo-1.15.4 x11-libs/gdk-pixbuf[jpeg?,tiff?] x11-libs/pango:0/0 >=dev-python/cairocffi-0.9[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-0.6:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cssselect2-0.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/html5lib-0.999999999[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyphen-0.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tinycss2-0.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-gfx/cairosvg-1.0.20[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/ahem )
 DESCRIPTION=Visual rendering engine for HTML and CSS that can export to PDF
 EAPI=7
 HOMEPAGE=https://weasyprint.org https://github.com/Kozea/WeasyPrint
-IUSE=jpeg jpeg2k test tiff python_targets_python3_5 python_targets_python3_6
+IUSE=jpeg test tiff python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=x11-libs/cairo-1.15.4 x11-libs/gdk-pixbuf[jpeg?,jpeg2k?,tiff?] x11-libs/pango:0/0 >=dev-python/cairocffi-0.9[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-0.6:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cssselect2-0.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/html5lib-0.999999999[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyphen-0.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tinycss2-0.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-gfx/cairosvg-1.0.20[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=>=x11-libs/cairo-1.15.4 x11-libs/gdk-pixbuf[jpeg?,tiff?] x11-libs/pango:0/0 >=dev-python/cairocffi-0.9[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-0.6:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cssselect2-0.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/html5lib-0.999999999[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyphen-0.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tinycss2-0.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-gfx/cairosvg-1.0.20[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WeasyPrint/WeasyPrint-43.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=00079bac69a2d8c54381af56052c44c4
+_md5_=54202e9f064982e78549cac69723197a
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.15.5 b/metadata/md5-cache/dev-python/werkzeug-0.15.5
new file mode 100644
index 000000000000..b5a70f780fe5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/werkzeug-0.15.5
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-xprocess[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Collection of various utilities for WSGI applications
+EAPI=7
+HOMEPAGE=http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.15.5.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=85bd919444602fef133aa9eaa750f9b7
diff --git a/metadata/md5-cache/dev-python/yarl-0.9.8-r1 b/metadata/md5-cache/dev-python/yarl-0.9.8-r1
deleted file mode 100644
index 2b48cd17cced..000000000000
--- a/metadata/md5-cache/dev-python/yarl-0.9.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/multidict[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest-runner[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=Yet another URL library
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/yarl/
-IUSE=test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/multidict[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/y/yarl/yarl-0.9.8.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ed1e1e64dacaa6d80e83b122dd45343
diff --git a/metadata/md5-cache/dev-python/yarl-1.2.4 b/metadata/md5-cache/dev-python/yarl-1.2.4
deleted file mode 100644
index 8f6488d1b8b7..000000000000
--- a/metadata/md5-cache/dev-python/yarl-1.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/multidict-4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[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=Yet another URL library
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/yarl/
-IUSE=test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/multidict-4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/y/yarl/yarl-1.2.4.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8ecf240df39e4d136f5b20997e8092f
diff --git a/metadata/md5-cache/dev-python/yarl-1.2.6 b/metadata/md5-cache/dev-python/yarl-1.2.6
deleted file mode 100644
index a060a1585508..000000000000
--- a/metadata/md5-cache/dev-python/yarl-1.2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/multidict-4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[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=Yet another URL library
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/yarl/
-IUSE=test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/multidict-4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/y/yarl/yarl-1.2.6.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8ecf240df39e4d136f5b20997e8092f
diff --git a/metadata/md5-cache/dev-python/yenc-0.4.0-r1 b/metadata/md5-cache/dev-python/yenc-0.4.0-r1
deleted file mode 100644
index 80fb75c24d22..000000000000
--- a/metadata/md5-cache/dev-python/yenc-0.4.0-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(-)]
-DESCRIPTION=Module providing raw yEnc encoding/decoding
-EAPI=5
-HOMEPAGE=http://www.golug.it/yenc.html
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.golug.it/pub/yenc/yenc-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2f2a1b087a67ea23566bfab4748e12ad
diff --git a/metadata/md5-cache/dev-python/zipp-0.5.1 b/metadata/md5-cache/dev-python/zipp-0.5.1
deleted file mode 100644
index 046c112ec6f7..000000000000
--- a/metadata/md5-cache/dev-python/zipp-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/contextlib2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pathlib2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Backport of pathlib-compatible object wrapper for zip files
-EAPI=7
-HOMEPAGE=https://github.com/jaraco/zipp
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/z/zipp/zipp-0.5.1.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1801a3eb424b41b8a9adf78fbf27b212
diff --git a/metadata/md5-cache/dev-python/zipp-0.6.0 b/metadata/md5-cache/dev-python/zipp-0.6.0
new file mode 100644
index 000000000000..a070ddee158a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zipp-0.6.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/more-itertools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/contextlib2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pathlib2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Backport of pathlib-compatible object wrapper for zip files
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/zipp
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/more-itertools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/z/zipp/zipp-0.6.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=d9c1d05c618c700a369fc71e53e20676
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 2046bba0f4eb..ae307ccc2725 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.12.4_p201906140200 b/metadata/md5-cache/dev-qt/qt-docs-5.12.4_p201906140200
new file mode 100644
index 000000000000..7f07dad91e85
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.12.4_p201906140200
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/p7zip
+DEFINED_PHASES=install
+DESCRIPTION=Qt5 documentation, for use with Qt Creator and other tools
+EAPI=7
+HOMEPAGE=https://doc.qt.io/
+IUSE=charts datavis +html networkauth +qch script virtualkeyboard webengine +scxml +speech +sql +x11extras +declarative +svg +webchannel +quickcontrols2 +linguist +printsupport +imageformats +gui +graphicaleffects +concurrent +webview +sensors +dbus +assistant +multimedia +help +network +websockets +serialport +xmlpatterns +wayland +serialbus +bluetooth +test +3d +opengl +gamepad +xml +core +positioning +quickcontrols +designer +qdoc +location +widgets
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=FDL-1.3
+REQUIRED_USE=|| ( html qch )
+SLOT=5
+SRC_URI=charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc.qtcharts/5.12.4-0-201906140200qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc.qtdatavis3d/5.12.4-0-201906140200qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc.qtnetworkauth/5.12.4-0-201906140200qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc.qtscript/5.12.4-0-201906140200qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc.qtscript/5.12.4-0-201906140200qtscripttools-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc.qtvirtualkeyboard/5.12.4-0-201906140200qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc.qtwebengine/5.12.4-0-201906140200qtwebengine-documentation.7z ) scxml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtscxml-documentation.7z ) speech? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtspeech-documentation.7z ) sql? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtsql-documentation.7z ) x11extras? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtx11extras-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtqml-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtqmltest-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtquick-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtquickdialogs-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtquickextras-documentation.7z ) svg? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtsvg-documentation.7z ) webchannel? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtwebchannel-documentation.7z ) quickcontrols2? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtquickcontrols-documentation.7z ) linguist? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtlinguist-documentation.7z ) printsupport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtprintsupport-documentation.7z ) imageformats? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtimageformats-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtgui-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtplatformheaders-documentation.7z ) graphicaleffects? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtgraphicaleffects-documentation.7z ) concurrent? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtconcurrent-documentation.7z ) webview? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtwebview-documentation.7z ) sensors? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtsensors-documentation.7z ) dbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtdbus-documentation.7z ) assistant? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtassistant-documentation.7z ) multimedia? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtmultimedia-documentation.7z ) help? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qthelp-documentation.7z ) network? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtnetwork-documentation.7z ) websockets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtwebsockets-documentation.7z ) serialport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtserialport-documentation.7z ) xmlpatterns? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtxmlpatterns-documentation.7z ) wayland? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtwaylandcompositor-documentation.7z ) serialbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtserialbus-documentation.7z ) bluetooth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtbluetooth-documentation.7z ) test? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qttestlib-documentation.7z ) 3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qt3d-documentation.7z ) opengl? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtopengl-documentation.7z ) gamepad? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtgamepad-documentation.7z ) xml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtxml-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtcore-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qmake-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtdoc-documentation.7z ) positioning? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtpositioning-documentation.7z ) quickcontrols? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtquickcontrols1-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtdesigner-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtuitools-documentation.7z ) qdoc? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qdoc-documentation.7z ) location? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtlocation-documentation.7z ) widgets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5124_src_doc_examples/qt.qt5.5124.doc/5.12.4-0-201906140200qtwidgets-documentation.7z )
+_md5_=e900af52a9a78308803da1a67e42a728
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.12.3 b/metadata/md5-cache/dev-qt/qtimageformats-5.12.3
index 3a6f28bcf195..f664cbfc7bbb 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.12.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.12.3 )
+DEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.12.3 )
 DESCRIPTION=Additional format plugins for the Qt image I/O system
 EAPI=6
 HOMEPAGE=https://www.qt.io/
-IUSE=jpeg2k mng debug test
+IUSE=mng debug test
 KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtimageformats-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=19a578a929c15d261fa913e6aea35cb9
+_md5_=2138393e55d9771315bcc0ab1e4daea9
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.12.4 b/metadata/md5-cache/dev-qt/qtimageformats-5.12.4
deleted file mode 100644
index 29087e38af8f..000000000000
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.12.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.12.4 ~dev-qt/qtgui-5.12.4 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) test? ( ~dev-qt/qttest-5.12.4 )
-DESCRIPTION=Additional format plugins for the Qt image I/O system
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=jpeg2k mng debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.12.4 ~dev-qt/qtgui-5.12.4 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.12
-SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.4/submodules/qtimageformats-everywhere-src-5.12.4.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=156a718d9064e2b492ce6fc43e665ebf
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.12.4-r1 b/metadata/md5-cache/dev-qt/qtimageformats-5.12.4-r1
new file mode 100644
index 000000000000..3a190cc5bba3
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.12.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.4 ~dev-qt/qtgui-5.12.4 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) test? ( ~dev-qt/qttest-5.12.4 )
+DESCRIPTION=Additional format plugins for the Qt image I/O system
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=mng debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.4 ~dev-qt/qtgui-5.12.4 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.4/submodules/qtimageformats-everywhere-src-5.12.4.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=bf4977c17e0c0f9b0fc6d988dda6dfc6
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.12.4 b/metadata/md5-cache/dev-qt/qtserialbus-5.12.4
index 9d591fd60d39..accb1200da48 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.12.4
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.12.4
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.4/submodules/qtserialbus-everywhere-src-5.12.4.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=bc5c9141db85156750c2b961033e7f93
+_md5_=ceab46827599c66564955891369738be
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.12.4 b/metadata/md5-cache/dev-qt/qtwebengine-5.12.4
index 68b56657fda3..8f93f3dead87 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.12.4
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.12.4
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.4/submodules/qtwebengine-everywhere-src-5.12.4.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=13796e389aa2e3ac7a08d0ad19f86ee6
+_md5_=a73552b1f6d2b11a1eb97113bb9ee0a3
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120 b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
index 5fda613ce86e..8212cdd745bc 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2 dev-libs/libxslt >=dev-q
 REQUIRED_USE=nsplugin? ( X ) qml? ( opengl ) ?? ( gstreamer multimedia )
 SLOT=5/5.212
 SRC_URI=mirror://gentoo/qtwebkit-5.212.0_pre20180120.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ea4bb3d38f3620e8149677b78e57b61
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 237e01d6f147..7bd13b32d6e3 100644
--- a/metadata/md5-cache/dev-ros/Manifest.gz
+++ b/metadata/md5-cache/dev-ros/Manifest.gz
diff --git a/metadata/md5-cache/dev-ros/cmake_modules-0.4.2 b/metadata/md5-cache/dev-ros/cmake_modules-0.4.2
new file mode 100644
index 000000000000..68c1df9e97fc
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/cmake_modules-0.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=CMake Modules which are not distributed with CMake but are commonly used by ROS packages
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/cmake_modules https://github.com/ros/cmake_modules
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/cmake_modules/archive/0.4.2.tar.gz -> cmake_modules-0.4.2.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=df40c729494090eed5488a7cec1940f1
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.12.5 b/metadata/md5-cache/dev-ros/cv_bridge-1.12.5
deleted file mode 100644
index 118cccd08935..000000000000
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.12.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Converts between ROS Image messages and OpenCV images
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/cv_bridge https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.5.tar.gz -> vision_opencv-1.12.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d2fa4c545ed8561ca2b6dec5aca799b
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.12.7 b/metadata/md5-cache/dev-ros/cv_bridge-1.12.7
deleted file mode 100644
index 45649708f05c..000000000000
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.12.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Converts between ROS Image messages and OpenCV images
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/cv_bridge https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.7.tar.gz -> vision_opencv-1.12.7.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d2fa4c545ed8561ca2b6dec5aca799b
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.12.8 b/metadata/md5-cache/dev-ros/cv_bridge-1.12.8
deleted file mode 100644
index d70b4b42d8a2..000000000000
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.12.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Converts between ROS Image messages and OpenCV images
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/cv_bridge https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.8.tar.gz -> vision_opencv-1.12.8.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7377354b09a4e46449a78f5e248047a
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.13.0 b/metadata/md5-cache/dev-ros/cv_bridge-1.13.0
index ffa3c1259d8a..2999293f422c 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.13.0
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.13.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.13.0.tar.gz -> vision_opencv-1.13.0.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7377354b09a4e46449a78f5e248047a
+_md5_=1cd5f8bacd9b5ebdac21150828842eed
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-9999 b/metadata/md5-cache/dev-ros/cv_bridge-9999
index f02f4ed878a6..577b2101b10e 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-9999
+++ b/metadata/md5-cache/dev-ros/cv_bridge-9999
@@ -10,4 +10,4 @@ RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d2fa4c545ed8561ca2b6dec5aca799b
+_md5_=1cd5f8bacd9b5ebdac21150828842eed
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.15.2 b/metadata/md5-cache/dev-ros/fake_localization-1.15.2
deleted file mode 100644
index 361d5da08198..000000000000
--- a/metadata/md5-cache/dev-ros/fake_localization-1.15.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A ROS node that simply forwards odometry information
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/fake_localization https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.15.2.tar.gz -> navigation-1.15.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=522029e9ccc9fc24d750386ade31e864
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.16.0 b/metadata/md5-cache/dev-ros/fake_localization-1.16.0
deleted file mode 100644
index cc2783499480..000000000000
--- a/metadata/md5-cache/dev-ros/fake_localization-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A ROS node that simply forwards odometry information
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/fake_localization https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.0.tar.gz -> navigation-1.16.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe5ebab6223f30f32aae686cac901a1f
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.16.1 b/metadata/md5-cache/dev-ros/fake_localization-1.16.1
deleted file mode 100644
index 2505a650a823..000000000000
--- a/metadata/md5-cache/dev-ros/fake_localization-1.16.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A ROS node that simply forwards odometry information
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/fake_localization https://github.com/ros-planning/navigation
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.1.tar.gz -> navigation-1.16.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe5ebab6223f30f32aae686cac901a1f
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.16.2 b/metadata/md5-cache/dev-ros/fake_localization-1.16.2
index 889909c98c61..530679b4c751 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-1.16.2
+++ b/metadata/md5-cache/dev-ros/fake_localization-1.16.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz -> navigation-1.16.2.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe5ebab6223f30f32aae686cac901a1f
+_md5_=04439bf821be5ee97d7b69a714c4ad79
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.8.5 b/metadata/md5-cache/dev-ros/gazebo_dev-2.8.5
new file mode 100644
index 000000000000..acbd0a8c6f7e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-2.8.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-electronics/gazebo sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Provides a cmake config for the default version of Gazebo for the ROS distribution.
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/gazebo_dev https://github.com/ros-simulation/gazebo_ros_pkgs
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=sci-electronics/gazebo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.5.tar.gz -> gazebo_ros_pkgs-2.8.5.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=699aa35637185d2a77dbbabba2914f64
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.5 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.5
new file mode 100644
index 000000000000..194325b04ffc
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/gazebo_msgs https://github.com/ros-simulation/gazebo_ros_pkgs
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.5.tar.gz -> gazebo_ros_pkgs-2.8.5.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=61db6dd02a858b396a9ac81d99cde6e8
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.8.5 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.8.5
new file mode 100644
index 000000000000..21fa9bcc3beb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.8.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/gazebo_plugins https://github.com/ros-simulation/gazebo_ros_pkgs
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD Apache-2.0
+RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.5.tar.gz -> gazebo_ros_pkgs-2.8.5.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9f37d40421cd79f53ed7a0361460fffa
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.8.5 b/metadata/md5-cache/dev-ros/gazebo_ros-2.8.5
new file mode 100644
index 000000000000..d8642cf95496
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.8.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/gazebo_ros https://github.com/ros-simulation/gazebo_ros_pkgs
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.5.tar.gz -> gazebo_ros_pkgs-2.8.5.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4364b932e19a7b79eb0d98383fd4520
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.5 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.5
new file mode 100644
index 000000000000..6d82fac75ece
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS control plugins for gazebo
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.5.tar.gz -> gazebo_ros_pkgs-2.8.5.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6dcbbe505259630f1eeedd39f676538a
diff --git a/metadata/md5-cache/dev-ros/gencpp-0.5.5 b/metadata/md5-cache/dev-ros/gencpp-0.5.5
deleted file mode 100644
index ba0c4d2623e3..000000000000
--- a/metadata/md5-cache/dev-ros/gencpp-0.5.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=ROS C++ message definition and serialization generators
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/gencpp
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0/0.5.5
-SRC_URI=https://github.com/ros/gencpp/archive/0.5.5.tar.gz -> gencpp-0.5.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95eceb4c6847de23d54dc8b21056eaab
diff --git a/metadata/md5-cache/dev-ros/gencpp-0.6.2 b/metadata/md5-cache/dev-ros/gencpp-0.6.2
new file mode 100644
index 000000000000..5dcfd8a5dd23
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gencpp-0.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS C++ message definition and serialization generators
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gencpp
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0/0.6.2
+SRC_URI=https://github.com/ros/gencpp/archive/0.6.2.tar.gz -> gencpp-0.6.2.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=95eceb4c6847de23d54dc8b21056eaab
diff --git a/metadata/md5-cache/dev-ros/genlisp-0.4.17 b/metadata/md5-cache/dev-ros/genlisp-0.4.17
new file mode 100644
index 000000000000..e537de0c384b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/genlisp-0.4.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Common-Lisp ROS message and service generators
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/genlisp https://github.com/ros/genlisp
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0/0.4.17
+SRC_URI=https://github.com/ros/genlisp/archive/0.4.17.tar.gz -> genlisp-0.4.17.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cb10e924d70556ba583bf5651c67153f
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.10 b/metadata/md5-cache/dev-ros/genmsg-0.5.10
deleted file mode 100644
index ac7df94c44c1..000000000000
--- a/metadata/md5-cache/dev-ros/genmsg-0.5.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python library for generating ROS message and service data structures for various languages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/genmsg https://github.com/ros/genmsg
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros/genmsg/archive/0.5.10.tar.gz -> genmsg-0.5.10.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=651ac86d5e6294b3e2249598db83e3ac
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.12 b/metadata/md5-cache/dev-ros/genmsg-0.5.12
new file mode 100644
index 000000000000..6ac21d7151b0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/genmsg-0.5.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Python library for generating ROS message and service data structures for various languages
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/genmsg https://github.com/ros/genmsg
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/genmsg/archive/0.5.12.tar.gz -> genmsg-0.5.12.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=651ac86d5e6294b3e2249598db83e3ac
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.9 b/metadata/md5-cache/dev-ros/genmsg-0.5.9
deleted file mode 100644
index 29e524ede99b..000000000000
--- a/metadata/md5-cache/dev-ros/genmsg-0.5.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python library for generating ROS message and service data structures for various languages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/genmsg https://github.com/ros/genmsg
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros/genmsg/archive/0.5.9.tar.gz -> genmsg-0.5.9.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=651ac86d5e6294b3e2249598db83e3ac
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.8 b/metadata/md5-cache/dev-ros/genpy-0.6.8
new file mode 100644
index 000000000000..758380ba897b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/genpy-0.6.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Python ROS message and service generators
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/genpy
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0/0.6.8
+SRC_URI=https://github.com/ros/genpy/archive/0.6.8.tar.gz -> genpy-0.6.8.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=be63482e1af9e240060b0a43c7ed8a82
diff --git a/metadata/md5-cache/dev-ros/gmapping-1.4.0 b/metadata/md5-cache/dev-ros/gmapping-1.4.0
new file mode 100644
index 000000000000..a0c10dd5c4ae
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gmapping-1.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping dev-ros/rostest sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/gmapping https://github.com/ros-perception/slam_gmapping
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.4.0.tar.gz -> slam_gmapping-1.4.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1246be89fd03a402793f7b056619fa5d
diff --git a/metadata/md5-cache/dev-ros/gmapping-9999 b/metadata/md5-cache/dev-ros/gmapping-9999
index 0f6d1c675095..5ed05f31396c 100644
--- a/metadata/md5-cache/dev-ros/gmapping-9999
+++ b/metadata/md5-cache/dev-ros/gmapping-9999
@@ -4,10 +4,10 @@ DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/gmapping https://github.com/ros-perception/slam_gmapping
 IUSE=python_targets_python2_7 test
-LICENSE=CC-BY-NC-SA-2.5
+LICENSE=BSD
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=647914d504ce7107968266bb04b6f792
+_md5_=8c1cddf4ddd706e807a1fa7e0f730302
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.14.2 b/metadata/md5-cache/dev-ros/hardware_interface-0.14.2
deleted file mode 100644
index c476996e90ca..000000000000
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.14.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Hardware Interface base class
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-controls/ros_control/archive/0.14.2.tar.gz -> ros_control-0.14.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15722f3540ecdb25dc7693a6c0ac5e16
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.15.0 b/metadata/md5-cache/dev-ros/hardware_interface-0.15.0
deleted file mode 100644
index f734bf500063..000000000000
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Hardware Interface base class
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-controls/ros_control/archive/0.15.0.tar.gz -> ros_control-0.15.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15722f3540ecdb25dc7693a6c0ac5e16
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.15.1 b/metadata/md5-cache/dev-ros/hardware_interface-0.15.1
index 2fcb4d740866..86448f71bea6 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.15.1
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.15.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Hardware Interface base class
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.15.1.tar.gz -> ros_control-0.15.1.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=875b1167a68c0830f66150253c920874
+_md5_=836e299def877687eca05bffdec3cc86
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-9999 b/metadata/md5-cache/dev-ros/hardware_interface-9999
index e7163a3f147b..f54903e4d086 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-9999
+++ b/metadata/md5-cache/dev-ros/hardware_interface-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Hardware Interface base class
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
@@ -10,4 +10,4 @@ RDEPEND=dev-ros/roscpp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b194a47c6b3bd77779c013f22eb23de6
+_md5_=836e299def877687eca05bffdec3cc86
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-0.3.5 b/metadata/md5-cache/dev-ros/hector_mapping-0.3.5
index a83980f732a9..11f2bcf5e5e7 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_mapping-0.3.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca50f3b375157bcecba70c32e86c6cda
+_md5_=ebc9c4412c448a0ecfb1cd2f371fc211
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1 b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
index c52cfc5f4ee0..222d58e8da2c 100644
--- a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
+++ b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8dfb2541d078e116209bd80b52b9622
+_md5_=9dab88378b27a69a01af803e933e2b04
diff --git a/metadata/md5-cache/dev-ros/image_view-1.12.22-r1 b/metadata/md5-cache/dev-ros/image_view-1.12.22-r1
deleted file mode 100644
index a99f85be2377..000000000000
--- a/metadata/md5-cache/dev-ros/image_view-1.12.22-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Simple viewer for ROS image topics
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.22.tar.gz -> image_pipeline-1.12.22.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d921cfda9d83b7975bac159de7bc7ac
diff --git a/metadata/md5-cache/dev-ros/image_view-1.12.23 b/metadata/md5-cache/dev-ros/image_view-1.12.23
index 9cc380c9dfe8..c096a88691f6 100644
--- a/metadata/md5-cache/dev-ros/image_view-1.12.23
+++ b/metadata/md5-cache/dev-ros/image_view-1.12.23
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.23.tar.gz -> image_pipeline-1.12.23.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6223da615e6092d612f95ecee7618495
+_md5_=962534b98e38bc55f98c96a2137c05b3
diff --git a/metadata/md5-cache/dev-ros/image_view-9999 b/metadata/md5-cache/dev-ros/image_view-9999
index d9ef16fea1d2..bbace210b900 100644
--- a/metadata/md5-cache/dev-ros/image_view-9999
+++ b/metadata/md5-cache/dev-ros/image_view-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/dynamic_reconfigure[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
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d921cfda9d83b7975bac159de7bc7ac
+_md5_=39e4d0e675d2617432a66b7ce00756f8
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.1.5-r1 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.1.5-r1
deleted file mode 100644
index 0c4646599837..000000000000
--- a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.1.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure dev-libs/boost:=[threads] test? ( dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/imu_filter_madgwick https://github.com/ccny-ros-pkg/imu_tools
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.1.5.tar.gz -> imu_tools-1.1.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14016f550bf42136b3999825c0c3f490
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.0 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.0
deleted file mode 100644
index dfbf0e70001f..000000000000
--- a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure dev-libs/boost:=[threads] test? ( dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Fuses angular velocities, accelerations, and (optionally) magnetic readings from an IMU device
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/imu_filter_madgwick https://github.com/ccny-ros-pkg/imu_tools
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.0.tar.gz -> imu_tools-1.2.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=09803f948c48b24a4f035d5cb62f20cf
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.1 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.1
index d6458424795b..95279a080f4e 100644
--- a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.1
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.1.tar.gz -> imu_tools-1.2.1.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6868245c8b7f73e8c70a302ff83ddf6a
+_md5_=205fd72fcb0820572150f40c51c77383
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
index aa4eca0c1390..b26e8c838e3b 100644
--- a/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
@@ -10,4 +10,4 @@ RDEPEND=dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4df63faa124579d8f3cd9c23fd68c977
+_md5_=205fd72fcb0820572150f40c51c77383
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.1 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.1
deleted file mode 100644
index 4c1b8239a6fb..000000000000
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Interactive marker tutorials
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/interactive_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.1.tar.gz -> visualization_tutorials-0.10.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91eb3fead59390955ea837629cf105e7
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.2 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.2
deleted file mode 100644
index 63e78755e455..000000000000
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Interactive marker tutorials
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/interactive_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.2.tar.gz -> visualization_tutorials-0.10.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27cbba0feb39dede9b76c320f9605c26
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.3 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.3
deleted file mode 100644
index 6beaa13bb7a1..000000000000
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Interactive marker tutorials
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/interactive_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz -> visualization_tutorials-0.10.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27cbba0feb39dede9b76c320f9605c26
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.3-r1 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.3-r1
new file mode 100644
index 000000000000..8e1f3b6ec517
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Interactive marker tutorials
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/interactive_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.3.tar.gz -> visualization_tutorials-0.10.3.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4601e0bb5f2ccd6ef1f7552661ce47b1
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
index 7a0d173c5d7a..bbd4dfd2a7fe 100644
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Interactive marker tutorials
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/interactive_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91eb3fead59390955ea837629cf105e7
+_md5_=4601e0bb5f2ccd6ef1f7552661ce47b1
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-1.7.4-r1 b/metadata/md5-cache/dev-ros/laser_assembler-1.7.4-r1
deleted file mode 100644
index 40d61b2a1cf5..000000000000
--- a/metadata/md5-cache/dev-ros/laser_assembler-1.7.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/laser_assembler https://github.com/ros-perception/laser_assembler
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/laser_assembler/archive/1.7.4.tar.gz -> laser_assembler-1.7.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c66d9b7f0c5394ee2c31e20fb7c771e7
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-1.7.5 b/metadata/md5-cache/dev-ros/laser_assembler-1.7.5
deleted file mode 100644
index 067ac98f4115..000000000000
--- a/metadata/md5-cache/dev-ros/laser_assembler-1.7.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/laser_assembler https://github.com/ros-perception/laser_assembler
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/laser_assembler/archive/1.7.5.tar.gz -> laser_assembler-1.7.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8b5eeec604e6b958d02d618955390ed0
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-1.7.7 b/metadata/md5-cache/dev-ros/laser_assembler-1.7.7
new file mode 100644
index 000000000000..8b79067d997f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/laser_assembler-1.7.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/laser_assembler https://github.com/ros-perception/laser_assembler
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/laser_assembler/archive/1.7.7.tar.gz -> laser_assembler-1.7.7.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=674fef94121722022d0546f32c920089
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14 b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
index 83d4a385f64d..7ea890defbf1 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5f151bc27625c02c6214ac747c076ba
+_md5_=20fc3a192d90ad9e4b172da42c5d2120
diff --git a/metadata/md5-cache/dev-ros/laser_filters-1.8.5-r1 b/metadata/md5-cache/dev-ros/laser_filters-1.8.5-r1
deleted file mode 100644
index a99ff657d715..000000000000
--- a/metadata/md5-cache/dev-ros/laser_filters-1.8.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/laser_filters/archive/1.8.5.tar.gz -> laser_filters-1.8.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f30ba5add3aa627f390d626dff82f58
diff --git a/metadata/md5-cache/dev-ros/laser_filters-1.8.7 b/metadata/md5-cache/dev-ros/laser_filters-1.8.7
new file mode 100644
index 000000000000..b3c29edc3305
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/laser_filters-1.8.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/laser_filters/archive/1.8.7.tar.gz -> laser_filters-1.8.7.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18f6323e5939b2b61ad55189e6dc35b7
diff --git a/metadata/md5-cache/dev-ros/libmavconn-0.19.0-r1 b/metadata/md5-cache/dev-ros/libmavconn-0.19.0-r1
index f2758720ab56..2374f1b83a87 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-0.19.0-r1
+++ b/metadata/md5-cache/dev-ros/libmavconn-0.19.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.19.0.tar.gz -> mavros-0.19.0.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62da6c05b0062da4c20d39a3c794966b
+_md5_=e3d81b918976ba16ab36414db745443b
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.2 b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.2
deleted file mode 100644
index 8ceb68c1b66f..000000000000
--- a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/python_qt_binding https://github.com/ros-visualization/python_qt_binding
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.3.2.tar.gz -> python_qt_binding-0.3.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=478220e21d182fb99f46cbde8da99b6d
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.3 b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.3
deleted file mode 100644
index e586979ab2b6..000000000000
--- a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/python_qt_binding https://github.com/ros-visualization/python_qt_binding
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.3.3.tar.gz -> python_qt_binding-0.3.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=478220e21d182fb99f46cbde8da99b6d
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.5-r1 b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.5-r1
new file mode 100644
index 000000000000..3c53ca39e778
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/python_qt_binding https://github.com/ros-visualization/python_qt_binding
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.3.5.tar.gz -> python_qt_binding-0.3.5.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=710dae089936cee710d2898d0a0eed2c
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.10 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.10
deleted file mode 100644
index 8d31e5fa8342..000000000000
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/qt_gui_cpp https://github.com/ros-visualization/qt_gui_core
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.10.tar.gz -> qt_gui_core-0.3.10.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=758e40eb529360557431e071c86b73da
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.8-r1 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.8-r1
deleted file mode 100644
index f7439208324f..000000000000
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/qt_gui_cpp https://github.com/ros-visualization/qt_gui_core
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.8.tar.gz -> qt_gui_core-0.3.8.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d116aebb44cefd22961eb80ba2424ee
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.9 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.9
deleted file mode 100644
index a688f96fc314..000000000000
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/qt_gui_cpp https://github.com/ros-visualization/qt_gui_core
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.9.tar.gz -> qt_gui_core-0.3.9.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=758e40eb529360557431e071c86b73da
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_server-0.7.4
deleted file mode 100644
index c0ed46f95601..000000000000
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.7.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=C++ implementation of the rosserial server side
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosserial_server https://github.com/ros-drivers/rosserial
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c9a90710602fcdc60cfe67257521e73
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_server-0.7.5
deleted file mode 100644
index fad2b22dc058..000000000000
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.7.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=C++ implementation of the rosserial server side
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosserial_server https://github.com/ros-drivers/rosserial
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=432a6f42123529205ce5f0b55681ebf7
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.7.6 b/metadata/md5-cache/dev-ros/rosserial_server-0.7.6
deleted file mode 100644
index 74f454256341..000000000000
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.7.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=C++ implementation of the rosserial server side
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosserial_server https://github.com/ros-drivers/rosserial
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.6.tar.gz -> rosserial-0.7.6.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1c918c9eb85037cd81d38d7f76db536
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.7.7 b/metadata/md5-cache/dev-ros/rosserial_server-0.7.7
deleted file mode 100644
index 3566b370a232..000000000000
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.7.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=C++ implementation of the rosserial server side
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosserial_server https://github.com/ros-drivers/rosserial
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.7.tar.gz -> rosserial-0.7.7.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1c918c9eb85037cd81d38d7f76db536
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_server-0.8.0
index f88b94d75298..d5b2f248fe50 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_server-0.8.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b5b47283555fb18f61bc9f922e7de50
+_md5_=5032e98f1ca0dc038ef3bde45df17edd
diff --git a/metadata/md5-cache/dev-ros/sound_play-0.3.1 b/metadata/md5-cache/dev-ros/sound_play-0.3.1
deleted file mode 100644
index 682d982876cb..000000000000
--- a/metadata/md5-cache/dev-ros/sound_play-0.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=ROS node that translates commands on a ROS topic (robotsound) into sounds
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/sound_play https://github.com/ros-drivers/audio_common
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gst-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-accessibility/festival media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.1.tar.gz -> audio_common-0.3.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0110c8d1394fff4eb9b891f26cfc9357
diff --git a/metadata/md5-cache/dev-ros/sound_play-0.3.2 b/metadata/md5-cache/dev-ros/sound_play-0.3.2
deleted file mode 100644
index 627ecac34c59..000000000000
--- a/metadata/md5-cache/dev-ros/sound_play-0.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=ROS node that translates commands on a ROS topic (robotsound) into sounds
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/sound_play https://github.com/ros-drivers/audio_common
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gst-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-accessibility/festival media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.2.tar.gz -> audio_common-0.3.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80d5a2b1b5327767b427a3b517f2ec1c
diff --git a/metadata/md5-cache/dev-ros/sound_play-0.3.3 b/metadata/md5-cache/dev-ros/sound_play-0.3.3
deleted file mode 100644
index e27abe748e93..000000000000
--- a/metadata/md5-cache/dev-ros/sound_play-0.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=ROS node that translates commands on a ROS topic (robotsound) into sounds
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/sound_play https://github.com/ros-drivers/audio_common
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gst-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-accessibility/festival media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.3.tar.gz -> audio_common-0.3.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80d5a2b1b5327767b427a3b517f2ec1c
diff --git a/metadata/md5-cache/dev-ros/sound_play-9999 b/metadata/md5-cache/dev-ros/sound_play-9999
deleted file mode 100644
index a085519531c8..000000000000
--- a/metadata/md5-cache/dev-ros/sound_play-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=ROS node that translates commands on a ROS topic (robotsound) into sounds
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/sound_play https://github.com/ros-drivers/audio_common
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gst-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-accessibility/festival media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0110c8d1394fff4eb9b891f26cfc9357
diff --git a/metadata/md5-cache/dev-ros/tf-1.11.9 b/metadata/md5-cache/dev-ros/tf-1.11.9
deleted file mode 100644
index 3718353b795f..000000000000
--- a/metadata/md5-cache/dev-ros/tf-1.11.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Maintains the relationship between coordinate frames in a tree structure buffered in time
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/tf https://github.com/ros/geometry
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros/geometry/archive/1.11.9.tar.gz -> geometry-1.11.9.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9faaa5981cb3611bfd69b147cb0828f
diff --git a/metadata/md5-cache/dev-ros/tf-1.12.0 b/metadata/md5-cache/dev-ros/tf-1.12.0
index ffcea162e008..eff43a01b0c4 100644
--- a/metadata/md5-cache/dev-ros/tf-1.12.0
+++ b/metadata/md5-cache/dev-ros/tf-1.12.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.12.0.tar.gz -> geometry-1.12.0.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79e8d1b03c0f9fedc9d11fe2e63ce18b
+_md5_=9045d6f856633a7687c03e9ef0b21fb2
diff --git a/metadata/md5-cache/dev-ros/turtle_tf-0.2.2 b/metadata/md5-cache/dev-ros/turtle_tf-0.2.2
deleted file mode 100644
index 264c9af53353..000000000000
--- a/metadata/md5-cache/dev-ros/turtle_tf-0.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Demonstrates how to write a tf broadcaster and listener with the turtlesim
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/turtle_tf https://github.com/ros/geometry_tutorials
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.2.tar.gz -> geometry_tutorials-0.2.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fff7c802a7d1541dcbc8676e8439918e
diff --git a/metadata/md5-cache/dev-ros/turtle_tf-0.2.2-r1 b/metadata/md5-cache/dev-ros/turtle_tf-0.2.2-r1
new file mode 100644
index 000000000000..a0db7f66b6bf
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/turtle_tf-0.2.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Demonstrates how to write a tf broadcaster and listener with the turtlesim
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/turtle_tf https://github.com/ros/geometry_tutorials
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.2.tar.gz -> geometry_tutorials-0.2.2.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=101b4305b76c950106fa4d8b1c4eda80
diff --git a/metadata/md5-cache/dev-ros/turtle_tf-9999 b/metadata/md5-cache/dev-ros/turtle_tf-9999
index 0dcfc576ebeb..969ce49bf89b 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf-9999
+++ b/metadata/md5-cache/dev-ros/turtle_tf-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Demonstrates how to write a tf broadcaster and listener with the turtlesim
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/turtle_tf https://github.com/ros/geometry_tutorials
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fff7c802a7d1541dcbc8676e8439918e
+_md5_=101b4305b76c950106fa4d8b1c4eda80
diff --git a/metadata/md5-cache/dev-ros/turtle_tf2-0.2.2 b/metadata/md5-cache/dev-ros/turtle_tf2-0.2.2
deleted file mode 100644
index ef70aa35eaf8..000000000000
--- a/metadata/md5-cache/dev-ros/turtle_tf2-0.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Demonstrates how to write a tf2 broadcaster and listener with the turtlesim
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/turtle_tf2 https://github.com/ros/geometry_tutorials
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.2.tar.gz -> geometry_tutorials-0.2.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c114d049850f8e668e117a6cfe206f07
diff --git a/metadata/md5-cache/dev-ros/turtle_tf2-0.2.2-r1 b/metadata/md5-cache/dev-ros/turtle_tf2-0.2.2-r1
new file mode 100644
index 000000000000..95ed07c33c48
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/turtle_tf2-0.2.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Demonstrates how to write a tf2 broadcaster and listener with the turtlesim
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/turtle_tf2 https://github.com/ros/geometry_tutorials
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.2.tar.gz -> geometry_tutorials-0.2.2.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=540dfabdce59d5bae2f00c9132793f0b
diff --git a/metadata/md5-cache/dev-ros/turtle_tf2-9999 b/metadata/md5-cache/dev-ros/turtle_tf2-9999
index e6fccf9602a5..69af9fdd3825 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf2-9999
+++ b/metadata/md5-cache/dev-ros/turtle_tf2-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Demonstrates how to write a tf2 broadcaster and listener with the turtlesim
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/turtle_tf2 https://github.com/ros/geometry_tutorials
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c114d049850f8e668e117a6cfe206f07
+_md5_=540dfabdce59d5bae2f00c9132793f0b
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1 b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1
new file mode 100644
index 000000000000..9e96d837d3e2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Online automated pattern-based object tracker relying on visual servoing
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/visp_auto_tracker https://github.com/lagadic/vision_visp
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e01966dc6e6639a1886e45a716923c70
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.8.0 b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.8.0
deleted file mode 100644
index 24212299cef4..000000000000
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Online automated pattern-based object tracker relying on visual servoing
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/visp_auto_tracker https://github.com/lagadic/vision_visp
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-2
-RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/lagadic/vision_visp/archive/jade-0.8.0.tar.gz -> vision_visp-0.8.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86441403c851ba02abf4712ae0934ddc
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.1 b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.1
deleted file mode 100644
index 3f6b4a5e5b07..000000000000
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Online automated pattern-based object tracker relying on visual servoing
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/visp_auto_tracker https://github.com/lagadic/vision_visp
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-2
-RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/lagadic/vision_visp/archive/jade-0.9.1.tar.gz -> vision_visp-0.9.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86441403c851ba02abf4712ae0934ddc
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.3 b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.3
deleted file mode 100644
index 1c32a62caced..000000000000
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Online automated pattern-based object tracker relying on visual servoing
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/visp_auto_tracker https://github.com/lagadic/vision_visp
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-2
-RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.9.3.tar.gz -> vision_visp-0.9.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ad80ca8db354523c62d1bec58386cce0
diff --git a/metadata/md5-cache/dev-ros/visp_bridge-0.11.1 b/metadata/md5-cache/dev-ros/visp_bridge-0.11.1
new file mode 100644
index 000000000000..f08c5227d2b1
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/visp_bridge-0.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-libs/ViSP:=[xml] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/camera_calibration_parsers dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Converts between ROS structures and ViSP structures
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/visp_bridge https://github.com/lagadic/vision_visp
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=sci-libs/ViSP:=[xml] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/camera_calibration_parsers dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8df979e22e22fb4886f15cd73df8b103
diff --git a/metadata/md5-cache/dev-ros/visp_camera_calibration-0.11.1 b/metadata/md5-cache/dev-ros/visp_camera_calibration-0.11.1
new file mode 100644
index 000000000000..fbec67f28114
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-0.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Calibration of cameras using a customizable pattern and ViSP library
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/visp_camera_calibration https://github.com/lagadic/vision_visp
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8211101923ee77a557eb8df1fea997c1
diff --git a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999 b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
index eea62f4243c3..8c0589de144a 100644
--- a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
@@ -10,4 +10,4 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/geometry_msgs[ros_messages_cx
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c0dfdf569bb8eb1b07b429c39b17b246
+_md5_=8211101923ee77a557eb8df1fea997c1
diff --git a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.11.1 b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.11.1
new file mode 100644
index 000000000000..cc3b32359776
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Estimates the camera position with respect to its effector using the ViSP library
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/visp_hand2eye_calibration https://github.com/lagadic/vision_visp
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4ca2d94ab4cc4d12bcfc4d72e1de3f22
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-0.11.1 b/metadata/md5-cache/dev-ros/visp_tracker-0.11.1
new file mode 100644
index 000000000000..0d819520dbd8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/visp_tracker-0.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Wraps the ViSP moving edge tracker provided by the ViSP visual servoing library into a ROS package
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/visp_tracker https://github.com/lagadic/vision_visp
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=410f84143342ba28b2089b1dced35088
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index b79a36c435e9..39eb97b2e6f4 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/acme-client-2.0.4 b/metadata/md5-cache/dev-ruby/acme-client-2.0.4
new file mode 100644
index 000000000000..f112401399cd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/acme-client-2.0.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9.1:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9.1:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/faraday-0.9.1:0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/vcr-2.9.3[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/vcr-2.9.3[ruby_targets_ruby25] dev-ruby/webmock[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/vcr-2.9.3[ruby_targets_ruby26] dev-ruby/webmock[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=A Ruby client for the letsencrypt's ACME protocol.
+EAPI=7
+HOMEPAGE=https://github.com/unixcharles/acme-client
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9.1:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9.1:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/faraday-0.9.1:0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/unixcharles/acme-client/archive/v2.0.4.tar.gz -> acme-client-2.0.4.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9edfe19ff24f4f5b1cef464542c9524a
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.0.0 b/metadata/md5-cache/dev-ruby/actioncable-6.0.0
new file mode 100644
index 000000000000..035886764e85
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0:*[ruby_targets_ruby25] dev-ruby/nio4r:2[ruby_targets_ruby25] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0:*[ruby_targets_ruby26] dev-ruby/nio4r:2[ruby_targets_ruby26] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby25] dev-ruby/test-unit:2[ruby_targets_ruby25] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby26] dev-ruby/test-unit:2[ruby_targets_ruby26] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Integrated WebSockets for Rails
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0:*[ruby_targets_ruby25] dev-ruby/nio4r:2[ruby_targets_ruby25] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0:*[ruby_targets_ruby26] dev-ruby/nio4r:2[ruby_targets_ruby26] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=test
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=4d67739e2f3c3a00c9651ae600ee9157
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.0 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.0
new file mode 100644
index 000000000000..ff564238b60d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby25] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby25] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby25] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby26] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby26] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby26] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Framework for designing email-service layers
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby25] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby25] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby25] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby26] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby26] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby26] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=20ccddd390c81309916e00b45cd82c56
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.0 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.0
new file mode 100644
index 000000000000..2847dee206e3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby25] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby25] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25] =dev-ruby/mail-2*:*[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby26] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby26] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26] =dev-ruby/mail-2*:*[ruby_targets_ruby26] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Framework for designing email-service layers
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby25] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby25] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25] =dev-ruby/mail-2*:*[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby26] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby26] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26] =dev-ruby/mail-2*:*[ruby_targets_ruby26] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=d19c00cdfef4543c239e599503598d13
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.0 b/metadata/md5-cache/dev-ruby/actionpack-6.0.0
new file mode 100644
index 000000000000..3cf8dc67e60e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby25] dev-ruby/rack:2.0[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby26] dev-ruby/rack:2.0[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby25] dev-ruby/bundler[ruby_targets_ruby25] >=dev-ruby/capybara-2.15[ruby_targets_ruby25] ~dev-ruby/activemodel-6.0.0[ruby_targets_ruby25] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby25] www-servers/puma[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby26] dev-ruby/bundler[ruby_targets_ruby26] >=dev-ruby/capybara-2.15[ruby_targets_ruby26] ~dev-ruby/activemodel-6.0.0[ruby_targets_ruby26] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby26] www-servers/puma[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Eases web-request routing, handling, and response
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby25] dev-ruby/rack:2.0[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby26] dev-ruby/rack:2.0[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0e613e6fef31c9229c18494f7fc11725
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.0 b/metadata/md5-cache/dev-ruby/actiontext-6.0.0
new file mode 100644
index 000000000000..6bc73dc34ba7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby25] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby25] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby26] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby26] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Edit and display rich text in Rails applications
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby25] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby25] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby26] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby26] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=247fe676ac64d76a65330c5c4f99c8f5
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.0 b/metadata/md5-cache/dev-ruby/actionview-6.0.0
new file mode 100644
index 000000000000..3509598a3df1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionview-6.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25] =dev-ruby/builder-3*:*[ruby_targets_ruby25] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26] =dev-ruby/builder-3*:*[ruby_targets_ruby26] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] ~dev-ruby/activemodel-6.0.0[ruby_targets_ruby25] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26] ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] ~dev-ruby/activemodel-6.0.0[ruby_targets_ruby26] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25] =dev-ruby/builder-3*:*[ruby_targets_ruby25] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26] =dev-ruby/builder-3*:*[ruby_targets_ruby26] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=4f4d42e480572318a26559db180b86f5
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.0 b/metadata/md5-cache/dev-ruby/activejob-6.0.0
new file mode 100644
index 000000000000..e7bba987f873
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activejob-6.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Job framework with pluggable queues
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=65d93f2671bcb28c46ceca110232b9a6
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.0 b/metadata/md5-cache/dev-ruby/activemodel-6.0.0
new file mode 100644
index 000000000000..7b0f94d10bca
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0:*[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-6.0.0[ruby_targets_ruby25] dev-ruby/test-unit:2[ruby_targets_ruby25] dev-ruby/mocha[ruby_targets_ruby25] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.0.0[ruby_targets_ruby26] dev-ruby/test-unit:2[ruby_targets_ruby26] dev-ruby/mocha[ruby_targets_ruby26] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0:*[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=49996a5c47bdd747ec7de8cf23563a7d
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.0 b/metadata/md5-cache/dev-ruby/activerecord-6.0.0
new file mode 100644
index 000000000000..153895b7d38e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] ~dev-ruby/activemodel-6.0.0[ruby_targets_ruby25] dev-ruby/arel:9.0[ruby_targets_ruby25] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby25] ) mysql? ( || ( dev-ruby/mysql2:0.5[ruby_targets_ruby25] >=dev-ruby/mysql2-0.4.4:0.4[ruby_targets_ruby25] ) ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby25] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby25] ) ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] ~dev-ruby/activemodel-6.0.0[ruby_targets_ruby26] dev-ruby/arel:9.0[ruby_targets_ruby26] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26] ) mysql? ( || ( dev-ruby/mysql2:0.5[ruby_targets_ruby26] >=dev-ruby/mysql2-0.4.4:0.4[ruby_targets_ruby26] ) ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby26] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby26] ) ) ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby25] dev-ruby/mocha[ruby_targets_ruby25] dev-ruby/minitest:5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26] ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby26] dev-ruby/mocha[ruby_targets_ruby26] dev-ruby/minitest:5[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails/
+IUSE=mysql postgres sqlite test ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] ~dev-ruby/activemodel-6.0.0[ruby_targets_ruby25] dev-ruby/arel:9.0[ruby_targets_ruby25] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby25] ) mysql? ( || ( dev-ruby/mysql2:0.5[ruby_targets_ruby25] >=dev-ruby/mysql2-0.4.4:0.4[ruby_targets_ruby25] ) ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby25] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby25] ) ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] ~dev-ruby/activemodel-6.0.0[ruby_targets_ruby26] dev-ruby/arel:9.0[ruby_targets_ruby26] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26] ) mysql? ( || ( dev-ruby/mysql2:0.5[ruby_targets_ruby26] >=dev-ruby/mysql2-0.4.4:0.4[ruby_targets_ruby26] ) ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby26] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby26] ) ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=51bf987ecf9b903ae4d3ed047e2b939b
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.0 b/metadata/md5-cache/dev-ruby/activestorage-6.0.0
new file mode 100644
index 000000000000..db986d8c4b86
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0:*[ruby_targets_ruby25] ~dev-ruby/activerecord-6.0.0:*[ruby_targets_ruby25] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby25] =dev-ruby/marcel-0.3*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0:*[ruby_targets_ruby26] ~dev-ruby/activerecord-6.0.0:*[ruby_targets_ruby26] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby26] =dev-ruby/marcel-0.3*[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-6.0.0[ruby_targets_ruby25] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby25] dev-ruby/test-unit:2[ruby_targets_ruby25] dev-ruby/mini_magick[ruby_targets_ruby25] dev-ruby/mocha[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] dev-ruby/sqlite3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.0.0[ruby_targets_ruby26] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby26] dev-ruby/test-unit:2[ruby_targets_ruby26] dev-ruby/mini_magick[ruby_targets_ruby26] dev-ruby/mocha[ruby_targets_ruby26] dev-ruby/rake[ruby_targets_ruby26] dev-ruby/sqlite3[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/mupdf ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Attach cloud and local files in Rails applications
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0:*[ruby_targets_ruby25] ~dev-ruby/activerecord-6.0.0:*[ruby_targets_ruby25] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby25] =dev-ruby/marcel-0.3*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0:*[ruby_targets_ruby26] ~dev-ruby/activerecord-6.0.0:*[ruby_targets_ruby26] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby26] =dev-ruby/marcel-0.3*[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=2bb30f8571aed9b29ba98aa4c5ec5675
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.0 b/metadata/md5-cache/dev-ruby/activesupport-6.0.0
index b5cb611bff5b..b8efd883c8c4 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.0
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25] dev-ruby/i18n:1[ruby_targets_ruby25] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby25] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25] >=dev-ruby/zeitwerk-2.1.8:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26] dev-ruby/i18n:1[ruby_targets_ruby26] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26] >=dev-ruby/zeitwerk-2.1.8:2[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=cdf7fd2bbc7ce4bec17e1d5a0d7944f2
+_md5_=0153658cb97156f06f924cb1be02c602
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.6.0 b/metadata/md5-cache/dev-ruby/addressable-2.6.0
index 2c82d8a2a0a7..9c75f03a546d 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.6.0
+++ b/metadata/md5-cache/dev-ruby/addressable-2.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=A replacement for the URI implementation that is part of Ruby's stan
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable
 IUSE=doc test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby24] <dev-ruby/public_suffix-4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby25] <dev-ruby/public_suffix-4:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby26] <dev-ruby/public_suffix-4:*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/addressable-2.6.0.gem
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b5b7f7c29253fc4b13111f8441cc25f7
+_md5_=d7e5724dada9f0cca4be7900b1d0cfbf
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.7.0 b/metadata/md5-cache/dev-ruby/addressable-2.7.0
new file mode 100644
index 000000000000..8072bf3da4fb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/addressable-2.7.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby24] dev-ruby/public_suffix:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby25] dev-ruby/public_suffix:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby26] dev-ruby/public_suffix:3[ruby_targets_ruby26] ) ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=A replacement for the URI implementation that is part of Ruby's standard library
+EAPI=7
+HOMEPAGE=https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable
+IUSE=doc test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby24? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby24] dev-ruby/public_suffix:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby25] dev-ruby/public_suffix:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( || ( dev-ruby/public_suffix:4[ruby_targets_ruby26] dev-ruby/public_suffix:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/addressable-2.7.0.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=58bf35be07e4832ea152bdab3339886b
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.4.10.1 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.4.10.1
deleted file mode 100644
index 6ceb20b2e45d..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.4.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rails[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] dev-ruby/rspec-rails[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=6
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=9
-SRC_URI=mirror://rubygems/autoprefixer-rails-9.4.10.1.gem
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=13a89f50c89c799d94438a5cf406c7dc
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.5.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.5.0
deleted file mode 100644
index 7b1d98c38a8f..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rails[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] dev-ruby/rspec-rails[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rails[ruby_targets_ruby26] dev-ruby/rake[ruby_targets_ruby26] dev-ruby/rspec-rails[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=6
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=9
-SRC_URI=mirror://rubygems/autoprefixer-rails-9.5.0.gem
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0447fb06a886cf56f9a9d72108e22570
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.6.0 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.6.0
deleted file mode 100644
index 7db9169859c5..000000000000
--- a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] dev-ruby/rspec-rails[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby26] dev-ruby/rake[ruby_targets_ruby26] dev-ruby/rspec-rails[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
-EAPI=6
-HOMEPAGE=https://github.com/ai/autoprefixer-rails
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=9
-SRC_URI=mirror://rubygems/autoprefixer-rails-9.6.0.gem
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=4a3acb92e770c0a12924bf585e7d2a2f
diff --git a/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.6.1.1 b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.6.1.1
new file mode 100644
index 000000000000..5ab38d09b2d0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/autoprefixer-rails-9.6.1.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/rspec-rails[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] dev-ruby/rspec-rails[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.0.0[ruby_targets_ruby26] dev-ruby/rake[ruby_targets_ruby26] dev-ruby/rspec-rails[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Add vendor prefixes to CSS rules using values from the Can I Use website
+EAPI=7
+HOMEPAGE=https://github.com/ai/autoprefixer-rails
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/execjs:*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=9
+SRC_URI=mirror://rubygems/autoprefixer-rails-9.6.1.1.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=81694747fd26fb2869f6c1aca5b83872
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.11.1 b/metadata/md5-cache/dev-ruby/capistrano-3.11.1
new file mode 100644
index 000000000000..9abf0012ef46
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby24] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby24] >=dev-ruby/rake-10.0.0[ruby_targets_ruby24] dev-ruby/i18n:*[ruby_targets_ruby24] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby25] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby25] >=dev-ruby/rake-10.0.0[ruby_targets_ruby25] dev-ruby/i18n:*[ruby_targets_ruby25] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby26] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby26] >=dev-ruby/rake-10.0.0[ruby_targets_ruby26] dev-ruby/i18n:*[ruby_targets_ruby26] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( 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 distributed application deployment system
+EAPI=6
+HOMEPAGE=https://capistranorb.com/
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby24] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby24] >=dev-ruby/rake-10.0.0[ruby_targets_ruby24] dev-ruby/i18n:*[ruby_targets_ruby24] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby25] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby25] >=dev-ruby/rake-10.0.0[ruby_targets_ruby25] dev-ruby/i18n:*[ruby_targets_ruby25] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby26] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby26] >=dev-ruby/rake-10.0.0[ruby_targets_ruby26] dev-ruby/i18n:*[ruby_targets_ruby26] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=mirror://rubygems/capistrano-3.11.1.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=78ce21f1b269004e76da0f58e6190daa
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.18.0 b/metadata/md5-cache/dev-ruby/capybara-3.18.0
deleted file mode 100644
index 968d479ecda7..000000000000
--- a/metadata/md5-cache/dev-ruby/capybara-3.18.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( || ( www-client/firefox www-client/firefox-bin ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby24] dev-ruby/sinatra:2[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby25] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby25] dev-ruby/sinatra:2[ruby_targets_ruby25] www-servers/puma[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby26] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby26] dev-ruby/sinatra:2[ruby_targets_ruby26] www-servers/puma[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
-EAPI=6
-HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby25] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=3
-SRC_URI=mirror://rubygems/capybara-3.18.0.gem
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=9a3213d76712c0f4f2a8ed860d9ee50d
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.26.0 b/metadata/md5-cache/dev-ruby/capybara-3.26.0
index 7851f746cca7..781885a96665 100644
--- a/metadata/md5-cache/dev-ruby/capybara-3.26.0
+++ b/metadata/md5-cache/dev-ruby/capybara-3.26.0
@@ -4,11 +4,11 @@ DESCRIPTION=Capybara aims to simplify the process of integration testing Rack ap
 EAPI=6
 HOMEPAGE=https://github.com/jnicklas/capybara
 IUSE=test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.5: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.5:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=mirror://rubygems/capybara-3.26.0.gem
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=7a8aa9e795f590212ac48f637086a43b
+_md5_=3dce288389295d5646348917790dae14
diff --git a/metadata/md5-cache/dev-ruby/capybara-3.29.0 b/metadata/md5-cache/dev-ruby/capybara-3.29.0
new file mode 100644
index 000000000000..b2c03de58c53
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capybara-3.29.0
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby24] dev-ruby/sinatra:2[ruby_targets_ruby24] www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby25] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby25] dev-ruby/sinatra:2[ruby_targets_ruby25] www-servers/puma[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] >=dev-ruby/launchy-2.4.0[ruby_targets_ruby26] >=dev-ruby/selenium-webdriver-3.5:3[ruby_targets_ruby26] dev-ruby/sinatra:2[ruby_targets_ruby26] www-servers/puma[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.5: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.5:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( || ( www-client/firefox www-client/firefox-bin ) ) ruby_targets_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] )
+DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
+EAPI=7
+HOMEPAGE=https://github.com/jnicklas/capybara
+IUSE=test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby24] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby24] >=dev-ruby/regexp_parser-1.5: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.5:1[ruby_targets_ruby25] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/addressable[ruby_targets_ruby26] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby26] >=dev-ruby/rack-1.6.0:*[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/regexp_parser-1.5:1[ruby_targets_ruby26] >=dev-ruby/xpath-3.2:3[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=mirror://rubygems/capybara-3.29.0.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=2930d3bf2fcdc16f4197e097b214e6f0
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.2.1 b/metadata/md5-cache/dev-ruby/did_you_mean-1.2.1
index 3500f3edef10..9963bfc4f34d 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.2.1
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION='did you mean?'experience in Ruby
 EAPI=6
 HOMEPAGE=https://github.com/yuki24/did_you_mean
 IUSE=ruby_targets_ruby25 test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 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 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 )
 SLOT=2.5
 SRC_URI=mirror://rubygems/did_you_mean-1.2.1.gem
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=188a3e6d7e401b1a0b27243a13a39c42
+_md5_=c3d7b3346efd7dc3d5b23b80f2d7914c
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.12.0 b/metadata/md5-cache/dev-ruby/ffaker-2.12.0
new file mode 100644
index 000000000000..30eb4278bf50
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.12.0
@@ -0,0 +1,15 @@
+BDEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Faster Faker, generates dummy data
+EAPI=7
+HOMEPAGE=https://github.com/emmanueloga/ffaker
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_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/ffaker-2.12.0.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=49124a53eb466a9bbc0a49c496a5940d
diff --git a/metadata/md5-cache/dev-ruby/http-accept-1.7.0 b/metadata/md5-cache/dev-ruby/http-accept-1.7.0
new file mode 100644
index 000000000000..813b85599a2f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/http-accept-1.7.0
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_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] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Parse Accept and Accept-Language HTTP headers
+EAPI=7
+HOMEPAGE=https://github.com/socketry/http-accept
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1
+SRC_URI=https://github.com/socketry/http-accept/archive/v1.7.0.tar.gz -> http-accept-1.7.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a4a4242272bf1249e674cb92a1b58699
diff --git a/metadata/md5-cache/dev-ruby/http-accept-2.1.0 b/metadata/md5-cache/dev-ruby/http-accept-2.1.0
new file mode 100644
index 000000000000..e4421ea425bf
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/http-accept-2.1.0
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_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] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Parse Accept and Accept-Language HTTP headers
+EAPI=7
+HOMEPAGE=https://github.com/socketry/http-accept
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=https://github.com/socketry/http-accept/archive/v2.1.0.tar.gz -> http-accept-2.1.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=1b9b1ff5b964d7b6162422df258abd58
diff --git a/metadata/md5-cache/dev-ruby/http-accept-2.1.1 b/metadata/md5-cache/dev-ruby/http-accept-2.1.1
new file mode 100644
index 000000000000..508d30e4032e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/http-accept-2.1.1
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_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] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Parse Accept and Accept-Language HTTP headers
+EAPI=7
+HOMEPAGE=https://github.com/socketry/http-accept
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=https://github.com/socketry/http-accept/archive/v2.1.1.tar.gz -> http-accept-2.1.1.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=1b9b1ff5b964d7b6162422df258abd58
diff --git a/metadata/md5-cache/dev-ruby/image_processing-1.9.3 b/metadata/md5-cache/dev-ruby/image_processing-1.9.3
new file mode 100644
index 000000000000..79f6284a52d6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/image_processing-1.9.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/mini_magick-4.9.5:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mini_magick-4.9.5:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/mini_magick-4.9.5:0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby24] >=dev-ruby/minitest-hooks-1.4.2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby25] >=dev-ruby/minitest-hooks-1.4.2[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby26] >=dev-ruby/minitest-hooks-1.4.2[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=High-level image processing helper methods with libvips and ImageMagick
+EAPI=7
+HOMEPAGE=https://github.com/janko/image_processing
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/mini_magick-4.9.5:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mini_magick-4.9.5:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/mini_magick-4.9.5:0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/janko/image_processing/archive/v1.9.3.tar.gz -> image_processing-1.9.3.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=430c2f31a8baae600ef0239ca84b1969
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.3 b/metadata/md5-cache/dev-ruby/mime-types-3.3
new file mode 100644
index 000000000000..af15e3b5c9cd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.3
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby24] dev-ruby/minitest-hooks:1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby25] dev-ruby/minitest-hooks:1[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby26] dev-ruby/minitest-hooks:1[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Provides a mailcap-like MIME Content-Type lookup for Ruby
+EAPI=7
+HOMEPAGE=https://github.com/mime-types/ruby-mime-types
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=mirror://rubygems/mime-types-3.3.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=fea41d68fbba674c3e8f50d94afac6d3
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2018.0812 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2018.0812
deleted file mode 100644
index 96b01ca7a7de..000000000000
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2018.0812
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=Registry for information about MIME media type definitions
-EAPI=6
-HOMEPAGE=https://github.com/mime-types/mime-types-data
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=3
-SRC_URI=mirror://rubygems/mime-types-data-3.2018.0812.gem
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6c213424bd4b8968ecb2ae1742323a2b
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2019.0904 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2019.0904
new file mode 100644
index 000000000000..bc4bcf0c8e1a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2019.0904
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Registry for information about MIME media type definitions
+EAPI=7
+HOMEPAGE=https://github.com/mime-types/mime-types-data
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=mirror://rubygems/mime-types-data-3.2019.0904.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b4f5aa00ea2ec5d86a2af41f93cac821
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.9.5 b/metadata/md5-cache/dev-ruby/mini_magick-4.9.5
new file mode 100644
index 000000000000..5a76aa1399b3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.9.5
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/posix-spawn[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] dev-ruby/posix-spawn[ruby_targets_ruby25] dev-ruby/webmock[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26] dev-ruby/posix-spawn[ruby_targets_ruby26] dev-ruby/webmock[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( virtual/imagemagick-tools[jpeg,png,tiff] ) ruby_targets_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] )
+DESCRIPTION=Manipulate images with minimal use of memory
+EAPI=7
+HOMEPAGE=https://github.com/minimagick/minimagick
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=media-gfx/imagemagick ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/minimagick/minimagick/archive/v4.9.5.tar.gz -> mini_magick-4.9.5.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a26b61012a90ff9c5563bdd98fed9635
diff --git a/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1 b/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
new file mode 100644
index 000000000000..9bc3da53426f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/minitest[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/minitest[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/minitest[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Define and access metadata in MiniTest::Spec descriptions and specs
+EAPI=7
+HOMEPAGE=https://github.com/ordinaryzelig/minispec-metadata
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/minitest[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/minitest[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/minitest[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( 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/minispec-metadata-3.3.1.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=4c1593507fe4119b7ab4e75b998b6457
diff --git a/metadata/md5-cache/dev-ruby/minitar-0.9 b/metadata/md5-cache/dev-ruby/minitar-0.9
new file mode 100644
index 000000000000..3cf8116f8f49
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/minitar-0.9
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) 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] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Provides POSIX tarchive management from Ruby programs
+EAPI=7
+HOMEPAGE=https://github.com/halostatue/minitar
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( BSD-2 Ruby )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/halostatue/minitar/archive/v0.9.tar.gz -> minitar-0.9.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e37e94212d79e39809ffd32368bb9d7c
diff --git a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.0 b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.0
index e0e42d28c981..60ad1bb6b490 100644
--- a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.0
+++ b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Power Assert for Minitest
 EAPI=6
 HOMEPAGE=https://github.com/hsbt/minitest-power_assert
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/minitest:*[ruby_targets_ruby24] >=dev-ruby/power_assert-1.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/minitest:*[ruby_targets_ruby25] >=dev-ruby/power_assert-1.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/minitest:*[ruby_targets_ruby26] >=dev-ruby/power_assert-1.1[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-power_assert-0.3.0.gem
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=268024c5d913bbd80ae3f3d0d389eac9
+_md5_=bfc029ce8523618938f3a3e067eea739
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.4.10 b/metadata/md5-cache/dev-ruby/mysql2-0.4.10
deleted file mode 100644
index c74e618a1772..000000000000
--- a/metadata/md5-cache/dev-ruby/mysql2-0.4.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libmysqlclient ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to libmysql
-EAPI=6
-HOMEPAGE=https://github.com/brianmario/mysql2
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0.4
-SRC_URI=mirror://rubygems/mysql2-0.4.10.gem
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=737f6258a1f572cbd13060b7bc55a728
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 11df0e8483f8..94919365aa7c 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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEPEND=dev-db/mysql-connector-c ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to libmysql
 EAPI=6
 HOMEPAGE=https://github.com/brianmario/mysql2
-IUSE=mysql mariadb ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c ) ruby_targets_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=^^ ( mariadb mysql ) || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=dev-db/mysql-connector-c:= ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0.4
 SRC_URI=mirror://rubygems/mysql2-0.4.10.gem
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=aa0956b6b11acdb7d2a404f6f2a0ea18
+_md5_=f148f04723b8e85731d44deb138c8aa4
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.4.10-r3 b/metadata/md5-cache/dev-ruby/mysql2-0.4.10-r3
new file mode 100644
index 000000000000..3c7c6583510c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.4.10-r3
@@ -0,0 +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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to libmysql
+EAPI=6
+HOMEPAGE=https://github.com/brianmario/mysql2
+IUSE=mysql mariadb ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) ruby_targets_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=^^ ( mariadb mysql ) || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0.4
+SRC_URI=mirror://rubygems/mysql2-0.4.10.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=fd49d0b881cc2732188e3e1a8290ad81
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.1 b/metadata/md5-cache/dev-ruby/mysql2-0.5.1
deleted file mode 100644
index 72faf928c4f3..000000000000
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libmysqlclient ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to libmysql
-EAPI=6
-HOMEPAGE=https://github.com/brianmario/mysql2
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0.5
-SRC_URI=mirror://rubygems/mysql2-0.5.1.gem
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7083eb66aaad92f637f76563198acf01
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.1-r1 b/metadata/md5-cache/dev-ruby/mysql2-0.5.1-r1
new file mode 100644
index 000000000000..1bea104d878f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-db/mysql-connector-c ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to libmysql
+EAPI=6
+HOMEPAGE=https://github.com/brianmario/mysql2
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-db/mysql-connector-c:= ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0.5
+SRC_URI=mirror://rubygems/mysql2-0.5.1.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c2f5dca771fd7992bb1bd7accc443d2d
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.2 b/metadata/md5-cache/dev-ruby/mysql2-0.5.2
deleted file mode 100644
index cb4485043886..000000000000
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libmysqlclient ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to libmysql
-EAPI=6
-HOMEPAGE=https://github.com/brianmario/mysql2
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0.5
-SRC_URI=mirror://rubygems/mysql2-0.5.2.gem
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=418f2e1bf0cfc40433baab5242025cbf
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r1 b/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r1
deleted file mode 100644
index f6a6b41617fd..000000000000
--- a/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to libmysql
-EAPI=6
-HOMEPAGE=https://github.com/brianmario/mysql2
-IUSE=mysql mariadb ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c ) ruby_targets_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=^^ ( mariadb mysql ) || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=0.5
-SRC_URI=mirror://rubygems/mysql2-0.5.2.gem
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a17bcf965af05432025a5a6491587ae5
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r2 b/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r2
new file mode 100644
index 000000000000..44f6952b4fe5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-db/mysql-connector-c ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to libmysql
+EAPI=6
+HOMEPAGE=https://github.com/brianmario/mysql2
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-db/mysql-connector-c:= ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0.5
+SRC_URI=mirror://rubygems/mysql2-0.5.2.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f88dbb33b9f3601a3c5977a1eecd4ed1
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r3 b/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r3
new file mode 100644
index 000000000000..c0c0796f5fbc
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.5.2-r3
@@ -0,0 +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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A modern, simple and very fast Mysql library for Ruby - binding to libmysql
+EAPI=6
+HOMEPAGE=https://github.com/brianmario/mysql2
+IUSE=mysql mariadb ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) ruby_targets_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=^^ ( mariadb mysql ) || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0.5
+SRC_URI=mirror://rubygems/mysql2-0.5.2.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c9eaeb871f71520369cbca020a5d19bd
diff --git a/metadata/md5-cache/dev-ruby/nio4r-2.5.1 b/metadata/md5-cache/dev-ruby/nio4r-2.5.1
new file mode 100644
index 000000000000..81c0ec3dd943
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/nio4r-2.5.1
@@ -0,0 +1,15 @@
+BDEPEND=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_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( 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=7
+HOMEPAGE=https://github.com/socketry/nio4r
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT || ( BSD GPL-2 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=mirror://rubygems/nio4r-2.5.1.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=384f9a50aeadbe9f6f7b2a9224f1cc0c
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.10.4 b/metadata/md5-cache/dev-ruby/nokogiri-1.10.4
index d42800926582..0fe75f9906d1 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.10.4
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.10.4
@@ -5,11 +5,11 @@ DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
 EAPI=7
 HOMEPAGE=https://www.nokogiri.org/
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.9:= >=dev-libs/libxslt-1.1.33 virtual/libiconv ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.10.4.tar.gz -> nokogiri-1.10.4-git.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=5e2c6f3edf05c1697547c3d924d9b299
+_md5_=5e9ffbc71f515d64d6b4be6859acb01e
diff --git a/metadata/md5-cache/dev-ruby/paint-2.0.1 b/metadata/md5-cache/dev-ruby/paint-2.0.1
deleted file mode 100644
index a93ecaba8b3e..000000000000
--- a/metadata/md5-cache/dev-ruby/paint-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Terminal painter
-EAPI=6
-HOMEPAGE=https://github.com/janlelis/paint
-IUSE=test doc ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://github.com/janlelis/paint/archive/v2.0.1.tar.gz -> paint-2.0.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f8060e3b25407f2058146786e0dc5b3d
diff --git a/metadata/md5-cache/dev-ruby/paint-2.0.3 b/metadata/md5-cache/dev-ruby/paint-2.0.3
deleted file mode 100644
index 2455fd30031e..000000000000
--- a/metadata/md5-cache/dev-ruby/paint-2.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Terminal painter
-EAPI=6
-HOMEPAGE=https://github.com/janlelis/paint
-IUSE=test doc ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://github.com/janlelis/paint/archive/v2.0.3.tar.gz -> paint-2.0.3.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1618983765303d6fd732d7c1c05db7e0
diff --git a/metadata/md5-cache/dev-ruby/paint-2.1.1 b/metadata/md5-cache/dev-ruby/paint-2.1.1
new file mode 100644
index 000000000000..74cea673eb20
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/paint-2.1.1
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_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] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Terminal painter
+EAPI=7
+HOMEPAGE=https://github.com/janlelis/paint
+IUSE=test doc 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=https://github.com/janlelis/paint/archive/v2.1.1.tar.gz -> paint-2.1.1.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=949e58d002fce000c30cee5ca4c0705e
diff --git a/metadata/md5-cache/dev-ruby/parser-2.6.2.0 b/metadata/md5-cache/dev-ruby/parser-2.6.2.0
deleted file mode 100644
index ab8f53a440da..000000000000
--- a/metadata/md5-cache/dev-ruby/parser-2.6.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] dev-ruby/cliver[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/racc[ruby_targets_ruby25] dev-ruby/cliver[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26] dev-ruby/racc[ruby_targets_ruby26] dev-ruby/cliver[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=A production-ready Ruby parser written in pure Ruby
-EAPI=6
-HOMEPAGE=https://github.com/whitequark/parser
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=0
-SRC_URI=mirror://rubygems/parser-2.6.2.0.gem
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6736ff31b4167dc63f071d6c568f5c9d
diff --git a/metadata/md5-cache/dev-ruby/parser-2.6.2.1 b/metadata/md5-cache/dev-ruby/parser-2.6.2.1
deleted file mode 100644
index 28813a30f745..000000000000
--- a/metadata/md5-cache/dev-ruby/parser-2.6.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] dev-ruby/cliver[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/racc[ruby_targets_ruby25] dev-ruby/cliver[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26] dev-ruby/racc[ruby_targets_ruby26] dev-ruby/cliver[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=A production-ready Ruby parser written in pure Ruby
-EAPI=6
-HOMEPAGE=https://github.com/whitequark/parser
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=0
-SRC_URI=mirror://rubygems/parser-2.6.2.1.gem
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6736ff31b4167dc63f071d6c568f5c9d
diff --git a/metadata/md5-cache/dev-ruby/parser-2.6.4.0 b/metadata/md5-cache/dev-ruby/parser-2.6.4.0
new file mode 100644
index 000000000000..41c2018b5f69
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/parser-2.6.4.0
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] dev-ruby/cliver[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/racc[ruby_targets_ruby25] dev-ruby/cliver[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26] dev-ruby/racc[ruby_targets_ruby26] dev-ruby/cliver[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=A production-ready Ruby parser written in pure Ruby
+EAPI=7
+HOMEPAGE=https://github.com/whitequark/parser
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/parser-2.6.4.0.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b4648868880df051dde09327f3162cf7
diff --git a/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2 b/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
deleted file mode 100644
index 4047f5a712b0..000000000000
--- a/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A fibonacci-heap priority-queue implementation
-EAPI=5
-HOMEPAGE=https://rubygems.org/gems/PriorityQueue
-IUSE=ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/PriorityQueue-0.1.2.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0acf9b48d4e9dc0945de74f85489963f
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.3.2 b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.3.2
deleted file mode 100644
index 39c9d5d508c2..000000000000
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.3.2
+++ /dev/null
@@ -1,10 +0,0 @@
-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.3.2-1stretch_all.deb
-_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=00d13183304e7c47a6eb5d05abae7629
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.4.0 b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.4.0
index 7c4aac6391e8..e263f1036d0f 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.4.0
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.4.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Library needed to connect puppet to puppetdb
 EAPI=7
 HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_6.4.0-1stretch_all.deb
 _eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=0f5d7f5a7bee83a7e8e5e29a8a511078
+_md5_=00d13183304e7c47a6eb5d05abae7629
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.5.0 b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.5.0
new file mode 100644
index 000000000000..8249eaed1440
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.5.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.5.0-1stretch_all.deb
+_eclasses_=unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=0f5d7f5a7bee83a7e8e5e29a8a511078
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-2.0.7 b/metadata/md5-cache/dev-ruby/rack-protection-2.0.7
new file mode 100644
index 000000000000..5320ae6ca939
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rack-protection-2.0.7
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rack:*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=This gem protects against typical web attacks
+EAPI=7
+HOMEPAGE=https://github.com/rkh/rack-protection
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc 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_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rack:*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=mirror://rubygems/rack-protection-2.0.7.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=99860e5892d78cfbccd0a7aca416fa14
diff --git a/metadata/md5-cache/dev-ruby/rails-6.0.0 b/metadata/md5-cache/dev-ruby/rails-6.0.0
new file mode 100644
index 000000000000..de960bdd2a3c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rails-6.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/actioncable-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionmailbox-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionmailer-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] ~dev-ruby/actiontext-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby25] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby25] ~dev-ruby/activemodel-6.0.0[ruby_targets_ruby25] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby25] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby25] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] ~dev-ruby/railties-6.0.0[ruby_targets_ruby25] >=dev-ruby/bundler-1.3[ruby_targets_ruby25] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionmailbox-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionmailer-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] ~dev-ruby/actiontext-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby26] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby26] ~dev-ruby/activemodel-6.0.0[ruby_targets_ruby26] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby26] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby26] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] ~dev-ruby/railties-6.0.0[ruby_targets_ruby26] >=dev-ruby/bundler-1.3[ruby_targets_ruby26] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=ruby on rails is a web-application and persistance framework
+EAPI=7
+HOMEPAGE=https://rubyonrails.org
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actioncable-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionmailbox-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionmailer-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] ~dev-ruby/actiontext-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby25] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby25] ~dev-ruby/activemodel-6.0.0[ruby_targets_ruby25] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby25] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby25] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] ~dev-ruby/railties-6.0.0[ruby_targets_ruby25] >=dev-ruby/bundler-1.3[ruby_targets_ruby25] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionmailbox-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionmailer-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] ~dev-ruby/actiontext-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby26] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby26] ~dev-ruby/activemodel-6.0.0[ruby_targets_ruby26] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby26] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby26] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] ~dev-ruby/railties-6.0.0[ruby_targets_ruby26] >=dev-ruby/bundler-1.3[ruby_targets_ruby26] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=6.0
+SRC_URI=mirror://rubygems/rails-6.0.0.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9061f76e9d7038ad5902e832944997ee
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.2.0 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.2.0
new file mode 100644
index 000000000000..5f6518221477
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.2.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/loofah-2.2.2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/loofah-2.2.2:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/loofah-2.2.2:0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Sanitize HTML fragments in Rails applications
+EAPI=7
+HOMEPAGE=https://github.com/rafaelfranca/rails-html-sanitizer
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/loofah-2.2.2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/loofah-2.2.2:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/loofah-2.2.2:0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1
+SRC_URI=mirror://rubygems/rails-html-sanitizer-1.2.0.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f8cb5930f5d272a331c43c37bee3dc60
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.0 b/metadata/md5-cache/dev-ruby/railties-6.0.0
new file mode 100644
index 000000000000..69b1518592f6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/railties-6.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] >=dev-ruby/thor-0.20.3[ruby_targets_ruby25] >=dev-ruby/rake-0.8.7[ruby_targets_ruby25] dev-ruby/method_source[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] >=dev-ruby/thor-0.20.3[ruby_targets_ruby26] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26] dev-ruby/method_source[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/actionview-6.0.0[ruby_targets_ruby25] dev-ruby/mocha:0.14[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/actionview-6.0.0[ruby_targets_ruby26] dev-ruby/mocha:0.14[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Tools for creating, working with, and running Rails applications
+EAPI=7
+HOMEPAGE=https://github.com/rails/rails
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=>=app-eselect/eselect-rails-0.24 ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] >=dev-ruby/thor-0.20.3[ruby_targets_ruby25] >=dev-ruby/rake-0.8.7[ruby_targets_ruby25] dev-ruby/method_source[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] >=dev-ruby/thor-0.20.3[ruby_targets_ruby26] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26] dev-ruby/method_source[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=test
+SLOT=6.0
+SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=bcba744dd6fa8da1885285720d5f2de8
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.20.1 b/metadata/md5-cache/dev-ruby/rbpdf-1.20.1
new file mode 100644
index 000000000000..a6d6400a621d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.20.1
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/htmlentities[ruby_targets_ruby24] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/htmlentities[ruby_targets_ruby25] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/htmlentities[ruby_targets_ruby26] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Ruby on Rails RBPDF plugin
+EAPI=7
+HOMEPAGE=https://github.com/naitoh/rbpdf
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/htmlentities[ruby_targets_ruby24] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/htmlentities[ruby_targets_ruby25] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/htmlentities[ruby_targets_ruby26] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/naitoh/rbpdf/archive/1.20.1.tar.gz -> rbpdf-1.20.1.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9bb83a8a04e20ac8ced8aec07a35e6e2
diff --git a/metadata/md5-cache/dev-ruby/rdoc-5.1.0-r1 b/metadata/md5-cache/dev-ruby/rdoc-5.1.0-r1
new file mode 100644
index 000000000000..0f16959f3993
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rdoc-5.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-ruby/kpeg[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/json:2[ruby_targets_ruby24] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
+EAPI=5
+HOMEPAGE=https://github.com/rdoc/rdoc/
+IUSE=test ruby_targets_ruby24 doc test test
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Ruby MIT
+RDEPEND=>=app-eselect/eselect-ruby-20161226 ruby_targets_ruby24? ( dev-ruby/json:2[ruby_targets_ruby24] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/rdoc/rdoc/archive/v5.1.0.tar.gz -> rdoc-5.1.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=eee306f2830050d60db05cd66e2a1571
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.1.1 b/metadata/md5-cache/dev-ruby/rdoc-6.1.1
index 8d9c7a50f9e5..12cde36ccbb2 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.1.1
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
 EAPI=6
 HOMEPAGE=https://github.com/ruby/rdoc/
 IUSE=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=Ruby MIT
 RDEPEND=>=app-eselect/eselect-ruby-20181225 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.1.1.tar.gz -> rdoc-6.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0ab93f4f174985857bb236c848bb1721
+_md5_=1baae95d7555170ec47b9a4542085669
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.1.2 b/metadata/md5-cache/dev-ruby/rdoc-6.1.2
new file mode 100644
index 000000000000..85d9e7045a5e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.1.2
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby24] >dev-ruby/racc-1.4.10[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby25] >dev-ruby/racc-1.4.10[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] test? ( dev-ruby/bundler[ruby_targets_ruby25] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby26] >dev-ruby/racc-1.4.10[ruby_targets_ruby26] dev-ruby/rake[ruby_targets_ruby26] test? ( dev-ruby/bundler[ruby_targets_ruby26] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install postinst 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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
+EAPI=7
+HOMEPAGE=https://github.com/ruby/rdoc/
+IUSE=doc ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Ruby MIT
+RDEPEND=>=app-eselect/eselect-ruby-20181225 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/ruby/rdoc/archive/v6.1.2.tar.gz -> rdoc-6.1.2.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=cd5b54852d0133cc38824f82f00d4df3
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.2.0 b/metadata/md5-cache/dev-ruby/rdoc-6.2.0
new file mode 100644
index 000000000000..c67f02d66403
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.2.0
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby24] >dev-ruby/racc-1.4.10[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby25] >dev-ruby/racc-1.4.10[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] test? ( dev-ruby/bundler[ruby_targets_ruby25] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( >=dev-ruby/kpeg-1.1.0-r1[ruby_targets_ruby26] >dev-ruby/racc-1.4.10[ruby_targets_ruby26] dev-ruby/rake[ruby_targets_ruby26] test? ( dev-ruby/bundler[ruby_targets_ruby26] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install postinst 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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
+EAPI=7
+HOMEPAGE=https://github.com/ruby/rdoc/
+IUSE=doc ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Ruby MIT
+RDEPEND=>=app-eselect/eselect-ruby-20181225 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/ruby/rdoc/archive/v6.2.0.tar.gz -> rdoc-6.2.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=3ef24667741c68870466b3245a20be6c
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.7 b/metadata/md5-cache/dev-ruby/rexical-1.0.7
index 6a2937fc1a35..da9cb0f1b705 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.7
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.7
@@ -5,11 +5,11 @@ DESCRIPTION=Rexical is a lexical scanner generator
 EAPI=7
 HOMEPAGE=https://github.com/tenderlove/rexical/tree/master
 IUSE=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 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=!!app-admin/rex ruby_targets_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/rexical-1.0.7.gem
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a13953af857b3ea060b3ca9f7dabcbe9
+_md5_=8e654c9560886f4ed369a1280cdf4f38
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.16.0 b/metadata/md5-cache/dev-ruby/rmagick-2.16.0
deleted file mode 100644
index 6bcd258a1f38..000000000000
--- a/metadata/md5-cache/dev-ruby/rmagick-2.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=media-gfx/imagemagick-6.4.9:=[jpeg] =media-gfx/imagemagick-6* ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=An interface between Ruby and the ImageMagick(TM) image processing library
-EAPI=6
-HOMEPAGE=https://github.com/gemhome/rmagick
-IUSE=doc ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=amd64 ~hppa ppc ppc64 x86 ~x86-macos
-LICENSE=Artistic
-RDEPEND=>=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6* ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/rmagick-2.16.0.gem
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=78fd5d38f57d831494afd047920e2d84
diff --git a/metadata/md5-cache/dev-ruby/rmagick-3.0.0 b/metadata/md5-cache/dev-ruby/rmagick-3.0.0
deleted file mode 100644
index 002e7dd7a200..000000000000
--- a/metadata/md5-cache/dev-ruby/rmagick-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=media-gfx/imagemagick-6.9.0:=[jpeg] =media-gfx/imagemagick-6* ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=An interface between Ruby and the ImageMagick(TM) image processing library
-EAPI=6
-HOMEPAGE=https://github.com/gemhome/rmagick
-IUSE=doc ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos
-LICENSE=Artistic
-RDEPEND=>=media-gfx/imagemagick-6.9.0:= =media-gfx/imagemagick-6* ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( 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/rmagick-3.0.0.gem
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0a0b861114a6e2fdbf714dc5d41fa645
diff --git a/metadata/md5-cache/dev-ruby/rmagick-3.1.0 b/metadata/md5-cache/dev-ruby/rmagick-3.1.0
index a15f1c5674d5..293e0bc45e45 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-3.1.0
+++ b/metadata/md5-cache/dev-ruby/rmagick-3.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=An interface between Ruby and the ImageMagick(TM) image processing l
 EAPI=6
 HOMEPAGE=https://github.com/gemhome/rmagick
 IUSE=doc ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 x86 ~x86-macos
+KEYWORDS=amd64 ~hppa ppc ppc64 x86 ~x86-macos
 LICENSE=Artistic
 RDEPEND=>=media-gfx/imagemagick-6.9.0:= =media-gfx/imagemagick-6* ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( 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/rmagick-3.1.0.gem
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0a13ebd52e16ad17084ea234564488d4
+_md5_=b54cbb77bb73877adda1bd397b660585
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.10.0 b/metadata/md5-cache/dev-ruby/rouge-3.10.0
new file mode 100644
index 000000000000..d5760abae4ff
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rouge-3.10.0
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) test? ( dev-ruby/minitest-power_assert[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby25] ) test? ( dev-ruby/minitest-power_assert[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby26] ) test? ( dev-ruby/minitest-power_assert[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/redcarpet[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/redcarpet[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Yet-another-markdown-parser using a strict syntax definition in pure Ruby
+EAPI=7
+HOMEPAGE=https://github.com/jneen/rouge
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/redcarpet[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/redcarpet[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=https://github.com/jneen/rouge/archive/v3.10.0.tar.gz -> rouge-3.10.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=19e55ba811a2b5d84b7010101c172f80
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.9.0 b/metadata/md5-cache/dev-ruby/rouge-3.9.0
new file mode 100644
index 000000000000..821cb29887bb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rouge-3.9.0
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) test? ( dev-ruby/minitest-power_assert[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby25] ) test? ( dev-ruby/minitest-power_assert[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby26] ) test? ( dev-ruby/minitest-power_assert[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/redcarpet[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/redcarpet[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Yet-another-markdown-parser using a strict syntax definition in pure Ruby
+EAPI=7
+HOMEPAGE=https://github.com/jneen/rouge
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/redcarpet[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/redcarpet[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=https://github.com/jneen/rouge/archive/v3.9.0.tar.gz -> rouge-3.9.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=19e55ba811a2b5d84b7010101c172f80
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-3.8.0
index c1a535a5a25c..15dd53dcb32e 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.8.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby25] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby25] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby26] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby26] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=mirror://rubygems/rspec-3.8.0.gem
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3b223b315aa6379a7b83892e050612ac
+_md5_=2293e2f307d12a3798e261399b743815
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-core-3.8.0
deleted file mode 100644
index 3ecc8ae0b15d..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby25] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] ) ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] dev-ruby/syntax[ruby_targets_ruby24] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] dev-ruby/syntax[ruby_targets_ruby25] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=6
-HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=highlight test ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-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=ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby25] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-core/archive/v3.8.0.tar.gz -> rspec-core-3.8.0-git.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=140883fb3a0b3cb79a2052b6f46e4a12
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.8.0-r1 b/metadata/md5-cache/dev-ruby/rspec-core-3.8.0-r1
deleted file mode 100644
index f08475e3e293..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.8.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby25] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby26] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26] ) ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] dev-ruby/syntax[ruby_targets_ruby24] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] dev-ruby/syntax[ruby_targets_ruby25] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby26] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26] dev-ruby/syntax[ruby_targets_ruby26] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby26] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby26] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=6
-HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=highlight test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-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=ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby25] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby26] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-core/archive/v3.8.0.tar.gz -> rspec-core-3.8.0-git.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f364ba6548262677387b6a0caeffb4fd
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.8.1 b/metadata/md5-cache/dev-ruby/rspec-core-3.8.1
deleted file mode 100644
index 08397d6d62a5..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby25] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby26] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26] ) ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] dev-ruby/syntax[ruby_targets_ruby24] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] dev-ruby/syntax[ruby_targets_ruby25] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby26] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26] dev-ruby/syntax[ruby_targets_ruby26] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby26] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby26] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=6
-HOMEPAGE=https://github.com/rspec/rspec-core
-IUSE=highlight test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-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=ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby25] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby26] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-core/archive/v3.8.1.tar.gz -> rspec-core-3.8.1-git.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=70134dc12fdce3c6189504f8d7e2ce4b
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.8.2 b/metadata/md5-cache/dev-ruby/rspec-core-3.8.2
index 8fad701d84a1..96c063097694 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.8.2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.8.2
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-core
 IUSE=highlight test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby25] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby26] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.8.2.tar.gz -> rspec-core-3.8.2-git.tgz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=70134dc12fdce3c6189504f8d7e2ce4b
+_md5_=b921e710a34e89ac8808ccdf8587fdbc
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.2
deleted file mode 100644
index d4dd7f2d624c..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] <dev-ruby/diff-lcs-2[ruby_targets_ruby25] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26] <dev-ruby/diff-lcs-2[ruby_targets_ruby26] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby26] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( 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 Behaviour Driven Development (BDD) framework for Ruby
-EAPI=6
-HOMEPAGE=https://github.com/rspec/rspec-expectations
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-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=ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] <dev-ruby/diff-lcs-2[ruby_targets_ruby25] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26] <dev-ruby/diff-lcs-2[ruby_targets_ruby26] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.8.2.tar.gz -> rspec-expectations-3.8.2-git.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=ada193ed2e7d41cb43b9a1ecbc1022a1
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.3 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.3
deleted file mode 100644
index 6aff236b877e..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] <dev-ruby/diff-lcs-2[ruby_targets_ruby25] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26] <dev-ruby/diff-lcs-2[ruby_targets_ruby26] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby26] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( 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 Behaviour Driven Development (BDD) framework for Ruby
-EAPI=6
-HOMEPAGE=https://github.com/rspec/rspec-expectations
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-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=ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] <dev-ruby/diff-lcs-2[ruby_targets_ruby25] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26] <dev-ruby/diff-lcs-2[ruby_targets_ruby26] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.8.3.tar.gz -> rspec-expectations-3.8.3-git.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7d072f1d123a8ea2b15437dc6d7fd880
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.4 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.4
index d014572b7672..3c7d6aefa5f2 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.4
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.4
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-expectations
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] <dev-ruby/diff-lcs-2[ruby_targets_ruby25] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26] <dev-ruby/diff-lcs-2[ruby_targets_ruby26] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.8.4.tar.gz -> rspec-expectations-3.8.4-git.tgz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7d072f1d123a8ea2b15437dc6d7fd880
+_md5_=e16fa4e73301462eb3d0d5f930608a3e
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.0
deleted file mode 100644
index 0bf42f59b2cc..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] =dev-ruby/diff-lcs-1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby26] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( 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 Behaviour Driven Development (BDD) framework for Ruby
-EAPI=6
-HOMEPAGE=https://github.com/rspec/rspec-mocks
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-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=ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] =dev-ruby/diff-lcs-1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.8.0.tar.gz -> rspec-mocks-3.8.0-git.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=894c702a38276edc7955cb46aa708e20
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.1
index e0b9c73c3da1..d1dcd11fedaf 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-mocks
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] =dev-ruby/diff-lcs-1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.8.1.tar.gz -> rspec-mocks-3.8.1-git.tgz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=10838c10075f75ab45df84250bd428e3
+_md5_=4023d898e8f161a90b8325ac77b0ffdf
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.8.0
deleted file mode 100644
index 26064fa3f521..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-3.8.0:3[ruby_targets_ruby24] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-3.8.0:3[ruby_targets_ruby25] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-3.8.0:3[ruby_targets_ruby26] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( 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 Behaviour Driven Development (BDD) framework for Ruby
-EAPI=6
-HOMEPAGE=https://github.com/rspec/rspec-support
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-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=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-support/archive/v3.8.0.tar.gz -> rspec-support-3.8.0-git.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=07c176a3ee49b658eb4d8f7c75805fb2
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.8.2 b/metadata/md5-cache/dev-ruby/rspec-support-3.8.2
index 5addfbd58cfa..3110ee82a140 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.8.2
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.8.2
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-support
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.8.2.tar.gz -> rspec-support-3.8.2-git.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=ecd43a4ac992544b61be91647c6b98e4
+_md5_=531a13ba5d12573f3e6a1c021d341f56
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.12.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.12.0
deleted file mode 100644
index 24c207cda4e8..000000000000
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby25] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=This gem provides Ruby bindings for WebDriver
-EAPI=6
-HOMEPAGE=https://github.com/seleniumhq/selenium
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby25] >=dev-ruby/rubyzip-1.2:1[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=3
-SRC_URI=mirror://rubygems/selenium-webdriver-3.12.0.gem
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8b03c145230e43c9e488dc196d0c5cf6
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.3 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.3
index 5ac94174fba2..d77b1f5e7f67 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.3
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.3
@@ -4,11 +4,11 @@ DESCRIPTION=This gem provides Ruby bindings for WebDriver
 EAPI=6
 HOMEPAGE=https://github.com/seleniumhq/selenium
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5[ruby_targets_ruby24] <dev-ruby/childprocess-2[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.5[ruby_targets_ruby25] <dev-ruby/childprocess-2[ruby_targets_ruby25] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/childprocess-0.5[ruby_targets_ruby26] <dev-ruby/childprocess-2[ruby_targets_ruby26] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=mirror://rubygems/selenium-webdriver-3.142.3.gem
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2dd8d4e28f538d7a12b8c7fbbf1bfa9f
+_md5_=ec5c514539696b63f129da876177635b
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.4 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.4
new file mode 100644
index 000000000000..820e7458962a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby25] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby26] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) 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] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=This gem provides Ruby bindings for WebDriver
+EAPI=7
+HOMEPAGE=https://github.com/seleniumhq/selenium
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby25] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/childprocess-0.5:2[ruby_targets_ruby26] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=mirror://rubygems/selenium-webdriver-3.142.4.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=2d78fbf99ea2e9f732f7ebbcad89eb08
diff --git a/metadata/md5-cache/dev-ruby/sinatra-2.0.7 b/metadata/md5-cache/dev-ruby/sinatra-2.0.7
new file mode 100644
index 000000000000..213219288a00
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sinatra-2.0.7
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/mustermann:1[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] ~dev-ruby/rack-protection-2.0.7[ruby_targets_ruby24] dev-ruby/tilt:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/mustermann:1[ruby_targets_ruby25] dev-ruby/rack:2.0[ruby_targets_ruby25] ~dev-ruby/rack-protection-2.0.7[ruby_targets_ruby25] dev-ruby/tilt:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/mustermann:1[ruby_targets_ruby26] dev-ruby/rack:2.0[ruby_targets_ruby26] ~dev-ruby/rack-protection-2.0.7[ruby_targets_ruby26] dev-ruby/tilt:2[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] dev-ruby/builder[ruby_targets_ruby24] dev-ruby/activesupport[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby25] dev-ruby/erubis[ruby_targets_ruby25] dev-ruby/builder[ruby_targets_ruby25] dev-ruby/activesupport[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rack-test-0.5.6[ruby_targets_ruby26] dev-ruby/erubis[ruby_targets_ruby26] dev-ruby/builder[ruby_targets_ruby26] dev-ruby/activesupport[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=A DSL for quickly creating web applications in Ruby with minimal effort
+EAPI=7
+HOMEPAGE=http://www.sinatrarb.com/
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/mustermann:1[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] ~dev-ruby/rack-protection-2.0.7[ruby_targets_ruby24] dev-ruby/tilt:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/mustermann:1[ruby_targets_ruby25] dev-ruby/rack:2.0[ruby_targets_ruby25] ~dev-ruby/rack-protection-2.0.7[ruby_targets_ruby25] dev-ruby/tilt:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/mustermann:1[ruby_targets_ruby26] dev-ruby/rack:2.0[ruby_targets_ruby26] ~dev-ruby/rack-protection-2.0.7[ruby_targets_ruby26] dev-ruby/tilt:2[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=https://github.com/sinatra/sinatra/archive/v2.0.7.tar.gz -> sinatra-2.0.7.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=5bbe822169dbf180a284a38ba5dc1b16
diff --git a/metadata/md5-cache/dev-ruby/web-console-4.0.1 b/metadata/md5-cache/dev-ruby/web-console-4.0.1
new file mode 100644
index 000000000000..41f72ace4e97
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/web-console-4.0.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby25] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby25] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby25] >=dev-ruby/railties-6.0:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby26] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby26] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby26] >=dev-ruby/railties-6.0:*[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] >=dev-ruby/rails-6.0[ruby_targets_ruby25] dev-ruby/sqlite3[ruby_targets_ruby25] dev-ruby/mocha[ruby_targets_ruby25] www-servers/puma[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26] >=dev-ruby/rails-6.0[ruby_targets_ruby26] dev-ruby/sqlite3[ruby_targets_ruby26] dev-ruby/mocha[ruby_targets_ruby26] www-servers/puma[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=A debugging tool for your Ruby on Rails applications
+EAPI=7
+HOMEPAGE=https://github.com/rails/web-console
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby25] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby25] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby25] >=dev-ruby/railties-6.0:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/actionview-6.0:*[ruby_targets_ruby26] >=dev-ruby/activemodel-6.0:*[ruby_targets_ruby26] >=dev-ruby/bindex-0.4.0[ruby_targets_ruby26] >=dev-ruby/railties-6.0:*[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=4
+SRC_URI=https://github.com/rails/web-console/archive/v4.0.1.tar.gz -> web-console-4.0.1.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e0d7a20ad128555b3c36d4cabcd9a5e6
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.7.0 b/metadata/md5-cache/dev-ruby/webmock-3.7.0
new file mode 100644
index 000000000000..262326c73582
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/webmock-3.7.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby24] >=dev-ruby/crack-0.3.2[ruby_targets_ruby24] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby25] >=dev-ruby/crack-0.3.2[ruby_targets_ruby25] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby26] >=dev-ruby/crack-0.3.2[ruby_targets_ruby26] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby24] || ( dev-ruby/http:4[ruby_targets_ruby24] dev-ruby/http:3[ruby_targets_ruby24] ) ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby25] dev-ruby/rack[ruby_targets_ruby25] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby25] || ( dev-ruby/http:4[ruby_targets_ruby25] dev-ruby/http:3[ruby_targets_ruby25] ) ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26] dev-ruby/rspec:3[ruby_targets_ruby26] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby26] dev-ruby/rack[ruby_targets_ruby26] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby26] || ( dev-ruby/http:4[ruby_targets_ruby26] dev-ruby/http:3[ruby_targets_ruby26] ) ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Allows stubbing HTTP requests and setting expectations on HTTP requests
+EAPI=7
+HOMEPAGE=https://github.com/bblimke/webmock
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby24] >=dev-ruby/crack-0.3.2[ruby_targets_ruby24] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby25] >=dev-ruby/crack-0.3.2[ruby_targets_ruby25] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby26] >=dev-ruby/crack-0.3.2[ruby_targets_ruby26] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=mirror://rubygems/webmock-3.7.0.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0c96d59ec1055acfca6dedd92f6ceff5
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.7.1 b/metadata/md5-cache/dev-ruby/webmock-3.7.1
new file mode 100644
index 000000000000..2ddb130e2dfb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/webmock-3.7.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby24] >=dev-ruby/crack-0.3.2[ruby_targets_ruby24] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby25] >=dev-ruby/crack-0.3.2[ruby_targets_ruby25] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby26] >=dev-ruby/crack-0.3.2[ruby_targets_ruby26] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby24] || ( dev-ruby/http:4[ruby_targets_ruby24] dev-ruby/http:3[ruby_targets_ruby24] ) ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/rspec:3[ruby_targets_ruby25] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby25] dev-ruby/rack[ruby_targets_ruby25] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby25] || ( dev-ruby/http:4[ruby_targets_ruby25] dev-ruby/http:3[ruby_targets_ruby25] ) ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26] dev-ruby/rspec:3[ruby_targets_ruby26] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby26] dev-ruby/rack[ruby_targets_ruby26] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby26] || ( dev-ruby/http:4[ruby_targets_ruby26] dev-ruby/http:3[ruby_targets_ruby26] ) ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Allows stubbing HTTP requests and setting expectations on HTTP requests
+EAPI=7
+HOMEPAGE=https://github.com/bblimke/webmock
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby24] >=dev-ruby/crack-0.3.2[ruby_targets_ruby24] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby25] >=dev-ruby/crack-0.3.2[ruby_targets_ruby25] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby26] >=dev-ruby/crack-0.3.2[ruby_targets_ruby26] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=mirror://rubygems/webmock-3.7.1.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0c96d59ec1055acfca6dedd92f6ceff5
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.1.8 b/metadata/md5-cache/dev-ruby/will_paginate-3.1.8
new file mode 100644
index 000000000000..6ccdcf80edbe
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.1.8
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/rails[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rails[ruby_targets_ruby25] dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rails[ruby_targets_ruby26] dev-ruby/mocha[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+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? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+DESCRIPTION=Most awesome pagination solution for Ruby
+EAPI=7
+HOMEPAGE=https://github.com/mislav/will_paginate/
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~x86-macos
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=mirror://rubygems/will_paginate-3.1.8.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b68a29a40f77887dd4af18831ede7b63
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.1.9 b/metadata/md5-cache/dev-ruby/zeitwerk-2.1.9
index ecaaef479e86..1e2c7378ef71 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.1.9
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.1.9
@@ -4,11 +4,11 @@ DESCRIPTION=Efficient and thread-safe code loader for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/fxn/zeitwerk
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 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=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.1.9.tar.gz -> zeitwerk-2.1.9.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1766a1d49bbc37c2705358a111739415
+_md5_=6886703a75620ebb6d62b932d05c3f36
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 8839beba4070..6deb5fd11a34 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/tkTheme-1.0-r2 b/metadata/md5-cache/dev-tcltk/tkTheme-1.0-r2
index b16a9acc5dab..940e7f056755 100644
--- a/metadata/md5-cache/dev-tcltk/tkTheme-1.0-r2
+++ b/metadata/md5-cache/dev-tcltk/tkTheme-1.0-r2
@@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 ppc x86
 LICENSE=BSD
 RDEPEND=dev-lang/tk x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm
 SLOT=0
-SRC_URI=http://www.xmission.com/~georgeps/Tk_Theme/other/tkTheme.tgz
+SRC_URI=mirror://gentoo/tkTheme.tgz -> tkTheme-1.0.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bae14c5d5d2a758a1d197741e377b853
+_md5_=cfdfb9d0eedaac8b8b0081fa15bfa51d
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 5684a2903556..b7b85a576cee 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/lgrind-3.67-r3 b/metadata/md5-cache/dev-tex/lgrind-3.67-r3
index 49627f2a42d2..b369035c1091 100644
--- a/metadata/md5-cache/dev-tex/lgrind-3.67-r3
+++ b/metadata/md5-cache/dev-tex/lgrind-3.67-r3
@@ -8,6 +8,6 @@ KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=BSD LGrind-Jacobson
 RDEPEND=virtual/latex-base
 SLOT=0
-SRC_URI=mirror://gentoo/lgrind.tar.gz
+SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/lgrind-3.67.tgz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b35031b2ab7bfe514fb4510e25fbdf42
+_md5_=3c940578ee19fd63270c9ef432e5010f
diff --git a/metadata/md5-cache/dev-tex/oesch-20080712 b/metadata/md5-cache/dev-tex/oesch-20080712
deleted file mode 100644
index b71430a2f275..000000000000
--- a/metadata/md5-cache/dev-tex/oesch-20080712
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=!<dev-texlive/texlive-fontsextra-2007-r1 dev-texlive/texlive-langgerman app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=Metafont font used in Austrian schools for hand writing
-EAPI=0
-HOMEPAGE=http://www.ctan.org/tex-archive/fonts/oesch/
-IUSE=examples
-KEYWORDS=~amd64 ~x86-fbsd
-LICENSE=freedist
-RDEPEND=!<dev-texlive/texlive-fontsextra-2007-r1 virtual/latex-base
-SLOT=0
-SRC_URI=mirror://gentoo/oesch-20080712.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cc9230f8a4374bba427dc8d71c142230
diff --git a/metadata/md5-cache/dev-tex/pgf-3.1.4 b/metadata/md5-cache/dev-tex/pgf-3.1.4
deleted file mode 100644
index 3f922f4534c1..000000000000
--- a/metadata/md5-cache/dev-tex/pgf-3.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DEFINED_PHASES=compile install postinst postrm
-DESCRIPTION=The TeX Portable Graphic Format
-EAPI=7
-HOMEPAGE=https://github.com/pgf-tikz/pgf
-IUSE=doc source
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LPPL-1.3c FDL-1.2
-RDEPEND=dev-texlive/texlive-latexrecommended dev-tex/xcolor virtual/latex-base
-SLOT=0
-SRC_URI=https://github.com/pgf-tikz/pgf/archive/3.1.4.tar.gz -> pgf-3.1.4.tar.gz doc? ( https://github.com/pgf-tikz/pgf/releases/download/3.1.4/pgfmanual.pdf -> pgf-3.1.4-pgfmanual.pdf )
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
-_md5_=7ec354d31e8acfcb5c96ee835db50b23
diff --git a/metadata/md5-cache/dev-tex/pgf-3.1.4-r1 b/metadata/md5-cache/dev-tex/pgf-3.1.4-r1
new file mode 100644
index 000000000000..96c29ae43fd2
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/pgf-3.1.4-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEFINED_PHASES=compile install postinst postrm
+DESCRIPTION=The TeX Portable Graphic Format
+EAPI=7
+HOMEPAGE=https://github.com/pgf-tikz/pgf
+IUSE=doc source
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LPPL-1.3c FDL-1.2
+RDEPEND=dev-texlive/texlive-latexrecommended dev-tex/xcolor virtual/latex-base
+SLOT=0
+SRC_URI=https://github.com/pgf-tikz/pgf/archive/3.1.4.tar.gz -> pgf-3.1.4.tar.gz https://dev.gentoo.org/~zlogene/distfiles/dev-tex/pgf/pgf-3.1.4-revisioned.tex.xz doc? ( https://github.com/pgf-tikz/pgf/releases/download/3.1.4/pgfmanual.pdf -> pgf-3.1.4-pgfmanual.pdf )
+_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_md5_=e6c8419c7074553af045f6b679170144
diff --git a/metadata/md5-cache/dev-tex/pgf-3.1.4b b/metadata/md5-cache/dev-tex/pgf-3.1.4b
deleted file mode 100644
index 0ce4a7edcadd..000000000000
--- a/metadata/md5-cache/dev-tex/pgf-3.1.4b
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DEFINED_PHASES=compile install postinst postrm
-DESCRIPTION=The TeX Portable Graphic Format
-EAPI=7
-HOMEPAGE=https://github.com/pgf-tikz/pgf
-IUSE=doc source
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LPPL-1.3c FDL-1.2
-RDEPEND=dev-texlive/texlive-latexrecommended dev-tex/xcolor virtual/latex-base
-SLOT=0
-SRC_URI=https://github.com/pgf-tikz/pgf/archive/3.1.4b.tar.gz -> pgf-3.1.4b.tar.gz doc? ( https://github.com/pgf-tikz/pgf/releases/download/3.1.4b/pgfmanual.pdf -> pgf-3.1.4b-pgfmanual.pdf )
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
-_md5_=0081b9720e21e2d6810fe7bbb6aec1ff
diff --git a/metadata/md5-cache/dev-tex/pgf-3.1.4b-r1 b/metadata/md5-cache/dev-tex/pgf-3.1.4b-r1
new file mode 100644
index 000000000000..e4aa82a03242
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/pgf-3.1.4b-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEFINED_PHASES=compile install postinst postrm
+DESCRIPTION=The TeX Portable Graphic Format
+EAPI=7
+HOMEPAGE=https://github.com/pgf-tikz/pgf
+IUSE=doc source
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LPPL-1.3c FDL-1.2
+RDEPEND=dev-texlive/texlive-latexrecommended dev-tex/xcolor virtual/latex-base
+SLOT=0
+SRC_URI=https://github.com/pgf-tikz/pgf/archive/3.1.4b.tar.gz -> pgf-3.1.4b.tar.gz https://dev.gentoo.org/~zlogene/distfiles/dev-tex/pgf/pgf-3.1.4b-revisioned.xz doc? ( https://github.com/pgf-tikz/pgf/releases/download/3.1.4b/pgfmanual.pdf -> pgf-3.1.4b-pgfmanual.pdf )
+_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_md5_=f61f3516b4d1e16f0a3a5d4f0e592039
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 4dadf584b3a7..8da48484f79b 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/android-ndk-10e b/metadata/md5-cache/dev-util/android-ndk-10e
index 0bf395dc45a7..47d712514555 100644
--- a/metadata/md5-cache/dev-util/android-ndk-10e
+++ b/metadata/md5-cache/dev-util/android-ndk-10e
@@ -9,5 +9,5 @@ RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 sys-libs/
 RESTRICT=mirror strip installsources test
 SLOT=0
 SRC_URI=x86? ( https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin -> android-ndk-10e-x86.7z ) amd64? ( https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin -> android-ndk-10e-amd64.7z )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73
 _md5_=d07fcc092aa852b624e82222f1ec759d
diff --git a/metadata/md5-cache/dev-util/android-ndk-11c b/metadata/md5-cache/dev-util/android-ndk-11c
index 8423d89fd886..6ba2086e9bbe 100644
--- a/metadata/md5-cache/dev-util/android-ndk-11c
+++ b/metadata/md5-cache/dev-util/android-ndk-11c
@@ -9,5 +9,5 @@ RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 sys-libs/
 RESTRICT=mirror strip installsources test
 SLOT=0
 SRC_URI=https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73
 _md5_=09bddb30c6ef4c4be3afdde7865d20f5
diff --git a/metadata/md5-cache/dev-util/android-ndk-11c-r1 b/metadata/md5-cache/dev-util/android-ndk-11c-r1
index d8c57a21a98e..a1c634e0408e 100644
--- a/metadata/md5-cache/dev-util/android-ndk-11c-r1
+++ b/metadata/md5-cache/dev-util/android-ndk-11c-r1
@@ -9,5 +9,5 @@ RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 || ( sys-
 RESTRICT=mirror strip installsources test
 SLOT=0
 SRC_URI=https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73
 _md5_=bba339aabd799a7605857e2c4a6dfb93
diff --git a/metadata/md5-cache/dev-util/android-ndk-13b b/metadata/md5-cache/dev-util/android-ndk-13b
index 35629a8942dd..a2e1148b0fcf 100644
--- a/metadata/md5-cache/dev-util/android-ndk-13b
+++ b/metadata/md5-cache/dev-util/android-ndk-13b
@@ -9,5 +9,5 @@ RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 || ( sys-
 RESTRICT=mirror strip installsources test
 SLOT=0
 SRC_URI=https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73
 _md5_=bba339aabd799a7605857e2c4a6dfb93
diff --git a/metadata/md5-cache/dev-util/android-ndk-14b b/metadata/md5-cache/dev-util/android-ndk-14b
index b4bcd6b50aee..e5de9a5be95b 100644
--- a/metadata/md5-cache/dev-util/android-ndk-14b
+++ b/metadata/md5-cache/dev-util/android-ndk-14b
@@ -9,5 +9,5 @@ RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 || ( sys-
 RESTRICT=mirror strip installsources test
 SLOT=0
 SRC_URI=https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73
 _md5_=fca6448cb89826d406f9d6cda495cbf0
diff --git a/metadata/md5-cache/dev-util/android-ndk-16b b/metadata/md5-cache/dev-util/android-ndk-16b
index 71ac7281a23a..e21cd1f3adf7 100644
--- a/metadata/md5-cache/dev-util/android-ndk-16b
+++ b/metadata/md5-cache/dev-util/android-ndk-16b
@@ -9,5 +9,5 @@ RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 || ( sys-
 RESTRICT=mirror strip installsources test
 SLOT=0
 SRC_URI=https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73
 _md5_=fca6448cb89826d406f9d6cda495cbf0
diff --git a/metadata/md5-cache/dev-util/android-ndk-18 b/metadata/md5-cache/dev-util/android-ndk-18
index c7acc868dfb8..b0ebc7f20f37 100644
--- a/metadata/md5-cache/dev-util/android-ndk-18
+++ b/metadata/md5-cache/dev-util/android-ndk-18
@@ -9,5 +9,5 @@ RDEPEND=>=dev-util/android-sdk-update-manager-10 >=sys-devel/make-3.81 sys-libs/
 RESTRICT=mirror strip installsources test
 SLOT=0
 SRC_URI=https://dl.google.com/android/repository/android-ndk-r18-linux-x86_64.zip
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73
 _md5_=c0496467c4e70815f895fdacff9b7483
diff --git a/metadata/md5-cache/dev-util/bingrep-0.6.2 b/metadata/md5-cache/dev-util/bingrep-0.6.2
index e78bda3c7cf2..5e34a3f56a6d 100644
--- a/metadata/md5-cache/dev-util/bingrep-0.6.2
+++ b/metadata/md5-cache/dev-util/bingrep-0.6.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/m4b/bingrep/archive/9b29a829bc41bbb9c8ca2d0ecfef8472e7aeda81.tar.gz -> bingrep-0.6.2.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.8/download -> aho-corasick-0.6.8.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.24/download -> backtrace-sys-0.1.24.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.2.6/download -> byteorder-1.2.6.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/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cpp_demangle/0.2.12/download -> cpp_demangle-0.2.12.crate https://crates.io/api/v1/crates/csv/1.0.2/download -> csv-1.0.2.crate https://crates.io/api/v1/crates/csv-core/0.1.4/download -> csv-core-0.1.4.crate https://crates.io/api/v1/crates/encode_unicode/0.3.5/download -> encode_unicode-0.3.5.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/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/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/goblin/0.0.19/download -> goblin-0.0.19.crate https://crates.io/api/v1/crates/hexplay/0.2.1/download -> hexplay-0.2.1.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.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/log/0.4.5/download -> log-0.4.5.crate https://crates.io/api/v1/crates/memchr/2.1.0/download -> memchr-2.1.0.crate https://crates.io/api/v1/crates/memrange/0.1.3/download -> memrange-0.1.3.crate https://crates.io/api/v1/crates/metagoblin/0.1.1/download -> metagoblin-0.1.1.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/prettytable-rs/0.8.0/download -> prettytable-rs-0.8.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.20/download -> proc-macro2-0.4.20.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.8/download -> quote-0.6.8.crate https://crates.io/api/v1/crates/rand/0.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/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/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/scroll/0.9.2/download -> scroll-0.9.2.crate https://crates.io/api/v1/crates/scroll_derive/0.9.5/download -> scroll_derive-0.9.5.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/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/structopt/0.2.12/download -> structopt-0.2.12.crate https://crates.io/api/v1/crates/structopt-derive/0.2.12/download -> structopt-derive-0.2.12.crate https://crates.io/api/v1/crates/syn/0.15.13/download -> syn-0.15.13.crate https://crates.io/api/v1/crates/synstructure/0.10.0/download -> synstructure-0.10.0.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.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/theban_interval_tree/0.7.1/download -> theban_interval_tree-0.7.1.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.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/utf8-ranges/1.0.1/download -> utf8-ranges-1.0.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.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.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/0.1.6/download -> wincolor-0.1.6.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=fe14b328c78711706769e8f0d7c5a8b3
diff --git a/metadata/md5-cache/dev-util/cargo-tree-0.23.0 b/metadata/md5-cache/dev-util/cargo-tree-0.23.0
index 5fbaa7324f16..39ffdbb47e29 100644
--- a/metadata/md5-cache/dev-util/cargo-tree-0.23.0
+++ b/metadata/md5-cache/dev-util/cargo-tree-0.23.0
@@ -10,5 +10,5 @@ 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	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	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
index 720ffe8fac08..157c901e4345 100644
--- a/metadata/md5-cache/dev-util/cargo-tree-0.24.0
+++ b/metadata/md5-cache/dev-util/cargo-tree-0.24.0
@@ -10,5 +10,5 @@ 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	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=d430f7cc1dc242210d2ce396640a4057
diff --git a/metadata/md5-cache/dev-util/cargo-tree-0.25.0 b/metadata/md5-cache/dev-util/cargo-tree-0.25.0
index 29f3ab108ce0..42c3208e9114 100644
--- a/metadata/md5-cache/dev-util/cargo-tree-0.25.0
+++ b/metadata/md5-cache/dev-util/cargo-tree-0.25.0
@@ -10,5 +10,5 @@ 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.25.0.tar.gz -> cargo-tree-0.25.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.10/download -> aho-corasick-0.6.10.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.14/download -> backtrace-0.3.14.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/byteorder/1.3.1/download -> byteorder-1.3.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.34.0/download -> cargo-0.34.0.crate https://crates.io/api/v1/crates/cc/1.0.30/download -> cc-1.0.30.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/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.22.0/download -> crates-io-0.22.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.1/download -> fuchsia-cprng-0.1.1.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.8.0/download -> git2-0.8.0.crate https://crates.io/api/v1/crates/git2-curl/0.9.0/download -> git2-curl-0.9.0.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.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.1/download -> im-rc-12.3.1.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.3.0/download -> lazy_static-1.3.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.49/download -> libc-0.2.49.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.2.0/download -> memchr-2.2.0.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.10.0/download -> num_cpus-1.10.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.19/download -> openssl-0.10.19.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.42/download -> openssl-sys-0.9.42.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.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/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.3/download -> rand_jitter-0.1.3.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.2/download -> rand_pcg-0.1.2.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.2/download -> regex-1.1.2.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.15/download -> schannel-0.1.15.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.89/download -> serde-1.0.89.crate https://crates.io/api/v1/crates/serde_derive/1.0.89/download -> serde_derive-1.0.89.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.39/download -> serde_json-1.0.39.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/sized-chunks/0.1.1/download -> sized-chunks-0.1.1.crate https://crates.io/api/v1/crates/smallvec/0.6.9/download -> smallvec-0.6.9.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.27/download -> syn-0.15.27.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.21/download -> tar-0.4.21.crate https://crates.io/api/v1/crates/tempfile/3.0.7/download -> tempfile-3.0.7.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/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url_serde/0.2.0/download -> url_serde-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/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/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	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=e544227b9521881a29da0dc94f886d29
diff --git a/metadata/md5-cache/dev-util/cargo-tree-0.26.0 b/metadata/md5-cache/dev-util/cargo-tree-0.26.0
index 8f0d2b4ebad5..382ba7081a27 100644
--- a/metadata/md5-cache/dev-util/cargo-tree-0.26.0
+++ b/metadata/md5-cache/dev-util/cargo-tree-0.26.0
@@ -10,5 +10,5 @@ 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.26.0.tar.gz -> cargo-tree-0.26.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.10/download -> aho-corasick-0.6.10.crate https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/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.15/download -> backtrace-0.3.15.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/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.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.35.0/download -> cargo-0.35.0.crate https://crates.io/api/v1/crates/cc/1.0.35/download -> cc-1.0.35.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.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.4/download -> core-foundation-0.6.4.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.23.0/download -> crates-io-0.23.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.2.0/download -> crc32fast-1.2.0.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.20/download -> curl-0.4.20.crate https://crates.io/api/v1/crates/curl-sys/0.4.17/download -> curl-sys-0.4.17.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/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.7/download -> flate2-1.0.7.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.1/download -> fuchsia-cprng-0.1.1.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.8.0/download -> git2-0.8.0.crate https://crates.io/api/v1/crates/git2-curl/0.9.0/download -> git2-curl-0.9.0.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.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/http/0.1.17/download -> http-0.1.17.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.4/download -> im-rc-12.3.4.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.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.13/download -> jobserver-0.1.13.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.3.0/download -> lazy_static-1.3.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.51/download -> libc-0.2.51.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.2.0/download -> memchr-2.2.0.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.10.0/download -> num_cpus-1.10.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.20/download -> openssl-0.10.20.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.43/download -> openssl-sys-0.9.43.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.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.12/download -> quote-0.6.12.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.3/download -> rand_jitter-0.1.3.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.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.54/download -> redox_syscall-0.1.54.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.5/download -> regex-1.1.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/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.5/download -> rustfix-0.4.5.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.15/download -> schannel-0.1.15.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.90/download -> serde-1.0.90.crate https://crates.io/api/v1/crates/serde_derive/1.0.90/download -> serde_derive-1.0.90.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.39/download -> serde_json-1.0.39.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/sized-chunks/0.1.2/download -> sized-chunks-0.1.2.crate https://crates.io/api/v1/crates/smallvec/0.6.9/download -> smallvec-0.6.9.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.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.2.15/download -> structopt-0.2.15.crate https://crates.io/api/v1/crates/structopt-derive/0.2.15/download -> structopt-derive-0.2.15.crate https://crates.io/api/v1/crates/syn/0.15.30/download -> syn-0.15.30.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.22/download -> tar-0.4.22.crate https://crates.io/api/v1/crates/tempfile/3.0.7/download -> tempfile-3.0.7.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.11.0/download -> textwrap-0.11.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/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url_serde/0.2.0/download -> url_serde-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/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/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.7/download -> winapi-0.3.7.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	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=af082c34c52c4383cc81583920e138a5
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.5 b/metadata/md5-cache/dev-util/catalyst-3.0.5
index d45cc807e273..809fcde0d48e 100644
--- a/metadata/md5-cache/dev-util/catalyst-3.0.5
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[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(-)]
+DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
-IUSE=ccache doc +iso kernel_linux system-bootloader python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+IUSE=ccache doc +iso kernel_linux system-bootloader python_targets_python3_6 python_targets_python3_7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) sys-boot/syslinux sys-boot/shim )
-RDEPEND=>=dev-python/snakeoil-0.6.5[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/pydecomp-0.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( virtual/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_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 )
+RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pydecomp-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( virtual/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-3.0.5.tar.bz2
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d381bf59bfe05dea27485dd195571a68
+_md5_=885e95aca41abbd8cfd6ffff42508aa9
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.6 b/metadata/md5-cache/dev-util/catalyst-3.0.6
new file mode 100644
index 000000000000..ef5ed41486fd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
+IUSE=ccache doc +iso kernel_linux system-bootloader python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) sys-boot/syslinux sys-boot/shim )
+RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pydecomp-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( virtual/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-3.0.6.tar.bz2
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=020f415c7fec0f6e89a4ddc4236c1a36
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index 7e8305138896..1a9c4a8262e8 100644
--- a/metadata/md5-cache/dev-util/catalyst-9999
+++ b/metadata/md5-cache/dev-util/catalyst-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[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(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
-IUSE=ccache doc +iso kernel_linux system-bootloader python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+IUSE=ccache doc +iso kernel_linux system-bootloader python_targets_python3_6 python_targets_python3_7
 LICENSE=GPL-2
 PDEPEND=system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 sys-boot/grub:2 amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) x86? ( sys-boot/grub[grub_platforms_efi-32] ) sys-boot/syslinux sys-boot/shim )
 PROPERTIES=live
-RDEPEND=>=dev-python/snakeoil-0.6.5[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/pydecomp-0.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( virtual/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_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 )
+RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pydecomp-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( virtual/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bca362246540fd58a920d0425a18bf20
+_md5_=d4c6ca01766e55da40725726374113c1
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.6.6 b/metadata/md5-cache/dev-util/cbindgen-0.6.6
index b0c128e30a37..3510a6959b59 100644
--- a/metadata/md5-cache/dev-util/cbindgen-0.6.6
+++ b/metadata/md5-cache/dev-util/cbindgen-0.6.6
@@ -8,5 +8,5 @@ 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.6.6/download -> cbindgen-0.6.6.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.14.1/download -> syn-0.14.1.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	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=b21e3f224b57a0fc2cadd35f4eed8b6f
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.6.7 b/metadata/md5-cache/dev-util/cbindgen-0.6.7
index fb36ea26dd8e..e6154300241f 100644
--- a/metadata/md5-cache/dev-util/cbindgen-0.6.7
+++ b/metadata/md5-cache/dev-util/cbindgen-0.6.7
@@ -8,5 +8,5 @@ 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.6.7/download -> cbindgen-0.6.7.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.14.1/download -> syn-0.14.1.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	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=a9f18c8863896c6512b71bee2bb5e713
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.7.1 b/metadata/md5-cache/dev-util/cbindgen-0.7.1
index db591f8dcba2..f21229b226fe 100644
--- a/metadata/md5-cache/dev-util/cbindgen-0.7.1
+++ b/metadata/md5-cache/dev-util/cbindgen-0.7.1
@@ -8,5 +8,5 @@ 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	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=e24933708dfd11b6ee90eb59a5056efc
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.8.2 b/metadata/md5-cache/dev-util/cbindgen-0.8.2
index 5a169dee9b60..8539c80c9949 100644
--- a/metadata/md5-cache/dev-util/cbindgen-0.8.2
+++ b/metadata/md5-cache/dev-util/cbindgen-0.8.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.2/download -> autocfg-0.1.2.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cbindgen/0.8.2/download -> cbindgen-0.8.2.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/itoa/0.4.3/download -> itoa-0.4.3.crate https://crates.io/api/v1/crates/libc/0.2.47/download -> libc-0.2.47.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/proc-macro2/0.4.25/download -> proc-macro2-0.4.25.crate https://crates.io/api/v1/crates/quote/0.6.10/download -> quote-0.6.10.crate https://crates.io/api/v1/crates/rand/0.6.4/download -> rand-0.6.4.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_core/0.3.0/download -> rand_core-0.3.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_os/0.1.1/download -> rand_os-0.1.1.crate https://crates.io/api/v1/crates/rand_pcg/0.1.1/download -> rand_pcg-0.1.1.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.50/download -> redox_syscall-0.1.50.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/0.2.7/download -> ryu-0.2.7.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.84/download -> serde-1.0.84.crate https://crates.io/api/v1/crates/serde_derive/1.0.84/download -> serde_derive-1.0.84.crate https://crates.io/api/v1/crates/serde_json/1.0.36/download -> serde_json-1.0.36.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.26/download -> syn-0.15.26.crate https://crates.io/api/v1/crates/tempfile/3.0.5/download -> tempfile-3.0.5.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/toml/0.4.10/download -> toml-0.4.10.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=35bfeea5564ddb00c66410a88892ad7f
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.8.7 b/metadata/md5-cache/dev-util/cbindgen-0.8.7
index 6a8d8bfe326a..d684b4379e78 100644
--- a/metadata/md5-cache/dev-util/cbindgen-0.8.7
+++ b/metadata/md5-cache/dev-util/cbindgen-0.8.7
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.2/download -> autocfg-0.1.2.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cbindgen/0.8.7/download -> cbindgen-0.8.7.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/itoa/0.4.3/download -> itoa-0.4.3.crate https://crates.io/api/v1/crates/libc/0.2.47/download -> libc-0.2.47.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/proc-macro2/0.4.25/download -> proc-macro2-0.4.25.crate https://crates.io/api/v1/crates/quote/0.6.10/download -> quote-0.6.10.crate https://crates.io/api/v1/crates/rand/0.6.4/download -> rand-0.6.4.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_core/0.3.0/download -> rand_core-0.3.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_os/0.1.1/download -> rand_os-0.1.1.crate https://crates.io/api/v1/crates/rand_pcg/0.1.1/download -> rand_pcg-0.1.1.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.50/download -> redox_syscall-0.1.50.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/0.2.7/download -> ryu-0.2.7.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.84/download -> serde-1.0.84.crate https://crates.io/api/v1/crates/serde_derive/1.0.84/download -> serde_derive-1.0.84.crate https://crates.io/api/v1/crates/serde_json/1.0.36/download -> serde_json-1.0.36.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.26/download -> syn-0.15.26.crate https://crates.io/api/v1/crates/tempfile/3.0.5/download -> tempfile-3.0.5.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/toml/0.4.10/download -> toml-0.4.10.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=09046d6a2662c1103e63f3a84f2d4896
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.9.0 b/metadata/md5-cache/dev-util/cbindgen-0.9.0
index 6c99685721b9..bad1be15f571 100644
--- a/metadata/md5-cache/dev-util/cbindgen-0.9.0
+++ b/metadata/md5-cache/dev-util/cbindgen-0.9.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=MPL-2.0
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.4/download -> autocfg-0.1.4.crate https://crates.io/api/v1/crates/bitflags/1.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/cbindgen/0.9.0/download -> cbindgen-0.9.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/libc/0.2.58/download -> libc-0.2.58.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/quote/0.6.12/download -> quote-0.6.12.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.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.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.54/download -> redox_syscall-0.1.54.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.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/ryu/0.2.8/download -> ryu-0.2.8.crate https://crates.io/api/v1/crates/serde/1.0.93/download -> serde-1.0.93.crate https://crates.io/api/v1/crates/serde_derive/1.0.93/download -> serde_derive-1.0.93.crate https://crates.io/api/v1/crates/serde_json/1.0.39/download -> serde_json-1.0.39.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/0.15.38/download -> syn-0.15.38.crate https://crates.io/api/v1/crates/tempfile/3.0.8/download -> tempfile-3.0.8.crate https://crates.io/api/v1/crates/termion/1.5.3/download -> termion-1.5.3.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/toml/0.5.1/download -> toml-0.5.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/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.7/download -> winapi-0.3.7.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	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=dc24afdd0dc98237183fb09eb7fc873a
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.9.1 b/metadata/md5-cache/dev-util/cbindgen-0.9.1
new file mode 100644
index 000000000000..a91bf53eb8ee
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cbindgen-0.9.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 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.4/download -> autocfg-0.1.4.crate https://crates.io/api/v1/crates/bitflags/1.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/cbindgen/0.9.1/download -> cbindgen-0.9.1.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/libc/0.2.58/download -> libc-0.2.58.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.0/download -> proc-macro2-1.0.0.crate https://crates.io/api/v1/crates/quote/1.0.0/download -> quote-1.0.0.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.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.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.54/download -> redox_syscall-0.1.54.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.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/ryu/0.2.8/download -> ryu-0.2.8.crate https://crates.io/api/v1/crates/serde/1.0.93/download -> serde-1.0.93.crate https://crates.io/api/v1/crates/serde_derive/1.0.99/download -> serde_derive-1.0.99.crate https://crates.io/api/v1/crates/serde_json/1.0.39/download -> serde_json-1.0.39.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.1/download -> syn-1.0.1.crate https://crates.io/api/v1/crates/tempfile/3.0.8/download -> tempfile-3.0.8.crate https://crates.io/api/v1/crates/termion/1.5.3/download -> termion-1.5.3.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/toml/0.5.1/download -> toml-0.5.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.2.0/download -> unicode-xid-0.2.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.7/download -> winapi-0.3.7.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	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=8faf5a52025522f0bdbb5a70c43508cb
diff --git a/metadata/md5-cache/dev-util/ccache-3.7.2 b/metadata/md5-cache/dev-util/ccache-3.7.2
index e4aae4e62d6f..5a374cc42f69 100644
--- a/metadata/md5-cache/dev-util/ccache-3.7.2
+++ b/metadata/md5-cache/dev-util/ccache-3.7.2
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils sys-libs/zlib
 DESCRIPTION=fast compiler cache
 EAPI=7
 HOMEPAGE=https://ccache.dev/
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd
 LICENSE=GPL-3
 RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://github.com/ccache/ccache/releases/download/v3.7.2/ccache-3.7.2.tar.xz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=8544d1d96e1fbea7f624e91b9accefa7
+_md5_=36d925341b194b5003dc52e71eef20be
diff --git a/metadata/md5-cache/dev-util/cmake-3.15.1 b/metadata/md5-cache/dev-util/cmake-3.15.1
deleted file mode 100644
index f39fb611d28e..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.15.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Cross platform Make
-EAPI=7
-HOMEPAGE=https://cmake.org/
-IUSE=doc emacs system-jsoncpp ncurses qt5 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=CMake
-RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.15/cmake-3.15.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=039470f416df95d97870449595f0d37f
diff --git a/metadata/md5-cache/dev-util/cmake-3.15.3 b/metadata/md5-cache/dev-util/cmake-3.15.3
new file mode 100644
index 000000000000..fd2a237159bc
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cmake-3.15.3
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cross platform Make
+EAPI=7
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs system-jsoncpp ncurses qt5 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=CMake
+RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.15/cmake-3.15.3.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=039470f416df95d97870449595f0d37f
diff --git a/metadata/md5-cache/dev-util/conan-1.0.4-r1 b/metadata/md5-cache/dev-util/conan-1.0.4-r1
deleted file mode 100644
index 8b9fe3aae88d..000000000000
--- a/metadata/md5-cache/dev-util/conan-1.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pyjwt-1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/colorama-0.3.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/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/patch-1.16[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fasteners-0.14.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/six-1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/node-semver-0.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/distro-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-1.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/future-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/astroid-1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pluginbase-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bottle-0.12.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-lang/go >=dev-python/mock-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-1.3.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-parameterized-0.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webtest-2.0.18[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Distributed C/C++ package manager
-EAPI=6
-HOMEPAGE=https://conan.io/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-python/pyjwt-1.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/colorama-0.3.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/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/patch-1.16[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fasteners-0.14.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/six-1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/node-semver-0.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/distro-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-1.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/future-0.16.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/astroid-1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pluginbase-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bottle-0.12.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/c/conan/conan-1.0.4.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d8126f59dd3ae1348efcbc9ed926c65
diff --git a/metadata/md5-cache/dev-util/conan-1.18.1-r1 b/metadata/md5-cache/dev-util/conan-1.18.1-r1
new file mode 100644
index 000000000000..a77babbdfcb7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/conan-1.18.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+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(-)] test? ( >=dev-python/astroid-1.6.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bottle-0.12.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/colorama-0.3.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/deprecation-2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/distro-1.0.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fasteners-0.14.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/future-0.16.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/node-semver-0.6.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/patch-1.16[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pluginbase-0.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyjwt-1.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-2.3.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.7.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-5.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.8.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tqdm-4.28.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/typed-ast-1.1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-lang/go >=dev-python/mock-1.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/nose-1.3.7[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parameterized-0.6.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webtest-2.0.18[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/cmake )
+DESCRIPTION=Distributed C/C++ package manager
+EAPI=7
+HOMEPAGE=https://conan.io/
+IUSE=test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/astroid-1.6.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bottle-0.12.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/colorama-0.3.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/deprecation-2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/distro-1.0.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fasteners-0.14.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/future-0.16.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/node-semver-0.6.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/patch-1.16[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pluginbase-0.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyjwt-1.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-2.3.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.7.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-5.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.8.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tqdm-4.28.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/typed-ast-1.1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/c/conan/conan-1.18.1.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=acf4def512007b42a7c15e2af3e70187
diff --git a/metadata/md5-cache/dev-util/conf2struct-0_pre0-r1 b/metadata/md5-cache/dev-util/conf2struct-0_pre0-r1
deleted file mode 100644
index d3e0f69ee685..000000000000
--- a/metadata/md5-cache/dev-util/conf2struct-0_pre0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/libconfig dev-perl/Conf-Libconfig
-DESCRIPTION=Create C parsers for libconfig and command-line
-EAPI=7
-HOMEPAGE=https://github.com/yrutschle/conf2struct/
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD-2
-RDEPEND=dev-libs/libconfig dev-perl/Conf-Libconfig
-SLOT=0
-SRC_URI=https://github.com/yrutschle/conf2struct/archive/10ea3356b65e712fb000f4d37f00e1dc09c1e722.tar.gz -> conf2struct-0_pre0.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=58db13bb275d1c523c1ee43bbbde28f0
diff --git a/metadata/md5-cache/dev-util/conf2struct-1.0 b/metadata/md5-cache/dev-util/conf2struct-1.0
new file mode 100644
index 000000000000..b0548abf4b50
--- /dev/null
+++ b/metadata/md5-cache/dev-util/conf2struct-1.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/libconfig dev-perl/Conf-Libconfig
+DESCRIPTION=Create C parsers for libconfig and command-line
+EAPI=7
+HOMEPAGE=https://github.com/yrutschle/conf2struct/
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=dev-libs/libconfig dev-perl/Conf-Libconfig
+SLOT=0
+SRC_URI=https://github.com/yrutschle/conf2struct/archive/v1.0.tar.gz -> conf2struct-1.0.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=53008fc4556692b3df6c595baa4e5a5e
diff --git a/metadata/md5-cache/dev-util/debhelper-12.3 b/metadata/md5-cache/dev-util/debhelper-12.3
deleted file mode 100644
index 5d7519ea4c14..000000000000
--- a/metadata/md5-cache/dev-util/debhelper-12.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
-DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
-EAPI=7
-HOMEPAGE=https://tracker.debian.org/pkg/debhelper
-IUSE=test l10n_de l10n_es l10n_fr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_12.3.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e0b59ccfc43fe797b946ca341a13367c
diff --git a/metadata/md5-cache/dev-util/debhelper-12.4 b/metadata/md5-cache/dev-util/debhelper-12.4
deleted file mode 100644
index 07a1810ddffa..000000000000
--- a/metadata/md5-cache/dev-util/debhelper-12.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
-DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
-EAPI=7
-HOMEPAGE=https://tracker.debian.org/pkg/debhelper
-IUSE=test l10n_de l10n_es l10n_fr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_12.4.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e0b59ccfc43fe797b946ca341a13367c
diff --git a/metadata/md5-cache/dev-util/debhelper-12.5.3 b/metadata/md5-cache/dev-util/debhelper-12.5.3
new file mode 100644
index 000000000000..c4014ba0a81d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debhelper-12.5.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
+DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
+EAPI=7
+HOMEPAGE=https://tracker.debian.org/pkg/debhelper
+IUSE=test l10n_de l10n_es l10n_fr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_12.5.3.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e0b59ccfc43fe797b946ca341a13367c
diff --git a/metadata/md5-cache/dev-util/debhelper-12.5.4 b/metadata/md5-cache/dev-util/debhelper-12.5.4
new file mode 100644
index 000000000000..22198b20021e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debhelper-12.5.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
+DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
+EAPI=7
+HOMEPAGE=https://tracker.debian.org/pkg/debhelper
+IUSE=test l10n_de l10n_es l10n_fr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_12.5.4.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e0b59ccfc43fe797b946ca341a13367c
diff --git a/metadata/md5-cache/dev-util/devhelp-3.30.1 b/metadata/md5-cache/dev-util/devhelp-3.30.1
index 0931e5966d80..c9f8514cb811 100644
--- a/metadata/md5-cache/dev-util/devhelp-3.30.1
+++ b/metadata/md5-cache/dev-util/devhelp-3.30.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs
 REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0/3-6
 SRC_URI=mirror://gnome/sources/devhelp/3.30/devhelp-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f19010d231f295421c4edbc506883a28
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20190728 b/metadata/md5-cache/dev-util/dialog-1.3.20190728
deleted file mode 100644
index d501eecce885..000000000000
--- a/metadata/md5-cache/dev-util/dialog-1.3.20190728
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool ) !<=sys-freebsd/freebsd-contrib-8.9999
-DESCRIPTION=tool to display dialog boxes from a shell
-EAPI=6
-HOMEPAGE=https://invisible-island.net/dialog/
-IUSE=examples minimal nls static-libs unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
-SLOT=0/15
-SRC_URI=https://dev.gentoo.org/~jer/dialog-1.3-20190728.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f406060a23f4e22ca0688f239baeeb43
diff --git a/metadata/md5-cache/dev-util/edi-0.7.1 b/metadata/md5-cache/dev-util/edi-0.7.1
index 118815684432..96f64aea9c35 100644
--- a/metadata/md5-cache/dev-util/edi-0.7.1
+++ b/metadata/md5-cache/dev-util/edi-0.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1-with-linking-exception
 RDEPEND=|| ( dev-libs/efl[X] dev-libs/efl[wayland] ) >=dev-libs/efl-1.22.0[eet] clang? ( sys-devel/clang:= )
 SLOT=0
 SRC_URI=https://github.com/Enlightenment/edi/archive/v0.7.1.tar.gz -> edi-0.7.1.tar.gz
-_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=48bb625c7cd5194d7f50da44a183de16
diff --git a/metadata/md5-cache/dev-util/electron-2.0.17-r2 b/metadata/md5-cache/dev-util/electron-2.0.17-r2
index 85df6e38f20e..39fad136114b 100644
--- a/metadata/md5-cache/dev-util/electron-2.0.17-r2
+++ b/metadata/md5-cache/dev-util/electron-2.0.17-r2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=2.0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-61.0.3163.100.tar.xz https://github.com/electron/electron/archive/v2.0.17.tar.gz -> electron-2.0.17.tar.gz https://github.com/electron/chromium-breakpad/archive/82f0452e6b687b3c1e14e08d172b2f3fb79ae91a.tar.gz -> electron-chromium-breakpad-82f0452e6b687b3c1e14e08d172b2f3fb79ae91a.tar.gz https://github.com/google/breakpad/archive/67f738b7adb47dc1e3b272fb99062f4192fa6651.tar.gz -> electron-breakpad-67f738b7adb47dc1e3b272fb99062f4192fa6651.tar.gz https://github.com/electron/node/archive/51abeb37cad3f2098c0f0fffdff739f4ac2393e8.tar.gz -> electron-node-51abeb37cad3f2098c0f0fffdff739f4ac2393e8.tar.gz https://github.com/zcbenz/native-mate/archive/6a3d238b7e1e3742f2bb495336a84021d927a24f.tar.gz -> electron-native-mate-6a3d238b7e1e3742f2bb495336a84021d927a24f.tar.gz https://github.com/electron/pdf-viewer/archive/a5251e497fb52e699b28f627e3cbb6d8cefb62df.tar.gz -> electron-pdf-viewer-a5251e497fb52e699b28f627e3cbb6d8cefb62df.tar.gz https://github.com/elprans/grit/archive/9536fb6429147d27ef1563088341825db0a893cd.tar.gz -> electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz https://github.com/electron/libchromiumcontent/archive/daf9bdcdfdfd6bad258b5e1e48b2e17d06c1a987.tar.gz -> electron-libchromiumcontent-daf9bdcdfdfd6bad258b5e1e48b2e17d06c1a987.tar.gz https://github.com/elprans/asar/releases/download/v0.13.0-gentoo/asar-build.tar.gz -> asar-0.13.0.tar.gz https://github.com/elprans/node-browserify/releases/download/14.0.0-gentoo/browserify-build.tar.gz -> browserify-14.0.0.tar.gz https://github.com/elprans/gentoo-electron-patches/archive/26715595f4fe3658a73adb0d2fb338f62c79e492.tar.gz -> electron-patches-26715595f4fe3658a73adb0d2fb338f62c79e492.tar.gz https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz -> ninja-1.8.2.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=416a27a5f76ad674a7b3e53f1d2696e8
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.60.6 b/metadata/md5-cache/dev-util/gdbus-codegen-2.60.6
index 2049c1b28c09..60935d4ceceb 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.60.6
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.60.6
@@ -5,11 +5,11 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.60/glib-2.60.6.tar.xz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8b83e44c32a5fdb7135e67954c029902
+_md5_=452250a19e61cd8e1d002172234ba547
diff --git a/metadata/md5-cache/dev-util/gengetopt-2.23 b/metadata/md5-cache/dev-util/gengetopt-2.23
index 5c7c207ce0bc..57c8ccd7d868 100644
--- a/metadata/md5-cache/dev-util/gengetopt-2.23
+++ b/metadata/md5-cache/dev-util/gengetopt-2.23
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure prepare
 DESCRIPTION=A tool to write command line option parsing code for C programs
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gengetopt/
-KEYWORDS=~amd64 ~arm ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gengetopt/gengetopt-2.23.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=048c7ad5e0070ccb05e19c6f6d622000
+_md5_=2fd2bbd4a4c4a1ff50583cff0b50a0c3
diff --git a/metadata/md5-cache/dev-util/glade-3.22.1 b/metadata/md5-cache/dev-util/glade-3.22.1
index 02018e9e0ba5..36f92857dd62 100644
--- a/metadata/md5-cache/dev-util/glade-3.22.1
+++ b/metadata/md5-cache/dev-util/glade-3.22.1
@@ -4,7 +4,7 @@ DESCRIPTION=A user interface designer for GTK+ and GNOME
 EAPI=6
 HOMEPAGE=https://glade.gnome.org/
 IUSE=debug +introspection python webkit python_targets_python2_7 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.53.2:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) webkit? ( >=net-libs/webkit-gtk-2.12.0:4 )
 REQUIRED_USE=python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=3.10/6
 SRC_URI=mirror://gnome/sources/glade/3.22/glade-3.22.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7475065fbbccb21faceda6ef9686af83
+_md5_=611e742892c9ccb8c08938f224feb8cd
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.60.6 b/metadata/md5-cache/dev-util/glib-utils-2.60.6
index 43a6bfc29231..4cdb1affb1d9 100644
--- a/metadata/md5-cache/dev-util/glib-utils-2.60.6
+++ b/metadata/md5-cache/dev-util/glib-utils-2.60.6
@@ -5,11 +5,11 @@ DESCRIPTION=Build utilities for GLib using projects
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] !<dev-libs/glib-2.56.2:2
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.60/glib-2.60.6.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=daa6e5adf1bb60ff963a5a0d62b6cad7
+_md5_=e7856795ed60b91619a07e0bf8611ed8
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.30.3 b/metadata/md5-cache/dev-util/gnome-builder-3.30.3
index a6f5ab82b94d..1f88c49182e6 100644
--- a/metadata/md5-cache/dev-util/gnome-builder-3.30.3
+++ b/metadata/md5-cache/dev-util/gnome-builder-3.30.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libdazzle-3.30.2[introspection,vala?] >=dev-libs/glib-2.58.0:
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-builder/3.30/gnome-builder-3.30.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fef86d89750247c6a749b0a5af37b385
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.8 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.8
index 3381571d6ffe..f5e85b48d083 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.8
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.24.8
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2 !<x11-libs/gtk+-3.22.2:3
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache/-/archive/3.24.8/gtk-update-icon-cache-3.24.8.tar.bz2
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=d0bacaf13d6eb7e0c069deea6faaddfb
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.176.3 b/metadata/md5-cache/dev-util/jenkins-bin-2.176.3
new file mode 100644
index 000000000000..fa57e6668c95
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.176.3
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DESCRIPTION=Extensible continuous integration server
+EAPI=7
+HOMEPAGE=https://jenkins.io/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.176.3/jenkins.war -> jenkins-bin-2.176.3.war
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=4452adb3375232a273bdea0aa5f43d64
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.192 b/metadata/md5-cache/dev-util/jenkins-bin-2.192
new file mode 100644
index 000000000000..032c6106a197
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.192
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DESCRIPTION=Extensible continuous integration server
+EAPI=7
+HOMEPAGE=https://jenkins.io/
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://mirrors.jenkins-ci.org/war/2.192/jenkins.war -> jenkins-bin-2.192.war
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=9473c1ab94afe7c3b6ce520b05bfad41
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.3.3 b/metadata/md5-cache/dev-util/kdevelop-5.3.3
index fb62bb7c4405..c7445304f890 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.3.3
+++ b/metadata/md5-cache/dev-util/kdevelop-5.3.3
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.3.3/src/kdevelop-5.3.3.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=594318ad81dade0a10b78c5840435cc6
+_md5_=31c2838c4d3d98ea053191ed95393934
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.4.2 b/metadata/md5-cache/dev-util/kdevelop-5.4.2
new file mode 100644
index 000000000000..ff8b76cf696d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-5.4.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=kde-apps/libkomparediff2-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qthelp-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 >=dev-util/astyle-3.1:= >=sys-devel/clang-3.8.0:= gdbui? ( >=kde-plasma/libksysguard-5.15.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.60.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) dev-libs/boost >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Integrated Development Environment, supporting KF5/Qt, C/C++ and much more
+EAPI=7
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=+gdbui hex +plasma +qmake reviewboard subversion webkit test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=kde-apps/libkomparediff2-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qthelp-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 >=dev-util/astyle-3.1:= >=sys-devel/clang-3.8.0:= gdbui? ( >=kde-plasma/libksysguard-5.15.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.60.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) >=kde-apps/kapptemplate-19.04.3:5 >=kde-apps/kio-extras-19.04.3:5 >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 dev-util/ninja >=sys-devel/gdb-7.0[python] reviewboard? ( >=kde-apps/ktp-accounts-kcm-19.04.3:5 ) !dev-util/kdevelop-clang-tidy !dev-util/kdevplatform >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RESTRICT=test
+SLOT=5/54
+SRC_URI=mirror://kde/stable/kdevelop/5.4.2/src/kdevelop-5.4.2.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0e07f926ef0ac9ddb08a4e59f9f90c5
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.4.2 b/metadata/md5-cache/dev-util/kdevelop-php-5.4.2
new file mode 100644
index 000000000000..1fbb715d10ba
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.4.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-util/kdevelop:5[test] ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5= dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=PHP plugin for KDevelop
+EAPI=7
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop/5.4.2/src/kdev-php-5.4.2.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=faa5983e025046520f6fd000157a1f9d
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.4.2 b/metadata/md5-cache/dev-util/kdevelop-python-5.4.2
new file mode 100644
index 000000000000..5e04d962cc9e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.4.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop:5= dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Python plugin for KDevelop
+EAPI=7
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=debug test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop:5= dev-python/pycodestyle[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop/5.4.2/src/kdev-python-5.4.2.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e62b11c4d54b48495e946ab90ed30bfa
diff --git a/metadata/md5-cache/dev-util/meson-0.48.2 b/metadata/md5-cache/dev-util/meson-0.48.2
deleted file mode 100644
index afd123496183..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.48.2
+++ /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_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 ~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.48.2.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ba9febd5b2b62f858c5b72e2b9fe455
diff --git a/metadata/md5-cache/dev-util/meson-0.49.2 b/metadata/md5-cache/dev-util/meson-0.49.2
deleted file mode 100644
index ec2eb518c07d..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.49.2
+++ /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_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.2.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a1c31ab1f37b181d82522ede0d6da279
diff --git a/metadata/md5-cache/dev-util/meson-0.51.1 b/metadata/md5-cache/dev-util/meson-0.51.1
index 3da343fe9955..0009bdbfa360 100644
--- a/metadata/md5-cache/dev-util/meson-0.51.1
+++ b/metadata/md5-cache/dev-util/meson-0.51.1
@@ -1,11 +1,11 @@
 BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git virtual/pkgconfig )
+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 sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
 DESCRIPTION=Open source build system
 EAPI=7
 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 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.51.1.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0147f6387e8bb113105f281e0a61cbd3
+_md5_=1dce7d70bf89b777f19a6daf3bed5e3f
diff --git a/metadata/md5-cache/dev-util/meson-0.51.2 b/metadata/md5-cache/dev-util/meson-0.51.2
new file mode 100644
index 000000000000..f52d25882814
--- /dev/null
+++ b/metadata/md5-cache/dev-util/meson-0.51.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
+DESCRIPTION=Open source build system
+EAPI=7
+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 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~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.51.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=3fa9a6eba865a6b4d009beecc65e52f0
diff --git a/metadata/md5-cache/dev-util/meson-9999 b/metadata/md5-cache/dev-util/meson-9999
index 0e879d1efd27..e0f970451e6f 100644
--- a/metadata/md5-cache/dev-util/meson-9999
+++ b/metadata/md5-cache/dev-util/meson-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git virtual/pkgconfig )
+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 sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
 DESCRIPTION=Open source build system
 EAPI=7
 HOMEPAGE=http://mesonbuild.com/
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0147f6387e8bb113105f281e0a61cbd3
+_md5_=3fa9a6eba865a6b4d009beecc65e52f0
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 02aecc0bd0f8..2f5656b10076 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	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a3210cc0d2756c7a7e3ffcc26183f3e1
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r1
index 55cae95063ea..8525869573d6 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r1
@@ -8,5 +8,5 @@ LICENSE=NVIDIA-CUDA
 RDEPEND=<sys-devel/gcc-9[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.1.105
 SRC_URI=https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.105_418.39_linux.run -> cuda_10.1.105_418.39_linux.run
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=87701addc7974ae132dcfecbb51e860d
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168
index d5a4a4469679..963cc3f18f2d 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168
@@ -8,5 +8,5 @@ LICENSE=NVIDIA-CUDA
 RDEPEND=<sys-devel/gcc-9[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.1.168
 SRC_URI=https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.168_418.67_linux.run -> cuda_10.1.168_418.67_linux.run
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=74841bab68699b6a46ba8f8e2759e634
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 dc52a8ed84f9..dd527838b2c5 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	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	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 d44d80f29946..a4d0375964da 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	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	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 34a693369535..b0c85f36e1d2 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	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	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 29010e211485..2916cf7622a8 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	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	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 67ba0525c04f..b55b3665bf9a 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	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	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 6ce6b1dd328d..21dd278ebaa8 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	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	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 909622b44624..a141c137e0c5 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	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	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 6ad4138a528a..e520ecae1e63 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	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=dc97ac8fcc42be993bb3b418c9f4a306
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.5.4 b/metadata/md5-cache/dev-util/pkgcheck-0.5.4
deleted file mode 100644
index 8e89a2ff45f8..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.5.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/snakeoil-0.7.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/pkgcore-0.9.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=pkgcore-based QA utility
-EAPI=5
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=>=dev-python/snakeoil-0.7.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/pkgcore-0.9.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.5.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f173f9a7658358a164b7316c1ed50f04
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.6.2 b/metadata/md5-cache/dev-util/pkgcheck-0.6.2
new file mode 100644
index 000000000000..7c91d9977c5c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.6.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/snakeoil-0.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-apps/pkgcore-0.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=pkgcore-based QA utility
+EAPI=6
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+IUSE=doc test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/snakeoil-0.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-apps/pkgcore-0.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.6.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=95d01f3884c58f14615c554d5c9ead8b
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.6.3 b/metadata/md5-cache/dev-util/pkgcheck-0.6.3
new file mode 100644
index 000000000000..fe749586a3dc
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.6.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/snakeoil-0.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-apps/pkgcore-0.10.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=pkgcore-based QA utility
+EAPI=6
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+IUSE=doc test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/snakeoil-0.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-apps/pkgcore-0.10.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.6.3.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=94c03818180f301b4992cf25594d7cb9
diff --git a/metadata/md5-cache/dev-util/pkgcheck-9999 b/metadata/md5-cache/dev-util/pkgcheck-9999
index ca7108c84ba7..568b4f6cb3cc 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-9999
+++ b/metadata/md5-cache/dev-util/pkgcheck-9999
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~sys-apps/pkgcore-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~sys-apps/pkgcore-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=pkgcore-based QA utility
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=doc python_targets_python3_6 python_targets_python3_7
-LICENSE=|| ( BSD GPL-2 )
+IUSE=doc test python_targets_python3_6 python_targets_python3_7
+LICENSE=BSD
 PROPERTIES=live
 RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~sys-apps/pkgcore-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0585c250486e652804d8070c349f18f4
+_md5_=94c03818180f301b4992cf25594d7cb9
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.6.3 b/metadata/md5-cache/dev-util/pkgconf-1.6.3
index 3439847f06ac..c515e5e809bc 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.6.3
+++ b/metadata/md5-cache/dev-util/pkgconf-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=pkg-config compatible replacement with no dependencies other than AN
 EAPI=7
 HOMEPAGE=https://git.dereferenced.org/pkgconf/pkgconf/
 IUSE=+pkg-config test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86
 LICENSE=ISC
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://distfiles.dereferenced.org/pkgconf/pkgconf-1.6.3.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=4b501f763aa4b4808746c6b17e449c20
+_md5_=b624667d84e4461344a5b6108548d7e5
diff --git a/metadata/md5-cache/dev-util/pscan-20000721-r1 b/metadata/md5-cache/dev-util/pscan-20000721-r1
index d337251d9683..a6791b3a00f9 100644
--- a/metadata/md5-cache/dev-util/pscan-20000721-r1
+++ b/metadata/md5-cache/dev-util/pscan-20000721-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-devel/flex
+BDEPEND=sys-devel/flex
+DEFINED_PHASES=configure install
 DESCRIPTION=A limited problem scanner for C source files
-EAPI=0
+EAPI=7
 HOMEPAGE=http://www.striker.ottawa.on.ca/~aland/pscan/
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
-SRC_URI=http://www.striker.ottawa.on.ca/~aland/pscan/pscan.tar.gz
+SRC_URI=mirror://gentoo/pscan.tar.gz -> pscan-20000721.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b6b3190e6643e1a7cdaa30245a5a52b8
+_md5_=769048a56e2d56b4f3ff599bc4d62635
diff --git a/metadata/md5-cache/dev-util/radare2-3.8.0 b/metadata/md5-cache/dev-util/radare2-3.8.0
new file mode 100644
index 000000000000..e1845a85ead5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/radare2-3.8.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+DESCRIPTION=unix-like reverse engineering framework and commandline tools
+EAPI=7
+HOMEPAGE=http://www.radare.org
+IUSE=ssl libressl
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://github.com/radare/radare2/archive/3.8.0.tar.gz -> radare2-3.8.0.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=03da0005c00178b3a42dc03ca101b4fc
diff --git a/metadata/md5-cache/dev-util/rocminfo-2.7.0 b/metadata/md5-cache/dev-util/rocminfo-2.7.0
new file mode 100644
index 000000000000..ce28e2c92b26
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rocminfo-2.7.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/rocr-runtime
+DESCRIPTION=ROCm Application for Reporting System Info
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/rocminfo
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/rocr-runtime
+SLOT=0/2.7
+SRC_URI=https://github.com/RadeonOpenCompute/rocminfo/archive/roc-2.7.0.tar.gz -> rocminfo-2.7.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c48102d5004aea2b665080a07844709b
diff --git a/metadata/md5-cache/dev-util/sccache-0.2.10 b/metadata/md5-cache/dev-util/sccache-0.2.10
index 6e23bb0563bc..5e204f2f7b90 100644
--- a/metadata/md5-cache/dev-util/sccache-0.2.10
+++ b/metadata/md5-cache/dev-util/sccache-0.2.10
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dist-server? ( dev-libs/openssl:0= ) gcs? ( dev-libs/openssl:0= ) dist-server? ( sys-apps/bubblewrap )
 SLOT=0
 SRC_URI=https://github.com/mozilla/sccache/archive/0.2.10.tar.gz -> sccache-0.2.10.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.11.0/download -> error-chain-0.11.0.crate https://crates.io/api/v1/crates/error-chain/0.12.1/download -> error-chain-0.12.1.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/lazycell/1.2.0/download -> lazycell-1.2.0.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/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/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/number_prefix/0.2.8/download -> number_prefix-0.2.8.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/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/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.5/download -> ring-0.13.5.crate https://crates.io/api/v1/crates/rouille/2.2.0/download -> rouille-2.2.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.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/syslog/4.0.1/download -> syslog-4.0.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/utf8parse/0.1.1/download -> utf8parse-0.1.1.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/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/version-compare/0.0.8/download -> version-compare-0.0.8.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/which/2.0.0/download -> which-2.0.0.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/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	c6407d708bf89ddb5b8d8fc903fd08b0	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=feec9c3145d7ad81d4e2ae1ff9d554ad
diff --git a/metadata/md5-cache/dev-util/sccache-0.2.8-r2 b/metadata/md5-cache/dev-util/sccache-0.2.8-r2
index dc17de4cf24c..dc260727db27 100644
--- a/metadata/md5-cache/dev-util/sccache-0.2.8-r2
+++ b/metadata/md5-cache/dev-util/sccache-0.2.8-r2
@@ -10,5 +10,5 @@ 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	c6407d708bf89ddb5b8d8fc903fd08b0	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=0e175212cfed990a1bfd6d3c625efdfb
diff --git a/metadata/md5-cache/dev-util/sccache-0.2.9 b/metadata/md5-cache/dev-util/sccache-0.2.9
index 092486d07da6..034defaf0b39 100644
--- a/metadata/md5-cache/dev-util/sccache-0.2.9
+++ b/metadata/md5-cache/dev-util/sccache-0.2.9
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dist-server? ( dev-libs/openssl:0= ) gcs? ( dev-libs/openssl:0= ) dist-server? ( sys-apps/bubblewrap )
 SLOT=0
 SRC_URI=https://github.com/mozilla/sccache/archive/0.2.9.tar.gz -> sccache-0.2.9.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.11.0/download -> error-chain-0.11.0.crate https://crates.io/api/v1/crates/error-chain/0.12.1/download -> error-chain-0.12.1.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.3.0/download -> lru-disk-cache-0.3.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.5/download -> ring-0.13.5.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/syslog/4.0.1/download -> syslog-4.0.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/which/2.0.0/download -> which-2.0.0.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/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	c6407d708bf89ddb5b8d8fc903fd08b0	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=24d9db4a6347c635b21bb25d8bccccab
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.0.1 b/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.0.1
deleted file mode 100644
index becc332d0ea1..000000000000
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/llvm:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-python/lit ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Bi-directional translator between SPIR-V and LLVM IR
-EAPI=6
-HOMEPAGE=https://github.com/KhronosGroup/SPIRV-LLVM-Translator
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=UoI-NCSA
-RDEPEND=sys-devel/llvm:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=8
-SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v8.0.0-1.tar.gz -> spirv-llvm-translator-8.0.0.1.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4da46ee43895441f4f0509b330ccea50
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.0.1-r1 b/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.0.1-r1
deleted file mode 100644
index be64cc01b059..000000000000
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/llvm:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-python/lit ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Bi-directional translator between SPIR-V and LLVM IR
-EAPI=6
-HOMEPAGE=https://github.com/KhronosGroup/SPIRV-LLVM-Translator
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=UoI-NCSA
-RDEPEND=sys-devel/llvm:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=8
-SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v8.0.0-1.tar.gz -> spirv-llvm-translator-8.0.0.1.tar.gz https://dev.gentoo.org/~marecki/dists/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-LowerOpenCL_new_block_representation.patch.xz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=087c6652d29aeb873ddf6c3bcde17588
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.1.1 b/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.1.1
deleted file mode 100644
index 3618cb08291a..000000000000
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/llvm:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-python/lit )
-DESCRIPTION=Bi-directional translator between SPIR-V and LLVM IR
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/SPIRV-LLVM-Translator
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=UoI-NCSA
-RDEPEND=sys-devel/llvm:8=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=8
-SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v8.0.1-1.tar.gz -> spirv-llvm-translator-8.0.1.1.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f6dd12f6fe24ab10ba087322fb2bfc2
diff --git a/metadata/md5-cache/dev-util/sysdig-0.26.1 b/metadata/md5-cache/dev-util/sysdig-0.26.1
deleted file mode 100644
index 7faf2ff53068..000000000000
--- a/metadata/md5-cache/dev-util/sysdig-0.26.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/grpc:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= app-arch/xz-utils virtual/os-headers modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=A system exploration and troubleshooting tool
-EAPI=7
-HOMEPAGE=https://www.sysdig.org/
-IUSE=libressl +modules kernel_linux kernel_linux modules
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 modules? ( || ( MIT GPL-2 ) )
-RDEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/grpc:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= modules? ( kernel_linux? ( virtual/modutils ) )
-SLOT=0
-SRC_URI=https://github.com/draios/sysdig/archive/0.26.1.tar.gz -> sysdig-0.26.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a761e99975d928a371faeedf01acd280
diff --git a/metadata/md5-cache/dev-util/sysdig-0.26.2 b/metadata/md5-cache/dev-util/sysdig-0.26.2
deleted file mode 100644
index 76ce59f11313..000000000000
--- a/metadata/md5-cache/dev-util/sysdig-0.26.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/grpc:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= app-arch/xz-utils virtual/os-headers modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=A system exploration and troubleshooting tool
-EAPI=7
-HOMEPAGE=https://www.sysdig.org/
-IUSE=libressl +modules kernel_linux kernel_linux modules
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 modules? ( || ( MIT GPL-2 ) )
-RDEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/grpc:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= modules? ( kernel_linux? ( virtual/modutils ) )
-SLOT=0
-SRC_URI=https://github.com/draios/sysdig/archive/0.26.2.tar.gz -> sysdig-0.26.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0285c1ee6cb6f7ec6841065c8a58ca41
diff --git a/metadata/md5-cache/dev-util/sysdig-0.26.3 b/metadata/md5-cache/dev-util/sysdig-0.26.3
new file mode 100644
index 000000000000..8da29ca07280
--- /dev/null
+++ b/metadata/md5-cache/dev-util/sysdig-0.26.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/grpc:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= app-arch/xz-utils virtual/os-headers modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=A system exploration and troubleshooting tool
+EAPI=7
+HOMEPAGE=https://www.sysdig.org/
+IUSE=libressl +modules kernel_linux kernel_linux modules
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 modules? ( || ( MIT GPL-2 ) )
+RDEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/grpc:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= modules? ( kernel_linux? ( virtual/modutils ) )
+SLOT=0
+SRC_URI=https://github.com/draios/sysdig/archive/0.26.3.tar.gz -> sysdig-0.26.3.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0285c1ee6cb6f7ec6841065c8a58ca41
diff --git a/metadata/md5-cache/dev-util/sysdig-0.26.4 b/metadata/md5-cache/dev-util/sysdig-0.26.4
new file mode 100644
index 000000000000..6a35a229ed3c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/sysdig-0.26.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/grpc:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= app-arch/xz-utils virtual/os-headers modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=A system exploration and troubleshooting tool
+EAPI=7
+HOMEPAGE=https://www.sysdig.org/
+IUSE=libressl +modules kernel_linux kernel_linux modules
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 modules? ( || ( MIT GPL-2 ) )
+RDEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/grpc:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= modules? ( kernel_linux? ( virtual/modutils ) )
+SLOT=0
+SRC_URI=https://github.com/draios/sysdig/archive/0.26.4.tar.gz -> sysdig-0.26.4.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0285c1ee6cb6f7ec6841065c8a58ca41
diff --git a/metadata/md5-cache/dev-util/sysprof-3.30.2-r1 b/metadata/md5-cache/dev-util/sysprof-3.30.2-r1
index 73513075673d..b2c418d2f5bb 100644
--- a/metadata/md5-cache/dev-util/sysprof-3.30.2-r1
+++ b/metadata/md5-cache/dev-util/sysprof-3.30.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 sys-auth/polkit gtk? ( >=x11-libs/gtk+-3.22.0:3 )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/sysprof/3.30/sysprof-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd9cfa3b61e03fe2fa530bc02ebf12b4
diff --git a/metadata/md5-cache/dev-util/sysprof-3.32.0 b/metadata/md5-cache/dev-util/sysprof-3.32.0
index a7286e102121..6b2d46e61fdd 100644
--- a/metadata/md5-cache/dev-util/sysprof-3.32.0
+++ b/metadata/md5-cache/dev-util/sysprof-3.32.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 sys-auth/polkit gtk? ( >=x11-libs/gtk+-3.22.0:3 )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/sysprof/3.32/sysprof-3.32.0.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b046bcd2495ec0cd9452465fb6dbb49
diff --git a/metadata/md5-cache/dev-util/trace-cmd-2.8.3 b/metadata/md5-cache/dev-util/trace-cmd-2.8.3
index a1bf7493485f..13d720f6dc1d 100644
--- a/metadata/md5-cache/dev-util/trace-cmd-2.8.3
+++ b/metadata/md5-cache/dev-util/trace-cmd-2.8.3
@@ -4,11 +4,11 @@ DESCRIPTION=User-space front-end for Ftrace
 EAPI=7
 HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git
 IUSE=+audit doc python udis86 kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=audit? ( sys-process/audit ) python? ( 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(-)] ) udis86? ( dev-libs/udis86 )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0/2.8.3
 SRC_URI=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v2.8.3.tar.gz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a4779b9c6cbd6ebff834db1e63a8814c
+_md5_=bf0c0e08f868070b9b85deb75beb2695
diff --git a/metadata/md5-cache/dev-util/wxglade-0.8.2 b/metadata/md5-cache/dev-util/wxglade-0.8.2
index 21100380d618..90bb30392e6d 100644
--- a/metadata/md5-cache/dev-util/wxglade-0.8.2
+++ b/metadata/md5-cache/dev-util/wxglade-0.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/unzip
 DESCRIPTION=Glade-like GUI designer which can generate Python, Perl, C++ or XRC code
 EAPI=6
 HOMEPAGE=http://wxglade.sourceforge.net/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wxglade/wxGlade-0.8.2.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6ada5d30cc62bfed8acc4b6584be432
+_md5_=891d0e4dae0b6ea069fcd1b281a9683f
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index fe26d0ef23a6..db03f87572f1 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/git-2.23.0 b/metadata/md5-cache/dev-vcs/git-2.23.0
new file mode 100644
index 000000000000..4d8f371c6ce6
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.23.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) iconv? ( virtual/libiconv ) doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=6
+HOMEPAGE=https://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=mirror://kernel/software/scm/git/git-2.23.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.23.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.23.0.tar.xz )
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=35c409a2407e3aafae61410c342a1551
diff --git a/metadata/md5-cache/dev-vcs/git-2.23.0_rc2 b/metadata/md5-cache/dev-vcs/git-2.23.0_rc2
deleted file mode 100644
index b3f473234aff..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.23.0_rc2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) iconv? ( virtual/libiconv ) doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=https://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-LICENSE=GPL-2
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
-SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/testing/git-2.23.0.rc2.tar.xz mirror://kernel/software/scm/git/testing/git-manpages-2.23.0.rc2.tar.xz doc? ( mirror://kernel/software/scm/git/testing/git-htmldocs-2.23.0.rc2.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	23f47b2e1de7abf387105eddd1318738	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=35c409a2407e3aafae61410c342a1551
diff --git a/metadata/md5-cache/dev-vcs/gitg-3.26.0 b/metadata/md5-cache/dev-vcs/gitg-3.26.0
deleted file mode 100644
index 89c3b31c007b..000000000000
--- a/metadata/md5-cache/dev-vcs/gitg-3.26.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-crypt/libsecret dev-libs/libgee:0.8[introspection] >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= dev-libs/libgit2:=[threads] >=dev-libs/libgit2-glib-0.25.0[ssh] <dev-libs/libgit2-glib-0.27.0 >=dev-libs/libpeas-1.5.0[gtk] >=dev-libs/libxml2-2.9.0:2 net-libs/libsoup:2.4 >=gnome-base/gsettings-desktop-schemas-0.1.1 >=x11-libs/gtk+-3.20.0:3 >=x11-libs/gtksourceview-3.10:3.0 x11-themes/adwaita-icon-theme glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=dev-libs/libgit2-glib-0.24.4[vala] >=dev-util/intltool-0.40 gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=git repository viewer for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Gitg
-IUSE=glade +python python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=app-crypt/libsecret dev-libs/libgee:0.8[introspection] >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= dev-libs/libgit2:=[threads] >=dev-libs/libgit2-glib-0.25.0[ssh] <dev-libs/libgit2-glib-0.27.0 >=dev-libs/libpeas-1.5.0[gtk] >=dev-libs/libxml2-2.9.0:2 net-libs/libsoup:2.4 >=gnome-base/gsettings-desktop-schemas-0.1.1 >=x11-libs/gtk+-3.20.0:3 >=x11-libs/gtksourceview-3.10:3.0 x11-themes/adwaita-icon-theme glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gitg/3.26/gitg-3.26.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a7aeb209b03e86c5d3d5ea012bbd51f
diff --git a/metadata/md5-cache/dev-vcs/gitg-3.30.1 b/metadata/md5-cache/dev-vcs/gitg-3.30.1
deleted file mode 100644
index 385d78c44900..000000000000
--- a/metadata/md5-cache/dev-vcs/gitg-3.30.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-crypt/libsecret[vala] >=app-text/gtkspell-3.0.3:3[vala] >=dev-libs/glib-2.38:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= dev-libs/libgee:0.8[introspection] dev-libs/libgit2:=[threads] >=dev-libs/libgit2-glib-0.26.4[ssh] <dev-libs/libgit2-glib-0.27.0 >=dev-libs/libpeas-1.5.0[gtk] >=dev-libs/libxml2-2.9.0:2 >=gnome-base/gsettings-desktop-schemas-0.1.1 net-libs/libsoup:2.4 >=x11-libs/gtk+-3.20.0:3 >=x11-libs/gtksourceview-3.10:3.0 x11-themes/adwaita-icon-theme glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=dev-libs/libgit2-glib-0.24.4[vala] >=dev-util/intltool-0.40 >=sys-devel/gettext-0.19.7 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=git repository viewer for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Gitg
-IUSE=glade +python python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=app-crypt/libsecret[vala] >=app-text/gtkspell-3.0.3:3[vala] >=dev-libs/glib-2.38:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= dev-libs/libgee:0.8[introspection] dev-libs/libgit2:=[threads] >=dev-libs/libgit2-glib-0.26.4[ssh] <dev-libs/libgit2-glib-0.27.0 >=dev-libs/libpeas-1.5.0[gtk] >=dev-libs/libxml2-2.9.0:2 >=gnome-base/gsettings-desktop-schemas-0.1.1 net-libs/libsoup:2.4 >=x11-libs/gtk+-3.20.0:3 >=x11-libs/gtksourceview-3.10:3.0 x11-themes/adwaita-icon-theme glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gitg/3.30/gitg-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe59a2f9556c0842a292426769eb1da1
diff --git a/metadata/md5-cache/dev-vcs/gitg-3.32.1 b/metadata/md5-cache/dev-vcs/gitg-3.32.1
index 7d92a8039333..7781d3963e79 100644
--- a/metadata/md5-cache/dev-vcs/gitg-3.32.1
+++ b/metadata/md5-cache/dev-vcs/gitg-3.32.1
@@ -1,15 +1,15 @@
 BDEPEND=app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-crypt/libsecret[vala] >=app-text/gtkspell-3.0.3:3[vala] >=dev-libs/glib-2.38:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= dev-libs/libdazzle[vala] dev-libs/libgee:0.8[introspection] dev-libs/libgit2:=[threads] >=dev-libs/libgit2-glib-0.27[ssh] <dev-libs/libgit2-glib-0.29 >=dev-libs/libpeas-1.5.0[gtk] >=dev-libs/libxml2-2.9.0:2 >=gnome-base/gsettings-desktop-schemas-0.1.1 net-libs/libsoup:2.4 >=x11-libs/gtk+-3.20.0:3 >=x11-libs/gtksourceview-3.10:3.0 x11-themes/adwaita-icon-theme glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=dev-libs/libgit2-glib-0.24.4[vala] >=sys-devel/gettext-0.19.7 virtual/pkgconfig
+DEPEND=app-crypt/libsecret[vala] >=app-text/gtkspell-3.0.3:3[vala] >=dev-libs/glib-2.38:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= dev-libs/libdazzle[vala] dev-libs/libgee:0.8[introspection] dev-libs/libgit2:=[threads] >=dev-libs/libgit2-glib-0.27[ssh] <dev-libs/libgit2-glib-0.29 >=dev-libs/libpeas-1.5.0[gtk] >=dev-libs/libxml2-2.9.0:2 >=gnome-base/gsettings-desktop-schemas-0.1.1 net-libs/libsoup:2.4 >=x11-libs/gtk+-3.20.0:3 >=x11-libs/gtksourceview-3.10:3.0 x11-themes/adwaita-icon-theme glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 ) >=dev-libs/libgit2-glib-0.24.4[vala] >=sys-devel/gettext-0.19.7 virtual/pkgconfig
 DESCRIPTION=git repository viewer for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Gitg
 IUSE=glade +python python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=app-crypt/libsecret[vala] >=app-text/gtkspell-3.0.3:3[vala] >=dev-libs/glib-2.38:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= dev-libs/libdazzle[vala] dev-libs/libgee:0.8[introspection] dev-libs/libgit2:=[threads] >=dev-libs/libgit2-glib-0.27[ssh] <dev-libs/libgit2-glib-0.29 >=dev-libs/libpeas-1.5.0[gtk] >=dev-libs/libxml2-2.9.0:2 >=gnome-base/gsettings-desktop-schemas-0.1.1 net-libs/libsoup:2.4 >=x11-libs/gtk+-3.20.0:3 >=x11-libs/gtksourceview-3.10:3.0 x11-themes/adwaita-icon-theme glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gitg/3.32/gitg-3.32.1.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=975084f3f5c7cba6d943d503e8818f27
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=139445e65bfad7a5f9628cf11148d81a
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 3a3ebb790fb5..a26fe8bffd9d 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/shovel-knight-3.3 b/metadata/md5-cache/games-arcade/shovel-knight-3.3
new file mode 100644
index 000000000000..244ea08b5aee
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/shovel-knight-3.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch postinst postrm unpack
+DESCRIPTION=Sweeping classic action adventure with an 8-bit retro aesthetic
+EAPI=7
+HOMEPAGE=https://yachtclubgames.com/shovel-knight/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Yacht-Club-Games-EULA
+RDEPEND=media-libs/glew:1.10 media-libs/libsdl2[opengl,sound,video] virtual/opengl
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=shovel_knight_treasure_trove_en_3_3_15418.sh
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=19178f1f7f459eaf31f2aed1068c25a8
diff --git a/metadata/md5-cache/games-arcade/xbill-2.1-r2 b/metadata/md5-cache/games-arcade/xbill-2.1-r2
deleted file mode 100644
index 6ba9d9a40756..000000000000
--- a/metadata/md5-cache/games-arcade/xbill-2.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw ) 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 game about an evil hacker called Bill!
-EAPI=5
-HOMEPAGE=http://www.xbill.org/
-IUSE=gtk
-KEYWORDS=~alpha ~amd64 ~x86
-LICENSE=GPL-1
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw ) games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.xbill.org/download/xbill-2.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e370a36a16f805688fd6d70e3208bd0
diff --git a/metadata/md5-cache/games-arcade/xbill-2.1-r3 b/metadata/md5-cache/games-arcade/xbill-2.1-r3
new file mode 100644
index 000000000000..3e1a47d559d3
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/xbill-2.1-r3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=acct-group/gamestat media-fonts/font-misc-misc gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw )
+DESCRIPTION=A game about an evil hacker called Bill!
+EAPI=7
+HOMEPAGE=http://www.xbill.org/
+IUSE=gtk
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-1
+RDEPEND=acct-group/gamestat media-fonts/font-misc-misc gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw )
+SLOT=0
+SRC_URI=http://www.xbill.org/download/xbill-2.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=3098eae60ca9fdb1efa716f80cd3388e
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 35a8979c8dae..63ad7ecd3aa3 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/gnome-chess-3.30.1 b/metadata/md5-cache/games-board/gnome-chess-3.30.1
index 1903f0e2c15d..aa1225e7eca9 100644
--- a/metadata/md5-cache/games-board/gnome-chess-3.30.1
+++ b/metadata/md5-cache/games-board/gnome-chess-3.30.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20.0:3 >=gnome-base/librsvg-2.32.0:2[vala]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-chess/3.30/gnome-chess-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=294f25b4745442533e5153a90ea782b4
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.30.1.1 b/metadata/md5-cache/games-board/gnome-mines-3.30.1.1
index c4b93797b8a1..69f97271c0ae 100644
--- a/metadata/md5-cache/games-board/gnome-mines-3.30.1.1
+++ b/metadata/md5-cache/games-board/gnome-mines-3.30.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8 >=x11-libs/gtk+-3.12:3 dev-libs/libgnome-games-support:1= >=gnome-base/librsvg-2.32.0:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mines/3.30/gnome-mines-3.30.1.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5ef78f702002adf408f4748971043874
diff --git a/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213 b/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213
index e11117279999..52ee74af5b9f 100644
--- a/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213
+++ b/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213
@@ -8,5 +8,5 @@ RDEPEND=~games-board/tablebase-syzygy-0_pre20131213:0
 RESTRICT=fetch
 SLOT=nofetch
 SRC_URI=KQQvKQQ.rtbw KQQvKQQ.rtbz KQQvKQR.rtbw KQQvKQR.rtbz KQQvKQB.rtbw KQQvKQB.rtbz KQQvKQN.rtbw KQQvKQN.rtbz KQQvKQP.rtbw KQQvKQP.rtbz KQQQvKQ.rtbw KQQQvKQ.rtbz KQQQQvK.rtbw KQQQQvK.rtbz KQQQvKR.rtbw KQQQvKR.rtbz KQQQRvK.rtbw KQQQRvK.rtbz KQQQvKB.rtbw KQQQvKB.rtbz KQQQBvK.rtbw KQQQBvK.rtbz KQQQvKN.rtbw KQQQvKN.rtbz KQQQNvK.rtbw KQQQNvK.rtbz KQQQvKP.rtbw KQQQvKP.rtbz KQQQPvK.rtbw KQQQPvK.rtbz KQQvKRR.rtbw KQQvKRR.rtbz KQQvKRB.rtbw KQQvKRB.rtbz KQQvKRN.rtbw KQQvKRN.rtbz KQQvKRP.rtbw KQQvKRP.rtbz KQQRvKQ.rtbw KQQRvKQ.rtbz KQQRvKR.rtbw KQQRvKR.rtbz KQQRRvK.rtbw KQQRRvK.rtbz KQQRvKB.rtbw KQQRvKB.rtbz KQQRBvK.rtbw KQQRBvK.rtbz KQQRvKN.rtbw KQQRvKN.rtbz KQQRNvK.rtbw KQQRNvK.rtbz KQQRvKP.rtbw KQQRvKP.rtbz KQQRPvK.rtbw KQQRPvK.rtbz KQQvKBB.rtbw KQQvKBB.rtbz KQQvKBN.rtbw KQQvKBN.rtbz KQQvKBP.rtbw KQQvKBP.rtbz KQQBvKQ.rtbw KQQBvKQ.rtbz KQQBvKR.rtbw KQQBvKR.rtbz KQQBvKB.rtbw KQQBvKB.rtbz KQQBBvK.rtbw KQQBBvK.rtbz KQQBvKN.rtbw KQQBvKN.rtbz KQQBNvK.rtbw KQQBNvK.rtbz KQQBvKP.rtbw KQQBvKP.rtbz KQQBPvK.rtbw KQQBPvK.rtbz KQQvKNN.rtbw KQQvKNN.rtbz KQQvKNP.rtbw KQQvKNP.rtbz KQQNvKQ.rtbw KQQNvKQ.rtbz KQQNvKR.rtbw KQQNvKR.rtbz KQQNvKB.rtbw KQQNvKB.rtbz KQQNvKN.rtbw KQQNvKN.rtbz KQQNNvK.rtbw KQQNNvK.rtbz KQQNvKP.rtbw KQQNvKP.rtbz KQQNPvK.rtbw KQQNPvK.rtbz KQQvKPP.rtbw KQQvKPP.rtbz KQQPvKQ.rtbw KQQPvKQ.rtbz KQQPvKR.rtbw KQQPvKR.rtbz KQQPvKB.rtbw KQQPvKB.rtbz KQQPvKN.rtbw KQQPvKN.rtbz KQQPvKP.rtbw KQQPvKP.rtbz KQQPPvK.rtbw KQQPPvK.rtbz KQRvKQR.rtbw KQRvKQR.rtbz KQRvKQB.rtbw KQRvKQB.rtbz KQRvKQN.rtbw KQRvKQN.rtbz KQRvKQP.rtbw KQRvKQP.rtbz KQRvKRR.rtbw KQRvKRR.rtbz KQRvKRB.rtbw KQRvKRB.rtbz KQRvKRN.rtbw KQRvKRN.rtbz KQRvKRP.rtbw KQRvKRP.rtbz KQRRvKQ.rtbw KQRRvKQ.rtbz KQRRvKR.rtbw KQRRvKR.rtbz KQRRRvK.rtbw KQRRRvK.rtbz KQRRvKB.rtbw KQRRvKB.rtbz KQRRBvK.rtbw KQRRBvK.rtbz KQRRvKN.rtbw KQRRvKN.rtbz KQRRNvK.rtbw KQRRNvK.rtbz KQRRvKP.rtbw KQRRvKP.rtbz KQRRPvK.rtbw KQRRPvK.rtbz KQRvKBB.rtbw KQRvKBB.rtbz KQRvKBN.rtbw KQRvKBN.rtbz KQRvKBP.rtbw KQRvKBP.rtbz KQRBvKQ.rtbw KQRBvKQ.rtbz KQRBvKR.rtbw KQRBvKR.rtbz KQRBvKB.rtbw KQRBvKB.rtbz KQRBBvK.rtbw KQRBBvK.rtbz KQRBvKN.rtbw KQRBvKN.rtbz KQRBNvK.rtbw KQRBNvK.rtbz KQRBvKP.rtbw KQRBvKP.rtbz KQRBPvK.rtbw KQRBPvK.rtbz KQRvKNN.rtbw KQRvKNN.rtbz KQRvKNP.rtbw KQRvKNP.rtbz KQRNvKQ.rtbw KQRNvKQ.rtbz KQRNvKR.rtbw KQRNvKR.rtbz KQRNvKB.rtbw KQRNvKB.rtbz KQRNvKN.rtbw KQRNvKN.rtbz KQRNNvK.rtbw KQRNNvK.rtbz KQRNvKP.rtbw KQRNvKP.rtbz KQRNPvK.rtbw KQRNPvK.rtbz KQRvKPP.rtbw KQRvKPP.rtbz KQRPvKQ.rtbw KQRPvKQ.rtbz KQRPvKR.rtbw KQRPvKR.rtbz KQRPvKB.rtbw KQRPvKB.rtbz KQRPvKN.rtbw KQRPvKN.rtbz KQRPvKP.rtbw KQRPvKP.rtbz KQRPPvK.rtbw KQRPPvK.rtbz KQBvKQB.rtbw KQBvKQB.rtbz KQBvKQN.rtbw KQBvKQN.rtbz KQBvKQP.rtbw KQBvKQP.rtbz KQBvKRR.rtbw KQBvKRR.rtbz KQBvKRB.rtbw KQBvKRB.rtbz KQBvKRN.rtbw KQBvKRN.rtbz KQBvKRP.rtbw KQBvKRP.rtbz KQBvKBB.rtbw KQBvKBB.rtbz KQBvKBN.rtbw KQBvKBN.rtbz KQBvKBP.rtbw KQBvKBP.rtbz KQBBvKQ.rtbw KQBBvKQ.rtbz KQBBvKR.rtbw KQBBvKR.rtbz KQBBvKB.rtbw KQBBvKB.rtbz KQBBBvK.rtbw KQBBBvK.rtbz KQBBvKN.rtbw KQBBvKN.rtbz KQBBNvK.rtbw KQBBNvK.rtbz KQBBvKP.rtbw KQBBvKP.rtbz KQBBPvK.rtbw KQBBPvK.rtbz KQBvKNN.rtbw KQBvKNN.rtbz KQBvKNP.rtbw KQBvKNP.rtbz KQBNvKQ.rtbw KQBNvKQ.rtbz KQBNvKR.rtbw KQBNvKR.rtbz KQBNvKB.rtbw KQBNvKB.rtbz KQBNvKN.rtbw KQBNvKN.rtbz KQBNNvK.rtbw KQBNNvK.rtbz KQBNvKP.rtbw KQBNvKP.rtbz KQBNPvK.rtbw KQBNPvK.rtbz KQBvKPP.rtbw KQBvKPP.rtbz KQBPvKQ.rtbw KQBPvKQ.rtbz KQBPvKR.rtbw KQBPvKR.rtbz KQBPvKB.rtbw KQBPvKB.rtbz KQBPvKN.rtbw KQBPvKN.rtbz KQBPvKP.rtbw KQBPvKP.rtbz KQBPPvK.rtbw KQBPPvK.rtbz KQNvKQN.rtbw KQNvKQN.rtbz KQNvKQP.rtbw KQNvKQP.rtbz KQNvKRR.rtbw KQNvKRR.rtbz KQNvKRB.rtbw KQNvKRB.rtbz KQNvKRN.rtbw KQNvKRN.rtbz KQNvKRP.rtbw KQNvKRP.rtbz KQNvKBB.rtbw KQNvKBB.rtbz KQNvKBN.rtbw KQNvKBN.rtbz KQNvKBP.rtbw KQNvKBP.rtbz KQNvKNN.rtbw KQNvKNN.rtbz KQNvKNP.rtbw KQNvKNP.rtbz KQNNvKQ.rtbw KQNNvKQ.rtbz KQNNvKR.rtbw KQNNvKR.rtbz KQNNvKB.rtbw KQNNvKB.rtbz KQNNvKN.rtbw KQNNvKN.rtbz KQNNNvK.rtbw KQNNNvK.rtbz KQNNvKP.rtbw KQNNvKP.rtbz KQNNPvK.rtbw KQNNPvK.rtbz KQNvKPP.rtbw KQNvKPP.rtbz KQNPvKQ.rtbw KQNPvKQ.rtbz KQNPvKR.rtbw KQNPvKR.rtbz KQNPvKB.rtbw KQNPvKB.rtbz KQNPvKN.rtbw KQNPvKN.rtbz KQNPvKP.rtbw KQNPvKP.rtbz KQNPPvK.rtbw KQNPPvK.rtbz KQPvKQP.rtbw KQPvKQP.rtbz KQPvKRR.rtbw KQPvKRR.rtbz KQPvKRB.rtbw KQPvKRB.rtbz KQPvKRN.rtbw KQPvKRN.rtbz KQPvKRP.rtbw KQPvKRP.rtbz KQPvKBB.rtbw KQPvKBB.rtbz KQPvKBN.rtbw KQPvKBN.rtbz KQPvKBP.rtbw KQPvKBP.rtbz KQPvKNN.rtbw KQPvKNN.rtbz KQPvKNP.rtbw KQPvKNP.rtbz KQPvKPP.rtbw KQPvKPP.rtbz KQPPvKQ.rtbw KQPPvKQ.rtbz KQPPvKR.rtbw KQPPvKR.rtbz KQPPvKB.rtbw KQPPvKB.rtbz KQPPvKN.rtbw KQPPvKN.rtbz KQPPvKP.rtbw KQPPvKP.rtbz KQPPPvK.rtbw KQPPPvK.rtbz KRRvKRR.rtbw KRRvKRR.rtbz KRRvKRB.rtbw KRRvKRB.rtbz KRRvKRN.rtbw KRRvKRN.rtbz KRRvKRP.rtbw KRRvKRP.rtbz KRRRvKQ.rtbw KRRRvKQ.rtbz KRRRvKR.rtbw KRRRvKR.rtbz KRRRRvK.rtbw KRRRRvK.rtbz KRRRvKB.rtbw KRRRvKB.rtbz KRRRBvK.rtbw KRRRBvK.rtbz KRRRvKN.rtbw KRRRvKN.rtbz KRRRNvK.rtbw KRRRNvK.rtbz KRRRvKP.rtbw KRRRvKP.rtbz KRRRPvK.rtbw KRRRPvK.rtbz KRRvKBB.rtbw KRRvKBB.rtbz KRRvKBN.rtbw KRRvKBN.rtbz KRRvKBP.rtbw KRRvKBP.rtbz KRRBvKQ.rtbw KRRBvKQ.rtbz KRRBvKR.rtbw KRRBvKR.rtbz KRRBvKB.rtbw KRRBvKB.rtbz KRRBBvK.rtbw KRRBBvK.rtbz KRRBvKN.rtbw KRRBvKN.rtbz KRRBNvK.rtbw KRRBNvK.rtbz KRRBvKP.rtbw KRRBvKP.rtbz KRRBPvK.rtbw KRRBPvK.rtbz KRRvKNN.rtbw KRRvKNN.rtbz KRRvKNP.rtbw KRRvKNP.rtbz KRRNvKQ.rtbw KRRNvKQ.rtbz KRRNvKR.rtbw KRRNvKR.rtbz KRRNvKB.rtbw KRRNvKB.rtbz KRRNvKN.rtbw KRRNvKN.rtbz KRRNNvK.rtbw KRRNNvK.rtbz KRRNvKP.rtbw KRRNvKP.rtbz KRRNPvK.rtbw KRRNPvK.rtbz KRRvKPP.rtbw KRRvKPP.rtbz KRRPvKQ.rtbw KRRPvKQ.rtbz KRRPvKR.rtbw KRRPvKR.rtbz KRRPvKB.rtbw KRRPvKB.rtbz KRRPvKN.rtbw KRRPvKN.rtbz KRRPvKP.rtbw KRRPvKP.rtbz KRRPPvK.rtbw KRRPPvK.rtbz KRBvKRB.rtbw KRBvKRB.rtbz KRBvKRN.rtbw KRBvKRN.rtbz KRBvKRP.rtbw KRBvKRP.rtbz KRBvKBB.rtbw KRBvKBB.rtbz KRBvKBN.rtbw KRBvKBN.rtbz KRBvKBP.rtbw KRBvKBP.rtbz KRBBvKQ.rtbw KRBBvKQ.rtbz KRBBvKR.rtbw KRBBvKR.rtbz KRBBvKB.rtbw KRBBvKB.rtbz KRBBBvK.rtbw KRBBBvK.rtbz KRBBvKN.rtbw KRBBvKN.rtbz KRBBNvK.rtbw KRBBNvK.rtbz KRBBvKP.rtbw KRBBvKP.rtbz KRBBPvK.rtbw KRBBPvK.rtbz KRBvKNN.rtbw KRBvKNN.rtbz KRBvKNP.rtbw KRBvKNP.rtbz KRBNvKQ.rtbw KRBNvKQ.rtbz KRBNvKR.rtbw KRBNvKR.rtbz KRBNvKB.rtbw KRBNvKB.rtbz KRBNvKN.rtbw KRBNvKN.rtbz KRBNNvK.rtbw KRBNNvK.rtbz KRBNvKP.rtbw KRBNvKP.rtbz KRBNPvK.rtbw KRBNPvK.rtbz KRBvKPP.rtbw KRBvKPP.rtbz KRBPvKQ.rtbw KRBPvKQ.rtbz KRBPvKR.rtbw KRBPvKR.rtbz KRBPvKB.rtbw KRBPvKB.rtbz KRBPvKN.rtbw KRBPvKN.rtbz KRBPvKP.rtbw KRBPvKP.rtbz KRBPPvK.rtbw KRBPPvK.rtbz KRNvKRN.rtbw KRNvKRN.rtbz KRNvKRP.rtbw KRNvKRP.rtbz KRNvKBB.rtbw KRNvKBB.rtbz KRNvKBN.rtbw KRNvKBN.rtbz KRNvKBP.rtbw KRNvKBP.rtbz KRNvKNN.rtbw KRNvKNN.rtbz KRNvKNP.rtbw KRNvKNP.rtbz KRNNvKQ.rtbw KRNNvKQ.rtbz KRNNvKR.rtbw KRNNvKR.rtbz KRNNvKB.rtbw KRNNvKB.rtbz KRNNvKN.rtbw KRNNvKN.rtbz KRNNNvK.rtbw KRNNNvK.rtbz KRNNvKP.rtbw KRNNvKP.rtbz KRNNPvK.rtbw KRNNPvK.rtbz KRNvKPP.rtbw KRNvKPP.rtbz KRNPvKQ.rtbw KRNPvKQ.rtbz KRNPvKR.rtbw KRNPvKR.rtbz KRNPvKB.rtbw KRNPvKB.rtbz KRNPvKN.rtbw KRNPvKN.rtbz KRNPvKP.rtbw KRNPvKP.rtbz KRNPPvK.rtbw KRNPPvK.rtbz KRPvKRP.rtbw KRPvKRP.rtbz KRPvKBB.rtbw KRPvKBB.rtbz KRPvKBN.rtbw KRPvKBN.rtbz KRPvKBP.rtbw KRPvKBP.rtbz KRPvKNN.rtbw KRPvKNN.rtbz KRPvKNP.rtbw KRPvKNP.rtbz KRPvKPP.rtbw KRPvKPP.rtbz KRPPvKQ.rtbw KRPPvKQ.rtbz KRPPvKR.rtbw KRPPvKR.rtbz KRPPvKB.rtbw KRPPvKB.rtbz KRPPvKN.rtbw KRPPvKN.rtbz KRPPvKP.rtbw KRPPvKP.rtbz KRPPPvK.rtbw KRPPPvK.rtbz KBBvKBB.rtbw KBBvKBB.rtbz KBBvKBN.rtbw KBBvKBN.rtbz KBBvKBP.rtbw KBBvKBP.rtbz KBBBvKQ.rtbw KBBBvKQ.rtbz KBBBvKR.rtbw KBBBvKR.rtbz KBBBvKB.rtbw KBBBvKB.rtbz KBBBBvK.rtbw KBBBBvK.rtbz KBBBvKN.rtbw KBBBvKN.rtbz KBBBNvK.rtbw KBBBNvK.rtbz KBBBvKP.rtbw KBBBvKP.rtbz KBBBPvK.rtbw KBBBPvK.rtbz KBBvKNN.rtbw KBBvKNN.rtbz KBBvKNP.rtbw KBBvKNP.rtbz KBBNvKQ.rtbw KBBNvKQ.rtbz KBBNvKR.rtbw KBBNvKR.rtbz KBBNvKB.rtbw KBBNvKB.rtbz KBBNvKN.rtbw KBBNvKN.rtbz KBBNNvK.rtbw KBBNNvK.rtbz KBBNvKP.rtbw KBBNvKP.rtbz KBBNPvK.rtbw KBBNPvK.rtbz KBBvKPP.rtbw KBBvKPP.rtbz KBBPvKQ.rtbw KBBPvKQ.rtbz KBBPvKR.rtbw KBBPvKR.rtbz KBBPvKB.rtbw KBBPvKB.rtbz KBBPvKN.rtbw KBBPvKN.rtbz KBBPvKP.rtbw KBBPvKP.rtbz KBBPPvK.rtbw KBBPPvK.rtbz KBNvKBN.rtbw KBNvKBN.rtbz KBNvKBP.rtbw KBNvKBP.rtbz KBNvKNN.rtbw KBNvKNN.rtbz KBNvKNP.rtbw KBNvKNP.rtbz KBNNvKQ.rtbw KBNNvKQ.rtbz KBNNvKR.rtbw KBNNvKR.rtbz KBNNvKB.rtbw KBNNvKB.rtbz KBNNvKN.rtbw KBNNvKN.rtbz KBNNNvK.rtbw KBNNNvK.rtbz KBNNvKP.rtbw KBNNvKP.rtbz KBNNPvK.rtbw KBNNPvK.rtbz KBNvKPP.rtbw KBNvKPP.rtbz KBNPvKQ.rtbw KBNPvKQ.rtbz KBNPvKR.rtbw KBNPvKR.rtbz KBNPvKB.rtbw KBNPvKB.rtbz KBNPvKN.rtbw KBNPvKN.rtbz KBNPvKP.rtbw KBNPvKP.rtbz KBNPPvK.rtbw KBNPPvK.rtbz KBPvKBP.rtbw KBPvKBP.rtbz KBPvKNN.rtbw KBPvKNN.rtbz KBPvKNP.rtbw KBPvKNP.rtbz KBPvKPP.rtbw KBPvKPP.rtbz KBPPvKQ.rtbw KBPPvKQ.rtbz KBPPvKR.rtbw KBPPvKR.rtbz KBPPvKB.rtbw KBPPvKB.rtbz KBPPvKN.rtbw KBPPvKN.rtbz KBPPvKP.rtbw KBPPvKP.rtbz KBPPPvK.rtbw KBPPPvK.rtbz KNNvKNN.rtbw KNNvKNN.rtbz KNNvKNP.rtbw KNNvKNP.rtbz KNNNvKQ.rtbw KNNNvKQ.rtbz KNNNvKR.rtbw KNNNvKR.rtbz KNNNvKB.rtbw KNNNvKB.rtbz KNNNvKN.rtbw KNNNvKN.rtbz KNNNNvK.rtbw KNNNNvK.rtbz KNNNvKP.rtbw KNNNvKP.rtbz KNNNPvK.rtbw KNNNPvK.rtbz KNNvKPP.rtbw KNNvKPP.rtbz KNNPvKQ.rtbw KNNPvKQ.rtbz KNNPvKR.rtbw KNNPvKR.rtbz KNNPvKB.rtbw KNNPvKB.rtbz KNNPvKN.rtbw KNNPvKN.rtbz KNNPvKP.rtbw KNNPvKP.rtbz KNNPPvK.rtbw KNNPPvK.rtbz KNPvKNP.rtbw KNPvKNP.rtbz KNPvKPP.rtbw KNPvKPP.rtbz KNPPvKQ.rtbw KNPPvKQ.rtbz KNPPvKR.rtbw KNPPvKR.rtbz KNPPvKB.rtbw KNPPvKB.rtbz KNPPvKN.rtbw KNPPvKN.rtbz KNPPvKP.rtbw KNPPvKP.rtbz KNPPPvK.rtbw KNPPPvK.rtbz KPPvKPP.rtbw KPPvKPP.rtbz KPPPvKQ.rtbw KPPPvKQ.rtbz KPPPvKR.rtbw KPPPvKR.rtbz KPPPvKB.rtbw KPPPvKB.rtbz KPPPvKN.rtbw KPPPvKN.rtbz KPPPvKP.rtbw KPPPvKP.rtbz KPPPPvK.rtbw KPPPPvK.rtbz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73
 _md5_=0b92a824b8aefacae279bc884a4a78a7
diff --git a/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213-r100 b/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213-r100
index 8b69da76eef6..1c04674cc20c 100644
--- a/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213-r100
+++ b/metadata/md5-cache/games-board/tablebase-syzygy-0_pre20131213-r100
@@ -8,5 +8,5 @@ LICENSE=public-domain
 PDEPEND=6-pieces? ( ~games-board/tablebase-syzygy-0_pre20131213:nofetch )
 SLOT=0
 SRC_URI=http://tablebase.sesse.net/syzygy/3-4-5/KQvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQQvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQQvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPPvK.rtbz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73
 _md5_=4d10bb561c24b44c8e3262e2bc926978
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 24f1fae4254d..5bed21d18c7d 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/libretro-bnes-0.0.1_pre20180723 b/metadata/md5-cache/games-emulation/libretro-bnes-0.0.1_pre20180723
index 195dfc885b06..27e6ed65a6a8 100644
--- a/metadata/md5-cache/games-emulation/libretro-bnes-0.0.1_pre20180723
+++ b/metadata/md5-cache/games-emulation/libretro-bnes-0.0.1_pre20180723
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://github.com/libretro/bnes-libretro/archive/18384086d58fd09de3844e2c5f3b2a77b5d490dc.tar.gz -> libretro-bnes-0.0.1_pre20180723.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libretro-core	a24db3f198650e3d23b1fb9d8114df40	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libretro-core	209b59a3aaa7b79139fcd2abae7414a8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=33ea712d8c0b638a6c2dbecc837c117e
diff --git a/metadata/md5-cache/games-emulation/libretro-bnes-9999 b/metadata/md5-cache/games-emulation/libretro-bnes-9999
index 0a8ffd07050c..dad235abf239 100644
--- a/metadata/md5-cache/games-emulation/libretro-bnes-9999
+++ b/metadata/md5-cache/games-emulation/libretro-bnes-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3+
 PROPERTIES=live
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libretro-core	a24db3f198650e3d23b1fb9d8114df40	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libretro-core	209b59a3aaa7b79139fcd2abae7414a8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=aaa4e5e8928d82ced7f00039d36ac02a
diff --git a/metadata/md5-cache/games-emulation/libretro-dosbox-0.0.1_pre20180723 b/metadata/md5-cache/games-emulation/libretro-dosbox-0.0.1_pre20180723
index 31d754a9153f..1305e97a2c85 100644
--- a/metadata/md5-cache/games-emulation/libretro-dosbox-0.0.1_pre20180723
+++ b/metadata/md5-cache/games-emulation/libretro-dosbox-0.0.1_pre20180723
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/libretro/dosbox-libretro/archive/169d476437ec813b462a47254f24cf78473389c8.tar.gz -> libretro-dosbox-0.0.1_pre20180723.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libretro-core	a24db3f198650e3d23b1fb9d8114df40	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libretro-core	209b59a3aaa7b79139fcd2abae7414a8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=5009563011d38309802b815352409ca1
diff --git a/metadata/md5-cache/games-emulation/libretro-dosbox-9999 b/metadata/md5-cache/games-emulation/libretro-dosbox-9999
index 824181ac39f9..aa6c34ade12f 100644
--- a/metadata/md5-cache/games-emulation/libretro-dosbox-9999
+++ b/metadata/md5-cache/games-emulation/libretro-dosbox-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2+
 PROPERTIES=live
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libretro-core	a24db3f198650e3d23b1fb9d8114df40	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libretro-core	209b59a3aaa7b79139fcd2abae7414a8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=75286d1fb2db775e8d526a13582bf933
diff --git a/metadata/md5-cache/games-emulation/libretro-fceumm-0.0.1_pre20180723 b/metadata/md5-cache/games-emulation/libretro-fceumm-0.0.1_pre20180723
index e387dcac6418..3572764df0ad 100644
--- a/metadata/md5-cache/games-emulation/libretro-fceumm-0.0.1_pre20180723
+++ b/metadata/md5-cache/games-emulation/libretro-fceumm-0.0.1_pre20180723
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/libretro/libretro-fceumm/archive/67c072617b700560acbfea54f2779cb290dbf827.tar.gz -> libretro-fceumm-0.0.1_pre20180723.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libretro-core	a24db3f198650e3d23b1fb9d8114df40	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libretro-core	209b59a3aaa7b79139fcd2abae7414a8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=667a9b4787f67b3656ffb8b617de493c
diff --git a/metadata/md5-cache/games-emulation/libretro-fceumm-9999 b/metadata/md5-cache/games-emulation/libretro-fceumm-9999
index 0005daa2b9b2..b813bdd663de 100644
--- a/metadata/md5-cache/games-emulation/libretro-fceumm-9999
+++ b/metadata/md5-cache/games-emulation/libretro-fceumm-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2+
 PROPERTIES=live
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libretro-core	a24db3f198650e3d23b1fb9d8114df40	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libretro-core	209b59a3aaa7b79139fcd2abae7414a8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=ffc8e5e57460a2faf7fe37cb34de1fbc
diff --git a/metadata/md5-cache/games-emulation/libretro-nestopia-0.0.1_pre20180723 b/metadata/md5-cache/games-emulation/libretro-nestopia-0.0.1_pre20180723
index d8e366a564da..c3db0480aa6e 100644
--- a/metadata/md5-cache/games-emulation/libretro-nestopia-0.0.1_pre20180723
+++ b/metadata/md5-cache/games-emulation/libretro-nestopia-0.0.1_pre20180723
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/libretro/nestopia/archive/9c335527c5dfa11dfa29bc22ee4ba6efa23c8890.tar.gz -> libretro-nestopia-0.0.1_pre20180723.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libretro-core	a24db3f198650e3d23b1fb9d8114df40	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libretro-core	209b59a3aaa7b79139fcd2abae7414a8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=659d7dbc03d372028607845cbc413fd2
diff --git a/metadata/md5-cache/games-emulation/libretro-nestopia-9999 b/metadata/md5-cache/games-emulation/libretro-nestopia-9999
index 02693be15590..782acab27971 100644
--- a/metadata/md5-cache/games-emulation/libretro-nestopia-9999
+++ b/metadata/md5-cache/games-emulation/libretro-nestopia-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2+
 PROPERTIES=live
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libretro-core	a24db3f198650e3d23b1fb9d8114df40	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libretro-core	209b59a3aaa7b79139fcd2abae7414a8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=8269d3d24493d6e263aef16908c8a39b
diff --git a/metadata/md5-cache/games-emulation/libretro-snes9x-0.0.1_pre20180723 b/metadata/md5-cache/games-emulation/libretro-snes9x-0.0.1_pre20180723
index 02f59e47e175..0d5039539176 100644
--- a/metadata/md5-cache/games-emulation/libretro-snes9x-0.0.1_pre20180723
+++ b/metadata/md5-cache/games-emulation/libretro-snes9x-0.0.1_pre20180723
@@ -8,5 +8,5 @@ LICENSE=Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://github.com/libretro/snes9x/archive/d2aefd2f73d9f9241ede79c19598ecaa7079f82a.tar.gz -> libretro-snes9x-0.0.1_pre20180723.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libretro-core	a24db3f198650e3d23b1fb9d8114df40	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libretro-core	209b59a3aaa7b79139fcd2abae7414a8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=f56dca56e3b67f6a5fb2d5a29ded43d1
diff --git a/metadata/md5-cache/games-emulation/libretro-snes9x-9999 b/metadata/md5-cache/games-emulation/libretro-snes9x-9999
index b1dc2d380549..563be9fbbe88 100644
--- a/metadata/md5-cache/games-emulation/libretro-snes9x-9999
+++ b/metadata/md5-cache/games-emulation/libretro-snes9x-9999
@@ -8,5 +8,5 @@ LICENSE=Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP
 PROPERTIES=live
 RESTRICT=bindist
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libretro-core	a24db3f198650e3d23b1fb9d8114df40	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libretro-core	209b59a3aaa7b79139fcd2abae7414a8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=f424f2ed2816132b3026851d20c8fb66
diff --git a/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-0.0.1_pre20180723 b/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-0.0.1_pre20180723
index 5c1f0e43d377..1ab208d945d7 100644
--- a/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-0.0.1_pre20180723
+++ b/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-0.0.1_pre20180723
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Unlicense
 SLOT=0
 SRC_URI=https://github.com/libretro/libretro-2048/archive/45655d3662e4cbcd8afb28e2ee3f5494a75888de.tar.gz -> libretro-twentyfortyeight-0.0.1_pre20180723.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libretro-core	a24db3f198650e3d23b1fb9d8114df40	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libretro-core	209b59a3aaa7b79139fcd2abae7414a8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2812a724e4a6a6e21d3e78a867e92734
diff --git a/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-9999 b/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-9999
index 83a6cbad628e..c7a899405b0f 100644
--- a/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-9999
+++ b/metadata/md5-cache/games-emulation/libretro-twentyfortyeight-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Unlicense
 PROPERTIES=live
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libretro-core	a24db3f198650e3d23b1fb9d8114df40	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libretro-core	209b59a3aaa7b79139fcd2abae7414a8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2710e91eaac217872b577cb988b862ef
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r2 b/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r2
new file mode 100644
index 000000000000..bfb035287587
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl[abi_x86_32(-),joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),X] dev-cpp/pngpp dev-cpp/sparsehash
+DESCRIPTION=A PlayStation 2 emulator
+EAPI=7
+HOMEPAGE=https://www.pcsx2.net
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl[abi_x86_32(-),joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),X]
+SLOT=0
+SRC_URI=https://github.com/PCSX2/pcsx2/archive/v1.4.0.tar.gz -> pcsx2-1.4.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ac63424de5a4f1ee97f86b273eae17cd
diff --git a/metadata/md5-cache/games-emulation/pcsx2-9999 b/metadata/md5-cache/games-emulation/pcsx2-9999
index de78162e23d0..914b14ccd6d1 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-9999
+++ b/metadata/md5-cache/games-emulation/pcsx2-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] dev-libs/libxml2:2[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] net-libs/libpcap[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),-sdl,X] >=app-eselect/eselect-opengl-1.3.1 dev-cpp/pngpp >=dev-cpp/sparsehash-1.5 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] dev-libs/libxml2:2[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] net-libs/libpcap[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0-gtk3[abi_x86_32(-),-sdl,X] dev-cpp/pngpp dev-cpp/sparsehash
 DESCRIPTION=A PlayStation 2 emulator
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.pcsx2.net
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] dev-libs/libxml2:2[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] net-libs/libpcap[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),-sdl,X]
+RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] dev-libs/libxml2:2[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] net-libs/libpcap[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0-gtk3[abi_x86_32(-),-sdl,X]
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce4f9499f3568f816233ab2cabda6eb3
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9b5b7def964d151894936d0a7aa8f792
diff --git a/metadata/md5-cache/games-emulation/snes9x-1.59.2 b/metadata/md5-cache/games-emulation/snes9x-1.59.2
index 25cc1f3f590f..922a212d0be1 100644
--- a/metadata/md5-cache/games-emulation/snes9x-1.59.2
+++ b/metadata/md5-cache/games-emulation/snes9x-1.59.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:=[minizip] x11-libs/libX11 x11-libs/libXext png? ( media-l
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://github.com/snes9xgit/snes9x/archive/1.59.2.tar.gz -> snes9x-1.59.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a23245eaf34770987122d086c5730f8f
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index f5173930a721..369ea5475f77 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/devilutionx-9999 b/metadata/md5-cache/games-engines/devilutionx-9999
new file mode 100644
index 000000000000..5bde8f5a6ee0
--- /dev/null
+++ b/metadata/md5-cache/games-engines/devilutionx-9999
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=dev-libs/libsodium media-libs/libsdl2[haptic] media-libs/sdl2-mixer media-libs/sdl2-ttf
+DESCRIPTION=Diablo engine for modern operating systems
+EAPI=7
+HOMEPAGE=https://github.com/diasurgical/devilutionX
+IUSE=debug
+LICENSE=public-domain
+PROPERTIES=live
+RDEPEND=dev-libs/libsodium media-libs/libsdl2[haptic] media-libs/sdl2-mixer media-libs/sdl2-ttf
+SLOT=0
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=68d1af86730932af4ae800229a7d6bb6
diff --git a/metadata/md5-cache/games-engines/frotz-2.43-r1 b/metadata/md5-cache/games-engines/frotz-2.43-r1
deleted file mode 100644
index 29bc67014ba0..000000000000
--- a/metadata/md5-cache/games-engines/frotz-2.43-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/ncurses:0 alsa? ( oss? ( media-libs/alsa-oss ) )
-DESCRIPTION=Curses based interpreter for Z-code based text games
-EAPI=6
-HOMEPAGE=http://frotz.sourceforge.net/
-IUSE=alsa oss
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0 alsa? ( oss? ( media-libs/alsa-oss ) )
-SLOT=0
-SRC_URI=http://www.ifarchive.org/if-archive/infocom/interpreters/frotz/frotz-2.43.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ce9a0d428c78a450f31a5bac0955f34
diff --git a/metadata/md5-cache/games-engines/frotz-2.45_pre20190903 b/metadata/md5-cache/games-engines/frotz-2.45_pre20190903
new file mode 100644
index 000000000000..e401a05a0781
--- /dev/null
+++ b/metadata/md5-cache/games-engines/frotz-2.45_pre20190903
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst
+DEPEND=ncurses? ( sys-libs/ncurses:0=[unicode?] sound? ( media-libs/libao ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer sys-libs/zlib virtual/jpeg:0= )
+DESCRIPTION=Interpreter for Z-code based text games
+EAPI=7
+HOMEPAGE=https://661.org/proj/if/frotz/
+IUSE=ncurses sdl sound unicode
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=ncurses? ( sys-libs/ncurses:0=[unicode?] sound? ( media-libs/libao ) ) sdl? ( media-libs/freetype:2 media-libs/libpng:0= media-libs/libsdl2[sound,threads,video] media-libs/sdl2-mixer sys-libs/zlib virtual/jpeg:0= )
+REQUIRED_USE=sound? ( || ( ncurses sdl ) )
+SLOT=0
+SRC_URI=https://gitlab.com/DavidGriffith/frotz/-/archive/57e915b5f5b8997d1e4a1e0dac4ace2e62b7f6e9/frotz-57e915b5f5b8997d1e4a1e0dac4ace2e62b7f6e9.tar.bz2
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=7370a00c3d1aa9c013d98ef018222aff
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 1851121f0097..b6867c90e032 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/eduke32-20190719.7814 b/metadata/md5-cache/games-fps/eduke32-20190719.7814
deleted file mode 100644
index b7693e5ddd25..000000000000
--- a/metadata/md5-cache/games-fps/eduke32-20190719.7814
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm test unpack
-DEPEND=media-libs/libsdl2[joystick,opengl?,sound,video] 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 )
-DESCRIPTION=An open source engine port of the classic PC first person shooter Duke Nukem 3D
-EAPI=7
-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] 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/20190719-7814/eduke32_src_20190719-7814.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	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a741aa8b82d57580b42e62d7cec4f5a
diff --git a/metadata/md5-cache/games-fps/eduke32-20190820.8043 b/metadata/md5-cache/games-fps/eduke32-20190820.8043
new file mode 100644
index 000000000000..9d7de64b0cd0
--- /dev/null
+++ b/metadata/md5-cache/games-fps/eduke32-20190820.8043
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm test unpack
+DEPEND=media-libs/libsdl2[joystick,opengl?,sound,video] 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 )
+DESCRIPTION=An open source engine port of the classic PC first person shooter Duke Nukem 3D
+EAPI=7
+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] 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/20190820-8043/eduke32_src_20190820-8043.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	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce6a669a2fbd01a40eb0484143313f11
diff --git a/metadata/md5-cache/games-fps/freedm-0.11.3 b/metadata/md5-cache/games-fps/freedm-0.11.3
deleted file mode 100644
index 9040dbc15a10..000000000000
--- a/metadata/md5-cache/games-fps/freedm-0.11.3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=A 32-level game designed for competitive deathmatch play.
-EAPI=7
-HOMEPAGE=https://freedoom.github.io
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=~games-fps/freedm-data-0.11.3 || ( games-fps/gzdoom games-engines/odamex games-fps/doomsday games-fps/prboom-plus )
-SLOT=0
-_md5_=d591123d902aae745c7827dd619dbfb1
diff --git a/metadata/md5-cache/games-fps/freedm-0.11.3-r1 b/metadata/md5-cache/games-fps/freedm-0.11.3-r1
new file mode 100644
index 000000000000..be804e2c0b1c
--- /dev/null
+++ b/metadata/md5-cache/games-fps/freedm-0.11.3-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=A 32-level game designed for competitive deathmatch play.
+EAPI=7
+HOMEPAGE=https://freedoom.github.io
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=~games-fps/freedm-data-0.11.3 || ( games-fps/gzdoom[nonfree(+)] games-engines/odamex games-fps/doomsday games-fps/prboom-plus )
+SLOT=0
+_md5_=a4ebacc66300e0d681f5efe083e52ff3
diff --git a/metadata/md5-cache/games-fps/freedm-data-0.11.3 b/metadata/md5-cache/games-fps/freedm-data-0.11.3
deleted file mode 100644
index 2f62a8a34676..000000000000
--- a/metadata/md5-cache/games-fps/freedm-data-0.11.3
+++ /dev/null
@@ -1,10 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst
-DESCRIPTION=Game resources for FreeDM
-EAPI=7
-HOMEPAGE=https://freedoom.github.io
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/freedoom/freedoom/releases/download/v0.11.3/freedm-0.11.3.zip
-_md5_=277b0ef7fffd356cd2d2e4c55f4e7700
diff --git a/metadata/md5-cache/games-fps/freedm-data-0.11.3-r1 b/metadata/md5-cache/games-fps/freedm-data-0.11.3-r1
new file mode 100644
index 000000000000..183b5d82e032
--- /dev/null
+++ b/metadata/md5-cache/games-fps/freedm-data-0.11.3-r1
@@ -0,0 +1,12 @@
+BDEPEND=|| ( ( dev-lang/python:3.7 dev-python/pillow[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pillow[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pillow[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pillow[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) app-text/asciidoc games-util/deutex virtual/imagemagick-tools[png]
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Game resources for FreeDM
+EAPI=7
+HOMEPAGE=https://freedoom.github.io
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/freedoom/freedoom/archive/v0.11.3.tar.gz -> freedoom-0.11.3.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0225a2491ad476121d397b30773ceeb3
diff --git a/metadata/md5-cache/games-fps/freedoom-0.11.3-r1 b/metadata/md5-cache/games-fps/freedoom-0.11.3-r1
deleted file mode 100644
index 62648aacb75d..000000000000
--- a/metadata/md5-cache/games-fps/freedoom-0.11.3-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=A complete free-content single-player focused game based on the Doom engine
-EAPI=7
-HOMEPAGE=https://freedoom.github.io
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=~games-fps/freedoom-data-0.11.3 || ( games-fps/gzdoom games-engines/odamex games-fps/doomsday games-fps/prboom-plus )
-SLOT=0
-_md5_=2a382610f05767d2620b1a064bee5eba
diff --git a/metadata/md5-cache/games-fps/freedoom-0.11.3-r2 b/metadata/md5-cache/games-fps/freedoom-0.11.3-r2
new file mode 100644
index 000000000000..10f90861ace9
--- /dev/null
+++ b/metadata/md5-cache/games-fps/freedoom-0.11.3-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=A complete free-content single-player focused game based on the Doom engine
+EAPI=7
+HOMEPAGE=https://freedoom.github.io
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=~games-fps/freedoom-data-0.11.3 || ( games-fps/gzdoom[nonfree(+)] games-engines/odamex games-fps/doomsday games-fps/prboom-plus )
+SLOT=0
+_md5_=71d1353b7e20138c1d7c19f47363adb9
diff --git a/metadata/md5-cache/games-fps/freedoom-data-0.11.3 b/metadata/md5-cache/games-fps/freedoom-data-0.11.3
deleted file mode 100644
index ee05c4130f3c..000000000000
--- a/metadata/md5-cache/games-fps/freedoom-data-0.11.3
+++ /dev/null
@@ -1,10 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst
-DESCRIPTION=Game resources for Freedoom: Phase 1+2
-EAPI=7
-HOMEPAGE=https://freedoom.github.io
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/freedoom/freedoom/releases/download/v0.11.3/freedoom-0.11.3.zip
-_md5_=12c8dcb258e621ce1d7ce2c5b3dfc2a4
diff --git a/metadata/md5-cache/games-fps/freedoom-data-0.11.3-r1 b/metadata/md5-cache/games-fps/freedoom-data-0.11.3-r1
new file mode 100644
index 000000000000..5a15932cd75e
--- /dev/null
+++ b/metadata/md5-cache/games-fps/freedoom-data-0.11.3-r1
@@ -0,0 +1,12 @@
+BDEPEND=|| ( ( dev-lang/python:3.7 dev-python/pillow[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pillow[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pillow[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pillow[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) app-text/asciidoc games-util/deutex virtual/imagemagick-tools[png]
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Game resources for Freedoom: Phase 1+2
+EAPI=7
+HOMEPAGE=https://freedoom.github.io
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/freedoom/freedoom/archive/v0.11.3.tar.gz -> freedoom-0.11.3.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4be36a578ff404d21f6866f779252ecd
diff --git a/metadata/md5-cache/games-fps/gzdoom-4.1.3 b/metadata/md5-cache/games-fps/gzdoom-4.1.3
deleted file mode 100644
index fe36d10758c1..000000000000
--- a/metadata/md5-cache/games-fps/gzdoom-4.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=media-libs/libsdl2[opengl] media-libs/libsndfile media-libs/openal media-sound/fluidsynth:= media-sound/mpg123 sys-libs/zlib virtual/jpeg:0 gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A modder-friendly OpenGL source port based on the DOOM engine
-EAPI=7
-HOMEPAGE=https://zdoom.org
-IUSE=gtk gtk2 openmp
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT
-RDEPEND=media-libs/libsdl2[opengl] media-libs/libsndfile media-libs/openal media-sound/fluidsynth:= media-sound/mpg123 sys-libs/zlib virtual/jpeg:0 gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) )
-SLOT=0
-SRC_URI=https://github.com/coelckers/gzdoom/archive/g4.1.3.tar.gz -> gzdoom-4.1.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d8bae1fe88ce0e70d0bbdfb0af4746a
diff --git a/metadata/md5-cache/games-fps/gzdoom-4.2.0 b/metadata/md5-cache/games-fps/gzdoom-4.2.0
new file mode 100644
index 000000000000..2999f9b0e6b3
--- /dev/null
+++ b/metadata/md5-cache/games-fps/gzdoom-4.2.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=media-libs/libsdl2[opengl] media-libs/libsndfile media-libs/openal media-sound/fluidsynth:= media-sound/mpg123 sys-libs/zlib virtual/jpeg:0 gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A modder-friendly OpenGL source port based on the DOOM engine
+EAPI=7
+HOMEPAGE=https://zdoom.org
+IUSE=gtk gtk2 +nonfree openmp
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )
+RDEPEND=media-libs/libsdl2[opengl] media-libs/libsndfile media-libs/openal media-sound/fluidsynth:= media-sound/mpg123 sys-libs/zlib virtual/jpeg:0 gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) )
+SLOT=0
+SRC_URI=https://github.com/coelckers/gzdoom/archive/g4.2.0.tar.gz -> gzdoom-4.2.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0378b5269d1bd12bcf113fd854a83058
diff --git a/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1 b/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
index feac987ff211..b59cedb393e9 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 mirror bindist
 SLOT=0
 SRC_URI=mirror://lokigames/sof/sof-1.06a-cdrom-x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56b641b177d29569c14d33e869d3081d
diff --git a/metadata/md5-cache/games-fps/urbanterror-data-4.3.4 b/metadata/md5-cache/games-fps/urbanterror-data-4.3.4
index 81e2db92a557..24761a971ad3 100644
--- a/metadata/md5-cache/games-fps/urbanterror-data-4.3.4
+++ b/metadata/md5-cache/games-fps/urbanterror-data-4.3.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Q3AEULA-20000111 urbanterror-4.2-maps
 SLOT=0
 SRC_URI=https://up.barbatos.fr/urt/UrbanTerror43_full_2.zip -> urbanterror-data-4.3.0.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.0-to-4.3.1.zip -> urbanterror-data-4.3.0-to-4.3.1.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.1-to-4.3.2.zip -> urbanterror-data-4.3.1-to-4.3.2.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.2-to-4.3.3.zip -> urbanterror-data-4.3.2-to-4.3.3.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.3-to-4.3.4.zip -> urbanterror-data-4.3.3-to-4.3.4.zip
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73
 _md5_=2846d4efca6b44ce1cb2dc8a7e1cc039
diff --git a/metadata/md5-cache/games-fps/xonotic-0.8.2 b/metadata/md5-cache/games-fps/xonotic-0.8.2
index 0141d80ba4ed..eb3ab1d74420 100644
--- a/metadata/md5-cache/games-fps/xonotic-0.8.2
+++ b/metadata/md5-cache/games-fps/xonotic-0.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/jpeg:0 media-libs/libpng:0 net-misc/curl ~dev-libs/d0_blind_id-1.0 !dedicated? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/libmodplug x11-libs/libX11 x11-libs/libXau x11-libs/libXpm x11-libs/libXext x11-libs/libXdmcp x11-libs/libXxf86dga x11-libs/libXxf86vm virtual/opengl media-libs/freetype:2 alsa? ( media-libs/alsa-lib ) ode? ( dev-games/ode[double-precision] ) sdl? ( media-libs/libsdl2[X,sound,joystick,opengl,video,alsa?] ) )
 SLOT=0
 SRC_URI=http://dl.xonotic.org/xonotic-0.8.2.zip
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=07e311ba364cacb31f65fb6bc28b923e
diff --git a/metadata/md5-cache/games-kids/Manifest.gz b/metadata/md5-cache/games-kids/Manifest.gz
index 9594544ea5c8..f18c2b21e877 100644
--- a/metadata/md5-cache/games-kids/Manifest.gz
+++ b/metadata/md5-cache/games-kids/Manifest.gz
diff --git a/metadata/md5-cache/games-kids/tuxmathscrabble-0.8.1-r1 b/metadata/md5-cache/games-kids/tuxmathscrabble-0.8.1-r1
index 238b55c6b5c8..b7be3d579b8a 100644
--- a/metadata/md5-cache/games-kids/tuxmathscrabble-0.8.1-r1
+++ b/metadata/md5-cache/games-kids/tuxmathscrabble-0.8.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/asymptopia/tuxmathscrabble/archive/0.8.1.tar.gz -> tuxmathscrabble-0.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2760645928d64bd3b0ff0c05e062dfa2
+_md5_=3c07fa3b0baca87d86ed461fa1bbb7ed
diff --git a/metadata/md5-cache/games-mud/Manifest.gz b/metadata/md5-cache/games-mud/Manifest.gz
index 6805ed8c66cf..f8583ead574f 100644
--- a/metadata/md5-cache/games-mud/Manifest.gz
+++ b/metadata/md5-cache/games-mud/Manifest.gz
diff --git a/metadata/md5-cache/games-mud/gnome-mud-9999 b/metadata/md5-cache/games-mud/gnome-mud-9999
index ded1c669c354..19b1e4686452 100644
--- a/metadata/md5-cache/games-mud/gnome-mud-9999
+++ b/metadata/md5-cache/games-mud/gnome-mud-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.48:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/vte-0.37:2.91 dev-libs/libpcre sys-libs/zlib gstreamer? ( media-libs/gstreamer:1.0 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac599acc12225fa648acb465aae475ff
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index d69293d7b984..076a128c837c 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/braincurses-1.1.0 b/metadata/md5-cache/games-puzzle/braincurses-1.1.0
new file mode 100644
index 000000000000..2b867c63d604
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/braincurses-1.1.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=A version of the classic game Mastermind
+EAPI=7
+HOMEPAGE=https://github.com/bderrly/braincurses
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/bderrly/braincurses/archive/1.1.0.tar.gz -> braincurses-1.1.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=bd6f36d468d8da207236b1331a3c4522
diff --git a/metadata/md5-cache/games-puzzle/five-or-more-3.30.0 b/metadata/md5-cache/games-puzzle/five-or-more-3.30.0
index 2b42378425d5..858504279d3f 100644
--- a/metadata/md5-cache/games-puzzle/five-or-more-3.30.0
+++ b/metadata/md5-cache/games-puzzle/five-or-more-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.20:3 dev-libs/libgnome-games-support:= >=gnome-base/librsvg-2.32:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/five-or-more/3.30/five-or-more-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b3839abc613582c7265782d8686dad11
diff --git a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.30.0 b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.30.0
index 401ad0f9c804..149390e70489 100644
--- a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.30.0
+++ b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.19.0:3[introspection] x11-libs/pango[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-sudoku/3.30/gnome-sudoku-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a332214834468491dbb5f44363308bd9
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-3.30.0 b/metadata/md5-cache/games-puzzle/lightsoff-3.30.0
index 68effe101ffa..28e2bcb9cebc 100644
--- a/metadata/md5-cache/games-puzzle/lightsoff-3.30.0
+++ b/metadata/md5-cache/games-puzzle/lightsoff-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.38.0:2 >=x11-libs/gtk+-3.13.4:3 >=media-libs/clutter-1.14.0:1.0 >=media-libs/clutter-gtk-1.5.5:1.0 >=gnome-base/librsvg-2.32.0:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/lightsoff/3.30/lightsoff-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=86e668678f09b55631ddf5c99a42068a
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-3.30.0 b/metadata/md5-cache/games-puzzle/swell-foop-3.30.0
index 3a9a03955d83..03de24f355e0 100644
--- a/metadata/md5-cache/games-puzzle/swell-foop-3.30.0
+++ b/metadata/md5-cache/games-puzzle/swell-foop-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gtk+-3.12:3 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/swell-foop/3.30/swell-foop-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=58f4fd423f42a1b5940bc3659e62ecad
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index be29d253f53b..8a477d76f064 100644
--- a/metadata/md5-cache/games-roguelike/Manifest.gz
+++ b/metadata/md5-cache/games-roguelike/Manifest.gz
diff --git a/metadata/md5-cache/games-roguelike/angband-4.2.0 b/metadata/md5-cache/games-roguelike/angband-4.2.0
new file mode 100644
index 000000000000..5df5dab66c2a
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/angband-4.2.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=X? ( media-fonts/font-misc-misc x11-libs/libX11 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) sdl? ( !sdl2? ( media-libs/libsdl[video,X] media-libs/sdl-image media-libs/sdl-ttf sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[mp3] ) ) sdl2? ( media-libs/libsdl2[video,X] media-libs/sdl2-image media-libs/sdl2-ttf sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[mp3] ) ) )
+DESCRIPTION=A roguelike dungeon exploration game based on the books of J.R.R. Tolkien
+EAPI=7
+HOMEPAGE=https://rephial.org/
+IUSE=+ncurses sdl sdl2 sound +X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=X? ( media-fonts/font-misc-misc x11-libs/libX11 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) sdl? ( !sdl2? ( media-libs/libsdl[video,X] media-libs/sdl-image media-libs/sdl-ttf sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[mp3] ) ) sdl2? ( media-libs/libsdl2[video,X] media-libs/sdl2-image media-libs/sdl2-ttf sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[mp3] ) ) )
+REQUIRED_USE=sdl2? ( sdl ) sound? ( sdl ) || ( X ncurses )
+SLOT=0
+SRC_URI=https://rephial.org/downloads/4.2/angband-4.2.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=107b91aa1f302e96f96de655513a70d8
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index fa5b0e3b367c..b2f21dc4b8ec 100644
--- a/metadata/md5-cache/games-rpg/Manifest.gz
+++ b/metadata/md5-cache/games-rpg/Manifest.gz
diff --git a/metadata/md5-cache/games-rpg/arx-fatalis-data-1.21-r4 b/metadata/md5-cache/games-rpg/arx-fatalis-data-1.21-r4
index 287b12b26c79..fa6e9cad9725 100644
--- a/metadata/md5-cache/games-rpg/arx-fatalis-data-1.21-r4
+++ b/metadata/md5-cache/games-rpg/arx-fatalis-data-1.21-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( cdinstall gog )
 RESTRICT=binchecks mirror gog? ( fetch )
 SLOT=0
 SRC_URI=cdinstall? ( https://cdn.bethsoft.com/arxfatalis/patches/1.21/ArxFatalis_1.21_MULTILANG.exe ) gog? ( setup_arx_fatalis_2.0.0.7.exe )
-_eclasses_=cdrom	6ffe90ac67bc6ac95249cae335323907	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=cdrom	6ffe90ac67bc6ac95249cae335323907	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7972433d10afd4cdc984dfa6860d7779
diff --git a/metadata/md5-cache/games-rpg/bastion-20120620-r1 b/metadata/md5-cache/games-rpg/bastion-20120620-r1
index af0cdad5ba2f..18c71eea7c28 100644
--- a/metadata/md5-cache/games-rpg/bastion-20120620-r1
+++ b/metadata/md5-cache/games-rpg/bastion-20120620-r1
@@ -8,5 +8,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	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc50abe73edec72ec06215d7f908e2e7
diff --git a/metadata/md5-cache/games-rpg/dungeon-defenders-20130305 b/metadata/md5-cache/games-rpg/dungeon-defenders-20130305
index 5a3d21de2896..2291d99bd276 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	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8ddf39a8fdfb58565bd40972d0faba6
diff --git a/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r2 b/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r2
deleted file mode 100644
index 80b80006fec2..000000000000
--- a/metadata/md5-cache/games-rpg/eternal-lands-1.9.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/libxml2:= media-libs/cal3d:=[-16bit-indices] media-libs/freealut media-libs/libpng:0= media-libs/libsdl:=[X,opengl,video] media-libs/libvorbis:= media-libs/openal:= media-libs/sdl-image:= media-libs/sdl-net:= >=games-rpg/eternal-lands-data-1.9.3 sys-libs/zlib:=[minizip] virtual/glu virtual/opengl x11-libs/libX11:= x11-libs/libXau:= x11-libs/libXdmcp:= x11-libs/libXext:= >=app-eselect/eselect-opengl-1.0.6-r1 app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) media-libs/glew
-DESCRIPTION=An online MMORPG written in C and SDL
-EAPI=5
-HOMEPAGE=http://www.eternal-lands.com
-IUSE=debug doc kernel_linux
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=eternal_lands
-RDEPEND=dev-libs/libxml2:= media-libs/cal3d:=[-16bit-indices] media-libs/freealut media-libs/libpng:0= media-libs/libsdl:=[X,opengl,video] media-libs/libvorbis:= media-libs/openal:= media-libs/sdl-image:= media-libs/sdl-net:= >=games-rpg/eternal-lands-data-1.9.3 sys-libs/zlib:=[minizip] virtual/glu virtual/opengl x11-libs/libX11:= x11-libs/libXau:= x11-libs/libXdmcp:= x11-libs/libXext:= games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://gentoo/elc_1.9.3-20120213.tar.bz2 https://dev.gentoo.org/~rich0/distfiles/eternal-lands.png
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35d7d63aa53fcbf45a7c100576a89daa
diff --git a/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13 b/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
index 4010071dc7a2..3754d5892a17 100644
--- a/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
+++ b/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
@@ -8,5 +8,5 @@ RDEPEND=>=dev-libs/atk-2.12.0-r1[abi_x86_32(-)] >=dev-libs/glib-2.40.0-r1:2[abi_
 RESTRICT=bindist fetch mirror
 SLOT=0
 SRC_URI=gog_wasteland_2_1.9.0.13.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=103e8f0e6d36582c1edb3c7b47f86a4d
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 3d98b5ad1e90..445588cd973f 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/monopd-0.10.2-r1 b/metadata/md5-cache/games-server/monopd-0.10.2-r1
index 9c71217f1e16..8576ed329f88 100644
--- a/metadata/md5-cache/games-server/monopd-0.10.2-r1
+++ b/metadata/md5-cache/games-server/monopd-0.10.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/gtkatlantic/monopd/monopd-0.10.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d5cc60ef3baa2a58ce0ab3f243e1a803
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=65e53e971d2000ad8a9c3f0bc5edd6d3
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index b538c1610b50..fe2ed1b6811e 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/crrcsim-0.9.13 b/metadata/md5-cache/games-simulation/crrcsim-0.9.13
index 49cc8c12665c..03b28d19a656 100644
--- a/metadata/md5-cache/games-simulation/crrcsim-0.9.13
+++ b/metadata/md5-cache/games-simulation/crrcsim-0.9.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/plib sci-mathematics/cgal portaudio? ( media-libs/portaudio ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/plib sci-mathematics/cgal portaudio? ( media-libs/portaudio ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=model-airplane flight simulation program
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/crrcsim/
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/plib sci-mat
 SLOT=0
 SRC_URI=mirror://sourceforge/crrcsim/crrcsim-0.9.13.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81d854cb129648e1cdb00374596f566b
+_md5_=5964a64131daf3656cf66684f75addca
diff --git a/metadata/md5-cache/games-simulation/flightgear-2018.3.2 b/metadata/md5-cache/games-simulation/flightgear-2018.3.2
index 78510028b09b..46bba724ee74 100644
--- a/metadata/md5-cache/games-simulation/flightgear-2018.3.2
+++ b/metadata/md5-cache/games-simulation/flightgear-2018.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend test
-DEPEND=dev-db/sqlite:3 <dev-games/openscenegraph-3.5.6:=[jpeg,png] ~dev-games/simgear-2018.3.2[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 utils? ( x11-libs/libXi x11-libs/libXmu ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-db/sqlite:3 <dev-games/openscenegraph-3.5.6:=[jpeg,png] ~dev-games/simgear-2018.3.2[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 qt5? ( >=dev-qt/linguist-tools-5.7.1:5 ) utils? ( x11-libs/libXi x11-libs/libXmu ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Open Source Flight Simulator
 EAPI=6
 HOMEPAGE=http://www.flightgear.org/
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/flightgear-2018.3.2.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b04644f131efa32b2997911aacb0bec2
+_md5_=e7ea32df377d2e17aed508259a49de43
diff --git a/metadata/md5-cache/games-simulation/flightgear-9999 b/metadata/md5-cache/games-simulation/flightgear-9999
index 6c0302e41b7a..f4d8b4bf4874 100644
--- a/metadata/md5-cache/games-simulation/flightgear-9999
+++ b/metadata/md5-cache/games-simulation/flightgear-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=dev-db/sqlite:3 <dev-games/openscenegraph-3.5.6:=[jpeg,png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 utils? ( x11-libs/libXi x11-libs/libXmu ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-db/sqlite:3 <dev-games/openscenegraph-3.5.6:=[jpeg,png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 qt5? ( >=dev-qt/linguist-tools-5.7.1:5 ) utils? ( x11-libs/libXi x11-libs/libXmu ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Open Source Flight Simulator
 EAPI=6
 HOMEPAGE=http://www.flightgear.org/
@@ -10,4 +10,4 @@ RDEPEND=dev-db/sqlite:3 <dev-games/openscenegraph-3.5.6:=[jpeg,png] ~dev-games/s
 RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a4c74a4c9a79d4c83912a9c87ac29d13
+_md5_=68e6737812d18afa93e13bf836418132
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index ccd3505370db..3b8de34e4b26 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/ja2-stracciatella-data-1 b/metadata/md5-cache/games-strategy/ja2-stracciatella-data-1
index ae8a4899807c..7be1cedbb895 100644
--- a/metadata/md5-cache/games-strategy/ja2-stracciatella-data-1
+++ b/metadata/md5-cache/games-strategy/ja2-stracciatella-data-1
@@ -8,5 +8,5 @@ LICENSE=SIR-TECH
 PROPERTIES=interactive
 RDEPEND=games-misc/games-envd
 SLOT=0
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a78ea64451dfed10553aef455e664bb1
diff --git a/metadata/md5-cache/games-strategy/outerspace-0.5.68-r1 b/metadata/md5-cache/games-strategy/outerspace-0.5.68-r1
index 6d134843a9e1..357125c285a3 100644
--- a/metadata/md5-cache/games-strategy/outerspace-0.5.68-r1
+++ b/metadata/md5-cache/games-strategy/outerspace-0.5.68-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ospace/Client/0.5.68/Outer%20Space-0.5.68.tar.gz -> outerspace-0.5.68.tar.gz mirror://sourceforge/ospace/Client/0.5.68/outerspace_0.5.68-0ubuntu1_all.deb
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9aebb47150fe67f59995e43c1582bcf3
+_md5_=0436e99b817c1ea5bdc9ae6cf08c84c1
diff --git a/metadata/md5-cache/games-strategy/warzone2100-3.3.0 b/metadata/md5-cache/games-strategy/warzone2100-3.3.0
new file mode 100644
index 000000000000..56e233920804
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/warzone2100-3.3.0
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/zip virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-games/physfs-2[zip] dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/freetype:2 media-libs/glew:= media-libs/harfbuzz media-libs/libogg media-libs/libpng:0 media-libs/libsdl2[opengl,video,X] media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr nls? ( virtual/libintl ) app-text/asciidoc dev-libs/fribidi media-libs/fontconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=3D real-time strategy game
+EAPI=7
+HOMEPAGE=http://wz2100.net/
+IUSE=debug nls videos
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ CC-BY-SA-3.0 public-domain
+RDEPEND=>=dev-games/physfs-2[zip] dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/freetype:2 media-libs/glew:= media-libs/harfbuzz media-libs/libogg media-libs/libpng:0 media-libs/libsdl2[opengl,video,X] media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr nls? ( virtual/libintl ) media-fonts/dejavu
+SLOT=0
+SRC_URI=mirror://sourceforge/warzone2100/warzone2100-3.3.0_src.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cea1f958a419a835ccabe82e39c423fa
diff --git a/metadata/md5-cache/games-strategy/warzone2100-3.3.0_beta1 b/metadata/md5-cache/games-strategy/warzone2100-3.3.0_beta1
deleted file mode 100644
index 1bfd9be204c4..000000000000
--- a/metadata/md5-cache/games-strategy/warzone2100-3.3.0_beta1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/zip virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-games/physfs-2[zip] dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/freetype:2 media-libs/glew:= media-libs/harfbuzz media-libs/libogg media-libs/libpng:0 media-libs/libsdl2[opengl,video,X] media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr nls? ( virtual/libintl ) app-text/asciidoc dev-libs/fribidi media-libs/fontconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=3D real-time strategy game
-EAPI=7
-HOMEPAGE=http://wz2100.net/
-IUSE=debug nls videos
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ CC-BY-SA-3.0 public-domain
-RDEPEND=>=dev-games/physfs-2[zip] dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/freetype:2 media-libs/glew:= media-libs/harfbuzz media-libs/libogg media-libs/libpng:0 media-libs/libsdl2[opengl,video,X] media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr nls? ( virtual/libintl ) media-fonts/dejavu
-SLOT=0
-SRC_URI=mirror://sourceforge/warzone2100/warzone2100-3.3.0_beta1.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6147a023101320bb6dd14673c29a08e4
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.6 b/metadata/md5-cache/games-strategy/wesnoth-1.14.6
deleted file mode 100644
index 6d0954b4714b..000000000000
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) ) x11-libs/libX11
-DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
-EAPI=7
-HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
-IUSE=dbus dedicated doc fribidi libressl nls openmp server
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
-SLOT=0
-SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.6.tar.gz -> wesnoth-1.14.6.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48f82f4d05997e66719a5dfd3200660a
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.7 b/metadata/md5-cache/games-strategy/wesnoth-1.14.7
index 5134215a4d29..009f132e4883 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.7
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.14.7
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[jo
 SLOT=0
 SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.7.tar.gz -> wesnoth-1.14.7.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18ee0dffed86fcd4eb06d4a51d16d676
+_md5_=47301e2ccf2e1727841defe3ed2b519b
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.15.1 b/metadata/md5-cache/games-strategy/wesnoth-1.15.1
new file mode 100644
index 000000000000..4b6cf1bfa32a
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.15.1
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) ) x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
+EAPI=7
+HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
+IUSE=dbus dedicated doc fribidi libressl nls server
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
+SLOT=0
+SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.15.1.tar.gz -> wesnoth-1.15.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4e725ededfdc6ab2a893d50637a4848a
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 9ff10b5cc49a..7fb0edb6a549 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/gamemode-1.2 b/metadata/md5-cache/games-util/gamemode-1.2
index 9dd394c5567e..c5eac018b45b 100644
--- a/metadata/md5-cache/games-util/gamemode-1.2
+++ b/metadata/md5-cache/games-util/gamemode-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] sys-auth/polkit
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://github.com/FeralInteractive/gamemode/releases/download/1.2/gamemode-1.2.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=5f90faf8204f60e1c27e14533d03a2a0
diff --git a/metadata/md5-cache/games-util/gamemode-9999 b/metadata/md5-cache/games-util/gamemode-9999
index 75d3e47dd014..91a64654e5ae 100644
--- a/metadata/md5-cache/games-util/gamemode-9999
+++ b/metadata/md5-cache/games-util/gamemode-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] sys-auth/polkit
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=5f90faf8204f60e1c27e14533d03a2a0
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 6b0157ed45b2..687e3373ad96 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/dconf-0.30.1 b/metadata/md5-cache/gnome-base/dconf-0.30.1
index 1ecfd6215f14..5d81987854d9 100644
--- a/metadata/md5-cache/gnome-base/dconf-0.30.1
+++ b/metadata/md5-cache/gnome-base/dconf-0.30.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf/0.30/dconf-0.30.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=688e71d01389d75cfbad69765c1739c6
diff --git a/metadata/md5-cache/gnome-base/dconf-editor-3.30.2 b/metadata/md5-cache/gnome-base/dconf-editor-3.30.2
index 86a08daa286f..92c171f5d6f1 100644
--- a/metadata/md5-cache/gnome-base/dconf-editor-3.30.2
+++ b/metadata/md5-cache/gnome-base/dconf-editor-3.30.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=gnome-base/dconf-0.26.1 >=dev-libs/glib-2.55.1:2 >=x11-libs/gtk+-3.22.27:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf-editor/3.30/dconf-editor-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a911e57cb662bb564ab9b80614ad889
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.30.3-r1 b/metadata/md5-cache/gnome-base/gnome-control-center-3.30.3-r1
index 719741901fce..2ac6f0980486 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.30.3-r1
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.30.3-r1
@@ -11,5 +11,5 @@ RDEPEND=gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) >=m
 REQUIRED_USE=flickr? ( gnome-online-accounts ) ^^ ( elogind systemd )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.30/gnome-control-center-3.30.3.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-control-center-3.30.3-patchset.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f931403f4c8c6b45c60c0071efe9637
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.26.2-r2 b/metadata/md5-cache/gnome-base/gnome-desktop-3.26.2-r2
deleted file mode 100644
index 5adc914ed266..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.26.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.53.0:2 >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) seccomp? ( sys-libs/libseccomp ) udev? ( sys-apps/hwids virtual/libudev:= ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.6 dev-util/itstool sys-devel/gettext x11-base/xorg-proto virtual/pkgconfig app-text/yelp-tools gnome-base/gnome-common >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Libraries for the gnome desktop that are not part of the UI
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gnome-desktop
-IUSE=debug +introspection seccomp udev test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
-RDEPEND=app-text/iso-codes >=dev-libs/glib-2.53.0:2 >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) seccomp? ( sys-libs/libseccomp ) udev? ( sys-apps/hwids virtual/libudev:= ) !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] seccomp? ( sys-apps/bubblewrap )
-SLOT=3/12
-SRC_URI=mirror://gnome/sources/gnome-desktop/3.26/gnome-desktop-3.26.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-desktop-3.26.2-patchset-r1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5eee36f5c613d832166f071612b2c75e
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.30.2.1 b/metadata/md5-cache/gnome-base/gnome-desktop-3.30.2.1
deleted file mode 100644
index e90a7535649a..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.30.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.53.0:2 >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.27.0 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) seccomp? ( sys-libs/libseccomp ) udev? ( sys-apps/hwids virtual/libudev:= ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 dev-util/itstool >=sys-devel/gettext-0.19.8 x11-base/xorg-proto virtual/pkgconfig media-libs/fontconfig app-text/yelp-tools sys-devel/autoconf-archive >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Library with common API for various GNOME modules
-EAPI=6
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
-IUSE=debug +introspection seccomp udev test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
-RDEPEND=app-text/iso-codes >=dev-libs/glib-2.53.0:2 >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.27.0 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) seccomp? ( sys-libs/libseccomp ) udev? ( sys-apps/hwids virtual/libudev:= ) !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] seccomp? ( sys-apps/bubblewrap )
-SLOT=3/17
-SRC_URI=mirror://gnome/sources/gnome-desktop/3.30/gnome-desktop-3.30.2.1.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-desktop-3.30.2.1-patchset.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7083d9cecebc845049117c0103fecd74
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.30.2.3 b/metadata/md5-cache/gnome-base/gnome-desktop-3.30.2.3
new file mode 100644
index 000000000000..0b9e3ccaa901
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-3.30.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.53.0:2 >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.27.0 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) seccomp? ( sys-libs/libseccomp ) udev? ( sys-apps/hwids virtual/libudev:= ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 dev-util/itstool >=sys-devel/gettext-0.19.8 x11-base/xorg-proto virtual/pkgconfig media-libs/fontconfig app-text/yelp-tools sys-devel/autoconf-archive >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Library with common API for various GNOME modules
+EAPI=6
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
+IUSE=debug +introspection seccomp udev test
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.53.0:2 >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.27.0 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) seccomp? ( sys-libs/libseccomp ) udev? ( sys-apps/hwids virtual/libudev:= ) !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] seccomp? ( sys-apps/bubblewrap )
+SLOT=3/17
+SRC_URI=mirror://gnome/sources/gnome-desktop/3.30/gnome-desktop-3.30.2.3.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-desktop-3.30.2.3-patchset.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd8d7d7a956bd9fe106caefc9e355c00
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.30.1-r1 b/metadata/md5-cache/gnome-base/gnome-session-3.30.1-r1
index d31d163c15c6..673719b4d44e 100644
--- a/metadata/md5-cache/gnome-base/gnome-session-3.30.1-r1
+++ b/metadata/md5-cache/gnome-base/gnome-session-3.30.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.18.0:3 x11-libs/libICE x11-li
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-session/3.30/gnome-session-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=177ea05be9260083b26b363f4956d298
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.30.2-r1 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.30.2-r1
index beb62ef042ee..d68c0c7495e0 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.30.2-r1
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.30.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sci-geosciences/geocode-glib-3.10 >=dev-libs/glib-2.53.0:2 >=gnome-bas
 REQUIRED_USE=^^ ( elogind systemd ) input_devices_wacom? ( udev ) wayland? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.30/gnome-settings-daemon-3.30.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-settings-daemon-3.30.2-patchset.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00e77efba0b949e1ac3693a6ef198d6b
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.26.2-r4 b/metadata/md5-cache/gnome-base/gnome-shell-3.26.2-r4
index 05d36309ba05..f47b3bf0de32 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.26.2-r4
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.26.2-r4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.26/gnome-shell-3.26.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-3.26.2-patchset.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=586c4f00ceba30abb401a06f0aec7573
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.30.2-r2 b/metadata/md5-cache/gnome-base/gnome-shell-3.30.2-r2
index 5a8b76443b8f..f1dcd1820bc5 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.30.2-r2
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.30.2-r2
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.30/gnome-shell-3.30.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-3.30.2-r2-patchset.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97897523b250fd265e869e63e184a7a2
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.32.0 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.32.0
new file mode 100644
index 000000000000..848ad3bf8dc6
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.32.0
@@ -0,0 +1,14 @@
+BDEPEND=introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=!<gnome-base/gdm-3.8 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Collection of GSettings schemas for GNOME desktop
+EAPI=7
+HOMEPAGE=https://git.gnome.org/browse/gsettings-desktop-schemas
+IUSE=+introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=!<gnome-base/gdm-3.8
+SLOT=0
+SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.32/gsettings-desktop-schemas-3.32.0.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d96985f2aa9deb9d8a2fc2a857d8723c
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.38.3 b/metadata/md5-cache/gnome-base/gvfs-1.38.3
index d449f38bdffd..d3e6df9281af 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.38.3
+++ b/metadata/md5-cache/gnome-base/gvfs-1.38.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.57.2:2 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps
 REQUIRED_USE=?? ( elogind systemd ) cdda? ( udev ) google? ( gnome-online-accounts ) gphoto2? ( udev ) mtp? ( udev ) udisks? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.38/gvfs-1.38.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0a9c930f1491d2d848caa0d5bf4aec3
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.40.2 b/metadata/md5-cache/gnome-base/gvfs-1.40.2
index bb61a705e8c5..66eb8bc84a16 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.40.2
+++ b/metadata/md5-cache/gnome-base/gvfs-1.40.2
@@ -5,11 +5,11 @@ DESCRIPTION=Virtual filesystem implementation for GIO
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
 IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.57.2:2 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-2.58.0:2.4 ) zeroconf? ( >=net-dns/avahi-0.6 ) udev? ( >=virtual/libgudev-147:= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8 ) net-misc/openssh
 REQUIRED_USE=?? ( elogind systemd ) cdda? ( udev ) google? ( gnome-online-accounts ) gphoto2? ( udev ) mtp? ( udev ) udisks? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.40/gvfs-1.40.2.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1da3399feb3709b628199ff6a598808
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cce33ae0f3e46ceb7a742088f5893902
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.28.1 b/metadata/md5-cache/gnome-base/nautilus-3.28.1
deleted file mode 100644
index 0d06f71160d4..000000000000
--- a/metadata/md5-cache/gnome-base/nautilus-3.28.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.55.1:2 >=media-libs/gexiv2-0.10.0 >=app-arch/gnome-autoar-0.2.1 >=gnome-base/gnome-desktop-3.0.0:3= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.22.26:3[X,introspection?] selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-2.0:= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) >=dev-util/gdbus-codegen-2.51.2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.10 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Default file manager for the GNOME desktop
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
-IUSE=gnome gtk-doc +introspection packagekit +previewer selinux sendto test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-3+ LGPL-2.1+
-PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
-RDEPEND=>=dev-libs/glib-2.55.1:2 >=media-libs/gexiv2-0.10.0 >=app-arch/gnome-autoar-0.2.1 >=gnome-base/gnome-desktop-3.0.0:3= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.22.26:3[X,introspection?] selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-2.0:= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) packagekit? ( app-admin/packagekit-base ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/nautilus/3.28/nautilus-3.28.1.tar.xz https://dev.gentoo.org/~leio/distfiles/nautilus-3.28.1-patchset.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7233c3f1a56ce9718020cf861e7028d3
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.30.5 b/metadata/md5-cache/gnome-base/nautilus-3.30.5
deleted file mode 100644
index e97b9ab52562..000000000000
--- a/metadata/md5-cache/gnome-base/nautilus-3.30.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.55.1:2 >=media-libs/gexiv2-0.10.0 >=app-arch/gnome-autoar-0.2.1 gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22.27:3[X,introspection?] seccomp? ( sys-libs/libseccomp ) >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-2.0:= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) >=dev-util/gdbus-codegen-2.51.2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.10 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Default file manager for the GNOME desktop
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
-IUSE=gnome gtk-doc +introspection packagekit +previewer seccomp selinux sendto test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-3+ LGPL-2.1+
-PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
-RDEPEND=>=dev-libs/glib-2.55.1:2 >=media-libs/gexiv2-0.10.0 >=app-arch/gnome-autoar-0.2.1 gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22.27:3[X,introspection?] seccomp? ( sys-libs/libseccomp ) >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-2.0:= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) packagekit? ( app-admin/packagekit-base ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/nautilus/3.30/nautilus-3.30.5.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4ed62fed9e9699f098e7d246121b8cc
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.30.5-r1 b/metadata/md5-cache/gnome-base/nautilus-3.30.5-r1
new file mode 100644
index 000000000000..ab86f680f082
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/nautilus-3.30.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.55.1:2 >=media-libs/gexiv2-0.10.0 >=app-arch/gnome-autoar-0.2.1 gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22.27:3[X,introspection?] seccomp? ( sys-libs/libseccomp ) >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-2.0:= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) >=dev-util/gdbus-codegen-2.51.2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.10 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Default file manager for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
+IUSE=gnome gtk-doc +introspection packagekit +previewer seccomp selinux sendto test
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-3+ LGPL-2.1+
+PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
+RDEPEND=>=dev-libs/glib-2.55.1:2 >=media-libs/gexiv2-0.10.0 >=app-arch/gnome-autoar-0.2.1 gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22.27:3[X,introspection?] seccomp? ( sys-libs/libseccomp ) >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-2.0:= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) packagekit? ( app-admin/packagekit-base ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/nautilus/3.30/nautilus-3.30.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8ab8268080d6ac2d782a8da2cf7903fe
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index b69f984e907b..8e184e1b1208 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1
index 1e8db6b68141..21d50bc7f183 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0/4
 SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/3.8.1.tar.gz -> cinnamon-desktop-3.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0bc1328707c9331de701921eafa6ed49
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-4.0.1 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-4.0.1
index e716e808d58e..a6d95aa55e9d 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-4.0.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0/4
 SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/4.0.1.tar.gz -> cinnamon-desktop-4.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e9a1bbb4cc863d7b0bcda2bba646474
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-3.8.0-r1 b/metadata/md5-cache/gnome-extra/cinnamon-session-3.8.0-r1
index c2e537698d12..8ccf702f52b3 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-session-3.8.0-r1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-session-3.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberr
 REQUIRED_USE=^^ ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/3.8.0.tar.gz -> cinnamon-session-3.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0fac3dda32722c42dd457338a53fefd2
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-4.0.0-r1 b/metadata/md5-cache/gnome-extra/cinnamon-session-4.0.0-r1
index d754c66ddf3f..77c40be2efda 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-session-4.0.0-r1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-session-4.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberr
 REQUIRED_USE=^^ ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/4.0.0.tar.gz -> cinnamon-session-4.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a074171f050e8e21eb4094a4e120acdf
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-3.30.3 b/metadata/md5-cache/gnome-extra/gnome-boxes-3.30.3
index 28ac577b56ef..9e60afba5a8f 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-3.30.3
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-3.30.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.52:2 >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.20:3[introspection] >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+),vala] >=sys-libs/libosinfo-1.1.0[vala] app-crypt/libsecret[vala] >=net-libs/libsoup-2.44:2.4[vala] virtual/libusb:1 >=app-emulation/libvirt-glib-0.2.3[vala] >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir,vala] app-misc/tracker:0/2.0 net-libs/webkit-gtk:4 >=virtual/libgudev-165:= rdp? ( net-misc/freerdp:= ) || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.52:2 >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.20:3[introspection] >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] >=sys-libs/libosinfo-1.1.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-0.2.3 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:0/2.0 net-libs/webkit-gtk:4 >=virtual/libgudev-165:= rdp? ( net-misc/freerdp:= ) || ( dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) net-libs/gtk-vnc[vala] sys-libs/libosinfo[vala] app-crypt/libsecret[vala] net-libs/libsoup:2.4[vala] app-emulation/libvirt-glib[vala] net-misc/spice-gtk[vala] dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Simple GNOME 3 application to access remote or virtual systems
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
 IUSE=rdp kernel_linux
 KEYWORDS=amd64
 LICENSE=LGPL-2+ CC-BY-2.0
-RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.52:2 >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.20:3[introspection] >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+),vala] >=sys-libs/libosinfo-1.1.0[vala] app-crypt/libsecret[vala] >=net-libs/libsoup-2.44:2.4[vala] virtual/libusb:1 >=app-emulation/libvirt-glib-0.2.3[vala] >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir,vala] app-misc/tracker:0/2.0 net-libs/webkit-gtk:4 >=virtual/libgudev-165:= rdp? ( net-misc/freerdp:= ) >=app-misc/tracker-miners-2[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools virtual/cdrtools sys-auth/polkit
+RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.52:2 >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.20:3[introspection] >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] >=sys-libs/libosinfo-1.1.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-0.2.3 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:0/2.0 net-libs/webkit-gtk:4 >=virtual/libgudev-165:= rdp? ( net-misc/freerdp:= ) >=app-misc/tracker-miners-2[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools virtual/cdrtools sys-auth/polkit
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/3.30/gnome-boxes-3.30.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=21ead0a7e426f322e08406bc866fae4c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bfbe19240ce7a151a029215a31832405
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.1 b/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.1
index ffd547905b35..9c30c17be924 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.1
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-3.30.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.19.3:3 >=x11-libs/gtksourceview-3.15.1:3.0[vala] >=net-libs/libsoup-2.42:2.4 dev-libs/libxml2:2 dev-libs/mpc:= dev-libs/mpfr:0=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calculator/3.30/gnome-calculator-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55694b35da8700380d2d6fe37f4eea60
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-3.32.2 b/metadata/md5-cache/gnome-extra/gnome-calculator-3.32.2
index 6b617b2036dd..a711af7f1f27 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-3.32.2
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-3.32.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.19.3:3 x11-libs/gtksourceview:4[vala] >=net-libs/libsoup-2.42:2.4 dev-libs/libxml2:2 dev-libs/mpc:= dev-libs/mpfr:0=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calculator/3.32/gnome-calculator-3.32.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4769b1e29e1252c7921743c17c8b220
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-3.30.1 b/metadata/md5-cache/gnome-extra/gnome-calendar-3.30.1
index facc6d4b1306..09eff51b4dae 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calendar-3.30.1
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-3.30.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calendar/3.30/gnome-calendar-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98405850f5cffd1a1eda20378c548c97
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-3.30.0 b/metadata/md5-cache/gnome-extra/gnome-characters-3.30.0
index df8913d0181d..0e155ec7df3d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-characters-3.30.0
+++ b/metadata/md5-cache/gnome-extra/gnome-characters-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ BSD
 RDEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5 >=x11-libs/gtk+-3.20:3[introspection] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.36[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-characters/3.30/gnome-characters-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f178945b6ad44c60ba8dc8ee7d2a605
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-3.30.1 b/metadata/md5-cache/gnome-extra/gnome-clocks-3.30.1
index 72d7816c555a..36b971eb0ac4 100644
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-3.30.1
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-3.30.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/libgweather-3.27.2:2=[vala] >=gnome-base/gnome-desktop-3.8:3= >=media-libs/gsound-0.98[vala] >=sci-geosciences/geocode-glib-1 >=app-misc/geoclue-2.4:2.0 >=x11-libs/gtk+-3.20:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-clocks/3.30/gnome-clocks-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d291b9757828a9f01fb65f7659b3549
diff --git a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1 b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1
index 45cc54762a6a..6f73a13e5208 100644
--- a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-1.3.1:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2:0= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-color-manager/3.30/gnome-color-manager-3.30.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=623a7390b36b28940c0364c8b1945152
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-3.30.2 b/metadata/md5-cache/gnome-extra/gnome-contacts-3.30.2
index 87e3abae3e90..339bfc2c02bb 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-3.30.2
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-3.30.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] >=dev-libs/glib-2.44:2 >=dev-libs/libgee-0.10:0.8 >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.22:3 v4l? ( >=media-video/cheese-3.5.91:= ) telepathy? ( >=net-libs/telepathy-glib-0.22 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-contacts/3.30/gnome-contacts-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c884cc1101a1fd9cf4337d972858dcf
diff --git a/metadata/md5-cache/gnome-extra/gnome-documents-3.30.1 b/metadata/md5-cache/gnome-extra/gnome-documents-3.30.1
index 60530d8cb73a..3f40167b7098 100644
--- a/metadata/md5-cache/gnome-extra/gnome-documents-3.30.1
+++ b/metadata/md5-cache/gnome-extra/gnome-documents-3.30.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-text/evince-3.13.3[introspection] app-misc/tracker:0/2.0 >=dev-libs/gjs-1.48.0 >=dev-libs/glib-2.39.3:2 gnome-base/gnome-desktop:3=[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.15:3[introspection] >=net-libs/libsoup-2.41.3:2.4 >=net-libs/webkit-gtk-2.6:4[introspection] >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] >=app-text/libgepub-0.6[introspection] <app-text/libgepub-0.7 >=net-libs/gnome-online-accounts-3.2.0[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] >=app-misc/tracker-miners-2 net-misc/gnome-online-miners sys-apps/dbus x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-documents/3.30/gnome-documents-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6931a2a0ef966e1e6a647e4a098b5edf
diff --git a/metadata/md5-cache/gnome-extra/gnome-logs-3.30.0 b/metadata/md5-cache/gnome-extra/gnome-logs-3.30.0
index 7936ee62df39..a2cb838869a8 100644
--- a/metadata/md5-cache/gnome-extra/gnome-logs-3.30.0
+++ b/metadata/md5-cache/gnome-extra/gnome-logs-3.30.0
@@ -10,5 +10,5 @@ RDEPEND=gnome-base/gsettings-desktop-schemas >=dev-libs/glib-2.43.90:2 >=x11-lib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-logs/3.30/gnome-logs-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cca551008464e958d01debee591b4c56
diff --git a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.30.0 b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.30.0
index e373ac18700a..ead057e35c2d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.30.0
+++ b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.30.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.15.3:3 >=app-admin/packagekit-base-0.9.1 systemd? ( sys-auth/polkit >=sys-apps/systemd-42 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-packagekit/3.30/gnome-packagekit-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e1118b1f9d84d1665855430dba6027f
diff --git a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.30.0 b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.30.0
index d18f367cd14a..e22743a563e2 100644
--- a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.30.0
+++ b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.30.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-power-manager/3.30/gnome-power-manager-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c875638f49ca19ac662fc314cb3acaea
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-20 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-20
deleted file mode 100644
index d3da73bb6680..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-20
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext
-DEFINED_PHASES=postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2
-DESCRIPTION=An icon taskbar for the Gnome Shell
-EAPI=7
-HOMEPAGE=https://github.com/home-sweet-gnome/dash-to-panel
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.18.0
-SLOT=0
-SRC_URI=https://github.com/home-sweet-gnome/dash-to-panel/archive/v20.tar.gz -> gnome-shell-extension-dash-to-panel-20.tar.gz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7d116921f54db015f00f2087bcd644f3
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-23 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-23
new file mode 100644
index 000000000000..4b2974f6186c
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-23
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool sys-devel/gettext
+DEFINED_PHASES=postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2
+DESCRIPTION=An icon taskbar for the Gnome Shell
+EAPI=7
+HOMEPAGE=https://github.com/home-sweet-gnome/dash-to-panel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.18.0
+SLOT=0
+SRC_URI=https://github.com/home-sweet-gnome/dash-to-panel/archive/v23.tar.gz -> gnome-shell-extension-dash-to-panel-23.tar.gz
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7d116921f54db015f00f2087bcd644f3
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.3 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.3
index af31304998eb..06ee909dcd60 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.3
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.30.0 >=gnome-base/nautilus-3.30.4 sys-apps/xdg-desktop-portal
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/World/ShellExtensions/desktop-icons/uploads/5de9fa81ff4ef1d16edcd96041063f91/desktop-icons-19.01.3.tar.xz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=29b2c0fd893491e97eddaaf206d715de
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.4 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.4
new file mode 100644
index 000000000000..6ea380665698
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-19.01.4
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=dev-libs/glib:2
+DESCRIPTION=A GNOME Shell extension for providing desktop icons
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/World/ShellExtensions/desktop-icons
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.30.0 >=gnome-base/nautilus-3.30.4 sys-apps/xdg-desktop-portal
+SLOT=0
+SRC_URI=https://gitlab.gnome.org/World/ShellExtensions/desktop-icons/uploads/2b03561a7d22912930d40a04ddb2bed9/desktop-icons-19.01.4.tar.xz
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9ff9bf41b9044339764f31ee6a8dd4f3
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-24 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-24
index 9192c4359c41..7e8051101490 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-24
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-24
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.48 >=gnome-base/gnome-shell-3.28 gnome-base/gvfs || ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks ) || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
 SLOT=0
 SRC_URI=https://github.com/andyholmes/gnome-shell-extension-gsconnect/archive/v24.tar.gz -> gnome-shell-extension-gsconnect-24.tar.gz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52c62f2de895595c56d46ff25e4bea15
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.30.1 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.30.1
index c96eff2e5134..0a67f315c49f 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.30.1
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.30.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.30/gnome-shell-extensions-3.30.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bc5be8b81d15450b486cd873f9e93ec0
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-3.30.6 b/metadata/md5-cache/gnome-extra/gnome-software-3.30.6
index a9e22fd131a8..4d60bc29d222 100644
--- a/metadata/md5-cache/gnome-extra/gnome-software-3.30.6
+++ b/metadata/md5-cache/gnome-extra/gnome-software-3.30.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/appstream-glib-0.7.14:0 >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22.4:3 >=dev-libs/json-glib-1.2.0 app-crypt/libsecret >=net-libs/libsoup-2.52.0:2.4 gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= ) spell? ( app-text/gspell:= ) sys-auth/polkit packagekit? ( >=app-admin/packagekit-base-1.1.0 ) firmware? ( >=sys-apps/fwupd-1.0.3 ) udev? ( virtual/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-software/3.30/gnome-software-3.30.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=773c27769080f6a0f030d4106b410892
diff --git a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.30.0 b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.30.0
index b02da65ed060..9e8155b9b868 100644
--- a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.30.0
+++ b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.30.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-cpp/glibmm-2.46:2 >=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=gnome-base/libgtop-2.37.2:2= >=gnome-base/librsvg-2.35:2 >=dev-libs/libxml2-2.0:2 X? ( >=x11-libs/libwnck-2.91.0:3 ) systemd? ( >=sys-apps/systemd-44:0= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-system-monitor/3.30/gnome-system-monitor-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=669f1e692af63227b2d8b6fc0fcbe3ce
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-3.30.2 b/metadata/md5-cache/gnome-extra/gnome-tweaks-3.30.2
index 00699102ad21..b69840f9dfc4 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweaks-3.30.2
+++ b/metadata/md5-cache/gnome-extra/gnome-tweaks-3.30.2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tweaks/3.30/gnome-tweaks-3.30.2.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d974ccec414b2b75c6edc5fc8458804
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-12.0.1 b/metadata/md5-cache/gnome-extra/gucharmap-12.0.1
index f16aaba49ac3..edafeadc4f75 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-12.0.1
+++ b/metadata/md5-cache/gnome-extra/gucharmap-12.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Unicode character map viewer and library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
 IUSE=debug +introspection test vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-3+
 RDEPEND==app-i18n/unicode-data-12.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] media-libs/freetype:2 introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/12.0/gucharmap-12.0.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d91694cdf0d06e8f4526d6f434bcac68
+_md5_=3f9a71122f90b0f855e97d07f5b2bb1e
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.45 b/metadata/md5-cache/gnome-extra/libgsf-1.14.45
index 2975d7d1afca..33f4b364e5f1 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.45
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.45
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= ) >=dev-util/gtk-doc-am-1.12 >=dev-util/intltool-0.35.0 dev-libs/gobject-introspection-common virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= ) >=dev-util/gtk-doc-am-1.12 >=dev-util/intltool-0.35.0 dev-libs/gobject-introspection-common virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=The GNOME Structured File Library
 EAPI=6
 HOMEPAGE=https://developer.gnome.org/gsf/
 IUSE=bzip2 gtk +introspection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
+RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
 SLOT=0/114
 SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.45.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ea4188941d19bd843d4a24ebb958290
+_md5_=a31d9f366d03d3127d91c14a3037e7df
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.46 b/metadata/md5-cache/gnome-extra/libgsf-1.14.46
new file mode 100644
index 000000000000..73762f2935d7
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.46
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= ) >=dev-util/gtk-doc-am-1.12 dev-libs/gobject-introspection-common >=sys-devel/gettext-0.19.4 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The GNOME Structured File Library
+EAPI=6
+HOMEPAGE=https://developer.gnome.org/gsf/
+IUSE=bzip2 gtk +introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
+SLOT=0/114
+SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.46.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=33171053491411c72802b46074c5e52f
diff --git a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6 b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6
index 89f74626b5fe..3239b2de6197 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6
+++ b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.25.9:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus-sendto/3.8/nautilus-sendto-3.8.6.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=083160bca37758b8abfd2dd221674792
diff --git a/metadata/md5-cache/gnome-extra/nemo-3.8.6-r1 b/metadata/md5-cache/gnome-extra/nemo-3.8.6-r1
index 276d920612c7..050a75169eb3 100644
--- a/metadata/md5-cache/gnome-extra/nemo-3.8.6-r1
+++ b/metadata/md5-cache/gnome-extra/nemo-3.8.6-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo/archive/3.8.6.tar.gz -> nemo-3.8.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a468b6e530419cec96ca7f90ac0bb6e
diff --git a/metadata/md5-cache/gnome-extra/nemo-4.0.6 b/metadata/md5-cache/gnome-extra/nemo-4.0.6
index b2e01278ed55..45c7de6a586d 100644
--- a/metadata/md5-cache/gnome-extra/nemo-4.0.6
+++ b/metadata/md5-cache/gnome-extra/nemo-4.0.6
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo/archive/4.0.6.tar.gz -> nemo-4.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e228c2766ea73d486226965ab998078a
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.8.22 b/metadata/md5-cache/gnome-extra/nm-applet-1.8.22
index 07745664df05..9ee76d577852 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.8.22
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.8.22
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info ayatana? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) >=dev-util/gtk-doc-am-1.0 >=dev-util/intltool-0.50.1 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info ayatana? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) >=dev-util/gtk-doc-am-1.0 >=sys-devel/gettext-0.18 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNOME applet for NetworkManager
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=ayatana +introspection +gcr +modemmanager selinux teamd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 PDEPEND=virtual/notification-daemon
 RDEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info ayatana? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.22.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50979a0b913221a3659e33f806970f1d
+_md5_=a775fcef89939f04565e33c18707be68
diff --git a/metadata/md5-cache/gnustep-base/Manifest.gz b/metadata/md5-cache/gnustep-base/Manifest.gz
index 5a8b24f9cc6b..93d332fe390e 100644
--- a/metadata/md5-cache/gnustep-base/Manifest.gz
+++ b/metadata/md5-cache/gnustep-base/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-base/libobjc2-2.0 b/metadata/md5-cache/gnustep-base/libobjc2-2.0
new file mode 100644
index 000000000000..6f4736909925
--- /dev/null
+++ b/metadata/md5-cache/gnustep-base/libobjc2-2.0
@@ -0,0 +1,13 @@
+BDEPEND=boehm-gc? ( dev-libs/boehm-gc ) sys-libs/libcxx sys-devel/clang dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=GNUstep Objective-C runtime
+EAPI=7
+HOMEPAGE=http://www.gnustep.org
+IUSE=boehm-gc test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=boehm-gc? ( dev-libs/boehm-gc ) sys-libs/libcxx
+SLOT=0
+SRC_URI=https://github.com/gnustep/libobjc2/archive/v2.0.tar.gz -> libobjc2-2.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=783f2ee8f6ea0d98216e8f9e93b59848
diff --git a/metadata/md5-cache/gnustep-libs/Manifest.gz b/metadata/md5-cache/gnustep-libs/Manifest.gz
index 25a86a8b147b..30f1fe3cfc2b 100644
--- a/metadata/md5-cache/gnustep-libs/Manifest.gz
+++ b/metadata/md5-cache/gnustep-libs/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-libs/sope-3.2.10 b/metadata/md5-cache/gnustep-libs/sope-3.2.10
deleted file mode 100644
index 9a141085f6b1..000000000000
--- a/metadata/md5-cache/gnustep-libs/sope-3.2.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=A set of frameworks forming a complete Web application server environment
-EAPI=6
-HOMEPAGE=http://www.sogo.nu/
-IUSE=gnutls ldap libressl mysql postgres +ssl +xml debug doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
-SLOT=0
-SRC_URI=https://github.com/inverse-inc/sope/archive/SOPE-3.2.10.tar.gz -> sope-3.2.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnustep-2	836726825908137cacbf1063f76adb4c	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=2046f6bfe44c968c59486d61630c1026
diff --git a/metadata/md5-cache/gnustep-libs/sope-3.2.10-r1 b/metadata/md5-cache/gnustep-libs/sope-3.2.10-r1
new file mode 100644
index 000000000000..7175f1b07420
--- /dev/null
+++ b/metadata/md5-cache/gnustep-libs/sope-3.2.10-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A set of frameworks forming a complete Web application server environment
+EAPI=6
+HOMEPAGE=http://www.sogo.nu/
+IUSE=gnutls ldap libressl mysql postgres +ssl +xml debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/inverse-inc/sope/archive/SOPE-3.2.10.tar.gz -> sope-3.2.10.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnustep-2	836726825908137cacbf1063f76adb4c	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=037fc23079f035c8540b658e90a858e6
diff --git a/metadata/md5-cache/gnustep-libs/sope-3.2.9 b/metadata/md5-cache/gnustep-libs/sope-3.2.9
deleted file mode 100644
index 4368bf0a816c..000000000000
--- a/metadata/md5-cache/gnustep-libs/sope-3.2.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=A set of frameworks forming a complete Web application server environment
-EAPI=6
-HOMEPAGE=http://www.sogo.nu/
-IUSE=gnutls ldap libressl mysql postgres +ssl +xml debug doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
-SLOT=0
-SRC_URI=https://github.com/inverse-inc/sope/archive/SOPE-3.2.9.tar.gz -> sope-3.2.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnustep-2	836726825908137cacbf1063f76adb4c	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=2046f6bfe44c968c59486d61630c1026
diff --git a/metadata/md5-cache/gnustep-libs/sope-3.2.9-r1 b/metadata/md5-cache/gnustep-libs/sope-3.2.9-r1
new file mode 100644
index 000000000000..5e343fe8dddb
--- /dev/null
+++ b/metadata/md5-cache/gnustep-libs/sope-3.2.9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A set of frameworks forming a complete Web application server environment
+EAPI=6
+HOMEPAGE=http://www.sogo.nu/
+IUSE=gnutls ldap libressl mysql postgres +ssl +xml debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/inverse-inc/sope/archive/SOPE-3.2.9.tar.gz -> sope-3.2.9.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnustep-2	836726825908137cacbf1063f76adb4c	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=037fc23079f035c8540b658e90a858e6
diff --git a/metadata/md5-cache/gnustep-libs/sope-4.0.7 b/metadata/md5-cache/gnustep-libs/sope-4.0.7
deleted file mode 100644
index 7cb0449e8949..000000000000
--- a/metadata/md5-cache/gnustep-libs/sope-4.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=A set of frameworks forming a complete Web application server environment
-EAPI=6
-HOMEPAGE=http://www.sogo.nu/
-IUSE=gnutls ldap libressl mysql postgres +ssl +xml debug doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
-SLOT=0
-SRC_URI=https://github.com/inverse-inc/sope/archive/SOPE-4.0.7.tar.gz -> sope-4.0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnustep-2	836726825908137cacbf1063f76adb4c	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=67fd148b38912f95a2ff32aff7497ba6
diff --git a/metadata/md5-cache/gnustep-libs/sope-4.0.7-r1 b/metadata/md5-cache/gnustep-libs/sope-4.0.7-r1
new file mode 100644
index 000000000000..bf9fb37a0521
--- /dev/null
+++ b/metadata/md5-cache/gnustep-libs/sope-4.0.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A set of frameworks forming a complete Web application server environment
+EAPI=6
+HOMEPAGE=http://www.sogo.nu/
+IUSE=gnutls ldap libressl mysql postgres +ssl +xml debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/inverse-inc/sope/archive/SOPE-4.0.7.tar.gz -> sope-4.0.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnustep-2	836726825908137cacbf1063f76adb4c	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=d380502166c2240b3ca14b7c4c9c6af1
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 54b08a10c2d4..199fd92d6a09 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/grim-1.2.0 b/metadata/md5-cache/gui-apps/grim-1.2.0
index fc07a4da8381..8d58025469be 100644
--- a/metadata/md5-cache/gui-apps/grim-1.2.0
+++ b/metadata/md5-cache/gui-apps/grim-1.2.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-protocols-1.14 dev-libs/wayland jpeg? ( virtual/jpeg ) x11-libs/cairo
 SLOT=0
 SRC_URI=https://github.com/emersion/grim/archive/v1.2.0.tar.gz -> grim-1.2.0.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=dc194a3019135967f11953c2fa8bad76
diff --git a/metadata/md5-cache/gui-apps/grim-9999 b/metadata/md5-cache/gui-apps/grim-9999
index d41da813a38d..db2d0330081c 100644
--- a/metadata/md5-cache/gui-apps/grim-9999
+++ b/metadata/md5-cache/gui-apps/grim-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/wayland-protocols-1.14 dev-libs/wayland jpeg? ( virtual/jpeg ) x11-libs/cairo
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=dc194a3019135967f11953c2fa8bad76
diff --git a/metadata/md5-cache/gui-apps/mako-1.3 b/metadata/md5-cache/gui-apps/mako-1.3
index e6eaf15ab985..e89aa8c71bb8 100644
--- a/metadata/md5-cache/gui-apps/mako-1.3
+++ b/metadata/md5-cache/gui-apps/mako-1.3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/pango x11-libs/cairo || ( sys-apps/systemd sys-auth/elogind ) sys-apps/dbus[user-session] icons? ( x11-libs/gtk+:3 x11-libs/gdk-pixbuf )
 SLOT=0
 SRC_URI=https://github.com/emersion/mako/archive/v1.3.tar.gz -> mako-1.3.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=82b0cbbb6af2ce10dbe74a46580a1be8
diff --git a/metadata/md5-cache/gui-apps/mako-1.4 b/metadata/md5-cache/gui-apps/mako-1.4
index 66754de3106b..b8f12ed9592a 100644
--- a/metadata/md5-cache/gui-apps/mako-1.4
+++ b/metadata/md5-cache/gui-apps/mako-1.4
@@ -5,10 +5,10 @@ DESCRIPTION=A lightweight notification daemon for Wayland. Works on Sway.
 EAPI=7
 HOMEPAGE=https://github.com/emersion/mako
 IUSE=+icons
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/pango x11-libs/cairo || ( sys-apps/systemd sys-auth/elogind ) sys-apps/dbus[user-session] icons? ( x11-libs/gtk+:3 x11-libs/gdk-pixbuf )
 SLOT=0
 SRC_URI=https://github.com/emersion/mako/archive/v1.4.tar.gz -> mako-1.4.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8f32dfe76f36e5bada6568c87347f2e4
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=82b0cbbb6af2ce10dbe74a46580a1be8
diff --git a/metadata/md5-cache/gui-apps/mako-9999 b/metadata/md5-cache/gui-apps/mako-9999
index 726d12b59ce3..20021e9db096 100644
--- a/metadata/md5-cache/gui-apps/mako-9999
+++ b/metadata/md5-cache/gui-apps/mako-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/wayland x11-libs/pango x11-libs/cairo || ( sys-apps/systemd sys-auth/elogind ) sys-apps/dbus[user-session] icons? ( x11-libs/gtk+:3 x11-libs/gdk-pixbuf )
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=8f32dfe76f36e5bada6568c87347f2e4
diff --git a/metadata/md5-cache/gui-apps/slurp-1.2.0 b/metadata/md5-cache/gui-apps/slurp-1.2.0
index 3077b26d4cbd..a560b1cee364 100644
--- a/metadata/md5-cache/gui-apps/slurp-1.2.0
+++ b/metadata/md5-cache/gui-apps/slurp-1.2.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-protocols-1.14 dev-libs/wayland x11-libs/cairo
 SLOT=0
 SRC_URI=https://github.com/emersion/slurp/archive/v1.2.0.tar.gz -> slurp-1.2.0.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=6ebfe87dbc45e82e0c67fb065ceb011a
diff --git a/metadata/md5-cache/gui-apps/slurp-9999 b/metadata/md5-cache/gui-apps/slurp-9999
index bcd44942c4d8..4e77c5ce35d9 100644
--- a/metadata/md5-cache/gui-apps/slurp-9999
+++ b/metadata/md5-cache/gui-apps/slurp-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/wayland-protocols-1.14 dev-libs/wayland x11-libs/cairo
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=4226ad4345f556b1f37e69131061997c
diff --git a/metadata/md5-cache/gui-apps/swaybg-1.0 b/metadata/md5-cache/gui-apps/swaybg-1.0
index bb829562d03d..198ff75b5854 100644
--- a/metadata/md5-cache/gui-apps/swaybg-1.0
+++ b/metadata/md5-cache/gui-apps/swaybg-1.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/wayland !<gui-wm/sway-1.1_alpha1
 SLOT=0
 SRC_URI=https://github.com/swaywm/swaybg/archive/1.0.tar.gz -> swaybg-1.0.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=9462f7e5ca1c3ad231114f473c5337bf
diff --git a/metadata/md5-cache/gui-apps/swaybg-9999 b/metadata/md5-cache/gui-apps/swaybg-9999
index 1f3ea4d96ef1..922a061c732a 100644
--- a/metadata/md5-cache/gui-apps/swaybg-9999
+++ b/metadata/md5-cache/gui-apps/swaybg-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/wayland !<gui-wm/sway-1.1_alpha1
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=517523ed0d000e37720f4f17ecdae7e7
diff --git a/metadata/md5-cache/gui-apps/swayidle-1.2 b/metadata/md5-cache/gui-apps/swayidle-1.2
index b70d969e8d00..6a8e5735369a 100644
--- a/metadata/md5-cache/gui-apps/swayidle-1.2
+++ b/metadata/md5-cache/gui-apps/swayidle-1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd?
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/swayidle/archive/1.2.tar.gz -> swayidle-1.2.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2e3132f6cb46ba1079cb93f0aac49364
diff --git a/metadata/md5-cache/gui-apps/swayidle-1.3 b/metadata/md5-cache/gui-apps/swayidle-1.3
index 1a955e957088..a91d1078f4e2 100644
--- a/metadata/md5-cache/gui-apps/swayidle-1.3
+++ b/metadata/md5-cache/gui-apps/swayidle-1.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd?
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/swayidle/archive/1.3.tar.gz -> swayidle-1.3.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2e3132f6cb46ba1079cb93f0aac49364
diff --git a/metadata/md5-cache/gui-apps/swayidle-1.5 b/metadata/md5-cache/gui-apps/swayidle-1.5
index abddae523bed..facb93155f65 100644
--- a/metadata/md5-cache/gui-apps/swayidle-1.5
+++ b/metadata/md5-cache/gui-apps/swayidle-1.5
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd?
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/swayidle/archive/1.5.tar.gz -> swayidle-1.5.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2e3132f6cb46ba1079cb93f0aac49364
diff --git a/metadata/md5-cache/gui-apps/swayidle-9999 b/metadata/md5-cache/gui-apps/swayidle-9999
index 4b5ce3af7df5..56d87f6cd6aa 100644
--- a/metadata/md5-cache/gui-apps/swayidle-9999
+++ b/metadata/md5-cache/gui-apps/swayidle-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/wayland elogind? ( >=sys-auth/elogind-237[policykit] ) systemd? ( >=sys-apps/systemd-237[policykit] ) !<=gui-wm/sway-1.0_beta1 !~gui-wm/sway-1.0_beta2[swayidle]
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2fee6767df9e656ae5954e44262579b3
diff --git a/metadata/md5-cache/gui-apps/swaylock-1.3 b/metadata/md5-cache/gui-apps/swaylock-1.3
index 31813cda5a23..7638b2da6747 100644
--- a/metadata/md5-cache/gui-apps/swaylock-1.3
+++ b/metadata/md5-cache/gui-apps/swaylock-1.3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( virtual/pam ) !<=gui-libs/sway-1.0_beta2[swaylock]
 SLOT=0
 SRC_URI=https://github.com/swaywm/swaylock/archive/1.3.tar.gz -> swaylock-1.3.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=c15ffc2d1ccf4e9265c07cada5a76660
diff --git a/metadata/md5-cache/gui-apps/swaylock-1.4 b/metadata/md5-cache/gui-apps/swaylock-1.4
index fd25963c955d..21b48d1e822a 100644
--- a/metadata/md5-cache/gui-apps/swaylock-1.4
+++ b/metadata/md5-cache/gui-apps/swaylock-1.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( virtual/pam ) !<=gui-wm/sway-1.0_beta2[swaylock]
 SLOT=0
 SRC_URI=https://github.com/swaywm/swaylock/archive/1.4.tar.gz -> swaylock-1.4.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=436faa5e09d871a43575c3efa3b5939a
diff --git a/metadata/md5-cache/gui-apps/swaylock-9999 b/metadata/md5-cache/gui-apps/swaylock-9999
index 0b6867d593d0..4c15b0e3311d 100644
--- a/metadata/md5-cache/gui-apps/swaylock-9999
+++ b/metadata/md5-cache/gui-apps/swaylock-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( virtual/pam ) !<=gui-wm/sway-1.0_beta2[swaylock]
 SLOT=0
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=436faa5e09d871a43575c3efa3b5939a
diff --git a/metadata/md5-cache/gui-apps/waybar-0.7.2 b/metadata/md5-cache/gui-apps/waybar-0.7.2
deleted file mode 100644
index 11d51a7624fc..000000000000
--- a/metadata/md5-cache/gui-apps/waybar-0.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots libcxx? ( sys-libs/libcxx ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
-DESCRIPTION=Highly customizable Wayland bar for Sway and Wlroots based compositors.
-EAPI=7
-HOMEPAGE=https://github.com/Alexays/Waybar
-IUSE=libcxx mpd network pulseaudio tray +udev
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots libcxx? ( sys-libs/libcxx ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
-SLOT=0
-SRC_URI=https://github.com/Alexays/Waybar/archive/0.7.2.tar.gz -> waybar-0.7.2.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e84855562436f5d6113332516f58f9f6
diff --git a/metadata/md5-cache/gui-apps/waybar-0.7.2-r1 b/metadata/md5-cache/gui-apps/waybar-0.7.2-r1
new file mode 100644
index 000000000000..16b63ae26b0f
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/waybar-0.7.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:0/5 >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots libcxx? ( sys-libs/libcxx ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
+DESCRIPTION=Highly customizable Wayland bar for Sway and Wlroots based compositors.
+EAPI=7
+HOMEPAGE=https://github.com/Alexays/Waybar
+IUSE=libcxx mpd network pulseaudio tray +udev
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:0/5 >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots libcxx? ( sys-libs/libcxx ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
+SLOT=0
+SRC_URI=https://github.com/Alexays/Waybar/archive/0.7.2.tar.gz -> waybar-0.7.2.tar.gz
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=3c105445f78721826d7b3d28d8cc2078
diff --git a/metadata/md5-cache/gui-apps/waybar-9999 b/metadata/md5-cache/gui-apps/waybar-9999
index a1acea74c63b..107882385622 100644
--- a/metadata/md5-cache/gui-apps/waybar-9999
+++ b/metadata/md5-cache/gui-apps/waybar-9999
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots libcxx? ( sys-libs/libcxx ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
+DEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:0/5 >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots libcxx? ( sys-libs/libcxx ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
 DESCRIPTION=Highly customizable Wayland bar for Sway and Wlroots based compositors.
 EAPI=7
 HOMEPAGE=https://github.com/Alexays/Waybar
 IUSE=libcxx mpd network pulseaudio tray +udev
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots libcxx? ( sys-libs/libcxx ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
+RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:0/5 >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots libcxx? ( sys-libs/libcxx ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e84855562436f5d6113332516f58f9f6
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=3c105445f78721826d7b3d28d8cc2078
diff --git a/metadata/md5-cache/gui-apps/wl-clipboard-1.0.0 b/metadata/md5-cache/gui-apps/wl-clipboard-1.0.0
index cb43d47e8933..1053bbde8bf0 100644
--- a/metadata/md5-cache/gui-apps/wl-clipboard-1.0.0
+++ b/metadata/md5-cache/gui-apps/wl-clipboard-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/wayland
 SLOT=0
 SRC_URI=https://github.com/bugaevc/wl-clipboard/archive/v1.0.0.tar.gz -> wl-clipboard-1.0.0.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=3d4c7f47817920f7b11f31d749b2c2b5
diff --git a/metadata/md5-cache/gui-apps/wl-clipboard-9999 b/metadata/md5-cache/gui-apps/wl-clipboard-9999
index 5f0c75732ccd..ed5c9820f01c 100644
--- a/metadata/md5-cache/gui-apps/wl-clipboard-9999
+++ b/metadata/md5-cache/gui-apps/wl-clipboard-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/wayland
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=8c4aaab0390322160019f154cdc6da3b
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index c7657b68ff67..8b3e6bbe9ae6 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/libhandy-0.0.9 b/metadata/md5-cache/gui-libs/libhandy-0.0.9
index 52ce7a60a3da..8123a833d837 100644
--- a/metadata/md5-cache/gui-libs/libhandy-0.0.9
+++ b/metadata/md5-cache/gui-libs/libhandy-0.0.9
@@ -5,12 +5,12 @@ DESCRIPTION=Library with GTK widgets for mobile phones
 EAPI=7
 HOMEPAGE=https://source.puri.sm/Librem5/libhandy/
 IUSE=examples glade gtk-doc +introspection test vala test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.24.1:3[introspection?] glade? ( dev-util/glade:3.10= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0.0/0
 SRC_URI=https://source.puri.sm/Librem5/libhandy/-/archive/v0.0.9/libhandy-v0.0.9.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=49e7ce02cd5c52ac40f92fee329da9df
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa8755c12526c9403195f2b0569377d2
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.4.1 b/metadata/md5-cache/gui-libs/wlroots-0.4.1
index c42611daf81b..cf155dd82dbb 100644
--- a/metadata/md5-cache/gui-libs/wlroots-0.4.1
+++ b/metadata/md5-cache/gui-libs/wlroots-0.4.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libinput-1.7.0:0= >=dev-libs/wayland-1.16.0 media-libs/mesa[e
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/wlroots/archive/0.4.1.tar.gz -> wlroots-0.4.1.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=6607767988f98016342f7ae725d80f50
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.5.0 b/metadata/md5-cache/gui-libs/wlroots-0.5.0
index eeab2d0c1b5a..543fcec904bb 100644
--- a/metadata/md5-cache/gui-libs/wlroots-0.5.0
+++ b/metadata/md5-cache/gui-libs/wlroots-0.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libinput-1.7.0:0= >=dev-libs/wayland-1.16.0 media-libs/mesa[e
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/wlroots/archive/0.5.0.tar.gz -> wlroots-0.5.0.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=e957d01bdb84ba1993d11d035f474bdc
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.6.0 b/metadata/md5-cache/gui-libs/wlroots-0.6.0
index 8d2c26985625..c8abe6ee51fd 100644
--- a/metadata/md5-cache/gui-libs/wlroots-0.6.0
+++ b/metadata/md5-cache/gui-libs/wlroots-0.6.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libinput-1.9.0:0= >=dev-libs/wayland-1.17.0 media-libs/mesa[e
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/swaywm/wlroots/archive/0.6.0.tar.gz -> wlroots-0.6.0.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=f4dcce4e05ed309ff09990677a983bbb
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.7.0 b/metadata/md5-cache/gui-libs/wlroots-0.7.0
new file mode 100644
index 000000000000..076a1c6f50e5
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/wlroots-0.7.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-libs/wayland-protocols-1.17 virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=>=dev-libs/libinput-1.9.0:0= >=dev-libs/wayland-1.17.0 media-libs/mesa[egl,gles2,gbm] virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman elogind? ( >=sys-auth/elogind-237 ) icccm? ( x11-libs/xcb-util-wm ) systemd? ( >=sys-apps/systemd-237 ) x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image ) filecaps? ( sys-libs/libcap )
+DESCRIPTION=Pluggable, composable, unopinionated modules for building a Wayland compositor
+EAPI=7
+HOMEPAGE=https://github.com/swaywm/wlroots
+IUSE=elogind icccm systemd x11-backend X +filecaps
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libinput-1.9.0:0= >=dev-libs/wayland-1.17.0 media-libs/mesa[egl,gles2,gbm] virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman elogind? ( >=sys-auth/elogind-237 ) icccm? ( x11-libs/xcb-util-wm ) systemd? ( >=sys-apps/systemd-237 ) x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image )
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0/7
+SRC_URI=https://github.com/swaywm/wlroots/archive/0.7.0.tar.gz -> wlroots-0.7.0.tar.gz
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=7be554a55bc96d9bf032a5f8505cb79a
diff --git a/metadata/md5-cache/gui-libs/wlroots-9999 b/metadata/md5-cache/gui-libs/wlroots-9999
index f7aaf9da2aba..c5f71ed64e0b 100644
--- a/metadata/md5-cache/gui-libs/wlroots-9999
+++ b/metadata/md5-cache/gui-libs/wlroots-9999
@@ -4,11 +4,11 @@ DEPEND=>=dev-libs/libinput-1.9.0:0= >=dev-libs/wayland-1.17.0 media-libs/mesa[eg
 DESCRIPTION=Pluggable, composable, unopinionated modules for building a Wayland compositor
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/wlroots
-IUSE=elogind icccm rootston systemd x11-backend X +filecaps
+IUSE=elogind icccm systemd x11-backend X +filecaps
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/libinput-1.9.0:0= >=dev-libs/wayland-1.17.0 media-libs/mesa[egl,gles2,gbm] virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman elogind? ( >=sys-auth/elogind-237 ) icccm? ( x11-libs/xcb-util-wm ) systemd? ( >=sys-apps/systemd-237 ) x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image )
 REQUIRED_USE=?? ( elogind systemd )
-SLOT=0
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=dd68c3a36b3f59cf574c81442ea003c4
+SLOT=0/9999
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8ae42ae772af7d2d3bd761cb4912f1c5
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 61e492ca3d63..b6e9b973fa63 100644
--- a/metadata/md5-cache/gui-wm/Manifest.gz
+++ b/metadata/md5-cache/gui-wm/Manifest.gz
diff --git a/metadata/md5-cache/gui-wm/sway-1.0 b/metadata/md5-cache/gui-wm/sway-1.0
index 74dd13928384..bcf55c3d1e84 100644
--- a/metadata/md5-cache/gui-wm/sway-1.0
+++ b/metadata/md5-cache/gui-wm/sway-1.0
@@ -11,5 +11,5 @@ RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-
 REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
 SLOT=0
 SRC_URI=https://github.com/swaywm/sway/archive/1.0.tar.gz -> sway-1.0.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=5585b1131eb38d3a0fd3968e1fd1cfa4
diff --git a/metadata/md5-cache/gui-wm/sway-1.1.1 b/metadata/md5-cache/gui-wm/sway-1.1.1
index 193daca2d98a..ef99789cdeeb 100644
--- a/metadata/md5-cache/gui-wm/sway-1.1.1
+++ b/metadata/md5-cache/gui-wm/sway-1.1.1
@@ -11,5 +11,5 @@ RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-
 REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
 SLOT=0
 SRC_URI=https://github.com/swaywm/sway/archive/1.1.1.tar.gz -> sway-1.1.1.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=ffd16365d553dcc69c2b0456c5280e41
diff --git a/metadata/md5-cache/gui-wm/sway-1.2 b/metadata/md5-cache/gui-wm/sway-1.2
new file mode 100644
index 000000000000..7cb60a6fc38f
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/sway-1.2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-libs/wayland-protocols-1.14 virtual/pkgconfig man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.7.0:=[elogind=,systemd=,X=]
+DESCRIPTION=i3-compatible Wayland window manager
+EAPI=7
+HOMEPAGE=https://swaywm.org
+IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.7.0:=[elogind=,systemd=,X=]
+REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
+SLOT=0
+SRC_URI=https://github.com/swaywm/sway/archive/1.2.tar.gz -> sway-1.2.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=bc83a0ae835239b9238cc46535f21d1a
diff --git a/metadata/md5-cache/gui-wm/sway-9999 b/metadata/md5-cache/gui-wm/sway-9999
index 5926ef763c11..ad4805af495f 100644
--- a/metadata/md5-cache/gui-wm/sway-9999
+++ b/metadata/md5-cache/gui-wm/sway-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-libs/wayland-protocols-1.14 virtual/pkgconfig man? ( ~app-text/scdoc-9999 ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999[elogind=,systemd=,X=]
+DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]
 DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
 HOMEPAGE=https://swaywm.org
 IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999[elogind=,systemd=,X=]
+RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]
 REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c60b3e3651382762c9d934ec1424eece
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=bc83a0ae835239b9238cc46535f21d1a
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index e8eedb46d76a..0052cc03ea51 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-19.04.3-r1 b/metadata/md5-cache/kde-apps/kross-interpreters-19.04.3-r1
index 7f5e15b0a847..886de71639a5 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-19.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-19.04.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Kross interpreter plugins for programming languages
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+python ruby debug python_targets_python2_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kross-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/19.04.3/src/kross-interpreters-19.04.3.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8a8dbe6eacc0ac54a754f4dc9980808
+_md5_=9257b1663929db434608b06089f84d9b
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index bb6fa64b539d..12abcc0a431b 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/kio-gdrive-1.2.6-r1 b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.6-r1
deleted file mode 100644
index 798226cca4ec..000000000000
--- a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-apps/libkgapi-19.08.0:5 >=dev-qt/qtwidgets-5.12.3:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.08.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KIO Slave for Google Drive service
-EAPI=7
-HOMEPAGE=https://phabricator.kde.org/project/profile/72/
-IUSE=+kaccounts debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-apps/libkgapi-19.08.0:5 >=dev-qt/qtwidgets-5.12.3:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.08.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) kaccounts? ( >=kde-apps/kaccounts-providers-19.08.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kio-gdrive/1.2.6/src/kio-gdrive-1.2.6.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=847b8ff7bf27332a827215f0dc3ed54b
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.7 b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.7
new file mode 100644
index 000000000000..8d35bc17fcc3
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-apps/libkgapi-19.08.0:5 >=dev-qt/qtwidgets-5.12.3:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.08.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KIO Slave for Google Drive service
+EAPI=7
+HOMEPAGE=https://phabricator.kde.org/project/profile/72/
+IUSE=+kaccounts debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-apps/libkgapi-19.08.0:5 >=dev-qt/qtwidgets-5.12.3:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.08.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) kaccounts? ( >=kde-apps/kaccounts-providers-19.08.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kio-gdrive/1.2.7/src/kio-gdrive-1.2.7.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5e8141941096cd1c2697268410c5cfc2
diff --git a/metadata/md5-cache/kde-misc/krusader-2.7.2 b/metadata/md5-cache/kde-misc/krusader-2.7.2
new file mode 100644
index 000000000000..f24587f5ec78
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/krusader-2.7.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-apps/acl sys-libs/zlib >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Advanced twin-panel (commander-style) file-manager with many extras
+EAPI=7
+HOMEPAGE=https://krusader.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-apps/acl sys-libs/zlib >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/krusader/2.7.2/krusader-2.7.2.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=59c11ae96f6f836a7e03f8a45132569b
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.9.0 b/metadata/md5-cache/kde-misc/latte-dock-0.9.0
deleted file mode 100644
index 1f3d3d581078..000000000000
--- a/metadata/md5-cache/kde-misc/latte-dock-0.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.60.0 >=kde-frameworks/karchive-5.60.0 >=kde-frameworks/kconfig-5.60.0 >=kde-frameworks/kcoreaddons-5.60.0 >=kde-frameworks/kcrash-5.60.0 >=kde-frameworks/kdbusaddons-5.60.0 >=kde-frameworks/kdeclarative-5.60.0 >=kde-frameworks/kglobalaccel-5.60.0 >=kde-frameworks/kguiaddons-5.60.0 >=kde-frameworks/ki18n-5.60.0 >=kde-frameworks/kiconthemes-5.60.0 >=kde-frameworks/knewstuff-5.60.0 >=kde-frameworks/knotifications-5.60.0 >=kde-frameworks/kpackage-5.60.0 >=kde-frameworks/kwayland-5.60.0 >=kde-frameworks/kwindowsystem-5.60.0 >=kde-frameworks/kxmlgui-5.60.0 >=kde-frameworks/plasma-5.60.0[X] >=kde-plasma/libksysguard-5.15.5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[xcb] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Elegant dock, based on KDE Frameworks
-EAPI=7
-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.60.0 >=kde-frameworks/karchive-5.60.0 >=kde-frameworks/kconfig-5.60.0 >=kde-frameworks/kcoreaddons-5.60.0 >=kde-frameworks/kcrash-5.60.0 >=kde-frameworks/kdbusaddons-5.60.0 >=kde-frameworks/kdeclarative-5.60.0 >=kde-frameworks/kglobalaccel-5.60.0 >=kde-frameworks/kguiaddons-5.60.0 >=kde-frameworks/ki18n-5.60.0 >=kde-frameworks/kiconthemes-5.60.0 >=kde-frameworks/knewstuff-5.60.0 >=kde-frameworks/knotifications-5.60.0 >=kde-frameworks/kpackage-5.60.0 >=kde-frameworks/kwayland-5.60.0 >=kde-frameworks/kwindowsystem-5.60.0 >=kde-frameworks/kxmlgui-5.60.0 >=kde-frameworks/plasma-5.60.0[X] >=kde-plasma/libksysguard-5.15.5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[xcb] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=0
-SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.9.0.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ec694d7cead7593cf912f9fbecce3222
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.9.2 b/metadata/md5-cache/kde-misc/latte-dock-0.9.2
new file mode 100644
index 000000000000..197d299d41fc
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.9.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.60.0 >=kde-frameworks/karchive-5.60.0 >=kde-frameworks/kconfig-5.60.0 >=kde-frameworks/kcoreaddons-5.60.0 >=kde-frameworks/kcrash-5.60.0 >=kde-frameworks/kdbusaddons-5.60.0 >=kde-frameworks/kdeclarative-5.60.0 >=kde-frameworks/kglobalaccel-5.60.0 >=kde-frameworks/kguiaddons-5.60.0 >=kde-frameworks/ki18n-5.60.0 >=kde-frameworks/kiconthemes-5.60.0 >=kde-frameworks/knewstuff-5.60.0 >=kde-frameworks/knotifications-5.60.0 >=kde-frameworks/kpackage-5.60.0 >=kde-frameworks/kwayland-5.60.0 >=kde-frameworks/kwindowsystem-5.60.0 >=kde-frameworks/kxmlgui-5.60.0 >=kde-frameworks/plasma-5.60.0[X] >=kde-plasma/libksysguard-5.15.5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[xcb] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Elegant dock, based on KDE Frameworks
+EAPI=7
+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.60.0 >=kde-frameworks/karchive-5.60.0 >=kde-frameworks/kconfig-5.60.0 >=kde-frameworks/kcoreaddons-5.60.0 >=kde-frameworks/kcrash-5.60.0 >=kde-frameworks/kdbusaddons-5.60.0 >=kde-frameworks/kdeclarative-5.60.0 >=kde-frameworks/kglobalaccel-5.60.0 >=kde-frameworks/kguiaddons-5.60.0 >=kde-frameworks/ki18n-5.60.0 >=kde-frameworks/kiconthemes-5.60.0 >=kde-frameworks/knewstuff-5.60.0 >=kde-frameworks/knotifications-5.60.0 >=kde-frameworks/kpackage-5.60.0 >=kde-frameworks/kwayland-5.60.0 >=kde-frameworks/kwindowsystem-5.60.0 >=kde-frameworks/kxmlgui-5.60.0 >=kde-frameworks/plasma-5.60.0[X] >=kde-plasma/libksysguard-5.15.5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[xcb] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=0
+SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.9.2.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ec694d7cead7593cf912f9fbecce3222
diff --git a/metadata/md5-cache/kde-misc/plasma-active-window-control-1.7.3 b/metadata/md5-cache/kde-misc/plasma-active-window-control-1.7.3
deleted file mode 100644
index 3b395522d012..000000000000
--- a/metadata/md5-cache/kde-misc/plasma-active-window-control-1.7.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5[X] >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=kde-frameworks/extra-cmake-modules-5.60.0:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Plasma 5 applet for controlling currently active window
-EAPI=6
-HOMEPAGE=https://store.kde.org/p/998910/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5[X] >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5
-SLOT=5
-SRC_URI=https://github.com/kotelnik/plasma-applet-active-window-control/archive/v1.7.3.tar.gz -> plasma-active-window-control-1.7.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95bcfabf50a8d1f81713d6360e412ab8
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 976934ab51bb..fcb6f0042355 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.16.4 b/metadata/md5-cache/kde-plasma/bluedevil-5.16.4
deleted file mode 100644
index 9f3a356e8a83..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/bluez-qt-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Bluetooth stack for KDE Plasma
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/bluedevil.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-plasma/kde-cli-tools-5.16.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/bluedevil-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=782dec248c87f9c5ade54a841a6573d2
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.16.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.16.5
new file mode 100644
index 000000000000..834188041d20
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/bluez-qt-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Bluetooth stack for KDE Plasma
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/bluedevil.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/bluez-qt-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-plasma/kde-cli-tools-5.16.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/bluedevil-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=782dec248c87f9c5ade54a841a6573d2
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.16.4 b/metadata/md5-cache/kde-plasma/breeze-5.16.4
deleted file mode 100644
index 1ed8283a4798..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.16.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/kdecoration-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Breeze visual style for the Plasma desktop
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/breeze.git
-IUSE=wayland X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.60.0:5 >=kde-plasma/kde-cli-tools-5.16.4:5
-RDEPEND=>=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/kdecoration-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/breeze-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ea5a0fdc4f698843de4e13e567b2328
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.16.5 b/metadata/md5-cache/kde-plasma/breeze-5.16.5
new file mode 100644
index 000000000000..a655a7cf2ed2
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-5.16.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/kdecoration-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Breeze visual style for the Plasma desktop
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/breeze.git
+IUSE=wayland X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-frameworks/breeze-icons-5.60.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/kdecoration-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/breeze-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5ea5a0fdc4f698843de4e13e567b2328
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.16.4 b/metadata/md5-cache/kde-plasma/breeze-grub-5.16.4
deleted file mode 100644
index d55b04e2864e..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.16.4
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Breeze theme for GRUB
-EAPI=7
-HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/breeze-grub-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c1397ee150e575dfdf9715d37001416e
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.16.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.16.5
new file mode 100644
index 000000000000..8e8f9427d02b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.16.5
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Breeze theme for GRUB
+EAPI=7
+HOMEPAGE=https://kde.org/
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3+
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/breeze-grub-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c1397ee150e575dfdf9715d37001416e
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.16.4 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.16.4
deleted file mode 100644
index 4a61108ef317..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) >=kde-plasma/breeze-5.16.4:5 || ( ( dev-lang/python:3.7 dev-python/pycairo[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pycairo[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pycairo[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) dev-lang/sassc dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/breeze-gtk.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/breeze-gtk-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=642f317748abb40b5172164bbba9db0d
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.16.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.16.5
new file mode 100644
index 000000000000..6fd996e735d6
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) >=kde-plasma/breeze-5.16.5:5 || ( ( dev-lang/python:3.7 dev-python/pycairo[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pycairo[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pycairo[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) dev-lang/sassc dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/breeze-gtk.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/breeze-gtk-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=642f317748abb40b5172164bbba9db0d
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.4 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.4
deleted file mode 100644
index bd0bfe448af1..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.60.0:5 dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-boot/plymouth dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Breeze theme for Plymouth
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=sys-boot/plymouth
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/breeze-plymouth-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=51aafba18dd66339fee3dd7f8425cd16
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.5
new file mode 100644
index 000000000000..bf602fd5febb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.60.0:5 dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-boot/plymouth dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Breeze theme for Plymouth
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=sys-boot/plymouth
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/breeze-plymouth-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=51aafba18dd66339fee3dd7f8425cd16
diff --git a/metadata/md5-cache/kde-plasma/discover-5.16.4 b/metadata/md5-cache/kde-plasma/discover-5.16.4
deleted file mode 100644
index b394b0fcbb04..000000000000
--- a/metadata/md5-cache/kde-plasma/discover-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 firmware? ( sys-apps/fwupd ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma resources management GUI
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/Discover
-IUSE=+firmware test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 firmware? ( sys-apps/fwupd ) >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/discover-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13b2c79f7888c5107c7144fed9306ac8
diff --git a/metadata/md5-cache/kde-plasma/discover-5.16.5 b/metadata/md5-cache/kde-plasma/discover-5.16.5
new file mode 100644
index 000000000000..5a256c572e29
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/discover-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 firmware? ( sys-apps/fwupd ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma resources management GUI
+EAPI=7
+HOMEPAGE=https://userbase.kde.org/Discover
+IUSE=+firmware test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/attica-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 firmware? ( sys-apps/fwupd ) >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/discover-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=13b2c79f7888c5107c7144fed9306ac8
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.16.4 b/metadata/md5-cache/kde-plasma/drkonqi-5.16.4
deleted file mode 100644
index 50dff9607e5e..000000000000
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlrpcclient-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlrpcclient-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/drkonqi-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=efa4d0ee095d923b3590b5cdfdd126e8
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.16.5 b/metadata/md5-cache/kde-plasma/drkonqi-5.16.5
new file mode 100644
index 000000000000..1c2b05e73245
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlrpcclient-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlrpcclient-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/drkonqi-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=efa4d0ee095d923b3590b5cdfdd126e8
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.4 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.4
deleted file mode 100644
index bbff4e62ed3e..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/kactivitymanagerd-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ec61d473a7e4d3d395bcdcb9533c4689
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.5
new file mode 100644
index 000000000000..c06798d44bf6
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/kactivitymanagerd-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ec61d473a7e4d3d395bcdcb9533c4689
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.4 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.4
deleted file mode 100644
index 42e944da21aa..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 kdesu? ( >=kde-frameworks/kdesu-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/kde-cli-tools.git
-IUSE=kdesu X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 kdesu? ( >=kde-frameworks/kdesu-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-REQUIRED_USE=kdesu? ( X )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/kde-cli-tools-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=65f4ac6f53c89a70ad3ffcd9aef2f290
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.5
new file mode 100644
index 000000000000..4a58d33439f7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 kdesu? ( >=kde-frameworks/kdesu-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/kde-cli-tools.git
+IUSE=kdesu X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 kdesu? ( >=kde-frameworks/kdesu-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+REQUIRED_USE=kdesu? ( X )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/kde-cli-tools-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=65f4ac6f53c89a70ad3ffcd9aef2f290
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.4 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.4
deleted file mode 100644
index d07bf3684cfb..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma systemsettings kcm to set GTK application look&feel
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/kde-gtk-config.git
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3: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.16.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/kde-gtk-config-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3fffc5ccee58c335225f968074303a61
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.5
new file mode 100644
index 000000000000..b86baf94a0da
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma systemsettings kcm to set GTK application look&feel
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/kde-gtk-config.git
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3: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.16.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/kde-gtk-config-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3fffc5ccee58c335225f968074303a61
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.16.4 b/metadata/md5-cache/kde-plasma/kdecoration-5.16.4
deleted file mode 100644
index 176acc7aefe3..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Plugin based library to create window decorations
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/kdecoration-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cfcfbce9a8811ce32a25d7afdb475c38
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.16.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.16.5
new file mode 100644
index 000000000000..9e8d6692bd5a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Plugin based library to create window decorations
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/kdecoration-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cfcfbce9a8811ce32a25d7afdb475c38
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.4 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.4
deleted file mode 100644
index bc05a7ae2141..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kholidays-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kunitconversion-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 share? ( >=kde-frameworks/purpose-5.60.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Extra Plasma applets and engines
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=share webengine debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kholidays-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kunitconversion-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 share? ( >=kde-frameworks/purpose-5.60.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) >=kde-plasma/plasma-workspace-5.16.4:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/kdeplasma-addons-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9be198e1b585f7a418f6a4621464670
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.5
new file mode 100644
index 000000000000..79c4c3629656
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kholidays-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kunitconversion-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 share? ( >=kde-frameworks/purpose-5.60.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Extra Plasma applets and engines
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=share webengine debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kholidays-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kunitconversion-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 share? ( >=kde-frameworks/purpose-5.60.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) >=kde-plasma/plasma-workspace-5.16.5:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/kdeplasma-addons-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b9be198e1b585f7a418f6a4621464670
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.16.4 b/metadata/md5-cache/kde-plasma/kgamma-5.16.4
deleted file mode 100644
index bdc35be3ebf3..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Screen gamma values kcontrol module
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/kgamma5-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=37866a53682eaed00e96acd9c8729631
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.16.5 b/metadata/md5-cache/kde-plasma/kgamma-5.16.5
new file mode 100644
index 000000000000..cb3e398557c1
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Screen gamma values kcontrol module
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/kgamma5-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=37866a53682eaed00e96acd9c8729631
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.16.4 b/metadata/md5-cache/kde-plasma/khotkeys-5.16.4
deleted file mode 100644
index 0aef08945fb2..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5[X] >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma workspace hotkey module
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5[X] >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.60.0:5 >=kde-plasma/kde-cli-tools-5.16.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/khotkeys-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42282941e91d0a51ffddbcbe31e39792
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.16.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.16.5
new file mode 100644
index 000000000000..8758b8e268a7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5[X] >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma workspace hotkey module
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5[X] >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.60.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/khotkeys-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=42282941e91d0a51ffddbcbe31e39792
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.16.4 b/metadata/md5-cache/kde-plasma/kinfocenter-5.16.4
deleted file mode 100644
index a34545041c84..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.16.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.14.3 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.12.3:5[gles2=] media-libs/mesa[gles2?,X(+)] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.60.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Utility providing information about the computer hardware
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/kinfocenter/
-IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.12.3:5[gles2=] media-libs/mesa[gles2?,X(+)] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.60.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.16.4:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/kinfocenter-5.16.4.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3ca2483b5c4ef2a2e09a55a81a6de7e
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.16.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.16.5
new file mode 100644
index 000000000000..e98977b8fe92
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.16.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.14.3 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.12.3:5[gles2=] media-libs/mesa[gles2?,X(+)] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.60.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Utility providing information about the computer hardware
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/kinfocenter/
+IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.12.3:5[gles2=] media-libs/mesa[gles2?,X(+)] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.60.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.16.5:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/kinfocenter-5.16.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d3ca2483b5c4ef2a2e09a55a81a6de7e
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.16.4 b/metadata/md5-cache/kde-plasma/kmenuedit-5.16.4
deleted file mode 100644
index dba9a5e8035d..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 hotkeys? ( >=kde-plasma/khotkeys-5.16.4:5 ) >=kde-frameworks/kinit-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma menu editor
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/kmenuedit.git
-IUSE=+hotkeys debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 hotkeys? ( >=kde-plasma/khotkeys-5.16.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/kmenuedit-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=23e04be0c60b77627c041cb1b5cc2b07
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.16.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.16.5
new file mode 100644
index 000000000000..b09b44e5f02a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 hotkeys? ( >=kde-plasma/khotkeys-5.16.5:5 ) >=kde-frameworks/kinit-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma menu editor
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/kmenuedit.git
+IUSE=+hotkeys debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 hotkeys? ( >=kde-plasma/khotkeys-5.16.5:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/kmenuedit-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=23e04be0c60b77627c041cb1b5cc2b07
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.16.4 b/metadata/md5-cache/kde-plasma/kscreen-5.16.4
deleted file mode 100644
index 2f0c1d5fac2c..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.16.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-plasma/libkscreen-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma screen management
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/kscreen.git
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-plasma/libkscreen-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-plasma/kde-cli-tools-5.16.4:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/kscreen-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68bc237dd39fa2690430f359e9f7e06c
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.16.5 b/metadata/md5-cache/kde-plasma/kscreen-5.16.5
new file mode 100644
index 000000000000..85453db243e9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.16.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-plasma/libkscreen-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma screen management
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/kscreen.git
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-plasma/libkscreen-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-plasma/kde-cli-tools-5.16.5:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/kscreen-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=68bc237dd39fa2690430f359e9f7e06c
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.16.4 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.16.4
deleted file mode 100644
index 2822e6e089fc..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.16.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3: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 ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Library and components for secure lock screen architecture
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=consolekit +pam seccomp test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.16.4:5
-RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-REQUIRED_USE=seccomp? ( pam )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/kscreenlocker-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1bdeec799f1b31a8f70b3276bcf84352
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.16.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.16.5
new file mode 100644
index 000000000000..8cf81e030b44
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.16.5
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3: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 ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Library and components for secure lock screen architecture
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=consolekit +pam seccomp test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.16.5:5
+RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+REQUIRED_USE=seccomp? ( pam )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/kscreenlocker-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1bdeec799f1b31a8f70b3276bcf84352
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.16.4 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.16.4
deleted file mode 100644
index 34c881177f0a..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/ksshaskpass.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/ksshaskpass-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9cb019a4dbd4584cf783d473f7ce246
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.16.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.16.5
new file mode 100644
index 000000000000..1dbd0d428902
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/ksshaskpass.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/ksshaskpass-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f9cb019a4dbd4584cf783d473f7ce246
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.16.4 b/metadata/md5-cache/kde-plasma/ksysguard-5.16.4
deleted file mode 100644
index 9ea656b15ec2..000000000000
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libksysguard-5.16.4:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 lm_sensors? ( sys-apps/lm_sensors:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Network-enabled task manager and system monitor
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=lm_sensors debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libksysguard-5.16.4:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 lm_sensors? ( sys-apps/lm_sensors:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/ksysguard-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40e3968294808b72b8a2ac450a213bf4
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.16.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.16.5
new file mode 100644
index 000000000000..b263c9182579
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libksysguard-5.16.5:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 lm_sensors? ( sys-apps/lm_sensors:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Network-enabled task manager and system monitor
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=lm_sensors debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libksysguard-5.16.5:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 lm_sensors? ( sys-apps/lm_sensors:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/ksysguard-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=40e3968294808b72b8a2ac450a213bf4
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.16.4 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.16.4
deleted file mode 100644
index 2448146712e4..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.60.0:5 dev-libs/libgcrypt:0= virtual/pam dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KWallet PAM module to not enter password again
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kwallet-5.60.0:5 dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/kwallet-pam-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2051dff384d95e1d000a33414fe58ef
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.16.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.16.5
new file mode 100644
index 000000000000..13891e7018d6
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwallet-5.60.0:5 dev-libs/libgcrypt:0= virtual/pam dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KWallet PAM module to not enter password again
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kwallet-5.60.0:5 dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/kwallet-pam-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e2051dff384d95e1d000a33414fe58ef
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.16.4 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.16.4
deleted file mode 100644
index c26745198ea4..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.16.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/kwayland-integration.git
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/kwayland-integration-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29355b48aa1e394727d2739f2ce2fc62
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.16.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.16.5
new file mode 100644
index 000000000000..2313f32a094c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.16.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/kwayland-integration.git
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/kwayland-integration-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=29355b48aa1e394727d2739f2ce2fc62
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.16.4 b/metadata/md5-cache/kde-plasma/kwin-5.16.4
deleted file mode 100644
index 05089b1e0836..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.16.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5= >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5= >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5[X] >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-plasma/breeze-5.16.4:5 >=kde-plasma/kdecoration-5.16.4:5 >=kde-plasma/kscreenlocker-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2=] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsensors-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3: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,X(+)] 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.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=caps gles2 multimedia test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.16.4:5
-RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5= >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5= >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5[X] >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-plasma/breeze-5.16.4:5 >=kde-plasma/kdecoration-5.16.4:5 >=kde-plasma/kscreenlocker-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2=] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsensors-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3: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,X(+)] 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 ) >=kde-frameworks/kirigami-5.60.0:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtvirtualkeyboard-5.12.3:5 multimedia? ( >=dev-qt/qtmultimedia-5.12.3:5[gstreamer,qml] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/kwin-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=df4eea9bb6411dd185bcd74e3ac0bb91
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.16.5 b/metadata/md5-cache/kde-plasma/kwin-5.16.5
new file mode 100644
index 000000000000..d1f67a30c3b8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.16.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5= >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5= >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5[X] >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-plasma/breeze-5.16.5:5 >=kde-plasma/kdecoration-5.16.5:5 >=kde-plasma/kscreenlocker-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2=] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsensors-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3: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,X(+)] 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.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=caps gles2 multimedia test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+PDEPEND=>=kde-plasma/kde-cli-tools-5.16.5:5
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5= >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5= >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5[X] >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-plasma/breeze-5.16.5:5 >=kde-plasma/kdecoration-5.16.5:5 >=kde-plasma/kscreenlocker-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2=] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsensors-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3: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,X(+)] 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 ) >=kde-frameworks/kirigami-5.60.0:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtvirtualkeyboard-5.12.3:5 multimedia? ( >=dev-qt/qtmultimedia-5.12.3:5[gstreamer,qml] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/kwin-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=df4eea9bb6411dd185bcd74e3ac0bb91
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.16.4 b/metadata/md5-cache/kde-plasma/kwrited-5.16.4
deleted file mode 100644
index 75420fa5cd45..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpty-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma daemon listening for wall and write messages
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpty-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/kwrited-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=17ca5b495175260eb01d3a14e3e56b1d
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.16.5 b/metadata/md5-cache/kde-plasma/kwrited-5.16.5
new file mode 100644
index 000000000000..369e71b08b97
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpty-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma daemon listening for wall and write messages
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpty-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/kwrited-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=17ca5b495175260eb01d3a14e3e56b1d
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.16.4 b/metadata/md5-cache/kde-plasma/libkscreen-5.16.4
deleted file mode 100644
index d5a01f6acd17..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.16.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwayland-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Plasma screen management library
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kwayland-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-RESTRICT=test
-SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.16.4/libkscreen-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8f0fc93f3156992d134e0844c745986
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.16.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.16.5
new file mode 100644
index 000000000000..95d36a5fe7f9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.16.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwayland-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Plasma screen management library
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kwayland-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RESTRICT=test
+SLOT=5/7
+SRC_URI=mirror://kde/stable/plasma/5.16.5/libkscreen-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f8f0fc93f3156992d134e0844c745986
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.16.4 b/metadata/md5-cache/kde-plasma/libksysguard-5.16.4
deleted file mode 100644
index dc5462df008e..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.60.0:5 !minimal? ( >=kde-frameworks/plasma-5.60.0:5 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Task management and system monitoring library
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=minimal webengine X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/libksysguard-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e88562caa48cb72e459e333f44237299
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.16.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.16.5
new file mode 100644
index 000000000000..d359ee44690d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.60.0:5 !minimal? ( >=kde-frameworks/plasma-5.60.0:5 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Task management and system monitoring library
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=minimal webengine X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/libksysguard-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e88562caa48cb72e459e333f44237299
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.16.4 b/metadata/md5-cache/kde-plasma/libkworkspace-5.16.4
deleted file mode 100644
index e4202066193e..000000000000
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.16.4:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Workspace library to interact with the Plasma session manager
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !<kde-plasma/plasma-workspace-5.14.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-workspace-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03c08687ce46483b4a170d9d76b67aad
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.16.5 b/metadata/md5-cache/kde-plasma/libkworkspace-5.16.5
new file mode 100644
index 000000000000..67477a71a6f0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.16.5:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Workspace library to interact with the Plasma session manager
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !<kde-plasma/plasma-workspace-5.14.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-workspace-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=03c08687ce46483b4a170d9d76b67aad
diff --git a/metadata/md5-cache/kde-plasma/milou-5.16.4 b/metadata/md5-cache/kde-plasma/milou-5.16.4
deleted file mode 100644
index f16c343df4d4..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Dedicated search application built on top of Baloo
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/milou.git
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/milou-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c2843d0adb9d136761b9e191c4a0e5fd
diff --git a/metadata/md5-cache/kde-plasma/milou-5.16.5 b/metadata/md5-cache/kde-plasma/milou-5.16.5
new file mode 100644
index 000000000000..2191869c3346
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/milou-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Dedicated search application built on top of Baloo
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/milou.git
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/milou-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c2843d0adb9d136761b9e191c4a0e5fd
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.16.4 b/metadata/md5-cache/kde-plasma/oxygen-5.16.4
deleted file mode 100644
index 74a559be6f0d..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.16.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/kdecoration-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) >=kde-frameworks/kservice-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Oxygen visual style for the Plasma desktop
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/oxygen.git
-IUSE=wayland debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.16.4:5
-RDEPEND=>=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/kdecoration-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/oxygen-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0558aaaf80ddca07264138174bfded5c
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.16.5 b/metadata/md5-cache/kde-plasma/oxygen-5.16.5
new file mode 100644
index 000000000000..7837c16391e0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.16.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/kdecoration-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) >=kde-frameworks/kservice-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Oxygen visual style for the Plasma desktop
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/oxygen.git
+IUSE=wayland debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.16.5:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/kdecoration-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/oxygen-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0558aaaf80ddca07264138174bfded5c
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.4
deleted file mode 100644
index 4cf315a2f178..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-browser-integration-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7a5a4ea5f04cf7355dcf9d5e57cea13
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.5
new file mode 100644
index 000000000000..aa2e2dddba9b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-browser-integration-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d7a5a4ea5f04cf7355dcf9d5e57cea13
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.4
deleted file mode 100644
index 0141d40bf91b..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.60.0:5 >=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kpeople-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-plasma/kwin-5.16.4:5 >=kde-plasma/plasma-workspace-5.16.4:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 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.12.3: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.60.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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma desktop
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-5.60.0:5 >=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kpeople-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-plasma/kwin-5.16.4:5 >=kde-plasma/plasma-workspace-5.16.4:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 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.12.3: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.60.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/qqc2-desktop-style-5.60.0:5 >=kde-plasma/breeze-5.16.4:5 >=kde-plasma/kde-cli-tools-5.16.4:5 >=kde-plasma/oxygen-5.16.4:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 sys-apps/util-linux x11-apps/setxkbmap !<kde-plasma/kdeplasma-addons-5.15.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-desktop-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f564c4d6b8288b6feb88b4e4d98baae1
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.5
new file mode 100644
index 000000000000..7668f4e65a9c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.60.0:5 >=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kpeople-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-plasma/kwin-5.16.5:5 >=kde-plasma/plasma-workspace-5.16.5:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 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.12.3: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.60.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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma desktop
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/attica-5.60.0:5 >=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kpeople-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-plasma/kwin-5.16.5:5 >=kde-plasma/plasma-workspace-5.16.5:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 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.12.3: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.60.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/qqc2-desktop-style-5.60.0:5 >=kde-plasma/breeze-5.16.5:5 >=kde-plasma/kde-cli-tools-5.16.5:5 >=kde-plasma/oxygen-5.16.5:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 sys-apps/util-linux x11-apps/setxkbmap !<kde-plasma/kdeplasma-addons-5.15.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-desktop-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f564c4d6b8288b6feb88b4e4d98baae1
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-integration-5.16.4
deleted file mode 100644
index 54908af3b29e..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.16.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/breeze-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[dbus] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libXcursor x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/breeze-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[dbus] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-integration-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8d185bb96c568d5569f5644698e8c2c
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.16.5
new file mode 100644
index 000000000000..12636ad4075c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.16.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/breeze-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[dbus] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libXcursor x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/breeze-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[dbus] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-integration-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f8d185bb96c568d5569f5644698e8c2c
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-meta-5.16.4
deleted file mode 100644
index 99aa6ec8ce17..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.16.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=bluetooth +browser-integration consolekit crypt +desktop-portal discover +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.16.4:5 >=kde-plasma/drkonqi-5.16.4:5 >=kde-plasma/kactivitymanagerd-5.16.4:5 >=kde-plasma/kde-cli-tools-5.16.4:5 >=kde-plasma/kdecoration-5.16.4:5 >=kde-plasma/kdeplasma-addons-5.16.4:5 >=kde-plasma/kgamma-5.16.4:5 >=kde-plasma/khotkeys-5.16.4:5 >=kde-plasma/kinfocenter-5.16.4:5 >=kde-plasma/kmenuedit-5.16.4:5 >=kde-plasma/kscreen-5.16.4:5 >=kde-plasma/kscreenlocker-5.16.4:5 >=kde-plasma/ksshaskpass-5.16.4:5 >=kde-plasma/ksysguard-5.16.4:5 >=kde-plasma/kwayland-integration-5.16.4:5 >=kde-plasma/kwin-5.16.4:5 >=kde-plasma/kwrited-5.16.4:5 >=kde-plasma/libkscreen-5.16.4:5 >=kde-plasma/libksysguard-5.16.4:5 >=kde-plasma/milou-5.16.4:5 >=kde-plasma/oxygen-5.16.4:5 >=kde-plasma/plasma-desktop-5.16.4:5 >=kde-plasma/plasma-integration-5.16.4:5 >=kde-plasma/plasma-workspace-5.16.4:5 >=kde-plasma/polkit-kde-agent-5.16.4:5 >=kde-plasma/powerdevil-5.16.4:5 >=kde-plasma/systemsettings-5.16.4:5 >=kde-plasma/user-manager-5.16.4:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.16.4:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.16.4:5 ) consolekit? ( >=sys-auth/consolekit-1.0.1 pm-utils? ( sys-power/pm-utils ) ) crypt? ( >=kde-plasma/plasma-vault-5.16.4:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.16.4:5 ) discover? ( >=kde-plasma/discover-5.16.4:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.16.4:5 x11-misc/sddm[consolekit?,elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.16.4:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.16.4:5 >=kde-plasma/kde-gtk-config-5.16.4:5 ) handbook? ( kde-apps/khelpcenter:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.16.4:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.16.4:5 net-misc/networkmanager[consolekit?,elogind?,systemd?] ) pam? ( >=kde-plasma/kwallet-pam-5.16.4:5 sys-auth/pambase[consolekit?,elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.16.4:5 >=kde-plasma/plymouth-kcm-5.16.4:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.16.4:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.16.4:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.16.4:5 )
-REQUIRED_USE=?? ( consolekit elogind systemd )
-SLOT=5
-_md5_=9b58dad38a115af2496063cd559baf72
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.16.5
new file mode 100644
index 000000000000..dec4b2a56503
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.16.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=bluetooth +browser-integration consolekit crypt +desktop-portal discover +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.16.5:5 >=kde-plasma/drkonqi-5.16.5:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=kde-plasma/kde-cli-tools-5.16.5:5 >=kde-plasma/kdecoration-5.16.5:5 >=kde-plasma/kdeplasma-addons-5.16.5:5 >=kde-plasma/kgamma-5.16.5:5 >=kde-plasma/khotkeys-5.16.5:5 >=kde-plasma/kinfocenter-5.16.5:5 >=kde-plasma/kmenuedit-5.16.5:5 >=kde-plasma/kscreen-5.16.5:5 >=kde-plasma/kscreenlocker-5.16.5:5 >=kde-plasma/ksshaskpass-5.16.5:5 >=kde-plasma/ksysguard-5.16.5:5 >=kde-plasma/kwayland-integration-5.16.5:5 >=kde-plasma/kwin-5.16.5:5 >=kde-plasma/kwrited-5.16.5:5 >=kde-plasma/libkscreen-5.16.5:5 >=kde-plasma/libksysguard-5.16.5:5 >=kde-plasma/milou-5.16.5:5 >=kde-plasma/oxygen-5.16.5:5 >=kde-plasma/plasma-desktop-5.16.5:5 >=kde-plasma/plasma-integration-5.16.5:5 >=kde-plasma/plasma-workspace-5.16.5:5 >=kde-plasma/polkit-kde-agent-5.16.5:5 >=kde-plasma/powerdevil-5.16.5:5 >=kde-plasma/systemsettings-5.16.5:5 >=kde-plasma/user-manager-5.16.5:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.16.5:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.16.5:5 ) consolekit? ( >=sys-auth/consolekit-1.0.1 pm-utils? ( sys-power/pm-utils ) ) crypt? ( >=kde-plasma/plasma-vault-5.16.5:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.16.5:5 ) discover? ( >=kde-plasma/discover-5.16.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.16.5:5 x11-misc/sddm[consolekit?,elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.16.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.16.5:5 >=kde-plasma/kde-gtk-config-5.16.5:5 ) handbook? ( kde-apps/khelpcenter:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.16.5:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.16.5:5 net-misc/networkmanager[consolekit?,elogind?,systemd?] ) pam? ( >=kde-plasma/kwallet-pam-5.16.5:5 sys-auth/pambase[consolekit?,elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.16.5:5 >=kde-plasma/plymouth-kcm-5.16.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.16.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.16.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.16.5:5 )
+REQUIRED_USE=?? ( consolekit elogind systemd )
+SLOT=5
+_md5_=9b58dad38a115af2496063cd559baf72
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-nm-5.16.4
deleted file mode 100644
index e03ada7fdf00..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/networkmanager-qt-5.60.0:5[teamd=] >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.60.0:5 >=dev-qt/qtxml-5.12.3:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.12.3:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma applet for NetworkManager
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=modemmanager openconnect teamd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/networkmanager-qt-5.60.0:5[teamd=] >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.60.0:5 >=dev-qt/qtxml-5.12.3:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.12.3:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.16.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-nm-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08dc318254e933973fdcf79d4a10c06c
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.16.5
new file mode 100644
index 000000000000..938520d430aa
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/networkmanager-qt-5.60.0:5[teamd=] >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.60.0:5 >=dev-qt/qtxml-5.12.3:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.12.3:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma applet for NetworkManager
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=modemmanager openconnect teamd debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/networkmanager-qt-5.60.0:5[teamd=] >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.60.0:5 >=dev-qt/qtxml-5.12.3:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.12.3:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.16.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-nm-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=08dc318254e933973fdcf79d4a10c06c
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-pa-5.16.4
deleted file mode 100644
index b778c579a81b..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Plasma applet for audio volume management using PulseAudio
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kirigami-5.60.0:5 >=dev-qt/qtquickcontrols2-5.12.3:5 media-libs/libcanberra x11-themes/sound-theme-freedesktop >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-pa-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=910085d7450eca13315356742b4efb5f
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.16.5
new file mode 100644
index 000000000000..e0d5ed923b31
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Plasma applet for audio volume management using PulseAudio
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kirigami-5.60.0:5 >=dev-qt/qtquickcontrols2-5.12.3:5 media-libs/libcanberra x11-themes/sound-theme-freedesktop >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-pa-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=910085d7450eca13315356742b4efb5f
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.4
deleted file mode 100644
index 56e871b11c94..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Useful applications for Plasma development
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-sdk-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce71f3f8fede95c7c695f6a3111bc845
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.5
new file mode 100644
index 000000000000..bb6c7f8ff3dc
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Useful applications for Plasma development
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-sdk-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce71f3f8fede95c7c695f6a3111bc845
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-vault-5.16.4
deleted file mode 100644
index 56105f9caff9..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-plasma/libksysguard-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.60.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Plasma applet and services for creating encrypted vaults
-EAPI=7
-HOMEPAGE=https://kde.org/ https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
-IUSE=networkmanager debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-3
-RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-plasma/libksysguard-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.60.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-vault-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc2f2a2a2cbfb39e827fa9fc7870b897
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.16.5
new file mode 100644
index 000000000000..93f3cb74cb93
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-plasma/libksysguard-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.60.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Plasma applet and services for creating encrypted vaults
+EAPI=7
+HOMEPAGE=https://kde.org/ https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
+IUSE=networkmanager debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-plasma/libksysguard-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.60.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-vault-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fc2f2a2a2cbfb39e827fa9fc7870b897
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.4
deleted file mode 100644
index 3abecc1bcd4c..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-plasma/kscreenlocker-5.16.4:5 >=kde-plasma/kwin-5.16.4:5 >=kde-plasma/libksysguard-5.16.4:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5[jpeg] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 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.60.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.60.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.60.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.60.0:5 ) >=dev-qt/qtconcurrent-5.12.3:5 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma workspace
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.16.4:5
-RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-plasma/kscreenlocker-5.16.4:5 >=kde-plasma/kwin-5.16.4:5 >=kde-plasma/libksysguard-5.16.4:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5[jpeg] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 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.60.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.60.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.60.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.60.0:5 ) >=kde-frameworks/kdesu-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-plasma/ksysguard-5.16.4:5 >=kde-plasma/milou-5.16.4:5 >=kde-plasma/plasma-integration-5.16.4:5 >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtpaths-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5[widgets] >=dev-qt/qtquickcontrols2-5.12.3:5 app-text/iso-codes x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.14.80:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-workspace-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=92b2c4a25df7acccd50342a460cbdd1d
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.5
new file mode 100644
index 000000000000..e9813ca64bed
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.5
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-plasma/kscreenlocker-5.16.5:5 >=kde-plasma/kwin-5.16.5:5 >=kde-plasma/libksysguard-5.16.5:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5[jpeg] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 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.60.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.60.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.60.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.60.0:5 ) >=dev-qt/qtconcurrent-5.12.3:5 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma workspace
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.16.5:5
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-plasma/kscreenlocker-5.16.5:5 >=kde-plasma/kwin-5.16.5:5 >=kde-plasma/libksysguard-5.16.5:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5[jpeg] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 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.60.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.60.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.60.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.60.0:5 ) >=kde-frameworks/kdesu-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-plasma/ksysguard-5.16.5:5 >=kde-plasma/milou-5.16.5:5 >=kde-plasma/plasma-integration-5.16.5:5 >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtpaths-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5[widgets] >=dev-qt/qtquickcontrols2-5.12.3:5 app-text/iso-codes x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.14.80:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-workspace-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=92b2c4a25df7acccd50342a460cbdd1d
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.4
deleted file mode 100644
index cf6a72ce6441..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.4
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.60.0:5 >=dev-qt/qtcore-5.12.3:5 dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Additional wallpapers for the Plasma workspace
-EAPI=7
-HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-workspace-wallpapers-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b6a51c29a96c3dcecae18fc61f4434e8
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.5
new file mode 100644
index 000000000000..382f00a283e0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.5
@@ -0,0 +1,12 @@
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.60.0:5 >=dev-qt/qtcore-5.12.3:5 dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Additional wallpapers for the Plasma workspace
+EAPI=7
+HOMEPAGE=https://kde.org/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/plasma-workspace-wallpapers-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b6a51c29a96c3dcecae18fc61f4434e8
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.4 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.4
deleted file mode 100644
index e3c02ba86553..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-boot/plymouth dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma control module for Plymouth
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/plymouth-kcm.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.16.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/plymouth-kcm-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5281487aac735d2f34417ef1c09d0bbe
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.5
new file mode 100644
index 000000000000..1e9cfbde823f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-boot/plymouth dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma control module for Plymouth
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/plymouth-kcm.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.16.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/plymouth-kcm-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5281487aac735d2f34417ef1c09d0bbe
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.4 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.4
deleted file mode 100644
index 5489fdf3dc1f..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=PolKit agent module for KDE Plasma
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/polkit-kde-agent-1-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a949da13f511cc51a31b112af5b7dbc
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.5
new file mode 100644
index 000000000000..20e865520069
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=PolKit agent module for KDE Plasma
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/polkit-kde-agent-1-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6a949da13f511cc51a31b112af5b7dbc
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.16.4 b/metadata/md5-cache/kde-plasma/powerdevil-5.16.4
deleted file mode 100644
index 14b7b95afb38..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5[policykit] >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-plasma/libkscreen-5.16.4:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.60.0:5 >=kde-frameworks/networkmanager-qt-5.60.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/powerdevil.git
-IUSE=brightness-control +wireless debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5[policykit] >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-plasma/libkscreen-5.16.4:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.60.0:5 >=kde-frameworks/networkmanager-qt-5.60.0:5 ) >=kde-plasma/kde-cli-tools-5.16.4:5 >=sys-power/upower-0.9.23 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/powerdevil-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8110eac7b903084d2cbd539e0a7466b0
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.16.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.16.5
new file mode 100644
index 000000000000..7df234413244
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5[policykit] >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-plasma/libkscreen-5.16.5:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.60.0:5 >=kde-frameworks/networkmanager-qt-5.60.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Power management for KDE Plasma Shell
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/powerdevil.git
+IUSE=brightness-control +wireless debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5[policykit] >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-plasma/libkscreen-5.16.5:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.60.0:5 >=kde-frameworks/networkmanager-qt-5.60.0:5 ) >=kde-plasma/kde-cli-tools-5.16.5:5 >=sys-power/upower-0.9.23 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/powerdevil-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8110eac7b903084d2cbd539e0a7466b0
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.16.4 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.16.4
deleted file mode 100644
index 66b3f7916251..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma control module for SDDM
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/sddm-kcm.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.16.4:5 x11-misc/sddm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/sddm-kcm-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f142594fe8cebd9d913c5e19f79ce3d
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.16.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.16.5
new file mode 100644
index 000000000000..938ad7768f05
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma control module for SDDM
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/sddm-kcm.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.16.5:5 x11-misc/sddm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/sddm-kcm-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6f142594fe8cebd9d913c5e19f79ce3d
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.16.4 b/metadata/md5-cache/kde-plasma/systemsettings-5.16.4
deleted file mode 100644
index 899d5494a020..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 classic? ( >=kde-frameworks/khtml-5.60.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=System settings utility
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=classic gtk debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 classic? ( >=kde-frameworks/khtml-5.60.0:5 ) >=kde-frameworks/kirigami-5.60.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.16.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/systemsettings-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=416319dbc832d681c1cb88e9eea10efd
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.16.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.16.5
new file mode 100644
index 000000000000..97cc7d9de886
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 classic? ( >=kde-frameworks/khtml-5.60.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=System settings utility
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=classic gtk debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 classic? ( >=kde-frameworks/khtml-5.60.0:5 ) >=kde-frameworks/kirigami-5.60.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.16.5:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/systemsettings-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=416319dbc832d681c1cb88e9eea10efd
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.16.4 b/metadata/md5-cache/kde-plasma/user-manager-5.16.4
deleted file mode 100644
index 7c79b11493e1..000000000000
--- a/metadata/md5-cache/kde-plasma/user-manager-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/libpwquality-1.3.0 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Simple system settings module to manage the users of your system
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/user-manager-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=594791d090ea427ca8efc3e60605c398
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.16.5 b/metadata/md5-cache/kde-plasma/user-manager-5.16.5
new file mode 100644
index 000000000000..f64b49e646d4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/libpwquality-1.3.0 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Simple system settings module to manage the users of your system
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/user-manager-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=594791d090ea427ca8efc3e60605c398
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.4 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.4
deleted file mode 100644
index 89ea8041bebf..000000000000
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5[cups] >=dev-qt/qtwidgets-5.12.3:5 screencast? ( dev-libs/glib:2 media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire:= ) >=kde-frameworks/kwayland-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=screencast test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5[cups] >=dev-qt/qtwidgets-5.12.3:5 screencast? ( dev-libs/glib:2 media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire:= ) screencast? ( sys-apps/xdg-desktop-portal[screencast] ) !screencast? ( sys-apps/xdg-desktop-portal ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.4/xdg-desktop-portal-kde-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b30c0bc1a5030d744fc67071ef10daa
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.5 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.5
new file mode 100644
index 000000000000..22756842449a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5[cups] >=dev-qt/qtwidgets-5.12.3:5 screencast? ( dev-libs/glib:2 media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire:= ) >=kde-frameworks/kwayland-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=screencast test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5[cups] >=dev-qt/qtwidgets-5.12.3:5 screencast? ( dev-libs/glib:2 media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire:= ) screencast? ( sys-apps/xdg-desktop-portal[screencast] ) !screencast? ( sys-apps/xdg-desktop-portal ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.5/xdg-desktop-portal-kde-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0b30c0bc1a5030d744fc67071ef10daa
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.4 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.4
deleted file mode 100644
index 0c928f3f3de9..000000000000
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/extra-cmake-modules-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3: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.16.4/plasma-workspace-5.16.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca4c810fa209a70288a89beeba01a6a0
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.5 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.5
new file mode 100644
index 000000000000..021636be0653
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/extra-cmake-modules-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3: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.16.5/plasma-workspace-5.16.5.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ca4c810fa209a70288a89beeba01a6a0
diff --git a/metadata/md5-cache/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index 7751596c4408..475ac1beaf20 100644
--- a/metadata/md5-cache/lxde-base/Manifest.gz
+++ b/metadata/md5-cache/lxde-base/Manifest.gz
diff --git a/metadata/md5-cache/lxde-base/lxsession-0.5.4-r1 b/metadata/md5-cache/lxde-base/lxsession-0.5.4-r1
new file mode 100644
index 000000000000..7c37010163df
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxsession-0.5.4-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/glib:2 dev-libs/dbus-glib dev-libs/libunique:1 lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=LXDE session manager
+EAPI=7
+HOMEPAGE=https://wiki.lxde.org/en/LXSession
+IUSE=nls upower
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/dbus-glib dev-libs/libunique:1 lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus !lxde-base/lxsession-edit sys-apps/lsb-release upower? ( sys-power/upower )
+SLOT=0
+SRC_URI=mirror://sourceforge/lxde/lxsession-0.5.4.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd
+_md5_=56d2702a2c946bfaca333d81ab69e346
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index e08f019c523c..e28450c1a211 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/geary-3.32.0-r1 b/metadata/md5-cache/mail-client/geary-3.32.0-r1
index f93e0508c869..aa19061c5644 100644
--- a/metadata/md5-cache/mail-client/geary-3.32.0-r1
+++ b/metadata/md5-cache/mail-client/geary-3.32.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.54:2 >=x11-libs/gtk+-3.22.26:3[introspection] >=net-libs/webkit-gtk-2.20:4=[introspection] app-text/iso-codes >=dev-db/sqlite-3.12:3 >=net-libs/libsoup-2.48:2.4[introspection] net-libs/gnome-online-accounts >=dev-libs/libgee-0.8.5:0.8=[introspection] >=x11-libs/libnotify-0.7.5[introspection] >=media-libs/libcanberra-0.28 >=dev-libs/gmime-2.6.17:2.6 >=app-crypt/libsecret-0.11[introspection,vala] >=dev-libs/libxml2-2.7.8:2 >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala] app-text/enchant >=dev-libs/folks-0.11:0 dev-libs/json-glib unwind? ( >=sys-libs/libunwind-1.1:7 ) gnome-base/dconf gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/geary/3.32/geary-3.32.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87346cb37700268a260cd617c0186c6f
diff --git a/metadata/md5-cache/mail-client/s-nail-14.9.15 b/metadata/md5-cache/mail-client/s-nail-14.9.15
new file mode 100644
index 000000000000..373c74230876
--- /dev/null
+++ b/metadata/md5-cache/mail-client/s-nail-14.9.15
@@ -0,0 +1,14 @@
+BDEPEND=virtual/awk
+DEFINED_PHASES=compile configure install
+DEPEND=sys-libs/ncurses:0= virtual/libiconv idn? ( net-dns/libidn2 ) net? ( ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) kerberos? ( virtual/krb5 ) ) !mail-client/mailx !net-mail/mailutils !mail-client/nail
+DESCRIPTION=Enhanced mailx-compatible mail client based on Hierloom mailx (nail)
+EAPI=7
+HOMEPAGE=https://www.sdaoden.eu/code.html
+IUSE=idn kerberos libressl net ssl
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD BSD-4 ISC RSA
+RDEPEND=sys-libs/ncurses:0= virtual/libiconv idn? ( net-dns/libidn2 ) net? ( ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) kerberos? ( virtual/krb5 ) ) !mail-client/mailx !net-mail/mailutils !mail-client/nail
+SLOT=0
+SRC_URI=https://ftp.sdaoden.eu/s-nail-14.9.15.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=6e594fd458d54f3ab6a16ad045ddbef1
diff --git a/metadata/md5-cache/mail-client/thunderbird-52.9.1 b/metadata/md5-cache/mail-client/thunderbird-52.9.1
index f04ed1a01d53..5ed44e3fcfbd 100644
--- a/metadata/md5-cache/mail-client/thunderbird-52.9.1
+++ b/metadata/md5-cache/mail-client/thunderbird-52.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selin
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ar.xpi -> thunderbird-52.9.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ast.xpi -> thunderbird-52.9.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/be.xpi -> thunderbird-52.9.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/bg.xpi -> thunderbird-52.9.1-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.9.1-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/br.xpi -> thunderbird-52.9.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ca.xpi -> thunderbird-52.9.1-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/cs.xpi -> thunderbird-52.9.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/cy.xpi -> thunderbird-52.9.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/da.xpi -> thunderbird-52.9.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/de.xpi -> thunderbird-52.9.1-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/el.xpi -> thunderbird-52.9.1-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/en-GB.xpi -> thunderbird-52.9.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/es-AR.xpi -> thunderbird-52.9.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/es-ES.xpi -> thunderbird-52.9.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/et.xpi -> thunderbird-52.9.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/eu.xpi -> thunderbird-52.9.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/fi.xpi -> thunderbird-52.9.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/fr.xpi -> thunderbird-52.9.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.9.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.9.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/gd.xpi -> thunderbird-52.9.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/gl.xpi -> thunderbird-52.9.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/he.xpi -> thunderbird-52.9.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hr.xpi -> thunderbird-52.9.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hsb.xpi -> thunderbird-52.9.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hu.xpi -> thunderbird-52.9.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.9.1-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/id.xpi -> thunderbird-52.9.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/is.xpi -> thunderbird-52.9.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/it.xpi -> thunderbird-52.9.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ja.xpi -> thunderbird-52.9.1-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ko.xpi -> thunderbird-52.9.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/lt.xpi -> thunderbird-52.9.1-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.9.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/nl.xpi -> thunderbird-52.9.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.9.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.9.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pl.xpi -> thunderbird-52.9.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.9.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.9.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/rm.xpi -> thunderbird-52.9.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ro.xpi -> thunderbird-52.9.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ru.xpi -> thunderbird-52.9.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/si.xpi -> thunderbird-52.9.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sk.xpi -> thunderbird-52.9.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sl.xpi -> thunderbird-52.9.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sq.xpi -> thunderbird-52.9.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sr.xpi -> thunderbird-52.9.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.9.1-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.9.1-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/tr.xpi -> thunderbird-52.9.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/uk.xpi -> thunderbird-52.9.1-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/vi.xpi -> thunderbird-52.9.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.9.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.9.1-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/source/thunderbird-52.9.1.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-5.4.9.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-3.3.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.52	43edd59f1e8e1f9536f3c0d3703ece9d	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.52	43edd59f1e8e1f9536f3c0d3703ece9d	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7f30db5aa0d7a5c46b85cd237eab6817
diff --git a/metadata/md5-cache/mail-client/thunderbird-60.8.0 b/metadata/md5-cache/mail-client/thunderbird-60.8.0
index 4cf2ab2b0a42..e2b467723cd2 100644
--- a/metadata/md5-cache/mail-client/thunderbird-60.8.0
+++ b/metadata/md5-cache/mail-client/thunderbird-60.8.0
@@ -4,12 +4,12 @@ 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
+KEYWORDS=amd64 ~ppc64 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=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8: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.8.0/linux-i686/xpi/ar.xpi -> thunderbird-60.8.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ast.xpi -> thunderbird-60.8.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/be.xpi -> thunderbird-60.8.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/bg.xpi -> thunderbird-60.8.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/br.xpi -> thunderbird-60.8.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ca.xpi -> thunderbird-60.8.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/cs.xpi -> thunderbird-60.8.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/cy.xpi -> thunderbird-60.8.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/da.xpi -> thunderbird-60.8.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/de.xpi -> thunderbird-60.8.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/el.xpi -> thunderbird-60.8.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/en-GB.xpi -> thunderbird-60.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-60.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-60.8.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/et.xpi -> thunderbird-60.8.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/eu.xpi -> thunderbird-60.8.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/fi.xpi -> thunderbird-60.8.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/fr.xpi -> thunderbird-60.8.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.8.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.8.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/gd.xpi -> thunderbird-60.8.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/gl.xpi -> thunderbird-60.8.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/he.xpi -> thunderbird-60.8.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/hr.xpi -> thunderbird-60.8.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/hsb.xpi -> thunderbird-60.8.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/hu.xpi -> thunderbird-60.8.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.8.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/id.xpi -> thunderbird-60.8.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/is.xpi -> thunderbird-60.8.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/it.xpi -> thunderbird-60.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ja.xpi -> thunderbird-60.8.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ko.xpi -> thunderbird-60.8.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/lt.xpi -> thunderbird-60.8.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.8.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/nl.xpi -> thunderbird-60.8.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.8.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/pl.xpi -> thunderbird-60.8.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.8.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.8.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/rm.xpi -> thunderbird-60.8.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ro.xpi -> thunderbird-60.8.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ru.xpi -> thunderbird-60.8.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/si.xpi -> thunderbird-60.8.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/sk.xpi -> thunderbird-60.8.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/sl.xpi -> thunderbird-60.8.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/sq.xpi -> thunderbird-60.8.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/sr.xpi -> thunderbird-60.8.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.8.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/tr.xpi -> thunderbird-60.8.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/uk.xpi -> thunderbird-60.8.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/vi.xpi -> thunderbird-60.8.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.8.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/source/thunderbird-60.8.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.5.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-4.4.1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-07.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	fa1351cd910ddd293c48a4888536f069	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd34e5445e3513f8972748af3e3c5d2b
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=def8d7ae335e536ff0f761b0a88bc4e2
diff --git a/metadata/md5-cache/mail-client/thunderbird-68.0-r2 b/metadata/md5-cache/mail-client/thunderbird-68.0-r2
new file mode 100644
index 000000000000..bbe850b08295
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-68.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.44.1 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.8.7 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/cargo-1.34.0 >=virtual/rust-1.34.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=https://www.mozilla.org/thunderbird
+IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free +gmp-autoupdate hardened jack lightning lto neon pgo pulseaudio selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_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 pgo
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.44.1 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=wifi? ( dbus ) pgo? ( lto )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/68.0/source/thunderbird-68.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.5.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-4.4.1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-68.0-patches-11.tar.xz l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ar.xpi -> thunderbird-68.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ast.xpi -> thunderbird-68.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/be.xpi -> thunderbird-68.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/bg.xpi -> thunderbird-68.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/br.xpi -> thunderbird-68.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ca.xpi -> thunderbird-68.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/cs.xpi -> thunderbird-68.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/cy.xpi -> thunderbird-68.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/da.xpi -> thunderbird-68.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/de.xpi -> thunderbird-68.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/el.xpi -> thunderbird-68.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/en-GB.xpi -> thunderbird-68.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/es-AR.xpi -> thunderbird-68.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/es-ES.xpi -> thunderbird-68.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/et.xpi -> thunderbird-68.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/eu.xpi -> thunderbird-68.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/fi.xpi -> thunderbird-68.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/fr.xpi -> thunderbird-68.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-68.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-68.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/gd.xpi -> thunderbird-68.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/gl.xpi -> thunderbird-68.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/he.xpi -> thunderbird-68.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/hr.xpi -> thunderbird-68.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/hsb.xpi -> thunderbird-68.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/hu.xpi -> thunderbird-68.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-68.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/id.xpi -> thunderbird-68.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/is.xpi -> thunderbird-68.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/it.xpi -> thunderbird-68.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ja.xpi -> thunderbird-68.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ko.xpi -> thunderbird-68.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/lt.xpi -> thunderbird-68.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-68.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/nl.xpi -> thunderbird-68.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-68.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/pl.xpi -> thunderbird-68.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-68.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-68.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/rm.xpi -> thunderbird-68.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ro.xpi -> thunderbird-68.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ru.xpi -> thunderbird-68.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/si.xpi -> thunderbird-68.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sk.xpi -> thunderbird-68.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sl.xpi -> thunderbird-68.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sq.xpi -> thunderbird-68.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sr.xpi -> thunderbird-68.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-68.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/tr.xpi -> thunderbird-68.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/uk.xpi -> thunderbird-68.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/vi.xpi -> thunderbird-68.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-68.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-68.0-zh-TW.xpi )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=83486b1dfb49ae6547f60e5dfdd7b578
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-68.0 b/metadata/md5-cache/mail-client/thunderbird-bin-68.0
new file mode 100644
index 000000000000..aa0ea3a57458
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-68.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=app-arch/unzip app-arch/zip 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=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 virtual/freedesktop-icon-theme >=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/68.0/linux-i686/xpi/ar.xpi -> thunderbird-68.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ast.xpi -> thunderbird-68.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/be.xpi -> thunderbird-68.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/bg.xpi -> thunderbird-68.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/br.xpi -> thunderbird-68.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ca.xpi -> thunderbird-68.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/cs.xpi -> thunderbird-68.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/cy.xpi -> thunderbird-68.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/da.xpi -> thunderbird-68.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/de.xpi -> thunderbird-68.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/el.xpi -> thunderbird-68.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/en-GB.xpi -> thunderbird-68.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/es-AR.xpi -> thunderbird-68.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/es-ES.xpi -> thunderbird-68.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/et.xpi -> thunderbird-68.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/eu.xpi -> thunderbird-68.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/fi.xpi -> thunderbird-68.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/fr.xpi -> thunderbird-68.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-68.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-68.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/gd.xpi -> thunderbird-68.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/gl.xpi -> thunderbird-68.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/he.xpi -> thunderbird-68.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/hr.xpi -> thunderbird-68.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/hsb.xpi -> thunderbird-68.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/hu.xpi -> thunderbird-68.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-68.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/id.xpi -> thunderbird-68.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/is.xpi -> thunderbird-68.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/it.xpi -> thunderbird-68.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ja.xpi -> thunderbird-68.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ko.xpi -> thunderbird-68.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/lt.xpi -> thunderbird-68.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-68.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/nl.xpi -> thunderbird-68.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-68.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/pl.xpi -> thunderbird-68.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-68.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-68.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/rm.xpi -> thunderbird-68.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ro.xpi -> thunderbird-68.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ru.xpi -> thunderbird-68.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/si.xpi -> thunderbird-68.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sk.xpi -> thunderbird-68.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sl.xpi -> thunderbird-68.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sq.xpi -> thunderbird-68.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sr.xpi -> thunderbird-68.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-68.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/tr.xpi -> thunderbird-68.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/uk.xpi -> thunderbird-68.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/vi.xpi -> thunderbird-68.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-68.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-68.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/en-US/thunderbird-68.0.tar.bz2 -> thunderbird-bin_x86_64-68.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/en-US/thunderbird-68.0.tar.bz2 -> thunderbird-bin_i686-68.0.tar.bz2 ) https://dev.gentoo.org/~juippis/distfiles/lightning-68.0b6.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fe2819c18c8fcd933d0a69f95da5aff5
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index bb91087aa31e..bbfb1bdb7e1b 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/anubis-4.1.1 b/metadata/md5-cache/mail-filter/anubis-4.1.1
deleted file mode 100644
index 3a6edf25ab90..000000000000
--- a/metadata/md5-cache/mail-filter/anubis-4.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/gdbm crypt? ( >=app-crypt/gpgme-0.9.0 ) guile? ( >=dev-scheme/guile-1.8 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql[server] ) nls? ( sys-devel/gettext ) pcre? ( >=dev-libs/libpcre-3.9 ) sasl? ( virtual/gsasl ) gnutls? ( net-libs/gnutls ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) test? ( dev-util/dejagnu ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=GNU Anubis is an outgoing mail processor
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/anubis/
-IUSE=crypt guile mysql postgres nls pam pcre sasl socks5 +gnutls tcpd test
-KEYWORDS=ppc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/gdbm crypt? ( >=app-crypt/gpgme-0.9.0 ) guile? ( >=dev-scheme/guile-1.8 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql[server] ) nls? ( sys-devel/gettext ) pcre? ( >=dev-libs/libpcre-3.9 ) sasl? ( virtual/gsasl ) gnutls? ( net-libs/gnutls ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-REQUIRED_USE=mysql? ( sasl ) postgres? ( sasl )
-SLOT=0
-SRC_URI=mirror://gnu/anubis/anubis-4.1.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a3412ed6d3550a9ce282bbe2aa52d824
diff --git a/metadata/md5-cache/mail-filter/anubis-4.1.1-r1 b/metadata/md5-cache/mail-filter/anubis-4.1.1-r1
deleted file mode 100644
index 61bc4fdf7dd8..000000000000
--- a/metadata/md5-cache/mail-filter/anubis-4.1.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/gdbm crypt? ( >=app-crypt/gpgme-0.9.0 ) guile? ( >=dev-scheme/guile-1.8 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql[server] ) nls? ( sys-devel/gettext ) pcre? ( >=dev-libs/libpcre-3.9 ) sasl? ( virtual/gsasl ) gnutls? ( net-libs/gnutls ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) test? ( dev-util/dejagnu ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=GNU Anubis is an outgoing mail processor
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/anubis/
-IUSE=crypt guile mysql postgres nls pam pcre sasl socks5 +gnutls tcpd test
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/gdbm crypt? ( >=app-crypt/gpgme-0.9.0 ) guile? ( >=dev-scheme/guile-1.8 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql[server] ) nls? ( sys-devel/gettext ) pcre? ( >=dev-libs/libpcre-3.9 ) sasl? ( virtual/gsasl ) gnutls? ( net-libs/gnutls ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-REQUIRED_USE=mysql? ( sasl ) postgres? ( sasl )
-SLOT=0
-SRC_URI=mirror://gnu/anubis/anubis-4.1.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6d268cb6696dbe329160242957cbf235
diff --git a/metadata/md5-cache/mail-filter/anubis-4.2 b/metadata/md5-cache/mail-filter/anubis-4.2
deleted file mode 100644
index 5c0e22124b03..000000000000
--- a/metadata/md5-cache/mail-filter/anubis-4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup test
-DEPEND=sys-libs/gdbm crypt? ( >=app-crypt/gpgme-1.8.0 ) guile? ( >=dev-scheme/guile-1.8 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:*[server] ) nls? ( sys-devel/gettext ) pcre? ( >=dev-libs/libpcre-3.9 ) sasl? ( virtual/gsasl ) gnutls? ( net-libs/gnutls ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) test? ( dev-util/dejagnu )
-DESCRIPTION=GNU Anubis is an outgoing mail processor
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/anubis/
-IUSE=crypt guile mysql postgres nls pam pcre sasl socks5 +gnutls tcpd test
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/gdbm crypt? ( >=app-crypt/gpgme-1.8.0 ) guile? ( >=dev-scheme/guile-1.8 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:*[server] ) nls? ( sys-devel/gettext ) pcre? ( >=dev-libs/libpcre-3.9 ) sasl? ( virtual/gsasl ) gnutls? ( net-libs/gnutls ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-REQUIRED_USE=mysql? ( sasl ) postgres? ( sasl )
-SLOT=0
-SRC_URI=mirror://gnu/anubis/anubis-4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8c38569d1d19ea5b4dedbc26b656a88d
diff --git a/metadata/md5-cache/mail-filter/anubis-4.2-r1 b/metadata/md5-cache/mail-filter/anubis-4.2-r1
deleted file mode 100644
index fb37f0622ae2..000000000000
--- a/metadata/md5-cache/mail-filter/anubis-4.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup test
-DEPEND=sys-libs/gdbm crypt? ( >=app-crypt/gpgme-1.8.0 ) guile? ( >=dev-scheme/guile-1.8 ) mysql? ( dev-db/mysql-connector-c ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:*[server] ) nls? ( sys-devel/gettext ) pcre? ( >=dev-libs/libpcre-3.9 ) sasl? ( virtual/gsasl ) gnutls? ( net-libs/gnutls ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) test? ( dev-util/dejagnu )
-DESCRIPTION=GNU Anubis is an outgoing mail processor
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/anubis/
-IUSE=crypt guile mysql postgres nls pam pcre sasl socks5 +gnutls tcpd test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/gdbm crypt? ( >=app-crypt/gpgme-1.8.0 ) guile? ( >=dev-scheme/guile-1.8 ) mysql? ( dev-db/mysql-connector-c ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:*[server] ) nls? ( sys-devel/gettext ) pcre? ( >=dev-libs/libpcre-3.9 ) sasl? ( virtual/gsasl ) gnutls? ( net-libs/gnutls ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-REQUIRED_USE=mysql? ( sasl ) postgres? ( sasl )
-SLOT=0
-SRC_URI=mirror://gnu/anubis/anubis-4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1285ca9589960ec58b54ec56e5a4613c
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 82529aad8ca4..e18a9caf4ff4 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/exim-4.92 b/metadata/md5-cache/mail-mta/exim-4.92
deleted file mode 100644
index e269872fadf2..000000000000
--- a/metadata/md5-cache/mail-mta/exim-4.92
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A highly configurable, drop-in replacement for sendmail
-EAPI=6
-HOMEPAGE=http://www.exim.org/
-IUSE=arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
-REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl )
-SLOT=0
-SRC_URI=https://downloads.exim.org/exim4/exim-4.92.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.92.tar.xz )
-_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=329d96f1602fe5729d0104ecaa642013
diff --git a/metadata/md5-cache/mail-mta/exim-4.92-r2 b/metadata/md5-cache/mail-mta/exim-4.92-r2
deleted file mode 100644
index 4f99e04ec994..000000000000
--- a/metadata/md5-cache/mail-mta/exim-4.92-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A highly configurable, drop-in replacement for sendmail
-EAPI=6
-HOMEPAGE=http://www.exim.org/
-IUSE=arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
-REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl ) !ssl? ( !dkim )
-SLOT=0
-SRC_URI=https://downloads.exim.org/exim4/exim-4.92.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.92.tar.xz )
-_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=21298fe120d930696f4f4c46c9fd88b5
diff --git a/metadata/md5-cache/mail-mta/exim-4.92-r3 b/metadata/md5-cache/mail-mta/exim-4.92-r3
new file mode 100644
index 000000000000..eed974f62e58
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/exim-4.92-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=A highly configurable, drop-in replacement for sendmail
+EAPI=6
+HOMEPAGE=http://www.exim.org/
+IUSE=arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
+REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl )
+SLOT=0
+SRC_URI=https://downloads.exim.org/exim4/exim-4.92.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.92.tar.xz )
+_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=81dc38da91840fcae914b4a7f8cc3f36
diff --git a/metadata/md5-cache/mail-mta/exim-4.92-r4 b/metadata/md5-cache/mail-mta/exim-4.92-r4
new file mode 100644
index 000000000000..a307ff2e5170
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/exim-4.92-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=A highly configurable, drop-in replacement for sendmail
+EAPI=6
+HOMEPAGE=http://www.exim.org/
+IUSE=arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
+REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl ) !ssl? ( !dkim )
+SLOT=0
+SRC_URI=https://downloads.exim.org/exim4/exim-4.92.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.92.tar.xz )
+_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c8ed7910100f3e52f0361e904fb8c7d1
diff --git a/metadata/md5-cache/mail-mta/exim-4.92.1 b/metadata/md5-cache/mail-mta/exim-4.92.1
deleted file mode 100644
index 0b0009c760bc..000000000000
--- a/metadata/md5-cache/mail-mta/exim-4.92.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A highly configurable, drop-in replacement for sendmail
-EAPI=6
-HOMEPAGE=http://www.exim.org/
-IUSE=arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
-REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl ) !ssl? ( !dkim )
-SLOT=0
-SRC_URI=https://downloads.exim.org/exim4/exim-4.92.1.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.92.1.tar.xz )
-_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fd875b66c489993bec1165ded3b6c5f1
diff --git a/metadata/md5-cache/mail-mta/exim-4.92.1-r1 b/metadata/md5-cache/mail-mta/exim-4.92.1-r1
new file mode 100644
index 000000000000..49a7047fbb4c
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/exim-4.92.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=A highly configurable, drop-in replacement for sendmail
+EAPI=6
+HOMEPAGE=http://www.exim.org/
+IUSE=arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
+REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl ) !ssl? ( !dkim )
+SLOT=0
+SRC_URI=https://downloads.exim.org/exim4/exim-4.92.1.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.92.1.tar.xz )
+_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c8327cf1151550c16ec85139f4eaf5df
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index a6d0c270191a..1a6849dadece 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/cantarell-0.101 b/metadata/md5-cache/media-fonts/cantarell-0.101
index a7dd8d1cf8d9..ec13d6ffd096 100644
--- a/metadata/md5-cache/media-fonts/cantarell-0.101
+++ b/metadata/md5-cache/media-fonts/cantarell-0.101
@@ -10,5 +10,5 @@ RDEPEND=media-libs/fontconfig
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/cantarell-fonts/0.101/cantarell-fonts-0.101.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3e16bdff3ec29f3191d046928c130768
diff --git a/metadata/md5-cache/media-fonts/cantarell-0.111 b/metadata/md5-cache/media-fonts/cantarell-0.111
index 0d874d9f2ea8..070bb1f9207b 100644
--- a/metadata/md5-cache/media-fonts/cantarell-0.111
+++ b/metadata/md5-cache/media-fonts/cantarell-0.111
@@ -10,5 +10,5 @@ RDEPEND=media-libs/fontconfig
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/cantarell-fonts/0.111/cantarell-fonts-0.111.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=03aac78f7fc240d2632b2f4f88ec8450
diff --git a/metadata/md5-cache/media-fonts/font-util-1.3.2-r1 b/metadata/md5-cache/media-fonts/font-util-1.3.2-r1
new file mode 100644
index 000000000000..f357e27d6725
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-util-1.3.2-r1
@@ -0,0 +1,11 @@
+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 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
+DEFINED_PHASES=compile configure install prepare unpack
+DESCRIPTION=X.Org font utilities
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-util
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-util-1.3.2.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
+_md5_=fa4396b8c5982c7718212ee7d21e3d1e
diff --git a/metadata/md5-cache/media-fonts/fontawesome-5.0.6 b/metadata/md5-cache/media-fonts/fontawesome-5.0.6
deleted file mode 100644
index 452f41a67402..000000000000
--- a/metadata/md5-cache/media-fonts/fontawesome-5.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=The iconic font
-EAPI=6
-HOMEPAGE=https://fontawesome.com
-IUSE=+otf +ttf X
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=CC-BY-3.0 OFL-1.1
-REQUIRED_USE=|| ( otf ttf )
-SLOT=0/5
-SRC_URI=https://use.fontawesome.com/releases/v5.0.6/fontawesome-free-5.0.6.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6d2e50637e5839bf0990914e28f2e430
diff --git a/metadata/md5-cache/media-fonts/fontawesome-5.10.1 b/metadata/md5-cache/media-fonts/fontawesome-5.10.1
deleted file mode 100644
index 847cb51e1186..000000000000
--- a/metadata/md5-cache/media-fonts/fontawesome-5.10.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=The iconic font
-EAPI=6
-HOMEPAGE=https://fontawesome.com
-IUSE=+otf +ttf X
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=CC-BY-3.0 OFL-1.1
-REQUIRED_USE=|| ( otf ttf )
-SLOT=0/5
-SRC_URI=https://github.com/FortAwesome/Font-Awesome/archive/5.10.1.tar.gz -> fontawesome-5.10.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9d76fb6beea24a625315fd14743dee22
diff --git a/metadata/md5-cache/media-fonts/fontawesome-5.10.2 b/metadata/md5-cache/media-fonts/fontawesome-5.10.2
new file mode 100644
index 000000000000..c0e668c08dad
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/fontawesome-5.10.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=The iconic font
+EAPI=6
+HOMEPAGE=https://fontawesome.com
+IUSE=+otf +ttf X
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=CC-BY-3.0 OFL-1.1
+REQUIRED_USE=|| ( otf ttf )
+SLOT=0/5
+SRC_URI=https://github.com/FortAwesome/Font-Awesome/archive/5.10.2.tar.gz -> fontawesome-5.10.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9d76fb6beea24a625315fd14743dee22
diff --git a/metadata/md5-cache/media-fonts/fontawesome-5.9.0 b/metadata/md5-cache/media-fonts/fontawesome-5.9.0
deleted file mode 100644
index 41cd56435dd5..000000000000
--- a/metadata/md5-cache/media-fonts/fontawesome-5.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=The iconic font
-EAPI=6
-HOMEPAGE=https://fontawesome.com
-IUSE=+otf +ttf X
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=CC-BY-3.0 OFL-1.1
-REQUIRED_USE=|| ( otf ttf )
-SLOT=0/5
-SRC_URI=https://github.com/FortAwesome/Font-Awesome/archive/5.9.0.tar.gz -> fontawesome-5.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9d76fb6beea24a625315fd14743dee22
diff --git a/metadata/md5-cache/media-fonts/ipamonafont-1.0.8 b/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
index 998734ea540f..f28ffa235a7a 100644
--- a/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
+++ b/metadata/md5-cache/media-fonts/ipamonafont-1.0.8
@@ -2,12 +2,12 @@ DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Hacked version of IPA fonts, which is suitable for browsing 2ch
 EAPI=0
-HOMEPAGE=http://www.geocities.jp/ipa_mona/index.html
+HOMEPAGE=https://web.archive.org/web/20190326123924/http://www.geocities.jp/ipa_mona/
 IUSE=X
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=grass-ipafonts mplus-fonts public-domain
 RESTRICT=mirror
 SLOT=0
-SRC_URI=http://www.geocities.jp/ipa_mona/opfc-ModuleHP-1.1.1_withIPAMonaFonts-1.0.8.tar.gz
+SRC_URI=http://freebsd.sin.openmirrors.asia/pub/FreeBSD/ports/local-distfiles/hrs/opfc-ModuleHP-1.1.1_withIPAMonaFonts-1.0.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b213590c8e72e09efa5f6cf8be7e7349
+_md5_=8d4339c5bba5bedf42d732a723a91488
diff --git a/metadata/md5-cache/media-fonts/noto-20190524 b/metadata/md5-cache/media-fonts/noto-20190524
index 5c6bfec1d6c2..880f731a948d 100644
--- a/metadata/md5-cache/media-fonts/noto-20190524
+++ b/metadata/md5-cache/media-fonts/noto-20190524
@@ -4,11 +4,11 @@ DESCRIPTION=Google's font family that aims to support all the world's languages
 EAPI=6
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts
 IUSE=cjk +extra X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm arm64 ~mips ppc ppc64 sparc x86
 LICENSE=OFL-1.1
 RDEPEND=cjk? ( media-fonts/noto-cjk )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlei18n/noto-fonts/archive/34e98229863e627d0f841e124a8657d5d0348b04.tar.gz -> noto-20190524.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=50a1a3ce85a601c203c250c9624f5305
+_md5_=f245cfdc78cd672760d4719a4eea1e5e
diff --git a/metadata/md5-cache/media-fonts/noto-cjk-20190416 b/metadata/md5-cache/media-fonts/noto-cjk-20190416
index 6c1104308f12..4d78bb305543 100644
--- a/metadata/md5-cache/media-fonts/noto-cjk-20190416
+++ b/metadata/md5-cache/media-fonts/noto-cjk-20190416
@@ -4,10 +4,10 @@ DESCRIPTION=Google's CJK font family
 EAPI=6
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-cjk
 IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm arm64 ~mips ppc ppc64 sparc x86
 LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlei18n/noto-cjk/archive/be6c059ac1587e556e2412b27f5155c8eb3ddbe6.tar.gz -> noto-cjk-20190416.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5a34f5d57eeb180b81624c7bd6bae013
+_md5_=3a1bfe779c02317fc1477366785fc694
diff --git a/metadata/md5-cache/media-fonts/pigiarniq-1 b/metadata/md5-cache/media-fonts/pigiarniq-1
index b9f74d0d254e..c585602ed090 100644
--- a/metadata/md5-cache/media-fonts/pigiarniq-1
+++ b/metadata/md5-cache/media-fonts/pigiarniq-1
@@ -7,6 +7,6 @@ IUSE=X
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 SLOT=0
-SRC_URI=http://www.gov.nu.ca/documents/fonts/pigiarniq.zip
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/pigiarniq-1.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8d1a98c25b85de9284854febc73270b
+_md5_=de8dcfcef8e21fb2d7e8393765ce5da8
diff --git a/metadata/md5-cache/media-fonts/pigiarniq-2 b/metadata/md5-cache/media-fonts/pigiarniq-2
new file mode 100644
index 000000000000..5606daef6621
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/pigiarniq-2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=Nunavut's official Inuktitut font
+EAPI=6
+HOMEPAGE=http://www.ch.gov.nu.ca/en/ComputerTools.aspx
+IUSE=X
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=http://ch.gov.nu.ca/fonts/pigiarniq.zip -> pigiarniq-2.zip
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3a7c9da4fabd2a35dc6f04e241ab810c
diff --git a/metadata/md5-cache/media-fonts/texcm-ttf-1.0 b/metadata/md5-cache/media-fonts/texcm-ttf-1.0
index 590b8fcecac3..ba3409e170b4 100644
--- a/metadata/md5-cache/media-fonts/texcm-ttf-1.0
+++ b/metadata/md5-cache/media-fonts/texcm-ttf-1.0
@@ -7,6 +7,6 @@ IUSE=X
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=bakoma
 SLOT=0
-SRC_URI=http://www.mozilla.org/projects/mathml/fonts/bakoma/texcm-ttf.zip
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/texcm-ttf-1.0.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b6ac0e775d5ae2fde43ed3e46893e7e
+_md5_=5d2bda0ca2b6a637edb92b5efa4834cf
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 9f6dc84da5d9..961c4ff4559a 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/blender-2.79b-r1 b/metadata/md5-cache/media-gfx/blender-2.79b-r1
index b6941da9b27c..f69345217fb1 100644
--- a/metadata/md5-cache/media-gfx/blender-2.79b-r1
+++ b/metadata/md5-cache/media-gfx/blender-2.79b-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) opencl? ( cycles ) osl? ( cycles llvm ) player? ( game-engine !headless )
 SLOT=0
 SRC_URI=https://download.blender.org/source/blender-2.79b.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df80c5b73b4bcf8118bee6059e67b341
diff --git a/metadata/md5-cache/media-gfx/chafa-1.2.1 b/metadata/md5-cache/media-gfx/chafa-1.2.1
new file mode 100644
index 000000000000..293ba8b3f09e
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/chafa-1.2.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/glib:2 media-gfx/imagemagick:0=
+DESCRIPTION=versatile and fast Unicode/ASCII/ANSI graphics renderer
+EAPI=7
+HOMEPAGE=https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa
+IUSE=static-libs +tools
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-libs/glib:2 media-gfx/imagemagick:0=
+SLOT=0
+SRC_URI=https://hpjansson.org/chafa/releases/chafa-1.2.1.tar.xz
+_md5_=3a52e10e83811fdfc183bbd907948933
diff --git a/metadata/md5-cache/media-gfx/cura-4.2.1 b/metadata/md5-cache/media-gfx/cura-4.2.1
new file mode 100644
index 000000000000..d9b22e6ce8c1
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/cura-4.2.1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/uranium-4.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=media-gfx/curaengine-4.2 >=media-gfx/fdm-materials-4.2 >=dev-libs/libsavitar-4.2:=[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/libcharon-4.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] usb? ( dev-python/pyserial[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A 3D model slicing application for 3D printing
+EAPI=7
+HOMEPAGE=https://github.com/Ultimaker/Cura
+IUSE=+usb zeroconf python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/uranium-4.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=media-gfx/curaengine-4.2 >=media-gfx/fdm-materials-4.2 >=dev-libs/libsavitar-4.2:=[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/libcharon-4.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] usb? ( dev-python/pyserial[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/Ultimaker/Cura/archive/4.2.1.tar.gz -> cura-4.2.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d836fdc1bfe6f42ff91d7d757c9504eb
diff --git a/metadata/md5-cache/media-gfx/curaengine-4.2.0 b/metadata/md5-cache/media-gfx/curaengine-4.2.0
new file mode 100644
index 000000000000..020779435a0e
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/curaengine-4.2.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( <sys-devel/gcc-9 <sys-devel/clang-8 ) doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=~dev-libs/libarcus-4.2.0:* dev-libs/protobuf dev-libs/stb
+DESCRIPTION=A 3D model slicing engine for 3D printing
+EAPI=7
+HOMEPAGE=https://github.com/Ultimaker/CuraEngine
+IUSE=doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=~dev-libs/libarcus-4.2.0:* dev-libs/protobuf dev-libs/stb
+SLOT=0
+SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/4.2.0.tar.gz -> curaengine-4.2.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=98329be862a40369a4811d336ecd380d
diff --git a/metadata/md5-cache/media-gfx/dcraw-9.28.0-r1 b/metadata/md5-cache/media-gfx/dcraw-9.28.0-r1
index 069d40d5b155..88703c782c14 100644
--- a/metadata/md5-cache/media-gfx/dcraw-9.28.0-r1
+++ b/metadata/md5-cache/media-gfx/dcraw-9.28.0-r1
@@ -1,14 +1,14 @@
 BDEPEND=nls? ( sys-devel/gettext ) gimp? ( virtual/pkgconfig )
 DEFINED_PHASES=compile install prepare
-DEPEND=jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) jpeg2k? ( media-libs/jasper:= ) gimp? ( media-gfx/gimp )
+DEPEND=jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) gimp? ( media-gfx/gimp )
 DESCRIPTION=Command-line decoder for raw digital photos
 EAPI=7
 HOMEPAGE=https://www.cybercom.net/~dcoffin/dcraw/
-IUSE=nls gimp jpeg jpeg2k lcms
+IUSE=nls gimp jpeg lcms
 KEYWORDS=alpha amd64 arm arm64 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
+RDEPEND=jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) 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	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=06378be693284e57f709a6b9f861a1a9
+_md5_=8b0a71d43f3010cb856118ec371d9a30
diff --git a/metadata/md5-cache/media-gfx/digikam-6.0.0 b/metadata/md5-cache/media-gfx/digikam-6.0.0
index b07694f0a281..65ba0f83842f 100644
--- a/metadata/md5-cache/media-gfx/digikam-6.0.0
+++ b/metadata/md5-cache/media-gfx/digikam-6.0.0
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gettext panorama? ( sys-devel/bison sys-devel/flex ) sys-devel/make >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[mysql?] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-libs/expat >=media-gfx/exiv2-0.26:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= >=media-libs/opencv-3.1.0:= media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 ) calendar? ( >=kde-apps/kcalcore-19.04.3:5 ) gphoto2? ( media-libs/libgphoto2:= ) jpeg2k? ( media-libs/jasper:= ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-apps/marble-19.04.3:5 >=dev-qt/qtconcurrent-5.12.3:5 ) mediaplayer? ( media-libs/qtav[opengl] !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.60.0:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.60.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) dev-cpp/eigen:3 dev-libs/boost[threads] dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[mysql?] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-libs/expat >=media-gfx/exiv2-0.26:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= >=media-libs/opencv-3.1.0:= media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 ) calendar? ( >=kde-apps/kcalcore-19.04.3:5 ) gphoto2? ( media-libs/libgphoto2:= ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-apps/marble-19.04.3:5 >=dev-qt/qtconcurrent-5.12.3:5 ) mediaplayer? ( media-libs/qtav[opengl] !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.60.0:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.60.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) dev-cpp/eigen:3 dev-libs/boost[threads] dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Digital photo management application
 EAPI=7
 HOMEPAGE=https://www.digikam.org/
-IUSE=addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X debug
+IUSE=addressbook calendar gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X debug
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[mysql?] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-libs/expat >=media-gfx/exiv2-0.26:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= >=media-libs/opencv-3.1.0:= media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 ) calendar? ( >=kde-apps/kcalcore-19.04.3:5 ) gphoto2? ( media-libs/libgphoto2:= ) jpeg2k? ( media-libs/jasper:= ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-apps/marble-19.04.3:5 >=dev-qt/qtconcurrent-5.12.3:5 ) mediaplayer? ( media-libs/qtav[opengl] !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.60.0:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.60.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) mysql? ( virtual/mysql[server] ) panorama? ( media-gfx/hugin ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[mysql?] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-libs/expat >=media-gfx/exiv2-0.26:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= >=media-libs/opencv-3.1.0:= media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 ) calendar? ( >=kde-apps/kcalcore-19.04.3:5 ) gphoto2? ( media-libs/libgphoto2:= ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-apps/marble-19.04.3:5 >=dev-qt/qtconcurrent-5.12.3:5 ) mediaplayer? ( media-libs/qtav[opengl] !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.60.0:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.60.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) mysql? ( virtual/mysql[server] ) panorama? ( media-gfx/hugin ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/6.0.0/digikam-6.0.0.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bbfd9f4ca23f4a5ebba7ee1f2d143295
+_md5_=9f7f7af9a81a88bbffdc74a3491f82e1
diff --git a/metadata/md5-cache/media-gfx/digikam-6.2.0 b/metadata/md5-cache/media-gfx/digikam-6.2.0
index 3cd3fa0827fc..50096bf6dcf8 100644
--- a/metadata/md5-cache/media-gfx/digikam-6.2.0
+++ b/metadata/md5-cache/media-gfx/digikam-6.2.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/6.2.0/digikam-6.2.0.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=626064f1bde75a0e2e206f387d12d06f
+_md5_=d8ec902ee86812a7264bdd77272bb7bd
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.8.5.0 b/metadata/md5-cache/media-gfx/displaycal-3.8.5.0
new file mode 100644
index 000000000000..69c2056ca96e
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/displaycal-3.8.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Display calibration and characterization powered by Argyll CMS
+EAPI=6
+HOMEPAGE=https://displaycal.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/libX11-1.3.3 >=x11-apps/xrandr-1.3.2 >=x11-libs/libXxf86vm-1.1.0 >=x11-libs/libXinerama-1.1 dev-python/faulthandler[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.8.5.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0021967a7c3455e3794fbea87254c0f2
diff --git a/metadata/md5-cache/media-gfx/eog-3.28.4 b/metadata/md5-cache/media-gfx/eog-3.28.4
index fe14a602a66e..260ad360c2de 100644
--- a/metadata/md5-cache/media-gfx/eog-3.28.4
+++ b/metadata/md5-cache/media-gfx/eog-3.28.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gn
 REQUIRED_USE=exif? ( jpeg )
 SLOT=1
 SRC_URI=mirror://gnome/sources/eog/3.28/eog-3.28.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6dd16d70c6bc97c13ea3a75f8af56c13
diff --git a/metadata/md5-cache/media-gfx/exact-image-0.8.1-r3 b/metadata/md5-cache/media-gfx/exact-image-0.8.1-r3
index d3a98c770fa8..6c78d59b826e 100644
--- a/metadata/md5-cache/media-gfx/exact-image-0.8.1-r3
+++ b/metadata/md5-cache/media-gfx/exact-image-0.8.1-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure prepare setup
-DEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg2k? ( media-libs/jasper ) jpeg? ( virtual/jpeg ) lua? ( dev-lang/lua ) openexr? ( media-libs/openexr ) php? ( dev-lang/php ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.2.43 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( dev-lang/ruby ) tiff? ( media-libs/tiff ) truetype? ( >=media-libs/freetype-2 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM ) virtual/pkgconfig swig? ( dev-lang/swig )
+DEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( virtual/jpeg ) lua? ( dev-lang/lua ) openexr? ( media-libs/openexr ) php? ( dev-lang/php ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.2.43 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( dev-lang/ruby ) tiff? ( media-libs/tiff ) truetype? ( >=media-libs/freetype-2 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM ) virtual/pkgconfig swig? ( dev-lang/swig )
 DESCRIPTION=A fast, modern and generic image processing library
 EAPI=6
 HOMEPAGE=http://www.exactcode.de/site/open_source/exactimage/
-IUSE=expat jpeg jpeg2k lua openexr php perl png python ruby swig tiff truetype X python_targets_python2_7
+IUSE=expat jpeg lua openexr php perl png python ruby swig tiff truetype X python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg2k? ( media-libs/jasper ) jpeg? ( virtual/jpeg ) lua? ( dev-lang/lua ) openexr? ( media-libs/openexr ) php? ( dev-lang/php ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.2.43 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( dev-lang/ruby ) tiff? ( media-libs/tiff ) truetype? ( >=media-libs/freetype-2 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM )
+RDEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( virtual/jpeg ) lua? ( dev-lang/lua ) openexr? ( media-libs/openexr ) php? ( dev-lang/php ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.2.43 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( dev-lang/ruby ) tiff? ( media-libs/tiff ) truetype? ( >=media-libs/freetype-2 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://dl.exactcode.de/oss/exact-image/exact-image-0.8.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=22abbbce07636e3584d3e8247f38e587
+_md5_=f9218075b3e8c28796ef371245e36d1d
diff --git a/metadata/md5-cache/media-gfx/fbida-9999 b/metadata/md5-cache/media-gfx/fbida-9999
index 192cfe4a3f92..ca32d1773f67 100644
--- a/metadata/md5-cache/media-gfx/fbida-9999
+++ b/metadata/md5-cache/media-gfx/fbida-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!media-gfx/fbi >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 >=x11-libs/motif-2.3:0 app-text/poppler media-libs/giflib:= media-libs/libepoxy media-libs/libexif media-libs/libpng:* media-libs/libwebp media-libs/mesa[X(+)] media-libs/tiff:* net-misc/curl virtual/jpeg:* virtual/ttf-fonts x11-libs/cairo[opengl] x11-libs/libX11 x11-libs/libXpm x11-libs/libXt x11-libs/libdrm
 SLOT=0
 SRC_URI=mirror://gentoo/ida.png.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=c1cba595ce0fb3e4cdd1884fb122ca6d
diff --git a/metadata/md5-cache/media-gfx/fdm-materials-4.2.0 b/metadata/md5-cache/media-gfx/fdm-materials-4.2.0
new file mode 100644
index 000000000000..0fa37ab43793
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/fdm-materials-4.2.0
@@ -0,0 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=FDM materials for media-gfx/cura
+EAPI=7
+HOMEPAGE=https://github.com/Ultimaker/fdm_materials
+KEYWORDS=~amd64 ~x86
+LICENSE=CC0-1.0
+SLOT=0
+SRC_URI=https://github.com/Ultimaker/fdm_materials/archive/4.2.0.tar.gz -> fdm-materials-4.2.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dbe7f920baa2e698658eb65970b2f322
diff --git a/metadata/md5-cache/media-gfx/feh-3.2.1 b/metadata/md5-cache/media-gfx/feh-3.2.1
index e37de3b85437..c000f76c6352 100644
--- a/metadata/md5-cache/media-gfx/feh-3.2.1
+++ b/metadata/md5-cache/media-gfx/feh-3.2.1
@@ -4,10 +4,11 @@ DESCRIPTION=A fast, lightweight imageviewer using imlib2
 EAPI=6
 HOMEPAGE=https://feh.finalrewind.org/
 IUSE=debug curl exif test xinerama
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~mips ppc ppc64 x86
 LICENSE=feh
 RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://feh.finalrewind.org/feh-3.2.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=22b8d1540a1e6a7933c58c70064e62a4
+_md5_=e637b7c0c60f10ceced3a47d33afa0e0
diff --git a/metadata/md5-cache/media-gfx/fim-0.5_rc3 b/metadata/md5-cache/media-gfx/fim-0.5_rc3
index f461486f8eba..e907acf29ff5 100644
--- a/metadata/md5-cache/media-gfx/fim-0.5_rc3
+++ b/metadata/md5-cache/media-gfx/fim-0.5_rc3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=media-fonts/terminus-font aalib? ( media-libs/aalib[slang] ) dia? ( app-office/dia ) djvu? ( app-text/djvu ) exif? ( media-libs/libexif ) gif? ( media-libs/giflib ) graphicsmagick? ( media-gfx/graphicsmagick ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) pdf? ( >=app-text/poppler-0.31 ) png? ( media-libs/libpng:0= ) postscript? ( app-text/libspectre ) readline? ( sys-libs/readline:0= ) sdl? ( media-libs/libsdl ) svg? ( media-gfx/inkscape ) tiff? ( media-libs/tiff:0 ) xfig? ( media-gfx/xfig ) sys-devel/bison sys-devel/flex >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-fonts/terminus-font aalib? ( media-libs/aalib[slang] ) dia? ( app-office/dia ) djvu? ( app-text/djvu ) exif? ( media-libs/libexif ) gif? ( media-libs/giflib ) graphicsmagick? ( media-gfx/graphicsmagick ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg:0 ) pdf? ( >=app-text/poppler-0.31 ) png? ( media-libs/libpng:0= ) postscript? ( app-text/libspectre ) readline? ( sys-libs/readline:0= ) sdl? ( media-libs/libsdl ) svg? ( media-gfx/inkscape ) tiff? ( media-libs/tiff:0 ) xfig? ( media-gfx/xfig ) sys-devel/bison sys-devel/flex >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Fbi-IMproved is a framebuffer image viewer based on Fbi and inspired from Vim
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/fbi-improved
-IUSE=aalib bmp dia djvu exif fbcon gif graphicsmagick imagemagick jpeg jpeg2k pcx pdf png postscript readline sdl static svg tiff xfig
+IUSE=aalib bmp dia djvu exif fbcon gif graphicsmagick imagemagick jpeg pcx pdf png postscript readline sdl static svg tiff xfig
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=media-fonts/terminus-font aalib? ( media-libs/aalib[slang] ) dia? ( app-office/dia ) djvu? ( app-text/djvu ) exif? ( media-libs/libexif ) gif? ( media-libs/giflib ) graphicsmagick? ( media-gfx/graphicsmagick ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) pdf? ( >=app-text/poppler-0.31 ) png? ( media-libs/libpng:0= ) postscript? ( app-text/libspectre ) readline? ( sys-libs/readline:0= ) sdl? ( media-libs/libsdl ) svg? ( media-gfx/inkscape ) tiff? ( media-libs/tiff:0 ) xfig? ( media-gfx/xfig )
+RDEPEND=media-fonts/terminus-font aalib? ( media-libs/aalib[slang] ) dia? ( app-office/dia ) djvu? ( app-text/djvu ) exif? ( media-libs/libexif ) gif? ( media-libs/giflib ) graphicsmagick? ( media-gfx/graphicsmagick ) imagemagick? ( virtual/imagemagick-tools ) jpeg? ( virtual/jpeg:0 ) pdf? ( >=app-text/poppler-0.31 ) png? ( media-libs/libpng:0= ) postscript? ( app-text/libspectre ) readline? ( sys-libs/readline:0= ) sdl? ( media-libs/libsdl ) svg? ( media-gfx/inkscape ) tiff? ( media-libs/tiff:0 ) xfig? ( media-gfx/xfig )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/fbi-improved/fim-0.5-rc3.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=5dbfcd92a603a33df21183e5ed1f13c1
+_md5_=99e4c3ed309f6f64bdcf848ac033b0b8
diff --git a/metadata/md5-cache/media-gfx/frogr-1.5 b/metadata/md5-cache/media-gfx/frogr-1.5
index 5083a92f0faa..c3512781a13c 100644
--- a/metadata/md5-cache/media-gfx/frogr-1.5
+++ b/metadata/md5-cache/media-gfx/frogr-1.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2 >=x11-libs/gtk+-3.16:3[introspection] >=media-libs/libexif-0.6.14 >=dev-libs/libxml2-2.6.8:2 media-libs/gstreamer:1.0 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libgcrypt-1.5:*
 SLOT=0
 SRC_URI=mirror://gnome/sources/frogr/1.5/frogr-1.5.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d0869a70de2179570154ac2a5b5388a7
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.5.1 b/metadata/md5-cache/media-gfx/geeqie-1.5.1
new file mode 100644
index 000000000000..cc4d92419ac7
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/geeqie-1.5.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) dev-util/glib-utils
+DESCRIPTION=A lightweight GTK image viewer forked from GQview
+EAPI=7
+HOMEPAGE=http://www.geeqie.org
+IUSE=debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
+REQUIRED_USE=gpu-accel? ( gtk3 ) map? ( gpu-accel )
+SLOT=0
+SRC_URI=http://www.geeqie.org/geeqie-1.5.1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c0a3bddf88d0f463a003a56bf3949ef0
diff --git a/metadata/md5-cache/media-gfx/gimp-2.8.22-r1 b/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
index 776fefbc7bcc..eb24760730d9 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
+++ b/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= ) sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= ) sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNU Image Manipulation Program
 EAPI=5
 HOMEPAGE=https://www.gimp.org/
-IUSE=alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm test debug python_targets_python2_7
+IUSE=alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm test debug python_targets_python2_7
 KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
+RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gimp/v2.8/gimp-2.8.22.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc755f6e425c6a1f28db4eb42c931c29
+_md5_=4d1b95eb913fcccd2eb0ca91fa830914
diff --git a/metadata/md5-cache/media-gfx/gimp-2.9.8-r1 b/metadata/md5-cache/media-gfx/gimp-2.9.8-r1
index 8fb46387356e..ecfac28df3ce 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.9.8-r1
+++ b/metadata/md5-cache/media-gfx/gimp-2.9.8-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 dev-util/gtk-update-icon-cache >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0[gegl] >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.38 >=media-libs/gegl-0.3.24:0.3[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 jpeg2k? ( media-libs/jasper:= ) >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 ) >=media-libs/libpng-1.6.25:0 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 webp? ( >=media-libs/libwebp-0.6.0 ) wmf? ( >=media-libs/libwmf-0.2.8 ) net-libs/glib-networking[ssl] x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 dev-util/gtk-update-icon-cache >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0[gegl] >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.38 >=media-libs/gegl-0.3.24:0.3[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 ) >=media-libs/libpng-1.6.25:0 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 webp? ( >=media-libs/libwebp-0.6.0 ) wmf? ( >=media-libs/libwmf-0.2.8 ) net-libs/glib-networking[ssl] x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNU Image Manipulation Program
 EAPI=6
 HOMEPAGE=https://www.gimp.org/
-IUSE=alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm test python_targets_python2_7
+IUSE=alsa aalib altivec aqua debug doc openexr gnome postscript cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm test python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 dev-util/gtk-update-icon-cache >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0[gegl] >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.38 >=media-libs/gegl-0.3.24:0.3[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 jpeg2k? ( media-libs/jasper:= ) >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 ) >=media-libs/libpng-1.6.25:0 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 webp? ( >=media-libs/libwebp-0.6.0 ) wmf? ( >=media-libs/libwmf-0.2.8 ) net-libs/glib-networking[ssl] x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
+RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 dev-util/gtk-update-icon-cache >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0[gegl] >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.38 >=media-libs/gegl-0.3.24:0.3[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 ) >=media-libs/libpng-1.6.25:0 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=media-libs/tiff-3.5.7:0 >=gnome-base/librsvg-2.40.6:2 webp? ( >=media-libs/libwebp-0.6.0 ) wmf? ( >=media-libs/libwmf-0.2.8 ) net-libs/glib-networking[ssl] x11-libs/libXcursor sys-libs/zlib app-arch/bzip2 >=app-arch/xz-utils-5.0.0 postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gimp/v2.9/gimp-2.9.8.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d4638154917415a55c1c2e441aedd59c
+_md5_=f3dc859ff3ab38713f83d7275a5fef0e
diff --git a/metadata/md5-cache/media-gfx/gmic-2.5.3 b/metadata/md5-cache/media-gfx/gmic-2.5.3
deleted file mode 100644
index 83f088eeb714..000000000000
--- a/metadata/md5-cache/media-gfx/gmic-2.5.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( >=media-gfx/gimp-2.8.0 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) virtual/pkgconfig gimp? ( dev-qt/linguist-tools ) krita? ( dev-qt/linguist-tools ) qt5? ( dev-qt/linguist-tools )
-DESCRIPTION=GREYC's Magic Image Converter
-EAPI=7
-HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
-IUSE=+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=CeCILL-2 GPL-3
-RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( >=media-gfx/gimp-2.8.0 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
-REQUIRED_USE=|| ( cli gimp krita qt5 ) gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
-SLOT=0
-SRC_URI=https://gmic.eu/files/source/gmic_2.5.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f08f8a67d3af299bcbb11a121a750b23
diff --git a/metadata/md5-cache/media-gfx/gmic-2.6.7 b/metadata/md5-cache/media-gfx/gmic-2.6.7
deleted file mode 100644
index 9d8864d7e928..000000000000
--- a/metadata/md5-cache/media-gfx/gmic-2.6.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( >=media-gfx/gimp-2.8.0 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) virtual/pkgconfig gimp? ( dev-qt/linguist-tools ) krita? ( dev-qt/linguist-tools ) qt5? ( dev-qt/linguist-tools )
-DESCRIPTION=GREYC's Magic Image Converter
-EAPI=7
-HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
-IUSE=+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=CeCILL-2 GPL-3
-RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( >=media-gfx/gimp-2.8.0 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
-REQUIRED_USE=|| ( cli gimp krita qt5 ) gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
-SLOT=0
-SRC_URI=https://gmic.eu/files/source/gmic_2.6.7.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=98fcd60fc7343e523cbebfd6ba3d6119
diff --git a/metadata/md5-cache/media-gfx/gmic-2.7.0 b/metadata/md5-cache/media-gfx/gmic-2.7.0
new file mode 100644
index 000000000000..23dbc8af33c1
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gmic-2.7.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( >=media-gfx/gimp-2.8.0 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) gimp? ( dev-qt/linguist-tools ) krita? ( dev-qt/linguist-tools ) qt5? ( dev-qt/linguist-tools )
+DESCRIPTION=GREYC's Magic Image Converter
+EAPI=7
+HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
+IUSE=+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=CeCILL-2 GPL-3
+RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( >=media-gfx/gimp-2.8.0 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
+REQUIRED_USE=|| ( cli gimp krita qt5 ) gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
+SLOT=0
+SRC_URI=https://gmic.eu/files/source/gmic_2.7.0.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c1933f4c1f822545a314ee9f851ade66
diff --git a/metadata/md5-cache/media-gfx/gmic-2.7.1 b/metadata/md5-cache/media-gfx/gmic-2.7.1
new file mode 100644
index 000000000000..2f13af7526b5
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gmic-2.7.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( >=media-gfx/gimp-2.8.0 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) gimp? ( dev-qt/linguist-tools ) krita? ( dev-qt/linguist-tools ) qt5? ( dev-qt/linguist-tools )
+DESCRIPTION=GREYC's Magic Image Converter
+EAPI=7
+HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
+IUSE=+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=CeCILL-2 GPL-3
+RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( >=media-gfx/gimp-2.8.0 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
+REQUIRED_USE=|| ( cli gimp krita qt5 ) gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
+SLOT=0
+SRC_URI=https://gmic.eu/files/source/gmic_2.7.1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=28135d6d5503895e2d1b79eacb100f76
diff --git a/metadata/md5-cache/media-gfx/gnome-font-viewer-3.30.0 b/metadata/md5-cache/media-gfx/gnome-font-viewer-3.30.0
index 74c1d8aa0f68..4e29e5361e87 100644
--- a/metadata/md5-cache/media-gfx/gnome-font-viewer-3.30.0
+++ b/metadata/md5-cache/media-gfx/gnome-font-viewer-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.35.1:2 >=x11-libs/gtk+-3.20:3 >=media-libs/harfbuzz-0.9.9 media-libs/fontconfig:1.0 media-libs/freetype:2 gnome-base/gnome-desktop:3=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-font-viewer/3.30/gnome-font-viewer-3.30.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd6fa41add89e1336bda5556451a05ab
diff --git a/metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0 b/metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0
index 6ab05ed8facc..ad32fcf8f0c3 100644
--- a/metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0
+++ b/metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/libX11 x11-libs/libXext >=dev-libs/glib-2.35.1:2[dbus] >=x11-libs/gtk+-3.0.3:3 >=media-libs/libcanberra-0.26-r2[gtk3] >=gnome-base/gsettings-desktop-schemas-0.1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-screenshot/3.30/gnome-screenshot-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=111056b206d95a53045fa1518499571d
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.30 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.30
index 669257834c75..628afc1f52c1 100644
--- a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.30
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.30
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0 ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib ) test? ( media-fonts/corefonts ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0 ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib ) test? ( media-fonts/corefonts ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=http://www.graphicsmagick.org/
-IUSE=bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp perl png postscript q16 q32 static-libs svg test threads tiff truetype webp wmf X zlib
+IUSE=bzip2 cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp perl png postscript q16 q32 static-libs svg test threads tiff truetype webp wmf X zlib
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0 ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0 ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
 SLOT=0/1.3
 SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.30.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=5a6fc8a63d842b23479cbf7638fc37a2
+_md5_=9d765cf474e41ebdd87ffa0db718bab8
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.32 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.32
index 25ea4fad98e7..fbcf25415d61 100644
--- a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.32
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.32
@@ -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=compile configure install prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
 DESCRIPTION=Collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=http://www.graphicsmagick.org/
-IUSE=bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib
+IUSE=bzip2 cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
 SLOT=0/1.3
 SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.32.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3a4689afc9047de01dfc763ee288d8c4
+_md5_=a0aba5ea9628251ddb880c88a4bf0edd
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-9999 b/metadata/md5-cache/media-gfx/graphicsmagick-9999
index 16e5e95ef743..4877b886f85b 100644
--- a/metadata/md5-cache/media-gfx/graphicsmagick-9999
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-9999
@@ -1,13 +1,13 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib ) dev-vcs/mercurial
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib ) dev-vcs/mercurial
 DESCRIPTION=Collection of tools and libraries for many image formats
 EAPI=7
 HOMEPAGE=http://www.graphicsmagick.org/
-IUSE=bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib
+IUSE=bzip2 cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libXext ) zlib? ( sys-libs/zlib )
 SLOT=0/9999
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	mercurial	d22fe98ea362174612a57c233239102f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=25f3c2a69232bd7a18e60d5306bd0d86
+_md5_=44c8f8d016a894fb6430fd8e6449548b
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.12.3 b/metadata/md5-cache/media-gfx/libimagequant-2.12.3
index 619b0bb354a0..02a8a3f8b9f7 100644
--- a/metadata/md5-cache/media-gfx/libimagequant-2.12.3
+++ b/metadata/md5-cache/media-gfx/libimagequant-2.12.3
@@ -3,9 +3,9 @@ DESCRIPTION=Palette quantization library that powers pngquant and other PNG opti
 EAPI=7
 HOMEPAGE=https://pngquant.org/lib/
 IUSE=cpu_flags_x86_sse2 debug openmp static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0/0
 SRC_URI=https://github.com/ImageOptim/libimagequant/archive/2.12.3.tar.gz -> libimagequant-2.12.3.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=459033c6001fc5aa7820fcb93eefed32
+_md5_=61f81d0c9e2f993e9e0c1e1d30c9ef4f
diff --git a/metadata/md5-cache/media-gfx/pycam-0.6.4 b/metadata/md5-cache/media-gfx/pycam-0.6.4
new file mode 100644
index 000000000000..cd680ad1b9e3
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/pycam-0.6.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtkglext[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/librsvg-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Open Source CAM - Toolpath Generation for 3-Axis CNC machining
+EAPI=6
+HOMEPAGE=http://pycam.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtkglext[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/librsvg-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/SebKuzminsky/pycam/archive/v0.6.4.tar.gz -> pycam-0.6.4.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c97679a5e2ecdac7c297898acf3b3b64
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.30.2 b/metadata/md5-cache/media-gfx/shotwell-0.30.2
index c4dc65a66b46..24bef333ec8d 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.30.2
+++ b/metadata/md5-cache/media-gfx/shotwell-0.30.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=x11-libs/gtk+-3.22.0:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8 >=net-libs/webkit-gtk-2.4:4 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=virtual/libgudev-145:= ) >=media-libs/gexiv2-0.10.4 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16:= dev-libs/libgdata >=app-crypt/gcr-3:=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-2.3.0:= ) || ( dev-lang/vala:0.42 dev-lang/vala:0.40 ) dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig net-libs/libsoup:2.4[vala] media-libs/gexiv2[vala] app-crypt/gcr[vala] app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=x11-libs/gtk+-3.22.0:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8 >=net-libs/webkit-gtk-2.4:4 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=virtual/libgudev-145:= ) >=media-libs/gexiv2-0.10.4 <media-libs/gexiv2-0.11 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16:= dev-libs/libgdata >=app-crypt/gcr-3:=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-2.3.0:= ) || ( dev-lang/vala:0.42 dev-lang/vala:0.40 ) dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig net-libs/libsoup:2.4[vala] media-libs/gexiv2[vala] app-crypt/gcr[vala] app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Open source photo manager for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Shotwell
 IUSE=opencv udev
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=>=x11-libs/gtk+-3.22.0:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8 >=net-libs/webkit-gtk-2.4:4 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=virtual/libgudev-145:= ) >=media-libs/gexiv2-0.10.4 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16:= dev-libs/libgdata >=app-crypt/gcr-3:=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-2.3.0:= ) media-plugins/gst-plugins-gdkpixbuf:1.0 media-plugins/gst-plugins-meta:1.0
+RDEPEND=>=x11-libs/gtk+-3.22.0:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8 >=net-libs/webkit-gtk-2.4:4 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=virtual/libgudev-145:= ) >=media-libs/gexiv2-0.10.4 <media-libs/gexiv2-0.11 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16:= dev-libs/libgdata >=app-crypt/gcr-3:=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-2.3.0:= ) media-plugins/gst-plugins-gdkpixbuf:1.0 media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.30/shotwell-0.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fef72700faf9c91612ae29e7873840de
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3555602f7e1c7d6ffa65014a4d085ffc
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.30.7 b/metadata/md5-cache/media-gfx/shotwell-0.30.7
new file mode 100644
index 000000000000..a18ce418ffee
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/shotwell-0.30.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=x11-libs/gtk+-3.22.0:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8 >=net-libs/webkit-gtk-2.4:4 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=virtual/libgudev-145:= ) >=media-libs/gexiv2-0.10.4 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16:= dev-libs/libgdata >=app-crypt/gcr-3:=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-2.3.0:= ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Open source photo manager for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Shotwell
+IUSE=opencv udev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=x11-libs/gtk+-3.22.0:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8 >=net-libs/webkit-gtk-2.4:4 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=virtual/libgudev-145:= ) >=media-libs/gexiv2-0.10.4 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16:= dev-libs/libgdata >=app-crypt/gcr-3:=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-2.3.0:= ) media-plugins/gst-plugins-gdkpixbuf:1.0 media-plugins/gst-plugins-meta:1.0
+SLOT=0
+SRC_URI=mirror://gnome/sources/shotwell/0.30/shotwell-0.30.7.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=34542e70e5723786b311f4afadcff39a
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.30.2 b/metadata/md5-cache/media-gfx/simple-scan-3.30.2
index 3bc82ed2a219..8799dc43ef8f 100644
--- a/metadata/md5-cache/media-gfx/simple-scan-3.30.2
+++ b/metadata/md5-cache/media-gfx/simple-scan-3.30.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.22:3 >=sys-libs/zlib-1.2.3.1:= x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=dev-libs/libgusb-0.2.7 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) webp? ( media-libs/libwebp ) >=media-gfx/sane-backends-1.0.20:= virtual/jpeg:0= x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://gnome/sources/simple-scan/3.30/simple-scan-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a28299e544b5eb8f16df4e2055deb544
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.32.2 b/metadata/md5-cache/media-gfx/simple-scan-3.32.2
index e5a3e766ab42..cca945cfac2a 100644
--- a/metadata/md5-cache/media-gfx/simple-scan-3.32.2
+++ b/metadata/md5-cache/media-gfx/simple-scan-3.32.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.22:3 >=sys-libs/zlib-1.2.3.1:= x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=dev-libs/libgusb-0.2.7 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) webp? ( media-libs/libwebp ) >=media-gfx/sane-backends-1.0.20:= virtual/jpeg:0= x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://gnome/sources/simple-scan/3.32/simple-scan-3.32.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0561c5d3c7a4e6c624802b5028edc181
diff --git a/metadata/md5-cache/media-gfx/ufraw-0.22-r2 b/metadata/md5-cache/media-gfx/ufraw-0.22-r2
index a243206b5fed..2baf943315f9 100644
--- a/metadata/md5-cache/media-gfx/ufraw-0.22-r2
+++ b/metadata/md5-cache/media-gfx/ufraw-0.22-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2= >=media-gfx/exiv2-0.11:0= media-libs/lcms:2= >=media-libs/lensfun-0.2.5:= media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= fits? ( sci-libs/cfitsio:0= ) gimp? ( >=media-gfx/gimp-2 ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=media-gfx/gtkimageview-1.5 >=x11-libs/gtk+-2.6:2 ) jpeg2k? ( media-libs/jasper:= ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2= >=media-gfx/exiv2-0.11:0= media-libs/lcms:2= >=media-libs/lensfun-0.2.5:= media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= fits? ( sci-libs/cfitsio:0= ) gimp? ( >=media-gfx/gimp-2 ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=media-gfx/gtkimageview-1.5 >=x11-libs/gtk+-2.6:2 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=RAW Image format viewer and GIMP plugin
 EAPI=6
 HOMEPAGE=http://ufraw.sourceforge.net/
-IUSE=contrast fits gimp gnome gtk jpeg2k openmp timezone
+IUSE=contrast fits gimp gnome gtk openmp timezone
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2= >=media-gfx/exiv2-0.11:0= media-libs/lcms:2= >=media-libs/lensfun-0.2.5:= media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= fits? ( sci-libs/cfitsio:0= ) gimp? ( >=media-gfx/gimp-2 ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=media-gfx/gtkimageview-1.5 >=x11-libs/gtk+-2.6:2 ) jpeg2k? ( media-libs/jasper:= )
+RDEPEND=dev-libs/glib:2= >=media-gfx/exiv2-0.11:0= media-libs/lcms:2= >=media-libs/lensfun-0.2.5:= media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= fits? ( sci-libs/cfitsio:0= ) gimp? ( >=media-gfx/gimp-2 ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=media-gfx/gtkimageview-1.5 >=x11-libs/gtk+-2.6:2 )
 REQUIRED_USE=gimp? ( gtk )
 SLOT=0
 SRC_URI=mirror://sourceforge/ufraw/ufraw-0.22.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d59c06d2f3366c3fd92e0619ee9e384
+_md5_=59b3611a3d8dcaf6660cfd1fc724c292
diff --git a/metadata/md5-cache/media-gfx/viewnior-1.7-r1 b/metadata/md5-cache/media-gfx/viewnior-1.7-r1
index 29676d968c85..59feadf45f03 100644
--- a/metadata/md5-cache/media-gfx/viewnior-1.7-r1
+++ b/metadata/md5-cache/media-gfx/viewnior-1.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 media-gfx/exiv2:0= x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://github.com/hellosiyan/Viewnior/archive/viewnior-1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7fd71627be676aae390b619212da59cb
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 58e220453b76..3d65198ce192 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/alsa-lib-1.1.8 b/metadata/md5-cache/media-libs/alsa-lib-1.1.8
index 783c4f0d7b45..ded1eb459c29 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.1.8
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.1.8
@@ -5,11 +5,11 @@ DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
 IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://alsaproject/lib/alsa-lib-1.1.8.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a89317062c3748fc035d2dcac2f416f4
+_md5_=2a65da35484d66a67765f30511987a0a
diff --git a/metadata/md5-cache/media-libs/alsa-oss-1.1.8 b/metadata/md5-cache/media-libs/alsa-oss-1.1.8
index 51b487c2b1c2..f5c98a7fac9f 100644
--- a/metadata/md5-cache/media-libs/alsa-oss-1.1.8
+++ b/metadata/md5-cache/media-libs/alsa-oss-1.1.8
@@ -5,10 +5,10 @@ DESCRIPTION=Advanced Linux Sound Architecture OSS compatibility layer
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://alsaproject/oss-lib/alsa-oss-1.1.8.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e6e69b87b6cf59a7f5683fdae0cb842a
+_md5_=c0959d285443f4ad9edb63fcf206db12
diff --git a/metadata/md5-cache/media-libs/assimp-4.0.1-r1 b/metadata/md5-cache/media-libs/assimp-4.0.1-r1
new file mode 100644
index 000000000000..dcd1817975de
--- /dev/null
+++ b/metadata/md5-cache/media-libs/assimp-4.0.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] samples? ( media-libs/freeglut virtual/opengl x11-libs/libX11 ) tools? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-libs/devil virtual/opengl ) test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Importer library to import assets from 3D files
+EAPI=6
+HOMEPAGE=https://github.com/assimp/assimp
+IUSE=samples static test tools
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] samples? ( media-libs/freeglut virtual/opengl x11-libs/libX11 ) tools? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-libs/devil virtual/opengl )
+SLOT=0
+SRC_URI=https://github.com/assimp/assimp/archive/v4.0.1.tar.gz -> assimp-4.0.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ade7ac8e19b7b15fcf32692ce28ca6e5
diff --git a/metadata/md5-cache/media-libs/assimp-4.1.0 b/metadata/md5-cache/media-libs/assimp-4.1.0
new file mode 100644
index 000000000000..c32abb122e91
--- /dev/null
+++ b/metadata/md5-cache/media-libs/assimp-4.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] samples? ( media-libs/freeglut virtual/opengl x11-libs/libX11 ) tools? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-libs/devil virtual/opengl ) test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Importer library to import assets from 3D files
+EAPI=6
+HOMEPAGE=https://github.com/assimp/assimp
+IUSE=samples static test tools
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] samples? ( media-libs/freeglut virtual/opengl x11-libs/libX11 ) tools? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-libs/devil virtual/opengl )
+SLOT=0
+SRC_URI=https://github.com/assimp/assimp/archive/v4.1.0.tar.gz -> assimp-4.1.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e1f3c0ad28f170fc26099c5b54676cde
diff --git a/metadata/md5-cache/media-libs/avidemux-core-2.7.0 b/metadata/md5-cache/media-libs/avidemux-core-2.7.0
deleted file mode 100644
index ac82362df400..000000000000
--- a/metadata/md5-cache/media-libs/avidemux-core-2.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-db/sqlite:3 nvenc? ( media-video/nvidia_video_sdk ) sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) vaapi? ( x11-libs/libva:0= ) vdpau? ( x11-libs/libvdpau:0 ) xv? ( x11-libs/libXv:0 ) virtual/pkgconfig nls? ( sys-devel/gettext ) !system-ffmpeg? ( dev-lang/yasm[nls=] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Core libraries for simple video cutting, filtering and encoding tasks
-EAPI=6
-HOMEPAGE=http://fixounet.free.fr/avidemux
-IUSE=debug nls nvenc sdl system-ffmpeg vaapi vdpau xv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
-RDEPEND=dev-db/sqlite:3 nvenc? ( media-video/nvidia_video_sdk ) sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) vaapi? ( x11-libs/libva:0= ) vdpau? ( x11-libs/libvdpau:0 ) xv? ( x11-libs/libXv:0 ) !<media-libs/avidemux-core-2.7.0 !<media-video/avidemux-2.7.0 nls? ( virtual/libintl:0 )
-SLOT=2.7
-SRC_URI=mirror://sourceforge/avidemux/avidemux/2.7.0/avidemux_2.7.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=508baa1cedb52840e302458d1646fc3a
diff --git a/metadata/md5-cache/media-libs/avidemux-core-2.7.4 b/metadata/md5-cache/media-libs/avidemux-core-2.7.4
new file mode 100644
index 000000000000..53fd5b3b770f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/avidemux-core-2.7.4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) !system-ffmpeg? ( dev-lang/yasm[nls=] ) sys-devel/make >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-db/sqlite:3 nvenc? ( media-video/nvidia_video_sdk ) sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) vaapi? ( x11-libs/libva:0= ) vdpau? ( x11-libs/libvdpau:0 ) xv? ( x11-libs/libXv:0 )
+DESCRIPTION=Core libraries for simple video cutting, filtering and encoding tasks
+EAPI=7
+HOMEPAGE=http://fixounet.free.fr/avidemux
+IUSE=debug nls nvenc sdl system-ffmpeg vaapi vdpau xv
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
+RDEPEND=dev-db/sqlite:3 nvenc? ( media-video/nvidia_video_sdk ) sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) vaapi? ( x11-libs/libva:0= ) vdpau? ( x11-libs/libvdpau:0 ) xv? ( x11-libs/libXv:0 ) !<media-libs/avidemux-core-2.7.4 !<media-video/avidemux-2.7.4 nls? ( virtual/libintl:0 )
+SLOT=2.7
+SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.4.tar.gz -> avidemux-2.7.4.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=614cb0ec8d1c940c60d7a4beee580038
diff --git a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.0 b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.0
deleted file mode 100644
index 1faef490ae9e..000000000000
--- a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ~media-libs/avidemux-core-2.7.0:2.7[vdpau?] ~media-video/avidemux-2.7.0:2.7[opengl?,qt5?] >=dev-lang/spidermonkey-1.5-r2:0= dev-libs/libxml2:2 media-libs/a52dec:0 media-libs/libass:0= media-libs/libmad:0 media-libs/libmp4v2:0 media-libs/libpng:0= virtual/libiconv:0 aac? ( >=media-libs/faac-1.29.9.2:0 media-libs/faad2:0 ) aften? ( media-libs/aften:0 ) alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 ) amr? ( media-libs/opencore-amr:0 ) dcaenc? ( media-sound/dcaenc:0 ) dts? ( media-libs/libdca:0 ) fdk? ( media-libs/fdk-aac:0= ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi:0 ) jack? ( media-sound/jack-audio-connection-kit:0 libsamplerate? ( media-libs/libsamplerate:0 ) ) lame? ( media-sound/lame:0 ) nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opus? ( media-libs/opus:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXv:0 ) xvid? ( media-libs/xvid:0 ) oss? ( virtual/os-headers:0 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Plugins for the video editor media-video/avidemux
-EAPI=6
-HOMEPAGE=http://fixounet.free.fr/avidemux
-IUSE=a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ~media-libs/avidemux-core-2.7.0:2.7[vdpau?] ~media-video/avidemux-2.7.0:2.7[opengl?,qt5?] >=dev-lang/spidermonkey-1.5-r2:0= dev-libs/libxml2:2 media-libs/a52dec:0 media-libs/libass:0= media-libs/libmad:0 media-libs/libmp4v2:0 media-libs/libpng:0= virtual/libiconv:0 aac? ( >=media-libs/faac-1.29.9.2:0 media-libs/faad2:0 ) aften? ( media-libs/aften:0 ) alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 ) amr? ( media-libs/opencore-amr:0 ) dcaenc? ( media-sound/dcaenc:0 ) dts? ( media-libs/libdca:0 ) fdk? ( media-libs/fdk-aac:0= ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi:0 ) jack? ( media-sound/jack-audio-connection-kit:0 libsamplerate? ( media-libs/libsamplerate:0 ) ) lame? ( media-sound/lame:0 ) nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opus? ( media-libs/opus:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXv:0 ) xvid? ( media-libs/xvid:0 ) !<media-libs/avidemux-plugins-2.7.0
-REQUIRED_USE=python_targets_python2_7
-SLOT=2.7
-SRC_URI=mirror://sourceforge/avidemux/avidemux/2.7.0/avidemux_2.7.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef81e3815f24e9a7092e477d62e9f911
diff --git a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.4 b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.4
new file mode 100644
index 000000000000..e3b3b531af77
--- /dev/null
+++ b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.4
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] ~media-libs/avidemux-core-2.7.4:2.7[vdpau?] ~media-video/avidemux-2.7.4:2.7[opengl?,qt5?] dev-lang/spidermonkey:0= dev-libs/libxml2:2 media-libs/a52dec media-libs/libass:0= media-libs/libmad media-libs/libmp4v2 media-libs/libpng:0= virtual/libiconv aac? ( media-libs/faac media-libs/faad2 ) aften? ( media-libs/aften ) alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) dcaenc? ( media-sound/dcaenc ) dts? ( media-libs/libdca ) fdk? ( media-libs/fdk-aac:0= ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi ) jack? ( media-sound/jack-audio-connection-kit libsamplerate? ( media-libs/libsamplerate ) ) lame? ( media-sound/lame ) nvenc? ( amd64? ( media-video/nvidia_video_sdk ) ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) xvid? ( media-libs/xvid ) oss? ( virtual/os-headers )
+DESCRIPTION=Plugins for the video editor media-video/avidemux
+EAPI=7
+HOMEPAGE=http://fixounet.free.fr/avidemux
+IUSE=a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] ~media-libs/avidemux-core-2.7.4:2.7[vdpau?] ~media-video/avidemux-2.7.4:2.7[opengl?,qt5?] dev-lang/spidermonkey:0= dev-libs/libxml2:2 media-libs/a52dec media-libs/libass:0= media-libs/libmad media-libs/libmp4v2 media-libs/libpng:0= virtual/libiconv aac? ( media-libs/faac media-libs/faad2 ) aften? ( media-libs/aften ) alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) dcaenc? ( media-sound/dcaenc ) dts? ( media-libs/libdca ) fdk? ( media-libs/fdk-aac:0= ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi ) jack? ( media-sound/jack-audio-connection-kit libsamplerate? ( media-libs/libsamplerate ) ) lame? ( media-sound/lame ) nvenc? ( amd64? ( media-video/nvidia_video_sdk ) ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) xvid? ( media-libs/xvid ) !<media-libs/avidemux-plugins-2.7.4
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=2.7
+SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.4.tar.gz -> avidemux-2.7.4.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a40fee902ebb472fcc85073ebab961d7
diff --git a/metadata/md5-cache/media-libs/cimg-2.7.0 b/metadata/md5-cache/media-libs/cimg-2.7.0
new file mode 100644
index 000000000000..df7672a3a325
--- /dev/null
+++ b/metadata/md5-cache/media-libs/cimg-2.7.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=C++ template image processing toolkit
+EAPI=7
+HOMEPAGE=https://cimg.eu/ https://github.com/dtschump/CImg
+IUSE=doc examples
+KEYWORDS=~amd64 ~x86
+LICENSE=CeCILL-2 CeCILL-C
+SLOT=0
+SRC_URI=https://github.com/dtschump/CImg/archive/v.2.7.0.tar.gz -> cimg-2.7.0.tar.gz
+_md5_=8e1c6df4cbdafa43ff73c1ac715f3e46
diff --git a/metadata/md5-cache/media-libs/dav1d-0.1.0 b/metadata/md5-cache/media-libs/dav1d-0.1.0
index 2b74271eaac2..0d6ffcad2bde 100644
--- a/metadata/md5-cache/media-libs/dav1d-0.1.0
+++ b/metadata/md5-cache/media-libs/dav1d-0.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.1.0/dav1d-0.1.0.tar.bz2
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=be50ab2fa8f179b65cc6aac422331fe6
diff --git a/metadata/md5-cache/media-libs/dav1d-0.2.0-r1 b/metadata/md5-cache/media-libs/dav1d-0.2.0-r1
index a333d5ddb4a6..8364df91e14f 100644
--- a/metadata/md5-cache/media-libs/dav1d-0.2.0-r1
+++ b/metadata/md5-cache/media-libs/dav1d-0.2.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0/1
 SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.2.0/dav1d-0.2.0.tar.bz2
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=d3bacc684ff4c5e6c296881efa1ecded
diff --git a/metadata/md5-cache/media-libs/dav1d-0.2.1 b/metadata/md5-cache/media-libs/dav1d-0.2.1
index 5be15a5e81d0..ab86fe5454dd 100644
--- a/metadata/md5-cache/media-libs/dav1d-0.2.1
+++ b/metadata/md5-cache/media-libs/dav1d-0.2.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0/1
 SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.2.1/dav1d-0.2.1.tar.bz2
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=d3bacc684ff4c5e6c296881efa1ecded
diff --git a/metadata/md5-cache/media-libs/dav1d-0.3.0 b/metadata/md5-cache/media-libs/dav1d-0.3.0
index 1eea0694e9b1..999ad73bf61e 100644
--- a/metadata/md5-cache/media-libs/dav1d-0.3.0
+++ b/metadata/md5-cache/media-libs/dav1d-0.3.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD-2
 SLOT=0/1
 SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.3.0/dav1d-0.3.0.tar.bz2
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=1822f363bca6b5f7321e1e74742e1c30
diff --git a/metadata/md5-cache/media-libs/dav1d-0.3.1 b/metadata/md5-cache/media-libs/dav1d-0.3.1
index 9fe8b3bcebd9..d680b5eb5b3b 100644
--- a/metadata/md5-cache/media-libs/dav1d-0.3.1
+++ b/metadata/md5-cache/media-libs/dav1d-0.3.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=BSD-2
 SLOT=0/1
 SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.3.1/dav1d-0.3.1.tar.bz2
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=9679356ecdbb43306ea9241a77deead9
diff --git a/metadata/md5-cache/media-libs/dav1d-0.4.0 b/metadata/md5-cache/media-libs/dav1d-0.4.0
new file mode 100644
index 000000000000..4282bb8137e2
--- /dev/null
+++ b/metadata/md5-cache/media-libs/dav1d-0.4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=asm? ( abi_x86_32? ( >=dev-lang/nasm-2.13 ) abi_x86_64? ( >=dev-lang/nasm-2.13 ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DESCRIPTION=dav1d is an AV1 Decoder :)
+EAPI=6
+HOMEPAGE=https://code.videolan.org/videolan/dav1d
+IUSE=+8bit +10bit +asm abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=BSD-2
+SLOT=0/2
+SRC_URI=https://code.videolan.org/videolan/dav1d/-/archive/0.4.0/dav1d-0.4.0.tar.bz2
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=54dd152953bc65992a9ad20b8e468477
diff --git a/metadata/md5-cache/media-libs/dav1d-9999 b/metadata/md5-cache/media-libs/dav1d-9999
index 126818fafd48..5b1d5813174d 100644
--- a/metadata/md5-cache/media-libs/dav1d-9999
+++ b/metadata/md5-cache/media-libs/dav1d-9999
@@ -6,6 +6,6 @@ HOMEPAGE=https://code.videolan.org/videolan/dav1d
 IUSE=+8bit +10bit +asm abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 LICENSE=BSD-2
 PROPERTIES=live
-SLOT=0/1
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=32d049d70dc96bb6877f6f6c6eedf4e0
+SLOT=0/2
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=54dd152953bc65992a9ad20b8e468477
diff --git a/metadata/md5-cache/media-libs/devil-1.7.8-r2 b/metadata/md5-cache/media-libs/devil-1.7.8-r2
index aadf5b5faf4d..74ccdb4f7daa 100644
--- a/metadata/md5-cache/media-libs/devil-1.7.8-r2
+++ b/metadata/md5-cache/media-libs/devil-1.7.8-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib:= ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr:= ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig 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
+DEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib:= ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg:0 ) mng? ( media-libs/libmng:= ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr:= ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig 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
 DESCRIPTION=DevIL image library
 EAPI=6
 HOMEPAGE=http://openil.sourceforge.net/
-IUSE=allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl static-libs tiff X xpm
+IUSE=allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt openexr opengl png sdl static-libs tiff X xpm
 KEYWORDS=amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86
 LICENSE=LGPL-2.1
-RDEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib:= ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr:= ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender ) xpm? ( x11-libs/libXpm )
+RDEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib:= ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg:0 ) mng? ( media-libs/libmng:= ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr:= ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender ) xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=mirror://sourceforge/openil/DevIL-1.7.8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e0a6024d5455570b677e900ddbc0fee1
+_md5_=61d6a840bf18a217786275278fad129e
diff --git a/metadata/md5-cache/media-libs/exiftool-11.54 b/metadata/md5-cache/media-libs/exiftool-11.54
deleted file mode 100644
index f03c04644158..000000000000
--- a/metadata/md5-cache/media-libs/exiftool-11.54
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Read and write meta information in image, audio and video files
-EAPI=6
-HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ https://metacpan.org/release/Image-ExifTool
-IUSE=doc
-KEYWORDS=amd64 arm64 ppc ppc64 x86 ~x64-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.54.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
-_md5_=04e7b210ae735fb814cce0b1a9271df4
diff --git a/metadata/md5-cache/media-libs/exiftool-11.60 b/metadata/md5-cache/media-libs/exiftool-11.60
index d0266702981c..0d78ba56c9db 100644
--- a/metadata/md5-cache/media-libs/exiftool-11.60
+++ b/metadata/md5-cache/media-libs/exiftool-11.60
@@ -4,10 +4,10 @@ DESCRIPTION=Read and write meta information in image, audio and video files
 EAPI=6
 HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ https://metacpan.org/release/Image-ExifTool
 IUSE=doc
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 arm64 ppc ppc64 x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.60.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
-_md5_=3b2fee8a0be590ab5f34b0ed558da8b8
+_md5_=04e7b210ae735fb814cce0b1a9271df4
diff --git a/metadata/md5-cache/media-libs/exiftool-11.61 b/metadata/md5-cache/media-libs/exiftool-11.61
deleted file mode 100644
index b528d3810dd2..000000000000
--- a/metadata/md5-cache/media-libs/exiftool-11.61
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Read and write meta information in image, audio and video files
-EAPI=6
-HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ https://metacpan.org/release/Image-ExifTool
-IUSE=doc
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.61.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
-_md5_=3b2fee8a0be590ab5f34b0ed558da8b8
diff --git a/metadata/md5-cache/media-libs/exiftool-11.63 b/metadata/md5-cache/media-libs/exiftool-11.63
new file mode 100644
index 000000000000..5d1ab209f350
--- /dev/null
+++ b/metadata/md5-cache/media-libs/exiftool-11.63
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Read and write meta information in image, audio and video files
+EAPI=6
+HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ https://metacpan.org/release/Image-ExifTool
+IUSE=doc
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.63.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
+_md5_=3b2fee8a0be590ab5f34b0ed558da8b8
diff --git a/metadata/md5-cache/media-libs/exiftool-11.65 b/metadata/md5-cache/media-libs/exiftool-11.65
new file mode 100644
index 000000000000..dbb0f5513d45
--- /dev/null
+++ b/metadata/md5-cache/media-libs/exiftool-11.65
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Read and write meta information in image, audio and video files
+EAPI=6
+HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ https://metacpan.org/release/Image-ExifTool
+IUSE=doc
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.65.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
+_md5_=3b2fee8a0be590ab5f34b0ed558da8b8
diff --git a/metadata/md5-cache/media-libs/gegl-0.2.0-r2 b/metadata/md5-cache/media-libs/gegl-0.2.0-r2
index f0ccbc0fddc6..4afff342680b 100644
--- a/metadata/md5-cache/media-libs/gegl-0.2.0-r2
+++ b/metadata/md5-cache/media-libs/gegl-0.2.0-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 ) >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 ) >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A graph based image processing framework
 EAPI=5
 HOMEPAGE=http://www.gegl.org/
-IUSE=cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack
+IUSE=cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack
 KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 )
+RDEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 )
 SLOT=0
 SRC_URI=https://download.gimp.org/pub/gegl/0.2/gegl-0.2.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08f264cd076cf96adbf1f5b4870f1d13
+_md5_=b51c392e4e7084d48251c45601b0bc4c
diff --git a/metadata/md5-cache/media-libs/gegl-0.2.0-r5 b/metadata/md5-cache/media-libs/gegl-0.2.0-r5
index 2e8b9345f789..5c679ea33911 100644
--- a/metadata/md5-cache/media-libs/gegl-0.2.0-r5
+++ b/metadata/md5-cache/media-libs/gegl-0.2.0-r5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( >=media-video/libav-11.3:0= ) !libav? ( media-video/ffmpeg:0= ) ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( >=media-libs/libopenraw-0.1:0= ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 ) >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( >=media-video/libav-11.3:0= ) !libav? ( media-video/ffmpeg:0= ) ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( >=media-libs/libopenraw-0.1:0= ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 ) >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
-IUSE=cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack
+IUSE=cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( >=media-video/libav-11.3:0= ) !libav? ( media-video/ffmpeg:0= ) ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( >=media-libs/libopenraw-0.1:0= ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 )
+RDEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( >=media-video/libav-11.3:0= ) !libav? ( media-video/ffmpeg:0= ) ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( >=media-libs/libopenraw-0.1:0= ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 )
 SLOT=0
 SRC_URI=https://download.gimp.org/pub/gegl/0.2/gegl-0.2.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81b405868f635683902e87cd7e530250
+_md5_=63b6180144df54e2a142564209f96ef1
diff --git a/metadata/md5-cache/media-libs/gegl-0.2.0-r6 b/metadata/md5-cache/media-libs/gegl-0.2.0-r6
index 4017b2d2fbef..9f73c5e6af16 100644
--- a/metadata/md5-cache/media-libs/gegl-0.2.0-r6
+++ b/metadata/md5-cache/media-libs/gegl-0.2.0-r6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( >=media-video/libav-12:0= ) !libav? ( >=media-video/ffmpeg-4:0= ) ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( >=media-libs/libopenraw-0.1:0= ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 ) >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( >=media-video/libav-12:0= ) !libav? ( >=media-video/ffmpeg-4:0= ) ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( >=media-libs/libopenraw-0.1:0= ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 ) >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
-IUSE=cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack
+IUSE=cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( >=media-video/libav-12:0= ) !libav? ( >=media-video/ffmpeg-4:0= ) ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( >=media-libs/libopenraw-0.1:0= ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 )
+RDEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( >=media-video/libav-12:0= ) !libav? ( >=media-video/ffmpeg-4:0= ) ) jpeg? ( virtual/jpeg:0 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( >=media-libs/libopenraw-0.1:0= ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) lensfun? ( >=media-libs/lensfun-0.2.5 )
 SLOT=0
 SRC_URI=https://download.gimp.org/pub/gegl/0.2/gegl-0.2.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20842d52a0d7113f18dc5133913fa92d
+_md5_=62190455868ab5435a24bfe96c18c986
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.0 b/metadata/md5-cache/media-libs/gegl-0.3.0
index 94e431180ce3..6e3c93e83339 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.0
+++ b/metadata/md5-cache/media-libs/gegl-0.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp ) >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp ) >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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 graph based image processing framework
 EAPI=5
 HOMEPAGE=http://www.gegl.org/
-IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp
+IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp )
+RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c02580f338ac0769ea514e81278a4b01
+_md5_=feb3d8e38c161d1a3bded4692f3c55ef
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.0-r1 b/metadata/md5-cache/media-libs/gegl-0.3.0-r1
index d9c3878d09ac..fe04b404c3bc 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.0-r1
+++ b/metadata/md5-cache/media-libs/gegl-0.3.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp ) >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp ) >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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 graph based image processing framework
 EAPI=5
 HOMEPAGE=http://www.gegl.org/
-IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp
+IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp )
+RDEPEND=>=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) jpeg? ( virtual/jpeg:0= ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=01a629277d4a4ed178396af438e5461b
+_md5_=d7f0935ce31b813ac40c625921344fa1
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.26 b/metadata/md5-cache/media-libs/gegl-0.3.26
index 925e1dea0c40..d73f8d9fb406 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.26
+++ b/metadata/md5-cache/media-libs/gegl-0.3.26
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.38 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.38 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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 graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
-IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp
+IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.38 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.38 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.26.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e36a1afe17ad9acfa28a348efe8d563
+_md5_=1ec42d5354bae15ce245b3285bc9175e
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.34 b/metadata/md5-cache/media-libs/gegl-0.3.34
index 40f3dc7c1148..6002ede13485 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.34
+++ b/metadata/md5-cache/media-libs/gegl-0.3.34
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.46 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.46 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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 graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
-IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp
+IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp
 KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.46 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.46 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.34.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c247a319b8092163c26aea280fdb6a1b
+_md5_=2792b9add293bebb7ed88a9a730bcc0e
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.14 b/metadata/md5-cache/media-libs/gegl-0.4.14
index 0257606e220c..87b6b82dd085 100644
--- a/metadata/md5-cache/media-libs/gegl-0.4.14
+++ b/metadata/md5-cache/media-libs/gegl-0.4.14
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.62 >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 ) dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( ffmpeg? ( media-libs/gexiv2 ) introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) )
+DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.62 >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 ) dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( ffmpeg? ( media-libs/gexiv2 ) introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) )
 DESCRIPTION=A graph based image processing framework
 EAPI=7
 HOMEPAGE=http://www.gegl.org/
-IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib
+IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3+ LGPL-3 )
-RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.62 >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 )
+RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.62 >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.4
 SRC_URI=http://download.gimp.org/pub/gegl/0.4/gegl-0.4.14.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54c9a5a9fb2189106d3419c053b31171
+_md5_=b21286a9199ef02a748ac4cff3c7029a
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.16 b/metadata/md5-cache/media-libs/gegl-0.4.16
index a5718a243ff3..fd95255dab18 100644
--- a/metadata/md5-cache/media-libs/gegl-0.4.16
+++ b/metadata/md5-cache/media-libs/gegl-0.4.16
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.62 >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 ) dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( ffmpeg? ( media-libs/gexiv2 ) introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) )
+DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.62 >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 ) dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( ffmpeg? ( media-libs/gexiv2 ) introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) )
 DESCRIPTION=A graph based image processing framework
 EAPI=7
 HOMEPAGE=http://www.gegl.org/
-IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib
+IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3+ LGPL-3 )
-RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.62 >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 )
+RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.62 >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.4
 SRC_URI=http://download.gimp.org/pub/gegl/0.4/gegl-0.4.16.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fedc9ec9a15b8881ce9844507a4fbd28
+_md5_=86f0015d09c0f025da0619d31e570b11
diff --git a/metadata/md5-cache/media-libs/gegl-9999 b/metadata/md5-cache/media-libs/gegl-9999
index 9516c3b81346..4a4b527dee40 100644
--- a/metadata/md5-cache/media-libs/gegl-9999
+++ b/metadata/md5-cache/media-libs/gegl-9999
@@ -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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.62 >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 ) dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( ffmpeg? ( media-libs/gexiv2 ) introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) )
+DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.62 >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 ) dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=sys-devel/libtool-2.2 test? ( ffmpeg? ( media-libs/gexiv2 ) introspection? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) )
 DESCRIPTION=A graph based image processing framework
 EAPI=7
 HOMEPAGE=http://www.gegl.org/
-IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib
+IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib
 LICENSE=|| ( GPL-3+ LGPL-3 )
 PROPERTIES=live
-RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.62 >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 )
+RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.62 >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.4
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69c9c1aaea9e31e0993b5719cfd0ee34
+_md5_=97c3e79ac8f751e529264167d5b02c83
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 d40faf8dfd13..29a591a9bfef 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
@@ -11,5 +11,5 @@ 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_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	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=921dcd84c8a07486d326f19905d3d0fe
diff --git a/metadata/md5-cache/media-libs/gexiv2-9999 b/metadata/md5-cache/media-libs/gexiv2-9999
index 1f58c021484d..6d91c2883a23 100644
--- a/metadata/md5-cache/media-libs/gexiv2-9999
+++ b/metadata/md5-cache/media-libs/gexiv2-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/glib-2.38.0:2 >=media-gfx/exiv2-0.21:= introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) ) test? ( python introspection ) vala? ( introspection )
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df779508284d5434863192a890a19953
diff --git a/metadata/md5-cache/media-libs/graphene-1.8.6 b/metadata/md5-cache/media-libs/graphene-1.8.6
index 2ddee9d0ab1d..145020158a70 100644
--- a/metadata/md5-cache/media-libs/graphene-1.8.6
+++ b/metadata/md5-cache/media-libs/graphene-1.8.6
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://github.com/ebassi/graphene/releases/download/1.8.6/graphene-1.8.6.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3bff9b36cc9882b8edee1a2b84d0e0c4
diff --git a/metadata/md5-cache/media-libs/grilo-0.3.7 b/metadata/md5-cache/media-libs/grilo-0.3.7
index 2029f18a84f8..d6b75a9183f4 100644
--- a/metadata/md5-cache/media-libs/grilo-0.3.7
+++ b/metadata/md5-cache/media-libs/grilo-0.3.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/libxml2:2 network? ( >=net-libs/libsoup-
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.3/0
 SRC_URI=mirror://gnome/sources/grilo/0.3/grilo-0.3.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8428f0fce695366535f743c6ef6de30f
diff --git a/metadata/md5-cache/media-libs/grilo-0.3.9 b/metadata/md5-cache/media-libs/grilo-0.3.9
new file mode 100644
index 000000000000..188c50e089e5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/grilo-0.3.9
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( >=dev-util/gtk-doc-1.10 app-text/docbook-xml-dtd:4.3 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) test? ( sys-apps/dbus ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.44:2 dev-libs/libxml2:2 network? ( >=net-libs/libsoup-2.41.3:2.4[introspection?] ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gtk? ( net-libs/liboauth >=x11-libs/gtk+-3.14:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A framework for easy media discovery and browsing
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Grilo
+IUSE=gtk gtk-doc +introspection +network +playlist test vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/libxml2:2 network? ( >=net-libs/libsoup-2.41.3:2.4[introspection?] ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gtk? ( net-libs/liboauth >=x11-libs/gtk+-3.14:3 )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0.3/0
+SRC_URI=mirror://gnome/sources/grilo/0.3/grilo-0.3.9.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=02d247088d0a099f3f825da5b9397bb9
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.5 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.5
new file mode 100644
index 000000000000..6d0b1b7e148c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl?,introspection?,gles2=,opengl=] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vnc? ( X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.4 ) gtk? ( >=media-plugins/gst-plugins-gtk-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=sys-devel/gettext-0.17 ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Less plugins for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl?,introspection?,gles2=,opengl=] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vnc? ( X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.4 ) gtk? ( >=media-plugins/gst-plugins-gtk-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa45896982493af08ee915ba971e8e9c
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.5 b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.5
new file mode 100644
index 000000000000..b1277959ac27
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.5:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 X? ( x11-base/xorg-proto ) >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=sys-devel/gettext-0.17 ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Basepack of plugins for gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.5:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4df13098c80f7bbc1f92157172aa3cc8
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.5-r1 b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.5-r1
new file mode 100644
index 000000000000..5e5853afd225
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.5:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 X? ( x11-base/xorg-proto ) >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=sys-devel/gettext-0.17 ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Basepack of plugins for gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.5:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fad4df37a056f3f3805dcf7b361bedca
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.14.5 b/metadata/md5-cache/media-libs/gst-plugins-good-1.14.5
new file mode 100644
index 000000000000..b64edfb96dea
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.12 >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=sys-devel/gettext-0.17 ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Basepack of plugins for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d0d47cb958fe554b1fcaf61bea4828da
diff --git a/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.5 b/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.5
new file mode 100644
index 000000000000..9fbe097613a4
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.5:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-srtp-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) >=dev-util/gtk-doc-am-1.12 >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=sys-devel/gettext-0.17 ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=A GStreamer based RTSP server
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html
+IUSE=examples +introspection static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.5:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/gst-plugins-srtp-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bc7819244f579ba4a59efe8ff9734d92
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.14.4 b/metadata/md5-cache/media-libs/gstreamer-1.14.4
index 86da249c980a..c34ade93b048 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.14.4
+++ b/metadata/md5-cache/media-libs/gstreamer-1.14.4
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.14.4.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=bef63840506c1ad2def6f271e89389c9
+_md5_=ba286f8ea7b73123312121ad5598473a
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.14.5 b/metadata/md5-cache/media-libs/gstreamer-1.14.5
new file mode 100644
index 000000000000..277df7b1c552
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gstreamer-1.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 sys-devel/bison sys-devel/flex >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( sys-devel/gettext )
+DESCRIPTION=Open source multimedia framework
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=+caps +introspection nls +orc test unwind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.14.5.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=27609067852723a9ffa03d4b8f4229c8
diff --git a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.5 b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.5
new file mode 100644
index 000000000000..11378a84e690
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=media-libs/gstreamer-1.14.5:1.0[introspection?] >=media-libs/gst-plugins-base-1.14.5:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) >=dev-util/gtk-doc-am-1.3 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=SDK for making video editors and more
+EAPI=6
+HOMEPAGE=http://wiki.pitivi.org/wiki/GES
+IUSE=+introspection python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=media-libs/gstreamer-1.14.5:1.0[introspection?] >=media-libs/gst-plugins-base-1.14.5:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.14.5.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4983ab7d9d9e17d0b5dc09cb4f21d104
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.6.1 b/metadata/md5-cache/media-libs/harfbuzz-2.6.1
new file mode 100644
index 000000000000..faaf5d5118dc
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.6.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=An OpenType text shaping engine
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo debug +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+SLOT=0/0.9.18
+SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.1.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c410ce80efbd2d8acece633941048396
diff --git a/metadata/md5-cache/media-libs/jasper-2.0.14 b/metadata/md5-cache/media-libs/jasper-2.0.14
deleted file mode 100644
index a84382b5aa63..000000000000
--- a/metadata/md5-cache/media-libs/jasper-2.0.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freeglut-2.8.1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Implementation of the codec specified in the JPEG-2000 Part-1 standard
-EAPI=6
-HOMEPAGE=https://www.ece.uvic.ca/~mdadams/jasper/
-IUSE=doc jpeg opengl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=JasPer2.0
-RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freeglut-2.8.1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/4
-SRC_URI=https://github.com/mdadams/jasper/archive/version-2.0.14.tar.gz -> jasper-2.0.14.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb2ee37e13abf94cb1e6b9a2b6d0df0c
diff --git a/metadata/md5-cache/media-libs/jasper-2.0.16 b/metadata/md5-cache/media-libs/jasper-2.0.16
deleted file mode 100644
index b8c886459cb2..000000000000
--- a/metadata/md5-cache/media-libs/jasper-2.0.16
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freeglut-2.8.1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Implementation of the codec specified in the JPEG-2000 Part-1 standard
-EAPI=7
-HOMEPAGE=https://www.ece.uvic.ca/~mdadams/jasper/
-IUSE=doc jpeg opengl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=JasPer2.0
-RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freeglut-2.8.1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/4
-SRC_URI=https://github.com/mdadams/jasper/archive/version-2.0.16.tar.gz -> jasper-2.0.16.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f679aed0e91fd6829efa34fbe7f15717
diff --git a/metadata/md5-cache/media-libs/jasper-9999 b/metadata/md5-cache/media-libs/jasper-9999
deleted file mode 100644
index af71f7055917..000000000000
--- a/metadata/md5-cache/media-libs/jasper-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freeglut-2.8.1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Implementation of the codec specified in the JPEG-2000 Part-1 standard
-EAPI=7
-HOMEPAGE=https://www.ece.uvic.ca/~mdadams/jasper/
-IUSE=doc jpeg opengl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-LICENSE=JasPer2.0
-PROPERTIES=live
-RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freeglut-2.8.1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXmu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/4
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f679aed0e91fd6829efa34fbe7f15717
diff --git a/metadata/md5-cache/media-libs/kodi-platform-17.1.0.1 b/metadata/md5-cache/media-libs/kodi-platform-17.1.0.1
deleted file mode 100644
index c3037e008ef9..000000000000
--- a/metadata/md5-cache/media-libs/kodi-platform-17.1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =dev-libs/libplatform-2* dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi platform support library
-EAPI=6
-HOMEPAGE=https://kodi.tv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =dev-libs/libplatform-2* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/xbmc/kodi-platform/tarball/c8188d8 -> kodi-platform-17.1.0.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03a92c640fa6d286d2b349376845c1e1
diff --git a/metadata/md5-cache/media-libs/libchamplain-0.12.19-r1 b/metadata/md5-cache/media-libs/libchamplain-0.12.19-r1
index 5f7f89d6b5cf..4b71f54dc261 100644
--- a/metadata/md5-cache/media-libs/libchamplain-0.12.19-r1
+++ b/metadata/md5-cache/media-libs/libchamplain-0.12.19-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.0:3 >=media-libs/clutter-1.24:1
 REQUIRED_USE=vala? ( introspection ) gtk-doc? ( gtk )
 SLOT=0.12
 SRC_URI=mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.19.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=334f009b27cbf4d119a8df7613745dd4
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.5.3-r1 b/metadata/md5-cache/media-libs/libepoxy-1.5.3-r1
index 7ebc402780dd..ea97a258641d 100644
--- a/metadata/md5-cache/media-libs/libepoxy-1.5.3-r1
+++ b/metadata/md5-cache/media-libs/libepoxy-1.5.3-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=egl? ( media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/anholt/libepoxy/archive/1.5.3.tar.gz -> libepoxy-1.5.3.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2d98653e030b6c7a3950b004ecdbbce6
diff --git a/metadata/md5-cache/media-libs/libepoxy-9999 b/metadata/md5-cache/media-libs/libepoxy-9999
index faa0ee10aff1..297e012ad837 100644
--- a/metadata/md5-cache/media-libs/libepoxy-9999
+++ b/metadata/md5-cache/media-libs/libepoxy-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=egl? ( media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=9d084472fb5b6fa6969e2750782667e3
diff --git a/metadata/md5-cache/media-libs/libglvnd-1.1.1 b/metadata/md5-cache/media-libs/libglvnd-1.1.1
new file mode 100644
index 000000000000..f2801623b608
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libglvnd-1.1.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) !media-libs/mesa[-libglvnd(-)] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=The GL Vendor-Neutral Dispatch library
+EAPI=7
+HOMEPAGE=https://github.com/NVIDIA/libglvnd
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=!media-libs/mesa[-libglvnd(-)] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://github.com/NVIDIA/libglvnd/releases/download/v1.1.1/libglvnd-1.1.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=1b8a3f246c9a7bba760dd97c7c461a7d
diff --git a/metadata/md5-cache/media-libs/libglvnd-9999 b/metadata/md5-cache/media-libs/libglvnd-9999
index 3a4a0e07863b..d135f5a314bc 100644
--- a/metadata/md5-cache/media-libs/libglvnd-9999
+++ b/metadata/md5-cache/media-libs/libglvnd-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=!media-libs/mesa[-libglvnd(-)] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=da1e0da25b20af7e7016db4f2b7e45ec
+_md5_=6beb93de2dd643e46e669ea390266975
diff --git a/metadata/md5-cache/media-libs/libinsane-1.0.1 b/metadata/md5-cache/media-libs/libinsane-1.0.1
new file mode 100644
index 000000000000..d77d00e31e62
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libinsane-1.0.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-gfx/sane-backends doc? ( app-doc/doxygen dev-util/gtk-doc ) test? ( dev-util/cunit dev-util/valgrind )
+DESCRIPTION=Crossplatform access to image scanners
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/World/OpenPaperwork/libinsane
+IUSE=doc gtk-doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=media-gfx/sane-backends
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/1.0.1/libinsane-1.0.1.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd
+_md5_=eeac614dfb8d191af0c0cd61fe7ebcda
diff --git a/metadata/md5-cache/media-libs/libmediainfo-19.04 b/metadata/md5-cache/media-libs/libmediainfo-19.04
deleted file mode 100644
index 28a6162384be..000000000000
--- a/metadata/md5-cache/media-libs/libmediainfo-19.04
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=MediaInfo libraries
-EAPI=7
-HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib
-IUSE=curl doc mms static-libs
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://mediaarea.net/download/source/libmediainfo/19.04/libmediainfo_19.04.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0a16d201ae08a39cd9c9e7ad79d3c8f5
diff --git a/metadata/md5-cache/media-libs/libmediainfo-19.07 b/metadata/md5-cache/media-libs/libmediainfo-19.07
index dea63f0cd29d..328420d0ccaa 100644
--- a/metadata/md5-cache/media-libs/libmediainfo-19.07
+++ b/metadata/md5-cache/media-libs/libmediainfo-19.07
@@ -5,11 +5,11 @@ DESCRIPTION=MediaInfo libraries
 EAPI=7
 HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib
 IUSE=curl doc mms static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/libmediainfo/19.07/libmediainfo_19.07.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e25defd7c8bea4dda20f7809bf109af5
+_md5_=0a16d201ae08a39cd9c9e7ad79d3c8f5
diff --git a/metadata/md5-cache/media-libs/libmpdclient-2.16 b/metadata/md5-cache/media-libs/libmpdclient-2.16
index c7ca26e0e4d8..ea3a54a94ac8 100644
--- a/metadata/md5-cache/media-libs/libmpdclient-2.16
+++ b/metadata/md5-cache/media-libs/libmpdclient-2.16
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ppc ppc64 ~sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.16.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=4f7d9cece8c24369332c429aacfa6b88
diff --git a/metadata/md5-cache/media-libs/libogg-1.3.4 b/metadata/md5-cache/media-libs/libogg-1.3.4
new file mode 100644
index 000000000000..b249146bd743
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libogg-1.3.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=the Ogg media file format library
+EAPI=7
+HOMEPAGE=https://xiph.org/ogg/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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
+SLOT=0
+SRC_URI=https://downloads.xiph.org/releases/ogg/libogg-1.3.4.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a238b5a8f7ff3ac15a3c0469efc49f56
diff --git a/metadata/md5-cache/media-libs/libplacebo-1.18.0 b/metadata/md5-cache/media-libs/libplacebo-1.18.0
index 2d05cd86bf2d..592bf7da0fed 100644
--- a/metadata/md5-cache/media-libs/libplacebo-1.18.0
+++ b/metadata/md5-cache/media-libs/libplacebo-1.18.0
@@ -11,5 +11,5 @@ RDEPEND=glslang? ( <dev-util/glslang-7.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 REQUIRED_USE=vulkan? ( || ( glslang shaderc ) )
 SLOT=0
 SRC_URI=https://code.videolan.org/videolan/libplacebo/-/archive/v1.18.0/libplacebo-v1.18.0.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2bf1b883d6dfe21f379a153d3e4e02d3
diff --git a/metadata/md5-cache/media-libs/libplacebo-9999 b/metadata/md5-cache/media-libs/libplacebo-9999
index ffa6c62aa0ed..15a1296beed5 100644
--- a/metadata/md5-cache/media-libs/libplacebo-9999
+++ b/metadata/md5-cache/media-libs/libplacebo-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=glslang? ( <dev-util/glslang-7.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) shaderc? ( >=media-libs/shaderc-2017.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=vulkan? ( || ( glslang shaderc ) )
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=f18e54982b19937ab6695a86f8cd0a75
diff --git a/metadata/md5-cache/media-libs/libraw-0.19.3 b/metadata/md5-cache/media-libs/libraw-0.19.3
index d24ded17a6a4..6f9ba4700057 100644
--- a/metadata/md5-cache/media-libs/libraw-0.19.3
+++ b/metadata/md5-cache/media-libs/libraw-0.19.3
@@ -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=compile configure install prepare pretend setup test
-DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig
+DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig
 DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital photo cameras
 EAPI=7
 HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
-IUSE=examples jpeg jpeg2k +lcms openmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=examples jpeg +lcms openmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 CDDL
-RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/19
 SRC_URI=https://www.libraw.org/data/LibRaw-0.19.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=20f30c74d9e3809a667b3cbc72671870
+_md5_=e3563763d999e8ace3cf433526918477
diff --git a/metadata/md5-cache/media-libs/libraw-0.19.4 b/metadata/md5-cache/media-libs/libraw-0.19.4
index 23ec5ea3aeca..f2c39a891628 100644
--- a/metadata/md5-cache/media-libs/libraw-0.19.4
+++ b/metadata/md5-cache/media-libs/libraw-0.19.4
@@ -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=compile configure install prepare pretend setup test
-DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig
+DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig
 DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital photo cameras
 EAPI=7
 HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
-IUSE=examples jpeg jpeg2k +lcms openmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=examples jpeg +lcms openmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 CDDL
-RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/19
 SRC_URI=https://www.libraw.org/data/LibRaw-0.19.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d825bc35831e13a404e18dd9fa0fac3f
+_md5_=931fd7b2395b91ff0f4bdd1c6290a350
diff --git a/metadata/md5-cache/media-libs/libraw-0.19.5 b/metadata/md5-cache/media-libs/libraw-0.19.5
new file mode 100644
index 000000000000..2ad97ae5ddbe
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libraw-0.19.5
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig
+DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital photo cameras
+EAPI=7
+HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
+IUSE=examples jpeg +lcms openmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1 CDDL
+RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/19
+SRC_URI=https://www.libraw.org/data/LibRaw-0.19.5.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=931fd7b2395b91ff0f4bdd1c6290a350
diff --git a/metadata/md5-cache/media-libs/libv4l-1.16.6 b/metadata/md5-cache/media-libs/libv4l-1.16.6
index 55aa37e33c0b..855be75c08b0 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.16.6
+++ b/metadata/md5-cache/media-libs/libv4l-1.16.6
@@ -5,10 +5,10 @@ DESCRIPTION=Separate libraries ebuild from upstream v4l-utils package
 EAPI=7
 HOMEPAGE=https://git.linuxtv.org/v4l-utils.git
 IUSE=jpeg kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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=LGPL-2.1+
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !elibc_glibc? ( sys-libs/argp-standalone ) virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0/0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.6.tar.bz2
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=caa19f0a6cf6928061ddb3e4a6d58112
+_md5_=fd8ced414edf806e334c66c3083fc353
diff --git a/metadata/md5-cache/media-libs/libvpx-1.7.0 b/metadata/md5-cache/media-libs/libvpx-1.7.0
index b2e9d5aeb021..813eb593985a 100644
--- a/metadata/md5-cache/media-libs/libvpx-1.7.0
+++ b/metadata/md5-cache/media-libs/libvpx-1.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=WebM VP8 and VP9 Codec SDK
 EAPI=6
 HOMEPAGE=https://www.webmproject.org
 IUSE=cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 ) test? ( threads )
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/webmproject/libvpx/archive/v1.7.0.tar.gz -> libvpx-1.7.0.tar.gz test? ( mirror://gentoo/libvpx-testdata-1.7.0.tar.xz )
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=dc28e452d11b908290001c5362ec55f2
+_md5_=192ca4a8ef5c98d8feecc7ca27abeaee
diff --git a/metadata/md5-cache/media-libs/mesa-19.0.8 b/metadata/md5-cache/media-libs/mesa-19.0.8
index 096691c8046a..dd54e1435d8a 100644
--- a/metadata/md5-cache/media-libs/mesa-19.0.8
+++ b/metadata/md5-cache/media-libs/mesa-19.0.8
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_rad
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.0.8.tar.xz
-_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=4b9ac1d316fad65db0771978060cd477
diff --git a/metadata/md5-cache/media-libs/mesa-19.1.3 b/metadata/md5-cache/media-libs/mesa-19.1.3
index 3bb210398527..9a1393e06b8d 100644
--- a/metadata/md5-cache/media-libs/mesa-19.1.3
+++ b/metadata/md5-cache/media-libs/mesa-19.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r60
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.1.3.tar.xz
-_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=34bc129989d1324ced166def9e0ddf58
diff --git a/metadata/md5-cache/media-libs/mesa-19.1.4 b/metadata/md5-cache/media-libs/mesa-19.1.4
index 4922fa8e1ca1..1e03871a2feb 100644
--- a/metadata/md5-cache/media-libs/mesa-19.1.4
+++ b/metadata/md5-cache/media-libs/mesa-19.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r60
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.1.4.tar.xz
-_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=34bc129989d1324ced166def9e0ddf58
diff --git a/metadata/md5-cache/media-libs/mesa-19.1.5 b/metadata/md5-cache/media-libs/mesa-19.1.5
new file mode 100644
index 000000000000..7e3ae4f6c97a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-19.1.5
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=7
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.1.5.tar.xz
+_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=34bc129989d1324ced166def9e0ddf58
diff --git a/metadata/md5-cache/media-libs/mesa-19.1.6 b/metadata/md5-cache/media-libs/mesa-19.1.6
new file mode 100644
index 000000000000..2629ed5d32c3
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-19.1.6
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=7
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.1.6.tar.xz
+_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=34bc129989d1324ced166def9e0ddf58
diff --git a/metadata/md5-cache/media-libs/mesa-19.2.0_rc1 b/metadata/md5-cache/media-libs/mesa-19.2.0_rc1
new file mode 100644
index 000000000000..e8cb993177b3
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-19.2.0_rc1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=7
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.2.0-rc1.tar.xz
+_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=92d7913ceb2fc78abb1014fa85208e1a
diff --git a/metadata/md5-cache/media-libs/mesa-19.2.0_rc2 b/metadata/md5-cache/media-libs/mesa-19.2.0_rc2
new file mode 100644
index 000000000000..c518614b33fa
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-19.2.0_rc2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=7
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.2.0-rc2.tar.xz
+_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=bc4b769b638bbff2fb38f6affedb577f
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 055238ac56de..857d94bebf6e 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -11,5 +11,5 @@ RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi
 REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b72308faf0e319ae8711495d50e5d429
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=bc4b769b638bbff2fb38f6affedb577f
diff --git a/metadata/md5-cache/media-libs/ming-0.20181112 b/metadata/md5-cache/media-libs/ming-0.20181112
deleted file mode 100644
index 742433dbac6e..000000000000
--- a/metadata/md5-cache/media-libs/ming-0.20181112
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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(-)] ) media-libs/freetype:= media-libs/libpng:0= media-libs/giflib:= sys-libs/zlib:= !media-libs/libswf sys-devel/flex virtual/pkgconfig virtual/yacc >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.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(-)]
-DESCRIPTION=An Open Source library for Flash movie generation
-EAPI=6
-HOMEPAGE=http://ming.sourceforge.net/
-IUSE=+perl php +python static-libs python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-2.1
-PDEPEND=php? ( dev-php/ming-php )
-RDEPEND=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(-)] ) media-libs/freetype:= media-libs/libpng:0= media-libs/giflib:= sys-libs/zlib:= !media-libs/libswf python_targets_python2_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 ) ) || ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/libming/libming/archive/50098023446a5412efcfbd40552821a8cba983a6.tar.gz -> ming-0.20181112.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71c5960b7f1d39b698b00361b8799b09
diff --git a/metadata/md5-cache/media-libs/mlt-6.16.0-r1 b/metadata/md5-cache/media-libs/mlt-6.16.0-r1
index f1bcce602c70..34c54cec0ce5 100644
--- a/metadata/md5-cache/media-libs/mlt-6.16.0-r1
+++ b/metadata/md5-cache/media-libs/mlt-6.16.0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/releases/download/v6.16.0/mlt-6.16.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=4cb72e76b93ca4b4e7423854a16e9ace
+_md5_=62c7d3189228f14fb5f29148c5bcb694
diff --git a/metadata/md5-cache/media-libs/mlt-6.16.0-r2 b/metadata/md5-cache/media-libs/mlt-6.16.0-r2
index 325c6cb5c910..21fe606cab7c 100644
--- a/metadata/md5-cache/media-libs/mlt-6.16.0-r2
+++ b/metadata/md5-cache/media-libs/mlt-6.16.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Open source multimedia framework for television broadcasting
 EAPI=7
 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 kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau vidstab xine xml python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 x86 ~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?,-flite] ) ) 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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) 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.5 ) virtual/rubygems ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) vidstab? ( media-libs/vidstab ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/releases/download/v6.16.0/mlt-6.16.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8b5792aca55c935f6a196c53c15f2ab0
+_md5_=fb8bebc73e282dcd7c2df15dedd3762c
diff --git a/metadata/md5-cache/media-libs/netpbm-10.66.00 b/metadata/md5-cache/media-libs/netpbm-10.66.00
index 57b7404977b5..2700072849ad 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.66.00
+++ b/metadata/md5-cache/media-libs/netpbm-10.66.00
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) 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 ) app-arch/xz-utils sys-devel/flex
+DEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0 ) 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 ) app-arch/xz-utils sys-devel/flex
 DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats
 EAPI=4
 HOMEPAGE=http://netpbm.sourceforge.net/
-IUSE=doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib
+IUSE=doc jbig jpeg png 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
 LICENSE=GPL-2
-RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) 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 )
+RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0 ) 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.66.00.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=761e92eb8113e527368121166c3f18a1
+_md5_=103d82fee9ea11a6a7f4ae8ca97d63d4
diff --git a/metadata/md5-cache/media-libs/netpbm-10.70.00 b/metadata/md5-cache/media-libs/netpbm-10.70.00
index 8761188af15f..ca808726563d 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.70.00
+++ b/metadata/md5-cache/media-libs/netpbm-10.70.00
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) 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 ) app-arch/xz-utils sys-devel/flex
+DEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0 ) 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 ) app-arch/xz-utils sys-devel/flex
 DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats
 EAPI=4
 HOMEPAGE=http://netpbm.sourceforge.net/
-IUSE=doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib
+IUSE=doc jbig jpeg png 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
 LICENSE=GPL-2
-RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) 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 )
+RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0 ) 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.70.00.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e65ab7c38382e631be9266aaf81b2b5
+_md5_=e8e5ebab2a335ca1061b0dc82618afed
diff --git a/metadata/md5-cache/media-libs/netpbm-10.76.00 b/metadata/md5-cache/media-libs/netpbm-10.76.00
index b130403dc32c..2f393d05fb6a 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.76.00
+++ b/metadata/md5-cache/media-libs/netpbm-10.76.00
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 ) app-arch/xz-utils sys-devel/flex
+DEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) 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 ) app-arch/xz-utils sys-devel/flex
 DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats
 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
+IUSE=doc jbig jpeg 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
 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 )
+RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) 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	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=848603769c41078b358d5dc9265d4d8a
+_md5_=0ddf505589891e2da4b8b80456e9fda5
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.13-r3 b/metadata/md5-cache/media-libs/opencv-2.4.13-r3
index 3c02ecd95e0b..b0643224c47f 100644
--- a/metadata/md5-cache/media-libs/opencv-2.4.13-r3
+++ b/metadata/md5-cache/media-libs/opencv-2.4.13-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qttest:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) sys-devel/make >=dev-util/cmake-3.9.6 java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
+DEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qttest:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) sys-devel/make >=dev-util/cmake-3.9.6 java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
 DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
 EAPI=6
 HOMEPAGE=https://opencv.org
-IUSE=cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine python_targets_python2_7 elibc_FreeBSD java elibc_FreeBSD
+IUSE=cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine python_targets_python2_7 elibc_FreeBSD java elibc_FreeBSD
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qttest:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qttest:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/2.4
 SRC_URI=https://github.com/Itseez/opencv/archive/2.4.13.tar.gz -> opencv-2.4.13.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=981a8fec18d4c14eb69b382b36850ad4
+_md5_=f00bca8c885ee33e5f592631f57dca46
diff --git a/metadata/md5-cache/media-libs/opencv-3.4.1-r5 b/metadata/md5-cache/media-libs/opencv-3.4.1-r5
index a6b959700c99..e7854fa04a27 100644
--- a/metadata/md5-cache/media-libs/opencv-3.4.1-r5
+++ b/metadata/md5-cache/media-libs/opencv-3.4.1-r5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libav? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] contrib_dnn? ( dev-libs/cereal ) eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) vaapi? ( x11-libs/libva ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libav? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] contrib_dnn? ( dev-libs/cereal ) eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) vaapi? ( x11-libs/libva ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
 EAPI=6
 HOMEPAGE=https://opencv.org
-IUSE=contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine elibc_FreeBSD java elibc_FreeBSD python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine elibc_FreeBSD java elibc_FreeBSD python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libav? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libav? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) dnn_samples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_dnn? ( contrib ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) contrib_xfeatures2d? ( contrib cuda ) java? ( python ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) ) tesseract? ( contrib )
 SLOT=0/3.4.1
 SRC_URI=https://github.com/opencv/opencv/archive/3.4.1.tar.gz -> opencv-3.4.1.tar.gz dnn_samples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/3.4.1.tar.gz -> opencv-3.4.1_contrib.tar.gz contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz -> tiny-dnn-1.0.0a3.tar.gz https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2b13fccc77455fbde286744098f27808
+_md5_=15a0ec687b043168737e2fce8751db77
diff --git a/metadata/md5-cache/media-libs/opencv-3.4.1-r6 b/metadata/md5-cache/media-libs/opencv-3.4.1-r6
index fd9cca462655..1222600f388b 100644
--- a/metadata/md5-cache/media-libs/opencv-3.4.1-r6
+++ b/metadata/md5-cache/media-libs/opencv-3.4.1-r6
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libav? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] contrib_dnn? ( dev-libs/cereal ) eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) vaapi? ( x11-libs/libva ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
+DEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libav? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] contrib_dnn? ( dev-libs/cereal ) eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) vaapi? ( x11-libs/libva ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
 DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
 EAPI=7
 HOMEPAGE=https://opencv.org
-IUSE=contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine elibc_FreeBSD java elibc_FreeBSD python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine elibc_FreeBSD java elibc_FreeBSD python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=BSD
-RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libav? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/protobuf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libav? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) dnn_samples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_dnn? ( contrib ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) contrib_xfeatures2d? ( contrib cuda ) java? ( python ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) tesseract? ( contrib )
 SLOT=0/3.4.1
 SRC_URI=https://github.com/opencv/opencv/archive/3.4.1.tar.gz -> opencv-3.4.1.tar.gz dnn_samples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/3.4.1.tar.gz -> opencv-3.4.1_contrib.tar.gz contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz -> tiny-dnn-1.0.0a3.tar.gz https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0e219d38acea9963cfcb9c4c09233646
+_md5_=64da0be28e1bdd608bc425919da9d331
diff --git a/metadata/md5-cache/media-libs/phonon-4.10.3 b/metadata/md5-cache/media-libs/phonon-4.10.3
deleted file mode 100644
index 6720a474f33c..000000000000
--- a/metadata/md5-cache/media-libs/phonon-4.10.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!!dev-qt/qtphonon:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] )
-DESCRIPTION=KDE multimedia API
-EAPI=7
-HOMEPAGE=https://phonon.kde.org/
-IUSE=debug designer gstreamer pulseaudio +vlc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-PDEPEND=gstreamer? ( =media-libs/phonon-gstreamer-4.9* ) vlc? ( =media-libs/phonon-vlc-0.10* )
-RDEPEND=!!dev-qt/qtphonon:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] )
-SLOT=0
-SRC_URI=mirror://kde/stable/phonon/4.10.3/phonon-4.10.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc4652bb48a9ca527bdb233093859a2a
diff --git a/metadata/md5-cache/media-libs/phonon-4.11.0 b/metadata/md5-cache/media-libs/phonon-4.11.0
new file mode 100644
index 000000000000..c25f8e123f86
--- /dev/null
+++ b/metadata/md5-cache/media-libs/phonon-4.11.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=!!dev-qt/qtphonon:4 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 media-sound/pulseaudio[glib] ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE multimedia abstraction library
+EAPI=7
+HOMEPAGE=https://phonon.kde.org/
+IUSE=debug designer gstreamer pulseaudio +vlc debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+PDEPEND=gstreamer? ( >=media-libs/phonon-gstreamer-4.9.60 ) vlc? ( >=media-libs/phonon-vlc-0.9.60 )
+RDEPEND=!!dev-qt/qtphonon:4 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 media-sound/pulseaudio[glib] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=0
+SRC_URI=mirror://kde/stable/phonon/4.11.0/phonon-4.11.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=040d3df31043db757f70d32a66e1c28b
diff --git a/metadata/md5-cache/media-libs/phonon-9999 b/metadata/md5-cache/media-libs/phonon-9999
deleted file mode 100644
index 1ca59b34a352..000000000000
--- a/metadata/md5-cache/media-libs/phonon-9999
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl] >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=!!dev-qt/qtphonon:4 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 media-sound/pulseaudio[glib] ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE multimedia abstraction library
-EAPI=7
-HOMEPAGE=https://phonon.kde.org/
-IUSE=debug designer gstreamer gui pulseaudio +vlc debug
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-PDEPEND=gstreamer? ( >=media-libs/phonon-gstreamer-4.9.60 ) vlc? ( >=media-libs/phonon-vlc-0.9.60 )
-PROPERTIES=live
-RDEPEND=!!dev-qt/qtphonon:4 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 media-sound/pulseaudio[glib] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d656178d5950418a7f70133ac486905
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0 b/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0
new file mode 100644
index 000000000000..e62b1469dfa5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 >=media-libs/phonon-4.10.60 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=GStreamer backend for the Phonon multimedia library
+EAPI=7
+HOMEPAGE=https://phonon.kde.org/
+IUSE=alsa debug +network debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 >=media-libs/phonon-4.10.60 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=0
+SRC_URI=mirror://kde/stable/phonon/phonon-backend-gstreamer/4.10.0/phonon-backend-gstreamer-4.10.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f40573ed67efbaa6ec5942cdbe2c6106
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.1 b/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.1
deleted file mode 100644
index 12822560c6ee..000000000000
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 =media-libs/phonon-4.10* media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 )
-DESCRIPTION=Phonon GStreamer backend
-EAPI=7
-HOMEPAGE=https://phonon.kde.org/
-IUSE=alsa debug +network
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 =media-libs/phonon-4.10* media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 )
-SLOT=0
-SRC_URI=mirror://kde/stable/phonon/phonon-backend-gstreamer/4.9.1/phonon-backend-gstreamer-4.9.1.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48f093145690fb2285f639defafb6538
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-9999 b/metadata/md5-cache/media-libs/phonon-gstreamer-9999
deleted file mode 100644
index 899f0a7bfcd3..000000000000
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl] >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 >=media-libs/phonon-4.10.60 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=GStreamer backend for the Phonon multimedia library
-EAPI=7
-HOMEPAGE=https://phonon.kde.org/
-IUSE=alsa debug +network debug
-LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-PROPERTIES=live
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 >=media-libs/phonon-4.10.60 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68e51fc8b583991bfe187e38be168026
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.10.3 b/metadata/md5-cache/media-libs/phonon-vlc-0.10.3
deleted file mode 100644
index f989a76f05bc..000000000000
--- a/metadata/md5-cache/media-libs/phonon-vlc-0.10.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =media-libs/phonon-4.10* media-video/vlc:=[dbus,ogg,vorbis]
-DESCRIPTION=Phonon VLC backend
-EAPI=7
-HOMEPAGE=https://phonon.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =media-libs/phonon-4.10* media-video/vlc:=[dbus,ogg,vorbis]
-SLOT=0
-SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.10.3/phonon-backend-vlc-0.10.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0d558a7b8c1240b1f15176bd9594ef4f
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.11.0 b/metadata/md5-cache/media-libs/phonon-vlc-0.11.0
new file mode 100644
index 000000000000..31b5bfe0bc37
--- /dev/null
+++ b/metadata/md5-cache/media-libs/phonon-vlc-0.11.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.60 media-video/vlc:=[dbus,ogg,vorbis] dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=VLC backend for the Phonon multimedia library
+EAPI=7
+HOMEPAGE=https://phonon.kde.org/
+IUSE=debug debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
+RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.60 media-video/vlc:=[dbus,ogg,vorbis] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=0
+SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.11.0/phonon-backend-vlc-0.11.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b969e18fbf7bb231c25f141bbb6013a
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-9999 b/metadata/md5-cache/media-libs/phonon-vlc-9999
deleted file mode 100644
index 8e276d138734..000000000000
--- a/metadata/md5-cache/media-libs/phonon-vlc-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl] >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.60 media-video/vlc:=[dbus,ogg,vorbis] dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=VLC backend for the Phonon multimedia library
-EAPI=7
-HOMEPAGE=https://phonon.kde.org/
-IUSE=debug debug
-LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-PROPERTIES=live
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.60 media-video/vlc:=[dbus,ogg,vorbis] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9329c96c42fd7ea7645d3d0ab65b6fa
diff --git a/metadata/md5-cache/media-libs/portaudio-19.06.00-r1 b/metadata/md5-cache/media-libs/portaudio-19.06.00-r1
index 3e80e06b92f7..2b7b7e19278f 100644
--- a/metadata/md5-cache/media-libs/portaudio-19.06.00-r1
+++ b/metadata/md5-cache/media-libs/portaudio-19.06.00-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A free, cross-platform, open-source, audio I/O library
 EAPI=6
 HOMEPAGE=http://www.portaudio.com/
 IUSE=alsa +cxx debug doc jack oss static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz
 _eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=bceb1cf19c1c0260f732bba39f925d00
+_md5_=84127b91c3c304509dd4235dd822338b
diff --git a/metadata/md5-cache/media-libs/simage-1.7.0-r1 b/metadata/md5-cache/media-libs/simage-1.7.0-r1
index 34bdf0c2f2c8..0d431a8483e0 100644
--- a/metadata/md5-cache/media-libs/simage-1.7.0-r1
+++ b/metadata/md5-cache/media-libs/simage-1.7.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper ) png? ( media-libs/libpng:0= ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
+DEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) png? ( media-libs/libpng:0= ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
 DESCRIPTION=Image and video texturing library
 EAPI=6
 HOMEPAGE=https://bitbucket.org/Coin3D/simage
-IUSE=debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib
+IUSE=debug gif jpeg png sndfile static-libs tiff vorbis zlib
 KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=public-domain mpeg2enc
-RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper ) png? ( media-libs/libpng:0= ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
+RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) png? ( media-libs/libpng:0= ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://bitbucket.org/Coin3D/coin/downloads/simage-1.7.0.tar.gz
-_md5_=284ecd5df02fab9d6e67dca1468eff37
+_md5_=a4b154b8af44800fb388f271a18d4788
diff --git a/metadata/md5-cache/media-libs/simage-1.7.1a_beta_pre20180312 b/metadata/md5-cache/media-libs/simage-1.7.1a_beta_pre20180312
index 6f2f71f4d926..f57fd935e427 100644
--- a/metadata/md5-cache/media-libs/simage-1.7.1a_beta_pre20180312
+++ b/metadata/md5-cache/media-libs/simage-1.7.1a_beta_pre20180312
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Image and video texturing library
 EAPI=6
 HOMEPAGE=https://bitbucket.org/Coin3D/simage
-IUSE=debug gif jpeg jpeg2k png qt5 sndfile tiff vorbis
+IUSE=debug gif jpeg png qt5 sndfile tiff vorbis
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=public-domain mpeg2enc
-RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0= ) vorbis? ( media-libs/libogg media-libs/libvorbis )
+RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0= ) vorbis? ( media-libs/libogg media-libs/libvorbis )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~reavertm/Coin3D-simage-3bd369da8f08.tar.bz2
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3242c838ab9b7290aeff70abe9a05684
+_md5_=f66929fc723b5701a8e3de3bbc1e574c
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.10-r2 b/metadata/md5-cache/media-libs/tiff-4.0.10-r2
new file mode 100644
index 000000000000..421b9bf6075a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/tiff-4.0.10-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Tag Image File Format (TIFF) library
+EAPI=7
+HOMEPAGE=http://libtiff.maptools.org
+IUSE=+cxx jbig jpeg lzma static-libs test webp zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=libtiff
+RDEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=test? ( jpeg )
+SLOT=0
+SRC_URI=https://download.osgeo.org/libtiff/tiff-4.0.10.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b838ed4e0a0d6aebc5466ad92044287c
diff --git a/metadata/md5-cache/media-libs/waffle-1.6.0 b/metadata/md5-cache/media-libs/waffle-1.6.0
index 0ced0c32d93f..859c2a2c543a 100644
--- a/metadata/md5-cache/media-libs/waffle-1.6.0
+++ b/metadata/md5-cache/media-libs/waffle-1.6.0
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.waffle-gl.org/files/release/waffle-1.6.0/waffle-1.6.0.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=578ba8730c5039f4cd1bd0853399b39a
diff --git a/metadata/md5-cache/media-libs/waffle-9999 b/metadata/md5-cache/media-libs/waffle-9999
index 64b20b3d4593..33a2b6d0ed25 100644
--- a/metadata/md5-cache/media-libs/waffle-9999
+++ b/metadata/md5-cache/media-libs/waffle-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gbm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=b27c9a56fb629041335efe333a5d630e
diff --git a/metadata/md5-cache/media-libs/x264-0.0.20190903 b/metadata/md5-cache/media-libs/x264-0.0.20190903
new file mode 100644
index 000000000000..be99ed14b9f8
--- /dev/null
+++ b/metadata/md5-cache/media-libs/x264-0.0.20190903
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=abi_x86_32? ( >=dev-lang/nasm-2.13 ) abi_x86_64? ( >=dev-lang/nasm-2.13 ) opencl? ( dev-lang/perl )
+DESCRIPTION=A free library for encoding X264/AVC streams
+EAPI=7
+HOMEPAGE=https://www.videolan.org/developers/x264.html
+IUSE=altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/157
+SRC_URI=https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20190903-2245.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f7cf0acac0d7f93239ea1651860cd6e4
diff --git a/metadata/md5-cache/media-libs/x265-3.1.2 b/metadata/md5-cache/media-libs/x265-3.1.2
new file mode 100644
index 000000000000..355ec6065361
--- /dev/null
+++ b/metadata/md5-cache/media-libs/x265-3.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( >=dev-lang/yasm-1.2.0 ) abi_x86_64? ( >=dev-lang/yasm-1.2.0 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
+EAPI=5
+HOMEPAGE=http://x265.org/
+IUSE=+10bit +12bit cpu_flags_arm_neon numa pic power8 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/176
+SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_3.1.2.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=63e907d7aad73b6e38ef5bbb0b5a7aea
diff --git a/metadata/md5-cache/media-libs/zita-convolver-4.0.3 b/metadata/md5-cache/media-libs/zita-convolver-4.0.3
index aa8ac2d334ae..2dc55f2cd574 100644
--- a/metadata/md5-cache/media-libs/zita-convolver-4.0.3
+++ b/metadata/md5-cache/media-libs/zita-convolver-4.0.3
@@ -3,10 +3,10 @@ DEPEND=sci-libs/fftw:3.0=
 DESCRIPTION=C++ library implementing a real-time convolution matrix
 EAPI=7
 HOMEPAGE=https://kokkinizita.linuxaudio.org/linuxaudio/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=sci-libs/fftw:3.0=
 SLOT=0/4
 SRC_URI=https://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-convolver-4.0.3.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=02c8255f61d5411e2d97ce17c0501322
+_md5_=154afd52f92e4bd7487959c94d8fb055
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index b56beb53f20b..4cf5d78c3129 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/alsa-plugins-1.1.8 b/metadata/md5-cache/media-plugins/alsa-plugins-1.1.8
index 1865fdb21475..48e8cfecb446 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.1.8
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.1.8
@@ -5,10 +5,10 @@ DESCRIPTION=ALSA extra plugins
 EAPI=7
 HOMEPAGE=http://www.alsa-project.org/
 IUSE=arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/alsa-lib-1.1.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.1.8.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=adf161da81cc7d3ce8f6352d15667b4e
+_md5_=c344de6ab489a9cf4449164bb1481832
diff --git a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.8 b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.8
index c34a328bd76c..29b287f51608 100644
--- a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.8
+++ b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.8
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=media-libs/grilo-0.3.6:0.3=[network,playlist] freebox? ( net-dns/avahi ) >=dev-libs/gom-0.3.2-r1 chromaprint? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-chromaprint:1.0 ) dev-libs/json-glib daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 ) media-libs/libmediaart:2.0 net-libs/libsoup:2.4 dev-libs/libxml2:2 flickr? ( net-libs/liboauth ) dev-db/sqlite:3 >=dev-libs/totem-pl-parser-3.4.1 tracker? ( >=app-misc/tracker-0.10.5:= ) upnp-av? ( net-libs/dleyna-connector-dbus net-misc/dleyna-server ) lua? ( >=dev-lang/lua-5.3 app-arch/libarchive dev-libs/libxml2:2 ) thetvdb? ( app-arch/libarchive ) youtube? ( >=dev-libs/libgdata-0.9.1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
 SLOT=0.3
 SRC_URI=mirror://gnome/sources/grilo-plugins/0.3/grilo-plugins-0.3.8.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b76070bb781e9cd6440b57ad03012fbf
diff --git a/metadata/md5-cache/media-plugins/grilo-plugins-0.3.9 b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.9
new file mode 100644
index 000000000000..0b9e369a5115
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/grilo-plugins-0.3.9
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xml-dtd:4.5 dev-util/itstool >=sys-devel/gettext-0.19.8 upnp-av? ( >=dev-util/gdbus-codegen-2.44 ) virtual/pkgconfig lua? ( dev-util/gperf ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.44:2 >=media-libs/grilo-0.3.8:0.3=[network,playlist] freebox? ( net-dns/avahi ) >=dev-libs/gom-0.3.2-r1 chromaprint? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-chromaprint:1.0 ) dev-libs/json-glib daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 ) media-libs/libmediaart:2.0 net-libs/libsoup:2.4 dev-libs/libxml2:2 flickr? ( net-libs/liboauth ) dev-db/sqlite:3 >=dev-libs/totem-pl-parser-3.4.1 tracker? ( >=app-misc/tracker-0.10.5:= ) upnp-av? ( net-libs/dleyna-connector-dbus net-misc/dleyna-server ) lua? ( >=dev-lang/lua-5.3 app-arch/libarchive dev-libs/libxml2:2 ) thetvdb? ( app-arch/libarchive ) youtube? ( >=dev-libs/libgdata-0.9.1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A collection of plugins for the Grilo framework
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Grilo
+IUSE=daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb tracker upnp-av +youtube
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.44:2 >=media-libs/grilo-0.3.8:0.3=[network,playlist] freebox? ( net-dns/avahi ) >=dev-libs/gom-0.3.2-r1 chromaprint? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-chromaprint:1.0 ) dev-libs/json-glib daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 ) media-libs/libmediaart:2.0 net-libs/libsoup:2.4 dev-libs/libxml2:2 flickr? ( net-libs/liboauth ) dev-db/sqlite:3 >=dev-libs/totem-pl-parser-3.4.1 tracker? ( >=app-misc/tracker-0.10.5:= ) upnp-av? ( net-libs/dleyna-connector-dbus net-misc/dleyna-server ) lua? ( >=dev-lang/lua-5.3 app-arch/libarchive dev-libs/libxml2:2 ) thetvdb? ( app-arch/libarchive ) youtube? ( >=dev-libs/libgdata-0.9.1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
+SLOT=0.3
+SRC_URI=mirror://gnome/sources/grilo-plugins/0.3/grilo-plugins-0.3.9.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0ece9af7de789a104eb1c7c67ee5f306
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.5
new file mode 100644
index 000000000000..08eec052d6f4
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=ASS/SSA rendering with effects support plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=32950abe868ce5803366a4d86ef86b0c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.5
new file mode 100644
index 000000000000..921714b9a7ab
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=net-wireless/bluez-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/gdbus-codegen >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=AVDTP source/sink and A2DP sink plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-wireless/bluez-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=83da627ebd17a2a4a48bc353f07a027e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.5
new file mode 100644
index 000000000000..5f2f9b00d6aa
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/libbs2b[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=bs2b elements for Gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libbs2b[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3a6961f5df8dc69c6c8d206ecfa18c03
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cairo-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-cairo-1.14.5
new file mode 100644
index 000000000000..fa0eecaa6475
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cairo-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=x11-libs/cairo-1.10[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Video overlay plugin based on cairo for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/cairo-1.10[glib,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=65e7c414926f65f4e46ccffcbcf3c361
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.5
new file mode 100644
index 000000000000..145ca6ef0233
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=CD Audio Source (cdda) plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5ffd8be1a27933db23952c9174ba111e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.5
new file mode 100644
index 000000000000..27913b748d63
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/chromaprint[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Calculate Chromaprint fingerprint from audio files for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/chromaprint[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=708dc5eac875e124cee0ce18553ad8eb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.5
new file mode 100644
index 000000000000..53b68b0bb273
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/lcms-2.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Color management correction GStreamer plugins
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=media-libs/lcms-2.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=27abd62c7757e22988f811519f07f5cb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.5
new file mode 100644
index 000000000000..e890cdc9eaf5
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=MPEG-DASH plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f44a29b09f8febd89b6cf1bacc0e52f0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.5
new file mode 100644
index 000000000000..c0a012339a15
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=DTLS encoder/decoder with SRTP support plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=libressl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=63ee0e9854bb69242eb4c9805cf8578a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.5
new file mode 100644
index 000000000000..51ebb0b4f5f1
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=DTS audio decoder plugin for Gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5e0856c856c557c62520d264fb355d06
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.5
new file mode 100644
index 000000000000..af2ed02dcf35
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=DV demuxer and decoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1146d5fbb02997177e644eb61ee903b1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.5
new file mode 100644
index 000000000000..6844843650bd
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/os-headers >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=plugin for gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9c86df7105f8c5be475765d4f5587558
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.5
new file mode 100644
index 000000000000..98cf6c2bf86a
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=AAC audio encoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6cabfa7e3e6eb068a89a78217a7676ad
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.5
new file mode 100644
index 000000000000..a05ef29d95ed
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=AAC audio decoder plugin.
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0197c49596a6d408f5bb5600e6112743
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.5
new file mode 100644
index 000000000000..e149d0c7e252
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=FLAC encoder/decoder/tagger plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=51cca3788d7a194d95d1aa0047574d4f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.5
new file mode 100644
index 000000000000..4b1705686036
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=plugin for gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2d879069f3845a2c22457eb6a7cdd7b8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.5
new file mode 100644
index 000000000000..8b1a2a402857
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl=,gles2=,opengl=,wayland=,X=] >=x11-libs/gtk+-3.15:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gles2? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Video sink plugin for GStreamer that renders to a GtkWidget
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=+egl gles2 +opengl wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl=,gles2=,opengl=,wayland=,X=] >=x11-libs/gtk+-3.15:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gles2? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c31820d86bdab7ed7a81e161261275b6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.5
new file mode 100644
index 000000000000..c7d718ab9547
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=HTTP live streaming plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a42abc2e565e0e6d5eaf860aab964309
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.5
new file mode 100644
index 000000000000..a701a9aedaa6
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=plugin for gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b7a0e0ce2302a9455d6ba12ad134227
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.5
new file mode 100644
index 000000000000..221e5110bb0d
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=JPEG image encoder/decoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2672fb1832ee09d508cba6191efabd1e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.5
new file mode 100644
index 000000000000..13c59ea998b9
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-kate-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libkate-0.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libtiger-0.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Kate overlay codec suppport plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libkate-0.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libtiger-0.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2798e794daa0b04cdbb91d1ae7abfbfc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.5
new file mode 100644
index 000000000000..d741dfa9ee64
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Ladspa elements for Gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9b1fd8a3287a24a146ba529c8727e398
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.5
new file mode 100644
index 000000000000..75551f532a69
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=MP3 encoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1560703bbc4ff60bfd78881641374fa3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.5
new file mode 100644
index 000000000000..e3e53c779b90
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libde265-0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=H.265 decoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libde265-0.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ac069a21671c85501e35a71f6e8eb74e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.5
new file mode 100644
index 000000000000..88f261b62931
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Microsoft Multi Media Server source plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7483f83d6d256cecdabdac5563116f49
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.5
new file mode 100644
index 000000000000..99c53c5c2c1f
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=PNG image encoder/decoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ae02bdbfe4341b1a4bc7be4316ad9236
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.5
new file mode 100644
index 000000000000..9a85eed21ec1
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/libvisual-plugins-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Visualization elements for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/libvisual-plugins-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a11d6f306c101f872cef6c4b20b26387
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.5
new file mode 100644
index 000000000000..4bfc8b90f368
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lilv-0.24.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Lv2 elements for Gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/lilv-0.24.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5973d45e0f2aea7e07380cbbefad6f4f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.5
new file mode 100644
index 000000000000..cd7a82f39c5b
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=MOD audio decoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fcd685d57b8d9cbf7203e1393ab9c536
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.5
new file mode 100644
index 000000000000..0d426bfbf2dc
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=MPEG-1/2 video encoding plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8051b5a85104d37b3585f31a50360573
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.5
new file mode 100644
index 000000000000..587eb4258a9c
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=MP3 decoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a05de4cf0aeb8acced561cc2a89b8512
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.5
new file mode 100644
index 000000000000..799083533cfb
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=MPEG/DVD/SVCD/VCD video/audio multiplexing plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7f8d3d2845a02d6b95595c971fb8d483
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.5
new file mode 100644
index 000000000000..8c9534c8a7b8
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=net-libs/neon-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=HTTP client source plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/neon-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=aadda4bdf8eecd2d154eb5bf2f9ef257
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.5
new file mode 100644
index 000000000000..f947eb93ebf7
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=MusicIP audio fingerprinting plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=912f1bebe497d51b3e25e79f65a87778
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.5
new file mode 100644
index 000000000000..9a4dae896bd1
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opencv-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/opencv-2.3.0[contrib(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <media-libs/opencv-3.5 >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=OpenCV elements for Gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/opencv-2.3.0[contrib(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <media-libs/opencv-3.5 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3f4425713fcfe0bcd895027e24d45050
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.5
new file mode 100644
index 000000000000..869042709b9f
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/openh264-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=H.264 encoder/decoder plugin for GStreamer.
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/openh264-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9bb4fc625a81e6cc4c2fe9278c804a00
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.5
new file mode 100644
index 000000000000..9b64cbc4de2b
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Opus audio parser plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,ogg] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.5.tar.xz https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3643a206a06c7ad55c2a0f393f3124e6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.5
new file mode 100644
index 000000000000..d4996ac3b037
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=virtual/os-headers >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=OSS (Open Sound System) support plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=823dbb4b02fbe97a310ec1269d6cfb9f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.5
new file mode 100644
index 000000000000..6d320c513811
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=PulseAudio sound server plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b8b9797a15f9627b3e48991582637a06
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.5
new file mode 100644
index 000000000000..2e1d4ff8ae6c
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Fiwewire DV/HDV capture plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=090432937d58ff65fd3876b6fb95375b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.5
new file mode 100644
index 000000000000..9c1d59370111
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=DVD playback support plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0977c47b09751331bfb875417f542bdc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.5
new file mode 100644
index 000000000000..cc1f3d3c5ff7
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=RTMP source/sink plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9fb90d02eabed1b5b0d2383917f28b00
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.5
new file mode 100644
index 000000000000..f67c9fc96c39
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Icecast server sink plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c9c00a2cacbd73ab069d870391d7dc82
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.5
new file mode 100644
index 000000000000..611943f4bef9
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Smooth Streaming plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0656cccb22c593d1e74dd687a6c56f4e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.5
new file mode 100644
index 000000000000..2efff4b69169
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libsoundtouch-1.7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Beats-per-minute detection and pitch controlling plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsoundtouch-1.7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7e533ed11ca4329c51a07679545bc0b0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.5
new file mode 100644
index 000000000000..86d9f3807b9f
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=HTTP client source/sink plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=868ad56feb994394d6eff8c758b15f37
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.5
new file mode 100644
index 000000000000..8f2d34c8605b
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Speex encoder/decoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=675da8a57d89bcab02999c4aebe42069
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.5
new file mode 100644
index 000000000000..877344b16d1e
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/glib-utils >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=SRTP encoder/decoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8c5fc4aa24a727c5458bf1a58cec056a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.5
new file mode 100644
index 000000000000..c67d541b2f27
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=ID3v2/APEv2 tagger plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=58358d78e27a886d04decaa9b9eb67c9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.5
new file mode 100644
index 000000000000..a0a1d1439cd2
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=MPEG2 encoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=00e989612f0d37452c2ff3dcd47bf964
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.5
new file mode 100644
index 000000000000..69b3403726f5
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=UVC compliant H264 encoding cameras plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ae10d4c9d33974ecc2185f3cfc7b4b2d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.5
new file mode 100644
index 000000000000..334f86013813
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( >=virtual/libgudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/os-headers >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=plugin for gstreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] udev? ( >=virtual/libgudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cc7fedbbafb23f6cd063804474787286
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.5
new file mode 100644
index 000000000000..5dfd267a2797
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] drm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/gst-plugins-base-1.14.5:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/gst-plugins-base-1.14.5:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.12 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Hardware accelerated video decoding through VA-API plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi
+IUSE=+drm +egl gles2 +opengl wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libva-1.4.0:=[drm?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] drm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/gst-plugins-base-1.14.5:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/gst-plugins-base-1.14.5:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl?,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=|| ( drm gles2 opengl wayland X ) gles2? ( egl ) opengl? ( || ( egl X ) )
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.14.5.tar.xz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=5ed89d943968548d69020d2d92c64d96
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.5
new file mode 100644
index 000000000000..4581ecba4407
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=AAC encoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=21fcbcdc467a3b1abe4b53db98dc77ec
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.5
new file mode 100644
index 000000000000..df5afdd24129
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=AMR-WB audio encoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d5411a2ac2978fe334ef12eea1f05f86
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.5
new file mode 100644
index 000000000000..b0c17b86a3d2
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/libvpx-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=VP8/VP9 video encoder/decoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libvpx-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=798bda44034b2469da69cbabbe1d1c07
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.5
new file mode 100644
index 000000000000..18d776faad06
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Wavpack audio encoder/decoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=09ca2a86748569b056498dc5954f2908
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.5
new file mode 100644
index 000000000000..3ecacc6d9acd
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=H.265 encoder plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/x265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18efeb1a90a2cd364f3785bd5a67b24c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.5
new file mode 100644
index 000000000000..046ba5c1fe9b
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=X11 video capture stream plugin for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/gst-plugins-base-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2f9976303199629553cabe8343aa35bc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.5 b/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.5
new file mode 100644
index 000000000000..c335edca5a50
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-zbar-1.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-gfx/zbar-0.10_p20121015-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Bar codes detection in video streams for GStreamer
+EAPI=6
+HOMEPAGE=https://gstreamer.freedesktop.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=media-gfx/zbar-0.10_p20121015-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.5:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=db3f9d53cbba508a8210ab415c267ecc
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-1.1.0-r1
deleted file mode 100644
index 8b770dd4f682..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-1.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* media-libs/libmodplug sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Modplug decoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/audiodecoder.modplug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* media-libs/libmodplug
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.modplug/archive/v1.1.0.tar.gz -> kodi-audiodecoder-modplug-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75de96554585231de5f2446b73e9f00a
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.0
index bda2d32a8e3c..333ccca8cabe 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* media-libs/libmodplug
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.modplug/archive/2.0.0-Leia.tar.gz -> kodi-audiodecoder-modplug-2.0.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d0c9663994c19c3f07524670921d0369
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.1
new file mode 100644
index 000000000000..cb14b8ef91f4
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* media-libs/libmodplug sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Modplug decoder addon for Kodi
+EAPI=6
+HOMEPAGE=https://github.com/notspiff/audiodecoder.modplug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* media-libs/libmodplug
+SLOT=0
+SRC_URI=https://github.com/notspiff/audiodecoder.modplug/archive/2.0.1-Leia.tar.gz -> kodi-audiodecoder-modplug-2.0.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=25e2ce4b11576e118d92b115d9423639
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999
index 69c606897f25..a692e0536851 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 media-libs/libmodplug sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 media-libs/libmodplug
 DESCRIPTION=Modplug decoder addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/notspiff/audiodecoder.modplug
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 media-libs/libmodplug
+RDEPEND=~media-tv/kodi-9999 media-libs/libmodplug
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38bf79e0f355437fc4ddba379ea64f8f
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ee6f4efe0a40f374abea0dbc1d302520
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-1.1.0-r1
deleted file mode 100644
index 099e72d926e7..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-1.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Nosefart decoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/audiodecoder.nosefart
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17*
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.nosefart/archive/v1.1.0.tar.gz -> kodi-audiodecoder-nosefart-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40f1e48f302dbb4042a5417bf51d535d
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.0
index 93d1627536ed..339642d0f414 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18*
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.nosefart/archive/2.0.0-Leia.tar.gz -> kodi-audiodecoder-nosefart-2.0.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c59c079bc0985e1e197c50f9253cc2f
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999
index 44bdf44c67e7..5ff88b91bff7 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
 DESCRIPTION=Nosefart decoder addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/notspiff/audiodecoder.nosefart
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1079bc13240afa334e672b41c50f67e2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9c5c10a41adcbe7dfbca5eb8ce6a5ec8
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.1.0-r1
deleted file mode 100644
index 8c0ba17403cc..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* media-libs/libsidplay:2 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=SidPlay decoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/audiodecoder.sidplay
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* media-libs/libsidplay:2
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.sidplay/archive/v1.1.0.tar.gz -> kodi-audiodecoder-sidplay-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=676e81008fad607ede10c450d7bd1f68
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.1.3 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.1.3
index 1505bf86c7da..70bf71f25b87 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.1.3
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* media-libs/libsidplay:2
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.sidplay/archive/1.1.3-Leia.tar.gz -> kodi-audiodecoder-sidplay-1.1.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3baf48ffd1b49e4a15010f649f768030
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
index b6dfb5b8a379..95b2c7e2eff8 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 media-libs/libsidplay:2 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 media-libs/libsidplay:2
 DESCRIPTION=SidPlay decoder addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/notspiff/audiodecoder.sidplay
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 media-libs/libsidplay:2
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5de6891c199e9249b3c3a23b59314d43
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6a2d7f20a2d8a4f224d45ccb17bae68c
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-1.1.0-r1
deleted file mode 100644
index dd1e8659b724..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-1.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=SPC decoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/audiodecoder.snesapu
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17*
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.snesapu/archive/v1.1.0.tar.gz -> kodi-audiodecoder-snesapu-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8de58ad4cb676d7ca35b89f07a823793
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.0
index 7374196cbc81..4e7833fa3aaa 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18*
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.snesapu/archive/2.0.0-Leia.tar.gz -> kodi-audiodecoder-snesapu-2.0.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4a5d002ba5d767cbb7cbca6abb132792
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
index 7663e101f09c..bffea34b938f 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
 DESCRIPTION=SPC decoder addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/notspiff/audiodecoder.snesapu
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7fdff6d72afa6b11c06f9247c693776c
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bc1a9a002bd091b07a9550b5b2031dbb
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-1.1.0-r1
deleted file mode 100644
index cdae3763070f..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-1.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=SPC decoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/audiodecoder.stsound
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17*
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.stsound/archive/v1.1.0.tar.gz -> kodi-audiodecoder-stsound-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2ba50b76c9bc5d61b117f61583f4c857
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.0.0
index dbbb49bf0596..e3fcad706758 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18*
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.stsound/archive/2.0.0-Leia.tar.gz -> kodi-audiodecoder-stsound-2.0.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7923eb3d98f3dc787cd0f8fb2e356318
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
index 89bbbfa118fd..70689d93b201 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
 DESCRIPTION=SPC decoder addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/notspiff/audiodecoder.stsound
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a60d356d2c321b0af95626421d0df60
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=86d325e6bd9ceb11be6f392fb1412e8e
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-1.1.0-r1
deleted file mode 100644
index afd90b924e98..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-1.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* 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-17*
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.timidity/archive/v1.1.0.tar.gz -> kodi-audiodecoder-timidity-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a1c9716fb304ea8a9e2c10e3d25894a
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.1
index f4e66fec591e..eb29a9d49314 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18*
 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	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12c1433c29bf78ca0c68c481883dd00f
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
index f2ef82563a41..beac528da7dc 100644
--- 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
@@ -8,5 +8,5 @@ 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	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 acf33eeaf09d..915b8f6eeb57 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~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]
+DEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2*
 DESCRIPTION=Timidity decoder addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/notspiff/audiodecoder.timidity
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2*
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=571992f8b605b85c6b93be06ccfa0c06
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6e302b84a58eae338b3ad5589e186bd9
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.0-r1
deleted file mode 100644
index 08d4ff4d820d..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=vgmstream decoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/audiodecoder.vgmstream
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17*
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.vgmstream/archive/v1.1.0.tar.gz -> kodi-audiodecoder-vgmstream-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f46f705a3138d2a6186f92e0087a2123
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.3 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.3
index 8273921a6d56..19c2cccb868d 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.3
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18*
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.vgmstream/archive/1.1.3-Leia.tar.gz -> kodi-audiodecoder-vgmstream-1.1.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a21239c2e71def27fe2c8a1c29609e83
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999
index 7e9672f171b1..6a340ec70489 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
 DESCRIPTION=vgmstream decoder addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/notspiff/audiodecoder.vgmstream
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=04ed2f3dcc346ccbced44a4b9fe8a801
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7ed1c19ca2681b9d5a98d8e2735ffd4d
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-1.1.0-r1
deleted file mode 100644
index 2bfef9367b84..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-1.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* media-libs/libogg media-libs/flac sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Flac encoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/xbmc/audioencoder.flac
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* media-libs/libogg media-libs/flac
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/v1.1.0.tar.gz -> kodi-audioencoder-flac-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8eb88c09c830d495f8114648abed70a2
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.1
index 36227498be7e..05fc3d974e21 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* media-libs/libogg media-libs/flac
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/v2.0.1.tar.gz -> kodi-audioencoder-flac-2.0.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4af0b3e94144a34ae6744789ac61985d
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999
index a5c233c15058..89a19d7e55ab 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 media-libs/libogg media-libs/flac sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 media-libs/libogg media-libs/flac
 DESCRIPTION=Flac encoder addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/audioencoder.flac
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 media-libs/libogg media-libs/flac
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e40972bb428ec78a9c4ae2117f7d348
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c99573552a126bce291daea9503df6e8
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-1.2.0-r1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-1.2.0-r1
deleted file mode 100644
index 399a8c1a831e..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-1.2.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* media-sound/lame sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Lame MP3 encoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/xbmc/audioencoder.lame
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* media-sound/lame
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/v1.2.0.tar.gz -> kodi-audioencoder-lame-1.2.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4ca79797831d60778f53b61d65623043
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.1
index a2ed76c1d9d4..c5f718d359c6 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* media-sound/lame
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/v2.0.1.tar.gz -> kodi-audioencoder-lame-2.0.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89105bccdad41b18a1144a98ed11b21e
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999
index cda1c1ea94e1..17ce9a648156 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 media-sound/lame sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 media-sound/lame
 DESCRIPTION=Lame MP3 encoder addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/audioencoder.lame
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 media-sound/lame
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=10c14fd89c74151091f7629a1652942d
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=abfc0602b79f16acc6779171f0ea595d
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-1.1.0-r1
deleted file mode 100644
index 58249d1afa62..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-1.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* media-libs/libogg media-libs/libvorbis sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Vorbis encoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/xbmc/audioencoder.vorbis
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* media-libs/libogg media-libs/libvorbis
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/v1.1.0.tar.gz -> kodi-audioencoder-vorbis-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=be394af0f54288306a8fe93017777d4b
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.1
index c603d92104fe..f9a6f35db1a8 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* media-libs/libogg media-libs/libvorbis
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/v2.0.1.tar.gz -> kodi-audioencoder-vorbis-2.0.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a713ce3f4809ac3eff9e0a8686112d24
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.2
new file mode 100644
index 000000000000..4800a3db4258
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* media-libs/libogg media-libs/libvorbis sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Vorbis encoder addon for Kodi
+EAPI=6
+HOMEPAGE=https://github.com/xbmc/audioencoder.vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* media-libs/libogg media-libs/libvorbis
+SLOT=0
+SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/v2.0.2-Leia.tar.gz -> kodi-audioencoder-vorbis-2.0.2.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a262e6000d6b3bd7eb2ce01d59837099
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999
index ed799ae52fb2..34c218e2e8eb 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 media-libs/libogg media-libs/libvorbis sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 media-libs/libogg media-libs/libvorbis
 DESCRIPTION=Vorbis encoder addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/audioencoder.vorbis
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 media-libs/libogg media-libs/libvorbis
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05c842fcb01d0a032df27f451bb01447
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=46bd4ef8975a7823e6183e64099308b2
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-1.1.0-r1
deleted file mode 100644
index de7e13432b57..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-1.1.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=WAV encoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/xbmc/audioencoder.wav
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.wav/archive/v1.1.0.tar.gz -> kodi-audioencoder-wav-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50563127d424e9248b11bbb2da349871
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.1
index 3e1c89981c1c..b39e16ef4f77 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.wav/archive/v2.0.1.tar.gz -> kodi-audioencoder-wav-2.0.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=657e5e58960984c912d88a88b036eb89
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999
index f3fe32a49e99..651e25c468c6 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~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
 DESCRIPTION=WAV encoder addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/audioencoder.wav
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=09a19fbdb3a80ffc65921998194efacb
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=af28fe154cbcfd59163002853797da5b
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-1.1.0 b/metadata/md5-cache/media-plugins/kodi-game-libretro-1.1.0
index 6b173f10a7d4..3f4de0090513 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2*
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro/archive/1.1.0-Leia.tar.gz -> kodi-game-libretro-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=534e3d573a108235e0c2cb9af58a2f49
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
index 616e4cbdb648..730de6f839e3 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 =dev-libs/libplatform-2*
 DESCRIPTION=Libretro compatibility layer for the Kodi Game API
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-game/game.libretro
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 =dev-libs/libplatform-2*
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=21627ceab19295230a7df7ac0a16a9b6
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e63ef537eccbb22b2fb6e6e43447f338
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.3 b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.3
index a6b997b56959..413f61e06904 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.3
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-bnes
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.bnes/archive/0.83.0.3-Leia.tar.gz -> kodi-game-libretro-bnes-0.83.0.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b90f7d0d2161ec0e6d262c4b4c005cb
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.4 b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.4
index e613e0e044c4..e9a449b94ab1 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.4
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-bnes
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.bnes/archive/0.83.0.4-Leia.tar.gz -> kodi-game-libretro-bnes-0.83.0.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b90f7d0d2161ec0e6d262c4b4c005cb
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.5 b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.5
new file mode 100644
index 000000000000..12faf5db018b
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-0.83.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* games-emulation/libretro-bnes sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=bNES GameClient for Kodi
+EAPI=6
+HOMEPAGE=https://github.com/kodi-game/game.libretro.bnes
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-bnes
+SLOT=0
+SRC_URI=https://github.com/kodi-game/game.libretro.bnes/archive/0.83.0.5-Leia.tar.gz -> kodi-game-libretro-bnes-0.83.0.5.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4b90f7d0d2161ec0e6d262c4b4c005cb
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999
index a41c5fc925e6..552621791d52 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 games-emulation/libretro-bnes sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 games-emulation/libretro-bnes
 DESCRIPTION=bNES GameClient for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-game/game.libretro.bnes
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-bnes
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0885f9c051e64b397a4609577c2115c1
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=41f661956fed7ae4595b80bea0911b91
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-0.74.0.3 b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-0.74.0.3
index 0a9ba8bb4cb5..2b419ed42309 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-0.74.0.3
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-0.74.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-dosbox
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.dosbox/archive/0.74.0.3-Leia.tar.gz -> kodi-game-libretro-dosbox-0.74.0.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41bafc5281a857b613102249882fe680
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-0.74.0.4 b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-0.74.0.4
new file mode 100644
index 000000000000..168d903ced66
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-0.74.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* games-emulation/libretro-dosbox sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=DOSBox GameClient for Kodi
+EAPI=6
+HOMEPAGE=https://github.com/kodi-game/game.libretro.dosbox
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-dosbox
+SLOT=0
+SRC_URI=https://github.com/kodi-game/game.libretro.dosbox/archive/0.74.0.4-Leia.tar.gz -> kodi-game-libretro-dosbox-0.74.0.4.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=41bafc5281a857b613102249882fe680
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999
index 2afca3c8bac7..6aff28bf03e5 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 games-emulation/libretro-dosbox sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 games-emulation/libretro-dosbox
 DESCRIPTION=DOSBox GameClient for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-game/game.libretro.dosbox
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-dosbox
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=962e11bd1131d0968f2dcc370a631ffb
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=791ada425d0ea69c1340b439a6e45ded
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-0.0.1.9 b/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-0.0.1.9
index 6cfc786a3f88..3fd88e6a44d8 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-0.0.1.9
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-0.0.1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-fceumm
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.fceumm/archive/0.0.1.9-Leia.tar.gz -> kodi-game-libretro-fceumm-0.0.1.9.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ffb3db9ab93a8ceafd1faf00893800b2
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999
index 1006fbc37937..18a56fd92a79 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 games-emulation/libretro-fceumm sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 games-emulation/libretro-fceumm
 DESCRIPTION=FCEU-Next GameClient for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-game/game.libretro.fceumm
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-fceumm
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8afa8cf0163cab63749e736d0c40a8b
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=31bb7da8da4eec57cc8cdd2f169f2723
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.3 b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.3
index 3833e0ba3aaa..cd3ccfeadaa7 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.3
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-nestopia
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.nestopia/archive/1.50.0.3-Leia.tar.gz -> kodi-game-libretro-nestopia-1.50.0.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9408f2b9562c3efbdb2cc2b1030724c2
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.4 b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.4
index 9dc0a534db8f..62cc11d24e28 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.4
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-nestopia
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.nestopia/archive/1.50.0.4-Leia.tar.gz -> kodi-game-libretro-nestopia-1.50.0.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9408f2b9562c3efbdb2cc2b1030724c2
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.5 b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.5
new file mode 100644
index 000000000000..ea79ddb95cd7
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* games-emulation/libretro-nestopia sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Nestopia GameClient for Kodi
+EAPI=6
+HOMEPAGE=https://github.com/kodi-game/game.libretro.nestopia
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-nestopia
+SLOT=0
+SRC_URI=https://github.com/kodi-game/game.libretro.nestopia/archive/1.50.0.5-Leia.tar.gz -> kodi-game-libretro-nestopia-1.50.0.5.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9408f2b9562c3efbdb2cc2b1030724c2
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.6 b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.6
new file mode 100644
index 000000000000..6c10baca7816
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* games-emulation/libretro-nestopia sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Nestopia GameClient for Kodi
+EAPI=6
+HOMEPAGE=https://github.com/kodi-game/game.libretro.nestopia
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-nestopia
+SLOT=0
+SRC_URI=https://github.com/kodi-game/game.libretro.nestopia/archive/1.50.0.6-Leia.tar.gz -> kodi-game-libretro-nestopia-1.50.0.6.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9408f2b9562c3efbdb2cc2b1030724c2
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999
index 46812eeb56ae..60a64f13dfcd 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 games-emulation/libretro-nestopia sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 games-emulation/libretro-nestopia
 DESCRIPTION=Nestopia GameClient for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-game/game.libretro.nestopia
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-nestopia
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ef29b8d037784991743bebb22579182
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0e41d9acac2a63d298d4e8fbf2a2ca82
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.58.0.6 b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.58.0.6
index 536c2f717035..3a931943b364 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.58.0.6
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.58.0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-snes9x
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.snes9x/archive/1.58.0.6-Leia.tar.gz -> kodi-game-libretro-snes9x-1.58.0.6.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1bff27722d3e573f79420bbea20ecfb2
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.60.0.7 b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.60.0.7
index 9bc494018489..ddfc26a9a922 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.60.0.7
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.60.0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-snes9x
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.snes9x/archive/1.60.0.7-Leia.tar.gz -> kodi-game-libretro-snes9x-1.60.0.7.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1bff27722d3e573f79420bbea20ecfb2
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.60.0.8 b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.60.0.8
new file mode 100644
index 000000000000..205a0646cf81
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-1.60.0.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* games-emulation/libretro-snes9x sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Snes9x GameClient for Kodi
+EAPI=6
+HOMEPAGE=https://github.com/kodi-game/game.libretro.snes9x
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-snes9x
+SLOT=0
+SRC_URI=https://github.com/kodi-game/game.libretro.snes9x/archive/1.60.0.8-Leia.tar.gz -> kodi-game-libretro-snes9x-1.60.0.8.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1bff27722d3e573f79420bbea20ecfb2
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999
index c4758533cceb..6940587a545e 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 games-emulation/libretro-snes9x sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 games-emulation/libretro-snes9x
 DESCRIPTION=Snes9x GameClient for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-game/game.libretro.snes9x
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-snes9x
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eb65f8dcde4139fdcb56ec5cd9fc4a18
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=591066a17ef0d637747421a511d46f15
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.106 b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.106
index a9e91eb2d435..77c2af348731 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.106
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.106
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-twentyfortyeight
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.2048/archive/1.0.0.106-Leia.tar.gz -> kodi-game-libretro-twentyfortyeight-1.0.0.106.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f08b7c3d8f6a3dae7ca5201b938d678
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.107 b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.107
index 31dd99fbb9dc..46f6425f5949 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.107
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.107
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-twentyfortyeight
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.2048/archive/1.0.0.107-Leia.tar.gz -> kodi-game-libretro-twentyfortyeight-1.0.0.107.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f08b7c3d8f6a3dae7ca5201b938d678
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.108 b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.108
new file mode 100644
index 000000000000..daf4cbad8cda
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.108
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* games-emulation/libretro-twentyfortyeight sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=2048 for Kodi
+EAPI=6
+HOMEPAGE=https://github.com/kodi-game/game.libretro.2048
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-twentyfortyeight
+SLOT=0
+SRC_URI=https://github.com/kodi-game/game.libretro.2048/archive/1.0.0.108-Leia.tar.gz -> kodi-game-libretro-twentyfortyeight-1.0.0.108.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0f08b7c3d8f6a3dae7ca5201b938d678
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999
index 9c68addb7643..5b71ef61eea2 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 games-emulation/libretro-twentyfortyeight sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 games-emulation/libretro-twentyfortyeight
 DESCRIPTION=2048 for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-game/game.libretro.2048
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-twentyfortyeight
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc8e336ad2940e6005ef5ef41e6d7636
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9457223e1c8c9a5a3fc49ed686f1637c
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.25 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.25
deleted file mode 100644
index 1092d865ceab..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat =media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Adaptive inputstream addon
-EAPI=6
-HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat =media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz/c51b9a9b58a645f820883e6d99982277fc58aac5 -> kodi-inputstream-adaptive-2.0.25.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=961cd8974c79b8c93d82671083c3e94e
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.13 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.13
deleted file mode 100644
index 85de32d91e11..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Adaptive inputstream addon
-EAPI=6
-HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.3.13.tar.gz -> kodi-inputstream-adaptive-2.3.13.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f2e92454fb7fcb4d95e5e6a6ea02071
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.14 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.14
deleted file mode 100644
index 5054e1643764..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Adaptive inputstream addon
-EAPI=6
-HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.3.14.tar.gz -> kodi-inputstream-adaptive-2.3.14.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f2e92454fb7fcb4d95e5e6a6ea02071
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.15 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.15
deleted file mode 100644
index a983c4cad7b1..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Adaptive inputstream addon
-EAPI=6
-HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.3.15.tar.gz -> kodi-inputstream-adaptive-2.3.15.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f2e92454fb7fcb4d95e5e6a6ea02071
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.16 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.16
deleted file mode 100644
index 2e51beae1b1f..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Adaptive inputstream addon
-EAPI=6
-HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.3.16.tar.gz -> kodi-inputstream-adaptive-2.3.16.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f2e92454fb7fcb4d95e5e6a6ea02071
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.17 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.17
deleted file mode 100644
index 7eb282f3d2f6..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Adaptive inputstream addon
-EAPI=6
-HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.3.17.tar.gz -> kodi-inputstream-adaptive-2.3.17.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f2e92454fb7fcb4d95e5e6a6ea02071
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.18 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.18
deleted file mode 100644
index 2f1b3cbacc81..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Adaptive inputstream addon
-EAPI=6
-HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.3.18.tar.gz -> kodi-inputstream-adaptive-2.3.18.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f2e92454fb7fcb4d95e5e6a6ea02071
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.19 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.19
deleted file mode 100644
index e78a7044c3ad..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Adaptive inputstream addon
-EAPI=6
-HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.3.19-Leia.tar.gz -> kodi-inputstream-adaptive-2.3.19.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=72beaf5dd0682be6f391ecb9fb0bcbdd
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.20 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.20
deleted file mode 100644
index 5d0e521e2c6d..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.20
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Adaptive inputstream addon
-EAPI=6
-HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.3.20-Leia.tar.gz -> kodi-inputstream-adaptive-2.3.20.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=72beaf5dd0682be6f391ecb9fb0bcbdd
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.21 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.21
deleted file mode 100644
index 37c2210bd65f..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.21
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Adaptive inputstream addon
-EAPI=6
-HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.3.21-Leia.tar.gz -> kodi-inputstream-adaptive-2.3.21.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=72beaf5dd0682be6f391ecb9fb0bcbdd
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.22 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.22
deleted file mode 100644
index a185e33d0666..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.3.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Adaptive inputstream addon
-EAPI=6
-HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.3.22-Leia.tar.gz -> kodi-inputstream-adaptive-2.3.22.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=72beaf5dd0682be6f391ecb9fb0bcbdd
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.4.2 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.4.2
new file mode 100644
index 000000000000..b278147d6940
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.4.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kodi's Adaptive inputstream addon
+EAPI=6
+HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat =media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2*
+SLOT=0
+SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.4.2-Leia.tar.gz -> kodi-inputstream-adaptive-2.4.2.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=72beaf5dd0682be6f391ecb9fb0bcbdd
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
index 44f3dd1141cb..bb5c63a06b96 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/expat ~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/expat ~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
 DESCRIPTION=Kodi's Adaptive inputstream addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/expat ~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 =dev-libs/libplatform-2*
+RDEPEND=dev-libs/expat ~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8703849f9bc64241b9cf120b0d89094
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=55435920683db8c08f800e7cb46337c2
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.4 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.4
deleted file mode 100644
index ac653c296297..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* media-video/rtmpdump sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's RTMP inputstream addon
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/inputstream.rtmp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* media-video/rtmpdump
-SLOT=0
-SRC_URI=https://github.com/notspiff/inputstream.rtmp/archive/v1.0.4.tar.gz -> kodi-inputstream-rtmp-1.0.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c9400318df44068dbaa83ebf6ed4a3a
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.5 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.5
deleted file mode 100644
index 4a18108e473a..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* media-video/rtmpdump sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's RTMP inputstream addon
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/inputstream.rtmp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* media-video/rtmpdump
-SLOT=0
-SRC_URI=https://github.com/notspiff/inputstream.rtmp/archive/v1.0.5.tar.gz -> kodi-inputstream-rtmp-1.0.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c068b2fbbadc93ff14c7d94e6f12657
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.4 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.4
index d526aa99d503..5dc925142042 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.4
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* media-video/rtmpdump
 SLOT=0
 SRC_URI=https://github.com/xbmc/inputstream.rtmp/archive/2.0.4-Leia.tar.gz -> kodi-inputstream-rtmp-2.0.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf3820c59d0e9ab45e05f5809dbaffcd
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.5 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.5
index 40b05f067ba7..7171518fccc2 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.5
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* media-video/rtmpdump
 SLOT=0
 SRC_URI=https://github.com/xbmc/inputstream.rtmp/archive/2.0.5-Leia.tar.gz -> kodi-inputstream-rtmp-2.0.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f9c3f695dbcda9f3441998d35446d77
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999
index f2be049c9a6d..e0c1437f30c7 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 media-video/rtmpdump sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 media-video/rtmpdump
 DESCRIPTION=Kodi's RTMP inputstream addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/inputstream.rtmp
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 media-video/rtmpdump
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4b4d6442941fc7623876dcb947c0b9c2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5e823917a7bf439121a31dcd1718f6dc
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.3.2 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.3.2
deleted file mode 100644
index 4e12dd83dd25..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>media-tv/kodi-17.0.9999:0 =media-tv/kodi-17*:0 =media-libs/kodi-platform-17* =dev-libs/libplatform-2* dev-libs/libpcre sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Libretro compatibility layer for the Kodi Game API
-EAPI=6
-HOMEPAGE=https://github.com/xbmc/peripheral.joystick
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>media-tv/kodi-17.0.9999:0 =media-tv/kodi-17*:0 =media-libs/kodi-platform-17* =dev-libs/libplatform-2* dev-libs/libpcre
-SLOT=0
-SRC_URI=https://github.com/xbmc/peripheral.joystick/archive/v1.3.2.tar.gz -> kodi-peripheral-joystick-1.3.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a323cb2e7e0dbbfb65f10eac4146f383
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.3.3 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.3.3
deleted file mode 100644
index 433e4ff35c83..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.3.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>media-tv/kodi-17.0.9999:0 =media-tv/kodi-17*:0 =media-libs/kodi-platform-17* =dev-libs/libplatform-2* dev-libs/libpcre sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Libretro compatibility layer for the Kodi Game API
-EAPI=6
-HOMEPAGE=https://github.com/xbmc/peripheral.joystick
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>media-tv/kodi-17.0.9999:0 =media-tv/kodi-17*:0 =media-libs/kodi-platform-17* =dev-libs/libplatform-2* dev-libs/libpcre
-SLOT=0
-SRC_URI=https://github.com/xbmc/peripheral.joystick/archive/v1.3.3.tar.gz -> kodi-peripheral-joystick-1.3.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a323cb2e7e0dbbfb65f10eac4146f383
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.6 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.6
index 29515c99e339..5e1005ffcde6 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.6
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* dev-libs/libpcre
 SLOT=0
 SRC_URI=https://github.com/xbmc/peripheral.joystick/archive/v1.4.6.tar.gz -> kodi-peripheral-joystick-1.4.6.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=456a0e6a30e39ccb5f014db5cd42b5d9
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.7 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.7
index b7dca9240763..c19e88de68fc 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.7
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* dev-libs/libpcre
 SLOT=0
 SRC_URI=https://github.com/xbmc/peripheral.joystick/archive/v1.4.7.tar.gz -> kodi-peripheral-joystick-1.4.7.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ec85ba3f5478613ad745d7c233746949
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.8 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.8
new file mode 100644
index 000000000000..689c07de240f
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* dev-libs/libpcre sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Libretro compatibility layer for the Kodi Game API
+EAPI=6
+HOMEPAGE=https://github.com/xbmc/peripheral.joystick
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* =dev-libs/libplatform-2* dev-libs/libpcre
+SLOT=0
+SRC_URI=https://github.com/xbmc/peripheral.joystick/archive/1.4.8-Leia.tar.gz -> kodi-peripheral-joystick-1.4.8.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1164afc3cb9c2ac89fecc72a4849ebec
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999
index 0196277c1f1e..3d95dfc9b8e7 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/libpcre sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/libpcre
 DESCRIPTION=Libretro compatibility layer for the Kodi Game API
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/peripheral.joystick
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/libpcre
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18c5d9080a2034fb0acb45b9bbf265ed
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8652bc5951e22ce80f08bc0d4aeaadda
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999 b/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999
index 8b13a937f015..780c4be74d9c 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 =dev-libs/libplatform-2* virtual/libusb:1 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 =dev-libs/libplatform-2* virtual/libusb:1
 DESCRIPTION=Steam controller driver for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-game/peripheral.steamcontroller
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 =dev-libs/libplatform-2* virtual/libusb:1
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9749015d392bd70aa488a958b99e373a
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eb834cccff918883a4dd7cf5d41e2d3f
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-2.5.4-r1 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-2.5.4-r1
deleted file mode 100644
index d6c9022f36b6..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-2.5.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's ARGUS TV client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.argustv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/2.5.4-Krypton.tar.gz -> kodi-pvr-argustv-2.5.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3a0d86c43b69596d454b55d970604c0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-2.5.6 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-2.5.6
deleted file mode 100644
index 3c3b5dc24377..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-2.5.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's ARGUS TV client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.argustv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/2.5.6-Krypton.tar.gz -> kodi-pvr-argustv-2.5.6.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3a0d86c43b69596d454b55d970604c0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-3.5.4 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-3.5.4
index cbd8e1ffffd0..1d8238e33309 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-3.5.4
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-3.5.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/3.5.4-Leia.tar.gz -> kodi-pvr-argustv-3.5.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d7a65c1db54b16c68e3bbd2afd2d666
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
index fa20045bf85e..8e570335ba96 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/jsoncpp sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/jsoncpp
 DESCRIPTION=Kodi's ARGUS TV client addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.argustv
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/jsoncpp
+RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/jsoncpp
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f2870b2eeb514925346edea04034131d
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c1b6f8d4a0b9297f90e6807ed7f81e57
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-2.4.3 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-2.4.3
deleted file mode 100644
index 1544bb4267a2..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-2.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Demo PVR for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.demo
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.demo/archive/2.4.3-Krypton.tar.gz -> kodi-pvr-demo-2.4.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=028556df1745d1767014c2c529f7530a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-2.4.6 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-2.4.6
deleted file mode 100644
index d79f84bcc1b1..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-2.4.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Demo PVR for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.demo
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.demo/archive/2.4.6-Krypton.tar.gz -> kodi-pvr-demo-2.4.6.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=028556df1745d1767014c2c529f7530a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-3.6.1 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-3.6.1
new file mode 100644
index 000000000000..42a6e1f845c2
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-demo-3.6.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml
+DESCRIPTION=Demo PVR for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.demo
+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.demo/archive/3.6.1-Leia.tar.gz -> kodi-pvr-demo-3.6.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=428c31b6e949cb9cc115d8b07279d6bf
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
index f91fbd935455..15939c2b1ddb 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml
 DESCRIPTION=Demo PVR for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.demo
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/tinyxml
+RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9178700d04d7e80ce8d2b4866e2cd0ea
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e199952b35332e231827fb076371b0bc
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-3.3.11-r1 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-3.3.11-r1
deleted file mode 100644
index 367ce1f0d698..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-3.3.11-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml2 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's DVBLink client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvblink
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvblink/archive/3.3.11-Krypton.tar.gz -> kodi-pvr-dvblink-3.3.11.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f097a1d4da64120069ffb5635518cdd0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-3.4.5 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-3.4.5
deleted file mode 100644
index b10ad4b602e5..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-3.4.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml2 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's DVBLink client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvblink
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvblink/archive/3.4.5-Krypton.tar.gz -> kodi-pvr-dvblink-3.4.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f097a1d4da64120069ffb5635518cdd0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-4.7.1 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-4.7.1
index 2e22d1c3a9cf..d9acdae27001 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-4.7.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-4.7.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.dvblink/archive/4.7.1-Leia.tar.gz -> kodi-pvr-dvblink-4.7.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2782222f9e34e41900f6dcca2dbe0abb
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-4.7.2 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-4.7.2
index 183655597eb0..d0f394e7173b 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-4.7.2
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-4.7.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.dvblink/archive/4.7.2-Leia.tar.gz -> kodi-pvr-dvblink-4.7.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2782222f9e34e41900f6dcca2dbe0abb
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
index 35da6e646558..19e4212a87b5 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml2 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml2
 DESCRIPTION=Kodi's DVBLink client addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.dvblink
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml2
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=998ff0f54dd55551bbf5f76a1fbf59c9
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1c9e407268f7bc198a13b3892bc88be2
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-2.4.11 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-2.4.11
deleted file mode 100644
index 9e4363b25415..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-2.4.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's DVBViewer client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/2.4.11-Krypton.tar.gz -> kodi-pvr-dvbviewer-2.4.11.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=189acc687e9b2736562b04a266d72658
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-2.4.7 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-2.4.7
deleted file mode 100644
index 946d1573de1e..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-2.4.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's DVBViewer client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/2.4.7.tar.gz -> kodi-pvr-dvbviewer-2.4.7.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d0940eb56fed213a1b4e231cdfd4c2ae
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-3.7.11 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-3.7.11
index 76a6664965e8..57ef1d27cfc3 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-3.7.11
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-3.7.11
@@ -8,5 +8,5 @@ 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.dvbviewer/archive/3.7.11-Leia.tar.gz -> kodi-pvr-dvbviewer-3.7.11-Leia.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3661f0e2f739d73ee75aa999303eedc
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-3.7.5 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-3.7.5
index ffc1c00fe36f..1ad8ba57fd61 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-3.7.5
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-3.7.5
@@ -8,5 +8,5 @@ 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.dvbviewer/archive/3.7.5-Leia.tar.gz -> kodi-pvr-dvbviewer-3.7.5-Leia.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=832da49777c272a8d8871242f79c5951
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-3.7.8 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-3.7.8
index bb127541eca4..e35369d36619 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-3.7.8
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-3.7.8
@@ -8,5 +8,5 @@ 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.dvbviewer/archive/3.7.8-Leia.tar.gz -> kodi-pvr-dvbviewer-3.7.8-Leia.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=832da49777c272a8d8871242f79c5951
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
index 3ef95d6945db..ae47d21cd554 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml
 DESCRIPTION=Kodi's DVBViewer client addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c062100ab9514bfe25d90ced724831b2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ff87f9f6a82dac2b023f1bb7cdaf08ae
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-1.4.7 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-1.4.7
deleted file mode 100644
index 8e13e921b555..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-1.4.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Filmon client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.filmon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.filmon/archive/1.4.7-Krypton.tar.gz -> kodi-pvr-filmon-1.4.7.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5389451c16553a8c3abe2ca5da3a175
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-1.4.8 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-1.4.8
deleted file mode 100644
index 0369a8ad4d6b..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-1.4.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Filmon client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.filmon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.filmon/archive/1.4.8-Krypton.tar.gz -> kodi-pvr-filmon-1.4.8.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5389451c16553a8c3abe2ca5da3a175
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-2.4.4 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-2.4.4
index 2e4bdb7a7400..7302213d376d 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-2.4.4
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-2.4.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.filmon/archive/2.4.4-Leia.tar.gz -> kodi-pvr-filmon-2.4.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c76b7f5798766da1980d16e1bd31e4a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999
index 321ab35b83a2..abc71e130e48 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/jsoncpp sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/jsoncpp
 DESCRIPTION=Kodi's Filmon client addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.filmon
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/jsoncpp
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d83e9622625ff55fa6ca8b8038532361
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c71ea233378feb5fc640f1e08040a7ac
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-3.4.24 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-3.4.24
deleted file mode 100644
index 1cdcd36f8e47..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-3.4.24
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/libplatform-2* =media-libs/kodi-platform-17* =media-tv/kodi-17* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Tvheadend Live TV and Radio PVR client addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.hts
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-libs/libplatform-2* =media-libs/kodi-platform-17* =media-tv/kodi-17*
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/3.4.24-Krypton.tar.gz -> kodi-pvr-hts-3.4.24.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94d75a79e681e5c3de96f41cc3f09895
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.12 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.12
index 8af8812a3a0e..64be2b02af01 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.12
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.12
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-libs/kodi-platform-18* =media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/4.4.12-Leia.tar.gz -> kodi-pvr-hts-4.4.12.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=983eaa88c336c741de6e4f1edf098553
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.13 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.13
index e04af308fc29..a103837ea6e0 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.13
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.13
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-libs/kodi-platform-18* =media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/4.4.13-Leia.tar.gz -> kodi-pvr-hts-4.4.13.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=983eaa88c336c741de6e4f1edf098553
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.14 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.14
index e1c811a46f37..58564ebca2a2 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.14
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-libs/kodi-platform-18* =media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/4.4.14-Leia.tar.gz -> kodi-pvr-hts-4.4.14.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=983eaa88c336c741de6e4f1edf098553
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.16 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.16
index c5757493e103..ae056ae7033e 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.16
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.16
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-libs/kodi-platform-18* =media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/4.4.16-Leia.tar.gz -> kodi-pvr-hts-4.4.16.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=983eaa88c336c741de6e4f1edf098553
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.17 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.17
index d267dbfcaae7..f4c3a3c4e7b6 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.17
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.17
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-libs/kodi-platform-18* =media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/4.4.17-Leia.tar.gz -> kodi-pvr-hts-4.4.17.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=983eaa88c336c741de6e4f1edf098553
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.18 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.18
index 333805d63dbd..3f4c3e95a08c 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.18
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.18
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-libs/kodi-platform-18* =media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/4.4.18-Leia.tar.gz -> kodi-pvr-hts-4.4.18.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=983eaa88c336c741de6e4f1edf098553
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999
index 77c8bab0c25e..d464eb062b30 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==dev-libs/libplatform-2* ~media-libs/kodi-platform-9999 ~media-tv/kodi-9999 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND==dev-libs/libplatform-2* ~media-libs/kodi-platform-9999 ~media-tv/kodi-9999
 DESCRIPTION=Tvheadend Live TV and Radio PVR client addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.hts
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND==dev-libs/libplatform-2* ~media-libs/kodi-platform-9999 ~media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b2179a0253361f4a40dbd4f8ae684377
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0d8168eaa59e82a804f16bbf9bc1943c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.11 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.11
deleted file mode 100644
index 2e20bba30574..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/libplatform-2* =media-tv/kodi-17* =media-libs/kodi-platform-17* sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's IPTVSimple client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-17* =media-libs/kodi-platform-17* sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/2.4.11-Krypton.tar.gz -> kodi-pvr-iptvsimple-2.4.11.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f43c9ba2818385c0e73dd29cbc5f8a99
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.14 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.14
deleted file mode 100644
index 48a07cca814c..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/libplatform-2* =media-tv/kodi-17* =media-libs/kodi-platform-17* sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's IPTVSimple client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-17* =media-libs/kodi-platform-17* sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/2.4.14-Krypton.tar.gz -> kodi-pvr-iptvsimple-2.4.14.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f43c9ba2818385c0e73dd29cbc5f8a99
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.8 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.8
deleted file mode 100644
index b97f0e8396b0..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/libplatform-2* =media-tv/kodi-17* =media-libs/kodi-platform-17* sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's IPTVSimple client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-17* =media-libs/kodi-platform-17* sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/2.4.8-Krypton.tar.gz -> kodi-pvr-iptvsimple-2.4.8.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f43c9ba2818385c0e73dd29cbc5f8a99
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.5.7 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.5.7
deleted file mode 100644
index befcc02f91f6..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.5.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* =media-libs/kodi-platform-18* sys-libs/zlib dev-libs/rapidxml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's IPTVSimple client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* =media-libs/kodi-platform-18* sys-libs/zlib dev-libs/rapidxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/3.5.7-Leia.tar.gz -> kodi-pvr-iptvsimple-3.5.7.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=93ab89fb97b718c94a56266dd9da7742
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.5.8 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.5.8
deleted file mode 100644
index 43e10a2492b1..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.5.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* =media-libs/kodi-platform-18* sys-libs/zlib dev-libs/rapidxml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's IPTVSimple client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* =media-libs/kodi-platform-18* sys-libs/zlib dev-libs/rapidxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/3.5.8-Leia.tar.gz -> kodi-pvr-iptvsimple-3.5.8.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=93ab89fb97b718c94a56266dd9da7742
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.0 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.0
new file mode 100644
index 000000000000..a0b0a0673dc3
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* =media-libs/kodi-platform-18* sys-libs/zlib dev-libs/rapidxml sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kodi's IPTVSimple client addon
+EAPI=6
+HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* =media-libs/kodi-platform-18* sys-libs/zlib dev-libs/rapidxml
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/3.8.0-Leia.tar.gz -> kodi-pvr-iptvsimple-3.8.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=93ab89fb97b718c94a56266dd9da7742
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
index f4a3438e0511..3eb2be16ca5c 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==dev-libs/libplatform-2* ~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 sys-libs/zlib dev-libs/rapidxml sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND==dev-libs/libplatform-2* ~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 sys-libs/zlib dev-libs/rapidxml
 DESCRIPTION=Kodi's IPTVSimple client addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND==dev-libs/libplatform-2* ~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 sys-libs/zlib dev-libs/rapidxml
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=adf7005e0f293c672419e0fdb1a1dc36
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e909cb90d790028f2a259b19de59f79f
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-2.4.19 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-2.4.19
deleted file mode 100644
index 0c9ccd6ad123..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-2.4.19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* 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-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/2.4.19v2-Krypton.tar.gz -> kodi-pvr-mediaportal-tvserver-2.4.19.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f214eb5ede8b6e1a9feea61a5fe55381
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-3.5.16 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-3.5.16
index d1006ee139c5..afb5d19d3dca 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-3.5.16
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-3.5.16
@@ -8,5 +8,5 @@ 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.16-Leia.tar.gz -> kodi-pvr-mediaportal-tvserver-3.5.16.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=daf3077932ad9d8f2b73951dfb1bf532
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
index fdac140d87c1..320661f5479d 100644
--- 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
@@ -8,5 +8,5 @@ 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	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=daf3077932ad9d8f2b73951dfb1bf532
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
index 5ad10395e389..92e4915eb5b9 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml
 DESCRIPTION=Kodi's MediaPortal TVServer client addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.mediaportal.tvserver
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f62967136888d8a53e19868f1a4dc367
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6225365ebf4fd156f949fee9911c2a7c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-4.15.3 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-4.15.3
deleted file mode 100644
index 4977d73f4d75..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-4.15.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib =media-tv/kodi-17* =media-libs/kodi-platform-17* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=MythTV PVR for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/janbar/pvr.mythtv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib =media-tv/kodi-17* =media-libs/kodi-platform-17*
-SLOT=0
-SRC_URI=https://github.com/janbar/pvr.mythtv/archive/4.15.3.tar.gz -> kodi-pvr-mythtv-4.15.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=875e55c5a0609ff516a205a3e4a44bc4
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.4 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.4
deleted file mode 100644
index b93d481af971..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=MythTV PVR for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/janbar/pvr.mythtv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18*
-SLOT=0
-SRC_URI=https://github.com/janbar/pvr.mythtv/archive/5.10.4-Leia.tar.gz -> kodi-pvr-mythtv-5.10.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13c5e35bc4fc72539cedfd5ab9d034a6
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.5 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.5
deleted file mode 100644
index 0baeb698ea5f..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=MythTV PVR for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/janbar/pvr.mythtv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18*
-SLOT=0
-SRC_URI=https://github.com/janbar/pvr.mythtv/archive/5.10.5-Leia.tar.gz -> kodi-pvr-mythtv-5.10.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13c5e35bc4fc72539cedfd5ab9d034a6
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.6 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.6
deleted file mode 100644
index 464102a01a4d..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=MythTV PVR for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/janbar/pvr.mythtv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18*
-SLOT=0
-SRC_URI=https://github.com/janbar/pvr.mythtv/archive/5.10.6-Leia.tar.gz -> kodi-pvr-mythtv-5.10.6.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13c5e35bc4fc72539cedfd5ab9d034a6
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.7 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.7
deleted file mode 100644
index 5dc378a6c9cc..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=MythTV PVR for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/janbar/pvr.mythtv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18*
-SLOT=0
-SRC_URI=https://github.com/janbar/pvr.mythtv/archive/5.10.7-Leia.tar.gz -> kodi-pvr-mythtv-5.10.7.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13c5e35bc4fc72539cedfd5ab9d034a6
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.9 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.9
new file mode 100644
index 000000000000..ce0a8fe14e64
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.9
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18*
+DESCRIPTION=MythTV PVR for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/janbar/pvr.mythtv
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18*
+SLOT=0
+SRC_URI=https://github.com/janbar/pvr.mythtv/archive/5.10.9-Leia.tar.gz -> kodi-pvr-mythtv-5.10.9.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=96673b3b5d8f58142e14d000211dd5f2
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999
index 056652ee94f0..a795758cc85e 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib ~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=sys-libs/zlib ~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
 DESCRIPTION=MythTV PVR for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/janbar/pvr.mythtv
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sys-libs/zlib ~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0abf6f33e9481455ec02be1a3771a2e9
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f44683ff2e2486d67517a66ea9957b7b
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-2.4.11 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-2.4.11
deleted file mode 100644
index d123b3931200..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-2.4.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's NextPVR client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/2.4.11-Krypton.tar.gz -> kodi-pvr-nextpvr-2.4.11.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7d73bf1807a52922f7cdbb8f6efc09a6
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-2.4.13 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-2.4.13
deleted file mode 100644
index 878713bdac0e..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-2.4.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's NextPVR client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/2.4.13-Krypton.tar.gz -> kodi-pvr-nextpvr-2.4.13.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7d73bf1807a52922f7cdbb8f6efc09a6
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.11 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.11
index 11dd7bb51bb6..c3249f4151ce 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.11
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.11
@@ -8,5 +8,5 @@ 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.nextpvr/archive/3.3.11-Leia.tar.gz -> kodi-pvr-nextpvr-3.3.11.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ee300c1276232058b62e55c7db2fcd0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.12 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.12
index 320f02951ee7..4548bd6549e4 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.12
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.12
@@ -8,5 +8,5 @@ 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.nextpvr/archive/3.3.12-Leia.tar.gz -> kodi-pvr-nextpvr-3.3.12.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ee300c1276232058b62e55c7db2fcd0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.13 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.13
index 5968cb0b5a2b..7233ed2c24ea 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.13
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.13
@@ -8,5 +8,5 @@ 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.nextpvr/archive/3.3.13-Leia.tar.gz -> kodi-pvr-nextpvr-3.3.13.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ee300c1276232058b62e55c7db2fcd0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.14 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.14
index 403d0eb089ea..869728dd14ef 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.14
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.14
@@ -8,5 +8,5 @@ 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.nextpvr/archive/3.3.14-Leia.tar.gz -> kodi-pvr-nextpvr-3.3.14.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ee300c1276232058b62e55c7db2fcd0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.15 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.15
index de27dd508dad..f3eac79996d3 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.15
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.15
@@ -8,5 +8,5 @@ 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.nextpvr/archive/3.3.15-Leia.tar.gz -> kodi-pvr-nextpvr-3.3.15.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ee300c1276232058b62e55c7db2fcd0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.8 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.8
index 63c420b9afca..d5b7e9d01bff 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.8
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.8
@@ -8,5 +8,5 @@ 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.nextpvr/archive/3.3.8-Leia.tar.gz -> kodi-pvr-nextpvr-3.3.8.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=551f62be5087cc53984d6d391a1a712e
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
index 61c6fa8df4a8..da7c4a8d0040 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml
 DESCRIPTION=Kodi's NextPVR client addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=604fdd363c759d4ae1026e63180e42ee
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=90a4bcd9665debb6a0cad673818800b1
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-2.4.2 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-2.4.2
deleted file mode 100644
index 9cf2ad10a3fd..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-2.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Njoy N7 client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.njoy
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.njoy/archive/2.4.2-Krypton.tar.gz -> kodi-pvr-njoy-2.4.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8fef5bd3243ba518f7803d1721b3ac1e
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-2.4.3 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-2.4.3
deleted file mode 100644
index 07709405e039..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-2.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Njoy N7 client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.njoy
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.njoy/archive/2.4.3-Krypton.tar.gz -> kodi-pvr-njoy-2.4.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8fef5bd3243ba518f7803d1721b3ac1e
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-3.4.2 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-3.4.2
new file mode 100644
index 000000000000..b392c6ea153c
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-3.4.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml
+DESCRIPTION=Kodi's Njoy N7 client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.njoy
+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.njoy/archive/3.4.2-Leia.tar.gz -> kodi-pvr-njoy-3.4.2.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bc5ddd66e135b9276dae2323b5d31ce6
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999
index 38c22506e1b1..e636081b1fdb 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml
 DESCRIPTION=Kodi's Njoy N7 client addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.njoy
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND==media-tv/kodi-9999 =media-libs/kodi-platform-9999 dev-libs/tinyxml
+RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b76aefa2ed76daa11c4ae6a68fcd06e7
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2dc583ebce633c6046d3216f4296e339
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-1.4.5 b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-1.4.5
deleted file mode 100644
index bb108695b8f2..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-1.4.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's PCTV client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.pctv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.pctv/archive/1.4.5-Krypton.tar.gz -> kodi-pvr-pctv-1.4.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5de9cf47adf06d2d0066b314968c7d42
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-1.4.7 b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-1.4.7
deleted file mode 100644
index 2904a874d687..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-1.4.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's PCTV client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.pctv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.pctv/archive/1.4.7-Krypton.tar.gz -> kodi-pvr-pctv-1.4.7.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5de9cf47adf06d2d0066b314968c7d42
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-2.4.5 b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-2.4.5
index bcb9de102f02..54c3d48223d5 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-2.4.5
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-2.4.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.pctv/archive/2.4.5-Leia.tar.gz -> kodi-pvr-pctv-2.4.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=248153c0e36d036469b7e44d1288c362
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999
index ed404e6d12c2..8fa1b76e25bb 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/jsoncpp sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/jsoncpp
 DESCRIPTION=Kodi's PCTV client addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.pctv
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/jsoncpp
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69963414623b1695d2b0a276e551b086
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=56ff25e1d755edb65361115df9cb3262
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-2.8.3 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-2.8.3
deleted file mode 100644
index 725aebcf3455..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-2.8.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Stalker client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.stalker
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/2.8.3-Krypton.tar.gz -> kodi-pvr-stalker-2.8.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a996942a149906791f36e5e7340243f
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-2.8.6 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-2.8.6
deleted file mode 100644
index f364f542400f..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-2.8.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Stalker client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.stalker
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/jsoncpp dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/2.8.6-Krypton.tar.gz -> kodi-pvr-stalker-2.8.6.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a996942a149906791f36e5e7340243f
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.8 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.8
index 2007279ca399..8a121156876d 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.8
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/jsoncpp dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/3.4.8-Leia.tar.gz -> kodi-pvr-stalker-3.4.8.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6033d1635f5dec81f4d6b1bf896bab11
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.9 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.9
index 49f8d881ad1f..34984e16763a 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.9
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/jsoncpp dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/3.4.9-Leia.tar.gz -> kodi-pvr-stalker-3.4.9.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eda10c7f13617961afb9ef7c66b776b1
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
index 11b746c849c1..cd1e489cf11b 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/jsoncpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/jsoncpp dev-libs/tinyxml
 DESCRIPTION=Kodi's Stalker client addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.stalker
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/jsoncpp dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8a3070221c3a245ad04b89e875e8b28
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ebf2f3809fbf262aa12638ce64069532
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.0.2-r1 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.0.2-r1
deleted file mode 100644
index 58f608703a83..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.0.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml2 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's VBox Home TV Gateway PVR client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vbox
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/4.0.2.tar.gz -> kodi-pvr-vbox-4.0.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=693a1301a45f7e79132cc5beadc6248d
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.4.6 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.4.6
index 5ff40f03150c..69dd2b795a06 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.4.6
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.4.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/4.4.6-Leia.tar.gz -> kodi-pvr-vbox-4.4.6.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d757ac23fe970678d56e21d0773081ac
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.4.7 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.4.7
index d94ca41089e6..f72fb518f16c 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.4.7
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.4.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/4.4.7-Leia.tar.gz -> kodi-pvr-vbox-4.4.7.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d757ac23fe970678d56e21d0773081ac
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.4.8 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.4.8
index 55fc0d4fa00a..792c4e98d31f 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.4.8
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.4.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/4.4.8-Leia.tar.gz -> kodi-pvr-vbox-4.4.8.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3c303361fb72b7ddf7de9735b945bc18
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
index c8631366c960..8ad36dbf75ec 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml2 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml2
 DESCRIPTION=Kodi's VBox Home TV Gateway PVR client addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.vbox
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml2
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=84eeb49647441c3627eef1d8710c6062
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=77c66b723659d84d92487fc22830420a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-2.6.17 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-2.6.17
deleted file mode 100644
index 60453fb934fd..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-2.6.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi PVR addon VNSI
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vdr.vnsi
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/v2.6.17.tar.gz -> kodi-pvr-vdr-vnsi-2.6.17.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a68aa2281b18e528a92625793fb0b70c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-3.6.2 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-3.6.2
index d4fd4d0d4d42..867e77313f0f 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-3.6.2
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-3.6.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/fernetmenta/pvr.vdr.vnsi/archive/v3.6.2.tar.gz -> kodi-pvr-vdr-vnsi-3.6.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f4855a08c9dec6b3217640144796fd4a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-3.6.3 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-3.6.3
index abb80d3e228b..0582fd17a930 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-3.6.3
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-3.6.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/3.6.3-Leia.tar.gz -> kodi-pvr-vdr-vnsi-3.6.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=17f68e1f006df6a9efaf9dcfe1ef8372
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999
index 4b5c9868354a..bac0d250e5da 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 virtual/opengl
 DESCRIPTION=Kodi PVR addon VNSI
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.vdr.vnsi
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=70f43117a3697ddd436f7f96982878c3
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f56c72a7b3f906f0f7962af59649b6a1
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-2.4.10 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-2.4.10
deleted file mode 100644
index 7afc41990c35..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-2.4.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/2.4.10-Krypton.tar.gz -> kodi-pvr-vuplus-2.4.10.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f23c89106330aa5ca8d71a2e4e1849d1
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.17.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.17.0
index 5b029d891286..ae12dc8e1326 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.17.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.17.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.17.0-Leia.tar.gz -> kodi-pvr-vuplus-3.17.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.18.1 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.18.1
index 3601cba9db3b..ff478c6ec62e 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.18.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.18.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.18.1-Leia.tar.gz -> kodi-pvr-vuplus-3.18.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.19.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.19.0
index 602307f0acb6..443cd2ec64c2 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.19.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.19.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.19.0-Leia.tar.gz -> kodi-pvr-vuplus-3.19.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.20.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.20.0
index 50a4501b0276..a8a421d1f007 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.20.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.20.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.20.0-Leia.tar.gz -> kodi-pvr-vuplus-3.20.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.21.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.21.0
index e2797cccaf53..2dee95c97076 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.21.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.21.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.21.0-Leia.tar.gz -> kodi-pvr-vuplus-3.21.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.22.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.22.0
index e8aab89c506f..11235a030b49 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.22.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.22.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.22.0-Leia.tar.gz -> kodi-pvr-vuplus-3.22.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.23.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.23.0
index 8f70dd06436a..632dfeed205f 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.23.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.23.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.23.0-Leia.tar.gz -> kodi-pvr-vuplus-3.23.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.24.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.24.0
index 0ed808a2d1fc..643ab83b69e5 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.24.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.24.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.24.0-Leia.tar.gz -> kodi-pvr-vuplus-3.24.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.25.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.25.0
index d8305b16844f..6d4262176d9e 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.25.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.25.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.25.0-Leia.tar.gz -> kodi-pvr-vuplus-3.25.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.26.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.26.0
index eedb1a9d9fd0..eb19130159ef 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.26.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.26.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.26.0-Leia.tar.gz -> kodi-pvr-vuplus-3.26.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.27.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.27.0
index c442048578d7..89c566c84ad1 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.27.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.27.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.27.0-Leia.tar.gz -> kodi-pvr-vuplus-3.27.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.27.1 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.27.1
new file mode 100644
index 000000000000..94a053db37f6
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.27.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kodi's VuPlus client addon
+EAPI=6
+HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.27.1-Leia.tar.gz -> kodi-pvr-vuplus-3.27.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999
index e466094761a8..d681f312994c 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml dev-cpp/nlohmann_json
 DESCRIPTION=Kodi's VuPlus client addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c3299922345b71b24a783d5e70915de
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f71e4c92960afed1e5dbc513046385fc
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-1.4.9 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-1.4.9
deleted file mode 100644
index 9ba40c0c7b59..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-1.4.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's Windows Media Center client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.wmc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17*
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.wmc/archive/1.4.9v2-Krypton.tar.gz -> kodi-pvr-wmc-1.4.9.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0d843f1e8a36825eb824bc62b8acfb6e
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.4 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.4
index ca50b62f20bd..0cf73ce69f30 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.4
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.wmc/archive/2.4.4-Leia.tar.gz -> kodi-pvr-wmc-2.4.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=209ca5a6a081478ae1f1268484eed1d3
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999
index 99cc25042341..d7832267ad8f 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
 DESCRIPTION=Kodi's Windows Media Center client addon
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/kodi-pvr/pvr.wmc
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f5a624aa5ad826b2afc34c74be879dd
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=16a8b15600d8c752aaf859225802a23d
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-1.1.0-r1
deleted file mode 100644
index 3d92f57fd8a3..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-1.1.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Asteroids screensaver for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/screensaver.asteroids
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/notspiff/screensaver.asteroids/archive/v1.1.0.tar.gz -> kodi-screensaver-asteroids-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75828e40e25b38f5bfcbdee03a5a0945
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.1.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.1.0
index ac4dd2a0f135..15c613908539 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.asteroids/archive/2.1.0-Leia.tar.gz -> kodi-screensaver-asteroids-2.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef2766b5e6eb41c9db55455e3cbb8154
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
index 9ad2b0bb15b1..46dde6cef8f0 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
@@ -1,10 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~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
 DESCRIPTION=Asteroids screensaver for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/screensaver.asteroids
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a11f11268bd7937b8d931a4d42df49f4
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=73143a76ab26efb10bf6d565e5717ca2
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-1.1.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-1.1.0
index deefba432b66..d6a2a8f35bb6 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-1.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/notspiff/screensaver.biogenesis/archive/v1.1.0.tar.gz -> kodi-screensaver-biogenesis-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de04e467e06e017dd2a272d889e9d53e
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.0.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.0.0
index 370f1eea12f0..0c054f2d3aaa 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.0.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.biogenesis/archive/2.0.0-Leia.tar.gz -> kodi-screensaver-biogenesis-2.0.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=129eb533071684a0706a0ea11695282f
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999
index 607089cb9461..a8ad08970049 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999
@@ -1,10 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~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
 DESCRIPTION=Biogenesis screensaver for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/screensaver.biogenesis
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=09d9ea6235a9e000239f618489080d43
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8c6357890343f323f4ede954a45276d8
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-crystalmorph-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-crystalmorph-9999
index 45c27e2b51f8..605648da59f5 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-crystalmorph-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-crystalmorph-9999
@@ -1,10 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~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
 DESCRIPTION=Crystalmorph screensaver for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/notspiff/screensaver.crystalmorph
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c739c23ba4683f7b405d4474033acbc
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9b696e7860fd5eb543fb63439d430fff
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-1.1.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-1.1.0
index 82ee14d7bf9b..80d47ec13c3e 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-1.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/notspiff/screensaver.greynetic/archive/v1.1.0.tar.gz -> kodi-screensaver-greynetic-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2380279946c75fe98d37695b12d67aba
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.0.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.0.0
index cdf7f7545428..77a8734df42a 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.0.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.greynetic/archive/2.0.0-Leia.tar.gz -> kodi-screensaver-greynetic-2.0.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa1d924d18876cdcc85cd848c23488eb
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
index 2fcc0a34ff60..d8cca1e204d4 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
@@ -1,10 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~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
 DESCRIPTION=Greynetic screensaver for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/screensaver.greynetic
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=426be9ac2e2611eaa1c23f569a71a934
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=acefcbf24ca0222d8750ff91b854f562
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-1.1.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-1.1.0
index 5901b05ff69d..b3f76f97b2e3 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-1.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/notspiff/screensaver.pingpong/archive/v1.1.0.tar.gz -> kodi-screensaver-pingpong-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f30b4649e6cb5aa75fb2f1f4229ff900
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.0.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.0.0
index a6770e4b35e5..4b431c2411b5 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.0.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.pingpong/archive/2.0.0-Leia.tar.gz -> kodi-screensaver-pingpong-2.0.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=308fa5ac474cc8048fc7e74c3357712e
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
index e05fccc1e43d..ecfc7ba29a20 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
@@ -1,10 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~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
 DESCRIPTION=Ping-pong screensaver for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/screensaver.pingpong
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=df4ba75b159c064702df2288ad7c40e7
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d773dc1f3dfd24ae771b3d8e7ede6d47
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-1.1.0-r1
deleted file mode 100644
index 5e63945a64cf..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-1.1.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Pyro screensaver for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/screensaver.pyro
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/notspiff/screensaver.pyro/archive/v1.1.0.tar.gz -> kodi-screensaver-pyro-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=def8b170dadae3f163e74e9893352e39
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-2.0.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-2.0.0
index b723cf758656..c65d7e95b6e5 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-2.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-2.0.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.pyro/archive/2.0.0-Leia.tar.gz -> kodi-screensaver-pyro-2.0.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a1ed1a3d2fcd292cdc5ae41214bbbd3
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.0.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.0.0
index a76fe87f60b8..737b29d30007 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.0.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.pyro/archive/3.0.0-Leia.tar.gz -> kodi-screensaver-pyro-3.0.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5ada8a8f73b849141132e29603b15a2a
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999
index b90cc2931a40..382567fcdeaa 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999
@@ -1,10 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~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
 DESCRIPTION=Pyro screensaver for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/screensaver.pyro
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea5a26dca5b6a0477c39e62f4660e2e2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=39075b1ac7806786600750bf414a0d2a
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-1.4.0-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-1.4.0-r1
deleted file mode 100644
index cfa51b7238d6..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-1.4.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* media-libs/libpng:= sys-libs/zlib media-libs/glu virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=RSXS screensaver for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/screensavers.rsxs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libpng:= sys-libs/zlib virtual/opengl media-libs/glu
-SLOT=0
-SRC_URI=https://github.com/notspiff/screensavers.rsxs/archive/v1.4.0.tar.gz -> kodi-screensaver-rsxs-1.4.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=192091ed5885a30b7a4800e03b6bfbfd
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-9999
index 78601cdf2d08..c336a3d5092e 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 media-libs/libpng:= sys-libs/zlib media-libs/glu virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 media-libs/libpng:= sys-libs/zlib media-libs/glu virtual/opengl
 DESCRIPTION=RSXS screensaver for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/notspiff/screensavers.rsxs
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-libs/libpng:= sys-libs/zlib virtual/opengl media-libs/glu
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=398aa83b0aec1ceef3a223be7b02f55e
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e1ceedcefa5f6b5a13b501059da45581
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-1.0.2 b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-1.0.2
index 517e17fabcbc..3fad88c88990 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-1.0.2
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-1.0.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.libarchive/archive/1.0.2-Leia.tar.gz -> kodi-vfs-libarchive-1.0.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=783a9021c5611583c420dc9c00e66162
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-1.0.5 b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-1.0.5
index 3cd5a3875c3e..8b263962986f 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-1.0.5
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-1.0.5
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.libarchive/archive/1.0.5-Leia.tar.gz -> kodi-vfs-libarchive-1.0.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6548a2273ef9731f902e54aead61a61
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999
index 6ee7d09f5cf8..c0dad53e8266 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/libarchive[bzip2,lz4,lzma,lzo,zlib] app-arch/lzma app-arch/bzip2 sys-libs/zlib app-arch/lz4 dev-libs/lzo:2 !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= app-arch/libarchive[libressl] ) ~media-tv/kodi-9999 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=app-arch/libarchive[bzip2,lz4,lzma,lzo,zlib] app-arch/lzma app-arch/bzip2 sys-libs/zlib app-arch/lz4 dev-libs/lzo:2 !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= app-arch/libarchive[libressl] ) ~media-tv/kodi-9999
 DESCRIPTION=Libarchive VFS add-on for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/vfs.libarchive
 IUSE=libressl
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7fd5ab8ef9c51c1fbb9c59d3085731e0
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=259696d4b05761449a5ee144dcf0d5dd
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.0.5 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.0.5
index c7e732e8992b..66e72087b122 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.0.5
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.0.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.rar/archive/2.0.5-Leia.tar.gz -> kodi-vfs-rar-2.0.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff3ad8896b6fea96e6189305ea584d21
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.0.6 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.0.6
index 7eebd361d5ff..dd2e8094a97b 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.0.6
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.0.6
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.rar/archive/2.0.6-Leia.tar.gz -> kodi-vfs-rar-2.0.6.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c0ff5d7271a656eea35e8786a62e8701
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.0.7 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.0.7
index 0debeb47aef3..dd315dcb0d7a 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.0.7
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.0.7
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.rar/archive/2.0.7-Leia.tar.gz -> kodi-vfs-rar-2.0.7.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c0ff5d7271a656eea35e8786a62e8701
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999
index d02ddc97cc2c..3d2d876034d4 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999
@@ -1,10 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==dev-libs/libplatform-2* ~media-libs/kodi-platform-9999 ~media-tv/kodi-9999 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND==dev-libs/libplatform-2* ~media-libs/kodi-platform-9999 ~media-tv/kodi-9999
 DESCRIPTION=RAR VFS addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/vfs.rar
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=89423efeacec6ee89a09fbda1f8b462b
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=62527a4e1a1dfbfe959d6a2d06f2362b
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sacd-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-sacd-9999
index 39bd38a3ba01..fcc7186b9234 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sacd-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sacd-9999
@@ -1,10 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==dev-libs/libplatform-2* ~media-libs/kodi-platform-9999 ~media-tv/kodi-9999 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND==dev-libs/libplatform-2* ~media-libs/kodi-platform-9999 ~media-tv/kodi-9999
 DESCRIPTION=SACD VFS addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/vfs.sacd
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7ae79a8dfe663f5a45b64d30528b582
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa3af803c3074de68e1a36a77a16c5c8
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.1 b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.1
index e367fcae9851..1ad10b4b170f 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.sftp/archive/1.0.1-Leia.tar.gz -> kodi-vfs-sftp-1.0.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7b1a8c9598b0b13979cf75242769950
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999
index d37a327d0755..795f48f8f93e 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999
@@ -1,10 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==dev-libs/libplatform-2* net-libs/libssh[sftp] ~media-libs/kodi-platform-9999 ~media-tv/kodi-9999 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND==dev-libs/libplatform-2* net-libs/libssh[sftp] ~media-libs/kodi-platform-9999 ~media-tv/kodi-9999
 DESCRIPTION=SFTP VFS addon for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/vfs.sftp
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0cd7ca359b5b8433c893410bf49a14a6
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0c4a2e6afc7c953c50acca9c216eb319
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-4.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-4.1.0-r1
deleted file mode 100644
index 2e63df54ae62..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-4.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Fische visualizer for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/visualization.fishbmc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/notspiff/visualization.fishbmc/archive/v4.1.0.tar.gz -> kodi-visualization-fishbmc-4.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c8554581134100cb65ef4b1324d10ab
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999
index 6961958c0637..c4720e21d2d2 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 virtual/opengl
 DESCRIPTION=Fische visualizer for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/notspiff/visualization.fishbmc
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a278e09da83b0944138567249c57e2b5
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa8fca14db303afbb5f05b150719e2c7
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-1.1.0-r1
deleted file mode 100644
index 72e51c212e50..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-1.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Goom visualizer for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/visualization.goom
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/notspiff/visualization.goom/archive/v1.1.0.tar.gz -> kodi-visualization-goom-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=400415d633a57a3e0aa8fba554848413
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999
index c5469e300a58..80c605b6e853 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 virtual/opengl
 DESCRIPTION=Goom visualizer for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/notspiff/visualization.goom
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc4151f62711b73df58a5655c52c6228
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ffbfde465931a8cf537f6f4de9ccab17
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-1.1.0-r1
deleted file mode 100644
index 2560654922a0..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-1.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=NastyFFT visualizer for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/visualization.nastyfft
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/notspiff/visualization.nastyfft/archive/v1.1.0.tar.gz -> kodi-visualization-nastyfft-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=90fec97c4b53bb973692cefd2e7eb1f6
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-9999
index 345d88c084ad..e05980e2db45 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 virtual/opengl
 DESCRIPTION=NastyFFT visualizer for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/notspiff/visualization.nastyfft
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc04e5c93db04e877eb590ae374de0d4
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5f049895fe741f60a1f9315872f1583a
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-1.2.0 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-1.2.0
deleted file mode 100644
index c127e921fed7..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* media-libs/libprojectm virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=ProjectM visualizer for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/visualization.projectm
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* media-libs/libprojectm virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/notspiff/visualization.projectm/archive/v1.2.0.tar.gz -> kodi-visualization-projectm-1.2.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=90671563105304990d4ee10c9d4b09ff
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-1.2.1 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-1.2.1
deleted file mode 100644
index 127887b5e963..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-1.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* media-libs/libprojectm virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=ProjectM visualizer for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/visualization.projectm
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* =media-libs/kodi-platform-17* media-libs/libprojectm virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/notspiff/visualization.projectm/archive/v1.2.1.tar.gz -> kodi-visualization-projectm-1.2.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=90671563105304990d4ee10c9d4b09ff
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.1.0 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.1.0
index 2ff3dc96b8dd..4b24493faa1c 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* >=media-libs/libprojectm-3.1.0 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.projectm/archive/v2.1.0.tar.gz -> kodi-visualization-projectm-2.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=187461067d73da0f849d270a39ad6498
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.2.0 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.2.0
index 51288198cb71..e5b5f3eabd65 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* >=media-libs/libprojectm-3.1.0 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.projectm/archive/v2.2.0.tar.gz -> kodi-visualization-projectm-2.2.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce75f0627a8feeea8ba93e1cd5f3faf6
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999
index 4e2fe3bed1dd..0a6d93f7939f 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 >=media-libs/libprojectm-3.1.0 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 >=media-libs/libprojectm-3.1.0 virtual/opengl
 DESCRIPTION=ProjectM visualizer for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/visualization.projectm
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 >=media-libs/libprojectm-3.1.0 virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14c229c0d695025d7435e475676ad1f0
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b6d8fc4921c12b8120695973f7ab6421
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.10 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.10
index aa0c4b9865a4..b9f906d7a25c 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.10
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.10
@@ -8,5 +8,5 @@ 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.10-Leia.tar.gz -> kodi-visualization-shadertoy-1.1.10.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82e16ece6927edf18a4f44ea64e3f124
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.5 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.5
index e70c083adf12..466ec00586ba 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.5
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* media-tv/kodi virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.shadertoy/archive/v1.1.5.tar.gz -> kodi-visualization-shadertoy-1.1.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de2a93f41c1234af69c9cfb9193f0fd4
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.8 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.8
index 7db121bb8890..e144ddc3a5fe 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.8
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.8
@@ -8,5 +8,5 @@ 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.8-Leia.tar.gz -> kodi-visualization-shadertoy-1.1.8.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=611ede9637b1d19448e0e7c671963f3b
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
index bc4d7d4ce93f..fa77fd74ca9f 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.9
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.1.9
@@ -8,5 +8,5 @@ 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	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82e16ece6927edf18a4f44ea64e3f124
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999
index a0892c6d0c33..704ef0430828 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==dev-libs/libplatform-2* ~media-tv/kodi-9999 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND==dev-libs/libplatform-2* ~media-tv/kodi-9999 virtual/opengl
 DESCRIPTION=Shadertoy visualizer for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/visualization.shadertoy
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND==dev-libs/libplatform-2* ~media-tv/kodi-9999 virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54d11c0fc9700498e4ca3a2a0b25e9de
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5772c0a521da199bffd394d886ca23c1
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-1.1.1 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-1.1.1
index 21a1aae79cd4..f04fd2fe48fc 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-1.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-1.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-tv/kodi virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.spectrum/archive/v1.1.1.tar.gz -> kodi-visualization-spectrum-1.1.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6ddc990f638208474bd8d62e17a494a
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-2.0.3 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-2.0.3
index 24faabcdcd84..18ecffcf0b0b 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-2.0.3
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-2.0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.spectrum/archive/v2.0.3.tar.gz -> kodi-visualization-spectrum-2.0.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=091798efe9502db15fdc6c852fc75802
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-2.0.4 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-2.0.4
index 97ca1a4a33b4..7a80c912296a 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-2.0.4
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-2.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.spectrum/archive/v2.0.4-Leia.tar.gz -> kodi-visualization-spectrum-2.0.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8d0dec61e73f0074c050426dbf7cbf0
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999
index 1a8ba9ab90b4..13bbf4776b23 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 virtual/opengl
 DESCRIPTION=Spectrum visualizer for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/visualization.spectrum
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0864b2ad211284a0d870c28df6b57d18
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0e25cec33a3443c9afd1eaf394e5a4c
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999
index cf1099de09e5..ec64c248e340 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-tv/kodi virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=media-tv/kodi virtual/opengl
 DESCRIPTION=StarBurst visualizer for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/notspiff/visualization.starburst
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-tv/kodi virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50cfd18ec617b153a3be78cd1eeb8eef
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=356dc04f745dc229b57e489c46f79742
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-1.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-1.1.0-r1
deleted file mode 100644
index a1fe41e9318b..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-1.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-17* virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Waveform visualizer for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/visualization.waveform
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-17* virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/notspiff/visualization.waveform/archive/v1.1.0.tar.gz -> kodi-visualization-waveform-1.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9bdc20de1aa64f1734b31eeb1458bffa
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-2.0.1 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-2.0.1
index f25828aaa90d..b5220e281d73 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-2.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.waveform/archive/2.0.1-Leia.tar.gz -> kodi-visualization-waveform-2.0.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93c36cea758014c8e671b87b1cb4b93f
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999
index f13ffc313442..a35d3b26d911 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~media-tv/kodi-9999 virtual/opengl
 DESCRIPTION=Waveform visualizer for Kodi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/xbmc/visualization.waveform
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 virtual/opengl
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f3816667561a1f8b00427901932ee2b
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7ed88e15d2f621316be3ea32c9f051c7
diff --git a/metadata/md5-cache/media-plugins/mda-lv2-1.2.2 b/metadata/md5-cache/media-plugins/mda-lv2-1.2.2
index e7abe6fc97e6..d936ad56245f 100644
--- a/metadata/md5-cache/media-plugins/mda-lv2-1.2.2
+++ b/metadata/md5-cache/media-plugins/mda-lv2-1.2.2
@@ -3,10 +3,10 @@ DEPEND=media-libs/lv2 || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[t
 DESCRIPTION=LV2 port of the MDA plugins by Paul Kellett
 EAPI=4
 HOMEPAGE=http://drobilla.net/software/mda-lv2/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=media-libs/lv2
 SLOT=0
 SRC_URI=http://download.drobilla.net/mda-lv2-1.2.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=fb33ecf6dd57c2d270626ef3fb377a9d
+_md5_=6cbfde750f87bf7e5974a5452cd51ed6
diff --git a/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420 b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420
new file mode 100644
index 000000000000..aaaa7c922e1c
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/vdr-dvbhddevice-2.2.0_p20180420
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
+DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DESCRIPTION=VDR Plugin: output device for the 'Full Featured' TechnoTrend S2-6400 DVB Card
+EAPI=7
+HOMEPAGE=https://bitbucket.org/powARman/dvbhddevice
+KEYWORDS=~amd64 ~x86
+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://bitbucket.org/powARman/dvbhddevice/get/2ea854ae8c7a.tar.gz -> vdr-dvbhddevice-2.2.0_p20180420.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
+_md5_=1f6a6c01573cf55000a0e9dc2d006bd5
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 07b753bc344f..07ea529f5c72 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/dxcc-20190309 b/metadata/md5-cache/media-radio/dxcc-20190309
index d3d99e25471a..0f7e1f64de72 100644
--- a/metadata/md5-cache/media-radio/dxcc-20190309
+++ b/metadata/md5-cache/media-radio/dxcc-20190309
@@ -3,9 +3,9 @@ DESCRIPTION=A ham radio callsign DXCC lookup utility
 EAPI=7
 HOMEPAGE=http://fkurz.net/ham/dxcc.html
 IUSE=tk
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl tk? ( dev-perl/Tk )
 SLOT=0
 SRC_URI=http://fkurz.net/ham/dxcc/dxcc-20190309.tar.gz
-_md5_=288a79a1934cc75418219f1fbc35f117
+_md5_=6b57b746bd5cec122da1d51f195f4479
diff --git a/metadata/md5-cache/media-radio/fldigi-4.1.01 b/metadata/md5-cache/media-radio/fldigi-4.1.01
deleted file mode 100644
index 7f7c669a6b47..000000000000
--- a/metadata/md5-cache/media-radio/fldigi-4.1.01
+++ /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.1.01.tar.gz
-_md5_=fcda00df9cd19b5f173f351a00e67a0b
diff --git a/metadata/md5-cache/media-radio/fldigi-4.1.02 b/metadata/md5-cache/media-radio/fldigi-4.1.02
deleted file mode 100644
index f8063e5ef72b..000000000000
--- a/metadata/md5-cache/media-radio/fldigi-4.1.02
+++ /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.1.02.tar.gz
-_md5_=c342b7e483e44447faecf843eea7e8d4
diff --git a/metadata/md5-cache/media-radio/fldigi-4.1.03 b/metadata/md5-cache/media-radio/fldigi-4.1.03
deleted file mode 100644
index 042c8a115465..000000000000
--- a/metadata/md5-cache/media-radio/fldigi-4.1.03
+++ /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.1.03.tar.gz
-_md5_=c342b7e483e44447faecf843eea7e8d4
diff --git a/metadata/md5-cache/media-radio/fldigi-4.1.04 b/metadata/md5-cache/media-radio/fldigi-4.1.04
deleted file mode 100644
index b4e6727ed942..000000000000
--- a/metadata/md5-cache/media-radio/fldigi-4.1.04
+++ /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=7
-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.04.tar.gz
-_md5_=9d1183835ff7d60a0d3b0a77b7ac5d7a
diff --git a/metadata/md5-cache/media-radio/fldigi-4.1.05 b/metadata/md5-cache/media-radio/fldigi-4.1.05
deleted file mode 100644
index 77be1295c1ac..000000000000
--- a/metadata/md5-cache/media-radio/fldigi-4.1.05
+++ /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=7
-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.05.tar.gz
-_md5_=9d1183835ff7d60a0d3b0a77b7ac5d7a
diff --git a/metadata/md5-cache/media-radio/fldigi-4.1.06 b/metadata/md5-cache/media-radio/fldigi-4.1.06
index a6fd69117e55..e51e5178d6a0 100644
--- a/metadata/md5-cache/media-radio/fldigi-4.1.06
+++ b/metadata/md5-cache/media-radio/fldigi-4.1.06
@@ -4,9 +4,9 @@ DESCRIPTION=Sound card based multimode software modem for Amateur Radio use
 EAPI=7
 HOMEPAGE=http://www.w1hkj.com
 IUSE=hamlib nls pulseaudio cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3
-KEYWORDS=~amd64 ~x86
+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.06.tar.gz
-_md5_=9d1183835ff7d60a0d3b0a77b7ac5d7a
+_md5_=416cbc94f5c59dc06ff1b2f1a198a374
diff --git a/metadata/md5-cache/media-radio/fldigi-4.1.08 b/metadata/md5-cache/media-radio/fldigi-4.1.08
new file mode 100644
index 000000000000..10f770109434
--- /dev/null
+++ b/metadata/md5-cache/media-radio/fldigi-4.1.08
@@ -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=7
+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.08.tar.gz
+_md5_=9d1183835ff7d60a0d3b0a77b7ac5d7a
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.42 b/metadata/md5-cache/media-radio/flrig-1.3.42
deleted file mode 100644
index fa0dc36bd011..000000000000
--- a/metadata/md5-cache/media-radio/flrig-1.3.42
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Transceiver control program for Amateur Radio use
-EAPI=6
-HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
-SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.42.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=51cb67ee3416a7af60b4d2d88240ff40
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.43 b/metadata/md5-cache/media-radio/flrig-1.3.43
deleted file mode 100644
index d0bdc6f10061..000000000000
--- a/metadata/md5-cache/media-radio/flrig-1.3.43
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Transceiver control program for Amateur Radio use
-EAPI=6
-HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
-SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.43.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a53a76b055fd0267c7d5d1f24b3fe2ef
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.44 b/metadata/md5-cache/media-radio/flrig-1.3.44
deleted file mode 100644
index fcd1b1bc09a5..000000000000
--- a/metadata/md5-cache/media-radio/flrig-1.3.44
+++ /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=prepare
-DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext
-DESCRIPTION=Transceiver control program for Amateur Radio use
-EAPI=7
-HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
-SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.44.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=81922ab784711dfc9d1ea2a0fa47e561
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.45 b/metadata/md5-cache/media-radio/flrig-1.3.45
deleted file mode 100644
index 87c08e2c42f4..000000000000
--- a/metadata/md5-cache/media-radio/flrig-1.3.45
+++ /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=prepare
-DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext
-DESCRIPTION=Transceiver control program for Amateur Radio use
-EAPI=7
-HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
-SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.45.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=81922ab784711dfc9d1ea2a0fa47e561
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.46 b/metadata/md5-cache/media-radio/flrig-1.3.46
index 29f4a869bf08..5ea3e69c74d0 100644
--- a/metadata/md5-cache/media-radio/flrig-1.3.46
+++ b/metadata/md5-cache/media-radio/flrig-1.3.46
@@ -5,10 +5,10 @@ DESCRIPTION=Transceiver control program for Amateur Radio use
 EAPI=7
 HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
 IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.46.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=81922ab784711dfc9d1ea2a0fa47e561
+_md5_=a47c3f7ca5c7820db1fcc1ca0708e65e
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.48 b/metadata/md5-cache/media-radio/flrig-1.3.48
new file mode 100644
index 000000000000..eaf39a8ecf6f
--- /dev/null
+++ b/metadata/md5-cache/media-radio/flrig-1.3.48
@@ -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=prepare
+DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext
+DESCRIPTION=Transceiver control program for Amateur Radio use
+EAPI=7
+HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
+SLOT=0
+SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.48.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=81922ab784711dfc9d1ea2a0fa47e561
diff --git a/metadata/md5-cache/media-radio/qrq-0.3.3 b/metadata/md5-cache/media-radio/qrq-0.3.3
index 2d08d0f28703..c2223688002b 100644
--- a/metadata/md5-cache/media-radio/qrq-0.3.3
+++ b/metadata/md5-cache/media-radio/qrq-0.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=Yet another CW trainer for Linux/Unix
 EAPI=7
 HOMEPAGE=http://fkurz.net/ham/qrq.html
 IUSE=pulseaudio
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:= pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=http://fkurz.net/ham/qrq/qrq-0.3.3.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b6b0580583f0d8912f16bb57a7b5f98e
+_md5_=284a01f5f3e457b9b0c144c902ad596f
diff --git a/metadata/md5-cache/media-radio/qsstv-9.4.2 b/metadata/md5-cache/media-radio/qsstv-9.4.2
index 0b9090a1ed85..c8e2fa7423fc 100644
--- a/metadata/md5-cache/media-radio/qsstv-9.4.2
+++ b/metadata/md5-cache/media-radio/qsstv-9.4.2
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-
 DESCRIPTION=Amateur radio SSTV software
 EAPI=7
 HOMEPAGE=http://users.telenet.be/on4qz/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/hamlib media-libs/openjpeg:2 media-libs/alsa-lib media-sound/pulseaudio media-libs/libv4l sci-libs/fftw:3.0= x11-misc/xdg-utils
 SLOT=0
 SRC_URI=http://users.telenet.be/on4qz/qsstv/downloads/qsstv_9.4.2.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=744523a5c79ec131cf9371975b91fd57
+_md5_=954c7fb53c0e370275120be38ddca234
diff --git a/metadata/md5-cache/media-radio/tucnak-4.14 b/metadata/md5-cache/media-radio/tucnak-4.14
deleted file mode 100644
index 3c85bc771ac5..000000000000
--- a/metadata/md5-cache/media-radio/tucnak-4.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) 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=Amateur Radio VHF Contest Logbook
-EAPI=6
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=alsa fftw gpm hamlib suid
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/tucnak-4.14.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5e50c31cadab60f2813b7aeef45dc3fc
diff --git a/metadata/md5-cache/media-radio/tucnak-4.15 b/metadata/md5-cache/media-radio/tucnak-4.15
deleted file mode 100644
index 9837db1d3cb4..000000000000
--- a/metadata/md5-cache/media-radio/tucnak-4.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) 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=Amateur Radio VHF Contest Logbook
-EAPI=6
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=alsa fftw gpm hamlib suid
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/tucnak-4.15.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e3f792af679973e0b63c406f2153ee6
diff --git a/metadata/md5-cache/media-radio/tucnak-4.16 b/metadata/md5-cache/media-radio/tucnak-4.16
index 23105895f535..3ba22952e643 100644
--- a/metadata/md5-cache/media-radio/tucnak-4.16
+++ b/metadata/md5-cache/media-radio/tucnak-4.16
@@ -4,10 +4,10 @@ DESCRIPTION=Amateur Radio VHF Contest Logbook
 EAPI=6
 HOMEPAGE=http://tucnak.nagano.cz
 IUSE=alsa fftw gpm hamlib suid
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib )
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/tucnak-4.16.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1283058a08b1bff8116e7242ab03acf0
+_md5_=7e3f792af679973e0b63c406f2153ee6
diff --git a/metadata/md5-cache/media-radio/tucnak-4.17 b/metadata/md5-cache/media-radio/tucnak-4.17
new file mode 100644
index 000000000000..5e7b7365faa7
--- /dev/null
+++ b/metadata/md5-cache/media-radio/tucnak-4.17
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) 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=Amateur Radio VHF Contest Logbook
+EAPI=6
+HOMEPAGE=http://tucnak.nagano.cz
+IUSE=alsa fftw gpm hamlib suid
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/tucnak-4.17.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1283058a08b1bff8116e7242ab03acf0
diff --git a/metadata/md5-cache/media-radio/xastir-2.0.8-r1 b/metadata/md5-cache/media-radio/xastir-2.0.8-r1
index 96d2a27a2d22..4861735db5ee 100644
--- a/metadata/md5-cache/media-radio/xastir-2.0.8-r1
+++ b/metadata/md5-cache/media-radio/xastir-2.0.8-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff:0 ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff:0 ) gdal? ( sci-libs/gdal ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=X Amateur Station Tracking and Information Reporting
 EAPI=5
 HOMEPAGE=http://xastir.org/
-IUSE=festival gdal geotiff +graphicsmagick
+IUSE=gdal geotiff +graphicsmagick
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff:0 ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival )
+RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff:0 ) gdal? ( sci-libs/gdal )
 SLOT=0
 SRC_URI=mirror://sourceforge/xastir/xastir-2.0.8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e2e117193735073789532635f4a8a835
+_md5_=c5b73fc7cbf722a0abd40290f074878e
diff --git a/metadata/md5-cache/media-radio/xastir-2.1.4 b/metadata/md5-cache/media-radio/xastir-2.1.4
index 70f2aea0b7c6..e1120aa50cb1 100644
--- a/metadata/md5-cache/media-radio/xastir-2.1.4
+++ b/metadata/md5-cache/media-radio/xastir-2.1.4
@@ -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=compile configure install postinst prepare
-DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff:= media-libs/tiff:0 ) festival? ( app-accessibility/festival )
+DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff:= media-libs/tiff:0 )
 DESCRIPTION=X Amateur Station Tracking and Information Reporting
 EAPI=7
 HOMEPAGE=http://xastir.org/
-IUSE=festival geotiff +graphicsmagick
-KEYWORDS=~amd64 ~x86
+IUSE=geotiff +graphicsmagick
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff:= media-libs/tiff:0 ) festival? ( app-accessibility/festival )
+RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff:= media-libs/tiff:0 )
 SLOT=0
 SRC_URI=https://github.com/Xastir/Xastir/archive/Release-2.1.4.tar.gz -> xastir-2.1.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7303a092d1dcc4d0120e73bb34457f64
+_md5_=5575e9e953c1e5386ea75755a8d6758e
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index ba9486d12122..ad95759e477c 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/alsa-tools-1.1.7 b/metadata/md5-cache/media-sound/alsa-tools-1.1.7
index 2ea5486ebe73..24c70f8ef1d9 100644
--- a/metadata/md5-cache/media-sound/alsa-tools-1.1.7
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.1.7
@@ -4,10 +4,10 @@ DESCRIPTION=Advanced Linux Sound Architecture tools
 EAPI=6
 HOMEPAGE=https://alsa-project.org/
 IUSE=fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
-KEYWORDS=amd64 ~hppa ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=amd64 ~hppa ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.1.7 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( >=dev-python/pygtk-2 x11-libs/gtk+:2 x11-libs/gtk+:3 ) gtk? ( media-fonts/font-misc-misc )
 SLOT=0.9
 SRC_URI=mirror://alsaproject/tools/alsa-tools-1.1.7.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b7a072810f05f4449ff123c8c8102a62
+_md5_=0f81627798f848bdd48e278bdbe5ad5d
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.1.8 b/metadata/md5-cache/media-sound/alsa-utils-1.1.8
index add0c49ecfe1..f413956ee1e3 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.1.8
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.1.8
@@ -5,10 +5,10 @@ DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
 IUSE=bat doc +libsamplerate +ncurses nls selinux
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.1.8 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
 SLOT=0.9
 SRC_URI=mirror://alsaproject/utils/alsa-utils-1.1.8.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=8065c5521fe82a07fc63270235d8dc0a
+_md5_=22e5ad11f740cd3864bb91e6ac11d442
diff --git a/metadata/md5-cache/media-sound/asunder-2.9.4 b/metadata/md5-cache/media-sound/asunder-2.9.4
new file mode 100644
index 000000000000..29b7051041cd
--- /dev/null
+++ b/metadata/md5-cache/media-sound/asunder-2.9.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=postinst postrm preinst prepare
+DEPEND=>=media-libs/libcddb-0.9.5 media-sound/cdparanoia x11-libs/gtk+:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Graphical Audio CD ripper and encoder with support for many output formats
+EAPI=7
+HOMEPAGE=http://littlesvr.ca/asunder/
+IUSE=flac mac mp3 musepack opus vorbis wavpack
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libcddb-0.9.5 media-sound/cdparanoia x11-libs/gtk+:2 flac? ( media-libs/flac ) mac? ( media-sound/mac ) mp3? ( media-sound/lame ) musepack? ( media-sound/musepack-tools ) opus? ( media-sound/opus-tools ) vorbis? ( media-sound/vorbis-tools ) wavpack? ( media-sound/wavpack )
+SLOT=0
+SRC_URI=http://littlesvr.ca/asunder/releases/asunder-2.9.4.tar.bz2
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=84bf99d6ac7f8833fccb08cccbc072d6
diff --git a/metadata/md5-cache/media-sound/audacity-2.3.2 b/metadata/md5-cache/media-sound/audacity-2.3.2
new file mode 100644
index 000000000000..a1c994abee58
--- /dev/null
+++ b/metadata/md5-cache/media-sound/audacity-2.3.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=app-arch/zip-2.3 dev-libs/expat >=media-libs/libsndfile-1.0.0 >=media-libs/portaudio-19.06.00-r2[alsa?] <media-libs/portaudio-20 media-libs/soxr x11-libs/wxGTK:3.0[X] alsa? ( media-libs/alsa-lib ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( >=media-video/ffmpeg-1.2:= ) ) flac? ( >=media-libs/flac-1.3.1[cxx] ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( >=media-sound/lame-3.70 ) lv2? ( media-libs/lilv media-libs/lv2 media-libs/suil ) mad? ( >=media-libs/libmad-0.14.2b ) sbsms? ( media-libs/libsbsms ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) twolame? ( media-sound/twolame ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) vorbis? ( >=media-libs/libvorbis-1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Free crossplatform audio editor
+EAPI=7
+HOMEPAGE=https://web.audacityteam.org/
+IUSE=alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav +lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-arch/zip-2.3 dev-libs/expat >=media-libs/libsndfile-1.0.0 >=media-libs/portaudio-19.06.00-r2[alsa?] <media-libs/portaudio-20 media-libs/soxr x11-libs/wxGTK:3.0[X] alsa? ( media-libs/alsa-lib ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( >=media-video/ffmpeg-1.2:= ) ) flac? ( >=media-libs/flac-1.3.1[cxx] ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( >=media-sound/lame-3.70 ) lv2? ( media-libs/lilv media-libs/lv2 media-libs/suil ) mad? ( >=media-libs/libmad-0.14.2b ) sbsms? ( media-libs/libsbsms ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) twolame? ( media-sound/twolame ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) vorbis? ( >=media-libs/libvorbis-1.0 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/audacity/audacity/archive/Audacity-2.3.2.tar.gz doc? ( https://dev.gentoo.org/~polynomial-c/dist/audacity-manual-2.3.2.zip )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=83611e6037af24235109572a5fe8c0ce
diff --git a/metadata/md5-cache/media-sound/beets-1.4.9 b/metadata/md5-cache/media-sound/beets-1.4.9
new file mode 100644
index 000000000000..c869cf1a89c1
--- /dev/null
+++ b/metadata/md5-cache/media-sound/beets-1.4.9
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/jellyfish-0.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/munkres[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-musicbrainz-ngs-0.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-oauthlib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unidecode[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/mutagen-1.33[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] badfiles? ( media-libs/flac media-sound/mp3val ) chromaprint? ( dev-python/pyacoustid[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/chromaprint[tools] ) discogs? ( dev-python/discogs-client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ffmpeg? ( media-video/ffmpeg:0[encode] ) gstreamer? ( media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 ) icu? ( dev-db/sqlite[icu] ) lastfm? ( dev-python/pylast[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mpd? ( dev-python/bluelet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-mpd[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) replaygain? ( gstreamer? ( dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-plugins/gst-plugins-libav:1.0 ) !gstreamer? ( media-sound/mp3gain ) ) thumbnail? ( dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-pathlib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/imagemagick ) ) webserver? ( dev-python/flask[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask-cors[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Media library management system for obsessive-compulsive music geeks
+EAPI=7
+HOMEPAGE=http://beets.io/ https://pypi.org/project/beets/
+IUSE=badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/jellyfish-0.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/munkres[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-musicbrainz-ngs-0.4[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-oauthlib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unidecode[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/mutagen-1.33[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] badfiles? ( media-libs/flac media-sound/mp3val ) chromaprint? ( dev-python/pyacoustid[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/chromaprint[tools] ) discogs? ( dev-python/discogs-client[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ffmpeg? ( media-video/ffmpeg:0[encode] ) gstreamer? ( media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 ) icu? ( dev-db/sqlite[icu] ) lastfm? ( dev-python/pylast[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mpd? ( dev-python/bluelet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-mpd[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) replaygain? ( gstreamer? ( dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-plugins/gst-plugins-libav:1.0 ) !gstreamer? ( media-sound/mp3gain ) ) thumbnail? ( dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-pathlib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/imagemagick ) ) webserver? ( dev-python/flask[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask-cors[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/b/beets/beets-1.4.9.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9020cce7c11cf489fabf465faf9805c3
diff --git a/metadata/md5-cache/media-sound/exaile-4.0.0 b/metadata/md5-cache/media-sound/exaile-4.0.0
index 2aa505f98d8b..e1bab4d26433 100644
--- a/metadata/md5-cache/media-sound/exaile-4.0.0
+++ b/metadata/md5-cache/media-sound/exaile-4.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=GTK+ based media player aiming to be similar to Amarok
 EAPI=7
 HOMEPAGE=https://www.exaile.org/
 IUSE=cddb libnotify nls scrobbler python_targets_python2_7
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=amd64 ~sparc x86
 LICENSE=GPL-2 GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/gst-python:1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.13.2:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=media-libs/gst-plugins-base-1.6:1.0 >=media-libs/gst-plugins-good-1.4:1.0 >=media-libs/mutagen-1.10[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-plugins/gst-plugins-meta:1.0 >=x11-libs/gtk+-3.10:3[introspection] cddb? ( dev-python/cddb-py ) libnotify? ( >=x11-libs/libnotify-0.7[introspection] ) scrobbler? ( dev-python/pylast[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/exaile/exaile/releases/download/4.0.0/exaile-4.0.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f3ef23d035c51c130a3796547406a118
+_md5_=f5c11b650d00e57371c21df2a5c08a08
diff --git a/metadata/md5-cache/media-sound/exaile-4.0.0_rc3 b/metadata/md5-cache/media-sound/exaile-4.0.0_rc3
deleted file mode 100644
index f2c874b0f422..000000000000
--- a/metadata/md5-cache/media-sound/exaile-4.0.0_rc3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( dev-util/intltool sys-devel/gettext )
-DEFINED_PHASES=compile install postinst postrm setup
-DESCRIPTION=GTK+ based media player aiming to be similar to Amarok
-EAPI=7
-HOMEPAGE=https://www.exaile.org/
-IUSE=cddb libnotify nls scrobbler python_targets_python2_7
-KEYWORDS=amd64 ~sparc x86
-LICENSE=GPL-2 GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/gobject-introspection[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/gst-python:1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.13.2:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=media-libs/gst-plugins-base-1.6:1.0 >=media-libs/gst-plugins-good-1.4:1.0 >=media-libs/mutagen-1.10[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-plugins/gst-plugins-meta:1.0 >=x11-libs/gtk+-3.10:3[introspection] cddb? ( dev-python/cddb-py ) libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) scrobbler? ( dev-python/pylast[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/exaile/exaile/releases/download/4.0.0-rc3/exaile-4.0.0rc3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=85c44938a55a5e69620c021caf333195
diff --git a/metadata/md5-cache/media-sound/flacon-4.1.0 b/metadata/md5-cache/media-sound/flacon-4.1.0
index b26e6f7d5622..bf09fbe89b25 100644
--- a/metadata/md5-cache/media-sound/flacon-4.1.0
+++ b/metadata/md5-cache/media-sound/flacon-4.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/flacon/flacon/archive/v4.1.0.tar.gz -> flacon-4.1.0.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=becec8e01acba4b5883327e2dc511348
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.0.6 b/metadata/md5-cache/media-sound/fluidsynth-2.0.6
new file mode 100644
index 000000000000..5d038002aee5
--- /dev/null
+++ b/metadata/md5-cache/media-sound/fluidsynth-2.0.6
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-cmt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Software real-time synthesizer based on the Soundfont 2 specifications
+EAPI=7
+HOMEPAGE=http://www.fluidsynth.org/
+IUSE=alsa dbus debug examples ipv6 jack ladspa lash oss portaudio pulseaudio +readline +sndfile systemd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-cmt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/2
+SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.0.6.tar.gz -> fluidsynth-2.0.6.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fe7019c9e05961983c4b2a9165e1feb3
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.30.2 b/metadata/md5-cache/media-sound/gnome-music-3.30.2
index bdf18bd7ec8d..e411644cd72f 100644
--- a/metadata/md5-cache/media-sound/gnome-music-3.30.2
+++ b/metadata/md5-cache/media-sound/gnome-music-3.30.2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-music/3.30/gnome-music-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cf4d85071e4ff5e368e246d8aeb8329
diff --git a/metadata/md5-cache/media-sound/grip-3.10.0 b/metadata/md5-cache/media-sound/grip-3.10.0
deleted file mode 100644
index 441772360f00..000000000000
--- a/metadata/md5-cache/media-sound/grip-3.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure prepare
-DEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools ) sys-devel/gettext
-DESCRIPTION=GTK+ based Audio CD Player/Ripper
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/grip/
-IUSE=vorbis
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools )
-SLOT=0
-SRC_URI=mirror://sourceforge/grip/grip-3.10.0.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=08e58eb6017b89e204dd648a894c4092
diff --git a/metadata/md5-cache/media-sound/grip-3.10.2 b/metadata/md5-cache/media-sound/grip-3.10.2
new file mode 100644
index 000000000000..45d678729ea4
--- /dev/null
+++ b/metadata/md5-cache/media-sound/grip-3.10.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure prepare
+DEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools ) sys-devel/gettext
+DESCRIPTION=GTK+ based Audio CD Player/Ripper
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/grip/
+IUSE=vorbis
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools )
+SLOT=0
+SRC_URI=mirror://sourceforge/grip/grip-3.10.2.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=08e58eb6017b89e204dd648a894c4092
diff --git a/metadata/md5-cache/media-sound/kid3-3.8.0 b/metadata/md5-cache/media-sound/kid3-3.8.0
new file mode 100644
index 000000000000..dc432a110b30
--- /dev/null
+++ b/metadata/md5-cache/media-sound/kid3-3.8.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) mpris? ( dev-qt/qtdbus:5 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple tag editor based on Qt
+EAPI=7
+HOMEPAGE=https://kid3.sourceforge.io/
+IUSE=acoustid flac kde mp3 mp4 +mpris +taglib vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) mpris? ( dev-qt/qtdbus:5 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) !media-sound/kid3:4
+REQUIRED_USE=flac? ( vorbis )
+SLOT=5
+SRC_URI=mirror://sourceforge/kid3/kid3-3.8.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f38645a5d0b0fb12894ebf026c78a9a9
diff --git a/metadata/md5-cache/media-sound/lollypop-1.0.12 b/metadata/md5-cache/media-sound/lollypop-1.0.12
index 127c8927fd87..a2d41aafe384 100644
--- a/metadata/md5-cache/media-sound/lollypop-1.0.12
+++ b/metadata/md5-cache/media-sound/lollypop-1.0.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/World/lollypop/uploads/011cb4140566625941a0fc645ac6d528/lollypop-1.0.12.tar.xz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41cf7b0d2359a07cb1ffefb7ad4f3175
diff --git a/metadata/md5-cache/media-sound/lollypop-1.1.4.14 b/metadata/md5-cache/media-sound/lollypop-1.1.4.14
deleted file mode 100644
index 50d5c489cd51..000000000000
--- a/metadata/md5-cache/media-sound/lollypop-1.1.4.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/appstream-glib[introspection] dev-libs/glib:2 dev-libs/gobject-introspection[cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/gnome-common x11-libs/gtk+:3 dev-python/pkgconfig[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/desktop-file-utils dev-util/itstool dev-util/intltool >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/appstream-glib[introspection] dev-libs/glib:2 dev-libs/gobject-introspection[cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/gnome-common x11-libs/gtk+:3
-DESCRIPTION=Modern music player for GNOME
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Lollypop
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/appstream-glib[introspection] dev-libs/glib:2 dev-libs/gobject-introspection[cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/gnome-common x11-libs/gtk+:3 app-crypt/libsecret[introspection] dev-libs/totem-pl-parser dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/dbus-python dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pylast-1.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/gst-plugins-base:1.0[introspection]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.gnome.org/World/lollypop/uploads/2ce8e3ae7569bda628da8db822d08df7/lollypop-1.1.4.14.tar.xz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=364740f1a6ac7f5d6b2ff23998d04900
diff --git a/metadata/md5-cache/media-sound/lollypop-1.1.4.15 b/metadata/md5-cache/media-sound/lollypop-1.1.4.15
new file mode 100644
index 000000000000..b263d8e8311a
--- /dev/null
+++ b/metadata/md5-cache/media-sound/lollypop-1.1.4.15
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/appstream-glib[introspection] dev-libs/glib:2 dev-libs/gobject-introspection[cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/gnome-common x11-libs/gtk+:3 dev-python/pkgconfig[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/desktop-file-utils dev-util/itstool dev-util/intltool >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/appstream-glib[introspection] dev-libs/glib:2 dev-libs/gobject-introspection[cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/gnome-common x11-libs/gtk+:3
+DESCRIPTION=Modern music player for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Lollypop
+IUSE=python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/appstream-glib[introspection] dev-libs/glib:2 dev-libs/gobject-introspection[cairo] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] gnome-base/gnome-common x11-libs/gtk+:3 app-crypt/libsecret[introspection] dev-libs/totem-pl-parser dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/dbus-python dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pylast-1.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/gst-plugins-base:1.0[introspection]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.gnome.org/World/lollypop/uploads/93fcc0dd47b06c2f4f54f88c0e67e993/lollypop-1.1.4.15.tar.xz
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0c2fdce1669826decd6c9b2fdefd8f7
diff --git a/metadata/md5-cache/media-sound/mixxx-2.2.0 b/metadata/md5-cache/media-sound/mixxx-2.2.0
deleted file mode 100644
index 27bd952bc11a..000000000000
--- a/metadata/md5-cache/media-sound/mixxx-2.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) lv2? ( >=media-libs/lilv-0.24.2-r3 ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= ) virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 dev-util/scons[python_targets_python2_7]
-DESCRIPTION=Advanced Digital DJ tool based on Qt
-EAPI=6
-HOMEPAGE=https://www.mixxx.org/
-IUSE=aac doc ffmpeg hid lv2 mp3 mp4 opus shout wavpack
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) lv2? ( >=media-libs/lilv-0.24.2-r3 ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= )
-SLOT=0
-SRC_URI=https://github.com/mixxxdj/mixxx/archive/release-2.2.0.tar.gz -> mixxx-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d801134e5707ed5524149e591ae8cad6
diff --git a/metadata/md5-cache/media-sound/mixxx-2.2.2 b/metadata/md5-cache/media-sound/mixxx-2.2.2
new file mode 100644
index 000000000000..0b8c6a8dd493
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mixxx-2.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) lv2? ( >=media-libs/lilv-0.24.2-r3 ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= ) virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 dev-util/scons[python_targets_python2_7]
+DESCRIPTION=Advanced Digital DJ tool based on Qt
+EAPI=6
+HOMEPAGE=https://www.mixxx.org/
+IUSE=aac doc ffmpeg hid lv2 mp3 mp4 opus shout wavpack
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) lv2? ( >=media-libs/lilv-0.24.2-r3 ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= )
+SLOT=0
+SRC_URI=https://github.com/mixxxdj/mixxx/archive/release-2.2.2.tar.gz -> mixxx-2.2.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=acab917263878db98fae608fcf8d9d52
diff --git a/metadata/md5-cache/media-sound/mpc-0.30 b/metadata/md5-cache/media-sound/mpc-0.30
index 371ef95385eb..dd35c746874b 100644
--- a/metadata/md5-cache/media-sound/mpc-0.30
+++ b/metadata/md5-cache/media-sound/mpc-0.30
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libmpdclient iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpc/0/mpc-0.30.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=e91607817a225d8406b6a65d5ac1ffee
diff --git a/metadata/md5-cache/media-sound/mpc-0.31-r1 b/metadata/md5-cache/media-sound/mpc-0.31-r1
index 1be3494b9177..2171b852e3aa 100644
--- a/metadata/md5-cache/media-sound/mpc-0.31-r1
+++ b/metadata/md5-cache/media-sound/mpc-0.31-r1
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libmpdclient
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpc/0/mpc-0.31.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=d43d26b05aff4987673042fb19a848f5
diff --git a/metadata/md5-cache/media-sound/mpc-0.32 b/metadata/md5-cache/media-sound/mpc-0.32
index 806817a37518..490a779283b4 100644
--- a/metadata/md5-cache/media-sound/mpc-0.32
+++ b/metadata/md5-cache/media-sound/mpc-0.32
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libmpdclient
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpc/0/mpc-0.32.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=c2e6ef1567c686cf70afd6a2f48d8522
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.10 b/metadata/md5-cache/media-sound/mpd-0.21.10
index 678a8f9dd4e8..9ddd4c349476 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.10
+++ b/metadata/md5-cache/media-sound/mpd-0.21.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.10.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=78cf4497b4c0efea44997a8d4aee313c
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.11 b/metadata/md5-cache/media-sound/mpd-0.21.11
index 3dd431603feb..1a3a2aed5a70 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.11
+++ b/metadata/md5-cache/media-sound/mpd-0.21.11
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.11.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=aadfb9bee59d891c60af11a2cace321c
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.12 b/metadata/md5-cache/media-sound/mpd-0.21.12
index f00c86d8d5f1..ffcab1bb6715 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.12
+++ b/metadata/md5-cache/media-sound/mpd-0.21.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.12.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=aadfb9bee59d891c60af11a2cace321c
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.13 b/metadata/md5-cache/media-sound/mpd-0.21.13
index 2aeaba32d599..4de5db3b6433 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.13
+++ b/metadata/md5-cache/media-sound/mpd-0.21.13
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.13.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=aadfb9bee59d891c60af11a2cace321c
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.14 b/metadata/md5-cache/media-sound/mpd-0.21.14
new file mode 100644
index 000000000000..788a7e2aa26b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpd-0.21.14
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.49.2 virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=adplug? ( media-libs/adplug:= ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= ) >=dev-libs/boost-1.58:= test? ( dev-cpp/gtest )
+DESCRIPTION=The Music Player Daemon (mpd)
+EAPI=7
+HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
+IUSE=adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp zeroconf zip zlib kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos
+LICENSE=GPL-2
+RDEPEND=adplug? ( media-libs/adplug:= ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( adplug audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) upnp? ( expat ) webdav? ( curl expat )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.14.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=aadfb9bee59d891c60af11a2cace321c
diff --git a/metadata/md5-cache/media-sound/mpg123-1.25.12 b/metadata/md5-cache/media-sound/mpg123-1.25.12
new file mode 100644
index 000000000000..6af96200bd53
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpg123-1.25.12
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=app-eselect/eselect-mpg123 dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
+DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
+EAPI=7
+HOMEPAGE=https://www.mpg123.org/
+IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=app-eselect/eselect-mpg123 dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
+SLOT=0
+SRC_URI=https://www.mpg123.org/download/mpg123-1.25.12.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c26a0597b1cbeb532c8cd6e4f2a6da1a
diff --git a/metadata/md5-cache/media-sound/musescore-9999 b/metadata/md5-cache/media-sound/musescore-9999
index b8220f40ebc9..f9c8bf6c614c 100644
--- a/metadata/md5-cache/media-sound/musescore-9999
+++ b/metadata/md5-cache/media-sound/musescore-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=portmidi? ( portaudio )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.3.tar.bz2
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa2d01f0b1b26f1acebddcbac2ccb50d
+_md5_=4995c718e8d2e18b2fdf7a3ec3efb22a
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.34 b/metadata/md5-cache/media-sound/ncmpc-0.34
index a17b13bdeb20..47b1496e09c3 100644
--- a/metadata/md5-cache/media-sound/ncmpc-0.34
+++ b/metadata/md5-cache/media-sound/ncmpc-0.34
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:0=[unicode] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/ncmpc/0/ncmpc-0.34.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=ce561480ca3360538a1691491597b105
diff --git a/metadata/md5-cache/media-sound/paprefs-1.1 b/metadata/md5-cache/media-sound/paprefs-1.1
index 3a4450b9971b..76dcfc2e416f 100644
--- a/metadata/md5-cache/media-sound/paprefs-1.1
+++ b/metadata/md5-cache/media-sound/paprefs-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-cpp/atkmm dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=dev-libs/libsigc++-2.2:2 >=media-sound/pulseaudio-12.0-r1[glib] x11-libs/gtk+:3 || ( x11-themes/tango-icon-theme x11-themes/adwaita-icon-theme )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/paprefs/paprefs-1.1.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2af79aa8cb5cbd27da0de9af6b6f72c7
diff --git a/metadata/md5-cache/media-sound/playerctl-2.0.1 b/metadata/md5-cache/media-sound/playerctl-2.0.1
index b0afe35158a5..c58214e2eefd 100644
--- a/metadata/md5-cache/media-sound/playerctl-2.0.1
+++ b/metadata/md5-cache/media-sound/playerctl-2.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://github.com/acrisci/playerctl/archive/v2.0.1.tar.gz -> playerctl-2.0.1.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b26bc5cb5235a9faa1bd31a6bf0d627c
diff --git a/metadata/md5-cache/media-sound/playerctl-2.0.2 b/metadata/md5-cache/media-sound/playerctl-2.0.2
index 828d6df9d465..792fea4cdb51 100644
--- a/metadata/md5-cache/media-sound/playerctl-2.0.2
+++ b/metadata/md5-cache/media-sound/playerctl-2.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://github.com/acrisci/playerctl/archive/v2.0.2.tar.gz -> playerctl-2.0.2.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=796f84dcb095f2a0be49a2e72b5cc969
diff --git a/metadata/md5-cache/media-sound/pulseaudio-12.2-r2 b/metadata/md5-cache/media-sound/pulseaudio-12.2-r2
index dfe7cac1f9b4..802eaa8eba52 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-12.2-r2
+++ b/metadata/md5-cache/media-sound/pulseaudio-12.2-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 IUSE=+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf +gdbm +glib gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libICE[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( >=sys-libs/libcap-2.22-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.26.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( virtual/jack ) tcpd? ( sys-apps/tcp-wrappers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) bluetooth? ( >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) media-libs/speexdsp gdbm? ( sys-libs/gdbm:= ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) realtime? ( sys-auth/rtkit ) gconf? ( >=gnome-base/gconf-3.2.6 ) equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) ) system-wide? ( alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-5 ) )
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( elogind systemd ) bluetooth? ( dbus ) equalizer? ( dbus ) ofon
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-12.2.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3519a37650ba0019be4947e3f09239b7
+_md5_=6b46c023dd92af56c884e9f5f4fbff5b
diff --git a/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1 b/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1
index 001c1581e1a1..665d0c7457e2 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1
+++ b/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/wwmm/pulseeffects/archive/v3.2.3.tar.gz -> pulseeffects-3.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=845819a3dc51a595fc1fefdcf61af8ab
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.6.5 b/metadata/md5-cache/media-sound/pulseeffects-4.6.5
index f38e05e7e1f1..ba2ed7a0b5e3 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-4.6.5
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.6.5
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
 SLOT=0
 SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.6.5.tar.gz -> pulseeffects-4.6.5.tar.gz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbf18ed0a3d3d4e28d20f078bf009277
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.6.6 b/metadata/md5-cache/media-sound/pulseeffects-4.6.6
index b3f995e26384..299a837ff7cf 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-4.6.6
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.6.6
@@ -5,10 +5,10 @@ DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects fo
 EAPI=7
 HOMEPAGE=https://github.com/wwmm/pulseeffects
 IUSE=bs2b calf mda-lv2 rubberband
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
 SLOT=0
 SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.6.6.tar.gz -> pulseeffects-4.6.6.tar.gz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=466ada9a2b0baaf4da549c95146663f5
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b2d1f762aef599635ea9a2cdbc04dd16
diff --git a/metadata/md5-cache/media-sound/pulseeffects-9999 b/metadata/md5-cache/media-sound/pulseeffects-9999
index 065e34442304..48e6194d3957 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-9999
+++ b/metadata/md5-cache/media-sound/pulseeffects-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=466ada9a2b0baaf4da549c95146663f5
diff --git a/metadata/md5-cache/media-sound/qmmp-1.3.4 b/metadata/md5-cache/media-sound/qmmp-1.3.4
new file mode 100644
index 000000000000..e7996f670fcb
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qmmp-1.3.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( || ( media-libs/libmad media-sound/mpg123 ) ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-qt/linguist-tools:5
+DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
+EAPI=7
+HOMEPAGE=http://qmmp.ylsoftware.com
+IUSE=aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-cmt ) mad? ( || ( media-libs/libmad media-sound/mpg123 ) ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2] dev-qt/qtopengl:5 media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
+REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
+SLOT=0
+SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.3.4.tar.bz2 mirror://sourceforge/qmmp-dev/files/qmmp-1.3.4.tar.bz2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0aef9e7bfca13a48e73d31f0e8cd7d41
diff --git a/metadata/md5-cache/media-sound/sfc-0.018-r1 b/metadata/md5-cache/media-sound/sfc-0.018-r1
deleted file mode 100644
index 7b85a2cfc323..000000000000
--- a/metadata/md5-cache/media-sound/sfc-0.018-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=media-libs/alsa-lib x11-libs/fltk:1 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=SoundFontCombi is an opensource software pseudo synthesizer
-EAPI=5
-HOMEPAGE=http://personal.telefonica.terra.es/web/soudfontcombi/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib x11-libs/fltk:1
-SLOT=0
-SRC_URI=http://personal.telefonica.terra.es/web/soudfontcombi/sfc-0.018.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a8ea9bfd427d90145d66a2891c4d85ec
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 545bda44e336..4305a3cc4d3c 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/kodi-17.3-r1 b/metadata/md5-cache/media-tv/kodi-17.3-r1
deleted file mode 100644
index 3c74adadad9e..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.6:=[encode,postproc] ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid 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 x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.9.6
-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 gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf java 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[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.6:=[encode,postproc] ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( sys-power/upower )
-REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.6-Krypton.tar.gz -> ffmpeg-kodi-3.1.6-Krypton.tar.gz ) https://github.com/xbmc/xbmc/archive/17.3-Krypton.tar.gz -> kodi-17.3.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.3-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d69530843ff54ca36bef26313d0792fd
diff --git a/metadata/md5-cache/media-tv/kodi-17.6 b/metadata/md5-cache/media-tv/kodi-17.6
deleted file mode 100644
index cfb1462b166d..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid 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 x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.9.6
-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 gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf java 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[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) media-fonts/corefonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( sys-power/upower )
-REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a0720b52a5cbd0280843f49d08dd648
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r10 b/metadata/md5-cache/media-tv/kodi-17.6-r10
deleted file mode 100644
index f0b6fbeb8d83..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.6-r10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid 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 x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.9.6
-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 gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf java 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[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( sys-power/upower )
-REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db940598f7ca3cb1353003421ccb0b1f
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r11 b/metadata/md5-cache/media-tv/kodi-17.6-r11
deleted file mode 100644
index 65f99c33a96c..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.6-r11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid 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 x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.9.6
-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 gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf java 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[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( sys-power/upower )
-REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4dd70175fbaabb4059ee15df8d3ad921
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r6 b/metadata/md5-cache/media-tv/kodi-17.6-r6
deleted file mode 100644
index 69735c9578b9..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.6-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( !mariadb? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid 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 x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.9.6
-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 gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf java 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[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( !mariadb? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( sys-power/upower )
-REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=202acc298e7105968961bc86b2b3e009
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r7 b/metadata/md5-cache/media-tv/kodi-17.6-r7
deleted file mode 100644
index 5cd0552d3cec..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.6-r7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid 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 x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.9.6
-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 gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf java 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[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( sys-power/upower )
-REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea4f94b15c97cfde4ead4459b8fdb4e9
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r8 b/metadata/md5-cache/media-tv/kodi-17.6-r8
deleted file mode 100644
index a253062dd3fa..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.6-r8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20180905 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid 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 x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.9.6
-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 gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf java 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[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20180905 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( sys-power/upower )
-REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9abc87900cea30313d988f0367ba879
diff --git a/metadata/md5-cache/media-tv/kodi-17.6-r9 b/metadata/md5-cache/media-tv/kodi-17.6-r9
deleted file mode 100644
index f8ff1d261eac..000000000000
--- a/metadata/md5-cache/media-tv/kodi-17.6-r9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20180905 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid 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 x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.9.6
-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 gles lcms libressl libusb lirc mariadb mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +xslt zeroconf java 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[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20180905 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:=[mysqlcompat] ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( sys-power/upower )
-REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=70d5cd50596be31555f43c222f13a7da
diff --git a/metadata/md5-cache/media-tv/kodi-18.0 b/metadata/md5-cache/media-tv/kodi-18.0
deleted file mode 100644
index e1aee3d19635..000000000000
--- a/metadata/md5-cache/media-tv/kodi-18.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_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_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,X(+)] >=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
-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_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_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,X(+)] >=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	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ba9a6b9481ef3363f5739b72315c74b
diff --git a/metadata/md5-cache/media-tv/kodi-18.0_rc2 b/metadata/md5-cache/media-tv/kodi-18.0_rc2
deleted file mode 100644
index 4f9c2680a72b..000000000000
--- a/metadata/md5-cache/media-tv/kodi-18.0_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_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_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,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.1:=[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 sys-devel/make >=dev-util/cmake-3.9.6
-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_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_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,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.1:=[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.1-Leia-Alpha3-1.tar.gz -> ffmpeg-kodi-4.0.1-Leia-Alpha3-1.tar.gz ) https://github.com/xbmc/xbmc/archive/18.0rc2-Leia.tar.gz -> kodi-18.0rc2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e072691b97985659f592e19fd1510733
diff --git a/metadata/md5-cache/media-tv/kodi-18.0_rc3 b/metadata/md5-cache/media-tv/kodi-18.0_rc3
deleted file mode 100644
index ca2d17385a21..000000000000
--- a/metadata/md5-cache/media-tv/kodi-18.0_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_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_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,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.1:=[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
-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_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_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,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.1:=[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.1-Leia-Alpha3-1.tar.gz -> ffmpeg-kodi-4.0.1-Leia-Alpha3-1.tar.gz ) https://github.com/xbmc/xbmc/archive/18.0rc3-Leia.tar.gz -> kodi-18.0rc3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e39ec0a8dd10ca607ef48e4bcbea26f
diff --git a/metadata/md5-cache/media-tv/kodi-18.0_rc4 b/metadata/md5-cache/media-tv/kodi-18.0_rc4
deleted file mode 100644
index cc2212e20f66..000000000000
--- a/metadata/md5-cache/media-tv/kodi-18.0_rc4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_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_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,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.1:=[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
-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_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_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,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.1:=[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.1-Leia-Alpha3-1.tar.gz -> ffmpeg-kodi-4.0.1-Leia-Alpha3-1.tar.gz ) https://github.com/xbmc/xbmc/archive/18.0rc4-Leia.tar.gz -> kodi-18.0rc4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e39ec0a8dd10ca607ef48e4bcbea26f
diff --git a/metadata/md5-cache/media-tv/kodi-18.0_rc5 b/metadata/md5-cache/media-tv/kodi-18.0_rc5
deleted file mode 100644
index d7da240390ba..000000000000
--- a/metadata/md5-cache/media-tv/kodi-18.0_rc5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_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_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,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.1:=[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
-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_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_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,X(+)] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.1:=[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.1-Leia-Alpha3-1.tar.gz -> ffmpeg-kodi-4.0.1-Leia-Alpha3-1.tar.gz ) https://github.com/xbmc/xbmc/archive/18.0rc5-Leia.tar.gz -> kodi-18.0rc5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d9d474f2fa20a109918108ad443d0cf
diff --git a/metadata/md5-cache/media-tv/kodi-18.1 b/metadata/md5-cache/media-tv/kodi-18.1
deleted file mode 100644
index 15203b8204d0..000000000000
--- a/metadata/md5-cache/media-tv/kodi-18.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_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_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,X(+)] >=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
-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 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_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_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,X(+)] >=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.1-Leia.tar.gz -> kodi-18.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ece45c9b49e21d0a69299a1a38f8e449
diff --git a/metadata/md5-cache/media-tv/kodi-18.1_rc1 b/metadata/md5-cache/media-tv/kodi-18.1_rc1
deleted file mode 100644
index 68862ffe46b3..000000000000
--- a/metadata/md5-cache/media-tv/kodi-18.1_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_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_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,X(+)] >=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
-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_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_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,X(+)] >=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.1rc1-Leia.tar.gz -> kodi-18.1rc1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ba9a6b9481ef3363f5739b72315c74b
diff --git a/metadata/md5-cache/media-tv/kodi-18.2 b/metadata/md5-cache/media-tv/kodi-18.2
deleted file mode 100644
index c63f8c2da51d..000000000000
--- a/metadata/md5-cache/media-tv/kodi-18.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_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_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,X(+)] >=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[http2] 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
-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 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_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_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,X(+)] >=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[http2] 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-18.2.tar.gz -> ffmpeg-kodi-4.0.3-Leia-18.2.tar.gz ) https://github.com/xbmc/xbmc/archive/18.2-Leia.tar.gz -> kodi-18.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20c91e820883febe526399aacdd3dd59
diff --git a/metadata/md5-cache/media-tv/kodi-18.2_rc1 b/metadata/md5-cache/media-tv/kodi-18.2_rc1
deleted file mode 100644
index 8e890fd145e1..000000000000
--- a/metadata/md5-cache/media-tv/kodi-18.2_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_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_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,X(+)] >=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[http2] 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
-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 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_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_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,X(+)] >=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[http2] 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-18.2.tar.gz -> ffmpeg-kodi-4.0.3-Leia-18.2.tar.gz ) https://github.com/xbmc/xbmc/archive/18.2rc1-Leia.tar.gz -> kodi-18.2rc1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20c91e820883febe526399aacdd3dd59
diff --git a/metadata/md5-cache/media-tv/kodi-18.3 b/metadata/md5-cache/media-tv/kodi-18.3
deleted file mode 100644
index c9886434fa62..000000000000
--- a/metadata/md5-cache/media-tv/kodi-18.3
+++ /dev/null
@@ -1,15 +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 dev-util/ninja >=dev-util/cmake-3.9.6
-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_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_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,X(+)] >=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[http2] 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 ) 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 >=x11-libs/libxkbcommon-0.4.1 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 )
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=7
-HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus 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_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_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,X(+)] >=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[http2] 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 ) 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 >=x11-libs/libxkbcommon-0.4.1 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-18.2.tar.gz -> ffmpeg-kodi-4.0.3-Leia-18.2.tar.gz ) https://github.com/xbmc/xbmc/archive/18.3-Leia.tar.gz -> kodi-18.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=293a4f35e2bbc95d23373424cd08c38e
diff --git a/metadata/md5-cache/media-tv/kodi-18.3-r1 b/metadata/md5-cache/media-tv/kodi-18.3-r1
index 1e5d338debf4..7373e8a30364 100644
--- a/metadata/md5-cache/media-tv/kodi-18.3-r1
+++ b/metadata/md5-cache/media-tv/kodi-18.3-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) ^^ ( gbm raspberry-pi w
 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-18.2.tar.gz -> ffmpeg-kodi-4.0.3-Leia-18.2.tar.gz ) https://github.com/xbmc/xbmc/archive/18.3-Leia.tar.gz -> kodi-18.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3410eceb24e9d8599eb96716a69f3372
+_md5_=4d618dc81c4b94ee1327e9e4a8705825
diff --git a/metadata/md5-cache/media-tv/kodi-18.4 b/metadata/md5-cache/media-tv/kodi-18.4
new file mode 100644
index 000000000000..4820b96d375a
--- /dev/null
+++ b/metadata/md5-cache/media-tv/kodi-18.4
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst 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_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[raspberry-pi?] ) 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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( 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 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[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[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) 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 ) 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 >=x11-libs/libxkbcommon-0.4.1 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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A free and open source media-player and entertainment hub
+EAPI=7
+HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
+IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi 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_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[raspberry-pi?] ) 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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( 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 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[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[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) 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 ) 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 >=x11-libs/libxkbcommon-0.4.1 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 raspberry-pi 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.4-Leia-18.4.tar.gz -> ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz ) https://github.com/xbmc/xbmc/archive/18.4-Leia.tar.gz -> kodi-18.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b7162941b303c4ee91da913b4dbecbfb
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index a0d9d291402d..8bd847dd8592 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] ) python_single_target_python3_5? ( dev-lang/python:3.5[libressl?,sqlite,ssl] ) python_single_target_python3_6? ( dev-lang/python:3.6[libressl?,sqlite,ssl] ) python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] 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[raspberry-pi?] ) 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_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_5? ( dev-python/pycryptodome[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_single_target_python3_6? ( dev-python/pycryptodome[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_single_target_python3_7? ( dev-python/pycryptodome[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-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( 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 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[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[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) 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 ) 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 >=x11-libs/libxkbcommon-0.4.1 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 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] ) python_single_target_python3_5? ( dev-lang/python:3.5[libressl?,sqlite,ssl] ) python_single_target_python3_6? ( dev-lang/python:3.6[libressl?,sqlite,ssl] ) python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] 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-1.11.0 >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) 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_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_5? ( dev-python/pycryptodome[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_single_target_python3_6? ( dev-python/pycryptodome[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_single_target_python3_7? ( dev-python/pycryptodome[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-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( 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 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[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[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) 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 ) 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 >=x11-libs/libxkbcommon-0.4.1 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 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free and open source media-player and entertainment hub
 EAPI=7
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
 IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] ) python_single_target_python3_5? ( dev-lang/python:3.5[libressl?,sqlite,ssl] ) python_single_target_python3_6? ( dev-lang/python:3.6[libressl?,sqlite,ssl] ) python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] 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[raspberry-pi?] ) 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_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_5? ( dev-python/pycryptodome[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_single_target_python3_6? ( dev-python/pycryptodome[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_single_target_python3_7? ( dev-python/pycryptodome[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-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( 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 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[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[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) 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 ) 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 >=x11-libs/libxkbcommon-0.4.1 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 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] ) python_single_target_python3_5? ( dev-lang/python:3.5[libressl?,sqlite,ssl] ) python_single_target_python3_6? ( dev-lang/python:3.6[libressl?,sqlite,ssl] ) python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] 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-1.11.0 >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) 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_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_5? ( dev-python/pycryptodome[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_single_target_python3_6? ( dev-python/pycryptodome[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_single_target_python3_7? ( dev-python/pycryptodome[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-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( 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 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[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[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) 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 ) 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 >=x11-libs/libxkbcommon-0.4.1 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_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) || ( gles opengl ) ^^ ( gbm raspberry-pi 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.4-Leia-18.4.tar.gz -> ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=585f9985c9321b4695195a4356981cb8
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=aeeee82397ca98326dd2497d3fd2e2f8
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.16.6 b/metadata/md5-cache/media-tv/v4l-utils-1.16.6
index ef5a640286d3..9a59e91014e9 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.16.6
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.16.6
@@ -5,10 +5,10 @@ DESCRIPTION=Separate utilities ebuild from upstream v4l-utils package
 EAPI=7
 HOMEPAGE=https://git.linuxtv.org/v4l-utils.git
 IUSE=+bpf opengl qt5
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=media-libs/libv4l-1.16.6[jpeg] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 opengl? ( dev-qt/qtopengl:5[-gles2(-)] virtual/opengl ) media-libs/alsa-lib ) virtual/libudev >=virtual/jpeg-0-r2:0= bpf? ( virtual/libelf:= ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.6.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7549295c70a014f229daac2744ff1eb8
+_md5_=961e24d33044561dabc6f87ba708187a
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 00e6c0486aa5..8366fa45d2ac 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/avidemux-2.7.0 b/metadata/md5-cache/media-video/avidemux-2.7.0
deleted file mode 100644
index 2bbdeaa8bf5b..000000000000
--- a/metadata/md5-cache/media-video/avidemux-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=~media-libs/avidemux-core-2.7.0:2.7[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opengl? ( virtual/opengl:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) vaapi? ( x11-libs/libva:0= ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Video editor designed for simple cutting, filtering and encoding tasks
-EAPI=6
-HOMEPAGE=http://fixounet.free.fr/avidemux
-IUSE=debug nls nvenc opengl qt5 sdl vaapi vdpau xv
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
-PDEPEND=~media-libs/avidemux-plugins-2.7.0:2.7[opengl?,qt5?]
-RDEPEND=~media-libs/avidemux-core-2.7.0:2.7[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opengl? ( virtual/opengl:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) vaapi? ( x11-libs/libva:0= ) nls? ( virtual/libintl:0 ) !<media-video/avidemux-2.7.0
-SLOT=2.7
-SRC_URI=mirror://sourceforge/avidemux/avidemux/2.7.0/avidemux_2.7.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7d5b4ea5ce66c708a0df49cc687bf7e
diff --git a/metadata/md5-cache/media-video/avidemux-2.7.4-r1 b/metadata/md5-cache/media-video/avidemux-2.7.4-r1
new file mode 100644
index 000000000000..50e5f47c72b5
--- /dev/null
+++ b/metadata/md5-cache/media-video/avidemux-2.7.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=~media-libs/avidemux-core-2.7.4:2.7[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opengl? ( virtual/opengl:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) vaapi? ( x11-libs/libva:0= ) qt5? ( dev-qt/linguist-tools:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Video editor designed for simple cutting, filtering and encoding tasks
+EAPI=7
+HOMEPAGE=http://fixounet.free.fr/avidemux
+IUSE=debug nls nvenc opengl qt5 sdl vaapi vdpau xv
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
+PDEPEND=~media-libs/avidemux-plugins-2.7.4:2.7[opengl?,qt5?]
+RDEPEND=~media-libs/avidemux-core-2.7.4:2.7[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opengl? ( virtual/opengl:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) vaapi? ( x11-libs/libva:0= ) nls? ( virtual/libintl:0 ) !<media-video/avidemux-2.7.4
+SLOT=2.7
+SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.4.tar.gz -> avidemux-2.7.4.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fc945276021e0c0aece59838a1e5d069
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.2.6 b/metadata/md5-cache/media-video/ffmpeg-3.2.6
deleted file mode 100644
index 329431163435..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-3.2.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ebur128? ( >=media-libs/libebur128-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zimg? ( media-libs/zimg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
-EAPI=6
-HOMEPAGE=http://ffmpeg.org/
-IUSE=alsa doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray gme gsm mmal modplug opus libilbc librtmp ssh speex vorbis vpx zvbi bs2b chromaprint ebur128 flite frei0r fribidi fontconfig ladspa libass truetype rubberband zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid armv5te armv6 armv6t2 neon armvfp mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ebur128? ( >=media-libs/libebur128-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zimg? ( media-libs/zimg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-SLOT=0/55.57.57
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.2.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0462484e3e5e05f3f005b8b35b416692
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.2.7 b/metadata/md5-cache/media-video/ffmpeg-3.2.7
deleted file mode 100644
index f2eed966caeb..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-3.2.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ebur128? ( >=media-libs/libebur128-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zimg? ( media-libs/zimg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
-EAPI=6
-HOMEPAGE=http://ffmpeg.org/
-IUSE=alsa doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray gme gsm mmal modplug opus libilbc librtmp ssh speex vorbis vpx zvbi bs2b chromaprint ebur128 flite frei0r fribidi fontconfig ladspa libass truetype rubberband zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid armv5te armv6 armv6t2 neon armvfp mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ebur128? ( >=media-libs/libebur128-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zimg? ( media-libs/zimg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-SLOT=0/55.57.57
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.2.7.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=69f986e4839ec8f73335b3228a1ebb69
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.3.4 b/metadata/md5-cache/media-video/ffmpeg-3.3.4
deleted file mode 100644
index b7c2ea7fccf7..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-3.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sofalizer? ( >=sci-libs/netcdf-4.3.2-r1[hdf5] >=sci-libs/hdf5-1.8.18[hl] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
-EAPI=6
-HOMEPAGE=http://ffmpeg.org/
-IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray gme gsm mmal modplug opus libilbc librtmp ssh speex vorbis vpx zvbi bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband sofalizer zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sofalizer? ( >=sci-libs/netcdf-4.3.2-r1[hdf5] >=sci-libs/hdf5-1.8.18[hl] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-SLOT=0/55.57.57
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.3.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3402a8e0439e3584f153df9ee87a9c20
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.3.6 b/metadata/md5-cache/media-video/ffmpeg-3.3.6
deleted file mode 100644
index aa958c54ce76..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-3.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sofalizer? ( >=sci-libs/netcdf-4.3.2-r1[hdf5] >=sci-libs/hdf5-1.8.18[hl] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
-EAPI=6
-HOMEPAGE=http://ffmpeg.org/
-IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray gme gsm mmal modplug opus libilbc librtmp ssh speex vorbis vpx zvbi bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband sofalizer zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sofalizer? ( >=sci-libs/netcdf-4.3.2-r1[hdf5] >=sci-libs/hdf5-1.8.18[hl] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-SLOT=0/55.57.57
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.3.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=51842ff71e39a97e700b7a004939bbf4
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.3.8 b/metadata/md5-cache/media-video/ffmpeg-3.3.8
deleted file mode 100644
index 53fab9dd6bd6..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-3.3.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sofalizer? ( >=sci-libs/netcdf-4.3.2-r1[hdf5] >=sci-libs/hdf5-1.8.18[hl] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
-EAPI=6
-HOMEPAGE=http://ffmpeg.org/
-IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray gme gsm mmal modplug opus libilbc librtmp ssh speex vorbis vpx zvbi bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband sofalizer zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sofalizer? ( >=sci-libs/netcdf-4.3.2-r1[hdf5] >=sci-libs/hdf5-1.8.18[hl] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-SLOT=0/55.57.57
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.3.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5cd397143293c3177a5b586c89554d1f
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.4.5 b/metadata/md5-cache/media-video/ffmpeg-3.4.5
deleted file mode 100644
index f520d3b817da..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-3.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
-EAPI=6
-HOMEPAGE=http://ffmpeg.org/
-IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm amr amr fdk jpeg2k bluray gme gsm mmal modplug opus libilbc librtmp ssh speex svg vorbis vpx zvbi appkit bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-SLOT=0/55.57.57
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.4.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=748afcdf34ace972f34a94546ea5b39d
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.4.6 b/metadata/md5-cache/media-video/ffmpeg-3.4.6
deleted file mode 100644
index 50041cd3fe06..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-3.4.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
-EAPI=6
-HOMEPAGE=http://ffmpeg.org/
-IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm amr amr fdk jpeg2k bluray gme gsm mmal modplug opus libilbc librtmp ssh speex svg vorbis vpx zvbi appkit bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-SLOT=0/55.57.57
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.4.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c8ba542885643c52f736e316d0bd6865
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.1.1 b/metadata/md5-cache/media-video/ffmpeg-4.1.1
deleted file mode 100644
index b4df0236c72f..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-4.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-8.1.24.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
-EAPI=6
-HOMEPAGE=https://ffmpeg.org/
-IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 fdk jpeg2k bluray gme gsm mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass lv2 truetype rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-8.1.24.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
-SLOT=0/56.58.58
-SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9af1d2578c2da995aef16cd76a3f678c
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.1.2 b/metadata/md5-cache/media-video/ffmpeg-4.1.2
deleted file mode 100644
index bbb9bbeb4b70..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-4.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-8.1.24.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
-EAPI=6
-HOMEPAGE=https://ffmpeg.org/
-IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 fdk jpeg2k bluray gme gsm mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass lv2 truetype rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-8.1.24.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
-SLOT=0/56.58.58
-SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9af1d2578c2da995aef16cd76a3f678c
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.1.3 b/metadata/md5-cache/media-video/ffmpeg-4.1.3
index ea8c1f05235e..4377b5cd81a3 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.1.3
+++ b/metadata/md5-cache/media-video/ffmpeg-4.1.3
@@ -7,9 +7,9 @@ IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-8.1.24.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
 RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.1.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=743cbb2f3450f109b4ef1d7475bb8d76
+_md5_=158d01d170ec4d576e746d44d9a5f6cf
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.1.4 b/metadata/md5-cache/media-video/ffmpeg-4.1.4
index 2df3ce294d5d..e7e4923ec769 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.1.4
+++ b/metadata/md5-cache/media-video/ffmpeg-4.1.4
@@ -7,9 +7,9 @@ IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-8.1.24.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
 RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.1.4.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7cc36a907da991bee47d61f4dba41a0b
+_md5_=d00feb4fdfcdb23d90ec8031e503ad3e
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.2 b/metadata/md5-cache/media-video/ffmpeg-4.2
new file mode 100644
index 000000000000..6dd16fda97bc
--- /dev/null
+++ b/metadata/md5-cache/media-video/ffmpeg-4.2
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/make-3.81 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) doc? ( sys-apps/texinfo ) test? ( net-misc/wget sys-devel/bc )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers )
+DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
+EAPI=7
+HOMEPAGE=https://ffmpeg.org/
+IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
+REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
+SLOT=0/56.58.58
+SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.2.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a8561a0547695b1f147c9ddcfcc5be72
diff --git a/metadata/md5-cache/media-video/ffmpeg-9999 b/metadata/md5-cache/media-video/ffmpeg-9999
index 995e769fedca..5c07c5aafab3 100644
--- a/metadata/md5-cache/media-video/ffmpeg-9999
+++ b/metadata/md5-cache/media-video/ffmpeg-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=sys-devel/make-3.81 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) doc? ( sys-apps/texinfo ) test? ( net-misc/wget sys-devel/bc ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.2.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers )
 DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
-EAPI=6
+EAPI=7
 HOMEPAGE=https://ffmpeg.org/
-IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 dav1d fdk jpeg2k bluray gme gsm mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
+IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 PROPERTIES=live
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.2.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
+REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
 RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 SLOT=0/56.58.58
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=441a9f020a95e89c6fa6b107cf3b2e5a
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=944c335616dd646cb41b6b3dcd39480e
diff --git a/metadata/md5-cache/media-video/gnome-mpv-0.16 b/metadata/md5-cache/media-video/gnome-mpv-0.16
index 0cda1cc15448..61166d58045f 100644
--- a/metadata/md5-cache/media-video/gnome-mpv-0.16
+++ b/metadata/md5-cache/media-video/gnome-mpv-0.16
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.44 >=x11-libs/gtk+-3.22.23:3 >=media-video/mpv-0.27[libmpv] media-libs/libepoxy
 SLOT=0
 SRC_URI=https://github.com/gnome-mpv/gnome-mpv/releases/download/v0.16/gnome-mpv-0.16.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c293f0c68862543713ae4e2980251e3
diff --git a/metadata/md5-cache/media-video/makemkv-1.14.4 b/metadata/md5-cache/media-video/makemkv-1.14.4
deleted file mode 100644
index 56c028b2c071..000000000000
--- a/metadata/md5-cache/media-video/makemkv-1.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm setup
-DEPEND=sys-libs/glibc dev-libs/expat sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) !libressl? ( dev-libs/openssl:0=[-bindist(-)] ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs
-EAPI=6
-HOMEPAGE=http://www.makemkv.com/
-IUSE=+gui libav libressl kernel_linux
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
-RDEPEND=sys-libs/glibc dev-libs/expat sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) !libressl? ( dev-libs/openssl:0=[-bindist(-)] ) libressl? ( dev-libs/libressl:0= ) media-video/ccextractor net-misc/wget
-SLOT=0
-SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.14.4.tar.gz http://www.makemkv.com/download/makemkv-bin-1.14.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cf96eaeacae8e8bed1224664f70640bb
diff --git a/metadata/md5-cache/media-video/makemkv-1.14.5 b/metadata/md5-cache/media-video/makemkv-1.14.5
new file mode 100644
index 000000000000..4b32bdc8a4fa
--- /dev/null
+++ b/metadata/md5-cache/media-video/makemkv-1.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm setup
+DEPEND=sys-libs/glibc dev-libs/expat sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) !libressl? ( dev-libs/openssl:0=[-bindist(-)] ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs
+EAPI=7
+HOMEPAGE=http://www.makemkv.com/
+IUSE=+gui libav libressl kernel_linux
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
+RDEPEND=sys-libs/glibc dev-libs/expat sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) !libressl? ( dev-libs/openssl:0=[-bindist(-)] ) libressl? ( dev-libs/libressl:0= ) media-video/ccextractor net-misc/wget
+SLOT=0
+SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.14.5.tar.gz http://www.makemkv.com/download/makemkv-bin-1.14.5.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fcaec9921d7a9508c319da7cfb35bc07
diff --git a/metadata/md5-cache/media-video/mediainfo-19.04 b/metadata/md5-cache/media-video/mediainfo-19.04
deleted file mode 100644
index ff08086aec23..000000000000
--- a/metadata/md5-cache/media-video/mediainfo-19.04
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-19.04[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) 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=MediaInfo supplies technical and tag information about media files
-EAPI=6
-HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo
-IUSE=curl mms wxwidgets
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-19.04[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
-SLOT=0
-SRC_URI=https://mediaarea.net/download/source/mediainfo/19.04/mediainfo_19.04.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c1303cae5fa7d1a416b3c30476b12ef2
diff --git a/metadata/md5-cache/media-video/mediainfo-19.07 b/metadata/md5-cache/media-video/mediainfo-19.07
index d49c44a8cb02..ab0706f935f9 100644
--- a/metadata/md5-cache/media-video/mediainfo-19.07
+++ b/metadata/md5-cache/media-video/mediainfo-19.07
@@ -4,10 +4,10 @@ DESCRIPTION=MediaInfo supplies technical and tag information about media files
 EAPI=6
 HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo
 IUSE=curl mms wxwidgets
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-19.07[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/mediainfo/19.07/mediainfo_19.07.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=322633f75d9cce4fc937de07c87e3071
+_md5_=c1303cae5fa7d1a416b3c30476b12ef2
diff --git a/metadata/md5-cache/media-video/pipewire-0.2.6 b/metadata/md5-cache/media-video/pipewire-0.2.6
index 4d854a2870b2..0e33171aeca9 100644
--- a/metadata/md5-cache/media-video/pipewire-0.2.6
+++ b/metadata/md5-cache/media-video/pipewire-0.2.6
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=media-libs/alsa-lib sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sdl? ( media-libs/libsdl2 ) systemd? ( sys-apps/systemd ) vaapi? ( x11-libs/libva ) X? ( x11-libs/libX11 )
 SLOT=0/0.2
 SRC_URI=https://github.com/PipeWire/pipewire/archive/0.2.6.tar.gz -> pipewire-0.2.6.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=b1d5b2df7d59596b546a5c6b81023042
diff --git a/metadata/md5-cache/media-video/pitivi-0.98.1 b/metadata/md5-cache/media-video/pitivi-0.98.1
index 5ef193c6f3ac..7947b1138b89 100644
--- a/metadata/md5-cache/media-video/pitivi-0.98.1
+++ b/metadata/md5-cache/media-video/pitivi-0.98.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_s
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pitivi/0.98/pitivi-0.98.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=5fe04727329933ed1711e48328224e5f
diff --git a/metadata/md5-cache/media-video/pitivi-0.999 b/metadata/md5-cache/media-video/pitivi-0.999
index 6c721249d554..053c43ef4926 100644
--- a/metadata/md5-cache/media-video/pitivi-0.999
+++ b/metadata/md5-cache/media-video/pitivi-0.999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_s
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pitivi/0.999/pitivi-0.999.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb703c43ff147456f527318f3a28ab0e
diff --git a/metadata/md5-cache/media-video/totem-3.30.0 b/metadata/md5-cache/media-video/totem-3.30.0
index 6d695194451f..8c9dc8b2987c 100644
--- a/metadata/md5-cache/media-video/totem-3.30.0
+++ b/metadata/md5-cache/media-video/totem-3.30.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.19.4:3[X,introspection?] >=me
 REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem/3.30/totem-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87bb2020cf0ea2d7d6b75f2eb2c997a4
diff --git a/metadata/md5-cache/media-video/totem-3.32.1 b/metadata/md5-cache/media-video/totem-3.32.1
index 8b939a1c4257..7ae04017b755 100644
--- a/metadata/md5-cache/media-video/totem-3.32.1
+++ b/metadata/md5-cache/media-video/totem-3.32.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.19.4:3[X,introspection?] >=me
 REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem/3.32/totem-3.32.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6538fb8c5398a697acdff3daff7fe4b0
diff --git a/metadata/md5-cache/media-video/vlc-3.0.7.1 b/metadata/md5-cache/media-video/vlc-3.0.7.1
deleted file mode 100644
index 6ac14439f54b..000000000000
--- a/metadata/md5-cache/media-video/vlc-3.0.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Media player and framework with support for most multimedia files and streaming
-EAPI=7
-HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse test
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc x86 ~x86-fbsd
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
-REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) postproc? ( ffmpeg ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
-SLOT=0/5-9
-SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.7.1/vlc-3.0.7.1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=84759bf7bd0003ac7cdb2e46d3843e40
diff --git a/metadata/md5-cache/media-video/vlc-3.0.8 b/metadata/md5-cache/media-video/vlc-3.0.8
new file mode 100644
index 000000000000..96f897d87024
--- /dev/null
+++ b/metadata/md5-cache/media-video/vlc-3.0.8
@@ -0,0 +1,15 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=configure install postinst postrm preinst prepare test
+DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Media player and framework with support for most multimedia files and streaming
+EAPI=7
+HOMEPAGE=https://www.videolan.org/vlc/
+IUSE=a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse test
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc x86 ~x86-fbsd
+LICENSE=LGPL-2.1 GPL-2
+RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) postproc? ( ffmpeg ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
+SLOT=0/5-9
+SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.8/vlc-3.0.8.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4b85080027999484f98197d5c7492d22
diff --git a/metadata/md5-cache/media-video/vlc-3.0.9999 b/metadata/md5-cache/media-video/vlc-3.0.9999
index 7e3e3487e7db..c2aee5bd3d35 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.9999
+++ b/metadata/md5-cache/media-video/vlc-3.0.9999
@@ -1,14 +1,14 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare test unpack
-DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse test
 LICENSE=LGPL-2.1 GPL-2
 PROPERTIES=live
-RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) postproc? ( ffmpeg ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 SLOT=0/5-9
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=77aba493ce1a58a93668c8b20bbb2f90
+_md5_=e233590b0725e9fe2a9c8f9fa161ce66
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index cad793dc4da5..6c95137fd71d 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare test unpack
-DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.3.0 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.3.0 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms libass libav libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse test
 LICENSE=LGPL-2.1 GPL-2
 PROPERTIES=live
-RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( dev-libs/libebml:= media-libs/libmatroska:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.3.0 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9 >=media-libs/libdvdread-4.9 ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.3.0 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.12 ) X? ( x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) postproc? ( ffmpeg ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 SLOT=0/12-9
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95294d295f93333a29391e6f8261b0bf
+_md5_=59c6a974caf079803af45de6cbb3e31c
diff --git a/metadata/md5-cache/media-video/x264-encoder-0.0.20190903 b/metadata/md5-cache/media-video/x264-encoder-0.0.20190903
new file mode 100644
index 000000000000..a9a1369bf6ee
--- /dev/null
+++ b/metadata/md5-cache/media-video/x264-encoder-0.0.20190903
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=~media-libs/x264-0.0.20190903[interlaced=,threads=] ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2:= ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) x86-fbsd? ( >=dev-lang/nasm-2.13 )
+DESCRIPTION=A free commandline encoder for X264/AVC streams
+EAPI=7
+HOMEPAGE=https://www.videolan.org/developers/x264.html
+IUSE=avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=~media-libs/x264-0.0.20190903[interlaced=,threads=] ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2:= )
+REQUIRED_USE=ffmpegsource? ( ffmpeg )
+SLOT=0
+SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20190903-2245.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c029589bfcbcbf757a6e724f5d2c60a5
diff --git a/metadata/md5-cache/media-video/yle-dl-20190614 b/metadata/md5-cache/media-video/yle-dl-20190614
new file mode 100644
index 000000000000..fb3476b4ff2a
--- /dev/null
+++ b/metadata/md5-cache/media-video/yle-dl-20190614
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=test? ( !libav? ( media-video/ffmpeg ) >=dev-python/attrs-18.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/attrs-18.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mini-amf[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/progress[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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(-)] net-misc/wget php? ( dev-lang/php:*[bcmath,cli,curl,simplexml] >=dev-libs/openssl-1.0.2:0= media-video/rtmpdump ) youtube-dl? ( net-misc/youtube-dl[python_targets_python2_7(-)?,python_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-runner[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Download media files from Yle Areena
+EAPI=7
+HOMEPAGE=http://aajanki.github.io/yle-dl/
+IUSE=libav php test +youtube-dl python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=!libav? ( media-video/ffmpeg ) >=dev-python/attrs-18.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/attrs-18.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mini-amf[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/progress[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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(-)] net-misc/wget php? ( dev-lang/php:*[bcmath,cli,curl,simplexml] >=dev-libs/openssl-1.0.2:0= media-video/rtmpdump ) youtube-dl? ( net-misc/youtube-dl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/aajanki/yle-dl/archive/20190614.tar.gz -> yle-dl-20190614.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=89d94a8a23815984ede746cc9ec03bdb
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 5310ebd40457..fbcaef1ddea0 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/argus-3.0.8.2-r1 b/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r1
index 0bb307cbdaff..d27497d19214 100644
--- a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r1
+++ b/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst preinst prepare
 DEPEND=net-libs/libnsl:= net-libs/libpcap sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=network Audit Record Generation and Utilization System
 EAPI=5
-HOMEPAGE=http://www.qosient.com/argus/
+HOMEPAGE=https://www.qosient.com/argus/
 IUSE=debug +libtirpc sasl tcpd
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=net-libs/libnsl:= net-libs/libpcap sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 SLOT=0
-SRC_URI=http://www.qosient.com/argus/dev/argus-3.0.8.2.tar.gz
+SRC_URI=https://www.qosient.com/argus/dev/argus-3.0.8.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=529045ea46440385af32a3b25c3e7dd5
+_md5_=6dc3b1396091e1ad87e0de4d860dfd90
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8
index 3789d55402d8..edbda77e22be 100644
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8
+++ b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) 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
 DESCRIPTION=Clients for net-analyzer/argus
 EAPI=5
-HOMEPAGE=http://www.qosient.com/argus/
+HOMEPAGE=https://www.qosient.com/argus/
 IUSE=debug ft geoip mysql sasl tcpd
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
 RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
-SRC_URI=http://qosient.com/argus/dev/argus-clients-3.0.8.tar.gz
+SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e791e4344ea7ac0efede293fabff5f0b
+_md5_=ccbd05be2c3319934f643312278554ec
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2
index 410701c24d6f..c4f9bdf33dec 100644
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2
+++ b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) 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
 DESCRIPTION=Clients for net-analyzer/argus
 EAPI=5
-HOMEPAGE=http://www.qosient.com/argus/
+HOMEPAGE=https://www.qosient.com/argus/
 IUSE=debug ft geoip mysql sasl tcpd
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3
 RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
-SRC_URI=http://qosient.com/argus/dev/argus-clients-3.0.8.2.tar.gz
+SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6c6168385774c4d22519b2ea467339f
+_md5_=287c5c2f6cdf810dcdd5ea6a5b8bac13
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r2 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r2
index b8a2e558c216..dc94cfb3d0d0 100644
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r2
+++ b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl ) 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
 DESCRIPTION=Clients for net-analyzer/argus
 EAPI=6
-HOMEPAGE=http://www.qosient.com/argus/
+HOMEPAGE=https://www.qosient.com/argus/
 IUSE=debug ft geoip mysql sasl tcpd
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3
 RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
-SRC_URI=http://qosient.com/argus/dev/argus-clients-3.0.8.2.tar.gz
+SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1baf2f3e3e9b919de9b899d0ca23c053
+_md5_=fc1c5699722632a34790abdaf61a4651
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r3 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r3
new file mode 100644
index 000000000000..a3248095e1e2
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r3
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex virtual/pkgconfig
+DESCRIPTION=Clients for net-analyzer/argus
+EAPI=7
+HOMEPAGE=https://www.qosient.com/argus/
+IUSE=debug ft geoip mysql sasl tcpd
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl )
+SLOT=0
+SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=44430f6a55aaa79025639bafb8920e5b
diff --git a/metadata/md5-cache/net-analyzer/arping-2.18 b/metadata/md5-cache/net-analyzer/arping-2.18
deleted file mode 100644
index 8fe9e47fa190..000000000000
--- a/metadata/md5-cache/net-analyzer/arping-2.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=postinst
-DEPEND=net-libs/libpcap net-libs/libnet:1.1 test? ( dev-libs/check ) filecaps? ( sys-libs/libcap )
-DESCRIPTION=A utility to see if a specific IP address is taken and what MAC address owns it
-EAPI=6
-HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=arping
-IUSE=test +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)]
-SLOT=2
-SRC_URI=http://www.habets.pp.se/synscan/files/arping-2.18.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16
-_md5_=2e684d5a60d73864d809e9749bea4603
diff --git a/metadata/md5-cache/net-analyzer/arping-2.20 b/metadata/md5-cache/net-analyzer/arping-2.20
new file mode 100644
index 000000000000..3f395df8bcff
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/arping-2.20
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=postinst prepare
+DEPEND=net-libs/libpcap net-libs/libnet:1.1 test? ( dev-libs/check ) filecaps? ( sys-libs/libcap )
+DESCRIPTION=A utility to see if a specific IP address is taken and what MAC address owns it
+EAPI=7
+HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=arping
+IUSE=test +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)]
+SLOT=2
+SRC_URI=https://github.com/ThomasHabets/arping/archive/arping-2.20.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=dc31b863c08435f867569657e09d0d39
diff --git a/metadata/md5-cache/net-analyzer/arping-9999 b/metadata/md5-cache/net-analyzer/arping-9999
index 3f6a3b127acc..bb9f3c208cb0 100644
--- a/metadata/md5-cache/net-analyzer/arping-9999
+++ b/metadata/md5-cache/net-analyzer/arping-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=postinst prepare unpack
-DEPEND=net-libs/libpcap net-libs/libnet:1.1 dev-libs/check >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=net-libs/libpcap net-libs/libnet:1.1 dev-libs/check filecaps? ( sys-libs/libcap )
 DESCRIPTION=A utility to see if a specific IP address is taken and what MAC address owns it
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=arping
 IUSE=+filecaps
 LICENSE=GPL-2
@@ -9,4 +10,4 @@ PROPERTIES=live
 RDEPEND=net-libs/libpcap net-libs/libnet:1.1 !net-misc/iputils[arping(+)]
 SLOT=2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6440c884e2b6fdd830773294eb60bcaf
+_md5_=37fab5a20dedc482391ce8042b311052
diff --git a/metadata/md5-cache/net-analyzer/barnyard2-1.13 b/metadata/md5-cache/net-analyzer/barnyard2-1.13
index 5db8b165b9f2..1daca0e78357 100644
--- a/metadata/md5-cache/net-analyzer/barnyard2-1.13
+++ b/metadata/md5-cache/net-analyzer/barnyard2-1.13
@@ -11,4 +11,4 @@ RDEPEND=net-libs/libpcap mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/u
 SLOT=0
 SRC_URI=https://github.com/firnsy/barnyard2/archive/v2-1.13.tar.gz -> barnyard2-1.13-github.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=5c09fc9c5568427903cfe503427e0139
+_md5_=2cff105966be878879cd925d36b322d2
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.5 b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.5
deleted file mode 100644
index e450f7b9dd34..000000000000
--- a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/openssl:0= net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= sys-apps/help2man
-DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
-EAPI=7
-HOMEPAGE=https://cacti.net/spine_info.php
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/openssl:0= net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= >net-analyzer/cacti-0.8.8
-SLOT=0
-SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.2.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f04c170d0f4bb8a91c017b187f12240a
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.5-r1 b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.5-r1
new file mode 100644
index 000000000000..49c73991b611
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.5-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= sys-apps/help2man
+DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
+EAPI=7
+HOMEPAGE=https://cacti.net/spine_info.php
+IUSE=libressl
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= >net-analyzer/cacti-0.8.8
+SLOT=0
+SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.2.5.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=6642308cd04fe482f2db85798a75d865
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-99999 b/metadata/md5-cache/net-analyzer/cacti-spine-99999
new file mode 100644
index 000000000000..0d0a24eb7359
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-99999
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=install prepare unpack
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= sys-apps/help2man
+DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
+EAPI=7
+HOMEPAGE=https://cacti.net/spine_info.php
+IUSE=libressl
+LICENSE=LGPL-2.1
+PROPERTIES=live
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= >net-analyzer/cacti-0.8.8
+SLOT=0
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=577a2acfba94f8a1199011512c0a91a4
diff --git a/metadata/md5-cache/net-analyzer/ettercap-0.8.3 b/metadata/md5-cache/net-analyzer/ettercap-0.8.3
index c7e25fea4a77..ce8dc966334a 100644
--- a/metadata/md5-cache/net-analyzer/ettercap-0.8.3
+++ b/metadata/md5-cache/net-analyzer/ettercap-0.8.3
@@ -5,10 +5,10 @@ DESCRIPTION=A suite for man in the middle attacks
 EAPI=7
 HOMEPAGE=https://github.com/Ettercap/ettercap
 IUSE=doc geoip gtk ipv6 libressl ncurses +plugins test
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libbsd dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib geoip? ( dev-libs/geoip ) gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) plugins? ( >=net-misc/curl-7.26.0 )
 SLOT=0
 SRC_URI=https://github.com/Ettercap/ettercap/archive/v0.8.3.tar.gz -> ettercap-0.8.3.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fbb8ac2e7b9b989423109fce18ea34c3
+_md5_=a382997b42df9bab52d4c7182216613c
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.10.6 b/metadata/md5-cache/net-analyzer/icinga2-2.10.6
index 9c1a6d5a61f0..3985723fb77a 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.10.6
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.10.6
@@ -4,11 +4,11 @@ DESCRIPTION=Distributed, general purpose, network monitoring engine
 EAPI=6
 HOMEPAGE=http://icinga.org/icinga2
 IUSE=classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax apache2
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) classicui? ( net-analyzer/icinga[web] ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
 SLOT=0
 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.10.6.tar.gz -> icinga2-2.10.6.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=97b9c06f048a51833d36f9e743faee9d
+_md5_=f6e100d21b5ae03839a5763ea6530bd1
diff --git a/metadata/md5-cache/net-analyzer/icinga2-9999 b/metadata/md5-cache/net-analyzer/icinga2-9999
index 4b4963d5703a..1ea686bc64e2 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-9999
+++ b/metadata/md5-cache/net-analyzer/icinga2-9999
@@ -10,4 +10,4 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=
 REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8da4a7d9dccb6df59be7881972ea0bb4
+_md5_=4c9e4c7127b32527a88c64154903ca62
diff --git a/metadata/md5-cache/net-analyzer/ipsumdump-1.86 b/metadata/md5-cache/net-analyzer/ipsumdump-1.86
index 910b7e254496..8db7f94e267b 100644
--- a/metadata/md5-cache/net-analyzer/ipsumdump-1.86
+++ b/metadata/md5-cache/net-analyzer/ipsumdump-1.86
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure
-DEPEND=net-libs/libpcap dev-lang/perl dev-libs/expat sys-apps/texinfo
+DEPEND=net-libs/libpcap dev-lang/perl dev-libs/expat sys-apps/texinfo virtual/os-headers
 DESCRIPTION=Simple TCP/IP Dump summarizer/analyzer
 EAPI=6
 HOMEPAGE=http://read.seas.harvard.edu/~kohler/ipsumdump/
@@ -9,4 +9,4 @@ LICENSE=the-Click-license
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=http://read.seas.harvard.edu/~kohler/ipsumdump/ipsumdump-1.86.tar.gz
-_md5_=fd5235725fedc7fba6d7e0ebbff9a010
+_md5_=7226a59a9f591668ff77d86c05063aef
diff --git a/metadata/md5-cache/net-analyzer/ipsumdump-1.86-r1 b/metadata/md5-cache/net-analyzer/ipsumdump-1.86-r1
new file mode 100644
index 000000000000..d63efa70c4ab
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/ipsumdump-1.86-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=net-libs/libpcap dev-lang/perl dev-libs/expat sys-apps/texinfo virtual/os-headers
+DESCRIPTION=Simple TCP/IP Dump summarizer/analyzer
+EAPI=7
+HOMEPAGE=http://read.seas.harvard.edu/~kohler/ipsumdump/
+IUSE=+ipv6 +nanotimestamp
+KEYWORDS=~amd64 ~x86
+LICENSE=the-Click-license
+RDEPEND=net-libs/libpcap
+SLOT=0
+SRC_URI=http://read.seas.harvard.edu/~kohler/ipsumdump/ipsumdump-1.86.tar.gz
+_md5_=602550ea3a3c0668cbd4c3a6970b341a
diff --git a/metadata/md5-cache/net-analyzer/nagios-4.4.4 b/metadata/md5-cache/net-analyzer/nagios-4.4.4
deleted file mode 100644
index 8324625040fa..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-4.4.4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=The Nagios metapackage
-EAPI=6
-HOMEPAGE=https://www.nagios.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=~net-analyzer/nagios-core-4.4.4 || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
-SLOT=0
-_md5_=01606b999b46fb307e59203055589a6a
diff --git a/metadata/md5-cache/net-analyzer/nagios-4.4.5 b/metadata/md5-cache/net-analyzer/nagios-4.4.5
new file mode 100644
index 000000000000..9d9ccad05d58
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagios-4.4.5
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=The Nagios metapackage
+EAPI=6
+HOMEPAGE=https://www.nagios.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=~net-analyzer/nagios-core-4.4.5 || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
+SLOT=0
+_md5_=01606b999b46fb307e59203055589a6a
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.4.4 b/metadata/md5-cache/net-analyzer/nagios-core-4.4.4
deleted file mode 100644
index 57de94bb4763..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup
-DEPEND=dev-libs/libltdl:0 virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_fcgid] ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) )
-DESCRIPTION=Nagios core - monitoring daemon, web GUI, and documentation
-EAPI=6
-HOMEPAGE=https://www.nagios.org/
-IUSE=apache2 classicui lighttpd perl +web vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libltdl:0 virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_fcgid] ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) ) vim-syntax? ( app-vim/nagios-syntax )
-REQUIRED_USE=apache2? ( !lighttpd )
-SLOT=0
-SRC_URI=mirror://sourceforge/nagios/nagios-4.4.4.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=0e563849df14a1d55de951a281df6f40
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.4.5-r3 b/metadata/md5-cache/net-analyzer/nagios-core-4.4.5-r3
new file mode 100644
index 000000000000..947c582535df
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.4.5-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=dev-libs/libltdl:0 virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_fcgid] ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) )
+DESCRIPTION=Nagios core - monitoring daemon, web GUI, and documentation
+EAPI=6
+HOMEPAGE=https://www.nagios.org/
+IUSE=apache2 classicui lighttpd perl +web vim-syntax
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libltdl:0 virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_fcgid] ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) ) vim-syntax? ( app-vim/nagios-syntax )
+REQUIRED_USE=apache2? ( !lighttpd )
+SLOT=0
+SRC_URI=mirror://sourceforge/nagios/nagios-4.4.5.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=e12c6c163539ed0131c42109753edaa5
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r4 b/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r4
new file mode 100644
index 000000000000..730c97fa3e95
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst preinst prepare
+DEPEND=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] )
+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
+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	00484e1be1aac73e24fca1c99557a7d6
+_md5_=ff4ce3910dd61e07c9f22dc4e8e1aa13
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-linux-madrisan-25-r1 b/metadata/md5-cache/net-analyzer/nagios-plugins-linux-madrisan-25-r1
new file mode 100644
index 000000000000..8024dc6e226c
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-linux-madrisan-25-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare test
+DEPEND=curl? ( net-misc/curl:0= )
+DESCRIPTION=Additional and alternative Nagios plugins for Linux
+EAPI=7
+HOMEPAGE=https://github.com/madrisan/nagios-plugins-linux
+IUSE=curl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=curl? ( net-misc/curl:0= )
+SLOT=0
+SRC_URI=https://github.com/madrisan/nagios-plugins-linux/releases/download/v25/nagios-plugins-linux-25.tar.xz -> nagios-plugins-linux-madrisan-25.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=04bf218e0e93ffdf703b0c76574543fb
diff --git a/metadata/md5-cache/net-analyzer/ndoutils-2.1.3-r1 b/metadata/md5-cache/net-analyzer/ndoutils-2.1.3-r1
deleted file mode 100644
index ac3a0090e22c..000000000000
--- a/metadata/md5-cache/net-analyzer/ndoutils-2.1.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst
-DEPEND=dev-db/mysql-connector-c dev-perl/DBD-mysql dev-perl/DBI >=net-analyzer/nagios-core-4 virtual/pkgconfig
-DESCRIPTION=Nagios addon to store Nagios data in a MySQL database
-EAPI=6
-HOMEPAGE=https://www.nagios.org/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-db/mysql-connector-c dev-perl/DBD-mysql dev-perl/DBI >=net-analyzer/nagios-core-4 virtual/mysql
-SLOT=0
-SRC_URI=https://github.com/NagiosEnterprises/ndoutils/archive/ndoutils-2.1.3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=be2c3b8f9eb0aab3e183d440e2b06d77
diff --git a/metadata/md5-cache/net-analyzer/ndoutils-2.1.3-r2 b/metadata/md5-cache/net-analyzer/ndoutils-2.1.3-r2
new file mode 100644
index 000000000000..f504dacb0f49
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/ndoutils-2.1.3-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst
+DEPEND=dev-db/mysql-connector-c dev-perl/DBD-mysql dev-perl/DBI >=net-analyzer/nagios-core-4.4.5 virtual/pkgconfig
+DESCRIPTION=Nagios addon to store Nagios data in a MySQL database
+EAPI=6
+HOMEPAGE=https://www.nagios.org/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/mysql-connector-c dev-perl/DBD-mysql dev-perl/DBI >=net-analyzer/nagios-core-4.4.5 virtual/mysql
+SLOT=0
+SRC_URI=https://github.com/NagiosEnterprises/ndoutils/archive/ndoutils-2.1.3.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=2cda80fdaec646972cdf96e44903c20f
diff --git a/metadata/md5-cache/net-analyzer/ndsad-1.33-r2 b/metadata/md5-cache/net-analyzer/ndsad-1.33-r2
new file mode 100644
index 000000000000..3e5314e0808b
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/ndsad-1.33-r2
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=>=net-libs/libpcap-0.8
+DESCRIPTION=Cisco netflow probe from libpcap, ULOG, tee/divert sources
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/ndsad
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libpcap-0.8
+SLOT=0
+SRC_URI=mirror://sourceforge/ndsad/ndsad-1.33.tgz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=4fa62814a5e379df1122935ecf0e0b15
diff --git a/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.4.2 b/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.4.2
new file mode 100644
index 000000000000..6e7ede51cc4a
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.4.2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install nofetch postinst unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=A remote security scanner for Linux - agent component
+EAPI=7
+HOMEPAGE=https://www.tenable.com/
+KEYWORDS=~amd64
+LICENSE=GPL-2 Nessus-EULA
+RESTRICT=mirror fetch strip
+SLOT=0
+SRC_URI=NessusAgent-7.4.2-es7.x86_64.rpm
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=2847f191b13948d192ad9f21aff17d17
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
deleted file mode 100644
index 495a92743aee..000000000000
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( virtual/mysql ) perl? ( dev-lang/perl:= ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Software for generating and retrieving SNMP data
-EAPI=5
-HOMEPAGE=http://net-snmp.sourceforge.net/
-IUSE=X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
-LICENSE=HPND BSD GPL-2
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( virtual/mysql ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
-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	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_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
deleted file mode 100644
index 7a904b00035f..000000000000
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( virtual/mysql ) perl? ( dev-lang/perl:= ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Software for generating and retrieving SNMP data
-EAPI=5
-HOMEPAGE=http://net-snmp.sourceforge.net/
-IUSE=X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=HPND BSD GPL-2
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( virtual/mysql ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
-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	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=31d933612948e6311cf395ee6ed7e1da
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3_p3-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3_p3-r1
deleted file mode 100644
index 2e608c54b886..000000000000
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3_p3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Software for generating and retrieving SNMP data
-EAPI=6
-HOMEPAGE=http://net-snmp.sourceforge.net/
-IUSE=X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=HPND BSD GPL-2
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
-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-3.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/net-snmp-5.7.3-perl524.patch.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c42055a5e8c9bb6ce65a7890fe2dc57
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r2 b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r2
new file mode 100644
index 000000000000..e85087bb01a0
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Software for generating and retrieving SNMP data
+EAPI=6
+HOMEPAGE=http://www.net-snmp.org/
+IUSE=X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=HPND BSD GPL-2
+RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
+RESTRICT=test
+SLOT=0/35
+SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.8/net-snmp-5.8.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ebd8b1f0410a336a34a1f02d0cf7217e
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.17.0 b/metadata/md5-cache/net-analyzer/netdata-1.17.0
new file mode 100644
index 000000000000..58dab7040a3c
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netdata-1.17.0
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-analyzer/tcpdump net-analyzer/traceroute net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( dev-libs/libuv app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] mysql? ( || ( dev-python/mysqlclient[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mysql-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) tor? ( net-libs/stem[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DESCRIPTION=Linux real time system monitoring, done right!
+EAPI=7
+HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
+IUSE=caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen +filecaps kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ MIT BSD
+RDEPEND=app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-analyzer/tcpdump net-analyzer/traceroute net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( dev-libs/libuv app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] mysql? ( || ( dev-python/mysqlclient[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mysql-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) tor? ( net-libs/stem[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+REQUIRED_USE=mysql? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) tor? ( python )
+SLOT=0
+SRC_URI=https://github.com/netdata/netdata/archive/v1.17.0.tar.gz -> netdata-1.17.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=f5ee0bae8edc2fd7f33d442a2ba745be
diff --git a/metadata/md5-cache/net-analyzer/nethogs-0.8.1 b/metadata/md5-cache/net-analyzer/nethogs-0.8.1
deleted file mode 100644
index 607f2d0d24fc..000000000000
--- a/metadata/md5-cache/net-analyzer/nethogs-0.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=net-libs/libpcap sys-libs/ncurses:0= virtual/pkgconfig
-DESCRIPTION=A small 'net top' tool, grouping bandwidth by process
-EAPI=5
-HOMEPAGE=https://github.com/raboof/nethogs
-KEYWORDS=amd64 ~arm ~ia64 x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://github.com/raboof/nethogs/archive/v0.8.1.tar.gz -> nethogs-0.8.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a2557f1f4420c619cf424345ab226fc0
diff --git a/metadata/md5-cache/net-analyzer/nrpe-2.15-r3 b/metadata/md5-cache/net-analyzer/nrpe-2.15-r3
deleted file mode 100644
index cfd69e1f3238..000000000000
--- a/metadata/md5-cache/net-analyzer/nrpe-2.15-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) ) 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=Nagios Remote Plugin Executor
-EAPI=5
-HOMEPAGE=http://www.nagios.org/
-IUSE=command-args libressl minimal selinux ssl tcpd
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) ) !minimal? ( || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) ) selinux? ( sec-policy/selinux-nagios )
-SLOT=0
-SRC_URI=mirror://sourceforge/nagios/nrpe-2.15.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=20fc8d65dd66970119d57228a72aa699
diff --git a/metadata/md5-cache/net-analyzer/nrpe-3.2.1 b/metadata/md5-cache/net-analyzer/nrpe-3.2.1
deleted file mode 100644
index 7d1c7704ff9d..000000000000
--- a/metadata/md5-cache/net-analyzer/nrpe-3.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup
-DEPEND=sys-apps/tcp-wrappers ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/pkgconfig
-DESCRIPTION=Nagios Remote Plugin Executor
-EAPI=6
-HOMEPAGE=https://github.com/NagiosEnterprises/nrpe
-IUSE=command-args libressl selinux ssl
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=sys-apps/tcp-wrappers ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) selinux? ( sec-policy/selinux-nagios )
-SLOT=0
-SRC_URI=https://github.com/NagiosEnterprises/nrpe/releases/download/nrpe-3.2.1/nrpe-3.2.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=9c20c0eedf957549b2198d0b5f234b96
diff --git a/metadata/md5-cache/net-analyzer/nrpe-3.2.1-r2 b/metadata/md5-cache/net-analyzer/nrpe-3.2.1-r2
new file mode 100644
index 000000000000..c4ab118966ac
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nrpe-3.2.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=sys-apps/tcp-wrappers ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/pkgconfig
+DESCRIPTION=Nagios Remote Plugin Executor
+EAPI=6
+HOMEPAGE=https://github.com/NagiosEnterprises/nrpe
+IUSE=command-args libressl selinux ssl
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=sys-apps/tcp-wrappers ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) selinux? ( sec-policy/selinux-nagios )
+SLOT=0
+SRC_URI=https://github.com/NagiosEnterprises/nrpe/releases/download/nrpe-3.2.1/nrpe-3.2.1.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=9dfbed14c31d1b7b80a780636ef86bc9
diff --git a/metadata/md5-cache/net-analyzer/ntopng-2.4 b/metadata/md5-cache/net-analyzer/ntopng-2.4
deleted file mode 100644
index 82d824391119..000000000000
--- a/metadata/md5-cache/net-analyzer/ntopng-2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap net-misc/curl virtual/libmysqlclient !net-libs/nDPI >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Network traffic analyzer with web interface
-EAPI=5
-HOMEPAGE=https://www.ntop.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap net-misc/curl virtual/libmysqlclient !net-libs/nDPI dev-db/redis
-SLOT=0
-SRC_URI=mirror://sourceforge/ntop/ntopng/ntopng-2.4-stable.tar.gz -> ntopng-2.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f94a6509e1c9dae893405507a8221b7d
diff --git a/metadata/md5-cache/net-analyzer/ntopng-2.4-r1 b/metadata/md5-cache/net-analyzer/ntopng-2.4-r1
new file mode 100644
index 000000000000..efaaadec65b9
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/ntopng-2.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap net-misc/curl dev-db/mysql-connector-c !net-libs/nDPI >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Network traffic analyzer with web interface
+EAPI=5
+HOMEPAGE=https://www.ntop.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap net-misc/curl dev-db/mysql-connector-c !net-libs/nDPI dev-db/redis
+SLOT=0
+SRC_URI=mirror://sourceforge/ntop/ntopng/ntopng-2.4-stable.tar.gz -> ntopng-2.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=67a0b24e41fa8d0290ac52e219c88cee
diff --git a/metadata/md5-cache/net-analyzer/ntopng-3.0-r3 b/metadata/md5-cache/net-analyzer/ntopng-3.0-r3
deleted file mode 100644
index 3eb548c9f959..000000000000
--- a/metadata/md5-cache/net-analyzer/ntopng-3.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libsodium:= dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap =net-libs/nDPI-2.0 net-misc/curl sys-libs/binutils-libs:= virtual/libmysqlclient >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Network traffic analyzer with web interface
-EAPI=6
-HOMEPAGE=https://www.ntop.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libsodium:= dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap =net-libs/nDPI-2.0 net-misc/curl sys-libs/binutils-libs:= virtual/libmysqlclient dev-db/redis
-SLOT=0
-SRC_URI=https://github.com/ntop/ntopng/archive/3.0.tar.gz -> ntopng-3.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=e0e9422c1f65404a4db1942a03bcd5c9
diff --git a/metadata/md5-cache/net-analyzer/ntopng-3.0-r4 b/metadata/md5-cache/net-analyzer/ntopng-3.0-r4
new file mode 100644
index 000000000000..02727e3a7e98
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/ntopng-3.0-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libsodium:= dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap =net-libs/nDPI-2.0 net-misc/curl sys-libs/binutils-libs:= dev-db/mysql-connector-c:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Network traffic analyzer with web interface
+EAPI=6
+HOMEPAGE=https://www.ntop.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libsodium:= dev-libs/libxml2 net-analyzer/rrdtool net-libs/libpcap =net-libs/nDPI-2.0 net-misc/curl sys-libs/binutils-libs:= dev-db/mysql-connector-c:= dev-db/redis
+SLOT=0
+SRC_URI=https://github.com/ntop/ntopng/archive/3.0.tar.gz -> ntopng-3.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=a48636b87ffbd27bd3cbc504334acfed
diff --git a/metadata/md5-cache/net-analyzer/ntopng-3.8 b/metadata/md5-cache/net-analyzer/ntopng-3.8
new file mode 100644
index 000000000000..571ac3aeb222
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/ntopng-3.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libsodium:= dev-libs/libxml2 dev-libs/libmaxminddb net-analyzer/rrdtool net-libs/libpcap >=net-libs/nDPI-2.4 net-misc/curl sys-libs/binutils-libs dev-db/mysql-connector-c:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Network traffic analyzer with web interface
+EAPI=6
+HOMEPAGE=https://www.ntop.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libsodium:= dev-libs/libxml2 dev-libs/libmaxminddb net-analyzer/rrdtool net-libs/libpcap >=net-libs/nDPI-2.4 net-misc/curl sys-libs/binutils-libs dev-db/mysql-connector-c:= dev-db/redis
+SLOT=0
+SRC_URI=https://github.com/ntop/ntopng/archive/3.8.tar.gz -> ntopng-3.8.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=669388f1f03ef1b8e0819a8d69c09780
diff --git a/metadata/md5-cache/net-analyzer/pypacker-4.8 b/metadata/md5-cache/net-analyzer/pypacker-4.8
new file mode 100644
index 000000000000..d60e59913e49
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/pypacker-4.8
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Fast and simple packet creation and parsing library for Python
+EAPI=7
+HOMEPAGE=https://gitlab.com/mike01/pypacker
+IUSE=examples python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://gitlab.com/mike01/pypacker/-/archive/v4.8/pypacker-v4.8.tar.gz -> pypacker-4.8.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=5fb19a6bd025d637f110d334ec29f3fb
diff --git a/metadata/md5-cache/net-analyzer/sarg-2.3.11-r2 b/metadata/md5-cache/net-analyzer/sarg-2.3.11-r2
new file mode 100644
index 000000000000..2ced4a8c4f5d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sarg-2.3.11-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=gd? ( media-libs/gd[png,truetype] ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre )
+DESCRIPTION=Squid Analysis Report Generator
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/sarg/
+IUSE=+gd ldap pcre
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=gd? ( media-libs/gd[png,truetype] ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre )
+SLOT=0
+SRC_URI=mirror://sourceforge/sarg/sarg-2.3.11.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b8ea2f4cb319d9a20ef062b260b1cb56
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.2 b/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.2
deleted file mode 100644
index 17d2642bb58c..000000000000
--- a/metadata/md5-cache/net-analyzer/speedtest-cli-2.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_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=Command line interface for testing internet bandwidth using speedtest.net
-EAPI=6
-HOMEPAGE=https://github.com/sivel/speedtest-cli
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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/sivel/speedtest-cli/archive/v2.0.2.tar.gz -> speedtest-cli-2.0.2.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b076c58de6fb82c89695c90cf55785e
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.1 b/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.1
index 3180f3079a87..0d21610ff6f2 100644
--- a/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.1
+++ b/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.1
@@ -5,11 +5,11 @@ DESCRIPTION=Command line interface for testing internet bandwidth using speedtes
 EAPI=7
 HOMEPAGE=https://github.com/sivel/speedtest-cli
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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/sivel/speedtest-cli/archive/v2.1.1.tar.gz -> speedtest-cli-2.1.1.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=baedc516daa8a6642a3f7b51f498106b
+_md5_=ba4243357ffd396bce3cf511d21de465
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.2 b/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.2
new file mode 100644
index 000000000000..938dc764b412
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Command line interface for testing internet bandwidth using speedtest.net
+EAPI=7
+HOMEPAGE=https://github.com/sivel/speedtest-cli
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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/sivel/speedtest-cli/archive/v2.1.2.tar.gz -> speedtest-cli-2.1.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=baedc516daa8a6642a3f7b51f498106b
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.9.2-r1 b/metadata/md5-cache/net-analyzer/tcpdump-4.9.2-r1
new file mode 100644
index 000000000000..4db3c710e5cb
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.9.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst preinst prepare setup test
+DEPEND=drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) ) drop-root? ( virtual/pkgconfig ) test? ( || ( app-arch/sharutils sys-freebsd/freebsd-ubin ) dev-lang/perl )
+DESCRIPTION=A Tool for network monitoring and data acquisition
+EAPI=7
+HOMEPAGE=http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump
+IUSE=+drop-root libressl smi ssl samba suid test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) )
+SLOT=0
+SRC_URI=http://www.tcpdump.org/release/tcpdump-4.9.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=ad16ca37e8d706e27c0187a1ed03116d
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-9999 b/metadata/md5-cache/net-analyzer/tcpdump-9999
index 1f60e6fdf7f5..bf0b4915a24e 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-9999
+++ b/metadata/md5-cache/net-analyzer/tcpdump-9999
@@ -1,12 +1,13 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst preinst prepare setup test unpack
-DEPEND=drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) ) drop-root? ( virtual/pkgconfig ) test? ( || ( app-arch/sharutils sys-freebsd/freebsd-ubin ) dev-lang/perl ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) ) drop-root? ( virtual/pkgconfig ) test? ( || ( app-arch/sharutils sys-freebsd/freebsd-ubin ) dev-lang/perl )
 DESCRIPTION=A Tool for network monitoring and data acquisition
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump
 IUSE=+drop-root libressl smi ssl samba suid test
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2c8ba3a217c2d577baef372ea5091d40
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=1c053607027397b608614f475fea4c7c
diff --git a/metadata/md5-cache/net-analyzer/tcpflow-1.5.2 b/metadata/md5-cache/net-analyzer/tcpflow-1.5.2
deleted file mode 100644
index 05c504b3256b..000000000000
--- a/metadata/md5-cache/net-analyzer/tcpflow-1.5.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=configure prepare
-DEPEND=dev-db/sqlite dev-lang/python:2.7= dev-libs/boost:= dev-libs/openssl:= net-libs/http-parser:= net-libs/libpcap sys-libs/libcap-ng sys-libs/zlib:= cairo? ( x11-libs/cairo ) test? ( sys-apps/coreutils )
-DESCRIPTION=A tool for monitoring, capturing and storing TCP connections flows
-EAPI=7
-HOMEPAGE=https://github.com/simsong/tcpflow
-IUSE=cairo test
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=dev-db/sqlite dev-lang/python:2.7= dev-libs/boost:= dev-libs/openssl:= net-libs/http-parser:= net-libs/libpcap sys-libs/libcap-ng sys-libs/zlib:= cairo? ( x11-libs/cairo )
-SLOT=0
-SRC_URI=https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz https://dev.gentoo.org/~jer/be13_api-20170924.tar.gz https://dev.gentoo.org/~jer/dfxml-20170921.tar.gz https://github.com/simsong/tcpflow/archive/tcpflow-1.5.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c4e09dc1b916b664d9dcc96160808eda
diff --git a/metadata/md5-cache/net-analyzer/tcpflow-1.5.2-r1 b/metadata/md5-cache/net-analyzer/tcpflow-1.5.2-r1
new file mode 100644
index 000000000000..9f939b609a35
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/tcpflow-1.5.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-db/sqlite dev-libs/boost:= dev-libs/openssl:= net-libs/http-parser:= net-libs/libpcap sys-libs/libcap-ng sys-libs/zlib:= cairo? ( x11-libs/cairo ) test? ( sys-apps/coreutils )
+DESCRIPTION=A tool for monitoring, capturing and storing TCP connections flows
+EAPI=7
+HOMEPAGE=https://github.com/simsong/tcpflow
+IUSE=cairo test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-db/sqlite dev-libs/boost:= dev-libs/openssl:= net-libs/http-parser:= net-libs/libpcap sys-libs/libcap-ng sys-libs/zlib:= cairo? ( x11-libs/cairo )
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz https://dev.gentoo.org/~jer/be13_api-20170924.tar.gz https://dev.gentoo.org/~jer/dfxml-20170921.tar.gz https://github.com/simsong/tcpflow/archive/tcpflow-1.5.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=5c995e2d71f60a2387db242a538267c8
diff --git a/metadata/md5-cache/net-analyzer/tcpstat-1.5-r3 b/metadata/md5-cache/net-analyzer/tcpstat-1.5-r3
new file mode 100644
index 000000000000..7f95fc779fff
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/tcpstat-1.5-r3
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=net-libs/libpcap
+DESCRIPTION=Reports network interface statistics
+EAPI=7
+HOMEPAGE=https://www.frenchfries.net/paul/tcpstat/
+IUSE=ipv6
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=net-libs/libpcap
+SLOT=0
+SRC_URI=https://www.frenchfries.net/paul/tcpstat/tcpstat-1.5.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=30bf4b5368328dba8f3d82f7b04ea72f
diff --git a/metadata/md5-cache/net-analyzer/telegraf-1.10.4 b/metadata/md5-cache/net-analyzer/telegraf-1.10.4
index 3e015e2c509a..0b856cece837 100644
--- a/metadata/md5-cache/net-analyzer/telegraf-1.10.4
+++ b/metadata/md5-cache/net-analyzer/telegraf-1.10.4
@@ -1,5 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare setup
+DEPEND=dev-lang/go
 DESCRIPTION=The plugin-driven server agent for collecting & reporting metrics.
 EAPI=7
 HOMEPAGE=https://github.com/influxdata/telegraf
@@ -9,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/influxdata/telegraf/archive/1.10.4.tar.gz -> telegraf-1.10.4.tar.gz https://dev.gentoo.org/~williamh/dist/telegraf-1.10.4-vendor.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=abe6573753d0cf9a5f06823f5506bdc4
+_md5_=5fd0f2befd1b3c8c4ab4975a734a49f1
diff --git a/metadata/md5-cache/net-analyzer/vnstat-2.2 b/metadata/md5-cache/net-analyzer/vnstat-2.2
deleted file mode 100644
index 1fb4fb74bce7..000000000000
--- a/metadata/md5-cache/net-analyzer/vnstat-2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install setup
-DEPEND=dev-db/sqlite gd? ( media-libs/gd[png] ) test? ( dev-libs/check )
-DESCRIPTION=Console-based network traffic monitor that keeps statistics of network usage
-EAPI=7
-HOMEPAGE=https://humdi.net/vnstat/
-IUSE=gd selinux test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-db/sqlite gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
-SLOT=0
-SRC_URI=https://humdi.net/vnstat/vnstat-2.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=f01c21d9c9649d1c79cbb1cfeb5017dc
diff --git a/metadata/md5-cache/net-analyzer/vnstat-2.4 b/metadata/md5-cache/net-analyzer/vnstat-2.4
new file mode 100644
index 000000000000..47e43b12c5bf
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/vnstat-2.4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install setup
+DEPEND=dev-db/sqlite gd? ( media-libs/gd[png] ) test? ( dev-libs/check )
+DESCRIPTION=Console-based network traffic monitor that keeps statistics of network usage
+EAPI=7
+HOMEPAGE=https://humdi.net/vnstat/
+IUSE=gd selinux test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
+SLOT=0
+SRC_URI=https://humdi.net/vnstat/vnstat-2.4.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=3ca9ed9a38879c4ff4456868525074a1
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.6.7 b/metadata/md5-cache/net-analyzer/wireshark-2.6.7
deleted file mode 100644
index b86eaabc0dbf..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-2.6.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) filecaps? ( sys-libs/libcap ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 filecaps? ( sys-libs/libcap )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=6
-HOMEPAGE=https://www.wireshark.org/
-IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
-KEYWORDS=alpha amd64 arm hppa ia64 ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) filecaps? ( sys-libs/libcap ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-SLOT=0/2.6.7
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.6.7.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e776a928c7104ef168425b1bf5df4a28
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.0.1 b/metadata/md5-cache/net-analyzer/wireshark-3.0.1
index 46ef952a384e..af185d396a24 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.0.1
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=6
 HOMEPAGE=https://www.wireshark.org/
 IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark +udpdump zlib +filecaps python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86
+KEYWORDS=arm
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) netlink? ( dev-libs/libnl:3 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0/3.0.1
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.0.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1dc6a2f56ae81c63eff1379cf59209c
+_md5_=66dc3008fdedd06e297be22ae68ced6f
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.0.2 b/metadata/md5-cache/net-analyzer/wireshark-3.0.2
deleted file mode 100644
index ef22e534e78b..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-3.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) netlink? ( dev-libs/libnl:3 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<perl-core/Pod-Simple-3.170 !<virtual/perl-Pod-Simple-3.170 dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/make >=dev-util/cmake-3.9.6 filecaps? ( sys-libs/libcap )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=6
-HOMEPAGE=https://www.wireshark.org/
-IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark +udpdump zlib +filecaps python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) netlink? ( dev-libs/libnl:3 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0/3.0.2
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.0.2.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=09f0faeab4ef14e98ccbe72e64028cee
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.0.3 b/metadata/md5-cache/net-analyzer/wireshark-3.0.3
index a63218b8a5cb..e23404f867c1 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.0.3
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.0.3
@@ -5,11 +5,11 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=7
 HOMEPAGE=https://www.wireshark.org/
 IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark +udpdump zlib +filecaps python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) netlink? ( dev-libs/libnl:3 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0/3.0.3
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.0.3.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8a3554702f87cb72dda96f2af35846c
+_md5_=28a454a9fc90ee4dcfcf2493693a697e
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.16 b/metadata/md5-cache/net-analyzer/zabbix-2.2.16
deleted file mode 100644
index 117577d01cde..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-2.2.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=66e1982bc86bedcc8431e19bd65cb8cf
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.16-r1 b/metadata/md5-cache/net-analyzer/zabbix-2.2.16-r1
new file mode 100644
index 000000000000..f5cf28ec4878
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.2.16-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-2.2.16.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=a002b40a6c841c73c967c7bdb5166b76
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.21 b/metadata/md5-cache/net-analyzer/zabbix-2.2.21
deleted file mode 100644
index 34089969c81f..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-2.2.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=16410f8ce332f16d18f35ea383d8776d
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.21-r1 b/metadata/md5-cache/net-analyzer/zabbix-2.2.21-r1
new file mode 100644
index 000000000000..a3018701e038
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.2.21-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-2.2.21.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=274df8cf3534b3b02f9da9171de7272e
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.23 b/metadata/md5-cache/net-analyzer/zabbix-2.2.23
deleted file mode 100644
index eeb61ecc8d06..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-2.2.23.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=16410f8ce332f16d18f35ea383d8776d
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.23-r1 b/metadata/md5-cache/net-analyzer/zabbix-2.2.23-r1
new file mode 100644
index 000000000000..984ff8fbb91b
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.2.23-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-2.2.23.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=274df8cf3534b3b02f9da9171de7272e
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.2.11 b/metadata/md5-cache/net-analyzer/zabbix-3.2.11
deleted file mode 100644
index 4227901fe3fb..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.2.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.2.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=19f7292023cc7bba28a0817cdbbc7b62
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.2.11-r1 b/metadata/md5-cache/net-analyzer/zabbix-3.2.11-r1
new file mode 100644
index 000000000000..dfd2d7bfc389
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.2.11-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.2.11.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=9af00fabd642b9be1fa20fd82af48ae4
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index c885c5f83fcc..67750b772da7 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.14.4 b/metadata/md5-cache/net-dns/bind-9.14.4
index 2798327575b2..abdf4c03d5cb 100644
--- a/metadata/md5-cache/net-dns/bind-9.14.4
+++ b/metadata/md5-cache/net-dns/bind-9.14.4
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) 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 ) 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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) 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 ) 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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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=Berkeley Internet Name Domain - Name Server
 EAPI=7
 HOMEPAGE=https://www.isc.org/software/bind
-IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi json ldap libressl lmdb mysql odbc postgres python selinux ssl static-libs urandom xml +zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) 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 ) 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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-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 )
+RDEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) 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 ) 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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-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 )
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.14.4/bind-9.14.4.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=708d779c99156687324f30773babbdc4
+_md5_=09eb28187e2ab7c10f263bdfee14ba01
diff --git a/metadata/md5-cache/net-dns/bind-9.14.5 b/metadata/md5-cache/net-dns/bind-9.14.5
new file mode 100644
index 000000000000..59ff6dbfb39c
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-9.14.5
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=config configure install postinst prepare setup
+DEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) 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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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=Berkeley Internet Name Domain - Name Server
+EAPI=7
+HOMEPAGE=https://www.isc.org/software/bind
+IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) 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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-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 )
+REQUIRED_USE=?? ( geoip geoip2 ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.14.5/bind-9.14.5.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=b8a6a1a0a5ebddd98ba5be58319ce981
diff --git a/metadata/md5-cache/net-dns/bind-9.15.2 b/metadata/md5-cache/net-dns/bind-9.15.2
index 4bece849f44e..2eba05291cd2 100644
--- a/metadata/md5-cache/net-dns/bind-9.15.2
+++ b/metadata/md5-cache/net-dns/bind-9.15.2
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) 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 ) 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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) 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 ) 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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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=Berkeley Internet Name Domain - Name Server
 EAPI=7
 HOMEPAGE=https://www.isc.org/software/bind
-IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi json ldap libressl lmdb mysql odbc postgres python selinux ssl static-libs urandom xml +zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 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? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) 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 ) 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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-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 )
+RDEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) 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 ) 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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-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 )
 REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.15.2/bind-9.15.2.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=9afce65d62551dd2d53bf3529add0467
+_md5_=10b0e769a985125c1be815196e9e8073
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.14.4 b/metadata/md5-cache/net-dns/bind-tools-9.14.4
index 785b784c98be..aac93ecd97d3 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.14.4
+++ b/metadata/md5-cache/net-dns/bind-tools-9.14.4
@@ -1,15 +1,15 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) virtual/pkgconfig
+DEPEND=caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) )
 DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=7
 HOMEPAGE=https://www.isc.org/software/bind
-IUSE=doc gssapi idn ipv6 libedit libressl readline ssl xml
+IUSE=+caps doc gssapi idn ipv6 libedit libressl readline xml
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) !<net-dns/bind-9.10.2
+RDEPEND=!<net-dns/bind-9.10.2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.14.4/bind-9.14.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c485e297093cfe5b879baf3a6c70d242
+_md5_=c165b840ce3ad9fe0bedb2750e866133
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.14.5 b/metadata/md5-cache/net-dns/bind-tools-9.14.5
new file mode 100644
index 000000000000..94bfa659f61b
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-tools-9.14.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) )
+DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
+EAPI=7
+HOMEPAGE=https://www.isc.org/software/bind
+IUSE=+caps doc gssapi idn ipv6 libedit libressl readline xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=!<net-dns/bind-9.10.2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.14.5/bind-9.14.5.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f65604ab863cdd8eff3b16e6325f42e3
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.15.2 b/metadata/md5-cache/net-dns/bind-tools-9.15.2
index baea6bf3f501..2427e6a27d6c 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.15.2
+++ b/metadata/md5-cache/net-dns/bind-tools-9.15.2
@@ -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
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) virtual/pkgconfig
+DEPEND=caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) )
 DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=7
 HOMEPAGE=https://www.isc.org/software/bind
-IUSE=doc gssapi idn ipv6 libedit libressl readline ssl xml
+IUSE=+caps doc gssapi idn ipv6 libedit libressl readline xml
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) !<net-dns/bind-9.10.2
+RDEPEND=caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) !<net-dns/bind-9.10.2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.15.2/bind-9.15.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d66077ac60208eafe9f570e5a1dc591a
+_md5_=79a8f09f73624d271b756b6125480907
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.80-r1 b/metadata/md5-cache/net-dns/dnsmasq-2.80-r1
index cc8904a7c2e9..3fbd3e6cc0e1 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.80-r1
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.80-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.80.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=8fec4194a9a2f239c046cdbef4c030d3
+_md5_=bf4c26bd4dc500fe3fe849d69eaf8ced
diff --git a/metadata/md5-cache/net-dns/knot-2.7.8 b/metadata/md5-cache/net-dns/knot-2.7.8
new file mode 100644
index 000000000000..646ded991c64
--- /dev/null
+++ b/metadata/md5-cache/net-dns/knot-2.7.8
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=High-performance authoritative-only DNS server
+EAPI=7
+HOMEPAGE=https://www.knot-dns.cz/
+IUSE=doc caps +fastparser idn +libidn2 systemd +utils +cookies +dnsproxy dnstap geoip +noudp +onlinesign +queryacl +rrl +stats +synthrecord +whoami
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
+SLOT=0
+SRC_URI=https://secure.nic.cz/files/knot-dns/knot-2.7.8.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=1a94150583d5d801615a44721a3743ef
diff --git a/metadata/md5-cache/net-dns/knot-2.8.3 b/metadata/md5-cache/net-dns/knot-2.8.3
new file mode 100644
index 000000000000..e815eb7eee8b
--- /dev/null
+++ b/metadata/md5-cache/net-dns/knot-2.8.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=High-performance authoritative-only DNS server
+EAPI=7
+HOMEPAGE=https://www.knot-dns.cz/
+IUSE=doc caps +fastparser idn +libidn2 systemd +utils +cookies +dnsproxy dnstap geoip +noudp +onlinesign +queryacl +rrl +stats +synthrecord +whoami
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
+SLOT=0
+SRC_URI=https://secure.nic.cz/files/knot-dns/knot-2.8.3.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=1a94150583d5d801615a44721a3743ef
diff --git a/metadata/md5-cache/net-dns/nsd-4.2.0 b/metadata/md5-cache/net-dns/nsd-4.2.0
deleted file mode 100644
index dc35f2e7bc58..000000000000
--- a/metadata/md5-cache/net-dns/nsd-4.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc systemd? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd )
-DESCRIPTION=An authoritative only, high performance, open source name server
-EAPI=7
-HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
-IUSE=bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.2.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=ce65d51be1309ff5e6b2df7d5b54f091
diff --git a/metadata/md5-cache/net-dns/nsd-4.2.1 b/metadata/md5-cache/net-dns/nsd-4.2.1
deleted file mode 100644
index 3fae7ef7e5be..000000000000
--- a/metadata/md5-cache/net-dns/nsd-4.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc systemd? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd )
-DESCRIPTION=An authoritative only, high performance, open source name server
-EAPI=7
-HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
-IUSE=bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.2.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=ce65d51be1309ff5e6b2df7d5b54f091
diff --git a/metadata/md5-cache/net-dns/nsd-4.2.2 b/metadata/md5-cache/net-dns/nsd-4.2.2
new file mode 100644
index 000000000000..c61479bf0034
--- /dev/null
+++ b/metadata/md5-cache/net-dns/nsd-4.2.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/flex virtual/yacc systemd? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd )
+DESCRIPTION=An authoritative only, high performance, open source name server
+EAPI=7
+HOMEPAGE=http://www.nlnetlabs.nl/projects/nsd
+IUSE=bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=acct-group/nsd acct-user/nsd dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd )
+SLOT=0
+SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.2.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=76dfa8028152448c8682c20636435aba
diff --git a/metadata/md5-cache/net-dns/pdns-4.1.13 b/metadata/md5-cache/net-dns/pdns-4.1.13
index b92aa61f1e7e..7f700e00abc0 100644
--- a/metadata/md5-cache/net-dns/pdns-4.1.13
+++ b/metadata/md5-cache/net-dns/pdns-4.1.13
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install postinst preinst
-DEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( dev-libs/botan:2= ) lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
+DEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( dev-libs/botan:2= ) lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
 DESCRIPTION=The PowerDNS Daemon
 EAPI=7
 HOMEPAGE=https://www.powerdns.com/
 IUSE=botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( dev-libs/botan:2= ) lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
+RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( dev-libs/botan:2= ) lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
 REQUIRED_USE=mydns? ( mysql )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-4.1.13.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=fa42c706a55766b1237f2eff51525447
+_md5_=520dcba650aaff8694af6af1df069081
diff --git a/metadata/md5-cache/net-dns/pdns-4.2.0 b/metadata/md5-cache/net-dns/pdns-4.2.0
new file mode 100644
index 000000000000..42463a9105bb
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-4.2.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install postinst preinst
+DEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
+DESCRIPTION=The PowerDNS Daemon
+EAPI=7
+HOMEPAGE=https://www.powerdns.com/
+IUSE=debug doc geoip ldap libressl lua luajit lua-records mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
+REQUIRED_USE=lua-records? ( lua ) mydns? ( mysql )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-4.2.0.tar.bz2
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=3180810ac1e60d518509939f5375aa31
diff --git a/metadata/md5-cache/net-dns/pdns-4.2.0_rc3 b/metadata/md5-cache/net-dns/pdns-4.2.0_rc3
deleted file mode 100644
index 869849d6a73d..000000000000
--- a/metadata/md5-cache/net-dns/pdns-4.2.0_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install postinst preinst
-DEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
-DESCRIPTION=The PowerDNS Daemon
-EAPI=7
-HOMEPAGE=https://www.powerdns.com/
-IUSE=debug doc geoip ldap libressl lua luajit lua-records mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test
-LICENSE=GPL-2
-RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= lua? ( !luajit? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
-REQUIRED_USE=lua-records? ( lua ) mydns? ( mysql )
-SLOT=0
-SRC_URI=https://downloads.powerdns.com/releases/pdns-4.2.0-rc3.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=83bf04b1191497375c390af071ca98d9
diff --git a/metadata/md5-cache/net-dns/unbound-1.9.3 b/metadata/md5-cache/net-dns/unbound-1.9.3
new file mode 100644
index 000000000000..72c920c227be
--- /dev/null
+++ b/metadata/md5-cache/net-dns/unbound-1.9.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) redis? ( dev-libs/hiredis:= ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) systemd? ( sys-apps/systemd )
+DESCRIPTION=A validating, recursive and caching DNS resolver
+EAPI=7
+HOMEPAGE=https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/
+IUSE=debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=BSD GPL-2
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+SLOT=0/8
+SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.9.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=d355b12926cb10276156179fc0e8bc0d
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 094a9ea88cb4..2c1f4e5441b8 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.2 b/metadata/md5-cache/net-firewall/nftables-0.9.2
new file mode 100644
index 000000000000..02487adaad3e
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.2
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-text/asciidoc ) >=app-text/docbook2X-0.8.8-r4 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
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.4:0= xtables? ( >=net-firewall/iptables-1.6.1 )
+DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=debug +doc +gmp json +modern_kernel python +readline static-libs xtables kernel_linux python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.4:0= xtables? ( >=net-firewall/iptables-1.6.1 )
+REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=https://netfilter.org/projects/nftables/files/nftables-0.9.2.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0bd95287f3296c2c79057b572f321fab
diff --git a/metadata/md5-cache/net-firewall/nufw-2.2.22-r1 b/metadata/md5-cache/net-firewall/nufw-2.2.22-r1
deleted file mode 100644
index f2c22efde46e..000000000000
--- a/metadata/md5-cache/net-firewall/nufw-2.2.22-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:0 dev-python/ipy net-firewall/iptables net-libs/gnutls ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) nfconntrack? ( net-libs/libnetfilter_conntrack ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql[server] ) prelude? ( dev-libs/libprelude ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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-libs/openssl:0 dev-libs/libressl:0 )
-DESCRIPTION=An enterprise grade authenticating firewall based on netfilter
-EAPI=5
-HOMEPAGE=http://www.nufw.org/
-IUSE=debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:0 dev-python/ipy net-firewall/iptables net-libs/gnutls ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) nfconntrack? ( net-libs/libnetfilter_conntrack ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql[server] ) prelude? ( dev-libs/libprelude )
-REQUIRED_USE=pam_nuauth? ( plaintext )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.nufw.org/attachments/download/39/nufw-2.2.22.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2ca1b31582d3b6213602f832e99d4cc
diff --git a/metadata/md5-cache/net-firewall/nufw-2.2.22-r2 b/metadata/md5-cache/net-firewall/nufw-2.2.22-r2
deleted file mode 100644
index 4c4086663ec8..000000000000
--- a/metadata/md5-cache/net-firewall/nufw-2.2.22-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:0 dev-python/ipy net-firewall/iptables net-libs/gnutls ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) nfconntrack? ( net-libs/libnetfilter_conntrack ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql:*[server] ) prelude? ( dev-libs/libprelude ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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-libs/openssl:0 dev-libs/libressl:0 )
-DESCRIPTION=An enterprise grade authenticating firewall based on netfilter
-EAPI=6
-HOMEPAGE=http://www.nufw.org/
-IUSE=debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:0 dev-python/ipy net-firewall/iptables net-libs/gnutls ldap? ( >=net-nds/openldap-2 ) mysql? ( virtual/mysql ) nfconntrack? ( net-libs/libnetfilter_conntrack ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql:*[server] ) prelude? ( dev-libs/libprelude )
-REQUIRED_USE=pam_nuauth? ( plaintext )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.nufw.org/attachments/download/39/nufw-2.2.22.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=008435af3d072783c44a1513099ec716
diff --git a/metadata/md5-cache/net-firewall/nufw-2.2.22-r3 b/metadata/md5-cache/net-firewall/nufw-2.2.22-r3
new file mode 100644
index 000000000000..b4295405fefe
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nufw-2.2.22-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:0 dev-python/ipy net-firewall/iptables net-libs/gnutls ldap? ( >=net-nds/openldap-2 ) mysql? ( dev-db/mysql-connector-c ) nfconntrack? ( net-libs/libnetfilter_conntrack ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql:*[server] ) prelude? ( dev-libs/libprelude ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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-libs/openssl:0 dev-libs/libressl:0 )
+DESCRIPTION=An enterprise grade authenticating firewall based on netfilter
+EAPI=6
+HOMEPAGE=http://www.nufw.org/
+IUSE=debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test
+KEYWORDS=~amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/cyrus-sasl dev-libs/glib:2 dev-libs/libgcrypt:0 dev-python/ipy net-firewall/iptables net-libs/gnutls ldap? ( >=net-nds/openldap-2 ) mysql? ( dev-db/mysql-connector-c ) nfconntrack? ( net-libs/libnetfilter_conntrack ) nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue ) pam? ( sys-libs/pam ) pam_nuauth? ( sys-libs/pam ) postgres? ( dev-db/postgresql:*[server] ) prelude? ( dev-libs/libprelude )
+REQUIRED_USE=pam_nuauth? ( plaintext )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.nufw.org/attachments/download/39/nufw-2.2.22.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f37cfd8b21c490f37889a51ef5118cad
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.3.4 b/metadata/md5-cache/net-firewall/shorewall-5.2.3.4
new file mode 100644
index 000000000000..db0d0de520b1
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.3.4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DESCRIPTION=A high-level tool for configuring Netfilter
+EAPI=7
+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.3/shorewall-core-5.2.3.4.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-5.2.3.4.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall6-5.2.3.4.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-lite-5.2.3.4.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall6-lite-5.2.3.4.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-init-5.2.3.4.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-docs-html-5.2.3.4.tar.bz2 )
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=392b60c4f879198be8624a4f73de9349
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index b478ad8c56fb..4c8e1edee3ef 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/autofs-5.1.2 b/metadata/md5-cache/net-fs/autofs-5.1.2
deleted file mode 100644
index 12425be4c600..000000000000
--- a/metadata/md5-cache/net-fs/autofs-5.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) sys-devel/flex virtual/yacc libtirpc? ( net-libs/rpcsvc-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 virtual/pkgconfig
-DESCRIPTION=Kernel based automounter
-EAPI=5
-HOMEPAGE=http://www.linux-consulting.com/Amd_AutoFS/autofs.html
-IUSE=-dmalloc ldap +libtirpc mount-locking sasl kernel_linux
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-REQUIRED_USE=sasl? ( ldap )
-SLOT=0
-SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.1.2.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=da3fe160c9f1208fe299937994fd4f46
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.3 b/metadata/md5-cache/net-fs/autofs-5.1.3
deleted file mode 100644
index 244401dce377..000000000000
--- a/metadata/md5-cache/net-fs/autofs-5.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) sys-devel/flex virtual/yacc libtirpc? ( net-libs/rpcsvc-proto ) virtual/pkgconfig
-DESCRIPTION=Kernel based automounter
-EAPI=6
-HOMEPAGE=http://www.linux-consulting.com/Amd_AutoFS/autofs.html
-IUSE=-dmalloc ldap +libtirpc mount-locking sasl kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-REQUIRED_USE=sasl? ( ldap )
-SLOT=0
-SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.1.3.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7d2cb2dd161cc50eea4043ce6cd6d684
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.4 b/metadata/md5-cache/net-fs/autofs-5.1.4
deleted file mode 100644
index 5d0bfc278ad8..000000000000
--- a/metadata/md5-cache/net-fs/autofs-5.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) sys-devel/flex virtual/yacc libtirpc? ( net-libs/rpcsvc-proto ) virtual/pkgconfig
-DESCRIPTION=Kernel based automounter
-EAPI=6
-HOMEPAGE=http://www.linux-consulting.com/Amd_AutoFS/autofs.html
-IUSE=-dmalloc ldap +libtirpc mount-locking sasl kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-REQUIRED_USE=sasl? ( ldap )
-SLOT=0
-SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.1.4.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7d2cb2dd161cc50eea4043ce6cd6d684
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.5-r1 b/metadata/md5-cache/net-fs/autofs-5.1.5-r1
deleted file mode 100644
index 45f18fd08360..000000000000
--- a/metadata/md5-cache/net-fs/autofs-5.1.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) systemd? ( sys-apps/systemd ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) sys-devel/flex virtual/yacc libtirpc? ( net-libs/rpcsvc-proto )
-DESCRIPTION=Kernel based automounter
-EAPI=7
-HOMEPAGE=http://www.linux-consulting.com/Amd_AutoFS/autofs.html
-IUSE=-dmalloc ldap +libtirpc mount-locking sasl systemd kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) systemd? ( sys-apps/systemd ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-REQUIRED_USE=sasl? ( ldap )
-SLOT=0
-SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.1.5.tar.xz
-_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d381aa61829f866943ae62da24bb44f3
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.5-r2 b/metadata/md5-cache/net-fs/autofs-5.1.5-r2
index 73404b7b7808..19fe737b231a 100644
--- a/metadata/md5-cache/net-fs/autofs-5.1.5-r2
+++ b/metadata/md5-cache/net-fs/autofs-5.1.5-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Kernel based automounter
 EAPI=7
 HOMEPAGE=https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html
 IUSE=-dmalloc ldap +libtirpc mount-locking sasl systemd kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) systemd? ( sys-apps/systemd ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
 SLOT=0
 SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.1.5.tar.xz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f55dfc9d0117dfadf8ba1bfb765d4bcf
+_md5_=567752cccb37aebd3628cd7cd616c3a3
diff --git a/metadata/md5-cache/net-fs/minio-2019.08.21.19.40.07 b/metadata/md5-cache/net-fs/minio-2019.08.21.19.40.07
new file mode 100644
index 000000000000..c4b1d5aa4434
--- /dev/null
+++ b/metadata/md5-cache/net-fs/minio-2019.08.21.19.40.07
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare setup test unpack
+DESCRIPTION=An Amazon S3 compatible object storage server
+EAPI=7
+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-08-21T19-40-07Z.tar.gz -> minio-2019.08.21.19.40.07.tar.gz https://github.com/go-yaml/yaml/archive/51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz -> github.com-go-yaml-yaml-51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz https://github.com/olivere/elastic/archive/f72acaba629a7ec879103d17b7426a31bc38e199.tar.gz -> github.com-olivere-elastic-f72acaba629a7ec879103d17b7426a31bc38e199.tar.gz https://github.com/Shopify/sarama/archive/879f631812a30a580659e8035e7cda9994bb99ac.tar.gz -> github.com-Shopify-sarama-879f631812a30a580659e8035e7cda9994bb99ac.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/golang/time/archive/9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz -> github.com-golang-time-9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz https://github.com/golang/sys/archive/81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz -> github.com-golang-sys-81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz https://github.com/golang/net/archive/eb5bcb51f2a31c7d5141d810b70815c05d9c9146.tar.gz -> github.com-golang-net-eb5bcb51f2a31c7d5141d810b70815c05d9c9146.tar.gz https://github.com/golang/text/archive/e3703dcdd614d2d7488fff034c75c551ea25da95.tar.gz -> github.com-golang-text-e3703dcdd614d2d7488fff034c75c551ea25da95.tar.gz https://github.com/golang/crypto/archive/38d8ce5564a5b71b2e3a00553993f1b9a7ae852f.tar.gz -> github.com-golang-crypto-38d8ce5564a5b71b2e3a00553993f1b9a7ae852f.tar.gz https://github.com/uber-go/atomic/archive/1ea20fb1cbb1cc08cbd0d913a96dead89aa18289.tar.gz -> github.com-uber-go-atomic-1ea20fb1cbb1cc08cbd0d913a96dead89aa18289.tar.gz https://github.com/valyala/tcplisten/archive/ceec8f93295a060cdb565ec25e4ccf17941dbd55.tar.gz -> github.com-valyala-tcplisten-ceec8f93295a060cdb565ec25e4ccf17941dbd55.tar.gz https://github.com/googleapis/google-cloud-go/archive/a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4.tar.gz -> github.com-googleapis-google-cloud-go-a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4.tar.gz https://github.com/tidwall/sjson/archive/25fb082a20e29e83fb7b7ef5f5919166aad1f084.tar.gz -> github.com-tidwall-sjson-25fb082a20e29e83fb7b7ef5f5919166aad1f084.tar.gz https://github.com/tidwall/gjson/archive/eee0b6226f0d1db2675a176fdfaa8419bcad4ca8.tar.gz -> github.com-tidwall-gjson-eee0b6226f0d1db2675a176fdfaa8419bcad4ca8.tar.gz https://github.com/tidwall/pretty/archive/1166b9ac2b65e46a43d8618d30d1554f4652d49b.tar.gz -> github.com-tidwall-pretty-1166b9ac2b65e46a43d8618d30d1554f4652d49b.tar.gz https://github.com/tidwall/match/archive/33827db735fff6510490d69a8622612558a557ed.tar.gz -> github.com-tidwall-match-33827db735fff6510490d69a8622612558a557ed.tar.gz https://github.com/streadway/amqp/archive/14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688.tar.gz -> github.com-streadway-amqp-14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688.tar.gz https://github.com/skyrings/skyring-common/archive/d1c0bb1cbd5ed8438be1385c85c4f494608cde1e.tar.gz -> github.com-skyrings-skyring-common-d1c0bb1cbd5ed8438be1385c85c4f494608cde1e.tar.gz https://github.com/segmentio/go-prompt/archive/f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz -> github.com-segmentio-go-prompt-f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz https://github.com/rs/cors/archive/9a47f48565a795472d43519dd49aac781f3034fb.tar.gz -> github.com-rs-cors-9a47f48565a795472d43519dd49aac781f3034fb.tar.gz https://github.com/rjeczalik/notify/archive/69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz -> github.com-rjeczalik-notify-69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz https://github.com/rcrowley/go-metrics/archive/3113b8401b8a98917cde58f8bbd42a1b1c03b1fd.tar.gz -> github.com-rcrowley-go-metrics-3113b8401b8a98917cde58f8bbd42a1b1c03b1fd.tar.gz https://github.com/prometheus/client_golang/archive/505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz -> github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz https://github.com/prometheus/procfs/archive/55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352.tar.gz -> github.com-prometheus-procfs-55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352.tar.gz https://github.com/prometheus/common/archive/5df5c82edb7502fd6cbe093223a19b6e1231494f.tar.gz -> github.com-prometheus-common-5df5c82edb7502fd6cbe093223a19b6e1231494f.tar.gz https://github.com/prometheus/client_model/archive/fd36f4220a901265f90734c3183c5f0c91daa0b8.tar.gz -> github.com-prometheus-client_model-fd36f4220a901265f90734c3183c5f0c91daa0b8.tar.gz https://github.com/pkg/profile/archive/f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz -> github.com-pkg-profile-f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz https://github.com/pkg/errors/archive/ba968bfe8b2f7e042a574c888954fccecfa385b4.tar.gz -> github.com-pkg-errors-ba968bfe8b2f7e042a574c888954fccecfa385b4.tar.gz https://github.com/pierrec/lz4/archive/315a67e90e415bcdaff33057da191569bf4d8479.tar.gz -> github.com-pierrec-lz4-315a67e90e415bcdaff33057da191569bf4d8479.tar.gz https://github.com/nsqio/go-nsq/archive/eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz -> github.com-nsqio-go-nsq-eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz https://github.com/nats-io/nats/archive/70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz -> github.com-nats-io-nats-70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz https://github.com/nats-io/nuid/archive/3024a71c3cbe30667286099921591e6fcc328230.tar.gz -> github.com-nats-io-nuid-3024a71c3cbe30667286099921591e6fcc328230.tar.gz https://github.com/nats-io/nkeys/archive/1546a3320a8f195a5b5c84aef8309377c2e411d5.tar.gz -> github.com-nats-io-nkeys-1546a3320a8f195a5b5c84aef8309377c2e411d5.tar.gz https://github.com/nats-io/go-nats/archive/70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz -> github.com-nats-io-go-nats-70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz https://github.com/nats-io/go-nats-streaming/archive/4366d43a0648b4997ed32080f937e8702ab86c48.tar.gz -> github.com-nats-io-go-nats-streaming-4366d43a0648b4997ed32080f937e8702ab86c48.tar.gz https://github.com/Azure/azure-sdk-for-go/archive/d659f2a91175cac99aa5627d09b83026eacc978d.tar.gz -> github.com-Azure-azure-sdk-for-go-d659f2a91175cac99aa5627d09b83026eacc978d.tar.gz https://github.com/Azure/go-autorest/archive/3b1641ed03046f2ee28d73f7a51e5b884d55b92a.tar.gz -> github.com-Azure-go-autorest-3b1641ed03046f2ee28d73f7a51e5b884d55b92a.tar.gz https://github.com/DataDog/zstd/archive/c7161f8c63c045cbc7ca051dcc969dd0e4054de2.tar.gz -> github.com-DataDog-zstd-c7161f8c63c045cbc7ca051dcc969dd0e4054de2.tar.gz https://github.com/mailru/easyjson/archive/1ea4449da9834f4d333f1cc461c374aea217d249.tar.gz -> github.com-mailru-easyjson-1ea4449da9834f4d333f1cc461c374aea217d249.tar.gz https://github.com/gorilla/mux/archive/a7962380ca08b5a188038c69871b8d3fbdf31e89.tar.gz -> github.com-gorilla-mux-a7962380ca08b5a188038c69871b8d3fbdf31e89.tar.gz https://github.com/coredns/coredns/archive/8dcc7fccd74454134b33c8bc9f780ed6d7f076cf.tar.gz -> github.com-coredns-coredns-8dcc7fccd74454134b33c8bc9f780ed6d7f076cf.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz https://github.com/eapache/go-resiliency/archive/842e16ec2c98ef0c59eebfe60d2d3500a793ba19.tar.gz -> github.com-eapache-go-resiliency-842e16ec2c98ef0c59eebfe60d2d3500a793ba19.tar.gz https://github.com/minio/minio-go/archive/5325257a208fc630aaaac31bc00789acbc998c14.tar.gz -> github.com-minio-minio-go-5325257a208fc630aaaac31bc00789acbc998c14.tar.gz https://github.com/alecthomas/participle/archive/98cb121381c371cf1542c7ae145e485d703aec0b.tar.gz -> github.com-alecthomas-participle-98cb121381c371cf1542c7ae145e485d703aec0b.tar.gz https://github.com/aliyun/aliyun-oss-go-sdk/archive/86c17b95fcd5db33628a61e492fb4a1a937d5906.tar.gz -> github.com-aliyun-aliyun-oss-go-sdk-86c17b95fcd5db33628a61e492fb4a1a937d5906.tar.gz https://github.com/bcicen/jstream/archive/16c1f8af81c2a9967b30d365a29472126274f998.tar.gz -> github.com-bcicen-jstream-16c1f8af81c2a9967b30d365a29472126274f998.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/cheggaaa/pb/archive/f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz -> github.com-cheggaaa-pb-f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz https://github.com/gogo/protobuf/archive/382325bbbb4d1c850eec1f3ec92a1a16f502d68b.tar.gz -> github.com-gogo-protobuf-382325bbbb4d1c850eec1f3ec92a1a16f502d68b.tar.gz https://github.com/davecgh/go-spew/archive/d8f796af33cc11cb798c1aaeb27a4ebc5099927d.tar.gz -> github.com-davecgh-go-spew-d8f796af33cc11cb798c1aaeb27a4ebc5099927d.tar.gz https://github.com/inconshreveable/go-update/archive/8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz -> github.com-inconshreveable-go-update-8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/mitchellh/go-homedir/archive/af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz -> github.com-mitchellh-go-homedir-af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz https://github.com/klauspost/pgzip/archive/083b1c3f84dd6486588802e5ce295de3a7f41a8b.tar.gz -> github.com-klauspost-pgzip-083b1c3f84dd6486588802e5ce295de3a7f41a8b.tar.gz https://github.com/marstr/guid/archive/8bd9a64bf37eb297b492a4101fb28e80ac0b290f.tar.gz -> github.com-marstr-guid-8bd9a64bf37eb297b492a4101fb28e80ac0b290f.tar.gz https://github.com/coreos/etcd/archive/d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9.tar.gz -> github.com-coreos-etcd-d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9.tar.gz https://github.com/dgrijalva/jwt-go/archive/06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz -> github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz https://github.com/gorilla/rpc/archive/bffcfa752ad4e523cc8f720afeb5b985ed41ae16.tar.gz -> github.com-gorilla-rpc-bffcfa752ad4e523cc8f720afeb5b985ed41ae16.tar.gz https://github.com/djherbis/atime/archive/8e47e0e01d08df8b9f840d74299c8ab70a024a30.tar.gz -> github.com-djherbis-atime-8e47e0e01d08df8b9f840d74299c8ab70a024a30.tar.gz https://github.com/dustin/go-humanize/archive/9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz -> github.com-dustin-go-humanize-9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz https://github.com/eapache/go-xerial-snappy/archive/776d5712da21bc4762676d614db1d8a64f4238b0.tar.gz -> github.com-eapache-go-xerial-snappy-776d5712da21bc4762676d614db1d8a64f4238b0.tar.gz https://github.com/eapache/queue/archive/093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz -> github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz https://github.com/golang/protobuf/archive/d3c38a4eb4970272b87a425ae00ccc4548e2f9bb.tar.gz -> github.com-golang-protobuf-d3c38a4eb4970272b87a425ae00ccc4548e2f9bb.tar.gz https://github.com/fatih/structs/archive/4966fc68f5b7593aafa6cbbba2d65ec6e1416047.tar.gz -> github.com-fatih-structs-4966fc68f5b7593aafa6cbbba2d65ec6e1416047.tar.gz https://github.com/minio/parquet-go/archive/9d767baf16793cc4b7fd55d642474c36c077ef77.tar.gz -> github.com-minio-parquet-go-9d767baf16793cc4b7fd55d642474c36c077ef77.tar.gz https://github.com/go-ini/ini/archive/c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz -> github.com-go-ini-ini-c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz https://github.com/grpc/grpc-go/archive/3507fb8e1a5ad030303c106fef3a47c9fdad16ad.tar.gz -> github.com-grpc-grpc-go-3507fb8e1a5ad030303c106fef3a47c9fdad16ad.tar.gz https://github.com/google/go-genproto/archive/64821d5d210748c883cd2b809589555ae4654203.tar.gz -> github.com-google-go-genproto-64821d5d210748c883cd2b809589555ae4654203.tar.gz https://github.com/census-instrumentation/opencensus-go/archive/43463a80402d8447b7fce0d2c58edf1687ff0b58.tar.gz -> github.com-census-instrumentation-opencensus-go-43463a80402d8447b7fce0d2c58edf1687ff0b58.tar.gz https://github.com/apache/thrift/archive/c9b1e29bc9e0702d7441383358d565e1e76ccea7.tar.gz -> github.com-apache-thrift-c9b1e29bc9e0702d7441383358d565e1e76ccea7.tar.gz https://github.com/elazarl/go-bindata-assetfs/archive/30f82fa23fd844bd5bb1e5f216db87fd77b5eb43.tar.gz -> github.com-elazarl-go-bindata-assetfs-30f82fa23fd844bd5bb1e5f216db87fd77b5eb43.tar.gz https://github.com/eclipse/paho.mqtt.golang/archive/20337d8c394721c308cc6ec096990ee451a7cd7f.tar.gz -> github.com-eclipse-paho.mqtt.golang-20337d8c394721c308cc6ec096990ee451a7cd7f.tar.gz https://github.com/klauspost/compress/archive/30be6041bed523c18e269a700ebd9c2ea9328574.tar.gz -> github.com-klauspost-compress-30be6041bed523c18e269a700ebd9c2ea9328574.tar.gz https://github.com/hashicorp/vault/archive/36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd.tar.gz -> github.com-hashicorp-vault-36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd.tar.gz https://github.com/fatih/color/archive/5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz -> github.com-fatih-color-5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz https://github.com/miekg/dns/archive/73601d4aed9d844322611759d7f3619110b7c88e.tar.gz -> github.com-miekg-dns-73601d4aed9d844322611759d7f3619110b7c88e.tar.gz https://github.com/klauspost/reedsolomon/archive/a9588190c00b0ccd742218388f6ff68bbad83e5c.tar.gz -> github.com-klauspost-reedsolomon-a9588190c00b0ccd742218388f6ff68bbad83e5c.tar.gz https://github.com/gomodule/redigo/archive/9c11da706d9b7902c6da69c592f75637793fe121.tar.gz -> github.com-gomodule-redigo-9c11da706d9b7902c6da69c592f75637793fe121.tar.gz https://github.com/go-sql-driver/mysql/archive/72cd26f257d44c1114970e19afddcd812016007e.tar.gz -> github.com-go-sql-driver-mysql-72cd26f257d44c1114970e19afddcd812016007e.tar.gz https://github.com/gorilla/handlers/archive/7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce.tar.gz -> github.com-gorilla-handlers-7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce.tar.gz https://github.com/mattn/go-isatty/archive/c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7.tar.gz -> github.com-mattn-go-isatty-c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/golang/snappy/archive/2a8bb927dd31d8daada140a5d09578521ce5c36a.tar.gz -> github.com-golang-snappy-2a8bb927dd31d8daada140a5d09578521ce5c36a.tar.gz https://github.com/klauspost/cpuid/archive/e7e905edc00ea8827e58662220139109efea09db.tar.gz -> github.com-klauspost-cpuid-e7e905edc00ea8827e58662220139109efea09db.tar.gz https://github.com/census-ecosystem/opencensus-go-exporter-ocagent/archive/902c0ccba68df93f7fefbe7e7c6f16be33108b40.tar.gz -> github.com-census-ecosystem-opencensus-go-exporter-ocagent-902c0ccba68df93f7fefbe7e7c6f16be33108b40.tar.gz https://github.com/lib/pq/archive/4ded0e9383f75c197b3a2aaa6d590ac52df6fd79.tar.gz -> github.com-lib-pq-4ded0e9383f75c197b3a2aaa6d590ac52df6fd79.tar.gz https://github.com/mattn/go-runewidth/archive/3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz -> github.com-mattn-go-runewidth-3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz https://github.com/census-instrumentation/opencensus-proto/archive/a105b96453fe85139acc07b68de48f2cbdd71249.tar.gz -> github.com-census-instrumentation-opencensus-proto-a105b96453fe85139acc07b68de48f2cbdd71249.tar.gz https://github.com/minio/cli/archive/8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz -> github.com-minio-cli-8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz https://github.com/minio/mc/archive/a1355e50e2e8984d645cc7745230c42b27396341.tar.gz -> github.com-minio-mc-a1355e50e2e8984d645cc7745230c42b27396341.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/grpc-ecosystem/grpc-gateway/archive/20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea.tar.gz -> github.com-grpc-ecosystem-grpc-gateway-20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea.tar.gz https://github.com/mattn/go-colorable/archive/3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz -> github.com-mattn-go-colorable-3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz https://github.com/minio/blazer/archive/2081f5bf046503f576d8712253724fbf2950fffe.tar.gz -> github.com-minio-blazer-2081f5bf046503f576d8712253724fbf2950fffe.tar.gz https://github.com/minio/highwayhash/archive/02ca4b43caa3297fbb615700d8800acc7933be98.tar.gz -> github.com-minio-highwayhash-02ca4b43caa3297fbb615700d8800acc7933be98.tar.gz https://github.com/minio/lsync/archive/v1.0.1.tar.gz -> github.com-minio-lsync-v1.0.1.tar.gz https://github.com/minio/sha256-simd/archive/05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz -> github.com-minio-sha256-simd-05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz https://github.com/minio/sio/archive/035b4ef8c449ba2ba21ec143c91964e76a1fb68c.tar.gz -> github.com-minio-sio-035b4ef8c449ba2ba21ec143c91964e76a1fb68c.tar.gz https://github.com/golang/sync/archive/e225da77a7e68af35c70ccbf71af2b83e6acac3c.tar.gz -> github.com-golang-sync-e225da77a7e68af35c70ccbf71af2b83e6acac3c.tar.gz https://github.com/golang/oauth2/archive/9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz -> github.com-golang-oauth2-9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz https://github.com/googleapis/google-cloud-go/archive/458e1f376a2b44413160b5d301183b65debaa3f6.tar.gz -> github.com-googleapis-google-cloud-go-458e1f376a2b44413160b5d301183b65debaa3f6.tar.gz https://github.com/googleapis/gax-go/archive/beaecbbdd8af86aa3acf14180d53828ce69400b2.tar.gz -> github.com-googleapis-gax-go-beaecbbdd8af86aa3acf14180d53828ce69400b2.tar.gz https://github.com/hashicorp/golang-lru/archive/7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz -> github.com-hashicorp-golang-lru-7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz https://github.com/json-iterator/go/archive/0ff49de124c6f76f8494e194af75bde0f1a49a29.tar.gz -> github.com-json-iterator-go-0ff49de124c6f76f8494e194af75bde0f1a49a29.tar.gz https://github.com/colinmarc/hdfs/archive/fd1e410ff7bf76b870f625dc0aa3eb4e44f5bc50.tar.gz -> github.com-colinmarc-hdfs-fd1e410ff7bf76b870f625dc0aa3eb4e44f5bc50.tar.gz https://github.com/hashicorp/go-uuid/archive/4f571afc59f3043a65f8fe6bf46d887b10a01d43.tar.gz -> github.com-hashicorp-go-uuid-4f571afc59f3043a65f8fe6bf46d887b10a01d43.tar.gz https://github.com/jcmturner/gofork/archive/dc7c13fece037a4a36e2b3c69db4991498d30692.tar.gz -> github.com-jcmturner-gofork-dc7c13fece037a4a36e2b3c69db4991498d30692.tar.gz https://github.com/modern-go/concurrent/archive/bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz -> github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz https://github.com/modern-go/reflect2/archive/94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz -> github.com-modern-go-reflect2-94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz https://github.com/jcmturner/aescts/archive/f6abebb3171c4c1b1fea279cb7c7325020a26290.tar.gz -> github.com-jcmturner-aescts-f6abebb3171c4c1b1fea279cb7c7325020a26290.tar.gz https://github.com/jcmturner/dnsutils/archive/13eeb8d49ffb74d7a75784c35e4d900607a3943c.tar.gz -> github.com-jcmturner-dnsutils-13eeb8d49ffb74d7a75784c35e4d900607a3943c.tar.gz https://github.com/klauspost/readahead/archive/v1.3.0.tar.gz -> github.com-klauspost-readahead-v1.3.0.tar.gz https://github.com/kurin/blazer/archive/v0.5.3.tar.gz -> github.com-kurin-blazer-v0.5.3.tar.gz https://github.com/minio/dsync/archive/fedfb5c974fa2ab238e45a6e6b19d38774e0326f.tar.gz -> github.com-minio-dsync-fedfb5c974fa2ab238e45a6e6b19d38774e0326f.tar.gz https://github.com/ncw/directio/archive/v1.0.5.tar.gz -> github.com-ncw-directio-v1.0.5.tar.gz https://github.com/nats-io/stan.go/archive/v0.4.5.tar.gz -> github.com-nats-io-stan.go-v0.4.5.tar.gz https://github.com/nats-io/nats.go/archive/v1.8.0.tar.gz -> github.com-nats-io-nats.go-v1.8.0.tar.gz https://github.com/minio/minio-go/archive/v6.0.29.tar.gz -> github.com-minio-minio-go-v6.0.29.tar.gz https://github.com/minio/hdfs/archive/v3.0.1.tar.gz -> github.com-minio-hdfs-v3.0.1.tar.gz https://github.com/minio/gokrb5/archive/v7.2.5.tar.gz -> github.com-minio-gokrb5-v7.2.5.tar.gz https://github.com/minio/minio-go/archive/v6.0.29.tar.gz -> github.com-minio-minio-go-v6.0.29.tar.gz https://github.com/jcmturner/goidentity/archive/v5.0.0.tar.gz -> github.com-jcmturner-goidentity-v5.0.0.tar.gz https://github.com/jcmturner/rpc/archive/99a8ce2fbf8b8087b6ed12a37c61b10f04070043.tar.gz -> github.com-jcmturner-rpc-99a8ce2fbf8b8087b6ed12a37c61b10f04070043.tar.gz https://github.com/jcmturner/goidentity/archive/v2.0.0.tar.gz -> github.com-jcmturner-goidentity-v2.0.0.tar.gz https://github.com/jcmturner/goidentity/archive/v3.0.0.tar.gz -> github.com-jcmturner-goidentity-v3.0.0.tar.gz https://github.com/kurin/blazer/archive/cf2f27cc0be3dac3c1a94c3c8b76834ce741439e.tar.gz -> github.com-kurin-blazer-cf2f27cc0be3dac3c1a94c3c8b76834ce741439e.tar.gz https://github.com/valyala/fastjson/archive/v1.4.1.tar.gz -> github.com-valyala-fastjson-v1.4.1.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=19f9e2af0691b5f99377ed88b6fa5a8a
diff --git a/metadata/md5-cache/net-fs/minio-2019.08.29.00.25.01 b/metadata/md5-cache/net-fs/minio-2019.08.29.00.25.01
new file mode 100644
index 000000000000..e6fe21e9bde4
--- /dev/null
+++ b/metadata/md5-cache/net-fs/minio-2019.08.29.00.25.01
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare setup test unpack
+DESCRIPTION=An Amazon S3 compatible object storage server
+EAPI=7
+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-08-29T00-25-01Z.tar.gz -> minio-2019.08.29.00.25.01.tar.gz https://github.com/go-yaml/yaml/archive/51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz -> github.com-go-yaml-yaml-51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz https://github.com/olivere/elastic/archive/f72acaba629a7ec879103d17b7426a31bc38e199.tar.gz -> github.com-olivere-elastic-f72acaba629a7ec879103d17b7426a31bc38e199.tar.gz https://github.com/Shopify/sarama/archive/879f631812a30a580659e8035e7cda9994bb99ac.tar.gz -> github.com-Shopify-sarama-879f631812a30a580659e8035e7cda9994bb99ac.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/golang/time/archive/9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz -> github.com-golang-time-9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz https://github.com/golang/sys/archive/81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz -> github.com-golang-sys-81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz https://github.com/golang/net/archive/eb5bcb51f2a31c7d5141d810b70815c05d9c9146.tar.gz -> github.com-golang-net-eb5bcb51f2a31c7d5141d810b70815c05d9c9146.tar.gz https://github.com/golang/text/archive/e3703dcdd614d2d7488fff034c75c551ea25da95.tar.gz -> github.com-golang-text-e3703dcdd614d2d7488fff034c75c551ea25da95.tar.gz https://github.com/golang/crypto/archive/38d8ce5564a5b71b2e3a00553993f1b9a7ae852f.tar.gz -> github.com-golang-crypto-38d8ce5564a5b71b2e3a00553993f1b9a7ae852f.tar.gz https://github.com/uber-go/atomic/archive/1ea20fb1cbb1cc08cbd0d913a96dead89aa18289.tar.gz -> github.com-uber-go-atomic-1ea20fb1cbb1cc08cbd0d913a96dead89aa18289.tar.gz https://github.com/valyala/tcplisten/archive/ceec8f93295a060cdb565ec25e4ccf17941dbd55.tar.gz -> github.com-valyala-tcplisten-ceec8f93295a060cdb565ec25e4ccf17941dbd55.tar.gz https://github.com/googleapis/google-cloud-go/archive/a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4.tar.gz -> github.com-googleapis-google-cloud-go-a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4.tar.gz https://github.com/tidwall/sjson/archive/25fb082a20e29e83fb7b7ef5f5919166aad1f084.tar.gz -> github.com-tidwall-sjson-25fb082a20e29e83fb7b7ef5f5919166aad1f084.tar.gz https://github.com/tidwall/gjson/archive/eee0b6226f0d1db2675a176fdfaa8419bcad4ca8.tar.gz -> github.com-tidwall-gjson-eee0b6226f0d1db2675a176fdfaa8419bcad4ca8.tar.gz https://github.com/tidwall/pretty/archive/1166b9ac2b65e46a43d8618d30d1554f4652d49b.tar.gz -> github.com-tidwall-pretty-1166b9ac2b65e46a43d8618d30d1554f4652d49b.tar.gz https://github.com/tidwall/match/archive/33827db735fff6510490d69a8622612558a557ed.tar.gz -> github.com-tidwall-match-33827db735fff6510490d69a8622612558a557ed.tar.gz https://github.com/streadway/amqp/archive/14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688.tar.gz -> github.com-streadway-amqp-14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688.tar.gz https://github.com/skyrings/skyring-common/archive/d1c0bb1cbd5ed8438be1385c85c4f494608cde1e.tar.gz -> github.com-skyrings-skyring-common-d1c0bb1cbd5ed8438be1385c85c4f494608cde1e.tar.gz https://github.com/segmentio/go-prompt/archive/f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz -> github.com-segmentio-go-prompt-f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz https://github.com/rs/cors/archive/9a47f48565a795472d43519dd49aac781f3034fb.tar.gz -> github.com-rs-cors-9a47f48565a795472d43519dd49aac781f3034fb.tar.gz https://github.com/rjeczalik/notify/archive/69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz -> github.com-rjeczalik-notify-69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz https://github.com/rcrowley/go-metrics/archive/3113b8401b8a98917cde58f8bbd42a1b1c03b1fd.tar.gz -> github.com-rcrowley-go-metrics-3113b8401b8a98917cde58f8bbd42a1b1c03b1fd.tar.gz https://github.com/prometheus/client_golang/archive/505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz -> github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz https://github.com/prometheus/procfs/archive/55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352.tar.gz -> github.com-prometheus-procfs-55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352.tar.gz https://github.com/prometheus/common/archive/5df5c82edb7502fd6cbe093223a19b6e1231494f.tar.gz -> github.com-prometheus-common-5df5c82edb7502fd6cbe093223a19b6e1231494f.tar.gz https://github.com/prometheus/client_model/archive/fd36f4220a901265f90734c3183c5f0c91daa0b8.tar.gz -> github.com-prometheus-client_model-fd36f4220a901265f90734c3183c5f0c91daa0b8.tar.gz https://github.com/pkg/profile/archive/f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz -> github.com-pkg-profile-f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz https://github.com/pkg/errors/archive/ba968bfe8b2f7e042a574c888954fccecfa385b4.tar.gz -> github.com-pkg-errors-ba968bfe8b2f7e042a574c888954fccecfa385b4.tar.gz https://github.com/pierrec/lz4/archive/315a67e90e415bcdaff33057da191569bf4d8479.tar.gz -> github.com-pierrec-lz4-315a67e90e415bcdaff33057da191569bf4d8479.tar.gz https://github.com/nsqio/go-nsq/archive/eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz -> github.com-nsqio-go-nsq-eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz https://github.com/nats-io/nats/archive/70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz -> github.com-nats-io-nats-70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz https://github.com/nats-io/nuid/archive/3024a71c3cbe30667286099921591e6fcc328230.tar.gz -> github.com-nats-io-nuid-3024a71c3cbe30667286099921591e6fcc328230.tar.gz https://github.com/nats-io/nkeys/archive/1546a3320a8f195a5b5c84aef8309377c2e411d5.tar.gz -> github.com-nats-io-nkeys-1546a3320a8f195a5b5c84aef8309377c2e411d5.tar.gz https://github.com/nats-io/go-nats/archive/70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz -> github.com-nats-io-go-nats-70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz https://github.com/nats-io/go-nats-streaming/archive/4366d43a0648b4997ed32080f937e8702ab86c48.tar.gz -> github.com-nats-io-go-nats-streaming-4366d43a0648b4997ed32080f937e8702ab86c48.tar.gz https://github.com/Azure/azure-sdk-for-go/archive/d659f2a91175cac99aa5627d09b83026eacc978d.tar.gz -> github.com-Azure-azure-sdk-for-go-d659f2a91175cac99aa5627d09b83026eacc978d.tar.gz https://github.com/Azure/go-autorest/archive/3b1641ed03046f2ee28d73f7a51e5b884d55b92a.tar.gz -> github.com-Azure-go-autorest-3b1641ed03046f2ee28d73f7a51e5b884d55b92a.tar.gz https://github.com/DataDog/zstd/archive/c7161f8c63c045cbc7ca051dcc969dd0e4054de2.tar.gz -> github.com-DataDog-zstd-c7161f8c63c045cbc7ca051dcc969dd0e4054de2.tar.gz https://github.com/mailru/easyjson/archive/1ea4449da9834f4d333f1cc461c374aea217d249.tar.gz -> github.com-mailru-easyjson-1ea4449da9834f4d333f1cc461c374aea217d249.tar.gz https://github.com/gorilla/mux/archive/a7962380ca08b5a188038c69871b8d3fbdf31e89.tar.gz -> github.com-gorilla-mux-a7962380ca08b5a188038c69871b8d3fbdf31e89.tar.gz https://github.com/coredns/coredns/archive/8dcc7fccd74454134b33c8bc9f780ed6d7f076cf.tar.gz -> github.com-coredns-coredns-8dcc7fccd74454134b33c8bc9f780ed6d7f076cf.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz https://github.com/eapache/go-resiliency/archive/842e16ec2c98ef0c59eebfe60d2d3500a793ba19.tar.gz -> github.com-eapache-go-resiliency-842e16ec2c98ef0c59eebfe60d2d3500a793ba19.tar.gz https://github.com/minio/minio-go/archive/5325257a208fc630aaaac31bc00789acbc998c14.tar.gz -> github.com-minio-minio-go-5325257a208fc630aaaac31bc00789acbc998c14.tar.gz https://github.com/alecthomas/participle/archive/98cb121381c371cf1542c7ae145e485d703aec0b.tar.gz -> github.com-alecthomas-participle-98cb121381c371cf1542c7ae145e485d703aec0b.tar.gz https://github.com/aliyun/aliyun-oss-go-sdk/archive/86c17b95fcd5db33628a61e492fb4a1a937d5906.tar.gz -> github.com-aliyun-aliyun-oss-go-sdk-86c17b95fcd5db33628a61e492fb4a1a937d5906.tar.gz https://github.com/bcicen/jstream/archive/16c1f8af81c2a9967b30d365a29472126274f998.tar.gz -> github.com-bcicen-jstream-16c1f8af81c2a9967b30d365a29472126274f998.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/cheggaaa/pb/archive/f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz -> github.com-cheggaaa-pb-f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz https://github.com/gogo/protobuf/archive/382325bbbb4d1c850eec1f3ec92a1a16f502d68b.tar.gz -> github.com-gogo-protobuf-382325bbbb4d1c850eec1f3ec92a1a16f502d68b.tar.gz https://github.com/davecgh/go-spew/archive/d8f796af33cc11cb798c1aaeb27a4ebc5099927d.tar.gz -> github.com-davecgh-go-spew-d8f796af33cc11cb798c1aaeb27a4ebc5099927d.tar.gz https://github.com/inconshreveable/go-update/archive/8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz -> github.com-inconshreveable-go-update-8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/mitchellh/go-homedir/archive/af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz -> github.com-mitchellh-go-homedir-af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz https://github.com/klauspost/pgzip/archive/083b1c3f84dd6486588802e5ce295de3a7f41a8b.tar.gz -> github.com-klauspost-pgzip-083b1c3f84dd6486588802e5ce295de3a7f41a8b.tar.gz https://github.com/marstr/guid/archive/8bd9a64bf37eb297b492a4101fb28e80ac0b290f.tar.gz -> github.com-marstr-guid-8bd9a64bf37eb297b492a4101fb28e80ac0b290f.tar.gz https://github.com/coreos/etcd/archive/d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9.tar.gz -> github.com-coreos-etcd-d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9.tar.gz https://github.com/dgrijalva/jwt-go/archive/06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz -> github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz https://github.com/gorilla/rpc/archive/bffcfa752ad4e523cc8f720afeb5b985ed41ae16.tar.gz -> github.com-gorilla-rpc-bffcfa752ad4e523cc8f720afeb5b985ed41ae16.tar.gz https://github.com/djherbis/atime/archive/8e47e0e01d08df8b9f840d74299c8ab70a024a30.tar.gz -> github.com-djherbis-atime-8e47e0e01d08df8b9f840d74299c8ab70a024a30.tar.gz https://github.com/dustin/go-humanize/archive/9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz -> github.com-dustin-go-humanize-9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz https://github.com/eapache/go-xerial-snappy/archive/776d5712da21bc4762676d614db1d8a64f4238b0.tar.gz -> github.com-eapache-go-xerial-snappy-776d5712da21bc4762676d614db1d8a64f4238b0.tar.gz https://github.com/eapache/queue/archive/093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz -> github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz https://github.com/golang/protobuf/archive/d3c38a4eb4970272b87a425ae00ccc4548e2f9bb.tar.gz -> github.com-golang-protobuf-d3c38a4eb4970272b87a425ae00ccc4548e2f9bb.tar.gz https://github.com/fatih/structs/archive/4966fc68f5b7593aafa6cbbba2d65ec6e1416047.tar.gz -> github.com-fatih-structs-4966fc68f5b7593aafa6cbbba2d65ec6e1416047.tar.gz https://github.com/minio/parquet-go/archive/9d767baf16793cc4b7fd55d642474c36c077ef77.tar.gz -> github.com-minio-parquet-go-9d767baf16793cc4b7fd55d642474c36c077ef77.tar.gz https://github.com/go-ini/ini/archive/c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz -> github.com-go-ini-ini-c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz https://github.com/grpc/grpc-go/archive/3507fb8e1a5ad030303c106fef3a47c9fdad16ad.tar.gz -> github.com-grpc-grpc-go-3507fb8e1a5ad030303c106fef3a47c9fdad16ad.tar.gz https://github.com/google/go-genproto/archive/64821d5d210748c883cd2b809589555ae4654203.tar.gz -> github.com-google-go-genproto-64821d5d210748c883cd2b809589555ae4654203.tar.gz https://github.com/census-instrumentation/opencensus-go/archive/43463a80402d8447b7fce0d2c58edf1687ff0b58.tar.gz -> github.com-census-instrumentation-opencensus-go-43463a80402d8447b7fce0d2c58edf1687ff0b58.tar.gz https://github.com/apache/thrift/archive/c9b1e29bc9e0702d7441383358d565e1e76ccea7.tar.gz -> github.com-apache-thrift-c9b1e29bc9e0702d7441383358d565e1e76ccea7.tar.gz https://github.com/elazarl/go-bindata-assetfs/archive/30f82fa23fd844bd5bb1e5f216db87fd77b5eb43.tar.gz -> github.com-elazarl-go-bindata-assetfs-30f82fa23fd844bd5bb1e5f216db87fd77b5eb43.tar.gz https://github.com/eclipse/paho.mqtt.golang/archive/20337d8c394721c308cc6ec096990ee451a7cd7f.tar.gz -> github.com-eclipse-paho.mqtt.golang-20337d8c394721c308cc6ec096990ee451a7cd7f.tar.gz https://github.com/klauspost/compress/archive/30be6041bed523c18e269a700ebd9c2ea9328574.tar.gz -> github.com-klauspost-compress-30be6041bed523c18e269a700ebd9c2ea9328574.tar.gz https://github.com/hashicorp/vault/archive/36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd.tar.gz -> github.com-hashicorp-vault-36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd.tar.gz https://github.com/fatih/color/archive/5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz -> github.com-fatih-color-5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz https://github.com/miekg/dns/archive/73601d4aed9d844322611759d7f3619110b7c88e.tar.gz -> github.com-miekg-dns-73601d4aed9d844322611759d7f3619110b7c88e.tar.gz https://github.com/klauspost/reedsolomon/archive/a9588190c00b0ccd742218388f6ff68bbad83e5c.tar.gz -> github.com-klauspost-reedsolomon-a9588190c00b0ccd742218388f6ff68bbad83e5c.tar.gz https://github.com/gomodule/redigo/archive/9c11da706d9b7902c6da69c592f75637793fe121.tar.gz -> github.com-gomodule-redigo-9c11da706d9b7902c6da69c592f75637793fe121.tar.gz https://github.com/go-sql-driver/mysql/archive/72cd26f257d44c1114970e19afddcd812016007e.tar.gz -> github.com-go-sql-driver-mysql-72cd26f257d44c1114970e19afddcd812016007e.tar.gz https://github.com/gorilla/handlers/archive/7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce.tar.gz -> github.com-gorilla-handlers-7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce.tar.gz https://github.com/mattn/go-isatty/archive/c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7.tar.gz -> github.com-mattn-go-isatty-c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/golang/snappy/archive/2a8bb927dd31d8daada140a5d09578521ce5c36a.tar.gz -> github.com-golang-snappy-2a8bb927dd31d8daada140a5d09578521ce5c36a.tar.gz https://github.com/klauspost/cpuid/archive/e7e905edc00ea8827e58662220139109efea09db.tar.gz -> github.com-klauspost-cpuid-e7e905edc00ea8827e58662220139109efea09db.tar.gz https://github.com/census-ecosystem/opencensus-go-exporter-ocagent/archive/902c0ccba68df93f7fefbe7e7c6f16be33108b40.tar.gz -> github.com-census-ecosystem-opencensus-go-exporter-ocagent-902c0ccba68df93f7fefbe7e7c6f16be33108b40.tar.gz https://github.com/lib/pq/archive/4ded0e9383f75c197b3a2aaa6d590ac52df6fd79.tar.gz -> github.com-lib-pq-4ded0e9383f75c197b3a2aaa6d590ac52df6fd79.tar.gz https://github.com/mattn/go-runewidth/archive/3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz -> github.com-mattn-go-runewidth-3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz https://github.com/census-instrumentation/opencensus-proto/archive/a105b96453fe85139acc07b68de48f2cbdd71249.tar.gz -> github.com-census-instrumentation-opencensus-proto-a105b96453fe85139acc07b68de48f2cbdd71249.tar.gz https://github.com/minio/cli/archive/8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz -> github.com-minio-cli-8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz https://github.com/minio/mc/archive/a1355e50e2e8984d645cc7745230c42b27396341.tar.gz -> github.com-minio-mc-a1355e50e2e8984d645cc7745230c42b27396341.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/grpc-ecosystem/grpc-gateway/archive/20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea.tar.gz -> github.com-grpc-ecosystem-grpc-gateway-20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea.tar.gz https://github.com/mattn/go-colorable/archive/3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz -> github.com-mattn-go-colorable-3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz https://github.com/minio/blazer/archive/2081f5bf046503f576d8712253724fbf2950fffe.tar.gz -> github.com-minio-blazer-2081f5bf046503f576d8712253724fbf2950fffe.tar.gz https://github.com/minio/highwayhash/archive/02ca4b43caa3297fbb615700d8800acc7933be98.tar.gz -> github.com-minio-highwayhash-02ca4b43caa3297fbb615700d8800acc7933be98.tar.gz https://github.com/minio/lsync/archive/v1.0.1.tar.gz -> github.com-minio-lsync-v1.0.1.tar.gz https://github.com/minio/sha256-simd/archive/05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz -> github.com-minio-sha256-simd-05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz https://github.com/minio/sio/archive/035b4ef8c449ba2ba21ec143c91964e76a1fb68c.tar.gz -> github.com-minio-sio-035b4ef8c449ba2ba21ec143c91964e76a1fb68c.tar.gz https://github.com/golang/sync/archive/e225da77a7e68af35c70ccbf71af2b83e6acac3c.tar.gz -> github.com-golang-sync-e225da77a7e68af35c70ccbf71af2b83e6acac3c.tar.gz https://github.com/golang/oauth2/archive/9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz -> github.com-golang-oauth2-9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz https://github.com/googleapis/google-cloud-go/archive/458e1f376a2b44413160b5d301183b65debaa3f6.tar.gz -> github.com-googleapis-google-cloud-go-458e1f376a2b44413160b5d301183b65debaa3f6.tar.gz https://github.com/googleapis/gax-go/archive/beaecbbdd8af86aa3acf14180d53828ce69400b2.tar.gz -> github.com-googleapis-gax-go-beaecbbdd8af86aa3acf14180d53828ce69400b2.tar.gz https://github.com/hashicorp/golang-lru/archive/7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz -> github.com-hashicorp-golang-lru-7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz https://github.com/json-iterator/go/archive/0ff49de124c6f76f8494e194af75bde0f1a49a29.tar.gz -> github.com-json-iterator-go-0ff49de124c6f76f8494e194af75bde0f1a49a29.tar.gz https://github.com/colinmarc/hdfs/archive/fd1e410ff7bf76b870f625dc0aa3eb4e44f5bc50.tar.gz -> github.com-colinmarc-hdfs-fd1e410ff7bf76b870f625dc0aa3eb4e44f5bc50.tar.gz https://github.com/hashicorp/go-uuid/archive/4f571afc59f3043a65f8fe6bf46d887b10a01d43.tar.gz -> github.com-hashicorp-go-uuid-4f571afc59f3043a65f8fe6bf46d887b10a01d43.tar.gz https://github.com/jcmturner/gofork/archive/dc7c13fece037a4a36e2b3c69db4991498d30692.tar.gz -> github.com-jcmturner-gofork-dc7c13fece037a4a36e2b3c69db4991498d30692.tar.gz https://github.com/modern-go/concurrent/archive/bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz -> github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz https://github.com/modern-go/reflect2/archive/94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz -> github.com-modern-go-reflect2-94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz https://github.com/jcmturner/aescts/archive/f6abebb3171c4c1b1fea279cb7c7325020a26290.tar.gz -> github.com-jcmturner-aescts-f6abebb3171c4c1b1fea279cb7c7325020a26290.tar.gz https://github.com/jcmturner/dnsutils/archive/13eeb8d49ffb74d7a75784c35e4d900607a3943c.tar.gz -> github.com-jcmturner-dnsutils-13eeb8d49ffb74d7a75784c35e4d900607a3943c.tar.gz https://github.com/klauspost/readahead/archive/v1.3.0.tar.gz -> github.com-klauspost-readahead-v1.3.0.tar.gz https://github.com/kurin/blazer/archive/v0.5.3.tar.gz -> github.com-kurin-blazer-v0.5.3.tar.gz https://github.com/minio/dsync/archive/fedfb5c974fa2ab238e45a6e6b19d38774e0326f.tar.gz -> github.com-minio-dsync-fedfb5c974fa2ab238e45a6e6b19d38774e0326f.tar.gz https://github.com/ncw/directio/archive/v1.0.5.tar.gz -> github.com-ncw-directio-v1.0.5.tar.gz https://github.com/nats-io/stan.go/archive/v0.4.5.tar.gz -> github.com-nats-io-stan.go-v0.4.5.tar.gz https://github.com/nats-io/nats.go/archive/v1.8.0.tar.gz -> github.com-nats-io-nats.go-v1.8.0.tar.gz https://github.com/minio/minio-go/archive/v6.0.29.tar.gz -> github.com-minio-minio-go-v6.0.29.tar.gz https://github.com/minio/hdfs/archive/v3.0.1.tar.gz -> github.com-minio-hdfs-v3.0.1.tar.gz https://github.com/minio/gokrb5/archive/v7.2.5.tar.gz -> github.com-minio-gokrb5-v7.2.5.tar.gz https://github.com/minio/minio-go/archive/v6.0.29.tar.gz -> github.com-minio-minio-go-v6.0.29.tar.gz https://github.com/jcmturner/goidentity/archive/v5.0.0.tar.gz -> github.com-jcmturner-goidentity-v5.0.0.tar.gz https://github.com/jcmturner/rpc/archive/99a8ce2fbf8b8087b6ed12a37c61b10f04070043.tar.gz -> github.com-jcmturner-rpc-99a8ce2fbf8b8087b6ed12a37c61b10f04070043.tar.gz https://github.com/jcmturner/goidentity/archive/v2.0.0.tar.gz -> github.com-jcmturner-goidentity-v2.0.0.tar.gz https://github.com/jcmturner/goidentity/archive/v3.0.0.tar.gz -> github.com-jcmturner-goidentity-v3.0.0.tar.gz https://github.com/kurin/blazer/archive/cf2f27cc0be3dac3c1a94c3c8b76834ce741439e.tar.gz -> github.com-kurin-blazer-cf2f27cc0be3dac3c1a94c3c8b76834ce741439e.tar.gz https://github.com/valyala/fastjson/archive/v1.4.1.tar.gz -> github.com-valyala-fastjson-v1.4.1.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=19f9e2af0691b5f99377ed88b6fa5a8a
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.3.3 b/metadata/md5-cache/net-fs/nfs-utils-2.3.3
index ec81c85e7e68..744ebc5452a2 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-2.3.3
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.3.3
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.3.3.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4af85836e3779303cfd3977d7cf12ea1
+_md5_=2d0c63a91432e89a08cfb5b9b2450125
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.3.4 b/metadata/md5-cache/net-fs/nfs-utils-2.3.4
index 86d6f7ef4403..6e230a6809ae 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-2.3.4
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.3.4
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.3.4.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=185266385d5728fe9b2bf553fada832a
+_md5_=05b025aa71a4027fab531902fbf1431f
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.4.1 b/metadata/md5-cache/net-fs/nfs-utils-2.4.1
deleted file mode 100644
index 3af726da310f..000000000000
--- a/metadata/md5-cache/net-fs/nfs-utils-2.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=net-libs/rpcsvc-proto virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-db/sqlite-3.3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux )
-DESCRIPTION=NFS client and server daemons
-EAPI=7
-HOMEPAGE=http://linux-nfs.org/
-IUSE=caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-db/sqlite-3.3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap !net-nds/portmap !<sys-apps/openrc-0.13.9 selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
-REQUIRED_USE=kerberos? ( nfsv4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.4.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=136c5bddee5237417ee5c217f66098c5
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r1 b/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r1
new file mode 100644
index 000000000000..dd966ffb4dcb
--- /dev/null
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=net-libs/rpcsvc-proto virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=dev-db/sqlite-3.3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux )
+DESCRIPTION=NFS client and server daemons
+EAPI=7
+HOMEPAGE=http://linux-nfs.org/
+IUSE=caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-db/sqlite-3.3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap !net-nds/portmap !<sys-apps/openrc-0.13.9 selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
+REQUIRED_USE=kerberos? ( nfsv4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.4.1.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a0804ff02eea91a0bab0346c8b66c337
diff --git a/metadata/md5-cache/net-fs/samba-4.10.5 b/metadata/md5-cache/net-fs/samba-4.10.5
deleted file mode 100644
index 34ec23b54ad5..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.10.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.4[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.4[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python gnutls json winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.10.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=113b267d12d0e248dbcc349f9d2eba74
diff --git a/metadata/md5-cache/net-fs/samba-4.10.7 b/metadata/md5-cache/net-fs/samba-4.10.7
new file mode 100644
index 000000000000..c3c20da558fc
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.10.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.5[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=https://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.5[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python gnutls json winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.10.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=d4b815f1984f8f31c2065a2ea50150fb
diff --git a/metadata/md5-cache/net-fs/samba-4.10.8 b/metadata/md5-cache/net-fs/samba-4.10.8
new file mode 100644
index 000000000000..5db58dfc351c
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.10.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.5[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=https://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.5[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python gnutls json winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.10.8.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=d4b815f1984f8f31c2065a2ea50150fb
diff --git a/metadata/md5-cache/net-fs/samba-4.11.0_rc3 b/metadata/md5-cache/net-fs/samba-4.11.0_rc3
new file mode 100644
index 000000000000..e46d5cfc8a76
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.11.0_rc3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgcrypt:0 dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0 net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.6[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.2.0[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=https://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgcrypt:0 dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0 net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.6[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.2.0[ldap(+)?,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/rc/samba-4.11.0rc3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=0607919d5724b300b60fbadfb38c1fdd
diff --git a/metadata/md5-cache/net-fs/samba-4.7.12-r1 b/metadata/md5-cache/net-fs/samba-4.7.12-r1
deleted file mode 100644
index 1bac350018c1..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.7.12-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.2.3[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.3.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.2.3[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.3.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python gnutls ) addns? ( python ) ads? ( acl gnutls ldap ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.7.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=8e9b8f8c18a4cf8a7993c3771319240f
diff --git a/metadata/md5-cache/net-fs/samba-4.9.13 b/metadata/md5-cache/net-fs/samba-4.9.13
new file mode 100644
index 000000000000..eaee3612a6f3
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.9.13
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.7[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=https://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.7[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python gnutls json winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.9.13.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=468acc387fa5fcbc1b42263bd36987d9
diff --git a/metadata/md5-cache/net-fs/samba-4.9.9 b/metadata/md5-cache/net-fs/samba-4.9.9
deleted file mode 100644
index a23900c3669e..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.9.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python gnutls json winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.9.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=86272cbf0ce15d9f5d03ecbfe158dca3
diff --git a/metadata/md5-cache/net-fs/sshfs-3.5.0 b/metadata/md5-cache/net-fs/sshfs-3.5.0
index 24ce8eab4501..824751bf1224 100644
--- a/metadata/md5-cache/net-fs/sshfs-3.5.0
+++ b/metadata/md5-cache/net-fs/sshfs-3.5.0
@@ -9,5 +9,5 @@ RDEPEND=>=sys-fs/fuse-3.1.0:3 >=dev-libs/glib-2.4.2 >=net-misc/openssh-4.4
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libfuse/sshfs/releases/download/sshfs-3.5.0/sshfs-3.5.0.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=e1e096a83e591231a35315627f298c71
diff --git a/metadata/md5-cache/net-fs/sshfs-3.5.1 b/metadata/md5-cache/net-fs/sshfs-3.5.1
index 2a2322502114..7f18c9e66cd6 100644
--- a/metadata/md5-cache/net-fs/sshfs-3.5.1
+++ b/metadata/md5-cache/net-fs/sshfs-3.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-fs/fuse-3.1.0:3 >=dev-libs/glib-2.4.2 >=net-misc/openssh-4.4
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libfuse/sshfs/releases/download/sshfs-3.5.1/sshfs-3.5.1.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=fc874d4870fa2f30106accedce20cadd
diff --git a/metadata/md5-cache/net-fs/sshfs-3.5.2 b/metadata/md5-cache/net-fs/sshfs-3.5.2
index 974a712288fe..d64af790bab3 100644
--- a/metadata/md5-cache/net-fs/sshfs-3.5.2
+++ b/metadata/md5-cache/net-fs/sshfs-3.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-fs/fuse-3.1.0:3 >=dev-libs/glib-2.4.2 >=net-misc/openssh-4.4
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libfuse/sshfs/releases/download/sshfs-3.5.2/sshfs-3.5.2.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=920358e13abd6e01349406c460aafefb
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index a0b23e0d6126..3a2a1795e0ed 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.6-r5 b/metadata/md5-cache/net-ftp/proftpd-1.3.6-r5
index 94b35dc2a6c2..34e871267d91 100644
--- a/metadata/md5-cache/net-ftp/proftpd-1.3.6-r5
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.6-r5
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.6.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-0.11rc.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.6.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=79cfda57dfe94f7ca34e16629d10dae4
+_md5_=8c6524a2a9b9beae8265709a3d416a54
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 34939e0e390a..06ec8e9bd474 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/gajim-1.0.3 b/metadata/md5-cache/net-im/gajim-1.0.3
index f4f2aa92bcf6..6a8d981079b4 100644
--- a/metadata/md5-cache/net-im/gajim-1.0.3
+++ b/metadata/md5-cache/net-im/gajim-1.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/gobject-introspection[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+DEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 DESCRIPTION=Jabber client written in PyGTK
 EAPI=6
 HOMEPAGE=https://www.gajim.org/
 IUSE=+crypt geolocation jingle keyring networkmanager remote rst +spell upnp +webp python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.22:3[introspection] dev-python/idna[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/precis-i18n[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyasn1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycurl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pyopenssl-0.14[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-nbxmpp-0.6.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/libXScrnSaver crypt? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-gnupg-0.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) keyring? ( app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+RDEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] dev-python/idna[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/precis-i18n[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyasn1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycurl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pyopenssl-0.14[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-nbxmpp-0.6.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/libXScrnSaver crypt? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-gnupg-0.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) keyring? ( app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.gajim.org/downloads/1.0/gajim-1.0.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb64794af77ed79bec812fc75085ada2
+_md5_=4e6a66fbcb03f99a7a83d4eefaba5806
diff --git a/metadata/md5-cache/net-im/gajim-1.0.3-r1 b/metadata/md5-cache/net-im/gajim-1.0.3-r1
index eae35dbccc38..39e847b068ac 100644
--- a/metadata/md5-cache/net-im/gajim-1.0.3-r1
+++ b/metadata/md5-cache/net-im/gajim-1.0.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/gobject-introspection[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+DEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 DESCRIPTION=Jabber client written in PyGTK
 EAPI=6
 HOMEPAGE=https://www.gajim.org/
 IUSE=+crypt geolocation jingle keyring networkmanager remote rst +spell upnp +webp python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.22:3[introspection] dev-python/idna[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/precis-i18n[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyasn1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycurl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pyopenssl-0.14[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-nbxmpp-0.6.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/libXScrnSaver crypt? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-gnupg-0.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) keyring? ( app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+RDEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] dev-python/idna[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/precis-i18n[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyasn1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycurl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pyopenssl-0.14[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-nbxmpp-0.6.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/libXScrnSaver crypt? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-gnupg-0.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) keyring? ( app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.gajim.org/downloads/1.0/gajim-1.0.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e6139496ee7d9e0a0706cfd1f01b57ac
+_md5_=d66c1e5d50543d822cabc0542b46c559
diff --git a/metadata/md5-cache/net-im/gajim-1.1.3 b/metadata/md5-cache/net-im/gajim-1.1.3
index 5fa4f64f689d..453ce576d389 100644
--- a/metadata/md5-cache/net-im/gajim-1.1.3
+++ b/metadata/md5-cache/net-im/gajim-1.1.3
@@ -1,16 +1,16 @@
 BDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/gobject-introspection[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1
+DEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1
 DESCRIPTION=Jabber client written in PyGTK
 EAPI=7
 HOMEPAGE=https://www.gajim.org/
 IUSE=+crypt geolocation jingle networkmanager remote rst +spell upnp +webp python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/gtk+-3.22:3[introspection] dev-python/idna[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/precis-i18n[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyasn1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycurl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pyopenssl-0.14[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-nbxmpp-0.6.9[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/secretstorage-3.1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/cssutils-1.0.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] crypt? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-gnupg-0.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+RDEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] dev-python/idna[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/precis-i18n[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyasn1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pycurl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject[cairo,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pyopenssl-0.14[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-nbxmpp-0.6.9[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/secretstorage-3.1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/cssutils-1.0.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] crypt? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/python-gnupg-0.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.gajim.org/downloads/1.1/gajim-1.1.3.tar.bz2
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7813ccecaee41b9fe25d9ed2508a626e
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=474957d023347fe3d80d9388504c4e93
diff --git a/metadata/md5-cache/net-im/poezio-9999 b/metadata/md5-cache/net-im/poezio-9999
index 0f53915c3e23..d3d48d226a57 100644
--- a/metadata/md5-cache/net-im/poezio-9999
+++ b/metadata/md5-cache/net-im/poezio-9999
@@ -11,4 +11,4 @@ RDEPEND=dev-python/aiodns[python_targets_python3_5(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=dbeea6cc61e3e45433106e26ba272106
+_md5_=e6ec1788c5fe50416e5215767ff4a1a8
diff --git a/metadata/md5-cache/net-im/pyicq-t-0.8.1.5-r6 b/metadata/md5-cache/net-im/pyicq-t-0.8.1.5-r6
index d253579c397c..ee516ae8e517 100644
--- a/metadata/md5-cache/net-im/pyicq-t-0.8.1.5-r6
+++ b/metadata/md5-cache/net-im/pyicq-t-0.8.1.5-r6
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://pyicqt.googlecode.com/files/pyicqt-0.8.1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=01cfa3b7dfee46178ffddab6aa91929e
+_md5_=20a6b66937aa81d397b83fc177ca3bce
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.50.0.38 b/metadata/md5-cache/net-im/skypeforlinux-8.50.0.38
deleted file mode 100644
index 2fa48050e2a0..000000000000
--- a/metadata/md5-cache/net-im/skypeforlinux-8.50.0.38
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Instant messaging client, with support for audio and video
-EAPI=7
-HOMEPAGE=https://www.skype.com/
-IUSE=pax_kernel abi_x86_64
-KEYWORDS=-* ~amd64
-LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=|| ( sys-auth/elogind sys-apps/systemd ) app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
-REQUIRED_USE=|| ( abi_x86_64 )
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.50.0.38-1.x86_64.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=31f5584f1df42349852517aef600cb1c
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.51.0.72 b/metadata/md5-cache/net-im/skypeforlinux-8.51.0.72
deleted file mode 100644
index f8a9e23ba063..000000000000
--- a/metadata/md5-cache/net-im/skypeforlinux-8.51.0.72
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Instant messaging client, with support for audio and video
-EAPI=7
-HOMEPAGE=https://www.skype.com/
-IUSE=pax_kernel abi_x86_64
-KEYWORDS=-* ~amd64
-LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=|| ( sys-auth/elogind sys-apps/systemd ) app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
-REQUIRED_USE=|| ( abi_x86_64 )
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.51.0.72-1.x86_64.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=31f5584f1df42349852517aef600cb1c
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.51.0.92 b/metadata/md5-cache/net-im/skypeforlinux-8.51.0.92
new file mode 100644
index 000000000000..7a75d7747979
--- /dev/null
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.51.0.92
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Instant messaging client, with support for audio and video
+EAPI=7
+HOMEPAGE=https://www.skype.com/
+IUSE=pax_kernel abi_x86_64
+KEYWORDS=-* ~amd64
+LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=|| ( sys-auth/elogind sys-apps/systemd ) app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.51.0.92-1.x86_64.rpm
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=31f5584f1df42349852517aef600cb1c
diff --git a/metadata/md5-cache/net-im/slack-bin-3.3.8 b/metadata/md5-cache/net-im/slack-bin-3.3.8
deleted file mode 100644
index 968ec989bfdf..000000000000
--- a/metadata/md5-cache/net-im/slack-bin-3.3.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DESCRIPTION=Team collaboration tool
-EAPI=7
-HOMEPAGE=http://www.slack.com/
-IUSE=ayatana gnome-keyring pax_kernel abi_x86_64
-KEYWORDS=-* ~amd64
-LICENSE=all-rights-reserved
-RDEPEND=dev-libs/atk:0[abi_x86_64(-)?] dev-libs/expat:0[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr:0[abi_x86_64(-)?] dev-libs/nss:0[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib:0[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] net-misc/curl:0[abi_x86_64(-)?] net-print/cups:0[abi_x86_64(-)?] sys-apps/dbus:0[abi_x86_64(-)?] x11-libs/cairo:0[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11:0[abi_x86_64(-)?] x11-libs/libxcb:0/1.12[abi_x86_64(-)?] x11-libs/libXcomposite:0[abi_x86_64(-)?] x11-libs/libXcursor:0[abi_x86_64(-)?] x11-libs/libXdamage:0[abi_x86_64(-)?] x11-libs/libXext:0[abi_x86_64(-)?] x11-libs/libXfixes:0[abi_x86_64(-)?] x11-libs/libXi:0[abi_x86_64(-)?] x11-libs/libxkbfile:0[abi_x86_64(-)?] x11-libs/libXrandr:0[abi_x86_64(-)?] x11-libs/libXrender:0[abi_x86_64(-)?] x11-libs/libXScrnSaver:0[abi_x86_64(-)?] x11-libs/libXtst:0[abi_x86_64(-)?] x11-libs/pango:0[abi_x86_64(-)?] ayatana? ( dev-libs/libappindicator:3[abi_x86_64(-)?] ) gnome-keyring? ( app-crypt/libsecret:0[abi_x86_64(-)?] )
-REQUIRED_USE=|| ( abi_x86_64 )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.3.8-amd64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d2fbd135cab66876bf360c2c21550459
diff --git a/metadata/md5-cache/net-im/slack-bin-3.4.0 b/metadata/md5-cache/net-im/slack-bin-3.4.0
deleted file mode 100644
index dda909e0edaa..000000000000
--- a/metadata/md5-cache/net-im/slack-bin-3.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DESCRIPTION=Team collaboration tool
-EAPI=7
-HOMEPAGE=https://www.slack.com/
-IUSE=ayatana gnome-keyring pax_kernel abi_x86_64
-KEYWORDS=-* ~amd64
-LICENSE=all-rights-reserved
-RDEPEND=app-accessibility/at-spi2-atk:2[abi_x86_64(-)?] dev-libs/atk:0[abi_x86_64(-)?] dev-libs/expat:0[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr:0[abi_x86_64(-)?] dev-libs/nss:0[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib:0[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] net-misc/curl:0[abi_x86_64(-)?] net-print/cups:0[abi_x86_64(-)?] sys-apps/dbus:0[abi_x86_64(-)?] x11-libs/cairo:0[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11:0[abi_x86_64(-)?] x11-libs/libxcb:0/1.12[abi_x86_64(-)?] x11-libs/libXcomposite:0[abi_x86_64(-)?] x11-libs/libXcursor:0[abi_x86_64(-)?] x11-libs/libXdamage:0[abi_x86_64(-)?] x11-libs/libXext:0[abi_x86_64(-)?] x11-libs/libXfixes:0[abi_x86_64(-)?] x11-libs/libXi:0[abi_x86_64(-)?] x11-libs/libxkbfile:0[abi_x86_64(-)?] x11-libs/libXrandr:0[abi_x86_64(-)?] x11-libs/libXrender:0[abi_x86_64(-)?] x11-libs/libXScrnSaver:0[abi_x86_64(-)?] x11-libs/libXtst:0[abi_x86_64(-)?] x11-libs/pango:0[abi_x86_64(-)?] ayatana? ( dev-libs/libappindicator:3[abi_x86_64(-)?] ) gnome-keyring? ( app-crypt/libsecret:0[abi_x86_64(-)?] )
-REQUIRED_USE=|| ( abi_x86_64 )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.4.0-amd64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b2ded539f949e9c5561328d6af2fd3e
diff --git a/metadata/md5-cache/net-im/slack-bin-4.0.2 b/metadata/md5-cache/net-im/slack-bin-4.0.2
new file mode 100644
index 000000000000..4591a367557b
--- /dev/null
+++ b/metadata/md5-cache/net-im/slack-bin-4.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DESCRIPTION=Team collaboration tool
+EAPI=7
+HOMEPAGE=https://www.slack.com/
+IUSE=ayatana gnome-keyring pax_kernel abi_x86_64
+KEYWORDS=-* ~amd64
+LICENSE=all-rights-reserved
+RDEPEND=app-accessibility/at-spi2-atk:2[abi_x86_64(-)?] dev-libs/atk:0[abi_x86_64(-)?] dev-libs/expat:0[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr:0[abi_x86_64(-)?] dev-libs/nss:0[abi_x86_64(-)?] media-libs/alsa-lib:0[abi_x86_64(-)?] media-libs/mesa:0[abi_x86_64(-)?] net-print/cups:0[abi_x86_64(-)?] sys-apps/dbus:0[abi_x86_64(-)?] sys-apps/util-linux:0[abi_x86_64(-)?] x11-libs/cairo:0[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11:0[abi_x86_64(-)?] x11-libs/libxcb:0/1.12[abi_x86_64(-)?] x11-libs/libXcomposite:0[abi_x86_64(-)?] x11-libs/libXcursor:0[abi_x86_64(-)?] x11-libs/libXdamage:0[abi_x86_64(-)?] x11-libs/libXext:0[abi_x86_64(-)?] x11-libs/libXfixes:0[abi_x86_64(-)?] x11-libs/libXi:0[abi_x86_64(-)?] x11-libs/libxkbfile:0[abi_x86_64(-)?] x11-libs/libXrandr:0[abi_x86_64(-)?] x11-libs/libXrender:0[abi_x86_64(-)?] x11-libs/libXScrnSaver:0[abi_x86_64(-)?] x11-libs/libXtst:0[abi_x86_64(-)?] x11-libs/pango:0[abi_x86_64(-)?] ayatana? ( dev-libs/libappindicator:3[abi_x86_64(-)?] ) gnome-keyring? ( app-crypt/libsecret:0[abi_x86_64(-)?] )
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.0.2-amd64.deb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b654a8ba6717444fecc46abd7d3e487b
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-1.7.10 b/metadata/md5-cache/net-im/telegram-desktop-bin-1.7.10
deleted file mode 100644
index 38084299d978..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-1.7.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=GPL-3-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 >=sys-apps/dbus-1.4.20 x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v1.7.10.tar.gz -> tdesktop-1.7.10.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.1.7.10.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.1.7.10.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f0ef4d130905511954aefe40da9dda2
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-1.7.9 b/metadata/md5-cache/net-im/telegram-desktop-bin-1.7.9
deleted file mode 100644
index 2bdd93c40bb4..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-bin-1.7.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Official desktop client for Telegram (binary package)
-EAPI=7
-HOMEPAGE=https://desktop.telegram.org
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=GPL-3-with-openssl-exception
-RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 >=sys-apps/dbus-1.4.20 x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v1.7.9.tar.gz -> tdesktop-1.7.9.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.1.7.9.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.1.7.9.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f0ef4d130905511954aefe40da9dda2
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-1.8.2 b/metadata/md5-cache/net-im/telegram-desktop-bin-1.8.2
new file mode 100644
index 000000000000..1e5ff179e42f
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-1.8.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Official desktop client for Telegram (binary package)
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-3-with-openssl-exception
+RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=media-libs/fontconfig-2.13 >=sys-apps/dbus-1.4.20 x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb]
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v1.8.2.tar.gz -> tdesktop-1.8.2.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.1.8.2.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.1.8.2.tar.xz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f07b30621cc8797c5ac94653f13394c2
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index b6cd96c09ef6..c88a1c1bb49f 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/hexchat-2.14.1 b/metadata/md5-cache/net-irc/hexchat-2.14.1
index 6de1f520bafb..ee8d61f8ec58 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.14.1
+++ b/metadata/md5-cache/net-irc/hexchat-2.14.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.14.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d0ffa18c613770224e0eb94959b8046
diff --git a/metadata/md5-cache/net-irc/hexchat-2.14.2 b/metadata/md5-cache/net-irc/hexchat-2.14.2
index 3a51d056793a..4b475aae9a34 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.14.2
+++ b/metadata/md5-cache/net-irc/hexchat-2.14.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.14.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03a275dd174678f7a097e45df114fa02
diff --git a/metadata/md5-cache/net-irc/hexchat-9999 b/metadata/md5-cache/net-irc/hexchat-9999
index 93310cd0ff44..26a2f0a7b26f 100644
--- a/metadata/md5-cache/net-irc/hexchat-9999
+++ b/metadata/md5-cache/net-irc/hexchat-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c9a656b6e9581a727c5a727a7b377909
diff --git a/metadata/md5-cache/net-irc/inspircd-2.0.27 b/metadata/md5-cache/net-irc/inspircd-2.0.27
deleted file mode 100644
index 1eca7c863a02..000000000000
--- a/metadata/md5-cache/net-irc/inspircd-2.0.27
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-lang/perl ssl? ( dev-libs/openssl:= ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
-DESCRIPTION=Inspire IRCd - The Stable, High-Performance Modular IRCd
-EAPI=7
-HOMEPAGE=https://inspircd.github.com/
-IUSE=geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl ssl? ( dev-libs/openssl:= ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
-SLOT=0
-SRC_URI=https://github.com/inspircd/inspircd/archive/v2.0.27.tar.gz -> inspircd-2.0.27.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=244b5f3ed88c4e43a5254f26738ba0a3
diff --git a/metadata/md5-cache/net-irc/inspircd-2.0.28 b/metadata/md5-cache/net-irc/inspircd-2.0.28
new file mode 100644
index 000000000000..5145a74144ee
--- /dev/null
+++ b/metadata/md5-cache/net-irc/inspircd-2.0.28
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=acct-group/inspircd acct-user/inspircd dev-lang/perl ssl? ( dev-libs/openssl:= ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
+DESCRIPTION=Inspire IRCd - The Stable, High-Performance Modular IRCd
+EAPI=7
+HOMEPAGE=https://inspircd.github.com/
+IUSE=geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/inspircd acct-user/inspircd dev-lang/perl ssl? ( dev-libs/openssl:= ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
+SLOT=0
+SRC_URI=https://github.com/inspircd/inspircd/archive/v2.0.28.tar.gz -> inspircd-2.0.28.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=d89138ccca14d121f0726f723a638088
diff --git a/metadata/md5-cache/net-irc/inspircd-3.2.0 b/metadata/md5-cache/net-irc/inspircd-3.2.0
index 7e8e5900ef98..51500cb32ffe 100644
--- a/metadata/md5-cache/net-irc/inspircd-3.2.0
+++ b/metadata/md5-cache/net-irc/inspircd-3.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Inspire IRCd - The Stable, High-Performance Modular IRCd
 EAPI=7
 HOMEPAGE=https://inspircd.github.com/
 IUSE=debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls:= ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) re2? ( dev-libs/re2:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( dev-libs/openssl:= ) tre? ( dev-libs/tre )
 SLOT=0
 SRC_URI=https://github.com/inspircd/inspircd/archive/v3.2.0.tar.gz -> inspircd-3.2.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c6642fbc1935e36281a7f50ae5e7d2e6
+_md5_=7e9399366e708d1bfd33aaa3dedcbe4a
diff --git a/metadata/md5-cache/net-irc/inspircd-3.3.0 b/metadata/md5-cache/net-irc/inspircd-3.3.0
new file mode 100644
index 000000000000..2036e86d2b55
--- /dev/null
+++ b/metadata/md5-cache/net-irc/inspircd-3.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=acct-group/inspircd acct-user/inspircd dev-lang/perl gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls:= ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) re2? ( dev-libs/re2:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( dev-libs/openssl:= ) tre? ( dev-libs/tre )
+DESCRIPTION=Inspire IRCd - The Stable, High-Performance Modular IRCd
+EAPI=7
+HOMEPAGE=https://inspircd.github.com/
+IUSE=debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/inspircd acct-user/inspircd dev-lang/perl gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls:= ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) re2? ( dev-libs/re2:= ) sqlite? ( >=dev-db/sqlite-3.0 ) ssl? ( dev-libs/openssl:= ) tre? ( dev-libs/tre )
+SLOT=0
+SRC_URI=https://github.com/inspircd/inspircd/archive/v3.3.0.tar.gz -> inspircd-3.3.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=15bd934d0b963270c18d6d5ec647c3b2
diff --git a/metadata/md5-cache/net-irc/irssi-1.2.1 b/metadata/md5-cache/net-irc/irssi-1.2.1
deleted file mode 100644
index 393d645aab12..000000000000
--- a/metadata/md5-cache/net-irc/irssi-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !net-irc/irssi-otr !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig
-DESCRIPTION=A modular textUI IRC client with IPv6 support
-EAPI=6
-HOMEPAGE=https://irssi.org/
-IUSE=otr +perl selinux socks5 +proxy libressl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !net-irc/irssi-otr !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/irssi/irssi/releases/download/1.2.1/irssi-1.2.1.tar.xz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
-_md5_=1ca97580c47b1fbcd4f463b96a38786b
diff --git a/metadata/md5-cache/net-irc/irssi-1.2.2 b/metadata/md5-cache/net-irc/irssi-1.2.2
new file mode 100644
index 000000000000..b03576fa21e2
--- /dev/null
+++ b/metadata/md5-cache/net-irc/irssi-1.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !net-irc/irssi-otr !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig
+DESCRIPTION=A modular textUI IRC client with IPv6 support
+EAPI=6
+HOMEPAGE=https://irssi.org/
+IUSE=otr +perl selinux socks5 +proxy libressl
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !net-irc/irssi-otr !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/irssi/irssi/releases/download/1.2.2/irssi-1.2.2.tar.xz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
+_md5_=1ca97580c47b1fbcd4f463b96a38786b
diff --git a/metadata/md5-cache/net-irc/polari-3.30.2 b/metadata/md5-cache/net-irc/polari-3.30.2
index a5e6debb06e2..4b203a9ba0f2 100644
--- a/metadata/md5-cache/net-irc/polari-3.30.2
+++ b/metadata/md5-cache/net-irc/polari-3.30.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3[introspection] net-libs/telepathy-glib[introspection] >=dev-libs/gobject-introspection-1.50:= >=dev-libs/gjs-1.53.90 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection] >=net-irc/telepathy-idle-0.2
 SLOT=0
 SRC_URI=mirror://gnome/sources/polari/3.30/polari-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c79c882615ac825b624dc0c3cf9ba1d4
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index d591561fe8ad..63804b39d2f7 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/accounts-qt-1.15 b/metadata/md5-cache/net-libs/accounts-qt-1.15
index 4e7fa6a01e94..6f99bd948123 100644
--- a/metadata/md5-cache/net-libs/accounts-qt-1.15
+++ b/metadata/md5-cache/net-libs/accounts-qt-1.15
@@ -1,14 +1,15 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=net-libs/libaccounts-glib-1.23:= dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtxml:5 doc? ( app-doc/doxygen ) test? ( dev-qt/qttest:5 )
+BDEPEND=doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtxml:5 >=net-libs/libaccounts-glib-1.23:= test? ( dev-qt/qttest:5 )
 DESCRIPTION=Qt5 bindings for libaccounts-glib
-EAPI=6
+EAPI=7
 HOMEPAGE=https://01.org/gsso/
 IUSE=doc test
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1
-RDEPEND=>=net-libs/libaccounts-glib-1.23:= dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtxml:5
+RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtxml:5 >=net-libs/libaccounts-glib-1.23:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/libaccounts-qt/repository/VERSION_1.15/archive.tar.gz -> accounts-qt-1.15.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=67bb2ad518829bc5a7a0166576ae274c
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9c5abbc8c8f00e5a51937d5a08acd29d
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.58.0 b/metadata/md5-cache/net-libs/glib-networking-2.58.0
index b4f5775f1a54..74c14c025cb0 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.58.0
+++ b/metadata/md5-cache/net-libs/glib-networking-2.58.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.55.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/gnutls-3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib-networking/2.58/glib-networking-2.58.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e91256402e4cc134d960b3f33c9876a8
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.60.3 b/metadata/md5-cache/net-libs/glib-networking-2.60.3
index 7901ee7f9a91..ffdb5efdbabf 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.60.3
+++ b/metadata/md5-cache/net-libs/glib-networking-2.60.3
@@ -5,10 +5,10 @@ DESCRIPTION=Network-related giomodules for glib
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/glib-networking/
 IUSE=+gnome +libproxy +ssl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.55.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/gnutls-3.4.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib-networking/2.60/glib-networking-2.60.3.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=927636fb630e018b1a6712a4b7021751
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4ad2272d04e7b20d29b837f393c7d48a
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.22 b/metadata/md5-cache/net-libs/gloox-1.0.22
index e9be532944bb..6e6046fd7776 100644
--- a/metadata/md5-cache/net-libs/gloox-1.0.22
+++ b/metadata/md5-cache/net-libs/gloox-1.0.22
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) zlib? ( sys-libs/zlib )
+DEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib )
 DESCRIPTION=A portable high-level Jabber/XMPP library for C++
 EAPI=7
 HOMEPAGE=https://camaya.net/gloox/
 IUSE=debug gnutls idn libressl ssl static-libs test zlib
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) zlib? ( sys-libs/zlib )
+RDEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib )
 RESTRICT=test
 SLOT=0/17
 SRC_URI=https://camaya.net/download/gloox-1.0.22.tar.bz2
-_md5_=82e36c3b821c0f3051090a977c2cbc33
+_md5_=fa382a039bb86d92e4f951748b7534cd
diff --git a/metadata/md5-cache/net-libs/gnutls-3.6.9 b/metadata/md5-cache/net-libs/gnutls-3.6.9
new file mode 100644
index 000000000000..f3edcdfba890
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gnutls-3.6.9
@@ -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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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.9.tar.xz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=2c658f6fbdbf5d7d9d8791d8a1f616a5
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.91 b/metadata/md5-cache/net-libs/gsoap-2.8.91
new file mode 100644
index 000000000000..bedb004708b6
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.91
@@ -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.91.zip
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b69f5cb1d91a05f61264bb07746b0e64
diff --git a/metadata/md5-cache/net-libs/gupnp-1.0.4 b/metadata/md5-cache/net-libs/gupnp-1.0.4
new file mode 100644
index 000000000000..a000ebda6501
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gupnp-1.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=net-libs/gssdp-0.14.15:0=[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.48.0:2.4[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.36:= || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) connman? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) networkmanager? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !net-libs/gupnp-vala >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An object-oriented framework for creating UPnP devs and control points
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
+IUSE=connman +introspection kernel_linux networkmanager abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=net-libs/gssdp-0.14.15:0=[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.48.0:2.4[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.36:= || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) connman? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) networkmanager? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !net-libs/gupnp-vala
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ?? ( connman networkmanager )
+SLOT=0/4
+SRC_URI=mirror://gnome/sources/gupnp/1.0/gupnp-1.0.4.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=edbeb7786d95bcf8c179c2d11a2731c9
diff --git a/metadata/md5-cache/net-libs/kdav2-0.3.0 b/metadata/md5-cache/net-libs/kdav2-0.3.0
new file mode 100644
index 000000000000..b0a3e0f2b171
--- /dev/null
+++ b/metadata/md5-cache/net-libs/kdav2-0.3.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KJob based DAV protocol implementation
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/unstable/kdav2/0.3.0/src/kdav2-0.3.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5f300bd845b35a1879e632172a31daaa
diff --git a/metadata/md5-cache/net-libs/kimap2-0.3.0 b/metadata/md5-cache/net-libs/kimap2-0.3.0
new file mode 100644
index 000000000000..283e4eea5ed0
--- /dev/null
+++ b/metadata/md5-cache/net-libs/kimap2-0.3.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-apps/kmime-19.04.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] dev-libs/cyrus-sasl:2 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Library for interacting with IMAP servers - successor of kimap
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-apps/kmime-19.04.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] dev-libs/cyrus-sasl:2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/unstable/kimap2/0.3.0/src/kimap2-0.3.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=19d427382634aead2fe97af79cded4ff
diff --git a/metadata/md5-cache/net-libs/libaccounts-glib-1.24-r1 b/metadata/md5-cache/net-libs/libaccounts-glib-1.24-r1
index b68ce3a94b09..abfc9dbcbf20 100644
--- a/metadata/md5-cache/net-libs/libaccounts-glib-1.24-r1
+++ b/metadata/md5-cache/net-libs/libaccounts-glib-1.24-r1
@@ -1,16 +1,16 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-libs/check doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+BDEPEND=|| ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-util/gdbus-codegen dev-util/glib-utils dev-libs/check doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection:= dev-libs/libxml2 dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Accounts SSO (Single Sign-On) management library for GLib applications
 EAPI=7
 HOMEPAGE=https://01.org/gsso/
 IUSE=doc python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection:= dev-libs/libxml2 dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0/1
 SRC_URI=https://gitlab.com/accounts-sso/libaccounts-glib/-/archive/VERSION_1.24/libaccounts-glib-VERSION_1.24.tar.gz -> libaccounts-glib-1.24.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=0d7835c0fb799827c0a5011112345455
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=f9a67009d5b37a822de0dbed4ba22ff6
diff --git a/metadata/md5-cache/net-libs/libktorrent-2.1.1 b/metadata/md5-cache/net-libs/libktorrent-2.1.1
new file mode 100644
index 000000000000..ad69c20c430a
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libktorrent-2.1.1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=BitTorrent library based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/ktorrent/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= !dev-libs/botan[gmp(-)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/ktorrent/5.1.2/libktorrent-2.1.1.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=231d3cfff5fb2bde1571b7a69dce3b9b
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.65 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.65
index d2084138206a..28ff7ece4dff 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.65
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.65
@@ -4,10 +4,10 @@ DESCRIPTION=Small C library to run an HTTP server as part of another application
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
 IUSE=+epoll messages ssl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.65.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=20b95cf8d8af23c5a9903e1e29c88465
+_md5_=20d8449e494a3c813068554a7f72f1cb
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.1.3 b/metadata/md5-cache/net-libs/libnftnl-1.1.3
index 93d5f617555e..530408cb4319 100644
--- a/metadata/md5-cache/net-libs/libnftnl-1.1.3
+++ b/metadata/md5-cache/net-libs/libnftnl-1.1.3
@@ -5,10 +5,10 @@ DESCRIPTION=Netlink API to the in-kernel nf_tables subsystem
 EAPI=7
 HOMEPAGE=https://netfilter.org/projects/nftables/
 IUSE=examples static-libs test kernel_linux split-usr
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3
 SLOT=0/11
 SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.1.3.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=753ec367bcf6501d31e90e13b99a412e
+_md5_=5e11f7f319fe551ce7fe98c8cb49b7ca
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.1.4 b/metadata/md5-cache/net-libs/libnftnl-1.1.4
new file mode 100644
index 000000000000..dbe6939e8ef1
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnftnl-1.1.4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install setup
+DEPEND=>=net-libs/libmnl-1.0.3
+DESCRIPTION=Netlink API to the in-kernel nf_tables subsystem
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=examples static-libs test kernel_linux split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.3
+SLOT=0/11
+SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.1.4.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=74af29dd21dbbdd5e915aba68ac225e9
diff --git a/metadata/md5-cache/net-libs/libpcap-1.9.0-r1 b/metadata/md5-cache/net-libs/libpcap-1.9.0-r1
new file mode 100644
index 000000000000..9a7d4cef274b
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libpcap-1.9.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex virtual/yacc dbus? ( virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A system-independent library for user-level network packet capture
+EAPI=6
+HOMEPAGE=http://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap
+IUSE=bluetooth dbus netlink static-libs usb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://github.com/the-tcpdump-group/libpcap/archive/libpcap-1.9.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=63ef9195bfa06b182816272178085162
diff --git a/metadata/md5-cache/net-libs/libpcap-9999 b/metadata/md5-cache/net-libs/libpcap-9999
index bf32312eabdc..0f69b7169709 100644
--- a/metadata/md5-cache/net-libs/libpcap-9999
+++ b/metadata/md5-cache/net-libs/libpcap-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d97499329a43255119b91c3d308b08b2
+_md5_=4842b004675b3f879ec671fb6afd8aaf
diff --git a/metadata/md5-cache/net-libs/libsignon-glib-2.1 b/metadata/md5-cache/net-libs/libsignon-glib-2.1
index 223f965abee6..8bc4929b9142 100644
--- a/metadata/md5-cache/net-libs/libsignon-glib-2.1
+++ b/metadata/md5-cache/net-libs/libsignon-glib-2.1
@@ -5,12 +5,12 @@ DESCRIPTION=GLib binding for the D-Bus API provided by signond
 EAPI=7
 HOMEPAGE=https://01.org/gsso/
 IUSE=debug doc +introspection python test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 net-libs/signond introspection? ( dev-libs/gobject-introspection:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/libsignon-glib/-/archive/VERSION_2.1/libsignon-glib-VERSION_2.1.tar.gz -> libsignon-glib-2.1.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=21eb7d4453ea1db8987fc2257f4e2b62
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=09a17abd8498f0b658d784d0e5259fd5
diff --git a/metadata/md5-cache/net-libs/libsoup-2.66.2 b/metadata/md5-cache/net-libs/libsoup-2.66.2
new file mode 100644
index 000000000000..567bdb5cf0cd
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libsoup-2.66.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.20 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libpsl-0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) samba? ( net-fs/samba ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=HTTP client/server library for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/libsoup
+IUSE=gssapi gtk-doc +introspection samba ssl test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libpsl-0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) samba? ( net-fs/samba ) >=net-libs/glib-networking-2.38.2[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+REQUIRED_USE=vala? ( introspection )
+SLOT=2.4
+SRC_URI=mirror://gnome/sources/libsoup/2.66/libsoup-2.66.2.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e59db51490b7ceca4af04a3af50dfcae
diff --git a/metadata/md5-cache/net-libs/libssh-0.8.6 b/metadata/md5-cache/net-libs/libssh-0.8.6
deleted file mode 100644
index c83b88723b85..000000000000
--- a/metadata/md5-cache/net-libs/libssh-0.8.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] ) test? ( >=dev-util/cmocka-0.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Access a working SSH implementation by means of a library
-EAPI=7
-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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=?? ( gcrypt mbedtls ) test? ( static-libs )
-SLOT=0/4
-SRC_URI=https://www.libssh.org/files/0.8/libssh-0.8.6.tar.xz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f83948a61135f68aeed3f03b0e4d658
diff --git a/metadata/md5-cache/net-libs/libssh-0.8.7 b/metadata/md5-cache/net-libs/libssh-0.8.7
deleted file mode 100644
index 6715f28eb50a..000000000000
--- a/metadata/md5-cache/net-libs/libssh-0.8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] ) test? ( >=dev-util/cmocka-0.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Access a working SSH implementation by means of a library
-EAPI=7
-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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=?? ( gcrypt mbedtls ) test? ( static-libs )
-SLOT=0/4
-SRC_URI=https://www.libssh.org/files/0.8/libssh-0.8.7.tar.xz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86d162e783fb488a10471531ed35efe8
diff --git a/metadata/md5-cache/net-libs/libssh-0.9.0 b/metadata/md5-cache/net-libs/libssh-0.9.0
index f3f63869ef84..12ac0a1a5b9e 100644
--- a/metadata/md5-cache/net-libs/libssh-0.9.0
+++ b/metadata/md5-cache/net-libs/libssh-0.9.0
@@ -5,11 +5,11 @@ DESCRIPTION=Access a working SSH implementation by means of a library
 EAPI=7
 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=?? ( gcrypt mbedtls ) test? ( static-libs )
 SLOT=0/4
 SRC_URI=https://www.libssh.org/files/0.9/libssh-0.9.0.tar.xz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5cfc1189bc10257771b45254e3196d9
+_md5_=8e4fd0da87a9ebc0134f556063c10267
diff --git a/metadata/md5-cache/net-libs/libssh2-1.9.0-r1 b/metadata/md5-cache/net-libs/libssh2-1.9.0-r1
new file mode 100644
index 000000000000..a853a7dd1125
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libssh2-1.9.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Library implementing the SSH2 protocol
+EAPI=7
+HOMEPAGE=https://www.libssh2.org
+IUSE=gcrypt libressl mbedtls zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=?? ( gcrypt mbedtls )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.libssh2.org/download/libssh2-1.9.0.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ae265f7386b26b1315a70895ce3551d1
diff --git a/metadata/md5-cache/net-libs/libtrace-4.0.9_p1-r1 b/metadata/md5-cache/net-libs/libtrace-4.0.9_p1-r1
new file mode 100644
index 000000000000..9f7d2a4524ee
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libtrace-4.0.9_p1-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=net-libs/libpcap-0.8 dev-libs/libyaml dev-libs/openssl:0= net-libs/wandio ncurses? ( sys-libs/ncurses:0= ) numa? ( sys-process/numactl ) app-doc/doxygen sys-devel/flex virtual/os-headers virtual/pkgconfig virtual/yacc
+DESCRIPTION=A library and tools for trace processing
+EAPI=7
+HOMEPAGE=https://research.wand.net.nz/software/libtrace.php
+IUSE=doc ncurses numa static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=net-libs/libpcap-0.8 dev-libs/libyaml dev-libs/openssl:0= net-libs/wandio ncurses? ( sys-libs/ncurses:0= ) numa? ( sys-process/numactl )
+SLOT=0
+SRC_URI=https://github.com/LibtraceTeam/libtrace/archive//4.0.9-1.tar.gz -> libtrace-4.0.9_p1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=d9b10e5d54976ab2097d0463728e2fca
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.1.20190210 b/metadata/md5-cache/net-libs/miniupnpc-2.1.20190210
deleted file mode 100644
index ccb6a656385e..000000000000
--- a/metadata/md5-cache/net-libs/miniupnpc-2.1.20190210
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=kernel_linux? ( sys-apps/lsb-release sys-apps/which )
-DESCRIPTION=UPnP client library and a simple UPnP client
-EAPI=6
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=ipv6 kernel_linux static-libs
-KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd
-LICENSE=BSD
-SLOT=0/17
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20190210.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3b13cc770ab6231246a0d4fb90dabc76
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.1.20190408 b/metadata/md5-cache/net-libs/miniupnpc-2.1.20190408
deleted file mode 100644
index e5d9f8cb2f70..000000000000
--- a/metadata/md5-cache/net-libs/miniupnpc-2.1.20190408
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=kernel_linux? ( sys-apps/lsb-release sys-apps/which )
-DESCRIPTION=UPnP client library and a simple UPnP client
-EAPI=6
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=ipv6 kernel_linux static-libs
-KEYWORDS=amd64 ~arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd
-LICENSE=BSD
-SLOT=0/17
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20190408.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1e3a49c86ae915adaf85ac1bd6625bf9
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.1.20190824 b/metadata/md5-cache/net-libs/miniupnpc-2.1.20190824
new file mode 100644
index 000000000000..d56e5afb7374
--- /dev/null
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.1.20190824
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=kernel_linux? ( sys-apps/lsb-release sys-apps/which )
+DESCRIPTION=UPnP client library and a simple UPnP client
+EAPI=7
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=ipv6 kernel_linux static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD
+SLOT=0/17
+SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20190824.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=de0c49d0ea736bf802f26d10d9991314
diff --git a/metadata/md5-cache/net-libs/nDPI-2.8 b/metadata/md5-cache/net-libs/nDPI-2.8
new file mode 100644
index 000000000000..f96f32c7fa4f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nDPI-2.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/json-c:= net-libs/libpcap >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Open Source Deep Packet Inspection Software Toolkit
+EAPI=6
+HOMEPAGE=http://www.ntop.org/
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/json-c:= net-libs/libpcap
+SLOT=0
+SRC_URI=https://github.com/ntop/nDPI/archive/2.8.tar.gz -> nDPI-2.8.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=322451f3a2cef9270f8c3f9644ac374c
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.39.1 b/metadata/md5-cache/net-libs/nghttp2-1.39.1
deleted file mode 100644
index f3965d480ad2..000000000000
--- a/metadata/md5-cache/net-libs/nghttp2-1.39.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=HTTP/2 C Library
-EAPI=7
-HOMEPAGE=https://nghttp2.org/
-IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd
-LICENSE=MIT
-RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/1.14
-SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.39.1/nghttp2-1.39.1.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1837ee98b557a7d7bc09b7e6c6926066
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.39.2 b/metadata/md5-cache/net-libs/nghttp2-1.39.2
index 0f24a0a60250..3a195a3142a3 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.39.2
+++ b/metadata/md5-cache/net-libs/nghttp2-1.39.2
@@ -4,10 +4,10 @@ DESCRIPTION=HTTP/2 C Library
 EAPI=7
 HOMEPAGE=https://nghttp2.org/
 IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-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
 RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/1.14
 SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.39.2/nghttp2-1.39.2.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b72479c75b83910ce29dab74c8b16ce6
+_md5_=1837ee98b557a7d7bc09b7e6c6926066
diff --git a/metadata/md5-cache/net-libs/nodejs-12.10.0 b/metadata/md5-cache/net-libs/nodejs-12.10.0
new file mode 100644
index 000000000000..b2d7c65fc052
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-12.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.31.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test
+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.31.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl )
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v12.10.0/node-v12.10.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=dabc6e7e75f57a2681092b0bd1f9d948
diff --git a/metadata/md5-cache/net-libs/nodejs-12.8.1 b/metadata/md5-cache/net-libs/nodejs-12.8.1
deleted file mode 100644
index d1e4465abb92..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-12.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.30.1:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test
-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.30.1:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl )
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v12.8.1/node-v12.8.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=12191615bfdfd29d627c4fac43a67765
diff --git a/metadata/md5-cache/net-libs/nodejs-12.9.1 b/metadata/md5-cache/net-libs/nodejs-12.9.1
new file mode 100644
index 000000000000..7b354bf4452c
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-12.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.31.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test
+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.31.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl )
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v12.9.1/node-v12.9.1.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=dabc6e7e75f57a2681092b0bd1f9d948
diff --git a/metadata/md5-cache/net-libs/telepathy-accounts-signon-2.0 b/metadata/md5-cache/net-libs/telepathy-accounts-signon-2.0
index d100e383b15b..f4ab4ab1c251 100644
--- a/metadata/md5-cache/net-libs/telepathy-accounts-signon-2.0
+++ b/metadata/md5-cache/net-libs/telepathy-accounts-signon-2.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 net-im/telepathy-mission-control net-libs/libaccounts-gli
 DESCRIPTION=Mission control plugin for Telepathy to provide IM accounts and authentication
 EAPI=7
 HOMEPAGE=https://gitlab.com/accounts-sso/telepathy-accounts-signon
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 net-im/telepathy-mission-control net-libs/libaccounts-glib:= >=net-libs/libsignon-glib-2.0 net-libs/telepathy-glib
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/telepathy-accounts-signon/-/archive/2.0/telepathy-accounts-signon-2.0.tar.bz2
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=bac349c09dc242d36135604b0c9fabad
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9a0692806f429081417ad3edf846c556
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.24.1 b/metadata/md5-cache/net-libs/webkit-gtk-2.24.1
deleted file mode 100644
index 101724a98f83..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.24.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.4 dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) dev-util/ninja >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open source web browser engine
-EAPI=6
-HOMEPAGE=https://www.webkitgtk.org
-IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage )
-REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) nsplugin? ( X ) webgl? ( gstreamer || ( gles2 opengl ) ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4/37
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.24.1.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8bdb05f52b027d1fa9709747a10321a5
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.24.2 b/metadata/md5-cache/net-libs/webkit-gtk-2.24.2
deleted file mode 100644
index 139bd9c085c5..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.24.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.4 dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) dev-util/ninja >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open source web browser engine
-EAPI=6
-HOMEPAGE=https://www.webkitgtk.org
-IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage )
-REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) nsplugin? ( X ) webgl? ( gstreamer || ( gles2 opengl ) ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4/37
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.24.2.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f8c997635001747089dd8036ea9a9b8
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.24.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.24.3
deleted file mode 100644
index e9bf216998cc..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.24.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.4 dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) dev-util/ninja >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open source web browser engine
-EAPI=6
-HOMEPAGE=https://www.webkitgtk.org
-IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X test
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage )
-REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) nsplugin? ( X ) webgl? ( gstreamer || ( gles2 opengl ) ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4/37
-SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.24.3.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc528e9500932e1b79bbfc6535a096f5
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.24.4 b/metadata/md5-cache/net-libs/webkit-gtk-2.24.4
new file mode 100644
index 000000000000..ca07b36eeef1
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.24.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.4 dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) dev-util/ninja >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open source web browser engine
+EAPI=6
+HOMEPAGE=https://www.webkitgtk.org
+IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X test
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage )
+REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) nsplugin? ( X ) webgl? ( gstreamer || ( gles2 opengl ) ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.24.4.tar.xz
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=73f79d1a0e46ef19d394fbb68f45dcd4
diff --git a/metadata/md5-cache/net-libs/wvstreams-4.6.1_p14-r1 b/metadata/md5-cache/net-libs/wvstreams-4.6.1_p14-r1
index dac4a726bcd0..20081b6f7ff4 100644
--- a/metadata/md5-cache/net-libs/wvstreams-4.6.1_p14-r1
+++ b/metadata/md5-cache/net-libs/wvstreams-4.6.1_p14-r1
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/openssl-1.1:0= sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) pam? ( virtual/pam ) virtual/pkgconfig doc? ( app-doc/doxygen ) boost? ( >=dev-libs/boost-1.34.1:= )
+DEPEND=sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) !libressl? ( >=dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:0= ) pam? ( virtual/pam ) virtual/pkgconfig doc? ( app-doc/doxygen ) boost? ( >=dev-libs/boost-1.34.1:= )
 DESCRIPTION=A network programming library in C++
 EAPI=7
 HOMEPAGE=https://github.com/apenwarr/wvstreams
-IUSE=pam doc +ssl +dbus debug boost
+IUSE=boost +dbus debug doc libressl pam
 KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/openssl-1.1:0= sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) pam? ( virtual/pam )
+RDEPEND=sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) !libressl? ( >=dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:0= ) pam? ( virtual/pam )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/wvstreams/wvstreams_4.6.1.orig.tar.gz mirror://debian/pool/main/w/wvstreams/wvstreams_4.6.1-14.debian.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9d50f0461d60b4fc25daef03bd45744e
+_md5_=9550a68c64421b1ab4b7d91797463c7e
diff --git a/metadata/md5-cache/net-libs/wvstreams-99999 b/metadata/md5-cache/net-libs/wvstreams-99999
index 3bfa11ab1b82..4df1c2cb8170 100644
--- a/metadata/md5-cache/net-libs/wvstreams-99999
+++ b/metadata/md5-cache/net-libs/wvstreams-99999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=<dev-libs/openssl-1.1:0= sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) pam? ( virtual/pam ) dev-util/redo virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) !libressl? ( <dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:0= ) pam? ( virtual/pam ) dev-util/redo virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A network programming library in C++
 EAPI=6
 HOMEPAGE=https://github.com/apenwarr/wvstreams
-IUSE=+dbus debug doc pam static-libs +zlib
+IUSE=+dbus debug doc libressl pam static-libs +zlib
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=<dev-libs/openssl-1.1:0= sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) pam? ( virtual/pam )
+RDEPEND=sys-libs/readline:0= sys-libs/zlib dbus? ( >=sys-apps/dbus-1.4.20 ) !libressl? ( <dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:0= ) pam? ( virtual/pam )
 SLOT=0/5.0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d494926413de5cbf704a3d35687c0492
+_md5_=84b0dc1b8d82fcf2214eba2f82b1c5b3
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 912bc58ed95a..8bf8224ffae4 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/dovecot-2.2.36.3 b/metadata/md5-cache/net-mail/dovecot-2.2.36.3
deleted file mode 100644
index 88215df9ce32..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.2.36.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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 IMAP and POP3 server written with security primarily in mind
-EAPI=6
-HOMEPAGE=https://www.dovecot.org/
-IUSE=kerberos ldap mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
-SLOT=0
-SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.36.3.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.24.1.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.24.1.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=44109bc79344746ad93168ee07279e02
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.36.4 b/metadata/md5-cache/net-mail/dovecot-2.2.36.4
new file mode 100644
index 000000000000..32927cebe934
--- /dev/null
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.36.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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 IMAP and POP3 server written with security primarily in mind
+EAPI=6
+HOMEPAGE=https://www.dovecot.org/
+IUSE=kerberos ldap mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1 MIT
+RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
+SLOT=0
+SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.36.4.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.24.2.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.24.2.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=01733b47f72aa3e64663736d9d1878cf
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.6 b/metadata/md5-cache/net-mail/dovecot-2.3.6
index 4da6afa41384..565d3363cb6a 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.6
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.6
@@ -10,4 +10,4 @@ RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-lib
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.6.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.6.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.6.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=a670a96e1e3ffbad5705b37e11b0ef13
+_md5_=56c3b1385117d34708aaad34c6137929
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.6-r1 b/metadata/md5-cache/net-mail/dovecot-2.3.6-r1
deleted file mode 100644
index 76b54e01be51..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.3.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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 IMAP and POP3 server written with security primarily in mind
-EAPI=6
-HOMEPAGE=https://www.dovecot.org/
-IUSE=kerberos ldap lua mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
-SLOT=0
-SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.6.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.6.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.6.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=73f4b57c3e181e3f4900965f93e17f83
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.7.1 b/metadata/md5-cache/net-mail/dovecot-2.3.7.1
index a60cef2a87c5..1b91f81d6e48 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.7.1
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.7.1
@@ -10,4 +10,4 @@ RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-lib
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.7.1.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.7.1.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.7.1.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=708d1892e2130c57bba3d776137ecd3b
+_md5_=a1a8b9ddab59317115bbf344ecc5bc73
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.7.2 b/metadata/md5-cache/net-mail/dovecot-2.3.7.2
new file mode 100644
index 000000000000..d6ffad562d63
--- /dev/null
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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 IMAP and POP3 server written with security primarily in mind
+EAPI=6
+HOMEPAGE=https://www.dovecot.org/
+IUSE=kerberos ldap lua mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86
+LICENSE=LGPL-2.1 MIT
+RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
+SLOT=0
+SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.7.2.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.7.2.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.7.2.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=fbfdbaef3e1b70739ff5e4188929720b
diff --git a/metadata/md5-cache/net-mail/mailutils-3.4-r3 b/metadata/md5-cache/net-mail/mailutils-3.4-r3
index edc29a35015b..bc9abdaca964 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.4-r3
+++ b/metadata/md5-cache/net-mail/mailutils-3.4-r3
@@ -4,11 +4,11 @@ DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
 IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet python_targets_python2_7
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( virtual/emacs ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:12/22 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
 REQUIRED_USE=python? ( python_targets_python2_7 ) servers? ( tcpd )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.4.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e2727f254900ae0ce2864451f99f835f
+_md5_=e40089284b68d146bc82375547356b5e
diff --git a/metadata/md5-cache/net-mail/mu-1.3.3 b/metadata/md5-cache/net-mail/mu-1.3.3
new file mode 100644
index 000000000000..8ff87fe7df34
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mu-1.3.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm prepare test
+DEPEND=dev-libs/gmime:3.0 >=dev-libs/xapian-1.4 dev-libs/glib:2 emacs? ( >=virtual/emacs-24.4 ) guile? ( >=dev-scheme/guile-2.0 ) !net-mail/mailutils
+DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
+EAPI=7
+HOMEPAGE=http://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
+IUSE=emacs guile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/gmime:3.0 >=dev-libs/xapian-1.4 dev-libs/glib:2 emacs? ( >=virtual/emacs-24.4 ) guile? ( >=dev-scheme/guile-2.0 ) !net-mail/mailutils
+SLOT=0
+SRC_URI=https://github.com/djcb/mu/archive/1.3.3.tar.gz -> mu-1.3.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a62dfe95615c076f3fdae789089186bc
diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.1 b/metadata/md5-cache/net-mail/notmuch-0.29.1
index 04f7f0153bce..54af12ac38a2 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.29.1
+++ b/metadata/md5-cache/net-mail/notmuch-0.29.1
@@ -11,4 +11,4 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_ta
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.29.1.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81952ab67f91dd8c76898f0c7a759054
+_md5_=142ece79a5e379394c791b4a956970da
diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.1-r1 b/metadata/md5-cache/net-mail/notmuch-0.29.1-r1
new file mode 100644
index 000000000000..0a6ef1fda826
--- /dev/null
+++ b/metadata/md5-cache/net-mail/notmuch-0.29.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmime-3.0.3:3.0 >=dev-libs/xapian-1.4.8:= dev-python/sphinx sys-apps/texinfo >=sys-libs/zlib-1.2.5.2 sys-libs/talloc crypt? ( dev-libs/gmime:3.0[crypt] ) emacs? ( >=virtual/emacs-23 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig doc? ( app-doc/doxygen dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb crypt? ( app-crypt/gnupg dev-libs/openssl ) ) valgrind? ( dev-util/valgrind )
+DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
+EAPI=6
+HOMEPAGE=https://notmuchmail.org/
+IUSE=crypt doc emacs mutt nmbug python test valgrind python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~x86 ~x64-solaris
+LICENSE=GPL-3
+RDEPEND=!!<app-shells/bash-completion-1.9 >=dev-libs/glib-2.22:2 >=dev-libs/gmime-3.0.3:3.0 >=dev-libs/xapian-1.4.8:= dev-python/sphinx sys-apps/texinfo >=sys-libs/zlib-1.2.5.2 sys-libs/talloc crypt? ( dev-libs/gmime:3.0[crypt] ) emacs? ( >=virtual/emacs-23 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) crypt? ( app-crypt/gnupg ) nmbug? ( dev-vcs/git ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Pod-Parser )
+REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) test? ( crypt emacs python valgrind )
+SLOT=0/5
+SRC_URI=https://notmuchmail.org/releases/notmuch-0.29.1.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=22bef1ce119c4aeee76b1a5c854714ff
diff --git a/metadata/md5-cache/net-mail/rss2email-2.71-r1 b/metadata/md5-cache/net-mail/rss2email-2.71-r1
index cf2692513165..ec6a020eae72 100644
--- a/metadata/md5-cache/net-mail/rss2email-2.71-r1
+++ b/metadata/md5-cache/net-mail/rss2email-2.71-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.allthingsrss.com/rss2email/rss2email-2.71.tar.gz mirror://debian/pool/main/r/rss2email/rss2email_2.65-1.diff.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ed5c613841bab9f0183ca5c140d04d35
+_md5_=0f032b9d7126c4ccbb8985ee3d814010
diff --git a/metadata/md5-cache/net-misc/AQtion-2.2.7 b/metadata/md5-cache/net-misc/AQtion-2.2.7
new file mode 100644
index 000000000000..cb82c893b7ec
--- /dev/null
+++ b/metadata/md5-cache/net-misc/AQtion-2.2.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=virtual/linux-sources kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Aquantia AQC multigigabit NIC linux driver (atlantic) - development preview
+EAPI=7
+HOMEPAGE=https://github.com/Aquantia/AQtion
+IUSE=lro kernel_linux kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://github.com/Aquantia/AQtion/archive/e024a859ea828ced78db310328db90dbedea837a.tar.gz -> AQtion-2.2.7.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8d00349ad5a55f0575bebfafb1e48fcd
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 35e0322b0b0b..85de1c92e5cf 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/bgpq3-0.1.35 b/metadata/md5-cache/net-misc/bgpq3-0.1.35
index 33ae00456d22..c5a8b6418771 100644
--- a/metadata/md5-cache/net-misc/bgpq3-0.1.35
+++ b/metadata/md5-cache/net-misc/bgpq3-0.1.35
@@ -8,4 +8,4 @@ LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/snar/bgpq3/archive/v0.1.35.tar.gz -> bgpq3-0.1.35.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1abf2b7fcb8d60726a11975d86c7c525
+_md5_=74f7a5aab4364882ae21e5e91fa41d01
diff --git a/metadata/md5-cache/net-misc/casync-2_p20190407 b/metadata/md5-cache/net-misc/casync-2_p20190407
index 8fe52b0745d5..32a1c01c4e83 100644
--- a/metadata/md5-cache/net-misc/casync-2_p20190407
+++ b/metadata/md5-cache/net-misc/casync-2_p20190407
@@ -11,5 +11,5 @@ RDEPEND=app-arch/xz-utils:= app-arch/zstd:= dev-libs/openssl:0= net-misc/curl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/casync/archive/6d185a540c54195a919d4b44f9bf28c341da3bf1.tar.gz -> casync-2_p20190407.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=f0217de4b47ff5e1cab86b8fc04352ab
diff --git a/metadata/md5-cache/net-misc/dhcpcd-8.0.2-r1 b/metadata/md5-cache/net-misc/dhcpcd-8.0.2-r1
deleted file mode 100644
index b7cd61e5de04..000000000000
--- a/metadata/md5-cache/net-misc/dhcpcd-8.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst
-DEPEND=udev? ( virtual/udev )
-DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
-EAPI=7
-HOMEPAGE=https://roy.marples.name/projects/dhcpcd
-IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=udev? ( virtual/udev )
-SLOT=0
-SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-8.0.2.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=707a3097776fbf98a8f485e14cdf71d2
diff --git a/metadata/md5-cache/net-misc/dhcpcd-8.0.3 b/metadata/md5-cache/net-misc/dhcpcd-8.0.3
new file mode 100644
index 000000000000..96956a6535d6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dhcpcd-8.0.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=udev? ( virtual/udev )
+DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
+EAPI=7
+HOMEPAGE=https://roy.marples.name/projects/dhcpcd
+IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=udev? ( virtual/udev )
+SLOT=0
+SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-8.0.3.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=3518889b8d1368da5c759c9f60f5f350
diff --git a/metadata/md5-cache/net-misc/dhcpcd-8.0.4 b/metadata/md5-cache/net-misc/dhcpcd-8.0.4
new file mode 100644
index 000000000000..8652e14988c1
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dhcpcd-8.0.4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=udev? ( virtual/udev )
+DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
+EAPI=7
+HOMEPAGE=https://roy.marples.name/projects/dhcpcd
+IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=udev? ( virtual/udev )
+SLOT=0
+SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-8.0.4.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=3518889b8d1368da5c759c9f60f5f350
diff --git a/metadata/md5-cache/net-misc/eventd-0.24.1 b/metadata/md5-cache/net-misc/eventd-0.24.1
index d899407b7279..6ad519bc4d72 100644
--- a/metadata/md5-cache/net-misc/eventd-0.24.1
+++ b/metadata/md5-cache/net-misc/eventd-0.24.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.40:2 sys-apps/util-linux x11-libs/libxkbcommon introsp
 REQUIRED_USE=X? ( notification ) fbcon? ( notification ) notification? ( || ( X fbcon ) ) test? ( websocket )
 SLOT=0
 SRC_URI=https://www.eventd.org/download/eventd/eventd-0.24.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b946fd17b816ec589e689459f74e4acb
diff --git a/metadata/md5-cache/net-misc/geoipupdate-4.0.4 b/metadata/md5-cache/net-misc/geoipupdate-4.0.4
new file mode 100644
index 000000000000..fe766fa05d7a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/geoipupdate-4.0.4
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=performs automatic updates of GeoIP2 and GeoIP Legacy binary databases
+EAPI=7
+HOMEPAGE=https://github.com/maxmind/geoipupdate
+KEYWORDS=~amd64
+LICENSE=|| ( Apache-2.0 MIT )
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/maxmind/geoipupdate/archive/v4.0.4.tar.gz -> geoipupdate-4.0.4.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=01b6f953994d7b67747ddd057dd8f859
diff --git a/metadata/md5-cache/net-misc/geomyidae-0.29 b/metadata/md5-cache/net-misc/geomyidae-0.29
deleted file mode 100644
index ca978d5892d9..000000000000
--- a/metadata/md5-cache/net-misc/geomyidae-0.29
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DESCRIPTION=A daemon to serve the gopher protocol
-EAPI=6
-HOMEPAGE=http://git.r-36.net/geomyidae/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://git.r-36.net/geomyidae/snapshot/geomyidae-0.29.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=fd9a83288ffd4dc24315169f16e38a67
diff --git a/metadata/md5-cache/net-misc/geomyidae-0.34 b/metadata/md5-cache/net-misc/geomyidae-0.34
new file mode 100644
index 000000000000..6e64b2c1199e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/geomyidae-0.34
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare setup
+DESCRIPTION=A daemon to serve the gopher protocol
+EAPI=7
+HOMEPAGE=http://r-36.net/scm/geomyidae/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=ftp://bitreich.org/releases/geomyidae/geomyidae-v0.34.tgz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=34cb232148180cb73e1346e3c2c037c1
diff --git a/metadata/md5-cache/net-misc/gnome-remote-desktop-0.1.7 b/metadata/md5-cache/net-misc/gnome-remote-desktop-0.1.7
index 3f3f944aab2a..d1236df9cf33 100644
--- a/metadata/md5-cache/net-misc/gnome-remote-desktop-0.1.7
+++ b/metadata/md5-cache/net-misc/gnome-remote-desktop-0.1.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=media-video/pipewire-0.2.5:0/0.2 sys-apps/systemd net-libs/libvncserver app-crypt/libsecret x11-libs/libnotify x11-wm/mutter[screencast]
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/jadahl/gnome-remote-desktop/uploads/ed3e8b8ebc1a74b6f4ed7260a2739f40/gnome-remote-desktop-0.1.7.tar.xz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b2d576c45ad51df0b5f811546539a4e
diff --git a/metadata/md5-cache/net-misc/htpdate-1.2.1 b/metadata/md5-cache/net-misc/htpdate-1.2.1
deleted file mode 100644
index 333cab450d46..000000000000
--- a/metadata/md5-cache/net-misc/htpdate-1.2.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Synchronize local workstation with time offered by remote webservers
-EAPI=7
-HOMEPAGE=http://www.vervest.org/htp/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.vervest.org/htp/archive/c/htpdate-1.2.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=93ca4c1428eebfe7a6aaa69ab0d430a3
diff --git a/metadata/md5-cache/net-misc/htpdate-1.2.2 b/metadata/md5-cache/net-misc/htpdate-1.2.2
new file mode 100644
index 000000000000..2ac9328e8b31
--- /dev/null
+++ b/metadata/md5-cache/net-misc/htpdate-1.2.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Synchronize local workstation with time offered by remote webservers
+EAPI=7
+HOMEPAGE=http://www.vervest.org/htp/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.vervest.org/htp/archive/c/htpdate-1.2.2.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=93ca4c1428eebfe7a6aaa69ab0d430a3
diff --git a/metadata/md5-cache/net-misc/icaclient-19.3.0.5 b/metadata/md5-cache/net-misc/icaclient-19.3.0.5
deleted file mode 100644
index e621cc41ddb0..000000000000
--- a/metadata/md5-cache/net-misc/icaclient-19.3.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare setup
-DESCRIPTION=ICA Client for Citrix Presentation servers
-EAPI=7
-HOMEPAGE=https://www.citrix.com/
-IUSE=nsplugin l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN
-KEYWORDS=-* amd64 x86
-LICENSE=icaclient
-RDEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libcanberra[gtk] media-libs/libogg media-libs/libvorbis media-libs/speex net-dns/libidn:1.33 net-libs/libsoup:2.4 net-misc/curl sys-libs/e2fsprogs-libs sys-libs/zlib virtual/krb5 virtual/jpeg:0 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango
-RESTRICT=mirror strip userpriv fetch
-SLOT=0
-SRC_URI=amd64? ( linuxx64-19.3.0.5.tar.gz ) x86? ( linuxx86-19.3.0.5.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c088cc68575680a42418e015b81f6b5
diff --git a/metadata/md5-cache/net-misc/icaclient-19.6.0.60-r1 b/metadata/md5-cache/net-misc/icaclient-19.6.0.60-r1
index 44deca928394..80e666e65510 100644
--- a/metadata/md5-cache/net-misc/icaclient-19.6.0.60-r1
+++ b/metadata/md5-cache/net-misc/icaclient-19.6.0.60-r1
@@ -3,11 +3,11 @@ DESCRIPTION=ICA Client for Citrix Presentation servers
 EAPI=7
 HOMEPAGE=https://www.citrix.com/
 IUSE=l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=icaclient
 RDEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libogg media-libs/libvorbis media-libs/speex net-libs/libsoup:2.4 net-libs/webkit-gtk:4 net-misc/curl sys-libs/e2fsprogs-libs sys-libs/zlib virtual/krb5 virtual/jpeg:0 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango
 RESTRICT=mirror strip userpriv fetch
 SLOT=0
 SRC_URI=amd64? ( linuxx64-19.6.0.60.tar.gz ) x86? ( linuxx86-19.6.0.60.tar.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd81230efca9795e64cec0b413cadbd3
+_md5_=cf0b2b34cfd436f1fb2a4a70b41ac4e5
diff --git a/metadata/md5-cache/net-misc/icaclient-19.8.0.20 b/metadata/md5-cache/net-misc/icaclient-19.8.0.20
new file mode 100644
index 000000000000..fe764dd3b293
--- /dev/null
+++ b/metadata/md5-cache/net-misc/icaclient-19.8.0.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm prepare setup
+DESCRIPTION=ICA Client for Citrix Presentation servers
+EAPI=7
+HOMEPAGE=https://www.citrix.com/
+IUSE=l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=icaclient
+RDEPEND=dev-libs/atk dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libogg media-libs/libvorbis media-libs/speex net-libs/libsoup:2.4 net-libs/webkit-gtk:4 net-misc/curl sys-libs/e2fsprogs-libs sys-libs/zlib virtual/krb5 virtual/jpeg:0 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango
+RESTRICT=mirror strip userpriv fetch
+SLOT=0
+SRC_URI=amd64? ( linuxx64-19.8.0.20.tar.gz ) x86? ( linuxx86-19.8.0.20.tar.gz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fd81230efca9795e64cec0b413cadbd3
diff --git a/metadata/md5-cache/net-misc/iputils-20190515 b/metadata/md5-cache/net-misc/iputils-20190515
index 1c17106bb48b..2cb1bb678840 100644
--- a/metadata/md5-cache/net-misc/iputils-20190515
+++ b/metadata/md5-cache/net-misc/iputils-20190515
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+ rdisc
 RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( nettle? ( dev-libs/nettle ) !nettle? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) ) ) ) nls? ( sys-devel/gettext ) )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/s20190515.tar.gz -> iputils-20190515.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20190515.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0bc228ee2409507befbf7a5d013d10bd
diff --git a/metadata/md5-cache/net-misc/iputils-20190709 b/metadata/md5-cache/net-misc/iputils-20190709
index 597ddddb9c68..a8324d019525 100644
--- a/metadata/md5-cache/net-misc/iputils-20190709
+++ b/metadata/md5-cache/net-misc/iputils-20190709
@@ -10,5 +10,5 @@ LICENSE=BSD GPL-2+ rdisc
 RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( nettle? ( dev-libs/nettle ) !nettle? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) ) ) ) nls? ( sys-devel/gettext ) )
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/s20190709.tar.gz -> iputils-20190709.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20190709.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=158a8f9a383f001aaee4ece04fe3d57b
diff --git a/metadata/md5-cache/net-misc/iputils-99999999 b/metadata/md5-cache/net-misc/iputils-99999999
index 3f8ad3c67f18..5f852a3efdb6 100644
--- a/metadata/md5-cache/net-misc/iputils-99999999
+++ b/metadata/md5-cache/net-misc/iputils-99999999
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+ rdisc
 PROPERTIES=live
 RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( nettle? ( dev-libs/nettle ) !nettle? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) ) ) ) nls? ( sys-devel/gettext ) )
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=d9328066d6c38ad3f66168fcb6174c1c
diff --git a/metadata/md5-cache/net-misc/kea-1.4.0_p1 b/metadata/md5-cache/net-misc/kea-1.4.0_p1
deleted file mode 100644
index ac9e9404b340..000000000000
--- a/metadata/md5-cache/net-misc/kea-1.4.0_p1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare
-DEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:= )
-DESCRIPTION=High-performance production grade DHCPv4 & DHCPv6 server
-EAPI=6
-HOMEPAGE=http://www.isc.org/kea/
-IUSE=openssl samples
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC BSD SSLeay GPL-2
-RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:= )
-SLOT=0
-SRC_URI=ftp://ftp.isc.org/isc/kea/kea-1.4.0-P1.tar.gz ftp://ftp.isc.org/isc/kea/1.4.0-P1/kea-1.4.0-P1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=4f3dca22e0173dbcf3e274f0138cef24
diff --git a/metadata/md5-cache/net-misc/kea-1.5.0_beta2 b/metadata/md5-cache/net-misc/kea-1.5.0_beta2
deleted file mode 100644
index 02a7e99d294f..000000000000
--- a/metadata/md5-cache/net-misc/kea-1.5.0_beta2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare
-DEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:0= )
-DESCRIPTION=High-performance production grade DHCPv4 & DHCPv6 server
-EAPI=6
-HOMEPAGE=http://www.isc.org/kea/
-IUSE=openssl samples
-LICENSE=ISC BSD SSLeay GPL-2
-RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=ftp://ftp.isc.org/isc/kea/kea-1.5.0-beta2.tar.gz ftp://ftp.isc.org/isc/kea/1.5.0-beta2/kea-1.5.0-beta2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=e8a91efbefd2f72c40b61f2184f69ae2
diff --git a/metadata/md5-cache/net-misc/kea-1.6.0 b/metadata/md5-cache/net-misc/kea-1.6.0
new file mode 100644
index 000000000000..80ff59d6158e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/kea-1.6.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install preinst prepare
+DEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* )
+DESCRIPTION=High-performance production grade DHCPv4 & DHCPv6 server
+EAPI=7
+HOMEPAGE=http://www.isc.org/kea/
+IUSE=mysql openssl postgres samples
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC BSD SSLeay GPL-2
+RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* )
+SLOT=0
+SRC_URI=ftp://ftp.isc.org/isc/kea/kea-1.6.0.tar.gz ftp://ftp.isc.org/isc/kea/1.6.0/kea-1.6.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=82680dede7072f3c3ef34d00eee8adbf
diff --git a/metadata/md5-cache/net-misc/kea-9999 b/metadata/md5-cache/net-misc/kea-9999
index 03b3a356a44d..a368b62cf025 100644
--- a/metadata/md5-cache/net-misc/kea-9999
+++ b/metadata/md5-cache/net-misc/kea-9999
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* )
 DESCRIPTION=High-performance production grade DHCPv4 & DHCPv6 server
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.isc.org/kea/
 IUSE=mysql openssl postgres samples
 LICENSE=ISC BSD SSLeay GPL-2
@@ -9,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=6067b835f20357c0c7fc7ee8add5e454
+_md5_=82680dede7072f3c3ef34d00eee8adbf
diff --git a/metadata/md5-cache/net-misc/lldpd-0.9.3-r1 b/metadata/md5-cache/net-misc/lldpd-0.9.3-r1
deleted file mode 100644
index 0d42bd8341b7..000000000000
--- a/metadata/md5-cache/net-misc/lldpd-0.9.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5 sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) jansson? ( dev-libs/jansson ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh ) virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
-EAPI=6
-HOMEPAGE=https://vincentbernat.github.com/lldpd/
-IUSE=cdp doc +dot1 +dot3 edp fdp graph jansson +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs readline xml zsh-completion
-KEYWORDS=amd64 x86
-LICENSE=ISC
-RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5 sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) jansson? ( dev-libs/jansson ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
-REQUIRED_USE=graph? ( doc )
-SLOT=0
-SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-0.9.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3090d858fdb9868675d358e8e3509729
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.1 b/metadata/md5-cache/net-misc/lldpd-1.0.1
deleted file mode 100644
index 9c4c3087fea5..000000000000
--- a/metadata/md5-cache/net-misc/lldpd-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh ) virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) test? ( dev-libs/check ) 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=Implementation of IEEE 802.1ab (LLDP)
-EAPI=6
-HOMEPAGE=https://vincentbernat.github.com/lldpd/
-IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
-REQUIRED_USE=graph? ( doc )
-SLOT=0
-SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45abd8720f97aa2c6fc81a2672703a1d
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.1-r1 b/metadata/md5-cache/net-misc/lldpd-1.0.1-r1
deleted file mode 100644
index 68742e4ff5e9..000000000000
--- a/metadata/md5-cache/net-misc/lldpd-1.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh ) virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) test? ( dev-libs/check ) 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=Implementation of IEEE 802.1ab (LLDP)
-EAPI=6
-HOMEPAGE=https://vincentbernat.github.com/lldpd/
-IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
-REQUIRED_USE=graph? ( doc )
-SLOT=0
-SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=809bb8ec781264e49b5e93dc93fe1919
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.3 b/metadata/md5-cache/net-misc/lldpd-1.0.3
index a1224f745d43..14af57bcdd07 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.3
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=6
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
 IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
 REQUIRED_USE=graph? ( doc )
 SLOT=0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=94cd1774dc723cf00d0425138fc77df3
+_md5_=c826e9c36fa8c1a510174316caef20f6
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.4 b/metadata/md5-cache/net-misc/lldpd-1.0.4
new file mode 100644
index 000000000000..a554511b1774
--- /dev/null
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2:= ) seccomp? ( sys-libs/libseccomp:= ) zsh-completion? ( app-shells/zsh ) test? ( dev-libs/check )
+DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
+EAPI=7
+HOMEPAGE=https://vincentbernat.github.com/lldpd/
+IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2:= ) seccomp? ( sys-libs/libseccomp:= ) zsh-completion? ( app-shells/zsh )
+REQUIRED_USE=graph? ( doc )
+SLOT=0
+SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=f6582db55404fbbd4da299d6b04580d1
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.17 b/metadata/md5-cache/net-misc/memcached-1.5.17
new file mode 100644
index 000000000000..3f48d529a180
--- /dev/null
+++ b/metadata/md5-cache/net-misc/memcached-1.5.17
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=High-performance, distributed memory object caching system
+EAPI=6
+HOMEPAGE=http://memcached.org/
+IUSE=debug sasl seccomp selinux slabs-reassign test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
+SLOT=0
+SRC_URI=https://www.memcached.org/files/memcached-1.5.17.tar.gz https://www.memcached.org/files/old/memcached-1.5.17.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f42ee145d1136616a54b6d94c7a39bfc
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.5.20190824 b/metadata/md5-cache/net-misc/minissdpd-1.5.20190824
new file mode 100644
index 000000000000..e995abf38d6c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/minissdpd-1.5.20190824
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=net-libs/libnfnetlink
+DESCRIPTION=MiniSSDP Daemon
+EAPI=7
+HOMEPAGE=http://miniupnp.free.fr/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=net-libs/libnfnetlink || ( net-misc/miniupnpd net-libs/miniupnpc )
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/files/minissdpd-1.5.20190824.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=1ed989e654e8a26fbf0c11e09b82e316
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.1.20190824 b/metadata/md5-cache/net-misc/miniupnpd-2.1.20190824
new file mode 100644
index 000000000000..790a3596ae04
--- /dev/null
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.1.20190824
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= ) sys-apps/lsb-release
+DESCRIPTION=MiniUPnP IGD Daemon
+EAPI=7
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=+leasefile igd2 ipv6 nftables pcp-peer portinuse strict
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.1.20190824.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f214412f9a908c745f8d17d1d871a98a
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.1.20190902 b/metadata/md5-cache/net-misc/miniupnpd-2.1.20190902
new file mode 100644
index 000000000000..60f38e178bdd
--- /dev/null
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.1.20190902
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= ) sys-apps/lsb-release
+DESCRIPTION=MiniUPnP IGD Daemon
+EAPI=7
+HOMEPAGE=http://miniupnp.free.fr/
+IUSE=+leasefile igd2 ipv6 nftables pcp-peer portinuse strict
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
+SLOT=0
+SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.1.20190902.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f214412f9a908c745f8d17d1d871a98a
diff --git a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190116 b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190116
deleted file mode 100644
index 244fe99dd14b..000000000000
--- a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190116
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=test? ( dev-libs/libxml2 ) app-arch/xz-utils
-DESCRIPTION=Database of mobile broadband service providers
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband
-IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=CC-PD
-SLOT=0
-SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20190116/mobile-broadband-provider-info-20190116.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f3593da78a4b17d7fc4946c979beca68
diff --git a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190618 b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190618
index 998ef180c88b..c0e30e0e88d4 100644
--- a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190618
+++ b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190618
@@ -4,9 +4,9 @@ DESCRIPTION=Database of mobile broadband service providers
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=CC-PD
 SLOT=0
 SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20190618/mobile-broadband-provider-info-20190618.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2a0732e6d47c5b5b87312bc1f0238a89
+_md5_=d3c0e74d3f54f6524cadd7bbe58a4eea
diff --git a/metadata/md5-cache/net-misc/mosh-1.3.2 b/metadata/md5-cache/net-misc/mosh-1.3.2
index 07d94442d4a5..b83f2c6d13a4 100644
--- a/metadata/md5-cache/net-misc/mosh-1.3.2
+++ b/metadata/md5-cache/net-misc/mosh-1.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=6
 HOMEPAGE=https://mosh.org
 IUSE=+client examples libressl +mosh-hardening +server ufw +utempter
-KEYWORDS=amd64 ~arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) utempter? ( sys-libs/libutempter )
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=https://mosh.org/mosh-1.3.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=04882bbb54ec6d03ebc6155947a718df
+_md5_=4be41706173b4acfa539927ac038c9c4
diff --git a/metadata/md5-cache/net-misc/ncman-0.0.1_p20190327 b/metadata/md5-cache/net-misc/ncman-0.0.1_p20190327
index 9b36c05577d7..698a50482166 100644
--- a/metadata/md5-cache/net-misc/ncman-0.0.1_p20190327
+++ b/metadata/md5-cache/net-misc/ncman-0.0.1_p20190327
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/json-c:0= >=sys-apps/dbus-1.4 sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/l4rzy/ncman/archive/21a55145ddbc5d085e91352586875abe92cff73b.tar.gz -> ncman-0.0.1_p20190327.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=108fed96519e296d25bd49ea1bddffd9
diff --git a/metadata/md5-cache/net-misc/ncman-9999 b/metadata/md5-cache/net-misc/ncman-9999
index 369d71354e9f..7163002b28be 100644
--- a/metadata/md5-cache/net-misc/ncman-9999
+++ b/metadata/md5-cache/net-misc/ncman-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/json-c:0= >=sys-apps/dbus-1.4 sys-libs/ncurses:0=
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=45764bf228a21d63de37e2aecd27849e
diff --git a/metadata/md5-cache/net-misc/netsed-0.01b b/metadata/md5-cache/net-misc/netsed-0.01b
deleted file mode 100644
index 009ea5a78147..000000000000
--- a/metadata/md5-cache/net-misc/netsed-0.01b
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Small tool for altering forwarded network data in real time
-EAPI=0
-HOMEPAGE=http://freshmeat.net/projects/netsed
-KEYWORDS=amd64 ~x86
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=http://dione.ids.pl/~lcamtuf/netsed.tgz http://http.us.debian.org/debian/pool/main/n/netsed/netsed_0.01c-2.diff.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f76efe716b60fbb495fd905307e0af70
diff --git a/metadata/md5-cache/net-misc/netsed-0.01b-r1 b/metadata/md5-cache/net-misc/netsed-0.01b-r1
index 5adc37d8f0d3..3dcf066b97ec 100644
--- a/metadata/md5-cache/net-misc/netsed-0.01b-r1
+++ b/metadata/md5-cache/net-misc/netsed-0.01b-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Small tool for altering forwarded network data in real time
 EAPI=7
 HOMEPAGE=http://freshmeat.net/projects/netsed
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/netsed.tgz -> netsed-0.01b.tgz mirror://gentoo/netsed_0.01c-2.diff.gz
-_md5_=a46722c7ae5dedd99151025495da4b75
+_md5_=85d12cdae398ae8803dc394137c4ae4c
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.18.2 b/metadata/md5-cache/net-misc/networkmanager-1.18.2
index 8e52e2145155..f8eb838a4427 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.18.2
+++ b/metadata/md5-cache/net-misc/networkmanager-1.18.2
@@ -4,11 +4,11 @@ DESCRIPTION=A set of co-operative tools that make networking simple and straight
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
 REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.18/NetworkManager-1.18.2.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b06a2fb0c701ac9bd8909dee3d895db
+_md5_=f0b2dd6d74a06b634a2d1220e413a7d8
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r1 b/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r1
new file mode 100644
index 000000000000..7a617460287c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) parse-clocks? ( net-misc/pps-tools ) 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=Network Time Protocol suite/programs
+EAPI=6
+HOMEPAGE=http://www.ntp.org/
+IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
+LICENSE=HPND BSD ISC
+PDEPEND=openntpd? ( net-misc/openntpd )
+RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) !net-misc/ntpsec !openntpd? ( !net-misc/openntpd )
+SLOT=0
+SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p13.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p13-manpages.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bb56d29b0333e9e806c82a38f771edac
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r2 b/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r2
new file mode 100644
index 000000000000..875be0fa15dd
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig acct-group/ntp acct-user/ntp >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) parse-clocks? ( net-misc/pps-tools )
+DESCRIPTION=Network Time Protocol suite/programs
+EAPI=7
+HOMEPAGE=http://www.ntp.org/
+IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
+LICENSE=HPND BSD ISC
+PDEPEND=openntpd? ( net-misc/openntpd )
+RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) parse-clocks? ( net-misc/pps-tools ) acct-group/ntp acct-user/ntp selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) !net-misc/ntpsec !openntpd? ( !net-misc/openntpd )
+SLOT=0
+SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p13.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p13-manpages.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=56b8e27243a96ca0b004f565e467042f
diff --git a/metadata/md5-cache/net-misc/ntpclient-2018.244-r1 b/metadata/md5-cache/net-misc/ntpclient-2018.244-r1
new file mode 100644
index 000000000000..8c991e808ad6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ntpclient-2018.244-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure
+DESCRIPTION=A NTP (RFC-1305 and RFC-4330) client for unix-alike systems
+EAPI=7
+HOMEPAGE=https://github.com/troglobit/ntpclient
+IUSE=debug embedded obsolete +syslog
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/troglobit/ntpclient/releases/download/2018_244/ntpclient-2018_244.tar.xz
+_md5_=38da6c91106786eb8851531e02336514
diff --git a/metadata/md5-cache/net-misc/radvd-2.18 b/metadata/md5-cache/net-misc/radvd-2.18
index 629b2a1a45f6..bf1b06aa99c0 100644
--- a/metadata/md5-cache/net-misc/radvd-2.18
+++ b/metadata/md5-cache/net-misc/radvd-2.18
@@ -4,10 +4,10 @@ DESCRIPTION=Linux IPv6 Router Advertisement Daemon
 EAPI=6
 HOMEPAGE=http://v6web.litech.org/radvd/
 IUSE=kernel_FreeBSD selinux test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm arm64 hppa ppc sparc x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.18.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a06d74cf249d7ea3cacb2018016b30ed
+_md5_=d541a09b220950041975f6154d5fa9f0
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.8.6-r1 b/metadata/md5-cache/net-misc/rdesktop-1.8.6-r1
new file mode 100644
index 000000000000..f57fb2c2e20e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rdesktop-1.8.6-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? ( virtual/krb5 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) xrandr? ( x11-libs/libXrandr ) x11-libs/libXt
+DESCRIPTION=A Remote Desktop Protocol Client
+EAPI=7
+HOMEPAGE=http://www.rdesktop.org/
+IUSE=alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) kerberos? ( virtual/krb5 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) xrandr? ( x11-libs/libXrandr )
+SLOT=0
+SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.8.6/rdesktop-1.8.6.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=45607aaf9b4714c63bd1624cccd2a0a2
diff --git a/metadata/md5-cache/net-misc/remmina-1.3.6 b/metadata/md5-cache/net-misc/remmina-1.3.6
new file mode 100644
index 000000000000..c2644bb69463
--- /dev/null
+++ b/metadata/md5-cache/net-misc/remmina-1.3.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= 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_rc4 ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !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[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( net-dns/avahi[gtk3] ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A GTK+ RDP, SPICE, VNC, XDMCP and SSH client
+EAPI=6
+HOMEPAGE=https://remmina.org/
+IUSE=ayatana crypt examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+-with-openssl-exception
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= 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_rc4 ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !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[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( net-dns/avahi[gtk3] ) virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.3.6/Remmina-v1.3.6.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=768f7c307b45a49a511f5631ed191d02
diff --git a/metadata/md5-cache/net-misc/usbip-3.19 b/metadata/md5-cache/net-misc/usbip-3.19
index ac62818759c1..e82fcc2fbbeb 100644
--- a/metadata/md5-cache/net-misc/usbip-3.19
+++ b/metadata/md5-cache/net-misc/usbip-3.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1c0228d0f6967e05391c7e94259241fb
diff --git a/metadata/md5-cache/net-misc/usbip-4.13 b/metadata/md5-cache/net-misc/usbip-4.13
index 4b129749f094..4023be13a5ac 100644
--- a/metadata/md5-cache/net-misc/usbip-4.13
+++ b/metadata/md5-cache/net-misc/usbip-4.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dee5fc21d6bb4ea70efe7d68b4009a5f
diff --git a/metadata/md5-cache/net-misc/whois-5.5.1 b/metadata/md5-cache/net-misc/whois-5.5.1
new file mode 100644
index 000000000000..284376e28ea5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/whois-5.5.1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils >=dev-lang/perl-5 virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install prepare
+DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl )
+DESCRIPTION=improved Whois Client
+EAPI=7
+HOMEPAGE=https://github.com/rfc1036/whois
+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=https://github.com/rfc1036/whois/archive/v5.5.1.tar.gz -> whois-5.5.1.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=eba94dcacfcc372776ca84b4171750e6
diff --git a/metadata/md5-cache/net-misc/whois-9999 b/metadata/md5-cache/net-misc/whois-9999
index f6675a8a56cd..a167c72d403a 100644
--- a/metadata/md5-cache/net-misc/whois-9999
+++ b/metadata/md5-cache/net-misc/whois-9999
@@ -11,4 +11,4 @@ RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/li
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=beb8328ad3d691b6ee0f250601f557db
+_md5_=eba94dcacfcc372776ca84b4171750e6
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2019.09.01 b/metadata/md5-cache/net-misc/youtube-dl-2019.09.01
new file mode 100644
index 000000000000..d8b141d072e6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2019.09.01
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=7
+HOMEPAGE=https://github.com/ytdl-org/youtube-dl/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://youtube-dl.org/downloads/2019.09.01/youtube-dl-2019.09.01.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ecce94f27c83031f68ddcda6b754430b
diff --git a/metadata/md5-cache/net-misc/zssh-1.5c-r1 b/metadata/md5-cache/net-misc/zssh-1.5c-r1
index d22f747d0045..9cc59f4671f9 100644
--- a/metadata/md5-cache/net-misc/zssh-1.5c-r1
+++ b/metadata/md5-cache/net-misc/zssh-1.5c-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=readline? ( sys-libs/ncurses sys-libs/readline:0 )
+DEPEND=readline? ( sys-libs/ncurses:0 sys-libs/readline:0 )
 DESCRIPTION=An ssh wrapper enabling zmodem up/download in ssh
 EAPI=5
 HOMEPAGE=http://zssh.sourceforge.net/
 IUSE=nls readline
 KEYWORDS=amd64 ~ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=readline? ( sys-libs/ncurses sys-libs/readline:0 ) net-misc/openssh net-dialup/lrzsz
+RDEPEND=readline? ( sys-libs/ncurses:0 sys-libs/readline:0 ) net-misc/openssh net-dialup/lrzsz
 SLOT=0
 SRC_URI=mirror://sourceforge/zssh/zssh-1.5c.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e73e15bcb9b98de8df5dfce56603eee0
+_md5_=bc5edd35a49592050984d41ba95c85e8
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 171f94a1adc6..6478847c3d13 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/newsboat-2.16.1 b/metadata/md5-cache/net-news/newsboat-2.16.1
index 8c14b469e0ab..bfc52a52bff1 100644
--- a/metadata/md5-cache/net-news/newsboat-2.16.1
+++ b/metadata/md5-cache/net-news/newsboat-2.16.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.18.0 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode]
 SLOT=0
 SRC_URI=https://newsboat.org/releases/2.16.1/newsboat-2.16.1.tar.xz https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.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/bit-set/0.5.1/download -> bit-set-0.5.1.crate https://crates.io/api/v1/crates/bit-vec/0.5.1/download -> bit-vec-0.5.1.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/cc/1.0.29/download -> cc-1.0.29.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/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/curl-sys/0.4.5/download -> curl-sys-0.4.5.crate https://crates.io/api/v1/crates/dirs/1.0.4/download -> dirs-1.0.4.crate https://crates.io/api/v1/crates/failure/0.1.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/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gettext-rs/0.4.1/download -> gettext-rs-0.4.1.crate https://crates.io/api/v1/crates/gettext-sys/0.19.8/download -> gettext-sys-0.19.8.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.48/download -> libc-0.2.48.crate https://crates.io/api/v1/crates/libz-sys/1.0.17/download -> libz-sys-1.0.17.crate https://crates.io/api/v1/crates/locale_config/0.2.2/download -> locale_config-0.2.2.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/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/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.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/once_cell/0.1.8/download -> once_cell-0.1.8.crate https://crates.io/api/v1/crates/openssl-sys/0.9.46/download -> openssl-sys-0.9.46.crate https://crates.io/api/v1/crates/parking_lot/0.7.1/download -> parking_lot-0.7.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.4.0/download -> parking_lot_core-0.4.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/proc-macro2/0.4.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/proptest/0.7.2/download -> proptest-0.7.2.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.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.5.6/download -> rand-0.5.6.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.3/download -> rand_jitter-0.1.3.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_users/0.2.0/download -> redox_users-0.2.0.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.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.4.2/download -> regex-syntax-0.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.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_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rusty-fork/0.2.1/download -> rusty-fork-0.2.1.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/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/smallvec/0.6.8/download -> smallvec-0.6.8.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/tempfile/3.0.6/download -> tempfile-3.0.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/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/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/wait-timeout/0.1.5/download -> wait-timeout-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	c6407d708bf89ddb5b8d8fc903fd08b0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=dda4682cbe7941216d5eb34cd65392d7
diff --git a/metadata/md5-cache/net-news/snownews-1.6.10 b/metadata/md5-cache/net-news/snownews-1.6.10
index 6d6580fa6593..89e55c1b2609 100644
--- a/metadata/md5-cache/net-news/snownews-1.6.10
+++ b/metadata/md5-cache/net-news/snownews-1.6.10
@@ -5,10 +5,10 @@ DESCRIPTION=Command-line RSS feed reader
 EAPI=7
 HOMEPAGE=https://github.com/kouya/snownews
 IUSE=unicode
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/libxml2-2.5.6 >=sys-libs/ncurses-5.3:0=[unicode?] dev-perl/XML-LibXML dev-perl/libwww-perl
 SLOT=0
 SRC_URI=https://github.com/kouya/snownews/archive/1.6.10.tar.gz -> snownews-1.6.10.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9bdabd1fb2c20f7a2ea68ee97298c554
+_md5_=8db85ecad87a36530b70e7b060f94ec3
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 89387826fe9a..c1ee844e17a1 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/ktorrent-5.1.2-r1 b/metadata/md5-cache/net-p2p/ktorrent-5.1.2-r1
new file mode 100644
index 000000000000..42ec8b1660c4
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/ktorrent-5.1.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=net-libs/libktorrent-2.1.1:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 ) mediaplayer? ( media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 ) rss? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=kde-frameworks/syndication-5.60.0:5 ) search? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) shutdown? ( >=kde-plasma/plasma-workspace-5.15.5:5 ) stats? ( >=kde-frameworks/kplotting-5.60.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.60.0:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.60.0:5 ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Powerful BitTorrent client based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/ktorrent/
+IUSE=+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator +mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=net-libs/libktorrent-2.1.1:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 ) mediaplayer? ( media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 ) rss? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=kde-frameworks/syndication-5.60.0:5 ) search? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) shutdown? ( >=kde-plasma/plasma-workspace-5.15.5:5 ) stats? ( >=kde-frameworks/kplotting-5.60.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.60.0:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.60.0:5 ) ipfilter? ( app-arch/bzip2 app-arch/unzip >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-apps/kio-extras-19.04.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/ktorrent/5.1.2/ktorrent-5.1.2.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=85351b0b50f85fdac031cd030a147f9f
diff --git a/metadata/md5-cache/net-p2p/multibit-0.5.18 b/metadata/md5-cache/net-p2p/multibit-0.5.18
deleted file mode 100644
index 4b46effe964e..000000000000
--- a/metadata/md5-cache/net-p2p/multibit-0.5.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=>=virtual/jre-1.6
-DESCRIPTION=Secure, lightweight, international Bitcoin wallet written in Java
-EAPI=5
-HOMEPAGE=https://multibit.org/
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6
-SLOT=0
-SRC_URI=https://multibit.org/releases/multibit-0.5.18/multibit-0.5.18-linux.jar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a720d43fdd6f276672a44ed4ed0945b9
diff --git a/metadata/md5-cache/net-p2p/transmission-2.94 b/metadata/md5-cache/net-p2p/transmission-2.94
deleted file mode 100644
index 189202535c48..000000000000
--- a/metadata/md5-cache/net-p2p/transmission-2.94
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/libevent-2.0.10:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) systemd? ( >=sys-apps/systemd-209:= ) >=dev-libs/glib-2.32 dev-util/intltool sys-devel/gettext virtual/os-headers virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 ) xfs? ( sys-fs/xfsprogs ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=A Fast, Easy and Free BitTorrent client
-EAPI=6
-HOMEPAGE=http://www.transmissionbt.com/
-IUSE=ayatana gtk libressl lightweight systemd qt5 xfs
-KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux
-LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
-RDEPEND=>=dev-libs/libevent-2.0.10:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-user/transmission
-REQUIRED_USE=ayatana? ( gtk )
-SLOT=0
-SRC_URI=https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88c083927837d52f84bb50cb42f79172
diff --git a/metadata/md5-cache/net-p2p/transmission-2.94-r1 b/metadata/md5-cache/net-p2p/transmission-2.94-r1
new file mode 100644
index 000000000000..fa2ad1645cd1
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/transmission-2.94-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/libevent-2.0.10:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission >=dev-libs/glib-2.32 dev-util/intltool sys-devel/gettext virtual/os-headers virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 ) xfs? ( sys-fs/xfsprogs ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=A Fast, Easy and Free BitTorrent client
+EAPI=6
+HOMEPAGE=http://www.transmissionbt.com/
+IUSE=ayatana gtk libressl lightweight systemd qt5 xfs
+KEYWORDS=amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux
+LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
+RDEPEND=>=dev-libs/libevent-2.0.10:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
+REQUIRED_USE=ayatana? ( gtk )
+SLOT=0
+SRC_URI=https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5dc6df67d493e26276fcb3ffdd18edaa
diff --git a/metadata/md5-cache/net-p2p/transmission-9999 b/metadata/md5-cache/net-p2p/transmission-9999
index a947bf8e279d..105d6bab5513 100644
--- a/metadata/md5-cache/net-p2p/transmission-9999
+++ b/metadata/md5-cache/net-p2p/transmission-9999
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-libs/libb64:0= >=dev-libs/libevent-2.0.10:= !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) virtual/pkgconfig nls? ( virtual/libintl gtk? ( dev-util/intltool sys-devel/gettext ) qt5? ( dev-qt/linguist-tools:5 ) ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=acct-group/transmission acct-user/transmission virtual/pkgconfig nls? ( gtk? ( dev-util/intltool sys-devel/gettext ) qt5? ( dev-qt/linguist-tools:5 ) ) dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/libb64:0= >=dev-libs/libevent-2.0.10:= !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) nls? ( virtual/libintl gtk? ( dev-util/intltool sys-devel/gettext ) qt5? ( dev-qt/linguist-tools:5 ) )
 DESCRIPTION=A fast, easy, and free BitTorrent client
-EAPI=6
+EAPI=7
 HOMEPAGE=https://transmissionbt.com/
 IUSE=ayatana gtk libressl lightweight nls mbedtls qt5 systemd test
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 PROPERTIES=live
-RDEPEND=dev-libs/libb64:0= >=dev-libs/libevent-2.0.10:= !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-user/transmission
+RDEPEND=dev-libs/libb64:0= >=dev-libs/libevent-2.0.10:= !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2d11eae98fb1c9b408c0d925d629553
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0154558d61b30d642570e6fd661be871
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index dd75f14e7700..c904ae44cdd1 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/cnijfilter2-5.70 b/metadata/md5-cache/net-print/cnijfilter2-5.70
new file mode 100644
index 000000000000..3e01e669ec4b
--- /dev/null
+++ b/metadata/md5-cache/net-print/cnijfilter2-5.70
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/libusb:1 dev-libs/libxml2 net-print/cups
+DESCRIPTION=IJ Printer Driver
+EAPI=7
+HOMEPAGE=https://www.canon.it/
+KEYWORDS=~amd64 ~x86
+LICENSE=Canon-IJ
+RDEPEND=virtual/libusb:1 dev-libs/libxml2 net-print/cups
+SLOT=0
+SRC_URI=http://gdlp01.c-wss.com/gds/0/0100009930/01/cnijfilter2-source-5.70-1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f2d89fc0965ba94a4e5df0b182b0f071
diff --git a/metadata/md5-cache/net-print/cups-2.2.11 b/metadata/md5-cache/net-print/cups-2.2.11
deleted file mode 100644
index 4a6d72abdc6d..000000000000
--- a/metadata/md5-cache/net-print/cups-2.2.11
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=The Common Unix Printing System
-EAPI=7
-HOMEPAGE=https://www.cups.org/
-IUSE=acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint
-LICENSE=GPL-2
-PDEPEND=>=net-print/cups-filters-1.0.43
-RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sec-policy/selinux-cups ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/apple/cups/releases/download/v2.2.11/cups-2.2.11-source.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	756a09f72c4cdbb55f2694c95f1e0860	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11a9a9bbd1ddb21daa165eb5f43e503d
diff --git a/metadata/md5-cache/net-print/cups-2.2.12 b/metadata/md5-cache/net-print/cups-2.2.12
index a3224c48d0bd..0bdbf696a4fc 100644
--- a/metadata/md5-cache/net-print/cups-2.2.12
+++ b/metadata/md5-cache/net-print/cups-2.2.12
@@ -5,7 +5,7 @@ DESCRIPTION=The Common Unix Printing System
 EAPI=7
 HOMEPAGE=https://www.cups.org/
 IUSE=acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint
 LICENSE=GPL-2
 PDEPEND=>=net-print/cups-filters-1.0.43
 RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp selinux? ( sec-policy/selinux-cups ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/cups/releases/download/v2.2.12/cups-2.2.12-source.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	756a09f72c4cdbb55f2694c95f1e0860	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=812a4375c13bb6554ce4573f3e2141ce
+_md5_=a7377b5492584d7e500cca7aae42ab11
diff --git a/metadata/md5-cache/net-print/cups-2.3.0 b/metadata/md5-cache/net-print/cups-2.3.0
new file mode 100644
index 000000000000..edb6e161e9a2
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-2.3.0
@@ -0,0 +1,17 @@
+BDEPEND=acct-group/lp >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Common Unix Printing System
+EAPI=7
+HOMEPAGE=https://www.cups.org/
+IUSE=acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint
+LICENSE=Apache-2.0
+PDEPEND=>=net-print/cups-filters-1.0.43
+RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp selinux? ( sec-policy/selinux-cups )
+REQUIRED_USE=usb? ( threads )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/apple/cups/releases/download/v2.3.0/cups-2.3.0-source.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	756a09f72c4cdbb55f2694c95f1e0860	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c4981ab5bd1dd75304ab621236921c28
diff --git a/metadata/md5-cache/net-print/cups-2.3_rc1 b/metadata/md5-cache/net-print/cups-2.3_rc1
deleted file mode 100644
index de8b97a4580d..000000000000
--- a/metadata/md5-cache/net-print/cups-2.3_rc1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The Common Unix Printing System
-EAPI=7
-HOMEPAGE=https://www.cups.org/
-IUSE=acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0
-PDEPEND=>=net-print/cups-filters-1.0.43
-RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sec-policy/selinux-cups )
-REQUIRED_USE=usb? ( threads )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/apple/cups/releases/download/v2.3rc1/cups-2.3rc1-source.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	756a09f72c4cdbb55f2694c95f1e0860	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=02c41976314f6c919d54ac7b4687b399
diff --git a/metadata/md5-cache/net-print/cups-filters-1.23.0 b/metadata/md5-cache/net-print/cups-filters-1.23.0
deleted file mode 100644
index 0fc615bcd94a..000000000000
--- a/metadata/md5-cache/net-print/cups-filters-1.23.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= 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 ) 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] ) dev-util/gdbus-codegen test? ( media-fonts/dejavu ) virtual/pkgconfig
-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
-LICENSE=MIT GPL-2
-RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= 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 ) 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.23.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b81fd3dc332844e9484e46f3a77e15cf
diff --git a/metadata/md5-cache/net-print/cups-filters-1.25.0 b/metadata/md5-cache/net-print/cups-filters-1.25.0
deleted file mode 100644
index 509997e97abd..000000000000
--- a/metadata/md5-cache/net-print/cups-filters-1.25.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= 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 ) 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] ) dev-util/gdbus-codegen test? ( media-fonts/dejavu ) virtual/pkgconfig
-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
-LICENSE=MIT GPL-2
-RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= 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 ) 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.25.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e09a793f38198be444083bef2dca5c5
diff --git a/metadata/md5-cache/net-print/cups-filters-1.25.1 b/metadata/md5-cache/net-print/cups-filters-1.25.1
deleted file mode 100644
index 6c77def19d47..000000000000
--- a/metadata/md5-cache/net-print/cups-filters-1.25.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= 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 ) 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] ) dev-util/gdbus-codegen test? ( media-fonts/dejavu ) virtual/pkgconfig
-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
-LICENSE=MIT GPL-2
-RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= 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 ) 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.25.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e09a793f38198be444083bef2dca5c5
diff --git a/metadata/md5-cache/net-print/cups-filters-1.25.2 b/metadata/md5-cache/net-print/cups-filters-1.25.2
deleted file mode 100644
index b0ea73f08235..000000000000
--- a/metadata/md5-cache/net-print/cups-filters-1.25.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= 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 ) 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] ) dev-util/gdbus-codegen test? ( media-fonts/dejavu )
-DESCRIPTION=Cups filters
-EAPI=7
-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
-LICENSE=MIT GPL-2
-RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= 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 ) 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.25.2.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=26b7d28bcab026d795b812d8a7f596a7
diff --git a/metadata/md5-cache/net-print/cups-filters-1.25.3 b/metadata/md5-cache/net-print/cups-filters-1.25.3
new file mode 100644
index 000000000000..90fed51e3952
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-filters-1.25.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= 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 ) 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] ) dev-util/gdbus-codegen test? ( media-fonts/dejavu )
+DESCRIPTION=Cups filters
+EAPI=7
+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
+LICENSE=MIT GPL-2
+RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= 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 ) 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.25.3.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=26b7d28bcab026d795b812d8a7f596a7
diff --git a/metadata/md5-cache/net-print/cups-filters-1.25.4 b/metadata/md5-cache/net-print/cups-filters-1.25.4
new file mode 100644
index 000000000000..819873c529e5
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-filters-1.25.4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= 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 ) 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] ) dev-util/gdbus-codegen test? ( media-fonts/dejavu )
+DESCRIPTION=Cups filters
+EAPI=7
+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
+LICENSE=MIT GPL-2
+RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= 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 ) 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.25.4.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=df50fd0f883c04cff82f20c36c53732c
diff --git a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.33 b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.33
index 8af8b08d8d73..ba86e1813299 100644
--- a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.33
+++ b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.33
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install
 DEPEND=net-print/cups
 DESCRIPTION=Epson Inkjet Printer Driver (ESC/P-R)
 EAPI=7
-HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
+HOMEPAGE=https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
 KEYWORDS=~amd64 ~ppc64
 LICENSE=GPL-2
 RDEPEND=net-print/cups
 SLOT=0
 SRC_URI=https://download3.ebz.epson.net/dsc/f/03/00/08/70/14/e33b7a89e843b3ac97dcab773f03fbac7769f147/epson-inkjet-printer-escpr-1.6.33-1lsb3.2.tar.gz
-_md5_=17a049a3e0e10f8c76791e66483af6ae
+_md5_=b5d5745e8f633fb35ef917b74167ef99
diff --git a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.2 b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.2
new file mode 100644
index 000000000000..9dc0c1924472
--- /dev/null
+++ b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DEPEND=net-print/cups
+DESCRIPTION=Epson Inkjet Printer Driver (ESC/P-R)
+EAPI=7
+HOMEPAGE=https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
+KEYWORDS=~amd64 ~ppc64
+LICENSE=GPL-2
+RDEPEND=net-print/cups
+SLOT=0
+SRC_URI=https://download3.ebz.epson.net/dsc/f/03/00/09/76/14/6479eac30ef2e351bb6672ed63314953b9655d16/epson-inkjet-printer-escpr-1.7.2-1lsb3.2.tar.gz
+_md5_=dc4267b6e3c6e12022c777d2bd976d60
diff --git a/metadata/md5-cache/net-print/hplip-3.19.8 b/metadata/md5-cache/net-print/hplip-3.19.8
new file mode 100644
index 000000000000..6d0077f6b255
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-3.19.8
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) )
+DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
+EAPI=7
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
+IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python2_7? ( dev-python/pygobject:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python3_5? ( dev-python/pygobject:3[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) python_single_target_python3_7? ( dev-python/pygobject:3[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(+)?] ) fax? ( dev-python/reportlab[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) kernel_linux? ( virtual/udev ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] libnotify? ( dev-python/notify2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pillow-3.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) policykit? ( sys-auth/polkit )
+REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/hplip/hplip-3.19.8.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.12-patches-1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=505b0451db789795c8698269cf47e433
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index cd78997f7ded..958b02d4e8ee 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/shadowsocks-libev-3.3.1 b/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.1
new file mode 100644
index 000000000000..975d9722e8ef
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.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 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=net-libs/mbedtls:= net-libs/libbloom net-libs/libcork net-libs/libcorkipset >=dev-libs/libsodium-1.0.8:= dev-libs/libev net-dns/c-ares dev-libs/libpcre sys-kernel/linux-headers doc? ( app-text/asciidoc app-text/xmlto )
+DESCRIPTION=A lightweight secured SOCKS5 proxy for embedded devices and low end boxes
+EAPI=7
+HOMEPAGE=https://github.com/shadowsocks/shadowsocks-libev
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=net-libs/mbedtls:= net-libs/libbloom net-libs/libcork net-libs/libcorkipset >=dev-libs/libsodium-1.0.8:= dev-libs/libev net-dns/c-ares dev-libs/libpcre
+SLOT=0
+SRC_URI=https://github.com/shadowsocks/shadowsocks-libev/archive/v3.3.1.tar.gz -> shadowsocks-libev-3.3.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9b6618911e421f590a7cd23d6046f256
diff --git a/metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1 b/metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1
index e3f9ef5bd70c..67f91153ddc8 100644
--- a/metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1
+++ b/metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=media-libs/giflib:0= media-libs/libpng:0= virtual/jpeg:0 sys-libs/zlib jpeg2k? ( media-libs/jasper:= ) sasl? ( dev-libs/cyrus-sasl ) xinetd? ( virtual/inetd )
+DEPEND=media-libs/giflib:0= media-libs/libpng:0= virtual/jpeg:0 sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) xinetd? ( virtual/inetd )
 DESCRIPTION=A forwarding, non-caching, compressing web proxy server
 EAPI=6
 HOMEPAGE=http://ziproxy.sourceforge.net/
-IUSE=jpeg2k sasl xinetd
+IUSE=sasl xinetd
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=media-libs/giflib:0= media-libs/libpng:0= virtual/jpeg:0 sys-libs/zlib jpeg2k? ( media-libs/jasper:= ) sasl? ( dev-libs/cyrus-sasl ) xinetd? ( virtual/inetd )
+RDEPEND=media-libs/giflib:0= media-libs/libpng:0= virtual/jpeg:0 sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) xinetd? ( virtual/inetd )
 SLOT=0
 SRC_URI=mirror://sourceforge/ziproxy/ziproxy-3.3.1.tar.xz
 _eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=6d4ef3549e8df6571668a04d6ae09725
+_md5_=1d653a2bcaf9519f5e05e933ea77f550
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 8b600fe37fa6..932a4e43b8f1 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/tinc-1.0.36 b/metadata/md5-cache/net-vpn/tinc-1.0.36
new file mode 100644
index 000000000000..990aa39aca85
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tinc-1.0.36
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib )
+DESCRIPTION=tinc is an easy to configure VPN implementation
+EAPI=7
+HOMEPAGE=http://www.tinc-vpn.org/
+IUSE=libressl +lzo uml vde +zlib
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) vde? ( net-misc/vde )
+SLOT=0
+SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.0.36.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=01cf8df0766b29804de8e7f647dcc827
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.1.4_rc b/metadata/md5-cache/net-vpn/tor-0.4.1.4_rc
deleted file mode 100644
index b7cf9bc5a674..000000000000
--- a/metadata/md5-cache/net-vpn/tor-0.4.1.4_rc
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install setup
-DEPEND=dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd )
-DESCRIPTION=Anonymizing overlay network for TCP
-EAPI=7
-HOMEPAGE=http://www.torproject.org/
-IUSE=caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
-LICENSE=BSD GPL-2
-RDEPEND=dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
-SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.4.1.4-rc.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.1.4-rc.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=0a9c88b2d28266ec876de36b3afc637a
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.1.5 b/metadata/md5-cache/net-vpn/tor-0.4.1.5
new file mode 100644
index 000000000000..3325958b5812
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tor-0.4.1.5
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install setup
+DEPEND=dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd )
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=7
+HOMEPAGE=http://www.torproject.org/
+IUSE=caps doc libressl lzma +man scrypt seccomp selinux systemd tor-hardening test zstd
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
+LICENSE=BSD GPL-2
+RDEPEND=dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
+SLOT=0
+SRC_URI=https://www.torproject.org/dist/tor-0.4.1.5.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.1.5.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=0a9c88b2d28266ec876de36b3afc637a
diff --git a/metadata/md5-cache/net-vpn/vtun-3.0.3-r1 b/metadata/md5-cache/net-vpn/vtun-3.0.3-r1
index 29a4c48268d0..3e7ce85928df 100644
--- a/metadata/md5-cache/net-vpn/vtun-3.0.3-r1
+++ b/metadata/md5-cache/net-vpn/vtun-3.0.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Create tunnels over TCP/IP networks with shaping, encryption, and co
 EAPI=6
 HOMEPAGE=http://vtun.sourceforge.net/
 IUSE=lzo socks5 ssl zlib kernel_linux
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0 ) lzo? ( dev-libs/lzo:2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante )
 SLOT=0
 SRC_URI=mirror://sourceforge/vtun/vtun-3.0.3.tar.gz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e09997035110ca314b549d3d9c189081
+_md5_=2295929bdeb23fe69e039e9df6e62c23
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20190702 b/metadata/md5-cache/net-vpn/wireguard-0.0.20190702
deleted file mode 100644
index 171783b2cdde..000000000000
--- a/metadata/md5-cache/net-vpn/wireguard-0.0.20190702
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) ) module? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=Simple yet fast and modern VPN that utilizes state-of-the-art cryptography.
-EAPI=6
-HOMEPAGE=https://www.wireguard.com/
-IUSE=debug +module +tools module-src kernel_linux kernel_linux module
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) )
-SLOT=0
-SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20190702.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9c45b8dbcaadaacf722ad1ffc3d6e5ce
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20190905 b/metadata/md5-cache/net-vpn/wireguard-0.0.20190905
new file mode 100644
index 000000000000..e20e170c1834
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/wireguard-0.0.20190905
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) ) module? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=Simple yet fast and modern VPN that utilizes state-of-the-art cryptography.
+EAPI=6
+HOMEPAGE=https://www.wireguard.com/
+IUSE=debug +module +tools module-src kernel_linux kernel_linux module
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) )
+SLOT=0
+SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20190905.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9c45b8dbcaadaacf722ad1ffc3d6e5ce
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 73c269e0ea93..f1ffe47db48b 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/broadcom-sta-6.30.223.271-r4 b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r4
deleted file mode 100644
index d993930bf3e7..000000000000
--- a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare pretend setup
-DEPEND=virtual/linux-sources kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver
-EAPI=5
-HOMEPAGE=https://www.broadcom.com/support/802.11
-IUSE=kernel_linux kernel_linux kernel_linux
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=Broadcom
-RDEPEND=kernel_linux? ( virtual/modutils )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=x86? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz ) amd64? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz ) https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_6.30.223.271.txt -> README-broadcom-sta-6.30.223.271.txt
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=58f83541e8c5904b78873261f39f9ae6
diff --git a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r5 b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r5
new file mode 100644
index 000000000000..e9ef623316df
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst pretend setup
+DEPEND=virtual/linux-sources kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver
+EAPI=7
+HOMEPAGE=https://www.broadcom.com/support/802.11
+IUSE=kernel_linux kernel_linux kernel_linux
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Broadcom
+RDEPEND=kernel_linux? ( virtual/modutils )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=x86? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz ) amd64? ( https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz ) https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_6.30.223.271.txt -> README-broadcom-sta-6.30.223.271.txt
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0af91413a95c8ce5db3e0cacd9678510
diff --git a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2 b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2
index 4f2d6897cd03..23b635be3ed1 100644
--- a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2
+++ b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=x11-libs/gtk+-3.12:3[introspection?] media-libs/libcanberra[gtk3] >=x11-libs/libnotify-0.7.0 virtual/libudev >=dev-libs/glib-2.38:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) virtual/udev >=net-wireless/bluez-5
 SLOT=2/13
 SRC_URI=mirror://gnome/sources/gnome-bluetooth/3.28/gnome-bluetooth-3.28.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea45935ab904363905f3bb4d9d10b2a1
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-9999 b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
index 54d649b517e1..524b27ba650d 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-9999
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-python/cheetah sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-python/cheetah sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr and hackrf
 EAPI=6
 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
 IUSE=bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd python_targets_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0/9999
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=52018dc6f6681afae7a109352d48bfd3
+_md5_=8a723f07ff7fe0cbd5d3021a1c84a02c
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.9 b/metadata/md5-cache/net-wireless/hostapd-2.9
index 4f9ccc463cb4..2d3adf96e8f9 100644
--- a/metadata/md5-cache/net-wireless/hostapd-2.9
+++ b/metadata/md5-cache/net-wireless/hostapd-2.9
@@ -4,10 +4,10 @@ DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon
 EAPI=6
 HOMEPAGE=http://w1.fi
 IUSE=internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda savedconfig
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~x86
+KEYWORDS=amd64 arm ~arm64 ~mips ppc x86
 LICENSE=BSD
 RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~andrey_utkin/distfiles/net-wireless_hostapd_2.7-r2_extras.tar.xz https://w1.fi/releases/hostapd-2.9.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	0c38912e9b32aef6433a71726675b4b1	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6461787f7b11efd0b6f3c6b7d92c3fb2
+_md5_=1561b2e52a4cc05eb12f7e099861b544
diff --git a/metadata/md5-cache/net-wireless/iwd-0.20 b/metadata/md5-cache/net-wireless/iwd-0.20
new file mode 100644
index 000000000000..1e12d33fa2f9
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/iwd-0.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend setup unpack
+DEPEND=>=dev-libs/ell-0.22 net-wireless/wireless-regdb sys-apps/dbus client? ( sys-libs/readline:0= ) crda? ( net-wireless/crda ) 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=Wireless daemon for linux
+EAPI=6
+HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
+IUSE=+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/ell-0.22 net-wireless/wireless-regdb sys-apps/dbus client? ( sys-libs/readline:0= ) crda? ( net-wireless/crda )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-0.20.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=05d7fd5a6d647f4bda1b85294fe0d2cf
diff --git a/metadata/md5-cache/net-wireless/kismet-2019.08.1 b/metadata/md5-cache/net-wireless/kismet-2019.08.1
deleted file mode 100644
index 1ba49481c9c8..000000000000
--- a/metadata/md5-cache/net-wireless/kismet-2019.08.1
+++ /dev/null
@@ -1,15 +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 postinst preinst prepare setup
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( dev-libs/libusb:= ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig
-DESCRIPTION=IEEE 802.11 wireless LAN sniffer
-EAPI=7
-HOMEPAGE=https://www.kismetwireless.net
-IUSE=lm_sensors mousejack networkmanager +pcre selinux +suid python_targets_python3_6
-KEYWORDS=amd64 arm ~arm64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( dev-libs/libusb:= ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] selinux? ( sec-policy/selinux-kismet )
-REQUIRED_USE=python_targets_python3_6
-SLOT=0/2019.08.1
-SRC_URI=https://www.kismetwireless.net/code/kismet-2019-08-R1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=8e35f8848810846cd1e7719b9a19bb6a
diff --git a/metadata/md5-cache/net-wireless/kismet-2019.09.1 b/metadata/md5-cache/net-wireless/kismet-2019.09.1
new file mode 100644
index 000000000000..ae9e1d2113bc
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/kismet-2019.09.1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig
+DESCRIPTION=IEEE 802.11 wireless LAN sniffer
+EAPI=7
+HOMEPAGE=https://www.kismetwireless.net
+IUSE=lm_sensors mousejack networkmanager +pcre selinux +suid python_targets_python3_6
+KEYWORDS=amd64 arm ~arm64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] selinux? ( sec-policy/selinux-kismet )
+REQUIRED_USE=python_targets_python3_6
+SLOT=0/2019.09.1
+SRC_URI=https://www.kismetwireless.net/code/kismet-2019-09-R1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=808c3b2c5ab49345a9b3585513d8dbfd
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
index 47cb0c86affd..00f3dad4ebd4 100644
--- a/metadata/md5-cache/net-wireless/kismet-9999
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst preinst prepare setup unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( dev-libs/libusb:= ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig
 DESCRIPTION=IEEE 802.11 wireless LAN sniffer
 EAPI=7
 HOMEPAGE=https://www.kismetwireless.net
 IUSE=lm_sensors mousejack networkmanager +pcre selinux +suid python_targets_python3_6
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( dev-libs/libusb:= ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] selinux? ( sec-policy/selinux-kismet )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] selinux? ( sec-policy/selinux-kismet )
 REQUIRED_USE=python_targets_python3_6
 RESTRICT=strip
 SLOT=0/9999
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=8e35f8848810846cd1e7719b9a19bb6a
+_md5_=808c3b2c5ab49345a9b3585513d8dbfd
diff --git a/metadata/md5-cache/net-wireless/limesuite-19.04.0 b/metadata/md5-cache/net-wireless/limesuite-19.04.0
new file mode 100644
index 000000000000..fea140506eda
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/limesuite-19.04.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/fltk x11-libs/wxGTK:3.0-gtk3 net-wireless/soapysdr:= virtual/opengl virtual/libusb:1
+DESCRIPTION=Driver and GUI for LMS7002M-based SDR platforms
+EAPI=7
+HOMEPAGE=https://myriadrf.org/projects/component/limesdr/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=x11-libs/fltk x11-libs/wxGTK:3.0-gtk3 net-wireless/soapysdr:= virtual/opengl virtual/libusb:1
+SLOT=0
+SRC_URI=https://github.com/myriadrf/LimeSuite/archive/v19.04.0.tar.gz -> limesuite-19.04.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=31af4fedc4eb6c94ccdfcc9432c288a7
diff --git a/metadata/md5-cache/net-wireless/linssid-3.6-r1 b/metadata/md5-cache/net-wireless/linssid-3.6-r1
index e8a453a7bdaf..0b1fe65eee36 100644
--- a/metadata/md5-cache/net-wireless/linssid-3.6-r1
+++ b/metadata/md5-cache/net-wireless/linssid-3.6-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/
 DESCRIPTION=Graphical wireless scanning for Linux
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/linssid/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 x11-libs/qwt:6[opengl,qt5(+),svg] net-wireless/iw sys-auth/polkit x11-libs/libxkbcommon[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/linssid/linssid_3.6.orig.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=102776bac3279402b741c6816b3ab47f
+_md5_=3c6c22739dd2a4068382193d9a6ae851
diff --git a/metadata/md5-cache/net-wireless/multimode-1.4_p20140831-r1 b/metadata/md5-cache/net-wireless/multimode-1.4_p20140831-r1
index 3bdfd8e114db..e0530703ed8f 100644
--- a/metadata/md5-cache/net-wireless/multimode-1.4_p20140831-r1
+++ b/metadata/md5-cache/net-wireless/multimode-1.4_p20140831-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/multimode-1.4_p20140831.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d0a4ee1833103c4e091825c2c6d3c75
+_md5_=fafbb0aad32135fd742419c9083187e8
diff --git a/metadata/md5-cache/net-wireless/multimode-9999 b/metadata/md5-cache/net-wireless/multimode-9999
index 782f9f4f576e..400cabe032eb 100644
--- a/metadata/md5-cache/net-wireless/multimode-9999
+++ b/metadata/md5-cache/net-wireless/multimode-9999
@@ -10,4 +10,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	subversion	76e4ab6ae9cda8407c34d0b9a086f81c	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=828363a0ac5b5cfe7806620968a8a29a
+_md5_=a6ab6d55c0856e5b1f1860aec37df5e6
diff --git a/metadata/md5-cache/net-wireless/soapybladerf-0.3.5_p20180908-r1 b/metadata/md5-cache/net-wireless/soapybladerf-0.3.5_p20180908-r1
deleted file mode 100644
index 6f446d7d6ba9..000000000000
--- a/metadata/md5-cache/net-wireless/soapybladerf-0.3.5_p20180908-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-wireless/soapysdr:= >=net-wireless/bladerf-2018.08:= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Soapy SDR plugin for the Blade RF
-EAPI=6
-HOMEPAGE=https://github.com/pothosware/SoapyBladeRF
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-wireless/soapysdr:= >=net-wireless/bladerf-2018.08:=
-SLOT=0
-SRC_URI=https://github.com/pothosware/SoapyBladeRF/archive/b210241694e0a6e56beddda09fbabcfa8e14be56.tar.gz -> soapybladerf-0.3.5_p20180908.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9116caa2e42860c84121dccdd04c323
diff --git a/metadata/md5-cache/net-wireless/soapybladerf-0.4.0 b/metadata/md5-cache/net-wireless/soapybladerf-0.4.0
deleted file mode 100644
index a584359bdef4..000000000000
--- a/metadata/md5-cache/net-wireless/soapybladerf-0.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-wireless/soapysdr:= >=net-wireless/bladerf-2018.08:= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Soapy SDR plugin for the Blade RF
-EAPI=6
-HOMEPAGE=https://github.com/pothosware/SoapyBladeRF
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-wireless/soapysdr:= >=net-wireless/bladerf-2018.08:=
-SLOT=0
-SRC_URI=https://github.com/pothosware/SoapyBladeRF/archive/soapy-bladerf-0.4.0.tar.gz -> soapybladerf-0.4.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7344e89c917c652f3f58c7d9d0a015a
diff --git a/metadata/md5-cache/net-wireless/soapybladerf-0.4.1 b/metadata/md5-cache/net-wireless/soapybladerf-0.4.1
new file mode 100644
index 000000000000..a7b358e3fd49
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/soapybladerf-0.4.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-wireless/soapysdr:= >=net-wireless/bladerf-2018.08:= sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Soapy SDR plugin for the Blade RF
+EAPI=6
+HOMEPAGE=https://github.com/pothosware/SoapyBladeRF
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=net-wireless/soapysdr:= >=net-wireless/bladerf-2018.08:=
+SLOT=0
+SRC_URI=https://github.com/pothosware/SoapyBladeRF/archive/soapy-bladerf-0.4.1.tar.gz -> soapybladerf-0.4.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d7344e89c917c652f3f58c7d9d0a015a
diff --git a/metadata/md5-cache/net-wireless/soapyplutosdr-0.0_p20180825-r1 b/metadata/md5-cache/net-wireless/soapyplutosdr-0.0_p20180825-r1
deleted file mode 100644
index 04c5fe18c924..000000000000
--- a/metadata/md5-cache/net-wireless/soapyplutosdr-0.0_p20180825-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-wireless/soapysdr:= net-libs/libiio:= net-libs/libad9361-iio:= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Soapy SDR plugin for the Pluto SDR
-EAPI=6
-HOMEPAGE=https://github.com/pothosware/SoapyPlutoSDR
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=net-wireless/soapysdr:= net-libs/libiio:= net-libs/libad9361-iio:=
-SLOT=0
-SRC_URI=https://github.com/pothosware/SoapyPlutoSDR/archive/782650597b18f311cc97fbb7c6813539e6adef16.tar.gz -> soapyplutosdr-0.0_p20180825.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a0c1c7499024ce4d8a6290a9585eede
diff --git a/metadata/md5-cache/net-wireless/soapyplutosdr-0.1.0 b/metadata/md5-cache/net-wireless/soapyplutosdr-0.1.0
deleted file mode 100644
index dee37cedb2f3..000000000000
--- a/metadata/md5-cache/net-wireless/soapyplutosdr-0.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-wireless/soapysdr:= net-libs/libiio:= net-libs/libad9361-iio:= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Soapy SDR plugin for the Pluto SDR
-EAPI=6
-HOMEPAGE=https://github.com/pothosware/SoapyPlutoSDR
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=net-wireless/soapysdr:= net-libs/libiio:= net-libs/libad9361-iio:=
-SLOT=0
-SRC_URI=https://github.com/pothosware/SoapyPlutoSDR/archive/782650597b18f311cc97fbb7c6813539e6adef16.tar.gz -> soapyplutosdr-0.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1bcdb8801d020f0bb93df67839d58665
diff --git a/metadata/md5-cache/net-wireless/soapyplutosdr-0.2.0 b/metadata/md5-cache/net-wireless/soapyplutosdr-0.2.0
new file mode 100644
index 000000000000..5266551d670b
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/soapyplutosdr-0.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-wireless/soapysdr:= net-libs/libiio:= net-libs/libad9361-iio:= sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Soapy SDR plugin for the Pluto SDR
+EAPI=6
+HOMEPAGE=https://github.com/pothosware/SoapyPlutoSDR
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=net-wireless/soapysdr:= net-libs/libiio:= net-libs/libad9361-iio:=
+SLOT=0
+SRC_URI=https://github.com/pothosware/SoapyPlutoSDR/archive/782650597b18f311cc97fbb7c6813539e6adef16.tar.gz -> soapyplutosdr-0.2.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1bcdb8801d020f0bb93df67839d58665
diff --git a/metadata/md5-cache/net-wireless/soapyrtlsdr-0.2.5-r1 b/metadata/md5-cache/net-wireless/soapyrtlsdr-0.2.5-r1
deleted file mode 100644
index f083bd50a572..000000000000
--- a/metadata/md5-cache/net-wireless/soapyrtlsdr-0.2.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-wireless/soapysdr:= net-wireless/rtl-sdr sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=SoapySDR RTL-SDR Support Module
-EAPI=6
-HOMEPAGE=https://github.com/pothosware/SoapyRTLSDR
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-wireless/soapysdr:= net-wireless/rtl-sdr
-SLOT=0
-SRC_URI=https://github.com/pothosware/SoapyRTLSDR/archive/soapy-rtlsdr-0.2.5.tar.gz -> soapyrtlsdr-0.2.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eb3cb22451bead995170b54bc0a905b4
diff --git a/metadata/md5-cache/net-wireless/soapysdr-0.6.1-r1 b/metadata/md5-cache/net-wireless/soapysdr-0.6.1-r1
deleted file mode 100644
index cc94b7fdf7f3..000000000000
--- a/metadata/md5-cache/net-wireless/soapysdr-0.6.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python? ( dev-lang/swig:0 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=vendor and platform neutral SDR support library
-EAPI=6
-HOMEPAGE=https://github.com/pothosware/SoapySDR
-IUSE=bladerf hackrf python rtlsdr plutosdr uhd python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Boost-1.0
-PDEPEND=bladerf? ( net-wireless/soapybladerf ) hackrf? ( net-wireless/soapyhackrf ) rtlsdr? ( net-wireless/soapyrtlsdr ) plutosdr? ( net-wireless/soapyplutosdr ) uhd? ( net-wireless/soapyuhd )
-RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://github.com/pothosware/SoapySDR/archive/soapy-sdr-0.6.1.tar.gz -> soapysdr-0.6.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d19c1f57f3f9a5250937b323d15bd5df
diff --git a/metadata/md5-cache/net-wireless/soapysdr-0.7.0 b/metadata/md5-cache/net-wireless/soapysdr-0.7.0
deleted file mode 100644
index 13a67c53211f..000000000000
--- a/metadata/md5-cache/net-wireless/soapysdr-0.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python? ( dev-lang/swig:0 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=vendor and platform neutral SDR support library
-EAPI=6
-HOMEPAGE=https://github.com/pothosware/SoapySDR
-IUSE=bladerf hackrf python rtlsdr plutosdr uhd python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Boost-1.0
-PDEPEND=bladerf? ( net-wireless/soapybladerf ) hackrf? ( net-wireless/soapyhackrf ) rtlsdr? ( net-wireless/soapyrtlsdr ) plutosdr? ( net-wireless/soapyplutosdr ) uhd? ( net-wireless/soapyuhd )
-RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0/0.7.0
-SRC_URI=https://github.com/pothosware/SoapySDR/archive/soapy-sdr-0.7.0.tar.gz -> soapysdr-0.7.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25118dac3d65ff7039867dfbe3ae394f
diff --git a/metadata/md5-cache/net-wireless/soapysdr-0.7.1 b/metadata/md5-cache/net-wireless/soapysdr-0.7.1
new file mode 100644
index 000000000000..8c90d215f791
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/soapysdr-0.7.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python? ( dev-lang/swig:0 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=vendor and platform neutral SDR support library
+EAPI=6
+HOMEPAGE=https://github.com/pothosware/SoapySDR
+IUSE=bladerf hackrf python rtlsdr plutosdr uhd python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Boost-1.0
+PDEPEND=bladerf? ( net-wireless/soapybladerf ) hackrf? ( net-wireless/soapyhackrf ) rtlsdr? ( net-wireless/soapyrtlsdr ) plutosdr? ( net-wireless/soapyplutosdr ) uhd? ( net-wireless/soapyuhd )
+RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=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? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0/0.7.1
+SRC_URI=https://github.com/pothosware/SoapySDR/archive/soapy-sdr-0.7.1.tar.gz -> soapysdr-0.7.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=25118dac3d65ff7039867dfbe3ae394f
diff --git a/metadata/md5-cache/net-wireless/soapyuhd-0.3.4-r1 b/metadata/md5-cache/net-wireless/soapyuhd-0.3.4-r1
deleted file mode 100644
index e9b948402d33..000000000000
--- a/metadata/md5-cache/net-wireless/soapyuhd-0.3.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-wireless/soapysdr:= net-wireless/uhd:= dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Soapy SDR plugins for UHD supported SDR devices
-EAPI=6
-HOMEPAGE=https://github.com/pothosware/SoapyUHD
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-wireless/soapysdr:= net-wireless/uhd:= dev-libs/boost:=
-SLOT=0
-SRC_URI=https://github.com/pothosware/SoapyUHD/archive/soapy-uhd-0.3.4.tar.gz -> soapyuhd-0.3.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=521872ecb0b08b0092c3e603ff8d1965
diff --git a/metadata/md5-cache/net-wireless/soapyuhd-0.3.6 b/metadata/md5-cache/net-wireless/soapyuhd-0.3.6
new file mode 100644
index 000000000000..6c36fd3a4256
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/soapyuhd-0.3.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-wireless/soapysdr:= net-wireless/uhd:= dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Soapy SDR plugins for UHD supported SDR devices
+EAPI=6
+HOMEPAGE=https://github.com/pothosware/SoapyUHD
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=net-wireless/soapysdr:= net-wireless/uhd:= dev-libs/boost:=
+SLOT=0
+SRC_URI=https://github.com/pothosware/SoapyUHD/archive/soapy-uhd-0.3.6.tar.gz -> soapyuhd-0.3.6.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=521872ecb0b08b0092c3e603ff8d1965
diff --git a/metadata/md5-cache/net-wireless/unifi-5.10.25 b/metadata/md5-cache/net-wireless/unifi-5.10.25
deleted file mode 100644
index 62a0642ded2a..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.10.25
+++ /dev/null
@@ -1,14 +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
-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.ui.com/unifi/5.10.25/UniFi.unix.zip -> unifi-5.10.25.zip
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=f1b1c6e68bf7e7630efd6f83f8a3e15b
diff --git a/metadata/md5-cache/net-wireless/unifi-5.10.26 b/metadata/md5-cache/net-wireless/unifi-5.10.26
deleted file mode 100644
index 1f9e402877f0..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.10.26
+++ /dev/null
@@ -1,14 +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
-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.ui.com/unifi/5.10.26-7fbb9ab8c4/UniFi.unix.zip -> unifi-5.10.26.zip
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=8154519ccb1ab883f89d47cca6d5e7f2
diff --git a/metadata/md5-cache/net-wireless/unifi-5.10.27 b/metadata/md5-cache/net-wireless/unifi-5.10.27
deleted file mode 100644
index 9a48cdf38b5f..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.10.27
+++ /dev/null
@@ -1,14 +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
-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.ui.com/unifi/5.10.27-2ad6590363/UniFi.unix.zip -> unifi-5.10.27.zip
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=f940350ad3849c5b1ee280ca130460e0
diff --git a/metadata/md5-cache/net-wireless/unifi-5.11.38 b/metadata/md5-cache/net-wireless/unifi-5.11.38
deleted file mode 100644
index b056116ba014..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.11.38
+++ /dev/null
@@ -1,14 +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
-KEYWORDS=~amd64
-LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
-RDEPEND=dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.11
-SRC_URI=https://dl.ui.com/unifi/5.11.38-65a83af88b/UniFi.unix.zip -> unifi-5.11.38.zip
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=0f4b3f3ffbbc689973ec23d8b40038fa
diff --git a/metadata/md5-cache/net-wireless/unifi-5.11.39 b/metadata/md5-cache/net-wireless/unifi-5.11.39
index 14a70c395e49..99735b59aeba 100644
--- a/metadata/md5-cache/net-wireless/unifi-5.11.39
+++ b/metadata/md5-cache/net-wireless/unifi-5.11.39
@@ -4,11 +4,11 @@ DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
 EAPI=6
 HOMEPAGE=https://www.ubnt.com
 IUSE=systemd
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
 RDEPEND=dev-db/mongodb virtual/jre:1.8
 RESTRICT=bindist mirror
 SLOT=0/5.11
 SRC_URI=https://dl.ui.com/unifi/5.11.39-54b4ab1ed1/UniFi.unix.zip -> unifi-5.11.39.zip
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=e0ec13186dc94896f7ad74c02ee7eefb
+_md5_=9bc970fb856c6874deff357cd197a267
diff --git a/metadata/md5-cache/net-wireless/unifi-5.11.45 b/metadata/md5-cache/net-wireless/unifi-5.11.45
new file mode 100644
index 000000000000..113ed9b6a91c
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-5.11.45
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=app-arch/unzip virtual/pkgconfig
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=6
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/5.11
+SRC_URI=https://dl.ui.com/unifi/5.11.45-6cc8cc5c2a/UniFi.unix.zip -> unifi-5.11.45.zip
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=e93b1cf01b4e8ab8e221068874cbcfca
diff --git a/metadata/md5-cache/net-wireless/wpa_supplicant-2.8-r1 b/metadata/md5-cache/net-wireless/wpa_supplicant-2.8-r1
index 51e1edab352d..418163e322f9 100644
--- a/metadata/md5-cache/net-wireless/wpa_supplicant-2.8-r1
+++ b/metadata/md5-cache/net-wireless/wpa_supplicant-2.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=IEEE 802.1X/WPA supplicant for secure wireless transfers
 EAPI=6
 HOMEPAGE=https://w1.fi/wpa_supplicant/
 IUSE=ap bindist dbus eap-sim eapol_test fasteap +fils +hs2-0 libressl macsec p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=|| ( GPL-2 BSD )
 RDEPEND=dbus? ( sys-apps/dbus ) kernel_linux? ( dev-libs/libnl:3 net-wireless/crda eap-sim? ( sys-apps/pcsc-lite ) ) !kernel_linux? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) selinux? ( sec-policy/selinux-networkmanager )
 SLOT=0
 SRC_URI=https://w1.fi/releases/wpa_supplicant-2.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7dda794ed81f347710cdfa389a55dff5
+_md5_=57612e61b518bdcfe574f41aa16b7b80
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index 097ab390f374..bba3596a6a1c 100644
--- a/metadata/md5-cache/ros-meta/Manifest.gz
+++ b/metadata/md5-cache/ros-meta/Manifest.gz
diff --git a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.8.5 b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.8.5
new file mode 100644
index 000000000000..3d2ba8f05a44
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.8.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Interface for using ROS with the gazebo simulator
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/gazebo_ros_pkgs https://github.com/ros-simulation/gazebo_ros_pkgs
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.5.tar.gz -> gazebo_ros_pkgs-2.8.5.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3587e55c5adbd2406c145aab8eac1efc
diff --git a/metadata/md5-cache/ros-meta/slam_gmapping-1.3.8 b/metadata/md5-cache/ros-meta/slam_gmapping-1.3.8
deleted file mode 100644
index 2f6d3fc00692..000000000000
--- a/metadata/md5-cache/ros-meta/slam_gmapping-1.3.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/slam_gmapping https://github.com/ros-perception/slam_gmapping
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=CC-BY-NC-SA-2.5
-RDEPEND=dev-ros/gmapping python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.3.8.tar.gz -> slam_gmapping-1.3.8.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1a29820674c32010ac8dc68bcc63078
diff --git a/metadata/md5-cache/ros-meta/slam_gmapping-1.3.9 b/metadata/md5-cache/ros-meta/slam_gmapping-1.3.9
deleted file mode 100644
index b15aad483a3e..000000000000
--- a/metadata/md5-cache/ros-meta/slam_gmapping-1.3.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/slam_gmapping https://github.com/ros-perception/slam_gmapping
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=CC-BY-NC-SA-2.5
-RDEPEND=dev-ros/gmapping python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.3.9.tar.gz -> slam_gmapping-1.3.9.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fcf3e0be6709936524a5280f0494a17c
diff --git a/metadata/md5-cache/ros-meta/slam_gmapping-1.4.0 b/metadata/md5-cache/ros-meta/slam_gmapping-1.4.0
new file mode 100644
index 000000000000..e2111900839d
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/slam_gmapping-1.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/slam_gmapping https://github.com/ros-perception/slam_gmapping
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/gmapping python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.4.0.tar.gz -> slam_gmapping-1.4.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=94c572fb83130d6748b28b46cebd346d
diff --git a/metadata/md5-cache/ros-meta/slam_gmapping-9999 b/metadata/md5-cache/ros-meta/slam_gmapping-9999
index d6a49c4b5f4e..083bfbaee87d 100644
--- a/metadata/md5-cache/ros-meta/slam_gmapping-9999
+++ b/metadata/md5-cache/ros-meta/slam_gmapping-9999
@@ -4,10 +4,10 @@ DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/slam_gmapping https://github.com/ros-perception/slam_gmapping
 IUSE=python_targets_python2_7 test
-LICENSE=CC-BY-NC-SA-2.5
+LICENSE=BSD
 PROPERTIES=live
 RDEPEND=dev-ros/gmapping python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1a29820674c32010ac8dc68bcc63078
+_md5_=94c572fb83130d6748b28b46cebd346d
diff --git a/metadata/md5-cache/ros-meta/vision_visp-0.11.1 b/metadata/md5-cache/ros-meta/vision_visp-0.11.1
new file mode 100644
index 000000000000..1aaf482ca87c
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/vision_visp-0.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Virtual package providing ViSP related packages
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/vision_visp https://github.com/lagadic/vision_visp
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=dev-ros/visp_auto_tracker dev-ros/visp_bridge dev-ros/visp_camera_calibration dev-ros/visp_hand2eye_calibration dev-ros/visp_tracker python_targets_python2_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/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4b65323b32a338641b17a4acbb85ef04
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 96e37e221310..2c57adcfc239 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/celestia-9999 b/metadata/md5-cache/sci-astronomy/celestia-9999
index 2c5f7eceb9b8..4c0037f33eba 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-9999
+++ b/metadata/md5-cache/sci-astronomy/celestia-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-cpp/eigen virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-lang/lua-5.1:* dev-libs/libfmt media-libs/glew:0 media-libs/libpng:0= virtual/glu virtual/jpeg:0 virtual/opengl glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 x11-libs/gdk-pixbuf:2 x11-libs/pango ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) theora? ( media-libs/libogg media-libs/libtheora ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-lang/lua-5.1:* dev-libs/libfmt:= media-libs/glew:0 media-libs/libpng:0= virtual/glu virtual/jpeg:0 virtual/opengl glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 x11-libs/gdk-pixbuf:2 x11-libs/pango ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) theora? ( media-libs/libogg media-libs/libtheora ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=OpenGL 3D space simulator
 EAPI=7
 HOMEPAGE=https://celestia.space
 IUSE=glut gtk nls +qt5 theora
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=dev-lang/lua-5.1:* dev-libs/libfmt media-libs/glew:0 media-libs/libpng:0= virtual/glu virtual/jpeg:0 virtual/opengl glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 x11-libs/gdk-pixbuf:2 x11-libs/pango ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) theora? ( media-libs/libogg media-libs/libtheora )
+RDEPEND=>=dev-lang/lua-5.1:* dev-libs/libfmt:= media-libs/glew:0 media-libs/libpng:0= virtual/glu virtual/jpeg:0 virtual/opengl glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 x11-libs/gdk-pixbuf:2 x11-libs/pango ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) theora? ( media-libs/libogg media-libs/libtheora )
 REQUIRED_USE=|| ( glut gtk qt5 )
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1badc89c70b1fc96fec8f0adf6d75e0e
+_md5_=6aab0232290718ac7822f91bcd4df409
diff --git a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.7.0 b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.7.0
deleted file mode 100644
index 9bccffcb8650..000000000000
--- a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/matplotlib-0.91.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(-)] >=sci-libs/scipy-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python framework for Gromacs
-EAPI=6
-HOMEPAGE=https://gromacswrapper.readthedocs.io
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-python/matplotlib-0.91.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(-)] >=sci-libs/scipy-0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/Becksteinlab/GromacsWrapper/archive/release-0.7.0.tar.gz -> GromacsWrapper-0.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a9d4690552f590503ce659c78737f079
diff --git a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0 b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0
new file mode 100644
index 000000000000..aecfd6075b90
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0
@@ -0,0 +1,14 @@
+BDEPEND=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/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/numkit[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Python framework for Gromacs
+EAPI=7
+HOMEPAGE=https://gromacswrapper.readthedocs.io
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+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/Becksteinlab/GromacsWrapper/archive/release-0.8.0.tar.gz -> GromacsWrapper-0.8.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=2879923b3d6d9396b5a0d22423cbd384
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 73bd79697fb9..0d2b2f274ae3 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 3ecf31cbd865..2f7d9cba69e8 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/geda-suite-20110427 b/metadata/md5-cache/sci-electronics/geda-suite-20110427
deleted file mode 100644
index 30eaac6ad5d8..000000000000
--- a/metadata/md5-cache/sci-electronics/geda-suite-20110427
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Metapackage for all components for a full-featured gEDA/gaf system
-EAPI=0
-HOMEPAGE=http://www.geda.seul.org
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sci-electronics/geda sci-electronics/gerbv >=sci-electronics/gnucap-0.35.20091207 >=sci-electronics/gwave-20090213-r1 sci-electronics/pcb >=sci-electronics/geda-xgsch2pcb-0.1.3-r2 >=sci-electronics/iverilog-0.9.1 sci-electronics/ngspice sci-electronics/gspiceui >=sci-electronics/gnetman-0.0.1_pre20060522-r2 sci-electronics/gtkwave
-SLOT=0
-_md5_=9363a5d54d2666c99b23dc48fc29c72e
diff --git a/metadata/md5-cache/sci-electronics/kicad-4.0.7 b/metadata/md5-cache/sci-electronics/kicad-4.0.7
index a733742899b8..433863ab90fe 100644
--- a/metadata/md5-cache/sci-electronics/kicad-4.0.7
+++ b/metadata/md5-cache/sci-electronics/kicad-4.0.7
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python? ( dev-python/wxpython:3.0[o
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/4.0/4.0.7/+download/kicad-4.0.7.tar.xz !minimal? ( http://downloads.kicad-pcb.org/libraries/kicad-footprints-4.0.7.tar.gz http://downloads.kicad-pcb.org/libraries/kicad-library-4.0.7.tar.gz ) i18n? ( https://github.com/KiCad/kicad-i18n/archive/4.0.7.tar.gz -> kicad-4.0.7-i18n.tar.gz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c08a490578c532db5f563fed19c5afe
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-5.0.1
index f2008c2f2482..a8c5fb9f5939 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.0.1
+++ b/metadata/md5-cache/sci-electronics/kicad-5.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python? ( dev-python/wxpython:3.0[o
 REQUIRED_USE=python? ( python_targets_python2_7 ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.0.1/+download/kicad-5.0.1.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2031f92d6206f22626da03c28cb6d743
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.0-r1 b/metadata/md5-cache/sci-electronics/kicad-5.1.0-r1
index d9a901360800..6490c129c229 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.0-r1
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python? ( dev-python/wxpython:3.0[o
 REQUIRED_USE=python? ( python_targets_python2_7 ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.1.0/+download/kicad-5.1.0.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d1b542470c2293804911d1f842a165f
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.2-r1 b/metadata/md5-cache/sci-electronics/kicad-5.1.2-r1
index 2dd1975c5aee..a1fc701fa89c 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.2-r1
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python? ( dev-python/wxpython:4.0[pyth
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.1.2/+download/kicad-5.1.2.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99628f4d24590bed068b1e3fb2f058a4
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.4 b/metadata/md5-cache/sci-electronics/kicad-5.1.4
index 17aaad278b10..9cb7d29c6ee2 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.4
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.4
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python? ( dev-python/wxpython:4.0[pyth
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.1.4/+download/kicad-5.1.4.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6ff4be7ed6618eafbb442aac58be427e
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.1
index be73f3f0b182..d958414feba8 100644
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.1
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=sci-electronics/kicad-5.0.0[occ=,oce=]
 REQUIRED_USE=|| ( occ oce )
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-packages3d/archive/5.0.1.tar.gz -> kicad-packages3d-5.0.1.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9609c042f42c414548b1360003c34145
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.0 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.0
index b537edff2e9e..752b56645357 100644
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.0
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=sci-electronics/kicad-5.1.0[occ=,oce=]
 REQUIRED_USE=|| ( occ oce )
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-packages3d/archive/5.1.0.tar.gz -> kicad-packages3d-5.1.0.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=24f0652566a35bce026b824567dabd08
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.2 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.2
index 4011c86f89cc..3ed9b71f3723 100644
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.2
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=sci-electronics/kicad-5.1.0[occ=,oce=]
 REQUIRED_USE=|| ( occ oce )
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-packages3d/archive/5.1.2.tar.gz -> kicad-packages3d-5.1.2.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=24f0652566a35bce026b824567dabd08
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.4 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.4
index 67ff05602d32..49766de67c3b 100644
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.4
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.4
@@ -10,5 +10,5 @@ RDEPEND=>=sci-electronics/kicad-5.1.0[occ=,oce=]
 REQUIRED_USE=|| ( occ oce )
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-packages3d/archive/5.1.4.tar.gz -> kicad-packages3d-5.1.4.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=24f0652566a35bce026b824567dabd08
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index d7dddc79ce0c..20232f372b8b 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/geocode-glib-3.26.1 b/metadata/md5-cache/sci-geosciences/geocode-glib-3.26.1
index 59f04b9e474a..58eafb91d0a6 100644
--- a/metadata/md5-cache/sci-geosciences/geocode-glib-3.26.1
+++ b/metadata/md5-cache/sci-geosciences/geocode-glib-3.26.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.99.2[introspection?] >=net
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/geocode-glib/3.26/geocode-glib-3.26.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebaaaddde8132b20eac790970b420c4f
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3 b/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3
index 04dd6ddaf568..a8431ca840c9 100644
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/gjs-1.50.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10 >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-maps/3.30/gnome-maps-3.30.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfc26f3890aefa0ce923dad72bffc575
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3.1 b/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3.1
index 5ca831c84113..b89ea363261c 100644
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3.1
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/gjs-1.50.0 >=dev-libs/gobject-introsp
 DESCRIPTION=A map application for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Maps
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/gjs-1.50.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10 >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-maps/3.30/gnome-maps-3.30.3.1.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=605542b005382a5791b410b8ca17f971
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=11474ded3ddb2b349f38dbc819637901
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 847250ba4a3e..d24d94187e2d 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/Shapely-1.6.4_p2 b/metadata/md5-cache/sci-libs/Shapely-1.6.4_p2
new file mode 100644
index 000000000000..8cde6065cb0d
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/Shapely-1.6.4_p2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sci-libs/geos-3.3 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Geometric objects, predicates, and operations
+EAPI=6
+HOMEPAGE=https://pypi.org/project/Shapely/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=sci-libs/geos-3.3 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/S/Shapely/Shapely-1.6.4.post2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0db0e23bb7442fbb5e46397791f4ac0
diff --git a/metadata/md5-cache/sci-libs/ViSP-3.2.0-r2 b/metadata/md5-cache/sci-libs/ViSP-3.2.0-r2
new file mode 100644
index 000000000000..99d7245d0197
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/ViSP-3.2.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=coin? ( media-libs/coin virtual/opengl ) dmtx? ( media-libs/libdmtx ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) motif? ( media-libs/SoXt ) ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv:= ) png? ( media-libs/libpng:0= ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) virtual/pkgconfig doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz ) test? ( sci-misc/ViSP-images ) v4l? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Visual Servoing Platform: visual tracking and visual servoing library
+EAPI=5
+HOMEPAGE=http://www.irisa.fr/lagadic/visp/visp.html
+IUSE=+coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre opencv png test tutorials usb v4l X xml +zbar zlib cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=coin? ( media-libs/coin virtual/opengl ) dmtx? ( media-libs/libdmtx ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) motif? ( media-libs/SoXt ) ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv:= ) png? ( media-libs/libpng:0= ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) demos? ( sci-misc/ViSP-images )
+REQUIRED_USE=motif? ( coin )
+SLOT=0/3.2
+SRC_URI=http://gforge.inria.fr/frs/download.php/latestfile/475/visp-3.2.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c259fe1e860a571a723a4f658dc35c64
diff --git a/metadata/md5-cache/sci-libs/blis-0.5.2 b/metadata/md5-cache/sci-libs/blis-0.5.2
index 61d46448ea6d..b65e9c2bbd4d 100644
--- a/metadata/md5-cache/sci-libs/blis-0.5.2
+++ b/metadata/md5-cache/sci-libs/blis-0.5.2
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=eselect-ldso? ( !app-eselect/eselect-cblas >=app-eselect/eselect-blas-0.2 ) dev-lang/python
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=eselect-ldso? ( !app-eselect/eselect-cblas >=app-eselect/eselect-blas-0.2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 )
 DESCRIPTION=BLAS-like Library Instantiation Software Framework
 EAPI=7
 HOMEPAGE=https://github.com/flame/blis
@@ -10,5 +10,5 @@ RDEPEND=eselect-ldso? ( !app-eselect/eselect-cblas >=app-eselect/eselect-blas-0.
 REQUIRED_USE=?? ( openmp pthread serial ) ?? ( eselect-ldso 64bit-index )
 SLOT=0
 SRC_URI=https://github.com/flame/blis/archive/0.5.2.tar.gz -> blis-0.5.2.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8
-_md5_=e9e39b427e1b47f5e14184f0ac2becb1
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=15f08e384d16acb29444599940b36d87
diff --git a/metadata/md5-cache/sci-libs/blis-0.6.0 b/metadata/md5-cache/sci-libs/blis-0.6.0
index 8b87a47ce08c..cbb59cf08464 100644
--- a/metadata/md5-cache/sci-libs/blis-0.6.0
+++ b/metadata/md5-cache/sci-libs/blis-0.6.0
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=eselect-ldso? ( !app-eselect/eselect-cblas >=app-eselect/eselect-blas-0.2 ) dev-lang/python
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=eselect-ldso? ( !app-eselect/eselect-cblas >=app-eselect/eselect-blas-0.2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 )
 DESCRIPTION=BLAS-like Library Instantiation Software Framework
 EAPI=7
 HOMEPAGE=https://github.com/flame/blis
@@ -10,5 +10,5 @@ RDEPEND=eselect-ldso? ( !app-eselect/eselect-cblas >=app-eselect/eselect-blas-0.
 REQUIRED_USE=?? ( openmp pthread serial ) ?? ( eselect-ldso 64bit-index )
 SLOT=0
 SRC_URI=https://github.com/flame/blis/archive/0.6.0.tar.gz -> blis-0.6.0.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8
-_md5_=54d38a858e95abda996253c44e862fc9
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ff57d80d06101d97d6bc540ebabd48b1
diff --git a/metadata/md5-cache/sci-libs/cantera-2.4.0-r2 b/metadata/md5-cache/sci-libs/cantera-2.4.0-r2
new file mode 100644
index 000000000000..b98cffa7cffa
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/cantera-2.4.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/scons[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python? ( dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) <sci-libs/sundials-5.0.0:0= dev-cpp/eigen:3 dev-libs/boost dev-libs/libfmt python? ( dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) test? ( >=dev-cpp/gtest-1.8.0 ) fortran? ( virtual/fortran )
+DESCRIPTION=Object-oriented tool suite for chemical kinetics, thermodynamics, and transport
+EAPI=7
+HOMEPAGE=https://www.cantera.org
+IUSE=+cti fortran pch +python test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python? ( dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) <sci-libs/sundials-5.0.0:0= fortran? ( virtual/fortran )
+REQUIRED_USE=python? ( cti ) ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/Cantera/cantera/archive/v2.4.0.tar.gz -> cantera-2.4.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	fortran-2	f75a2d9321053acf424991e805f32ede	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=84e75cffae5f03a909bc533ff3fb791d
diff --git a/metadata/md5-cache/sci-libs/gmsh-4.4.1 b/metadata/md5-cache/sci-libs/gmsh-4.4.1
index 136afecadfa2..ad3d62825323 100644
--- a/metadata/md5-cache/sci-libs/gmsh-4.4.1
+++ b/metadata/md5-cache/sci-libs/gmsh-4.4.1
@@ -8,7 +8,8 @@ IUSE=blas cgns examples jpeg lua med metis mpi netgen opencascade petsc png pyth
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 free-noncomm
 RDEPEND=virtual/fortran X? ( x11-libs/fltk:1 ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib ) jpeg? ( virtual/jpeg:0 ) lua? ( dev-lang/lua:0 ) med? ( sci-libs/med ) opencascade? ( sci-libs/opencascade:* ) png? ( media-libs/libpng:0 ) petsc? ( sci-mathematics/petsc ) zlib? ( sys-libs/zlib ) mpi? ( virtual/mpi[cxx] ) virtual/fortran
+REQUIRED_USE=med? ( mpi )
 SLOT=0
 SRC_URI=http://www.geuz.org/gmsh/src/gmsh-4.4.1-source.tgz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8bbbf91400f66172bdde126709cdb58e
+_md5_=1cac44eeed34b1b07772ee98bdb9db02
diff --git a/metadata/md5-cache/sci-libs/grib_api-1.11.0 b/metadata/md5-cache/sci-libs/grib_api-1.11.0
index ad8c887d2179..6ae320c406eb 100644
--- a/metadata/md5-cache/sci-libs/grib_api-1.11.0
+++ b/metadata/md5-cache/sci-libs/grib_api-1.11.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=jpeg2k? ( jasper? ( media-libs/jasper:= ) !jasper? ( media-libs/openjpeg:0 ) ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) python? ( dev-lang/swig ) >=app-portage/elt-patches-20170815 fortran? ( virtual/fortran )
+DEPEND=jpeg2k? ( media-libs/openjpeg:0 !!media-libs/jasper ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) python? ( dev-lang/swig ) >=app-portage/elt-patches-20170815 fortran? ( virtual/fortran )
 DESCRIPTION=Library for decoding WMO FM-92 GRIB messages
 EAPI=5
 HOMEPAGE=https://software.ecmwf.int/wiki/display/GRIB/Home
-IUSE=doc examples fortran jasper jpeg2k netcdf openmp png python static-libs threads perl python_targets_python2_7
+IUSE=doc examples fortran jpeg2k netcdf openmp png python static-libs threads perl python_targets_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=jpeg2k? ( jasper? ( media-libs/jasper:= ) !jasper? ( media-libs/openjpeg:0 ) ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) fortran? ( virtual/fortran )
+RDEPEND=jpeg2k? ( media-libs/openjpeg:0 !!media-libs/jasper ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) fortran? ( virtual/fortran )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.11.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbf1b1025ef2b8f4fdf1b4416c4bfbb5
+_md5_=5d9df8762431eca27ad9a790ab4ba81d
diff --git a/metadata/md5-cache/sci-libs/grib_api-1.14.5 b/metadata/md5-cache/sci-libs/grib_api-1.14.5
index 4928ada00ca2..45fea0d45e63 100644
--- a/metadata/md5-cache/sci-libs/grib_api-1.14.5
+++ b/metadata/md5-cache/sci-libs/grib_api-1.14.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=aec? ( sci-libs/libaec:= ) jpeg2k? ( media-libs/jasper:= ) netcdf? ( sci-libs/netcdf:= ) png? ( media-libs/libpng:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python? ( dev-lang/swig ) test? ( dev-libs/boost ) sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
+DEPEND=aec? ( sci-libs/libaec:= ) netcdf? ( sci-libs/netcdf:= ) png? ( media-libs/libpng:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python? ( dev-lang/swig ) test? ( dev-libs/boost ) sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
 DESCRIPTION=Library for encoding and decoding WMO FM-92 GRIB messages
 EAPI=6
 HOMEPAGE=https://software.ecmwf.int/wiki/display/GRIB/Home
-IUSE=aec doc examples fortran jpeg2k netcdf png python static-libs test threads python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
+IUSE=aec doc examples fortran netcdf png python static-libs test threads python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=aec? ( sci-libs/libaec:= ) jpeg2k? ( media-libs/jasper:= ) netcdf? ( sci-libs/netcdf:= ) png? ( media-libs/libpng:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) fortran? ( virtual/fortran )
+RDEPEND=aec? ( sci-libs/libaec:= ) netcdf? ( sci-libs/netcdf:= ) png? ( media-libs/libpng:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) fortran? ( virtual/fortran )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.14.5-Source.tar.gz test? ( http://download.ecmwf.org/test-data/grib_api/grib_api_test_data.tar.gz )
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cbb0877e3556ac05fb801243c0629828
+_md5_=8c561c4b4ba2ef834f707c5d042cef7d
diff --git a/metadata/md5-cache/sci-libs/iml-1.0.5 b/metadata/md5-cache/sci-libs/iml-1.0.5
new file mode 100644
index 000000000000..89ba31695d39
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/iml-1.0.5
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=virtual/cblas
+DESCRIPTION=Integer Matrix Library
+EAPI=7
+HOMEPAGE=http://www.cs.uwaterloo.ca/~astorjoh/iml.html
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=virtual/cblas
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://www.cs.uwaterloo.ca/~astorjoh/iml-1.0.5.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=964e01fb00950890d6dd4df618ebebbc
diff --git a/metadata/md5-cache/sci-libs/libctl-3.1 b/metadata/md5-cache/sci-libs/libctl-3.1
deleted file mode 100644
index 0d776b82567b..000000000000
--- a/metadata/md5-cache/sci-libs/libctl-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-scheme/guile[deprecated] sci-libs/nlopt virtual/fortran >=app-portage/elt-patches-20170815
-DESCRIPTION=Guile-based library for scientific simulations
-EAPI=4
-HOMEPAGE=http://ab-initio.mit.edu/libctl/
-IUSE=doc examples static-libs
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-scheme/guile[deprecated] sci-libs/nlopt virtual/fortran
-SLOT=0
-SRC_URI=http://ab-initio.mit.edu/libctl/libctl-3.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4c39a34b15c849ad96377206ab526fde
diff --git a/metadata/md5-cache/sci-libs/libctl-3.2 b/metadata/md5-cache/sci-libs/libctl-3.2
deleted file mode 100644
index 8f5e3aba053a..000000000000
--- a/metadata/md5-cache/sci-libs/libctl-3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-scheme/guile sci-libs/nlopt virtual/fortran >=app-portage/elt-patches-20170815
-DESCRIPTION=Guile-based library for scientific simulations
-EAPI=4
-HOMEPAGE=http://ab-initio.mit.edu/libctl/
-IUSE=doc examples static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-scheme/guile sci-libs/nlopt virtual/fortran
-SLOT=0
-SRC_URI=http://ab-initio.mit.edu/libctl/libctl-3.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=079e890cb994f83f3bc7f17f867e502f
diff --git a/metadata/md5-cache/sci-libs/libgeodecomp-0.4.0 b/metadata/md5-cache/sci-libs/libgeodecomp-0.4.0
index 1f59e9fadeca..4d4e88845f97 100644
--- a/metadata/md5-cache/sci-libs/libgeodecomp-0.4.0
+++ b/metadata/md5-cache/sci-libs/libgeodecomp-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.48 doc? ( app-doc/doxygen app-text/texlive media-gfx/graphviz ) mpi? ( virtual/mpi ) cuda? ( dev-util/nvidia-cuda-toolkit ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv ) silo? ( sci-libs/silo ) hpx? ( sys-cluster/hpx ) visit? ( sci-visualization/visit ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=dev-libs/boost-1.48 doc? ( app-doc/doxygen app-text/texlive media-gfx/graphviz ) hpx? ( sys-cluster/hpx ) <=dev-libs/libflatarray-0.2.0 mpi? ( virtual/mpi ) cuda? ( dev-util/nvidia-cuda-toolkit ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv ) silo? ( sci-libs/silo ) visit? ( sci-visualization/visit ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=An auto-parallelizing library to speed up computer simulations
 EAPI=6
 HOMEPAGE=http://www.libgeodecomp.org
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/boost-1.48
 SLOT=0
 SRC_URI=http://www.libgeodecomp.org/archive/libgeodecomp-0.4.0.tar.bz2
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=417dc6bd0ef518e4e63b90bfde5ec2bc
+_md5_=011dc6ea7772e0ee6702fb82d84e956c
diff --git a/metadata/md5-cache/sci-libs/libmed-3.3.1-r1 b/metadata/md5-cache/sci-libs/libmed-3.3.1-r1
deleted file mode 100644
index db8aa634b20a..000000000000
--- a/metadata/md5-cache/sci-libs/libmed-3.3.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-libs/hdf5[fortran=,mpi=] mpi? ( virtual/mpi[fortran=] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python? ( >=dev-lang/swig-2.0.9:0 ) fortran? ( virtual/fortran )
-DESCRIPTION=A library to store and exchange meshed data or computation results
-EAPI=7
-HOMEPAGE=https://www.salome-platform.org/
-IUSE=doc fortran mpi python static-libs test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=sci-libs/hdf5[fortran=,mpi=] mpi? ( virtual/mpi[fortran=] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) fortran? ( virtual/fortran )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=http://files.salome-platform.org/Salome/other/med-3.3.1.tar.gz https://dev.gentoo.org/~fordfrog/distfiles/libmed-3.3.1-r1-gentoo.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=849071979b40d7ad0a6db37e87c15f77
diff --git a/metadata/md5-cache/sci-libs/med-4.0.0 b/metadata/md5-cache/sci-libs/med-4.0.0
deleted file mode 100644
index 022c2edebe89..000000000000
--- a/metadata/md5-cache/sci-libs/med-4.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Modeling and Exchange of Data library
-EAPI=7
-HOMEPAGE=https://www.salome-platform.org/user-section/about/med
-IUSE=mpi
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sci-libs/hdf5-1.10.5[mpi=] mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=https://files.salome-platform.org/Salome/other/med-4.0.0.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=be860a334e02f0d22a6e35265ef76592
diff --git a/metadata/md5-cache/sci-libs/med-4.0.0-r1 b/metadata/md5-cache/sci-libs/med-4.0.0-r1
new file mode 100644
index 000000000000..6f49197bf613
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/med-4.0.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=python? ( >=dev-lang/swig-3.0.8 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran=,mpi(+)] virtual/mpi[fortran=] python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) virtual/fortran
+DESCRIPTION=Modeling and Exchange of Data library
+EAPI=7
+HOMEPAGE=https://www.salome-platform.org/user-section/about/med
+IUSE=doc fortran hdf5-16-api python test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran=,mpi(+)] virtual/mpi[fortran=] python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) virtual/fortran
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://files.salome-platform.org/Salome/other/med-4.0.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=7454dc06ba1a60ded8d8cd21f45bb1ea
diff --git a/metadata/md5-cache/sci-libs/mkl-10.0.5.025 b/metadata/md5-cache/sci-libs/mkl-10.0.5.025
index 9450a104b8e0..5373c600887f 100644
--- a/metadata/md5-cache/sci-libs/mkl-10.0.5.025
+++ b/metadata/md5-cache/sci-libs/mkl-10.0.5.025
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-blas app-eselect/eselect-cblas app-eselect/eselect-l
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=http://registrationcenter-download.intel.com/irc_nas/1232/l_mkl_p_10.0.5.025.tgz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=09fec5d56fe1828c954406b1be2d315c
diff --git a/metadata/md5-cache/sci-libs/mkl-10.0.5.025-r1 b/metadata/md5-cache/sci-libs/mkl-10.0.5.025-r1
index b8fca187d81e..5ac494fa5413 100644
--- a/metadata/md5-cache/sci-libs/mkl-10.0.5.025-r1
+++ b/metadata/md5-cache/sci-libs/mkl-10.0.5.025-r1
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-blas app-eselect/eselect-cblas app-eselect/eselect-l
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=http://registrationcenter-download.intel.com/irc_nas/1232/l_mkl_p_10.0.5.025.tgz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=15bcc97a92b3740a555995aad5a94513
diff --git a/metadata/md5-cache/sci-libs/numkit-1.1.2 b/metadata/md5-cache/sci-libs/numkit-1.1.2
new file mode 100644
index 000000000000..3054014b0cd0
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/numkit-1.1.2
@@ -0,0 +1,14 @@
+BDEPEND=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/numpy-1.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sci-libs/scipy-1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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 unpack
+DESCRIPTION=Numerical first aid kit (with numpy/scipy)
+EAPI=7
+HOMEPAGE=https://numkit.readthedocs.io
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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/Becksteinlab/numkit/archive/release-1.1.2.tar.gz -> numkit-1.1.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=bf2ef717542e217253a516785835e2f7
diff --git a/metadata/md5-cache/sci-libs/oce-0.18.3-r1 b/metadata/md5-cache/sci-libs/oce-0.18.3-r1
index af17c8ab9800..9b7bf398e9a9 100644
--- a/metadata/md5-cache/sci-libs/oce-0.18.3-r1
+++ b/metadata/md5-cache/sci-libs/oce-0.18.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/ti
 REQUIRED_USE=?? ( openmp tbb )
 SLOT=0.18.3
 SRC_URI=https://github.com/tpaviot/oce/archive/OCE-0.18.3.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9553df555bb5767080967762df0fa9c
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.7 b/metadata/md5-cache/sci-libs/openblas-0.3.7
new file mode 100644
index 000000000000..d696ea9fb358
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm setup test unpack
+DEPEND=virtual/pkgconfig virtual/fortran
+DESCRIPTION=Optimized BLAS library based on GotoBLAS2
+EAPI=7
+HOMEPAGE=http://xianyi.github.com/OpenBLAS/
+IUSE=dynamic eselect-ldso index-64bit openmp pthread
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 !app-eselect/eselect-cblas >=app-eselect/eselect-lapack-0.2 ) virtual/fortran
+REQUIRED_USE=?? ( openmp pthread )
+SLOT=0
+SRC_URI=https://github.com/xianyi/OpenBLAS/tarball/v0.3.7 -> openblas-0.3.7.tar.gz
+_eclasses_=fortran-2	f75a2d9321053acf424991e805f32ede	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=48a07334a8d5e99cc09746e1316118d1
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.3.0 b/metadata/md5-cache/sci-libs/opencascade-7.3.0
index 17fde6ec5801..b1fb3d8b9e20 100644
--- a/metadata/md5-cache/sci-libs/opencascade-7.3.0
+++ b/metadata/md5-cache/sci-libs/opencascade-7.3.0
@@ -9,5 +9,5 @@ LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
 RDEPEND=app-eselect/eselect-opencascade dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/freetype:2 media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu ffmpeg? ( virtual/ffmpeg ) freeimage? ( media-libs/freeimage ) gl2ps? ( x11-libs/gl2ps ) java? ( >=virtual/jdk-0:= ) tbb? ( dev-cpp/tbb ) vtk? ( sci-libs/vtk[rendering] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=7.3.0
 SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_3_0;sf=tgz -> opencascade-7.3.0.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df0fb186901d9a44ee0685150f7766ea
diff --git a/metadata/md5-cache/sci-libs/pcl-1.8.1 b/metadata/md5-cache/sci-libs/pcl-1.8.1
deleted file mode 100644
index 378f93f427b3..000000000000
--- a/metadata/md5-cache/sci-libs/pcl-1.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sci-libs/flann-1.7.1 dev-libs/boost:=[threads] dev-cpp/eigen:3 opengl? ( virtual/opengl media-libs/freeglut ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtopengl:5 ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) !!dev-cpp/metslib doc? ( app-doc/doxygen ) tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink ) test? ( >=dev-cpp/gtest-1.6.0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=2D/3D image and point cloud processing
-EAPI=5
-HOMEPAGE=http://pointclouds.org/
-IUSE=cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=sci-libs/flann-1.7.1 dev-libs/boost:=[threads] dev-cpp/eigen:3 opengl? ( virtual/opengl media-libs/freeglut ) openni? ( dev-libs/OpenNI ) openni2? ( dev-libs/OpenNI2 ) pcap? ( net-libs/libpcap ) png? ( media-libs/libpng:0= ) qhull? ( media-libs/qhull ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtopengl:5 ) usb? ( virtual/libusb:1 ) vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-REQUIRED_USE=openni? ( usb ) openni2? ( usb ) tutorials? ( doc )
-SLOT=0/1.8
-SRC_URI=https://github.com/PointCloudLibrary/pcl/archive/pcl-1.8.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=564ebb1091b2e6eea7784cfc48dd33c7
diff --git a/metadata/md5-cache/sci-libs/rtabmap-0.14.0 b/metadata/md5-cache/sci-libs/rtabmap-0.14.0
deleted file mode 100644
index ea564cc583c3..000000000000
--- a/metadata/md5-cache/sci-libs/rtabmap-0.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394 ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)
-EAPI=5
-HOMEPAGE=http://introlab.github.io/rtabmap/
-IUSE=examples ieee1394 openni2 qt5
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394 ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
-SLOT=0
-SRC_URI=https://github.com/introlab/rtabmap/archive/0.14.0.tar.gz -> rtabmap-0.14.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=00b9dd26e98c9d5cdea40032fb53049e
diff --git a/metadata/md5-cache/sci-libs/rtabmap-0.17.1 b/metadata/md5-cache/sci-libs/rtabmap-0.17.1
deleted file mode 100644
index 3a3941c7f5c0..000000000000
--- a/metadata/md5-cache/sci-libs/rtabmap-0.17.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk,qt5(-)?] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394 ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)
-EAPI=5
-HOMEPAGE=http://introlab.github.io/rtabmap/
-IUSE=examples ieee1394 openni2 qt5
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk,qt5(-)?] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394 ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
-SLOT=0
-SRC_URI=https://github.com/introlab/rtabmap/archive/0.17.1-melodic.tar.gz -> rtabmap-0.17.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a76cbea39f6e64787df71485ec33fd3a
diff --git a/metadata/md5-cache/sci-libs/rtabmap-0.19.3 b/metadata/md5-cache/sci-libs/rtabmap-0.19.3
new file mode 100644
index 000000000000..607600eb7729
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rtabmap-0.19.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk,qt5(-)?] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394 ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)
+EAPI=5
+HOMEPAGE=http://introlab.github.io/rtabmap/
+IUSE=examples ieee1394 openni2 qt5
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk,qt5(-)?] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394 ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
+SLOT=0
+SRC_URI=https://github.com/introlab/rtabmap/archive/0.19.3.tar.gz -> rtabmap-0.19.3.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6d0ccda50e384f006fd93fa0c43cf3da
diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.13.1 b/metadata/md5-cache/sci-libs/tensorflow-1.13.1
index 5658827f8479..f56220f12415 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-1.13.1
+++ b/metadata/md5-cache/sci-libs/tensorflow-1.13.1
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/icu >=dev-libs/jsoncp
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.13.1.tar.gz -> tensorflow-1.13.1.tar.gz http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz https://bitbucket.org/eigen/eigen/get/9f48e814419e.tar.gz -> eigen-9f48e814419e.tar.gz https://github.com/abseil/abseil-cpp/archive/389ec3f906f018661a5308458d623d01f96d7b23.tar.gz -> abseil-cpp-389ec3f906f018661a5308458d623d01f96d7b23.tar.gz https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz https://github.com/bazelbuild/rules_docker/archive/a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz -> rules_docker-a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/nlopezgi/bazel-toolchains/archive/3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz -> bazel-toolchains-3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz -> nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://mirror.bazel.build/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	a0b1163178726619e8646179984e463d	check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=bazel	a0b1163178726619e8646179984e463d	check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=b8e38a81578f26407cea6938e3b2b3de
diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r1 b/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r1
index d419c2e52165..06fc960e7e14 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r1
+++ b/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r1
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/icu >=dev-libs/jsoncp
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.14.0.tar.gz -> tensorflow-1.14.0.tar.gz http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz https://bitbucket.org/eigen/eigen/get/a0d250e79c79.tar.gz -> eigen-a0d250e79c79.tar.gz https://github.com/abseil/abseil-cpp/archive/daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz -> abseil-cpp-daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz https://github.com/bazelbuild/bazel-skylib/archive/0.6.0.tar.gz -> bazel-skylib-0.6.0.tar.gz https://github.com/bazelbuild/rules_closure/archive/cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz -> bazelbuild-rules_closure-cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz https://github.com/bazelbuild/rules_swift/releases/download/0.9.0/rules_swift.0.9.0.tar.gz -> bazelbuild-rules_swift.0.9.0.tar.gz https://github.com/bazelbuild/rules_docker/archive/b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz -> rules_docker-b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz -> nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz http://mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.14.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	a0b1163178726619e8646179984e463d	check-reqs	2c6f909675083dce8430b648bf737cb0	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=bazel	a0b1163178726619e8646179984e463d	check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=afa33f812831c7f3acef0b7097913d82
diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r2 b/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r2
new file mode 100644
index 000000000000..008e0ff689ce
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/tensorflow-1.14.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip >=dev-libs/protobuf-3.6.0 dev-java/java-config dev-python/mock dev-lang/swig dev-python/cython || ( =dev-util/bazel-0.24* =dev-util/bazel-0.26* =dev-util/bazel-0.27* ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.1[profiler] ) !python? ( dev-lang/python ) python? ( >=dev-python/grpcio-tools-1.22.0 ) >=dev-util/bazel-0.20
+DEFINED_PHASES=compile configure install prepare pretend setup unpack
+DEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/icu >=dev-libs/jsoncpp-1.9 dev-libs/libpcre dev-libs/nsync dev-libs/openssl:0= >=dev-libs/protobuf-3.6.0:= >=dev-libs/re2-0.2018.04.01 media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.22.0 net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2 cuda? ( >=dev-util/nvidia-cuda-toolkit-9.1[profiler] dev-libs/cudnn ) mpi? ( virtual/mpi ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/flatbuffers-1.8.0 dev-python/absl-py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/astor-0.7.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/gast[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/google-pasta[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/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/termcolor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/grpcio-1.22.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/wrapt-1.11.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.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(-)] >=sci-libs/keras-preprocessing-1.0.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(-)] >=sci-visualization/tensorboard-1.13.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(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/mock
+DESCRIPTION=Computation framework using data flow graphs for scalable machine learning
+EAPI=7
+HOMEPAGE=https://www.tensorflow.org/
+IUSE=cuda mpi +python cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+PDEPEND=python? ( >=sci-libs/tensorflow-estimator-1.13.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(-)] )
+RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/icu >=dev-libs/jsoncpp-1.9 dev-libs/libpcre dev-libs/nsync dev-libs/openssl:0= >=dev-libs/protobuf-3.6.0:= >=dev-libs/re2-0.2018.04.01 media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.22.0 net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2 cuda? ( >=dev-util/nvidia-cuda-toolkit-9.1[profiler] dev-libs/cudnn ) mpi? ( virtual/mpi ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/flatbuffers-1.8.0 dev-python/absl-py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/astor-0.7.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/gast[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/google-pasta[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/protobuf-python-3.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/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/termcolor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/grpcio-1.22.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/wrapt-1.11.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.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(-)] >=sci-libs/keras-preprocessing-1.0.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(-)] >=sci-visualization/tensorboard-1.13.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(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.14.0.tar.gz -> tensorflow-1.14.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-1.14.0-r2.tar.bz2 http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz https://bitbucket.org/eigen/eigen/get/a0d250e79c79.tar.gz -> eigen-a0d250e79c79.tar.gz https://github.com/abseil/abseil-cpp/archive/daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz -> abseil-cpp-daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz https://github.com/bazelbuild/bazel-skylib/archive/0.6.0.tar.gz -> bazel-skylib-0.6.0.tar.gz https://github.com/bazelbuild/rules_closure/archive/cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz -> bazelbuild-rules_closure-cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz https://github.com/bazelbuild/rules_swift/releases/download/0.9.0/rules_swift.0.9.0.tar.gz -> bazelbuild-rules_swift.0.9.0.tar.gz https://github.com/bazelbuild/rules_docker/archive/b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz -> rules_docker-b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz -> nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz http://mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.14.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
+_eclasses_=bazel	a0b1163178726619e8646179984e463d	check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=6dd76d99ed8d82e6a0a5e675ace5a493
diff --git a/metadata/md5-cache/sci-libs/vtk-7.1.0 b/metadata/md5-cache/sci-libs/vtk-7.1.0
deleted file mode 100644
index 47eb0ef3841a..000000000000
--- a/metadata/md5-cache/sci-libs/vtk-7.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
-DEPEND=dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 sci-libs/vtkdata ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/autobahn[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=The Visualization Toolkit
-EAPI=6
-HOMEPAGE=https://www.vtk.org/
-IUSE=all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi mysql odbc offscreen postgres python qt5 rendering tbb test theora tk tcl video_cards_nvidia views web R +X xdmf2 elibc_FreeBSD java python_targets_python2_7 test
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-LICENSE=BSD LGPL-2
-RDEPEND=dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 sci-libs/vtkdata ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/autobahn[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( python_targets_python2_7 ) tcl? ( rendering ) test? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.vtk.org/files/release/7.1/VTK-7.1.0.tar.gz doc? ( https://www.vtk.org/files/release/7.1/vtkDocHtml-7.1.0.tar.gz ) test? ( https://www.vtk.org/files/release/7.1/VTKData-7.1.0.tar.gz https://www.vtk.org/files/release/7.1/VTKLargeData-7.1.0.tar.gz )
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=194399ac6f7df44da2d95ee53a9be21f
diff --git a/metadata/md5-cache/sci-libs/vtk-8.1.0 b/metadata/md5-cache/sci-libs/vtk-8.1.0
deleted file mode 100644
index f573a87b6787..000000000000
--- a/metadata/md5-cache/sci-libs/vtk-8.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
-DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/constantly[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/hyperlink[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/incremental[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/txaio[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=The Visualization Toolkit
-EAPI=6
-HOMEPAGE=https://www.vtk.org/
-IUSE=all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl video_cards_nvidia views web R +X xdmf2 elibc_FreeBSD java python_targets_python2_7 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD LGPL-2
-RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/constantly[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/hyperlink[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/incremental[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/txaio[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( python_targets_python2_7 ) tcl? ( rendering ) examples? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.vtk.org/files/release/8.1/VTK-8.1.0.tar.gz doc? ( https://www.vtk.org/files/release/8.1/vtkDocHtml-8.1.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.1/VTKData-8.1.0.tar.gz https://www.vtk.org/files/release/8.1/VTKLargeData-8.1.0.tar.gz )
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2604d0265fff5e35762723bb38a370f8
diff --git a/metadata/md5-cache/sci-libs/vtk-8.1.0-r1 b/metadata/md5-cache/sci-libs/vtk-8.1.0-r1
deleted file mode 100644
index d1933bd5cdf0..000000000000
--- a/metadata/md5-cache/sci-libs/vtk-8.1.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
-DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/constantly[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/hyperlink[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/incremental[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/txaio[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=The Visualization Toolkit
-EAPI=6
-HOMEPAGE=https://www.vtk.org/
-IUSE=all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl video_cards_nvidia views web R +X xdmf2 elibc_FreeBSD java python_targets_python2_7 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD LGPL-2
-RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/constantly[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/hyperlink[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/incremental[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/txaio[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( python_targets_python2_7 ) tcl? ( rendering ) examples? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.vtk.org/files/release/8.1/VTK-8.1.0.tar.gz doc? ( https://www.vtk.org/files/release/8.1/vtkDocHtml-8.1.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.1/VTKData-8.1.0.tar.gz https://www.vtk.org/files/release/8.1/VTKLargeData-8.1.0.tar.gz )
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d05bdc6bb60fd65dee5c3f30e188c9c
diff --git a/metadata/md5-cache/sci-libs/vtk-8.1.0-r2 b/metadata/md5-cache/sci-libs/vtk-8.1.0-r2
deleted file mode 100644
index a427b2a6b1de..000000000000
--- a/metadata/md5-cache/sci-libs/vtk-8.1.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
-DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/constantly[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/hyperlink[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/incremental[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/txaio[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=The Visualization Toolkit
-EAPI=6
-HOMEPAGE=https://www.vtk.org/
-IUSE=all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl video_cards_nvidia views web R +X xdmf2 elibc_FreeBSD java python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD LGPL-2
-RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) kaapi? ( <sci-libs/xkaapi-3 ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/constantly[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/hyperlink[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/incremental[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/txaio[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) 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 ) ) tcl? ( rendering ) examples? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.vtk.org/files/release/8.1/VTK-8.1.0.tar.gz doc? ( https://www.vtk.org/files/release/8.1/vtkDocHtml-8.1.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.1/VTKData-8.1.0.tar.gz https://www.vtk.org/files/release/8.1/VTKLargeData-8.1.0.tar.gz )
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=be84746f8b0547411b6c5ad5917f58dc
diff --git a/metadata/md5-cache/sci-libs/vtkdata-6.0.0 b/metadata/md5-cache/sci-libs/vtkdata-6.0.0
deleted file mode 100644
index b84b45ba4a2c..000000000000
--- a/metadata/md5-cache/sci-libs/vtkdata-6.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Example data file for VTK
-EAPI=5
-HOMEPAGE=http://www.vtk.org
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=!<sci-libs/vtk-6
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=http://www.vtk.org/files/release/6.0/vtkdata-6.0.0.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1a095630904e31f7c3a6c9aa4c96e699
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 4a2fe9274df9..86b2b640204d 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/drgeo-1.1.0-r1 b/metadata/md5-cache/sci-mathematics/drgeo-1.1.0-r1
deleted file mode 100644
index 74c9fd98d59f..000000000000
--- a/metadata/md5-cache/sci-mathematics/drgeo-1.1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/libxml2:2 dev-scheme/guile:=[deprecated] gnome-base/libglade:2.0 x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=Interactive geometry package
-EAPI=6
-HOMEPAGE=http://www.ofset.org/drgeo
-IUSE=nls
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2:2 dev-scheme/guile:=[deprecated] gnome-base/libglade:2.0 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/ofset/drgeo-1.1.0.tar.gz mirror://sourceforge/ofset/drgeo-doc-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=758acd1a2b0628ce5fc7ddd9596140ee
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4 b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4
new file mode 100644
index 000000000000..ae4a3a379d8a
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/gmp:0= blas? ( sci-libs/gsl ) openmp? ( sys-devel/gcc:*[openmp] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Elliptic Curve Method for Integer Factorization
+EAPI=5
+HOMEPAGE=http://ecm.gforge.inria.fr/
+IUSE=+blas +custom-tune -openmp static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=dev-libs/gmp:0= blas? ( sci-libs/gsl ) openmp? ( sys-devel/gcc:*[openmp] )
+SLOT=0
+SRC_URI=https://gforge.inria.fr/frs/download.php/36224/gmp-ecm-7.0.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3f3b7419e0d76016e8c169f711cbe046
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2016.1 b/metadata/md5-cache/sci-mathematics/isabelle-2016.1
index 3bf832f7b19e..a9c186d5aa2a 100644
--- a/metadata/md5-cache/sci-mathematics/isabelle-2016.1
+++ b/metadata/md5-cache/sci-mathematics/isabelle-2016.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/libwww-perl sci-mathematics/sha1-polyml >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0/2016.1
 SRC_URI=http://isabelle.in.tum.de/website-Isabelle2016-1/dist/Isabelle2016-1.tar.gz http://isabelle.in.tum.de/dist/contrib/bash_process-1.2.1.tar.gz -> bash_process-isabelle-component-1.2.1.tar.gz https://dev.gentoo.org/~gienah/snapshots/csdp-isabelle-component-6.x.tar.gz http://isabelle.in.tum.de/dist/contrib/isabelle_fonts-20160830.tar.gz -> isabelle_fonts-isabelle-component-20160830.tar.gz http://isabelle.in.tum.de/components/jortho-1.0-2.tar.gz -> jortho-isabelle-component-1.0-2.tar.gz http://isabelle.in.tum.de/components/jedit_build-20161024.tar.gz -> jedit_build-isabelle-component-20161024.tar.gz http://isabelle.in.tum.de/dist/contrib/jfreechart-1.0.14-1.tar.gz -> jfreechart-isabelle-component-1.0.14-1.tar.gz https://dev.gentoo.org/~gienah/snapshots/polyml-isabelle-component-5.6-1.tar.gz http://isabelle.in.tum.de/dist/contrib/ssh-java-20161009.tar.gz -> ssh-java-isabelle-component-20161009.tar.gz https://dev.gentoo.org/~gienah/snapshots/xz-java-isabelle-component-1.5.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=fe56239f55d2509521a97a844016ce9c
diff --git a/metadata/md5-cache/sci-mathematics/num-utils-0.3 b/metadata/md5-cache/sci-mathematics/num-utils-0.3
deleted file mode 100644
index 83b3dd054dad..000000000000
--- a/metadata/md5-cache/sci-mathematics/num-utils-0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A set of programs for dealing with numbers from the command line
-EAPI=0
-HOMEPAGE=http://suso.suso.org/programs/num-utils/
-KEYWORDS=x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl !<sci-chemistry/gromacs-4
-SLOT=0
-SRC_URI=http://suso.suso.org/programs/num-utils/downloads/num-utils-0.3.tar.gz
-_md5_=bb4ef145a24ff39562a15ea1e270b18a
diff --git a/metadata/md5-cache/sci-mathematics/octave-5.1.0 b/metadata/md5-cache/sci-mathematics/octave-5.1.0
new file mode 100644
index 000000000000..165bbe5da8f9
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/octave-5.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( !graphicsmagick? ( >=media-gfx/imagemagick-7:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) dev-util/gperf sys-apps/texinfo virtual/pkgconfig doc? ( dev-texlive/texlive-fontsrecommended dev-texlive/texlive-plaingeneric dev-texlive/texlive-metapost virtual/latex-base ) gui? ( dev-qt/linguist-tools:5 ) java? ( >=virtual/jdk-1.6.0 ) qrupdate? ( app-misc/pax-utils ) sparse? ( app-misc/pax-utils ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=High-level interactive language for numerical computations
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/octave/
+IUSE=curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java libressl opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( !graphicsmagick? ( >=media-gfx/imagemagick-7:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= virtual/glu >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/5.1.0
+SRC_URI=mirror://gnu/octave/octave-5.1.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2813007a493bd7e76a12d96e2104f8c4
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.1.463 b/metadata/md5-cache/sci-mathematics/rstudio-1.1.463
index b0870164178a..00602dfec56e 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-1.1.463
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.1.463
@@ -10,4 +10,4 @@ RDEPEND=>=app-text/pandoc-1.19.2.1 dev-haskell/pandoc-citeproc >=dev-lang/R-2.11
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v1.1.463.tar.gz -> rstudio-1.1.463.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de8fa1021c784354430f0b57f7e18f6e
+_md5_=e48a32eb6ca386563b414739f224363a
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.1.463-r1 b/metadata/md5-cache/sci-mathematics/rstudio-1.1.463-r1
new file mode 100644
index 000000000000..88a1f054ffa2
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.1.463-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-text/pandoc-1.19.2.1 dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) app-arch/unzip dev-java/ant-core >=virtual/jdk-1.8:= virtual/pkgconfig >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=IDE for the R language
+EAPI=7
+HOMEPAGE=http://www.rstudio.org https://github.com/rstudio/rstudio/
+IUSE=dedicated libressl server elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=AGPL-3
+RDEPEND=>=app-text/pandoc-1.19.2.1 dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://github.com/rstudio/rstudio/archive/v1.1.463.tar.gz -> rstudio-1.1.463.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	pax-utils	db85a3c508cf82c45f24b2723791cc93	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c3810299edb1f2b819750010da768ab
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.2.1335 b/metadata/md5-cache/sci-mathematics/rstudio-1.2.1335
new file mode 100644
index 000000000000..2b17ba7202b7
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.2.1335
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-text/pandoc-1.19.2.1 dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebengine-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) app-arch/unzip dev-java/ant-core >=virtual/jdk-1.8:= virtual/pkgconfig >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=IDE for the R language
+EAPI=7
+HOMEPAGE=http://www.rstudio.org https://github.com/rstudio/rstudio/
+IUSE=dedicated libressl server elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=AGPL-3
+RDEPEND=>=app-text/pandoc-1.19.2.1 dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.63:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux >=sys-devel/clang-3.5.0:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebchannel-5.4:5 >=dev-qt/qtwebengine-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://github.com/rstudio/rstudio/archive/v1.2.1335.tar.gz -> rstudio-1.2.1335.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-2.1.2.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.8.1.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	pax-utils	db85a3c508cf82c45f24b2723791cc93	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d765218ede9d6411cf9eb86939bac369
diff --git a/metadata/md5-cache/sci-mathematics/spass-3.7 b/metadata/md5-cache/sci-mathematics/spass-3.7
deleted file mode 100644
index 9904fadfdf8e..000000000000
--- a/metadata/md5-cache/sci-mathematics/spass-3.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=isabelle? ( >=sci-mathematics/isabelle-2011.1-r1:= )
-DESCRIPTION=An Automated Theorem Prover for First-Order Logic with Equality
-EAPI=5
-HOMEPAGE=http://www.spass-prover.org/
-IUSE=doc examples isabelle
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=isabelle? ( >=sci-mathematics/isabelle-2011.1-r1:= )
-SLOT=0/3.7
-SRC_URI=http://www.spass-prover.org/download/sources/spass37.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b41ab02a45003a536afc4062255aa2c8
diff --git a/metadata/md5-cache/sci-mathematics/spass-3.9 b/metadata/md5-cache/sci-mathematics/spass-3.9
index 55897ca5ac97..3fb3a7d9c504 100644
--- a/metadata/md5-cache/sci-mathematics/spass-3.9
+++ b/metadata/md5-cache/sci-mathematics/spass-3.9
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install postinst postrm unpack
 DEPEND=isabelle? ( sci-mathematics/isabelle:= )
 DESCRIPTION=An Automated Theorem Prover for First-Order Logic with Equality
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.spass-prover.org/
 IUSE=isabelle
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=isabelle? ( sci-mathematics/isabelle:= )
 SLOT=0/3.9
 SRC_URI=http://www.spass-prover.org/download/sources/spass39.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f123872570b771a621d995d6c7be73ea
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=833c8ef8eff5f69f461e9ad75176255b
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 546e980649fd..b0f1f0da7ea7 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/ViSP-images-3.2.0 b/metadata/md5-cache/sci-misc/ViSP-images-3.2.0
new file mode 100644
index 000000000000..bcea8fa5f7cb
--- /dev/null
+++ b/metadata/md5-cache/sci-misc/ViSP-images-3.2.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=ViSP images data set
+EAPI=5
+HOMEPAGE=http://www.irisa.fr/lagadic/visp/
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://visp-doc.inria.fr/download/dataset/visp-images-3.2.0.zip
+_md5_=793825a38eb994d434a8193b9f80e439
diff --git a/metadata/md5-cache/sci-misc/gt-itm-19961004-r2 b/metadata/md5-cache/sci-misc/gt-itm-19961004-r2
index da318059df89..b2ee7de2de4e 100644
--- a/metadata/md5-cache/sci-misc/gt-itm-19961004-r2
+++ b/metadata/md5-cache/sci-misc/gt-itm-19961004-r2
@@ -9,6 +9,6 @@ LICENSE=all-rights-reserved sgb2ns
 RDEPEND=dev-util/sgb
 RESTRICT=mirror bindist
 SLOT=0
-SRC_URI=http://www.cc.gatech.edu/fac/Ellen.Zegura/gt-itm/gt-itm.tar.gz http://www.isi.edu/nsnam/dist/sgb2ns.tar.gz
+SRC_URI=http://www.cc.gatech.edu/fac/Ellen.Zegura/gt-itm/gt-itm.tar.gz -> gt-itm-19961004.tar.gz http://www.isi.edu/nsnam/dist/sgb2ns.tar.gz -> sgb2ns-19961004.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d48601765647bdade4c159430502a2d8
+_md5_=79513a8e0cc06b392271d6e2c31cd8e6
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 4c69dc22d6fb..dd082f14550d 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/harminv-1.3.1-r1 b/metadata/md5-cache/sci-physics/harminv-1.3.1-r1
deleted file mode 100644
index b7557de15d2a..000000000000
--- a/metadata/md5-cache/sci-physics/harminv-1.3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=virtual/lapack 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=Extraction of complex frequencies and amplitudes from time series
-EAPI=6
-HOMEPAGE=http://ab-initio.mit.edu/harminv/
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=virtual/lapack
-SLOT=0
-SRC_URI=http://ab-initio.mit.edu/harminv/harminv-1.3.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=59b7c2ad47af6ecdc57a3d07d2e5f438
diff --git a/metadata/md5-cache/sci-physics/meep-1.3 b/metadata/md5-cache/sci-physics/meep-1.3
deleted file mode 100644
index 102801b2ae20..000000000000
--- a/metadata/md5-cache/sci-physics/meep-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=sci-libs/fftw:3.0= sci-libs/gsl:= sci-physics/harminv guile? ( >=sci-libs/libctl-3.2 ) hdf5? ( sci-libs/hdf5:= ) mpi? ( virtual/mpi ) 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=Simulation software to model electromagnetic systems
-EAPI=6
-HOMEPAGE=http://ab-initio.mit.edu/meep/
-IUSE=examples hdf5 guile mpi
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sci-libs/fftw:3.0= sci-libs/gsl:= sci-physics/harminv guile? ( >=sci-libs/libctl-3.2 ) hdf5? ( sci-libs/hdf5:= ) mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=http://ab-initio.mit.edu/meep/meep-1.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=03727bc49c1627cc962a3b5795b7f8d2
diff --git a/metadata/md5-cache/sci-physics/root-9999 b/metadata/md5-cache/sci-physics/root-9999
index bff0b70018cd..613b780c134f 100644
--- a/metadata/md5-cache/sci-physics/root-9999
+++ b/metadata/md5-cache/sci-physics/root-9999
@@ -3,11 +3,11 @@ DEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/li
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
 EAPI=6
 HOMEPAGE=https://root.cern
-IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc vmc +xml xrootd python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc vmc +xml xrootd python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
 PROPERTIES=live
 RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
 REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bbb554209366987462e960702e34b159
+_md5_=7c62f060ea441b514c0637fdc27943dd
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 38dff0a51dc4..6eefbef04942 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/epix-1.2.11 b/metadata/md5-cache/sci-visualization/epix-1.2.11
deleted file mode 100644
index 49a313d3593e..000000000000
--- a/metadata/md5-cache/sci-visualization/epix-1.2.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-tex/xcolor emacs? ( virtual/emacs ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=2- and 3-D plotter for creating images (to be used in LaTeX)
-EAPI=5
-HOMEPAGE=http://mathcs.holycross.edu/~ahwang/current/ePiX.html
-IUSE=doc emacs examples
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-tex/xcolor emacs? ( virtual/emacs )
-SLOT=0
-SRC_URI=http://mathcs.holycross.edu/~ahwang/epix/epix-1.2.11_withpdf.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5f01ed28c83a2eba4290e801e5886a63
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 5230a392c107..7039aff855ee 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/adjtime-0.4-r2 b/metadata/md5-cache/sys-apps/adjtime-0.4-r2
index 04cba4f28c51..97403f395aab 100644
--- a/metadata/md5-cache/sys-apps/adjtime-0.4-r2
+++ b/metadata/md5-cache/sys-apps/adjtime-0.4-r2
@@ -8,5 +8,5 @@ LICENSE=all-rights-reserved
 RDEPEND=dev-lang/perl >=net-misc/ntp-4.2
 RESTRICT=mirror bindist
 SLOT=0
-SRC_URI=http://www.gentoogeek.org/files/adjtime.zip
-_md5_=01098999d4cae30655fc95ee57965dca
+SRC_URI=http://www.gentoogeek.org/files/adjtime.zip -> adjtime-0.4.zip
+_md5_=58da66a07ad4878b3e536664c7fbfd62
diff --git a/metadata/md5-cache/sys-apps/baobab-3.30.0 b/metadata/md5-cache/sys-apps/baobab-3.30.0
index cc82ba125cdf..21f5dc98cd7c 100644
--- a/metadata/md5-cache/sys-apps/baobab-3.30.0
+++ b/metadata/md5-cache/sys-apps/baobab-3.30.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/baobab/3.30/baobab-3.30.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14bd8cc5bfc4029c807a5f1dcf41820a
diff --git a/metadata/md5-cache/sys-apps/bat-0.10.0-r1 b/metadata/md5-cache/sys-apps/bat-0.10.0-r1
deleted file mode 100644
index 8acd54645be9..000000000000
--- a/metadata/md5-cache/sys-apps/bat-0.10.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=virtual/rust-1.30.0 virtual/cargo
-DEFINED_PHASES=compile install test unpack
-DEPEND=sys-libs/zlib
-DESCRIPTION=A cat(1) clone with wings
-EAPI=7
-HOMEPAGE=https://github.com/sharkdp/bat
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT Apache-2.0 )
-RDEPEND=sys-libs/zlib !>app-backup/bacula-9.2[qt5]
-SLOT=0
-SRC_URI=https://github.com/sharkdp/bat/archive/v0.10.0.tar.gz -> bat-0.10.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_colours/1.0.1/download -> ansi_colours-1.0.1.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/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/assert_cmd/0.11.0/download -> assert_cmd-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/backtrace/0.3.11/download -> backtrace-0.3.11.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/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bincode/1.0.1/download -> bincode-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/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/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/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/clicolors-control/1.0.0/download -> clicolors-control-1.0.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/console/0.7.5/download -> console-0.7.5.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/1.0.4/download -> dirs-1.0.4.crate https://crates.io/api/v1/crates/encode_unicode/0.3.5/download -> encode_unicode-0.3.5.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.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.4.0/download -> escargot-0.4.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/flate2/1.0.4/download -> flate2-1.0.4.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/git2/0.8.0/download -> git2-0.8.0.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/itoa/0.4.3/download -> itoa-0.4.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/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.43/download -> libc-0.2.43.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/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.1/download -> linked-hash-map-0.5.1.crate https://crates.io/api/v1/crates/lock_api/0.1.4/download -> lock_api-0.1.4.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.1/download -> memchr-2.1.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/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/onig/4.2.1/download -> onig-4.2.1.crate https://crates.io/api/v1/crates/onig_sys/69.0.0/download -> onig_sys-69.0.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.1/download -> parking_lot_core-0.3.1.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/plist/0.3.0/download -> plist-0.3.0.crate https://crates.io/api/v1/crates/predicates/1.0.0/download -> predicates-1.0.0.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.21/download -> proc-macro2-0.4.21.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.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.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/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.2.0/download -> redox_users-0.2.0.crate https://crates.io/api/v1/crates/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/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_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.3.0/download -> safemem-0.3.0.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/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.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.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/shell-words/0.1.0/download -> shell-words-0.1.0.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.19/download -> syn-0.15.19.crate https://crates.io/api/v1/crates/synstructure/0.10.1/download -> synstructure-0.10.1.crate https://crates.io/api/v1/crates/syntect/3.0.2/download -> syntect-3.0.2.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.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/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/termios/0.3.1/download -> termios-0.3.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/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/ucd-util/0.1.2/download -> ucd-util-0.1.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.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.6/download -> walkdir-2.2.6.crate https://crates.io/api/v1/crates/wild/2.0.1/download -> wild-2.0.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-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/xml-rs/0.7.0/download -> xml-rs-0.7.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.2/download -> yaml-rust-0.4.2.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=9972ab2ee767617f6e43a8289594a966
diff --git a/metadata/md5-cache/sys-apps/bat-0.11.0-r1 b/metadata/md5-cache/sys-apps/bat-0.11.0-r1
deleted file mode 100644
index dce899b1436e..000000000000
--- a/metadata/md5-cache/sys-apps/bat-0.11.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=virtual/rust-1.31.0 virtual/cargo
-DEFINED_PHASES=compile install test unpack
-DEPEND=sys-libs/zlib
-DESCRIPTION=A cat(1) clone with wings
-EAPI=7
-HOMEPAGE=https://github.com/sharkdp/bat
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT Apache-2.0 )
-RDEPEND=sys-libs/zlib !>app-backup/bacula-9.2[qt5]
-SLOT=0
-SRC_URI=https://github.com/sharkdp/bat/archive/v0.11.0.tar.gz -> bat-0.11.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.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_colours/1.0.1/download -> ansi_colours-1.0.1.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/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/assert_cmd/0.11.1/download -> assert_cmd-0.11.1.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.16/download -> backtrace-0.3.16.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/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/bincode/1.1.4/download -> bincode-1.1.4.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/build_const/0.2.1/download -> build_const-0.2.1.crate https://crates.io/api/v1/crates/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/cc/1.0.37/download -> cc-1.0.37.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/clicolors-control/1.0.0/download -> clicolors-control-1.0.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/console/0.7.5/download -> console-0.7.5.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.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.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/encode_unicode/0.3.5/download -> encode_unicode-0.3.5.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/error-chain/0.12.1/download -> error-chain-0.12.1.crate https://crates.io/api/v1/crates/escargot/0.4.0/download -> escargot-0.4.0.crate https://crates.io/api/v1/crates/escargot/0.5.0/download -> escargot-0.5.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/flate2/1.0.7/download -> flate2-1.0.7.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/git2/0.8.0/download -> git2-0.8.0.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.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/itoa/0.4.4/download -> itoa-0.4.4.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.3.0/download -> lazy_static-1.3.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.54/download -> libc-0.2.54.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/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.2/download -> linked-hash-map-0.5.2.crate https://crates.io/api/v1/crates/lock_api/0.2.0/download -> lock_api-0.2.0.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.2.0/download -> memchr-2.2.0.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/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/onig/4.3.2/download -> onig-4.3.2.crate https://crates.io/api/v1/crates/onig_sys/69.1.0/download -> onig_sys-69.1.0.crate https://crates.io/api/v1/crates/parking_lot/0.8.0/download -> parking_lot-0.8.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.5.0/download -> parking_lot_core-0.5.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/plist/0.4.1/download -> plist-0.4.1.crate https://crates.io/api/v1/crates/predicates/1.0.1/download -> predicates-1.0.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.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.12/download -> quote-0.6.12.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.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.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.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.54/download -> redox_syscall-0.1.54.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.3.0/download -> redox_users-0.3.0.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.14/download -> rustc-demangle-0.1.14.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.8/download -> ryu-0.2.8.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/1.0.4/download -> same-file-1.0.4.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.0.0/download -> scopeguard-1.0.0.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.91/download -> serde-1.0.91.crate https://crates.io/api/v1/crates/serde_derive/1.0.91/download -> serde_derive-1.0.91.crate https://crates.io/api/v1/crates/serde_json/1.0.39/download -> serde_json-1.0.39.crate https://crates.io/api/v1/crates/shell-words/0.1.0/download -> shell-words-0.1.0.crate https://crates.io/api/v1/crates/smallvec/0.6.9/download -> smallvec-0.6.9.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/0.15.34/download -> syn-0.15.34.crate https://crates.io/api/v1/crates/synstructure/0.10.2/download -> synstructure-0.10.2.crate https://crates.io/api/v1/crates/syntect/3.2.0/download -> syntect-3.2.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_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/termion/1.5.2/download -> termion-1.5.2.crate https://crates.io/api/v1/crates/termios/0.3.1/download -> termios-0.3.1.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.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/treeline/0.1.0/download -> treeline-0.1.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-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/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/walkdir/2.2.7/download -> walkdir-2.2.7.crate https://crates.io/api/v1/crates/wild/2.0.1/download -> wild-2.0.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.7/download -> winapi-0.3.7.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/xml-rs/0.8.0/download -> xml-rs-0.8.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=283164db1cf081b227106d9530ea7e9a
diff --git a/metadata/md5-cache/sys-apps/bat-0.12.0 b/metadata/md5-cache/sys-apps/bat-0.12.0
new file mode 100644
index 000000000000..977c23a30980
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/bat-0.12.0
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/rust-1.31.0 virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DEPEND=sys-libs/zlib
+DESCRIPTION=cat(1) clone with syntax highlighting and Git integration
+EAPI=7
+HOMEPAGE=https://github.com/sharkdp/bat
+IUSE=debug
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=|| ( MIT Apache-2.0 )
+RDEPEND=sys-libs/zlib !>app-backup/bacula-9.2[qt5]
+SLOT=0
+SRC_URI=https://github.com/sharkdp/bat/archive/v0.12.0.tar.gz -> bat-0.12.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.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_colours/1.0.1/download -> ansi_colours-1.0.1.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/ansi_term/0.12.0/download -> ansi_term-0.12.0.crate https://crates.io/api/v1/crates/arrayref/0.3.5/download -> arrayref-0.3.5.crate https://crates.io/api/v1/crates/arrayvec/0.4.11/download -> arrayvec-0.4.11.crate https://crates.io/api/v1/crates/assert_cmd/0.11.1/download -> assert_cmd-0.11.1.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.6/download -> autocfg-0.1.6.crate https://crates.io/api/v1/crates/backtrace/0.3.35/download -> backtrace-0.3.35.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/bat/0.12.0/download -> bat-0.12.0.crate https://crates.io/api/v1/crates/bincode/1.1.4/download -> bincode-1.1.4.crate https://crates.io/api/v1/crates/bindgen/0.50.0/download -> bindgen-0.50.0.crate https://crates.io/api/v1/crates/bitflags/1.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.7/download -> blake2b_simd-0.5.7.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.41/download -> cc-1.0.41.crate https://crates.io/api/v1/crates/cexpr/0.3.5/download -> cexpr-0.3.5.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/clang-sys/0.28.1/download -> clang-sys-0.28.1.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/clicolors-control/1.0.1/download -> clicolors-control-1.0.1.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/console/0.8.0/download -> console-0.8.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.4/download -> constant_time_eq-0.1.4.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/env_logger/0.6.2/download -> env_logger-0.6.2.crate https://crates.io/api/v1/crates/error-chain/0.12.1/download -> error-chain-0.12.1.crate https://crates.io/api/v1/crates/escargot/0.4.0/download -> escargot-0.4.0.crate https://crates.io/api/v1/crates/escargot/0.5.0/download -> escargot-0.5.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/flate2/1.0.11/download -> flate2-1.0.11.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/git2/0.10.0/download -> git2-0.10.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.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.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.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.4.0/download -> lazy_static-1.4.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.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/libgit2-sys/0.9.0/download -> libgit2-sys-0.9.0.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.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/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.2/download -> linked-hash-map-0.5.2.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.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.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.12/download -> miniz-sys-0.1.12.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.2/download -> miniz_oxide-0.3.2.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/onig/5.0.0/download -> onig-5.0.0.crate https://crates.io/api/v1/crates/onig_sys/69.2.0/download -> onig_sys-69.2.0.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.15/download -> pkg-config-0.3.15.crate https://crates.io/api/v1/crates/plist/0.4.2/download -> plist-0.4.2.crate https://crates.io/api/v1/crates/predicates/1.0.1/download -> predicates-1.0.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.2/download -> proc-macro2-1.0.2.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.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.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.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_users/0.3.1/download -> redox_users-0.3.1.crate https://crates.io/api/v1/crates/regex/1.2.1/download -> regex-1.2.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.11/download -> regex-syntax-0.6.11.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rust-argon2/0.5.1/download -> rust-argon2-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/safemem/0.3.2/download -> safemem-0.3.2.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.99/download -> serde-1.0.99.crate https://crates.io/api/v1/crates/serde_derive/1.0.99/download -> serde_derive-1.0.99.crate https://crates.io/api/v1/crates/serde_json/1.0.40/download -> serde_json-1.0.40.crate https://crates.io/api/v1/crates/shell-words/0.1.0/download -> shell-words-0.1.0.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/smallvec/0.6.10/download -> smallvec-0.6.10.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/synstructure/0.10.2/download -> synstructure-0.10.2.crate https://crates.io/api/v1/crates/syntect/3.2.1/download -> syntect-3.2.1.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.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/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/termios/0.3.1/download -> termios-0.3.1.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.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/treeline/0.1.0/download -> treeline-0.1.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.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.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/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/url/2.1.0/download -> url-2.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.7/download -> vcpkg-0.2.7.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/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/which/2.0.1/download -> which-2.0.1.crate https://crates.io/api/v1/crates/wild/2.0.2/download -> wild-2.0.2.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.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/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.2/download -> wincolor-1.0.2.crate https://crates.io/api/v1/crates/xml-rs/0.8.0/download -> xml-rs-0.8.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=c37b5f99278117a34c3b161beddb12d3
diff --git a/metadata/md5-cache/sys-apps/bolt-0.4 b/metadata/md5-cache/sys-apps/bolt-0.4
index a2b9cf7df587..b3049ec77bbd 100644
--- a/metadata/md5-cache/sys-apps/bolt-0.4
+++ b/metadata/md5-cache/sys-apps/bolt-0.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.50.0:2 virtual/libudev virtual/udev sys-apps/systemd:0= sys-auth/polkit[introspection] doc? ( app-text/asciidoc )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.4/bolt-0.4.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=27179b4d43c3e52603a9696e219da330
diff --git a/metadata/md5-cache/sys-apps/bolt-0.5 b/metadata/md5-cache/sys-apps/bolt-0.5
index f929780e0a1e..fb6a835872ab 100644
--- a/metadata/md5-cache/sys-apps/bolt-0.5
+++ b/metadata/md5-cache/sys-apps/bolt-0.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.50.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd:0= ) doc? ( app-text/asciidoc )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.5/bolt-0.5.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=1a19386bcb6dd8bb973ad162dc4df517
diff --git a/metadata/md5-cache/sys-apps/bolt-0.7 b/metadata/md5-cache/sys-apps/bolt-0.7
index f5c5e4a1eeb9..016757140543 100644
--- a/metadata/md5-cache/sys-apps/bolt-0.7
+++ b/metadata/md5-cache/sys-apps/bolt-0.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.50.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd:0= ) doc? ( app-text/asciidoc )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.7/bolt-0.7.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=8d87fc7d20dc743649d3eabff05764b6
diff --git a/metadata/md5-cache/sys-apps/bolt-0.8 b/metadata/md5-cache/sys-apps/bolt-0.8
index a4fdb5bf7cb3..44d50e1a4260 100644
--- a/metadata/md5-cache/sys-apps/bolt-0.8
+++ b/metadata/md5-cache/sys-apps/bolt-0.8
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.50.0:2 dev-util/glib-utils virtual/libudev virtual/udev dev-util/umockdev sys-auth/polkit[introspection] systemd? ( sys-apps/systemd:0= ) doc? ( app-text/asciidoc )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/bolt/bolt/-/archive/0.8/bolt-0.8.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=8d87fc7d20dc743649d3eabff05764b6
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.31-r1 b/metadata/md5-cache/sys-apps/coreutils-8.31-r1
new file mode 100644
index 000000000000..128e6b3aba7c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/coreutils-8.31-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) ) app-arch/xz-utils test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.7 dev-python/pyinotify[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pyinotify[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pyinotify[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pyinotify[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
+DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/coreutils/
+IUSE=acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux
+LICENSE=GPL-3
+RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
+SLOT=0
+SRC_URI=mirror://gnu/coreutils/coreutils-8.31.tar.xz mirror://gentoo/coreutils-8.30-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.30-patches-01.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cbe18a635c746c73995cfb52d3577088
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-18 b/metadata/md5-cache/sys-apps/dbus-broker-18
index 02d0ecefde46..037a6d009967 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-18
+++ b/metadata/md5-cache/sys-apps/dbus-broker-18
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=audit? ( >=sys-process/audit-2.7 >=sys-libs/libcap-ng-0.6 ) launcher? ( >=dev-libs/expat-2.2 >=sys-apps/systemd-230:0= ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=https://github.com/bus1/dbus-broker/archive/v18/dbus-broker-18.tar.gz https://github.com/c-util/c-dvar/archive/9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46/c-dvar-9fcd89593f8b7fb5c9f1c32f0b82f518eda4be46.tar.gz https://github.com/c-util/c-ini/archive/979a18fdd59f05f927d6cdf624d8ded6f81c6776/c-ini-979a18fdd59f05f927d6cdf624d8ded6f81c6776.tar.gz https://github.com/c-util/c-list/archive/dda36d30c7d655b4d61358519168fa7ce0e9dae9/c-list-dda36d30c7d655b4d61358519168fa7ce0e9dae9.tar.gz https://github.com/c-util/c-rbtree/archive/bf627e0c32241915108f66ad9738444e4d045b45/c-rbtree-bf627e0c32241915108f66ad9738444e4d045b45.tar.gz https://github.com/c-util/c-shquote/archive/b7e325c7ff098787f2937dd91597677374f038b6/c-shquote-b7e325c7ff098787f2937dd91597677374f038b6.tar.gz https://github.com/c-util/c-sundry/archive/50c8ccf01b39b3f11e59c69d1cafea5bef5a9769/c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz https://github.com/c-util/c-utf8/archive/b245df543717ee19ad398f8139447e3807c11c96/c-utf8-b245df543717ee19ad398f8139447e3807c11c96.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=a5982ecca69c64feb2006ea1aadbf690
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-21 b/metadata/md5-cache/sys-apps/dbus-broker-21
index 36b9e29a226b..e6281a6f0c58 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-21
+++ b/metadata/md5-cache/sys-apps/dbus-broker-21
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=audit? ( >=sys-process/audit-2.7 >=sys-libs/libcap-ng-0.6 ) launcher? ( >=dev-libs/expat-2.2 >=sys-apps/systemd-230:0= ) selinux? ( sys-libs/libselinux ) launcher? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=https://github.com/bus1/dbus-broker/archive/v21/dbus-broker-21.tar.gz https://github.com/c-util/c-rbtree/archive/b46392d25de7a7bab67d48ef18bf8350b429cff5/c-rbtree-b46392d25de7a7bab67d48ef18bf8350b429cff5.tar.gz https://github.com/c-util/c-shquote/archive/34e1e25299fb82ab9fd0c8bfd8a66010ead1497b/c-shquote-34e1e25299fb82ab9fd0c8bfd8a66010ead1497b.tar.gz https://github.com/c-util/c-utf8/archive/34f5df0f4b28fc7ea6747680a432e666047082e4/c-utf8-34f5df0f4b28fc7ea6747680a432e666047082e4.tar.gz https://github.com/c-util/c-stdaux/archive/11930d259212605a15430523472ef54e0c7654ee/c-stdaux-11930d259212605a15430523472ef54e0c7654ee.tar.gz https://github.com/c-util/c-list/archive/2e4b605c6217cd3c8a1ef773f82f5cc329ba650d/c-list-2e4b605c6217cd3c8a1ef773f82f5cc329ba650d.tar.gz https://github.com/c-util/c-dvar/archive/7c0833f9cae446163077b204b2296287bbee7c67/c-dvar-7c0833f9cae446163077b204b2296287bbee7c67.tar.gz https://github.com/c-util/c-ini/archive/847c55f5b3d33baa47af9a1286175d58b34f91d5/c-ini-847c55f5b3d33baa47af9a1286175d58b34f91d5.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=e6d054ffc4f5e13ce83158add1b89e8d
diff --git a/metadata/md5-cache/sys-apps/dbus-broker-9999 b/metadata/md5-cache/sys-apps/dbus-broker-9999
index f5d8e013abdf..1151e7d821b9 100644
--- a/metadata/md5-cache/sys-apps/dbus-broker-9999
+++ b/metadata/md5-cache/sys-apps/dbus-broker-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=audit? ( >=sys-process/audit-2.7 >=sys-libs/libcap-ng-0.6 ) launcher? ( >=dev-libs/expat-2.2 >=sys-apps/systemd-230:0= ) selinux? ( sys-libs/libselinux ) launcher? ( sys-apps/dbus )
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=e6d054ffc4f5e13ce83158add1b89e8d
diff --git a/metadata/md5-cache/sys-apps/exa-0.8.0-r1 b/metadata/md5-cache/sys-apps/exa-0.8.0-r1
index 037f77ac3a7e..46ee796c28cf 100644
--- a/metadata/md5-cache/sys-apps/exa-0.8.0-r1
+++ b/metadata/md5-cache/sys-apps/exa-0.8.0-r1
@@ -11,5 +11,5 @@ RDEPEND=git? ( dev-libs/libgit2:= net-libs/http-parser:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/ansi_term/0.8.0/download -> ansi_term-0.8.0.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/byteorder/0.4.2/download -> byteorder-0.4.2.crate https://crates.io/api/v1/crates/cmake/0.1.25/download -> cmake-0.1.25.crate https://crates.io/api/v1/crates/conv/0.3.3/download -> conv-0.3.3.crate https://crates.io/api/v1/crates/custom_derive/0.1.7/download -> custom_derive-0.1.7.crate https://crates.io/api/v1/crates/datetime/0.4.5/download -> datetime-0.4.5.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/exa/0.8.0/download -> exa-0.8.0.crate https://crates.io/api/v1/crates/gcc/0.3.53/download -> gcc-0.3.53.crate https://crates.io/api/v1/crates/getopts/0.2.14/download -> getopts-0.2.14.crate https://crates.io/api/v1/crates/git2/0.6.8/download -> git2-0.6.8.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/iso8601/0.1.1/download -> iso8601-0.1.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/lazy_static/0.2.8/download -> lazy_static-0.2.8.crate https://crates.io/api/v1/crates/libc/0.2.30/download -> libc-0.2.30.crate https://crates.io/api/v1/crates/libgit2-sys/0.6.14/download -> libgit2-sys-0.6.14.crate https://crates.io/api/v1/crates/libz-sys/1.0.16/download -> libz-sys-1.0.16.crate https://crates.io/api/v1/crates/locale/0.2.2/download -> locale-0.2.2.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/magenta/0.1.1/download -> magenta-0.1.1.crate https://crates.io/api/v1/crates/magenta-sys/0.1.1/download -> magenta-sys-0.1.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/1.2.4/download -> nom-1.2.4.crate https://crates.io/api/v1/crates/num/0.1.40/download -> num-0.1.40.crate https://crates.io/api/v1/crates/num-bigint/0.1.40/download -> num-bigint-0.1.40.crate https://crates.io/api/v1/crates/num-complex/0.1.40/download -> num-complex-0.1.40.crate https://crates.io/api/v1/crates/num-integer/0.1.35/download -> num-integer-0.1.35.crate https://crates.io/api/v1/crates/num-iter/0.1.34/download -> num-iter-0.1.34.crate https://crates.io/api/v1/crates/num-rational/0.1.39/download -> num-rational-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.1.40/download -> num-traits-0.1.40.crate https://crates.io/api/v1/crates/num_cpus/1.6.2/download -> num_cpus-1.6.2.crate https://crates.io/api/v1/crates/number_prefix/0.2.7/download -> number_prefix-0.2.7.crate https://crates.io/api/v1/crates/pad/0.1.4/download -> pad-0.1.4.crate https://crates.io/api/v1/crates/percent-encoding/1.0.0/download -> percent-encoding-1.0.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/rand/0.3.16/download -> rand-0.3.16.crate https://crates.io/api/v1/crates/redox_syscall/0.1.31/download -> redox_syscall-0.1.31.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.7/download -> scoped_threadpool-0.1.7.crate https://crates.io/api/v1/crates/term_grid/0.1.6/download -> term_grid-0.1.6.crate https://crates.io/api/v1/crates/term_size/0.3.0/download -> term_size-0.3.0.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.5/download -> unicode-normalization-0.1.5.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/url/1.5.1/download -> url-1.5.1.crate https://crates.io/api/v1/crates/users/0.5.3/download -> users-0.5.3.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/vcpkg/0.2.2/download -> vcpkg-0.2.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/zoneinfo_compiled/0.4.5/download -> zoneinfo_compiled-0.4.5.crate
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=ab0e0d38c10d1dc31c839f58c69718b3
diff --git a/metadata/md5-cache/sys-apps/exa-0.9.0 b/metadata/md5-cache/sys-apps/exa-0.9.0
index ffa6ea4bbe65..a03cf5ee38fb 100644
--- a/metadata/md5-cache/sys-apps/exa-0.9.0
+++ b/metadata/md5-cache/sys-apps/exa-0.9.0
@@ -11,5 +11,5 @@ RDEPEND=git? ( dev-libs/libgit2:= net-libs/http-parser:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.12.0/download -> ansi_term-0.12.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.4/download -> autocfg-0.1.4.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.35/download -> cc-1.0.35.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/datetime/0.4.7/download -> datetime-0.4.7.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/exa/0.9.0/download -> exa-0.9.0.crate https://crates.io/api/v1/crates/git2/0.9.1/download -> git2-0.9.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.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/iso8601/0.1.1/download -> iso8601-0.1.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/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.51/download -> libc-0.2.51.crate https://crates.io/api/v1/crates/libgit2-sys/0.8.1/download -> libgit2-sys-0.8.1.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/locale/0.2.2/download -> locale-0.2.2.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.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/1.2.4/download -> nom-1.2.4.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.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/number_prefix/0.3.0/download -> number_prefix-0.3.0.crate https://crates.io/api/v1/crates/openssl-src/111.3.0+1.1.1c/download -> openssl-src-111.3.0+1.1.1c.crate https://crates.io/api/v1/crates/openssl-sys/0.9.47/download -> openssl-sys-0.9.47.crate https://crates.io/api/v1/crates/pad/0.1.5/download -> pad-0.1.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/pkg-config/0.3.14/download -> pkg-config-0.3.14.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/redox_syscall/0.1.54/download -> redox_syscall-0.1.54.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/smallvec/0.6.9/download -> smallvec-0.6.9.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/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/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-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-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.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/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.7/download -> winapi-0.3.7.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 https://crates.io/api/v1/crates/zoneinfo_compiled/0.4.8/download -> zoneinfo_compiled-0.4.8.crate
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=44f2bc0ae37a9d894527ece2d5cd1076
diff --git a/metadata/md5-cache/sys-apps/fd-7.3.0 b/metadata/md5-cache/sys-apps/fd-7.3.0
index 38b426cd82fe..c3a6a04b6da9 100644
--- a/metadata/md5-cache/sys-apps/fd-7.3.0
+++ b/metadata/md5-cache/sys-apps/fd-7.3.0
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=virtual/rust-1.31.0
 SLOT=0
 SRC_URI=https://github.com/sharkdp/fd/archive/v7.3.0.tar.gz -> fd-7.3.0.tar.gz 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/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cc/1.0.29/download -> cc-1.0.29.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/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/ctrlc/3.1.1/download -> ctrlc-3.1.1.crate https://crates.io/api/v1/crates/diff/0.1.11/download -> diff-0.1.11.crate https://crates.io/api/v1/crates/filetime/0.2.4/download -> filetime-0.2.4.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/globset/0.4.2/download -> globset-0.4.2.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/ignore/0.4.6/download -> ignore-0.4.6.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/libc/0.2.48/download -> libc-0.2.48.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/lscolors/0.5.0/download -> lscolors-0.5.0.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.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/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/same-file/1.0.4/download -> same-file-1.0.4.crate https://crates.io/api/v1/crates/smallvec/0.6.8/download -> smallvec-0.6.8.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_size/0.3.1/download -> term_size-0.3.1.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.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/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.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
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=8cca294e5b0649e77b86f9aea5480b1d
diff --git a/metadata/md5-cache/sys-apps/findutils-4.7.0 b/metadata/md5-cache/sys-apps/findutils-4.7.0
new file mode 100644
index 000000000000..8cb884dfcb18
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/findutils-4.7.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure prepare setup
+DEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=GNU utilities for finding files
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/findutils/
+IUSE=nls selinux static test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+
+RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnu/findutils/findutils-4.7.0.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=96ca827b8faa31b7ea35a8bdc8686a92
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.2.10 b/metadata/md5-cache/sys-apps/fwupd-1.2.10
index 058d4ced2b4d..69b4aebc5592 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.2.10
+++ b/metadata/md5-cache/sys-apps/fwupd-1.2.10
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ^^ ( consolekit elogind systemd ) dell? ( uefi )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.2.10.tar.gz -> fwupd-1.2.10.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e17f1631dad0983904f2eb7e54457dc
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.2.8 b/metadata/md5-cache/sys-apps/fwupd-1.2.8
index 4839c11e9397..f6cd6f9d2660 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.2.8
+++ b/metadata/md5-cache/sys-apps/fwupd-1.2.8
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ^^ ( consolekit elogind systemd ) dell? ( uefi )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.2.8.tar.gz -> fwupd-1.2.8.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7ce4c7b489e72a9c2e659e23a12d245
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.2.9 b/metadata/md5-cache/sys-apps/fwupd-1.2.9
index a43ce3e71216..2be4b2fd5961 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.2.9
+++ b/metadata/md5-cache/sys-apps/fwupd-1.2.9
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ^^ ( consolekit elogind systemd ) dell? ( uefi )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.2.9.tar.gz -> fwupd-1.2.9.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff71571aeb0905482a46ce6794ca8053
diff --git a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.30.2-r1 b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.30.2-r1
index 4beb8b7026cd..888b99aadc3c 100644
--- a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.30.2-r1
+++ b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.30.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.31:2 >=sys-fs/udisks-2.7.6:2 >=x11-libs/gtk+-3.16.0:3
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-disk-utility/3.30/gnome-disk-utility-3.30.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14e7a6e63835fe472efa947024151b9b
diff --git a/metadata/md5-cache/sys-apps/help2man-1.47.10 b/metadata/md5-cache/sys-apps/help2man-1.47.10
index 7f4ae6359a7e..8ec03b18313c 100644
--- a/metadata/md5-cache/sys-apps/help2man-1.47.10
+++ b/metadata/md5-cache/sys-apps/help2man-1.47.10
@@ -4,9 +4,9 @@ DESCRIPTION=GNU utility to convert program --help output to a man page
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/help2man/
 IUSE=nls
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
 SLOT=0
 SRC_URI=mirror://gnu/help2man/help2man-1.47.10.tar.xz
-_md5_=e9cdd84d7c354f3dd6541b01167ee15f
+_md5_=5c14f7d7088d48d50956a4823800f73e
diff --git a/metadata/md5-cache/sys-apps/hwids-20190316 b/metadata/md5-cache/sys-apps/hwids-20190316
index d295ecae9284..125fce156d05 100644
--- a/metadata/md5-cache/sys-apps/hwids-20190316
+++ b/metadata/md5-cache/sys-apps/hwids-20190316
@@ -4,10 +4,10 @@ DESCRIPTION=Hardware (PCI, USB, OUI, IAB) IDs databases
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/hwids
 IUSE=+net +pci +udev +usb
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=udev? ( virtual/udev ) !<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
 SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20190316.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=07218392eddc5f9647500eda7a4bd74e
+_md5_=63e70b04f0706759f6eacb9c987fe5ef
diff --git a/metadata/md5-cache/sys-apps/hwids-20190818 b/metadata/md5-cache/sys-apps/hwids-20190818
new file mode 100644
index 000000000000..8c74c11b528a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hwids-20190818
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DESCRIPTION=Hardware (PCI, USB, OUI, IAB) IDs databases
+EAPI=7
+HOMEPAGE=https://github.com/gentoo/hwids
+IUSE=+net +pci +udev +usb
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 BSD ) public-domain
+RDEPEND=udev? ( virtual/udev ) !<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
+SLOT=0
+SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20190818.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=4553db22507b51c4df84731b763797f4
diff --git a/metadata/md5-cache/sys-apps/hwids-99999999 b/metadata/md5-cache/sys-apps/hwids-99999999
index a95fc08ed625..9074c1032a31 100644
--- a/metadata/md5-cache/sys-apps/hwids-99999999
+++ b/metadata/md5-cache/sys-apps/hwids-99999999
@@ -1,7 +1,7 @@
+BDEPEND=net-misc/curl udev? ( || ( ( dev-lang/python:3.7 dev-python/pyparsing[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pyparsing[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=net-misc/curl udev? ( || ( ( dev-lang/python:3.7 dev-python/pyparsing[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pyparsing[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Hardware (PCI, USB, OUI, IAB) IDs databases
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/gentoo/hwids
 IUSE=+net +pci +udev +usb
 LICENSE=|| ( GPL-2 BSD ) public-domain
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=udev? ( virtual/udev ) !<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
 _eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=07218392eddc5f9647500eda7a4bd74e
+_md5_=4553db22507b51c4df84731b763797f4
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.0 b/metadata/md5-cache/sys-apps/i2c-tools-4.0
index 475a1f2f372d..b2dca9275f87 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.0
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.0
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 py
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4879e0fdd8db4aa1497689beca0d13f3
+_md5_=f4dbb30afa32f5c4eb6ae35b0f468540
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1 b/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
index dbcb203785de..0152e2c58927 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 py
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.1.tar.xz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=46b193be93d80fffa7f3b9b82ffe221a
+_md5_=6a05a1b9cf552473f5dfa246073c4781
diff --git a/metadata/md5-cache/sys-apps/ipmiutil-3.1.2 b/metadata/md5-cache/sys-apps/ipmiutil-3.1.2
deleted file mode 100644
index 7720f28916ca..000000000000
--- a/metadata/md5-cache/sys-apps/ipmiutil-3.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/openssl-1:0= 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 virtual/pkgconfig
-DESCRIPTION=IPMI Management Utilities
-EAPI=6
-HOMEPAGE=http://ipmiutil.sourceforge.net/
-IUSE=static-libs
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/openssl-1:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/ipmiutil/ipmiutil-3.1.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9bee3d00357f34100fafb5d59617b09b
diff --git a/metadata/md5-cache/sys-apps/ipmiutil-3.1.4 b/metadata/md5-cache/sys-apps/ipmiutil-3.1.4
new file mode 100644
index 000000000000..8f28bd16e48e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ipmiutil-3.1.4
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-libs/openssl-1:0= virtual/os-headers
+DESCRIPTION=IPMI Management Utilities
+EAPI=7
+HOMEPAGE=http://ipmiutil.sourceforge.net/
+IUSE=static-libs
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/openssl-1:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/ipmiutil/ipmiutil-3.1.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=5580798e9e88403135bb9ee722b9acb0
diff --git a/metadata/md5-cache/sys-apps/iproute2-4.19.0-r1 b/metadata/md5-cache/sys-apps/iproute2-4.19.0-r1
index 65550c9b63e4..ef282ab1d8d6 100644
--- a/metadata/md5-cache/sys-apps/iproute2-4.19.0-r1
+++ b/metadata/md5-cache/sys-apps/iproute2-4.19.0-r1
@@ -10,4 +10,4 @@ RDEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl ) caps? ( sys-libs/libcap ) e
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-4.19.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=65841df5282d294e214374cf6c4c6348
+_md5_=7956d861c55e3a646393673452131c8c
diff --git a/metadata/md5-cache/sys-apps/iproute2-5.1.0 b/metadata/md5-cache/sys-apps/iproute2-5.1.0
index d7225af5670c..75babd2f29d3 100644
--- a/metadata/md5-cache/sys-apps/iproute2-5.1.0
+++ b/metadata/md5-cache/sys-apps/iproute2-5.1.0
@@ -11,4 +11,4 @@ RDEPEND=!net-misc/arpd dev-libs/libbsd !minimal? ( net-libs/libmnl ) caps? ( sys
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-5.1.0.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2799979b34f910fe369e12e7cfc527b5
+_md5_=738a3540a1be42e4af796ed468eaa4b4
diff --git a/metadata/md5-cache/sys-apps/iproute2-5.2.0 b/metadata/md5-cache/sys-apps/iproute2-5.2.0
deleted file mode 100644
index 093de27fecd4..000000000000
--- a/metadata/md5-cache/sys-apps/iproute2-5.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/xz-utils >=sys-devel/bison-2.4 sys-devel/flex virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!net-misc/arpd dev-libs/libbsd !minimal? ( net-libs/libmnl ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux ) >=sys-kernel/linux-headers-3.16
-DESCRIPTION=kernel routing and traffic control utilities
-EAPI=7
-HOMEPAGE=https://wiki.linuxfoundation.org/networking/iproute2
-IUSE=atm berkdb caps elf +iptables ipv6 minimal selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!net-misc/arpd dev-libs/libbsd !minimal? ( net-libs/libmnl ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-5.2.0.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2799979b34f910fe369e12e7cfc527b5
diff --git a/metadata/md5-cache/sys-apps/iproute2-5.2.0-r1 b/metadata/md5-cache/sys-apps/iproute2-5.2.0-r1
new file mode 100644
index 000000000000..9700e9ef2eb5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/iproute2-5.2.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils >=sys-devel/bison-2.4 sys-devel/flex virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=!net-misc/arpd dev-libs/libbsd !minimal? ( net-libs/libmnl ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux ) >=sys-kernel/linux-headers-3.16
+DESCRIPTION=kernel routing and traffic control utilities
+EAPI=7
+HOMEPAGE=https://wiki.linuxfoundation.org/networking/iproute2
+IUSE=atm berkdb caps elf +iptables ipv6 minimal selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!net-misc/arpd dev-libs/libbsd !minimal? ( net-libs/libmnl ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux )
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-5.2.0.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=738a3540a1be42e4af796ed468eaa4b4
diff --git a/metadata/md5-cache/sys-apps/iproute2-9999 b/metadata/md5-cache/sys-apps/iproute2-9999
index 10953e75b21a..d0b60a52f7aa 100644
--- a/metadata/md5-cache/sys-apps/iproute2-9999
+++ b/metadata/md5-cache/sys-apps/iproute2-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=!net-misc/arpd dev-libs/libbsd !minimal? ( net-libs/libmnl ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux )
 SLOT=0
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=41443f4e080380f08564e29df4079a24
+_md5_=9fae9c40c4e1ea7d7e76b945cdd6fbaf
diff --git a/metadata/md5-cache/sys-apps/kmod-26-r1 b/metadata/md5-cache/sys-apps/kmod-26-r1
deleted file mode 100644
index 8385ffe6f25d..000000000000
--- a/metadata/md5-cache/sys-apps/kmod-26-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.1.0:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.6 ) doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815
-DESCRIPTION=library and tools for managing linux kernel modules
-EAPI=6
-HOMEPAGE=https://git.kernel.org/?p=utils/kernel/kmod/kmod.git
-IUSE=debug doc libressl lzma python ssl static-libs +tools zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
-LICENSE=LGPL-2
-RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.1.0:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.6 )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-26.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=dd045c35f60a10c11257390a1f8ecee0
diff --git a/metadata/md5-cache/sys-apps/kmod-26-r2 b/metadata/md5-cache/sys-apps/kmod-26-r2
new file mode 100644
index 000000000000..d39e2abec655
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/kmod-26-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.1.0:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.6 ) doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815
+DESCRIPTION=library and tools for managing linux kernel modules
+EAPI=6
+HOMEPAGE=https://git.kernel.org/?p=utils/kernel/kmod/kmod.git
+IUSE=debug doc libressl lzma python ssl static-libs +tools zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.1.0:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.6 )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-26.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a557d3fff80fd614778cf6827155a2f6
diff --git a/metadata/md5-cache/sys-apps/kmod-9999 b/metadata/md5-cache/sys-apps/kmod-9999
index 2cd9ccdf2858..0cee0f907269 100644
--- a/metadata/md5-cache/sys-apps/kmod-9999
+++ b/metadata/md5-cache/sys-apps/kmod-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 py
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=97761d8f75001dbdef8ba81f4ea6937c
+_md5_=fbe498e78a1a6558bb864ff107822c01
diff --git a/metadata/md5-cache/sys-apps/lsd-0.14.0 b/metadata/md5-cache/sys-apps/lsd-0.14.0
index 4091b63d1a40..fdcd56943941 100644
--- a/metadata/md5-cache/sys-apps/lsd-0.14.0
+++ b/metadata/md5-cache/sys-apps/lsd-0.14.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/Peltoche/lsd/archive/0.14.0.tar.gz -> lsd-0.14.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/lscolors/0.5.0/download -> lscolors-0.5.0.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	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=ad42ad01969180ef1cbb143a9d4516b2
diff --git a/metadata/md5-cache/sys-apps/lsd-0.15.1 b/metadata/md5-cache/sys-apps/lsd-0.15.1
index 68222de9c3f3..aa326768a034 100644
--- a/metadata/md5-cache/sys-apps/lsd-0.15.1
+++ b/metadata/md5-cache/sys-apps/lsd-0.15.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/Peltoche/lsd/archive/0.15.1.tar.gz -> lsd-0.15.1.tar.gz https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/chrono-humanize/0.0.11/download -> chrono-humanize-0.0.11.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.55/download -> libc-0.2.55.crate https://crates.io/api/v1/crates/lscolors/0.5.0/download -> lscolors-0.5.0.crate https://crates.io/api/v1/crates/lsd/0.15.1/download -> lsd-0.15.1.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/redox_syscall/0.1.43/download -> redox_syscall-0.1.43.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.8/download -> terminal_size-0.1.8.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/wild/2.0.1/download -> wild-2.0.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=40abd323cccdd116204426016ba1fc73
diff --git a/metadata/md5-cache/sys-apps/lsd-0.16.0 b/metadata/md5-cache/sys-apps/lsd-0.16.0
index 28205d5a670c..20dd94cf4540 100644
--- a/metadata/md5-cache/sys-apps/lsd-0.16.0
+++ b/metadata/md5-cache/sys-apps/lsd-0.16.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/Peltoche/lsd/archive/0.16.0.tar.gz -> lsd-0.16.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/autocfg/0.1.4/download -> autocfg-0.1.4.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.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/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.55/download -> libc-0.2.55.crate https://crates.io/api/v1/crates/lscolors/0.5.0/download -> lscolors-0.5.0.crate https://crates.io/api/v1/crates/lsd/0.16.0/download -> lsd-0.16.0.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.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.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.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.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/tempfile/3.0.8/download -> tempfile-3.0.8.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.8/download -> terminal_size-0.1.8.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/wild/2.0.1/download -> wild-2.0.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=1c8cde4bdb5c3121c8a14148198ccc6b
diff --git a/metadata/md5-cache/sys-apps/man-db-2.8.5-r1 b/metadata/md5-cache/sys-apps/man-db-2.8.5-r1
deleted file mode 100644
index 35d6e0231699..000000000000
--- a/metadata/md5-cache/sys-apps/man-db-2.8.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst setup
-DEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) app-arch/xz-utils virtual/pkgconfig nls? ( >=app-text/po4a-0.45 sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=a man replacement that utilizes berkdb instead of flat files
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/man-db/
-IUSE=berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-PDEPEND=manpager? ( app-text/manpager )
-RDEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-mandb )
-SLOT=0
-SRC_URI=mirror://nongnu/man-db/man-db-2.8.5.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=007b5fa5ec284fd6bec3c5eecdebf440
diff --git a/metadata/md5-cache/sys-apps/man-db-2.8.7 b/metadata/md5-cache/sys-apps/man-db-2.8.7
new file mode 100644
index 000000000000..9a5fad3aed80
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/man-db-2.8.7
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( >=app-text/po4a-0.45 sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst setup
+DEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib )
+DESCRIPTION=a man replacement that utilizes berkdb instead of flat files
+EAPI=7
+HOMEPAGE=http://www.nongnu.org/man-db/
+IUSE=berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+PDEPEND=manpager? ( app-text/manpager )
+RDEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) acct-group/man acct-user/man selinux? ( sec-policy/selinux-mandb )
+SLOT=0
+SRC_URI=mirror://nongnu/man-db/man-db-2.8.7.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9e0c375e8c14699b0731c3d9f1ad0a56
diff --git a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20150503 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20150503
deleted file mode 100644
index 03ca9cfbf4c9..000000000000
--- a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20150503
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-eselect/eselect-awk
-DESCRIPTION=an (often faster than gawk) awk-interpreter
-EAPI=5
-HOMEPAGE=https://invisible-island.net/mawk/mawk.html
-KEYWORDS=alpha amd64 ~hppa ia64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=app-eselect/eselect-awk
-SLOT=0
-SRC_URI=ftp://invisible-island.net/mawk/mawk-1.3.4-20150503.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2fcbfb3a0529cfe9f7068cc8e7fc33c5
diff --git a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20171017 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20171017
deleted file mode 100644
index 443c8a067803..000000000000
--- a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20171017
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-eselect/eselect-awk
-DESCRIPTION=an (often faster than gawk) awk-interpreter
-EAPI=6
-HOMEPAGE=https://invisible-island.net/mawk/mawk.html
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=app-eselect/eselect-awk
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/mawk/mawk-1.3.4-20171017.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a438e202516bab199844ce43011e38e0
diff --git a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20190203 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20190203
new file mode 100644
index 000000000000..60ed45feb56c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20190203
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=app-eselect/eselect-awk
+DESCRIPTION=an (often faster than gawk) awk-interpreter
+EAPI=7
+HOMEPAGE=https://invisible-island.net/mawk/mawk.html
+IUSE=forced-sandbox
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=app-eselect/eselect-awk
+SLOT=0
+SRC_URI=ftp://ftp.invisible-island.net/mawk/mawk-1.3.4-20190203.tgz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8c5d6e320ca1cb7f5fa8b56692ac54c7
diff --git a/metadata/md5-cache/sys-apps/memtest86+-4.20-r1 b/metadata/md5-cache/sys-apps/memtest86+-4.20-r1
index 75e1139bf021..ae13d0c6f132 100644
--- a/metadata/md5-cache/sys-apps/memtest86+-4.20-r1
+++ b/metadata/md5-cache/sys-apps/memtest86+-4.20-r1
@@ -5,8 +5,8 @@ HOMEPAGE=http://www.memtest.org/
 IUSE=floppy serial
 KEYWORDS=-* amd64 x86
 LICENSE=GPL-2
-RDEPEND=floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )
+RDEPEND=floppy? ( sys-fs/mtools )
 SLOT=0
 SRC_URI=http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	mount-boot	0ed73d6bc7399be07e136b5dc46709d9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4598969893c5ae4797dace4828238466
+_md5_=e90ed838a46e120373771d270eb4825b
diff --git a/metadata/md5-cache/sys-apps/memtest86+-4.20-r3 b/metadata/md5-cache/sys-apps/memtest86+-4.20-r3
index 7f01358df298..7de95d6e7bbb 100644
--- a/metadata/md5-cache/sys-apps/memtest86+-4.20-r3
+++ b/metadata/md5-cache/sys-apps/memtest86+-4.20-r3
@@ -5,8 +5,8 @@ HOMEPAGE=http://www.memtest.org/
 IUSE=floppy serial
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )
+RDEPEND=floppy? ( sys-fs/mtools )
 SLOT=0
 SRC_URI=http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	mount-boot	0ed73d6bc7399be07e136b5dc46709d9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f8397cab183ea4d1808f13699e87f7ec
+_md5_=4354c50f79a778e91d4e9fc4e57687a0
diff --git a/metadata/md5-cache/sys-apps/memtest86+-5.01-r2 b/metadata/md5-cache/sys-apps/memtest86+-5.01-r2
index e719142ae126..8fdb9f689af8 100644
--- a/metadata/md5-cache/sys-apps/memtest86+-5.01-r2
+++ b/metadata/md5-cache/sys-apps/memtest86+-5.01-r2
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.memtest.org/
 IUSE=floppy iso serial
 KEYWORDS=-* amd64 x86
 LICENSE=GPL-2
-RDEPEND=floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )
+RDEPEND=floppy? ( sys-fs/mtools )
 SLOT=0
 SRC_URI=http://www.memtest.org/download/5.01/memtest86+-5.01.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	mount-boot	0ed73d6bc7399be07e136b5dc46709d9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bdcd56e12842f46090119703bac4c166
+_md5_=b59d8af37c585bd04ef5f116d932c247
diff --git a/metadata/md5-cache/sys-apps/memtest86+-5.01-r4 b/metadata/md5-cache/sys-apps/memtest86+-5.01-r4
index 48fec8f80069..52ac67116362 100644
--- a/metadata/md5-cache/sys-apps/memtest86+-5.01-r4
+++ b/metadata/md5-cache/sys-apps/memtest86+-5.01-r4
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.memtest.org/
 IUSE=+boot floppy iso serial
 KEYWORDS=-* amd64 x86
 LICENSE=GPL-2
-RDEPEND=floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )
+RDEPEND=floppy? ( sys-fs/mtools )
 SLOT=0
 SRC_URI=http://www.memtest.org/download/5.01/memtest86+-5.01.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	mount-boot	0ed73d6bc7399be07e136b5dc46709d9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3704f7847209cb3dddd879d4cec65390
+_md5_=b14f939b66e5d45a201f648c7280f5da
diff --git a/metadata/md5-cache/sys-apps/mouseemu-0.12 b/metadata/md5-cache/sys-apps/mouseemu-0.12
index 91f77fb86b45..cf749a748402 100644
--- a/metadata/md5-cache/sys-apps/mouseemu-0.12
+++ b/metadata/md5-cache/sys-apps/mouseemu-0.12
@@ -5,5 +5,5 @@ HOMEPAGE=http://geekounet.org/powerbook/
 KEYWORDS=-* ppc
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://geekounet.org/powerbook/files/mouseemu.tar.gz
-_md5_=ebf06a328ddab1467e515e8503224c5b
+SRC_URI=mirror://gentoo/mouseemu.tar.gz -> mouseemu-0.12.tar.gz
+_md5_=2a15144b3251f5b1695988096ced86f2
diff --git a/metadata/md5-cache/sys-apps/mouseemu-0.15 b/metadata/md5-cache/sys-apps/mouseemu-0.15
index 1188b94b6563..c13ba12b26a6 100644
--- a/metadata/md5-cache/sys-apps/mouseemu-0.15
+++ b/metadata/md5-cache/sys-apps/mouseemu-0.15
@@ -5,5 +5,5 @@ HOMEPAGE=http://geekounet.org/powerbook/
 KEYWORDS=-* ~ppc
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://geekounet.org/powerbook/files/mouseemu-0.15.tar.gz
-_md5_=fc10fdcf1c73a62e4d02b437c4f9c776
+SRC_URI=mirror://gentoo/mouseemu-0.15.tar.gz
+_md5_=b6fb2bcc7510a111c5ff08235393c64c
diff --git a/metadata/md5-cache/sys-apps/nvme-cli-1.6-r1 b/metadata/md5-cache/sys-apps/nvme-cli-1.6-r1
index 385a1c602351..cee485e2c66f 100644
--- a/metadata/md5-cache/sys-apps/nvme-cli-1.6-r1
+++ b/metadata/md5-cache/sys-apps/nvme-cli-1.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=NVM-Express user space tooling for Linux
 EAPI=6
 HOMEPAGE=https://github.com/linux-nvme/nvme-cli
 IUSE=+uuid
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=uuid? ( sys-apps/util-linux:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linux-nvme/nvme-cli/archive/v1.6.tar.gz -> nvme-cli-1.6.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=000d303f9c6650798d4098df2953b8b2
+_md5_=442d7e6bad2359d547f4bf1740b55432
diff --git a/metadata/md5-cache/sys-apps/opal-utils-6.5 b/metadata/md5-cache/sys-apps/opal-utils-6.5
new file mode 100644
index 000000000000..bd6e60773f55
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/opal-utils-6.5
@@ -0,0 +1,12 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/sphinx[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/recommonmark[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup
+DESCRIPTION=OPAL firmware utilities
+EAPI=7
+HOMEPAGE=https://github.com/open-power/skiboot
+IUSE=doc kernel_linux
+KEYWORDS=~ppc64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/open-power/skiboot/archive/v6.5.tar.gz -> opal-utils-6.5.tar.gz
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=5ac3d575e18d61b2d9d5bc6f770eb9c3
diff --git a/metadata/md5-cache/sys-apps/openrc-0.34.11 b/metadata/md5-cache/sys-apps/openrc-0.34.11
deleted file mode 100644
index 7922cd50d25a..000000000000
--- a/metadata/md5-cache/sys-apps/openrc-0.34.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
-DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
-EAPI=6
-HOMEPAGE=https://github.com/openrc/openrc/
-IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD split-usr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=BSD-2
-PDEPEND=netifrc? ( net-misc/netifrc )
-RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
-SLOT=0
-SRC_URI=https://github.com/openrc/openrc/archive/0.34.11.tar.gz -> openrc-0.34.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cfae1ab42bdf384ba508b3d5e5e7ea54
diff --git a/metadata/md5-cache/sys-apps/openrc-0.38.3 b/metadata/md5-cache/sys-apps/openrc-0.38.3
deleted file mode 100644
index 5bbe1764f62d..000000000000
--- a/metadata/md5-cache/sys-apps/openrc-0.38.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
-DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
-EAPI=6
-HOMEPAGE=https://github.com/openrc/openrc/
-IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD split-usr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=BSD-2
-PDEPEND=netifrc? ( net-misc/netifrc )
-RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
-SLOT=0
-SRC_URI=https://github.com/openrc/openrc/archive/0.38.3.tar.gz -> openrc-0.38.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ab72f6094d1915a993d5c102354a0ce6
diff --git a/metadata/md5-cache/sys-apps/openrc-0.38.3-r1 b/metadata/md5-cache/sys-apps/openrc-0.38.3-r1
deleted file mode 100644
index 367e4d2a67af..000000000000
--- a/metadata/md5-cache/sys-apps/openrc-0.38.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
-DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
-EAPI=6
-HOMEPAGE=https://github.com/openrc/openrc/
-IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD split-usr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=BSD-2
-PDEPEND=netifrc? ( net-misc/netifrc )
-RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
-SLOT=0
-SRC_URI=https://github.com/openrc/openrc/archive/0.38.3.tar.gz -> openrc-0.38.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ff15c499ca6f35a7f8e6c97663438eaf
diff --git a/metadata/md5-cache/sys-apps/openrc-0.41.2 b/metadata/md5-cache/sys-apps/openrc-0.41.2
index 9bce803237ae..e956d0c8416b 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.41.2
+++ b/metadata/md5-cache/sys-apps/openrc-0.41.2
@@ -4,11 +4,11 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
 EAPI=6
 HOMEPAGE=https://github.com/openrc/openrc/
 IUSE=audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD split-usr
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 bash? ( app-shells/bash ) !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
 SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.41.2.tar.gz -> openrc-0.41.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ffa0b8a82115e9491dd94cecff0524af
+_md5_=f018545ce01262baa66c60553e173c22
diff --git a/metadata/md5-cache/sys-apps/openrc-0.42.1 b/metadata/md5-cache/sys-apps/openrc-0.42.1
new file mode 100644
index 000000000000..e1e00f81fdbd
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.42.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare
+DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=7
+HOMEPAGE=https://github.com/openrc/openrc/
+IUSE=audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs sysv-utils unicode kernel_linux kernel_FreeBSD split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD-2
+PDEPEND=netifrc? ( net-misc/netifrc )
+RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 bash? ( app-shells/bash ) !prefix? ( kernel_linux? ( sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
+SLOT=0
+SRC_URI=https://github.com/openrc/openrc/archive/0.42.1.tar.gz -> openrc-0.42.1.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=a244939ea3e53063a92479e03d599914
diff --git a/metadata/md5-cache/sys-apps/openrc-9999 b/metadata/md5-cache/sys-apps/openrc-9999
index 10df98b2e5c9..e7cd5e65f761 100644
--- a/metadata/md5-cache/sys-apps/openrc-9999
+++ b/metadata/md5-cache/sys-apps/openrc-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 bash? ( app-shells/bash ) !prefix? ( kernel_linux? ( sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
 SLOT=0
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=6daee023806c27e2254d7584daca8f7c
+_md5_=a244939ea3e53063a92479e03d599914
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.10.2 b/metadata/md5-cache/sys-apps/pkgcore-0.10.2
new file mode 100644
index 000000000000..3ceaa1b0c25b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.10.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/snakeoil-0.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=a framework for package management
+EAPI=6
+HOMEPAGE=https://github.com/pkgcore/pkgcore
+IUSE=doc test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/snakeoil-0.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.10.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e3dc5c148a2101e0f8e52e27fe26af8d
diff --git a/metadata/md5-cache/sys-apps/pkgcore-9999 b/metadata/md5-cache/sys-apps/pkgcore-9999
index cd497d565d86..1d969b2784b3 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-9999
+++ b/metadata/md5-cache/sys-apps/pkgcore-9999
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyparsing[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=a framework for package management
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/pkgcore
 IUSE=doc test python_targets_python3_6 python_targets_python3_7
-LICENSE=|| ( BSD GPL-2 )
+LICENSE=BSD
 PROPERTIES=live
 RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc52ccd6656f3fcb8ffc7c090670e9b8
+_md5_=e3dc5c148a2101e0f8e52e27fe26af8d
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.71 b/metadata/md5-cache/sys-apps/portage-2.3.71
deleted file mode 100644
index 9818d040998f..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.3.71
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 !<app-portage/repoman-2.3.10 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.3.71.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.71.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c93ea216673340a61983f348ab12beb9
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.75 b/metadata/md5-cache/sys-apps/portage-2.3.75
new file mode 100644
index 000000000000..643ea016632e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.75
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.75.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.75.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4d3d6d03fbb671021f77083da1c14b45
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 0208a02dd379..e74fd6964339 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-0.10.0-r1
+++ b/metadata/md5-cache/sys-apps/ripgrep-0.10.0-r1
@@ -9,5 +9,5 @@ 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	c6407d708bf89ddb5b8d8fc903fd08b0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=3343208ea56dd2d972a1fb6d0a3ace1c
diff --git a/metadata/md5-cache/sys-apps/ripgrep-11.0.1 b/metadata/md5-cache/sys-apps/ripgrep-11.0.1
index ed1052810806..a859a8edabc8 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-11.0.1
+++ b/metadata/md5-cache/sys-apps/ripgrep-11.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Unlicense )
 RDEPEND=pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/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/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/bstr/0.1.2/download -> bstr-0.1.2.crate https://crates.io/api/v1/crates/bytecount/0.5.1/download -> bytecount-0.5.1.crate https://crates.io/api/v1/crates/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/cc/1.0.35/download -> cc-1.0.35.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.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.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/encoding_rs/0.8.17/download -> encoding_rs-0.8.17.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.6/download -> encoding_rs_io-0.1.6.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.3/download -> globset-0.4.3.crate https://crates.io/api/v1/crates/grep/0.2.4/download -> grep-0.2.4.crate https://crates.io/api/v1/crates/grep-cli/0.1.2/download -> grep-cli-0.1.2.crate https://crates.io/api/v1/crates/grep-matcher/0.1.2/download -> grep-matcher-0.1.2.crate https://crates.io/api/v1/crates/grep-pcre2/0.1.3/download -> grep-pcre2-0.1.3.crate https://crates.io/api/v1/crates/grep-printer/0.1.2/download -> grep-printer-0.1.2.crate https://crates.io/api/v1/crates/grep-regex/0.1.3/download -> grep-regex-0.1.3.crate https://crates.io/api/v1/crates/grep-searcher/0.1.4/download -> grep-searcher-0.1.4.crate https://crates.io/api/v1/crates/ignore/0.4.7/download -> ignore-0.4.7.crate https://crates.io/api/v1/crates/itoa/0.4.3/download -> itoa-0.4.3.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.51/download -> libc-0.2.51.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/packed_simd/0.3.3/download -> packed_simd-0.3.3.crate https://crates.io/api/v1/crates/pcre2/0.2.0/download -> pcre2-0.2.0.crate https://crates.io/api/v1/crates/pcre2-sys/0.2.0/download -> pcre2-sys-0.2.0.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.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/quote/0.6.12/download -> quote-0.6.12.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.3/download -> rand_jitter-0.1.3.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.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.54/download -> redox_syscall-0.1.54.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-automata/0.1.6/download -> regex-automata-0.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/ripgrep/11.0.1/download -> ripgrep-11.0.1.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/serde/1.0.90/download -> serde-1.0.90.crate https://crates.io/api/v1/crates/serde_derive/1.0.90/download -> serde_derive-1.0.90.crate https://crates.io/api/v1/crates/serde_json/1.0.39/download -> serde_json-1.0.39.crate https://crates.io/api/v1/crates/smallvec/0.6.9/download -> smallvec-0.6.9.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/0.15.31/download -> syn-0.15.31.crate https://crates.io/api/v1/crates/tempfile/3.0.7/download -> tempfile-3.0.7.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.11.0/download -> textwrap-0.11.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.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.2.7/download -> walkdir-2.2.7.crate https://crates.io/api/v1/crates/winapi/0.3.7/download -> winapi-0.3.7.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_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=91aa378e94534b7deeacd00a37526f2e
diff --git a/metadata/md5-cache/sys-apps/ripgrep-11.0.2 b/metadata/md5-cache/sys-apps/ripgrep-11.0.2
index 1b4a94e12e28..bad68c4cb76a 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-11.0.2
+++ b/metadata/md5-cache/sys-apps/ripgrep-11.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Unlicense )
 RDEPEND=pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=https://github.com/BurntSushi/ripgrep/archive/11.0.2.tar.gz -> ripgrep-11.0.2.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.4/download -> aho-corasick-0.7.4.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/bitflags/1.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/bstr/0.2.6/download -> bstr-0.2.6.crate https://crates.io/api/v1/crates/bytecount/0.5.1/download -> bytecount-0.5.1.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/c2-chacha/0.2.2/download -> c2-chacha-0.2.2.crate https://crates.io/api/v1/crates/cc/1.0.38/download -> cc-1.0.38.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.3.9/download -> crossbeam-channel-0.3.9.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.17/download -> encoding_rs-0.8.17.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.6/download -> encoding_rs_io-0.1.6.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fs_extra/1.1.0/download -> fs_extra-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.1.7/download -> getrandom-0.1.7.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.2.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.60/download -> libc-0.2.60.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/num_cpus/1.10.1/download -> num_cpus-1.10.1.crate https://crates.io/api/v1/crates/packed_simd/0.3.3/download -> packed_simd-0.3.3.crate https://crates.io/api/v1/crates/pcre2/0.2.1/download -> pcre2-0.2.1.crate https://crates.io/api/v1/crates/pcre2-sys/0.2.2/download -> pcre2-sys-0.2.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.15/download -> pkg-config-0.3.15.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.5/download -> ppv-lite86-0.2.5.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/rand/0.7.0/download -> rand-0.7.0.crate https://crates.io/api/v1/crates/rand_chacha/0.2.1/download -> rand_chacha-0.2.1.crate https://crates.io/api/v1/crates/rand_core/0.5.0/download -> rand_core-0.5.0.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.2.0/download -> regex-1.2.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.8/download -> regex-automata-0.1.8.crate https://crates.io/api/v1/crates/regex-syntax/0.6.10/download -> regex-syntax-0.6.10.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.98/download -> serde-1.0.98.crate https://crates.io/api/v1/crates/serde_derive/1.0.98/download -> serde_derive-1.0.98.crate https://crates.io/api/v1/crates/serde_json/1.0.40/download -> serde_json-1.0.40.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/0.15.42/download -> syn-0.15.42.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.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.5/download -> ucd-util-0.1.5.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.3/download -> utf8-ranges-1.0.3.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/winapi/0.3.7/download -> winapi-0.3.7.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_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=8dd72e333eac86311334be51e25b5aa6
diff --git a/metadata/md5-cache/sys-apps/systemd-242-r6 b/metadata/md5-cache/sys-apps/systemd-242-r6
index 6b7abc2f3194..14b0245607d3 100644
--- a/metadata/md5-cache/sys-apps/systemd-242-r6
+++ b/metadata/md5-cache/sys-apps/systemd-242-r6
@@ -13,5 +13,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v242/systemd-242.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=8ad8f340cf4cfc361863d045970bcb16
diff --git a/metadata/md5-cache/sys-apps/systemd-242-r7 b/metadata/md5-cache/sys-apps/systemd-242-r7
new file mode 100644
index 000000000000..c5d7eeaa7ae3
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-242-r7
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) acct-group/adm acct-group/wheel acct-group/kmem acct-group/tty acct-group/utmp acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/render acct-group/tape acct-group/video acct-group/systemd-journal acct-user/systemd-journal-remote acct-user/systemd-coredump acct-user/systemd-network acct-user/systemd-resolve acct-user/systemd-timesync >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd/archive/v242/systemd-242.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=28ab1f1a9238e1d9e72b5faf9ab43630
diff --git a/metadata/md5-cache/sys-apps/systemd-243_rc1-r2 b/metadata/md5-cache/sys-apps/systemd-243_rc1-r2
deleted file mode 100644
index 5dfbde81b4f0..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-243_rc1-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-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 cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) acct-group/adm acct-group/wheel acct-group/kmem acct-group/tty acct-group/utmp acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/render acct-group/tape acct-group/video acct-group/systemd-journal acct-user/systemd-journal-remote acct-user/systemd-coredump acct-user/systemd-network acct-user/systemd-resolve acct-user/systemd-timesync >=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/v243-rc1/systemd-243-rc1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=b3b6b8a72cbafd9cfb82dba5e877b15c
diff --git a/metadata/md5-cache/sys-apps/systemd-243_rc2-r1 b/metadata/md5-cache/sys-apps/systemd-243_rc2-r1
new file mode 100644
index 000000000000..e3363fe2a773
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-243_rc2-r1
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-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 cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) acct-group/adm acct-group/wheel acct-group/kmem acct-group/tty acct-group/utmp acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/render acct-group/tape acct-group/video acct-group/systemd-journal acct-user/systemd-journal-remote acct-user/systemd-coredump acct-user/systemd-network acct-user/systemd-resolve acct-user/systemd-timesync >=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/v243-rc2/systemd-243-rc2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=e66b15c213b7e13ef874044b44d8d200
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 601fc21f6d0e..05954d143b6d 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=e80422f4c9a8bce03db41e4fbae82960
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=540ada21d2162d78e92943fc43da491e
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.96_beta b/metadata/md5-cache/sys-apps/sysvinit-2.96_beta
new file mode 100644
index 000000000000..cd08d806a5c6
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sysvinit-2.96_beta
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
+DESCRIPTION=/sbin/init - parent of all processes
+EAPI=7
+HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
+IUSE=selinux ibm static kernel_FreeBSD
+LICENSE=GPL-2
+RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) selinux? ( sec-policy/selinux-shutdown ) !<sys-apps/openrc-0.13
+SLOT=0
+SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.96-beta.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=69fd3f934b2c96f97df6d835a31fd37a
diff --git a/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.28 b/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.28
index b6ff118ff395..77bde3f339c3 100644
--- a/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.28
+++ b/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.28
@@ -8,4 +8,4 @@ LICENSE=tcp_wrappers_license
 SLOT=0
 SRC_URI=http://ftp.porcupine.org/pub/security/tcp_wrappers_7.6.tar.gz mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.q-28.debian.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=673c8b577f820e713d8d57a9e62d7cb3
+_md5_=181deabf58aa33bc4d8edbf05beeb898
diff --git a/metadata/md5-cache/sys-apps/texinfo-6.6-r1 b/metadata/md5-cache/sys-apps/texinfo-6.6-r1
index 0d6ef1bb839f..010fdae4905a 100644
--- a/metadata/md5-cache/sys-apps/texinfo-6.6-r1
+++ b/metadata/md5-cache/sys-apps/texinfo-6.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU info program and utilities
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/texinfo/
 IUSE=nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-6.6.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=13bccb9d88ea70a26b265953af7151e7
+_md5_=0d8e4a18880167c917421966d1e8be3f
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index f659de204820..d99628d515d0 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/authenticator-0.2.4 b/metadata/md5-cache/sys-auth/authenticator-0.2.4
index 31fa9dda8629..aeafbdb511c9 100644
--- a/metadata/md5-cache/sys-auth/authenticator-0.2.4
+++ b/metadata/md5-cache/sys-auth/authenticator-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/World/Authenticator/-/archive/0.2.4/Authenticator-0.2.4.tar.gz -> authenticator-0.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6ceaed4599b83bf081666d5636268912
diff --git a/metadata/md5-cache/sys-auth/authenticator-9999 b/metadata/md5-cache/sys-auth/authenticator-9999
index da96409f8c20..f72ae1d55b66 100644
--- a/metadata/md5-cache/sys-auth/authenticator-9999
+++ b/metadata/md5-cache/sys-auth/authenticator-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-crypt/libsecret dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyotp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/python-gnupg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyzbar[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/gd x11-libs/gtk+:3
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1f21f1eec6bfe2eab288c2549bf340e
diff --git a/metadata/md5-cache/sys-auth/elogind-241.3 b/metadata/md5-cache/sys-auth/elogind-241.3
index 2404f552beab..ed126e2458b2 100644
--- a/metadata/md5-cache/sys-auth/elogind-241.3
+++ b/metadata/md5-cache/sys-auth/elogind-241.3
@@ -11,5 +11,5 @@ PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
 RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v241.3.tar.gz -> elogind-241.3.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f81fa5629db7940db55fdbf5954e891e
diff --git a/metadata/md5-cache/sys-auth/libfprint-0.99.0 b/metadata/md5-cache/sys-auth/libfprint-0.99.0
index 64743a788a63..46f9f4862922 100644
--- a/metadata/md5-cache/sys-auth/libfprint-0.99.0
+++ b/metadata/md5-cache/sys-auth/libfprint-0.99.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/pixman x11-libs/libX11 x11-libs/libXv
 SLOT=0
 SRC_URI=https://github.com/freedesktop/libfprint/archive/V_0_99_0.tar.gz -> libfprint-0.99.0.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=2517a60bc49d0e63c7b5a146cd4bbae9
diff --git a/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2 b/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
index 8b60f5c76a76..7e7d276ce942 100644
--- a/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
+++ b/metadata/md5-cache/sys-auth/oath-toolkit-2.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Toolkit for using one-time password authentication with HOTP/TOTP al
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/oath-toolkit/
 IUSE=pam pskc test
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=pam? ( virtual/pam ) pskc? ( dev-libs/xmlsec )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/oath-toolkit/oath-toolkit-2.6.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d4344fa21beecf5fa5dcf40b68ede948
+_md5_=770146481c45160d6f9c51c46cc41f3f
diff --git a/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r5 b/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r5
deleted file mode 100644
index 83cfc77b50f0..000000000000
--- a/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=net-libs/libnsl:0= >=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4 app-arch/xz-utils >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=PAM interface for the S/Key authentication system
-EAPI=5
-HOMEPAGE=http://freshmeat.net/projects/pam_skey/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libnsl:0= >=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4
-SLOT=0
-SRC_URI=http://dkorunic.net/tarballs/pam_skey-1.1.5.tar.gz mirror://gentoo/pam_skey-1.1.5-patches-6.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=205d689168f2dc1986a6f87935e5ff84
diff --git a/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r6 b/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r6
index 6c929260cb6c..ee52f1b73669 100644
--- a/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r6
+++ b/metadata/md5-cache/sys-auth/pam_skey-1.1.5-r6
@@ -4,10 +4,10 @@ DEPEND=net-libs/libnsl:0= >=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4
 DESCRIPTION=PAM interface for the S/Key authentication system
 EAPI=7
 HOMEPAGE=http://freshmeat.net/projects/pam_skey/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=net-libs/libnsl:0= >=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4
 SLOT=0
 SRC_URI=http://dkorunic.net/tarballs/pam_skey-1.1.5.tar.gz https://dev.gentoo.org/~ulm/distfiles/pam_skey-1.1.5-patches-6.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d7e9318500c537724cee657022a92f81
+_md5_=683629b677a642d65b074dcdcc5d2de2
diff --git a/metadata/md5-cache/sys-auth/polkit-qt-0.113.0 b/metadata/md5-cache/sys-auth/polkit-qt-0.113.0
new file mode 100644
index 000000000000..7268877dd5d1
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/polkit-qt-0.113.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-0.103
+DESCRIPTION=Qt wrapper around polkit-1 client libraries
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2
+RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-0.103
+SLOT=0
+SRC_URI=mirror://kde/stable/polkit-qt-1/polkit-qt-1-0.113.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b33f2c252bde3d84412664026cc1748
diff --git a/metadata/md5-cache/sys-auth/sakcl-0.1.0 b/metadata/md5-cache/sys-auth/sakcl-0.1.0
index 1e621a3cd70d..0dba564e516c 100644
--- a/metadata/md5-cache/sys-auth/sakcl-0.1.0
+++ b/metadata/md5-cache/sys-auth/sakcl-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl )
 RESTRICT=mirror
 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/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/atty/0.2.10/download -> atty-0.2.10.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/byteorder/1.2.3/download -> byteorder-1.2.3.crate https://crates.io/api/v1/crates/bytes/0.4.8/download -> bytes-0.4.8.crate https://crates.io/api/v1/crates/cc/1.0.15/download -> cc-1.0.15.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/core-foundation/0.2.3/download -> core-foundation-0.2.3.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/crossbeam-deque/0.3.1/download -> crossbeam-deque-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.4.1/download -> crossbeam-epoch-0.4.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.3.2/download -> crossbeam-utils-0.3.2.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.21/download -> futures-0.1.21.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/lazy_static/1.0.0/download -> lazy_static-1.0.0.crate https://crates.io/api/v1/crates/lazycell/0.6.0/download -> lazycell-0.6.0.crate https://crates.io/api/v1/crates/lber/0.1.6/download -> lber-0.1.6.crate https://crates.io/api/v1/crates/ldap3/0.6.0/download -> ldap3-0.6.0.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.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/mio/0.6.14/download -> mio-0.6.14.crate https://crates.io/api/v1/crates/mio-uds/0.6.6/download -> mio-uds-0.6.6.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.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/net2/0.2.32/download -> net2-0.2.32.crate https://crates.io/api/v1/crates/nodrop/0.1.12/download -> nodrop-0.1.12.crate https://crates.io/api/v1/crates/nom/2.2.1/download -> nom-2.2.1.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/openssl/0.9.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.31/download -> openssl-sys-0.9.31.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.11/download -> pkg-config-0.3.11.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.3/download -> proc-macro2-0.4.3.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.2/download -> quote-0.6.2.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.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.38/download -> redox_syscall-0.1.38.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/sakcl/0.1.0/download -> sakcl-0.1.0.crate https://crates.io/api/v1/crates/schannel/0.1.12/download -> schannel-0.1.12.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-sys/0.1.16/download -> security-framework-sys-0.1.16.crate https://crates.io/api/v1/crates/serde/1.0.60/download -> serde-1.0.60.crate https://crates.io/api/v1/crates/serde_derive/1.0.60/download -> serde_derive-1.0.60.crate https://crates.io/api/v1/crates/slab/0.3.0/download -> slab-0.3.0.crate https://crates.io/api/v1/crates/slab/0.4.0/download -> slab-0.4.0.crate https://crates.io/api/v1/crates/smallvec/0.2.1/download -> smallvec-0.2.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.8/download -> structopt-0.2.8.crate https://crates.io/api/v1/crates/structopt-derive/0.2.8/download -> structopt-derive-0.2.8.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.14.0/download -> syn-0.14.0.crate https://crates.io/api/v1/crates/take/0.1.0/download -> take-0.1.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.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/tokio/0.1.6/download -> tokio-0.1.6.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-executor/0.1.2/download -> tokio-executor-0.1.2.crate https://crates.io/api/v1/crates/tokio-fs/0.1.0/download -> tokio-fs-0.1.0.crate https://crates.io/api/v1/crates/tokio-io/0.1.6/download -> tokio-io-0.1.6.crate https://crates.io/api/v1/crates/tokio-proto/0.1.1/download -> tokio-proto-0.1.1.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.1/download -> tokio-reactor-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-tcp/0.1.0/download -> tokio-tcp-0.1.0.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.3/download -> tokio-threadpool-0.1.3.crate https://crates.io/api/v1/crates/tokio-timer/0.2.3/download -> tokio-timer-0.2.3.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.0/download -> tokio-udp-0.1.0.crate https://crates.io/api/v1/crates/tokio-uds/0.1.7/download -> tokio-uds-0.1.7.crate https://crates.io/api/v1/crates/tokio-uds-proto/0.1.1/download -> tokio-uds-proto-0.1.1.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/url/1.7.0/download -> url-1.7.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.3/download -> vcpkg-0.2.3.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.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.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 https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate
-_eclasses_=cargo	c6407d708bf89ddb5b8d8fc903fd08b0	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=b576997cb48b87f829ffa665d5efce4e
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 7b1bed47d67f..81abd200b6d1 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.0 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.0
index f0c5d5f35129..7d569e634129 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.0
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!static? ( dev-libs/expat dev-libs/libaio ) static? ( dev-libs/expat[static-libs(+)] dev-libs/libaio[static-libs(+)] ) test? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) >=dev-cpp/gtest-1.8.0 dev-util/cucumber dev-util/aruba ) dev-libs/boost >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!static? ( dev-libs/expat dev-libs/libaio ) static? ( dev-libs/expat[static-libs(+)] dev-libs/libaio[static-libs(+)] ) test? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) >=dev-cpp/gtest-1.8.0 dev-util/cucumber dev-util/aruba ) dev-libs/boost >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A suite of tools for thin provisioning on Linux
 EAPI=6
 HOMEPAGE=https://github.com/jthornber/thin-provisioning-tools
@@ -10,4 +10,4 @@ RDEPEND=!static? ( dev-libs/expat dev-libs/libaio )
 SLOT=0
 SRC_URI=https://github.com/jthornber/thin-provisioning-tools/archive/v0.7.0.tar.gz -> thin-provisioning-tools-0.7.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=94914987e4bbb592c1f89777a3f6159d
+_md5_=7f0230b51e32c6468f1a826de13fe088
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.6 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.6
index 84aae631d7d1..8d780edb1185 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.6
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!static? ( dev-libs/expat dev-libs/libaio ) static? ( dev-libs/expat[static-libs(+)] dev-libs/libaio[static-libs(+)] ) test? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) >=dev-cpp/gtest-1.8.0 dev-util/cucumber dev-util/aruba ) dev-libs/boost >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!static? ( dev-libs/expat dev-libs/libaio ) static? ( dev-libs/expat[static-libs(+)] dev-libs/libaio[static-libs(+)] ) test? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) >=dev-cpp/gtest-1.8.0 dev-util/cucumber dev-util/aruba ) dev-libs/boost >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A suite of tools for thin provisioning on Linux
 EAPI=6
 HOMEPAGE=https://github.com/jthornber/thin-provisioning-tools
@@ -10,4 +10,4 @@ RDEPEND=!static? ( dev-libs/expat dev-libs/libaio )
 SLOT=0
 SRC_URI=https://github.com/jthornber/thin-provisioning-tools/archive/v0.7.6.tar.gz -> thin-provisioning-tools-0.7.6.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=786a3f88ba1a0eeb8b0ac40613cb9e5a
+_md5_=200dd148bd758d77de087ba86e0c49d7
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index fa719f5331f3..eb9ac600844c 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/palo-2.12 b/metadata/md5-cache/sys-boot/palo-2.12
new file mode 100644
index 000000000000..177c85569d16
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/palo-2.12
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=PALO : PArisc Linux Loader
+EAPI=7
+HOMEPAGE=http://parisc-linux.org/ https://parisc.wiki.kernel.org/
+KEYWORDS=-* ~hppa
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/deller/palo.git/snapshot/palo-2.12.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e50bc2000907497142ddedf3dc1437da
diff --git a/metadata/md5-cache/sys-boot/systemd-boot-239 b/metadata/md5-cache/sys-boot/systemd-boot-239
index a0bc0dbb52a8..2f50697c4582 100644
--- a/metadata/md5-cache/sys-boot/systemd-boot-239
+++ b/metadata/md5-cache/sys-boot/systemd-boot-239
@@ -9,5 +9,5 @@ RDEPEND=>=sys-apps/util-linux-2.30 !sys-apps/systemd
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v239.tar.gz -> systemd-239.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=770dab890f037338d2cde997098bdbb2
diff --git a/metadata/md5-cache/sys-boot/systemd-boot-241 b/metadata/md5-cache/sys-boot/systemd-boot-241
index 48059097e9c2..19b33bf73a4e 100644
--- a/metadata/md5-cache/sys-boot/systemd-boot-241
+++ b/metadata/md5-cache/sys-boot/systemd-boot-241
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/util-linux-2.30 !sys-apps/systemd
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v241.tar.gz -> systemd-241.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=c1602b73b69d38609d98b5e34fb8dad3
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 572f06e41d5b..247c166eebc5 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/ceph-12.2.11 b/metadata/md5-cache/sys-cluster/ceph-12.2.11
index e135ca094adc..589b40872e4c 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.11
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.11
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.11.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=613537dd39cd6bfb662416d017637563
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.12-r2 b/metadata/md5-cache/sys-cluster/ceph-12.2.12-r2
index 809bf6013b2e..d712ce1a1d5a 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.12-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.12-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.12.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e818aebfd39d07257c9e2e22735c63f5
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.8-r1 b/metadata/md5-cache/sys-cluster/ceph-12.2.8-r1
index 4e80438cf797..26c46b99e845 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.8-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.8.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d26ea94fa1243331004b9dae5725689e
diff --git a/metadata/md5-cache/sys-cluster/ceph-13.2.5-r4 b/metadata/md5-cache/sys-cluster/ceph-13.2.5-r4
index fc96d7cd096e..1c1ce155375b 100644
--- a/metadata/md5-cache/sys-cluster/ceph-13.2.5-r4
+++ b/metadata/md5-cache/sys-cluster/ceph-13.2.5-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-13.2.5.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2a4c99c346ae56f2a83c41d0894cf93
diff --git a/metadata/md5-cache/sys-cluster/ceph-13.2.6 b/metadata/md5-cache/sys-cluster/ceph-13.2.6
index 81cfd9a6baee..365a4b959598 100644
--- a/metadata/md5-cache/sys-cluster/ceph-13.2.6
+++ b/metadata/md5-cache/sys-cluster/ceph-13.2.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-13.2.6.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4ea78824e0ce1a8756659e73715776b
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.2 b/metadata/md5-cache/sys-cluster/ceph-14.2.2
deleted file mode 100644
index fd84aa2a2600..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/cpio >=dev-util/cmake-3.5.0 dev-util/gperf dev-util/valgrind sys-apps/which sys-devel/bc virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/ncurses:0=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) kerberos? ( virtual/krb5 ) rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( || ( ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-libs/boost:=[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) 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(-)] amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx dev-util/cunit test? ( 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/virtualenv[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs )
-DESCRIPTION=Ceph distributed filesystem
-EAPI=7
-HOMEPAGE=https://ceph.com/
-IUSE=babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain
-RDEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/ncurses:0=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) kerberos? ( virtual/krb5 ) rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( || ( ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-libs/boost:=[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup sys-fs/lvm2[-device-mapper-only(-)] !<sys-apps/openrc-0.26.3 dev-python/bcrypt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/cherrypy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/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/pecan[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/prettytable[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/werkzeug[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ?? ( jemalloc tcmalloc ) rabbitmq? ( radosgw )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1eea9fcb62a75eb8a71781ed8842b36
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.3 b/metadata/md5-cache/sys-cluster/ceph-14.2.3
new file mode 100644
index 000000000000..9a2615570d38
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.3
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/cpio >=dev-util/cmake-3.5.0 dev-util/gperf dev-util/valgrind sys-apps/which sys-devel/bc virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/ncurses:0=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) kerberos? ( virtual/krb5 ) rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( || ( ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-libs/boost:=[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) 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(-)] amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx dev-util/cunit test? ( 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/virtualenv[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs )
+DESCRIPTION=Ceph distributed filesystem
+EAPI=7
+HOMEPAGE=https://ceph.com/
+IUSE=babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain
+RDEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/ncurses:0=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) kerberos? ( virtual/krb5 ) rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( || ( ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-libs/boost:=[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup sys-fs/lvm2[-device-mapper-only(-)] !<sys-apps/openrc-0.26.3 dev-python/bcrypt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/cherrypy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/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/pecan[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/prettytable[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/werkzeug[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ?? ( jemalloc tcmalloc ) rabbitmq? ( radosgw )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.3.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9de2585a86dc073a92debeb874d7abcb
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.13.10 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.13.10
new file mode 100644
index 000000000000..6bc1086e92df
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.13.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes API server
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.10.tar.gz -> kubernetes-1.13.10.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=583afa17241e835873c261c6cf362ffa
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.13.7 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.13.7
deleted file mode 100644
index 316d7d841862..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.13.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.7.tar.gz -> kubernetes-1.13.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=583afa17241e835873c261c6cf362ffa
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.13.8 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.13.8
deleted file mode 100644
index 1c6ca2b45571..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.13.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.8.tar.gz -> kubernetes-1.13.8.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=583afa17241e835873c261c6cf362ffa
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.3 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.3
deleted file mode 100644
index ff8d702efbb2..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.3.tar.gz -> kubernetes-1.14.3.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=583afa17241e835873c261c6cf362ffa
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.4 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.4
deleted file mode 100644
index 16be632fc628..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.4.tar.gz -> kubernetes-1.14.4.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=583afa17241e835873c261c6cf362ffa
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.6 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.6
new file mode 100644
index 000000000000..4ba8fd08f95f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes API server
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.6.tar.gz -> kubernetes-1.14.6.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=583afa17241e835873c261c6cf362ffa
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.0 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.0
deleted file mode 100644
index 8759c3b08d29..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes API server
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.0.tar.gz -> kubernetes-1.15.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=583afa17241e835873c261c6cf362ffa
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.3 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.3
new file mode 100644
index 000000000000..328b5236c8b4
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes API server
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.3.tar.gz -> kubernetes-1.15.3.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=583afa17241e835873c261c6cf362ffa
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.13.10 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.13.10
new file mode 100644
index 000000000000..d7968beb4a83
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.13.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.10.tar.gz -> kubernetes-1.13.10.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=fa239f3ce983ed49bcbf4359fbd65afa
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.13.7 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.13.7
deleted file mode 100644
index 690ca573b951..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.13.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.7.tar.gz -> kubernetes-1.13.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=fa239f3ce983ed49bcbf4359fbd65afa
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.13.8 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.13.8
deleted file mode 100644
index b2742944243e..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.13.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.8.tar.gz -> kubernetes-1.13.8.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=fa239f3ce983ed49bcbf4359fbd65afa
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.3 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.3
deleted file mode 100644
index 9a1f3b73bf44..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.3.tar.gz -> kubernetes-1.14.3.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=fa239f3ce983ed49bcbf4359fbd65afa
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.4 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.4
deleted file mode 100644
index 62da6cf427e7..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.4.tar.gz -> kubernetes-1.14.4.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=fa239f3ce983ed49bcbf4359fbd65afa
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.6 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.6
new file mode 100644
index 000000000000..283df6c3e701
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.6.tar.gz -> kubernetes-1.14.6.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=fa239f3ce983ed49bcbf4359fbd65afa
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.0 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.0
deleted file mode 100644
index ee19ad5e5846..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Controller Manager
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.0.tar.gz -> kubernetes-1.15.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=fa239f3ce983ed49bcbf4359fbd65afa
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.3 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.3
new file mode 100644
index 000000000000..dd2de69cb13f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.3.tar.gz -> kubernetes-1.15.3.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=fa239f3ce983ed49bcbf4359fbd65afa
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.13.10 b/metadata/md5-cache/sys-cluster/kube-proxy-1.13.10
new file mode 100644
index 000000000000..5c2e55d639e8
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.13.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Proxy service
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.10.tar.gz -> kubernetes-1.13.10.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=55aeb7a564b39695fc0cd5bf65ed9902
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.13.7 b/metadata/md5-cache/sys-cluster/kube-proxy-1.13.7
deleted file mode 100644
index 866c31b187e3..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.13.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.7.tar.gz -> kubernetes-1.13.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=55aeb7a564b39695fc0cd5bf65ed9902
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.13.8 b/metadata/md5-cache/sys-cluster/kube-proxy-1.13.8
deleted file mode 100644
index 88936aecd11c..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.13.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.8.tar.gz -> kubernetes-1.13.8.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=55aeb7a564b39695fc0cd5bf65ed9902
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.14.3 b/metadata/md5-cache/sys-cluster/kube-proxy-1.14.3
deleted file mode 100644
index 865ac18ae9b2..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.3.tar.gz -> kubernetes-1.14.3.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=55aeb7a564b39695fc0cd5bf65ed9902
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.14.4 b/metadata/md5-cache/sys-cluster/kube-proxy-1.14.4
deleted file mode 100644
index 6dd09acbe2f9..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.4.tar.gz -> kubernetes-1.14.4.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=55aeb7a564b39695fc0cd5bf65ed9902
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.14.6 b/metadata/md5-cache/sys-cluster/kube-proxy-1.14.6
new file mode 100644
index 000000000000..aab96bc77ce4
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.14.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Proxy service
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.6.tar.gz -> kubernetes-1.14.6.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=55aeb7a564b39695fc0cd5bf65ed9902
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.15.0 b/metadata/md5-cache/sys-cluster/kube-proxy-1.15.0
deleted file mode 100644
index b850b0349c7a..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.15.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Proxy service
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/conntrack-tools
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.0.tar.gz -> kubernetes-1.15.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=55aeb7a564b39695fc0cd5bf65ed9902
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.15.3 b/metadata/md5-cache/sys-cluster/kube-proxy-1.15.3
new file mode 100644
index 000000000000..73250adecd20
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.15.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Proxy service
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.3.tar.gz -> kubernetes-1.15.3.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=55aeb7a564b39695fc0cd5bf65ed9902
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.13.10 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.13.10
new file mode 100644
index 000000000000..64461d08750c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.13.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Scheduler
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.10.tar.gz -> kubernetes-1.13.10.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=b902e1e2d71212f733fb50894e5e87ce
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.13.7 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.13.7
deleted file mode 100644
index 6a9b36eb8811..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.13.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Scheduler
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.7.tar.gz -> kubernetes-1.13.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=b902e1e2d71212f733fb50894e5e87ce
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.13.8 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.13.8
deleted file mode 100644
index 99b0c40d5e78..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.13.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Scheduler
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.8.tar.gz -> kubernetes-1.13.8.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=b902e1e2d71212f733fb50894e5e87ce
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.3 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.3
deleted file mode 100644
index d5f8804d5d92..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Scheduler
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.3.tar.gz -> kubernetes-1.14.3.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=b902e1e2d71212f733fb50894e5e87ce
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.4 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.4
deleted file mode 100644
index 2a171b0b844a..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Scheduler
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.4.tar.gz -> kubernetes-1.14.4.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=b902e1e2d71212f733fb50894e5e87ce
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.6 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.6
new file mode 100644
index 000000000000..bc855e9e822c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Scheduler
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.6.tar.gz -> kubernetes-1.14.6.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=b902e1e2d71212f733fb50894e5e87ce
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.0 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.0
deleted file mode 100644
index e3116ec177cb..000000000000
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
-DESCRIPTION=Kubernetes Scheduler
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.0.tar.gz -> kubernetes-1.15.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=b902e1e2d71212f733fb50894e5e87ce
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.3 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.3
new file mode 100644
index 000000000000..25c85735ca6b
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Scheduler
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.3.tar.gz -> kubernetes-1.15.3.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=b902e1e2d71212f733fb50894e5e87ce
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.13.10 b/metadata/md5-cache/sys-cluster/kubeadm-1.13.10
new file mode 100644
index 000000000000..e3c828cc7e71
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.13.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.11 dev-go/go-bindata >=dev-lang/go-1.10
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.10.tar.gz -> kubernetes-1.13.10.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=6d52136487f9c9d3ca25a83e319146da
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.13.7 b/metadata/md5-cache/sys-cluster/kubeadm-1.13.7
deleted file mode 100644
index c7aca1741b84..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.13.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.11 dev-go/go-bindata >=dev-lang/go-1.10
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.7.tar.gz -> kubernetes-1.13.7.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6d52136487f9c9d3ca25a83e319146da
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.13.8 b/metadata/md5-cache/sys-cluster/kubeadm-1.13.8
deleted file mode 100644
index f46eb638ef4f..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.13.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.11 dev-go/go-bindata >=dev-lang/go-1.10
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.8.tar.gz -> kubernetes-1.13.8.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6d52136487f9c9d3ca25a83e319146da
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.14.3 b/metadata/md5-cache/sys-cluster/kubeadm-1.14.3
deleted file mode 100644
index dc4dbe5de822..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.14.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.12 dev-go/go-bindata >=dev-lang/go-1.10
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.3.tar.gz -> kubernetes-1.14.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=fcb6587694b5f25ab39d19a03f0ab955
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.14.4 b/metadata/md5-cache/sys-cluster/kubeadm-1.14.4
deleted file mode 100644
index 4a7bb92c3934..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.14.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.12 dev-go/go-bindata >=dev-lang/go-1.10
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.4.tar.gz -> kubernetes-1.14.4.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=fcb6587694b5f25ab39d19a03f0ab955
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.14.6 b/metadata/md5-cache/sys-cluster/kubeadm-1.14.6
new file mode 100644
index 000000000000..fee91c06c2df
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.14.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.12 dev-go/go-bindata >=dev-lang/go-1.10
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.6.tar.gz -> kubernetes-1.14.6.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=fcb6587694b5f25ab39d19a03f0ab955
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.15.0 b/metadata/md5-cache/sys-cluster/kubeadm-1.15.0
deleted file mode 100644
index 25f5068f7e13..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.15.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.12 dev-go/go-bindata >=dev-lang/go-1.10
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.0.tar.gz -> kubernetes-1.15.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=dbdcf427289f201b6cefb595d6cbf194
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.15.1 b/metadata/md5-cache/sys-cluster/kubeadm-1.15.1
deleted file mode 100644
index 739c971add76..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.15.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.12 dev-go/go-bindata >=dev-lang/go-1.10
-DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.1.tar.gz -> kubernetes-1.15.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=dbdcf427289f201b6cefb595d6cbf194
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.15.3 b/metadata/md5-cache/sys-cluster/kubeadm-1.15.3
new file mode 100644
index 000000000000..b0e6f92dd549
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.15.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.12 dev-go/go-bindata >=dev-lang/go-1.10
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.3.tar.gz -> kubernetes-1.15.3.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=dbdcf427289f201b6cefb595d6cbf194
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.13.10 b/metadata/md5-cache/sys-cluster/kubectl-1.13.10
new file mode 100644
index 000000000000..c18a26389264
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.13.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.11 dev-go/go-bindata >=dev-lang/go-1.10
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.10.tar.gz -> kubernetes-1.13.10.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ba12c44291037fe025993c6bda8613e7
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.13.9 b/metadata/md5-cache/sys-cluster/kubectl-1.13.9
deleted file mode 100644
index 5b19f4bfc72e..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.13.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.11 dev-go/go-bindata >=dev-lang/go-1.10
-DESCRIPTION=CLI to run commands against Kubernetes clusters
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.9.tar.gz -> kubernetes-1.13.9.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=ba12c44291037fe025993c6bda8613e7
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.14.6 b/metadata/md5-cache/sys-cluster/kubectl-1.14.6
new file mode 100644
index 000000000000..3978d3b92d64
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.14.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.12 dev-go/go-bindata >=dev-lang/go-1.10
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.6.tar.gz -> kubernetes-1.14.6.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=1967dc9a3a57363631512f7d5e70d87f
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.15.3 b/metadata/md5-cache/sys-cluster/kubectl-1.15.3
new file mode 100644
index 000000000000..31b329a3a759
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.15.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.12 dev-go/go-bindata >=dev-lang/go-1.10
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.3.tar.gz -> kubernetes-1.15.3.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=1967dc9a3a57363631512f7d5e70d87f
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.13.10 b/metadata/md5-cache/sys-cluster/kubelet-1.13.10
new file mode 100644
index 000000000000..540cb39e29c0
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.13.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10 virtual/pkgconfig
+DESCRIPTION=Kubernetes Node Agent
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.10.tar.gz -> kubernetes-1.13.10.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f51f7b4eb49131e0ed3b15642552e347
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.13.7 b/metadata/md5-cache/sys-cluster/kubelet-1.13.7
deleted file mode 100644
index cf92672141b5..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.13.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.7.tar.gz -> kubernetes-1.13.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a53524dc91a7f2e22d63c86e967cd156
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.13.8 b/metadata/md5-cache/sys-cluster/kubelet-1.13.8
deleted file mode 100644
index ef72a3639e8e..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.13.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.8.tar.gz -> kubernetes-1.13.8.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f51f7b4eb49131e0ed3b15642552e347
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.13.9 b/metadata/md5-cache/sys-cluster/kubelet-1.13.9
deleted file mode 100644
index 53cf92ec4015..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.13.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.13.9.tar.gz -> kubernetes-1.13.9.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a53524dc91a7f2e22d63c86e967cd156
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.14.3 b/metadata/md5-cache/sys-cluster/kubelet-1.14.3
deleted file mode 100644
index 2ae13a4dc4bf..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.3.tar.gz -> kubernetes-1.14.3.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a53524dc91a7f2e22d63c86e967cd156
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.14.4 b/metadata/md5-cache/sys-cluster/kubelet-1.14.4
deleted file mode 100644
index 5b580d69bb95..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.4.tar.gz -> kubernetes-1.14.4.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a53524dc91a7f2e22d63c86e967cd156
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.14.6 b/metadata/md5-cache/sys-cluster/kubelet-1.14.6
new file mode 100644
index 000000000000..579bae34098d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.14.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10 virtual/pkgconfig
+DESCRIPTION=Kubernetes Node Agent
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.6.tar.gz -> kubernetes-1.14.6.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a53524dc91a7f2e22d63c86e967cd156
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.15.0 b/metadata/md5-cache/sys-cluster/kubelet-1.15.0
deleted file mode 100644
index 547de5203a65..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.15.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.0.tar.gz -> kubernetes-1.15.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a53524dc91a7f2e22d63c86e967cd156
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.15.1 b/metadata/md5-cache/sys-cluster/kubelet-1.15.1
deleted file mode 100644
index c57818a04e70..000000000000
--- a/metadata/md5-cache/sys-cluster/kubelet-1.15.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Kubernetes Node Agent
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.1.tar.gz -> kubernetes-1.15.1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a53524dc91a7f2e22d63c86e967cd156
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.15.3 b/metadata/md5-cache/sys-cluster/kubelet-1.15.3
new file mode 100644
index 000000000000..4c63affd50df
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.15.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10 virtual/pkgconfig
+DESCRIPTION=Kubernetes Node Agent
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.3.tar.gz -> kubernetes-1.15.3.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a53524dc91a7f2e22d63c86e967cd156
diff --git a/metadata/md5-cache/sys-cluster/neutron-13.0.4 b/metadata/md5-cache/sys-cluster/neutron-13.0.4
index 152121b040ef..2fc6e75ab5e4 100644
--- a/metadata/md5-cache/sys-cluster/neutron-13.0.4
+++ b/metadata/md5-cache/sys-cluster/neutron-13.0.4
@@ -11,4 +11,4 @@ REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !my
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/configs.tar.gz -> neutron-configs-13.0.4.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/ml2_plugins.tar.gz -> neutron-ml2-plugins-13.0.4.tar.gz https://tarballs.openstack.org/neutron/neutron-13.0.4.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bfab404def9e77d5c5b1f3e3f7ffd154
+_md5_=26064a31de175248e3c7955eb0bef1d2
diff --git a/metadata/md5-cache/sys-cluster/neutron-14.0.2 b/metadata/md5-cache/sys-cluster/neutron-14.0.2
index 9cc62ef3d918..caeac8c3d541 100644
--- a/metadata/md5-cache/sys-cluster/neutron-14.0.2
+++ b/metadata/md5-cache/sys-cluster/neutron-14.0.2
@@ -12,4 +12,4 @@ REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !my
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/configs.tar.gz -> neutron-configs-14.0.2.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/ml2_plugins.tar.gz -> neutron-ml2-plugins-14.0.2.tar.gz https://tarballs.openstack.org/neutron/neutron-14.0.2.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=d38ba24703ac6a099935ebb17098810b
+_md5_=4858f41130567211a442b3f78e7734e6
diff --git a/metadata/md5-cache/sys-cluster/neutron-2018.2.9999 b/metadata/md5-cache/sys-cluster/neutron-2018.2.9999
index 917d23600d2d..588c9e504157 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2018.2.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2018.2.9999
@@ -11,4 +11,4 @@ REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !my
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/configs.tar.gz -> neutron-configs-2018.2.9999.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/ml2_plugins.tar.gz -> neutron-ml2-plugins-2018.2.9999.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d76b79893a2646f6eec84c79579f64d7
+_md5_=ce3a28f97314f39fc148ad1208c9df1c
diff --git a/metadata/md5-cache/sys-cluster/neutron-2019.1.9999 b/metadata/md5-cache/sys-cluster/neutron-2019.1.9999
index 5ea910f7e3f0..581daecd9318 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2019.1.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2019.1.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !my
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/configs.tar.gz -> neutron-configs-2019.1.9999.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/ml2_plugins.tar.gz -> neutron-ml2-plugins-2019.1.9999.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=63affcc149706ca280fa083b0eb3650c
+_md5_=d81e0deeec5dbe15808bd14d65139606
diff --git a/metadata/md5-cache/sys-cluster/nova-18.2.2 b/metadata/md5-cache/sys-cluster/nova-18.2.2
index 3fc93d7ffc98..d2fcb3cb98e1 100644
--- a/metadata/md5-cache/sys-cluster/nova-18.2.2
+++ b/metadata/md5-cache/sys-cluster/nova-18.2.2
@@ -11,4 +11,4 @@ REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( com
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample -> nova.conf.sample-18.2.2 https://tarballs.openstack.org/nova/nova-18.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0652e62f25040da12a2324c3a6966f1e
+_md5_=7bb9f3f09f186801c512fbe45c472c73
diff --git a/metadata/md5-cache/sys-cluster/nova-19.0.2 b/metadata/md5-cache/sys-cluster/nova-19.0.2
index b83fa571ccf0..348ded4f4390 100644
--- a/metadata/md5-cache/sys-cluster/nova-19.0.2
+++ b/metadata/md5-cache/sys-cluster/nova-19.0.2
@@ -12,4 +12,4 @@ REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( com
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/stein/nova.conf.sample -> nova.conf.sample-19.0.2 https://tarballs.openstack.org/nova/nova-19.0.2.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=89e7879452cddba63c262bb06fdec791
+_md5_=98a171d818b77f8b0b175b4896ed70cc
diff --git a/metadata/md5-cache/sys-cluster/nova-2018.2.9999 b/metadata/md5-cache/sys-cluster/nova-2018.2.9999
index 3bf253780f3b..0893667936d4 100644
--- a/metadata/md5-cache/sys-cluster/nova-2018.2.9999
+++ b/metadata/md5-cache/sys-cluster/nova-2018.2.9999
@@ -11,4 +11,4 @@ REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( com
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample -> nova.conf.sample-2018.2.9999
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46b304811caa0860dac2e80cc43a8172
+_md5_=d5009258b42425169fde8398868540fb
diff --git a/metadata/md5-cache/sys-cluster/nova-2019.1.9999 b/metadata/md5-cache/sys-cluster/nova-2019.1.9999
index 06def9caf46f..1bf58d7d54ff 100644
--- a/metadata/md5-cache/sys-cluster/nova-2019.1.9999
+++ b/metadata/md5-cache/sys-cluster/nova-2019.1.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( com
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/stein/nova.conf.sample -> nova.conf.sample-2019.1.9999
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=140b2cc1a1f8088c31978f5b4c518fda
+_md5_=0725f6a81151e03004e8d94ebe942110
diff --git a/metadata/md5-cache/sys-cluster/openmpi-4.0.1 b/metadata/md5-cache/sys-cluster/openmpi-4.0.1
deleted file mode 100644
index 39694bd895ae..000000000000
--- a/metadata/md5-cache/sys-cluster/openmpi-4.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A high-performance message passing library (MPI)
-EAPI=7
-HOMEPAGE=http://www.open-mpi.org
-IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
-SLOT=0
-SRC_URI=http://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.1.tar.bz2
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=785337919f192c92e1760a25c6114f7e
diff --git a/metadata/md5-cache/sys-cluster/openmpi-4.0.1-r1 b/metadata/md5-cache/sys-cluster/openmpi-4.0.1-r1
new file mode 100644
index 000000000000..6085f80eeb6d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/openmpi-4.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jdk-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A high-performance message passing library (MPI)
+EAPI=7
+HOMEPAGE=http://www.open-mpi.org
+IUSE=cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java romio openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_rdmacm openmpi_ofed_features_dynamic-sl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/nullmpi !sys-cluster/mpiexec >=dev-libs/libevent-2.0.22:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) openmpi_rm_pbs? ( sys-cluster/torque ) openmpi_rm_slurm? ( sys-cluster/slurm ) openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) java? ( >=virtual/jre-1.6 ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
+SLOT=0
+SRC_URI=http://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-4.0.1.tar.bz2
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b825eecfbcd34b4da4c38d578f3f2412
diff --git a/metadata/md5-cache/sys-cluster/swift-2.22.0 b/metadata/md5-cache/sys-cluster/swift-2.22.0
index d275b18be0ff..3ca1e18d4b31 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.22.0
+++ b/metadata/md5-cache/sys-cluster/swift-2.22.0
@@ -4,11 +4,11 @@ DESCRIPTION=A highly available, distributed, and eventually consistent object/bl
 EAPI=6
 HOMEPAGE=https://launchpad.net/swift
 IUSE=account container doc +memcached object proxy python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.8.0[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/dnspython-1.14.0:0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.25.0[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/greenlet-0.3.1[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/netifaces-0.8[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/netifaces-0.10.0[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/netifaces-0.10.1[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/pastedeploy-1.3.3[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/six-1.9.0[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/pyxattr[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/PyECLib-1.3.1[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/cryptography-2.0.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(-)] >=dev-python/ipaddress-1.0.16[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(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] 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=|| ( proxy account container object ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.22.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db1dca2619badb06bd6adaee5975f122
+_md5_=880d6b57768e550ff480bb8c441a0b25
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 2d6eb3067bc7..e65609a2a89e 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-r1 b/metadata/md5-cache/sys-devel/autogen-5.18.16-r1
index e9b0c2ce65fe..854a7040ef3f 100644
--- a/metadata/md5-cache/sys-devel/autogen-5.18.16-r1
+++ b/metadata/md5-cache/sys-devel/autogen-5.18.16-r1
@@ -10,4 +10,4 @@ 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	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=697e427bf1330643e2af0f7d0704dd0c
+_md5_=447aa53c55c183ca58029339c8295534
diff --git a/metadata/md5-cache/sys-devel/binutils-2.32-r1 b/metadata/md5-cache/sys-devel/binutils-2.32-r1
index 74a164c2778f..907568db8169 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.32-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.32-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=+cxx default-gold doc +gold multitarget +nls +plugins static-libs test
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 REQUIRED_USE=cxx? ( gold plugins ) default-gold? ( gold )
 SLOT=2.32
 SRC_URI=mirror://gnu/binutils/binutils-2.32.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.32-patches-2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5e4dc65ed418a4d6bffd615350622f2b
+_md5_=116e5cf7b8aacd7f6ff0fb91a8d1f361
diff --git a/metadata/md5-cache/sys-devel/crossdev-20190712 b/metadata/md5-cache/sys-devel/crossdev-20190712
index b729853aad14..a50bf874a98b 100644
--- a/metadata/md5-cache/sys-devel/crossdev-20190712
+++ b/metadata/md5-cache/sys-devel/crossdev-20190712
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Gentoo Cross-toolchain generator
 EAPI=7
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions !sys-devel/crossdev-wrappers
 SLOT=0
 SRC_URI=mirror://gentoo/crossdev-20190712.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20190712.tar.xz
-_md5_=6ca92e9622fb71e75386aeddb7526aa5
+_md5_=4430665b8d8015f0b3d42e939a1b2d71
diff --git a/metadata/md5-cache/sys-devel/crossdev-20190901 b/metadata/md5-cache/sys-devel/crossdev-20190901
new file mode 100644
index 000000000000..4c0f30147ddb
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/crossdev-20190901
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Gentoo Cross-toolchain generator
+EAPI=7
+HOMEPAGE=https://www.gentoo.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions !sys-devel/crossdev-wrappers
+SLOT=0
+SRC_URI=mirror://gentoo/crossdev-20190901.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20190901.tar.xz
+_md5_=6ca92e9622fb71e75386aeddb7526aa5
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r3 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r3
index 1bcec93066d6..c818c725aa06 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r3
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r3
@@ -3,7 +3,7 @@ DEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 amd64? ( >=sys-devel/binutils-2.15.90
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran boundschecking doc hardened multilib objc awt gcj pgo
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl boundschecking doc hardened multilib objc awt gcj pgo
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( virtual/libintl
 RESTRICT=strip
 SLOT=3.3.6
 SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-patches-1.11.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5c1561a4b79055276abdf35669a4bd71
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r4 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r4
index 608d5be46d83..9a6f03f06837 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r4
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r4
@@ -3,7 +3,7 @@ DEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 amd64? ( >=sys-devel/binutils-2.15.90
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran boundschecking doc hardened multilib objc awt gcj pgo
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl boundschecking doc hardened multilib objc awt gcj pgo
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( virtual/libintl
 RESTRICT=strip
 SLOT=3.3.6
 SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-patches-2.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d3abaaaed4f11a7cd6c3d3b9dc97a5ba
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
index e058185d8cf2..9decf85a4c2b 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
@@ -3,7 +3,7 @@ DEPEND=>=sys-devel/binutils-2.14.90.0.8-r1 amd64? ( >=sys-devel/binutils-2.15.90
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran boundschecking d doc hardened multilib objc awt gcj pgo
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl boundschecking d doc hardened multilib objc awt gcj pgo
 KEYWORDS=-* alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4.6
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.6-patches-1.8.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d7dec1766720fc67e21b08bfe6022486
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r3 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r3
index 0573177683ac..b94d406866e7 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r3
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r3
@@ -3,7 +3,7 @@ DEPEND=>=sys-devel/binutils-2.14.90.0.8-r1 amd64? ( >=sys-devel/binutils-2.15.90
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran boundschecking d doc hardened multilib objc awt gcj pgo
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl boundschecking d doc hardened multilib objc awt gcj pgo
 KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4.6
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.6-patches-1.9.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e5fbefd12263f450441111ea1bee9deb
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r4 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r4
index ca2cb96ff8bb..b19bde173458 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r4
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r4
@@ -3,7 +3,7 @@ DEPEND=>=sys-devel/binutils-2.14.90.0.8-r1 amd64? ( >=sys-devel/binutils-2.15.90
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran boundschecking d doc hardened multilib objc awt gcj pgo
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl boundschecking d doc hardened multilib objc awt gcj pgo
 KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4.6
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.6-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.6-patches-2.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f4150cc572b1d95d9540039f847c6bc1
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.0.4-r2
index e77164118e7d..294a5e76fcb2 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.0.4-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.0.4-r2
@@ -3,12 +3,12 @@ DEPEND=>=sys-devel/binutils-2.15.94 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-p
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc mudflap
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= )
 RESTRICT=strip
 SLOT=4.0.4
 SRC_URI=mirror://gnu/gcc/gcc-4.0.4/gcc-4.0.4.tar.bz2 mirror://gentoo/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-patches-1.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1bbc42906ab3aa336b87c98b81b2f622
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2 b/metadata/md5-cache/sys-devel/gcc-4.1.2
index fd3a04b3e49f..a79f8ea77940 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2
@@ -3,7 +3,7 @@ DEPEND=ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran d doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl d doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++
 KEYWORDS=-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.1.2
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.6.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=624ba5f357ebde380fd7dcfcfda8449c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2-r2 b/metadata/md5-cache/sys-devel/gcc-4.1.2-r2
index 3ffda55b3ccb..814d4aca45ef 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2-r2
@@ -3,7 +3,7 @@ DEPEND=ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran d doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl d doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++
 KEYWORDS=-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.1.2
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.8.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b5c86282ca4bd992897e77a91edb424d
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
index 1100951cb5c3..4b390ae34486 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
@@ -3,7 +3,7 @@ DEPEND=ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp
 KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.2.4
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=40eb7f3a89055031f38431809365bc09
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r3 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r3
index ca79a8db4e13..a520debcb5ed 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r3
@@ -3,7 +3,7 @@ DEPEND=ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.2.4
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f4a302b614d5f1af5799ca8f24708cd3
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
index a750d475d96a..9833b4c5e0e1 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
@@ -3,7 +3,7 @@ DEPEND=ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
 KEYWORDS=alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.6
 SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-patches-1.2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=96b4ef1a01a77ed5ac862323a395109e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r3 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r3
index a8d161cc285c..819e4a217b39 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r3
@@ -3,7 +3,7 @@ DEPEND=ppc? ( >=sys-devel/binutils-2.17 ) ppc64? ( >=sys-devel/binutils-2.17 ) >
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
 KEYWORDS=~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.6
 SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-patches-1.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aa0f2e8255b5f001fbcee4662193ecb0
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7 b/metadata/md5-cache/sys-devel/gcc-4.4.7
index dd6894804e9c..5ad35775acfb 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) ppc? ( >=sys-devel/binutils-2.17 )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dceb9c7c83221cc16d1e96976accad5e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7-r2 b/metadata/md5-cache/sys-devel/gcc-4.4.7-r2
index d7f8b2852ead..eff2970993ce 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7-r2
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) ppc? ( >=sys-devel/binutils-2.17 )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-patches-1.5.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=df55d2bdcf1e25d2cc1d9355da13b9e1
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4 b/metadata/md5-cache/sys-devel/gcc-4.5.4
index 8486455882e9..10db08a902a2 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) ppc? ( >=sys-devel/binutils-2.17 )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.5.4
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=571cff20a06f6ff7c1aca3aaa417c068
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.5.4-r2
index 9cccd6b11c95..ec3c6d6b5eec 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4-r2
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) ppc? ( >=sys-devel/binutils-2.17 )
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.5.4
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.5.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=769b7ef7bd7f15680f46348b3ce98b80
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4 b/metadata/md5-cache/sys-devel/gcc-4.6.4
index 515bf9925c82..411301301871 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.18 >=sys-app
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6.4
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0b8362c82ddcd2644cca03e1d286bbaa
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.6.4-r2
index 51940f783a8d..540cbb0e223a 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4-r2
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.18 >=sys-app
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6.4
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.5.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=933cb429614a5207e83597549d87c7e4
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
index 83766fa74728..84e349f68467 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.18 >=sys-app
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran nopie nossp doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point go
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl nopie nossp doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point go
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -amd64-fbsd -x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7.4
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7c4348c5456f94428a7c422251a1f18
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.4-r3 b/metadata/md5-cache/sys-devel/gcc-4.7.4-r3
index fee2b33cf134..d1dffd985d58 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.4-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.4-r3
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.18 >=sys-app
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran nopie nossp doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point go
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl nopie nossp doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point go
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7.4
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.6.tar.bz2 mirror://gentoo/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2212b967cdf0ce79e3a78c70636783fb
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.5-r1 b/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
index 096aef53ed99..cc0945d621fd 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-app
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran nopie nossp doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point go graphite +sanitize
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl nopie nossp doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point go graphite +sanitize
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8.5
 SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5208fe90a7af46207bca10b23ea935ac
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.5-r3 b/metadata/md5-cache/sys-devel/gcc-4.8.5-r3
index 21451d4ffa86..24d9ea902baf 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.5-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.5-r3
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-app
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran nopie nossp doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point go graphite +sanitize
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl nopie nossp doc hardened multilib objc awt gcj pgo objc-gc mudflap libssp objc++ +openmp fixed-point go graphite +sanitize
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8.5
 SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=864c70b56d2c0dd6f54f82d9a5308558
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.4 b/metadata/md5-cache/sys-devel/gcc-4.9.4
index f004e1c7e712..c7d799ab5c92 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.4
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-app
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c051e9cf5eb44aa3fdb596e4e1c7c83
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
index dd0045c0c29a..c22a857051ab 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-app
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bc9ac4fa5bc7919e21e32d9a4e0b59c1
diff --git a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4 b/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
index cd6c0014d7a9..1ddce09fbb9a 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
+++ b/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-app
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.9.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eaa0d13b0e1d57db19fc7011c9befd7b
diff --git a/metadata/md5-cache/sys-devel/gcc-5.4.0-r6 b/metadata/md5-cache/sys-devel/gcc-5.4.0-r6
index e49a494f04ce..a30490911bc2 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0-r6
+++ b/metadata/md5-cache/sys-devel/gcc-5.4.0-r6
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-app
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.11.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b18328c29f63fa1914f57adb1a570d2
diff --git a/metadata/md5-cache/sys-devel/gcc-5.5.0 b/metadata/md5-cache/sys-devel/gcc-5.5.0
index f7d1d43cc086..87f7477b3f73 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-5.5.0
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-app
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl nopie nossp doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=5.5.0
 SRC_URI=mirror://gnu/gcc/gcc-5.5.0/gcc-5.5.0.tar.xz mirror://gentoo/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c725c4af43e3c3b4ebc995d53ba094b7
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0-r1 b/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
index ecb30006ebc9..03f03e86efc6 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-ap
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8c07f4b3f1057325c5297a300d7a3e3
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0-r5 b/metadata/md5-cache/sys-devel/gcc-6.4.0-r5
index 8f95178066a1..a65553433acf 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0-r5
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0-r5
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-ap
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.8.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eab704a174f4f72ee52c10d51288a78f
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
index 9b02c0556733..e39bd4a464d9 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-ap
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=6.5.0
 SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fd8abb938a8bf0cfd3bfa80923684c3b
diff --git a/metadata/md5-cache/sys-devel/gcc-7.3.0-r3 b/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
index 76b328dc413c..0991ef8fbafc 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-ap
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=7.3.0
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8a97475e8d048e3adf03495a5d3719d1
diff --git a/metadata/md5-cache/sys-devel/gcc-7.3.0-r6 b/metadata/md5-cache/sys-devel/gcc-7.3.0-r6
index c9ea61b8ad35..e4d3382c4e12 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.3.0-r6
+++ b/metadata/md5-cache/sys-devel/gcc-7.3.0-r6
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-ap
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=7.3.0
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=09e59f6d7fc4cb431ef19b926a610d1f
diff --git a/metadata/md5-cache/sys-devel/gcc-7.4.0-r1 b/metadata/md5-cache/sys-devel/gcc-7.4.0-r1
index 92a2de487491..b597f1c1b8a0 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.4.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-7.4.0-r1
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-ap
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=7.4.0
 SRC_URI=mirror://gnu/gcc/gcc-7.4.0/gcc-7.4.0.tar.xz mirror://gentoo/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.4.0-patches-1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f82587a71bfd62de6c781a42ebd45304
diff --git a/metadata/md5-cache/sys-devel/gcc-7.4.0-r2 b/metadata/md5-cache/sys-devel/gcc-7.4.0-r2
index 3aaa581e116a..0016279dd0d9 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.4.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-7.4.0-r2
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-ap
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize cilk +vtv jit mpx +pie +ssp +pch
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=7.4.0
 SRC_URI=mirror://gnu/gcc/gcc-7.4.0/gcc-7.4.0.tar.xz mirror://gentoo/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.4.0-patches-1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=50151b6ee0a38b94d7d5e2dfab2aee82
diff --git a/metadata/md5-cache/sys-devel/gcc-8.2.0-r5 b/metadata/md5-cache/sys-devel/gcc-8.2.0-r5
index b832460f376c..ce96b8016c83 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.2.0-r5
+++ b/metadata/md5-cache/sys-devel/gcc-8.2.0-r5
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-ap
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit mpx +pie +ssp +pch systemtap
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit mpx +pie +ssp +pch systemtap
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=8.2.0
 SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.2.0-patches-1.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c1c1937e58c871d2b137b5598896d6f5
diff --git a/metadata/md5-cache/sys-devel/gcc-8.2.0-r6 b/metadata/md5-cache/sys-devel/gcc-8.2.0-r6
index c1a83fc3d524..c9605b59946a 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.2.0-r6
+++ b/metadata/md5-cache/sys-devel/gcc-8.2.0-r6
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-ap
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit mpx +pie +ssp +pch systemtap
+IUSE=regression-test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit mpx +pie +ssp +pch systemtap
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=8.2.0
 SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.2.0-patches-1.7.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8662040db10cce70d663f811a4177f2c
diff --git a/metadata/md5-cache/sys-devel/gcc-8.3.0 b/metadata/md5-cache/sys-devel/gcc-8.3.0
index 56c8aa4c57be..46b10b90385b 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.3.0
+++ b/metadata/md5-cache/sys-devel/gcc-8.3.0
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-ap
 DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit mpx +pie +ssp +pch systemtap
+IUSE=test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit mpx +pie +ssp +pch systemtap
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=8.3.0
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b33fa6966647c15c744a2cdbf29b0c2b
diff --git a/metadata/md5-cache/sys-devel/gcc-8.3.0-r1 b/metadata/md5-cache/sys-devel/gcc-8.3.0-r1
index 8ba89a0de2ed..649910b041a0 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.3.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-8.3.0-r1
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-ap
 DESCRIPTION=The GNU Compiler Collection
 EAPI=6
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit mpx +pie +ssp +pch systemtap
+IUSE=test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit mpx +pie +ssp +pch systemtap
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=8.3.0
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=754cfab0b624c66aa9f8810527da734c
diff --git a/metadata/md5-cache/sys-devel/gcc-9.1.0 b/metadata/md5-cache/sys-devel/gcc-9.1.0
index d56ff8f65342..63964b968908 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.1.0
+++ b/metadata/md5-cache/sys-devel/gcc-9.1.0
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-ap
 DESCRIPTION=The GNU Compiler Collection
 EAPI=6
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit +pie +ssp +pch systemtap d lto
+IUSE=test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit +pie +ssp +pch systemtap d lto
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=9.1.0
 SRC_URI=mirror://gnu/gcc/gcc-9.1.0/gcc-9.1.0.tar.xz mirror://gentoo/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.1.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e5625d994498b125cfa030274fcdc96
diff --git a/metadata/md5-cache/sys-devel/gcc-9.1.0-r1 b/metadata/md5-cache/sys-devel/gcc-9.1.0-r1
index 47ddeb3c21ba..38503c65322a 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.1.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-9.1.0-r1
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-ap
 DESCRIPTION=The GNU Compiler Collection
 EAPI=6
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit +pie +ssp +pch systemtap d lto
+IUSE=test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit +pie +ssp +pch systemtap d lto
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=9.1.0
 SRC_URI=mirror://gnu/gcc/gcc-9.1.0/gcc-9.1.0.tar.xz mirror://gentoo/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.1.0-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=906b707fbad1cd1f08179a66bb2f1a30
diff --git a/metadata/md5-cache/sys-devel/gcc-9.2.0 b/metadata/md5-cache/sys-devel/gcc-9.2.0
index 2e91771f9ab6..4a3fe782887a 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.2.0
+++ b/metadata/md5-cache/sys-devel/gcc-9.2.0
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-ap
 DESCRIPTION=The GNU Compiler Collection
 EAPI=6
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls +nptl altivec debug +cxx +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit +pie +ssp +pch systemtap d lto
+IUSE=test vanilla +nls altivec debug +cxx +fortran +nptl doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go graphite +sanitize +vtv jit +pie +ssp +pch systemtap d lto
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=9.2.0
 SRC_URI=mirror://gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz mirror://gentoo/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.2.0-patches-1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1217d309fb4d2fbb7a10f7975266c9ce
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
index 9ea286bf2410..251080a42072 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
@@ -3,7 +3,7 @@ DEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 DESCRIPTION=Apple branch of the GNU Compiler Collection, Developer Tools 4.0
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org
-IUSE=bootstrap fortran nls +openmp objc objc++ +cxx regression-test vanilla +nls +nptl
+IUSE=bootstrap fortran nls +openmp objc objc++ +cxx regression-test vanilla +nls
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2 GPL-3
 PDEPEND=sys-libs/csu >=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/gcc-apple-4.2.1_p5646-gfortran.patch )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9d045438c8d24fad84c5133405ed383f
diff --git a/metadata/md5-cache/sys-devel/gdb-8.3 b/metadata/md5-cache/sys-devel/gdb-8.3
index 0537a44f4b59..d96cf158663c 100644
--- a/metadata/md5-cache/sys-devel/gdb-8.3
+++ b/metadata/md5-cache/sys-devel/gdb-8.3
@@ -5,7 +5,7 @@ DESCRIPTION=GNU debugger
 EAPI=7
 HOMEPAGE=https://sourceware.org/gdb/
 IUSE=+client lzma multitarget nls +python +server source-highlight test vanilla xml python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
 RDEPEND=server? ( !dev-util/gdbserver ) client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) || ( client server )
@@ -13,4 +13,4 @@ RESTRICT=hppa? ( test ) ia64? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-8.3.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-8.3.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=4a23eee39319152e164e83f8e32e3cc0
+_md5_=cf4aad9ddb644c41504c6b91c46d7c0a
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.1.2 b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
index a94408b229d9..2bd5024f9008 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.1.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
@@ -3,7 +3,7 @@ DEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc-
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=-* hppa ~mips ~s390 sparc
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.1.2
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.0.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4287b0b7f9ce8b6865f6948812501cc8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.2.4 b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
index d4e463cc7287..90e16a3a33ae 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.2.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
@@ -3,7 +3,7 @@ DEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc-
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=-* hppa ~mips ~s390 ~sparc
 LICENSE=GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.2.4
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b6f206f7701d664aa14a87c3585f0ddd
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.3.5 b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
index 8465bc649cd3..9e5d159c6776 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.3.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
@@ -3,7 +3,7 @@ DEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc-
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=-hppa ~mips ~sparc
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.5
 SRC_URI=mirror://gnu/gcc/gcc-4.3.5/gcc-4.3.5.tar.bz2 mirror://gentoo/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.5-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ec6572a5964dbd4fb0e9b408ab1a4906
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.5 b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
index d71e8707f9a1..938d398f35d6 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 hpp
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=hppa sparc
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.bz2 mirror://gentoo/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.5-patches-1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=885ff8764444180b5b9468b039d1d6c7
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.6 b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
index b86c1eec7100..c98925324276 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 hpp
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=hppa ~sparc
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.4.6/gcc-4.4.6.tar.bz2 mirror://gentoo/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.6-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7c248eb43f85d6e92aa0d3da6bb4643e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.3 b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
index 7216c97e608d..b11a2ba5a92e 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=hppa sparc
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5.3
 SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.3-patches-1.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bc38515ddf23da9bea281583fd294e01
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.4 b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
index 88f4dd927c35..0f6a98b7c014 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=hppa ~sparc
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5.4
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=66fb8a6b7789b020c7ec831ff6734136
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.6.4 b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
index c15f8bd4c54b..ad3d0be195bf 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.6.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=hppa ~sparc
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.6.4
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=72222fd69b078160875299e54f945848
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.3 b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
index 23d11f76f9c9..8b6810e49267 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=hppa sparc
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.7.3
 SRC_URI=mirror://gnu/gcc/gcc-4.7.3/gcc-4.7.3.tar.bz2 mirror://gentoo/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-patches-1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e5f7f7adb1120b7069c7bff6460186eb
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.4 b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
index 6f467e048fae..f224169b718d 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=hppa ~mips ~sparc
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.7.4
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f12ff1dddfea91247a92f36600960ad6
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.3 b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
index 9df1ddd21269..fd2dc92f6630 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=hppa ~sparc
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.8.3
 SRC_URI=mirror://gnu/gcc/gcc-4.8.3/gcc-4.8.3.tar.bz2 mirror://gentoo/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.3-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8471dd65776a9de1df31e6ac5983dbd4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.5 b/metadata/md5-cache/sys-devel/kgcc64-4.8.5
index 1b98d6391bd4..fd2d08b150ae 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.5
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=hppa ~sparc
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.8.5
 SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5be437344c8ffaae90c70c4fdd9ddc60
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.9.4 b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
index 2a336d9501da..3b2a6aed2e1e 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.9.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=hppa ~mips
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-5.4.0 b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
index 15a16ea2fce1..f4d8f74d88ed 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-5.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=hppa ~mips
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-6.3.0 b/metadata/md5-cache/sys-devel/kgcc64-6.3.0
index 503b170acb1e..39c01742ad03 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-6.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-6.3.0
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=~hppa ~mips
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=6.3.0
 SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dd30e381df3740b88e76ffa3e5a8933e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-6.4.0 b/metadata/md5-cache/sys-devel/kgcc64-6.4.0
index 69ce50e984b5..c2ad0b93784d 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-6.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-6.4.0
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=hppa ~mips
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-7.2.0 b/metadata/md5-cache/sys-devel/kgcc64-7.2.0
index 3d8126e97c16..1a23805abf38 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-7.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-7.2.0
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=~hppa ~mips
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=7.2.0
 SRC_URI=mirror://gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz mirror://gentoo/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.1.0-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cebaf5a44a3f27a06d34b25f117ec3f4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-7.3.0 b/metadata/md5-cache/sys-devel/kgcc64-7.3.0
index 6aa3a8409eed..f0a7cd5dd856 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-7.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-7.3.0
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=hppa ~mips
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=7.3.0
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7c76e15073553d95a38e1d2cec3e32c4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-8.2.0 b/metadata/md5-cache/sys-devel/kgcc64-8.2.0
index d8da95bbcccb..640ade83b7ce 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-8.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-8.2.0
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla +nls +nptl
+IUSE=regression-test vanilla +nls
 KEYWORDS=~hppa
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=8.2.0
 SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.1.0-patches-1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7692942c28ca16a1a019705350e29088
diff --git a/metadata/md5-cache/sys-devel/kgcc64-8.3.0 b/metadata/md5-cache/sys-devel/kgcc64-8.3.0
index e619353d667a..562bd9164187 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-8.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-8.3.0
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-dev
 DESCRIPTION=64bit kernel compiler
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls +nptl
+IUSE=test vanilla +nls
 KEYWORDS=hppa ~mips
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=8.3.0
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7f85787023afacf25f97077d7f472118
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.1.0 b/metadata/md5-cache/sys-devel/kgcc64-9.1.0
index 4dc2f1820e22..f1e39c3a77ec 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-9.1.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.1.0
@@ -3,7 +3,7 @@ DEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc-
 DESCRIPTION=64bit kernel compiler
 EAPI=6
 HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls +nptl
+IUSE=test vanilla +nls
 KEYWORDS=~hppa ~mips
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=9.1.0
 SRC_URI=mirror://gnu/gcc/gcc-9.1.0/gcc-9.1.0.tar.xz mirror://gentoo/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.1.0-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	76bc5e0c12ab75efe0ab1bab0aad61ff	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5756d668b26576277a3a1e42c7a29bae
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.2.0 b/metadata/md5-cache/sys-devel/kgcc64-9.2.0
new file mode 100644
index 000000000000..d657e6614d23
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.2.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=hppa? ( sys-devel/binutils-hppa64 ) !sys-devel/gcc-hppa64 !sys-devel/gcc-mips64 !sys-devel/gcc-powerpc64 !sys-devel/gcc-sparc64 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DESCRIPTION=64bit kernel compiler
+EAPI=6
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=test vanilla +nls
+KEYWORDS=~hppa ~mips
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
+RESTRICT=strip
+SLOT=9.2.0
+SRC_URI=mirror://gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz mirror://gentoo/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.2.0-patches-1.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=74b7b6deab0a7032e778604278c91faf
diff --git a/metadata/md5-cache/sys-devel/parity-9999 b/metadata/md5-cache/sys-devel/parity-9999
index ee666f3a27cd..e09fc39953b1 100644
--- a/metadata/md5-cache/sys-devel/parity-9999
+++ b/metadata/md5-cache/sys-devel/parity-9999
@@ -3,9 +3,9 @@ DEPEND=dev-util/confix >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.
 DESCRIPTION=A POSIX to native Win32 Cross-Compiler Tool (requires Visual Studio)
 EAPI=6
 HOMEPAGE=https://github.com/haubi/parity
-IUSE=+vc_x86 +vc7_0 +vc7_1 +vc8_0 +vc9_0 +vc10_0 +vc11_0 +vc12_0 +vc14_0 +vc15_0 +vc16_2
+IUSE=+vc_x64 +vc_x86 vc7_0 vc7_1 vc8_0 vc9_0 +vc10_0 +vc11_0 +vc12_0 +vc14_0 +vc15_0 +vc16_2
 LICENSE=LGPL-3
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b7280d447e3af95509b08938eb89ce55
+_md5_=ace1f7aa503ac702901490efec3ac43c
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.6-r3 b/metadata/md5-cache/sys-devel/patch-2.7.6-r3
deleted file mode 100644
index 1844124b3c71..000000000000
--- a/metadata/md5-cache/sys-devel/patch-2.7.6-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=xattr? ( sys-apps/attr ) test? ( sys-apps/ed )
-DESCRIPTION=Utility to apply diffs to files
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/patch/patch.html
-IUSE=static test xattr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+
-RDEPEND=xattr? ( sys-apps/attr )
-SLOT=0
-SRC_URI=mirror://gnu/patch/patch-2.7.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=18a3769a569eb9dd20fb71541e322829
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.6-r4 b/metadata/md5-cache/sys-devel/patch-2.7.6-r4
index 8bf9dd2bd495..98c62a87ac23 100644
--- a/metadata/md5-cache/sys-devel/patch-2.7.6-r4
+++ b/metadata/md5-cache/sys-devel/patch-2.7.6-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Utility to apply diffs to files
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/patch/patch.html
 IUSE=static test xattr
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=mirror://gnu/patch/patch-2.7.6.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c5713845539c9cf551d6bbbe5d29dcb5
+_md5_=b8f479d5e1596a20110844e8a11434ef
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index ef13cfd156cc..c9432262cb0e 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/edk2-ovmf-2017_p20180211 b/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_p20180211
deleted file mode 100644
index 8fa5621a2bbd..000000000000
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-2017_p20180211
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=!binary? ( amd64? ( >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) )
-DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
-EAPI=6
-HOMEPAGE=https://github.com/tianocore/edk2
-IUSE=+binary
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
-LICENSE=BSD-2 MIT
-REQUIRED_USE=!amd64? ( binary )
-SLOT=0
-SRC_URI=binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_p20180211-bin.tar.xz ) !binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-2017_p20180211.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4da2cc7f6056c3fd80cf5d4a3062ada4
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-201905 b/metadata/md5-cache/sys-firmware/edk2-ovmf-201905
index bf91e9af08a2..22d5f84a1764 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-201905
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-201905
@@ -4,10 +4,10 @@ DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
 EAPI=7
 HOMEPAGE=https://github.com/tianocore/edk2
 IUSE=+binary
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=BSD-2 MIT
 REQUIRED_USE=!amd64? ( binary )
 SLOT=0
 SRC_URI=!binary? ( https://github.com/tianocore/edk2/archive/edk2-stable201905.tar.gz -> edk2-ovmf-201905.tar.gz https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-201905-bundled.tar.xz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-201905-bin.tar.xz )
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=782d207f6a615a045754df8595591ede
+_md5_=ac8299e22c9761ad14bf8abea8a6d4eb
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190722 b/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190722
deleted file mode 100644
index 843b10d89f28..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190722
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
-DEPEND=sys-apps/iucode_tool
-DESCRIPTION=Intel IA32/IA64 microcode update data
-EAPI=6
-HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
-IUSE=hostonly initramfs +split-ucode vanilla kernel_linux
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=|| ( initramfs split-ucode )
-RESTRICT=binchecks bindist mirror strip
-SLOT=0
-SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20190618.tar.gz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20190722.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	mount-boot	0ed73d6bc7399be07e136b5dc46709d9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c0177ee4ed4324001311edc0f8cd7300
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190819 b/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190819
new file mode 100644
index 000000000000..7fe588c9ddd6
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190819
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
+DEPEND=sys-apps/iucode_tool
+DESCRIPTION=Intel IA32/IA64 microcode update data
+EAPI=6
+HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
+IUSE=hostonly initramfs +split-ucode vanilla kernel_linux
+KEYWORDS=-* amd64 x86
+LICENSE=intel-ucode
+RDEPEND=hostonly? ( sys-apps/iucode_tool )
+REQUIRED_USE=|| ( initramfs split-ucode )
+RESTRICT=binchecks bindist mirror strip
+SLOT=0
+SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20190618.tar.gz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20190819.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	mount-boot	0ed73d6bc7399be07e136b5dc46709d9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c0177ee4ed4324001311edc0f8cd7300
diff --git a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728 b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
index beec89eac4b4..d53020ff31e5 100644
--- a/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
+++ b/metadata/md5-cache/sys-firmware/ipxe-1.0.0_p20190728
@@ -4,10 +4,10 @@ DESCRIPTION=Open source network boot (PXE) firmware
 EAPI=6
 HOMEPAGE=http://ipxe.org/
 IUSE=+binary efi ipv6 iso lkrn +qemu undi usb vmware savedconfig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
 REQUIRED_USE=!amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://git.ipxe.org/ipxe.git/snapshot/a4f8c6e31f6c62522cfc633bbbffa81b22f9d6f3.tar.bz2 -> ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20190728-a4f8c6e-bin.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	0c38912e9b32aef6433a71726675b4b1	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9ee6f141dfe94d05daa6c99cb2d9a30d
+_md5_=434109d277ea576b9a5c1ea2ba8d73ff
diff --git a/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15 b/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15
index d6639a45f799..f1da3253fe70 100644
--- a/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15
+++ b/metadata/md5-cache/sys-firmware/nvidia-firmware-325.15
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install unpack
-DEPEND==dev-lang/python-2*
+DEFINED_PHASES=compile install setup unpack
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 )
 DESCRIPTION=Kernel and mesa firmware for nouveau (video accel and pgraph)
 EAPI=5
 HOMEPAGE=https://nouveau.freedesktop.org/wiki/VideoAcceleration/
@@ -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	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=92df02691f7a26f65f8b05680698975c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4687bca05f5ccc132c83097722697871
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.12.0 b/metadata/md5-cache/sys-firmware/seabios-1.12.0
index efa9b599024f..3dcefeb7da62 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.12.0
+++ b/metadata/md5-cache/sys-firmware/seabios-1.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
 EAPI=7
 HOMEPAGE=https://www.seabios.org/
 IUSE=+binary debug +seavgabios
-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=LGPL-3 GPL-3
 REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.12.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.12.0-bin.tar.xz )
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=80e4e677503c143c1974989e54c890f8
+_md5_=4b1d6c2c31cd78d6bf0243e234f3e936
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 188c81a348e3..5af180521db4 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/avfs-1.0.4 b/metadata/md5-cache/sys-fs/avfs-1.0.4
deleted file mode 100644
index b245f35b5f39..000000000000
--- a/metadata/md5-cache/sys-fs/avfs-1.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=sys-fs/fuse-2.4:0 sys-libs/zlib app-arch/bzip2 lzma? ( app-arch/xz-utils ) virtual/pkgconfig
-DESCRIPTION=AVFS is a virtual filesystem that allows browsing of compressed files
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/avf
-IUSE=static-libs +lzma
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=sys-fs/fuse-2.4:0 sys-libs/zlib app-arch/bzip2 lzma? ( app-arch/xz-utils )
-SLOT=0
-SRC_URI=mirror://sourceforge/avf/avfs-1.0.4.tar.bz2
-_eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=644210805340de0551695ea27686be03
diff --git a/metadata/md5-cache/sys-fs/avfs-1.0.5 b/metadata/md5-cache/sys-fs/avfs-1.0.5
deleted file mode 100644
index 9e683b6132b6..000000000000
--- a/metadata/md5-cache/sys-fs/avfs-1.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=sys-fs/fuse-2.4:0 sys-libs/zlib app-arch/bzip2 lzma? ( app-arch/xz-utils ) virtual/pkgconfig
-DESCRIPTION=AVFS is a virtual filesystem that allows browsing of compressed files
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/avf
-IUSE=static-libs +lzma
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-fs/fuse-2.4:0 sys-libs/zlib app-arch/bzip2 lzma? ( app-arch/xz-utils )
-SLOT=0
-SRC_URI=mirror://sourceforge/avf/avfs-1.0.5.tar.bz2
-_eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3172b9bc6b9319beded2a78baf3d8711
diff --git a/metadata/md5-cache/sys-fs/avfs-1.1.1 b/metadata/md5-cache/sys-fs/avfs-1.1.1
new file mode 100644
index 000000000000..f49a20ccaac4
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/avfs-1.1.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=>=sys-fs/fuse-2.4:0 sys-libs/zlib app-arch/bzip2 lzma? ( app-arch/xz-utils )
+DESCRIPTION=AVFS is a virtual filesystem that allows browsing of compressed files
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/avf
+IUSE=static-libs +lzma
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-fs/fuse-2.4:0 sys-libs/zlib app-arch/bzip2 lzma? ( app-arch/xz-utils )
+SLOT=0
+SRC_URI=mirror://sourceforge/avf/avfs-1.1.1.tar.bz2
+_md5_=cbe75062204d3e7e6be35c78ea46ad4f
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.2 b/metadata/md5-cache/sys-fs/btrfs-progs-5.2
deleted file mode 100644
index 19dc2a49368a..000000000000
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) python? ( dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
-DESCRIPTION=Btrfs filesystem utilities
-EAPI=7
-HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert doc python reiserfs static static-libs +zstd python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) zstd? ( app-arch/zstd:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
-RESTRICT=test
-SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.2.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=da2dc41db1bdaa4d44405c7e57da950e
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.2.2 b/metadata/md5-cache/sys-fs/btrfs-progs-5.2.2
new file mode 100644
index 000000000000..4bde1335fbd0
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.2.2
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) python? ( dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
+DESCRIPTION=Btrfs filesystem utilities
+EAPI=7
+HOMEPAGE=https://btrfs.wiki.kernel.org
+IUSE=+convert doc python reiserfs static static-libs +zstd python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) zstd? ( app-arch/zstd:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+RESTRICT=test
+SLOT=0/0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.2.2.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=da2dc41db1bdaa4d44405c7e57da950e
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.2.0 b/metadata/md5-cache/sys-fs/cryptsetup-2.2.0
index 92db090d3a38..8e402531c534 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.2.0
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.2.0
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare pretend setup test
-DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) )
+DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) )
 DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=7
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
-IUSE=gcrypt kernel libressl nettle +openssl +argon2 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom kernel_linux
+IUSE=gcrypt kernel nettle +openssl +argon2 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev )
-REQUIRED_USE=^^ ( gcrypt kernel libressl nettle openssl ) static? ( !gcrypt )
+RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev )
+REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) libressl? ( openssl ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=mirror://kernel/linux/utils/cryptsetup/v2.2/cryptsetup-2.2.0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=18c406a483c478144409890d514b4f02
+_md5_=121e54b0811c52f92fef0570da5aea7f
diff --git a/metadata/md5-cache/sys-fs/fuse-3.6.2 b/metadata/md5-cache/sys-fs/fuse-3.6.2
index b0f568ca15dc..325a153d5d76 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.6.2
+++ b/metadata/md5-cache/sys-fs/fuse-3.6.2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.6.2/fuse-3.6.2.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=dbcaaf79c5655797269a1b35ac781f39
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 63bfc8923f1f..2b36be880895 100644
--- a/metadata/md5-cache/sys-fs/fuse-common-3.2.6
+++ b/metadata/md5-cache/sys-fs/fuse-common-3.2.6
@@ -9,5 +9,5 @@ RDEPEND=!<sys-fs/fuse-2.9.7-r1:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.6/fuse-3.2.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ebd559c3cc72f46e699cf47a1dfeb0aa
diff --git a/metadata/md5-cache/sys-fs/hfsplusutils-1.0.4-r1 b/metadata/md5-cache/sys-fs/hfsplusutils-1.0.4-r1
deleted file mode 100644
index e2acc3b75ce4..000000000000
--- a/metadata/md5-cache/sys-fs/hfsplusutils-1.0.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-arch/bzip2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=HFS+ Filesystem Access Utilities (a PPC filesystem)
-EAPI=5
-HOMEPAGE=http://penguinppc.org/historical/hfsplus/
-IUSE=static-libs
-KEYWORDS=ppc ppc64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://penguinppc.org/historical/hfsplus/hfsplus_1.0.4.src.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b34c111121e4b7362b68484cf52a627f
diff --git a/metadata/md5-cache/sys-fs/hfsplusutils-1.0.4-r2 b/metadata/md5-cache/sys-fs/hfsplusutils-1.0.4-r2
new file mode 100644
index 000000000000..3103126822c7
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/hfsplusutils-1.0.4-r2
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=HFS+ Filesystem Access Utilities (a PPC filesystem)
+EAPI=7
+HOMEPAGE=http://penguinppc.org/historical/hfsplus/
+IUSE=static-libs
+KEYWORDS=~amd64 ppc ppc64 x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://penguinppc.org/historical/hfsplus/hfsplus_1.0.4.src.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=45dd1f5d8ec21b5b93a30e06bf82a152
diff --git a/metadata/md5-cache/sys-fs/pytagsfs-0.9.2 b/metadata/md5-cache/sys-fs/pytagsfs-0.9.2
deleted file mode 100644
index 65a3f92c149a..000000000000
--- a/metadata/md5-cache/sys-fs/pytagsfs-0.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/fuse-python-0.2-r1 >=dev-python/sclapp-0.5.2 || ( dev-python/inotifyx ( dev-libs/libgamin[python] app-admin/gam-server ) ) media-libs/mutagen dev-libs/libxml2[python] dev-libs/libxslt app-text/docbook-xsl-stylesheets test? ( dev-python/inotifyx dev-libs/libgamin[python] app-admin/gam-server media-sound/madplay media-sound/vorbis-tools media-libs/flac ) python_targets_python2_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=File system that arranges media files based their tags
-EAPI=5
-HOMEPAGE=https://launchpad.net/pytagsfs
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/fuse-python-0.2-r1 >=dev-python/sclapp-0.5.2 || ( dev-python/inotifyx ( dev-libs/libgamin[python] app-admin/gam-server ) ) media-libs/mutagen python_targets_python2_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://www.alittletooquiet.net/media/release/pytagsfs-0.9.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de7b23c2d40ef669e5acf8f5deefda02
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p11 b/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p11
deleted file mode 100644
index b06b00e760b3..000000000000
--- a/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!static? ( sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) zstd? ( app-arch/zstd ) ) static? ( sys-libs/zlib[static-libs(+)] !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) lz4? ( app-arch/lz4[static-libs(+)] ) lzma? ( app-arch/xz-utils[static-libs(+)] ) lzo? ( dev-libs/lzo[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xz? ( app-arch/xz-utils[static-libs(+)] ) zstd? ( app-arch/zstd[static-libs(+)] ) )
-DESCRIPTION=tools to create and extract Squashfs filesystems
-EAPI=7
-HOMEPAGE=http://squashfs.sourceforge.net
-IUSE=debug lz4 lzma lzo static xattr +xz zstd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!static? ( sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) zstd? ( app-arch/zstd ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/squashfs/squashfs4.3.tar.gz mirror://debian/pool/main/s/squashfs-tools/squashfs-tools_4.3-11.debian.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0063e9b239d2dd1ff8c63a5e7fcaf175
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p11-r1 b/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p11-r1
deleted file mode 100644
index 39260aab19e0..000000000000
--- a/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p11-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!static? ( sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) zstd? ( app-arch/zstd ) ) static? ( sys-libs/zlib[static-libs(+)] !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) lz4? ( app-arch/lz4[static-libs(+)] ) lzma? ( app-arch/xz-utils[static-libs(+)] ) lzo? ( dev-libs/lzo[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xz? ( app-arch/xz-utils[static-libs(+)] ) zstd? ( app-arch/zstd[static-libs(+)] ) )
-DESCRIPTION=tools to create and extract Squashfs filesystems
-EAPI=7
-HOMEPAGE=http://squashfs.sourceforge.net
-IUSE=debug lz4 lzma lzo static xattr +xz zstd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!static? ( sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) zstd? ( app-arch/zstd ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/squashfs/squashfs4.3.tar.gz mirror://debian/pool/main/s/squashfs-tools/squashfs-tools_4.3-11.debian.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9387bf0d4f6ba411cdfaebf5f4312d68
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p7 b/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p7
index 9be9d1e92c24..6d7acdb93b92 100644
--- a/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p7
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p7
@@ -4,10 +4,10 @@ DESCRIPTION=tools to create and extract Squashfs filesystems
 EAPI=7
 HOMEPAGE=http://squashfs.sourceforge.net
 IUSE=debug lz4 lzma lzo static xattr +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
 LICENSE=GPL-2
 RDEPEND=!static? ( sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/squashfs/squashfs4.3.tar.gz mirror://debian/pool/main/s/squashfs-tools/squashfs-tools_4.3-7.debian.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b9e6572f046f4da9b36579e7ee3bfe35
+_md5_=ae7731cd7ad55911da77d48afdf16f00
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-4.4 b/metadata/md5-cache/sys-fs/squashfs-tools-4.4
new file mode 100644
index 000000000000..65e9c93e0e96
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=!static? ( sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) zstd? ( app-arch/zstd ) ) static? ( sys-libs/zlib[static-libs(+)] !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) lz4? ( app-arch/lz4[static-libs(+)] ) lzma? ( app-arch/xz-utils[static-libs(+)] ) lzo? ( dev-libs/lzo[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xz? ( app-arch/xz-utils[static-libs(+)] ) zstd? ( app-arch/zstd[static-libs(+)] ) )
+DESCRIPTION=tools to create and extract Squashfs filesystems
+EAPI=7
+HOMEPAGE=https://github.com/plougher/squashfs-tools
+IUSE=debug lz4 lzma lzo static xattr +xz zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!static? ( sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) zstd? ( app-arch/zstd ) )
+SLOT=0
+SRC_URI=https://github.com/plougher/squashfs-tools/archive/4.4.tar.gz -> squashfs-tools-4.4.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=dee6c7683ffb31024191dcb89615392b
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-ng-0.6.1 b/metadata/md5-cache/sys-fs/squashfs-tools-ng-0.6.1
new file mode 100644
index 000000000000..e70ee4411df4
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-ng-0.6.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:= ) xz? ( app-arch/xz-utils:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=A new set of tools for working with SquashFS images
+EAPI=7
+HOMEPAGE=https://github.com/AgentD/squashfs-tools-ng
+IUSE=lz4 lzo selinux +xz zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:= ) xz? ( app-arch/xz-utils:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
+SLOT=0
+SRC_URI=https://infraroot.at/pub/squashfs/squashfs-tools-ng-0.6.1.tar.xz
+_md5_=cb1b2b316cad518a7364243d423f99f9
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-ng-9999 b/metadata/md5-cache/sys-fs/squashfs-tools-ng-9999
index d112af848ff2..05c7e8238475 100644
--- a/metadata/md5-cache/sys-fs/squashfs-tools-ng-9999
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-ng-9999
@@ -1,14 +1,13 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare unpack
-DEPEND=lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:= ) xz? ( app-arch/xz-utils:= ) selinux? ( sys-libs/libselinux:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
+DEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:= ) xz? ( app-arch/xz-utils:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=A new set of tools for working with SquashFS images
 EAPI=7
 HOMEPAGE=https://github.com/AgentD/squashfs-tools-ng
-IUSE=lz4 lzo selinux +xz +zlib zstd
+IUSE=lz4 lzo selinux +xz zstd
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:= ) xz? ( app-arch/xz-utils:= ) selinux? ( sys-libs/libselinux:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
-REQUIRED_USE=|| ( lz4 lzo xz zlib zstd )
+RDEPEND=sys-libs/zlib:= lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:= ) xz? ( app-arch/xz-utils:= ) selinux? ( sys-libs/libselinux:= ) zstd? ( app-arch/zstd:= )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8a26ba4e1f9613ea868abb1c582edca3
+_md5_=cb1b2b316cad518a7364243d423f99f9
diff --git a/metadata/md5-cache/sys-fs/udev-236-r1 b/metadata/md5-cache/sys-fs/udev-236-r1
index fa82a17b9ed4..662992dc24df 100644
--- a/metadata/md5-cache/sys-fs/udev-236-r1
+++ b/metadata/md5-cache/sys-fs/udev-236-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6eea47095a9ad21cbe4bb47772b56341
diff --git a/metadata/md5-cache/sys-fs/udev-238 b/metadata/md5-cache/sys-fs/udev-238
index 2b54f37d105e..ce41733238c1 100644
--- a/metadata/md5-cache/sys-fs/udev-238
+++ b/metadata/md5-cache/sys-fs/udev-238
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v238.tar.gz -> systemd-238.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=201c5d4a368afcb2f2077f0e27f64436
diff --git a/metadata/md5-cache/sys-fs/udev-239 b/metadata/md5-cache/sys-fs/udev-239
index 993fe9cbf42b..22e6849956a7 100644
--- a/metadata/md5-cache/sys-fs/udev-239
+++ b/metadata/md5-cache/sys-fs/udev-239
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v239.tar.gz -> systemd-239.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=39c678835d41c8dc36f9d5284cc73f01
diff --git a/metadata/md5-cache/sys-fs/udev-240-r2 b/metadata/md5-cache/sys-fs/udev-240-r2
index 15dc2c4b922d..46f4a8b43b9a 100644
--- a/metadata/md5-cache/sys-fs/udev-240-r2
+++ b/metadata/md5-cache/sys-fs/udev-240-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v240.tar.gz -> systemd-240.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-240-patches-1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=e5731b746f2a3b1b47cddbcecb7bd3f2
diff --git a/metadata/md5-cache/sys-fs/udev-240-r3 b/metadata/md5-cache/sys-fs/udev-240-r3
index 49df4f7cf601..3a7dcb7c0bcc 100644
--- a/metadata/md5-cache/sys-fs/udev-240-r3
+++ b/metadata/md5-cache/sys-fs/udev-240-r3
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v240.tar.gz -> systemd-240.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-240-patches-3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=2f52045509fd6779fe7919e381c091d0
diff --git a/metadata/md5-cache/sys-fs/udev-241 b/metadata/md5-cache/sys-fs/udev-241
index 0a919b84d186..53ee3e364614 100644
--- a/metadata/md5-cache/sys-fs/udev-241
+++ b/metadata/md5-cache/sys-fs/udev-241
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v241/systemd-241.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=410f6d5a3c70bf164b4853a929029a2c
diff --git a/metadata/md5-cache/sys-fs/udev-241_rc1 b/metadata/md5-cache/sys-fs/udev-241_rc1
index b5f0e7bc9dea..7a5a5d10482d 100644
--- a/metadata/md5-cache/sys-fs/udev-241_rc1
+++ b/metadata/md5-cache/sys-fs/udev-241_rc1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v241-rc1/systemd-241-rc1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=169b46a589ce099f9feb900c2f711dab
diff --git a/metadata/md5-cache/sys-fs/udev-241_rc2 b/metadata/md5-cache/sys-fs/udev-241_rc2
index 64dc029a5714..8c9a386da64a 100644
--- a/metadata/md5-cache/sys-fs/udev-241_rc2
+++ b/metadata/md5-cache/sys-fs/udev-241_rc2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v241-rc2/systemd-241-rc2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=169b46a589ce099f9feb900c2f711dab
diff --git a/metadata/md5-cache/sys-fs/udev-242 b/metadata/md5-cache/sys-fs/udev-242
index ddcc40cdcb3e..a3a5d176dd2b 100644
--- a/metadata/md5-cache/sys-fs/udev-242
+++ b/metadata/md5-cache/sys-fs/udev-242
@@ -4,12 +4,12 @@ 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !<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/v242/systemd-242.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=08bd857407531718cbc0ae7866da78cc
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=7ed7ef7a868817c07c0f59b15035f745
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 1693b7b5fd04..0c872a1c9707 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
 _md5_=e5127e9aed7b1ff1256c81c1058e143a
diff --git a/metadata/md5-cache/sys-fs/udev-init-scripts-32 b/metadata/md5-cache/sys-fs/udev-init-scripts-32
deleted file mode 100644
index ef7d8f3f19f3..000000000000
--- a/metadata/md5-cache/sys-fs/udev-init-scripts-32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=udev startup scripts for openrc
-EAPI=6
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/udev-217 !<sys-apps/openrc-0.14
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~williamh/dist/udev-init-scripts-32.tar.gz
-_md5_=f11ffab221b18d1717008dc163394742
diff --git a/metadata/md5-cache/sys-fs/udev-init-scripts-33 b/metadata/md5-cache/sys-fs/udev-init-scripts-33
index 244914406679..e777503c9c7d 100644
--- a/metadata/md5-cache/sys-fs/udev-init-scripts-33
+++ b/metadata/md5-cache/sys-fs/udev-init-scripts-33
@@ -1,4 +1,4 @@
-DEFINED_PHASES=postinst
+DEFINED_PHASES=install postinst
 DESCRIPTION=udev startup scripts for openrc
 EAPI=7
 HOMEPAGE=https://www.gentoo.org
@@ -8,4 +8,4 @@ RDEPEND=>=virtual/udev-217 !<sys-apps/openrc-0.14
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/snapshot/udev-gentoo-scripts-33.tar.gz -> udev-init-scripts-33.tar.gz
-_md5_=fc6ad197cad6a914f9977d9eb7ef5a4a
+_md5_=8c849ec95e0f72be4945db2fa14a2c0a
diff --git a/metadata/md5-cache/sys-fs/udev-init-scripts-9999 b/metadata/md5-cache/sys-fs/udev-init-scripts-9999
index 12cec1bc436c..fd6fc5e9d4f5 100644
--- a/metadata/md5-cache/sys-fs/udev-init-scripts-9999
+++ b/metadata/md5-cache/sys-fs/udev-init-scripts-9999
@@ -1,5 +1,5 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=postinst unpack
+DEFINED_PHASES=install postinst unpack
 DESCRIPTION=udev startup scripts for openrc
 EAPI=7
 HOMEPAGE=https://www.gentoo.org
@@ -9,4 +9,4 @@ RDEPEND=>=virtual/udev-217 !<sys-apps/openrc-0.14
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1
-_md5_=342f5ef300eccca3b740e2cfc2454b1d
+_md5_=62e155a655a1ddf95e650427a726cb05
diff --git a/metadata/md5-cache/sys-fs/vhba-20190827 b/metadata/md5-cache/sys-fs/vhba-20190827
new file mode 100644
index 000000000000..e69e3fc1f1ac
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/vhba-20190827
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=virtual/udev virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
+EAPI=7
+HOMEPAGE=http://cdemu.org
+IUSE=kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=virtual/udev kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=mirror://sourceforge/cdemu/vhba-module-20190827.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=93bf9a95c3ee24cb98eeb154c9ff0efc
diff --git a/metadata/md5-cache/sys-fs/vhba-20190831 b/metadata/md5-cache/sys-fs/vhba-20190831
new file mode 100644
index 000000000000..b98d1ca33dbb
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/vhba-20190831
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=virtual/udev virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
+EAPI=7
+HOMEPAGE=https://cdemu.sourceforge.io
+IUSE=kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=virtual/udev kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://download.sourceforge.net/cdemu/vhba-module/vhba-module-20190831.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=cf4e8639229d913099dff7d5657a3134
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-5.0.0 b/metadata/md5-cache/sys-fs/xfsprogs-5.0.0
deleted file mode 100644
index 3c766b08b82b..000000000000
--- a/metadata/md5-cache/sys-fs/xfsprogs-5.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !<sys-fs/xfsdump-3 nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=xfs filesystem utilities
-EAPI=6
-HOMEPAGE=https://xfs.wiki.kernel.org/
-IUSE=icu libedit nls readline static-libs split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !<sys-fs/xfsdump-3
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.0.0.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=350a49fbc7f0d449c3d9ea3c59ef0018
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-5.2.0 b/metadata/md5-cache/sys-fs/xfsprogs-5.2.0
new file mode 100644
index 000000000000..c0a6be44635c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/xfsprogs-5.2.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !<sys-fs/xfsdump-3
+DESCRIPTION=xfs filesystem utilities
+EAPI=7
+HOMEPAGE=https://xfs.wiki.kernel.org/
+IUSE=icu libedit nls readline
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !<sys-fs/xfsdump-3
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.2.0.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c32893393147a87f84045db1a268c279
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-5.2.1 b/metadata/md5-cache/sys-fs/xfsprogs-5.2.1
new file mode 100644
index 000000000000..02579cab9d57
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/xfsprogs-5.2.1
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !<sys-fs/xfsdump-3
+DESCRIPTION=xfs filesystem utilities
+EAPI=7
+HOMEPAGE=https://xfs.wiki.kernel.org/
+IUSE=icu libedit nls readline
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) !readline? ( libedit? ( dev-libs/libedit ) ) !<sys-fs/xfsdump-3
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.2.1.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=81f28863d8bcce597b87a174ab99dff9
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 88004e976546..cec4c94e5689 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=ebc6809dcef560f551d5aad5f6a440f6
+_md5_=12910bf639dfb08ce47f9764acef6a58
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 799e565aed93..18ea1693a044 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.127 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.127
index 14e0b2cf0ab9..08d8839ee2c7 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.127
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.127
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.127
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-135.base.tar.xz mirror://gentoo/genpatches-4.14-135.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-135.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fb6a3a7acbbcbbe6a7f2b133bfd491eb
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.128 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.128
index 42a0baf4effe..427e317de9c5 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.128
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.128
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.128
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-136.base.tar.xz mirror://gentoo/genpatches-4.14-136.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-136.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ab48383a58d7c159de7781a7782a111b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.129 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.129
index 33469ae73ffe..343a067e41b0 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.129
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.129
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.129
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-137.base.tar.xz mirror://gentoo/genpatches-4.14-137.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-137.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e469d4f720a05d24cc5c2bab04389286
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.130 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.130
index 414182cc093f..59bfc9f2ce57 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.130
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.130
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.130
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-138.base.tar.xz mirror://gentoo/genpatches-4.14-138.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-138.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=add1bb89743d30ff5908a0d00f43da42
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.131 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.131
index 4f1456de290e..8b8a4d6d8308 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.131
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.131
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.131
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-139.base.tar.xz mirror://gentoo/genpatches-4.14-139.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-139.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=64252493921f25569c3d2bbf7b07dee2
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.132 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.132
index 3b0a4647f047..6bccddb7f000 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.132
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.132
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.132
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-141.base.tar.xz mirror://gentoo/genpatches-4.14-141.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-141.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b8f3a73c35133e7149a0b85be56b262b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.133 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.133
index 992255a9c09a..ca3bd33d1ed8 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.133
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.133
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.133
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.73+_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-142.base.tar.xz mirror://gentoo/genpatches-4.14-142.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-142.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=702534f5d3d9a63bef86957b71a00167
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.52 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.52
index deae24ee2fcd..dd112389b617 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.52
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.52
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.52
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.17+_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-53.base.tar.xz mirror://gentoo/genpatches-4.19-53.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-53.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=44242a0816e310d0b9a0cea9e2ee651c
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.53 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.53
index aaabb5bb6106..fa3be26836c3 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.53
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.53
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.53
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.17+_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-54.base.tar.xz mirror://gentoo/genpatches-4.19-54.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-54.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=25a2f033d8183c2c9c3c2257794244df
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.55 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.55
index fabc0415dac5..48fc7c5aac5c 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.55
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.55
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.55
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.17+_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-55.base.tar.xz mirror://gentoo/genpatches-4.19-55.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-55.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8acd03791906233db43d5d82426abbb5
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.56 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.56
index aed50ee8c2a3..0dcbde95407f 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.56
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.56
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.56
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.17+_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-56.base.tar.xz mirror://gentoo/genpatches-4.19-56.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-56.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a79c0c650801081d03882d8b2d73df08
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.57 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.57
index 7ce49c7531b4..3c4e9fcadab6 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.57
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.57
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.57
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.17+_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-57.base.tar.xz mirror://gentoo/genpatches-4.19-57.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-57.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fc58030b8d7bc024dce1b8400002a9ed
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.58 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.58
index cd66c507d2fa..bd34ee72659c 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.58
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.58
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.58
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.17+_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-58.base.tar.xz mirror://gentoo/genpatches-4.19-58.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-58.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=478c7010cc20b35320c39d67787303aa
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.59 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.59
index e69b8d67313d..a8293c2eddf7 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.59
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.59
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.59
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19.17+_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-59.base.tar.xz mirror://gentoo/genpatches-4.19-59.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-59.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f440045de18d19823d5d3874ba95f7e5
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.1.11 b/metadata/md5-cache/sys-kernel/aufs-sources-5.1.11
index 033dd0d064b0..ab57e5db28a8 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.1.11
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.1.11
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1.11
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.1_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-5.1-12.base.tar.xz mirror://gentoo/genpatches-5.1-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.1-12.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3db32e55ee9dbed84642cdb8e855fd7d
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.1.12 b/metadata/md5-cache/sys-kernel/aufs-sources-5.1.12
index 490f0d5b4842..a5fbf20ddba5 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.1.12
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.1.12
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1.12
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.1_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-5.1-13.base.tar.xz mirror://gentoo/genpatches-5.1-13.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.1-13.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ce35641368fe15140ddd846b1a9abc33
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.1.14 b/metadata/md5-cache/sys-kernel/aufs-sources-5.1.14
index c67805e64437..f97a2a3d2ceb 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.1.14
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.1.14
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1.14
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.1_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-5.1-14.base.tar.xz mirror://gentoo/genpatches-5.1-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.1-14.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d46ffde3549f24a58d491debdbb7e671
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.1.15 b/metadata/md5-cache/sys-kernel/aufs-sources-5.1.15
index 60525d381a5f..a53ff9b6138a 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.1.15
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.1.15
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1.15
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.1_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-5.1-15.base.tar.xz mirror://gentoo/genpatches-5.1-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.1-15.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=937749b3d295b44da0decaebcacd6926
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.1.16 b/metadata/md5-cache/sys-kernel/aufs-sources-5.1.16
index ab5980e34b17..2a1da4b48df3 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.1.16
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.1.16
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1.16
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.1_p20190610.tar.xz !vanilla? ( mirror://gentoo/genpatches-5.1-16.base.tar.xz mirror://gentoo/genpatches-5.1-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.1-16.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd3ab59efa9cd376ca1acbef6a36da66
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.1.17 b/metadata/md5-cache/sys-kernel/aufs-sources-5.1.17
index 647edcedcccf..208d5fdc1a65 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.1.17
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.1.17
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1.17
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.1_p20190715.tar.xz !vanilla? ( mirror://gentoo/genpatches-5.1-17.base.tar.xz mirror://gentoo/genpatches-5.1-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.1-17.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7361e6549ffaf023cf55150b1b14d401
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.1.18 b/metadata/md5-cache/sys-kernel/aufs-sources-5.1.18
index ac7ffa26722e..593856451b49 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.1.18
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.1.18
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1.18
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.1_p20190715.tar.xz !vanilla? ( mirror://gentoo/genpatches-5.1-18.base.tar.xz mirror://gentoo/genpatches-5.1-18.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.1-18.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=50cbefbe9e643957ea60f6b7a5dea1d8
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.0 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.0
index b72b50b7a1da..de21e7116a89 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.0
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.0
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.0
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2_p20190715.tar.xz !vanilla? ( mirror://gentoo/genpatches-5.2-1.base.tar.xz mirror://gentoo/genpatches-5.2-1.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.2-1.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fb8c5d835ca318a2a958144185fe66d4
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.1 b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.1
index f15c9913ebe4..9a5dedef6a1d 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-5.2.1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-5.2.1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.1
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-5.2_p20190715.tar.xz !vanilla? ( mirror://gentoo/genpatches-5.2-2.base.tar.xz mirror://gentoo/genpatches-5.2-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.2-2.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d989f45442bf809d44df1f361e3b760c
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.63 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.63
index d2e7c3607f89..3468eb58073b 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.63
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.63
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.63
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-69.base.tar.xz mirror://gentoo/genpatches-4.14-69.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-69.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=88edc7fd66a293652319552872e228e2
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.66 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.66
index 031fd922dc19..438fbf53ad17 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.66
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.66
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.66
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-72.base.tar.xz mirror://gentoo/genpatches-4.14-72.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-72.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=5f8b5ea95724c5da6f209548a3032509
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.67 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.67
index 6c9cf9a83aa9..d668772299d1 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.67
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.67
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.67
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-73.base.tar.xz mirror://gentoo/genpatches-4.14-73.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-73.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=09a69adeca57626f23d18a45250b26ff
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.69 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.69
index dc404289ebf2..d0f1201230ae 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.69
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.69
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.69
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-75.base.tar.xz mirror://gentoo/genpatches-4.14-75.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-75.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=fd0db79c5a74eefa245caa7dca40fd91
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.71 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.71
index 442fc50fa957..1ab0a432467d 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.71
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.71
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.71
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-77.base.tar.xz mirror://gentoo/genpatches-4.14-77.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-77.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=98b37cc3952e24ff0f765f22fd9aec46
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.73 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.73
index 298951250029..84062fba0f0c 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.73
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.73
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.73
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-79.base.tar.xz mirror://gentoo/genpatches-4.14-79.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-79.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=085ff130ba0a97322b5fa5a7fc9b9eb0
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.75 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.75
index c85d5704b53b..807d0aeeee40 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.75
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.75
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.75
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-81.base.tar.xz mirror://gentoo/genpatches-4.14-81.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-81.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=4aaa7d1e5433c87fe7c8ed0e23972e4b
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.78 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.78
index d769076a8f39..59577d906694 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.78
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.78
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.78
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-85.base.tar.xz mirror://gentoo/genpatches-4.14-85.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-85.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=ffd76a558c1c04b1c5cf6fa596d6aa78
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.81 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.81
index 8dd701ede48d..4304bb84353f 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.81
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.81
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.81
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-88.base.tar.xz mirror://gentoo/genpatches-4.14-88.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-88.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=47b079e6b9fe245a4e85be39702611d0
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.11 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.11
index 306e1649662e..89af0cae2044 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.11
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.11
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.11
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-14.base.tar.xz mirror://gentoo/genpatches-4.18-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-14.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=19e59bbb661dacc6a839e7100cafa92d
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.13 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.13
index a727bef30190..acbb5d584ab4 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.13
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.13
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.13
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-16.base.tar.xz mirror://gentoo/genpatches-4.18-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-16.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=946e2d0c28bb9b6e5c26aec001a7ceb8
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.16 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.16
index 076fd622676a..9c6706a12019 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.16
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.16
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.16
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-19.base.tar.xz mirror://gentoo/genpatches-4.18-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-19.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=bded78c0fb5630e7d20dc7533170065f
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.19 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.19
index fc9916d9c156..b8eee58c5875 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.19
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.19
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.19
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-23.base.tar.xz mirror://gentoo/genpatches-4.18-23.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-23.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=31300c723d63a5310f338eb721d0df44
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.5 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.5
index aa09c496d228..06adaebc53c5 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.5
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-8.base.tar.xz mirror://gentoo/genpatches-4.18-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-8.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=1146cc2d704051fb09b40413daff2a63
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.7 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.7
index fe802126f075..c952f8fc45d2 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.7
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.7
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-10.base.tar.xz mirror://gentoo/genpatches-4.18-10.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-10.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=be230d062a9a2177e56b84e7a1c1a671
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.9 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.9
index 0f5f9ea40331..b20c7416a1c7 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.9
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.9
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-12.base.tar.xz mirror://gentoo/genpatches-4.18-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-12.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2b8df6b48346ec27fb6a94c256d9e8e0
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.19.2 b/metadata/md5-cache/sys-kernel/ck-sources-4.19.2
index 24ae576c6c45..b156e9745146 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.19.2
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.19.2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.2
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) mirror://gentoo/genpatches-4.19-3.base.tar.xz mirror://gentoo/genpatches-4.19-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-3.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.19/0001-MultiQueue-Skiplist-Scheduler-version-v0.180.patch -> ck-sources-4.19-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=acab435a08ab2ff759f832856c5cf3e7
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.120 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.120
index 63793d2ebf89..40e7cd7dea86 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.120
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.120
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.120
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-124.base.tar.xz mirror://gentoo/genpatches-4.9-124.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-124.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=720f70fbaa2e445dc077c743e7668847
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.123 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.123
index f1ccf2a56988..de20a5bafbc0 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.123
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.123
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.123
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-127.base.tar.xz mirror://gentoo/genpatches-4.9-127.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-127.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=d964548267e4142a87f1551f3ae679f8
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.124 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.124
index aec101a7e918..e6880d5c6549 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.124
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.124
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.124
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-128.base.tar.xz mirror://gentoo/genpatches-4.9-128.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-128.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=583c54a6edf2d8f84940f24e0c899152
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.126 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.126
index 1a8bf317cb9c..670650c48094 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.126
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.126
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.126
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-130.base.tar.xz mirror://gentoo/genpatches-4.9-130.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-130.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=98e0ce1fb63f410cfdd5a2051c8fbe0c
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.128 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.128
index 041b52cdf87f..21a99ace4798 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.128
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.128
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.128
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-132.base.tar.xz mirror://gentoo/genpatches-4.9-132.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-132.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=f8e1950cc82180923344b353d4b9cb26
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.130 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.130
index 2a6782f62a80..45aac068abce 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.130
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.130
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.130
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-134.base.tar.xz mirror://gentoo/genpatches-4.9-134.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-134.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=035fedf0fc1d114fd67ed46b5de4aec7
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.132 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.132
index 31171cb0c729..2c791b160c37 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.132
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.132
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.132
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-136.base.tar.xz mirror://gentoo/genpatches-4.9-136.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-136.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2f84d80ba564e8662c27588801389ecc
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.135 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.135
index ee19d8c33390..73d5f4e2cb0a 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.135
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.135
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.135
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-139.base.tar.xz mirror://gentoo/genpatches-4.9-139.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-139.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=7f6ce089d60648491b0a20622553331a
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.137 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.137
index 5bfc76f99c5b..2009f20c3e1e 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.137
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.137
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.137
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-141.base.tar.xz mirror://gentoo/genpatches-4.9-141.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-141.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=6b89323e1bf9e099b76084dbd34af781
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-5.1.7 b/metadata/md5-cache/sys-kernel/ck-sources-5.1.7
index e8bd3496983e..2c3b7a57ea8a 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-5.1.7
+++ b/metadata/md5-cache/sys-kernel/ck-sources-5.1.7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1.7
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.1-gnu/deblob-5.1 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.1-gnu/deblob-check -> deblob-check-5.1 ) mirror://gentoo/genpatches-5.1-8.base.tar.xz mirror://gentoo/genpatches-5.1-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.1-8.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/5.0/5.1/0001-MultiQueue-Skiplist-Scheduler-version-0.192.patch -> ck-sources-5.1-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=b49621acd1de9c4341b85cb25b174b49
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-5.2.3 b/metadata/md5-cache/sys-kernel/ck-sources-5.2.3
index 4fa6087ccf89..986302ec79c4 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-5.2.3
+++ b/metadata/md5-cache/sys-kernel/ck-sources-5.2.3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.3
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.2-gnu/deblob-5.2 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.2-gnu/deblob-check -> deblob-check-5.2 ) mirror://gentoo/genpatches-5.2-4.base.tar.xz mirror://gentoo/genpatches-5.2-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.2-4.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/5.0/5.2/0001-MultiQueue-Skiplist-Scheduler-version-0.193.patch -> ck-sources-5.2-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=ed527c1909024235030b92b049ad48bf
diff --git a/metadata/md5-cache/sys-kernel/dracut-049-r2 b/metadata/md5-cache/sys-kernel/dracut-049-r2
new file mode 100644
index 000000000000..a8504ebfe7a1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/dracut-049-r2
@@ -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 ~arm64 ~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/openrc[sysv-utils,selinux?] 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	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=fa8a39bf9aa99c87a50098517511c874
diff --git a/metadata/md5-cache/sys-kernel/dracut-9999 b/metadata/md5-cache/sys-kernel/dracut-9999
index c39b0a368f16..fe13be3bf8e8 100644
--- a/metadata/md5-cache/sys-kernel/dracut-9999
+++ b/metadata/md5-cache/sys-kernel/dracut-9999
@@ -7,8 +7,8 @@ HOMEPAGE=https://dracut.wiki.kernel.org
 IUSE=selinux kernel_linux
 LICENSE=GPL-2
 PROPERTIES=live
-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 )
+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/openrc[sysv-utils,selinux?] 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
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=79a1eb2af0d387f3646a8a34864710e7
+_md5_=2c5f9227b5e5ffb5f9f4d908bfdd3edb
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta12 b/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta12
deleted file mode 100644
index 389ad5f4be6c..000000000000
--- a/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend unpack
-DESCRIPTION=Gentoo automatic kernel building scripts
-EAPI=7
-HOMEPAGE=https://www.gentoo.org
-IUSE=ibm +firmware
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware ) !<sys-apps/openrc-0.9.9
-SLOT=0
-SRC_URI=mirror://gentoo/genkernel-4.0.0_beta12.tar.xz mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.2.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.0.tar.bz2 mirror://kernel/linux/utils/cryptsetup/v2.1/cryptsetup-2.1.0.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.8.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.3/e2fsprogs-1.45.3.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.875.tar.gz -> open-iscsi-2.0.875.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.4.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.36.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.185.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz mirror://kernel/linux/utils/raid/mdadm/mdadm-4.1.tar.xz https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.0;sf=tgz -> multipath-tools-0.8.0.tar.gz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.2/strace-5.2.tar.xz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://lttng.org/files/urcu/userspace-rcu-0.10.2.tar.bz2 mirror://kernel/linux/utils/util-linux/v2.34/util-linux-2.34.tar.xz mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.1.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.1.tar.gz -> zstd-1.4.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	mount-boot	0ed73d6bc7399be07e136b5dc46709d9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=eadc2ea37bd257fcf960b98794695710
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta16 b/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta16
new file mode 100644
index 000000000000..fe264f083389
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta16
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend unpack
+DESCRIPTION=Gentoo automatic kernel building scripts
+EAPI=7
+HOMEPAGE=https://www.gentoo.org
+IUSE=ibm +firmware
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware ) !<sys-apps/openrc-0.9.9
+SLOT=0
+SRC_URI=mirror://gentoo/genkernel-4.0.0_beta16.tar.xz mirror://sourceforge/boost/boost_1_70_0.tar.bz2 mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.2.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.0.tar.bz2 mirror://kernel/linux/utils/cryptsetup/v2.2/cryptsetup-2.2.0.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.8.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_2_7/expat-2.2.7.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.3/e2fsprogs-1.45.3.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.875.tar.gz -> open-iscsi-2.0.875.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.5.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.36.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.185.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz mirror://kernel/linux/utils/raid/mdadm/mdadm-4.1.tar.xz https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.0;sf=tgz -> multipath-tools-0.8.0.tar.gz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.2/strace-5.2.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://lttng.org/files/urcu/userspace-rcu-0.10.2.tar.bz2 mirror://kernel/linux/utils/util-linux/v2.34/util-linux-2.34.tar.xz mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.1.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.1.tar.gz -> zstd-1.4.1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	mount-boot	0ed73d6bc7399be07e136b5dc46709d9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c7c41afd1a7a9c1be0835df651478075
diff --git a/metadata/md5-cache/sys-kernel/genkernel-9999 b/metadata/md5-cache/sys-kernel/genkernel-9999
index 2272ebe6ff9d..f92867cf00a1 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-9999
+++ b/metadata/md5-cache/sys-kernel/genkernel-9999
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware ) !<sys-apps/openrc-0.9.9
 SLOT=0
-SRC_URI=mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.2.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.0.tar.bz2 mirror://kernel/linux/utils/cryptsetup/v2.2/cryptsetup-2.2.0.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.8.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.3/e2fsprogs-1.45.3.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.875.tar.gz -> open-iscsi-2.0.875.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.4.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.36.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.185.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz mirror://kernel/linux/utils/raid/mdadm/mdadm-4.1.tar.xz https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.0;sf=tgz -> multipath-tools-0.8.0.tar.gz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.2/strace-5.2.tar.xz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://lttng.org/files/urcu/userspace-rcu-0.10.2.tar.bz2 mirror://kernel/linux/utils/util-linux/v2.34/util-linux-2.34.tar.xz mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.1.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.1.tar.gz -> zstd-1.4.1.tar.gz
+SRC_URI=mirror://sourceforge/boost/boost_1_70_0.tar.bz2 mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.2.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.0.tar.bz2 mirror://kernel/linux/utils/cryptsetup/v2.2/cryptsetup-2.2.0.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.8.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_2_7/expat-2.2.7.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.3/e2fsprogs-1.45.3.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.875.tar.gz -> open-iscsi-2.0.875.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.5.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.36.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.185.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz mirror://kernel/linux/utils/raid/mdadm/mdadm-4.1.tar.xz https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.0;sf=tgz -> multipath-tools-0.8.0.tar.gz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.2/strace-5.2.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://lttng.org/files/urcu/userspace-rcu-0.10.2.tar.bz2 mirror://kernel/linux/utils/util-linux/v2.34/util-linux-2.34.tar.xz mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.1.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.1.tar.gz -> zstd-1.4.1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	git-r3	562b380fc59ae6a8622171d0acb777d1	mount-boot	0ed73d6bc7399be07e136b5dc46709d9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0d9736c1a35c7f75a0ad13ad65d7545e
+_md5_=c7c41afd1a7a9c1be0835df651478075
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.132 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.132
index a0d4ccc65302..3d5a106e2add 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.132
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.132
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.132
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-141.base.tar.xz mirror://gentoo/genpatches-4.14-141.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-141.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=b86c8ad97711e98185bad4974a834b35
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.135 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.135
index ef7dc0b3a27a..829248ead996 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.135
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.135
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.135
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-144.base.tar.xz mirror://gentoo/genpatches-4.14-144.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-144.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=1c24665f836799069d6bd25e65a7627c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.136 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.136
index 108d965484a9..d6f07bf78ff3 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.136
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.136
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.136
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-145.base.tar.xz mirror://gentoo/genpatches-4.14-145.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-145.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=b389716463a962d320203155877062c7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.137 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.137
index 9ae7913238ea..8eb4185b8440 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.137
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.137
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.137
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-146.base.tar.xz mirror://gentoo/genpatches-4.14-146.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-146.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=81d4368ab8a0fb6dbaf54fe0c524b694
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.138 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.138
index ba73551a5eb1..bd770148a0ad 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.138
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.138
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.14.138
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-147.base.tar.xz mirror://gentoo/genpatches-4.14-147.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-147.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f6be026df8cc99dfd77b936b18d2ba94
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8ea79a101cd81b10fb7cca8b7b00cf5c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.139 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.139
index d2c743da389a..0646dd35d288 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.139
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.139
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.139
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-148.base.tar.xz mirror://gentoo/genpatches-4.14-148.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-148.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=88336e3f0239a0af8fc1553c9f8b4c93
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.140 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.140
new file mode 100644
index 000000000000..45a7175a2a50
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.140
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.140
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-149.base.tar.xz mirror://gentoo/genpatches-4.14-149.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-149.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b8d076caa90e2056af3c989253b44aac
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.141 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.141
new file mode 100644
index 000000000000..3abff5b12038
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.141
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.141
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-150.base.tar.xz mirror://gentoo/genpatches-4.14-150.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-150.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=df1960fa53a5b7b82f8e4b7e3c5fa90b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.57 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.57
index 97a787414a7b..2c632b458dda 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.57
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.57
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.57
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-57.base.tar.xz mirror://gentoo/genpatches-4.19-57.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-57.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=c4322bd6d92dd123329ea3994d9581c2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.63 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.63
index d169a1a892e2..c05fd97bec7a 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.63
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.63
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.63
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-63.base.tar.xz mirror://gentoo/genpatches-4.19-63.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-63.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=dd873bdc4988549b90d55af91988a3a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.64 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.64
index 069c9d9d9e5a..6250d19396d2 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.64
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.64
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.64
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-64.base.tar.xz mirror://gentoo/genpatches-4.19-64.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-64.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=96faa373ad9742c47d1e94710d25ac36
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.65 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.65
index 6dc443af4383..a90f0d83b12d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.65
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.65
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.65
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-65.base.tar.xz mirror://gentoo/genpatches-4.19-65.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-65.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=524baea48da01c81b12cd2db488714bf
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.66 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.66
index 9d89a8254a01..c688d4b0e185 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.66
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.66
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.19.66
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-66.base.tar.xz mirror://gentoo/genpatches-4.19-66.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-66.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=5f1cc4802cad28c030a7143bc8496c08
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b032a089c8123eca5b5ff9db0f6655d9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.67 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.67
index 1a5f6ddf7a55..8d91ae6d045b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.67
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.67
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.67
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-67.base.tar.xz mirror://gentoo/genpatches-4.19-67.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-67.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=d985635d5dd3cf05cc98b6948e3f7d1d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.68 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.68
new file mode 100644
index 000000000000..96cfaafc7e0d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.68
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.68
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-68.base.tar.xz mirror://gentoo/genpatches-4.19-68.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-68.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=2dfc7e0f40199d9cd4926193d002f1fe
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.69 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.69
new file mode 100644
index 000000000000..256cc2e773c5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.69
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.69
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-69.base.tar.xz mirror://gentoo/genpatches-4.19-69.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-69.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9e78d3929eca076ce8d1c0cdcad01b79
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.184 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.184
index d6d837d27222..9b63bf2b5a40 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.184
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.184
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.184
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-185.base.tar.xz mirror://gentoo/genpatches-4.4-185.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-185.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=80283659a067c29e0a7851f53d9b53c0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.186 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.186
index bbd863319ef5..4e4d2b81b228 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.186
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.186
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.186
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-187.base.tar.xz mirror://gentoo/genpatches-4.4-187.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-187.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=1132f4f04a1a26328deb5605f7265ae2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.187 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.187
index d305040f73cf..3e9d4def13c5 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.187
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.187
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.187
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-188.base.tar.xz mirror://gentoo/genpatches-4.4-188.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-188.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=40445bfa99f8cc7578f94164e284d4fe
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.188 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.188
index cb01d8244580..32a532119865 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.188
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.188
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.188
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-189.base.tar.xz mirror://gentoo/genpatches-4.4-189.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-189.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=4a3a64b25247835651468aff501232c2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.189 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.189
index e874a850faa9..f0a03af09e89 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.189
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.189
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.4.189
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-190.base.tar.xz mirror://gentoo/genpatches-4.4-190.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-190.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1cda5f7aeb766a63ade82e56cb506fa1
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=efa15286144a99215696a77343c90648
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.190 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.190
new file mode 100644
index 000000000000..2fe923560262
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.190
@@ -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.190
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-191.base.tar.xz mirror://gentoo/genpatches-4.4-191.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-191.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=438e8fd9471f024a2298f222bba53a44
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.184 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.184
index f44e6e81fba5..3af29b034637 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.184
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.184
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.184
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-189.base.tar.xz mirror://gentoo/genpatches-4.9-189.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-189.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=79671f0244df55a7f688e5644d5647dc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.186 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.186
index e127e9a29860..327ecf461073 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.186
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.186
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.186
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-191.base.tar.xz mirror://gentoo/genpatches-4.9-191.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-191.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=438e8fd9471f024a2298f222bba53a44
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.187 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.187
index e7354e569021..ffa3a6bc06c3 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.187
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.187
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.187
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-192.base.tar.xz mirror://gentoo/genpatches-4.9-192.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-192.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=a4c87cfac36b6cbdea6ee5ce07d9bcae
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.188 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.188
index d51d8341ce5b..3ba778d4aa78 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.188
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.188
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.188
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-193.base.tar.xz mirror://gentoo/genpatches-4.9-193.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-193.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=6d2fffe946d0022b4a75dfac89ecdfda
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.189 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.189
index 0dabe42b5e75..f1fb6955f303 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.189
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.189
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.9.189
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-194.base.tar.xz mirror://gentoo/genpatches-4.9-194.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-194.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c8556d0d81c466da5a1746949eac17d0
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=d5e16d0c4770bc1586934fef0e5635ff
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.190 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.190
new file mode 100644
index 000000000000..3b1e0c7851c4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.190
@@ -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.190
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-195.base.tar.xz mirror://gentoo/genpatches-4.9-195.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-195.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=19136f3e1b84ac10df33d814694da613
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.10 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.10
new file mode 100644
index 000000000000..debe979ef2ba
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.2 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.2.10
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz mirror://gentoo/genpatches-5.2-11.base.tar.xz mirror://gentoo/genpatches-5.2-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.2-11.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c1bb8851c09b8d7e7a2f8291453558a2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.11 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.11
new file mode 100644
index 000000000000..9847276aca16
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.2 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.2.11
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz mirror://gentoo/genpatches-5.2-12.base.tar.xz mirror://gentoo/genpatches-5.2-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.2-12.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=eb5add21a82f8f3d2a7775fe6df5090a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.5 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.5
index ee798cc04c0d..a3a3c3a1975e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.5
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.5
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz mirror://gentoo/genpatches-5.2-6.base.tar.xz mirror://gentoo/genpatches-5.2-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.2-6.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=ffe00c75b7caf47ec211adce6bcedde1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.6
index 4ee79ea6b97c..bc560172fca2 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.6
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.6
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz mirror://gentoo/genpatches-5.2-7.base.tar.xz mirror://gentoo/genpatches-5.2-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.2-7.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=601ff7c23e8ffe7fd235dcf65a56cb59
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.7
index b1bd905e9185..343c93120ba6 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.7
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.7
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz mirror://gentoo/genpatches-5.2-8.base.tar.xz mirror://gentoo/genpatches-5.2-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.2-8.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=a5c82ba5c1efbe89002789ebe619f375
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.8 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.8
index 1663ede5f358..4f76090d5459 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.8
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.8
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz mirror://gentoo/genpatches-5.2-9.base.tar.xz mirror://gentoo/genpatches-5.2-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.2-9.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=16ba3d145f8ea35219e20f5a092b989e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.9 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.9
index bc9b0ed4c715..bf008c9cddb6 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.9
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2.9
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz mirror://gentoo/genpatches-5.2-10.base.tar.xz mirror://gentoo/genpatches-5.2-10.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.2-10.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=13f88b7c6bdbf239b225de4c25d1d23a
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.3_rc1 b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc1
index 6ee5a75a8db8..a1ccb4beca06 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.3_rc1
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3_rc1
 SRC_URI=https://git.kernel.org/torvalds/p/v5.3-rc1/v5.2 -> patch-5.3-rc1.patch mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=ce6201206cd2f236435c15b325654952
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.3_rc2 b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc2
index 31cbe9c9c320..ae6d59b44602 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.3_rc2
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3_rc2
 SRC_URI=https://git.kernel.org/torvalds/p/v5.3-rc2/v5.2 -> patch-5.3-rc2.patch mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=ce6201206cd2f236435c15b325654952
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.3_rc3 b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc3
index ed391129da09..e88b6d0241c5 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.3_rc3
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3_rc3
 SRC_URI=https://git.kernel.org/torvalds/p/v5.3-rc3/v5.2 -> patch-5.3-rc3.patch mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=ce6201206cd2f236435c15b325654952
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.3_rc4 b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc4
index ac201ef556f8..574f6e3c42ba 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.3_rc4
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.3_rc4
 SRC_URI=https://git.kernel.org/torvalds/p/v5.3-rc4/v5.2 -> patch-5.3-rc4.patch mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=ce6201206cd2f236435c15b325654952
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.3_rc5 b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc5
new file mode 100644
index 000000000000..d0237de06a67
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.3_rc5
+SRC_URI=https://git.kernel.org/torvalds/p/v5.3-rc5/v5.2 -> patch-5.3-rc5.patch mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ce6201206cd2f236435c15b325654952
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.3_rc6 b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc6
new file mode 100644
index 000000000000..d7d324cd19c4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.3_rc6
+SRC_URI=https://git.kernel.org/torvalds/p/v5.3-rc6/v5.2 -> patch-5.3-rc6.patch mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ce6201206cd2f236435c15b325654952
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.3_rc7 b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc7
new file mode 100644
index 000000000000..d39d4c5d20f7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.3_rc7
+SRC_URI=https://git.kernel.org/torvalds/p/v5.3-rc7/v5.2 -> patch-5.3-rc7.patch mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ce6201206cd2f236435c15b325654952
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20190815 b/metadata/md5-cache/sys-kernel/linux-firmware-20190815
index 970c9cd5faef..d12dc0a7c7da 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20190815
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20190815
@@ -7,8 +7,9 @@ IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
 RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
+REQUIRED_USE=initramfs? ( redistributable )
 RESTRICT=binchecks strip unknown-license? ( bindist )
 SLOT=0
 SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-07b925b450bfb4cf3e141c612ec5b104658cd020.tar.gz -> linux-firmware-20190815.tar.gz
 _eclasses_=mount-boot	0ed73d6bc7399be07e136b5dc46709d9	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	0c38912e9b32aef6433a71726675b4b1
-_md5_=42eece5f3532947e7a576c420fc31746
+_md5_=bf386e16de6967fdb2eb18947e8275c8
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-99999999 b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
index 80f74e0cfb65..c6475d821fd9 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-99999999
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
@@ -7,7 +7,8 @@ IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
 LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
 PROPERTIES=live
 RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
+REQUIRED_USE=initramfs? ( redistributable )
 RESTRICT=binchecks strip unknown-license? ( bindist )
 SLOT=0
 _eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	mount-boot	0ed73d6bc7399be07e136b5dc46709d9	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	0c38912e9b32aef6433a71726675b4b1
-_md5_=a43ed7e17459c2719968e92715a26bae
+_md5_=b5666605502c5dd46e670befef7ce23f
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.18 b/metadata/md5-cache/sys-kernel/linux-headers-3.18
index 2209c4d4fa99..afae9e6eb067 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.18
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.18
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.18.tar.xz mirror://gentoo/gentoo-headers-3.18-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=dc4fe9f110af888e0a652eaacbbc3b5a
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.13 b/metadata/md5-cache/sys-kernel/linux-headers-4.13
index c2d0dd3c03a9..612c5be574fc 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.13
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.13
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.13.tar.xz mirror://gentoo/gentoo-headers-4.13-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=6fcc2aeab73ce8ed16b1946f9eb72404
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
index b13210138ed8..1500a7828f8a 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.14.tar.xz mirror://gentoo/gentoo-headers-4.14-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=59fb671273c1ce0bc3ee90ad15ab0500
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
index f6665acfbc49..4dc3cee1a848 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.15.tar.xz mirror://gentoo/gentoo-headers-4.15-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=adc2b7d2293553db25f14ccab47337d5
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.16 b/metadata/md5-cache/sys-kernel/linux-headers-4.16
index 238d76d0ab2a..ab2439d1488e 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.16
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.16
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.16.tar.xz mirror://gentoo/gentoo-headers-4.16-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.16.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.16-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=87ceb46f30cc43df3f28e5eb921ede8b
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2 b/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
index f17b88ae19ab..665335a7d2ab 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.16-r1.tar.xz mirror://gentoo/gentoo-headers-4.16-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.16-r1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.16-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=a2ceb924cb18f4bc540454a280b945e5
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.17 b/metadata/md5-cache/sys-kernel/linux-headers-4.17
index 6bbd92806e5e..71f8ce9f4c6b 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.17
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.17
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.17.tar.xz mirror://gentoo/gentoo-headers-4.17-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=627cba397fdb644b9a3af8595fb67798
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.18 b/metadata/md5-cache/sys-kernel/linux-headers-4.18
index 0e66c131cb5c..ec1fa3fd618f 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.18
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.18.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.18.tar.xz mirror://gentoo/gentoo-headers-4.18-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.18-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=9cafe7b53b9f289d20c7de25ddaff5f8
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.19 b/metadata/md5-cache/sys-kernel/linux-headers-4.19
index be77cd43a5a0..9692e7afcad5 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.19
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.19.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.19.tar.xz mirror://gentoo/gentoo-headers-4.19-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.19-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=6e43703a0ce2f94d83c84b1622daf5ee
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.20 b/metadata/md5-cache/sys-kernel/linux-headers-4.20
index 467847c94ee9..d9f0202ec447 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.20
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.20
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.20.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.20.tar.xz mirror://gentoo/gentoo-headers-4.20-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.20-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=9cafe7b53b9f289d20c7de25ddaff5f8
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.4 b/metadata/md5-cache/sys-kernel/linux-headers-4.4
index 1f982468df65..d9990a2a556e 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.4
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.4
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.4.tar.xz mirror://gentoo/gentoo-headers-4.4-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=68b3561369522606c23d143a796dd256
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.9 b/metadata/md5-cache/sys-kernel/linux-headers-4.9
index 3af7fc6c3451..f9c3380d3623 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.9
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.9
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.9.tar.xz mirror://gentoo/gentoo-headers-4.9-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=0e197473a1afd16ea06c6afffb688a17
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.0 b/metadata/md5-cache/sys-kernel/linux-headers-5.0
index a9f80107117a..d80092c7109a 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.0
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-5.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-5.0.tar.xz mirror://gentoo/gentoo-headers-5.0-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.0-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=9cafe7b53b9f289d20c7de25ddaff5f8
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.0-r1 b/metadata/md5-cache/sys-kernel/linux-headers-5.0-r1
index b067fadf35d3..72f22a2568b5 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.0-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-5.0-bug-679630.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-5.0-bug-679630.tar.xz mirror://gentoo/gentoo-headers-5.0-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.0-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=9cf7388630d554f237cdaf07bb84f92b
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.1 b/metadata/md5-cache/sys-kernel/linux-headers-5.1
index 5d7390e5594a..9747a4e663f3 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz mirror://gentoo/gentoo-headers-5.1-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.1-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=7fa26c585f1e33f99ecd568f74f2cf73
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.2 b/metadata/md5-cache/sys-kernel/linux-headers-5.2
index 2424f5e70202..c62711ddc896 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-5.2
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz mirror://gentoo/gentoo-headers-5.2-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-5.2-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=7fa26c585f1e33f99ecd568f74f2cf73
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.14.135 b/metadata/md5-cache/sys-kernel/mips-sources-4.14.135
index 515e5d22ce75..52cb57b7cda8 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.14.135
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.14.135
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.135
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.135.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/mipsgit-4.14.0-20180128.diff.xz mirror://gentoo/mips-sources-4.14.0-patches-v2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7ec47017cf8ad3ac894f9e436164d0fb
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.17.19 b/metadata/md5-cache/sys-kernel/mips-sources-4.17.19
index e161c2f36030..d396cb157f5f 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.17.19
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.17.19
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.17.19
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.17.19.xz mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/mipsgit-4.17.0-20180705.diff.xz mirror://gentoo/mips-sources-4.17.0-patches-v1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=21a2581acc260da5444d50d70d20288c
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.18.20 b/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
index 0a882b3eca04..46d46aeda1e3 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.20
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.18.20.xz mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz mirror://gentoo/mipsgit-4.18.0-20181112.diff.xz mirror://gentoo/mips-sources-4.18.0-patches-v2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a0aa621ac7763cb319a46536dfe80bda
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.4.186 b/metadata/md5-cache/sys-kernel/mips-sources-4.4.186
index f4db64ae36bd..b59dbab967c0 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.4.186
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.4.186
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.186
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.186.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/mipsgit-4.4.0-20160123.diff.xz mirror://gentoo/mips-sources-4.4.0-patches-v2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3e55592090868567992c7ac3eb34c952
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.9.186 b/metadata/md5-cache/sys-kernel/mips-sources-4.9.186
index 76964466b2e1..8cddc491df4f 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.9.186
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.9.186
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.186
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.186.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/mipsgit-4.9.0-20161216.diff.xz mirror://gentoo/mips-sources-4.9.0-patches-v2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2de6104c23ad0708aaf3de76361348ee
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.1_p7 b/metadata/md5-cache/sys-kernel/pf-sources-5.1_p7
index 2a776c9a6985..6de46d07da80 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.1_p7
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.1_p7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1_p7
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.1...v5.1-pf7.diff -> pf-sources-5.1_p7.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.1-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.1-1.extras.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=8ea8123b5ce14eb973a9cbded5e447e3
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p1 b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p1
index 15440bd5aace..54da6e11f8d8 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2_p1
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.2...v5.2-pf1.diff -> pf-sources-5.2_p1.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.extras.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=78c508dd953652f70f7f70e59ede0ad3
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p2 b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p2
index 9abc8a14953b..f13941de5245 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2_p2
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.2...v5.2-pf2.diff -> pf-sources-5.2_p2.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.extras.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=78c508dd953652f70f7f70e59ede0ad3
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p3
index 17d3cb69fdc8..f1445f73f894 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2_p3
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.2...v5.2-pf3.diff -> pf-sources-5.2_p3.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.extras.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=78c508dd953652f70f7f70e59ede0ad3
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p4 b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p4
index 85dc90799e83..95b7fa826dc7 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2_p4
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.2...v5.2-pf4.diff -> pf-sources-5.2_p4.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.extras.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=78c508dd953652f70f7f70e59ede0ad3
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p5 b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p5
index 4296f1008810..b30d8994777f 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p5
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.2_p5
 SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.2...v5.2-pf5.diff -> pf-sources-5.2_p5.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.extras.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=55f7bd072fbe6223727a6dc034e46442
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p6 b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p6
new file mode 100644
index 000000000000..24cb2b5d13f1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p6
@@ -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=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://gitlab.com/post-factum/pf-kernel/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.2_p6
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.2...v5.2-pf6.diff -> pf-sources-5.2_p6.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.extras.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=55f7bd072fbe6223727a6dc034e46442
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p7 b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p7
new file mode 100644
index 000000000000..e3c9023eff0b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p7
@@ -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=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://gitlab.com/post-factum/pf-kernel/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.2_p7
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.2...v5.2-pf7.diff -> pf-sources-5.2_p7.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.extras.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=07efbd65cd802f1b1931ae12068fdf63
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.10.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.10.9999
index 85b41af0f0e7..606168ea1250 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.10.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.10.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.10.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.11.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.11.9999
index 0b0387e6fd9b..e7e785ff1b41 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.11.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.11.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.11.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.12.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.12.9999
index a1fd85dcb789..d4f663c025b8 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.12.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.12.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.12.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.13.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.13.9999
index 057c5c2f616c..4754c43df4df 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.13.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.13.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.13.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999
index 9f1e47b0e512..8f18a91ae6bd 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.14.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
index a9985a4f6dab..de0aefa2d168 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.19.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2da249c494dca0e19c87641ef4855aa5
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999
index cbf3421ad7ce..44d11c12ddba 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.4.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.9.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.9.9999
index eef17b01c9a8..a580197ea778 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.9.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.9.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.9.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107
index 2740a9821c6f..11833df0a6f4 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=3.18.123_p107
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.123.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-3.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.123-rt107.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.123-rt107.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.125_p108 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.125_p108
index 87b0d1812d15..ac1c3cbdc975 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.18.125_p108
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.125_p108
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=3.18.125_p108
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.125.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-3.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.125-rt108.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.125-rt108.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.129_p110 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.129_p110
index ea396b982472..5935215efd94 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.18.129_p110
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.129_p110
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=3.18.129_p110
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.129.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-3.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.129-rt110.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.129-rt110.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=7dd4abac9eef41dfb3911ad066604b3d
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44
index ec4ce91ebe01..c74ffcb71fdd 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.71_p44
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.71.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://kernel/linux/kernel/projects/rt/4.14/patch-4.14.71-rt44.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.71-rt44.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.78_p47 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.78_p47
index 89d99ca735d4..98c672589c66 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.78_p47
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.78_p47
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.78_p47
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.78.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://kernel/linux/kernel/projects/rt/4.14/patch-4.14.78-rt47.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.78-rt47.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.87_p49 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.87_p49
index 1758f9a946d0..831decf9f984 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.87_p49
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.87_p49
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.87_p49
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.87.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://kernel/linux/kernel/projects/rt/4.14/patch-4.14.87-rt49.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.87-rt49.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=d932aac0bada87f774a7d095025eb628
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12 b/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12
index ee2511057715..beda6f410f60 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.16.18_p12
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.18.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.16-gnu/deblob-4.16 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.16-gnu/deblob-check -> deblob-check-4.16 ) mirror://kernel/linux/kernel/projects/rt/4.16/patch-4.16.18-rt12.patch.xz mirror://kernel/linux/kernel/projects/rt/4.16/older/patch-4.16.18-rt12.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.18.16_p9 b/metadata/md5-cache/sys-kernel/rt-sources-4.18.16_p9
index 078834c9fa21..29f1c6f48ee3 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.18.16_p9
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.18.16_p9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.16_p9
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.18.16.xz mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://kernel/linux/kernel/projects/rt/4.18/patch-4.18.16-rt9.patch.xz mirror://kernel/linux/kernel/projects/rt/4.18/older/patch-4.18.16-rt9.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.10_p8 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.10_p8
index 5b4c9ccbbe41..a4b26c5b6681 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.10_p8
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.10_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.10_p8
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.10.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) mirror://kernel/linux/kernel/projects/rt/4.19/patch-4.19.10-rt8.patch.xz mirror://kernel/linux/kernel/projects/rt/4.19/older/patch-4.19.10-rt8.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=d932aac0bada87f774a7d095025eb628
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.5_p4 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.5_p4
index 30c061c34a3f..7ca1f8ce793d 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.5_p4
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.5_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.5_p4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.5.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) mirror://kernel/linux/kernel/projects/rt/4.19/patch-4.19.5-rt4.patch.xz mirror://kernel/linux/kernel/projects/rt/4.19/older/patch-4.19.5-rt4.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.162_p175 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.162_p175
index 299929647495..74ccc0af34cc 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.162_p175
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.162_p175
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.162_p175
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.162.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) mirror://kernel/linux/kernel/projects/rt/4.4/patch-4.4.162-rt175.patch.xz mirror://kernel/linux/kernel/projects/rt/4.4/older/patch-4.4.162-rt175.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.164_p176 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.164_p176
index c02a438f9d3d..ab59427cad9a 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.164_p176
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.164_p176
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.164_p176
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.164.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-check -> deblob-check-4.4 ) mirror://kernel/linux/kernel/projects/rt/4.4/patch-4.4.164-rt176.patch.xz mirror://kernel/linux/kernel/projects/rt/4.4/older/patch-4.4.164-rt176.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93
index c0f8f3abdf34..5fba04bb9130 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.115_p93
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.115.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://kernel/linux/kernel/projects/rt/4.9/patch-4.9.115-rt93.patch.xz mirror://kernel/linux/kernel/projects/rt/4.9/older/patch-4.9.115-rt93.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.146_p125 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.146_p125
index a50cc8a4ae59..96c315d2cd85 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.146_p125
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.146_p125
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.146_p125
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.146.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://kernel/linux/kernel/projects/rt/4.9/patch-4.9.146-rt125.patch.xz mirror://kernel/linux/kernel/projects/rt/4.9/older/patch-4.9.146-rt125.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=7dd4abac9eef41dfb3911ad066604b3d
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.72 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.72
deleted file mode 100644
index c27e9cd2ac32..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.72
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=3.16.72
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.16.72.xz mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.73 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.73
new file mode 100644
index 000000000000..318465772a61
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.73
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=3.16.73
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.16.73.xz mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.138 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.138
deleted file mode 100644
index bc4edf51003a..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.138
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.138
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.138.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.141 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.141
new file mode 100644
index 000000000000..2d3d429dbfe4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.141
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.141
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.141.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.66 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.66
deleted file mode 100644
index 35fa057b9202..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.66
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.19.66
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.66.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.69 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.69
new file mode 100644
index 000000000000..6c6212bb196b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.69
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.69
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.69.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.189 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.189
deleted file mode 100644
index 7fa58c8b7922..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.189
+++ /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.189
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.189.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.190 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.190
new file mode 100644
index 000000000000..a869fdebbde8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.190
@@ -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.190
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.190.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.189 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.189
deleted file mode 100644
index cc835e6ba50c..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.189
+++ /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.189
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.189.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.190 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.190
new file mode 100644
index 000000000000..8d2812d02627
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.190
@@ -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.190
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.190.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.21 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.21
index 150f695fa25c..721f21581afd 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.21
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.21
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=5.1.21
 SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.1.21.xz mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.2.11 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.2.11
new file mode 100644
index 000000000000..c61d09956680
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.2.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.2.11
+SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.2.11.xz mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.2.8 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.2.8
deleted file mode 100644
index 4924b04e5499..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=5.2.8
-SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.2.8.xz mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26 b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
index cc9801092c3a..3b3dd25ca79c 100644
--- a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
+++ b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=2.6.16.26
 SRC_URI=mirror://kernel/linux/kernel/v2.6/patch-2.6.16.26.xz mirror://kernel/linux/kernel/v2.6/linux-2.6.16.tar.xz mirror://sourceforge/xbox-linux/linux-2.6.16-xbox.patch.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=5668a47c58461eb3e14a3d6890f51dda
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-4.14.9999 b/metadata/md5-cache/sys-kernel/zen-sources-4.14.9999
index e637a7a957e5..4d23d6fd030e 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-4.14.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-4.14.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.14.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=322112777abd81f4f8a030331bb728e1
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-4.15.9999 b/metadata/md5-cache/sys-kernel/zen-sources-4.15.9999
index f7d6c322c165..8c1fde6872d4 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-4.15.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-4.15.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.15.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=322112777abd81f4f8a030331bb728e1
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-4.16.9999 b/metadata/md5-cache/sys-kernel/zen-sources-4.16.9999
index b04f56241bb2..fc52be7da3a9 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-4.16.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-4.16.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.16.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d9bc6473bf79f3ef3d1f71d6cd9ab816	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=322112777abd81f4f8a030331bb728e1
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 8bf1f7e6a433..a0b5d2aa1682 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.32-r1 b/metadata/md5-cache/sys-libs/binutils-libs-2.32-r1
index 27033a003f08..2168f81d8ab6 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.32-r1
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.32-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external
 EAPI=6
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=64-bit-bfd multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5 nls? ( !<sys-devel/gdb-7.10-r1[nls] )
 SLOT=0/2.32
 SRC_URI=mirror://gnu/binutils/binutils-2.32.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.32-patches-2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=689e7a66c27612960560afeb8cb7bb48
+_md5_=13b43912319979814b067ab1d9131969
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0.9999
index 19a8f411bc58..9780e88e84a2 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.0
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ce5ae7b340bf6515465922746324560
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
index e4f7c4bed27b..402152f4cae6 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( UoI-NCSA MIT )
 SLOT=5.0.2
 SRC_URI=https://releases.llvm.org/5.0.2/compiler-rt-5.0.2.src.tar.xz test? ( https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b3a665ffe7cf8222f54030be24485c2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.1
index 65fa67416fab..00a88c683b99 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-6.0.1
@@ -10,5 +10,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=6.0.1
 SRC_URI=https://releases.llvm.org/6.0.1/compiler-rt-6.0.1.src.tar.xz https://dev.gentoo.org/~mgorny/dist/llvm/compiler-rt-sanitizers-6.0.1-patchset.tar.xz test? ( https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da785b8b6d5ae664155ff7743c365243
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.1.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.1.0
index afffc206aa14..901322cd2cfd 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.1.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-7.1.0
@@ -10,5 +10,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=7.1.0
 SRC_URI=https://releases.llvm.org/7.1.0/compiler-rt-7.1.0.src.tar.xz test? ( https://releases.llvm.org/7.1.0/llvm-7.1.0.src.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb1b36bf06b28717a806a16610b165f2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.0
index 75125ee17211..fe86a80d9d4d 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.0
@@ -10,5 +10,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=8.0.0
 SRC_URI=https://releases.llvm.org/8.0.0/compiler-rt-8.0.0.src.tar.xz test? ( https://releases.llvm.org/8.0.0/llvm-8.0.0.src.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f20a11e7801133c551961dfb694e176a
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.1
index a6abb7059c9e..34b01bf9c257 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.1
@@ -10,5 +10,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=8.0.1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/compiler-rt-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=22396aba2ac95f3987229e3f19c28fa2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.0.9999
index e823bc081192..aef1592523e7 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=9.0.0
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eaf7ccb88a1a057241331c2554160b1d
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.4.8 b/metadata/md5-cache/sys-libs/freeipmi-1.4.8
deleted file mode 100644
index d60bd743d02c..000000000000
--- a/metadata/md5-cache/sys-libs/freeipmi-1.4.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libgcrypt:0 virtual/os-headers >=app-portage/elt-patches-20170815
-DESCRIPTION=Provides Remote-Console and System Management Software as per IPMI v1.5/2.0
-EAPI=5
-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.4.8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6d71c730548c8479cb8ea63fbdaf1c48
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.6.2 b/metadata/md5-cache/sys-libs/freeipmi-1.6.2
deleted file mode 100644
index cbcc67a2cf55..000000000000
--- a/metadata/md5-cache/sys-libs/freeipmi-1.6.2
+++ /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 ~ppc ~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.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=38bc3189d34a5972e1bfd4da739c1110
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.6.4 b/metadata/md5-cache/sys-libs/freeipmi-1.6.4
new file mode 100644
index 000000000000..240359207b21
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/freeipmi-1.6.4
@@ -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.4.tar.gz
+_md5_=401bf8114119b8b85f51e2a858ff9de2
diff --git a/metadata/md5-cache/sys-libs/glibc-2.19-r2 b/metadata/md5-cache/sys-libs/glibc-2.19-r2
index a27e1cf36d4e..e8e9991f8a68 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.19-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.19-r2
@@ -3,7 +3,7 @@ DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap )
 DESCRIPTION=GNU libc C library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libc/
-IUSE=audit caps compile-locales debug doc gd hardened headers-only multilib nscd profile selinux suid systemtap vanilla split-usr
+IUSE=audit caps compile-locales debug doc gd headers-only multilib nscd profile selinux suid systemtap vanilla split-usr
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
@@ -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.19.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.19-patches-9.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3d5086e8ca4474030a9c773f05b05972
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=04955b00828f80708f6e6c6b869ce9ff
diff --git a/metadata/md5-cache/sys-libs/glibc-2.29-r2 b/metadata/md5-cache/sys-libs/glibc-2.29-r2
index c4a5e9f3b685..916a8886c665 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.29-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.29-r2
@@ -4,7 +4,7 @@ DESCRIPTION=GNU libc C library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libc/
 IUSE=audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux +ssp suid systemtap test vanilla split-usr
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.29.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.29-patches-3.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1682984023cd68f6859c7d93fc1b8b43
+_md5_=caf1a48a1a47f1eb3c2f99d45ed46a10
diff --git a/metadata/md5-cache/sys-libs/glibc-2.29-r5 b/metadata/md5-cache/sys-libs/glibc-2.29-r5
new file mode 100644
index 000000000000..028205d4a39a
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.29-r5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
+DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 !<sys-devel/bison-2.7 !<sys-devel/make-4 doc? ( sys-apps/texinfo ) test? ( >=net-dns/libidn2-2.0.5 ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
+DESCRIPTION=GNU libc C library
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libc/
+IUSE=audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux +ssp suid systemtap test vanilla split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data )
+RESTRICT=strip
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.29.tar.xz https://dev.gentoo.org/~slyfox/distfiles/glibc-2.29-patches-6.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c87906418acfba2d04825637f11454bb
diff --git a/metadata/md5-cache/sys-libs/glibc-2.30 b/metadata/md5-cache/sys-libs/glibc-2.30
index d32fe6c57ba7..e82c4a4ad668 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.30
+++ b/metadata/md5-cache/sys-libs/glibc-2.30
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.30.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.30-patches-1.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=49b1c1d0ab9d94e0f62a4dae968a4f76
+_md5_=bef4c3e12ff4bc6c095acd970472e79b
diff --git a/metadata/md5-cache/sys-libs/glibc-2.30-r1 b/metadata/md5-cache/sys-libs/glibc-2.30-r1
new file mode 100644
index 000000000000..0746f176f6a1
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.30-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
+DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 !<sys-devel/bison-2.7 !<sys-devel/make-4 doc? ( sys-apps/texinfo ) test? ( >=net-dns/libidn2-2.0.5 ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
+DESCRIPTION=GNU libc C library
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libc/
+IUSE=audit caps cet compile-locales custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs suid systemtap test vanilla split-usr
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data )
+RESTRICT=strip
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.30.tar.xz https://dev.gentoo.org/~slyfox/distfiles/glibc-2.30-patches-2.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d6dab5dea67fe9bfc6ccd3486ffecdeb
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index cd0dfeeb7d75..b557adf2dc95 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -10,6 +10,6 @@ PDEPEND=!vanilla? ( sys-libs/timezone-data )
 PROPERTIES=live
 RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data )
 SLOT=2.2
-SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/glibc-9999-patches-13.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
+SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/glibc-9999-patches-14.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=e9b3b85c5eb6aab9f84e013c57535718
+_md5_=6a496af9c3245cc116f0a4e34991204c
diff --git a/metadata/md5-cache/sys-libs/ldb-1.1.26 b/metadata/md5-cache/sys-libs/ldb-1.1.26
deleted file mode 100644
index d6f809710791..000000000000
--- a/metadata/md5-cache/sys-libs/ldb-1.1.26
+++ /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 !elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.5[python,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.27[python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.8[python,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-nds/openldap !!<net-fs/samba-3.6.0[ldb] !!>=net-fs/samba-4.0.0[ldb] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=An LDAP-like embedded database
-EAPI=6
-HOMEPAGE=https://ldb.samba.org/
-IUSE=doc python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.5[python,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.27[python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.8[python,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-nds/openldap !!<net-fs/samba-3.6.0[ldb] !!>=net-fs/samba-4.0.0[ldb] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0/1.1.26
-SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.1.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=7395e5a275477d6728858004e9c75fa0
diff --git a/metadata/md5-cache/sys-libs/ldb-1.2.3 b/metadata/md5-cache/sys-libs/ldb-1.2.3
deleted file mode 100644
index b0d2153eec75..000000000000
--- a/metadata/md5-cache/sys-libs/ldb-1.2.3
+++ /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_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.10[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.33[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ldap? ( net-nds/openldap )
-DESCRIPTION=An LDAP-like embedded database
-EAPI=6
-HOMEPAGE=https://ldb.samba.org/
-IUSE=doc +ldap python python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.10[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.33[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ldap? ( net-nds/openldap )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0/1.2.3
-SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=6b731be44c633f5b2138bfd05c918a5b
diff --git a/metadata/md5-cache/sys-libs/ldb-1.4.6 b/metadata/md5-cache/sys-libs/ldb-1.4.6
deleted file mode 100644
index 10094d8cf657..000000000000
--- a/metadata/md5-cache/sys-libs/ldb-1.4.6
+++ /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_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0/1.4.6
-SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.4.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=943650b191d201236b697b0e6954974c
diff --git a/metadata/md5-cache/sys-libs/ldb-1.6.2 b/metadata/md5-cache/sys-libs/ldb-1.6.2
deleted file mode 100644
index 3c15c69cd520..000000000000
--- a/metadata/md5-cache/sys-libs/ldb-1.6.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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] !elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.16[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
-DESCRIPTION=An LDAP-like embedded database
-EAPI=6
-HOMEPAGE=https://ldb.samba.org
-IUSE=doc +ldap +lmdb python python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.16[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
-SLOT=0/1.6.2
-SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.6.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=71bff9f8a39f531313bd65367fac1763
diff --git a/metadata/md5-cache/sys-libs/ldb-2.0.5 b/metadata/md5-cache/sys-libs/ldb-2.0.5
new file mode 100644
index 000000000000..b5447045228c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ldb-2.0.5
@@ -0,0 +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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] !elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.2.0[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.1[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+DESCRIPTION=An LDAP-like embedded database
+EAPI=6
+HOMEPAGE=https://ldb.samba.org
+IUSE=doc +ldap +lmdb python python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.2.0[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.1[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+SLOT=0/2.0.5
+SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-2.0.5.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=19fde6565722e93bc67521c6af08a864
diff --git a/metadata/md5-cache/sys-libs/ldb-2.0.7 b/metadata/md5-cache/sys-libs/ldb-2.0.7
new file mode 100644
index 000000000000..54510018e528
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ldb-2.0.7
@@ -0,0 +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_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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] !elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.2.0[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+DESCRIPTION=An LDAP-like embedded database
+EAPI=6
+HOMEPAGE=https://ldb.samba.org
+IUSE=doc +ldap +lmdb python python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.2.0[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+SLOT=0/2.0.7
+SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-2.0.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=b86dc481b7c7c3642ab4226eeae712bf
diff --git a/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1 b/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
index b2dd39007d4a..3f18bad18bd5 100644
--- a/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
+++ b/metadata/md5-cache/sys-libs/libkudzu-1.2.57.1
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/popt >=sys-apps/pciutils-2.2.4[zlib?] zlib? ( sys-libs/zlib ) s
 SLOT=0
 SRC_URI=mirror://gentoo/kudzu-1.2.57.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0d377459fb534d84c1baace8483b82ae
+_md5_=89a7592fdec5b48180d1cc94a8768bc8
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.9 b/metadata/md5-cache/sys-libs/libselinux-2.9
index dab6c04d6671..15604990a77b 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.9
+++ b/metadata/md5-cache/sys-libs/libselinux-2.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) elibc_musl? ( sys-libs/fts-standalone ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 ) ruby? ( >=dev-lang/swig-2.0.9 )
+DEPEND=>=sys-libs/libsepol-2.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) elibc_musl? ( sys-libs/fts-standalone ) virtual/pkgconfig python? ( <dev-lang/swig-4_pre ) ruby? ( <dev-lang/swig-4_pre )
 DESCRIPTION=SELinux userland library
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 py
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20190315/libselinux-2.9.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f3056879829b7007960fde29848e7a78
+_md5_=5f09c39de0df13e15cb775009762c21b
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.9-r1 b/metadata/md5-cache/sys-libs/libselinux-2.9-r1
new file mode 100644
index 000000000000..0ce1b8d95f41
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libselinux-2.9-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=sys-libs/libsepol-2.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) elibc_musl? ( sys-libs/fts-standalone ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 ) ruby? ( >=dev-lang/swig-2.0.9 )
+DESCRIPTION=SELinux userland library
+EAPI=6
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+IUSE=pcre2 python ruby static-libs ruby_targets_ruby24 ruby_targets_ruby25 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+LICENSE=public-domain
+RDEPEND=>=sys-libs/libsepol-2.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) elibc_musl? ( sys-libs/fts-standalone )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20190315/libselinux-2.9.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=04c8359236cab55c67a1e9c05b0e7810
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.20-r1 b/metadata/md5-cache/sys-libs/musl-1.1.20-r1
deleted file mode 100644
index 20e27863072b..000000000000
--- a/metadata/md5-cache/sys-libs/musl-1.1.20-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare 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	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7165184a49e288f7669d317dffa8a661
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.21 b/metadata/md5-cache/sys-libs/musl-1.1.21
deleted file mode 100644
index 2aeff6adbe08..000000000000
--- a/metadata/md5-cache/sys-libs/musl-1.1.21
+++ /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.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	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79b2ea71319230ad41a6591132771736
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.23 b/metadata/md5-cache/sys-libs/musl-1.1.23
index b9c05caef2f6..9dc5217ea715 100644
--- a/metadata/md5-cache/sys-libs/musl-1.1.23
+++ b/metadata/md5-cache/sys-libs/musl-1.1.23
@@ -3,9 +3,9 @@ DESCRIPTION=Light, fast and simple C library focused on standards-conformance an
 EAPI=6
 HOMEPAGE=http://www.musl-libc.org/
 IUSE=headers-only
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~mips ~ppc ~x86
+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.23.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	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eace87bc3b8caab1eb0fcb6e00c467bd
+_md5_=7b85dcfbfc52e15d2daeb369f5d64350
diff --git a/metadata/md5-cache/sys-libs/readline-8.0_p1 b/metadata/md5-cache/sys-libs/readline-8.0_p1
index 4227b1ed019d..ab63bfc3b3dc 100644
--- a/metadata/md5-cache/sys-libs/readline-8.0_p1
+++ b/metadata/md5-cache/sys-libs/readline-8.0_p1
@@ -10,5 +10,5 @@ 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/8
 SRC_URI=mirror://gnu/readline/readline-8.0.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-8.0-patches/readline80-001 mirror://gnu/readline/readline-8.0-patches/readline80-001
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=651132d3c00959ff1302d5a64bdb4ec6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=1172483e60f49a01beb9da2e43ecd4ae
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.15 b/metadata/md5-cache/sys-libs/talloc-2.1.15
deleted file mode 100644
index e13645d09c45..000000000000
--- a/metadata/md5-cache/sys-libs/talloc-2.1.15
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) !!<sys-libs/talloc-2.0.5 sys-devel/gettext dev-libs/libxslt 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DESCRIPTION=Samba talloc library
-EAPI=6
-HOMEPAGE=https://talloc.samba.org/
-IUSE=compat +python python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris
-LICENSE=GPL-3 LGPL-3+ LGPL-2
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) !!<sys-libs/talloc-2.0.5
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.1.15.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=1be926050ee02d9ad0a3178d405150ef
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.5 b/metadata/md5-cache/sys-libs/talloc-2.1.5
deleted file mode 100644
index c914421ab9d4..000000000000
--- a/metadata/md5-cache/sys-libs/talloc-2.1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !!<sys-libs/talloc-2.0.5 sys-devel/gettext dev-libs/libxslt python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Samba talloc library
-EAPI=5
-HOMEPAGE=https://talloc.samba.org/
-IUSE=compat +python python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris
-LICENSE=GPL-3 LGPL-3+ LGPL-2
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !!<sys-libs/talloc-2.0.5
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=d52fc94c202d1b5c9d7ea4733ec3fdf2
diff --git a/metadata/md5-cache/sys-libs/talloc-2.3.0 b/metadata/md5-cache/sys-libs/talloc-2.3.0
new file mode 100644
index 000000000000..5f8b0644414c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/talloc-2.3.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) python? ( 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) !!<sys-libs/talloc-2.0.5 sys-devel/gettext dev-libs/libxslt 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+DESCRIPTION=Samba talloc library
+EAPI=6
+HOMEPAGE=https://talloc.samba.org/
+IUSE=compat +python python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris
+LICENSE=GPL-3 LGPL-3+ LGPL-2
+RDEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) python? ( 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) !!<sys-libs/talloc-2.0.5
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.3.0.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=fd86b1b7bd61cf71f9917a41c6ef34f7
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.17 b/metadata/md5-cache/sys-libs/tdb-1.3.17
deleted file mode 100644
index ef665b17b9d7..000000000000
--- a/metadata/md5-cache/sys-libs/tdb-1.3.17
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/docbook-xml-dtd:4.2
-DESCRIPTION=A simple database API
-EAPI=6
-HOMEPAGE=http://tdb.samba.org/
-IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://samba.org/ftp/tdb/tdb-1.3.17.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=396a3e696a006a4e6d22b6d7cbf3cb58
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.8 b/metadata/md5-cache/sys-libs/tdb-1.3.8
deleted file mode 100644
index 6d5b58e0620e..000000000000
--- a/metadata/md5-cache/sys-libs/tdb-1.3.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/docbook-xml-dtd:4.2
-DESCRIPTION=A simple database API
-EAPI=5
-HOMEPAGE=https://tdb.samba.org/
-IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://www.samba.org/ftp/tdb/tdb-1.3.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=411082ab5300ef9858ce729f347f1f5e
diff --git a/metadata/md5-cache/sys-libs/tdb-1.4.2 b/metadata/md5-cache/sys-libs/tdb-1.4.2
new file mode 100644
index 000000000000..717739a7e09a
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/tdb-1.4.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/docbook-xml-dtd:4.2
+DESCRIPTION=A simple database API
+EAPI=6
+HOMEPAGE=http://tdb.samba.org/
+IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://samba.org/ftp/tdb/tdb-1.4.2.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=396a3e696a006a4e6d22b6d7cbf3cb58
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2019b-r1 b/metadata/md5-cache/sys-libs/timezone-data-2019b-r1
index 44bf6f37b0f3..4fb0ad07596a 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2019b-r1
+++ b/metadata/md5-cache/sys-libs/timezone-data-2019b-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdum
 EAPI=7
 HOMEPAGE=https://www.iana.org/time-zones
 IUSE=nls leaps_timezone elibc_FreeBSD
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=BSD public-domain
 RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
 SLOT=0
 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2019b.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2019b.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=385d67115141e6c80d20db74166803af
+_md5_=e81fc8fbd88ec2897f063c84077729eb
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2019b-r2 b/metadata/md5-cache/sys-libs/timezone-data-2019b-r2
new file mode 100644
index 000000000000..83319ae25aec
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/timezone-data-2019b-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare test
+DEPEND=nls? ( virtual/libintl )
+DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
+EAPI=7
+HOMEPAGE=https://www.iana.org/time-zones
+IUSE=nls leaps_timezone elibc_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=BSD public-domain
+RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
+SLOT=0
+SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2019b.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2019b.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=86038573c5b80a33c0012b34714a475c
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index c707e4b77b2a..b80d73b11a8f 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/acpid-2.0.32 b/metadata/md5-cache/sys-power/acpid-2.0.32
new file mode 100644
index 000000000000..47acaa9408d2
--- /dev/null
+++ b/metadata/md5-cache/sys-power/acpid-2.0.32
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst pretend setup
+DEPEND=>=sys-kernel/linux-headers-3 virtual/pkgconfig
+DESCRIPTION=Daemon for Advanced Configuration and Power Interface
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/acpid2
+IUSE=selinux kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=selinux? ( sec-policy/selinux-apm )
+SLOT=0
+SRC_URI=mirror://sourceforge/acpid2/acpid-2.0.32.tar.xz https://dev.gentoo.org/~andrey_utkin/distfiles/sys-power_acpid_2.0.29-r1_extras.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8fb30c35ac66d9c3934a79d22f09f134
diff --git a/metadata/md5-cache/sys-power/intel-undervolt-1.7 b/metadata/md5-cache/sys-power/intel-undervolt-1.7
new file mode 100644
index 000000000000..6d65261c629f
--- /dev/null
+++ b/metadata/md5-cache/sys-power/intel-undervolt-1.7
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure postinst setup
+DEPEND=elogind? ( sys-auth/elogind )
+DESCRIPTION=Intel CPU undervolting and throttling configuration tool
+EAPI=7
+HOMEPAGE=https://github.com/kitsunyan/intel-undervolt
+IUSE=elogind kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3
+RDEPEND=elogind? ( sys-auth/elogind )
+SLOT=0
+SRC_URI=https://github.com/kitsunyan/intel-undervolt/archive/1.7.tar.gz -> intel-undervolt-1.7.tar.gz
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a22643593ab0c235ca3fb2e35ce67a60
diff --git a/metadata/md5-cache/sys-power/intel-undervolt-9999 b/metadata/md5-cache/sys-power/intel-undervolt-9999
index 2db66adceeb8..50726c632e62 100644
--- a/metadata/md5-cache/sys-power/intel-undervolt-9999
+++ b/metadata/md5-cache/sys-power/intel-undervolt-9999
@@ -1,11 +1,13 @@
-BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install prepare setup unpack
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure postinst setup unpack
+DEPEND=elogind? ( sys-auth/elogind )
 DESCRIPTION=Intel CPU undervolting and throttling configuration tool
 EAPI=7
 HOMEPAGE=https://github.com/kitsunyan/intel-undervolt
-IUSE=kernel_linux
+IUSE=elogind kernel_linux
 LICENSE=GPL-3
 PROPERTIES=live
+RDEPEND=elogind? ( sys-auth/elogind )
 SLOT=0
 _eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=08572b5d12128398ec16e82fdf82fd3f
+_md5_=a22643593ab0c235ca3fb2e35ce67a60
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index b3e0a9d544a2..682ed6f85e2b 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/evisum-0.2.4 b/metadata/md5-cache/sys-process/evisum-0.2.4
new file mode 100644
index 000000000000..81f85a68b0d0
--- /dev/null
+++ b/metadata/md5-cache/sys-process/evisum-0.2.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=dev-libs/efl
+DESCRIPTION=System and process monitor written with EFL
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/apps/evisum/evisum-0.2.4.tar.xz
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b37666e06e6aaec9e7d87f7cf244ef3
diff --git a/metadata/md5-cache/sys-process/fuser-bsd-1142334561 b/metadata/md5-cache/sys-process/fuser-bsd-1142334561
deleted file mode 100644
index 6c6896814cb8..000000000000
--- a/metadata/md5-cache/sys-process/fuser-bsd-1142334561
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=sys-freebsd/freebsd-mk-defs virtual/pmake
-DESCRIPTION=fuser(1) utility for *BSD
-EAPI=2
-HOMEPAGE=http://mbsd.msk.ru/stas/fuser.html
-KEYWORDS=~x86-fbsd
-LICENSE=BSD
-RDEPEND=virtual/libc !sys-process/psmisc
-SLOT=0
-SRC_URI=http://mbsd.msk.ru/dist/fuser-1142334561.tar.bz2 mirror://gentoo/fuser-bsd-patches-1.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	bsdmk	9483ce8462177e1eca375e253e3bf7d5	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=26fd69c03dbff5dc1c22b7de2778bfaf
diff --git a/metadata/md5-cache/sys-process/glances-3.1.2 b/metadata/md5-cache/sys-process/glances-3.1.2
new file mode 100644
index 000000000000..b63839254ead
--- /dev/null
+++ b/metadata/md5-cache/sys-process/glances-3.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup 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(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/psutil-5.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) >=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=CLI curses based monitoring tool
+EAPI=6
+HOMEPAGE=https://github.com/nicolargo/glances
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,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/psutil-5.4.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) >=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/nicolargo/glances/archive/v3.1.2.tar.gz -> glances-3.1.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=97c129fd36a82b48c3ce2b082655d4c0
diff --git a/metadata/md5-cache/sys-process/gnome-usage-3.32.0 b/metadata/md5-cache/sys-process/gnome-usage-3.32.0
index 2c2560ce8c8f..38acccb1b9f2 100644
--- a/metadata/md5-cache/sys-process/gnome-usage-3.32.0
+++ b/metadata/md5-cache/sys-process/gnome-usage-3.32.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.38.0:2 >=x11-libs/gtk+-3.20.10:3 >=gnome-base/libgtop-2.34.0:2 >=dev-libs/libdazzle-3.30
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-usage/3.32/gnome-usage-3.32.0.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27b28174b5e77104041d73d946f5af43
diff --git a/metadata/md5-cache/sys-process/numactl-2.0.11 b/metadata/md5-cache/sys-process/numactl-2.0.11
deleted file mode 100644
index be143c928d30..000000000000
--- a/metadata/md5-cache/sys-process/numactl-2.0.11
+++ /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=Utilities and libraries for NUMA systems
-EAPI=5
-HOMEPAGE=http://oss.sgi.com/projects/libnuma/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 -arm ia64 ~mips ppc ppc64 x86 ~amd64-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://oss.sgi.com/www/projects/libnuma/download/numactl-2.0.11.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79388d86424d06de836214860d659ef8
diff --git a/metadata/md5-cache/sys-process/numactl-2.0.11-r1 b/metadata/md5-cache/sys-process/numactl-2.0.11-r1
deleted file mode 100644
index 2ae7c5fb5dea..000000000000
--- a/metadata/md5-cache/sys-process/numactl-2.0.11-r1
+++ /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=Utilities and libraries for NUMA systems
-EAPI=5
-HOMEPAGE=http://oss.sgi.com/projects/libnuma/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 -arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://oss.sgi.com/www/projects/libnuma/download/numactl-2.0.11.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6f8bbb6ed6ea83a1eb7f0cd6146e4187
diff --git a/metadata/md5-cache/sys-process/numactl-2.0.12 b/metadata/md5-cache/sys-process/numactl-2.0.12
index f39d23c9a14f..9743dab4ec6a 100644
--- a/metadata/md5-cache/sys-process/numactl-2.0.12
+++ b/metadata/md5-cache/sys-process/numactl-2.0.12
@@ -4,9 +4,9 @@ DESCRIPTION=Utilities and libraries for NUMA systems
 EAPI=6
 HOMEPAGE=https://github.com/numactl/numactl
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 -arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 -arm arm64 ia64 ~mips ppc ppc64 x86 ~amd64-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/numactl/numactl/releases/download/v2.0.12/numactl-2.0.12.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3d9b579193eef54ba891a23d9c6f891a
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c70f28be9c0b6c3ffdb0ffbe6dcf8d22
diff --git a/metadata/md5-cache/sys-process/numactl-2.0.13 b/metadata/md5-cache/sys-process/numactl-2.0.13
new file mode 100644
index 000000000000..a77af9988bd6
--- /dev/null
+++ b/metadata/md5-cache/sys-process/numactl-2.0.13
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utilities and libraries for NUMA systems
+EAPI=7
+HOMEPAGE=https://github.com/numactl/numactl
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 -arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/numactl/numactl/releases/download/v2.0.13/numactl-2.0.13.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a66f16abce3658891971052d489d3c1b
diff --git a/metadata/md5-cache/sys-process/numactl-9999 b/metadata/md5-cache/sys-process/numactl-9999
index 674a901491f1..df2deaca5b83 100644
--- a/metadata/md5-cache/sys-process/numactl-9999
+++ b/metadata/md5-cache/sys-process/numactl-9999
@@ -1,11 +1,11 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Utilities and libraries for NUMA systems
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/numactl/numactl
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e5bcf2adfd31f6ef8ae7d018566d8e0f
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a66f16abce3658891971052d489d3c1b
diff --git a/metadata/md5-cache/sys-process/parallel-20190822 b/metadata/md5-cache/sys-process/parallel-20190822
new file mode 100644
index 000000000000..6523dd63bf88
--- /dev/null
+++ b/metadata/md5-cache/sys-process/parallel-20190822
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/parallel/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+SLOT=0
+SRC_URI=mirror://gnu/parallel/parallel-20190822.tar.bz2
+_md5_=d64f8076cf5378396d2846b299a56c1e
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.10 b/metadata/md5-cache/sys-process/systemd-cron-1.5.10
deleted file mode 100644
index 48a859ca95ba..000000000000
--- a/metadata/md5-cache/sys-process/systemd-cron-1.5.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=sys-process/cronbase test? ( sys-apps/man-db dev-python/pyflakes ) virtual/pkgconfig
-DESCRIPTION=systemd units to create timers for cron directories and crontab
-EAPI=5
-HOMEPAGE=https://github.com/systemd-cron/systemd-cron/
-IUSE=cron-boot etc-crontab-systemd minutely setgid test yearly python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_single_target_pypy3 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( >=virtual/pypy3-5:0= ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_pypy3(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-process/cronbase
-REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/systemd-cron/systemd-cron/archive/v1.5.10.tar.gz -> systemd-cron-1.5.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bea8e2c15d1a5e9563845f74e6d6e81a
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1 b/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
index b4e2a3189070..4188522a7b93 100644
--- a/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
+++ b/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
@@ -4,11 +4,11 @@ DESCRIPTION=systemd units to create timers for cron directories and crontab
 EAPI=5
 HOMEPAGE=https://github.com/systemd-cron/systemd-cron/
 IUSE=cron-boot etc-crontab-systemd minutely setgid test yearly python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_single_target_pypy3 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~sparc x86
+KEYWORDS=amd64 sparc x86
 LICENSE=MIT
 RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( >=virtual/pypy3-5:0= ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_pypy3(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-process/cronbase
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/systemd-cron/systemd-cron/archive/v1.5.12.tar.gz -> systemd-cron-1.5.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=96f84579624d60300703df20dd17eaca
+_md5_=878adc8e7752e154d6e4f424ad07539c
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.14 b/metadata/md5-cache/sys-process/systemd-cron-1.5.14
new file mode 100644
index 000000000000..c05c1eb5607b
--- /dev/null
+++ b/metadata/md5-cache/sys-process/systemd-cron-1.5.14
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure prepare setup
+DEPEND=sys-process/cronbase test? ( sys-apps/man-db dev-python/pyflakes )
+DESCRIPTION=systemd units to create timers for cron directories and crontab
+EAPI=7
+HOMEPAGE=https://github.com/systemd-cron/systemd-cron/
+IUSE=cron-boot etc-crontab-systemd minutely setgid test yearly python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_pypy3 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( >=virtual/pypy3-5:0= ) python_single_target_python3_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_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_python2_7(-),python_single_target_pypy3(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] sys-process/cronbase
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/systemd-cron/systemd-cron/archive/v1.5.14.tar.gz -> systemd-cron-1.5.14.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=d9a4797f8b3f41b4e50b93d025384108
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.3 b/metadata/md5-cache/sys-process/systemd-cron-1.5.3
deleted file mode 100644
index 6bdea38eda7f..000000000000
--- a/metadata/md5-cache/sys-process/systemd-cron-1.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=sys-process/cronbase test? ( sys-apps/man-db dev-python/pyflakes ) virtual/pkgconfig
-DESCRIPTION=systemd units to create timers for cron directories and crontab
-EAPI=5
-HOMEPAGE=https://github.com/systemd-cron/systemd-cron/
-IUSE=cron-boot etc-crontab-systemd minutely setgid test yearly python_targets_pypy3
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !etc-crontab-systemd? ( !sys-process/dcron ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy3(+)] sys-process/cronbase
-REQUIRED_USE=python_targets_pypy3
-SLOT=0
-SRC_URI=https://github.com/systemd-cron/systemd-cron/archive/v1.5.3.tar.gz -> systemd-cron-1.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2598ae7240c71634c3fbe26098f589f7
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.4 b/metadata/md5-cache/sys-process/systemd-cron-1.5.4
deleted file mode 100644
index 35850d2e98dd..000000000000
--- a/metadata/md5-cache/sys-process/systemd-cron-1.5.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=sys-process/cronbase test? ( sys-apps/man-db dev-python/pyflakes ) virtual/pkgconfig
-DESCRIPTION=systemd units to create timers for cron directories and crontab
-EAPI=5
-HOMEPAGE=https://github.com/systemd-cron/systemd-cron/
-IUSE=cron-boot etc-crontab-systemd minutely setgid test yearly python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_single_target_pypy3 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( >=virtual/pypy3-5:0= ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_pypy3(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-process/cronbase
-REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/systemd-cron/systemd-cron/archive/v1.5.4.tar.gz -> systemd-cron-1.5.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=989052cac377c38ccf1ae50ab6dd4105
diff --git a/metadata/md5-cache/sys-process/xjobs-20170829 b/metadata/md5-cache/sys-process/xjobs-20170829
deleted file mode 100644
index c00709fe020a..000000000000
--- a/metadata/md5-cache/sys-process/xjobs-20170829
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-devel/flex
-DESCRIPTION=Reads commands line by line and executes them in parallel
-EAPI=6
-HOMEPAGE=http://www.maier-komor.de/xjobs.html
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.maier-komor.de/xjobs/xjobs-20170829.tgz
-_md5_=d091dcab3c7748b0e910a5160efdfdc3
diff --git a/metadata/md5-cache/sys-process/xjobs-20190725 b/metadata/md5-cache/sys-process/xjobs-20190725
index 46f948b71508..a4946ef8fa57 100644
--- a/metadata/md5-cache/sys-process/xjobs-20190725
+++ b/metadata/md5-cache/sys-process/xjobs-20190725
@@ -5,10 +5,10 @@ DESCRIPTION=Reads commands line by line and executes them in parallel
 EAPI=7
 HOMEPAGE=http://www.maier-komor.de/xjobs.html
 IUSE=examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://www.maier-komor.de/xjobs/xjobs-20190725.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=4f2bd2ad2548b5b16b3fa75bde48afd6
+_md5_=521360259ca9e04bf68e5b8f11716c39
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index c23f477cdf23..4104ff4324b2 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/emacs-24 b/metadata/md5-cache/virtual/emacs-24
index 1b5903fcf12d..e3102ab06c6c 100644
--- a/metadata/md5-cache/virtual/emacs-24
+++ b/metadata/md5-cache/virtual/emacs-24
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for GNU Emacs
 EAPI=6
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=app-editors/emacs:24
 SLOT=0
-_md5_=017ecf1eb736e541554f45a545487937
+_md5_=6c934ed35858481f3f710719b2279f94
diff --git a/metadata/md5-cache/virtual/python-dnspython-2 b/metadata/md5-cache/virtual/python-dnspython-2
deleted file mode 100644
index efc4ed542419..000000000000
--- a/metadata/md5-cache/virtual/python-dnspython-2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for dnspython, for Python 2 & 3
-EAPI=6
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dnspython-1.15.0:0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=55923aef1666308fff5fbb9d9527f229
diff --git a/metadata/md5-cache/virtual/ruby-ssl-11 b/metadata/md5-cache/virtual/ruby-ssl-11
index 7d6330a075ec..14bd520aa420 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-11
+++ b/metadata/md5-cache/virtual/ruby-ssl-11
@@ -3,9 +3,9 @@ DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lan
 DESCRIPTION=Virtual ebuild for the Ruby OpenSSL bindings
 EAPI=6
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 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=ruby_targets_ruby24? ( dev-lang/ruby:2.4[ssl] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5[ssl] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6[ssl] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=719a4d089cc96b267b96ce77a30ebaca
+_md5_=b5683a4f0e96de627dc8f4273bfbe6b6
diff --git a/metadata/md5-cache/virtual/rubygems-15 b/metadata/md5-cache/virtual/rubygems-15
index 345d4210f682..ff03606b1470 100644
--- a/metadata/md5-cache/virtual/rubygems-15
+++ b/metadata/md5-cache/virtual/rubygems-15
@@ -3,9 +3,9 @@ DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lan
 DESCRIPTION=Virtual ebuild for rubygems
 EAPI=6
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/rubygems-2.6.11[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rubygems-2.7.3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rubygems-3.0.1[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e223d6c2e1814c8fcc344565cda41862
+_md5_=e23bcc86eaac9cde7b0da18a3a718311
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 4906cb7faa84..f173c775dece 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_vhost_ldap-2.4.0-r1 b/metadata/md5-cache/www-apache/mod_vhost_ldap-2.4.0-r1
index 0ec1eb0249c4..58e89c1f5642 100644
--- a/metadata/md5-cache/www-apache/mod_vhost_ldap-2.4.0-r1
+++ b/metadata/md5-cache/www-apache/mod_vhost_ldap-2.4.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst prepare setup
 DEPEND=dev-libs/apr-util[ldap] =www-servers/apache-2.4*
 DESCRIPTION=Store and configure Apache virtual hosts using LDAP
 EAPI=5
-HOMEPAGE=http://modvhostldap.alioth.debian.org/
+HOMEPAGE=https://github.com/oerdnj/mod-vhost-ldap
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2.4*[ldap] =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mjo/distfiles/mod_vhost_ldap-2.4.0.tar.xz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=871e7c4ea62bc99c8555adc6c2085066
+_md5_=2615019b564ea3d223ee7b9001e1c44e
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 0b755d47fcca..4d93fc5cb363 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/grafana-bin-5.4.5 b/metadata/md5-cache/www-apps/grafana-bin-5.4.5
new file mode 100644
index 000000000000..e28869824555
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-5.4.5
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=7
+HOMEPAGE=https://grafana.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=media-libs/fontconfig
+SLOT=0
+SRC_URI=https://dl.grafana.com/oss/release/grafana-5.4.5.linux-amd64.tar.gz -> grafana-bin-5.4.5.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=086ffe3b210b8f3bbf79ac91ff61b291
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.1.6 b/metadata/md5-cache/www-apps/grafana-bin-6.1.6
deleted file mode 100644
index a993f90741b3..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-6.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install setup
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=7
-HOMEPAGE=https://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=media-libs/fontconfig
-SLOT=0
-SRC_URI=https://dl.grafana.com/oss/release/grafana-6.1.6.linux-amd64.tar.gz -> grafana-bin-6.1.6.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=d98abd8ebb335f7ba998d427ecdbf763
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.2.5 b/metadata/md5-cache/www-apps/grafana-bin-6.2.5
deleted file mode 100644
index da04f5908b42..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-6.2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install setup
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=7
-HOMEPAGE=https://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=media-libs/fontconfig
-SLOT=0
-SRC_URI=https://dl.grafana.com/oss/release/grafana-6.2.5.linux-amd64.tar.gz -> grafana-bin-6.2.5.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=1162edb714562148192c3848a89819c5
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.3.2 b/metadata/md5-cache/www-apps/grafana-bin-6.3.2
deleted file mode 100644
index 91a13474dd0c..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-6.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install setup
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=7
-HOMEPAGE=https://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=media-libs/fontconfig
-SLOT=0
-SRC_URI=https://dl.grafana.com/oss/release/grafana-6.3.2.linux-amd64.tar.gz -> grafana-bin-6.3.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=1162edb714562148192c3848a89819c5
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.3.3 b/metadata/md5-cache/www-apps/grafana-bin-6.3.3
deleted file mode 100644
index ac8e913f2271..000000000000
--- a/metadata/md5-cache/www-apps/grafana-bin-6.3.3
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install setup
-DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
-EAPI=7
-HOMEPAGE=https://grafana.org
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=media-libs/fontconfig
-SLOT=0
-SRC_URI=https://dl.grafana.com/oss/release/grafana-6.3.3.linux-amd64.tar.gz -> grafana-bin-6.3.3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=1162edb714562148192c3848a89819c5
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.3.4 b/metadata/md5-cache/www-apps/grafana-bin-6.3.4
new file mode 100644
index 000000000000..492a6d85c127
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-6.3.4
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=7
+HOMEPAGE=https://grafana.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=media-libs/fontconfig
+SLOT=0
+SRC_URI=https://dl.grafana.com/oss/release/grafana-6.3.4.linux-amd64.tar.gz -> grafana-bin-6.3.4.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=1162edb714562148192c3848a89819c5
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.3.5 b/metadata/md5-cache/www-apps/grafana-bin-6.3.5
new file mode 100644
index 000000000000..c9ebbd9421fd
--- /dev/null
+++ b/metadata/md5-cache/www-apps/grafana-bin-6.3.5
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install setup
+DESCRIPTION=Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB
+EAPI=7
+HOMEPAGE=https://grafana.org
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=media-libs/fontconfig
+SLOT=0
+SRC_URI=https://dl.grafana.com/oss/release/grafana-6.3.5.linux-amd64.tar.gz -> grafana-bin-6.3.5.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=1162edb714562148192c3848a89819c5
diff --git a/metadata/md5-cache/www-apps/hiawatha-monitor-1.3-r1 b/metadata/md5-cache/www-apps/hiawatha-monitor-1.3-r1
deleted file mode 100644
index 0d606700cce3..000000000000
--- a/metadata/md5-cache/www-apps/hiawatha-monitor-1.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Monitoring application for www-servers/hiawatha
-EAPI=6
-HOMEPAGE=https://www.hiawatha-webserver.org/howto/monitor
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/php-5*[mysql,xslt] virtual/cron virtual/mysql www-servers/hiawatha[xslt]
-SLOT=0
-SRC_URI=https://www.hiawatha-webserver.org/files/monitor-1.3.tar.gz
-_md5_=e62db22f34a40e62d2d62307658bbffd
diff --git a/metadata/md5-cache/www-apps/hiawatha-monitor-1.6 b/metadata/md5-cache/www-apps/hiawatha-monitor-1.6
new file mode 100644
index 000000000000..fedc3a428365
--- /dev/null
+++ b/metadata/md5-cache/www-apps/hiawatha-monitor-1.6
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Monitoring application for www-servers/hiawatha
+EAPI=7
+HOMEPAGE=https://www.hiawatha-webserver.org/howto/monitor
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-lang/php-5:*[mysql,mysqli,xslt] virtual/cron virtual/mysql www-servers/hiawatha[xslt]
+SLOT=0
+SRC_URI=https://www.hiawatha-webserver.org/files/monitor-1.6.tar.gz
+_md5_=c292a9cf7b8f7852b5a6d6de1d14be51
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.6.2 b/metadata/md5-cache/www-apps/icingaweb2-2.6.2
deleted file mode 100644
index d5d2994c27cb..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-2.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( >=www-servers/nginx-1.7.0:* || ( dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Icinga Web 2 - Frontend for icinga2
-EAPI=6
-HOMEPAGE=http://www.icinga.org/
-IUSE=apache2 ldap mysql nginx pdf postgres apache2
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 || ( dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) nginx? ( >=www-servers/nginx-1.7.0:* || ( dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=^^ ( apache2 nginx )
-SLOT=0
-SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.6.2 -> icingaweb2-2.6.2.tar.gz
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f48fce7727dff462063b499620b54be4
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.7.0 b/metadata/md5-cache/www-apps/icingaweb2-2.7.0
deleted file mode 100644
index 4c12bd77775f..000000000000
--- a/metadata/md5-cache/www-apps/icingaweb2-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config install postinst setup
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) apache2? ( =www-servers/apache-2* )
-DESCRIPTION=Icinga Web 2 - Frontend for icinga2
-EAPI=6
-HOMEPAGE=http://www.icinga.org/
-IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
-SLOT=0
-SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.7.0 -> icingaweb2-2.7.0.tar.gz
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8281571b0cc310e442a29b8687bdd9a
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.7.1 b/metadata/md5-cache/www-apps/icingaweb2-2.7.1
index 0a2afcdce318..8aefa5cee976 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.7.1
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=6
 HOMEPAGE=http://www.icinga.org/
 IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.7.1 -> icingaweb2-2.7.1.tar.gz
 _eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8281571b0cc310e442a29b8687bdd9a
+_md5_=ed83b39862cfcf3eddf8b8bbae09a189
diff --git a/metadata/md5-cache/www-apps/nextcloud-14.0.14 b/metadata/md5-cache/www-apps/nextcloud-14.0.14
new file mode 100644
index 000000000000..066648b9ae85
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-14.0.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=6
+HOMEPAGE=http://nextcloud.com
+IUSE=+curl mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=14.0.14
+SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-14.0.14.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=74c3f955efe48aeca857e90ba7ab1b9b
diff --git a/metadata/md5-cache/www-apps/nextcloud-15.0.11 b/metadata/md5-cache/www-apps/nextcloud-15.0.11
new file mode 100644
index 000000000000..e801952d7705
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-15.0.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=6
+HOMEPAGE=http://nextcloud.com
+IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=15.0.11
+SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-15.0.11.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=33fb50f29ab7f0d854f9488aec02059a
diff --git a/metadata/md5-cache/www-apps/nextcloud-16.0.4 b/metadata/md5-cache/www-apps/nextcloud-16.0.4
new file mode 100644
index 000000000000..7bfa485dd3cd
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-16.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=6
+HOMEPAGE=http://nextcloud.com
+IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=16.0.4
+SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-16.0.4.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=33fb50f29ab7f0d854f9488aec02059a
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index a18a688d337c..bde8c9c71be9 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-76.0.3809.100 b/metadata/md5-cache/www-client/chromium-76.0.3809.100
deleted file mode 100644
index 9200d054d363..000000000000
--- a/metadata/md5-cache/www-client/chromium-76.0.3809.100
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl <dev-util/gn-0.1583 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex closure-compile? ( virtual/jre ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.2.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=http://chromium.org/
-IUSE=+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.2.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-REQUIRED_USE=component-build? ( !suid )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-76.0.3809.100.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fddce723cc89fe149631148f38cc6521
diff --git a/metadata/md5-cache/www-client/chromium-76.0.3809.132 b/metadata/md5-cache/www-client/chromium-76.0.3809.132
new file mode 100644
index 000000000000..f4daa5f8b3c3
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-76.0.3809.132
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl <dev-util/gn-0.1583 dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex closure-compile? ( virtual/jre ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.2.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=http://chromium.org/
+IUSE=+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.2.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+REQUIRED_USE=component-build? ( !suid )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-76.0.3809.132.tar.xz
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9776435f2058e3b11cd4c63dd79a6320
diff --git a/metadata/md5-cache/www-client/chromium-77.0.3865.35 b/metadata/md5-cache/www-client/chromium-77.0.3865.35
deleted file mode 100644
index 8c0fe6456fe0..000000000000
--- a/metadata/md5-cache/www-client/chromium-77.0.3865.35
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex closure-compile? ( virtual/jre ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=http://chromium.org/
-IUSE=+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-REQUIRED_USE=component-build? ( !suid )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-77.0.3865.35.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d6e7311ea79a53d929d58491f55ee98
diff --git a/metadata/md5-cache/www-client/chromium-77.0.3865.56 b/metadata/md5-cache/www-client/chromium-77.0.3865.56
new file mode 100644
index 000000000000..f5d576b034ee
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-77.0.3865.56
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex closure-compile? ( virtual/jre ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=http://chromium.org/
+IUSE=+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+REQUIRED_USE=component-build? ( !suid )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-77.0.3865.56.tar.xz
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=083d6701d0643e8ba770502de8eee062
diff --git a/metadata/md5-cache/www-client/chromium-78.0.3880.4 b/metadata/md5-cache/www-client/chromium-78.0.3880.4
deleted file mode 100644
index f90a5db2e2be..000000000000
--- a/metadata/md5-cache/www-client/chromium-78.0.3880.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex closure-compile? ( virtual/jre ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=http://chromium.org/
-IUSE=+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-REQUIRED_USE=component-build? ( !suid )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-78.0.3880.4.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=19c5cdea54828a8a473481e9c8ea6b44
diff --git a/metadata/md5-cache/www-client/chromium-78.0.3887.7 b/metadata/md5-cache/www-client/chromium-78.0.3887.7
new file mode 100644
index 000000000000..c2f74981dcea
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-78.0.3887.7
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex closure-compile? ( virtual/jre ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=http://chromium.org/
+IUSE=+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+REQUIRED_USE=component-build? ( !suid )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-78.0.3887.7.tar.xz
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=542e4780af12ad5c27fed5709215d59c
diff --git a/metadata/md5-cache/www-client/elinks-0.13_pre_pre20180225 b/metadata/md5-cache/www-client/elinks-0.13_pre_pre20180225
index e1f08de33908..b9680400ee82 100644
--- a/metadata/md5-cache/www-client/elinks-0.13_pre_pre20180225
+++ b/metadata/md5-cache/www-client/elinks-0.13_pre_pre20180225
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) brotli? ( app-arch/brotli ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.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
+DEPEND=brotli? ( app-arch/brotli ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) || ( >=dev-lang/python-2.7.5-r2:2.7[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.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Advanced and well-established text-mode web browser
 EAPI=6
 HOMEPAGE=http://elinks.or.cz/
 IUSE=bittorrent brotli bzip2 debug finger ftp gopher gpm guile idn ipv6 javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) brotli? ( app-arch/brotli ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 )
+RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 )
 SLOT=0
 SRC_URI=https://github.com/rkd77/felinks/archive/0dd3aaabe61fbc5ed0d9a74915678d11d00c2a1c.tar.gz -> elinks-0.13_pre_pre20180225.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bddc25ec0550b08f496bfa2be62adfd
+_md5_=fb3893c0827a61aafbb1237749070aa5
diff --git a/metadata/md5-cache/www-client/elinks-9999 b/metadata/md5-cache/www-client/elinks-9999
index 6e602afa115c..37cdea8e4290 100644
--- a/metadata/md5-cache/www-client/elinks-9999
+++ b/metadata/md5-cache/www-client/elinks-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) brotli? ( app-arch/brotli ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.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 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=brotli? ( app-arch/brotli ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) || ( >=dev-lang/python-2.7.5-r2:2.7[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.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Advanced and well-established text-mode web browser
 EAPI=6
 HOMEPAGE=http://elinks.or.cz/
 IUSE=bittorrent brotli bzip2 debug finger ftp gopher gpm guile idn ipv6 javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) brotli? ( app-arch/brotli ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 )
+RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0= ) lua? ( >=dev-lang/lua-5:0= ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) samba? ( net-fs/samba ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6537a6c42946e36baca6e479087f6a2a
+_md5_=9a03ec30c5cd6c6ae606fd0a4cabb06f
diff --git a/metadata/md5-cache/www-client/epiphany-3.30.4 b/metadata/md5-cache/www-client/epiphany-3.30.4
index e4ed29ac4d3c..c1cd48c19d2c 100644
--- a/metadata/md5-cache/www-client/epiphany-3.30.4
+++ b/metadata/md5-cache/www-client/epiphany-3.30.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.52.0:2 >=x11-libs/gtk+-3.22.13:3 >=dev-libs/nettle-3.2:= >=net-libs/webkit-gtk-2.21.92:4= >=x11-libs/cairo-1.2 >=dev-libs/libdazzle-3.28.0 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 dev-libs/gmp:0= >=gnome-base/gsettings-desktop-schemas-0.0.1 x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/3.30/epiphany-3.30.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=443335db9c95f718f57e7f24253769db
diff --git a/metadata/md5-cache/www-client/epiphany-3.32.4 b/metadata/md5-cache/www-client/epiphany-3.32.4
index f24aeea11a9f..42dab5326cf8 100644
--- a/metadata/md5-cache/www-client/epiphany-3.32.4
+++ b/metadata/md5-cache/www-client/epiphany-3.32.4
@@ -5,10 +5,10 @@ DESCRIPTION=GNOME webbrowser based on Webkit
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Web
 IUSE=test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.24.1:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=dev-libs/libdazzle-3.31.90 >=gui-libs/libhandy-0.0.9:0.0= >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 dev-db/sqlite:3 dev-libs/gmp:0= x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/3.32/epiphany-3.32.4.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ecdcdbd59448e29b3b7ab4a9871d69ef
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=138872b973aa33b6bfa513ebd838f133
diff --git a/metadata/md5-cache/www-client/firefox-52.9.0 b/metadata/md5-cache/www-client/firefox-52.9.0
index 78e9c4645142..fb0a17b9398f 100644
--- a/metadata/md5-cache/www-client/firefox-52.9.0
+++ b/metadata/md5-cache/www-client/firefox-52.9.0
@@ -10,5 +10,5 @@ RDEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 seli
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ach.xpi -> firefox-52.9.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/af.xpi -> firefox-52.9.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/an.xpi -> firefox-52.9.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ar.xpi -> firefox-52.9.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/as.xpi -> firefox-52.9.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ast.xpi -> firefox-52.9.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/az.xpi -> firefox-52.9.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/bg.xpi -> firefox-52.9.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.9.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.9.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/br.xpi -> firefox-52.9.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/bs.xpi -> firefox-52.9.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ca.xpi -> firefox-52.9.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/cak.xpi -> firefox-52.9.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/cs.xpi -> firefox-52.9.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/cy.xpi -> firefox-52.9.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/da.xpi -> firefox-52.9.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/de.xpi -> firefox-52.9.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/dsb.xpi -> firefox-52.9.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/el.xpi -> firefox-52.9.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.9.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.9.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/eo.xpi -> firefox-52.9.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.9.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.9.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.9.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.9.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/et.xpi -> firefox-52.9.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/eu.xpi -> firefox-52.9.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/fa.xpi -> firefox-52.9.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ff.xpi -> firefox-52.9.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/fi.xpi -> firefox-52.9.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/fr.xpi -> firefox-52.9.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.9.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.9.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/gd.xpi -> firefox-52.9.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/gl.xpi -> firefox-52.9.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/gn.xpi -> firefox-52.9.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.9.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/he.xpi -> firefox-52.9.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.9.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hr.xpi -> firefox-52.9.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.9.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hu.xpi -> firefox-52.9.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.9.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/id.xpi -> firefox-52.9.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/is.xpi -> firefox-52.9.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/it.xpi -> firefox-52.9.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ja.xpi -> firefox-52.9.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ka.xpi -> firefox-52.9.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/kab.xpi -> firefox-52.9.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/kk.xpi -> firefox-52.9.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/km.xpi -> firefox-52.9.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/kn.xpi -> firefox-52.9.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ko.xpi -> firefox-52.9.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/lij.xpi -> firefox-52.9.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/lt.xpi -> firefox-52.9.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/lv.xpi -> firefox-52.9.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/mai.xpi -> firefox-52.9.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/mk.xpi -> firefox-52.9.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ml.xpi -> firefox-52.9.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/mr.xpi -> firefox-52.9.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ms.xpi -> firefox-52.9.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.9.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/nl.xpi -> firefox-52.9.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.9.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/or.xpi -> firefox-52.9.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.9.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/pl.xpi -> firefox-52.9.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.9.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.9.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/rm.xpi -> firefox-52.9.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ro.xpi -> firefox-52.9.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ru.xpi -> firefox-52.9.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/si.xpi -> firefox-52.9.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sk.xpi -> firefox-52.9.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sl.xpi -> firefox-52.9.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/son.xpi -> firefox-52.9.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sq.xpi -> firefox-52.9.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sr.xpi -> firefox-52.9.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.9.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/ta.xpi -> firefox-52.9.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/te.xpi -> firefox-52.9.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/th.xpi -> firefox-52.9.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/tr.xpi -> firefox-52.9.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/uk.xpi -> firefox-52.9.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/uz.xpi -> firefox-52.9.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/vi.xpi -> firefox-52.9.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/xh.xpi -> firefox-52.9.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.9.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.9.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/52.9.0esr/source/firefox-52.9.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.5-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.5-patches-02.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.52	43edd59f1e8e1f9536f3c0d3703ece9d	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.52	43edd59f1e8e1f9536f3c0d3703ece9d	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=230e939203ba5a27ba2b175a1dab8207
diff --git a/metadata/md5-cache/www-client/firefox-60.8.0 b/metadata/md5-cache/www-client/firefox-60.8.0
index a54f7768134a..0106df686505 100644
--- a/metadata/md5-cache/www-client/firefox-60.8.0
+++ b/metadata/md5-cache/www-client/firefox-60.8.0
@@ -10,5 +10,5 @@ RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/ns
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ach.xpi -> firefox-60.8.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/af.xpi -> firefox-60.8.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/an.xpi -> firefox-60.8.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ar.xpi -> firefox-60.8.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/as.xpi -> firefox-60.8.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ast.xpi -> firefox-60.8.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/az.xpi -> firefox-60.8.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bg.xpi -> firefox-60.8.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.8.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.8.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/br.xpi -> firefox-60.8.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bs.xpi -> firefox-60.8.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ca.xpi -> firefox-60.8.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cak.xpi -> firefox-60.8.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cs.xpi -> firefox-60.8.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cy.xpi -> firefox-60.8.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/da.xpi -> firefox-60.8.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/de.xpi -> firefox-60.8.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/dsb.xpi -> firefox-60.8.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/el.xpi -> firefox-60.8.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.8.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.8.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eo.xpi -> firefox-60.8.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.8.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.8.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.8.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.8.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/et.xpi -> firefox-60.8.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eu.xpi -> firefox-60.8.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fa.xpi -> firefox-60.8.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ff.xpi -> firefox-60.8.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fi.xpi -> firefox-60.8.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fr.xpi -> firefox-60.8.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.8.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.8.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gd.xpi -> firefox-60.8.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gl.xpi -> firefox-60.8.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gn.xpi -> firefox-60.8.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.8.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/he.xpi -> firefox-60.8.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.8.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hr.xpi -> firefox-60.8.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.8.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hu.xpi -> firefox-60.8.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.8.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/id.xpi -> firefox-60.8.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/is.xpi -> firefox-60.8.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/it.xpi -> firefox-60.8.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ja.xpi -> firefox-60.8.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ka.xpi -> firefox-60.8.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kab.xpi -> firefox-60.8.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kk.xpi -> firefox-60.8.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/km.xpi -> firefox-60.8.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kn.xpi -> firefox-60.8.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ko.xpi -> firefox-60.8.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lij.xpi -> firefox-60.8.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lt.xpi -> firefox-60.8.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lv.xpi -> firefox-60.8.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mai.xpi -> firefox-60.8.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mk.xpi -> firefox-60.8.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ml.xpi -> firefox-60.8.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mr.xpi -> firefox-60.8.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ms.xpi -> firefox-60.8.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.8.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nl.xpi -> firefox-60.8.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.8.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/or.xpi -> firefox-60.8.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.8.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pl.xpi -> firefox-60.8.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.8.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.8.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/rm.xpi -> firefox-60.8.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ro.xpi -> firefox-60.8.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ru.xpi -> firefox-60.8.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/si.xpi -> firefox-60.8.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sk.xpi -> firefox-60.8.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sl.xpi -> firefox-60.8.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/son.xpi -> firefox-60.8.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sq.xpi -> firefox-60.8.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sr.xpi -> firefox-60.8.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.8.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ta.xpi -> firefox-60.8.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/te.xpi -> firefox-60.8.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/th.xpi -> firefox-60.8.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/tr.xpi -> firefox-60.8.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uk.xpi -> firefox-60.8.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uz.xpi -> firefox-60.8.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/vi.xpi -> firefox-60.8.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/xh.xpi -> firefox-60.8.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.8.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.8.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.8.0esr/source/firefox-60.8.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-07.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	4f62da16d617090e7ca9d890a4a9357a	mozcoreconf-v6	fa1351cd910ddd293c48a4888536f069	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	4f62da16d617090e7ca9d890a4a9357a	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f1e6e0d1ab174514d1d2c4da566ca79
diff --git a/metadata/md5-cache/www-client/firefox-60.9.0 b/metadata/md5-cache/www-client/firefox-60.9.0
new file mode 100644
index 000000000000..4c7e7e43ba7e
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-60.9.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.8 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] ) ) ) 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=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.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 ~arm64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.8 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ach.xpi -> firefox-60.9.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/af.xpi -> firefox-60.9.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/an.xpi -> firefox-60.9.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ar.xpi -> firefox-60.9.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/as.xpi -> firefox-60.9.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ast.xpi -> firefox-60.9.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/az.xpi -> firefox-60.9.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bg.xpi -> firefox-60.9.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.9.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.9.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/br.xpi -> firefox-60.9.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bs.xpi -> firefox-60.9.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ca.xpi -> firefox-60.9.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cak.xpi -> firefox-60.9.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cs.xpi -> firefox-60.9.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cy.xpi -> firefox-60.9.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/da.xpi -> firefox-60.9.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/de.xpi -> firefox-60.9.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/dsb.xpi -> firefox-60.9.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/el.xpi -> firefox-60.9.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.9.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.9.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eo.xpi -> firefox-60.9.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.9.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.9.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.9.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.9.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/et.xpi -> firefox-60.9.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eu.xpi -> firefox-60.9.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fa.xpi -> firefox-60.9.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ff.xpi -> firefox-60.9.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fi.xpi -> firefox-60.9.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fr.xpi -> firefox-60.9.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.9.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.9.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gd.xpi -> firefox-60.9.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gl.xpi -> firefox-60.9.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gn.xpi -> firefox-60.9.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.9.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/he.xpi -> firefox-60.9.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.9.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hr.xpi -> firefox-60.9.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.9.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hu.xpi -> firefox-60.9.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.9.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/id.xpi -> firefox-60.9.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/is.xpi -> firefox-60.9.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/it.xpi -> firefox-60.9.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ja.xpi -> firefox-60.9.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ka.xpi -> firefox-60.9.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kab.xpi -> firefox-60.9.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kk.xpi -> firefox-60.9.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/km.xpi -> firefox-60.9.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kn.xpi -> firefox-60.9.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ko.xpi -> firefox-60.9.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lij.xpi -> firefox-60.9.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lt.xpi -> firefox-60.9.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lv.xpi -> firefox-60.9.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mai.xpi -> firefox-60.9.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mk.xpi -> firefox-60.9.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ml.xpi -> firefox-60.9.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mr.xpi -> firefox-60.9.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ms.xpi -> firefox-60.9.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.9.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nl.xpi -> firefox-60.9.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.9.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/or.xpi -> firefox-60.9.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.9.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pl.xpi -> firefox-60.9.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.9.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.9.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/rm.xpi -> firefox-60.9.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ro.xpi -> firefox-60.9.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ru.xpi -> firefox-60.9.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/si.xpi -> firefox-60.9.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sk.xpi -> firefox-60.9.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sl.xpi -> firefox-60.9.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/son.xpi -> firefox-60.9.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sq.xpi -> firefox-60.9.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sr.xpi -> firefox-60.9.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.9.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ta.xpi -> firefox-60.9.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/te.xpi -> firefox-60.9.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/th.xpi -> firefox-60.9.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/tr.xpi -> firefox-60.9.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uk.xpi -> firefox-60.9.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uz.xpi -> firefox-60.9.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/vi.xpi -> firefox-60.9.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/xh.xpi -> firefox-60.9.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.9.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.9.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.9.0esr/source/firefox-60.9.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-07.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	4f62da16d617090e7ca9d890a4a9357a	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0839b154e1ad7733e78fd8168eef54f7
diff --git a/metadata/md5-cache/www-client/firefox-68.0.1 b/metadata/md5-cache/www-client/firefox-68.0.1
deleted file mode 100644
index 09f2649007e3..000000000000
--- a/metadata/md5-cache/www-client/firefox-68.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.44.1 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3=[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.8.7 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/cargo-1.34.0 >=virtual/rust-1.34.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB 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_ia 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_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc 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_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.44.1 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3=[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=wifi? ( dbus ) pgo? ( lto !wayland )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ach.xpi -> firefox-68.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/af.xpi -> firefox-68.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/an.xpi -> firefox-68.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ar.xpi -> firefox-68.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ast.xpi -> firefox-68.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/az.xpi -> firefox-68.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/be.xpi -> firefox-68.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/bg.xpi -> firefox-68.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/bn.xpi -> firefox-68.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/br.xpi -> firefox-68.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/bs.xpi -> firefox-68.0.1-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ca.xpi -> firefox-68.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/cak.xpi -> firefox-68.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/cs.xpi -> firefox-68.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/cy.xpi -> firefox-68.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/da.xpi -> firefox-68.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/de.xpi -> firefox-68.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/dsb.xpi -> firefox-68.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/el.xpi -> firefox-68.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/en-CA.xpi -> firefox-68.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/en-GB.xpi -> firefox-68.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/eo.xpi -> firefox-68.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/es-AR.xpi -> firefox-68.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/es-CL.xpi -> firefox-68.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/es-ES.xpi -> firefox-68.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/es-MX.xpi -> firefox-68.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/et.xpi -> firefox-68.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/eu.xpi -> firefox-68.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/fa.xpi -> firefox-68.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ff.xpi -> firefox-68.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/fi.xpi -> firefox-68.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/fr.xpi -> firefox-68.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-68.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-68.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/gd.xpi -> firefox-68.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/gl.xpi -> firefox-68.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/gn.xpi -> firefox-68.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-68.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/he.xpi -> firefox-68.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-68.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/hr.xpi -> firefox-68.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/hsb.xpi -> firefox-68.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/hu.xpi -> firefox-68.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-68.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ia.xpi -> firefox-68.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/id.xpi -> firefox-68.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/is.xpi -> firefox-68.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/it.xpi -> firefox-68.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ja.xpi -> firefox-68.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ka.xpi -> firefox-68.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/kab.xpi -> firefox-68.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/kk.xpi -> firefox-68.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/km.xpi -> firefox-68.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/kn.xpi -> firefox-68.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ko.xpi -> firefox-68.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/lij.xpi -> firefox-68.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/lt.xpi -> firefox-68.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/lv.xpi -> firefox-68.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/mk.xpi -> firefox-68.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/mr.xpi -> firefox-68.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ms.xpi -> firefox-68.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/my.xpi -> firefox-68.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-68.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/nl.xpi -> firefox-68.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-68.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/oc.xpi -> firefox-68.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-68.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/pl.xpi -> firefox-68.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-68.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-68.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/rm.xpi -> firefox-68.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ro.xpi -> firefox-68.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ru.xpi -> firefox-68.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/si.xpi -> firefox-68.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/sk.xpi -> firefox-68.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/sl.xpi -> firefox-68.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/son.xpi -> firefox-68.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/sq.xpi -> firefox-68.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/sr.xpi -> firefox-68.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-68.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ta.xpi -> firefox-68.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/te.xpi -> firefox-68.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/th.xpi -> firefox-68.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/tr.xpi -> firefox-68.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/uk.xpi -> firefox-68.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/ur.xpi -> firefox-68.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/uz.xpi -> firefox-68.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/vi.xpi -> firefox-68.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/xh.xpi -> firefox-68.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-68.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-68.0.1-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/68.0.1/source/firefox-68.0.1.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-09.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-68.0-patches-09.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-68.0-patches-09.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-68.0-patches-09.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	fa1351cd910ddd293c48a4888536f069	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18e754fd84f3b518aa9834bc22a6eb54
diff --git a/metadata/md5-cache/www-client/firefox-68.0.2 b/metadata/md5-cache/www-client/firefox-68.0.2
index 18a142268050..398ea9d88e73 100644
--- a/metadata/md5-cache/www-client/firefox-68.0.2
+++ b/metadata/md5-cache/www-client/firefox-68.0.2
@@ -10,6 +10,6 @@ RDEPEND=>=dev-libs/nss-3.44.1 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >
 REQUIRED_USE=wifi? ( dbus ) pgo? ( lto )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ach.xpi -> firefox-68.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/af.xpi -> firefox-68.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/an.xpi -> firefox-68.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ar.xpi -> firefox-68.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ast.xpi -> firefox-68.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/az.xpi -> firefox-68.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/be.xpi -> firefox-68.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/bg.xpi -> firefox-68.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/bn.xpi -> firefox-68.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/br.xpi -> firefox-68.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/bs.xpi -> firefox-68.0.2-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ca.xpi -> firefox-68.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/cak.xpi -> firefox-68.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/cs.xpi -> firefox-68.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/cy.xpi -> firefox-68.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/da.xpi -> firefox-68.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/de.xpi -> firefox-68.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/dsb.xpi -> firefox-68.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/el.xpi -> firefox-68.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/en-CA.xpi -> firefox-68.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/en-GB.xpi -> firefox-68.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/eo.xpi -> firefox-68.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/es-AR.xpi -> firefox-68.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/es-CL.xpi -> firefox-68.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/es-ES.xpi -> firefox-68.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/es-MX.xpi -> firefox-68.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/et.xpi -> firefox-68.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/eu.xpi -> firefox-68.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/fa.xpi -> firefox-68.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ff.xpi -> firefox-68.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/fi.xpi -> firefox-68.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/fr.xpi -> firefox-68.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/fy-NL.xpi -> firefox-68.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ga-IE.xpi -> firefox-68.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/gd.xpi -> firefox-68.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/gl.xpi -> firefox-68.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/gn.xpi -> firefox-68.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/gu-IN.xpi -> firefox-68.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/he.xpi -> firefox-68.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hi-IN.xpi -> firefox-68.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hr.xpi -> firefox-68.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hsb.xpi -> firefox-68.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hu.xpi -> firefox-68.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hy-AM.xpi -> firefox-68.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ia.xpi -> firefox-68.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/id.xpi -> firefox-68.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/is.xpi -> firefox-68.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/it.xpi -> firefox-68.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ja.xpi -> firefox-68.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ka.xpi -> firefox-68.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/kab.xpi -> firefox-68.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/kk.xpi -> firefox-68.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/km.xpi -> firefox-68.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/kn.xpi -> firefox-68.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ko.xpi -> firefox-68.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/lij.xpi -> firefox-68.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/lt.xpi -> firefox-68.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/lv.xpi -> firefox-68.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/mk.xpi -> firefox-68.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/mr.xpi -> firefox-68.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ms.xpi -> firefox-68.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/my.xpi -> firefox-68.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/nb-NO.xpi -> firefox-68.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/nl.xpi -> firefox-68.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/nn-NO.xpi -> firefox-68.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/oc.xpi -> firefox-68.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/pa-IN.xpi -> firefox-68.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/pl.xpi -> firefox-68.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/pt-BR.xpi -> firefox-68.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/pt-PT.xpi -> firefox-68.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/rm.xpi -> firefox-68.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ro.xpi -> firefox-68.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ru.xpi -> firefox-68.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/si.xpi -> firefox-68.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sk.xpi -> firefox-68.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sl.xpi -> firefox-68.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/son.xpi -> firefox-68.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sq.xpi -> firefox-68.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sr.xpi -> firefox-68.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sv-SE.xpi -> firefox-68.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ta.xpi -> firefox-68.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/te.xpi -> firefox-68.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/th.xpi -> firefox-68.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/tr.xpi -> firefox-68.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/uk.xpi -> firefox-68.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ur.xpi -> firefox-68.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/uz.xpi -> firefox-68.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/vi.xpi -> firefox-68.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/xh.xpi -> firefox-68.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/zh-CN.xpi -> firefox-68.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/zh-TW.xpi -> firefox-68.0.2-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/68.0.2/source/firefox-68.0.2.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-09.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-68.0-patches-09.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-68.0-patches-09.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-68.0-patches-09.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	fa1351cd910ddd293c48a4888536f069	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b2ac802a01fdb552f0087faff86ccede
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ach.xpi -> firefox-68.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/af.xpi -> firefox-68.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/an.xpi -> firefox-68.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ar.xpi -> firefox-68.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ast.xpi -> firefox-68.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/az.xpi -> firefox-68.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/be.xpi -> firefox-68.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/bg.xpi -> firefox-68.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/bn.xpi -> firefox-68.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/br.xpi -> firefox-68.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/bs.xpi -> firefox-68.0.2-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ca.xpi -> firefox-68.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/cak.xpi -> firefox-68.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/cs.xpi -> firefox-68.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/cy.xpi -> firefox-68.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/da.xpi -> firefox-68.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/de.xpi -> firefox-68.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/dsb.xpi -> firefox-68.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/el.xpi -> firefox-68.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/en-CA.xpi -> firefox-68.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/en-GB.xpi -> firefox-68.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/eo.xpi -> firefox-68.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/es-AR.xpi -> firefox-68.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/es-CL.xpi -> firefox-68.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/es-ES.xpi -> firefox-68.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/es-MX.xpi -> firefox-68.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/et.xpi -> firefox-68.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/eu.xpi -> firefox-68.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/fa.xpi -> firefox-68.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ff.xpi -> firefox-68.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/fi.xpi -> firefox-68.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/fr.xpi -> firefox-68.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/fy-NL.xpi -> firefox-68.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ga-IE.xpi -> firefox-68.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/gd.xpi -> firefox-68.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/gl.xpi -> firefox-68.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/gn.xpi -> firefox-68.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/gu-IN.xpi -> firefox-68.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/he.xpi -> firefox-68.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hi-IN.xpi -> firefox-68.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hr.xpi -> firefox-68.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hsb.xpi -> firefox-68.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hu.xpi -> firefox-68.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hy-AM.xpi -> firefox-68.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ia.xpi -> firefox-68.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/id.xpi -> firefox-68.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/is.xpi -> firefox-68.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/it.xpi -> firefox-68.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ja.xpi -> firefox-68.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ka.xpi -> firefox-68.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/kab.xpi -> firefox-68.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/kk.xpi -> firefox-68.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/km.xpi -> firefox-68.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/kn.xpi -> firefox-68.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ko.xpi -> firefox-68.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/lij.xpi -> firefox-68.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/lt.xpi -> firefox-68.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/lv.xpi -> firefox-68.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/mk.xpi -> firefox-68.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/mr.xpi -> firefox-68.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ms.xpi -> firefox-68.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/my.xpi -> firefox-68.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/nb-NO.xpi -> firefox-68.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/nl.xpi -> firefox-68.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/nn-NO.xpi -> firefox-68.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/oc.xpi -> firefox-68.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/pa-IN.xpi -> firefox-68.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/pl.xpi -> firefox-68.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/pt-BR.xpi -> firefox-68.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/pt-PT.xpi -> firefox-68.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/rm.xpi -> firefox-68.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ro.xpi -> firefox-68.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ru.xpi -> firefox-68.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/si.xpi -> firefox-68.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sk.xpi -> firefox-68.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sl.xpi -> firefox-68.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/son.xpi -> firefox-68.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sq.xpi -> firefox-68.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sr.xpi -> firefox-68.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sv-SE.xpi -> firefox-68.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ta.xpi -> firefox-68.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/te.xpi -> firefox-68.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/th.xpi -> firefox-68.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/tr.xpi -> firefox-68.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/uk.xpi -> firefox-68.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ur.xpi -> firefox-68.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/uz.xpi -> firefox-68.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/vi.xpi -> firefox-68.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/xh.xpi -> firefox-68.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/zh-CN.xpi -> firefox-68.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/zh-TW.xpi -> firefox-68.0.2-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/68.0.2/source/firefox-68.0.2.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-68.0-patches-11.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=12bb4cf7a784135b4e1c4569967d1df8
diff --git a/metadata/md5-cache/www-client/firefox-68.1.0 b/metadata/md5-cache/www-client/firefox-68.1.0
new file mode 100644
index 000000000000..3ac05e828e38
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-68.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.44.1 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.8.7 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/cargo-1.34.0 >=virtual/rust-1.34.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB 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_ia 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_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc 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_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.44.1 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=wifi? ( dbus ) pgo? ( lto )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ach.xpi -> firefox-68.1.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/af.xpi -> firefox-68.1.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/an.xpi -> firefox-68.1.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ar.xpi -> firefox-68.1.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ast.xpi -> firefox-68.1.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/az.xpi -> firefox-68.1.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/be.xpi -> firefox-68.1.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/bg.xpi -> firefox-68.1.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/bn.xpi -> firefox-68.1.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/br.xpi -> firefox-68.1.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/bs.xpi -> firefox-68.1.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ca.xpi -> firefox-68.1.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/cak.xpi -> firefox-68.1.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/cs.xpi -> firefox-68.1.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/cy.xpi -> firefox-68.1.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/da.xpi -> firefox-68.1.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/de.xpi -> firefox-68.1.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/dsb.xpi -> firefox-68.1.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/el.xpi -> firefox-68.1.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/en-CA.xpi -> firefox-68.1.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/en-GB.xpi -> firefox-68.1.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/eo.xpi -> firefox-68.1.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/es-AR.xpi -> firefox-68.1.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/es-CL.xpi -> firefox-68.1.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/es-ES.xpi -> firefox-68.1.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/es-MX.xpi -> firefox-68.1.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/et.xpi -> firefox-68.1.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/eu.xpi -> firefox-68.1.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/fa.xpi -> firefox-68.1.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ff.xpi -> firefox-68.1.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/fi.xpi -> firefox-68.1.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/fr.xpi -> firefox-68.1.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-68.1.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-68.1.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/gd.xpi -> firefox-68.1.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/gl.xpi -> firefox-68.1.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/gn.xpi -> firefox-68.1.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-68.1.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/he.xpi -> firefox-68.1.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-68.1.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hr.xpi -> firefox-68.1.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hsb.xpi -> firefox-68.1.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hu.xpi -> firefox-68.1.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-68.1.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ia.xpi -> firefox-68.1.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/id.xpi -> firefox-68.1.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/is.xpi -> firefox-68.1.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/it.xpi -> firefox-68.1.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ja.xpi -> firefox-68.1.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ka.xpi -> firefox-68.1.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/kab.xpi -> firefox-68.1.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/kk.xpi -> firefox-68.1.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/km.xpi -> firefox-68.1.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/kn.xpi -> firefox-68.1.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ko.xpi -> firefox-68.1.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/lij.xpi -> firefox-68.1.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/lt.xpi -> firefox-68.1.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/lv.xpi -> firefox-68.1.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/mk.xpi -> firefox-68.1.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/mr.xpi -> firefox-68.1.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ms.xpi -> firefox-68.1.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/my.xpi -> firefox-68.1.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-68.1.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/nl.xpi -> firefox-68.1.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-68.1.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/oc.xpi -> firefox-68.1.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-68.1.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/pl.xpi -> firefox-68.1.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-68.1.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-68.1.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/rm.xpi -> firefox-68.1.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ro.xpi -> firefox-68.1.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ru.xpi -> firefox-68.1.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/si.xpi -> firefox-68.1.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sk.xpi -> firefox-68.1.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sl.xpi -> firefox-68.1.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/son.xpi -> firefox-68.1.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sq.xpi -> firefox-68.1.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sr.xpi -> firefox-68.1.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-68.1.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ta.xpi -> firefox-68.1.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/te.xpi -> firefox-68.1.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/th.xpi -> firefox-68.1.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/tr.xpi -> firefox-68.1.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/uk.xpi -> firefox-68.1.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ur.xpi -> firefox-68.1.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/uz.xpi -> firefox-68.1.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/vi.xpi -> firefox-68.1.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/xh.xpi -> firefox-68.1.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-68.1.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-68.1.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/source/firefox-68.1.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-68.0-patches-11.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9747f88d9126310fdbc0189ccf2ba5cc
diff --git a/metadata/md5-cache/www-client/firefox-69.0 b/metadata/md5-cache/www-client/firefox-69.0
new file mode 100644
index 000000000000..504a653db377
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-69.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.45 >=dev-libs/nspr-4.22 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3=[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme sys-apps/dbus dev-libs/dbus-glib startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.5.3:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.9.0 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/cargo-1.35.0 >=virtual/rust-1.35.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=bindist clang cpu_flags_x86_avx2 debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB 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_ia 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_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc 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_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.45 >=dev-libs/nspr-4.22 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3=[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme sys-apps/dbus dev-libs/dbus-glib startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.5.3:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( 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=pgo? ( lto )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ach.xpi -> firefox-69.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/af.xpi -> firefox-69.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/an.xpi -> firefox-69.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ar.xpi -> firefox-69.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ast.xpi -> firefox-69.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/az.xpi -> firefox-69.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/be.xpi -> firefox-69.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/bg.xpi -> firefox-69.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/bn.xpi -> firefox-69.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/br.xpi -> firefox-69.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/bs.xpi -> firefox-69.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ca.xpi -> firefox-69.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/cak.xpi -> firefox-69.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/cs.xpi -> firefox-69.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/cy.xpi -> firefox-69.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/da.xpi -> firefox-69.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/de.xpi -> firefox-69.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/dsb.xpi -> firefox-69.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/el.xpi -> firefox-69.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/en-CA.xpi -> firefox-69.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/en-GB.xpi -> firefox-69.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/eo.xpi -> firefox-69.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/es-AR.xpi -> firefox-69.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/es-CL.xpi -> firefox-69.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/es-ES.xpi -> firefox-69.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/es-MX.xpi -> firefox-69.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/et.xpi -> firefox-69.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/eu.xpi -> firefox-69.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/fa.xpi -> firefox-69.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ff.xpi -> firefox-69.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/fi.xpi -> firefox-69.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/fr.xpi -> firefox-69.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/fy-NL.xpi -> firefox-69.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ga-IE.xpi -> firefox-69.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/gd.xpi -> firefox-69.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/gl.xpi -> firefox-69.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/gn.xpi -> firefox-69.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/gu-IN.xpi -> firefox-69.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/he.xpi -> firefox-69.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/hi-IN.xpi -> firefox-69.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/hr.xpi -> firefox-69.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/hsb.xpi -> firefox-69.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/hu.xpi -> firefox-69.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/hy-AM.xpi -> firefox-69.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ia.xpi -> firefox-69.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/id.xpi -> firefox-69.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/is.xpi -> firefox-69.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/it.xpi -> firefox-69.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ja.xpi -> firefox-69.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ka.xpi -> firefox-69.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/kab.xpi -> firefox-69.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/kk.xpi -> firefox-69.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/km.xpi -> firefox-69.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/kn.xpi -> firefox-69.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ko.xpi -> firefox-69.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/lij.xpi -> firefox-69.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/lt.xpi -> firefox-69.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/lv.xpi -> firefox-69.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/mk.xpi -> firefox-69.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/mr.xpi -> firefox-69.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ms.xpi -> firefox-69.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/my.xpi -> firefox-69.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/nb-NO.xpi -> firefox-69.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/nl.xpi -> firefox-69.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/nn-NO.xpi -> firefox-69.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/oc.xpi -> firefox-69.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/pa-IN.xpi -> firefox-69.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/pl.xpi -> firefox-69.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/pt-BR.xpi -> firefox-69.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/pt-PT.xpi -> firefox-69.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/rm.xpi -> firefox-69.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ro.xpi -> firefox-69.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ru.xpi -> firefox-69.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/si.xpi -> firefox-69.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/sk.xpi -> firefox-69.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/sl.xpi -> firefox-69.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/son.xpi -> firefox-69.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/sq.xpi -> firefox-69.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/sr.xpi -> firefox-69.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/sv-SE.xpi -> firefox-69.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ta.xpi -> firefox-69.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/te.xpi -> firefox-69.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/th.xpi -> firefox-69.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/tr.xpi -> firefox-69.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/uk.xpi -> firefox-69.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ur.xpi -> firefox-69.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/uz.xpi -> firefox-69.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/vi.xpi -> firefox-69.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/xh.xpi -> firefox-69.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/zh-CN.xpi -> firefox-69.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/zh-TW.xpi -> firefox-69.0-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/69.0/source/firefox-69.0.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-69.0-patches-06.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-69.0-patches-06.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-69.0-patches-06.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-69.0-patches-06.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bf109ba4b2bbd7e5a3164fed3648b73b
diff --git a/metadata/md5-cache/www-client/firefox-bin-60.8.0 b/metadata/md5-cache/www-client/firefox-bin-60.8.0
deleted file mode 100644
index 5a3282bb0f94..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-60.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=app-arch/unzip 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.6.1esr/linux-i686/xpi/ach.xpi -> firefox-60.8.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/af.xpi -> firefox-60.8.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/an.xpi -> firefox-60.8.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ar.xpi -> firefox-60.8.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/as.xpi -> firefox-60.8.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ast.xpi -> firefox-60.8.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/az.xpi -> firefox-60.8.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bg.xpi -> firefox-60.8.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.8.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.8.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/br.xpi -> firefox-60.8.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bs.xpi -> firefox-60.8.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ca.xpi -> firefox-60.8.0esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/cs.xpi -> firefox-60.8.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/cy.xpi -> firefox-60.8.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/da.xpi -> firefox-60.8.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/de.xpi -> firefox-60.8.0esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/el.xpi -> firefox-60.8.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.8.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.8.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/eo.xpi -> firefox-60.8.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.8.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.8.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.8.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.8.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/et.xpi -> firefox-60.8.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/eu.xpi -> firefox-60.8.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fa.xpi -> firefox-60.8.0esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fi.xpi -> firefox-60.8.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fr.xpi -> firefox-60.8.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.8.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.8.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/gd.xpi -> firefox-60.8.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/gl.xpi -> firefox-60.8.0esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.8.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/he.xpi -> firefox-60.8.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.8.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hr.xpi -> firefox-60.8.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.8.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hu.xpi -> firefox-60.8.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.8.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/id.xpi -> firefox-60.8.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/is.xpi -> firefox-60.8.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/it.xpi -> firefox-60.8.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ja.xpi -> firefox-60.8.0esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/kk.xpi -> firefox-60.8.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/km.xpi -> firefox-60.8.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/kn.xpi -> firefox-60.8.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ko.xpi -> firefox-60.8.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/lt.xpi -> firefox-60.8.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/lv.xpi -> firefox-60.8.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/mai.xpi -> firefox-60.8.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/mk.xpi -> firefox-60.8.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ml.xpi -> firefox-60.8.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/mr.xpi -> firefox-60.8.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ms.xpi -> firefox-60.8.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.8.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/nl.xpi -> firefox-60.8.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.8.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/or.xpi -> firefox-60.8.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.8.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pl.xpi -> firefox-60.8.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.8.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.8.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/rm.xpi -> firefox-60.8.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ro.xpi -> firefox-60.8.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ru.xpi -> firefox-60.8.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/si.xpi -> firefox-60.8.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sk.xpi -> firefox-60.8.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sl.xpi -> firefox-60.8.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/son.xpi -> firefox-60.8.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sq.xpi -> firefox-60.8.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sr.xpi -> firefox-60.8.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.8.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ta.xpi -> firefox-60.8.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/te.xpi -> firefox-60.8.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/th.xpi -> firefox-60.8.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/tr.xpi -> firefox-60.8.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/uk.xpi -> firefox-60.8.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/uz.xpi -> firefox-60.8.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/vi.xpi -> firefox-60.8.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/xh.xpi -> firefox-60.8.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.8.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.8.0esr-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.8.0esr/linux-x86_64/en-US/firefox-60.8.0esr.tar.bz2 -> firefox-bin_x86_64-60.8.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.8.0esr/linux-i686/en-US/firefox-60.8.0esr.tar.bz2 -> firefox-bin_i686-60.8.0.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7105819da5c5018fce37c90dc7c32f6
diff --git a/metadata/md5-cache/www-client/firefox-bin-60.9.0 b/metadata/md5-cache/www-client/firefox-bin-60.9.0
new file mode 100644
index 000000000000..24a159fdac76
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-60.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm unpack
+DEPEND=app-arch/unzip 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.6.1esr/linux-i686/xpi/ach.xpi -> firefox-60.9.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/af.xpi -> firefox-60.9.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/an.xpi -> firefox-60.9.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ar.xpi -> firefox-60.9.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/as.xpi -> firefox-60.9.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ast.xpi -> firefox-60.9.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/az.xpi -> firefox-60.9.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bg.xpi -> firefox-60.9.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.9.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.9.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/br.xpi -> firefox-60.9.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bs.xpi -> firefox-60.9.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ca.xpi -> firefox-60.9.0esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/cs.xpi -> firefox-60.9.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/cy.xpi -> firefox-60.9.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/da.xpi -> firefox-60.9.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/de.xpi -> firefox-60.9.0esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/el.xpi -> firefox-60.9.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.9.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.9.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/eo.xpi -> firefox-60.9.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.9.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.9.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.9.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.9.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/et.xpi -> firefox-60.9.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/eu.xpi -> firefox-60.9.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fa.xpi -> firefox-60.9.0esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fi.xpi -> firefox-60.9.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fr.xpi -> firefox-60.9.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.9.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.9.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/gd.xpi -> firefox-60.9.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/gl.xpi -> firefox-60.9.0esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.9.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/he.xpi -> firefox-60.9.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.9.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hr.xpi -> firefox-60.9.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.9.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hu.xpi -> firefox-60.9.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.9.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/id.xpi -> firefox-60.9.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/is.xpi -> firefox-60.9.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/it.xpi -> firefox-60.9.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ja.xpi -> firefox-60.9.0esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/kk.xpi -> firefox-60.9.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/km.xpi -> firefox-60.9.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/kn.xpi -> firefox-60.9.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ko.xpi -> firefox-60.9.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/lt.xpi -> firefox-60.9.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/lv.xpi -> firefox-60.9.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/mai.xpi -> firefox-60.9.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/mk.xpi -> firefox-60.9.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ml.xpi -> firefox-60.9.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/mr.xpi -> firefox-60.9.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ms.xpi -> firefox-60.9.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.9.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/nl.xpi -> firefox-60.9.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.9.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/or.xpi -> firefox-60.9.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.9.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pl.xpi -> firefox-60.9.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.9.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.9.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/rm.xpi -> firefox-60.9.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ro.xpi -> firefox-60.9.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ru.xpi -> firefox-60.9.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/si.xpi -> firefox-60.9.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sk.xpi -> firefox-60.9.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sl.xpi -> firefox-60.9.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/son.xpi -> firefox-60.9.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sq.xpi -> firefox-60.9.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sr.xpi -> firefox-60.9.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.9.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ta.xpi -> firefox-60.9.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/te.xpi -> firefox-60.9.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/th.xpi -> firefox-60.9.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/tr.xpi -> firefox-60.9.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/uk.xpi -> firefox-60.9.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/uz.xpi -> firefox-60.9.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/vi.xpi -> firefox-60.9.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/xh.xpi -> firefox-60.9.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.9.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.9.0esr-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.9.0esr/linux-x86_64/en-US/firefox-60.9.0esr.tar.bz2 -> firefox-bin_x86_64-60.9.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.9.0esr/linux-i686/en-US/firefox-60.9.0esr.tar.bz2 -> firefox-bin_i686-60.9.0.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4adb2b80024544ebed367ec3899f0305
diff --git a/metadata/md5-cache/www-client/firefox-bin-68.0.2 b/metadata/md5-cache/www-client/firefox-bin-68.0.2
deleted file mode 100644
index 0b93afb407de..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-68.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=app-arch/unzip 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_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB 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_ia 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_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc 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_ur 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//68.0.2/linux-i686/xpi/ach.xpi -> firefox-68.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/af.xpi -> firefox-68.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/an.xpi -> firefox-68.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/ar.xpi -> firefox-68.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/ast.xpi -> firefox-68.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/az.xpi -> firefox-68.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/be.xpi -> firefox-68.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/bg.xpi -> firefox-68.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/bn.xpi -> firefox-68.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/br.xpi -> firefox-68.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/bs.xpi -> firefox-68.0.2-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/ca.xpi -> firefox-68.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/cak.xpi -> firefox-68.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/cs.xpi -> firefox-68.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/cy.xpi -> firefox-68.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/da.xpi -> firefox-68.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/de.xpi -> firefox-68.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/dsb.xpi -> firefox-68.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/el.xpi -> firefox-68.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/en-CA.xpi -> firefox-68.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/en-GB.xpi -> firefox-68.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/eo.xpi -> firefox-68.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/es-AR.xpi -> firefox-68.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/es-CL.xpi -> firefox-68.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/es-ES.xpi -> firefox-68.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/es-MX.xpi -> firefox-68.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/et.xpi -> firefox-68.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/eu.xpi -> firefox-68.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/fa.xpi -> firefox-68.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/ff.xpi -> firefox-68.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/fi.xpi -> firefox-68.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/fr.xpi -> firefox-68.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/fy-NL.xpi -> firefox-68.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/ga-IE.xpi -> firefox-68.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/gd.xpi -> firefox-68.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/gl.xpi -> firefox-68.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/gn.xpi -> firefox-68.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/gu-IN.xpi -> firefox-68.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/he.xpi -> firefox-68.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/hi-IN.xpi -> firefox-68.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/hr.xpi -> firefox-68.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/hsb.xpi -> firefox-68.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/hu.xpi -> firefox-68.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/hy-AM.xpi -> firefox-68.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/ia.xpi -> firefox-68.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/id.xpi -> firefox-68.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/is.xpi -> firefox-68.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/it.xpi -> firefox-68.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/ja.xpi -> firefox-68.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/ka.xpi -> firefox-68.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/kab.xpi -> firefox-68.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/kk.xpi -> firefox-68.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/km.xpi -> firefox-68.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/kn.xpi -> firefox-68.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/ko.xpi -> firefox-68.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/lij.xpi -> firefox-68.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/lt.xpi -> firefox-68.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/lv.xpi -> firefox-68.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/mk.xpi -> firefox-68.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/mr.xpi -> firefox-68.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/ms.xpi -> firefox-68.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/my.xpi -> firefox-68.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/nb-NO.xpi -> firefox-68.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/nl.xpi -> firefox-68.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/nn-NO.xpi -> firefox-68.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/oc.xpi -> firefox-68.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/pa-IN.xpi -> firefox-68.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/pl.xpi -> firefox-68.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/pt-BR.xpi -> firefox-68.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/pt-PT.xpi -> firefox-68.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/rm.xpi -> firefox-68.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/ro.xpi -> firefox-68.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/ru.xpi -> firefox-68.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/si.xpi -> firefox-68.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/sk.xpi -> firefox-68.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/sl.xpi -> firefox-68.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/son.xpi -> firefox-68.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/sq.xpi -> firefox-68.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/sr.xpi -> firefox-68.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/sv-SE.xpi -> firefox-68.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/ta.xpi -> firefox-68.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/te.xpi -> firefox-68.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/th.xpi -> firefox-68.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/tr.xpi -> firefox-68.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/uk.xpi -> firefox-68.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/ur.xpi -> firefox-68.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/uz.xpi -> firefox-68.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/vi.xpi -> firefox-68.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/xh.xpi -> firefox-68.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/zh-CN.xpi -> firefox-68.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.0.2/linux-i686/xpi/zh-TW.xpi -> firefox-68.0.2-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/68.0.2/linux-x86_64/en-US/firefox-68.0.2.tar.bz2 -> firefox-bin_x86_64-68.0.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/68.0.2/linux-i686/en-US/firefox-68.0.2.tar.bz2 -> firefox-bin_i686-68.0.2.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b82b52f1133099dff24803542c182b3
diff --git a/metadata/md5-cache/www-client/firefox-bin-68.1.0 b/metadata/md5-cache/www-client/firefox-bin-68.1.0
new file mode 100644
index 000000000000..d43cd5b1b0b8
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-68.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm unpack
+DEPEND=app-arch/unzip 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_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB 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_ia 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_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc 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_ur 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//68.1.0esr/linux-i686/xpi/ach.xpi -> firefox-68.1.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/af.xpi -> firefox-68.1.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/an.xpi -> firefox-68.1.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/ar.xpi -> firefox-68.1.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/ast.xpi -> firefox-68.1.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/az.xpi -> firefox-68.1.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/be.xpi -> firefox-68.1.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/bg.xpi -> firefox-68.1.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/bn.xpi -> firefox-68.1.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/br.xpi -> firefox-68.1.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/bs.xpi -> firefox-68.1.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/ca.xpi -> firefox-68.1.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/cak.xpi -> firefox-68.1.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/cs.xpi -> firefox-68.1.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/cy.xpi -> firefox-68.1.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/da.xpi -> firefox-68.1.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/de.xpi -> firefox-68.1.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/dsb.xpi -> firefox-68.1.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/el.xpi -> firefox-68.1.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/en-CA.xpi -> firefox-68.1.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/en-GB.xpi -> firefox-68.1.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/eo.xpi -> firefox-68.1.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/es-AR.xpi -> firefox-68.1.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/es-CL.xpi -> firefox-68.1.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/es-ES.xpi -> firefox-68.1.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/es-MX.xpi -> firefox-68.1.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/et.xpi -> firefox-68.1.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/eu.xpi -> firefox-68.1.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/fa.xpi -> firefox-68.1.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/ff.xpi -> firefox-68.1.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/fi.xpi -> firefox-68.1.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/fr.xpi -> firefox-68.1.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-68.1.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-68.1.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/gd.xpi -> firefox-68.1.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/gl.xpi -> firefox-68.1.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/gn.xpi -> firefox-68.1.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-68.1.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/he.xpi -> firefox-68.1.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-68.1.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/hr.xpi -> firefox-68.1.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/hsb.xpi -> firefox-68.1.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/hu.xpi -> firefox-68.1.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-68.1.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/ia.xpi -> firefox-68.1.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/id.xpi -> firefox-68.1.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/is.xpi -> firefox-68.1.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/it.xpi -> firefox-68.1.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/ja.xpi -> firefox-68.1.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/ka.xpi -> firefox-68.1.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/kab.xpi -> firefox-68.1.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/kk.xpi -> firefox-68.1.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/km.xpi -> firefox-68.1.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/kn.xpi -> firefox-68.1.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/ko.xpi -> firefox-68.1.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/lij.xpi -> firefox-68.1.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/lt.xpi -> firefox-68.1.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/lv.xpi -> firefox-68.1.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/mk.xpi -> firefox-68.1.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/mr.xpi -> firefox-68.1.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/ms.xpi -> firefox-68.1.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/my.xpi -> firefox-68.1.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-68.1.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/nl.xpi -> firefox-68.1.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-68.1.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/oc.xpi -> firefox-68.1.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-68.1.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/pl.xpi -> firefox-68.1.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-68.1.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-68.1.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/rm.xpi -> firefox-68.1.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/ro.xpi -> firefox-68.1.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/ru.xpi -> firefox-68.1.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/si.xpi -> firefox-68.1.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/sk.xpi -> firefox-68.1.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/sl.xpi -> firefox-68.1.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/son.xpi -> firefox-68.1.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/sq.xpi -> firefox-68.1.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/sr.xpi -> firefox-68.1.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-68.1.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/ta.xpi -> firefox-68.1.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/te.xpi -> firefox-68.1.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/th.xpi -> firefox-68.1.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/tr.xpi -> firefox-68.1.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/uk.xpi -> firefox-68.1.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/ur.xpi -> firefox-68.1.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/uz.xpi -> firefox-68.1.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/vi.xpi -> firefox-68.1.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/xh.xpi -> firefox-68.1.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-68.1.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//68.1.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-68.1.0esr-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/68.1.0esr/linux-x86_64/en-US/firefox-68.1.0esr.tar.bz2 -> firefox-bin_x86_64-68.1.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/68.1.0esr/linux-i686/en-US/firefox-68.1.0esr.tar.bz2 -> firefox-bin_i686-68.1.0.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c16a4c716a9b58bc4135da5861c037d3
diff --git a/metadata/md5-cache/www-client/firefox-bin-69.0 b/metadata/md5-cache/www-client/firefox-bin-69.0
new file mode 100644
index 000000000000..5cf3a6522523
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-69.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm unpack
+DEPEND=app-arch/unzip 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_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB 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_ia 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_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc 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_ur 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//69.0/linux-i686/xpi/ach.xpi -> firefox-69.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/af.xpi -> firefox-69.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/an.xpi -> firefox-69.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/ar.xpi -> firefox-69.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/ast.xpi -> firefox-69.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/az.xpi -> firefox-69.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/be.xpi -> firefox-69.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/bg.xpi -> firefox-69.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/bn.xpi -> firefox-69.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/br.xpi -> firefox-69.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/bs.xpi -> firefox-69.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/ca.xpi -> firefox-69.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/cak.xpi -> firefox-69.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/cs.xpi -> firefox-69.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/cy.xpi -> firefox-69.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/da.xpi -> firefox-69.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/de.xpi -> firefox-69.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/dsb.xpi -> firefox-69.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/el.xpi -> firefox-69.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/en-CA.xpi -> firefox-69.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/en-GB.xpi -> firefox-69.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/eo.xpi -> firefox-69.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/es-AR.xpi -> firefox-69.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/es-CL.xpi -> firefox-69.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/es-ES.xpi -> firefox-69.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/es-MX.xpi -> firefox-69.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/et.xpi -> firefox-69.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/eu.xpi -> firefox-69.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/fa.xpi -> firefox-69.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/ff.xpi -> firefox-69.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/fi.xpi -> firefox-69.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/fr.xpi -> firefox-69.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/fy-NL.xpi -> firefox-69.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/ga-IE.xpi -> firefox-69.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/gd.xpi -> firefox-69.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/gl.xpi -> firefox-69.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/gn.xpi -> firefox-69.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/gu-IN.xpi -> firefox-69.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/he.xpi -> firefox-69.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/hi-IN.xpi -> firefox-69.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/hr.xpi -> firefox-69.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/hsb.xpi -> firefox-69.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/hu.xpi -> firefox-69.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/hy-AM.xpi -> firefox-69.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/ia.xpi -> firefox-69.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/id.xpi -> firefox-69.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/is.xpi -> firefox-69.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/it.xpi -> firefox-69.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/ja.xpi -> firefox-69.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/ka.xpi -> firefox-69.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/kab.xpi -> firefox-69.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/kk.xpi -> firefox-69.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/km.xpi -> firefox-69.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/kn.xpi -> firefox-69.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/ko.xpi -> firefox-69.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/lij.xpi -> firefox-69.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/lt.xpi -> firefox-69.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/lv.xpi -> firefox-69.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/mk.xpi -> firefox-69.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/mr.xpi -> firefox-69.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/ms.xpi -> firefox-69.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/my.xpi -> firefox-69.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/nb-NO.xpi -> firefox-69.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/nl.xpi -> firefox-69.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/nn-NO.xpi -> firefox-69.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/oc.xpi -> firefox-69.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/pa-IN.xpi -> firefox-69.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/pl.xpi -> firefox-69.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/pt-BR.xpi -> firefox-69.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/pt-PT.xpi -> firefox-69.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/rm.xpi -> firefox-69.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/ro.xpi -> firefox-69.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/ru.xpi -> firefox-69.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/si.xpi -> firefox-69.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/sk.xpi -> firefox-69.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/sl.xpi -> firefox-69.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/son.xpi -> firefox-69.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/sq.xpi -> firefox-69.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/sr.xpi -> firefox-69.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/sv-SE.xpi -> firefox-69.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/ta.xpi -> firefox-69.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/te.xpi -> firefox-69.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/th.xpi -> firefox-69.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/tr.xpi -> firefox-69.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/uk.xpi -> firefox-69.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/ur.xpi -> firefox-69.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/uz.xpi -> firefox-69.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/vi.xpi -> firefox-69.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/xh.xpi -> firefox-69.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/zh-CN.xpi -> firefox-69.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//69.0/linux-i686/xpi/zh-TW.xpi -> firefox-69.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/69.0/linux-x86_64/en-US/firefox-69.0.tar.bz2 -> firefox-bin_x86_64-69.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/69.0/linux-i686/en-US/firefox-69.0.tar.bz2 -> firefox-bin_i686-69.0.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3c88f373eb875abd73667f010ac61d0c
diff --git a/metadata/md5-cache/www-client/google-chrome-76.0.3809.100 b/metadata/md5-cache/www-client/google-chrome-76.0.3809.100
deleted file mode 100644
index 90621abe977e..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-76.0.3809.100
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_76.0.3809.100-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/google-chrome-76.0.3809.132 b/metadata/md5-cache/www-client/google-chrome-76.0.3809.132
new file mode 100644
index 000000000000..d98eb75292dc
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-76.0.3809.132
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_76.0.3809.132-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-77.0.3865.35 b/metadata/md5-cache/www-client/google-chrome-beta-77.0.3865.35
deleted file mode 100644
index fe07efa3b4ab..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-77.0.3865.35
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_77.0.3865.35-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41d165a2c0d07dba94ea75edcaf796a1
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-77.0.3865.56 b/metadata/md5-cache/www-client/google-chrome-beta-77.0.3865.56
new file mode 100644
index 000000000000..cb14a3fbb6a8
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-77.0.3865.56
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_77.0.3865.56-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=41d165a2c0d07dba94ea75edcaf796a1
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3880.4 b/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3880.4
deleted file mode 100644
index 87f2eb59051a..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3880.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_78.0.3880.4-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41d165a2c0d07dba94ea75edcaf796a1
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3887.7 b/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3887.7
new file mode 100644
index 000000000000..136ab7014d5c
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3887.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_78.0.3887.7-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=41d165a2c0d07dba94ea75edcaf796a1
diff --git a/metadata/md5-cache/www-client/opera-12.16_p1860-r1 b/metadata/md5-cache/www-client/opera-12.16_p1860-r1
deleted file mode 100644
index 0fae71dcb4b4..000000000000
--- a/metadata/md5-cache/www-client/opera-12.16_p1860-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4 app-arch/xz-utils
-DESCRIPTION=A fast and secure web browser and Internet suite
-EAPI=6
-HOMEPAGE=https://www.opera.com/
-IUSE=elibc_FreeBSD gtk multilib l10n_af l10n_ar l10n_az l10n_be l10n_bg l10n_bn l10n_cnr l10n_cs l10n_da l10n_de l10n_el l10n_en-GB l10n_es-419 l10n_es-ES l10n_et l10n_fa l10n_fi l10n_fr l10n_fr-CA l10n_fy l10n_gd l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_it l10n_ja l10n_ka l10n_kk l10n_ko l10n_lt l10n_lv l10n_mk l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sr l10n_sv l10n_sw l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_uk l10n_ur l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_zu
-KEYWORDS=amd64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=OPERA-12 LGPL-2 LGPL-3
-RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt x11-misc/xdg-utils gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( x11-libs/gtk+:2 ) x11-libs/pango x11-libs/pixman )
-SLOT=0
-SRC_URI=amd64? ( mirror://opera/linux/1216/opera-12.16-1860.x86_64.linux.tar.xz ) amd64-fbsd? ( mirror://opera/unix/1216/opera-12.16-1860.amd64.freebsd.tar.xz ) x86? ( mirror://opera/linux/1216/opera-12.16-1860.i386.linux.tar.xz ) x86-fbsd? ( mirror://opera/unix/1216/opera-12.16-1860.i386.freebsd.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=be0c66071fc9a6720038844178c32412
diff --git a/metadata/md5-cache/www-client/opera-62.0.3331.116 b/metadata/md5-cache/www-client/opera-62.0.3331.116
deleted file mode 100644
index 82025224b9d6..000000000000
--- a/metadata/md5-cache/www-client/opera-62.0.3331.116
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/62.0.3331.116/linux/opera-stable_62.0.3331.116_amd64.deb https://download2.operacdn.com/pub/opera/desktop/62.0.3331.116/linux/opera-stable_62.0.3331.116_amd64.deb https://download3.operacdn.com/pub/opera/desktop/62.0.3331.116/linux/opera-stable_62.0.3331.116_amd64.deb https://download4.operacdn.com/pub/opera/desktop/62.0.3331.116/linux/opera-stable_62.0.3331.116_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c405f1b3aeb4dfc4829a3aef6100e22d
diff --git a/metadata/md5-cache/www-client/opera-63.0.3368.53 b/metadata/md5-cache/www-client/opera-63.0.3368.53
new file mode 100644
index 000000000000..4b53cc285a98
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-63.0.3368.53
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/63.0.3368.53/linux/opera-stable_63.0.3368.53_amd64.deb https://download2.operacdn.com/pub/opera/desktop/63.0.3368.53/linux/opera-stable_63.0.3368.53_amd64.deb https://download3.operacdn.com/pub/opera/desktop/63.0.3368.53/linux/opera-stable_63.0.3368.53_amd64.deb https://download4.operacdn.com/pub/opera/desktop/63.0.3368.53/linux/opera-stable_63.0.3368.53_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=89708cd7601a34cbaa703f107640ea1c
diff --git a/metadata/md5-cache/www-client/opera-63.0.3368.66 b/metadata/md5-cache/www-client/opera-63.0.3368.66
new file mode 100644
index 000000000000..dafa14e7bde0
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-63.0.3368.66
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/63.0.3368.66/linux/opera-stable_63.0.3368.66_amd64.deb https://download2.operacdn.com/pub/opera/desktop/63.0.3368.66/linux/opera-stable_63.0.3368.66_amd64.deb https://download3.operacdn.com/pub/opera/desktop/63.0.3368.66/linux/opera-stable_63.0.3368.66_amd64.deb https://download4.operacdn.com/pub/opera/desktop/63.0.3368.66/linux/opera-stable_63.0.3368.66_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=042e9bfb56943b80785aa8a9197b3797
diff --git a/metadata/md5-cache/www-client/opera-beta-63.0.3368.29 b/metadata/md5-cache/www-client/opera-beta-63.0.3368.29
deleted file mode 100644
index 04e128338d06..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-63.0.3368.29
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/63.0.3368.29/linux/opera-beta_63.0.3368.29_amd64.deb https://download2.operacdn.com/pub/opera-beta/63.0.3368.29/linux/opera-beta_63.0.3368.29_amd64.deb https://download3.operacdn.com/pub/opera-beta/63.0.3368.29/linux/opera-beta_63.0.3368.29_amd64.deb https://download4.operacdn.com/pub/opera-beta/63.0.3368.29/linux/opera-beta_63.0.3368.29_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a6af105b075ad391ce7d3274cbee92f
diff --git a/metadata/md5-cache/www-client/opera-beta-63.0.3368.33 b/metadata/md5-cache/www-client/opera-beta-63.0.3368.33
deleted file mode 100644
index 17ecd20e21af..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-63.0.3368.33
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/63.0.3368.33/linux/opera-beta_63.0.3368.33_amd64.deb https://download2.operacdn.com/pub/opera-beta/63.0.3368.33/linux/opera-beta_63.0.3368.33_amd64.deb https://download3.operacdn.com/pub/opera-beta/63.0.3368.33/linux/opera-beta_63.0.3368.33_amd64.deb https://download4.operacdn.com/pub/opera-beta/63.0.3368.33/linux/opera-beta_63.0.3368.33_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a6af105b075ad391ce7d3274cbee92f
diff --git a/metadata/md5-cache/www-client/opera-beta-64.0.3417.8 b/metadata/md5-cache/www-client/opera-beta-64.0.3417.8
new file mode 100644
index 000000000000..ce9a9b55cfca
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-64.0.3417.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/64.0.3417.8/linux/opera-beta_64.0.3417.8_amd64.deb https://download2.operacdn.com/pub/opera-beta/64.0.3417.8/linux/opera-beta_64.0.3417.8_amd64.deb https://download3.operacdn.com/pub/opera-beta/64.0.3417.8/linux/opera-beta_64.0.3417.8_amd64.deb https://download4.operacdn.com/pub/opera-beta/64.0.3417.8/linux/opera-beta_64.0.3417.8_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3a6af105b075ad391ce7d3274cbee92f
diff --git a/metadata/md5-cache/www-client/opera-developer-64.0.3407.0 b/metadata/md5-cache/www-client/opera-developer-64.0.3407.0
deleted file mode 100644
index fd1e37ce73ff..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-64.0.3407.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/64.0.3407.0/linux/opera-developer_64.0.3407.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/64.0.3407.0/linux/opera-developer_64.0.3407.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/64.0.3407.0/linux/opera-developer_64.0.3407.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/64.0.3407.0/linux/opera-developer_64.0.3407.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15a3756fba642990d5e49f40be495e5e
diff --git a/metadata/md5-cache/www-client/opera-developer-64.0.3409.0 b/metadata/md5-cache/www-client/opera-developer-64.0.3409.0
deleted file mode 100644
index 172a543ec57c..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-64.0.3409.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/64.0.3409.0/linux/opera-developer_64.0.3409.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/64.0.3409.0/linux/opera-developer_64.0.3409.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/64.0.3409.0/linux/opera-developer_64.0.3409.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/64.0.3409.0/linux/opera-developer_64.0.3409.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15a3756fba642990d5e49f40be495e5e
diff --git a/metadata/md5-cache/www-client/opera-developer-65.0.3425.0 b/metadata/md5-cache/www-client/opera-developer-65.0.3425.0
new file mode 100644
index 000000000000..c53be1756fc9
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-65.0.3425.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/65.0.3425.0/linux/opera-developer_65.0.3425.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/65.0.3425.0/linux/opera-developer_65.0.3425.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/65.0.3425.0/linux/opera-developer_65.0.3425.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/65.0.3425.0/linux/opera-developer_65.0.3425.0_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=15a3756fba642990d5e49f40be495e5e
diff --git a/metadata/md5-cache/www-client/opera-developer-65.0.3430.0 b/metadata/md5-cache/www-client/opera-developer-65.0.3430.0
new file mode 100644
index 000000000000..d1d803691236
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-65.0.3430.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/65.0.3430.0/linux/opera-developer_65.0.3430.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/65.0.3430.0/linux/opera-developer_65.0.3430.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/65.0.3430.0/linux/opera-developer_65.0.3430.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/65.0.3430.0/linux/opera-developer_65.0.3430.0_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=15a3756fba642990d5e49f40be495e5e
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.5 b/metadata/md5-cache/www-client/seamonkey-2.49.5
new file mode 100644
index 000000000000..0170c64ba960
--- /dev/null
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] ) ) ) 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=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.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=Seamonkey Web Browser
+EAPI=6
+HOMEPAGE=http://www.seamonkey-project.org
+IUSE=+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test custom-cflags custom-optimization clang dbus debug neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx wifi l10n_cs l10n_de l10n_en-GB l10n_es-AR l10n_es-ES l10n_fr l10n_hu l10n_it l10n_ja l10n_lt l10n_nl l10n_pl l10n_pt-PT l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW
+KEYWORDS=amd64 ~ppc64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.49.5/source/seamonkey-2.49.5.source.tar.xz -> seamonkey-2.49.5.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.49.5/source/seamonkey-2.49.5.source-l10n.tar.xz -> seamonkey-2.49.5.source-l10n.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.49.5-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.49.5-patches-01.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	4f62da16d617090e7ca9d890a4a9357a	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7bea2cb2a267cabf5dcd894a48419ecf
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0
index d2eaea101ea9..7fec73b7b5f3 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.9.1_p0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-2.0.5 ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.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
+DEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.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=Seamonkey Web Browser
 EAPI=6
 HOMEPAGE=http://www.seamonkey-project.org
 IUSE=+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx force-gtk3 wifi l10n_cs l10n_de l10n_en-GB l10n_es-AR l10n_es-ES l10n_fr l10n_hu l10n_it l10n_ja l10n_lt l10n_nl l10n_pl l10n_pt-PT l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW
 KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( >=x11-plugins/enigmail-2.0.5 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/source/thunderbird-52.9.1.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/cs.xpi -> seamonkey-2.49.9.1-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/de.xpi -> seamonkey-2.49.9.1-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.9.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.9.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.9.1-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/fr.xpi -> seamonkey-2.49.9.1-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/hu.xpi -> seamonkey-2.49.9.1-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/it.xpi -> seamonkey-2.49.9.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ja.xpi -> seamonkey-2.49.9.1-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/lt.xpi -> seamonkey-2.49.9.1-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/nl.xpi -> seamonkey-2.49.9.1-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pl.xpi -> seamonkey-2.49.9.1-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.9.1-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/ru.xpi -> seamonkey-2.49.9.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sk.xpi -> seamonkey-2.49.9.1-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.9.1-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.9.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.9.1/../../../seamonkey/releases/2.49.1/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.9.1-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.4-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.52	43edd59f1e8e1f9536f3c0d3703ece9d	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c793e4af30ae80b3a608a79c9d74e198
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.52	43edd59f1e8e1f9536f3c0d3703ece9d	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ec6f62b69037316720bf678f62d7b742
diff --git a/metadata/md5-cache/www-client/vivaldi-2.6.1566.40_p1 b/metadata/md5-cache/www-client/vivaldi-2.6.1566.40_p1
deleted file mode 100644
index de8e195f026d..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-2.6.1566.40_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.6.1566.40-1_amd64.deb -> vivaldi-2.6.1566.40_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.6.1566.40-1_armhf.deb -> vivaldi-2.6.1566.40_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.6.1566.40-1_i386.deb -> vivaldi-2.6.1566.40_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c71bed7d90a1783a268c7e21ac0c7fba
diff --git a/metadata/md5-cache/www-client/vivaldi-2.7.1628.30_p1 b/metadata/md5-cache/www-client/vivaldi-2.7.1628.30_p1
new file mode 100644
index 000000000000..db1f08958da6
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-2.7.1628.30_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=virtual/libiconv
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* amd64 ~arm x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.30-1_amd64.deb -> vivaldi-2.7.1628.30_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.30-1_armhf.deb -> vivaldi-2.7.1628.30_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.30-1_i386.deb -> vivaldi-2.7.1628.30_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c71bed7d90a1783a268c7e21ac0c7fba
diff --git a/metadata/md5-cache/www-client/vivaldi-2.7.1628.33_p1 b/metadata/md5-cache/www-client/vivaldi-2.7.1628.33_p1
new file mode 100644
index 000000000000..3516acf6784c
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-2.7.1628.33_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=virtual/libiconv
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.33-1_amd64.deb -> vivaldi-2.7.1628.33_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.33-1_armhf.deb -> vivaldi-2.7.1628.33_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.33-1_i386.deb -> vivaldi-2.7.1628.33_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6ad3d712e255fffc3879cdf00b491412
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.7.1628.21_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.7.1628.21_p1
deleted file mode 100644
index ce73ef7d1d95..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-2.7.1628.21_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +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_gd +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 ~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.7.1628.21-1_amd64.deb -> vivaldi-snapshot-2.7.1628.21_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.7.1628.21-1_arm64.deb -> vivaldi-snapshot-2.7.1628.21_p1-arm64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.7.1628.21-1_i386.deb -> vivaldi-snapshot-2.7.1628.21_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de6c7914abc1088989488af9607b839e
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.7.1628.26_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.7.1628.26_p1
deleted file mode 100644
index ef0753e875ed..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-2.7.1628.26_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +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_gd +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 ~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.7.1628.26-1_amd64.deb -> vivaldi-snapshot-2.7.1628.26_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.7.1628.26-1_arm64.deb -> vivaldi-snapshot-2.7.1628.26_p1-arm64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.7.1628.26-1_i386.deb -> vivaldi-snapshot-2.7.1628.26_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de6c7914abc1088989488af9607b839e
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1649.4_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1649.4_p1
new file mode 100644
index 000000000000..3ff9ee2631aa
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1649.4_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=virtual/libiconv
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +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_gd +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 ~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.8.1649.4-1_amd64.deb -> vivaldi-snapshot-2.8.1649.4_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1649.4-1_arm64.deb -> vivaldi-snapshot-2.8.1649.4_p1-arm64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1649.4-1_i386.deb -> vivaldi-snapshot-2.8.1649.4_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=de6c7914abc1088989488af9607b839e
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1650.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1650.3_p1
new file mode 100644
index 000000000000..1f9793e2e403
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1650.3_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=virtual/libiconv
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +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_gd +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 ~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.8.1650.3-1_amd64.deb -> vivaldi-snapshot-2.8.1650.3_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1650.3-1_arm64.deb -> vivaldi-snapshot-2.8.1650.3_p1-arm64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1650.3-1_i386.deb -> vivaldi-snapshot-2.8.1650.3_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=de6c7914abc1088989488af9607b839e
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index b5dfc7ee9f20..e00e63248bd2 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-76.0.3809.100 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-76.0.3809.100
deleted file mode 100644
index 081566b73962..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-76.0.3809.100
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_76.0.3809.100-1_amd64.deb
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=d42a365cfcb1cb0bb53fcf1c1818eeb6
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-76.0.3809.132 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-76.0.3809.132
new file mode 100644
index 000000000000..8aab736c44e8
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-76.0.3809.132
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=stable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_76.0.3809.132-1_amd64.deb
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=d42a365cfcb1cb0bb53fcf1c1818eeb6
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.35_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.35_beta
deleted file mode 100644
index 3d9aecbd3cd2..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.35_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_77.0.3865.35-1_amd64.deb
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.56_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.56_beta
new file mode 100644
index 000000000000..529de3fcaef9
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.56_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_77.0.3865.56-1_amd64.deb
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3880.4_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3880.4_alpha
deleted file mode 100644
index c4eff2d0ed9b..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3880.4_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_78.0.3880.4-1_amd64.deb
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3887.7_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3887.7_alpha
new file mode 100644
index 000000000000..8f7c4955de26
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3887.7_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_78.0.3887.7-1_amd64.deb
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index c998c2429cb0..976816d7d165 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/apache-2.4.39 b/metadata/md5-cache/www-servers/apache-2.4.39
deleted file mode 100644
index 6b2ef77c64d2..000000000000
--- a/metadata/md5-cache/www-servers/apache-2.4.39
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) suexec? ( suexec-caps? ( sys-libs/libcap ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) >=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:0= ) ) !=www-servers/apache-1* virtual/pkgconfig
-DESCRIPTION=The Apache Web Server
-EAPI=6
-HOMEPAGE=https://httpd.apache.org/
-IUSE=+suexec-caps suexec-syslog ssl debug doc gdbm ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
-LICENSE=Apache-2.0 Apache-1.1
-PDEPEND=~app-admin/apache-tools-2.4.39
-RDEPEND=apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) >=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:0= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache ) virtual/tmpfiles
-REQUIRED_USE=apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_substitute? ( apache2_modules_filter )
-SLOT=2
-SRC_URI=mirror://apache/httpd/httpd-2.4.39.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.39-20190402.tar.bz2
-_eclasses_=apache-2	20ad1434bfafa6a0c06f7898cf4059ef	autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1677a9e54cab16486f247541cd0e87d0
diff --git a/metadata/md5-cache/www-servers/apache-2.4.41 b/metadata/md5-cache/www-servers/apache-2.4.41
index 2a38b020fa0c..4ee2f6270183 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.41
+++ b/metadata/md5-cache/www-servers/apache-2.4.41
@@ -4,7 +4,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=+suexec-caps suexec-syslog ssl debug doc gdbm ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_auth_form apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authn_socache apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_session apache2_modules_session_cookie apache2_modules_session_crypto apache2_modules_session_dbd apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.41
 RDEPEND=apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_session_crypto? ( libressl? ( dev-libs/apr-util[libressl] ) !libressl? ( dev-libs/apr-util[openssl] ) ) >=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:0= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache ) virtual/tmpfiles
@@ -12,4 +12,4 @@ REQUIRED_USE=apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.41.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.39-20190402.tar.bz2
 _eclasses_=apache-2	20ad1434bfafa6a0c06f7898cf4059ef	autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d62f72e78d68209fdad1f69b918ac4fb
+_md5_=79f31a75dc86e9b017b8f3c56ea5a484
diff --git a/metadata/md5-cache/www-servers/civetweb-1.10 b/metadata/md5-cache/www-servers/civetweb-1.10
deleted file mode 100644
index 3229fdacd848..000000000000
--- a/metadata/md5-cache/www-servers/civetweb-1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ssl? ( dev-libs/openssl:0= ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Embedded C/C++ web server
-EAPI=6
-HOMEPAGE=https://github.com/civetweb/civetweb/
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=https://github.com/civetweb/civetweb/archive/v1.10.tar.gz -> civetweb-1.10.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a85131921eec31ae7ff0aadcfa27d22
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.10.0 b/metadata/md5-cache/www-servers/nginx-unit-1.10.0
new file mode 100644
index 000000000000..3e073a21de13
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install setup
+DEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ruby? ( dev-lang/ruby:= )
+DESCRIPTION=A dynamic web and application server
+EAPI=7
+HOMEPAGE=https://unit.nginx.org
+IUSE=perl python ruby php5-6 php7-1 php7-2 php7-3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ruby? ( dev-lang/ruby:= )
+REQUIRED_USE=|| ( perl python ruby php5-6 php7-1 php7-2 php7-3 ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=https://unit.nginx.org/download/unit-1.10.0.tar.gz -> nginx-unit-1.10.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=1da3e3a0f23d5355341ce07d7a8bb1b9
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.45 b/metadata/md5-cache/www-servers/tomcat-8.5.45
new file mode 100644
index 000000000000..5fdefff142d4
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.45
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 app-admin/pwgen >=dev-java/ant-core-1.9.13 >=virtual/jdk-1.7 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.45/src/apache-tomcat-8.5.45-src.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=57440fb9295fcb1ae22cd794f69795b4
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.24 b/metadata/md5-cache/www-servers/tomcat-9.0.24
new file mode 100644
index 000000000000..096a785e4029
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.10 dev-java/glassfish-xmlrpc-api:0 dev-java/tomcat-servlet-api:4.0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 >=virtual/jdk-11 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.10 dev-java/glassfish-xmlrpc-api:0 dev-java/tomcat-servlet-api:4.0 dev-java/wsdl4j:0 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.24/src/apache-tomcat-9.0.24-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/4.1.0/biz.aQute.bnd-4.1.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/4.1.0/biz.aQute.bndlib-4.1.0.jar
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=aeb96d2319a10dd23ec46ae09d8ab848
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 035114892e91..2f19bbfddec1 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.24 b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.24
index 0249707074e9..13e632dfc44c 100644
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.24
+++ b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.24
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) ove
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/igt-gpu-tools-1.24.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=685d8e9d10dcb4d60750b4f223856835
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-9999 b/metadata/md5-cache/x11-apps/igt-gpu-tools-9999
index e1b81da92f16..2aac0708a351 100644
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-9999
+++ b/metadata/md5-cache/x11-apps/igt-gpu-tools-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/libunwind:= s
 REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=685d8e9d10dcb4d60750b4f223856835
diff --git a/metadata/md5-cache/x11-apps/listres-1.0.4 b/metadata/md5-cache/x11-apps/listres-1.0.4
index c4ac042cd7b4..fc2ef66dcf07 100644
--- a/metadata/md5-cache/x11-apps/listres-1.0.4
+++ b/metadata/md5-cache/x11-apps/listres-1.0.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/listres-1.0.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=8fd6216f3880b5f3bf15b050fda3ca38
diff --git a/metadata/md5-cache/x11-apps/mkfontscale-1.2.1 b/metadata/md5-cache/x11-apps/mkfontscale-1.2.1
index 20985d2a9db7..7546a8ba3146 100644
--- a/metadata/md5-cache/x11-apps/mkfontscale-1.2.1
+++ b/metadata/md5-cache/x11-apps/mkfontscale-1.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libfontenc media-libs/freetype:2 sys-libs/zlib app-arch/bzip2 !<x11-apps/mkfontdir-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/mkfontscale-1.2.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=e9a1254f4e3e4af9c28dc6d8e55df169
diff --git a/metadata/md5-cache/x11-apps/sessreg-1.1.2 b/metadata/md5-cache/x11-apps/sessreg-1.1.2
index ef77597f4c41..b25b5ad74d49 100644
--- a/metadata/md5-cache/x11-apps/sessreg-1.1.2
+++ b/metadata/md5-cache/x11-apps/sessreg-1.1.2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~a
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/sessreg-1.1.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=ed2ef4b9f2480460a3221714fdbfe0d7
diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.3.2 b/metadata/md5-cache/x11-apps/setxkbmap-1.3.2
index beead5b1d847..8f5ff292438a 100644
--- a/metadata/md5-cache/x11-apps/setxkbmap-1.3.2
+++ b/metadata/md5-cache/x11-apps/setxkbmap-1.3.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxkbfile x11-libs/libX11 x11-misc/xkeyboard-config
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/setxkbmap-1.3.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=b99296d3359457bb5e9c14227aa5242e
diff --git a/metadata/md5-cache/x11-apps/viewres-1.0.6 b/metadata/md5-cache/x11-apps/viewres-1.0.6
new file mode 100644
index 000000000000..919412dc5f13
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/viewres-1.0.6
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-base/xorg-proto
+DESCRIPTION=graphical class browser for Xt
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/viewres
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXmu
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/viewres-1.0.6.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
+_md5_=69f0c1c29e29ba92a3c620051f0fc433
diff --git a/metadata/md5-cache/x11-apps/x11perf-1.6.1 b/metadata/md5-cache/x11-apps/x11perf-1.6.1
index 110afc99c155..19539006c68e 100644
--- a/metadata/md5-cache/x11-apps/x11perf-1.6.1
+++ b/metadata/md5-cache/x11-apps/x11perf-1.6.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/x11perf-1.6.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=bf907c62643cce4f2edd49261f73bb30
diff --git a/metadata/md5-cache/x11-apps/xauth-1.1 b/metadata/md5-cache/x11-apps/xauth-1.1
index 101b63e0252e..738798c7b679 100644
--- a/metadata/md5-cache/x11-apps/xauth-1.1
+++ b/metadata/md5-cache/x11-apps/xauth-1.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xauth-1.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=1bceeffcd30e190ce2708b4cca3df6ff
diff --git a/metadata/md5-cache/x11-apps/xauth-9999 b/metadata/md5-cache/x11-apps/xauth-9999
index c41ffca72896..a297066dcc44 100644
--- a/metadata/md5-cache/x11-apps/xauth-9999
+++ b/metadata/md5-cache/x11-apps/xauth-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=1bceeffcd30e190ce2708b4cca3df6ff
diff --git a/metadata/md5-cache/x11-apps/xbacklight-1.2.3 b/metadata/md5-cache/x11-apps/xbacklight-1.2.3
index 65b3fad1d170..8208f0c6b03e 100644
--- a/metadata/md5-cache/x11-apps/xbacklight-1.2.3
+++ b/metadata/md5-cache/x11-apps/xbacklight-1.2.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxcb >=x11-libs/xcb-util-0.3.8
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xbacklight-1.2.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=93499bb2d5322df787e4a0783e8fea0c
diff --git a/metadata/md5-cache/x11-apps/xbiff-1.0.4 b/metadata/md5-cache/x11-apps/xbiff-1.0.4
index 53d887330e4e..9ec2df71b712 100644
--- a/metadata/md5-cache/x11-apps/xbiff-1.0.4
+++ b/metadata/md5-cache/x11-apps/xbiff-1.0.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXext
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xbiff-1.0.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=e886d63bc013a62d9287442d0b94db3b
diff --git a/metadata/md5-cache/x11-apps/xcalc-1.1.0 b/metadata/md5-cache/x11-apps/xcalc-1.1.0
index c7bdab94c709..07589c90f8dc 100644
--- a/metadata/md5-cache/x11-apps/xcalc-1.1.0
+++ b/metadata/md5-cache/x11-apps/xcalc-1.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xcalc-1.1.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=a224ec11db1cabb6b17284d24622c7a3
diff --git a/metadata/md5-cache/x11-apps/xclock-1.0.8 b/metadata/md5-cache/x11-apps/xclock-1.0.8
index eebf76dd7709..8ae6000d42e0 100644
--- a/metadata/md5-cache/x11-apps/xclock-1.0.8
+++ b/metadata/md5-cache/x11-apps/xclock-1.0.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xclock-1.0.8.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=cf44f5b8a1c67f1649b8e09caaf36898
diff --git a/metadata/md5-cache/x11-apps/xclock-1.0.9 b/metadata/md5-cache/x11-apps/xclock-1.0.9
index 6de253e4be61..332dc5fbf8d5 100644
--- a/metadata/md5-cache/x11-apps/xclock-1.0.9
+++ b/metadata/md5-cache/x11-apps/xclock-1.0.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xclock-1.0.9.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=48f83129c98284a3b0a0306185047fbf
diff --git a/metadata/md5-cache/x11-apps/xditview-1.0.5 b/metadata/md5-cache/x11-apps/xditview-1.0.5
index fd10f92de95e..6013a56aa5f8 100644
--- a/metadata/md5-cache/x11-apps/xditview-1.0.5
+++ b/metadata/md5-cache/x11-apps/xditview-1.0.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xditview-1.0.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=9603e0cad3c3ccbbf9fcfea2f111c93b
diff --git a/metadata/md5-cache/x11-apps/xdm-1.1.12 b/metadata/md5-cache/x11-apps/xdm-1.1.12
index 99c2ef996f59..4ea7a3e03e76 100644
--- a/metadata/md5-cache/x11-apps/xdm-1.1.12
+++ b/metadata/md5-cache/x11-apps/xdm-1.1.12
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=x11-apps/sessreg x11-apps/xconsole x11-apps/xinit x11-apps/xrdb x11-apps/xsm x11-libs/libX11 x11-libs/libXaw x11-libs/libXdmcp x11-libs/libXmu x11-libs/libXt consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-209 ) truetype? ( x11-libs/libXrender x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) elibc_glibc? ( dev-libs/libbsd )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xdm-1.1.12.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=b120e72ede99d38d872097a95ebbec55
diff --git a/metadata/md5-cache/x11-apps/xev-1.2.3 b/metadata/md5-cache/x11-apps/xev-1.2.3
index 1832c8f88a0a..1803703d80ad 100644
--- a/metadata/md5-cache/x11-apps/xev-1.2.3
+++ b/metadata/md5-cache/x11-apps/xev-1.2.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xev-1.2.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=4907beee31a5eee59b29b3dee9300518
diff --git a/metadata/md5-cache/x11-apps/xfd-1.1.3 b/metadata/md5-cache/x11-apps/xfd-1.1.3
index 7a68cf2a41f5..737c17c085d0 100644
--- a/metadata/md5-cache/x11-apps/xfd-1.1.3
+++ b/metadata/md5-cache/x11-apps/xfd-1.1.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/freetype:2 media-libs/fontconfig x11-libs/libXft x11-libs/libXt x11-libs/libXmu x11-libs/libXrender x11-libs/libXaw x11-libs/libxkbfile
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xfd-1.1.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=ac9e70c67d3de05042e7e31014029928
diff --git a/metadata/md5-cache/x11-apps/xhost-1.0.8 b/metadata/md5-cache/x11-apps/xhost-1.0.8
index a7975371ec4d..bc57f96e046b 100644
--- a/metadata/md5-cache/x11-apps/xhost-1.0.8
+++ b/metadata/md5-cache/x11-apps/xhost-1.0.8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXau
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xhost-1.0.8.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=6bc3e14f0b2c2eca7bdf6cac0db32795
diff --git a/metadata/md5-cache/x11-apps/xinit-1.4.1 b/metadata/md5-cache/x11-apps/xinit-1.4.1
index efd97b11119e..522329adb732 100644
--- a/metadata/md5-cache/x11-apps/xinit-1.4.1
+++ b/metadata/md5-cache/x11-apps/xinit-1.4.1
@@ -11,5 +11,5 @@ PDEPEND=x11-apps/xrdb twm? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm
 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.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=519656cebe70c20e20fbf64295347a60
diff --git a/metadata/md5-cache/x11-apps/xinput-1.6.3 b/metadata/md5-cache/x11-apps/xinput-1.6.3
index d8e36ed35747..c116dc676f78 100644
--- a/metadata/md5-cache/x11-apps/xinput-1.6.3
+++ b/metadata/md5-cache/x11-apps/xinput-1.6.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.3 x11-libs/libXext >=x11-libs/libXi-1.5.99.1 x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xinput-1.6.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=7b6d510881ca4cb780f7c303816dec37
diff --git a/metadata/md5-cache/x11-apps/xlogo-1.0.5 b/metadata/md5-cache/x11-apps/xlogo-1.0.5
index 8ef4bc099730..e42d3f15be2d 100644
--- a/metadata/md5-cache/x11-apps/xlogo-1.0.5
+++ b/metadata/md5-cache/x11-apps/xlogo-1.0.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXrender x11-libs/libXext x11-libs/libXt x11-libs/libXft x11-libs/libXaw x11-libs/libSM x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xlogo-1.0.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=6d8f2a38321dde8bf63eab6e319709f2
diff --git a/metadata/md5-cache/x11-apps/xlsatoms-1.1.3 b/metadata/md5-cache/x11-apps/xlsatoms-1.1.3
index 022bec5b1143..0ab3bcdfff0c 100644
--- a/metadata/md5-cache/x11-apps/xlsatoms-1.1.3
+++ b/metadata/md5-cache/x11-apps/xlsatoms-1.1.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxcb:=
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xlsatoms-1.1.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=0415eceff3c09418f0db4cfe6593e577
diff --git a/metadata/md5-cache/x11-apps/xman-1.1.5 b/metadata/md5-cache/x11-apps/xman-1.1.5
index b99cd50e1edb..3d854fc75341 100644
--- a/metadata/md5-cache/x11-apps/xman-1.1.5
+++ b/metadata/md5-cache/x11-apps/xman-1.1.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xman-1.1.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=98f8487da45e202ca583e1e20a5acfb7
diff --git a/metadata/md5-cache/x11-apps/xmodmap-1.0.10 b/metadata/md5-cache/x11-apps/xmodmap-1.0.10
index 853d272fa66f..6bde806c6e9b 100644
--- a/metadata/md5-cache/x11-apps/xmodmap-1.0.10
+++ b/metadata/md5-cache/x11-apps/xmodmap-1.0.10
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xmodmap-1.0.10.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=bb01eca17559302ed39e9734c098ca95
diff --git a/metadata/md5-cache/x11-apps/xmore-1.0.3 b/metadata/md5-cache/x11-apps/xmore-1.0.3
index a87c94e79789..0c22f8e69ee7 100644
--- a/metadata/md5-cache/x11-apps/xmore-1.0.3
+++ b/metadata/md5-cache/x11-apps/xmore-1.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xmore-1.0.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=1eee393721e7ff22a11349b88abdf9d3
diff --git a/metadata/md5-cache/x11-apps/xprop-1.2.4 b/metadata/md5-cache/x11-apps/xprop-1.2.4
index 76739d201d83..fa2097f6906f 100644
--- a/metadata/md5-cache/x11-apps/xprop-1.2.4
+++ b/metadata/md5-cache/x11-apps/xprop-1.2.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xprop-1.2.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=61bb7488f6fb9f31b2b63a98e9b77051
diff --git a/metadata/md5-cache/x11-apps/xrandr-1.5.1 b/metadata/md5-cache/x11-apps/xrandr-1.5.1
index a5179cb0b8bd..14ce08a2bb8e 100644
--- a/metadata/md5-cache/x11-apps/xrandr-1.5.1
+++ b/metadata/md5-cache/x11-apps/xrandr-1.5.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xrandr-1.5.1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=ea4b13135477cf64cbccab25318df691
diff --git a/metadata/md5-cache/x11-apps/xrdb-1.2.0 b/metadata/md5-cache/x11-apps/xrdb-1.2.0
index 2f3be7d3a5e3..5a05b8b5e185 100644
--- a/metadata/md5-cache/x11-apps/xrdb-1.2.0
+++ b/metadata/md5-cache/x11-apps/xrdb-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xrdb-1.2.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=419640303807d879a97dd4c715c7ef52
diff --git a/metadata/md5-cache/x11-apps/xstdcmap-1.0.4 b/metadata/md5-cache/x11-apps/xstdcmap-1.0.4
index 1fb49ce29a39..e9471b0dddda 100644
--- a/metadata/md5-cache/x11-apps/xstdcmap-1.0.4
+++ b/metadata/md5-cache/x11-apps/xstdcmap-1.0.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xstdcmap-1.0.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=482fbc13410f4b7f2a481aecd8d694b0
diff --git a/metadata/md5-cache/x11-apps/xvinfo-1.1.4 b/metadata/md5-cache/x11-apps/xvinfo-1.1.4
index f430af3706d2..7c385fe4430b 100644
--- a/metadata/md5-cache/x11-apps/xvinfo-1.1.4
+++ b/metadata/md5-cache/x11-apps/xvinfo-1.1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libXv x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xvinfo-1.1.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=49322af55edbf03de00b78c9d59a50dc
diff --git a/metadata/md5-cache/x11-apps/xwininfo-1.1.5 b/metadata/md5-cache/x11-apps/xwininfo-1.1.5
index e5c17f37d24e..c53b9d79543b 100644
--- a/metadata/md5-cache/x11-apps/xwininfo-1.1.5
+++ b/metadata/md5-cache/x11-apps/xwininfo-1.1.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.6
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xwininfo-1.1.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=7fd4f9f54507c813bd48dd24b2497520
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index d492b7eb1488..342be8b0695d 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2019.1 b/metadata/md5-cache/x11-base/xorg-proto-2019.1
index a9aa31fd9cb7..05066a5d0031 100644
--- a/metadata/md5-cache/x11-base/xorg-proto-2019.1
+++ b/metadata/md5-cache/x11-base/xorg-proto-2019.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=!<x11-proto/bigreqsproto-1.1.2-r1 !<x11-proto/compositeproto-0.4.2-r2 !<x11-proto/damageproto-1.2.1-r2 !<x11-proto/dmxproto-2.3.1-r2 !<x11-proto/dri2proto-2.8-r2 !<x11-proto/dri3proto-1.0-r1 !<x11-proto/fixesproto-5.0-r2 !<x11-proto/fontsproto-2.1.3-r1 !<x11-proto/glproto-1.4.17-r2 !<x11-proto/inputproto-2.3.2-r1 !<x11-proto/kbproto-1.0.7-r1 !<x11-proto/presentproto-1.1-r1 !<x11-proto/randrproto-1.5.0-r1 !<x11-proto/recordproto-1.14.2-r2 !<x11-proto/renderproto-0.11.1-r2 !<x11-proto/resourceproto-1.2.0-r1 !<x11-proto/scrnsaverproto-1.2.2-r2 !<x11-proto/trapproto-3.4.3-r1 !<x11-proto/videoproto-2.3.3-r1 !<x11-proto/xcmiscproto-1.2.2-r1 !<x11-proto/xextproto-7.3.0-r1 !<x11-proto/xf86bigfontproto-1.2.0-r2 !<x11-proto/xf86dgaproto-2.1-r3 !<x11-proto/xf86driproto-2.1.1-r2 !<x11-proto/xf86miscproto-0.9.3-r1 !<x11-proto/xf86vidmodeproto-2.3.1-r2 !<x11-proto/xineramaproto-1.2.1-r2 !<x11-proto/xproto-7.0.31-r1 !x11-proto/fontcacheproto !x11-proto/xf86rushproto
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2019.1.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=7cc66740de1645864326b9b47654f633
diff --git a/metadata/md5-cache/x11-base/xorg-proto-9999 b/metadata/md5-cache/x11-base/xorg-proto-9999
index 6b06b8f0c058..a15102e2602b 100644
--- a/metadata/md5-cache/x11-base/xorg-proto-9999
+++ b/metadata/md5-cache/x11-base/xorg-proto-9999
@@ -7,5 +7,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=!<x11-proto/bigreqsproto-1.1.2-r1 !<x11-proto/compositeproto-0.4.2-r2 !<x11-proto/damageproto-1.2.1-r2 !<x11-proto/dmxproto-2.3.1-r2 !<x11-proto/dri2proto-2.8-r2 !<x11-proto/dri3proto-1.0-r1 !<x11-proto/fixesproto-5.0-r2 !<x11-proto/fontsproto-2.1.3-r1 !<x11-proto/glproto-1.4.17-r2 !<x11-proto/inputproto-2.3.2-r1 !<x11-proto/kbproto-1.0.7-r1 !<x11-proto/presentproto-1.1-r1 !<x11-proto/randrproto-1.5.0-r1 !<x11-proto/recordproto-1.14.2-r2 !<x11-proto/renderproto-0.11.1-r2 !<x11-proto/resourceproto-1.2.0-r1 !<x11-proto/scrnsaverproto-1.2.2-r2 !<x11-proto/trapproto-3.4.3-r1 !<x11-proto/videoproto-2.3.3-r1 !<x11-proto/xcmiscproto-1.2.2-r1 !<x11-proto/xextproto-7.3.0-r1 !<x11-proto/xf86bigfontproto-1.2.0-r2 !<x11-proto/xf86dgaproto-2.1-r3 !<x11-proto/xf86driproto-2.1.1-r2 !<x11-proto/xf86miscproto-0.9.3-r1 !<x11-proto/xf86vidmodeproto-2.3.1-r2 !<x11-proto/xineramaproto-1.2.1-r2 !<x11-proto/xproto-7.0.31-r1 !x11-proto/fontcacheproto !x11-proto/xf86rushproto
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=8ef85a54c35dc300a79721743ca56c1c
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.5 b/metadata/md5-cache/x11-base/xorg-server-1.20.5
index a66ec909a64d..53ec406f078c 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.20.5
+++ b/metadata/md5-cache/x11-base/xorg-server-1.20.5
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) li
 REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !glamor !wayland ) xephyr? ( kdrive )
 SLOT=0/1.20.5
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=0488399135ae953b00172d73d514b84f
diff --git a/metadata/md5-cache/x11-base/xorg-server-9999 b/metadata/md5-cache/x11-base/xorg-server-9999
index 1817c45e8221..6185e0312eed 100644
--- a/metadata/md5-cache/x11-base/xorg-server-9999
+++ b/metadata/md5-cache/x11-base/xorg-server-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=>=app-eselect/eselect-opengl-1.3.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) glamor? ( media-libs/libepoxy[X,egl(+)] >=media-libs/mesa-18[egl,gbm] !x11-libs/glamor ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy[egl(+)] >=dev-libs/wayland-protocols-1.1 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind sys-auth/pambase[elogind] ) selinux? ( sec-policy/selinux-xserver ) !x11-drivers/xf86-video-modesetting
 REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !glamor !wayland ) xephyr? ( kdrive )
 SLOT=0/9999
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=d26d9e2742c7c5021af0c4d7f163b82a
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 9d368a7fe2fb..6adbd9b080ef 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-435.21 b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21
new file mode 100644
index 000000000000..5e61e98a4ef4
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21
@@ -0,0 +1,15 @@
+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? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) 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=https://www.nvidia.com/
+IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms libglvnd 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_riscv_lp64d abi_riscv_lp64 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? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X ) static-libs? ( tools )
+RESTRICT=test
+SLOT=0/435
+SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/435.21/NVIDIA-FreeBSD-x86_64-435.21.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/435.21/NVIDIA-Linux-x86_64-435.21.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-435.21.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=801848d187f5ae6600bb2dc6c67beb85
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.2 b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.2
index d802318ecc5c..fbceb6dacf07 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-elographics-1.4.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=0b9a948703339d06c9642e26552cdf59
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0
index da6925ffe8fc..e2e7573523b1 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.7.0:0= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-0.29.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=2d5faba0b50c9873728559eade86b6d4
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-19.0.1 b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-19.0.1
index 40e967c007fe..8209e333f43d 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-19.0.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-19.0.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_amdgpu] x11-base/xorg-server[glamor(-)] udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=d6d42dbb06f7cedbe9e253a00d826ac5
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-9999 b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-9999
index 4d1b1fcacb2f..e374af41e6f1 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_amdgpu] x11-base/xorg-server[glamor(-)] udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=3fdcf5e4dd423743a8914417745e59cd
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-19.0.1 b/metadata/md5-cache/x11-drivers/xf86-video-ati-19.0.1
index 2f3196bffced..c7b6a9df8156 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-19.0.1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-19.0.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 glamor? ( x11-base/xorg-server[glamor] ) udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-ati-19.0.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=29575c34ac945d34c2bcebae6e492963
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-ati-9999 b/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
index 5c48d4d7a56e..085991b97c01 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 glamor? ( x11-base/xorg-server[glamor] ) udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=232feaf2dd24dda4ec31da5aa3f95872
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20190301 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20190301
index 5bcf8690bf69..df4faba3b5b4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20190301
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20190301
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pi
 REQUIRED_USE=|| ( sna uxa )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/6afed33b2d673d88674f0c76efe500ae414e8e1b/xf86-video-intel-2.99.917_p20190301.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=fefdc09323fd6b4c9f09806a4f0c0255
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-9999 b/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
index 878c3c1f8d83..e1c2acaa14cb 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.52[video_cards_intel] >=x11-base/xorg-server-1.18 !<=media-libs/mesa-12.0.4 tools? ( x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst ) udev? ( virtual/libudev:= ) xvmc? ( x11-libs/libXvMC >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 REQUIRED_USE=|| ( sna uxa )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=2b944882c0eebaf1754dce7e098ea96c
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 78e964b07e57..5e83838458f0 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12
index ed9be5a43bc5..62e315a60854 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.19 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.19 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Image loading library for GTK+
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
-IUSE=X debug +introspection jpeg jpeg2k tiff test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=X debug +introspection jpeg tiff test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
+RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.12.tar.xz test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug753605-atsize.jpg?h=2.36.12 -> gdk-pixbuf-2.36.12-bug753605-atsize.jpg )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=89e8a6ff6ca0e8058f9b17034cb6df26
+_md5_=66235707116d179fbd2df59c6fb80d33
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.38.1 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.38.1
index 6c4e999e9e66..4f73d496faf7 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.38.1
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.38.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.20 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.20 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Image loading library for GTK+
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
-IUSE=X gtk-doc +introspection jpeg jpeg2k tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=X gtk-doc +introspection jpeg tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
+RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.38/gdk-pixbuf-2.38.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff8b224f1c18eaec0df6009ef17fdadc
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c713bb93a9d8042dfe3699ca39517187
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.24.10 b/metadata/md5-cache/x11-libs/gtk+-3.24.10
index 879f38451f9a..1f89ab1c0771 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.24.10
+++ b/metadata/md5-cache/x11-libs/gtk+-3.24.10
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.15[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.53.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.4[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.41.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-0.9:= x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.12 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.10.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86c41bcd4482821192c3e274f0c1be91
+_md5_=2042164cc2765a7103b43f7a5b667bb0
diff --git a/metadata/md5-cache/x11-libs/guile-gtk-2.1-r2 b/metadata/md5-cache/x11-libs/guile-gtk-2.1-r2
deleted file mode 100644
index ebb3669193e4..000000000000
--- a/metadata/md5-cache/x11-libs/guile-gtk-2.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-scheme/guile:12[deprecated(+)] x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90: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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GTK+ bindings for guile
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/guile-gtk/
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-scheme/guile:12[deprecated(+)] x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2
-SLOT=0
-SRC_URI=mirror://gnu/guile-gtk/guile-gtk-2.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=c07835e449770149e5f1fdea449fdb05
diff --git a/metadata/md5-cache/x11-libs/guile-gtk-2.1-r3 b/metadata/md5-cache/x11-libs/guile-gtk-2.1-r3
deleted file mode 100644
index 3f6e300ff902..000000000000
--- a/metadata/md5-cache/x11-libs/guile-gtk-2.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-scheme/guile-2[deprecated(+)] x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.9* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GTK+ bindings for guile
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/guile-gtk/
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=>=dev-scheme/guile-2[deprecated(+)] x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2
-SLOT=0
-SRC_URI=mirror://gnu/guile-gtk/guile-gtk-2.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=c7eea406678331614fc4139f9f6adfde
diff --git a/metadata/md5-cache/x11-libs/libFS-1.0.8 b/metadata/md5-cache/x11-libs/libFS-1.0.8
index 47d2ddf45bc4..24089165b6c9 100644
--- a/metadata/md5-cache/x11-libs/libFS-1.0.8
+++ b/metadata/md5-cache/x11-libs/libFS-1.0.8
@@ -9,5 +9,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libFS-1.0.8.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=2f590566b25a8fd3502caa669d0e1753
diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.10 b/metadata/md5-cache/x11-libs/libICE-1.0.10
index 63a374abdad3..ea18ca0a07d7 100644
--- a/metadata/md5-cache/x11-libs/libICE-1.0.10
+++ b/metadata/md5-cache/x11-libs/libICE-1.0.10
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-proto x11-libs/xtrans elibc_glibc? ( dev-libs/libbsd )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libICE-1.0.10.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=f4ae85fd85e39323c1ccc51bca04aa1d
diff --git a/metadata/md5-cache/x11-libs/libX11-1.6.8 b/metadata/md5-cache/x11-libs/libX11-1.6.8
index 8ea1e8d096ab..2631d3fbed0a 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.6.8
+++ b/metadata/md5-cache/x11-libs/libX11-1.6.8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.6.8.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=9df20cc6806c973a207adcce4017a032
diff --git a/metadata/md5-cache/x11-libs/libXcomposite-0.4.5 b/metadata/md5-cache/x11-libs/libXcomposite-0.4.5
index dd8593d65783..449c1a0bed15 100644
--- a/metadata/md5-cache/x11-libs/libXcomposite-0.4.5
+++ b/metadata/md5-cache/x11-libs/libXcomposite-0.4.5
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXcomposite-0.4.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=d936beac58b6807bc0e6e13b74868e39
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.2.0 b/metadata/md5-cache/x11-libs/libXcursor-1.2.0
index a40d049fda3d..8a4bb6c011bc 100644
--- a/metadata/md5-cache/x11-libs/libXcursor-1.2.0
+++ b/metadata/md5-cache/x11-libs/libXcursor-1.2.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXcursor-1.2.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=c84692788074cb2d0b99f46548ae8780
diff --git a/metadata/md5-cache/x11-libs/libXdamage-1.1.5 b/metadata/md5-cache/x11-libs/libXdamage-1.1.5
index fbaba58c4210..657236050592 100644
--- a/metadata/md5-cache/x11-libs/libXdamage-1.1.5
+++ b/metadata/md5-cache/x11-libs/libXdamage-1.1.5
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXdamage-1.1.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=4ab817b44c2b2d4b0b566005bd454810
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.3 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.3
index 45dc7d297dc5..9050c5b21857 100644
--- a/metadata/md5-cache/x11-libs/libXdmcp-1.1.3
+++ b/metadata/md5-cache/x11-libs/libXdmcp-1.1.3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=elibc_glibc? ( dev-libs/libbsd )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXdmcp-1.1.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=6e4bc4d0aa98d1020d629273a6defc41
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.4 b/metadata/md5-cache/x11-libs/libXext-1.3.4
index c06253ac475d..a8c775140bba 100644
--- a/metadata/md5-cache/x11-libs/libXext-1.3.4
+++ b/metadata/md5-cache/x11-libs/libXext-1.3.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXext-1.3.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=9ac6c6e2c76b590f05874d3476d75406
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.3 b/metadata/md5-cache/x11-libs/libXft-2.3.3
index 318bc9987d06..18443c3f45b0 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.3.3
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/ttf-fonts >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXft-2.3.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=737e0fd683ab47213e5d565a7f933a21
diff --git a/metadata/md5-cache/x11-libs/libXi-1.7.10 b/metadata/md5-cache/x11-libs/libXi-1.7.10
index 9c52c40517a3..223d27e51c7c 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.7.10
+++ b/metadata/md5-cache/x11-libs/libXi-1.7.10
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXi-1.7.10.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=f10724ee51f192b027415c2c34dc5a05
diff --git a/metadata/md5-cache/x11-libs/libXmu-1.1.3 b/metadata/md5-cache/x11-libs/libXmu-1.1.3
index 8c9785b70489..9352bfe96ed5 100644
--- a/metadata/md5-cache/x11-libs/libXmu-1.1.3
+++ b/metadata/md5-cache/x11-libs/libXmu-1.1.3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXmu-1.1.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=a18033a7130ca34a05282c4488036bd5
diff --git a/metadata/md5-cache/x11-libs/libXrandr-1.5.2 b/metadata/md5-cache/x11-libs/libXrandr-1.5.2
index 1b59e5a998d3..326af7ecb913 100644
--- a/metadata/md5-cache/x11-libs/libXrandr-1.5.2
+++ b/metadata/md5-cache/x11-libs/libXrandr-1.5.2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXrandr-1.5.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=0ff6d0360c71469f6e8a1597c6bdbbd3
diff --git a/metadata/md5-cache/x11-libs/libXt-1.2.0 b/metadata/md5-cache/x11-libs/libXt-1.2.0
index 7cab7138e1ec..b60cab83bc6d 100644
--- a/metadata/md5-cache/x11-libs/libXt-1.2.0
+++ b/metadata/md5-cache/x11-libs/libXt-1.2.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXt-1.2.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=c40f245178c412b337746f1c7eb25455
diff --git a/metadata/md5-cache/x11-libs/libXvMC-1.0.11 b/metadata/md5-cache/x11-libs/libXvMC-1.0.11
index ceb5fdaa70f8..e17e22b6e789 100644
--- a/metadata/md5-cache/x11-libs/libXvMC-1.0.11
+++ b/metadata/md5-cache/x11-libs/libXvMC-1.0.11
@@ -11,5 +11,5 @@ PDEPEND=app-eselect/eselect-xvmc
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXvMC-1.0.11.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=a168897be594bb2265b88decf2befcb4
diff --git a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.5 b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.5
index 1ed320925cd4..06421490ab05 100644
--- a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.5
+++ b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.5
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXxf86dga-1.1.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=3f1b0351fc5af1c865b973f47fb2f9ce
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.96 b/metadata/md5-cache/x11-libs/libdrm-2.4.96
deleted file mode 100644
index 61f90930684e..000000000000
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.96
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=X.Org libdrm library
-EAPI=6
-HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
-IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.96.tar.bz2
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=38490efc3aa2690b87650275f59f7364
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.97 b/metadata/md5-cache/x11-libs/libdrm-2.4.97
index 279ab7a49233..3bdb0261fb04 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.97
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.97
@@ -10,5 +10,5 @@ RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[abi_x86_32(-)?,abi_x8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.97.tar.bz2
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=38490efc3aa2690b87650275f59f7364
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.98 b/metadata/md5-cache/x11-libs/libdrm-2.4.98
deleted file mode 100644
index 6f99242572a9..000000000000
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.98
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=X.Org libdrm library
-EAPI=6
-HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
-IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.98.tar.bz2
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=12ec96f87e119112efeaa59c0a1083ae
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.99 b/metadata/md5-cache/x11-libs/libdrm-2.4.99
index 9b5b6517a2a8..9b9604cb7a6d 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.99
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.99
@@ -10,5 +10,5 @@ RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[abi_x86_32(-)?,abi_x8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.99.tar.bz2
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=12ec96f87e119112efeaa59c0a1083ae
diff --git a/metadata/md5-cache/x11-libs/libdrm-9999 b/metadata/md5-cache/x11-libs/libdrm-9999
index a7fdc3a35fb8..1858d67f37bc 100644
--- a/metadata/md5-cache/x11-libs/libdrm-9999
+++ b/metadata/md5-cache/x11-libs/libdrm-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=12ec96f87e119112efeaa59c0a1083ae
diff --git a/metadata/md5-cache/x11-libs/libfontenc-1.1.4 b/metadata/md5-cache/x11-libs/libfontenc-1.1.4
index 8389110138df..6c19f227773f 100644
--- a/metadata/md5-cache/x11-libs/libfontenc-1.1.4
+++ b/metadata/md5-cache/x11-libs/libfontenc-1.1.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libfontenc-1.1.4.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=03a30b48e65daa75b84472291e1da6e3
diff --git a/metadata/md5-cache/x11-libs/libnotify-0.7.8 b/metadata/md5-cache/x11-libs/libnotify-0.7.8
index 50172dffd24c..8c9c9eb11df3 100644
--- a/metadata/md5-cache/x11-libs/libnotify-0.7.8
+++ b/metadata/md5-cache/x11-libs/libnotify-0.7.8
@@ -11,5 +11,5 @@ PDEPEND=virtual/notification-daemon
 RDEPEND=app-eselect/eselect-notify-send >=dev-libs/glib-2.26:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.32:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libnotify/0.7/libnotify-0.7.8.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=575a7d356b91228b6a29d251f740c18e
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.15 b/metadata/md5-cache/x11-libs/libpciaccess-0.15
index 6885b9248dad..2533a85bc53e 100644
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.15
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.15
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.5 zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-apps/hwids
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libpciaccess-0.15.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=e9e11a559079b1341947a07b74a10841
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.16 b/metadata/md5-cache/x11-libs/libpciaccess-0.16
index 2adcd3b66a0f..c8de643e0a3c 100644
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.16
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.16
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.5 zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-apps/hwids
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libpciaccess-0.16.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=aaa2f3e130637cb9e4213baf3c6e0cbe
diff --git a/metadata/md5-cache/x11-libs/libvdpau-1.3 b/metadata/md5-cache/x11-libs/libvdpau-1.3
new file mode 100644
index 000000000000..a5b42449438e
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libvdpau-1.3
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri? ( >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz virtual/latex-base ) dri? ( x11-base/xorg-proto )
+DESCRIPTION=VDPAU wrapper and trace libraries
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/VDPAU
+IUSE=doc dri test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=MIT
+RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri? ( >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/1.3/libvdpau-1.3.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=747c503b0281762da995e22a94a67757
diff --git a/metadata/md5-cache/x11-libs/libvdpau-99999 b/metadata/md5-cache/x11-libs/libvdpau-99999
index 99f0be71779a..ab4c819ee675 100644
--- a/metadata/md5-cache/x11-libs/libvdpau-99999
+++ b/metadata/md5-cache/x11-libs/libvdpau-99999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dri? ( >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=f99be5d2bac6c4b2502d956cc29568e6
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-0.8.4 b/metadata/md5-cache/x11-libs/libxkbcommon-0.8.4
index b21449cbd62c..21dfd0bbca41 100644
--- a/metadata/md5-cache/x11-libs/libxkbcommon-0.8.4
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-0.8.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=X? ( >=x11-libs/libxcb-1.10:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,xkb] )
 SLOT=0
 SRC_URI=https://xkbcommon.org/download/libxkbcommon-0.8.4.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=d3a859dca7766e26535035ffaa29f953
diff --git a/metadata/md5-cache/x11-libs/libxkbfile-1.1.0 b/metadata/md5-cache/x11-libs/libxkbfile-1.1.0
index 4cda48f89949..d4bad8d18666 100644
--- a/metadata/md5-cache/x11-libs/libxkbfile-1.1.0
+++ b/metadata/md5-cache/x11-libs/libxkbfile-1.1.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libxkbfile-1.1.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=a051e14947aa55017c4179a02fac4b41
diff --git a/metadata/md5-cache/x11-libs/pango-1.42.4-r2 b/metadata/md5-cache/x11-libs/pango-1.42.4-r2
index 89bad53aa3d3..d1456d96d71c 100644
--- a/metadata/md5-cache/x11-libs/pango-1.42.4-r2
+++ b/metadata/md5-cache/x11-libs/pango-1.42.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized text layout and rendering library
 EAPI=6
 HOMEPAGE=https://www.pango.org/
 IUSE=X +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.12.92:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.42/pango-1.42.4.tar.xz https://dev.gentoo.org/~leio/distfiles/pango-1.42.4-patchset.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47fefd2efea437626c24ff3a20ce2119
+_md5_=05fdeb1d1624de24b8e0b2801cc7b3a5
diff --git a/metadata/md5-cache/x11-libs/pixman-0.38.4 b/metadata/md5-cache/x11-libs/pixman-0.38.4
index 7179c8c33c88..178e2590bb79 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.38.4
+++ b/metadata/md5-cache/x11-libs/pixman-0.38.4
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.38.4.tar.gz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=360054c58b231af51445a19a47331e09
diff --git a/metadata/md5-cache/x11-libs/pixman-9999 b/metadata/md5-cache/x11-libs/pixman-9999
index 8f7dce7818f7..9d6d8875e596 100644
--- a/metadata/md5-cache/x11-libs/pixman-9999
+++ b/metadata/md5-cache/x11-libs/pixman-9999
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install test unpack
 DESCRIPTION=Low-level pixel manipulation routines
 EAPI=7
 HOMEPAGE=http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/
-IUSE=altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=59c5371cd1f05b8d8002ae71dbd4b8a3
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c94abc90904ae9376fa2089f67ff3dbf
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r2 b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r2
index 4ea9e4acc5df..9d600d4626a0 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r2
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r2
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=6
 HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gstreamer libnotify opengl sdl tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
 PDEPEND=>=app-eselect/eselect-wxwidgets-20131230
 RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=dev-libs/glib-2.22:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.18:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) aqua? ( x11-libs/gtk+:2[aqua=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=3.0
 SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4.tar.bz2 https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4-docs-html.tar.bz2 )
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8be1522efb4f64b6d657aa4fa6a120ef
+_md5_=5ebe0c749b9f62d61688180ccb7373c8
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r302 b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r302
index 003ebd191b49..0f3a76db9d7a 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r302
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r302
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=6
 HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
 PDEPEND=>=app-eselect/eselect-wxwidgets-20131230
 RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=dev-libs/glib-2.22:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( net-libs/webkit-gtk:4 ) ) aqua? ( x11-libs/gtk+:3[aqua=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=3.0-gtk3
 SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4.tar.bz2 https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4-docs-html.tar.bz2 )
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=22a123685e38c3935d53c10de4b8e418
+_md5_=6f1074c5258e89b3245180ee9f4bd991
diff --git a/metadata/md5-cache/x11-libs/xapps-1.4.2 b/metadata/md5-cache/x11-libs/xapps-1.4.2
index b183168bfb7d..9d17c9b01f60 100644
--- a/metadata/md5-cache/x11-libs/xapps-1.4.2
+++ b/metadata/md5-cache/x11-libs/xapps-1.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.37.3:2 dev-libs/gobject-introspection:0= gnome-base/libgnomekbd gnome-base/gnome-common x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] x11-libs/libxkbfile
 SLOT=0
 SRC_URI=https://github.com/linuxmint/xapps/archive/1.4.2.tar.gz -> xapps-1.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c80ef49b06da5e0d1e0922a792d81aa3
diff --git a/metadata/md5-cache/x11-libs/xtrans-1.4.0 b/metadata/md5-cache/x11-libs/xtrans-1.4.0
index 1b98900c5ad3..5090a3faa7f0 100644
--- a/metadata/md5-cache/x11-libs/xtrans-1.4.0
+++ b/metadata/md5-cache/x11-libs/xtrans-1.4.0
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/xtrans-1.4.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=64764d2baa8e4fa638d7e5981b8db7e7
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 7ffb15092f6e..cddde5dbdba3 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/colord-1.3.5 b/metadata/md5-cache/x11-misc/colord-1.3.5
index e2106f649e84..0da6cb7fc5e1 100644
--- a/metadata/md5-cache/x11-misc/colord-1.3.5
+++ b/metadata/md5-cache/x11-misc/colord-1.3.5
@@ -11,5 +11,5 @@ REQUIRED_USE=gusb? ( udev ) scanner? ( udev ) vala? ( introspection )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-1.3.5.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bac09ef969f61eef0f373fe1c60b627a
diff --git a/metadata/md5-cache/x11-misc/imake-1.0.8 b/metadata/md5-cache/x11-misc/imake-1.0.8
index a8f2bc87e809..13adf7bdf0cc 100644
--- a/metadata/md5-cache/x11-misc/imake-1.0.8
+++ b/metadata/md5-cache/x11-misc/imake-1.0.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-misc/xorg-cf-files
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/util/imake-1.0.8.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=7e8a6cd7c8852671323c04d504a09c76
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.2.2 b/metadata/md5-cache/x11-misc/kronometer-2.2.2
deleted file mode 100644
index b9cad96ab72e..000000000000
--- a/metadata/md5-cache/x11-misc/kronometer-2.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Stopwatch application
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/Kronometer
-IUSE=test debug +handbook test
-KEYWORDS=amd64
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kronometer/2.2.2/src/kronometer-2.2.2.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5672bfa96bd7a71c46c1a9d1d4e8d1b
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.2.3 b/metadata/md5-cache/x11-misc/kronometer-2.2.3
index 93818e10892c..8446e33fd919 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.2.3
+++ b/metadata/md5-cache/x11-misc/kronometer-2.2.3
@@ -5,10 +5,10 @@ DESCRIPTION=Stopwatch application
 EAPI=7
 HOMEPAGE=https://kde.org/applications/utilities/org.kde.kronometer https://userbase.kde.org/Kronometer
 IUSE=test debug +handbook test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kronometer/2.2.3/src/kronometer-2.2.3.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46801ada25b0e17b750a90b119835b79
+_md5_=da541bb0004079f9915a4c58312e5302
diff --git a/metadata/md5-cache/x11-misc/makedepend-1.0.6 b/metadata/md5-cache/x11-misc/makedepend-1.0.6
index 5b0391ab5a79..6debf32f369d 100644
--- a/metadata/md5-cache/x11-misc/makedepend-1.0.6
+++ b/metadata/md5-cache/x11-misc/makedepend-1.0.6
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/util/makedepend-1.0.6.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=a668a5fcace9d785b302dc2e26c847be
diff --git a/metadata/md5-cache/x11-misc/sxhkd-0.6.1 b/metadata/md5-cache/x11-misc/sxhkd-0.6.1
new file mode 100644
index 000000000000..ae0a1892efb9
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/sxhkd-0.6.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms x11-libs/xcb-util
+DESCRIPTION=Simple X hotkey daemon
+EAPI=7
+HOMEPAGE=https://github.com/baskerville/sxhkd/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=x11-libs/libxcb x11-libs/xcb-util-keysyms
+SLOT=0
+SRC_URI=https://github.com/baskerville/sxhkd/archive/0.6.1.tar.gz -> sxhkd-0.6.1.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ad2f9c6bd1625e12424251529391bafc
diff --git a/metadata/md5-cache/x11-misc/vym-2.6.11 b/metadata/md5-cache/x11-misc/vym-2.6.11
deleted file mode 100644
index 5ed0108ba0f5..000000000000
--- a/metadata/md5-cache/x11-misc/vym-2.6.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) dev-qt/linguist-tools:5
-DESCRIPTION=View Your Mind, a mindmap tool
-EAPI=6
-HOMEPAGE=http://www.insilmaril.de/vym/
-IUSE=dbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 )
-SLOT=0
-SRC_URI=mirror://sourceforge/vym/vym-2.6.11.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e8756433046885b7c0c90864bd8f81f5
diff --git a/metadata/md5-cache/x11-misc/vym-2.7.0 b/metadata/md5-cache/x11-misc/vym-2.7.0
deleted file mode 100644
index 49b640e8522b..000000000000
--- a/metadata/md5-cache/x11-misc/vym-2.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) dev-qt/linguist-tools:5
-DESCRIPTION=View Your Mind, a mindmap tool
-EAPI=7
-HOMEPAGE=http://www.insilmaril.de/vym/
-IUSE=dbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 )
-SLOT=0
-SRC_URI=mirror://sourceforge/vym/vym-2.7.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f41e08011e11e831bc54f5d25ce11e1e
diff --git a/metadata/md5-cache/x11-misc/vym-2.7.1 b/metadata/md5-cache/x11-misc/vym-2.7.1
index 01ee747ef080..f578e2197874 100644
--- a/metadata/md5-cache/x11-misc/vym-2.7.1
+++ b/metadata/md5-cache/x11-misc/vym-2.7.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) dev-qt/linguist-tools:5
+DEPEND=dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) dev-qt/linguist-tools:5
 DESCRIPTION=View Your Mind, a mindmap tool
 EAPI=7
 HOMEPAGE=https://www.insilmaril.de/vym/
 IUSE=dbus
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 )
+RDEPEND=dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vym/vym-2.7.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=20f4c619d29eb883817a2d2077140927
+_md5_=3508f78e4d649c9a16d9bbfc886e6bd7
diff --git a/metadata/md5-cache/x11-misc/xcompmgr-1.1.8 b/metadata/md5-cache/x11-misc/xcompmgr-1.1.8
index 5473efd0818c..18af06a01c88 100644
--- a/metadata/md5-cache/x11-misc/xcompmgr-1.1.8
+++ b/metadata/md5-cache/x11-misc/xcompmgr-1.1.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/libXrender x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXext
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xcompmgr-1.1.8.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	86fd2a2076aae14098f64bab45f31f71
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=2ee2c686fe2df2cca0c3b2ac08012c47
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.40 b/metadata/md5-cache/x11-misc/xscreensaver-5.40
deleted file mode 100644
index 2eb794c4fd83..000000000000
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.40
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A modular screen saver and locker for the X Window System
-EAPI=6
-HOMEPAGE=https://www.jwz.org/xscreensaver/
-IUSE=gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
-SLOT=0
-SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.40.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2fd95ef6bf151f25ae56aca1ee0b3869
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.43 b/metadata/md5-cache/x11-misc/xscreensaver-5.43
deleted file mode 100644
index c5b66da10999..000000000000
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.43
+++ /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=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=A modular screen saver and locker for the X Window System
-EAPI=7
-HOMEPAGE=https://www.jwz.org/xscreensaver/
-IUSE=gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
-SLOT=0
-SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.43.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a37da030bd270b39be9b0260e0bcf1c2
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.43-r1 b/metadata/md5-cache/x11-misc/xscreensaver-5.43-r1
new file mode 100644
index 000000000000..c87e83fdbc87
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.43-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=A modular screen saver and locker for the X Window System
+EAPI=7
+HOMEPAGE=https://www.jwz.org/xscreensaver/
+IUSE=gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
+SLOT=0
+SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.43.tar.gz -> xscreensaver-5.43-r1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0c7be393b8786d7229e0380c11c2bb6f
diff --git a/metadata/md5-cache/x11-misc/xvkbd-3.8 b/metadata/md5-cache/x11-misc/xvkbd-3.8
deleted file mode 100644
index 8702d42df79c..000000000000
--- a/metadata/md5-cache/x11-misc/xvkbd-3.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt x11-libs/libXtst app-text/rman x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
-DESCRIPTION=virtual keyboard for X window system
-EAPI=6
-HOMEPAGE=http://t-sato.in.coocan.jp/xvkbd/
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt x11-libs/libXtst
-SLOT=0
-SRC_URI=http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.8.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b37fa9a5dbb5380c49165b1309ee4e71
diff --git a/metadata/md5-cache/x11-misc/xvkbd-4.0 b/metadata/md5-cache/x11-misc/xvkbd-4.0
new file mode 100644
index 000000000000..5666e200966a
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xvkbd-4.0
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt x11-libs/libXtst virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=virtual keyboard for X window system
+EAPI=7
+HOMEPAGE=http://t-sato.in.coocan.jp/xvkbd/
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt x11-libs/libXtst
+SLOT=0
+SRC_URI=http://t-sato.in.coocan.jp/xvkbd/xvkbd-4.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=74f630b34a0c1cd8cd1434a4b861f7d8
diff --git a/metadata/md5-cache/x11-misc/zim-0.69 b/metadata/md5-cache/x11-misc/zim-0.69
deleted file mode 100644
index a407a66f2978..000000000000
--- a/metadata/md5-cache/x11-misc/zim-0.69
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-misc/xdg-utils test? ( dev-vcs/bzr dev-vcs/git dev-vcs/mercurial ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A desktop wiki
-EAPI=6
-HOMEPAGE=http://zim-wiki.org/
-IUSE=test python_targets_python2_7 test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2+
-RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://zim-wiki.org/downloads/zim-0.69.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c726a48acf29d62080aefd960bad4f17
diff --git a/metadata/md5-cache/x11-misc/zim-0.71.0 b/metadata/md5-cache/x11-misc/zim-0.71.0
deleted file mode 100644
index 02182ad3c536..000000000000
--- a/metadata/md5-cache/x11-misc/zim-0.71.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/gtk+:3[introspection] x11-misc/xdg-utils
-DESCRIPTION=A desktop wiki
-EAPI=7
-HOMEPAGE=http://zim-wiki.org/ https://github.com/zim-desktop-wiki/
-IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2+
-RDEPEND=dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.71.0.tar.gz -> zim-0.71.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=821b07bc12a7a909b75d72e9cee6c9ce
diff --git a/metadata/md5-cache/x11-misc/zim-0.72.0 b/metadata/md5-cache/x11-misc/zim-0.72.0
new file mode 100644
index 000000000000..3238219908fd
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/zim-0.72.0
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/gtk+:3[introspection] x11-misc/xdg-utils
+DESCRIPTION=A desktop wiki
+EAPI=7
+HOMEPAGE=https://zim-wiki.org/ https://github.com/zim-desktop-wiki/zim-desktop-wiki
+IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2+
+RDEPEND=dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.72.0.tar.gz -> zim-0.72.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f1f237bb461b94d19ad189744e35f635
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index f8d6ca4b65c3..3829ac3337d4 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/enigmail-2.0.12 b/metadata/md5-cache/x11-plugins/enigmail-2.0.12
deleted file mode 100644
index eb82a1080ef3..000000000000
--- a/metadata/md5-cache/x11-plugins/enigmail-2.0.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
-DESCRIPTION=Mozilla extension to provide GPG support in mail clients
-EAPI=7
-HOMEPAGE=https://www.enigmail.net/
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-3
-RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0
-SLOT=0
-SRC_URI=https://www.enigmail.net/download/source/enigmail-2.0.12.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e37b80d3b95a42310865567432c4498e
diff --git a/metadata/md5-cache/x11-plugins/enigmail-2.0.12-r1 b/metadata/md5-cache/x11-plugins/enigmail-2.0.12-r1
new file mode 100644
index 000000000000..e48844843379
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/enigmail-2.0.12-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) !<mail-client/thunderbird-52.5.0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
+DESCRIPTION=Mozilla extension to provide GPG support in mail clients
+EAPI=7
+HOMEPAGE=https://www.enigmail.net/
+KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-3
+RDEPEND=( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) !<mail-client/thunderbird-52.5.0
+SLOT=0
+SRC_URI=https://www.enigmail.net/download/source/enigmail-2.0.12.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c826f077b41e32eadaff472fefd1acdf
diff --git a/metadata/md5-cache/x11-plugins/enigmail-2.0.8-r1 b/metadata/md5-cache/x11-plugins/enigmail-2.0.8-r1
index 85dcf4538bb8..2319c9fe7c8e 100644
--- a/metadata/md5-cache/x11-plugins/enigmail-2.0.8-r1
+++ b/metadata/md5-cache/x11-plugins/enigmail-2.0.8-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst setup
-DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
+DEPEND=( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) !<mail-client/thunderbird-52.5.0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
 DESCRIPTION=Mozilla extension to provide GPG support in mail clients
 EAPI=7
 HOMEPAGE=https://www.enigmail.net/
 KEYWORDS=~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0 GPL-3
-RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0
+RDEPEND=( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) !<mail-client/thunderbird-52.5.0
 SLOT=0
 SRC_URI=https://www.enigmail.net/download/source/enigmail-2.0.8.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=37517f9157affc172ca91b812d934f05
+_md5_=d1d391cd2dc813dc80ee9b78ad426f44
diff --git a/metadata/md5-cache/x11-plugins/enigmail-2.1 b/metadata/md5-cache/x11-plugins/enigmail-2.1
deleted file mode 100644
index 668e0e73d50d..000000000000
--- a/metadata/md5-cache/x11-plugins/enigmail-2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
-DESCRIPTION=Mozilla extension to provide GPG support in mail clients
-EAPI=7
-HOMEPAGE=https://www.enigmail.net/
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MPL-2.0 GPL-3
-RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0
-SLOT=0
-SRC_URI=https://www.enigmail.net/download/source/enigmail-2.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8070d4d65fe3f4338358e7afb494a338
diff --git a/metadata/md5-cache/x11-plugins/enigmail-2.1.2 b/metadata/md5-cache/x11-plugins/enigmail-2.1.2
new file mode 100644
index 000000000000..59c6fc7693d4
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/enigmail-2.1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) !<mail-client/thunderbird-52.5.0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
+DESCRIPTION=Mozilla extension to provide GPG support in mail clients
+EAPI=7
+HOMEPAGE=https://www.enigmail.net/
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-3
+RDEPEND=( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) !<mail-client/thunderbird-52.5.0
+SLOT=0
+SRC_URI=https://www.enigmail.net/download/source/enigmail-2.1.2.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=63cf847b584d74bff8027e0b3fad0344
diff --git a/metadata/md5-cache/x11-plugins/enigmail-9999 b/metadata/md5-cache/x11-plugins/enigmail-9999
index 4155d3ff7dba..4b269c302245 100644
--- a/metadata/md5-cache/x11-plugins/enigmail-9999
+++ b/metadata/md5-cache/x11-plugins/enigmail-9999
@@ -1,12 +1,12 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
+DEPEND=( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) !<mail-client/thunderbird-52.5.0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
 DESCRIPTION=Mozilla extension to provide GPG support in mail clients
 EAPI=7
 HOMEPAGE=https://www.enigmail.net/
 LICENSE=MPL-2.0 GPL-3
 PROPERTIES=live
-RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0
+RDEPEND=( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt5(-)] ) ) !<mail-client/thunderbird-52.5.0
 SLOT=0
 _eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8070d4d65fe3f4338358e7afb494a338
+_md5_=63cf847b584d74bff8027e0b3fad0344
diff --git a/metadata/md5-cache/x11-plugins/gkrellflynn-0.8 b/metadata/md5-cache/x11-plugins/gkrellflynn-0.8
deleted file mode 100644
index 7f3c4656ab87..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellflynn-0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
-DESCRIPTION=A funny GKrellM2 load monitor (for Doom(tm) fans)
-EAPI=6
-HOMEPAGE=http://bax.comlab.uni-rostock.de/en/projects/flynn.html
-KEYWORDS=alpha amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X]
-SLOT=0
-SRC_URI=http://bax.comlab.uni-rostock.de/fileadmin/downloads/gkrellflynn-0.8.tar.gz
-_eclasses_=gkrellm-plugin	c01023a3c28bc24f50c00ae019e8861e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1ac274c867fa0cb144fc3a26f06c9f1a
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 44103ec44c23..c176bfba5c21 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/alacritty-0.3.3-r1 b/metadata/md5-cache/x11-terms/alacritty-0.3.3-r1
index 2811b40cdc32..115d9005ab3a 100644
--- a/metadata/md5-cache/x11-terms/alacritty-0.3.3-r1
+++ b/metadata/md5-cache/x11-terms/alacritty-0.3.3-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 x11-libs/libxcb sys-libs/zlib sys-libs/ncurses:0 x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/jwilm/alacritty/archive/v0.3.3.tar.gz -> alacritty-0.3.3.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.10/download -> aho-corasick-0.6.10.crate https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/andrew/0.2.1/download -> andrew-0.2.1.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.3.2/download -> approx-0.3.2.crate https://crates.io/api/v1/crates/arc-swap/0.3.11/download -> arc-swap-0.3.11.crate https://crates.io/api/v1/crates/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.4/download -> autocfg-0.1.4.crate https://crates.io/api/v1/crates/backtrace/0.3.30/download -> backtrace-0.3.30.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/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/bindgen/0.33.2/download -> bindgen-0.33.2.crate https://crates.io/api/v1/crates/bitflags/1.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.7/download -> bzip2-sys-0.1.7.crate https://crates.io/api/v1/crates/cc/1.0.37/download -> cc-1.0.37.crate https://crates.io/api/v1/crates/cexpr/0.2.3/download -> cexpr-0.2.3.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/cgl/0.2.3/download -> cgl-0.2.3.crate https://crates.io/api/v1/crates/clang-sys/0.22.0/download -> clang-sys-0.22.0.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/clipboard-win/2.2.0/download -> clipboard-win-2.2.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.40/download -> cmake-0.1.40.crate https://crates.io/api/v1/crates/cocoa/0.18.4/download -> cocoa-0.18.4.crate https://crates.io/api/v1/crates/color_quant/1.0.1/download -> color_quant-1.0.1.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/core-foundation/0.6.4/download -> core-foundation-0.6.4.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/core-graphics/0.17.3/download -> core-graphics-0.17.3.crate https://crates.io/api/v1/crates/core-text/13.2.0/download -> core-text-13.2.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.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-deque/0.6.3/download -> crossbeam-deque-0.6.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.7.1/download -> crossbeam-epoch-0.7.1.crate https://crates.io/api/v1/crates/crossbeam-queue/0.1.2/download -> crossbeam-queue-0.1.2.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/deflate/0.7.19/download -> deflate-0.7.19.crate https://crates.io/api/v1/crates/derivative/1.0.2/download -> derivative-1.0.2.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dlib/0.4.1/download -> dlib-0.4.1.crate https://crates.io/api/v1/crates/downcast-rs/1.0.4/download -> downcast-rs-1.0.4.crate https://crates.io/api/v1/crates/dtoa/0.4.4/download -> dtoa-0.4.4.crate https://crates.io/api/v1/crates/dunce/1.0.0/download -> dunce-1.0.0.crate https://crates.io/api/v1/crates/dwrote/0.9.0/download -> dwrote-0.9.0.crate https://crates.io/api/v1/crates/either/1.5.2/download -> either-1.5.2.crate https://crates.io/api/v1/crates/embed-resource/1.2.0/download -> embed-resource-1.2.0.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.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/errno/0.2.4/download -> errno-0.2.4.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.1/download -> errno-dragonfly-0.1.1.crate https://crates.io/api/v1/crates/euclid/0.19.9/download -> euclid-0.19.9.crate https://crates.io/api/v1/crates/euclid_macros/0.1.0/download -> euclid_macros-0.1.0.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.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.5/download -> filetime-0.2.5.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/0.4.0/download -> foreign-types-0.4.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.1.0/download -> foreign-types-macros-0.1.0.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/foreign-types-shared/0.2.0/download -> foreign-types-shared-0.2.0.crate https://crates.io/api/v1/crates/freetype-rs/0.19.1/download -> freetype-rs-0.19.1.crate https://crates.io/api/v1/crates/freetype-sys/0.7.1/download -> freetype-sys-0.7.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/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/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/gif/0.10.2/download -> gif-0.10.2.crate https://crates.io/api/v1/crates/gleam/0.6.17/download -> gleam-0.6.17.crate https://crates.io/api/v1/crates/gl_generator/0.11.0/download -> gl_generator-0.11.0.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/glutin/0.21.0/download -> glutin-0.21.0.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.3/download -> glutin_egl_sys-0.1.3.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.0/download -> glutin_emscripten_sys-0.1.0.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.3/download -> glutin_gles2_sys-0.1.3.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.5/download -> glutin_glx_sys-0.1.5.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.3/download -> glutin_wgl_sys-0.1.3.crate https://crates.io/api/v1/crates/http_req/0.5.0/download -> http_req-0.5.0.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/image/0.21.2/download -> image-0.21.2.crate https://crates.io/api/v1/crates/inflate/0.4.5/download -> inflate-0.4.5.crate https://crates.io/api/v1/crates/inotify/0.6.1/download -> inotify-0.6.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.3/download -> inotify-sys-0.1.3.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/jpeg-decoder/0.1.15/download -> jpeg-decoder-0.1.15.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/khronos_api/3.1.0/download -> khronos_api-3.1.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.58/download -> libc-0.2.58.crate https://crates.io/api/v1/crates/libflate/0.1.23/download -> libflate-0.1.23.crate https://crates.io/api/v1/crates/libloading/0.5.1/download -> libloading-0.5.1.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/line_drawing/0.7.0/download -> line_drawing-0.7.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.2/download -> linked-hash-map-0.5.2.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/lzw/0.10.0/download -> lzw-0.10.0.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.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/1.0.2/download -> memchr-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/mio/0.6.19/download -> mio-0.6.19.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.1.0/download -> mio-anonymous-pipes-0.1.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.5/download -> mio-extras-2.0.5.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/named_pipe/0.3.0/download -> named_pipe-0.3.0.crate https://crates.io/api/v1/crates/native-tls/0.2.3/download -> native-tls-0.2.3.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.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/nom/3.2.1/download -> nom-3.2.1.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/notify/4.0.12/download -> notify-4.0.12.crate https://crates.io/api/v1/crates/num_cpus/1.10.1/download -> num_cpus-1.10.1.crate https://crates.io/api/v1/crates/num-derive/0.2.5/download -> num-derive-0.2.5.crate https://crates.io/api/v1/crates/num-integer/0.1.41/download -> num-integer-0.1.41.crate https://crates.io/api/v1/crates/num-iter/0.1.39/download -> num-iter-0.1.39.crate https://crates.io/api/v1/crates/num-rational/0.2.2/download -> num-rational-0.2.2.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/num-traits/0.2.8/download -> num-traits-0.2.8.crate https://crates.io/api/v1/crates/objc/0.2.6/download -> objc-0.2.6.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/openssl/0.10.23/download -> openssl-0.10.23.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.47/download -> openssl-sys-0.9.47.crate https://crates.io/api/v1/crates/ordered-float/1.0.2/download -> ordered-float-1.0.2.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.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.7.1/download -> parking_lot-0.7.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.4.0/download -> parking_lot_core-0.4.0.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.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.24/download -> phf-0.7.24.crate https://crates.io/api/v1/crates/phf_codegen/0.7.24/download -> phf_codegen-0.7.24.crate https://crates.io/api/v1/crates/phf_generator/0.7.24/download -> phf_generator-0.7.24.crate https://crates.io/api/v1/crates/phf_shared/0.7.24/download -> phf_shared-0.7.24.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/png/0.14.1/download -> png-0.14.1.crate https://crates.io/api/v1/crates/podio/0.1.6/download -> podio-0.1.6.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.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.12/download -> quote-0.6.12.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.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.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/rayon/1.1.0/download -> rayon-1.1.0.crate https://crates.io/api/v1/crates/rayon-core/1.5.0/download -> rayon-core-1.5.0.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.54/download -> redox_syscall-0.1.54.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.3.0/download -> redox_users-0.3.0.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex/1.1.7/download -> regex-1.1.7.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.7/download -> regex-syntax-0.6.7.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.15/download -> rustc-demangle-0.1.15.crate https://crates.io/api/v1/crates/rustc_tools_util/0.2.0/download -> rustc_tools_util-0.2.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/rusttype/0.7.7/download -> rusttype-0.7.7.crate https://crates.io/api/v1/crates/ryu/0.2.8/download -> ryu-0.2.8.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.15/download -> schannel-0.1.15.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/security-framework/0.3.1/download -> security-framework-0.3.1.crate https://crates.io/api/v1/crates/security-framework-sys/0.3.1/download -> security-framework-sys-0.3.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.92/download -> serde-1.0.92.crate https://crates.io/api/v1/crates/serde_derive/1.0.92/download -> serde_derive-1.0.92.crate https://crates.io/api/v1/crates/serde_json/1.0.39/download -> serde_json-1.0.39.crate https://crates.io/api/v1/crates/serde_yaml/0.8.9/download -> serde_yaml-0.8.9.crate https://crates.io/api/v1/crates/servo-fontconfig/0.4.0/download -> servo-fontconfig-0.4.0.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/4.0.7/download -> servo-fontconfig-sys-4.0.7.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/signal-hook/0.1.9/download -> signal-hook-0.1.9.crate https://crates.io/api/v1/crates/signal-hook-registry/1.0.1/download -> signal-hook-registry-1.0.1.crate https://crates.io/api/v1/crates/siphasher/0.2.3/download -> siphasher-0.2.3.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/0.6.10/download -> smallvec-0.6.10.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.4.6/download -> smithay-client-toolkit-0.4.6.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.6.2/download -> smithay-client-toolkit-0.6.2.crate https://crates.io/api/v1/crates/smithay-clipboard/0.3.3/download -> smithay-clipboard-0.3.3.crate https://crates.io/api/v1/crates/socket2/0.3.9/download -> socket2-0.3.9.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.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/static_assertions/0.3.3/download -> static_assertions-0.3.3.crate https://crates.io/api/v1/crates/stb_truetype/0.2.6/download -> stb_truetype-0.2.6.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/0.15.36/download -> syn-0.15.36.crate https://crates.io/api/v1/crates/synstructure/0.10.2/download -> synstructure-0.10.2.crate https://crates.io/api/v1/crates/tempfile/3.0.8/download -> tempfile-3.0.8.crate https://crates.io/api/v1/crates/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/terminfo/0.6.1/download -> terminfo-0.6.1.crate https://crates.io/api/v1/crates/termion/1.5.3/download -> termion-1.5.3.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.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/tiff/0.2.2/download -> tiff-0.2.2.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.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/2.4.0/download -> unicase-2.4.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.8/download -> unicode-normalization-0.1.8.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/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.3/download -> utf8-ranges-1.0.3.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/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/2.2.8/download -> walkdir-2.2.8.crate https://crates.io/api/v1/crates/wayland-client/0.21.13/download -> wayland-client-0.21.13.crate https://crates.io/api/v1/crates/wayland-client/0.23.5/download -> wayland-client-0.23.5.crate https://crates.io/api/v1/crates/wayland-commons/0.21.13/download -> wayland-commons-0.21.13.crate https://crates.io/api/v1/crates/wayland-commons/0.23.5/download -> wayland-commons-0.23.5.crate https://crates.io/api/v1/crates/wayland-protocols/0.21.13/download -> wayland-protocols-0.21.13.crate https://crates.io/api/v1/crates/wayland-protocols/0.23.5/download -> wayland-protocols-0.23.5.crate https://crates.io/api/v1/crates/wayland-scanner/0.21.13/download -> wayland-scanner-0.21.13.crate https://crates.io/api/v1/crates/wayland-scanner/0.23.5/download -> wayland-scanner-0.23.5.crate https://crates.io/api/v1/crates/wayland-sys/0.21.13/download -> wayland-sys-0.21.13.crate https://crates.io/api/v1/crates/wayland-sys/0.23.5/download -> wayland-sys-0.23.5.crate https://crates.io/api/v1/crates/which/1.0.5/download -> which-1.0.5.crate https://crates.io/api/v1/crates/widestring/0.4.0/download -> widestring-0.4.0.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.7/download -> winapi-0.3.7.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 https://crates.io/api/v1/crates/winit/0.19.1/download -> winit-0.19.1.crate https://crates.io/api/v1/crates/winpty-sys/0.4.3/download -> winpty-sys-0.4.3.crate https://crates.io/api/v1/crates/winreg/0.5.1/download -> winreg-0.5.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/x11-clipboard/0.3.2/download -> x11-clipboard-0.3.2.crate https://crates.io/api/v1/crates/x11-dl/2.18.3/download -> x11-dl-2.18.3.crate https://crates.io/api/v1/crates/xcb/0.8.2/download -> xcb-0.8.2.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.0/download -> xml-rs-0.8.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate https://crates.io/api/v1/crates/zip/0.5.2/download -> zip-0.5.2.crate
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c6407d708bf89ddb5b8d8fc903fd08b0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=b367c58ad2f053bf1c401e1637d1638e
diff --git a/metadata/md5-cache/x11-terms/alacritty-9999 b/metadata/md5-cache/x11-terms/alacritty-9999
new file mode 100644
index 000000000000..6dbfebd4d8ef
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/alacritty-9999
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/cmake >=virtual/rust-1.32.0 >=virtual/cargo-1.37.0 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=media-libs/fontconfig:= media-libs/freetype:2 x11-libs/libxcb
+DESCRIPTION=GPU-accelerated terminal emulator
+EAPI=7
+HOMEPAGE=https://github.com/jwilm/alacritty
+IUSE=debug
+LICENSE=Apache-2.0
+PROPERTIES=live
+RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 x11-libs/libxcb sys-libs/zlib sys-libs/ncurses:0 x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr virtual/opengl
+SLOT=0
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	bccdcfbbe03fc5843eeb9f7e87005f6f	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=418b1dbfeb687bf60b0c0d32fd9ffa1c
diff --git a/metadata/md5-cache/x11-terms/kitty-0.13.3 b/metadata/md5-cache/x11-terms/kitty-0.13.3
deleted file mode 100644
index fcc898513eb6..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-0.13.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) imagemagick? ( virtual/imagemagick-tools ) sys-libs/ncurses virtual/pkgconfig
-DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
-EAPI=6
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug doc imagemagick wayland python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) imagemagick? ( virtual/imagemagick-tools )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.13.3/kitty-0.13.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ecfa88269c3b090608ac036af7e5f70a
diff --git a/metadata/md5-cache/x11-terms/kitty-0.14.4 b/metadata/md5-cache/x11-terms/kitty-0.14.4
new file mode 100644
index 000000000000..0c1187ea87be
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-0.14.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libcanberra media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) imagemagick? ( virtual/imagemagick-tools ) media-libs/mesa[X(+)] sys-libs/ncurses virtual/pkgconfig
+DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
+EAPI=6
+HOMEPAGE=https://github.com/kovidgoyal/kitty
+IUSE=debug doc imagemagick wayland python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libcanberra media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) imagemagick? ( virtual/imagemagick-tools )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.14.4/kitty-0.14.4.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c5a8e08fd577bdd30a0702e73eefa876
diff --git a/metadata/md5-cache/x11-terms/kitty-9999 b/metadata/md5-cache/x11-terms/kitty-9999
index ede57a5d0ea2..56161ee2c359 100644
--- a/metadata/md5-cache/x11-terms/kitty-9999
+++ b/metadata/md5-cache/x11-terms/kitty-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup test unpack
-DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) imagemagick? ( virtual/imagemagick-tools ) media-libs/mesa[X(+)] sys-libs/ncurses virtual/pkgconfig >=dev-python/sphinx-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_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]
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libcanberra media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) imagemagick? ( virtual/imagemagick-tools ) media-libs/mesa[X(+)] sys-libs/ncurses virtual/pkgconfig >=dev-python/sphinx-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_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]
 DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
 EAPI=6
 HOMEPAGE=https://github.com/kovidgoyal/kitty
 IUSE=debug doc imagemagick wayland python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) imagemagick? ( virtual/imagemagick-tools )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libcanberra media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) imagemagick? ( virtual/imagemagick-tools )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d977e13dba0a9a07dd2d78b65221ae99
+_md5_=fa35640b1cee9cc40d54f4677550b56e
diff --git a/metadata/md5-cache/x11-terms/terminology-1.5.0 b/metadata/md5-cache/x11-terms/terminology-1.5.0
index f2b896ca05f7..edf342325f8a 100644
--- a/metadata/md5-cache/x11-terms/terminology-1.5.0
+++ b/metadata/md5-cache/x11-terms/terminology-1.5.0
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] ) || ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 dev-libs/efl[eet,fontconfig]
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/apps/terminology/terminology-1.5.0.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df3ae60b2c5aec9245cd9cceec26f762
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index b1e6cfdc20e8..7d5783f6ae0b 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/adapta-gtk-theme-3.95.0.11 b/metadata/md5-cache/x11-themes/adapta-gtk-theme-3.95.0.11
index 8e2698339292..8fafc6f15c52 100644
--- a/metadata/md5-cache/x11-themes/adapta-gtk-theme-3.95.0.11
+++ b/metadata/md5-cache/x11-themes/adapta-gtk-theme-3.95.0.11
@@ -4,10 +4,10 @@ DEPEND=dev-lang/sassc dev-libs/glib:2 dev-ruby/sass:* media-gfx/inkscape x11-lib
 DESCRIPTION=An adaptive Gtk+ theme based on Material Design Guidelines
 EAPI=7
 HOMEPAGE=https://github.com/adapta-project/adapta-gtk-theme
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-1
 RDEPEND=dev-lang/sassc dev-libs/glib:2 dev-ruby/sass:* media-gfx/inkscape x11-libs/gdk-pixbuf:2
 SLOT=0
 SRC_URI=https://github.com/adapta-project/adapta-gtk-theme/archive/3.95.0.11.tar.gz -> adapta-gtk-theme-3.95.0.11.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3d4b49b5d76e23c0e08aa0140bc91c07
+_md5_=ea96d22dee3e9df7e19119b4e00e3505
diff --git a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.30.0 b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.30.0
index f2c2386693d2..10b58034719c 100644
--- a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.30.0
+++ b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.30.0
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0
 RDEPEND=!<x11-themes/gnome-themes-standard-3.14
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-backgrounds/3.30/gnome-backgrounds-3.30.0.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=bdbed1a0fd44fa453a59708795e8c4b5
diff --git a/metadata/md5-cache/x11-themes/greybird-3.22.10 b/metadata/md5-cache/x11-themes/greybird-3.22.10
new file mode 100644
index 000000000000..23f9444ca767
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/greybird-3.22.10
@@ -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=install postinst prepare
+DEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90 dev-lang/sassc dev-libs/glib:2 dev-ruby/sass:3.5
+DESCRIPTION=The default theme from Xubuntu
+EAPI=7
+HOMEPAGE=http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird
+IUSE=ayatana gnome xfce
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=CC-BY-SA-3.0 GPL-2+
+RDEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90
+SLOT=0
+SRC_URI=https://github.com/shimmerproject/Greybird/archive/v3.22.10.tar.gz -> greybird-3.22.10.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c3c5e6cb0cf554515f24ad3eee3e1a73
diff --git a/metadata/md5-cache/x11-themes/greybird-3.22.8 b/metadata/md5-cache/x11-themes/greybird-3.22.8
deleted file mode 100644
index e52cd134b55d..000000000000
--- a/metadata/md5-cache/x11-themes/greybird-3.22.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90 dev-libs/glib:2 dev-ruby/sass:3.5 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The default theme from Xubuntu
-EAPI=6
-HOMEPAGE=http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird
-IUSE=ayatana gnome
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=CC-BY-SA-3.0 GPL-2+
-RDEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90
-SLOT=0
-SRC_URI=https://github.com/shimmerproject/Greybird/archive/v3.22.8.tar.gz -> greybird-3.22.8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=59ab552f878d3ba32ff581282e4e3396
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-rezlooks-0.6-r1 b/metadata/md5-cache/x11-themes/gtk-engines-rezlooks-0.6-r1
new file mode 100644
index 000000000000..beb70acfc52c
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/gtk-engines-rezlooks-0.6-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=x11-libs/gtk+-2.8:2 virtual/pkgconfig
+DESCRIPTION=Rezlooks GTK+ Engine
+EAPI=7
+HOMEPAGE=https://www.gnome-look.org/content/show.php?content=39179
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-2.8:2
+SLOT=0
+SRC_URI=https://www.gnome-look.org/content/files/39179-rezlooks-0.6.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a6814e2cb1ab6c604a0a973a78645d4e
diff --git a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.05.07 b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.05.07
index 2662b3266dba..b57578046604 100644
--- a/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.05.07
+++ b/metadata/md5-cache/x11-themes/numix-icon-theme-circle-19.05.07
@@ -3,10 +3,10 @@ DEPEND=x11-themes/numix-icon-theme
 DESCRIPTION=An icon theme for Linux from the Numix project
 EAPI=6
 HOMEPAGE=https://github.com/numixproject
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=x11-themes/numix-icon-theme
 SLOT=0
 SRC_URI=https://github.com/numixproject/numix-icon-theme-circle/archive/19.05.07.tar.gz -> numix-icon-theme-circle-19.05.07.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a2880cd2c8fd26d0412e397ce056af80
+_md5_=da9f123dfd3dd6dcaf79efb206bffffe
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index d161384545bf..28d718bbf934 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/bspwm-0.9.5 b/metadata/md5-cache/x11-wm/bspwm-0.9.5
deleted file mode 100644
index 4eb755bda448..000000000000
--- a/metadata/md5-cache/x11-wm/bspwm-0.9.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm
-DESCRIPTION=Tiling window manager based on binary space partitioning
-EAPI=6
-HOMEPAGE=https://github.com/baskerville/bspwm/
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm x11-misc/sxhkd
-SLOT=0
-SRC_URI=https://github.com/baskerville/bspwm/archive/0.9.5.tar.gz -> bspwm-0.9.5.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=ff5142faf2995a59fa9b0b454f49135e
diff --git a/metadata/md5-cache/x11-wm/bspwm-0.9.7 b/metadata/md5-cache/x11-wm/bspwm-0.9.7
deleted file mode 100644
index bf8d1258e7d2..000000000000
--- a/metadata/md5-cache/x11-wm/bspwm-0.9.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm
-DESCRIPTION=Tiling window manager based on binary space partitioning
-EAPI=7
-HOMEPAGE=https://github.com/baskerville/bspwm/
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm x11-misc/sxhkd
-SLOT=0
-SRC_URI=https://github.com/baskerville/bspwm/archive/0.9.7.tar.gz -> bspwm-0.9.7.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a2fecbd0f4bf3bd862b5834145551159
diff --git a/metadata/md5-cache/x11-wm/bspwm-0.9.9 b/metadata/md5-cache/x11-wm/bspwm-0.9.9
new file mode 100644
index 000000000000..bcc5ec2bcbd1
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/bspwm-0.9.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm
+DESCRIPTION=Tiling window manager based on binary space partitioning
+EAPI=7
+HOMEPAGE=https://github.com/baskerville/bspwm/
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm x11-misc/sxhkd
+SLOT=0
+SRC_URI=https://github.com/baskerville/bspwm/archive/0.9.9.tar.gz -> bspwm-0.9.9.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=abcfc4e35b890c17c18ebac7e36e9e69
diff --git a/metadata/md5-cache/x11-wm/e16-1.0.20 b/metadata/md5-cache/x11-wm/e16-1.0.20
new file mode 100644
index 000000000000..6086e341f5f1
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/e16-1.0.20
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=media-libs/freetype:2 media-libs/imlib2[X] virtual/libiconv x11-libs/libX11 x11-libs/libXext x11-misc/xbitmaps dbus? ( sys-apps/dbus ) opengl? ( media-libs/glu media-libs/mesa ) pango? ( dev-libs/glib:2 x11-libs/pango[X] ) sound? ( || ( media-sound/apulse[sdk] media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) audiofile? ( media-libs/audiofile:= ) ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpresent? ( x11-libs/libXpresent ) xrandr? ( x11-libs/libXrandr ) xrender? ( x11-libs/libXrender ) xsm? ( x11-libs/libICE x11-libs/libSM ) zoom? ( x11-libs/libXxf86vm ) x11-base/xorg-proto
+DESCRIPTION=Enlightenment Window Manager (E16)
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/
+IUSE=audiofile container dbus debug +dialogs doc examples gnome libhack modules nls opengl +pango sndfile sound +themes xcomposite +xft xi2 xinerama xpresent +xrandr +xrender +xsm +xsync zoom
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=media-libs/freetype:2 media-libs/imlib2[X] virtual/libiconv x11-libs/libX11 x11-libs/libXext x11-misc/xbitmaps dbus? ( sys-apps/dbus ) opengl? ( media-libs/glu media-libs/mesa ) pango? ( dev-libs/glib:2 x11-libs/pango[X] ) sound? ( || ( media-sound/apulse[sdk] media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) audiofile? ( media-libs/audiofile:= ) ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpresent? ( x11-libs/libXpresent ) xrandr? ( x11-libs/libXrandr ) xrender? ( x11-libs/libXrender ) xsm? ( x11-libs/libICE x11-libs/libSM ) zoom? ( x11-libs/libXxf86vm ) doc? ( app-doc/e16-docs ) nls? ( virtual/libintl ) themes? ( x11-themes/e16-themes ) !x11-wm/enlightenment:0
+REQUIRED_USE=audiofile? ( sound ) opengl? ( xcomposite ) sndfile? ( sound ) sound? ( ^^ ( sndfile audiofile ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/enlightenment/e16-1.0.20.tar.xz
+_md5_=d0bcdc1c8c345cc72a73bfa2b406ee1d
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.22.4 b/metadata/md5-cache/x11-wm/enlightenment-0.22.4
deleted file mode 100644
index 9dd5c8e0b9b9..000000000000
--- a/metadata/md5-cache/x11-wm/enlightenment-0.22.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/efl-1.20.5[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) bluetooth? ( net-wireless/bluez ) connman? ( dev-libs/efl[connman] ) geolocation? ( app-misc/geoclue:2.0 ) packagekit? ( app-admin/packagekit-base ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( >=dev-libs/efl-1.21.0[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=Enlightenment window manager
-EAPI=6
-HOMEPAGE=https://www.enlightenment.org
-IUSE=acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi
-KEYWORDS=amd64 ~ppc x86
-LICENSE=BSD-2
-RDEPEND=>=dev-libs/efl-1.20.5[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) bluetooth? ( net-wireless/bluez ) connman? ( dev-libs/efl[connman] ) geolocation? ( app-misc/geoclue:2.0 ) packagekit? ( app-admin/packagekit-base ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( >=dev-libs/efl-1.21.0[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman )
-SLOT=0.17/0.22.4
-SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.22.4.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a82e4c0dc25f7ce38aaa97b58e96b7af
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.22.4-r1 b/metadata/md5-cache/x11-wm/enlightenment-0.22.4-r1
index 0c618bf89663..50bd08d280ba 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.22.4-r1
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.22.4-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Enlightenment window manager
 EAPI=7
 HOMEPAGE=https://www.enlightenment.org
 IUSE=acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.20.5[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) bluetooth? ( net-wireless/bluez ) connman? ( dev-libs/efl[connman] ) geolocation? ( app-misc/geoclue:2.0 ) packagekit? ( app-admin/packagekit-base ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( >=dev-libs/efl-1.22.0[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman ) xwayland? ( dev-libs/efl[X,wayland] x11-base/xorg-server[wayland] )
 REQUIRED_USE=xwayland? ( wayland )
 SLOT=0.17/0.22.4
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.22.4.tar.xz
-_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=415ab718bfaa806fbe1655681fbc329b
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=37e6797f40ea93a04bc0dd5be13dc07e
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.23.0 b/metadata/md5-cache/x11-wm/enlightenment-0.23.0
new file mode 100644
index 000000000000..16ade623725b
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.23.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=>=dev-libs/efl-1.22.3[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) bluetooth? ( net-wireless/bluez ) connman? ( dev-libs/efl[connman] ) geolocation? ( app-misc/geoclue:2.0 ) packagekit? ( app-admin/packagekit-base ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( >=dev-libs/efl-1.22.0[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman ) xwayland? ( dev-libs/efl[X,wayland] x11-base/xorg-server[wayland] )
+DESCRIPTION=Enlightenment window manager
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org
+IUSE=acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-libs/efl-1.22.3[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) bluetooth? ( net-wireless/bluez ) connman? ( dev-libs/efl[connman] ) geolocation? ( app-misc/geoclue:2.0 ) packagekit? ( app-admin/packagekit-base ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( >=dev-libs/efl-1.22.0[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman ) xwayland? ( dev-libs/efl[X,wayland] x11-base/xorg-server[wayland] )
+REQUIRED_USE=xwayland? ( wayland )
+SLOT=0.17/0.23.0
+SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.23.0.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1a340400cf0e09a71939864fd958fa85
diff --git a/metadata/md5-cache/x11-wm/icewm-1.4.2 b/metadata/md5-cache/x11-wm/icewm-1.4.2
deleted file mode 100644
index 916c9d4682a1..000000000000
--- a/metadata/md5-cache/x11-wm/icewm-1.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=media-libs/fontconfig x11-libs/gdk-pixbuf:2[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender bidi? ( dev-libs/fribidi ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto doc? ( app-text/linuxdoc-tools ) nls? ( >=sys-devel/gettext-0.19.6 ) truetype? ( >=media-libs/freetype-2.0.9 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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=Ice Window Manager with Themes
-EAPI=6
-HOMEPAGE=https://ice-wm.org/ https://github.com/bbidulock/icewm
-IUSE=bidi debug doc minimal nls truetype uclibc xinerama
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig x11-libs/gdk-pixbuf:2[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender bidi? ( dev-libs/fribidi ) xinerama? ( x11-libs/libXinerama )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/bbidulock/icewm/archive/1.4.2.tar.gz -> icewm-1.4.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a5f781c75f11db2ca2f6e3cdaa8d3e40
diff --git a/metadata/md5-cache/x11-wm/icewm-1.5.4 b/metadata/md5-cache/x11-wm/icewm-1.5.4
deleted file mode 100644
index 22d7756ae3e8..000000000000
--- a/metadata/md5-cache/x11-wm/icewm-1.5.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/asciidoc nls? ( >=sys-devel/gettext-0.19.6 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/fontconfig x11-libs/gdk-pixbuf:2[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr x11-libs/libXrender alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) truetype? ( x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) gnome-base/librsvg x11-base/xorg-proto truetype? ( >=media-libs/freetype-2.0.9 )
-DESCRIPTION=Ice Window Manager with Themes
-EAPI=7
-HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
-IUSE=+alsa ao bidi debug nls truetype uclibc xinerama
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig x11-libs/gdk-pixbuf:2[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr x11-libs/libXrender alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) truetype? ( x11-libs/libXext ) xinerama? ( x11-libs/libXinerama )
-REQUIRED_USE=|| ( alsa ao )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.5.4/icewm-1.5.4.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=10fa80b00adb2d20eda1de3ab4ceb56f
diff --git a/metadata/md5-cache/x11-wm/icewm-1.5.5 b/metadata/md5-cache/x11-wm/icewm-1.5.5
index f0b71d6759f2..8dcd08defe14 100644
--- a/metadata/md5-cache/x11-wm/icewm-1.5.5
+++ b/metadata/md5-cache/x11-wm/icewm-1.5.5
@@ -5,7 +5,7 @@ DESCRIPTION=Ice Window Manager with Themes
 EAPI=7
 HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
 IUSE=+alsa ao bidi debug nls truetype uclibc xinerama
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig x11-libs/gdk-pixbuf:2[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr x11-libs/libXrender alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) truetype? ( x11-libs/libXext ) xinerama? ( x11-libs/libXinerama )
 REQUIRED_USE=|| ( alsa ao )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.5.5/icewm-1.5.5.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=10fa80b00adb2d20eda1de3ab4ceb56f
+_md5_=e51e6b65dc5d70027b4e558c55148c7d
diff --git a/metadata/md5-cache/x11-wm/icewm-1.6.1 b/metadata/md5-cache/x11-wm/icewm-1.6.1
new file mode 100644
index 000000000000..86451268119c
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/icewm-1.6.1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/asciidoc virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.6 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/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 unpack
+DEPEND=media-libs/fontconfig x11-libs/gdk-pixbuf:2[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr x11-libs/libXrender alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) truetype? ( x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) || ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) gnome-base/librsvg x11-base/xorg-proto truetype? ( >=media-libs/freetype-2.0.9 )
+DESCRIPTION=Ice Window Manager with Themes
+EAPI=7
+HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
+IUSE=+alsa ao bidi debug nls truetype uclibc xinerama
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/fontconfig x11-libs/gdk-pixbuf:2[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr x11-libs/libXrender alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) truetype? ( x11-libs/libXext ) xinerama? ( x11-libs/libXinerama )
+REQUIRED_USE=|| ( alsa ao )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.6.1/icewm-1.6.1.tar.lz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=525654c9cd436fb4df0ef5034038cb51
diff --git a/metadata/md5-cache/x11-wm/mutter-3.26.2-r1 b/metadata/md5-cache/x11-wm/mutter-3.26.2-r1
index 7e618a93d0ef..8a40c8590840 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.26.2-r1
+++ b/metadata/md5-cache/x11-wm/mutter-3.26.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[egl] gles2? ( media-libs/mesa[gles2] ) input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.9 >=media-libs/mesa-10.3[egl,gbm,wayland] sys-apps/systemd >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] <gnome-base/gsettings-desktop-schemas-3.31 gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[egl] gles2? ( media-libs/mesa[gles2] ) input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.9 >=media-libs/mesa-10.3[egl,gbm,wayland] sys-apps/systemd >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GNOME 3 compositing window manager based on Clutter
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
 IUSE=debug gles2 input_devices_wacom +introspection test udev wayland test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[egl] gles2? ( media-libs/mesa[gles2] ) input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.9 >=media-libs/mesa-10.3[egl,gbm,wayland] sys-apps/systemd >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= )
+RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] <gnome-base/gsettings-desktop-schemas-3.31 gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[egl] gles2? ( media-libs/mesa[gles2] ) input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.9 >=media-libs/mesa-10.3[egl,gbm,wayland] sys-apps/systemd >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/mutter/3.26/mutter-3.26.2.tar.xz https://dev.gentoo.org/~leio/distfiles/mutter-3.26.2-patchset.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03c2aa00348181d53ea690b9871355f3
+_md5_=613c5a7101bb369ced0f9f5c3fcca944
diff --git a/metadata/md5-cache/x11-wm/mutter-3.30.2-r1 b/metadata/md5-cache/x11-wm/mutter-3.30.2-r1
index 7d82ae2e0616..0208e4c0606f 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.30.2-r1
+++ b/metadata/md5-cache/x11-wm/mutter-3.30.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[X(+),egl,gles2?] input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.16 >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] <gnome-base/gsettings-desktop-schemas-3.31 gnome-base/gnome-desktop:3= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[X(+),egl,gles2?] input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.16 >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GNOME 3 compositing window manager based on Clutter
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
 IUSE=debug elogind gles2 input_devices_wacom +introspection systemd test udev wayland test
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[X(+),egl,gles2?] input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.16 >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= )
+RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] <gnome-base/gsettings-desktop-schemas-3.31 gnome-base/gnome-desktop:3= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[X(+),egl,gles2?] input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.16 >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= )
 REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) )
 SLOT=0/3
 SRC_URI=mirror://gnome/sources/mutter/3.30/mutter-3.30.2.tar.xz https://dev.gentoo.org/~leio/distfiles/mutter-3.30.2-r1-patchset.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b7cd14c2c8c2e5c1753c8f4f2535be5
+_md5_=811b3e0835f36d624caf4ebe08886ae2
diff --git a/metadata/md5-cache/x11-wm/mutter-3.30.2-r3 b/metadata/md5-cache/x11-wm/mutter-3.30.2-r3
index 1a497885f106..5f550f9e9f68 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.30.2-r3
+++ b/metadata/md5-cache/x11-wm/mutter-3.30.2-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[X(+),egl,gles2?] input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.16 >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] <gnome-base/gsettings-desktop-schemas-3.31 gnome-base/gnome-desktop:3= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[X(+),egl,gles2?] input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.16 >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GNOME 3 compositing window manager based on Clutter
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
 IUSE=debug elogind gles2 input_devices_wacom +introspection systemd test udev wayland test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[X(+),egl,gles2?] input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.16 >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= )
+RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] <gnome-base/gsettings-desktop-schemas-3.31 gnome-base/gnome-desktop:3= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[X(+),egl,gles2?] input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.16 >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= )
 REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) )
 SLOT=0/3
 SRC_URI=mirror://gnome/sources/mutter/3.30/mutter-3.30.2.tar.xz https://dev.gentoo.org/~leio/distfiles/mutter-3.30.2-r3-patchset.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cad13c88d4e6ae0dc339dc81f24544a5
+_md5_=c8a6e0535bd5f2bc8269963e5020366a
diff --git a/metadata/md5-cache/x11-wm/mutter-3.30.2-r4 b/metadata/md5-cache/x11-wm/mutter-3.30.2-r4
index ba2f9e95a3a1..0e25386d01d0 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.30.2-r4
+++ b/metadata/md5-cache/x11-wm/mutter-3.30.2-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[X(+),egl,gles2?] input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) screencast? ( >=media-video/pipewire-0.2.2:0/0.2 ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.16 >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] <gnome-base/gsettings-desktop-schemas-3.31 gnome-base/gnome-desktop:3= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[X(+),egl,gles2?] input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) screencast? ( >=media-video/pipewire-0.2.2:0/0.2 ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.16 >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= ) dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) wayland? ( >=sys-kernel/linux-headers-4.4 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GNOME 3 compositing window manager based on Clutter
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
 IUSE=debug elogind gles2 input_devices_wacom +introspection screencast systemd test udev wayland test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] gnome-base/gnome-desktop:3= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[X(+),egl,gles2?] input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) screencast? ( >=media-video/pipewire-0.2.2:0/0.2 ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.16 >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= )
+RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] <gnome-base/gsettings-desktop-schemas-3.31 gnome-base/gnome-desktop:3= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[X(+),egl,gles2?] input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) screencast? ( >=media-video/pipewire-0.2.2:0/0.2 ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.16 >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= )
 REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) )
 SLOT=0/3
 SRC_URI=mirror://gnome/sources/mutter/3.30/mutter-3.30.2.tar.xz https://dev.gentoo.org/~leio/distfiles/mutter-3.30.2-r4-patchset.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d45e72af72fbe5debca6d43e047778a
+_md5_=e5021f70c8650febd7e6104e12c2d41b
diff --git a/metadata/md5-cache/x11-wm/xmonad-0.15 b/metadata/md5-cache/x11-wm/xmonad-0.15
new file mode 100644
index 000000000000..78964dee4f02
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/xmonad-0.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-haskell/data-default:=[profile?] dev-haskell/extensible-exceptions:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/setlocale:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.8:=[profile?] <dev-haskell/x11-1.10:=[profile?] >=dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-1.24.0.0 test? ( >=dev-haskell/quickcheck-2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A tiling window manager
+EAPI=6
+HOMEPAGE=http://xmonad.org
+IUSE=no-autorepeat-keys doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/data-default:=[profile?] dev-haskell/extensible-exceptions:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/setlocale:=[profile?] >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/x11-1.8:=[profile?] <dev-haskell/x11-1.10:=[profile?] >=dev-lang/ghc-8.0.1:=
+SLOT=0/0.15
+SRC_URI=mirror://hackage/packages/archive/xmonad/0.15/xmonad-0.15.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a549d573a09cb3483a874d315c5309fd
diff --git a/metadata/md5-cache/x11-wm/xmonad-contrib-0.15 b/metadata/md5-cache/x11-wm/xmonad-contrib-0.15
new file mode 100644
index 000000000000..4177fec307e2
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/xmonad-contrib-0.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.10:=[profile?] >=dev-lang/ghc-7.6.1:= >=x11-wm/xmonad-0.15:=[profile?] <x11-wm/xmonad-0.16:=[profile?] xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] ) >=dev-haskell/cabal-1.16.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Third party extensions for xmonad
+EAPI=6
+HOMEPAGE=http://xmonad.org/
+IUSE=+xft doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] dev-haskell/old-locale:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] dev-haskell/semigroups:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.10:=[profile?] >=dev-lang/ghc-7.6.1:= >=x11-wm/xmonad-0.15:=[profile?] <x11-wm/xmonad-0.16:=[profile?] xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
+SLOT=0/0.15
+SRC_URI=mirror://hackage/packages/archive/xmonad-contrib/0.15/xmonad-contrib-0.15.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3942df5a5f35fdb98292b216f3f092e1
diff --git a/metadata/md5-cache/x11-wm/xoat-9999 b/metadata/md5-cache/x11-wm/xoat-9999
index 762e5d659787..adb68904e6cc 100644
--- a/metadata/md5-cache/x11-wm/xoat-9999
+++ b/metadata/md5-cache/x11-wm/xoat-9999
@@ -1,12 +1,13 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama
 DESCRIPTION=X Obstinate Asymmetric Tiler
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/seanpringle/xoat
 IUSE=savedconfig
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama !savedconfig? ( x11-misc/dmenu )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	0c38912e9b32aef6433a71726675b4b1	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8632450db2f848a9a50548cbc421ad52
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	0c38912e9b32aef6433a71726675b4b1	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b365628b38fbf283c9e1facbe888bf33
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index a70211ba1024..87ac0b1b5b4f 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/garcon-0.6.2 b/metadata/md5-cache/xfce-base/garcon-0.6.2
deleted file mode 100644
index ce9109000333..000000000000
--- a/metadata/md5-cache/xfce-base/garcon-0.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
-EAPI=7
-HOMEPAGE=https://docs.xfce.org/xfce/exo/start
-IUSE=+gtk2
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.2.tar.bz2
-_md5_=0afd109e44b74800991ecf9529bf63ef
diff --git a/metadata/md5-cache/xfce-base/garcon-0.6.2-r1 b/metadata/md5-cache/xfce-base/garcon-0.6.2-r1
new file mode 100644
index 000000000000..4bb1745ca06d
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/garcon-0.6.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)] >=xfce-base/libxfce4util-4.12:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
+EAPI=7
+HOMEPAGE=https://docs.xfce.org/xfce/exo/start
+IUSE=+gtk2
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)] >=xfce-base/libxfce4util-4.12:= gtk2? ( >=x11-libs/gtk+-2.24:2= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.2.tar.bz2
+_md5_=e42311e8392c5eae1cef3dc133b5c52e
diff --git a/metadata/md5-cache/xfce-base/garcon-0.6.3 b/metadata/md5-cache/xfce-base/garcon-0.6.3
index f2f0a7076e80..aee23082ab11 100644
--- a/metadata/md5-cache/xfce-base/garcon-0.6.3
+++ b/metadata/md5-cache/xfce-base/garcon-0.6.3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)] >=xfce-base/libxfce4util-4.12:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
 EAPI=7
 HOMEPAGE=https://docs.xfce.org/xfce/exo/start
 IUSE=+gtk2
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
+RDEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)] >=xfce-base/libxfce4util-4.12:= gtk2? ( >=x11-libs/gtk+-2.24:2= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.3.tar.bz2
-_md5_=1c1c4ad81939733af8bb3d195b5cbaeb
+_md5_=cced29407f4c4c1ac750b19590e529f8
diff --git a/metadata/md5-cache/xfce-base/garcon-0.6.4 b/metadata/md5-cache/xfce-base/garcon-0.6.4
deleted file mode 100644
index 5574cedd48ee..000000000000
--- a/metadata/md5-cache/xfce-base/garcon-0.6.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
-EAPI=7
-HOMEPAGE=https://docs.xfce.org/xfce/exo/start
-IUSE=+gtk2
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.30:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.4.tar.bz2
-_md5_=1c1c4ad81939733af8bb3d195b5cbaeb
diff --git a/metadata/md5-cache/xfce-base/garcon-0.6.4-r1 b/metadata/md5-cache/xfce-base/garcon-0.6.4-r1
new file mode 100644
index 000000000000..4ac6a413e1ca
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/garcon-0.6.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)] >=xfce-base/libxfce4util-4.12:= gtk2? ( >=x11-libs/gtk+-2.24:2= ) dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
+EAPI=7
+HOMEPAGE=https://docs.xfce.org/xfce/exo/start
+IUSE=+gtk2
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.30:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)] >=xfce-base/libxfce4util-4.12:= gtk2? ( >=x11-libs/gtk+-2.24:2= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.4.tar.bz2
+_md5_=cced29407f4c4c1ac750b19590e529f8
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.14.1 b/metadata/md5-cache/xfce-base/libxfce4ui-4.14.1
index 191084e5946d..e2c8dba53157 100644
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.14.1
+++ b/metadata/md5-cache/xfce-base/libxfce4ui-4.14.1
@@ -1,14 +1,15 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.18:3=[introspection?] x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10= ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification:= ) !xfce-base/xfce-utils dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
+DEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.18:3=[introspection?] x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10= ) gtk2? ( >=x11-libs/gtk+-2.24:2= ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification:= ) !xfce-base/xfce-utils dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
 DESCRIPTION=Unified widget and session management libs for Xfce
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=debug glade introspection startup-notification vala
+IUSE=debug glade +gtk2 introspection startup-notification vala
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.18:3=[introspection?] x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10= ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification:= ) !xfce-base/xfce-utils
+RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.18:3=[introspection?] x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10= ) gtk2? ( >=x11-libs/gtk+-2.24:2= ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification:= ) !xfce-base/xfce-utils
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!gtk2? ( test )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.14/libxfce4ui-4.14.1.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46e4a80818a66a218a2744644a8a1129
+_md5_=75c34f839fe7bbd251d3db376cc7a00f
diff --git a/metadata/md5-cache/xfce-base/thunar-1.6.16 b/metadata/md5-cache/xfce-base/thunar-1.6.16
deleted file mode 100644
index 8bca59f27e39..000000000000
--- a/metadata/md5-cache/xfce-base/thunar-1.6.16
+++ /dev/null
@@ -1,14 +0,0 @@
-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 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 ~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	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca07a1d4f8059a02e6bfe5c9d7aca21d
diff --git a/metadata/md5-cache/xfce-base/thunar-1.6.16-r1 b/metadata/md5-cache/xfce-base/thunar-1.6.16-r1
new file mode 100644
index 000000000000..3de5b14b51d7
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/thunar-1.6.16-r1
@@ -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:=[gtk2(+)] >=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 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 ~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:=[gtk2(+)] >=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	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=265be9abed76af1efd3fa8d35d1bca5f
diff --git a/metadata/md5-cache/xfce-base/thunar-1.6.17 b/metadata/md5-cache/xfce-base/thunar-1.6.17
index 67b81637cf75..cdb4068c7c75 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.6.17
+++ b/metadata/md5-cache/xfce-base/thunar-1.6.17
@@ -1,14 +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.12.5-r100:= >=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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+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.12.5-r100:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=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 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 ~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.12.5-r100:= >=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] )
+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.12.5-r100:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=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.17.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5009b191c756d15ff63d62f56bdce0e1
+_md5_=935b28eb000e60b2feccbe2241398847
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.14.0 b/metadata/md5-cache/xfce-base/xfce4-panel-4.14.0
index e25d95ab9154..87626c6e1dd7 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.14.0
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.14.0
@@ -1,14 +1,15 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.42 >=x11-libs/cairo-1 >=x11-libs/gtk+-2.20:2 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= introspection? ( dev-libs/gobject-introspection:= ) vala? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-lang/perl dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.42 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= gtk2? ( >=x11-libs/gtk+-2.20:2 ) introspection? ( dev-libs/gobject-introspection:= ) vala? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-lang/perl dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Panel for the Xfce desktop environment
 EAPI=7
 HOMEPAGE=https://www.xfce.org/projects/
-IUSE=introspection vala
+IUSE=+gtk2 introspection vala
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.42 >=x11-libs/cairo-1 >=x11-libs/gtk+-2.20:2 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= introspection? ( dev-libs/gobject-introspection:= )
+RDEPEND=>=dev-libs/glib-2.42 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= gtk2? ( >=x11-libs/gtk+-2.20:2 ) introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=!gtk2? ( test )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.14/xfce4-panel-4.14.0.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6182c1a88c90e4595c070afb29250118
+_md5_=85ad93dc0ed67dd514bc017c3f5e5c20
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.12.4 b/metadata/md5-cache/xfce-base/xfce4-settings-4.12.4
deleted file mode 100644
index e31ace4339b1..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.12.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.11 >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) dev-util/intltool virtual/pkgconfig sys-devel/gettext x11-base/xorg-proto
-DESCRIPTION=Configuration system for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=input_devices_libinput libcanberra libnotify upower +xklavier
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.11 >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.12/xfce4-settings-4.12.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3324aebd680b28fc258142b97c3b8bfb
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.12.4-r1 b/metadata/md5-cache/xfce-base/xfce4-settings-4.12.4-r1
new file mode 100644
index 000000000000..8d24073c4ca9
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.12.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.11[gtk2(+)] >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) dev-util/intltool virtual/pkgconfig sys-devel/gettext x11-base/xorg-proto
+DESCRIPTION=Configuration system for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=input_devices_libinput libcanberra libnotify upower +xklavier
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 media-libs/fontconfig >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.8 >=xfce-base/libxfce4ui-4.11[gtk2(+)] >=xfce-base/libxfce4util-4.11 >=xfce-base/xfconf-4.10 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.12/xfce4-settings-4.12.4.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c0a963c3e378568be96a75505db65149
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.7 b/metadata/md5-cache/xfce-base/xfce4-settings-4.13.7
deleted file mode 100644
index fd59433e8af1..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig sys-devel/gettext x11-base/xorg-proto
-DESCRIPTION=Configuration system for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.13/xfce4-settings-4.13.7.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd7caa0a299d133487018d9a9b66f2a3
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.8 b/metadata/md5-cache/xfce-base/xfce4-settings-4.13.8
deleted file mode 100644
index ea403d2445b7..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.13.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig sys-devel/gettext x11-base/xorg-proto
-DESCRIPTION=Configuration system for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.13/xfce4-settings-4.13.8.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd7caa0a299d133487018d9a9b66f2a3
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.14.1 b/metadata/md5-cache/xfce-base/xfce4-settings-4.14.1
new file mode 100644
index 000000000000..fc5d165fe05d
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig sys-devel/gettext x11-base/xorg-proto
+DESCRIPTION=Configuration system for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.24 media-libs/fontconfig x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2 >=xfce-base/exo-0.11 >=xfce-base/libxfce4ui-4.12 >=xfce-base/libxfce4util-4.12 >=xfce-base/xfconf-4.13 colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.14/xfce4-settings-4.14.1.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd7caa0a299d133487018d9a9b66f2a3
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.12.4 b/metadata/md5-cache/xfce-base/xfdesktop-4.12.4
index dc359c3bce46..36088f180a6e 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.12.4
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.12.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure postinst postrm
-DEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= >=xfce-base/exo-0.8:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= >=xfce-base/exo-0.8:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:=[gtk2(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Desktop manager for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=debug libnotify +thunar
 KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= >=xfce-base/exo-0.8:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] )
+RDEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= >=xfce-base/exo-0.8:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:=[gtk2(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.12/xfdesktop-4.12.4.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eb354261934b9da3e22cd58c7a719e32
+_md5_=02fdbf7445248c0f85951027919d4774
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.12.5 b/metadata/md5-cache/xfce-base/xfdesktop-4.12.5
deleted file mode 100644
index 8124d320d945..000000000000
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.12.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Desktop manager for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=debug libnotify +thunar
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.12/xfdesktop-4.12.5.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce655926910c767120aad2e099913c79
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.12.5-r1 b/metadata/md5-cache/xfce-base/xfdesktop-4.12.5-r1
new file mode 100644
index 000000000000..557eedd053fb
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.12.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:=[gtk2(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Desktop manager for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=debug libnotify +thunar
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:=[gtk2(+)] >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= =xfce-base/thunar-1.6*:=[dbus] )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.12/xfdesktop-4.12.5.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=115dd1d8ea6c9c49283cc54c8930908b
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.12.5 b/metadata/md5-cache/xfce-base/xfwm4-4.12.5
deleted file mode 100644
index 1f6f0b02878b..000000000000
--- a/metadata/md5-cache/xfce-base/xfwm4-4.12.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/xfconf-4.10:= startup-notification? ( x11-libs/startup-notification:= ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig dri? ( >=x11-libs/libdrm-2.4 )
-DESCRIPTION=Window manager for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=dri startup-notification +xcomposite
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/xfconf-4.10:= startup-notification? ( x11-libs/startup-notification:= ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.12/xfwm4-4.12.5.tar.bz2
-_md5_=64fad4ba393b95ea4b23b7fd6d36faaf
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.12.5-r1 b/metadata/md5-cache/xfce-base/xfwm4-4.12.5-r1
new file mode 100644
index 000000000000..8c5df8e31a88
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.12.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:=[gtk2(+)] >=xfce-base/xfconf-4.10:= startup-notification? ( x11-libs/startup-notification:= ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig dri? ( >=x11-libs/libdrm-2.4 )
+DESCRIPTION=Window manager for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=dri startup-notification +xcomposite
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:=[gtk2(+)] >=xfce-base/xfconf-4.10:= startup-notification? ( x11-libs/startup-notification:= ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.12/xfwm4-4.12.5.tar.bz2
+_md5_=c323c4927d204b8a66d7f0a1cb0f59b7
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 9cd775bc1625..9d808a4a04fd 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/multiload-nandhp-0.3-r1 b/metadata/md5-cache/xfce-extra/multiload-nandhp-0.3-r1
deleted file mode 100644
index 1699b6a48679..000000000000
--- a/metadata/md5-cache/xfce-extra/multiload-nandhp-0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.14:2= x11-libs/cairo:= >=gnome-base/libgtop-2.11.92:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A port of the GNOME multiload applet for the Xfce panel
-EAPI=6
-HOMEPAGE=https://github.com/nandhp/multiload-nandhp
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.14:2= x11-libs/cairo:= >=gnome-base/libgtop-2.11.92:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
-SLOT=0
-SRC_URI=https://github.com/nandhp/multiload-nandhp/archive/version-0-3.tar.gz -> multiload-nandhp-0.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1a5b4197fde9dfe881a010252b0e039f
diff --git a/metadata/md5-cache/xfce-extra/multiload-nandhp-0.3-r2 b/metadata/md5-cache/xfce-extra/multiload-nandhp-0.3-r2
new file mode 100644
index 000000000000..dfdd1bc559cb
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/multiload-nandhp-0.3-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=x11-libs/gtk+-2.14:2= x11-libs/cairo:= >=gnome-base/libgtop-2.11.92:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)] dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A port of the GNOME multiload applet for the Xfce panel
+EAPI=6
+HOMEPAGE=https://github.com/nandhp/multiload-nandhp
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-2.14:2= x11-libs/cairo:= >=gnome-base/libgtop-2.11.92:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)]
+SLOT=0
+SRC_URI=https://github.com/nandhp/multiload-nandhp/archive/version-0-3.tar.gz -> multiload-nandhp-0.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=5d811f09444faab347ea9fedf3113148
diff --git a/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1 b/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1
deleted file mode 100644
index e2c8a2b83da5..000000000000
--- a/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.30 virtual/libgudev:= >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Daemon that enforces volume-related policies
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-volman
-IUSE=libnotify
-KEYWORDS=alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.30 virtual/libgudev:= >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/udev >=xfce-base/thunar-1.6[udisks]
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/thunar-volman/0.8/thunar-volman-0.8.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44b53deef0ea3413710097b718825285
diff --git a/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r2 b/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r2
new file mode 100644
index 000000000000..84e80ed7f1f1
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=dev-libs/glib-2.30 virtual/libgudev:= >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10[gtk2(+)] >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Daemon that enforces volume-related policies
+EAPI=6
+HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-volman
+IUSE=libnotify
+KEYWORDS=alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.30 virtual/libgudev:= >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10[gtk2(+)] >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/udev >=xfce-base/thunar-1.6[udisks]
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/thunar-volman/0.8/thunar-volman-0.8.1.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3505143eb8d6a4df1cb3c99907db4dd2
diff --git a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.1 b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.1
index f65f568c9d81..b087cf9b7069 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=media-libs/alsa-lib xfce-base/xfce4-panel x11-libs/gtk+:2 || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-util/intltool
+DEPEND=media-libs/alsa-lib xfce-base/xfce4-panel[gtk2(+)] x11-libs/gtk+:2 || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-util/intltool
 DESCRIPTION=Simple ALSA volume control for xfce4-panel
 EAPI=6
 HOMEPAGE=https://github.com/equeim/xfce4-alsa-plugin
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3
-RDEPEND=media-libs/alsa-lib xfce-base/xfce4-panel x11-libs/gtk+:2
+RDEPEND=media-libs/alsa-lib xfce-base/xfce4-panel[gtk2(+)] x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://github.com/equeim/xfce4-alsa-plugin/archive/0.1.1.tar.gz -> xfce4-alsa-plugin-0.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=a71ba4d4448b278c88997f139dda203a
+_md5_=df9cf8fd622fb54334f765907131809d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.0 b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.0
index 574fa9dc3288..cc797a8acdba 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib >=xfce-base/xfce4-panel-4.13 x11-libs/gtk+:3[introspection]
 SLOT=0
 SRC_URI=https://github.com/equeim/xfce4-alsa-plugin/archive/0.2.0.tar.gz -> xfce4-alsa-plugin-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b2d59237f509ea4ead8fb3be91bdae1
diff --git a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.1 b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.1
index 37e7da146d09..f871eb556cec 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/alsa-lib >=xfce-base/xfce4-panel-4.13 x11-libs/gtk+:3[introspection]
 SLOT=0
 SRC_URI=https://github.com/equeim/xfce4-alsa-plugin/archive/0.2.1.tar.gz -> xfce4-alsa-plugin-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7b2d59237f509ea4ead8fb3be91bdae1
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5-r1 b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5-r1
deleted file mode 100644
index b36a999408e6..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=x11-libs/gtk+-2.12:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A system load plug-in for the Xfce panel
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 GPL-2
-RDEPEND=>=x11-libs/gtk+-2.12:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfce4-panel-4.8
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-1.0.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91e34bce291909fcdcde5f496228b99e
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5-r2 b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5-r2
new file mode 100644
index 000000000000..a7e7ff755c2b
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.0.5-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=x11-libs/gtk+-2.12:2 >=xfce-base/libxfce4ui-4.8[gtk2(+)] >=xfce-base/xfce4-panel-4.8[gtk2(+)] dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=A system load plug-in for the Xfce panel
+EAPI=6
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2 GPL-2
+RDEPEND=>=x11-libs/gtk+-2.12:2 >=xfce-base/libxfce4ui-4.8[gtk2(+)] >=xfce-base/xfce4-panel-4.8[gtk2(+)]
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/xfce4-cpugraph-plugin-1.0.5.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=446696bf9b6b116709f2bf6128d24ad3
diff --git a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0-r1 b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0-r1
deleted file mode 100644
index 5852bb836e7d..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A plug-in for embedding arbitrary application windows into the Xfce panel
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-embed-plugin/1.6/xfce4-embed-plugin-1.6.0.tar.bz2
-_md5_=222c784d10d8a363afe2dba9accc8f73
diff --git a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0-r2 b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0-r2
new file mode 100644
index 000000000000..95e6b214fbcb
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-1.6.0-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)] dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=A plug-in for embedding arbitrary application windows into the Xfce panel
+EAPI=6
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)]
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-embed-plugin/1.6/xfce4-embed-plugin-1.6.0.tar.bz2
+_md5_=166426fbc89077424591e7a28d0c39f9
diff --git a/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8.1 b/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8.1
index c9509b6b5ff0..6d57d178f319 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.8.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=postinst postrm
-DEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)] dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Panel plug-in that displays information about earthquakes at regular intervals
 EAPI=6
 HOMEPAGE=http://www.e-quake.org/
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
+RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:2= x11-libs/libX11:= >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)]
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-equake-plugin/1.3/xfce4-equake-plugin-1.3.8.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a9562d2be7c4598ed98ec5d935d8454
+_md5_=11256f196b14b2b50ccdeb6698257243
diff --git a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5-r1 b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5-r1
deleted file mode 100644
index c88b9aa45813..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A panel plug-in which adds classic eyes to your every step
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-eyes-plugin/4.4/xfce4-eyes-plugin-4.4.5.tar.bz2
-_md5_=cec27d2deb07f953c03a917d95ef5673
diff --git a/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5-r2 b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5-r2
new file mode 100644
index 000000000000..eae5f56f252c
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-eyes-plugin-4.4.5-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)] dev-util/intltool virtual/pkgconfig
+DESCRIPTION=A panel plug-in which adds classic eyes to your every step
+EAPI=6
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)]
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-eyes-plugin/4.4/xfce4-eyes-plugin-4.4.5.tar.bz2
+_md5_=0dab1b8b04554b3370f272a71f59ae69
diff --git a/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9-r1 b/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9-r1
deleted file mode 100644
index 5bbd2bb3ffb5..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm pretend setup
-DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A plugin to indicate the status of the IBM Hard Drive Active Protection System
-EAPI=6
-HOMEPAGE=http://michael.orlitzky.com/code/xfce4-hdaps.php
-IUSE=kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=app-laptop/hdapsd-20090101 >=app-laptop/tp_smapi-0.39
-SLOT=0
-SRC_URI=http://michael.orlitzky.com/code/releases/xfce4-hdaps-0.0.9.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e2e45ebb7eb1bbc08d39cfc2dc19a0b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9-r2 b/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9-r2
new file mode 100644
index 000000000000..8e11ee547de6
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-hdaps-0.0.9-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm pretend setup
+DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8[gtk2(+)] >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8[gtk2(+)] dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=A plugin to indicate the status of the IBM Hard Drive Active Protection System
+EAPI=6
+HOMEPAGE=http://michael.orlitzky.com/code/xfce4-hdaps.php
+IUSE=kernel_linux
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8[gtk2(+)] >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8[gtk2(+)] >=app-laptop/hdapsd-20090101 >=app-laptop/tp_smapi-0.39
+SLOT=0
+SRC_URI=http://michael.orlitzky.com/code/releases/xfce4-hdaps-0.0.9.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0acb3e3bbf6e72f411e027a3bf8b7aec
diff --git a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r1 b/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r1
deleted file mode 100644
index d79d3ed71af4..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=x11-libs/gtk+-2.20:2 dev-util/intltool virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=A panel plug-in to show state of Caps, Num and Scroll Lock keys
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-kbdleds-plugin
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 >=x11-libs/gtk+-2.20:2
-SLOT=0
-SRC_URI=http://compas.com.ua/oco/file/xfce4-kbdleds-plugin-0.0.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=00ecf79e3e6169d7345dc8518b4c1487
diff --git a/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r2 b/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r2
new file mode 100644
index 000000000000..e4e950e4f2a7
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-kbdleds-plugin-0.0.6-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=xfce-base/libxfce4ui-4.8[gtk2(+)] >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8[gtk2(+)] >=x11-libs/gtk+-2.20:2 dev-util/intltool virtual/pkgconfig sys-devel/gettext
+DESCRIPTION=A panel plug-in to show state of Caps, Num and Scroll Lock keys
+EAPI=6
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-kbdleds-plugin
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=xfce-base/libxfce4ui-4.8[gtk2(+)] >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8[gtk2(+)] >=x11-libs/gtk+-2.20:2
+SLOT=0
+SRC_URI=http://compas.com.ua/oco/file/xfce4-kbdleds-plugin-0.0.6.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d650c84711f5d84f58a6b30ac33bd45b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r2 b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r2
deleted file mode 100644
index 843531e8cbec..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2:= >=x11-libs/gtk+-2.18:2= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10 ssl? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=An mail notification panel plug-in for the Xfce desktop environment
-EAPI=6
-HOMEPAGE=http://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/
-IUSE=ipv6 ssl
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2:= >=x11-libs/gtk+-2.18:2= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10 ssl? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/1.2/xfce4-mailwatch-plugin-1.2.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=320c7b8ab78acf8af4e5b8876ca7a670
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r3 b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r3
new file mode 100644
index 000000000000..37a69c14572f
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-mailwatch-plugin-1.2.0-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2:= >=x11-libs/gtk+-2.18:2= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10[gtk2(+)] ssl? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=An mail notification panel plug-in for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=http://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/
+IUSE=ipv6 ssl
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2:= >=x11-libs/gtk+-2.18:2= x11-libs/libX11:= <xfce-base/exo-0.12.5-r100 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10[gtk2(+)] ssl? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/1.2/xfce4-mailwatch-plugin-1.2.0.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b144eff1856c44de935332725082adf3
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r1 b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r1
deleted file mode 100644
index 466ec85e14c5..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= >=xfce-base/xfconf-4.10:= dev-libs/libunique:1= virtual/pkgconfig dev-util/intltool
-DESCRIPTION=Xfce4 panel sticky notes plugin
-EAPI=7
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:= >=xfce-base/xfconf-4.10:= dev-libs/libunique:1=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.8/xfce4-notes-plugin-1.8.1.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69c41f2722c487b3bf09eaaaf2ae07e0
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r2 b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r2
new file mode 100644
index 000000000000..7a86986d8b40
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.8.1-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)] >=xfce-base/xfconf-4.10:= dev-libs/libunique:1= virtual/pkgconfig dev-util/intltool
+DESCRIPTION=Xfce4 panel sticky notes plugin
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.24:2 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.10:=[gtk2(+)] >=xfce-base/xfconf-4.10:= dev-libs/libunique:1=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.8/xfce4-notes-plugin-1.8.1.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=397ac5016d00fd825ce88bde6c9f3924
diff --git a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.7.0-r1 b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.7.0-r1
deleted file mode 100644
index 3e8fea2ec3dc..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.7.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.20:2 x11-libs/libX11:= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:= >=xfce-base/xfconf-4.8:= libnotify? ( >=x11-libs/libnotify-0.7:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=A panel plug-in to provide quick access to files, folders and removable media
-EAPI=7
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin
-IUSE=libnotify
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.20:2 x11-libs/libX11:= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:= >=xfce-base/xfconf-4.8:= libnotify? ( >=x11-libs/libnotify-0.7:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.7/xfce4-places-plugin-1.7.0.tar.bz2
-_md5_=b1d1462df8e2793015d782fc9121375a
diff --git a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.7.0-r2 b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.7.0-r2
new file mode 100644
index 000000000000..6182aec6d243
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.7.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.20:2 x11-libs/libX11:= >=xfce-base/exo-0.6:=[gtk2(+)] >=xfce-base/libxfce4ui-4.8:=[gtk2(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=[gtk2(+)] >=xfce-base/xfconf-4.8:= libnotify? ( >=x11-libs/libnotify-0.7:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=A panel plug-in to provide quick access to files, folders and removable media
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin
+IUSE=libnotify
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-2.20:2 x11-libs/libX11:= >=xfce-base/exo-0.6:=[gtk2(+)] >=xfce-base/libxfce4ui-4.8:=[gtk2(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=[gtk2(+)] >=xfce-base/xfconf-4.8:= libnotify? ( >=x11-libs/libnotify-0.7:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.7/xfce4-places-plugin-1.7.0.tar.bz2
+_md5_=ced929d473b4920dec7f6125abac2093
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.6 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.6
new file mode 100644
index 000000000000..3b52eb436a1e
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.16:= >=x11-libs/gtk+-3.20:3= dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= dev-util/glib-utils dev-util/intltool sys-apps/help2man virtual/pkgconfig
+DESCRIPTION=Xfce4 screenshooter application and panel plugin
+EAPI=6
+HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-screenshooter
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.16:= >=net-libs/libsoup-2.26:= >=x11-libs/gdk-pixbuf-2.16:= >=x11-libs/gtk+-3.20:3= dev-libs/libxml2:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXfixes:= >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.6.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6398c531936cc6a2c1852e2cfc33259e
diff --git a/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2-r1 b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2-r1
index cf3548a44eb2..d9575ce74dbd 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst postrm
-DEPEND=x11-libs/gtk+:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:= dev-util/intltool virtual/pkgconfig
+DEPEND=x11-libs/gtk+:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.8:=[gtk2(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=[gtk2(+)] dev-util/intltool virtual/pkgconfig
 DESCRIPTION=A panel plug-in to take periodical breaks from the computer
 EAPI=7
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
-RDEPEND=x11-libs/gtk+:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=
+RDEPEND=x11-libs/gtk+:2 x11-libs/libX11:= >=xfce-base/libxfce4ui-4.8:=[gtk2(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=[gtk2(+)]
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-1.0.2.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc8f4d2af0074ab2320ceeee45fa0e60
+_md5_=5e03c0c6f377563724bfec2e9fd5b0aa
diff --git a/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.3 b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.3
deleted file mode 100644
index b0dd398c45fd..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=x11-libs/gtk+:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:= dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A panel plug-in to take periodical breaks from the computer
-EAPI=7
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8:= >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-1.0.3.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=77d4d1a243f27944cc61d74feb971f4b
diff --git a/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.3-r1 b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.3-r1
new file mode 100644
index 000000000000..8c1d5befd64d
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=x11-libs/gtk+:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8:=[gtk2(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=[gtk2(+)] dev-util/intltool virtual/pkgconfig
+DESCRIPTION=A panel plug-in to take periodical breaks from the computer
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8:=[gtk2(+)] >=xfce-base/libxfce4util-4.8:= >=xfce-base/xfce4-panel-4.8:=[gtk2(+)]
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/1.0/xfce4-time-out-plugin-1.0.3.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6742ca400d95d9239539b0cbe9fbcecb
diff --git a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6 b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6
deleted file mode 100644
index b43c597413d4..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:= || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/intltool dev-util/xfce4-dev-tools media-gfx/imagemagick[png] sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Xfce plugin puts the maximized window title and windows buttons on the panel
-EAPI=7
-HOMEPAGE=https://github.com/cedl38/xfce4-windowck-plugin
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:=
-SLOT=0
-SRC_URI=https://github.com/cedl38/xfce4-windowck-plugin/archive/v0.4.6.tar.gz -> xfce4-windowck-plugin-0.4.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99376c6ed6e0545b3a7a119cb08b7321
diff --git a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6-r1 b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6-r1
new file mode 100644
index 000000000000..c5085bd6c552
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:=[gtk2(+)] >=xfce-base/xfconf-4.10:= || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/intltool dev-util/xfce4-dev-tools media-gfx/imagemagick[png] sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Xfce plugin puts the maximized window title and windows buttons on the panel
+EAPI=7
+HOMEPAGE=https://github.com/cedl38/xfce4-windowck-plugin
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:=[gtk2(+)] >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:=[gtk2(+)] >=xfce-base/xfconf-4.10:=
+SLOT=0
+SRC_URI=https://github.com/cedl38/xfce4-windowck-plugin/archive/v0.4.6.tar.gz -> xfce4-windowck-plugin-0.4.6.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eabd749d4d7a4efbc9f0af77ba742a5d
diff --git a/metadata/news/2019-08-30-php-5_6-deprecation/2019-08-30-php-5_6-deprecation.en.txt b/metadata/news/2019-08-30-php-5_6-deprecation/2019-08-30-php-5_6-deprecation.en.txt
new file mode 100644
index 000000000000..5e7218bfcfda
--- /dev/null
+++ b/metadata/news/2019-08-30-php-5_6-deprecation/2019-08-30-php-5_6-deprecation.en.txt
@@ -0,0 +1,69 @@
+Title: Deprecation and removal of PHP 5.6
+Author: Brian Evans <grknight@gentoo.org>
+Posted: 2019-08-30
+Revision: 2
+News-Item-Format: 2.0
+Display-If-Installed: dev-lang/php:5.6
+Display-If-Installed: dev-php/haru
+Display-If-Installed: dev-php/magickwand
+Display-If-Installed: dev-php/pecl-bbcode
+Display-If-Installed: dev-php/pecl-cairo
+Display-If-Installed: dev-php/pecl-dbx
+Display-If-Installed: dev-php/pecl-htscanner
+Display-If-Installed: dev-php/pecl-libevent
+Display-If-Installed: dev-php/pecl-memcache
+Display-If-Installed: dev-php/pecl-mongo
+Display-If-Installed: dev-php/pecl-mysqlnd_ms
+Display-If-Installed: dev-php/pecl-mysqlnd_qc
+Display-If-Installed: dev-php/pecl-sphinx
+Display-If-Installed: dev-php/pecl-spl_types
+Display-If-Installed: dev-php/pecl-svn
+Display-If-Installed: dev-php/pecl-xrange
+Display-If-Installed: dev-php/suhosin
+Display-If-Installed: dev-php/xcache
+Display-If-Installed: dev-php/xhprof
+Display-If-Installed: dev-php/pecl-apcu:0
+Display-If-Installed: dev-php/pecl-dbase:0
+Display-If-Installed: dev-php/pecl-http:2
+Display-If-Installed: dev-php/pecl-mailparse:0
+Display-If-Installed: dev-php/pecl-memcached:0
+Display-If-Installed: dev-php/pecl-oauth:0
+Display-If-Installed: dev-php/pecl-propro:0
+Display-If-Installed: dev-php/pecl-ps:0
+Display-If-Installed: dev-php/pecl-raphf:0
+Display-If-Installed: dev-php/pecl-rrd:0
+Display-If-Installed: dev-php/pecl-ssh2:0
+Display-If-Installed: dev-php/pecl-stomp:0
+Display-If-Installed: dev-php/pecl-xdiff:0
+Display-If-Installed: dev-php/pecl-yaml:0
+Display-If-Installed: dev-php/twig[extension]
+Display-If-Installed: dev-php/PEAR-MDB2_Driver_mysql
+Display-If-Installed: media-gfx/exact-image[php]
+Display-If-Installed: sci-geosciences/mapserver[php,php_targets_php5-6]
+Display-If-Installed: www-apps/rutorrent:3.4-r1
+Display-If-Installed: www-server/nginx-unit[php56]
+
+The Gentoo PHP Team is announcing the deprecation and future removal of
+PHP 5.6. As of October 1, 2019, PHP 5.6 will be masked for removal.
+Since some may consider this a critical package, we have decided on a
+longer than normal 90 day removal period.
+
+Other distributions have already or will have moved to PHP 7.2 by the end of
+the year.  Currently, we are using a backport repository to keep
+security updates in line with the main releases.  However, we feel this
+is the right time to remove this branch as maintenance burden will
+likely only increase.
+
+To that end, the long list of PHP 5 only extensions must accompany its
+removal. Many of which are long ignored by their upstream maintainers
+and have no replacements.  Some packages listed here have PHP 5 only
+slots which are included as reminders to upgrade.
+
+Some packages do have replacements:
+dev-php/pecl-memcache can be replaced by dev-php/pecl-memcached with
+  some small code modifications
+dev-php/pecl-mongo has been superceded by dev-php/pecl-mongodb
+dev-php/pecl-libevent should be replaced by dev-php/pecl-event
+  with code changes
+dev-php/PEAR-MDB2_Driver_mysql should be easily replaced by
+  dev-php/PEAR-MDB2_Driver_mysqli with minor configuration changes
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 457b22776a0f..8177a67622c0 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 12061 BLAKE2B f448db7d0d96e290585ff31a0a53eef16c1eaf1067a762ae38dee6e3aabd907e39615d4506ca817a600c16bc5c05aa26bacbbb4df18dc41ca59fd44b42d445cc SHA512 cbd0f4d5c608e680e0b38d51b1fc83032fe61ae7f08009a95dca0f360997eaa870127096b3cdfa97c14f98aa98b7916911420bb10425f038f9c2f291b8052a2a
-TIMESTAMP 2019-08-18T16:09:02Z
+MANIFEST Manifest.files.gz 12241 BLAKE2B 350d0fa9c9068c79a454f1d29525cdb50bc4ab6c7b0234d7f96c810c6738176a8180e8609bb8d3c1d0c548de68e67c49c6ae5bfde637c852df27ea57ba15fdd0 SHA512 a93acc45a7247b1e99c20aa686e6ab2bf355f9fa51aab26f04010bf33a32d11cd2683454eecad4bf080edf22099ff1057b150ced2f3ed9b9454607aae714890f
+TIMESTAMP 2019-09-06T08:39:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl1ZeB5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl1yGyhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAbHw//Wrvnn3RfvJ0tgaeODKzUsoWwv15STnyWLfq8afbthRlve9B0feKUIr4b
-2cdjhkkSeTzCKeRi2RnW+aGd8xAxdv1gZm9L67vAaJrQSQItEH+zVG7xBsls97U2
-eJPncMOsral1p73elSXdbVEU3hBQLRwHQtUYsnjuTJj496M88WjStltzdOdoY1cF
-mDSKQnStfg5zbZbEv/dK9RDp9kFUIRrKqt0ZTPA1lZl1iW2mDGOTWJ04EBrnZel/
-8gk3BAFZqBsw33IomBA7qeBg4pIH8QEcUhmHeRJZqvFFuc09CgCVFcAkEyhMfBDf
-fvn/Ui+RUwM0R/hDhbuc/UTJ6sZhEgnKq48iCFOxxg2Q6HTkmR+n502rDmXItNaz
-nACqGbSQ0LL2N5TW2px7/cPNMnT4C9WAfR9IzH1EOYX5FofObxvWAaJk0xEoTZ/h
-k85kflry6WyYp+di2/Dij5jJU/qwNjajCqeydXCyWS5Wv97WwHlzk2JgNJuigpAr
-G4DTd1gj28LNzLUURsdksLpur5eUNBshUeqb2RdkXsK72YEv7pNsNDXElfGt1ozq
-P/Men0jpbfOmvFDZrzhvNeCcHQpO5BR77+U94RIITZA6JMNPvUJoa7n4+xou58UZ
-pFukDKuW/NeEzTK48ILaqPgCP59yYxiKpFBHOWPQ5jAP6YwKiUg=
-=qyHW
+klDjpw//cgdiEklmP+PTD1UIv1Jy0x1ZXDRQqEV4SRixHe4l8Sp6QgYn39+YcnvD
+TTTvb5jhFXd6V60LqjMT2ZbvSov+US0RvsPxudcIEdGQ0/N1vGOTUKrgsSN3wo2e
+MIlCp9j/cHSuJKF5tdumuFH9sKvZX1mepn2l/cU6EiFFm75QGKBAnPoBFxTLrPnK
+cFSMj5AmOlTB8Z62SMBDxarERoNIyI/ccljkY8cHh1Cbuf832/cLXe1WHRdUG4uv
+VrnZReMNiZ+jfoKZFzjoi7ZRIMADkheecpdl68fEu4N8O/Nurii8OcYDx17KWm8m
+WR3aT03WSDUFRA+nWrNdu19PDfCkOGqenk7FXWuI4N+9/f6E7URYMKVlyMEyIFfe
+N06cfknMrTVzAxofSXZbIHl7vdgOK9CFE49Ceq23lgELhCuJm3HryhYXemW9/2s9
+UVMLDRZkxkhM54U0KSPW2H/eqBZkVILWk9DhXDur2MJW/0p2x9ToRd+/cbKRgQgJ
+mrh4ueXW7plyItT0lR140CqJx9ocreSXJ5RJzzpzaKeAZbf/C+hslNHVd2tvZxUg
+QWVHV+ETV2HzYkuNa2Ot35V68bTmICnMjm6BnagdC7Qx+XrvinFm9MDTN2HnhV3E
+owGKXbrC07n5vst1yL8T/XtkNMa/wOaRqHb3T2SXYUUXxi5tcY8=
+=7DbJ
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 93b99ed0b8ae..4fa31c502ef5 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7a755efccb78..2f6a7762bf94 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Aug 2019 16:08:59 +0000
+Fri, 06 Sep 2019 08:39:01 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index ad96d2d30b63..795c2fd480ce 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-9bc8a58a49587b2dc7d4665a93cfd70f9d83faec 1563794848 2019-07-22T11:27:28+00:00
+2c5c3a82795da5d340bd4ccd3e2c9b14ab25b82d 1567197758 2019-08-30T20:42:38+00:00
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 2c653340096e..0a5441eeb515 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -60,7 +60,7 @@
   </project>
   <project>
     <email>arm@gentoo.org</email>
-    <name>Gentoo Linux ARM Development</name>
+    <name>ARM Development</name>
     <url>https://wiki.gentoo.org/wiki/Project:ARM</url>
     <description>The ARM Development Project is devoted to keeping Gentoo in good shape on the ARM architecture.</description>
     <member>
@@ -121,7 +121,7 @@
   </project>
   <project>
     <email>arm64@gentoo.org</email>
-    <name>Gentoo Linux ARM64 development</name>
+    <name>ARM64 development</name>
     <url>https://wiki.gentoo.org/wiki/Project:ARM64</url>
     <description>The ARM64 project is devoted to getting and keeping Gentoo in good shape on the ARM AArch64 architecture.</description>
     <member>
@@ -183,7 +183,7 @@
   </project>
   <project>
     <email>alpha@gentoo.org</email>
-    <name>Gentoo Linux Alpha Development</name>
+    <name>Alpha Development</name>
     <url>https://wiki.gentoo.org/wiki/Project:Alpha</url>
     <description>The Gentoo/Alpha Arch Team is devoted to keeping Gentoo in good shape on the Alpha architecture.</description>
     <member>
@@ -215,6 +215,10 @@
       <email>lordvan@gentoo.org</email>
       <name>Thomas Raschbacher</name>
     </member>
+    <member>
+      <email>mjo@gentoo.org</email>
+      <name>Michael Orlitzky</name>
+    </member>
   </project>
   <project>
     <email>apache-bugs@gentoo.org</email>
@@ -312,7 +316,7 @@
   </project>
   <project>
     <email>base-system@gentoo.org</email>
-    <name>Gentoo Base System</name>
+    <name>Base System</name>
     <url>https://wiki.gentoo.org/wiki/Project:Base</url>
     <description>The Base System Project provides an umbrella project for keeping the system tools, libraries, compilers and layout consistent for all the various architectures under Gentoo Linux.</description>
     <subproject ref="amd64@gentoo.org"/>
@@ -464,7 +468,7 @@
   </project>
   <project>
     <email>catalyst@gentoo.org</email>
-    <name>Gentoo Catalyst Project</name>
+    <name>Catalyst Project</name>
     <url>https://wiki.gentoo.org/wiki/Project:Catalyst</url>
     <description>The Gentoo Catalyst Project develops and supports the Catalyst release building tool. Catalyst has been designed to be easy to use, customize, and maintain. It is also used in other Gentoo projects, such as GNAP.</description>
     <member>
@@ -621,7 +625,7 @@
   </project>
   <project>
     <email>comrel@gentoo.org</email>
-    <name>Gentoo Community Relations</name>
+    <name>Community Relations</name>
     <url>https://wiki.gentoo.org/wiki/Project:ComRel</url>
     <description>Community Relations handles many personnel-related tasks, solving conflicts and also ensuring that the Gentoo Code of Conduct and proper and professional behavior is followed across Gentoo's borders.</description>
     <subproject ref="undertakers@gentoo.org"/>
@@ -1431,7 +1435,7 @@
   </project>
   <project>
     <email>hppa@gentoo.org</email>
-    <name>Gentoo Linux HPPA Development</name>
+    <name>HPPA Development</name>
     <url>https://wiki.gentoo.org/wiki/Project:HPPA</url>
     <description>The Gentoo HPPA project is designed to bring the Gentoo GNU/Linux operating system to the HP Precision Architecture platforms. We aim to provide a usable computing environment for your various HPPA related endeavors.</description>
     <member>
@@ -1495,11 +1499,6 @@
       <role>Developer</role>
     </member>
     <member>
-      <email>quantumsummers@gentoo.org</email>
-      <name>Matt Summers</name>
-      <role>Documentation, Hardened sources</role>
-    </member>
-    <member>
       <email>williamh@gentoo.org</email>
       <name>William Hubbs</name>
       <role>PaX markings</role>
@@ -1566,7 +1565,7 @@
   </project>
   <project>
     <email>ia64@gentoo.org</email>
-    <name>Gentoo Linux IA-64 Development</name>
+    <name>IA-64 Development</name>
     <url>https://wiki.gentoo.org/wiki/Project:IA-64</url>
     <description>The IA-64 Development Project is devoted to keeping Gentoo in good shape on the IA-64 architecture.</description>
     <member>
@@ -1989,13 +1988,17 @@
   </project>
   <project>
     <email>livecd@gentoo.org</email>
-    <name>Gentoo LiveCD Project</name>
+    <name>LiveCD Project</name>
     <url>https://wiki.gentoo.org/wiki/Project:LiveCD</url>
     <description>Maintains packages used in the creation of LiveCDs.</description>
     <member>
       <email>jer@gentoo.org</email>
       <name>Jeroen Roovers</name>
     </member>
+    <member>
+      <email>mattst88@gentoo.org</email>
+      <name>Matt Turner</name>
+    </member>
   </project>
   <project>
     <email>m68k@gentoo.org</email>
@@ -2023,7 +2026,7 @@
   </project>
   <project>
     <email>mips@gentoo.org</email>
-    <name>Gentoo Linux MIPS Development</name>
+    <name>MIPS Development</name>
     <url>https://wiki.gentoo.org/wiki/Project:MIPS</url>
     <description>Gentoo/MIPS is a port of the Gentoo GNU/Linux and the Gentoo Portage package management system to mips-based platforms.</description>
     <subproject ref="gentoo-yeeloong@gentoo.org"/>
@@ -2613,7 +2616,7 @@
   </project>
   <project>
     <email>ppc@gentoo.org</email>
-    <name>Gentoo Linux PowerPC Development</name>
+    <name>PowerPC Development</name>
     <url>https://wiki.gentoo.org/wiki/Project:PowerPC</url>
     <description>The PowerPC Development Project is devoted to keeping Gentoo in good shape on both 32-bit and 64-bit PowerPC architecture.</description>
     <member>
@@ -2982,6 +2985,11 @@
       <role>Developer</role>
     </member>
     <member>
+      <email>dilfridge@gentoo.org</email>
+      <name>Andreas K. Hüttel</name>
+      <role>Developer</role>
+    </member>
+    <member>
       <email>mgorny@gentoo.org</email>
       <name>Michał Górny</name>
       <role>Deputy Lead</role>
@@ -3002,11 +3010,6 @@
       <role>Developer</role>
     </member>
     <member>
-      <email>williamh@gentoo.org</email>
-      <name>William Hubbs</name>
-      <role>Developer</role>
-    </member>
-    <member>
       <email>zlogene@gentoo.org</email>
       <name>Mikle Kolyada</name>
       <role>Developer</role>
@@ -3107,7 +3110,7 @@
   </project>
   <project>
     <email>releng@gentoo.org</email>
-    <name>Gentoo Release Engineering</name>
+    <name>Release Engineering</name>
     <url>https://wiki.gentoo.org/wiki/Project:RelEng</url>
     <description>Release Engineering ("RelEng") is the official Gentoo project focused on coordinating and improving the creation of official media releases of Gentoo Linux and the associated tools used by the installation process.</description>
     <subproject ref="catalyst@gentoo.org"/>
@@ -3243,7 +3246,7 @@
   </project>
   <project>
     <email>s390@gentoo.org</email>
-    <name>Gentoo Linux s390 Development</name>
+    <name>s390 Development</name>
     <url>https://wiki.gentoo.org/wiki/Project:S390</url>
     <description>The s390 Development Project is devoted to keeping Gentoo in good shape on the s390 architecture.</description>
     <member>
@@ -3284,7 +3287,7 @@
   </project>
   <project>
     <email>sparc@gentoo.org</email>
-    <name>Gentoo Linux SPARC Development</name>
+    <name>SPARC Development</name>
     <url>https://wiki.gentoo.org/wiki/Project:SPARC</url>
     <description>Gentoo/SPARC is a Gentoo project designed to bring the Gentoo GNU/Linux operating system to the SPARC and UltraSPARC platforms. Gentoo/SPARC aims to provide a usable server and desktop environment for your various SPARC related endeavors.</description>
     <member>
@@ -3664,7 +3667,7 @@
   </project>
   <project>
     <email>toolchain@gentoo.org</email>
-    <name>Gentoo Toolchain Project</name>
+    <name>Toolchain Project</name>
     <url>https://wiki.gentoo.org/wiki/Project:Toolchain</url>
     <description>Manages gcc/binutils/glibc and other toolchain-related packages</description>
     <subproject ref="crossdev@gentoo.org"/>
@@ -3898,10 +3901,6 @@
     <url>https://wiki.gentoo.org/wiki/Project:Website</url>
     <description>The website project maintains the Gentoo website and develops new sites for the community.</description>
     <member>
-      <email>chrisadr@gentoo.org</email>
-      <name>Christopher Díaz Riveros</name>
-    </member>
-    <member>
       <email>dilfridge@gentoo.org</email>
       <name>Andreas K. Hüttel</name>
     </member>
@@ -3980,7 +3979,7 @@
   </project>
   <project>
     <email>x11@gentoo.org</email>
-    <name>Gentoo X11 Project</name>
+    <name>X11 Project</name>
     <url>https://wiki.gentoo.org/wiki/Project:X11</url>
     <description>The X11 project manages the X implementations and related packages in Portage.</description>
     <member>
diff --git a/metadata/timestamp b/metadata/timestamp
index 159ec1eb27fe..d0cd7a94b788 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Aug 18 16:08:59 UTC 2019
+Fri Sep  6 08:39:00 UTC 2019
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9e71887fba8d..f5f8d6754432 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Aug 2019 16:15:01 +0000
+Fri, 06 Sep 2019 08:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b5ddd54be6d6..bb7fb197d399 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-93b10ca8d4183db22c121f186549c9f84d702ef2 1566142742 2019-08-18T15:39:02+00:00
+6eb1fb6129b4297b07ecb003e36f1d84b9c6486f 1567754776 2019-09-06T07:26:16+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 940ab875c917..bb0609d6ba90 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1566144301 Sun 18 Aug 2019 04:05:01 PM UTC
+1567758901 Fri 06 Sep 2019 08:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7a755efccb78..2f6a7762bf94 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Aug 2019 16:08:59 +0000
+Fri, 06 Sep 2019 08:39:01 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 31ed472aedcf..08d3c0605a53 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index 65bd37cfb510..3355fd01cf4d 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -2,10 +2,12 @@ AUX argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch 521 BLAKE2B 729ad
 AUX argus-clients-3.0.7.21-curses-readline.patch 611 BLAKE2B 046d31d75bef26da50b58fd646192437c25cff3a13752f5c94a3b5fab6f3f5ef265c2a51c9768e90b9bf8bbb197d363ab132f27f967b925ce19a98f66ed2020d SHA512 17910c0e2e2d3efefd1efe713bea5b394087415d103aa18254c7f8e8e4f4aae7d8670db8ab9d6045c145bfc0d5e804c653eca6e1c169813075c1af37ff01a0b2
 AUX argus-clients-3.0.8.2-ar.patch 767 BLAKE2B b13abee07d0d11319890e36d0dd3f446996eb0fe5ddda70d834873349c5b9bfdaa2029526ce2146efb88887b454c6019462908786f47b372e1d2de4f52a8dadf SHA512 793dec8cf09bb730b327a6af35e89b029922329d5e031767b840b1c974dd0ed3482f5590ee6b3f76480d0518139281474c849797df70ddd3013ac06822d0575a
 AUX argus-clients-3.0.8.2-curses-readline.patch 777 BLAKE2B 374420361e1cca506e51fa977ad1da0c37fb3596e181a6880e09b9392fc7926f98fe52f78c7d7b09cb237e64253ce78deb46fb545fd349431fb62b8bafc31316 SHA512 f6fbcb3a4aed87214dc1d08c9a7b5b807cea88a1789e7487f0b0b30896e6d1c7a3cf21b04d7d8afbcfb5f205edce5b5a50a8d67cd3556d9badbeecc103f98770
+AUX argus-clients-3.0.8.2-my_bool.patch 1276 BLAKE2B e6379b42be86bc5a55af64519caf5e5fa9a3b9256ae56ab2a972ae438cd60e16260cab66f47150cd9f63664543625e08a3f45849019afd1b32f958e02a2fffa3 SHA512 b5a71da8037889ee84403f13cbe2bb55e67caa1486fba7f6259a4ad417939264f6d6d4bc14c9b15f45ef697b556717d9dd0d056a7f2615aa5f31705b912563e5
 AUX argus-clients-3.0.8.2-rpc.patch 967 BLAKE2B b59450ad0a21eeb1e37d84f518e0e5417ab82f9e6afe5bca078e3dc14f8b52a0a07abc42040569d4d665145794187cf8f554310acd4f98cfab17f0046f381ad6 SHA512 3292d71b78be693901cd8fca3712d5f866185968e30747278d793b9c280091ecbd1f6e61390b48338b07dfa760efda96e1cbf15d279137a4f85991d69b7526cc
 DIST argus-clients-3.0.8.2.tar.gz 2776072 BLAKE2B 429a12d63f38ce1c5dae343be28543f3c8b6dd746661a893a0108db100762d60dec619cdccfff525b84c0843f0bb61c7e5d96df561a369e6df0d1e6a821d938a SHA512 20aac16bd6474b8f98c8fc86b21ad0b43aca62264c6de2f7f26eea876a90f7276cdaf2241a510a19ae445f40f5d0d05ec6a5869980b6889e6eb5937dbff0f855
 DIST argus-clients-3.0.8.tar.gz 2627515 BLAKE2B e7753ce1a65f24639c0c36d694033b038abb7cf835b89a1020edf72829f9196cad2a1be5958a28a51884c169ff7b4e295381501e61cf1e1eb1ee1557fccb6d8f SHA512 79022b3c3e472ebc526b27c20c25ae97abdb9a363a91ebbe3baf405f2aba9bdd80fbc0250b444d3d7ab4488e3c1325389a4719e92d9aded7598a91c3309369c2
-EBUILD argus-clients-3.0.8.2-r2.ebuild 1517 BLAKE2B 47512e061e1fea4b5b1fd1d2dc0e980b01ef98847cb4efdf944f1999721e17caa8d65a01018f84720e4b457f3cd7bb0447b887a8c80aa072bac4ff561f410535 SHA512 a3c0fc9f20f14860a98cca43a3f4edaf2be91e51876c8fd923434902856baedcc6fe07f46a22cd99864289d40072bd24e53007b98cc737e4110f4a28a3f4dc48
-EBUILD argus-clients-3.0.8.2.ebuild 1453 BLAKE2B f18f8d5c4e85d441b72e6490730dd6b6f9e0c04e433caa58b9fe297d2a40ba3f811f113a7739a8b7df67aafd07d254c7561703ff5bd5fad523879502567eade1 SHA512 b5fd648853deb3a81982a462da9e6ac1c8cbcc453fb6144e5afa303a6465f33daf846212e47d781c33b9e5a0737fa8fcc6dcb0edc4ebf4a1f59583606382851b
-EBUILD argus-clients-3.0.8.ebuild 1446 BLAKE2B aeb8501a05352c57c5cf5338ee19f598549d96df3d39da2864da8eefa32d3d59e48b0e8f89de39970524bba1a861a3dbf7b50110c815eecdd54258d1fa1f98cb SHA512 90119ef5268e3afafb73b97d4eab3b55d761609064b1d1f371f908715d49f81992d35d6f86466f312e106b014410b1afe4b6815d5b626a2e0485f74cd968f147
+EBUILD argus-clients-3.0.8.2-r2.ebuild 1519 BLAKE2B fbd75810aa28eeaa2f9e71cdc3eb9576f0f4819cecfed3c39595e374c800870f877ec5cf82d6ba9e792fc0cba2a88cf6e1725ee74d7312a4b43939212972f4d6 SHA512 a5109d04f041dddd80e7b0de7d1fc1539eb3c5fcd10ca2e68592c54d11a7be2132996265aeb38a21fccdfaa8572c876353262c722a75f27f3d840bb4024ddc98
+EBUILD argus-clients-3.0.8.2-r3.ebuild 1562 BLAKE2B cb0d32880096b5c421b690567bdad37ffda750e08f18ace6818a98c5d8608fe3cb6fc69def073dafacd68f0158e10894ff0c9fd92b30d3fde04af59ff62eba24 SHA512 bcf1a4da98180e1b841f14e4ff992a8b9003e38bd2ad5b584a4d46262c7edb68d384fd00bca5e09cde7929dc36dd40ec33c284c42c821fba6f1e9b10738c0afb
+EBUILD argus-clients-3.0.8.2.ebuild 1452 BLAKE2B 52eb69a7b9cd55066c118503866915b361b30f0fa0d6732e4bf31d20e9029b9a5350bdce7413fc768b9a552782b30731de6c20f6a7cec6740177a7e80007c033 SHA512 15f49d72ad76e88745bb3e0fe2966348edc220ea6af06eb65b0e3274f626fbf73931d53f47ac3681874e2d51ad2f5f53958d9bd77f717ed821b0157003bf6ffc
+EBUILD argus-clients-3.0.8.ebuild 1445 BLAKE2B 572a61f3c2b3b86886e984c1ca6ca25945289d7be5f6b8efc240bebb1c070c7399f7c1579317c77f3b92278c9bdfc72f66d6b3e5159b97e370e224149590ea34 SHA512 fb741600733cfe208ea70861b17f34bd238d26d95cd09f233e6febf49793e2e2df816f26fef5f69f44af69d0fdd17ce269666c4bf319c8efceea3e9f55f776a0
 MISC metadata.xml 383 BLAKE2B f19de1514d40bf02fc21d447b5d5eed6cf1917fff41a0462a993b0d7572d5d75ca80c6a2e7a0b1de83e9c167d5b5046e96a11ddc3d99595b79079cc4c76e5a54 SHA512 16728e62acf8d17d105ce0d0c0bd32197a9157544aeee9c9601ffc716ccd70cb126086b732c2814d5c4124f3546bb1fe7efddd27b7f686ae2c1960cbf7f90780
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
index 42799057487b..d87060d87bec 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
@@ -5,8 +5,8 @@ EAPI=6
 inherit autotools toolchain-funcs
 
 DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
+HOMEPAGE="https://www.qosient.com/argus/"
+SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild
new file mode 100644
index 000000000000..637ef50ad05a
--- /dev/null
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Clients for net-analyzer/argus"
+HOMEPAGE="https://www.qosient.com/argus/"
+SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ft geoip mysql sasl tcpd"
+
+ARGUS_CDEPEND="
+	net-analyzer/rrdtool[perl]
+	net-libs/libpcap
+	net-libs/libtirpc:=
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	sys-libs/zlib
+	ft? ( net-analyzer/flow-tools )
+	geoip? ( dev-libs/geoip )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	sasl? ( dev-libs/cyrus-sasl )
+"
+RDEPEND="
+	${ARGUS_CDEPEND}
+"
+DEPEND="
+	${ARGUS_CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch
+	"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
+	"${FILESDIR}"/${PN}-3.0.8.2-ar.patch
+	"${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch
+	"${FILESDIR}"/${PN}-3.0.8.2-my_bool.patch
+	"${FILESDIR}"/${PN}-3.0.8.2-rpc.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR RANLIB
+
+	use debug && touch .debug
+	econf \
+		$(use_with ft libft) \
+		$(use_with geoip GeoIP /usr/) \
+		$(use_with sasl) \
+		$(use_with tcpd wrappers) \
+		$(use_with mysql mysql /usr)
+}
+
+src_compile() {
+	emake \
+		CCOPT="${CFLAGS} ${LDFLAGS}" \
+		RANLIB=$(tc-getRANLIB) \
+		CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
+}
+
+src_install() {
+	dobin bin/ra*
+	dodoc ChangeLog CREDITS README CHANGES
+	doman man/man{1,5}/*
+}
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
index efa07fed3bd7..d16c7f6422a6 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
+HOMEPAGE="https://www.qosient.com/argus/"
+SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
index 7dbfc5a721a2..742c6cbebee7 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
+HOMEPAGE="https://www.qosient.com/argus/"
+SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-my_bool.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-my_bool.patch
new file mode 100644
index 000000000000..99cd6b255ae7
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-my_bool.patch
@@ -0,0 +1,42 @@
+--- a/examples/ramysql/rasql.c
++++ b/examples/ramysql/rasql.c
+@@ -414,7 +414,7 @@
+ void
+ RaMySQLInit ()
+ {
+-   my_bool reconnectbuf = 1, *reconnect = &reconnectbuf;
++   int reconnectbuf = 1, *reconnect = &reconnectbuf;
+    char userbuf[1024], sbuf[1024], db[1024], *dbptr = NULL;
+    char *sptr = NULL, *ptr;
+    MYSQL_RES *mysqlRes;
+--- a/examples/ramysql/rasqlinsert.c
++++ b/examples/ramysql/rasqlinsert.c
+@@ -7026,7 +7026,7 @@
+ void
+ RaMySQLInit ()
+ {
+-   my_bool reconnectbuf = 1, *reconnect = &reconnectbuf;
++   int reconnectbuf = 1, *reconnect = &reconnectbuf;
+    char *sptr = NULL, *ptr;
+    char userbuf[1024], sbuf[1024], db[1024], *dbptr = NULL;
+    MYSQL_RES *mysqlRes;
+--- a/examples/ramysql/rasqltimeindex.c
++++ b/examples/ramysql/rasqltimeindex.c
+@@ -539,7 +539,7 @@
+ void
+ RaMySQLInit ()
+ {
+-   my_bool reconnectbuf = 1, *reconnect = &reconnectbuf;
++   int reconnectbuf = 1, *reconnect = &reconnectbuf;
+    char *sptr = NULL, *ptr;
+    char userbuf[1024], sbuf[1024], db[1024], *dbptr = NULL;
+    MYSQL_RES *mysqlRes;
+@@ -797,7 +797,7 @@
+ void
+ RaMySQLInit ()
+ {
+-   my_bool reconnectbuf = 1, *reconnect = &reconnectbuf;
++   int reconnectbuf = 1, *reconnect = &reconnectbuf;
+    unsigned int RaTableFlags = 0;
+    int retn = 0, x;
+    char *sptr = NULL, *ptr;
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index d61af810bbda..86bbb2c5b682 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -4,5 +4,5 @@ AUX argus-3.0.8.1-disable-tcp-wrappers-automagic.patch 591 BLAKE2B 2a04cb018d385
 AUX argus-3.0.8.2-rpc.patch 1425 BLAKE2B c71d72db164a343114ac39f754cdd7a9d19bf4338ea809966c5de1de5a71d6c339a11021207c1c20f5029052e6ce7cc43298e227574a96369a9fee1c40adc3e2 SHA512 61136d8d736429a4e291f0a92e47bb02ec5706e0e9e8b68db4e5213baebff064427733edd054d163e582ed0288209d008b38b7f1ab77f54b1968f246b8c6db77
 AUX argus.initd 365 BLAKE2B 1b7841cd53679b10444a1da1af0f0226bc84c08e9e5427f964622c03f4a8661997cd2b31db35d804f7373ca89ca4eca006662c6d08d26d6b65d13c209ae92aa0 SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231
 DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313
-EBUILD argus-3.0.8.2-r1.ebuild 2051 BLAKE2B 07a38831af71a6b58a65cb5a04572ea82fdd3814d1227b06ecf5fdfbb2c8acd70832b506dc21542680f14186d0c1af0acc80c0304fd236f03c52d888fda3d916 SHA512 5c7cd31160f04f545109716ff050b8ca235d17bf2a4c92b1e75ee1af1e5fddfc2c318f5f3d6e6256689f326f0c4b878a7373be904eeedc7819c3ad9e2e060f01
+EBUILD argus-3.0.8.2-r1.ebuild 2049 BLAKE2B 1168c4cc70b9d4abd9c255b19f930293f2bd025a670dc2aefbdc0ea6a8cefaff1744dc3f08fe651fc5230a8a0af58436cc008c4ee9d38bcfa080d701c275b000 SHA512 808d7edf1467798714a0eab02336baa6f223fc4c1ffcd707018135eb99856f109ea713b98326cd7c796083f2b62a743229806f848fa013af49339ce44c89277f
 MISC metadata.xml 468 BLAKE2B ce716483a5c126030c044618343341e853b367516f0fb6142b5cf7140738a5950eec5fcc514a856dd119310d7a1e05adab9f4ac0e802e01ee873a6c81f14a2e4 SHA512 64c97706da7a48ebaf5d3bd9aecdd11b1eff9516d5e99993ba65217b169c503bb509fdf19ade828925c85a82573b186aab89991b5870161681c42985a244771f
diff --git a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
index 7b0216859466..83eacad11e44 100644
--- a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools eutils user
 
 DESCRIPTION="network Audit Record Generation and Utilization System"
-HOMEPAGE="http://www.qosient.com/argus/"
+HOMEPAGE="https://www.qosient.com/argus/"
 SRC_URI="${HOMEPAGE}dev/${P/_rc/.rc.}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index 718d620dd1aa..b72eb72431f8 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -1,8 +1,8 @@
 DIST arping-2.17.tar.gz 174346 BLAKE2B b0a095ff4e39e8f08b25a10db828e4ab9f60299043fbefc353b9df14e5bae839a93be20724ab9758b5bfc830c211e5f9bdfd606e321db508dbce9886b5903b09 SHA512 062026f522ab3d3b96c05c97aa3133995bce808a25a470207359a1236886da0300368ddac7d76568201510c0bcc2ac4ef6b34b2284c8d367c1be41972f0ee1c2
-DIST arping-2.18.tar.gz 175691 BLAKE2B 42372f629b66568868ffa6d5ed5d050f0eeb53b6a3b804bbd87d273d4c381d249b0b2e41f641f7cd2d5d93d5aa18882c8e623461db8052dd2393d6822d8ca222 SHA512 0ce54bd834695d1f624e9846d1796a316e5a733b83cdeaf745f522e1311f082d646c265a90b90b524d7e718070d61dd9ca767b5365f9fd5bd0a807e37c4d4c89
 DIST arping-2.19.tar.gz 177178 BLAKE2B ed8936b5526c02526d3cf0f208be0cbb91034fec861a26ae9f3fa7a865597ae8ba9d9b15418b07e930b7b5d1e766e4a4be4b4b61e5ba313dcca0f1e038373a00 SHA512 7ad242202432d91adc34b049c5511529789cf381ef02e803f8fc61394a5540427b719981946a36f692df9b1b3186e3f39b0f867f583aa42e237ae7f7549822a2
+DIST arping-2.20.tar.gz 48102 BLAKE2B ce08c68e5d76db89f4f9ecb31bcee3316064cfd8ffd9615964677db33f214b856300de0dd2619430ce934b19f260cd38c8fa892636787ae4de82022301274a06 SHA512 c5fac3b43a9be8c63ee7707a7df1cef2d75c6f7944cc6e580450a6558fb7e72b0d97d09b5c9b4a3aa86a59f49faba94b39bd634c93917c11ae20ac59e8635282
 EBUILD arping-2.17.ebuild 706 BLAKE2B e7c8265c088471fb2a158db710986fe67c2603c3b5fc19bb0d355f024baff962c31722ad255e3e747b106151d19ac77c0c0b2b994652d9cab72a5581467b5384 SHA512 8537da18d1a79d669899c82dc6344f27467824257ed327a070168060e745d23996d85692034cedf85b3a1e0073fb06f91f1b7615a134832a5d8139be0b8b127d
-EBUILD arping-2.18.ebuild 715 BLAKE2B 57e6e6704f67e72bd1a3a6b8ce393fb2e7ead1e05d15a534756914bc43d5f1eb845e8abdf4c027d64689a7b474d94b849d60b5eb2c38d7d55d2da799c75a9bab SHA512 72eb38608ba78934fd605170084642724f5ca05c020ec4a8b95f88e2652969225a8376af4cceda3f7ec9a5b91c18b50a01c4badc1d92e9aea47e5024a8940472
 EBUILD arping-2.19.ebuild 715 BLAKE2B 57e6e6704f67e72bd1a3a6b8ce393fb2e7ead1e05d15a534756914bc43d5f1eb845e8abdf4c027d64689a7b474d94b849d60b5eb2c38d7d55d2da799c75a9bab SHA512 72eb38608ba78934fd605170084642724f5ca05c020ec4a8b95f88e2652969225a8376af4cceda3f7ec9a5b91c18b50a01c4badc1d92e9aea47e5024a8940472
-EBUILD arping-9999.ebuild 628 BLAKE2B 60e4bdaefd3472a9cbc10e15c79948d0d2dc77d0f3e3fc77c3c432753af6627ffcab4891af054eff2701ccb3519b9acc81a3746259838bfff228112a7019de2c SHA512 c478daa886e12ae738a7d8a134bd18f43bb272e31694c1166e5d59fcc8c4974c81d320a4553061eb4b3a516ed9a1bddf7dc0c9ebc775182088c3b775758d8170
+EBUILD arping-2.20.ebuild 794 BLAKE2B 732883ce8dc887afd35c4d411190d885c125405cefbf1b25d18f61a240949b8d654cf914969989092c68b99ee068172bff36d4fd794f642eacb1f1a18ed872a4 SHA512 eab36d027018099d16bd4fa8e71895a3bee76aa3298f2769ebf58b2387ad31e02bec27a0f2e6fc191b8b47d20b8a7be43697bd2352d5d29708f794740c52e255
+EBUILD arping-9999.ebuild 628 BLAKE2B 90f247f73d143e302004ac102e67baacf27385e1943d2e0bda9667aa8511fc3c5839b55738c4cce91bd649eaa51ba04d7face31680e561effd9e16db38f86753 SHA512 51046ede312bd8de290bb6c96bdea0aa2c95b2b6975af2bffc5147e3d82766b0f1d7528dd22c97eb838aadfc48b672927cc1a5a638b010105824d109aca4b12b
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/arping/arping-2.18.ebuild b/net-analyzer/arping/arping-2.18.ebuild
deleted file mode 100644
index 1552c81188ae..000000000000
--- a/net-analyzer/arping/arping-2.18.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit fcaps
-
-DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it"
-HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
-SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="test"
-
-CDEPEND="
-	net-libs/libpcap
-	net-libs/libnet:1.1
-"
-DEPEND="
-	${CDEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND="
-	${CDEPEND}
-	!net-misc/iputils[arping(+)]
-"
-
-FILECAPS=( cap_net_raw /usr/sbin/arping )
diff --git a/net-analyzer/arping/arping-2.20.ebuild b/net-analyzer/arping/arping-2.20.ebuild
new file mode 100644
index 000000000000..9f3f308a61fe
--- /dev/null
+++ b/net-analyzer/arping/arping-2.20.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools fcaps
+
+DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it"
+HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
+SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="test"
+
+CDEPEND="
+	net-libs/libpcap
+	net-libs/libnet:1.1
+"
+DEPEND="
+	${CDEPEND}
+	test? ( dev-libs/check )
+"
+RDEPEND="
+	${CDEPEND}
+	!net-misc/iputils[arping(+)]
+"
+FILECAPS=( cap_net_raw /usr/sbin/arping )
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-analyzer/arping/arping-9999.ebuild b/net-analyzer/arping/arping-9999.ebuild
index ee101c39dcdd..20b7fc882067 100644
--- a/net-analyzer/arping/arping-9999.ebuild
+++ b/net-analyzer/arping/arping-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools fcaps git-r3
 
 DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it"
diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest
index c1cca42e98c5..90ac598fb49a 100644
--- a/net-analyzer/barnyard2/Manifest
+++ b/net-analyzer/barnyard2/Manifest
@@ -1,11 +1,12 @@
 AUX barnyard2-1.13-free.patch 235 BLAKE2B 5c96aa8048a8445ce34c4bed29d60ae66b82cd7758e58fb34c2ec96d0b1d43404ee24a5cf7f5815bf1201adf621fa954096000c52aba56db919c20f335dd7749 SHA512 40aa34cb3b778e17a917ae1791ba640060e6cbd6fff1b3edb43f95d4b187a57e2c826abbb6709d71d6b30b73a07a117f2a27b19600a0129462d9d5106ab40285
 AUX barnyard2-1.13-libdir.patch 2976 BLAKE2B f940e9302aea3a55867c081de832dc4d2be6759c73152a9e204dad4987dd3975efe8dfe4e1d16ffd965d95205b5ef7eb178876e8bcc23dd3d6e5cb7c892bf84e SHA512 c87aec5043b7a589cc2c23464cadcb073d1a1da3c11491080b306f04191e7359942acf56fc42a85c7e52349ce5ae82bbc3dd26f886ae6f45191506b2cffdf8ce
+AUX barnyard2-1.13-my_bool.patch 447 BLAKE2B dde68b66b62debca2d6b2acc81dae27520ba9fc72695fcd49822628ecc80073ef9b20e8dbe2861080bc32a59a625d9199465aeadb7c1f7f1472b48685e02ae57 SHA512 e7a58e512cca86f1867e7fd07d9c1c3c236d5ecb0cbfb175042c6175bd81c95ae01c637c7c3cc91e806b00fb45d30daf657703fa64b8d29cd33eeeccd705bb8f
 AUX barnyard2-1.13-odbc.patch 1453 BLAKE2B a238e0456227c82620a59b1b8b66d1e99a88baacf029a476851241cd5e795118d6b9cd3aada07013f67ee25b88568f63376c7a4eb64946321731daa1b1fb2f4f SHA512 34b2d744c933a007412536b95b7bd152425c37022c9d8c92b5e1f104baea60b831e2c0816a57e0a8f662975005a073b424408e6f5630432588add3a7c6ad28c9
 AUX barnyard2-1.13-pcap-1.9.0.patch 944 BLAKE2B 143d2cc61e447d5c493a3d503e7e2020432fea9c5292b5837f20ef4e9bd5ba306180280a2bc3e25bd98ceb3859328e94f4967e88fccc74f5d9ebdd3e01be0179 SHA512 23d39af20e6a062547f57c9c0a3614bd5b1d08622611a455e7faa6201d12a9ce26e6985d61cae44e3d85842a596b34c921fe07c5ab88caa2a1c48542bda1563c
 AUX barnyard2.confd 1487 BLAKE2B 0eaae6d5c5bd249c5033e404712b14b10eacb2ea7f638872927bd4e2fe5d005225e257bd5971597ae62db5a1f10da2d092e086eb60fb6ea3b552801f992d8646 SHA512 25fb327829da9f23a100e69310dd57c1f99404dd9923f2ef73d90635013ca68678122ee5f45f2e267c7b2f6264fd8e57998b1730d4ee02d3c2f61f1fe72d1f5f
 AUX barnyard2.initd 680 BLAKE2B 3cd613eb91029876a98900f38bde0cfaca15e47d66d9900a109797bf698ec61f4430cb4bed266c6875ec2a4bfa41a285e5c068b2f9b1f11b16394b9bba6d889b SHA512 32370ac32444e44df517dcc86ae59c548311ab02e49d2cf81d391e111334335968ee1d639c8a36a937dfdaa6a83f5dc33fb9f44ab3d7b822ace28985eabe3423
 DIST barnyard2-1.13-github.tar.gz 435017 BLAKE2B 2bfd6b038f4691cd9b40128c48db89cdb0cdefd9c779cbae4f6a86246507849f8faf73e10c986d9a48d45d608b02cbb8486bd731ebe1c78be115fe65c5a97704 SHA512 b9cf42ff3cb066493a3a6e8d095f6af1c59815ebb19725374a75977294620fe825cdbc6650d3600d3f8525860c39d3580aa1d6ef773cd31fbc28d500d6c75246
 DIST barnyard2-1.9-github.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666
-EBUILD barnyard2-1.13.ebuild 1881 BLAKE2B d0416ca8952ffbe4bba4cde68c7abb6ebf5207adbf356d154e21e665594c5bef305f96d1589a8913d999c4f1e422221163772bbf8aa24b8eeb9d02067f567c97 SHA512 ee78d77e42cdaa0899a5d85b837bb6279aa1e927faff82a110a18542e9d8af57489e71a0d408b06d89ddc35273e0988389d1d5c7aa30f4d35f114b9f7109c784
+EBUILD barnyard2-1.13.ebuild 1921 BLAKE2B b91c3c05f834a75e0b68bc2e881552d9db289721869c2418e1f908c78cabd99cea3687750fd6f54fe178c26ec027b32ded738d0ba7e223eb30bc8d7ab7536fc4 SHA512 0e13345b0b1f5c8c73b5eb0ff1ab0eee4e02baee928ab4ee521e51a1032a7044b9fe2148cc725c0cab73aead9accdd33c41a913b5669aff260438bd5c01767d5
 EBUILD barnyard2-1.9-r2.ebuild 1720 BLAKE2B b05ec48d30fc48ecd74d814790ec61df13c7e7d2b98e389859dfdf4a05642e7fd5bb9f47d3b9b8a587f9a6a154657cbbb925af2e493cb951e889239e3a4c28f0 SHA512 0d0967ce5498054f075d163e407d1d04741c2329cee2ab205e1d4990e5918ec63f4948e75456e8b9ae628e9206a95b0a3602473074d9ff2be3313788b6302fcd
 MISC metadata.xml 1369 BLAKE2B 90fc4c66290d2b82184e109a0affc8550b38b4f1781215531496bef639150b5e610feca7182335c263db764f94c248fe16448025835b3f2bb6e92b1b5703b13a SHA512 3fcbf3709f433993d2fac432ff9175547afbcc646efa98dc49f1ffc8ea5b5f5bf3872a557994af885cd1d2106358bfbd2a8a08361218c7a87f07f46ce61746ce
diff --git a/net-analyzer/barnyard2/barnyard2-1.13.ebuild b/net-analyzer/barnyard2/barnyard2-1.13.ebuild
index 7214129d7ec1..64f00cbb8a96 100644
--- a/net-analyzer/barnyard2/barnyard2-1.13.ebuild
+++ b/net-analyzer/barnyard2/barnyard2-1.13.ebuild
@@ -28,6 +28,7 @@ S="${WORKDIR}/${PN}-2-${PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.13-free.patch
 	"${FILESDIR}"/${PN}-1.13-libdir.patch
+	"${FILESDIR}"/${PN}-1.13-my_bool.patch
 	"${FILESDIR}"/${PN}-1.13-odbc.patch
 	"${FILESDIR}"/${PN}-1.13-pcap-1.9.0.patch
 )
diff --git a/net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch b/net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch
new file mode 100644
index 000000000000..9cd93220662e
--- /dev/null
+++ b/net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch
@@ -0,0 +1,11 @@
+--- a/src/output-plugins/spo_database.h
++++ b/src/output-plugins/spo_database.h
+@@ -357,7 +357,7 @@
+     /* Herited from shared data globals */
+ 
+     unsigned long pThreadID; /* Used to store thread information and know if we "reconnected automaticaly" */
+-    my_bool mysql_reconnect; /* We will handle it via the api. */
++    u_int8_t mysql_reconnect; /* We will handle it via the api. */
+ #endif /* ENABLE_MYSQL */
+ 
+ #ifdef ENABLE_POSTGRESQL
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index cc1d6e4b0505..6b61205378c7 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,9 +1,11 @@
 AUX cacti-spine-0.8.8d-ping.patch 235 BLAKE2B ab0390faaa8cd7b473ae2341a0f80d4eb87678bcf219bdf6d35ac2e6885047c87a26454f5bf0d3bbf618fccfcec06c31639bdc9f35e4c0267cf8f4de5bc13cb9 SHA512 93ea39cefbe20741a372c644f79bc2bde80e8ba81cbdfa4425523a642c0853aafe12a46bfd84a5d2161a9afed4ff8fd933cf72adbabcd54e936da8dd7d89d265
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
+AUX cacti-spine-1.2.5-my_bool.patch 208 BLAKE2B 001bedf38a4cf481aa451670f9e8712b11dcae4192b8517db6c44b060560afeb094d66410f7e42fcd3229f96490782f0bcf23c359010762d25a7879def3c3668 SHA512 c0e873444ae4f259786a3e2705a0e07485fd6676bf5024cc503a8b30285b3920322c57184105a75148d696a4e762d63ff29c260b855f9a0c3040afc8bd7ab548
 DIST cacti-spine-1.1.38.tar.gz 805437 BLAKE2B 32d934f54e00d83e9807dd194a7cacf8d5526c8e5b84c44ffad201c07edcb117f862266843552299fe04cc780575b9b2dc7129a106a20bd709cb82844ade7812 SHA512 5409a690e89fcc74e1e87e34e1918cab27d1243825955eb8256a92f8e9658f312345c66b338a4a07a0e38c94e3275131cb4e58fb70e7b59837c0e6c47746e45e
 DIST cacti-spine-1.2.2.tar.gz 2310298 BLAKE2B 782fb21fda6acf06434c6e996863a235670970b19e5218624723df4736c388c2d9f00c1e3cc623dad7973bcbbe7ae5d4bbe89e366c1f47ce83eac9b416f88cb4 SHA512 ef2f839f7b247439a8576d49e311546cfd2346eea06cfb26b7a05d4757ae28334e6ed6ea00396027dc6c0c6e107121ed38f356ba62d8202003553fea3b5d139e
 DIST cacti-spine-1.2.5.tar.gz 105494 BLAKE2B 1bd2f33cee841fb7b05a1a32d3d0d2824c36ccdc69fbf52c48cfe2d7bdbface4c1925261c8643c19addde90346c5ecdee547d8014705dc34800f59eab6ac248c SHA512 5bbf5f68e0d3477d43afee57bc86bfeb61a3ddaa18f7c0e5e0c2413bde6646bcd662d93e4c124daa6eaef5bca5843fb359b733c5189d9f43a34a14fba7f03682
 EBUILD cacti-spine-1.1.38-r2.ebuild 865 BLAKE2B d3ee48575e06d3936d7b05417549a6bbd0655f8b04f8e62b44f220615020016e373c9854b7b830efeda4fea76b0a133574a9e97f150ae6c62e029be6ec812147 SHA512 93a55f613d7f0be9301ab7d36e4bcbd9f518aa514bb43a70eec540848274b98574af5c8fb26ba8b21849c9c698005a7b7e404dfd29b2b04378308ca87cdda740
 EBUILD cacti-spine-1.2.2-r1.ebuild 887 BLAKE2B d8680ed1e6ae3b749b5bcb3d0a37f7d52aed0bfdcb31072f38d604b6800317bfdb1f0da7758f9265b27f8c5b4a456ce97bc434cb7a0833a73a02988025bee152 SHA512 1c6116e9609629559fe8a8462f4449b8535ad44bd2e8d7212f119c179d7e21a2befd378bcaa5e0ee60e344b24acb31501ea41f984fdd92f9ce905f3978d8d335
-EBUILD cacti-spine-1.2.5.ebuild 887 BLAKE2B d8680ed1e6ae3b749b5bcb3d0a37f7d52aed0bfdcb31072f38d604b6800317bfdb1f0da7758f9265b27f8c5b4a456ce97bc434cb7a0833a73a02988025bee152 SHA512 1c6116e9609629559fe8a8462f4449b8535ad44bd2e8d7212f119c179d7e21a2befd378bcaa5e0ee60e344b24acb31501ea41f984fdd92f9ce905f3978d8d335
+EBUILD cacti-spine-1.2.5-r1.ebuild 977 BLAKE2B b95d683505702a0e4bb0e627c9d581e6668e5c97f6479d5e212ab60c0a079800f1c3cf77a15a24dec8076f0b65584ce4c14be4656717b2ec929f1b1f9c4da4dc SHA512 85dd5d7d273fab5cb939e95dc0eedd1f7e3ebf78faa4508f8211629e2f6ddd754fb138fefbe75f06a784f8f40172d70b6d1f4997e6eb97ecab91bfb397fa6b91
+EBUILD cacti-spine-99999.ebuild 884 BLAKE2B 5df3c6c34e5b6d1fdf833d49a5a4cd1e9c6137199bd54879f47f632059b8cfa1d836d68f3f0abf126f66a0f78e6c3166a322b86df6f1b8f2acd709691f1e22b1 SHA512 7d2dface1745bc2847de70b2b8067822438b4d51d0039e1e9a9e4599d2ff64cbdc2d2e431a7e6d81694c1c23158a2f1f99cada8f374eff60a31ef9da6e6c0566
 MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..752dc560a7cd
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="https://cacti.net/spine_info.php"
+SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="libressl"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-analyzer/net-snmp:=
+	dev-db/mysql-connector-c:0=
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+	"${FILESDIR}"/${PN}-1.2.5-my_bool.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin spine
+
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+
+	doman spine.1
+	dodoc CHANGELOG
+}
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild
deleted file mode 100644
index 9a49a5087926..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="https://cacti.net/spine_info.php"
-SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-CDEPEND="
-	dev-libs/openssl:0=
-	net-analyzer/net-snmp:=
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
-	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
-)
-
-src_prepare() {
-	default
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_install() {
-	dosbin spine
-
-	insinto /etc/
-	insopts -m0640 -o root
-	newins spine.conf{.dist,}
-
-	doman spine.1
-	dodoc CHANGELOG
-}
diff --git a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild b/net-analyzer/cacti-spine/cacti-spine-99999.ebuild
new file mode 100644
index 000000000000..3eacb02e8472
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-99999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="https://cacti.net/spine_info.php"
+EGIT_REPO_URI="https://github.com/Cacti/spine"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="libressl"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-analyzer/net-snmp:=
+	dev-db/mysql-connector-c:0=
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8d-ping.patch
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin spine
+
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+
+	doman spine.1
+	dodoc CHANGELOG
+}
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch b/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch
new file mode 100644
index 000000000000..d9554bfa38c5
--- /dev/null
+++ b/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch
@@ -0,0 +1,11 @@
+--- a/sql.c
++++ b/sql.c
+@@ -229,7 +229,7 @@ void db_connect(int type, MYSQL *mysql) {
+ 	timeout = 5;
+ 	rtimeout = 10;
+ 	wtimeout = 20;
+-	my_bool reconnect = 1;
++	_Bool reconnect = 1;
+ 
+ 	mysql_init(mysql);
+ 
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 2776c976b45e..4e86ccca4ea2 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -3,6 +3,6 @@ AUX ettercap-0.8.2-openssl-1.1.patch 8769 BLAKE2B 6c9d7e8c60264b6ac0724891f9cbc9
 DIST ettercap-0.8.2.tar.gz 8082561 BLAKE2B 851df0a8700de45ce0e3427f7fdbdcd13feb2f75c0d1136563449db634b1f02276bade0d82a1a51bf8de726d6faddf05ff537e397c2e56cfc3e3181d25566fe9 SHA512 18137b1cc518c9db3c9650157a5cbf09dbb665b79876a24875d6c5125e8923ebde543464adb61cf1d1244101242f4d66b80d94ef3b36aa265cefca7646aa6415
 DIST ettercap-0.8.3.tar.gz 8381943 BLAKE2B f49098d61f60877d3f979d7861f36dad6ec3fbfca7ed89d8f9826867145ea36daec65a1076c893f81391218688448515ef020a9cdf9a16ffddc830bacec8eb1c SHA512 1929c986d3a17ebc693ffe8531e01c66379c0ee6ea71305ea49b6a9eece84b6da1923135311db458bdb6035feb593e525786e6cf4c465ced5a7683384d4a4ae7
 EBUILD ettercap-0.8.2-r2.ebuild 1789 BLAKE2B a23ee25a8d7c4b95a072183c1cbc6f1465b013ba5cb9cd894481b9063af043f7802ffd2b4311b030973b9acc04bf956e49922b2ed6105c67073f50b62b798946 SHA512 29bb82ce78874bf7b0b512b4a6033a80d1eafa125e4bbae14d6df3d89d92e55158ed6dea064fee50d04d82472b07082e177ffde512274c9e037f7a62299eb7ba
-EBUILD ettercap-0.8.3.ebuild 1758 BLAKE2B 743c128bc562577efe2d8e5ee07ecadbf4924932458776ccdf9a33b0a69cd48de8b1a0192b1a4da26b2b72e8556d7c57fa41c3c81503d8601059adfe7fa09aaf SHA512 5d40815ba0d90dd0db649e136b92d09bb9e25a767ce42879eaca4332bcbb6fd9d1c1ef32bd559b1bb2fa240f4e280f04cc24452d2e34656d05c428b735759433
+EBUILD ettercap-0.8.3.ebuild 1753 BLAKE2B 80c74dc437c36eaa73bdbe0d6347a426127f31508f5e6d252d44036c4941b5adb1be2e46af95c321051fefb02d5fd3612af349f1649fe59b802ff2b73ad75a44 SHA512 64f94012b5830d582cba3aab5305092a6d12982ed2a526a56704b661cead583235ba34b43d765fbf638829b005042199cf62030401a6acb840050caa0a1a0397
 EBUILD ettercap-9999.ebuild 1711 BLAKE2B 0ed80f63f24c4c595f2b1caf410259fbe974d0833bf8bdaa14f964009a9bd5c75540fcd6beff17622a355bce45408ea2ca52d2378196c7b37a515c6222d96441 SHA512 9d4fd99f08e11126ba68519404490c7000997aa349805a8d4a6d271e52fcda764dc3c8164a3f5ddfe63e819343d24c7f792d229da9d44ec56f039c87854e37ec
 MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
index ec323be8df10..c1487e4a8cde 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
 else
 	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
 fi
 
 IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test"
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 37d10d6232f1..27c464159591 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -3,6 +3,6 @@ AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc
 DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a SHA512 c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38
 DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce SHA512 ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d
 EBUILD icinga2-2.10.5.ebuild 4737 BLAKE2B 82b6eff71862480ff9017a301a45d807e2ff8c23eaafd2ee5e7df29e75f90e7f33507bce3ee3d14b6c0deeece33a7b531f023e8429dd55779578c3ce82b99a44 SHA512 b10ae453454d9747f3368c39be3c380bd1409f48298d32d7380b68bfc8fffdbf48afe1271ba8c30766c23b64335f46fa3fddcd313598e94856acc3dad4f696bf
-EBUILD icinga2-2.10.6.ebuild 4739 BLAKE2B 98edc856ce987b5e3b6ce3b7c13626392f1cd8c30f445aee583d20b35b07c86425eb12020461266f04ce009840f94c4636716c8ceb57ca7dac70ceae0c0cccfc SHA512 36f667896c130b61d2f76f29ec014207b60fc3dc9743a6723e51983e89be3bb4727d0243b516dd695b3f88265365ff2205e852546889911da2e530bef7cf7b93
-EBUILD icinga2-9999.ebuild 4739 BLAKE2B af9e0e626730fb2514cd38c8decf2308046beffffba6df1e5768593da0941f23a702913af03ca67b0a4034dc59cc7a5f0745fe36903a9bb7c4665a4bd06c1705 SHA512 3f6d8bda9d1f4729d3abf162d1d8d883e7da4310a29d83d8468ced54db64b84caf9c27d2c10b128d2ec8d7aeb9cd654c5416904d8deade3b243ec8a851711f06
+EBUILD icinga2-2.10.6.ebuild 4724 BLAKE2B e4b6ed8fb5262e71342e59064de815e2da58d32cf59a011ecc849ce8a218491443e00a9204165dfa2cd89523c1eddebcc1b309f8375f3d00d3a52047ef9e1ad6 SHA512 3cb16eb643087a905cb6c7539d78e59757d063b6bb7b067953ad522d3a4c0261a4606fa8206d17b226b255cb9d4d1e1d67b9f7759b838219bcf3a202c5e1c838
+EBUILD icinga2-9999.ebuild 4726 BLAKE2B 540407f321222356e979a3c159c10aeb519688c75f7e9a6ae5ce3a5749c47c0217080934cbccc921808e3c70b32ea1e70914a30c8d23213a86a4b9b7d4f850c7 SHA512 6714fb5ce7f1e0c2d082a479091fdfb8d24776f2119cc1ed0419f2fc1c47b7bfc95ee113367743dc9de4c7266e015129075551640269b7b6bfd81860d2e5353c
 MISC metadata.xml 834 BLAKE2B 49da117c90fdfa30311744b471933f1de2d106b74704e4daef5c33fa71f7aa99c6f05d5ca1345baf607b8e18f4036a9582f95487587f50bff90d6ac2d6c1ad48 SHA512 2e28e73e56153235ce7a69ee3f320cd6a8b9117ed6633deaf1095051d75c2c2fb499ff3748fa74262e84b340082dd6c6f08489549486d2dcba6b944d4cf460f5
diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
index 8a9695a5e27b..7d8f56dd9e4c 100644
--- a/net-analyzer/icinga2/icinga2-2.10.6.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
@@ -5,12 +5,11 @@ EAPI=6
 if [[ ${PV} != 9999 ]]; then
 	inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
 	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 else
 	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
 	EGIT_BRANCH="master"
-	KEYWORDS=""
 fi
 
 DESCRIPTION="Distributed, general purpose, network monitoring engine"
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 913217ef694f..d8066e1db2f0 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-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
@@ -10,7 +10,6 @@ else
 	inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
 	EGIT_BRANCH="master"
-	KEYWORDS=""
 fi
 
 DESCRIPTION="Distributed, general purpose, network monitoring engine"
diff --git a/net-analyzer/ipsumdump/Manifest b/net-analyzer/ipsumdump/Manifest
index 302786dd6675..d1824600f258 100644
--- a/net-analyzer/ipsumdump/Manifest
+++ b/net-analyzer/ipsumdump/Manifest
@@ -1,5 +1,7 @@
+AUX ipsumdump-1.86-SIOCGSTAMP.patch 228 BLAKE2B 05abaaba5619f0eac3d0dda66ad948afc7aa3cca3660fa9a89a35252e92408a2ffe9f3add385a851651439dd2bfbfec0164619c1cc22faad8269de4d00b61336 SHA512 bbf0737f8825e309f9fe548b0ea385d5c6926e59aabc90545d72ec301147a14607a648b0be90adf7f81874b9efd8bf6db59ad0103e7f8a54aa62bd61450e8cf2
 DIST ipsumdump-1.85.tar.gz 919540 BLAKE2B 870e003f4d9149904e6a411ae89b6df3e6f90e378b300dea823701e5f168d7f7b2c788702c3ca9c5840dbbe4372e30435e6fab79fd975328ddc474bc3e797559 SHA512 b42844cf028b9c1ea9da90306be8d731bffcec1a8f5c9eeb8029f563ddd5781651c583913a2105d8ad99cabac4b003345e1e8fdfb83367cabf806de1bca31596
 DIST ipsumdump-1.86.tar.gz 895567 BLAKE2B 5d33e2c6a5df836592028fb1026749561188b3e0cc15fe691404ad17bc1dd724f4fd9e1be46bbe76b200288575251178f874df4f8697b0e943de4185b71f9e69 SHA512 38bf55589ab81eb7601283410a9f962508e419c1a0ef24f088a2d1328b29e360a9788a20689ea45724fbc56194ecb5ede1f3b792e5bc7e97a500a7b2e434fe65
 EBUILD ipsumdump-1.85.ebuild 566 BLAKE2B 21324b6effeee5a7d4c148aac10c127c50e69a4c1a79f613b73dc44e7578eb137e297fa6dc7ebd1c00f74f1f088330a07be3be0a17ece27acff7edab367b13b1 SHA512 7bdd99fc11e9384a6ccadd786b71e142ef8890bd9b4082f254b56a62797761ec4e26a70b0a9193ca882f95eec91a157a62fcd5f3d539aa54a86b53fa4e51460d
-EBUILD ipsumdump-1.86.ebuild 569 BLAKE2B 39b94566b1a0784ada70b8c0da9a57aa0e291c468ceca1fea03acba601843ce70a1a0a53a9292e76548f6eef68969f52a31422ca9b784a83697070df77cb4aef SHA512 6e7a9ba5b8c93c8073588960c753d6626a9382c045ff94fc5637da90fba221a1b11410f328a467f43fcfad5c4216daea4a4a244ebd67b9d346f521b21f68db06
+EBUILD ipsumdump-1.86-r1.ebuild 641 BLAKE2B af657021aeed8a2752c2efc8119252636537deee7b8ce44024549120159ee3bbada4e5add37f82a2ccc57d6331801a1838ebe635f11b810e49e5024cf8a55772 SHA512 9e9361a75e7459cd16c77af2d35b1cd5a42ae1af0cdfb17a55cdff018eb4c9bd60be5746f70514b2282feacb41bb7328b1db4a980dec8c05413a3261e131fddf
+EBUILD ipsumdump-1.86.ebuild 586 BLAKE2B 5a7328c107e4c8356532f9257ea1af8ba5a4bdbfa9bb8daaff9cdedb7220b658d3dced093d0b0331ac46107d05d93f0f693a2c7b878b295e17b1eb10edc16d09 SHA512 21143b4e07e5d42aac54ebee738af1af6a29c6a2cb279f9d5f3207dd859692cb970a21e37c0b90271488d6813d64c6dfe0582444b6caf088016c6c9ab721582c
 MISC metadata.xml 563 BLAKE2B 1c76f973fe5a6165461b1822b83462cc49c658ce95d020e38a3f5eb4fd8ae3e5e5a455491ca4e9da2089f439757cd21ec9788c5ce1f845421a3a030255f7bdb4 SHA512 1867ca535fabb5e70808491cea9339e91e21009f30526dccbbf29594bba57261d98a10b43d096f24b84d476a4dedfd9be1ca7fbbc3445ddde928580789914432
diff --git a/net-analyzer/ipsumdump/files/ipsumdump-1.86-SIOCGSTAMP.patch b/net-analyzer/ipsumdump/files/ipsumdump-1.86-SIOCGSTAMP.patch
new file mode 100644
index 000000000000..c2f0a74fff11
--- /dev/null
+++ b/net-analyzer/ipsumdump/files/ipsumdump-1.86-SIOCGSTAMP.patch
@@ -0,0 +1,10 @@
+--- a/src/fromdevice.cc
++++ b/src/fromdevice.cc
+@@ -47,6 +47,7 @@
+ 
+ #if FROMDEVICE_ALLOW_LINUX
+ # include <sys/socket.h>
++# include <linux/sockios.h>
+ # include <net/if.h>
+ # include <features.h>
+ # include <linux/if_packet.h>
diff --git a/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild
new file mode 100644
index 000000000000..25325a3484db
--- /dev/null
+++ b/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer"
+HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="the-Click-license"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ipv6 +nanotimestamp"
+
+RDEPEND="
+	net-libs/libpcap
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	dev-libs/expat
+	sys-apps/texinfo
+	virtual/os-headers
+"
+DOCS=(
+	NEWS.md
+	README.md
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.86-SIOCGSTAMP.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable ipv6 ip6) \
+		$(use_enable nanotimestamp)
+}
diff --git a/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild
index 182f6ec8e8f8..784df50ece56 100644
--- a/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild
+++ b/net-analyzer/ipsumdump/ipsumdump-1.86.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
@@ -20,6 +20,7 @@ DEPEND="
 	dev-lang/perl
 	dev-libs/expat
 	sys-apps/texinfo
+	virtual/os-headers
 "
 DOCS=(
 	NEWS.md
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index ba8180abf1cc..f986923bb649 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,8 +1,8 @@
 AUX 99_nagios4.conf 368 BLAKE2B 147f4b73bd2f7d71dabb56f646399b939d3a87c288efed9b135e9401120e81c27e2a05f96982b62e601d1dd9b21be494e866103467a363336234b8b15095daf1 SHA512 f0b239f23d74afa89483806f27fb9259054e46bc5742de8a414c9a9a9852a4fbdc14db45aeb148a15288196c8f7d51bdd485b005e20d012892e9e7321b50e161
 AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82d149c8b0a786dddacc58c62337072691136c486d4050d1e3bce82420398d5f525ebc0bb36eefdf3a6a2e7f SHA512 a2f854713512ee8ee5c451235beb6ffccf2e04617a98619c6de807a5abca0a424e0581c34b4d255dcbc108e677e18bed25dd33e3d38df8fe10d7d8d4fab015c9
 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
-DIST nagios-4.4.4.tar.gz 11303598 BLAKE2B e4015ca5c0383b0540f2eaf3d608343df850c6045a4539c1f1ab8c19dc95e9223816efe71034b37f6995cb623dc6b83c92e22a677fe687a34d2215b1a2758c90 SHA512 c8f2b83bad744d67be4ba8356d9eea0be3efbf42d9a215d64815cdf7d944eba798348ce0faea6cebe64f1c99e0edbf12540d83ca42f8b4b563cbcc60139afdb0
+DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675 SHA512 14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.3.4.ebuild 6633 BLAKE2B b179113b24ff38a5c147de20cd48db21fa1379f4ab377c7c354a1f107f9651f1b348f7dbd26825aaacb1fe8ce54d8feedbd7a44b65d3c897480d1c87a1fd4183 SHA512 43668b229464870ff2843790b1fd3bed7e3e2c4ba58f8cc19b90d8e85418c0e86b3b604089ccf52a63f24f6c0fb5e9ea4045769b2f63df96dc7d70c53d3e8411
-EBUILD nagios-core-4.4.4.ebuild 6606 BLAKE2B 158f1629920032d07ccef39a5f6c8b596f894a957fae83b4efee89a42560f20eb4c2c248c0634ceac84b7315e1e0825a7608f1053a5485ab58d83b3b4dc33a44 SHA512 79985b40a69782d73780b5c0d85d758c96e57e87f24725d2bb338c8e761cadca4ac17e82d22a3662657408bb8cc1b03cc1e1eea2220424d75314f81fdccc6e75
+EBUILD nagios-core-4.4.5-r3.ebuild 7470 BLAKE2B ceb783a9c27047b42b6464a2570452125f2ff6f5c7c6a3333a63f113b2c78037ca7cea1db6cd6ca783d58d3d4bfaa491fade7217bff29b76f2cbaa7496c74dc4 SHA512 4962381b6508363c2f330e81dd81d3de878cb7ef7428f8ba9fc71193c6a3de2c93c8c32298212312feaa72e76b0094fec7ff9e04a9f07072be8181c12497a82a
 MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.4.ebuild
deleted file mode 100644
index 74ddb853c43e..000000000000
--- a/net-analyzer/nagios-core/nagios-core-4.4.4.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
-HOMEPAGE="https://www.nagios.org/"
-
-# The name of the directory into which our Gentoo icons will be
-# extracted, and also the basename of the archive containing it.
-GENTOO_ICONS="${PN}-gentoo-icons-20141125"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apache2 classicui lighttpd perl +web vim-syntax"
-
-# In pkg_postinst(), we change the group of the Nagios configuration
-# directory to that of the web server user. It can't belong to both
-# apache/lighttpd groups at the same time, so we block this combination
-# for our own sanity.
-#
-# This could be made to work, but we would need a better way to allow
-# the web user read-only access to Nagios's configuration directory.
-#
-REQUIRED_USE="apache2? ( !lighttpd )"
-
-#
-# Note, we require one of the apache2 CGI modules:
-#
-#   * mod_cgi
-#   * mod_cgid
-#   * mod_fcgid
-#
-# We just don't care /which/ one. And of course PHP supports both CGI
-# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
-# dependencies, and expect the user not to do anything /too/
-# stupid. (For example, installing Apache with only FastCGI support, and
-# PHP with only CGI support.)
-#
-# Another annoyance is that the upstream Makefile uses app-arch/unzip to
-# extract a snapshot of AngularJS, but that's only needed when USE=web.
-#
-MOD_ALIAS=apache2_modules_alias
-DEPEND="dev-libs/libltdl:0
-	virtual/mailx
-	perl? ( dev-lang/perl:= )
-	web? (
-		app-arch/unzip
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd[php] )
-		apache2? (
-			|| (
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
-				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
-			|| (
-				dev-lang/php:*[apache2]
-				dev-lang/php:*[cgi]
-				dev-lang/php:*[fpm] )
-		)
-	)"
-RDEPEND="${DEPEND}
-	vim-syntax? ( app-vim/nagios-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_configure() {
-	local myconf
-
-	if use perl; then
-		myconf="${myconf} --enable-embedded-perl --with-perlcache"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf="${myconf} --with-command-group=nagios"
-	else
-		if use apache2 ; then
-			myconf="${myconf} --with-command-group=apache"
-			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-		elif use lighttpd ; then
-			myconf="${myconf} --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf} \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		--with-cgibindir=/usr/$(get_libdir)/nagios/cgi-bin \
-		--with-webdir=/usr/share/nagios/htdocs
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) nagios
-
-	if use web; then
-		# Only compile the CGIs/HTML when USE=web is set.
-		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
-	fi
-}
-
-src_install() {
-	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
-
-	# There is no way to install the CGIs unstripped from the top-level
-	# makefile, so descend into base/ here. The empty INSTALL_OPTS
-	# ensures that root:root: owns the nagios executables.
-	cd "${S}/base" || die
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-	cd "${S}" || die
-
-	# Otherwise this gets installed as 770 and you get "access denied"
-	# for some reason or other when starting nagios. The permissions
-	# on nagiostats are just for consistency (these should both get
-	# fixed upstream).
-	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
-
-	# INSTALL_OPTS are needed for most of install-basic, but we don't
-	# want them on the LIBEXECDIR, argh.
-	emake DESTDIR="${D}" install-basic
-	fowners root:root /usr/$(get_libdir)/nagios/plugins
-
-	# Don't make the configuration owned by the nagios user, because
-	# then he can edit nagios.cfg and trick nagios into running as root
-	# and doing his bidding.
-	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
-
-	# No INSTALL_OPTS used in install-commandmode, thankfully.
-	emake DESTDIR="${D}" install-commandmode
-
-	if use web; then
-		# There is no way to install the CGIs unstripped from the
-		# top-level makefile, so descend into cgi/ here. The empty
-		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
-		cd "${S}/cgi" || die
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
-		cd "${S}" || die
-
-		# install-html installs the new exfoliation theme
-		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
-
-		if use classicui; then
-			# This overwrites the already-installed exfoliation theme
-			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
-		fi
-
-		# Install cute Gentoo icons (bug #388323), setting their
-		# owner, group, and mode to match those of the rest of Nagios's
-		# images.
-		insinto /usr/share/nagios/htdocs/images/logos
-		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
-	fi
-
-	newinitd startup/openrc-init nagios
-
-	if use web ; then
-		if use apache2 ; then
-			# Install the Nagios configuration file for Apache.
-			insinto "/etc/apache2/modules.d"
-			doins "${FILESDIR}"/99_nagios4.conf
-		elif use lighttpd ; then
-			# Install the Nagios configuration file for Lighttpd.
-			insinto /etc/lighttpd
-			newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
-			ewarn "out of the box. Since you are not using one of them, you"
-			ewarn "will have to configure your webserver yourself."
-		fi
-	fi
-}
-
-pkg_postinst() {
-
-	if use web; then
-		if use apache2 || use lighttpd ; then
-			if use apache2; then
-				elog "To enable the Nagios web front-end, please edit"
-				elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
-				elog "to APACHE2_OPTS. Then Nagios will be available at,"
-				elog
-			elif use lighttpd; then
-				elog "To enable the Nagios web front-end, please add"
-				elog "'include \"nagios.conf\"' to the lighttpd configuration"
-				elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
-				elog "will be available at,"
-				elog
-			fi
-
-			elog "  http://localhost/nagios/"
-		fi
-	fi
-
-	elog
-	elog "If your kernel has /proc protection, nagios"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding nagios into"
-	elog "the group wheel, but this is not recomended."
-	elog
-}
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild
new file mode 100644
index 000000000000..b6994129cefe
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/"
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+	web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+#
+# Note, we require one of the apache2 CGI modules:
+#
+#   * mod_cgi
+#   * mod_cgid
+#   * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+DEPEND="dev-libs/libltdl:0
+	virtual/mailx
+	perl? ( dev-lang/perl:= )
+	web? (
+		app-arch/unzip
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd[php] )
+		apache2? (
+			|| (
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
+				>=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
+			|| (
+				dev-lang/php:*[apache2]
+				dev-lang/php:*[cgi]
+				dev-lang/php:*[fpm] )
+		)
+	)"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/nagios-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 -1 -1 nagios
+}
+
+src_configure() {
+	local myconf
+
+	if use perl; then
+		myconf="${myconf} --enable-embedded-perl --with-perlcache"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf="${myconf} --with-command-group=nagios"
+	else
+		if use apache2 ; then
+			myconf="${myconf} --with-command-group=apache"
+			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+		elif use lighttpd ; then
+			myconf="${myconf} --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} \
+		--prefix=/usr \
+		--bindir=/usr/sbin \
+		--localstatedir=/var/lib/nagios \
+		--sysconfdir=/etc/nagios \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		--with-cgibindir=/usr/$(get_libdir)/nagios/cgi-bin \
+		--with-webdir=/usr/share/nagios/htdocs
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) nagios
+
+	if use web; then
+		# Only compile the CGIs/HTML when USE=web is set.
+		emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
+	fi
+}
+
+src_install() {
+	dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
+
+	# There is no way to install the CGIs unstripped from the top-level
+	# makefile, so descend into base/ here. The empty INSTALL_OPTS
+	# ensures that root:root: owns the nagios executables.
+	cd "${S}/base" || die
+	emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+	cd "${S}" || die
+
+	# Otherwise this gets installed as 770 and you get "access denied"
+	# for some reason or other when starting nagios. The permissions
+	# on nagiostats are just for consistency (these should both get
+	# fixed upstream).
+	fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
+
+	# INSTALL_OPTS are needed for most of install-basic, but we don't
+	# want them on the LIBEXECDIR, argh.
+	emake DESTDIR="${D}" install-basic
+	fowners root:root /usr/$(get_libdir)/nagios/plugins
+
+	# Don't make the configuration owned by the nagios user, because
+	# then he can edit nagios.cfg and trick nagios into running as root
+	# and doing his bidding.
+	emake INSTALL_OPTS="" DESTDIR="${D}" install-config
+
+	# No INSTALL_OPTS used in install-commandmode, thankfully.
+	emake DESTDIR="${D}" install-commandmode
+
+	# The build system installs these directories, but portage assumes
+	# that the build system doesn't know what it's doing so we have to
+	# keepdir them, too. I guess you'll have to manually re-check the
+	# upstream build system forever to see if this is still necessary.
+	keepdir /var/lib/nagios{,/archives,/rw,/spool,/spool/checkresults}
+
+	if use web; then
+		# There is no way to install the CGIs unstripped from the
+		# top-level makefile, so descend into cgi/ here. The empty
+		# INSTALL_OPTS ensures that root:root: owns the CGI executables.
+		cd "${S}/cgi" || die
+		emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+		cd "${S}" || die
+
+		# install-html installs the new exfoliation theme
+		emake INSTALL_OPTS="" DESTDIR="${D}" install-html
+
+		if use classicui; then
+			# This overwrites the already-installed exfoliation theme
+			emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
+		fi
+
+		# Install cute Gentoo icons (bug #388323), setting their
+		# owner, group, and mode to match those of the rest of Nagios's
+		# images.
+		insinto /usr/share/nagios/htdocs/images/logos
+		doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
+	fi
+
+	newinitd startup/openrc-init nagios
+
+	if use web ; then
+		if use apache2 ; then
+			# Install the Nagios configuration file for Apache.
+			insinto "/etc/apache2/modules.d"
+			doins "${FILESDIR}"/99_nagios4.conf
+		elif use lighttpd ; then
+			# Install the Nagios configuration file for Lighttpd.
+			insinto /etc/lighttpd
+			newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf
+		else
+			ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
+			ewarn "out of the box. Since you are not using one of them, you"
+			ewarn "will have to configure your webserver yourself."
+		fi
+	fi
+}
+
+pkg_postinst() {
+
+	if use web; then
+		if use apache2 || use lighttpd ; then
+			if use apache2; then
+				elog "To enable the Nagios web front-end, please edit"
+				elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
+				elog "to APACHE2_OPTS. Then Nagios will be available at,"
+				elog
+			elif use lighttpd; then
+				elog "To enable the Nagios web front-end, please add"
+				elog "'include \"nagios.conf\"' to the lighttpd configuration"
+				elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
+				elog "will be available at,"
+				elog
+			fi
+
+			elog "  http://localhost/nagios/"
+		fi
+	fi
+
+	elog
+	elog "If your kernel has /proc protection, nagios"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding nagios into"
+	elog "the group wheel, but this is not recomended."
+	elog
+
+	if [ -n "${REPLACING_VERSIONS}" ]; then
+		ewarn "The local state directory for nagios has changed in v4.4.5,"
+		ewarn "from ${EROOT}var/nagios to ${EROOT}var/lib/nagios. If you"
+		ewarn "wish to migrate your state to the new location, first stop"
+		ewarn "nagios and then run"
+		ewarn ""
+		ewarn "  diff --recursive --brief ${EROOT}var/nagios ${EROOT}var/lib/nagios"
+		ewarn ""
+		ewarn "to identify any files that should be moved to the new"
+		ewarn "location. They can simply be moved with \"mv\" before"
+		ewarn "restarting nagios."
+	fi
+}
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
new file mode 100644
index 000000000000..5fddcc204780
--- /dev/null
+++ b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
@@ -0,0 +1,3 @@
+DIST nagios-plugins-linux-madrisan-25.tar.xz 371712 BLAKE2B 60637426d9ced289a1acdf61c3e7c5a2b3227afb20079ef93d445057b2127d12a6c76ab5a780571ac8bdd6ac3b55de2761722236d2ed7a057ab84559d97610e9 SHA512 64961a16e24802d66c48d0c33bd63d75aba8492f38dd83a57ee2e7cb728cf6876c7869622256c4249a9e9da39b744a332df6ecad80f6039861887bb5c8d806ec
+EBUILD nagios-plugins-linux-madrisan-25-r1.ebuild 1027 BLAKE2B efb8e3ad6283580d948b083c65984d9dffd338d7e2a2ee8be01b8bd2af578e8afbd457cf61fb61d27472a00519208bf3d9ddf2d6c05e5524f20d3d2b4801c6f7 SHA512 0d55a77d5cfa4d741c6388cf984b8eb376284f35d4f5979a7b326d446e2f48b16d411fdda8b1595b36e0283f1d9a0b13841a4f4824fbe0929cca096b45355766
+MISC metadata.xml 517 BLAKE2B b78b662d5028f2d3a6739be37b771af2ee51c35fa47b9aeff228dbcf67a8feaee45ea8db57acf2c6ac490b19ec87f97d0ba4db2883406945f5e37d30e430921e SHA512 b3a1dfedeb45883a101e1194643a6cfbc5041cf772f9ac70d32de38d909ef5aa5a1403b283e797c721b663498953d4b0810887a4c3e2ab51655084122b2e7ce3
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml b/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml
new file mode 100644
index 000000000000..2485783589cb
--- /dev/null
+++ b/net-analyzer/nagios-plugins-linux-madrisan/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>sbraz@gentoo.org</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<use>
+		<flag name="curl">Build check_docker which requires <pkg>net-misc/curl</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">madrisan/nagios-plugins-linux</remote-id>
+		<bugs-to>https://github.com/madrisan/nagios-plugins-linux/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild
new file mode 100644
index 000000000000..6367fdc2f4e7
--- /dev/null
+++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PN="nagios-plugins-linux"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Additional and alternative Nagios plugins for Linux"
+HOMEPAGE="https://github.com/madrisan/nagios-plugins-linux"
+SRC_URI="https://github.com/madrisan/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl"
+
+DEPEND="curl? ( net-misc/curl:0= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	# Avoid collision with net-analyzer/monitoring-plugins
+	# and net-analyzer/nagios-plugins
+	sed -ri "s/check_(load|swap|uptime|users)/&_madrisan/" plugins/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins"
+		# Most options are already defaults for Gentoo
+		--disable-hardening
+		$(use_enable curl libcurl)
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	emake check VERBOSE=1
+}
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 6c54935d0f2a..616dc578502e 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,4 +1,5 @@
 AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac02042147d162a452e17480433a8fd8ffcf3ce506d6930215e8a8eaa219d7811adffbcc2b3ee6a004661ca2a1f8bdc3339bf3526 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec
 DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3
 EBUILD nagios-plugins-2.2.1-r3.ebuild 3116 BLAKE2B d8d272c092af7fe6cab2c5f08f73e6a836e7862b98e65a42edb0125c87446504f89fa01d54663e7bd31da35bf45bfebd58b98ce137c4c6949ebc1e5b77932458 SHA512 9e59c607ff8177ddb930ad3e5cafd2ccf6dda76faa6b935532ecfae2c27ff696d4b7f5e8cca04164a98f3a1829c6ad969e41ac0a1fff3748f467df0387dfccc6
+EBUILD nagios-plugins-2.2.1-r4.ebuild 3102 BLAKE2B 71b4e4382bd6ad0d2278db3a21e952cf38e551bc8f3619297ff24f508c2ffe4a4261093135e950212c8b8dab80e2cac294fc07a91bf3e273a03a09ac47822307 SHA512 9d8af2f74fd41c3bd660f72dc66665b2436671d899df8e9f06c1691df963f549320dda0dada32a39fc6214af11285fc329415e8038f35d10e245ac15f416259a
 MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r4.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r4.ebuild
new file mode 100644
index 000000000000..2c15df43c502
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Official plugins for Nagios"
+HOMEPAGE="http://nagios-plugins.org/"
+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"
+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
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="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 )"
+
+DEPEND="${REAL_DEPEND}
+	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] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+	!net-analyzer/monitoring-plugins
+	selinux? ( sec-policy/selinux-nagios )"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+DOCS=(
+	ACKNOWLEDGEMENTS
+	AUTHORS
+	CODING
+	ChangeLog
+	FAQ
+	NEWS
+	README
+	REQUIREMENTS
+	SUPPORT
+	THANKS
+)
+
+PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" )
+
+src_prepare() {
+	default
+
+	# Fix the path to our perl interpreter
+	sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
+		"${S}"/plugins-scripts/*.pl \
+		|| die 'failed to fix perl interpreter path'
+}
+
+src_configure() {
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with ssl openssl /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered. Bug #468296.
+	myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		$(use_with radius) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+pkg_preinst() {
+	enewgroup nagios
+	enewuser nagios -1 -1 -1 nagios
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index a9ef6160cdaa..b777f77d646c 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,3 +1,3 @@
 EBUILD nagios-4.3.4.ebuild 391 BLAKE2B 31a1586c68f74b862b0ee308ae8818c574a1e33f94a2b3daaa6d3a7d52622a61bcda61a5c968dcd911ad55ac03797dd0b54f85d4d98ebc79630fb0ed655c671e SHA512 80f20980638b39862e3026ff34e1a4827161366ad1c8079a32b8bd2736a67a3d4da2d042e9da54b6c0eef6dd2b3d196c7cdcb2949ac796d614e92fa9817cd85b
-EBUILD nagios-4.4.4.ebuild 397 BLAKE2B 244121a98f46b570281d36276ca17413b51a015a46835b1bd1f568328d0b12a90bd5f001199a3bd11f4121287bb78762e36007f9e206e75dcfad5af792ce10e0 SHA512 c260ebfa1f7578fd20bb76ba8ae0dfe9dcd495b185c8c5272b09657918b08d194b539428642f4e9e20afa9ba6cdb73a73806f47e9e4e80a321021e04c3f5b405
+EBUILD nagios-4.4.5.ebuild 397 BLAKE2B 244121a98f46b570281d36276ca17413b51a015a46835b1bd1f568328d0b12a90bd5f001199a3bd11f4121287bb78762e36007f9e206e75dcfad5af792ce10e0 SHA512 c260ebfa1f7578fd20bb76ba8ae0dfe9dcd495b185c8c5272b09657918b08d194b539428642f4e9e20afa9ba6cdb73a73806f47e9e4e80a321021e04c3f5b405
 MISC metadata.xml 1110 BLAKE2B a3577be74f7ae7da47c1add86da6b9cd2972ebea1e4e4241886027e7c4aecb936ffa776a32bcc0b77498c393ebb4c81aa9a98a3c8d45cbd5556f8b9014384e52 SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1
diff --git a/net-analyzer/nagios/nagios-4.4.4.ebuild b/net-analyzer/nagios/nagios-4.4.5.ebuild
index 39d47b09dafc..39d47b09dafc 100644
--- a/net-analyzer/nagios/nagios-4.4.4.ebuild
+++ b/net-analyzer/nagios/nagios-4.4.5.ebuild
diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest
index 779b8922bd3e..40b001f07d3b 100644
--- a/net-analyzer/ndoutils/Manifest
+++ b/net-analyzer/ndoutils/Manifest
@@ -3,5 +3,5 @@ AUX ndoutils-2.0.0-asprintf.patch 438 BLAKE2B 2d32a25467123281f8593b464362a66345
 AUX openrc-init.patch 3296 BLAKE2B f07c1c0fda7a0d2e1c3f2b9cbae60568f743d82454179bcb3ee367d8a022a406dd1bf0c775fc9b339524cc5c64e4af6aacb8df8a866809104e39f39d11531f26 SHA512 4beb0e72712909554deaa93aa3fe959e80bed3465f4f0a2153f8b4e994538e6d508e303451cc14425ecb5210845308e9a113f491900a977526327a2701b00eb7
 AUX sample-config-piddir.patch 1098 BLAKE2B 467fab110ef030010acf8e130d91ba1f97424c611ef75ed0a7806d5034f1c8a5ecce2c64832a295347fb3e323342f3afc5f5d1fbbc3584f26bd2f3b226cbf3af SHA512 bae06d6571aa55c5b9f0103d9af861f50b31668f06dc9b9a29cdf961741455384d8c762338dbfb3c75e10bacba360ac5a706b6251a6ef5cec8fa0def4c679344
 DIST ndoutils-2.1.3.tar.gz 2182999 BLAKE2B 390548b9018d4434d5d0f69abee1d1a11f4e240150941f7f2f9e2662eb2cdb2f29b24244e094d5bdf8bfaf6c3be7bc8ebd9e6d510d66edad8bc9cf3245d5c2c3 SHA512 727f2051876ff32cafaf9993a69b721ae4ea81031fade12262dbb4c5399c601f3c1af362d9d550e1d6d56fac8fe044d515dc10fc43e7d4d3e981bc9a89db88de
-EBUILD ndoutils-2.1.3-r1.ebuild 2557 BLAKE2B 67519f051f59f2f0dee46914b65e8e0802af450d2a43285a28a81d9afa15bfc7f45ee85bdccffd60a9b19da35fff0f2e94099f17b466aeefe5900486c4405def SHA512 696abe6e261e729c9b252128e995c2b2bbbb01ac207f39a8ae7f0e1a5ce4edd6830ce8c065fe3b7954ffc8b16e04f4a5f44f8ed493b9808ab12dc3664601162f
+EBUILD ndoutils-2.1.3-r2.ebuild 2572 BLAKE2B 29b9f5c3353bc3eb12622ab6bbacb5a62d398a7059c835be0a6e71d66e764188c46971236d96d92d141c7a1ad88a520c8fa0537cde9750fb5f4e8f6a9e467a3b SHA512 82ea4e98d2b97714cfef7155638b4eff269a220330eb9e97767880197f06843e9cdd8775f5df9637ea7d1bebe5eaaba41ba750661d2191d074e3cc266e497c5e
 MISC metadata.xml 446 BLAKE2B fa3dd9d02ff6fc6a6b973fc1a08e0402a7a024ee783d7d9eb86e6dbc5756ebf62942f87115e45997779fe9393d6a6df91f8a92ace9f6be38bbfda00b8951f06d SHA512 744e2dc2da0449a47d7acc67820a5627058f7e962f9b78beabc766936abb8a5a8c55d4bd01f239af9d63b418e36d875e30f591bf6ab694fc171c7387eb1c1c77
diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
deleted file mode 100644
index 018e14d53e39..000000000000
--- a/net-analyzer/ndoutils/ndoutils-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd
-
-DESCRIPTION="Nagios addon to store Nagios data in a MySQL database"
-HOMEPAGE="https://www.nagios.org/"
-SRC_URI="https://github.com/NagiosEnterprises/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-# We require the "nagios" user from net-analyzer/nagios-core at build
-# time.
-DEPEND="dev-db/mysql-connector-c
-	dev-perl/DBD-mysql
-	dev-perl/DBI
-	>=net-analyzer/nagios-core-4"
-RDEPEND="${DEPEND}
-	virtual/mysql"
-
-S="${WORKDIR}/${PN}-${P}"
-
-DOCS=(
-	Changelog
-	README
-	THANKS
-	TODO
-	UPGRADING
-	"docs/NDOUTILS DB Model.pdf"
-	"docs/NDOUtils Documentation.pdf"
-)
-
-PATCHES=(
-	"${FILESDIR}/format-security.patch"
-	"${FILESDIR}/ndoutils-2.0.0-asprintf.patch"
-	"${FILESDIR}/sample-config-piddir.patch"
-	"${FILESDIR}/openrc-init.patch"
-)
-
-src_configure() {
-	# The localstatedir is where our socket will be created by the
-	# nagios daemon, so we put it in /var/nagios where the "nagios" user
-	# will be able to write.
-	#
-	# And normally, we would use /run for the pid file, but the daemon
-	# drops permissions before creating it, the the piddir also needs
-	# to be writable by the nagios user.
-	econf --enable-mysql \
-		  --localstatedir=/var/nagios \
-		  --sysconfdir=/etc/nagios \
-		  --with-piddir=/var/nagios
-}
-
-src_compile() {
-	# Avoid "emake all" so that we don't build the stuff for nagios-2.x
-	# and nagios-3.x, some of which throws QA warnings. We don't use it
-	# anyway.
-	pushd src
-	emake file2sock log2ndo ndo2db-4x ndomod-4x.o sockdebug
-	popd
-}
-
-src_install() {
-	default
-	insinto /etc/nagios
-	newins config/ndo2db.cfg-sample ndo2db.cfg
-	newins config/ndomod.cfg-sample ndomod.cfg
-	newinitd "startup/openrc-init" ndo2db
-	newconfd "startup/openrc-conf" ndo2db
-	systemd_newunit "startup/default-service" "${PN}.service"
-
-	# The documentation isn't installed by the build system
-	dodoc -r docs/html
-
-	insinto "/usr/share/${PN}"
-	doins -r db
-
-	# These need to be executable...
-	exeinto "/usr/share/${PN}/db"
-	doexe db/{installdb,prepsql,upgradedb}
-
-	# Use symlinks because the installdb/upgradedb scripts use relative
-	# paths to the SQL queries.
-	dosym "../share/${PN}/db/installdb" /usr/bin/ndoutils-installdb
-	dosym "../share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb
-}
-
-pkg_postinst() {
-	elog "To include NDO in your Nagios setup, you'll need to activate"
-	elog "the NDO broker module in /etc/nagios/nagios.cfg:"
-	elog "  broker_module=/usr/bin/ndomod.o config_file=/etc/nagios/ndomod.cfg"
-}
diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild
new file mode 100644
index 000000000000..784309fee43a
--- /dev/null
+++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd
+
+DESCRIPTION="Nagios addon to store Nagios data in a MySQL database"
+HOMEPAGE="https://www.nagios.org/"
+SRC_URI="https://github.com/NagiosEnterprises/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# We require the "nagios" user from net-analyzer/nagios-core at build
+# time.
+DEPEND="dev-db/mysql-connector-c
+	dev-perl/DBD-mysql
+	dev-perl/DBI
+	>=net-analyzer/nagios-core-4.4.5"
+RDEPEND="${DEPEND}
+	virtual/mysql"
+
+S="${WORKDIR}/${PN}-${P}"
+
+DOCS=(
+	Changelog
+	README
+	THANKS
+	TODO
+	UPGRADING
+	"docs/NDOUTILS DB Model.pdf"
+	"docs/NDOUtils Documentation.pdf"
+)
+
+PATCHES=(
+	"${FILESDIR}/format-security.patch"
+	"${FILESDIR}/ndoutils-2.0.0-asprintf.patch"
+	"${FILESDIR}/sample-config-piddir.patch"
+	"${FILESDIR}/openrc-init.patch"
+)
+
+src_configure() {
+	# The localstatedir is where our socket will be created by the
+	# nagios daemon, so we put it in /var/lib/nagios where the "nagios"
+	# user will be able to write.
+	#
+	# And normally, we would use /run for the pid file, but the daemon
+	# drops permissions before creating it, so the piddir also needs
+	# to be writable by the nagios user.
+	econf --enable-mysql \
+		  --localstatedir=/var/lib/nagios \
+		  --sysconfdir=/etc/nagios \
+		  --with-piddir=/var/lib/nagios
+}
+
+src_compile() {
+	# Avoid "emake all" so that we don't build the stuff for nagios-2.x
+	# and nagios-3.x, some of which throws QA warnings. We don't use it
+	# anyway.
+	pushd src
+	emake file2sock log2ndo ndo2db-4x ndomod-4x.o sockdebug
+	popd
+}
+
+src_install() {
+	default
+	insinto /etc/nagios
+	newins config/ndo2db.cfg-sample ndo2db.cfg
+	newins config/ndomod.cfg-sample ndomod.cfg
+	newinitd "startup/openrc-init" ndo2db
+	newconfd "startup/openrc-conf" ndo2db
+	systemd_newunit "startup/default-service" "${PN}.service"
+
+	# The documentation isn't installed by the build system
+	dodoc -r docs/html
+
+	insinto "/usr/share/${PN}"
+	doins -r db
+
+	# These need to be executable...
+	exeinto "/usr/share/${PN}/db"
+	doexe db/{installdb,prepsql,upgradedb}
+
+	# Use symlinks because the installdb/upgradedb scripts use relative
+	# paths to the SQL queries.
+	dosym "../share/${PN}/db/installdb" /usr/bin/ndoutils-installdb
+	dosym "../share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb
+}
+
+pkg_postinst() {
+	elog "To include NDO in your Nagios setup, you'll need to activate"
+	elog "the NDO broker module in /etc/nagios/nagios.cfg:"
+	elog "  broker_module=/usr/bin/ndomod.o config_file=/etc/nagios/ndomod.cfg"
+}
diff --git a/net-analyzer/ndsad/Manifest b/net-analyzer/ndsad/Manifest
index 10a8743e3daf..5cf6d60ba204 100644
--- a/net-analyzer/ndsad/Manifest
+++ b/net-analyzer/ndsad/Manifest
@@ -7,4 +7,5 @@ AUX ndsad.conf.d 286 BLAKE2B 1cb53d5a324ef0aa5e4535299815427d74177d911f517b9d51a
 AUX ndsad.init 675 BLAKE2B 3b6eff620021d8be3ab938c8e17adda4488214657e0d80884285cddd702167ad2817ae2df46014962aec6556f2f67af0ed4442c6cf29492ad94bad760833e595 SHA512 f08c02ea457e2067e170cea8c2860ac12ccbbc4dd50a27f308e7b6884afa7e2ca8a7cf2f2d627002c43c13c4bc710727579fd22e043105d1c3f135de9cfdb500
 DIST ndsad-1.33.tgz 214614 BLAKE2B ca8e0f983d14cb43148411cead699dc140ca0cce60266b0aae6cb1836c643bd5c5d7aae6c34ae372af83a20e0e9ab39f92fcc46f2e2edbc70cf3968ee9b824dd SHA512 38ebca91f28d763ce334d92361779f100ee6b98d6d17485bf096f913f777e8525add63bd73aeea43321cee622e10cb88020aca7af492fbafdd50cf740510bd51
 EBUILD ndsad-1.33-r1.ebuild 905 BLAKE2B 540ba5fb53cab1fc45a88831eca7e222882049904c08dd77743c7ccb54065a75ac628b15be67f6376bb9f76f83b7682067776445ccb2b1b6659bbe394094d3d4 SHA512 4fd73c4234e8e08284e2c21501315203feb814d6ce73c4140a9e5f71772f3a2fcdd119f682bce8917ec048876c205db1a6a91c2e56d7794ffb8c09680078adcc
+EBUILD ndsad-1.33-r2.ebuild 854 BLAKE2B 06458be1e1c5665868c257766cdad06a1feca486ceeb3e40f6deb0a53ca01cfdfea99583adac0b122800fcbb76959b644d52817dcc1120bc49837dbc93a04283 SHA512 20be2483348444283a262667b7dce91298af0009e426fbf256c91b6489caf11215ecf6f4f500ad5ccc33311c7d7492c6c7a40874731bce19cd2690e3ac3d9562
 MISC metadata.xml 1271 BLAKE2B ae2d1adc298d9987342838550ed7fe1081b88198b7a6f24825a78356db0833013429acdeb6836c4e7f90cf1bb9e2961cc52dded5d2857d6baac2a3f00f5ab0bd SHA512 9db4f4368820e30e5b48f1ad9c49e245348c57a37829aec25b699d863e5e56f565f52c948cb6a2b63efd4c54c4feff204234e2d98bb8525f767d55701d14ce3f
diff --git a/net-analyzer/ndsad/ndsad-1.33-r2.ebuild b/net-analyzer/ndsad/ndsad-1.33-r2.ebuild
new file mode 100644
index 000000000000..e7f9a919a4a4
--- /dev/null
+++ b/net-analyzer/ndsad/ndsad-1.33-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Cisco netflow probe from libpcap, ULOG, tee/divert sources"
+HOMEPAGE="https://sourceforge.net/projects/ndsad"
+SRC_URI="mirror://sourceforge/ndsad/ndsad-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="
+	>=net-libs/libpcap-0.8
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-conf_path.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-getpid.patch
+	"${FILESDIR}"/${P}-log-path.patch
+	"${FILESDIR}"/${P}-strncpy-overflow.patch
+)
+DOCS=( ChangeLog AUTHORS README )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	doman ndsad.conf.5
+
+	insinto /etc
+	newins ndsad.conf ndsad.conf
+
+	newinitd "${FILESDIR}"/ndsad.init ndsad
+	newconfd "${FILESDIR}"/ndsad.conf.d ndsad
+}
diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index f164c3c4e831..0e82b21577b4 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,6 +1,8 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
 DIST NessusAgent-7.4.0-es7.x86_64.rpm 15719960 BLAKE2B 3ea992c54d7a5acf09bc0097b6780993daab68ef2ac4816b247dba8deb949f5fd3202f9244d8ca6d9b53414163deb942b4e2739e14b42396a9a64b2265dea18e SHA512 35d948807a5110a3b1e32abf8a427aebbf082555ffd7f11abff037909119eed8f866f09121d2523107a6b2c374a45f0ff42933b1148d7679436540956d227c4b
 DIST NessusAgent-7.4.1-es7.x86_64.rpm 15719896 BLAKE2B 16e0c578c01edeb54156e6228569ad3c179ac421887dc5f844aa957ef0c12f69d72a22efd8f0fecec9d3d23dcd8a9fdc017561f05f1aaf1cc3a426f83b9b914d SHA512 ff3704706d740e70cac083eb748e9e0e410709b8718c7fd77851ee7591fd5cb0c162bc7308662f864cd1d527ae33171c089d0b32e88c278399aaf8d95d013c22
+DIST NessusAgent-7.4.2-es7.x86_64.rpm 15989044 BLAKE2B 7fdc998acc4a5ee38519a3cf4d41d1de29cb8ddacb05bd6f734a458c63d7ce22c547b4d080320631d489dc381c4553d99a81786dcb48231833a77561ffa6928f SHA512 4aacc51d360c41963ad46c0976322cd29012d52e054337d4e0a303257796923bd35059324a041827ce0c54ef5c5dd6738311fcc4f0bcba19b6d4ea1e3730a146
 EBUILD nessus-agent-bin-7.4.0.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684
 EBUILD nessus-agent-bin-7.4.1.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684
+EBUILD nessus-agent-bin-7.4.2.ebuild 1970 BLAKE2B 278773d237abd92549945042f22e33de29803a1eb7f94678d85c8824fe4e93e932afa56bb250680a997706fe3be683f960656e48a8272e87ac9c8b628902b2ca SHA512 6b075584220409015a3e82cddc2f2b7d1b68aa1ec2093b6ddf350bb35461b4c29969fd02ee646b30bbf3c2cea5cbe6bd339b7b8f14bdb04122238d86da25c684
 MISC metadata.xml 353 BLAKE2B e3ba298accb9a0618eb7340652a32cc166702f8873b49de734f6c117e2aeadbd9c31a76f231574ee04159454633191d4d3480925c05c993be174bf4efd3cc994 SHA512 81bc629de5c0367706b7b3259b3bb68edff6260dd47de345153af292a81fb6df23771b0f4974617f1fdef7b446dc17ab3c485d44d3dcb376e93c69173503a348
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.2.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.2.ebuild
new file mode 100644
index 000000000000..20d896ea6290
--- /dev/null
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm pax-utils systemd
+
+MY_P="NessusAgent-${PV}-es7"
+
+DESCRIPTION="A remote security scanner for Linux - agent component"
+HOMEPAGE="https://www.tenable.com/"
+SRC_URI="${MY_P}.x86_64.rpm"
+
+LICENSE="GPL-2 Nessus-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+QA_PREBUILT="opt/nessus_agent/bin/nasl
+	opt/nessus_agent/bin/nessus-mkrand
+	opt/nessus_agent/lib/nessus/libjemalloc.so.${PV}
+	opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so
+	opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc
+	opt/nessus_agent/sbin/nessus-check-signature
+	opt/nessus_agent/sbin/nessus-service
+	opt/nessus_agent/sbin/nessuscli
+	opt/nessus_agent/sbin/nessusd"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus-agents"
+	einfo "The archive should then be placed into your DISTDIR directory."
+}
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
+
+	pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd
+
+	# Make sure these originally empty directories do not vanish,
+	# Nessus will not run properly without them
+	keepdir /opt/nessus_agent/com/nessus/CA
+	keepdir /opt/nessus_agent/etc/nessus
+	keepdir /opt/nessus_agent/var/nessus/logs
+	keepdir /opt/nessus_agent/var/nessus/tmp
+	keepdir /opt/nessus_agent/var/nessus/users
+
+	newinitd "${FILESDIR}"/nessusagent.initd nessusagent
+	systemd_dounit usr/lib/systemd/system/nessusagent.service
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "In order to link the agent to Tenable.io or an instance of Nessus Manager,"
+		elog "obtain an appropriate linking key and run"
+		elog ""
+		elog "  /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]"
+		elog ""
+		elog "This can be done before the agent is started."
+	fi
+}
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index b1b879a92247..df29868ad6f4 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,7 +1,6 @@
 AUX net-snmp-5.1.2-snmpconf-selinux.patch 189 BLAKE2B ca3ac3cc5786226ca5ed73997df2b9ec5c75405f098ed8eb29a52f5187399a1a6fd357613ca10c8dad3a4a5c8f03e25771e785ec9673ae0d3da3970827b90afc SHA512 5859742fa90c297af17b1b1a4718af8d03edbb3a78f723c2cbde54576c68a5f562ed573cc0f8cfdd0bdee9d5accb769e6183dbd16d5e5aa66f0d43f174658f75
 AUX net-snmp-5.7.3-include-limits.patch 578 BLAKE2B ae19f67f0e06a5010d8399e51f716cf7f2148ed9ed0737c00f195892346c2ec56985e2de9a12dbc111c98a012f591e69f6bac3d74ff8d83e36c56a9d0a21036e SHA512 47c27ac62c97a0b3ecfcfe05adeedd55436cc9cfc094a71f00df06cb5dece5f297c40fc255ad73e72a0c468a3c5f62afc98b79c0adc7d31a67813f25f1ec9415
-AUX net-snmp-5.7.3-mariadb-10.2.patch 1292 BLAKE2B 6b445dd00096924b975327c948c20942be70c1797605c9af22ca0395c06d1e4129170254a4d6b1f03948c18ef5d0e88250490a601df67736fafca973f0a1f042 SHA512 43b8d39837af147edf66b322d8e75bc82acc243f9eb6bb7ab11ed2975442ee975292d61d953d862679027d5110198ee30347de6209feb2abf3a6ede8547c0de1
-AUX net-snmp-5.7.3-perl524-2.patch 1776 BLAKE2B fdf872595094d83300ed950731b470db87b4cbf1eb584a109000d9af5fd329225d1d16f0509c6eabe6dae5602583f90dec7945596d912fb6137638a30d94e994 SHA512 ddd2ac301995114ea70890d89a320528e9009d9f49203ab9fa247b507e16dfa91cb517dd408290c530c1e0ca07f6ee431015958a625d68dd082d4c1e55d279ae
+AUX net-snmp-5.8-my_bool.patch 751 BLAKE2B d0caff5c2cebb50cc2fcf4375d222f1146e3908698565eb7201d3e009b4bcbbccf653c336c1af9a23a8dc1a5f468da12d77d940ea4a00eb3f7c14db7dd45463e SHA512 5fe9d44653e5c26d1d1d6041b48f0abf5c38d148b8dfe82d6fc83290e66becc25dda43962a895994989f7267d5914f69969b118c999c324b7fac0184c383bbce
 AUX net-snmp-5.8-tinfo.patch 340 BLAKE2B 59b75cc89e83d59249921f92ca3b54e3a6fb943a956bb603c891a253f2d015b23ef00029d42bb799625bfd3af2eab5803474fad2dace5d2013f7004221c71e8d SHA512 94598dd39c0067a161beba68bfa09ef4c0dc09376c94a4b0b7346a718e75da173a8c9cb37349c79ec6909fb82a39552ca84b170c3f7f07927386991771b4568e
 AUX snmpd.conf 552 BLAKE2B 9d2801b0ddc2148a62e332a1d355a9ddc050ec95aea2dde31f25413096c4b91dbab794c1e71b75f5baba1234d89729a6e8c50287098c04991a3eec4d9f512b3c SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc
 AUX snmpd.init.2 680 BLAKE2B ce21b60980c2a0d74c810bb473c6b4c70eb11a2fc0636ec4af8a262ce412324ba80bc6c72b2544d359b4e2f536cf329df99e0be7d96035fa20c25f9ab7dc4a16 SHA512 10394f04dee23537a195f5aed63a3e758ca90227e269076ae9d13f883c7bd666c1c43823d1b869c43f232e97dc4138e52648cae995327f7a7f676ba416ee6fff
@@ -9,15 +8,9 @@ AUX snmpd.service 181 BLAKE2B e68aa957e78178c624faa41c93eee84dcadec817fd0b0fcba1
 AUX snmptrapd.conf 517 BLAKE2B dced765351c6fbd74166da9c3631993a06135569e8bc7b2375e36e2823446de47c82e10992579a05bdd1f2803fc4694463f0f9e1e5e3510204a28184919d8a78 SHA512 283d1503ebca55046cc273f693a257be3e8e6f26b5db10a3b64a5455079a41568eb40c1a3f5dbc698b822502d5e8120ea80b9e2c3ac4aa1d830d318228c0beca
 AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf9252404b49f8c58355b4def5d751df0b3c7878bcce0bf703ccb7ba022db108eb1496b68eb2bb4a035612da SHA512 316964703559082b1626280bd0532a32533185741d1919f255473ae6bfe30f82b71bee79093cb0b341c99427e14a5ed201b6aa2886a9123c89d5f5f78496f706
 AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c5976394c04bfd8da30917395b1a752f8e66502259d271ccf264c3e99f99e95df62b80447d4099d1dd7 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d
-DIST net-snmp-5.7.3-patches-2.tar.xz 3312 BLAKE2B 9cf2b3b5ec2f65dc8c017565666c148acb42354f8a03274f67c856fea530df27877026aa2c0477d90cd2f035503e15cd48c33b449a9522c34c9dca370f7ed7a6 SHA512 22ca6cc4dd1fd58a8cff53881d248155dbfdab765e9a3664320c8c4a5cfa35e741adfb0304bb38be7719ba1c7418f9b0f9178719951b82d70257c3c944c450ad
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
-DIST net-snmp-5.7.3-perl524-2.patch.gz 523 BLAKE2B 6762795cd6bcdccd5b49899cf572d5a498f3ab7fd20af69fad5f3fe45880e40f2aecfb0e9443a2a10773e25323ed5d0f271446d8fc03102e70fa8efd79e0d118 SHA512 bede47234b809d67f33c46654f3d09d0b255d835fb97eea23bfa888922dfb80ad287c305596a6b041ed03ec91dc7c647ecd54c3c79e0b4ce08978332de3cc007
-DIST net-snmp-5.7.3-perl524.patch.gz 9072 BLAKE2B d870e195bccb8178827791c9bd495d5c13a8848d176ae72b1c6b54b38eabc3b5aa4842d1841f422e3a71d9e9129b2acf303e8961ce98f82f5d9310c3a65e671d SHA512 2d3184ac7c96f75af5bf8c8d23f33d5636c701e052a638e5403a8d5aa34985abc38f6a366ba09a1d8499a05fd71d939a7ed4d530661e56a726386603b6f6e6a4
-DIST net-snmp-5.7.3.tar.gz 6382428 BLAKE2B df036da09658fdb4c52a99696fb6374cd582bc8da765e212285478ffb16c8725ddecd37842aba7835bc90ea74437ce00491dff569b1ce2c7499acf46968b3935 SHA512 0758bba5844cfd6c80959ac16b83906a2f830ba49fd0ab1bf9e191dc6a79d312a2e4760bd53b3e1a1c82759481f0064d088d5a3cf475d84b25679a6bd0f049bb
 DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7
-EBUILD net-snmp-5.7.3-r5.ebuild 5123 BLAKE2B 4b131228917ab3884ca81e2777e1de6f8a73fa8b5ca5bfb15aa3224e00a6f7aa0d750ff18339c5abfcb26c01c592c7f182a47bca26728e0e620971c846bb4838 SHA512 a0aa82e9b35f0e2e8f33fe4abe55b706ddb7e6918da85916189e54c1a7273f121a42d802ff0a13ab53e4ed382b398f0fc6834cf9686aedabf850a7fb55230c9a
-EBUILD net-snmp-5.7.3-r6.ebuild 5156 BLAKE2B 29fbde65309d3169b9b9ce45aef271d70d583b859e27362c5c4c5185da1922abf5075f577b046c5e46042f2f1d335633cd81a56dd7e0fa99487f74797f91eb55 SHA512 e80156676b3b4841c24c6aa20af042ef6ea7c21fbf0ea08bb37af95ae4966a0a80f2bcede1e0231fa8065a21b4d97b12ce1828b012a8d887fe808898523405fa
-EBUILD net-snmp-5.7.3_p3-r1.ebuild 5235 BLAKE2B 20975c562ad43c1a20d4116aa2d422285adbad4df23f7f975357668fbbed6951705fffcec1008498374c42f14ecc6dc96e471970fba95cc592b862019bf23c18 SHA512 c058c0f7351da016936c454830887510a204bc9ae7d798f81323a4a4228fa51ad52551a68e95125c88ed2f511b3d0ee6860cd09bce70ae9d8719ad9673e3f9cd
 EBUILD net-snmp-5.8-r1.ebuild 5264 BLAKE2B 08450602568f2b2854cb62c123709035259cf71435911fa34f9ba7aa512755d8a911373d831ec7645f1829c42281444da4bc85c6f30f7da1e2082290d0e3b572 SHA512 8d870aa51ac3d5d65dfef6e94ca38fe154d689c011d494e1a931852b34ddc17a5fb3382ba1637b3f7bffd6bf8e79c52a75a25a675c7b9b8a41ad1c8a8151f848
+EBUILD net-snmp-5.8-r2.ebuild 5321 BLAKE2B 495325377ce6ef83dbc4ad6b4ffae809ecc9e99ac5908a1a001c87ad275fe556cacc3866d0a2d712b49a9ae8c5d1fe11a70355cb457e4c9571b0448c02e2ee47 SHA512 9474859c802d792503a6d4235eac511de6210648092acf071f938e928675fb1cb560e33a78b34d1cebfde7098464c7df992fb78c67646c58d8a52bfa065bc671
 EBUILD net-snmp-99999999.ebuild 5227 BLAKE2B 30ce2a65e1628ce78759589124604cd9db583c05edfc7cd8c1ab05d31fec7368271eaa073dff921304849e835608f0e63d58c0775b85bd69d391a259b9d3d1a9 SHA512 9690b14e47ecb2e9e5d8f6d32a6e9c429b3c5561975f0045e82fa9616afaae1f892099f789243eb68fcb522e0318b19782bf82fbc848356c93aa97b3fd5ba47c
 MISC metadata.xml 1193 BLAKE2B b53ad11776e58b025bb3655b4f3bb96580f0dbde557cfa037e272ab6e71411b4bec434a82df646da3f3b53e1eda24555cf26366084c27d8729ec0342249a5c93 SHA512 4b9d6d7d36786dd2176f0d90bc4f55f310595807d4a364132c098df60de2c0bab6e8619760de768667e1c13bbcf5d209a73469e06bd1d78323bea76ae4fdf981
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch b/net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch
deleted file mode 100644
index dea1a0178531..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.7.3-mariadb-10.2.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/apps/snmptrapd_sql.c
-+++ b/apps/snmptrapd_sql.c
-@@ -54,6 +54,7 @@
- #include <my_sys.h>
- #include <mysql.h>
- #include <errmsg.h>
-+#include <mysql_version.h>
- 
- netsnmp_feature_require(container_fifo)
- 
-@@ -437,6 +438,7 @@ netsnmp_mysql_init(void)
-         return -1;
-     }
- 
-+#if MYSQL_VERSION_ID < 100000
- #ifdef HAVE_BROKEN_LIBMYSQLCLIENT
-     my_init();
- #else
-@@ -445,6 +447,7 @@ netsnmp_mysql_init(void)
- 
-     /** load .my.cnf values */
-     load_defaults ("my", _sql.groups, &not_argc, &not_argv);
-+#endif
-     for(i=0; i < not_argc; ++i) {
-         if (NULL == not_argv[i])
-             continue;
-@@ -542,6 +545,10 @@ netsnmp_mysql_init(void)
-         return -1;
-     }
- 
-+#if MYSQL_VERSION_ID > 100000
-+    mysql_options(_sql.conn, MYSQL_READ_DEFAULT_GROUP, "snmptrapd");
-+#endif
-+
-     /** try to connect; we'll try again later if we fail */
-     (void) netsnmp_mysql_connect();
- 
---- a/apps/snmptrapd_sql.c
-+++ b/apps/snmptrapd_sql.c
-@@ -50,11 +50,16 @@
- #undef PACKAGE_STRING
- #undef PACKAGE_TARNAME
- #undef PACKAGE_VERSION
-+#ifdef HAVE_BROKEN_LIBMYSQLCLIENT
-+#include <mysql.h>
-+#include <errmsg.h>
-+#else
- #include <my_global.h>
- #include <my_sys.h>
- #include <mysql.h>
- #include <errmsg.h>
- #include <mysql_version.h>
-+#endif
- 
- netsnmp_feature_require(container_fifo)
- 
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch b/net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch
deleted file mode 100644
index 45855597a867..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.7.3-perl524-2.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/perl/ASN/Makefile.PL
-+++ b/perl/ASN/Makefile.PL
-@@ -1,3 +1,4 @@
-+package ASN;
- use ExtUtils::MakeMaker;
- require 5;
- use Config;
---- a/perl/AnyData_SNMP/Makefile.PL
-+++ b/perl/AnyData_SNMP/Makefile.PL
-@@ -1,3 +1,4 @@
-+package AnyData_SNMP;
- use ExtUtils::MakeMaker;
- # See lib/ExtUtils/MakeMaker.pm for details of how to influence
- # the contents of the Makefile that is written.
---- a/perl/OID/Makefile.PL
-+++ b/perl/OID/Makefile.PL
-@@ -1,3 +1,4 @@
-+package OID;
- # See lib/ExtUtils/MakeMaker.pm for details of how to influence
- # the contents of the Makefile that is written.
- 
---- a/perl/SNMP/Makefile.PL
-+++ b/perl/SNMP/Makefile.PL
-@@ -1,3 +1,4 @@
-+package SNMP;
- use ExtUtils::MakeMaker;
- require 5;
- use Config;
---- a/perl/TrapReceiver/Makefile.PL
-+++ b/perl/TrapReceiver/Makefile.PL
-@@ -1,3 +1,4 @@
-+package TrapReceiver;
- use ExtUtils::MakeMaker;
- require 5;
- use Config;
---- a/perl/agent/Makefile.PL
-+++ b/perl/agent/Makefile.PL
-@@ -1,3 +1,4 @@
-+package agent;
- use ExtUtils::MakeMaker;
- require 5;
- use Config;
---- a/perl/agent/Support/Makefile.PL
-+++ b/perl/agent/Support/Makefile.PL
-@@ -1,3 +1,4 @@
-+package agent_Support;
- use ExtUtils::MakeMaker;
- require 5;
- use Config;
---- a/perl/agent/default_store/Makefile.PL
-+++ b/perl/agent/default_store/Makefile.PL
-@@ -1,3 +1,4 @@
-+package agent_default_store;
- use ExtUtils::MakeMaker;
- require 5;
- use Config;
---- a/perl/default_store/Makefile.PL
-+++ b/perl/default_store/Makefile.PL
-@@ -1,3 +1,4 @@
-+package default_store;
- use ExtUtils::MakeMaker;
- require 5;
- use Config;
---- a/perl/manager/Makefile.PL
-+++ b/perl/manager/Makefile.PL
-@@ -1,3 +1,4 @@
-+package manager;
- use ExtUtils::MakeMaker;
- # See lib/ExtUtils/MakeMaker.pm for details of how to influence
- # the contents of the Makefile that is written.
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch
new file mode 100644
index 000000000000..72127d053c0a
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch
@@ -0,0 +1,23 @@
+commit 9f4af8c42d515e6b214738cc97212dfbe7f749cf
+Author: Andreas Hasenack <ahasenack2@users.sourceforge.net>
+Date:   Tue Feb 5 18:21:40 2019 -0800
+
+    apps/snmptrapd_sql: Fix build against MySQL 8
+    
+    See also https://sourceforge.net/p/net-snmp/bugs/2922/.
+    
+    [bvanassche: changed 'int' into 'char']
+
+diff --git a/apps/snmptrapd_sql.c b/apps/snmptrapd_sql.c
+index 6126ca916..32a3b1799 100644
+--- a/apps/snmptrapd_sql.c
++++ b/apps/snmptrapd_sql.c
+@@ -199,7 +199,7 @@ typedef struct sql_buf_t {
+  * static bind structures, plus 2 static buffers to bind to.
+  */
+ static MYSQL_BIND _tbind[TBIND_MAX], _vbind[VBIND_MAX];
+-static my_bool    _no_v3;
++static char       _no_v3;
+ 
+ static void _sql_process_queue(u_int dontcare, void *meeither);
+ 
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
deleted file mode 100644
index 8d923fa28d7b..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=2
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools distutils-r1 eutils perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz
-	https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524.patch.gz
-	https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524-2.patch.gz
-"
-
-S=${WORKDIR}/${P/_/.}
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
-
-COMMON_DEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	elf? ( dev-libs/elfutils )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	pci? ( sys-apps/pciutils )
-	lm_sensors? ( sys-apps/lm_sensors )
-	netlink? ( dev-libs/libnl:3 )
-	mysql? ( virtual/mysql )
-	perl? ( dev-lang/perl:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/Tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-
-RESTRICT=test
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	epatch "${WORKDIR}"/${P}-perl524.patch
-	epatch "${WORKDIR}"/${P}-perl524-2.patch
-	epatch "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
-
-	epatch "${WORKDIR}"/patches/*.patch
-
-	epatch_user
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-	use smux && mibs="${mibs} smux"
-
-	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
-	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--enable-shared --disable-static \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	for target in snmplib agent sedscript all; do
-		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
-	done
-
-	use doc && emake docsdox
-}
-
-src_install () {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	if use perl ; then
-		perl_delete_localpod
-		if ! use X; then
-			rm "${D}"/usr/bin/tkmib || die
-		fi
-	else
-		rm -f \
-			"${D}"/usr/bin/fixproc \
-			"${D}"/usr/bin/ipf-mod.pl \
-			"${D}"/usr/bin/mib2c \
-			"${D}"/usr/bin/net-snmp-cert \
-			"${D}"/usr/bin/snmp-bridge-mib \
-			"${D}"/usr/bin/snmpcheck \
-			"${D}"/usr/bin/snmpconf \
-			"${D}"/usr/bin/tkmib \
-			"${D}"/usr/bin/traptoemail \
-			"${D}"/usr/share/snmp/mib2c.perl.conf \
-			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
-			|| die
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	use doc && dohtml docs/html/*
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/**/*.pl \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			|| die
-	fi
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild
deleted file mode 100644
index 060479915394..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=2
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools distutils-r1 eutils perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz
-	https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524.patch.gz
-	https://dev.gentoo.org/~dilfridge/distfiles/${P}-perl524-2.patch.gz
-"
-
-S=${WORKDIR}/${P/_/.}
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
-
-COMMON_DEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	elf? ( dev-libs/elfutils )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	pci? ( sys-apps/pciutils )
-	lm_sensors? ( sys-apps/lm_sensors )
-	netlink? ( dev-libs/libnl:3 )
-	mysql? ( virtual/mysql )
-	perl? ( dev-lang/perl:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/Tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-
-RESTRICT=test
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	epatch "${WORKDIR}"/${P}-perl524.patch
-	epatch "${WORKDIR}"/${P}-perl524-2.patch
-	epatch "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
-
-	epatch "${WORKDIR}"/patches/*.patch
-
-	epatch_user
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-	use smux && mibs="${mibs} smux"
-
-	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
-	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--enable-shared --disable-static \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	for target in snmplib agent sedscript all; do
-		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
-	done
-
-	use doc && emake docsdox
-}
-
-src_install () {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	if use perl ; then
-		perl_delete_localpod
-		if ! use X; then
-			rm "${D}"/usr/bin/tkmib || die
-		fi
-	else
-		rm -f \
-			"${D}"/usr/bin/fixproc \
-			"${D}"/usr/bin/ipf-mod.pl \
-			"${D}"/usr/bin/mib2c \
-			"${D}"/usr/bin/net-snmp-cert \
-			"${D}"/usr/bin/snmp-bridge-mib \
-			"${D}"/usr/bin/snmpcheck \
-			"${D}"/usr/bin/snmpconf \
-			"${D}"/usr/bin/tkmib \
-			"${D}"/usr/bin/traptoemail \
-			"${D}"/usr/share/snmp/mib2c.perl.conf \
-			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
-			|| die
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	use doc && dohtml docs/html/*
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/**/*.pl \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			|| die
-	fi
-
-	prune_libtool_files
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3_p3-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3_p3-r1.ebuild
deleted file mode 100644
index 4add1e5486bb..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.7.3_p3-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=3
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools distutils-r1 eutils perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PV/*_p/}.tar.xz
-	https://dev.gentoo.org/~dilfridge/distfiles/${P/_p*/}-perl524.patch.gz
-"
-
-S=${WORKDIR}/${P/_/.}
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
-
-COMMON_DEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	elf? ( dev-libs/elfutils )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	pci? ( sys-apps/pciutils )
-	lm_sensors? ( sys-apps/lm_sensors )
-	netlink? ( dev-libs/libnl:3 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	perl? ( dev-lang/perl:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/Tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-S=${WORKDIR}/${P/_p*/}
-
-RESTRICT=test
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	eapply "${WORKDIR}"/${PN}-5.7.3-perl524.patch
-	eapply "${FILESDIR}"/${PN}-5.7.3-perl524-2.patch
-	eapply "${FILESDIR}"/${PN}-5.7.3-mariadb-10.2.patch
-	eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-	use smux && mibs="${mibs} smux"
-
-	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
-	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--enable-shared --disable-static \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	for target in snmplib agent sedscript all; do
-		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
-	done
-
-	use doc && emake docsdox
-}
-
-src_install () {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	if use perl ; then
-		perl_delete_localpod
-		if ! use X; then
-			rm "${D}"/usr/bin/tkmib || die
-		fi
-	else
-		rm -f \
-			"${D}"/usr/bin/fixproc \
-			"${D}"/usr/bin/ipf-mod.pl \
-			"${D}"/usr/bin/mib2c \
-			"${D}"/usr/bin/net-snmp-cert \
-			"${D}"/usr/bin/snmp-bridge-mib \
-			"${D}"/usr/bin/snmpcheck \
-			"${D}"/usr/bin/snmpconf \
-			"${D}"/usr/bin/tkmib \
-			"${D}"/usr/bin/traptoemail \
-			"${D}"/usr/share/snmp/mib2c.perl.conf \
-			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
-			|| die
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/html/*
-	fi
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/**/*.pl \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			|| die
-	fi
-
-	prune_libtool_files
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild
new file mode 100644
index 000000000000..2452860409a7
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=yesplz
+DISTUTILS_OPTIONAL=yesplz
+WANT_AUTOMAKE=none
+PATCHSET=3
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools distutils-r1 eutils perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://www.net-snmp.org/"
+SRC_URI="
+	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz
+	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+"
+
+S=${WORKDIR}/${P/_/.}
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/35"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
+
+COMMON_DEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	elf? ( dev-libs/elfutils )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	pci? ( sys-apps/pciutils )
+	lm_sensors? ( sys-apps/lm_sensors )
+	netlink? ( dev-libs/libnl:3 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	perl? ( dev-lang/perl:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+S=${WORKDIR}/${P/_p*/}
+
+RESTRICT=test
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+	eapply "${FILESDIR}"/${PN}-5.8-my_bool.patch
+	eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch
+
+	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+	eapply "${WORKDIR}"/patches/*.patch
+
+	eapply_user
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with kmem kmem-usage) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--enable-shared --disable-static \
+		--with-default-snmp-version="3" \
+		--with-install-prefix="${D}" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@Unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	for target in snmplib agent sedscript all; do
+		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
+	done
+
+	use doc && emake docsdox
+}
+
+src_install () {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/html/*
+	fi
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	prune_libtool_files
+}
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 5119f4160bf8..8783b6eedd96 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -3,6 +3,7 @@ DIST netdata-1.14.0.tar.gz 3116199 BLAKE2B 366fdd7fc94799f170a2957e26fadfacd0cc7
 DIST netdata-1.15.0.tar.gz 3175237 BLAKE2B 75f4c6f0dba53e6ff01fb98767e266ede8a8b8b965c484a03d5f72a55b39d55b150ada7784a971897a365ff9ebeb9bb66cadc72d4ce33dbc1465a758321d4104 SHA512 34b783d3b550c8ac5dc22e08f30fe87de65a5cd97008e271d9328d09b59620a6807ca3daa81a2e49d7ddf1c015f868b21f4118700b2630dcb78c4f9feda3fe4d
 DIST netdata-1.16.0.tar.gz 3233403 BLAKE2B 5e51722f9f11171a38231afd918a319c18fb7c95d5605a3fe73616af955b50036d2db7729494e8cc08d95a0bd11fb0259abb50d5f4da979f977b734778b16678 SHA512 132e8c0c57798d69ca8c3f360c2d55f1b8a46deaeacbb59979bc5bb5c52c9eaf02db7f7a166848787aae5807122d86f48fa86c0b9211ed0fdfd92889d1d8e2e4
 DIST netdata-1.16.1.tar.gz 3286225 BLAKE2B 4411baa2da9282173abef872dce02bc0a3f1b1e46a449648a0e09f35db27f2864bc63caf155f84e550ea8cff60c0c0d887a9e7043ac138a45a8170805059fed5 SHA512 f16dad4395b3cd2c437e03f98a2e0945fabd1cabd8b0f294d83e2fbd429955fe1cbe92668f9d3160d1c56ea744acc3908c8df91d0b3bb0623854361878317520
+DIST netdata-1.17.0.tar.gz 3313545 BLAKE2B 4225ed7e53d9d79d4e0e5e6c4c5408a78bcb1ce05a5d20925c231d55131e13ef3426586962c85f814073fad389495ac010b6843288865a44d8a0f22e55eab065 SHA512 fb1a2295868df3a161cc777dddece3bd8c6a2338a75ba72d6eaa7ca6914a1661cb056680229ad67d3059081309130f60eeff98d8e60ab3a03622f5c1947d1b08
 EBUILD netdata-1.13.0.ebuild 2633 BLAKE2B 917373166cefb26f30a9f62fedec407be3e7332774b419cb36db4a8ec6978d774f527a21d8b09e9bc4ed920144d7dc0378c9ecd30eaf51e855c6557b4e950556 SHA512 b964e4a3949b0ccf268cc8caa6ede03a45c3fbf5ec9b2d98e2c8ca9efec2643d8bbcf4233a087ac259c9a62c19f54ecaa15183a51fae0642c93c80d27c95cda8
 EBUILD netdata-1.14.0-r1.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
 EBUILD netdata-1.14.0.ebuild 2623 BLAKE2B 8552936e3884d9b62a6b2ee94ce4d14fb80feff59412e35b5f6174f5de2abc0506fc22311386b3337c3ee250fe0952acda36ae1524e924bf39673aa5f74a7eac SHA512 82d51a4bcd131b4dca9090ec6c6b344e37efabb5521f06315324bc006fdf5cd9930f4b68c4aa4a90f1ca7a1135803872726521f3d4ac21504a60047f8abaab96
@@ -11,5 +12,6 @@ EBUILD netdata-1.15.0-r2.ebuild 3006 BLAKE2B 1f48be63c01ef90eda30ce79c9bc709f3b5
 EBUILD netdata-1.15.0.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
 EBUILD netdata-1.16.0.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
 EBUILD netdata-1.16.1.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
+EBUILD netdata-1.17.0.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
 EBUILD netdata-9999.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
 MISC metadata.xml 939 BLAKE2B fa9652dfc67eb1f088383a62d435349665f81dc9db3e1dd9c8412110f27297cc15681cbd2307c8a09cd490bd195e830311bf9a2612abfe14ecec18fb99a17eed SHA512 c9e7794f190c22d0b5a14d2431d7f15d7b048fcbcf8cf48499e6a71fb21f7fc0292bd944db6767e1f70413c484a338ffeccbf7a70c63d7c128e4bc72c7d24fe3
diff --git a/net-analyzer/netdata/netdata-1.17.0.ebuild b/net-analyzer/netdata/netdata-1.17.0.ebuild
new file mode 100644
index 000000000000..b12cc034edfb
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.17.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		dev-libs/libuv
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		--disable-jsonc \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+
+	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
+	doenvd 99netdata
+}
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index f9bbc5421809..12d0326743e7 100644
--- a/net-analyzer/nethogs/Manifest
+++ b/net-analyzer/nethogs/Manifest
@@ -1,5 +1,3 @@
-DIST nethogs-0.8.1.tar.gz 35986 BLAKE2B a357c4a28478ecd5497c44e31a2a994baa074a027f3b3a11919cbe83b0b5bda426594e5a85046c82f0e0742ef4827cd151a1b8511eeecb556a851f5432b62271 SHA512 f1af7bb7208d08fc3a51bb38ee475da5a7b8f8814e2a7a653057d0c5d6b4e73be7742ffef5569525822160971f81dd22212d6854483928e621cfddce8d98409f
 DIST nethogs-0.8.5.tar.gz 112385 BLAKE2B 1d4867447455720a11f3131787b731428550f03d106ad476367ae356954c6c9895d02a8e730488b3deb9638d54bd60765cb63bcf599f4ec73c0bdc8da3d52cae SHA512 a2be81fcebc9925dd8a0fd9f71c6e790206819e0cc5efeeeb0c741baa9fd25ec685a1784b6d331d938cf14381403f9c13d619509d0ffe713ce8786a83a380908
-EBUILD nethogs-0.8.1.ebuild 679 BLAKE2B 46d88f3418e4943c042b016882041268b68f35a13ba3c15ebc4b053ac0c301acd5053e167cd378342d3434033d4ee9da8ad8aa548f257ac183cb0efb28bc6ddf SHA512 76fa00e33e4055259e67843469bdee9433c3d0499e1301b3962e1a2c55417d671eac99c8c08c54671c468e4da58c5faabb8e2461f9b179dac7b20011dff03368
 EBUILD nethogs-0.8.5-r1.ebuild 687 BLAKE2B 3327b3f3cd5c122d19d03290c475083767614e092a3a83db48d45b2af83930e7b835029165427002ccdc74b383fb40e6d8c7fd853c59c06eec81a7eb8e709ab1 SHA512 2cb80a6c06355bded0292b1a30d60d681e4b4fd7a624eabb38bc9b3ac8308e8c84af20e9a401164bae66a98fa5ad821a86ff0faee6188255cb9586ae0f42c20f
 MISC metadata.xml 898 BLAKE2B 401dd16bdfff0b3ab7baa1c51a28938ac428b4ff646e46e65efd7a5f612541be58a35c4ef68f48cec0b3f63af1624377615f8b4bb14bd8e8d9f4c297708e3b3c SHA512 324d822a63e6a8e179d487c840ae2fe10c5cb16a6973c40d480666e5a3d95b596495c1989de8afe8809a6888a17fccef7b7ca4ebacd0d4d0543611253dfa73ed
diff --git a/net-analyzer/nethogs/nethogs-0.8.1.ebuild b/net-analyzer/nethogs/nethogs-0.8.1.ebuild
deleted file mode 100644
index 8a31eb5993fc..000000000000
--- a/net-analyzer/nethogs/nethogs-0.8.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
-HOMEPAGE="https://github.com/raboof/nethogs"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86"
-
-RDEPEND="
-	net-libs/libpcap
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_compile() {
-	tc-export CC CXX
-	emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="/usr" install
-	dodoc Changelog DESIGN README.decpcap.txt README.md
-}
diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest
index 6d2b9c920f46..05f6d66c164c 100644
--- a/net-analyzer/nrpe/Manifest
+++ b/net-analyzer/nrpe/Manifest
@@ -1,15 +1,8 @@
-AUX nrpe-2.14-multiline.patch 6806 BLAKE2B 601bfaf6a7deddcd59c7ab9666ea9ada85698326d8f1eb0971196167edc79cad8acc818b6faa5e53cdad608692e9d3438200a08f2641bdac9937692cf83b8702 SHA512 09c0cc6a4610d674b0ed0da8cdc96f3653f98b54fc98802c33a1cc0b09755d3d0d6afd7fe6b25e1713e6b27af2ba1fa5063988691bc3b5364fa0bfd137d54546
-AUX nrpe-2.15-autoconf-header.patch 898 BLAKE2B 4cec3a40431057025c8aa711ea0535885c1b115f19f127a5d65145c2efb1215524bab357812d8648c32d953307e16ffbf5b787a306a7cd5941d957a33bda7eb4 SHA512 aa7aa0cb57c1b9826a980f9e093f8c8219e0b02dd1e8ba27e74a0a39e746d723e280a93d18d4e069743d14937e0c7159336bb6f406671450fc6a0bb90f902fb2
-AUX nrpe-2.15-metachar-security-fix.patch 1165 BLAKE2B f7e4c7c7ac83627baeb87b05264cea254cc852a4bcf1e67fb7994c3e15605ebafa6b25819692d179e23c2f8fca729c52f49ec47f979ba63574a26d9cb03ba2ae SHA512 cba997f4433dd38c95a3e2166f091b53ac6f618f25944dc69bb9ae5864a74a1136667c557881a498ce6aa16e91b367c416a5935e20e348f94f140fdc09692b29
-AUX nrpe-2.15-no-ssl.patch 967 BLAKE2B e198d1c140ba6cdcc50739e79ffd955c9f5ca692e529a09cfcc31db991d229df85a7137c0a72747e881aff82aa16d3b08cd5f12e0dbda2ad2c2a2793ceef05bd SHA512 17163aa22fd9e03ca00679756413c9ac2051b2d66c894b3ec6dc6bad468d2835c95481eab915b40ccc37e7063e1a2b382af7ed47a5c2ea6d1aa94286a95c44ce
-AUX nrpe-2.15-tcpd-et-al.patch 2651 BLAKE2B 2ada9c800d41a9854102f5a469c9ec829212845e07c3d17aaed095f90e807acfe945b3eaac6cf5d51fedd25d3baa88cefb75e72476a84c105a706560b0512abf SHA512 d4c2b38f05b9ac19702ff81d0f07cabed9f98a309e0e4d287bd9784b0aa6ee50ff8b6aee0f4d5541cb10120d463b470d23a6d4a4a2627166d6cf1b07fb5d61de
 AUX nrpe-3.2.1-eliminate-systemd-pid.patch 1264 BLAKE2B e0fb75dcc231881fd02fba73de02b983098d7762852d5dea497e717e0c978d773c871d35ba8671a4d292896aa276703ea9d2450e053add1ff3f2d6d9f1c53bf1 SHA512 9e8d58dee6c60b48e209a69eaab10abcc5eccfc28edf073240afba3d3e70a36ead4a568fe6589dd8578d11f0149c968c5977742e9905fa0a407b120c6d168570
 AUX nrpe.init 1152 BLAKE2B eea4c8554ef02b7eb9e602a4b0750565520dd830435586043f61534a58563eaed379f1296df5eaf68aab88440f4199354118ffbcc5b4340eda633bb3eb49092c SHA512 19f470407d63b2949535acd6e5849afbea44f82a5773f9110f8b025c380c0626a0a733ead417b1ce293741168acea5a885c2e9f94fb1c0b3e38a06e0eae4ddca
 AUX nrpe.service 242 BLAKE2B 715f0e8b91d6c40405d6d1f3689bbbf750e61e78e1d727debbe998ae81922b36f1d5f7c011f6881979e485a81c08d3f1f405b962023fecea643c8f7a9e04c3df SHA512 ffd67467cc4f5ccdf73e0860d1355a8cc3e528d0c67f2054b0ad76c02a43f9c5a8964a3f6df6f91eaa8e15c3c9596259aa964ad69aa2da60678d68fa892b2346
 AUX nrpe.xinetd.2 245 BLAKE2B 3e9db31c7d5b28dab18d2f5855d0465f25fc9cf4a70deac9a5d0c87c7cc546a33b432dbca172a49addadc0bd6583d870ec0fe350bf60e015e325d8bb923aca47 SHA512 d687cb2a5babfd28a97d3a5f1ac665758341ecc37fdd0193dbf0df4cba68c88aa24776a33a706989843fa5356b2e3e995662a823ceb2b86ba8f846f8c47e18fb
-DIST nrpe-2.15.tar.gz 419695 BLAKE2B 999ecc633cbd2dc516ff0654db3ac0cc58a88d93ae4ace1040888fe73d8fb471306d95312ac364c79b3a47300ac57c0c429a24697c37bfa639f1da55cb6bc756 SHA512 03ce9774b5112d03235dc9da075770d89d1bcc5ffa5faf221ff7ea8ec5c92ded1e1ae9222581a87cf53736d190ac047e1acce7edc2f31f26c432d786cdef0e73
 DIST nrpe-3.2.1.tar.gz 518015 BLAKE2B c9be2bf24e3d9977a7ff5c2f0e08bfe841729289af836bb7ac6ccb2c173a519958b12cc3e90ece612ac6c2527ad472ef1464be648a66b11ff8ad483d5ad78cc1 SHA512 ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856
-EBUILD nrpe-2.15-r3.ebuild 4013 BLAKE2B 6609597c36f1df0228f627a66f1a2edaf2c30c93d3f143c69ab92c2c914f1e83bbb3bfd2bdd286fdc42411b3d86ca9716609f278838849ed940aa35dc7cad9c0 SHA512 d2442384f0bea253479f06186b78f013514f6fbaddc1aea531eec6b7f0436061aab3852d4035bd61fcaa6beefa2f2724200d8845d62851ced816895aa9258179
 EBUILD nrpe-3.2.1-r1.ebuild 2486 BLAKE2B a71330ceb27dba3654f6e4923ef4e395e6f831bd2fafe23220e39cdf31aa9d3a898bec0b4ceca4a4a7fee73c76efb69207b4ddb7b264a6af4c0aae84fa2cbc19 SHA512 71e4bf9e5a6ad3f1ff1315d09b84d56b2b5772d7f0627f09c60fa6f63c81ebf1bc89e2980085efb0a9d9a54b8d98846010b5f26c66bfb863f2421cef2c6b0e79
-EBUILD nrpe-3.2.1.ebuild 1938 BLAKE2B bd00244a5585503b24b108f167345560d0b7855a8cdd1497fc4e853b86b42e4f9fb67aa1fc767ca67f5e3b1e13424828f295b0a74316c95a17ebb26dbea7aa0f SHA512 f0fa9659e5c06ad4239ede15ac5303675812db6cd06febade51c68aaa05e289ad1f206e53f78c327e918955be4e69e07b621671110044b3f1fc1d161ee36ee64
-MISC metadata.xml 882 BLAKE2B 76bf034c9869b503725f301f0f478c0449787057f1ba4bc22842ddee2d4460b68be1654cdc18e04504469880b71113e7a4b5a0a37fc9138eeb1b39fc2c8833f1 SHA512 2bbdd6bb5d0802985b242b8c058c749eca1adfb102820e2c587699622299936df90ee1ff43445df8686e1dd1648d0131bee40639ddfad3e26e9877c0c61dc40e
+EBUILD nrpe-3.2.1-r2.ebuild 2476 BLAKE2B db4b5cccb4d03a0a5521b436e1c8d2a668b6a78aa4fe5edab7660711b86c8472ea934bfdc32dd1c81c4d0437aebcc70782d155537472a6d471bac243b94c3cc8 SHA512 d6c95485ba47471893ee641d5594bc688c9991890ee6c12bf03c579b189c2babc7ef17d473ad05610622ef40e0c2c4f34963cd87bba99afb269230829eb91c2a
+MISC metadata.xml 770 BLAKE2B 93991f7ee4c1b6c26b67e873fae0cdb66170cd93ba6b79d6e798cb2605126888a996f633eccd038ece2a822d1b92498c2036746bb3a1add2e336c6026c2db86d SHA512 48693abab21581eff977b8deaa5fabc5d388960c9cd090b590a1f6d3c8d37b63fe33ec86d6f95d7435404314b84053f8c2ca84b0f33c6c7241ea7260f82a3a27
diff --git a/net-analyzer/nrpe/files/nrpe-2.14-multiline.patch b/net-analyzer/nrpe/files/nrpe-2.14-multiline.patch
deleted file mode 100644
index 3af2ef95baba..000000000000
--- a/net-analyzer/nrpe/files/nrpe-2.14-multiline.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-Add support for large output
-
-http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.htmlIndex: nrpe-2.14/include/common.h
-===================================================================
-Index: nrpe-2.14/include/common.h
-===================================================================
---- nrpe-2.14.orig/include/common.h
-+++ nrpe-2.14/include/common.h
-@@ -41,7 +41,7 @@
- #define DEFAULT_SOCKET_TIMEOUT	10	/* timeout after 10 seconds */
- #define DEFAULT_CONNECTION_TIMEOUT 300	/* timeout if daemon is waiting for connection more than this time */
- 
--#define MAX_INPUT_BUFFER	2048	/* max size of most buffers we use */
-+#define MAX_INPUT_BUFFER	16384	/* max size of most buffers we use */
- #define MAX_FILENAME_LENGTH     256
- 
- #define MAX_HOST_ADDRESS_LENGTH	256	/* max size of a host address */
-@@ -55,12 +55,14 @@
- 
- #define QUERY_PACKET		1		/* id code for a packet containing a query */
- #define	RESPONSE_PACKET		2		/* id code for a packet containing a response */
-+#define    RESPONSE_PACKET_WITH_MORE   3   /* id code for a packet containing a response, with more data to follow */
- 
- #define NRPE_PACKET_VERSION_3   3               /* packet version identifier */
- #define NRPE_PACKET_VERSION_2   2               
- #define NRPE_PACKET_VERSION_1	1		/* older packet version identifiers (no longer supported) */
- 
- #define MAX_PACKETBUFFER_LENGTH	1024		/* max amount of data we'll send in one query/response */
-+											/* WARNING - do not change this as older clients/servers will not work */
- 
- typedef struct packet_struct{
- 	int16_t   packet_version;
-Index: nrpe-2.14/src/check_nrpe.c
-===================================================================
---- nrpe-2.14.orig/src/check_nrpe.c
-+++ nrpe-2.14/src/check_nrpe.c
-@@ -221,6 +221,11 @@ int main(int argc, char **argv){
- 			return STATE_UNKNOWN;
- 		        }
- 
-+		/* Altinity patch: Allow multiple packets to be received */
-+		/* Indentation not corrected to allow simpler patching */
-+		/* START MULTI_PACKET LOOP */
-+		do {
-+
- 		/* wait for the response packet */
- 		bytes_to_recv=sizeof(receive_packet);
- 		if(use_ssl==FALSE)
-@@ -233,31 +238,24 @@ int main(int argc, char **argv){
- 		/* reset timeout */
- 		alarm(0);
- 
--		/* close the connection */
--#ifdef HAVE_SSL
--		if(use_ssl==TRUE){
--			SSL_shutdown(ssl);
--			SSL_free(ssl);
--			SSL_CTX_free(ctx);
--	                }
--#endif
--		graceful_close(sd,1000);
--
- 		/* recv() error */
- 		if(rc<0){
- 			printf("CHECK_NRPE: Error receiving data from daemon.\n");
-+			graceful_close(sd,1000);
- 			return STATE_UNKNOWN;
- 		        }
- 
- 		/* server disconnected */
- 		else if(rc==0){
- 			printf("CHECK_NRPE: Received 0 bytes from daemon.  Check the remote server logs for error messages.\n");
-+			graceful_close(sd,1000);
- 			return STATE_UNKNOWN;
- 		        }
- 
- 		/* receive underflow */
- 		else if(bytes_to_recv<sizeof(receive_packet)){
- 			printf("CHECK_NRPE: Receive underflow - only %d bytes received (%d expected).\n",bytes_to_recv,sizeof(receive_packet));
-+			graceful_close(sd,1000);
- 			return STATE_UNKNOWN;
- 		        }
- 
-@@ -271,21 +269,21 @@ int main(int argc, char **argv){
- 		calculated_crc32=calculate_crc32((char *)&receive_packet,sizeof(receive_packet));
- 		if(packet_crc32!=calculated_crc32){
- 			printf("CHECK_NRPE: Response packet had invalid CRC32.\n");
--			close(sd);
-+			graceful_close(sd,1000);
- 			return STATE_UNKNOWN;
-                         }
- 	
- 		/* check packet version */
- 		if(ntohs(receive_packet.packet_version)!=NRPE_PACKET_VERSION_2){
- 			printf("CHECK_NRPE: Invalid packet version received from server.\n");
--			close(sd);
-+			graceful_close(sd,1000);
- 			return STATE_UNKNOWN;
- 			}
- 
- 		/* check packet type */
--		if(ntohs(receive_packet.packet_type)!=RESPONSE_PACKET){
-+		if(ntohs(receive_packet.packet_type)!=RESPONSE_PACKET && ntohs(receive_packet.packet_type)!=RESPONSE_PACKET_WITH_MORE){
- 			printf("CHECK_NRPE: Invalid packet type received from server.\n");
--			close(sd);
-+			graceful_close(sd,1000);
- 			return STATE_UNKNOWN;
- 			}
- 
-@@ -297,8 +295,18 @@ int main(int argc, char **argv){
- 		if(!strcmp(receive_packet.buffer,""))
- 			printf("CHECK_NRPE: No output returned from daemon.\n");
- 		else
--			printf("%s\n",receive_packet.buffer);
--	        }
-+			printf("%s",receive_packet.buffer);
-+
-+		} while (ntohs(receive_packet.packet_type)==RESPONSE_PACKET_WITH_MORE);
-+		/* END MULTI_PACKET LOOP */
-+
-+		/* Finish output with newline */
-+		printf("\n");
-+
-+		/* close the connection */
-+		graceful_close(sd,1000);
-+
-+	}
- 
- 	/* reset the alarm */
- 	else
-@@ -434,6 +442,14 @@ int graceful_close(int sd, int timeout){
-         struct timeval tv;
-         char buf[1000];
- 
-+#ifdef HAVE_SSL
-+		if(use_ssl==TRUE){
-+			SSL_shutdown(ssl);
-+			SSL_free(ssl);
-+			SSL_CTX_free(ctx);
-+		}
-+#endif
-+
- 	/* send FIN packet */
-         shutdown(sd,SHUT_WR);  
-         for(;;){
-Index: nrpe-2.14/src/nrpe.c
-===================================================================
---- nrpe-2.14.orig/src/nrpe.c
-+++ nrpe-2.14/src/nrpe.c
-@@ -1056,6 +1056,8 @@ void handle_connection(int sock){
- 	char processed_command[MAX_INPUT_BUFFER];
- 	int result=STATE_OK;
- 	int early_timeout=FALSE;
-+	int bytes_copied=0;
-+	char *pbuffer=&buffer[0];
- 	int rc;
- 	int x;
- #ifdef DEBUG
-@@ -1272,6 +1274,14 @@ void handle_connection(int sock){
- 	if(buffer[strlen(buffer)-1]=='\n')
- 		buffer[strlen(buffer)-1]='\x0';
- 
-+	/* Altinity patch to allow multi packet responses */
-+	/* Loop not indented to allow easier patching */
-+	/* START MULTI_PACKET LOOP */
-+	do {
-+
-+		if(debug==TRUE)
-+			syslog(LOG_DEBUG,"Sending response - bytes left: %d", strlen(pbuffer));
-+
- 	/* clear the response packet buffer */
- 	bzero(&send_packet,sizeof(send_packet));
- 
-@@ -1280,11 +1290,17 @@ void handle_connection(int sock){
- 
- 	/* initialize response packet data */
- 	send_packet.packet_version=(int16_t)htons(NRPE_PACKET_VERSION_2);
--	send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET);
- 	send_packet.result_code=(int16_t)htons(result);
--	strncpy(&send_packet.buffer[0],buffer,MAX_PACKETBUFFER_LENGTH);
-+	strncpy(&send_packet.buffer[0],pbuffer,MAX_PACKETBUFFER_LENGTH);
- 	send_packet.buffer[MAX_PACKETBUFFER_LENGTH-1]='\x0';
--	
-+
-+	bytes_copied = strlen(&send_packet.buffer[0]);
-+	pbuffer = pbuffer+bytes_copied;
-+	if(strlen(pbuffer)>0)
-+		send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET_WITH_MORE);
-+	else
-+		send_packet.packet_type=(int16_t)htons(RESPONSE_PACKET);
-+
- 	/* calculate the crc 32 value of the packet */
- 	send_packet.crc32_value=(u_int32_t)0L;
- 	calculated_crc32=calculate_crc32((char *)&send_packet,sizeof(send_packet));
-@@ -1303,6 +1319,9 @@ void handle_connection(int sock){
- 		SSL_write(ssl,&send_packet,bytes_to_send);
- #endif
- 
-+	} while (strlen(pbuffer) > 0);
-+	/* END MULTI_PACKET LOOP */
-+
- #ifdef HAVE_SSL
- 	if(ssl){
- 		complete_SSL_shutdown( ssl);
diff --git a/net-analyzer/nrpe/files/nrpe-2.15-autoconf-header.patch b/net-analyzer/nrpe/files/nrpe-2.15-autoconf-header.patch
deleted file mode 100644
index 81078c449713..000000000000
--- a/net-analyzer/nrpe/files/nrpe-2.15-autoconf-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nuar --exclude '*.orig' nrpe-2.15.orig/configure.in nrpe-2.15/configure.in
---- nrpe-2.15.orig/configure.in	2013-09-06 08:27:13.000000000 -0700
-+++ nrpe-2.15/configure.in	2014-04-19 09:32:52.251766643 -0700
-@@ -6,7 +6,8 @@
- 
- AC_INIT([nrpe],[2.15],[nagios-users@lists.sourceforge.net],[nrpe],[http://www.nagios.org])
- AC_CONFIG_SRCDIR([src/nrpe.c])
--AC_CONFIG_HEADERS([include/config.h])
-+AC_CONFIG_HEADERS([include/autoconf.h])
- AC_CONFIG_FILES([Makefile
-+	include/config.h
- 	subst
- 	src/Makefile
-diff -Nuar --exclude '*.orig' nrpe-2.15.orig/include/config.h.in nrpe-2.15/include/config.h.in
---- nrpe-2.15.orig/include/config.h.in	2013-09-06 08:27:13.000000000 -0700
-+++ nrpe-2.15/include/config.h.in	2014-04-19 09:33:07.620035056 -0700
-@@ -26,6 +26,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include "autoconf.h"
- 
- 
- #define DEFAULT_SERVER_PORT	@nrpe_port@	/* default port to use */
diff --git a/net-analyzer/nrpe/files/nrpe-2.15-metachar-security-fix.patch b/net-analyzer/nrpe/files/nrpe-2.15-metachar-security-fix.patch
deleted file mode 100644
index c42f8bfdec00..000000000000
--- a/net-analyzer/nrpe/files/nrpe-2.15-metachar-security-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Disallow all control characters in argument handling.
-
-This closes a security hole that allowed passing commands via the argument
-handling, if a newline was used to seperate the argument from the rest of the
-command.
-
-X-URL: http://www.exploit-db.com/exploits/32925/
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
---
-I didn't find any patches from upstream NRPE, so I wrote this quick one.
-If somebody else has a valid use for control characters in NRPE arguments, then
-this could be relaxed slightly.
-
-diff -Nuar --exclude '*.orig' nrpe-2.15.orig/src/nrpe.c nrpe-2.15/src/nrpe.c
---- nrpe-2.15.orig/src/nrpe.c	2014-04-19 09:37:16.022373910 -0700
-+++ nrpe-2.15/src/nrpe.c	2014-04-19 09:46:53.237458939 -0700
-@@ -53,7 +53,7 @@
- 
- #define DEFAULT_COMMAND_TIMEOUT	60			/* default timeout for execution of plugins */
- #define MAXFD                   64
--#define NASTY_METACHARS         "|`&><'\"\\[]{};"
-+#define NASTY_METACHARS         "|`&><'\"\\[]{};\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x7f"
- #define howmany(x,y)	(((x)+((y)-1))/(y))
- #define MAX_LISTEN_SOCKS        16
- 
diff --git a/net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch b/net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch
deleted file mode 100644
index 3b3fc135455f..000000000000
--- a/net-analyzer/nrpe/files/nrpe-2.15-no-ssl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Without this patch, you can't build nrpe without SSL support. It was
-originally submitted on the Nagios forums by user Matthew L. Daniel:
-
-  https://support.nagios.com/forum/viewtopic.php?t=27027
-
-It was merged into the upstream github repo (NagiosEnterprises/nrpe)
-in commit 3736fdeeac11a.
-
-
-diff --git a/src/nrpe.c b/src/nrpe.c
-index 4bc849b..1e55ab4 100644
---- a/src/nrpe.c
-+++ b/src/nrpe.c
-@@ -102,7 +102,9 @@ int     use_src=FALSE; /* Define parameter for SRC option */
- int		listen_queue_size=DEFAULT_LISTEN_QUEUE_SIZE;
- 
- 
-+#ifdef HAVE_SSL
- void complete_SSL_shutdown( SSL *);
-+#endif
- 
- 
- int main(int argc, char **argv){
-@@ -1815,6 +1817,7 @@ int remove_pid_file(void){
- 	return OK;
-         }
- 
-+#ifdef HAVE_SSL
- void complete_SSL_shutdown( SSL *ssl) {
- 
- 	/*  
-@@ -1835,6 +1838,7 @@ void complete_SSL_shutdown( SSL *ssl) {
- 		if( SSL_shutdown( ssl)) break;
- 	}
- }
-+#endif/*HAVE_SSL*/
- 
- /* bail if daemon is running as root */
- int check_privileges(void){
diff --git a/net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch b/net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch
deleted file mode 100644
index b8a0811b831c..000000000000
--- a/net-analyzer/nrpe/files/nrpe-2.15-tcpd-et-al.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Nuar --exclude '*.orig' nrpe-2.15.orig/configure.in nrpe-2.15/configure.in
---- nrpe-2.15.orig/configure.in	2013-09-06 08:27:13.000000000 -0700
-+++ nrpe-2.15/configure.in	2014-04-19 09:20:50.406150828 -0700
-@@ -45,7 +45,7 @@
- AC_HEADER_STDC
- AC_HEADER_TIME
- AC_HEADER_SYS_WAIT
--AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h signal.h stdint.h strings.h string.h syslog.h tcpd.h unistd.h arpa/inet.h netinet/in.h socket.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h)
-+AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h getopt.h grp.h inttypes.h netdb.h pwd.h signal.h stdint.h strings.h string.h syslog.h unistd.h arpa/inet.h netinet/in.h socket.h sys/types.h sys/time.h sys/resource.h sys/wait.h sys/socket.h sys/stat.h)
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-@@ -164,11 +164,20 @@
- AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl")
- AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket")
- AC_SUBST(SOCKETLIBS)
--AC_CHECK_LIB(wrap,main,[
--	LIBWRAPLIBS="$LIBWRAPLIBS -lwrap"
-+
-+AC_ARG_ENABLE([tcp-wrapper],
-+    AS_HELP_STRING([--disable-tcp-wrapper], [Disable building with TCP wrappers. *** DISABLING IS A SECURITY RISK! *** Read the SECURITY file before using this option! @<:@default=enable@:>@]))
-+
-+LIBWRAPLIBS=""
-+AS_IF([test "x$enable_tcp_wrapper" != "xno"], [
-+    AC_CHECK_LIB([wrap],[hosts_access],[
-+        LIBWRAPLIBS="$LIBWRAPLIBS -lwrap"
- 	AC_DEFINE(HAVE_LIBWRAP,[1],[Have the TCP wrappers library])
--	])
-+	AC_DEFINE(HAVE_TCPD_H,[1],[Have the TCP wrappers library])
-+    ])
-+])
- AC_SUBST(LIBWRAPLIBS)
-+
- AC_CHECK_FUNCS(strdup strstr strtoul initgroups closesocket)
- 
- dnl socklen_t check - from curl
-@@ -440,8 +449,11 @@
- AC_SUBST(TARGET_PLATFORM)
- 
- AC_ARG_ENABLE([command-args],
--	AS_HELP_STRING([--enable-command-args],[allows clients to specify command arguments.  *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!]),
--	AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS,[1],[Enable command-line arguments]))
-+	AS_HELP_STRING([--enable-command-args],[allows clients to specify command arguments.  *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!]))
-+
-+AS_IF([test "x$enable_command_args" = "xyes"], [
-+	AC_DEFINE(ENABLE_COMMAND_ARGUMENTS,[1],[Enable command-line arguments])
-+])
- 
- AC_ARG_ENABLE([bash-command-substitution],
- 	AS_HELP_STRING([--enable-bash-command-substitution],[allows clients to pass bash command substitutions of the form $(command).  *** THIS IS A HIGH SECURITY RISK! *** Read the SECURITY file before using this option!]),
diff --git a/net-analyzer/nrpe/metadata.xml b/net-analyzer/nrpe/metadata.xml
index e47fd6fd83c9..6d48b12e1abf 100644
--- a/net-analyzer/nrpe/metadata.xml
+++ b/net-analyzer/nrpe/metadata.xml
@@ -15,9 +15,6 @@
       Nagios/Icinga master. Make sure you understand the implications
       of this flag as it can be a security risk.
     </flag>
-    <flag name="minimal">
-      Only build the check plugins for Nagios/Icinga, and not the daemon.
-    </flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">nagios</remote-id>
diff --git a/net-analyzer/nrpe/nrpe-2.15-r3.ebuild b/net-analyzer/nrpe/nrpe-2.15-r3.ebuild
deleted file mode 100644
index afdbdc893c41..000000000000
--- a/net-analyzer/nrpe/nrpe-2.15-r3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd toolchain-funcs multilib user autotools
-
-DESCRIPTION="Nagios Remote Plugin Executor"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="command-args libressl minimal selinux ssl tcpd"
-
-DEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	!minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )"
-RDEPEND="${DEPEND}
-	!minimal? (
-		|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
-	)
-	selinux? ( sec-policy/selinux-nagios )"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /dev/null nagios
-
-	elog "If you plan to use \"nrpe_check_control\" then you may want to specify"
-	elog "different command and services files. You can override the defaults"
-	elog "through the \"NAGIOS_COMMAND_FILE\" and \"NAGIOS_SERVICES_FILE\" environment variables."
-	elog "NAGIOS_COMMAND_FILE=${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}"
-	elog "NAGIOS_SERVICES_FILE=${NAGIOS_SERVICES_FILE:-/etc/services.cfg}"
-}
-
-src_prepare() {
-	# Add support for large output,
-	# http://opsview-blog.opsera.com/dotorg/2008/08/enhancing-nrpe.html
-	epatch "${FILESDIR}"/${PN}-2.14-multiline.patch
-
-	# fix configure, among others #326367, #397603
-	epatch "${FILESDIR}"/${PN}-2.15-tcpd-et-al.patch
-
-	# otherwise autoconf will overwrite the custom include/config.h.in
-	epatch "${FILESDIR}"/${PN}-2.15-autoconf-header.patch
-
-	# improve handling of metachars for security
-	epatch "${FILESDIR}"/${PN}-2.15-metachar-security-fix.patch
-
-	# Fix build with USE="-ssl".
-	epatch "${FILESDIR}"/${PN}-2.15-no-ssl.patch
-
-	sed -i -e '/define \(COMMAND\|SERVICES\)_FILE/d' \
-		contrib/nrpe_check_control.c || die
-
-	# change the default location of the pid file
-	sed -i -e '/pid_file/s:/var/run:/run:' sample-config/nrpe.cfg.in || die
-
-	# fix TFU handling of autoheader
-	sed -i -e '/#undef/d' include/config.h.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use minimal; then
-		myconf="--disable-tcp-wrapper --disable-command-args"
-	else
-		myconf="$(use_enable tcpd tcp-wrapper) $(use_enable command-args)"
-	fi
-
-	econf \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--with-nrpe-user=nagios \
-		--with-nrpe-group=nagios \
-		$(use_enable ssl) \
-		${myconf}
-}
-
-src_compile() {
-	emake -C src check_nrpe $(use minimal || echo nrpe)
-
-	# Add nifty nrpe check tool
-	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} \
-		-DCOMMAND_FILE=\"${NAGIOS_COMMAND_FILE:-/var/rw/nagios.cmd}\" \
-		-DSERVICES_FILE=\"${NAGIOS_SERVICES_FILE:-/etc/services.cfg}\" \
-		${LDFLAGS} -o nrpe_check_control contrib/nrpe_check_control.c || die
-}
-
-src_install() {
-	dodoc LEGAL Changelog README SECURITY \
-		contrib/README.nrpe_check_control \
-		$(use ssl && echo README.SSL)
-
-	exeinto /usr/$(get_libdir)/nagios/plugins
-	doexe src/check_nrpe nrpe_check_control
-
-	use minimal && return 0
-
-	## NON-MINIMAL INSTALL FOLLOWS ##
-
-	insinto /etc/nagios
-	newins sample-config/nrpe.cfg nrpe.cfg
-	fowners root:nagios /etc/nagios/nrpe.cfg
-	fperms 0640 /etc/nagios/nrpe.cfg
-
-	exeinto /usr/libexec
-	doexe src/nrpe
-
-	newinitd "${FILESDIR}"/nrpe.init nrpe
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/xinetd.d/
-	newins "${FILESDIR}/nrpe.xinetd.2" nrpe
-
-	if use tcpd; then
-		sed -i -e '/^reload()/, /^}/ d' -e '/extra_started_commands/s:reload::' \
-			"${D}"/etc/init.d/nrpe
-	fi
-}
-
-pkg_postinst() {
-	elog "If you are using the nrpe daemon, remember to edit"
-	elog "the config file /etc/nagios/nrpe.cfg"
-
-	if use command-args ; then
-		ewarn ""
-		ewarn "You have enabled command-args for NRPE. This enables"
-		ewarn "the ability for clients to supply arguments to commands"
-		ewarn "which should be run. "
-		ewarn "THIS IS CONSIDERED A SECURITY RISK!"
-		ewarn "Please read /usr/share/doc/${PF}/SECURITY.bz2 for more info"
-	fi
-}
diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r2.ebuild b/net-analyzer/nrpe/nrpe-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..430050c49b14
--- /dev/null
+++ b/net-analyzer/nrpe/nrpe-3.2.1-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user
+
+DESCRIPTION="Nagios Remote Plugin Executor"
+HOMEPAGE="https://github.com/NagiosEnterprises/nrpe"
+SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="command-args libressl selinux ssl"
+
+DEPEND="sys-apps/tcp-wrappers
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+RDEPEND="${DEPEND}
+	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
+	selinux? ( sec-policy/selinux-nagios )"
+
+PATCHES=( "${FILESDIR}/nrpe-3.2.1-eliminate-systemd-pid.patch" )
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 -1 -1 nagios
+}
+
+src_configure() {
+	# The configure script tries to detect what OS, distribution, and
+	# init system you're running and changes the build/install process
+	# depending on what it comes up with. We specify fixed values
+	# because we don't want it guessing, for example, whether or not
+	# to install the tmpfiles.d entry based on whether or not systemd
+	# is currently running (OpenRC uses them too).
+	econf \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		--localstatedir=/var/lib/nagios \
+		--sysconfdir=/etc/nagios \
+		--with-nrpe-user=nagios \
+		--with-nrpe-group=nagios \
+		--with-piddir=/run \
+		--with-opsys=unknown \
+		--with-dist-type=unknown \
+		--with-init-type=unknown \
+		--with-inetd-type=unknown \
+		$(use_enable command-args) \
+		$(use_enable ssl)
+}
+
+src_compile() {
+	emake all
+}
+
+src_install() {
+	default
+
+	dodoc CHANGELOG.md SECURITY.md
+	insinto /etc/nagios
+	newins sample-config/nrpe.cfg nrpe.cfg
+	fowners root:nagios /etc/nagios/nrpe.cfg
+	fperms 0640 /etc/nagios/nrpe.cfg
+
+	newinitd "startup/openrc-init" nrpe
+	newconfd "startup/openrc-conf" nrpe
+	systemd_newunit "startup/default-service" "${PN}.service"
+
+	insinto /etc/xinetd.d/
+	newins "${FILESDIR}/nrpe.xinetd.2" nrpe
+
+	rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool'
+}
+
+pkg_postinst(){
+	elog 'Some users have reported incompatibilities between nrpe-2.x and'
+	elog 'nrpe-3.x. We recommend that you use the same major version for'
+	elog 'both your server and clients.'
+
+	if use command-args ; then
+		ewarn ''
+		ewarn 'You have enabled command-args for NRPE. That lets clients'
+		ewarn 'supply arguments to the commands that are run, and IS A'
+		ewarn 'SECURITY RISK!'
+		ewarn''
+	fi
+}
diff --git a/net-analyzer/nrpe/nrpe-3.2.1.ebuild b/net-analyzer/nrpe/nrpe-3.2.1.ebuild
deleted file mode 100644
index 3a4f9d8d2513..000000000000
--- a/net-analyzer/nrpe/nrpe-3.2.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-DESCRIPTION="Nagios Remote Plugin Executor"
-HOMEPAGE="https://github.com/NagiosEnterprises/nrpe"
-SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="command-args libressl selinux ssl"
-
-DEPEND="sys-apps/tcp-wrappers
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-RDEPEND="${DEPEND}
-	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
-	selinux? ( sec-policy/selinux-nagios )"
-
-pkg_setup() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_configure() {
-	econf \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--with-nrpe-user=nagios \
-		--with-nrpe-group=nagios \
-		--with-piddir=/run \
-		$(use_enable command-args) \
-		$(use_enable ssl)
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	default
-
-	dodoc CHANGELOG.md SECURITY.md
-	insinto /etc/nagios
-	newins sample-config/nrpe.cfg nrpe.cfg
-	fowners root:nagios /etc/nagios/nrpe.cfg
-	fperms 0640 /etc/nagios/nrpe.cfg
-
-	newinitd "startup/openrc-init" nrpe
-	newconfd "startup/openrc-conf" nrpe
-	systemd_newunit "startup/default-service" "${PN}.service"
-
-	insinto /etc/xinetd.d/
-	newins "${FILESDIR}/nrpe.xinetd.2" nrpe
-
-	rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool'
-}
-
-pkg_postinst(){
-	elog 'Some users have reported incompatibilities between nrpe-2.x and'
-	elog 'nrpe-3.x. We recommend that you use the same major version for'
-	elog 'both your server and clients.'
-
-	if use command-args ; then
-		ewarn ''
-		ewarn 'You have enabled command-args for NRPE. That lets clients'
-		ewarn 'supply arguments to the commands that are run, and IS A'
-		ewarn 'SECURITY RISK!'
-		ewarn''
-	fi
-}
diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest
index abd651f28691..a71221525b18 100644
--- a/net-analyzer/ntopng/Manifest
+++ b/net-analyzer/ntopng/Manifest
@@ -4,10 +4,16 @@ AUX ntopng-2.4-mysqltool.patch 430 BLAKE2B 052163786435b54d527e01a9e13fc385795f6
 AUX ntopng-3.0-gentoo.patch 1596 BLAKE2B 36349887ae8f418a0db67d8a96d33785fe5ec4875a987fa9b837857b1cbbdcaa802d2c5b2524b6edeb8cda5aaeec69102f4facd177d43bc321ed50de62135728 SHA512 fcab6670255d7c756694091d6b53a7880a74e8840fa8f77ec81b072dbe7c7a5ec5b4550892dc78c45304ee437a309fe8c79293f6205c570685b8f13178c1c306
 AUX ntopng-3.0-mysqltool.patch 430 BLAKE2B 94410cdac37f6d35b4c6b0f90c3391f79d36242932af2ab520a8db3057b37b3d059fd708e0af930bf8321babadade61621f79f77ac55581ebe46555e6cd9e6c6 SHA512 82b06a14f471bd037743a7563a80d6460e63ff262252d0318e40ba25bf8da849bc0394a5fa4d54befd5df6bd4b645b86711708198f8971d54eb15e8f32c83cd5
 AUX ntopng-3.0-pointer-cmp.patch 340 BLAKE2B 2b361ac6fc25857125b192fab11cb1c060bef6fb220386ffaf5b3df68ee5f52e173fc63e3a70175d746df52ae258bb2fd01ab6b3888ccfd320700083540ab0e7 SHA512 30e0137046c5612d627c3efb7a17b303a04144e63dc14e3ffd393cd87444b623af6430a6520181e5cf3fef5e89e51594c9700306bba1ffea2a9e6795e7c5e861
+AUX ntopng-3.8-missing-min.patch 567 BLAKE2B 06cff6608d9d8d2fb2312aef0075d53f2e1c19f6294bc47f2b26b6aa27d078edfc78b16142ea13c3e6a679ba541dcb2185b82af4969e621454fa97566a68e6e5 SHA512 567cea5b632b9a2d405cfb8058ef1ec204506084286ba4d7e86b64939a0ab7b3bd1204473a194ab7cf16195e76abcd4b77a05c20b1516cdbc59f431feb5cec16
+AUX ntopng-3.8-mysqltool.patch 437 BLAKE2B 13df7c163168b59917843a2c7dee13f41c6d3b95e16a0967c849771dbb552c72f1d5e8d16dd76ed6b51c149a1143707d432761abd907bec3d7b6257a099debca SHA512 f13a6d529e2e2d659763c2ec013ebdb61f3b741d242f375345e60e66d7cf4adeefdff6876d3a15497fc9b2f1966268665e550719f7bd86ca1b44252f459c9029
+AUX ntopng-3.8-ndpi-call.patch 507 BLAKE2B b08c95e8a35c7372b1fc56bf59a50a8ba22091e86051ea2843f6833b41faaa0022d79e462f9755c3234bd3641facbec7a6a2689eb5ee66ee3b4b3df6abcaf29c SHA512 88c3fc0b3f82fda730e614c85a3366392a557140122d98d21e9dc24b2e43123d557636206e18f09117dccb9c1da8a1ccce49293d2261f00f78e3b1523f70ba0e
+AUX ntopng-3.8-ndpi-includes.patch 528 BLAKE2B c8a874f83aae75b0691ea9c9eeaaaeaac021de9f2e1d7a1bc1024acf927c36449d13df022ea6df5c2f09af68628aee5adef9039db5f7a3d6aa36da6c9d7924fa SHA512 593923665752322207bde864850bdfca7d1f75ea1270f1abd514b648f0fe6a539f4925837bebf433a3ffc82ae60edaafeaeaca2e19a58e87459e6caea245e59b
 AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061
 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84
 DIST ntopng-2.4.tar.gz 134074662 BLAKE2B dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
 DIST ntopng-3.0.tar.gz 23017655 BLAKE2B f791690118a5ecfb1be5ad791229f2438354a0c2271350aa1a2f0fee05886c54d181a669e6e1b27657c5bfe4b68db24b06d91adfb89e803a154a7a4bbff146b7 SHA512 d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1
-EBUILD ntopng-2.4.ebuild 1724 BLAKE2B bfa8ed23ce2b4a5e7b0de83cda74a0211f89868e718cfe027f4c282db9e939b5efd6b48dd8d68cef4714dd238e8126e2a5716cdc939f04511599abaa5b7e2a0d SHA512 4c0298162c77666ee7ec2b3fa139468f5fc61e25baef6f7a55f5057dee1238e951e6d6b6ab7b824e31791172912bd106ae28ccafcf42fd89622676400a8132b1
-EBUILD ntopng-3.0-r3.ebuild 1631 BLAKE2B b77cffb6554e04821db246fe2bfb1ba0468a63a5b456b6bde71c5c36886173b78d00c0fe46359ce90fbe66ce96a12bfcb2d607eef778f6c230abf5769e44f228 SHA512 892942a332dfce2bca02e8ace13fea7da75089c0ca0b8e68b5e2b7294d51a3f8f375cf7acffd0a34e26a177cb6e232153b7b50350b2e457f6beba3f2a6239c60
+DIST ntopng-3.8.tar.gz 33910329 BLAKE2B a5aaed2244516b92e4b8c7364817ea66eb2f446fe814a96622cbbf5d851d79e8049b75da009d0f80f07c1fae90f8dc294794b76ed14450d8e0e6685a1b1ce8f2 SHA512 2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f
+EBUILD ntopng-2.4-r1.ebuild 1713 BLAKE2B 412ffa5d8596bf4f2d5701864cc12a542c13442c99c3652d8df3790f0aec24b2d8f3d151c7b560d492c2f74ba6dc1b1b24358cb7e9b22ee26d89ca14032108b5 SHA512 a5a42e0f4de1feefd5cfc8c407b375ce9b5587568de90f5fbc2e4c3f53c08df6f645e5abd95eddd6edb136f519bf3b56b8107298e0fb6e126d0f9bc286946a15
+EBUILD ntopng-3.0-r4.ebuild 1622 BLAKE2B 1db14760398455995b4584065665032b2304d0e5699001e9ee7727bb0cf31272422e8de56b9aa5ec1778d27419f60ad38008b248114fbd49781229de38ac546e SHA512 e2591cd2c833021f08e45c5ae24843deef9ca7d745e68462618592a2205df3e341c76361bc9046d8d0797d515b099f2139e889bc4caa5a1f42996ed6154dffa2
+EBUILD ntopng-3.8.ebuild 1727 BLAKE2B c95da883fdd8b8e9828345248d8dea86f7a326e799e1ec413e06f32eeb620efc45a20ab93a7c005307c5877ef5285a368db4dc1fa9b15c7c480e5775c15ea3f6 SHA512 3a04bfdf57bec06b39a470692a319f38d9204a0e88e63b4a02b16c2da5caf16a0639a8ced42a4f1de42e3651ea657a5b22eb4674180049c3cafcae89eb56fb39
 MISC metadata.xml 299 BLAKE2B 466c255eb9dd221bc91a9308a7ad2d4032c96072f96220d56f78f8c2e9f79392a83603e7bd3a78e4bfa32bd61b04351261ccc86dc82ca9d834c2afc73724ed19 SHA512 5c8e5b8f97b306a059913e2adc9e02137502ec35da1a753a2b9af4d4c67c0af0f0266c14acdd488c89bb96da3cc0464512de05ce389055d35bc6a0feab7ac996
diff --git a/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch b/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch
new file mode 100644
index 000000000000..303826a918df
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch
@@ -0,0 +1,19 @@
+--- a/third-party/zeromq-4.1.3/src/tcp_connecter.cpp
++++ b/third-party/zeromq-4.1.3/src/tcp_connecter.cpp
+@@ -31,6 +31,7 @@
+ 
+ #include <new>
+ #include <string>
++#include <algorithm>
+ 
+ #include "tcp_connecter.hpp"
+ #include "stream_engine.hpp"
+@@ -207,7 +208,7 @@
+         options.reconnect_ivl_max > options.reconnect_ivl)
+         //  Calculate the next interval
+         current_reconnect_ivl =
+-            min (current_reconnect_ivl * 2, options.reconnect_ivl_max);
++	  std::min(current_reconnect_ivl * 2, options.reconnect_ivl_max);
+     return interval;
+ }
+ 
diff --git a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch
new file mode 100644
index 000000000000..62c328a3505e
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch
@@ -0,0 +1,17 @@
+--- a/configure.seed
++++ b/configure.seed
+@@ -355,13 +355,7 @@
+  if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then
+    MYSQLTOOL="mariadb_config"
+  else
+-   PATH=$PATH:/usr/local/mysql/bin
+-   AC_CHECK_TOOL(MYSQL, mysql_config)
+-   if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then
+-     MYSQLTOOL="mysql_config"
+-   else
+-     MYSQLTOOL=""
+-   fi
++   MYSQLTOOL="mysql_config"
+  fi
+ 
+ if test -n "$MYSQLTOOL"; then
diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch
new file mode 100644
index 000000000000..1308a5c2c03f
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch
@@ -0,0 +1,12 @@
+--- a/src/NetworkInterface.cpp
++++ b/src/NetworkInterface.cpp
+@@ -1604,7 +1604,8 @@
+ 	  ndpi_protocol icmp_proto = flow->get_detected_protocol();
+ 
+ 	  if(icmp_proto.category == NDPI_PROTOCOL_CATEGORY_UNSPECIFIED) {
+-	    ndpi_fill_ip_protocol_category(ndpi_struct, (struct ndpi_iphdr *)ip, &icmp_proto);
++	    ndpi_fill_ip_protocol_category(ndpi_struct, ((struct ndpi_iphdr *)ip)->saddr,
++					   ((struct ndpi_iphdr*)ip)->daddr, &icmp_proto);
+ 	    flow->setDetectedProtocol(icmp_proto, false);
+ 	  }
+ 	}
diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
new file mode 100644
index 000000000000..068f1e9fa9b9
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch
@@ -0,0 +1,14 @@
+--- a/configure.seed	2018-10-08 21:33:09.403001834 -0600
++++ b/configure.seed	2018-10-08 21:35:47.404002203 -0600
+@@ -129,9 +129,9 @@
+ fi
+ 
+ PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [
+-   NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`/libndpi
++   NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`
+    # Use static libndpi library as building against the dynamic library fails
+-   NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic"
++   NDPI_LIB="$NDPI_LIBS"
+    NDPI_LIB_DEP=
+    ], [
+       AC_MSG_CHECKING(for nDPI source)
diff --git a/net-analyzer/ntopng/ntopng-2.4-r1.ebuild b/net-analyzer/ntopng/ntopng-2.4-r1.ebuild
new file mode 100644
index 000000000000..3e53ff545180
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-2.4-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils user toolchain-funcs
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="https://www.ntop.org/"
+SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-db/sqlite:3
+	dev-python/pyzmq
+	dev-lang/luajit:2
+	dev-libs/json-c:=
+	dev-libs/geoip
+	dev-libs/glib:2
+	dev-libs/hiredis
+	dev-libs/libxml2
+	net-analyzer/rrdtool
+	net-libs/libpcap
+	net-misc/curl
+	dev-db/mysql-connector-c
+	!net-libs/nDPI"
+RDEPEND="${DEPEND}
+	dev-db/redis"
+
+S="${WORKDIR}/${P}-stable"
+
+src_prepare() {
+	cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed "s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac"
+	epatch "${FILESDIR}/${P}-dont-build-ndpi.patch"
+	epatch "${FILESDIR}/${P}-mysqltool.patch"
+	epatch "${FILESDIR}/${P}-cxx.patch"
+	sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac"
+	eautoreconf
+
+	cd "${S}/nDPI"
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG
+	cd "${S}/nDPI"
+	econf
+	cd "${S}"
+	econf
+}
+
+src_compile() {
+	cd "${S}/nDPI"
+	emake
+
+	cd "${S}"
+	emake
+}
+
+src_install() {
+	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+	dodir ${SHARE_NTOPNG_DIR}
+	insinto ${SHARE_NTOPNG_DIR}
+	doins -r httpdocs
+	doins -r scripts
+
+	exeinto /usr/bin
+	doexe ${PN}
+	doman ${PN}.8
+
+	newinitd "${FILESDIR}/ntopng.init.d" ntopng
+	newconfd "${FILESDIR}/ntopng.conf.d" ntopng
+
+	dodir "/var/lib/ntopng"
+	fowners ntopng "/var/lib/ntopng"
+}
+
+pkg_setup() {
+	enewuser ntopng
+}
+
+pkg_postinst() {
+	elog "ntopng default creadential are user='admin' password='admin'"
+}
diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild b/net-analyzer/ntopng/ntopng-2.4.ebuild
deleted file mode 100644
index d024ad1f63db..000000000000
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils user toolchain-funcs
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-db/sqlite:3
-	dev-python/pyzmq
-	dev-lang/luajit:2
-	dev-libs/json-c:=
-	dev-libs/geoip
-	dev-libs/glib:2
-	dev-libs/hiredis
-	dev-libs/libxml2
-	net-analyzer/rrdtool
-	net-libs/libpcap
-	net-misc/curl
-	virtual/libmysqlclient
-	!net-libs/nDPI"
-RDEPEND="${DEPEND}
-	dev-db/redis"
-
-S="${WORKDIR}/${P}-stable"
-
-src_prepare() {
-	cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed "s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac"
-	epatch "${FILESDIR}/${P}-dont-build-ndpi.patch"
-	epatch "${FILESDIR}/${P}-mysqltool.patch"
-	epatch "${FILESDIR}/${P}-cxx.patch"
-	sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac"
-	eautoreconf
-
-	cd "${S}/nDPI"
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG
-	cd "${S}/nDPI"
-	econf
-	cd "${S}"
-	econf
-}
-
-src_compile() {
-	cd "${S}/nDPI"
-	emake
-
-	cd "${S}"
-	emake
-}
-
-src_install() {
-	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
-	dodir ${SHARE_NTOPNG_DIR}
-	insinto ${SHARE_NTOPNG_DIR}
-	doins -r httpdocs
-	doins -r scripts
-
-	exeinto /usr/bin
-	doexe ${PN}
-	doman ${PN}.8
-
-	newinitd "${FILESDIR}/ntopng.init.d" ntopng
-	newconfd "${FILESDIR}/ntopng.conf.d" ntopng
-
-	dodir "/var/lib/ntopng"
-	fowners ntopng "${EPREFIX}/var/lib/ntopng"
-}
-
-pkg_setup() {
-	enewuser ntopng
-}
-
-pkg_postinst() {
-	elog "ntopng default creadential are user='admin' password='admin'"
-}
diff --git a/net-analyzer/ntopng/ntopng-3.0-r3.ebuild b/net-analyzer/ntopng/ntopng-3.0-r3.ebuild
deleted file mode 100644
index 18736380ba1b..000000000000
--- a/net-analyzer/ntopng/ntopng-3.0-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools user toolchain-funcs
-
-DESCRIPTION="Network traffic analyzer with web interface"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-db/sqlite:3
-	dev-python/pyzmq
-	dev-lang/luajit:2
-	dev-libs/json-c:=
-	dev-libs/geoip
-	dev-libs/glib:2
-	dev-libs/hiredis
-	dev-libs/libsodium:=
-	dev-libs/libxml2
-	net-analyzer/rrdtool
-	net-libs/libpcap
-	=net-libs/nDPI-2.0
-	net-misc/curl
-	sys-libs/binutils-libs:=
-	virtual/libmysqlclient"
-RDEPEND="${DEPEND}
-	dev-db/redis"
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-mysqltool.patch
-	"${FILESDIR}"/${P}-pointer-cmp.patch
-)
-
-src_prepare() {
-	sed -e "s/@VERSION@/${PV}/g;s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die
-
-	default
-
-	eautoreconf
-}
-
-src_install() {
-	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
-	dodir ${SHARE_NTOPNG_DIR}
-	insinto ${SHARE_NTOPNG_DIR}
-	doins -r httpdocs
-	doins -r scripts
-
-	dodir ${SHARE_NTOPNG_DIR}/third-party
-	insinto ${SHARE_NTOPNG_DIR}/third-party
-	doins -r third-party/i18n.lua-master
-	doins -r third-party/lua-resty-template-master
-
-	exeinto /usr/bin
-	doexe ${PN}
-	doman ${PN}.8
-
-	newinitd "${FILESDIR}/ntopng.init.d" ntopng
-	newconfd "${FILESDIR}/ntopng.conf.d" ntopng
-
-	dodir "/var/lib/ntopng"
-	fowners ntopng "${EPREFIX}/var/lib/ntopng"
-}
-
-pkg_setup() {
-	enewuser ntopng
-}
-
-pkg_postinst() {
-	elog "ntopng default credentials are user='admin' password='admin'"
-}
diff --git a/net-analyzer/ntopng/ntopng-3.0-r4.ebuild b/net-analyzer/ntopng/ntopng-3.0-r4.ebuild
new file mode 100644
index 000000000000..2a126bff0473
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-3.0-r4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools user toolchain-funcs
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="https://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-db/sqlite:3
+	dev-python/pyzmq
+	dev-lang/luajit:2
+	dev-libs/json-c:=
+	dev-libs/geoip
+	dev-libs/glib:2
+	dev-libs/hiredis
+	dev-libs/libsodium:=
+	dev-libs/libxml2
+	net-analyzer/rrdtool
+	net-libs/libpcap
+	=net-libs/nDPI-2.0
+	net-misc/curl
+	sys-libs/binutils-libs:=
+	dev-db/mysql-connector-c:="
+RDEPEND="${DEPEND}
+	dev-db/redis"
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-mysqltool.patch
+	"${FILESDIR}"/${P}-pointer-cmp.patch
+)
+
+src_prepare() {
+	sed -e "s/@VERSION@/${PV}/g;s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die
+
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+	dodir ${SHARE_NTOPNG_DIR}
+	insinto ${SHARE_NTOPNG_DIR}
+	doins -r httpdocs
+	doins -r scripts
+
+	dodir ${SHARE_NTOPNG_DIR}/third-party
+	insinto ${SHARE_NTOPNG_DIR}/third-party
+	doins -r third-party/i18n.lua-master
+	doins -r third-party/lua-resty-template-master
+
+	exeinto /usr/bin
+	doexe ${PN}
+	doman ${PN}.8
+
+	newinitd "${FILESDIR}/ntopng.init.d" ntopng
+	newconfd "${FILESDIR}/ntopng.conf.d" ntopng
+
+	dodir "/var/lib/ntopng"
+	fowners ntopng "/var/lib/ntopng"
+}
+
+pkg_setup() {
+	enewuser ntopng
+}
+
+pkg_postinst() {
+	elog "ntopng default credentials are user='admin' password='admin'"
+}
diff --git a/net-analyzer/ntopng/ntopng-3.8.ebuild b/net-analyzer/ntopng/ntopng-3.8.ebuild
new file mode 100644
index 000000000000..adb578b7ff8b
--- /dev/null
+++ b/net-analyzer/ntopng/ntopng-3.8.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools user toolchain-funcs
+
+DESCRIPTION="Network traffic analyzer with web interface"
+HOMEPAGE="https://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-db/sqlite:3
+	dev-python/pyzmq
+	dev-lang/luajit:2
+	dev-libs/json-c:=
+	dev-libs/geoip
+	dev-libs/glib:2
+	dev-libs/hiredis
+	dev-libs/libsodium:=
+	dev-libs/libxml2
+	dev-libs/libmaxminddb
+	net-analyzer/rrdtool
+	net-libs/libpcap
+	>=net-libs/nDPI-2.4
+	net-misc/curl
+	sys-libs/binutils-libs
+	dev-db/mysql-connector-c:="
+RDEPEND="${DEPEND}
+	dev-db/redis"
+PATCHES=(
+	"${FILESDIR}"/${P}-mysqltool.patch
+	"${FILESDIR}"/${P}-ndpi-includes.patch
+	"${FILESDIR}"/${P}-missing-min.patch
+	"${FILESDIR}"/${P}-ndpi-call.patch
+)
+
+src_prepare() {
+	default
+	sed -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" -e "s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" > configure.ac
+	eapply_user
+	eautoreconf
+}
+
+src_install() {
+	SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}"
+	dodir ${SHARE_NTOPNG_DIR}
+	insinto ${SHARE_NTOPNG_DIR}
+	doins -r httpdocs
+	doins -r scripts
+
+	dodir ${SHARE_NTOPNG_DIR}/third-party
+	insinto ${SHARE_NTOPNG_DIR}/third-party
+	doins -r third-party/i18n.lua-master
+	doins -r third-party/lua-resty-template-master
+
+	exeinto /usr/bin
+	doexe ${PN}
+	doman ${PN}.8
+
+	newinitd "${FILESDIR}/ntopng.init.d" ntopng
+	newconfd "${FILESDIR}/ntopng.conf.d" ntopng
+
+	dodir "/var/lib/ntopng"
+	fowners ntopng "/var/lib/ntopng"
+}
+
+pkg_setup() {
+	enewuser ntopng
+}
+
+pkg_postinst() {
+	elog "ntopng default credentials are user='admin' password='admin'"
+}
diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest
index 2a0ac0af8fd6..7e83170c6a79 100644
--- a/net-analyzer/pypacker/Manifest
+++ b/net-analyzer/pypacker/Manifest
@@ -1,7 +1,9 @@
 DIST pypacker-2.9.tar.gz 276080 BLAKE2B 3bab4b4c7879fea10accbd3fb2bcb4a8e27096a29240f6b8e4e06c3486ee0cb2b8fa1e83674dee759fafc85c2e182cb75e836c00dfe28c83c0bb2cecaed758cd SHA512 b7ca61948a55a37661fa402ebc5a9c2be456e8df14d1ee091a50ccd1362c7a7fa9224e1ae2b8ee8057f302ee9e0c61c06d07b627dde92947f8d22158ef3623b8
 DIST pypacker-4.6.tar.gz 592362 BLAKE2B 41fc63f1fc40ab1cfc007db9dfc6d18cedb51cc8525dc2b467bc03babe03c49f9f0771b8146aacf80f74c511619da85e1f7d56667bcda350710e4c0bafb89351 SHA512 c55205b35f653903149517aad0e2d055745edd6c1a28b1b49aeaa435ca327693b20ed6f851011fa80df1fcc5281ac8b92fbffa3b1381cb3d4507ef7d45d49545
 DIST pypacker-4.7.tar.gz 595975 BLAKE2B 95f29bf88347df5c4673a225049337c053cc4833a13767a3fce700a911fb7b744a61ea745f3d3ac4a14cc93288504e190c9cda228000b8a41b924b23805efcf3 SHA512 9c874af28887e942f62a7f540961f7e31af3b35e52f960ec99ed53e6a5ea29d36f20a6dbcf652125ac6b72849502a30e5d11ee1f795c90c7efd5702a0d34b2b3
+DIST pypacker-4.8.tar.gz 600508 BLAKE2B e9cdf07ed7d92aecad24e2bea9d18f67eca4477bccc273d77b82701f3110b7b71db5f35bc29ee45d33ac8ba02e8c8d1d36b31e326f21a443f6fc2b2375678330 SHA512 729a55e745f645b874bc6a868afcff543a26aae74b5241204c8e7103f754c296204c43b9db5b64b4a3423f735e2c658e9f0d97f7c84f0f8b134b29c5a2e55227
 EBUILD pypacker-2.9.ebuild 696 BLAKE2B 3ec2822ab28c7ab75e6a2cd049ad397a4ef86c54f60d06f87c8d544e911a0d513651211dc4020f267e864db782188f3c4e31d749e58a1656427ad68b3b1ff67d SHA512 7fc02ab96434a780d5e6f51e8ccd6f5c2fbbe8227e4f41ba93f85f0894d805f028a6cc3e8321a9455079335698f558a796944c6a7be37ceb40413d4b6098350b
 EBUILD pypacker-4.6.ebuild 696 BLAKE2B 849590e13844edc4d6d08d4995e3284f0aa1e7a90ca969802f6525046197984d6e6c5d4a3f07ac4def5be19812395924a68c102d1bbc8a690405af1530b1526e SHA512 7f80a767611317ded7eb0e94f3b62add6432acdac9c95ac92d2bb2155b34ef1f991a094cdc9db731b7eb8a171bc5af6ac2afd27b882579922f17240e082352d4
 EBUILD pypacker-4.7.ebuild 697 BLAKE2B 3e6cb3ecdc10198d651dd726974ce7ac81b45e9b7fa191c02595afe26ac4f271be55468c1b68ba85c5bc35ab4dea468d7518e359fd9a19bdb8f7fa42efc3881f SHA512 f6f896ce34a9b056b2e0c1af1200404b49457c85daeff4df86661674faf667d10c21a52f618409b06be054a7d505dae2c6c26cd4135097099c0c133bf513ddf7
+EBUILD pypacker-4.8.ebuild 696 BLAKE2B 6167963cfc8e5796fcaccfb1044744511340eb3c5bb3cde52a6878de8dcbdfd7177a471d861a1598ec6a3b667afe3c793f2a3bdb205800571220f605df3b5612 SHA512 f88d3524eb9415642b164fe42e58e290a06f6f284d3951bb98d1dbce3cd54661628908abce86936076218f094400b05801094e2f4070123999578430dda3b50e
 MISC metadata.xml 471 BLAKE2B 16f24ca5a8c373e40115c441da2b6efabca5ebf7f6cd5d4e55c64320172d92470e34c484c7c9d63dce8f4fcf1aff0a0adc0d0743807cd342756aabfe790b4356 SHA512 8eda90dced7132f754ceccf39fbd1b7fdce0ff01490987eb6c6258544dcac27ba03313cb401396e0014c0fff42133da53698681ad5ac48d0f29bead5786abe2f
diff --git a/net-analyzer/pypacker/pypacker-4.8.ebuild b/net-analyzer/pypacker/pypacker-4.8.ebuild
new file mode 100644
index 000000000000..5d76249812e6
--- /dev/null
+++ b/net-analyzer/pypacker/pypacker-4.8.ebuild
@@ -0,0 +1,27 @@
+# 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 vcs-snapshot
+
+DESCRIPTION="Fast and simple packet creation and parsing library for Python"
+HOMEPAGE="https://gitlab.com/mike01/pypacker"
+SRC_URI="${HOMEPAGE}/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DOCS=( AUTHORS CHANGES HACKING README.md )
+
+python_test() {
+	"${EPYTHON}" tests/test_pypacker.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index deab42521460..f44dfb0a481b 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,6 +1,8 @@
 AUX sarg-2.3.10-config.patch 2612 BLAKE2B 8d0d6bdab60784dd9c289e974dba087b11234b3f961c951bd96ce76a59bdc36f8da5fe5f3c4268f238b5c25f34baa69f97c1e05fbd161abaecb2eb7949d9591d SHA512 e04a971a0838bef3e777708c3328ff940cce84d934de72014eafbcc5123cb8ff2075c30aafdb4ae4541778c6c0fcce38ac32b6dde57ed1a52fc03f1b1f980cda
+AUX sarg-2.3.11-Werror.patch 1012 BLAKE2B f3e9b66c95fe905817c2ceecc52e863c4c0eb9c09d96a525c7876a5f807160421f694b95a02f8f1d62e1292102218c6a1fecf3ed1dedd8f0c7b6b9293322c034 SHA512 e74013c3bc22248ba08656b8751ca6177aeb070ce06661279ee3208ffa62dac8014fed0d6e35b65627ce6f02e70ed662b41dccf21dae8ff2b4e5902cc141e358
 AUX sarg-2.3.11-configure.patch 641 BLAKE2B 8afacc3e90ee7092b762c812dd7e2cab94e9bc6d63026818fb67b26c814b101695989d31e2b3bdd61a346334008afbe2b6f55493e68ecf5c55f7e23f16325253 SHA512 15dce8406ddcc4a4937743c9a6ee8cbe11eb95ef2d86f56f8e6a7b5f3288534a98cb0b3609332ef6b40a3d5d22dc879aaa750f0bbda64b3d5ecc66c606bad9d4
 AUX sarg-2.3.11-format.patch 778 BLAKE2B c3fdcbba47da9ef4b27adeb3cd0bcfc80b1eee230bfb7f44ed5508e0ebe0e5005abf9c40b8794f6986a533170166f7d5c455e0782271f9f87c5db7da594460e9 SHA512 d7e6baa56465d163c0422dd15317bbbf2bf8b20e4aae54eab2c77c7505f18cbf1cc600ddf35ed3f8e7b2a4c58326c5e38c837711c8f9d9188a1e1e8dfe244bc7
 DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B f1ba5e5d3531b611cca1e18444b24772d5f6fb31622d3702ce34bf7e5208b7ff04000ed80c984ff103f785dd9b7015f56403b8389100bbd02cdbf936c8343be9 SHA512 a5bf5c0f696a9d58d9dd1d631d2b458e7a48f597e7a084b032b2feb6185440b08babe7ffaaefc04676f0dbc11301084d1896b6246a7e79a10acdbd7aa7882ff6
 EBUILD sarg-2.3.11-r1.ebuild 849 BLAKE2B dadaef09ee5131c4aec4bec7a5d27084a9a5da0bcb0bc18f7648ece30d5ff7b8da5345bbc3833c423c3530c2596cdebb837396aacccd2f11471e26a53d78b448 SHA512 395e8bbb6c7b752637393f6ad1b90b964cc7502f3750674888a1ae94da13de0efa890c52f5dd59af0e23f54a4976180859cab86aa3b9ce0dc62bdbe74c0b3973
+EBUILD sarg-2.3.11-r2.ebuild 900 BLAKE2B ae2ee2cec4f73a97a4f2191a2a5659ab2cb314bd6e17b886085c246cc8aec0ac699f22aece2c3516380d107191b8267a211d496372a7ef5005776d32369134f4 SHA512 1905afac5cb561d9f28f11e86a4f594ab01a2667bbb84ac2504a916f43710a4c3547a8213094da9d70727ee6d14d2dea61ec6e2ea78f600a1486cf82ba9a7dfe
 MISC metadata.xml 856 BLAKE2B 0640133457b9035a7a30e4ec481ff092254902a21cb8f8cc9a91d0a0b13f99a484982787646e2367f7bcde5f3d2436371f588729acc35b638c289c09cddb2ff9 SHA512 3571bb6b4562fa58e9736ce48c4b3930bb33a3b38dec15b79b22b3cbd457ea7751819a2b45a7e728b02e641c187c085e813eb29d8644dc57e40b682f061b115a
diff --git a/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch b/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch
new file mode 100644
index 000000000000..035578793934
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch
@@ -0,0 +1,25 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,18 +46,18 @@
+     CFLAGS="${saved_CFLAGS}"
+ fi
+ 
+-AC_MSG_CHECKING([for implicit-function-declaration error flag in $CC])
++AC_MSG_CHECKING([for implicit-function-declaration warning flag in $CC])
+ saved_CFLAGS="${CFLAGS}"
+-CFLAGS="${CFLAGS} -Werror=implicit-function-declaration"
++CFLAGS="${CFLAGS} -Wimplicit-function-declaration"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"])
+ AC_MSG_RESULT($have_implicit_function_declaration)
+ if test "$have_implicit_function_declaration" = "no" ; then
+     CFLAGS="${saved_CFLAGS}"
+ fi
+ 
+-AC_MSG_CHECKING([for format error flag in $CC])
++AC_MSG_CHECKING([for format warning flag in $CC])
+ saved_CFLAGS="${CFLAGS}"
+-CFLAGS="${CFLAGS} -Werror=format"
++CFLAGS="${CFLAGS} -Wformat"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"])
+ AC_MSG_RESULT($have_error_format)
+ if test "$have_error_format" = "no" ; then
diff --git a/net-analyzer/sarg/sarg-2.3.11-r2.ebuild b/net-analyzer/sarg/sarg-2.3.11-r2.ebuild
new file mode 100644
index 000000000000..c8afb3c48d45
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.3.11-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Squid Analysis Report Generator"
+HOMEPAGE="https://sourceforge.net/projects/sarg/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="+gd ldap pcre"
+
+DEPEND="
+	gd? ( media-libs/gd[png,truetype] )
+	ldap? ( net-nds/openldap )
+	pcre? ( dev-libs/libpcre )
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.10-config.patch
+	"${FILESDIR}"/${PN}-2.3.11-configure.patch
+	"${FILESDIR}"/${PN}-2.3.11-format.patch
+	"${FILESDIR}"/${PN}-2.3.11-Werror.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gd) \
+		$(use_with ldap) \
+		$(use_with pcre) \
+		--sysconfdir="${EPREFIX}/etc/sarg/"
+}
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index 61165138ce18..fc5b36f130d7 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,5 +1,5 @@
-DIST speedtest-cli-2.0.2.tar.gz 23915 BLAKE2B 95b88e1666d7bc50c525ae7eb587e1b53babe02549e3b6b81f59451166fdbfb5561daa29e1de308d3ca7340989bcb6e7b43edd84bf371716284c034cdeb21fd8 SHA512 12fa9a5dd8bcb7a7ee68ecc9075dc5c18f089cecf003e7e643dbb6b1c3663f17c2aba48d1e84aa27bff6b66e207d39ecaf874aebad1d71cac772c58b62191723
 DIST speedtest-cli-2.1.1.tar.gz 24380 BLAKE2B ea6f5fc3127246ad4cf90dee4b53529fa9f3b9b9558c9ebb92661380663a5e5950490e91cda97f9207b26c23464026b91c8faa50ef5a515b817b0f84fcb2e13b SHA512 afc1fc0264d5124efe5afc9b0583b2b37ae50eac229e6971656a906b9a7a78d44158485d5c2e44c3430694fd7355926f578a54a196cc9b9baf6cfbc357a789d1
-EBUILD speedtest-cli-2.0.2.ebuild 659 BLAKE2B b1158cc13f1edcf3430f0ba7973a5d5bb617aa836cf9ccf08c7b15b57585642468a41237de0cb9e7254f2fc5a8f997529c1a323c5d4b10173d183d585f3702d0 SHA512 3830ba3d46b8391cd2f0f63a11f70acda45af07cc8025ca4ac1aba574312634f754558cb54bf40c2d051c20a06221f193610f45bbfd76836e7ea24e936eb9324
-EBUILD speedtest-cli-2.1.1.ebuild 661 BLAKE2B 6dbca712919867894da38ae045b6b737b7b50f79b70a7aab04373aeb086928888d486e33728073108f7ce1eb2b350598f7c0ba9a28b825a7d759c503d8c03e86 SHA512 6085506ffd9e89f83538e7aae5a816c50b0f9a87e3a945633ac1631d3d46344ba1839030eff091eeecaa0dc5651aef6bd96aaf41f70179470b462c78f297c7f1
+DIST speedtest-cli-2.1.2.tar.gz 24741 BLAKE2B 09418e34d92e0f91d7482ba4cc46cf812b43f25118c71a8e5127265f62ef93bb428ebfe5cc65a73ea8284fb7bfe1a99cc670d5d186f9e82284a11390f6e66960 SHA512 f2eb125116f42075d3248e1c0590cce4f822f383ff7c54c158504b16de72bf35b35d55a78014413a95a5f5bafa98c71c3ea011f20f480f1db272d6e8800c40bd
+EBUILD speedtest-cli-2.1.1.ebuild 659 BLAKE2B b38afdbb04d3e6ea17250d35cc320fe8a54218c9f8c74c5f3c5aab05407e624a7b5567dbebec34459e64c262e0eca3ee82339e3f557b672b1f70a3b4be6a3843 SHA512 9f287b6ca567d954629bf40af89a7cb638ddb4aa7357e8f8728ea2c8307a171f9eb94fa23e6d6b65e1989ca828a0ce54a8e3137ae681e709c922b52c546a7bdf
+EBUILD speedtest-cli-2.1.2.ebuild 661 BLAKE2B 6dbca712919867894da38ae045b6b737b7b50f79b70a7aab04373aeb086928888d486e33728073108f7ce1eb2b350598f7c0ba9a28b825a7d759c503d8c03e86 SHA512 6085506ffd9e89f83538e7aae5a816c50b0f9a87e3a945633ac1631d3d46344ba1839030eff091eeecaa0dc5651aef6bd96aaf41f70179470b462c78f297c7f1
 MISC metadata.xml 460 BLAKE2B 488a43d888cbc4baa7d74bcf4b8852054037be8227f380d43f187baba239e253c2a0aa3ce1d8c2c672a4947be9e4268a2d1fa8adbb3db38fee9e2334851bc7eb SHA512 6e911380a7bc75a4f5726f4bb8f864a2660e93cb07be2cdf55b428fe8615e9e31c7a78f978064ed73fdc1133d6611b3bc3a39966439bb249e4f8a69dbae88f1c
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild
deleted file mode 100644
index 3e6301cf17bf..000000000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
-HOMEPAGE="https://github.com/sivel/speedtest-cli"
-SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DOCS=( CONTRIBUTING.md README.rst )
-
-python_install_all() {
-	doman ${PN}.1
-	distutils-r1_python_install_all
-}
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.1.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.1.ebuild
index 8c5b2bfd8f88..1dbd4e633bf5 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.1.1.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild
new file mode 100644
index 000000000000..8c5b2bfd8f88
--- /dev/null
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
+HOMEPAGE="https://github.com/sivel/speedtest-cli"
+SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=( CONTRIBUTING.md README.rst )
+
+python_install_all() {
+	doman ${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 52aea4c6a8a5..ef98d053a6df 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,4 +1,6 @@
+AUX tcpdump-4.9.2-includedir.patch 2027 BLAKE2B b9fc28ec180095f9b6e47e9a1ccd75d479029cfb19d6f1ff53595a25cab4c68d1ca55df0f702dfae86e264e4b7d3f645f3fac1b548bb6d62cec58306ae19e88a SHA512 054af892c4948926d23b6b7a4f93ac00ab8f258181784598a4097dd8f8b641ddeaedf3c9924b940b860929e086810037d3a672fabd03427b4bb41d3020013c27
 DIST tcpdump-4.9.2.tar.gz 2298386 BLAKE2B b7e90d1091affa6f4734a622f23565976b0cb5be8c0afa12656f52acea29384306f2875477dc180b5dc60110a57e0f30f5654ba27dac9f03ff610ca0548de0a7 SHA512 e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b
+EBUILD tcpdump-4.9.2-r1.ebuild 2196 BLAKE2B 3fa9633aec8cbf4fade7622b445336fb79d90b361299ad18d0704e613e749d05204f44b0e75b489692dc5851dcc1d987719c7f6cc4d1e5f5b9265775c1ffcc88 SHA512 6573400c2c12725e5c791756de76854c38869cbabe35c208c479beda30893f0f029011f407bd56f0ae6dd8a63a5dddf45f57d49b51babf25a966a407e0cdbe6b
 EBUILD tcpdump-4.9.2.ebuild 2074 BLAKE2B 94a22e1acea10408c02fcca114547eba248491b0a99505ee369549c681e23e5a5ffa51f4dd43ba6ae2eaa79d0abc85f1f5c1f9a057a96c70189d47e9d98e0028 SHA512 48bd328212aae63dc3f0361352f93b29edb165cbbe12f7d92cc3588c9240e4584e5257bda6adc52872b271e72dfcd65cbd78d79b1faf86b76088fe4f3244376f
-EBUILD tcpdump-9999.ebuild 2202 BLAKE2B bda2d7229a0da196d4a16b263cea1b3a48197485e48118fa368288c8a1ed5138b0090017321528d22a56b20ab0fae177e9b798e7ef4e8d1c1cf41dc73d23d1e7 SHA512 c6a450a094a69fb62b9b742c1fbd63bd8fb30326bffc484f19e60c6ab7fe6e4ae2f0fd73b6330ddb4b825db3f919cd62b0a18e3f40a673d3250e7ff10a1991dc
+EBUILD tcpdump-9999.ebuild 2199 BLAKE2B 4931c70244b037b100cbabad036f2cb14a675d6bb0cec61697bcb2b996d18ee18e38afe6d04cec9e07b78b222cf5ef1f2cf01205eef137f7df5eb7d931605744 SHA512 57e1a444b5a345b2acc2cc14e64fd2298b6d8b20fcf45a9352ddfb3a6a16220fb078b0e4382031eb1b3ed61b7b33ab30c2790c7f1adb15a68701fd57fbe97f9f
 MISC metadata.xml 580 BLAKE2B 0769370fb4433cb7be15b66cbf8598298818b3ae024c534aab956afa695766cc77ec44041559547daac91a1b71d8427039137353497da9b8c6d8dbdb24c41952 SHA512 b8fd75f13c0993c8aa97e0c35649b4f11f992413f4dce8f737c28741d047bb36637b6c509139a046594fa788eb2932ee39a87046742372c63fe0bc6e037da49a
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch b/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch
new file mode 100644
index 000000000000..0f74fa9a8a3f
--- /dev/null
+++ b/net-analyzer/tcpdump/files/tcpdump-4.9.2-includedir.patch
@@ -0,0 +1,65 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -534,40 +534,6 @@
+ 		if test $libpcap = FAIL ; then
+ 		    AC_MSG_ERROR(see the INSTALL doc for more info)
+ 		fi
+-		dnl
+-		dnl Some versions of Red Hat Linux put "pcap.h" in
+-		dnl "/usr/include/pcap"; had the LBL folks done so,
+-		dnl that would have been a good idea, but for
+-		dnl the Red Hat folks to do so just breaks source
+-		dnl compatibility with other systems.
+-		dnl
+-		dnl We work around this by assuming that, as we didn't
+-		dnl find a local libpcap, libpcap is in /usr/lib or
+-		dnl /usr/local/lib and that the corresponding header
+-		dnl file is under one of those directories; if we don't
+-		dnl find it in either of those directories, we check to
+-		dnl see if it's in a "pcap" subdirectory of them and,
+-		dnl if so, add that subdirectory to the "-I" list.
+-		dnl
+-		dnl (We now also put pcap.h in /usr/include/pcap, but we
+-		dnl leave behind a /usr/include/pcap.h that includes it,
+-		dnl so you can still just include <pcap.h>.)
+-		dnl
+-		AC_MSG_CHECKING(for extraneous pcap header directories)
+-		if test \( ! -r /usr/local/include/pcap.h \) -a \
+-			\( ! -r /usr/include/pcap.h \); then
+-		    if test -r /usr/local/include/pcap/pcap.h; then
+-			d="/usr/local/include/pcap"
+-		    elif test -r /usr/include/pcap/pcap.h; then
+-			d="/usr/include/pcap"
+-		    fi
+-		fi
+-		if test -z "$d" ; then
+-		    AC_MSG_RESULT(not found)
+-		else
+-		    $2="-I$d $$2"
+-		    AC_MSG_RESULT(found -- -I$d added)
+-		fi
+ 	    fi
+     else
+ 	    $1=$libpcap
+@@ -1351,11 +1351,4 @@
+ 			  	    -f "$1/$tmplib/libcrypto.dylib" \); then
+ 		ac_cv_ssleay_path="$1"
+ 	fi
+-
+-	#
+-	# Make sure we have the headers as well.
+-	#
+-	if test -d "$1/include/openssl" -a -f "$1/include/openssl/des.h"; then
+-		incdir="-I$1/include"
+-	fi
+ ])
+--- a/configure.in
++++ b/configure.in
+@@ -908,7 +908,6 @@
+ 		# Put the subdirectories of the libcrypto root directory
+ 		# at the front of the header and library search path.
+ 		#
+-		CFLAGS="-I$withval/include $CFLAGS"
+ 		LIBS="-L$withval/lib $LIBS"
+ 	fi
+ ],[
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
new file mode 100644
index 000000000000..7e89e1714aaf
--- /dev/null
+++ b/net-analyzer/tcpdump/tcpdump-4.9.2-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs user
+
+DESCRIPTION="A Tool for network monitoring and data acquisition"
+HOMEPAGE="
+	http://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/tcpdump
+"
+SRC_URI="
+	http://www.tcpdump.org/release/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+drop-root libressl smi ssl samba suid test"
+
+RDEPEND="
+	drop-root? ( sys-libs/libcap-ng )
+	net-libs/libpcap
+	smi? ( net-libs/libsmi )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	drop-root? ( virtual/pkgconfig )
+	test? (
+		|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
+		dev-lang/perl
+	)
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.2-includedir.patch
+)
+
+pkg_setup() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+src_prepare() {
+	default
+
+	mv aclocal.m4 acinclude.m4 || die
+
+	eautoreconf
+
+	sed -i -e '/^eapon1/d;' tests/TESTLIST || die
+
+	# bug 630394
+	sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
+}
+
+src_configure() {
+	if use drop-root; then
+		append-cppflags -DHAVE_CAP_NG_H
+		export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
+	fi
+
+	econf \
+		$(use_enable samba smb) \
+		$(use_with drop-root chroot '') \
+		$(use_with smi) \
+		$(use_with ssl crypto "${EPREFIX}/usr") \
+		$(usex drop-root "--with-user=tcpdump" "")
+}
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
+		emake check
+	else
+		ewarn "If you want to run the test suite, make sure you either"
+		ewarn "set FEATURES=userpriv or set USE=-drop-root"
+	fi
+}
+
+src_install() {
+	dosbin tcpdump
+	doman tcpdump.1
+	dodoc *.awk
+	dodoc CHANGES CREDITS README.md
+
+	if use suid; then
+		fowners root:tcpdump /usr/sbin/tcpdump
+		fperms 4110 /usr/sbin/tcpdump
+	fi
+}
+
+pkg_preinst() {
+	if use drop-root || use suid; then
+		enewgroup tcpdump
+		enewuser tcpdump -1 -1 -1 tcpdump
+	fi
+}
+
+pkg_postinst() {
+	use suid && elog "To let normal users run tcpdump add them into tcpdump group."
+}
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 5386a5f79cea..c4fe962e8128 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-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 flag-o-matic toolchain-funcs user
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index 13b7c7754f9a..ec551e18b181 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -8,5 +8,5 @@ DIST tcpflow_1.4.5+repack1-4.debian.tar.xz 12228 BLAKE2B a7c1725d2a82a6ef63800c3
 DIST tcpflow_1.4.5+repack1.orig.tar.gz 725962 BLAKE2B 282849bded34acc79ece4b06c72d5ed05ada07bb2e1a5e6e15dd7c6c46f8f1e57b5bfb018b1a23bdd543d0664b3bd5a3f756342fd657930a77c1ab8307358421 SHA512 fed8589957e3c790b5b6837b9b578d5dcbde316122ed6b3d4f908d1d73f23c6ed8a11720ee0510e878eaa7a6c559a2f35e7df2c77e3cb1f2810040adf7ac2b85
 EBUILD tcpflow-1.4.5_p1-r1.ebuild 1119 BLAKE2B 47a36a5f641e96a2a16afc41c02468ea83b93b425b7c6f1e7f3382321119d3459cbe7e1c9e4a42e02a73fe205d9da21f7afe596c543f6d5879bc5d0fa2b0bbbe SHA512 bbaaf72e7ab163093392d1c4c690281f84100209f4084f351c60823bbbf94e7787530dc75120123ff4a7f4439de06d1a1c815a97185f0735753444d374d8506b
 EBUILD tcpflow-1.4.5_p4-r1.ebuild 1132 BLAKE2B 431b20f5779a0cb828d321069300f12348f75f47d75dd9d2fd7411bebe956f0f40085ff1a0e33fd5036bc919881d07972506ae2dea4362c6f63713eb433d0c33 SHA512 e781ef6618cbd549828bf426c2fdd9511b037d149f45279d54da658b48b5e6302e62b278e9fe36782cf458e2a335263507efb3be8134d698900c4530455a1bfa
-EBUILD tcpflow-1.5.2.ebuild 1467 BLAKE2B eb7752d796db2c7727ac3b3aa8bfceba4db245d01efdd3d2f0d55815ae6bccab9d69fe0947bf68dab3b8ed1a5e15a99df965ebd20676297e0049d5c1d505ffff SHA512 5c53a52906ddc2ac8e9e6d23b760a27cfbe4bbc546bc09a7500a54df924ac2a527ea337af9d7895138b12e56b000013ec1931f12b6ced376d9f90f7a8524b97e
+EBUILD tcpflow-1.5.2-r1.ebuild 1571 BLAKE2B 7fef6a92a455d62a4e253a7e1c25b0b2c92b61c5be950f4c76079cdcec4a1d120e1ebc8726b9d2c608b781d701b0070d299fa866bafd71ca073ac800d023d7b1 SHA512 a3005f38a0998dddb0136dbba1b686afa019a93c1c44ea311eb78cc21583ee663f89b99a00f6b3278d6e689b754f043f5d0e7286cd4bfcd48fa716cad61a5a96
 MISC metadata.xml 360 BLAKE2B e69d4aa24b5949bff690f0dd8e735d85e975424fec366d7952232a9efd223c163b57684eadde0ddaee26cb0a763e09b64ef7b6361e97611e2369eb1b037d7341 SHA512 32d3c4b5fabd54d1c6c1db15d8af755a6c83725f1d52f5be2ffd7e9975113d200581da4e4a735d823bdf5d12408c8306cc08ef08721ce924f04e137a7da8fa08
diff --git a/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..bf0aeffb4aab
--- /dev/null
+++ b/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+inherit autotools flag-o-matic python-single-r1
+
+DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
+HOMEPAGE="https://github.com/simsong/tcpflow"
+SRC_URI="
+	https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz
+	https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz
+	https://dev.gentoo.org/~jer/be13_api-20170924.tar.gz
+	https://dev.gentoo.org/~jer/dfxml-20170921.tar.gz
+	https://github.com/simsong/${PN}/archive/${P/_/}.tar.gz
+"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0"
+IUSE="cairo test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-db/sqlite
+	dev-libs/boost:=
+	dev-libs/openssl:=
+	net-libs/http-parser:=
+	net-libs/libpcap
+	sys-libs/libcap-ng
+	sys-libs/zlib:=
+	cairo? (
+		x11-libs/cairo
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? ( sys-apps/coreutils )
+"
+S=${WORKDIR}/${PN}-${P/_/}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch
+	"${FILESDIR}"/${PN}-1.5.2-gentoo.patch
+)
+
+src_prepare() {
+	mv "${WORKDIR}"/simsong-dfxml-7d11eaa/* src/dfxml/ || die
+	mv "${WORKDIR}"/simsong-be13_api-c81521d/* src/be13_api/ || die
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -fpermissive
+	econf $(usex cairo --enable-cairo=true --enable-cairo=false)
+}
diff --git a/net-analyzer/tcpflow/tcpflow-1.5.2.ebuild b/net-analyzer/tcpflow/tcpflow-1.5.2.ebuild
deleted file mode 100644
index 0271f130a3ba..000000000000
--- a/net-analyzer/tcpflow/tcpflow-1.5.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
-HOMEPAGE="https://github.com/simsong/tcpflow"
-SRC_URI="
-	https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz
-	https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz
-	https://dev.gentoo.org/~jer/be13_api-20170924.tar.gz
-	https://dev.gentoo.org/~jer/dfxml-20170921.tar.gz
-	https://github.com/simsong/${PN}/archive/${P/_/}.tar.gz
-"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-SLOT="0"
-IUSE="cairo test"
-
-RDEPEND="
-	dev-db/sqlite
-	dev-lang/python:2.7=
-	dev-libs/boost:=
-	dev-libs/openssl:=
-	net-libs/http-parser:=
-	net-libs/libpcap
-	sys-libs/libcap-ng
-	sys-libs/zlib:=
-	cairo? (
-		x11-libs/cairo
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? ( sys-apps/coreutils )
-"
-S=${WORKDIR}/${PN}-${P/_/}
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch
-	"${FILESDIR}"/${PN}-1.5.2-gentoo.patch
-)
-
-src_prepare() {
-	mv "${WORKDIR}"/simsong-dfxml-7d11eaa/* src/dfxml/ || die
-	mv "${WORKDIR}"/simsong-be13_api-c81521d/* src/be13_api/ || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -fpermissive
-	econf $(usex cairo --enable-cairo=true --enable-cairo=false)
-}
diff --git a/net-analyzer/tcpstat/Manifest b/net-analyzer/tcpstat/Manifest
index bebd27093d63..6ce9163bdead 100644
--- a/net-analyzer/tcpstat/Manifest
+++ b/net-analyzer/tcpstat/Manifest
@@ -1,6 +1,8 @@
+AUX tcpstat-1.5-_DEFAULT_SOURCE.patch 428 BLAKE2B ee4ac925f6baa2728cdc5ec2d31fe9ddfa555465f3386ff0413a851541c06d160270f56896c715c136849776b7233482a0de359c616e73ed4be0755ed05da199 SHA512 471309ad08b0a10f18b34a3d69a81ff19223787f375ea652fb12a96b3166432a55efb091d255aee4388262e44af0d4b3ea2a644ddc6cfaf8201b57194511a1d9
 AUX tcpstat-1.5-db.patch 4691 BLAKE2B 1c135688c7197144f6add6ccca007a70141033a16a6b3c24cf4d9769f43b651fc5cfc2bad875c010d7b888e5533af49aca7eab2c691bb716e2c389435136ab0d SHA512 03de51e86bd0aa1bf2d29097871fe8409498050100c4adefde7d8aae7bdd752455af6ce13b490f4e596ea90557b37c95b974705cbaece35d9b465571fdb31d6d
 DIST tcpstat-1.5.tar.gz 93102 BLAKE2B 39a570fe6176fda0e8a6539417ece268183a1ebed6fa956b8ec5556b8bbd2508829e7d0861ef39b551bd6070df70cfdaf3dbf694a42ad00be4ea0f3e5c757ce5 SHA512 f1399365e754e4d9e19657c455a580294a7b4002a0d02ff05791a45574dcb1d0e75dc492157ef595066502b1553702481c67b20ad24267a50d7293766c39a5ab
 EBUILD tcpstat-1.5-r1.ebuild 865 BLAKE2B b904e297122d5640de2f88c68124bf6a6945f41e0a60632c0813422ae0496da917093e2e47968d7e919110521f3ce5adc24de853b3cae2b29ee9b2f1e9e23af5 SHA512 f74ee7b2f110edbacf08085e95d8409ac35e85a656439156e4c98e09b5bac06dc5a91ea91eb13cd51f30f085bc6be6433da95a42fba67039bfa4d8c18e5896ed
 EBUILD tcpstat-1.5-r2.ebuild 725 BLAKE2B 111495835579d8b584959fb232be6bf813886dc26de21585b2f7b820da8cf390dde050a9c257d74633802236449943e801d65df5482473c5ed08964bf6230a01 SHA512 5379b0dc23729ff8c4a3148dccb0efa5ff2971eb39c0939ff795ad8923b95917191db1e3809bd9c05e5a4b2fa12db4e13a407e94976f28af580ad0595c46d672
+EBUILD tcpstat-1.5-r3.ebuild 859 BLAKE2B 5f32b003b52942bd8b1d74a20b99e64d25b37272d95550afd6ba11aca2ae875c6a75b83c106ecec76424455138f9be2ad1024de96d3abe6019a906a1e46645a3 SHA512 6a2613d431804324507e49a835612e5ed59db0850f038a23b64c63f6177e2b8bf85ed7bb061b991ef63b4e1e542b8b113bd2c6216e34b1c913cbd399d6e7fef3
 EBUILD tcpstat-1.5.ebuild 561 BLAKE2B aa14697eab225735f94826244653ec1c5cfd97799fc46adc6a17924f244c52841babaec0d20005f7599cefb79a9878a1eeb38fb9e2b65a8a5b148978ffe8048b SHA512 47cdb87e19a06b557e9ec1253790cb349929f04690d8f760b4e78e68ea5fa8ddb84e4edf87d8b22200c20d3cb3222867d538537debe22b6c934677d230995aa6
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch
new file mode 100644
index 000000000000..e3e0df933d5c
--- /dev/null
+++ b/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -68,7 +68,7 @@
+ case $my_build_os in
+ 	aix*)		AC_DEFINE(AIX_STRANGENESS, 1, [ defined on AIX systems. ]) ;;
+ 	osf1*)		AC_DEFINE(TRU64_STRANGENESS, 1, [ defined on OSF systems. ]) ;;
+-	linux*)		AC_DEFINE(_BSD_SOURCE, 1, [ defined usually on linux systems ] ) ;;
++	linux*)		AC_DEFINE(_DEFAULT_SOURCE, 1, [ defined usually on linux systems ] ) ;;
+ 	bsd/os*)	;;
+ 	freebsd*)	;;
+ 	sunos*)		;;
diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild
new file mode 100644
index 000000000000..64128ffed42c
--- /dev/null
+++ b/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+DESCRIPTION="Reports network interface statistics"
+HOMEPAGE="https://www.frenchfries.net/paul/tcpstat/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6"
+
+DEPEND="
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt )
+PATCHES=(
+	"${FILESDIR}"/${P}-db.patch
+	"${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags -Wall -Wextra
+	econf \
+		$(use_enable ipv6) \
+		--with-pcap-include='' \
+		--with-pcap-lib="$( $(tc-getPKG_CONFIG) --libs libpcap)"
+}
+
+src_install() {
+	default
+	dobin src/{catpcap,packetdump}
+	newdoc src/README README.src
+}
diff --git a/net-analyzer/telegraf/Manifest b/net-analyzer/telegraf/Manifest
index 2591ddc2933d..cd5e3bef698d 100644
--- a/net-analyzer/telegraf/Manifest
+++ b/net-analyzer/telegraf/Manifest
@@ -206,7 +206,7 @@ DIST telegraf-1.10.4-vendor.tar.gz 69744868 BLAKE2B 97123bb14b89d28519c734264911
 DIST telegraf-1.10.4.tar.gz 1372505 BLAKE2B f3064cd71b1b6f9a8aae8e5425813386bd6d4e4f06c2e95f35c09d055aef6b811867bb1fe1724e88311f82e8214a1c7ae23a0b5ab8461cfa6b0adebe3b86cb28 SHA512 7e6c27bb5b94382f00f48ce98906f7e505abe734b47e29c2c07f245c2c5c12c522eb3f59be2773bfea78316b7b808d0d425d07fa7c247af7cd280a041759cc34
 DIST telegraf-1.5.3.tar.gz 911976 BLAKE2B 3e67a037eb22be88de700131f15120faa13b7a9bd8404f76c29376e3e4da630d84767fd8cbff45b3e14e6ce836dcc68a2a87b462eb91d398d57370c1112879c0 SHA512 48e80a4f3f00b5c18f584e28836c36abd7b7f9bacb33dd90ff569dbdc0a5bf69e29d38ae2d74a9c14ee6dc3400dda91e586dd31bc11522257c2206efb3e93348
 DIST telegraf-1.8.3.tar.gz 1205303 BLAKE2B 60579cca57863362cb4003f8da4326cef0d1bc4986d07d38f4b594556736ad79e0363098df41c13a2d10bbeeccce20fabcd0b07c7e187cbeecb5c561008d587e SHA512 367069b3578529307d5fa6eb14eabf78a44743d75e5df7c3860b35de212b5809c54cd1a7c791076137f60096d227774b4d5206606cd3fad08594721b4b49de4e
-EBUILD telegraf-1.10.4.ebuild 1328 BLAKE2B d90230f4d99b4e3397f9ddd95d7e210894321245f8d89debc6a5b2a4b4698b418231703d4b3f651da5c67df0de63bff255dd413340e8769d582579935f993592 SHA512 d208883ac6787db14fc883cde3c68d10d34c48f0ac0b4e1f59c7167f67e9c2ccf395bca6cda9eeda4b7ecf4a3c010de1a3a42b0b69fe880a59a3efa3c22cb0e0
+EBUILD telegraf-1.10.4.ebuild 1350 BLAKE2B 4cd393ebb9c9afb4c9b381b9f9cd44c5af5c746022de949777697e75d30c69fb1b0f10db2216f4e765a26b160dbe6f65b7d60f6f1a7bf84537b60640293751ea SHA512 9ec1991dde6f6a1f88576e582b5e96e094f524c4e9b90ed3e7ab2e02cef8382b3f9573fdc48520d29099f8d7592656f65dd83c163e0c5da9cc7761869688c1fc
 EBUILD telegraf-1.5.3.ebuild 8161 BLAKE2B 53f9c9b2fc23e06e2d8cea9d11198fa0b8b91cd8c5721a7baaac36a300473da2b2494399f0786d9dbf022fa92093f9bf1eeb234a314ed97bdb97a48c6d6df730 SHA512 ecd1b258a0932732f4a738ef4baae5e7b7ae97eb076cc2d3ff6e824429e75b64d3c70385e843fe27daa1a09d8bb80a9977291bc8808922ea46100ab99f09e779
 EBUILD telegraf-1.8.3.ebuild 10888 BLAKE2B 84331e20f7ada3e7e1882a6a0e34ba3f2d764350265dc199edefb21a247e3e89be1bb9ae216782bb8b7e0af7bb160972be8084341ef86d37c2a101d1e89d2a52 SHA512 ab279f166ad698c7547a8c26a155ac2566829a71d01654df7f8bc4a9ee5f4278e5fb79da39ffae7dac949ee1181f53eb6ba94e9e28272fd918b92ed40e60400a
 MISC metadata.xml 397 BLAKE2B 2a5052554a207a61b00ce3997cd42292b00aaa7a434aee3361abc24057d705c0ec82885550a0515439775fec013319c325b911684bc351f9478adf4a0b7c26d1 SHA512 e27b2a6ed4fe38df2a3ab0d70fe4e82bbe874987be1cfa26df2ff5cdfa93a1fd55b19fa6c901ea1adda058fafc703d15438bdd3119023f4da0e2fd5cc915a52e
diff --git a/net-analyzer/telegraf/telegraf-1.10.4.ebuild b/net-analyzer/telegraf/telegraf-1.10.4.ebuild
index 26d57829cbfc..ed1cb6058ca1 100644
--- a/net-analyzer/telegraf/telegraf-1.10.4.ebuild
+++ b/net-analyzer/telegraf/telegraf-1.10.4.ebuild
@@ -20,6 +20,8 @@ KEYWORDS="~amd64"
 
 RESTRICT="strip"
 
+DEPEND="dev-lang/go"
+
 pkg_setup() {
 	enewgroup telegraf
 	enewuser telegraf -1 -1 -1 telegraf
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 233ad5d23ec6..c0d570f06be9 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -10,10 +10,10 @@ AUX vnstatd.initd-r2 874 BLAKE2B 4ce5936af3a375d30bc8ab1b5ea1ddf1c2b4910394b8a9e
 AUX vnstatd.systemd 262 BLAKE2B e54c30a1bfa6c7a8bba32fa93c3d2417506c55e9499754419b24179147a5b35f0c51cf61a3f7c4840c88f81d09101c427ba64b41f0922303b8c353caafb883db SHA512 35f9714641d1b3288bed659bd010ef1b8f0316f915622dcf5d3250e1acdd3b438762ae934fab2f6cd350274c7ec0f70a7d8946448bbc6db67be6f91cd86aa47c
 AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e21016c31fc227f9564218ca479455b7cf4eb697d18d8389ba65266b91d71c5bf22c83a9337ae1d861d9 SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac
 DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3
-DIST vnstat-2.2.tar.gz 264037 BLAKE2B dc82798a0c619d2aea3d3cbdd42bb10f73769b0e64443407daabc8838e5af5b0ef718c0769321116269f1bc6f50e99133a1d38ccb730f658f3215a83180589b7 SHA512 47bd544ed071268774bf55a8269f50694d2af0b14fe3eb50b707c4f09c9a0c0653360ac892136275355b2a647a0fed731f007d135edf4bc9b04dc537bf248acc
 DIST vnstat-2.3.tar.gz 269907 BLAKE2B b935c7baec34f15213b3fe320add4e3ecf0d3cd43d5934231eb9b96f3bc8171aa056e1a08d42cafdc2d06b9e6108d04392a1452a3d24bdbaf748722c53f64f23 SHA512 244aae8a127fb93407918e90efefe09d901410abbfda715272f1d754692661f2036ea98cc7f75ebc53ec27249ba676f84463af24ed7e19a9a130d6ce29b32677
+DIST vnstat-2.4.tar.gz 270907 BLAKE2B 4666c39c05cb0bd2a89db7e57bfd72b542ccda02ba09a9da6097b58957141042a5e63a2ee4863bb61b686b3e4c374a690d798398136760699755187fdca5e27c SHA512 e2f23b375a6afcd9e51770769c741d3a5fc139aec22e535bc98da09e4a6677a0c820fb04727a79f23569be29f031e9ee897b6d569146c42ed917f5f83399b7b6
 EBUILD vnstat-1.17.ebuild 1432 BLAKE2B 670816f4084b10dd622dd9ab90d95c01f185d9d7a51bddd430c5cb0b0fd7900b5cf3417310b814a7299102978c9d4f165e0991978defb025e2935f9922715059 SHA512 669b9f5f8638dcca0c97d2f1c0a160bbfbf24ac5dfa6c4e3c0d6b1280dc6fb5923c512924397576ccbe75c762464fa93aa4022c524fd167800da1c5195e8c9b4
-EBUILD vnstat-2.2.ebuild 1525 BLAKE2B 6bd8f55fdc399980494b108f9152d8a4b5bf552feb98deaedafe82744a9f5f01e1517b01d8d616027dc714a8d78ea55b7d06ee8251d547239c9747f87e799b8c SHA512 049caeb2e5a1b717151bd57e88de2dd7a7df4fb2408bba910a4b0ecf5318997fb30db4e25c600e3a4c62d2fe84f88fc67222de931fbcd4b6e794df2f06cbcdbf
 EBUILD vnstat-2.3.ebuild 1525 BLAKE2B 6bd8f55fdc399980494b108f9152d8a4b5bf552feb98deaedafe82744a9f5f01e1517b01d8d616027dc714a8d78ea55b7d06ee8251d547239c9747f87e799b8c SHA512 049caeb2e5a1b717151bd57e88de2dd7a7df4fb2408bba910a4b0ecf5318997fb30db4e25c600e3a4c62d2fe84f88fc67222de931fbcd4b6e794df2f06cbcdbf
+EBUILD vnstat-2.4.ebuild 1525 BLAKE2B b4a3e5bdd1c554cf7ff18528eaf02688b6d7035cd8480291ad3cd7fdc7d2b71bed7cea46bfe0f30415d1b3ce4873ebfb2f5fd0343ca93d5253ecb66adf62cd22 SHA512 cd3577efee947e7688b0b9a7768d0bf71e8f10726081fe13c335737abc939bc059fe4ce5a438ce353714b0a726e3712a05da6fa9191b24ad28790a542947c005
 EBUILD vnstat-9999.ebuild 1502 BLAKE2B 85b6e903a1cd01f95b3140ff957f06f2cae8e890279fde5b89d8e478e23a9a1e96cd4db7ad31d00fe1bfb269330a367f35c24e844e3399ec44774adc1c6d80c7 SHA512 8c8644661509f62cd77319e0d445371cfbf4b9533f4e0602978103c1b7460c64a1a242a2495aeb35ac81c6b2f5898d042bfc4f0c51d544e8156f5632a2a26b02
 MISC metadata.xml 603 BLAKE2B 6cd01f8334d5768e057d6866f9c8d739af3680787d9159638a504eeeb74b2f01a36775bfa3e2afeb169d2948e290e8995b2100d572603eaa5ffa44c96b15b385 SHA512 7dbda5d3a317201c8eb0000f2b55af6b2de6fd44368ab39b08c60ee8eb1355264a8886d9a484ab75d47c0c0ce3f41059a8f354f7d6480ae20e469e4c29ca31e2
diff --git a/net-analyzer/vnstat/vnstat-2.2.ebuild b/net-analyzer/vnstat/vnstat-2.2.ebuild
deleted file mode 100644
index c5e123218abe..000000000000
--- a/net-analyzer/vnstat/vnstat-2.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd user
-
-DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
-HOMEPAGE="https://humdi.net/vnstat/"
-SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gd selinux test"
-
-COMMON_DEPEND="
-	dev-db/sqlite
-	gd? ( media-libs/gd[png] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-vnstatd )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-conf.patch
-	"${FILESDIR}"/${PN}-2.2-drop-root.patch
-	"${FILESDIR}"/${PN}-2.2-run.patch
-)
-
-pkg_setup() {
-	enewgroup vnstat
-	enewuser vnstat -1 -1 /var/lib/vnstat vnstat
-}
-
-src_compile() {
-	emake ${PN} ${PN}d $(usex gd ${PN}i '')
-}
-
-src_install() {
-	use gd && dobin vnstati
-	dobin vnstat vnstatd
-
-	exeinto /usr/share/${PN}
-	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
-
-	insinto /etc
-	doins cfg/vnstat.conf
-	fowners root:vnstat /etc/vnstat.conf
-
-	keepdir /var/lib/vnstat
-	fowners vnstat:vnstat /var/lib/vnstat
-
-	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
-	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
-
-	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
-	systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
-
-	use gd && doman man/vnstati.1
-	doman man/vnstat.1 man/vnstatd.1
-
-	newdoc INSTALL README.setup
-	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}
diff --git a/net-analyzer/vnstat/vnstat-2.4.ebuild b/net-analyzer/vnstat/vnstat-2.4.ebuild
new file mode 100644
index 000000000000..158b3bde0441
--- /dev/null
+++ b/net-analyzer/vnstat/vnstat-2.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd user
+
+DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
+HOMEPAGE="https://humdi.net/vnstat/"
+SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gd selinux test"
+
+COMMON_DEPEND="
+	dev-db/sqlite
+	gd? ( media-libs/gd[png] )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-libs/check )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-vnstatd )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2-conf.patch
+	"${FILESDIR}"/${PN}-2.2-drop-root.patch
+	"${FILESDIR}"/${PN}-2.2-run.patch
+)
+
+pkg_setup() {
+	enewgroup vnstat
+	enewuser vnstat -1 -1 /var/lib/vnstat vnstat
+}
+
+src_compile() {
+	emake ${PN} ${PN}d $(usex gd ${PN}i '')
+}
+
+src_install() {
+	use gd && dobin vnstati
+	dobin vnstat vnstatd
+
+	exeinto /usr/share/${PN}
+	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
+
+	insinto /etc
+	doins cfg/vnstat.conf
+	fowners root:vnstat /etc/vnstat.conf
+
+	keepdir /var/lib/vnstat
+	fowners vnstat:vnstat /var/lib/vnstat
+
+	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
+	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
+
+	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
+	systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
+
+	use gd && doman man/vnstati.1
+	doman man/vnstat.1 man/vnstatd.8
+
+	newdoc INSTALL README.setup
+	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 791854b89309..516d7a546e00 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,22 +1,14 @@
-AUX wireshark-1.99.8-qtchooser.patch 296 BLAKE2B 0a3f7a0aacf868e6af938bf4a67267c657838ff2bb09f51dca59d399fdbefdb0b86df6debdd6c244817586591d8e5dcb53136eb5be23eb96423fa61204276f75 SHA512 ecdbc5b3164cbef46d9f9e647deefc141ef2fa261fdab2e46df8a6235af544e8496b22a87ffefb60be34907a8432a6e6ec4d3a9fb3789404d946558cab7a0afc
 AUX wireshark-2.4-androiddump.patch 1135 BLAKE2B 8126f920def5e6faf4691d639dc3dde7e32aca4b3dd11928a50ddbfdec9b53386957eb473fa93fc21bf791c052a4808b03e00a775d4c1e9f61a1c007c03b6953 SHA512 d18daa46b3ff8f0f4e3e468c65c33fd1bf9fb9a8e90f6318a64cc11b696520b07ccfcbc9921f3c932fcceb809c0406a5cd9773a157ed1bfd10e4c8873215b36b
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
-AUX wireshark-2.6.2-qtsvg.patch 548 BLAKE2B a86981841b4bd76c429d68bb94439317c29404a8917ee8419b7f9e729e857a6dafb94c738f656633672f4f31a8a0e3ccc6a1946b6db3a15b27244cf5ab34a7e5 SHA512 08530766e3e3e3273847a7147303c0bbb0f2b9230e54f057fe4e266ea4f67d577d301a4c02e63d69bb5cdeaf0445466c906278ab76e636a0f2bb8a886eb21ddc
-AUX wireshark-2.6.6-androiddump-wsutil.patch 324 BLAKE2B f72415948a15cdfa2eae24bd2af00c64ede367007c8ee969ae76a7d391a209f47d96431a61484ac9d780111f05e2262083601a9e3ca81453b6a5a1293979021e SHA512 2b26ac08ade3ba51c53fd17db7722fd7182330bf68ac3db851b19e246f8ac808cf7f5e6a85a58d91a2566a254c4e57b14b61188e56f75e3df0028a7ae0726125
 AUX wireshark-2.9.0-tfshark-libm.patch 134 BLAKE2B 364acc14eaf74d134b9905c240a3a6074138a259ce6a0a4a08496884d34961cbcbcba6204a47c62e015207d551abe5c5b30430333f185773347157162a027d4d SHA512 5cbbe6fc9aef5f26216ede7e5ece4fa8b5e2aeebc478c761a8b5ee5310f24fef8b2588fc04938fa9bfc4875d6df2835f82b4d15c4b818f9ac500d2fc2465d362
 AUX wireshark-99999999-androiddump-wsutil.patch 343 BLAKE2B 665e3329615524fa145b0b6f996aa950f0337ef4fd6a53d26887453744f8f3dcbcd499654f679edd07d2e07224e542247583233a8c0be1d130bc9196dc56ee01 SHA512 9f013bb9fd7d0dad834c2079210a1b15adbd5650a7fc320e7dfab7c9c6d0fa9f0b4e3fd3b1972f91ec47484933244c6b91dfbf4eb62409391562bc7ee4ee7f5e
-AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
 AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
-DIST wireshark-2.6.7.tar.xz 28420060 BLAKE2B fda1fb2b9a8968916dd24c59c193854ab56dc13d5a69d2f589ae89b257f92794d092a3da75c2e20b1c83c902966db15527346dc4072a38d16a21ed095cde364e SHA512 bd0f87debd8bd8947f386aaec9fc843148e3cdfbffc28ba499526c4053732becea606061deae6799da0cf52458fba840ba0ff8e4a034a671fa876b8a0ff25677
 DIST wireshark-3.0.1.tar.xz 30903792 BLAKE2B 583052691cc20e97511f2407a64fbdffae91c09275429c9c9a60dbafcfc91ce79270f09710e8fba7db053565f1afc9786caf22ef21e700dd0f97c2f38b139e31 SHA512 59c3f36e4e7a1a7ea8f926dbf8ca495f83346396e1df5edf6a1bb34823c84308f52a1b6d46be9675d3af9ce8718da4a574f63a4fb210d8fc52131f4534d8670d
-DIST wireshark-3.0.2.tar.xz 30910100 BLAKE2B ffc8f1c5fc09a387c10ec2bbd91f80dcee2b368108c2d93b3c891773dd1d69259fff351adf991d37ecc52fcb69f5ae60ab91333b5bf7b7a3390de2eb9d4f6d9a SHA512 0dab01b614534c9ddea517d045598029c15f24ab54d59110e6819d43d2479afe9eebe04554d25f3b0806cf8c78ed241b0fb261c2024234297eeb25d032fbb982
 DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0 SHA512 78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
 DIST wireshark-3.1.0.tar.xz 31052040 BLAKE2B 96ede4dcbb3f5c4ecf1d935737bb26dcaecabe24e0767b34914febd31a1402d2428580e8b26c145bc98a71ef01fddcfca6e4f5709d9a8d90634ea6ed4789bb20 SHA512 df7ca131d0e0f00ec00ef0934cf070c7f6d06e55830777e5ab62f4b1c5588b57bfb45e69009f8ab0c3f405f9dd730bf35671d09f46a9a846a09154ec47caffc9
-EBUILD wireshark-2.6.7.ebuild 6510 BLAKE2B de9400f9081e9a225d4c3e43f715db085b2e420fd5fe91badba9a9ddbb4f78d83715f4505203b54fab0f5d3aab6366b35ad09ed91d9cf681e2ab3f744840bbfc SHA512 6d0f9594348164136a731ea99a82b22bfec73f51f477446a58f85da5873c956a2806d310c9aa74bf2a8b124c7a22e405b7b1e555d903f316801dedec19c404f5
-EBUILD wireshark-3.0.1.ebuild 6644 BLAKE2B ec4baa9e82e85d4d4f12c8d8952fd67fc01c4452a0baa709d4dcf71313a4f01e8c711aa3735a329868b9627099872a3bb4665e6fe70a7caa84ea0fa910947c14 SHA512 9c48c6c03aa455dda7178f77c1fa32d404d36c814043b3bc71ea60437779f85c5d4af38d35599eab548d7fd856eb1227398a78629acbef2d3f9edb3fa7d05147
-EBUILD wireshark-3.0.2.ebuild 6646 BLAKE2B a83359278ffcc89e54efe7367b13e060884985bc0c4817639b1513815fc62877f6edea5224768ce75f006f569ec01fa950a2554d3048dbad7b32f51f3147c838 SHA512 7273fbcd9a25a1312979cdc244825d6c3139d9b161d396a2f1a6ac58701912228b3a380d415d36d8d37cb1295cb6c0b49f2bd73d95f28853879d4d5917e3dfd9
-EBUILD wireshark-3.0.3.ebuild 6582 BLAKE2B 903e0d9984291cf6a19d02b037ebaf81dbada4e64665800bd8411291bcb4835d4d89f167c5e4626bb7c103376c51d6504759df17c82983f9dcf61fee08c13b57 SHA512 7f6b2b4333b81835f719ce22684e0a5c0a213399b16aa41575544957376ce258de5784abf088c78347fd5bdc1e95a9482bbfe2a9a64f51fc276ab0388478b5c5
+EBUILD wireshark-3.0.1.ebuild 6603 BLAKE2B e6a553eaadb1eb0098088bc18f2603359f6b3c5c3a411d4abdc879c21e2b927362d383cdab19072f333beba35da851368263ea9fb059eb9726ea5bf6f5a969ef SHA512 33362ce11dd19ce6c93c47325907dbbea2f504724ad94464217d98744b19dad1f3461319ba709edb21ad442d22fce6db4d8fae596d1e0714520b34598bdbfcb2
+EBUILD wireshark-3.0.3.ebuild 6578 BLAKE2B 3a333b229fdb0c26aeb66221d4f578ff0b83ab1d531e2fcb9e34c1d6bc3f3b64f760ec421bfd2a8a3be9c323c7182dda8eecc8ffceb90a8815066ad2ea83ecc9 SHA512 7c69e9e51897bbea7d460be38a8ba714e01cb4e0240fbcf5a568f0b76044499d007859b71cd088fde25109b8ca2d6d884ff5d53055bcb85b4ad50f034e0c70a9
 EBUILD wireshark-3.1.0.ebuild 6786 BLAKE2B 7b05213d7d7ba5b672a5f220ddf59933d32cc0a3a721794748309e7db4084ab850f7f8b7cb41ef7ae766d5aaaf15e39e29383490084c97a3f592eee8e0d06582 SHA512 df91871153094a2a3c0ab7346c6f88ae96ec1ca094585bbc7caf1640a1569f637a4b83faa27aad13a8f36eaa13563bb64c6176bdd93d4e83510e5cbd931a46a4
 EBUILD wireshark-99999999.ebuild 6791 BLAKE2B 30a9e0c25a67f859feabdee9edf89b4ce04399dd0e5ab32b49555bed905d133fa6cd6c6c987d8a687a49a1f153740dc8917369ce34c0c6a0febdcaeb8348032c SHA512 ba9ee5fb66214cac558e2b4aed29760535c095b5df46ec24b02a344d414613c41b09322c8ad644ca78f27090b8d2d0e4abfb0405909c88709a2d471a624d427d
 MISC metadata.xml 5146 BLAKE2B f126bc073b880c4c0fac986cef21b7cd6951826df28032ec546b21f5b4472192c91cb6442f765d8e408c1ac7d725518ae316e63a931996c01724154404f879e4 SHA512 895920a9ee9a7f4587d063581b36d00c08b85d554087ddbfb6acbbbd6c066795d8b484826c50740fb4c2db5cf0058ed4d85c0082ab42f7d5e96bd96413701b69
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch b/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch
deleted file mode 100644
index 47459515ee79..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2149,7 +2149,6 @@
- 	# -qt={version} argument, otherwise we look for particular
- 	# tool versions using tool name suffixes.
- 	#
--	AC_PATH_PROG(QTCHOOSER, qtchooser)
- 	if test ! -z "$QTCHOOSER"; then
- 		#
- 		# We found qtchooser; we assume that means that
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch
deleted file mode 100644
index 445851090a69..000000000000
--- a/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -939,14 +939,12 @@
- 			Qt5LinguistTools
- 			Qt5Multimedia
- 			Qt5PrintSupport
--			Qt5Svg
- 			Qt5Widgets
- 		)
- 		set(Qt5Core_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- 		set(Qt5LinguistTools_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- 		set(Qt5Multimedia_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- 		set(Qt5PrintSupport_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
--		set(Qt5Svg_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- 		set(Qt5Widgets_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
- 		if (APPLE)
- 			set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch
deleted file mode 100644
index 654c2c82db17..000000000000
--- a/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2843,6 +2843,7 @@
- 		if(HAVE_LIBPCAP)
- 			set(androiddump_LIBS
- 				ui
-+				wsutil
- 				${GLIB2_LIBRARIES}
- 				${PCAP_LIBRARIES}
- 			)
-@@ -2853,6 +2854,7 @@
- 		set(androiddump_LIBS
- 			ui
- 			wiretap
-+			wsutil
- 			${GLIB2_LIBRARIES}
- 			${ZLIB_LIBRARIES}
- 			${CMAKE_DL_LIBS}
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
deleted file mode 100644
index db1c560848ec..000000000000
--- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/extcap/Makefile.am
-+++ b/extcap/Makefile.am
-@@ -32,6 +32,7 @@
- 	../ui/libui.a			\
- 	../wiretap/libwiretap.la	\
- 	../wsutil/libwsutil.la		\
-+	@PCAP_LIBS@ \
- 	@GLIB_LIBS@
- 
- randpktdump_SOURCES = \
diff --git a/net-analyzer/wireshark/wireshark-2.6.7.ebuild b/net-analyzer/wireshark/wireshark-2.6.7.ebuild
deleted file mode 100644
index d947b47f07b1..000000000000
--- a/net-analyzer/wireshark/wireshark-2.6.7.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib qmake-utils user xdg-utils
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc64 x86"
-IUSE="
-	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
-	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
-	nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux
-	+sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump
-	zlib
-"
-
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-	>=dev-libs/glib-2.14:2
-	dev-libs/libgcrypt:0
-	netlink? ( dev-libs/libnl:3 )
-	adns? ( >=net-dns/c-ares-1.5 )
-	bcg729? ( media-libs/bcg729 )
-	filecaps? ( sys-libs/libcap )
-	gtk? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/pango
-		x11-misc/xdg-utils
-	)
-	kerberos? ( virtual/krb5 )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	lz4? ( app-arch/lz4 )
-	maxminddb? ( dev-libs/libmaxminddb )
-	nghttp2? ( net-libs/nghttp2 )
-	pcap? ( net-libs/libpcap )
-	portaudio? ( media-libs/portaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	!<virtual/perl-Pod-Simple-3.170
-	!<perl-core/Pod-Simple-3.170
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND="
-	${CDEPEND}
-	gtk? ( virtual/freedesktop-icon-theme )
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
-	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-2.6.2-qtsvg.patch
-	"${FILESDIR}"/${PN}-2.6.6-androiddump-wsutil.patch
-	"${FILESDIR}"/${PN}-99999999-androiddump.patch
-)
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	mycmakeargs+=(
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DBUILD_wireshark_gtk=$(usex gtk)
-		-DDISABLE_WERROR=yes
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_CAP=no
-		-DENABLE_CARES=$(usex adns)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex nghttp2)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PORTAUDIO=$(usex portaudio)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		epan/wmem
-		wiretap
-		wsutil
-	)
-	for dir in "${dirs[@]}"
-	do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking
-	# in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use gtk || use qt5; then
-		local s
-		for s in 16 32 48 64 128 256 512 1024; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap; then
-		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.0.1.ebuild b/net-analyzer/wireshark/wireshark-3.0.1.ebuild
index b51c9dc2b5ae..32c6c317528f 100644
--- a/net-analyzer/wireshark/wireshark-3.0.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc64 x86"
+KEYWORDS="arm"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
diff --git a/net-analyzer/wireshark/wireshark-3.0.2.ebuild b/net-analyzer/wireshark/wireshark-3.0.2.ebuild
deleted file mode 100644
index 124702089cb3..000000000000
--- a/net-analyzer/wireshark/wireshark-3.0.2.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit cmake-utils fcaps flag-o-matic ltprune multilib python-r1 qmake-utils user xdg-utils
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc64 x86"
-IUSE="
-	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
-	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
-	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
-	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
-	+udpdump zlib
-"
-
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
-	>=dev-libs/glib-2.32:2
-	dev-libs/libgcrypt:0
-	adns? ( >=net-dns/c-ares-1.5 )
-	bcg729? ( media-libs/bcg729 )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	filecaps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( >=dev-lang/lua-5.1:* )
-	lz4? ( app-arch/lz4 )
-	maxminddb? ( dev-libs/libmaxminddb )
-	netlink? ( dev-libs/libnl:3 )
-	nghttp2? ( net-libs/nghttp2 )
-	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-	!<perl-core/Pod-Simple-3.170
-	!<virtual/perl-Pod-Simple-3.170
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4-androiddump.patch
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
-	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
-	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
-	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
-	enewgroup wireshark
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup 'python3*'
-
-	mycmakeargs+=(
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
-		-DDISABLE_WERROR=yes
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_CARES=$(usex adns)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex nghttp2)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" test-programs
-	emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		epan/wmem
-		wiretap
-		wsutil
-	)
-	for dir in "${dirs[@]}"
-	do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking
-	# in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use qt5; then
-		local s
-		for s in 16 32 48 64 128 256 512 1024; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	enewgroup wireshark
-	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap; then
-		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the wireshark group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
index f7585e7fc2ff..6898a01da4d2 100644
--- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc64 x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 3c6b6369d928..c3d2443a0faf 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -33,11 +33,11 @@ DIST zabbix-4.0.6.tar.gz 17162202 BLAKE2B 8f03830d5493719cbabd770527dfc99e1bd2d8
 DIST zabbix-4.0.7.tar.gz 17175571 BLAKE2B 3173881e093c58175e014d55c74d09656dbb6e99321f808a3ce6fe61aef56325aa94c4a3ff0b1edd2872734cc970052c63e5db377f8e8d605bf25f2eb8505802 SHA512 67373383ef961426901d8c27e1e51c902d8580b9af1877d4012c934f0ee52c5cf85e3f81fd16b244cd9c8e869cf13dbdd7597d8e2591356efc61570b354961f8
 DIST zabbix-4.0.9.tar.gz 17118478 BLAKE2B 0b3761085c9fac577061ca3a0e5839c3d33f13802ff4e752c575f4428339dfbc7e02e5ae8abbf7870a0286c45777c670aa74cd93b2cdbf9cf62961e4723aa0ae SHA512 4e04d80490f43d2e7833a4e11dbc7ce0ed70dc1f43653eeff923f5bfa16bbeedf37597599d68e0de3194820501d896d785a20d6ae0dce9328c458fd711a6a7bf
 DIST zabbix-4.2.3.tar.gz 18241315 BLAKE2B 38f9e61ccfe68de553e115e35466430b9f8b4211ca72b3c0265a9c9e5494575d8b026cda11cb7ef10644df35b8f168b7e5ca72ace8a412445008299c6c513877 SHA512 2e7d7372d5ce84798743d3c10fea0230aac470b0d9936a722687eefbe818b51e16f5dc64040b8b1b1189f64e8785ceca108914534efecd152473d213b15f7e07
-EBUILD zabbix-2.2.16.ebuild 9436 BLAKE2B 3d7e32e772074500827d0bd469e280f77a4f7319ada11d1556bfa3148d0a25e6b00b84d604ac0cca436d375cabfe9cb145c5e51902c8293668135396d1dfc160 SHA512 c244b2dcff1fc7a1e7dc82c254eef974a4153f3f4bdf1b202d50e3006de3e0237d4dcc587ee66ffcbc16bb39ee4ad29a4dfe283332a3593aba2585f5c970d563
-EBUILD zabbix-2.2.21.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d
-EBUILD zabbix-2.2.23.ebuild 9438 BLAKE2B 2032d57e9e5dec45250fba571414aa22b896ecd3f13d42d04b86f0392f153e2cfdc9097cac3b983a331dabd03bcde7b74685139879114bd361a15449bd850123 SHA512 dcda14cad8ea47a09853f5768fb9f538a8150a0fc1da33350ab7d77e161fa85b3719dfcac9515b461815d7c710da7b2ca5ff24db7b7a05a26edeceb00931944d
+EBUILD zabbix-2.2.16-r1.ebuild 9437 BLAKE2B c31b9519737b01d27baf9edbfced815dc05da1d5cd64963e97ca228d854794c39e50c9d8c028ff0da7bf813cdae5011bd99ef608980a3c2de55840752fa872fb SHA512 901bff4d135b436879f890aad4c23251edcc78f7d6dd7fe5d03677ffc8338a40fbf96a50b000a7f9d17bd3ab4a3d15e0f39ce77de9512559886414f6aadad49f
+EBUILD zabbix-2.2.21-r1.ebuild 9439 BLAKE2B 88e198ba41060624100419240e023c9f905058cad9c30ae3f4e44b7464cdf80c26283b624bc2b1d6ed731fd5c2df28f018286ff5b5d5ce3c2e2cd3bf37c9bd5b SHA512 534a266defeb9a02dbf56cd39162280a7c0d367fbe8a53004430436c8f3c4dd23b4b818a002aa5bc52595097fabdc5faedff8015b01ffce8f9395468c61e5cab
+EBUILD zabbix-2.2.23-r1.ebuild 9439 BLAKE2B 88e198ba41060624100419240e023c9f905058cad9c30ae3f4e44b7464cdf80c26283b624bc2b1d6ed731fd5c2df28f018286ff5b5d5ce3c2e2cd3bf37c9bd5b SHA512 534a266defeb9a02dbf56cd39162280a7c0d367fbe8a53004430436c8f3c4dd23b4b818a002aa5bc52595097fabdc5faedff8015b01ffce8f9395468c61e5cab
 EBUILD zabbix-3.0.26.ebuild 9275 BLAKE2B 072b2fde37e9b098ab6767249a8967d558bf561f72e11f55497f9db47d0810cdd751bf3a9d36a5135ca94c2a0dfb88ce21caf31a95180e06a6d6acb5d76acdea SHA512 f30893b5c51596ea6db4bdd19e0a647cb03a6e9f527a70579c8378495250cb63bc056e0807c2be9f39dbceb4cb5f228dc51135e3f9e96cf4d4e2c14df1b00374
-EBUILD zabbix-3.2.11.ebuild 9265 BLAKE2B 489884d6ce42e154f3c7c0a9b1f2e0143b9fdd38a1778b13dd8be48d0e4ba1e6645934fcb495dd08a19a22f23201270c2ef79d3d2885316b2eebae142a4bb04a SHA512 f2fd5f8759e9625a798edad0b00868c27f961cb2d3327855cde7e53e46f4950b269bdc95f280d79d89a95291cf92288a6e163fd72562a889f900ddf519a9e44e
+EBUILD zabbix-3.2.11-r1.ebuild 9266 BLAKE2B b944050634710ed53be3348a0d4f49c1b4de458ce4085d4ea8968fe2ed9ec4c529a910460c8104788448efb6760f25214fce08fdd03632b8a0fa28278f8aec47 SHA512 b6251332a4db49445c42662a2c029fce99f9df6368396d2c52f822939bc0ee9aa3b08329f99b080ea11e0f4f29f41e9a1d193533584e7e65ddabe5c177b82dbe
 EBUILD zabbix-3.4.15.ebuild 9253 BLAKE2B f381475686894409266e9c642872a728306a89ea472b337709ca45683be504e9ae2822f9d105c256630113f6c874595d130204ca512b6ecd93126fb4926447ef SHA512 d4929f2687c5c0a58ceb7a8a98fed706a62a5a717ba7892d85058b7e1e827095245b022a523daf0d3f53727f42b4ff83c693c1a2195eb3656d589bede632db4d
 EBUILD zabbix-4.0.6.ebuild 9441 BLAKE2B d61df5f8af38fe456285b619b37bf5c8dd80f21c15466893ea5f89de4569f8ba2c9fd3db8922f22b9cc311e7d265f47d17b3580df22073cb3ed1547b3a0f3457 SHA512 8c04eae3cb2b184bfc5dcb6a6ef55d7e6a01f38d4eba77aa7603d1d8f10bb8f82f92cab8be942a85851d387fa36f683c4603c18808277ec5208785d7f6f85576
 EBUILD zabbix-4.0.7.ebuild 9441 BLAKE2B d61df5f8af38fe456285b619b37bf5c8dd80f21c15466893ea5f89de4569f8ba2c9fd3db8922f22b9cc311e7d265f47d17b3580df22073cb3ed1547b3a0f3457 SHA512 8c04eae3cb2b184bfc5dcb6a6ef55d7e6a01f38d4eba77aa7603d1d8f10bb8f82f92cab8be942a85851d387fa36f683c4603c18808277ec5208785d7f6f85576
diff --git a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
new file mode 100644
index 000000000000..6449f4cd9d50
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="amd64 x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/2.2"/zabbix_server.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd \
+			"${FILESDIR}/2.2"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_agent.conf \
+			"${FILESDIR}/2.2"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
+		dosbin \
+			src/zabbix_agent/zabbix_agent \
+			src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		fperms 0640 \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agent.conf \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-2.2.16.ebuild b/net-analyzer/zabbix/zabbix-2.2.16.ebuild
deleted file mode 100644
index 16a773d14401..000000000000
--- a/net-analyzer/zabbix/zabbix-2.2.16.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/2.2"/zabbix_server.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd \
-			"${FILESDIR}/2.2"/init.d/zabbix-proxy
-		dosbin \
-			src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_agent.conf \
-			"${FILESDIR}/2.2"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agent.conf \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild
new file mode 100644
index 000000000000..5cf012564554
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/2.2"/zabbix_server.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd \
+			"${FILESDIR}/2.2"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_agent.conf \
+			"${FILESDIR}/2.2"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
+		dosbin \
+			src/zabbix_agent/zabbix_agent \
+			src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		fperms 0640 \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agent.conf \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-2.2.21.ebuild b/net-analyzer/zabbix/zabbix-2.2.21.ebuild
deleted file mode 100644
index cbd15dd4953a..000000000000
--- a/net-analyzer/zabbix/zabbix-2.2.21.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/2.2"/zabbix_server.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd \
-			"${FILESDIR}/2.2"/init.d/zabbix-proxy
-		dosbin \
-			src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_agent.conf \
-			"${FILESDIR}/2.2"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agent.conf \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild
new file mode 100644
index 000000000000..5cf012564554
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/2.2"/zabbix_server.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd \
+			"${FILESDIR}/2.2"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_agent.conf \
+			"${FILESDIR}/2.2"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
+		dosbin \
+			src/zabbix_agent/zabbix_agent \
+			src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		fperms 0640 \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agent.conf \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-2.2.23.ebuild b/net-analyzer/zabbix/zabbix-2.2.23.ebuild
deleted file mode 100644
index cbd15dd4953a..000000000000
--- a/net-analyzer/zabbix/zabbix-2.2.23.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/2.2"/zabbix_server.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd \
-			"${FILESDIR}/2.2"/init.d/zabbix-proxy
-		dosbin \
-			src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/2.2"/zabbix_agent.conf \
-			"${FILESDIR}/2.2"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agent.conf \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-	   dodir \
-	   	/${ZABBIXJAVA_BASE} \
-		/${ZABBIXJAVA_BASE}/bin \
-		/${ZABBIXJAVA_BASE}/lib
-	   keepdir /${ZABBIXJAVA_BASE}
-	   exeinto /${ZABBIXJAVA_BASE}/bin
-	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-	   exeinto /${ZABBIXJAVA_BASE}/lib
-	   doexe \
-	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
-		src/zabbix_java/lib/logback-console.xml \
-		src/zabbix_java/lib/logback-core-0.9.27.jar \
-		src/zabbix_java/lib/logback.xml \
-		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-		src/zabbix_java/lib/slf4j-api-1.6.1.jar
-	   exeinto /${ZABBIXJAVA_BASE}/
-	   doexe \
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild b/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild
new file mode 100644
index 000000000000..39902958a7e2
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.2.11.ebuild b/net-analyzer/zabbix/zabbix-3.2.11.ebuild
deleted file mode 100644
index 318cb9575249..000000000000
--- a/net-analyzer/zabbix/zabbix-3.2.11.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-	static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( >=virtual/mysql-5.0.3 )
-	sqlite? ( >=dev-db/sqlite-3.3.5 )
-	postgres? ( dev-db/postgresql:* )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-	xmpp? ( dev-libs/iksemel )
-	libxml2? ( dev-libs/libxml2 )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )
-	ssh? ( net-libs/libssh2 )
-	java? ( virtual/jdk:* )
-	odbc? ( dev-db/unixODBC )
-	ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping[suid] )
-	server? ( net-analyzer/fping[suid]
-		app-admin/webapp-config )
-	java?	(
-		>=virtual/jre-1.4
-		dev-java/slf4j-api
-	)
-	frontend? (
-		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-		mysql? ( dev-lang/php[mysqli] )
-		odbc? ( dev-lang/php[odbc] )
-		oracle? ( dev-lang/php[oci8-instant-client] )
-		postgres? ( dev-lang/php[postgres] )
-		sqlite? ( dev-lang/php[sqlite] )
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	static? (
-		ldap? (
-			net-nds/openldap[static-libs]
-			=dev-libs/cyrus-sasl-2*[static-libs]
-			net-libs/gnutls[static-libs]
-		)
-	mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] )
-	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-	postgres? ( dev-db/postgresql:*[static-libs] )
-	libxml2? ( dev-libs/libxml2[static-libs] )
-	curl? ( net-misc/curl[static-libs] )
-	ssh? ( net-libs/libssh2[static-libs] )
-	odbc? ( dev-db/unixODBC[static-libs] )
-	)
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
-	if use oracle; then
-		if [ -z "${ORACLE_HOME}" ]; then
-			eerror
-			eerror "The environment variable ORACLE_HOME must be set"
-			eerror "and point to the correct location."
-			eerror "It looks like you don't have Oracle installed."
-			eerror
-			die "Environment variable ORACLE_HOME is not set"
-		fi
-		if has_version 'dev-db/oracle-instantclient-basic'; then
-			ewarn
-			ewarn "Please ensure you have a full install of the Oracle client."
-			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-			ewarn
-		fi
-	fi
-
-	if use frontend; then
-		webapp_pkg_setup
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-	cd "${S}/src/zabbix_java/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(use_enable static) \
-		$(use_enable java) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		$(use_with oracle) \
-		$(use_with sqlite sqlite3) \
-		$(use_with xmpp jabber) \
-		$(use_with curl libcurl) \
-		$(use_with openipmi openipmi) \
-		$(use_with ssh ssh2) \
-		$(use_with libxml2) \
-		$(use_with odbc unixodbc) \
-		$(use_with ssl openssl) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-	fi
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	if use server; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_server.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-		dosbin src/zabbix_server/zabbix_server
-		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-		fperms 0640 /etc/zabbix/zabbix_server.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-server.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-	fi
-
-	if use proxy; then
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-		dosbin src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-		dodir /usr/share/zabbix
-		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-	fi
-
-	if use agent; then
-		insinto /etc/zabbix
-		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-		dosbin src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-		fperms 0640 /etc/zabbix/zabbix_agentd.conf
-		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/lib/zabbix/alertscripts \
-		/var/lib/zabbix/externalscripts \
-		/var/log/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog \
-		conf/zabbix_agentd.conf \
-		conf/zabbix_proxy.conf \
-		conf/zabbix_agentd/userparameter_examples.conf \
-		conf/zabbix_agentd/userparameter_mysql.conf \
-		conf/zabbix_server.conf
-
-	if use frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-
-	if use java; then
-		dodir \
-			/${ZABBIXJAVA_BASE} \
-			/${ZABBIXJAVA_BASE}/bin \
-			/${ZABBIXJAVA_BASE}/lib
-		keepdir /${ZABBIXJAVA_BASE}
-		exeinto /${ZABBIXJAVA_BASE}/bin
-		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
-		exeinto /${ZABBIXJAVA_BASE}/lib
-		doexe \
-			src/zabbix_java/lib/logback-classic-0.9.27.jar \
-			src/zabbix_java/lib/logback-console.xml \
-			src/zabbix_java/lib/logback-core-0.9.27.jar \
-			src/zabbix_java/lib/logback.xml \
-			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
-			src/zabbix_java/lib/slf4j-api-1.6.1.jar
-		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
-	fi
-}
-
-pkg_postinst() {
-	if use server || use proxy ; then
-		elog
-		elog "You may need to configure your database for Zabbix,"
-		elog "if you have not already done so. "
-		elog
-
-		zabbix_homedir=$(egethome zabbix)
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	if use server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "You may need to add these lines to /etc/services:"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	if use server || use proxy ; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				;;
-		esac
-	fi
-}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index b0bae8d85d8e..6fa6bd4a1f52 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index afe13434130c..696ee03f7c74 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,5 +1,8 @@
+AUX sparc-pause-instruction.patch 4109 BLAKE2B e0a705c5b29033f54ae5d707a0159d8814fb15be4fdc33f91834f2aa50c3c37ca2d653d17222f16bb4e45f8d2e6a983f15ef70ebcd07f579426d3d97b5d78ecf SHA512 590fa784999692700db796291236ce9436e775b16cb737f853d2b5e0b9433f2993682edad2e9f25be140d6fe00edc3768947670a404079b603f8e93651d6da84
 DIST bind-9.14.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932
+DIST bind-9.14.5.tar.gz 6313555 BLAKE2B 46bde0f6f78ee15357bca0129022a6dd88941f633513a8d768b53d9c3bc0f4f7af4d8dc8cc4b1d6119d148700703b2fa27b6834671dcb5df9b544e4a2025452b SHA512 1b18eda5dea639f9b34e1c41b534704b0d5f64c036b766c9cfccf9bbeb586ce4ea7f0d098a5b2747e88aa403e48ad8ae0b6e560e93348f0dc7616f914671d084
 DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646
-EBUILD bind-tools-9.14.4.ebuild 3044 BLAKE2B b7695a80cff665209ec6b662398e21cf9bed283e9e5cba40889fa594f9dc8084431518a35de4dfa22680fa8370abfbb66a56428a040c57561440a30cc3a5d0d8 SHA512 48e5022bb9060e7b6214f18c9aa7a1205a1f35cf04d1b7583598c62b822e53e9a9db83a73ac8d30070b670906046e0a9efacb728d4120e7a393c142c0076ea1d
-EBUILD bind-tools-9.15.2.ebuild 2834 BLAKE2B 9d0dd1053c2e177fba876d00ff65006fd0e0c35b90f5f912a0b267361cc3876c1380ad256c50731cad7dd24861fa5af84dd9272ff797796577334dca9a8522d8 SHA512 a8cd57dcd7e925e81a7d11361354410cddddcca4f0813ee5d74c8d3e7d3c721704b7b37e585ee4a8b92645b94b55d12f3338d25a1f8eee4b7d2e506f404bbbb9
+EBUILD bind-tools-9.14.4.ebuild 3195 BLAKE2B d1c2e157df3e38c512e3fddc3c6da2149b960cd4ea68e7127463e8518cc681b7a872b7500c0e6bdec9c9d9739d115c4289907a39ab4b5787504d1b43a6ca834d SHA512 180240d41e9bc9d9057ecc19d5d82886f7dd5e0f80f5841d9371b44048904322fb9a985633a20b0e1a1faef15ef74ae9fd8d0e1b34ea9b5dbc316f7c22005b62
+EBUILD bind-tools-9.14.5.ebuild 3148 BLAKE2B 5399c325ed33fc10c9aeb2bd1c2a2e5cbecbc5beee693b8fbdf4620aba7fec57764636f6ba99600599f91cbf6c9266b9701d3c0eece2590f841df38847320c59 SHA512 5d5ae428ae45da3e7af8b7d657054025858af9ce08dec4fa1098d7446f1bee09ce5bc5968937c2d1196d8a494ff78ad938b0bedb0f1ff45bae9f7ce466295f6e
+EBUILD bind-tools-9.15.2.ebuild 2930 BLAKE2B a08144a58d307eef0ad98ce59b91f8dd2f439f982132df6cab8b3c2f23c652a0333b307beba6e21966b23681ca4462a43ad7ab27da88f0b0490b07e1d14278be SHA512 a5b22961bc788d1b2b89c8ae16722675ff193ef0089cd9c7956d100f1dd38cc0888b01e32a0b85ec9fff43eeff5ffe7875b8b7ed807853f90b51170fcb06271e
 MISC metadata.xml 488 BLAKE2B 44d0112102447f6d6f8c76aa5e3018de5fc4746240a1a7f187cb7bc493e9a442812c5b0f1c4a8a0a3410af12fbd2e390f6291c981440840b42348f403a278e2c SHA512 ac2a79f4622fd4aa957f9ad0618c631d4c68497443015bbd12c1670576d4515649f26c39c555046771b2aadd5f9b53fdc4c478ba7fb07e24f06b3a4f30f071e0
diff --git a/net-dns/bind-tools/bind-tools-9.14.4.ebuild b/net-dns/bind-tools/bind-tools-9.14.4.ebuild
index 489ecbb114fe..fd6ff9184d41 100644
--- a/net-dns/bind-tools/bind-tools-9.14.4.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.4.ebuild
@@ -17,14 +17,13 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc gssapi idn ipv6 libedit libressl readline ssl xml"
+IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
-CDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+COMMON_DEPEND="
+	caps? ( sys-libs/libcap )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	xml? ( dev-libs/libxml2 )
 	idn? ( net-dns/libidn2:= )
 	gssapi? ( virtual/krb5 )
@@ -32,19 +31,25 @@ CDEPEND="
 	!libedit? (
 		readline? ( sys-libs/readline:0= )
 	)"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_EPEND}
 	!<net-dns/bind-9.10.2"
 
+BDEPEND="virtual/pkgconfig"
+
 S="${WORKDIR}/${MY_P}"
 
 # bug 479092, requires networking
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}"/sparc-pause-instruction.patch )
+
 src_prepare() {
 	default
 
+	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
 	# Disable tests for now, bug 406399
 	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
 
@@ -63,10 +68,10 @@ src_configure() {
 		--without-zlib
 		--without-lmdb
 		$(use_with idn libidn2)
-		$(use_with ssl openssl "${EPREFIX}"/usr)
 		$(use_with xml libxml2)
 		$(use_with gssapi)
 		$(use_with readline)
+		$(use_enable caps linux-caps)
 	)
 
 	# bug 607400
diff --git a/net-dns/bind-tools/bind-tools-9.14.5.ebuild b/net-dns/bind-tools/bind-tools-9.14.5.ebuild
new file mode 100644
index 000000000000..cccff23c8588
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.14.5.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+COMMON_DEPEND="
+	caps? ( sys-libs/libcap )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/libidn2:= )
+	gssapi? ( virtual/krb5 )
+	libedit? ( dev-libs/libedit )
+	!libedit? (
+		readline? ( sys-libs/readline:0= )
+	)"
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_EPEND}
+	!<net-dns/bind-9.10.2"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--without-python
+		--without-libjson
+		--without-zlib
+		--without-lmdb
+		$(use_with idn libidn2)
+		$(use_with xml libxml2)
+		$(use_with gssapi)
+		$(use_with readline)
+		$(use_enable caps linux-caps)
+	)
+
+	# bug 607400
+	if use libedit ; then
+		myeconfargs+=( --with-readline=-ledit )
+	elif use readline ; then
+		myeconfargs+=( --with-readline=-lreadline )
+	else
+		myeconfargs+=( --without-readline )
+	fi
+
+	# bug 344029
+	append-cflags "-DDIG_SIGCHASE"
+
+	# to expose CMSG_* macros from sys/sockets.h
+	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
+
+	# localstatedir for nsupdate -l, bug 395785
+	tc-export BUILD_CC
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+	local AR=$(tc-getAR)
+
+	emake AR="${AR}" -C lib/
+	emake AR="${AR}" -C bin/delv/
+	emake AR="${AR}" -C bin/dig/
+	emake AR="${AR}" -C bin/nsupdate/
+	emake AR="${AR}" -C bin/dnssec/
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	cd "${S}"/bin/delv || die
+	dobin delv
+	doman delv.1
+
+	cd "${S}"/bin/dig || die
+	dobin dig host nslookup
+	doman {dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate || die
+	dobin nsupdate
+	doman nsupdate.1
+	if use doc; then
+		docinto html
+		dodoc nsupdate.html
+	fi
+
+	cd "${S}"/bin/dnssec || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+		revoke settime signzone verify; do
+		dobin dnssec-"${tool}"
+		doman dnssec-"${tool}".8
+		if use doc; then
+			docinto html
+			dodoc dnssec-"${tool}".html
+		fi
+	done
+}
diff --git a/net-dns/bind-tools/bind-tools-9.15.2.ebuild b/net-dns/bind-tools/bind-tools-9.15.2.ebuild
index fe96db31c354..cb870329d1a3 100644
--- a/net-dns/bind-tools/bind-tools-9.15.2.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.15.2.ebuild
@@ -17,14 +17,13 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.gz"
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc gssapi idn ipv6 libedit libressl readline ssl xml"
+IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
-CDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+COMMON_DEPEND="
+	caps? ( sys-libs/libcap )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	xml? ( dev-libs/libxml2 )
 	idn? ( net-dns/libidn2:= )
 	gssapi? ( virtual/krb5 )
@@ -32,11 +31,14 @@ CDEPEND="
 	!libedit? (
 		readline? ( sys-libs/readline:0= )
 	)"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
 	!<net-dns/bind-9.10.2"
 
+BDEPEND="virtual/pkgconfig"
+
 S="${WORKDIR}/${MY_P}"
 
 # bug 479092, requires networking
@@ -45,6 +47,8 @@ RESTRICT="test"
 src_prepare() {
 	default
 
+	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
 	# Disable tests for now, bug 406399
 	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
 
@@ -63,10 +67,10 @@ src_configure() {
 		--without-zlib
 		--without-lmdb
 		$(use_with idn libidn2)
-		$(use_with ssl openssl "${EPREFIX}"/usr)
 		$(use_with xml libxml2)
 		$(use_with gssapi)
 		$(use_with readline)
+		$(use_enable caps linux-caps)
 	)
 
 	# bug 607400
diff --git a/net-dns/bind-tools/files/sparc-pause-instruction.patch b/net-dns/bind-tools/files/sparc-pause-instruction.patch
new file mode 100644
index 000000000000..35ddb24da0b0
--- /dev/null
+++ b/net-dns/bind-tools/files/sparc-pause-instruction.patch
@@ -0,0 +1,135 @@
+From a5ad6b16c5c0bfd333758d707a6397be79a92914 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Thu, 8 Aug 2019 08:33:10 +0100
+Subject: [PATCH] configure.ac: autodetect 'pause' instruction presence on
+ sparc
+
+The change fixes the following build failure on sparc T3 and older CPUs:
+
+```
+sparc-unknown-linux-gnu-gcc ... -O2 -mcpu=niagara2 ... -c rwlock.c
+{standard input}: Assembler messages:
+{standard input}:398: Error: Architecture mismatch on "pause ".
+{standard input}:398: (Requires v9e|v9v|v9m|m8; requested architecture is v9b.)
+make[1]: *** [Makefile:280: rwlock.o] Error 1
+```
+
+`pause` insutruction exists only on `-mcpu=niagara4` (`T4`) and upper.
+
+The change adds `pause` configure-time autodetection and uses it if available.
+config.h.in got new `HAVE_SPARC_PAUSE` knob. Fallback is a fall-through no-op.
+
+Build-tested on:
+
+- sparc-unknown-linux-gnu-gcc (no `pause`, build succeeds)
+- sparc-unknown-linux-gnu-gcc -mcpu=niagara4 (`pause`, build succeeds)
+
+Reported-by: Rolf Eike Beer
+Bug: https://bugs.gentoo.org/691708
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ config.h.in      |  3 +++
+ configure        | 33 +++++++++++++++++++++++++++++++++
+ configure.ac     | 14 ++++++++++++++
+ lib/isc/rwlock.c |  2 +-
+ 4 files changed, 51 insertions(+), 1 deletion(-)
+
+diff --git a/config.h.in b/config.h.in
+index 91508e5d91..eeba105ec6 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -357,6 +357,9 @@
+ /* Define to 1 if you have the `setresuid' function. */
+ #undef HAVE_SETRESUID
+ 
++/* define if the SPARC pause instruction is available */
++#undef HAVE_SPARC_PAUSE
++
+ /* define if struct stat has st_mtim.tv_nsec field */
+ #undef HAVE_STAT_NSEC
+ 
+diff --git a/configure b/configure
+index d336f6aa24..757dacb06e 100755
+--- a/configure
++++ b/configure
+@@ -13872,6 +13872,39 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; #(
+      ;;
+ esac
+ 
++#
++# Check for pause support on SPARC processors
++#
++case $host in #(
++  sparc*) :
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pause instruction support" >&5
++$as_echo_n "checking for pause instruction support... " >&6; }
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++int
++main ()
++{
++__asm__ __volatile__ ("pause")
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define HAVE_SPARC_PAUSE 1" >>confdefs.h
++
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; #(
++  *) :
++     ;;
++esac
++
+ for ac_func in sysctlbyname
+ do :
+   ac_fn_c_check_func "$LINENO" "sysctlbyname" "ac_cv_func_sysctlbyname"
+diff --git a/configure.ac b/configure.ac
+index 90aafae8d0..b04c651966 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -415,6 +415,20 @@ AS_CASE([$host],
+ 			[define if the ARM yield instruction is available])],
+ 	     [AC_MSG_RESULT([no])])])
+ 
++#
++# Check for pause support on SPARC processors
++#
++AS_CASE([$host],
++	[sparc*],
++	[AC_MSG_CHECKING([for pause instruction support])
++	 AC_COMPILE_IFELSE(
++	     [AC_LANG_PROGRAM([[]],
++			     [[__asm__ __volatile__ ("pause")]])],
++	     [AC_MSG_RESULT([yes])
++	      AC_DEFINE([HAVE_SPARC_PAUSE], [1],
++			[define if the SPARC pause instruction is available])],
++	     [AC_MSG_RESULT([no])])])
++
+ AC_CHECK_FUNCS([sysctlbyname])
+ 
+ #
+diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
+index a6ea35feed..e313a912e0 100644
+--- a/lib/isc/rwlock.c
++++ b/lib/isc/rwlock.c
+@@ -152,7 +152,7 @@ isc_rwlock_destroy(isc_rwlock_t *rwl) {
+ # define isc_rwlock_pause() __asm__ __volatile__ ("yield")
+ #elif defined(sun) && (defined(__sparc) || defined(__sparc__))
+ # define isc_rwlock_pause() smt_pause()
+-#elif defined(__sparc) || defined(__sparc__)
++#elif (defined(__sparc) || defined(__sparc__)) && HAVE_SPARC_PAUSE
+ # define isc_rwlock_pause() __asm__ __volatile__ ("pause")
+ #elif defined(__ppc__) || defined(_ARCH_PPC)  ||			\
+ 	defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER)
+-- 
+2.21.0
+
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index f756aef81282..c5d06852a638 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -8,8 +8,10 @@ AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f
 AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d9503834c0d7d7d56f1a987175cb413bc7fec10249002b84b6580d87cb61d2b6a1965cd34d05807abe0390c SHA512 c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
 DIST bind-9.14.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932
+DIST bind-9.14.5.tar.gz 6313555 BLAKE2B 46bde0f6f78ee15357bca0129022a6dd88941f633513a8d768b53d9c3bc0f4f7af4d8dc8cc4b1d6119d148700703b2fa27b6834671dcb5df9b544e4a2025452b SHA512 1b18eda5dea639f9b34e1c41b534704b0d5f64c036b766c9cfccf9bbeb586ce4ea7f0d098a5b2747e88aa403e48ad8ae0b6e560e93348f0dc7616f914671d084
 DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.14.4.ebuild 11630 BLAKE2B 8552b9a50399c437b8f66582b9379b382bcf2a0348661fae0a651cc0f831e33b666bb966b0ba54ccaaf833214bda2bc3f607f1ab051bd4807b22bc30b35cee17 SHA512 db8e49ebebb3c99c8d295301df04eca01d37b5803898c79d55118e92891f76a48800bc804639d002d13a7f22bd37140fb3252975a6fdcaff8ce25965a3578f9b
-EBUILD bind-9.15.2.ebuild 11440 BLAKE2B c30e7efb317373682f1bcfebd8a4e7226f264907f93085bf711a4777e7be94cc73166159dd3ec7b15d64d94c92c8ec57f953b4d822a60e14baf6a83c1b3115c8 SHA512 4cf463d5226da0ac27e7b0c0334efdc300b79e9fc2eace784122c7106e258417a8ed9d60f0d42b4d2b23b3438cc556ce2848092da0fc5f0a44d05a673cdcfaf8
-MISC metadata.xml 1128 BLAKE2B 8d48c81803010ad0c5f3cc98da7a42b1a684c267f0422c8615fb02f9a9f59d368b923a888f3dd115ea00be7693e4ee292148bb8493f097666e9ff5bbc5e0e4a5 SHA512 80b67f58f87e6bb11ec12de7460cfbcdcca1494a0d0b9a64057dad43a5a9883ac222608dd717b49b4e56e513b2be57ccb70cfd30c987a436fdfa0f7cbe01fe97
+EBUILD bind-9.14.4.ebuild 11612 BLAKE2B ec1aed9cca707a5bf5248dbf0d7be564b68c4ca011235799dca4621827b35f19f5ede9a161b4caf3e0bf2f2790d3d2ee708b40bc96026a58fc27badd6891d5ba SHA512 acc4a3b1eea4fa388f3220f360433217a6697bd4d142d83d4bb6f05ed73edeebb14a6c0c94f112c635f2daad0421663ba931f682de6a90a0c8a0c82512296b78
+EBUILD bind-9.14.5.ebuild 11321 BLAKE2B d7dedb82cfa5ef77f53715e24e100e2c1add21ceb03607126e4a8fcc99ffcfe0b08f57b9296f7811186882c3d12a9f247accb78049d584f247d1a31a229f5c11 SHA512 5476cecbcc8198e6b57a33b8092cf02b495fb2259af9ebec0e8b79ae0e61f6323e30bbbed67b1247349bc358839785ec7a306eaca3297ccfb801c2b0de8b4bc4
+EBUILD bind-9.15.2.ebuild 11417 BLAKE2B 89c03b4ef7bb016be184503812513e270fd6608d6121525f241e60dcec1131c8206179ecc28fd152c1ec529c490ee8e13539b48b2c897cd0f9b6e219c916746a SHA512 298b38b6701f10d07d9860b6fdeafca10c46711b0a97520ca8b80d21e96dd6b9319114f86dab9a1002781b9b8344d19c676100ee0ca482540c73de408a182454
+MISC metadata.xml 1188 BLAKE2B 6da9a02bb959544829b980c3edfbe859b73e9f21485e78a23c00d9351fd933de5ba668ebffcffbec7da118116d95232ccaae7d4528de9c2dac6565cabc4f29cc SHA512 0589922970d0998c59e48e485c4475eede9a04cc5b029e1c4c2988d478e72287230613003777034b1df98042c0e7b4f79cfe22585c108b2c668d20710d43c655
diff --git a/net-dns/bind/bind-9.14.4.ebuild b/net-dns/bind/bind-9.14.4.ebuild
index 73486f000eed..56b57d6e2972 100644
--- a/net-dns/bind/bind-9.14.4.ebuild
+++ b/net-dns/bind/bind-9.14.4.ebuild
@@ -39,7 +39,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi
-json ldap libressl lmdb mysql odbc postgres python selinux ssl static-libs
+json ldap libressl lmdb mysql odbc postgres python selinux static-libs
 urandom xml +zlib"
 # sdb-ldap - patch broken
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
@@ -53,11 +53,8 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )"
 # sdb-ldap? ( dlz )
 
-DEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0[-bindist] )
-		libressl? ( dev-libs/libressl )
-	)
+DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] )
+	libressl? ( dev-libs/libressl )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
@@ -78,7 +75,7 @@ DEPEND="
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
-	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )"
+	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -95,6 +92,8 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
 	# Adjusting PATHs in manpages
 	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
 		sed -i \
@@ -152,7 +151,6 @@ src_configure() {
 		$(use_with postgres dlz-postgres)
 		$(use_with lmdb)
 		$(use_with python)
-		$(use_with ssl openssl "${EPREFIX}"/usr)
 		$(use_with xml libxml2)
 		$(use_with zlib)
 	)
@@ -211,19 +209,19 @@ src_install() {
 
 	if use gost; then
 		sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' \
-			-i "${ED%/}/etc/init.d/named" || die
+			-i "${ED}/etc/init.d/named" || die
 	else
 		sed -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' \
-			-i "${ED%/}/etc/init.d/named" || die
+			-i "${ED}/etc/init.d/named" || die
 	fi
 
 	newenvd "${FILESDIR}"/10bind.env 10bind
 
 	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f "${ED%/}"/usr/share/man/man1/{dig,host,nslookup}.1* || die
-	rm -f "${ED%/}"/usr/share/man/man8/nsupdate.8* || die
-	rm -f "${ED%/}"/usr/bin/{dig,host,nslookup,nsupdate} || die
-	rm -f "${ED%/}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
+	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die
+	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
+	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
+	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
 	for tool in dsfromkey importkey keyfromlabel keygen \
 	  revoke settime signzone verify; do
 		rm -f "${ED%/}"/usr/{,s}bin/dnssec-"${tool}" || die
@@ -244,16 +242,16 @@ src_install() {
 		}
 		python_foreach_impl install_python_tools
 
-		python_replicate_script "${ED%/}/usr/sbin/dnssec-checkds"
-		python_replicate_script "${ED%/}/usr/sbin/dnssec-coverage"
+		python_replicate_script "${ED}/usr/sbin/dnssec-checkds"
+		python_replicate_script "${ED}/usr/sbin/dnssec-coverage"
 	fi
 
 	# bug 450406
 	dosym named.cache /var/bind/root.cache
 
-	dosym /var/bind/pri /etc/bind/pri
-	dosym /var/bind/sec /etc/bind/sec
-	dosym /var/bind/dyn /etc/bind/dyn
+	dosym "${ED}"/var/bind/pri /etc/bind/pri
+	dosym "${ED}"/var/bind/sec /etc/bind/sec
+	dosym "${ED}"/var/bind/dyn /etc/bind/dyn
 	keepdir /var/bind/{pri,sec,dyn}
 
 	dodir /var/log/named
diff --git a/net-dns/bind/bind-9.14.5.ebuild b/net-dns/bind/bind-9.14.5.ebuild
new file mode 100644
index 000000000000..6f05b895942c
--- /dev/null
+++ b/net-dns/bind/bind-9.14.5.ebuild
@@ -0,0 +1,372 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+#	sdb-ldap? (
+#		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
+#	)"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# -berkdb by default re bug 602682
+IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
+json ldap libressl lmdb mysql odbc postgres python selinux static-libs
+urandom xml +zlib"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="
+	?? ( geoip geoip2 )
+	postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+# sdb-ldap? ( dlz )
+
+DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] )
+	libressl? ( dev-libs/libressl )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )
+	postgres? ( dev-db/postgresql:= )
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( >=dev-libs/geoip-1.4.6 )
+	geoip2? ( dev-libs/libmaxminddb )
+	gssapi? ( virtual/krb5 )
+	json? ( dev-libs/json-c:= )
+	lmdb? ( dev-db/lmdb )
+	zlib? ( sys-libs/zlib )
+	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/ply[${PYTHON_USEDEP}]
+	)"
+#	sdb-ldap? ( net-nds/openldap )
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_prepare() {
+	default
+
+	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
+	# Adjusting PATHs in manpages
+	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
+		sed -i \
+			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+			"${i}" || die "sed failed, ${i} doesn't exist"
+	done
+
+#	if use dlz; then
+#		# sdb-ldap patch as per  bug #160567
+#		# Upstream URL: http://bind9-ldap.bayour.com/
+#		# New patch take from bug 302735
+#		if use sdb-ldap; then
+#			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+#			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
+#			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
+#			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
+#		fi
+#	fi
+
+	# should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir=/etc/bind
+		--localstatedir=/var
+		--with-libtool
+		--enable-full-report
+		--without-readline
+		$(use_enable caps linux-caps)
+		$(use_enable dnsrps)
+		$(use_enable dnstap)
+		$(use_enable fixed-rrset)
+		# $(use_enable static-libs static)
+		$(use_with berkdb dlz-bdb)
+		$(use_with dlz dlopen)
+		$(use_with dlz dlz-filesystem)
+		$(use_with dlz dlz-stub)
+		$(use_with gssapi)
+		$(use_with json libjson)
+		$(use_with ldap dlz-ldap)
+		$(use_with mysql dlz-mysql)
+		$(use_with odbc dlz-odbc)
+		$(use_with postgres dlz-postgres)
+		$(use_with lmdb)
+		$(use_with python)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+	)
+
+	use geoip && myeconfargs+=( --with-geoip )
+	use geoip2 && myeconfargs+=( --with-geoip2 )
+
+	# bug #158664
+#	gcc-specs-ssp && replace-flags -O[23s] -O
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_install() {
+	default
+
+	dodoc CHANGES README
+
+	if use doc; then
+		dodoc doc/arm/Bv9ARM.pdf
+
+		docinto misc
+		dodoc -r doc/misc/
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dodoc -r doc/arm/
+
+		docinto contrib
+		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+		# some handy-dandy dynamic dns examples
+		pushd "${ED%/}"/usr/share/doc/${PF} 1>/dev/null || die
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+		popd 1>/dev/null || die
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r3 named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r13 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die
+	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
+	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
+	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	  revoke settime signzone verify; do
+		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
+		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
+	done
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	# bug 405251
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use python; then
+		install_python_tools() {
+			dosbin bin/python/dnssec-{checkds,coverage}
+		}
+		python_foreach_impl install_python_tools
+
+		python_replicate_script "${ED}/usr/sbin/dnssec-checkds"
+		python_replicate_script "${ED}/usr/sbin/dnssec-coverage"
+	fi
+
+	# bug 450406
+	dosym named.cache /var/bind/root.cache
+
+	dosym "${ED}"/var/bind/pri /etc/bind/pri
+	dosym "${ED}"/var/bind/sec /etc/bind/sec
+	dosym "${ED}"/var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn}
+
+	dodir /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	systemd_dotmpfilesd "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+pkg_postinst() {
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		if use urandom; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a
+			echo
+		fi
+		chown root:named /etc/bind/rndc.key || die
+		chmod 0640 /etc/bind/rndc.key || die
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT} || die
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
+	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
+
+	chown root:named \
+		${CHROOT} \
+		${CHROOT}/var/{bind,log/named} \
+		${CHROOT}/run/named/ \
+		${CHROOT}/etc/bind \
+		|| die
+
+	mknod ${CHROOT}/dev/null c 1 3 || die
+	chmod 0666 ${CHROOT}/dev/null || die
+
+	mknod ${CHROOT}/dev/zero c 1 5 || die
+	chmod 0666 ${CHROOT}/dev/zero || die
+
+	if use urandom; then
+		mknod ${CHROOT}/dev/urandom c 1 9 || die
+		chmod 0666 ${CHROOT}/dev/urandom || die
+	else
+		mknod ${CHROOT}/dev/random c 1 8 || die
+		chmod 0666 ${CHROOT}/dev/random || die
+	fi
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/ || die
+		cp -a /var/bind ${CHROOT}/var/ || die
+	fi
+
+	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+		if use geoip; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
+		elif use geoip2; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
+		fi
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/bind/bind-9.15.2.ebuild b/net-dns/bind/bind-9.15.2.ebuild
index d1efa262a4a5..b26c1f1fbdb5 100644
--- a/net-dns/bind/bind-9.15.2.ebuild
+++ b/net-dns/bind/bind-9.15.2.ebuild
@@ -39,7 +39,7 @@ SLOT="0"
 KEYWORDS=""
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi
-json ldap libressl lmdb mysql odbc postgres python selinux ssl static-libs
+json ldap libressl lmdb mysql odbc postgres python selinux static-libs
 urandom xml +zlib"
 # sdb-ldap - patch broken
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
@@ -53,11 +53,8 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )"
 # sdb-ldap? ( dlz )
 
-DEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0[-bindist] )
-		libressl? ( dev-libs/libressl )
-	)
+DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] )
+	libressl? ( dev-libs/libressl )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
@@ -78,7 +75,7 @@ DEPEND="
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
-	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )"
+	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -95,6 +92,8 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
 	# Adjusting PATHs in manpages
 	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
 		sed -i \
@@ -152,7 +151,6 @@ src_configure() {
 		$(use_with postgres dlz-postgres)
 		$(use_with lmdb)
 		$(use_with python)
-		$(use_with ssl openssl "${EPREFIX}"/usr)
 		$(use_with xml libxml2)
 		$(use_with zlib)
 	)
diff --git a/net-dns/bind/metadata.xml b/net-dns/bind/metadata.xml
index 5c09dd2e7744..f9a219809fa9 100644
--- a/net-dns/bind/metadata.xml
+++ b/net-dns/bind/metadata.xml
@@ -15,6 +15,7 @@
 		<flag name="dnsrps">Enable the DNS Response Policy Service (DNSRPS) API, a mechanism to allow an external response policy provider</flag>
 		<flag name="dlz">Enables dynamic loaded zones, 3rd party extension</flag>
 		<flag name="fixed-rrset">Enables fixed rrset-order option</flag>
+		<flag name="geoip2">Enable GeoIP2 API from MaxMind</flag>
 		<flag name="gost">Enables gost OpenSSL engine support</flag>
 		<flag name="gssapi">Enable gssapi support</flag>
 		<flag name="json">Enable JSON statistics channel</flag>
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 20f4034f9f2a..f202ce28e1a4 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -8,6 +8,6 @@ AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8
 DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f
 DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068
 EBUILD dnsmasq-2.79.ebuild 4594 BLAKE2B 28cf745cd261bf067114adc98733f5e00a2f6a10a906d4eaf2175c0457d538d7d96b91fe87a87320c3df27a5c64234ed7d5bbee993070964fa421b8e5b12693c SHA512 eb8ac4fdf747657983909b22baa2e0af5f2299d2a5ab4d97933b185e528cddbb1d4cc7ca14c2efddcd8c6f4ec9861f3c37d9fc59c96b68f55c45a274acf7eff7
-EBUILD dnsmasq-2.80-r1.ebuild 4809 BLAKE2B 3e69803a3f70a3d64d2b34609407791b66546c000b601bea27369b14207a01775acdec510df88119f1b3d9329d8589896eee6ac80526e9625530ef089ebd357e SHA512 b4dbb133a052007d9a1f8111df056a883c2d5de76a7c510782a9f521448803fd1f993b89dd4360752d90e2b5b75f9fb518140317bed0fd88fd724b8ad53d3365
+EBUILD dnsmasq-2.80-r1.ebuild 4804 BLAKE2B 0cdafef75a132aca8365120e4fa54df4f48de281cd5d2a5e587864389fb86c332bdcc459c148b712e8acdf4b172bf094cb7e07133f1ad7a1d02dd0dae06b6809 SHA512 d2c342597d88de56440c0345b93ae57de6cfe1f132ff5b6c570426b7f8e08891738764b9adc772240b7f75b988668c350f421a230615dfa50a4643dcff930910
 EBUILD dnsmasq-2.80.ebuild 4742 BLAKE2B 4844bb2c2fed9d35ee6358bedf86c9fac3feacedc965628b53687bc22ac672f2a5a7eef90f112a0a1446fb99ce79c7233d2178b5bf7773e8fad23dc2a1557f2b SHA512 a278d6e216bde4d31671481eb7d9ec302789854119229c0852a1204b7b059213ca19ed48b99afe75221e39494c358f537d56a6da1e5275ef563844ff4083e49e
 MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc
diff --git a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
index e73c42b41c10..be6a1b57d82a 100644
--- a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
@@ -16,10 +16,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
 IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
 
-PATCHES=(
-	"${FILESDIR}/${P}-nettle-3.5.patch"
-)
-
 DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
 
 BDEPEND="app-arch/xz-utils
@@ -58,6 +54,7 @@ REQUIRED_USE="dhcp-tools? ( dhcp )
 	libidn2? ( idn )"
 
 PATCHES=(
+	"${FILESDIR}/dnsmasq-2.80-nettle-3.5.patch"
 	"${FILESDIR}/dnsmasq-2.80-linux-headers-5.2.patch"
 )
 
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 651aea6c6fb6..faa1f07f894b 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -2,7 +2,11 @@ AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
 DIST knot-2.7.7.tar.xz 1156996 BLAKE2B aa31233cf9af9f8060a40788529593d35912992472d5b9d892e632ba4cbf08a0f0adec6ed00d1152bf6cd443e3a659fa88050355e65a71cc2a3aac3c453bdc44 SHA512 95c341ce7c8cc2e65429d6e3bf009844fbd82ca5a0e36019f0e019ce35fc3ba8b68c159d34637380f6a3ad3dc2291ed5adc37e91515b2b6ecf61f7078ddad841
+DIST knot-2.7.8.tar.xz 1158284 BLAKE2B 513670a05d9014e990f09e525dd638cfaac00027172a09734e23302bfdc1bd8d61d145e566485410ee1277dfdc48317afeffc9064dad6e88b1938965ba862924 SHA512 e220e9d885f488119bcb8324576b981e4c45e15d710595d6acaf121fbff9442e5c1d8c723c11dcd9cbc4d26e7a5200f002d52a94c67ba8af04f5c0c82615def7
 DIST knot-2.8.2.tar.xz 1193760 BLAKE2B 0afd70740be103d596856dfcfea629b5216aa41e8e0044f050a993967c7bf53a129fd824d1d1ec6fef4d41072f25225f06a6113bf86266d755d6f944c8b5799f SHA512 d7a045cc7b1a1f43b9536283d4202d7f8f36ac2160e0b985b40f318cc0041f3c3e977ff2db6f518dd37ea62d93d0d3f617bca1ac0dff81185bf5dcb9c1eac97b
+DIST knot-2.8.3.tar.xz 1206172 BLAKE2B f306b5c788bb27c8062284167378046a4f77926b805f9c2fb84b5192f51d2079547cf740b9b156673e6bfc2a5f28d6ff6762dc7d854a56a0a98d1dcac9f39fca SHA512 a5743181807b944c9b6dfce845f009c576125c114fbac7b87592129b724628466740fb77e41cabd8aaf9f046374a9337a1c97ea74b33afae1af6e39e21f8e662
 EBUILD knot-2.7.7.ebuild 1962 BLAKE2B 37fd12290d609d8e5874f3e1cece9b600be35b90466b318e33f32c47ea422a6538c9c04cada4218d9fe91ea5b08fc23348c362ba19f8e425694a2fe1998d7c62 SHA512 8557b7aab3e1cbd7ab1bc0f1c0b510f9060c30ac1add36687340d3a6de16961394bbcf710230b70f9b1b890df1301c284993b1014bdde2cb83934d863d055fb7
+EBUILD knot-2.7.8.ebuild 1887 BLAKE2B 50877ea27c72362a6121b4c26a5fc5897ccb77ed94c95c695e6ecf7d61d6a2d13b6c8e1e582f8806a7c93e0e142776c1fb4f60813d644df25bc07b165a364e54 SHA512 c03750e0a03b492cadf77e41280ff7383bed4f38b52e82abb594edb6f86c053c875dbd06f8070e4a1348c63948a7056d81dfd684912f0143446a2ebfa5e13437
 EBUILD knot-2.8.2.ebuild 1962 BLAKE2B 37fd12290d609d8e5874f3e1cece9b600be35b90466b318e33f32c47ea422a6538c9c04cada4218d9fe91ea5b08fc23348c362ba19f8e425694a2fe1998d7c62 SHA512 8557b7aab3e1cbd7ab1bc0f1c0b510f9060c30ac1add36687340d3a6de16961394bbcf710230b70f9b1b890df1301c284993b1014bdde2cb83934d863d055fb7
+EBUILD knot-2.8.3.ebuild 1887 BLAKE2B 50877ea27c72362a6121b4c26a5fc5897ccb77ed94c95c695e6ecf7d61d6a2d13b6c8e1e582f8806a7c93e0e142776c1fb4f60813d644df25bc07b165a364e54 SHA512 c03750e0a03b492cadf77e41280ff7383bed4f38b52e82abb594edb6f86c053c875dbd06f8070e4a1348c63948a7056d81dfd684912f0143446a2ebfa5e13437
 MISC metadata.xml 1677 BLAKE2B 89c3190781cf6b6d6217c84dd45f78ebd86695e9c224c7fa7f5112b246b95b982fb025c6c30b065d59b11f3acdcabda8e92b0da001cf1a7ad3e67ee9b2207d3c SHA512 d1e480d3e5d422b94a952a8fd0a679052d24724cccdda0bf13808f1a6b47b129a1db6ad17a0a42d9a6d315e9cbe64293a1a22077b7affc36862313ff8715d9e1
diff --git a/net-dns/knot/knot-2.7.8.ebuild b/net-dns/knot/knot-2.7.8.ebuild
new file mode 100644
index 000000000000..aa3b0735e370
--- /dev/null
+++ b/net-dns/knot/knot-2.7.8.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="High-performance authoritative-only DNS server"
+HOMEPAGE="https://www.knot-dns.cz/"
+SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+KNOT_MODULES=(
+	"+cookies"
+	"+dnsproxy"
+	"dnstap"
+	"geoip"
+	"+noudp"
+	"+onlinesign"
+	"+queryacl"
+	"+rrl"
+	"+stats"
+	"+synthrecord"
+	"+whoami"
+)
+IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
+
+RDEPEND="
+	acct-group/knot
+	acct-user/knot
+	dev-db/lmdb
+	dev-libs/libedit
+	dev-libs/userspace-rcu:=
+	dev-python/lmdb
+	net-libs/gnutls:=
+	caps? ( sys-libs/libcap-ng )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c:=
+	)
+	geoip? ( dev-libs/libmaxminddb:= )
+	idn? (
+		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
+		libidn2? ( net-dns/libidn2:= )
+	)
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	local u
+	local my_conf=(
+		--with-storage="${EPREFIX}/var/lib/${PN}"
+		--with-rundir="${EPREFIX}/var/run/${PN}"
+		$(use_enable fastparser)
+		$(use_enable dnstap)
+		$(use_enable doc documentation)
+		$(use_enable utils utilities)
+		--enable-systemd=$(usex systemd)
+		$(use_with idn libidn)
+	)
+
+	for u in "${KNOT_MODULES[@]#+}"; do
+		my_conf+=("$(use_with ${u} module-${u})")
+	done
+
+	econf "${my_conf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -C doc html
+		HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+
+	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
+
+	newinitd "${FILESDIR}/knot.init" knot
+	if use systemd; then
+		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-dns/knot/knot-2.8.3.ebuild b/net-dns/knot/knot-2.8.3.ebuild
new file mode 100644
index 000000000000..aa3b0735e370
--- /dev/null
+++ b/net-dns/knot/knot-2.8.3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="High-performance authoritative-only DNS server"
+HOMEPAGE="https://www.knot-dns.cz/"
+SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+KNOT_MODULES=(
+	"+cookies"
+	"+dnsproxy"
+	"dnstap"
+	"geoip"
+	"+noudp"
+	"+onlinesign"
+	"+queryacl"
+	"+rrl"
+	"+stats"
+	"+synthrecord"
+	"+whoami"
+)
+IUSE="doc caps +fastparser idn +libidn2 systemd +utils ${KNOT_MODULES[@]}"
+
+RDEPEND="
+	acct-group/knot
+	acct-user/knot
+	dev-db/lmdb
+	dev-libs/libedit
+	dev-libs/userspace-rcu:=
+	dev-python/lmdb
+	net-libs/gnutls:=
+	caps? ( sys-libs/libcap-ng )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c:=
+	)
+	geoip? ( dev-libs/libmaxminddb:= )
+	idn? (
+		!libidn2? ( net-dns/libidn:0= !net-dns/libidn2 )
+		libidn2? ( net-dns/libidn2:= )
+	)
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	local u
+	local my_conf=(
+		--with-storage="${EPREFIX}/var/lib/${PN}"
+		--with-rundir="${EPREFIX}/var/run/${PN}"
+		$(use_enable fastparser)
+		$(use_enable dnstap)
+		$(use_enable doc documentation)
+		$(use_enable utils utilities)
+		--enable-systemd=$(usex systemd)
+		$(use_with idn libidn)
+	)
+
+	for u in "${KNOT_MODULES[@]#+}"; do
+		my_conf+=("$(use_with ${u} module-${u})")
+	done
+
+	econf "${my_conf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -C doc html
+		HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+
+	rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die
+
+	newinitd "${FILESDIR}/knot.init" knot
+	if use systemd; then
+		systemd_newunit "${FILESDIR}/knot-1.service" knot.service
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 40c478e54d68..20fe38969f78 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -3,10 +3,9 @@ AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1d
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
 DIST nsd-4.1.27.tar.gz 1131881 BLAKE2B 94a7f7efe23d130b04258faca0f73690712919e14268e6efabf4029bc30273d8ef3155259b072190776b6cde32050b61ade0584175f00eef0129e4621d5896a3 SHA512 9c75041f5a6213cdba7238c2e51fc73031f6f073e06587659f93992fed49418ee789642b25b5522d48642507050ac15021f385927eed81ce5ea649f974e66402
-DIST nsd-4.2.0.tar.gz 1141796 BLAKE2B 3e3df373e2ff00c170b9c104e1a4ca7038f98ad613104f045c594b7df17d4d66be1473a07e545deb9096c6a3945570530c5639c7b2f4c76234f643bce8c4fb40 SHA512 caa14fcd599ddc631cb74c3a56e571044dae1deb2fa9bd6b062f143954f9207b64b42ab5eab917360161f96bae8711df932f3e18b58be98b3f7b640071e7e807
 DIST nsd-4.2.1.tar.gz 1145713 BLAKE2B 2cb265dbe274b68e2b038b98b37cf44b4dda4eb576f0fdae1c57686a3b99b0e2cdfd7f893ce196316ea02d1d872371cb36c00a35a5ddf8f83d66a981bf5b2560 SHA512 8f40baf7cc72b72a84f3c4eb45847f03b2f91e47dd7f3dfc89270c774565a8cc692363cee3547b0a2a124e9c43b23eed8887f95ae55b2e63af96c65467b85796
+DIST nsd-4.2.2.tar.gz 1149182 BLAKE2B 1cbac527063f7d14da589bd5060117da10fdd6a9e34b04eb763dbb94fe6c9cf09dc351985de3d099aea3377a4c945622871566c06e7f78aede885aa0c2bc5937 SHA512 43e2ee980a11ed0ad521cc9d8be1e2d29fa8ab552bdda043ffa7e5bc71cf07ad49319629f71e93dcf1dabd315f93bcfb9fd8b5847f27b125cf151fb4f63779b2
 EBUILD nsd-4.1.27.ebuild 3021 BLAKE2B 5af63c683a17a2d1fd1f997acec9a6ceea18a606313e011f2f90d04efa7afb201a994172b15a58f68935048dcf1e18479cf3da7e4326f616b5d0d9a98e910e1b SHA512 ee2fded785d879af29bdc9003c2a63d3c47efb2afabc1d8c72bee82392b84d9eeb780ad731c94190402b0e85c39ed5ead8078ddf18bd7672daf3c0e1c915ab51
-EBUILD nsd-4.2.0.ebuild 3047 BLAKE2B 7fff82ccb3e76556f3448788bef1058a77e0d53f709f167bccd77ae95730e7b1ac8045ff5d435f97e748b96bff09bbdab3dc37ba8f382c7eca8750b326c2f9f6 SHA512 bdf1841c2128fb2822dd2247515adae1c144965c0e94310a5fb42716a3b1e97bd549b110b5579fc1f3719521eab06faf97dcfca27dc990ed682002fb8b1824b3
 EBUILD nsd-4.2.1-r1.ebuild 2959 BLAKE2B c5f5d8d3080ddf40fba98d24c80e2440af5b83364b84a178ee646507504ffd1036135e10b9df71bdfc20c6da64989a497bc91320d14f2f5428a410661beba280 SHA512 7b1ae3ff916fca6cde66b4ada3647b0be59a23c60340606094eb8e40c0433699d96ef0ef1f6e8523084fb9b8b92201a0ee6e06caa1a2c58212e5517557c7dafd
-EBUILD nsd-4.2.1.ebuild 3047 BLAKE2B 7fff82ccb3e76556f3448788bef1058a77e0d53f709f167bccd77ae95730e7b1ac8045ff5d435f97e748b96bff09bbdab3dc37ba8f382c7eca8750b326c2f9f6 SHA512 bdf1841c2128fb2822dd2247515adae1c144965c0e94310a5fb42716a3b1e97bd549b110b5579fc1f3719521eab06faf97dcfca27dc990ed682002fb8b1824b3
+EBUILD nsd-4.2.2.ebuild 2959 BLAKE2B c5f5d8d3080ddf40fba98d24c80e2440af5b83364b84a178ee646507504ffd1036135e10b9df71bdfc20c6da64989a497bc91320d14f2f5428a410661beba280 SHA512 7b1ae3ff916fca6cde66b4ada3647b0be59a23c60340606094eb8e40c0433699d96ef0ef1f6e8523084fb9b8b92201a0ee6e06caa1a2c58212e5517557c7dafd
 MISC metadata.xml 1082 BLAKE2B c44a5b7b9cb5ad52ebc55dd52a584cd8b0700977a19d541df1b415164250e390941ef35a0e8633a975e6cbae402719d8c5fe7d452dde5623223b01a7ec4320ac SHA512 a66e71346c6742c77ce38ca73f600dde471f3256928bab79f2015cb88c2f3237a4d69f7b9127ea90c58f584b60b8b676416b0704761ee1455479644fd2cd5a8d
diff --git a/net-dns/nsd/nsd-4.2.0.ebuild b/net-dns/nsd/nsd-4.2.0.ebuild
deleted file mode 100644
index e8a9dc238025..000000000000
--- a/net-dns/nsd/nsd-4.2.0.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
-
-inherit autotools user systemd
-
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	libevent? ( dev-libs/libevent )
-	munin? ( net-analyzer/munin )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	systemd? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	# Fix the paths in the munin plugin to match our install
-	"${FILESDIR}"/nsd_munin_.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-largefile
-		--enable-pie
-		--enable-relro-now
-		--enable-tcp-fastopen
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
-		--with-logfile="${EPREFIX}"/var/log/nsd.log
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
-		--with-xfrdir="${EPREFIX}"/var/db/nsd
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd
-		$(use_enable bind8-stats)
-		$(use_enable bind8-stats zone-stats)
-		$(use_enable dnstap)
-		$(use_enable ipv6)
-		$(use_enable minimal-responses)
-		$(use_enable mmap)
-		$(use_enable nsec3)
-		$(use_enable ratelimit)
-		$(use_enable root-server)
-		$(use_enable runtime-checks checking)
-		$(use_enable systemd)
-		$(use_with libevent)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-
-	keepdir /var/db/${PN}
-}
-
-pkg_postinst() {
-	# Do this in postinst to ensure the uid/gid is consistent for binpkgs
-	enewgroup nsd
-	enewuser nsd -1 -1 -1 nsd
-
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
-}
diff --git a/net-dns/nsd/nsd-4.2.1.ebuild b/net-dns/nsd/nsd-4.2.1.ebuild
deleted file mode 100644
index e8a9dc238025..000000000000
--- a/net-dns/nsd/nsd-4.2.1.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
-
-inherit autotools user systemd
-
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	libevent? ( dev-libs/libevent )
-	munin? ( net-analyzer/munin )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	systemd? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	# Fix the paths in the munin plugin to match our install
-	"${FILESDIR}"/nsd_munin_.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-largefile
-		--enable-pie
-		--enable-relro-now
-		--enable-tcp-fastopen
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
-		--with-logfile="${EPREFIX}"/var/log/nsd.log
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
-		--with-xfrdir="${EPREFIX}"/var/db/nsd
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd
-		$(use_enable bind8-stats)
-		$(use_enable bind8-stats zone-stats)
-		$(use_enable dnstap)
-		$(use_enable ipv6)
-		$(use_enable minimal-responses)
-		$(use_enable mmap)
-		$(use_enable nsec3)
-		$(use_enable ratelimit)
-		$(use_enable root-server)
-		$(use_enable runtime-checks checking)
-		$(use_enable systemd)
-		$(use_with libevent)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-
-	keepdir /var/db/${PN}
-}
-
-pkg_postinst() {
-	# Do this in postinst to ensure the uid/gid is consistent for binpkgs
-	enewgroup nsd
-	enewuser nsd -1 -1 -1 nsd
-
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
-}
diff --git a/net-dns/nsd/nsd-4.2.2.ebuild b/net-dns/nsd/nsd-4.2.2.ebuild
new file mode 100644
index 000000000000..0eba80ae8a8a
--- /dev/null
+++ b/net-dns/nsd/nsd-4.2.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="An authoritative only, high performance, open source name server"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+	acct-group/nsd
+	acct-user/nsd
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c
+	)
+	libevent? ( dev-libs/libevent )
+	munin? ( net-analyzer/munin )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	systemd? ( virtual/pkgconfig )
+"
+
+PATCHES=(
+	# Fix the paths in the munin plugin to match our install
+	"${FILESDIR}"/nsd_munin_.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-largefile
+		--enable-pie
+		--enable-relro-now
+		--enable-tcp-fastopen
+		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
+		--with-logfile="${EPREFIX}"/var/log/nsd.log
+		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
+		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
+		--with-xfrdir="${EPREFIX}"/var/db/nsd
+		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
+		--with-zonesdir="${EPREFIX}"/var/lib/nsd
+		$(use_enable bind8-stats)
+		$(use_enable bind8-stats zone-stats)
+		$(use_enable dnstap)
+		$(use_enable ipv6)
+		$(use_enable minimal-responses)
+		$(use_enable mmap)
+		$(use_enable nsec3)
+		$(use_enable ratelimit)
+		$(use_enable root-server)
+		$(use_enable runtime-checks checking)
+		$(use_enable systemd)
+		$(use_with libevent)
+		$(use_with ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
+
+	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
+
+	# install munin plugin and config
+	if use munin ; then
+		exeinto /usr/libexec/munin/plugins
+		doexe contrib/nsd_munin_
+		insinto /etc/munin/plugin-conf.d
+		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
+	fi
+
+	systemd_dounit "${FILESDIR}"/nsd.service
+
+	# remove the /run directory that usually resides on tmpfs and is
+	# being taken care of by the nsd init script anyway (checkpath)
+	rm -r "${ED}"/run || die "Failed to remove /run"
+
+	keepdir /var/db/${PN}
+}
+
+pkg_postinst() {
+	# database directory, writable by nsd for database updates and zone transfers
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
+
+	# zones directory, writable by nsd for zone file updates (nsd-control write)
+	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
+}
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index a84b6484f1ce..06ec1b84960c 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,7 +1,7 @@
 AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf403453422888e2cb44fa4fed7891241919a39c8c6f539a61de032654650a45ea548a6983777ea1bfe029e817f2c315 SHA512 ac16f8d528d6138d3c2cbf997fd8fbb467d388aa63eb6ed4e7780a3dad11ea885b91252ff0809b1d2cf7d5200814b8963aab890af84741ea86d35b2f5955a7ea
 AUX pdns-r1 2533 BLAKE2B 0d4af8f9cd4568cde40b44c72cb10a29662daa514df1a1d8174dd02f2ad4324cb7c99a05736bac7cbe80e1b9081832cac95d8c482eb4d1a8c344a6b55da623e3 SHA512 6392f59f82b82621b6cab6823f7761cd875bc6818c48db846df289057c02d8119a1024c5ecdf70a5ca8a55c00a2c3c56240d36b42cc038a25e8616ab9b966dd6
 DIST pdns-4.1.13.tar.bz2 1117990 BLAKE2B 95fa26d872fe138d1cde7e586881010dd27211c4186d0a99693d2fd90bdc3fd939da09805898d469daec6fe8c3493166346cf18b528760f3b25274fe10f45ad2 SHA512 94d80b1c6b78e93dd856631d391225c521485c3fb6b4123b28f9f58e178a7f6eb03f24189eaa261873e7e29962761b513c1fcf092101d68ad81dac73249a54d4
-DIST pdns-4.2.0-rc3.tar.bz2 1250840 BLAKE2B d9c97b318405b43545ca44a7debf442cd276226dbfcfef98de555d3aa61203fe7af0842c6d65f16677769b33dba5998c5cc64e4a5820ee5a137a9ec770ea5b28 SHA512 a60fc2eb369f56d8bdc2e78c54ad62795e27e7f55138c3a83725d8144c0d0a7b5c894cfbd3972516dd8d2d816e5b0ff73fefe8479c8ad08dfa0aa0e0f3f026d7
-EBUILD pdns-4.1.13.ebuild 4701 BLAKE2B ac742a7da5357f1d6ccf51f7f52c896f843916df802f2435ba4226742275b8f52209b0bb162a26c2ab46c1bcdbd55de57b2954de25329faaadd3a106e099c97b SHA512 4c76ca4f8fc3d50818f18d77f35af83b11bad18e6e0c5f6e0d946a86c38f6216615ac346e1492daff4cf1301c08b032d8ae40b699cf1fe1ccc31abe07f838915
-EBUILD pdns-4.2.0_rc3.ebuild 4699 BLAKE2B a14e65a1fd01a624050fecb8de08ac6c8175791fa8070d092aa86f7e65ed0aa422da1ef1535dffe4c00bb3aa49bb20ce13acf43acb44a61b376a146ba5e806bf SHA512 628c2ffa41afc748a32267a80d32818c846004fd4f10689c945050c3206bbeb7191eb01c4d472ee839211b792a866b410be8b6b1392b5c2e9ce16d12051f7980
+DIST pdns-4.2.0.tar.bz2 1249282 BLAKE2B 56b3639004abd05ab9df4541cc46f155ce76426b35a29d9a4cedd16428c5852bf9306e14b77440b8239e823cb0603b4747a8ae7729f964f415a529f17706eb1f SHA512 ee67c132458e539d522aaa5835237dc64d92ad546f51e0ef86366964f7105631f2bd1e6c5d19d85466d95e1982f6410aeb14932c265fddfd301e403e76542624
+EBUILD pdns-4.1.13.ebuild 4703 BLAKE2B 6b6d49e55745519af07c3bba4a964e4bc40536fd1189f681699075b79f6f690368f635c6f65f699875ace38065b18afff0739fae715e2c9163a9246d3e96ac86 SHA512 acaab7c3256e09e54b56f5fde789d0776bdc6320ec4489158119d00659d18d9747b87c8df2e2ad2c7ec8fca6658c916ca0b636e261c9565269b844fa527ad83e
+EBUILD pdns-4.2.0.ebuild 4698 BLAKE2B b44da7a37397340af4af678dc9a05c2e1aba2676a1058c348926483ab0fb5f69617dcc331659f70a1d308166cce40c5ec717caf8acae84d61f2a304153b84397 SHA512 a1086874a1c1b60306504274f700131be47d1022abbb2d2057cc3cb2c6f3a0cbbb9725f5561b09fe5508ca208f275c53f3f3bfbcb6cd6f68b9f7d75de51b5574
 MISC metadata.xml 1383 BLAKE2B fd622facab46aaba7d1e54529574ec0d0531254fcbed8c454bc21438212a9d7f0ce744417b24461e1dc144a3daded8d252d805011b77bc5f396bb59297cf55c4 SHA512 6301ccaa19d82478a7e338cf1ad3b586cbdc4c2b98298bb306e7913399efab4e30305756cc7dcf6df4d81520733f2095c4bf61f65ac83763e38f375c2cc0b2a7
diff --git a/net-dns/pdns/pdns-4.1.13.ebuild b/net-dns/pdns/pdns-4.1.13.ebuild
index f267a0663b84..ae6ae070db07 100644
--- a/net-dns/pdns/pdns-4.1.13.ebuild
+++ b/net-dns/pdns/pdns-4.1.13.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 		!luajit? ( dev-lang/lua:= )
 		luajit? ( dev-lang/luajit:= )
 	)
-	mysql? ( dev-db/mysql-connector-c )
+	mysql? ( dev-db/mysql-connector-c:= )
 	postgres? ( dev-db/postgresql:= )
 	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
 	sqlite? ( dev-db/sqlite:3 )
diff --git a/net-dns/pdns/pdns-4.2.0.ebuild b/net-dns/pdns/pdns-4.2.0.ebuild
new file mode 100644
index 000000000000..e1229b5437f0
--- /dev/null
+++ b/net-dns/pdns/pdns-4.2.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib user
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="debug doc geoip ldap libressl lua luajit lua-records mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
+
+REQUIRED_USE="lua-records? ( lua ) mydns? ( mysql )"
+
+RDEPEND="
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:=
+	lua? (
+		!luajit? ( dev-lang/lua:= )
+		luajit? ( dev-lang/luajit:= )
+	)
+	lua-records? ( >=net-misc/curl-7.21.3 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	opendbx? ( dev-db/opendbx )
+	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
+	sodium? ( dev-libs/libsodium:= )
+	tinydns? ( >=dev-db/tinycdb-0.77 )
+	protobuf? ( dev-libs/protobuf )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/${P/_/-}
+
+src_configure() {
+	local dynmodules="pipe bind" # the default backends, always enabled
+
+	#use db2 && dynmodules+=" db2"
+	use ldap && dynmodules+=" ldap"
+	use lua && dynmodules+=" lua"
+	use mydns && dynmodules+=" mydns"
+	use mysql && dynmodules+=" gmysql"
+	use opendbx && dynmodules+=" opendbx"
+	#use oracle && dynmodules+=" goracle oracle"
+	use postgres && dynmodules+=" gpgsql"
+	use remote && dynmodules+=" remote"
+	use sqlite && dynmodules+=" gsqlite3"
+	use tinydns && dynmodules+=" tinydns"
+	use geoip && dynmodules+=" geoip"
+	#use xdb && dynmodules+=" xdb"
+
+	econf \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-modules= \
+		--with-dynmodules="${dynmodules}" \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable lua-records) \
+		$(use_enable test unit-tests) \
+		$(use_enable tools) \
+		$(use_enable systemd) \
+		$(use_with sodium libsodium) \
+		$(use_with lua lua $(usex luajit luajit lua)) \
+		$(use_with protobuf) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	newinitd "${FILESDIR}"/pdns-r1 pdns
+
+	keepdir /var/empty
+
+	if use doc; then
+		docinto html
+		dodoc -r codedocs/html/.
+	fi
+
+	# Install development headers
+	insinto /usr/include/pdns
+	doins pdns/*.hh
+	insinto /usr/include/pdns/backends/gsql
+	doins pdns/backends/gsql/*.hh
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	enewgroup pdns
+	enewuser pdns -1 -1 /var/empty pdns
+}
+
+pkg_postinst() {
+	elog "PowerDNS provides multiple instances support. You can create more instances"
+	elog "by symlinking the pdns init script to another name."
+	elog
+	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+	if use ldap ; then
+		echo
+		ewarn "The official LDAP backend module is only compile-tested by upstream."
+		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
+	fi
+
+	local old
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 3.2 || continue
+
+		echo
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/powerdns"
+		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
+
+		break
+	done
+
+	if use postgres; then
+		for old in ${REPLACING_VERSIONS}; do
+			ver_test ${old} -lt 4.1.11-r1 || continue
+
+			echo
+			ewarn "PowerDNS 4.1.11 contains a security fix for the PostgreSQL backend."
+			ewarn "This security fix needs to be applied manually to the database schema."
+			ewarn "Please refer to the official security advisory for more information:"
+			ewarn
+			ewarn "  https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-06.html"
+
+			break
+		done
+	fi
+}
diff --git a/net-dns/pdns/pdns-4.2.0_rc3.ebuild b/net-dns/pdns/pdns-4.2.0_rc3.ebuild
deleted file mode 100644
index d811e77d5c51..000000000000
--- a/net-dns/pdns/pdns-4.2.0_rc3.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib user
-
-DESCRIPTION="The PowerDNS Daemon"
-HOMEPAGE="https://www.powerdns.com/"
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="" # ~amd64 ~x86
-
-# other possible flags:
-# db2: we lack the dep
-# oracle: dito (need Oracle Client Libraries)
-# xdb: (almost) dead, surely not supported
-
-IUSE="debug doc geoip ldap libressl lua luajit lua-records mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test"
-
-REQUIRED_USE="lua-records? ( lua ) mydns? ( mysql )"
-
-RDEPEND="
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:= )
-	>=dev-libs/boost-1.35:=
-	lua? (
-		!luajit? ( dev-lang/lua:= )
-		luajit? ( dev-lang/luajit:= )
-	)
-	lua-records? ( >=net-misc/curl-7.21.3 )
-	mysql? ( dev-db/mysql-connector-c )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 app-crypt/mit-krb5 )
-	sqlite? ( dev-db/sqlite:3 )
-	opendbx? ( dev-db/opendbx )
-	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
-	sodium? ( dev-libs/libsodium:= )
-	tinydns? ( >=dev-db/tinycdb-0.77 )
-	protobuf? ( dev-libs/protobuf )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/${P/_/-}
-
-src_configure() {
-	local dynmodules="pipe bind" # the default backends, always enabled
-
-	#use db2 && dynmodules+=" db2"
-	use ldap && dynmodules+=" ldap"
-	use lua && dynmodules+=" lua"
-	use mydns && dynmodules+=" mydns"
-	use mysql && dynmodules+=" gmysql"
-	use opendbx && dynmodules+=" opendbx"
-	#use oracle && dynmodules+=" goracle oracle"
-	use postgres && dynmodules+=" gpgsql"
-	use remote && dynmodules+=" remote"
-	use sqlite && dynmodules+=" gsqlite3"
-	use tinydns && dynmodules+=" tinydns"
-	use geoip && dynmodules+=" geoip"
-	#use xdb && dynmodules+=" xdb"
-
-	econf \
-		--disable-static \
-		--sysconfdir=/etc/powerdns \
-		--libdir=/usr/$(get_libdir)/powerdns \
-		--with-modules= \
-		--with-dynmodules="${dynmodules}" \
-		--with-mysql-lib=/usr/$(get_libdir) \
-		$(use_enable debug verbose-logging) \
-		$(use_enable lua-records) \
-		$(use_enable test unit-tests) \
-		$(use_enable tools) \
-		$(use_enable systemd) \
-		$(use_with sodium libsodium) \
-		$(use_with lua lua $(usex luajit luajit lua)) \
-		$(use_with protobuf) \
-		${myconf}
-}
-
-src_compile() {
-	default
-	use doc && emake -C codedocs codedocs
-}
-
-src_install() {
-	default
-
-	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
-
-	fperms 0700 /etc/powerdns
-	fperms 0600 /etc/powerdns/pdns.conf
-
-	# set defaults: setuid=pdns, setgid=pdns
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
-		"${D}"/etc/powerdns/pdns.conf
-
-	newinitd "${FILESDIR}"/pdns-r1 pdns
-
-	keepdir /var/empty
-
-	if use doc; then
-		docinto html
-		dodoc -r codedocs/html/.
-	fi
-
-	# Install development headers
-	insinto /usr/include/pdns
-	doins pdns/*.hh
-	insinto /usr/include/pdns/backends/gsql
-	doins pdns/backends/gsql/*.hh
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/dnsdomain2.schema
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	enewgroup pdns
-	enewuser pdns -1 -1 /var/empty pdns
-}
-
-pkg_postinst() {
-	elog "PowerDNS provides multiple instances support. You can create more instances"
-	elog "by symlinking the pdns init script to another name."
-	elog
-	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
-	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
-
-	if use ldap ; then
-		echo
-		ewarn "The official LDAP backend module is only compile-tested by upstream."
-		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
-	fi
-
-	local old
-	for old in ${REPLACING_VERSIONS}; do
-		ver_test ${old} -lt 3.2 || continue
-
-		echo
-		ewarn "To fix a security bug (bug #458018) had the following"
-		ewarn "files/directories the world-readable bit removed (if set):"
-		ewarn "  ${EPREFIX}/etc/powerdns"
-		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
-		ewarn "Check if this is correct for your setup"
-		ewarn "This is a one-time change and will not happen on subsequent updates."
-		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
-
-		break
-	done
-
-	if use postgres; then
-		for old in ${REPLACING_VERSIONS}; do
-			ver_test ${old} -lt 4.1.11-r1 || continue
-
-			echo
-			ewarn "PowerDNS 4.1.11 contains a security fix for the PostgreSQL backend."
-			ewarn "This security fix needs to be applied manually to the database schema."
-			ewarn "Please refer to the official security advisory for more information:"
-			ewarn
-			ewarn "  https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-06.html"
-
-			break
-		done
-	fi
-}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index d84b86869332..9c98fe537886 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -9,8 +9,10 @@ AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a7
 DIST unbound-1.9.0.tar.gz 5662176 BLAKE2B dff42ca4155df1c364bcfeb37c0f9516e7f167cc59bebd1fcf264db6471ad99804323c59e485662e03ab095932f1ca3fe25693a9ba840e9c0ecad69cf31b1a2d SHA512 7dfa8e078507fc24a2d0938eea590389453bacfcac023f1a41af19350ea1f7b87d0c82d7eead121a11068921292a96865e177274ff27ed8b8868445f80f7baf6
 DIST unbound-1.9.1.tar.gz 5665254 BLAKE2B 68a643cd17139b34e3651e0e72053b0faacf83ae975fff97493c78742ffa7f0d3dbc0028e96e581e125a3591467ec78ae245a718424c2fb32ea7db23ae945f44 SHA512 5dfac7ce3892f73109fdfe0f81863643b1f4c10cee2d4e2d1a28132f1b9ea4d4f89242e4e6348fdadf998f1c75d53577cbf4f719e98faa1342fc3c5de2e8903d
 DIST unbound-1.9.2.tar.gz 5676395 BLAKE2B fa42e6afaf7e7fc98dba35fb6ec4513f7f392194e9124f7a4625c9a51f4b2b58bb63ca40a083b9f3583af3636399df02f92ef7cb0ae10404b7258cddfce82adc SHA512 118f0e53ee2d5cfb53ce1f792ca680cc01b5825bf81575e36bd3b24f3bdbe14e6631401bf1bf85eb2ac2a3fa0ee2ee3eb6a28b245d06d48d9975ce4cc260f764
+DIST unbound-1.9.3.tar.gz 5686017 BLAKE2B f96636f4070e48cc5e3eadfb59e28f2ab2fc95a8c5a78af095743ea6d32149aadc486f8da62ea1b38c856f4ba9c2cf041407dceb33396a47c59a19816d67f8c6 SHA512 21e14dc1577adbe502a262d7fbe9aae0cd389cd9c0b822246beadf00f0ee875e268eeb3ce820433cbb01495d6b182c334b34b63b1bc33b08589a230810ccfe90
 EBUILD unbound-1.9.0.ebuild 5371 BLAKE2B 210ca5db8c4fedf546d8caeffda1cf94f6366e9befe55be6c07ba273209ff2b5388509341c4540ee65aeedb3f543e0caa7fbac880121ba86f1426e856167689c SHA512 2f78e2c29c5ed3998260ae8803c0a5e9216f63c9001be4f62613e88899e130258b7a53e0072a621e2d436b6491ed688006cb2e8ccdf6e6426eec34d87d358648
 EBUILD unbound-1.9.1-r1.ebuild 5406 BLAKE2B 92f267663f8174cf9ed701078773c5e56a2e44456788037ba392df6d4d3aacf7d3fab1447a93271bdf1ededc6bc4e2e010157f782389f48fa3678f2449acedd2 SHA512 761d406627a16bd9ed687c939f57e9b16e42e7aa9de84aa3b03aa11efb4efa9eb9910cbb73ab962dc34184159b46413540d8f6b1071059ac02231eda63190527
 EBUILD unbound-1.9.1.ebuild 5383 BLAKE2B 2e5777319dab657dea41e1eb2e6e325ed8dc0d5d6c9e7711ee4cd11e043bc9582cb58fcffa26d1264759fed85debfa8f23b21dde1a936730e47d7ecf1ea2eb0f SHA512 1cc7d4b7deef9d75412caee7633e487e22fea793454eb87554401bf8b1efdaf24b67c2d6a463232cddb4cf1ecd8ab90f998623df0c99e9c8434245f27b202975
 EBUILD unbound-1.9.2.ebuild 5406 BLAKE2B 92f267663f8174cf9ed701078773c5e56a2e44456788037ba392df6d4d3aacf7d3fab1447a93271bdf1ededc6bc4e2e010157f782389f48fa3678f2449acedd2 SHA512 761d406627a16bd9ed687c939f57e9b16e42e7aa9de84aa3b03aa11efb4efa9eb9910cbb73ab962dc34184159b46413540d8f6b1071059ac02231eda63190527
+EBUILD unbound-1.9.3.ebuild 5406 BLAKE2B 92f267663f8174cf9ed701078773c5e56a2e44456788037ba392df6d4d3aacf7d3fab1447a93271bdf1ededc6bc4e2e010157f782389f48fa3678f2449acedd2 SHA512 761d406627a16bd9ed687c939f57e9b16e42e7aa9de84aa3b03aa11efb4efa9eb9910cbb73ab962dc34184159b46413540d8f6b1071059ac02231eda63190527
 MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
diff --git a/net-dns/unbound/unbound-1.9.3.ebuild b/net-dns/unbound/unbound-1.9.3.ebuild
new file mode 100644
index 000000000000..e4d1ceae7af4
--- /dev/null
+++ b/net-dns/unbound/unbound-1.9.3.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd user
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup unbound
+	enewuser unbound -1 -1 /etc/unbound unbound
+	# improve security on existing installs (bug #641042)
+	# as well as new installs where unbound homedir has just been created
+	if [[ -d "${ROOT}/etc/unbound" ]]; then
+		chown --no-dereference --from=unbound root "${ROOT}/etc/unbound"
+	fi
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX%/}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX%/}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX%/}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX%/}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX%/}"/usr \
+		--with-libexpat="${EPREFIX%/}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_dounit "${FILESDIR}"/unbound.socket
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED%/}/etc/unbound/unbound.conf" || \
+		die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	# make var/ writable by unbound
+	if [[ -d "${EROOT%/}/etc/unbound/var" ]]; then
+		chown --no-dereference --from=root unbound: "${EROOT%/}/etc/unbound/var"
+	fi
+
+	einfo ""
+	einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+	einfo "set 'auto-trust-anchor-file: ${EROOT%/}/etc/unbound/var/root-anchors.txt' in ${EROOT%/}/etc/unbound/unbound.conf"
+	einfo "and run"
+	einfo ""
+	einfo "  su -s /bin/sh -c '${EROOT%/}/usr/sbin/unbound-anchor -a ${EROOT%/}/etc/unbound/var/root-anchors.txt' unbound"
+	einfo ""
+	einfo "as root to create it initially before starting unbound for the first time after enabling this."
+	einfo ""
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index c766b14b5f7b..aa41a306dc84 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index f80131a2fde7..f58bed582810 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -9,6 +9,8 @@ AUX nftables.init 3069 BLAKE2B 68c6b2b81995bd909c00cc3527f891f04d0dd30532cd821c8
 AUX systemd/nftables-restore.service 394 BLAKE2B 1c1f358eb2eff789e68c051098c971f11a8df6621c3c919e30a1ec1213f6db822c390609c01827fe9fc75c540effa3e3a7b6f93bd24e16ea19841bbfaab796ed SHA512 18da6a770bb3e94fd6b2c9e6f033450aaff9fe886c8846f780d08a21e2fc884ac078652743b50b3d4ea8c9500f92d272bdd27e2881e438c2b223d40816c100a0
 DIST nftables-0.9.0.tar.gz 417981 BLAKE2B 4dfba4d71928f1694ffeb4871353fc373d88e23c5ba716e726e1e6aba0efb2703233528f7a408bfefe47bfe54aa3612cccab9742c2a2208ec8c7a4bcda0e1823 SHA512 78e383bad5440c9414202cf0e4b6749fc5c01071d2fa547208e61cea6e7e179933990e7e538a60696eb0a7cf510d2c4b273a91d50287bb51507d244cd2875aed
 DIST nftables-0.9.1.tar.bz2 764066 BLAKE2B 26b194d6b3b970c05348c32a3ab21e8c25fcdb0d09d3d6b467198ba23a5bb44e7b6450d3efb86c39a488df4a837885c4a1ab96c197d5449f7de49b7b18ff5f90 SHA512 e14b75197ba3fea2a46c090450bf8b45b39fdc20db67bab1d6919c90128dee8ea8bbe9508e070f86b22ec70bcad8ab584fb89630a2240f09683137471c77d242
+DIST nftables-0.9.2.tar.bz2 779850 BLAKE2B 40bf9ed956a126048f27b343afc7aa4f6e34f35dc91127402cb127903f8150d212c80491fef2b54c18a63ca065608521062b3f6a2dd78969bdbf4d7d8a5a751d SHA512 2d83b104af0d70f99a16c2e40afdb9bf89bd984323810e2895976c5e2e346bf09dd88850a391f295e335279adfdd39d34c13610cf8e6b801499dc0df2a5cecf6
 EBUILD nftables-0.9.0-r4.ebuild 2497 BLAKE2B 17916257a8fd7934348d4ceddcbead2c50a24954bff6b50e9f13ec5da2351935c3310be2c6749bfb94141523ca2157e6fe84d89bb7b56914f4f3a0553b7e58b8 SHA512 bf2036978cc0412b677c9117512db14c7344747e19f3fe1b2ef6a7d2b750cf64b33c41bdfaae55f8cfdda19c7f376faadd16a626816672a05b70b11d77231ffc
 EBUILD nftables-0.9.1.ebuild 3439 BLAKE2B cc4cc8af10d494b52a1b1c1cb826983fbe04bf62d7c11aa25bb7c8b11189feeb6e69b2437276574ff0dd9f41d680fcf3e5b19f4d62e17324a3129eeb4c521594 SHA512 dc05bd17223ad8106259170681b2ca55af02842ea1f1eb9f809b93f829c0930a9cfdd06df8922faf6c5d8e54b2d59ebc5516da1ba7eaa8b264e04aa6466fc4ad
+EBUILD nftables-0.9.2.ebuild 3342 BLAKE2B 05e99227df28fcd6b9d7f70e1295b2ca0997e84d15eeabb0cefb2dbcc9c91eae6637f98e08aa7fef98bb541ba620c53c881e729a735e6aff26a1465499b6ebe9 SHA512 c191d5a43ef0bde4f0ac85c9b702d2999744c25ede558103e648b4aa5c8b9c140b1839a0a655e203868dc80e2319948161ebb942bc2c6db4c0bae9dfac7a5a1c
 MISC metadata.xml 918 BLAKE2B 16404ad621319f8a8e93e39d8586aaadb0f6fc6989ee928605a8e5e00f581c5f84b11b9718958667a2f76722950a893e5d6097ff2f242961998ac7b092901489 SHA512 27413ba6b81e930b13ae55292d1c308b54b173cf120430d5462313cd8052834bd01e272978b3ba1d4b9f1be99215a90446b2e93bd0a502d328182706be40f02d
diff --git a/net-firewall/nftables/nftables-0.9.2.ebuild b/net-firewall/nftables/nftables-0.9.2.ebuild
new file mode 100644
index 000000000000..112b5f0b9afb
--- /dev/null
+++ b/net-firewall/nftables/nftables-0.9.2.ebuild
@@ -0,0 +1,138 @@
+# 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 autotools linux-info python-r1 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"
+SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
+IUSE="debug +doc +gmp json +modern_kernel python +readline static-libs xtables"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.3:0=
+	gmp? ( dev-libs/gmp:0= )
+	json? ( dev-libs/jansson )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	>=net-libs/libnftnl-1.1.4:0=
+	xtables? ( >=net-firewall/iptables-1.6.1 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? ( app-text/asciidoc )
+	>=app-text/docbook2X-0.8.8-r4
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+#S="${WORKDIR}/v${PV}"
+
+python_make() {
+	emake \
+		-C py \
+		abs_builddir="${S}" \
+		DESTDIR="${D}" \
+		PYTHON_BIN="${PYTHON}" \
+		${@}
+}
+
+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
+
+	# fix installation path for doc stuff
+	sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}@' \
+		-i files/nftables/Makefile.am || die
+	sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/osf@' \
+		-i files/osf/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# We handle python separately
+		--disable-python
+		--sbindir="${EPREFIX}"/sbin
+		$(use_enable debug)
+		$(use_enable doc man-doc)
+		$(use_with !gmp mini_gmp)
+		$(use_with json)
+		$(use_with readline cli)
+		$(use_enable static-libs static)
+		$(use_with xtables)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use python ; then
+		python_foreach_impl python_make
+	fi
+}
+
+src_install() {
+	default
+
+	local mksuffix="$(usex modern_kernel '-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
+
+	if use python ; then
+		python_foreach_impl python_make install
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+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/nufw/Manifest b/net-firewall/nufw/Manifest
index ddb4fc5e2e3d..7c9d0f981a1d 100644
--- a/net-firewall/nufw/Manifest
+++ b/net-firewall/nufw/Manifest
@@ -5,6 +5,5 @@ AUX nufw-2.2.22-var-run.patch 1438 BLAKE2B 259d96d3a7386ac30f4ca7a88ecb0a4714b04
 AUX nufw-conf.d 122 BLAKE2B 3263b28a9a783f35920a30cb022fe86b8a0fdc05b45c5a191e53c0b201ca38da9fe9eeda82866cf69dc760e0ff2fcd0264ee17f53f03a6077b63d9fcbd2dd1f0 SHA512 df48fc1843bf07e7ccfacd647caafc43752fdfa76da09a89d9ec0d76b79746c60c70f68c004c7e37899f195ae63adefc7d1c1b2c7b41da27911eb4cdc54212fb
 AUX nufw-init.d 273 BLAKE2B 00827d4cf93b484c6563b7bccc4020e9de0e8f2652eb29f9b1a64dfb4333b7e04b370f977a43a8f9af4b680d62e658a7779822c6671059e83a5ceea7f1872f5e SHA512 7f8b16532ae74b6aae8a9c7ef4a7509b66253f03a47c8ee521163a35db525e8c25b091289e10337307906a27e0aba558bd2a28dc0b91cbc09ce17ba78002d0e1
 DIST nufw-2.2.22.tar.bz2 597491 BLAKE2B 4c3092aeaced237ceb9faa16cff275938de23cdca31d2d6f6406238a0fe75ad15468f91a80b1d6e0bfc6dac520b6331ee19a1d95a006d591b891b91aad6caa8b SHA512 cc9f43b9ebf6aabbab4c83799ca1735fc456c085959cfb24d17571302c71518660424195b2cc62ed615f811bd6b3c45e1b99db99138d1caa6a744370775acaee
-EBUILD nufw-2.2.22-r1.ebuild 2631 BLAKE2B 731d7f4c0b9d61809d5e4100fb47c9619d0fdad47b2af596740ff3b4f7cbd94158cdc27a930d4d35ae9029f06a4bfdd5b0d42915fdfa989edca4b784abd613d7 SHA512 45e1cbc6deb24861633753cc268090bb4e21f6cd85aed8f1abae2f6aec1d7523dd1ce92043d60cb4229894577b9f0d34fad4ecbf2b5e7dffd7461a3f0b700bb0
-EBUILD nufw-2.2.22-r2.ebuild 2642 BLAKE2B bb9629295235b2a7cfaf184b67b4122cbedc45ea61e6ef7964c277f579ba3d2e0bf61050f30aa9462c82bad399a49330ea5cbdb504c4762d7128ddc6dacda641 SHA512 8afdeab8d1794994a3f398ea4a741369752c52346cd1693978fc48f98b3798b180bea2fa66a7f94614e23067171742e3a3f10e4cb4edef3fa742825b867560fd
+EBUILD nufw-2.2.22-r3.ebuild 2650 BLAKE2B 1a22d6dc4bb32d595d147d8b7f739d9bf21658df7e7befda1157008a0841c25b1f864671d0c4a9662f9aefebafea82cbd445ab98399a016c6522ed361762abb2 SHA512 0593a072ba72284ffdce5c591dda4adb17f24842ff42d2021218140b5fe2e4abf910d707afb8ddd974d67eda856d686e3e6e198ab4b0ca5268866e2aae9ee3a5
 MISC metadata.xml 547 BLAKE2B 58719a0151213d5a4f796870fdb9360ae67d7d6b7e3672d9e685149c7561604e92f293391813b502f932c94ea76fc2a3b6fd089725d33471a57318e5978a7e8c SHA512 29dea30db4101530fc810fd162a93aa7f87898f57a955f528a9259918a4a9c1d16dc1b7a790817846482b410a11e98f32987d409165a322fdfc8352bfd5383d5
diff --git a/net-firewall/nufw/nufw-2.2.22-r1.ebuild b/net-firewall/nufw/nufw-2.2.22-r1.ebuild
deleted file mode 100644
index 79f0b9290942..000000000000
--- a/net-firewall/nufw/nufw-2.2.22-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SSL_CERT_MANDATORY=1
-inherit autotools eutils multilib pam ssl-cert
-
-DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
-HOMEPAGE="http://www.nufw.org/"
-SRC_URI="http://www.nufw.org/attachments/download/39/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test"
-
-REQUIRED_USE="pam_nuauth? ( plaintext )"
-DEPEND="
-	dev-libs/cyrus-sasl
-	dev-libs/glib:2
-	dev-libs/libgcrypt:0
-	dev-python/ipy
-	net-firewall/iptables
-	net-libs/gnutls
-	ldap? ( >=net-nds/openldap-2 )
-	mysql? ( virtual/mysql )
-	nfconntrack? ( net-libs/libnetfilter_conntrack )
-	nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue )
-	pam? ( sys-libs/pam )
-	pam_nuauth? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql[server] )
-	prelude? ( dev-libs/libprelude )
-"
-RDEPEND=${DEPEND}
-
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-var-run.patch
-	sed -i \
-		-e 's:^#\(nuauth_tls_key="/etc/nufw/\)nuauth-key.pem:\1nuauth.key:' \
-		-e 's:^#\(nuauth_tls_cert="/etc/nufw/\)nuauth-cert.pem:\1nuauth.pem:' \
-		conf/nuauth.conf || die
-	sed -i \
-		-e "/^modulesdir/s|=.*|= /$(get_libdir)/security|g" \
-		src/clients/pam_nufw/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable pam_nuauth pam-nufw) \
-		$(use_enable static) \
-		$(use_with ldap) \
-		$(use_with mysql mysql-auth) \
-		$(use_with mysql mysql-log) \
-		$(use_with nfconntrack) \
-		$(use_with nfqueue) \
-		$(use_with pam system-auth) \
-		$(use_with plaintext plaintext-auth) \
-		$(use_with postgres pgsql-log) \
-		$(use_with prelude prelude-log) \
-		$(use_with syslog syslog-log) \
-		$(use_with unicode utf8) \
-		--enable-shared \
-		--includedir="/usr/include/nufw" \
-		--localstatedir="/var" \
-		--sysconfdir="/etc/nufw" \
-		--with-mark-group \
-		--with-user-mark
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/nufw-init.d nufw
-	newconfd "${FILESDIR}"/nufw-conf.d nufw
-
-	newinitd "${FILESDIR}"/nuauth-init.d nuauth
-	newconfd "${FILESDIR}"/nuauth-conf.d nuauth
-
-	insinto /etc/nufw
-	doins conf/nuauth.conf
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	docinto scripts
-	dodoc scripts/{clean_conntrack.pl,nuaclgen,nutop,README,ulog_rotate_daily.sh,ulog_rotate_weekly.sh}
-	docinto conf
-	dodoc conf/*.{nufw,schema,conf,dump,xml}
-
-	if use pam; then
-		pamd_mimic system-auth nufw auth account password session
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	install_cert /etc/nufw/{nufw,nuauth}
-}
diff --git a/net-firewall/nufw/nufw-2.2.22-r2.ebuild b/net-firewall/nufw/nufw-2.2.22-r2.ebuild
deleted file mode 100644
index a3c6d2b4f822..000000000000
--- a/net-firewall/nufw/nufw-2.2.22-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-inherit autotools eutils multilib pam ssl-cert
-
-DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
-HOMEPAGE="http://www.nufw.org/"
-SRC_URI="http://www.nufw.org/attachments/download/39/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test"
-
-REQUIRED_USE="pam_nuauth? ( plaintext )"
-DEPEND="
-	dev-libs/cyrus-sasl
-	dev-libs/glib:2
-	dev-libs/libgcrypt:0
-	dev-python/ipy
-	net-firewall/iptables
-	net-libs/gnutls
-	ldap? ( >=net-nds/openldap-2 )
-	mysql? ( virtual/mysql )
-	nfconntrack? ( net-libs/libnetfilter_conntrack )
-	nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue )
-	pam? ( sys-libs/pam )
-	pam_nuauth? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:*[server] )
-	prelude? ( dev-libs/libprelude )
-"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}/${P}-var-run.patch"
-	"${FILESDIR}/${P}-gnutls-3.4.patch"
-)
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:^#\(nuauth_tls_key="/etc/nufw/\)nuauth-key.pem:\1nuauth.key:' \
-		-e 's:^#\(nuauth_tls_cert="/etc/nufw/\)nuauth-cert.pem:\1nuauth.pem:' \
-		conf/nuauth.conf || die
-	sed -i \
-		-e "/^modulesdir/s|=.*|= /$(get_libdir)/security|g" \
-		src/clients/pam_nufw/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable pam_nuauth pam-nufw) \
-		$(use_enable static) \
-		$(use_with ldap) \
-		$(use_with mysql mysql-auth) \
-		$(use_with mysql mysql-log) \
-		$(use_with nfconntrack) \
-		$(use_with nfqueue) \
-		$(use_with pam system-auth) \
-		$(use_with plaintext plaintext-auth) \
-		$(use_with postgres pgsql-log) \
-		$(use_with prelude prelude-log) \
-		$(use_with syslog syslog-log) \
-		$(use_with unicode utf8) \
-		--enable-shared \
-		--includedir="/usr/include/nufw" \
-		--localstatedir="/var" \
-		--sysconfdir="/etc/nufw" \
-		--with-mark-group \
-		--with-user-mark
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/nufw-init.d nufw
-	newconfd "${FILESDIR}"/nufw-conf.d nufw
-
-	newinitd "${FILESDIR}"/nuauth-init.d nuauth
-	newconfd "${FILESDIR}"/nuauth-conf.d nuauth
-
-	insinto /etc/nufw
-	doins conf/nuauth.conf
-
-	docinto scripts
-	dodoc scripts/{clean_conntrack.pl,nuaclgen,nutop,README,ulog_rotate_daily.sh,ulog_rotate_weekly.sh}
-	docinto conf
-	dodoc conf/*.{nufw,schema,conf,dump,xml}
-
-	if use pam; then
-		pamd_mimic system-auth nufw auth account password session
-	fi
-}
-
-pkg_postinst() {
-	install_cert /etc/nufw/{nufw,nuauth}
-}
diff --git a/net-firewall/nufw/nufw-2.2.22-r3.ebuild b/net-firewall/nufw/nufw-2.2.22-r3.ebuild
new file mode 100644
index 000000000000..ec1f263bec86
--- /dev/null
+++ b/net-firewall/nufw/nufw-2.2.22-r3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+inherit autotools eutils multilib pam ssl-cert
+
+DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
+HOMEPAGE="http://www.nufw.org/"
+SRC_URI="http://www.nufw.org/attachments/download/39/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE="debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test"
+
+REQUIRED_USE="pam_nuauth? ( plaintext )"
+DEPEND="
+	dev-libs/cyrus-sasl
+	dev-libs/glib:2
+	dev-libs/libgcrypt:0
+	dev-python/ipy
+	net-firewall/iptables
+	net-libs/gnutls
+	ldap? ( >=net-nds/openldap-2 )
+	mysql? ( dev-db/mysql-connector-c )
+	nfconntrack? ( net-libs/libnetfilter_conntrack )
+	nfqueue? ( net-libs/libnfnetlink net-libs/libnetfilter_queue )
+	pam? ( sys-libs/pam )
+	pam_nuauth? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:*[server] )
+	prelude? ( dev-libs/libprelude )
+"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}/${P}-var-run.patch"
+	"${FILESDIR}/${P}-gnutls-3.4.patch"
+)
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:^#\(nuauth_tls_key="/etc/nufw/\)nuauth-key.pem:\1nuauth.key:' \
+		-e 's:^#\(nuauth_tls_cert="/etc/nufw/\)nuauth-cert.pem:\1nuauth.pem:' \
+		conf/nuauth.conf || die
+	sed -i \
+		-e "/^modulesdir/s|=.*|= /$(get_libdir)/security|g" \
+		src/clients/pam_nufw/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable pam_nuauth pam-nufw) \
+		$(use_enable static) \
+		$(use_with ldap) \
+		$(use_with mysql mysql-auth) \
+		$(use_with mysql mysql-log) \
+		$(use_with nfconntrack) \
+		$(use_with nfqueue) \
+		$(use_with pam system-auth) \
+		$(use_with plaintext plaintext-auth) \
+		$(use_with postgres pgsql-log) \
+		$(use_with prelude prelude-log) \
+		$(use_with syslog syslog-log) \
+		$(use_with unicode utf8) \
+		--enable-shared \
+		--includedir="/usr/include/nufw" \
+		--localstatedir="/var" \
+		--sysconfdir="/etc/nufw" \
+		--with-mark-group \
+		--with-user-mark
+}
+
+src_install() {
+	default
+	prune_libtool_files
+
+	newinitd "${FILESDIR}"/nufw-init.d nufw
+	newconfd "${FILESDIR}"/nufw-conf.d nufw
+
+	newinitd "${FILESDIR}"/nuauth-init.d nuauth
+	newconfd "${FILESDIR}"/nuauth-conf.d nuauth
+
+	insinto /etc/nufw
+	doins conf/nuauth.conf
+
+	docinto scripts
+	dodoc scripts/{clean_conntrack.pl,nuaclgen,nutop,README,ulog_rotate_daily.sh,ulog_rotate_weekly.sh}
+	docinto conf
+	dodoc conf/*.{nufw,schema,conf,dump,xml}
+
+	if use pam; then
+		pamd_mimic system-auth nufw auth account password session
+	fi
+}
+
+pkg_postinst() {
+	install_cert /etc/nufw/{nufw,nuauth}
+}
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index c5b81dd8a4d2..16104f2f6076 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.3.3.tar.bz2 556424 BLAKE2B 0a172f0e70449af91421308c5308420a8de7af405eb74107201966b10df2fa7a0fd6042337c182bfa30a92cce3e611e46f8f5b910fb1bbc282513e3fc2d77d0c SHA512 d4166332160cbbc9e36f0c7f8fb6db8573dda17f80bbfb062465bba42f748c4f6815c9467da8a072b9eb01f3745fad67e00eea657ef61d9f90b49ad3a4668300
+DIST shorewall-5.2.3.4.tar.bz2 554090 BLAKE2B b7c5305a23c661d73dcce0d0b2edacbf7dcad911fe8cd7bb11dc34f860505aab5290f0ac9c3902ee5bba826335ec0b656a44b3580250dc6b546436addaad18c1 SHA512 e73fd31d4242823ad592b453af2ad47c28f0b2bfa6fe357f7b0f40f6facd20a293800ae48a8f9db4be68937eb957f24902966710ae1ca649204489f6269cc780
 DIST shorewall-core-5.2.3.3.tar.bz2 69043 BLAKE2B 6e84490258bc5cff88ef081bae11520463ff63a079fa8884d5976fa8c812d85e029636abe1092f2fd97a8529e935dc16f877cb75d7f9a3c0aa2236b2a9636d22 SHA512 c8c03273f686a8fa4151686b2426e437b3169ec78831e2d2f4a5bb20bb5265f4ede4a701bca5d21d0d8cafb4bb1e2c460c1b7ebb72ff042ec47221304dfbddd5
+DIST shorewall-core-5.2.3.4.tar.bz2 69744 BLAKE2B 14305bbd73f7f8fd5156a89bf986cbd5a1f4a3f511e8246659a132bc04d3f9ec3b3c6df4f4ced8e29b6034e690751c0dcd1ff8d28d6694528d704ed8ceedd33f SHA512 9fcc55d6eef1456cf3d45b87c29bdfc311e366837a91776519a158605ca2c012779851e94462acbe56868b8549d906f68d36b517b18e99a344cbb39f7127c649
 DIST shorewall-docs-html-5.2.3.3.tar.bz2 4303296 BLAKE2B 26fa00d1226fee0a60c5c352bb6d625a365641837a3e7cc9b0a9ec249f45926bb5230e53052597cda098e8bcbc171c9909b98436af75a3ceff6407bab3cbc8ad SHA512 e43c48cad4abb4e8455ff5f012af8cc466737b0c0ff130cadeb5860cee7f3fc38a7d6eacde5fa49c8afbbb6c49cc9df310eb9bcf992bb12422ade26ae003740e
+DIST shorewall-docs-html-5.2.3.4.tar.bz2 4292826 BLAKE2B ad5430fac374caeb00cab6edf0f5e9c7d72a5f60c39d43efb57013987eecc029283f698c51b82b577f708f64c39257f679c0c63c4d1879b95aa06e081c4275b0 SHA512 7c3fdc0603c4a8395a86234b982f984c01e131d6ab32a290477fc2ca081f5417dc943dd749da8f1ab76e0f5c0745ca99a6e5d3c3f03f4aa56720e7bf12f430c6
 DIST shorewall-init-5.2.3.3.tar.bz2 34456 BLAKE2B 5e7bf650de96973cfe211e4cbb9927c78a9cbae4a4436b8d556ac3df679a999294205f61532906dcbd0fa1027608dfa087b35c31bf64065cb0ccd6d5689905d0 SHA512 6c7017a6ac2df5611910132d9e5d2281b3210dda5e31ce26b15eed9ccd302ca9e1ddfbf92c093e6a751080e6f5a745516db2110bf30154f077d078b607087485
+DIST shorewall-init-5.2.3.4.tar.bz2 34827 BLAKE2B c57fed92734aa9f2e82b9f232568c7181c7ed2dd85257efd1a903747bc6c15951f1ca5521019bc7afa8b1e3e135359e6fa8162ae2ca732a45f03e035a3d0251b SHA512 f22e1a06ee47feacd49add0f0d9cfd7746ed4db626e863c1d8bf0287a33e4a39f6579deb3af29d38c299e8adc35fa5c4b930ba07cad449b1dab87054780109db
 DIST shorewall-lite-5.2.3.3.tar.bz2 39290 BLAKE2B f499ead6ee21323847b314793cd3250c08eda5e66c335effd72d9df92629e041377cbace0a6a647f5f791489a50663570d79eca7b4c59e1b75d017e47af82706 SHA512 12e87dc80fc347dd8077c9de9d87435bfe689c9115a5e88460f46f58a406ed66ce67f9b9847960bc50bee09eba7f1fe526a871f4852c2978392e7c10929f6617
+DIST shorewall-lite-5.2.3.4.tar.bz2 39642 BLAKE2B 83181e5bedc92d0f7bc6854aa7efe49c05caf3de310a3d3fb5d24eac312f957e3ebaf092a9cf4fa4eb19b9e1b853ececd8b1f3ce64ce47e5b475669920f5464e SHA512 4f73c05f1163051a30c46e4c898622a41c623b8d895c5c819f06ab7d81612cb1d396cdc2dceb816c65a67a1a11642f2bc20f6a510c71f11fc11b4057af837d62
 DIST shorewall6-5.2.3.3.tar.bz2 190274 BLAKE2B be44782454dff686a769e0f84298d5bb6217a85953e67acc7d2df16bcb4ebafc0867c62fc308f24690ba1d3b71444779fd5df1c6bce6545e3f269b0efbe49bd3 SHA512 ceb887f479841ed4998e488019bf3ec6874585c552f67be60af39f6414b40d24e2f6595812241d2f5fdf021beed2e0e2af8d98b03cdc66e72c7aedecbad8d3b1
+DIST shorewall6-5.2.3.4.tar.bz2 190759 BLAKE2B ad4a8530341700c475f6fadc840968c7c11fe1841a3c68a1145de457092dadce9a6c6b8df7ca6cb39343d248b1b9c5f267641a62193a76dc41b2bf93d0fe6b01 SHA512 d9c73ac388b794a1714e4487ef805121cef5743c04f48980bad74fd805bd923aae35c678e47a605532634ef156c4ba983f0f63672ee704634bef636505bb7c55
 DIST shorewall6-lite-5.2.3.3.tar.bz2 39210 BLAKE2B de02932cfc5315f1db0a21b6ec2f20e393ab041c3634a2bfee3bb309de73614f5da0e8e60ced697d16f82ff19f8257e7fff943fdae983bf64e8b7a18d43811be SHA512 044d793bfd98c0698713adf2aea8837fac970f39956db6f44c9e5b68c4435c65ebf594f5c3091f58dbd3e4d34c2d178052c5af28b568f591c290359cc1418e61
+DIST shorewall6-lite-5.2.3.4.tar.bz2 39623 BLAKE2B fc7ee2d7eee5a4f50b53882ad0ced13893b5f3c4348214529791e7aeffc6662ec5a6e9cead676287be028a8575ccb083570606f12b5e6880848c7476ca90a382 SHA512 3acb0a11c175ec8fd18b48a164c53aedb9e65347e0ca985307624ea892e3609ef645e8b2659319e00757a42efc161a219691027163387da70c6db624d0d6739d
 EBUILD shorewall-5.2.3.3.ebuild 17106 BLAKE2B aa979e5dec0e76a93db5bb2a4671158e792bb76e23e0fc05460f3ddcda9d2638c5608eacd18822aaf8e0dd5ff314925494ead63b39060b131be5ab454b3bb2ce SHA512 8c881b26cb893c6f1660481334440225b7cbce5012f2fcf20e8cce8403baab12fa21ee489b287eb1604b0d85a05d05c1120fc51617a6001cd35fcaab61e09b43
+EBUILD shorewall-5.2.3.4.ebuild 16979 BLAKE2B be07687a0184b7c790fba59dfb2a1212503d7748e5772b5a959a04a0376c3fc89d827fdf5fd0666b066bc6d0f0add984955ccf6631f605ffff5c1fcd276e952a SHA512 ac4af4eee2c1d7bf44ed265d9541713f2cca27975f7be93cd302ff9f5a8c8b8c2b91ead699d4cf8b8c661801b6dea9e5f40e5d074835b7fc90a431dc1d7b69c0
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
new file mode 100644
index 000000000000..6effdd7a417a
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
@@ -0,0 +1,482 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info prefix systemd
+
+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=$(ver_cut 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(ver_cut 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/'
+
+	if [[ ${MY_PV} = *-Beta* ]] ; then
+		MY_URL_SUFFIX="-Beta${MY_PV##*-Beta}"
+	elif [[ ${MY_PV} = *-RC* ]] ; then
+		MY_URL_SUFFIX="-RC${MY_PV##*-RC}"
+	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="${ED}" ${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="${ED}" ${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="${ED}" ${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="${ED}" ${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="${ED}" ${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="${ED}" ${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 "${ED}/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 \"${ED}/etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${ED}"/etc/logrotate.d/shorewall-init || die "Removing \"${ED}/etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${ED}/etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${ED}/etc/NetworkManager\" ..."
+			rm -rf "${ED}"/etc/NetworkManager || die "Removing \"${ED}/etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${ED}/usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${ED}"/usr/share/shorewall-init/ifupdown || die "Removing \"${ED}/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-fs/Manifest.gz b/net-fs/Manifest.gz
index e2d817105595..20ba865d65b1 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index cfd0b52e2202..4f1991e8cb63 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,13 +1,5 @@
-AUX autofs-5.1.2-libtirpc-as-need.patch 808 BLAKE2B a36fab796d78adff8cab4c10f8316d51809ef36781f7d95616b8c87ad093855a7c625c8cda907017c3000b3ee8a69cfc6ecfc60c655c32cd8dea0d2ede76ea0d SHA512 96441e4a040ceafd4bf323003d13170f419ea09c7d9cfdaeaf8675c945d28afde9b9ccf0ae3b0180d2038f5120e6d651c6657115658591093b778ed8f21b1bb3
 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd
 AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa
-DIST autofs-5.1.2.tar.xz 294792 BLAKE2B eeecac768726a1b2d336908b48222c53b1ffbc9eeff7b7f597ccbf55214d35f0d99eaeaa1c065509fffa31ec86729bdd51be873e003aa1fb7d88a9e2ab04f4c8 SHA512 435bcb41c9d467947c194d879e46692b5976131b8e923793bdeac34f70420ede740c4d70ec393413fff0b1010495ac7fe5fa8b45a59d15a2430ecae9ec3fe7e1
-DIST autofs-5.1.3.tar.xz 300632 BLAKE2B 500325ec790304442e896208e94e25cf862621fc2354fa3c31fbf277dcc570d0b2b27894728d9f881efdcca262b1ef6e2c957cd23e2aea1d5b3cd2cd822c813b SHA512 d5363f4442be5258465140920a32cb63340c5da060ef2e66678f003d6a0c00579880837f0a04f59c7bce57d1cbc0f42bdd26546a2195f87e7bd46334c9e32e35
-DIST autofs-5.1.4.tar.xz 304864 BLAKE2B 7348aa1106554eb765919c765c0585b5d975d7a0ea036dec5b509711bf33cefd0f3e1e857a6865434adabbd1e323cfe8ffb09eb234495672e81101f79b8f4d0f SHA512 1ef48800a1e44d6bf7048923109f3b8299ef266ff0fbaf5f979c32f42c6c5e28620c1876f64b9d913fddb69244ff83226c01c666401ff6271dd6b53d31860589
 DIST autofs-5.1.5.tar.xz 313476 BLAKE2B 9822f6eb6294a0ee14b08f7982bf6008eb9ac8a79f89cdf3ffa0ed234b83c932db1646fc5591269000372dbfb95ce1b9ded040f0724a7eb4b3888caf20f56a20 SHA512 c8138929a9e2cfa7e0096c1d490b9d7275d1d43a50f5f87ad457bdd9a49c7dd13a4aa5d86ab1e028d66dae630e1a1342661844e5775625fe585867f0f4778898
-EBUILD autofs-5.1.2.ebuild 3157 BLAKE2B 29c4a6f616f3da60798d51d01fd2547509a9e74ac8d98abe570bf13b68f5c3a104d28d19c76bdc1be8fe0002ec38d835c1f3b28d51f57bd7e1f46ce33698cf3f SHA512 2be0c80720dca0ebc3c0ac654cfdc4eddd388bb244808f904e82f3346a8d9d6cbcd83d50c776aaf6adef27288c411aacc5dec0bd4e10954d1e3f33ca41211ba1
-EBUILD autofs-5.1.3.ebuild 2937 BLAKE2B 90927d80b1250c13391c681fb605a0c9d5348b3f6e132f71d4ba58be285254d4e3f132a413b2a2c4d826ea07d56d8865df769d63647c038a8486d794f44622a9 SHA512 fd292b5aa28d53738e60e9fa21449c4af5f31b3d418fec30bc5ff371db5bce56cc5c385a04f9287d7c5b6af92e032dd0c2dcefbae58c99c64179c95cff697795
-EBUILD autofs-5.1.4.ebuild 2937 BLAKE2B 90927d80b1250c13391c681fb605a0c9d5348b3f6e132f71d4ba58be285254d4e3f132a413b2a2c4d826ea07d56d8865df769d63647c038a8486d794f44622a9 SHA512 fd292b5aa28d53738e60e9fa21449c4af5f31b3d418fec30bc5ff371db5bce56cc5c385a04f9287d7c5b6af92e032dd0c2dcefbae58c99c64179c95cff697795
-EBUILD autofs-5.1.5-r1.ebuild 3083 BLAKE2B 2b9237308a753fdc6fa3fc260cff723026543476753866f4f4bf39e1f19f5a33b2376fed696784cdb296e15cbfcb8c5be26188e0b6dba382f1faeb36fe5a7bd9 SHA512 228c6d1b49d9e400da1837db73cfad7e1e4339beb4b99a10183a1a2a5da57bc5cde5f6aa26023c80f7ae2c4f4223eea5250a32413cc82ee57df1790200f964d7
-EBUILD autofs-5.1.5-r2.ebuild 2930 BLAKE2B badacbf6e32ab37700c08dfc6cf15729d83b73850c07d331bbb9b173f7bd21b82de0edd1b05b99d84afeee5d6c49a1ca68330754867dac7e7fc880c79f9fd5ac SHA512 c54017c16f012145a4351722bf360e4e6de7f825081d79bc60b70cd8d9e58067e26d22465fa4403639ee974d788cb2301275f3067178977efd2d189ed9db5aa3
+EBUILD autofs-5.1.5-r2.ebuild 2927 BLAKE2B 6863078a585f3cdbdd1b897a47cb92ba6d7e681fdc995bd6f4b044a36163527622eb9f44afbecafddaf20fbb59e082840774e591f4ce85f4463f3788c4c3c598 SHA512 519ed73687be9f06273a9dbce8639ec00a2d089b955cd4bf73954826f9181884bb5bc4757b433a750e9e72f16fdcdc6facfc4bf43d799a68901b2a6bcdec43f0
 MISC metadata.xml 897 BLAKE2B a986a7de6079af006edec362f4ebda0a0da7baf04ce9151164bb60aba9e73ed3b398def4c0693e6905ff36c4f7bb4c94e3bb72ddc04c24e520e3a1c5909eacde SHA512 ea9849bee9f3e8247a366f9fab08cb40d0421df977e4071bff1a04cad68766815059bbf3de64cd8670b8cd024d5f455e14cd41b2bcfa8bac00f032ef8aaaa821
diff --git a/net-fs/autofs/autofs-5.1.2.ebuild b/net-fs/autofs/autofs-5.1.2.ebuild
deleted file mode 100644
index 902979caabdf..000000000000
--- a/net-fs/autofs/autofs-5.1.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=true
-
-inherit autotools-utils linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="
-	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
-	${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="-dmalloc ldap +libtirpc mount-locking sasl"
-
-# USE="sasl" adds SASL support to the LDAP module which will not be build. If
-# SASL support should be available, please add "ldap" to the USE flags.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	libtirpc? ( net-libs/libtirpc )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	libtirpc? ( net-libs/rpcsvc-proto )
-"
-
-CONFIG_CHECK="~AUTOFS4_FS"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libtirpc-as-need.patch
-)
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_enable mount-locking)
-		--without-hesiod
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		--with-systemd="$(systemd_get_unitdir)" #bug #479492
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile DONTSTRIP=1
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.1.3.ebuild b/net-fs/autofs/autofs-5.1.3.ebuild
deleted file mode 100644
index c09dd3334e1f..000000000000
--- a/net-fs/autofs/autofs-5.1.3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="
-	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
-	${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-dmalloc ldap +libtirpc mount-locking sasl"
-
-# USE="sasl" adds SASL support to the LDAP module which will not be build. If
-# SASL support should be available, please add "ldap" to the USE flags.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	libtirpc? ( net-libs/libtirpc )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	libtirpc? ( net-libs/rpcsvc-proto )
-"
-
-CONFIG_CHECK="~AUTOFS4_FS"
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-	default
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_enable mount-locking)
-		--without-hesiod
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		--with-systemd="$(systemd_get_systemunitdir)" #bug #479492
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.1.4.ebuild b/net-fs/autofs/autofs-5.1.4.ebuild
deleted file mode 100644
index c09dd3334e1f..000000000000
--- a/net-fs/autofs/autofs-5.1.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="
-	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
-	${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-dmalloc ldap +libtirpc mount-locking sasl"
-
-# USE="sasl" adds SASL support to the LDAP module which will not be build. If
-# SASL support should be available, please add "ldap" to the USE flags.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	libtirpc? ( net-libs/libtirpc )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	libtirpc? ( net-libs/rpcsvc-proto )
-"
-
-CONFIG_CHECK="~AUTOFS4_FS"
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-	default
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_enable mount-locking)
-		--without-hesiod
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		--with-systemd="$(systemd_get_systemunitdir)" #bug #479492
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.1.5-r1.ebuild b/net-fs/autofs/autofs-5.1.5-r1.ebuild
deleted file mode 100644
index c7f1f39104fe..000000000000
--- a/net-fs/autofs/autofs-5.1.5-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="
-	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
-	${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd"
-
-# USE="sasl" adds SASL support to the LDAP module which will not be build. If
-# SASL support should be available, please add "ldap" to the USE flags.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	systemd? ( sys-apps/systemd )
-	libtirpc? ( net-libs/libtirpc )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	libtirpc? ( net-libs/rpcsvc-proto )
-"
-
-CONFIG_CHECK="~AUTOFS4_FS"
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-
-	# need for install autofs.service
-	sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die
-
-	default
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_enable mount-locking)
-		$(use_with systemd systemd $(systemd_get_systemunitdir)) #bug #479492
-		--without-hesiod
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}/usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}/usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.1.5-r2.ebuild b/net-fs/autofs/autofs-5.1.5-r2.ebuild
index 81532f3d62be..1e2fd32e46a7 100644
--- a/net-fs/autofs/autofs-5.1.5-r2.ebuild
+++ b/net-fs/autofs/autofs-5.1.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd"
 
 # currently, sasl code assumes the presence of kerberosV
diff --git a/net-fs/autofs/files/autofs-5.1.2-libtirpc-as-need.patch b/net-fs/autofs/files/autofs-5.1.2-libtirpc-as-need.patch
deleted file mode 100644
index f6e176978164..000000000000
--- a/net-fs/autofs/files/autofs-5.1.2-libtirpc-as-need.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Make configure compatible with -Wl,--as-needed following
-https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Failure_in_..2Fconfigure
-
-2016-07-05 Martin von Gagern
-
---- autofs-5.1.2.orig/aclocal.m4
-+++ autofs-5.1.2/aclocal.m4
-@@ -413,9 +413,9 @@ AC_DEFUN([AF_CHECK_LIBTIRPC],
- [
- # save current flags
- af_check_libtirpc_save_cflags="$CFLAGS"
--af_check_libtirpc_save_ldflags="$LDFLAGS"
-+af_check_libtirpc_save_libs="$LIBS"
- CFLAGS="$CFLAGS -I/usr/include/tirpc"
--LDFLAGS="$LDFLAGS -ltirpc"
-+LIBS="$LIBS -ltirpc"
- 
- AC_TRY_LINK(
-     [ #include <rpc/rpc.h> ],
-@@ -438,7 +438,7 @@ AC_CHECK_FUNCS([getrpcbyname getservbyna
- 
- # restore flags
- CFLAGS="$af_check_libtirpc_save_cflags"
--LDFLAGS="$af_check_libtirpc_save_ldflags"
-+LIBS="$af_check_libtirpc_save_libs"
- ])
- 
- AC_DEFUN([AF_WITH_LIBTIRPC],
diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest
index fa91c7f68bc1..d4e7ac8667b6 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -127,6 +127,7 @@ DIST github.com-tidwall-match-33827db735fff6510490d69a8622612558a557ed.tar.gz 43
 DIST github.com-tidwall-pretty-1166b9ac2b65e46a43d8618d30d1554f4652d49b.tar.gz 8823 BLAKE2B 6470a0221efb65e13d22e7cb8c5c5e43065d2980511b3972e22dfedb77b374879e4be055cae64fe9e95ca7dd0fc89c99159dd49651d43db8466f0b18e8128f4e SHA512 3a3820a4029a310e69d997dcd2a378fae2e8c0c0f76c9e2eef87bf43754832999ab4dc4c506a75e3b788ff855842b62fde8b1782ea7259a6c640a0de99a3921f
 DIST github.com-tidwall-sjson-25fb082a20e29e83fb7b7ef5f5919166aad1f084.tar.gz 26764 BLAKE2B 1756704c32c465c7368f7947ec0c7f257dcc007a0a4eaa3b18c3a3dbcebc5bd952d128dd92010bb04a4ad55a0a1e2e3e3c6524bd18ef082671d39fb9225eb0b6 SHA512 314d63ad24d9b5c4133f8a2f603a19e09f73958a61c8b10b758f760825a411fd478ab47a1fa0e95c1c5156e7b2aa0ad611ba2ca91bf0b10f6bf2b9608bbc8f4a
 DIST github.com-uber-go-atomic-1ea20fb1cbb1cc08cbd0d913a96dead89aa18289.tar.gz 8055 BLAKE2B 89cd909922bf9e565cd01e86b5970dfd55e0f4cbb3109ac052080013aa9a1dfef79761b5f3e08f6c2f2fe1cbcc99d7148e129461b7f95e266ff8253b38124732 SHA512 1455ebfeb0457da779eda76de3bdd5ef8aa18aa440563b3933d2013bff5b3742f245dd396cc9e93bbb343d166d048877b192b159b23b41c630128ac2e2ab26a5
+DIST github.com-valyala-fastjson-v1.4.1.tar.gz 728333 BLAKE2B bf43df3d72c0e9c06667bf6670aef178b638efc51ac5918c2bd9dc1a3016daa9bd98b78f426289262963e40b4233434e46086d113d4dabe43296a8e4e19bdc46 SHA512 6af810588ee07c39d3e4416aca6dc3ea6aa344b3febd0a2204cfb12e1ac3383a6736a1e1d48593bb31ddaf59520bc5a566ccd489d8596632e6fceb7672ba6582
 DIST github.com-valyala-tcplisten-ceec8f93295a060cdb565ec25e4ccf17941dbd55.tar.gz 4579 BLAKE2B d1c4bdac60073d25e0d953c2f48820c72e0da13b730f439abff498ff9fe09165ee006b021df4d6c925e9d364f5565025dd0fb8f10cad20d16db3e14aa32ddafd SHA512 69f9afd7e71c9dabb851b2592f99d565d83be9dea2ff55ee0208401debf6445e92d74973079f369d4028c64bcf6e9156a9144ba536cef8b6f72685762f28197e
 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
@@ -150,6 +151,8 @@ DIST minio-2019.07.24.02.02.23.tar.gz 6071931 BLAKE2B 927d20dd4d0d905004bd4f6f69
 DIST minio-2019.07.31.18.57.56.tar.gz 6075316 BLAKE2B f1ce00ac4ef82a543afadf8d816b5f3e771b5ca6e1f24d31fbec25f2e6202ba740b3887c4530df9583a518b2bc364dc5949a18943353876e145408585f6b4efa SHA512 ecceb4d66caafafa5a0af80d493822d2dd2f93ba53f876d6eecb94cfb7e8963034e64ac138f818f1bc114f2a26b9b3d26ae732fd03f1d3ffea7a166dc0041676
 DIST minio-2019.08.01.22.18.54.tar.gz 6075510 BLAKE2B 73d21e067c5e067465a98dbbfc0442317f11ae6c08c1b910624dfbfc7850022b12e29bdff75c6cd2c0d5f45b2ff6607349bebce17864d69db1079be5be4860b8 SHA512 a2a6008a5516210048e2258c0c3dff9788efc6f7c510225d4e49da78d7c9ebae84be696796d4ca49bddea7cf8804784e743fcd1fab635ea9c6eb613678a6b8dd
 DIST minio-2019.08.14.20.37.41.tar.gz 6943472 BLAKE2B 5f79acc95d25f33d3428dba27a22c6c7b6ccedea0a996994931b21e1376f3a8d43dc8f4b091fee5e320d7b5198e58ec493e3a3a0902b0bad3ea0c6d598be8663 SHA512 87f4c47eb3d7c719099da3704e9144b5c8e5b93fa7fd49434c0764670a8a164d21af0a05474c6ee049b99d162a62c47b6a145d5876b2c723a0c415f7b26811e6
+DIST minio-2019.08.21.19.40.07.tar.gz 6945260 BLAKE2B a44d09e1344ff3e24c7de66a4b6250ad2f49dbaa9d8512a2eeab12465a4666e975e9917cb0bbe5b591f187be31c8f043e70620151505f70ae0b9bad41f247731 SHA512 f66a746a3155ab20054e70b48aac035000bb590adda63e74520eb6da54a37e11c978b3528238cfe90ed5ce9270e93b2951a513b261e1ed4d7360fc6e082450c7
+DIST minio-2019.08.29.00.25.01.tar.gz 6944687 BLAKE2B c37cc1d232ff947d6bee2c6dcffbc61886f5ce5e372b2c599d9c26d1c609da3d6c1ce30c86c46135764e7a62ea502ea8ca5363d1885f0ee298d17fd9ef173f5f SHA512 760f1b7532b86fc537bbd09fdf42c1a5be62ffae199f7e948bca00d6d4044bd97a6addea1b5a2af3b2721e855d485f845785672c332b45c842d6b1a99e148bda
 EBUILD minio-2019.01.10.00.21.20.ebuild 1381 BLAKE2B 5ce76ea9331938f9e42cfbfcdfa12c57f5cd2e2a7c06282379bf6af2bf31886d0eebcf8a8f33bae7fc6e773061df0bd6f54697936eaa4ac7c446a104b84718c4 SHA512 2708fac173db7349246b4391510cefd625e68986609e5fea2a6b8caf08afd00a5ba251689895a05c468ebae4e9328e95cdb2d0cf279cb0d701e1a145934a7290
 EBUILD minio-2019.01.16.21.44.08.ebuild 1381 BLAKE2B 5ce76ea9331938f9e42cfbfcdfa12c57f5cd2e2a7c06282379bf6af2bf31886d0eebcf8a8f33bae7fc6e773061df0bd6f54697936eaa4ac7c446a104b84718c4 SHA512 2708fac173db7349246b4391510cefd625e68986609e5fea2a6b8caf08afd00a5ba251689895a05c468ebae4e9328e95cdb2d0cf279cb0d701e1a145934a7290
 EBUILD minio-2019.01.23.23.18.58.ebuild 1381 BLAKE2B 5ce76ea9331938f9e42cfbfcdfa12c57f5cd2e2a7c06282379bf6af2bf31886d0eebcf8a8f33bae7fc6e773061df0bd6f54697936eaa4ac7c446a104b84718c4 SHA512 2708fac173db7349246b4391510cefd625e68986609e5fea2a6b8caf08afd00a5ba251689895a05c468ebae4e9328e95cdb2d0cf279cb0d701e1a145934a7290
@@ -172,4 +175,6 @@ EBUILD minio-2019.07.24.02.02.23.ebuild 11693 BLAKE2B 1626e907246dc8745b3b9f6ba5
 EBUILD minio-2019.07.31.18.57.56.ebuild 11693 BLAKE2B 1626e907246dc8745b3b9f6ba53b71af3ef8149537af6e0b96a2f77127e109daf621e1f619b5af4da6f49f1893965f40f3e492224498e0665a39bb52e1f65560 SHA512 666c9a7e023134d5aa8d484bc17d5574a66494060498952a3bbe860bca850027dd8bfdb6b7e4bd6fd98913cf4f4a2ef309a1eea6ceeae67d432968876dfd8eb7
 EBUILD minio-2019.08.01.22.18.54.ebuild 11896 BLAKE2B eb5f3d23f030595cc42ce6ff3542a34059dcbb2f86b76c286e987c5a16525d0ba6f7e48f8c3944deab604caf566a96d2da596f4b1d5270a2cbe2038c51ea5d7d SHA512 58968c4793bd6d3c34c07781f849dafacb398502c28d4f9356b210c7ec2c743488a3041b06cb818c05766be3e97f54b84a4f0f8401940f9621d283ed3d467446
 EBUILD minio-2019.08.14.20.37.41.ebuild 11896 BLAKE2B eb5f3d23f030595cc42ce6ff3542a34059dcbb2f86b76c286e987c5a16525d0ba6f7e48f8c3944deab604caf566a96d2da596f4b1d5270a2cbe2038c51ea5d7d SHA512 58968c4793bd6d3c34c07781f849dafacb398502c28d4f9356b210c7ec2c743488a3041b06cb818c05766be3e97f54b84a4f0f8401940f9621d283ed3d467446
+EBUILD minio-2019.08.21.19.40.07.ebuild 11939 BLAKE2B 1f4ccf9bd8c6c3a04cce98ca212784e10e5c2c12043c11b903daf403e17b9e536645bcd15a0f07cd2cd892fb258aa2faf80de18b7881ff3833e7312725e20897 SHA512 b6179ff35ef06d333462c3b9b1b3b3a808e8dcd129c9217748d535948152762912c602cf87a9041cdc23b7fcb1b0e2ca4d5ed2e7c26cd46436102abfb123e8e8
+EBUILD minio-2019.08.29.00.25.01.ebuild 11939 BLAKE2B 1f4ccf9bd8c6c3a04cce98ca212784e10e5c2c12043c11b903daf403e17b9e536645bcd15a0f07cd2cd892fb258aa2faf80de18b7881ff3833e7312725e20897 SHA512 b6179ff35ef06d333462c3b9b1b3b3a808e8dcd129c9217748d535948152762912c602cf87a9041cdc23b7fcb1b0e2ca4d5ed2e7c26cd46436102abfb123e8e8
 MISC metadata.xml 323 BLAKE2B 53e4aa74bfb7ce2ce83686b69238aa7d248c06dfdf61703b7e5d40a099d0c972492a2a6eaed91fe16914443e1dab70ebd421c4dbec06064ac72736dc381d6a7e SHA512 827c8163d2b096af06bee067f81fb16236681807b71e945427290ee9b077be0520a4d18f404a8c75eef1d49eeaa36850d2035fd1addaf42dfada0922f2eac3b4
diff --git a/net-fs/minio/minio-2019.08.21.19.40.07.ebuild b/net-fs/minio/minio-2019.08.21.19.40.07.ebuild
new file mode 100644
index 000000000000..c0b5ee79d46f
--- /dev/null
+++ b/net-fs/minio/minio-2019.08.21.19.40.07.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=( "gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232 github.com/go-yaml/yaml"
+	     "gopkg.in/olivere/elastic.v5 f72acaba629a7ec879103d17b7426a31bc38e199 github.com/olivere/elastic"
+	     "gopkg.in/Shopify/sarama.v1 879f631812a30a580659e8035e7cda9994bb99ac github.com/Shopify/sarama"
+	     "google.golang.org/api/option bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "google.golang.org/api/iterator bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "google.golang.org/api/googleapi bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef github.com/golang/time"
+	     "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys"
+	     "golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146 github.com/golang/net"
+	     "golang.org/x/text e3703dcdd614d2d7488fff034c75c551ea25da95 github.com/golang/text"
+	     "golang.org/x/crypto 38d8ce5564a5b71b2e3a00553993f1b9a7ae852f github.com/golang/crypto"
+	     "go.uber.org/atomic 1ea20fb1cbb1cc08cbd0d913a96dead89aa18289 github.com/uber-go/atomic"
+	     "github.com/valyala/tcplisten ceec8f93295a060cdb565ec25e4ccf17941dbd55"
+	     "cloud.google.com/go/storage a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4 github.com/googleapis/google-cloud-go"
+	     "github.com/tidwall/sjson 25fb082a20e29e83fb7b7ef5f5919166aad1f084"
+	     "github.com/tidwall/gjson eee0b6226f0d1db2675a176fdfaa8419bcad4ca8"
+	     "github.com/tidwall/pretty 1166b9ac2b65e46a43d8618d30d1554f4652d49b"
+	     "github.com/tidwall/match 33827db735fff6510490d69a8622612558a557ed"
+	     "github.com/streadway/amqp 14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688"
+	     "github.com/skyrings/skyring-common d1c0bb1cbd5ed8438be1385c85c4f494608cde1e"
+	     "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2"
+	     "github.com/rs/cors 9a47f48565a795472d43519dd49aac781f3034fb"
+	     "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7"
+	     "github.com/rcrowley/go-metrics 3113b8401b8a98917cde58f8bbd42a1b1c03b1fd"
+	     "github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
+	     "github.com/prometheus/procfs 55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352"
+	     "github.com/prometheus/common 5df5c82edb7502fd6cbe093223a19b6e1231494f"
+	     "github.com/prometheus/client_model fd36f4220a901265f90734c3183c5f0c91daa0b8"
+	     "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee"
+	     "github.com/pkg/errors ba968bfe8b2f7e042a574c888954fccecfa385b4"
+	     "github.com/pierrec/lz4 315a67e90e415bcdaff33057da191569bf4d8479"
+	     "github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f"
+	     "github.com/nats-io/nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228"
+	     "github.com/nats-io/nuid 3024a71c3cbe30667286099921591e6fcc328230"
+	     "github.com/nats-io/nkeys 1546a3320a8f195a5b5c84aef8309377c2e411d5"
+	     "github.com/nats-io/go-nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228"
+	     "github.com/nats-io/go-nats-streaming 4366d43a0648b4997ed32080f937e8702ab86c48"
+	     "github.com/Azure/azure-sdk-for-go d659f2a91175cac99aa5627d09b83026eacc978d"
+	     "github.com/Azure/go-autorest 3b1641ed03046f2ee28d73f7a51e5b884d55b92a"
+	     "github.com/DataDog/zstd c7161f8c63c045cbc7ca051dcc969dd0e4054de2"
+	     "github.com/mailru/easyjson 1ea4449da9834f4d333f1cc461c374aea217d249"
+	     "github.com/gorilla/mux a7962380ca08b5a188038c69871b8d3fbdf31e89"
+	     "github.com/coredns/coredns 8dcc7fccd74454134b33c8bc9f780ed6d7f076cf"
+	     "github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d"
+	     "github.com/eapache/go-resiliency 842e16ec2c98ef0c59eebfe60d2d3500a793ba19"
+	     "github.com/minio/minio-go 5325257a208fc630aaaac31bc00789acbc998c14"
+	     "github.com/alecthomas/participle 98cb121381c371cf1542c7ae145e485d703aec0b"
+	     "github.com/aliyun/aliyun-oss-go-sdk 86c17b95fcd5db33628a61e492fb4a1a937d5906"
+	     "github.com/bcicen/jstream 16c1f8af81c2a9967b30d365a29472126274f998"
+	     "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+	     "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11"
+	     "github.com/gogo/protobuf 382325bbbb4d1c850eec1f3ec92a1a16f502d68b"
+	     "github.com/davecgh/go-spew d8f796af33cc11cb798c1aaeb27a4ebc5099927d"
+	     "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad"
+	     "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+	     "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727"
+	     "github.com/klauspost/pgzip 083b1c3f84dd6486588802e5ce295de3a7f41a8b"
+	     "github.com/marstr/guid 8bd9a64bf37eb297b492a4101fb28e80ac0b290f"
+	     "github.com/coreos/etcd d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9"
+	     "github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
+	     "github.com/gorilla/rpc bffcfa752ad4e523cc8f720afeb5b985ed41ae16"
+	     "github.com/djherbis/atime 8e47e0e01d08df8b9f840d74299c8ab70a024a30"
+	     "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e"
+	     "github.com/eapache/go-xerial-snappy 776d5712da21bc4762676d614db1d8a64f4238b0"
+	     "github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d"
+	     "github.com/golang/protobuf d3c38a4eb4970272b87a425ae00ccc4548e2f9bb"
+	     "github.com/fatih/structs 4966fc68f5b7593aafa6cbbba2d65ec6e1416047"
+	     "github.com/minio/parquet-go 9d767baf16793cc4b7fd55d642474c36c077ef77"
+	     "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini"
+	     "google.golang.org/grpc 3507fb8e1a5ad030303c106fef3a47c9fdad16ad github.com/grpc/grpc-go"
+	     "google.golang.org/genproto 64821d5d210748c883cd2b809589555ae4654203 github.com/google/go-genproto"
+	     "go.opencensus.io 43463a80402d8447b7fce0d2c58edf1687ff0b58 github.com/census-instrumentation/opencensus-go"
+	     "git.apache.org/thrift.git c9b1e29bc9e0702d7441383358d565e1e76ccea7 github.com/apache/thrift"
+	     "github.com/elazarl/go-bindata-assetfs 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"
+	     "github.com/eclipse/paho.mqtt.golang 20337d8c394721c308cc6ec096990ee451a7cd7f"
+	     "github.com/klauspost/compress 30be6041bed523c18e269a700ebd9c2ea9328574"
+	     "github.com/hashicorp/vault 36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd"
+	     "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
+	     "github.com/miekg/dns 73601d4aed9d844322611759d7f3619110b7c88e"
+	     "github.com/klauspost/reedsolomon a9588190c00b0ccd742218388f6ff68bbad83e5c"
+	     "github.com/gomodule/redigo 9c11da706d9b7902c6da69c592f75637793fe121"
+	     "github.com/go-sql-driver/mysql 72cd26f257d44c1114970e19afddcd812016007e"
+	     "github.com/gorilla/handlers 7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"
+	     "github.com/mattn/go-isatty c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7"
+	     "github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
+	     "github.com/golang/snappy 2a8bb927dd31d8daada140a5d09578521ce5c36a"
+	     "github.com/klauspost/cpuid e7e905edc00ea8827e58662220139109efea09db"
+	     "contrib.go.opencensus.io/exporter/ocagent 902c0ccba68df93f7fefbe7e7c6f16be33108b40 github.com/census-ecosystem/opencensus-go-exporter-ocagent"
+	     "github.com/lib/pq 4ded0e9383f75c197b3a2aaa6d590ac52df6fd79"
+	     "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3"
+	     "github.com/census-instrumentation/opencensus-proto a105b96453fe85139acc07b68de48f2cbdd71249"
+	     "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee"
+	     "github.com/minio/mc a1355e50e2e8984d645cc7745230c42b27396341"
+	     "google.golang.org/api bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "github.com/grpc-ecosystem/grpc-gateway 20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea"
+	     "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045"
+	     "github.com/minio/blazer 2081f5bf046503f576d8712253724fbf2950fffe"
+	     "github.com/minio/highwayhash 02ca4b43caa3297fbb615700d8800acc7933be98"
+	     "github.com/minio/lsync v1.0.1"
+	     "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261"
+	     "github.com/minio/sio 035b4ef8c449ba2ba21ec143c91964e76a1fb68c"
+	     "golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c github.com/golang/sync"
+	     "golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
+	     "cloud.google.com/go 458e1f376a2b44413160b5d301183b65debaa3f6 github.com/googleapis/google-cloud-go"
+	     "github.com/googleapis/gax-go beaecbbdd8af86aa3acf14180d53828ce69400b2"
+	     "github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"
+	     "github.com/json-iterator/go 0ff49de124c6f76f8494e194af75bde0f1a49a29"
+	     "github.com/colinmarc/hdfs/v2 fd1e410ff7bf76b870f625dc0aa3eb4e44f5bc50 github.com/colinmarc/hdfs"
+	     "github.com/hashicorp/go-uuid 4f571afc59f3043a65f8fe6bf46d887b10a01d43"
+	     "github.com/jcmturner/gofork dc7c13fece037a4a36e2b3c69db4991498d30692"
+	     "github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+	     "github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
+	     "gopkg.in/jcmturner/aescts.v1 f6abebb3171c4c1b1fea279cb7c7325020a26290 github.com/jcmturner/aescts"
+	     "gopkg.in/jcmturner/dnsutils.v1 13eeb8d49ffb74d7a75784c35e4d900607a3943c github.com/jcmturner/dnsutils"
+	     "github.com/klauspost/readahead v1.3.0"
+	     "github.com/kurin/blazer v0.5.3"
+	     "github.com/minio/dsync/v2 fedfb5c974fa2ab238e45a6e6b19d38774e0326f github.com/minio/dsync"
+	     "github.com/ncw/directio v1.0.5"
+	     "github.com/nats-io/stan.go v0.4.5"
+	     "github.com/nats-io/nats.go v1.8.0"
+	     "github.com/minio/minio-go v6.0.29"
+	     "github.com/minio/hdfs/v3 v3.0.1 github.com/minio/hdfs"
+	     "github.com/minio/gokrb5/v7 v7.2.5 github.com/minio/gokrb5"
+	     "github.com/minio/minio-go/v6 v6.0.29 github.com/minio/minio-go"
+	     "gopkg.in/jcmturner/goidentity.v3 v5.0.0 github.com/jcmturner/goidentity"
+	     "gopkg.in/jcmturner/rpc.v1  99a8ce2fbf8b8087b6ed12a37c61b10f04070043 github.com/jcmturner/rpc"
+	     "gopkg.in/jcmturner/goidentity.v2 v2.0.0 github.com/jcmturner/goidentity"
+	     "gopkg.in/jcmturner/goidentity.v3 v3.0.0 github.com/jcmturner/goidentity"
+	     "github.com/kurin/blazer cf2f27cc0be3dac3c1a94c3c8b76834ce741439e"
+	     "github.com/valyala/fastjson v1.4.1"
+)
+
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/minio/minio"
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+EGIT_COMMIT="3e3fbdf8e6e5e889232eb7afc0b27ac054adfda0"
+ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+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
+
+	pushd src/${EGO_PN} || die
+
+	rm go.mod || die
+
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		buildscripts/gen-ldflags.go || die
+
+	popd || die
+}
+
+src_compile() {
+	unset XDG_CACHE_HOME
+
+	pushd src/${EGO_PN} || die
+	MINIO_RELEASE="${MY_PV}"
+	go run buildscripts/gen-ldflags.go
+	GOPATH="${S}" GOCACHE="${T}"/go-cache 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.08.29.00.25.01.ebuild b/net-fs/minio/minio-2019.08.29.00.25.01.ebuild
new file mode 100644
index 000000000000..c0b5ee79d46f
--- /dev/null
+++ b/net-fs/minio/minio-2019.08.29.00.25.01.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=( "gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232 github.com/go-yaml/yaml"
+	     "gopkg.in/olivere/elastic.v5 f72acaba629a7ec879103d17b7426a31bc38e199 github.com/olivere/elastic"
+	     "gopkg.in/Shopify/sarama.v1 879f631812a30a580659e8035e7cda9994bb99ac github.com/Shopify/sarama"
+	     "google.golang.org/api/option bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "google.golang.org/api/iterator bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "google.golang.org/api/googleapi bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef github.com/golang/time"
+	     "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys"
+	     "golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146 github.com/golang/net"
+	     "golang.org/x/text e3703dcdd614d2d7488fff034c75c551ea25da95 github.com/golang/text"
+	     "golang.org/x/crypto 38d8ce5564a5b71b2e3a00553993f1b9a7ae852f github.com/golang/crypto"
+	     "go.uber.org/atomic 1ea20fb1cbb1cc08cbd0d913a96dead89aa18289 github.com/uber-go/atomic"
+	     "github.com/valyala/tcplisten ceec8f93295a060cdb565ec25e4ccf17941dbd55"
+	     "cloud.google.com/go/storage a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4 github.com/googleapis/google-cloud-go"
+	     "github.com/tidwall/sjson 25fb082a20e29e83fb7b7ef5f5919166aad1f084"
+	     "github.com/tidwall/gjson eee0b6226f0d1db2675a176fdfaa8419bcad4ca8"
+	     "github.com/tidwall/pretty 1166b9ac2b65e46a43d8618d30d1554f4652d49b"
+	     "github.com/tidwall/match 33827db735fff6510490d69a8622612558a557ed"
+	     "github.com/streadway/amqp 14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688"
+	     "github.com/skyrings/skyring-common d1c0bb1cbd5ed8438be1385c85c4f494608cde1e"
+	     "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2"
+	     "github.com/rs/cors 9a47f48565a795472d43519dd49aac781f3034fb"
+	     "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7"
+	     "github.com/rcrowley/go-metrics 3113b8401b8a98917cde58f8bbd42a1b1c03b1fd"
+	     "github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
+	     "github.com/prometheus/procfs 55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352"
+	     "github.com/prometheus/common 5df5c82edb7502fd6cbe093223a19b6e1231494f"
+	     "github.com/prometheus/client_model fd36f4220a901265f90734c3183c5f0c91daa0b8"
+	     "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee"
+	     "github.com/pkg/errors ba968bfe8b2f7e042a574c888954fccecfa385b4"
+	     "github.com/pierrec/lz4 315a67e90e415bcdaff33057da191569bf4d8479"
+	     "github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f"
+	     "github.com/nats-io/nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228"
+	     "github.com/nats-io/nuid 3024a71c3cbe30667286099921591e6fcc328230"
+	     "github.com/nats-io/nkeys 1546a3320a8f195a5b5c84aef8309377c2e411d5"
+	     "github.com/nats-io/go-nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228"
+	     "github.com/nats-io/go-nats-streaming 4366d43a0648b4997ed32080f937e8702ab86c48"
+	     "github.com/Azure/azure-sdk-for-go d659f2a91175cac99aa5627d09b83026eacc978d"
+	     "github.com/Azure/go-autorest 3b1641ed03046f2ee28d73f7a51e5b884d55b92a"
+	     "github.com/DataDog/zstd c7161f8c63c045cbc7ca051dcc969dd0e4054de2"
+	     "github.com/mailru/easyjson 1ea4449da9834f4d333f1cc461c374aea217d249"
+	     "github.com/gorilla/mux a7962380ca08b5a188038c69871b8d3fbdf31e89"
+	     "github.com/coredns/coredns 8dcc7fccd74454134b33c8bc9f780ed6d7f076cf"
+	     "github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d"
+	     "github.com/eapache/go-resiliency 842e16ec2c98ef0c59eebfe60d2d3500a793ba19"
+	     "github.com/minio/minio-go 5325257a208fc630aaaac31bc00789acbc998c14"
+	     "github.com/alecthomas/participle 98cb121381c371cf1542c7ae145e485d703aec0b"
+	     "github.com/aliyun/aliyun-oss-go-sdk 86c17b95fcd5db33628a61e492fb4a1a937d5906"
+	     "github.com/bcicen/jstream 16c1f8af81c2a9967b30d365a29472126274f998"
+	     "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+	     "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11"
+	     "github.com/gogo/protobuf 382325bbbb4d1c850eec1f3ec92a1a16f502d68b"
+	     "github.com/davecgh/go-spew d8f796af33cc11cb798c1aaeb27a4ebc5099927d"
+	     "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad"
+	     "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+	     "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727"
+	     "github.com/klauspost/pgzip 083b1c3f84dd6486588802e5ce295de3a7f41a8b"
+	     "github.com/marstr/guid 8bd9a64bf37eb297b492a4101fb28e80ac0b290f"
+	     "github.com/coreos/etcd d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9"
+	     "github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
+	     "github.com/gorilla/rpc bffcfa752ad4e523cc8f720afeb5b985ed41ae16"
+	     "github.com/djherbis/atime 8e47e0e01d08df8b9f840d74299c8ab70a024a30"
+	     "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e"
+	     "github.com/eapache/go-xerial-snappy 776d5712da21bc4762676d614db1d8a64f4238b0"
+	     "github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d"
+	     "github.com/golang/protobuf d3c38a4eb4970272b87a425ae00ccc4548e2f9bb"
+	     "github.com/fatih/structs 4966fc68f5b7593aafa6cbbba2d65ec6e1416047"
+	     "github.com/minio/parquet-go 9d767baf16793cc4b7fd55d642474c36c077ef77"
+	     "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini"
+	     "google.golang.org/grpc 3507fb8e1a5ad030303c106fef3a47c9fdad16ad github.com/grpc/grpc-go"
+	     "google.golang.org/genproto 64821d5d210748c883cd2b809589555ae4654203 github.com/google/go-genproto"
+	     "go.opencensus.io 43463a80402d8447b7fce0d2c58edf1687ff0b58 github.com/census-instrumentation/opencensus-go"
+	     "git.apache.org/thrift.git c9b1e29bc9e0702d7441383358d565e1e76ccea7 github.com/apache/thrift"
+	     "github.com/elazarl/go-bindata-assetfs 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"
+	     "github.com/eclipse/paho.mqtt.golang 20337d8c394721c308cc6ec096990ee451a7cd7f"
+	     "github.com/klauspost/compress 30be6041bed523c18e269a700ebd9c2ea9328574"
+	     "github.com/hashicorp/vault 36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd"
+	     "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
+	     "github.com/miekg/dns 73601d4aed9d844322611759d7f3619110b7c88e"
+	     "github.com/klauspost/reedsolomon a9588190c00b0ccd742218388f6ff68bbad83e5c"
+	     "github.com/gomodule/redigo 9c11da706d9b7902c6da69c592f75637793fe121"
+	     "github.com/go-sql-driver/mysql 72cd26f257d44c1114970e19afddcd812016007e"
+	     "github.com/gorilla/handlers 7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"
+	     "github.com/mattn/go-isatty c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7"
+	     "github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
+	     "github.com/golang/snappy 2a8bb927dd31d8daada140a5d09578521ce5c36a"
+	     "github.com/klauspost/cpuid e7e905edc00ea8827e58662220139109efea09db"
+	     "contrib.go.opencensus.io/exporter/ocagent 902c0ccba68df93f7fefbe7e7c6f16be33108b40 github.com/census-ecosystem/opencensus-go-exporter-ocagent"
+	     "github.com/lib/pq 4ded0e9383f75c197b3a2aaa6d590ac52df6fd79"
+	     "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3"
+	     "github.com/census-instrumentation/opencensus-proto a105b96453fe85139acc07b68de48f2cbdd71249"
+	     "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee"
+	     "github.com/minio/mc a1355e50e2e8984d645cc7745230c42b27396341"
+	     "google.golang.org/api bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "github.com/grpc-ecosystem/grpc-gateway 20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea"
+	     "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045"
+	     "github.com/minio/blazer 2081f5bf046503f576d8712253724fbf2950fffe"
+	     "github.com/minio/highwayhash 02ca4b43caa3297fbb615700d8800acc7933be98"
+	     "github.com/minio/lsync v1.0.1"
+	     "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261"
+	     "github.com/minio/sio 035b4ef8c449ba2ba21ec143c91964e76a1fb68c"
+	     "golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c github.com/golang/sync"
+	     "golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
+	     "cloud.google.com/go 458e1f376a2b44413160b5d301183b65debaa3f6 github.com/googleapis/google-cloud-go"
+	     "github.com/googleapis/gax-go beaecbbdd8af86aa3acf14180d53828ce69400b2"
+	     "github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"
+	     "github.com/json-iterator/go 0ff49de124c6f76f8494e194af75bde0f1a49a29"
+	     "github.com/colinmarc/hdfs/v2 fd1e410ff7bf76b870f625dc0aa3eb4e44f5bc50 github.com/colinmarc/hdfs"
+	     "github.com/hashicorp/go-uuid 4f571afc59f3043a65f8fe6bf46d887b10a01d43"
+	     "github.com/jcmturner/gofork dc7c13fece037a4a36e2b3c69db4991498d30692"
+	     "github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+	     "github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
+	     "gopkg.in/jcmturner/aescts.v1 f6abebb3171c4c1b1fea279cb7c7325020a26290 github.com/jcmturner/aescts"
+	     "gopkg.in/jcmturner/dnsutils.v1 13eeb8d49ffb74d7a75784c35e4d900607a3943c github.com/jcmturner/dnsutils"
+	     "github.com/klauspost/readahead v1.3.0"
+	     "github.com/kurin/blazer v0.5.3"
+	     "github.com/minio/dsync/v2 fedfb5c974fa2ab238e45a6e6b19d38774e0326f github.com/minio/dsync"
+	     "github.com/ncw/directio v1.0.5"
+	     "github.com/nats-io/stan.go v0.4.5"
+	     "github.com/nats-io/nats.go v1.8.0"
+	     "github.com/minio/minio-go v6.0.29"
+	     "github.com/minio/hdfs/v3 v3.0.1 github.com/minio/hdfs"
+	     "github.com/minio/gokrb5/v7 v7.2.5 github.com/minio/gokrb5"
+	     "github.com/minio/minio-go/v6 v6.0.29 github.com/minio/minio-go"
+	     "gopkg.in/jcmturner/goidentity.v3 v5.0.0 github.com/jcmturner/goidentity"
+	     "gopkg.in/jcmturner/rpc.v1  99a8ce2fbf8b8087b6ed12a37c61b10f04070043 github.com/jcmturner/rpc"
+	     "gopkg.in/jcmturner/goidentity.v2 v2.0.0 github.com/jcmturner/goidentity"
+	     "gopkg.in/jcmturner/goidentity.v3 v3.0.0 github.com/jcmturner/goidentity"
+	     "github.com/kurin/blazer cf2f27cc0be3dac3c1a94c3c8b76834ce741439e"
+	     "github.com/valyala/fastjson v1.4.1"
+)
+
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/minio/minio"
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+EGIT_COMMIT="3e3fbdf8e6e5e889232eb7afc0b27ac054adfda0"
+ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+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
+
+	pushd src/${EGO_PN} || die
+
+	rm go.mod || die
+
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		buildscripts/gen-ldflags.go || die
+
+	popd || die
+}
+
+src_compile() {
+	unset XDG_CACHE_HOME
+
+	pushd src/${EGO_PN} || die
+	MINIO_RELEASE="${MY_PV}"
+	go run buildscripts/gen-ldflags.go
+	GOPATH="${S}" GOCACHE="${T}"/go-cache 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/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index ccb0a647861e..34c40be3e212 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -9,7 +9,7 @@ AUX nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch 1629 BLAKE2B 8d9739
 AUX nfs-utils-2.4.1-gssd-Look-in-lib32-for-gss-libs-aswell.patch 1608 BLAKE2B 761eb16d6556b0df1029556453922925ccac7bdc88c4f769382afdf659dfccdd90aa6a183d317667c638e2d2d4d8fc080cfe49070c5fec5bb5f5dc2f66d2040e SHA512 cc4a7a7dde84854b52f57afe09bbff9e241712a19784febd0992b5b53b4b14905b6daf6620a8e9049fbda1dfe0a1619f322adc0517d9747466d7974d4c3eac06
 AUX nfs-utils.conf 74 BLAKE2B 504c298c1e8e7eb596cd87813f1aeeac5cbc830bb85be9e26ed98f7ed85cdbd14ae2c47b0e111c912398ef28ef629e6de7e585a7b161624e9698ea208750fd9f SHA512 d72c0fbdf12cb1ddf8eaa5885e1ed93a2078c40ca48eb8868836fb72fa456c4865df15273fb7472f70dfe8098167e695b1340ff9a59b55e73b47690baaf977d6
 AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535
-AUX nfs.initd 4244 BLAKE2B 0df8f270cf38b16efb331202d300d0bd648ee90c9dc44704e4db6f6aaad53e1c16059e94e14278923db59ce17752e4f034ad948ed53d6f2aefe8ecd6faf808c9 SHA512 f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018
+AUX nfs.initd 4013 BLAKE2B 3ccbafc56cb1aaf7b091ca5e895e71516a899177dbf5b74d3b8ecd7cb369ed2a3108cef8f76f6abc72272fbc1c692bc50a219025a9abc05d2ffb0e9caf2309d9 SHA512 2bfd641d1ff3b377aef81632ceba75e1e9aa0305d776ac8ca03217f253040ea3e6349d6d2d1815b91c5f6c90d076d6cb86294e41ecd19f31c288219620703ecc
 AUX nfsclient.confd 592 BLAKE2B b661b726aa50f904752ec73a201a088f403a1e0f8d11181615e794da259a03b98131fff68e27645d4371564c796bb44915d6a13db9dc5a909294c4d1613c429d SHA512 f12e67728ac4e76357685e2fe38bd7f6fcd90064165758ffeca145e6962ac44d4ff9d8d57e18cc6925a6ada8e95ad8321e9fc355931a804dd455aae1e4850e92
 AUX nfsclient.initd 752 BLAKE2B 8e3303be602ed97b9c6db0238b950039ec87830d733e7490f62657953e18d8050d5cd75e603d566b00db86ba910384d36e488d149112c86f1b9ed8e0901f5c16 SHA512 85078e2cd38b37a1e6fbaf0e40cf7690f403e71d9c8188d542d12fe56bfc02a49763c7bcc7742691754acc37928468c215db2795bebc29a5dfb052ba08f407bb
 AUX nfsmount.confd 326 BLAKE2B c9506a71d28358d0ee7eef18985e3f65decd6cd2735cae17cef911129fe0531e2859c833ef75b04c1521c364c5aa1245d38a03191cb4167f6c1fa02383e7c091 SHA512 6e23897885cc33c49d9c7353b456585a1e0c7300822edba81bc48ba4ccc18297adce137260cc0aa9487aa5ef0aab3eecf931532cfa5bd40fd03bc9e0ddacfb28
@@ -23,7 +23,7 @@ AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf9342
 DIST nfs-utils-2.3.3.tar.bz2 888947 BLAKE2B 7c913f0c5061807d4af162fb392c8f466abb97c88960853b52298f61056bcad08f67a16e577036dec9afa737d88268d5a766b67c4b30a014b666dfbf3db81031 SHA512 266b86ef5041a7ecd144c6f2570e8a6eb00ebb4e547fa4b8c8c3e60a4af117c2690ff9effb0d4113a7b7ef57164583c8a6ada9cb1bb8f7b748524c826eaf1cba
 DIST nfs-utils-2.3.4.tar.bz2 906900 BLAKE2B 968fac7b37c7311bc8d29667c88db925aac0c062ed7ef8c13f9e5c11c3c88960ffaea56c1b6cfb5594a01238f9190e55ab7b837a79a7a804bc55dcca75908eea SHA512 25203b38be6683f25ad6583ac8534873c907124092a768955c1454899e2f467b9dd427b167556eb4f28992b5720da13078eb1eb086da991438454f268e1559a5
 DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b SHA512 655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540
-EBUILD nfs-utils-2.3.3.ebuild 5494 BLAKE2B 1da519c6135e9fd70d88bede60e19479dca05e80645a04a4a57ee21be978589d86a6adb3bc1f1881fbaff8839685da6fa1b1e37212a36ced856f60220b6bd5d2 SHA512 39b5e83e3140d203d3b7d411a81d8341ffc55fc1f72d81a4b2ea2be0b2398607fcd7fb3b45ed7dfdc71a4ef13f6c28fa2d3139543fa65553fa8855e943e4d79e
-EBUILD nfs-utils-2.3.4.ebuild 5234 BLAKE2B 0beca63652f9b6bc82afbcd09b1d2a3b1d7c139317a5c41468c2ea0a98f2eb85fe81734cc4243cb6f1cb32fd6167960ca7ad50fe8b5cb07495c78c27a7aa7f5d SHA512 0f6538a18a71a137a277c5c6bf9b525d8ccaa880e85f4c32389d616acd398e12fbb45f11a4c39106cc4ae14f6d711ac3df7a3e3d02527fadc6316951da8ffc67
-EBUILD nfs-utils-2.4.1.ebuild 5306 BLAKE2B 864bcc061e57e5cd75c7f938f0d8488e2c5d0932a45edbcbaf1e9be8584a0c9d0b6a9b5ad1a6a69bab84e1a0ebbb21aa8ef2fdd77aff8b86944a1c1c72e914b9 SHA512 18b01051c9fb02f509c49cc29486044c7cc2fd46e658284fb3b3dd0c25e706f3911beefdb4fb8ddf46077b6a029316b5786c70c4f0b86fbc1a191c2b3981b5cc
+EBUILD nfs-utils-2.3.3.ebuild 5534 BLAKE2B e70b34817cd313721687897c29622f66ac3c1c2e347f71a3ef6763d4693c121866e21dee282a9499661db2dfcf27a33a40a90cc80fe481859b402753c0ab1816 SHA512 f5afca6badb7be19d708632a624d535ffdd7abad2fac6ccc59295061f9354c5db66cacb841001dcc2039f5380a29e4f56450105311d42c38b7b2c60786a7373b
+EBUILD nfs-utils-2.3.4.ebuild 5274 BLAKE2B 8ac149fa4f44491d101a7fbdd283f7b0bfc1db7183c2622d54f0e39f1a3b477fc0ce52481d6ee13478e03e0f6dec08d04507e775a3851aab80c0f11586c18ad5 SHA512 97b33afd3742f740754502d991dbc2d99ddb4c361af497db0bc2c026315354bb45e82625c68a7ef198aa7f6dced68b325f82521a482a8d434bca24faa992aeb7
+EBUILD nfs-utils-2.4.1-r1.ebuild 5894 BLAKE2B f9568ff4f507190f60bfbf728b19f6809b5752f1089700b8d2dbc18a61af469962ab1044044f004bb2b2510bba6e32753d124a91bf5b93ff651795f4148951c2 SHA512 e8489c99b89fbf51163f94759541532d88edd4f72b020b2927922e8c1de1586653133d90702a7aeaf9a62acd9c872b2a824859a5325b6b1d9864c4b25f2cf753
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index 4b572fc2e5ed..59120629be3f 100644
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -4,10 +4,6 @@
 
 extra_started_commands="reload"
 
-# This variable is used for controlling whether or not to run exportfs -ua;
-# see stop() for more information
-restarting=no
-
 # The binary locations
 exportfs=/usr/sbin/exportfs
   mountd=/usr/sbin/rpc.mountd
@@ -88,7 +84,7 @@ start() {
 	# Exportfs likes to hang if networking isn't working.
 	# If that's the case, then try to kill it so the
 	# bootup process can continue.
-	if grep -qs '^[[:space:]]*/' /etc/exports /etc/exports.d/*.exports ; then
+	if grep -qs '^[[:space:]]*"\?/' /etc/exports /etc/exports.d/*.exports ; then
 		ebegin "Exporting NFS directories"
 		${exportfs} -r &
 		waitfor_exportfs $!
@@ -131,7 +127,7 @@ stop() {
 	# then "exportfs -r" will reread the xtab, and all the current
 	# clients will be able to resume NFS activity, *without* needing
 	# to umount/(re)mount the filesystem.
-	if [ "${restarting}" = no -o "${RC_CMD}" = "restart" ] ; then
+	if [ "${RC_CMD}" != "restart" ] ; then
 		ebegin "Unexporting NFS directories"
 		# Exportfs likes to hang if networking isn't working.
 		# If that's the case, then try to kill it so the
@@ -155,8 +151,6 @@ reload() {
 }
 
 restart() {
-	# See long comment in stop() regarding "restarting" and exportfs -ua
-	restarting=yes
 	svc_stop
 	svc_start
 }
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
index b98297ce0b07..77465d97e588 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
@@ -179,12 +179,14 @@ pkg_postinst() {
 	done
 
 	if systemd_is_booted; then
-		if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
-			ewarn "We have switched to upstream systemd unit files. Since"
-			ewarn "they got renamed, you should probably enable the new ones."
-			ewarn "You can run 'equery files nfs-utils | grep systemd'"
-			ewarn "to know what services you need to enable now."
-		fi
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 1.3.0; then
+				ewarn "We have switched to upstream systemd unit files. Since"
+				ewarn "they got renamed, you should probably enable the new ones."
+				ewarn "You can run 'equery files nfs-utils | grep systemd'"
+				ewarn "to know what services you need to enable now."
+			fi
+		done
 	else
 		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
 		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
index dafe5f83ce34..975b78c549b1 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
@@ -176,12 +176,14 @@ pkg_postinst() {
 	done
 
 	if systemd_is_booted; then
-		if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
-			ewarn "We have switched to upstream systemd unit files. Since"
-			ewarn "they got renamed, you should probably enable the new ones."
-			ewarn "You can run 'equery files nfs-utils | grep systemd'"
-			ewarn "to know what services you need to enable now."
-		fi
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 1.3.0; then
+				ewarn "We have switched to upstream systemd unit files. Since"
+				ewarn "they got renamed, you should probably enable the new ones."
+				ewarn "You can run 'equery files nfs-utils | grep systemd'"
+				ewarn "to know what services you need to enable now."
+			fi
+		done
 	else
 		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
 		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..3bb65dad7568
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic linux-info multilib systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/"
+
+if [[ "${PV}" = *_rc* ]] ; then
+	MY_PV="$(ver_rs 1- -)"
+	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+else
+	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+RESTRICT="test" #315573
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+DEPEND="
+	>=dev-db/sqlite-3.3
+	dev-libs/libxml2
+	net-libs/libtirpc:=
+	>=net-nds/rpcbind-0.2.4
+	sys-libs/e2fsprogs-libs
+	caps? ( sys-libs/libcap )
+	ldap? ( net-nds/openldap )
+	libmount? ( sys-apps/util-linux )
+	nfsv4? (
+		dev-libs/libevent:=
+		>=sys-apps/keyutils-1.5.9:=
+		kerberos? (
+			>=net-libs/libtirpc-0.2.4-r1[kerberos]
+			app-crypt/mit-krb5
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	uuid? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND}
+	!net-libs/libnfsidmap
+	!net-nds/portmap
+	!<sys-apps/openrc-0.13.9
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+"
+BDEPEND="
+	net-libs/rpcsvc-proto
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
+	"${FILESDIR}"/${PN}-2.3.4-no-werror.patch
+	"${FILESDIR}"/${P}-gssd-Look-in-lib32-for-gss-libs-aswell.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
+		ewarn "Your NFS server will be unable to track clients across server restarts!"
+		ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
+		ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
+		ewarn "support the legacy, in-kernel client tracker."
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+	local myeconfargs=(
+		--with-statedir="${EPREFIX%/}"/var/lib/nfs
+		--enable-tirpc
+		--with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/
+		--with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap
+		--with-rpcgen
+		--with-systemd="$(systemd_get_systemunitdir)"
+		--without-gssglue
+		$(use_enable caps)
+		$(use_enable ipv6)
+		$(use_enable junction)
+		$(use_enable kerberos gss)
+		$(use_enable kerberos svcgss)
+		$(use_enable ldap)
+		$(use_enable libmount libmount-mount)
+		$(use_enable nfsdcld nfsdcltrack)
+		$(use_enable nfsv4)
+		$(use_enable nfsv41)
+		$(use_enable uuid)
+		$(use_with tcpd tcp-wrappers)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile(){
+	# remove compiled files bundled in the tarball
+	emake clean
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+
+	if use nfsv4 && use nfsidmap ; then
+		insinto /etc
+		doins support/nfsidmap/idmapd.conf
+
+		# Install a config file for idmappers in newer kernels. #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+	keepdir /etc/exports.d
+
+	local f list=() opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
+	for f in nfs nfsclient ; do
+		newconfd "${FILESDIR}"/${f}.confd ${f}
+	done
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED}"/etc/conf.d/nfs || die #234132
+
+	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
+	sed -i \
+		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+		"${ED}${systemd_systemunitdir}"/* || die
+
+	keepdir /var/lib/nfs #368505
+	keepdir /var/lib/nfs/v4recovery #603628
+
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  #30486
+	local f
+	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
+	done
+
+	if systemd_is_booted; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 1.3.0; then
+				ewarn "We have switched to upstream systemd unit files. Since"
+				ewarn "they got renamed, you should probably enable the new ones."
+				ewarn "You can run 'equery files nfs-utils | grep systemd'"
+				ewarn "to know what services you need to enable now."
+			fi
+		done
+	else
+		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
+		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
+		ewarn "same runlevel as nfsmount."
+	fi
+}
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild
deleted file mode 100644
index c579954763ad..000000000000
--- a/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-
-if [[ "${PV}" = *_rc* ]] ; then
-	MY_PV="$(ver_rs 1- -)"
-	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-else
-	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND="
-	>=dev-db/sqlite-3.3
-	dev-libs/libxml2
-	net-libs/libtirpc:=
-	>=net-nds/rpcbind-0.2.4
-	sys-libs/e2fsprogs-libs
-	caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	libmount? ( sys-apps/util-linux )
-	nfsv4? (
-		dev-libs/libevent:=
-		>=sys-apps/keyutils-1.5.9
-		kerberos? (
-			>=net-libs/libtirpc-0.2.4-r1[kerberos]
-			app-crypt/mit-krb5
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}
-	!net-libs/libnfsidmap
-	!net-nds/portmap
-	!<sys-apps/openrc-0.13.9
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-"
-BDEPEND="
-	net-libs/rpcsvc-proto
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	"${FILESDIR}"/${PN}-2.3.4-no-werror.patch
-	"${FILESDIR}"/${P}-gssd-Look-in-lib32-for-gss-libs-aswell.patch
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
-		-i utils/*/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	local myeconfargs=(
-		--with-statedir="${EPREFIX%/}"/var/lib/nfs
-		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap
-		--with-rpcgen
-		--with-systemd="$(systemd_get_systemunitdir)"
-		--without-gssglue
-		$(use_enable caps)
-		$(use_enable ipv6)
-		$(use_enable junction)
-		$(use_enable kerberos gss)
-		$(use_enable kerberos svcgss)
-		$(use_enable ldap)
-		$(use_enable libmount libmount-mount)
-		$(use_enable nfsdcld nfsdcltrack)
-		$(use_enable nfsv4)
-		$(use_enable nfsv41)
-		$(use_enable uuid)
-		$(use_with tcpd tcp-wrappers)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile(){
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs README
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
-
-	# Install some client-side binaries in /sbin
-	dodir /sbin
-	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
-
-	if use nfsv4 && use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-	keepdir /etc/exports.d
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
-	for f in nfs nfsclient ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-
-	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-	sed -i \
-		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-		"${ED}${systemd_systemunitdir}"/* || die
-
-	keepdir /var/lib/nfs #368505
-	keepdir /var/lib/nfs/v4recovery #603628
-
-}
-
-pkg_postinst() {
-	# Install default xtab and friends if there's none existing.  In
-	# src_install we put them in /usr/lib/nfs for safe-keeping, but
-	# the daemons actually use the files in /var/lib/nfs.  #30486
-	local f
-	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
-		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
-	done
-
-	if systemd_is_booted; then
-		if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
-			ewarn "We have switched to upstream systemd unit files. Since"
-			ewarn "they got renamed, you should probably enable the new ones."
-			ewarn "You can run 'equery files nfs-utils | grep systemd'"
-			ewarn "to know what services you need to enable now."
-		fi
-	else
-		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
-		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
-		ewarn "same runlevel as nfsmount."
-	fi
-}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index a8458c2d5aa2..58d2e27b37be 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -5,7 +5,6 @@ AUX nmbd.service 224 BLAKE2B 499598b7e80f3dddbcc0b2d3ba217774cfcd7d87cc5287bdc75
 AUX samba-4.10.0-disable_gnutls_build_fix.patch 1152 BLAKE2B 39ad43d93ac0cd7b9072ce02d88fcc9615b4442868cebb358c68002a163a0e7628e6d4a3397e2bdd46133c629a411b874001bf31a78b5d61df1782c2a6a6d057 SHA512 318fe8eab7bad814eac1ae33771e25bdbe0dc3511f03b9e1999471e2e16d452fe259311a4c162cee5b7107efa79e0e7f9d70c5258ef3092ec953fa2ee49b25e1
 AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
 AUX samba-4.5.1-compile_et_fix.patch 762 BLAKE2B 432d8380e3511c3dbb408479d0152fb0760e9e487a3033718fa39b9ca4a87a04c9cf8ac41a4b9268020a1d41dee9efa5bde3f0e71498483102fcae80749ad62c SHA512 9605751653dcbbce41be807a9b4f8e5f657db6622f843e91c4df9c4b3e4ad621b6e8e3891f2b970208d55a80801355988f253e3c844ca51a658cd6de8c373e24
-AUX samba-4.7.3-krb-cross-compile.patch 1590 BLAKE2B 34cf304441731556556e40ed386f110dd8aa26a49680fa106b550edede86842e736c5652cd4aa54f0da7955600442cbc41350031dc8b67deae11f68050a6cf7c SHA512 0f762326f5b72d10e4c553630a8c4c433de884d80024c26e4f0e46b26bc24ac53c07642d833bb327f0010b7ee0ce2df05a94dc8868f3f363f68f9851b76265c5
 AUX samba-4.8.6-no-pydsdb-when-no-addc.patch 1493 BLAKE2B ce0de6426170645c15bdc4832fd35d8dcd6de9c1ce014846d3c8bbbb4d8f6c654c0e6a02252186f9de76d0735ac808d0326b1c57e9e98c00a357792430fbd4bf SHA512 f3e5c9ce1e75e8332e38ad33a637d7f687a77c8586511aad252db0176b4483e9e6a8ede09d7d448a0146d35f141d61a937561e16029606d08047974ee58dd982
 AUX samba-4.9.2-timespec.patch 701 BLAKE2B 8bb49dcc4a2e8219a66737e6211b1f597bba9f64622c750fbd5334c60f7d69fd61030422cc4259dd83068b820276a5ce873f59560e9a54a9891a1d7d213ce47a SHA512 9aeaa8a4359828f34cc66a92b88579592580435fd0992b9dfe5b541c9b08e103bef644a0049dfc29f305c1dd3ca3b87f378957f9afae95cfb2c72bfb6e44941c
 AUX samba-glibc-2.26-no_rpc.patch 631 BLAKE2B 22e414bcd329d7d32381c61ad4341de69a07235447dc4116855cca9ce99d32a5ffe111602fdf6ea02c6fe9c5b3331ecaec974faa5e22e009f15964296b53825a SHA512 18a466cbe42313f096ebeb635e5738b59672e96fd5c7db80cff5aa96c0edeb359b6833967bfac09eb5c010eec4309b3b73c0f941173b520918939974fa599541
@@ -17,23 +16,25 @@ AUX smbd_at.service 145 BLAKE2B 729dd189fc69ff33930ec96a68cff42438645ff7f3cf0a88
 AUX talloc-disable-python.patch 1706 BLAKE2B cc447f5077c82d7eb584692121b9b34c03afb5f7dda2b799ea518d08421d31ce54fe2422c5ca7efe74f66011951c97b171a326604bd67446a15ad2849bade919 SHA512 ac0bf82e8ed8b918a5efbdeb0a6cbaaef22bb72231abb09026637d62b8ce35b25212960d26c07abe63661328ab7ea8a82590cd93f04de583e23239211daf6efa
 AUX winbindd.service 240 BLAKE2B f0b96a5a1d93a3c04bb2a2b2b500718b41fc907a3c551827a459c5d8184abc3caed0ac5edcf16032650dc2d58c38b779473c7a619047956f1381415e3de4dd93 SHA512 f1ce6d035e8e0fcdc73f14e3b60c9647043777ff6b2a982a81ed07eb4df5ff245a9511e3e4a9d8163f9c8f3fb86d2a39a67621ace68392eb7c2f2e2a55d587f7
 DIST samba-4.10.2.tar.gz 18280710 BLAKE2B f15b117d1159dfa6cd279c5011629d688fcfba94a2ca8184a827d0787a31f76a38f46b355454b916f2e62c0a88109b86664f6bb16fc0e23d0f61d09908e587cd SHA512 3d146ea12567ebb02a7babcad779b82339ffbfb19f6f2be5cac33eb18af2c9b546dc1cd910072a5c9e152ba9c4a632ed6870c48a8f6ad9d04304b130f240a4bf
-DIST samba-4.10.5.tar.gz 18290612 BLAKE2B 731ea29b02db5158c5cc564d5663e3f9552d7e1164ed8a41738dba8656692b685cc9a7ba57e8cd32fe9a1cb24eed5373929d2b805bf3da3982c0f4b1246883d0 SHA512 82961791a43511aa42f0d648edd13f0533cb20e1d673903e6a1f6235b0df19dfc0755ab0c8e6d4518ca19c188968a38a6c8e8c80d05a20141c097fb0b3e2b795
 DIST samba-4.10.6.tar.gz 18306135 BLAKE2B 236598c26294e1b7b23e48eba7d6429eec01e65a4a73a45fea16ef0e0b7cf1c7b861d824e860bc178d358c298400e829577525b0438e0384fca7bf4409bd69f0 SHA512 6c06a55ac686210965cf52f79190700a3d3a5cba8ea54b32e5bdb4d6b6167f1fa9aef308c3d5fdc7078496aa78b46d5cea3c623438d3a049b11fc58d334f8d0f
+DIST samba-4.10.7.tar.gz 18318281 BLAKE2B ccb97823e8e23e48141b2585b9f6d1f786460a8ee9077e6a0f71d2e2c797f79cb155f4d418f0d18d046307ba5e8bf0780f975707145d1c7f94bc5aa5a65e34b6 SHA512 3ef05754fc12343cf76c7981ca25e4898bd0bf133f394b9fbe9393e8447b18626977e80ddc76f1597921abc378ad058cc363f1f277856d6fa4d783c902514c88
+DIST samba-4.10.8.tar.gz 18316560 BLAKE2B a1b89169a13eb96202e846e9e501b364235d61459a5d2f2e443af569d8a754df8546b5fb52e9e1b9629535d838a7fdfd9cd1fb631870880dad9981587c14be5f SHA512 14d463dfba36473f4a1d2b306ff2a18c664e1a01bc8077ef62afc6796cf4dd65461d72b519b8df3a777eaf322cb98653b416468d770541cd21fab2383c8dce66
+DIST samba-4.11.0rc3.tar.gz 18490189 BLAKE2B 1bddf744bf33b501a67e14dfc6e935285c458d1362e9c403fdb4abbbcbd71aaa3ae87d225f270cfbd0a0f6221072db070d04a984dfbc85ba607b5326ebcf835f SHA512 0a8998977d746b6fd37f51f2615a4a91296579d17e9f19818635f2042e844a69b1669c6ee0386e6ef8068bf75a141a483d2cbce4ea75d65e254cfca12e94f428
 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
 DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
-DIST samba-4.7.12.tar.gz 16923189 BLAKE2B 98ea5e535482a4cdfeb4f9ad70bc8c40bb6d5a8920ce9bc6dda84f20698245c3c5d472a5f79984efc81f9c32d1d1e72b1fcdffb137e3a27634f4c521a1d46a48 SHA512 951dfc0ea7130da9d9aa3069ca276e630d67171a1995dba368459e0cdf00337d0f6271827bffec694371010614a1a7ce2349840ddedd0231315f6a56dce2fcac
 DIST samba-4.8.12.tar.gz 17764832 BLAKE2B d2c0c8b9090da7c94b9343fd3f416e9aafad64273abc9be0639b011f71072926a0b303cf53e63c4e470aeb168e8ec23003b5f4ed4258aac8d6b3d029f71fba6f SHA512 f29595f6390d01860cb6acd750d2e36b4d207dd1da16465c21c8d6d732ce27bd0582a0f34296081e2659638d839c8b12f28deccc31982afa94650da8bce8df8b
 DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
 DIST samba-4.9.11.tar.gz 18095745 BLAKE2B d06a15608f71e73e26dbb15ddfb3512a0cd6f6ce5cffe663451cdf1552473c28cc5a66fc5e28d0e3fbfc80be8524903bd42d75050b664e713efdb09855175bdf SHA512 3d1cd7e3f1ffbfa6bb44fe0cb12be47dd17c9b614b6509ecec20210ac734fa1ab90ea5d2d2180fe7c80bd4eb5bb9a73a09183edf70bdd28dde2d33e092c9e71a
-DIST samba-4.9.9.tar.gz 18080757 BLAKE2B 3cfe741d21584d74654607d6c1450b67f80524f5809607b0c796fad501c06b34ddfb8eb7ef639cca70e8bc54f53805be4c45d78eeb2760aa7728ba907e99589f SHA512 636fc7073cf9dc9ff9bfe46403d35d7a058024708d090bd0ecc7e900a8468ffb7c9a8d564b2df85758c4ef3d184ed3f2c8fa3079ece13d6b9afa816136f0b608
+DIST samba-4.9.13.tar.gz 18109481 BLAKE2B 948ef6b0e1a9796c70635119f5aea5887e9f1c1d2a5264d072f3f3d218dfae3b6a16c640233063c9df0670dc7835a92a8c97447f57518aa9d387bc5d04831675 SHA512 ce80486c9ab093d44ee68b0e2ab28f9af97c7ed00cca1b8a0c65de18254ae40759a1e9fcb9a0ba18006aa296c6a6fbadf53dcd730785a96ac0c167efdbe9d3ae
 EBUILD samba-4.10.2.ebuild 9070 BLAKE2B 80a704b0a82cbe4a720cfb8418da6c5b6245f54da0689ff704ec579f38a05894d7a5474977b2802432670a9424c4efa8fff3f234782a551d54b5ac247db8075c SHA512 ea1422a0eb843444d7ab232d85fd1e5be1022aaf2ff785ee67edbe65516acc7d6d40ecff4a767de2f18290c8f91710c90aba19c2a19b91c32c98be61fe57a3a7
-EBUILD samba-4.10.5.ebuild 9115 BLAKE2B d0d8c4b014098218e7dc30b5169c5ee474ceada2e774e78b7e8a3f76d61703553da7c6ab298dadee21db500124858089497711783307f801c1d92443411204b9 SHA512 4c1c41e3e4cefce8721d07f29894dbb64825f1d514fbfd964285a9509986aafc2aa8819bc6db4fda24b864e3412a620323bfbf5d437803f9a907f5f4b400eeca
 EBUILD samba-4.10.6.ebuild 9266 BLAKE2B 206634d5aca6854b6e94d05fb86d02e7313f9261c4adfa41f5ffecb68e109d90fcc379d2aa96bdf493877bde09a2da55b4753183808cdc0b68601a461c44cf22 SHA512 6fd185aa69cc59031aeda035563e00a84392a8a73a70cbf499aa3e4e5ad76ec857ff06356a74de061e76a37dbdaf3b7e39674316880eafd616fc36c3bf62e59e
+EBUILD samba-4.10.7.ebuild 9207 BLAKE2B 27f90b5c7ee787923c220bed8617a9458f13fe231707f22fe614a696a08c45cb983ac1d2d875bd54eea3efd187f2111556ab635c18cf7b427f63c862f0ba68b2 SHA512 654b252dcec8b19ccf741a85a3862e3b3a52b845dd1d4845ec255349e254f5cfe150fef0d9cb940fc1c35798bd07620c58e50e10a15704cd0a73114b18d7c678
+EBUILD samba-4.10.8.ebuild 9207 BLAKE2B 27f90b5c7ee787923c220bed8617a9458f13fe231707f22fe614a696a08c45cb983ac1d2d875bd54eea3efd187f2111556ab635c18cf7b427f63c862f0ba68b2 SHA512 654b252dcec8b19ccf741a85a3862e3b3a52b845dd1d4845ec255349e254f5cfe150fef0d9cb940fc1c35798bd07620c58e50e10a15704cd0a73114b18d7c678
+EBUILD samba-4.11.0_rc3.ebuild 9099 BLAKE2B 9502151e0d54c22eaddc7b0c877b10c83d9acf7fe62a5e926f8ba59273bbd3c8bd59d2556fd69fcbb29bb15470d9a09cb16c98f1848fe8aa94f24655e308f877 SHA512 c7a1bb3e41eb5485c53760e0544eef103ba50781d2a7e028ae4c3c389f8805d1689b5fc1eb62e4b1555200ce665867937f9a9a33ffd97eb65d53dd6734b42a44
 EBUILD samba-4.5.16.ebuild 8166 BLAKE2B 2a0d68ff2848c1dee76d8329cab4f5a0b06bcac989b55a97bac1211f194b4c10736d8fd99eb32779c86406c8aa4c45523af34f43f70eebf928e4ceb787d374e3 SHA512 5a3e1645ec3d05ddf26e66f75cc2f43c86baad8b08e40e137919f0b33d68701cef8460fd3da3d080905af538659b834169e66cc946517ed1c9190dc52ac697d3
-EBUILD samba-4.7.12-r1.ebuild 9188 BLAKE2B 458197bbc0248729c819bcd347fd6fe6a31acf4e858d6b7d204c91f528bc029901a7a30004e16146baf789b4aae1a82d2eadae8e257a1a89fe320220bacbe2b5 SHA512 9bbc844a9cd1883eb6097e12482641c83ec140caf1870cca8879b9d3f3392a462fa11084ff285c547725661747432c0c9a327f83d2da1997709eafe5c133dc52
 EBUILD samba-4.8.12.ebuild 8901 BLAKE2B f01720de64da1ed13c6f717891919c2ccfad0221d1e0f6a612e620d7de8bcea57fdec4c10bed8e9842c31a412a1681b2e0376e7ac628646d121584de54220944 SHA512 deed37996e47a8889f783898fd0c99c63feb20a4d6b811384b8a964cbc4363c3e63d8c404de4a3bf9cd310cbdfd0f440434cd86d7c7426cb8a4bc6f5c88ea9fb
 EBUILD samba-4.8.6-r2.ebuild 8467 BLAKE2B bb9806f40f062f742e5e82778fdb82e1a9366c2f53fb977be373ca2dd54d3fbf49632c4f424acc12eb73847ce2d944d02fb54951bbbc6a02c11b42a521c05e2d SHA512 71a940ea88b17096512e160236dbebb9d82603c19262e2b955212b4a361d0c0f51466eb1150f501c0e13e2fcce0f29c1f480d1c38fd32bc27ebae0207e40dd79
 EBUILD samba-4.8.6-r3.ebuild 8862 BLAKE2B 23eea9d9f1e1aa4b5812b10a190a6c6d609dc9d7ce48a5052eb0505289aabc7644090e15bc72c7bbc2d79a42707d16fa36c3e41a58cdcec0c292b50d20ec7905 SHA512 d98d4a73c0404912a6946b0b9b793542158d061a72a1979e4e8aa7a8d378c818e29f3049daa07db71f4b3ccd550ce9325b85d5beab3d13204957912ac99cc4e7
 EBUILD samba-4.9.11.ebuild 9060 BLAKE2B 587779d9c3aced71a77202fd5d34eea51db1b506bf15ea9bc6fb35cb5525f09facaedbc52464cf2c4807976d1e7bd41b7de404e1adc4706e623674232a089605 SHA512 ffcf5c86d8fdc19b03abc4840c22060b291368ddbebef0e60a6414c7ab456303e76f2dae3ec38fa359560b89c0303e79cb670283b300f51a898bf50b67761d3d
-EBUILD samba-4.9.9.ebuild 9060 BLAKE2B 966a27c76b743bf6548e5a8e794344c100dc65031d42aca9351e5d9f56e5fb66fe150b4e22ef5c5701d70dcc845218bebd28e276aece5d8b81b7bb247e45b2dc SHA512 5fb312a2f176e7f4fb928411ff9d212c21aa004837fe5e81aea43cd8d78c5c96c6f81b7dae1763913a82488550d989219aac12b73324925b3f9aaddf7e7258d8
+EBUILD samba-4.9.13.ebuild 9060 BLAKE2B 587779d9c3aced71a77202fd5d34eea51db1b506bf15ea9bc6fb35cb5525f09facaedbc52464cf2c4807976d1e7bd41b7de404e1adc4706e623674232a089605 SHA512 ffcf5c86d8fdc19b03abc4840c22060b291368ddbebef0e60a6414c7ab456303e76f2dae3ec38fa359560b89c0303e79cb670283b300f51a898bf50b67761d3d
 MISC metadata.xml 1756 BLAKE2B 74fcabbc9a00bd2e2b91d527354edde5e44c36755d81c849c2a81c03590794f1be30a92ad7cade453fdb183754ace37f7ddc2c171eab657689cf34d83e840aed SHA512 65ee3dbcb246c068278ffb6a8eaaa439bea10fa86662504d2aacfb1bcf58a215d915e50c4c6ea6c6e989870f7a9d9974b7a1a33d2a2f0077b9e263a6adf94279
diff --git a/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch b/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch
deleted file mode 100644
index 9fad9fca44fb..000000000000
--- a/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://lists.samba.org/archive/samba-technical/2017-December/124344.html
-https://git.samba.org/?p=samba.git;a=commit;h=70f92025ae504cda97ff3a130f19035450967836
-
-From 70f92025ae504cda97ff3a130f19035450967836 Mon Sep 17 00:00:00 2001
-From: Zentaro Kavanagh <zentaro@chromium.org>
-Date: Mon, 11 Dec 2017 12:41:16 -0800
-Subject: [PATCH] Remove unsupported colon from configure msg.
-
-- When cross-compiling an answers file must be supplied via
-  --cross-compile --cross-answers=<path to answers>.
-- The lines in the answer file have the form;
-    Config Msg: Answer
-- The colon is used to delimit the msg and the answer when reading
-  the answers file.
-- WAF doesn't support the message containing a colon.
-- It's not possible to override this variable so cross compile fails.
-
-Signed-off-by: Zentaro Kavanagh <zentaro@google.com>
-Reviewed-by: Uri Simchoni <uri@samba.org>
-Reviewed-by: Andrew Bartlett <abartlet@samba.org>
----
- wscript_configure_system_mitkrb5 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
-index 9c351131ad1a..803dad7ab63b 100644
---- a/wscript_configure_system_mitkrb5
-+++ b/wscript_configure_system_mitkrb5
-@@ -282,7 +282,7 @@ conf.CHECK_CODE('''
-        ''',
-     'HAVE_WRFILE_KEYTAB',
-     headers='krb5.h', lib='krb5', execute=True,
--    msg="Checking whether the WRFILE:-keytab is supported");
-+    msg="Checking whether the WRFILE -keytab is supported");
- # Check for KRB5_DEPRECATED handling
- conf.CHECK_CODE('''#define KRB5_DEPRECATED 1
-        #include <krb5.h>''',
--- 
-2.15.1
-
diff --git a/net-fs/samba/samba-4.10.5.ebuild b/net-fs/samba/samba-4.10.5.ebuild
deleted file mode 100644
index 9abce7be82cd..000000000000
--- a/net-fs/samba/samba-4.10.5.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
-iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
-+system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libaio[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( virtual/pam )
-	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
-	ceph? ( sys-cluster/ceph )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0
-	)
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-	addc? ( python gnutls json winbind )
-	addns? ( python )
-	ads? ( acl gnutls ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	test? ( python )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
-	"${FILESDIR}/${PN}-4.10.0-disable_gnutls_build_fix.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	# ugly hackaround for bug #592502
-	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_enable gnutls)
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-	)
-
-	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf || die
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-	keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.10.7.ebuild b/net-fs/samba/samba-4.10.7.ebuild
new file mode 100644
index 000000000000..87c4c3061f9e
--- /dev/null
+++ b/net-fs/samba/samba-4.10.7.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
+iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
++system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.5.5[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( virtual/pam )
+	acl? ( virtual/acl )
+	addns? (
+		net-dns/bind-tools[gssapi]
+		dev-python/dnspython:=[${PYTHON_USEDEP}]
+	)
+	ceph? ( sys-cluster/ceph )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+	addc? ( python gnutls json winbind )
+	addns? ( python )
+	ads? ( acl gnutls ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+	)
+
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf || die
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+	keepdir /var/run/{ctdb,samba}
+}
+
+multilib_src_install_all() {
+	# Attempt to fix bug #673168
+	find "${ED}" -type d -name "Yapp" -print0 \
+		| xargs -0 --no-run-if-empty rm -r || die
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.10.8.ebuild b/net-fs/samba/samba-4.10.8.ebuild
new file mode 100644
index 000000000000..87c4c3061f9e
--- /dev/null
+++ b/net-fs/samba/samba-4.10.8.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
+iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
++system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.5.5[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( virtual/pam )
+	acl? ( virtual/acl )
+	addns? (
+		net-dns/bind-tools[gssapi]
+		dev-python/dnspython:=[${PYTHON_USEDEP}]
+	)
+	ceph? ( sys-cluster/ceph )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+	addc? ( python gnutls json winbind )
+	addns? ( python )
+	ads? ( acl gnutls ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+	)
+
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf || die
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+	keepdir /var/run/{ctdb,samba}
+}
+
+multilib_src_install_all() {
+	# Attempt to fix bug #673168
+	find "${ED}" -type d -name "Yapp" -print0 \
+		| xargs -0 --no-run-if-empty rm -r || die
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.11.0_rc3.ebuild b/net-fs/samba/samba-4.11.0_rc3.ebuild
new file mode 100644
index 000000000000..8a6b44acada0
--- /dev/null
+++ b/net-fs/samba/samba-4.11.0_rc3.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint 
+json ldap pam profiling-data python quota selinux syslog system-heimdal 
++system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libgcrypt:0
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	>=net-libs/gnutls-3.2.0
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.0.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.2.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.2[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( virtual/pam )
+	acl? ( virtual/acl )
+	addns? (
+		net-dns/bind-tools[gssapi]
+		dev-python/dnspython:=[${PYTHON_USEDEP}]
+	)
+	ceph? ( sys-cluster/ceph )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+	)
+
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf || die
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+	keepdir /var/run/{ctdb,samba}
+}
+
+multilib_src_install_all() {
+	# Attempt to fix bug #673168
+	find "${ED}" -type d -name "Yapp" -print0 \
+		| xargs -0 --no-run-if-empty rm -r || die
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.7.12-r1.ebuild b/net-fs/samba/samba-4.7.12-r1.ebuild
deleted file mode 100644
index 98b097983e0e..000000000000
--- a/net-fs/samba/samba-4.7.12-r1.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libaio[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.3.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( virtual/pam )
-	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
-	ceph? ( sys-cluster/ceph )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0
-	)
-	gpg? ( app-crypt/gpgme )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-	addc? ( python gnutls )
-	addns? ( python )
-	ads? ( acl gnutls ldap )
-	cluster? ( ads )
-	gpg? ( addc )
-	test? ( python )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-	"${FILESDIR}"/talloc-disable-python.patch
-	"${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-	# ugly hackaround for bug #592502
-	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=()
-	myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			$(use_with acl acl-support)
-			$(usex addc '' '--without-ad-dc')
-			$(use_with addns dnsupdate)
-			$(use_with ads)
-			$(use_enable ceph cephfs)
-			$(use_with cluster cluster-support)
-			$(use_enable cups)
-			$(use_with debug lttng)
-			$(use_with dmapi)
-			$(use_with fam)
-			$(use_enable gnutls)
-			$(use_with gpg gpgme)
-			$(use_enable iprint)
-			$(use_with ldap)
-			$(use_with pam)
-			$(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-			$(use_with quota quotas)
-			$(use_with syslog)
-			$(use_with systemd)
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			$(use_with winbind)
-			$(usex python '' '--disable-python')
-			$(usex test '--enable-selftest' '')
-			$(use_enable zeroconf avahi)
-			--with-shared-modules=${SHAREDMODS}
-		)
-	else
-		myconf+=(
-			--without-acl-support
-			--without-ad-dc
-			--without-dnsupdate
-			--without-ads
-			--disable-avahi
-			--disable-cephfs
-			--without-cluster-support
-			--disable-cups
-			--without-dmapi
-			--without-fam
-			--disable-gnutls
-			--without-gpgme
-			--disable-iprint
-			$(use_with ldap)
-			$(use_with debug lttng)
-			--without-pam
-			--without-quotas
-			--without-syslog
-			--without-systemd
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			--without-winbind
-			--disable-python
-		)
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	if multilib_is_native_abi; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf || die
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-	keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://samba.org/samba/history/${PN}-4.5.0.html and"
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.9.13.ebuild b/net-fs/samba/samba-4.9.13.ebuild
new file mode 100644
index 000000000000..c983eaa51e3e
--- /dev/null
+++ b/net-fs/samba/samba-4.9.13.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
+iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
++system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.4.7[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( virtual/pam )
+	acl? ( virtual/acl )
+	addns? (
+		net-dns/bind-tools[gssapi]
+		dev-python/dnspython:=[${PYTHON_USEDEP}]
+	)
+	ceph? ( sys-cluster/ceph )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+	addc? ( python gnutls json winbind )
+	addns? ( python )
+	ads? ( acl gnutls ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json json-audit)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+	)
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf || die
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+	keepdir /var/run/{ctdb,samba}
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.9.9.ebuild b/net-fs/samba/samba-4.9.9.ebuild
deleted file mode 100644
index b254b52dad44..000000000000
--- a/net-fs/samba/samba-4.9.9.ebuild
+++ /dev/null
@@ -1,307 +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(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
-iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
-+system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libaio[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.4.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( virtual/pam )
-	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
-	ceph? ( sys-cluster/ceph )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0
-	)
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-	addc? ( python gnutls json winbind )
-	addns? ( python )
-	ads? ( acl gnutls ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	test? ( python )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	# ugly hackaround for bug #592502
-	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json json-audit)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_enable gnutls)
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-	)
-	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf || die
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-	keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 1cd6afcb83e0..2ca8231833df 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 043ed2090e59..da9557dc692c 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,4 +1,5 @@
 AUX proftpd-1.3.6-mod_copy.patch 3069 BLAKE2B 08b9afdfa32e17d50d1762f4bf8a932b4c5106b91814b707b92e5745835f79c569d07ee18021c53aa961970a7167760a90e967388f0ac64956cde3899d72942c SHA512 2df01ce88d340b097523c10e0287c0a02484daaa11c3acd8975471c2cd346429fe9ef84f372943251af264d8d2713dfd1d259fb7fb30bc6aa75fab7559e8b4ef
+AUX proftpd-1.3.6-mysql-8.patch 750 BLAKE2B e8d9a48b2af603f1b50298ba5102242d575eb9b2321508a574ec3e6e0a0e54d058d248706aa2bfc9b85172ee6404ce5e16354e600e5332d8bc388649d10751e9 SHA512 15213f045427611f8ab5af9e064f4aadd448514a1789558f65c83b0703710df547178c15b254a368c1913c82d9fb533c47fd95d42326527809d4150191869bdd
 AUX proftpd-1.3.6-sighup-crash.patch 2145 BLAKE2B 60e24fe7f8ee4fdac4a95b73c5e6d76862d6163e6dfbc1a15970f18ab6a38e715bace0adad487606a29dc9de39bbb2987b3d4c5e0283d6468864f877c2030b6f SHA512 d16515e7bf14d1d3a147b93fea330b0342db3ad501f366dd4f1d872262829902cb3c197fe68b20b86048bc3bbe0e5c22470d6d81bf08c72c192a33770c3d499a
 AUX proftpd-1.3.6-use-trace.patch 477 BLAKE2B f69adc68327f467b44dd19d0da66388945c0d1c35ce734ab8fa5e618ca7dbf1164e785e37a6dcb0e9f8ab671ece0b4e711b6614947f39b55310ffd4522df5e07 SHA512 90164f799d1f6c3768a30161a40d5c369e576c3b1a875047ef65c1224d3e18cf1f4dd5145c5ff6f7aeda80135134df58a1d57046129b922514cb56d1de97f13e
 AUX proftpd-1.3.6_rc4-diskuse-refresh-api.patch 576 BLAKE2B ce4522896a81fed326ae234810491005c5165fa1bbcd0b64d785c6d070f2ac80c763e75f813655696a9405284cf27c82293026e2d8c68936d7794c20e886dacb SHA512 08a0674600944ff5d13033651a1dea1647c9d22f18efe6505e051b36566bf357bc41439d2dd7c2900e873ef8d600ba7f16332680dda1abb2529808fbe5a4e573
@@ -18,5 +19,5 @@ DIST proftpd-1.3.6.tar.gz 20251898 BLAKE2B b68bd8bfb6cc970974b7a67cf13d1a543ffbc
 DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012
-EBUILD proftpd-1.3.6-r5.ebuild 8664 BLAKE2B 756dcfb300ed8e6beb5e6d71023f78547e5e7920c8c8d9f686300dc121461341bcf375168e8490e06a1f9f8d2a63bb41400719b186d628c99a0f3bead7415ae3 SHA512 9d2cbd0aaee69700ebb1dc2b0d95dad250bf1feb072cf70d8cf414044fdc9c3fb1776351fa8b4856854552c1e29076b2965d7582ddc0dcbba3c62ce26527a5f2
+EBUILD proftpd-1.3.6-r5.ebuild 8705 BLAKE2B b17b9cb7c090725f90a0851f9e525ef583759f86dd5aa1aa5bda871064acb42bf52954050ad0c19dcd5bb7fb537b52b324313438e7986de84a7e4e6048da5a91 SHA512 55717ed59f59347a9da3ad0d6b21e87623b4b4bacc446948530e50979148334ceccdb4707f9ce83eac205939dcbd35910108c239cc6220e23e8ca5485b515938
 MISC metadata.xml 2930 BLAKE2B 3b97d562cb49d2a1a431c5b05d1cc24bf87cef2690aedc953274ec78c82bf3e4e9a5fbada45dc7df6ad71ac1b69fd40a055936ed039a8472812ac889a99cba2f SHA512 a4e29b9ac8c96cd4412fbfc854298e310fb80cfff7aeac81bc423a8990bb5c0cdbf274a9f8db2eaafa83830f9be727b7877881647802d8d7ba3eab5b6c395658
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch b/net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch
new file mode 100644
index 000000000000..4149a6540595
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/692434
+https://github.com/proftpd/proftpd/issues/824
+--- a/contrib/mod_sql_mysql.c
++++ b/contrib/mod_sql_mysql.c
+@@ -132,6 +132,7 @@
+ #include "../contrib/mod_sql.h"
+ 
+ #include <mysql.h>
++#include <stdbool.h>
+ 
+ /* The my_make_scrambled_password{,_323} functions are not part of the public
+  * MySQL API and are not declared in any of the MySQL header files. But the
+@@ -495,7 +495,11 @@ MODRET cmd_open(cmd_rec *cmd) {
+    *  http://dev.mysql.com/doc/refman/5.0/en/auto-reconnect.html
+    */
+   if (!(pr_sql_opts & SQL_OPT_NO_RECONNECT)) {
++#if MYSQL_VERSION_ID >= 80000
++    bool reconnect = true;
++#else
+     my_bool reconnect = TRUE;
++#endif
+     mysql_options(conn->mysql, MYSQL_OPT_RECONNECT, &reconnect);
+   }
+ #endif
diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index c3a8e165e6fd..9fef53a6a6ce 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -72,6 +72,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
 	"${FILESDIR}"/${PN}-1.3.6-sighup-crash.patch
 	"${FILESDIR}"/${PN}-1.3.6-mod_copy.patch
+	"${FILESDIR}"/${PN}-1.3.6-mysql-8.patch
 )
 
 RESTRICT=test # tests corrupt memory. need to be fixed upstream first
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 76f0898413c7..3347d254fee3 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index c7b411a5e66e..90ae40642e8d 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,6 +1,6 @@
 DIST gajim-1.0.3.tar.bz2 5964743 BLAKE2B af4bf2206a962eb68c4df09359fa3a0ccaca1e886d4fad67d9839f5fd4c1fd359c7ee7933d39d8c1ae7dcbde6b72548fef3564a467653064d4d37aa1db234c04 SHA512 a6d7f92a22a9dddc8a4b07eda0aae0b6fb4db57c73133ee19937f7e2a2a82c5351051d1f3627c94a44434276ed001b83d375f708f177962125af66cda8579ec8
 DIST gajim-1.1.3.tar.bz2 8013585 BLAKE2B 7be25380ecfe76ae5e2a7534665688dcca9ff850c12c7a450e8d1f6caab1820a1022750710df0a8a7ae259c5748f55582b272ad83fbdb0560f18e6ab8642bf78 SHA512 18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac
-EBUILD gajim-1.0.3-r1.ebuild 2175 BLAKE2B 8b4edb274123a0d6df82ee6776762e21848c47969c67a2d4b6bf9cbc863b2a479df6511959d932c8ebe25e2fe34d076a6dc5390c0f9ab1e30548552ebd5ed1b7 SHA512 3bb95be0156d410949d6237a5084c0e2b4d9b79a1742df8bf10d9f6b349864df9c2813116999ff688a1dd206df5703d52615d79a3e0350b3eeb7bbb3f6ab087b
-EBUILD gajim-1.0.3.ebuild 2173 BLAKE2B 2040e327866a96f479ea97d79975a7394ed4958505ffe02969f27b8e7a28e8f0a57aa3064b7ec6ae99485f287bc9b76f2956f608a01cbf0d80d4ae96a97d572a SHA512 b413d58eddec79a358b4407d40ae7808730e5f7a8b59c9eabcbad822aec7c8a7c114c966ef8640f3fda3ba16a172d8d48cbbaf7bed7e2015b3b7573dc8ecafba
-EBUILD gajim-1.1.3.ebuild 2217 BLAKE2B cab09e9b550f0b5b39b1b7c39bfc84a013010d1fbb8fc1cd1e1bf4a49438438882b4406d9b27fb7e2f2e104d99f27825da4e7c7b9c7b3d35f5db6fd0280617df SHA512 240ba8a69ab9a0e4ede62d9cab9046a4a8226e1a5971e700e0609537ff20bbfe32f226f5d8ceddbb514b3f6a8f322a7c33196ecc7e58d84916941ce80cd60f6a
+EBUILD gajim-1.0.3-r1.ebuild 2158 BLAKE2B 678fcfcf7ceb61710fb6c442a5afc243666a7d9181984196a0764b5eced18fabf9701a2678b6176da34939a613b8e861472c1c655bce4a1040b43dcbd5bf06ae SHA512 6b19f4c29d0e40e1b433208b22bd4ea1695a4914258979c79ddefe0c36ff04bbd3678a420fcecd362c36d638aa91e2dcfe0bac5ab86557ed62ed9a686fc66a9a
+EBUILD gajim-1.0.3.ebuild 2156 BLAKE2B 67ffce69962eb4ad091b54dcfaaebcf5fb0a2efb138b033382dad0312fa4132797244a6a74dd98cededb0e1cc429a27c3c0a4056a588ce00b34d239278bf2cd8 SHA512 edccfee6c5019fe6c25f9ae2a4bebc3486b5c64097e7bf06e7628534638f30034636378ca7c977d3d04ceeaefe408281a40a5f88fb0b4bc133e3fdfe974f0049
+EBUILD gajim-1.1.3.ebuild 2304 BLAKE2B a3d88e26614a3c78529e3e3185a38e3c0b623ab419f0d8e1192b41a66e4081e528aecc3d9dcdb0b8ff13d66b9a6037317cb2725c4097d7d3f33f85563e0fa95d SHA512 915b895a22147387ceda12e5cf0d193a15757d1d2f6ad70e2c249ea20e4844f7e9c278915e4edaa2cebafcc65b81f9fdc5b635e774482a6e29a68b1edd034e9c
 MISC metadata.xml 1061 BLAKE2B d7e37cec9e291addde0d1c18b155afdadee1225270c7f34f8a916f45ad828353f677f87e6de49994ba14af8cc4773689d7f629f991326e94a43ff36fa9c9b981 SHA512 f9eb4f8a033ca5cca7a2de4a43e98346cf446a20a9257ea95b37d9a6be6051224d55b32272167946c2cbef370cd3c1ddc3b27ce6b8794823d1e9ca9b5ebcac44
diff --git a/net-im/gajim/gajim-1.0.3-r1.ebuild b/net-im/gajim/gajim-1.0.3-r1.ebuild
index a59f5e9ad7f9..0ea841d01b32 100644
--- a/net-im/gajim/gajim-1.0.3-r1.ebuild
+++ b/net-im/gajim/gajim-1.0.3-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
 	+webp"
 
 COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo,${PYTHON_USEDEP}]
+	dev-libs/gobject-introspection[cairo]
 	>=x11-libs/gtk+-3.22:3[introspection]"
 DEPEND="${COMMON_DEPEND}
 	app-arch/unzip
diff --git a/net-im/gajim/gajim-1.0.3.ebuild b/net-im/gajim/gajim-1.0.3.ebuild
index 719d5ddebbd1..0727b7f841e2 100644
--- a/net-im/gajim/gajim-1.0.3.ebuild
+++ b/net-im/gajim/gajim-1.0.3.ebuild
@@ -21,7 +21,7 @@ IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
 	+webp"
 
 COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo,${PYTHON_USEDEP}]
+	dev-libs/gobject-introspection[cairo]
 	>=x11-libs/gtk+-3.22:3[introspection]"
 DEPEND="${COMMON_DEPEND}
 	app-arch/unzip
diff --git a/net-im/gajim/gajim-1.1.3.ebuild b/net-im/gajim/gajim-1.1.3.ebuild
index 1548f5c281dd..54f26a180bee 100644
--- a/net-im/gajim/gajim-1.1.3.ebuild
+++ b/net-im/gajim/gajim-1.1.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite,xml"
 DISTUTILS_SINGLE_IMPL=1
 
-inherit gnome2-utils distutils-r1 xdg-utils
+inherit distutils-r1 xdg-utils
 
 DESCRIPTION="Jabber client written in PyGTK"
 HOMEPAGE="https://www.gajim.org/"
@@ -21,7 +21,7 @@ IUSE="+crypt geolocation jingle networkmanager remote rst +spell upnp
 	+webp"
 
 COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo,${PYTHON_USEDEP}]
+	dev-libs/gobject-introspection[cairo]
 	>=x11-libs/gtk+-3.22:3[introspection]"
 DEPEND="${COMMON_DEPEND}
 	app-arch/unzip
@@ -67,12 +67,20 @@ RDEPEND="${COMMON_DEPEND}
 
 RESTRICT="test"
 
+src_install() {
+	distutils-r1_src_install
+
+	# avoid precompressed man pages
+	rm -r "${D}/usr/share/man"
+	doman data/*.1
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/net-im/poezio/Manifest b/net-im/poezio/Manifest
index 8e55620779eb..407bc5e3926a 100644
--- a/net-im/poezio/Manifest
+++ b/net-im/poezio/Manifest
@@ -1,4 +1,4 @@
 DIST poezio-0.12.tar.gz 585750 BLAKE2B d79cab965b39a9ea191c763e1560bedbf46e3107e1b301a651103caf8f9e63b8465925ea01ac4e2e6b747b66cf5d4be8cabd8be80a069fe4eafcf331c7daada8 SHA512 6249daf23c6f4c1b25a9de686abaa62076e1eac7566da0a174ae3a82e3a53b7f2a86145d20d587a7ee43c8b679d90cb381d5afbfc7860459c5a497e97af32ff4
 EBUILD poezio-0.12.ebuild 1252 BLAKE2B 6517051d452341fe765b9ccfe0b96d5bee2c4ea084c80742c241c283d7010e0ff108af251d0124858f1387d67bc1a7297647148208dd759b01f106c65be2c71e SHA512 f7e996b9fb61d5586689d2f17a5e3b993129a1da5a0e92aa4d24bf86daa4482d1ac2e2ced0d55302c77224cb09dd6f2e9bfa89b1caf0f79ed6f8b8eb4e84e961
-EBUILD poezio-9999.ebuild 1289 BLAKE2B 6d7ec5ba64346fb8e8d83660838d4edb3406b4bec4c5651014717924df84aaa1f6d5aa61550c46622c82a15dfdb5992a709885aaa206f357d8b2a6d8a5eb0d15 SHA512 a67525257a27020958030d36ddece4ea6ec39aac14f67adc25c07399a3788e0109ba1649e8400a80f1d7508232f5137dd900f9ab4f95abb2db618432db2b3ee6
+EBUILD poezio-9999.ebuild 1257 BLAKE2B e37cfaff22d726a02ac625626e001fd86fdf84ecb5d9601a519034b0710c453c6aa1d55f3b7ffe359118282d3c3bcba0d301762052cad7963fa4549cf6907965 SHA512 f6c3d7bb7ac42e6d2690dac37651cfedacbc1cceb0dd937de9c28c95c28aa61ff14b9f88632b7163f947617906f9c055909b3a20a5878d429c2c40887c67e755
 MISC metadata.xml 320 BLAKE2B 38b85fd661f7ca7a79c83a1070753f1049b7de9049f2d233f32d77ddd2a8cf72cfc8e3b7b27065a5583d6c631a6af0aa3ca70b907ca9c2a2e92f85471da542b2 SHA512 874c300be76a1b931ddebfb8867563696884267891a09e0879e1ceb0f581536ab9acacccb104e9609aef5c61c55e05ebd87d867d332141be9d52cea246dad09c
diff --git a/net-im/poezio/poezio-9999.ebuild b/net-im/poezio/poezio-9999.ebuild
index 6c4752e9f1f5..a0147fb03e58 100644
--- a/net-im/poezio/poezio-9999.ebuild
+++ b/net-im/poezio/poezio-9999.ebuild
@@ -13,8 +13,7 @@ SLOT="0"
 IUSE="test"
 
 if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://git.poez.io/${PN}.git
-		https://lab.louiz.org/${PN}/${PN}.git"
+	EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/net-im/pyicq-t/Manifest b/net-im/pyicq-t/Manifest
index 73c2c0a63d9d..90402cadc096 100644
--- a/net-im/pyicq-t/Manifest
+++ b/net-im/pyicq-t/Manifest
@@ -3,5 +3,5 @@ AUX pyicq-t-0.8.1.5-pillow-imaging.patch 1236 BLAKE2B f394b84f530fc01ddc87ec3e9f
 AUX pyicq-t-0.8.1.5-python26-warnings.diff 3485 BLAKE2B edf98d20ea41bed32b3c4952c24f133a6d02a073402d0032140195fc9772eb85421ed202a72813922f61001d4c56e34fee38cc49701e646e1992961cb8e0f3ed SHA512 8b7cb353ff2c6259525909b62a6d552116339fe8489d747f7310fa9013011b6028c0f0dc165307ff5b9fe9da9517852c3e4158eb6f05a51f987e9cf2a969b949
 AUX pyicq-t.service 223 BLAKE2B 3f323776d36115207e5bd81f16c7c47b438bab74772cbcc3cabb5acb7ab992b0cb8edc6b76def436a9d65685d232754d988cb2c7dcecdc8bc5a2152cfdd0ceb7 SHA512 e1df68340f54bc6568308fefcc723323358c27b143cd3258f451ebf06e5f6ac0a7b66d7567543212e5924144164e0d9a2121fb96fa2721b234399a19127850c6
 DIST pyicqt-0.8.1.5.tar.gz 183865 BLAKE2B 5f0cce6fd9d27cf60f6234870644c95e016bc979a167d48a331df47cb25eefca96ed0082d336c931a6af5f25babaa7fdffc0cafdb0374463c066d5c185b02059 SHA512 5b83adf86746c2af60bed2759c7d4e3a3839bea532e0882a6dc087aee5e0afa1320c6d2d2296a667ec45c5b36be879034f079fd30cef924e8db5f66a2f1d3fde
-EBUILD pyicq-t-0.8.1.5-r6.ebuild 1739 BLAKE2B d8b956e1ba450d3c1a1044f50965a788ae30d26bd358693a03c8a8ecd166bae9e16bb2be100b468f1cdf61cc3a9112440f385748c418c1efdf9e690f167548ef SHA512 4a79c9e34dba2cc45e2ecd90feecb6de604ddae44ae9197b1e229e9a107413fe461212788d7f9d617c9fde3e9eaca6e22807b6f63382ba644f0ebe981cd644dc
+EBUILD pyicq-t-0.8.1.5-r6.ebuild 1749 BLAKE2B 6b1fa86374cf440a0364a4330f10f995cbd290b9c223d5caf045d12931c21486da88d4833a7c65c316d31375bfb509b71fa971f01e8ed066303a0c338a934748 SHA512 1c28862d2d7ddc0a79b9379ea235621d49d304dc3a2feee7995980d01b683dbfb0eff19295b5142c5fb0e4aec584629b05baa5889afe866fdfe7a3f32d9ec229
 MISC metadata.xml 419 BLAKE2B 89f7918635ee4ead843dee7a7b031eefc427b5df2c5edb25a3b891e21046ac346386a1270d69820594cd23957bab8690d0c55246696ffb204d8fe636ae097dfb SHA512 1f30a23054f9f867a94d7e899f5be0780b08cf070c9a2831a34f4fbafe03e19dc9fedb023d3825411104a7322e0d0c8b6928a4f30794511371dd9ec7ea2e339f
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild
index bbfe7914fe4a..ec0c387fbfa9 100644
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild
+++ b/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild
@@ -48,7 +48,7 @@ src_install() {
 	newins config_example.xml ${PN}.xml
 	fperms 600 /etc/jabber/${PN}.xml
 	fowners jabber:jabber /etc/jabber/${PN}.xml
-	fperms 755 "$(python_get_sitedir)/${PN}/${PN}.py"
+	chmod 755 "${D}$(python_get_sitedir)/${PN}/${PN}.py" || die
 	sed -i \
 		-e "s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \
 		-e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 2aabf2459426..530a66297e34 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,5 +1,3 @@
-DIST skypeforlinux_8.50.0.38-1.x86_64.rpm 97771604 BLAKE2B bf3ed5cb99618162076d1fed448abfe063db4dc51e4c5ec6a8d0abc1e1cd304466550b410c7dfa5de6c3a41a1ff6520a0d6a91a3689719c9772ce74117147ba1 SHA512 1b8a3dbd506acbadb9083b9c39e9933fe1e847a9f55724a2bef3d6611b8242ef8da5a0c05396231baf86f8ac09e0a9237d1a241a22e2da79e64c5564eb93cc84
-DIST skypeforlinux_8.51.0.72-1.x86_64.rpm 106489177 BLAKE2B 18a84af205dfdca719d15e37c2cf19a039dfb521e7458c02271dae5eb9dd6433d14ec5fcb1501c74fbcf90103745e3ae49e5d290c699866d94430b2662eac7cf SHA512 18c98a040d453be83cafeca39009e07db2319dab5f2738dc98e2b7c6966dd2d59e83d0c8a943bfa3dd19b7cd435b7dcfa097f9725850148cb493cdc992a6550e
-EBUILD skypeforlinux-8.50.0.38.ebuild 3290 BLAKE2B 6ba778ac15813855972a0f8a7841186e23b42766a465db44c825b699cf79e5a399c540c71ec0705b243bbe08c73c02efc9077495c4cf1f77edd8ef6e07463171 SHA512 50e044c7e7e5ae986d8465e9842dc8aebf8a888076c192ad4fcb0597010da224358f2ea7bf2e9de0f29108c6ae4563b6bc2af0337d29e2c45303d77a5f707b48
-EBUILD skypeforlinux-8.51.0.72.ebuild 3290 BLAKE2B 6ba778ac15813855972a0f8a7841186e23b42766a465db44c825b699cf79e5a399c540c71ec0705b243bbe08c73c02efc9077495c4cf1f77edd8ef6e07463171 SHA512 50e044c7e7e5ae986d8465e9842dc8aebf8a888076c192ad4fcb0597010da224358f2ea7bf2e9de0f29108c6ae4563b6bc2af0337d29e2c45303d77a5f707b48
-MISC metadata.xml 678 BLAKE2B 08cae428a7267eb18dd5bbb460dcb617a8eaaf33ccce7229f90e3031f526125922b84d445577e91620e01ccaf789109c331bb11a03362cec9c15ad85162f4b43 SHA512 5372348bd01b1e828c29866180e85e9230ade0aa36f23bfcc89fb10dbf7f1b92530ac00c9dd0fe9977061a660abf9780ab2e59069db2115fb2dacbc5e3ffd26a
+DIST skypeforlinux_8.51.0.92-1.x86_64.rpm 106489251 BLAKE2B 1846623eb9ab78bf143b9a45bf2001fb3ae4b78ac1690041b984f96f309f57ac427f1313722de02d3305cab4413f40470a9452f1d87a47b3e3af1d0878eecabb SHA512 58c86e19900badec28e0bc58ed23459aea8e94e6f0d36fd8d8412d99d96eec15945a9b4920278788e5edccc6cc26ec7da9159d7105ff4499f9c6e44d3e4615ac
+EBUILD skypeforlinux-8.51.0.92.ebuild 3290 BLAKE2B 6ba778ac15813855972a0f8a7841186e23b42766a465db44c825b699cf79e5a399c540c71ec0705b243bbe08c73c02efc9077495c4cf1f77edd8ef6e07463171 SHA512 50e044c7e7e5ae986d8465e9842dc8aebf8a888076c192ad4fcb0597010da224358f2ea7bf2e9de0f29108c6ae4563b6bc2af0337d29e2c45303d77a5f707b48
+MISC metadata.xml 786 BLAKE2B 3041105c7b5f90dc5f058e92a8542550b1c07fe954a68c0fdad069b309f41a75d1885ef14d62b3bb8defa7b69a4478a3ec37abb09a16153614d498d82877958c SHA512 2332db6f8ec755f6b12c4bef3b7e5819438a38835ad764bbf3466f1560905024f2632fc7035904028fbddc6c368930fcea81bb10f29dec1b9725b658d81208ca
diff --git a/net-im/skypeforlinux/metadata.xml b/net-im/skypeforlinux/metadata.xml
index 01552bdd48c1..376761200504 100644
--- a/net-im/skypeforlinux/metadata.xml
+++ b/net-im/skypeforlinux/metadata.xml
@@ -5,6 +5,10 @@
 		<email>onigino@protonmail.com</email>
 		<name>Gino McCarty</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>jano.vesely@gmail.com</email>
+		<name>Jan Vesely</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-im/skypeforlinux/skypeforlinux-8.51.0.72.ebuild b/net-im/skypeforlinux/skypeforlinux-8.51.0.72.ebuild
deleted file mode 100644
index df398450e030..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.51.0.72.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop pax-utils rpm multilib-build xdg
-
-DESCRIPTION="Instant messaging client, with support for audio and video"
-HOMEPAGE="https://www.skype.com/"
-SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
-
-LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="pax_kernel"
-
-S="${WORKDIR}"
-QA_PREBUILT="*"
-RESTRICT="mirror bindist strip" #299368
-
-RDEPEND="
-	|| (
-		sys-auth/elogind
-		sys-apps/systemd
-	)
-	app-crypt/libsecret[${MULTILIB_USEDEP}]
-	dev-libs/atk[${MULTILIB_USEDEP}]
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr[${MULTILIB_USEDEP}]
-	dev-libs/nss[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	media-libs/libv4l[${MULTILIB_USEDEP}]
-	net-print/cups[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-devel/gcc[cxx]
-	virtual/ttf-fonts
-	x11-libs/cairo[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXi[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]"
-
-src_unpack() {
-	rpm_src_unpack ${A}
-}
-
-src_prepare() {
-	default
-	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
-		-i usr/bin/skypeforlinux || die
-	sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
-		-e "/^OnlyShowIn=/d" \
-		-i usr/share/applications/skypeforlinux.desktop || die
-}
-
-src_install() {
-	dodir /opt
-	cp -a usr/share/skypeforlinux "${D}"/opt || die
-
-	dobin usr/bin/skypeforlinux
-
-	dodoc usr/share/skypeforlinux/*.html
-	dodoc -r usr/share/doc/skypeforlinux/.
-	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
-	dosym ${PF} usr/share/doc/skypeforlinux
-
-	doicon usr/share/pixmaps/skypeforlinux.png
-
-	local res
-	for res in 16 32 256 512; do
-		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
-	done
-
-	domenu usr/share/applications/skypeforlinux.desktop
-
-	if use pax_kernel; then
-		pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
-		pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		ewarn "You have set USE=pax_kernel meaning that you intend to run"
-		ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		ewarn "you suspect that ${PN} is being broken by this modification,"
-		ewarn "please open a bug."
-	fi
-}
diff --git a/net-im/skypeforlinux/skypeforlinux-8.50.0.38.ebuild b/net-im/skypeforlinux/skypeforlinux-8.51.0.92.ebuild
index df398450e030..df398450e030 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.50.0.38.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.51.0.92.ebuild
diff --git a/net-im/slack-bin/Manifest b/net-im/slack-bin/Manifest
index 1e6f8e584fb9..65485f1c922a 100644
--- a/net-im/slack-bin/Manifest
+++ b/net-im/slack-bin/Manifest
@@ -1,12 +1,10 @@
 DIST slack-desktop-2.1.2-amd64.deb 46460486 BLAKE2B c6478764d3bd49745f9626d85287489fd58345b1315e41fdb1bfa9b93e4201aeeb2a22678e79f584c3da26d090136c1b8b18e449b518a69a0291072b5fc05089 SHA512 b23ccee498c2c6d043bdb4632b1b2755b3f0a96a1d78338020fb4221c49b7feeb437cc358abcf285e0f0a0f7b57f4db6792b2baa8b339596a287f1272ed12284
 DIST slack-desktop-2.1.2-i386.deb 42997902 BLAKE2B e5b3375efbe00d31e34c900aedde4c6c19b0e6a550d9db6155d9f8333c9d6db241da60e9b711eee7dbf6cf89d5ac4b84050c9e89c490172b7db205f38981dca3 SHA512 6b68123d3c85687043e886974449fe424af267c326ffc869d03d911ae5d0f30f5081b611e136bc4f832da8d555b2851a4c093df9c8be2de98235ebcd03528d8c
 DIST slack-desktop-3.1.1-amd64.deb 60320286 BLAKE2B 3054e8283b41d5b8b45323131b2a85800ba8b8e24e0b80aa0eff0c0152c7cad0a2914bf64a6b83621cf6c9ad52b9bf26c0d113cf5867d4c3f2e7d6129d4d27ae SHA512 06f209b07d1bbbadede592f4e63da7c53436ecc821585448269d4eda16ad0bdf8355ac46e508741150fae6dc883c90563509361f47dd02fda2f15b2829dda309
-DIST slack-desktop-3.3.8-amd64.deb 56743966 BLAKE2B 3673a55a300b56b645d69e18617fd58241c9f4ac5fec088660bb715c722b4b22b77db9302ca3d8f09338bb41be188998366e8c5f9f0a145d80391f82fbc5fb6f SHA512 f9a0414213bf0d1a8404f532a37b16bf47a43b8ecf6bb9be99184577b3b8c58e5f1b1b40a044550dc900d328b40207763de6eb3936e0b8ded709782796e81720
-DIST slack-desktop-3.4.0-amd64.deb 56807282 BLAKE2B fa0637b98344983b66a5362b03e719260e7553cabad0d5ff294ac5051d8b2bf189722c82f328410c5ffdbe057dd782a51f81ba0f213ce36efee017c4febe8291 SHA512 7ae266b5bf13a89d66d35646005a4d5cb0de0143cba19ea450b226ac394de90c82b45d6798f39c7d27db6cad36db2c25f1f4ee06a436753cc49170eabc9fa6b8
 DIST slack-desktop-3.4.2-amd64.deb 62724122 BLAKE2B 31ab566b9a1cb80f1daa207664f4bf0504666cb388f06bf5cd5d381ab26f6b11a4eae5a4a0abd634dd562277fd291bddfb213b9285c4fab218488acc3bbd39a9 SHA512 d3d9ea70467fe59c6194430054d4bed5824a39b156ed9d215df4592eed7b63fbdb93d0a135502941805575f99bce0ec3fe266643cac731b75d9c58a760b3c1a4
+DIST slack-desktop-4.0.2-amd64.deb 61298592 BLAKE2B d6d30f75d245f78276036588eb69a579148feb18fd9232c096b95ce342d37719476eec49ec67147dcd87dbf84b60e8041c45cd6a133f48811cff33958abc43e5 SHA512 6647253eaf73022baaeacbc2e5c8a679cf1d65f8a43aec207b0aedafb74ba64b76196ee621f26097591ccd9e1aa215f2185e23b7083a4da9c89fb031f09a4471
 EBUILD slack-bin-2.1.2.ebuild 1769 BLAKE2B c667beab3b7754601efcce865265974c3c959189b41465b055ebe8402e9369009d1a1abc486422c6267e49737e5bf51ec8608cdca74b8e20e59ccc88d8b9c7d0 SHA512 195c9b12c1ecda6afcae9cfec0710f30cac1480f5aa5f4ec6f5bd42550b6e012ab30e0be67f5c979db2be41357f47a7bbab44506c67bc23c1caa3ae43125d38b
 EBUILD slack-bin-3.1.1.ebuild 2731 BLAKE2B 6a74a81ee7c1c9734e1f0176f530b4068e1b3f8b506ce7b2ebecb76a3eacfffc11b6a5e1fa7c7ad03db15763b19010297508600a1269b368a871468b65e64b3c SHA512 5b67498636859305edeb88d9317c8836a04d00208861c041387e14222a303b095c85d2236dda7312fcdfb3e2ef01e8e037050a909d96ec71be1aaaa809a40ac0
-EBUILD slack-bin-3.3.8.ebuild 2712 BLAKE2B 2b2cea26f5c0e31804490f5625a162b6d346d5608c05666e991b5d7f4b26ccc4d4a9a7581e8e1de2a989bfad0766aedeef9a09b54646165a74675c759622b002 SHA512 62c677f95763e902e686a178f0599a754c8bbbc1bfd4e57458c77a225b1332bd425f1b793f3ed9ddad06914bdb138ac957877ef4c80f02393ab3e242c7bca1b3
-EBUILD slack-bin-3.4.0.ebuild 2766 BLAKE2B a2a8a068ea92a9e408942b33b952fa67d42d69d40a5834bc4bbfd405ed172681dfb3309861d36d0294cac52e86be0d4d5e6ad07b7323830a3d17f66e7631b269 SHA512 f33cfef07e88b855de354bf287d699bb54ba93a498f353f152bfc17913850c5b1b0c76268cc702ea85a1999de6dd7f573260c022c12d1e6e3794c927d2d3d4f7
 EBUILD slack-bin-3.4.2.ebuild 2911 BLAKE2B f4e90543df17459fa06c6b4a689656f83761faa61d47bd4e7102f9167c36e1dca48b752c7d3dfcaf791b7cf96d5fd35f8064439e5aa27a5994e5d4bbb66f3241 SHA512 fc61240b411f9060109691448d9df2c198bffd1e2d8efc956cca7631104b119268209a24d9e57d273cd60ad77a8e1d66d048c2b5e4d8f725e632dd7a58330575
+EBUILD slack-bin-4.0.2.ebuild 2827 BLAKE2B e6a298d07e4c6b8987fff46ba7f09ee27bafef17b6f0fbe5524ac1f25ee6f0da734fe600107b0501fd315d37a1a5a50f1f6aae2219323fa3e0843cc8802cad99 SHA512 d744d70567e9573c5dba8cc82306cd906910b0c886aa9d7c5052e1165394ce8aa486c414180d7974b2bf94b6db608705cd81058315257002ba6a4d3325ff4960
 MISC metadata.xml 770 BLAKE2B b84907f7e6edab20de957ec2ecb5e9acb2c3167095b0a89bd41e00187d47defe6e2737324ca4b7ac2b01c16f5e12db118889bccdf3dd8b17a4ebc50b84be97e2 SHA512 6dba8262370ebbfceee5a9b8c26eca95b11271c74490ece09cec90a698d614902cec29104695692508a2d6b30a87efb1b82d44bef2edef828e26634c06aa6828
diff --git a/net-im/slack-bin/slack-bin-3.3.8.ebuild b/net-im/slack-bin/slack-bin-3.3.8.ebuild
deleted file mode 100644
index 3db3b00c13ef..000000000000
--- a/net-im/slack-bin/slack-bin-3.3.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-bin/}"
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop multilib-build pax-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="http://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="ayatana gnome-keyring pax_kernel"
-RESTRICT="bindist mirror"
-
-RDEPEND="dev-libs/atk:0[${MULTILIB_USEDEP}]
-	dev-libs/expat:0[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr:0[${MULTILIB_USEDEP}]
-	dev-libs/nss:0[${MULTILIB_USEDEP}]
-	gnome-base/gconf:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	net-misc/curl:0[${MULTILIB_USEDEP}]
-	net-print/cups:0[${MULTILIB_USEDEP}]
-	sys-apps/dbus:0[${MULTILIB_USEDEP}]
-	x11-libs/cairo:0[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libX11:0[${MULTILIB_USEDEP}]
-	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
-	x11-libs/libXext:0[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
-	x11-libs/libXi:0[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
-	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
-	x11-libs/pango:0[${MULTILIB_USEDEP}]
-	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )
-	gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
-
-QA_PREBUILT="opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libnode.so
-	opt/slack/libffmpeg.so
-	opt/slack/libCallsCore.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	if use ayatana ; then
-		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
-			usr/share/applications/slack.desktop \
-			|| die "sed failed for slack.desktop"
-	fi
-}
-
-src_install() {
-	doicon usr/share/pixmaps/slack.png
-	doicon -s 512 usr/share/pixmaps/slack.png
-	domenu usr/share/applications/slack.desktop
-
-	insinto /opt/slack
-	doins -r usr/lib/slack/.
-	fperms +x /opt/slack/slack
-	dosym ../../opt/slack/slack usr/bin/slack
-
-	use pax_kernel && pax-mark -m "${ED%/}"/opt/slack/slack
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/slack-bin/slack-bin-3.4.0.ebuild b/net-im/slack-bin/slack-bin-3.4.0.ebuild
deleted file mode 100644
index b8dcb8c7b763..000000000000
--- a/net-im/slack-bin/slack-bin-3.4.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-bin/}"
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop multilib-build pax-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="https://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="ayatana gnome-keyring pax_kernel"
-RESTRICT="bindist mirror"
-
-RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
-	dev-libs/atk:0[${MULTILIB_USEDEP}]
-	dev-libs/expat:0[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr:0[${MULTILIB_USEDEP}]
-	dev-libs/nss:0[${MULTILIB_USEDEP}]
-	gnome-base/gconf:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	net-misc/curl:0[${MULTILIB_USEDEP}]
-	net-print/cups:0[${MULTILIB_USEDEP}]
-	sys-apps/dbus:0[${MULTILIB_USEDEP}]
-	x11-libs/cairo:0[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libX11:0[${MULTILIB_USEDEP}]
-	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
-	x11-libs/libXext:0[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
-	x11-libs/libXi:0[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
-	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
-	x11-libs/pango:0[${MULTILIB_USEDEP}]
-	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )
-	gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
-
-QA_PREBUILT="opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libnode.so
-	opt/slack/libffmpeg.so
-	opt/slack/libCallsCore.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	if use ayatana ; then
-		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
-			usr/share/applications/slack.desktop \
-			|| die "sed failed for slack.desktop"
-	fi
-}
-
-src_install() {
-	doicon usr/share/pixmaps/slack.png
-	doicon -s 512 usr/share/pixmaps/slack.png
-	domenu usr/share/applications/slack.desktop
-
-	insinto /opt/slack
-	doins -r usr/lib/slack/.
-	fperms +x /opt/slack/slack
-	dosym ../../opt/slack/slack usr/bin/slack
-
-	use pax_kernel && pax-mark -m "${ED%/}"/opt/slack/slack
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/slack-bin/slack-bin-4.0.2.ebuild b/net-im/slack-bin/slack-bin-4.0.2.ebuild
new file mode 100644
index 000000000000..4717b2533290
--- /dev/null
+++ b/net-im/slack-bin/slack-bin-4.0.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-bin/}"
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit desktop multilib-build pax-utils unpacker xdg-utils
+
+DESCRIPTION="Team collaboration tool"
+HOMEPAGE="https://www.slack.com/"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="ayatana gnome-keyring pax_kernel"
+RESTRICT="bindist mirror"
+
+RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
+	dev-libs/atk:0[${MULTILIB_USEDEP}]
+	dev-libs/expat:0[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr:0[${MULTILIB_USEDEP}]
+	dev-libs/nss:0[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
+	media-libs/mesa:0[${MULTILIB_USEDEP}]
+	net-print/cups:0[${MULTILIB_USEDEP}]
+	sys-apps/dbus:0[${MULTILIB_USEDEP}]
+	sys-apps/util-linux:0[${MULTILIB_USEDEP}]
+	x11-libs/cairo:0[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libX11:0[${MULTILIB_USEDEP}]
+	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
+	x11-libs/libXext:0[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
+	x11-libs/libXi:0[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
+	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
+	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
+	x11-libs/pango:0[${MULTILIB_USEDEP}]
+	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )
+	gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
+
+QA_PREBUILT="opt/slack/slack
+	opt/slack/resources/app.asar.unpacked/node_modules/*
+	opt/slack/libnode.so
+	opt/slack/libffmpeg.so
+	opt/slack/libCallsCore.so
+	opt/slack/libVkICD_mock_icd.so
+	opt/slack/libEGL.so
+	opt/slack/libGLESv2.so
+	opt/slack/swiftshader/libEGL.so
+	opt/slack/swiftshader/libGLESv2.so"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	if use ayatana ; then
+		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
+			usr/share/applications/slack.desktop \
+			|| die "sed failed for slack.desktop"
+	fi
+}
+
+src_install() {
+	doicon usr/share/pixmaps/slack.png
+	doicon -s 512 usr/share/pixmaps/slack.png
+	domenu usr/share/applications/slack.desktop
+
+	insinto /opt/slack
+	doins -r usr/lib/slack/.
+	fperms +x /opt/slack/slack
+	dosym ../../opt/slack/slack usr/bin/slack
+
+	use pax_kernel && pax-mark -m "${ED%/}"/opt/slack/slack
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 822d88e4390b..c18240d47539 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,18 +1,14 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-DIST tdesktop-1.7.10.tar.gz 14395842 BLAKE2B 76699a4ad4d44a1e628e14cf38e70f57f8434834b53bcbb8bd4b1e5691778585f49cad21669ef7e9087c0a41e0bf1dd48622fc75f89f12f01bcd07c5c36c5862 SHA512 f6e8849d344fd7f8af94d639900150ae87182e1e782f071d1f99aee29a366754eca74ed4062ee10d37348d1195da598a6ce77921fd480e5367b69913c443efe5
 DIST tdesktop-1.7.14.tar.gz 14296012 BLAKE2B 0983b3e8ae69947d9d034cff975e1422b1308c63d952b8f38288e7dcef5ef2437358b35c7599be720f1e031c3ba696437a00f9daeba0dbf3d22c5cb0f453daf9 SHA512 b2b19aad5c276a389461964b82773f2d0380f0774557d1d81316dc0b10a915ee88b0439211ebbf8aafd8d3edc17dc0dc9d4b7ac894669fba45307a10f5fa946f
-DIST tdesktop-1.7.9.tar.gz 14395719 BLAKE2B 057a01cbdec1a37ec9503193dbac394ef058f3cf4d9862459b86b10f9838c34113d7f5b2613ce5d22a3f3e96c32147c4b27d3045fab4ebe34a9113670d7a7e43 SHA512 5ec62ffe69c4fbc600f4e0f32601259360756ec945978fb53dfee9c10e5fb602913c632b9034da11b46e345754f4c32e353dee3dcdef150d87c64a714e6a16c1
 DIST tdesktop-1.8.1.tar.gz 14334229 BLAKE2B b049138e544a399470be6ae0d42edb9ecadf54ec23928ce8eb1a6c3326fdcd9e4df363f46dd3c3a1b3c7c3731dbcd2fea4ecaa5decdddb0686088f7c287f6c47 SHA512 129725e87e32b97a9e1fe844cfc489e07bd47a1f54cfa79dbde59f26510fd79e786c39f09fb6cfe11d93059f5d6aa62c8d9a17c7c9d12de88d10ddbaabc940d0
-DIST tsetup.1.7.10.tar.xz 33158312 BLAKE2B f029837ffbde250edb07d7491ccfec1781e0622c851270b1490fb079ea498041843ced457c6da0d518f5d49b9c6c266023ba065f3fc1b0019d4bea3c968d2c43 SHA512 dfaa890a211f7e3348ecc696bb50de95d3bd47cf75f1b2ceff6bcd63b1e4fe67fee3579f04511d822cad79c30c9681e5e77b3f887f9a28d923cc2539da4b8c5f
+DIST tdesktop-1.8.2.tar.gz 14335232 BLAKE2B 5a99e2cf4da70d32b5cf3fd2f0c717a59e2aab1d9ac3ce7609d0de8bef7545cc4ef9ac83de0b8d044f68cf7d95c38c232de9838fd591ea2da2430e7e6d900ccd SHA512 6616519b60492886a89702166b80b73a5ca5014d63088d1400d9c8ad14ec2ebf0481a46d12d4e9fc7675b9b484cb19ba2535760d33bc6e5c502115b461d32e5f
 DIST tsetup.1.7.14.tar.xz 33449716 BLAKE2B 37a3a248affb268f2ff1e427e0439889a2ca11699b030cc50dcb72edeac40c8b835de3ea69e0e265ae37c1b3647c517ea6667b99792c2e532dbc3f44cb0848c6 SHA512 d755ed539d2a515261e8c33ff998b1c5af65c3c0e85313cdcede7b5147022175b2f3595cfc46aff0ef753bd6166947b76793c41f9e387cb4c8e45c5f33deca26
-DIST tsetup.1.7.9.tar.xz 33163260 BLAKE2B 1fca3aee9039dc43f54170c6cd8f48036dec9de652956a96de6b86b2857d3a022a5270f3db2ea4a114e7595d128461c959b1adc6e38e22d5d24d55d8b50935fe SHA512 4f73e22f202f6df074bedd356bd8f91b1c8278cb7d87f5dbf345850bb4595b681f87892e3c93e794ab68d74974492a0eff7d64bcce01532337575f998d5eef42
 DIST tsetup.1.8.1.tar.xz 33591872 BLAKE2B 6d92087666727b3e1b5ad41bb04c8404c4106d74589dacee63414d588358c88f88a1e6e81c6ee4cd9e47a3b58bcb6b9c4fbd8ef1dbb8aa4a2f13fa2f6aa03991 SHA512 d56e4e3af4aeda409f3743badd5559155c527c10bb780165528c7b9350b40dc95b4658190407389dc3c52b5a1df34ce98dc8038cdfdaa7928f1ec01e16709ea3
-DIST tsetup32.1.7.10.tar.xz 36304976 BLAKE2B 60bd7bbdfed9bcd164002c675a371763142fd409ecbebf366939f235de6cc009cedd6a78177be86e5fd897bd6a00e9b5ff10ab68b79bb326e45eb5f6afa241be SHA512 393e6309cc78f6453cbe526e3e9f0e15d67ee6ed980cdbcc7b131abf6cc8235248206d03e54af370d70a49209f675cdf08fc7b289f57027815b68daa4898cca4
+DIST tsetup.1.8.2.tar.xz 33596992 BLAKE2B f8844bfb4168831c5299a52a286b0245aaf8c72e8d161c9dacc45c133a37cccb496d7fb4d37af3fbf6d157737e1b2d7755c06ce696c33e254d8ea120cb18a8c6 SHA512 862ac62593dc47f887e4a438551520ca939898a4584271bc189cf7004b47cf2bede6a5ef6302382bd8a777ffb1afb74fa48fec3b0fa82a447dab43e42718bc84
 DIST tsetup32.1.7.14.tar.xz 36564112 BLAKE2B cfcc0e0265f907b2eea54a1719c644baeb46a15affe4b735536650208175528d7e6a24f586535e4c8296b61ceae1948c31e47d4a7a4c643c08d7ad5dd503c52a SHA512 7118344c4f76bde6903ceed7521303650f17f8e71fbef64b5d55268211c451f96d9315fbc0fa6d0d975b523bcfa71f6fd076df9b421f72fb8b2c043b66ac3d5e
-DIST tsetup32.1.7.9.tar.xz 36297704 BLAKE2B 1a9b55ec5c0f49d10f59b3e2ebaf90f17491dd6fdb0ddf9adb705e04f38033c8f582c495a71a9479037025aeb97920ab6ce0309106596e197fe9e0afc8c12dd9 SHA512 0e23b4cbddcf418f8056570593fa20dc755846102d6a10ab97b4e112d4b922bddba1dd12cddc59b5d958243b1bf1e3317731f444890d3aeedfe53f3da4956885
 DIST tsetup32.1.8.1.tar.xz 36470956 BLAKE2B 238eafb6aea416bc480b924811941734c64b8695ee2b7d6297eeba5423283cc0d90a4af465e2edbb6952af444d6976f01300cc15758b269df27053aa5e61b7b2 SHA512 e808d5f06d768f732d85eefe60f16829ec6e5ce4df0239520bbd8d3a4a23b67c06e2f389c14388480235188ed372be84a5da7eb89336c827fefc6cbb30e34b31
-EBUILD telegram-desktop-bin-1.7.10.ebuild 1523 BLAKE2B 06d6f24b456c2376de9d182ec9a09cdac93f36d0704fc325beea07a735b2c64a4fb3ce5adfead40a80a683aa6b0da49ba8e8a2db7f179fd6783c543a963b3b28 SHA512 43a5ab3178c862f89d3f0e19648da5909fbad498fc558773e830d659f7b7048ba4bad191fb98f13be48d643cec1b8cf68be42ba4daa97d930245de92abef2fae
+DIST tsetup32.1.8.2.tar.xz 36487916 BLAKE2B 6f9ac95ea6bd6565a060ffa5630d2bdb6a21c72962ce01f0811c398e8e630a771a8b24c2eb656686e970fe9801bdfd5f6d1da38ad218e1692c31b8f2a932d20b SHA512 9900241b599e11d0c2de01e50f8f854ea86e1ee3a6353a3edfd333534142372f515bfccb940a00a4af7f8866c96b3f21e2bfc1d56b0e6531cb03727baa8de5c3
 EBUILD telegram-desktop-bin-1.7.14.ebuild 1154 BLAKE2B ab2ba32e4c9c30027481cbc6e477df91397d8d0c9c5c0a0a3b6cbdab39e8817a1836a7053d59c8339f33f0c1f3fec9953b3fd092654b3076ea9f2f5da432ae36 SHA512 67729a225944fd367b22013fe2f8b1df27a9bab46047071053f5416566f47101d261756fb138822c47ffd84dd26d766a1e4eb78be762814d46a1e589c3bb9f2f
-EBUILD telegram-desktop-bin-1.7.9.ebuild 1523 BLAKE2B 06d6f24b456c2376de9d182ec9a09cdac93f36d0704fc325beea07a735b2c64a4fb3ce5adfead40a80a683aa6b0da49ba8e8a2db7f179fd6783c543a963b3b28 SHA512 43a5ab3178c862f89d3f0e19648da5909fbad498fc558773e830d659f7b7048ba4bad191fb98f13be48d643cec1b8cf68be42ba4daa97d930245de92abef2fae
 EBUILD telegram-desktop-bin-1.8.1.ebuild 1154 BLAKE2B ab2ba32e4c9c30027481cbc6e477df91397d8d0c9c5c0a0a3b6cbdab39e8817a1836a7053d59c8339f33f0c1f3fec9953b3fd092654b3076ea9f2f5da432ae36 SHA512 67729a225944fd367b22013fe2f8b1df27a9bab46047071053f5416566f47101d261756fb138822c47ffd84dd26d766a1e4eb78be762814d46a1e589c3bb9f2f
+EBUILD telegram-desktop-bin-1.8.2.ebuild 1154 BLAKE2B ab2ba32e4c9c30027481cbc6e477df91397d8d0c9c5c0a0a3b6cbdab39e8817a1836a7053d59c8339f33f0c1f3fec9953b3fd092654b3076ea9f2f5da432ae36 SHA512 67729a225944fd367b22013fe2f8b1df27a9bab46047071053f5416566f47101d261756fb138822c47ffd84dd26d766a1e4eb78be762814d46a1e589c3bb9f2f
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.7.10.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.7.10.ebuild
deleted file mode 100644
index 528da9c30d85..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.7.10.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
-"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-QA_PREBUILT="usr/lib/${PN}/Telegram"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	>=media-libs/fontconfig-2.13
-	>=sys-apps/dbus-1.4.20
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	exeinto /usr/lib/${PN}
-	doexe "Telegram"
-	newbin "${FILESDIR}"/${PN} "telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	einfo
-	einfo "Previous versions of ${PN} have created "
-	einfo "\"~/.local/share/applications/telegram.desktop\". These files"
-	einfo "conflict with the one shipped by portage and should be removed"
-	einfo "from all homedirs. (https://bugs.gentoo.org/618662)"
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.7.9.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.7.9.ebuild
deleted file mode 100644
index 528da9c30d85..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.7.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
-"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-QA_PREBUILT="usr/lib/${PN}/Telegram"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	>=media-libs/fontconfig-2.13
-	>=sys-apps/dbus-1.4.20
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	exeinto /usr/lib/${PN}
-	doexe "Telegram"
-	newbin "${FILESDIR}"/${PN} "telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	einfo
-	einfo "Previous versions of ${PN} have created "
-	einfo "\"~/.local/share/applications/telegram.desktop\". These files"
-	einfo "conflict with the one shipped by portage and should be removed"
-	einfo "from all homedirs. (https://bugs.gentoo.org/618662)"
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.8.2.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.8.2.ebuild
new file mode 100644
index 000000000000..6564f90ef88c
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.8.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+QA_PREBUILT="usr/lib/${PN}/Telegram"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=media-libs/fontconfig-2.13
+	>=sys-apps/dbus-1.4.20
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	exeinto /usr/lib/${PN}
+	doexe "Telegram"
+	newbin "${FILESDIR}"/${PN} "telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 9e8ff1dfc57a..903affc299ff 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 14c9d464b7bb..be9c55c91bc7 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,12 +1,16 @@
 AUX inspircd-2.0.25-fix-path-builds.patch 9669 BLAKE2B 8b6612800028658cf231be62fbdd92638bfbc64fc1e9634bfbbdfe997f2915f583aba8ee41fbf98f44e016b1bdf17936017d5e9217c29aa404576167526f9d1b SHA512 0595199d8c5c44ea3dff19e08d4a1fe9bb5011befbafe7b58fce2cf7678f30cbaa6ceedb408141519f4068c3b96dbc41aecb8112d180ca66e9deff00390935d9
 AUX inspircd-2.0.27-fix-path-builds.patch 9655 BLAKE2B eaf233df43b48a156bee13e8113ff185b9fd3fb04686620e4759a5cc3a1d055f984b8cfe2ba32e2ad48d32386c34579b37161f7a1a82b9aa9e2356263f865314 SHA512 86117ecf4cdbec2181b48ff3737c6c4eda71d7bfdd3c6b3b6a195a79cfc6c884b5d6b9e7ba41a1943c39458e1d69a3a0f2e6b6338da7b846230e50f51064b402
+AUX inspircd-2.0.28-fix-path-builds.patch 9655 BLAKE2B eaf233df43b48a156bee13e8113ff185b9fd3fb04686620e4759a5cc3a1d055f984b8cfe2ba32e2ad48d32386c34579b37161f7a1a82b9aa9e2356263f865314 SHA512 86117ecf4cdbec2181b48ff3737c6c4eda71d7bfdd3c6b3b6a195a79cfc6c884b5d6b9e7ba41a1943c39458e1d69a3a0f2e6b6338da7b846230e50f51064b402
 AUX inspircd-3.2.0-fix-path-builds.patch 12593 BLAKE2B fe6e74da76321c4be5bd736e84385ccd73a267f175b9eb3b613a4cb5a19b4388ad66eb0be7740e58fb3ab9af5bddfca9b27454e586853c0db461eb5d62ed2b25 SHA512 288205a8f9b26019ac3a682d9d168839ead435ffbe6423e069f98d1213ea00a18a30fb05ad63555001411fd7043b88f3fb7005081e7433a2ebf28927776e6e0a
+AUX inspircd-3.3.0-fix-path-builds.patch 12593 BLAKE2B fe6e74da76321c4be5bd736e84385ccd73a267f175b9eb3b613a4cb5a19b4388ad66eb0be7740e58fb3ab9af5bddfca9b27454e586853c0db461eb5d62ed2b25 SHA512 288205a8f9b26019ac3a682d9d168839ead435ffbe6423e069f98d1213ea00a18a30fb05ad63555001411fd7043b88f3fb7005081e7433a2ebf28927776e6e0a
 AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2
 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
 DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
-DIST inspircd-2.0.27.tar.gz 735970 BLAKE2B 74a262ddd5f7d2fd61a1a01cddb0d61bf58e9fcdb3a69ebda15d711f3439b7b8e4387ee9ef3b55309e213e1e8bdc2978ca5b319720b0fcf71d9645f13102c2a2 SHA512 56f03c3259fad54365e97fd82f4e309edc60b641ccadd7916d04156fd157858f79930c8b9df99aa98c5505f76ab19e6bcd150ae5ed04d2bddfff572e18226cdd
+DIST inspircd-2.0.28.tar.gz 735981 BLAKE2B d467b4d31db4cbafeba655a4e129766ec780b2244f1945da6e25e9d70a8c7f946ea6258cc4e1189029a9f3be4d93b3d943f0bd20ccb85951f001268c2e460805 SHA512 0e8082a03e65f350ac423cc0781506c0eb40151d6e8d250067288b2a1d42087f10c159472ad76028aa986f6764180fdc493893984cadc0064715853472fa3e2a
 DIST inspircd-3.2.0.tar.gz 799842 BLAKE2B 87f8465479f01587b669c926c9097e14e441d40d6f37be2971863b40c2cef3d962acaf2cc84879d1d813819bcb512adfc58723b6adac5dfc35b240d4068b40f6 SHA512 8792614785d7f0415a38d49cc1786204d838917df54792ee6755b9ad8fd895020539364fdfc6daae60a911b8f39af1326e172ac40335b700241ca832410a4498
+DIST inspircd-3.3.0.tar.gz 803449 BLAKE2B 2b396db9d4bc84af33367715acb7f82299211ab31975310de0da4e3fe74385085b801c3bce6fe835b0f9e9857b1b457e037eb72e91d4455dc5918ad8d5bc844d SHA512 067904d877803c370873b5e79860fe0ac68529e740283e7e78dcd4dbbea30e19841a1f2e7e57e3e0b701704224369dbd484562e7edbbcd775bf85c18a4d340c3
 EBUILD inspircd-2.0.25.ebuild 3376 BLAKE2B 802a96022a2cad65801d6dab88d2069523ce72914b2558718b39dde9891e6e0b78cd432541add655cdf1a01376ec1f8d216640c9480a84deb36b703345377859 SHA512 fd9a2c56b35f6855a68e8d697df1e63100c0abafdcd7a79b4ca53bc0f65a23876870352c3203e09a4a668844fd01735896d93ace6e60bd8a01e5253c5af9f99e
-EBUILD inspircd-2.0.27.ebuild 3168 BLAKE2B 06c0815778898c90477b49aae366e2f250a30a716da12d6d3414fd164107a9deb5b1e580937aee3be226cbf09df14af7bce301a6d09e0e6fc30e3b5963363952 SHA512 ae539416d593d8602a900ea8cfebf450d4c5762163bf9a0ee0556d1ad51d42302e93c5d20788d1285d6a26a714a1f5d413ffd547c7c74f517779e873b9689476
-EBUILD inspircd-3.2.0.ebuild 3870 BLAKE2B 38bca33d824c7bba4c79612d70bc638a1bcd47af3561ea6bc2b3a8eed2b235dd5d41e3644b65beab54f7f7cc2b59bd7eb4325c33bb059b05486402ab07c62b40 SHA512 2df090adea36eec1f3312cee25cc39fae7014f7187125a16d56b7a4f8dbaba4768be7159d760da22fd592cc4a02ea583329d7e3bc4849431e9a4d85ba5b44f79
+EBUILD inspircd-2.0.28.ebuild 3136 BLAKE2B 79c05f2b3fda1124718cc167a73ffd8f7dec5147644c34dfb843979c055ae4f368eed3e477add255047c096e51d1099ca49176dbd2f5c9cc5de4ad667f966097 SHA512 6c20ee1747c9e2c0610cb989d54b80d352525592f2f581c35b4654da443343bdc70c60397b3261348961bdd65e25247db4f4ff8579264da3468afd2c50f22950
+EBUILD inspircd-3.2.0.ebuild 3869 BLAKE2B 05a59a672e9801d3699b1687193a97a87348d5710b18c966f64af770e8b65a903283d4b5f2b82567a14e0a0a733c51a7e1c77e2d802f8951c1e1f44b130d2b42 SHA512 02a2b299f15b22c6ecc5dcddf44e62439f6d9ebee3e1e91c564a2de1ff2ee27877ad54ff9ab58c4bd8058fc93cbb068cff734fba89f8e713af8741bf0e904a2c
+EBUILD inspircd-3.3.0.ebuild 3841 BLAKE2B 7a061872092b58bee29379ac8bb4d97ddb807748096352cfb900c8ea048985364d62d4aa7fd508b0cd331f8c8780121c930cee28527ef968dc75145d6e1b44cc SHA512 16e00bb9ef7b5ccb110e39cf6440782320e82c8e9fbffb9cd26106ec5474658a80df7e49649e3130e55a70d5a11e6b5d376f6aaa47fa8ee6e8e366c15b929ab4
 MISC metadata.xml 1928 BLAKE2B b3c78c7526b07644b61532293634647d5db2c60f3f69e7cae15f4cc7fb7ad12dcbe980467d2c433e509817a8e200d0e674e0a1b12f5cec3ffbf5a80ebe5a2d53 SHA512 8c373da73fdad81bce0533aa767716fe16bbdbe909818f1a022a43b307e6679456150a077a155076d221b48759b00a0f09947d32608876787c306fac88918098
diff --git a/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch
new file mode 100644
index 000000000000..da00a8491d1f
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch
@@ -0,0 +1,257 @@
+diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
+index d54cdc916..ee21be7f3 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf.example
+@@ -425,11 +425,11 @@
+ 
+ # This file has all the information about oper classes, types and o:lines.
+ # You *MUST* edit it.
+-<include file="conf/examples/opers.conf.example">
++<include file="/etc/inspircd/opers.conf.example">
+ 
+ # This file has all the information about server links and ulined servers.
+ # You *MUST* edit it if you intend to link servers.
+-<include file="conf/examples/links.conf.example">
++<include file="/etc/inspircd/links.conf.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -439,7 +439,8 @@
+ #   motd - displayed on connect and when a user executes /MOTD
+ #   rules - displayed when the user executes /RULES
+ # Modules can also define their own files
+-<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example">
++<files motd="/etc/inspircd/motd.txt.example"
++       rules="/etc/inspircd/rules.txt.example">
+ 
+ # Example of an executable file include. Note this will be read on rehash,
+ # not when the command is run.
+@@ -485,7 +486,7 @@
+ # the default of 'inspircd.pid' is used.                              #
+ #                                                                     #
+ 
+-#<pid file="/path/to/inspircd.pid">
++<pid file="/var/run/inspircd/inspircd.pid">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -994,7 +995,7 @@
+ # provide almost all the features of InspIRCd. :)                     #
+ #                                                                     #
+ # The default does nothing -- we include it for simplicity for you.   #
+-<include file="conf/examples/modules.conf.example">
++<include file="/etc/inspircd/modules.conf.example">
+ 
+ # Here are some pre-built modules.conf files that closely match the
+ # default configurations of some popular IRCd's. You still may want to
+@@ -1006,10 +1007,10 @@
+ # recommended that you make your own modules file based on modules.conf.example.
+ 
+ # Settings similar to UnrealIRCd defaults.
+-#<include file="conf/examples/modules/unrealircd.conf.example">
++#<include file="/etc/inspircd/modules/unrealircd.conf.example">
+ 
+ # Settings similar to Charybdis IRCd defaults.
+-#<include file="conf/examples/modules/charybdis.conf.example">
++#<include file="/etc/inspircd/modules/charybdis.conf.example">
+ 
+ 
+ #########################################################################
+diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
+index c3f074b94..4b0a584bb 100644
+--- a/docs/conf/modules.conf.example
++++ b/docs/conf/modules.conf.example
+@@ -315,7 +315,7 @@
+ # specify some censor tags. See also:                                 #
+ # https://wiki.inspircd.org/Modules/2.0/censor                        #
+ #
+-#<include file="conf/examples/censor.conf.example">
++#<include file="/etc/inspircd/censor.conf.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # CGI:IRC module: Adds support for automatic host changing in CGI:IRC
+@@ -790,7 +790,7 @@
+ # specify below the path to the filter.conf file, or define some      #
+ # <filter> tags.                                                      #
+ #                                                                     #
+-#<include file="conf/examples/filter.conf.example">
++#<include file="/etc/inspircd/filter.conf.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Gecos ban: Implements extended ban 'r', which stops anyone matching
+@@ -849,7 +849,7 @@
+ #                                                                     #
+ # If you specify to use the m_helpop.so module, then specify below    #
+ # the path to the helpop.conf file.                                   #
+-#<include file="conf/examples/helpop-full.conf.example">
++#<include file="/etc/inspircd/helpop-full.conf.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Hide chans module: Allows users to hide their channels list from non-
+@@ -1304,7 +1304,7 @@
+ #                 Read the comment above <connect:allowmotdcolors> in #
+ #                 inspircd.conf.example for details.                  #
+ #                                                                     #
+-#<opermotd file="conf/examples/opermotd.txt.example" onoper="yes" processcolors="false">
++#<opermotd file="/etc/inspircd/opermotd.txt.example" onoper="yes" processcolors="false">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Override module: Adds support for oper override.
+diff --git a/make/template/main.mk b/make/template/main.mk
+index 23daa7efc..386e0138a 100644
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -34,7 +34,7 @@ CC = @CC@
+ SYSTEM = @SYSTEM@
+ BUILDPATH = @BUILD_DIR@
+ SOCKETENGINE = @SOCKETENGINE@
+-CXXFLAGS = -pipe -fPIC -DPIC
++MYCXXFLAGS = -pipe -fPIC -DPIC
+ LDLIBS = -pthread -lstdc++
+ LDFLAGS = 
+ CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
+@@ -52,9 +52,9 @@ INSTMODE_BIN = 0755
+ INSTMODE_LIB = 0644
+ 
+ @IFEQ $(CC) icpc
+-  CXXFLAGS += -Wshadow
++  MYCXXFLAGS += -Wshadow
+ @ELSE
+-  CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
++  MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
+ @ENDIF
+ 
+ 
+@@ -76,46 +76,46 @@ INSTMODE_LIB = 0644
+ 	INSTALL = ginstall
+ @ENDIF
+ @IFEQ $(SYSTEM) darwin
+-  CXXFLAGS += -DDARWIN -frtti
++  MYCXXFLAGS += -DDARWIN -frtti
+   LDLIBS += -ldl
+   CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
+   PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
+ @ENDIF
+ @IFEQ $(SYSTEM) interix
+-  CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
++  MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
+ @ENDIF
+ 
+-@IFNDEF D
+-  D=0
++@IFNDEF DEBUGLEVEL
++  DEBUGLEVEL=0
+ @ENDIF
+ 
+ GCC6=@GCC6@
+ @IFEQ $(GCC6) true
+-  CXXFLAGS += -fno-delete-null-pointer-checks
++  MYCXXFLAGS += -fno-delete-null-pointer-checks
+ @ENDIF
+ 
+ DBGOK=0
+-@IFEQ $(D) 0
+-  CXXFLAGS += -O2
++@IFEQ $(DEBUGLEVEL) 0
++  MYCXXFLAGS += -O2
+ @IFEQ $(CC) g++
+-    CXXFLAGS += -g1
++    MYCXXFLAGS += -g1
+ @ENDIF
+   HEADER = std-header
+   DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 1
+-  CXXFLAGS += -O0 -g3 -Werror
++@IFEQ $(DEBUGLEVEL) 1
++  MYCXXFLAGS += -O0 -g3 -Werror
+   HEADER = debug-header
+   DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 2
+-  CXXFLAGS += -O2 -g3
++@IFEQ $(DEBUGLEVEL) 2
++  MYCXXFLAGS += -O2 -g3
+   HEADER = debug-header
+   DBGOK=1
+ @ENDIF
+ FOOTER = finishmessage
+ 
+-CXXFLAGS += -Iinclude
++MYCXXFLAGS += -Iinclude
+ 
+ @GNU_ONLY MAKEFLAGS += --no-print-directory
+ 
+@@ -135,10 +135,11 @@ CXXFLAGS += -Iinclude
+ @ENDIF
+ 
+ @IFDEF PURE_STATIC
+-  CXXFLAGS += -DPURE_STATIC
++  MYCXXFLAGS += -DPURE_STATIC
+ @ENDIF
+ 
+-@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
++MYCXXFLAGS += $(CXXFLAGS)
++@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
+ @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
+ 
+ # Default target
+@@ -151,10 +152,10 @@ TARGET = all
+     @GNU_ONLY TARGET = modules/$(M:.so=).so
+ @ENDIF
+ 
+-@IFDEF T
++@IFDEF TGT
+     HEADER =
+     FOOTER = target
+-    TARGET = $(T)
++    TARGET = $(TGT)
+ @ENDIF
+ 
+ @IFEQ $(DBGOK) 0
+@@ -229,8 +230,8 @@ install: target
+ 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH)
+ 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH)
+ 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
+-	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
+-	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules
+ 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
+ 	[ "$(BUILDPATH)/bin/" -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
+ @IFNDEF PURE_STATIC
+@@ -238,9 +239,9 @@ install: target
+ @ENDIF
+ 	-$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
+ 	-$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
+-	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
+-	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
+-	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
++	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)
++	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases
++	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules
+ 	@echo ""
+ 	@echo "*************************************"
+ 	@echo "*        INSTALL COMPLETE!          *"
+@@ -253,7 +254,7 @@ install: target
+ 	@echo '  Data:' $(DATPATH)
+ 	@echo 'To start the ircd, run:' $(BASE)/inspircd start
+ 	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
+-	@echo 'Examples are available at:' $(CONPATH)/examples/
++	@echo 'Examples are available at:' $(CONPATH)
+ 
+ @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh)
+ @BSD_ONLY RCS_FILES = src/version.sh
+diff --git a/make/unit-cc.pl b/make/unit-cc.pl
+index a494fb74b..2a570ec91 100755
+--- a/make/unit-cc.pl
++++ b/make/unit-cc.pl
+@@ -113,7 +113,7 @@ sub do_compile {
+ 	my $libs = '';
+ 	my $binary = $ENV{RUNCC};
+ 	if ($do_compile) {
+-		$flags = $ENV{CXXFLAGS};
++		$flags = $ENV{MYCXXFLAGS};
+ 		$flags =~ s/ -pedantic// if nopedantic($file);
+ 		$flags .= ' ' . getcompilerflags($file);
+ 
diff --git a/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch
new file mode 100644
index 000000000000..955b2be79095
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch
@@ -0,0 +1,267 @@
+diff --git a/docs/conf/filter.conf.example b/docs/conf/filter.conf
+similarity index 100%
+rename from docs/conf/filter.conf.example
+rename to docs/conf/filter.conf
+diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf
+similarity index 100%
+rename from docs/conf/helpop.conf.example
+rename to docs/conf/helpop.conf
+diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf
+similarity index 99%
+rename from docs/conf/inspircd.conf.example
+rename to docs/conf/inspircd.conf
+index dbd56d2fe..4a7aab514 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf
+@@ -494,11 +494,11 @@
+ 
+ # This file has all the information about oper classes, types and o:lines.
+ # You *MUST* edit it.
+-#<include file="examples/opers.conf.example">
++#<include file="/etc/inspircd/opers.conf">
+ 
+ # This file has all the information about server links and ulined servers.
+ # You *MUST* edit it if you intend to link servers.
+-#<include file="examples/links.conf.example">
++#<include file="/etc/inspircd/links.conf">
+ 
+ #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -507,7 +507,7 @@
+ #
+ #   motd - displayed on connect and when a user executes /MOTD
+ # Modules can also define their own files
+-<files motd="examples/motd.txt.example">
++<files motd="/etc/inspircd/motd.txt">
+ 
+ # Example of an executable file include. Note this will be read on rehash,
+ # not when the command is run.
+@@ -543,7 +543,7 @@
+ # the default of 'inspircd.pid' is used.                              #
+ #                                                                     #
+ 
+-#<pid file="/path/to/inspircd.pid">
++#<pid file="/var/run/inspircd/inspircd.pid">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -1041,7 +1041,7 @@
+ # provide almost all the features of InspIRCd. :)                     #
+ #                                                                     #
+ # The default does nothing -- we include it for simplicity for you.   #
+-#<include file="examples/modules.conf.example">
++#<include file="/etc/inspircd/modules.conf">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION  #-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -1050,13 +1050,13 @@
+ # exemptions for services pseudoclients:                              #
+ #
+ # Anope users should uncomment this:
+-#<include file="examples/services/anope.conf.example">
++#<include file="/etc/inspircd/aliases/anope.conf">
+ #
+ # Atheme users should uncomment this:
+-#<include file="examples/services/atheme.conf.example">
++#<include file="/etc/inspircd/aliases/atheme.conf">
+ #
+ # Users of other services should uncomment this:
+-#<include file="examples/services/generic.conf.example">
++#<include file="/etc/inspircd/aliases/generic.conf">
+ 
+ #########################################################################
+ #                                                                       #
+diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf
+similarity index 100%
+rename from docs/conf/links.conf.example
+rename to docs/conf/links.conf
+diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf
+similarity index 99%
+rename from docs/conf/modules.conf.example
+rename to docs/conf/modules.conf
+index 3bf1c2e99..b451a2f18 100644
+--- a/docs/conf/modules.conf.example
++++ b/docs/conf/modules.conf
+@@ -832,7 +832,7 @@
+ # anticaps, auditorium-see, auditorium-vis, blockcaps, blockcolor,    #
+ # censor, filter, flood, nickflood, noctcp, nonick, nonotice,         #
+ # regmoderated, stripcolor, and topiclock.                            #
+-# See <options:exemptchanops> in inspircd.conf.example for a more     #
++# See <options:exemptchanops> in inspircd.conf for a more             #
+ # detailed list of the restriction modes that can be exempted.        #
+ # These are settable using: /MODE #chan +X <restriction>:<status>     #
+ #<module name="exemptchanops">
+@@ -868,7 +868,7 @@
+ # Your choice of regex engine must match on all servers network-wide. #
+ #                                                                     #
+ # To learn more about the configuration of this module, read          #
+-# examples/filter.conf.example, which covers the various types of     #
++# filter.conf, which covers the various types of                      #
+ # filters and shows how to add exemptions.                            #
+ #                                                                     #
+ #-#-#-#-#-#-#-#-#-#-#-  FILTER  CONFIGURATION  -#-#-#-#-#-#-#-#-#-#-#-#
+@@ -877,7 +877,7 @@
+ # specify below the path to the filter.conf file, or define some      #
+ # <keyword> tags.                                                     #
+ #                                                                     #
+-#<include file="examples/filter.conf.example">
++#<include file="/etc/inspircd/filter.conf">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)#
+@@ -967,7 +967,7 @@
+ # If you specify to use the helpop module, then specify below the     #
+ # path to the helpop.conf file.                                       #
+ #                                                                     #
+-#<include file="examples/helpop.conf.example">
++#<include file="/etc/inspircd/helpop.conf">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Hide chans module: Allows users to hide their channels list from non-
+@@ -1545,7 +1545,7 @@
+ # onoper        - If on, the message is sent on /OPER, otherwise it's #
+ #                 only sent when /OPERMOTD is used.                   #
+ #                                                                     #
+-#<opermotd file="examples/opermotd.txt.example" onoper="yes">
++#<opermotd file="/etc/inspircd/opermotd.txt" onoper="yes">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Override module: Adds support for oper override.
+@@ -2123,7 +2123,7 @@
+ # connections in order to oper up. It is highly recommended to load
+ # this module if you use SSL on your network.
+ # For how to use the oper features, please see the first
+-# example <oper> tag in opers.conf.example.
++# example <oper> tag in opers.conf.
+ #
+ #<module name="sslinfo">
+ #
+diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt
+similarity index 97%
+rename from docs/conf/motd.txt.example
+rename to docs/conf/motd.txt
+index c5266f844..34d85d965 100644
+--- a/docs/conf/motd.txt.example
++++ b/docs/conf/motd.txt
+@@ -24,7 +24,7 @@
+                     `-.__  `----"""    __.-'
+                          `--..____..--'
+ 
+-        ---- To change, see motd.txt.example -----
++        ---- To change, see motd.txt         -----
+        /                                          \
+       /   * Web: https://www.inspircd.org          \
+       |   * IRC: irc.inspircd.org #inspircd        |
+diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt
+similarity index 97%
+rename from docs/conf/opermotd.txt.example
+rename to docs/conf/opermotd.txt
+index 7e1c82f33..73ad28621 100644
+--- a/docs/conf/opermotd.txt.example
++++ b/docs/conf/opermotd.txt
+@@ -24,7 +24,7 @@
+                     `-.__  `----"""    __.-'
+                          `--..____..--'
+ 
+-        -- To change, see opermotd.txt.example ---
++        -- To change, see opermotd.txt         ---
+        /                                          \
+       /   * Web: https://www.inspircd.org          \
+       |   * IRC: irc.inspircd.org #inspircd        |
+diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf
+similarity index 99%
+rename from docs/conf/opers.conf.example
+rename to docs/conf/opers.conf
+index 7cad2589c..082009da9 100644
+--- a/docs/conf/opers.conf.example
++++ b/docs/conf/opers.conf
+@@ -178,4 +178,4 @@
+ 
+ # Once you have edited this file you can remove this line. This is just to
+ # ensure that you don't hastily include the file without reading it.
+-<die reason="Using opers.conf.example without editing it is a security risk">
++<die reason="Using opers.conf without editing it is a security risk">
+diff --git a/docs/conf/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
+similarity index 100%
+rename from docs/conf/providers/irccloud.conf.example
+rename to docs/conf/providers/irccloud.conf
+diff --git a/docs/conf/providers/kiwiirc-com.conf.example b/docs/conf/providers/kiwiirc-com.conf
+similarity index 100%
+rename from docs/conf/providers/kiwiirc-com.conf.example
+rename to docs/conf/providers/kiwiirc-com.conf
+diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt
+similarity index 100%
+rename from docs/conf/quotes.txt.example
+rename to docs/conf/quotes.txt
+diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.conf
+similarity index 86%
+rename from docs/conf/services/anope.conf.example
+rename to docs/conf/services/anope.conf
+index 5c8f859ff..b1179eb8c 100644
+--- a/docs/conf/services/anope.conf.example
++++ b/docs/conf/services/anope.conf
+@@ -2,7 +2,7 @@
+ # by Anope. See https://www.anope.org for more information on Anope.
+ 
+ # This file inherits from the generic config to avoid repetition.
+-<include file="examples/services/generic.conf.example">
++<include file="examples/services/generic.conf">
+ 
+ # /GLOBAL <message>
+ # Sends a global notice.
+diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.conf
+similarity index 98%
+rename from docs/conf/services/atheme.conf.example
+rename to docs/conf/services/atheme.conf
+index d509522b8..7605251db 100644
+--- a/docs/conf/services/atheme.conf.example
++++ b/docs/conf/services/atheme.conf
+@@ -3,7 +3,7 @@
+ # information on Atheme.
+ 
+ # This file inherits from the generic config to avoid repetition.
+-<include file="examples/services/generic.conf.example">
++<include file="examples/services/generic.conf">
+ 
+ # Long hand aliases for services pseudoclients.
+ <alias text="ALIS"      replace="SQUERY $requirement :$2-" requires="ALIS"      uline="yes">
+diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.conf
+similarity index 100%
+rename from docs/conf/services/generic.conf.example
+rename to docs/conf/services/generic.conf
+diff --git a/make/template/main.mk b/make/template/main.mk
+index d77d59fa5..b28d7180d 100644
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -210,8 +210,8 @@ install: target
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
++	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/services
++	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/sql
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
+@@ -229,9 +229,9 @@ endif
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
++	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
++	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services
++	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
+ 	@echo ""
+ 	@echo "*************************************"
+@@ -245,7 +245,6 @@ endif
+ 	@echo '  Data:' $(DATPATH)
+ 	@echo 'To start the ircd, run:' $(SCRPATH)/inspircd start
+ 	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
+-	@echo 'Examples are available at:' $(EXAPATH)
+ 
+ GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
+ 	./configure --update
diff --git a/net-irc/inspircd/inspircd-2.0.27.ebuild b/net-irc/inspircd/inspircd-2.0.27.ebuild
deleted file mode 100644
index ca3c680e39b8..000000000000
--- a/net-irc/inspircd/inspircd-2.0.27.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs user
-
-DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
-HOMEPAGE="https://inspircd.github.com/"
-SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
-
-RDEPEND="
-	dev-lang/perl
-	ssl? ( dev-libs/openssl:= )
-	geoip? ( dev-libs/geoip )
-	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	pcre? ( dev-libs/libpcre )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	tre? ( dev-libs/tre )"
-DEPEND="${RDEPEND}"
-
-DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-
-	# Patch the inspircd launcher with the inspircd user
-	sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
-}
-
-src_configure() {
-	local extras=""
-
-	use geoip && extras+="m_geoip.cpp,"
-	use gnutls && extras+="m_ssl_gnutls.cpp,"
-	use ldap && extras+="m_ldapauth.cpp,m_ldapoper.cpp,"
-	use mysql && extras+="m_mysql.cpp,"
-	use pcre && extras+="m_regex_pcre.cpp,"
-	use posix && extras+="m_regex_posix.cpp,"
-	use postgres && extras+="m_pgsql.cpp,"
-	use sqlite && extras+="m_sqlite3.cpp,"
-	use ssl && extras+="m_ssl_openssl.cpp,"
-	use tre && extras+="m_regex_tre.cpp,"
-
-	# The first configuration run enables certain "extra" InspIRCd
-	# modules, the second run generates the actual makefile.
-	if [[ -n "${extras}" ]]; then
-		./configure --disable-interactive --enable-extras=${extras%,}
-	fi
-
-	local myconf=(
-		--with-cc="$(tc-getCXX)"
-		--disable-interactive
-		--prefix="/usr/$(get_libdir)/${PN}"
-		--config-dir="/etc/${PN}"
-		--data-dir="/var/lib/${PN}/data"
-		--log-dir="/var/log/${PN}"
-		--binary-dir="/usr/bin"
-		--module-dir="/usr/$(get_libdir)/${PN}/modules"
-		$(usex ipv6 '' '--disable-ipv6')
-		$(usex gnutls '--enable-gnutls' '')
-		$(usex ssl '--enable-openssl' ''))
-	./configure "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	emake INSTUID=${PN} DESTDIR="${D%/}" install
-
-	insinto "/usr/include/${PN}"
-	doins -r include/.
-
-	einstalldocs
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	keepdir "/var/log/${PN}"
-
-	diropts -o"${PN}" -g"${PN}" -m0700
-	keepdir "/var/lib/${PN}/data"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "You will find example configuration files under "
-		elog "/usr/share/doc/${PN}"
-		elog "Read the ${PN}.conf.example file carefully before "
-		elog "starting the service."
-	fi
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test "${pv}" -lt "2.0.24-r1"; then
-			elog "Starting with 2.0.24-r1 the daemon is no longer started"
-			elog "with the --logfile option and you are thus expected to define"
-			elog "logging in the InspIRCd configuration file if you want it."
-			break
-		fi
-	done
-}
diff --git a/net-irc/inspircd/inspircd-2.0.28.ebuild b/net-irc/inspircd/inspircd-2.0.28.ebuild
new file mode 100644
index 000000000000..41581c0c6c15
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.28.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="https://inspircd.github.com/"
+SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
+
+RDEPEND="
+	acct-group/inspircd
+	acct-user/inspircd
+	dev-lang/perl
+	ssl? ( dev-libs/openssl:= )
+	geoip? ( dev-libs/geoip )
+	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	pcre? ( dev-libs/libpcre )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	tre? ( dev-libs/tre )"
+DEPEND="${RDEPEND}"
+
+DOCS=( docs/. )
+PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+
+src_prepare() {
+	default
+
+	# Patch the inspircd launcher with the inspircd user
+	sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
+}
+
+src_configure() {
+	local extras=""
+
+	use geoip && extras+="m_geoip.cpp,"
+	use gnutls && extras+="m_ssl_gnutls.cpp,"
+	use ldap && extras+="m_ldapauth.cpp,m_ldapoper.cpp,"
+	use mysql && extras+="m_mysql.cpp,"
+	use pcre && extras+="m_regex_pcre.cpp,"
+	use posix && extras+="m_regex_posix.cpp,"
+	use postgres && extras+="m_pgsql.cpp,"
+	use sqlite && extras+="m_sqlite3.cpp,"
+	use ssl && extras+="m_ssl_openssl.cpp,"
+	use tre && extras+="m_regex_tre.cpp,"
+
+	# The first configuration run enables certain "extra" InspIRCd
+	# modules, the second run generates the actual makefile.
+	if [[ -n "${extras}" ]]; then
+		./configure --disable-interactive --enable-extras=${extras%,}
+	fi
+
+	local myconf=(
+		--with-cc="$(tc-getCXX)"
+		--disable-interactive
+		--prefix="/usr/$(get_libdir)/${PN}"
+		--config-dir="/etc/${PN}"
+		--data-dir="/var/lib/${PN}/data"
+		--log-dir="/var/log/${PN}"
+		--binary-dir="/usr/bin"
+		--module-dir="/usr/$(get_libdir)/${PN}/modules"
+		$(usex ipv6 '' '--disable-ipv6')
+		$(usex gnutls '--enable-gnutls' '')
+		$(usex ssl '--enable-openssl' ''))
+	./configure "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	emake INSTUID=${PN} DESTDIR="${D%/}" install
+
+	insinto "/usr/include/${PN}"
+	doins -r include/.
+
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	keepdir "/var/log/${PN}"
+
+	diropts -o"${PN}" -g"${PN}" -m0700
+	keepdir "/var/lib/${PN}/data"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "You will find example configuration files under "
+		elog "/usr/share/doc/${PN}"
+		elog "Read the ${PN}.conf.example file carefully before "
+		elog "starting the service."
+	fi
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test "${pv}" -lt "2.0.24-r1"; then
+			elog "Starting with 2.0.24-r1 the daemon is no longer started"
+			elog "with the --logfile option and you are thus expected to define"
+			elog "logging in the InspIRCd configuration file if you want it."
+			break
+		fi
+	done
+}
diff --git a/net-irc/inspircd/inspircd-3.2.0.ebuild b/net-irc/inspircd/inspircd-3.2.0.ebuild
index 2416d94a03a4..90aad649918c 100644
--- a/net-irc/inspircd/inspircd-3.2.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
 
 RDEPEND="
diff --git a/net-irc/inspircd/inspircd-3.3.0.ebuild b/net-irc/inspircd/inspircd-3.3.0.ebuild
new file mode 100644
index 000000000000..0223cc46790f
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.3.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="https://inspircd.github.com/"
+SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
+
+RDEPEND="
+	acct-group/inspircd
+	acct-user/inspircd
+	dev-lang/perl
+	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
+	ldap? ( net-nds/openldap )
+	maxminddb? ( dev-libs/libmaxminddb )
+	mbedtls? ( net-libs/mbedtls:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	re2? ( dev-libs/re2:= )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	ssl? ( dev-libs/openssl:= )
+	tre? ( dev-libs/tre )"
+DEPEND="${RDEPEND}"
+
+DOCS=( docs/. )
+PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+
+src_prepare() {
+	default
+
+	# Patch the inspircd launcher with the inspircd user
+	sed -i -e "s/@UID@/${PN}/" "make/template/${PN}" || die
+}
+
+src_configure() {
+	local extras=""
+
+	use gnutls && extras+="m_ssl_gnutls.cpp,"
+	use ldap && extras+="m_ldap.cpp,"
+	use maxminddb && extras+="m_geo_maxmind.cpp,"
+	use mbedtls && extras+="m_ssl_mbedtls.cpp,"
+	use mysql && extras+="m_mysql.cpp,"
+	use pcre && extras+="m_regex_pcre.cpp,"
+	use postgres && extras+="m_pgsql.cpp,"
+	use re2 && extras+="m_regex_re2.cpp,"
+	use regex-posix && extras+="m_regex_posix.cpp,"
+	use regex-stdlib && extras+="m_regex_stdlib.cpp,"
+	use sqlite && extras+="m_sqlite3.cpp,"
+	use ssl && extras+="m_ssl_openssl.cpp,"
+	use sslrehashsignal && extras+="m_sslrehashsignal.cpp,"
+	use tre && extras+="m_regex_tre.cpp,"
+
+	# The first configuration run enables certain "extra" InspIRCd
+	# modules, the second run generates the actual makefile.
+	if [[ -n "${extras}" ]]; then
+		./configure --disable-interactive --enable-extras=${extras%,}
+	fi
+
+	local myconf=(
+		--disable-interactive
+		--disable-auto-extras
+		--prefix="/usr/$(get_libdir)/${PN}"
+		--config-dir="/etc/${PN}"
+		--data-dir="/var/lib/${PN}/data"
+		--log-dir="/var/log/${PN}"
+		--binary-dir="/usr/bin"
+		--module-dir="/usr/$(get_libdir)/${PN}/modules"
+		--manual-dir="/usr/share/man")
+	CXX="$(tc-getCXX)" ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usex debug 'INSPIRCD_DEBUG=2' '') INSPIRCD_VERBOSE=1
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	# Default is '0750', which causes init errors.
+	fperms 0755 /usr/bin/inspircd{,-genssl}
+	# Default is '0640', causing module load errors.
+	fperms -R 0755 "/usr/lib64/inspircd/modules/."
+
+	insinto "/usr/include/${PN}"
+	doins -r include/.
+
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	keepdir "/var/log/${PN}"
+
+	diropts -o"${PN}" -g"${PN}" -m0700
+	keepdir "/var/lib/${PN}/data"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "You will find example configuration files under "
+		elog "/usr/share/doc/${PN}"
+		elog "Read the ${PN}.conf.example file carefully before "
+		elog "starting the service."
+	fi
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ver_test "${pv}" -lt "2.0.24-r1"; then
+			elog "Starting with 2.0.24-r1 the daemon is no longer started"
+			elog "with the --logfile option and you are thus expected to define"
+			elog "logging in the InspIRCd configuration file if you want it."
+		fi
+		if ver_test "${pv}" -lt "3.0.0"; then
+			elog "Version 3.0 is a major upgrade which contains breaking"
+			elog "changes.  You will need to update your configuration files."
+			elog "See: https://docs.inspircd.org/3/configuration-changes"
+		fi
+	done
+}
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 8de224425508..6a0a8fe9d273 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,4 +1,4 @@
-DIST irssi-1.2.1.tar.xz 1140380 BLAKE2B 11ab48ce6d7efa0a4c33f823dd414660107d94b9f00c863feb8377f4586e6c62043932bdcf35f1f4e9e9ab545ccc3bb0bfd207727e55856243c8494ae6172cf9 SHA512 67c4501b5a0055c1b24fa6753305658de809cd66e952e6f9233701a112989fd8721a065b1c681725b82346b40b53a29bd2b6b8b8315ac0ad196235a9e5156d5a
-EBUILD irssi-1.2.1.ebuild 1576 BLAKE2B fe7fcbdfa0415293d8b2a0d06da8ae3e08d9c388b88bddea6ada08ae5f1942eeaed3c9b8660a66333667677aa20dfe31975475a2811817a664025f7996846335 SHA512 4e15b662b4ebec22e07ad4e68197ea2c18f62c2defb9270934b4a7335fc502d7a8ff1ee8ba0970bdf57878c087c7c3dabe8cea8dad6621e8cd0d428b25f2726d
+DIST irssi-1.2.2.tar.xz 1140844 BLAKE2B c1758828285c3f3210d6920455382e52279587280ecdc4ba7d73562c164ebd6618b1bb32d387439be2696f948044f66eb73b78ed2b0635286f8c3d93530167f2 SHA512 5444ac102ff9ad3a6399a47c967d138e181330dd226eac68886d35fee4ad455932b9306a367bee3478095158e41ba67fb46deb8f0a33512046b9b83bae37c610
+EBUILD irssi-1.2.2.ebuild 1576 BLAKE2B fe7fcbdfa0415293d8b2a0d06da8ae3e08d9c388b88bddea6ada08ae5f1942eeaed3c9b8660a66333667677aa20dfe31975475a2811817a664025f7996846335 SHA512 4e15b662b4ebec22e07ad4e68197ea2c18f62c2defb9270934b4a7335fc502d7a8ff1ee8ba0970bdf57878c087c7c3dabe8cea8dad6621e8cd0d428b25f2726d
 EBUILD irssi-9999.ebuild 1486 BLAKE2B 2742c15d0b3f5a2787aeea9db79693e36845957a28b5146e8eb839278681f538d7be2e46d37875e5f230b0edc7fa37a79809f2ba93f6927363398201335c030f SHA512 ba8be2fe7989ed59714cc454b372edf377261cb5b2fcbe6cfaec10f9fef1b1871d238ab3920f05b1c8da93d2f35b7049dbf12418659eedff457e99b225959159
 MISC metadata.xml 700 BLAKE2B 9d12cb98cc2a5204d423141bcb42222cb5aca53888eac4158927a40f2b5b8a28eb0fa4171f1a4467aa795df45673f21dec09ddbf9c22f897c131d137a10a1d98 SHA512 9d510764f9f5dbfaaa2c027ac79ccbcfc92552d48de3bb3491b6e9b1abdb8be7dcd4e59be4fdf82b9ba4c240a8bc63e5f18548b3c3da4e77eff0b87a457db470
diff --git a/net-irc/irssi/irssi-1.2.1.ebuild b/net-irc/irssi/irssi-1.2.2.ebuild
index 07e3cb75fc68..07e3cb75fc68 100644
--- a/net-irc/irssi/irssi-1.2.1.ebuild
+++ b/net-irc/irssi/irssi-1.2.2.ebuild
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 57d56c1c920e..d28c9af7aba7 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/accounts-qt/Manifest b/net-libs/accounts-qt/Manifest
index 9ed27c0a92e3..57cae0b0b787 100644
--- a/net-libs/accounts-qt/Manifest
+++ b/net-libs/accounts-qt/Manifest
@@ -1,3 +1,3 @@
 DIST accounts-qt-1.15.tar.gz 64190 BLAKE2B a00f4677d9e99304729af4768c288bce1b19f357e50db0db1264760114b6a9cea821bda112605a49dafa192e10d4d6454155fa94a3dd3cea2a6525d63c129bb4 SHA512 36c80a237bc2d427ce3acb62ac3b2e7878ac7e02b00f17022af326b52edbc7ad3d0cf428fb4e1e2bcc1d0d410054102926f549dc18bea137a9d9ea19a2d268d3
-EBUILD accounts-qt-1.15.ebuild 1015 BLAKE2B df4364b347858a324155cfa77fc160f127cd2fbbc63b09d51ff2b090630a37b1fa44d2579cc184eff6baad659a692e6e0a4324fcf3d55704548fd15f50e2d899 SHA512 f446e59fc7136f6fa2c702627be8a642745687955ae82c47d062ee48b98680d18d635fe5a183268616164d15f80bd2d2db11ee0f8ecf89772c54fa20c51b59dc
+EBUILD accounts-qt-1.15.ebuild 1124 BLAKE2B d61d7f6691e875e94078268a7b3f4c86b1a809f0c652076a10dc35f5d77ac1ae0d7c7dafe259515e2f9847da8312a3f355f6ccca171c67af52d82ce579a21504 SHA512 bc1878077361b7168f637e8ee17a9814d53b3f326019fbe3045966af2aa546d5d0c55b2d2164e7a903b9c3fadf94f6e7185180ece8160962d636a535da0b43b4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/accounts-qt/accounts-qt-1.15.ebuild b/net-libs/accounts-qt/accounts-qt-1.15.ebuild
index 042c2bffddf3..9b7e7c225ad9 100644
--- a/net-libs/accounts-qt/accounts-qt-1.15.ebuild
+++ b/net-libs/accounts-qt/accounts-qt-1.15.ebuild
@@ -1,43 +1,53 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit qmake-utils vcs-snapshot
+inherit qmake-utils
 
 DESCRIPTION="Qt5 bindings for libaccounts-glib"
 HOMEPAGE="https://01.org/gsso/"
-SRC_URI="https://gitlab.com/accounts-sso/libaccounts-qt/repository/VERSION_1.15/archive.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/repository/VERSION_${PV}/archive.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="doc test"
 
-# dbus problems
-RESTRICT="test"
-
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
-	>=net-libs/libaccounts-glib-1.23:=
 	dev-libs/glib:2
 	dev-qt/qtcore:5
 	dev-qt/qtxml:5
+	>=net-libs/libaccounts-glib-1.23:=
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
 	test? ( dev-qt/qttest:5 )
 "
 
+# dbus problems
+RESTRICT="test"
+
+S="${WORKDIR}/lib${PN}-VERSION_${PV}-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8"
+
 src_prepare() {
 	default
 
-	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" -i doc/doc.pri || die
-	use doc || sed -e "/include( doc\/doc.pri )/d" -i ${PN}.pro || die
-	use test || sed -i -e '/^SUBDIRS/s/tests//' accounts-qt.pro || die "couldn't disable tests"
+	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \
+		-i doc/doc.pri || die
+	if ! use doc; then
+		sed -e "/include( doc\/doc.pri )/d" -i ${PN}.pro || die
+	fi
+	if ! use test; then
+		sed -e '/^SUBDIRS/s/tests//' \
+			-i accounts-qt.pro || die "couldn't disable tests"
+	fi
 }
 
 src_configure() {
-	eqmake5 LIBDIR="${EPREFIX%/}/usr/$(get_libdir)"
+	eqmake5 LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
 
 src_install() {
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 1ddfe47fb723..771bbf4bc7fb 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -2,5 +2,5 @@ AUX 2.58.0-disable-failing-tests.patch 1879 BLAKE2B 6821bf4e1e18f085759c9ac19ff8
 DIST glib-networking-2.58.0.tar.xz 172632 BLAKE2B 2b1e478ecac7ffb25f0d4e319fc71f7a0c6d9bd4181a5e8abb310d11774491312b0ff1c81b9d8b383ae0b236ece89253d6bd222740199d816c94ea557b4e3511 SHA512 d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff
 DIST glib-networking-2.60.3.tar.xz 185132 BLAKE2B 8bbe2b8afb779bac99bd554c384bdbf9e197e9b71dc6fe213cdd4352d95ce19d1c9786747ba5c721fc35bdda3e1325e9620c1ef15ca1fa1e294aad9ab3f9a4bc SHA512 06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f
 EBUILD glib-networking-2.58.0.ebuild 1952 BLAKE2B 3a801454107b9250a12912ecd5c82ff134558f853cd2a63081c449a5cb7fe47dcc475fb34ef10830bff4d4a0c5afde5753c894420a10b93ca1fd96eb999bbede SHA512 b0d2a0c4d7f654c955a6aa6f7979b6d81cc32217dd4a1f2dc6129cbe114a65e52c48ed7c068145f0d2ee2e8d6de072d869bac9c1b562b0d877ed2132e5fa0652
-EBUILD glib-networking-2.60.3.ebuild 1775 BLAKE2B 1618245c9991aa7f8685823fb22b96c057ee4c67f9dcebf256e7e1b6da47487f3c82a36d07cd2ad01ca087854320656d4e9d5899460433399577ab92fd035d36 SHA512 62c2fd35d37b8f4d16bac850734c080a0b1bbd68f5723c7b231e2b2e4477edda25dece8b9f7bce76d4fb1d775a6a5c37b5228b9d050fd168d887f78d929ae07d
+EBUILD glib-networking-2.60.3.ebuild 1769 BLAKE2B e2d645fcd5ef3baf61253a4b1663ae2c0b6f5516391cb179f1219c2a166d00fca3a1ea5e1ee30e50bf85c5a8d4e3ef6906caa653edfeec916b10c9b422eb2fc9 SHA512 89a79ddd49eeebd6adb9b09e0706ac39c77f079c847a9311039c50290f1c60e0c47f2e3c6e8f186874a9d875dc18cb0ddd2ca471ba51d9e9350e88fdd485e874
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.60.3.ebuild b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
index 8d703fcf458d..3840bd352f93 100644
--- a/net-libs/glib-networking/glib-networking-2.60.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl 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"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index f306dff1f47e..a96c40a43d67 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,5 +1,5 @@
 DIST gloox-1.0.21.tar.bz2 716449 BLAKE2B 9728b137b088e3ebd067dd88688474e37ec27108cc87ffe6d2d78b206c3215f36c072e333d04c659e5dc9db43c330bcac7ee7f495208bd8df1bbeb72db1e0792 SHA512 ee2c180e6a6e05955707fdd3e790c4c0e7be46fdf071201abd081b8620e3f664045f000804e1a30bddf8a3324e90f211ce5ee870fd5330ab87979dedfeb45575
 DIST gloox-1.0.22.tar.bz2 722653 BLAKE2B e029930ae51053772d4f7bb0cb0933cb260aacc571a6fab6b78c0e12cb7e119938c742afcc0e1af037a97c293f03b423a626c9b01dc9ce974b922c7e9054bcf2 SHA512 89b51dbee338ef8b234d934a5536a2e5d83d8121fa624e933b63bd15017d60f941781a1045884d0d125f50370ed7857cf4131242d39f6703e72c9cf064691416
 EBUILD gloox-1.0.21.ebuild 1134 BLAKE2B 65f284fc562483195e09f8412d88876c602cc6ea25750eda6e32a3abc183e522c8427b1e5e62099aeb2d038f3bb60998f9cf249bfd879aab85c73168c6b64f04 SHA512 4a9d5d47ac2a3ec2ad0e103183b8d64f665100859bfa556c55adc659401141c6d84f84014e77a603858ce5b6cc876663f97494e0b1bde3595a642a9c26824d82
-EBUILD gloox-1.0.22.ebuild 1113 BLAKE2B d7b994f6f248369cf8dbd2a4c3e935767f882670853530f9cc420fdcd60840870dbbab682ec8d61119cb446753846618a37527c8c2023b2b537a722d2b94ffb9 SHA512 df8c47a00f308936c1a9049e98a00e1fa9802b6cfe866f40ea6187d184c483af369118845cfdfe85fe03ec07d8555eb100fe186015ebdf0d47d8e05b1ac1ef59
+EBUILD gloox-1.0.22.ebuild 1117 BLAKE2B cfe30d6bac3e249c88e6825390c504405eaaea78442359d4297c6a0a3cc4f167dd5c1eae12c6d34856a833b4a83247c16123e740b637dd2e7bc6b6c546c16492 SHA512 37ee7375502d50d168b2f79b4d8656424094741fe11c6c9b8d50ea8512fdd0218516c2644d57bbfe6aef4cfdd2f635539bae2c9add09a3cf0f2a0addb279893e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/gloox/gloox-1.0.22.ebuild b/net-libs/gloox/gloox-1.0.22.ebuild
index 2f7e2ca6f205..bf7eb1980c80 100644
--- a/net-libs/gloox/gloox-1.0.22.ebuild
+++ b/net-libs/gloox/gloox-1.0.22.ebuild
@@ -16,8 +16,8 @@ IUSE="debug gnutls idn libressl ssl static-libs test zlib"
 DEPEND="idn? ( net-dns/libidn:= )
 	gnutls? ( net-libs/gnutls )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 	)
 	zlib? ( sys-libs/zlib )"
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index a9b8c46bc629..2dd99e40d363 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,3 +1,5 @@
 DIST gnutls-3.6.7.tar.xz 8153728 BLAKE2B 993a45edff335e75f36de27373d5db01094c81ebc5eb13d9e04a01f7f32ce6189f71f05a18c90c2e57aec688750e917ee948261726acdd7752d9d7d42a9c7ac2 SHA512 ae9b8996eb9b7269d28213f0aca3a4a17890ba8d47e3dc3b8e754ab8e2b4251e9412aaaa161a8bf56167f04cc169b4cada46f55a7bde92b955eb36cd717a99f3
+DIST gnutls-3.6.9.tar.xz 5773928 BLAKE2B 9dd7678fd7ea9f170816358a6ac385193fe4db8052e7a35d553e18e8618ea88aeed2b618b288f98f2f480cafd560d46de04234808560a8ec18028574bf26b706 SHA512 a9fd0f4edae4c081d5c539ba2e5574a4d7294bc00c5c73ea25ce26cb7fd126299c2842a282d45ef5cf0544108f27066e587df28776bc7915143d190d7d5b9d07
 EBUILD gnutls-3.6.7.ebuild 3908 BLAKE2B 4dbb2c896f38322dabb73e14629612fc1b3f2652db58461c0444380e24b5bb1a050b5d62d58e17e583bf17875ff58124d74fb392fe6b3b31cdf81128ba596a92 SHA512 e1aefd74b5a3bc2da84b1dbd7ef3315706ad6dfff6b5a20015c00a92458918645e6791163b03d8f1ed92dc525875c42f6646c40de5121650a0ef235822b70bfa
+EBUILD gnutls-3.6.9.ebuild 3928 BLAKE2B fac7d7e13b3ac5c53d600d9db5c5202d7296ecfa3a9e64e6d22eb8b723699256336374e5d365aed08c3b066957bef80e077cc74cf9fadfd0dd11ef3225c132f7 SHA512 baf3f6f4812963bc6e373d877c3a576c016588f986451084077a16a9fde8228549ae72e0219dcd4a60ae121f0d67a56dc2d0ba5bcacf40569d4d3aaaefb8c1e2
 MISC metadata.xml 1194 BLAKE2B 2f5c69b9b4ed31a5bf470451931963cac503fa11a8d3d575279d2b8002ed5b7d5bfdb4ca2f141b1f2d7c8f802d2d51ea9de0875d4f9dcdd7febcef200cb8a932 SHA512 fefa4338d539e248747ef69447b20b7d5b70fd814bd9daee6a659f09888c7ff90dfa6bfa1d8778383cf14fbd3b0bd919bdccac2f5adc9b2d2decb00211325b0d
diff --git a/net-libs/gnutls/gnutls-3.6.9.ebuild b/net-libs/gnutls/gnutls-3.6.9.ebuild
new file mode 100644
index 000000000000..a70df5748a11
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.6.9.ebuild
@@ -0,0 +1,127 @@
+# 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 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+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
+}
+
+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 "${ED}" -type f -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 dd3c4c29b601..070c174d5825 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,8 +1,11 @@
 AUX gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch 614 BLAKE2B b54c19d6a465c71d3f7e4ac42ccc0add193b4b50b0047450583ee7c22d652b620e72f218ec5f87048331bd61e232b5ad1d2298f1ffdc17079ccdcf1d8f300aae SHA512 7a63d83db669ea0eba5dd43fb7a65e8a8b6bf6d397bf3884ab84eb5661f2b4fb0f19a9aead2851772d3d84e6b2ec470b67a2589f82fa28f7a27cb9b59d7890d8
 AUX gsoap-2.8.70-parallel.patch 229 BLAKE2B 2fb3b972b8201dae35911065df1b7555cbe6dd7bb1dc933216a1770accc94c2d1ef02fe6a3ad7643cb7d748a54e55e9ba3591d48f107485c9b9e4306763f2634 SHA512 d49527ae34788f8bc1a74c9a59890bdc13eb343fb3293fcc756b7dd7259cc7cd544bafc58a0c271cf7268b0a9c986db36e587fdc7fcc520ea05ab559e292649e
 AUX gsoap-2.8.70-shared_libs.patch 6177 BLAKE2B d599e56a83a3dec5dc0e6470531081af3a5d5778f3ba7f231e41d4b95a8fbffe2f94ab41b422cff21df3c25dbe5976da4da0626735fe84877407a6f0fa925247 SHA512 46cc3733f1b25c3c5ac81ff340b4254d29bdd8c93f5cc4cb5aad4a997e253aed513eb466070ae1697a308fba5cf2bb22bdda0c04eecd0979debe2b38c68fab83
+AUX gsoap-2.8.91-shared_libs.patch 6463 BLAKE2B 7d31673c56e53b146b8cc8f1ed9403a574b1a1c16aca169e1811ad822a9f389693d7e93821920366c3fe41e01ae15282a87795c68a1176de07f76e8e55c5af38 SHA512 2fc865443e6da4d9426f2b6cbded9ce0d31b47df37bed6f0a12ac715d1a4e4de4d53bc4df612275d8f42d7fcc9ad00fbdee3109ec073edd8760af4676f792d09
 DIST gsoap_2.8.84.zip 32538551 BLAKE2B cab2b75ac931ee6063af47975665f45514cb94f5514fb1f76d17ccb2e71d64d4ebd43543cc004ff7f5c49982975ebaa38e555e3bc45dbc370aae991bc7639273 SHA512 ec050119cd3e480b266cad36823f4862fe0ac21045ce901c3c91a552eae2fbf9e1cd515458835807cce54c04df7835a980a299d37f418190cd57684fd6bdcf79
 DIST gsoap_2.8.87.zip 32545316 BLAKE2B c2d0f9fafdfa9de83ea35f8dfc88e23d9d80967a2e58c30d554d539fd93056d7a8eb00ea9c928c6cf786e4888eb9f942ba4574e343de0c0104fce8b270494d6a SHA512 638bf9b2b8aca5facba518f136ad5af5bda41f2b92ee345ee6989d73223a571ce5ddab23c0b65259e9fd524039250d861defc8cfc2fc0a366a578ce3629b9ca4
+DIST gsoap_2.8.91.zip 32553307 BLAKE2B 463c2d9c2d56c2a09fa8c9ebea7fa8059ed050cff81780b04a1a47ee1f016e385e6eb338ca740a40cd0c9483b4e10cf0963d02c52d6020863ce015e2f9cf2024 SHA512 ed99f1a20fd95edc7f24cf55454ee057b8c88d2e5b5b153b61c44c57bf4d92fb65ed557e9cb9ea89e3fa8939689c0e30791cebdb91b837482ec8ec13ae281abc
 EBUILD gsoap-2.8.84.ebuild 1787 BLAKE2B b884b325f98f664ffe0955f35d818b323e50f33aa961720932b1e36512b97bd7e20006fc34eefb32c7d6f7b0b3e6fe8840c97ccc101deec93099d204aeaafaaa SHA512 890dd89c7b7eafde95caa5eb6a251801ce2a441bfbf6f392ba0cf6fcf2bb0cf17108c7cc57f14c66f070f490752bc85d00cbe7932ac3a00be98634569ddf7a02
 EBUILD gsoap-2.8.87.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
+EBUILD gsoap-2.8.91.ebuild 1789 BLAKE2B 7824109745720d612b99444bd4d1ce1b83f701575fd8948e73b96ad5706ad405e21087a09477af436959e2a404ed52e38ba34e31fe21534a3642bbb569277bb2 SHA512 1738a71853f66115688a6b3f2595c50091946a0936aff86840436b4ae7f7fe2283640da51d28562132e8f1e53d68e86f2379c82340623e34527255b25ba6e3b0
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/files/gsoap-2.8.91-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.91-shared_libs.patch
new file mode 100644
index 000000000000..1fcdeeb69844
--- /dev/null
+++ b/net-libs/gsoap/files/gsoap-2.8.91-shared_libs.patch
@@ -0,0 +1,142 @@
+--- gsoap-2.8/configure.ac
++++ gsoap-2.8/configure.ac
+@@ -17,7 +17,7 @@
+ AC_PROG_YACC
+ AC_PROG_CPP
+ AC_PROG_RANLIB
+-#AM_PROG_LIBTOOL
++AM_PROG_LIBTOOL
+ AC_PROG_LN_S
+ AC_PROG_AWK
+ AC_PROG_INSTALL
+@@ -307,15 +307,17 @@
+     WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
+     SAMPLE_INCLUDES=
+     SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
+-    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
++    WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
++    WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
+   else
+     AC_MSG_RESULT(no)
+     WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
+     # compile with wsdl2h when OPENSSL is available
+-    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz"
++    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lcrypto"
+     SAMPLE_INCLUDES=
+     SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
+-    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
++    WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
++    WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
+   fi
+   if test -n "$ZLIB"; then
+     WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}"
+@@ -334,7 +336,8 @@
+   WSDL2H_EXTRA_FLAGS=
+   SAMPLE_SSL_LIBS=
+   SAMPLE_INCLUDES=
+-  WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
++  WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a"
++  WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
+ fi
+ AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes")
+ AC_SUBST(WITH_OPENSSL)
+@@ -342,7 +345,8 @@
+ AC_SUBST(WSDL2H_EXTRA_LIBS)
+ AC_SUBST(SAMPLE_INCLUDES)
+ AC_SUBST(SAMPLE_SSL_LIBS)
+-AC_SUBST(WSDL2H_SOAP_CPP_LIB)
++AC_SUBST(WSDL2H_SOAP_CPP_SHARED_LIB)
++AC_SUBST(WSDL2H_SOAP_CPP_STATIC_LIB)
+ 
+ # enable the compile of the samples
+ AC_ARG_ENABLE(samples,
+--- gsoap-2.8/gsoap/Makefile.am
++++ gsoap-2.8/gsoap/Makefile.am
+@@ -49,6 +49,29 @@
+ libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
+ libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+ 
++lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
++SOVERSION = 0
++libgsoap_la_SOURCES = stdsoap2.c dom.c
++libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
++libgsoap_la_LDFLAGS = -version-info $(SOVERSION)
++libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
++libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
++libgsoap___la_LDFLAGS = -version-info $(SOVERSION)
++libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c
++libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
++libgsoapck_la_LDFLAGS = -version-info $(SOVERSION)
++libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
++libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
++libgsoapck___la_LDFLAGS = -version-info $(SOVERSION)
++libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c
++libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
++libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION)
++libgsoapssl_la_LIBADD = -lssl -lcrypto -lz
++libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
++libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
++libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION)
++libgsoapssl___la_LIBADD = -lssl -lcrypto -lz
++
+ BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
+ 
+ include_HEADERS = stdsoap2.h
+--- gsoap-2.8/gsoap/samples/autotest/Makefile.am
++++ gsoap-2.8/gsoap/samples/autotest/Makefile.am
+@@ -14,7 +14,7 @@
+ WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl
+ SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h
+ SOAP_CPP_SRC=soapC.cpp soapServer.cpp
+-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
+ 
+ $(SOAP_CPP_SRC) : $(WSDLINPUT)
+ 	$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
+@@ -40,6 +40,6 @@
+ autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
+ autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
+ autotest_SOURCES=$(SOAP_CPP_SRC) soapTester.cpp duration.cpp long_time.cpp struct_tm.cpp struct_tm_date.cpp
+-autotest_LDADD=$(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
++autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS)
+ 
+ CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap
+--- gsoap-2.8/gsoap/samples/databinding/Makefile.am
++++ gsoap-2.8/gsoap/samples/databinding/Makefile.am
+@@ -14,7 +14,7 @@
+ WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd
+ SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h
+ SOAP_CPP_SRC=addressC.cpp
+-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
+ 
+ $(SOAP_CPP_SRC) : $(WSDLINPUT)
+ 	$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
+@@ -28,6 +28,6 @@
+ address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
+ address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
+ address_SOURCES=$(SOAP_CPP_SRC) address.cpp
+-address_LDADD=$(SOAP_CPP_LIB)
++address_LDADD=$(SOAP_CPP_SHARED_LIB)
+ 
+ CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap
+--- gsoap-2.8/gsoap/wsdl/Makefile.am
++++ gsoap-2.8/gsoap/wsdl/Makefile.am
+@@ -10,7 +10,7 @@
+ AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
+ AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
+ SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT)
+-SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB)
++SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_SHARED_LIB)
+ SOAP_CPP_SRC=wsdlC.cpp
+ SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h
+ SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import
+@@ -29,7 +29,7 @@
+ wsdl2h_CXXFLAGS=$(C_DEBUG_FLAGS) $(SOAPCPP2_INCLUDE_XLOCALE) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH)
+ wsdl2h_CPPFLAGS=$(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform)
+ wsdl2h_SOURCES=wsdl2h.cpp wsdl.cpp wadl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC)
+-wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS)
++wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS)
+ if WITH_OPENSSL
+ wsdl2h_SOURCES+=$(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c
+ wsdl2h_LDADD+=-lpthread
diff --git a/net-libs/gsoap/gsoap-2.8.91.ebuild b/net-libs/gsoap/gsoap-2.8.91.ebuild
new file mode 100644
index 000000000000..edad97594bbc
--- /dev/null
+++ b/net-libs/gsoap/gsoap-2.8.91.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}-2.8"
+
+DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
+HOMEPAGE="http://gsoap2.sourceforge.net"
+SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
+
+LICENSE="GPL-2 gSOAP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug examples ipv6 libressl gnutls +ssl"
+
+RDEPEND="
+	sys-libs/zlib
+	gnutls? ( net-libs/gnutls )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	sys-devel/flex
+	sys-devel/bison
+"
+
+PATCHES=(
+	# Fix Pre-ISO headers
+	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
+
+	# enable shared libs https://bugs.gentoo.org/583398
+	"${FILESDIR}/${PN}-2.8.91-shared_libs.patch"
+
+	# Fix parallel make
+	"${FILESDIR}/${PN}-2.8.70-parallel.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# Don't include xlocale.h as it got removed in >=glibc-2.26
+		--disable-xlocale
+		$(use_enable debug)
+		$(use_enable examples samples)
+		$(usex gnutls --enable-gnutls '')
+		$(usex ipv6 --enable-ipv6 '')
+		$(usex ssl '' --disable-ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# yes, we also install the license-file since
+	# it contains info about how to apply the licenses
+	dodoc *.txt
+
+	docinto html
+	dodoc changelog.md
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	if use examples; then
+		rm -r gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
+		insinto /usr/share/doc/${PF}/examples
+		doins -r gsoap/samples/*
+	fi
+
+	if use doc; then
+		docinto html
+		dodoc -r gsoap/doc/*
+	fi
+}
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 43976d3339d9..cc682f4a8cb3 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,3 +1,5 @@
 DIST gupnp-1.0.3.tar.xz 422912 BLAKE2B 900a2a81982a50239b26ddd5df3f57caac1ee66103e857b9014db7dc694e303c1eaa0633cb467887f3370e97058abc221bd0175c9df11ca4af31e3f802145a66 SHA512 f256757ddf1a31f1dc93dc138401329e40aa063e7452dccaabe53682eebcb1b98cb6429c01d806290587ca9d01d91afce0603627d2d8675ddb68ef919efb6448
+DIST gupnp-1.0.4.tar.xz 427616 BLAKE2B ab5d34e701e253dc48ebafabc908f9aacd7a325805c61b11b5668cfa105d56a37f0d93593eeedd0e63630b986f2a2c18d4d9cdd82b653c9cc7a5d57262a819ef SHA512 54a133ce043e9b3d5ea23041c04fbbf5483aea98a72421cdb59bada0ab2e3ab3fc85452c4c743b794eeb7c929f5ef38bf0e6ba7f9539d86182a77612c898205a
 EBUILD gupnp-1.0.3.ebuild 1948 BLAKE2B c7515e47821d5e385d21f507a241f15b320645d88d94e3bb8cfd91574c40dcff36d52b412663723cfce4d59324034fd60de31175b0dbd878a41d0d184fc25c1a SHA512 495086fb7212e0f4bb864eefe84e6d895d9dba1939bf43f9a001deacb5389eb4dea136ccc39a469683d6a36e8e0b98d05ecece38e825ff1a395ac829ba84635d
+EBUILD gupnp-1.0.4.ebuild 1953 BLAKE2B 1fc828d6d3ec967d2a6564d56547514dbb4f2de42caad06cd75ce63e0f083a24cb53d0c2c319b52f5548b56063109d46c78b1d2c4e07d9bc1dec9f047e54327e SHA512 32be26a800256a06e27b3dc2e9aca20bd9836fc1ee5b58587aeb2f393fa2cd6e0850cc852fd4aee1a9fba068bbb0753eef7c489e2fe797e3c469ba054d9d568c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.0.4.ebuild b/net-libs/gupnp/gupnp-1.0.4.ebuild
new file mode 100644
index 000000000000..6e5cf8b99539
--- /dev/null
+++ b/net-libs/gupnp/gupnp-1.0.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 multilib-minimal python-single-r1 vala
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="connman +introspection kernel_linux networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( connman networkmanager )
+"
+
+# prefix: uuid dependency can be adapted to non-linux platforms
+RDEPEND="${PYTHON_DEPS}
+	>=net-libs/gssdp-0.14.15:0=[introspection?,${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+	introspection? (
+			>=dev-libs/gobject-introspection-1.36:=
+			$(vala_depend) )
+	connman? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	networkmanager? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	!net-libs/gupnp-vala
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	sys-devel/gettext
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local backend=unix
+	use kernel_linux && backend=linux
+	use connman && backend=connman
+	use networkmanager && backend=network-manager
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(multilib_native_use_enable introspection) \
+		--disable-static \
+		--with-context-manager=${backend}
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool
+}
diff --git a/net-libs/kdav2/Manifest b/net-libs/kdav2/Manifest
index 12eb5aefc241..7469abaf8ea5 100644
--- a/net-libs/kdav2/Manifest
+++ b/net-libs/kdav2/Manifest
@@ -1,4 +1,6 @@
 AUX kdav2-0.2.0-qt-5.11.patch 209 BLAKE2B eb03b7877db105894d19d0a597c112f760b68a4d556762b8101f10cb8203a1fd0d417f124065cf0d9dfc1c3f40f5201c8e86bc083073acb3e65bc1ce21f863e0 SHA512 1e7ad2451b709b9c8fc301f4f7975dd725b02ae3f8640b1e172a8ff3fc21e91c62ea892ff42ae298331b20a01f967cfcf047955f87b38082a02553e6314a01d1
 DIST kdav2-0.2.0.tar.xz 49440 BLAKE2B 965f38b854f8aa95b907fbde136fbffdfdf47690e7816cc6a5e3d8014b97a57bad991a0a1aa488a855065eeba50bd7bb73f25ac05ccc9dedee563044da293519 SHA512 ef2510ae36a8e5be0903eb7e576c0f62c5e17d36cb42a9e6f07bb8d06f2e2a46354cf10256509f7c252e58f281f5e32e1c9dae682c421ac96941b7785df6a6a3
+DIST kdav2-0.3.0.tar.xz 48764 BLAKE2B 0e904f41cbe7b88667ed2dee5e23815fc9cf5fddf77493bb6c947703e001a215b2b47c302cf1570002d273ca06d9dd219a3c488c85609e4f7a3da7aa4f57412f SHA512 19060bdd28720b5477ced627d441411b7f594a025bb574196d011b946074ac472819b1673028e082f76f01d3038d3ee4acb438223a3aa6a657a5b8cddd1026d6
 EBUILD kdav2-0.2.0.ebuild 691 BLAKE2B 475dcd189e498b2ca3e2489835c46310ff1b212831bbeff5b50fc91f7bf72d67ca1448ea617d1b9200f44f6a5b6f9338732ff44eeafd81b76bce21610059b0ea SHA512 92393d08ed4e2354715aecc5f412bc598ad29cf6325972ac9f137fd1e1d4cd185fbb14b51ad2fd25595f22025b6bfd75ca7e5fa3b928beac806148caf0ec3854
+EBUILD kdav2-0.3.0.ebuild 645 BLAKE2B 541b690a8ceaf9ebb36baa1aabe4a874314e008e900c2c686cadda08b725ca0030631d1af26b6f36eeb7492d4b6e44303b5506e97de200914377a9b6a2a59009 SHA512 df2778bbb43ec9c14d61790bbd785396160b3d594548789a16cdd03967ccd5813383c09b2a33e9110a7b06ba2dac1bbd2046c0adb98debfb31406c12f80d3efa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kdav2/kdav2-0.3.0.ebuild b/net-libs/kdav2/kdav2-0.3.0.ebuild
new file mode 100644
index 000000000000..d379a6565453
--- /dev/null
+++ b/net-libs/kdav2/kdav2-0.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KJob based DAV protocol implementation"
+SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# disable tests requiring net access, bug #680952
+	local myctestargs=(
+		-E "(kdav2-davcollectionfetchjob|kdav2-davcollectioncreatejob)"
+	)
+
+	kde5_src_test
+}
diff --git a/net-libs/kimap2/Manifest b/net-libs/kimap2/Manifest
index 7497ff9fbf1c..0e4686a13330 100644
--- a/net-libs/kimap2/Manifest
+++ b/net-libs/kimap2/Manifest
@@ -1,3 +1,5 @@
 DIST kimap2-0.2.0.tar.xz 91624 BLAKE2B 37065978c80739415a7b0acc9491b3344865d452c65e50cde5941fa45bf5c2423cf5389d85b46f229e28adb644f8ed12bab8af9c8cbe50ecfffa5b88fd30435a SHA512 33258217767cec2f0a3b7f47d733701fb90239b32ae8ae96bcac4215b059e7ab245d4c151e18f924c13f5a7bbfc890ecac6ccdccc40c91e008e44b67c322a8d4
+DIST kimap2-0.3.0.tar.xz 91948 BLAKE2B 95bc03eb7a5d99525a897327e6e12d46bc5fecbcfb521ad91645db8b531a1cd3f7e3125b6ceee412f6e2a53bed9b75e4993f6267722d23976f50fd711481b631 SHA512 a351fbd8a2c532a963d488c64fc497d05be3521fb2ddf2d942a9c2ebc6a76068f509c283c6335dee03c9ff1a6df294fa69b2033874d33dc6a860b70e1d4e973a
 EBUILD kimap2-0.2.0-r1.ebuild 506 BLAKE2B 3f39699cff1d1eb960a4f07441d0af211bdbdec5a12aeed0223a4561522097f3a8b609c66b17ad52d3985692b5faffa12bf57cba782b63ebe7ac71566e9c500f SHA512 559c52241787d7f14cf289802dc41dcd4104d23cd1ba3fbfe038ddcc3697986167016b666d5e4c73ef0e56ebd9e2d3c40fffb15a7cf538b779478c3176ebd18f
+EBUILD kimap2-0.3.0.ebuild 506 BLAKE2B 3f39699cff1d1eb960a4f07441d0af211bdbdec5a12aeed0223a4561522097f3a8b609c66b17ad52d3985692b5faffa12bf57cba782b63ebe7ac71566e9c500f SHA512 559c52241787d7f14cf289802dc41dcd4104d23cd1ba3fbfe038ddcc3697986167016b666d5e4c73ef0e56ebd9e2d3c40fffb15a7cf538b779478c3176ebd18f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/kimap2/kimap2-0.3.0.ebuild b/net-libs/kimap2/kimap2-0.3.0.ebuild
new file mode 100644
index 000000000000..87ebec633722
--- /dev/null
+++ b/net-libs/kimap2/kimap2-0.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde5
+
+DESCRIPTION="Library for interacting with IMAP servers - successor of kimap"
+SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtnetwork 'ssl')
+	dev-libs/cyrus-sasl:2
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index 4fa4ca6276dc..0e89ce8f4d33 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1,5 +1,5 @@
 DIST libaccounts-glib-1.23.tar.gz 127931 BLAKE2B 2379786bb4a658eaba632a1788782a0b5620e69fa058e991a41feeedf5b8f4786592077f237513fde9ed4ea00db015a7dd0be6ad852c265a5b7f8b1180ac01e4 SHA512 88fec1fed7a135375516363e4b7f1330d45a6337bbfb45dd35dabce87097ee4e550e968870541e1b496c2ee3db1bd26e0665f4155f1e64d1cc7b6b74d5b71b5c
 DIST libaccounts-glib-1.24.tar.gz 116578 BLAKE2B d3569ee9d4b92f285f20ab7bc285c62c9817a16f632ad9da83a86ab69e7e3ded74afbcb1307deee788a74796372c0011563ecd293cba4b0e81d15252eae4cf50 SHA512 d4e6906f642c7a196cb42172f31345f58037d528950bee3af2b8cb388aea386056cbaa22f0e7c604a4e00038b231e9ee455f6a1d48f82344cfc0037ad7251b7c
 EBUILD libaccounts-glib-1.23.ebuild 855 BLAKE2B 79ed3efe8e876ffc020b9264552228f56d3a7f2794f19275f18d8c45b1956042caf8103fe7fbf1aff5723945a03351fe44b502aac825988087e4e7076107e21d SHA512 ca131867785ab6b6cde4bf8b88c2460fb40b555c4a987cf4f67bb79c9a7d4ae65bdf91aa2583029b98f413bf446aa76a226b55da579bf49b0bb91be41135c162
-EBUILD libaccounts-glib-1.24-r1.ebuild 1191 BLAKE2B 4c969bd411b5d92ec658dfb864ac6609a5754860713b6f49341177bee94580669be60281cc13f931d84700833c100b901b39fdab36e88db04c4ce134a745a3ed SHA512 866c8631bd8fe4128e7f99cf54f88938e4d04a8161fafc9e57c514310523cb2b3344d02b7ca81395f192b9c62bbf5284e3d70e597330c52e41b74af20fa018f3
+EBUILD libaccounts-glib-1.24-r1.ebuild 1217 BLAKE2B b6ab737f6f4e8457a3a5487be1fdbb99473a887a5c3d0206732037b78735f7b814c4272495a84a5ff4a045faee913d2e449668ddb5354e08f744d217414e5574 SHA512 48844d8f1a2f8fa39b6a0d66fba49b7e6f01e39c61e47dcf4ec1fe5f6216b6f7f0f34af36a3d78b6956099477f9d516c58526c05070e3f4fdd437ba5bee3c17c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.24-r1.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.24-r1.ebuild
index b1f40ae0f6ab..c7d039a2bf1f 100644
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.24-r1.ebuild
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.24-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VER
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -27,6 +27,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	$(vala_depend)
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	dev-libs/check
@@ -39,7 +40,7 @@ RESTRICT="test"
 src_prepare() {
 	default
 
-	vala_src_prepare
+	vala_src_prepare --ignore-use
 
 	use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die
 }
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 3d3e458a3bf9..55084634a242 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,4 +1,6 @@
 AUX libktorrent-2.1-unused-link.patch 649 BLAKE2B 246274feed30df570ba174699b48c702a9b77bbbdda66d7ae44fa0a83993a007897ed2cc9193a4ddd8aba6c8ddc4b1319694246c0bb6bae94bf4dfc4c1591588 SHA512 94f2663bef9c5d31ebdc69538a4dc80b17b9f6835c4975f5b52f13a6bc03ba526b50ee91e1b4515c426e80e95e64f41e8d38980585638a4eb15c328e37fe6ac4
+DIST libktorrent-2.1.1.tar.xz 357516 BLAKE2B 8bcec166fa1d4f09b72c4f31c771d5316f7411da538b789b111b641c8ba551d9c88bd1d68d8ad96396e125bb6b16f9d4e2a42a6b2166b40572d730d692d3cf5d SHA512 5c7f0218193cae148b03ae86a886b89d08a46200755728468ef271a6201add88eca617898d486d1823699def282d0251e26e3b28d2642f45cab966c286127d37
 DIST libktorrent-2.1.tar.xz 355476 BLAKE2B c86205174ac0526455cc9d2049cd918fa1127e85ca18422823f89c3714950d6e4f606dabbeca4d615a17fc18d8032ef0cf86aa4d80726116ea667d9f257e0ddc SHA512 28d7a4b8ee45ddcbadb3ca9d6e568120803081b0ecd3e9436ed721860717b98538c522653ea47975123f0819548d0cabe1973baffed887fcbbca11d84ea5ebe4
 EBUILD libktorrent-2.1-r2.ebuild 1355 BLAKE2B 6b8e1600b6c8eeb8d447166aeac2310cfc3de7b3ec50df02a087bc8306ed53ef6cb21a9dfb453a136c86ff85d87794db6ac06f17b87edceb6cb731f08f58ab64 SHA512 e11dd93dd788c50b93871d3c1bc8c34fd13bbc3db041933b31a0ab29c3b22f412e31186b977e5347e23b65f04620954e425edfda08302bc09b1122f07b3a2771
+EBUILD libktorrent-2.1.1.ebuild 1348 BLAKE2B e2e563a158b9be304a206f6359d7965b367d238893b979bc65b257a216ce253fb61e1b5785c530104ea752b79eac80988758b33eb7adac86adf6525e35d79e7d SHA512 22e76136f24c9783b6a0948d6bf7dd3504d9cdfabed4e14acb5d733e1eeac747867982c9c36e94da1add7bf63ca316b8500454691a9469ad21d672fea7d97154
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/libktorrent-2.1.1.ebuild b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
new file mode 100644
index 000000000000..d9c041e72e83
--- /dev/null
+++ b/net-libs/libktorrent/libktorrent-2.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="BitTorrent library based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
+SRC_URI="mirror://kde/stable/ktorrent/5.1.2/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="sys-devel/gettext"
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtxml)
+	app-crypt/qca:2[qt5(+)]
+	>=dev-libs/gmp-6.0.0a:0=
+	dev-libs/libgcrypt:0=
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-libs/botan[gmp(-)]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2.1-unused-link.patch" ) # git master
+
+src_prepare() {
+	kde5_src_prepare
+
+	# Gentoo workaround because gmp.h in MULTILIB_WRAPPED_HEADERS is breaking this
+	sed -i -e "/^find_package/ s/\"\${LibGMP_MIN_VERSION}\" //" \
+		CMakeLists.txt || die
+	sed -i -e "/^find_dependency/ s/ \"@LibGMP_MIN_VERSION@\"//" \
+		KF5TorrentConfig.cmake.in || die
+}
+
+src_test() {
+	# failing network tests
+	local myctestargs=(
+		-E "(fin|packetloss|send|transmit)"
+	)
+
+	kde5_src_test
+}
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 1bbc3c97d631..f3b0e67988ad 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -4,6 +4,6 @@ DIST libmicrohttpd-0.9.65.tar.gz 1633346 BLAKE2B ce6ba2b6c52e30194872c66ab5b9e35
 DIST libmicrohttpd-0.9.66.tar.gz 1877096 BLAKE2B 4788fa63b0438e250264852f291a7661ee64f4116cbe95eec0902a47115721040a9259acb9c3385d833364f9b27695a90a2cedc516a35ee89125e0852d545579 SHA512 59cc56a9511d9d1c05647a57d920a16d0aaa0d0523d0241ceb88641d18bd95fdb3bb5a60fd648ac54a6f4323a673a3145e520a2fe9e124e78973ff6dac3ad89a
 EBUILD libmicrohttpd-0.9.63.ebuild 1264 BLAKE2B 6cd0a690a3f344e6e6fd60cb7c7601f1c5abf9f8fcbcc4fc81e2b4b730ae037afda530e984318c7cdba26d6126f22f11d2747a56194047eacd69e86cf181abf4 SHA512 eac1917a4193109502a487008b23405a4f11acb437e87f3b444d328b41f228c5e3a08f78aa11b71d6471b64df294e594b5f56e1e64ef6b2abae49c0acd235cfb
 EBUILD libmicrohttpd-0.9.64.ebuild 1272 BLAKE2B fa49ca2d92a50f4b171c6bdb1d833f0e4be13eefee103ab909ba0b026d0c240f66ab9d3c7079dce074f46a91b4ca2f0fad44ae7e887532b53dd8f7c38f155817 SHA512 c1bec32dcea42c581d7424e42942f62d5dcb60654fafa75bcdaa96038057c31e5f33b21c858f79296cecb2b3d7f4a0d691b740ef9a8ae0088c2c523d1a971385
-EBUILD libmicrohttpd-0.9.65.ebuild 1265 BLAKE2B f7d4938f65f06992fe3b80dbbd21bf32044c889d3c57e0397b3b46feeb94abe0a6c1bd2401cb60a2a3d012ef11f324f01304ea9b85a5e317fbe800c0011df022 SHA512 105eaf15059b0c11f6d94cd33f52501693570b89f25ac24e2837028522cb046f70ad851fcb3e72718482e8d6b9dbd8fa97cc942fa2b954403ace074e61239ad0
+EBUILD libmicrohttpd-0.9.65.ebuild 1264 BLAKE2B 6cd0a690a3f344e6e6fd60cb7c7601f1c5abf9f8fcbcc4fc81e2b4b730ae037afda530e984318c7cdba26d6126f22f11d2747a56194047eacd69e86cf181abf4 SHA512 eac1917a4193109502a487008b23405a4f11acb437e87f3b444d328b41f228c5e3a08f78aa11b71d6471b64df294e594b5f56e1e64ef6b2abae49c0acd235cfb
 EBUILD libmicrohttpd-0.9.66.ebuild 1272 BLAKE2B fa49ca2d92a50f4b171c6bdb1d833f0e4be13eefee103ab909ba0b026d0c240f66ab9d3c7079dce074f46a91b4ca2f0fad44ae7e887532b53dd8f7c38f155817 SHA512 c1bec32dcea42c581d7424e42942f62d5dcb60654fafa75bcdaa96038057c31e5f33b21c858f79296cecb2b3d7f4a0d691b740ef9a8ae0088c2c523d1a971385
 MISC metadata.xml 372 BLAKE2B d180fcd5efefd2e3578a0c24eceab503d896a3b194a15d3966bb2ccf4bc2bb4734951824b8f85b22f7a7dde6ca17b2e17026cd182788f2055f7cc37b9429032e SHA512 dfa7081c0ae502a60c5b86d7fb2aab3a23f77b08d0e638686fddba3e7976c917dd2392ba150365ffa411f2fcdd10483856b051bf1ee0ac519b74ce7b2672a8d7
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
index 57c0c3aef473..328d70812508 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 2176c5569ea7..ead5db3afcfd 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,3 +1,5 @@
 DIST libnftnl-1.1.3.tar.bz2 366521 BLAKE2B 9a46a46b68fd6d3e0ffc3d28713ee9a70017dd4d05763a49a655f172ae77928d9b54554e7609851f3a18e9465c53f53c1828311162013bc067493e4e02ff3fb8 SHA512 3fb96ea1a8bc9eb00fa2cf79f64cc9613250e8b97de6e90e440c7c44e92789e7c7fd603b7347bb02d9d74af725cf8fde5d2e435c5ffdcb784316c67b83ddf0fe
-EBUILD libnftnl-1.1.3.ebuild 1164 BLAKE2B dc02a9509e9ccafa71367c221dadf10fd26b60110fe8eb86ea8f635f52ebcd12631fe875641be64707112a7ab59d43be15f55bb9c2e8578e216bd1478dd20022 SHA512 9b243c291ff51787ec8216701a5ec035fc08f0fb9691c2f2388d86fc539589a37ce52f73b6c5b2c9cd14cd02bc135dd44c96d13ecddbb7f7a7dd6ca6876e0d6f
+DIST libnftnl-1.1.4.tar.bz2 368262 BLAKE2B e5f396b582221b9f9a7d3303d65548e3597474b1cedf931728f3105b04a851eeeeff98fd2a49772f29849a9094c2e0cfef7d500050e8f205565e8dfd1ec7a49d SHA512 6fe248b1340decc1ec8ae40dd0ed60b8d4b819c2f36f2399d39e13e92fc5e6f6ec693b736d6c188bff954afb2bf2dbce67d54a9e664b45f43288b2c5c6cc08f6
+EBUILD libnftnl-1.1.3.ebuild 1163 BLAKE2B aa2bff82edec4ab5e098022db9d9b609cc699674746a88ef6a0f43f60c3b89d957656fd8eca09e12a67885f65fe92d994b708adb747e880de4d9bd735133f849 SHA512 54d1af11abc80e4f39ffb8535957e3a1f9c6b8a90b811979e0c16dbbe4456d3ecf173fb513b7df4d90d38721aa0032379a888e190c5ab53133867ff8adfcf493
+EBUILD libnftnl-1.1.4.ebuild 1172 BLAKE2B 5478337523c2fd1823de78bb5468c4d8d3d3e08836b8233a029eecb793bf0d9ab9b6cac4cf92da9cb6368573ef27aafad436dbd3da8558419291a2291345c820 SHA512 9001a1cb38f4b670afda7432c0315ee5539d9131b4f15c98b23694700c5e950174e7fac29fcc6c298b9fa4c284d58db0736ddb26121e7b5860fd94c6e6351406
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/libnftnl-1.1.3.ebuild b/net-libs/libnftnl/libnftnl-1.1.3.ebuild
index 0be1b2401e8a..713abb6f662c 100644
--- a/net-libs/libnftnl/libnftnl-1.1.3.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/11" # libnftnl.so version
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="examples static-libs test"
 
 RDEPEND=">=net-libs/libmnl-1.0.3"
diff --git a/net-libs/libnftnl/libnftnl-1.1.4.ebuild b/net-libs/libnftnl/libnftnl-1.1.4.ebuild
new file mode 100644
index 000000000000..c7dd0aecc739
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info toolchain-funcs usr-ldscript
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/11" # libnftnl.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples static-libs test"
+
+RDEPEND=">=net-libs/libmnl-1.0.3"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a nftnl
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index a4ce06f043cc..912671aca81f 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -4,13 +4,15 @@ AUX libpcap-1.8.1-darwin.patch 395 BLAKE2B 629e349f4734ed1fd234082abf06eb2b1280c
 AUX libpcap-1.8.1-disable-remote.patch 776 BLAKE2B 085500b64c4f1da871b0ca13115dd95981f96279581908dd5bd779187970c82423531bcbd916955cc3deb1e15b71488adc9dcb5a92207cded6f162d7e137f3a8 SHA512 929243aa68ecf8ee4605fc993a9c64d1b7dba29990765f60a44c158ac7cc8c64f2c06861eae441cf8ee7379ebf3067ba5a2cd2df859212010180e85d2c3c6cd4
 AUX libpcap-1.8.1-libnl.patch 688 BLAKE2B 8f3c68374815f86c894c5fb9d29969bb5b76f757cf7e35e44b4d0021a2b67b3a39b70dd070070fd8a82ab68550e2c60bfbf4eb8a95e6a5c478316eceb398b4ad SHA512 f56a8f4b87c2f9bfb70e2b31b2e4dcb4fb80654b13cf541f9ff42f193cb9bb4e90a3ad9ef7e91c6ebc8667525bfc75ab78b54381d3f1709f10aaf9f48fd3a1f0
 AUX libpcap-1.8.1-usbmon.patch 522 BLAKE2B 27f464db028d8b2cbc1f4651ebb79b7a7042a2a1bdb97e5c1334e64b27cd969ea6a2f8d9d6301e4a4ec48dec2cec0e53cd68c887bbc445ab056a1f603696a34e SHA512 489c2f20e7935e47d478efb1077e3cf3806614651cdbd6312d0378989c71409e870f9d0fb9d496cf00b7076d8d001714c56d0444144eedbab47c6ed3afd3bf90
+AUX libpcap-1.9.0-os.patch 784 BLAKE2B 7b3d493ef9b4ffc62e113c22bd8b0f8e49cc2aa1abf91a98bc3d47114e53dff641ad256705c1a979ec0568d9b8b8ad14f47341d46eb44c945820219cbd39bb13 SHA512 ae64c22c12b812a15fc52f65aa26bf3860be6b5d64d63864dca140f03c6b435f30368447abb21f6ffc52a4e6d8ddf0e3a39ae40d11735e4314ba0829637563b9
+AUX libpcap-1.9.0-pcap-config-includedir.patch 907 BLAKE2B 7d616edbc6bd129bbe73ce1a621277593d8d818119eac910d51a1cf320175409363d94ef5157ccad3768753b2a6d00c404ea6db4b18911bb0e551c5d19447cfb SHA512 00cceca448928c233658600c65534abb76fc76b327c652c241925297ee251e540802b00b9fb7c5f4cafd8c47244df5d73e4c060d99b199e8c2a45f56dcd504f1
 AUX libpcap-9999-parallel.patch 640 BLAKE2B cb1b081fba0b53af09ead5e4c0bc3e5b7856ad2c0ebaf68dc99b8a375158a112c47e0dfad7763caff7b0f7da8ce5b1ebfcb79a6cf3cf72636605dfd4097fb711 SHA512 82e0c48f2fc42c8df4a21009b9afac18ca4aaa14db822c0c85b4ea420434391dec3b5da90261d7afe01879354b43ef425c7464c9fe98a407a4b232590e361117
 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75
-AUX libpcap-9999-prefix-solaris.patch 838 BLAKE2B 01d20a5cb097113c305161a8e1688ca99f375c1ddf06a65a762639e2e39f2d1b87cc60e10fb96a3117ced39e5b6a717c0a0d9580c1e4a3db2e128a5bd59f0d5d SHA512 541986573369e05ae24c2f092afd0eb77c18f5aaadaaa0f822dde039ae0734f88e5a86e51a26edcb42a4c99d3300a028ee1993005f8a2f39ae9ea64c89c1612f
 DIST libpcap-1.8.1.tar.gz 753405 BLAKE2B f80fbd6451cf788fc43e5f2240e5ecb267ac98b57bca3fa56dd63576b57d10966bfacde5005d07282352fc2b30d8ef5964cbd126f8f63e565f1bb3dc6f8d9a1c SHA512 7e6a7351bb4213e1c3dd95ef7a460e91f733d933e39ba518ad8ba6d2f86b6e7cfa50ae667c8dc1300ef47bf8693ac8a1f18e068f41175ca5d0147a0b72278882
 DIST libpcap-1.9.0.tar.gz 819766 BLAKE2B bf98029eea58328c1c820966b100d8467373c9469c107bfe36bcf17e5250d64c45a331050b8a1027c4f4eb1600925b873e4fe43d866ba5a9dc5dcc7995137de1 SHA512 b94d63204f74fd155c1409c50b84c4a02d5b9db7069a24d42d496056416923183331f587903f9101d8464b74efc7db22f113c48e518bd7fb3082b333bbc337fd
 EBUILD libpcap-1.8.1-r2.ebuild 2003 BLAKE2B 7dcbc9656cbda85903363e4d3e6cb149df76c44d75243fafb8e2e414a7f39026e434f9309905b1879e4b6059ac252ddf19d350459e7206c53f89839a61f92ffa SHA512 bb143dfad1307d0a3246eea173a3fbf9ce66f35e156c61e24b873f402bc1c3d40f3d1142edcf7daccc5c09ff62e720e4eefb3944d8f38ddf3c6fb4081e395f6b
 EBUILD libpcap-1.8.1.ebuild 1916 BLAKE2B 8e51e1f17444dad1614f3f182c0eaacef1ccdaf5a6c83bae406e52484ed260ac0ddcc987b4271e5efbcd6e424ecd36a12137539f18b50365ae134eae4956bc99 SHA512 0ee228ce842d912be7b808ba7c4749d931f370914915e6dcc7702eb77c366a561af169ebe6b22657ebebdd1b7dcf3b40760f99099445cc2428589f1243583a69
+EBUILD libpcap-1.9.0-r1.ebuild 1850 BLAKE2B b58af5a4955c4476724d65f45c4adc44fb950cc327e282d6fb0cf4cb081624f7cbf5f931c557a6b14aaa9b0c992267031f7cb116b80fa0981450ba689d24ae12 SHA512 259c29e531b016747fb9b2ca02782c6e484068bb45b573adf6c4c878f10f056b859db669c63e9cff9ed141aed8e8401ea173452e9b03e424a58dff18e7133e10
 EBUILD libpcap-1.9.0.ebuild 1807 BLAKE2B ef1334b7356fe43b302f8526e70b8c244824ccd60b9e3825484f56f4d46a2f76d23dfac18d7f1c36aebfbba097252e6c27e8f706049cbe0b3c1985a8e938025a SHA512 31f6a00350d35015c7cd6de63715d0e5fcdb86be2aa81067d201c2a9b00196e0d23736969b1a1df7c915fffbbe9e524e57d35f1550ecb644f93659c728fe6116
-EBUILD libpcap-9999.ebuild 1501 BLAKE2B e700c6d566c7281c6f3718453edb5134354d2543bd75ac58cd72322b6286ef048e145ee55587bc9af671c9cea9c7ace892e108ab1585d98d3263de4120c7f437 SHA512 c7a059189411599db2b02e4c44abeba54e03f681918b79c9022ed12e5a9b9c792b6d25f20d6b0ddc740d912bfa82ab973dabb7dff42f53cfd454261379bc415d
+EBUILD libpcap-9999.ebuild 1510 BLAKE2B ca653872343d7f710dcf2ebfcf0a85f40fd82392cb030ba6ea0d1b01be98dfb132c748e7baf55c4556300634ee08836886f507b642b5172f6c3ba7ead3e84361 SHA512 472ada950b336389d86c12ef428636702e009a8a0e7fe63ecd0f3eb497a669b97e145b5cd91a4c3e04f1c803470a313502be2f89d400747c91fbc9023c9fcb8f
 MISC metadata.xml 475 BLAKE2B a914e052c15c557f921c504f0cf128704ed8854bd8107dd2019a5584dd86f80ad06545ef8780e01447c309801207e2f83e286a90ad755ddebd7447d27bba1336 SHA512 ff92cbd5725e74f72d117b57d85858851ddf3b27046bf7d5b9e29cac8e07c98bb21e2a81ff8ffcec08adb062a42deb051019d60911a8b86ecd232a37e1b88170
diff --git a/net-libs/libpcap/files/libpcap-1.9.0-os.patch b/net-libs/libpcap/files/libpcap-1.9.0-os.patch
new file mode 100644
index 000000000000..d3ec8014084f
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.9.0-os.patch
@@ -0,0 +1,33 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -415,7 +415,7 @@
+ 	    aix*)
+ 		    ;;
+ 
+-	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
++	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
+ 	    	    #
+ 		    # Platforms where the linker is the GNU linker
+ 		    # or accepts command-line arguments like
+@@ -429,10 +429,10 @@
+ 		    PIC_OPT=-fpic
+ 		    case "$host_cpu" in
+ 
+-		    sparc64*)
++		    sparc64*|sparcv9*)
+ 			case "$host_os" in
+ 
+-			freebsd*|openbsd*)
++			freebsd*|solaris*|openbsd*|linux*)
+ 			    PIC_OPT=-fPIC
+ 			    ;;
+ 			esac
+@@ -497,7 +497,7 @@
+ 		    V_SHLIB_OPT="-G -bnoentry -bexpall"
+ 		    ;;
+ 
+-	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
++	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
+ 		    #
+ 		    # "cc" is GCC.
+ 		    #
diff --git a/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch b/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch
new file mode 100644
index 000000000000..cd2c9fe61f2f
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch
@@ -0,0 +1,36 @@
+--- a/pcap-config.in
++++ b/pcap-config.in
+@@ -59,13 +59,13 @@
+ 	#
+ 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
+ 	then
+-		echo "-I$includedir -L$libdir -lpcap $LIBS"
++		echo "-L$libdir -lpcap $LIBS"
+ 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
+ 	then
+-		echo "-I$includedir -L$libdir $LIBS"
++		echo "-L$libdir $LIBS"
+ 	elif [ "$show_cflags" = 1 ]
+ 	then
+-		echo "-I$includedir"
++		echo ""
+ 	elif [ "$show_libs" = 1 ]
+ 	then
+ 		echo "-L$libdir -lpcap $LIBS"
+@@ -80,13 +80,13 @@
+ 	#
+ 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
+ 	then
+-		echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
++		echo "-L$libdir $RPATH -l$PACKAGE_NAME"
+ 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
+ 	then
+-		echo "-I$includedir"
++		echo ""
+ 	elif [ "$show_cflags" = 1 ]
+ 	then
+-		echo "-I$includedir"
++		echo ""
+ 	elif [ "$show_libs" = 1 ]
+ 	then
+ 		echo "-L$libdir $RPATH -l$PACKAGE_NAME"
diff --git a/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch b/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch
deleted file mode 100644
index 358cb123ff2b..000000000000
--- a/net-libs/libpcap/files/libpcap-9999-prefix-solaris.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Prefix' Solaris uses GNU ld
-
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -415,7 +415,7 @@
- 	    aix*)
- 		    ;;
- 
--	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*|haiku*|midipix*)
-+	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*|haiku*|midipix*|solaris*)
- 	    	    #
- 		    # Platforms where the linker is the GNU linker
- 		    # or accepts command-line arguments like
-@@ -429,10 +429,10 @@
- 		    PIC_OPT=-fpic
- 		    case "$host_cpu" in
- 
--		    sparc64*)
-+		    sparc64*|sparcv9*)
- 			case "$host_os" in
- 
--			freebsd*|openbsd*)
-+			freebsd*|solaris*|openbsd*)
- 			    PIC_OPT=-fPIC
- 			    ;;
- 			esac
-@@ -497,7 +497,7 @@
- 		    V_SHLIB_OPT="-G -bnoentry -bexpall"
- 		    ;;
- 
--	    freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
-+	    freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
- 		    #
- 		    # "cc" is GCC.
- 		    #
diff --git a/net-libs/libpcap/libpcap-1.9.0-r1.ebuild b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..69742603f3c5
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib-minimal ltprune
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="
+	http://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/libpcap
+"
+SRC_URI="
+	https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth dbus netlink static-libs usb"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+"
+
+S=${WORKDIR}/${PN}-${P/_}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
+	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
+	"${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch
+	"${FILESDIR}"/${PN}-1.9.0-os.patch
+)
+
+src_prepare() {
+	default
+
+	echo ${PV} > VERSION || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable usb) \
+		$(use_enable dbus) \
+		$(use_with netlink libnl) \
+		--enable-ipv6
+}
+
+multilib_src_compile() {
+	emake all shared
+}
+
+multilib_src_install_all() {
+	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
+
+	# remove static libraries (--disable-static does not work)
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -exec rm {} + || die
+	fi
+	prune_libtool_files
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h portability.h
+	fi
+}
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 45652829cdd0..3e6c9db1d115 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -30,8 +30,8 @@ DEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch
 	"${FILESDIR}"/${PN}-9999-prefix-darwin.patch
-	"${FILESDIR}"/${PN}-9999-prefix-solaris.patch
 )
 
 src_prepare() {
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index b29c9f1021f3..2c13cddcae74 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -3,5 +3,5 @@ AUX libsignon-glib-1.14-default-opts.patch 1714 BLAKE2B 8c00bcf5b056cd0fe05f58ed
 DIST libsignon-glib-1.14.tar.gz 54019 BLAKE2B 9ffdb96a374ef0848c1b70cb369a533ea826b24856a32b4b454a0fd8982533041fcc88382fdf1eee6857aa36ec8d076885fc769a058e148e91da54dbddaf7125 SHA512 c2277933d6ec2c3288ce510c853da7719116dac15d60c7114fcdcb87d04e7f70390d066938dea6aa0f819fbd70158fb875c5be5684c47fd27c0b6c55e9467a1d
 DIST libsignon-glib-2.1.tar.gz 52440 BLAKE2B edc27f5f09c3f6d05f32ff6b560934dc003072940b44932fd90021511510fb56beaec7f25dd051b3c1d12d10942f292cc906a9fc4b74bb7f2daf8b885f15e644 SHA512 45d8e26263a16b98517cda0fff8e46fb1ffcc4bb833a6364454f120eb9819b48ee04bdb338bf5e9f0b0fe344af5940f35ed56f0765ca3605dead5b3755657dcf
 EBUILD libsignon-glib-1.14.ebuild 1702 BLAKE2B 4275605165e5db245631e43d0dec26563e9d0ed04462be541412f42465770d88c2089ff1f997908bc773f1819a234d3e35a851e61eeec51a4f16b655b16ccb79 SHA512 36f714d100f0cae96b5bb67db9062024d542851709c6dfa456e0ce3909b1db7bd0edc858f628809a71ce976dcaab28d0182fba84b01e2f2bb447403c8148d942
-EBUILD libsignon-glib-2.1.ebuild 1820 BLAKE2B 0dc2371faf190328641b2c8a9140dd10558e36bb979145963fe68aa5898e5d6da71d028a288c65bc0504f18af2d5bc6e7ff0a97736ef22b4be9c5be6a6a23cd6 SHA512 8d6ad0d044fc141c1fd2a135a5c6ce3345e61c745bb156ad49bba63781061b93805b0d5489a3dca4d8ada51310cdab763a1d17276e3be0f4785f56fe33388225
+EBUILD libsignon-glib-2.1.ebuild 1817 BLAKE2B 07588f45e40e9707e38c24123dce695f7ae25eba47f9aa9c5af8f72505b37e4dc4889fde0b0a6302c721c6431542d4496a1bba46edaba0c425f17356e7d06b1c SHA512 24ec9eb44667b33b0bad0657c8b5d561ec83548b0ef3697ebf356ff01833165991554d3ba9b07892bfcef4b8b9094e9e8431f50bf28dfe346319a3ef39ff2501
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild b/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
index 43e1df26d947..88ad9c326e1f 100644
--- a/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VER
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="debug doc +introspection python test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} introspection )"
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 05fa79392b0c..a987a1ddce02 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,8 +1,13 @@
+AUX 2.66.2-meson-ntlm_auth-fix.patch 873 BLAKE2B ea7f36d5cb7d9df048b6f9ecf8cf0ab24424fae6bc918a3130ae6bac8b7c03fc8b69e7c2288e9c7dae2115ecaf48e1ed1c75c2abdc704faf0bdb093f2adde17f SHA512 227015874f95e759eb8850fc139d8340cff1bb05024585d7a8fa2af60f09aca17e497e43ca2a78a15c9ce71c90c7855e5235c1abc9b41e734a922e499a44edab
+AUX 2.66.2-vala-0.46-compat.patch 767 BLAKE2B ff124c8ab2897b2cdbe02e3a4c90e1584f856f9254e320a828daf1d6966c87060fb654d233baa7086e740086935b49640670f2b76ed65204bdc76b66bc2924a6 SHA512 ff218cdd450130fe12e95c3c93f8762ed891444c0a8f9b1d2c77a580717fec96a856b65ff54485ed7353d9fa3e9620acfae87fd77a096f76b647c70b8d74dbfb
+AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
 AUX libsoup-2.58.2-sparc-unaligned.patch 1006 BLAKE2B 95a3695e59c8fa86ce550cd90b9d138b6e6ebf1ee8ae3e38fff1a8ac1f89cb088feec8297c8532fcea578260b0947946a18b6e3e8b87e6faf7643cc79a5200ba SHA512 cb8e90ef7d3b163c0e9f9991e7f219d08769f101de09f1cc17dd55fe768f9193938e45f8547e8a26f599d965eea05ff2f27c11af221384b08ab76411325dcfb5
 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
 DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
 DIST libsoup-2.64.2.tar.xz 1793440 BLAKE2B 77a41ad62e0e419711cb26f510b6c0ca09c0430300f72144a0d0563a24e24639d1ca430784051b8de279623193a273510d5c95de6edb4a54a3aee0bd7903d9cd SHA512 c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
+DIST libsoup-2.66.2.tar.xz 1446024 BLAKE2B 2953b91e3bf28b80189a87ecff3a9d103d57bb090f62121dc441e9bfa65750b67f2ab4f50e7a7a0cf5691b79139ae84de5aeaff69e7505b5c2fdd3f375536724 SHA512 1df443470239f23d22301e37e36f3d34963352ee0122f317cd15b19d90115831091bddcee27bc6f0d4994adcf4e5bd9c0395de2bd7f39ae305ba0edea7789092
 EBUILD libsoup-2.58.2.ebuild 3011 BLAKE2B 6bb09cc7a247550ac1ef0fbc82b3a6e2d0fe421174243f12feabb87dda992b305ef0aaec2fdbc99a13eccd1523ed98f46bfe175598907f30d9365034ad6c3fd7 SHA512 98dfcd612e875658b20e590875f0ffc016fed4f4da998d38954a6fbd5f8817c0d95819343d567432b682dadb152299d826f8d65aa36714de091e4aad8c20e8aa
 EBUILD libsoup-2.62.3.ebuild 2922 BLAKE2B 8b7f012a12a0a6d6ec723a5d8fd74ac57bc5c734c2dd4c65fa51ac6db657f4a286a3324509c4490fe97b9e5c8f0834d8116285392bf643349bb398bffb8c406f SHA512 c70d71b679159df7cf00829cd13e68f8723e054ef3bb3ddcd131008ce699317fb5a7e9a0a69cc4381746441555b2f1dd78c78f1528e39cc38315d396054cbcb0
 EBUILD libsoup-2.64.2.ebuild 2749 BLAKE2B 355649f9823662e3de59e959e3123cebb01fb3bf80fd3f4d68d2197cef02f444fd0761d79153af3217a9d5409f81fc00d74649c931d483aedf349cb0966112eb SHA512 bea4a4a5774888038defe6b3c0041d3b14ffdf46e4942b5afb0183c56d95d8b77478cbaebd0f03fa2aae4cbb17bed028e68a839de5bb7fba7f676543c3105629
+EBUILD libsoup-2.66.2.ebuild 2751 BLAKE2B 19a21abb9fd70ca5c5f21d9756fc711114aba0f8028364603574e8550a2a2a100890d9df5d459e57cb769bca805b92ac8f77b606e2444f17e9f5e4870b7fb283 SHA512 f49379ff1e40ec9b62861141c6157576d8d0dc4f9e40c16199bcedb8267d6e3012e6b73e3a4b2850e79116642b81251199f5253440f33ae27cb8c1215b088032
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch b/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch
new file mode 100644
index 000000000000..04c9cccfeec0
--- /dev/null
+++ b/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch
@@ -0,0 +1,28 @@
+From ecd64363f82eb9d6cea07674f49c2d2869e5b62b Mon Sep 17 00:00:00 2001
+From: Claudio Saavedra <csaavedra@igalia.com>
+Date: Tue, 20 Aug 2019 16:04:06 +0300
+Subject: [PATCH] NTLM: Fix build with ntlm enabled
+
+Just realized that build with NTLM enabled was broken (!?)
+
+(cherry picked from commit bab0db142d508e92e72970db72cbbce3c13a526a)
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index f0e34cb0..346ed2fd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -271,7 +271,7 @@ if host_machine.system() != 'windows'
+ 
+     if ntlm_auth.found()
+       add_project_arguments('-DUSE_NTLM_AUTH=1', language : 'c')
+-      add_project_arguments('-DNTLM_AUTH=' + ntlm_auth.path(), language : 'c')
++      add_project_arguments('-DNTLM_AUTH="' + ntlm_auth.path() + '"', language : 'c')
+     endif
+   endif
+ endif
+-- 
+2.20.1
+
diff --git a/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch b/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch
new file mode 100644
index 000000000000..ce0e1dc9b620
--- /dev/null
+++ b/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch
@@ -0,0 +1,26 @@
+From 1c6f47df99cc5b2efe3d629c71c5d85a7871689c Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 28 May 2019 09:08:35 +0200
+Subject: [PATCH] gir: soup_auth_new is not a constructor
+
+---
+ libsoup/Soup-2.4.metadata | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libsoup/Soup-2.4.metadata b/libsoup/Soup-2.4.metadata
+index c0056ec8..1f107eda 100644
+--- a/libsoup/Soup-2.4.metadata
++++ b/libsoup/Soup-2.4.metadata
+@@ -18,6 +18,9 @@ ProxyResolver deprecated_since="2.28" replacement="ProxyURIResolver"
+ 
+ // Report upstream
+ add_* skip=false type="unowned GLib.TimeoutSource"
++Auth
++	// Factory method
++	.new symbol_type="function"
+ AuthDomain
+ 	.accepts#method name="accepts_authorization"
+ AuthDomainBasic.new skip=false
+-- 
+2.20.1
+
diff --git a/net-libs/libsoup/files/disable-apache-tests.patch b/net-libs/libsoup/files/disable-apache-tests.patch
new file mode 100644
index 000000000000..e7d306bde971
--- /dev/null
+++ b/net-libs/libsoup/files/disable-apache-tests.patch
@@ -0,0 +1,33 @@
+From 6c9bbf0d91688e831f8f19232e18619bfc57e12e Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 23 Aug 2019 21:11:57 +0300
+Subject: [PATCH] meson: Force disable apache/php using tests for now
+
+We had them disabled in autotools with a sed. Keep them disabled for now
+in meson port as well. Should be revisited at some point.
+---
+ meson.build | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 89837c15..f0e34cb0 100644
+--- a/meson.build
++++ b/meson.build
+@@ -162,12 +162,9 @@ endif
+ #
+ # The summary is that for the configuration parsing we will use the apachectl,
+ # but for running the tests we will use the httpd binary.
+-apachectl = find_program('apachectl', '/sbin/apachectl', '/usr/sbin/apachectl', required : false)
++apachectl = disabler()
+ # This abomination is a result of https://github.com/mesonbuild/meson/issues/1576
+-apache_httpd2 = find_program('httpd2', 'httpd', 'apache2', 'apache',
+-             '/sbin/httpd2', '/sbin/httpd', '/sbin/apache2', '/sbin/apache',
+-             '/usr/sbin/httpd2', '/usr/sbin/httpd', '/usr/sbin/apache2', '/usr/sbin/apache',
+-             required : false)
++apache_httpd2 = disabler()
+ have_apache=false
+ apache_httpd2_version = ''
+ if apache_httpd2.found() and apachectl.found()
+-- 
+2.20.1
+
diff --git a/net-libs/libsoup/libsoup-2.66.2.ebuild b/net-libs/libsoup/libsoup-2.66.2.ebuild
new file mode 100644
index 000000000000..238bf9bb9666
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.66.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson multilib-minimal vala xdg
+
+DESCRIPTION="HTTP client/server library for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.4"
+
+IUSE="gssapi gtk-doc +introspection samba ssl test +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	samba? ( net-fs/samba )
+"
+RDEPEND="${DEPEND}
+	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
+"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	vala? ( $(vala_depend) )
+"
+#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
+#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
+#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+#		dev-lang/php[apache2,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
+
+PATCHES=(
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	"${FILESDIR}"/disable-apache-tests.patch
+	# Fix libsoup-2.4.vapi to be compatible with vala:0.46 and onwards. Included in 2.67.2
+	"${FILESDIR}"/${PV}-vala-0.46-compat.patch
+	"${FILESDIR}"/${PV}-meson-ntlm_auth-fix.patch
+)
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	# But necessary while apache tests are disabled
+	#addpredict /usr/share/snmp/mibs/.index
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use gssapi)
+		-Dkrb5_config="${CHOST}-krb5-config"
+		$(meson_use samba ntlm)
+		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
+		-Dtls_check=false # disables check, we still rdep on glib-networking
+		-Dgnome=false
+		-Dintrospection=$(multilib_native_usex introspection true false)
+		-Dvapi=$(multilib_native_usex vala true false)
+		-Ddoc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use test tests)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 9612fc592aad..924240ebc60c 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,11 +1,6 @@
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
-AUX libssh-0.8.3-strict-overflow.patch 627 BLAKE2B 81d29d56f91bb5c649f8f2e3706034de59834b859725bddd9243a934335fc20d13dbc2fcb0e8627ba23856072958e1bf06224403ed24a871a38a909af09d38d8 SHA512 06529a3a6145ac4123f48b307b45376441b09c368a6cc89d514180e6a0e7fb5be46c3a1ed118bb2f8aec61a389fadbb7c8b2649d35dfa03bbdfc01befad56fc6
 AUX libssh-0.9.0-libressl.patch 923 BLAKE2B 997f909b6576e52a9104cf9dd821a42e7a00fb0c934b35d9f6775080db84e3d6a52ccb973c07d94b37f0182caeb8e0ca47330d042ec286692a59014b731fc006 SHA512 d7fdfb19bbf552de9d17bdd09ee28e8f4dcfb1bc94415249fafca52ea0dba9075fd36fef063a1e3be2ec165baae35c0c224c4a30799c7b30a9f749e0639ce91b
-DIST libssh-0.8.6.tar.xz 433680 BLAKE2B f222e67676a90a2d2431463dc71859ad336a23a519b54e08fe368efe6322d0b9c8e393ec92d5246cb4721cd57bb955856fa6a2d92ffe71b6c35e2c94cde28762 SHA512 e91d1f4c1343aa232ade0fe4b5e9a92ca65e3716f4ebe2ec25b04def4fae5a3774349f05a6919836551f66fb0288ed6a3e19e0ab786c081616218be973356522
-DIST libssh-0.8.7.tar.xz 430104 BLAKE2B 8ad9455d81120726434a418abb74bfee53279040541cda50117909d43088ea992b9dbc7164b079dbe970b4348b967ed0d3f6352df98f60d1e6d9f14a086b5a40 SHA512 13c3dccad81d521edf29c8a5e2c5f7fdd90507a0eda652b2b040a0a17bab88860873e089a46e181907ea3f449ca1847b1c84453b1960f456e391eefe5be983c5
 DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3 SHA512 8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
-EBUILD libssh-0.8.6.ebuild 2937 BLAKE2B df427590602299e1c2fb18583c83d554f083db3ad474307002474793313a0aedf5d2108ad8116934fc4ebcc748391d16d6fab87f42b42aa56ca659031111ec26 SHA512 a7fe530b3714b126fab464b0acff0cb4321ea9c2594f8862eb184b6378a5febcf93042a6a18e329e3f5d39891ef335f2f9aac783ab4485ca6d9c18359a7a5f71
-EBUILD libssh-0.8.7.ebuild 3091 BLAKE2B ebd0ec869401d1dccab35911777e785afa7700969bd2ac0ca4f9e8e53685b36f0f4af952e1544a77fadd3708f5a5e7f4811a68ca35a87168bf7b0920dfe938c9 SHA512 930688de59ddbef12c114005e2e7e5cc39b3b1066463433a68486030d64ecd43382d2483fe0eb93f7378849a111bf37d5a05d8c4e4f4b2b78e7417a206a2994a
-EBUILD libssh-0.9.0.ebuild 3190 BLAKE2B 78f3e0098b89f120e58b42adb667dad2d849a166f2aa22f9ed6cf403d20a2787adf3baeb1f4aece0b30812d920715929c7e1f431d48cf55cf836281948257ddc SHA512 acd33c928a49d95f6dc96b5ecf0f96c1832176c3244ffa22dd171dd8364bdf925b2b09f2aeb71623fec62e86fd83c81759d06f0ac102854a1500856e8d5a6534
+EBUILD libssh-0.9.0.ebuild 3189 BLAKE2B dd071656c6722e1d7dc2c27dadff638e2b146f01028ddf0107ab966450efbf36f1c038169bbbeff4ddb77d1a425479ba83a09079835e89a306e33804366b87e1 SHA512 abe7a2090cf71a9c46dd3004be79a6ea5c75111f23c0b48f3b131b96bdc8eb9c5a2cc625a452ececd66c03eb815ccef75bd7d252b1c17039942b4547e19b7e8d
 EBUILD libssh-9999.ebuild 3156 BLAKE2B 0784a4173cd3c3128ecd46e2d621366d91a46d1a447c315bb7e0d6ba540e9086902fc73568a56ef3c53b6b73c5530fd307d3ea408135824feaaebbb09ad95948 SHA512 1d97d0d6b3d111abc4f739a70e53fb210fc565d54a63a463e67263981fbf2700d4938ea11a4f753f540ef8e7d507b324beb28c1428467347603bcc5705077f50
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/files/libssh-0.8.3-strict-overflow.patch b/net-libs/libssh/files/libssh-0.8.3-strict-overflow.patch
deleted file mode 100644
index 93b15ec061b8..000000000000
--- a/net-libs/libssh/files/libssh-0.8.3-strict-overflow.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Neither i nor j are ever counted downward for the array pointers, so assume
-they were intended to be signed integers.
-
-Fixes a compiler warning on HPPA triggering an error because of
--Werror=strict-overflow -Wstrict-overflow=2:
-
-src/connect.c:509:7: error: assuming signed overflow does not occur when
-simplifying conditional to constant [-Werror=strict-overflow]
-     if(j != 0)
-	        ^
---- a/src/connect.c
-+++ b/src/connect.c
-@@ -471,7 +471,7 @@
-     fd_set *readfds, struct timeval *timeout) {
-   fd_set origfds;
-   socket_t fd;
--  int i,j;
-+  unsigned int i,j;
-   int rc;
-   int base_tm, tm;
-   struct ssh_timestamp ts;
diff --git a/net-libs/libssh/libssh-0.8.6.ebuild b/net-libs/libssh/libssh-0.8.6.ebuild
deleted file mode 100644
index 65d029e138f0..000000000000
--- a/net-libs/libssh/libssh-0.8.6.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-${PV/_rc/rc}"
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	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"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.0-tests.patch"
-	"${FILESDIR}/${PN}-0.8.3-strict-overflow.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	# keyfile torture test is currently broken
-	sed -i \
-		-e '/torture_keyfiles/d' \
-		tests/unittests/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_NACL=no
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.8.7.ebuild b/net-libs/libssh/libssh-0.8.7.ebuild
deleted file mode 100644
index a2353f90c6bd..000000000000
--- a/net-libs/libssh/libssh-0.8.7.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
-
-MY_P="${PN}-${PV/_rc/rc}"
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	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"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
-
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.0-tests.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	# keyfile torture test is currently broken
-	sed -i \
-		-e '/torture_keyfiles/d' \
-		tests/unittests/CMakeLists.txt || die
-
-	# disable tests that take too long (bug #677006)
-	if use sparc; then
-		sed -i \
-			-e '/torture_threads_pki_rsa/d' \
-			-e '/torture_pki_dsa/d' \
-			tests/unittests/CMakeLists.txt || die
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_NACL=no
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.9.0.ebuild b/net-libs/libssh/libssh-0.9.0.ebuild
index 1ba01cd47ea6..164aae6d0c1a 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${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/libssh2/Manifest b/net-libs/libssh2/Manifest
index e377f9bbf9cc..260bda74b42b 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -2,6 +2,7 @@ AUX libssh2-1.8.0-libgcrypt-prefix.patch 1026 BLAKE2B da1ba552aafecb1b950bc8d5d4
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
 AUX libssh2-1.8.0-openssl11-memleak.patch 823 BLAKE2B 3d2abd43798a23b551ef5ba97b705f8e8e24db010a19a2387efe10299e436e0dbe655db419fa8da1467aed18ec2bb39e1d863eb981603afecb302700c565159e SHA512 d93ee0b8ea5f37b81883ff79fb7d2f19633a4415990de1743f1388f49f7897be200ae0911b6ca14d505498294727aa5542c7d76a29e7b8df0051a53e6dcd586a
 AUX libssh2-1.8.0-openssl11.patch 2551 BLAKE2B 32875e90a9cfb754050559a315c24d51065ceb9be22e450984aef9dea0a59b5b93cac7498e3c3e9cf8057ac13dd93330bc470bd717c9a06af9d9294ef7172eed SHA512 3cfd11ef23884a3de173422e001b0ec0f9af48c832948b5d0f90f0be2008334c30ed769a642786cad9aa68ea445b66780b10d3c64434178978018e709510deab
+AUX libssh2-1.9.0-libdir.patch 573 BLAKE2B 5464910fdb5a9461ad4ad6e94c0c682bb1106d437a47a035cb107c9dbec6d2d9e89f791b4f7309fdba307b898f229dff8bba5b5af5b8c6af2ca6ddc21d949695 SHA512 5b389312a4b0bdb6d724f54ce9659612b11f86add4b185b10ee4277b641b26c63256264e11225ea5f28775f0ac9367b391fe77470f34851aeca2e3b5e3408446
 AUX libssh2-1.9.0-missing.patch 4796 BLAKE2B 185428de9298fc210c30a1b826b958ebde761a6b258d2b6a79c2162533c81c6f9dfa5a1c574b239067a7bf79bda36656498cea78b0da797579b5cb6711a6dfe0 SHA512 65d75ecdc041cfb627c49f992804201dc234ba63558e2cbac066efbe0c4de03900668f61f87674ea9ef5beeb217d82cb441018f11e703545ba9349a4f05c8ae6
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
 DIST libssh2-1.8.2.tar.gz 859587 BLAKE2B 58e0854e83001c424a767ceb4ddfb535373320d8319aa632244dc14434276db7c8b7a77d4a5f22fe8e397f1050b33516d2fca1162658a9f414166f560bc1f358 SHA512 390ab4ad93bb738415ec11a6eb92806c9b9e9e5d8ee7c442d841a58b4292c1c447a9bc99e153ba464e2e11f9c0d1913469303598c3046722d1ae821991e8cb93
@@ -9,6 +10,7 @@ DIST libssh2-1.9.0.tar.gz 888551 BLAKE2B 7bce5cd38b88654f0ca0f8b562e4bddc56346e3
 EBUILD libssh2-1.8.0-r1.ebuild 1362 BLAKE2B 0765a2ec7cfb2b0eb5ab4f52054d4cf8abebeda0b47814520ec76a5b3ff4299efa642483bfad8051788a27cc0934bdecf9a91bf6a17b49e81562e2b3a6b246d6 SHA512 61067547b394f9c5959bf7dec2ec2cb0a69629ca5a65f9f5dbc6f71b8664767802af0fe59eae210eefb165378c9f4af58eae0358421ae4f339da3812a80dd579
 EBUILD libssh2-1.8.0-r2.ebuild 1647 BLAKE2B 47a2d718a0a2bf40f31fa3a3251ddf64e44fdb2823b61a3c10b54cf34c41af01adc3831b99f25a8b012cf7ce54a0120d4216dd3c7ec9921b48df15d29d542561 SHA512 43bbf761c4075cbe523b1b5ab247ef7e69c800f529ac41981ff61cf53a0c37b3b2b989cd9a08e7e709b9ddc0cb9d2a86f31e7930b96c95a0e5857aadf2a3eda9
 EBUILD libssh2-1.8.2.ebuild 1637 BLAKE2B c1ee43a0355c0f6fd4d761355c9a10f2ec70ff5b6dcdd175ef5162a852921e747ddae104d429536978fee57042764155bc8785ca3c15d9d3462302ff978be4dd SHA512 772baee7fe1f82db778da86c7cd7490e3d2a5843eb130aef310b5ebbffaa317d55aeea1cfc17ed71ab3e467209edbe2f5ede66482337028a1ddf2b780fe3011e
+EBUILD libssh2-1.9.0-r1.ebuild 1471 BLAKE2B 1f970aa5dfcedeab0701d5c7aa71a05546bfec61d410a0c067400dbf76208c1cfe2bfeacb62f12b7d91628144c32f2a38573ca2637d4afb2839196bd61ee9883 SHA512 0e4780d042d1be4b3e95f124e776e588770c0674534c3d439f6958994b1dbde62e1bbc3d0d7641194d877e3cab8202f168b8d5d2e5f500950c327058ae1336d8
 EBUILD libssh2-1.9.0.ebuild 1421 BLAKE2B c8780ed527d063300fe4256af1d09ab67997b5cafcdbfd3dfdc1ab04db34130ff8e9dff1013148bf2d2442e29f2d1e962c638a7dc1ce059f9a2d4d194d1c961f SHA512 e53accd6d3a5cc15da88c6a8bfe8e7d82911e4cfef5cd45297459555dbe4b435db4860837f1159907b4bd069d5855e4384493dcb4711108875d8987292b6e4b0
 EBUILD libssh2-9999.ebuild 1237 BLAKE2B 0a4ace453cacc7e735fc5df42d1bbadfb3a231954a94e992b8c7141037cd07b73a3f262f3ad9dcad9e98d51fe024a41220e0d34593f96e563c26f632e0f172f7 SHA512 f8f597a5adee5b882d3e6d22ce1dd739d5f1a57da4466bfedeebe1d7bfecddac296f687cf4982ece60f5e3e0b52eb4ae8fda30a2e6e4d091f479fbb0872116e2
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch b/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch
new file mode 100644
index 000000000000..e04acb0904ba
--- /dev/null
+++ b/net-libs/libssh2/files/libssh2-1.9.0-libdir.patch
@@ -0,0 +1,17 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -392,7 +392,7 @@
+ ## During package installation, install Libssh2Config.cmake
+ install(EXPORT Libssh2Config
+   NAMESPACE Libssh2::
+-  DESTINATION lib/cmake/libssh2)
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2)
+ 
+ ## During build, register directly from build tree
+ # create Libssh2Config.cmake
+@@ -424,4 +424,4 @@
+   COMPATIBILITY SameMajorVersion)
+ install(
+   FILES ${CMAKE_CURRENT_BINARY_DIR}/Libssh2ConfigVersion.cmake
+-  DESTINATION lib/cmake/libssh2)
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2)
diff --git a/net-libs/libssh2/libssh2-1.9.0-r1.ebuild b/net-libs/libssh2/libssh2-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..92f1a88bf9c3
--- /dev/null
+++ b/net-libs/libssh2/libssh2-1.9.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-multilib
+
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="https://www.libssh2.org"
+SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="gcrypt libressl mbedtls zlib"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="test"
+
+RDEPEND="
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	!gcrypt? (
+		mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+		!mbedtls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		)
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
+	"${FILESDIR}"/${PN}-1.9.0-libdir.patch
+	"${FILESDIR}"/${PN}-1.9.0-missing.patch
+)
+
+multilib_src_configure() {
+	local crypto_backend=OpenSSL
+	if use gcrypt; then
+		crypto_backend=Libgcrypt
+	elif use mbedtls; then
+		crypto_backend=mbedTLS
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCRYPTO_BACKEND=${crypto_backend}
+		-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 3cb572119bd4..c98a8059a3c0 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -2,10 +2,12 @@ AUX libtrace-3.0.20-autoconf-1.13.patch 219 BLAKE2B 5b342005bc1004c0d85a59e4e815
 AUX libtrace-3.0.20-tinfo.patch 474 BLAKE2B bfbe8126fae0ef132671c24ae4a0a44fa5204e95e7aad330c9b3afcb033e65a95c135b09b054a7741f902b2aefe31fa5b953d62a95bb41ff227b3281956e55c6 SHA512 eb0369b9b8a273e47189b63ac90e9bcfe3a10532343efce8b5ab1d79c84a427dbd6655683c9e7b135978e703567603eec12d1314dd6bb44c91c716d166c9b824
 AUX libtrace-4.0.0-no-examples.patch 282 BLAKE2B 0a3f3a4a33490a0a7956a1884bfab647f9498c655b394c68505bb6a9677da98b3dd62b5b499e13c6be4d975cef68b95ba2874aa08edd9f121bf1f637829581d7 SHA512 f000efc2de1e46db5fa486e3640eaea95389f09e22c46b903de2e88d8f13e2421951a9f46f9cf90f5989cbd7f55cc0e16e8e038c872241d624219b8e85b86f2d
 AUX libtrace-4.0.0-with-numa.patch 655 BLAKE2B ac290763914fb35b0638050183a0bd1e8c99a6b7679715eeaffebb584616baffef7b76a4917f8bfd7b02c3da1720fd0fe77427d84d6a43cd2e67ff2b6b20c493 SHA512 f6d0dbd63b2ca7055d001612c73af3c8f0fc6eaae0c565607d241abfbc9457f3fd739aad5f7933a8b281ebf36f601534a648067a62b0582eb6741fcfdc68d5fe
+AUX libtrace-4.0.9_p1-SIOCGSTAMP.patch 339 BLAKE2B 6faa812fa2c70eb6144e0750d937196c1e252ae5d3f04751fef3f5198d662b89920823af554007c88600ade0b735bf8caaafa636ca810cacaae51e9d7a7da010 SHA512 208a64062828757737f43cff85e8468df6816fb747aadfcc3d6747efe43a9846b737a0a416ce70d91e74e9ecdec7217f094740803942a809206ccf1c29d0484d
 AUX libtrace-4.0.9_p1-tinfo.patch 699 BLAKE2B de67795fc21e680a84998b0777dbb9bb8254ec4634cc94ab7903a29b238b1f6b6bd6447d0b63bb48c6404acc2216d06a2fb4ea371cc4179ad323954f6647c033 SHA512 82c86d79c549788665ecd50e4f1a1fb8ceea928585a07ec42b007df57875c57b3fc924395318ee0e7f9cf93faa849f9e86d8eb9ac715e9f113d5a02acebcff7a
 DIST libtrace-4.0.8.tar.gz 1000829 BLAKE2B 943c3f800045c93880657e96173de0eff6ecbaab5ba22e8f29ad35363a3bdbb88a81d5c8c98e2750caff2cbe1b4590dd18bf924cc0520b041e54c1e17b8eb290 SHA512 10179a19c03d13451b088cd0678718bec3e3be2355c561d289a88457c7819a790c28094f7c3d95143bd3f16260f91fb6df465429375c7625d2ca0c696204de3b
 DIST libtrace-4.0.9_p1.tar.gz 1853724 BLAKE2B 2c2c8f44c5dea7c5acb3c3035cf8f749f1f33b03dd20675062718176ed26cba16c91f67df39512fb369896798edbe3f48e5624c72229bd00fc845712f8faf3cb SHA512 aa9e15322e507e01d9b51f6945772deba7673816c62546de30539792d7353b31235ae97866637f84969582e7300b634d080ba29a8cb088f5304a438e79357e57
 EBUILD libtrace-4.0.8.ebuild 1147 BLAKE2B 6671032674a7a22903830ecc9f2ed9ae8092db6d930a00ac5dc9b57f0f44a42e488997909a5d05ad9b2ecf7f001ec913a6f193e384455707e68b7c2863801349 SHA512 7e7c141d9b4529568401dbc8789ca489ff94390dbc31ec19e9cf3eb633d3ad279400e62279626468141f0c98a1295a265f204622fd7cb1aea363fa0da3237a33
+EBUILD libtrace-4.0.9_p1-r1.ebuild 1231 BLAKE2B b546dddbdeb5fa16e9e463f1bc17742269a66e481871d675ada0e780cf325dff48e09cc3888a29dfd323fc29af4ce755c7043bd8e69300a372bf88fc5a0330da SHA512 3cb7d81477146295aeb8ad0ad9902163eb13151318c1879e18cf7138d3573af93376034c560674c1751a1f2e0068b92c0c9ef1c535a15ad376055a34005bd92f
 EBUILD libtrace-4.0.9_p1.ebuild 1183 BLAKE2B 335894903da0d4c3f7e1d7e22a9f35219aef687f831fa17d5ba752334b0fd73308f92198280a3e86e0802e68ad3c7a20ca32f3c20feaab648ad0595164d8a5c0 SHA512 e42d78f87636f6686e50933698870b508b3d54d5bc4704932b1e0e60de5ab6915965622878c7712b2ac0092daa04a0a57bf637ce0ef939d3586fe2fc7008d89a
 EBUILD libtrace-99999.ebuild 1132 BLAKE2B 8bf7a1a7a87b930c3e5f5da6fe426ed6662a2ec702f7479946cc769901d989e7ecfe4553472b2b96da356ff8c6c9aa5425056629c26a599e17d57be6dd793ff2 SHA512 3dffc3729ecf8222019684d3e3a599e411944bb3597eabea4fa9067d43d98eee0fee681d676e4d6e0b6ae48ffef99d04cda32fda87df3ec6b2ebd2654f279cc6
 MISC metadata.xml 349 BLAKE2B 848cf78c8b1c684331f7d0e4ffc027c3b2db879910b09b6573dfc5c19669e783a98a19e70a56d205dd2a256c7dfe3ab7e3cf411642674da0462f9f46510f4466 SHA512 4cb73fcfe0a021f618da0281bf492f407459d637e7f58ccb5a698f3612f9c8c19ca90d1449f17c9c6c47694b6a19ac8c5c80a285b1662208c6c18de51afb0ac4
diff --git a/net-libs/libtrace/files/libtrace-4.0.9_p1-SIOCGSTAMP.patch b/net-libs/libtrace/files/libtrace-4.0.9_p1-SIOCGSTAMP.patch
new file mode 100644
index 000000000000..0693601356b2
--- /dev/null
+++ b/net-libs/libtrace/files/libtrace-4.0.9_p1-SIOCGSTAMP.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/format_linux_common.h b/lib/format_linux_common.h
+index 244144b1..b6a66d30 100644
+--- a/lib/format_linux_common.h
++++ b/lib/format_linux_common.h
+@@ -44,6 +44,7 @@
+ #include <netpacket/packet.h>
+ #include <net/ethernet.h>
+ #include <net/if_arp.h>
++#include <linux/sockios.h>
+ 
+ #include <net/if.h>
+ #include <sys/ioctl.h>
diff --git a/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild b/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild
new file mode 100644
index 000000000000..84bdf221362d
--- /dev/null
+++ b/net-libs/libtrace/libtrace-4.0.9_p1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A library and tools for trace processing"
+HOMEPAGE="https://research.wand.net.nz/software/libtrace.php"
+SRC_URI="https://github.com/${PN^}Team/${PN}/archive//${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ncurses numa static-libs"
+
+RDEPEND="
+	>=net-libs/libpcap-0.8
+	dev-libs/libyaml
+	dev-libs/openssl:0=
+	net-libs/wandio
+	ncurses? ( sys-libs/ncurses:0= )
+	numa? ( sys-process/numactl )
+"
+DEPEND="
+	${RDEPEND}
+	app-doc/doxygen
+	sys-devel/flex
+	virtual/os-headers
+	virtual/pkgconfig
+	virtual/yacc
+"
+PATCHES=(
+		"${FILESDIR}"/${PN}-3.0.20-autoconf-1.13.patch
+		"${FILESDIR}"/${PN}-4.0.0-no-examples.patch
+		"${FILESDIR}"/${PN}-4.0.0-with-numa.patch
+		"${FILESDIR}"/${PN}-4.0.9_p1-tinfo.patch
+		"${FILESDIR}"/${PN}-4.0.9_p1-SIOCGSTAMP.patch
+)
+S=${WORKDIR}/${P/_p/-}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with ncurses) \
+		$(use_with numa) \
+		--with-man
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r docs/doxygen/html
+
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 20847c43357d..dfa787d8a3be 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,7 +1,5 @@
-DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
-DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
 DIST miniupnpc-2.1.20190625.tar.gz 94461 BLAKE2B 26c881c2ef99640e99a5c9cb138cc88dc29a25cd57fffaeaffcf521ded11402fd34ad1001639cd0659fdef9debd247dded5c1903b69f36b74b059c1e282bcdfb SHA512 d55a959bb2fce2c1747fa95da53d9993220403d2c511b12f489b80a7941b28238561f90a1cd60be9fa2bd62777fbfd3cef370db694b9970f73ccbdf3ef49aa48
-EBUILD miniupnpc-2.1.20190210.ebuild 1334 BLAKE2B 237a6940686e9ca218a181a37ff5220969466fe0766d63923b12996e4f5bede6cddf67ebaf820e56beb4cde31f7ea81c42fcad532d03da8515827f9ebcb4407a SHA512 60bb5c23c47dc83c1ee5d0e84ad89beb769271ae33aa55b4b851a18dddd22c529b9c702326ae3603d6853e1a52e1d9a280d142b4a018d83a34c27c1168a9c59c
-EBUILD miniupnpc-2.1.20190408.ebuild 1334 BLAKE2B 65d5b1380e81c86f035f46765a1a57f4ef3670dfad73a54bdca1e6347ae38db2fcfae9279baede1b2fdc42a4727ab79106124c63566a541875e5c3c8215ea5b7 SHA512 321de8dee4bb986c578203ef9f27e5ba6a8cb830d756edf54eafdb6e240a1120d435c12f5638984f0bb27a56a6f049e76fa382935e4e2b0162d7fa254761cc48
+DIST miniupnpc-2.1.20190824.tar.gz 94564 BLAKE2B 1569e15bc9a886bdee5192526b83e0a628f0d6c9b4449c547c0c22c2ab1f912b1671d84ead6aa6961161bd99e5f62f8428f3867b8f9ca14e04d5f953e6553d4a SHA512 9ed5fc6fbe6f64fbfa23938043732db1999f3c8585422a660fde04fd9e203d7acf8a5c3f1f1433468ea179f090261702194cf5714601c5c0ed9094250352f175
 EBUILD miniupnpc-2.1.20190625.ebuild 1333 BLAKE2B 1cbe9aead1d890e3f72e899dc29c1edb4cb0b0da2fe1ac492871093dca397ee0d7bae4446740083b283fb09014017d3cbdb446aac6c68d8b23db03dc89788b86 SHA512 5547277b02ff777c3d79ed2bfda70da4a3cf9346af4098a475901d9ba85e30c4cd3b9dd2af1be0f0020bdbb139b41537adc63c7da8145ad4b879eb222b09d8ee
+EBUILD miniupnpc-2.1.20190824.ebuild 1342 BLAKE2B f12bd5c9837665f4d53fcffb68dd94886e5a526d84e48414b7c06f1a227c7508a73cc582060edc2dc9be67a54d5404182c03cb89c30ca556de0e9ab9c97726ea SHA512 e28384448ff3a40f5e71625073fab0fc2b0a1c4c5a10e545377df60ca89b9d1c497677b34c1571c6f7696411498bc38a1206c66b94f3f139a37380324a72c43d
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild
deleted file mode 100644
index bfae17481afa..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190210.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
deleted file mode 100644
index 84a21887ff3f..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="amd64 ~arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
new file mode 100644
index 000000000000..daca72280309
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190824.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 kernel_linux static-libs"
+
+RDEPEND=""
+DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+
+src_prepare() {
+	eapply_user
+
+	# These bins are not installed, upnpc-static requires building static lib
+	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+
+	if ! use static-libs; then
+		sed -i \
+			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
+			Makefile || die
+	fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake upnpc-shared $(usex static-libs upnpc-static '')
+}
+
+src_test() {
+	emake -j1 HAVE_IPV6=$(usex ipv6) check
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 326c5df432b2..6e751942ae76 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,6 +1,10 @@
 AUX nDPI-2.2-libcache-include.patch 819 BLAKE2B 5a0698bc19917ebfd737e886937d023e83452bfdd812010e2b2622461ca8eb6758533ecf5c1b01495eab21de72fd7f0608dd826d864336446f893d083b68ed55 SHA512 854b65c5dbdb19bd73040ed12740c945e0f31e50c51a0ebd32c646177043e28eee79e572747fe23580f7c2cca7cf59a22655f084e111bec3e146a4d4b6d941cc
+AUX nDPI-2.8-fix-pkgconfigdir.patch 321 BLAKE2B 1098b213f60fefb46c264f4092e6ac31aa3f227cdc0fc50ee6e2f5a06d1a5fb48735b0d1daeac662ade0ccfd4032837f26f4c3e6805a6cbabcff4f0f0083838f SHA512 e85fedae14902bf11e5520932d0455d517d8ce09821c72ea23afd124a490f072c8b92b0ceb73adc14a35037c3f16a04d99d691e3130d751edb55c5c13d117e68
+AUX nDPI-2.8-relative-sym.patch 691 BLAKE2B 257ee665e40fba3f6a697be8a2a3b7b9954b2b17b6117d4262c448f6bfed7e1043c09c848e8b2ae4ef8e036bceca6e4e617b12d509f34769be1b7dc150e22650 SHA512 3a415dca74bf6a9c1679d48fa469cd035aaf252d22568ff587ac8e5124b765f37795b7d806e6379905bca903e5593058c309c708c40070f45a510efa7538ca16
 DIST nDPI-2.0.tar.gz 19280901 BLAKE2B d08bd807b556394b708713061ef23025be296b3c847c90680170b2d39f23f05fac35a1ced091925383f57c0d0be6e5f0c7ad239168c76caa7b9a46847413e860 SHA512 c8dac1990ff49fc04ee321068d8fc722528c6be0543af2d0bda77936eff12713c36d5abd3fd2472121f2e322e99ba8e57facca813f7b012240c61e16c1a6cd44
 DIST nDPI-2.2.tar.gz 19937173 BLAKE2B a00287d5901487f7e56d7aeab7dcb357c0eb6348be5621952d9f357058419b6378d41b42d0d6e9ea6e20680cfda96fa501f2ebaae5c83dd4e62f756d1089a160 SHA512 ee1e0a1cc87a3971408877bd5d3154f6bd5d4ddcd2437c8e03e5d8a5093da2b1cbfefad1e28e77145af4286eecbd341ef90f94aa5c7f36a98e3625e9948e96d6
+DIST nDPI-2.8.tar.gz 19754226 BLAKE2B c112ae2d9fff872f116a23bbffe7bca39a5c876346b4e41ef503934301f39413517fce169a37a766ffae16b0cb1ee81d96573ffa1ee2519d295dfb32cc1f115e SHA512 aae757047810bbc32700ecf7ac2e5df4b93528021a50da4a0b83865a5248dfca8b1643c75aa7eeb6eac4f155638d45666db487318b2be9adb2f3412cb8ec8497
 EBUILD nDPI-2.0.ebuild 628 BLAKE2B 22d7c6797b085bd92a24e8fe85c4509c832857d10f6158a54ba2e9dfe0a0d8d3d3731def8fe3df7363d4e7b6191977f15b24a4a9010eeac1462bc9c9f8f866d9 SHA512 af0f66872a28048b36a994727c756e365a611e875976568698160ee59f1c0e6dc9401e743c1197e7dbe51e083611ac0557f18d02dde2282a769054311a49e3dc
 EBUILD nDPI-2.2.ebuild 1005 BLAKE2B 21c2bf8c4ecca6458b8023b2fd530193c2986cf6777db3d981a50b80cf22b002c3d041e70f092c917bfd4570b3bd2679a746f7f7d07c09ca406f1d9c905555c5 SHA512 97821a39be0ae0a1a58d8c9b275a674a1a2fba937588191292cfa7d8b281b3a755259e10845750ef22860d57b2d66016d56b1c680ef4741b72224ed83825227d
+EBUILD nDPI-2.8.ebuild 1073 BLAKE2B 62465dfb22f70d24ba4947d7005ffebe89b930336c7ba1dd651649840b39245cd470e72c16c5ca46393bc28120d52315a0685249e7a2aa7f04ded86798b69e62 SHA512 dcf8abb346221acf640f858165a5049522c20ce7919466e733f34839c943b487e9beba309e73f7ee1b7a89ffa3b95115e4c7eb51f48cb42e4c7b5430017ccbe9
 MISC metadata.xml 297 BLAKE2B 2e455c6a6ad027d81612f6f4ec28e25389848def5c8f8ad836ddb920f6b3dfb83a8038c2114194ea7cf79fb63b9ce720f946e02776b0915a41e7eaba0ae4026d SHA512 5f765ad3cc06c790fb16873bc7a759ebb0a432cde847b4e7b8e9dc0f2049441c44d90d54caf007e11deaeca4282ba213f927951060a0ec62bb1836a9cb94e22a
diff --git a/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch b/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
new file mode 100644
index 000000000000..2604b8c34d8c
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-2.8-fix-pkgconfigdir.patch
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2018-10-08 19:04:23.241000607 -0600
++++ Makefile.am	2018-10-08 19:04:46.710000661 -0600
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = src/lib example tests
+ 
+-pkgconfigdir = $(prefix)/libdata/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libndpi.pc
+ 
+ EXTRA_DIST = autogen.sh
diff --git a/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch b/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch
new file mode 100644
index 000000000000..b889d0546ba4
--- /dev/null
+++ b/net-libs/nDPI/files/nDPI-2.8-relative-sym.patch
@@ -0,0 +1,12 @@
+--- src/lib/Makefile.in.orig	2019-08-20 07:34:29.667187396 +0200
++++ src/lib/Makefile.in	2019-08-20 07:34:40.202187657 +0200
+@@ -61,7 +61,7 @@
+ install: $(NDPI_LIBS)
+ 	mkdir -p $(DESTDIR)$(libdir)
+ 	cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/
+-	ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE)
+-	ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
++	ln -Ffs $(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE)
++	ln -Ffs $(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
+ 	mkdir -p $(DESTDIR)$(includedir)
+ 	cp ../include/*.h $(DESTDIR)$(includedir)
diff --git a/net-libs/nDPI/nDPI-2.8.ebuild b/net-libs/nDPI/nDPI-2.8.ebuild
new file mode 100644
index 000000000000..1412a46256d6
--- /dev/null
+++ b/net-libs/nDPI/nDPI-2.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils multilib versionator
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="http://www.ntop.org/"
+SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="dev-libs/json-c:=
+		net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e "s/@NDPI_MAJOR@/$(get_version_component_range 1)/g;s/@NDPI_MINOR@/$(get_version_component_range 2)/g;s/@NDPI_PATCH@/$(get_version_component_range 3)/g;s/@NDPI_VERSION_SHORT@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die
+
+	sed -i "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" src/lib/Makefile.in || die
+
+	epatch "${FILESDIR}/${P}-fix-pkgconfigdir.patch"
+	epatch "${FILESDIR}/${P}-relative-sym.patch"
+
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
+	fi
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 8d2134e63783..b3d5dac1166d 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,6 +1,4 @@
-DIST nghttp2-1.39.1.tar.xz 1634512 BLAKE2B 66444de067200a7dd66f162c22fd258471d336b1ba02f579a675b5d9dfcbf1600fcfb92a37797842a0482bd0f5c850008508d3d41f7afddc47f7c9330fb34b43 SHA512 36558ed03c59086086abbf144ec7c54c60de3fea00a9ea594feea7186a779781cbb66a08c9b34265892dea382b42b875f551e85331cfa0086e357f9b27b919fa
 DIST nghttp2-1.39.2.tar.xz 1635428 BLAKE2B 4569774c33f17d51ac889c385697fcead82106db421399ceb22ad2aafabe64a576445d9272adcf37e2fec47cdd6ac1dc6423efd49012ca7be0aa2087609a0397 SHA512 d8c971543e3e87736dfafebca55e9ecd0644e304c9731edaccba34170205824476595861a439077289b438ad489dd6008dedf2c6b2c111920300329be1b1bf34
-EBUILD nghttp2-1.39.1.ebuild 1955 BLAKE2B 60502c5f8505c6b83441dd6f92b1a6b232a5025b96922341ffe3be0b7543ffe95484be0c38b757849432d02d39d749165a24a9b9c4d7148451d5b8da6772d552 SHA512 3075acc15ecb395a3fea2963652bf0bcdbe8678d1061afe728a7f149722d3bc4ffd1042b2e5987b7f69a78d2070be977e1c8407480d5bd29cfc1743530ef9037
-EBUILD nghttp2-1.39.2.ebuild 1958 BLAKE2B 9e77f91fc8d96b89e9e1bd7915374a55ed62c4fe08fe5ce461f18023eb4ca65fe8ba0783d2949454f40bad8f1f08cef8aa49b81a12b1fe2d42e7d86c6b267aea SHA512 b93041a9f7440aba81501a2beeb3b0f2dfc01aa4e5514c9f03436d005180d07c0e67956301b9afa5e0fe37b55d7fbeaf1f2a1c878accab39400a7622dd4634e0
+EBUILD nghttp2-1.39.2.ebuild 1955 BLAKE2B 60502c5f8505c6b83441dd6f92b1a6b232a5025b96922341ffe3be0b7543ffe95484be0c38b757849432d02d39d749165a24a9b9c4d7148451d5b8da6772d552 SHA512 3075acc15ecb395a3fea2963652bf0bcdbe8678d1061afe728a7f149722d3bc4ffd1042b2e5987b7f69a78d2070be977e1c8407480d5bd29cfc1743530ef9037
 EBUILD nghttp2-9999.ebuild 1966 BLAKE2B 13541411bb8f29654a24fbfd9bfdcc299ce78dff30bfc05de6d66c433cc12f258d9dcad25d222cc9e9f991322d4ff626a220478f5a7c6c61d6009b920f203938 SHA512 d851b5061afdf03f4724c696489915a820437ae62e927e66c3c4089392f8e01fc62e434718391d255d51f42fe61d420cec3de957b81d3c63103b58ffda3ca4e3
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.39.1.ebuild b/net-libs/nghttp2/nghttp2-1.39.1.ebuild
deleted file mode 100644
index 2142ab3bd2e9..000000000000
--- a/net-libs/nghttp2/nghttp2-1.39.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-SSL_DEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/net-libs/nghttp2/nghttp2-1.39.2.ebuild b/net-libs/nghttp2/nghttp2-1.39.2.ebuild
index 1eb2bf7b3f92..2142ab3bd2e9 100644
--- a/net-libs/nghttp2/nghttp2-1.39.2.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.39.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index f9067d583e8d..b4c4b91cddb0 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -3,7 +3,8 @@ AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
 DIST node-v10.16.3.tar.xz 21505540 BLAKE2B 2ae6c3ce96a42cb72a388ca7727affb1e2eae06b997098bd8cad2b339b888f1f188c868d39631c51e10ef7b3a5a9173a3b016afe9fa7a4fb74c24a584781c329 SHA512 5d5457adaae87e41699cdf5bd62d32e9590248f7dadd583614cca9078a1749a4ee477433ebbe4278ec872fdfc377d99097c1e06073e0fd47c8c6597256ccdeb7
-DIST node-v12.8.1.tar.xz 22641228 BLAKE2B 8eba5a3f99a30c2a91d737da91ec963b4dc505f167afb73e7161292bb97ae15b87b14577629c07131048dd9a1e311468185967910ac6bee489ee354e7a3f23a2 SHA512 eddaa9a53de802b3f0e2ffb121feae914fc3aed15271d1568332dc63db328f4bbf9c0700dbd7b5e2ffc6462f2bffe53dd4c65615bd289d1c8badaeb4f5fc580c
+DIST node-v12.10.0.tar.xz 22726116 BLAKE2B deb6ecaec54233050eaeb335d58020b8a82009bbab51c41c00784cab3003e57dbc96f3c25715deefbb5b3aee704b3db920cbb650af33cbcb1a62c1bb654f48f8 SHA512 7eb57b40effa9627b93c74ddc01ce1c044e878c669969c506ed40f72a7946c7c6951931c4fe4fbef456386ad459f7f4f1d0f04177e38343375aa463974ca1dba
+DIST node-v12.9.1.tar.xz 22714668 BLAKE2B c2ab1d67d1f9cf9dee4a1fcb0f1f8f23e2536f526290baf9d5dd05867695f763d8cd8e501b044cb42b383a897f5e016c7a57aecc2d5a4ca58ab3d50020db1f07 SHA512 efe5fbf0545a3e9c37c7598abd89841073cfafefc04a9b5f9f95c8c51357bf3d5384701fd5524ff8fcaef833bca87c72cbf1f8755ee406e9437ad8ad875af18e
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.14.4.tar.xz 15842824 BLAKE2B fc56364be64fe5824e2bb50d861ebf8f58f9895f2c9c108b8df3315b127ffb2755eac85c28165ac9779adab4611ce8f5ea1a5745f43ebaa1389e82b8215c6396 SHA512 1ead0c097ec125230dd631f19a5c3ec06a1371f9ca3b392b5ad08fcc227dd0142f33ad52f96890c2c17448a4951a635b9099dfff00d7d8b3ffb59b07904d1bfa
 DIST node-v6.17.1.tar.xz 15858444 BLAKE2B ad050f71452f0ddf989e66a4eb02e88e4e5001faa2bcb0eae6b57784da87ba1d8251201e3a3d15245bb4d846f31f39854ddfae47aa1212c0526ec717438ba778 SHA512 6938c4864a96f5698ebc4e9a1228644820789d5402f42348eb1ff9ccd64f31bb91309a1f3301636b1117424c88b0b41b42baae51a1070d5c532604e5d7d7b868
@@ -11,7 +12,8 @@ DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d
 DIST node-v8.16.1.tar.xz 18519480 BLAKE2B a721ea5118e6e97ce36245367d33fb2eab8a9b4fba72f59f1a65dfc79de394a235a579fa789e8676d2897a928444db11e7792e7fe49c59bf17ac4cc1cac63941 SHA512 7d2d7c063934227e5204b2912de45ed1667d5c35573322192393bdac623491559ccd9fa8fbf05828bd2bb8e3aeb03d82804775cccb1139b48298758defe92be3
 EBUILD nodejs-0.12.18.ebuild 3391 BLAKE2B 92061062b32ab1c83b58c62968522cd0c7c587f5397ef5cfb7c93d2831264a20be13e7eff242d7f84d67e3be72faaff6db1ea934d0116f074b42048323d7a464 SHA512 97e96b5666ece7ab1c0b66703d584a53331e33df77b9280c2cd062483f3c712f9d913eb5cd444ae8d928f244ecadd90435ec09ddbda72d8464aa99a200ac7eb0
 EBUILD nodejs-10.16.3.ebuild 6417 BLAKE2B 1d7cd3d8b82f94490e6739b789f033072dd5e6455afec4e8f22de91a8ee6e9bcee76c03ee79cc57260bd2fa1de2a2fe3bd73ac0507d86fca906f960c815a6f2f SHA512 314c6f7171f6b79fe925fe725296ce89b2783302253124d4093c5a0472504bffad9fa62d0d06431831f91f2093a8218cb2c49c324bbec36214252d8ea944e0e3
-EBUILD nodejs-12.8.1.ebuild 6438 BLAKE2B 1868cd6d7cfca62e25787d5ad2377c3e19d7704ddf9e71f7539de3066cf5bc40559590895396dec9e5cafa80075f21940b683d680138eb0872655733ee085523 SHA512 205a10d03273f5c5ce64bfd2532c84c5d339d5c5bd0c8a7a40ba1c89abba2352f08b874c537c8ed46c47def9d87e03cd67b168482497927dc27a20d64f21ab94
+EBUILD nodejs-12.10.0.ebuild 6338 BLAKE2B 0704b552013b85d97e8a1219aca81afea248e079b810707b035e9d7e9110bd4c2d629ee23b2479354a553a633a5d1133e94b0334e576d93ab536629f4525c6c3 SHA512 1adac0bfb35867e8158173a7fe131f16aae0976e5299ec043b8fe20284923fc9658d0de69be623b033f3b75ce5ab2c2dd9f68d25584a68d8736bfef2a4ba7d02
+EBUILD nodejs-12.9.1.ebuild 6338 BLAKE2B 0704b552013b85d97e8a1219aca81afea248e079b810707b035e9d7e9110bd4c2d629ee23b2479354a553a633a5d1133e94b0334e576d93ab536629f4525c6c3 SHA512 1adac0bfb35867e8158173a7fe131f16aae0976e5299ec043b8fe20284923fc9658d0de69be623b033f3b75ce5ab2c2dd9f68d25584a68d8736bfef2a4ba7d02
 EBUILD nodejs-4.9.1.ebuild 4381 BLAKE2B 62e1110114fdb91b685fd5b5941539a4296b1568a16238d272f24aa4e6dcf6d2755bc8960fbde2f7611b5fde4dd7567148258b15067f0d9bcfb129539b9c168b SHA512 c68a34e3bd6b8bc8e51a3f34cb729c4857fa0bdb871d0e6c50a5128262161a2bfea692f2a4985e2dc6a007170851ec1176489c2be870e55bae14fe4c1c94492f
 EBUILD nodejs-6.14.4.ebuild 6126 BLAKE2B b5965f1be60e43483275a13bf8acdeb5b90e3903bb0cd3d425bec1347fec76c1d5824f39d4a178a3f4d376f6fb0deed4441be4042514610801cab4f6229c5f96 SHA512 d1f5432bc43c2aaaee1fefa22c8861231844bde4fa14d2b55459dad60ee07d7334dcf0a1bb816827db088352d93d86a599ac4d6807ba0609ac86602bfa613537
 EBUILD nodejs-6.17.1.ebuild 6175 BLAKE2B 7ec3b76f072f4e88df52f58a194544d5092204dce3c62206169b5bf11bad94754ca52a6b1906546668085eb759c893ec64a5c185e0e082992d71648546192f6c SHA512 46b70f2a29c3faa5549122ded4547f8ac5f04a562c1c8fa329b888ec97901c3ed5863cb6b7a08e97288db55eba03999bc7705aaa434fa2b20923058bd2e21e8a
diff --git a/net-libs/nodejs/nodejs-12.10.0.ebuild b/net-libs/nodejs/nodejs-12.10.0.ebuild
new file mode 100644
index 000000000000..c6d70169aeff
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.10.0.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-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="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.31.0:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.39.2
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
+)
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		--shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-12.8.1.ebuild b/net-libs/nodejs/nodejs-12.8.1.ebuild
deleted file mode 100644
index 5d8e9c6b4327..000000000000
--- a/net-libs/nodejs/nodejs-12.8.1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-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="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.30.1:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.8.0:=
-	>=net-libs/nghttp2-1.39.2
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myconf=(
-		--shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-12.9.1.ebuild b/net-libs/nodejs/nodejs-12.9.1.ebuild
new file mode 100644
index 000000000000..c6d70169aeff
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.9.1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-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="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.31.0:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.39.2
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
+)
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		--shared-cares --shared-http-parser --shared-libuv --shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/telepathy-accounts-signon/Manifest b/net-libs/telepathy-accounts-signon/Manifest
index 4ddb9aa0c9e8..df54c661fe19 100644
--- a/net-libs/telepathy-accounts-signon/Manifest
+++ b/net-libs/telepathy-accounts-signon/Manifest
@@ -1,5 +1,5 @@
 DIST telepathy-accounts-signon-1.0.tar.xz 17584 BLAKE2B 6b28df37eca0ce78b11d66cf96b7508bc3e8cf3457b5df2b61bf63666c8b4d4c0bed41cdea9b0135e631c7b663275eef303496724aad342b06fad3ff512f669f SHA512 10058570efbd7dc916a3102b72e506999793ca0ad9ce79f5b33f20d207ec3396fb067242558d2903e49a04b14e7f4717e43475aaaf902a03fc7d4a0bb52c717c
 DIST telepathy-accounts-signon-2.0.tar.bz2 15335 BLAKE2B 5c33403b2c271cc93526058d8415e8f47249018b6fdef4cc9d41ac8f530de61dfa94fd33f1cac433f2ac90077db0a322b8f3907953172ba20bcdee812c852298 SHA512 2fc4e04b47740a0500f6c7a6f08b5d421c1415970c97331b460bdb124b029e35b5288211dfe3da20eab18924a0c05f769094faa258cf05b76665b4428855f1ce
 EBUILD telepathy-accounts-signon-1.0.ebuild 633 BLAKE2B 22575a87923af9e508ced272316d537038d9b6d602d634341d64f78b060c78996605a92da6bb1745336627426eeb60b8f301314080e29aec727596b6576950e4 SHA512 2a7bf5a92fc3085c6eb4e6b3b1fddbff9d2c6eca659ed0a1e27d0ed6595e1b7e9a6fc28d57d7e769a0160e652876bc0a178be4eaf23e7e1031686e6723456e4a
-EBUILD telepathy-accounts-signon-2.0.ebuild 634 BLAKE2B 9f4ddc821cc05a89d0522b9bca5ca315195f63e34aaad8d20d9e5a0c857d657ac561c230cb9a8ce97a0325d4ec3e1c658322c823e3393e2e75f0ff6c59ce3ec5 SHA512 6de189e7e33ec34d0b6d437ef134d74dd3b4b67b71a9f393338d178fe05114f4016676156c3195af5ba224c5c038e4e39eb5877de375730fe8bda2c1f801a853
+EBUILD telepathy-accounts-signon-2.0.ebuild 631 BLAKE2B c5e545d32466d23995946382d10fe81bc7dc876bcfc30219d54641f85434bee092cf7179d2be24575a52f8224a44fd673371f6dca11b428d4b64cd37f2b955b1 SHA512 3424889053d5b1e86b57c705a0aa648a7dfc4793b487a40f91dc606bc614b02daa9e99f3d3a83d25e57550760c45821d9a2f5cfe06bb497d4c3eca5fa073d1d1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.0.ebuild b/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.0.ebuild
index 792e67b9101a..bb6dcafe1795 100644
--- a/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.0.ebuild
+++ b/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/2.0/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND=">=dev-util/meson-0.49.2"
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 12ffd1a95ef3..c56c6c3d3be5 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,7 +1,3 @@
-DIST webkitgtk-2.24.1.tar.xz 17897488 BLAKE2B 62cd6d896d4b4847430f0d41de92595e955db283626dad2aa560071da12ccd0c24093163e15cc50c30ceb96f9767797f9051657ec68f822e7e371c8566872ad5 SHA512 65424f03b6baca53d64f0d633f53e2f7788c7fb65aa8b50b696418c140707c40351ec3cc0a8652806d75b9da98a04a8bb4203dd6ee4c51a3f93878964354c1ca
-DIST webkitgtk-2.24.2.tar.xz 17908808 BLAKE2B bf53f27a5fa15067fb91cbfcff3c2287418c797a4ad03d3a71fbdb194c27e069ab5985b9c8e8df008ed80c80fe2a397d71297b4c187fd7c3acbfe2961d332c50 SHA512 8376167cfc4530886a2ac644ab84ff1021a63f6236d7be9eeb9e0ecade8bad5384b652dfe3720fdd31cddb39df6c935f859f1c0a59f42d7c71998992c4a9ffaa
-DIST webkitgtk-2.24.3.tar.xz 17912032 BLAKE2B 9ac897f10ef25a25b70b73499fb79b72d469c0016231b94fb3376dc8876fd9ac2874bac38450ddf67c80dba8a66fa509c8cd42bc4ce5316d6e4a17fa1346803c SHA512 b358bb11f7df477e5b3d6a12e2e6b41cb4e6a7274e34ce6299bf0c56044ffc7db5a834e9abf5c71d992ef41d194d30171b8be406420ffc54fe766cc811afb79f
-EBUILD webkit-gtk-2.24.1.ebuild 8332 BLAKE2B 6f05f3a6f7f7ec01c540eaa08a709c84f4ce745a1d769bac6be2933b5f142031092aa0527c6dad2afbf73d73ee473a6a4ed6e122f5de3bf729b0bcb133f90a01 SHA512 85599d3537f015f2f546b7dd7c38e8f3b2d83d79904724e836a7ecdf22c6999792a863fc05214c4d6e1b5fb237aaf8bb89c54d7be5310d1b58f8122a668faf15
-EBUILD webkit-gtk-2.24.2.ebuild 8334 BLAKE2B 75b620fd2b5906f2c2f167bae4249fe0b3dac7a26d89ee20c42be5b9619293383ddb43b313804b888347d5664a423486f3d35f80882e31a44094363ef2375358 SHA512 06e9bf8737d871d9fc09c48c1ab91f49a63aa23132fb88523e3c817eec1e60b6347ee543ce0743148fb70b048c93e16820660761a2a7c272c00bb8209ab6f197
-EBUILD webkit-gtk-2.24.3.ebuild 8335 BLAKE2B b98aa4c274eca854357d8dfb7502d6d41308f1434b9d53ed9f249d827579d84ec0ff2c7f46f9231de0ac44c773d7cc92880cd9fcbc63e77218b9d1a9cbfba1b3 SHA512 cee7e4c58cbc63988808e7666b272c0f8ac9d81833613caeb54e1a7403a974a7091dd9e2090bc3053af563891fd4451bb6f0a6abd14dc7bfb5f9a31cd837b843
+DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
+EBUILD webkit-gtk-2.24.4.ebuild 8333 BLAKE2B a99c45d4923a31f68acdbbe60bcdd374cc2388d151766c2466db58805e0e90662190bd97b771da3b72b51020dc2e6739dd183cdd9535267f37e13a5a23184a71 SHA512 61aff64d782c5713ebea6d16f18a1d8d6e39759adc245c0cb215e47b8ae264c32dfbd1dde687413433205c152a6843b4c5cd4ecd7438f357dbde7055942e9f53
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
deleted file mode 100644
index 4438db5fb696..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-
-	if ! use opengl && ! use gles2; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
deleted file mode 100644
index fd02876d1608..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-
-	if ! use opengl && ! use gles2; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
deleted file mode 100644
index 867d03afc2db..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-
-	if ! use opengl && ! use gles2; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
new file mode 100644
index 000000000000..c8444e26f612
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+
+	if ! use opengl && ! use gles2; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 49a55565bf36..42c06088b025 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -6,6 +6,7 @@ AUX wvstreams-4.6.1-gcc47.patch 1308 BLAKE2B 4c49bb694eb50452f3d158ef9e8c8097861
 AUX wvstreams-4.6.1-glibc212.patch 497 BLAKE2B d4ba5b6e687b7746f4be510721ee5fc7fda4d5f8c7c7e9b14479e0301de6329925b8a876ec3e98007d7edcc3646685c1e18b45d4b91ed891a69df4950ccb4415 SHA512 467ef4faad88b4ba150a05f95147bbd2ba8d297bbb5e32a1c85e482b62786e1ec82f6ae8a8f62426c01239ec9e9da899f38fcd7a7d4737dd9a8c9d6de0bdedb1
 AUX wvstreams-4.6.1-openssl-1.0.0.patch 399 BLAKE2B c290744f06cd7781ce64fa43e0d7a076b80fa3130425e2ad19768f6cf3f88bcd007b6ab5d3fc2fef24396cb064c76917a577f25f9329cecbc3c41f1500f4008a SHA512 98d8c8b529e9ce6c8219f70dbec8f9270d14952e88e3f0f0cf16e58cfed2cad8a2bd4039d2006290f9567beaeb5ec77ef500fb5bc812b7a3bac6a1bf4e2888aa
 AUX wvstreams-4.6.1-parallel-make.patch 1882 BLAKE2B 03c40c90d63c72065ad29dcb7436a37e5d5037595c285671a5c7c1b76a74723e63ac7eba024326e7452b4c9af507b2925609faed0496c384c04980044dea28b6 SHA512 d7fffbd7940495f2e34d3317b8f0066f6caa98e213df00bf31e3f42fa6821c9fd017e3052f7ff98303a8d8bb61d9b24a14b87ddd18199038e083e42cf253c17e
+AUX wvstreams-4.6.1_p14-libressl.patch 3457 BLAKE2B f5c1a3ee44007fc3ca7c08be91ed9fbee84939bb09a02d699a2da7aa60238762a0d38fd8be5e7bb3aab891fa8b99f4c0de2a206e6db58fdc12c5adeaebf18700 SHA512 5561021c6ebeb9fc8255eb42be799dc23d32e368cb2662cbb78e5f5258392983bd9b5174954f1262062be1fe5638941255bd612760d1373d5682c139dcaf3ee4
 AUX wvstreams-99999-openssl-ldflags.patch 349 BLAKE2B d8df661e5219b7890e338ed21a570194a93d64142ce6e96f81c141cdb4ae33c6e785fe863278347e2b7903df13a5390305a18568fca9880c2ac45534458671ec SHA512 a8b90e1bbda676ba4303c7a31fc896955c3a0aea0ba4d8a69514210a4baa1cc4228de43b648788cfca2e6b607040daaa520568c7d15b258d04b803bba6375637
 AUX wvstreams-99999-soname.patch 273 BLAKE2B ef364e25848b4727a0e8b75f155ac2807f1d8cc976ea72af3191ca25a0dbb5d4345030812fad7af839e1c126db185b6ce48fb50d2211e810954f2f714717854e SHA512 c8388a5ac1e0bbbf1574c97004ae7381a466a7182614cc7345cc3f9639771e6696ce32ce03b98604a05618be03c30cb95079085e7c1c935c42dcfe5e9453f886
 DIST wvstreams-4.6.1.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e530914e6ac4540e542dc3cee31e00d32211ad1c6085d7f5bd6e5fd85ff66e8c93afa37cec81f976590ba150f039dc8580 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a
@@ -14,6 +15,6 @@ DIST wvstreams_4.6.1.orig.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e
 EBUILD wvstreams-4.6.1-r3.ebuild 2404 BLAKE2B fb696df3dbda56527f29646f03d3f4cfd7507b9af6d08b50771fff15770c35e96bdb19e61b3651abd72f63beb17096216a85b10fd01ef7306ca082406e8e6c68 SHA512 f4a95c3d74d79315e297a78c99ab2fca17b953c2b2b0f62934ed1de78b3ef98aba423057033eee1936717ff32f469b404875944f81b8e6f723f8cd701990ace9
 EBUILD wvstreams-4.6.1-r4.ebuild 2038 BLAKE2B dc58084533c0dd159f6cece9f3e71a0fd986ea9ea79b5042f597f323f34787f2084b1f823cfa014f820c65317b3d27ffa0da7cf138caac68a4c229282d2e5d82 SHA512 b2a9ead8d0b3bb82b8b7dc2f08c51994ba43abae7cda7177ee700d1410652f46f07a8464dacefa8356fb2a97b9d23de005f070fc94b82a14ace273d3061101f2
 EBUILD wvstreams-4.6.1-r5.ebuild 2112 BLAKE2B a48edb2558858a642096d3d5ca9026556d96983d509a4c5cf1d13fee70780354c5b268583c720aaf76f41d3cef73d406fb76b44fd798f9cd075305f527fcb352 SHA512 343a767d872bb15a883444b531461860f57b367478065b6bf190d2db1dffe7576d2e9e63a76a7ff1b66cc7e44c764692e0fe731a895bf937602ef9dc38866d20
-EBUILD wvstreams-4.6.1_p14-r1.ebuild 2082 BLAKE2B 578cc743dbde68c624e9e8a7aa5a58b2e6e4542e70b8de413d2be8233dc259168986813c8fe8702f2e21c6babaa219ba05d00a3b6821bdff5363f0b62a641aab SHA512 ecf7d794298df0dcba5b3cb70693b24a6f13e7a33d1afa8ae7f6ea5431b99b29488c8a2eb7bac76783505f022acbd2557ce1380bbd43099a70783cb2b9d44ddf
-EBUILD wvstreams-99999.ebuild 1907 BLAKE2B ae0a110b682b12e3bdb9a896e8d20defbfd4ef32f53ed58729d91ced4fecaade6f36bfc6282143aa4307ea5a1ac3e27ec5fa4546ed24fe57f2e583a0926e5259 SHA512 8a8a507e142f5731b0bb1608399ad988fba56cb3060b8e55351a963e1fe1d94aa432e04740ea9f5560c9f317892d03f72c8d2d58194dc5bef0d99bcec6f046d5
+EBUILD wvstreams-4.6.1_p14-r1.ebuild 2192 BLAKE2B ee62497b120f33efe48cab6eca998c142d32db0eafdb86413c72e8352d4d3f706dd84e8d78cd31b90a34f32fe5064266172011bc62433f0014aca0e950796750 SHA512 cb0fefeb8deb030026190dd35ddba28217cd5553b8c0c821f5c138c2ad6bb384bbd08a5648fa63567c7c174a60647ee45c86895d021588db1bd6695d8db913e0
+EBUILD wvstreams-99999.ebuild 1967 BLAKE2B c6b1ef94c65245dc9c5cf3937b957a552411c6d7b2eb374526b890257f1bd803e0b3055345996f40b233f48dc444a515aaba5b86f923ec43aec44e896374878a SHA512 bf142a212c96d94795fff5da6e7516f8f4ed24169711a36ecfb51adce5cc9a312f0c14abb17e83a42683fb94126f14f5693a2e4e5b7f25d5fd83040acde5ed0d
 MISC metadata.xml 567 BLAKE2B 75e97c66b9091dd12ae8cabfc3f1f80b772e7cc835d5fe6fc4399dc837ca0576d567af45186bfdaeaefb862938f82d0b75c339ec73fcb0a5f6abe2b81ce8ed83 SHA512 11ce01ce8844fa3c43e8175c36a0f76266ce43acc9d6ed86156bfddc0b8e5f5ede6ecac9518e329c48fa46a448e57021496e46f9282d6d0cc81133ac9488c437
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1_p14-libressl.patch b/net-libs/wvstreams/files/wvstreams-4.6.1_p14-libressl.patch
new file mode 100644
index 000000000000..e897c95bf093
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1_p14-libressl.patch
@@ -0,0 +1,114 @@
+From cb8a81da928054c2e8174d671f2abc88f4f35b87 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Mon, 10 Jun 2019 17:07:06 +0300
+Subject: [PATCH] Fix LibreSSL support
+
+---
+ crypto/wvocsp.cc    | 34 ++++++++++++++++++++++++++++++++++
+ crypto/wvx509mgr.cc | 14 ++++++++++++++
+ include/wvdigest.h  |  1 +
+ 3 files changed, 49 insertions(+)
+
+diff --git a/crypto/wvocsp.cc b/crypto/wvocsp.cc
+index 7d5da072..7a157f90 100644
+--- a/crypto/wvocsp.cc
++++ b/crypto/wvocsp.cc
+@@ -130,6 +130,7 @@ bool WvOCSPResp::signedbycert(const WvX509 &cert) const
+ }
+ 
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+ WvX509 WvOCSPResp::get_signing_cert() const
+ {
+     const STACK_OF(X509) *certs = OCSP_resp_get0_certs(bs);
+@@ -143,6 +144,39 @@ WvX509 WvOCSPResp::get_signing_cert() const
+ 
+     return WvX509();
+ }
++#else
++WvX509 WvOCSPResp::get_signing_cert() const
++{
++    if (!bs || !sk_X509_num(bs->certs))
++        return WvX509();
++
++    // note: the following bit of code is taken almost verbatim from
++    // ocsp_vfy.c in OpenSSL 0.9.8. Copyright and attribution should
++    // properly belong to them
++
++    OCSP_RESPID *id = bs->tbsResponseData->responderId;
++
++    if (id->type == V_OCSP_RESPID_NAME)
++    {
++        X509 *x = X509_find_by_subject(bs->certs, id->value.byName);
++        if (x)
++            return WvX509(X509_dup(x));
++    }
++
++    if (id->value.byKey->length != SHA_DIGEST_LENGTH) return NULL;
++    unsigned char tmphash[SHA_DIGEST_LENGTH];
++    unsigned char *keyhash = id->value.byKey->data;
++    for (int i = 0; i < sk_X509_num(bs->certs); i++)
++    {
++        X509 *x = sk_X509_value(bs->certs, i);
++        X509_pubkey_digest(x, EVP_sha1(), tmphash, NULL);
++        if(!memcmp(keyhash, tmphash, SHA_DIGEST_LENGTH))
++            return WvX509(X509_dup(x));
++    }
++
++    return WvX509();
++}
++#endif /* LIBRESSL_VERSION_NUMBER */
+ 
+ 
+ WvOCSPResp::Status WvOCSPResp::get_status(const WvX509 &cert, 
+diff --git a/crypto/wvx509mgr.cc b/crypto/wvx509mgr.cc
+index 156d3a49..e2bb3ffe 100644
+--- a/crypto/wvx509mgr.cc
++++ b/crypto/wvx509mgr.cc
+@@ -350,8 +350,15 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
+         return false;
+     }
+ 
++#ifndef LIBRESSL_VERSION_NUMBER
+     uint32_t ex_flags = X509_get_extension_flags(cert);
+     uint32_t ex_kusage = X509_get_key_usage(cert);
++#else
++    X509_check_purpose(cert, -1, -1);
++    uint32_t ex_flags = cert->ex_flags;
++    uint32_t ex_kusage = (cert->ex_flags & EXFLAG_KUSAGE) ?
++                         cert->ex_kusage : UINT32_MAX;
++#endif
+     if (cert == unsignedcert.cert)
+     {
+ 	debug("Self Signing!\n");
+@@ -392,8 +399,15 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
+ 
+ bool WvX509Mgr::signcrl(WvCRL &crl) const
+ {
++#ifndef LIBRESSL_VERSION_NUMBER
+     uint32_t ex_flags = X509_get_extension_flags(cert);
+     uint32_t ex_kusage = X509_get_key_usage(cert);
++#else
++    X509_check_purpose(cert, -1, -1);
++    uint32_t ex_flags = cert->ex_flags;
++    uint32_t ex_kusage = (cert->ex_flags & EXFLAG_KUSAGE) ?
++                         cert->ex_kusage : UINT32_MAX;
++#endif
+     if (!isok() || !crl.isok())
+     {
+         debug(WvLog::Warning, "Asked to sign CRL, but certificate or CRL (or "
+diff --git a/include/wvdigest.h b/include/wvdigest.h
+index f2eed401..e637fb49 100644
+--- a/include/wvdigest.h
++++ b/include/wvdigest.h
+@@ -10,6 +10,7 @@
+ #include "wvencoder.h"
+ #include <stdint.h>
+ #include <openssl/evp.h>
++#include <openssl/hmac.h>
+ 
+ 
+ /**
+-- 
+2.21.0
+
diff --git a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
index 58f5b66846d7..34a203bd673a 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="pam doc +ssl +dbus debug boost"
+IUSE="boost +dbus debug doc libressl pam"
 
 #Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
 RESTRICT="test"
@@ -24,10 +24,11 @@ RESTRICT="test"
 #more tightly this time. Probably for the better since upstream xplc seems dead.
 
 RDEPEND="
-	>=dev-libs/openssl-1.1:0=
 	sys-libs/readline:0=
 	sys-libs/zlib
 	dbus? ( >=sys-apps/dbus-1.4.20 )
+	!libressl? ( >=dev-libs/openssl-1.1:0= )
+	libressl? ( dev-libs/libressl:0= )
 	pam? ( virtual/pam )
 "
 DEPEND="
@@ -49,6 +50,7 @@ src_prepare() {
 	default
 
 	eapply $(awk '{ print "'"${WORKDIR}"'/debian/patches/" $0; }' < "${WORKDIR}"/debian/patches/series)
+	eapply "${FILESDIR}"/${P}-libressl.patch # bug 687096
 
 	eautoreconf
 }
diff --git a/net-libs/wvstreams/wvstreams-99999.ebuild b/net-libs/wvstreams/wvstreams-99999.ebuild
index 8665f2087f92..dc51487d43e1 100644
--- a/net-libs/wvstreams/wvstreams-99999.ebuild
+++ b/net-libs/wvstreams/wvstreams-99999.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,13 +12,14 @@ EGIT_REPO_URI="${HOMEPAGE}"
 LICENSE="GPL-2"
 SLOT="0/5.0"
 KEYWORDS=""
-IUSE="+dbus debug doc pam static-libs +zlib"
+IUSE="+dbus debug doc libressl pam static-libs +zlib"
 
 RDEPEND="
-	<dev-libs/openssl-1.1:0=
 	sys-libs/readline:0=
 	sys-libs/zlib
 	dbus? ( >=sys-apps/dbus-1.4.20 )
+	!libressl? ( <dev-libs/openssl-1.1:0= )
+	libressl? ( dev-libs/libressl:0= )
 	pam? ( virtual/pam )
 "
 DEPEND="
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 9fbe2d35525b..e05b310556c2 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 43173f555114..0e45dbdb9e3a 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,14 +1,15 @@
-AUX dovecot-no-log-error-tcp_nodelay.patch 1374 BLAKE2B c665fdbd0d54dc8ddac8f4891197dfa813b39280ab8157a82a3946dc4284fb01710dd4fbc4c3961df4003d8027faeaf8e407223fbbdf0989145254aabb20e56a SHA512 48dc102d4d8e49e1cdfb0f0dee5ca67739f260f5467583c60d5fa6e3de8031da29a830ce56b8f786d6a9568b968bc64707031b193fd40af90c9fda58e152fd40
 AUX dovecot-userdb-passwd-fix.patch 500 BLAKE2B 133e7b13cf3dd1515db5694945abd2d00ecd89c4a766ea873099ebbdd450700e70b80696ba58b21cc4f7160fa3becde6453c9334d41cdad426e3f59bd9e5491e SHA512 18a26eed0c793b0ccee828dc5eafc6448dda94d705597b19c3333f21944e838b677af2884f5fb65eb2f6dc79158ad8b3143b24d3788d841038de6dd24885fc0d
 AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063
-DIST dovecot-2.2-pigeonhole-0.4.24.1.tar.gz 1810959 BLAKE2B f24b28dc7422ea4f379e372adf33ebbf7cbb146d55b01dbf40580767a14adf695b0a2726f591c0c34436bd93a8b48ee8a8c4307fffc6b082d9c028ce93e29a0a SHA512 99af8a1f4588d821c7000133c5c173ab05640d3411b826a0978db2d60c9a59d5b330ca2d38aa25aa1163f6d1b669dc97b8303e2bceda554f67d0029d5d0b34fd
-DIST dovecot-2.2.36.3.tar.gz 6270735 BLAKE2B 90bd6f7cd3769040215f574bb368c1ad835041fff54273e2477be2d2e057c1700472b08a24ed3a7cad469bd39449d94986bc6801373bb97a63975ddbb54cefa5 SHA512 47611dbde7ee854ad323dcdb726757c7172376761fa774f28fce3f9d74ed590319d812f0555abed5f8178c326c3cb7661ac0b708ca5982914e255cec60f72e35
+DIST dovecot-2.2-pigeonhole-0.4.24.2.tar.gz 1833284 BLAKE2B bee45fd129aee3d5126bd48b27829e7e266a5c1043411b6b23655bbf32e2f684763b82bff476a954bf7f0c7aae4e038c0892be70776726c7b324e409a8f89d78 SHA512 a51de88bcbac83ced7d314a560bd44f119dd80bf58f350da522501f072c0a4c02ff8c11152e2b858f14bb8ca9a9b665960cbe37a0c8ef4600b430e65ddbf3bf4
+DIST dovecot-2.2.36.4.tar.gz 6257899 BLAKE2B 3260e96f369e85f2dfd5ece0d9b12902c7192d057369e8a151cc6ab7b4f2033d4e1029fb862d412f2837fd384d7fe729cf1ab15cac9ac335e943bb1fdb532b51 SHA512 e33ab2f6c5f7b4ffca3d57580329f1df8e1655c755a1a6b575a4e49d57ea94d1ab67df2419033c9d68acf5959c6edfa596815dc2bc43798e9aef3d17d271cc4d
 DIST dovecot-2.3-pigeonhole-0.5.6.tar.gz 1854287 BLAKE2B a26edf2a298d8c3de0d9977d56583bd2e0933495c5f554871a38d7b9e31701ebf3587d221c5ec398721a9c34816918c41b069de39c13f879334f9776fede1a17 SHA512 998a046d2eb5ff7bba615fd1a3efdfb1e7e1dabf191257f7fa2882074acc1735a0a4c11c5f31bab1e964b0118f1a8e9e51b3d5529b8fff6d1312c9a8257d9c20
 DIST dovecot-2.3-pigeonhole-0.5.7.1.tar.gz 1857291 BLAKE2B 09763c87099ac50fbe86870855b100379a9b2a72d6077438bbf1f76ff3aed162ad781be27e6587a9742819137f6636f142a220f3b46d3c46115b10cbf4cb2efc SHA512 121eac4ad8bc1ddc55c554d00338bb553590b6aedffcb11e34f6cba102d59bd34580cb7218bd5fe820038c004d12db73f7a27ca135c3d4a12c4449bae3216355
+DIST dovecot-2.3-pigeonhole-0.5.7.2.tar.gz 1857602 BLAKE2B 8de6200bb1ca99d25b48c963c007e9fda07e21f0708d4542e497985a61c07270febd8f29171d607c4025f4651c2ef17d84447a789ebad896c55aa36ec2cd876c SHA512 7fc8d89ee31c8e8c16a9aeaeffb591f4188de36fc80e3a30a9ae10bc5acd7ea5d5d91e077fda566e61d588d9221ec53044ce17a9cc0c9c219dbe6824558a1d60
 DIST dovecot-2.3.6.tar.gz 6980135 BLAKE2B 59ce625aafb96092cbd687aa0d5ccc3d7697228606978efa89bbf50e608915e381abb79348197aaf3b3fa046618bcf88acdc77420f9f028035653b8cb9843009 SHA512 ec28af2efcbd4ab534298c3342709251074dcdb0f0f4bcad0d24b996b273387e2ce557d7ab54abafb69be3ed7dd61f25c82b9710d78156932e2eff7f941c9eb2
 DIST dovecot-2.3.7.1.tar.gz 7076500 BLAKE2B fba84e324de44a4f463769ee8b99ddc532f3ac3fad3c55a1035a367c7b186850cd49c3c45ecea439469e84abf2ae26dcfc8f454c3d2dab43be0fd89721c8053f SHA512 9addfe2be9ae745ac9164e1658e6638df96bd611d45f172e2cd1cb2c6596e4ce534674e9eea3c1d17f497555061031916e0fb9a9fbc6de0eb6034e2fd0bed3b9
-EBUILD dovecot-2.2.36.3.ebuild 8599 BLAKE2B ce60439de2676ad168bbb8355f61072019ea6ad4ef9e357b401bfced19b4d0d0f842926d83cf8e2348db460b1bb3dc7a5537b457835eedfe16e03a024fdfa65c SHA512 ed5940edaa0c1bf67065354f9e433901bc556a2c3db071d8c9d1c6a9ed02b86f151729c6ec5ece5a2924662d3ed8eaf1df19ce1979d325c03b932751b3921afe
-EBUILD dovecot-2.3.6-r1.ebuild 8717 BLAKE2B 5e61b8154648de4e65b5bd9601544bd032c2e8a03f7259654f819b6fab22379ddfac701930ef079e14f7ccaa7c08c86042c419281ce96baeb018f24686bbabc9 SHA512 264191a2fb2d79cd57e800d7c95a64f3c0677901941a7c3ace92cbad3e8f7c6cf812a5b68de78993715c7bc2793c809733510145c103020d6a5f7f555fc9976d
-EBUILD dovecot-2.3.6.ebuild 8782 BLAKE2B 0f108ca6de24026c9220d8ab60001726256bf2a39361fbe22b67e15ca8c1f9e1dc30868296045985f66ec656cb1903347efb96fca3a40af41c220c51884b6f66 SHA512 c3e032b287e03e70c50f8ffd28dfcc0cad977a76dc173e20b7ca801190b5f1747dc08b1a400e553853806c907ef3351b2d0956ecd645c05017ea2ea7d59b8602
-EBUILD dovecot-2.3.7.1.ebuild 8719 BLAKE2B 2d5fb6a84f8de0690b51f0d11844f065cff11474e37903dd516f0e468c01037cf69bd97b7d38371af52393a296a91707225dca3331021010a2a1b77a82b6b202 SHA512 7b4b37372ad55ed4249fae45d397ea237f458ea9bcc5ed9dbce9d317329509efb456e3bc09e26f670b04cfb7f4a36ea0969751fe49a9dc944d604a1aa9c00674
+DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d
+EBUILD dovecot-2.2.36.4.ebuild 8567 BLAKE2B 4d29cba3ccfabee9a205074796fc7169eb6d0bd53d88a44262b7838b06252216aa0b37cb63d5fc88ae08c3b506d32752f6f6a61180d72ae1de7f745b3e352bab SHA512 77705e2406995c784460ff9cf71fcf605a4ec2f62721e8ab7280b1841b725971ab7d6d77e5ceddd31d7a6d715e515d07a1cac60b158296032b597df861b6bde6
+EBUILD dovecot-2.3.6.ebuild 8750 BLAKE2B c0a9f8e7c192bd05025514cea8afa1e25c9f7475aefba60868ecd2f72670036c6d489d67ae5ab1528647545c3a5dca687c916a51b1ea58ce28bbc3eacdce4efb SHA512 d4a86bea299e45614d3485695253676c4407e84f17c61da0959429b882161e51dc2886ffea19200fb581d4bac59e7013ae361e03c2fd6d3ec11e425bea5b867b
+EBUILD dovecot-2.3.7.1.ebuild 8687 BLAKE2B 0f9352889df0e72b8be0234df21909ec706a81cd666b5914253e16f39b0be4010da41d69f27c77c3368ef473692fefd4a9996abbe7cbf135f25ade3e4d803739 SHA512 f7ef9cc71b89a0f735554ee133ad29a25c40c634d9e664fd7427952451af3a1363e4f9ddb348a305cad28a94941f7c1f29b7b8a5244a44d6b439387847b5ebf4
+EBUILD dovecot-2.3.7.2.ebuild 8680 BLAKE2B 6cd1f0f0b1f35d915b16d7d4d06fa92ed1b668486628b82e21b9e15b2d79fe86cd7141c8a591e607574e7eba6a44cf6ecca25a8ed16b0626e8c7564fa12c2d90 SHA512 75a4a5dd9b55afbd751f5fb879c2b2e0ed53ea3202281138ecd348653d030d498c2642121fa75cd6868edda792cb2c6570f8dfdbaa7e98e4ed34a1658c81a90d
 MISC metadata.xml 941 BLAKE2B 8432d32315ba8c4ad55cdbc6cdfc85b9cbd2aab5928f8f3fbaa1e33093a272ee36abfaeb8d4e6f2a7658bdf9a9f481efe3ac18e5b5b901c74addc63979bcc312 SHA512 f8347117eb6039d0340ab53e0ccd82cd269a3f50d2747a780ccfee26b6e598347337f73b75c1e6f4f814c86918c4d0325c4c784a04a86b3d66ceb58bfe94d98d
diff --git a/net-mail/dovecot/dovecot-2.2.36.3.ebuild b/net-mail/dovecot/dovecot-2.2.36.3.ebuild
deleted file mode 100644
index 9e06b4534ad0..000000000000
--- a/net-mail/dovecot/dovecot-2.2.36.3.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools eapi7-ver ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.4.24.1"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-userdb-passwd-fix.patch"
-)
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	default
-	# bug 657108
-	elibtoolize
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--with-icu \
-		--with-ssl \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-	-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.2.36.4.ebuild b/net-mail/dovecot/dovecot-2.2.36.4.ebuild
new file mode 100644
index 000000000000..ddcf00b21ae2
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.36.4.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools eapi7-ver ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.4.24.2"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-userdb-passwd-fix.patch"
+)
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+}
+
+src_prepare() {
+	default
+	# bug 657108
+	elibtoolize
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--with-icu \
+		--with-ssl \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="${S}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install () {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	# Let's not make a new certificate if we already have one
+	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+	-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+		einfo "Creating SSL	certificate"
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+		install_cert /etc/ssl/dovecot/server
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/dovecot-2.3.6-r1.ebuild b/net-mail/dovecot/dovecot-2.3.6-r1.ebuild
deleted file mode 100644
index 20f2b5332e0c..000000000000
--- a/net-mail/dovecot/dovecot-2.3.6-r1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools eapi7-ver ssl-cert systemd user
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.6"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="argon2? ( dev-libs/libsodium )
-	bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite:* )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	suid? ( acct-group/mail )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv
-	dev-libs/icu:="
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-userdb-passwd-fix.patch"
-)
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-}
-
-src_prepare() {
-	default
-	# bug 657108
-	elibtoolize
-	#eautoreconf
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--disable-rpath \
-		--without-libbsd \
-		--with-icu \
-		--with-ssl \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$( use_with argon2 sodium ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with lzma ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX%/}/var" \
-			--enable-shared \
-			--with-dovecot="${S}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		docinto plugins
-		dodoc doc/plugins/*.txt
-		docinto extensions
-		dodoc doc/extensions/*.txt
-		docinto locations
-		dodoc doc/locations/*.txt
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	# Let's not make a new certificate if we already have one
-	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-		einfo "Creating SSL	certificate"
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-		install_cert /etc/ssl/dovecot/server
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.3.6.ebuild b/net-mail/dovecot/dovecot-2.3.6.ebuild
index a37dbd5f911f..7abeccbbadd2 100644
--- a/net-mail/dovecot/dovecot-2.3.6.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.6.ebuild
@@ -167,8 +167,8 @@ src_install () {
 	# better:
 	if use suid;then
 		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
 	fi
 
 	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
@@ -194,7 +194,7 @@ src_install () {
 	doins doc/example-config/*.{conf,ext}
 	insinto /etc/dovecot/conf.d
 	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
 	rm -f "${confd}/../README"
 
 	# .maildir is the Gentoo default
diff --git a/net-mail/dovecot/dovecot-2.3.7.1.ebuild b/net-mail/dovecot/dovecot-2.3.7.1.ebuild
index 9ca01af7c7fa..89f0139e20b6 100644
--- a/net-mail/dovecot/dovecot-2.3.7.1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.7.1.ebuild
@@ -164,8 +164,8 @@ src_install () {
 	# better:
 	if use suid;then
 		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
 	fi
 
 	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
@@ -191,7 +191,7 @@ src_install () {
 	doins doc/example-config/*.{conf,ext}
 	insinto /etc/dovecot/conf.d
 	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
 	rm -f "${confd}/../README"
 
 	# .maildir is the Gentoo default
diff --git a/net-mail/dovecot/dovecot-2.3.7.2.ebuild b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
new file mode 100644
index 000000000000..8f049006a00a
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools eapi7-ver ssl-cert systemd user
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.7.2"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="argon2? ( dev-libs/libsodium )
+	bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua:* )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	suid? ( acct-group/mail )
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-userdb-passwd-fix.patch"
+)
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+}
+
+src_prepare() {
+	default
+	# bug 657108
+	elibtoolize
+	#eautoreconf
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--without-libbsd \
+		--with-icu \
+		--with-ssl \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with argon2 sodium ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with lua ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX%/}/var" \
+			--enable-shared \
+			--with-dovecot="${S}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install () {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	# Let's not make a new certificate if we already have one
+	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+		einfo "Creating SSL	certificate"
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+		install_cert /etc/ssl/dovecot/server
+	fi
+
+	elog "Please read https://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/files/dovecot-no-log-error-tcp_nodelay.patch b/net-mail/dovecot/files/dovecot-no-log-error-tcp_nodelay.patch
deleted file mode 100644
index 3a2acd74fb65..000000000000
--- a/net-mail/dovecot/files/dovecot-no-log-error-tcp_nodelay.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/lib/ostream-file.c b/src/lib/ostream-file.c
-index e7e6f62d12..82bf729ac0 100644
---- a/src/lib/ostream-file.c
-+++ b/src/lib/ostream-file.c
-@@ -333,17 +333,17 @@ static int buffer_flush(struct file_ostream *fstream)
- static void o_stream_tcp_flush_via_nodelay(struct file_ostream *fstream)
- {
- 	if (net_set_tcp_nodelay(fstream->fd, TRUE) < 0) {
--		if (errno != ENOTSUP && errno != ENOTSOCK &&
--		    errno != ENOPROTOOPT) {
--			i_error("file_ostream.net_set_tcp_nodelay(%s, TRUE) failed: %m",
--				o_stream_get_name(&fstream->ostream.ostream));
--		}
-+		/* Don't bother logging errors. There are quite a lot of
-+		   different errors that need to be ignored, and it differs
-+		   between OSes. At least:
-+		   Linux: ENOTSUP, ENOTSOCK, ENOPROTOOPT
-+		   FreeBSD: EINVAL, ECONNRESET */
- 		fstream->no_socket_nodelay = TRUE;
- 	} else if (net_set_tcp_nodelay(fstream->fd, FALSE) < 0) {
--		/* We already successfully enabled TCP_NODELAY, so we're really
--		   not expecting any errors here. */
--		i_error("file_ostream.net_set_tcp_nodelay(%s, FALSE) failed: %m",
--			o_stream_get_name(&fstream->ostream.ostream));
-+		/* We already successfully enabled TCP_NODELAY, so there
-+		   shouldn't really be errors. Except ECONNRESET can possibly
-+		   still happen between these two calls, so again don't log
-+		   errors. */
- 		fstream->no_socket_nodelay = TRUE;
- 	}
- }
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index b7814d2fa227..0defee44ee7a 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -13,6 +13,6 @@ AUX twomsg.at 2216 BLAKE2B 8a0ac15f6c2a8824406d9a74e14f3143e48b9fd7636732bfae918
 AUX weed.at 1100 BLAKE2B 120c50265f45b192afa583e594cbf75d753f33aa129f71f3e076780e71224605d735722cb50ba078aa9747b286291d560d9b5e28393239995c1648407070db97 SHA512 84fa4564cb1876c1b9f1a8b143f8fc95829de5d2b02edf8894d86aa50efcdd5696d66d773737a8989ccc4ae22d4d0e2c4b7c055e281faabb82cea399150b2821
 DIST mailutils-3.4.tar.xz 2619672 BLAKE2B 3a49c319a7171b2659477e6892ae222a342243e84ed2ee93e6d77353e1871d57d101a3a6ee3d2442709adbfb090e4931e134369661e8e8aa407061c1eccdf862 SHA512 548d97a4a036ef0ef5a429c82ffa43dd377b210b4c4d3844e7e5dded0f963060e3733b7766821c06ccf4dc1135002608658bcd6420e75b4ca1f4f17cfc8e2573
 DIST mailutils-3.7.tar.xz 2846864 BLAKE2B d407d370a4823972c060ea6c6a6e16eefe46598fee8302159f9d44fe150ace32b6915e7e3d4ddaca63ed5d5a5cffce48514f7f6297413a97692eb609a295622d SHA512 aa93ee1cde76392808f492dae6c69625ab124a2c31a296449ba217fc26f292871b4d04f8720bf20377177eab33c01cbfe195d6ac3674c35e1db53157a6916a4d
-EBUILD mailutils-3.4-r3.ebuild 3661 BLAKE2B 282581bc98cbeeb486ed13f1524bd52e501b2643ab3a4b5bfb5bca7cebc51f3b78b13544b0a041c73b2b8b6f8c11aa15be29e522037b2ad339fd1408269eff55 SHA512 405bff601f64bd22e80063b863ae337caa4d29608bce3c55071e7eb954daff645f605ce43957980c847648e10243c0ee20dfea491d5fba4105c58ea10de56b85
+EBUILD mailutils-3.4-r3.ebuild 3659 BLAKE2B 2ebc7f7e7ade4bb105bdc048e9abdbf1760eda5ce61469389e9c75b3e417dc1cf99c8304aca16514f4f917ecbea7fcccec4f474828b57bf28dd3a79abfeac85d SHA512 6491a8647fa1d91013fc3e03f5195a488182997967fb90019f32c5bc7f8820f3db07e7bd10f4cb43788d28bfb517c8a52ad6969f3e79197bb6756cc4d003e6f0
 EBUILD mailutils-3.7.ebuild 3619 BLAKE2B acb7c1ca9fa7fabcb6713440bcfe7987b67179ccb687bf3b8247071a2cbf43a6852865362b9ea148c033b8587766bd575198a41001e25c9f823f7b12f9e75072 SHA512 434d96f09388488e44facf0bf973846ff3d324da5adbcc64335fd5f0da5b9a7367f7a35856e806e6c6e5e9c36ea624b84b96b80789648e8bf8652742a32c5891
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild
index c2ccdf90bbc6..a3180e98440c 100644
--- a/net-mail/mailutils/mailutils-3.4-r3.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index c35b43f08144..51518d3f4515 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,6 +1,8 @@
 AUX 70mu-gentoo.el 76 BLAKE2B 478ebba49409f7b1fd601e4c6019cb9da7cc8c6f9b4f7318155225fa84ebd82cb73ba79637c0aa2dda9d9779e525b0577bc940a0d613a3fa64031e35f3178a46 SHA512 61cc2bf611a0d1f2aa53b4624c52e1aa9672a81b4b8d7386aad1bf70b0b0db6ee19e011acc5a1a28b220d99eb3683140a2ff02dc3e01ea68f512ee05ec7bc23e
 DIST mu-0.9.18.tar.gz 2250319 BLAKE2B 7eb83a797eccff706ac6b264a7d56feae80e40f370e190e0a94f2524dd73a8bfdb35599909f90d0a2b87fc513bbcf2b00fa307a3e4d0b6718ebdc7f7fcdc6df0 SHA512 47104d18547de0871782abc4e1c6dbf1f9b2489410e5716043861bf8d973d33d2138de7d7ac568b300ca86ae9f1a0fda0fa9555ad9a5938771336ef958183546
 DIST mu-1.0.tar.gz 2273670 BLAKE2B a771b00159142fa4a671d07cf9de6f0f941c432ddee31f19606c260ba3dfef857a36a333f5ede4ca30be88d7b7eae28e996e15a8deebd96971b341f0f72bfbbb SHA512 49b0b86f22e9a6ace1fc3fd6e7a8a523aa9edf092b953d59f59a1ef7311c8c546a261a1a186e3285cea788be20c816c70ac08d1514f700ff97258a2012ad394d
+DIST mu-1.3.3.tar.gz 2304029 BLAKE2B e2bbf3f7aa22ba2e1fd64b0e35df3e857dd3ec7874d08d36350a5d80abb36c667dee3cb43adf481dfbabd2a7944e84207d1913cb2525e637878a86fa70b213af SHA512 ab7844aef1ee6526a8b4ac1b98f6dc323fa01be6ac999f7b8a57b1c2aee6eec60a5643589c0477e8fede2f5140a8aa9050f00e52a30aaa1cd6b1cdbd66e441bf
 EBUILD mu-0.9.18-r2.ebuild 1967 BLAKE2B 2fc80cbf26459398f0f12824cb310eafe4b0af676dfaf1d680bbff480ff7bcbd363ef6db1b022d87b6fa6333be33c47e47baa2a04db9d00653062724075243d2 SHA512 d2d2aaf0e23a3edb2871353eea2beee972aad3a06d1ad30dedb94d0c283850a2ebbf537dd3245e447968ee202105fa0ff1f8b965964765d3e0312cf9f7f1a824
 EBUILD mu-1.0.ebuild 1970 BLAKE2B 1f0d0ec3b5cc6c79a0a83c4c5d0488e81e92304e15134dd4902aa78f63ca77a120a7d10930261eb061f425bdff3d985d0d9fee63f7952abf10a65768fbdbb39c SHA512 1c9522b996bc308452352ecd6343280e95ddc3ce2684918c18f032537d92f1327f9a1271a1abc30ace3469985c628c0eb1c567e61fd634d87e30fb3f0c1f36a8
-MISC metadata.xml 630 BLAKE2B 0a24656b86c87b2af1d9b00fc8be0fdccaa2fa28d6b1d8a4146b3d4df7a9edfa3934b28f54615115e1369da32b10e52fefc9ede45b5b59e4c5055d43f797427b SHA512 644b98b1c92e4a8b3e51a9d75d815869f84908aa0fd434c6ac24ca327820e6a2eed31013351a89f33aac9a8a0db91636e8912e5b0417556b45d888e3b1b7ac62
+EBUILD mu-1.3.3.ebuild 2099 BLAKE2B 863cb8a39459777dbae5fd4601fbb88a51d1fa3bdd97f76699f798484a715677e8b8c6fbae080ae2265ca078e13d9267c023bf06073053377ed25cd941441385 SHA512 f120292c849d27aa15a67fa84fc7f485b076d86565be96f42295115cb04daa55fb69d7b71be50b81aaa7de038fad5020c3c404dea64f8a200f1cd2715ad3c31d
+MISC metadata.xml 823 BLAKE2B de3b4bd9c6633407c16cf0cc5704a3d7fa6a67886139adaa7b23e1b1eea82e3ba19bcc53beaebdacc8d7a2da71539c216f7c62210d698b10ffe33215783e23ee SHA512 bd2265c198b8342c47c5cc428811993f8187b8dee981df72531097b9d8f2c01e21bc2ec39ab1a1f291e189ef2bdb788153f0bfe5f2479e6faa1cb9e6ce0079ae
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index f5c66685bfc7..52409e491151 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>matt@offtopica.uk</email>
+		<name>Matt Smith</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		'mu' is a set of command-line tools for Linux/Unix that enable you to quickly find the e-mails you
 		are looking for, assuming that you store your e-mails in Maildirs.  It also includes an emacs based mail client mu4e.
diff --git a/net-mail/mu/mu-1.3.3.ebuild b/net-mail/mu/mu-1.3.3.ebuild
new file mode 100644
index 000000000000..96b9d5115927
--- /dev/null
+++ b/net-mail/mu/mu-1.3.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="http://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs guile"
+
+# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
+# really wants both installed at the same time.
+DEPEND="
+	dev-libs/gmime:3.0
+	>=dev-libs/xapian-1.4
+	dev-libs/glib:2
+	emacs? ( >=virtual/emacs-24.4 )
+	guile? ( >=dev-scheme/guile-2.0 )
+	!net-mail/mailutils"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+SITEFILE="70mu-gentoo.el"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Note: Author recommends that packages do not build the webkit toy
+	# Todo: Add gtk USE-flag
+
+	econf --disable-gtk \
+		--disable-webkit \
+		$(use_enable emacs mu4e) \
+		$(use_enable guile)
+}
+
+src_install () {
+	dobin mu/mu
+	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
+	if use emacs; then
+		elisp-install ${PN} mu4e/*.el mu4e/*.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		doinfo mu4e/mu4e.info
+	fi
+
+	doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \
+		  man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \
+		  man/mu-mkdir.1 man/mu-query.7 man/mu-remove.1 \
+		  man/mu-script.1 man/mu-server.1 man/mu-verify.1 \
+		  man/mu-view.1 man/mu.1
+
+	if use guile; then
+	       	  doinfo guile/mu-guile.info
+	fi
+}
+
+src_test () {
+	# Note: Fails with parallel make
+	emake -j1 check
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/"
+	fi
+
+	elog "If you upgrade from an older major version,"
+	elog "then you need to rebuild your mail index."
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 2ac172ef50dc..7f4af32582db 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -6,5 +6,6 @@ DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b404677
 DIST notmuch-0.28.4.tar.gz 922364 BLAKE2B f22d52ecc982b086b5d2a67d3b9ae4a379bdcb9e9acf3e77060fd7d97439347e3b4cd767f2c9c3c48657b80f63316f6abc09a653d6791e27b4a8996adccf42a9 SHA512 77d7ad81e1f7dc93ae6392346da434f6dc74c21d19be728c2a6ca283c429f36e7081387d223af58eb5f63f5d2a8ad8367f0103f0bb9d052890c07fe419abbee7
 DIST notmuch-0.29.1.tar.xz 660352 BLAKE2B d145aba2d1a376e8cbcff3d51f9a7093649912a54273f91cce2a56fb414e222c2bbf0aeb510894278bf7dca8a96412400d55897a4d42281ab9c110d9bc8207a6 SHA512 9b76a7c8c62cb67b64a0008f80a82eeecccd20267ddba67d4d96a768815466c305f154769947bb9526e02c7a1696faaf69e94b90007603b185589be0c7c2a5d8
 EBUILD notmuch-0.28.4.ebuild 5090 BLAKE2B 8987d5ca0226b9a8093a3e1d0c48cbd24272a4f5aa1e41833ea9cd10cb02fed6199181116700cb0cb025301460397d5cca6300e7c33ddb84aac54c8476c332bd SHA512 971f6d3a84f360f8e4bfe161017fb79c58918610752344dff99bc9872fb303b14e172e2224e52c32130742b1e74e97ec879b5e1b0cef2a7e386b2f7eef4156b5
-EBUILD notmuch-0.29.1.ebuild 5038 BLAKE2B 75f4181ae4670d6019d4715255b451c28a3cec3e0a2dc27a7bdfd3b3e7ad88bdf25eda710deae7e90f583a1998e9769f30559574d2887bf1b32cc46008e315fd SHA512 f3beed9c567af5a0af98af8c46f497adf1f6400d42fe75abc968cdbe65f38869e9b07fb65fa1a00c7d42f38be18b124f60775d15933ecf8cc8a9ff993cd57b7d
+EBUILD notmuch-0.29.1-r1.ebuild 5197 BLAKE2B f847ac52b619bd10a4a294b27bf1149dc5c0309933c197eb17d2fa9c91dfa41036dad9c480afa1390c49cb062e4c12e897eb7f970552d91d2775c2797601bc22 SHA512 0ef0cd052e0704c155274dc7cf90eb7b28cd097bb4baaaa1dacf8c7228a17a7a6a1ed871512dd2379763722531e349b6d8d9387c4f39a84578b18d5d2c19223b
+EBUILD notmuch-0.29.1.ebuild 5215 BLAKE2B 13850458a70677d973331165accdac1884c4186bef74cef558dd32af43a9247f579cd0a5a2992fefd5c7a941aa7001564a585d0aecc823d4958fcf5ccaf1e3c5 SHA512 d6261d95f80d5c2ba8a04176b394ff58028e8caa0b7b25b9d95f63c7ab3061adc2e569eb8ac4432332ff5ec13c8ee038c500be832e5d7ee70d60475b0047bb89
 MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
diff --git a/net-mail/notmuch/notmuch-0.29.1-r1.ebuild b/net-mail/notmuch/notmuch-0.29.1-r1.ebuild
new file mode 100644
index 000000000000..0124be3ef9a2
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.29.1-r1.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+	distutils-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.xz
+	test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+	"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+	!!<app-shells/bash-completion-1.9
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/gmime-3.0.3:3.0
+	>=dev-libs/xapian-1.4.8:=
+	dev-python/sphinx
+	sys-apps/texinfo
+	>=sys-libs/zlib-1.2.5.2
+	sys-libs/talloc
+	crypt? ( dev-libs/gmime:3.0[crypt] )
+	emacs? ( >=virtual/emacs-23 )
+	python? ( ${PYTHON_DEPS} )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	test? (
+		app-misc/dtach
+		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl )
+	)
+	valgrind? ( dev-util/valgrind )
+	"
+RDEPEND="${CDEPEND}
+	crypt? ( app-crypt/gnupg )
+	nmbug? ( dev-vcs/git )
+	mutt? (
+		dev-perl/File-Which
+		dev-perl/Mail-Box
+		dev-perl/MailTools
+		dev-perl/String-ShellQuote
+		dev-perl/Term-ReadLine-Gnu
+		virtual/perl-Digest-SHA
+		virtual/perl-File-Path
+		virtual/perl-Getopt-Long
+		virtual/perl-Pod-Parser
+	)
+	"
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
+PATCHES=(
+	"${FILESDIR}"/${PV}-0001-Use-loopback-IP-address-rather-than-name.patch
+)
+
+bindings() {
+	local ret=0
+
+	if use $1; then
+		pushd bindings/$1 || die
+		shift
+		"$@"
+		ret=$?
+		popd || die
+	fi
+
+	return $ret
+}
+
+pkg_pretend() {
+	if has_version '<net-mail/notmuch-0.18'; then
+		ewarn
+		ewarn "There are few not backward compatible changes between"
+		ewarn "<notmuch-0.18 and >=notmuch-0.18.  See NEWS file"
+		ewarn "(0.18 section) for details before first use!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if use emacs; then
+		elisp-need-emacs 23 || die "Emacs version too low"
+	fi
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	bindings python distutils-r1_src_prepare
+	bindings python mv README README-python || die
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# assure that new Makefile.config will be generated
+	rm -f Makefile.config || die
+
+	sed -e 's@^install: all install-man install-info$@install: all install-info@' -i Makefile.local
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		append-ldflags -lnsl -lsocket   # non-autoconf configure
+		# disable gpgme test using too old gpg-key
+		sed -i \
+			-e '/GNUPGHOME=/d' \
+			-e '/SESSION_KEY =/c|| false ;' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	python_setup  # for sphinx
+
+	local myeconfargs=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	tc-export CC CXX
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	python_setup  # for sphinx
+
+	V=1 default
+	bindings python distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		emake notmuch-mutt.1
+		popd || die
+	fi
+
+	if use doc; then
+		pydocs() {
+			pushd docs || die
+			emake html
+			rm -r html/_sources || die
+			rm html/{objects.inv,.buildinfo} || die
+			mkdir -p ../html && mv html ../html/python || die
+			popd || die
+		}
+		LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
+	fi
+}
+
+src_test() {
+	pax-mark -m notmuch
+	LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		doman doc/_build/man/man?/*.?
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/notmuch-report
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		dobin notmuch-mutt
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd || die
+	fi
+
+	DOCS="" bindings python distutils-r1_src_install
+	use doc && bindings python dodoc -r html
+}
+
+pkg_preinst() {
+	if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
+		elog "To enable notmuch support in mutt, add the following line into"
+		elog "your mutt config file, please:"
+		elog ""
+		elog "  source /etc/mutt/notmuch-mutt.rc"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/notmuch/notmuch-0.29.1.ebuild b/net-mail/notmuch/notmuch-0.29.1.ebuild
index ffa74708369a..4984cf17d69a 100644
--- a/net-mail/notmuch/notmuch-0.29.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.29.1.ebuild
@@ -131,7 +131,14 @@ src_prepare() {
 		append-cxxflags -g
 	fi
 
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		append-ldflags -lnsl -lsocket   # non-autoconf configure
+		# disable gpgme test using too old gpg-key
+		sed -i \
+			-e '/GNUPGHOME=/d' \
+			-e '/SESSION_KEY =/c|| false ;' \
+			configure || die
+	fi
 }
 
 src_configure() {
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 8314997aed1d..adf081a38df2 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -2,6 +2,6 @@ AUX rss2email-2.69-config-location.patch 433 BLAKE2B 068d30efe9658b51d3327a18ade
 DIST rss2email-2.71.tar.gz 63268 BLAKE2B 56c4e2b59611ffcb0e7a9ff3558e6ed4da3f5ba186d5c2f84b715b8b63bf4729a57c1986f910a46d81813f3e756e07a35959e3000f1bf65839a5da830c50377f SHA512 242a4f2e4fe64f42e3348f8c159d91f79121224beec4faf542393c8323bdcba85510a28fc967ec59702f08205de1d40c2a26235f9d5590751f392880a7211c60
 DIST rss2email-3.10_pre20171001.tar.gz 162385 BLAKE2B 91ae17c43cca616750139b6d559fcfff50be682f70a932ae3e1e281c2a1ae0c31419d37ce7d8887b72873359f0ce29dfb03a1a7c19cfdc2fc945902110b6a3a1 SHA512 d0174489b1d5be9f18e720351f994a87ac0d6131fd23914deb1305223a022e3a741cf279c68c533e8dfe99112af334223354dcd145b38c09e32e16e1a80898ff
 DIST rss2email_2.65-1.diff.gz 8626 BLAKE2B 25b497e099d6093d94a29bf79d89b53d51cff0ed71c926e709b17d8a5a066d13a64c75e162ab02fa34756c49891595f43d1031f4549bf5603238d76bf8e1ac3d SHA512 cb0ca7f6c02f342305c6c19f03973f91343ca530a6a858427bfd6a57948e6123e02d64b1285efed10cda9541f3237f666d8e1a7954a3c2b57866a68dd43b8d8d
-EBUILD rss2email-2.71-r1.ebuild 1621 BLAKE2B 90f214d11231318e13fe6acffce72837a36c6a39b378e0eb60fc0cc0ab6626b5e589c35975a11f1ef596adca540995c22e3235f227a93568d0005af2e1d363c8 SHA512 c758468374d63600c7800453186f1ce42279090cd3e39c9dff35f6fdb26a7720758ea0610bfbf99d95d38b9bd204a36217a6a91805eb662f7fd62b1f7baada53
+EBUILD rss2email-2.71-r1.ebuild 1607 BLAKE2B a0e69e478f16725053bb8bfdc195c4be5165dd5039a4a59cccb39886ed4914cb690428b40e920978f9c3111389e4c819fa9e6110bef3af65eaa45195fba9b401 SHA512 e35e6f5cb45092227df9d25456ab79d56922b5208d0875fef35f6ae4f1536e33619ab4d1473a5c8cc01854bdefcd574cd915a87fba171e73feca08dbe11b2bec
 EBUILD rss2email-3.10_pre20171001.ebuild 772 BLAKE2B d857de7cda75d2b8dee0754fb38766f6de250ca1dadbb9b3f89e7c40b352cd4abc16887919a0f5c82ae1511a15df2647580393ba9d649aa9024e2976c3262978 SHA512 ae9f03a4b150d80be8082d063b2d55b6e8e7d3c0cca9b0531a82191d79f596ed16fa9cb80bf7855c091ec06e3eecd33f31a3977a65355b310ceca743a904d29b
 MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
diff --git a/net-mail/rss2email/rss2email-2.71-r1.ebuild b/net-mail/rss2email/rss2email-2.71-r1.ebuild
index b8476f504875..1fbb40b32186 100644
--- a/net-mail/rss2email/rss2email-2.71-r1.ebuild
+++ b/net-mail/rss2email/rss2email-2.71-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"
@@ -44,8 +44,8 @@ src_prepare() {
 
 src_install() {
 	my_install() {
-		insinto "$(python_get_sitedir)"/${PN}
-		newins rss2email.py main.py || die
+		python_moduleinto ${PN}
+		python_newscript rss2email.py main.py
 	}
 	python_foreach_impl my_install
 
diff --git a/net-misc/AQtion/AQtion-2.2.7.ebuild b/net-misc/AQtion/AQtion-2.2.7.ebuild
new file mode 100644
index 000000000000..157bb239defb
--- /dev/null
+++ b/net-misc/AQtion/AQtion-2.2.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+DESCRIPTION="Aquantia AQC multigigabit NIC linux driver (atlantic) - development preview"
+HOMEPAGE="https://github.com/Aquantia/AQtion"
+
+COMMIT_ID="e024a859ea828ced78db310328db90dbedea837a"
+SRC_URI="https://github.com/Aquantia/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="lro"
+
+DEPEND="virtual/linux-sources"
+
+S="${WORKDIR}/${PN}-${COMMIT_ID}"
+
+MODULE_NAMES="atlantic(drivers/net/ethernet/aquantia/atlantic:${S})"
+BUILD_TARGETS="all"
+CONFIG_CHECK="~!AQTION ~PTP_1588_CLOCK ~CRC_ITU_T"
+
+DOCS=(
+	README.md
+	README.txt
+)
+
+pkg_setup() {
+	use lro && CONFIG_CHECK+=" ~!CONFIG_BRIDGE"
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if ! use lro; then
+		sed -r -i -e 's/(#define AQ_CFG_IS_LRO_DEF[[:space:]]+)[[:digit:]]+([[:alpha:]]*)/\10\2/' \
+			aq_cfg.h || die
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc "${DOCS[@]}"
+}
diff --git a/net-misc/AQtion/Manifest b/net-misc/AQtion/Manifest
new file mode 100644
index 000000000000..c9aa8208c79f
--- /dev/null
+++ b/net-misc/AQtion/Manifest
@@ -0,0 +1,3 @@
+DIST AQtion-2.2.7.tar.gz 122679 BLAKE2B 9d4e2d4d4b26a191551e2cfd30c2a8ce4e4bde01b7ab1e9beb9564abdfd1093b63f94713570fe2c949943037b649c55a9f448b0333fcdcc7227849330d466f92 SHA512 d3ba78acbe5d85d1017d5460fa7d916ffa59eeb137aa1817da215f08b994a10336a9f865c9b84a16b8cef7238d4fd87785bc17d6e3eac577210bf321538cbda3
+EBUILD AQtion-2.2.7.ebuild 1011 BLAKE2B c7210658ee6823245bfcc3b44252228e913f0c38d7a7180d5c65d0effb830ffc37950216d6f56685fb181c78cc27e33fbfa437e57100f5108c3baac0c8a7a9ef SHA512 938ca7011bf9952768306b8f26ccc24b1dd73c48cb3cba6991e2bc8b5ab282b99def15bbe4bb37978f29849a961cb0527f8e5f408f600b4c2045fa74e512cdb8
+MISC metadata.xml 697 BLAKE2B 2462c0dedde087805f1879750ad183a9c5d29dbd8561270f9e999bda47946517ce45ab70d29851aec06b5f2e79aa93fa5f7d9f09bcb3f089bf4cada541c4b87a SHA512 f2cbb250acd2690842dbdb5645f04e071f08a65e9dd80153fef3fe1c5d35ea1b5c40e8c58309b9323ca53941e902069c11b710037289923ff2b9a77570cb8313
diff --git a/net-misc/AQtion/metadata.xml b/net-misc/AQtion/metadata.xml
new file mode 100644
index 000000000000..62085b44d7b0
--- /dev/null
+++ b/net-misc/AQtion/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Aquantia/AQtion</remote-id>
+	</upstream>
+	<use>
+		<flag name="lro">
+			Enable/disable Large Receive Offload. This MUST be disabled for
+			bridging or forwarding.
+		</flag>
+	</use>
+	<longdescription>
+		Latest development preview of aquantia's atlantic linux kernel
+		driver for AQtion family of multigigabit adapters.
+
+		These drivers are UNSUPPORTED by the vendor, use at your own
+		risk.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a5604d411c5c..52931c895d87 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/bgpq3/Manifest b/net-misc/bgpq3/Manifest
index 624c3d00ce32..21f2eafb85a3 100644
--- a/net-misc/bgpq3/Manifest
+++ b/net-misc/bgpq3/Manifest
@@ -1,5 +1,5 @@
 DIST bgpq3-0.1.33.tar.gz 82696 BLAKE2B d6a8b950747ed0889d2e67873f4b029127d49b730bb0cf4047df7025415db2ee1870d4be632e9347cfe7930f3a453d34e87ba236314825eb994809a5c2b990e6 SHA512 f4faec46eaa5fe77a9118ed76e3d2dddce855cebfe6ead3dadffe0f72ea720502e378febd04829409039fd2bd6a693e518814408c628df1a9e5c7e7c5c170f49
 DIST bgpq3-0.1.35.tar.gz 87066 BLAKE2B b217d490ed74e9174cbbd70ed5d1dd4bc72b136a23d583b6b9cede8fd38d8b579a463d8a146313f9eec1904e836ac4db0b75a2c1554c00c5df79a8d0d32f950f SHA512 a41a424fc0230a0ab7d64ff017b9c1a52e32d7deae542ba096d4815e0e5ce76342ad55c204bbcc22ae4c47ad486917410c53b0dbb2306d40fa5c5a5cf93fcd01
 EBUILD bgpq3-0.1.33.ebuild 674 BLAKE2B 14f8d30ead4bbba32fb56baf8292aba0eeb03bbcc17e48c0fabc6ef00806beabb64acb5044a514a7510813829280719b8f3d39a200d98b9e0cccccc7aeca5117 SHA512 dcbb1c3312da4aec1455b74d2fa9a741c295e1053ae55651a6df2c86011a0f0dbf0799f1dbb4d30383539fff9a6c8f8931022bf6650d3795f76e3ccd6e377bb0
-EBUILD bgpq3-0.1.35.ebuild 768 BLAKE2B 275fbc4571d5beb7225c29a59aa3300b4534d0e059c4f7816ec42293a943f3b19f4254429593c440988a139b00e5e6a82567c366d7ca479249e4fa9b8c2e908e SHA512 195a72098033c91ab86da0a709b97bd6e0d80361e3d85d6c36a0b486f6efdfb6f0b2460e80794c2aa7765eb0241e02e663cbd1ab547ad3e88a6321e704c00cd3
+EBUILD bgpq3-0.1.35.ebuild 770 BLAKE2B 7af3683fc58bf8a2fe675f1945a64456f16800c2746d876d862cf1d2dff758ec929e922ff472adc708be5677bf9d5d8bae25dae3dc35c1c173db1e056a7bd4f9 SHA512 c633a9af222adbf10a50b42ddf6cea73a325ede45e782b2296aad5a06ff4758eb83b3e82e43aad29095d2f8d3407ab33e4c09b02eba8c5515e5717ace197d2dc
 MISC metadata.xml 1265 BLAKE2B 08a5d75cc81e3edee274fe845a5d0495bc6c2dafc127f41350dfae62a0ad7425cfb34817ede9fafec65c510f34d9728ecab15e621ba7310093f2d41d9ce32141 SHA512 9364ecadb0b1fd98841b69d59e5bf000be9cd92997c4203506ee4ebfba9513b33141526153defc23bbeb3e5ae6542648e5ba7d2583893fb06420e831b2cd41a1
diff --git a/net-misc/bgpq3/bgpq3-0.1.35.ebuild b/net-misc/bgpq3/bgpq3-0.1.35.ebuild
index 2ee24d24e3db..ad300b09c414 100644
--- a/net-misc/bgpq3/bgpq3-0.1.35.ebuild
+++ b/net-misc/bgpq3/bgpq3-0.1.35.ebuild
@@ -30,6 +30,5 @@ src_prepare() {
 src_install() {
 	dobin bgpq3
 	doman bgpq3.8
-	dodoc CHANGES
-	dohtml *.html
+	dodoc CHANGES README.md *.html
 }
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index aa83e8587874..c2b1b5f2d533 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,9 +1,10 @@
-AUX dhcpcd-8.0.2-string_termination.patch 1827 BLAKE2B d90f757e740cf73adc76d82705f669bd0d43415f523ff01d11c0afe911ab744cf5d36b32906209abc110eff2355f1687b2055cfac4a22085ba4aee65c74e5e27 SHA512 1d232efc8c822534dd55a5e5998392e4ded7b9051b69413a7ef44b450a1e050c651467148d560008fd537a5388873ba0d2efe9f4f6e4b7829f3f6ae87d82971e
 AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
 DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
-DIST dhcpcd-8.0.2.tar.xz 222408 BLAKE2B fb27a33cd64c7aeedb28e05c885c860618d923ac857895b9fdc7daa608f433587bea1e6630fd9897426b371a45b8a336e1edaa804d76eda6e9fc2adc1411aed2 SHA512 a6e3aa66800adc8b209324bae02a6e373e2623735bf0695ffec4a7c972d65c3498f55e4da62f93df0bc6cddb4bee8ab667b3743b5b25cd5f4cc9da4d1f8e15c4
+DIST dhcpcd-8.0.3.tar.xz 223104 BLAKE2B ca1b35e0fc0f8b345d2a55e380aa4e10b864f18f4b5368659875ef5efc955fac442b0505b0192578d83fa8c3b304942e50aa082d753e98dc3cd44237100f106c SHA512 0a740286181e1b24e7ac5157f60727c2a3abd81080235efc8ba86628bb8e2aa877b8d9348055c16cdae1a819f443afbf452907a25152bb936a6dc72f3a179944
+DIST dhcpcd-8.0.4.tar.xz 224236 BLAKE2B ae1bc71fef58526482d5c0b34f66d68ad4baf84979da2fa90d51ec1831ccdc2a2d77dc1a09b52b8fa58deed42ff7c6af49a165afba50decae0085788bcbb10c2 SHA512 d5ea895b841a1afcabd50013800f567c0a9c077cd409ec18c5442b3da6bac814db5e9ae4a4218076eb5119bd7ccb732d3f58e22dcbba38ede26ee668f9733ec4
 EBUILD dhcpcd-7.2.3.ebuild 4407 BLAKE2B 6f5df954ec0be66be6a4f4c1b63a1dee87e78d5cab8de8cbe935bd0d2a82caf70c5dc8d513ddc69b6e317a3d44c2a527529420da71ecf1489a71cdc2f4384eb5 SHA512 aa591926ec797c71c9d28d91a64257eaee76e2fae6853925e0b0fdf9001fd6279bdae68bdd2727f500661b8142c96b3c66ab28b055fb8887c4b7d96162d42843
-EBUILD dhcpcd-8.0.2-r1.ebuild 4486 BLAKE2B 4fa85a2475043c6a24402a596a38f1ff01aa9d8df9ce03270b411060383d4382e21958b7eb69c7e1963f3b9f5a9296bdbd4cc814c7e344a759fbd0e5500d1f3b SHA512 ba68295d42423c80ab51c332b642837e19bad3126584d9f0cb210fccf9ce4d51d197e159f79b7edfefc80996bc96d98a1dba7e0dc51d213bea54ebd596960982
+EBUILD dhcpcd-8.0.3.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
+EBUILD dhcpcd-8.0.4.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
 EBUILD dhcpcd-9999.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.2-r1.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.2-r1.ebuild
deleted file mode 100644
index 1696c38dcf71..000000000000
--- a/net-misc/dhcpcd/dhcpcd-8.0.2-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-string_termination.patch #691426
-)
-
-src_configure() {
-	local myeconfargs=(
-		--dbdir="${EPREFIX}/var/lib/dhcpcd"
-		--libexecdir="${EPREFIX}/lib/dhcpcd"
-		--localstatedir="${EPREFIX}/var"
-		--prefix="${EPREFIX}"
-		--with-hook=ntp.conf
-		$(use_enable embedded)
-		$(use_enable ipv6)
-		$(usex elibc_glibc '--with-hook=yp.conf' '')
-		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
-		$(usex udev '' '--without-dev --without-udev')
-		CC="$(tc-getCC)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
-
-	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [[ -e "${old_old_duid}" ]] ; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [[ ! -e "${old_duid}" ]] ; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_old_duid}" )
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [[ -e "${old_duid}" ]] ; then
-		if [[ ! -e "${new_duid}" ]] ; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_duid}" )
-	fi
-	local old_secret="${EROOT}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [[ -e "${old_secret}" ]] ; then
-		if [[ ! -e "${new_secret}" ]] ; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files+=( "${old_secret}" )
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [[ -e "${old_rdm}" ]] ; then
-		if [[ ! -e "${new_rdm}" ]] ; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files+=( "${old_rdm}" )
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[[ -f "${lease}" ]] || continue
-		old_files+=( "${lease}" )
-		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-		[[ -e "${dbdir}/${new_lease}" ]] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [[ -n "${old_files[@]}" ]] ; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files[@]}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.3.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.3.ebuild
new file mode 100644
index 000000000000..d8940210a7b5
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-8.0.3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	local myeconfargs=(
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
+		$(usex udev '' '--without-dev --without-udev')
+		CC="$(tc-getCC)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [[ -e "${old_old_duid}" ]] ; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [[ ! -e "${old_duid}" ]] ; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_old_duid}" )
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_duid}" )
+	fi
+	local old_secret="${EROOT}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files+=( "${old_secret}" )
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files+=( "${old_rdm}" )
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [[ -n "${old_files[@]}" ]] ; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files[@]}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild
new file mode 100644
index 000000000000..d8940210a7b5
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	local myeconfargs=(
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
+		$(usex udev '' '--without-dev --without-udev')
+		CC="$(tc-getCC)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [[ -e "${old_old_duid}" ]] ; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [[ ! -e "${old_duid}" ]] ; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_old_duid}" )
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_duid}" )
+	fi
+	local old_secret="${EROOT}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files+=( "${old_secret}" )
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files+=( "${old_rdm}" )
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [[ -n "${old_files[@]}" ]] ; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files[@]}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd-8.0.2-string_termination.patch b/net-misc/dhcpcd/files/dhcpcd-8.0.2-string_termination.patch
deleted file mode 100644
index a1bc19ec974d..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-8.0.2-string_termination.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-https://bugs.gentoo.org/691426
-
-diff --git a/src/dhcp-common.c b/src/dhcp-common.c
-index 08ab9493..9f556557 100644
---- a/src/dhcp-common.c
-+++ b/src/dhcp-common.c
-@@ -645,14 +645,16 @@ print_option(FILE *fp, const char *prefix, const struct dhcp_opt *opt,
- 	if (fputc('=', fp) == EOF)
- 		return -1;
- 	if (dl == 0)
--		return 1;
-+		goto out;
- 
- 	if (opt->type & OT_RFC1035) {
- 		char domain[NS_MAXDNAME];
- 
- 		sl = decode_rfc1035(domain, sizeof(domain), data, dl);
--		if (sl == 0 || sl == -1)
--			return sl;
-+		if (sl == -1)
-+			return -1;
-+		if (sl == 0)
-+			goto out;
- 		if (valid_domainname(domain, opt->type) == -1)
- 			return -1;
- 		return efprintf(fp, "%s", domain);
-@@ -693,9 +695,7 @@ print_option(FILE *fp, const char *prefix, const struct dhcp_opt *opt,
- 					return -1;
- 			}
- 		}
--		if (fputc('\0', fp) == EOF)
--			return -1;
--		return 1;
-+		goto out;
- 	}
- 
- 	t = data;
-@@ -760,6 +760,7 @@ print_option(FILE *fp, const char *prefix, const struct dhcp_opt *opt,
- 		}
- 	}
- 
-+out:
- 	if (fputc('\0', fp) == EOF)
- 		return -1;
- 	return 1;
-diff --git a/src/script.c b/src/script.c
-index 74aef1b1..3dee7b08 100644
---- a/src/script.c
-+++ b/src/script.c
-@@ -33,6 +33,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
-+#include <assert.h>
- #include <ctype.h>
- #include <errno.h>
- #include <signal.h>
-@@ -477,12 +478,21 @@ dumplease:
- 	fp = NULL;
- #endif
- 
-+	/* Count the terminated env strings.
-+	 * assert that the terminations are correct. */
- 	nenv = 0;
- 	endp = buf + buf_pos;
- 	for (bufp = buf; bufp < endp; bufp++) {
--		if (*bufp == '\0')
-+		if (*bufp == '\0') {
-+#ifndef NDEBUG
-+			if (bufp + 1 < endp)
-+				assert(*(bufp + 1) != '\0');
-+#endif
- 			nenv++;
-+		}
- 	}
-+	assert(*--bufp == '\0');
-+
- 	if (ctx->script_envlen < nenv) {
- 		env = reallocarray(ctx->script_env, nenv + 1, sizeof(*env));
- 		if (env == NULL)
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index c68bc17e70a0..791de97ebcdf 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -2,9 +2,11 @@ DIST geoipupdate-2.3.1.tar.gz 362497 BLAKE2B e07eb22d6b4897d735af0c354f991119316
 DIST geoipupdate-3.1.0.tar.gz 370293 BLAKE2B 5cd7b4563ca0b6820b863e24b80054f27c49bd9e89898f6b7248d3389a81f9c680f9979293fa2acaab0727b3c915926396404e19e90ffbb0ef6647a64d30c14a SHA512 9efd30593df0a2564f98a0e99d02ac3671e5752034d8c747d84a204cd620845e619bec511b6004d895cdb611a2d98b921eb830192d258c572ac9efd603cd5c99
 DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3f4ee5cea873f2fd3fbcbe7a38f22d2995558f8196f4c4030fb6f24b179104912af3290d3b7ed9bde9fbe5ff37862c SHA512 24e6a9f72449df1a2763314f188828332b5516962dbd75892689e505516af967bece60cc846fe17cfcc1ddb4d6111c9cd7d5c0ebc9d3e8e7af355f8a1c7f1a2f
 DIST geoipupdate-4.0.3.tar.gz 107019 BLAKE2B 55978bb6fc37b02706d4f48b76dc8b85f3aacc86f1192a0d31cee5c55fb4d0feb8d5ddb2b6a13d4a85d80133ccaa318bd9ad3e7d3d5b818fea2a3a0fa09a62d3 SHA512 870f930a54a45f5fe14c8328158ea2c8d2d8e4320a5400abc8ec18ae1e234426e86492a41868ccd3bf649acf0cd347722683326817359fed7d147ab21eb64397
+DIST geoipupdate-4.0.4.tar.gz 107115 BLAKE2B 1ab08a34c41ac08aa26faf2078e7a964350c09c65871829023928dc25011a931f9be4aff32300778ab645831b8786898a986e15aec8bceb31f77715be77f857a SHA512 2d97f65128d26600345b07cab4b1c1ed26f68bb850f4fa92d8f6b4065d1e9a25b73b38e1cc08bc0afc11135394fe20fb77bd931e557ba6fe83d792ad3bcc4a1c
 DIST geoipupdate-vendor-4.0.3.tar 532480 BLAKE2B c619098fa40d6a92743a2847900e7cefe5d61aa9dbd36399e4a26d7c2fda1ea493f91ded8a4b17a76063960c0f8a11cc7b3b7b734e9f3d978da7035799d32956 SHA512 25976c66d775e3e50b422e9f564b9486c7c08d9dba8a11b5ac9faf62f3545673fa94d2ea6ea40750835840c938b686b174de5658236a19e85d592d861eea05b8
 EBUILD geoipupdate-2.3.1.ebuild 573 BLAKE2B 1a4e9421d90bed8da5b4ddb282b53a9bb2cd9d7123007a8c7a207ed807480abf95ec3c2e7cea6a987d399fd73c7148778f6b28b9c66ea0f48f2c1cb4d9ae4435 SHA512 add023538fe12026667cf0feba8c1ebf1157609ba2ac9622466920d2ed7c128bec10ba7ac1a12acb358067e0ec757996ad0eec63c91c7b4a7c9d75984b06bcff
 EBUILD geoipupdate-3.1.0.ebuild 582 BLAKE2B 106db9ba7a0f95104f0728fd820da17c03ed7c1fa79481d3fe09e666594b707b64ec4522b5095c1f19b0afecc0cfa9f5dd6e60829d12cb0887910ddc82e66053 SHA512 b6fddee463197592d4bff439b9ba4e407725895544af9875c9157fad695cc700ce2d3ab293da271fa6d3826b458a1a20c477c1df51daef6367d59798b4ad1392
 EBUILD geoipupdate-3.1.1.ebuild 582 BLAKE2B 106db9ba7a0f95104f0728fd820da17c03ed7c1fa79481d3fe09e666594b707b64ec4522b5095c1f19b0afecc0cfa9f5dd6e60829d12cb0887910ddc82e66053 SHA512 b6fddee463197592d4bff439b9ba4e407725895544af9875c9157fad695cc700ce2d3ab293da271fa6d3826b458a1a20c477c1df51daef6367d59798b4ad1392
 EBUILD geoipupdate-4.0.3-r1.ebuild 1268 BLAKE2B 39d26909a70acfdddbeb9f823e4babac6af48077af154f15f1228d7d50a40fe73b2c4de5842ce8d6b87ea6d39a25d998e553ec0cbf42904a9efa45302d9f7eee SHA512 194465588a84cd045cb0694c5dfbfd1e9e14cd07d49d3a77d68ec6e0df4a872766d8a5bcb2a9094f72853cfe3e28a350969cbd4bec99bce35edaa2786cb4d52d
+EBUILD geoipupdate-4.0.4.ebuild 1146 BLAKE2B 7b690131bd0f63803a2709e718bf6d33ffb6109d2e62c5eb99ca5bb793a9ea185bc5ca6962abffcdc0068a54187e70cdcee5d12128443f673637d92903f37015 SHA512 a3242fffa1b3511f861664134362ecd3dd06525b86be3791137ccade9bfb382ec3261ff24dd2c4bde2c5f75a79ddbbb1e9bb94102a9a3a35017bbc589840c336
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-4.0.4.ebuild b/net-misc/geoipupdate/geoipupdate-4.0.4.ebuild
new file mode 100644
index 000000000000..37d94082af11
--- /dev/null
+++ b/net-misc/geoipupdate/geoipupdate-4.0.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/maxmind/${PN}"
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
+SRC_URI="
+	https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( GeoIP.conf.md geoipupdate.md )
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+}
+
+src_compile() {
+	cd src/${EGO_PN} || die
+	# requires pandoc but the information is still in the distributed md files
+	sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
+	sed -i -e 's/go build/go build -x/' Makefile || die
+
+	# the horror, the horror ... but it's all automagic
+	export GO111MODULE=on
+	export GOFLAGS=-mod=vendor
+	export CONFFILE=/etc/GeoIP.conf
+	export DATADIR=/usr/share/GeoIP
+	export VERSION=${PV}
+	default
+}
+
+src_install() {
+	mkdir "${D}/usr/bin" -p
+	cd "src/${EGO_PN}/build" || die
+	cp geoipupdate "${D}/usr/bin" || die
+	keepdir /usr/share/GeoIP
+	insinto /etc
+	doins GeoIP.conf
+}
diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest
index 79917856d8ae..84829e716051 100644
--- a/net-misc/geomyidae/Manifest
+++ b/net-misc/geomyidae/Manifest
@@ -1,5 +1,5 @@
-DIST geomyidae-0.29.tar.bz2 16279 BLAKE2B 148c6fe39de7333fbda4d1794c540940d06317f89291bae0fc35cb2cad8bde7a0f665ada79a9a0f7e7d4c96707bb811cc6cbc1b7b167c0dbd0ca301175176d2a SHA512 00bc7c4b5c1cd58d7e36cc5bce9a8d2e3dd70ccfd2f3c2729527ed7c55ced04aa0f9cf024b825f6f3317b2c1b35b4f3fd4dd88c83b14369e98b72b59965b0aa2
 DIST geomyidae-v0.32.2.tgz 20897 BLAKE2B 117a4e89a379a8e84355661d910fcb227ef6105cdf6c5860a89c94caa7ed71d278b53c325a59bf200acdd589b515559995b27536c9fab3fe30fe87cb82f10130 SHA512 3b0927a16082df862b9efacc2f29fd1b1ca76f7d465426e179d5995a416bc27b518daba422512091304ed5479ff133e3d40f7bf66aedfbd8d99d13710809d519
-EBUILD geomyidae-0.29.ebuild 1155 BLAKE2B 2f2f61c475a43ae965e44a08a625551cd7af600fea83e34ba3294f45ce31bef74a0916723a5dbaae38cb173be6f6f456e50d75b7a0287c2c70083796a52f414b SHA512 dc20c4e2e198695df054931968dd81ce23a7e36a01ce5b184069e67a2a4112d5bb1de693dfd0d6ccb460849d1a643f15a27fd90ce3a3b0164c0a3c362d1cd70d
+DIST geomyidae-v0.34.tgz 22242 BLAKE2B bc25f50c49c10e5a04b83a12cdcd7546b33f6a7d93eab504122bcfb2fdacfbcb82205890d5fd999d1b8b681c65dc0ef0dc5f95ea2d56a795fa371031c4af43b8 SHA512 55b7845c8b9fbee70b2e2bd71d2e3bb8e34c3029a1ea410cb39750763c81d5c31af8c703f7b673aa28fbfd61dd7915300ed4ff22f94c8430ac754681bc30ce41
 EBUILD geomyidae-0.32.2.ebuild 1031 BLAKE2B 04a3cccb671609ed69f0c715edc73f6f5ae9522d225f375d5cb58827fe864b1e3a66aacd467ecd32ee85503748237a2410477bb100f6963838f8b393748fa8e4 SHA512 e3ff159000ca3068d6a2583071944af7f87d530ef5482d79ff7c7037a5efa460f3902cb88abcd9e9b79b238c628df3553783973456b05ad5aa519e6126c1aa7b
+EBUILD geomyidae-0.34.ebuild 1028 BLAKE2B 3ecd610bdd02391345b49857dc8569dd2874fce30a739c601689e62e9513ad545a35597a3e2737fc8bddee712695dd265c93249affece0a2385b5e1eb6914535 SHA512 d8f0a0e9507384c3616b0bf806f3389da5c089ab16ca7887c7e398b4d07973633ad5e7f39971b7aaee951dad4917b77dd7ac4a79064efa1d177e0722b8b84fd8
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/net-misc/geomyidae/geomyidae-0.29.ebuild b/net-misc/geomyidae/geomyidae-0.29.ebuild
deleted file mode 100644
index 57dec0d5956e..000000000000
--- a/net-misc/geomyidae/geomyidae-0.29.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-DESCRIPTION="A daemon to serve the gopher protocol"
-HOMEPAGE="http://git.r-36.net/geomyidae/"
-SRC_URI="http://git.r-36.net/geomyidae/snapshot/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-pkg_setup(){
-	enewgroup gopherd
-	enewuser gopherd -1 -1 /var/gopher gopherd
-}
-
-src_prepare() {
-	# enable verbose build
-	# drop -O. from CFLAGS
-	sed -i \
-		-e 's/@${CC}/${CC}/g' \
-		-e '/CFLAGS/s/-O. //' \
-		Makefile || die 'sed on Makefile failed'
-	# fix for correctly start/stop daemon
-	# fix path for pid file
-	sed -i \
-		-e 's:start-stop-daemon -Sb:start-stop-daemon -Sbm:' \
-		-e 's:start-stop-daemon -S -p:start-stop-daemon -K -p:' \
-		-e 's:/var/run:/run:g' \
-		rc.d/Gentoo.init.d || die
-
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd rc.d/Gentoo.init.d ${PN}
-	newconfd rc.d/Gentoo.conf.d ${PN}
-
-	insinto /var/gopher
-	doins index.gph
-	fowners -R root.gopherd /var/gopher
-	fperms -R g=rX,o=rX /var/gopher
-
-	doman ${PN}.8
-	dodoc CGI README
-}
diff --git a/net-misc/geomyidae/geomyidae-0.34.ebuild b/net-misc/geomyidae/geomyidae-0.34.ebuild
new file mode 100644
index 000000000000..86affea4be21
--- /dev/null
+++ b/net-misc/geomyidae/geomyidae-0.34.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs user
+
+DESCRIPTION="A daemon to serve the gopher protocol"
+HOMEPAGE="http://r-36.net/scm/geomyidae/"
+SRC_URI="ftp://bitreich.org/releases/geomyidae/${PN}-v${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+pkg_setup(){
+	enewgroup gopherd
+	enewuser gopherd -1 -1 /var/gopher gopherd
+}
+
+src_prepare() {
+	# enable verbose build
+	# drop -O. from CFLAGS
+	sed -i \
+		-e 's/@${CC}/${CC}/g' \
+		-e '/CFLAGS/s/-O. //' \
+		Makefile || die 'sed on Makefile failed'
+	# fix path for pid file
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		rc.d/Gentoo.init.d || die
+
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dosbin ${PN}
+
+	newinitd rc.d/Gentoo.init.d ${PN}
+	newconfd rc.d/Gentoo.conf.d ${PN}
+
+	insinto /var/gopher
+	doins index.gph
+	fowners -R root.gopherd /var/gopher
+	fperms -R g=rX,o=rX /var/gopher
+
+	doman ${PN}.8
+	dodoc CGI README
+}
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index c25032c2e656..8c6137475728 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -9,4 +9,4 @@ EBUILD gerbera-1.2.0-r1.ebuild 2558 BLAKE2B c5f81e11241cb74d63428c263cd0141d61a9
 EBUILD gerbera-1.3.1.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 EBUILD gerbera-1.3.2.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 EBUILD gerbera-9999.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
-MISC metadata.xml 1209 BLAKE2B b724abc66f5a3111c66a94331e61f9a50ae67344dab4695e7fc68154ddc9843e0295c7a12438e342be409b9429a4f9c60abce02422594df708d7933521bf9673 SHA512 c91dddacee6beab0a3cec3ab317810f77d3715a84384ceeafd3bdc872fff6d352d6bd4312d8194b59a159604794b0197780db6c27b20a327afa1e7bb9cba6a26
+MISC metadata.xml 1142 BLAKE2B 000fa449f9dff3541b6d1507e6945a2508c0478ac19ed4a1ff1108ecde9dbbad96b76d304da9f34a2169bdaf620be5d710b111e0c442e05c94ab58747a7dab87 SHA512 28acbb3ef7011c52e77a323a4ec346ca25a3c255f8dc41da4c4c6c8f21bcbf0fcc8ebef501efd0f225ac2f0d29d828584a904774d7fb061635b007a0ea123f54
diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml
index 22d6ba3fd3c0..2ea8b3e052b0 100644
--- a/net-misc/gerbera/metadata.xml
+++ b/net-misc/gerbera/metadata.xml
@@ -11,7 +11,6 @@
     <flag name="exiv2">Use <pkg>media-gfx/exiv2</pkg> to extract EXIF information</flag>
     <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
     <flag name="lastfm">Enable last.fm support</flag>
-    <flag name="magic">Use libmagic to determine file types</flag>
     <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag>
     <flag name="protocol-extensions">Enable partial DLNA support</flag>
     <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata</flag>
diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
index f192459fbea3..99f7ca948a22 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -2,8 +2,8 @@ AUX htpdate.conf 359 BLAKE2B 7bcd2aa3e818ee31796e6f1e3b060cb6c04558fbfcfbdc51cd6
 AUX htpdate.init-r1 507 BLAKE2B facb31723331fd77ae24ff64753cc12c913e35b7ba97997925bd421164dd25d3820e4c7727e14389cd5372635afdf5cc8e313297679e74b3a65ab65f0c4a12b3 SHA512 d18a91792787fdcb4808da042025d60bbe19335fd8492b33af33d33bc24d250bcc65c8ead7d443e4d37a9ca61428361db7b418a5fb3256b030b02b9a772fe10f
 DIST htpdate-1.0.7.tar.gz 16848 BLAKE2B 2e7350f186af09d8876c9caddf3d3bdd1b3d361169417e1c672eb04e499d07391ec93c56fad7e6d0f947a5bf60580a9f52ba564f213662a65dbbd67df875399e SHA512 83408545d1d2cc794f62efaf348e54cc2ce47dfb27815710e92d0c7d34360a581e637ef82424030c8a4fcabcc9a07205518fac08f426b37c7c4519cfa6696360
 DIST htpdate-1.2.0.tar.gz 13618 BLAKE2B a94f08738d08c0caacc876d2e25e1dba43bbe371b0a31f957a1d5ff522b0ae5bd7bf5abcde63802843b1c32799e4cc38bacda657a9efb3a56a1eaccdb4f8c35c SHA512 5447d54a54038cc3c33f7877410ae42022e01eb10a93bd79fe4937452a823c65c6bdb743213bc77a8506128d5b384e26812f1291a0ffa1aeafde0230c1b645d4
-DIST htpdate-1.2.1.tar.gz 13580 BLAKE2B e14ec96366cbf7d546f718f2577d4c862e7b90557622a12f3e01de4f9bf6bd153c297a81dd16c376da33aa13c1a83937e66537f52f429586eea9994b316c22a3 SHA512 02f8775b0c6424108aed2e6a37ee1c0ffde5484e8e6f3dcdbda6a1ccf8863c986c6bb86804e912d257af2753b745c2c7f270fba6c2cf0dc7cef9875405235d69
+DIST htpdate-1.2.2.tar.gz 13625 BLAKE2B 11813def81e3cce1194120a21cf99e8ad288b0f604aab201850f03b6ca786d19792b9586c9d805aa1945bbc651e6afc5099b5c7cb6ea354473a4b3bab01397e3 SHA512 00d52b291004ddb3d0282aef78c5fbe5d9397dbf171a6646803ee7ba4bd0514af6089f7e48a92397dd1b0fbae5ba314f5165c9902028438e16d3516b65724de0
 EBUILD htpdate-1.0.7.ebuild 1104 BLAKE2B f8430b15362130cc425a75b6b296b274e8f26ae4bc30085bd9d4d5d7330fa16560e19809e65dbf55d346f96a7f70901b8165526a0842b0b3a9cc2d9bf21671ad SHA512 b94a56bd7230572bc2b52fcba820a7606abd26254b202ad2c7be1ccbe29bb7a4fcce4e211576e06fe08d04d7b88979e4116b823254d9dd406cff61dd9b21fed5
 EBUILD htpdate-1.2.0.ebuild 1006 BLAKE2B ffd29371c97e36a023bbc436bc584bb00424cf1317e9fb2003e8d66f4ffaa971efba6e1244eb44807af776cdba3353a37232c774ac57b0c4e4e35e91ea996327 SHA512 d9a33a5e3ec3eb7f24e8853b3d9903f4206379ca94d49c80d7d74e5bf1628d5cd092545fd11e364d0a30d007cb8cc0ed18d06d5935a76ce2b455f9aa5aae0a7f
-EBUILD htpdate-1.2.1.ebuild 1013 BLAKE2B fc54769cb76b36f7aa5a571e5f079b30d99e51f1f20400b2cb7cf7644f1b15db75427b0090fe0b58870a9466a8921798242a1510e48fe1372608fb53362ac4f8 SHA512 93e35fd309c8c1d44f96bc7f40cc32ca571559b45b16c78ee2124b1ac2f011d91218fdcfb92baa3d4910e587db089ec20f630ee3f38f49ac8446035872f0d7e7
+EBUILD htpdate-1.2.2.ebuild 1013 BLAKE2B fc54769cb76b36f7aa5a571e5f079b30d99e51f1f20400b2cb7cf7644f1b15db75427b0090fe0b58870a9466a8921798242a1510e48fe1372608fb53362ac4f8 SHA512 93e35fd309c8c1d44f96bc7f40cc32ca571559b45b16c78ee2124b1ac2f011d91218fdcfb92baa3d4910e587db089ec20f630ee3f38f49ac8446035872f0d7e7
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-misc/htpdate/htpdate-1.2.1.ebuild b/net-misc/htpdate/htpdate-1.2.2.ebuild
index e004eb864aca..e004eb864aca 100644
--- a/net-misc/htpdate/htpdate-1.2.1.ebuild
+++ b/net-misc/htpdate/htpdate-1.2.2.ebuild
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 98d133480c5e..ee38a6aed47f 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -4,10 +4,10 @@ AUX conncenter.desktop 194 BLAKE2B 96fdae8892ec9cef05a92e129bba42efb666874a2a218
 AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
-DIST linuxx64-19.3.0.5.tar.gz 22254035 BLAKE2B 7ed276f0096a39a9089c02fba4c2a62f4cf7de524b24210c979c272105f40294a7773e14ecb6a6e6f65f07e9a7400a83d5c5c0dd306cf7dd1cbea4f39f489d73 SHA512 5331ec70771016ef01cb99eed9ea058e1c318b119c245318803a0f72aeaf14fd00a90150fe59b03342894f7a627affa9a383d5bd783fee424f55978db6136489
 DIST linuxx64-19.6.0.60.tar.gz 101850500 BLAKE2B c292a6dbde3f6b7a52952ceb1c6127729be9c82b2447138bc3487bc3eafba95cbe6b54e18df8b91583330dcd47f30cd51a1ebc0bcbc869baaf003024a889efb7 SHA512 952a81734b8284489a3e03a894ca721ba1f47227217cbc021fcca310ed6ebc53195b7df24985f408062b472b5be580b4b4719d1809ee01b0ab634d5cb5e06258
-DIST linuxx86-19.3.0.5.tar.gz 24360452 BLAKE2B 823a26f23fd4979b633baa2d47034bfb6c71cad9568853dad12d857dd4a3df0e1f885d79d69e440ed01f2f9ec0af4f64a0ab9cd1460aead5cd3d2c36e7436897 SHA512 253d11f2d46928eda958036d398a58d33239beb9f754a381244ed5333277435c7d1f5bff77e8b79ec9066cb2f7e8b67b71b6609d12e8faa869a79d3109d7261f
+DIST linuxx64-19.8.0.20.tar.gz 101850343 BLAKE2B 275896b781addbc4b83e2ce54b46136a2595b65eb8adf9675b2a2695aea5acd36d99ee01b0171498a6f724c5d1878ec4a7741f3fae27a08b93d1bb6a79a9c49a SHA512 141f2c3a0fef7be341568029228a4c32ed5d578014a513fb3ca1fd6213b42b613a07b0c5dcf350712a0d7190006b9443ed3d7279707a29d0c00ddc4108b7b090
 DIST linuxx86-19.6.0.60.tar.gz 108052444 BLAKE2B ce784be607ac74a4087a66fa492625fbb6aec6cf04271ecc6114e0a1d8940314f0f715dcfc3842cb145f05cf880f164dd83b4bec7d3ba63fa021bc2a5fde0d9e SHA512 9056d716f0c9f895d5d24eb81582b6f9ac1cc5db5063d2edf892841ad87d4bd58d68ba67b03f7f04f7287d2472b067ae3d2040bc3c773e5c2a79a401dbd04732
-EBUILD icaclient-19.3.0.5.ebuild 4989 BLAKE2B 3b9185b6a5f125600481585498146cefb34c8137d3c678fe8573bbb39cac3a0b606f2eddcf6fef94c5463064500dfe5c0ab7ffda17050130d97a742809693200 SHA512 11cda20539aa5ec3478a4d669dd198d3d96fe445d13d11d056eb3e7e7654b87c097fb44b5098960f61a2962525ffb24c48b8dcc70b6bfc4490b6dcba535fd025
-EBUILD icaclient-19.6.0.60-r1.ebuild 4562 BLAKE2B ecc1d62665c372e622df639a2445ba67a04011622ca01551f56164ca7bd7a89eb24954765ae8ddc24975e2730cf2de4bb44505e986387c1121cc417b8db508c2 SHA512 ea51340b1bc5d1b5435e3067a5eae1410055454503bf85abc9c7be22f2e5d5abdc0789617c6c7d99298f04765fd5ba10d736574face335510cf908778b1c4d0b
+DIST linuxx86-19.8.0.20.tar.gz 108044897 BLAKE2B a76d8c507bdc662f62c7874e19bbbbbe5a59f0f146b7226f3f989ff9626db3def036b7b218c47a71f75c5ec873cd81a785d79a69291c49d3db3ca630950379b2 SHA512 0c88f511b289caac27d1b8a83e8a1c49a9a9f431b880f53172229a58df85052d67890bbb1b5e3f8272c9c7f6d3dd9e588aff481ac727293cec6148a18facb061
+EBUILD icaclient-19.6.0.60-r1.ebuild 4560 BLAKE2B 3134576f7a893a1eaa82d768d94391ba5b3bfac015437ec8e00223866206fcdd8ef2242a7b2bcccd3c6c12beb792f50c319229979d5a222bc82ba501e0ff91dd SHA512 cc4eeefd96a0c3fcebea06a408abb34bd51f9fdd322ec408026b37397d41970e94a04a8b05fc8caca03a4deb9b66ca00a09b94d2bec9d34cac3a1a26e85e6196
+EBUILD icaclient-19.8.0.20.ebuild 4562 BLAKE2B ecc1d62665c372e622df639a2445ba67a04011622ca01551f56164ca7bd7a89eb24954765ae8ddc24975e2730cf2de4bb44505e986387c1121cc417b8db508c2 SHA512 ea51340b1bc5d1b5435e3067a5eae1410055454503bf85abc9c7be22f2e5d5abdc0789617c6c7d99298f04765fd5ba10d736574face335510cf908778b1c4d0b
 MISC metadata.xml 602 BLAKE2B d0a0f2a13b43053f748f4250ff9fd0f7aee5d53501d773081e646097e40b5a60bb49c4517ec4689272c2e14bfd51acff76c8b4c8575533697f8f069854a4d5eb SHA512 281c87fd74b63941c4ae76772c7020b0c70adfcde3e87be13cb9b0994aa4794df2c2904e623518812d1da8ea602b45c95db083ea7d239e7f0e7c9c92487bd68c
diff --git a/net-misc/icaclient/icaclient-19.3.0.5.ebuild b/net-misc/icaclient/icaclient-19.3.0.5.ebuild
deleted file mode 100644
index c8e2a36e854d..000000000000
--- a/net-misc/icaclient/icaclient-19.3.0.5.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# eutils inherit required for make_wrapper call
-inherit desktop eutils multilib xdg-utils
-
-DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="https://www.citrix.com/"
-SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
-	x86? ( linuxx86-${PV}.tar.gz )"
-
-LICENSE="icaclient"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="nsplugin l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
-RESTRICT="mirror strip userpriv fetch"
-
-ICAROOT="/opt/Citrix/ICAClient"
-
-QA_PREBUILT="${ICAROOT#/}/*"
-
-RDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-fonts/font-adobe-100dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	media-fonts/font-xfree86-type1
-	media-fonts/font-misc-ethiopic
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gst-plugins-base:1.0
-	media-libs/gstreamer:1.0
-	media-libs/libcanberra[gtk]
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/speex
-	net-dns/libidn:1.33
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/e2fsprogs-libs
-	sys-libs/zlib
-	virtual/krb5
-	virtual/jpeg:0
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-"
-DEPEND=""
-
-pkg_nofetch() {
-	elog "Download the client file ${A} from
-	https://www.citrix.com/downloads/workspace-app/"
-	elog "and place it into your DISTDIR directory."
-}
-
-pkg_setup() {
-	case ${ARCH} in
-		amd64)
-			ICAARCH=linuxx64
-		;;
-		x86)
-			ICAARCH=linuxx86
-		;;
-		*)
-			eerror "Given architecture is not supported by Citrix."
-		;;
-	esac
-
-	S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
-}
-
-src_prepare() {
-	default
-	rm lib/UIDialogLibWebKit.so || die
-}
-
-src_install() {
-	local bin tmpl dest
-
-	dodir "${ICAROOT}"
-
-	exeinto "${ICAROOT}"
-	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
-
-	exeinto "${ICAROOT}"/lib
-	doexe lib/*.so
-
-	if use nsplugin ; then
-		exeinto "${ICAROOT}"
-		doexe npica.so
-		dosym "${ICAROOT}"/npica.so /usr/$(get_libdir)/nsbrowser/plugins/npica.so
-	fi
-
-	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
-		insinto "${dest}"
-		doins nls/en.UTF-8/eula.txt
-	done
-
-	insinto "${ICAROOT}"
-	doins -r usb
-
-	insinto "${ICAROOT}"/config
-	doins config/* config/.* nls/en/*.ini
-	for tmpl in {appsrv,wfclient}.template ; do
-		newins nls/en/${tmpl} ${tmpl/template/ini}
-	done
-	touch "${ED}/${ICAROOT}"/config/.server || die
-
-	insinto "${ICAROOT}"/gtk
-	doins gtk/*
-
-	insinto "${ICAROOT}"/gtk/glade
-	doins gtk/glade/*
-
-	insinto "${ICAROOT}"/site
-	doins -r site/*
-
-	dodir "${ICAROOT}"/help
-
-	insinto "${ICAROOT}"/config/usertemplate
-	doins config/usertemplate/*
-
-	local lang LANGCODES=( en )
-	use l10n_de && LANGCODES+=( de )
-	use l10n_es && LANGCODES+=( es )
-	use l10n_fr && LANGCODES+=( fr )
-	use l10n_ja && LANGCODES+=( ja )
-	use l10n_zh-CN && LANGCODES+=( zh_CN )
-
-	for lang in ${LANGCODES[@]} ; do
-		insinto "${ICAROOT}"/nls/${lang}
-		doins nls/${lang}/*
-
-		insinto "${ICAROOT}"/nls/$lang/UTF-8
-		doins nls/${lang}.UTF-8/*
-
-		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
-		doins nls/${lang}/LC_MESSAGES/*
-
-		insinto "${ICAROOT}"/nls/${lang}
-		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
-
-		for tmpl in {appsrv,wfclient}.template ; do
-			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
-				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
-				|| die
-		done
-	done
-
-	insinto "${ICAROOT}"/nls
-	dosym en /opt/Citrix/ICAClient/nls/C
-
-	insinto "${ICAROOT}"/icons
-	doins icons/*
-
-	insinto "${ICAROOT}"/keyboard
-	doins keyboard/*
-
-	rm -r "${S}"/keystore/cacerts || die
-	dosym /etc/ssl/certs "${ICAROOT}"/keystore/cacerts
-
-	exeinto "${ICAROOT}"/util
-	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so,webcontainer,ctxwebhelper,ctx_rehash,ctx_app_bind}
-	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
-
-	# https://bugs.gentoo.org/655922
-	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
-	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
-	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
-
-	doenvd "${FILESDIR}"/10ICAClient
-
-	for bin in configmgr conncenter new_store ; do
-		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
-	done
-
-	for bin in selfservice wfica ; do
-		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
-	done
-
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
-		> "${ED}"/etc/revdep-rebuild/70icaclient
-
-	# 651926
-	domenu "${FILESDIR}"/*.desktop
-}
-
-pkg_preinst() {
-	local old_plugin="/usr/lib64/nsbrowser/plugins/npwrapper.npica.so"
-	if use amd64 && [[ -f ${old_plugin} ]] ; then
-		local wrapper="/usr/bin/nspluginwrapper"
-		if [[ -x ${wrapper} ]] ; then
-			einfo "Removing npica.so from wrapper."
-			${wrapper} -r ${old_plugin}
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-misc/icaclient/icaclient-19.6.0.60-r1.ebuild b/net-misc/icaclient/icaclient-19.6.0.60-r1.ebuild
index 941c09b0cfba..935af4875168 100644
--- a/net-misc/icaclient/icaclient-19.6.0.60-r1.ebuild
+++ b/net-misc/icaclient/icaclient-19.6.0.60-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-19.8.0.20.ebuild b/net-misc/icaclient/icaclient-19.8.0.20.ebuild
new file mode 100644
index 000000000000..941c09b0cfba
--- /dev/null
+++ b/net-misc/icaclient/icaclient-19.8.0.20.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# eutils inherit required for make_wrapper call
+inherit desktop eutils multilib xdg-utils
+
+DESCRIPTION="ICA Client for Citrix Presentation servers"
+HOMEPAGE="https://www.citrix.com/"
+SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
+	x86? ( linuxx86-${PV}.tar.gz )"
+
+LICENSE="icaclient"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
+RESTRICT="mirror strip userpriv fetch"
+
+ICAROOT="/opt/Citrix/ICAClient"
+
+QA_PREBUILT="${ICAROOT#/}/*"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	media-fonts/font-xfree86-type1
+	media-fonts/font-misc-ethiopic
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/speex
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
+	net-misc/curl
+	sys-libs/e2fsprogs-libs
+	sys-libs/zlib
+	virtual/krb5
+	virtual/jpeg:0
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+"
+DEPEND=""
+
+pkg_nofetch() {
+	elog "Download the client file ${A} from
+	https://www.citrix.com/downloads/workspace-app/"
+	elog "and place it into your DISTDIR directory."
+}
+
+pkg_setup() {
+	case ${ARCH} in
+		amd64)
+			ICAARCH=linuxx64
+		;;
+		x86)
+			ICAARCH=linuxx86
+		;;
+		*)
+			eerror "Given architecture is not supported by Citrix."
+		;;
+	esac
+
+	S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
+}
+
+src_prepare() {
+	default
+	rm lib/UIDialogLibWebKit.so || die
+}
+
+src_install() {
+	local bin tmpl dest
+
+	dodir "${ICAROOT}"
+
+	exeinto "${ICAROOT}"
+	doexe *.DLL libAnalyticsInterfacePd.so libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+
+	exeinto "${ICAROOT}"/lib
+	doexe lib/*.so
+
+	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
+		insinto "${dest}"
+		doins nls/en.UTF-8/eula.txt
+	done
+
+	insinto "${ICAROOT}"
+	doins -r usb
+
+	insinto "${ICAROOT}"/config
+	doins config/* config/.* nls/en/*.ini
+	for tmpl in {appsrv,wfclient}.template ; do
+		newins nls/en/${tmpl} ${tmpl/template/ini}
+	done
+	touch "${ED}/${ICAROOT}"/config/.server || die
+
+	insinto "${ICAROOT}"/gtk
+	doins gtk/*
+
+	insinto "${ICAROOT}"/gtk/glade
+	doins gtk/glade/*
+
+	insinto "${ICAROOT}"/site
+	doins -r site/*
+
+	dodir "${ICAROOT}"/help
+
+	insinto "${ICAROOT}"/config/usertemplate
+	doins config/usertemplate/*
+
+	local lang LANGCODES=( en )
+	use l10n_de && LANGCODES+=( de )
+	use l10n_es && LANGCODES+=( es )
+	use l10n_fr && LANGCODES+=( fr )
+	use l10n_ja && LANGCODES+=( ja )
+	use l10n_zh-CN && LANGCODES+=( zh_CN )
+
+	for lang in ${LANGCODES[@]} ; do
+		insinto "${ICAROOT}"/nls/${lang}
+		doins nls/${lang}/*
+
+		insinto "${ICAROOT}"/nls/$lang/UTF-8
+		doins nls/${lang}.UTF-8/*
+
+		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
+		doins nls/${lang}/LC_MESSAGES/*
+
+		insinto "${ICAROOT}"/nls/${lang}
+		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
+
+		for tmpl in {appsrv,wfclient}.template ; do
+			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
+				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+				|| die
+		done
+	done
+
+	insinto "${ICAROOT}"/nls
+	dosym en /opt/Citrix/ICAClient/nls/C
+
+	insinto "${ICAROOT}"/icons
+	doins icons/*
+
+	insinto "${ICAROOT}"/keyboard
+	doins keyboard/*
+
+	rm -r "${S}"/keystore/cacerts || die
+	dosym /etc/ssl/certs "${ICAROOT}"/keystore/cacerts
+
+	exeinto "${ICAROOT}"/util
+	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so,webcontainer,ctxwebhelper,ctx_rehash,ctx_app_bind}
+	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
+
+	# https://bugs.gentoo.org/655922
+	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
+	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
+	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
+
+	doenvd "${FILESDIR}"/10ICAClient
+
+	for bin in configmgr conncenter new_store ; do
+		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
+	done
+
+	for bin in selfservice wfica ; do
+		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
+	done
+
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
+		> "${ED}"/etc/revdep-rebuild/70icaclient
+
+	# 651926
+	domenu "${FILESDIR}"/*.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 68289de0e334..49e9f74c2b4a 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,10 +1,8 @@
 AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab
 AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31
-DIST kea-1.4.0-P1.tar.gz 6645111 BLAKE2B 290b7bcf8b32fcf2762240f2173cb45c035187c7dfd1affd0fd8a947721745ea9d8846be365ee3f9331d578b7bc248ee53a1e37666585a62c90d7dc541c7aaa5 SHA512 beb3baae09510de970fb5c1a301c57d64fc56d825d964f413357ba448b993d0a4f714d4efa4da166d3c06623a9ae78b70c25b61793e696551cb97b7e08d5e634
-DIST kea-1.5.0-beta2.tar.gz 7372364 BLAKE2B bb5c8c119fbf52ceea58998cb37b19286ea85f30f67d0b6f4bd27be188f2d68ec551667a136f0e9f4bf5320ed1250494b67fc26c8d15910a46976c968cd4480b SHA512 c107a7a570d018a05d42bd0d521757d9036c4bdabf2943ac3c96e2f5124ec6f34fe1d60660450a51cba20b24e8fda3915e8c5ee2d3e5e6df4319ba965153b8de
 DIST kea-1.5.0.tar.gz 7395257 BLAKE2B dfc28916166a732714253e1e7458076643e1a40e9fbcfca78d7206155b355abedf630f19311a2b164b2af78227e9c8cd0db9afcc01015554e5b2c4c336a11c9c SHA512 6d6b7407831311ebe37abce382ce77c664015ddbe3e73ec78153a00b301f98af5be52e26ad4febf5ca1e478d2c1844db4c988b241d2700d758e90b077f176ad8
-EBUILD kea-1.4.0_p1.ebuild 1485 BLAKE2B 8b860d58efd988221fe35ce2d75e4ed0b59ba09d2c2b951e89c8a7d402f9689a9a59627f61c0df4644ab4e781b63e44d1994f294b37d30c6c98561a02964976d SHA512 9777bc0844c9e261e84f63294109935a8c8cab6e3545ab182ee7d3c8c996c0b979495182117701b30714c418eecd62600e435be279864b187f3227a279498aa7
+DIST kea-1.6.0.tar.gz 7154301 BLAKE2B b05bd6cbf53140e10da2614917d2f314a048035f1ba5b33bc260166d203c3c99c1aa6438f886569aa5a809f705572096834dbb0ccea67eee1a93c1ed61fc0d9c SHA512 09e670996ad3dbfc523ad7639e3cfd43147bf370069cec80a6ba6af4c45264f33318594a20073f1c5d75bd19bcaa275e3167b243e13c5a6c151c10d634f338af
 EBUILD kea-1.5.0.ebuild 1620 BLAKE2B aa8f2a332a2387db5d86cdb04d5d81974cb2940b78e37a9d1fa046d84af7481b74e5e922e9a02e8304079ef422b59e20f8f6bdc8ebc97099e6ce44167522dd25 SHA512 9e4d61c89e66dd06c58b5db9a6ad4daf29bccf39172ea6123c876d53211cd5a73cb54352b9865bbd19934023777a625573fc3f7f4c15e5cb2e5881e6a2a49921
-EBUILD kea-1.5.0_beta2.ebuild 1483 BLAKE2B 032da6b42cc0333422a8f88ccc823ab26ff33b1181f8ab0b3b009c4b094d72bb5ec0739ac97fbc058d30ed0c3095481012f50b7c2790f13f7f1da7c8fac87855 SHA512 ef638d67430c9f980121434367f7df2edc8b0e7a8c80f5dd56b346bf78e6062ec61932f2cb0e1dde989e21e03ba37f6360cd93d36fabf167f6aa3982276018b8
-EBUILD kea-9999.ebuild 1620 BLAKE2B aa8f2a332a2387db5d86cdb04d5d81974cb2940b78e37a9d1fa046d84af7481b74e5e922e9a02e8304079ef422b59e20f8f6bdc8ebc97099e6ce44167522dd25 SHA512 9e4d61c89e66dd06c58b5db9a6ad4daf29bccf39172ea6123c876d53211cd5a73cb54352b9865bbd19934023777a625573fc3f7f4c15e5cb2e5881e6a2a49921
+EBUILD kea-1.6.0.ebuild 1750 BLAKE2B a4d18a5a46923bddac174ed443d03c838cd6d6bbc253683a890f921ff11683ba2566fcbaf18d6004505132e738da9f54fd2dcda2d0df666707337339c76fb52a SHA512 64c24cf23105b94a1df01bcac4ed3fbb8a70c4ea2507becfa58a75e9951161ac3280a8e62b261b532fec733fb30185c9169b0dc2e66fc7c2c6295d8d56c0d588
+EBUILD kea-9999.ebuild 1750 BLAKE2B a4d18a5a46923bddac174ed443d03c838cd6d6bbc253683a890f921ff11683ba2566fcbaf18d6004505132e738da9f54fd2dcda2d0df666707337339c76fb52a SHA512 64c24cf23105b94a1df01bcac4ed3fbb8a70c4ea2507becfa58a75e9951161ac3280a8e62b261b532fec733fb30185c9169b0dc2e66fc7c2c6295d8d56c0d588
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-1.4.0_p1.ebuild b/net-misc/kea/kea-1.4.0_p1.ebuild
deleted file mode 100644
index b3312db88dd3..000000000000
--- a/net-misc/kea/kea-1.4.0_p1.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 toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
-HOMEPAGE="http://www.isc.org/kea/"
-if [[ ${PV} = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
-else
-	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
-		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-IUSE="openssl samples"
-
-DEPEND="
-	dev-libs/boost:=
-	dev-cpp/gtest
-	dev-libs/log4cplus
-	!openssl? ( dev-libs/botan:0= )
-	openssl? ( dev-libs/openssl:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	[[ ${PV} = 9999* ]] && eautoreconf
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with openssl)
-		$(use_enable samples install-configurations)
-		--disable-static
-		--without-werror
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newconfd "${FILESDIR}"/${PN}-confd ${PN}
-	newinitd "${FILESDIR}"/${PN}-initd ${PN}
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_preinst() {
-	enewgroup dhcp
-	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-}
diff --git a/net-misc/kea/kea-1.5.0_beta2.ebuild b/net-misc/kea/kea-1.5.0_beta2.ebuild
deleted file mode 100644
index 6a29a56af228..000000000000
--- a/net-misc/kea/kea-1.5.0_beta2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-MY_PV="${PV//_p/-P}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
-HOMEPAGE="http://www.isc.org/kea/"
-if [[ ${PV} = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
-else
-	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
-		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
-	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-IUSE="openssl samples"
-
-DEPEND="
-	dev-libs/boost:=
-	dev-cpp/gtest
-	dev-libs/log4cplus
-	!openssl? ( dev-libs/botan:0= )
-	openssl? ( dev-libs/openssl:0= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	[[ ${PV} = *9999 ]] && eautoreconf
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with openssl)
-		$(use_enable samples install-configurations)
-		--disable-static
-		--without-werror
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newconfd "${FILESDIR}"/${PN}-confd ${PN}
-	newinitd "${FILESDIR}"/${PN}-initd ${PN}
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_preinst() {
-	enewgroup dhcp
-	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-}
diff --git a/net-misc/kea/kea-1.6.0.ebuild b/net-misc/kea/kea-1.6.0.ebuild
new file mode 100644
index 000000000000..2d0234c2da44
--- /dev/null
+++ b/net-misc/kea/kea-1.6.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs user
+
+MY_PV="${PV//_p/-P}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
+HOMEPAGE="http://www.isc.org/kea/"
+if [[ ${PV} = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
+else
+	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
+		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
+	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+IUSE="mysql openssl postgres samples"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-cpp/gtest
+	dev-libs/log4cplus
+	mysql? ( dev-db/mysql-connector-c )
+	!openssl? ( dev-libs/botan:0= )
+	openssl? ( dev-libs/openssl:0= )
+	postgres? ( dev-db/postgresql:* )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	[[ ${PV} = *9999 ]] && eautoreconf
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--enable-perfdhcp
+		--localstatedir="${EPREFIX}/var"
+		--without-werror
+		$(use_with mysql)
+		$(use_with openssl)
+		$(use_with postgres pgsql)
+		$(use_enable samples install-configurations)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/${PN}-confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-initd ${PN}
+	keepdir /var/{lib,run}/${PN} /var/log
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+}
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index 75288a0c58a2..2d0234c2da44 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs user
 
@@ -35,6 +35,7 @@ DEPEND="
 	postgres? ( dev-db/postgresql:* )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -49,12 +50,14 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
+		--enable-perfdhcp
+		--localstatedir="${EPREFIX}/var"
+		--without-werror
 		$(use_with mysql)
 		$(use_with openssl)
 		$(use_with postgres pgsql)
 		$(use_enable samples install-configurations)
-		--disable-static
-		--without-werror
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -63,7 +66,8 @@ src_install() {
 	default
 	newconfd "${FILESDIR}"/${PN}-confd ${PN}
 	newinitd "${FILESDIR}"/${PN}-initd ${PN}
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+	keepdir /var/{lib,run}/${PN} /var/log
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
 }
 
 pkg_preinst() {
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 2256476e68bc..88b304073c18 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,4 +1,3 @@
-AUX lldpd-0.7.11-zsh-completion-dir.patch 318 BLAKE2B 98a182c00ac6d5fedabf2c5c0891020b1c896e6b412bdefbf2db6715065df8b1bf75965f262f42a794d2be3cfe78c716c44b02e6076bc5a1bfcb68f88730e337 SHA512 cd4c069f9d637d6c9f0a687a7a415a6382bf5217390a94a269de19f5a35c1edd47d5c3455bc63d75aa7bc74a72d7f2c9de9210c0795a95bd0c78a10c1709fcb1
 AUX lldpd-0.9-seccomp-missing-syscalls.patch 1192 BLAKE2B 2692d29b9ffcd7edc09c96b512dfdf1e868be50a07428ac810ec5276b132ef43215f59de498e0b1e61fbf9dce0db4261c96ee81461b20d2ab9764448b74a56ca SHA512 360c53265171ba2effed935da762d66213a911da53832d2c5426e775d4e0d00d2ee74b0041bebe100a4aeb1ecd0292ac4bd2f95dcf0c79440e28f2ec47b01669
 AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 BLAKE2B 47f508fd0894334cc4d00079c3c3907bbe419c1729ed54214dee835661742b8a904098a5a28a86bdf836becf10004942fe6159be29ff27adeaa8bc8258156681 SHA512 5b39207b33a5b419e1775bfbaa91f11b1aa07af786a4be7733f305ac5d5a7a1ef9e8a2eb91d023aaac005bc19c1445f864b5a702073892436b5e310fd4fa79dc
 AUX lldpd-1.0.1-seccomp-add-brk.patch 900 BLAKE2B 0bfbdc01382c8b96e6b266797110f5988f94abc9e40c19e0e2b7f24eebe07d91182629c8c2f06632360096b9f2509dbc0aea3f87e2152ca1ea264535c9c25f55 SHA512 8b51bce336da2151323f9fd8a48efa59684bc72450a49c438a4fcac81f64602f0a2777bdc8880b21541ac22760c7922b455225af7c27e8c392d70a651f84e752
@@ -9,11 +8,8 @@ AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e1
 AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893cc7437aa236fac9449d4890989f10618146b1da11795c637f29f2849c89af04b5156f6d9b1d SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0
 AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d24c4fa2b5b72426af5ee5ac57d40cfb2d1bc3ea6c1b253e1daaa341d998d66889bbc94c83d2438 SHA512 5b5aead569c842c2850fb0180b67beb87b4f0301e9e591d957089f5c659a30ef464fadd44a01f9b5476ff999368c3494c7dc7013db473d518721e5fab41cd054
 AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde
-DIST lldpd-0.9.3.tar.gz 1601102 BLAKE2B 0ba31d20dad9770c93fa4930a7c439273c36e5cebdb0b4a1674f0a375008f642e33d71b9668c91313ec4bb3311e1b4bd22d0996ed6347d2cacfd7cce24536a58 SHA512 0d40d77bfde78f9ceece56968981f3a36bd7e683b12de05e84e5da0409b8e0d06062e5d665942637a66164af0254a6ac3d1a327aab3bcb48ec91ecfdd2693283
-DIST lldpd-1.0.1.tar.gz 1590903 BLAKE2B 37ff1c042537ac31f394986f1bbd3faf13105d07f340ed045a4bbc196912c0c017a5d60b2c6a89b0da9faa5a7ff8e9c4ef0d4d01a39504a31c23288a89eb92a3 SHA512 61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd
 DIST lldpd-1.0.3.tar.gz 1605563 BLAKE2B 968d1c2e046049fd9ba9e9af7b8cb4f531fbd99f41a9157679f3694f800b0da1a4dd3b21feac583fa5cde3f57b022e2d6ee543ea349e1136037ba10419e3c855 SHA512 bae121a707d06726830dbb6b45210c1ed23aa2a99349a68d088b3ae3109504a6b462c7b0abf8543297083294519be2878779edf1a41bb73fe002bb6c9f966ef1
-EBUILD lldpd-0.9.3-r1.ebuild 2476 BLAKE2B ea99c4a7cf9b328e074c400ae1873340e10c2865b0ec7297f995563f5f0bb7656806d02caa490664b69e72effafa9af964820013a7c3b2a7bb83629680ff3b68 SHA512 aade0484be9dd930dbd7e7225e70796a93f3986b79a6a3a289f30de717e82845c890a6ce93c7986f7542e3f398ac583a95768d60ecf5e34091db7b70bd749fb0
-EBUILD lldpd-1.0.1-r1.ebuild 2439 BLAKE2B fc2b1c220d371f0e2d42efc6e7ed3f7ee5389cd4c2b96f7d5af6449a1bd8f1ccd7b42c01fd5a98587048df6694261ac0b5c157cae80010cb058bdf091227c829 SHA512 3a8fb50e15715e6b7cf53f6723b74b476ffe942adc39ee93612fa7eb7a4dd37c05b763c19afe128c9e17e4251cec9369e2c2c6f78249356f96d9caf0b4e9c788
-EBUILD lldpd-1.0.1.ebuild 2390 BLAKE2B b201067dde29c59460b13866be79e359bd933b24d9dfff80e59f69c0f586e8a6ba1daac4ef4dd4c86a3de398a05e96866f7fd3297771c07cc478830e2d1438fd SHA512 084fb2530ed91f354410515ddaeb790bdf8c6cc94d4db3e34c6ad9d6e094ecb18e7659a92ca46110975a1a6b39693c58eab72b89d0fdcb4b622aa687f1a054af
-EBUILD lldpd-1.0.3.ebuild 2542 BLAKE2B 047b22f95ba2b5b1708b963952d8e0a0f7d1de026fe07247761357006c19be93eabdbef1f666da9ce2ec4a32439834037918aa231fcf7bfda3838be147b98f4e SHA512 ddd5b65a8545d030284043eb782e0faa1a2ab0427891861d0f4323db595693225d0d7bf8f05f88f0bb8a30c846f63fb758775fe37c034ff844348a275064cd66
-MISC metadata.xml 2829 BLAKE2B 83e3f2636828107af74952f951e1e5874ce647f786932a509f79e154ab026a0556bc0341576f4c458e40c88feacee187e7a18fd1ee736953425d2cb252e0175c SHA512 a401329c2f122ba079995ce0c7810d32920a91dc94e8678378f3c0eb9f72e613710933df8508eb25ad1516bda1f406d6e459fe1049112dedd8c524a7d8432c01
+DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04c228eeb12a2f60ea6643f63a7de3831ee3f0a060cd4de3849e75b58fdb6a868dc1aa0f8dc4b516fdd4f4ead0 SHA512 a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9
+EBUILD lldpd-1.0.3.ebuild 2540 BLAKE2B 5feb12c469fcc8b1197ae90b81b07384ba5d9562e8a8104f5e1e1f3f89c1a50aca0b4801cbd18e553bbb5db8aae0eb41a328e37050c22393f62382b700b600af SHA512 497abc9c43b915427ae051d522a613db865ea7d221fece4c005e416bbae69aff60b99ced62d372f4c6ea8728c92dc06256f35ee2c50f858afe9fbb5cc9b456a9
+EBUILD lldpd-1.0.4.ebuild 2522 BLAKE2B 301b2684c36504372139267a37b51523ce21fcb0d775413f0a0234abe6b1a716d2825ea30ef8d49e1dd6dec3094200931a6f0d31585f621656dc071cba60e914 SHA512 24480ce8ad674947232f640ca6c8a6962cf3f79b568e83b34be709d30acd331a2351f9c6db4b714fce2e2950df01567581e5d80bc9c8cad13da34b04353b0fb5
+MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511
diff --git a/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch b/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch
deleted file mode 100644
index ff20d9aabc75..000000000000
--- a/net-misc/lldpd/files/lldpd-0.7.11-zsh-completion-dir.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/src/client/Makefile.am b/src/client/Makefile.am
-index 454bdeb..fd391fd 100644
---- a/src/client/Makefile.am
-+++ b/src/client/Makefile.am
-@@ -46 +46 @@ dist_bashcompletion_DATA = lldpcli.bash-completion
--zshcompletiondir = $(datadir)/zsh/vendor-completions
-+zshcompletiondir = $(datadir)/zsh/site-functions
diff --git a/net-misc/lldpd/lldpd-0.9.3-r1.ebuild b/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
deleted file mode 100644
index 4f8d9c61c91d..000000000000
--- a/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user systemd bash-completion-r1 autotools
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
-SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph jansson +lldpmed old-kernel
-	sanitizers seccomp sonmp snmp static-libs readline xml zsh-completion"
-
-RDEPEND="dev-libs/libbsd
-	>=dev-libs/libevent-2.0.5
-	sys-libs/readline:0=
-	snmp? ( net-analyzer/net-snmp[extensible(+)] )
-	xml? ( dev-libs/libxml2 )
-	jansson? ( dev-libs/jansson )
-	seccomp? ( sys-libs/libseccomp )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		graph? ( app-doc/doxygen[dot] )
-		!graph? ( app-doc/doxygen )
-	)"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.7.11-zsh-completion-dir.patch"
-	"${FILESDIR}/${PN}-0.9-seccomp-missing-syscalls.patch"
-)
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--without-embedded-libevent \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/run/${PN} \
-		--with-lldpd-ctl-socket=/run/${PN}.socket \
-		--with-lldpd-pid-file=/run/${PN}.pid \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable cdp) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable graph doxygen-dot) \
-		$(use_with jansson json) \
-		$(use_enable lldpmed) \
-		$(use_enable old-kernel oldies) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_enable sanitizers) \
-		$(use_with seccomp) \
-		$(use_with snmp) \
-		$(use_with xml)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-	newbashcomp src/client/completion/lldpcli lldpcli
-
-	use doc && dodoc -r doxygen/html
-
-	insinto /etc
-	doins "${FILESDIR}/lldpd.conf"
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
diff --git a/net-misc/lldpd/lldpd-1.0.1-r1.ebuild b/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
deleted file mode 100644
index 4f6e234cb95b..000000000000
--- a/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user systemd bash-completion-r1 autotools
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
-SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
-	seccomp sonmp snmp static-libs test readline xml zsh-completion"
-
-RDEPEND="dev-libs/libbsd
-	>=dev-libs/libevent-2.0.5:=
-	sys-libs/readline:0=
-	snmp? ( net-analyzer/net-snmp[extensible(+)] )
-	xml? ( dev-libs/libxml2 )
-	seccomp? ( sys-libs/libseccomp )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		graph? ( app-doc/doxygen[dot] )
-		!graph? ( app-doc/doxygen )
-	)
-	test? ( dev-libs/check )"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
-	"${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
-	"${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
-)
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--without-embedded-libevent \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/run/${PN} \
-		--with-lldpd-ctl-socket=/run/${PN}.socket \
-		--with-lldpd-pid-file=/run/${PN}.pid \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable cdp) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable graph doxygen-dot) \
-		$(use_enable lldpmed) \
-		$(use_enable old-kernel oldies) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_enable sanitizers) \
-		$(use_with seccomp) \
-		$(use_with snmp) \
-		$(use_with xml)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-	newbashcomp src/client/completion/lldpcli lldpcli
-
-	use doc && dodoc -r doxygen/html
-
-	insinto /etc
-	doins "${FILESDIR}/lldpd.conf"
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
diff --git a/net-misc/lldpd/lldpd-1.0.1.ebuild b/net-misc/lldpd/lldpd-1.0.1.ebuild
deleted file mode 100644
index 31d70bcb6cd9..000000000000
--- a/net-misc/lldpd/lldpd-1.0.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user systemd bash-completion-r1 autotools
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
-SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
-	seccomp sonmp snmp static-libs test readline xml zsh-completion"
-
-RDEPEND="dev-libs/libbsd
-	>=dev-libs/libevent-2.0.5:=
-	sys-libs/readline:0=
-	snmp? ( net-analyzer/net-snmp[extensible(+)] )
-	xml? ( dev-libs/libxml2 )
-	seccomp? ( sys-libs/libseccomp )
-	zsh-completion? ( app-shells/zsh )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		graph? ( app-doc/doxygen[dot] )
-		!graph? ( app-doc/doxygen )
-	)
-	test? ( dev-libs/check )"
-
-REQUIRED_USE="graph? ( doc )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.5-seccomp-add-socket-ops.patch"
-)
-
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--without-embedded-libevent \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/run/${PN} \
-		--with-lldpd-ctl-socket=/run/${PN}.socket \
-		--with-lldpd-pid-file=/run/${PN}.pid \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable cdp) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable graph doxygen-dot) \
-		$(use_enable lldpmed) \
-		$(use_enable old-kernel oldies) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_enable sanitizers) \
-		$(use_with seccomp) \
-		$(use_with snmp) \
-		$(use_with xml)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-
-	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-	newbashcomp src/client/completion/lldpcli lldpcli
-
-	use doc && dodoc -r doxygen/html
-
-	insinto /etc
-	doins "${FILESDIR}/lldpd.conf"
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild
index 822e037de615..df8005f63804 100644
--- a/net-misc/lldpd/lldpd-1.0.3.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 	seccomp sonmp snmp static-libs test readline xml zsh-completion"
 
diff --git a/net-misc/lldpd/lldpd-1.0.4.ebuild b/net-misc/lldpd/lldpd-1.0.4.ebuild
new file mode 100644
index 000000000000..04dd3d66540b
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils user systemd bash-completion-r1 autotools
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://vincentbernat.github.com/lldpd/"
+SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+	seccomp sonmp snmp static-libs test readline xml zsh-completion"
+
+RDEPEND="dev-libs/libbsd
+	>=dev-libs/libevent-2.0.5:=
+	sys-libs/readline:0=
+	snmp? ( net-analyzer/net-snmp[extensible(+)] )
+	xml? ( dev-libs/libxml2:= )
+	seccomp? ( sys-libs/libseccomp:= )
+	zsh-completion? ( app-shells/zsh )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+BDEPEND="virtual/pkgconfig
+	doc? (
+		graph? ( app-doc/doxygen[dot] )
+		!graph? ( app-doc/doxygen )
+	)"
+
+REQUIRED_USE="graph? ( doc )"
+
+PATCHES=(
+	"${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
+	"${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
+	"${FILESDIR}/lldpd-1.0.2-seccomp-add-misc.patch"
+)
+
+pkg_setup() {
+	ebegin "Creating lldpd user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+	eend $?
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--without-embedded-libevent \
+		--with-privsep-user=${PN} \
+		--with-privsep-group=${PN} \
+		--with-privsep-chroot=/run/${PN} \
+		--with-lldpd-ctl-socket=/run/${PN}.socket \
+		--with-lldpd-pid-file=/run/${PN}.pid \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable cdp) \
+		$(use_enable doc doxygen-man) \
+		$(use_enable doc doxygen-pdf) \
+		$(use_enable doc doxygen-html) \
+		$(use_enable dot1) \
+		$(use_enable dot3) \
+		$(use_enable edp) \
+		$(use_enable fdp) \
+		$(use_enable graph doxygen-dot) \
+		$(use_enable lldpmed) \
+		$(use_enable old-kernel oldies) \
+		$(use_enable sonmp) \
+		$(use_enable static-libs static) \
+		$(use_with readline) \
+		$(use_enable sanitizers) \
+		$(use_with seccomp) \
+		$(use_with snmp) \
+		$(use_with xml)
+}
+
+src_compile() {
+	emake
+	use doc && emake doxygen-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+	newbashcomp src/client/completion/lldpcli lldpcli
+
+	use doc && dodoc -r doxygen/html
+
+	insinto /etc
+	doins "${FILESDIR}/lldpd.conf"
+	keepdir /etc/${PN}.d
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
diff --git a/net-misc/lldpd/metadata.xml b/net-misc/lldpd/metadata.xml
index 83adab8a47e0..1b100cd39eca 100644
--- a/net-misc/lldpd/metadata.xml
+++ b/net-misc/lldpd/metadata.xml
@@ -25,7 +25,6 @@ lldpd also implements CDP (Cisco Discovery Protocol), FDP (Foundry Discovery Pro
 		<flag name="dot3">Enable Dot3 extension (PHY stuff)</flag>
 		<flag name="edp">Enable Extreme Discovery Protocol</flag>
 		<flag name="fdp">Enable Foundry Discovery Protocol</flag>
-		<flag name="jansson">Enable JSON output via Jansson</flag>
 		<flag name="lldpmed">Enable LLDP-MED extension</flag>
 		<flag name="old-kernel">Enable compatibility with Linux kernel older than 2.6.39</flag>
 		<flag name="sanitizers">Enable code instrumentation with selected sanitizers</flag>
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 5a392a1abf91..f2ed72b4e66e 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -7,6 +7,8 @@ AUX memcached.init2 2205 BLAKE2B d27dbf6fb4d72ec49ff89cb3957770a25afe467c96c0564
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
 DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed
 DIST memcached-1.5.16.tar.gz 487868 BLAKE2B b9889866b8adbbbf23785f0da35f6f6b3cd5c842c6167beab3dd5385d6ed53e4607a2ffc18cd815005f2a1d67a3a549c780411b93d34335c541f4999d793b8a0 SHA512 999872c4c68e0210feab76f74c9487fbfb652cf3e6b7fa347f882767aad41ea6d8ba3ee056494409c054d673fc209032d8a890605810b2c6c9048d26d50751a0
+DIST memcached-1.5.17.tar.gz 490891 BLAKE2B a971083ec29452755de953537ff9c23fc872496d4746420c9c20e91c226481bd3818c00495cb7a5d85f2bd38683061e57a9e92cbfe0e4cd28bcafde37f05cabf SHA512 533c916015d738ff4c7ba8420654ae15b19370b3e959b89d43bc60cae1bda65d36906be05fad44a025ea1878570a8c1a36041c4e4c0cdf0cea84e6bb0e7ba325
 EBUILD memcached-1.5.14.ebuild 2912 BLAKE2B c0fd78c76871cb26f9c8375d9b22d6073f6f81d8daedca76b0398de33fd1d2665dcdbcbddbacba4419747e16b3a379dcdefc1da99167826d68f6829e04072846 SHA512 795f3933d27879e5102773a7527b129a1de60a61f4c53acae02d5229fc37efe8cc2e0055e1cd829a958e4f7681d9b0785090c04a8ed2f261a4253ccdccf99bc8
 EBUILD memcached-1.5.16.ebuild 2920 BLAKE2B 44a9e54f77974921a4550308dff727bce9b1924514770e3526f710c5b1b1c8cb9b422c0f53dda5d7e6b67f75173c3624117871ecd12fa06f290e05b0dfa59628 SHA512 cd45d05190af8eb23017b52ff00a01909f35003c58d1591857d47ba6ccd445885595262ddc02f0a251621c6270fa81f684c59e953949a994d85f066e91fc0f54
+EBUILD memcached-1.5.17.ebuild 2922 BLAKE2B e2dd55a2876f4ae53465b2df1aedac099e496227b4ae56c00a9c081a8069d2e6ad4d489b8414865a431101db52dd32f50a65e2245122e3a484d3b3afc2800a1d SHA512 45cff587c952d530c1c986789ef6b54f5cd177b238e2941f8ea604412374b9fbdc09b4fb0a676914f6d54edfbde3a463d2fa94a45a70876a20ba89166e4af251
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.17.ebuild b/net-misc/memcached/memcached-1.5.17.ebuild
new file mode 100644
index 000000000000..8d046a22030e
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.17.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic systemd user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 5c7efc667443..424c565fc86c 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -1,5 +1,7 @@
 AUX minissdpd.confd 487 BLAKE2B aeb624644debe2e9ba438f9839f526fc9411e6f4d355bf46764c5b7b59a62776c16c93d4112821159835e9d9f174f2af443c0d07a10823b41182910d12899947 SHA512 5ac723cb5b3d3f8bb97989cffb174f22566fcebff304e40f12ca5144cfa94b00614fdf6925e2c5a1dd0f8fa533aac12e991bad0d0909cbdd90a9b7ed73e0c296
 AUX minissdpd.initd-r2 1522 BLAKE2B 35bde96e182529f0dd10ec4081c495ba1f52706dc191e29fa99ebb7d37b302578e492f705d4f724744ec3a9ca455730f01294e2a781529c3750193fd8e84cf50 SHA512 6d14fa0730b4c1f0e6a6765c80250ebd01d69c6fd3341049fae276a3d0ae2ec806cdfeb3b7897be0b62e426c7c9d7fb59514a0d67bb751a2e41f9b9616cc9ade
 DIST minissdpd-1.5.20190210.tar.gz 37227 BLAKE2B a273c35bb332e50f5c528cc395b257de7761fbec2cdef910018b0c751026ca4f3fc9fce60485c4209488574d3130a3c8a6d2755ae4114d2f4e2c0316491be021 SHA512 1902c3c396cdcec90af0638305224f77871bd7f70057ac8a1ff59b3ab6da168ee17eb52a5bee87eb85c8d759d02112225876e38c254ad521396eca9c4884686c
+DIST minissdpd-1.5.20190824.tar.gz 37300 BLAKE2B 3a04f6af0af8ce5d26e4860ceafe2c52f1ee562f179094fbcba3485c85ae75b7374fd7fa8f89ec6d9ce2a10bb94120618de40e0191fc7ecdd1e813a2b9c5d6af SHA512 79a14482b69a88b778e484a3b3e98964c420ff7576ac818ba60fd5e07f5b31754cdef3ee00d9189ba0a33f0268f11acd1f7c4222d8d0958920d1f568ec7755e2
 EBUILD minissdpd-1.5.20190210.ebuild 676 BLAKE2B 1d2e443df9406d31e7942c150b430eee7c68e3550f434b8fc4732db1c593335266864408ae93bb669d769dcfc83a9a1524d234a5bafca2446fc06fab63cb410d SHA512 f3429b14b6e2e7d019c582e7354f073159526299c3638e20622a5030cc49a2756d098356facd4974be82f14260e84775fd598e23ad05a0b2ce49c4728a94550e
+EBUILD minissdpd-1.5.20190824.ebuild 676 BLAKE2B 1d2e443df9406d31e7942c150b430eee7c68e3550f434b8fc4732db1c593335266864408ae93bb669d769dcfc83a9a1524d234a5bafca2446fc06fab63cb410d SHA512 f3429b14b6e2e7d019c582e7354f073159526299c3638e20622a5030cc49a2756d098356facd4974be82f14260e84775fd598e23ad05a0b2ce49c4728a94550e
 MISC metadata.xml 360 BLAKE2B 7e083fa0362b52310ab298a0684308dbe220a6f6acb7b99c99cf6bf22cb9406da9d34e021a367d50eaefa67f133c5b57f01d4b63aa46887ea15bf4c66ad5e5e4 SHA512 fbf209d07841a834e1d216090879be7a1e739f7ddd1e649d40d24aabe8782d2ed55a37fe8525453cb96137f1c76044087a6b435c786877349bbe939485d7b855
diff --git a/net-misc/minissdpd/minissdpd-1.5.20190824.ebuild b/net-misc/minissdpd/minissdpd-1.5.20190824.ebuild
new file mode 100644
index 000000000000..35c0a1f9b2be
--- /dev/null
+++ b/net-misc/minissdpd/minissdpd-1.5.20190824.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit toolchain-funcs
+
+DESCRIPTION="MiniSSDP Daemon"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+HOMEPAGE="http://miniupnp.free.fr/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-libs/libnfnetlink"
+
+RDEPEND="$DEPEND
+	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	emake PREFIX="${ED}" install
+	# note: we overwrite upstream's init.d
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	dodoc Changelog.txt README
+	doman minissdpd.1
+}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 7a1e27887d4d..650c9f0f9462 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,5 +1,9 @@
 AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
 DIST miniupnpd-2.1.20190630.tar.gz 240466 BLAKE2B fe4d4e59a7dad32bef9ed9b4c58b52e378ec9b26ea2439e84284630a7ef7269c6cd53cabdc632ff274cae88aea2552a8808af2ea349138f8b8ed667baf9e87ee SHA512 cd6006e5487652a258f7320e1e28fea7b0790528cc014071109a1abd0f6c249237cf8d0620987c14ee0ce1cca14f4bb4abd439b1d422e0e49a398cd485eaf970
+DIST miniupnpd-2.1.20190824.tar.gz 240490 BLAKE2B c2eaf08b18d4cd27a18a71232fd8d972ced799a68b0e6f3ff1b3d155ab0e27047153dcd81a0c89806f74a6c09c303eb3255825f6fd4083f1ec77605ee4f0d1b3 SHA512 f3e591e10b33d2459e55118db11f6692bafd75ae867f934f4a5c6ccf6c9cf21363d0a746d1b319a08381119f382d5941af84c5bfb5c54b97f8945aa9d7372987
+DIST miniupnpd-2.1.20190902.tar.gz 240742 BLAKE2B 0b880b1e8a96c56af92726d3fe81da0a26de83861efe4dc266e287623dcac4c6bd4c4ac8d2c6ef7724c1055933d5138e7c86da5c8e3852f2022f69697505f231 SHA512 0abeb9df088ecd57909106fbb43de14d90eebd351a466477777f413f40c49bc432050bc8ea0d655d2eea0bfcedbdb97719ea2476a8bd9170ef9b74ad97217d26
 EBUILD miniupnpd-2.1.20190630.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
+EBUILD miniupnpd-2.1.20190824.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
+EBUILD miniupnpd-2.1.20190902.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
 MISC metadata.xml 1037 BLAKE2B 9fa42839f13b135ac2b69091b9d0ba1d3749f3b9903bcaa209c0d23ff981615c58df027725a536b4e268c53eb285ab6750bbeb7e0bc8e668dfca61b787ec9c60 SHA512 536ef1fce9d3d76eb33a88707c5750fc0b014cf29b4c20d3459bc0116a68234667689a297e8aae35507f1b6b9fde7590d14b3763f2813c485478e18f396bfeb8
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190824.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190824.ebuild
new file mode 100644
index 000000000000..07c804f35640
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20190824.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0=
+	!nftables? (
+		>=net-firewall/iptables-1.4.6:0=[ipv6?]
+		net-libs/libnfnetlink:=
+		net-libs/libmnl:=
+	)
+	nftables? (
+		net-firewall/nftables
+		net-libs/libnftnl:=
+		net-libs/libmnl:=
+	)"
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release"
+
+src_prepare() {
+	default
+
+	# Prevent overriding CFLAGS.
+	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
+
+	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
+
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_configure() {
+	local -a opts
+	opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+	)
+
+	emake CONFIG_OPTIONS="${opts[*]}" config.h
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	local confd_seds=()
+	if use nftables; then
+		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+	else
+		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+	fi
+	if ! use ipv6 || use nftables; then
+		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+		"${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190902.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190902.ebuild
new file mode 100644
index 000000000000..07c804f35640
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20190902.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0=
+	!nftables? (
+		>=net-firewall/iptables-1.4.6:0=[ipv6?]
+		net-libs/libnfnetlink:=
+		net-libs/libmnl:=
+	)
+	nftables? (
+		net-firewall/nftables
+		net-libs/libnftnl:=
+		net-libs/libmnl:=
+	)"
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release"
+
+src_prepare() {
+	default
+
+	# Prevent overriding CFLAGS.
+	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
+
+	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
+
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_configure() {
+	local -a opts
+	opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+	)
+
+	emake CONFIG_OPTIONS="${opts[*]}" config.h
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	local confd_seds=()
+	if use nftables; then
+		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+	else
+		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+	fi
+	if ! use ipv6 || use nftables; then
+		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+		"${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index eee1fde6781d..eddfafa356e5 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,5 +1,3 @@
-DIST mobile-broadband-provider-info-20190116.tar.xz 85904 BLAKE2B e41ca1914c8b9c47f52f5b65cbfef577814269a23c5777fb1caf582cfc1c0c9a5125f51907748de8516b8aa3a8cf3fb044c8521d305161b206cc75f06e791764 SHA512 82cbf2c4523bc941d7cbfb1f552057d8259fcccbf95d02a6d43d315136050928ae5a8cf85f9900196214b803bb087446e28254d148af6b004225518f07aa9d23
 DIST mobile-broadband-provider-info-20190618.tar.xz 82640 BLAKE2B 6aad85193297a17c4606bdc700b0d3c7ce59c897d5d8fe0cec4ba3d17168aa519971c52a6b4c1f133c24a8fbd3f2ed1f3d45461248612ac95fbb746a3de9217f SHA512 511e6561b9b0db6c26f2e08bd06bb1dc9bb46696730fe6c6eba82cceec600dad684dc8dbe27adae78956367fb00dd8745070046acaa7a1129f194d8f16df425a
-EBUILD mobile-broadband-provider-info-20190116.ebuild 458 BLAKE2B 1d88977c00eabd0b81e15b93b718b7a1dc23d873dfc3d6e89ba5d015c3777b0d8103a7c3c5d9a5a91f5db9ed81b1aa3ba6b575affdd2cbb5d0ed7d951143d2a9 SHA512 032590ceacc4a2e212a6bb07ee227d386c1a4aa637fc8c74f6626ad0ad5c184b20f00d280ffa76da9355f365722963ceb7633b806fc2b711abad1aae2755ba68
-EBUILD mobile-broadband-provider-info-20190618.ebuild 451 BLAKE2B c8f4bfd36aa1e660190dea24bbb42c5280c15f625f79863f0b03e29df6b8f8afa65d3aac08f1c6be1a0e9326d9a3425512d9e319ffdeefaa2a826d8bcef84649 SHA512 2c61b42043cc65a04e98453338ea16b38acebab94fed8ffbcc91abdbabf067948dc8e4d3bcd21288f21c5ff4d6adc29906b7ba92c8261885923a89051d13621a
+EBUILD mobile-broadband-provider-info-20190618.ebuild 441 BLAKE2B d9ded965878f821ed011f934132418729648413be881123bd91e48c6db1e25305f2b5393c10131d877c057958c79c50d45fa20b3ab381e74f9a16cf7207d39dc SHA512 1ef9872af4c53385124f30725daadeaf603aa1e78550f5cd0c492957bc9d3b9429b5da4403601cb8594dc44e3d56b0bb1c8c5d81a4f6e64b76719b7e5e42aea0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild
deleted file mode 100644
index e356471e6a3b..000000000000
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org
-
-DESCRIPTION="Database of mobile broadband service providers"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
-
-LICENSE="CC-PD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="test"
-
-DEPEND="
-	test? ( dev-libs/libxml2 )
-"
-
-DOCS="README" # ChangeLog and NEWS are both dead
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
index 0cd0a8925e4d..4b4321836f0f 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
 
 LICENSE="CC-PD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index b61e85d3f916..d4fd86bfdc00 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -4,6 +4,6 @@ DIST mosh-1.3.0.tar.gz 356220 BLAKE2B c0a74243f7f54e24b2ccc326f89cff87f2772bf98b
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
 EBUILD mosh-1.2.6.ebuild 1421 BLAKE2B efaae0cc26ad8542351721bd8a82e33241175170b5883b40f2bfb8cf8b6b55209b7e526087ec4104f5eb3a27328844c0f59aa70379ef3d950945259147f8bf86 SHA512 116498494644dfe64dc2764d33e4ee567b7e67ea8fc538ce17eec31243a739d2f5c7ad046952be7b01119fbf1635a44807284694e35ea0ffa56c2520c59646c0
 EBUILD mosh-1.3.0.ebuild 1425 BLAKE2B 8244b7496ab7091af92ff8ddf6d0f702c5d75ae9a647baddaf514fa67fe3532fb3c645cae287dde5da6d226e9d64a005427d656c5121dc7ad53524a552547662 SHA512 aa1d9546fc5a8ac7b58951e54e343a567b1afa63ccccc740e431b716c9ba58bac6ad5e27b4c07b89618ae56ade77d73a7da9d29b99d43b63179683913ce074ab
-EBUILD mosh-1.3.2.ebuild 1495 BLAKE2B 8726361ddd15b620f13c3c011955ec28280c8c2ef03c3d9a7c67568d0736d3e003ca6579f0dc71103d0e19fc7f771d9a73de0d93f3293b3ef50e8ada5564b945 SHA512 3e3cd120664e9817970546b0238bb880d6d0de340b30df782b8232426b01bddf5de9fbdeb564604385f8f023f8133a499b5c3017ee58d1960cb7e7c6f2db3242
+EBUILD mosh-1.3.2.ebuild 1522 BLAKE2B 9fdfbc5762acd2b8897db9c01f89646d74b65312968f3f778e89511a58d5ba8d54907a5aeda3d33d839801148d755c710ba53eb21f42e0f234ef7b74a1a8c0fd SHA512 bdfec478e306626b6a79026c866e572c5e5adad61617e956caaaf68c0e63a008b470a15e739c59f38b713dacb94758c68d20a0b133776df361cd02df5f463f5c
 EBUILD mosh-9999.ebuild 1474 BLAKE2B 752b071131e7a0f33587374e8a2150c62570d2c6c70f9c5ed44efe629230202dd2bce07acc40f3cce14eed60ef467df3fc1d78e2fc2be7bc005c8f550b0a7036 SHA512 c7e8cd3814ec54f377472285f7f9c47737bd2dedb596a97551959c3332dfbee5c129cb52c41dd1f1649aa38aa1db38b45793e9d4af42f97d479d2dfb13c1fa0e
 MISC metadata.xml 1054 BLAKE2B 88f7bb070bcd535ba07cd1897dbf27bd2a5081f367354f67943e22148b2ce4d0c9e8b9ba5c1d4906057d4a015f69af2836abb69bd9e656bfd66ad483592cb843 SHA512 48fd6dc4aa24de61a6951b49cad3db41c084a0ec985af53d13d78c7bcae801152afcc7930eae5a0b6393cdcf844f0986f4a943d7d6f6193b950845e9da509ab2
diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild
index eb607fe4305d..4eea0ddd9726 100644
--- a/net-misc/mosh/mosh-1.3.2.ebuild
+++ b/net-misc/mosh/mosh-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+client examples libressl +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
diff --git a/net-misc/netsed/Manifest b/net-misc/netsed/Manifest
index 88327d330e41..62e42c7750d8 100644
--- a/net-misc/netsed/Manifest
+++ b/net-misc/netsed/Manifest
@@ -1,6 +1,4 @@
 DIST netsed-0.01b.tgz 6352 BLAKE2B 0aa8ed9f282f32d139e50af1a1c8d1aae118ff6e892475774125b45c229707c40544199ea70708827636a50e43b8f652138b244cb2f3857c854d49018b996fb7 SHA512 edef6ef6e39a17a46a3b4d8019ba2e742b2b5852f804df5e952461a792e3ba7a49fcc33353abf7e532e51586927f28f4b7c6da4f4fbd34a32cdf093f26163dd7
-DIST netsed.tgz 6352 BLAKE2B 0aa8ed9f282f32d139e50af1a1c8d1aae118ff6e892475774125b45c229707c40544199ea70708827636a50e43b8f652138b244cb2f3857c854d49018b996fb7 SHA512 edef6ef6e39a17a46a3b4d8019ba2e742b2b5852f804df5e952461a792e3ba7a49fcc33353abf7e532e51586927f28f4b7c6da4f4fbd34a32cdf093f26163dd7
 DIST netsed_0.01c-2.diff.gz 3140 BLAKE2B 211c7f71a76b74fc47cc32dbd5e9ad05a2c7c67bd95de73b0bdb09249f245ab8b0190ee79b51cf1d2f2bc99cc0b7fdf8d358851fddafb2815adc640260122c77 SHA512 5a729e9800051449f7f52989cb65232e262ac6023f21b8ec688f3ce33ed4be79f9d00993aed7773d83dbe109927a5fc6c64e4775d4958136e5c891b6b82e6b83
-EBUILD netsed-0.01b-r1.ebuild 543 BLAKE2B e3188985cf509cd621ffef839525a1a7d92f54b0dff06eb31c901401a6301d9ed1e70e4d9e2c3949c66d2beecbaafff9e00d5489bda76621e02cbfc3b65a5fb7 SHA512 a8ff862ff7314cf6a3316b9f85f8c0b634e62557a879e91d08b3f1ce0277cd01d24c42ef61a230c194deb064134d1dd5079d6889b558cd7dd1c6da469bc21817
-EBUILD netsed-0.01b.ebuild 662 BLAKE2B c2cb326d7eaeac16c23eed475a6c0169582d5ae537dbcd7e7d1ce3166a3b03186d0c2adff2b643579c8629fbe88a7f5132a6498be1128058e46daf95d31aa1cc SHA512 dfbbfe4d6b5f25c9b05ca1f0bded9650a7eb60db74ab7906732a52e25eb0b4204d2a0cd5abe4dd42b94726bd92512ad383072c3052ccfe61c228395ffe3c8d6c
+EBUILD netsed-0.01b-r1.ebuild 542 BLAKE2B ccb708488b5d60157afb379c08a29012f188cdffcb2abd1fd90f0754e89e1842255b6c3d98f236fb85bbc0845d2316946ca3ddd345a416dcd8013cdf73fc54ac SHA512 f0c898c0cf65673242b8591283a042341792dd2bead9529db1f613e852c454d7fa97baeb1cc752c83a3d469074b94a74c9e3477fbcde8ccf7c6f5f7303bdb764
 MISC metadata.xml 246 BLAKE2B 51e0781372b853df95595d4124ba0f81cb5fab4dfb78745aeeebcc0728617634384d5f9a90f02b50c13330b29651450eb18dd782e1c485bea5bdcb5017fd1d63 SHA512 68010e77c1c73aa0f8b81bd63ec9734de511e7b3fef0edd156df2584f25b6d485656a4d11f200af89e53a1b3ece9d6d15e93a2d1ba63f83adf944841183cdf00
diff --git a/net-misc/netsed/netsed-0.01b-r1.ebuild b/net-misc/netsed/netsed-0.01b-r1.ebuild
index d1c95a069071..e47d88888bc1 100644
--- a/net-misc/netsed/netsed-0.01b-r1.ebuild
+++ b/net-misc/netsed/netsed-0.01b-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${PN}.tgz -> ${P}.tgz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/net-misc/netsed/netsed-0.01b.ebuild b/net-misc/netsed/netsed-0.01b.ebuild
deleted file mode 100644
index 4072aa1d0567..000000000000
--- a/net-misc/netsed/netsed-0.01b.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Small tool for altering forwarded network data in real time"
-HOMEPAGE="http://freshmeat.net/projects/netsed"
-SRC_URI="http://dione.ids.pl/~lcamtuf/${PN}.tgz
-	http://http.us.debian.org/debian/pool/main/n/netsed/${PN}_0.01c-2.diff.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	mkdir -p "${S}"
-	cd "${S}"
-	unpack ${A}
-}
-
-src_compile() {
-	epatch "${DISTDIR}"/${PN}_0.01c-2.diff.gz
-	make CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin netsed
-	doman debian/netsed.1
-	dodoc README
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 367f985ff30b..c0db81594cf1 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -7,5 +7,5 @@ DIST NetworkManager-1.16.2.tar.xz 4820392 BLAKE2B f85fa4ff27cb2f0fc7d58052c810d4
 DIST NetworkManager-1.18.2.tar.xz 4872252 BLAKE2B 8a3fa74837a6cf2a09af807b9bd164c949d31efb81fc212485f49e24f0a215ff06db10c4259712f6c51d7480bda1b53457bf50bda9b2df8330891e8c8ba394c8 SHA512 a220d856632693298af0bd23ae4393ee597684fcae400c8ed35bae5e543bcdbd0b0e879f4a7587b674ae86c5fdfbee955acd0fb6226cb95ed31372cb7c222814
 EBUILD networkmanager-1.16.0.ebuild 11106 BLAKE2B 2ad8ff5ee0069946ed60b644ac8beb24167ba6da6bb5d8ddcef09d7b4187974efb62ef867d98b746b7910005a3dc89ffba5b263ffdcb2260a92463658b4fefcf SHA512 db17cab0f2ae56802f57e5f785ba11f5b3391a6a595c9ff773ace9b75d0d36df260fd5ef1ba6ec5d5f3539645bc2c5c03af628df89cb830861526da078b6e619
 EBUILD networkmanager-1.16.2.ebuild 11131 BLAKE2B 0ce19eba230f3608d09c4a6664e4d877711e683b6fecdabfaf5876ebfe924f6ced3445881f99cd90003e17482f90cd6d8ef24d3c0b1541afe5cc9ee510ec1c47 SHA512 40f15c6ed60d0c931b8b882e99a32a4daf795f40939a8e8b8826ede4fdacfd204efbbc4e3f82ffec4e5ee6d4ad0c54b435e5d3301cf7c6486663ad3ce65b6a62
-EBUILD networkmanager-1.18.2.ebuild 11131 BLAKE2B ace4e19631cf2c5963c7c47669cf8e96fdfe00c6e3152d54a2cce5d1b1cd0822961a55f8d6ec1a9b3c9a2d7bbd0eb15775ed570203b45c3ebe4685e766e8ca5c SHA512 d6a6eb85fc9c30cf434c6ea841f49c4f6adf1fe2b2e6a4a10cc9e225956ff7ab1d0398f66fa21918106296b8880401fe7b4d1b57b7cc09bb04753ae8c34fe191
+EBUILD networkmanager-1.18.2.ebuild 11126 BLAKE2B 0490cfa37f7423edc94e7b5b650c6d1986c0dd450413bd5031add0b6585e134a26f29f3306ee6198feba3b22191d774cfba7bd73cabc87e359be2bfe8678ad74 SHA512 0f041e6faa53cd4ecd6a07c0b8aa7e4d43594d9a89d96115265a9198be5449e2cb3bbe8312f01237b7aabad5cb6853d8d56ef1803ce119f76c7b8d68f3c7a318
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.18.2.ebuild b/net-misc/networkmanager/networkmanager-1.18.2.ebuild
index e90575126d4d..0e98e4e8353b 100644
--- a/net-misc/networkmanager/networkmanager-1.18.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.2.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
 	?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc ~x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index da0516fab64f..4b4c8fca3962 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -12,12 +12,16 @@ AUX ntpd.confd 192 BLAKE2B f5387ba2571b238a3e4f78c11151153deb40ad0babe4728942ec0
 AUX ntpd.rc-r1 489 BLAKE2B 6d3fe11a2ba7d04d02b24ca3acbcae5419908d12e94118bf91fca825f7561304a01dc9085cdc371b91498f6b14503c94cddeeb462b23c2b4b1017d3bfd3bd3ba SHA512 d51856ebff9160a01e1331114c5a8ea7337f9c8b570da75f36bbb29dcaf1924a40cdbbbf56e03148fc0f540103846e58d15175acf2e9d83c6b68d55c1e199734
 AUX ntpd.service-r2 207 BLAKE2B 5df5cbdde640e2686b94bf5ae952f257ec6905204aade6e0c482623187456336a5f7e4dc89fe56d929f17b16a8016e775c83f8db0bf8cfc30a819cf79da16b2d SHA512 c6425efdc046f5a8981a2ec97993d65454fe4a0c4162f8e8d873abf91280a4263509657e1d582baf5b02ce0ba536b87ca49158725f69914c9b01502f8c0e97f1
 AUX ntpdate.service-r1 316 BLAKE2B ffa7df1f3cab697bf971545cf1c60394ea456f67e2013adafdab97b4f44f93851705c3bd60e0a075c8c2b3c2f2b5d89440d63db9617dc37ac07bafe015f89e8d SHA512 156a6e48be3534ddd6e699315fa65d7ea0ee070594d7b7049962adeb8b411c0f2b919b93afe3f2976392a300792c6e6139529cc576dab6af3f8b94919af27eab
+AUX ntpdate.service-r2 325 BLAKE2B 807cef41cdaf78e582f6e77b8c992c8fed048ccb64b01152111294e4f281858815d17d90318421ba6dfcfceb49dbbbd8ae691533ff5e06ed972fb298f17d0e02 SHA512 745a9b9dd3a440b41228b1139978782dc1c2dd9a0876b5c4f9b842570fab1a6c6fd8f9e1a8b638aa7113ec863cefc17d578d8497ef4ea685ad984fc4020fb2db
 AUX ntpdate.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 AUX sntp.confd 149 BLAKE2B 8ef1da02161b1b757dcf3f34934f2455499ad1f28b0691e4b49334c5900b936a96eb91bac371e756256678ff4fbcad30239fe8753d605fc8a9c498a2fbad72d3 SHA512 28c8f1fd3a69bbdfacc2379a3ce01f254ae21fd8b91d893600086d27e5fb9cccf05d1bf62022ab26fcb53fa2080d4178961619811fd7a56f4e7502893f8ea13b
 AUX sntp.rc 484 BLAKE2B b8d829c7f1f2f9fc5e4cfd584483f31843d5b5740cf2fd89a9718fc7db86fc540406dfbf1209fbd5a1a44b3c9a2e0ffc92b28d01310a2125507489f0caf3ec10 SHA512 17b48cf31f5b15f5219d4a7f69a5eb84805bea256f8ae5b4888e56ec4de7e9a2640c7a36e236a467ecc7881a1757a12c24124697694730341f24bdeb751d8d7d
 AUX sntp.service-r2 324 BLAKE2B c94e72170f46453e94d6fb48b3ee353ba2db1bdf1903f6521219975e9a456346f8525f8016dfb10779e474e9495d7dc37ebfbf6e23b4482a6ae2396e6456796f SHA512 8626967f3bf9ef01fa5a2b7268b220ed7c518974db450a6f56316ede7b57947351171fb8ae6d28d32599e50c1d5506b4547dfd03cdbd80c5b873efb7d606cf17
+AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b920aa400cbf7db4ecbc874e5cddb778dbdca07da9cb79be327c1c0f8f296d30bb20d6b886b41084e5f SHA512 607322b6b47fc3e64e16a91e8c4114fcc1c565769e08dc872be9d9eb7c747a42c52a3ac855544cd05a3ae232463d612c1e58fcfed2d5b8f6fbdeff076f490380
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2
 DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075
+EBUILD ntp-4.2.8_p13-r1.ebuild 4584 BLAKE2B 08f0a824000d854e3371c12848cb042860b155b57fbaa6f598c825de0c3ef924b9d581e98c270aaf2d9a695735086824a414f893f52bd7a996b51c682fb0afc4 SHA512 1c84804f8efb04e601461dcac9187bf40a0d29cd716001d4721342f971b8abf9bcc12529c0c84eb6e8ecff53dfe58186ccc3e0c227d7d7e2deb886988b502ce7
+EBUILD ntp-4.2.8_p13-r2.ebuild 4587 BLAKE2B ad00e9a09745e16d9e227afef5f4f916db9b021579c8252c1caef10c0837f55a735b87be49dc97ef675a4f73d98943a847522e06011580b6598a66d7e8ec1612 SHA512 9ce56598d743a1a58880858c09e981d0b4255ffc5acca4f661ffa3cfd510b7690af835877b5947499109e30064f057dabd25853c0f4de5e1035b8742a5e8f129
 EBUILD ntp-4.2.8_p13.ebuild 4571 BLAKE2B 1884c38ee5b85477cfa32b39d6c42b0f24548cef45a8542d36b4ca39a5d3d3dc26e2dd964edb731e04e4ecb0eb7fbf2a4eec05254fcf04f5cac18266d6dcd4ea SHA512 ff1997994042aaf04638ad9a14c2c7acd05983faa2f21c78626d0d2596f82b73102082129804a465b4c3cf6974f1a1b510bacd36f639f5272543569de7bcf675
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/files/ntpdate.service-r2 b/net-misc/ntp/files/ntpdate.service-r2
new file mode 100644
index 000000000000..7ad294eccdee
--- /dev/null
+++ b/net-misc/ntp/files/ntpdate.service-r2
@@ -0,0 +1,14 @@
+[Unit]
+Description=Set time via NTP using ntpdate
+After=network-online.target nss-lookup.target
+Before=time-sync.target
+Wants=network-online.target time-sync.target
+Conflicts=systemd-timesyncd.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/ntpdate -b -u $SERVER
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/ntp/files/sntp.service-r3 b/net-misc/ntp/files/sntp.service-r3
new file mode 100644
index 000000000000..2ab722f2c6f1
--- /dev/null
+++ b/net-misc/ntp/files/sntp.service-r3
@@ -0,0 +1,14 @@
+[Unit]
+Description=Set time via SNTP
+After=network.target network-online.target nss-lookup.target
+Before=time-sync.target
+Wants=network-online.target time-sync.target
+Conflicts=systemd-timesyncd.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/sntp -s $SERVER
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild
new file mode 100644
index 000000000000..75150d171392
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs flag-o-matic user systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
+	>=dev-libs/libevent-2.0.9:=[threads?]
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	parse-clocks? ( net-misc/pps-tools )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-ntp )
+	vim-syntax? ( app-vim/ntp-syntax )
+	!net-misc/ntpsec
+	!openntpd? ( !net-misc/openntpd )
+"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
+	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
+	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
+	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
+)
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+	default
+	append-cppflags -D_GNU_SOURCE #264109
+	# Make sure every build uses the same install layout. #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
+	eautoreconf #622754
+	# Disable pointless checks.
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+}
+
+src_configure() {
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(usex zeroconf)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	# Increase the default memlimit from 32MiB to 128MiB.  #533232
+	local myeconfargs=(
+		--with-lineeditlibs=readline,edit,editline
+		--with-yielding-select
+		--disable-local-libevent
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--with-memlock=256
+		$(use_enable caps linuxcaps)
+		$(use_enable parse-clocks)
+		$(use_enable ipv6)
+		$(use_enable debug debugging)
+		$(use_with readline lineeditlibs readline)
+		$(use_enable samba ntp-signd)
+		$(use_with snmp ntpsnmpd)
+		$(use_with ssl crypto)
+		$(use_enable threads thread-support)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${ED%/}"/usr/bin/{ntpd,ntpdate} "${ED%/}"/usr/sbin/ || die "move to sbin"
+
+	dodoc INSTALL WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+	use ipv6 || sed -i '/^restrict .*::1/d' "${ED%/}"/etc/ntp.conf #524726
+	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED%/}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED%/}"/etc/init.d/ntpd || die
+
+	keepdir /var/lib/ntp
+	use prefix || fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${ED}" || die
+		rm usr/sbin/ntpd || die
+		rm -r var/lib || die
+		rm etc/{conf,init}.d/ntpd || die
+		rm usr/share/man/*/ntpd.8 || die
+	else
+		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
+		if use caps ; then
+			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
+				"${D%/}$(systemd_get_systemunitdir)"/ntpd.service \
+				|| die
+		fi
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "https://bugs.gentoo.org/41827"
+	fi
+}
diff --git a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
new file mode 100644
index 000000000000..40f035bdcd4d
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs flag-o-matic systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= )
+	>=dev-libs/libevent-2.0.9:=[threads?]
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	parse-clocks? ( net-misc/pps-tools )"
+BDEPEND="virtual/pkgconfig
+	acct-group/ntp
+	acct-user/ntp"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/ntp
+	acct-user/ntp
+	selinux? ( sec-policy/selinux-ntp )
+	vim-syntax? ( app-vim/ntp-syntax )
+	!net-misc/ntpsec
+	!openntpd? ( !net-misc/openntpd )
+"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
+	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
+	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
+	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
+)
+
+src_prepare() {
+	default
+	append-cppflags -D_GNU_SOURCE #264109
+	# Make sure every build uses the same install layout. #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
+	eautoreconf #622754
+	# Disable pointless checks.
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+}
+
+src_configure() {
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(usex zeroconf)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	# Increase the default memlimit from 32MiB to 128MiB.  #533232
+	local myeconfargs=(
+		--with-lineeditlibs=readline,edit,editline
+		--with-yielding-select
+		--disable-local-libevent
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--with-memlock=256
+		$(use_enable caps linuxcaps)
+		$(use_enable parse-clocks)
+		$(use_enable ipv6)
+		$(use_enable debug debugging)
+		$(use_with readline lineeditlibs readline)
+		$(use_enable samba ntp-signd)
+		$(use_with snmp ntpsnmpd)
+		$(use_with ssl crypto)
+		$(use_enable threads thread-support)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
+
+	dodoc INSTALL WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+	use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726
+	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
+
+	keepdir /var/lib/ntp
+	use prefix || fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${ED}" || die
+		rm usr/sbin/ntpd || die
+		rm -r var/lib || die
+		rm etc/{conf,init}.d/ntpd || die
+		rm usr/share/man/*/ntpd.8 || die
+	else
+		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
+		if use caps ; then
+			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
+				"${D%/}$(systemd_get_systemunitdir)"/ntpd.service \
+				|| die
+		fi
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "https://bugs.gentoo.org/41827"
+	fi
+}
diff --git a/net-misc/ntpclient/Manifest b/net-misc/ntpclient/Manifest
index f8542b979971..fbf9f3862a0a 100644
--- a/net-misc/ntpclient/Manifest
+++ b/net-misc/ntpclient/Manifest
@@ -1,3 +1,5 @@
+AUX ntpclient-2018.244-linux-headers-5.2.patch 298 BLAKE2B bf39e7f0300b925a468c423d2ed6d41bb646ff4b034e264784e64fc6aeb9497c40154e21b1a76930104d2f62b8cdfa3d17ba3abdbbfefe95a3329438a009938d SHA512 dc92198426f3a859c5ff2618f754c279aa24e147ec0b165baa85af213c42bf011e7f2f13e33116839fc5b8fdc7e79405f113cee253bc5adbfb2fa40cbc6c3596
 DIST ntpclient-2018_244.tar.xz 108056 BLAKE2B 52c554fe238521e8820111a19220a532406137b2e21c67558fd8252ea2e4d60a7827f4acd1a2868f7a7f6f09c7b25c4267f4cd28773088a12132fa580b02bb4c SHA512 4c1c7e1088365679182507e21386bcf670713aed4b636687fbbe226219fdcbc25e27e2369912a78c662058cba9b6b409fb90978315806a3ed5ea59c70133e4bc
+EBUILD ntpclient-2018.244-r1.ebuild 829 BLAKE2B faa6abce18a23ee3d6c36ab7298a7f3b166503fc074ef4f21e34952cfd43e7dfa4b335a8e79899b0f007bd67597b18f1ee88afb84a19cd707dd8d4a9ce6ebf7e SHA512 c21047913ca423b15dbde991e4fc1984c6855047a94ea44b3a5075c827121cd40fded836ece3bf1143034186640759ef0d68a753d33f5ef09ff10d822ec4f450
 EBUILD ntpclient-2018.244.ebuild 772 BLAKE2B 8e0972d3e6c71a5f9378c842eb5021b8c769922e2a4774157741fff1db1efcb7347fa7bab932ab8289e3ac045de95b0ddde7b8e0f5cce3b848716de8f510ec09 SHA512 586bd3a631505608342bb6e10094d178433c7dc35e1fe7876c641dd7544817449aa3e2b0a5565efd6bda5807e85aebe86b296a6c2899cc775c9ce1dad23bba76
 MISC metadata.xml 1258 BLAKE2B 60a9f7c14c15b49d19acb728c55a2a695311d50232e6bb143315a81400cdc990af3b5e1f3699c7b225fd76f6c0725a6e7cd62f0c49091ccd47222bf6e96f0ea1 SHA512 dc7d72c25206360f89ac0b8cd210a6b13346a6a183a92eb4a279059cc07b372d49d7a64808d4db5fb638781d9c16fc33aca21dd02ee2fc40894f2ce6195e4a64
diff --git a/net-misc/ntpclient/files/ntpclient-2018.244-linux-headers-5.2.patch b/net-misc/ntpclient/files/ntpclient-2018.244-linux-headers-5.2.patch
new file mode 100644
index 000000000000..df87cb6ceb22
--- /dev/null
+++ b/net-misc/ntpclient/files/ntpclient-2018.244-linux-headers-5.2.patch
@@ -0,0 +1,10 @@
+--- a/src/ntpclient.c	2018-08-27 20:38:12.000000000 +0200
++++ b/src/ntpclient.c	2019-08-19 20:11:59.000000000 +0200
+@@ -40,6 +40,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #ifdef PRECISION_SIOCGSTAMP
++#include <linux/sockios.h>
+ #include <sys/ioctl.h>
+ #endif
+ #ifdef USE_OBSOLETE_GETTIMEOFDAY
diff --git a/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild b/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild
new file mode 100644
index 000000000000..a76559041406
--- /dev/null
+++ b/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/./_}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A NTP (RFC-1305 and RFC-4330) client for unix-alike systems"
+HOMEPAGE="https://github.com/troglobit/ntpclient"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug embedded obsolete +syslog"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-linux-headers-5.2.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug replay)
+		$(use_enable embedded mini)
+		$(use_enable obsolete)
+		$(use_enable !obsolete siocgstamp)
+		$(use_enable syslog)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index e9afb06b95ed..c7c4d9db513a 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -11,5 +11,5 @@ DIST radvd-2.18.tar.gz 224183 BLAKE2B 4bacf9e17b78286a032ca5e6b6424aa8742d2e42b3
 EBUILD radvd-2.14.ebuild 1763 BLAKE2B ffe1ecff2d2fa70d7bfb9e8dd20fc7e15a017d8ce363ed3fe36780ee803676aa6ab3d650ba8d48bd8f5fd1f2207a86486916edb831d16c723511bc9d907d71ba SHA512 7f7e28f4d4b84e088fb60a50c26ce2a42eb3ddbcfce094f035d779a01aa235b27e24ed590646ab186f2faec854e6d13f5b2c32e0e580d76dfc6d08ba5e4f9550
 EBUILD radvd-2.17-r1.ebuild 1575 BLAKE2B 327a7eb2dc9a567145a14f556e4e4bb7d35e0184b83d7336d963f3754c96cfc4d1bd8db85b074c6ccf547cf4331b2260ace20a05ee085eea895fd5088cd16e2d SHA512 d4df95d439844c4be3dd7df39609c762acb27a8f3b6db1dba081c1961e03289cf0fdb795bf1d10f20053bac9e587995944a70efa5c9d6e53ab0e7cc88c1d86b8
 EBUILD radvd-2.17-r2.ebuild 1628 BLAKE2B caaaedd5d8d132165e080f1ad9888c629a2cc44f7a75a0213cbd1ffa32fd50725ded8366eeb5ecf08ce2d3d5a8873730dca7f7aff7931e3aa2ea67dbaab4ef9c SHA512 7b1ca29b1537e18c66dcd7e6bf764df08e350b9006e589de9e5388684d12ff7532e1d4b86c36d1981da8760b766916ae33a010a1052c52d51010a4e3dd3a6206
-EBUILD radvd-2.18.ebuild 1591 BLAKE2B 10e840d56f020d2ec5bf82fe714023c78be8aa55806fceb28f38f80b077d18199484d6756b5eeee5612b0f157a516033713413b4106b59f287b252f96211836a SHA512 bf6c3400d7f37b82f4751780977e92500ea0a3f2b9876ea97ee0e4dc698898a1b4fa2a9bd755a144a757565f870a6820b0506f4cfed280ac80461df5b66cb780
+EBUILD radvd-2.18.ebuild 1585 BLAKE2B 4b7ee406b6a20b3ad44e1dbc01d47db91af0d6ea623e1939d6030c46aeeeb651a7d1e40ea1dc9a611c907ac77c7db34b0ec130b8946078c2bc6ab59d3fb568e9 SHA512 b715af5af67cb90b30e43f79392db9942124e099151c2411a885809f586eff843428a0546e7783971e9c535aba7d3e6131986cee511fc72d4f3ab3874f2c549e
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/net-misc/radvd/radvd-2.18.ebuild b/net-misc/radvd/radvd-2.18.ebuild
index bf7bfecda9dd..e42974c512d2 100644
--- a/net-misc/radvd/radvd-2.18.ebuild
+++ b/net-misc/radvd/radvd-2.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm arm64 hppa ppc sparc x86 ~x86-fbsd"
 IUSE="kernel_FreeBSD selinux test"
 
 CDEPEND="dev-libs/libdaemon"
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 89f1e07f4781..786c005646ff 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -4,9 +4,11 @@ AUX rdesktop-1.8.3-xrandr_configure.patch 666 BLAKE2B 1d2b0b57069b4e8a4eeed2d3d8
 AUX rdesktop-1.8.4-libressl.patch 395 BLAKE2B d7ae01de041bcba333c6c72348c28665a8b1cab12ace786848515b6455f189121c8e87a393255ac25b116d5027d0756a35b1de60007f37426e82f32c9cdc2f5e SHA512 dfc8b4af9d22d587846f5d18d3063c4932b3add419b60a01ff391e3ac5f7b1d6b40614e54cdff61c66b2690a879550d7ffad38c71188d62e598a8f63d347dd98
 AUX rdesktop-1.8.4-use_standard_gssapi.patch 2696 BLAKE2B 01f5542dc294d51f6d2fccf7141fc02ed199042cc25000bbc90d3387d6cd0b93ebce1a3ebbcaa1a8817bdd660dedd09d115f979fabb561b3ccc9e56e126bbd60 SHA512 ae91f4e0eb1e2c3141aedef660eb89628b334155c8c0559805cc4ac75274fff94101daf665052b27fe5074ce7468ff854fab865e7efd377d08d525319c7aa150
 AUX rdesktop-1.8.5-use_standard_gssapi.patch 1909 BLAKE2B 5e9b2b4b7bde0c38ba3302c780cbaec1a2ecea437fa686ce812c0e898427cac5e742ed69b96df9cbbc38378b99eef00f8326c25ed389461f689aab92f14e2a79 SHA512 1f886a23fd416f421bbab449b72fc889f60908b0408436f4c26229386d3baa48256bb78b4c72575ab9877932c634575345511f8418c20bef3345e231ef5d78ca
+AUX rdesktop-1.8.6-sec_decrypt.patch 1730 BLAKE2B 22b7c254b4fee01b72e51d28622795b622cc3ed495920780240afb153f14630b048d5e9592ec6eda1df7dd25e633c70c04d15aa286033397dc504d61826e7574 SHA512 a3a863afe18aea932a29b66f584d4beb7ceb8446522dccfde4251141ea56949b567711f69a849793e88bc12d65b8f93b659032478eebc2d8b5e61620e86044a3
 DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7ad0feb144746c904146c410c6456391eb3f2b7b9a6a40c2fb34515bb7518888c2c9da8dfcaf17c5309ff21cad3 SHA512 9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae
 DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee
 EBUILD rdesktop-1.8.4-r1.ebuild 1736 BLAKE2B 2683cb189864e5895da4d8252a96e6729bdf6484fab692c5b7922e9cfa4d66bbb2885fbcac7d7863d787d5ddd253faa05124bc712450b7a2d7a7f274242a39ae SHA512 16d5d030d96a6a27ef134e6d5f6b6a94a90034042f2dc02c587788f312403c1aaf9c71f0baf1001910053c703b96e009975d5fdc328a4114c0c511821117570c
 EBUILD rdesktop-1.8.4-r2.ebuild 1783 BLAKE2B 94a097e988cb19622eb8165830136f78f7ef6081914d64660974be4b97b861b4a01cd631a45009910cf27a2498c2e6f74e9be48ba0ccf8d4ea67a84eaba0fd93 SHA512 66a9fdc1e5c46fcf09879f482cb1b918614ed012373b776b05622dbc520d60d626a487422cf7ab0161886355fe17b392a64074da357e67a25c780cf625783679
+EBUILD rdesktop-1.8.6-r1.ebuild 1835 BLAKE2B b37022e869b06fddc2ff27f7b587c4cd105a58483b580be04e2fbf5a8568a491708d9db257ae88c16f5fe1960b17eb61705c94faffd4b65c1908a0b326ea10c8 SHA512 c089900c79fd165f66bb9c7d6d3706e41256b7360296fa644d594a1e62190ea007b406c1c057412b45b3b12cb50c46f5e63f3f7cbf18616c28ae1cc02c6c3a48
 EBUILD rdesktop-1.8.6.ebuild 1789 BLAKE2B a5981d395a82c55f364135084abf114b9dd620a8e6de31dd00f367a7adf56aa1d704472004448828160fcc855689abf8ce09f5b3081afb7871060d1cf1703ddd SHA512 1e868524b008638be1a472f9030bd11c1f6c744e7f40483d8233b5fbb58b734f48030e11c0b99b26049d06215fcd005377eb6e5bb6d5892007d111d67e716f48
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch b/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch
new file mode 100644
index 000000000000..dbb0d0e9baf7
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch
@@ -0,0 +1,59 @@
+From 7841030279c5300d5073b2348b58f3f41e136f82 Mon Sep 17 00:00:00 2001
+From: Markus Beth <markus.beth@web.de>
+Date: Tue, 11 Jun 2019 22:57:31 +0200
+Subject: [PATCH] sec_decrypt() the correct amount of data
+
+Save the correct amount of data to sec_decrypt() because after
+inout_uint8p() the macro s_remaining(s) will find nothing left.
+---
+ secure.c | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/secure.c b/secure.c
+index 8f65b3aa..9b301e1f 100644
+--- a/secure.c
++++ b/secure.c
+@@ -813,6 +813,7 @@ sec_recv(uint8 * rdpver)
+ 	STREAM s;
+ 	struct stream packet;
+ 	size_t data_offset;
++	size_t remaining;
+ 	unsigned char *data;
+ 
+ 	while ((s = mcs_recv(&channel, rdpver)) != NULL)
+@@ -832,8 +833,9 @@ sec_recv(uint8 * rdpver)
+ 
+ 					data_offset = s_tell(s);
+ 
+-					inout_uint8p(s, data, s_remaining(s));
+-					sec_decrypt(data, s_remaining(s));
++					remaining = s_remaining(s);
++					inout_uint8p(s, data, remaining);
++					sec_decrypt(data, remaining);
+ 
+ 					s_seek(s, data_offset);
+ 				}
+@@ -860,8 +862,9 @@ sec_recv(uint8 * rdpver)
+ 
+ 					data_offset = s_tell(s);
+ 
+-					inout_uint8p(s, data, s_remaining(s));
+-					sec_decrypt(data, s_remaining(s));
++					remaining = s_remaining(s);
++					inout_uint8p(s, data, remaining);
++					sec_decrypt(data, remaining);
+ 				}
+ 
+ 				if (sec_flags & SEC_LICENCE_NEG)
+@@ -883,8 +886,9 @@ sec_recv(uint8 * rdpver)
+ 
+ 					data_offset = s_tell(s);
+ 
+-					inout_uint8p(s, data, s_remaining(s));
+-					sec_decrypt(data, s_remaining(s));
++					remaining = s_remaining(s);
++					inout_uint8p(s, data, remaining);
++					sec_decrypt(data, remaining);
+ 
+ 					/* Check for a redirect packet, starts with 00 04 */
+ 					if (data[0] == 0 && data[1] == 4)
diff --git a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
new file mode 100644
index 000000000000..023a23ca970d
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://www.rdesktop.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.6 )
+	kerberos? ( virtual/krb5 )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+BDEPEND=virtual/pkgconfig
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
+	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
+	"${FILESDIR}"/${PN}-1.8.4-libressl.patch
+	"${FILESDIR}"/${PN}-1.8.5-use_standard_gssapi.patch
+	"${FILESDIR}"/${P}-sec_decrypt.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 8c39afbd7d95..cbf89dd5578e 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,6 +1,7 @@
 DIST Remmina-v1.2.31.3.tar.gz 1248295 BLAKE2B da748ceea5aa50702b060075c8e5c4aefe11ca1ebbc301b2951df76208da5998746631ef4c57f5692678e948839a8869a183b777f7046d416a55e5ac5b0d76d1 SHA512 f95c4dcebd833b590fbf0b418854bae66541743bc77cda4b0b97e1e49b158927fa859907619fd532b0660fc30eee80be472e02c38a2afe33e477c4a903a99e28
 DIST Remmina-v1.3.3.tar.gz 1362239 BLAKE2B 8ae5b72293ffe2f627a46aa9354256d84d318819b0d5c236f4d5628764eaa9e3a3d07f3130ae04ee271cbc6ac207ccfaf495533b3fa59ee184d3da19c8738bc8 SHA512 72d0303f922619c3842880365bb68b967eb2134fef7187d0fd83aeec2b50fb499573849f853d509216608eefc02db7ced91cfc65f89154b51d0657e42bd0d637
 DIST Remmina-v1.3.4.tar.gz 1365473 BLAKE2B f71a9c0a0fa9eafa547abf192972da39f0cfe1ca3745a87783d6a9ec5bab0674d93df8815b589b25659990bb345748f8f464f401c7efb934e8e71b207b0dab67 SHA512 212ebc6e08c694861522a05feb51e4efa012ef3361debf079384c07e4354370f6cf7d2880ff442bbe03782421bac7f33343d8049207073d90925d1c894d30e7a
+DIST Remmina-v1.3.6.tar.gz 1538166 BLAKE2B f3fc60df2a1a31bd5aae7d8de2d85cd579fa4cc35a0351fbce80433e21583b67cfc81665307d02fbd4863f6a55695be81f9c4d07423d6c8122d84dd625b69c3b SHA512 ce16379aa163467d05018c900d0dc7c2a7d73c1c22dd06a9a3092efa7675fda505bfa31b20131b9a3a10c74788377db17961c0bc9e59c47b1c7a15bf347f3bab
 DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e
 DIST remmina-1.3.5_p20190731.tar.gz 1475593 BLAKE2B 0a2ddb9c45474e65de9a5be28155ad45f06779170dc360f415ed7ce96fd8595d730eb5f89f756075f89ba5e8e124962fdd07f85d4ac90157eb1e0fae99169fbf SHA512 8b25dae17e13812184481d0640f44a253f0b66260e5e41b06d4e65e9d4dd673d0a17fab2453c9a29ba4691d53ac6e49cb35160931c546a7c68bc483e11eab987
 EBUILD remmina-1.2.0_rc24.ebuild 2035 BLAKE2B 7490ba779c88bf0caf7f1de2398dec1484acf428f3f1ddd06b021965d3ef255927d9637e24c56a71a3737707ef6a2df0257dc1a486c60e665e99721aaa5c1092 SHA512 058740deb4f072b8677fcb5bcedf2c870dccf748c166594cdf24cc09574b1fd1b8fb0157b89c82e43bd3dabcc892e72f561ed4db816ea269c40b2da9b73ce3cf
@@ -8,4 +9,5 @@ EBUILD remmina-1.2.31.3.ebuild 2239 BLAKE2B 65e7720bc587f060e1014ea7c35832a4eb3a
 EBUILD remmina-1.3.3.ebuild 2247 BLAKE2B 99065b1b37f957f07f0a16487f2dd4c9dc3f7c60cf9657584b6c0f1ed06b41602f8763d3e88f02234a42ad424080818e35df676e61dde7a6042d4934526ce65b SHA512 f80bf47e941b0c505610f757647c3260c7182d230e2f8067c3ed3781bd37c1ebcdab52aba279e9a51bda2f6faec78a7c0eb4e75c8c85f6fadb965ab0ff9910b3
 EBUILD remmina-1.3.4.ebuild 2245 BLAKE2B 256d9073a83f692a70c9db223a0d201f30100a5ff80d411f1990a53afd4954e6b96b8be0e9ef47600c4d3f2039b9250daf33fb9dc5ff6d6d74d451d860e52d49 SHA512 d2181e7130c47df3b0849936bea4cef88444ecbd2873a45b5f2f46e3269d310dc27d958138ecf7f0ed3d6929a82a8a9b0a3999838eb9dfb1646b137a481772d1
 EBUILD remmina-1.3.5_p20190731.ebuild 2530 BLAKE2B 88ee3101aa2954144e0e633a3a0f3e099b66eeb5451546dae5605176f8a8ae08a6619f51aca1f149ba23f33358eb63d7d958d9da189172183982d9a56ef384ab SHA512 ec5265dcf6489f7d0edd6eb48f2733cfc2b70ff208fb63d39af0e9e5a6b1908f646cfc431f039a53ee4df114265c98b458dc066dcc80e87131f10e5e9735800b
+EBUILD remmina-1.3.6.ebuild 2474 BLAKE2B 88edb239965f778136ffeda7464f73f5bec967e79309876ff8575c2573d91f836cfed7310f42dabf8f653b91b91e6c967415e28bd8cd22327fa4d955318a1728 SHA512 72550d956488a237ce029b3bf1fc61091820dd669804c2920cb83adb1167f55a2e6db212024dbb02cb511cb9a27c2afabc623189aa58a9fc47985fd1df5a3d73
 MISC metadata.xml 1310 BLAKE2B bcf7c45908f6d13c26cbb7564e78d925c34000ed1ba20f793ada10d34e0f5f8b7ca380cb2688029eb4bac52b8afa3ed06cf5e635d8789d64f4cb420d23167cd5 SHA512 8bc4313586204ce7d2e386815599ef8694b8e39816612b0bdc7984676fd17f0a78f94f96677c1a51b5bd8876402c0cfef58a629c60c091ebfed14912e4ca9bff
diff --git a/net-misc/remmina/remmina-1.3.6.ebuild b/net-misc/remmina/remmina-1.3.6.ebuild
new file mode 100644
index 000000000000..ca7ab2e53a71
--- /dev/null
+++ b/net-misc/remmina/remmina-1.3.6.ebuild
@@ -0,0 +1,95 @@
+# 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 kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libsodium:=
+	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_rc4 )
+	gnome-keyring? ( app-crypt/libsecret )
+	kwallet? ( kde-frameworks/kwallet )
+	!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[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4 )
+	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_KF5WALLET=$(usex kwallet)
+		-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_WWW=$(usex webkit)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+	)
+	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/whois/Manifest b/net-misc/whois/Manifest
index 2342d5dc05d5..924292b8a27a 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,8 +1,10 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
+DIST whois-5.5.1.tar.gz 103269 BLAKE2B c737c922b7ef5a8619e1778521da66b3507e96ed82b2fdde8fe61df22d7c40bd4494fa26b3de83e51cbeaf4811d912cbeff8de230f7bce9c0dbeb021567c2908 SHA512 bc32208e32f632b515792767c6c72a94cb66e7f42aed3dc5dc6ede3f5f28860cc279c5e6b1579db45b0f7dc6d55ec910b81cf1dfadb91354fb3833b1272b93fc
 DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084
 DIST whois_5.5.0.tar.xz 85600 BLAKE2B 37c90324e1b7c773793e1eaff70816f90a6429ab91bafcff36dfa02ea09b4eb5e83b8cd36e1ca0bc5eb3a043f1973f4479037de38cf41a7b7ac646845697636f SHA512 a26730613b8019385e48c7432bcc9871984a7035e53e56188a876e70e255a1adf23d546dfeb1706879af5c4a8f2231976fe89d2571b3d2cb6d615a7834a2d876
 EBUILD whois-5.4.3.ebuild 1583 BLAKE2B a143d22a2f6f7e91122449ee15947fad9d28cb57a7995af6068f36b2d06ee82090f501a86b3d5185b3471edad319f064c0b8c485a6cd80f5beb186d3fae38b6b SHA512 b6b2d2d1e38cfc198859c969de3c870e6624b2746cfb197726cc554b8036035a6bdc09f453997c9b49b8d7ba9cc523cb8fe62d4ed3332c6e573566f62be8458e
 EBUILD whois-5.5.0.ebuild 1624 BLAKE2B 5b6225e917c0746a4db7390d3a2871eb5701604d80747a1fab174beecc82bb08c6776f958bb907ffbfc78077b9035214716f6c7ae8babedb7808c4d49a1d5f76 SHA512 81be69cb9c3a681e371aa44080aa1fc8c89d718a5474072d472c99204a0ac2c78362f1e4a5d242912196ebfe7338c148adf1ab27c79cbaf4e401946639be9b2f
-EBUILD whois-9999.ebuild 1708 BLAKE2B cfb0991a873e3afe2f0efbc710f4e8883eb3bc6b01b248c9dec9369b590d7a3270ba568b774d7ac02f12a877027896e4e58cc6c33897484e5638151e3651f9c3 SHA512 e7a58163d0c63db79c05f7628bb867727143a7dc715f65658ead427f5e9ad6e21399769a5df564e9d491bc19c8a6fc74b64e88890a7a24c018e37b2f1528f42c
+EBUILD whois-5.5.1.ebuild 1790 BLAKE2B 35e07b65f4ae1ad45a8210e65956ec75568c638b91527d87e9c9ca49ed96667414eaafa4f91c4a2dffa388e6f75bfa3621286b08fa07dfd8ee3f0fcfb4cfffd8 SHA512 386833c1f4dababde9f75d8885828c84c0fdbe2697bef7418eb8784444b1b9719ce52171e9890b6ad5b95ea2008af766093756232f4774885c61b729ae70ab88
+EBUILD whois-9999.ebuild 1790 BLAKE2B 35e07b65f4ae1ad45a8210e65956ec75568c638b91527d87e9c9ca49ed96667414eaafa4f91c4a2dffa388e6f75bfa3621286b08fa07dfd8ee3f0fcfb4cfffd8 SHA512 386833c1f4dababde9f75d8885828c84c0fdbe2697bef7418eb8784444b1b9719ce52171e9890b6ad5b95ea2008af766093756232f4774885c61b729ae70ab88
 MISC metadata.xml 335 BLAKE2B 105a64d3c2f98d051101083c04232489e806ea86a66e27bbd33ebaf00cd7ce3cde1e4cce051adf86c6b61201973f9aec9c10f5b49f11586208260b7d7b40b292 SHA512 81d7c5fe370408b1cd3470c7e6b46127a8de700db07da3b0c7416263d7f0f7558da56dd2256cb4120a2fd398765d8a295436a517fbd0e9313d6abe9f5358d51d
diff --git a/net-misc/whois/whois-5.5.1.ebuild b/net-misc/whois/whois-5.5.1.ebuild
new file mode 100644
index 000000000000..f4e5388d3fd4
--- /dev/null
+++ b/net-misc/whois/whois-5.5.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${P/-/_}"
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="https://github.com/rfc1036/whois"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
+else
+	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="iconv idn nls"
+RESTRICT="test" #59327
+
+RDEPEND="iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	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/whois/whois-9999.ebuild b/net-misc/whois/whois-9999.ebuild
index fbab7732283e..f4e5388d3fd4 100644
--- a/net-misc/whois/whois-9999.ebuild
+++ b/net-misc/whois/whois-9999.ebuild
@@ -12,7 +12,8 @@ if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
 else
-	SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index eda1125f620b..b2fe6fc5e186 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,6 @@
 DIST youtube-dl-2019.08.13.tar.gz 3177273 BLAKE2B 927b7bfe128738efbb5023817ccbcf635b6f7f3741f3f794bd8af377cd7c203ae4466818d03ee717f5196124c3a46c5bf9c1e1a92438a295a453786bd8ec3ee5 SHA512 0b5066f3ce93bc0ffa3f9c3aefe4154daae38e78449a8b5825ecf032252f8fafde893f1325809b3d9fecf28ca1c2539d941b90acf204c5bf68783e79fcd28c61
+DIST youtube-dl-2019.09.01.tar.gz 3179376 BLAKE2B 422e7f7f86d6486c45c2638b81a107c1fbf1aac4c05819b5d98185a403b9ed75be520e5711f42393ed4560b5828d10b6a55a633b55fa84d110f0c323bb159374 SHA512 327ef44180e2048045884d79de20541f81a4dbcee415c3fa15bcf333674f2b6e6c6663efa532b64e4f7078449af946479c98464ff9b54642e886f8c792f0b82f
 EBUILD youtube-dl-2019.08.13.ebuild 2124 BLAKE2B 608cd130bf27ff5253236fea27c22981fd804fa73e49ee6d0e67173d1840bd266349334f041307b4fe82c7a0708ae1a032d8f3d113dda7e0931197267f4b1246 SHA512 7ff84adcc79769d2acd9f9baa88e6f4222c65e8c892de335200e0f27d2aa15dc839241363bd2f58a6fe37e0af1345b072c5147a2205a927caeb9b9540dc17f72
+EBUILD youtube-dl-2019.09.01.ebuild 2130 BLAKE2B a6b9c8c31b6c7631f19183fccd1adf7b4c3ae5f5bc3108549803c83df78b66c2af9e04e1549a70b6f3bcca4cbc78a6e279f8aa063259c63e2fa464996ee69bcd SHA512 84f330ea104602ecd898906b7d33c98bd254715fc9feb5e71d35e34ac32466b56f178d22fe72dbea83f78ba45ffcd5fe73952c6d508dfc99bccec9a237daa155
 EBUILD youtube-dl-99999999.ebuild 1997 BLAKE2B 7b5974dc4df22cbb2fb7d87f60e73b2fddc7117331a6a81e8e9f0efef84788211d5fdefb1c96e9d4df0677fda2d264ef2846f36e60a890233fa79b06722b2abb SHA512 71019b536d5301dfbd5e9cb8085d1a001854f5bf204c0e76866c16a9553516a55081c17396bcc89c0128e44116b6e2dc451541b7e89d677822f3d541b316d5c5
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.09.01.ebuild b/net-misc/youtube-dl/youtube-dl-2019.09.01.ebuild
new file mode 100644
index 000000000000..89ac8f636eea
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2019.09.01.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+LICENSE="public-domain"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+RESTRICT="test"
+SLOT="0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
diff --git a/net-misc/zssh/Manifest b/net-misc/zssh/Manifest
index ff9981a137d7..52ed34a68628 100644
--- a/net-misc/zssh/Manifest
+++ b/net-misc/zssh/Manifest
@@ -1,4 +1,4 @@
 AUX zssh-1.5a-gentoo-include.diff 321 BLAKE2B 3daa9a3da6a58f90d176d0d68c054055f349530618179215ed5bfa49fc4262b0bc4d7d72608ca3b3050ec9ce870f23b8665c8f9e36fc18459044ab0ddb27e3e8 SHA512 e26c32832f537311f6804936a2ca88daf403ec5e8d263f3a84f29fadae68b0d35a514c97348867bbab584cbc845b1dfc5fb83fda7edad0714091e11165b965a2
 DIST zssh-1.5c.tgz 344964 BLAKE2B 35b41125ec7a49cae741666516b17e3f0b22b159d0fc2b490565e8eaef366bb4b418895ad028822647a4b946577b2ef9dc588e9dbfe657ce7c1c8300207ca603 SHA512 799ce3bbea5e94a800f61e6c38879746a579992396304861b7584b6bad967214b811b6bf9aecb36d9d60a15857377cb2fee80b495ad69778903fc45593efeebd
-EBUILD zssh-1.5c-r1.ebuild 891 BLAKE2B 60fced89c1ec43430b3fe86c46c68a61dec3fb7fd3ec14ecd8b6940446d9a49d6400b9a5fe3d0bc96406196bb99eb783aba209ec8747c30086efb1f2bd43a3a4 SHA512 43e9793f1f0de9aa998584babdb81140b9772237fb509ab333b192d3d813f5e91ded067571fa887ab6f38f9982f4d0f52369ec697ce95db871bc45ab5a88a728
+EBUILD zssh-1.5c-r1.ebuild 890 BLAKE2B bd4b6c34c2d4e5ccde331b8eef5a8146c5a6d0b17d80ab67001eed4e0c37f75ead5fee601ff61558c8303d53a3d8a169b965518d93cab749960569e5f0657661 SHA512 55af914818508272aaa017ba5bdbb5f425335818b58c571bce269581a8f8cf66440d869e9fcd6f6f83d962590e9d532a23c5cdccb5a01456c5091f3a30ef9b84
 MISC metadata.xml 429 BLAKE2B a25d3fb63a716299bd1df42df578ebb6aca4a82725acdff2530dce16383f6e464d6adbef6beec7bf687c1dfecce6daaa6897c385d02896552e321ef6240fd123 SHA512 dd4d5ff90a156df887316a4c6915cf23dd670ae81dfb8549fb7c2ec70bb2dd02cb1e039b9e262091673f25d4dcb728d5a1e5fff1322cba6dec358affb73d75ca
diff --git a/net-misc/zssh/zssh-1.5c-r1.ebuild b/net-misc/zssh/zssh-1.5c-r1.ebuild
index 31bceeeb6c2f..6ba687af4f6f 100644
--- a/net-misc/zssh/zssh-1.5c-r1.ebuild
+++ b/net-misc/zssh/zssh-1.5c-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
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="nls readline"
 
 DEPEND="readline? (
-		sys-libs/ncurses
+		sys-libs/ncurses:0
 		sys-libs/readline:0
 	)"
 RDEPEND="${DEPEND}
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index de6a931efd41..622df7c2a66b 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/snownews/Manifest b/net-news/snownews/Manifest
index 0222efcc7500..86b1e0183421 100644
--- a/net-news/snownews/Manifest
+++ b/net-news/snownews/Manifest
@@ -3,5 +3,5 @@ DIST snownews-1.5.13.tar.gz 199931 BLAKE2B 1e68fb46a0fdcea67281adb5334b4e90cb4b5
 DIST snownews-1.6.10.tar.gz 189715 BLAKE2B 0456faa526b21d06c5a7fe70f52cffbb3c7d977afcc4a5bc80179fd928b9c00d0674d44a64342a469a1cbccd3a1e0264ecadc1065f5a85965d9ef76fc3d3d896 SHA512 df90c3c55da8d11b2936075aab86f66f54f9a6ace0cbe0db54d0e6177ae71e28ab3c700d79b521d55859bb94ef7ecc89e3eb69f215eb9f7286d30cc4e2bec078
 EBUILD snownews-1.5.12-r1.ebuild 1285 BLAKE2B a93a596a32945f8cf3de47febccd8dea2ec7eeceea998d4afc4f0e82bd05badc68de3b8ebb945af981ac74789b880f4e36cec48ae5d506db5146f1ecbbf57058 SHA512 9c6a3c03b0e09760fb3f555a3a0accd83953513adac17acfe83c3563fb0a1ec66d0ce7b9d5d151f5131ecbde6e6b7369e886d3510d0449caccc11e915a5e9df1
 EBUILD snownews-1.5.13.ebuild 1079 BLAKE2B e9b582c967b5516c578be9bba37a99cb38ea7fba93e446433eb1e88b30afc2fbc020371ed3954f480580116c3a1203984da599b0b166e523c88caebbe76a9ea3 SHA512 3f4b6430286d5e34948d64215526d7dab14f00a2ebb3705a96a6342e6f125584a13644f4765fa7a02b158feb61d65b663c973e805c8d9816e49dda84afdd842e
-EBUILD snownews-1.6.10.ebuild 1090 BLAKE2B c6d33397f2c9617336eb5deff34e0b8b85b21a379ffe75d000f5c45c6702efb3776b63cc20ef2be9f04c462cc2e17bd396af93623649b608dbfa3835569d0bad SHA512 46451636a0204f498254c33219419d91464d04e4681f7aa5a033e3c274b5a051856dfc1fb1c03f2d931864d4d58ac04e1f7083684850f81e83d8aeb9e59a8f48
+EBUILD snownews-1.6.10.ebuild 1089 BLAKE2B 56f8b42295dc0831e4a51b5570107f4a3459750e66a6bd65b0c38d8f70bdd59afd3b5b688ac76890fc8d769e911085854af7cace736b6bd6581428a1275ae216 SHA512 3771fb3726dc7b8202988bf9bfe067b9f5e1ea35dcde1b5e8a64e96ef210906c8a9452fb6a8d5dab24612938b7dd09a57e935ba482e74861e5b0dbf20d92a9f4
 MISC metadata.xml 363 BLAKE2B ee398b88367b0004f371ce5afc8580a4a2e115485a1e3f882369f9046c49519891b6ea6fa50fb4a33079c0c63639efe1fed8ee5d286dcfbebe216a06d4e1b173 SHA512 a19c917a1e76ae139fba6a947b896783c6c700c350e56bd1ed32ccbfbc9e28bf8cbdd074ec29aadfc98eee1339926582bae8eea87e8b596c6368e298b7a44bc1
diff --git a/net-news/snownews/snownews-1.6.10.ebuild b/net-news/snownews/snownews-1.6.10.ebuild
index 9520f666b5a9..c718b5a16d64 100644
--- a/net-news/snownews/snownews-1.6.10.ebuild
+++ b/net-news/snownews/snownews-1.6.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kouya/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="unicode"
 
 COMMON_DEPEND="
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 55acaa0e6fa2..e19958fed70e 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index f38069a22366..46920e3482dd 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -7,4 +7,4 @@ AUX sabnzbd.initd 1395 BLAKE2B d8663fefa21e3d371c32ecebd1a3958704d39738ce4496c8f
 AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e3a6b53fbb8e0c7df2100ac13ee746e4b6cd45b384acfe6a9478df3a3d1f75bfc70dc41f51ac8f018916 SHA512 e5e6882c8520d26c21583fd2b9895248a777fa7519dc3588726dcccf689f81d604f2ef883681e54f6b212a51a8d8e690570ab60742d8b0232af73e98d61d6d34
 DIST SABnzbd-2.3.9-src.tar.gz 2738773 BLAKE2B fbb765732c0aab6a47a4d4827d21b1b029c6d40c1c6c335692964210dc4c389e94cd1cdca45bfb3fb8c2fa9adc84f33df0fe3d23a0e4f9143a095eec042a5cf0 SHA512 10a39db9ad7f6d441166da97194b7a281aacd1900f7687bca72c6c2b555114bc2bbdaaba51cb9fcec57aa1b782f20609a07528484ad911ffd9f9eabb54a324fa
 EBUILD sabnzbd-2.3.9.ebuild 4170 BLAKE2B 3d0e56d22c41045ea2a1e2c05f4cec3cb680d11f2a988c72222343fb4715a5cc8f984479290feacdc993bed7322aef0cf3aa6fdf0bbc37c5c9cb11f35f18b514 SHA512 5719356e34b7c08bdb6e81ef49481a297bf65630dde38cd080cecf138f52a062fbff5b2acb8578b54c36fa83a27e7062c7c85feb5ff28248f456803f07ed0fb4
-MISC metadata.xml 506 BLAKE2B ae36d43db0df97454127c4e195c5039b745ea2cbc5883bd9747f049ea63340e16090c671bbe7229895630b078a0d025729353dd457b3581f4a72672bf085ee2e SHA512 13c60fc2a77328dd1d8ae3d2036a84b72dc98a88093aad9a326fd904b41c795dcce84aec5dc528bc81daabba0341f10a7dda2d01788f70310bbaf801da831f53
+MISC metadata.xml 453 BLAKE2B b786f50f5de22bcda321e5b8e42086ba26f5bab4cf740da40f35e34169385381f0c24de382157d95ca2a4ae06507fa5e60c69f382a8a50a9e84e209ff2c035b9 SHA512 016997c5f57bb0da2f71d505f95fff1b1eb13ccd3c9ac1cf85613c19ef90800ce0aa4b26fcb22a274971fbf062a03581ce604960e142691d97080489d6684f93
diff --git a/net-nntp/sabnzbd/metadata.xml b/net-nntp/sabnzbd/metadata.xml
index 1bd96f540af7..e00cfb113795 100644
--- a/net-nntp/sabnzbd/metadata.xml
+++ b/net-nntp/sabnzbd/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jsbronder@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="7za">Add support for extracting 7za files</flag>
 		<flag name="rar">Add support for extracting rar files</flag>
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 0d8ddbd7523a..87b47225bec6 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index cc88e9e3c237..b7f87f7222a6 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -4,5 +4,7 @@ AUX ktorrent-5.1.1-missing-header.patch 609 BLAKE2B 9d27522bb0309775dd330447993b
 AUX ktorrent-5.1.1-scanfolder-memcorruption.patch 2244 BLAKE2B 53efe0320124f954adff60144981d740e5cdf45ed4712fa43f112bb6133fb24b4303e6f969d9a73598525dea4f6706c22e57d2e5c7378c69e494dd924360a307 SHA512 8d3868a6f75e2f53fa11762378a676736df09e14e6fbde04f0dcfb45eb56e8b739d17b3ea96af4be21edb22edad610982865b33508847f07ac2eba744f62ae5e
 AUX ktorrent-5.1.1-singlefile-torrent.patch 4654 BLAKE2B 8bef064068df9db5b82eb16e5ca04bb618378c94a5d218654aabb5e49dcc5db1a8b8fd92a4ed6e3e922f8a2eebdf23f4d460261fd396b7a7b8319cc102dce9f8 SHA512 e74632a86967440733ed0d3da9249a04dfe401d3966bc385581b5ba5e50e864b288fb0ca4e1ac17b754289fd8aeb70119f8c1981e9478afff434e17138beb151
 DIST ktorrent-5.1.1.tar.xz 2049392 BLAKE2B 09ad841e1b6d7f332b19e2a660130b1f2b998cd6839614800cde7c99c8ec7f119f2adbdc3d9e06c8525e2dde534d73dab521c7df1d01b2fd0eb6b11fbb868d8f SHA512 bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06
+DIST ktorrent-5.1.2.tar.xz 2048604 BLAKE2B 761df1e0aab5c4457311ae821a47ebf7b5b82b2839b4bf238491231caa213370cc649a1c0cafd332b42bbb84230f4a313e5172db722ff3c7af81c0daba450a98 SHA512 b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621
 EBUILD ktorrent-5.1.1-r1.ebuild 3192 BLAKE2B 5d0e9eb5e8a38f4f81c1928158f96973695f179fe7e423317e00959627ea2b66547d1ad043297898dd06ddb230735c1999180c3b43e7385d44689b4b74053ace SHA512 ee10006a6f529e1860f9499cf85df90e19ec8f2c39d03c714465e8a72104bfd82ee09b062f56307c9483f579d1df646549d2bd17df4a77f62e4b9ad3cec31899
+EBUILD ktorrent-5.1.2-r1.ebuild 3056 BLAKE2B 7bce29b1c9ef8cb43e30df074abe8539df270172f2a2828397c19c1c6422acaad0a2ddae59b9b3ab645e4dd57e9fc5827167df3d1599df8729ed2681264f12a1 SHA512 aa6d6ed75b45f3526807ddf39bba2859c42c2b3e35d0c5f436e0b5592c4e96d5db7421076f7dee765f41b519e09c32fa4da0f8d3ba34b4758272420339d3eb75
 MISC metadata.xml 1341 BLAKE2B 91b9b58b6df009f42960708b09f926b3bdf6849ebffd8d46114c28c7f2df2c0972a8b5460333ac6758f138729a7c689f6a61d4a58494bc44af2e364d1dbc3e05 SHA512 dfff24b08dba8615c983c1360fe10efcb60744651d5484a8bd1a7a731697b9dd4a10126b8d66276f96a8524352b1e4ba99b28b773d292362b3f7506a45da5a80
diff --git a/net-p2p/ktorrent/ktorrent-5.1.2-r1.ebuild b/net-p2p/ktorrent/ktorrent-5.1.2-r1.ebuild
new file mode 100644
index 000000000000..6de16c595265
--- /dev/null
+++ b/net-p2p/ktorrent/ktorrent-5.1.2-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="optional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
+[[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV/%.0}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
++mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf"
+
+BDEPEND="sys-devel/gettext"
+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 kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=net-libs/libktorrent-2.1.1:5
+	infowidget? ( dev-libs/geoip )
+	kross? (
+		$(add_frameworks_dep karchive)
+		$(add_frameworks_dep kitemviews)
+		$(add_frameworks_dep kross)
+	)
+	mediaplayer? (
+		media-libs/phonon[qt5(+)]
+		>=media-libs/taglib-1.5
+	)
+	rss? (
+		$(add_frameworks_dep kdewebkit)
+		$(add_frameworks_dep syndication)
+	)
+	search? (
+		$(add_frameworks_dep kdewebkit)
+		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+	)
+	shutdown? ( $(add_plasma_dep plasma-workspace) )
+	stats? ( $(add_frameworks_dep kplotting) )
+	upnp? ( $(add_frameworks_dep kcompletion) )
+	zeroconf? ( $(add_frameworks_dep kdnssd) )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	ipfilter? (
+		app-arch/bzip2
+		app-arch/unzip
+		$(add_frameworks_dep ktextwidgets)
+		$(add_kdeapps_dep kio-extras)
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.1.1-singlefile-torrent.patch" ) # git master
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler)
+		-DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder)
+		-DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget)
+		-DWITH_SYSTEM_GEOIP=$(usex infowidget)
+		-DENABLE_IPFILTER_PLUGIN=$(usex ipfilter)
+		-DENABLE_SCRIPTING_PLUGIN=$(usex kross)
+		-DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
+		-DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
+		-DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
+		$(cmake-utils_use_find_package rss KF5Syndication)
+		-DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
+		-DENABLE_SEARCH_PLUGIN=$(usex search)
+		-DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
+		-DENABLE_STATS_PLUGIN=$(usex stats)
+		-DENABLE_UPNP_PLUGIN=$(usex upnp)
+		-DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf)
+	)
+# add back when ported
+#		-DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface)
+	kde5_src_configure
+}
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 24080819139f..99b86244e43d 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -7,4 +7,4 @@ DIST mldonkey-3.1.6.tar.bz2 2886916 BLAKE2B f92c7195c67e3a9186cb9e691114dc2c1b96
 EBUILD mldonkey-3.1.5-r1.ebuild 4356 BLAKE2B 4fffa30f9bda190d601eb0e8e4cc7ab217575d99b8ebf91663ff1b642cf558942abf1e3ed00409428b48d77ab49eb6c491981bd032e4b6599d003437636ac660 SHA512 37c85135b6f346e65513e80733f84f8fd42345b5698322c70e9d5af08fa4e8a70d2ba44155b7bd3f1e9d8e090797d80ca1c104088e57563ad8490dca63320102
 EBUILD mldonkey-3.1.6-r1.ebuild 4463 BLAKE2B 0c67e039fdd1c9fd9571c5f46541baadcadc465460dba345823a2ebe52aa1d9baac529662311dcd8bf08406b1002a7622f65f5d2d1ee258b17b5842503cefc4e SHA512 898892a8884166e050d1205e78bee827f5fcad3a2adad3bbce03badcfb171c5102f0d158b6c26ef3b365e2ef70268b6107fbf8df7fd2e5b492738481aad2ae54
 EBUILD mldonkey-3.1.6.ebuild 4330 BLAKE2B da18da74f5300bc30921ee25049387eac3c9a5cf43518af9bae1fba6bea3cd47328077563beae8655a861eb916c345234c16b7a096a800705b023319effd3fa4 SHA512 3da6cdb7e908c71985c0ecb043fdd810614c60986c18375e6e24b39c26a96b27e37290b262427b82e90cbfc904be22d9c0650f4ac1d07da4c80dfc1eb8c3519e
-MISC metadata.xml 793 BLAKE2B 61001afe516cb624a0ab15b3e2326df537da1eef78c4aa30b983999591a862d71916db4e3198f02782ff2d485341f586a49bc0d20d52c75027950f0e50bb20f8 SHA512 faff7076c4e3f4c6e0972ee0f0ff1a667dc44dd5bce6444b76723c6c3c151633c2598bf2ba3fd12ba64232a7de6d56f46bb1da014b26db7b544cd4cabff2b4e8
+MISC metadata.xml 740 BLAKE2B 96af3507e4e0714fd01d369619b3f0e4e68a2a88e97189565a2e73ebaf9666f07063a91a33aae63f9ada4d155300a44a2361df6d5d499645f9b5df9646528b4d SHA512 ecca594b6b356c1d8c86217dc9792ed09fb842cbe015b78baae1d4c4885e86f81a9cfd694dcd8a3fbca420ede35c8ae228a15f64f1d5013d139542e06290d160
diff --git a/net-p2p/mldonkey/metadata.xml b/net-p2p/mldonkey/metadata.xml
index 6cefea4a1841..bdbe5ed30ca8 100644
--- a/net-p2p/mldonkey/metadata.xml
+++ b/net-p2p/mldonkey/metadata.xml
@@ -11,7 +11,6 @@
     <flag name="fasttrack">enable fasttrack support</flag>
     <flag name="gnutella">enable gnutella and gnutella2 support</flag>
     <flag name="guionly">enable client build only</flag>
-    <flag name="magic">enable use of libmagic</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">mldonkey</remote-id>
diff --git a/net-p2p/multibit/Manifest b/net-p2p/multibit/Manifest
deleted file mode 100644
index b94babb34d7d..000000000000
--- a/net-p2p/multibit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX auto-install.xml 862 BLAKE2B 99f928135329163bc4cdb975c9dd98cec14cdff49547c3e104ff816a0d1c30813d04aebb5acbc8f51082bfe62e27e2299a8c2a09d1e27cdbaf470007d40ec33b SHA512 54b1744d6efb74c9afad771fbab7f293ab102e7f5948ae9c47af60e5bb385419efcdce074795fb633a33d3f358d3814aa368ae7f600c55bcab791d30d6c0895f
-AUX multibit 81 BLAKE2B 30248bd0c42bc89ce54bac46e14ef090427b3807bea66b47a5dee087df09f977d7b168177c2cfe2621377cd4b7dbd6bf93426427a0cc36684f9d574e6d774826 SHA512 05a87d14a45478a677691b1318777f484892afe88f67ee0e0768273c78ef95b7ba10171db79fa27688944e253ddf572f8b2d7dc61f807a57366cbdb0cbf1b84c
-DIST multibit-0.5.18-linux.jar 7993916 BLAKE2B 17ab4ad38507d6aa30880c4f66b001d45f84d52726d80f6eb9af60741d18006219476e5dacf76bc27cf7a33704b2ff3123ad0267b04167e28040a96e73d42521 SHA512 788910b4a8b27f345df2cc58f8641a34d038091ffcddd69eca07c9452ed406113cf70479e6214ea52f39536d8eb21b34ecb7ab359868199223b2796b50b1b561
-EBUILD multibit-0.5.18.ebuild 838 BLAKE2B cfa6129f7990d8df2edc6d6e870d342b1e72b16d9104da141e4c256953a906d3a02c0d7c5c5f0878361e74f0f825bffe324f884b14f9ecda93f2921f0fff1f05 SHA512 17919a04057e0627305fa6f4db766fc3e62c6666b5f937617813514c5480425c4837c2124b660e7be5f955e4b7cfa619cc1922af342fe3ee27f33a2e6c7c11e2
-MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/net-p2p/multibit/files/auto-install.xml b/net-p2p/multibit/files/auto-install.xml
deleted file mode 100644
index 338377b9822b..000000000000
--- a/net-p2p/multibit/files/auto-install.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<AutomatedInstallation langpack="eng">
-<com.izforge.izpack.panels.HelloPanel id="UNKNOWN (com.izforge.izpack.panels.HelloPanel)"/>
-<com.izforge.izpack.panels.InfoPanel id="UNKNOWN (com.izforge.izpack.panels.InfoPanel)"/>
-<com.izforge.izpack.panels.LicencePanel id="UNKNOWN (com.izforge.izpack.panels.LicencePanel)"/>
-<com.izforge.izpack.panels.TargetPanel id="UNKNOWN (com.izforge.izpack.panels.TargetPanel)">
-<installpath>ED/opt/MultiBit</installpath>
-</com.izforge.izpack.panels.TargetPanel>
-<com.izforge.izpack.panels.ShortcutPanel id="UNKNOWN (com.izforge.izpack.panels.ShortcutPanel)"/>
-<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
-<com.izforge.izpack.panels.FinishPanel id="UNKNOWN (com.izforge.izpack.panels.FinishPanel)"/>
-</AutomatedInstallation>
diff --git a/net-p2p/multibit/files/multibit b/net-p2p/multibit/files/multibit
deleted file mode 100644
index c0335cac10b8..000000000000
--- a/net-p2p/multibit/files/multibit
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-/usr/bin/java -jar /opt/MultiBit/multibit-exe.jar >/dev/null 2>&1 &
diff --git a/net-p2p/multibit/metadata.xml b/net-p2p/multibit/metadata.xml
deleted file mode 100644
index d920e3ba3e56..000000000000
--- a/net-p2p/multibit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-p2p/multibit/multibit-0.5.18.ebuild b/net-p2p/multibit/multibit-0.5.18.ebuild
deleted file mode 100644
index 7e35c93ba03b..000000000000
--- a/net-p2p/multibit/multibit-0.5.18.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Secure, lightweight, international Bitcoin wallet written in Java"
-HOMEPAGE="https://multibit.org/"
-SRC_URI="https://multibit.org/releases/${P}/${P}-linux.jar"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=virtual/jre-1.6"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() { :; }
-
-src_prepare() {
-	cp "${FILESDIR}"/auto-install.xml "${WORKDIR}" || die
-	sed -i "s:ED:${ED}:" auto-install.xml || die
-}
-
-src_install() {
-	dobin "${FILESDIR}"/${PN}
-
-	make_desktop_entry "${PN}" "Multibit" "/opt/MultiBit/multibit48.png" "GNOME;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/multibit;\nTerminal=false"
-
-	java -jar "${DISTDIR}"/${P}-linux.jar auto-install.xml >/dev/null 2>&1
-}
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 58308d6d6253..3bea35c3ea12 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,8 +1,9 @@
+AUX 60-transmission.conf 56 BLAKE2B 4c2aadb19b4c85ce8ecec4f190f83da81a8b9e27f02cb20b785251122b5a495d1b3b7425378c4e17d3cda3c1c5b92c4297140dcfc3d4973dfbd1ac8e713245ca SHA512 9f79cfb00fa92e6d9054aad615f0ca7a1ad9d57b750e40b8942b7987a4a93d97b1f1ba9774a64f2b16e7c49fe7ae5fb4978d7aca3c481431ff333d508ed36410
 AUX libsystemd.patch 630 BLAKE2B 1e7d9ac41ebc8971a86f051aaa5e7c4899004e4ae29b62d8b2963a16047cdd9ce7830156510d8e2f00967dcfb538991138f3b5c31bb2c841e5ddabfdb397ab47 SHA512 5babefd3ab0216dd1cf0b08b1ad10c79d034782ce744c9a4df402036ed1529655b9e05c641e876e9629a8366363ad0bf2d5e7581a621f2b0749ff02c6ed742eb
 AUX transmission-daemon.confd.4 735 BLAKE2B bc4c06dcf4a12282d36d446537ae8d3a461a9bb84f93b54f7d13be1c430209647bae89054b60f5d8dd434049140f74c1cb4ad04064d03b37ad88a851c28c07fa SHA512 47e78c85857eefb9be6c25d1e789cfb2a276d5816ba911ba1511e764469b2d9998edafe44247aff784113ca28926748bc5fb2b879280b780fd69ffb1e4e40736
 AUX transmission-daemon.initd.10 1707 BLAKE2B 57857fa0b628f0c49ebaf13544b366bf9db39c70f31556a21262556ad89657a7f13c84e19f882839e4bc10f2b8afef96aa51f833478e38f215499244ca8b388b SHA512 30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4
 AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3af77afead303197c49970873fa604d6b375e71122de8d3645f9fcc8abed4f696ac257bd59ba87ebdc5cdd5839d32c0a7b SHA512 3dc02be596296fc1efbf1bc690be3953709af00c230f55db4d067ff592d87e1a465faa4067bc15d65a8a27fed2cf07d108abb2ed45fc76b47b0642ce2e182946
 DIST transmission-2.94.tar.xz 3365952 BLAKE2B d0215a2c595dd3ebb2ed5c94cc3d380c78f62b98388557620534b88b9e2304bb6ac91960395541267f82d70800c4860d0e58125bca33dd158da992d19b4c0def SHA512 ee411743940f2897aa0bbc351ce79f11d860075d2e9e399d60301eae8cfc453e20426ef553fc62ee43019a07c052d512f5d7972cc4411fb57b1312c2c1558da7
-EBUILD transmission-2.94.ebuild 4106 BLAKE2B 790dfe75e484a02013f96e3b5eed1a4f4ad9d9c0ffbabf2edd090ce220f6fe062c8c2cdab72fba6057fee1e87ae110884a69e6a95ce31a3a50a3d807e78923d1 SHA512 072bf1a9af81a975214db9b9f9b2d337bb9e935dd2e2ff269919788c0493cff2ec45c808e31a465ae7e376fead92f37ae314c546ed9607549b987cf01be23bce
-EBUILD transmission-9999.ebuild 3505 BLAKE2B ae448cc6ed0c52f2cd16d72d9106a923532052c41bbff74e875297f4206f3b1c9d6fe65d59d420ac8187197209ae7d2617f2740e26f353c482e62595266099e1 SHA512 5b0db4a554a38706c1b6d7914e11bd293a23708c08dc8799ac2ad0f7c2a0c1aab4012adb30fe64caf422e69e9c6875abbea33d017b888393c7164e30b2c0e5e8
+EBUILD transmission-2.94-r1.ebuild 3777 BLAKE2B a6af0614b29f30277e398fafad3860940363fed39dfe75cc12f3e0acb1cdc9c4529917e08df8c3961b2f0236b0263b4d06d089d8d68648f0aa0ed6f3840fc459 SHA512 cf0ae34c109f31247c8fc6d1850c36e46f8d54e84a3dabf2c91dc7a52235765169c6b9e880b4e58cd4c4ff565c458509fee7238019843b9cdd28857a8d43e15e
+EBUILD transmission-9999.ebuild 3293 BLAKE2B 5ff20121f1ce486e9d4a2e035ee56c113be45399fb52be6071f7d916423ca5540fa1efc98f5363fcdcecc2beae0aa3b97a8816c6ef57da2fe9afad12bc14452e SHA512 f0b04b023c37a52af09d928cb5d71515396e8f941794edf3fef0a0489a5cfe40d68d07b235b66068737fdf53e69beae16b76d49a0d0079ed27b41c2b004a453e
 MISC metadata.xml 602 BLAKE2B 05300c81bd2c4df76aaaf8381a788016777e259075aa6a3bf9da239b4832dac1281f718f0fd79ece7d5c238440e07d1aabe15b7da40f34674ac30bbd356d0c6b SHA512 0047a936eda032a4521707ea50dcde06dce3837993e70d43a5b033183ba58633ae46e2d2e56de98a56f3480b30e596c7fbae82fd1e2ee9cbebc7983d9551617d
diff --git a/net-p2p/transmission/files/60-transmission.conf b/net-p2p/transmission/files/60-transmission.conf
new file mode 100644
index 000000000000..bdf0de2064e1
--- /dev/null
+++ b/net-p2p/transmission/files/60-transmission.conf
@@ -0,0 +1,2 @@
+net.core.rmem_max = 4194304
+net.core.wmem_max = 1048576
diff --git a/net-p2p/transmission/transmission-2.94-r1.ebuild b/net-p2p/transmission/transmission-2.94-r1.ebuild
new file mode 100644
index 000000000000..c2e85f5d064b
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.94-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic gnome2-utils qmake-utils systemd xdg-utils
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client"
+HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.tar.xz"
+
+# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
+# transmission in licenses/ is for mentioning OpenSSL linking exception
+# MIT is in several libtransmission/ headers
+LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
+SLOT=0
+IUSE="ayatana gtk libressl lightweight systemd qt5 xfs"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
+
+ACCT_DEPEND="
+	acct-group/transmission
+	acct-user/transmission
+"
+COMMON_DEPEND=">=dev-libs/libevent-2.0.10:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libnatpmp
+	>=net-libs/miniupnpc-1.7:=
+	>=net-misc/curl-7.16.3[ssl]
+	sys-libs/zlib:=
+	gtk? (
+		>=dev-libs/dbus-glib-0.100
+		>=dev-libs/glib-2.32:2
+		>=x11-libs/gtk+-3.4:3
+		ayatana? ( >=dev-libs/libappindicator-0.4.90:3 )
+		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		)
+	systemd? ( >=sys-apps/systemd-209:= )"
+DEPEND="${COMMON_DEPEND}
+	${ACCT_DEPEND}
+	>=dev-libs/glib-2.32
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/os-headers
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+	xfs? ( sys-fs/xfsprogs )"
+RDEPEND="${COMMON_DEPEND}
+	${ACCT_DEPEND}"
+
+REQUIRED_USE="ayatana? ( gtk )"
+
+DOCS=( AUTHORS NEWS qt/README.txt )
+
+PATCHES=(
+	"${FILESDIR}"/libsystemd.patch
+)
+
+src_prepare() {
+	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
+
+	# Trick to avoid automagic dependency
+	if ! use ayatana ; then
+		sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die
+	fi
+
+	# http://trac.transmissionbt.com/ticket/4324
+	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die
+
+	# Prevent m4_copy error when running aclocal
+	# m4_copy: won't overwrite defined macro: glib_DEFUN
+	rm m4/glib-gettext.m4 || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_header_xfs_xfs_h=$(usex xfs)
+
+	# https://bugs.gentoo.org/577528
+	append-lfs-flags
+
+	econf \
+		--enable-external-natpmp \
+		$(use_enable lightweight) \
+		$(use_with systemd systemd-daemon) \
+		$(use_with gtk)
+
+	if use qt5; then
+		pushd qt >/dev/null || die
+		eqmake5 qtr.pro
+		popd >/dev/null || die
+	fi
+}
+
+src_compile() {
+	emake
+
+	if use qt5; then
+		emake -C qt
+		$(qt5_get_bindir)/lrelease qt/translations/*.ts || die
+	fi
+}
+
+src_install() {
+	default
+
+	rm "${ED%/}"/usr/share/transmission/web/LICENSE || die
+
+	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
+	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
+	systemd_dounit daemon/transmission-daemon.service
+	systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
+
+	insinto /usr/lib/sysctl.d
+	doins "${FILESDIR}"/60-transmission.conf
+
+	if use qt5; then
+		pushd qt >/dev/null || die
+		emake INSTALL_ROOT="${ED%/}"/usr install
+
+		domenu transmission-qt.desktop
+
+		local res
+		for res in 16 22 24 32 48 64 72 96 128 192 256; do
+			doicon -s ${res} icons/hicolor/${res}x${res}/transmission-qt.png
+		done
+		doicon -s scalable icons/hicolor/scalable/transmission-qt.svg
+
+		insinto /usr/share/qt5/translations
+		doins translations/*.qm
+		popd >/dev/null || die
+	fi
+
+	diropts -o transmission -g transmission
+	keepdir /var/lib/transmission
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-p2p/transmission/transmission-2.94.ebuild b/net-p2p/transmission/transmission-2.94.ebuild
deleted file mode 100644
index 745abf9221fa..000000000000
--- a/net-p2p/transmission/transmission-2.94.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic gnome2-utils qmake-utils systemd xdg-utils
-
-DESCRIPTION="A Fast, Easy and Free BitTorrent client"
-HOMEPAGE="http://www.transmissionbt.com/"
-SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.tar.xz"
-
-# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
-# transmission in licenses/ is for mentioning OpenSSL linking exception
-# MIT is in several libtransmission/ headers
-LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
-SLOT=0
-IUSE="ayatana gtk libressl lightweight systemd qt5 xfs"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
-
-COMMON_DEPEND=">=dev-libs/libevent-2.0.10:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libnatpmp
-	>=net-libs/miniupnpc-1.7:=
-	>=net-misc/curl-7.16.3[ssl]
-	sys-libs/zlib:=
-	gtk? (
-		>=dev-libs/dbus-glib-0.100
-		>=dev-libs/glib-2.32:2
-		>=x11-libs/gtk+-3.4:3
-		ayatana? ( >=dev-libs/libappindicator-0.4.90:3 )
-		)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		)
-	systemd? ( >=sys-apps/systemd-209:= )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/glib-2.32
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/os-headers
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-	xfs? ( sys-fs/xfsprogs )"
-RDEPEND="${COMMON_DEPEND}
-	acct-user/transmission"
-
-REQUIRED_USE="ayatana? ( gtk )"
-
-DOCS=( AUTHORS NEWS qt/README.txt )
-
-PATCHES=(
-	"${FILESDIR}"/libsystemd.patch
-)
-
-src_prepare() {
-	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
-
-	# Trick to avoid automagic dependency
-	if ! use ayatana ; then
-		sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die
-	fi
-
-	# http://trac.transmissionbt.com/ticket/4324
-	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die
-
-	# Prevent m4_copy error when running aclocal
-	# m4_copy: won't overwrite defined macro: glib_DEFUN
-	rm m4/glib-gettext.m4 || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_header_xfs_xfs_h=$(usex xfs)
-
-	# https://bugs.gentoo.org/577528
-	append-lfs-flags
-
-	econf \
-		--enable-external-natpmp \
-		$(use_enable lightweight) \
-		$(use_with systemd systemd-daemon) \
-		$(use_with gtk)
-
-	if use qt5; then
-		pushd qt >/dev/null || die
-		eqmake5 qtr.pro
-		popd >/dev/null || die
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use qt5; then
-		emake -C qt
-		$(qt5_get_bindir)/lrelease qt/translations/*.ts || die
-	fi
-}
-
-src_install() {
-	default
-
-	rm "${ED%/}"/usr/share/transmission/web/LICENSE || die
-
-	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
-	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
-	systemd_dounit daemon/transmission-daemon.service
-	systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
-
-	if use qt5; then
-		pushd qt >/dev/null || die
-		emake INSTALL_ROOT="${ED%/}"/usr install
-
-		domenu transmission-qt.desktop
-
-		local res
-		for res in 16 22 24 32 48 64 72 96 128 192 256; do
-			doicon -s ${res} icons/hicolor/${res}x${res}/transmission-qt.png
-		done
-		doicon -s scalable icons/hicolor/scalable/transmission-qt.svg
-
-		insinto /usr/share/qt5/translations
-		doins translations/*.qm
-		popd >/dev/null || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-
-	elog "If you use transmission-daemon, please, set 'rpc-username' and"
-	elog "'rpc-password' (in plain text, transmission-daemon will hash it on"
-	elog "start) in settings.json file located at /var/lib/transmission/config or"
-	elog "any other appropriate config directory."
-	elog
-	elog "Since µTP is enabled by default, transmission needs large kernel buffers for"
-	elog "the UDP socket. You can append following lines into /etc/sysctl.conf:"
-	elog " net.core.rmem_max = 4194304"
-	elog " net.core.wmem_max = 1048576"
-	elog "and run sysctl -p"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index 312540191f40..dc8e81488004 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils readme.gentoo-r1 systemd xdg-utils
+inherit cmake-utils systemd xdg-utils
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -24,6 +24,22 @@ SLOT="0"
 IUSE="ayatana gtk libressl lightweight nls mbedtls qt5 systemd test"
 RESTRICT="!test? ( test )"
 
+ACCT_DEPEND="
+	acct-group/transmission
+	acct-user/transmission
+"
+BDEPEND="${ACCT_DEPEND}
+	virtual/pkgconfig
+	nls? (
+		gtk? (
+			dev-util/intltool
+			sys-devel/gettext
+		)
+		qt5? (
+			dev-qt/linguist-tools:5
+		)
+	)
+"
 COMMON_DEPEND="
 	dev-libs/libb64:0=
 	>=dev-libs/libevent-2.0.10:=
@@ -36,6 +52,7 @@ COMMON_DEPEND="
 	>=net-libs/miniupnpc-1.7:=
 	>=net-misc/curl-7.16.3[ssl]
 	sys-libs/zlib:=
+	nls? ( virtual/libintl )
 	gtk? (
 		>=dev-libs/dbus-glib-0.100
 		>=dev-libs/glib-2.32:2
@@ -52,7 +69,6 @@ COMMON_DEPEND="
 	systemd? ( >=sys-apps/systemd-209:= )
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	nls? (
 		virtual/libintl
 		gtk? (
@@ -65,7 +81,7 @@ DEPEND="${COMMON_DEPEND}
 	)
 "
 RDEPEND="${COMMON_DEPEND}
-	acct-user/transmission
+	${ACCT_DEPEND}
 "
 
 src_unpack() {
@@ -102,21 +118,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="\
-If you use transmission-daemon, please, set 'rpc-username' and
-'rpc-password' (in plain text, transmission-daemon will hash it on
-start) in settings.json file located at /var/lib/transmission/config or
-any other appropriate config directory.
-
-Since µTP is enabled by default, transmission needs large kernel buffers for
-the UDP socket. You can append following lines into /etc/sysctl.conf:
-
-net.core.rmem_max = 4194304
-net.core.wmem_max = 1048576
-
-and run sysctl -p"
-
 src_install() {
 	cmake-utils_src_install
 
@@ -125,20 +126,23 @@ src_install() {
 	systemd_dounit daemon/transmission-daemon.service
 	systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
 
-	readme.gentoo_create_doc
-}
+	insinto /usr/lib/sysctl.d
+	doins "${FILESDIR}"/60-transmission.conf
 
-pkg_preinst() {
-	gnome2_icon_savelist
+	diropts -o transmission -g transmission
+	keepdir /var/lib/transmission
 }
 
 pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	if use gtk || use qt5; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
+	if use gtk || use qt5; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
 }
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index ba13de4155be..7c2bd039a1dd 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index 2ebccbfa369e..a56a7ec092a8 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -1,8 +1,11 @@
 AUX cnijfilter2-5.20-gentoo.patch 1535 BLAKE2B c3861e039d0ecce6f1940c1f998ce23ab2834f18a7394c82070e83d7de4d7860869775d5e017a8e26999f3798090bcffab699916263953afbc52a24f39b3bb23 SHA512 29458eabdfe3f7c66b47ddbd490c741b78a3cb9b375be1769e65d2240e732fc184005de226eed8985f77aa153c00c39463d9fce41ba79a439874ebb031acb70d
+AUX cnijfilter2-5.70-gentoo.patch 1786 BLAKE2B 96c0f8b919dbc896c7b749ef52cc1c6f331921fe55b196782b613389372c5ba382b8a7f1e5f6e326bcfae4652cf4d1c40fcd052f435c721301cf4cdf7433faaa SHA512 9cc2b0a069a8ec045bdedb41e9f6246f6245ae5fb4567a23f03516bbc0d6661d54faa291a976d8a89ee216df31db4515ee04123f9ba7e1cfd629f3191c6ff657
 DIST cnijfilter2-source-5.20-1.tar.gz 466507 BLAKE2B 1ca96153350a157f56dfed691a04dcbe1e3ab5462b59c0cd919316a7c54a36bbeb34cf4205132f0aa3e5a23f89eb260c35c1a3ee14ea85bc36b9e3b67cd7e3f7 SHA512 60be49d34adf9a4d2cd8337cccb36eb8c078e9712bf8043c3552f1d83c3da307badfe34fc3683c99e3234da30f4ba82e0c4a0b48ea5f78f0d66db1408bd7d495
 DIST cnijfilter2-source-5.40-1.tar.gz 817298 BLAKE2B 1088eb19c70ed9133c38b8a6da9fbc26c42d6f077fda01678fb4485c2db21a17567fab8ab5c9565ece7ea13e5fac3f7c5842e984116d6c595e7a1f19092d3461 SHA512 bb4ce18864037fae9735fcb1b2c3198fe39f8abe0caa754e457e3cb0d03767742d82ff4fddf81451215395b23eea8207a880e238558e0ea2ac5c359186ecd859
 DIST cnijfilter2-source-5.50-1.tar.gz 1129057 BLAKE2B 20208b1fa679a4303b5f47ae733224fa1346277d539e62688ecbfaa6a1a9f7b01cb4742c299ec188d59787e4175896dfe8d812f8aa936977f8168d823216b239 SHA512 9a99d0230fb9498d2b17648e58009efa5812fe5c076c11fdc6c2afeec453e355c1e3406053330e965e46be23651df6b887d0edb20eebd564554a7bf31b155186
+DIST cnijfilter2-source-5.70-1.tar.gz 1366033 BLAKE2B 0d03c4c4f4bc00ea91cc46db6554252997242dcc98ee65fe856528848843cdd6d2195e3839d8dad71f1fc722cfbb2e65730020665d9095d0a93900840659477d SHA512 3d9afe4ca6b042015898f4fc08d991a4af2c55010c9d98807a12dade01d2655f74b7e4896abeb933c93faeca954bcfdadfd6e359ee8efe5952623fc635500729
 EBUILD cnijfilter2-5.20.ebuild 1403 BLAKE2B 1daedead655b9573ea422a8374bf04449baed0d9f845fb64852f0a3515694d6a24cb799f83d98074553808b6e3cadeb273a4b54c1a743d079658c5f093f1cadf SHA512 e316d08d3e04b5bdc2b3281c4e2d983b8bb4d4a46b7b32b088fa65c370f613ec3a4a6d48252f620125974212b4c235d42316ef73c7748fed940ab44442d09027
 EBUILD cnijfilter2-5.40.ebuild 1515 BLAKE2B 5c7452ce92474cc403a1051b622e18ff257759bfd80b45c0e928ecf2a68e69a78eefa31ec60f29e1c4c9aa218dbab5141ccb1251a9fd46f171332dbf069975ae SHA512 0e75f8248fe1d14e2bede4e172e662492c7e2483c2dbebe66d1a8ba719df3b3c6da31f83dd2be7c71db98367a62f969a6a0ad1d7cf8ea68eb17bfdc4f6097171
 EBUILD cnijfilter2-5.50.ebuild 1510 BLAKE2B b4d914fa287c315528c6598821ff75a8b7f9b14d5fc605dba5b35794f19fa9573733ad3f1575fbc908c988a6547f27d4752161b3af93f5146f9d39cb9cc53052 SHA512 16189d363f5464c492b788dfc75c2f3b45f91489d3f93983d4c449f8e7df99263ba3ae7c3514ad71869c1f1de6a8373cbd10797ac1d0e08aa32f2484100e8b63
+EBUILD cnijfilter2-5.70.ebuild 1520 BLAKE2B 526de368e3ada4e675ab6bd8b3cfc84fa6314a233be92ca072de738945011a1a76f017c0da1d6516d8879d2abfcd9636f4999860984298d5f3135b81b242c978 SHA512 44f3775f11b07387448703a7102a7d498ece24f5750e141a6838b994e4a9050a19b990514fe9a17a138683349372e40cfb6f178f3ded7cc6e6d6266d6f1e0d45
 MISC metadata.xml 339 BLAKE2B aa954d512a8d86489f00bcaf9f59d4427e95e095b42ef7946456db0c9037fcda08a9940e22df160871fcf1d19d8c06852b707934a904fa680ed06726fcd5c735 SHA512 a8976b24c12b154f9cdcd8a6f31d10f35a039a51141eda7aaea0fa6e9f7f9d405745f4910c6f56d44fac6ecde6bd927dc8a1e10f995279816f1bc551667dedd5
diff --git a/net-print/cnijfilter2/cnijfilter2-5.70.ebuild b/net-print/cnijfilter2/cnijfilter2-5.70.ebuild
new file mode 100644
index 000000000000..3b5058bc8153
--- /dev/null
+++ b/net-print/cnijfilter2/cnijfilter2-5.70.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}-source-${PV}-1"
+
+DESCRIPTION="IJ Printer Driver"
+HOMEPAGE="https://www.canon.it/"
+SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009930/01/${MY_P}.tar.gz"
+
+LICENSE="Canon-IJ"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/libusb:1
+	dev-libs/libxml2
+	net-print/cups"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+	DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
+	LIBDIR=com/libs_bin$(usex amd64 64 32)
+	for d in ${DIRS}; do
+		mv "${d}"/configure.{in,ac} || die
+	done
+	echo "AC_INIT([${PN}], [${PV}])" >> configure.ac
+	echo "AM_INIT_AUTOMAKE" >> configure.ac
+	echo "AC_CONFIG_SUBDIRS([${DIRS}])" >> configure.ac
+	echo "AC_CONFIG_FILES([Makefile])" >> configure.ac
+	echo "AC_OUTPUT()" >> configure.ac
+	echo "SUBDIRS= ${DIRS}" >> Makefile.am
+	sed -i \
+		-e "/^CFLAGS/d" \
+		*/configure.ac || die
+	eautoreconf
+	cd ${LIBDIR}
+	rm libcn*.so || die
+	ln -sf libcnbpcnclapicom2.so.5.0.0 libcnbpcnclapicom2.so || die
+	ln -sf libcnbpnet20.so.1.0.0 libcnbpnet20.so || die
+	ln -sf libcnbpnet30.so.1.0.0 libcnbpnet30.so || die
+	ln -sf libcnnet2.so.1.2.4 libcnnet2.so || die
+
+	cd -
+}
+
+src_configure() {
+	LDFLAGS="-L"${S}"/${LIBDIR}" econf --enable-progpath="${EPREFIX}/usr/bin"
+}
+
+src_install() {
+	default
+	insinto /usr/share/ppd/cupsfilters
+	doins ppd/*ppd
+	dolib.so ${LIBDIR}/*
+}
diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.70-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.70-gentoo.patch
new file mode 100644
index 000000000000..fcb2d62ad7b5
--- /dev/null
+++ b/net-print/cnijfilter2/files/cnijfilter2-5.70-gentoo.patch
@@ -0,0 +1,58 @@
+--- a/cmdtocanonij2/filter/Makefile.am	2018-01-14 18:14:20.645473030 +0100
++++ b/cmdtocanonij2/filter/Makefile.am	2018-01-14 18:14:36.078219959 +0100
+@@ -1,4 +1,4 @@
+-filterdir=$(libdir)/cups/filter
++filterdir=$(libexecdir)/cups/filter
+ 
+ filter_PROGRAMS= cmdtocanonij2
+ 
+--- a/cmdtocanonij3/filter/Makefile.am	2018-01-14 18:14:20.645473030 +0100
++++ b/cmdtocanonij3/filter/Makefile.am	2018-01-14 18:14:36.078219959 +0100
+@@ -1,4 +1,4 @@
+-filterdir=$(libdir)/cups/filter
++filterdir=$(libexecdir)/cups/filter
+ 
+ filter_PROGRAMS= cmdtocanonij3
+
+--- a/cnijbe2/src/Makefile.am	2018-01-14 19:25:48.823470121 +0100
++++ b/cnijbe2/src/Makefile.am	2018-01-14 19:25:59.316275741 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-backend_bindir = /usr/lib/cups/backend
++backend_bindir = $(libexecdir)/cups/backend
+ backend_bin_PROGRAMS = cnijbe2
+ transform = 
+ 
+--- a/rastertocanonij/src/Makefile.am	2018-01-14 21:31:33.053307218 +0100
++++ b/rastertocanonij/src/Makefile.am	2018-01-14 21:31:41.106166479 +0100
+@@ -1,4 +1,4 @@
+-filterdir=$(libdir)/cups/filter
++filterdir=$(libexecdir)/cups/filter
+ 
+ filter_PROGRAMS= rastertocanonij
+ 
+--- a/tocanonij/src/Makefile.am	2018-01-15 22:38:14.236460663 +0100
++++ b/tocanonij/src/Makefile.am	2018-01-15 22:38:39.184018933 +0100
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+ 	-I$(top_srcdir)/include/cncl
+ 
+-bin_PROGRAMS= tocanonij
++filterdir=$(libexecdir)/cups/filter
++filter_PROGRAMS= tocanonij
+ 
+ tocanonij_SOURCES= \
+ 	main.c
+--- a/tocnpwg/src/Makefile.am	2018-01-15 22:42:43.759703863 +0100
++++ b/tocnpwg/src/Makefile.am	2018-01-15 22:43:10.442232986 +0100
+@@ -2,7 +2,8 @@
+ INCLUDES = \
+ 	@XML_2_CFLAGS@
+ 
+-bin_PROGRAMS= tocnpwg
++filterdir=$(libexecdir)/cups/filter
++filter_PROGRAMS= tocnpwg
+ 
+ tocnpwg_SOURCES= \
+ 	main.c mkpset.c
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 83b2b426b46c..460700822ae5 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,15 +1,12 @@
 AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3
+AUX cups-filters-1.25.4-missing_cstring.patch 540 BLAKE2B fdc22ccbc624cc6dc9fb6a30cf461d3142b5ab794708e7456663efce7a2ed207159bfad564dc790d77e8f4b6ab7f1e95768f889523c5c2a9c33d3a4408d46fc6 SHA512 0eaf6ec88a74890ae4045bf954895c48e843f346a2ac8114bd3adf9f6c49b511001e5d9cf22dc4c8215b09b58e9acbec80b1f3d20b1b3c2909694f65bbfe5b4b
 DIST cups-filters-1.21.6.tar.xz 1474944 BLAKE2B a4c3418accb9d2bf46a366ec6004919d2a5c2c0a02022102270da17fb81915428275aadf58f1f50f8ca022e1c09cbdbd7300492fa38c53d4a2cbc4c4b86a09e3 SHA512 804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a
 DIST cups-filters-1.22.6.tar.xz 1477584 BLAKE2B 7d833c3e97c510eabcc906bbd01d4d1ef2bf3106d963bdec7f735942e96a830c53ec2c03a4ef580d9fc01f19bae3962c1bd2a98d2af7f03f71988ae374366fee SHA512 6c1c46bd74f700b3ab0a46cb4b5b7ecc93000122e9deb20b43878d876cbe2ceeeb4a3c16ef6de00497b10447d04f2689a5d939d0d49212e7274cc51b4617c296
-DIST cups-filters-1.23.0.tar.xz 1477900 BLAKE2B 00a67ace059c9c280dbd4019fbfec61ef1e46bc2b5c9e36019e860c32a8b4277abefb9cf290e7d8629450c7022099157910703bda2366a0700e3e973fd44a110 SHA512 466dc14155750f8868f29fe416c061813b661892aba7bf91446e1145da5c7eb23abf9935a19d2309bfcb521c44eab9d4404db7965c95b9578e10cccd26bbba8f
-DIST cups-filters-1.25.0.tar.xz 1447496 BLAKE2B 297f16a5580787ccf1494ae99a90ed5912156e255394e3d3e921d8e29db9f94b0ed8409b641bec5231dfc0c802b773415beaf4103424cc2cb46d25d9f3804d8e SHA512 f1be31721fd8f6192868e7954d94038ff1382bb0194bb64014da3dd695cbbd2cd5d65373d809e1b541071374b7eabb44c68c6be29575251490d76a0a5336a5c5
-DIST cups-filters-1.25.1.tar.xz 1447208 BLAKE2B ccc9e02309b7a29ac79f91b1de92e11d78ee108777af0e07127f15ba64c6fece79482bf00011e2f82f50eb2bdea42f4a94f4d591402b35757b62876b04119fe5 SHA512 474045497237387dd16bde73253d9e4e9e0ca2f33f3f7ff70245b4c0f8b1dc71abe141f8ab6b467d941dd7153e11369951bc778ef677d6ea17101cd91886625c
-DIST cups-filters-1.25.2.tar.xz 1449984 BLAKE2B a6f595ac2c1ef55302aa9063d88d77ff518d1b32cd74449a28e039caa119f894577ed79c312b96181b12ae5153859685ba3f95e250f87c9f2ab002279153fd15 SHA512 e616a3a356ea7ad7d61e50242c1c0fd899911a8a293e721a89b425fb6a5d6d98388bbd4c02df407d9b66219b99f7c41a457b1436af6b9d8e979f0fd4e392ef3e
+DIST cups-filters-1.25.3.tar.xz 1448840 BLAKE2B d58d93995d1742ceea861896399687717b7791ef6208daaf50e6df715943ac7c5a8709ad93b5d0c66e412ae4832b1969b238f277bdefb1da61b00dd0cb984fc9 SHA512 df3c5fc9e4e0449943abbff19a537057f9def3a18504241581727ed6a39ecad30315d5593bdf31d04d51181dd402a418805185afa15c22dabf34e1e9eea90a81
+DIST cups-filters-1.25.4.tar.xz 1449676 BLAKE2B 1ba36c013d37d57ebf04a9395638bee8aa3935832ed5f0235f50fcfbc61e4002701dec15f7c45952975fc1e53e7f57fd93f86b9af153a732795745e21e38d329 SHA512 0386c4640249a0325257f9b10a0eee387bc6e8129bde734b6c35704719c0ad60624f9ad44c73cd199768373ffd331fc1b4b4c4c8641f5ec8792ddf8850da510a
 EBUILD cups-filters-1.21.6.ebuild 3488 BLAKE2B da4a24389073b98e8d081290baf781dca00fd9c78512f17c74c8e1962a2e54cbfcac5ae28fd4f2a7ad9c4d9e15b8588a88ddcabfbd33e333839e26d138bd9fc3 SHA512 48d0ab3b1f0361006e79426bff2ad563950ad90833f49aad9934c8cfc607c89fc8ab9ef74c18d832113ba35a76d0a46d5135b739619550790a751a20edf0cca0
 EBUILD cups-filters-1.22.6.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177
-EBUILD cups-filters-1.23.0.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177
-EBUILD cups-filters-1.25.0.ebuild 3384 BLAKE2B 91f79e3470ff93e629fe4d0058951c69439b09da27a7fed891ba71b0453922f7ce7160a5e76b2d523474a99a100807a72ca597987fccae3332115ffa770288db SHA512 0feb327adc4272a479baec21ede0df9d125b1255a4fe6093a7255aa714133f3a7d2141d51eb1c4f89e0f39e779016a9627988e0c29f3f8f3c7ce1c2ecaf150bf
-EBUILD cups-filters-1.25.1.ebuild 3384 BLAKE2B 91f79e3470ff93e629fe4d0058951c69439b09da27a7fed891ba71b0453922f7ce7160a5e76b2d523474a99a100807a72ca597987fccae3332115ffa770288db SHA512 0feb327adc4272a479baec21ede0df9d125b1255a4fe6093a7255aa714133f3a7d2141d51eb1c4f89e0f39e779016a9627988e0c29f3f8f3c7ce1c2ecaf150bf
-EBUILD cups-filters-1.25.2.ebuild 3384 BLAKE2B 0b3a0f627fc1422c27c37e67ce4c938849738afc29a705fb6f395b770eea20872885b43c14cc0fd90d75d8a49d89b86975fc5621444535f05e32e20cfc89dc13 SHA512 6b93a7820236f97c207ad877bd96383f7c671dfec809e7e92571a9c54152c8b21a0828614c3aa818a8ef9e542972460e693105dafb0ec55ea27748c0adf7a0f9
+EBUILD cups-filters-1.25.3.ebuild 3384 BLAKE2B 0b3a0f627fc1422c27c37e67ce4c938849738afc29a705fb6f395b770eea20872885b43c14cc0fd90d75d8a49d89b86975fc5621444535f05e32e20cfc89dc13 SHA512 6b93a7820236f97c207ad877bd96383f7c671dfec809e7e92571a9c54152c8b21a0828614c3aa818a8ef9e542972460e693105dafb0ec55ea27748c0adf7a0f9
+EBUILD cups-filters-1.25.4.ebuild 3447 BLAKE2B 15b83730551c5bda0b8603dc22248810c299f04bf9f2a1586f5a9949daecc4b49c48e7aa75e62f899a041d023161017adc72a130dc9fbe4519ac57a4f68aa157 SHA512 17c640fb9703663e6ec43ff16ccaafbcda24222aba347d59cf1595988a92a405d44175911247e5011b22a14c119cfd194a027b4926d14a0bfc996c5d74f1ca16
 EBUILD cups-filters-9999.ebuild 3384 BLAKE2B 0b3a0f627fc1422c27c37e67ce4c938849738afc29a705fb6f395b770eea20872885b43c14cc0fd90d75d8a49d89b86975fc5621444535f05e32e20cfc89dc13 SHA512 6b93a7820236f97c207ad877bd96383f7c671dfec809e7e92571a9c54152c8b21a0828614c3aa818a8ef9e542972460e693105dafb0ec55ea27748c0adf7a0f9
 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.23.0.ebuild b/net-print/cups-filters/cups-filters-1.23.0.ebuild
deleted file mode 100644
index 9549f96b1d5a..000000000000
--- a/net-print/cups-filters/cups-filters-1.23.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
-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"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	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 )
-	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] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	default
-	[[ "${PV}" == "9999" ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--with-pdftops=pdftops
-		--with-rcdir=no
-		--without-php
-		$(use_enable dbus)
-		$(use_enable foomatic)
-		$(use_enable ipp_autosetup auto-setup-driverless)
-		$(use_enable ldap)
-		$(use_enable pclm)
-		$(use_enable pdf mutool)
-		$(use_enable postscript ghostscript)
-		$(use_enable postscript ijs)
-		$(use_enable static-libs static)
-		$(use_enable zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.25.0.ebuild b/net-print/cups-filters/cups-filters-1.25.0.ebuild
deleted file mode 100644
index 707a8fe57462..000000000000
--- a/net-print/cups-filters/cups-filters-1.25.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
-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"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	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 )
-	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] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	default
-	[[ "${PV}" == "9999" ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--with-pdftops=pdftops
-		--with-rcdir=no
-		--without-php
-		$(use_enable dbus)
-		$(use_enable foomatic)
-		$(use_enable ipp_autosetup auto-setup-driverless)
-		$(use_enable ldap)
-		$(use_enable pclm)
-		$(use_enable pdf mutool)
-		$(use_enable postscript ghostscript)
-		$(use_enable static-libs static)
-		$(use_enable zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.25.1.ebuild b/net-print/cups-filters/cups-filters-1.25.1.ebuild
deleted file mode 100644
index 707a8fe57462..000000000000
--- a/net-print/cups-filters/cups-filters-1.25.1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
-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"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	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 )
-	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] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	default
-	[[ "${PV}" == "9999" ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--with-pdftops=pdftops
-		--with-rcdir=no
-		--without-php
-		$(use_enable dbus)
-		$(use_enable foomatic)
-		$(use_enable ipp_autosetup auto-setup-driverless)
-		$(use_enable ldap)
-		$(use_enable pclm)
-		$(use_enable pdf mutool)
-		$(use_enable postscript ghostscript)
-		$(use_enable static-libs static)
-		$(use_enable zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.25.2.ebuild b/net-print/cups-filters/cups-filters-1.25.3.ebuild
index cdc922f82de3..cdc922f82de3 100644
--- a/net-print/cups-filters/cups-filters-1.25.2.ebuild
+++ b/net-print/cups-filters/cups-filters-1.25.3.ebuild
diff --git a/net-print/cups-filters/cups-filters-1.25.4.ebuild b/net-print/cups-filters/cups-filters-1.25.4.ebuild
new file mode 100644
index 000000000000..03ae82bd13c0
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.25.4.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
+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"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
+
+RDEPEND="
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-8.3.0:=
+	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 )
+	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] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	test? ( media-fonts/dejavu )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-missing_cstring.patch" #693498
+)
+
+src_prepare() {
+	default
+	[[ "${PV}" == "9999" ]] && eautoreconf
+
+	# Bug #626800
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ipp_autosetup auto-setup-driverless)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable static-libs static)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/cups-filters/files/cups-filters-1.25.4-missing_cstring.patch b/net-print/cups-filters/files/cups-filters-1.25.4-missing_cstring.patch
new file mode 100644
index 000000000000..1b051221b6e7
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.25.4-missing_cstring.patch
@@ -0,0 +1,17 @@
+From 1878ecd2ef533c3dbe6e6bc29018ce4bf8246e83 Mon Sep 17 00:00:00 2001
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Wed, 4 Sep 2019 18:13:11 +0200
+Subject: [PATCH] bannertopdf: Added missing "#include <cstring>" to pdf.cxx.
+
+diff --git a/filter/pdf.cxx b/filter/pdf.cxx
+index 5b212ca9..f12607f8 100644
+--- a/filter/pdf.cxx
++++ b/filter/pdf.cxx
+@@ -20,6 +20,7 @@
+ #include "pdf.h"
+ #include <vector>
+ #include <string>
++#include <cstring>
+ #include <qpdf/QPDF.hh>
+ #include <qpdf/QPDFObjectHandle.hh>
+ #include <qpdf/QPDFWriter.hh>
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 7ec9727b1d51..cb01e3e69549 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -3,13 +3,10 @@ AUX cups-2.0.1-xinetd-installation-fix.patch 332 BLAKE2B 5688eeabaea0d2db636012e
 AUX cups-2.0.2-rename-systemd-service-files.patch 2092 BLAKE2B c34d8d6c5295aea6eaeb5aea05dcf32a9a554d445ae1b57b8d33386394e1d3f414095d89dc55eb0d4c5678e2985c37451e64101e6426bc2ad26aa50404b51844 SHA512 409a7508dccbbcfca60ba448f8cea84ecb2710890e7655c67b8292c34c8d555884e7e82e70c2c700691af1a786ce0d8c8c799b6fb471a18f1b87eda99eacd9cb
 AUX cups-2.2.0-dont-compress-manpages.patch 319 BLAKE2B b03a0ab815751055d79475423242bbc407e934cdc00e4596ab05e3d7f87ca0feb7201f6696a8eef59fdb73630431364f12146f1d32743e272de054019acb8380 SHA512 0f4822e50f9376dc2e8c87b55f6526ab514f5f08f737071f5b15696e71b51416203df6c9219d78989544bbc135cd92be91ef351a377be7ab4052e98c25c0c4f5
 AUX cups-2.2.6-fix-install-perms.patch 660 BLAKE2B 85c42742762dc72c746550c36160c5fd13b10727fa4e40793b7072c88c3856c580e408180819acc1668da06024b30173fd71f725175981305c739aaa40b7ba65 SHA512 f64ed254bc79935ea3d9fce4c4cd8074445397c20ee1bc1e759e3bc7a336b30f73722357d2702219932e7a774f925abf9a450d3b30a12ca1f0c5f3c92b0b5fbf
-AUX cups-2.3_rc1-no_pam.patch 4704 BLAKE2B 99d9726f43ebc6ebb7fcaa608b99f435dccdeaa53f8fd6b47b4735c084dec8852ab5b34d06f07293299f13a4d975cf9b5bfc44950910c58c409fdcb71dfec6ea SHA512 f5f0f850a954a970aa5129d518f7b84e1e5fbb57c4bf16d42eb09eac01ebb5280514a580938433525514d5cd57acfcb363aa972d783d7b6b23e8f30e01d5e1b1
 AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3
-DIST cups-2.2.11-source.tar.gz 10405908 BLAKE2B 9b7ee4da9502e42fd1b4a2c57ab709b3127ee8aeb8481a52f37da19fe5578f406260f1551e3fcedcd3a828fbed69267e68fcfd7bfabadf65afce4c3af19b4a1f SHA512 21a6916041b50044d336871f10d1192635458a3d318f19a18ad21d27027dd3839400601019e758424c218225a34aba148ba3a57f0ce3fe14c4df03bd1fde3403
 DIST cups-2.2.12-source.tar.gz 10409313 BLAKE2B 126ea81f7108b3b62f5e062ed522898dd48d4e5b4077c834e8fe89012445dd0a903bafa62f593551ed5f1c92cce4fbd22f56834e0615ed65ca4a6ae84dc2ca1c SHA512 b8e7be512938ad388d469d093ad0c882ab42ea1408c27a91340f8424aa0e79e588df3d59795624973b89074a2af650fa9b5b6ed5224138b17e4c6dbbcbf0a2e6
-DIST cups-2.3rc1-source.tar.gz 7926640 BLAKE2B c39bee2c4697eb540cfa02ee2ce0fa8a79d7efd0a7e65db19fada8473997841e5c341c209eba8eb242e57bb21b0dbded1ca340654874b9400318ed2d9332b890 SHA512 d2411c1da576bd7d561c5465fba0824af86d7b52792482d90876847d0869a5a092de12efc761fd403c74be072c6d6eb5bf407525f187051683dba694e5f7febd
-EBUILD cups-2.2.11.ebuild 9743 BLAKE2B f3b1cd58c0774eb64fde8762dfe13834b38a6c70ace22655ec6103b3dcc277ee6562d7d16592f14e138f6fa3f08b166bb9eb7dea26b75ae464a0fa136ad9c1b6 SHA512 870e5c4f06e96b098a069019aa38ec76364f86677cda52d43e84c0e81cd990cddf1d852920ec9fa0de06efb09239726cec15898e9d07ec97826256d134c81229
-EBUILD cups-2.2.12.ebuild 9786 BLAKE2B 18f65da7d2ee4fea4beeead57add0a296a22dd2d66fa13260647672de892467d87136ab3c0f7473ce72e52049f284c0df1fc4d5fa27c25854a73186da824a3cd SHA512 c9ac430f63a3913de538c3098b56af492ce9709c8e34e6d4885a5a0b5e36816976ffbc7d31c62f2a03df4c1a5afa87cfed28d5577c5f8c0eacd6118f1fa69e28
-EBUILD cups-2.3_rc1.ebuild 9531 BLAKE2B c92b415be48dfe3209bbf8affb451374a1e76f6bcb75d4a74c32beaa7a6feb79a86a49546054655cf4b32bd208b157957719a7611beb1d4ecc18ee308d9da879 SHA512 70302e04dfc1acfa6b9f8ed6db5c974b63e2210cd94b870d45acfd58bb61beb80cb336a3a39f5fd4293625a527020a8754f546e2129ff27c118028a1734f19ab
+DIST cups-2.3.0-source.tar.gz 8129049 BLAKE2B 738dbc7ee5ddcc9ffee44083cd93d8a0e75f4d3bf0b704dd643dc59db2cc2381dd65f676c0979bc65fee03438d160d9d650ceb93f8c702102eb1449d306a81a3 SHA512 c51f173b5fbae1554a3f4a3786fb3b5566e50d9f775473788ee3553922ac7e02e4785492c87c93fd46f159f50d97cc10ff6feafb3397cd9c1840840f3a9cdfae
+EBUILD cups-2.2.12.ebuild 9775 BLAKE2B 37d41f1388d74dcad7e71aa401593bd6e46f57ef9c257c177b83159a95804e357d773ef108fb69ef6ce5effff8e5f60b1d1bd78cdb4792834ecb6006840b89e7 SHA512 f2be9a200c0faaf11b35c19945dc18ed35ce90918357e1b680e09bd760b1f48fc9ea0f187d71064226daf0c78955794e342ac560b9d51b9260ddac08cb4d4200
+EBUILD cups-2.3.0.ebuild 9633 BLAKE2B 2b62636ffa95594e5b3985c3649120fc5deaea937035225ed5f70a4a3f3ceecf21b7eb1ab90a8568c6de0711c169131117de03f8c9ceac32a4493c9eec4494cb SHA512 26221b3b0b98c65dbda3820ccd7a5b88318bacca52d79af37d7cdc35efa441de6696f7082206f716a29001853960ca3f4e6a8ce8e6ef031e4b6025068dea57e1
 EBUILD cups-9999.ebuild 9633 BLAKE2B 2b62636ffa95594e5b3985c3649120fc5deaea937035225ed5f70a4a3f3ceecf21b7eb1ab90a8568c6de0711c169131117de03f8c9ceac32a4493c9eec4494cb SHA512 26221b3b0b98c65dbda3820ccd7a5b88318bacca52d79af37d7cdc35efa441de6696f7082206f716a29001853960ca3f4e6a8ce8e6ef031e4b6025068dea57e1
 MISC metadata.xml 677 BLAKE2B ca19e7bd0d56a0a78771a30efcbd867cd0ab1eba7aaf3add8d384721ac70ed8809bc8a171df43887d772f81dcfd54f31bc13267a9a3a88da44b51322aff87c15 SHA512 f7ed769c4f662ea52ed9e24702b91948a376e7d5a59b305f6d89950d0ea40130e6d471cc0bee373a63338f590bce3b6df5a09e56a166ba7fdd960f82e7648717
diff --git a/net-print/cups/cups-2.2.11.ebuild b/net-print/cups/cups-2.2.11.ebuild
deleted file mode 100644
index 1c078ac92c8b..000000000000
--- a/net-print/cups/cups-2.2.11.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic linux-info xdg multilib-minimal pam python-single-r1 user java-pkg-opt-2 systemd toolchain-funcs
-
-MY_P="${P/_rc/rc}"
-MY_P="${MY_P/_beta/b}"
-MY_PV="${PV/_rc/rc}"
-MY_PV="${MY_PV/_beta/b}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/apple/cups.git"
-	if [[ ${PV} != 9999 ]]; then
-		EGIT_BRANCH=branch-${PV/.9999}
-	fi
-else
-	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/apple/cups/releases/download/v${PV}/${P}-source.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="https://www.cups.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-
-CDEPEND="
-	app-text/libpaper
-	sys-libs/zlib
-	acl? (
-		kernel_linux? (
-			sys-apps/acl
-			sys-apps/attr
-		)
-	)
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.6:* )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	!lprng-compat? ( !net-print/lprng )
-	pam? ( virtual/pam )
-	python? ( ${PYTHON_DEPS} )
-	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd )
-	usb? ( virtual/libusb:1 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${CDEPEND}"
-BDEPEND="
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-cups )
-"
-
-PDEPEND=">=net-print/cups-filters-1.0.43"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-# systemd-socket.patch from Fedora
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
-	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
-	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
-	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/cups-config
-)
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-	enewgroup lpadmin 106
-
-	use python && python-single-r1_pkg_setup
-
-	if use kernel_linux; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Can't check the linux kernel configuration."
-			ewarn "You might have some incompatible options enabled."
-		else
-			# recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122)
-			if use usb; then
-				if linux_chkconfig_present USB_PRINTER; then
-					elog "Your USB printers will be managed via libusb. In case you run into problems, "
-					elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
-					elog "usblp kernel module."
-					elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
-				fi
-			else
-				#here we should warn user that he should enable it so he can print
-				if ! linux_chkconfig_present USB_PRINTER; then
-					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
-					ewarn "support in your kernel."
-					ewarn "Please enable it:"
-					ewarn "    CONFIG_USB_PRINTER=y"
-					ewarn "in /usr/src/linux/.config or"
-					ewarn "    Device Drivers --->"
-					ewarn "        USB support  --->"
-					ewarn "            [*] USB Printer support"
-					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Remove ".SILENT" rule for verbose output (bug 524338).
-	sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
-
-	# Fix install-sh, posix sh does not have 'function'.
-	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
-	AT_M4DIR=config-scripts eaclocal
-	eautoconf
-
-	# custom Makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	export DSOFLAGS="${LDFLAGS}"
-
-	einfo LINGUAS=\"${LINGUAS}\"
-
-	# explicitly specify compiler wrt bug 524340
-	#
-	# need to override KRB5CONFIG for proper flags
-	# https://github.com/apple/cups/issues/4423
-	local myeconfargs=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--localstatedir="${EPREFIX}"/var
-		--with-exe-file-perm=755
-		--with-rundir="${EPREFIX}"/run/cups
-		--with-cups-user=lp
-		--with-cups-group=lp
-		--with-docdir="${EPREFIX}"/usr/share/cups/html
-		--with-languages="${LINGUAS}"
-		--with-system-groups=lpadmin
-		--with-xinetd="${EPREFIX}"/etc/xinetd.d
-		$(multilib_native_use_enable acl)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable debug debug-guards)
-		$(use_enable debug debug-printfs)
-		$(multilib_native_use_with java)
-		$(use_enable kerberos gssapi)
-		$(multilib_native_use_enable pam)
-		$(multilib_native_use_with python python "${PYTHON}")
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd)
-		$(multilib_native_use_enable usb libusb)
-		$(use_enable zeroconf avahi)
-		--disable-dnssd
-		--without-perl
-		--without-php
-		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
-	)
-
-	if tc-is-static-only; then
-		myeconfargs+=(
-			--disable-shared
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
-	# makes more sense when facing multilib support.
-	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
-	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
-	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
-
-	# additional path corrections needed for prefix, see bug 597728
-	sed \
-		-e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
-		-e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
-		-e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \
-		-e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \
-		-i Makedefs || die
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake libs
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake BUILDROOT="${D}" install
-	else
-		emake BUILDROOT="${D}" install-libs install-headers
-		dobin cups-config
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,CREDITS,README}.md
-
-	# move the default config file to docs
-	dodoc "${ED}"/etc/cups/cupsd.conf.default
-	rm -f "${ED}"/etc/cups/cupsd.conf.default
-
-	# clean out cups init scripts
-	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
-	# install our init script
-	local neededservices
-	use zeroconf && neededservices+=" avahi-daemon"
-	use dbus && neededservices+=" dbus"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
-	sed -i \
-		-e "s/@neededservices@/${neededservices}/" \
-		"${T}"/cupsd || die
-	doinitd "${T}"/cupsd
-
-	# install our pam script
-	pamd_mimic_system cups auth account
-
-	if use xinetd ; then
-		# correct path
-		sed -i \
-			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
-			"${ED}"/etc/xinetd.d/cups-lpd || die
-		# it is safer to disable this by default, bug #137130
-		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
-			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
-		# write permission for file owner (root), bug #296221
-		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
-	else
-		# always configure with --with-xinetd= and clean up later,
-		# bug #525604
-		rm -rf "${ED}"/etc/xinetd.d
-	fi
-
-	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
-		/var/log/cups /var/spool/cups/tmp
-
-	keepdir /etc/cups/{interfaces,ppd,ssl}
-
-	if ! use X ; then
-		rm -r "${ED}"/usr/share/applications || die
-	fi
-
-	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
-
-	# the following file is now provided by cups-filters:
-	rm -r "${ED}"/usr/share/cups/banners || die
-
-	# the following are created by the init script
-	rm -r "${ED}"/var/cache/cups || die
-	rm -r "${ED}"/run || die
-
-	# for the special case of running lprng and cups together, bug 467226
-	if use lprng-compat ; then
-		rm -fv "${ED}"/usr/bin/{lp*,cancel}
-		rm -fv "${ED}"/usr/sbin/lp*
-		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
-		rm -fv "${ED}"/usr/share/man/man8/lp*
-		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
-		ewarn "Unless you plan to install an exotic server setup, you most likely"
-		ewarn "do not want this. Disable the useflag then and all will be fine."
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	xdg_pkg_postinst
-
-	local v
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ! ver_test ${v} -ge 2.2.2-r2 ; then
-			echo
-			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
-			ewarn "cupsd will fail the next time. To fix this, please run once as root"
-			ewarn "   killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
-			echo
-			break
-		fi
-	done
-
-	for v in ${REPLACING_VERSIONS}; do
-		echo
-		elog "For information about installing a printer and general cups setup"
-		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
-		echo
-		break
-	done
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	xdg_pkg_postrm
-}
diff --git a/net-print/cups/cups-2.2.12.ebuild b/net-print/cups/cups-2.2.12.ebuild
index ac6565a2d4c1..fdabb541c491 100644
--- a/net-print/cups/cups-2.2.12.ebuild
+++ b/net-print/cups/cups-2.2.12.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="https://github.com/apple/cups/releases/download/v${PV}/${P}-source.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
 fi
 
 DESCRIPTION="The Common Unix Printing System"
diff --git a/net-print/cups/cups-2.3.0.ebuild b/net-print/cups/cups-2.3.0.ebuild
new file mode 100644
index 000000000000..b2da32a36b26
--- /dev/null
+++ b/net-print/cups/cups-2.3.0.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic linux-info xdg multilib-minimal pam user systemd toolchain-funcs
+
+MY_PV="${PV/_rc/rc}"
+MY_PV="${MY_PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/apple/cups.git"
+	if [[ ${PV} != 9999 ]]; then
+		EGIT_BRANCH=branch-${PV/.9999}
+	fi
+else
+	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
+	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+	fi
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="https://www.cups.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+CDEPEND="
+	app-text/libpaper
+	sys-libs/zlib
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	!lprng-compat? ( !net-print/lprng )
+	pam? ( virtual/pam )
+	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:1 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${CDEPEND}"
+BDEPEND="
+	acct-group/lp
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="${CDEPEND}
+	acct-group/lp
+	selinux? ( sec-policy/selinux-cups )
+"
+
+PDEPEND=">=net-print/cups-filters-1.0.43"
+
+REQUIRED_USE="
+	usb? ( threads )
+"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+# systemd-socket.patch from Fedora
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
+	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	#enewgroup lp -> acct-group/lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122)
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					elog "Your USB printers will be managed via libusb. In case you run into problems, "
+					elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
+					elog "usblp kernel module."
+					elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				#here we should warn user that he should enable it so he can print
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Remove ".SILENT" rule for verbose output (bug 524338).
+	sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
+
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	# Do not add -Werror even for live ebuilds
+	sed '/WARNING_OPTIONS/s@-Werror@@' \
+		-i config-scripts/cups-compiler.m4 || die
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	# explicitly specify compiler wrt bug 524340
+	#
+	# need to override KRB5CONFIG for proper flags
+	# https://github.com/apple/cups/issues/4423
+	local myeconfargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--localstatedir="${EPREFIX}"/var
+		--with-exe-file-perm=755
+		--with-rundir="${EPREFIX}"/run/cups
+		--with-cups-user=lp
+		--with-cups-group=lp
+		--with-docdir="${EPREFIX}"/usr/share/cups/html
+		--with-languages="${LINGUAS}"
+		--with-system-groups=lpadmin
+		--with-xinetd="${EPREFIX}"/etc/xinetd.d
+		$(multilib_native_use_enable acl)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable debug debug-guards)
+		$(use_enable debug debug-printfs)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_enable pam)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd)
+		$(multilib_native_use_enable usb libusb)
+		$(use_enable zeroconf avahi)
+		--disable-dnssd
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
+	)
+
+	if tc-is-static-only; then
+		myeconfargs+=(
+			--disable-shared
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
+	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
+	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
+
+	# additional path corrections needed for prefix, see bug 597728
+	sed \
+		-e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
+		-e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
+		-e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \
+		-e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \
+		-i Makedefs || die
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake BUILDROOT="${D}" install
+	else
+		emake BUILDROOT="${D}" install-libs install-headers
+		dobin cups-config
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,CREDITS,README}.md
+
+	# move the default config file to docs
+	dodoc "${ED}"/etc/cups/cupsd.conf.default
+	rm -f "${ED}"/etc/cups/cupsd.conf.default
+
+	# clean out cups init scripts
+	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices=(
+		$(usex zeroconf avahi-daemon '')
+		$(usex dbus dbus '')
+	)
+	[[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}"
+	cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/${neededservices}/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	if use xinetd ; then
+		# correct path
+		sed -i \
+			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${ED}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
+	else
+		# always configure with --with-xinetd= and clean up later,
+		# bug #525604
+		rm -rf "${ED}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/log/cups /var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	if ! use X ; then
+		rm -r "${ED}"/usr/share/applications || die
+	fi
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+	# the following file is now provided by cups-filters:
+	rm -r "${ED}"/usr/share/cups/banners || die
+
+	# the following are created by the init script
+	rm -r "${ED}"/var/cache/cups || die
+	rm -r "${ED}"/run || die
+
+	# for the special case of running lprng and cups together, bug 467226
+	if use lprng-compat ; then
+		rm -fv "${ED}"/usr/bin/{lp*,cancel}
+		rm -fv "${ED}"/usr/sbin/lp*
+		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
+		rm -fv "${ED}"/usr/share/man/man8/lp*
+		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
+		ewarn "Unless you plan to install an exotic server setup, you most likely"
+		ewarn "do not want this. Disable the useflag then and all will be fine."
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	xdg_pkg_postinst
+
+	local v
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ! ver_test ${v} -ge 2.2.2-r2 ; then
+			echo
+			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
+			ewarn "cupsd will fail the next time. To fix this, please run once as root"
+			ewarn "   killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
+			echo
+			break
+		fi
+	done
+
+	for v in ${REPLACING_VERSIONS}; do
+		echo
+		elog "For information about installing a printer and general cups setup"
+		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+		echo
+		break
+	done
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	xdg_pkg_postrm
+}
diff --git a/net-print/cups/cups-2.3_rc1.ebuild b/net-print/cups/cups-2.3_rc1.ebuild
deleted file mode 100644
index 2252272dc810..000000000000
--- a/net-print/cups/cups-2.3_rc1.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic linux-info xdg multilib-minimal pam user systemd toolchain-funcs
-
-MY_PV="${PV/_rc/rc}"
-MY_PV="${MY_PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/apple/cups.git"
-	if [[ ${PV} != 9999 ]]; then
-		EGIT_BRANCH=branch-${PV/.9999}
-	fi
-else
-	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
-	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
-	fi
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="https://www.cups.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-
-CDEPEND="
-	app-text/libpaper
-	sys-libs/zlib
-	acl? (
-		kernel_linux? (
-			sys-apps/acl
-			sys-apps/attr
-		)
-	)
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	!lprng-compat? ( !net-print/lprng )
-	pam? ( virtual/pam )
-	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd )
-	usb? ( virtual/libusb:1 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${CDEPEND}"
-BDEPEND="
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-cups )
-"
-
-PDEPEND=">=net-print/cups-filters-1.0.43"
-
-REQUIRED_USE="
-	usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-# systemd-socket.patch from Fedora
-PATCHES=(
-	#"${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
-	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
-	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
-	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/cups-config
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-	enewgroup lpadmin 106
-
-	if use kernel_linux; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Can't check the linux kernel configuration."
-			ewarn "You might have some incompatible options enabled."
-		else
-			# recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122)
-			if use usb; then
-				if linux_chkconfig_present USB_PRINTER; then
-					elog "Your USB printers will be managed via libusb. In case you run into problems, "
-					elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
-					elog "usblp kernel module."
-					elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
-				fi
-			else
-				#here we should warn user that he should enable it so he can print
-				if ! linux_chkconfig_present USB_PRINTER; then
-					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
-					ewarn "support in your kernel."
-					ewarn "Please enable it:"
-					ewarn "    CONFIG_USB_PRINTER=y"
-					ewarn "in /usr/src/linux/.config or"
-					ewarn "    Device Drivers --->"
-					ewarn "        USB support  --->"
-					ewarn "            [*] USB Printer support"
-					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Remove ".SILENT" rule for verbose output (bug 524338).
-	sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
-
-	# Fix install-sh, posix sh does not have 'function'.
-	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
-	AT_M4DIR=config-scripts eaclocal
-	eautoconf
-
-	# custom Makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	export DSOFLAGS="${LDFLAGS}"
-
-	einfo LINGUAS=\"${LINGUAS}\"
-
-	# explicitly specify compiler wrt bug 524340
-	#
-	# need to override KRB5CONFIG for proper flags
-	# https://github.com/apple/cups/issues/4423
-	local myeconfargs=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--localstatedir="${EPREFIX}"/var
-		--with-exe-file-perm=755
-		--with-rundir="${EPREFIX}"/run/cups
-		--with-cups-user=lp
-		--with-cups-group=lp
-		--with-docdir="${EPREFIX}"/usr/share/cups/html
-		--with-languages="${LINGUAS}"
-		--with-system-groups=lpadmin
-		--with-xinetd="${EPREFIX}"/etc/xinetd.d
-		$(multilib_native_use_enable acl)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable debug debug-guards)
-		$(use_enable debug debug-printfs)
-		$(use_enable kerberos gssapi)
-		$(multilib_native_use_enable pam)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd)
-		$(multilib_native_use_enable usb libusb)
-		$(use_enable zeroconf avahi)
-		--disable-dnssd
-		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
-	)
-
-	if tc-is-static-only; then
-		myeconfargs+=(
-			--disable-shared
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
-	# makes more sense when facing multilib support.
-	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
-	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
-	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
-
-	# additional path corrections needed for prefix, see bug 597728
-	sed \
-		-e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
-		-e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
-		-e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \
-		-e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \
-		-i Makedefs || die
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake libs
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake BUILDROOT="${D}" install
-	else
-		emake BUILDROOT="${D}" install-libs install-headers
-		dobin cups-config
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,CREDITS,README}.md
-
-	# move the default config file to docs
-	dodoc "${ED}"/etc/cups/cupsd.conf.default
-	rm -f "${ED}"/etc/cups/cupsd.conf.default
-
-	# clean out cups init scripts
-	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
-	# install our init script
-	local neededservices
-	use zeroconf && neededservices+=" avahi-daemon"
-	use dbus && neededservices+=" dbus"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
-	sed -i \
-		-e "s/@neededservices@/${neededservices}/" \
-		"${T}"/cupsd || die
-	doinitd "${T}"/cupsd
-
-	# install our pam script
-	pamd_mimic_system cups auth account
-
-	if use xinetd ; then
-		# correct path
-		sed -i \
-			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
-			"${ED}"/etc/xinetd.d/cups-lpd || die
-		# it is safer to disable this by default, bug #137130
-		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
-			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
-		# write permission for file owner (root), bug #296221
-		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
-	else
-		# always configure with --with-xinetd= and clean up later,
-		# bug #525604
-		rm -rf "${ED}"/etc/xinetd.d
-	fi
-
-	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
-		/var/log/cups /var/spool/cups/tmp
-
-	keepdir /etc/cups/{interfaces,ppd,ssl}
-
-	if ! use X ; then
-		rm -r "${ED}"/usr/share/applications || die
-	fi
-
-	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
-
-	# the following file is now provided by cups-filters:
-	rm -r "${ED}"/usr/share/cups/banners || die
-
-	# the following are created by the init script
-	rm -r "${ED}"/var/cache/cups || die
-	rm -r "${ED}"/run || die
-
-	# for the special case of running lprng and cups together, bug 467226
-	if use lprng-compat ; then
-		rm -fv "${ED}"/usr/bin/{lp*,cancel}
-		rm -fv "${ED}"/usr/sbin/lp*
-		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
-		rm -fv "${ED}"/usr/share/man/man8/lp*
-		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
-		ewarn "Unless you plan to install an exotic server setup, you most likely"
-		ewarn "do not want this. Disable the useflag then and all will be fine."
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	xdg_pkg_postinst
-
-	local v
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ! ver_test ${v} -ge 2.2.2-r2 ; then
-			echo
-			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
-			ewarn "cupsd will fail the next time. To fix this, please run once as root"
-			ewarn "   killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
-			echo
-			break
-		fi
-	done
-
-	for v in ${REPLACING_VERSIONS}; do
-		echo
-		elog "For information about installing a printer and general cups setup"
-		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
-		echo
-		break
-	done
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	xdg_pkg_postrm
-}
diff --git a/net-print/cups/files/cups-2.3_rc1-no_pam.patch b/net-print/cups/files/cups-2.3_rc1-no_pam.patch
deleted file mode 100644
index 17e69ab7b0ac..000000000000
--- a/net-print/cups/files/cups-2.3_rc1-no_pam.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 3cd7b5e053f8100da1ca8d8daf93976cca3516ef Mon Sep 17 00:00:00 2001
-From: Michael R Sweet <michael.r.sweet@gmail.com>
-Date: Fri, 23 Feb 2018 13:21:56 -0500
-Subject: [PATCH] Fix builds without PAM (Issue #5253)
-
---- a/scheduler/auth.c
-+++ b/scheduler/auth.c
-@@ -67,9 +68,6 @@ static int		check_authref(cupsd_client_t *con, const char *right);
- static int		compare_locations(cupsd_location_t *a,
- 			                  cupsd_location_t *b);
- static cupsd_authmask_t	*copy_authmask(cupsd_authmask_t *am, void *data);
--#if !HAVE_LIBPAM
--static char		*cups_crypt(const char *pw, const char *salt);
--#endif /* !HAVE_LIBPAM */
- static void		free_authmask(cupsd_authmask_t *am, void *data);
- #if HAVE_LIBPAM
- static int		pam_func(int, const struct pam_message **,
-@@ -690,14 +688,14 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
- 	    * client...
- 	    */
- 
--	    pass = cups_crypt(password, pw->pw_passwd);
-+	    pass = crypt(password, pw->pw_passwd);
- 
- 	    if (!pass || strcmp(pw->pw_passwd, pass))
- 	    {
- #  ifdef HAVE_SHADOW_H
- 	      if (spw)
- 	      {
--		pass = cups_crypt(password, spw->sp_pwdp);
-+		pass = crypt(password, spw->sp_pwdp);
- 
- 		if (pass == NULL || strcmp(spw->sp_pwdp, pass))
- 		{
-@@ -1991,129 +1989,6 @@ copy_authmask(cupsd_authmask_t *mask,	/* I - Existing auth mask */
- }
- 
- 
--#if !HAVE_LIBPAM
--/*
-- * 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms,
-- *                  as needed.
-- */
--
--static char *				/* O - Encrypted password */
--cups_crypt(const char *pw,		/* I - Password string */
--           const char *salt)		/* I - Salt (key) string */
--{
--  if (!strncmp(salt, "$1$", 3))
--  {
--   /*
--    * Use MD5 passwords without the benefit of PAM; this is for
--    * Slackware Linux, and the algorithm was taken from the
--    * old shadow-19990827/lib/md5crypt.c source code... :(
--    */
--
--    int			i;		/* Looping var */
--    unsigned long	n;		/* Output number */
--    int			pwlen;		/* Length of password string */
--    const char		*salt_end;	/* End of "salt" data for MD5 */
--    char		*ptr;		/* Pointer into result string */
--    _cups_md5_state_t	state;		/* Primary MD5 state info */
--    _cups_md5_state_t	state2;		/* Secondary MD5 state info */
--    unsigned char	digest[16];	/* MD5 digest result */
--    static char		result[120];	/* Final password string */
--
--
--   /*
--    * Get the salt data between dollar signs, e.g. $1$saltdata$md5.
--    * Get a maximum of 8 characters of salt data after $1$...
--    */
--
--    for (salt_end = salt + 3; *salt_end && (salt_end - salt) < 11; salt_end ++)
--      if (*salt_end == '$')
--        break;
--
--   /*
--    * Compute the MD5 sum we need...
--    */
--
--    pwlen = strlen(pw);
--
--    _cupsMD5Init(&state);
--    _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
--    _cupsMD5Append(&state, (unsigned char *)salt, salt_end - salt);
--
--    _cupsMD5Init(&state2);
--    _cupsMD5Append(&state2, (unsigned char *)pw, pwlen);
--    _cupsMD5Append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3);
--    _cupsMD5Append(&state2, (unsigned char *)pw, pwlen);
--    _cupsMD5Finish(&state2, digest);
--
--    for (i = pwlen; i > 0; i -= 16)
--      _cupsMD5Append(&state, digest, i > 16 ? 16 : i);
--
--    for (i = pwlen; i > 0; i >>= 1)
--      _cupsMD5Append(&state, (unsigned char *)((i & 1) ? "" : pw), 1);
--
--    _cupsMD5Finish(&state, digest);
--
--    for (i = 0; i < 1000; i ++)
--    {
--      _cupsMD5Init(&state);
--
--      if (i & 1)
--        _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
--      else
--        _cupsMD5Append(&state, digest, 16);
--
--      if (i % 3)
--        _cupsMD5Append(&state, (unsigned char *)salt + 3, salt_end - salt - 3);
--
--      if (i % 7)
--        _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
--
--      if (i & 1)
--        _cupsMD5Append(&state, digest, 16);
--      else
--        _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
--
--      _cupsMD5Finish(&state, digest);
--    }
--
--   /*
--    * Copy the final sum to the result string and return...
--    */
--
--    memcpy(result, salt, (size_t)(salt_end - salt));
--    ptr = result + (salt_end - salt);
--    *ptr++ = '$';
--
--    for (i = 0; i < 5; i ++, ptr += 4)
--    {
--      n = ((((unsigned)digest[i] << 8) | (unsigned)digest[i + 6]) << 8);
--
--      if (i < 4)
--        n |= (unsigned)digest[i + 12];
--      else
--        n |= (unsigned)digest[5];
--
--      to64(ptr, n, 4);
--    }
--
--    to64(ptr, (unsigned)digest[11], 2);
--    ptr += 2;
--    *ptr = '\0';
--
--    return (result);
--  }
--  else
--  {
--   /*
--    * Use the standard crypt() function...
--    */
--
--    return (crypt(pw, salt));
--  }
--}
--#endif /* !HAVE_LIBPAM */
--
--
- /*
-  * 'free_authmask()' - Free function for auth masks.
-  */
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index d90ffcd46c2f..8ddf5940f0dc 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1,4 +1,6 @@
 AUX 1.6.5-warnings.patch 1115 BLAKE2B eac889dc8f5b39bbcf633c3ff2469ba1d3e07f475aa29f82e2ff81568aa72e2a3c25018c481b9d56bfd321314fb931561bbaed5b0883597c6fb296465ac486f1 SHA512 8a32ce7d22bb97cf1a7c1864353cab4a148eb4d1dc599f355420e0119dfb89abbfb66cbe58c8f35e2f8fc3a62b0c4018e0d48065acd21b17cb250e4722b9e027
 DIST epson-inkjet-printer-escpr-1.6.33-1lsb3.2.tar.gz 4402012 BLAKE2B a200ebb94460ff5d6b8731d66ccaa8d7423d8f249871183d3e8e321e2fba84dfca3d72638901c7d81344de8713e765de59ff6e6d579599ec9c565b10bb9e4a0c SHA512 b7af8c69cff0869410a3dfad3204bb908f42070fc2721e1037631d5d5da972a800e195df27ef8e62418a9b927adcbedb2dfe77a6d189d34841f20789aa41eca1
-EBUILD epson-inkjet-printer-escpr-1.6.33.ebuild 877 BLAKE2B dc50bdde50fc24454116acfdc2a53c8f642c241ed8b695b198e040b03d9b119a6305cdce365b81f6904924b7e643f29bc95e18e9e327e7d9af13253e2624c4f9 SHA512 f44894b74f77cd96c79f3316fa623608ad6ac6cdecfe249598314b02894b9758cad44923df7f1d16654e37ba1614312f0efea1f0ecc168da5991645b2059cc73
+DIST epson-inkjet-printer-escpr-1.7.2-1lsb3.2.tar.gz 4667086 BLAKE2B f01790daca7b80e0d1258a6736f1b6edf0db1d5899941174b75b7ea40dd7e75bfa0504511403a1301018ca20273410d5afc28c3b2768e6e2af93c15c032d9b97 SHA512 ae8d965c3325e89b428c53a4037566f0b786e0109ac521623c6a6ada66717487c82eeb9147de01f6a14a6e0afc6ed60045ff8b9526f91bf2995b3c3cd66c548d
+EBUILD epson-inkjet-printer-escpr-1.6.33.ebuild 878 BLAKE2B cb695d1ffaa33ba40e4778ac8f89bb2106a75bdd476618635d759dd6ce5b9dbfd866c7afcd0763c62094eb87a0c4fbaa15b361e0336f53c7cd78afb825afe444 SHA512 4ae106f537b37d635a1e85ffcd859e90576b804156964ed345196811a2f0d210ccde253723a35df430e29fcb8fb9b92dd49f56201447fc79d0dc84a39feff8ba
+EBUILD epson-inkjet-printer-escpr-1.7.2.ebuild 877 BLAKE2B f18ec49c3f0294c382bfe8448f1490103dc5e5b6c1036e1869bd49fa426e7e39893813bca49f3d9ceff60e9fe30928231dc76be5dc1fdc7078093313b0a11974 SHA512 f6410e9206a3ad4334acccd74ed1602fdc1eabe83d4889b3d92b72affbc96f508e3c1f63ed8ddbfdded11c71a78c37df92de0869c7180788c17465435cd56c34
 MISC metadata.xml 253 BLAKE2B 9f98272e44d92f62df07adebeb8942eb26113e29ae3021a9d1ef478a1bc2bdd26bd4700cc7d88dab9c5fd78d54958327997e9849c100ac00fbe051915ab3f2e0 SHA512 e8bc4d02500676e2506fbe7f0811be984878560deb05d09122cede2e62e633fb7644fa59b73a20da8f3fceea8f8cb928768726e8b679f32178c0aed9a874ea15
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.33.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.33.ebuild
index a6862fc975ee..6b72b2b615de 100644
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.33.ebuild
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.33.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/08/70/14/e33b7a89e843b3ac97dcab773f03fbac7769f147/epson-inkjet-printer-escpr-1.6.33-1lsb3.2.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.2.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.2.ebuild
new file mode 100644
index 000000000000..dd6f26c67cf9
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
+HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/09/76/14/6479eac30ef2e351bb6672ed63314953b9655d16/epson-inkjet-printer-escpr-1.7.2-1lsb3.2.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/1.6.5-warnings.patch" )
+
+src_configure() {
+	econf --disable-shared
+
+	# Makefile calls ls to generate a file list which is included in Makefile.am
+	# Set the collation to C to avoid automake being called automatically
+	unset LC_ALL
+	export LC_COLLATE=C
+}
+
+src_install() {
+	emake -C ppd DESTDIR="${D}" install
+	emake -C src DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index f6ef1a73aab5..45e76264e689 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,6 +1,8 @@
 DIST hplip-3.18.12-patches-1.tar.xz 12032 BLAKE2B 33e6e4e1e0e5b4f998459073cf0742b7c56929b23e6c1cc3ba9df4eafb8007273a5a2e7f27af0d2d4a3a97ebb9cfe462b74dcddd7149088980893b2c66113b7c SHA512 3b0e2b4f7d8da257c6fcf12f2e049276d059426f2d1c626324982ce862efa2323cbb191a373c53fea7880e3b6e44ec62e584091676556d97e6a456edea4c44cf
 DIST hplip-3.18.12.tar.gz 24588202 BLAKE2B f2ffa6d0d54e467c03ccf9e74accb62ef69842001a00e8c4e6fd68b40c4daff5896fcdd69d37b5e50be2b837918058a5c9071615ab77c1ce83fffc546ff98c02 SHA512 7197cac325cf40c03f49053a98ee0e8ac6c670d142b2a64df09c0f7afa1d7d3602216c55c825ccbf20a1fbda9c9289173b8708e9f87171a862dae5b6b4ef7635
 DIST hplip-3.19.6.tar.gz 25436373 BLAKE2B 9ce8fe6aec475ea6c2c5b25555d311ac498ef34e12e9f7c41900ae88d1ce30939470f8f9a1c29fffceb1f69dd205be25ce6aa381fe9ee3a2f01e86dcbd927c63 SHA512 c99448ad0cef9fc626a0a03147a0d582513cb838ecfbfe29f07c65bbf701dee5c7d02222469b118ccc4e8c230c7a4b4685a72a1e67595ee01150b0472692d654
+DIST hplip-3.19.8.tar.gz 25473983 BLAKE2B 8778b1b66164e38c1593c55b1a5b762679e82e1ab96249520d02af87e2a55584733ee3c047fad912838571be626f85d6a07335f95b37a28fd7b1015c993ec6b8 SHA512 99b7661c9b1d70f3c762658fcbff1ab0c170be8f8fd6cc8bbc80bb0860ccc6d69d38b662ff8be2bd38986a95385a5e5766f22003ee3e74b764dab3d46c6cb9ac
 EBUILD hplip-3.18.12.ebuild 7738 BLAKE2B 3a7f56fbf029ad197d8c3f5b20883cf387da98368564a0c76bc349440f9aee55a87c1a0ee71c07b8b6e5cab377432f2e13252aaea6d03c0252a1ad3b68490f43 SHA512 2904fd13f3b168a2c4dd8807a9f665e75cdbd9d2de36acc7bbbe49864764012e37ad1f47b1fc402d397c3e4bcd18d6946484aba1b4708e3f39396b5c4ffb47e1
 EBUILD hplip-3.19.6.ebuild 7743 BLAKE2B afd1f59ad7c15e2801d2cdaaac099061606ca22e1a229c391c46c7ec35220b894512d75e611671f16657db5d8cecf8d8fabb195277cfe898b713d9eaa8c9f904 SHA512 d283fc0e5784e9f9d3e298ab186d97692bf071bc2c12c5bec53ebe0c26094252f036858186e395f0a9e1c346407c53d21c3ca5c49e231884293e1039346ec62f
+EBUILD hplip-3.19.8.ebuild 7748 BLAKE2B 2bab14cdb4593b7cb0f5bd0eef84d098eb2c24db84e112941647c52e163eb375df884fc4c060e9385103c1d389f3cac857e9fb387f6bc843430464be5b57e691 SHA512 9ec707ecb7060d671f3b45e77d6870a37138ccffc820101af7966cf73d55def19748b5c2e89820dbe85e8b15522375e49824c603dba4aa1ddc120e8c872c103b
 MISC metadata.xml 1829 BLAKE2B 614757c5958bb24f223c75a252beb06014bfe7f47cfe58feb88be89918394224b7075e0d444d7bb898f9f478c2ae5cf572df3f905ff110ec1153cf1849cc8e46 SHA512 c6aae86cd5a200b7d42336f0884b87dc0b74d2b2216b8002929a56a53f42ec02447684eb8d0411e30ef707e01d930aac446866796c781f95a3463f84901666f6
diff --git a/net-print/hplip/hplip-3.19.8.ebuild b/net-print/hplip/hplip-3.19.8.ebuild
new file mode 100644
index 000000000000..ac23a93aaa95
--- /dev/null
+++ b/net-print/hplip/hplip-3.19.8.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+# 14 and 15 spit out a lot of warnings about subdirs
+WANT_AUTOMAKE="1.13"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.12-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+COMMON_DEPEND="
+	net-print/cups
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!minimal? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( media-gfx/sane-backends )
+		snmp? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp
+		)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+		kernel_linux? ( virtual/udev )
+		qt5? (
+			>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
+			libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
+		)
+		scanner? (
+			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
+			X? (
+				|| (
+					kde? ( kde-misc/skanlite )
+					media-gfx/xsane
+					media-gfx/sane-frontends
+				)
+			)
+		)
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+
+Any user who wants to print must be in the lp group.
+"
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	# disable class driver for now
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		--enable-hpps-install \
+		--disable-class-driver \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable !minimal gui-build) \
+		$(use_enable !minimal dbus-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit) \
+		$(use_enable qt5) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build)
+
+	# hpijs ppds are created at configure time but are not installed (3.17.11)
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	#local i
+	#for i in ppd/hpijs/*.ppd.gz ; do
+	#	rm -f ${i}.temp || die
+	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+	#		gzip > ${i}.temp || die
+	#	mv ${i}.temp ${i} || die
+	#done
+}
+
+src_install() {
+	# Disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED}"/etc/sane.d/dll.conf || die
+
+	# Remove desktop and autostart files
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
+	use qt5 || {
+		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
+	}
+
+	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${ED}"/usr/share/hplip
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index ba95780cf4ea..8039c31d267c 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index ea831a331f7a..5c30e3a941a5 100644
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@@ -6,6 +6,8 @@ AUX shadowsocks.initd 1349 BLAKE2B ec1f4bd395803c6a23ff16c6040ecfe70eae2aa840f05
 AUX shadowsocks.json 132 BLAKE2B 84f0dbdf0a7eb5d1c8d8ca26147b5dde872a78b128357fa4d3d1348afdc4bd3bdd87f73c564d030e9cdc19a0e5fe2d414a5430f2daeddd03c0a24b761460596a SHA512 6bc5c406bdb25123fd43e21784028dd331f729bc56fe7ac4d31e3b1d81d12048a6906db3fd79765a64fc7f8b651095695fd8cdcc60f6d3285231e94a90611cef
 DIST shadowsocks-libev-3.2.5.tar.gz 278138 BLAKE2B 874471f134371d274ce274c096286dfe8a755e5423624df80df70321f017d9344516fd38f82df43033870588664dc626595157ab6c5022c9953bd9ce59dee2b8 SHA512 b4ca9f7c303c85a5bba9bf5d7a093c6dfde7a147d0335b449d4ee213cd3b9004c5220a099dcc78464a35c55f9cfe280d817daf934e2fda100f5e784f70091c0b
 DIST shadowsocks-libev-3.3.0.tar.gz 278818 BLAKE2B e2f00082d6fe697560dc282f31ed98368390e750a7be33fd3230f4d4635b4aa8a8ace3bd82da8000defee468ae167c2b4fa1e836e79580deeeff3a53dc7b793c SHA512 7c93bddef07af9e79a7c6757a89f301000a6137e0951ee622c66c2e8d3aa70e157cfdf7798a718074f956f7c22dde0af1073781cf0b36d7e185dfd45a87f354b
+DIST shadowsocks-libev-3.3.1.tar.gz 281804 BLAKE2B b0091f0c0eba285d75d340e2449684e42689a44c4c93d71b32466a9f6f85130f0ecaaa1b880717e50d5b9d452d10f3fe0b87705b704be2896f450588d6cac48d SHA512 a2f5f257fb701f03cc24d1d86df0e41aa2589c95a0e694c3b7fe19af68fa9ad8c61de631320525338d5579a60c978bb0fb741a85a9606110ff1077cb9c655eba
 EBUILD shadowsocks-libev-3.2.5.ebuild 2222 BLAKE2B 7bc54c6a01331d76f786df11b1df9dec7eb14eec1a8f8f2c499885a54686f934b70c6ab04127c71eadfa47a17ea7a496012bdda9d7ff1d97bce68749dc16a534 SHA512 9d0b697bc6b415c8a56c6e41cc4e6c8825fbd8609040c78cecebd8c23b83046ae8820b9131744d20eafb31092f9399ec14098c842d36d8ec34d52dccac67aba9
 EBUILD shadowsocks-libev-3.3.0.ebuild 2234 BLAKE2B 000c464ca58ffdcc13da4940bcc7fc9696b203c3eec9cc832497c4004ef34b63ecde9285a79472124a1b7222edd1f350e96af08336f8f99c789255095536d71c SHA512 f783afe841b842cdd62379eb529fe26b2b947b7623f829535ef995fdf966a08ced6f2fb53d84701ce82d44387275d4897561aaf5530045f9be8e00c05fc80386
+EBUILD shadowsocks-libev-3.3.1.ebuild 2234 BLAKE2B 000c464ca58ffdcc13da4940bcc7fc9696b203c3eec9cc832497c4004ef34b63ecde9285a79472124a1b7222edd1f350e96af08336f8f99c789255095536d71c SHA512 f783afe841b842cdd62379eb529fe26b2b947b7623f829535ef995fdf966a08ced6f2fb53d84701ce82d44387275d4897561aaf5530045f9be8e00c05fc80386
 MISC metadata.xml 334 BLAKE2B 1217232e3b08c238795607fa0281c81feb34ed794005d1e5c1522b3380a9d1f3877ccf787ab88ee95a4cd4db85a11163395e4a3a449d4a862634e5a8cdfbe0e2 SHA512 a1e5349204ad41815cdf8772c760c0e1085749863c71d30fddfa8958d8c6d388575288da4dcd60acdaf00288b5a52a731aa21512a1c7ef9622fd0b2de162086f
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.1.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.1.ebuild
new file mode 100644
index 000000000000..b6510c91d684
--- /dev/null
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="v${PV}"
+inherit autotools eutils systemd
+
+DESCRIPTION="A lightweight secured SOCKS5 proxy for embedded devices and low end boxes"
+HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev"
+
+#repack with git submodule populated: libbloom, libcork, libipset
+#SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${P}.tar.xz"
+
+SRC_URI="https://github.com/shadowsocks/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug doc"
+
+RDEPEND="net-libs/mbedtls:=
+	net-libs/libbloom
+	net-libs/libcork
+	net-libs/libcorkipset
+	>=dev-libs/libsodium-1.0.8:=
+	dev-libs/libev
+	net-dns/c-ares
+	dev-libs/libpcre
+	"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	"
+
+src_prepare() {
+	sed -i 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' \
+		configure.ac || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="
+		$(use_enable debug assert)
+		--enable-system-shared-lib
+	"
+	use doc || myconf+="--disable-documentation"
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	dodir "/etc/${PN}"
+	insinto "/etc/${PN}"
+	newins "${FILESDIR}/shadowsocks.json" shadowsocks.json
+
+	newinitd "${FILESDIR}/shadowsocks.initd" shadowsocks
+	dosym shadowsocks /etc/init.d/shadowsocks.server
+	dosym shadowsocks /etc/init.d/shadowsocks.client
+	dosym shadowsocks /etc/init.d/shadowsocks.redir
+	dosym shadowsocks /etc/init.d/shadowsocks.tunnel
+
+	dodoc -r acl
+
+	systemd_newunit "${FILESDIR}/${PN}-local_at.service" "${PN}-local@.service"
+	systemd_newunit "${FILESDIR}/${PN}-server_at.service" "${PN}-server@.service"
+	systemd_newunit "${FILESDIR}/${PN}-redir_at.service" "${PN}-redir@.service"
+	systemd_newunit "${FILESDIR}/${PN}-tunnel_at.service" "${PN}-tunnel@.service"
+}
+
+pkg_setup() {
+	elog "You need to choose the mode"
+	elog "  server: rc-update add shadowsocks.server default"
+	elog "  client: rc-update add shadowsocks.client default"
+	elog "  redir:  rc-update add shadowsocks.redir default"
+	elog "  tunnel: rc-update add shadowsocks.tunnel default"
+}
diff --git a/net-proxy/ziproxy/Manifest b/net-proxy/ziproxy/Manifest
index 09f80d5cb59a..5d50b9b51b26 100644
--- a/net-proxy/ziproxy/Manifest
+++ b/net-proxy/ziproxy/Manifest
@@ -2,5 +2,5 @@ AUX ziproxy-3.3.1-giflib5.patch 1399 BLAKE2B d8f60518ae1b1fe777597d5dcc56816aee1
 AUX ziproxy.confd 650 BLAKE2B 1c9dacf16234404fc702643ffd9fc2c72d7c7eb3e1d17af68a7c784a650bc7e95688167b86fc57e0b25b09c984569de52b3ef214be34b416642f9f1be4b02e0b SHA512 77d730705c652c59acbd20c10d06801427cc3736ef3f9e06771fcadb0470599b3f6b84bd6e4d35c10e90927077e35e0547051b638a4bbafe4a596c38aa1af0eb
 AUX ziproxy.initd-r1 558 BLAKE2B 3a6ccb81024c594babb288375d7b1c47208214700d9a362bc2eae1064f3ff026559f52dcccb3774924faa36a1f66d177347615ea6eab873ddccdac6ecd65a5c6 SHA512 81fd2c24876e6cc2be6c1b77e9c3ff916a7a8b541655aeb0dab3122c7b40a5f23ddc7db3d3867441c3f61509e0c75e321681e7fcd4e6b268f45faab55460542f
 DIST ziproxy-3.3.1.tar.xz 205972 BLAKE2B 60dde7a7da61408023d85c92b04e22e876155e90ad5541653748d7e9059a47e698767420b3f3bc072d2b23aa99b0bf0f7335965fcd519b7f34eeddc0849fb000 SHA512 bff87a63320e721091ccdcdbe409f59db7f7f681ee8b7f093f18f3c0391579a25b9a8daf6ccfea4d94384142247ce36cfaec68d294b2a23caa56ede436da2d87
-EBUILD ziproxy-3.3.1-r1.ebuild 1699 BLAKE2B bc901496f2780742843f9c1589b91dc2ade67fed96469310106d28e1ea98206a146f59cd49612ea1b94c3205294fb8160c61b8f49bd17d488067054b28c11952 SHA512 ff68726c66e33eff25cb1c3b5f7bb85a60cd06e8d0969d017f353dfbc1fe36caedc638edd323585622ae92b345866063029930ce1a4f0b78b49cde3491f87fba
+EBUILD ziproxy-3.3.1-r1.ebuild 1612 BLAKE2B 109f51906fc16c5d4f87ad609feb27da35f7e162fc47ca4ab8e1717064d5b74fef161668ad2650be4f8a522eb468b25800e564f51e31eb850a6444076b6c5d7b SHA512 f6f2b8bdda748afefbc65ddb426e478aef2936b4244a9c77ce0a3d9bf1e4bf05bb88244b9159059fa77ef1e80e2ea6095f7866b558d9578eda2cc26f7e5de256
 MISC metadata.xml 516 BLAKE2B a85e057b74ce76cadded707fbd9bbb810f5f3fe4ac5b30ccda9b02fc22efedcffe3c2eb398f36a986d067771290de88fb5aa0f42cdc9846fc869d9de3a105d41 SHA512 477983c8d8f5e65f6bb6f8462711e6920da429c4c17dbcabfe5743da8cd693d016df2743bc4cedf042ccbe2d2f406486173ce7e118a117634eb3c2fee7cf4e6f
diff --git a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild b/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
index 7ac3b1b6f333..b5d92bd3fadc 100644
--- a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
+++ b/net-proxy/ziproxy/ziproxy-3.3.1-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=6
@@ -11,14 +11,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="jpeg2k sasl xinetd"
+IUSE="sasl xinetd"
 
 RDEPEND="
 	media-libs/giflib:0=
 	media-libs/libpng:0=
 	virtual/jpeg:0
 	sys-libs/zlib
-	jpeg2k? ( media-libs/jasper:= )
 	sasl? ( dev-libs/cyrus-sasl )
 	xinetd? ( virtual/inetd )
 "
@@ -50,7 +49,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_with jpeg2k jasper) \
+		--without-jasper \
 		$(use_with sasl sasl2) \
 		--with-cfgfile=/etc/ziproxy/ziproxy.conf
 }
@@ -66,8 +65,6 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 
-	use jpeg2k && dodoc JPEG2000.txt
-
 	insinto /etc
 	doins -r etc/ziproxy
 
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 0ffd3c23533e..e08e125a263c 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 5ab8df2b0499..8641f3c7a26f 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -7,8 +7,10 @@ AUX tincd.conf 728 BLAKE2B fdfe320df4ac8112fb5ee64cd88cd228bef8d1e701a00598691a3
 AUX tincd_at.service 197 BLAKE2B f568007b8872e105eb001333d24d7446ff8fb1995edaf77d98679078bfddd2ad9a534e1ed7d8ac743aaf026863dd9952e96e3bf2a8f950115c9f059a2660afc6 SHA512 866f8adbc9c39cc6030e6046e4265a4f6e893960045df15abc0a1865599cf2576ac12468bd1a286df47248ebe2c6b16ba64a60f0ebeeb0212d850a9d7886c98a
 DIST tinc-1.0.35-upstream-patches-1.tar.xz 6028 BLAKE2B d236125211efda0c8b5aa4e93a278fec17d57ecb257ea057ca67f2a465d1da7d069f6d3a97220dc1e40123266bc2fc68685d2ea2e143033a12199278b073c31b SHA512 8ae2b96d5f296bc5d0d21fa814832ccafdb5595b06d60d72a090eadb4aade9e386990801b5e1a8cca722f88881aa2d21e70f9154570feede6a9771a0eaec83ab
 DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 419b581167614d534b6f2f3b804657f088c013529d7738766aff199da775860ffed42ecb61e8ed008c5b6fa410f071e2fe1ca59f0c6e443c0a8017cd10c31ce3 SHA512 037867306c21506d57d69d35c0f246b2936022047978fa3e01464b5f6b65f109760507d9cc740f82f8166f39c5ce44d9f8dde55655a6372dacd5b5974aeaee32
+DIST tinc-1.0.36.tar.gz 500320 BLAKE2B 6f799ab04f9553fa389baf9d60121540b1fc7d5b5c2b62b2ebe0bf7478f5f69e8638a9c1b15f8ab84268d813ac1b1978c73b12a478b682cd808747fd2eed951c SHA512 23af9162f7ae700bad01e1f59f23f32d1b183b185ec35f4a69a987c52c53cfebfa9e852203b399f035988078e9131e5d59b018554a52a30044f34df6e64b5289
 DIST tinc-1.1-upstream-patches-2.tar.xz 23500 BLAKE2B ab44d2efcd494c6a49e9e0bc109670a586b087d5ce1daab9b9cdf8f50a4c9b9d927e102fe947e75e6f7be509ba9315936315006b557b39639399bc7f40109f5f SHA512 351537f212421e7fe28fcf97293550edaa4c4c8a578bf4eeca34ae591caefb222df4d5d96bfa03bddd6afcb5143e68b59f5341b2a6412c053a3cecf4fdd0bee8
 DIST tinc-1.1pre17.tar.gz 927313 BLAKE2B d16789b64f6d11deda4752fdeeb603fe62efd6b1d68b0286fbe9c329d8ea51494df59e0e5bf1564b25a0ed44e9244799eb61f73de9ded6a1a418417453adddc4 SHA512 b966dbfa522e12ff6766c4deb54a9da29cddc15c3a1df0f0e084df27ee5f1421ffbebc0e29472b1bcd79ea8b41f8c0ef904172e333dcba0b85bafe4654a63b30
 EBUILD tinc-1.0.35-r2.ebuild 1349 BLAKE2B a082f910398173e5956af8fa52782557a263ca1877a7ea710afe0f11f1b82830e851efbf735d92e2e67b267d3bbe85ffb64c28337a59685f41b4355b955f842b SHA512 f765a2da03b5526bdef70fdb50c7efddc0b27d978b97526cb3e0048f1570c9a69ec8376768f462b8d79769eb1185b13b6b42881796471ccafbec246fae2ba41e
+EBUILD tinc-1.0.36.ebuild 1064 BLAKE2B d0f3f10c386ea9549d55c9b9bca434892ee16ceecc9b035e7e1f890c37198add7556ab5935743ae67b8d8437d0f559bc369ef8058d1d835e84dc123b95aba078 SHA512 a490dab876713a817d4bb32cdbdc8a4651bb26f1c96fc7e61ae7666d632430a22e29ea43778d9351051f9b21cbb7255e5cf029311dcad7fb4e537415dbc07db8
 EBUILD tinc-1.1_pre17.ebuild 2417 BLAKE2B fcbfdddaf5c5e80b9af691bc62e0dd59b297fdcedabe8258edc524306f34e1a1a317bb2e2ef13b6e28f053a5c87f683e99eaa74a7439feb653474ceb80abbff5 SHA512 47f0247a1f47c4cd14f6d9d014b33470276f67a0dcee0d7e81d3fec8d0fe48c2db6c8f6a633a87c108c7e399887fba5d2a6d1afc9304796bc6bd63302c4bb71b
 MISC metadata.xml 723 BLAKE2B 09ac4b61d77c06379478413b2c8f33762908f272de27f7721d7cc02ad77b91755944835544ec6219a5d2744e3d79b2262d570e319140c4d06fae988caf7a7666 SHA512 d1aa24b5c5548fc37c19a992d211918afb93d361b385307f3d6bef783d381a465d0a743832425857766e5af5a8f960e5708cb60a1738d4a29bc659f6293d3bda
diff --git a/net-vpn/tinc/tinc-1.0.36.ebuild b/net-vpn/tinc/tinc-1.0.36.ebuild
new file mode 100644
index 000000000000..d239ba672fd9
--- /dev/null
+++ b/net-vpn/tinc/tinc-1.0.36.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/"
+
+SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="libressl +lzo uml vde +zlib"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	lzo? ( dev-libs/lzo:2 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	vde? ( net-misc/vde )"
+
+src_configure() {
+	econf \
+		--enable-jumbograms \
+		--disable-tunemu  \
+		$(use_enable lzo) \
+		$(use_enable uml) \
+		$(use_enable vde) \
+		$(use_enable zlib)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodir /etc/tinc
+	dodoc AUTHORS NEWS README THANKS
+	doconfd "${FILESDIR}"/tinc.networks
+	newconfd "${FILESDIR}"/tincd.conf tincd
+	newinitd "${FILESDIR}"/tincd-r1 tincd
+	systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
+}
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 05839815d44e..7a0c7f6c3446 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -5,7 +5,7 @@ AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c19
 AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07e347308523caad1a1e0255e5597bdfb818257ab6db03da0f07622707ff60c62926f91d9d7d6e8 SHA512 4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
 DIST tor-0.4.0.5.tar.gz 7203877 BLAKE2B e03710038615a5b9baf327933917c369bb3fabd4df6dd9f16053a0b72bcf20219e956e74258d0e39ae297d406035a89fab017d2e28c795f5d713c3933ad7cd29 SHA512 f6bccc52aaa436a501077b0891ecd3a9779f288b3b15fd76fa2c612e60aba04763b5951f55b2357e6271797b2f924bee9a6d2c1ee20419daa02d9d38ec68510b
-DIST tor-0.4.1.4-rc.tar.gz 7369948 BLAKE2B 336886c45701f3e7a783284000c601d6642a6b866d0cc9ffd66da0876871dc7fbe893edda5e08f059366a7ab21b30e493cf19bd49d9812ce3d06cc7e2d85d190 SHA512 851809c5ff80beea8bf4432d702bcb6ce9ffe0b3d137c3c11386f1e4c771140d218d4ed2dc5c3c4994091c13a2e28f85ce125c1b68fe606d16e4e1f5a259937b
+DIST tor-0.4.1.5.tar.gz 7378436 BLAKE2B 33e4cd5958f4b0e1ece2cc035f87d6ccd255fcc9d0d1d92d05a9d469997f39120cddf700a614b80c83dbc4f57a80e270178ea3c04159b96aec248405654a6a5b SHA512 33d30f5fd2a92dfcb28d97c76c9d396d3eda27036b01c3a678428e878f046e45a87c2d42de0c1b8ba672568d75b08ba4cbf56d1aa50acd34c0d174180faace6e
 EBUILD tor-0.4.0.5.ebuild 2232 BLAKE2B fed112e92aa7b11f4646ea94db9fea5ef81a80dd57a4b95990d906142991ee8f4b900601a011246ff6e707069c255555195041929c97e753d16a16bc8d820719 SHA512 44a4958239f006307178121e4cb49f79ca2063561dc593af840456895eaa4f7d272592a1a3658645b29fe9e82a71e73a731eccbc7cab0ebbbfe37b41068f1c1b
-EBUILD tor-0.4.1.4_rc.ebuild 2237 BLAKE2B c4b181a5383703dd236901b8a7c6f7af27caa9f2e2cc8824bed97e17fa7dde3eed93ef1e341b9d34197040c4d25a6eb6d2d009115f936539da447464747fbc01 SHA512 347aac4e1fdd00208a2949c42804110b0d4c10b499d8d85c5b97cadf54577b966f76bb90d38ab5c732a29ae533024b6207d1508d5ec166f2b1f650d58bde7498
+EBUILD tor-0.4.1.5.ebuild 2237 BLAKE2B c4b181a5383703dd236901b8a7c6f7af27caa9f2e2cc8824bed97e17fa7dde3eed93ef1e341b9d34197040c4d25a6eb6d2d009115f936539da447464747fbc01 SHA512 347aac4e1fdd00208a2949c42804110b0d4c10b499d8d85c5b97cadf54577b966f76bb90d38ab5c732a29ae533024b6207d1508d5ec166f2b1f650d58bde7498
 MISC metadata.xml 502 BLAKE2B 62cfa9bebca4f57461228105fc7433ba9d56494197768549f6dc62ec048654918bfc04958c321239b5f223c5d263415b346168ab30c6ea3cc78a5b0bef93f08f SHA512 70b258fd1bab0a13d24e20ccff51ba8b0b1f3a526986a0140c5d2344c781f257ff0f7b60cb6a193b6727faf21d7a4ce96071b9b09373fd9636ed2f01ee1f2000
diff --git a/net-vpn/tor/tor-0.4.1.4_rc.ebuild b/net-vpn/tor/tor-0.4.1.5.ebuild
index 5260bac68c8c..5260bac68c8c 100644
--- a/net-vpn/tor/tor-0.4.1.4_rc.ebuild
+++ b/net-vpn/tor/tor-0.4.1.5.ebuild
diff --git a/net-vpn/vtun/Manifest b/net-vpn/vtun/Manifest
index d8bf224071dc..77018729fce7 100644
--- a/net-vpn/vtun/Manifest
+++ b/net-vpn/vtun/Manifest
@@ -5,6 +5,6 @@ AUX vtun-libssl-1.1.patch 7826 BLAKE2B 6c025f0aef6ea16e7cde078637f4f3ed908b54a6d
 AUX vtun.rc 669 BLAKE2B beb4f78d4a4c8a83ea7d102a9c508125cf0942081aebeb0d6196fa8a04a5095f6a50f514ef46debc82da19d548cccd4e90cf6f7dece51158428c037d1064ace7 SHA512 d5028e1ca0b01e9f746b273a54f9c82bdf393c22c4ba099b08fadec5086055c571242d6d1c13eeced9d8c7c27bc57a7559a91f05f8e25ff92a6629827d443ee4
 AUX vtund-start.conf 1174 BLAKE2B 3bce3aa808286c554accb71876314bbe8ecbd5e02b16b804f911201a0fbfd8fae25f9f6a702d2de4ef5254d50661d9d1c578f5d6b7e9dcec5b92ebe8b4724007 SHA512 7ec2a8f64380483b8e311bbefb78675a457e27088888e654f8c5fee5f14a77a72f1319b9c7e2dd38763c86728e4f44d6eb87c286103e547e19f329f1550e6710
 DIST vtun-3.0.3.tar.gz 130051 BLAKE2B 9bbc11724fb75acd024fda8b4e84af425c5377b3d8a938f7e789ecb1c2cdb95f109a1edc59f3fcbd2c5898bd17be76054060e8e36a1fb4355b40b61cc64adaad SHA512 5fa789d08b556f97492b89515a89c2322c4b0a8fa95bd1035f5ed19061b3654a6a36a9911792096ac872ae9ae5451848cab87d0343dc0ffc064affea1f7d0d54
-EBUILD vtun-3.0.3-r1.ebuild 1536 BLAKE2B d1f4b8066c339799b9104d70b0e40e3686bb4a35c85b75678ce3c4a089510b94e27c1b0723c5ba84500601dc838148b51b7a51177f9fee317d107773e08631cc SHA512 7fc8d100a3945feb8e060b8b91bfeaa32c063fd058477cce0257e1b6b28cc7569f3bb4445465d4f23178f5275deab169710c7e6edf5c7b9fedfc9f6e87cb318c
+EBUILD vtun-3.0.3-r1.ebuild 1533 BLAKE2B 0b6c7af0263cff3121b6cd14eba8c6da85adc352b6c388d9502177bd09e1ec3b35e22a74215b4f8283ba4fe3b7d99786d2f5378279a8fec82dc93e126f88b021 SHA512 b1d101ca8513f18e2fc114657518f6e866eaec6934f689593116c0941ac6e94daf373e880a6666b05b9720dcb9ec387504bd836f27e9de4a33c8c2b912363df7
 EBUILD vtun-3.0.3.ebuild 1450 BLAKE2B 50212549f2a46310ca4cd7160d65a6efaf1a5648a6005c0783821c3be15f459d5a77d377815b2a53df3447f44482e1746acdaac4fea2dbdb992b695fe93c3285 SHA512 cfee3847a8925c5d37b6273896e759fc8cbd49302c31870d6124fe51d70b91d1d9414453c99345b09c6a308b6cde9151e8426d6524358d0ebb962b45260173a1
 MISC metadata.xml 321 BLAKE2B bc9b56ffe1106a5ba954a206111d3814e33cca82f2431c888f7c5da8c7b8314e3fcda78c6f96791cc33b6710ff8eb07ba38c14582e2f5a070ae10442d0ea03d0 SHA512 c5983cd105c9b0534371fae20648dc22d4d73440d2f1df3fdab3c84dc76d58fc951c31421cf9ac597fdef0067a53fcb54817a4a0c40b6cbf8c4dcfae8543c731
diff --git a/net-vpn/vtun/vtun-3.0.3-r1.ebuild b/net-vpn/vtun/vtun-3.0.3-r1.ebuild
index d56bcd52fbdb..48ca1ccaade8 100644
--- a/net-vpn/vtun/vtun-3.0.3-r1.ebuild
+++ b/net-vpn/vtun/vtun-3.0.3-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://vtun.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="ssl? ( dev-libs/openssl:0 )
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index a4536254ca01..27a3a9849f6b 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,4 +1,4 @@
-DIST WireGuard-0.0.20190702.tar.xz 327632 BLAKE2B 5a6ecb34e7f02507a2d97209c6210f01c8000644519f6b6532de5f50b7f2cd9d1534c2e5098bb1f5615ce08891b71e2d54b31b976808ad386cd0c99d1cd79c14 SHA512 8b92b51506cd3f8e9939378b86f23678e08e8501432decd0abf6a9d4e3dfe4742b6f1cb75e06407f5816778b3dd90849a5da83252ab882392ec1905dfb997501
-EBUILD wireguard-0.0.20190702.ebuild 5142 BLAKE2B 4d8631e7f3e819db7478096d3fbb733736b468780f91562f474c125a5a19281f69a9f46ff342b96160b7e393a9b0652cf4f4b00ae53932cd319092dd6b7ac3c0 SHA512 e1fb55d03036d9addbd2b20c71b4a2b26dabf825ab5957cbcc96c2a9ae3135ed7ea50dac0029f92d2cae7026d569bd744229a2d10780f2e8ac445dfb98d3c8d2
+DIST WireGuard-0.0.20190905.tar.xz 328440 BLAKE2B fce7c7ef367f88978af7253f979242ef46368e5b56d28c6e9ad4f5c89e2864711b49658e13b1379d8b4ee994b62071b14ed254bf439b8f3c8ceaed5546acfedf SHA512 25e74d1cce495dcec04341ba18214a916f38ba71d36cccba3237ac3b3a54c83eee9718a2d90213268fba6a236f5c6cd7b80a4ae8deef0ee99611b4ed3cb5ed31
+EBUILD wireguard-0.0.20190905.ebuild 5142 BLAKE2B 4d8631e7f3e819db7478096d3fbb733736b468780f91562f474c125a5a19281f69a9f46ff342b96160b7e393a9b0652cf4f4b00ae53932cd319092dd6b7ac3c0 SHA512 e1fb55d03036d9addbd2b20c71b4a2b26dabf825ab5957cbcc96c2a9ae3135ed7ea50dac0029f92d2cae7026d569bd744229a2d10780f2e8ac445dfb98d3c8d2
 EBUILD wireguard-9999.ebuild 4720 BLAKE2B 4de715d72ccd551ee68eeab051ff9905323fe57d475e6c17ad39542c3c50416d0ff6cfa27c994afe1edf6277bdbd6bab9b3351d74cfcae5921f24c2c93f0cb36 SHA512 e71251e953b6046149d69b1168af47e20ae705c3822f8c80542388571e8677ddfe299eb46808ec462c8a13764fc939eafe7f51dcfa0d7e3aca7c6e153ba14c7b
 MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/wireguard-0.0.20190702.ebuild b/net-vpn/wireguard/wireguard-0.0.20190905.ebuild
index e4113ef8fb96..e4113ef8fb96 100644
--- a/net-vpn/wireguard/wireguard-0.0.20190702.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20190905.ebuild
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 3536b359942e..dcf2362385e4 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index b4a97f33ae91..4e46a78ad875 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -1,6 +1,6 @@
 AUX broadcom-sta-6.30.223.141-eth-to-wlan.patch 395 BLAKE2B 80ee748c37774a85b5591601c81beca81ae2924a63bb76fbaa5914e9d2ff6344765ca1de334ae39af8f7e027af2da859512f4110d0b334e6b18d713186d20817 SHA512 1b340746e47edcc63cacf454fc44cd40ac34e526dacb026602e629b16030eeab0919456cadad7f93662291c1a0bea461c25471a7b71b7e9a1103f88e7d92be5d
 AUX broadcom-sta-6.30.223.141-gcc.patch 316 BLAKE2B 862f4c5a2284d5e2adb6d76c803d7fafe242ed3b69f526237ad231641c1160890ccbc4a8d2bc3e474176195d1bba6c68352afb47bcd619539b5b90fbbd8739e5 SHA512 a298ff51359da6fd5f47ca63e99babc778a95622687c205cca4244d16552fc697f46f90cadc93fc8e8d6674965b3641a0d22d35c5f14d6d86cf3215a71db6172
-AUX broadcom-sta-6.30.223.141-makefile.patch 497 BLAKE2B 17cf5baf3214ac5d75ad2918c74861b36e0ba56d757a2c5edb30599fa98be54b8fb7bdaf14b4339a0e6fbc748316c59a51319f8196454318b34fe85dec9aeba6 SHA512 f403669dede71f3c9f2886bfa535518a9e89a4398d1da7789ff955f15c493dd5ede1f304b0980c300c580ac1ae2464a4e395fb40b72dffa98a5a015c3e7d74c5
+AUX broadcom-sta-6.30.223.141-makefile.patch 497 BLAKE2B 49048dc09a76bf7bbb804d49415c3ae8a3b2d4236543a5940e7a1a22874f12a8ea8152dfc161d471edf0d5d71bdf111c6910c0ff98dc0350e3d66de4ceb28935 SHA512 31be005e4a2ed48e4d932ae902cd180e87167e3cc3d8892ea25e2cc3619a2843fbbfe769d0ef3cc11709841765aef5090185d49d98deffe14773dd5ca567218b
 AUX broadcom-sta-6.30.223.248-r3-Wno-date-time.patch 380 BLAKE2B d0398b0d856a1abb34e42f1ad2d1cfcf4c6203a82c251a40562c15ba46b1c8cd0a6cc1bedcdf576e02cc671b56f1f2da826dd0781df0308f7c8fac8387413293 SHA512 f1f96ac2b51be18bfdc4c3d627801cb14d024def92416434c3c0a9adb986e846f9ceb6087b5ab343d78ed87a3dda277818cb060534b44be62bf8f123bc6594fd
 AUX broadcom-sta-6.30.223.271-r1-linux-3.18.patch 326 BLAKE2B 9c7069c310983625ff1c8a956ea2e856e24c429791197b3e7e1131189fbf9e4b44e3e33cad672ffec44017779300bae3462b175399b1b4dcc2481f1f7b429d45 SHA512 bdc7f810bf01446e9752e664030e570396127a674b397ecd0001a0ff79103a891e5011975a819d3decfb8cc4dc90e7655621753c76ccc07bde99a2610f188587
 AUX broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch 408 BLAKE2B f7a01e470641b7a19cb649ceafe9c37d882dc2271fdec0e027919a8d3ed119663480a7eed645116b20b72f90cd96acc8c9e49afc570404ba51a36ef3697ca9c5 SHA512 d419d776bb8a0071250eb26d1e878639df35272dc47a8eb459f426356fadb0ab25779a90dd1317711c94549ec45f80b70fca9677c93c37cac829913120cc80d4
@@ -9,8 +9,9 @@ AUX broadcom-sta-6.30.223.271-r4-linux-4.12.patch 2320 BLAKE2B 9595273b57d76585f
 AUX broadcom-sta-6.30.223.271-r4-linux-4.15.patch 1343 BLAKE2B ca87ae817cefd6436da9ba827c2aa83fec0b7b1e0d837842d857fdba0ba88b52cfd8eec0beddfdb67f08870d6bc2f8f3d3d0bc0fdeeab8fe849eb704dfd8f8a2 SHA512 5558ee1b82f62250e64e3fe71b340698d48325f43bb774be00dc3557c3789b7180282082905e21cf97316b70fd6de5941521db198dd2b6396903ab31465f336b
 AUX broadcom-sta-6.30.223.271-r4-linux-4.7.patch 3897 BLAKE2B ecf3eb75f8eb3331b0a36b39851536de43cffd3b303db9e9f4fe6fe55d463c3343aba17a99668448427764a719e15e3e862d6a3dc0bc61cb68da9934fb427c6f SHA512 f61ecfb6b8c5a377c7a4da7549c9ec75677782fa2f97e64de0df1259e0ec3b993cfa3eaa4ff50331703ee18ef28f2af0d09839dd3b63ed994e6b29cbfe8ed73f
 AUX broadcom-sta-6.30.223.271-r4-linux-4.8.patch 1835 BLAKE2B 7e091ac44616ea4cfa80b3a5563f4c6a235d2431b911f6bc52074a76b2c1d609dc546430f048abf042f862907f573c6b1dfa24c8c424aeefe73ff13ae3f34900 SHA512 e5959921b6f0cd5d61d7ed568f549b0920f394458c28257c05064b89d7067ce11c8e44ed0e5a48a65bd041c6193d9ae2d02fca2f5efbfb787d3f9001786a4578
+AUX broadcom-sta-6.30.223.271-r5-linux-5.1.patch 829 BLAKE2B 7bb59009307d423e72832d14114b7e6bd016717ace260174b2b9dbc909ec7eb962aec88d930f34ee6c09165e937a2cc271eac7e6b214fe8161a8f76af1aaa83c SHA512 e8780fbff3ed0640b30b44ca777d56bdcf8b23702d4fa827c843919658f022090ca3e2533541f577e7b49133cb2bb3d6ec85bcc9c023a82bea892e231f01a550
 DIST README-broadcom-sta-6.30.223.271.txt 17216 BLAKE2B af6db6e129911d1589d7d6cb7166bee32ce1ca98a4e5c9b3515a44e48681d8a7a7a6b697419b2bcd9c46f0f4ca1f7ece632b63531b4a4ecd91df4f9dddf043c9 SHA512 672ecc5afcd8535a9f8beb4baea5a40c584b7682844e9ff0e4f66b7406b42118a99dce1fcd580118187fdc506781334b8243082def2b78dce916d90c55ab3663
 DIST hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz 2869247 BLAKE2B 2e3189c468cec50b1a980452a4b2bd0f9657d9adf6fae2a95a8b1c2d1df2f5f6beb4cb903f72f444eddf823fe4375299864cd62191c9d59c4f77598b5d3aa246 SHA512 0361ba30d97bcb1dedf46c11ef1b9a16f09cde3faa6be87b3ccc28679f34183c2fdf511e7c3b5c26b304f6961da454ccf71844b92bbb2f25aa876249496a2f1b
 DIST hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz 2928541 BLAKE2B e9d01c1a1a63c07f720e3ee53ee3ef634ab12694135300cb0ce47ade0e9e0084967a0b6df64d983e8184240eb3defb128f650bddb7727e901d50315307f3398a SHA512 6855781f7c69a9aecb9461932423688964879d5a4df571f01ae7adaa7bf21a410bef839605d555afb6c8f4eec92fe8510af6cb120930095617ff6cdcccedaf17
-EBUILD broadcom-sta-6.30.223.271-r4.ebuild 3762 BLAKE2B d9b88f48c6d2b02e86af439f9e998cfdccd12fc897f7859047a129a82be0edbaaf1d131c1380e87531d8b1ade41b0cb1af32927c302dade59634d75a3fe014b9 SHA512 b3f4413ac8cd1e664f08ff3e7ac49762551dc95685819ce42267078e0cdf7df4d44e30f964462498781447abb98d86124af986f43a004b129074c58f27087055
+EBUILD broadcom-sta-6.30.223.271-r5.ebuild 3763 BLAKE2B 923c9cf82aa607b7a980c2e8608cdba9ba7c2f1ed76da5f16f648e7a2f6e35e29d32c5264999c78c14b5984aed5bdfd6616d5d17b9988de61740cb443a880281 SHA512 b11a485700e3efb06c310a3b296414dce84ce248db166f8efb04254128e7efc5132ecdf4adcf11cb5c254701f590812a850de7d4c8aa0bca79284eeb514afd55
 MISC metadata.xml 333 BLAKE2B 0634d9cb768f942e912418540c980cfb5027423f9bde64faaa8ad0179a798fe98b0d93c3a5d259c74609acc213ddcd73addd3799671e5215cf636dd9d4429f45 SHA512 d792d7293edec312c9da7f4db8162cb415bfee561302d7523b3398132c31cd4dcf638e0c815c0046dea81b7de2642d31407b38a8612e04090e0f3ed608b202df
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.ebuild
deleted file mode 100644
index 95eeba5c4831..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r4.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
-inherit eutils linux-info linux-mod
-
-DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver"
-HOMEPAGE="https://www.broadcom.com/support/802.11"
-SRC_BASE="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35"
-SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
-	amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )
-	https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_${PV}.txt -> README-${P}.txt"
-
-LICENSE="Broadcom"
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="mirror"
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-MODULE_NAMES="wl(net/wireless)"
-MODULESD_WL_ALIASES=("wlan0 wl")
-
-pkg_pretend() {
-	ewarn
-	ewarn "If you are stuck using this unmaintained driver (likely in a MacBook),"
-	ewarn "you may be interested to know that a newer compatible wireless card"
-	ewarn "is supported by the in-tree brcmfmac driver. It has a model number "
-	ewarn "BCM943602CS and is for sale on the second hand market for less than "
-	ewarn "20 USD."
-	ewarn
-	ewarn "See https://wikidevi.com/wiki/Broadcom_Wireless_Adapters and"
-	ewarn "    https://wikidevi.com/wiki/Broadcom_BCM943602CS"
-	ewarn "for more information."
-	ewarn
-}
-
-pkg_setup() {
-	# bug #300570
-	# NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
-	# make checks non-fatal. The correct fix is blackisting ssb and, perhaps
-	# b43 via udev rules. Moreover, previous fix broke binpkgs support.
-	CONFIG_CHECK="~!B43 ~!BCMA ~!SSB ~!X86_INTEL_LPSS"
-	CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP"
-	ERROR_B43="B43: If you insist on building this, you must blacklist it!"
-	ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!"
-	ERROR_SSB="SSB: If you insist on building this, you must blacklist it!"
-	ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice."
-	ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!"
-	ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else."
-	ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA."
-	ERROR_X86_INTEL_LPSS="X86_INTEL_LPSS: Please disable it. The module does not work with it enabled."
-	if kernel_is ge 3 8 8; then
-		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT"
-	elif kernel_is ge 2 6 32; then
-		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211"
-	elif kernel_is ge 2 6 31; then
-		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211"
-	elif kernel_is ge 2 6 29; then
-		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT COMPAT_NET_DEV_OPS"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
-	fi
-
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
-	BUILD_TARGETS="wl.ko"
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \
-		"${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \
-		"${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \
-		"${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch" \
-		"${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch" \
-		"${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3-v2.patch" \
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.7.patch" \
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.8.patch" \
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.11.patch" \
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch" \
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.15.patch"
-
-	epatch_user
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc "${DISTDIR}/README-${P}.txt"
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild
new file mode 100644
index 000000000000..91581b52a4e4
--- /dev/null
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils linux-info linux-mod
+
+DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver"
+HOMEPAGE="https://www.broadcom.com/support/802.11"
+SRC_BASE="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35"
+SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
+	amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )
+	https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_${PV}.txt -> README-${P}.txt"
+
+LICENSE="Broadcom"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="mirror"
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+MODULE_NAMES="wl(net/wireless)"
+MODULESD_WL_ALIASES=("wlan0 wl")
+
+pkg_pretend() {
+	ewarn
+	ewarn "If you are stuck using this unmaintained driver (likely in a MacBook),"
+	ewarn "you may be interested to know that a newer compatible wireless card"
+	ewarn "is supported by the in-tree brcmfmac driver. It has a model number "
+	ewarn "BCM943602CS and is for sale on the second hand market for less than "
+	ewarn "20 USD."
+	ewarn
+	ewarn "See https://wikidevi.com/wiki/Broadcom_Wireless_Adapters and"
+	ewarn "    https://wikidevi.com/wiki/Broadcom_BCM943602CS"
+	ewarn "for more information."
+	ewarn
+}
+
+pkg_setup() {
+	# bug #300570
+	# NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
+	# make checks non-fatal. The correct fix is blackisting ssb and, perhaps
+	# b43 via udev rules. Moreover, previous fix broke binpkgs support.
+	CONFIG_CHECK="~!B43 ~!BCMA ~!SSB ~!X86_INTEL_LPSS"
+	CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP"
+	ERROR_B43="B43: If you insist on building this, you must blacklist it!"
+	ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!"
+	ERROR_SSB="SSB: If you insist on building this, you must blacklist it!"
+	ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice."
+	ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!"
+	ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else."
+	ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA."
+	ERROR_X86_INTEL_LPSS="X86_INTEL_LPSS: Please disable it. The module does not work with it enabled."
+	if kernel_is ge 3 8 8; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT"
+	elif kernel_is ge 2 6 32; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211"
+	elif kernel_is ge 2 6 31; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211"
+	elif kernel_is ge 2 6 29; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT COMPAT_NET_DEV_OPS"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
+	fi
+
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
+	BUILD_TARGETS="wl.ko"
+}
+
+PATCHES=(
+		"${FILESDIR}/${PN}-6.30.223.141-makefile.patch"
+		"${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch"
+		"${FILESDIR}/${PN}-6.30.223.141-gcc.patch"
+		"${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3-v2.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.7.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.8.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.11.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.15.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.1.patch"
+)
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc "${DISTDIR}/README-${P}.txt"
+}
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch
index 09c495d2a10f..d5b97fe87ebe 100644
--- a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2013-04-28 22:42:59.000000000 +0200
-+++ Makefile	2013-04-28 22:45:53.000000000 +0200
+--- a/Makefile	2013-04-28 22:42:59.000000000 +0200
++++ b/Makefile	2013-04-28 22:45:53.000000000 +0200
 @@ -128,9 +128,9 @@
  
  EXTRA_LDFLAGS      := $(src)/lib/wlc_hybrid.o_shipped
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.1.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.1.patch
new file mode 100644
index 000000000000..fcee46ea3d02
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r5-linux-5.1.patch
@@ -0,0 +1,29 @@
+From 20bb1a6da26c496572ee63d310cdf69a2f1553f8 Mon Sep 17 00:00:00 2001
+From: Seth Forshee <seth.forshee@canonical.com>
+Date: Fri, 17 May 2019 20:32:20 +0000
+Subject: [PATCH] add support for linux 5.1
+
+get_ds() was removed and replaced universally with KERNEL_DS.
+Provide a version of get_ds() to do likewise for 5.1 and later.
+
+Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
+---
+ src/include/linuxver.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/include/linuxver.h b/src/include/linuxver.h
+index b05bc32..2b88b30 100644
+--- a/src/include/linuxver.h
++++ b/src/include/linuxver.h
+@@ -591,4 +591,9 @@ do {									\
+ #define netdev_priv(dev) dev->priv
+ #endif 
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0))
++#include <linux/uaccess.h>
++#define get_ds() (KERNEL_DS)
++#endif
++
+ #endif 
+-- 
+2.20.1
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index f64d86ee9512..e0e597534af0 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -2,5 +2,5 @@ AUX csete-iio.patch 18603 BLAKE2B 437bc8318e88090012cfc98a1b5910ade54b191abb6cb9
 DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B 223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda SHA512 8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28
 EBUILD gr-osmosdr-0.1.4_p20180626-r4.ebuild 2081 BLAKE2B 923ad7b4a1b152948b37d11af00358e328527cf49212c931ee8a8aed04284391e8b672bd82191db4055eea946628575ad88ba3ebc8b23f04355a6d7639b21426 SHA512 a58dde517573c804a3b847b82669cc2931aaaec442008cf79ade344c84fbe9d91cd2adc9f2f71c94ea7c59c201cf7c58af5d112a96cb2ef8f2deeb378cb291d4
 EBUILD gr-osmosdr-0.1.4_p20180626-r5.ebuild 2210 BLAKE2B fc07ded75c0df5c1d68917d199f326cc464478466d5436b4ed07fabe9113d3683400b3bb610b691a6533f97eb7f58b99cf1b6ea76e662829128fff24f28fe196 SHA512 42d10d5fc4bba9e7f5790ee6a50476b959e28f7c7079d4b48bdb41e994de11989f6e97c950739fd430a4e75a0536ceb6cf0f9ead335467c186eddff87250d179
-EBUILD gr-osmosdr-9999.ebuild 2081 BLAKE2B 07d45fa701bde6b687139a68af7500b3d582fecea5e2a083d82e4e995c9bfdb6fcefcf7cf043c7ee9520cc5ac6ebbd000c6d106446fc63933813befdcd0837af SHA512 5b9e6dbfa918117698ddf622f71a62868214e5dee06146b371724026b2c6c2c3134a547dea03d75bb1b050b7d6004a08aeca2bf0460dc6bda0dd8f1dfe76cb66
+EBUILD gr-osmosdr-9999.ebuild 2081 BLAKE2B 923ad7b4a1b152948b37d11af00358e328527cf49212c931ee8a8aed04284391e8b672bd82191db4055eea946628575ad88ba3ebc8b23f04355a6d7639b21426 SHA512 a58dde517573c804a3b847b82669cc2931aaaec442008cf79ade344c84fbe9d91cd2adc9f2f71c94ea7c59c201cf7c58af5d112a96cb2ef8f2deeb378cb291d4
 MISC metadata.xml 1010 BLAKE2B e4f3fbd3eb67c98876fb8df6db5d809011a8cf120134cb34ed63254b328e15914e696c80c848313c296c43cca71d0c61feb6788effacce30862d982ff6cf8975 SHA512 7144c3e40a28dc0e684f236ec7c70269a7734b3ca55df89f159e803904a43883563b8efb3b1bbc8f3f6eb96bf1c18040df4b1528f5bf1a674f8e8d875dbd69d3
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index 2e7d5bdcee77..67f6413233c9 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-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
@@ -34,7 +34,7 @@ RDEPEND="${PYTHON_DEPS}
 	hackrf? ( net-libs/libhackrf:= )
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
-	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 499d4f730e02..cc74e57e67ca 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -2,6 +2,6 @@ DIST hostapd-2.8.tar.gz 2169018 BLAKE2B 29e331d8ebb52732d2548734fe9ea55d8401826d
 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1a2222c9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01 SHA512 66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c
 EBUILD hostapd-2.8.ebuild 6682 BLAKE2B f7b0f129334d7d784f89de6fbcc2086f347ad740ba2daec570f721c109871239cbf6fd4f2d894d358b128cc497d368046aa05a6e0a6705f7ba79d5ca98a69416 SHA512 e23c2e753f91b69da5e4b5fa49b9683c92c8df5af17f5d457f2e8639fb0cee1f96490a81d914d592dc3fb74ad61d0e79528045edb401d33c8828045ebc4f7e08
-EBUILD hostapd-2.9.ebuild 6687 BLAKE2B d9c80e418f9f19e44afe890ab9251ea0b3eba6e4c852ba2bb25ad17466801de9c4e52f960f3baa13be1b3de49a7cb7188ca9c23fe1b2128fdbd74e2e6a9e03f0 SHA512 f8f78876354cd9501d4260309b526c61c1e2d6b501f27fd539ff50a6c651f5fbf482be730360fffd4c8d168096349e15053eb8d21939f7dc5c4e33568af2b5ea
+EBUILD hostapd-2.9.ebuild 6683 BLAKE2B ae53db361d4e846f2c1f08960235d69dda3d4162c9a261fa144dcb623751c9dec68285d00821e40afa707cffc08fc2474d47f7e28fee4fb1dc01425237a21571 SHA512 7912df1d03950951f7c5b80eaa262717939ac6347ecb0becf3e71bd81aa891a57ad16dec174c86d8a34cc2e5253d27cb9f7e4beb42887f784b9d05f733d484ee
 EBUILD hostapd-9999.ebuild 6687 BLAKE2B d9c80e418f9f19e44afe890ab9251ea0b3eba6e4c852ba2bb25ad17466801de9c4e52f960f3baa13be1b3de49a7cb7188ca9c23fe1b2128fdbd74e2e6a9e03f0 SHA512 f8f78876354cd9501d4260309b526c61c1e2d6b501f27fd539ff50a6c651f5fbf482be730360fffd4c8d168096349e15053eb8d21939f7dc5c4e33568af2b5ea
 MISC metadata.xml 973 BLAKE2B 009e9b39aa6c7d1d6da4421ec1d0c4610a64b136b497f92dc5a822ab54449720cfacb9ce898fc2015cdcf741939acb46aa8797e13c80079ce424f5f6bfbde8be SHA512 19a5d72d11eee955856bde7065a784d1942b2c55adbb154e1af432c693763beedb1541d119ba6c0d7b5e2f37e13a3aa915b13def6c9ee651b6f4f7f8e85a57e5
diff --git a/net-wireless/hostapd/hostapd-2.9.ebuild b/net-wireless/hostapd/hostapd-2.9.ebuild
index 382256f224b1..425e0b513fa2 100644
--- a/net-wireless/hostapd/hostapd-2.9.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9.ebuild
@@ -21,7 +21,7 @@ else
 		SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
 	fi
 	# Never stabilize snapshot ebuilds please
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index f81b1fc3ea74..fe16f0f2b5cd 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -3,8 +3,10 @@ AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600
 DIST iwd-0.17.tar.xz 720500 BLAKE2B 8bd931421663b71eb7bbdc4a72e10fe325ede4a3d075a8d477ee80040f23d3a8645f1c8c24f8c5f3e615049273968ea48687bcbc5480d05af3aabf135d0e7118 SHA512 fcec43cb9d470dec783fcafd8485e2e25f7c5ccc4283bc58c299fb816609b4e03ca241f1fe9f73025a08863e89ae8d7b7ceb6ae02524eb681a61079c5a28534a
 DIST iwd-0.18.tar.xz 738168 BLAKE2B b37bde01952542583d82439639c39c06a1a5b6c359bbd092e631be6d25975498eb9bad9f71f3eeaa4b571e9d195e6f1113b17f758f386d49e6ee2d2cf071387f SHA512 0eb5558f7bafe521aaf80f24e5818c1fb0dfa6445c671c4454d3a4f67f97643a1232709b1e9c376cbe09dd7ba521651e1e46328cce0bfe1befe15668d6081cd6
 DIST iwd-0.19.tar.xz 777952 BLAKE2B 6a3bc23c7260b6b199920275f83b89556df8557371920cd6537ef9456c057d52b8ebe4e97429da950304299dcff964118a163f913144b0204b99c11d1f7c7f52 SHA512 72be037974664260ba570affbb400b8261d1f7923877a9b03fd748ac1527c885f96fd70c8305300d81918a232a08ec7d71866bb3b9c4c86ac03b0b77fce85ade
+DIST iwd-0.20.tar.xz 785400 BLAKE2B ce918c328ae5247a5a66ad7db8d4f1e7ea505aca2a69c3676b31f92d668bd64c1dd02fe5b91818668c017836a639f02eb8cf9e47e3e6554806a33dcef3ce2e6c SHA512 acfe77e96b4658c6efbfe1bab460593e2e15c9d54244deb1dd6e6bc0ec5bab7c0760257dda7b1218338b103daa9b5a422d48d7f5ae50a631bc46669bf14f8fcd
 EBUILD iwd-0.17.ebuild 2861 BLAKE2B c5e1d4a9828a20c30d45434d88b72ffce6598a000e005b6273a61d6d7d714667167501030ac67509a58363e4976b7cdcb0cdecde04cf596145ffbba657f1cead SHA512 fb1341de4cf116a5cbbc3f20cd7fa6b83b905564a60b5dd23fefd7b07f2d738c4c1d45a6206a812bbfd1fc9c2d3f3cd6305810ccfc8e27977b06a0a683cd74b2
 EBUILD iwd-0.18.ebuild 3824 BLAKE2B e57d63f2e912b3a635f25ca037a7e0de7381791beb724b5310f1701a9e4c78a73496bdd37499b916dc4b1bb4014f1b19f43ffa20e7796c298459d7203f077e78 SHA512 9baa2641f25c8e14be96e2ef7c3b9732f4bd256a96a045eff0d9e1e9e1dddfff6a31ea8a1f5ff14e9445a7daf6134db28cef7331f77f354415694647574d9331
 EBUILD iwd-0.19.ebuild 3824 BLAKE2B 13e4dc44709040109e67ba7662044d08871638a727cf4a6ed8af2fbd08d7b72620d210aee4410dff4f04b8f1921e723a27d57b10e948da33fde936c30ff94e44 SHA512 fb99fefd03c479713054329419fad912a48410f629a95e30b61a745f1ea839ca9c64dbb2f0c1f854b9b6440d9ba5a586897e9019e880f5356a903ac5ba39dfde
+EBUILD iwd-0.20.ebuild 3824 BLAKE2B fc62158d4ef186af69f2f32bfa6221a95e79cf7bbdcce33cfb5865af6940d305f76d4fa724a96ebc0f2face192cbb5eb80ed23769e96f9a0128b1e14b6744b35 SHA512 cede9d8c5a8a64192877ad189ccf312367891362f1212abed82edf272a84750696390018395079128c79a1b79db4035693bcf0d7ee8fab9805a2d583661439c6
 EBUILD iwd-9999.ebuild 3824 BLAKE2B 13e4dc44709040109e67ba7662044d08871638a727cf4a6ed8af2fbd08d7b72620d210aee4410dff4f04b8f1921e723a27d57b10e948da33fde936c30ff94e44 SHA512 fb99fefd03c479713054329419fad912a48410f629a95e30b61a745f1ea839ca9c64dbb2f0c1f854b9b6440d9ba5a586897e9019e880f5356a903ac5ba39dfde
 MISC metadata.xml 623 BLAKE2B 59adc818adaf90dcb719531a1fde1507d2fb5f3ef33ad7f45ce39876e0e008cd2dc931da58c6d4092c1c57ebc8bfed704a0a7acf92548620c009202e274e76d7 SHA512 3253bfe989a6393d984fb25db1eb1576c670dde4af9aa1b6a4e34673a493b4869f70d1cb1bb502e2d28be8cf15dc595e5e594b7c988752aa9405b0b680a3273b
diff --git a/net-wireless/iwd/iwd-0.20.ebuild b/net-wireless/iwd/iwd-0.20.ebuild
new file mode 100644
index 000000000000..17cedb0dd7fb
--- /dev/null
+++ b/net-wireless/iwd/iwd-0.20.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic linux-info systemd
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
+
+RDEPEND=">=dev-libs/ell-0.22
+	net-wireless/wireless-regdb
+	sys-apps/dbus
+	client? ( sys-libs/readline:0= )
+	crda? ( net-wireless/crda )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CFG80211
+		~CRYPTO_AES
+		~CRYPTO_ARC4
+		~CRYPTO_CBC
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
+		~KEY_DH_OPERATIONS
+		~PKCS7_MESSAGE_PARSER
+		~X509_CERTIFICATE_PARSER
+	"
+	if use crda;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3 && use amd64; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	if use kernel_linux && kernel_is -ge 4 20; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
+	fi
+
+	check_extra_config
+
+	if ! use crda; then
+		if [[ $(getfilevar CONFIG_CFG80211 /usr/src/linux/.config) == y ]] \
+			&& [[ $(getfilevar CONFIG_EXTRA_FIRMWARE /usr/src/linux/.config) != *regulatory.db* ]]
+		then
+			ewarn ""
+			ewarn "REGULATORY DOMAIN PROBLEM:"
+			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+			ewarn ""
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags "-fsigned-char"
+	econf --sysconfdir=/etc/iwd --localstatedir=/var \
+		$(use_enable client) \
+		$(use_enable monitor) \
+		$(use_enable ofono) \
+		$(use_enable wired) \
+		--enable-external-ell \
+		--enable-systemd-service \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
+		--with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d)
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd" iwd
+
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
+	if [[ ${PV} == "9999" ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+}
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index fb5b7f9ae628..45331b6f70d2 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -5,8 +5,8 @@ AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e
 AUX kismet.initd-r2 495 BLAKE2B 6d495c1fe5582921a67acf411fc65f6f3b3d832017e9354e09a3b39b8af67193e519a9da838cd26e80e80a6e145cde879089adb56ea34810a2d42c588fac7d28 SHA512 4066adc3b5ae455fb1305f4d5ac71604e90b2e1e6210fef10036229f4917dbf40dd8853f8e9dc2accc1457e4fd95f28f13ba39b56e066df365d7d186b3ea25b6
 AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
-DIST kismet-2019-08-R1.tar.xz 3030764 BLAKE2B bf9db5d7a35c3426832def9c1f974644f325a6714084b1dc2fabdf7b8155d767419683a39ce34f390dc8c9de2adf047d1f8016b9b48a789765294ec4aed0ea2f SHA512 2a512af192e153fbc361fdb0e83c40feb98c4905bf6556010191d04e5f2c5d290c0545f756b67100a63de6bc2995c9e15b56f5ca38fd1220031c25d87a27db7a
+DIST kismet-2019-09-R1.tar.xz 3034832 BLAKE2B 9f7818549e5260dc081ac39ea8323c70f2e4d0b959bc42dacc253c9d72bf72c2547f7c6d65d84ee7d0ca4a41068f5973028e48f6f9f3c5a7cd50c35246570814 SHA512 eeaf069718206f2b6d292c41792217afc9c72c10ffa014c8c670de64195bd28d44f33364dba7d338610f17a5af2be3c125ccd1297cce362159a4968c9ddabb88
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
-EBUILD kismet-2019.08.1.ebuild 4695 BLAKE2B f273b1ff7cf27c004ccce1d9bfd3ee6caaecf357c01e204e0339c63af38e6bd257b2446c2e5f724bbee24ba6388144e7fa9adcd015392f115fd2a94cf4ce93ca SHA512 80565d91f1995862a85aed1641ce8bc3312dee621c532bbdcf4a5e7d76b6aba2ba8f90f994e26b2456612a078dcf9a43c8fd1a4824d07cb83953035dec83d9d2
-EBUILD kismet-9999.ebuild 4695 BLAKE2B f273b1ff7cf27c004ccce1d9bfd3ee6caaecf357c01e204e0339c63af38e6bd257b2446c2e5f724bbee24ba6388144e7fa9adcd015392f115fd2a94cf4ce93ca SHA512 80565d91f1995862a85aed1641ce8bc3312dee621c532bbdcf4a5e7d76b6aba2ba8f90f994e26b2456612a078dcf9a43c8fd1a4824d07cb83953035dec83d9d2
+EBUILD kismet-2019.09.1.ebuild 4694 BLAKE2B 5203e6f7cc6149e1272f97155aa62b157c8ecded4ff86c76f12ff4f0c5912b0f09ed361f7d265b89601c8a2c9cfcc4026f43ce785b4a8697ccc5fc8fe6d4b709 SHA512 438d2ea946ece4ba71cc60927f93da3f86e9fb91f7da70fbd3f13aade8b95b5f5982aa9930a626ed933fa9234bef719bee90506c66170bb8bced2faae35c13e6
+EBUILD kismet-9999.ebuild 4694 BLAKE2B 5203e6f7cc6149e1272f97155aa62b157c8ecded4ff86c76f12ff4f0c5912b0f09ed361f7d265b89601c8a2c9cfcc4026f43ce785b4a8697ccc5fc8fe6d4b709 SHA512 438d2ea946ece4ba71cc60927f93da3f86e9fb91f7da70fbd3f13aade8b95b5f5982aa9930a626ed933fa9234bef719bee90506c66170bb8bced2faae35c13e6
 MISC metadata.xml 1259 BLAKE2B c9c91a87613a3126a81c28e768dbcf37422e04c8679d991ed2149361bf07d43a1dc17e5eaffebbb77bb9e92f2fd316192745e8b3cde04729db12b7dbefd33d26 SHA512 777ea0bad8a04dc4ac303eee0006692aa0107a7c38322b890565fab59288d84932b531145445623af1fa594b762aec627dd00f659b90f1fb595d7b49f6ab20a0
diff --git a/net-wireless/kismet/kismet-2019.08.1.ebuild b/net-wireless/kismet/kismet-2019.08.1.ebuild
deleted file mode 100644
index 470ff2ccffa2..000000000000
--- a/net-wireless/kismet/kismet-2019.08.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools eutils multilib user python-single-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
-	inherit git-r3
-	RESTRICT="strip"
-else
-	MY_P=${P/\./-}
-	MY_P=${MY_P/_beta/-BETA}
-	MY_P=${MY_P/./-R}
-	S=${WORKDIR}/${MY_P/BETA/beta}
-
-	#normally we want an official release
-	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
-
-	#but sometimes we want a git commit
-	#COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
-	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}/${PN}-${COMMIT}"
-
-	KEYWORDS="amd64 arm ~arm64 ~ppc x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="https://www.kismetwireless.net"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-CDEPEND="
-	${PYTHON_DEPS}
-	networkmanager? ( net-misc/networkmanager:= )
-	dev-libs/glib:=
-	dev-libs/elfutils:=
-	sys-libs/zlib:=
-	dev-db/sqlite:=
-	net-libs/libmicrohttpd
-	kernel_linux? ( sys-libs/libcap
-			dev-libs/libnl:3
-			net-libs/libpcap
-			)
-	mousejack? ( dev-libs/libusb:= )
-	dev-libs/protobuf-c:=
-	dev-libs/protobuf:=
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	sys-libs/ncurses:=
-	lm_sensors? ( sys-apps/lm_sensors )
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	selinux? ( sec-policy/selinux-kismet )
-"
-
-src_prepare() {
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet_logging.conf || die
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
-
-	eapply_user
-
-	#just use set to fix setup.py
-	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-
-	if [ "${PV}" = "9999" ]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable pcre) \
-		$(use_enable lm_sensors lmsensors) \
-		$(use_enable mousejack libusb) \
-		$(use_enable networkmanager libnm) \
-		--sysconfdir=/etc/kismet \
-		--disable-optimization
-}
-
-src_install() {
-	emake DESTDIR="${D}" commoninstall
-	emake DESTDIR="${D}" forceconfigs
-
-	insinto /usr/share/${PN}
-	doins Makefile.inc
-
-	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
-	dodoc CHANGELOG README*
-	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
-	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
-}
-
-pkg_preinst() {
-	if use suid; then
-		enewgroup kismet
-		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
-		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
-		fowners root:kismet /usr/bin/kismet_cap_pcapfile
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
-		fperms 4550 /usr/bin/kismet_cap_linux_wifi
-		fperms 4550 /usr/bin/kismet_cap_pcapfile
-		elog "Kismet has been installed with a setuid-root helper binary"
-		elog "to enable minimal-root operation.  Users need to be part of"
-		elog "the 'kismet' group to perform captures from physical devices."
-	fi
-	if ! use suid; then
-		ewarn "It is highly discouraged to run a sniffer as root,"
-		ewarn "Please consider enabling the suid use flag and adding"
-		ewarn "your user to the kismet group."
-	fi
-}
-
-migrate_config() {
-	einfo "Kismet Configuration files are now read from /etc/kismet/"
-	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then
-		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
-		ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
-	fi
-	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
-		mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
-		ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
-	elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
-		ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
-		ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${REPLACING_VERSIONS}" ]; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test ${v} -lt 2019.07.2 ; then
-				migrate_config
-				break
-			fi
-			if ver_test ${v} -eq 9999 ; then
-				migrate_config
-				break
-			fi
-		done
-	fi
-}
diff --git a/net-wireless/kismet/kismet-2019.09.1.ebuild b/net-wireless/kismet/kismet-2019.09.1.ebuild
new file mode 100644
index 000000000000..f6b223f22b1e
--- /dev/null
+++ b/net-wireless/kismet/kismet-2019.09.1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit autotools eutils multilib user python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
+	inherit git-r3
+	RESTRICT="strip"
+else
+	MY_P=${P/\./-}
+	MY_P=${MY_P/_beta/-BETA}
+	MY_P=${MY_P/./-R}
+	S=${WORKDIR}/${MY_P/BETA/beta}
+
+	#normally we want an official release
+	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
+
+	#but sometimes we want a git commit
+	#COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
+	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86"
+fi
+
+DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
+HOMEPAGE="https://www.kismetwireless.net"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+CDEPEND="
+	${PYTHON_DEPS}
+	networkmanager? ( net-misc/networkmanager:= )
+	dev-libs/glib:=
+	dev-libs/elfutils:=
+	sys-libs/zlib:=
+	dev-db/sqlite:=
+	net-libs/libmicrohttpd
+	kernel_linux? ( sys-libs/libcap
+			dev-libs/libnl:3
+			net-libs/libpcap
+			)
+	mousejack? ( virtual/libusb:1 )
+	dev-libs/protobuf-c:=
+	dev-libs/protobuf:=
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	sys-libs/ncurses:=
+	lm_sensors? ( sys-apps/lm_sensors )
+	pcre? ( dev-libs/libpcre )
+	suid? ( sys-libs/libcap )
+	"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	selinux? ( sec-policy/selinux-kismet )
+"
+
+src_prepare() {
+	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+		conf/kismet_logging.conf || die
+
+	# Don't strip and set correct mangrp
+	sed -i -e 's| -s||g' \
+		-e 's|@mangrp@|root|g' Makefile.in
+
+	eapply_user
+
+	#just use set to fix setup.py
+	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+
+	if [ "${PV}" = "9999" ]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable pcre) \
+		$(use_enable lm_sensors lmsensors) \
+		$(use_enable mousejack libusb) \
+		$(use_enable networkmanager libnm) \
+		--sysconfdir=/etc/kismet \
+		--disable-optimization
+}
+
+src_install() {
+	emake DESTDIR="${D}" commoninstall
+	emake DESTDIR="${D}" forceconfigs
+
+	insinto /usr/share/${PN}
+	doins Makefile.inc
+
+	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
+	dodoc CHANGELOG README*
+	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
+	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
+}
+
+pkg_preinst() {
+	if use suid; then
+		enewgroup kismet
+		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
+		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
+		fowners root:kismet /usr/bin/kismet_cap_pcapfile
+		# Need to set the permissions after chowning.
+		# See chown(2)
+		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
+		fperms 4550 /usr/bin/kismet_cap_linux_wifi
+		fperms 4550 /usr/bin/kismet_cap_pcapfile
+		elog "Kismet has been installed with a setuid-root helper binary"
+		elog "to enable minimal-root operation.  Users need to be part of"
+		elog "the 'kismet' group to perform captures from physical devices."
+	fi
+	if ! use suid; then
+		ewarn "It is highly discouraged to run a sniffer as root,"
+		ewarn "Please consider enabling the suid use flag and adding"
+		ewarn "your user to the kismet group."
+	fi
+}
+
+migrate_config() {
+	einfo "Kismet Configuration files are now read from /etc/kismet/"
+	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then
+		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
+		ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
+	fi
+	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
+		ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
+	elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
+		ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${REPLACING_VERSIONS}" ]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test ${v} -lt 2019.07.2 ; then
+				migrate_config
+				break
+			fi
+			if ver_test ${v} -eq 9999 ; then
+				migrate_config
+				break
+			fi
+		done
+	fi
+}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 470ff2ccffa2..f6b223f22b1e 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -48,7 +48,7 @@ CDEPEND="
 			dev-libs/libnl:3
 			net-libs/libpcap
 			)
-	mousejack? ( dev-libs/libusb:= )
+	mousejack? ( virtual/libusb:1 )
 	dev-libs/protobuf-c:=
 	dev-libs/protobuf:=
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
diff --git a/net-wireless/limesuite/Manifest b/net-wireless/limesuite/Manifest
new file mode 100644
index 000000000000..0a82642dccc2
--- /dev/null
+++ b/net-wireless/limesuite/Manifest
@@ -0,0 +1,3 @@
+DIST limesuite-19.04.0.tar.gz 5357563 BLAKE2B ac4f97b564968e2e1aca076cbb97d2cd77067c405fbe90e1453be864dd4083cf087363c708d9b3f130c8bad150ad878eb4c648809c2364fef0e669650319d66e SHA512 6e416cee91bd27fe5ac11838fe6a67d1f6d6a790a5844d6bddd79ed7433b65c401aa88cf45f9977af862b8e35bd3caf79d3d3c2e639ab993bbb8e0127a97a598
+EBUILD limesuite-19.04.0.ebuild 671 BLAKE2B 8f71beaf4b05873f415e920e91ab0f3f83a8abc8bb1b900b079fb71f57b2a4f06bbce84e963782001f7561c70d2d9a2f28861aec0a1bb518ad4e0d00a5f96dbb SHA512 b78176df0e239ad4bd122f98c0886e88fb47eb5ab17a60e4e1c17afc5c6bb9c01982fb27098effe7fa2343393c73b01df0816b092e9396e40843ec1aaf2591b9
+MISC metadata.xml 321 BLAKE2B 6a85652610982612b0b382399aa28996e73cb6c22cbfbe967f9b7ded6b5d272afdcee031e122fc366d8aa782787d7bd25ab3abcb46b169c06d707a70585a417d SHA512 377adb3770c63556750c641012945bd22d3f4266506c8e198d267d3445bec302ea7993788b50043d94e02ea7dc48fdb6b62c57ab06ec57fc195917e62bcf8d02
diff --git a/net-wireless/limesuite/limesuite-19.04.0.ebuild b/net-wireless/limesuite/limesuite-19.04.0.ebuild
new file mode 100644
index 000000000000..45c0f916b3e4
--- /dev/null
+++ b/net-wireless/limesuite/limesuite-19.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake-utils wxwidgets
+
+DESCRIPTION="Driver and GUI for LMS7002M-based SDR platforms"
+HOMEPAGE="https://myriadrf.org/projects/component/limesdr/"
+SRC_URI="https://github.com/myriadrf/LimeSuite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/LimeSuite-${PV}"
+
+DEPEND="x11-libs/fltk
+	x11-libs/wxGTK:${WX_GTK_VER}
+	net-wireless/soapysdr:=
+	virtual/opengl
+	virtual/libusb:1"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_configure() {
+	setup-wxwidgets
+	cmake-utils_src_configure
+}
diff --git a/net-wireless/limesuite/metadata.xml b/net-wireless/limesuite/metadata.xml
new file mode 100644
index 000000000000..ce3eca15bcc5
--- /dev/null
+++ b/net-wireless/limesuite/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">myriadrf/LimeSuite</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/linssid/Manifest b/net-wireless/linssid/Manifest
index 5db57c007775..2d089daa5f92 100644
--- a/net-wireless/linssid/Manifest
+++ b/net-wireless/linssid/Manifest
@@ -1,3 +1,3 @@
 DIST linssid_3.6.orig.tar.gz 397541 BLAKE2B 35d56cc9439a3a117200c59a03dad3a53bbecbe522a5592ba4cd6a5d37332c4b8c6ec065b7357643bda6b7b54462d720e3ee0b3efcb5a80e14c809330d84fc2b SHA512 066c890776a23d0e5fe8518826c64edc4b7d6dcef28cd7ce58f842e52b9e2b13517358ca6df636613abd1e860b20c6b542b5df165de1aa262e1e7db8a60e00e5
-EBUILD linssid-3.6-r1.ebuild 1089 BLAKE2B b8bdfb107fe2c6a85c2eea73e7779a001c099933d765790555d97693dcee92abc3e9947150b89c23043fed012d06c260b5ff979408c908c0515f1483617b78a0 SHA512 1e47da1bd43931e7ae84be5ec174c074c06ad3c567a0402974c68d92d713f7bdddd3fb209fd878d217f36084f159147c442852cf3964e7ede00d6a6b20cc4aa7
+EBUILD linssid-3.6-r1.ebuild 1088 BLAKE2B 23cb66317aa3688f69d9151961de15f34b65dd90389d6a7c0a9288c3276e4ceb521c95605c31f435e240ce5f547aa1d10dc9b943d6a87cb600b26f126f6168ab SHA512 8c083191d5505aae46e083681d86f5f367a253bb45d01d7a0810fc9673e8e50a1e3ac8153291dc93082fdffafb3d37473039609e2ef7e6d46c7e730480604089
 MISC metadata.xml 870 BLAKE2B b769f54c91d56f89b67f1375f07eb9c7f72a80db1a05cf7998b83488204a4c07011aee881c3503ea0bdc60930a595c57301a01bb866ef46bc928e4d46a076815 SHA512 2f1248f1540ef58073808c08a87b3e813e2a50af2624f9230618626f3efc5a3f5719d4792e0c391d2fc1aa95770366cf510c9fd36689008ca1f8e0369763ed8e
diff --git a/net-wireless/linssid/linssid-3.6-r1.ebuild b/net-wireless/linssid/linssid-3.6-r1.ebuild
index 8c9e2377c9ef..f12ac63ff47b 100644
--- a/net-wireless/linssid/linssid-3.6-r1.ebuild
+++ b/net-wireless/linssid/linssid-3.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-libs/boost:=
diff --git a/net-wireless/multimode/Manifest b/net-wireless/multimode/Manifest
index ea831966c212..e6d93df0e08b 100644
--- a/net-wireless/multimode/Manifest
+++ b/net-wireless/multimode/Manifest
@@ -1,4 +1,4 @@
 DIST multimode-1.4_p20140831.tar.xz 7648 BLAKE2B 1efec8c12e46b63f5501f1cf28f2e1f57d378c578656ecae771f0b98b873bbc1f119652a9f4607c9c0f3c5f3ca4f7109c48509f8339a1b22b8e3ef2af7214407 SHA512 891428e6c049cfd94787bd7580a59b3a9eb488dbf97cd21a1d82be04648e5423c3ce73983d38c5a3c280519ebea73c9572e9b0cdc7df453114e6aa220a58eaff
-EBUILD multimode-1.4_p20140831-r1.ebuild 1038 BLAKE2B 3e6e0f1e9214dbc579e3c7bcf15d4bf22f5b343ab2d3dd04a774a3bd4744122fa68b38de3dfdf524391ee3fd55a07b391e4e9aa7ef198d4818d2ec9cf4059be6 SHA512 423f747ab12262ec97f97480ea221cf9a0fd8753e65f45e8430ec8c9752b0d8cd9e77aaf13c816c9360b955a2f28fd456d9a64de0ca9ded0590ead45e82b554b
-EBUILD multimode-9999.ebuild 1036 BLAKE2B 3b8c895ee1bb0c65956c372bcc1d5576d6e62b7cc546fb5064a0de695178f23350404a1d55b7da4ca19c687d6fb54ebbd86e4d978ee66593a7fbffdbc8e49dfb SHA512 72376982be361641b8764da6c85f54253627c2319e18064d6fda6123c1a7ad38308b2b140897805799d4b7142d6827c2bb33b5798a43febf6f250532b3f17d20
+EBUILD multimode-1.4_p20140831-r1.ebuild 1014 BLAKE2B 26fe4ac18b123cf0dbf83bfd2428d490d6d23db486ef0036311842e9fb56a9bc324bc8f3cb3e70caac5b9098f550480cb827f5e42a9ecc0d0e83ad7263c51d89 SHA512 87a27c09ea6bb831581127ecb9261b848aac1f74ead76e4f2f1149ca15b8fcb1eb6d06e89831b0431ff2e4787b71a5eb901ecec5fac1ccd942a7b913d9afef52
+EBUILD multimode-9999.ebuild 1012 BLAKE2B e1e426b5a3cfd57fc09d1578a4588c9abe7babb06cacdfde47732294b31e0d51d0bd585e871a36a58a95a2b6db21abc8e0a6b1819327333529bc163193ad1169 SHA512 4ca89c3de9a95dd830f7f3b9cd5f0403bd8f787497654de9a7ac8e6ea8b81f4eebb35466cd6abe0d1534a32517b61a729af457ba7266ab0a2e7384686787a6cb
 MISC metadata.xml 338 BLAKE2B d8dd443fa026ba6b7343fe067de88b467663e1e5a77904a32df6ee64bc3128341fcd48c52a99103229180005cc9a007dd7c7ec33e3c136835185ec68a03bc0ce SHA512 de41f6b74153a345fca1448cb9dcbd391acfcfbdc784d3359a96c6c099897aa65ecc58f84e09e872772274afd74a0ba15ef06be8a4492e7e89f43f70f6ba090f
diff --git a/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild b/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild
index b8a3b0feeac2..b57130054c5c 100644
--- a/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild
+++ b/net-wireless/multimode/multimode-1.4_p20140831-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
@@ -35,8 +35,7 @@ src_compile() {
 
 src_install() {
 	newbin ${PN}.py ${PN}
-	insinto $(python_get_sitedir)
-	doins ${PN}_helper.py
+	python_domodule ${PN}_helper.py
 	insinto /usr/share/${PN}
 	doins ${PN}.grc
 	python_fix_shebang "${ED}"/usr/bin
diff --git a/net-wireless/multimode/multimode-9999.ebuild b/net-wireless/multimode/multimode-9999.ebuild
index b6713c20413e..8de909cb3401 100644
--- a/net-wireless/multimode/multimode-9999.ebuild
+++ b/net-wireless/multimode/multimode-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=5
@@ -35,8 +35,7 @@ src_compile() {
 
 src_install() {
 	newbin ${PN}.py ${PN}
-	insinto $(python_get_sitedir)
-	doins ${PN}_helper.py
+	python_domodule ${PN}_helper.py
 	insinto /usr/share/${PN}
 	doins ${PN}.grc
 	python_fix_shebang "${ED}"/usr/bin
diff --git a/net-wireless/soapybladerf/Manifest b/net-wireless/soapybladerf/Manifest
index 8cf54a11c4bb..a5f096c9f789 100644
--- a/net-wireless/soapybladerf/Manifest
+++ b/net-wireless/soapybladerf/Manifest
@@ -1,6 +1,4 @@
-DIST soapybladerf-0.3.5_p20180908.tar.gz 29426 BLAKE2B 0e6830e2c930178d995c104f22df6a6104a531ea53166c2c6b5e7c652ae6699a1a3c32b455af50f6c3990c868043d8d20edaac9acabc3a9340744ee6a66e6bb9 SHA512 fc0be84e8c1a51caf6e3a73b60cea998317924b041c578a507c4fc0bdab3f70115796a1fc932531466685dcefe47949283c4d4834092126b9b3e60ae237952cc
-DIST soapybladerf-0.4.0.tar.gz 29489 BLAKE2B 6a0cea3d9b7825e6e1bfa18ec8653df3ae28b4999f6e43437a64a1a10da867819f8e9f72cd03c183380b2a12a2ace29819b1944537cf15f808accc3444550c00 SHA512 69347847e25239c8686506cc7101dd9263b57fa3d3b5f518c915d9a9e0cb7e3a5627ee87ad7afb3022751aa212aa3698d8dbb16b6cddcc597292c7d2f5f806d4
-EBUILD soapybladerf-0.3.5_p20180908-r1.ebuild 691 BLAKE2B 2dc96fc4b4a35a14ee53ad2b5b4f5e0e6a060400d49890d83b8a0166f410c6ed8abf22182c94ce16e307ab4fca7a1423b96ea35b1720a42f787867b18458ecbe SHA512 82f3d16ec126f69fab49061227b963f5919b2de45ac898d564d0d31d8e9f9d12eb3e483e6cbd83b23c69c308806c4f5d5ac3806d826897136787e740fe5975e5
-EBUILD soapybladerf-0.4.0.ebuild 649 BLAKE2B 9d87bb4ef65237043ad67d5594f94aceadb0f9f637126b0afd18e377c67ccc03236603eb04929d5471bfc87323f622e33ca39c8b9ecaea4e2974cb53ff6c4fbe SHA512 a8f7c9ccac76eb6669f6dac307aa60107da46b72269dd2a00f090030992c3189d9bd9fe980dd5b42711c4b1dab979fb2ab649023a52302913b6c4044bdcda9a0
+DIST soapybladerf-0.4.1.tar.gz 29194 BLAKE2B 11b53c6d5f824ddd1704e852a220c88ca9f69e8d4024b11c936ae325c5c4b98198f32033ed1506402ef94b87a8f8b0a0d8cfaaa55ad4b6495fe79886f1cfb368 SHA512 73cd5c56b6f2faa37fb8eb8aca359061fd2da94fb081c1eb60f61894385f5f0175c9e3955835dc38478e513b0fd5a15fd100123be89e4ad62a0b7134557ab73e
+EBUILD soapybladerf-0.4.1.ebuild 649 BLAKE2B 9d87bb4ef65237043ad67d5594f94aceadb0f9f637126b0afd18e377c67ccc03236603eb04929d5471bfc87323f622e33ca39c8b9ecaea4e2974cb53ff6c4fbe SHA512 a8f7c9ccac76eb6669f6dac307aa60107da46b72269dd2a00f090030992c3189d9bd9fe980dd5b42711c4b1dab979fb2ab649023a52302913b6c4044bdcda9a0
 EBUILD soapybladerf-9999.ebuild 649 BLAKE2B 9d87bb4ef65237043ad67d5594f94aceadb0f9f637126b0afd18e377c67ccc03236603eb04929d5471bfc87323f622e33ca39c8b9ecaea4e2974cb53ff6c4fbe SHA512 a8f7c9ccac76eb6669f6dac307aa60107da46b72269dd2a00f090030992c3189d9bd9fe980dd5b42711c4b1dab979fb2ab649023a52302913b6c4044bdcda9a0
 MISC metadata.xml 434 BLAKE2B da3841724dfb1d301e29abd0c97ff4db9cb851fe55b1fb1ac576d39edb2dbb800bfc5b0857132325103b0138c6809d38d4af49b7548214f83dda38b2ce0ce39d SHA512 a672da1167904fe55179376d6c769066ab66639369fae311ad3a6b9afcab931554f148920c4deedcfbb57cd4fd8cee940462082a7fa68408913731939f651439
diff --git a/net-wireless/soapybladerf/soapybladerf-0.3.5_p20180908-r1.ebuild b/net-wireless/soapybladerf/soapybladerf-0.3.5_p20180908-r1.ebuild
deleted file mode 100644
index dd0ab129a9d6..000000000000
--- a/net-wireless/soapybladerf/soapybladerf-0.3.5_p20180908-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Soapy SDR plugin for the Blade RF "
-HOMEPAGE="https://github.com/pothosware/SoapyBladeRF"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/pothosware/SoapyBladeRF.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	COMMIT="b210241694e0a6e56beddda09fbabcfa8e14be56"
-	SRC_URI="https://github.com/pothosware/SoapyBladeRF/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/SoapyBladeRF-${COMMIT}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="net-wireless/soapysdr:=
-		>=net-wireless/bladerf-2018.08:="
-DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapybladerf/soapybladerf-0.4.0.ebuild b/net-wireless/soapybladerf/soapybladerf-0.4.1.ebuild
index 1ca79c8ea07e..1ca79c8ea07e 100644
--- a/net-wireless/soapybladerf/soapybladerf-0.4.0.ebuild
+++ b/net-wireless/soapybladerf/soapybladerf-0.4.1.ebuild
diff --git a/net-wireless/soapyplutosdr/Manifest b/net-wireless/soapyplutosdr/Manifest
index 9f52635b0cc1..119ae85b6612 100644
--- a/net-wireless/soapyplutosdr/Manifest
+++ b/net-wireless/soapyplutosdr/Manifest
@@ -1,6 +1,4 @@
-DIST soapyplutosdr-0.0_p20180825.tar.gz 17597 BLAKE2B d5b6205da7aa64406ccf84d198088094c10397ca874925926dfe2ee3134e045c3ab80b68db06ee84448ae8966e2d8edecb2517ef70b10bbddd9681fcbf09385a SHA512 40cc7c83c13f1d81212c5b0b6028d49de6c9e0b4df9e479c5cb577f60a92b415f76e159d45ecf19aad2deac507f7bd779b7cce1f7bc5e6fd2ea9a3f24399dfe7
-DIST soapyplutosdr-0.1.0.tar.gz 17597 BLAKE2B d5b6205da7aa64406ccf84d198088094c10397ca874925926dfe2ee3134e045c3ab80b68db06ee84448ae8966e2d8edecb2517ef70b10bbddd9681fcbf09385a SHA512 40cc7c83c13f1d81212c5b0b6028d49de6c9e0b4df9e479c5cb577f60a92b415f76e159d45ecf19aad2deac507f7bd779b7cce1f7bc5e6fd2ea9a3f24399dfe7
-EBUILD soapyplutosdr-0.0_p20180825-r1.ebuild 713 BLAKE2B 4d87dcef2f0e61075f5d8ce10fbac767aa5e30f9f8eb327c6b93ac5d462507326648c0fe2412a2ba460f7ca3a4e087e9fa96b84a0e52edc7c9a3c844ab46f17a SHA512 847eb690033af589a4624a643427d1d540c98f056feee104e1bbba3abe5d8ddce9e7c4ba78030cbba5f2c4908578a038d2db1f3dc2db949a694bccfbfdba422b
-EBUILD soapyplutosdr-0.1.0.ebuild 700 BLAKE2B 791904806e881642a8ea163e8771fa0d6f5ec44278264ee013ae77f74e055016b5fd428985e2dd453e3383505153a67b826dc2507c8888f1dc10bbd6fca59687 SHA512 a41a26326068dee86fcf959b740ede42b5862776b4bd3e69ae46745a69d59a46d320400118ae63ef70f1bb1294c0da0e54f4578804b45cace027f7bd9a27fab9
+DIST soapyplutosdr-0.2.0.tar.gz 17597 BLAKE2B d5b6205da7aa64406ccf84d198088094c10397ca874925926dfe2ee3134e045c3ab80b68db06ee84448ae8966e2d8edecb2517ef70b10bbddd9681fcbf09385a SHA512 40cc7c83c13f1d81212c5b0b6028d49de6c9e0b4df9e479c5cb577f60a92b415f76e159d45ecf19aad2deac507f7bd779b7cce1f7bc5e6fd2ea9a3f24399dfe7
+EBUILD soapyplutosdr-0.2.0.ebuild 700 BLAKE2B 791904806e881642a8ea163e8771fa0d6f5ec44278264ee013ae77f74e055016b5fd428985e2dd453e3383505153a67b826dc2507c8888f1dc10bbd6fca59687 SHA512 a41a26326068dee86fcf959b740ede42b5862776b4bd3e69ae46745a69d59a46d320400118ae63ef70f1bb1294c0da0e54f4578804b45cace027f7bd9a27fab9
 EBUILD soapyplutosdr-9999.ebuild 700 BLAKE2B 791904806e881642a8ea163e8771fa0d6f5ec44278264ee013ae77f74e055016b5fd428985e2dd453e3383505153a67b826dc2507c8888f1dc10bbd6fca59687 SHA512 a41a26326068dee86fcf959b740ede42b5862776b4bd3e69ae46745a69d59a46d320400118ae63ef70f1bb1294c0da0e54f4578804b45cace027f7bd9a27fab9
 MISC metadata.xml 435 BLAKE2B 2a0b2a0043234cf560ee6b76935c546da77ae108e3fd4e8187dcac974d1ffed8e50e86f94fb943e4396c0bc338ae1a92b899da38f7a88d3bc0c6437bf95282af SHA512 c66683ba419f5dd3d7ea63d07478366ae751ecd38250ba07fe157375d937bc0f42ae6324716dd7068c33e1d405f98207b676c6dfee3b1b1870bfb6f73b9e8a7d
diff --git a/net-wireless/soapyplutosdr/soapyplutosdr-0.0_p20180825-r1.ebuild b/net-wireless/soapyplutosdr/soapyplutosdr-0.0_p20180825-r1.ebuild
deleted file mode 100644
index 0ebf43c8590a..000000000000
--- a/net-wireless/soapyplutosdr/soapyplutosdr-0.0_p20180825-r1.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
-
-inherit cmake-utils
-
-DESCRIPTION="Soapy SDR plugin for the Pluto SDR"
-HOMEPAGE="https://github.com/pothosware/SoapyPlutoSDR"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/pothosware/SoapyPlutoSDR.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	COMMIT="782650597b18f311cc97fbb7c6813539e6adef16"
-	SRC_URI="https://github.com/pothosware/SoapyPlutoSDR/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/SoapyPlutoSDR-${COMMIT}
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-RDEPEND="net-wireless/soapysdr:=
-		net-libs/libiio:=
-		net-libs/libad9361-iio:="
-DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyplutosdr/soapyplutosdr-0.1.0.ebuild b/net-wireless/soapyplutosdr/soapyplutosdr-0.2.0.ebuild
index 494237c9dd27..494237c9dd27 100644
--- a/net-wireless/soapyplutosdr/soapyplutosdr-0.1.0.ebuild
+++ b/net-wireless/soapyplutosdr/soapyplutosdr-0.2.0.ebuild
diff --git a/net-wireless/soapyrtlsdr/Manifest b/net-wireless/soapyrtlsdr/Manifest
index d93b087ee827..32b7013e888d 100644
--- a/net-wireless/soapyrtlsdr/Manifest
+++ b/net-wireless/soapyrtlsdr/Manifest
@@ -1,6 +1,4 @@
-DIST soapyrtlsdr-0.2.5.tar.gz 14101 BLAKE2B 3fc48e5cece291220a64ec1fd06492a94497e3e639c4fbdcb4c88d4b0431676bbf7a8d531123acc91d937380abe6a96a1b9df4cd7150203e31e17ba859da7113 SHA512 2e6343833d0ef48b11c6be6ea85c87276d58ab810b6b47fa2735b909beb6a758856ef2cbef3a0d478c27dd1fea829a049dd91252ae9807415f8ea66f15054a64
 DIST soapyrtlsdr-0.3.0.tar.gz 14386 BLAKE2B f1f54bbf0a18cf02924844933108d38fe5280b8a856ffc9c3f12f56fc1ace5fa2abcabbfa86263f77d31fcd28f0a32cc4b4a350fca539a4860c6e0deebc492d5 SHA512 ccc0b3a5174bb1b57a79ecd0395ccaa5c3fada8ea7dce08d35a07992e84fef2cb45d92744fb0064857df36ad8120f495c3841b0fdca1870b9ed2328fb639ac21
-EBUILD soapyrtlsdr-0.2.5-r1.ebuild 641 BLAKE2B 0500aa30519312a6b95b4ec20cbd2066f456b2f95f81ee74554364588a9ae159fdafbc807176495dac3b5cef2a181b28c3325cb8ef39c756bc3cdd23011976ae SHA512 ebf01b8602e0eff83fe4d515923df6c13ff885352a31f3b0d0dc4ef8ba11c9c3e2148cbbce80cecf70fa4bdc64991150077c5dcb7cf14b17defcfab9641690f0
 EBUILD soapyrtlsdr-0.3.0.ebuild 628 BLAKE2B 78f33ddd40836b4759f34444e136f984dd918e2e6915ab203c8603969eb697a7db112f2102dcacd40c5d5e3c4374bd922524471712ec5371f56c75159b17fd2e SHA512 2914f28a417c4389b342ddb035f206f9a72f4a24f233d167d6bf4d6e7041d4d869d4b927d8743d6f72726f983a9d58820bd1019e4c71558dcde709b5403d9607
 EBUILD soapyrtlsdr-9999.ebuild 628 BLAKE2B 78f33ddd40836b4759f34444e136f984dd918e2e6915ab203c8603969eb697a7db112f2102dcacd40c5d5e3c4374bd922524471712ec5371f56c75159b17fd2e SHA512 2914f28a417c4389b342ddb035f206f9a72f4a24f233d167d6bf4d6e7041d4d869d4b927d8743d6f72726f983a9d58820bd1019e4c71558dcde709b5403d9607
 MISC metadata.xml 433 BLAKE2B 17192d2957af1deaddf7baec5c5ff77eb4ea40bbd80b7a91e5a36f91a4b53f6f6b142dc76ade70c016f8934905642c49851857bcb7823e5e3adee5e24cfccece SHA512 6b6295bd49522a9c1eb4747c4039a77201ec2dabb03250dae21b93605a1df695970d33ebe12108bd2effa7fc07ba6ab695de949e02099f89b7e334531145fe41
diff --git a/net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.5-r1.ebuild b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.5-r1.ebuild
deleted file mode 100644
index 1ae13f826167..000000000000
--- a/net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.5-r1.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
-
-inherit cmake-utils
-
-DESCRIPTION="SoapySDR RTL-SDR Support Module"
-HOMEPAGE="https://github.com/pothosware/SoapyRTLSDR"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/pothosware/SoapyRTLSDR.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/pothosware/SoapyRTLSDR/archive/soapy-rtlsdr-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/SoapyRTLSDR-soapy-rtlsdr-"${PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="net-wireless/soapysdr:=
-		net-wireless/rtl-sdr"
-DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapysdr/Manifest b/net-wireless/soapysdr/Manifest
index b2569d9c5721..3008fd1b6765 100644
--- a/net-wireless/soapysdr/Manifest
+++ b/net-wireless/soapysdr/Manifest
@@ -1,6 +1,4 @@
-DIST soapysdr-0.6.1.tar.gz 112820 BLAKE2B 42376a7a43c0d5a87a5b17b7d901cc7c74885083051c433c1f22427fe07a4fb0f111ddb460867bd7f748cb3ac6858b15e3dc69ba3ecca4574802c6bd0856a8cc SHA512 80ae8d0b096139e0df70524a1ff05fa1954755177d7920dbd8acb37e45cf86729e2745dcfd4e9c7ae2d7aa564335c2f197ca25ea387daa8f376d6c3e93234106
-DIST soapysdr-0.7.0.tar.gz 122933 BLAKE2B 2bd2f8812a6258a92ca4fe82ced10e3e97e348927dfc8a1f702a7ee4900b4fbe966a32566d1640a3474734074524cf31d8850b47a9b177e6e0e4d92c531409a6 SHA512 3dc69f070a2fe7acee9239154e58b21aa9c321fe35e2de77dfed8561016a93d5e693b5288da6d05e3d8c0f9ab7552ea12c4fd74ddb8d3c118d576f58251fb632
-EBUILD soapysdr-0.6.1-r1.ebuild 1282 BLAKE2B bd1e34b60f42146c6f3fa3b00c6ab1e3bd060cf7e45f24fb7868910bb8b653ad98673053d0daf8612ec504f97830d61a147f133584dceb3e08838af6a6a97796 SHA512 a2295857204808470f1ffe1de364abda9042ca1b0626f3c91e13bbd974e2557b9ab56b168db6c4952deb42e8f9e865368d2fd94007423338f3d006115f2d4696
-EBUILD soapysdr-0.7.0.ebuild 1288 BLAKE2B db8ed6a8599f20dbed78fa5bef9248fa5a2b5cd74ff5bba2089813bb85c4502c595b283c673f97a4bb4d2758976402b9b6666dffe991efdf7ef7ccbe748e188a SHA512 0cacd60aa0f4c24fd754e0070349c5f1c21f0663eddcd6fd138e69ae7fbf9845c2761e43a0b715d3d404eb135c138b167a20551743902a5160dd5e0da1005f69
+DIST soapysdr-0.7.1.tar.gz 124532 BLAKE2B 157c24610b5f89b549a7d670e26ba68cabb923b7fd95bab4adc4896f7fb9e13f58e53671a4802804bc15b09eb1113baddb5879fd14efe8b8ea1bfbff363dde0f SHA512 9b2c4251d6362faecf770df021b74e3b387b99699ae4f7d3f145801e2acc901a3803f7b4d2cd50267013f1add6658703dfa5db6db28b8a645f1f8230117123cd
+EBUILD soapysdr-0.7.1.ebuild 1288 BLAKE2B db8ed6a8599f20dbed78fa5bef9248fa5a2b5cd74ff5bba2089813bb85c4502c595b283c673f97a4bb4d2758976402b9b6666dffe991efdf7ef7ccbe748e188a SHA512 0cacd60aa0f4c24fd754e0070349c5f1c21f0663eddcd6fd138e69ae7fbf9845c2761e43a0b715d3d404eb135c138b167a20551743902a5160dd5e0da1005f69
 EBUILD soapysdr-9999.ebuild 1288 BLAKE2B db8ed6a8599f20dbed78fa5bef9248fa5a2b5cd74ff5bba2089813bb85c4502c595b283c673f97a4bb4d2758976402b9b6666dffe991efdf7ef7ccbe748e188a SHA512 0cacd60aa0f4c24fd754e0070349c5f1c21f0663eddcd6fd138e69ae7fbf9845c2761e43a0b715d3d404eb135c138b167a20551743902a5160dd5e0da1005f69
 MISC metadata.xml 775 BLAKE2B dbcad63785d9af5b1f2f93775c645f78e6344a2c47fe0ed1f71ab47d9945be2885e4becb2d9b329e145b035cf3af2f50daacc56175126d2fc3b6feae5e4579a7 SHA512 8805602022441e46c239411c7050ae3c4ef954c796a4293f3fb2eb0ff6cbc87a47eb554b89a29c22622e088f6cb232f05c154c0d6f8f864b35cc5f9c2a292862
diff --git a/net-wireless/soapysdr/soapysdr-0.6.1-r1.ebuild b/net-wireless/soapysdr/soapysdr-0.6.1-r1.ebuild
deleted file mode 100644
index 0b2bcdea38a2..000000000000
--- a/net-wireless/soapysdr/soapysdr-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit cmake-utils python-r1
-
-DESCRIPTION="vendor and platform neutral SDR support library"
-HOMEPAGE="https://github.com/pothosware/SoapySDR"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/pothosware/SoapySDR.git"
-	EGIT_CLONE_TYPE="shallow"
-	KEYWORDS=""
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/pothosware/SoapySDR/archive/soapy-sdr-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/SoapySDR-soapy-sdr-"${PV}"
-fi
-
-LICENSE="Boost-1.0"
-SLOT="0"
-
-IUSE="bladerf hackrf python rtlsdr plutosdr uhd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig:0 )
-"
-PDEPEND="bladerf? ( net-wireless/soapybladerf )
-		hackrf? ( net-wireless/soapyhackrf )
-		rtlsdr? ( net-wireless/soapyrtlsdr )
-		plutosdr? ( net-wireless/soapyplutosdr )
-		uhd? ( net-wireless/soapyuhd )"
-
-src_configure() {
-	configuration() {
-		mycmakeargs+=( -DENABLE_PYTHON=ON )
-		if python_is_python3; then
-			mycmakeargs+=( -DBUILD_PYTHON3=ON )
-		fi
-	}
-
-	if use python; then
-		python_foreach_impl configuration
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/soapysdr/soapysdr-0.7.0.ebuild b/net-wireless/soapysdr/soapysdr-0.7.1.ebuild
index 38efa5b2ccc4..38efa5b2ccc4 100644
--- a/net-wireless/soapysdr/soapysdr-0.7.0.ebuild
+++ b/net-wireless/soapysdr/soapysdr-0.7.1.ebuild
diff --git a/net-wireless/soapyuhd/Manifest b/net-wireless/soapyuhd/Manifest
index 8074ab3e4f19..eb706df9ca50 100644
--- a/net-wireless/soapyuhd/Manifest
+++ b/net-wireless/soapyuhd/Manifest
@@ -1,4 +1,4 @@
-DIST soapyuhd-0.3.4.tar.gz 32111 BLAKE2B 77e976f0d5ba671fb7ff2f9822b62ab6de9b6992dc57e7824fbf7972fa52e864a33673c3620094871117a33008cf86e834d7401b2ddd060a96662d2caa48d6e4 SHA512 2eda4d0ed65d86e915ad24c5221c41716ad838ea444d92ade5eb19959bc6992132dc208ceafe994cd14e4c4a429a21341c7c5d67d354999b85e96f388cb3aa4e
-EBUILD soapyuhd-0.3.4-r1.ebuild 644 BLAKE2B c6b31b854ed82c410704cbabe69d0752674b3a0fff8cd8116aeeaf77f726605016983fde94f7c7969c3682d770b4324e123954b714c8ee4728e45c1b5ee5dcdb SHA512 d568698b88819a0517a2a0fba65b704e4a74ed21650acdd414b901e9f88abe65bf577f6953e5f27217b7e3be3bf648e9c979303654a3bde0eff2d00f9fa6b263
+DIST soapyuhd-0.3.6.tar.gz 32894 BLAKE2B 479be969cd07e965f0d324778e8943830d655516e2ef407e61b99bc890096bf37efe083dec3862716cdfdecff9c7fc79eaf19f335d30ff08ae831b8aa7ebff2b SHA512 8bb2a5538ed869a93eb7dfac3d9213efa6af9761ab3a5977cdfc8de5763d969cf2b838320dad99c2c9f91284a2fdc0b686e99ae368f2e79bbb8597605118357f
+EBUILD soapyuhd-0.3.6.ebuild 644 BLAKE2B c6b31b854ed82c410704cbabe69d0752674b3a0fff8cd8116aeeaf77f726605016983fde94f7c7969c3682d770b4324e123954b714c8ee4728e45c1b5ee5dcdb SHA512 d568698b88819a0517a2a0fba65b704e4a74ed21650acdd414b901e9f88abe65bf577f6953e5f27217b7e3be3bf648e9c979303654a3bde0eff2d00f9fa6b263
 EBUILD soapyuhd-9999.ebuild 644 BLAKE2B c6b31b854ed82c410704cbabe69d0752674b3a0fff8cd8116aeeaf77f726605016983fde94f7c7969c3682d770b4324e123954b714c8ee4728e45c1b5ee5dcdb SHA512 d568698b88819a0517a2a0fba65b704e4a74ed21650acdd414b901e9f88abe65bf577f6953e5f27217b7e3be3bf648e9c979303654a3bde0eff2d00f9fa6b263
 MISC metadata.xml 430 BLAKE2B 583986bcf088a9cfcda635a68fef35c98ad5d5504be93f03b1034936930b38a81f3a952f1a33409a71406b3178cccb98afac8c3dafef670cbda3383830d1c22d SHA512 31ca3b4aff913064ad156b644b1598cc3412d818cf0b67607b222770852e98fc1e4d5e164d053088bd53bdffe9f394a279a1525dabfa3f22db972bc5099101f6
diff --git a/net-wireless/soapyuhd/soapyuhd-0.3.4-r1.ebuild b/net-wireless/soapyuhd/soapyuhd-0.3.6.ebuild
index 16bc1bdb9fba..16bc1bdb9fba 100644
--- a/net-wireless/soapyuhd/soapyuhd-0.3.4-r1.ebuild
+++ b/net-wireless/soapyuhd/soapyuhd-0.3.6.ebuild
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 1f9f4481f6c7..d61c00dfc105 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -2,16 +2,10 @@ 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.25.zip 91781146 BLAKE2B 3a4166f3d96c1fe0e7a9afd7e85266e6dacaa4bad44af1cfd72cd22f8a2f5fae4ca4534c5ae09ca50ddc216e067e5e5598e0cc3ea1bcb96802b7379dca03426b SHA512 2a88c8640b10c2b596c40c3e4594062f9828db3e2be5dd159dcf7275b3796c7ef8714c60c27de980672fb1ccc88e9fa7640fc74e61e6d994e3fb1214d0e0bd48
-DIST unifi-5.10.26.zip 91777116 BLAKE2B a07f296aa55204d0c1be055f0c54901824eaf2341548ae3a4de95faa496f5e38e19cd62974da09abfad5756889506db4dda1aa8803e0f87036ebfb3205c47c10 SHA512 3722c83b810e3ddce6c82d8b8119717b00213d5052baf66288299311fe6f7e8c5a5c5dbdae871a166bcfeb1e70c69f2ed4f34dea702d50e69d1a1a8eacea4594
-DIST unifi-5.10.27.zip 91782447 BLAKE2B 810170b44dc6ade4e9b3805302f3f17fde104e04f581aacba895dbb41f1c2450a764aeb62841cc93df5d8a0bdcaebe9ab12a9644cacf7ae4261b9a09301cf652 SHA512 f425596e1d8f0ee82d1bb84c1a5f0900d5cbcbbc579b6a9769bd10c7f66e61423c14dcf08028525b12495e144ee2d9452a3e4a5d6bc3331f14f087c27effc5eb
-DIST unifi-5.11.38.zip 112222011 BLAKE2B 3838452f3bc2abba075a3cce20062f1e3e76f963b374c25489a57839c491567b92d03ef308846c2d2afb3a249717804365c4d928cb9df9d864e1251fd1c5d0d8 SHA512 e7a55181283dc972c3883da2d05ca00e5ddd77516db5109f7a38f1208dbed90c48553fb7cb598d760c90a6978d19fe11f39da8d485a174c6fe7a03b00b61c7f5
 DIST unifi-5.11.39.zip 112221641 BLAKE2B 33acc8ba7e31dc0e4bc768f26dbb9d995d42a5f9bf58b4671c5a3c973c575c3ca232781e6747ad82ff808df44dbbe71a75a340f738461f1e21a069d144440176 SHA512 2c2e5a4216b916905666b6d0585458d2dba8cfe5a60e183b95406361b39a97cd9c7243faaaecb439db77cf7e2751941c729c2d0bc4d0807aad18706e10e696ff
+DIST unifi-5.11.45.zip 112350672 BLAKE2B add0446bb39c169d988395f47e418ea63428bee8c5effa98d021128219f313572ac8763f26ffea7d5b051f9c7e4e0e2b6848d499fb2c68a8869e195d99d35e67 SHA512 e5a72a784ae7f6e829204fb39f7f7daef00dd30b59e7d8c2ddd7a20a302ad43c45bf7ad680cd824cf8a28d7017a05dbbc11c0c24a65d6a8980f86739785121c9
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
-EBUILD unifi-5.10.25.ebuild 1832 BLAKE2B 0391c965a650f7ba24efea5123407d38fd1bd9559c2f39b64c36f0044ab7a4eefbfe98a8d4165966e81f435bb137add9892ec08f4fe3917fb7206ad3e9cd56c7 SHA512 9bf367781e46c9cc8fcad0be0eed59a848a822825555b87eddc9e36941e66861a9ae7f229f263532eced0376e4154d35183a1bdcadc3bda77f9b7a8547d8b6bf
-EBUILD unifi-5.10.26.ebuild 1843 BLAKE2B 92109fd98d1975d1f07b6d66b7965709609571f8cc6f5b8eebdcd24157fd6233b21ba74c17b3454aa99c8ec2273944b9af24939476c9f1b42de871a0c6c4da29 SHA512 1dec9b15ae11c83c9f71843616299e52a665a5d50342844b72a648ece714b3db10f06ae7205ba11b44d052dd5be6b1cfd23160a1fee1d01cad830c357b2c40ac
-EBUILD unifi-5.10.27.ebuild 1843 BLAKE2B 6393bf28e4743a0c4f24b57ce3be0b6202bb71bf727099b6676e6c5db920fad2aaf6c912993e90588991d39e0008f83362eee5ac943504bc3dd9f618b07dd76f SHA512 79ab81ff07309c5aab6d827779c5e94d3a1d1bba3236bba9db50e6ba5f78dfaa7058c1c6ec43660a34909f8407b4dd00c5a0a65fe393f13eff63d92bd84813f4
-EBUILD unifi-5.11.38.ebuild 1833 BLAKE2B 9102a824bf1d2c7bb5a3c41eed184623eca648804eb69d49ab988f653323c2df96d88b5816e6d13b49bc5dc47c53c26db0e4e76e476679ed2f870fac4a3056bd SHA512 e61f7a368a5175914acaa71990ade92030e39b5af19be37d579069043c9f85a0100654337ccfebeb183d08f2ea5f32de7a0f480756e823b1568cc09ae1800c56
-EBUILD unifi-5.11.39.ebuild 1833 BLAKE2B 1b4447e889e7523b5f031104286649c66b90ca5b2cf0579d32abbfa984d8845d24617e28f4a5b61bf3d4d7fa6f52cf7c9e3627e11ea3a1a95a06746db087fe93 SHA512 095dc6b41df6edca66f11855e81ab31598e417ccccf7fa2874cb23322546daababd480032d6b3cc2be098f31ca5fbce5c7dae727c730028e003c5313c958c5f3
+EBUILD unifi-5.11.39.ebuild 1832 BLAKE2B 7c40929311169e488fca0f551e8636222bf15e8f7e180bca177fe7b1e3e1d217071689951676a7cc90fe106de74b08be430ac9731843390eedef700bfb2d0445 SHA512 aa414683457d916af76f22ae2004bccc79610f8522005202d0c43367227f5a6d46e1fbdf506993c7c20098a4b6d697824fab7d23088e73ba929727067465caca
+EBUILD unifi-5.11.45.ebuild 1833 BLAKE2B adf52bdbd0c09b41feedaa66635b7ae771c784efae0615f5adb40a03e7a3c5defdcbcbe40282ac91b4905f3a85825288a9914d6a773830ba515b406b3f257ca9 SHA512 ff34c8cbebc2ecf0307d459c551900b771b3ab452bdc9ab5fb9189aa612667116f47c40b1797a402200f7dbae7d465b74b68c069029975151aa8b2f1ff1ec42c
 EBUILD unifi-5.6.42.ebuild 1721 BLAKE2B 04efda4b528074a4b01f11d9cdb45237d64ec6af9846f8d30e2c5fe1564990467f6e0e6c4fa76e77e06007239f1f338d509f5759ed9baccd93ee8f2f70b39a63 SHA512 6e1b3ae4df8cb47c142ee14e5bb92a3c21dd5a97caeaa665bba0e201a9ffefb913f24420967944c09e3dcf516c667af566ecbd7404a254146fa2022a496f6788
 MISC metadata.xml 802 BLAKE2B cf4248b03b6b0f5ecee40ab09e9d7fe718c8a3478aeb5814faa489b74080b19fa20b0db05b7910523c68297d2fc00a56d4b16822367811b52fbdbd2cf707962a SHA512 8071155df75634be1db52068b17960b194f47c8a1ca38f23fe4397df8c3156123c6023cab0d33db4dce1b0763beaa096ba6f745671c3078be637dad6ef63abf5
diff --git a/net-wireless/unifi/unifi-5.10.25.ebuild b/net-wireless/unifi/unifi-5.10.25.ebuild
deleted file mode 100644
index 716df55f9fed..000000000000
--- a/net-wireless/unifi/unifi-5.10.25.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=""
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.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.26.ebuild b/net-wireless/unifi/unifi-5.10.26.ebuild
deleted file mode 100644
index d486ab031275..000000000000
--- a/net-wireless/unifi/unifi-5.10.26.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="-7fbb9ab8c4"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.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.27.ebuild b/net-wireless/unifi/unifi-5.10.27.ebuild
deleted file mode 100644
index 05255d5cc70b..000000000000
--- a/net-wireless/unifi/unifi-5.10.27.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="-2ad6590363"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.10"
-IUSE="systemd"
-
-RDEPEND="dev-db/mongodb
-	virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.11.38.ebuild b/net-wireless/unifi/unifi-5.11.38.ebuild
deleted file mode 100644
index ee04a76926d0..000000000000
--- a/net-wireless/unifi/unifi-5.11.38.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
-
-# Set this var for any releases except stable
-RC_SUFFIX="-65a83af88b"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.11"
-IUSE="systemd"
-
-RDEPEND="dev-db/mongodb
-	virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.11.39.ebuild b/net-wireless/unifi/unifi-5.11.39.ebuild
index 832f70fb87c8..31f7b51af90d 100644
--- a/net-wireless/unifi/unifi-5.11.39.ebuild
+++ b/net-wireless/unifi/unifi-5.11.39.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
 HOMEPAGE="https://www.ubnt.com"
 SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
 SLOT="0/5.11"
 IUSE="systemd"
diff --git a/net-wireless/unifi/unifi-5.11.45.ebuild b/net-wireless/unifi/unifi-5.11.45.ebuild
new file mode 100644
index 000000000000..2605a1951254
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.11.45.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Set this var for any releases except stable
+RC_SUFFIX="-6cc8cc5c2a"
+
+inherit systemd user
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.11"
+IUSE="systemd"
+
+RDEPEND="dev-db/mongodb
+	virtual/jre:1.8"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+pkg_setup() {
+	enewgroup unifi
+	enewuser unifi -1 -1 /var/lib/unifi unifi
+}
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+	exeinto /usr/lib/unifi/bin
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index fbea62987ba9..ad5fed495273 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -23,7 +23,7 @@ DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B f1e2a5cb37b02d5c74116b5bc7f67c47d
 EBUILD wpa_supplicant-2.6-r10.ebuild 12647 BLAKE2B 1c79f30a1746cb72ca4a8dd1353fc943731ab13633ec963f53f36ddf8c75a64bc738e9be75a059d174e05f85693b251de413f8733d47392de53c8bdbcd8bec75 SHA512 dca78957810df5fd52a1a4bbc7fdb5460dad19b2388124ef90c4616e4684eeac01ea60f0436d9c81ad168ac7acf5f56011270a0972fc42da58d2731539993ba8
 EBUILD wpa_supplicant-2.7-r1.ebuild 11750 BLAKE2B eb1e7a72330890822359cc0d006957cd6e25723bc063ee739148a9923aa5d966287e5f35049190dbf730f116025bfc960545561d869ca8d06ad35a92c88bbd26 SHA512 b9bd97e080835f1aeec619cab60e5bf23382b6a91bead57373edef72064b53945ee4722ec4ebd23ce8d5d95d342a56f72d9c508910176d890e796067802b1746
 EBUILD wpa_supplicant-2.7-r3.ebuild 11552 BLAKE2B 2634e6f8bf06e5a9f65dc52194334bda1b89fafc5db5d5c080840944c58431d8271eac507d3ae33ea9496ca05bffa76d2852231ae39032f697feb297ec895b9b SHA512 83fef1ecea3a7b21a995920018a63b4cd3f3f5019573aaa559faae16bf8550e4fd4f1b26fb96d3f94dead411067f11ffc444a37728883bedb73e493f1a476d69
-EBUILD wpa_supplicant-2.8-r1.ebuild 11673 BLAKE2B 18e1ae16bb945a781918c94dc18655257906fdb1583d77dcf1b7d6769fbafe89ef94c896e9239af1a8cf95414ee8ef87f4f8864442f7bce531498b445003f6e2 SHA512 6b3ae679c8974082fd6cf9fbb5601cbf07137640e327842a4f0a1e92d828218c57547418e50779789b99162a1ed6a0d68752cff287aaac0993cc69bf654536e7
+EBUILD wpa_supplicant-2.8-r1.ebuild 11671 BLAKE2B d03e365d8897f8029cd4cb1f5d935ac8cf63b4889863ec86a32ac8a503a24239c4f8edd7d827e39204e5732b1dd9c24e552da8ac51e60f43186510ec910b14a9 SHA512 08884e96122db43448dcffb8a957c595d6a8dbe1493274e94b3d3d69e7cec26242c21dcdba780219da5d0cb081cfabdc95e27ae3592cb2d9382683e71a24a6ca
 EBUILD wpa_supplicant-2.9.ebuild 11883 BLAKE2B 6a3a0b2da56a2a9045b196d83e237a2e6c8cc49674f7a556ce1718546b5592df44b34761e8f43899c60e919ea1154b76a405830cf21bfe3a1fd75c066d3a3e09 SHA512 20184ba90153581468db253f59a3528b86f10186ab6ee89ede28d87d2e81a2812e966f9a53b6d63f9da2bb77c55b59be3428c5e718c4e82fbe3b3ee5a4c5c665
 EBUILD wpa_supplicant-9999.ebuild 11361 BLAKE2B cbac3abdabd5438ce306317f5b8616d93feaf4260fada105e8ac452f70a131696e4f956f1bc09a07005856548648838f634f3d967beec7c4c393f5257c25b282 SHA512 29a6025e9ce15f9e27465dcc155d6089dccc2e0b6e2422c4acd3ae715d5657e043377c6534d9fa3f4f2dc89fc08e4fab90a1424c411dccfc59491580c9405c74
 MISC metadata.xml 1523 BLAKE2B 50ad101e8ccf8a08b6c778c5108c518b81f2d28770f7cf4b770aa92a7a16da5806354bfe4ac1342fdb7a1f1fdf943272507f9c7308c5f421e2ee7d7d20c70266 SHA512 3ea8bfd877e93ebe91a75f989fe09e11546d76ffbea1ddf559de0829d6728cd4bdac64321971011eccd673e8dfdd446bf4a67e4619f07c3f8330816d5a815ee2
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
index 7dd2d7f67448..1c68d46a2a63 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
 else
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 fi
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 44edf6393db6..1262498a93d2 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 0989a3a310c4..604c9277d461 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -94,6 +94,11 @@ media-sound/pulseaudio native-headset
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
 dev-vcs/git pcre-jit
 
+# Fabian Groffen <grobian@gentoo.org> (2017-06-15)
+# net-mail/notmuch is not keyworded, and holds back stabilisation, see
+# bug https://bugs.gentoo.org/show_bug.cgi?id=604902
+mail-client/mutt notmuch
+
 # Tobias Klausmann <klausman@gentoo.org> (2017-05-18)
 # Stack protector code is not ported to alpha (and may not ever be)
 >=sys-devel/gcc-6 ssp
@@ -116,10 +121,6 @@ dev-python/pyquery test
 # hardware that is "too slow".
 dev-python/attrs test
 
-# Tobias Klausmann <klausman@gentoo.org> (2016-01-22)
-# Requires guile2 which is keyworded nowhere
-media-sound/lilypond guile2
-
 # Tobias Klausmann <klausman@gentoo.org> (2016-11-15)
 # JITing for libpcre{,2} is not supported on Alpha
 dev-libs/libpcre jit
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index 58c3630c7a06..d14c33e57e4f 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -166,6 +166,10 @@ connman
 # sys-apps/entropy is not keyworded
 entropy
 
+# Anthony G. Basile <blueness@gentoo.org> (2012-04-15)
+# Pulls in net-libs/axtls which is not keyworded for arch
+curl_ssl_axtls
+
 # Alexandre Rostovtsev <tetromino@gentoo.org> (2012-12-31)
 # media-libs/xine-lib is not keyworded
 xine
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 77b864e88740..f15eb9ff2858 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -21,7 +21,6 @@ mail-client/novell-groupwise-client
 # Mask packages that rely on amd64 multilib
 >=app-i18n/atokx3-3.0.0
 app-accessibility/mbrola
-app-accessibility/perlbox-voice
 app-arch/stuffit
 app-benchmarks/cpuburn
 app-editors/emacs:18
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 43ba5a2fb159..758d97f26c8f 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-08-28)
+# upstream provides docs and tools for tier-1 arches
+dev-lang/rust-bin -doc
+>=dev-lang/rust-bin-1.37 -clippy -rustfmt
+
 # Thomas Deutschmann <whissi@gentoo.org> (2019-08-03)
 # Early microcode loading is supported on amd64
 sys-kernel/linux-firmware -initramfs
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index a542388fefb4..02af1528e42b 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -8,6 +8,7 @@ dev-libs/amdgpu-pro-opencl
 # Thomas Deutschmann <whissi@gentoo.org> (2018-10-23)
 # requires net-libs/nodejs
 >=www-client/firefox-63.0
+>=mail-client/thunderbird-68.0
 
 # Patrick McLean <chutzpah@gentoo.org> (2018-07-12)
 # requires nodejs
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 97aa916f451a..5ceb9b4d20e1 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -281,10 +281,6 @@ media-video/ffmpeg -mmal
 # unkeyworded deps, bug #555896
 sci-libs/armadillo mkl
 
-# Pawel Hajdan jr <phajdan.jr@gentoo.org> (2015-10-15)
-# Repoman reports dependency issues on arm.
-www-client/chromium system-ffmpeg
-
 # Markus Meier <maekke@gentoo.org> (2015-10-10)
 # unkeyworded deps, bug #552330
 app-portage/g-sorcery bson
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index b61502402b7f..18f0f7b726f7 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (2019-08-27)
+# Missing stable net-libs/webkit-gtk
+dev-util/glade webkit
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-02-10)
 # Needs kde-frameworks/{kwallet,ki18n,kconfig} stable
 dev-vcs/subversion kwallet
diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults
index ae8f19006b86..3fa7f0b1c878 100644
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -25,7 +25,3 @@ USE="libtirpc"
 # Michał Górny <mgorny@gentoo.org> (2017-03-14)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
-
-# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
-# Temporary RUBY_TARGETS for bug 688976
-RUBY_TARGETS="ruby24 -ruby25"
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index db7e10319702..84620e110da1 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -79,12 +79,6 @@ virtual/ffmpeg -sdl
 # It builds OK but is not yet in ::gentoo. bug #678404
 kde-apps/cantor lua
 
-# Dirkjan Ochtman <djc@gentoo.org> (2018-09-29)
-# Upstream doesn't build docs for tier 2 and lower architectures.
-# Bug #660512.
-dev-lang/rust doc
-dev-lang/rust-bin doc
-
 # Virgil Dupras <vdupras@gentoo.org> (2018-09-06)
 # sci-electronics/ngspice not yet keyworded, bug #665416
 # sci-libs/opencascade not yet keyworded
@@ -185,7 +179,6 @@ sys-cluster/neutron haproxy
 dev-python/ipython notebook
 dev-python/networkx scipy
 dev-ruby/haml test
-media-libs/ming php
 media-libs/opencv contrib_dnn
 net-analyzer/icinga2 classicui
 
@@ -333,9 +326,8 @@ media-sound/pulseaudio neon
 media-libs/vo-aacenc cpu_flags_arm_neon
 
 # Alexis Ballier <aballier@gentoo.org> (2017-06-16)
-# neon on pixman seems armv7 only, at least according to configure checks: it
-# aborts when neon is enabled.
-x11-libs/pixman neon
+# pixman's neon code is armv7 only.
+x11-libs/pixman cpu_flags_arm_neon neon
 
 # James Le Cuirot <chewi@gentoo.org> (2017-05-22)
 # Only available on some architectures.
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 3bc5d02e20b1..f72c702f6298 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
-# Temporary mask for stable bug 688976
-ruby_targets_ruby25
-
 # Aaron Bauman <bman@gentoo.org> (2019-05-20)
 # Does not build on arm64
 ocamlopt
diff --git a/profiles/arch/base/package.mask b/profiles/arch/base/package.mask
new file mode 100644
index 000000000000..f8d22ee19ff8
--- /dev/null
+++ b/profiles/arch/base/package.mask
@@ -0,0 +1,56 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2019-08-30)
+# Perl 5.26 will be removed soon. Please upgrade.
+# This block is here (and not in ../../package.mask) since we still need
+# it and unmask it on hppa and sparc. See bug 676062 and bug 683018.
+<dev-lang/perl-5.28.2-r1
+~virtual/perl-Archive-Tar-2.240.0
+~virtual/perl-Attribute-Handlers-0.990.0
+~virtual/perl-B-Debug-1.240.0
+~virtual/perl-CPAN-2.180.0
+~virtual/perl-Carp-1.420.0
+~virtual/perl-Compress-Raw-Zlib-2.74.0
+~virtual/perl-Data-Dumper-2.167.0
+~virtual/perl-Devel-PPPort-3.350.0
+~virtual/perl-Digest-SHA-5.960.0
+~virtual/perl-Encode-2.880.0
+~virtual/perl-Exporter-5.720.0
+~virtual/perl-ExtUtils-CBuilder-0.280.225
+~virtual/perl-ExtUtils-Constant-0.230.0
+~virtual/perl-ExtUtils-Install-2.40.0
+~virtual/perl-ExtUtils-MakeMaker-7.240.0
+~virtual/perl-ExtUtils-ParseXS-3.340.0
+~virtual/perl-File-Spec-3.670.0
+~virtual/perl-Filter-Simple-0.930.0
+~virtual/perl-Getopt-Long-2.490.0
+~virtual/perl-I18N-LangTags-0.420.0
+~virtual/perl-IO-1.380.0
+~virtual/perl-IO-Socket-IP-0.380.0
+~virtual/perl-IPC-Cmd-0.960.0
+~virtual/perl-JSON-PP-2.274.0.200_rc
+~virtual/perl-Locale-Maketext-1.280.0
+~virtual/perl-Math-BigInt-1.999.806
+~virtual/perl-Math-BigInt-FastCalc-0.500.500
+~virtual/perl-Math-BigRat-0.261.100
+~virtual/perl-Module-CoreList-5.201.804.140
+~virtual/perl-Net-Ping-2.550.0
+~virtual/perl-Scalar-List-Utils-1.460.200_rc
+~virtual/perl-Socket-2.20.30_rc
+~virtual/perl-Storable-2.620.0
+~virtual/perl-Test-1.300.0
+~virtual/perl-Test-Harness-3.380.0
+~virtual/perl-Test-Simple-1.302.73
+~virtual/perl-Time-HiRes-1.974.100
+~virtual/perl-Time-Piece-1.310.0
+~virtual/perl-Unicode-Collate-1.190.0
+~virtual/perl-Unicode-Normalize-1.250.0
+~virtual/perl-XSLoader-0.270.0
+~virtual/perl-bignum-0.470.0
+~virtual/perl-if-0.60.600
+~virtual/perl-libnet-3.100.0
+~virtual/perl-podlators-4.90.0
+~virtual/perl-threads-2.150.0
+~virtual/perl-threads-shared-1.560.0
+~virtual/perl-version-0.991.700
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 2215c435345f..072dbbd336c3 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-08-28)
+# upstream tarballs for tier-2 arches do not ship docs
+# and starting with 1.37 no longer ship extra tools
+dev-lang/rust-bin doc
+>=dev-lang/rust-bin-1.37 clippy rustfmt
+
 # Craig Andrews <candrews@gentoo.org> (2019-07-03)
 # Raspberry Pi support is only available on arm.
 # Mask raspberry-pi USE globally, unmask on arm.
diff --git a/profiles/arch/hppa/package.mask b/profiles/arch/hppa/package.mask
index 5b64a27123b6..7e5d59da2ad5 100644
--- a/profiles/arch/hppa/package.mask
+++ b/profiles/arch/hppa/package.mask
@@ -1,2 +1,57 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2019-08-30)
+# Unmask block corresponding to the mask in ../base
+# Perl 5.26 will be removed soon. Please upgrade.
+# This block is here (and not in ../../package.mask) since we still need
+# it and unmask it on hppa and sparc. See bug 676062 and bug 683018.
+-<dev-lang/perl-5.28.2-r1
+-~virtual/perl-Archive-Tar-2.240.0
+-~virtual/perl-Attribute-Handlers-0.990.0
+-~virtual/perl-B-Debug-1.240.0
+-~virtual/perl-CPAN-2.180.0
+-~virtual/perl-Carp-1.420.0
+-~virtual/perl-Compress-Raw-Zlib-2.74.0
+-~virtual/perl-Data-Dumper-2.167.0
+-~virtual/perl-Devel-PPPort-3.350.0
+-~virtual/perl-Digest-SHA-5.960.0
+-~virtual/perl-Encode-2.880.0
+-~virtual/perl-Exporter-5.720.0
+-~virtual/perl-ExtUtils-CBuilder-0.280.225
+-~virtual/perl-ExtUtils-Constant-0.230.0
+-~virtual/perl-ExtUtils-Install-2.40.0
+-~virtual/perl-ExtUtils-MakeMaker-7.240.0
+-~virtual/perl-ExtUtils-ParseXS-3.340.0
+-~virtual/perl-File-Spec-3.670.0
+-~virtual/perl-Filter-Simple-0.930.0
+-~virtual/perl-Getopt-Long-2.490.0
+-~virtual/perl-I18N-LangTags-0.420.0
+-~virtual/perl-IO-1.380.0
+-~virtual/perl-IO-Socket-IP-0.380.0
+-~virtual/perl-IPC-Cmd-0.960.0
+-~virtual/perl-JSON-PP-2.274.0.200_rc
+-~virtual/perl-Locale-Maketext-1.280.0
+-~virtual/perl-Math-BigInt-1.999.806
+-~virtual/perl-Math-BigInt-FastCalc-0.500.500
+-~virtual/perl-Math-BigRat-0.261.100
+-~virtual/perl-Module-CoreList-5.201.804.140
+-~virtual/perl-Net-Ping-2.550.0
+-~virtual/perl-Scalar-List-Utils-1.460.200_rc
+-~virtual/perl-Socket-2.20.30_rc
+-~virtual/perl-Storable-2.620.0
+-~virtual/perl-Test-1.300.0
+-~virtual/perl-Test-Harness-3.380.0
+-~virtual/perl-Test-Simple-1.302.73
+-~virtual/perl-Time-HiRes-1.974.100
+-~virtual/perl-Time-Piece-1.310.0
+-~virtual/perl-Unicode-Collate-1.190.0
+-~virtual/perl-Unicode-Normalize-1.250.0
+-~virtual/perl-XSLoader-0.270.0
+-~virtual/perl-bignum-0.470.0
+-~virtual/perl-if-0.60.600
+-~virtual/perl-libnet-3.100.0
+-~virtual/perl-podlators-4.90.0
+-~virtual/perl-threads-2.150.0
+-~virtual/perl-threads-shared-1.560.0
+-~virtual/perl-version-0.991.700
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 17909763350b..f8db01005e76 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -162,6 +162,10 @@ alsa_cards_wavefront
 # media-sound/fluidsynth isn't keyworded
 fluidsynth
 
+# Anthony G. Basile <blueness@gentoo.org> (2012-04-15)
+# Pulls in net-libs/axtls which is not keyworded for arch
+curl_ssl_axtls
+
 # Alexandre Rostovtsev <tetromino@gentoo.org> (2012-12-31)
 # net-misc/connman is not keyworded, bug 348308
 connman
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index e3984601c31c..38cd86ebc6c6 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -58,6 +58,10 @@ app-portage/g-sorcery bson
 # dev-python/gmpy also a test depend, so minimize the features until can test properly (http2 soap test)
 dev-python/twisted conch crypt http2 soap test
 
+# Fabian Groffen <grobian@gentoo.org> (2016-12-07)
+# unkeyworded notmuch dependency, bug #587560
+mail-client/mutt notmuch
+
 # Felix Janda <felix.janda@posteo.de> (2016-09-24)
 # net-libs/libnetfilter_conntrack is not keyworded on mips
 net-dns/dnsmasq conntrack
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 0c2c0d8533c4..32ba177b1fe3 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -216,7 +216,6 @@ eds
 acpi
 afs
 apm
-directfb
 dvdr
 ibm
 ggi
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 60c78c5ed7aa..036de06eeaf0 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -129,6 +129,10 @@ sci-geosciences/gpsbabel gui
 # DOSBox + OpenGLide is untested on this arch.
 games-emulation/dosbox glide
 
+# Fabian Groffen <grobian@gentoo.org> (2016-12-07)
+# unkeyworded notmuch dependency, bug #587560
+mail-client/mutt notmuch
+
 # Thomas Deutschmann <whissi@gentoo.org> (2016-08-26)
 # Enable numa support on supported architectures
 dev-db/mysql -numa
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index 4757780a00be..2a7b9313ea42 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -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
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -26,9 +26,8 @@ media-sound/easytag nautilus
 media-sound/abcde replaygain
 
 # Ulrich Müller <ulm@gentoo.org> (2018-08-09)
-# Needs net-mail/mailutils and net-libs/webkit-gtk which are not
-# stable (yet?), bug #663248
-app-editors/emacs mailutils xwidgets
+# Needs net-libs/webkit-gtk which is not stable, bug #663248
+app-editors/emacs xwidgets
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2018-06-20)
 # dev-python/PyQt5 is not stable.
@@ -76,6 +75,7 @@ x11-misc/xscreensaver new-login
 # webkit-gtk is going to stay in ~all but amd64/x86
 # that are the only arches upstream is taking care
 >=x11-libs/wxGTK-3.0.2.0-r1 webkit
+dev-util/glade webkit
 
 # Justin Lecher <jlec@gentoo.org> (2015-02-21)
 # Needs stable GNOME-3
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask
index 25117d003d9a..8705a504655d 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-08-29)
+# PGO works on ppc64le
+>=www-client/firefox-68 -pgo
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-08-14)
 # works on ppc64le
 media-libs/mesa -llvm -video_cards_radeonsi
diff --git a/profiles/arch/powerpc/ppc64/64ul/use.mask b/profiles/arch/powerpc/ppc64/64ul/use.mask
index 0cc7f9e27d9d..70b2f2d64466 100644
--- a/profiles/arch/powerpc/ppc64/64ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/use.mask
@@ -1,4 +1,5 @@
-# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 # Ilya Tumaykin <itumaykin+gentoo@gmail.com> (2017-05-07)
 # There is no luajit support on ppc64 userland. Bug #608326.
@@ -12,10 +13,6 @@ luajittex
 # virtual/opencl requires media-libs/mesa[opencl] (bug #549096)
 opencl
 
-# this is a list of USE flags that should not be used on PPC64
-# Tom Gall <tgall@gentoo.org> manages this list
-directfb
-
 # Agostino Sarubbo <ago@gentoo.org> (2012-12-22)
 # mask kde since is not anymore keyworded for ppc64
 kde
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 78f206bc2910..491c1dee8a5c 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -57,7 +57,6 @@ acpi
 afs
 alsa
 apm
-directfb
 lirc
 llvm
 java
diff --git a/profiles/default/linux/sparc/17.0/desktop/gnome/eapi b/profiles/arch/sparc/64ul/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/sparc/17.0/desktop/gnome/eapi
+++ b/profiles/arch/sparc/64ul/eapi
diff --git a/profiles/arch/sparc/64ul/make.defaults b/profiles/arch/sparc/64ul/make.defaults
new file mode 100644
index 000000000000..f9d3de3e5b9d
--- /dev/null
+++ b/profiles/arch/sparc/64ul/make.defaults
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+MULTILIB_ABIS="sparc64"
+DEFAULT_ABI="sparc64"
+ABI="${DEFAULT_ABI}"
+
+CHOST="sparc64-unknown-linux-gnu"
diff --git a/profiles/arch/sparc/64ul/package.use.mask b/profiles/arch/sparc/64ul/package.use.mask
new file mode 100644
index 000000000000..b0792becdce5
--- /dev/null
+++ b/profiles/arch/sparc/64ul/package.use.mask
@@ -0,0 +1,15 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Matt Turner <mattst88@gentoo.org> (2019-08-26)
+# Upstream Git is switching to PCRE2 w/ JIT.
+# This is not available on some arches, where a fallback to PCRE1 without JIT is used.
+dev-vcs/git pcre-jit
+
+# Matt Turner <mattst88@gentoo.org> (2019-08-26)
+# jit not supported on sparc64
+dev-libs/libpcre2 jit
+
+# Matt Turner <mattst88@gentoo.org> (2019-08-26)
+# Falis to build on 64-bit userland
+dev-libs/openssl asm
diff --git a/profiles/arch/sparc/64ul/parent b/profiles/arch/sparc/64ul/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/sparc/64ul/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 66fd2ca7a08a..d78ba38801a4 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -27,6 +27,9 @@ CTARGET_sparc32="sparc-unknown-linux-gnu"
 # do NOT set CFLAGS_sparc64 here it'd break linux-headers for non-multilib
 # profiles
 
+LIBDIR_sparc32="lib"
+LIBDIR_sparc64="lib64"
+
 # Compiler flags
 CFLAGS="-O2 -mcpu=ultrasparc -pipe"
 CXXFLAGS="${CFLAGS}"
diff --git a/profiles/arch/sparc/package.mask b/profiles/arch/sparc/package.mask
index 0d6a7972c48f..bf8da5214314 100644
--- a/profiles/arch/sparc/package.mask
+++ b/profiles/arch/sparc/package.mask
@@ -1,6 +1,61 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2019-08-30)
+# Unmask block corresponding to the mask in ../base
+# Perl 5.26 will be removed soon. Please upgrade.
+# This block is here (and not in ../../package.mask) since we still need
+# it and unmask it on hppa and sparc. See bug 676062 and bug 683018.
+-<dev-lang/perl-5.28.2-r1
+-~virtual/perl-Archive-Tar-2.240.0
+-~virtual/perl-Attribute-Handlers-0.990.0
+-~virtual/perl-B-Debug-1.240.0
+-~virtual/perl-CPAN-2.180.0
+-~virtual/perl-Carp-1.420.0
+-~virtual/perl-Compress-Raw-Zlib-2.74.0
+-~virtual/perl-Data-Dumper-2.167.0
+-~virtual/perl-Devel-PPPort-3.350.0
+-~virtual/perl-Digest-SHA-5.960.0
+-~virtual/perl-Encode-2.880.0
+-~virtual/perl-Exporter-5.720.0
+-~virtual/perl-ExtUtils-CBuilder-0.280.225
+-~virtual/perl-ExtUtils-Constant-0.230.0
+-~virtual/perl-ExtUtils-Install-2.40.0
+-~virtual/perl-ExtUtils-MakeMaker-7.240.0
+-~virtual/perl-ExtUtils-ParseXS-3.340.0
+-~virtual/perl-File-Spec-3.670.0
+-~virtual/perl-Filter-Simple-0.930.0
+-~virtual/perl-Getopt-Long-2.490.0
+-~virtual/perl-I18N-LangTags-0.420.0
+-~virtual/perl-IO-1.380.0
+-~virtual/perl-IO-Socket-IP-0.380.0
+-~virtual/perl-IPC-Cmd-0.960.0
+-~virtual/perl-JSON-PP-2.274.0.200_rc
+-~virtual/perl-Locale-Maketext-1.280.0
+-~virtual/perl-Math-BigInt-1.999.806
+-~virtual/perl-Math-BigInt-FastCalc-0.500.500
+-~virtual/perl-Math-BigRat-0.261.100
+-~virtual/perl-Module-CoreList-5.201.804.140
+-~virtual/perl-Net-Ping-2.550.0
+-~virtual/perl-Scalar-List-Utils-1.460.200_rc
+-~virtual/perl-Socket-2.20.30_rc
+-~virtual/perl-Storable-2.620.0
+-~virtual/perl-Test-1.300.0
+-~virtual/perl-Test-Harness-3.380.0
+-~virtual/perl-Test-Simple-1.302.73
+-~virtual/perl-Time-HiRes-1.974.100
+-~virtual/perl-Time-Piece-1.310.0
+-~virtual/perl-Unicode-Collate-1.190.0
+-~virtual/perl-Unicode-Normalize-1.250.0
+-~virtual/perl-XSLoader-0.270.0
+-~virtual/perl-bignum-0.470.0
+-~virtual/perl-if-0.60.600
+-~virtual/perl-libnet-3.100.0
+-~virtual/perl-podlators-4.90.0
+-~virtual/perl-threads-2.150.0
+-~virtual/perl-threads-shared-1.560.0
+-~virtual/perl-version-0.991.700
+
 # Raúl Porcel <armin76@gentoo.org> (2014-11-17)
 # Mask sys-devel/kgcc64 since >=gcc-4.4 can build 64bit kernels
 sys-devel/kgcc64
diff --git a/profiles/arch/sparc/package.use b/profiles/arch/sparc/package.use
index aad975a6da70..4babc96027fc 100644
--- a/profiles/arch/sparc/package.use
+++ b/profiles/arch/sparc/package.use
@@ -6,3 +6,7 @@
 dev-ml/llvm-ocaml llvm_targets_AMDGPU
 sys-devel/clang llvm_targets_AMDGPU
 sys-devel/llvm llvm_targets_AMDGPU
+
+# Ben Kohler <bkohler@gentoo.org> (2019-09-03)
+# Enable SPARC OpenBoot support
+sys-boot/grub:2 grub_platforms_ieee1275
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index cb45c2c6f171..3909985198b1 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -115,6 +115,10 @@ dev-libs/hiredis test
 # DOSBox + OpenGLide is untested on this arch.
 games-emulation/dosbox glide
 
+# Fabian Groffen <grobian@gentoo.org> (2016-12-07)
+# unkeyworded notmuch dependency, bug #587560
+mail-client/mutt notmuch
+
 # Michał Górny <mgorny@gentoo.org> (2016-11-18)
 # libomp does not support SPARC, #600148.
 sys-devel/clang-runtime openmp
@@ -315,6 +319,11 @@ x11-misc/xscreensaver new-login
 # libhid is not keyworded
 app-misc/lcdproc hid lcd_devices_mdm166a
 
+# Anthony G. Basile <blueness@gentoo.org> (2011-12-21)
+# Mask the vde flag on tinc because net-misc/vde is not
+# keyworded for sparc
+net-vpn/tinc vde
+
 # Alexey Shvetsov <alexxy@gentoo.org> (2011-12-17)
 # Mask use numa for openmpi
 sys-cluster/openmpi openmpi_fabrics_psm openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_ofed openmpi_fabrics_dapl openmpi_rm_slurm openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index f17c3d6f5ace..21a61f4b994d 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -1,60 +1,6 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# When you add an entry to the top of this file, add your name, the date, and
-# an explanation of why something is getting masked. Please be extremely
-# careful not to commit atoms that are not valid, as it can cause large-scale
-# breakage, especially if it ends up in the daily snapshot.
-#
-## Example:
-##
-## # Dev E. Loper <developer@gentoo.org> (2012-06-28)
-## # Masking foo USE flag until we can get the
-## # foo stuff to work properly again (bug 12345)
-## =media-video/mplayer-0.90_pre5 foo
-## =media-video/mplayer-0.90_pre5-r1 foo
-#
-
-#--- END OF EXAMPLES ---
-
-# Sergei Trofimovich <slyfox@gentoo.org> (2019-05-03)
-# Requires net-libs/webkit-gtk. Not stable on sparc.
-dev-util/geany-plugins markdown
-
-# Sergei Trofimovich <slyfox@gentoo.org> (2019-03-31)
-# No stable dovecot on net-mail/dovecot, bug #634822.
-mail-filter/maildrop dovecot
-
-# Sergei Trofimovich <slyfox@gentoo.org> (2018-12-25)
-# Needs net-mail/mailutils and net-libs/webkit-gtk which are not
-# stable (yet?), bug #663248
-app-editors/emacs mailutils xwidgets
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2018-09-14)
-# media-libs/libraw is not stable
-media-gfx/imagemagick raw
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2018-05-07)
-# sci-visualization/gnuplot is not stable.
-sci-libs/libqalculate gnuplot
-sci-mathematics/octave gnuplot
-
-# Mart Raudsepp <leio@gentoo.org> (2017-09-02)
-# Drop stable gstreamer on sparc, can move to use.stable.mask
-# after gstreamer:0.10 is gone; #601354
-dev-libs/efl gstreamer
-media-sound/mp3splt-gtk gstreamer
-net-im/pidgin gstreamer
-media-libs/libcanberra gstreamer
-
-# Pacho Ramos <pacho@gentoo.org> (2015-08-02)
-# Missing keywords
-dev-python/pyquery test
-sys-fs/dmraid klibc
-
-# Pacho Ramos <pacho@gentoo.org> (2014-07-02)
-# Mask due Gnome3 not going to be stabilized on this arch
-dev-util/geany-plugins gtkspell
->=gnome-base/gnome-desktop-2.32.1-r2 license-docs
-gnome-base/gvfs google
->=x11-libs/gtk+-3.12.2 cloudprint
+# Matt Turner <mattst88@gentoo.org> (2019-08-27)
+# No stable nftables yet.
+net-firewall/iptables nftables
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index 5d188553c6b0..a5963370adbb 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -168,7 +168,6 @@ redis
 
 # USE-flags from differents origins
 brltty
-directfb
 djbfft
 dvb
 java
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index b24b2fe93808..9d4081792d4b 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -8,6 +8,10 @@
 # Temporary mask for stable bug 688976
 ruby_targets_ruby25
 
+# Ben Kohler <bkohler@gentoo.org> (2019-06-11)
+# Pulls in net-libs/axtls which is not stable for sparc
+curl_ssl_axtls
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-02-02)
 # No stable app-arch/rpm on sparc.
 rpm
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 69c61d58e064..c0600e4ae9f1 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -47,7 +47,3 @@ ABI_X86="32"
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148
 USE="libtirpc"
-
-# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
-# Temporary RUBY_TARGETS for bug 688976
-RUBY_TARGETS="ruby24 -ruby25"
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index a13a9ba9dd8c..d8437f82970a 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,11 @@
 
 # This file requires >=portage-2.1.1
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-08-28)
+# upstream provides docs and tools for tier-1 arches
+dev-lang/rust-bin -doc
+>=dev-lang/rust-bin-1.37 -clippy -rustfmt
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-08-18)
 # media-video/pipewire is not keyworded yet
 dev-libs/weston pipewire
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 32aebf145aa9..c30ac38e05bc 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
-# Temporary mask for stable bug 688976
-ruby_targets_ruby25
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2018-11-17)
 # media-sound/audacious is not yet stabilised
 audacious
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 678b493f8670..298897cef62c 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -13,7 +13,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
@@ -175,3 +175,8 @@ POSTGRES_TARGETS="postgres10 postgres11"
 # of PHP, to avoid pulling in an unstable PHP on stable systems.
 #
 PHP_TARGETS="php7-2"
+
+# Alfredo Tupone <tupone@gentoo.org> (2019-09-03)
+#
+# Default ADA target
+ADA_TARGET="gnat_2018"
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 081b86bcd413..d8f5108cb0fb 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (2019-09-01)
+# <dev-scheme/guile-2 is package.mask'd, so force USE=guile2
+media-sound/lilypond guile2
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-08-17)
 # USE=-cxx us a sure way to break native install as modern gcc
 # requires C++ to bootstrap. But in rare cases it's useful
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 42b7549742bd..82413ef6a620 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,26 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Thomas Deutschmann <whissi88@gentoo.org> (2019-09-02)
+# PGO not yet supported for comm-central, #693160
+>=mail-client/thunderbird-68 pgo
+
+# Matt Turner <mattst88@gentoo.org> (2019-09-01)
+# <dev-scheme/guile-2 is package.mask'd
+www-client/elinks guile
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# sci-libs/grib_api is slated for removal.
+dev-lang/gdl grib
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# net-misc/tokyotyrant is slated for removal.
+app-metrics/collectd collectd_plugins_tokyotyrant
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-25)
+# sys-cluster/open-mx is masked for removal.
+sys-cluster/openmpi openmpi_fabrics_open-mx
+
 # Kent Fredric <kentnl@gentoo.org> (2019-08-07)
 # Newer versions of nqp need newer versions of jdk to run on the jvm,
 # but these currently don't exist in gentoo. The USE flags have to be
@@ -62,12 +82,6 @@ games-emulation/vbam ffmpeg
 # bug #318841#c20.
 sys-kernel/linux-firmware unknown-license
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2019-05-11)
-# app-accessibility/festival:
-# Outdated, EAPI=2, unmaintained, segfaults immediately.
-# See bug 634928 and bug 612980. Removal in 30 days.
-media-radio/xastir festival
-
 # Virgil Dupras <vdupras@gentoo.org> (2019-04-29)
 # Docs are temporarily broken. See bug #680014
 dev-python/pandas doc
@@ -84,10 +98,6 @@ app-text/ghostscript-gpl l10n_ja
 dev-java/openjdk-jre-bin:8 gentoo-vm
 dev-java/openjdk-jre-bin:11 gentoo-vm
 
-# Michał Górny <mgorny@gentoo.org> (2019-04-13)
-# net-libs/ftplib is slated for removal.
-app-cdr/xbiso ftp
-
 # Michał Górny <mgorny@gentoo.org> (2019-04-10)
 # media-sound/aacplusenc is slated for removal.
 media-video/h264enc aac
@@ -109,7 +119,6 @@ dev-python/construct python_targets_python2_7
 # Has multiple issues including symlinks and threading.
 # Packages should use and access libmariadb.so instead
 dev-db/mariadb-connector-c mysqlcompat
-~media-tv/kodi-17.6 mariadb
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-03-05)
 # Not keyworded on non-x86 arches
@@ -117,17 +126,16 @@ app-admin/conserver freeipmi
 
 # Matt Turner <mattst88@gentoo.org> (2019-03-03)
 # Mask for testing. Bug 606924
+# Jeroen Roovers <jer@gentoo.org> (2019-09-02)
+# Bug 692170
 media-libs/mesa libglvnd
+x11-drivers/nvidia-drivers libglvnd
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-01-17)
 # Mask openjdk:8 for use as system java-vm until it's proven to work
 dev-java/openjdk:8 gentoo-vm
 dev-java/openjdk-bin:8 gentoo-vm
 
-# Sven Wegener <swegener@gentoo.org> (2019-01-18)
-# Waiting for >=dev-libs/libressl-2.7 to be unmasked.
->=net-libs/libvncserver-0.9.12 libressl
-
 # William Hubbs <williamh@gentoo.org> (2019-01-13)
 # For memtest86+ mask the floppy use flag since it requires grub:0 which
 # is being removed
@@ -167,10 +175,6 @@ dev-cpp/eigen test
 kde-apps/cantor julia
 sci-libs/ceres-solver sparse
 
-# Alon Bar-Lev <alonbl@gentoo.org> (2018-11-08)
-# Waiting for >=dev-libs/libressl-2.7 to be unmasked.
->=app-crypt/xca-2.1.0 libressl
-
 # Alfredo Tupone <tupone@gentoo.org> (2018-10-24)
 # jit brokes build of gnat-gpl
 dev-lang/gnat-gpl jit
@@ -181,10 +185,6 @@ dev-lang/gnat-gpl jit
 # masked. bug #666619
 dev-python/paramiko server
 
-# Alon Bar-Lev <alonbl@gentoo.org> (2018-09-11)
-# Waiting for >=dev-libs/libressl-2.7 to be stablized.
->=dev-libs/opensc-0.18.0 libressl
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2018-08-03)
 # New and for Gentoo still quite experimental. You've been
 # warned. (Also, works only on x86_64 and with certain CPUs
@@ -203,10 +203,6 @@ sys-cluster/ceph static-libs
 # Depends on last-rited sci-libs/coinhsl.
 sci-libs/ipopt hsl
 
-# Mike Gilbert <floppym@gentoo.org> (2018-05-01)
-# Requires >=media-video/ffmpeg-4 (bug 654208).
->=www-client/chromium-67 system-ffmpeg
-
 # Göktürk Yüksek <gokturk@gentoo.org> (2018-04-04)
 # libewf is getting treecleaned (#547418).
 # Starting with sleuthkit-4.6.0, we statically link sleuthkit to a
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 21c108c9ec8d..0a00fc800bb7 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Kent Fredric <kentnl@gentoo.org> (2019-08-29)
+# Support for DBD-mysql to use mariadb is sketchy. Use DBD-MariaDB
+# instead if you can.
+dev-perl/DBD-mysql mariadb
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-08-16)
 # dev-libs/libical[glib] was not stable tested, bug #689434
 =dev-libs/libical-3.0.5 glib
@@ -56,9 +61,10 @@ media-gfx/alembic arnold maya
 media-plugins/grilo-plugins chromaprint
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-02-16)
-# Unstable dependencies.
-media-gfx/digikam vkontakte
+# media-libs/opencv[contrib,contrib_dnn], net-libs/libmediawiki,
+# net-libs/libkvkontakte all not stable anywhere.
 kde-apps/kipi-plugins mediawiki vkontakte
+media-gfx/digikam dnn vkontakte
 
 # Brian Evans <grknight@gentoo.org> (2018-12-06)
 # Mask USE flag since argon2 dependency is not stable on most arches
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 7a2b7dbc5f55..fff8836e1fd9 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Matt Turner <mattst88@gentoo.org> (2019-09-01)
+# app-office/texmacs is package.mask'd. Bug #436400
+texmacs
+
 # Brian Evans <grknight@gentoo.org> (2019-07-25)
 # Mask flag for early testing
 php_targets_php7-4
diff --git a/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/eapi b/profiles/default/bsd/fbsd/amd64/11.1/clang/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/eapi
+++ b/profiles/default/bsd/fbsd/amd64/11.1/clang/eapi
diff --git a/profiles/default/bsd/use.mask b/profiles/default/bsd/use.mask
index 390fcc3df99a..6629ace9a073 100644
--- a/profiles/default/bsd/use.mask
+++ b/profiles/default/bsd/use.mask
@@ -1,5 +1,5 @@
-# Copyright 1999-2018 Gentoo Authors.
-# Distributed under the terms of the GNU General Public License, v2
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 # Mart Raudsepp <leio@gentoo.org>
 # net-misc/networkmanager not keyworded
@@ -15,7 +15,6 @@ alsa
 v4l
 libv4l
 fbcon
-directfb
 gpm
 lirc
 multilib
diff --git a/profiles/default/linux/alpha/17.0/use.mask b/profiles/default/linux/alpha/17.0/use.mask
deleted file mode 100644
index 50a187c63e49..000000000000
--- a/profiles/default/linux/alpha/17.0/use.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Anthony G. Basile <blueness@gentoo.org> (2012-04-15)
-# Pulls in net-libs/axtls which is not keyworded for arch
-curl_ssl_axtls
diff --git a/profiles/default/linux/alpha/17.0/use.stable.mask b/profiles/default/linux/alpha/17.0/use.stable.mask
deleted file mode 100644
index f54e7a1f560a..000000000000
--- a/profiles/default/linux/alpha/17.0/use.stable.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
diff --git a/profiles/default/linux/alpha/package.use.mask b/profiles/default/linux/alpha/package.use.mask
deleted file mode 100644
index 2b0250529226..000000000000
--- a/profiles/default/linux/alpha/package.use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2017-06-15)
-# net-mail/notmuch is not keyworded, and holds back stabilisation, see
-# bug https://bugs.gentoo.org/show_bug.cgi?id=604902
-mail-client/mutt notmuch
diff --git a/profiles/default/linux/ia64/17.0/use.mask b/profiles/default/linux/ia64/17.0/use.mask
deleted file mode 100644
index 440155068a76..000000000000
--- a/profiles/default/linux/ia64/17.0/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Anthony G. Basile <blueness@gentoo.org> (2012-04-15)
-# Pulls in net-libs/axtls which is not keyworded for arch
-curl_ssl_axtls
diff --git a/profiles/default/linux/ia64/17.0/use.stable.mask b/profiles/default/linux/ia64/17.0/use.stable.mask
deleted file mode 100644
index 90062e0f6d10..000000000000
--- a/profiles/default/linux/ia64/17.0/use.stable.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/default/linux/m68k/17.0/package.mask b/profiles/default/linux/m68k/17.0/package.mask
deleted file mode 100644
index 17532723914b..000000000000
--- a/profiles/default/linux/m68k/17.0/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/default/linux/mips/package.use.mask b/profiles/default/linux/mips/package.use.mask
deleted file mode 100644
index c3bd17b1a146..000000000000
--- a/profiles/default/linux/mips/package.use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2016-12-07)
-# unkeyworded notmuch dependency, bug #587560
-mail-client/mutt notmuch
diff --git a/profiles/default/linux/powerpc/package.use.mask b/profiles/default/linux/powerpc/package.use.mask
index 6a1e090315a6..fdb8bc6a6571 100644
--- a/profiles/default/linux/powerpc/package.use.mask
+++ b/profiles/default/linux/powerpc/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (2016-12-07)
-# unkeyworded notmuch dependency, bug #587560
-mail-client/mutt notmuch
-
 # Mike Frysinger <vapier@gentoo.org> (2014-10-21)
 # This target supports ASAN/etc... #504200.
 sys-devel/gcc -sanitize
diff --git a/profiles/default/linux/sparc/17.0/64ul/desktop/eapi b/profiles/default/linux/sparc/17.0/64ul/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/64ul/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/17.0/64ul/desktop/parent b/profiles/default/linux/sparc/17.0/64ul/desktop/parent
new file mode 100644
index 000000000000..db8ce088c69a
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/64ul/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/profiles/default/linux/sparc/17.0/64ul/developer/eapi b/profiles/default/linux/sparc/17.0/64ul/developer/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/64ul/developer/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/17.0/64ul/developer/parent b/profiles/default/linux/sparc/17.0/64ul/developer/parent
new file mode 100644
index 000000000000..5c8258a71e32
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/64ul/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/developer
diff --git a/profiles/default/linux/sparc/17.0/64ul/eapi b/profiles/default/linux/sparc/17.0/64ul/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/64ul/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/17.0/64ul/parent b/profiles/default/linux/sparc/17.0/64ul/parent
new file mode 100644
index 000000000000..e7b5079fc132
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/64ul/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/sparc/64ul
diff --git a/profiles/default/linux/sparc/17.0/64ul/systemd/eapi b/profiles/default/linux/sparc/17.0/64ul/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/64ul/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/17.0/64ul/systemd/parent b/profiles/default/linux/sparc/17.0/64ul/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/64ul/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/default/linux/sparc/17.0/desktop/gnome/parent b/profiles/default/linux/sparc/17.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e01478..000000000000
--- a/profiles/default/linux/sparc/17.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent
deleted file mode 100644
index f5c1ae438de4..000000000000
--- a/profiles/default/linux/sparc/17.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/sparc/17.0/make.defaults b/profiles/default/linux/sparc/17.0/make.defaults
deleted file mode 100644
index 15095e86283a..000000000000
--- a/profiles/default/linux/sparc/17.0/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# LIBDIR_* moved from features/multilib, #609178.
-# TODO: figure out whether this can be moved to arch/sparc
-LIBDIR_sparc32="lib"
-LIBDIR_sparc64="lib64"
diff --git a/profiles/default/linux/sparc/17.0/package.use.mask b/profiles/default/linux/sparc/17.0/package.use.mask
deleted file mode 100644
index 2ede42030159..000000000000
--- a/profiles/default/linux/sparc/17.0/package.use.mask
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Anthony G. Basile <blueness@gentoo.org> (2011-12-21)
-#
-# Mask the vde flag on tinc because net-misc/vde is not
-# keyworded for sparc
-net-vpn/tinc vde
diff --git a/profiles/default/linux/sparc/17.0/systemd/eapi b/profiles/default/linux/sparc/17.0/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/17.0/systemd/parent b/profiles/default/linux/sparc/17.0/systemd/parent
new file mode 100644
index 000000000000..ced72403bde9
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/systemd
diff --git a/profiles/default/linux/sparc/17.0/use.stable.mask b/profiles/default/linux/sparc/17.0/use.stable.mask
deleted file mode 100644
index f24ba8c0196b..000000000000
--- a/profiles/default/linux/sparc/17.0/use.stable.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Ben Kohler <bkohler@gentoo.org> (2019-06-11)
-# Pulls in net-libs/axtls which is not stable for sparc
-curl_ssl_axtls
diff --git a/profiles/default/linux/sparc/package.use.mask b/profiles/default/linux/sparc/package.use.mask
index 6a1e090315a6..fdb8bc6a6571 100644
--- a/profiles/default/linux/sparc/package.use.mask
+++ b/profiles/default/linux/sparc/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (2016-12-07)
-# unkeyworded notmuch dependency, bug #587560
-mail-client/mutt notmuch
-
 # Mike Frysinger <vapier@gentoo.org> (2014-10-21)
 # This target supports ASAN/etc... #504200.
 sys-devel/gcc -sanitize
diff --git a/profiles/desc/ada_target.desc b/profiles/desc/ada_target.desc
new file mode 100644
index 000000000000..af88195ca134
--- /dev/null
+++ b/profiles/desc/ada_target.desc
@@ -0,0 +1,8 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+gnat_2016 - Compile with dev-lang/gnat-gpl-2016
+gnat_2017 - Compile with dev-lang/gnat-gpl-2017
+gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+gnat_2019 - Compile with dev-lang/gnat-gpl-2019
+
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 010c6b8f5a5c..52e0d06dc8d4 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -8,10 +8,6 @@ sys-libs/glibc
 sys-apps/systemd
 sys-fs/udev
 
-# dev-libs/elfutils needs a port to musl, bug #602126
-dev-libs/elfutils
->virtual/libelf-2
-
 # Ian Stakenvicius, 2017-06-14
 # on behalf of mozilla@gentoo.org
 # Mask firefox-54 and above as it requires rust
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index 4861b78c15c2..508d530d08ae 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -31,7 +31,3 @@ x11-misc/gpaste gnome
 x11-terms/gnome-terminal gnome-shell
 x11-themes/zukitwo gnome-shell
 net-wireless/bluez user-session
-
-# Alex Brandt <alunduil@gentoo.org> (2015-09-06)
-# app-emulation/rkt[rkt_stage1_src] requires systemd which isn't available with selinux.
-app-emulation/rkt rkt_stage1_src
diff --git a/profiles/license_groups b/profiles/license_groups
index 4c4cf391ada3..2f8c80dd5c18 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artisti
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j DUMB-0.9.3 eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
+MISC-FREE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j DUMB-0.9.3 eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
diff --git a/profiles/package.mask b/profiles/package.mask
index f8ecfd1f1e49..c68e6f79ce01 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,279 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2019-09-04)
+# EAPI 2. Brutally outdated and untouched for ages. Removal in
+# 30 days, bug 688504
+sci-libs/openfoam-bin
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-04)
+# EAPI 0.  Keyworded only for x86-fbsd which is dead.  Practically untouched
+# since 2007.  Removal in 30 days.  Bug #693504.
+app-admin/consolehm
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-04)
+# Unmaintained.  EAPI 0.  Last touched in 2010.  No real homepage.
+# No clear advantage over app-text/tree.
+# Removal in 30 days.  Bug #693502.
+app-text/ddir
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-04)
+# A metapackage without a really clear purpose.  No reverse
+# dependencies.
+# Removal in 30 days.
+app-text/docbook-sgml
+
+# Lars Wendler <polynomial-c@gentoo.org> (2019-09-04)
+# Unofficial build. Superseded by official 2.49.5 release.
+# Masked for removal.
+=www-client/seamonkey-2.49.9.1_p0
+
+# Matthias Maier <tamiko@gentoo.org> (2019-09-03)
+# Duplicate package - use sci-libs/med instead, bug #693146
+# (Expedited) removal in 7 days
+sci-libs/libmed
+
+# Matt Turner <mattst88@gentoo.org> (2019-09-03)
+# Not supported by the current browserpass extension.
+# Removal in 30 days
+<www-plugins/browserpass-3
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-02)
+# gnome-vfs was deprecated along with GNOME 2.22 in favor of gvfs.
+# gnome-vfsmm provides C++ bindings for it, with last release in 2009
+# and only one reverse dependency.
+#
+# assogiate is the last revdep of gnome-vfsmm.  It was last bumped
+# in 2007, and the homepage is long gone (last seen ~2009).
+#
+# Removal in 30 days.  Bug #649000.
+dev-cpp/gnome-vfsmm
+gnome-extra/assogiate
+
+# Matt Turner <mattst88@gentoo.org> (2019-09-01)
+# <dev-scheme/guile-2 is package.mask'd
+<media-sound/lilypond-2.19
+
+# Matt Turner <mattst88@gentoo.org> (2019-09-01)
+# dev-scheme/guile-gnome-platform depends on dev-scheme/guile:12. Its only
+# reverse dependency is sci-chemistry/burrow-owl, so include it. The others are
+# dependencies of sci-chemistry/burrow-owl as well, and it is their only
+# reverse dependency.
+# Bug #693290.
+dev-libs/g-wrap
+dev-scheme/guile-cairo
+dev-scheme/guile-gnome-platform
+dev-scheme/guile-lib
+sci-chemistry/burrow-owl
+sci-libs/starparse
+
+# Matt Turner <mattst88@gentoo.org> (2019-09-01)
+# Unmaintained, unpackaged versions from 2015. Incompatible with guile-2.2.
+# Removal in 30 days. # Bug #654654.
+games-strategy/liquidwar6
+
+# Matt Turner <mattst88@gentoo.org> (2019-09-01)
+# TeXmacs is the only remaining package in tree that requires guile-1.8, which
+# is unsupported upstream. A TeXmacs port to Guile-2 has been in progress for a
+# few years. Bug #436400
+app-office/texmacs
+<dev-scheme/guile-2
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-01)
+# Remnant of Half-Life server stuff that was removed back in 2005.
+# Removal in 30 days.  Bug #693260.
+dev-games/hlsdk
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-01)
+# Ancient, i386-only binary package.  Current version is a nightly
+# from 2006.  The package has had a release since, has found a new
+# upstream and has been forked multiple times as well.  Apparently
+# NetRadiant-custom is the most recently maintained fork (not packaged).
+# Removal in 30 days.  Bug #181372.
+dev-games/gtkradiant
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-01)
+# Never keyworded on amd64 (and probably does not work on 64-bit
+# systems).  Last release from 2001.  Requires rare hardware.
+# Removal in 30 days.  Bug #693258.
+dev-games/flinker
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-01)
+# Last bumped in 2007.  The current version is known to be broken
+# on amd64.  The game has been discontinued, and then revived/forked
+# multiple times.  It is pending a version bump since at least 2011.
+# See [1] for the 'revived' project and links to other forks.
+# [1] http://www.netpanzer.info/Download/
+# Removal in 30 days.  Bug #375237.
+games-strategy/netpanzer
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-01)
+# Discontinued upstream.  Last release in 2003.  Replaced
+# by dev-embedded/urjtag.
+# Removal in 30 days.  Bug #693256.
+dev-embedded/jtag
+
+# Joonas Niilola <juippis@gentoo.org> (2019-08-31)
+# No maintainer and no one stepped in to take it after a mailing 
+# list announcement. Has QA issues and continuous CI issues. Removal 
+# in 30 days.
+# Bugs: #690784, #691376, #693184
+app-misc/pip3line
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-31)
+# Unmaintained.  EAPI 0 ebuilds with multiple QA issues.  Last release
+# added in 2003.  Upstream removed all traces of it.
+# Removal in 30 days.  Bug #693186.
+www-apache/mod_pcgi2
+www-apps/pcgi
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-30)
+# All current releases are incompatible with the current version
+# of mail-mta/opensmtpd.  Not touched by maintainer since 2016.  Some
+# USE flag combinations fail to build with other errors.  Needs porting
+# to new Python eclasses.
+# Removal in 30 days.  Bug #693128.
+mail-filter/opensmtpd-extras
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-30)
+# Unmaintained.  EAPI=0.  HOMEPAGE and SRC_URI are gone.  Last release
+# in 2006.  Removal in 30 days.  Bug #680412.
+mail-filter/ask
+
+# Ulrich Müller <ulm@gentoo.org> (2019-08-30)
+# Last visible upstream activity in 2013. Doesn't work with Emacs 24.3
+# or newer. Byte-compilation of newest upstream version 1.3.1 fails.
+# Masked for removal in 30 days, bug #693118.
+app-emacs/identica-mode
+
+# David Seifert <soap@gentoo.org> (2019-08-29)
+# Dead upstream, last commit over 10 years ago, no revdeps, EAPI=0,
+# Removal in 30 days.
+sci-electronics/gplcver
+
+# David Seifert <soap@gentoo.org> (2019-08-29)
+# Dead upstream, last release in 2008, no revdeps, removal in 30 days.
+dev-cpp/threadpool
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-29)
+# Added in 2012 and not touched since.  Fails multilib-strict.  Pending
+# version bump.  No reverse dependencies.
+# Removal in 30 days.  Bug #667064.
+net-misc/libss7
+
+# Stefan Strogin <steils@gentoo.org> (2019-08-29)
+# Obsolete. No reverse dependencies (games-rpg/eternal-lands no longer
+# depends on them).
+# Removal in 30 days. Bug #549890.
+games-rpg/eternal-lands-bloodsucker
+games-rpg/eternal-lands-data
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-28)
+# Last touched in 2010.  EAPI=0.  Last upstream release in 2011 (pending
+# bump).  No reverse dependencies.
+# Removal in 30 days.  Bug #681168.
+dev-embedded/scratchbox
+dev-embedded/scratchbox-devkit-apt-https
+dev-embedded/scratchbox-devkit-cputransp
+dev-embedded/scratchbox-devkit-debian
+dev-embedded/scratchbox-devkit-debian-squeeze
+dev-embedded/scratchbox-devkit-doctools
+dev-embedded/scratchbox-devkit-git
+dev-embedded/scratchbox-devkit-maemo3
+dev-embedded/scratchbox-devkit-perl
+dev-embedded/scratchbox-devkit-qemu
+dev-embedded/scratchbox-devkit-svn
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# Unmaintained.  No release since 2008.  Is reported to wrongly reject
+# 'pretty much all mails', also reported build failure.
+# Removal in 30 days.  Bug #519668.
+mail-filter/sid-milter
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# Fails to build against openssl-1.1.  Not touched by Gentoo maintainer
+# who is also upstream since 2016, and the problem has been reported
+# in Jan 2019.  Removal in 30 days.  Bug #674800.
+app-crypt/af_alg
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# Our version is seriously outdated and has numerous bugs reported,
+# including multilib-strict failures preventing it from being installed
+# on any modern system.  It has not been touched since 2016, and is
+# many releases behind upstream.  Furthermore, upstream has discontinued
+# it in favor of eeCodes.
+# Removal in 30 days.  Bug #628746.
+sci-libs/grib_api
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# Not touched since 2012.  Homepage gone, and no replacement found.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #692796.
+dev-tcltk/tkTheme
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# Discontinued upstream, in favor of Tokyo Tycoon.  Last release
+# in 2010.  Not touched by the Gentoo maintainer since 2010, with bugs
+# having to be addressed by other developers.
+# Removal in 30 days.  Bug #681044.
+net-misc/tokyotyrant
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# Live ebuild committed in Oct 2018, and not updated since.  Suffers
+# from numerous QA violations.  Never had a keyworded version.
+# Removal in 14 days.  Bug #692048.
+net-misc/hblink
+
+# Ulrich Müller <ulm@gentoo.org> (2019-08-26)
+# A more recent version of thumbs.el is distributed
+# as part of GNU Emacs proper.
+# Masked for removal in 30 days, bug #692882.
+app-emacs/thumbs
+
+# Brian Evans <grknight@gentoo.org> (2019-08-26)
+# Deprecated virtual as it cannot solve the issue of ABI incompatibility
+# and rebuild consumers when provider changes
+# No revdeps. Removal in 30 days.
+virtual/libmysqlclient
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-25)
+# Discontinued upstream in 2015, and not touched in Gentoo since.
+# Has series of build failures reported due to growing incompatibility
+# with new kernels.  Removal in 30 days.  Bug #677618.
+sys-cluster/open-mx
+
+# Brian Evans <grknight@gentoo.org> (2019-08-23)
+# These packages are incompatible with current versions of PHP (7 or higher)
+# They need a maintainer but no one has volunteered.
+# Removal in 30 days if no one picks them up.
+# Bugs 615472 651166 and 651180 respectively
+www-apps/groupoffice
+www-apps/phpwebsite
+www-apps/sitebar
+
+# Matthias Maier <tamiko@gentoo.org> (2019-08-22)
+# Masked for removal in 30 days. Unmaintained and upstream has released
+# backdoored versions for more than a year due to a compromised development
+# server, http://www.webmin.com/exploit.html
+app-admin/webmin
+
+# Hans de Graaff <graaff@gentoo.org> (2019-08-21)
+# This virtual was useful when jruby was still around but this
+# has not been the case for a long time and there are no
+# reverse dependencies for this package anymore.
+# Removal in 30 days.
+virtual/ruby-ffi
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2019-08-19)
+# Depends on >=virtual/{jdk,jre}-11 which is masked
+=www-servers/tomcat-9.0.24
+
+# Michael Orlitzky <mjo@gentoo.org> (2019-08-18)
+# Ebuilds contain a two-year old root exploit. Less-than-maintained
+# since robbat2's announcement on 2017-11-30. Binary package to begin
+# with. Masked for removal eventually, https://bugs.gentoo.org/630808
+app-misc/dnetc
+
 # Mart Raudsepp <leio@gentoo.org> (2019-08-18)
 # Fails to dbus activate properly for me. Help welcome figuring it out.
 net-misc/gnome-remote-desktop
@@ -41,7 +314,6 @@ sys-kernel/bliss-initramfs
 # Aaron Bauman <bman@gentoo.org> (2019-08-17)
 # Relies on vulnerable automake:{1.9,1.10}
 # Removal in 30 days
-games-simulation/crrcsim
 media-gfx/pixie
 net-irc/eiwic
 net-misc/openrdate
@@ -78,12 +350,6 @@ sci-mathematics/spass
 # Removal in 30 days.  Bug #691840.
 sys-apps/lomoco
 
-# Michał Górny <mgorny@gentoo.org> (2019-08-14)
-# Replaced by sys-freebsd/freebsd-ubin, therefore not installable
-# anymore.  All revdeps support the replacement.
-# Removal in 14 days.  Bug #688502.
-sys-process/fuser-bsd
-
 # Aaron Bauman <bman@gentoo.org> (2019-08-14)
 # open sec bug #622428, unmaintained
 # list includes rdeps. Removal in 30 days.
@@ -152,89 +418,10 @@ dev-java/jlayer
 # and accept a more unstable release.
 >=www-client/chromium-78
 
-# Mikle Kolyada <zlogene@gentoo.org> (2019-08-05)
-# dead upstream, does not work and compile
-#(bug #688006, bug #686630)
-# masked for removal in 14 days
-app-text/winefish
-dev-tex/oesch
-
-# Aaron Bauman <bman@gentoo.org> (2019-08-04)
-# multiple open sec bugs. no response from upstream
-# Masked for removal in 30 days
-media-libs/ming
-dev-php/ming-php
-
-# Hans de Graaff <graaff@gentoo.org> (2019-08-03)
-# ruby24-only, no longer compiles with gcc 9, last release in 2009,
-# upstream gone, no reverse dependencies.
-# Masked for removal in 30 days, bug #691302
-dev-ruby/priorityqueue
-
-# Matt Turner <mattst88@gentoo.org> (2019-08-02)
-# Incompatible with guile-2
-# Masked for removal in 30 days, Bugs #592188
-sci-mathematics/drgeo
-
-# Matt Turner <mattst88@gentoo.org> (2019-08-02)
-# Incompatible with guile-2. No longer a use case
-# Masked for removal in 30 days, Bugs #617792
-mail-filter/anubis
-
-# Matt Turner <mattst88@gentoo.org> (2019-08-02)
-# Unmaintained in Gentoo. Incompatible with guile-2
-# Masked for removal in 30 days, Bugs #685540, #629058
-sci-libs/libctl
-sci-physics/harminv
-sci-physics/meep
-
-# Matt Turner <mattst88@gentoo.org> (2019-08-02)
-# Unmaintained. Incompatible with guile-2
-# Masked for removal in 30 days, Bugs #641864, #647536, #688244
-x11-libs/guile-gtk
-
-# Michał Górny <mgorny@gentoo.org> (2019-08-01)
-# Discontinued upstream in July 2017.  Has irritating bugs, and is hard
-# to build from source (we have binary package only).  Upstream
-# recommends net-misc/electrum as a replacement.
-# See: https://multibit.org/blog/2017/07/26/multibit-shutdown.html
-# Removal in 30 days.  Bug #639530.
-net-p2p/multibit
-
-# David Seifert <soap@gentoo.org> (2019-08-01)
-# Dead upstream, last release over 5 years ago,
-# broken build system, fails with boost 1.70,
-# removal in 30 days. Bug #646014, #691162
-dev-games/vamos
-
-# David Seifert <soap@gentoo.org> (2019-08-01)
-# Last touched over 3 years ago, broken tests,
-# fails with boost 1.70, removal in 30 days.
-# Bug #655886, #690704
-dev-python/pgmagick
-
-# Brian Evans <grknight@gentoo.org> (2019-07-31)
-# MySQL 5.5 will no longer receive updates from Oracle
-# It may or may not have unaccounced security vulnerabilities
-# Please upgrade to 5.6 or use dev-db/mariadb
-# Removal in 30 days
-=dev-db/mysql-5.5*
-
 # Miroslav Šulc <fordfrog@gentoo.org> (2019-07-30)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 =www-servers/tomcat-9.0.22
 
-# Michał Górny <mgorny@gentoo.org> (30 Jul 2019)
-# Obsolete virtual that was created back when dev-python/dnspython
-# needed separate slots for py2 & py3.  The versions needing it are long
-# gone.  Replace all its uses with dev-python/dnspython.
-# Removal in 30 days.
-virtual/python-dnspython
-
-# Thomas Deutschmann <whissi@gentoo.org> (2019-07-29)
-# Broken config parser
->=app-metrics/collectd-5.9.0
-
 # Mart Raudsepp <leio@gentoo.org> (2019-07-28)
 # GNOME 3.33 development release packages
 >=dev-libs/vala-common-0.45
@@ -250,38 +437,10 @@ dev-lang/vala:0.46
 dev-lang/php:7.4
 ~virtual/httpd-php-7.4
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-07-24)
-# Unmaintained and broken with current Plasma, removal in 30 days
-# Bugs: https://bugs.kde.org/show_bug.cgi?id=404359,
-# https://bugs.kde.org/show_bug.cgi?id=404360, see also HOMEPAGE comments
-kde-misc/plasma-active-window-control
-
-# Lars Wendler <polynomial-c@gentoo.org> (2019-07-21)
-# Requires >=mail-client/thunderbird-68_beta1 which is not in the tree yet
->=x11-plugins/enigmail-2.1
-
 # Sobhan Mohammadpour <sobhan@gentoo.org> (2019-07-14)
 # Masked for testing
 >=media-video/totem-3.32.1
 
-# Kent Fredric <kentnl@gentoo.org> (2019-07-14)
-# Broken since 2007, Upstream not seen since 2004.
-# Removal after 2019-08-16
-# Bug #635792
-dev-perl/libvorbis-perl
-
-# David Seifert <soap@gentoo.org> (2019-07-14)
-# Unmaintained, removed from Debian and other distros, tons of CVEs,
-# unreachable upstream, removal in 30 days
-# Bug #601068, #614028, #614032, #614566, #619120, #624988, #629286,
-# #635552, #662160, #674154, #674214, #684826, #689784
-media-libs/jasper
-
-# Kent Fredric <kentnl@gentoo.org> (2019-07-10)
-# Dead upstream, no remaining revdeps.
-# Masked for removal after 2019-08-09, bug #631300
-dev-perl/File-Slurp-Unicode
-
 # Robin H. Johnson <robbat2@gentoo.org> (2019-07-08)
 # Needs LOTS of testing, broke boot on my laptop in early attempts, maybe needs
 # matching genkernel work?
@@ -291,10 +450,6 @@ dev-perl/File-Slurp-Unicode
 # Requires >=dev-lang/lua-5.2 which is masked
 >=app-admin/conky-1.11.4
 
-# Sobhan Mohammadpour <sobhan@gentoo.org> (2019-07-04)
-# Mask until further testing is done
-=dev-libs/libgdata-0.17.10
-
 # Michał Górny <mgorny@gentoo.org> (2019-07-04)
 # The core FreeBSD packages are outdated, and have not been subject
 # to FreeBSD erratas for quite some time.  As a result, at least some
@@ -317,26 +472,10 @@ sys-freebsd/freebsd-ubin
 sys-freebsd/freebsd-usbin
 sys-freebsd/ubin-wrappers
 
-# Jonas Stein <jstein@gentoo.org> (2019-06-24)
-# Source is broken. Upstream is dead since 2011.
-# Removal after 2019-08-01. (bug #688552)
-media-sound/sfc
-
-# Mikle Kolyada <zlogene@gentoo.org> (2019-06-15)
-# Part of dev-texlive/texlive-latexextra
-# does not work with utf-8 (bug #688096)
-# removal in 30 days
-dev-tex/quotchap
-
 # Miroslav Šulc <fordfrog@gentoo.org> (2019-06-12)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 =www-servers/tomcat-9.0.21
 
-# Zac Medico <zmedico@gentoo.org> (2019-05-31)
-# Upstream is dead and there are multiple security vulnerabilities.
-# Removal in 30 days. Bug #687100.
-app-emulation/rkt
-
 # Patrick Lauer <patrick@gentoo.org> (2019-05-23)
 # PostgreSQL beta and release candidate releases are pre-release testing
 # versions, not meant for production use. They are feature-frozen, and are
@@ -349,16 +488,6 @@ app-emulation/rkt
 #     https://www.postgresql.org/developer/beta/
 dev-db/postgresql:12
 
-# Jonas Stein <jstein@gentoo.org> (2019-05-22)
-# Masked for removal after 2019-06-23. (bug #686260)
-# Wrong license, ships non-GPL image, maintainer needed.
-x11-plugins/gkrellflynn
-
-# Sebastian Pipping <sping@gentoo.org> (2019-05-22)
-# Masked for removal in 30 days (bug #686562)
-# Unfixed bug, dead upstream, not relevant enough
-sys-fs/pytagsfs
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2019-05-11)
 # Perl 5.24 will be removed soon. Please upgrade.
 <dev-lang/perl-5.26.2
@@ -420,21 +549,6 @@ sys-fs/pytagsfs
 =virtual/perl-threads-shared-1.510.0-r1
 =virtual/perl-version-0.991.600-r1
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2019-05-11)
-# Outdated, EAPI=2, unmaintained, segfaults immediately.
-# See bug 634928 and bug 612980.
-# Andrew Savchenko <bircoph@gentoo.org> (2019-06-09)
-# festival and speech-tools update is WIP now, so postponing removal.
-app-accessibility/festival
-app-accessibility/festival-freebsoft-utils
-app-accessibility/festival-hts
-app-accessibility/festival-fi
-app-accessibility/festival-it
-app-accessibility/festival-ru
-app-accessibility/perlbox-voice
-app-accessibility/pidgin-festival
-dev-ros/sound_play
-
 # Michał Górny <mgorny@gentoo.org> (2019-04-18)
 # All current versions of SystemRescueCD contain vulnerable packages.
 # Bug #683724.
diff --git a/profiles/prefix/aix/use.mask b/profiles/prefix/aix/use.mask
index 8ba50841f101..4728fdf3fb69 100644
--- a/profiles/prefix/aix/use.mask
+++ b/profiles/prefix/aix/use.mask
@@ -11,7 +11,6 @@ acpi
 alsa
 apm
 caps
-directfb
 djbfft
 fbcon
 ggi
diff --git a/profiles/prefix/darwin/macos/10.10/package.mask b/profiles/prefix/darwin/macos/10.10/package.mask
index 0fe00cbb0542..c103679ebe56 100644
--- a/profiles/prefix/darwin/macos/10.10/package.mask
+++ b/profiles/prefix/darwin/macos/10.10/package.mask
@@ -1,7 +1,2 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2012-09-30)
-# Requires XQuartz, since Apple dropped much of X-support in 10.8
-# (a.k.a. Mountain Lion), bug #431182
-media-libs/opengl-apple
diff --git a/profiles/prefix/darwin/macos/10.11/package.mask b/profiles/prefix/darwin/macos/10.11/package.mask
index f1eab2bde7e6..c103679ebe56 100644
--- a/profiles/prefix/darwin/macos/10.11/package.mask
+++ b/profiles/prefix/darwin/macos/10.11/package.mask
@@ -1,7 +1,2 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2012-09-30)
-# Requires XQuartz, since Apple dropped much of X-support in 10.8
-# (a.k.a. Mountain Lion), bug #431182
-media-libs/opengl-apple
diff --git a/profiles/prefix/darwin/macos/10.12/package.mask b/profiles/prefix/darwin/macos/10.12/package.mask
index ec06be2487a9..c103679ebe56 100644
--- a/profiles/prefix/darwin/macos/10.12/package.mask
+++ b/profiles/prefix/darwin/macos/10.12/package.mask
@@ -1,7 +1,2 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2012-09-30)
-# Requires XQuartz, since Apple dropped much of X-support in 10.8
-# (a.k.a. Mountain Lion), bug #431182
-media-libs/opengl-apple
diff --git a/profiles/prefix/darwin/macos/10.13/package.mask b/profiles/prefix/darwin/macos/10.13/package.mask
index ea39de0ebbf5..c103679ebe56 100644
--- a/profiles/prefix/darwin/macos/10.13/package.mask
+++ b/profiles/prefix/darwin/macos/10.13/package.mask
@@ -1,7 +1,2 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2012-09-30)
-# Requires XQuartz, since Apple dropped much of X-support in 10.8
-# (a.k.a. Mountain Lion), bug #431182
-media-libs/opengl-apple
diff --git a/profiles/prefix/darwin/macos/10.14/package.mask b/profiles/prefix/darwin/macos/10.14/package.mask
index 6a61d9527e86..c103679ebe56 100644
--- a/profiles/prefix/darwin/macos/10.14/package.mask
+++ b/profiles/prefix/darwin/macos/10.14/package.mask
@@ -1,7 +1,2 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2012-09-30)
-# Requires XQuartz, since Apple dropped much of X-support in 10.8
-# (a.k.a. Mountain Lion), bug #431182
-media-libs/opengl-apple
diff --git a/profiles/prefix/darwin/macos/10.8/package.mask b/profiles/prefix/darwin/macos/10.8/package.mask
index 5b83590aa957..c103679ebe56 100644
--- a/profiles/prefix/darwin/macos/10.8/package.mask
+++ b/profiles/prefix/darwin/macos/10.8/package.mask
@@ -1,7 +1,2 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2012-09-30)
-# Requires XQuartz, since Apple dropped much of X-support in 10.8
-# (a.k.a. Mountain Lion), bug #431182
-media-libs/opengl-apple
diff --git a/profiles/prefix/darwin/macos/10.9/package.mask b/profiles/prefix/darwin/macos/10.9/package.mask
index f7972754d55e..c103679ebe56 100644
--- a/profiles/prefix/darwin/macos/10.9/package.mask
+++ b/profiles/prefix/darwin/macos/10.9/package.mask
@@ -1,7 +1,2 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2012-09-30)
-# Requires XQuartz, since Apple dropped much of X-support in 10.8
-# (a.k.a. Mountain Lion), bug #431182
-media-libs/opengl-apple
diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask
index e73cdefb4053..1deb466a9841 100644
--- a/profiles/prefix/darwin/use.mask
+++ b/profiles/prefix/darwin/use.mask
@@ -18,7 +18,6 @@ acpi
 alsa
 apm
 caps
-directfb
 djbfft
 fbcon
 ggi
diff --git a/profiles/prefix/mint/use.mask b/profiles/prefix/mint/use.mask
index a354482fb2fc..9485c70a8549 100644
--- a/profiles/prefix/mint/use.mask
+++ b/profiles/prefix/mint/use.mask
@@ -11,7 +11,6 @@ acpi
 alsa
 apm
 caps
-directfb
 djbfft
 fbcon
 ggi
diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask
index 92a4f4a28bde..e1152c2b8b71 100644
--- a/profiles/prefix/sunos/use.mask
+++ b/profiles/prefix/sunos/use.mask
@@ -11,7 +11,6 @@ acpi
 alsa
 apm
 caps
-directfb
 djbfft
 fbcon
 ggi
diff --git a/profiles/prefix/windows/winnt/use.mask b/profiles/prefix/windows/winnt/use.mask
index 5b60cad0f8a9..727eb842a440 100644
--- a/profiles/prefix/windows/winnt/use.mask
+++ b/profiles/prefix/windows/winnt/use.mask
@@ -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
 
 # Re-add Winnt libc
@@ -19,7 +19,6 @@ caps
 cdr
 coreaudio
 dga
-directfb
 djbfft
 dri
 dvdr
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index d9384010e596..b45c90b1902e 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -182,11 +182,14 @@ sh              default/linux/sh/17.0/developer                 exp
 
 # SPARC Profiles
 # @MAINTAINER: sparc@gentoo.org
-sparc           default/linux/sparc/17.0                        exp
-sparc           default/linux/sparc/17.0/desktop                exp
-sparc           default/linux/sparc/17.0/desktop/gnome          exp
-sparc           default/linux/sparc/17.0/desktop/gnome/systemd  exp
-sparc           default/linux/sparc/17.0/developer              exp
+sparc		default/linux/sparc/17.0				exp
+sparc		default/linux/sparc/17.0/desktop			exp
+sparc		default/linux/sparc/17.0/developer			exp
+sparc		default/linux/sparc/17.0/systemd			exp
+sparc		default/linux/sparc/17.0/64ul				exp
+sparc		default/linux/sparc/17.0/64ul/desktop			exp
+sparc		default/linux/sparc/17.0/64ul/developer			exp
+sparc		default/linux/sparc/17.0/64ul/systemd			exp
 
 # x86 Profiles
 # @MAINTAINER: x86@gentoo.org
diff --git a/profiles/releases/freebsd-11.1/package.mask b/profiles/releases/freebsd-11.1/package.mask
index 1767b7c756ce..7a82ed6bfdfe 100644
--- a/profiles/releases/freebsd-11.1/package.mask
+++ b/profiles/releases/freebsd-11.1/package.mask
@@ -31,10 +31,6 @@
 <sys-freebsd/freebsd-sources-11.1_alpha
 >sys-freebsd/freebsd-sources-11.1.99
 
-# Alexis Ballier <aballier@gentoo.org> (2011-11-07)
-# It is in freebsd-ubin starting from FreeBSD 9.0
-sys-process/fuser-bsd
-
 # Alexis Ballier <aballier@gentoo.org> (2012-05-11)
 # freebsd-lib provides a utempter compatible interface starting from FreeBSD 9.0
 # via libulog.
diff --git a/profiles/updates/4Q-2015 b/profiles/updates/4Q-2015
index df294b85ed70..01e7e42fdf44 100644
--- a/profiles/updates/4Q-2015
+++ b/profiles/updates/4Q-2015
@@ -5,7 +5,6 @@ slotmove =dev-ruby/recog-2.0.12 2 2.0.12
 slotmove =dev-ruby/recog-2.0.14 2 2.0.14
 move media-libs/libkgeomap kde-apps/libkgeomap
 slotmove =dev-python/pyfltk-1.3.3 1 0
-move virtual/dnspython virtual/python-dnspython
 move virtual/funcsigs virtual/python-funcsigs
 move virtual/pmw virtual/python-pmw
 move kde-apps/oxygen-icons kde-frameworks/oxygen-icons
diff --git a/profiles/use.desc b/profiles/use.desc
index 92b90f4b2df2..0ca431225e04 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -106,6 +106,10 @@ gimp - Build a plugin for the GIMP
 git - Enable git (version control system) support
 glut - Build an OpenGL plugin using the GLUT library
 gmp - Add support for dev-libs/gmp (GNU MP library)
+gnat_2016 - Compile with dev-lang/gnat-gpl-2016
+gnat_2017 - Compile with dev-lang/gnat-gpl-2017
+gnat_2018 - Compile with dev-lang/gnat-gpl-2018
+gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 gnome - Add GNOME support
 gnome-keyring - Enable support for storing passwords via gnome-keyring
 gnuplot - Enable support for gnuplot (data and function plotting)
@@ -181,6 +185,7 @@ lzma - Support for LZMA (de)compression algorithm
 lzo - Enable support for lzo compression
 m17n-lib - Enable m17n-lib support
 mad - Add support for mad (high-quality mp3 decoder library and cli frontend)
+magic - Add support for file type detection via magic bytes (usually via libmagic from sys-apps/file)
 maildir - Add support for maildir (~/.maildir) style mail spools
 matroska - Add support for the matroska container format (extensions .mkv, .mka and .mks)
 mbox - Add support for mbox (/var/spool/mail) style mail spools
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 48a89d02eb30..4c216ff4a439 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -12,7 +12,6 @@ app-accessibility/brltty:pcm - support for sound card digital audio
 app-accessibility/brltty:speech - speech support
 app-accessibility/eflite:16k_voice - Use a higher-quality voice.
 app-accessibility/emacspeak:espeak - Adds support for the espeak tts engine
-app-accessibility/festival-it:mbrola - Adds support for mbrola voices
 app-accessibility/freetts:jsapi - build Java Speech API (JSAPI)
 app-accessibility/freetts:mbrola - Adds support for mbrola voices
 app-accessibility/orca:braille - Enable braille support
@@ -218,7 +217,6 @@ app-arch/dpkg:update-alternatives - Install update-alternatives
 app-arch/dump:ermt - encrypted rmt support
 app-arch/dump:uuid - Enable UUID support
 app-arch/engrampa:caja - Enable engrampa to integrate with mate-base/caja by providing entries in its context menu
-app-arch/engrampa:magic - Enable filetype auto-detection via sys-apps/file
 app-arch/engrampa:packagekit - Enable support for installing via app-admin/packagekit based on archive type
 app-arch/file-roller:nautilus - Build contextual menu extension for gnome-base/nautilus.
 app-arch/file-roller:packagekit - Enable support for the distro-neutral package manager GUI app-admin/packagekit
@@ -368,7 +366,6 @@ app-doc/devmanual:fallback - Use alternative minimal stylesheet instead of tyria
 app-doc/doxygen:clang - support for sys-devel/clang assisted parsing
 app-doc/doxygen:dot - allow to create dot graphs using media-gfx/graphviz
 app-doc/doxygen:doxysearch - build doxyindexer and doxysearch.cgi
-app-doc/gnucash-docs:l10n_C - English
 app-doc/kicad-doc:html - Generate documentation in HTML format
 app-doc/kicad-doc:pdf - Generate documentation in PDF format
 app-doc/linuxfromscratch:htmlsingle - Install all-on-one-page HTML version.
@@ -390,7 +387,6 @@ app-editors/emacs:gconf - Use gnome-base/gconf to read the system font name
 app-editors/emacs:gfile - Use gfile (dev-libs/glib) for file notification
 app-editors/emacs:gsettings - Use gsettings (dev-libs/glib) to read the system font name
 app-editors/emacs:gtk2 - Prefer version 2 of the GIMP Toolkit to version 3 (x11-libs/gtk+)
-app-editors/emacs:gtk3 - Prefer version 3 of the GIMP Toolkit to version 2 (x11-libs/gtk+)
 app-editors/emacs:gzip-el - Compress bundled Emacs Lisp source
 app-editors/emacs:imagemagick - Use media-gfx/imagemagick for image processing
 app-editors/emacs:libxml2 - Use dev-libs/libxml2 to parse XML instead of the internal Lisp implementations
@@ -464,6 +460,7 @@ app-emacs/bbdb:tex - Install plain TeX support files
 app-emacs/bbdb:vm - Add support for app-emacs/vm
 app-emacs/calfw:howm - Add support for the app-emacs/howm note-taking tool
 app-emacs/company-mode:ropemacs - Install backend for dev-python/ropemacs
+app-emacs/elscreen:wanderlust - Include support for app-emacs/wanderlust
 app-emacs/emacs-common-gentoo:games - Support shared score files for games
 app-emacs/mu-cite:bbdb - Include support for app-emacs/bbdb
 app-emacs/org-mode:contrib - Install user-contributed files
@@ -627,14 +624,6 @@ app-emulation/qemu:xattr - Add support for getting and setting POSIX extended at
 app-emulation/qemu:xen - Enables support for Xen backends
 app-emulation/qemu:xfs - Support xfsctl() notification and syncing for XFS backed virtual disks.
 app-emulation/qt-virt-manager:smartcard - Enable smartcard remoting using app-emulation/libcacard
-app-emulation/rkt:actool - Install the actool for ACI manipulation
-app-emulation/rkt:rkt_stage1_coreos - Download and use a prebuilt stage1.aci from CoreOS
-app-emulation/rkt:rkt_stage1_fly - Build stage1-fly.aci
-app-emulation/rkt:rkt_stage1_host - Assemble stage1.aci from host binaries
-app-emulation/rkt:rkt_stage1_kvm - This flag has been replaced by the rkt_stage1_kvm_* flags
-app-emulation/rkt:rkt_stage1_kvm_lkvm - Build stage1-kvm-lkvm.aci
-app-emulation/rkt:rkt_stage1_kvm_qemu - Build stage1-kvm-qemu.aci
-app-emulation/rkt:rkt_stage1_src - Build the stage1.aci from source
 app-emulation/runc:ambient - Enable support for ambient capabilities set (Requires Linux kernel 4.3 or later).
 app-emulation/runc:apparmor - Enable AppArmor support.
 app-emulation/runc:kmem - Enable Kernel Memory Accounting.
@@ -1086,10 +1075,8 @@ app-misc/vcontrold:vsim - Build the vsim helper program (simulates the heating's
 app-misc/vifm:developer - Enable features of interest to developers
 app-misc/vifm:extended-keys - Support for extended keys (arrows, home etc)
 app-misc/vifm:gtk - Use gtk+ to determine mimetypes
-app-misc/vifm:magic - Use libmagic to determine mimetypes
 app-misc/vifm:vim - Install the vifm vim plugin and vim-compatible documentation
 app-misc/worker:avfs - Enable support for sys-fs/avfs
-app-misc/worker:magic - Add magic file support from sys-apps/file to automatically detect file types
 app-misc/workrave:mate - Add support for MATE panel
 app-misc/workrave:xfce - Add support for XFCE panel
 app-misc/zygrib:maps - Installs additional GSHHS maps for high resolution coastline data and cities
@@ -1383,95 +1370,31 @@ app-text/xpdf:metric - Use A4 instead of US Letter paper size by default for Pos
 app-text/xpdf:opi - Include support for OPI (Open Prepress Interface) comments
 app-text/xpdf:textselect - Allow text selection
 app-text/xpdf:utils - Install command-line PDF converters and various utilities
-app-text/zathura:magic - Use libmagic to determine mimetypes
 app-text/zathura:synctex - Use libsynctex to get latex codeline from pdf
 app-text/zathura-meta:cb - Install plug-in for ComicBook support
 app-vim/gentoo-syntax:ignore-glep31 - Remove GLEP 31 (UTF-8 file encodings) settings
 app-vim/youcompleteme:clang - Enable semantic support for C-family languages using sys-devel/clang
 app-xemacs/xemacs-packages-all:mule - Add multi-language support to XEmacs
-dev-ada/asis:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/asis:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/asis:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/asis:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
-dev-ada/aunit:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/aunit:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/aunit:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/aunit:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
-dev-ada/aws:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/aws:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/aws:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/aws:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
-dev-ada/gnat_util:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/gnat_util:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/gnat_util:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/gnat_util:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gnat_util:shared - Build gnat_util shared library
 dev-ada/gnat_util:static-pic - Build gnat_util static library with pic code
-dev-ada/gnatcoll:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/gnatcoll:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gnatcoll:projects - Adds support for projects
 dev-ada/gnatcoll:pygobject - Adds support for pygobject
 dev-ada/gnatcoll:shared - Build shared library
 dev-ada/gnatcoll:tools - Build associated tools
-dev-ada/gnatcoll-bindings:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/gnatcoll-bindings:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/gnatcoll-bindings:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/gnatcoll-bindings:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gnatcoll-bindings:shared - Build shared library
 dev-ada/gnatcoll-bindings:static-pic - Build shared library
-dev-ada/gnatcoll-core:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/gnatcoll-core:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/gnatcoll-core:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/gnatcoll-core:gnat_2019 - Compile with dev-lang/gnat-gpl-2018
 dev-ada/gnatcoll-core:shared - Build shared library
 dev-ada/gnatcoll-core:static-pic - Build static library with pic code
-dev-ada/gnatcoll-db:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/gnatcoll-db:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/gnatcoll-db:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/gnatcoll-db:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gnatcoll-db:gnatcoll_db2ada - Build gnatcoll_db2ada
 dev-ada/gnatcoll-db:gnatinspect - Build gnatinspect
 dev-ada/gnatcoll-db:shared - Build shared library
 dev-ada/gnatcoll-db:sql - Build sql library
 dev-ada/gnatcoll-db:static-pic - Build shared library
 dev-ada/gnatcoll-db:xref - Build xref library
-dev-ada/gnatmem:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/gnatmem:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/gnatmem:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/gnatmem:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
-dev-ada/gnatsymbolize:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/gnatsymbolize:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
-dev-ada/gprbuild:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/gprbuild:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/gprbuild:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/gprbuild:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
-dev-ada/gps:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/gps:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/gps:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/gtkada:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/gtkada:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/gtkada:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/gtkada:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/gtkada:shared - Build gtkada as shared library
-dev-ada/libadalang:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/libadalang:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/libadalang:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/libadalang:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/libadalang:shared - Build shared library
-dev-ada/libadalang-tools:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/libadalang-tools:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/libadalang-tools:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/libadalang-tools:gnat_2019 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/libgpr:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/libgpr:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/libgpr:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/libgpr:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/libgpr:shared - Build shared library
 dev-ada/libgpr:static-pic - Build static library with pic code
-dev-ada/xmlada:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
-dev-ada/xmlada:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/xmlada:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
-dev-ada/xmlada:gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 dev-ada/xmlada:shared - Build shared library
 dev-ada/xmlada:static-pic - Build static library with pic code
 dev-cpp/eigen:c++11 - Build using the C++11 standard
@@ -1534,7 +1457,6 @@ dev-db/mycli:ssh - Add support for connection over SSH tunnel
 dev-db/mysql:cjk - Add CJK support for InnoDB fulltext search using app-text/mecab
 dev-db/mysql:client-libs - Build the client libraries from the server package instead of the C Connector packages (not recommended)
 dev-db/mysql:experimental - Build experimental features aka "rapid" plugins
-dev-db/mysql:extraengine - Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)
 dev-db/mysql:latin1 - Use LATIN1 encoding instead of UTF8
 dev-db/mysql:libressl - Enable SSL connections and crypto functions using dev-libs/libressl
 dev-db/mysql:numa - Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)
@@ -1961,7 +1883,6 @@ dev-java/icedtea:pch - Build using pre-compiled headers.
 dev-java/icedtea:sctp - Build the SCTP NIO channel implementation against lksctp
 dev-java/icedtea:shenandoah - Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (arm64 and x86_64 only)
 dev-java/icedtea:smartcard - Build the PCSC driver against pcsc-lite
-dev-java/icedtea:sunec - Build the SunEC provider against system NSS
 dev-java/icedtea:system-lcms - Build against the system LCMS installation rather than the in-tree copy.
 dev-java/icedtea:webstart - Enable Web Start support (via NetX).
 dev-java/icedtea:zero - Enable Zero assembler port (usually for non-HotSpot architectures)
@@ -2398,6 +2319,7 @@ dev-libs/gmp:asm - Enable use of hand optimized assembly routines (faster execut
 dev-libs/gobject-introspection:doctool - Install g-ir-doc-tool for generating documentation from introspected data
 dev-libs/granite:demo - Build the Granite demo application (to present all available UI features provided by the library)
 dev-libs/hidapi:fox - Build a x11-libs/fox GUI
+dev-libs/hsa-ext-rocr:deprecated - Install the deprecated debug/trace/profiling library
 dev-libs/input-pad:eekboard - Enable support for dev-libs/eekboard
 dev-libs/input-pad:xtest - Enable support for x11-libs/libXtst
 dev-libs/intel-neo:vaapi - Support the sharing of surfaces with Video Acceleration API (OpenCL Extension #36)
@@ -2429,8 +2351,8 @@ dev-libs/libevent:debug - Support runtime debug mode and malloc hooks (for progr
 dev-libs/libffi:pax_kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
 dev-libs/libflatarray:cuda - Enables plugins for NVIDIA GPUs (e.g. CUDAAllocator)
 dev-libs/libgcrypt:o-flag-munging - Enable O-flag mangling during build
+dev-libs/libgdata:crypt - Use app-crypt/gcr for keeping tokens and passwords in non-pageable memory for improved security
 dev-libs/libgdata:gnome-online-accounts - Enable net-libs/gnome-online-accounts support
-dev-libs/libgit2:curl - Use net-misc/curl for HTTP support (otherwise, limited built-in implementation will be used)
 dev-libs/libgit2:gssapi - Enable GSSAPI support for SPNEGO auth
 dev-libs/libgit2:ssh - Enable SSH transport support
 dev-libs/libgit2:trace - Enable tracing support
@@ -2563,6 +2485,7 @@ dev-libs/poco:pocodoc - POCO documentation generator
 dev-libs/poco:util - Several utility classes (like logger, timer, config file parser)
 dev-libs/poco:zip - Add support for the zip & gz archive formats
 dev-libs/ppl:lpsol - Build the ppl_lpsol linear programming problem solver
+dev-libs/rocr-runtime:nonfree - Enables HSA image support using dev-libs/hsa-ext-rocr
 dev-libs/serdisplib:tools - Build optional tools.
 dev-libs/softhsm:gost - Enable gost algorithm
 dev-libs/softhsm:migration-tool - Build db migration tool
@@ -2686,6 +2609,8 @@ dev-perl/DBD-MariaDB:mariadb - Use dev-db/mariadb-connector-c as the client libr
 dev-perl/DBD-MariaDB:mysql - Use dev-db/mysql-connector-c as the client library
 dev-perl/DBD-SQLite:system-sqlite - Use the system-wide dev-db/sqlite installation
 dev-perl/DBD-mysql:embedded - Support embedded server (libmysqld)
+dev-perl/DBD-mysql:mariadb - Use dev-db/mariadb-connector-c as the client library
+dev-perl/DBD-mysql:mysql - Use dev-db/mysql-connector-c as the client library
 dev-perl/DBD-mysql:ssl - Compile in support for SSL connections via libmysqlclient
 dev-perl/DBIx-Class:admin - Modules required for the DBIx::Class administrative library
 dev-perl/DBIx-Class:admin_script - Modules required for the CLI DBIx::Class interface dbicadmin
@@ -2743,7 +2668,6 @@ dev-php/pecl-zmq:czmq - Use the czmq high level bindings
 dev-php/phing:zip - Support zip archives by requiring said support in dev-lang/php.
 dev-php/swoole:http2 - Add support for HTTP/2 protocol via net-libs/nghttp2
 dev-php/swoole:redis - Add support for redis via dev-libs/hiredis
-dev-php/twig:extension - Build the C extension (only for php-5.6.x).
 dev-php/xcache:coverage - Enable the coverager module (not recommended for production servers).
 dev-python/Kivy:camera - Install libraries needed to support camera
 dev-python/Kivy:garden - Install garden tool to manage user maintained widgets
@@ -2871,7 +2795,6 @@ dev-python/rarfile:compressed - Enables the module to support compressed v3 arch
 dev-python/rdflib:redland - enable support for Redland triplestore
 dev-python/restkit:cli - Install the restcli command line interface/tool, based on dev-python/ipython
 dev-python/setuptools_scm:mercurial - Enables mercurial backend
-dev-python/simplecv:shell - Enable the iPython SimpleCV shell
 dev-python/simplespectral:faster - Use sci-libs/scipy to speed up drawing
 dev-python/simplespectral:fastest - Use dev-python/pyFFTW to speed up drawing to the max
 dev-python/sphinx:net - enable internet capabilities
@@ -2944,20 +2867,46 @@ dev-qt/qt-creator:valgrind - Add support for memory debugging using dev-util/val
 dev-qt/qt-creator:webengine - Use dev-qt/qtwebengine to view documentation
 dev-qt/qt-creator:winrt - Build plugin for WinRT devices
 dev-qt/qt-docs:3d - Install documentation for dev-qt/qt3d
+dev-qt/qt-docs:assistant - Install documentation for dev-qt/assistant
 dev-qt/qt-docs:bluetooth - Install documentation for dev-qt/qtbluetooth
 dev-qt/qt-docs:charts - Install documentation for dev-qt/qtcharts
+dev-qt/qt-docs:concurrent - Install documentation for dev-qt/qtconcurrent
+dev-qt/qt-docs:core - Install documentation for dev-qt/qtcore
 dev-qt/qt-docs:datavis - Install documentation for dev-qt/qtdatavis3d
-dev-qt/qt-docs:declarative - Install documentation for dev-qt/qtdeclarative, dev-qt/qtquickcontrols, and dev-qt/qtquickcontrols2
+dev-qt/qt-docs:declarative - Install documentation for dev-qt/qtdeclarative
+dev-qt/qt-docs:designer - Install documentation for dev-qt/designer
+dev-qt/qt-docs:gamepad - Install documentation for dev-qt/qtgamepad (available in qt overlay only)
 dev-qt/qt-docs:graphicaleffects - Install documentation for dev-qt/qtgraphicaleffects
+dev-qt/qt-docs:gui - Install documentation for dev-qt/qtgui
+dev-qt/qt-docs:help - Install documentation for dev-qt/qthelp
 dev-qt/qt-docs:html - Install documentation in HTML format
+dev-qt/qt-docs:imageformats - Install documentation for dev-qt/qtimageformats
+dev-qt/qt-docs:linguist - Install documentation for dev-qt/linguist
 dev-qt/qt-docs:location - Install documentation for dev-qt/qtlocation
 dev-qt/qt-docs:multimedia - Install documentation for dev-qt/qtmultimedia
+dev-qt/qt-docs:network - Install documentation for dev-qt/qtnetwork
 dev-qt/qt-docs:networkauth - Install documentation for dev-qt/qtnetworkauth
+dev-qt/qt-docs:positioning - Install documentation for dev-qt/qtpositioning
+dev-qt/qt-docs:printsupport - Install documentation for dev-qt/qtprintsupport
 dev-qt/qt-docs:qch - Install documentation in QCH format
+dev-qt/qt-docs:qdoc - Install documentation for dev-qt/qdoc
+dev-qt/qt-docs:quickcontrols - Install documentation for dev-qt/qtquickcontrols
+dev-qt/qt-docs:quickcontrols2 - Install documentation for dev-qt/qtquickcontrols2
 dev-qt/qt-docs:script - Install documentation for dev-qt/qtscript
+dev-qt/qt-docs:scxml - Install documentation for dev-qt/qtscxml
 dev-qt/qt-docs:sensors - Install documentation for dev-qt/qtsensors
+dev-qt/qt-docs:serialbus - Install documentation for dev-qt/qtserialbus
+dev-qt/qt-docs:serialport - Install documentation for dev-qt/qtserialport
+dev-qt/qt-docs:speech - Install documentation for dev-qt/qtspeech
+dev-qt/qt-docs:sql - Install documentation for dev-qt/qtsql
 dev-qt/qt-docs:virtualkeyboard - Install documentation for dev-qt/qtvirtualkeyboard
+dev-qt/qt-docs:webchannel - Install documentation for dev-qt/qtwebchannel
 dev-qt/qt-docs:webengine - Install documentation for dev-qt/qtwebengine
+dev-qt/qt-docs:websockets - Install documentation for dev-qt/qtwebsockets
+dev-qt/qt-docs:webview - Install documentation for dev-qt/qtwebview
+dev-qt/qt-docs:widgets - Install documentation for dev-qt/qtwidgets
+dev-qt/qt-docs:x11extras - Install documentation for dev-qt/qtx11extras
+dev-qt/qt-docs:xmlpatterns - Install documentation for dev-qt/qtxmlpatterns
 dev-qt/qt3d:gles2 - Use GLES 2.0 or later instead of full OpenGL
 dev-qt/qt3d:qml - Build QML/QtQuick bindings
 dev-qt/qtbluetooth:qml - Build QML/QtQuick bindings and imports
@@ -3245,9 +3194,9 @@ 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.
+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
 dev-util/spirv-llvm-translator:tools - Install the command-line translator llvm-spirv
 dev-util/squashdelta:lz4 - Enable support for LZ4 compression using app-arch/lz4
 dev-util/squashmerge:lz4 - Enable support for LZ4 compression using app-arch/lz4
@@ -3487,6 +3436,7 @@ games-fps/eduke32:voxels - Install the Duke Nukem 3D Voxels Pack.
 games-fps/eduke32:vpx - Enable support for media-libs/libvpx.
 games-fps/eduke32:xmp - Enable support for media-libs/exempi.
 games-fps/gzdoom:gtk2 - Enable support for GTK+2 instead of GTK+3
+games-fps/gzdoom:nonfree - Enable non-free components
 games-fps/nexuiz:maps - Install the community map pack
 games-fps/prboom-plus:dumb - Enable support for various tracker-style music formats via media-libs/dumb
 games-fps/prboom-plus:fluidsynth - Enable support for MIDI via media-sound/fluidsynth
@@ -3546,6 +3496,7 @@ games-puzzle/sgt-puzzles:gtk3 - Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2
 games-puzzle/tiny-and-big:bundled-libs - Use the upstream provided bundled libraries.
 games-puzzle/xlogical:alt_gfx - Use alternate graphics which are closer to the original Amiga version
 games-roguelike/FTL:bundled-libs - Use bundled libraries.
+games-roguelike/angband:sdl2 - Use libsdl2 instead of libsdl
 games-roguelike/angband:sound - Enable and install sounds
 games-roguelike/nethack:experimental - Enable experimental features (showscore and status_hilite)
 games-roguelike/stone-soup:ncurses - Enable for console (uses ncurses) based build. (can be enabled on top of tiles)
@@ -4069,15 +4020,18 @@ mail-client/s-nail:kerberos - If network is enabled, this adds support for GSSAP
 mail-client/s-nail:net - Enable support for network protocols (POP, IMAP and SMTP). If you only need to send mail with the local Transport Agent, disabling this will get you support for only /usr/sbin/sendmail call.
 mail-client/s-nail:ssl - If network is enabled, this adds support for S/MIME and SSL/TLS-powered protocols through dev-libs/openssl.
 mail-client/sylpheed:oniguruma - Use dev-libs/oniguruma for regular expression
-mail-client/thunderbird:bindist - Disable official Thunderbird branding (icons, name) which are not binary-redistributable according to upstream.
+mail-client/thunderbird:bindist - Disable official Firefox/Thunderbird branding (icons, name) which are not binary-redistributable according to upstream.
 mail-client/thunderbird:clang - Use Clang compiler instead of GCC
-mail-client/thunderbird:crypt - Enable encryption support with enigmail
 mail-client/thunderbird:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
+mail-client/thunderbird:eme-free - Disable EME (DRM plugin) cabability at build time
+mail-client/thunderbird:gmp-autoupdate - Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles
 mail-client/thunderbird:gtk2 - Use the cairo-gtk2 rendering engine instead of the default cairo-gtk3
 mail-client/thunderbird:lightning - Enable app-global calendar support (note 38.0 and above bundles calendar support when this flag is off)
-mail-client/thunderbird:minimal - Remove the software development kit and headers
+mail-client/thunderbird:lto - Enable Link Time Optimization (LTO). Requires Gold linker when using GCC or LDD linker when using Clang
 mail-client/thunderbird:mozdom - Enable Mozilla's DOM inspector
+mail-client/thunderbird:pgo - Add support for profile-guided optimization using gcc-4.5, for faster binaries. This option will double the compile time.
 mail-client/thunderbird:rust - Enable support for using rust compiler (experimental)
+mail-client/thunderbird:system-av1 - Use the system-wide media-libs/dav1d and media-libs/libaom library instead of bundled.
 mail-client/thunderbird:system-cairo - Use the system-wide x11-libs/cairo instead of bundled.
 mail-client/thunderbird:system-harfbuzz - Use the system-wide media-libs/harfbuzz and media-gfx/graphite2 instead of bundled.
 mail-client/thunderbird:system-icu - Use the system-wide dev-libs/icu instead of bundled.
@@ -4085,6 +4039,7 @@ mail-client/thunderbird:system-jpeg - Use the system-wide media-libs/libjpeg-tur
 mail-client/thunderbird:system-libevent - Use the system-wide dev-libs/libevent instead of bundled.
 mail-client/thunderbird:system-libvpx - Use the system-wide media-libs/libvpx instead of bundled.
 mail-client/thunderbird:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
+mail-client/thunderbird:system-webp - Use the system-wide media-libs/libwebp instead of bundled.
 mail-client/thunderbird-bin:crashreporter - Enable crash reporter for bugs
 mail-client/trojita:addressbook - Build kde-apps/akonadi addressbook plugin
 mail-client/trojita:password - Store passwords securely via dev-libs/qtkeychain
@@ -4419,7 +4374,6 @@ media-gfx/pstoedit:emf - Enable media-libs/libemf support
 media-gfx/pstoedit:flash - Enable media-libs/ming SWF support
 media-gfx/pstoedit:pptx - Enable support for generating PowerPoint pptx files
 media-gfx/qimgv:video - Add support for gif/webm playback via libmpv
-media-gfx/qiv:magic - Use libmagic to determine mimetypes
 media-gfx/shotwell:opencv - Enable face detection via media-libs/opencv
 media-gfx/sigal:s3 - Enables support for the Amazon S3 service.
 media-gfx/slic3r:gui - Enable GUI
@@ -4527,7 +4481,6 @@ media-libs/libepoxy:egl - Enable EGL support.
 media-libs/libextractor:apparmor - Enable apparmor support using sys-libs/libapparmor
 media-libs/libextractor:archive - Enable archive support using app-arch/libarchive
 media-libs/libextractor:gsf - Enable OLE2 (MS Office) plug-in support using gnome-extra/libgsf
-media-libs/libextractor:magic - Enable magic support using sys-apps/file
 media-libs/libextractor:midi - Enable MIDI support through media-libs/libsmf
 media-libs/libffado:test-programs - Install standalone test programs
 media-libs/libggi:vis - Enables sparc vis support for libggi
@@ -4651,7 +4604,6 @@ media-libs/opusfile:http - Enable http connections
 media-libs/osl:partio - Use media-libs/partio
 media-libs/osl:qt5 - Build the osltoy binary
 media-libs/phonon:designer - Install plugin for dev-qt/designer
-media-libs/phonon:gui - Install device preferences and backend settings GUI
 media-libs/phonon:vlc - Install VLC Phonon backend
 media-libs/phonon-gstreamer:network - Enable network streaming support via libsoup
 media-libs/portmidi:test-programs - Install various example programs
@@ -4773,7 +4725,6 @@ media-radio/ax25-tools:X - Enable some X based configuration tools.
 media-radio/fldigi:hamlib - Enables support by the Hamlib amateur radio rig control library to get/set frequency and mode of the ham radio in use
 media-radio/tucnak:hamlib - Enables support by the Hamlib amateur radio rig control library to get/set frequency and mode of the ham radio
 media-radio/unixcw:ncurses - Enables building the curses based morse code tutor program 'cwcp'.
-media-radio/xastir:festival - Enable text to speech synthesizer
 media-radio/xastir:gdal - Support for some further map formats
 media-radio/xastir:geotiff - Install geotiff support. Allows using USGS DRG topo maps or other types of geotiff mapes/images
 media-sound/abcde:aiff - Enable support for Audio Interchange File Format (AIFF) output encoding
@@ -4922,7 +4873,6 @@ media-sound/mixxx:hid - Enable HID controller support
 media-sound/mixxx:lv2 - Add support for Ladspa V2 via media-libs/lilv
 media-sound/mixxx:shout - Enable broadcasting support via media-libs/libshout
 media-sound/moc:cache - Enable tags caching support
-media-sound/moc:magic - Use libmagic to determine mimetypes
 media-sound/moc:sid - Build with SID (Commodore 64 Audio) support
 media-sound/moc:tremor - Build vorbis support using an integer implementation of the vorbis library (media-libs/tremor)
 media-sound/mp3blaster:sid - Build with SID (Commodore 64 Audio) support
@@ -5115,9 +5065,7 @@ media-tv/kodi:libusb - Use virtual/libusb for usb device hotplug support. This f
 media-tv/kodi:lirc - Enable support for controlling Totem with a remote control using app-misc/lirc
 media-tv/kodi:mariadb - Add MariaDB support
 media-tv/kodi:nfs - Enable NFS client support
-media-tv/kodi:nonfree - Enable non-free components
 media-tv/kodi:raspberry-pi - Enable support for the Raspberry Pi
-media-tv/kodi:sftp - Support browsing files over SFTP
 media-tv/kodi:system-ffmpeg - Use system ffmpeg instead of the bundled one
 media-tv/kodi:udev - Use sys-fs/udev rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness.
 media-tv/kodi:webserver - Enable internal webserver
@@ -5205,10 +5153,6 @@ media-video/ffdiaporama:texturemate - Install extra backgrounds
 media-video/ffmpeg:amr - Enables Adaptive Multi-Rate Audio support
 media-video/ffmpeg:amrenc - Enables Adaptive Multi-Rate Audio encoding support with media-libs/vo-amrwbenc.
 media-video/ffmpeg:appkit - Enables Apple AppKit framework
-media-video/ffmpeg:armv5te - Enables optimizations for armv5te processors.
-media-video/ffmpeg:armv6 - Enables optimizations for armv6 processors.
-media-video/ffmpeg:armv6t2 - Enables optimizations for armv6t2 processors.
-media-video/ffmpeg:armvfp - Enables VFP optimizations for ARM processors.
 media-video/ffmpeg:bluray - Enable playback of Blu-ray filesystems
 media-video/ffmpeg:bs2b - Enables media-libs/libbs2b based Bauer stereo-to-binaural filter.
 media-video/ffmpeg:cdio - Enables audio CD grabbing with dev-libs/libcdio.
@@ -5216,8 +5160,8 @@ media-video/ffmpeg:chromaprint - Enables audio fingerprinting support with media
 media-video/ffmpeg:chromium - Builds libffmpeg.so to enable media playback in Chromium-based browsers like Opera and Vivaldi.
 media-video/ffmpeg:codec2 - Enables codec2 low bit rate speech codec support via media-libs/codec2.
 media-video/ffmpeg:cpudetection - Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)
-media-video/ffmpeg:dav1d - Enables AV1 decoding viamedia-libs/dav1d.
-media-video/ffmpeg:ebur128 - Enables EBU R128 loudness normalization filter via media-libs/libebur128
+media-video/ffmpeg:cuda - Enables CUDA-based acceleration. Mostly used for specific filters.
+media-video/ffmpeg:dav1d - Enables AV1 decoding via media-libs/dav1d.
 media-video/ffmpeg:fdk - Use external fdk-aac library for AAC encoding
 media-video/ffmpeg:flite - Adds a text-to-speech filter based on app-accessibility/flite.
 media-video/ffmpeg:frei0r - Enable frei0r wrapping in libavfilter
@@ -5229,6 +5173,7 @@ media-video/ffmpeg:hardcoded-tables - Use pre-calculated tables rather than calc
 media-video/ffmpeg:iec61883 - Support for FireWire DV/HDV input device using media-libs/libiec61883.
 media-video/ffmpeg:kvazaar - Enables media-libs/kvazaar based HEVC encoder.
 media-video/ffmpeg:libaom - Enables media-libs/libaom based AV1 codec support.
+media-video/ffmpeg:libaribb24 - Enables ARIB text and caption decoding via media-libs/aribb24.
 media-video/ffmpeg:libdrm - Enables x11-libs/libdrm support for better screen grabbing and hardware accelerated codecs.
 media-video/ffmpeg:libilbc - Enables iLBC de/encoding via media-libs/libilbc.
 media-video/ffmpeg:librtmp - Enables Real Time Messaging Protocol using librtmp (media-video/rtmpdump) in addition to FFmpeg's native implementation.
@@ -5249,7 +5194,6 @@ media-video/ffmpeg:pic - Force shared libraries to be built as PIC (this is slow
 media-video/ffmpeg:postproc - Build and install libpostproc.
 media-video/ffmpeg:rubberband - Adds time-stretching and pitch-shifting audio filter based on media-libs/rubberband.
 media-video/ffmpeg:snappy - Enable app-arch/snappy support. Required for e.g. Vidvox Hap encoder.
-media-video/ffmpeg:sofalizer - Enables Sofalizer filter
 media-video/ffmpeg:srt - Enable support for Secure Reliable Transport (SRT) via net-libs/srt
 media-video/ffmpeg:ssh - Enable SSH/sftp support via net-libs/libssh.
 media-video/ffmpeg:twolame - Enables MP2 encoding via media-sound/twolame as an alternative to the internal encoder.
@@ -5475,6 +5419,8 @@ media-video/x264-encoder:avs - enable AvxSynth support in the AviSynth input mod
 media-video/x264-encoder:ffmpegsource - Enable ffmpegsource aka ffms support, disables lavf
 media-video/x264-encoder:interlaced - Enable interlaced encoding support, this can decrease encoding speed by up to 2%
 media-video/xine-ui:vdr - Enables Video Disk Recorder support
+media-video/yle-dl:php - Use a PHP script as download backend
+media-video/yle-dl:youtube-dl - Use youtube-dl script as a download backend
 net-analyzer/2ping:server - Install the server init scripts.
 net-analyzer/argus:libtirpc - Build against net-libs/libtirpc for RPC support
 net-analyzer/argus-clients:ft - Enable support for flow packets through net-analyzer/flow-tools
@@ -5576,6 +5522,7 @@ net-analyzer/nagios-plugins:nagios-ping - Install net-analyzer/fping required fo
 net-analyzer/nagios-plugins:snmp - Install dev-perl/Net-SNMP required for monitoring SNMP values. Disabling the flag does not remove any plugin file.
 net-analyzer/nagios-plugins:ssh - Install net-misc/openssh required for monitoring SSH servers. Disabling the flag does not remove any plugin file.
 net-analyzer/nagios-plugins-flameeyes:smart - Install sys-apps/smartmontools required for S.M.A.R.T. disk monitoring. Disabling the flag removes the plugin file. This plugin also requires the sudo flag to be enable.
+net-analyzer/nagios-plugins-linux-madrisan:curl - Build check_docker which requires net-misc/curl
 net-analyzer/net-snmp:elf - Enable the use of elf utils to check uptime on some systems
 net-analyzer/net-snmp:kmem - Enable usage of /dev/kmem
 net-analyzer/net-snmp:mfd-rewrites - Use MFD rewrites of mib modules where available
@@ -5607,7 +5554,6 @@ net-analyzer/nmap:nse - Include support for the Nmap Scripting Engine (NSE)
 net-analyzer/nmap:system-lua - Use dev-lang/lua instead of the bundled liblua
 net-analyzer/nmap:zenmap - Install the GTK+ based nmap GUI, zenmap
 net-analyzer/nrpe:command-args - Build support for specifying the command-line arguments from the Nagios/Icinga master. Make sure you understand the implications of this flag as it can be a security risk.
-net-analyzer/nrpe:minimal - Only build the check plugins for Nagios/Icinga, and not the daemon.
 net-analyzer/nsca:crypt - Build support for crypted communication with nsca, through dev-libs/libmcrypt. It's recommended not to disable this flag unless all the communication will be handled in an absolutely safe environment.
 net-analyzer/nsca:minimal - Only build and install the send_nsca command and not the daemon. This allows a very minimal install with no overhead when setting up a node.
 net-analyzer/openvas:cli - Command Line Interface for OpenVAS Scanner throught net-analyzer/gvm-tools
@@ -5789,6 +5735,7 @@ net-dns/bind:dlz - Enables dynamic loaded zones, 3rd party extension
 net-dns/bind:dnsrps - Enable the DNS Response Policy Service (DNSRPS) API, a mechanism to allow an external response policy provider
 net-dns/bind:dnstap - Enables dnstap packet logging
 net-dns/bind:fixed-rrset - Enables fixed rrset-order option
+net-dns/bind:geoip2 - Enable GeoIP2 API from MaxMind
 net-dns/bind:gost - Enables gost OpenSSL engine support
 net-dns/bind:gssapi - Enable gssapi support
 net-dns/bind:json - Enable JSON statistics channel
@@ -6499,6 +6446,7 @@ net-mail/vpopmail:clearpasswd - Enables cleartext password storage in the vpassw
 net-mail/vpopmail:ipalias - Enables enable-ip-alias-domains
 net-mail/vpopmail:maildrop - Enables mail-filter/maildrop support in vdelivermail
 net-mail/vpopmail:spamassassin - Enables mail-filter/spamassassin support
+net-misc/AQtion:lro - Enable/disable Large Receive Offload. This MUST be disabled for bridging or forwarding.
 net-misc/apt-cacher-ng:fuse - Install the sys-fs/fuse based acngfs, to use a userspace filesystem for the apt cache.
 net-misc/aria2:bittorrent - Enable support for the bittorrent protocol.
 net-misc/aria2:gnutls - Use net-libs/gnutls as TLS provider (preferred). Otherwise, dev-libs/openssl will be used as TLS provider. Both apply only with USE=ssl.
@@ -6707,7 +6655,6 @@ net-misc/gerbera:curl - Support HTTP media sources (e.g. internet radio)
 net-misc/gerbera:exiv2 - Use media-gfx/exiv2 to extract EXIF information
 net-misc/gerbera:ffmpegthumbnailer - Enable video thumbnail support with media-video/ffmpegthumbnailer
 net-misc/gerbera:lastfm - Enable last.fm support
-net-misc/gerbera:magic - Use libmagic to determine file types
 net-misc/gerbera:mysql - Use dev-db/mysql as backend rather than SQLite3
 net-misc/gerbera:protocol-extensions - Enable partial DLNA support
 net-misc/gerbera:taglib - Use media-libs/taglib for reading files' metadata
@@ -6753,7 +6700,6 @@ net-misc/lldpd:dot3 - Enable Dot3 extension (PHY stuff)
 net-misc/lldpd:edp - Enable Extreme Discovery Protocol
 net-misc/lldpd:fdp - Enable Foundry Discovery Protocol
 net-misc/lldpd:graph - Create dot graphs in documentations
-net-misc/lldpd:jansson - Enable JSON output via Jansson
 net-misc/lldpd:lldpmed - Enable LLDP-MED extension
 net-misc/lldpd:old-kernel - Enable compatibility with Linux kernel older than 2.6.39
 net-misc/lldpd:sanitizers - Enable code instrumentation with selected sanitizers
@@ -7060,7 +7006,6 @@ net-p2p/mldonkey:bittorrent - enable bittorrent support
 net-p2p/mldonkey:fasttrack - enable fasttrack support
 net-p2p/mldonkey:gnutella - enable gnutella and gnutella2 support
 net-p2p/mldonkey:guionly - enable client build only
-net-p2p/mldonkey:magic - enable use of libmagic
 net-p2p/pybitmessage:opencl - Enable dev-python/pyopencl for GPU acceleration
 net-p2p/pybitmessage:qrcode - Enable dev-python/qrcode for QR code support
 net-p2p/qbittorrent:webui - Enable the Web UI
@@ -7530,7 +7475,6 @@ sci-geosciences/qgis:polar - Enable support for the polar coordinate system via
 sci-geosciences/qgis:qml - Enable support Qml-based plugins using dev-qt/qtdeclarative
 sci-geosciences/viking:geoclue - Use app-misc/geoclue to determine current location
 sci-geosciences/viking:libexif - Use media-libs/libexif for EXIF support
-sci-geosciences/viking:magic - Use libmagic to determine mimetypes
 sci-geosciences/viking:mapnik - Enable a layer based on sci-geosciences/mapnik
 sci-geosciences/viking:oauth - Enable OAuth authentication for OSM
 sci-geosciences/viking:sqlite - Enable MBTiles support based on dev-db/sqlite
@@ -7628,7 +7572,6 @@ sci-libs/gmsh:netgen - Enable 3D Frontal triangulation using netgen lib
 sci-libs/gmsh:opencascade - Enable OpenCASCADE support
 sci-libs/gmsh:petsc - Enable sci-mathematics/petsc support
 sci-libs/grib_api:aec - Build with Adaptive Entropy Coding compression, needs sci-libs/libaec
-sci-libs/grib_api:jasper - Use media-libs/jasper instead of media-libs/openjpeg for JPEG 2000 support
 sci-libs/gsl:cblas-external - Link gsl with external cblas provided by (virtual/cblas) instead of shipped internal version
 sci-libs/gsl:deprecated - Enable deprecated functions
 sci-libs/hdf5:hl - Enable high level API (https://support.hdfgroup.org/HDF5/doc/HL/index.html)
@@ -7665,6 +7608,7 @@ sci-libs/magma:kepler - Compile for GPU NVIDIA Kepler family (GF 6xx cards)
 sci-libs/mathgl:hdf - Add support for the Hierarchical Data Format v.4 sci-libs/hdf
 sci-libs/mathgl:octave - Add bindings for sci-mathematics/octave
 sci-libs/matio:sparse - Extend formats for sparse matrix (not matlab)
+sci-libs/med:hdf5-16-api - Use -DH5_USE_16_API to build the package against old 1.6 API of HDF5
 sci-libs/mkl:fortran95 - Installs the BLAS/LAPACK FORTRAN95 static libraries
 sci-libs/mkl:int64 - Installs the 64 bits integer libraries
 sci-libs/mkl-rt:eselect-ldso - Enable runtime library switching by eselect and ld.so.
@@ -8534,6 +8478,7 @@ sys-devel/parity:vc7_0 - Enable support for Visual Studio 2002
 sys-devel/parity:vc7_1 - Enable support for Visual Studio 2003
 sys-devel/parity:vc8_0 - Enable support for Visual Studio 2005
 sys-devel/parity:vc9_0 - Enable support for Visual Studio 2008
+sys-devel/parity:vc_x64 - Enable support for 64bit Visual Studio compilers
 sys-devel/parity:vc_x86 - Enable support for 32bit Visual Studio compilers
 sys-devel/sparse:gtk - Build the test-inspect utility (requires x11-libs/gtk+ version 2)
 sys-devel/sparse:llvm - Build the sparse-llvm utility
@@ -8769,6 +8714,7 @@ sys-libs/uclibc-ng:symlink-compat - Explicitly add sym links for libdl.so.0, lib
 sys-libs/zlib:minizip - include the minizip library for quick and dirty zip extraction
 sys-power/apcupsd:modbus - Enable MODBUS support over USB
 sys-power/cpupower:cpufreq_bench - Build and install the cpufreq_bench binary
+sys-power/intel-undervolt:elogind - Use elogind hook to apply voltage after system sleep
 sys-power/nut:gui - Install NUT-Monitor python gui
 sys-power/nut:ipmi - Support IPMI-based UPSes.
 sys-power/nut:ups_drivers_al175 - Driver for Eltek UPS models with AL175 alarm module
@@ -8985,11 +8931,11 @@ www-client/netsurf:pdf-writer - PDF output support (media-libs/libharu)
 www-client/netsurf:psl - Use public suffix list via media-libs/libnspsl
 www-client/netsurf:rosprite - RISC OS Sprite bitmap image support (media-libs/librosprite)
 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/qutebrowser:scripts - Installs userscripts from the misc/userscripts directory to /usr/share/qutebrowser/userscripts.
 www-client/seamonkey:calendar - Build Mozilla's calendar
 www-client/seamonkey:chatzilla - Build Mozilla's IRC client (default on)
+www-client/seamonkey:clang - Use Clang compiler instead of GCC
 www-client/seamonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
 www-client/seamonkey:force-gtk3 - Use the cairo-gtk3 rendering engine
 www-client/seamonkey:gmp-autoupdate - Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles
@@ -9125,6 +9071,7 @@ x11-drivers/nvidia-drivers:compat - Install non-GLVND libGL for backwards compat
 x11-drivers/nvidia-drivers:driver - Install the kernel driver module
 x11-drivers/nvidia-drivers:gtk3 - Install nvidia-settings with support for GTK+ 3
 x11-drivers/nvidia-drivers:kms - Enable support for kernel mode setting (KMS)
+x11-drivers/nvidia-drivers:libglvnd - Use media-libs/libglvnd for dispatch
 x11-drivers/nvidia-drivers:tools - Install additional tools such as nvidia-settings
 x11-drivers/nvidia-drivers:uvm - Install the Unified Memory kernel module (nvidia-uvm) for sharing memory between CPU and GPU in CUDA programs
 x11-drivers/xf86-video-ati:glamor - Enable Glamor OpenGL 2D acceleration
@@ -9404,7 +9351,9 @@ x11-wm/xpra:webcam - Enable webcam support via opencv
 xfce-base/exo:gtk2 - Build deprecated GTK+2 libexo-1 library.
 xfce-base/garcon:gtk2 - Build the garcon-gtk2-1 library (required for xfce-base/xfce4-panel < 4.13 only).
 xfce-base/libxfce4ui:glade - Build support for Glade 3's GtkBuilder implementation
+xfce-base/libxfce4ui:gtk2 - Build deprecated GTK+2 libxfce4ui-1 library.
 xfce-base/thunar:trash-panel-plugin - Build the trash status indicator plugin for the XFCE panel
+xfce-base/xfce4-panel:gtk2 - Enable GTK+2 plugin support.
 xfce-base/xfce4-settings:libcanberra - Enable sound event support using media-libs/libcanberra
 xfce-base/xfce4-settings:xklavier - Enable keyboard layout selection support using x11-libs/libxklavier
 xfce-base/xfdesktop:thunar - Build support for desktop icons (for example, launchers and folders)
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 8aeb5beea72b..5ea5f232f33d 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/gazebo_ros_pkgs/Manifest b/ros-meta/gazebo_ros_pkgs/Manifest
index 7f3520cb75b9..9bdbe0d7d257 100644
--- a/ros-meta/gazebo_ros_pkgs/Manifest
+++ b/ros-meta/gazebo_ros_pkgs/Manifest
@@ -3,10 +3,12 @@ DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a312
 DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
 DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
+DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
 EBUILD gazebo_ros_pkgs-2.6.1.ebuild 457 BLAKE2B f62b4dc6e86a8c1f6d0459da68d398663e954fc6508cdf4f876ef450bbe9da9dea5189a7f287c0a011ed6f29bb02311ffc243016c780352a710db0ee73e81e5e SHA512 b24783ce061b9089ad545dbf9b2f3b7c02be105afa65f6c252b8714020f6788847f3ab45bb57a1ba6a5ba79a3782b3f0033e5424ede03bf61f872b3c287cd711
 EBUILD gazebo_ros_pkgs-2.6.2.ebuild 457 BLAKE2B 0574045871c0d8611d2a8267b358cac6f8c16c4c6fd6b941747f052d56e089c52f6a202cb7106eb38525f8f6269389d367409fddd0f7cf1a273166c1e130352b SHA512 147db9137c88a3576f1c8177ee21aa0e2f85e882a8bd98dfaaefa82a382dd87eb817303263f1654f6dcd7bb033c83e20ddc47c4ed7d7e54ee0eeb7ca1f6a1980
 EBUILD gazebo_ros_pkgs-2.7.3.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
 EBUILD gazebo_ros_pkgs-2.7.4.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
 EBUILD gazebo_ros_pkgs-2.8.4.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
+EBUILD gazebo_ros_pkgs-2.8.5.ebuild 474 BLAKE2B 1fb90d3daab12c908c09a5544904cda7e2dd286ca0a709e7e72767f87ef3e7865e95bada7b7731dcbb4ca885c70f2692ee0c1f6de4aca0b355a89679b4e3d23b SHA512 5f26eccebf978283b9041125d9c537bcab243309de4553625fee562af738367a27a797e9b1384864ed4863ba068225adf8265d8abce147781850ee1e40c1c386
 EBUILD gazebo_ros_pkgs-9999.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.8.5.ebuild b/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.8.5.ebuild
new file mode 100644
index 000000000000..ebc7371492da
--- /dev/null
+++ b/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.8.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Interface for using ROS with the gazebo simulator"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_msgs
+	dev-ros/gazebo_plugins
+	dev-ros/gazebo_ros
+	dev-ros/gazebo_ros_control
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/slam_gmapping/Manifest b/ros-meta/slam_gmapping/Manifest
index eaf64d5b8e58..1427d9eb1ac1 100644
--- a/ros-meta/slam_gmapping/Manifest
+++ b/ros-meta/slam_gmapping/Manifest
@@ -1,8 +1,6 @@
 DIST slam_gmapping-1.3.10.tar.gz 21032 BLAKE2B cca0779e64d45622dad4ec29cb3c1d0162176038288c0aa7b117f1a76a7655f3af3024dba7ff1025948e400e0176794a553e357a235187d9196161a635ab6d01 SHA512 fa4485ddc9fcfaac63a63d209a5a994e33e78546a39edcf47eb3c3f1775f0d87a1f562319058868838990bbf85a9515ff0228779dce7531148f208b3522e7e7a
-DIST slam_gmapping-1.3.8.tar.gz 20533 BLAKE2B 5e096b4863077941843b966f2991a23c24e5396d42d0d8cd8beb7123805d085d07b8ac7e8e4a3c3ea43a6f4605ada40eb28b8c10207536dcdb7ef92cc1a5fcd8 SHA512 d7b054296f286a5e61e5f952a29ccff2165503123ab6a89724ec34180fb0f4c452fc0ae81ec853cac170b304095e62cef420431e5aca85a262febc2b5ab5ccf2
-DIST slam_gmapping-1.3.9.tar.gz 20951 BLAKE2B 989c28fe60668f0b37bf4766656764095157734c1ae0f41f6b95faa9ed9c20ed91de18534bfc99ea7ee035f2df213f8004adefcf06d269be55b27c37156da542 SHA512 fcab88127507206274e903de804aa9167b30c1dd9fbf2875aeafb990285923223a2ce71edecede60d2c93dba2d8fffd0d371abd643647755094abd9ffe0aba73
+DIST slam_gmapping-1.4.0.tar.gz 21123 BLAKE2B 088d1bfaa69bf98eb2b2176afbfadf843f5f478f9c54dc7eb32fa91116da31bab66f9a1ac09d0535629cc5a7f604d153c90c5a25f173fb867369aa9e33d4d7b2 SHA512 ae7984716113e24e1bced88523729481829303a2b88d247b8fc8bdd23c0f38b4ce6260d7086d79a6653ecfdbe8ba60ae011af20180ffcb5025cd9d347d3e76b1
 EBUILD slam_gmapping-1.3.10.ebuild 370 BLAKE2B 82bff3ef0e2eed8bc9c57f7400b5beef775a095f79d65dee7ecebbf7b5c6939aee0a474651eed2926227dd5d921900e8cd226ec1eb27b50148c070a619cbb44c SHA512 c7a126accec5704c08e877386b6da6a2d3c0fd150a11a3e43f24fc712bdd2b566233596728ef40e4502c7c5e434e3e376d69fa6deed83f4d9163168467431765
-EBUILD slam_gmapping-1.3.8.ebuild 370 BLAKE2B 7b32d9b9899ea4f658ad7283c2937e39dbaf1776e358f19dd38f1e05d56aa78884574be78c9e72e4215ac9ffc86831186161396e866b8fca4840d21bf534fb13 SHA512 e33e8c784dfc0047f686c399545175d5ef0bda60bdd00d3beb25153b2f38c3972b7f524637396b1857c7d27ee527bf256730b4040b75dad1d27f6e0e47288257
-EBUILD slam_gmapping-1.3.9.ebuild 370 BLAKE2B 38d2e82f3043ec3a540915aa470d11a47ded599b2f08e8075506c1bea4b98d3f21af64c228d441f3fd2be72189d07c9dbc586c003f2096e65c17a3942d71af56 SHA512 c9155eeefb96a31ae418b952e35371f85c7a3d191ed732a5ca2be435e60b93a35a4e7d64d78f86be05959cbad5c362524c6810777d2753ee6621c96e3c03f176
-EBUILD slam_gmapping-9999.ebuild 370 BLAKE2B 7b32d9b9899ea4f658ad7283c2937e39dbaf1776e358f19dd38f1e05d56aa78884574be78c9e72e4215ac9ffc86831186161396e866b8fca4840d21bf534fb13 SHA512 e33e8c784dfc0047f686c399545175d5ef0bda60bdd00d3beb25153b2f38c3972b7f524637396b1857c7d27ee527bf256730b4040b75dad1d27f6e0e47288257
+EBUILD slam_gmapping-1.4.0.ebuild 355 BLAKE2B 6377d947b58585e1b33a56e6faad9d93465c36090c6c71fc4d3640ed4397c6863ef6cc05958dc31740da70dbc92a2956d24766ae3116c3cd561d6deaa5c95245 SHA512 b43a6325eeba01a3e9221edc5d55058dba4768230456e1d9369e288dad37b96a8f8a6a5432f91814d6dbce1eff988770ff5bbc90f54f3283efd572686f6e9cd7
+EBUILD slam_gmapping-9999.ebuild 355 BLAKE2B 6377d947b58585e1b33a56e6faad9d93465c36090c6c71fc4d3640ed4397c6863ef6cc05958dc31740da70dbc92a2956d24766ae3116c3cd561d6deaa5c95245 SHA512 b43a6325eeba01a3e9221edc5d55058dba4768230456e1d9369e288dad37b96a8f8a6a5432f91814d6dbce1eff988770ff5bbc90f54f3283efd572686f6e9cd7
 MISC metadata.xml 342 BLAKE2B 72a1fe4f1e7971418dbb3f5b1e78de71a77819b9fa7200feb2ce0abec5b50a5435c5e5541d290bfd23c7acee5a6920280934067c84e4716bd9f6bb0cc634544d SHA512 2a5beef664e8c79b9e4d858d0dc093068c6e462456ae6066ea637f4b725e5c7184dd65769906c34e55eb6b03949e957edba34b84a587e1daec784e1f74ea287c
diff --git a/ros-meta/slam_gmapping/slam_gmapping-1.3.8.ebuild b/ros-meta/slam_gmapping/slam_gmapping-1.3.8.ebuild
deleted file mode 100644
index f976426e281e..000000000000
--- a/ros-meta/slam_gmapping/slam_gmapping-1.3.8.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="CC-BY-NC-SA-2.5"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/gmapping"
-DEPEND=""
diff --git a/ros-meta/slam_gmapping/slam_gmapping-1.3.9.ebuild b/ros-meta/slam_gmapping/slam_gmapping-1.3.9.ebuild
deleted file mode 100644
index 8fb94572a765..000000000000
--- a/ros-meta/slam_gmapping/slam_gmapping-1.3.9.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="CC-BY-NC-SA-2.5"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/gmapping"
-DEPEND=""
diff --git a/ros-meta/slam_gmapping/slam_gmapping-1.4.0.ebuild b/ros-meta/slam_gmapping/slam_gmapping-1.4.0.ebuild
new file mode 100644
index 000000000000..8d2027a20145
--- /dev/null
+++ b/ros-meta/slam_gmapping/slam_gmapping-1.4.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/gmapping"
+DEPEND=""
diff --git a/ros-meta/slam_gmapping/slam_gmapping-9999.ebuild b/ros-meta/slam_gmapping/slam_gmapping-9999.ebuild
index f976426e281e..8d2027a20145 100644
--- a/ros-meta/slam_gmapping/slam_gmapping-9999.ebuild
+++ b/ros-meta/slam_gmapping/slam_gmapping-9999.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
@@ -9,7 +9,7 @@ ROS_SUBDIR=${PN}
 inherit ros-catkin
 
 DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="CC-BY-NC-SA-2.5"
+LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
diff --git a/ros-meta/vision_visp/Manifest b/ros-meta/vision_visp/Manifest
index a37e9f3ce7f6..3a0b14236866 100644
--- a/ros-meta/vision_visp/Manifest
+++ b/ros-meta/vision_visp/Manifest
@@ -1,6 +1,8 @@
 DIST vision_visp-0.10.0.tar.gz 1015180 BLAKE2B bf0474d0633a6b704077e232d4676e6ebb9ec666b9b03792dbb929c6c6d1c52a941f7a4517f7bc6a7150882c16ba719eb3cf17c3fbdd13df109eab3a34afa259 SHA512 8e2652d6ca9c9535f1bebb628ec908f64c9fc89358bc92ed42ef12430b0b28c8ed3ed7935d2d3fe03c9761f9ac08e200eb59839ee2243df62d5934e8162cca9c
+DIST vision_visp-0.11.1.tar.gz 1014349 BLAKE2B 63148bef65a8361be7cb4a3d27bae4e6440feeeca3ab7183c6c345d4d1a2e0e4f7bc52b265455636ae8e07ddbed0e182c8d0b326b7686cdeda97500203fe3183 SHA512 cb1a09fea7ed2bb74c0c3f5a525d35ef7304dc2c569c6c808cd3751e500b7e32f226436ec4150f63a8280bc3f0c53dfd64757aa09da7344b1ec998130006253c
 DIST vision_visp-0.9.3.tar.gz 1014883 BLAKE2B 45dcc7b6fc7f80986c57ab92b31ce85ec7806206903b79363e0eb54467043a63300f37fa15292174be3638898acdeb2c3b3a468c11e7ab0ef689b40b8f2c899e SHA512 e5775e410efefaaac00cdfaf07b65f9f77ade0e7d6f40b3d8345d7b594520f46741f56039c1eb0193c57287bafbddf8e755e10d6f85cc12ddefb2b997681f44a
 EBUILD vision_visp-0.10.0.ebuild 604 BLAKE2B e49d7a83e3f38785e4a4c3cc9d74fbc88a07810cb29fdd7286d6388a360a1d97dc21c26720e0965d0f3de31db810029bba7290f341f1f541f9ace929877c6f11 SHA512 f7704dd49b7f3c00848ec6116de7005deb7cd0d0823d6cdc494fc7b9b55afe6e7ef830815fb24a7fb326637d1cae4c6117c145f1f9f99e88bb654476747256e5
+EBUILD vision_visp-0.11.1.ebuild 601 BLAKE2B a90b0ad61ed4ca52de1f49781ee1cfe964801848d15102828c63920ce09ff4f01f2dceb01d290db414c8d365bc4bed6fe6870ca8fcc67218e4f54fc57c2c3925 SHA512 b9cabe020813c3bd925a3d9b62ebf7d9b16d30eb285d71effb8bd4c1ca238d7b8d1d7c1a7fa37d99219fefa89f21054381ff761470610c818ca10af4c5b33066
 EBUILD vision_visp-0.9.3.ebuild 604 BLAKE2B e49d7a83e3f38785e4a4c3cc9d74fbc88a07810cb29fdd7286d6388a360a1d97dc21c26720e0965d0f3de31db810029bba7290f341f1f541f9ace929877c6f11 SHA512 f7704dd49b7f3c00848ec6116de7005deb7cd0d0823d6cdc494fc7b9b55afe6e7ef830815fb24a7fb326637d1cae4c6117c145f1f9f99e88bb654476747256e5
 EBUILD vision_visp-9999.ebuild 604 BLAKE2B e49d7a83e3f38785e4a4c3cc9d74fbc88a07810cb29fdd7286d6388a360a1d97dc21c26720e0965d0f3de31db810029bba7290f341f1f541f9ace929877c6f11 SHA512 f7704dd49b7f3c00848ec6116de7005deb7cd0d0823d6cdc494fc7b9b55afe6e7ef830815fb24a7fb326637d1cae4c6117c145f1f9f99e88bb654476747256e5
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/ros-meta/vision_visp/vision_visp-0.11.1.ebuild b/ros-meta/vision_visp/vision_visp-0.11.1.ebuild
new file mode 100644
index 000000000000..a3e7b3906be4
--- /dev/null
+++ b/ros-meta/vision_visp/vision_visp-0.11.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Virtual package providing ViSP related packages"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/visp_auto_tracker
+	dev-ros/visp_bridge
+	dev-ros/visp_camera_calibration
+	dev-ros/visp_hand2eye_calibration
+	dev-ros/visp_tracker
+"
+DEPEND=""
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+fi
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 42bf15c94981..79b5ef21a63f 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 41d7bd1cf151..691e1a55978e 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -8,5 +8,5 @@ AUX celestia-1.6.1-linking.patch 1526 BLAKE2B 8244fa0dcd7771887c2bd09e5ac2c8abba
 AUX celestia-1.6.99-cfg.patch 781 BLAKE2B 04ff4f7c5159eee81479ed588d302fa6a97475955af733e013fcafb2b37975fb1f2215afe61a715b5ec7716dbd75b5915dd4a5031255adb8fde5f6e64d9b71a5 SHA512 50cce63a701da85b52bee5db5b34eed77118c7c847612b4bc7ae82c80b198c718b4adbf0f21cc82e4afbafe20f53dda191285095d6ee5e796ce7f6c94388b832
 DIST celestia-1.6.1.tar.gz 52600436 BLAKE2B aa5b515a75b0344f6e5d59bf385bf1c368e3c38098a1bb9c273fd87ae34a7c8e88a4bf789935bb35ee16f2037004c8f54e21592023a0675766cb4ce005c704f4 SHA512 5b1221e97ee03f7def317e5e29c5100ebe714a4a3aeb8b9818dc9445e4282b6f87026ab35c7b3d5eb02fa6dbb33693977999d14d9648fc4e6d1947abe32a413f
 EBUILD celestia-1.6.1-r1.ebuild 3062 BLAKE2B b5c913e509ce0706219d93350b5f5657fb9b871fa93604eb493ab496926d5c19bd0afecc448ff1c2bed0fe9098bafd9080a816acdaa5802b25812bd3ff921d3d SHA512 84f0c7f6dc6ec27cf1659178a71b1a936d4d2155530dc51fc457aa08cfe02c89a967f8e169d56d9aa2179265153fe0c998f18e0240255c3dadc5b386f915e6f6
-EBUILD celestia-9999.ebuild 2405 BLAKE2B 8b8e1421f4152f1a9226b7f108ecf55a63a7a8d03ae362c6510043f506f9882c6a01b0fb1c48c2bcd077d8318a8cce1a949936b6ee6f228ab98897398559e85b SHA512 8da007157a0e51ccb789d437098128d8d8bb64f183f3442265188cd9160e25be407ca1246a6e63b02c97c2a9a4f6463f32ae34f33d2087e714593867ff27af16
+EBUILD celestia-9999.ebuild 2407 BLAKE2B 465a30c13876ab1b348496f01c44c757ba496a18404e36744b6ca2adc06a64dd70984a535679f0d7d5e270bf0d8896bef1851dcf3090c7acae71ed10ac66a95c SHA512 55a28e63b93c737fdace09e9f64e464dd6e9f4ace95d8e93432ffe445782cd813d87e8861a4b5cccd8e62b9fbdf8c0e51db4228817b2f8023996f679c3972add
 MISC metadata.xml 892 BLAKE2B e5bc4a09a9e495bcecf9bc2f5e0c60e7aee0b7c65071ac1636416368a1fc9c49057a23127a964c0cbb9a42c6a679cfed5c8d0511c88c67808f5078cfb3ad04c0 SHA512 f222c4e816f2684d8d8de5d456e81b6f6a9b92f3d3996137ddd371a9934793beeda6d1611e8f510f35eafdbe83837007fbae897efcebd47a6bf00e8b3ae159f9
diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index 182456385fd5..cf7966b4a411 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -29,7 +29,7 @@ BDEPEND="
 "
 DEPEND="
 	>=dev-lang/lua-5.1:*
-	dev-libs/libfmt
+	dev-libs/libfmt:=
 	media-libs/glew:0
 	media-libs/libpng:0=
 	virtual/glu
diff --git a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.7.0.ebuild b/sci-chemistry/GromacsWrapper/GromacsWrapper-0.7.0.ebuild
deleted file mode 100644
index 55ff025bcf66..000000000000
--- a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.7.0.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
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI="https://github.com/Becksteinlab/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	scm_eclass=vcs-snapshot
-	SRC_URI="https://github.com/Becksteinlab/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit eutils distutils-r1 ${scm_eclass}
-
-DESCRIPTION="Python framework for Gromacs"
-HOMEPAGE="https://gromacswrapper.readthedocs.io"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=dev-python/matplotlib-0.91.3[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0.ebuild b/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0.ebuild
new file mode 100644
index 000000000000..688c26cc3807
--- /dev/null
+++ b/sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-r3
+	EGIT_REPO_URI="https://github.com/Becksteinlab/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	scm_eclass=vcs-snapshot
+	SRC_URI="https://github.com/Becksteinlab/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit eutils distutils-r1 ${scm_eclass}
+
+DESCRIPTION="Python framework for Gromacs"
+HOMEPAGE="https://gromacswrapper.readthedocs.io"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	sci-libs/numkit[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/sci-chemistry/GromacsWrapper/Manifest b/sci-chemistry/GromacsWrapper/Manifest
index 6e3316548fb5..cc8676ae54fd 100644
--- a/sci-chemistry/GromacsWrapper/Manifest
+++ b/sci-chemistry/GromacsWrapper/Manifest
@@ -1,3 +1,3 @@
-DIST GromacsWrapper-0.7.0.tar.gz 1177718 BLAKE2B 88515b14ce85ecdf0323c3e4a68ac702cfc14569508be015fafc8192174af792507f6d10935aed2f969417ad34d5a1216688e9dce2f6dc6fc47529b87572d229 SHA512 74f6c5b84556b79ced128e48bf111cc40306b8854c8fcf53cab8f2fcf2dce56367e075c116f50aa1aa0947c83af0641bc78045e7d5035f2a8813f9709edce097
-EBUILD GromacsWrapper-0.7.0.ebuild 791 BLAKE2B 37fc7272107e139932930627ecaacebc074addcb0cf6208835d9034b18d6ba9012fa94ce27662f3f71d7baa7c2b44fc2f7a7b99553378bfa17f641087b76ec33 SHA512 d98ee09bc0326207469eb832bfdf3fc61fc83b526ade01994c17bd4cd37313f42913f6bf62665e3834eaf12231e176887192bfb6d709edbb7b547152464a65d2
-MISC metadata.xml 478 BLAKE2B 43348f9431c7456df96e838aeea11d6e3ce3c4c38c796d0746cd249f167e9a55fbd57c3e8d7b731facd530492e14ff165c54fc4c97facddba948dd02a2c4bd2e SHA512 2214eed914af825f9ab83c1de633c00cf2d3f39ad9f88dde4b21264856e3f7ba960fcacf512d0308f6d351857c76a8ad5aa494988c3c03bfd172a233a7f3207a
+DIST GromacsWrapper-0.8.0.tar.gz 1205837 BLAKE2B 3627e56df0dc6ba86caac67795416c7c8c187aaa4fac545600d17dcd799cb153feaab61a0f0632e051c4e9c0b4cd74f8e165156873e36bc53571bec78e5fca61 SHA512 da7215216c9a2b52094bb7e43e04f1b429c4893ba67b4bd850fe68e99f338813392fd9d0aa1b19d3398c694be964bc2badbf1b3623420da929ee4abcef18026f
+EBUILD GromacsWrapper-0.8.0.ebuild 817 BLAKE2B 12c186f411c5dff106e04d65c3de4350c29ba5f71e4012196674f00ca0711cfa311cce7c1211128c2808add32c05cf36afdf58be2682455a38ca938d45dc69fc SHA512 1518c5ccc637bcf1a8f89896ca4e9b9f31f0331ab07ba5a4b698d81e0233ec75d318f1699981897148e13013a94dcb62ef87478ddce01756d71e164320f96cc4
+MISC metadata.xml 482 BLAKE2B 2745b575ac325e9f8c53d53026ca0c67201f1519725c572813c0ad281b4a39399cbf93176e816646aa83f829c0981ee4457e3ab2232ed095f76d5a2068840912 SHA512 4f2efb8d263f20e50928e0c6f0913c65da746b5253a14658273c830b7f95ecc15620f92e87db9670adfd92792e96cc352af528ed4fa1e874977a744d2e15c6bf
diff --git a/sci-chemistry/GromacsWrapper/metadata.xml b/sci-chemistry/GromacsWrapper/metadata.xml
index 16752065b886..e8b6e94ed2a1 100644
--- a/sci-chemistry/GromacsWrapper/metadata.xml
+++ b/sci-chemistry/GromacsWrapper/metadata.xml
@@ -10,6 +10,6 @@
     <name>Gentoo Chemistry Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">orbeckst/GromacsWrapper</remote-id>
+    <remote-id type="github">Becksteinlab/GromacsWrapper</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 0ec00a70e274..8103b64845c5 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 17b822044ba8..889c347a84b3 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/geda-suite/Manifest b/sci-electronics/geda-suite/Manifest
index dcc89fc3a640..7dae73fbbf81 100644
--- a/sci-electronics/geda-suite/Manifest
+++ b/sci-electronics/geda-suite/Manifest
@@ -1,3 +1,2 @@
-EBUILD geda-suite-20110427.ebuild 644 BLAKE2B cb0f3b1e70cb97735dbe5be66e1ef3cde6c21b65dbf841fa24385a0cba2de98bebc23b35546af851513e3ca142995567dd14f318f697975b827475d7c159f578 SHA512 7645c271df5fa390442534cb6433daaefad6f9338912b3e87c3327b34d03cf9278c9d4f7d4d02db68354ac40eb060e3008d43ec6efd6db7432eee2bad1063723
 EBUILD geda-suite-20171223.ebuild 641 BLAKE2B 1d4542e79cfed04af6f23423a73f75b16dce3d9055b55b54587a28e93fbee22996299774af915c00a1bb05652ae6c5dc22b6188913d2baf3a52c898c6e1a2fcd SHA512 75d6a72171717460d30a955cc78991f0a1f69e833e63ff14eec4ffd9f62aad69ccda4481ebe5c9aacaa1b5637a804a795a7e4c20a348803b294b479e4dbaadcd
 MISC metadata.xml 275 BLAKE2B 9881119cf5c31889f750c01cbf8f3db4b26cf0c92ae29ccd45c42032ea9454b0d9c1193e42692d88abdaff067171bb00927d2c291922932a7f38b484b8ed89a1 SHA512 8e06b994ef5f02a1e192c3d5a91244012f1c2f0cc29d8cd5ed7ccc7adc178d3a9b61abcb7b4dfa96ad616bf45447ff463357d0b5640606d48f70cdd0def1968d
diff --git a/sci-electronics/geda-suite/geda-suite-20110427.ebuild b/sci-electronics/geda-suite/geda-suite-20110427.ebuild
deleted file mode 100644
index b7049a989cf6..000000000000
--- a/sci-electronics/geda-suite/geda-suite-20110427.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-HOMEPAGE="http://www.geda.seul.org"
-DESCRIPTION="Metapackage for all components for a full-featured gEDA/gaf system"
-
-IUSE=''
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="sci-electronics/geda
-	sci-electronics/gerbv
-	>=sci-electronics/gnucap-0.35.20091207
-	>=sci-electronics/gwave-20090213-r1
-	sci-electronics/pcb
-	>=sci-electronics/geda-xgsch2pcb-0.1.3-r2
-	>=sci-electronics/iverilog-0.9.1
-	sci-electronics/ngspice
-	sci-electronics/gspiceui
-	>=sci-electronics/gnetman-0.0.1_pre20060522-r2
-	sci-electronics/gtkwave"
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index faa7023eb4e8..76b38bced164 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index a24e466ab284..89b401950af8 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-maps-3.30.3.1.tar.xz 2175840 BLAKE2B 0c2f44ec3262715d98e1a0412ca305e15916cdb92df5fc5b04df34b65a7b9c55d4f5dd9c54f9f9dc34f8e6dd889f60d7993b59ca0cd92e4e60b22b506877b24c SHA512 02d3b1b305c1011a60a34566847962ec3c32ee3563ce2c327b810fae24c2df08354d8420f1986645d861cfef7a35f336d67d4576a3e2f61eabdd972b8d070a8e
 DIST gnome-maps-3.30.3.tar.xz 2176712 BLAKE2B 8595643ddf3f6c419fdc053561e49e62d6bd6e3713d3d809d3fe73cd1aecf3361e3f6592fb53d6963cbdd5fc3edaf1dcb616059da9e5e506a3399d00a9a65de7 SHA512 f3481266c6cf792da71ef40ce489c13fdd807dab91238e02b815b25e29119ffb56212fb03078e14004cca27e24906af1b94f7f3c4325bbf4f332c782c79d8203
-EBUILD gnome-maps-3.30.3.1.ebuild 1372 BLAKE2B 45f013defff4980ee034b0a59bd2263faa1d1e749044c9c3c8104d75565b5a1ea8e9c23bf5e9b21cc7c5825dfafadc554898de4a6034ae511e069eb24238f642 SHA512 f2671abdd34e99ae2e95f6f1b865f13294b59b10fc95dc4e7687d822516a0ab497af4aa3eecaf619486ea5a15e33a7b694dfca798399ec26b0482cc096eba10d
+EBUILD gnome-maps-3.30.3.1.ebuild 1371 BLAKE2B e21171e674c9aac5754c4d32b1bbcdbf4b5ed108787a78e4702764f65506a2a2424baf58d0ab7a808b4948fd8b5f47977832d299985bb93177120ca862e2b273 SHA512 3eac7d2475cfc32138e72fa025f65117726a2ee47e91e841e9352cc7fe8ecfb0283293625f293f14bd655b2624398f1034094f3001ab2d8504a8fb77bb9cba19
 EBUILD gnome-maps-3.30.3.ebuild 1359 BLAKE2B dfa98ca4eed766532f6008528d72cd0788323cbd8f5a575869cca613d35aca73a9a61fbf5d2f86e9bbbfd5e7f3f2471ebf86ea36e9876a07545191007b4f5d7f SHA512 955e664deb35e95f3d2c2bc0329dd252b41dd9167d1c6b69a59313853b84a651c3749f1960df8c164d26d9c5b2af4bbeee63c337920536f79f9951c106e6fcf1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.30.3.1.ebuild
index 9aea12d14292..801d1c7091bb 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.1.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.30.3.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # Pure introspection dependencies found by grepping imports.gi in ${S}
 RDEPEND="
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index e6c37bbd4cba..406a6c4cdcb3 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -3,4 +3,4 @@ DIST viking-1.7.tar.bz2 3438343 BLAKE2B 2fbf154c94a0bc745e353dd07e67424b5dd27fab
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
 EBUILD viking-1.6.2-r2.ebuild 1756 BLAKE2B 5d914b4f1ab4d07fba05485d77e6a5802a4c59d5110b49a0c7914367a4684d9a64f8bbdc164bbcbb961b5372eff36fe9ebd58fac4d6ac4567031d12820c7f1ea SHA512 b2672f59cc289c0554989adec8d20eab69b81c27305a9a36c7227f4393afac4b99f03549ae122a59aa497c5ad26f0760df4b85015ad2053b4d120b977e84d438
 EBUILD viking-1.7.ebuild 1922 BLAKE2B 9c9bc4fdb8ede308da5d6f149e8b25916a167c27b9a1fe17b1dcad4aeb10a03ee1f75a02031aae28e19e028c6260ffe993ab74a6bfc9b6b1281e4399a1c3ef42 SHA512 157328f298a3e3fcef1e7cc1dba866d2fadf75694f046f20bf2d7368fbc327436fe2dc0e13e1fbae852db50813777953ef59cbfb30ef05f0dc54e2a8d538914d
-MISC metadata.xml 1012 BLAKE2B e98fc84972539ba979b7846e80814f5062d4943bc2b09850cc0bdb6a72bb490620400f4d0056226ed61f88249cba9245b020fea5d64130ef7dbdd60b32e7bc2b SHA512 ba0bd7b6ac100042461367a17d46150471d9a0427b5da6c4185f5cd61e389f5131bf10667d6d92bca86a57a0fa0431857cfb5004d742f087cd70f5912804bdbe
+MISC metadata.xml 934 BLAKE2B 7f6af7f644e184f8595aa373c4599c55faa6a2e426a64cad0a3932b047a0d842d12f984f6633f34a31114da32cfbcf5cafda739a8f6fc2599f61f63e1e98b5ff SHA512 23e71b45b9d974af69029358c24e47bbb01228dda6ad32ca1453617879d776cc8b212d88728c694a46b46634dc5f77f52b050349a1287249e483e7f4cd5b1b35
diff --git a/sci-geosciences/viking/metadata.xml b/sci-geosciences/viking/metadata.xml
index b43ae0fa4280..1e7626ccd503 100644
--- a/sci-geosciences/viking/metadata.xml
+++ b/sci-geosciences/viking/metadata.xml
@@ -15,9 +15,6 @@
     <flag name="libexif">
       Use <pkg>media-libs/libexif</pkg> for EXIF support
     </flag>
-    <flag name="magic">
-      Use libmagic to determine mimetypes
-    </flag>
     <flag name="mapnik">
       Enable a layer based on <pkg>sci-geosciences/mapnik</pkg>
     </flag>
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index ef8473b676e3..44755f1d951f 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest
index e5f2a4736af2..c2f1f86e036b 100644
--- a/sci-libs/Shapely/Manifest
+++ b/sci-libs/Shapely/Manifest
@@ -2,9 +2,11 @@ AUX setup_unicode.patch 698 BLAKE2B a4a007ac79df195e261161c59a92bf2fc50beea9d128
 DIST Shapely-1.3.0.tar.gz 118863 BLAKE2B 6a35060b6593519b62b479fdb21047e0a44976109e27a55dbdf7583952666c8cfecf775975be54701696d57d3c5b1082110dd474df265ccf5b467acddcd2a629 SHA512 106f9773a5b00e7269a84c760f3a2b867c48139c48eebeecd524c8216d75c28daaf46eff45c118c1809999e33a317e9aca278a8d83605dc7273877a7ed3edd82
 DIST Shapely-1.3.2.tar.gz 120179 BLAKE2B bc10e017a546e715c05c4edb1aab4f86cb0fd6f1f35ab23f1d8dcdf402c96bbbbaca92668cf9bc788387dac8cabd958cfa3ffff5a90045f2f2a7a6798383cb2d SHA512 23d65c5a7137726e05e0399dc49f05e5ad9b582d4adcdf30215f72ae75989e85daf30ea2a5010d6a5a086cb6bbb5b4599b5065080b845c833776812f6e46566d
 DIST Shapely-1.5.17.tar.gz 180663 BLAKE2B 1a41de8c264989abeac27fe9b63abd81ad6f03f0eecd313131d04190b8bbebc6c6bd6b45b1782fbfd163025cda4977b7e93a24a711c76fddfaedb0fe880cea53 SHA512 eea241942ffbf377001445fab4017c9a2746d6bc0baa6c801a08ca95e608bbdaea7ad9568f00cbecdb559e634402bc6d213ebccb4074e59325e1cc4b3771626d
+DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f
 EBUILD Shapely-1.3.0.ebuild 603 BLAKE2B 62cf1e6d9fd2910ca19853362f74b6cf887f51680f4ddb4c4815043afc6299145c3238dbf9324d20047a9b7888c0c3ca8f4f97a8e088081943545e064b36b335 SHA512 ad90840393460ff0644e0bdc8be885febbe8c874c47330d200266cb1423335ad8433163762b46fb2bd32275d4d255dde29297ecd44fec689156af7b6f5539905
 EBUILD Shapely-1.3.2.ebuild 603 BLAKE2B 62cf1e6d9fd2910ca19853362f74b6cf887f51680f4ddb4c4815043afc6299145c3238dbf9324d20047a9b7888c0c3ca8f4f97a8e088081943545e064b36b335 SHA512 ad90840393460ff0644e0bdc8be885febbe8c874c47330d200266cb1423335ad8433163762b46fb2bd32275d4d255dde29297ecd44fec689156af7b6f5539905
 EBUILD Shapely-1.5.17-r1.ebuild 1052 BLAKE2B 71a677a56a589598ee692554ecb4e1c07fad83af3f34e521b1f3ba039dc9ca52174431560e9a5624ccb58b51ab5c86c901e773947d08579f1e6d9aef51d767cd SHA512 20ddcc090a596b4fe9da47f5ca361a0710ab8e04e708a021e9d59ff35ded397779931b649937c204332521cf4cf514e7d8d4db196358f91a61d58d225b298c35
 EBUILD Shapely-1.5.17.ebuild 688 BLAKE2B 03b1db2cd2deb926ab58b75228d729ae3315f83533021bb01ca157a3dc210e44d07da0e411f609de99758c655424bca9c158648694851af49bb5b4bc13df7b98 SHA512 11d9431fea44f608a3a50f1bb132c82fe63aaa0ed3591ed36900e3fd1943c55ae9e993ef48edbecf172ef30d7d4008e4bc6cb65bc7e0fd14758fd2ad36fc5d67
+EBUILD Shapely-1.6.4_p2.ebuild 1145 BLAKE2B dac69677d50fc0eb36522f4969f162bea9d2a7501c524731396555d28e4e84f554018d6fe581fed9ec2012457e4fa54c7a0c95503eddf5590c7085d0bc02f18d SHA512 59f6cf247d595d9ee2b597a5dc92b97dbbe2fef1ba94b473968bbb1992de7287ef1a72ee74f90333b050b7bab7672cf637633503d3d0b593ff880f91529da08b
 EBUILD Shapely-9999.ebuild 580 BLAKE2B 1662dcbd1c300b5c039e5d619f7b323d8206967f354f09b3b512cfc91e8f4f4b8d922d1db411f6307c38d33f06f4fd2d0944c7596020c9aa700cf498a38d0f77 SHA512 43dc089ac4901fe171b8bc1df7081d265c01471c6f27981e8c4d99ab13c4ebb7dc807fdb6cf11c2b93f34592307f0fce88dd3350ad2de60a85d6831466b95665
 MISC metadata.xml 293 BLAKE2B 556bed997454d3e7c0a32291cae2326e9fcdd3cd91d5a3f43fd5934bb093daf397c3f3628b0f921460f7cb846b1c961a02de772437275193883d59c90f018e78 SHA512 850b4e0ef0b365030c29a55c20eba931ea283a3f1603d0c0f887e80fad352ffcee0c546cd68ada65d4ba9f33fc0bfb2a817b11e630e704a22928380c7180deb4
diff --git a/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild b/sci-libs/Shapely/Shapely-1.6.4_p2.ebuild
new file mode 100644
index 000000000000..50528d9087df
--- /dev/null
+++ b/sci-libs/Shapely/Shapely-1.6.4_p2.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=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eapi7-ver
+
+DESCRIPTION="Geometric objects, predicates, and operations"
+HOMEPAGE="https://pypi.org/project/Shapely/"
+
+MY_PV="$(ver_cut 1-3).post$(ver_cut 5)"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=sci-libs/geos-3.3
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+python_prepare_all() {
+	# fix install path for Cython definition file
+	sed -i \
+		-e "s|\(data_files.*\)'shapely'|\1'share/shapely'|" \
+		setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}/lib" || die
+	cp -r "${S}/tests" . || die
+	py.test tests || die
+}
diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest
index 6f6b25938556..4ac836209949 100644
--- a/sci-libs/ViSP/Manifest
+++ b/sci-libs/ViSP/Manifest
@@ -1,7 +1,10 @@
 AUX ViSP-3.0.0-ffmpeg3.patch 4291 BLAKE2B 2948a7e4cad247da78187a15198fbc5e804caab7ead381219113cd48ccc71c9b59832f315ca784d8bfd3b6d2d2b27ce918341dbbab88c2f66d0749e20cbaa63c SHA512 fed1699ccaba5baa67e0fde19abc5ae828c51c88bf761a9d6784b8ad858230cca7e11bfbc1fb7661bca0a666c49ff9915e0a771909bf42493229165d1131b3a9
 AUX ViSP-3.0.1-opencv.patch 403 BLAKE2B 0bc3da5cd6e73cdd47dac7b525f4f3fbe6e683aa79f9185a3e92cecaf36fdc30c018fe93d1e9f7ac69890b7807e16663e21e65025184b950a8f384c1ec2748d8 SHA512 3a6a84ac6ad2bce4fdf7228b4a296589239c2b4b019b3ad8e4654af71b00eca6102444f38c32604013ec62d60d067deb2902ea8cffffff6d97e0762602a013f4
+AUX ViSP-3.2.0-ocv.patch 1065 BLAKE2B 830cecf11df2d9c5c909ab5e2b5e7430e953355feeea77e40b77d53f24d2f1799a529c8dfda061ca6a276a1e150d10fee475f63e798511ce0296e8fde1fd75a8 SHA512 35fbb672da815fd404bd483800bf3f27b4f62d41b1173b10292a964d23129f4ec8afd530f8de913500214633a425a1a7567341b6da317b9e74720cf9414f3eff
 DIST visp-3.0.1.tar.gz 26029005 BLAKE2B d8881b0dd56b38f5db88e33f13e7dfa29b0a64fa1aebc5160384db2c7124d3a0ab2f0a5b3ba0255cbe209b578a3cdeb4420dc138a063248f945e9a73e041f21d SHA512 558e9acbd7ac5ef2193dca026062b75e0a30a7efbcae7d1e7d392b0855e643ee96ab9f60c19465f6bfa861374e30d9e91faf2f860e0442fa48ea5ea384b4e3fa
 DIST visp-3.1.0.tar.gz 38743434 BLAKE2B 294eaaf95c7ff7a8ade8bdf2146018856b081a9c461aca68eedb6fb096d253e537f41ad9a81687cba7a9e42a34b5a3fe2d1a705917a1c96f47e1e3e708f20cc3 SHA512 b7d56d3286e3610ff0db4f4c3a51f953825578532a9c518f7654142a644f466343660901632487fb513b0f6a6503d3716d56e733830b4d52daf5839bc1cfbdb5
+DIST visp-3.2.0.tar.gz 52737424 BLAKE2B 78b733183a62541f5d5af22a376ac52ba2377753fa53be62858611b27d961fad286923c11f624c4fe0f561d8dbc5367e2ac01e6bc11a2a19068167ef52198307 SHA512 b4ad21e5063327d91d4ebda268cf4a4dc2ceffbe39d6af0dd6bfeb94d1150884d37fc4ea4295f640135fc2ba758afd29b9090755561ef05249fe2cbc5680dcce
 EBUILD ViSP-3.0.1-r1.ebuild 2999 BLAKE2B e5415f5a699aa20037e770f28155be8fef622f30201fa123a6cac27cbd134d1d796e35e971c6c5450ca0154f224dca0f78b78ca7f4f5cecb07c9f3144f8c423b SHA512 ee12ae28a8b83180978bf88b611ad83484ef6061b22252e5d4e0f0109c92b6a8620d3f8e314d41e1aeff700e2d0134c82fbc132db17163f74cc65dd74401a09d
 EBUILD ViSP-3.1.0-r1.ebuild 2864 BLAKE2B 7d9752251c1af6604544b14692352920765653d6022dfebd4eed381243df320d08da3f8539e4cdffdac387e16df4da1e409e5b80f28c086527614810efee3045 SHA512 a1b09523d092e39270210adeb0099b389cc3dc49b2cef86c7a9879bc02315b6c10a7df6d778a6955a3e4bff553ab1cb5751fb4f8b70533d83061bf0677013317
+EBUILD ViSP-3.2.0-r2.ebuild 2897 BLAKE2B e02dae9d88455de806338a8bd70e9e8f75e1405bfcab8b3d74689ed63bb613eca976b9ff074a5f37bb274f2c6bb63e84d6c11e20d494728a2002c0317064fb37 SHA512 52088222b4786e7d6d702abad38d2b1eae569ec8d130cfb02492d1b82eb3c20c52a5106e0b9e5276bc75ef8ec88d6edd8d007c1953ed6c5b6df0ff93b72c5aba
 MISC metadata.xml 1316 BLAKE2B 0ef658cebd419a44479f24feefd44103fca5a6538cd2f4ba82ac3a12f20fbe4d079551b35587d1616969d7908cb347cf94cc33d27a2a5e327e4b369be30dfaf3 SHA512 738ff67d41b80f336be750cc0e534196bd2055dac9e00a183c097bbe94febb686340db1fd683f3c17cf2dacb68d123e84d6730025d9a46153918aa5b316daf9b
diff --git a/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild b/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild
new file mode 100644
index 000000000000..c9cba774d8e7
--- /dev/null
+++ b/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library"
+HOMEPAGE="http://www.irisa.fr/lagadic/visp/visp.html"
+SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/visp-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3.2"
+KEYWORDS="~amd64 ~arm"
+IUSE="
+	+coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre
+	opencv png test tutorials usb v4l X xml +zbar zlib
+	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
+"
+
+RDEPEND="
+	coin? ( media-libs/coin virtual/opengl )
+	dmtx? ( media-libs/libdmtx )
+	gsl? ( sci-libs/gsl )
+	ieee1394? ( media-libs/libdc1394 )
+	jpeg? ( virtual/jpeg:0 )
+	lapack? ( virtual/lapack )
+	motif? ( media-libs/SoXt )
+	ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
+	opencv? ( media-libs/opencv:= )
+	png? ( media-libs/libpng:0= )
+	usb? ( virtual/libusb:1 )
+	v4l? ( media-libs/libv4l )
+	X? ( x11-libs/libX11 )
+	xml? ( dev-libs/libxml2 )
+	zbar? ( media-gfx/zbar )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
+	test? ( sci-misc/ViSP-images )
+	v4l? ( virtual/os-headers )"
+RDEPEND="${RDEPEND}
+	demos? ( sci-misc/ViSP-images )"
+REQUIRED_USE="motif? ( coin )"
+
+S="${WORKDIR}/visp-${PV}"
+PATCHES=( "${FILESDIR}/${PN}-3.2.0-ocv.patch" "${FILESDIR}/${PN}-3.0.1-opencv.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
+		"-DBUILD_TESTS=$(usex test ON OFF)"
+		"-DBUILD_DEMOS=$(usex demos ON OFF)"
+		"-DBUILD_TUTORIALS=$(usex tutorials ON OFF)"
+		"-DUSE_COIN3D=$(usex coin ON OFF)"
+		"-DUSE_DC1394=$(usex ieee1394 ON OFF)"
+		"-DUSE_DMTX=$(usex dmtx ON OFF)"
+		"-DUSE_GSL=$(usex gsl ON OFF)"
+		"-DUSE_LAPACK=$(usex lapack ON OFF)"
+		"-DUSE_JPEG=$(usex jpeg ON OFF)"
+		"-DUSE_PNG=$(usex png ON OFF)"
+		"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
+		"-DUSE_OGRE=$(usex ogre ON OFF)"
+		"-DUSE_OIS=$(usex ogre ON OFF)"
+		"-DUSE_OPENCV=$(usex opencv ON OFF)"
+		"-DUSE_SOQT=OFF"
+		"-DUSE_SOXT=$(usex motif ON OFF)"
+		"-DUSE_V4L2=$(usex v4l ON OFF)"
+		"-DUSE_X11=$(usex X ON OFF)"
+		"-DUSE_XML2=$(usex xml ON OFF)"
+		"-DUSE_ZBAR=$(usex zbar ON OFF)"
+		"-DUSE_ZLIB=$(usex zlib ON OFF)"
+		"-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin"
+		"-DSOQT_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin"
+		"-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)"
+		"-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)"
+		"-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	cd "${BUILD_DIR}"
+	use doc && emake visp_doc
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use tutorials ; then
+		dodoc -r tutorial
+		docompress -x /usr/share/doc/${PF}/tutorial
+	fi
+	cd "${BUILD_DIR}"
+	use doc && dohtml -r doc/html/*
+}
diff --git a/sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch b/sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch
new file mode 100644
index 000000000000..56347c58f968
--- /dev/null
+++ b/sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch
@@ -0,0 +1,18 @@
+Index: visp-3.2.0/CMakeLists.txt
+===================================================================
+--- visp-3.2.0.orig/CMakeLists.txt
++++ visp-3.2.0/CMakeLists.txt
+@@ -574,12 +574,7 @@ if(USE_CXX11 AND NOT USE_PTHREAD)
+   endif()
+ endif()
+ VP_OPTION(USE_XML2        XML2        ""    "Include xml support"          "" ON IF NOT WINRT)
+-if(CMAKE_TOOLCHAIN_FILE)
+-  # Find opencv2.framework for ios and naoqi
+-  VP_OPTION(USE_OPENCV      "MyOpenCV" QUIET "Include OpenCV support" "OpenCV_DIR;OpenCV_FOUND;OPENCV_FOUND" ON)
+-else()
+-  VP_OPTION(USE_OPENCV      "OpenCV;MyOpenCV" QUIET "Include OpenCV support" "OpenCV_DIR;OpenCV_FOUND;OPENCV_FOUND" ON)
+-endif()
++VP_OPTION(USE_OPENCV      "OpenCV;MyOpenCV" QUIET "Include OpenCV support" "OpenCV_DIR;OpenCV_FOUND;OPENCV_FOUND" ON)
+ VP_OPTION(USE_ZLIB        "ZLIB;MyZLIB" ""  "Include zlib support"         "" ON IF NOT WINRT AND NOT IOS)
+ VP_OPTION(USE_X11         X11         ""    "Include X11 support"          "" ON IF NOT WINRT AND NOT IOS)
+ # The native FindGTK2.cmake doesn't consider libgobject-2.0 that is
diff --git a/sci-libs/blis/Manifest b/sci-libs/blis/Manifest
index 7cdd8c43ea9f..9009236830a5 100644
--- a/sci-libs/blis/Manifest
+++ b/sci-libs/blis/Manifest
@@ -7,6 +7,6 @@ AUX blis-0.6.0-rpath.patch 384 BLAKE2B f5a0390384d30d2929fcb5ff22424770dc3b6a4b9
 AUX cblas.lds 205 BLAKE2B ab2c41b571dbb9b55e36fa5afe4344ed9ef33454f6b7a5cda0726aa7f98a61dcef3065976cc02ab593aad94c5d6c0a23efce726da30673bd06cf57b64e826b93 SHA512 23008248e2b2c221a9ce36c2aca3e2acf58a6d434ffde498a058689af5d16d6e87ab56900508bb0403c5f5a1fc9366b202a7fc44a42d04c409197ec1ec164408
 DIST blis-0.5.2.tar.gz 3502383 BLAKE2B b09fda20711086c8bde0d4efc3f3c9b0f6072e1ddb8bd2846465877f0353cced27548abe1239b6a042fe655e85e4b7b3c960322e39b2c733866b8e17777718bd SHA512 4f91a7834ef0ed39544dd21856814467416a222240050cca323917b0fc61b9201ae4dbd109aa687cdecb27ddee5d6bf4510ef023e1c1dc73599faef0482d3d04
 DIST blis-0.6.0.tar.gz 5107257 BLAKE2B cd589ad1216486e8bb0cf574cc096c1e1f2bb9587b182c2bcff44db322468d9f027323c0bf2d22ea0fabb1902dc047d2bf62253ef1c2797fc3de9ba53d7fc34a SHA512 74e9da5146f7986cbd11651d7cd0837562a1603c667b9e6d3f79b5057443de657b60d7463cb2d64daf3eff7d33fc05a64e6d8eb807f4cabe0c3121517924a206
-EBUILD blis-0.5.2.ebuild 2681 BLAKE2B f33e967ea3a24689deac7d282f9b6740c5ee37a7cc8e6a8d9440050f7ea006a0acf9e577642b81e354c25efd920373963d0d26a4ebfa5998d201848cafed46da SHA512 47f73b98f61dfcb657c37c5bf4ac043a8b01c4c7c01c67e4d7a747eb7f56dc5eda2d8964928b1649fa5625184c6a727895fb43beb5f7420c697156b8ee24e09e
-EBUILD blis-0.6.0.ebuild 2639 BLAKE2B d98cb1522bb6c947ecb96163f72a9434d9b0ddd791cba397106f99280ec0abbbfa5f674f6b4da93b9adccd8530edd0ae97c909f93038b13f43528c1cd85cfc94 SHA512 cb692569282023fa6a728d2066f2dc83bd0f34f005c6906fa3175554171f17fd20759f63c168f3301470596cc4921c84651e3d04e9e37f240fd41bafb4f182ea
+EBUILD blis-0.5.2.ebuild 2731 BLAKE2B 918e61749a6e8b338805d4255f82205dd8834f16e8fedc80264b30ed6a799a14201573bc5c0c4d99e9fef0566507447165959b05e2315b1a123767921f636860 SHA512 6d4959da4440a037cf8c133b383e4aefded0cd7285da6b50aebb76da503dc9998a09635efc8532ee59d2696e9dbdc3b6fd1e54cecb23777d35a3e0bd0cbd460f
+EBUILD blis-0.6.0.ebuild 2689 BLAKE2B c0b684e0aebfa5b607e2afb703b89d9fbba44069db963b6c023252fb677c932c9fee9956500ee408c67d3a6a12adaae6746066486e4bb655880ba98bf4d3a146 SHA512 b355863ef2f14516912cfb4e966489fa95fb832947317b2729768f21755678ee988dbc7768f93eb18b94e7819a35f4c38063204cd5b55524ec7e346d912ea3e8
 MISC metadata.xml 1608 BLAKE2B c8026b4a933bd7f14e7c446ea5d4bda580532252e52194b058d97daaa38969c661d5dbd86d230f44d2c77d52798962ca2953b1d88490fe284629777e763a5ee7 SHA512 b7ce333449f22acb746fed9913850e226e2e6bd6573537996f43f402b055f20b5ca5fe511eda8aa220939dd8194937eb65e8bec34bf61280ddf90722563ab037
diff --git a/sci-libs/blis/blis-0.5.2.ebuild b/sci-libs/blis/blis-0.5.2.ebuild
index 785210e5b5a9..2c8bf1dbc422 100644
--- a/sci-libs/blis/blis-0.5.2.ebuild
+++ b/sci-libs/blis/blis-0.5.2.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit python-any-r1
 
 DESCRIPTION="BLAS-like Library Instantiation Software Framework"
 HOMEPAGE="https://github.com/flame/blis"
@@ -18,7 +19,7 @@ RDEPEND="eselect-ldso? ( !app-eselect/eselect-cblas
                          >=app-eselect/eselect-blas-0.2 )"
 
 DEPEND="${RDEPEND}
-	dev-lang/python
+	${PYTHON_DEPS}
 "
 
 PATCHES=(
@@ -56,7 +57,7 @@ src_configure () {
 		$(use_enable static-libs static) \
 		--enable-blas \
 		--enable-cblas \
-		${BLIS_FLAGS[@]} \
+		"${BLIS_FLAGS[@]}" \
 		--enable-shared \
 		$confname || die
 }
diff --git a/sci-libs/blis/blis-0.6.0.ebuild b/sci-libs/blis/blis-0.6.0.ebuild
index ccb44fdd6824..4d56f5622120 100644
--- a/sci-libs/blis/blis-0.6.0.ebuild
+++ b/sci-libs/blis/blis-0.6.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit python-any-r1
 
 DESCRIPTION="BLAS-like Library Instantiation Software Framework"
 HOMEPAGE="https://github.com/flame/blis"
@@ -18,7 +19,7 @@ RDEPEND="eselect-ldso? ( !app-eselect/eselect-cblas
 						 >=app-eselect/eselect-blas-0.2 )"
 
 DEPEND="${RDEPEND}
-	dev-lang/python
+	${PYTHON_DEPS}
 "
 
 PATCHES=(
@@ -55,7 +56,7 @@ src_configure () {
 		$(use_enable static-libs static) \
 		--enable-blas \
 		--enable-cblas \
-		${BLIS_FLAGS[@]} \
+		"${BLIS_FLAGS[@]}" \
 		--enable-shared \
 		$confname || die
 }
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 5d9f62c911d3..ef2a235b6897 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,4 +1,7 @@
 AUX cantera_2.4.0_env.patch 3559 BLAKE2B 07af1b751b653b1c92288286b9c82ef230ea0df7d9ea4036d23ac24338a221cc45c8e74f137fcf741bb9bb7148e7f3339f54234e9a92ac939956ba7c0ca8e157 SHA512 f2574c3de42d1666a2b64914c66d97045a2a3598f63678b3b60a701d111d7bfc9bd71031dd665a64e6791c9f311fb9514b1a0462a5713763a1b5f87fcd72e528
+AUX cantera_2.4.0_env_python_install.patch 1001 BLAKE2B bfe6e69332117526d8a7c330ae9610e26e72a9e250ce04beda564149fbd21f3262f36982971e5ec0c552e09f12804172b7f978ab03bfb98c0dbe92cd8c7d9401 SHA512 410a81b4ec69eb6eb2a60d55d142b266b836da5a7d4e4ae2fd8844fb87eff0f3544f6e370fc354d334c6cd5a61f8364842c8a9b3bd0dc2290f58ee7392a170f4
+AUX cantera_2.4.0_sundials4.patch 7492 BLAKE2B 995142708ffd02bb3bfdf94b7cad545f269b4c20ffd4c325109637d61e3544d343d0135119388a4b88dc3b037f054854064df83aff381bac6769ec62b12ebf2e SHA512 24afc5d5944966140d191b2250768e2e1331b4db5d53b2dc204b0c1888ff2a328e1dd467b69616d3aced51e6108e38bc1fd2c3a102bf3a02b4c975b677ea73c5
 DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
 EBUILD cantera-2.4.0-r1.ebuild 2828 BLAKE2B 2b41354065b3ce34ddb7c8535fe8e44d14ddb2bc2afb919f72c91ad92f2915895c9a17461d7575e238a719d0043a826eeb5ebd657edc341e289a669f06a5f3cf SHA512 77fdcddcb93927d08976a11828d82f82c4798b2b85795a230a095af4698c4747d4b2241f89d6933d3c5f6b852edc4626557e5ee67eb2243b0bbf40e24c8a8760
+EBUILD cantera-2.4.0-r2.ebuild 2926 BLAKE2B f39d64f5d3177b85ef5d5e2a12397bc62e2095958536bd7b0e9a385ad4c306e2b30085bf61fe9d547533ffa799d5e51fc1963da54041a1493480b5c5ecd213f9 SHA512 a610ce99c7836d58f28c5906ae5a8ce2641acebaeacb7723d149996d736edd16aa2d31c4fac0d33f6143f11097a37f5aeac42f40f875f034159a57cc21a7bea3
 MISC metadata.xml 794 BLAKE2B 4a92fb553aad7d87d4b7a8d77974dbd67d593b4010783f96324979d9c01067bccc60d2faedf604bd8d44a8ac4316356879301899af8bc08d0fcd548df6d3762d SHA512 a9e6f4e161519d0b3618fe8da7065195bc760ba889fa4356358d4047ea1970eb5fd78bdc5fbeb7c660f1bee48a68ab20ced636514e6f12848e88f6f4dabc9705
diff --git a/sci-libs/cantera/cantera-2.4.0-r2.ebuild b/sci-libs/cantera/cantera-2.4.0-r2.ebuild
new file mode 100644
index 000000000000..2d69f8d348c6
--- /dev/null
+++ b/sci-libs/cantera/cantera-2.4.0-r2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
+HOMEPAGE="https://www.cantera.org"
+SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cti fortran pch +python test"
+
+REQUIRED_USE="
+	python? ( cti )
+	${PYTHON_REQUIRED_USE}
+	"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	python? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	<sci-libs/sundials-5.0.0:0=
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost
+	dev-libs/libfmt
+	python? (
+		dev-python/cython[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-cpp/gtest-1.8.0
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}_${PV}_env.patch"
+	"${FILESDIR}/${PN}_${PV}_env_python_install.patch"
+	"${FILESDIR}/${PN}_${PV}_sundials4.patch"
+	)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+## Full list of configuration options of Cantera is presented here:
+## http://cantera.org/docs/sphinx/html/compiling/config-options.html
+
+src_configure() {
+	scons_vars=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		cc_flags="${CXXFLAGS}"
+		cxx_flags="-std=c++11"
+		debug="no"
+		FORTRAN="$(tc-getFC)"
+		FORTRANFLAGS="${CXXFLAGS}"
+		optimize_flags="-Wno-inline"
+		renamed_shared_libraries="no"
+		use_pch=$(usex pch)
+## In some cases other order can break the detection of right location of Boost: ##
+		system_fmt="y"
+		system_sundials="y"
+		system_eigen="y"
+		env_vars="all"
+		extra_inc_dirs="/usr/include/eigen3"
+	)
+	use test || scons_vars+=( googletest="none" )
+
+	scons_targets=(
+		f90_interface=$(usex fortran y n)
+		python2_package="none"
+	)
+
+	if use cti ; then
+		local scons_python=$(usex python full minimal)
+		scons_targets+=( python3_package="${scons_python}" python3_cmd="${EPYTHON}" )
+	else
+		scons_targets+=( python3_package="none" )
+	fi
+}
+
+src_compile() {
+	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
+}
+
+src_test() {
+	escons test
+}
+
+src_install() {
+	escons install stage_dir="${D}" libdirname="$(get_libdir)"
+	if ! use cti ; then
+		rm -r "${D}/usr/share/man" || die "Can't remove man files."
+	else
+		# Run the byte-compile of modules
+		python_optimize "${D}/$(python_get_sitedir)/${PN}"
+	fi
+}
+
+pkg_postinst() {
+	if use cti && ! use python ; then
+		elog "Cantera was build without 'python' use-flag therefore the CTI tool 'ck2cti'"
+		elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
+	fi
+
+	local post_msg=$(usex fortran "and Fortran " "")
+	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
+
+	if use python ; then
+		elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
+	fi
+}
diff --git a/sci-libs/cantera/files/cantera_2.4.0_env_python_install.patch b/sci-libs/cantera/files/cantera_2.4.0_env_python_install.patch
new file mode 100644
index 000000000000..2e01fed1fa93
--- /dev/null
+++ b/sci-libs/cantera/files/cantera_2.4.0_env_python_install.patch
@@ -0,0 +1,17 @@
+diff -Nur old/interfaces/cython/SConscript new/interfaces/cython/SConscript
+--- old/interfaces/cython/SConscript	2018-08-24 16:24:45.000000000 +0300
++++ new/interfaces/cython/SConscript	2019-08-14 04:28:41.000000000 +0300
+@@ -83,10 +83,10 @@
+             extra = ''
+         elif localenv['OS'] == 'Darwin':
+             extra = localenv.subst(' --prefix=${python%s_prefix}' % major)
+-        elif localenv['libdirname'] == 'lib64':
+-            # 64-bit RHEL / Fedora
++        elif localenv['libdirname'] != 'lib':
++            # 64-bit RHEL / Fedora etc. or e.g. x32 Gentoo profile
+             extra = localenv.subst(
+-                ' --prefix=${python%s_prefix} --install-lib=${python%s_prefix}/lib64/python%s.%s/site-packages' % (major, major, major, minor))
++                ' --prefix=${python%s_prefix} --install-lib=${python%s_prefix}/${libdirname}/python%s.%s/site-packages' % (major, major, major, minor))
+         else:
+             extra = '--user'
+             localenv.AppendENVPath(
diff --git a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch b/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
new file mode 100644
index 000000000000..c745f6b6f7ff
--- /dev/null
+++ b/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
@@ -0,0 +1,190 @@
+diff -Nur old/SConstruct new/SConstruct
+--- old/SConstruct	2019-08-14 04:12:50.000000000 +0300
++++ new/SConstruct	2019-08-14 04:38:55.000000000 +0300
+@@ -1013,23 +1013,29 @@
+ 
+ import SCons.Conftest, SCons.SConf
+ context = SCons.SConf.CheckContext(conf)
+-ret = SCons.Conftest.CheckLib(context,
+-                              ['sundials_cvodes'],
+-                              header='#include "cvodes/cvodes.h"',
+-                              language='C++',
+-                              call='CVodeCreate(CV_BDF, CV_NEWTON);',
+-                              autoadd=False,
+-                              extra_libs=env['blas_lapack_libs'])
+-if ret:
++
++# Check initially for Sundials<=3.2 and then for Sundials>=4.0
++for cvode_call in ['CVodeCreate(CV_BDF, CV_NEWTON);','CVodeCreate(CV_BDF);']:
++    ret = SCons.Conftest.CheckLib(context,
++                                  ['sundials_cvodes'],
++                                  header='#include "cvodes/cvodes.h"',
++                                  language='C++',
++                                  call=cvode_call,
++                                  autoadd=False,
++                                  extra_libs=env['blas_lapack_libs'])
+     # CheckLib returns False to indicate success
++    if not ret:
++        if env['system_sundials'] == 'default':
++            env['system_sundials'] = 'y'
++        break
++
++# Execute if the cycle ends without 'break'
++else:
+     if env['system_sundials'] == 'default':
+         env['system_sundials'] = 'n'
+     elif env['system_sundials'] == 'y':
+         config_error('Expected system installation of Sundials, but it could '
+                      'not be found.')
+-elif env['system_sundials'] == 'default':
+-    env['system_sundials'] = 'y'
+-
+ 
+ # Checkout Sundials submodule if needed
+ if (env['system_sundials'] == 'n' and
+@@ -1066,7 +1072,7 @@
+ 
+     # Ignore the minor version, e.g. 2.4.x -> 2.4
+     env['sundials_version'] = '.'.join(sundials_version.split('.')[:2])
+-    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2'):
++    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2','4.0','4.1'):
+         print("""ERROR: Sundials version %r is not supported.""" % env['sundials_version'])
+         sys.exit(1)
+     print("""INFO: Using system installation of Sundials version %s.""" % sundials_version)
+diff -Nur old/include/cantera/numerics/CVodesIntegrator.h new/include/cantera/numerics/CVodesIntegrator.h
+--- old/include/cantera/numerics/CVodesIntegrator.h	2018-08-24 16:24:45.000000000 +0300
++++ new/include/cantera/numerics/CVodesIntegrator.h	2019-08-14 04:39:50.000000000 +0300
+@@ -49,7 +49,6 @@
+         m_maxord = n;
+     }
+     virtual void setMethod(MethodType t);
+-    virtual void setIterator(IterType t);
+     virtual void setMaxStepSize(double hmax);
+     virtual void setMinStepSize(double hmin);
+     virtual void setMaxSteps(int nmax);
+diff -Nur old/include/cantera/numerics/Integrator.h new/include/cantera/numerics/Integrator.h
+--- old/include/cantera/numerics/Integrator.h	2018-08-24 16:24:45.000000000 +0300
++++ new/include/cantera/numerics/Integrator.h	2019-08-14 04:44:27.000000000 +0300
+@@ -34,17 +34,6 @@
+     Adams_Method //! Adams
+ };
+ 
+-//! Specifies the method used for iteration.
+-/*!
+- * Not all methods are supported by all integrators.
+- */
+-enum IterType {
+-    //!  Newton Iteration
+-    Newton_Iter,
+-    //! Functional Iteration
+-    Functional_Iter
+-};
+-
+ //!  Abstract base class for ODE system integrators.
+ /*!
+  *  @ingroup odeGroup
+@@ -163,11 +152,6 @@
+         warn("setMethodType");
+     }
+ 
+-    //! Set the linear iterator.
+-    virtual void setIterator(IterType t) {
+-        warn("setInterator");
+-    }
+-
+     //! Set the maximum step size
+     virtual void setMaxStepSize(double hmax) {
+         warn("setMaxStepSize");
+diff -Nur old/src/kinetics/ImplicitSurfChem.cpp new/src/kinetics/ImplicitSurfChem.cpp
+--- old/src/kinetics/ImplicitSurfChem.cpp	2018-08-24 16:24:45.000000000 +0300
++++ new/src/kinetics/ImplicitSurfChem.cpp	2019-08-14 04:45:57.000000000 +0300
+@@ -79,7 +79,6 @@
+     // numerically, and use a Newton linear iterator
+     m_integ->setMethod(BDF_Method);
+     m_integ->setProblemType(DENSE + NOJAC);
+-    m_integ->setIterator(Newton_Iter);
+     m_work.resize(ntmax);
+ }
+ 
+diff -Nur old/src/numerics/CVodesIntegrator.cpp new/src/numerics/CVodesIntegrator.cpp
+--- old/src/numerics/CVodesIntegrator.cpp	2018-08-24 16:24:45.000000000 +0300
++++ new/src/numerics/CVodesIntegrator.cpp	2019-08-14 04:49:02.000000000 +0300
+@@ -88,7 +88,6 @@
+     m_type(DENSE+NOJAC),
+     m_itol(CV_SS),
+     m_method(CV_BDF),
+-    m_iter(CV_NEWTON),
+     m_maxord(0),
+     m_reltol(1.e-9),
+     m_abstols(1.e-15),
+@@ -218,17 +217,6 @@
+     }
+ }
+ 
+-void CVodesIntegrator::setIterator(IterType t)
+-{
+-    if (t == Newton_Iter) {
+-        m_iter = CV_NEWTON;
+-    } else if (t == Functional_Iter) {
+-        m_iter = CV_FUNCTIONAL;
+-    } else {
+-        throw CanteraError("CVodesIntegrator::setIterator", "unknown iterator");
+-    }
+-}
+-
+ void CVodesIntegrator::sensInit(double t0, FuncEval& func)
+ {
+     m_np = func.nparams();
+@@ -284,7 +272,11 @@
+     //! Specify the method and the iteration type. Cantera Defaults:
+     //!        CV_BDF  - Use BDF methods
+     //!        CV_NEWTON - use Newton's method
+-    m_cvode_mem = CVodeCreate(m_method, m_iter);
++    #if CT_SUNDIALS_VERSION < 40
++        m_cvode_mem = CVodeCreate(m_method, CV_NEWTON);
++    #else
++        m_cvode_mem = CVodeCreate(m_method);
++    #endif
+     if (!m_cvode_mem) {
+         throw CanteraError("CVodesIntegrator::initialize",
+                            "CVodeCreate failed.");
+@@ -394,7 +386,11 @@
+         #if CT_SUNDIALS_VERSION >= 30
+             SUNLinSolFree((SUNLinearSolver) m_linsol);
+             SUNMatDestroy((SUNMatrix) m_linsol_matrix);
+-            m_linsol_matrix = SUNBandMatrix(N, nu, nl, nu+nl);
++            #if CT_SUNDIALS_VERSION < 40
++                m_linsol_matrix = SUNBandMatrix(N, nu, nl, nu+nl);
++            #else
++                m_linsol_matrix = SUNBandMatrix(N, nu, nl);
++            #endif
+             #if CT_SUNDIALS_USE_LAPACK
+                 m_linsol = SUNLapackBand(m_y, (SUNMatrix) m_linsol_matrix);
+             #else
+diff -Nur old/src/numerics/IDA_Solver.cpp new/src/numerics/IDA_Solver.cpp
+--- old/src/numerics/IDA_Solver.cpp	2018-08-24 16:24:45.000000000 +0300
++++ new/src/numerics/IDA_Solver.cpp	2019-08-14 04:51:01.000000000 +0300
+@@ -442,7 +442,11 @@
+         #if CT_SUNDIALS_VERSION >= 30
+             SUNLinSolFree((SUNLinearSolver) m_linsol);
+             SUNMatDestroy((SUNMatrix) m_linsol_matrix);
+-            m_linsol_matrix = SUNBandMatrix(N, nu, nl, nu+nl);
++            #if CT_SUNDIALS_VERSION < 40
++                m_linsol_matrix = SUNBandMatrix(N, nu, nl, nu+nl);
++            #else
++                m_linsol_matrix = SUNBandMatrix(N, nu, nl);
++            #endif
+             #if CT_SUNDIALS_USE_LAPACK
+                 m_linsol = SUNLapackBand(m_y, (SUNMatrix) m_linsol_matrix);
+             #else
+diff -Nur old/src/zeroD/ReactorNet.cpp new/src/zeroD/ReactorNet.cpp
+--- old/src/zeroD/ReactorNet.cpp	2018-08-24 16:24:45.000000000 +0300
++++ new/src/zeroD/ReactorNet.cpp	2019-08-14 04:51:35.000000000 +0300
+@@ -28,7 +28,6 @@
+     // numerically, and use a Newton linear iterator
+     m_integ->setMethod(BDF_Method);
+     m_integ->setProblemType(DENSE + NOJAC);
+-    m_integ->setIterator(Newton_Iter);
+ }
+ 
+ void ReactorNet::setInitialTime(double time)
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 734e9e99c16e..8b741b80f8cc 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,3 +1,3 @@
 DIST gmsh-4.4.1-source.tgz 13227645 BLAKE2B 68df0a54655d2a85012d2961daafbe92f0295661f6f71b0be4c7a78b7c814af21b39b29e65a201c4918d7e31462ac391b208fcceca356c4d9974c5de3c88da13 SHA512 cfdd353de051d1deffca90bfa31a007a466d39c145e704612b92441556dec0c8d7b58ab07c2fa3166de893d99f0308ffb66b4f321172ea60da0b6db907aa7a2e
-EBUILD gmsh-4.4.1.ebuild 1740 BLAKE2B 77ac37edcdc391cf69151c289b2958e8f6d3d1ddd482bee66695d573dc8a9435b6bab4c4be9ae9f03b492c58502be85d1621382912392d205e6153091d400fa5 SHA512 5ac483d00af4d61871a6391b730b83fe6c36426dd511efd1ad7c3f20b0ee3e07068c80f11e47d2c916e1427e7a7e26739c30900209e70b3147204d26a9551f80
+EBUILD gmsh-4.4.1.ebuild 1769 BLAKE2B c90deb313c847e37d898c84ea7c75ab37fe02e17bc37f94b4e662af7d23d4d299084bf382ed56eca38c39d96a76a2653e6e2b06f3f6e54136e759716906d1027 SHA512 e5e4fa32178bed819f8a20f93247d426a97dc2268a42381f9e1267b2d5e903449fd24df31a6538349000a0950a8cb5c0cb2dcec87ed79b55433160ad57402210
 MISC metadata.xml 737 BLAKE2B fc604a0966c3106fabcd1379cf0cecbd28bd80c9068330206127cd35e134436a5ec3f43b19dfe0793e2a7a299a4b8f335b11cf2f723b6451a3b341077d27a6c7 SHA512 03f6a246c66264a58638c5ef89ec10737cbb15bd6d443f2f866fc77d21bf052c3ff4e00ca919546aa0da5b91c31a96af8dea5609a72dbb92a20c534e6a6f639b
diff --git a/sci-libs/gmsh/gmsh-4.4.1.ebuild b/sci-libs/gmsh/gmsh-4.4.1.ebuild
index fa56d3eae139..af727805d6c1 100644
--- a/sci-libs/gmsh/gmsh-4.4.1.ebuild
+++ b/sci-libs/gmsh/gmsh-4.4.1.ebuild
@@ -17,6 +17,8 @@ KEYWORDS="~amd64 ~x86"
 ## cgns is not compiling ATM, maybe fix cgns lib first
 IUSE="blas cgns examples jpeg lua med metis mpi netgen opencascade petsc png python X zlib"
 
+REQUIRED_USE="med? ( mpi )"
+
 RDEPEND="
 	virtual/fortran
 	X? ( x11-libs/fltk:1 )
diff --git a/sci-libs/grib_api/Manifest b/sci-libs/grib_api/Manifest
index 5c5b2659ebe9..8b5820f7e38c 100644
--- a/sci-libs/grib_api/Manifest
+++ b/sci-libs/grib_api/Manifest
@@ -3,6 +3,6 @@ AUX grib_api-1.14.5-disable-failing-test.patch 841 BLAKE2B 7ee8902b4ff278885bdeb
 DIST grib_api-1.11.0.tar.gz 14412684 BLAKE2B 72375400f74f3edba62e781b9dac4c40f3944c676cd90221ad57b0d6690a3a8958ef9d77c414ccb45b60ff2fd2c93923628e0ac3d0f10cfb4c393fb91eaf3001 SHA512 09c50d194049d2d19686139fb7150bd7399fc05bb5b7e40e8d91ce0301698263c40357b8524f925642ae6f78d9bc61218be26bef7f2dfeb326ccc9e8bc3a49e3
 DIST grib_api-1.14.5-Source.tar.gz 4530071 BLAKE2B 7d9660e0c244ace011ef53e5a77c8ddc1f9435b210df407d6e90ef111c501cd589db1b34739937d5c78d6e1050b12d7c334b215122467a25b9a513e817a0eb7b SHA512 ad31dc27adcdeeded1aa3c3620181c0d4a5250734724c242443d19332b84f2297b4dea2aa02027627321fa35822c94865a41f24d03eb1143756621da14a59322
 DIST grib_api_test_data.tar.gz 131042849 BLAKE2B 9036d4363b86ae0ad948026dd8ea7371232723942dea9eb6d8cceec466d8e37ebbe6a8e4eadb4cd413ab40601d8ea01c91bef0265310aac9ea3773a9bc252868 SHA512 25b37c3e725f7a2c18979d96e7d512111ba54f4e448c57e6a8ae913b7f13be25d9e643edb45ebc714daf6de51d85e9a7d252e735299affc562b9911e53a95058
-EBUILD grib_api-1.11.0.ebuild 2051 BLAKE2B df350b475c33ef307e2d1066196a085bb26b80a4efa02deab9d53bc44bbac3fc07b30b4a37e4215416f54f76789265a05c9cab8b9e3fdd4916280e616c279e97 SHA512 d19a87ecd3f3a8b42786c31fdbcc928f7cc2a0e9232c9f907315b6f1f8222dc066cc9941e9fbe9f3621693e10b5c21218b046327bd356401c82cbcf1b1b92a12
-EBUILD grib_api-1.14.5.ebuild 2461 BLAKE2B 01f6694b4bac595014ae94e85bc03bcc03e8c23c3af009c62c74fdae93dc17200cdf23e6a9e881605c440765f1b459a6d1f041af0e327e19569db4c7701c5ef5 SHA512 88f1eaae6f1190e2a02a023b620eb346e9e70e8bb00b81efa699ea7e16d0cdd9698e3382590e78abfd09c975216bf1a674e654f9dd279c3380dc98cf995bda7e
-MISC metadata.xml 890 BLAKE2B 6a02ae5a83a54569ff02b5f2d30c4be7b765bc148772ec0360cff70ecf2d0a481642a2a01cdeff9a494a4c173ef120f6af14ee8624c076da6b0c7acd3355f5b3 SHA512 7e1ceccaf41783414b3fd3e3b00db274aa8df748d66e9f83617d4528f84d674ce313568a130cc5bac53eec5fc94cf03c9a35e9bf1f46a25851992f5c44f1bcd0
+EBUILD grib_api-1.11.0.ebuild 2019 BLAKE2B 39fbf10cee5e02f597cce76a338e74e87ac0c526b11aaa77328b3c74cee8f036dd3230f02bc7271d47fbb048699f2ea9109bbfc2693753acc01b0ccfb4839987 SHA512 b448af11504178dd6a582643d54b231ef4d8a738fdf8495ae35cda007fd15b6deef5a39a239f9173b94497a28162339b07fea646d8962c9225ccfc63d67e1212
+EBUILD grib_api-1.14.5.ebuild 2408 BLAKE2B c386fbdad1766723bd5e5b52a24c3888573b457777387e60b6f7f2258518350b8b469d6fc5d66bef504ca3a2958da65d51a3612a8f5483a55f7be30a05c9f3e9 SHA512 5609e07b738c1a6641e9000361693ec37cd1436c619e3435946ba0445fe06bf39ae62c9cd432eeb7dfc4fb483683defb0a64045882b817153bba5054986e9535
+MISC metadata.xml 762 BLAKE2B d691892137e85fdf2c7ab7d1845e5203b4c5c86199371a02d0680cbde369c122e17ec2cc08d58518a55a6accecbe5fd4937e1a96865c70b80ef1d96d9f73dcdf SHA512 f4d15bed44a3072c987c2467c8e034f1569611b277915a1ea17f63da576bccdd4c38ea0e5212325e6f5687471e789fb1c46412b8e2510bd8a1f6cbd6d86056e8
diff --git a/sci-libs/grib_api/grib_api-1.11.0.ebuild b/sci-libs/grib_api/grib_api-1.11.0.ebuild
index e49572604770..e1476a9132a9 100644
--- a/sci-libs/grib_api/grib_api-1.11.0.ebuild
+++ b/sci-libs/grib_api/grib_api-1.11.0.ebuild
@@ -21,13 +21,13 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="doc examples fortran jasper jpeg2k netcdf openmp png python static-libs threads perl"
+IUSE="doc examples fortran jpeg2k netcdf openmp png python static-libs threads perl"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	jpeg2k? (
-		jasper? ( media-libs/jasper:= )
-		!jasper? ( media-libs/openjpeg:0 )
+		media-libs/openjpeg:0
+		!!media-libs/jasper
 	)
 	netcdf? ( sci-libs/netcdf )
 	png? ( media-libs/libpng:0= )
diff --git a/sci-libs/grib_api/grib_api-1.14.5.ebuild b/sci-libs/grib_api/grib_api-1.14.5.ebuild
index ff36dfbfdf82..40b5406dc0f4 100644
--- a/sci-libs/grib_api/grib_api-1.14.5.ebuild
+++ b/sci-libs/grib_api/grib_api-1.14.5.ebuild
@@ -22,12 +22,11 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="aec doc examples fortran jpeg2k netcdf png python static-libs test threads"
+IUSE="aec doc examples fortran netcdf png python static-libs test threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	aec? ( sci-libs/libaec:= )
-	jpeg2k? ( media-libs/jasper:= )
 	netcdf? ( sci-libs/netcdf:= )
 	png? ( media-libs/libpng:= )
 	python? (
@@ -72,7 +71,7 @@ src_configure() {
 		-DENABLE_AEC="$(usex aec)"
 		-DENABLE_FORTRAN="$(usex fortran)"
 		-DENABLE_GRIB_THREADS="$(usex threads)"
-		-DENABLE_JPG="$(usex jpeg2k)"
+		-DENABLE_JPG=OFF
 		-DENABLE_NETCDF="$(usex netcdf)"
 		-DENABLE_PNG="$(usex png)"
 		-DENABLE_PYTHON="$(usex python)"
diff --git a/sci-libs/grib_api/metadata.xml b/sci-libs/grib_api/metadata.xml
index b053bfcb8747..9a5952fcb794 100644
--- a/sci-libs/grib_api/metadata.xml
+++ b/sci-libs/grib_api/metadata.xml
@@ -13,8 +13,6 @@
   line tools is also provided to give quick access to grib messages.
 </longdescription>
 <use>
-  <flag name="jasper">Use <pkg>media-libs/jasper</pkg> instead of
-  <pkg>media-libs/openjpeg</pkg> for JPEG 2000 support</flag>
   <flag name="aec">Build with Adaptive Entropy Coding compression, needs <pkg>sci-libs/libaec</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/sci-libs/iml/Manifest b/sci-libs/iml/Manifest
new file mode 100644
index 000000000000..e9dcaebdb8e6
--- /dev/null
+++ b/sci-libs/iml/Manifest
@@ -0,0 +1,4 @@
+AUX iml-1.0.4-use-any-cblas-implementation.patch 865 BLAKE2B 5167ab1a5f82e5fce596dd3f7cdb3a711f0fd5c86fefc6a36574bcbc63e464115895e43d81eba3d4d04bd016266817440098eed18fab04b30bc45dee37497ffd SHA512 36181f90032b6f4d786d50b327cb342d5c8f4431dd556e4267e99b02e92161adbb9c23d7815e1764d8f237b1f008b2abebc27bdc422ba7296144999f0cde3c19
+DIST iml-1.0.5.tar.bz2 391757 BLAKE2B 5895b353269ce19e17e2522f78eb705c89a47ed3c6cce54d1b7ab3003f59d0a13050b30ce9cedbf38392c737c169740b6c2433f1a74856b0f9d4e6e007ebf804 SHA512 b5a85982636035cc50acba7dcff5478c6271be3669313f01915b2761302d4c77617c0dd7932daf74433098670d3ffdb2ef19eb24450b40709750a0b7c8f797f1
+EBUILD iml-1.0.5.ebuild 713 BLAKE2B 1bc188017da5870454c3c2af732322abac825d2920929110352ce23f7824e59d742efd42d92cab683410f2bde44f76c1324f645ddf99bb5eb1f6536dc7df7492 SHA512 794f836b7f892034aeff8fc69be433cde98ab1e8aa1733faee2bf37cd724797e35bfa96dcb921674df72ed0dd2973f37af6c0fbf0be7109681efce34d58b4ba2
+MISC metadata.xml 434 BLAKE2B 91cfe59fd89e32d7dda5fbb31ecccc46762c6e00cd8de2cbaa8509829d22d1e03f58eb143d72cd9a0c0294a5692643a372c810ecaaaa6d07b61a2818eb10ff91 SHA512 9d2059a19a31ac1393cb69aa28af0cabf1a6da3ee75f7edfea880b506dc8ff764be013e99b4b82fd8819c1552fde80caf15f5f022a0272701800482c2bd81006
diff --git a/sci-libs/iml/files/iml-1.0.4-use-any-cblas-implementation.patch b/sci-libs/iml/files/iml-1.0.4-use-any-cblas-implementation.patch
new file mode 100644
index 000000000000..28d70bf91663
--- /dev/null
+++ b/sci-libs/iml/files/iml-1.0.4-use-any-cblas-implementation.patch
@@ -0,0 +1,22 @@
+Patch to detect ATLAS or cblas. Ported from 1.0.3 to 1.0.4.
+
+Patch by Marius Brehler.
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,15 +76,7 @@ location with the options --with-gmp-inc
+ respectively when running configure.
+ )])
+ 
+-IML_CHECK_CBLAS(,,[AC_MSG_WARN(
+-CBLAS not found!
+-Please make sure that --with-cblas=<linker flags> and optional --with-cblas-include=<path> and --with-cblas-lib=<path> are correctly set.
+-Trying legacy ATLAS configuration.)
+-IML_CHECK_ATLAS(,,[AC_MSG_ERROR(
+-ATLAS not found! 
+-ATLAS version 3.0 or greater is required for this library to compile. Please make sure ATLAS is installed and specify the header and libraries location with the options --with-atlas-include=<path> and --with-atlas-lib=<path> respectively when running configure.)
+-])
+-])
++PKG_CHECK_MODULES([ATLAS], [cblas])
+ 
+ AC_SUBST(LIBIML_LDFLAGS)
+ AC_SUBST(LDFLAGS)
diff --git a/sci-libs/iml/iml-1.0.5.ebuild b/sci-libs/iml/iml-1.0.5.ebuild
new file mode 100644
index 000000000000..25907543c005
--- /dev/null
+++ b/sci-libs/iml/iml-1.0.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Integer Matrix Library"
+HOMEPAGE="http://www.cs.uwaterloo.ca/~astorjoh/iml.html"
+SRC_URI="http://www.cs.uwaterloo.ca/~astorjoh/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RESTRICT="mirror"
+
+DEPEND="virtual/cblas"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.4-use-any-cblas-implementation.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-default="${EPREFIX}"/usr \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
diff --git a/sci-libs/iml/metadata.xml b/sci-libs/iml/metadata.xml
new file mode 100644
index 000000000000..673326db1e86
--- /dev/null
+++ b/sci-libs/iml/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>a free library of C source code which implements algorithms for computing exact solutions to dense systems of linear equations over the integers</longdescription>
+</pkgmetadata>
diff --git a/sci-libs/libctl/Manifest b/sci-libs/libctl/Manifest
deleted file mode 100644
index 652910de529a..000000000000
--- a/sci-libs/libctl/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST libctl-3.1.tar.gz 460108 BLAKE2B 8aea0a1621d70c68c1fe91b8cfa5b7337f18c16e7789845990de850f6b72a4f902230f5c014c342060a98b9a835f7bad9899dc9ffb3c1ada840fe09d6cb5645a SHA512 94e44a0baea067a85c7a8f930545317b1c9f440e18b6ccc59417ed3072652da0ba79f58b469b8d9ba81cd6adae81830566c28aefea18fd76491824dc6c2da067
-DIST libctl-3.2.tar.gz 485681 BLAKE2B a995fc43c877a5094e1c1b88485a46b3d00a1f352adb5f940859efa26b8a46fa64b477b2e17fe41b43f0d373cafb5e628adf4443c7ea3de2079a4d78d7e7406d SHA512 df8701330d3785ff845a065a0d4abb1e7d9167ad7909ff7074a48040092e5bb840f75b3fa90263fe8d29607aeb0b33919be333a619f34a5bac255c0ade4340f5
-EBUILD libctl-3.1.ebuild 730 BLAKE2B 9748ac31749232b4ffa176a627eccb74a77c247db254c29f303fc122110c472ae5e42d100e081add97ff511b1d11d173b19e91c41375e52c84f54b630f554959 SHA512 7ddd0d5d118ead986ad401682d1775f45800bfc4499f76219bdc924e34ce0a50817ab0074534bed1f407b7e45988dd46519f02baeb980d73884fcc9fcaf04c3b
-EBUILD libctl-3.2.ebuild 744 BLAKE2B 985977dab089acaf0875ab3891b911c9b16b91d511c1bae798f36974f641a6b233c4e4822aa8b53464a0981426771b83d8dbaac43b9f53f446bc79b2531c4c40 SHA512 3026f2c9a8162f03451fb1d4f0dfdd88c21f0485cbfd510ebead32f8727b4eac3091936811af39bea683c4abce26a51483827ba9783a53dbc1d431a35bbb6f8f
-MISC metadata.xml 602 BLAKE2B eb599fb4602c792ca55134b3b88e3c5df6f6ba108cde255e12cab954ed06d113ff6acadcd93318c670edecf568cf29206d5ee800199d61ab633bf4aa8e046126 SHA512 e37303f22b99b3e18b1028d68473acc6fc6d8ecc6ffa17ed3857285a2bdafbab95e2c7df6cd2e1dd3f2fb54ccff0da8089723a4696aa2f27b422845b1ff95132
diff --git a/sci-libs/libctl/libctl-3.1.ebuild b/sci-libs/libctl/libctl-3.1.ebuild
deleted file mode 100644
index 23d9af250871..000000000000
--- a/sci-libs/libctl/libctl-3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit fortran-2 autotools-utils
-
-DESCRIPTION="Guile-based library for scientific simulations"
-HOMEPAGE="http://ab-initio.mit.edu/libctl/"
-SRC_URI="http://ab-initio.mit.edu/libctl/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="doc examples static-libs"
-
-DEPEND="
-	dev-scheme/guile[deprecated]
-	sci-libs/nlopt"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dohtml doc/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins "${AUTOTOOLS_BUILD_DIR}"/examples/{*.c,*.h,example.scm,Makefile}
-		doins "${S}"/examples/{README,example.c,run.ctl}
-	fi
-}
diff --git a/sci-libs/libctl/libctl-3.2.ebuild b/sci-libs/libctl/libctl-3.2.ebuild
deleted file mode 100644
index 14995ee8a35b..000000000000
--- a/sci-libs/libctl/libctl-3.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit fortran-2 autotools-utils
-
-DESCRIPTION="Guile-based library for scientific simulations"
-HOMEPAGE="http://ab-initio.mit.edu/libctl/"
-SRC_URI="http://ab-initio.mit.edu/libctl/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
-
-DEPEND="
-	dev-scheme/guile
-	sci-libs/nlopt"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dohtml doc/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins "${AUTOTOOLS_BUILD_DIR}"/examples/{*.c,*.h,example.scm,Makefile}
-		doins "${S}"/examples/{README,example.c,run.ctl}
-	fi
-}
diff --git a/sci-libs/libctl/metadata.xml b/sci-libs/libctl/metadata.xml
deleted file mode 100644
index 46b996eb80ed..000000000000
--- a/sci-libs/libctl/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		libctl is the Control Language library implementing a control file
-		structure aimed at simplifying the control file writing in
-		scientific simulations.  The "ctl" in "libctl" stands for Control
-		Language (by convention, libctl  control files end with ".ctl" and
-		are referred to as ctl files).
-	</longdescription>
-</pkgmetadata>
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index 940ac3410369..d16b6ba6c4ed 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1,5 +1,5 @@
 AUX libgeodecomp-0.4.0-libdir.patch 694 BLAKE2B 87b08665e9f1d236183f7bfaaf34ef5a9839e28f7a94a6b870fe99d19603b11f152227137202be5669c9f9cd2ba65b3f559eba9ca2460676f19c22e0911ab36e SHA512 fa8e0e08b45d9250d6f32e1a8ade6ff8bdb8acb7951115916cee7b6df600800f8aa64cfb92e13bb5b108af98e8ac2b1f127f34b415648ebe556a589bb11af68d
 AUX libgeodecomp-0.4.0-scotch.patch 7962 BLAKE2B e47365810132838ba0afc63dead520a17d866c0c6b5c2c2bf8f7299d688bcf10ef34ff19d1b29a29d3388101f082080b5943b037fdc9aedf937b392ffb46a68a SHA512 78d805aedb820b457ae01e5f35c530edf7de014cc60c640314cefb1cdfa88f54a6128fb56a81e974fed9d0620e56c31a8f97922d78e88d729bbf3c29c71f7f5d
 DIST libgeodecomp-0.4.0.tar.bz2 766090 BLAKE2B 2abc5d10371fbad92f957118cabd656f0b4938d5e102da6446851bd979debddaf5eba8a6321dffd32356a40ca12659d9a7a691929e71989e48a71e5177fedc51 SHA512 3ff1a45844e5879662012cb4bae5d577f30ee71094ed4063b535b0ac3da900f34a1bc25be524c006ff91e0edd665e46cbb6cfc0db7966eebfea30f9fee6eeddb
-EBUILD libgeodecomp-0.4.0.ebuild 1435 BLAKE2B b259a896d174988bec38e7e1be7493648ca5ed862eb04eecd1fc3b182b5b7bca159fa57075334368fbc3e667f4168db43134199e426ff890c1a17afdd61b8adc SHA512 f3a91db74a114d40bbecce9a3c997bdfa85c14c650fa14d35507b536ab34eff91fe11314d81c63c9f720bdcf43f29d67879b33fb1929f6d60840b14a000d459a
+EBUILD libgeodecomp-0.4.0.ebuild 1466 BLAKE2B 5d6b2314208bee5bc15bc69fcc564ffa425d82421c1d54df69f8db187adab43889cee89f9d9affcf87ed139d283602c6514491240393bb44444d66f6a273f9b2 SHA512 1fc4b3515cb3d219108da35349292a4bceb1bc282949c2a16127d99a2b75787aa2edc2ac80b712c3b9579686a26e4ffe7a85020345030153c5b67c0420c09a29
 MISC metadata.xml 1252 BLAKE2B 1c35e4efb788c48e23b62025853472afeedfe1f860797cf22e79877e8bab3170998bb1e064ff05a36bf8ddbb6e70b40da329cf9be7ab929a7cb6a9aca2b51c04 SHA512 e8c259afc51b594f4d167128555c7c0ef6935eab46e43ee92407ed32183815cd5e3588a3b0cb0230d757dfa9ca0ddb1f36ef4887b9c31f27ee57e668413f1026
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
index d3a1b4df976b..14e3f4f3cc83 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.4.0.ebuild
@@ -21,12 +21,13 @@ DEPEND="${RDEPEND}
 		app-text/texlive
 		media-gfx/graphviz
 		)
+	hpx? ( sys-cluster/hpx )
+	<=dev-libs/libflatarray-0.2.0
 	mpi? ( virtual/mpi )
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	opencl? ( virtual/opencl )
 	opencv? ( media-libs/opencv )
 	silo? ( sci-libs/silo )
-	hpx? ( sys-cluster/hpx )
 	visit? ( sci-visualization/visit )"
 
 S="${WORKDIR}/${P}"
diff --git a/sci-libs/libmed/Manifest b/sci-libs/libmed/Manifest
index 712e88eb6d7a..4944c28e0496 100644
--- a/sci-libs/libmed/Manifest
+++ b/sci-libs/libmed/Manifest
@@ -4,9 +4,6 @@ AUX libmed-3.3.1-mpi.patch 608 BLAKE2B 61c26f3cce21aa92d72f07227076afc477fb5cb94
 AUX libmed-4.0.0-cmakelist.patch 2421 BLAKE2B 38991513aabbb8237a8b0d9456d9bb76f38cffecff9b1b4c906c0f9d17abd6c02ec150420403d8c1b36310b871f5354e100d1038d5620f6ba8719074e0ccd665 SHA512 405669dedc95b3776a2f4f6d64f8a608c914adb7d0666690f1f8b4a0598d6d85c7398622f50c50ead0295ee965fa993c36eb9e4217985079b528714682ea8b5d
 AUX libmed-4.0.0-installdoc.patch 1045 BLAKE2B ddc44d986743a4bf1fa59ab20d34835117f2213283ad13ce1e8e16358b87fe64888facb2f32da76a025cc283a5d942554700cc8816c25cb6f0eeaa54970f1f9a SHA512 486eb41af086d2dc92463aa8f64f074f70a39920b4954e4c272bc6b92c960efe198255975b7c594ff801be43e9eb6a31d007f55451901107db90ed6b3389eee6
 AUX libmed-4.0.0-tests.patch 819 BLAKE2B c6352475b917d4300d15eaa8742c44ed609768265beb37d6a4128e52cfcda9b7971e8d770045944e94dfa9c40dd756dba854c6dd793639c3dad4497bba34b651 SHA512 4b13a8dc40d7d666b7853b47df7c432a796bc905b714cdecc22bc242597eddb6c18a13eae0c39b8a00a4b07d710332c413ac5c358ffff7cb19378a8adb12221c
-DIST libmed-3.3.1-r1-gentoo.tar.bz2 36127 BLAKE2B c112215932ac5c84cc75911c20712fcf428a8fc6e8adfd497066315fbc99a70816e0276196ff6366f34eeb3bf6d40586a735dd35cc13579640d7128f563fbf2b SHA512 e55dc96b8282dfba0dc9746dba7ef2ea8616d5617deabd3164d0134ca680e27c2a121432ae22f38fc53a52ffb0ac66a9a17c131488a9d01a757601afbcdc0bff
-DIST med-3.3.1.tar.gz 43379218 BLAKE2B 101033a766b3b8f184de8b18437a020129da3a11fd947742c30d8b9d274542e7445f1ee1d5827194a1ebc02c701ea6911105102f7b61c24d9d07bb15dbfe45f7 SHA512 f1eba3bc69520b862bdab89ce76694f91ed0e6be42c037df8ec655b6314e8ae776083d5ead61fb34097eb8440302969229d1859b6d8fcce51e7551b75d8ebf5f
 DIST med-4.0.0.tar.gz 47849098 BLAKE2B 0bc6710f7b5156e09962e3125349573989429e614a203f649843f00dea06217040ebee70e481eed9c0dd304cb7d167efcd216c3600f6954a74f262cc845fff63 SHA512 2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7
-EBUILD libmed-3.3.1-r1.ebuild 2959 BLAKE2B affec9e8225346068e8efae6aac6565aec3e2e7e03d49f7c29283002bd302d9f7c82cb01ec35900937cbc49bb3a4875ab170d20cc9ab9bccfa9ee64299e93dc4 SHA512 41d3458105c5847461b8e7077361fa735bb157e4eca8bc9853748a7ff3f1993ddf476a32663f75ebffb2c304bd962b8e180885d59702dbc6dd1022b1deceb706
 EBUILD libmed-4.0.0-r1.ebuild 3020 BLAKE2B 7fdf0682ca017aae35f8cd93e685fcf397880b71a56c51418369f09a2d944cd707df131048ba6a2eb53e353d5101d288397f27954ea618aef21acb962a74dc24 SHA512 c05b59f02f76a9ac37147600dfa27171cbb7fafde529ebb96558e91c6c3b541e3372f1ec1bf1fa7d2d5b10e1cc59238c407339aae44ba8f9b87771702fd47ecc
 MISC metadata.xml 379 BLAKE2B d8dc23452e0bc847d6d828192f2665cc74924abb6e5057db84a2a7bd6a1e4b1daa047e7db5694e00b07b1c21666f0fca8d4c374fb3be0f1ce3dbf3742f3b7f93 SHA512 5bc38cad4d81652ac0f16779036d8a3ab1772e504c4d17b614aca53c845518c56f0baa3bf02aa186bb988d6942945b4b5355ade3544f9c0c5da367c9bf0a645f
diff --git a/sci-libs/libmed/libmed-3.3.1-r1.ebuild b/sci-libs/libmed/libmed-3.3.1-r1.ebuild
deleted file mode 100644
index 0a63fccfcc87..000000000000
--- a/sci-libs/libmed/libmed-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# EAPI=7 uses ninja generator by default but it's incompatible with USE=fortran
-# https://github.com/Kitware/ninja/tree/features-for-fortran#readme
-CMAKE_MAKEFILE_GENERATOR=emake
-
-FORTRAN_NEEDED=fortran
-# NOTE:The build for multiple python versions should be possible but complecated for the build system
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit cmake-utils fortran-2 python-single-r1
-
-MY_P="med-${PV}"
-
-DESCRIPTION="A library to store and exchange meshed data or computation results"
-HOMEPAGE="https://www.salome-platform.org/"
-SRC_URI="http://files.salome-platform.org/Salome/other/${MY_P}.tar.gz
-	 https://dev.gentoo.org/~fordfrog/distfiles/${P}-r1-gentoo.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fortran mpi python static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="
-	sci-libs/hdf5[fortran=,mpi=]
-	mpi? ( virtual/mpi[fortran=] )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-2.0.9:0 )
-"
-
-S="${WORKDIR}"/${MY_P}_SRC
-
-PATCHES=(
-	"${WORKDIR}/${P}-cmake-fortran.patch"
-	"${WORKDIR}/${P}-disable-python-compile.patch"  # managed by function of python eclass
-	"${WORKDIR}/${P}-mpi.patch"
-	"${WORKDIR}/${P}-hdf5-1.10-support.patch"  # taken from Debian
-	"${WORKDIR}/${P}-cmakelist.patch"
-	"${WORKDIR}/${P}-tests.patch"  # disable a few tests not running
-	"${WORKDIR}/${P}-tests-python3.patch"
-	"${WORKDIR}/${P}-installdoc.patch"
-	"${WORKDIR}/${P}-python-imports.patch"
-)
-
-DOCS=( AUTHORS COPYING COPYING.LESSER ChangeLog NEWS README TODO )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	# fixes for correct libdir name
-	sed -i -e "s@SET(_install_dir lib/python@SET(_install_dir $(get_libdir)/python@" \
-		./python/CMakeLists.txt || die "sed failed"
-	for cm in ./src/CMakeLists.txt ./tools/medimport/CMakeLists.txt
-	do
-		sed -i -e "s@INSTALL(TARGETS \(.*\) DESTINATION lib)@INSTALL(TARGETS \1 DESTINATION $(get_libdir))@" \
-			"${cm}" || die "sed on ${cm} failed"
-	done
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDFILE_BUILD_FORTRAN=$(usex fortran)
-		-DMEDFILE_BUILD_STATIC_LIBS=$(usex static-libs)
-		-DMEDFILE_BUILD_PYTHON=$(usex python)
-		-DMEDFILE_BUILD_TESTS=$(usex test)
-		-DMEDFILE_INSTALL_DOC=$(usex doc)
-		-DMEDFILE_USE_MPI=$(usex mpi)
-		-DMEDFILE_DOC_DIRECTORY="${EPREFIX}"/usr/share/doc/${PF}/html   # custom var created by patches
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# the optimization done in CMakeLists.txt has been disabled so
-	# we need to do it manually
-	use python && python_optimize
-
-	# Prevent test executables being installed
-	use test && rm -rf "${D}"/usr/bin/{testc,testf,testpy}
-}
-
-src_test() {
-	# override parallel mode only for tests
-	local myctestargs=( "-j 1" )
-	cmake-utils_src_test
-}
diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
index 7f3fba95a489..be3be43db4b2 100644
--- a/sci-libs/med/Manifest
+++ b/sci-libs/med/Manifest
@@ -1,3 +1,4 @@
+AUX med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch 1683 BLAKE2B 7b5c58e14c36d08e534139df2deba0cd3dd14bc3b66ed3472f89c8693aad73b7215806b4a4a6e3696e5e54855e4deea428309cea48519c85bf99f94f6355f5ba SHA512 4175e0c4b89e541cf27932392333e08960849ebd8e2897a340bce09c7500782064afadfaa51ff8dea89d420636e8bbb28a60fa8fe23432531b233da4462f568a
 DIST med-4.0.0.tar.gz 47849098 BLAKE2B 0bc6710f7b5156e09962e3125349573989429e614a203f649843f00dea06217040ebee70e481eed9c0dd304cb7d167efcd216c3600f6954a74f262cc845fff63 SHA512 2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7
-EBUILD med-4.0.0.ebuild 855 BLAKE2B b10da966988f792f38bacee9d3262429f7d8f5da33b3e0d4785c77fdcf216b22ce1af488407938ad1e1a3154b139fc0385418bb35d4ced76023ee62bdf111727 SHA512 20cc36592197be6d7365cbe6410dfd3701b9236e79dfaa00d147afbff3d27151137d1f13945e2aa74be016bdae196b7a90a5e0b247ff5d14bae5cd4b466e18e6
-MISC metadata.xml 361 BLAKE2B fbd2fb8f0943722292e127f49064380cbe92df453a9c30ac6e0f4767866d81c3ca69b2605cb6269d8cc02604507068dbb967317b6cdc2d1184420bff2d592200 SHA512 a25fbe30ddfa3b62d7c7fff16a022a19145e161099fc59cb2df072461452f2c8a2a0246da7bbc3e18dd580789e514f6a85232b908e921a9762eff18059c85f94
+EBUILD med-4.0.0-r1.ebuild 2955 BLAKE2B 0ec34136f384fd172b7cf07fb8d0ed896f363f4a05b2a784bce784fb7747258aef27894c3850988536b1eb9d27c02729aa14609b4a76988eb7b4a4beafe6801b SHA512 b07717aa5cebf4421b9caa11a48adfd303ef661cc75d656f60ee0315134387028067e2d420556277248bbe408f8a97b6b0bd31f3c2726ca4a27dc0fca381e3ec
+MISC metadata.xml 743 BLAKE2B 26b8d89344c704c98c0819d9c10818667619f77ac704086ee645cbae2d15a59c36533edfe13e787da7e20f0611ddedbc2d761e33277d5a0b1f3328f2704971f9 SHA512 65a7ccf699c82ba6830d0172c87e83651f7d02182f3974fbd725e027046e4a2496fbdab9be852d1796f254622a73f697a3677fbb771a30a06a0b8d9c0a54c4bf
diff --git a/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch b/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch
new file mode 100644
index 000000000000..e9dad6d5febe
--- /dev/null
+++ b/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch
@@ -0,0 +1,50 @@
+From 73a776f76043d122438d716d0958489fc67bab8e Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sun, 1 Sep 2019 22:02:42 +0200
+Subject: [PATCH] doc/html.doc/Makefile.am: install into $htmldir
+
+Patches the install-data-local target to use $htmldir instead of $docdir
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ doc/html.dox/Makefile.am | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/doc/html.dox/Makefile.am b/doc/html.dox/Makefile.am
+index 9dc5b08..3946777 100644
+--- a/doc/html.dox/Makefile.am
++++ b/doc/html.dox/Makefile.am
+@@ -36,25 +36,25 @@ html-local: $(builddir)/../dox/Doxyfile.cfg
+ 	diff $(builddir)/htmllistfile2.am.tmp $(srcdir)/htmllistfile2.am || @CP@ $(builddir)/htmllistfile2.am.tmp $(srcdir)/htmllistfile2.am
+ 
+ install-data-local: $(htmllistfile1) $(htmllistfile2) $(htmllistfile3)
+-	test -z "$(DESTDIR)$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
++	test -z "$(DESTDIR)$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
+ 	for i in $(htmllistfile1) ; do \
+ 	  $(INSTALL_DATA) \
+ 	     `test -f $$i || echo $(srcdir)/`$$i \
+-	     $(DESTDIR)$(docdir) ; \
++	     $(DESTDIR)$(htmldir) ; \
+ 	done 
+ 	for i in $(htmllistfile2) ; do \
+ 	  $(INSTALL_DATA) \
+ 	     `test -f $$i || echo $(srcdir)/`$$i \
+-	     $(DESTDIR)$(docdir) ; \
++	     $(DESTDIR)$(htmldir) ; \
+ 	done
+ 	for i in $(htmllistfile3) ; do \
+ 	  $(INSTALL_DATA) \
+ 	     `test -f $$i || echo $(srcdir)/`$$i \
+-	     $(DESTDIR)$(docdir) ; \
++	     $(DESTDIR)$(htmldir) ; \
+ 	done
+ 
+ uninstall-local: $(htmllistfile1) $(htmllistfile2) $(htmllistfile3)
+-	rm -rf $(DESTDIR)$(docdir); 
++	rm -rf $(DESTDIR)$(htmldir); 
+ 
+ .PHONY: htmlclean
+ 
+-- 
+2.22.0
+
diff --git a/sci-libs/med/med-4.0.0-r1.ebuild b/sci-libs/med/med-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..3eaa9806e84f
--- /dev/null
+++ b/sci-libs/med/med-4.0.0-r1.ebuild
@@ -0,0 +1,119 @@
+# 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 autotools flag-o-matic fortran-2 python-single-r1
+
+#DESCRIPTION="A library to store and exchange meshed data or computation results"
+DESCRIPTION="Modeling and Exchange of Data library"
+HOMEPAGE="https://www.salome-platform.org/user-section/about/med"
+SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fortran hdf5-16-api python test"
+
+# fails to run parallel tests
+RESTRICT="test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# dev-lang/tk is needed for wish-based xmdump utility
+RDEPEND="
+	!sci-libs/libmed
+	dev-lang/tk:0=
+	>=sci-libs/hdf5-1.10.2:=[fortran=,mpi(+)]
+	virtual/mpi[fortran=]
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="python? ( >=dev-lang/swig-3.0.8 )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch"
+)
+
+DOCS=( AUTHORS ChangeLog README )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	if use hdf5-16-api; then
+		append-cppflags -DH5_USE_16_API
+	fi
+
+	# add flag to produce python 3 code
+	sed -e 's|SWIG_PYTHON_OPT += -c++|SWIG_PYTHON_OPT += -c++ -relativeimport -py3|' \
+		-i ./python/Makefile.am || die "failed to change swig options"
+
+	# don't use version information when linking python libraries
+	sed -e 's|= -module|= -avoid-version -module|' \
+		-i ./python/Makefile.am || die "failed to change python link flags"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-api23
+		--disable-installtest
+		--disable-static
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		--with-hdf5="${EPREFIX}"/usr
+		--with-hdf5-lib="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable fortran)
+		$(use_enable python)
+	)
+
+	if ! use fortran; then
+		myconf+=(
+			--with-f90=no
+		)
+	fi
+
+	if use python; then
+		myconf+=(
+			--with-swig="${EPREFIX}/usr"
+		)
+	fi
+
+	export MPICC=mpicc
+	export MPICXX=mpicxx
+	export MPIFC=mpif90
+	export MPIF77=mpif77
+	export FC=mpif90
+	export F77=mpif77
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	use python && python_optimize
+
+	default
+
+	find "${ED}/usr/$(get_libdir)" -type f -name '*.la' -delete || die "failed to delete *.la files"
+
+	# remove unnecessary doc subdirs
+	rm -r "${ED}"/usr/share/doc/${PF}/{gif,jpg,odt,png} || die "failed to remove unneeded doc subdirs"
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/doc/${PF}/html || die "failed to remove html documentation"
+	fi
+
+	# Prevent test executables being installed
+	if use test; then
+		rm -r "${ED}"/usr/bin/{testc,testf,testpy} || die "failed to delete test executables"
+	fi
+
+	# we don't need old 2.3.6 include files
+	rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir"
+
+	rm "${ED}"/usr/$(get_libdir)/libmed3.settings || die "failed to remove libmed3.settings"
+}
diff --git a/sci-libs/med/med-4.0.0.ebuild b/sci-libs/med/med-4.0.0.ebuild
deleted file mode 100644
index 721d2173d35b..000000000000
--- a/sci-libs/med/med-4.0.0.ebuild
+++ /dev/null
@@ -1,48 +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
-
-DESCRIPTION="Modeling and Exchange of Data library"
-HOMEPAGE="https://www.salome-platform.org/user-section/about/med"
-SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mpi"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=sci-libs/hdf5-1.10.5[mpi=]
-	mpi? ( virtual/mpi )
-"
-
-DEPEND="
-	${DEPEND}
-"
-
-src_prepare() {
-	default
-	append-cppflags -DH5_USE_16_API
-}
-
-src_configure() {
-	local myconf=(
-		--docdir="/usr/share/doc/${PF}"
-		--disable-python
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	mv "${ED}"/usr/$(get_libdir)/libmed3.settings \
-		"${ED}"/usr/share/doc/${PF}/ || die "mv failed"
-
-	rm -rf "${ED}"/usr/include/2.3.6 || die "rm failed"
-}
diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml
index dd66d18ef4fd..508afc5ef9c1 100644
--- a/sci-libs/med/metadata.xml
+++ b/sci-libs/med/metadata.xml
@@ -5,8 +5,21 @@
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>waebbl@gmail.com</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
+		<description>Gentoo Science Project</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<description>Gentoo Proxy Maintainers</description>
 	</maintainer>
+	<use>
+		<flag name="hdf5-16-api">
+			Use -DH5_USE_16_API to build the package against old 1.6 API of HDF5
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-libs/numkit/Manifest b/sci-libs/numkit/Manifest
new file mode 100644
index 000000000000..86f34ac46a2e
--- /dev/null
+++ b/sci-libs/numkit/Manifest
@@ -0,0 +1,3 @@
+DIST numkit-1.1.2.tar.gz 243442 BLAKE2B e5d1e4d85b7646acf47a1e332cbb08f849272ada30bcd65fc5995cd000683f802eb882603e4e7043b159d30ca73395988b83c1fc16d6303ea32731bfdea12db5 SHA512 694a56f64282bbbffed975eabeb2716ac924fbf47f5fb62934ba3b57e6415e5f4b079345fd4eee670990fbf7abe1f945b98472aba034d8c7ff259676da58c034
+EBUILD numkit-1.1.2.ebuild 784 BLAKE2B 62ed2a3f85f7f566c5ab29ea86aff15b1f1a8faf1d754d999d0a8c805633e007f0f6253bf450bd54826ccca6bb4e5786edaa5a498ded72ac3f6eb22fc2ee2d41 SHA512 b9dce213f6cffd1585df04eaf7a49aac6926d46cae23789a4ba61880faf09f5c06fc66e249ecbb5913001bb7802edd2a8bf8fc2e2cc4b67633f5dfeac4150292
+MISC metadata.xml 474 BLAKE2B 7467f534225c3c84437c0306f716e64c9740607a9c18afae941af472c867fb29e3bf8e7371caaabd200a0a583c6502f5c6dc2dc6efa8508b91e15a372c90048f SHA512 7df51b689b986305f1a266361661871f2f0da60e1bda3c77d98f1f45d9ba4e2614930f283e2ef73fe861e519931fbc8b1724f2692c4759ddfa78e9cc89b1efeb
diff --git a/sci-libs/numkit/metadata.xml b/sci-libs/numkit/metadata.xml
new file mode 100644
index 000000000000..f38dc92dab52
--- /dev/null
+++ b/sci-libs/numkit/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>alexxy@gentoo.org</email>
+    <name>Alexey Shvetsov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci-chemistry@gentoo.org</email>
+    <name>Gentoo Chemistry Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Becksteinlab/numkit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/numkit/numkit-1.1.2.ebuild b/sci-libs/numkit/numkit-1.1.2.ebuild
new file mode 100644
index 000000000000..51a550050540
--- /dev/null
+++ b/sci-libs/numkit/numkit-1.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-r3
+	EGIT_REPO_URI="https://github.com/Becksteinlab/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	scm_eclass=vcs-snapshot
+	SRC_URI="https://github.com/Becksteinlab/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit eutils distutils-r1 ${scm_eclass}
+
+DESCRIPTION="Numerical first aid kit (with numpy/scipy)"
+HOMEPAGE="https://numkit.readthedocs.io"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.9[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index bdc61767c453..37c549fd734b 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,4 +1,6 @@
 AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b
 DIST openblas-0.3.6.tar.gz 11923774 BLAKE2B 0133b83a4449fd7f86d6379129be4e4477df338d0a402a7787eec317838922b175315c6e6b014a2c7ed6aa1c58509a28f6b48c641e043af067434c4315f1fdb1 SHA512 e432ae8bfbdc8e8c6336553e05181ab38576164c140ef2a6ddb2a66479f724bd4e60a2c90f7bc15bf18eefa7045e7775dedae421fb71296b8d250132c2407b07
+DIST openblas-0.3.7.tar.gz 11991860 BLAKE2B c4eebcbdda8c15ce384195bd2a57d3638b9a8fa9a0484dc3af9dcef0543e7bbfd8444b65ede36379f2182a9bd3df085070210d289c916dfa428da7ab6889eb43 SHA512 424d1c9c6fd97f6af4fdb7d7dce320cf5eab867a027e576531e39df934358736c4efab88782f781ec8f4afa8d992544040e3bbff3a4736c20cf4256d3a8e517d
 EBUILD openblas-0.3.6.ebuild 3532 BLAKE2B b48e2a8dce76ebff23d42da60e867e97ceb5c2f7d9b610800472e8765373dc8547f86065bc35d3924e402b3f4d47650596a457845b2c5062e22f377318ada101 SHA512 0ac456ebe0043cd37be9e40186283895ed09c9bbdad9259b918b40053d3b083ef9df341e2806f7d140cb63dc39182b785e0da556d594edd1150f424c972b18b5
+EBUILD openblas-0.3.7.ebuild 3532 BLAKE2B b48e2a8dce76ebff23d42da60e867e97ceb5c2f7d9b610800472e8765373dc8547f86065bc35d3924e402b3f4d47650596a457845b2c5062e22f377318ada101 SHA512 0ac456ebe0043cd37be9e40186283895ed09c9bbdad9259b918b40053d3b083ef9df341e2806f7d140cb63dc39182b785e0da556d594edd1150f424c972b18b5
 MISC metadata.xml 884 BLAKE2B a2fa7ef571e7fa3a5390f73e40f58fe54b156e9a706c046e88b844de341b0689b8a5fe996fa31ea48f913bfbf064271983d065dd1ada7109212240bcb766317a SHA512 088a07f3bb464717bd8403c9547def9c361b1d0c9f3e5d3398d93c7d8f7b54b4ec47ec82b4d72409ad926a6e49fc297cdbe43b7ea199cf1d64ac27091930868d
diff --git a/sci-libs/openblas/openblas-0.3.7.ebuild b/sci-libs/openblas/openblas-0.3.7.ebuild
new file mode 100644
index 000000000000..f52bf5c6ece1
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.3.7.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit fortran-2 toolchain-funcs
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+SRC_URI="https://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="dynamic eselect-ldso index-64bit openmp pthread"
+REQUIRED_USE="?? ( openmp pthread )"
+
+RDEPEND="
+	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
+			!app-eselect/eselect-cblas
+			>=app-eselect/eselect-lapack-0.2 )"
+
+DEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/shared-blas-lapack.patch" )
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	use openmp && tc-check-openmp
+	export CC=$(tc-getCC) FC=$(tc-getFC)
+
+	use dynamic && \
+		export DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1
+
+	# disable submake with -j
+	export MAKE_NB_JOBS=-1
+
+	USE_THREAD=0
+	if use openmp; then
+		USE_THREAD=1; USE_OPENMP=1;
+	elif use pthread; then
+		USE_THREAD=1; USE_OPENMP=0;
+	fi
+	export USE_THREAD USE_OPENMP
+
+	export PREFIX="${EPREFIX}/usr"
+}
+
+src_unpack () {
+	default
+	mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
+	if use index-64bit; then
+		cp -aL "${S}" "${S}-index-64bit" || die
+	fi
+}
+
+src_compile () {
+	emake
+	emake -Cinterface shared-blas-lapack
+	if use index-64bit; then
+		emake -C"${S}-index-64bit" INTERFACE64=1 LIBPREFIX=libopenblas64
+	fi
+}
+
+src_test() {
+	emake tests
+}
+
+src_install () {
+	emake install DESTDIR="${D}" OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
+		OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
+	dodoc GotoBLAS_*.txt *.md Changelog.txt
+
+	if use eselect-ldso; then
+		dodir /usr/$(get_libdir)/blas/openblas/
+		insinto /usr/$(get_libdir)/blas/openblas/
+		doins interface/libblas.so.3
+		dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
+		doins interface/libcblas.so.3
+		dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
+
+		dodir /usr/$(get_libdir)/lapack/openblas/
+		insinto /usr/$(get_libdir)/lapack/openblas/
+		doins interface/liblapack.so.3
+		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
+	fi
+
+	if use index-64bit; then
+		insinto /usr/$(get_libdir)/
+		dolib.so "${S}-index-64bit"/libopenblas64*.so*
+	fi
+}
+
+pkg_postinst () {
+	use eselect-ldso || return
+	local libdir=$(get_libdir) me="openblas"
+
+	# check blas
+	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
+		eselect blas set ${libdir} ${me}
+		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+	else
+		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+		elog "To use blas [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect blas set ${libdir} ${me}"
+	fi
+
+	# check lapack
+	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
+		eselect lapack set ${libdir} ${me}
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+	else
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+		elog "To use lapack [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect lapack set ${libdir} ${me}"
+	fi
+}
+
+pkg_postrm () {
+	if use eselect-ldso; then
+		eselect blas validate
+		eselect lapack validate
+	fi
+}
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 55251d55febd..69af6ae72d5c 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,6 +1,4 @@
-DIST pcl-1.8.1.tar.gz 66787596 BLAKE2B d02439bc0c0b9cf179f5840822dcad9b3cd128c53325d5f1a5b67e0153c8b4c5150cd65763e17d2c28f91325eb9ae33d9fa6e673a17681b05d19c46eaf0bdb9d SHA512 9e7c87fb750a176712f08d215a906012c9e8174b687bbc8c08fa65de083b4468951bd8017b10409015d5eff0fc343885d2aae5c340346118b1a251af7bdd5cd7
 DIST pcl-1.9.1.tar.gz 67158067 BLAKE2B 472422930e08feba11f42a2df49d68e0c55484744e0649164b113dc3b654188e598b1c0a55f1b75680150090749b00378ae0f70b35b1695a7914a16be7415bf7 SHA512 ca95028c23861ac2df0fa7e18fdd0202255cb2e49ab714325eb36c35289442c6eedbf489e6f9f232b30fa2a93eff4c9619f8a14d3fdfe58f353a4a6e26206bdf
-EBUILD pcl-1.8.1.ebuild 2228 BLAKE2B 916758207e3f8ea2f4b95dcb72986f3dff0d5587e671b2b30471ed548a7c8c7a25b1088957fdcbebb82bcf366042ed3079935233ec54382aaf4b22b20384cf99 SHA512 3a2fd249e12e1529476d9efb04ab3a2dffd6303fcb5825668238c04562eaba439f83ed0dbf08c04b81923e83a58f53a44132cf6d20466d1311366b3b6961cc80
 EBUILD pcl-1.9.1.ebuild 2225 BLAKE2B 71b098a237d0993d68442220862510f8539cdceedd21dbe86a65724044f64f366fbb861455cceca2467744d951cd4cacc790482012b0ad80ee5a1310a4ae1ea6 SHA512 d7c512ff67957ba32fb241489f14693131c15b57d1c05d5c84b3fe8021101a5a42ab3502686d8a0b0b653198ef4023c63ddfb2bc9626a44c4f1b8c83b27aabcc
 EBUILD pcl-9999.ebuild 2225 BLAKE2B 71b098a237d0993d68442220862510f8539cdceedd21dbe86a65724044f64f366fbb861455cceca2467744d951cd4cacc790482012b0ad80ee5a1310a4ae1ea6 SHA512 d7c512ff67957ba32fb241489f14693131c15b57d1c05d5c84b3fe8021101a5a42ab3502686d8a0b0b653198ef4023c63ddfb2bc9626a44c4f1b8c83b27aabcc
 MISC metadata.xml 1125 BLAKE2B 27e8b272d41bf690e99b28e7b9af140412e3d5641f56131c1c8ece113262f3222444a487a3e6a050fcf7fb8c8c404f284bc731780fa557d56241e0e0ad18613f SHA512 d5676bf63401993065215538dd0725f13a99251117e7e61cf9614ea765eb0b9388a8866aa74fb6840dba4ead49f763070076cd328c60ab0830ff11bee827e7cf
diff --git a/sci-libs/pcl/pcl-1.8.1.ebuild b/sci-libs/pcl/pcl-1.8.1.ebuild
deleted file mode 100644
index 9475d9da7036..000000000000
--- a/sci-libs/pcl/pcl-1.8.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-HOMEPAGE="http://pointclouds.org/"
-DESCRIPTION="2D/3D image and point cloud processing"
-LICENSE="BSD"
-SLOT="0/1.8"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
-
-RDEPEND="
-	>=sci-libs/flann-1.7.1
-	dev-libs/boost:=[threads]
-	dev-cpp/eigen:3
-	opengl? ( virtual/opengl media-libs/freeglut )
-	openni? ( dev-libs/OpenNI )
-	openni2? ( dev-libs/OpenNI2 )
-	pcap? ( net-libs/libpcap )
-	png? ( media-libs/libpng:0= )
-	qhull? ( media-libs/qhull )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtcore:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtopengl:5
-	)
-	usb? ( virtual/libusb:1 )
-	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-"
-DEPEND="${RDEPEND}
-	!!dev-cpp/metslib
-	doc? ( app-doc/doxygen )
-	tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
-	test? ( >=dev-cpp/gtest-1.6.0 )
-	virtual/pkgconfig"
-
-REQUIRED_USE="
-	openni? ( usb )
-	openni2? ( usb )
-	tutorials? ( doc )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLIB_INSTALL_DIR=$(get_libdir)"
-		"-DWITH_CUDA=$(usex cuda TRUE FALSE)"
-		"-DWITH_LIBUSB=$(usex usb TRUE FALSE)"
-		"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
-		"-DWITH_PNG=$(usex png TRUE FALSE)"
-		"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
-		"-DWITH_QT=$(usex qt5 TRUE FALSE)"
-		"-DWITH_VTK=$(usex vtk TRUE FALSE)"
-		"-DWITH_PCAP=$(usex pcap TRUE FALSE)"
-		"-DWITH_OPENNI=$(usex openni TRUE FALSE)"
-		"-DBUILD_OPENNI=$(usex openni TRUE FALSE)"
-		"-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)"
-		"-DBUILD_OPENNI2=$(usex openni2 TRUE FALSE)"
-		"-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
-		"-DWITH_DOCS=$(usex doc TRUE FALSE)"
-		"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
-		"-DBUILD_TESTS=$(usex test TRUE FALSE)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 08bf1dbcb961..65ea71b8399a 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,8 +1,6 @@
-DIST rtabmap-0.14.0.tar.gz 19515196 BLAKE2B 851017bd3114c4dfaf323ef7ba6c3e970480de4c227b06d625cec0363a144a220be587934b0d457eca587d39c0c0b609acebd71ce7a98f1193ab5723f6a47f9a SHA512 00e2996b11aef8e0f61dc59ac59626b5b695ac3b5281d7776d73b54edbd90473bfffa1daae148e090b601a4d56d7feff2190f362ea188640b93db06e3760042f
-DIST rtabmap-0.17.1.tar.gz 19632117 BLAKE2B 6e2bd929da4148856317f0b03197e541223d59810397fc5d282b04ace5af796028cd8cde850d89fb2f3f289ed11d155a5163132edd7e65e2bc8a1bad1d09c54a SHA512 6714d245b87012cb0432b677c87b17e3bc182df2025203f0bd63b1f4ab06d03d795de4792d3cc4fe6d1ca4db40852c15350fed3c3a6e27176ea5e764a9816cd2
 DIST rtabmap-0.18.1.tar.gz 19725948 BLAKE2B c43cf9c696a151b9f9117d13438122bf47fc66914249377b7c9519a2838c8512147d68f999744c1f1c5a298e1b7adb7b77db8df1c6100d1d9a7a0acbf8b24967 SHA512 37fc2e6445531875cb9b27684cd5ff7a651ca2a8a3c653a52813352579bd2f4a4ee4be7c690cf0b29ae7907d26fd8a1f4e9188071409611b845333e734714aca
-EBUILD rtabmap-0.14.0.ebuild 1401 BLAKE2B 877164ca7375c4d39f6598b72019b16664c853f3c1ee16753c490df0efbcc600b7a7e0ae57957f11f0469ffc8f09f6c4a50a644191d111b19cd7ecc95bda774c SHA512 b47443ccdf33d69e61c6912951f7c816cfaa13ca8076dc627c1814b7bbffc4a2c547296d2995726a6203b3317e568b6df7933918d660594729bf436ef80382b6
-EBUILD rtabmap-0.17.1.ebuild 1446 BLAKE2B 7f638d8f3b7e756a39122ec993b0471bbf1e72d8fa986679f796c9e5e415fabba12721e7139bc70cb881082f2c2927066f6de814fed35105b85f47f61d196094 SHA512 27178728cadf42f1e8cc9e47e52ef69d3ef9ee6bb1c71223ed80edfa9fe451a6020ddbc08f5f960c2dcb6df77535d0f72458c465213886788048b2b6493fba30
+DIST rtabmap-0.19.3.tar.gz 19818629 BLAKE2B f732a02db6ef8434b1457234211a128e3050236590e0f6a1e08e36bbb5899b9d3de9409d7d7329f346d29874d440bd86835c1501fb638e3802e2663907e7b04d SHA512 bda72596911b1c35d757322c7e5acd7e43ec1f4e984bfb0599cfb39597bee79e470d1bc11b492f244f39c35812ae570d023848cdcbd011eeb78e347727045509
 EBUILD rtabmap-0.18.1.ebuild 1427 BLAKE2B 8cd9e1dcbe91cd609815f9dadd9c252ef9145f2fa2a79e4f0fa627d276310d648cc53d81a4dce4e1b47fab5af19243f50643e2209e50920b2b373c83d1de7d0b SHA512 f380f1de720a19f8bcd5a4aec152b4776771c41794595151890fb47c63ef512a24cc3922d5e7b3ac5eb9671274fb1d26867dcb677eb1e5ee61a4e84461341afb
+EBUILD rtabmap-0.19.3.ebuild 1427 BLAKE2B 8df77b7a3a13eaceb32b14acf719d0ed5310a47861d8ea1fc0b198d52fd8a41d0a898269d8efb03581a8f8c402834a351483928ccb3c215227a3e6cab0863cd2 SHA512 91f0b78b6bfa53210aed90c326ed5151e2712edef451953416e3e81ac5842a8f0e3349ea6ce0eb2b3097012014b908af915525e65e1a074bedd86f3a82594290
 EBUILD rtabmap-9999.ebuild 1427 BLAKE2B 8cd9e1dcbe91cd609815f9dadd9c252ef9145f2fa2a79e4f0fa627d276310d648cc53d81a4dce4e1b47fab5af19243f50643e2209e50920b2b373c83d1de7d0b SHA512 f380f1de720a19f8bcd5a4aec152b4776771c41794595151890fb47c63ef512a24cc3922d5e7b3ac5eb9671274fb1d26867dcb677eb1e5ee61a4e84461341afb
 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81
diff --git a/sci-libs/rtabmap/rtabmap-0.14.0.ebuild b/sci-libs/rtabmap/rtabmap-0.14.0.ebuild
deleted file mode 100644
index ec181ba72d33..000000000000
--- a/sci-libs/rtabmap/rtabmap-0.14.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
-HOMEPAGE="http://introlab.github.io/rtabmap/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples ieee1394 openni2 qt5"
-
-RDEPEND="
-	media-libs/opencv:=[qt5(-)?]
-	sci-libs/pcl:=[openni,vtk]
-	sci-libs/vtk:=[qt5(-)?]
-	sys-libs/zlib
-	sci-libs/octomap:=
-	dev-libs/boost:=
-	ieee1394? ( media-libs/libdc1394 )
-	openni2? ( dev-libs/OpenNI2 )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DWITH_QT=$(usex qt5 ON OFF)"
-		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
-		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	# Needed since we force ros crawling to be done only in
-	# /usr/share/ros_packages/
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
-}
diff --git a/sci-libs/rtabmap/rtabmap-0.17.1.ebuild b/sci-libs/rtabmap/rtabmap-0.17.1.ebuild
deleted file mode 100644
index 9bbe6d06b163..000000000000
--- a/sci-libs/rtabmap/rtabmap-0.17.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-melodic.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P}-melodic"
-fi
-
-DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
-HOMEPAGE="http://introlab.github.io/rtabmap/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples ieee1394 openni2 qt5"
-
-RDEPEND="
-	media-libs/opencv:=[qt5(-)?]
-	sci-libs/pcl:=[openni,vtk,qt5(-)?]
-	sci-libs/vtk:=[qt5(-)?]
-	sys-libs/zlib
-	sci-libs/octomap:=
-	dev-libs/boost:=
-	ieee1394? ( media-libs/libdc1394 )
-	openni2? ( dev-libs/OpenNI2 )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DWITH_QT=$(usex qt5 ON OFF)"
-		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
-		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	# Needed since we force ros crawling to be done only in
-	# /usr/share/ros_packages/
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
-}
diff --git a/sci-libs/rtabmap/rtabmap-0.19.3.ebuild b/sci-libs/rtabmap/rtabmap-0.19.3.ebuild
new file mode 100644
index 000000000000..da61f393cbde
--- /dev/null
+++ b/sci-libs/rtabmap/rtabmap-0.19.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
+fi
+
+inherit ${SCM} cmake-utils multilib
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P}"
+fi
+
+DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
+HOMEPAGE="http://introlab.github.io/rtabmap/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples ieee1394 openni2 qt5"
+
+RDEPEND="
+	media-libs/opencv:=[qt5(-)?]
+	sci-libs/pcl:=[openni,vtk,qt5(-)?]
+	sci-libs/vtk:=[qt5(-)?]
+	sys-libs/zlib
+	sci-libs/octomap:=
+	dev-libs/boost:=
+	ieee1394? ( media-libs/libdc1394 )
+	openni2? ( dev-libs/OpenNI2 )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DWITH_QT=$(usex qt5 ON OFF)"
+		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
+		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
+		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	# Needed since we force ros crawling to be done only in
+	# /usr/share/ros_packages/
+	insinto /usr/share/ros_packages/${PN}
+	doins "${ED}/usr/share/${PN}/package.xml"
+}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 83b067841fbe..74e292c51993 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -28,7 +28,9 @@ DIST rules_docker-b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz 460121 BLAKE2B
 DIST tensorflow-1.13.1.tar.gz 31614228 BLAKE2B 3e78309744747afd5a0929eebccb414efe51320f9291424ef6e3cb848f265aaac5ff16a7064c7aac8094f06b1edb61aa9fe22a55c28c23cfc4e2a6f640f4f12d SHA512 1e5c020a82b0b502c9c6fc9439905e19e8f1fb07e32740a5e2c70f4a3565c8c87053ccdcad360e95550dad648154e399ca8e352fb97a1788acfec3b87bf323bb
 DIST tensorflow-1.14.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
 DIST tensorflow-1.14.0.tar.gz 41335204 BLAKE2B d91d84c5d86c838cc659c45e28cf3c8a9ec9a02f5854a1826680806dae41cdd00ea49a6d2c04f2019b3400c6e267c6ca6f3b28e43b244569dca174ff7f2c59d6 SHA512 ac9ea5a2d1c761aaafbdc335259e29c128127b8d069ec5b206067935180490aa95e93c7e13de57f7f54ce4ba4f34a822face22b4a028f60185edb380e5cd4787
+DIST tensorflow-patches-1.14.0-r2.tar.bz2 7213 BLAKE2B 51719fc02049d564b7e5c00a76375af9a7e8dfc73753ba5f0d53163dc1fa00d23bb7ed03553a0bce68b8b90cd5bfe21d29e7a57a827db2c68ceef65f3cb0e925 SHA512 35e1a410060cdde99df148bfd06f042b91e021f7a692ae9c0100c67555de553bc248d73db762ed0239117296fb1147e2b67cdf0dd3dc94dee6fe9804c08a7360
 DIST tensorflow-python-license.rst.txt 45132 BLAKE2B 770ddd87adc745a021daac01a284131825a33f176002a28b20a2251246183bf7ab4686305620678285e4a216a37f01b3ad953fe7864fa79611cccde156d69ab6 SHA512 2d5a3783ec340f24797e89c78007ee95ab753eb5ee8198c739544f9e1159895f7abe816d6b3c66620f8d7b64641d2a7f44ff0a5b4f2f941928f4733157c7995e
 EBUILD tensorflow-1.13.1.ebuild 10011 BLAKE2B 8b151edc20f6b80ccaac0e6c99f2414b484eb23ec2e1706736e90f355c8e5d960d8bb5beb00adf54238243e192832f6765d0edab1a6a14d18b888a34d2be343b SHA512 d3aefaeca59c6ee8ad58c0cf0830dc1334d0c0d12d602bbb6fea3f6030d002e918414fb0a5eb900a0ad199012c454d6dba8bda889b218fe6da4daa1e55a6d95e
 EBUILD tensorflow-1.14.0-r1.ebuild 10688 BLAKE2B 272c017503db3301e972242af8e0b66aaf7e81befe37ece9dc39696dec838b139d873c79e6db4f19fdf91f1af968475848bd4176155fcf5df403b6ebea108b79 SHA512 015fc7b2a664d7b8617da22139e8a87cca5bb6f876ded8fdc441ad68c5456ab9d7c7d5ca624031bec0d38e35e39fee69db8e5a38fdfe9ff23cdb8377fd9df66a
+EBUILD tensorflow-1.14.0-r2.ebuild 10387 BLAKE2B e96b62c51ecddfd883dafe6e43612c490f082cb220eed052239d0bb5743bd899762c7308f9021d7a980a6b080b3930eea7520f257d23a420f53868c7b2606988 SHA512 0805d3024a2cd5fde6bf057bfda691710256639982e9281e4e6e57ab70e13f5069bcdcb232354e87edc8c99e1af9723a63ef2c5f5dee9e83424df5320ba707c4
 MISC metadata.xml 512 BLAKE2B 39a7fc6dc76945448a9f0e8e9d79866f364d0df5036500a2ab981b6ab6f1170ef8a15e29e3a5a3d39edc0dc441985feaa45ce8069fdfb815ca1419721ba9d870 SHA512 a6dc893a523fa7dab319173914e8602434b8247aee2af6a4adbde29be440097901b0e40193e5592f3849340414a4debce1218ae3895c2c6e7d5af171c463c82b
diff --git a/sci-libs/tensorflow/tensorflow-1.14.0-r2.ebuild b/sci-libs/tensorflow/tensorflow-1.14.0-r2.ebuild
new file mode 100644
index 000000000000..b30050d97da7
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-1.14.0-r2.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit bazel check-reqs cuda distutils-r1 flag-o-matic toolchain-funcs
+
+DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda mpi +python"
+CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
+for i in $CPU_USE_FLAGS_X86; do
+	IUSE+=" cpu_flags_x86_$i"
+done
+
+# distfiles that bazel uses for the workspace, will be copied to basel-distdir
+bazel_external_uris="
+	http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
+	https://bitbucket.org/eigen/eigen/get/a0d250e79c79.tar.gz -> eigen-a0d250e79c79.tar.gz
+	https://github.com/abseil/abseil-cpp/archive/daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz -> abseil-cpp-daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz
+	https://github.com/bazelbuild/bazel-skylib/archive/0.6.0.tar.gz -> bazel-skylib-0.6.0.tar.gz
+	https://github.com/bazelbuild/rules_closure/archive/cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz -> bazelbuild-rules_closure-cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz
+	https://github.com/bazelbuild/rules_swift/releases/download/0.9.0/rules_swift.0.9.0.tar.gz -> bazelbuild-rules_swift.0.9.0.tar.gz
+	https://github.com/bazelbuild/rules_docker/archive/b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz -> rules_docker-b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz
+	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
+	https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip
+	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
+	https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz
+	cuda? (
+		https://github.com/nvidia/nccl/archive/f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz -> nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz
+		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
+	)
+	python? (
+		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
+		http://mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.14.0-python-license.rst.txt
+		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
+	)"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
+		${bazel_external_uris}"
+
+RDEPEND="
+	app-arch/snappy
+	dev-db/lmdb
+	dev-db/sqlite
+	dev-libs/icu
+	>=dev-libs/jsoncpp-1.9
+	dev-libs/libpcre
+	dev-libs/nsync
+	dev-libs/openssl:0=
+	>=dev-libs/protobuf-3.6.0:=
+	>=dev-libs/re2-0.2018.04.01
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng:0
+	>=net-libs/grpc-1.22.0
+	net-misc/curl
+	sys-libs/zlib
+	>=sys-apps/hwloc-2
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
+		dev-libs/cudnn
+	)
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/flatbuffers-1.8.0
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
+		dev-python/gast[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/google-pasta[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.6.0[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		>=dev-python/grpcio-1.22.0[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}]
+		>=net-libs/google-cloud-cpp-0.10.0
+		>=sci-libs/keras-applications-1.0.6[${PYTHON_USEDEP}]
+		>=sci-libs/keras-preprocessing-1.0.5[${PYTHON_USEDEP}]
+		>=sci-visualization/tensorboard-1.13.0[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/mock"
+PDEPEND="python? (
+		>=sci-libs/tensorflow-estimator-1.13.0[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.6.0
+	dev-java/java-config
+	dev-python/mock
+	dev-lang/swig
+	dev-python/cython
+	|| (
+		=dev-util/bazel-0.24*
+		=dev-util/bazel-0.26*
+		=dev-util/bazel-0.27*
+	)
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
+	)
+	!python? ( dev-lang/python )
+	python? (
+		>=dev-python/grpcio-tools-1.22.0
+	)"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="5G"
+
+get-cpu-flags() {
+	local i f=()
+	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+	done
+	use cpu_flags_x86_fma3 && f+=( -mfma )
+	echo "${f[*]}"
+}
+
+pkg_setup() {
+	local num_pythons_enabled
+	num_pythons_enabled=0
+	count_impls(){
+		num_pythons_enabled=$((${num_pythons_enabled} + 1))
+	}
+	use python && python_foreach_impl count_impls
+
+	# 5 G to build C/C++ libs, 5G per python impl
+	CHECKREQS_DISK_BUILD="$((5 + 5 * $num_pythons_enabled))G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	append-flags $(get-cpu-flags)
+	bazel_setup_bazelrc
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+	use python && python_copy_sources
+
+	use cuda && cuda_add_sandbox
+}
+
+src_configure() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_configure() {
+		export CC_OPT_FLAGS=" "
+		export TF_ENABLE_XLA=0
+		export TF_NEED_OPENCL_SYCL=0
+		export TF_NEED_OPENCL=0
+		export TF_NEED_COMPUTECPP=0
+		export TF_NEED_ROCM=0
+		export TF_NEED_MPI=$(usex mpi 1 0)
+		export TF_SET_ANDROID_WORKSPACE=0
+
+		if use python; then
+			python_export PYTHON_SITEDIR
+			export PYTHON_BIN_PATH="${PYTHON}"
+			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
+		else
+			export PYTHON_BIN_PATH="$(which python)"
+			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
+		fi
+
+		export TF_NEED_CUDA=$(usex cuda 1 0)
+		export TF_DOWNLOAD_CLANG=0
+		export TF_CUDA_CLANG=0
+		export TF_NEED_TENSORRT=0
+		if use cuda; then
+			export TF_CUDA_PATHS="${EPREFIX%/}/opt/cuda"
+			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
+			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
+			einfo "Setting CUDA version: $TF_CUDA_VERSION"
+			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+		fi
+
+		local SYSLIBS=(
+			absl_py
+			astor_archive
+			boringssl
+			com_github_googleapis_googleapis
+			com_github_googlecloudplatform_google_cloud_cpp
+			com_google_protobuf
+			com_google_protobuf_cc
+			com_googlesource_code_re2
+			curl
+			cython
+			double_conversion
+			enum34_archive
+			flatbuffers
+			gast_archive
+			gif_archive
+			grpc
+			hwloc
+			icu
+			jpeg
+			jsoncpp_git
+			keras_applications_archive
+			lmdb
+			nasm
+			nsync
+			org_sqlite
+			pasta
+			pcre
+			png_archive
+			protobuf_archive
+			six_archive
+			snappy
+			swig
+			termcolor_archive
+			wrapt
+			zlib_archive
+		)
+
+		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
+		export TF_IGNORE_MAX_BAZEL_VERSION=1
+
+		# This is not autoconf
+		./configure || die
+
+		echo 'build --config=noaws --config=nohdfs --config=noignite --config=nokafka' >> .bazelrc || die
+		echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die
+		echo 'build --incompatible_no_support_tools_in_action_inputs=false' >> .bazelrc || die
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_configure
+	else
+		do_configure
+	fi
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	if use python; then
+		python_setup
+		BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}"
+	fi
+
+	# fail early if any deps are missing
+	ebazel build --nobuild \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so \
+		//tensorflow:libtensorflow_cc.so \
+		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
+
+	ebazel build \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so
+	ebazel build //tensorflow:libtensorflow_cc.so
+
+	do_compile() {
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
+	}
+	BUILD_DIR="${S}"
+	cd "${BUILD_DIR}"
+	use python && python_foreach_impl run_in_build_dir do_compile
+	ebazel shutdown
+}
+
+src_install() {
+	local i j
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_install() {
+		einfo "Installing ${EPYTHON} files"
+		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
+		cd "${srcdir}" || die
+		esetup.py install
+
+		# libtensorflow_framework.so is in /usr/lib already
+		python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
+		rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die
+		python_optimize
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir do_install
+
+		# Symlink to python-exec scripts
+		for i in "${ED}"/usr/lib/python-exec/*/*; do
+			n="${i##*/}"
+			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
+		done
+
+		python_setup
+		local BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}" || die
+	fi
+
+	einfo "Installing headers"
+	ebazel build //tensorflow:install_headers
+	ebazel shutdown
+	insinto /usr/include/${PN}/
+	doins -r bazel-genfiles/tensorflow/include/*
+
+	einfo "Installing libs"
+	# Generate pkg-config file
+	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc ${PN}_cc.pc
+
+	for l in libtensorflow{,_framework,_cc}.so; do
+		dolib.so bazel-bin/tensorflow/${l}
+		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1)
+		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3)
+	done
+
+	einstalldocs
+}
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 3177be830de3..d2d8a576c575 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -7,23 +7,14 @@ AUX vtk-6.1.0-memset.patch 5216 BLAKE2B 301ac84c0e439c14228665c8230d3f843c919b0a
 AUX vtk-6.1.0-netcdf.patch 994 BLAKE2B 9b24685987b2a76f32cbe7c107f5c5ac580ca7d6616d959caeedc2b3ac0699b9f1b5b79a26fc1cc61818c3712fb40d9246dea2c3bb221e0fbc5db5a61707406d SHA512 0f0b3493270efbf33a13abb7f38637473d48d15efe793f7148c13f5aeb77ac5534340d42f87451cd81ed2d7cce4ca6da9a71e065a7780e84f30a710d7368b488
 AUX vtk-6.1.0-system.patch 1307 BLAKE2B f89f7e4946c94a907ef7b74c1ca1e35106ece486c944f932b6d19febe2ecb08aee6cd11719a121b3a47a978969724aff2d16c2212151bf6fd50cb7c19ab22957 SHA512 1fae8aecaf2344b5517e9b29ea2cb8b834af8a22be88535ec8bf9ec624625ea3f2ca820945a3d3f7c896ca080a7ded59ca7a601c50f970e59c3a8db691f060b3
 AUX vtk-6.1.0-web.patch 776 BLAKE2B e92d3abb96161f0d955c3c653ce67a2427538fcabcb3b492449d086ec35b545c693231fa9bbb02f27ca96395bcd4c73e6741318625ad23c5105fa3fc8cfbf671 SHA512 5489096a0a4e5854cd426a75a0713f53a5c0daab7a9069c249b65d4a34cc8ff18737267f16ee8fbb2a07b7e987525b93e1eec5a23f78ac1b3f893c5847761bc5
-AUX vtk-7.0.0-glext.patch 393 BLAKE2B 416612e5a587378287d99c447a30703c66aabd8ad07cea83a984bd7b5feaa0f619e152d70a4c514b9e31a85a9e57693884918047e25609d5cca394e623929045 SHA512 67fcdbf128ea3bc32dbc5ea8de350fcb3e8447a90a7cb23501658d624703623c1d67c31e8783607fa995e8ac666075cbf00417c702a9a4a357e933b8e2153d64
 DIST VTK-6.1.0.tar.gz 27608882 BLAKE2B 10cef62e2fc3bf7109f7b3e9858721850243a7798fe885c6a584dba9a6f74c526c58b009f2cba6c56512a6ec159dbf29ac965f9ae6533128f3a20e7224bdddc0 SHA512 3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc
-DIST VTK-7.1.0.tar.gz 31171521 BLAKE2B e607aa8437b4b4546cf3be5fa1fd771d07e2c0e5f85faeeb4585aae139fc40564939ccd3ec5efd4e63711789de300cf70edede46bfb54228bf6ea783d9dec39b SHA512 83f0c9291cd2bc517a4bc449ad28a1d77e7ece169e846c7beab0b1140b9ef4b7bad30e3fa6e5a59826a707df78e2e336e07fa8bd30cf7498096ee80feef16534
 DIST VTK-8.1.0.tar.gz 33482506 BLAKE2B 82aecb497847254595f20294120ae793432348fc3fd881924b52c004335d9bae3d052f168bbe291b307af67845a80e740d8996d36991c38fbec7213438e2395d SHA512 3d5efd1a18939e21045278a387817421a98919cbaaa6ed65167c16999e1bb882b849b698d201a294da9920dbc96d1fbc987013462b1c7cbb12920bfff9b6f2a3
 DIST VTKData-6.1.0.tar.gz 94452190 BLAKE2B 55e1af454f1c54c0a182552c41e08549781532b510bf29cb28fcd12510c1cef2c4e09274507d658b700f22d0da1961d7b4e6dc289d9ee39c6b1e1fac348ba153 SHA512 4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65
-DIST VTKData-7.1.0.tar.gz 249106922 BLAKE2B 01505bd5e01c790d40be6966c6261de4eba2ec36b515580112b3291f894c9d2e361f31d20bb14faf40f125b82e5ea6a1b0002acbb598c79f11d541e0fe5de4df SHA512 8f78fdce36fc683c8b8b7137a02fd727f322ceecce66f20a4b1b3f8d260e8e894c1ec1ed46eb2427e501239f12b02b1476ca3a302fa1f9287584110598972f9e
 DIST VTKData-8.1.0.tar.gz 282986441 BLAKE2B 885f35c5386cc5db8db905a868a3ad79c246f1b0e41a3e5b81312b1f3de90483a1e34886d4764c60fe8006acaace2405b25acf047ec0e25a957f7a2d563d3380 SHA512 0a63f87896320aa38970932bf47c9e3f65a8bdd5413e51f95c53e321348b5b4e1eca2405d755eabb785c03939e1936245cc9f1b0f7ad0988c41362ac6f1e3047
 DIST VTKLargeData-6.1.0.tar.gz 166019220 BLAKE2B 94180c9fd73655cbc08914a2309925d40ac2c99ce8652a7db37bb3ddc3b9dd654e8286be97a764c9029a6de21ae847f1f2c46c07ec974e5da802f23a7d277836 SHA512 3663a124c16448882ad3aef0fb15f55f438863ba2176106803ad9c6fb561325accd74f2675d8b6e1de791babfa8b992e516d87640efedda4a6daeb5affc2cf3f
-DIST VTKLargeData-7.1.0.tar.gz 166680011 BLAKE2B 6b630d13a7cf22909f2fd42a89eccfe2ae79c16ec46b99229f349ff47d20e38cf22b9b63803087d319d43915fce116d2874e450c439727dde5a795d003cd1c4a SHA512 79d058732932837f2873a14850e18375d6a43f07de7cf4b71570ae32cf7abb7651052378ff9cbd1e221c95f78e46c13c9852425a509ae02c826f5345e836e455
 DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B ac98861ccac2aacfab7547a4b56de5c9e611b8655f077bb85e6ab850fb0cfd79f4722a0486f73eafcde2cd77d6be305201857f3e729b1f60f710c45bcf0bb63f SHA512 9dfd64b5125205ba7d8cba5665da40874d0a9781f3bd2595058d939207d96980c9a68009ce9ed1476931e1b929199c4888ccf6d590f23d2412873ca6907abc31
 DIST vtkDocHtml-6.1.0.tar.gz 230827905 BLAKE2B a323728450c5054d715dac137e54ed9b901019af595ea3abca9e7865d0b420d7b5f87789a9489df116f982633984d74721153dc3ab735e97455f64c2ffc4aa95 SHA512 fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60
-DIST vtkDocHtml-7.1.0.tar.gz 128927849 BLAKE2B 93ad088ec0578bf8008a789f71d7d70eff13899ab216af1499c88870189fe53c426fd23fea5f1c0ff5e8cfd9ec5c6fe03ad2b691edf88d0fbf55b7593778b3fd SHA512 cac6d005262d3849f84c2632dd737c4dcd9f23d5015266d683bcc8c65fad0d88e87faf9b1d5f68fdabe7b2ed97927a9f907020cbeae2b6e7223a5ffee54f2679
 DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e SHA512 c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c
 EBUILD vtk-6.1.0-r4.ebuild 10480 BLAKE2B 72dc967f163fed46bcbe7dc0a2b4de89840c95134a5b89522ed2d8962873a4ee54d7e2a0a9dc9814f003e3aa5d206e39ec77b799690b7ba8af1fec5d874cef48 SHA512 b299bee838d2fac4b44d56039856a326388186bac7d7c154bc4b144db66df1c04b9c74db3039f6e2ff8d3b25714a3e37d097e47a573b4a1851be09acbe161794
-EBUILD vtk-7.1.0.ebuild 9296 BLAKE2B 0fd4cb6ff13fe68d9a39bd686a18477fc0f8daad711910135448aacc96e06820251921263dc9517f400454fbdbda26ad5dc9633e98557b2246fe6e8658495537 SHA512 622eabfbb2a4b2c80a6254b09779f05b9354082402f3fead1010767c660b86c0e94413026a27bd06ea8eb7a07bea14d747db3bec51d9b5bf6ccb669d660d937f
-EBUILD vtk-8.1.0-r1.ebuild 9027 BLAKE2B 45d5ef5b8177e418424135b9ee70af8e4d681731584a595bb4108cdff1e8f3fe29f0293bd668fba67967dfcd4e9b7e26ae51e3dea92e72ed0bc7d4589c82597c SHA512 36a149ad672f38d48f767c4381bb04bc4054edd76776430d3157f034f4faf58ddaed43675c712e1d4787ae01f05ed8c2b64988dfb30392a43faeb6c37416d115
-EBUILD vtk-8.1.0-r2.ebuild 9037 BLAKE2B 8f8f89c3d158b826591eb07fe0250c16d0ba9dca9ea11011254152ac37b15bb840a815eb1bcb7b8a7c92524eb12f44d56a5ca16d91ca47b0d2797fa6e43db214 SHA512 5e0285464d4a41370a9e6586f9fb57fa6a1bebc2785f996c9a48d4066022f05103a7f233570cb729a79052a6684c51e682229376afab359b2c56bdbe52ad0a33
 EBUILD vtk-8.1.0-r3.ebuild 9057 BLAKE2B e5329bd6ed31f37152614d1e4773ed62a0eb92e9bfdecd0695dc57ebbf5c6cce9d0e5ab27a793774acabe9a9b9c4170ec579ccdf75fcbdc02e6666eafee2b6b2 SHA512 db6b2eea35c79c1ece9a0ce00dd5e9863eb3b312fd90101da5b7d216dcff2a365445d4f91fccdf49f176dfc626652a05da396c270dd27251db74b1cf69f08238
-EBUILD vtk-8.1.0.ebuild 9214 BLAKE2B 4705a1ba19eee614686234bb3297f70104fd1b050f51bfd3c16f2c01cc33f745d2fdcf70331dc060852923da8f319cbc554c9296e76d6a742215e3c31990b77d SHA512 34a8ab6760d0b3fbb25dbf9d2c4a9eb5507b7de777bcce509b8d80e92131290d31b747921a1cd0905001b4657c6eba68f6497b024f2ff70cecaa7bdacaccb11a
 MISC metadata.xml 1120 BLAKE2B 17456da598e4b7dfddec75a323def586e3b099ddfaa2e5883410afdd9143d317a6db53ead747b097cf8631f738d6a0b38a1e27ea37b445ba667a403053223e02 SHA512 d0d9ccd1922afe496e24d38fee05793fdf3983f798bef817a00c77bb632f2cabe3d2be554d0e979c223fd4005f3186b9ef78d394050539bd21cba5c2b6e56143
diff --git a/sci-libs/vtk/files/vtk-7.0.0-glext.patch b/sci-libs/vtk/files/vtk-7.0.0-glext.patch
deleted file mode 100644
index 5c321340ed6a..000000000000
--- a/sci-libs/vtk/files/vtk-7.0.0-glext.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Rendering/OpenGL/vtkOpenGL.h
-+++ b/Rendering/OpenGL/vtkOpenGL.h
-@@ -19,7 +19,8 @@
- #include "vtkConfigure.h"
- 
- // To prevent gl.h to include glext.h provided by the system
--#define GL_GLEXT_LEGACY
-+// https://bugzilla.redhat.com/show_bug.cgi?id=1138466
-+// #define GL_GLEXT_LEGACY
- #if defined(__APPLE__) && defined(VTK_USE_COCOA)
- # include <OpenGL/gl.h> // Include OpenGL API.
- #else
diff --git a/sci-libs/vtk/vtk-7.1.0.ebuild b/sci-libs/vtk/vtk-7.1.0.ebuild
deleted file mode 100644
index 7d06c7c1ccb3..000000000000
--- a/sci-libs/vtk/vtk-7.1.0.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-WEBAPP_OPTIONAL=yes
-WEBAPP_MANUAL_SLOT=yes
-
-inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx webapp
-
-# Short package version
-SPV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
-	https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
-	doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
-	test? (
-		https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
-		https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
-		)
-	"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="
-	all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi
-	mysql odbc offscreen postgres python qt5 rendering tbb test theora tk tcl
-	video_cards_nvidia views web R +X xdmf2"
-
-REQUIRED_USE="
-	all-modules? ( python xdmf2 boost )
-	java? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tcl? ( rendering )
-	test? ( python )
-	tk? ( tcl )
-	web? ( python )
-	^^ ( X aqua offscreen )
-	"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/jsoncpp:=
-	dev-libs/libxml2:2
-	>=media-libs/freetype-2.5.4
-	media-libs/libpng:0=
-	media-libs/libtheora
-	media-libs/mesa
-	media-libs/tiff:0
-	sci-libs/exodusii
-	sci-libs/hdf5:=
-	sci-libs/netcdf-cxx:3
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	boost? ( dev-libs/boost:=[mpi?] )
-	examples? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		sci-libs/vtkdata
-	)
-	ffmpeg? ( virtual/ffmpeg )
-	gdal? ( sci-libs/gdal )
-	java? ( >=virtual/jdk-1.7:* )
-	kaapi? ( <sci-libs/xkaapi-3 )
-	mpi? (
-		virtual/mpi[cxx,romio]
-		python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-	)
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	offscreen? ( media-libs/mesa[osmesa] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/sip[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/designer:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsql:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtx11extras:5
-		python? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-	)
-	R? ( dev-lang/R )
-	tbb? ( dev-cpp/tbb )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	web? (
-		${WEBAPP_DEPEND}
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/autobahn[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}]
-	)
-	xdmf2? ( sci-libs/xdmf2 )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}"/VTK-${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.0-glext.patch
-	"${FILESDIR}"/${PN}-6.1.0-memset.patch
-)
-
-RESTRICT="test"
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	use web && webapp_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e 's:libproj4:libproj:g' \
-		-e 's:lib_proj.h:lib_abi.h:g' \
-		-i CMake/FindLIBPROJ4.cmake || die
-
-	local x
-	# missing: VPIC alglib exodusII freerange ftgl libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
-	for x in expat freetype hdf5 jpeg jsoncpp libxml2 netcdf oggtheora png tiff zlib; do
-		ebegin "Dropping bundled ${x}"
-		rm -r ThirdParty/${x}/vtk${x} || die
-		eend $?
-	done
-	rm -r \
-		ThirdParty/AutobahnPython/autobahn \
-		ThirdParty/Twisted/twisted \
-		ThirdParty/ZopeInterface/zope \
-		|| die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# general configuration
-	local mycmakeargs=(
-		-Wno-dev
-		-DVTK_DIR="${S}"
-		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
-		-DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
-		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
-		-DBUILD_SHARED_LIBS=ON
-		-DVTK_USE_SYSTEM_AUTOBAHN=ON
-		-DVTK_USE_SYSTEM_EXPAT=ON
-		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_FreeType=ON
-		# Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
-		-DVTK_USE_SYSTEM_GL2PS=OFF
-		-DVTK_USE_SYSTEM_HDF5=ON
-		-DVTK_USE_SYSTEM_JPEG=ON
-		-DVTK_USE_SYSTEM_LIBPROJ4=OFF
-		-DVTK_USE_SYSTEM_LIBXML2=ON
-		-DVTK_USE_SYSTEM_LibXml2=ON
-		-DVTK_USE_SYSTEM_NETCDF=ON
-		-DVTK_USE_SYSTEM_OGGTHEORA=ON
-		-DVTK_USE_SYSTEM_PNG=ON
-		-DVTK_USE_SYSTEM_TIFF=ON
-		-DVTK_USE_SYSTEM_TWISTED=ON
-		-DVTK_USE_SYSTEM_XDMF2=OFF
-		-DVTK_USE_SYSTEM_XDMF3=OFF
-		-DVTK_USE_SYSTEM_ZLIB=ON
-		-DVTK_USE_SYSTEM_ZOPE=ON
-		-DVTK_USE_SYSTEM_LIBRARIES=ON
-		# Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
-		-DVTK_USE_SYSTEM_DIY2=OFF
-		-DVTK_USE_GL2PS=ON
-		-DVTK_USE_LARGE_DATA=ON
-		-DVTK_USE_PARALLEL=ON
-		-DVTK_EXTRA_COMPILER_WARNINGS=ON
-		-DVTK_Group_StandAlone=ON
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=$(usex test)
-		-DVTK_BUILD_ALL_MODULES=$(usex all-modules)
-		-DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
-		-DVTK_Group_Imaging=$(usex imaging)
-		-DVTK_Group_MPI=$(usex mpi)
-		-DVTK_Group_Rendering=$(usex rendering)
-		-DVTK_Group_Tk=$(usex tk)
-		-DVTK_Group_Views=$(usex views)
-		-DVTK_Group_Web=$(usex web)
-		-DVTK_WWW_DIR="${ED%/}/${MY_HTDOCSDIR}"
-		-DVTK_WRAP_JAVA=$(usex java)
-		-DVTK_WRAP_PYTHON=$(usex python)
-		-DVTK_WRAP_PYTHON_SIP=$(usex python)
-		-DVTK_WRAP_TCL=$(usex tcl)
-		-DVTK_USE_BOOST=$(usex boost)
-		-DUSE_VTK_USE_BOOST=$(usex boost)
-		-DModule_vtkInfovisBoost=$(usex boost)
-		-DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
-		-DVTK_USE_ODBC=$(usex odbc)
-		-DModule_vtkIOODBC=$(usex odbc)
-		-DVTK_USE_OFFSCREEN=$(usex offscreen)
-		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-		-DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
-		-DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
-		-DModule_vtkFiltersStatisticsGnuR=$(usex R)
-		-DVTK_USE_X=$(usex X)
-	# IO
-		-DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
-		-DModule_vtkIOGDAL=$(usex gdal)
-		-DModule_vtkIOGeoJSON=$(usex json)
-		-DModule_vtkIOXdmf2=$(usex xdmf2)
-	# Apple stuff, does it really work?
-		-DVTK_USE_COCOA=$(usex aqua)
-	)
-
-	if use examples || use test; then
-		mycmakeargs+=( -DBUILD_TESTING=ON )
-	fi
-
-	if use java; then
-		local javacargs=$(java-pkg_javac-args)
-		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
-	fi
-
-	if use kaapi; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Kaapi" )
-	elif use tbb; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
-	else
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
-			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DPYTHON_LIBRARY="$(python_get_library_path)"
-			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
-			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
-			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
-			-DVTK_USE_SYSTEM_SIX=ON
-		)
-	fi
-
-	if use qt5; then
-		mycmakeargs+=(
-			-DVTK_USE_QVTK=ON
-			-DVTK_USE_QVTK_OPENGL=ON
-			-DVTK_USE_QVTK_QTOPENGL=ON
-			-DQT_WRAP_CPP=ON
-			-DQT_WRAP_UI=ON
-			-DVTK_INSTALL_QT_DIR="$(qt5_get_libdir)/qt5/plugins/designer"
-			-DDESIRED_QT_VERSION=5
-			-DVTK_QT_VERSION=5
-			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
-			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
-			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
-			-DVTK_Group_Qt:BOOL=ON
-		)
-	fi
-
-	if use R; then
-		mycmakeargs+=(
-			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
-			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
-		)
-	fi
-
-	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
-
-	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-	if use mpi; then
-		export CC=mpicc
-		export CXX=mpicxx
-		export FC=mpif90
-		export F90=mpif90
-		export F77=mpif77
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local tcllib
-	ln -sf "${BUILD_DIR}"/lib  "${BUILD_DIR}"/lib/Release || die
-	for tcllib in "${BUILD_DIR}"/lib/lib*TCL*so; do
-		ln -sf ${tcllib##*/}.1 "${tcllib/.so/-${SPV}.so}" || die
-	done
-	export LD_LIBRARY_PATH="${BUILD_DIR}"/lib:"${JAVA_HOME}"/jre/lib/${ARCH}/:"${JAVA_HOME}"/jre/lib/${ARCH}/xawt/
-	virtx cmake-utils_src_test
-}
-
-src_install() {
-	use web && webapp_src_preinst
-
-	cmake-utils_src_install
-
-	use java && java-pkg_regjar "${ED%/}"/usr/$(get_libdir)/${PN}.jar
-
-	if use tcl; then
-		# install Tcl docs
-		docinto vtk_tcl
-		dodoc Wrapping/Tcl/README
-		docinto .
-	fi
-
-	# install examples
-	if use examples; then
-		einfo "Installing examples"
-		mv -v {E,e}xamples || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	#install big docs
-	if use doc; then
-		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
-		einfo "Installing API docs. This may take some time."
-		dodoc -r "${WORKDIR}"/html
-	fi
-
-	# environment
-	cat >> "${T}"/40${PN} <<- EOF || die
-		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
-		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
-		VTKHOME=${EPREFIX}/usr
-		EOF
-	doenvd "${T}"/40${PN}
-
-	use web && webapp_src_install
-}
-
-# webapp.eclass exports these but we want it optional #534036
-pkg_postinst() {
-	use web && webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	use web && webapp_pkg_prerm
-}
diff --git a/sci-libs/vtk/vtk-8.1.0-r1.ebuild b/sci-libs/vtk/vtk-8.1.0-r1.ebuild
deleted file mode 100644
index 6524c600faba..000000000000
--- a/sci-libs/vtk/vtk-8.1.0-r1.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-WEBAPP_OPTIONAL=yes
-WEBAPP_MANUAL_SLOT=yes
-
-inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx webapp
-
-# Short package version
-SPV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
-	https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
-	doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
-	examples? (
-		https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
-		https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
-	)"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="
-	all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi
-	mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl
-	video_cards_nvidia views web R +X xdmf2"
-
-REQUIRED_USE="
-	all-modules? ( python xdmf2 boost )
-	java? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tcl? ( rendering )
-	examples? ( python )
-	tk? ( tcl )
-	web? ( python )
-	^^ ( X aqua offscreen )"
-
-RDEPEND="
-	app-arch/lz4
-	dev-libs/expat
-	dev-libs/jsoncpp:=
-	dev-libs/libxml2:2
-	>=media-libs/freetype-2.5.4
-	>=media-libs/libharu-2.3.0-r2
-	media-libs/libpng:0=
-	media-libs/libtheora
-	media-libs/mesa
-	media-libs/tiff:0
-	sci-libs/exodusii
-	sci-libs/hdf5:=
-	sci-libs/netcdf-cxx:3
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	boost? ( dev-libs/boost:=[mpi?] )
-	examples? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	ffmpeg? ( virtual/ffmpeg )
-	gdal? ( sci-libs/gdal )
-	java? ( >=virtual/jdk-1.7:* )
-	kaapi? ( <sci-libs/xkaapi-3 )
-	mpi? (
-		virtual/mpi[cxx,romio]
-		python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-	)
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	offscreen? ( media-libs/mesa[osmesa] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/sip[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/designer:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsql:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtx11extras:5
-		python? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-	)
-	R? ( dev-lang/R )
-	tbb? ( dev-cpp/tbb )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	web? (
-		${WEBAPP_DEPEND}
-		dev-python/autobahn[${PYTHON_USEDEP}]
-		dev-python/constantly[${PYTHON_USEDEP}]
-		dev-python/hyperlink[${PYTHON_USEDEP}]
-		dev-python/incremental[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		dev-python/txaio[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}]
-	)
-	xdmf2? ( sci-libs/xdmf2 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/VTK-${PV}
-
-RESTRICT="test"
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	use web && webapp_pkg_setup
-}
-
-src_prepare() {
-	local x
-	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
-	for x in constantly expat freetype hdf5 hyperlink incremental jpeg jsoncpp libharu libxml2 lz4 netcdf oggtheora png tiff Twisted txaio zlib ZopeInterface; do
-		ebegin "Dropping bundled ${x}"
-		rm -r ThirdParty/${x}/vtk${x} || die
-		eend $?
-	done
-	rm -r \
-		ThirdParty/AutobahnPython/vtkAutobahn \
-		|| die
-
-	if use doc; then
-		einfo "Removing .md5 files from documents."
-		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
-		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
-			-i Utilities/Doxygen/CMakeLists.txt || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# general configuration
-	local mycmakeargs=(
-		-Wno-dev
-		-DVTK_DIR="${S}"
-		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
-		-DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
-		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
-		-DBUILD_SHARED_LIBS=ON
-		-DVTK_USE_SYSTEM_AUTOBAHN=ON
-		-DVTK_USE_SYSTEM_EXPAT=ON
-		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_FreeType=ON
-		# Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
-		-DVTK_USE_SYSTEM_GL2PS=OFF
-		-DVTK_USE_SYSTEM_HDF5=ON
-		-DVTK_USE_SYSTEM_JPEG=ON
-		-DVTK_USE_SYSTEM_LIBPROJ4=OFF
-		-DVTK_USE_SYSTEM_LIBXML2=ON
-		-DVTK_USE_SYSTEM_LibXml2=ON
-		-DVTK_USE_SYSTEM_NETCDF=ON
-		-DVTK_USE_SYSTEM_OGGTHEORA=ON
-		-DVTK_USE_SYSTEM_PNG=ON
-		-DVTK_USE_SYSTEM_TIFF=ON
-		-DVTK_USE_SYSTEM_TWISTED=ON
-		-DVTK_USE_SYSTEM_XDMF2=OFF
-		-DVTK_USE_SYSTEM_XDMF3=OFF
-		-DVTK_USE_SYSTEM_ZLIB=ON
-		-DVTK_USE_SYSTEM_ZOPE=ON
-		-DVTK_USE_SYSTEM_LIBRARIES=ON
-		# Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
-		-DVTK_USE_SYSTEM_DIY2=OFF
-		-DVTK_USE_GL2PS=ON
-		-DVTK_USE_LARGE_DATA=ON
-		-DVTK_USE_PARALLEL=ON
-		-DVTK_EXTRA_COMPILER_WARNINGS=ON
-		-DVTK_Group_StandAlone=ON
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
-		-DVTK_BUILD_ALL_MODULES=$(usex all-modules)
-		-DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
-		-DVTK_Group_Imaging=$(usex imaging)
-		-DVTK_Group_MPI=$(usex mpi)
-		-DVTK_Group_Rendering=$(usex rendering)
-		-DVTK_Group_Tk=$(usex tk)
-		-DVTK_Group_Views=$(usex views)
-		-DVTK_Group_Web=$(usex web)
-		-DVTK_WWW_DIR="${ED%/}/${MY_HTDOCSDIR}"
-		-DVTK_WRAP_JAVA=$(usex java)
-		-DVTK_WRAP_PYTHON=$(usex python)
-		-DVTK_WRAP_PYTHON_SIP=$(usex python)
-		-DVTK_WRAP_TCL=$(usex tcl)
-		-DVTK_USE_BOOST=$(usex boost)
-		-DUSE_VTK_USE_BOOST=$(usex boost)
-		-DModule_vtkInfovisBoost=$(usex boost)
-		-DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
-		-DVTK_USE_ODBC=$(usex odbc)
-		-DModule_vtkIOODBC=$(usex odbc)
-		-DVTK_USE_OFFSCREEN=$(usex offscreen)
-		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-		-DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
-		-DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
-		-DModule_vtkFiltersStatisticsGnuR=$(usex R)
-		-DVTK_USE_X=$(usex X)
-	# IO
-		-DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
-		-DModule_vtkIOGDAL=$(usex gdal)
-		-DModule_vtkIOGeoJSON=$(usex json)
-		-DModule_vtkIOXdmf2=$(usex xdmf2)
-		-DBUILD_TESTING=$(usex examples)
-	# Apple stuff, does it really work?
-		-DVTK_USE_COCOA=$(usex aqua)
-	)
-
-	if use java; then
-		local javacargs=$(java-pkg_javac-args)
-		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
-	fi
-
-	if use kaapi; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Kaapi" )
-	elif use tbb; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
-	else
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
-			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DPYTHON_LIBRARY="$(python_get_library_path)"
-			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
-			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
-			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
-			-DVTK_USE_SYSTEM_SIX=ON
-		)
-	fi
-
-	if use qt5; then
-		mycmakeargs+=(
-			-DVTK_USE_QVTK=ON
-			-DVTK_USE_QVTK_OPENGL=ON
-			-DVTK_USE_QVTK_QTOPENGL=ON
-			-DQT_WRAP_CPP=ON
-			-DQT_WRAP_UI=ON
-			-DVTK_INSTALL_QT_DIR="$(qt5_get_libdir)/qt5/plugins/designer"
-			-DDESIRED_QT_VERSION=5
-			-DVTK_QT_VERSION=5
-			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
-			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
-			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
-			-DVTK_Group_Qt:BOOL=ON
-		)
-	fi
-
-	if use R; then
-		mycmakeargs+=(
-			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
-			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
-		)
-	fi
-
-	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
-
-	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-	if use mpi; then
-		export CC=mpicc
-		export CXX=mpicxx
-		export FC=mpif90
-		export F90=mpif90
-		export F77=mpif77
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use web && webapp_src_preinst
-
-	cmake-utils_src_install
-
-	use java && java-pkg_regjar "${ED%/}"/usr/$(get_libdir)/${PN}.jar
-
-	# Stop web page images from being compressed
-	use doc && docompress -x /usr/share/doc/${PF}/doxygen
-
-	if use tcl; then
-		# install Tcl docs
-		docinto vtk_tcl
-		dodoc Wrapping/Tcl/README
-		docinto .
-	fi
-
-	# install examples
-	if use examples; then
-		einfo "Installing examples"
-		mv -v {E,e}xamples || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# environment
-	cat >> "${T}"/40${PN} <<- EOF || die
-		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
-		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
-		VTKHOME=${EPREFIX}/usr
-		EOF
-	doenvd "${T}"/40${PN}
-
-	use web && webapp_src_install
-}
-
-# webapp.eclass exports these but we want it optional #534036
-pkg_postinst() {
-	use web && webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	use web && webapp_pkg_prerm
-}
diff --git a/sci-libs/vtk/vtk-8.1.0-r2.ebuild b/sci-libs/vtk/vtk-8.1.0-r2.ebuild
deleted file mode 100644
index 7cad42c1018f..000000000000
--- a/sci-libs/vtk/vtk-8.1.0-r2.ebuild
+++ /dev/null
@@ -1,332 +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_5,3_6} )
-WEBAPP_OPTIONAL=yes
-WEBAPP_MANUAL_SLOT=yes
-
-inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx webapp
-
-# Short package version
-SPV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
-	https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
-	doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
-	examples? (
-		https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
-		https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
-	)"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="
-	all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi
-	mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl
-	video_cards_nvidia views web R +X xdmf2"
-
-REQUIRED_USE="
-	all-modules? ( python xdmf2 boost )
-	java? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tcl? ( rendering )
-	examples? ( python )
-	tk? ( tcl )
-	web? ( python )
-	^^ ( X aqua offscreen )"
-
-RDEPEND="
-	app-arch/lz4
-	dev-libs/expat
-	dev-libs/jsoncpp:=
-	dev-libs/libxml2:2
-	>=media-libs/freetype-2.5.4
-	>=media-libs/libharu-2.3.0-r2
-	media-libs/libpng:0=
-	media-libs/libtheora
-	media-libs/mesa
-	media-libs/tiff:0
-	sci-libs/exodusii
-	sci-libs/hdf5:=
-	sci-libs/netcdf-cxx:3
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	boost? ( dev-libs/boost:=[mpi?] )
-	examples? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	ffmpeg? ( virtual/ffmpeg )
-	gdal? ( sci-libs/gdal )
-	java? ( >=virtual/jdk-1.7:* )
-	kaapi? ( <sci-libs/xkaapi-3 )
-	mpi? (
-		virtual/mpi[cxx,romio]
-		python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-	)
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	offscreen? ( media-libs/mesa[osmesa] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/sip[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/designer:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsql:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtx11extras:5
-		python? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-	)
-	R? ( dev-lang/R )
-	tbb? ( dev-cpp/tbb )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	web? (
-		${WEBAPP_DEPEND}
-		dev-python/autobahn[${PYTHON_USEDEP}]
-		dev-python/constantly[${PYTHON_USEDEP}]
-		dev-python/hyperlink[${PYTHON_USEDEP}]
-		dev-python/incremental[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		dev-python/txaio[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}]
-	)
-	xdmf2? ( sci-libs/xdmf2 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/VTK-${PV}
-
-RESTRICT="test"
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	use web && webapp_pkg_setup
-}
-
-src_prepare() {
-	local x
-	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
-	for x in constantly expat freetype hdf5 hyperlink incremental jpeg jsoncpp libharu libxml2 lz4 netcdf oggtheora png tiff Twisted txaio zlib ZopeInterface; do
-		ebegin "Dropping bundled ${x}"
-		rm -r ThirdParty/${x}/vtk${x} || die
-		eend $?
-	done
-	rm -r \
-		ThirdParty/AutobahnPython/vtkAutobahn \
-		|| die
-
-	if use doc; then
-		einfo "Removing .md5 files from documents."
-		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
-		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
-			-i Utilities/Doxygen/CMakeLists.txt || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# general configuration
-	local mycmakeargs=(
-		-Wno-dev
-		-DVTK_DIR="${S}"
-		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
-		-DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
-		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
-		-DBUILD_SHARED_LIBS=ON
-		-DVTK_USE_SYSTEM_AUTOBAHN=ON
-		-DVTK_USE_SYSTEM_EXPAT=ON
-		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_FreeType=ON
-		# Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
-		-DVTK_USE_SYSTEM_GL2PS=OFF
-		-DVTK_USE_SYSTEM_HDF5=ON
-		-DVTK_USE_SYSTEM_JPEG=ON
-		-DVTK_USE_SYSTEM_LIBPROJ4=OFF
-		-DVTK_USE_SYSTEM_LIBXML2=ON
-		-DVTK_USE_SYSTEM_LibXml2=ON
-		-DVTK_USE_SYSTEM_NETCDF=ON
-		-DVTK_USE_SYSTEM_OGGTHEORA=ON
-		-DVTK_USE_SYSTEM_PNG=ON
-		-DVTK_USE_SYSTEM_TIFF=ON
-		-DVTK_USE_SYSTEM_TWISTED=ON
-		-DVTK_USE_SYSTEM_XDMF2=OFF
-		-DVTK_USE_SYSTEM_XDMF3=OFF
-		-DVTK_USE_SYSTEM_ZLIB=ON
-		-DVTK_USE_SYSTEM_ZOPE=ON
-		-DVTK_USE_SYSTEM_LIBRARIES=ON
-		# Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
-		-DVTK_USE_SYSTEM_DIY2=OFF
-		-DVTK_USE_GL2PS=ON
-		-DVTK_USE_LARGE_DATA=ON
-		-DVTK_USE_PARALLEL=ON
-		-DVTK_EXTRA_COMPILER_WARNINGS=ON
-		-DVTK_Group_StandAlone=ON
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
-		-DVTK_BUILD_ALL_MODULES=$(usex all-modules)
-		-DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
-		-DVTK_Group_Imaging=$(usex imaging)
-		-DVTK_Group_MPI=$(usex mpi)
-		-DVTK_Group_Rendering=$(usex rendering)
-		-DVTK_Group_Tk=$(usex tk)
-		-DVTK_Group_Views=$(usex views)
-		-DVTK_Group_Web=$(usex web)
-		-DVTK_WWW_DIR="${ED%/}/${MY_HTDOCSDIR}"
-		-DVTK_WRAP_JAVA=$(usex java)
-		-DVTK_WRAP_PYTHON=$(usex python)
-		-DVTK_WRAP_PYTHON_SIP=$(usex python)
-		-DVTK_WRAP_TCL=$(usex tcl)
-		-DVTK_USE_BOOST=$(usex boost)
-		-DUSE_VTK_USE_BOOST=$(usex boost)
-		-DModule_vtkInfovisBoost=$(usex boost)
-		-DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
-		-DVTK_USE_ODBC=$(usex odbc)
-		-DModule_vtkIOODBC=$(usex odbc)
-		-DVTK_USE_OFFSCREEN=$(usex offscreen)
-		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-		-DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
-		-DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
-		-DModule_vtkFiltersStatisticsGnuR=$(usex R)
-		-DVTK_USE_X=$(usex X)
-	# IO
-		-DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
-		-DModule_vtkIOGDAL=$(usex gdal)
-		-DModule_vtkIOGeoJSON=$(usex json)
-		-DModule_vtkIOXdmf2=$(usex xdmf2)
-		-DBUILD_TESTING=$(usex examples)
-	# Apple stuff, does it really work?
-		-DVTK_USE_COCOA=$(usex aqua)
-	)
-
-	if use java; then
-		local javacargs=$(java-pkg_javac-args)
-		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
-	fi
-
-	if use kaapi; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Kaapi" )
-	elif use tbb; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
-	else
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
-			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DPYTHON_LIBRARY="$(python_get_library_path)"
-			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
-			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
-			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
-			-DVTK_USE_SYSTEM_SIX=ON
-		)
-	fi
-
-	if use qt5; then
-		mycmakeargs+=(
-			-DVTK_USE_QVTK=ON
-			-DVTK_USE_QVTK_OPENGL=ON
-			-DVTK_USE_QVTK_QTOPENGL=ON
-			-DQT_WRAP_CPP=ON
-			-DQT_WRAP_UI=ON
-			-DVTK_INSTALL_QT_DIR="$(qt5_get_libdir)/qt5/plugins/designer"
-			-DDESIRED_QT_VERSION=5
-			-DVTK_QT_VERSION=5
-			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
-			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
-			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
-			-DVTK_Group_Qt:BOOL=ON
-		)
-	fi
-
-	if use R; then
-		mycmakeargs+=(
-			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
-			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
-		)
-	fi
-
-	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
-
-	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-	if use mpi; then
-		export CC=mpicc
-		export CXX=mpicxx
-		export FC=mpif90
-		export F90=mpif90
-		export F77=mpif77
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use web && webapp_src_preinst
-
-	cmake-utils_src_install
-
-	use java && java-pkg_regjar "${ED%/}"/usr/$(get_libdir)/${PN}.jar
-
-	# Stop web page images from being compressed
-	use doc && docompress -x /usr/share/doc/${PF}/doxygen
-
-	if use tcl; then
-		# install Tcl docs
-		docinto vtk_tcl
-		dodoc Wrapping/Tcl/README
-		docinto .
-	fi
-
-	# install examples
-	if use examples; then
-		einfo "Installing examples"
-		mv -v {E,e}xamples || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# environment
-	cat >> "${T}"/40${PN} <<- EOF || die
-		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
-		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
-		VTKHOME=${EPREFIX}/usr
-		EOF
-	doenvd "${T}"/40${PN}
-
-	use web && webapp_src_install
-}
-
-# webapp.eclass exports these but we want it optional #534036
-pkg_postinst() {
-	use web && webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	use web && webapp_pkg_prerm
-}
diff --git a/sci-libs/vtk/vtk-8.1.0.ebuild b/sci-libs/vtk/vtk-8.1.0.ebuild
deleted file mode 100644
index 6604f443bb3c..000000000000
--- a/sci-libs/vtk/vtk-8.1.0.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-WEBAPP_OPTIONAL=yes
-WEBAPP_MANUAL_SLOT=yes
-
-inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx webapp
-
-# Short package version
-SPV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
-	https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
-	doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
-	examples? (
-		https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
-		https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
-	)"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="
-	all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi
-	mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl
-	video_cards_nvidia views web R +X xdmf2"
-
-REQUIRED_USE="
-	all-modules? ( python xdmf2 boost )
-	java? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tcl? ( rendering )
-	examples? ( python )
-	tk? ( tcl )
-	web? ( python )
-	^^ ( X aqua offscreen )"
-
-RDEPEND="
-	app-arch/lz4
-	dev-libs/expat
-	dev-libs/jsoncpp:=
-	dev-libs/libxml2:2
-	>=media-libs/freetype-2.5.4
-	>=media-libs/libharu-2.3.0-r2
-	media-libs/libpng:0=
-	media-libs/libtheora
-	media-libs/mesa
-	media-libs/tiff:0
-	sci-libs/exodusii
-	sci-libs/hdf5:=
-	sci-libs/netcdf-cxx:3
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	boost? ( dev-libs/boost:=[mpi?] )
-	examples? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	ffmpeg? ( virtual/ffmpeg )
-	gdal? ( sci-libs/gdal )
-	java? ( >=virtual/jdk-1.7:* )
-	kaapi? ( <sci-libs/xkaapi-3 )
-	mpi? (
-		virtual/mpi[cxx,romio]
-		python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-	)
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	offscreen? ( media-libs/mesa[osmesa] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/sip[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/designer:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsql:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtx11extras:5
-		python? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-	)
-	R? ( dev-lang/R )
-	tbb? ( dev-cpp/tbb )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	web? (
-		${WEBAPP_DEPEND}
-		dev-python/autobahn[${PYTHON_USEDEP}]
-		dev-python/constantly[${PYTHON_USEDEP}]
-		dev-python/hyperlink[${PYTHON_USEDEP}]
-		dev-python/incremental[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		dev-python/txaio[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}]
-	)
-	xdmf2? ( sci-libs/xdmf2 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/VTK-${PV}
-
-RESTRICT="test"
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	use web && webapp_pkg_setup
-}
-
-src_prepare() {
-	local x
-	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
-	for x in constantly expat freetype hdf5 hyperlink incremental jpeg jsoncpp libharu libxml2 lz4 netcdf oggtheora png tiff Twisted txaio zlib ZopeInterface; do
-		ebegin "Dropping bundled ${x}"
-		rm -r ThirdParty/${x}/vtk${x} || die
-		eend $?
-	done
-	rm -r \
-		ThirdParty/AutobahnPython/vtkAutobahn \
-		|| die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# general configuration
-	local mycmakeargs=(
-		-Wno-dev
-		-DVTK_DIR="${S}"
-		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
-		-DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
-		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
-		-DBUILD_SHARED_LIBS=ON
-		-DVTK_USE_SYSTEM_AUTOBAHN=ON
-		-DVTK_USE_SYSTEM_EXPAT=ON
-		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_FreeType=ON
-		# Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
-		-DVTK_USE_SYSTEM_GL2PS=OFF
-		-DVTK_USE_SYSTEM_HDF5=ON
-		-DVTK_USE_SYSTEM_JPEG=ON
-		-DVTK_USE_SYSTEM_LIBPROJ4=OFF
-		-DVTK_USE_SYSTEM_LIBXML2=ON
-		-DVTK_USE_SYSTEM_LibXml2=ON
-		-DVTK_USE_SYSTEM_NETCDF=ON
-		-DVTK_USE_SYSTEM_OGGTHEORA=ON
-		-DVTK_USE_SYSTEM_PNG=ON
-		-DVTK_USE_SYSTEM_TIFF=ON
-		-DVTK_USE_SYSTEM_TWISTED=ON
-		-DVTK_USE_SYSTEM_XDMF2=ON
-		-DVTK_USE_SYSTEM_XDMF3=OFF
-		-DVTK_USE_SYSTEM_ZLIB=ON
-		-DVTK_USE_SYSTEM_ZOPE=ON
-		-DVTK_USE_SYSTEM_LIBRARIES=ON
-		# Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
-		-DVTK_USE_SYSTEM_DIY2=OFF
-		-DVTK_USE_GL2PS=ON
-		-DVTK_USE_LARGE_DATA=ON
-		-DVTK_USE_PARALLEL=ON
-		-DVTK_EXTRA_COMPILER_WARNINGS=ON
-		-DVTK_Group_StandAlone=ON
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
-		-DVTK_BUILD_ALL_MODULES=$(usex all-modules)
-		-DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
-		-DVTK_Group_Imaging=$(usex imaging)
-		-DVTK_Group_MPI=$(usex mpi)
-		-DVTK_Group_Rendering=$(usex rendering)
-		-DVTK_Group_Tk=$(usex tk)
-		-DVTK_Group_Views=$(usex views)
-		-DVTK_Group_Web=$(usex web)
-		-DVTK_WWW_DIR="${ED%/}/${MY_HTDOCSDIR}"
-		-DVTK_WRAP_JAVA=$(usex java)
-		-DVTK_WRAP_PYTHON=$(usex python)
-		-DVTK_WRAP_PYTHON_SIP=$(usex python)
-		-DVTK_WRAP_TCL=$(usex tcl)
-		-DVTK_USE_BOOST=$(usex boost)
-		-DUSE_VTK_USE_BOOST=$(usex boost)
-		-DModule_vtkInfovisBoost=$(usex boost)
-		-DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
-		-DVTK_USE_ODBC=$(usex odbc)
-		-DModule_vtkIOODBC=$(usex odbc)
-		-DVTK_USE_OFFSCREEN=$(usex offscreen)
-		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-		-DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
-		-DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
-		-DModule_vtkFiltersStatisticsGnuR=$(usex R)
-		-DVTK_USE_X=$(usex X)
-	# IO
-		-DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
-		-DModule_vtkIOGDAL=$(usex gdal)
-		-DModule_vtkIOGeoJSON=$(usex json)
-		-DModule_vtkIOXdmf2=$(usex xdmf2)
-		-DBUILD_TESTING=$(usex examples)
-	# Apple stuff, does it really work?
-		-DVTK_USE_COCOA=$(usex aqua)
-	)
-
-	if use java; then
-		local javacargs=$(java-pkg_javac-args)
-		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
-	fi
-
-	if use kaapi; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Kaapi" )
-	elif use tbb; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
-	else
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
-			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DPYTHON_LIBRARY="$(python_get_library_path)"
-			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
-			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
-			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
-			-DVTK_USE_SYSTEM_SIX=ON
-		)
-	fi
-
-	if use qt5; then
-		mycmakeargs+=(
-			-DVTK_USE_QVTK=ON
-			-DVTK_USE_QVTK_OPENGL=ON
-			-DVTK_USE_QVTK_QTOPENGL=ON
-			-DQT_WRAP_CPP=ON
-			-DQT_WRAP_UI=ON
-			-DVTK_INSTALL_QT_DIR="$(qt5_get_libdir)/qt5/plugins/designer"
-			-DDESIRED_QT_VERSION=5
-			-DVTK_QT_VERSION=5
-			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
-			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
-			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
-			-DVTK_Group_Qt:BOOL=ON
-		)
-	fi
-
-	if use R; then
-		mycmakeargs+=(
-			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
-			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
-		)
-	fi
-
-	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
-
-	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-	if use mpi; then
-		export CC=mpicc
-		export CXX=mpicxx
-		export FC=mpif90
-		export F90=mpif90
-		export F77=mpif77
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local tcllib
-	ln -sf "${BUILD_DIR}"/lib  "${BUILD_DIR}"/lib/Release || die
-	for tcllib in "${BUILD_DIR}"/lib/lib*TCL*so; do
-		ln -sf ${tcllib##*/}.1 "${tcllib/.so/-${SPV}.so}" || die
-	done
-	export LD_LIBRARY_PATH="${BUILD_DIR}"/lib:"${JAVA_HOME}"/jre/lib/${ARCH}/:"${JAVA_HOME}"/jre/lib/${ARCH}/xawt/
-	virtx cmake-utils_src_test
-}
-
-src_install() {
-	use web && webapp_src_preinst
-
-	cmake-utils_src_install
-
-	use java && java-pkg_regjar "${ED%/}"/usr/$(get_libdir)/${PN}.jar
-
-	if use tcl; then
-		# install Tcl docs
-		docinto vtk_tcl
-		dodoc Wrapping/Tcl/README
-		docinto .
-	fi
-
-	# install examples
-	if use examples; then
-		einfo "Installing examples"
-		mv -v {E,e}xamples || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	#install big docs
-	if use doc; then
-		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
-		einfo "Installing API docs. This may take some time."
-		dodoc -r "${WORKDIR}"/html
-	fi
-
-	# environment
-	cat >> "${T}"/40${PN} <<- EOF || die
-		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
-		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
-		VTKHOME=${EPREFIX}/usr
-		EOF
-	doenvd "${T}"/40${PN}
-
-	use web && webapp_src_install
-}
-
-# webapp.eclass exports these but we want it optional #534036
-pkg_postinst() {
-	use web && webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	use web && webapp_pkg_prerm
-}
diff --git a/sci-libs/vtkdata/Manifest b/sci-libs/vtkdata/Manifest
index b9c042c46e7a..d416f78c1d79 100644
--- a/sci-libs/vtkdata/Manifest
+++ b/sci-libs/vtkdata/Manifest
@@ -1,5 +1,3 @@
 DIST VTKData-6.1.0.tar.gz 94452190 BLAKE2B 55e1af454f1c54c0a182552c41e08549781532b510bf29cb28fcd12510c1cef2c4e09274507d658b700f22d0da1961d7b4e6dc289d9ee39c6b1e1fac348ba153 SHA512 4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65
-DIST vtkdata-6.0.0.tar.gz 99106820 BLAKE2B 977d61f4d902af810db78b1c1a63cedbfd1bae9a23b4c85f011fc0826cf3f30c64b9458b5349358cde454a14decdcceea62ba6dfcfe672e32c2f8c78a2ad41e3 SHA512 b76eb8389047de1b74c585b8a3064d499758886f8e44063cb0d73fdc29b1a7cfbb1926bca869ccfbfaada3cffbb74a78a01fa081fd230002af7c4d79aa8a90af
-EBUILD vtkdata-6.0.0.ebuild 521 BLAKE2B 1bf40720161d151eb26f415565e4f311626a87d7d477b6762f9ba09e047540e40945ad1254f30ba9ea6138ce8b3483aba0e5978f9ad40b8ddd4b5f5328464f1f SHA512 5e4ce75c254122d75ebdf7ba7a599086cc55f7a078071265ac2bbaed61d27971179acc3cd003a3bce0a2ef1ade53ca6580ce95f2c00b93e9d8a215e5f37355ed
 EBUILD vtkdata-6.1.0.ebuild 542 BLAKE2B cd9321447c214da62fa6a81a98e8a55d1eee94a88336d88abfa0a0f66565df3de3abdea11dbee8118d273d985098e7bcffc1b704d0c377a7a20060df7a4c269e SHA512 8ea22e90926556f19c95aa684c2aebc053dc155f4c81d813341f11bc0fac2317138de84ee01788f4f151a1cf04cba58eb1fdd682f2dbb6d23e69c49f1aa8bca0
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/vtkdata/vtkdata-6.0.0.ebuild b/sci-libs/vtkdata/vtkdata-6.0.0.ebuild
deleted file mode 100644
index 0ecf958ee161..000000000000
--- a/sci-libs/vtkdata/vtkdata-6.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="Example data file for VTK"
-HOMEPAGE="http://www.vtk.org"
-SRC_URI="http://www.vtk.org/files/release/$(get_version_component_range 1-2)/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT="binchecks strip"
-
-RDEPEND="!<sci-libs/vtk-6"
-
-S="${WORKDIR}"/VTKDATA${PV}
-
-src_install() {
-	insinto /usr/share/vtk/data
-	doins -r *
-}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 8ca02e4bcd69..468edbdc7835 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/drgeo/Manifest b/sci-mathematics/drgeo/Manifest
deleted file mode 100644
index f78b77f660e0..000000000000
--- a/sci-mathematics/drgeo/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX drgeo-1.1.0-gcc45.patch 1111 BLAKE2B 4ce022b48d3baa7fd617b560c1248d021d48e2b00491c238ec03e8c5b169a31bb271d8267ca4c818deac6cc2f45405bce1e037d5b43537fa0a467d361c701f19 SHA512 8a30d6a1e7f11194bfeb04938de594eb81bc89420102b0920f7b3e34d666a36557de5edd2cec064d7383db105c17131247c810753c7f2ee674e7f7b0b28dfa28
-DIST drgeo-1.1.0.tar.gz 1608361 BLAKE2B b7c89fb5010f7e140f891c839a0ca66fa77f47814ce15097ce7e4781faeef4d2b2269a2c5b722af0d04be76adb8b1724c252387d35d382182bc27f327143be99 SHA512 6dee654e674d76e9725ddb4c8b4374c34c93a8cd367ff827f1a8816168a85cabb6341a9b8770659e15f26d3888181b0c13e9d92ee2290df664fda55bed625f6d
-DIST drgeo-doc-1.5.tar.gz 2730242 BLAKE2B fd7b0ec0c3468a1258db47fe78476661b09d49a53d3f68314c97c60d80883a638bb7515dee02191a777eee93b90b5071ab4ecba3279949b61db05832fbb3d165 SHA512 a8010eaca8e5f8aec365317aaec277a61579f217510ffe6c0585371f139f891041388437765d6e67c3373bc87267b864f159067e142f55396a782dec9a61ff54
-EBUILD drgeo-1.1.0-r1.ebuild 1092 BLAKE2B ae9e8a404bf1c1aee434963d1b25cf5facca6fece36e4dad044ca9c550e7f749ac9bfc70762be8bea5d1974cb256b28dd07638877f302a02ceaef02c649415f7 SHA512 4a3659e64216547dc7a8c2764285184d9e68a20cd0db4cbcffa528387dd8b683d34f641a12e37da00e88ff3e047927a838849c3998f9f93b31c13eb70dcf6317
-MISC metadata.xml 766 BLAKE2B ff550db73357a02b91aaaec791aa89202e0f509e259ccdd8268c51b1de74121cb8ebcda8ea07974fb9d0461a10a6c79dafecc8a650a888991e0a00295af0bff3 SHA512 15a5dcefb8527784f027dbc70948897e80bf7be46ec93eef3f108fe2c0fb8dc49979e1c3ed100568613cb5024b11caa7d9133774d1aad497d2040906d2cccd98
diff --git a/sci-mathematics/drgeo/drgeo-1.1.0-r1.ebuild b/sci-mathematics/drgeo/drgeo-1.1.0-r1.ebuild
deleted file mode 100644
index c80f79a9a0cf..000000000000
--- a/sci-mathematics/drgeo/drgeo-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DOC="${PN}-doc-1.5"
-
-DESCRIPTION="Interactive geometry package"
-HOMEPAGE="http://www.ofset.org/drgeo"
-SRC_URI="
-	mirror://sourceforge/ofset/${P}.tar.gz
-	mirror://sourceforge/ofset/${DOC}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-libs/libxml2:2
-	dev-scheme/guile:=[deprecated]
-	gnome-base/libglade:2.0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc45.patch )
-
-src_configure() {
-	default
-	# Can't make the documentation as it depends on Hyperlatex which isn't
-	# yet in portage. Fortunately HTML is already compiled for us in the
-	# tarball and so can be installed. Just create the make install target.
-	cd "${WORKDIR}"/${DOC} || die
-	econf
-}
-
-src_install() {
-	sed -i -e "s/gnome-drgenius.png/${PN}/" \
-		-e '/^Categories=/s/Application;//' \
-		${PN}.desktop || die
-	default
-	emake -C "${WORKDIR}"/${DOC}/$(usex nls "" c) DESTDIR="${D}" install
-	doicon glade/${PN}.png
-}
diff --git a/sci-mathematics/drgeo/files/drgeo-1.1.0-gcc45.patch b/sci-mathematics/drgeo/files/drgeo-1.1.0-gcc45.patch
deleted file mode 100644
index 257cbb23d111..000000000000
--- a/sci-mathematics/drgeo/files/drgeo-1.1.0-gcc45.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Fix build with GCC 4.5, fix random SIGSEGV
-
-http://bugs.gentoo.org/show_bug.cgi?id=322211
-https://bugzilla.redhat.com/show_bug.cgi?id=454045
-
---- a/geo/drgeo_figure.h
-+++ b/geo/drgeo_figure.h
-@@ -322,4 +322,11 @@
-   gboolean showGrid;
- };
- 
-+struct
-+{
-+  drgeoPoint mouse;
-+  drgeoFigure *figure;
-+}
-+drgeoDialogData;
-+
- #endif
---- a/geo/drgeo_figure.cc
-+++ b/geo/drgeo_figure.cc
-@@ -48,13 +48,6 @@
- #include "drgeo_dialog.h"
- #include "traite.h"
- 
--extern struct
--{
--  drgeoPoint mouse;
--  drgeoFigure *figure;
--}
--drgeoDialogData;
--
- typedef struct drgeoSearchValue
- {
-   gpointer value;
-@@ -1309,7 +1302,7 @@
- gint
- drgeoFigure::preferedUndoLevel ()
- {
--  atoi (drgeoConfigGet (":undoLevel"));
-+  return atoi (drgeoConfigGet (":undoLevel"));
- }
- 
- void
---- a/geo/drgeo_dialog.cc
-+++ b/geo/drgeo_dialog.cc
-@@ -38,14 +38,6 @@
- // Used in the style dialod callback, I know it's ugly, but so easy
- static drgeoFigure *selected_figure;
- 
--struct
--{
--  drgeoPoint mouse;
--  drgeoFigure *figure;
--}
--drgeoDialogData;
--
--
- static void drgeo_edit_dialog_cb (GtkWidget * dialog,
- 				  gint button, gpointer entry);
- 
diff --git a/sci-mathematics/drgeo/metadata.xml b/sci-mathematics/drgeo/metadata.xml
deleted file mode 100644
index 433ad5443362..000000000000
--- a/sci-mathematics/drgeo/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-mathematics@gentoo.org</email>
-		<name>Gentoo Mathematics Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Dr. Geo is a GTK2 interactive geometry software. It allows one to
-		create geometric figure plus the interactive manipulation of
-		such figure in respect with their geometric constraints. It is
-		useable in teaching situation with students from primary or
-		secondary level. It also features an integrated Scheme
-		programming language to define scripts within a figure.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">ofset</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 96d588f0ca47..d5bb9e2ec41d 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,6 +1,8 @@
 DIST gmp-ecm-6.4.3.tar.gz 944719 BLAKE2B aa07f0b6c4a4b0d3bb36b596ddbaefd259b2387fa0295a829c8e239b0edde0e1f3887bff19a6b0b67083cbec7706fa41214a21eeca8b83eb4b3f7e3cc372c113 SHA512 71ccdf3b48e96b0acad45302c87a7b17a20ad289efde212a34fb11491531b96848f1824606fdab7604874ca7d8165baba4bbfbc8424e27e8844444ad0d4f56a6
 DIST gmp-ecm-6.4.4.tar.gz 941058 BLAKE2B e83f02592a8bb86285f258fefc3e302cc5168888109e7f87835b25412baf526df58e5ea38347acfd926b90fac15b4103981a14aa7b853dba0cb0168467a223e0 SHA512 039009de2d1a22de7abed2e2b843fa2bc684ddcfc45892891a24b93ad4b3640a97d2e7612ebcbdbca8db032534c226ad77c67199772b21a6139e5fa205687097
+DIST gmp-ecm-7.0.4.tar.gz 1101899 BLAKE2B 6d52364d9c752aee66510a7f6b273559bf1b7de0032fbbeff74e229ed68fd0cd1c236b480f8fc25bcad6435740e3e22b3099c8f018912918ab8f4b33dc7b8b3c SHA512 b863b9bfd26df26c3c4243686036a69110e69ca3eec5b31d4550fe713e2fac4ce70cd1d80f0614899793aa44710531aa4a21abc0fa1b99eb17f62bd92b971350
 EBUILD gmp-ecm-6.4.3-r5.ebuild 1370 BLAKE2B ad6bf30df573f77c458268b81d63157cb66ef6b0a9b6a99a2eccef27c70caac2ba51eda8d056781712fe8aa33a65128aa742ac3ac5ba5914145882a8401345ba SHA512 6c2e766207e64b1b4837720f39f99e7efc644218178a44ad994585e2febc3c13b70a2c684a89964834ccdddac6d7f60d63543b7d5f8eba90906c85f760bfb513
 EBUILD gmp-ecm-6.4.4-r1.ebuild 1474 BLAKE2B cf8ce605ccdb5a1b26db33a01989a06b8395840a84c700f7e420e8b69edc0bf4a91e03f84ce66e2d13184b10212c1e375c273d67c043adbf57e99b7462fc93eb SHA512 da6edd387bef9b397d431ee5ac7700e651a9751fb7aff1413151bf7a7f1e312def417514c7ff536a454c5b46f7405a26ad5fdbecf743f0d667313a1da6c00e22
+EBUILD gmp-ecm-7.0.4.ebuild 1163 BLAKE2B 1b47e6286c06526166e3a4e9c612ae0fee5e36e1220d9c33dbe5d93a7d2a0fa1afad87ca5f15656c9a8663044c820b09df54d6c76775da41d53926a36983ad65 SHA512 154195e3ab1ce965e8df9862a9c0571726a3426c3e3c90861913dc1937998d8be4172a2bf7207762dd2dea30a0d17d93b9257fc19a0c553306bb6f527a135493
 EBUILD gmp-ecm-9999.ebuild 1026 BLAKE2B 26e3b858f684136f9909a00f58240359cb6f09cafb64276e1c14efc7d26f13dc9b676809c8bf8d8b3b3342847b87de2b19ba5f37096a975e870694a6fb082cd3 SHA512 2f4314e9578bdc129af573c540e2f4cb26549a5a5bbfd640bdcdd50afc55b6bd05f10486a0382be4f13d4c4fac3dc93bcffd44faddfbafcafdaaf9b64d2cc579
 MISC metadata.xml 384 BLAKE2B 168807abd87bddc88522015f01126d5ec0bde8716aa38b6e619054d39e9bb12a6ffdaa3082328ecb56c0398b498c964c8e28c818d3887919fbe3065a28673f2a SHA512 a8a7aa64869c88ac293347281a80158cbd3cc84fc9f5ca56531d3d53b33601f9baa5c4f66c93508d6763dc54779a563faa09c4a473c670a9b217610efecca25c
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild
new file mode 100644
index 000000000000..54f7a1bbd2df
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib
+
+DESCRIPTION="Elliptic Curve Method for Integer Factorization"
+HOMEPAGE="http://ecm.gforge.inria.fr/"
+SRC_URI="https://gforge.inria.fr/frs/download.php/36224/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+blas +custom-tune -openmp static-libs test"
+
+DEPEND="
+	dev-libs/gmp:0=
+	blas? ( sci-libs/gsl )
+	openmp? ( sys-devel/gcc:*[openmp] )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/ecm-${PV}
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	sed -e '/libecm_la_LIBADD/s:$: -lgmp:g' -i Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	# --enable-shellcmd is broken
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable openmp) \
+		${myconf}
+}
+
+src_compile() {
+	append-ldflags "-Wl,-z,noexecstack"
+	if use custom-tune; then
+		use amd64 && cd x86_64
+		use x86 && cd pentium4
+		emake
+	fi
+	default
+}
+
+src_install() {
+	default
+	mkdir -p "${ED}/usr/include/${PN}/"
+	cp "${S}"/*.h "${ED}/usr/include/${PN}" || die "Failed to copy headers" # needed by other apps like YAFU
+}
diff --git a/sci-mathematics/num-utils/Manifest b/sci-mathematics/num-utils/Manifest
index 637db629fd67..7f8d50ba9aa4 100644
--- a/sci-mathematics/num-utils/Manifest
+++ b/sci-mathematics/num-utils/Manifest
@@ -1,6 +1,4 @@
-DIST num-utils-0.3.tar.gz 28208 BLAKE2B 7d78c69d79b3b5ea34049eea7682c25d01d9955637571ee8f7237d82b640403b1f6787c3454ac63c9a73161e053bde37f9ff14f3a799eeaf83135ed0fd505b41 SHA512 d4133062d63477ef69fa4439600e8d48b9d4944a747e3e1913a4b51e24bf07fb20cd0863c1066b90085d64ce76bc23862e2f548861aee4d8e5d36c6ac336ab7c
 DIST num-utils-0.5.tar.gz 31845 BLAKE2B fe6620dd0cc7c0d0dc03447918b525f57e9360c5d2a44a32afe7879cf8000bbce646dc271fc821531642c209bf6b356783b09e969755eb7c7af785a8a07a2462 SHA512 6f5a2a8304a0ac3cdba342ecfd28ccd926778a5fde5eed4655f973a5c921e558f0986061ec11ba6146382f63a46b1503570576370a28a0f975e361d790f03561
 DIST num-utils_0.5-11.diff.gz 11702 BLAKE2B d0f81877b3dedbd98f89d0e7448739eb6c953cc966a2a49dfc598821802837b7ade4d6ee70586febd0e72218f042dead06bc3750616960862a63c9e8134f1bef SHA512 b461771ba1c8054d83f1aea06cd6beb92945ba929ff71df9e9c02b589c59dce2f2a19e7dab76120d48de7ae2f9e30f0271ae0b873d6e220ea195e160d4347bbf
-EBUILD num-utils-0.3.ebuild 573 BLAKE2B 77c907c9e1ddcd456f0ce62f6407a7e1f8fb145963d8f0e9d13c65553e5177fe871a3c0ac3b9a76de08ed404087d1b258018a1f9d818afbe578da411a1f24dd6 SHA512 c8ab3175da4ace29c9406e044c4a59d7208c87d8dd92dca951e50c19b82b82e7fc3052e34d03c9ef1c460b7271d425684304a8e657131c49a830dbfeb51f6125
 EBUILD num-utils-0.5-r1.ebuild 1102 BLAKE2B 2fa8a6e7aa30b889a25836e1b29ff8b2ac110064c5377dddeec18038ea7869b8517959f45687a8b15c894ee0e7019a4abc2f59b72fb9e26ff56eccc0a79cc6b8 SHA512 cb32d9c43624f37bbd5331be9076d7a2d066e2d5a50ec7341fec402fedfea87477577c1813e384cb392346d060ae32be2559286e447ad104ab6d8ac5b7f6d981
 MISC metadata.xml 269 BLAKE2B 5511cf8f01948aaca0488a6ed41ed923b130bfea9ba90d49f39bff86cfbd1e956b662d07406c76ca8e7e1d2ceb54547740e9f61a0a16041e5fcf18d713f90f03 SHA512 ecf9121172cdf04793bdbf6684060c7f15fb2a25606e53d8fc7dbc78efe24e264affa600c1ee3106ce8216b7093dff66eced3f78dd6ca7bd6ee589d1c7912cd6
diff --git a/sci-mathematics/num-utils/num-utils-0.3.ebuild b/sci-mathematics/num-utils/num-utils-0.3.ebuild
deleted file mode 100644
index 17a6d211c6a1..000000000000
--- a/sci-mathematics/num-utils/num-utils-0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A set of programs for dealing with numbers from the command line"
-SRC_URI="http://suso.suso.org/programs/num-utils/downloads/${P}.tar.gz"
-HOMEPAGE="http://suso.suso.org/programs/num-utils/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-lang/perl
-	!<sci-chemistry/gromacs-4"
-
-src_compile() {
-	emake || die
-}
-
-src_install () {
-	make ROOT="${D}" install || die
-	dodoc CHANGELOG GOALS MANIFEST README VERSION WARNING
-}
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index fb5061c15e71..a5ac00f76258 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -10,10 +10,13 @@ AUX octave-4.4.0-imagemagick-configure.patch 862 BLAKE2B 46e5b0ab1f7e2fd261b012b
 AUX octave-4.4.0-imagemagick.patch 850 BLAKE2B d6779333b449150299608f07d3d8a2fbce2dea1c9db7f1e04f9407ab570216e323795aeaa2964b32747f33e49d707fbea069e7dd4a438440eee4731771707125 SHA512 94d9743e2029f46e842a73ebb6315f85c5f6b0a71b797a0e43ac0f81abeccd8683d2cb84f858730c3ce40b3130012d659f571d4111f949494f6dd6bba7619477
 AUX octave-4.4.0-qt-5.11.patch 346 BLAKE2B 0e9d5a2701ca789abaf9b396e5716226ce786fe259ae84ab8cbdeeff80dcf871945e1eec5260c14525744559ee8258e96ca5e8543ab21cff27ac21723078435f SHA512 48fbd44cf0af2ecc391c18a4fdd5e0f6682998f5ab5aadf5b2f1740504b4bd40fa24c08449c4ee50d47d0307748ff7fd5a23870e6b643658583260de8b338130
 AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b434f98f25db214ef6b3bcfa504d316dad984e7330ed51d972e5caec69c42797f703595a39d6acab7128270313 SHA512 e2d0390e586e001182a31a840ed6a93b4fb6ce0dd581f64460dcf3947783dd4755a8bd277f4babb6328f04cf653f02ac681952610d7eb70165936a9d79998c3f
+AUX octave-5.1.0-pkgbuilddir.patch 1565 BLAKE2B 7b2968139e080aaa20b5372b400ac84c1754296767834011bcdda5258e7859c48ffaedcade17e8b23e2d23635a546c6a726061e8b4679913ff5b204a26cd0ef4 SHA512 28dcebc3a904cf048cb0568591c6c55616d40f6ca80982a232489a51ec92505dca186043ee3750d8a3f3782149ef1861332a8486466fba2898f0084adf0acb90
 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
+DIST octave-5.1.0.tar.gz 32034788 BLAKE2B d387f41f6ae826b35735fc4208d71be84076a81544f5cd0e3d5410f41a70eebb5b0b3bbf19e4344b88901869d54f2759259dc374c44a430f681d3b0c32cb02cb SHA512 a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb
 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 5190 BLAKE2B 6aeaf6fb0c50188027786ed55fd63f223a6d403ded9fa5736b0883aa0c3d443cc3147bd1fcfef6ea011e1f023057ba3fe90c29cb3e406d1f293f3a72698eefbe SHA512 726b0787936c803a03ff1669c1cdf5d29f926c13fe1c2010802829098a62502c0245ad69cad476b8d4149e7f97f2ca5c680fd553cc6708159654a61ad0434ed7
+EBUILD octave-5.1.0.ebuild 5086 BLAKE2B 96cedb79e27e8f1c846b467b28c2d62f999a9c3c16f3d9c3a9a08cd5b683ddcf8cac993cc38f4d0602b2a53d989fc0c383143eb19375d13386e3efcef4870702 SHA512 89f98419f393b8d0df576f275ec97adce10f75d815ded2ff7a89956ff5bedadac110be9c086e78d790a7d3d65a86f8c8188d223e1889a5a2d5689fc1001b82bd
 MISC metadata.xml 1199 BLAKE2B f1daa0330bdc0362c68458ce6e7145118dd8a9d1a3bcbcc76c04ccdffe700c9d6f71b5e8b7f05b5ed0154352a213ce7b5177284919362585fedb0dbd8b68cbca SHA512 aebb1728f0ca59ba83b649eea72c267c530efc0b97b12f0d7958ba8de0f482fcb37245cf93bc188c9368686e0feafc44da4a7dd97d6bab8246309945fee8f7a4
diff --git a/sci-mathematics/octave/files/octave-5.1.0-pkgbuilddir.patch b/sci-mathematics/octave/files/octave-5.1.0-pkgbuilddir.patch
new file mode 100644
index 000000000000..56a133b7f359
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-5.1.0-pkgbuilddir.patch
@@ -0,0 +1,43 @@
+Index: octave-5.1.0/scripts/pkg/private/install.m
+===================================================================
+--- octave-5.1.0.orig/scripts/pkg/private/install.m
++++ octave-5.1.0/scripts/pkg/private/install.m
+@@ -62,7 +62,14 @@ function install (files, handle_deps, pr
+     for i = 1:length (files)
+       tgz = files{i};
+ 
+-      if (exist (tgz, "file"))
++      ## The filename pointed to an uncompressed package to begin with.
++      if (exist (tgz, "dir"))
++        if (tgz(1) == '/')
++          packdir = tgz;
++        else
++          packdir = fullfile (pwd(), tgz);
++        endif
++      elseif (exist (tgz, "file"))
+         ## Create a temporary directory.
+         tmpdir = tempname ();
+         tmpdirs{end+1} = tmpdir;
+@@ -89,20 +96,12 @@ function install (files, handle_deps, pr
+         if (length (dirlist) > 3)
+           error ("bundles of packages are not allowed");
+         endif
+-      endif
+ 
+-      ## The filename pointed to an uncompressed package to begin with.
+-      if (isfolder (tgz))
+-        dirlist = {".", "..", tgz};
++        ## The two first entries of dirlist are "." and "..".
++        packdir = fullfile (tmpdir, dirlist{3});
+       endif
+ 
+       if (exist (tgz, "file") || isfolder (tgz))
+-        ## The two first entries of dirlist are "." and "..".
+-        if (exist (tgz, "file"))
+-          packdir = fullfile (tmpdir, dirlist{3});
+-        else
+-          packdir = fullfile (pwd (), dirlist{3});
+-        endif
+         packdirs{end+1} = packdir;
+ 
+         ## Make sure the package contains necessary files.
diff --git a/sci-mathematics/octave/octave-5.1.0.ebuild b/sci-mathematics/octave/octave-5.1.0.ebuild
new file mode 100644
index 000000000000..f347d4a6cfb1
--- /dev/null
+++ b/sci-mathematics/octave/octave-5.1.0.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="https://www.gnu.org/software/octave/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java libressl opengl
+	portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs X zlib"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/bzip2
+	app-text/ghostscript-gpl
+	dev-libs/libpcre:3=
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	virtual/blas
+	virtual/lapack
+	curl? ( net-misc/curl:0= )
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( sci-mathematics/glpk:0= )
+	gnuplot? ( sci-visualization/gnuplot )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-libs/qscintilla:=
+	)
+	hdf5? ( sci-libs/hdf5:0= )
+	imagemagick? (
+		!graphicsmagick? ( >=media-gfx/imagemagick-7:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	java? ( >=virtual/jre-1.6.0:* )
+	opengl? (
+		media-libs/freetype:2=
+		media-libs/fontconfig:1.0=
+		virtual/glu
+		>=x11-libs/fltk-1.3:1=[opengl,xft]
+		x11-libs/gl2ps:0=
+	)
+	ssl? (
+		 !libressl? ( dev-libs/openssl:0= )
+		 libressl? ( dev-libs/libressl:0= )
+	)
+	portaudio? ( media-libs/portaudio )
+	postscript? (
+		app-text/epstool
+		media-gfx/pstoedit
+		media-gfx/transfig
+	)
+	qhull? ( media-libs/qhull:0= )
+	qrupdate? ( sci-libs/qrupdate:0= )
+	readline? ( sys-libs/readline:0= )
+	sndfile? ( media-libs/libsndfile )
+	sparse? (
+		sci-libs/arpack:0=
+		sci-libs/camd:0=
+		sci-libs/ccolamd:0=
+		sci-libs/cholmod:0=
+		sci-libs/colamd:0=
+		sci-libs/cxsparse:0=
+		sci-libs/umfpack:0=
+	)
+	X? ( x11-libs/libX11:0= )"
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	sys-apps/texinfo
+	virtual/pkgconfig
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-plaingeneric
+		dev-texlive/texlive-metapost
+		virtual/latex-base
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+	java? ( >=virtual/jdk-1.6.0 )
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.0-texi.patch
+	"${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+	"${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch
+	"${FILESDIR}"/${PN}-4.4.0-imagemagick.patch
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+	"${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
+	"${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch
+)
+
+src_prepare() {
+	# nasty prefix hacks for fltk:1 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# unfortunate dependency on mpi from hdf5 (bug #302621)
+	use hdf5 && has_version sci-libs/hdf5[mpi] && \
+		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+
+	econf \
+		--localstatedir="${EPREFIX}/var/state/octave" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
+		--disable-64 \
+		--disable-jit \
+		--enable-shared \
+		--with-z \
+		--with-bz2 \
+		$(use_enable static-libs static) \
+		$(use_enable doc docs) \
+		$(use_enable java) \
+		$(use_enable readline) \
+		$(use_with curl) \
+		$(use_with fftw fftw3) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with X x)
+}
+
+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"
+	fi
+}
+
+src_install() {
+	default
+	if use doc; then
+		dodoc $(find doc -name '*.pdf')
+	else
+		# bug 566134, macros.texi is installed by make install if use doc
+		insinto /usr/share/${PN}/${PV}/etc
+		doins doc/interpreter/macros.texi
+	fi
+	[[ -e test/fntests.log ]] && dodoc test/fntests.log
+	use java && \
+		java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
+	echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
+	doenvd 99octave
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 1dd38bb58c05..c58fb3ea5fa1 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -7,26 +7,42 @@ AUX rstudio-1.0.44-systemd.patch 1147 BLAKE2B ca1b24c2544ff2cb6b9e7a91b4ce25eda7
 AUX rstudio-1.1.357-clang-pandoc.patch 3240 BLAKE2B bc7f55d2f2cea64643d02af314afbbd0df1d986889d0d3a2bbf6878e9f8ec7d73710c7e631bf0cbf04b4ecf4142236ef7a1dc0a073d34958a8bd0828594f605d SHA512 3a2fc154f934b4bbd92df6359dc26c27bf2f4f06b2dde572faba3c083879c8e0e98ed776701282d9f3a5cb3f4ac2416e04e6a30beedf4ffa5cbeca3a7e72421b
 AUX rstudio-1.1.453-boost-1.67.0.patch 1920 BLAKE2B d360259929a73ca6ed7b59997e34dfb2f40992ad6a25372fa2465d07c6df93838d62f5c9dd54b3b45850056bdcba24d20f84eda9480103e71feeac0b20df0a1b SHA512 250c16695c42b03d59ed690de8fc38494ac52047f5fe88b82df431082d524a396266c2b7e8c6afbf3b25e08102d99ef37b3892d62e7bc134f872718880660709
 AUX rstudio-1.1.453-core.patch 5843 BLAKE2B 9634a1d619c7e32e672d64ce90c092a9451499ffb27104a5228b4665abeffe7618f92ac04c29b6a3278c2702fe1361be43ba9eb1616acef71c42d39c68df9e65 SHA512 64e50dc812fb60ce6d8b17c6ea0eb6cfa055faa3a235d12e84ecb2691fcc90ef457d4eddc6e8029145fc3e919336fb0c91c293767c2d2f27bd542508c1e458aa
-AUX rstudio-1.1.463-boost-1.69.0_p1.patch 27177 BLAKE2B 7d902104856cff7f6f3c2eef5f5712bd86112d5f4f7149d05bced5084d4e57f27b8c67975fc6ce6f40980e8b1544c528db440142d82d81775fe773189096d4cc SHA512 3b6d53afd9233400edce3dc7cfd18cd1b1804707c22a6efbf821527d19517d1c643272e947e5550be8735bd00829cf9be800dca84bc60f91e9dded747deebae3
-AUX rstudio-1.1.463-boost-1.69.0_p2.patch 7744 BLAKE2B dd8c4f40731e5cde1d277a29f7db9068db1e5da2e329558911afc5bffa8ee80e727e674383cc3c16e7b653e62895f06782aa9505ff102086e9e3bfdb822d9a5f SHA512 ef41803eea2efd4f5e309ede41c54e77115a358065fd3d4c3a2178e6bbaedc08a619517b28672d6003cc1c9062526e3f881645dd99cba57d1de1d13c643cd391
+AUX rstudio-1.1.463-boost-1.69.0_p1.patch 18663 BLAKE2B b6431c931c97bdad30756e62510ad839c86f77e2474faace7202ef596fe6d2e06659fdd82d78135456a7ed9b343df0a309432438dcd7a87b5cde2e0b690e3be3 SHA512 2c86971f29059c22d97680cd8ccbcdab19873f28929b71079f1d3cc004ea3625ebc4644f49c0ac9fbe4726b8d60c76cbbd882e8712e76cd0c939a2a31fe6f945
+AUX rstudio-1.1.463-boost-1.69.0_p2.patch 8514 BLAKE2B efa138cc72890872670da80e688f4171f8ad3001eb3a1f8d549e6841857f97cc7ef54c02f39db9014a73dfae03f206ac6dc8c274c02c8c644f4738561f3c841c SHA512 6cbfefe675271fe131858f0753e93008a72019d24888c517b09cf37c0d944d71f5f63575eabb0d0f524419052a77f166f1b039f43fae51cd40bb82ac225716f2
+AUX rstudio-1.1.463-boost-1.69.0_p3.patch 7744 BLAKE2B dd8c4f40731e5cde1d277a29f7db9068db1e5da2e329558911afc5bffa8ee80e727e674383cc3c16e7b653e62895f06782aa9505ff102086e9e3bfdb822d9a5f SHA512 ef41803eea2efd4f5e309ede41c54e77115a358065fd3d4c3a2178e6bbaedc08a619517b28672d6003cc1c9062526e3f881645dd99cba57d1de1d13c643cd391
+AUX rstudio-1.1.463-boost-1.70.0.patch 1765 BLAKE2B 43520b4ef0c20ce33cb336d5b7fd0a2a30df74455ed1ed43dcb6d556970d08f61780c8a4ba341c5f5d4b3ae9023996f5ea76a0dad8c63fe74b535632650825f8 SHA512 7bfd9235ce0e3f45fdd4f4440c56a5172f0162fb65d4a784b792463defa8ec3013be92b16bff295e87ae01b3288f127386e0c07f0c8417fcc1f124db052eb9bf
 AUX rstudio-1.1.463-fix-ptr-int-compare.patch 595 BLAKE2B 10b7320990869c07c02e8a8cd06d41f67d0ddcbb7351fbbd2b9044144733b0b68225bc53c2aa93a98ea6715031d31346209700fbcbcb4c48809d9e3537cce435 SHA512 27fc52d4ff2a96212863eefabf3d69f4d18db259da4e366a0020c2deb4126d03208c9bf3c4877f75ccadaf5cc59da070a07380968d44942622525b1f33db90e3
+AUX rstudio-1.2.1335-boost-1.70.0_p1.patch 1771 BLAKE2B eaa29ff256b8ee79c0384075745c53999d2d4ace494c0403cfa805868638921b6b0aa48631c8399bd8f21a4ee5734c6e0f46d2abf5f5111466613fbf7eca73bc SHA512 01a105c269147e256a3a0d2f803809d215c492c22626bf8b7bd5d9b6465db584b8aaa48299a6cc4f7081dd537ffcdedae1e2c328fe9bae0e1dca844f13402586
+AUX rstudio-1.2.1335-boost-1.70.0_p2.patch 1081 BLAKE2B 19e78cfa2620335cdc2f058b84eba48f693d2cd3268813fb226641727c0f622bbe452d29bdd2be85518aaf4268306cd5e985ec5778e08f21bd802bfd5ef2eb2e SHA512 20c57a4eec8e8b333c718578caad1aca525df94090c7528f996077aab4a1a59d77a03e01d8ed2d3a77d444bebcd9744815fc168d2c3263b2f0b7646c5ebc37c0
+AUX rstudio-1.2.1335-core.patch 6336 BLAKE2B 00abd96a9d653fc6c557e9e3bd82227ead2edef5a49ae67ee0ee4ec97b5a80665c999f478516710c437a0148b9e3b372164aa5e4c50813db41de0eb667bdbd41 SHA512 7cda17801efd5afe91d9064c7c24bd285ee1c2bc2df3f2631fe68261194394adb217345be529b5a6880a93a99dd6f4f32a92d449ace30c31f6d85cbf79f039fa
+AUX rstudio-1.2.1335-fix-ptr-int-compare.patch 595 BLAKE2B 8db7be4c0be67670d60a8f096faa58b13a6dc87194d0997cf97768d8fd67e2c74b84c4de2a8f4502bbd9cf262293b8fe18f4d05428394dcc70ebc8962a969923 SHA512 2f083f036f3594af206fd71db5b761ae6a536e99e4b51264234a7d8169db252b0494da19d5e9d319817a84f6002f64ccb388bc6e0a42bf439c1365618da5626f
+AUX rstudio-1.2.1335-linker_flags.patch 505 BLAKE2B ac0ebca22f6dfcb799dd151e3c915c387dade30f86a9d335513d75c7c726c362255c745e91949ef3c1f58695d7a76a53550837c9d550113ba81d3d2d36507459 SHA512 221471a6ad720517a0b62563779ee11190f14b2f2f6d39e9e1c0acb32a03e41b9db5bd639c5336a26936d8f71ab5d88274471b00d224c6e31f2662680d6fd71c
+AUX rstudio-1.2.1335-pandoc.patch 1392 BLAKE2B 55829768d2c05c5bb3ee13da383a5f9f084c788860acf2c7be29b526aaf2ae0d2c3872490867b20efdc2b132f3672dcc218f76705bbe7091e2cbec2f0460fb44 SHA512 6da7b7aee8d90bce1ddba8818a0d4a57d65d656dca8e487c81e27e03ac7aa973066d96a4c4bf5a65bfb73d5746af71b072f8a3a86daaef62c02f367bc781841c
+AUX rstudio-1.2.1335-paths.patch 6105 BLAKE2B 249118b4ecdaa00ad7192079f3d4cc38b623fcf82e4c1df688abefcc5d0cb17561fd5f873ef57a7338fda9b792224b7a166186ad13c84e18d975a4a21d7696a5 SHA512 7af93bc2e375a8070d22e3e923fd43135e5dc8d1875a6a206b14b92a07a20ed541cc6258cb92ce18e562d7247abb60e6e7e9d3fa680b6b9e8b9c34e8d93e4b1d
+AUX rstudio-1.2.1335-prefs.patch 2221 BLAKE2B 659738473f343ed1632221d33770d6caf59c1dc2cce6ff8e15e6742e3603edabd1ebb7f2e809837855a4dbd6792ef41668adb423a2a0a7ddbe378306fadaee20 SHA512 ba2b8f9186c97f17d265e475ee7e1444a4b9796675da2ac0148bef791aca4dda9a6b597c83c580837bbb55c53ea3f61871cba6b5bc60395c6a59e2778da3432f
+AUX rstudio-1.2.1335-qtsingleapplication.patch 2080 BLAKE2B 3e2c1b5df1c030a0d3f9adb01ad469a7e4032248eca156644aa74fdbf1a4584fd92185c9f3e38cb8ee8afdfd556f40642995702719b4d69fe9342f9e4de85dda SHA512 6b03194d47c7f7a39b13ccf93d02bb154e85b5d46777fbf5306e94da13f22fc83bf91bd923a58dfc9bceda517cda81673deb0f0a7b087d501b82a961174bc9cc
 AUX rstudio-server.conf 1337 BLAKE2B a9a85c76a1c7c5f32f55606c6e3c9b72662dbd25e4b005f9702ed301afc21425906faf06fca91c18328524c53437aee7c9c4aee26cf293cdc72375e91ec7f701 SHA512 f166f1aa4bd370fcfcb44c5694d4e6af8bc64c5f43671e0c1def10c555d248bebf54199097f37d628a083c65913f522b7b44c3bd6a1227c011cf25eed1dba4a6
 AUX rstudio-server.initd 377 BLAKE2B 4f49b9ae2a81cd60565f79f121d60f5531746febd1f6f68cc93863985bd9af28d4ef04f647bd1b492ca69273724c282bcaedcfb5d08b8f2ac237ddb6f5baa438 SHA512 828a485338088d129c57debec6557ad35db5b042c61489ae4341717ce2218bec59a873541c270f964bb9c708b75896f1a3e2e64a4245a1713979d3bd42c9d5c8
 AUX rstudio-server.service.in 161 BLAKE2B 0be9cb83304063c9123c6fa13b7751b2f848adde282fc586acccfa4110f902e4de9962211ca0c871f66f3563319fe195c9f230daa4d4e429357ff74701e4d2d7 SHA512 bcf1f30e460dd5f0562b20489ca5544c6bcfbfb0ee1c636c4365df433e97e02e9e3b233e4159a0c71ad6d319f34f93c22b8fbf6b36463e29f22df2acd71da173
 DIST chromedriver-linux 19303552 BLAKE2B 610396fd74f2adc4c249ca971a53a6dd4ab06145d0b37d59adf66180dfada52192b20203bf3d992c270bd4f787df5c85511ca325aed06cbd9318add3eccfde30 SHA512 18774ede961dec222058dd0e3f128d63732cd444ee310136b44d5bf508a4f2f2c164a2c8d195d80bce8b5fb6303559e167f82f384e4a58e30f48b151a4206ee8
 DIST core-dictionaries.zip 876339 BLAKE2B f29afcbf5a7f8ec635e5a5b248d978af286d18488f54c9a09a2b95fde19b796e4473e5846402a46dd24b71c6e4167512539aaa32ab6d99713d500a80aaf46796 SHA512 9c5830cc9fed575e223f1c61f02e48c5aea6801bb0cd2586f02437c17fdffdb1d36c396d5a8ecbe02ba01196e73458304345b1f6b92c052bc7a7d05961fac2c9
 DIST gin-1.5.zip 1055663 BLAKE2B 11b86245d54967f0c76f22f7460fb752c410db3c59a019bb538a48fd0de7e87552f2f5bb9ce604e6ed508136a6a2b0814f061161579429daae8ca55b1a448114 SHA512 3f6649565f9600daaca6ddf3fb431925b5a1ce1ada38e6389de64cef617abba9d3f49c555d0a20053fb06f17ccbe4e1141b39966fbe4b2975d7b120377504897
+DIST gin-2.1.2.zip 1341053 BLAKE2B 515338ba50ba2183c101b42183e42ebf15613aae8751a0dcedb4b047de4ca8fab85eb240f5f0c92955441dbb87e80b3edbdae8d83f1e74f74c7de067d18cf108 SHA512 03407b6318ffb0dd504ce520649ed90e845f13fbdbd0bfb4d7e3b127842f1735093e39674077c3a04a11d434aefdc3a734652c3f85e8ab00ff37ae760ccb8dbb
 DIST gwt-2.7.0.zip 108818328 BLAKE2B 9af969f3f2577be041fcfb58f228fab4b5479fa0da5ff054ab0a59cad751590a1b4ae8d7fabc8a50e3b0e5d7eb9b2896c485d929421f75e6a2f6513480438a31 SHA512 a1eed5cc25c888cf81d4f22b1f9494d5d8567b911f7aeb1d164a6359120543668280afe1a3ffc9ed87b139c7db67fbcaaabde2066e3279909d7cd6fc22eaf499
+DIST gwt-2.8.1.zip 95650299 BLAKE2B 3853d50d1346e313903b6f0c4b8405ce9e896e51652483e5c7e9d711daa213e1341c71765b4a3fb061b58f90d49420245963a0480db8b71fe7aed6cd43782c14 SHA512 feeb00cb0413c2703dfd6931f57ba669813bd65f814715f2c04dd6dc69e885a8048337272333d7504c48e9fa52cdab699f854ee13211228ab142a1f458ee33ae
 DIST packrat-0.98.1000.tar.gz 97677 BLAKE2B 282fe33dc5ba366ceea05a222ae2d018bc3ad8f35fad73c585a3d4901c3287e6902277a9c7ca087854f3944bd85ff1b1d1f02869ece686b10f946e2f1cb1296c SHA512 2290c768ecf27a037e73c3f8336b9fd71c68ff19d071b4a8fbc469550d29007cacacdb75f854f73b5db2139a5104f129b85a3612e2ee47bd6118ee13f7d103a6
 DIST rmarkdown-0.98.1000.tar.gz 1423820 BLAKE2B eac8c9cf438c9b44ddfe954602dd67a83764b0c988b3ba571877c986b0d5d237059ed6643a86bb404428857ec8c346bfecd12f7cd15cde301cb0ce331f842b7f SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852
 DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 BLAKE2B 1f3f9fe71d7b50ab5108dfdbd3cc0b882bcc935ee58e8a9145b07a18bb86c39bc45e321a13add24df99492bc30548df716775c339bcbf4efc2bfe158299ae55a SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade
 DIST rstudio-1.1.383.tar.gz 20196702 BLAKE2B 5164230a92618e4252269ad0016b200294d1e7fa502cc49aa694486cda098ee7ffc65e6c74a87d891d0532f5cc15d1552aa86d04047d07b4f275cbc4d2758647 SHA512 3f637f9bce2c1ad1a4ed3e74287da722190a4e12b0cace6ffcca271977d49dcecca9365f2064366aad94e87851593cab83fa9361e9a9222a9f67fe9451f31ed2
 DIST rstudio-1.1.453.tar.gz 20200360 BLAKE2B 560b89e53b04356ecf9a02dd8a7e72ad8d6c30bf406fbe7e22a82cc6d33d40e84bececf5ecda9cf086360b2bd2fa64d6b33c2dd675ef5f605f9e825d7ca2dc84 SHA512 f2be0866f645007a6f80959109928820c89480057c3660d23e790591797d4f4c371733f49290dae9c81bfc2715821528e2a105e7a66d4d9ffbfc7ee2a596976c
 DIST rstudio-1.1.463.tar.gz 20203779 BLAKE2B 97f879539cbb7051af362a8469795a47feb42d18ff46dbbdffe36e0685d1cd5704848b3bf5a5611d482a09567722e35288527302cd521b18e2a48b347c919e17 SHA512 987347563a9726363c28d866e1372eae8eb19a5cbd0e33c7ee0e0c8f90471c4b69de0f559c00410523841b6c090b584652e01496f5db33c015a4554d2f4e179b
+DIST rstudio-1.2.1335.tar.gz 20440199 BLAKE2B cdd54a7df5a234bcc6d440f4ba5b45e58ea469f8dac5a17d9088f9d65035495c86b5a308cde28a224648f96a74038299863291f3c516a1d567762ecc5bfb079c SHA512 90657effc55264bf3efa1a8a5d2bbe94a37727f0450202ade99b9fbb71ea75b6dd9fa798d17cd4d1a1a97a16f186de8004d1888b6ea43f36d5252508520d3cde
 DIST selenium-java-2.37.0.zip 24625928 BLAKE2B b369a805ae96f0d0913c4be42888d9c2a1e213ff982f9daefe73fadb705baa80ab0186ab50ed52609e83697cffaf8d617d06d75405cb8e1c3fe8e7c5b81dba25 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779
 DIST selenium-server-standalone-2.37.0.jar 34730734 BLAKE2B 3899b1d4c5f9153c1f9f13bec66f7c1456ea2e0f34db7d8e54a1ce9063c33a05b3cf95216c2ae06bb40504f72f343a4b9ba6c8553fbbc340e7c18a5b612dde5c SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018
 DIST shinyapps-0.98.1000.tar.gz 910095 BLAKE2B 4f9364692348bb52cbd12cc6ee447841cb0c805327f2518b2a9545920b602b954a98dea68ccb3daf32d2c3bab6464fb15402844d93277193315f1ae7b3ca5190 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c
 EBUILD rstudio-1.1.383-r1.ebuild 8336 BLAKE2B 0a4a5ce1a2dfd929728c2c2fa61254a786178a56b797ec1eb4df4fdeb3079e3529b1909ec844735da2c229a6315c666c66f4ee8d9270908ce046e4779d61da5a SHA512 9a516a74872da4b46742ebfaaeb55080a7815db818842d12fa47200ea5a604256244bf9051a55ee90f5506f2111a4a7799c8b5b706fca7a5e1a27419138a224a
 EBUILD rstudio-1.1.453.ebuild 8502 BLAKE2B 9cf5aee42e422d77798a65b5447ef2027b4ca7a2cc2c35d37c7ec44109956ab1efaf253c4fe54c1c401ad10e50947898e8fd632894df2ad99ebb0c60046cf9ac SHA512 087dd2e5fdac0bb6bd261d40a8ef53f50de7aa1e922eb2a20eab2a3560431748e202ba9de1ae7adf1fd65847b14627628ce945894c94903f8ebfc3287641118b
-EBUILD rstudio-1.1.463.ebuild 8662 BLAKE2B 80861e38451ce653420d601c05ed2df9db0d5ceeb95758c8290abac212f9161e1ce3d09b6fba8b04a3a88b7028ff67f52577f6c626bf6a485c79876a02735e01 SHA512 bbfe44bf555d35a8eb6887760daead2a57e5d01d30eea39741a9f6202d27b9fff6b61af2bfe092be3841aedcd1bb92cdd82811715418b612756d738a8f7cb192
+EBUILD rstudio-1.1.463-r1.ebuild 8691 BLAKE2B e9cc9c2652c2f0193bfe5093c3a14a51f6d499a6e1c65b549ce8619017aaa8e196a55d8af3683b70ed3a139982e2e67ff4b829af0f8b554e8fb895aaab02d5df SHA512 9c98ecb0213f499c415e565d4da05d17c68c0276bc93fb5e9bee8a23057064bbcd32bac54c8a5bf5a111586438670d52d5bf92cde2947adc9e5911f72d6915b1
+EBUILD rstudio-1.1.463.ebuild 8714 BLAKE2B 415be08177b519e1e0863c60d3b3cceb241615862afb1d03f60367e03da3516ee32c45acef68e34951721290e7e775afec2c690534ccad3742b154709053c2eb SHA512 155cc3f01dd2e8ea20b5e061b5aa946cf69a42ed536db5e89352c759fdc4b2e1c7733d6181c3560beca2fa7e5571bc65ccafd0e9e33545229f1053cd20d13756
+EBUILD rstudio-1.2.1335.ebuild 8630 BLAKE2B 3a403fe159129f869b06dd59ede3b279ef9b20fdd467bfdc14b57acabf6191a2d1f4e4a2575f4728543440cbd00957709122faccae4e1ff89393ae96442ccfcf SHA512 a98ff2097ec07fef51c838d1c5705cdf34ac8ac40699c692f1038c926548e7906dacd5a475baf365be941186c1ebe8d929d198986b5e4dfe2404db262c2b9f25
 MISC metadata.xml 590 BLAKE2B 53dc62775e118c9c26ee05e20ee1da1ac31b6a6b74cf7dac410856fe4e0cce40fbb800c7a03e60f59e14442baf3aad866ad42616ad5fbb5724f7f6d8c1636eea SHA512 7111442aaa52da1e554c34f824113ec0e227798dd11b0ea9148b81e7a31c08b2a527b9995e3adb9363c7a4f2a8594f30cbd4a179545bf31d69f07d5558c20f52
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch
index aa3db25f3c01..a7a48572de30 100644
--- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch
+++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch
@@ -1,4 +1,4 @@
---- /dev/null	2018-11-10 15:32:26.332997437 +1100
+--- /dev/null	2019-03-19 11:03:33.121000004 +1100
 +++ rstudio-1.1.463/src/cpp/core/include/core/BoostSignals.hpp	2018-11-17 21:24:35.285976284 +1100
 @@ -0,0 +1,40 @@
 +/*
@@ -458,223 +458,3 @@
  };
  
  ProjectContext& projectContext();
---- rstudio-1.1.463-orig/src/cpp/session/modules/SessionPlots.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/SessionPlots.hpp	2018-11-17 21:24:35.292976352 +1100
-@@ -16,7 +16,7 @@
- #ifndef SESSION_PLOTS_HPP
- #define SESSION_PLOTS_HPP
- 
--#include <boost/signals.hpp>
-+#include <core/BoostSignals.hpp>
- 
- namespace rstudio {
- namespace core {
-@@ -35,9 +35,9 @@
- 
- struct Events : boost::noncopyable
- {
--   boost::signal<void()> onBeforeNewPlot;
--   boost::signal<void()> onBeforeNewGridPage;
--   boost::signal<void()> onNewPlot;
-+   RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewPlot;
-+   RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewGridPage;
-+   RSTUDIO_BOOST_SIGNAL<void()> onNewPlot;
- };
- 
- Events& events();
---- rstudio-1.1.463-orig/src/cpp/session/modules/build/SessionSourceCpp.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/build/SessionSourceCpp.cpp	2018-11-17 21:24:35.293976361 +1100
-@@ -15,11 +15,11 @@
- 
- #include "SessionSourceCpp.hpp"
- 
--#include <boost/signal.hpp>
- #include <boost/algorithm/string/trim.hpp>
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/algorithm/string/join.hpp>
- 
-+#include <core/BoostSignals.hpp>
- #include <core/Error.hpp>
- #include <core/FilePath.hpp>
- #include <core/StringUtils.hpp>
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp	2018-11-17 21:24:35.294976371 +1100
-@@ -142,7 +142,7 @@
-       LOG_ERROR(error);
-    
-    // capture console output, error
--   boost::signals::scoped_connection consoleHandler =
-+   RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
-          module_context::events().onConsoleOutput.connect(
-             boost::bind(chunkConsoleOutputHandler,
-                         _1,
-@@ -219,7 +219,7 @@
-       LOG_ERROR(error);
-    
-    // capture console output, error
--   boost::signals::scoped_connection consoleHandler =
-+   RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
-          module_context::events().onConsoleOutput.connect(
-             boost::bind(chunkConsoleOutputHandler,
-                         _1,
-@@ -363,7 +363,7 @@
-       LOG_ERROR(error);
-    
-    // capture console output, error
--   boost::signals::scoped_connection consoleHandler =
-+   RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
-          module_context::events().onConsoleOutput.connect(
-             boost::bind(chunkConsoleOutputHandler,
-                         _1,
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp	2018-11-17 21:24:35.294976371 +1100
-@@ -16,6 +16,8 @@
- #include "SessionRmdNotebook.hpp"
- #include "NotebookCapture.hpp"
- 
-+#include <boost/make_shared.hpp>
-+
- namespace rstudio {
- namespace session {
- namespace modules {
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.cpp	2018-11-17 21:24:35.295976381 +1100
-@@ -441,7 +441,7 @@
-    }
- 
-    // unhook all our event handlers
--   BOOST_FOREACH(const boost::signals::connection connection, connections_) 
-+   BOOST_FOREACH(const RSTUDIO_BOOST_CONNECTION connection, connections_) 
-    {
-       connection.disconnect();
-    }
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.hpp	2018-11-17 21:24:35.295976381 +1100
-@@ -18,8 +18,7 @@
- 
- #include <session/SessionModuleContext.hpp>
- 
--#include <boost/signal.hpp>
--
-+#include <core/BoostSignals.hpp>
- #include <core/json/Json.hpp>
- 
- #include <r/RSexp.hpp>
-@@ -99,7 +98,7 @@
-    bool hasErrors_;
- 
-    std::vector<boost::shared_ptr<NotebookCapture> > captures_;
--   std::vector<boost::signals::connection> connections_;
-+   std::vector<RSTUDIO_BOOST_CONNECTION> connections_;
- };
- 
- } // namespace notebook
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp	2018-11-17 21:24:35.295976381 +1100
-@@ -20,11 +20,12 @@
- 
- #include <boost/format.hpp>
- #include <boost/foreach.hpp>
--#include <boost/signals/connection.hpp>
- 
--#include <core/system/FileMonitor.hpp>
--#include <core/StringUtils.hpp>
-+#include <core/BoostSignals.hpp>
- #include <core/Exec.hpp>
-+#include <core/StringUtils.hpp>
-+
-+#include <core/system/FileMonitor.hpp>
- 
- #include <session/SessionModuleContext.hpp>
- 
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp	2018-11-17 21:24:35.296976391 +1100
-@@ -18,8 +18,10 @@
- #define SESSION_NOTEBOOK_PLOTS_HPP
- 
- #include <boost/function.hpp>
--#include <boost/signals/connection.hpp>
-+
-+#include <core/BoostSignals.hpp>
- #include <core/FilePath.hpp>
-+
- #include <r/RSexp.hpp>
- 
- #include "NotebookCapture.hpp"
-@@ -80,9 +82,9 @@
- 
-    unsigned lastOrdinal_;
- 
--   boost::signals::connection onBeforeNewPlot_;
--   boost::signals::connection onBeforeNewGridPage_;
--   boost::signals::connection onNewPlot_;
-+   RSTUDIO_BOOST_CONNECTION onBeforeNewPlot_;
-+   RSTUDIO_BOOST_CONNECTION onBeforeNewGridPage_;
-+   RSTUDIO_BOOST_CONNECTION onNewPlot_;
- 
-    double width_;
-    double height_;
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp	2018-11-17 21:24:35.296976391 +1100
-@@ -87,7 +87,7 @@
-       pInput_->enque(kThreadQuitCommand);
- 
-       // unregister handlers
--      BOOST_FOREACH(boost::signals::connection connection, handlers_)
-+      BOOST_FOREACH(RSTUDIO_BOOST_CONNECTION connection, handlers_)
-       {
-          connection.disconnect();
-       }
-@@ -651,7 +651,7 @@
-    boost::shared_ptr<ChunkExecContext> execContext_;
- 
-    // registered signal handlers
--   std::vector<boost::signals::connection> handlers_;
-+   std::vector<RSTUDIO_BOOST_CONNECTION> handlers_;
- 
-    // the thread which submits console input, and the queue which feeds it
-    boost::thread console_;
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp	2018-11-17 21:24:35.296976391 +1100
-@@ -18,7 +18,8 @@
- #define SESSION_RMARKDOWN_NOTEBOOK_HPP
- 
- #include <ctime>
--#include <boost/signals.hpp>
-+
-+#include <core/BoostSignals.hpp>
- #include <core/json/Json.hpp>
- 
- #define kChunkLibDir "lib"
-@@ -76,24 +77,24 @@
- struct Events : boost::noncopyable
- {
-    // Document {0}, chunk {1} from context id {3} execution completed
--   boost::signal<void(const std::string&, const std::string&,
-+   RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&,
-                       const std::string&)> 
-                 onChunkExecCompleted;
- 
-    // Document {0}, chunk {1} had console output of type {2} and text {3}
--   boost::signal<void(const std::string&, const std::string&, int, 
-+   RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&, int, 
-                 const std::string&)>
-                 onChunkConsoleOutput;
- 
--   boost::signal<void(const core::FilePath&, const core::FilePath&, 
-+   RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&, 
-                       const core::json::Value& metadata, unsigned ordinal)> 
-                          onPlotOutput;
--   boost::signal<void(const core::FilePath&, const core::FilePath&,
-+   RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
-                       const core::json::Value& metadata)> onHtmlOutput;
--   boost::signal<void(const core::json::Object&)> onErrorOutput;
--   boost::signal<void(const core::FilePath&, const core::FilePath&,
-+   RSTUDIO_BOOST_SIGNAL<void(const core::json::Object&)> onErrorOutput;
-+   RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
-                       const core::json::Value& metadata)> onDataOutput;
--   boost::signal<void(Condition condition, const std::string& message)> 
-+   RSTUDIO_BOOST_SIGNAL<void(Condition condition, const std::string& message)> 
-                          onCondition;
- };
- 
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch
index 961723fd224f..d90ce005a1a0 100644
--- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch
+++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch
@@ -1,167 +1,220 @@
---- rstudio-1.1.463-orig/src/cpp/CMakeLists.txt	2018-11-17 21:24:35.285976284 +1100
-+++ rstudio-1.1.463/src/cpp/CMakeLists.txt	2018-11-17 21:41:02.712507842 +1100
-@@ -175,6 +175,9 @@
-       set(Boost_USE_STATIC_LIBS ON)
-       set(BOOST_INCLUDEDIR  ${RSTUDIO_TOOLS_BOOST}/include)
-       find_package(Boost ${BOOST_VERSION} REQUIRED)
-+      if(NOT Boost_VERSION VERSION_LESS 1.69.0)
-+         list(REMOVE_ITEM BOOST_LIBS signals)
-+      endif()
- 
-       # define library list manually (find_package doesn't always pick them up)
-       set(BOOST_LIB_DIR ${RSTUDIO_TOOLS_BOOST}/lib)
-@@ -184,11 +187,15 @@
-       message(STATUS "Using RStudio-provided Boost ${BOOST_VERSION}")
-    else()
-       add_definitions(-DRSTUDIO_BOOST_NAMESPACE=boost)
-+      find_package(Boost ${BOOST_VERSION} REQUIRED)
-+      if(NOT Boost_VERSION VERSION_LESS 1.69.0)
-+         list(REMOVE_ITEM BOOST_LIBS signals)
-+      endif()
-       find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS ${BOOST_LIBS})
-       message(STATUS "Using system Boost ${BOOST_VERSION}")
-    endif()
- 
--   # WIN32 BOOST
-+# WIN32 BOOST
- else()
-    # hard-code to our own prebuilt boost libs
-    add_definitions(-DRSTUDIO_BOOST_NAMESPACE=rstudio_boost)
-@@ -211,14 +218,14 @@
- # allow opt-in to using Boost.Signals2
- # TODO: remove this in RStudio v1.3 and port to signals2
- if(NOT RSTUDIO_BOOST_SIGNALS_VERSION)
--   if (BOOST_VERSION VERSION_LESS 1.69.0)
-+   if (Boost_VERSION VERSION_LESS 1.69.0)
-       set(RSTUDIO_BOOST_SIGNALS_VERSION 1)
-    else()
-       set(RSTUDIO_BOOST_SIGNALS_VERSION 2)
-    endif()
- endif()
- 
--message(STATUS "Using Booost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}")
-+message(STATUS "Using Boost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}")
- add_definitions(-DRSTUDIO_BOOST_SIGNALS_VERSION=${RSTUDIO_BOOST_SIGNALS_VERSION})
- 
- # add boost as system include directory
---- rstudio-1.1.463-orig/src/cpp/core/include/core/r_util/RFunctionInformation.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/core/include/core/r_util/RFunctionInformation.hpp	2018-11-17 21:41:02.713507852 +1100
-@@ -75,9 +75,9 @@
-    const std::string& name() const { return name_; }
-    const boost::optional<std::string>& defaultValue() const { return defaultValue_; }
-    boost::tribool hasDefault() const { return hasDefault_; }
--   bool isUsed() const { return isUsed_; }
-+   bool isUsed() const { return bool(isUsed_); }
-    void setIsUsed(bool value) { isUsed_ = value; }
--   bool isMissingnessHandled() const { return isMissingnessHandled_; }
-+   bool isMissingnessHandled() const { return bool(isMissingnessHandled_); }
-    void setMissingnessHandled(bool value) { isMissingnessHandled_ = value; }
+--- rstudio-1.1.463-orig/src/cpp/session/modules/SessionPlots.hpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/SessionPlots.hpp	2018-11-17 21:24:35.292976352 +1100
+@@ -16,7 +16,7 @@
+ #ifndef SESSION_PLOTS_HPP
+ #define SESSION_PLOTS_HPP
+ 
+-#include <boost/signals.hpp>
++#include <core/BoostSignals.hpp>
+ 
+ namespace rstudio {
+ namespace core {
+@@ -35,9 +35,9 @@
+ 
+ struct Events : boost::noncopyable
+ {
+-   boost::signal<void()> onBeforeNewPlot;
+-   boost::signal<void()> onBeforeNewGridPage;
+-   boost::signal<void()> onNewPlot;
++   RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewPlot;
++   RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewGridPage;
++   RSTUDIO_BOOST_SIGNAL<void()> onNewPlot;
+ };
+ 
+ Events& events();
+--- rstudio-1.1.463-orig/src/cpp/session/modules/build/SessionSourceCpp.cpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/build/SessionSourceCpp.cpp	2018-11-17 21:24:35.293976361 +1100
+@@ -15,11 +15,11 @@
+ 
+ #include "SessionSourceCpp.hpp"
+ 
+-#include <boost/signal.hpp>
+ #include <boost/algorithm/string/trim.hpp>
+ #include <boost/algorithm/string/predicate.hpp>
+ #include <boost/algorithm/string/join.hpp>
+ 
++#include <core/BoostSignals.hpp>
+ #include <core/Error.hpp>
+ #include <core/FilePath.hpp>
+ #include <core/StringUtils.hpp>
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp	2018-11-17 21:24:35.294976371 +1100
+@@ -142,7 +142,7 @@
+       LOG_ERROR(error);
     
- private:
-@@ -130,7 +130,7 @@
+    // capture console output, error
+-   boost::signals::scoped_connection consoleHandler =
++   RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
+          module_context::events().onConsoleOutput.connect(
+             boost::bind(chunkConsoleOutputHandler,
+                         _1,
+@@ -219,7 +219,7 @@
+       LOG_ERROR(error);
     
-    bool isPrimitive()
-    {
--      return isPrimitive_ == true;
-+      return bool(isPrimitive_);
-    }
+    // capture console output, error
+-   boost::signals::scoped_connection consoleHandler =
++   RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
+          module_context::events().onConsoleOutput.connect(
+             boost::bind(chunkConsoleOutputHandler,
+                         _1,
+@@ -363,7 +363,7 @@
+       LOG_ERROR(error);
     
-    void setIsPrimitive(bool isPrimitive)
---- rstudio-1.1.463-orig/src/cpp/session/modules/SessionRParser.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/SessionRParser.cpp	2018-11-17 21:41:02.714507862 +1100
-@@ -390,7 +390,7 @@
-    if (!failed)
+    // capture console output, error
+-   boost::signals::scoped_connection consoleHandler =
++   RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
+          module_context::events().onConsoleOutput.connect(
+             boost::bind(chunkConsoleOutputHandler,
+                         _1,
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp	2018-11-17 21:24:35.294976371 +1100
+@@ -16,6 +16,8 @@
+ #include "SessionRmdNotebook.hpp"
+ #include "NotebookCapture.hpp"
+ 
++#include <boost/make_shared.hpp>
++
+ namespace rstudio {
+ namespace session {
+ namespace modules {
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.cpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.cpp	2018-11-17 21:24:35.295976381 +1100
+@@ -441,7 +441,7 @@
+    }
+ 
+    // unhook all our event handlers
+-   BOOST_FOREACH(const boost::signals::connection connection, connections_) 
++   BOOST_FOREACH(const RSTUDIO_BOOST_CONNECTION connection, connections_) 
     {
-       DEBUG("--- Found function in pkgInfo index: " << *fnInfo.binding());
--      return fnInfo.performsNse();
-+      return bool(fnInfo.performsNse());
+       connection.disconnect();
     }
-    
-    // Handle some special cases first.
---- rstudio-1.1.463-orig/src/tools/clang-ubsan-build	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/tools/clang-ubsan-build	2018-11-17 21:41:02.714507862 +1100
-@@ -10,19 +10,19 @@
- 
- : ${RSTUDIO_USE_LIBCXX="Yes"}
- : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"}
--: ${RSTUDIO_BOOST_VERSION="1.56.0"}
-+: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.56.0"}
- 
- mkdir -p "${BUILD_DIR}"
- cd "${BUILD_DIR}"
--cmake ../cpp                                                 \
--    -DLIBR_HOME="${R_HOME}"                                  \
--    -DCMAKE_C_COMPILER="${CC}"                               \
--    -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}"                \
--    -DCMAKE_CXX_COMPILER="${CXX}"                            \
--    -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}"              \
--    -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}"             \
--    -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
--    -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}"       \
-+cmake ../cpp                                                               \
-+    -DLIBR_HOME="${R_HOME}"                                                \
-+    -DCMAKE_C_COMPILER="${CC}"                                             \
-+    -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}"                              \
-+    -DCMAKE_CXX_COMPILER="${CXX}"                                          \
-+    -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}"                            \
-+    -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}"                           \
-+    -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}"               \
-+    -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \
-     "$@"
- cd ..
- 
---- rstudio-1.1.463-orig/src/tools/gcc-ubsan-build	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/tools/gcc-ubsan-build	2018-11-17 21:41:02.715507871 +1100
-@@ -19,19 +19,19 @@
- # NOTE: Boost 1.50.0 not compatible with gcc-6
- : ${RSTUDIO_USE_LIBCXX="No"}
- : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"}
--: ${RSTUDIO_BOOST_VERSION="1.54.0"}
-+: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.54.0"}
- 
- mkdir -p "${BUILD_DIR}"
- cd "${BUILD_DIR}"
--cmake ../cpp                                                 \
--    -DLIBR_HOME="${R_HOME}"                                  \
--    -DCMAKE_C_COMPILER="${CC}"                               \
--    -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}"                \
--    -DCMAKE_CXX_COMPILER="${CXX}"                            \
--    -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}"              \
--    -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}"             \
--    -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
--    -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}"       \
-+cmake ../cpp                                                               \
-+    -DLIBR_HOME="${R_HOME}"                                                \
-+    -DCMAKE_C_COMPILER="${CC}"                                             \
-+    -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}"                              \
-+    -DCMAKE_CXX_COMPILER="${CXX}"                                          \
-+    -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}"                            \
-+    -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}"                           \
-+    -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}"               \
-+    -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \
-     "$@"
- cd ..
- 
---- rstudio-1.1.463-orig/src/tools/xcode-ubsan-build	2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/tools/xcode-ubsan-build	2018-11-17 21:41:02.715507871 +1100
-@@ -15,13 +15,13 @@
- # sanitizers released with newer versions of clang)
- mkdir -p "${BUILD_DIR}"
- cd "${BUILD_DIR}"
--cmake ../cpp -GXcode                 \
--    -DLIBR_HOME="${R_HOME}"          \
--    -DLIBR_INCLUDE_DIRS="${R_INCL}"  \
--    -DLIBR_DOC_DIR="${R_DOCS}"       \
--    -DRSTUDIO_USE_LIBCXX="Yes"       \
--    -DRSTUDIO_USE_SYSTEM_BOOST="Yes" \
--    -DRSTUDIO_BOOST_VERSION="1.56.0" \
-+cmake ../cpp -GXcode                           \
-+    -DLIBR_HOME="${R_HOME}"                    \
-+    -DLIBR_INCLUDE_DIRS="${R_INCL}"            \
-+    -DLIBR_DOC_DIR="${R_DOCS}"                 \
-+    -DRSTUDIO_USE_LIBCXX="Yes"                 \
-+    -DRSTUDIO_USE_SYSTEM_BOOST="Yes"           \
-+    -DRSTUDIO_BOOST_REQUESTED_VERSION="1.56.0" \
-     "$@"
- cmake ../cpp -DLIBR_LIBRARIES="${R_LIBS}/libR.dylib"
- cd ..
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.hpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.hpp	2018-11-17 21:24:35.295976381 +1100
+@@ -18,8 +18,7 @@
+ 
+ #include <session/SessionModuleContext.hpp>
+ 
+-#include <boost/signal.hpp>
+-
++#include <core/BoostSignals.hpp>
+ #include <core/json/Json.hpp>
+ 
+ #include <r/RSexp.hpp>
+@@ -99,7 +98,7 @@
+    bool hasErrors_;
+ 
+    std::vector<boost::shared_ptr<NotebookCapture> > captures_;
+-   std::vector<boost::signals::connection> connections_;
++   std::vector<RSTUDIO_BOOST_CONNECTION> connections_;
+ };
+ 
+ } // namespace notebook
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp	2018-11-17 21:24:35.295976381 +1100
+@@ -20,11 +20,12 @@
+ 
+ #include <boost/format.hpp>
+ #include <boost/foreach.hpp>
+-#include <boost/signals/connection.hpp>
+ 
+-#include <core/system/FileMonitor.hpp>
+-#include <core/StringUtils.hpp>
++#include <core/BoostSignals.hpp>
+ #include <core/Exec.hpp>
++#include <core/StringUtils.hpp>
++
++#include <core/system/FileMonitor.hpp>
+ 
+ #include <session/SessionModuleContext.hpp>
+ 
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp	2018-11-17 21:24:35.296976391 +1100
+@@ -18,8 +18,10 @@
+ #define SESSION_NOTEBOOK_PLOTS_HPP
+ 
+ #include <boost/function.hpp>
+-#include <boost/signals/connection.hpp>
++
++#include <core/BoostSignals.hpp>
+ #include <core/FilePath.hpp>
++
+ #include <r/RSexp.hpp>
+ 
+ #include "NotebookCapture.hpp"
+@@ -80,9 +82,9 @@
+ 
+    unsigned lastOrdinal_;
+ 
+-   boost::signals::connection onBeforeNewPlot_;
+-   boost::signals::connection onBeforeNewGridPage_;
+-   boost::signals::connection onNewPlot_;
++   RSTUDIO_BOOST_CONNECTION onBeforeNewPlot_;
++   RSTUDIO_BOOST_CONNECTION onBeforeNewGridPage_;
++   RSTUDIO_BOOST_CONNECTION onNewPlot_;
+ 
+    double width_;
+    double height_;
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp	2018-11-17 21:24:35.296976391 +1100
+@@ -87,7 +87,7 @@
+       pInput_->enque(kThreadQuitCommand);
+ 
+       // unregister handlers
+-      BOOST_FOREACH(boost::signals::connection connection, handlers_)
++      BOOST_FOREACH(RSTUDIO_BOOST_CONNECTION connection, handlers_)
+       {
+          connection.disconnect();
+       }
+@@ -651,7 +651,7 @@
+    boost::shared_ptr<ChunkExecContext> execContext_;
+ 
+    // registered signal handlers
+-   std::vector<boost::signals::connection> handlers_;
++   std::vector<RSTUDIO_BOOST_CONNECTION> handlers_;
+ 
+    // the thread which submits console input, and the queue which feeds it
+    boost::thread console_;
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp	2018-11-17 21:24:35.296976391 +1100
+@@ -18,7 +18,8 @@
+ #define SESSION_RMARKDOWN_NOTEBOOK_HPP
+ 
+ #include <ctime>
+-#include <boost/signals.hpp>
++
++#include <core/BoostSignals.hpp>
+ #include <core/json/Json.hpp>
+ 
+ #define kChunkLibDir "lib"
+@@ -76,24 +77,24 @@
+ struct Events : boost::noncopyable
+ {
+    // Document {0}, chunk {1} from context id {3} execution completed
+-   boost::signal<void(const std::string&, const std::string&,
++   RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&,
+                       const std::string&)> 
+                 onChunkExecCompleted;
+ 
+    // Document {0}, chunk {1} had console output of type {2} and text {3}
+-   boost::signal<void(const std::string&, const std::string&, int, 
++   RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&, int, 
+                 const std::string&)>
+                 onChunkConsoleOutput;
+ 
+-   boost::signal<void(const core::FilePath&, const core::FilePath&, 
++   RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&, 
+                       const core::json::Value& metadata, unsigned ordinal)> 
+                          onPlotOutput;
+-   boost::signal<void(const core::FilePath&, const core::FilePath&,
++   RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
+                       const core::json::Value& metadata)> onHtmlOutput;
+-   boost::signal<void(const core::json::Object&)> onErrorOutput;
+-   boost::signal<void(const core::FilePath&, const core::FilePath&,
++   RSTUDIO_BOOST_SIGNAL<void(const core::json::Object&)> onErrorOutput;
++   RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
+                       const core::json::Value& metadata)> onDataOutput;
+-   boost::signal<void(Condition condition, const std::string& message)> 
++   RSTUDIO_BOOST_SIGNAL<void(Condition condition, const std::string& message)> 
+                          onCondition;
+ };
+ 
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch
new file mode 100644
index 000000000000..961723fd224f
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch
@@ -0,0 +1,167 @@
+--- rstudio-1.1.463-orig/src/cpp/CMakeLists.txt	2018-11-17 21:24:35.285976284 +1100
++++ rstudio-1.1.463/src/cpp/CMakeLists.txt	2018-11-17 21:41:02.712507842 +1100
+@@ -175,6 +175,9 @@
+       set(Boost_USE_STATIC_LIBS ON)
+       set(BOOST_INCLUDEDIR  ${RSTUDIO_TOOLS_BOOST}/include)
+       find_package(Boost ${BOOST_VERSION} REQUIRED)
++      if(NOT Boost_VERSION VERSION_LESS 1.69.0)
++         list(REMOVE_ITEM BOOST_LIBS signals)
++      endif()
+ 
+       # define library list manually (find_package doesn't always pick them up)
+       set(BOOST_LIB_DIR ${RSTUDIO_TOOLS_BOOST}/lib)
+@@ -184,11 +187,15 @@
+       message(STATUS "Using RStudio-provided Boost ${BOOST_VERSION}")
+    else()
+       add_definitions(-DRSTUDIO_BOOST_NAMESPACE=boost)
++      find_package(Boost ${BOOST_VERSION} REQUIRED)
++      if(NOT Boost_VERSION VERSION_LESS 1.69.0)
++         list(REMOVE_ITEM BOOST_LIBS signals)
++      endif()
+       find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS ${BOOST_LIBS})
+       message(STATUS "Using system Boost ${BOOST_VERSION}")
+    endif()
+ 
+-   # WIN32 BOOST
++# WIN32 BOOST
+ else()
+    # hard-code to our own prebuilt boost libs
+    add_definitions(-DRSTUDIO_BOOST_NAMESPACE=rstudio_boost)
+@@ -211,14 +218,14 @@
+ # allow opt-in to using Boost.Signals2
+ # TODO: remove this in RStudio v1.3 and port to signals2
+ if(NOT RSTUDIO_BOOST_SIGNALS_VERSION)
+-   if (BOOST_VERSION VERSION_LESS 1.69.0)
++   if (Boost_VERSION VERSION_LESS 1.69.0)
+       set(RSTUDIO_BOOST_SIGNALS_VERSION 1)
+    else()
+       set(RSTUDIO_BOOST_SIGNALS_VERSION 2)
+    endif()
+ endif()
+ 
+-message(STATUS "Using Booost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}")
++message(STATUS "Using Boost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}")
+ add_definitions(-DRSTUDIO_BOOST_SIGNALS_VERSION=${RSTUDIO_BOOST_SIGNALS_VERSION})
+ 
+ # add boost as system include directory
+--- rstudio-1.1.463-orig/src/cpp/core/include/core/r_util/RFunctionInformation.hpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/core/include/core/r_util/RFunctionInformation.hpp	2018-11-17 21:41:02.713507852 +1100
+@@ -75,9 +75,9 @@
+    const std::string& name() const { return name_; }
+    const boost::optional<std::string>& defaultValue() const { return defaultValue_; }
+    boost::tribool hasDefault() const { return hasDefault_; }
+-   bool isUsed() const { return isUsed_; }
++   bool isUsed() const { return bool(isUsed_); }
+    void setIsUsed(bool value) { isUsed_ = value; }
+-   bool isMissingnessHandled() const { return isMissingnessHandled_; }
++   bool isMissingnessHandled() const { return bool(isMissingnessHandled_); }
+    void setMissingnessHandled(bool value) { isMissingnessHandled_ = value; }
+    
+ private:
+@@ -130,7 +130,7 @@
+    
+    bool isPrimitive()
+    {
+-      return isPrimitive_ == true;
++      return bool(isPrimitive_);
+    }
+    
+    void setIsPrimitive(bool isPrimitive)
+--- rstudio-1.1.463-orig/src/cpp/session/modules/SessionRParser.cpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/SessionRParser.cpp	2018-11-17 21:41:02.714507862 +1100
+@@ -390,7 +390,7 @@
+    if (!failed)
+    {
+       DEBUG("--- Found function in pkgInfo index: " << *fnInfo.binding());
+-      return fnInfo.performsNse();
++      return bool(fnInfo.performsNse());
+    }
+    
+    // Handle some special cases first.
+--- rstudio-1.1.463-orig/src/tools/clang-ubsan-build	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/tools/clang-ubsan-build	2018-11-17 21:41:02.714507862 +1100
+@@ -10,19 +10,19 @@
+ 
+ : ${RSTUDIO_USE_LIBCXX="Yes"}
+ : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"}
+-: ${RSTUDIO_BOOST_VERSION="1.56.0"}
++: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.56.0"}
+ 
+ mkdir -p "${BUILD_DIR}"
+ cd "${BUILD_DIR}"
+-cmake ../cpp                                                 \
+-    -DLIBR_HOME="${R_HOME}"                                  \
+-    -DCMAKE_C_COMPILER="${CC}"                               \
+-    -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}"                \
+-    -DCMAKE_CXX_COMPILER="${CXX}"                            \
+-    -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}"              \
+-    -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}"             \
+-    -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
+-    -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}"       \
++cmake ../cpp                                                               \
++    -DLIBR_HOME="${R_HOME}"                                                \
++    -DCMAKE_C_COMPILER="${CC}"                                             \
++    -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}"                              \
++    -DCMAKE_CXX_COMPILER="${CXX}"                                          \
++    -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}"                            \
++    -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}"                           \
++    -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}"               \
++    -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \
+     "$@"
+ cd ..
+ 
+--- rstudio-1.1.463-orig/src/tools/gcc-ubsan-build	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/tools/gcc-ubsan-build	2018-11-17 21:41:02.715507871 +1100
+@@ -19,19 +19,19 @@
+ # NOTE: Boost 1.50.0 not compatible with gcc-6
+ : ${RSTUDIO_USE_LIBCXX="No"}
+ : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"}
+-: ${RSTUDIO_BOOST_VERSION="1.54.0"}
++: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.54.0"}
+ 
+ mkdir -p "${BUILD_DIR}"
+ cd "${BUILD_DIR}"
+-cmake ../cpp                                                 \
+-    -DLIBR_HOME="${R_HOME}"                                  \
+-    -DCMAKE_C_COMPILER="${CC}"                               \
+-    -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}"                \
+-    -DCMAKE_CXX_COMPILER="${CXX}"                            \
+-    -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}"              \
+-    -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}"             \
+-    -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
+-    -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}"       \
++cmake ../cpp                                                               \
++    -DLIBR_HOME="${R_HOME}"                                                \
++    -DCMAKE_C_COMPILER="${CC}"                                             \
++    -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}"                              \
++    -DCMAKE_CXX_COMPILER="${CXX}"                                          \
++    -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}"                            \
++    -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}"                           \
++    -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}"               \
++    -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \
+     "$@"
+ cd ..
+ 
+--- rstudio-1.1.463-orig/src/tools/xcode-ubsan-build	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/tools/xcode-ubsan-build	2018-11-17 21:41:02.715507871 +1100
+@@ -15,13 +15,13 @@
+ # sanitizers released with newer versions of clang)
+ mkdir -p "${BUILD_DIR}"
+ cd "${BUILD_DIR}"
+-cmake ../cpp -GXcode                 \
+-    -DLIBR_HOME="${R_HOME}"          \
+-    -DLIBR_INCLUDE_DIRS="${R_INCL}"  \
+-    -DLIBR_DOC_DIR="${R_DOCS}"       \
+-    -DRSTUDIO_USE_LIBCXX="Yes"       \
+-    -DRSTUDIO_USE_SYSTEM_BOOST="Yes" \
+-    -DRSTUDIO_BOOST_VERSION="1.56.0" \
++cmake ../cpp -GXcode                           \
++    -DLIBR_HOME="${R_HOME}"                    \
++    -DLIBR_INCLUDE_DIRS="${R_INCL}"            \
++    -DLIBR_DOC_DIR="${R_DOCS}"                 \
++    -DRSTUDIO_USE_LIBCXX="Yes"                 \
++    -DRSTUDIO_USE_SYSTEM_BOOST="Yes"           \
++    -DRSTUDIO_BOOST_REQUESTED_VERSION="1.56.0" \
+     "$@"
+ cmake ../cpp -DLIBR_LIBRARIES="${R_LIBS}/libR.dylib"
+ cd ..
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch
new file mode 100644
index 000000000000..320b823355a3
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch
@@ -0,0 +1,46 @@
+--- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/connection.hpp	2019-03-30 20:14:40.634057634 +1100
+@@ -296,7 +296,11 @@
+      */
+     timer_ptr set_timer(long duration, timer_handler callback) {
+         timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
++            *m_io_service,
++#else
+             lib::ref(*m_io_service),
++#endif
+             boost::posix_time::milliseconds(duration)
+         );
+ 
+--- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp	2019-03-30 20:14:36.319021594 +1100
+@@ -184,7 +184,12 @@
+         m_io_service = ptr;
+         m_external_io_service = true;
+         m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
+-            lib::ref(*m_io_service));
++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
++            *m_io_service
++#else
++            lib::ref(*m_io_service)
++#endif
++        );
+ 
+         m_state = READY;
+         ec = lib::error_code();
+--- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp	2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/security/none.hpp	2019-03-30 20:15:22.353406097 +1100
+@@ -167,7 +167,12 @@
+         }
+ 
+         m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
+-            lib::ref(*service));
++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
++            *service
++#else
++            lib::ref(*service)
++#endif
++        );
+ 
+         m_state = READY;
+ 
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch
new file mode 100644
index 000000000000..1ec458bb8698
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch
@@ -0,0 +1,46 @@
+--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/connection.hpp	2019-08-20 22:38:53.808923305 +1000
+@@ -296,7 +296,11 @@
+      */
+     timer_ptr set_timer(long duration, timer_handler callback) {
+         timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
++            *m_io_service,
++#else
+             lib::ref(*m_io_service),
++#endif
+             boost::posix_time::milliseconds(duration)
+         );
+ 
+--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp	2019-08-20 22:38:53.822923358 +1000
+@@ -184,7 +184,12 @@
+         m_io_service = ptr;
+         m_external_io_service = true;
+         m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
+-            lib::ref(*m_io_service));
++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
++            *m_io_service
++#else
++            lib::ref(*m_io_service)
++#endif
++        );
+ 
+         m_state = READY;
+         ec = lib::error_code();
+--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/security/none.hpp	2019-08-20 22:38:53.823923362 +1000
+@@ -167,7 +167,12 @@
+         }
+ 
+         m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
+-            lib::ref(*service));
++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
++            *service
++#else
++            lib::ref(*service)
++#endif
++        );
+ 
+         m_state = READY;
+ 
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch
new file mode 100644
index 000000000000..eed2c5c955cb
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch
@@ -0,0 +1,17 @@
+--- rstudio-1.2.1335-orig/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp	2019-04-09 22:08:45.331273559 +1000
+@@ -77,7 +77,13 @@
+       {
+          // start a timer that will cancel any outstanding asynchronous operations
+          // when it elapses if the connection operation has not succeeded
+-         pConnectionTimer_.reset(new boost::asio::deadline_timer(resolver_.get_io_service(), timeout));
++         pConnectionTimer_.reset(new boost::asio::deadline_timer(
++#if BOOST_VERSION >= 107000
++                                   resolver_.get_executor(),
++#else
++                                   resolver_.get_io_service(),
++#endif
++                                   timeout));
+          pConnectionTimer_->async_wait(boost::bind(&TcpIpAsyncConnector::onConnectionTimeout,
+                                                    TcpIpAsyncConnector::shared_from_this(),
+                                                    boost::asio::placeholders::error));
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch
new file mode 100644
index 000000000000..2c4374bb8045
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch
@@ -0,0 +1,160 @@
+--- rstudio-1.2.1335-orig/src/cpp/session/SessionClientInit.cpp	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/session/SessionClientInit.cpp	2019-04-09 18:15:37.746363789 +1000
+@@ -87,13 +87,13 @@
+       boost::shared_ptr<http::Cookie>* pCookie)
+ {
+    // extract the base URL
+-   json::JsonRpcRequest request;
++   core::json::JsonRpcRequest request;
+    Error error = parseJsonRpcRequest(ptrConnection->request().body(), &request);
+    if (error)
+       return error;
+    std::string baseURL;
+ 
+-   error = json::readParams(request.params, &baseURL);
++   error = core::json::readParams(request.params, &baseURL);
+    if (error)
+       return error;
+ 
+@@ -161,7 +161,7 @@
+    }
+ 
+    // prepare session info 
+-   json::Object sessionInfo ;
++   core::json::Object sessionInfo ;
+    sessionInfo["clientId"] = clientId;
+    sessionInfo["mode"] = options.programMode();
+    
+@@ -175,8 +175,8 @@
+    }
+ 
+    // temp dir
+-   FilePath tempDir = rstudio::r::session::utils::tempDir();
+-   Error error = tempDir.ensureDirectory();
++   core::FilePath tempDir = rstudio::r::session::utils::tempDir();
++   core::Error error = tempDir.ensureDirectory();
+    if (error)
+       LOG_ERROR(error);
+    sessionInfo["temp_dir"] = tempDir.absolutePath();
+@@ -194,12 +194,12 @@
+    sessionInfo["prompt"] = rstudio::r::options::getOption<std::string>("prompt");
+ 
+    // client state
+-   json::Object clientStateObject;
++   core::json::Object clientStateObject;
+    rstudio::r::session::clientState().currentState(&clientStateObject);
+    sessionInfo["client_state"] = clientStateObject;
+    
+    // source documents
+-   json::Array jsonDocs;
++   core::json::Array jsonDocs;
+    error = modules::source::clientInitDocuments(&jsonDocs);
+    if (error)
+       LOG_ERROR(error);
+@@ -224,7 +224,7 @@
+    if (resumed)
+    {
+       // console actions
+-      json::Object actionsObject;
++     core::json::Object actionsObject;
+       consoleActions.asJson(&actionsObject);
+       sessionInfo["console_actions"] = actionsObject;
+    }
+@@ -290,12 +290,12 @@
+    }
+    else
+    {
+-      sessionInfo["active_project_file"] = json::Value();
+-      sessionInfo["project_ui_prefs"] = json::Value();
+-      sessionInfo["project_open_docs"] = json::Value();
++      sessionInfo["active_project_file"] = core::json::Value();
++      sessionInfo["project_ui_prefs"] = core::json::Value();
++      sessionInfo["project_open_docs"] = core::json::Value();
+       sessionInfo["project_supports_sharing"] = false;
+       sessionInfo["project_owned_by_user"] = false;
+-      sessionInfo["project_user_data_directory"] = json::Value();
++      sessionInfo["project_user_data_directory"] = core::json::Value();
+    }
+ 
+    sessionInfo["system_encoding"] = std::string(::locale2charset(NULL));
+@@ -332,20 +332,20 @@
+       sessionInfo["build_tools_bookdown_website"] =
+                               module_context::isBookdownWebsite();
+ 
+-      FilePath buildTargetDir = projects::projectContext().buildTargetPath();
++      core::FilePath buildTargetDir = projects::projectContext().buildTargetPath();
+       if (!buildTargetDir.empty())
+       {
+          sessionInfo["build_target_dir"] = module_context::createAliasedPath(
+                                                                 buildTargetDir);
+-         sessionInfo["has_pkg_src"] = (type == r_util::kBuildTypePackage) &&
++         sessionInfo["has_pkg_src"] = (type == core::r_util::kBuildTypePackage) &&
+                                       buildTargetDir.childPath("src").exists();
+          sessionInfo["has_pkg_vig"] =
+-               (type == r_util::kBuildTypePackage) &&
++               (type == core::r_util::kBuildTypePackage) &&
+                buildTargetDir.childPath("vignettes").exists();
+       }
+       else
+       {
+-         sessionInfo["build_target_dir"] = json::Value();
++         sessionInfo["build_target_dir"] = core::json::Value();
+          sessionInfo["has_pkg_src"] = false;
+          sessionInfo["has_pkg_vig"] = false;
+       }
+@@ -353,9 +353,9 @@
+    }
+    else
+    {
+-      sessionInfo["build_tools_type"] = r_util::kBuildTypeNone;
++      sessionInfo["build_tools_type"] = core::r_util::kBuildTypeNone;
+       sessionInfo["build_tools_bookdown_website"] = false;
+-      sessionInfo["build_target_dir"] = json::Value();
++      sessionInfo["build_target_dir"] = core::json::Value();
+       sessionInfo["has_pkg_src"] = false;
+       sessionInfo["has_pkg_vig"] = false;
+    }
+@@ -364,7 +364,7 @@
+    sessionInfo["presentation_commands"] = options.allowPresentationCommands();
+ 
+    sessionInfo["tutorial_api_available"] = false;
+-   sessionInfo["tutorial_api_client_origin"] = json::Value();
++   sessionInfo["tutorial_api_client_origin"] = core::json::Value();
+ 
+    sessionInfo["build_state"] = modules::build::buildStateAsJson();
+    sessionInfo["devtools_installed"] = module_context::isMinimumDevtoolsInstalled();
+@@ -375,7 +375,7 @@
+ 
+    // console history -- we do this at the end because
+    // restoreBuildRestartContext may have reset it
+-   json::Array historyArray;
++   core::json::Array historyArray;
+    rstudio::r::session::consoleHistory().asJson(&historyArray);
+    sessionInfo["console_history"] = historyArray;
+    sessionInfo["console_history_capacity"] =
+@@ -447,14 +447,14 @@
+ 
+    sessionInfo["multi_session"] = options.multiSession();
+ 
+-   json::Object rVersionsJson;
++   core::json::Object rVersionsJson;
+    rVersionsJson["r_version"] = module_context::rVersion();
+    rVersionsJson["r_version_label"] = module_context::rVersionLabel();
+    rVersionsJson["r_home_dir"] = module_context::rHomeDir();
+    sessionInfo["r_versions_info"] = rVersionsJson;
+ 
+    sessionInfo["show_user_home_page"] = options.showUserHomePage();
+-   sessionInfo["user_home_page_url"] = json::Value();
++   sessionInfo["user_home_page_url"] = core::json::Value();
+    
+    sessionInfo["r_addins"] = modules::r_addins::addinRegistryAsJson();
+    sessionInfo["package_provided_extensions"] = modules::ppe::indexer().getPayload();
+@@ -491,7 +491,7 @@
+ 
+    // create response  (we always set kEventsPending to false so that the client
+    // won't poll for events until it is ready)
+-   json::JsonRpcResponse jsonRpcResponse;
++   core::json::JsonRpcResponse jsonRpcResponse;
+    jsonRpcResponse.setField(kEventsPending, "false");
+    jsonRpcResponse.setResult(sessionInfo);
+ 
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch
new file mode 100644
index 000000000000..e38f5e0c4448
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch
@@ -0,0 +1,13 @@
+--- rstudio-1.2.1335-orig/src/cpp/server_core/SecureKeyFile.cpp	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/server_core/SecureKeyFile.cpp	2019-04-09 20:47:57.943317208 +1000
+@@ -68,8 +68,8 @@
+          return error;
+ 
+       // change mode it so it is only readable and writeable by this user
+-      if (changeFileMode(secureKeyPath,
+-                         core::system::UserReadWriteMode) < 0)
++      if (!!changeFileMode(secureKeyPath,
++                           core::system::UserReadWriteMode))
+       {
+          return systemError(errno, ERROR_LOCATION);
+       }
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-linker_flags.patch
new file mode 100644
index 000000000000..e07ead68969e
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-linker_flags.patch
@@ -0,0 +1,11 @@
+--- rstudio-1.2.1335-orig/src/cpp/CMakeLists.txt	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/CMakeLists.txt	2019-04-09 17:58:59.926559001 +1000
+@@ -117,7 +117,7 @@
+          add_definitions(-O0)
+          add_definitions(-D_GLIBCXX_ASSERTIONS)
+       endif()
+-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie -Wl,-z,relro,-z,now")
++      set(CMAKE_EXE_LINKER_FLAGS "-pie -Wl,-z,relro,-z,now ${CMAKE_EXE_LINKER_FLAGS}")
+    endif()
+ 
+    # other useful gcc diagnostics
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch
new file mode 100644
index 000000000000..e2fe83867bcd
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch
@@ -0,0 +1,32 @@
+--- rstudio-1.2.1335-orig/src/cpp/session/CMakeLists.txt	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/session/CMakeLists.txt	2019-04-09 17:22:59.210201624 +1000
+@@ -25,9 +25,6 @@
+ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26")
+   message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)")
+ endif()
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
+-  message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
+-endif()
+ 
+ # we often install embedded versions of these packages but don't do so currently
+ 
+@@ -479,19 +476,6 @@
+ install(DIRECTORY "resources/connections"
+         DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
+ 
+-# install pandoc
+-if(WIN32)
+-   set(PANDOC_VERSION "2.6" CACHE INTERNAL "Pandoc version")
+-else()
+-   set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version")
+-endif()
+-
+-set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
+-file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
+-install(FILES ${PANDOC_FILES}
+-        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+-        DESTINATION  ${RSTUDIO_INSTALL_BIN}/pandoc)
+-
+ # install rmarkdown package
+ # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
+ # install(FILES ${RMARKDOWN_PACKAGE}
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch
new file mode 100644
index 000000000000..ba66ef9f0ea1
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch
@@ -0,0 +1,118 @@
+--- rstudio-1.2.1335-orig/CMakeGlobals.txt	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/CMakeGlobals.txt	2019-04-09 17:10:07.680657631 +1000
+@@ -161,7 +161,7 @@
+    set(RSTUDIO_INSTALL_SUPPORTING RStudio.app/Contents/Resources)
+ else()
+    set(RSTUDIO_INSTALL_BIN bin)
+-   set(RSTUDIO_INSTALL_SUPPORTING .)
++   set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE})
+ endif()
+ 
+ # if the install prefix is /usr/local then tweak as appropriate
+--- rstudio-1.2.1335-orig/src/cpp/server/CMakeLists.txt	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/server/CMakeLists.txt	2019-04-09 16:54:34.740739744 +1000
+@@ -194,7 +194,7 @@
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}
+-           DESTINATION ${RSERVER_INITD_DEBIAN_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR})
+ 
+    # install configured redhat init.d script
+    set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")
+@@ -202,7 +202,7 @@
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}
+-           DESTINATION ${RSERVER_INITD_REDHAT_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR})
+ 
+    # install configured suse init.d script
+    set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")
+@@ -210,13 +210,13 @@
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}
+-           DESTINATION ${RSERVER_INITD_SUSE_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR})
+ 
+    # install pam profile
+    set(RSERVER_PAM_DIR "extras/pam")
+    set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}
+-           DESTINATION ${RSERVER_PAM_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR})
+ 
+    # install configured upstart profile
+    set(RSERVER_UPSTART_DIR "extras/upstart")
+@@ -224,12 +224,12 @@
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}
+-           DESTINATION ${RSERVER_UPSTART_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
+    set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf")
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}
+-           DESTINATION ${RSERVER_UPSTART_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
+ 
+     # install configured systemd profile
+    set(RSERVER_SYSTEMD_DIR "extras/systemd")
+--- rstudio-1.2.1335-orig/src/cpp/server/ServerOptions.cpp	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/server/ServerOptions.cpp	2019-04-09 16:54:34.740739744 +1000
+@@ -389,8 +389,8 @@
+ 
+    // convert relative paths by completing from the system installation
+    // path (this allows us to be relocatable)
+-   resolvePath(resourcePath, &wwwLocalPath_);
+-   resolvePath(resourcePath, &wwwSymbolMapsPath_);
++   resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_);
++   resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
+    resolvePath(binaryPath, &authPamHelperPath_);
+    resolvePath(binaryPath, &rsessionPath_);
+    resolvePath(binaryPath, &rldpathPath_);
+--- rstudio-1.2.1335-orig/src/cpp/session/SessionOptions.cpp	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/session/SessionOptions.cpp	2019-04-09 17:17:06.035206050 +1000
+@@ -53,7 +53,7 @@
+ namespace session {  
+ 
+ namespace {
+-const char* const kDefaultPandocPath = "bin/pandoc";
++const char* const kDefaultPandocPath = "bin";
+ const char* const kDefaultPostbackPath = "bin/postback/rpostback";
+ const char* const kDefaultRsclangPath = "bin/rsclang";
+ 
+@@ -569,14 +569,14 @@
+    }
+    
+    // convert relative paths by completing from the app resource path
+-   resolvePath(resourcePath_, &rResourcesPath_);
+-   resolvePath(resourcePath_, &agreementFilePath_);
+-   resolvePath(resourcePath_, &wwwLocalPath_);
+-   resolvePath(resourcePath_, &wwwSymbolMapsPath_);
+-   resolvePath(resourcePath_, &coreRSourcePath_);
+-   resolvePath(resourcePath_, &modulesRSourcePath_);
+-   resolvePath(resourcePath_, &sessionLibraryPath_);
+-   resolvePath(resourcePath_, &sessionPackageArchivesPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_);
+    resolvePostbackPath(resourcePath_, &rpostbackPath_);
+ #ifdef _WIN32
+    resolvePath(resourcePath_, &consoleIoPath_);
+@@ -601,7 +601,7 @@
+    }
+    winptyPath_ = pty.complete(completion).absolutePath();
+ #endif // _WIN32
+-   resolvePath(resourcePath_, &hunspellDictionariesPath_);
++   resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_);
+    resolvePath(resourcePath_, &mathjaxPath_);
+    resolvePath(resourcePath_, &libclangHeadersPath_);
+    resolvePandocPath(resourcePath_, &pandocPath_);
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch
new file mode 100644
index 000000000000..e72df553eeb6
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch
@@ -0,0 +1,53 @@
+--- rstudio-1.2.1335-orig/src/gwt/build.xml	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/gwt/build.xml	2019-04-09 16:44:15.089471934 +1000
+@@ -34,6 +34,7 @@
+    <property name="gwt.extra.args" value=""/>
+    <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/>
+    <property name="ace.bin" value="${src.dir}/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/>
++   <property environment="env"/>
+ 
+    <path id="project.class.path">
+      <pathelement location="${build.dir}"/>
+@@ -112,8 +113,10 @@
+             <pathelement location="${src.dir}"/>
+             <path refid="project.class.path"/>
+          </classpath>
++         <jvmarg value="-Duser.home=${env.T}"/>
+          <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
+          <jvmarg value="-Xmx1536M"/>
++         <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/>
+          <arg value="-war"/>
+          <arg value="${www.dir}"/>
+          <arg value="-localWorkers"/>
+@@ -154,6 +157,7 @@
+             <pathelement location="${src.dir}"/>
+             <path refid="project.class.path"/>
+          </classpath>
++         <jvmarg value="-Duser.home=${env.T}"/>
+          <jvmarg value="-Xmx2048M"/>
+          <arg value="-style"/>
+          <arg value="PRETTY"/>
+@@ -176,6 +180,7 @@
+             <pathelement location="src"/>
+             <path refid="project.class.path"/>
+          </classpath>
++         <jvmarg value="-Duser.home=${env.T}"/>
+          <jvmarg value="-Xmx2048M"/>
+          <arg value="-style"/>
+          <arg value="PRETTY"/>
+@@ -202,6 +207,7 @@
+             <pathelement location="src"/>
+             <path refid="project.class.path"/>
+          </classpath>
++         <jvmarg value="-Duser.home=${env.T}"/>
+          <jvmarg value="-Xmx2048M"/>
+       	<arg value="-src"/>
+       	<arg value = "src"/>
+@@ -237,6 +243,7 @@
+             <pathelement location="${test.dir}"/>
+             <pathelement location="${src.dir}"/>
+         </classpath>
++        <jvmarg value="-Duser.home=${env.T}"/>
+         <classpath refid="project.class.path"/>
+         <classpath refid="unittest.class.path"/>
+         <arg value="org.rstudio.studio.client.RStudioUnitTestSuite"/>
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch
new file mode 100644
index 000000000000..a59fa02f1d2c
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch
@@ -0,0 +1,60 @@
+--- rstudio-1.2.1335-orig/src/cpp/desktop/CMakeLists.txt	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/desktop/CMakeLists.txt	2019-04-09 18:04:57.783616412 +1000
+@@ -140,6 +140,13 @@
+ get_filename_component(QT_LIBRARY_PATH "${QT_BIN_DIR}/../lib"     ABSOLUTE CACHE)
+ get_filename_component(QT_INSTALL_PATH "${QT_BIN_DIR}/.."         ABSOLUTE CACHE)
+ 
++find_path(QTSINGLEAPPLIB_INCLUDE_DIR NAMES QtSingleApplication
++  PATH_SUFFIXES QtSolutions
++  PATHS
++  /usr/include/qt5)
++find_library(QTSINGLEAPPLIB Qt5Solutions_SingleApplication-2.6
++  libQt5Solutions_SingleApplication-2.6)
++
+ # disable clang warnings for qt sources
+ if(APPLE)
+    add_definitions(-Wno-unused-private-field
+@@ -158,7 +165,6 @@
+ 
+ set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES})
+ list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES
+-  ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h
+   ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp
+   ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp
+   ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp
+@@ -224,8 +230,6 @@
+   DesktopSlotBinders.cpp
+   DesktopSubMenu.cpp
+   DesktopSynctex.cpp
+-  3rdparty/qtsingleapplication/qtsingleapplication.cpp
+-  3rdparty/qtsingleapplication/qtlocalpeer.cpp
+ )
+ 
+ if(WIN32)
+@@ -280,6 +284,7 @@
+   ${CORE_SOURCE_DIR}/include
+   ${CMAKE_CURRENT_SOURCE_DIR}
+   ${CMAKE_CURRENT_BINARY_DIR}
++  ${QTSINGLEAPPLIB_INCLUDE_DIR}
+   ${TESTS_INCLUDE_DIR}
+ )
+ 
+@@ -384,6 +389,7 @@
+    # set link dependencies
+    target_link_libraries(rstudio
+       ${RSTUDIO_QTMODULES}
++      ${QTSINGLEAPPLIB}
+       ${QT_LIBRARIES}
+       ${Boost_LIBRARIES}
+       rstudio-core
+--- rstudio-1.2.1335-orig/src/cpp/desktop/DesktopPosixApplication.hpp	2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/desktop/DesktopPosixApplication.hpp	2019-04-09 18:01:39.333920927 +1000
+@@ -16,7 +16,7 @@
+ #ifndef DESKTOP_POSIX_APPLICATION_HPP
+ #define DESKTOP_POSIX_APPLICATION_HPP
+ 
+-#include "3rdparty/qtsingleapplication/QtSingleApplication"
++#include <QtSingleApplication>
+ 
+ #include "DesktopApplicationLaunch.hpp"
+ 
diff --git a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
new file mode 100644
index 000000000000..cc1c95318e3a
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2 pax-utils qmake-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
+PANDOC_VER=1.19.2.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated libressl server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	>=app-text/pandoc-${PANDOC_VER}
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.63:=
+	>=dev-libs/mathjax-2.7.4
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0:*
+	sys-libs/zlib
+	>=virtual/jre-1.8:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.8:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
+		"${FILESDIR}/${PN}-1.0.44-paths.patch"
+		"${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch"
+		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
+		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
+		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
+		"${FILESDIR}/${PN}-1.1.453-boost-1.67.0.patch"
+		"${FILESDIR}/${PN}-1.1.453-core.patch"
+		"${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p1.patch"
+		"${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p2.patch"
+		"${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p3.patch"
+		"${FILESDIR}/${PN}-1.1.463-fix-ptr-int-compare.patch"
+		"${FILESDIR}/${PN}-1.1.463-boost-1.70.0.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || die
+	cp "${DISTDIR}"/chromedriver-linux \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
+	cd dependencies/common || die
+	unpack packrat-${PACKRAT_VER}.tar.gz
+	unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	java-pkg-2_src_prepare
+	egit_clean
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
+	# this sed hack for now. ~RMH
+	sed -i \
+		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
+		src/cpp/server/ServerOptions.cpp \
+		src/cpp/session/SessionOptions.cpp || die
+
+	# use mathjax from system
+	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
+
+	# make sure icons and mime stuff are with prefix
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag: git rev-list -n 1 v${PV}
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.txt \
+		|| die
+}
+
+src_configure() {
+	export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
+	export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
+	export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
+
+	local mycmakeargs=(
+		-DDISTRO_SHARE=share/${PN}
+		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}/usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym "${EROOT}/etc/conf.d/rstudio-server.conf" "/etc/rstudio/rserver.conf"
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	fi
+}
+
+pkg_preinst() {
+	use dedicated || gnome2_icon_savelist
+	java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		gnome2_icon_cache_update ;}
+
+	if use dedicated || use server; then
+		enewgroup rstudio-server
+		enewuser rstudio-server -1 -1 -1 rstudio-server
+	fi
+}
+
+pkg_postrm() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		gnome2_icon_cache_update ;}
+}
diff --git a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
index 271588e60b84..5c0511bb9a52 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
@@ -101,6 +101,7 @@ PATCHES=(
 		"${FILESDIR}/${PN}-1.1.453-core.patch"
 		"${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p1.patch"
 		"${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p2.patch"
+		"${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p3.patch"
 		"${FILESDIR}/${PN}-1.1.463-fix-ptr-int-compare.patch"
 )
 
diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
new file mode 100644
index 000000000000..60a61cb90a35
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2 pax-utils qmake-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.8.1
+GIN_VER=2.1.2
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
+# It should be PANDOC_VER=2.3.1 however >=app-text/pandoc-2.3.1 is not yet in portage
+PANDOC_VER=1.19.2.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated libressl server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	>=app-text/pandoc-${PANDOC_VER}
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.63:=
+	>=dev-libs/mathjax-2.7.4
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0:*
+	sys-libs/zlib
+	>=virtual/jre-1.8:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.8:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+		"${FILESDIR}/${PN}-1.2.1335-prefs.patch"
+		"${FILESDIR}/${PN}-1.2.1335-paths.patch"
+		"${FILESDIR}/${PN}-1.2.1335-pandoc.patch"
+		"${FILESDIR}/${PN}-1.2.1335-linker_flags.patch"
+		"${FILESDIR}/${PN}-1.2.1335-qtsingleapplication.patch"
+		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
+		"${FILESDIR}/${PN}-1.2.1335-core.patch"
+		"${FILESDIR}/${PN}-1.2.1335-fix-ptr-int-compare.patch"
+		"${FILESDIR}/${PN}-1.2.1335-boost-1.70.0_p1.patch"
+		"${FILESDIR}/${PN}-1.2.1335-boost-1.70.0_p2.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || die
+	cp "${DISTDIR}"/chromedriver-linux \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
+	cd dependencies/common || die
+	unpack packrat-${PACKRAT_VER}.tar.gz
+	unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	java-pkg-2_src_prepare
+	egit_clean
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
+	# this sed hack for now. ~RMH
+	sed -i \
+		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
+		src/cpp/server/ServerOptions.cpp \
+		src/cpp/session/SessionOptions.cpp || die
+
+	# use mathjax from system
+	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
+
+	# make sure icons and mime stuff are with prefix
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag: git rev-list -n 1 v${PV}
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.txt \
+		|| die
+}
+
+src_configure() {
+	export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
+	export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
+	export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
+
+	local mycmakeargs=(
+		-DDISTRO_SHARE=share/${PN}
+		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}/usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym "${ED}/etc/conf.d/rstudio-server.conf" "/etc/rstudio/rserver.conf"
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	fi
+}
+
+pkg_preinst() {
+	use dedicated || gnome2_icon_savelist
+	java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		gnome2_icon_cache_update ;}
+
+	if use dedicated || use server; then
+		enewgroup rstudio-server
+		enewuser rstudio-server -1 -1 -1 rstudio-server
+	fi
+}
+
+pkg_postrm() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		gnome2_icon_cache_update ;}
+}
diff --git a/sci-mathematics/spass/Manifest b/sci-mathematics/spass/Manifest
index fe06a9388497..3f6eac8e73fd 100644
--- a/sci-mathematics/spass/Manifest
+++ b/sci-mathematics/spass/Manifest
@@ -1,5 +1,3 @@
-DIST spass37.tgz 1340925 BLAKE2B 5b71778702f61a62e1ec6bd6136fb53ab50f746cab9437510a22141702384b425502c321651910f881c908d0d5640a223ae632e2e0c0f9dbd347cd7ee5c435f6 SHA512 5b4efd7b767dfee3f24e7917a6ec58ac240ab33bf601722eabd50af57637d8fdd62de9e34e7cd1cd98b8b7e371c9e2d47c8fa3e07c6e7ce2fa616a76646a4e12
 DIST spass39.tgz 554633 BLAKE2B ca2215f205215805eace6abae82ad281bdadd75f2a52cfe3fed43cb15a4955a4e4d2375fc73a546592315540a7596494bc0df4c53996fd9299e901f68a81ddc8 SHA512 d7ea0697426c476f2e03b2f9078b7e060671067a67fad7144bb5887a2dd3f39e19e1888f121fce546b5d6ea9a4dc458d1cbec56b59c93507e7dc2d0afa25a89b
-EBUILD spass-3.7.ebuild 1991 BLAKE2B db0b3f9a499dadfa94d30838fcf59fa35f2cb463501502448e5301cb0532efdac20a9131960e85d0cd12cb8abd2dbd5a2a8721a107b4906b9d051aaa3271a562 SHA512 a155b205249cd9e80b274d8316d42e3a69d60aeecaabe4162b8b6225433a138b5b33605cde7dea391b65c9acb97f65807e0bbf7f2eb9fbe7970e38c81cccb33b
-EBUILD spass-3.9.ebuild 4528 BLAKE2B 4004195f26de851c50a4d0d9631bf08fa808a45db3efb2421823097bceda8da062c048020bb84b187d4bdbcfdea74e641226935150dfc105cf698a7949f9f977 SHA512 5cd41de9201063f2ebf696b5cdd1cf2572e6e0e99282c41a0fd3a92ea8589337da63e4392e0e45257b79dd667d986f7206655310696372ce433e43f5473a6f2c
+EBUILD spass-3.9.ebuild 4528 BLAKE2B cde0847e8e2779971f33c1901f4601083c7490082d987a3286c89b1b7c72b8f5c5824aa3762f3eab99b4748c17f0cc6e38bd6f5ced7cf66ff87e4a013b6349a0 SHA512 e00e0c0a2fe8ffc3b5e5ff193a90ed002ffb0a7173cd31837351d32e86201b4bb0296ee49e203ebba9b67f948448f93e3f8acd317f1f800691d6b8a9ed3b0a2f
 MISC metadata.xml 577 BLAKE2B 7d0a60f31459c0a514ae829d1a56efdb55ac0abb5c5202e1e8400755ae4593ef183e9770e2308545af2b17ad7e385d15c48a9ee630a3cd20d1feb5f0edc189d1 SHA512 7cd50f06b202828fd682e2f44d361b393cc89f0468001970c2ad807e26d7fa5399cba09e6805a937cfba9c56019b67ab3dec422a989e16cbb5216fa76c253285
diff --git a/sci-mathematics/spass/spass-3.7.ebuild b/sci-mathematics/spass/spass-3.7.ebuild
deleted file mode 100644
index 6f16128d8a8c..000000000000
--- a/sci-mathematics/spass/spass-3.7.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-MY_PV=$(delete_all_version_separators "${PV}")
-MY_P="${PN}${MY_PV}"
-
-DESCRIPTION="An Automated Theorem Prover for First-Order Logic with Equality"
-HOMEPAGE="http://www.spass-prover.org/"
-SRC_URI="http://www.spass-prover.org/download/sources/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples isabelle"
-
-RDEPEND="isabelle? (
-			>=sci-mathematics/isabelle-2011.1-r1:=
-		)"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/SPASS-${PV}"
-
-src_prepare() {
-	sed \
-		-e "s:-O3:${CFLAGS}:g" \
-		-i configure || die
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		insinto /usr/share/${PN}/
-		doins -r examples
-	fi
-
-	if use isabelle; then
-		ewarn "All open source versions of spass are broken with Isabelle 2016.1"
-		ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f 2)"
-		[[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
-		dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		cat <<- EOF >> "${S}/settings"
-			SPASS_HOME="${ROOT}usr/bin"
-			SPASS_VERSION="${PV}"
-		EOF
-		insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		doins "${S}/settings"
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [ -f "${ROOT}etc/isabelle/components" ]; then
-			if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then
-				sed -e "/contrib\/${PN}-[0-9.]*/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-			cat <<- EOF >> "${ROOT}etc/isabelle/components"
-				contrib/${PN}-${PV}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [ ! -f "${ROOT}usr/bin/SPASS" ]; then
-			if [ -f "${ROOT}etc/isabelle/components" ]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new spass being installed during an upgrade.
-				sed -e "/contrib\/${PN}-${PV}/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/spass/spass-3.9.ebuild b/sci-mathematics/spass/spass-3.9.ebuild
index 8fdbb7ebb633..c702deaec240 100644
--- a/sci-mathematics/spass/spass-3.9.ebuild
+++ b/sci-mathematics/spass/spass-3.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit versionator
+inherit toolchain-funcs
 
-MY_PV=$(delete_all_version_separators "${PV}")
+MY_PV=$(ver_rs 1- '' "${PV}")
 MY_P="${PN}${MY_PV}"
 
 DESCRIPTION="An Automated Theorem Prover for First-Order Logic with Equality"
@@ -108,7 +108,7 @@ src_install() {
 		[[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
 		dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
 		cat <<- EOF >> "${S}/settings"
-			SPASS_HOME="${ROOT}usr/bin"
+			SPASS_HOME="${EROOT}/usr/bin"
 			SPASS_VERSION="${PV}"
 		EOF
 		insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
@@ -118,12 +118,12 @@ src_install() {
 
 pkg_postinst() {
 	if use isabelle; then
-		if [ -f "${ROOT}etc/isabelle/components" ]; then
-			if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then
+		if [ -f "${EROOT}/etc/isabelle/components" ]; then
+			if egrep "contrib/${PN}-[0-9.]*" "${EROOT}/etc/isabelle/components"; then
 				sed -e "/contrib\/${PN}-[0-9.]*/d" \
-					-i "${ROOT}etc/isabelle/components"
+					-i "${EROOT}/etc/isabelle/components"
 			fi
-			cat <<- EOF >> "${ROOT}etc/isabelle/components"
+			cat <<- EOF >> "${EROOT}/etc/isabelle/components"
 				contrib/${PN}-${PV}
 			EOF
 		fi
@@ -132,13 +132,13 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if use isabelle; then
-		if [ ! -f "${ROOT}usr/bin/SPASS" ]; then
-			if [ -f "${ROOT}etc/isabelle/components" ]; then
+		if [ ! -f "${EROOT}/usr/bin/SPASS" ]; then
+			if [ -f "${EROOT}/etc/isabelle/components" ]; then
 				# Note: this sed should only match the version of this ebuild
 				# Which is what we want as we do not want to remove the line
 				# of a new spass being installed during an upgrade.
 				sed -e "/contrib\/${PN}-${PV}/d" \
-					-i "${ROOT}etc/isabelle/components"
+					-i "${EROOT}/etc/isabelle/components"
 			fi
 		fi
 	fi
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index c5b5ce4b3c7e..f2bef769e92f 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/ViSP-images/Manifest b/sci-misc/ViSP-images/Manifest
index 4c07f6dfbdf0..f782535f9096 100644
--- a/sci-misc/ViSP-images/Manifest
+++ b/sci-misc/ViSP-images/Manifest
@@ -1,5 +1,7 @@
 DIST ViSP-images-3.0.1.zip 70498859 BLAKE2B a1b64e49337713c6ed96d471d8e94ca37a149359e736e28dcc87e3d9d75a8f8a7d0147bba822f4889122d235b86b0aac7d7db4647067416056476d13d41881bc SHA512 b3fac5b08a9aad24c27e9f887a096386995a30af616c0137ca2e61445c96dc474a905604133740d550827f7e67d2c0d492774e0c0277e4ca44c5df6df06c8477
 DIST visp-images-3.1.0.zip 81133842 BLAKE2B 6702582d4cbd53b72edfa57999cf42069ec5b3f5179983368552f72fdfdf5480a7e25f87dcf5e53856b310f83c5e0bb872e8353aeea1032c73ee00bd0a77f618 SHA512 0d865234c1f6278a9f0bd3bfc58aeb9083e7ee8a748b2f7ab96d3aedd21ef164cbf1dc3113facfafdbac2e0256aa932b8b5f8efa2e348f1ce834c50e703cf14d
+DIST visp-images-3.2.0.zip 84366211 BLAKE2B a0cb17bf7e79ed187a40f229b236e83127bd449f48a4046c21235f6f6cd37b25a324ba74c1337a110b91a42789249e71ce86fc2fa81e1573733db1bf4fff1cc5 SHA512 1249f63ca648e0248d6dcc13ae19a8485d347c90f3f929d4725909ec1b25962f58a999e8feed664ed51ccba9a3ba95a184385aabd0a5aef88f118dbb2a020c14
 EBUILD ViSP-images-3.0.1.ebuild 503 BLAKE2B 6e4bf456707cbc22048c5930e08cab78fcfc171a426dd2311b024b11dc73f5ef64b603249f0734b9f3e8bbb4add346707cd9ab5c90e905940e6ee4667eea08b4 SHA512 ebee1ff121e00f304aa6e2769c347334c1924acd00907a08a1442a33ef69077359faf01dbe8def2ff5e4dafd34e5f6822226e7bb7e1c473f891cd1d2a9ec1db9
 EBUILD ViSP-images-3.1.0.ebuild 550 BLAKE2B 27fe8cf848925371eb2b5fa8310edc386ee49e6a6a2a9c0dcf19120e8dd64dcead041d33ebe1af88a18beba51441bf6168b434fab6fd37cd9509584314bade49 SHA512 3ac46e91dfe5585d7557c96bf1b77d92124de4a3d93ec92654f0727dbf40ffbe8a60fd7e7bcf760cf312182be04d05bd9cb66888a93569ce21255ed00902ac3e
+EBUILD ViSP-images-3.2.0.ebuild 547 BLAKE2B e8a9da04ebb39e8bb5140d5be1ccf87b507f79e830fa94c2be74ca43d1f7e194c7dfd47342f832398e60338a03d1647d8d838be9d5f1368d6ffd1b6b343f2f7f SHA512 6ac2b1294ab67aa5379e0834b2e6df45a29eab46d7e79d55b2044ee9ddda11daee387277b933031d12c09f4765b560892730748fc5d2328bf862a75a1a38b01e
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-misc/ViSP-images/ViSP-images-3.2.0.ebuild b/sci-misc/ViSP-images/ViSP-images-3.2.0.ebuild
new file mode 100644
index 000000000000..ff0ecbb3bdf4
--- /dev/null
+++ b/sci-misc/ViSP-images/ViSP-images-3.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="ViSP images data set"
+HOMEPAGE="http://www.irisa.fr/lagadic/visp/"
+SRC_URI="http://visp-doc.inria.fr/download/dataset/visp-images-${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}/visp-images-${PV}"
+
+src_install() {
+	dodoc README.md
+	rm -f README.md LICENSE.txt
+	dodir /usr/share/visp-images-data/
+	mv "${S}" "${ED}/usr/share/visp-images-data/${PN}"
+}
diff --git a/sci-misc/gt-itm/Manifest b/sci-misc/gt-itm/Manifest
index 17977e50792f..c08ad6271576 100644
--- a/sci-misc/gt-itm/Manifest
+++ b/sci-misc/gt-itm/Manifest
@@ -1,5 +1,5 @@
 AUX gt-itm-implicits.patch 2731 BLAKE2B b8aaea5e6016d9c3e6badc3a5f02f83188830bbe79501183dbfea9453d3af51479d46e83a7053eb86241a203c3a808f8e9a0d78cb350c01eb9d6c6483be4bc91 SHA512 64dc41be9d914e1df68780576300c54aa8091862b37ae44b5530312b8eaafbda76d97021f62544bce7c57e447959eea5a83c72074a714b4894bf4fddc79b5fe7
-DIST gt-itm.tar.gz 623345 BLAKE2B e9cf712d6a4411cbb66faf9bbd803bb3753ebbbd05174c02581c9b606e02f1c7132b0b96f483e3f273a28aebd64a8ede046de7397ddb9606efccad59ba137524 SHA512 e775ac475d40fc753a27fb619f262d701818190fa3be90d587f95e215610918b56b9d67783d4e7e2f55d0064e5b2d2ce911042353b29bce1e4dbcf407ff9fabc
-DIST sgb2ns.tar.gz 50635 BLAKE2B b669d9def20c7e149de33072467183190f85b7fb30662cad83c53c1d9317532a1bd95174498eebd13b98eccf2ac693159793a40b667cdc97a6f15fbd027e0975 SHA512 77ec6fdad61f43bf078851852aa03dfea02df235a78853e477dacc8e2b94c0d8bda9772fc00d18fdaeabc419b2780c016b7a64a1a06ac0be2c8c2aa6608c06cf
-EBUILD gt-itm-19961004-r2.ebuild 2077 BLAKE2B 7628ed27586f3a71e15c71ca0863ff7dd49b5b6a087524060e28c0467dbf7c0db039b46bb41fe38de5c0191496957d6fcd51f8dc8658ee329b5996c90f92fff7 SHA512 eb9a4a175782790a4d473ed74721b3aa13df0fba4fca34831cdca7474059e596e8081fc92ff16024f49d05d8ef40ebad4f88b836145999bf2c9d79b4f6c54e02
+DIST gt-itm-19961004.tar.gz 623345 BLAKE2B e9cf712d6a4411cbb66faf9bbd803bb3753ebbbd05174c02581c9b606e02f1c7132b0b96f483e3f273a28aebd64a8ede046de7397ddb9606efccad59ba137524 SHA512 e775ac475d40fc753a27fb619f262d701818190fa3be90d587f95e215610918b56b9d67783d4e7e2f55d0064e5b2d2ce911042353b29bce1e4dbcf407ff9fabc
+DIST sgb2ns-19961004.tar.gz 50635 BLAKE2B b669d9def20c7e149de33072467183190f85b7fb30662cad83c53c1d9317532a1bd95174498eebd13b98eccf2ac693159793a40b667cdc97a6f15fbd027e0975 SHA512 77ec6fdad61f43bf078851852aa03dfea02df235a78853e477dacc8e2b94c0d8bda9772fc00d18fdaeabc419b2780c016b7a64a1a06ac0be2c8c2aa6608c06cf
+EBUILD gt-itm-19961004-r2.ebuild 2118 BLAKE2B ce805335d8360fd8fb6f268a5a1afb0c573f514ceca3401786f6c1048da8ba30f3a57863eb2c53af1a0c0abdcefa3235ba4ca9ac294fd137ce8a26f3ddcaed61 SHA512 5504fb37e2fcdc8469cebdacbdf5cbc3bf85ded66154a91a85419a16f946f9d8fff9c3e7f8037e5ab34f811aa790e9a754fd6e41f99e327b93bdca6d7ab54e1d
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild b/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild
index 36c7552cf47e..99585d83edfe 100644
--- a/sci-misc/gt-itm/gt-itm-19961004-r2.ebuild
+++ b/sci-misc/gt-itm/gt-itm-19961004-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
@@ -7,9 +7,9 @@ inherit toolchain-funcs
 
 DESCRIPTION="Routines to generate / analyze graphs using models for internetwork topology"
 HOMEPAGE="http://www.cc.gatech.edu/fac/Ellen.Zegura/graphs.html
-		  http://www.isi.edu/nsnam/ns/ns-topogen.html#gt-itm"
-SRC_URI="http://www.cc.gatech.edu/fac/Ellen.Zegura/gt-itm/gt-itm.tar.gz
-		 http://www.isi.edu/nsnam/dist/sgb2ns.tar.gz"
+		http://www.isi.edu/nsnam/ns/ns-topogen.html#gt-itm"
+SRC_URI="http://www.cc.gatech.edu/fac/Ellen.Zegura/gt-itm/gt-itm.tar.gz -> ${P}.tar.gz
+		http://www.isi.edu/nsnam/dist/sgb2ns.tar.gz -> sgb2ns-${PV}.tar.gz"
 
 LICENSE="all-rights-reserved sgb2ns"
 SLOT="0"
@@ -27,12 +27,13 @@ PATCHES=( "${FILESDIR}"/${PN}-implicits.patch )
 DOCS=( README docs/. )
 
 src_unpack() {
-	unpack sgb2ns.tar.gz
+	unpack "sgb2ns-${PV}.tar.gz"
 
 	mkdir "$S" || die
 	cd "$S" || die
-	unpack gt-itm.tar.gz
+	unpack "${P}.tar.gz"
 }
+
 src_prepare() {
 	sed -ri -e '/^[[:alnum:]]+\.o:/d' \
 		-e 's|LIBS = -lm -lgb.*|LIBS = -lm -lgb|' \
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 1e516839373a..8febcca3a63f 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/harminv/Manifest b/sci-physics/harminv/Manifest
deleted file mode 100644
index 98b53f4c6021..000000000000
--- a/sci-physics/harminv/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX harminv-1.3.1-configure.ac.patch 965 BLAKE2B f5cebe4567fe94dd38d04c380bc4d1cfdfb8c84814ae70eeee6ec7524da9f4c6ec7538109562f0b7518194a357aedffbde14c6e53890a44aafc5c71b0cf1d7b6 SHA512 c177dae71d23df73f09d1754edfcbb464970b6bb987c46f880d3eee288ab69a293b885b85414b519a32323e8c5f83f853d68339eaed2b8d4c5734c5e55a96691
-DIST harminv-1.3.1.tar.gz 327832 BLAKE2B 5aa80f6cde0409d4daaaf9923e17a97a5592321e5d3c671d6ae07e68e62d42e987e51944ecb3d27fe1bff3cab0754c6e6ec8565e1c5ba34471896f2d6bdee0e7 SHA512 7dc1c2f658d9722cd64558a702f04409d10b87cb4ff7247c2fbd7f8d9a24387fef1b8ba4b7b183727bef21891c32d27d83aaa3607d063f8ad60702be4bfe5c3c
-EBUILD harminv-1.3.1-r1.ebuild 753 BLAKE2B 1da92a3b0405c4a7a4ea0d91a604b9ebce3c349e2a8f79010d3dc8075d77675e348d93d69dfb79776efab7cc34f4a55ef603b95c625b35e1f26a367a310bd77f SHA512 4eafc9b442d5463971bafcd57003073544117fa04510e42ed0e8d62032b072fee1e5d6d42c802596aed67371b66cc4647a7f814e2cde8c9334f0647e09d37729
-MISC metadata.xml 632 BLAKE2B 427eda18fb4a538628cf1854ee0c1e48a76997ffe248ec971c5324e53a847cc3c87dcdc76dab8fcc0c51589c17344f100a8dff8b3e2d201b0d91a57e7593ce70 SHA512 ec47048cde692010d9b562d430992630d9107e65d401a7f429a2e0658c8edaab2f200b2d84c233fe6481330c0ded1ff6672fd3b7b9f75a5130129e3037b9da9d
diff --git a/sci-physics/harminv/files/harminv-1.3.1-configure.ac.patch b/sci-physics/harminv/files/harminv-1.3.1-configure.ac.patch
deleted file mode 100644
index 508a8c177902..000000000000
--- a/sci-physics/harminv/files/harminv-1.3.1-configure.ac.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -9,7 +9,7 @@
- # *not* the same as the "public" version number.  CURRENT:REVISION:AGE
- SHARED_VERSION_INFO="2:4:0"
- AC_SUBST(SHARED_VERSION_INFO)
--AM_ENABLE_SHARED(no) dnl shared libs cause too many headaches to be default
-+AM_ENABLE_SHARED(yes) dnl shared libs cause too many headaches to be default
- 
- ##############################################################################
- 
-@@ -123,9 +123,16 @@
- ###########################################################################
- 
- # Checks for BLAS/LAPACK libraries:
--
--ACX_BLAS([], [AC_MSG_ERROR([BLAS library not found])])
--ACX_LAPACK([], [AC_MSG_ERROR([LAPACK library not found])])
-+sinclude(acx_blas.m4)
-+ACX_BLAS
-+if test x"$BLAS_LIBS" = x ; then
-+   AC_MSG_ERROR([BLAS library not found])
-+fi
-+sinclude(acx_lapack.m4)
-+ACX_LAPACK
-+if test x"$LAPACK_LIBS" = x ; then
-+   AC_MSG_ERROR([LAPACK library not found])
-+fi
- 
- LIBS="$LAPACK_LIBS $BLAS_LIBS $LIBS $FLIBS"
- 
diff --git a/sci-physics/harminv/harminv-1.3.1-r1.ebuild b/sci-physics/harminv/harminv-1.3.1-r1.ebuild
deleted file mode 100644
index 396cc6fe8440..000000000000
--- a/sci-physics/harminv/harminv-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Extraction of complex frequencies and amplitudes from time series"
-HOMEPAGE="http://ab-initio.mit.edu/harminv/"
-SRC_URI="http://ab-initio.mit.edu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-configure.ac.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-}
diff --git a/sci-physics/harminv/metadata.xml b/sci-physics/harminv/metadata.xml
deleted file mode 100644
index 5ddaae490a92..000000000000
--- a/sci-physics/harminv/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-physics@gentoo.org</email>
-    <name>Gentoo Physics Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  Harminv is a program to solve the problem of harmonic inversion,
-  given a discrete-time, finite-length signal that consists of a sum of
-  finitely-many sinusoids (possibly exponentially decaying) in a given
-  bandwidth, it determines the frequencies, decay constants, amplitudes,
-  and phases of those sinusoids.
-</longdescription>
-</pkgmetadata>
diff --git a/sci-physics/meep/Manifest b/sci-physics/meep/Manifest
deleted file mode 100644
index c4694fe3022d..000000000000
--- a/sci-physics/meep/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX meep-1.2-no-auto-mpb.patch 652 BLAKE2B d5e2eadafa10bd9b2aa58f0eae3f57f297ef874a1a89b89dd3d0e44910738490d348e5e61ac345088f90a9b6c5dae36c9863a82b2efc4393361366e5c71b2065 SHA512 4a25e919ac828920fb1ad2395acb897e0b9d9123fa55ee3ed33a4c07e79d250602cb496435482710315c077d3d5408d0192d629afd70dca64aedc7a649c7091f
-AUX meep-1.2-pc-no-ldflags.patch 503 BLAKE2B c571fd76c2ad9449245cb6fee07bcef8d815814e486a28e5d8283ce696d0feb0424319020b368cd7ebaa4685f2fec47747516ffed74e31620671bc1e7b73a921 SHA512 2e8602f21814f4edef4b0572180b0b4f41f91a23d7e2576da6a2c62d602e55e9a70b5c7124cb60b7ea4d2f6debd10db3a30aa451d4b6d82eed7a7d9655a26a82
-DIST meep-1.3.tar.gz 740890 BLAKE2B e94fe9709c42ff99f764e34e0db0aa7dc7a8dfa640f539d44e952bf9870686956a8cbf24d3ce0fae95f44c659b5a19075b6377ef2aa68fb51166f09a3e0f7a3b SHA512 4ad8d68f27d9971fe6dd4b8440f78d5b141fe747a80c50da55ecbc56a5beb0c2d31441fb46b54cac3c62d4cb34cb1ce6819c06bd2c54bc35f129ba683dc84aea
-EBUILD meep-1.3.ebuild 1137 BLAKE2B 09c1a9a0c3aa185d11f06e65a523ab03b7dfe7a7725b926d68b46b39f97cee9abd987ff0266a01f85929f41a764da2dd54e056136289374fa061e6fd2a485513 SHA512 c4bfee913eb8d32b0e5f67ffa87a27eff18292dcf3302b29fe1531865e02b564e8c8f43bdc4f4d8d357275238f827d82c4102fc5e68726a9ff67f7ea93ad3da9
-MISC metadata.xml 525 BLAKE2B 3dbcefd51f53261e0adee37fc29279cc1b0bd9df58027ebd50b7373a41fa1af8e9c35d72a3eefad6b0e23b9108c0b5ab2a8ce923a3e1f982d4982c49b46367f1 SHA512 1d6f8f93e9ad60102daeabf5a6017f0f3724b2bfa2ecfca30e6e2069bb624e5067a8743b8839996b3eadc627f431b84b911b2ea4de9a5a97ee30921e158318cd
diff --git a/sci-physics/meep/files/meep-1.2-no-auto-mpb.patch b/sci-physics/meep/files/meep-1.2-no-auto-mpb.patch
deleted file mode 100644
index 8c287f208d65..000000000000
--- a/sci-physics/meep/files/meep-1.2-no-auto-mpb.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur meep-1.2.orig/configure.ac meep-1.2/configure.ac
---- meep-1.2.orig/configure.ac	2012-08-14 21:52:13.000000000 +0100
-+++ meep-1.2/configure.ac	2012-08-14 22:00:55.000000000 +0100
-@@ -161,8 +161,10 @@
- 
- ###########################################################################
- # MPB library
--
--AC_CHECK_HEADER(mpb.h, [have_mpb=maybe], [have_mpb=no])
-+AC_ARG_WITH(mpb, [AC_HELP_STRING([--without-mpb],[do not build with mpb])], ok=$withval, ok=yes)
-+if test "$ok" = "yes"; then
-+   AC_CHECK_HEADER(mpb.h, [have_mpb=maybe], [have_mpb=no])
-+fi
- 
- if test $have_mpb = maybe; then
-   if test "x$acx_lapack_ok" = x -a "$have_harminv" = xno; then
diff --git a/sci-physics/meep/files/meep-1.2-pc-no-ldflags.patch b/sci-physics/meep/files/meep-1.2-pc-no-ldflags.patch
deleted file mode 100644
index d7b2f72eaffc..000000000000
--- a/sci-physics/meep/files/meep-1.2-pc-no-ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur meep-1.2.orig/configure.ac meep-1.2/configure.ac
---- meep-1.2.orig/configure.ac	2012-08-14 21:52:13.000000000 +0100
-+++ meep-1.2/configure.ac	2012-08-14 21:54:49.000000000 +0100
-@@ -224,7 +224,7 @@
- ##############################################################################
- # Libraries and flags (other than -lmeep) required to link Meep:
- 
--MEEPLIBS="$LDFLAGS $LIBS"
-+MEEPLIBS="$LIBS"
- AC_SUBST(MEEPLIBS)
- 
- ##############################################################################
diff --git a/sci-physics/meep/meep-1.3.ebuild b/sci-physics/meep/meep-1.3.ebuild
deleted file mode 100644
index 6cc3d1495390..000000000000
--- a/sci-physics/meep/meep-1.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Simulation software to model electromagnetic systems"
-HOMEPAGE="http://ab-initio.mit.edu/meep/"
-SRC_URI="http://ab-initio.mit.edu/meep/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples hdf5 guile mpi"
-
-RDEPEND="
-	sci-libs/fftw:3.0=
-	sci-libs/gsl:=
-	sci-physics/harminv
-	guile? ( >=sci-libs/libctl-3.2 )
-	hdf5? ( sci-libs/hdf5:= )
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2-pc-no-ldflags.patch
-	"${FILESDIR}"/${PN}-1.2-no-auto-mpb.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with mpi) \
-		$(use_with hdf5) \
-		$(use_with guile libctl)
-}
-
-src_test() {
-	# pml test buggy with optimization on
-	# http://thread.gmane.org/gmane.comp.science.electromagnetism.meep.general/4579
-	emake -C tests pml CXXFLAGS="-O0"
-	emake check
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-physics/meep/metadata.xml b/sci-physics/meep/metadata.xml
deleted file mode 100644
index a6fba91cb5cc..000000000000
--- a/sci-physics/meep/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>sci-physics@gentoo.org</email>
-  <name>Gentoo Physics Project</name>
-</maintainer>
-<longdescription lang="en">
-  The MIT Electromagnetic Equation Propagation (MEEP) is a
-  finite-difference time-domain (FDTD) simulation software package
-  developed at MIT to model electromagnetic systems, along with the MPB
-  eigenmode package.
-</longdescription>
-</pkgmetadata>
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 4ac672a7714c..61a1c2fa9bba 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -13,5 +13,5 @@ EBUILD root-6.12.06-r11.ebuild 7866 BLAKE2B e12510ed1d12803dd4bac0ad21616aa3d1ce
 EBUILD root-6.14.08-r4.ebuild 8052 BLAKE2B 82c9067edf53e5102ccbe89c63e3ab122d17dacf2cc686e0c7450238b110fb796490dc8887d59b2c7287f4a74fc05d773fdfab11aa7a6d932b82993349699105 SHA512 5027873eefb0f5655f8d990ed434a84a0a72f39561fca2e6537b9248406c48ad8636f46942680c62d47665629fc80bcd54092852ea6b954946b3ac980efa1dbb
 EBUILD root-6.16.00-r3.ebuild 8138 BLAKE2B f87aa6680d0ff4887ae4149e16d38dd525056441f8465d4375059eec662de50cecb9eb64d00e76f4895d11bafb2dbbd2f47113e7b5cd008d6f25f67b78a7c0d0 SHA512 1e3d0a46d8b3198fe6334a9f8ebfe47144da445042e9fb43a53328c42bfa29e246347586861a83fd594000af458ad2db52f8950fd309547b4b71f7c6f6d6d967
 EBUILD root-6.18.00-r2.ebuild 7600 BLAKE2B 7522424247f422a763fb957948bc4e39a8121daaa79476b1d14d849afb7856ea1df18a6bf2f900b37add07cdadc4779808f70cbaed2123385759187163339a03 SHA512 f3d7fc72787d547382487d0496729f392af6617372a73acf0d6b7cec16faa8c029d739e61ad0a198cb95299b959ca0efbc75552e6ccd24bc98b1ac1016bcc81a
-EBUILD root-9999.ebuild 7616 BLAKE2B d1c3f74707686d2d4804f6efac7cfa734479e86619cbd1a8c977187535555e2ae759d27171f1d9c7ee0b13b7dc98ac5cffa87bc1bbe3a813ce94db083b35181d SHA512 bc88053326c6a61dff904107437fcb7e3ae3b714b3afd39ca7530785716f155c2275811fbf3801ed3364dccdfaa2b0b50a6287d1106ce02197d2cfcedca1194d
+EBUILD root-9999.ebuild 7517 BLAKE2B 6cee68b58c2e6fe2d30ffbb08af824a40e2b815aff1980c8d4d39f80579749d9f92b2e3eab3628bd368d5b3fa624d368d0f1657610a04d580cae3fa1f0a7cd49 SHA512 bd21527629e472f870036afea07d4222a03ab69e9238d8201c5eacdc2ce3025561be636aa430d6530bffdb8d7f66c193a657ba39d870eab7aae01614516d6350
 MISC metadata.xml 3218 BLAKE2B f23175b1a5998bbecdcdb6e5f42d08bd8e16aaeee79f43d30e0906977f389e18a19ddceeba24009360c2f717c29162c8e30b807bda993492f27429802dc62883 SHA512 d3bdc5bce1d1ac904e5a7a9f21bca65deb480ecbd1362a3251c93e09ab07fdcdd6dfd8900e62df3853b7e200880850d9010122500a081fdedb6b43adae25a6bd
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 0b58a32c0138..e841fafab73c 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -16,9 +16,9 @@ HOMEPAGE="https://root.cern"
 
 IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs
 	+examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit
-	mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8
-	+python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva
-	+unuran vc vmc +xml xrootd"
+	mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python
+	qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc
+	vmc +xml xrootd"
 
 if [[ ${PV} =~ "9999" ]] ; then
 	inherit git-r3
@@ -136,10 +136,6 @@ src_prepare() {
 
 	# CSS should use local images
 	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
-
-	if use nosplash; then
-		sed -i -e '/bool gNoLogo/s@false@true@' rootx/src/rootx.cxx
-	fi
 }
 
 # Note: ROOT uses bundled clang because it is patched and API-incompatible
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index ac09ebbcd0e6..b93962839776 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index 318b3121e17e..cd33a91b18d5 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -2,5 +2,4 @@ AUX 50epix-gentoo.el 298 BLAKE2B 236677e59724ddda6cca138c5e049250798a249373558ca
 AUX epix-1.2.10-autotools.patch 2701 BLAKE2B 1478b23499deda305b94b26e9b680131bcecf6dc633d35187f9e9fc3fa7ee500e6b679eb6ade85564b631e7d207c3e0c0cb4ee1caf42779ff1477e1a55e5fd31 SHA512 c94beae67c28ceff6cd4445272574e6cb93f4c181cddb4023587d20e2fed1bea523891191f80b6dd8870f167cbcae2567cd014b6a20aafbb6a74624c76e54cac
 DIST epix-1.2.11_withpdf.tar.bz2 1709429 BLAKE2B db9cba5b94e27742347f8fc85366399016438681a7016077966e5048b9a178404af8305da7d170722aaac82d85283552f87fbba76b21e788fee546b0e0aebf43 SHA512 16d0edf13711e469a13faba83d47fbab983277a95cfed0e343089258da0b8a56104af9fc217aaa70928c50f10e7d152df93c3638cf2a65a2833142645a829a45
 EBUILD epix-1.2.11-r1.ebuild 1531 BLAKE2B 26de585b5c8316dad3df7da42493799acfcfb95f9bb0da3af4e53e7398ec11b701423324248501a56d2b67df9cdabf56cc3806864b7717d64591c6522d1674cb SHA512 712a89e7286ce16cf00df72571ae3bd15fbb90f85bfc5078230056c766c6f74ba2b434707526ba9d3f25670fcc91d1e5e80766396f2c69ca7ffb097270e9a438
-EBUILD epix-1.2.11.ebuild 1534 BLAKE2B 671f0d198da96fd9b06bc81c89521478d1290039a5de1a35dbdfb9cc42da7fdb3be0b90371e0330c6c464f574e3b1ed4a7e03fc6d17155594f2222668dbcb22a SHA512 8bc004f857a1a4297a32619f8a6d472dd0ed44b82ba3f486283fc44feb475ee3f231463f84f62a4970d3eb57b8a4af9cea09cc00a83528d73e7f930d251007e1
 MISC metadata.xml 779 BLAKE2B 2e6405de37d7ed3e85eb865d140a599b1de484f9cc5c35eda7be384259b34bbed06aa84dffc8a5b1b05c6db18a5d0bd1b0f28c9969a8aac933582bf0d1c9cc2a SHA512 b0cb62a782873b0e2e115f18495f520f3fb5cf06052d6fdae023a65a3a40fb2eaf355ffacf0243149d9890d8f56be87dbbdaf459b05ae32b877037e7ff2bc5e9
diff --git a/sci-visualization/epix/epix-1.2.11.ebuild b/sci-visualization/epix/epix-1.2.11.ebuild
deleted file mode 100644
index 7f6af033a27c..000000000000
--- a/sci-visualization/epix/epix-1.2.11.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp-common bash-completion-r1 autotools eutils
-
-DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
-HOMEPAGE="http://mathcs.holycross.edu/~ahwang/current/ePiX.html"
-SRC_URI="http://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc emacs examples"
-
-DEPEND="
-	virtual/latex-base
-	dev-texlive/texlive-pstricks
-	dev-texlive/texlive-pictures
-	dev-texlive/texlive-latexextra
-	dev-tex/xcolor
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.10-autotools.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-epix-el
-}
-
-src_install() {
-	default
-	if use emacs; then
-		# do compilation here as the make install target will
-		# create the .el file
-		elisp-compile *.el || die "elisp-compile failed!"
-		elisp-install ${PN} *.elc *.el || die "elisp-install failed!"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	newbashcomp bash_completions epix
-	bashcomp_alias epix flix elaps laps
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/*gz
-	fi
-	if use examples; then
-		cd samples
-		insinto /usr/share/doc/${PF}/examples
-		doins *.xp *.flx *c *h README
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b12f6d8b63c8..0f8c5b918f67 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/adjtime/Manifest b/sys-apps/adjtime/Manifest
index b6fa6a1b73d6..3247c07e0d2f 100644
--- a/sys-apps/adjtime/Manifest
+++ b/sys-apps/adjtime/Manifest
@@ -1,3 +1,3 @@
-DIST adjtime.zip 2805 BLAKE2B d2d05d69534f8069cd4a97758b8c7f8116987d485a9198ae0fd3d558c404e965e7aef6eabf702b56ea91adbf071eb10959aa6e1bb64d5553bf826f4194bb8f43 SHA512 cc0f16ca19fea240300f9e0a9eddcefa07cb21f59fe4da8e7132dc75ec26ecaf7036ee6d282f8a488005b40077931e1cadc5634095aa0ff402f375bc0e83a1c0
-EBUILD adjtime-0.4-r2.ebuild 1241 BLAKE2B d6b931caa24a551c2b8add786f5f07db660c92f41301309c3922651118a21ac2c66ed0f36ea566c414f76779fcd1b027b866e3ddc819196d6b276084efc43c00 SHA512 7a98a10acfbb9f2a30d5c6e519e07296d4ea114c08474333cf3cb6d240c8dd4b0ee1fdf450a6cc639213e3996c27926bfe9aa6ecaf68c7b763e906ddc31e939a
+DIST adjtime-0.4.zip 2805 BLAKE2B d2d05d69534f8069cd4a97758b8c7f8116987d485a9198ae0fd3d558c404e965e7aef6eabf702b56ea91adbf071eb10959aa6e1bb64d5553bf826f4194bb8f43 SHA512 cc0f16ca19fea240300f9e0a9eddcefa07cb21f59fe4da8e7132dc75ec26ecaf7036ee6d282f8a488005b40077931e1cadc5634095aa0ff402f375bc0e83a1c0
+EBUILD adjtime-0.4-r2.ebuild 1250 BLAKE2B 50f3987be0bed58f1b65109775b91cb016693965b3bf2c15dd0b3fb8d50a220216f96696dd05bcc134d8093422ceff46f66f5da0aee43357e5895a416492c0c7 SHA512 bf34661ba725b49796b3a56e7c81eff031657b513dd697e95ddbd2ba327e0df634a31282b2a65c418a3051773630263a0fda07ae007d511383e60224cd35c5ed
 MISC metadata.xml 465 BLAKE2B 224e779d27cd25bf00ee6be1145c3f0029c4cce7ab37f0f10615736bf63d1b727ec9b1c7dc5b6f4a031681193fcf823506277dbb084e86901372f23098229967 SHA512 55016064c622981f3608dba338435d01ae54483aca85fe1a0ef519b27ee93cf537b34908abcbf37ef1f570cbc33d58bc4b41b4f46cd3b0a8d10e54f92c1888cc
diff --git a/sys-apps/adjtime/adjtime-0.4-r2.ebuild b/sys-apps/adjtime/adjtime-0.4-r2.ebuild
index cae97c111c48..b6ef649c5870 100644
--- a/sys-apps/adjtime/adjtime-0.4-r2.ebuild
+++ b/sys-apps/adjtime/adjtime-0.4-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="A perl script to adjust the clock tick of the hardware clock on the system board"
 HOMEPAGE="https://groups.yahoo.com/neo/groups/LinkStation_General/info"
-SRC_URI="http://www.gentoogeek.org/files/${PN}.zip"
+SRC_URI="http://www.gentoogeek.org/files/${PN}.zip -> ${P}.zip"
 
 LICENSE="all-rights-reserved"	#441922
 SLOT="0"
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index 8c724945e34f..80f9fc8aec01 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -1,45 +1,39 @@
 DIST adler32-1.0.3.crate 5734 BLAKE2B 31cd43d1e13b5e854a195824084dc34a157ef59cccabaa335cfba2de532096046bbb66a9fce2430979b243509d608bfef752c46d80bdcc7e420e039269d575a3 SHA512 2128cc34abc74a363b18eec5abf414b95e4d84bfd99b6508ac807e13c026ad0e37e67b5a8c429212b85e78071f03e0df24ee70db5995772c4bc78acfb0234459
-DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
-DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
+DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST ansi_colours-1.0.1.crate 9937 BLAKE2B 04d86fb964138cadeab0cb708e99d198189efe6ad871b9cea43967f610922234f371befe7b25c8ef824f94daef5b6c52e47a5d86f7966b82ff100ae5a4e38281 SHA512 16d9470385c55eb28be0fd3ea0bf5d8832676282636edb71f670c629a77884f590bf4ea13f2bf1002031a5a014cf1bfb32bb7a09da27af3c1d85e4a0f524af23
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST argon2rs-0.2.5.crate 353096 BLAKE2B 9f8136f54f96cd95facd78572e31d83d49474b77205277805173aa4afe3ebdccf2592dfcb72a68cfc8e7434b89cdf36058038b2c2d452c8289a5c0f4fbb3ed3b SHA512 09a47467d09ed5bb4efdc4b8392e6282da6f4434063f4352c225c6dd1b668b51623e7d8960deb56c7c18eaca890a3515c1dc833acac1c68dc999e56b63e9b04f
-DIST arrayvec-0.4.10.crate 26133 BLAKE2B 43772765a9be4e3e6dd5b2ee8864f7894aab3128123a673fd0ddf18dafb69d7ed94709dad6de26e222f080b1de83d31aacbb3419b1d926ec4005de64e4db8b30 SHA512 8aa327fcc18220da496c63c76a521c383c7d506e8c39448f5cc6535c47b8c70ca74f73322b0c368fae7b8a8cec11c9854ac45b4eb7e537fed34e007aa3ad175f
-DIST assert_cmd-0.11.0.crate 20425 BLAKE2B fc1c0304abe7d5038d375645d32b5480457b6ed37e13f55f29a1ecf1eb6faf41168feffbf09221eef9c98bdc8e3e85c3b74a165e8c81149b7fff93897bae7d48 SHA512 b04a2ae35fc47112b43828330c43515d345c194ef6eea828bf93c4cb2f05f2a19c86fac2537142864abb0250889194223faff3dffa46bd51fa6b924c99e0dcf9
+DIST ansi_term-0.12.0.crate 22762 BLAKE2B 4612905fc52d4aa67b9443f49f2e967e63688df1dbd3c3fe40c19774ee214bba6dccdd185deae40ee97b5c4913d2849b5bb202a90e6ce91c75d10d4081041af2 SHA512 ca41f0a8ff75fdd5a1033589d95a52e89bbc7bc8a23aba161cb8f7d32f85d909171483917dfcfe7db2b65b00221e026380286fbd2baa735666b6793a1ecb5d7f
+DIST arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
+DIST arrayvec-0.4.11.crate 26439 BLAKE2B 5ea27434d57f37f7ea3e7d94acc1a3450ec464bd62e2d377cd378f4faa13078244afc53284bf2838ea0f62802801961d6915f202eea951a8792e9fe825424be9 SHA512 6919f07fce0aa834b75ecc722476d05580a7dd58e8119b0ead5077d6501ee69ffef71016b6e63ed0617ce2d29a6fa1a4f5431d7aa20340c9f3f2e4c9c93d49c4
 DIST assert_cmd-0.11.1.crate 20524 BLAKE2B 1b9443fbe9bd677f03e4711091390697f5f7db575d02738a7911bcd80d9872922f7ab2c605507f49547b69fb34d150a6043e47aa44027e476e08b1c06cecb8b9 SHA512 146d3088d90bd22aff24ee37598298d45fb6775aa4f7eaf95d4bdb9c2e5cb5c5da31039ffe2a3833866c191de0ffd60ca9ba94757096bc1c24d17fd72f962c55
-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.11.crate 33703 BLAKE2B c6f105cd75a019d19903d40b3894eba0fbcae11d1778ee5714577dc9ce6985f1233faec1c215a8a7d5f6c566d6869fc67e752ecb2c8a765f43414603c0d5f05a SHA512 41758a2faded361fee7d7ba9e1805b96b5598c7621157f74d692b2f7fa84465e6c08d20b122c5d863ad739c95a4e33e159038b7636d3c62ed6bbed8bfd3e5dad
-DIST backtrace-0.3.16.crate 45054 BLAKE2B 1b15e447713735bf02b322fe24fe38921b5b0ebfafe874810df13fd51aa7cca243338f9c62abdab36e5296a3431b491a31287109dd5d6a8b25b0ff7bd5a46007 SHA512 7490e6a71d43ca6fa0861634c28b29421ea1233356317aae421a4712f7cdeeae34c9a81679b36569609fd313e72b532064b1f5979c3eaa2a4e31e0272e324bc8
-DIST backtrace-sys-0.1.28.crate 522603 BLAKE2B 6150bee74264cf2383aa27cd33b28790b3c70da0c21c327dbc4af628b5f12afe941c1f3ecbb556f8dec5638b6be29f5db3867514417b267d7099202c5ea89f52 SHA512 4b16bc8500258d0e75db0c6cca3e2a68d9024106a0e8a4a46cf5865fe1e08304d9291a6723e4fd337b7d7f5bb14e9cec7b3aa2e40bbaa4642562764c803d345d
+DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d2b52c0385550902d59d01c716a53179708bdeb250a91690edeb70ab81d91090ff0fd89a731dd365621aa496 SHA512 ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe
+DIST backtrace-0.3.35.crate 60047 BLAKE2B 716fc69b2a7999371d52792fae45fede5c3dc72c0522c0dacb275025cb97353aa0f8569ab8bad66105671babcd4e675fdf6f0d65153a83c5a0de9262cd275480 SHA512 bb4d50c57bda52b9f48772c1cdb1fb30c003a5c6d69cb5ae740115020600693b00aca7c89e8c76a5e3e0deb6e54a2ec4d68edcdebb85e3f35b8dbbaf23f88926
+DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
 DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
-DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb
-DIST bat-0.10.0.tar.gz 810088 BLAKE2B ec6319a29a09177ba5793ebc840e2bc7370ea4c13d1e4c58a922cf581e2309de5dc0806bf137bfbc8a9a510a014f2b251e9c288bef7ea233b00f1103ded02317 SHA512 65913c7d3e504c32b157036b4418775a8a4d6dc60e45f8b6c3d26cae98fdac7f956d54caf1c5ef662b378a41479d527a71bb78de3ab11446b9be41cc8a580dbd
-DIST bat-0.11.0.tar.gz 834756 BLAKE2B c6f4e73d160160a3b2925ff68e51cef00d144989f9e2e0793836ade8fd86bbb91154019017ad4b432e71a8f56c5cab7f26b8f216a25e2bb5f76b9d4ff6d622a3 SHA512 29b4ba1a5b42cef43835faec48aca25450ae8ebcc4e3d20933df552462ebd28bb06e1d0245161bf815fce2fcebab547907ac223457320c67eaf8bc053e9d7adf
-DIST bincode-1.0.1.crate 14071 BLAKE2B 99edd46decd97925e2af882411c9cc986311e936a0e8c05ffb29e49b44460cb6fe6cf17e75301743cdf02d5b30bba7ea1efaf70dd1d3b770061c7fb6db4dd459 SHA512 1294b89089b457ce2bc4d9471ae677d6d06e64eaa01948e9db4ab49fc23638ba79e7aa1d6ca3a0df5fb61bd90cadc811df724053a321ca99d16b8ce650abbd59
+DIST bat-0.12.0.crate 767284 BLAKE2B e2a0bc353bdb0b5b1b539a7d32e69e8de9c31d7a61adb8f1f78dbddade335165ef8ba765e730f88e17d98f79b2dfec03a15781d0220f1c96254b6d9d4b6fc778 SHA512 a16d0cedd248786ab928e4f4bb9ef17b6e58aff142c1aa6b2dd0fcbd2714b19023a277d5fc1234b72c05296bd7ac0e47a59cdfe20879b2e1231556f9f53d60b5
+DIST bat-0.12.0.tar.gz 874081 BLAKE2B 6be17ac0980306542153d6c6c9bb47179a25d146501ef31a5c97f1fdc6f6742f4a58f5ed45c82b268c064c88f21e63fc86d44db9e008988f360fd13fd1dbbec2 SHA512 94726f51675d513a3fa7e36f87f2e5bed3040960f53b0d6e316afd4e2014c96b27c93956fb092d69f35bb7f676886a939d61feb26810d4c57218501e7795e256
 DIST bincode-1.1.4.crate 14412 BLAKE2B e1ccc8e9954893c3f4efec56522281050b9567090fc37f6bcdd28804eccaf4e619892b1d64c9da6b555ffe10c9c47414414bcfff589cfa80e3fba5b086b513cb SHA512 31f32a3dfcb76f113b2e993938b4c708d98d3c75efa9414d74168b2ef8af544bfe64fe39dbc4ea556842ec11100c56f14bbad15aaab919c67a7c5be1aa584f28
-DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
-DIST blake2-rfc-0.2.18.crate 15676 BLAKE2B fe942b3f09012ea2856d36a44dc59df0a90463eb4333e7afac3e2c5e1b53e7231f5f16242269d97a9731bcba4aa57889dad7decad142618802341678b2b0c6ce SHA512 f89c1067febcd0ed04e86674a42ea7a96aa432ad255210180504f0dec97a10714110eb044fa5004cc48fd75eefac7af4dc12d8a4ad84dad82851ab6d7d916f8e
-DIST build_const-0.2.1.crate 4499 BLAKE2B da7f1040560862b76447426be8884bf0ac62d2f2faca0a572b8cf566fcbbaaf27dd1f260fb1333c3cf9410251433239616aaf0ca1a2be644fd4cbcc2b908eeb1 SHA512 4e210078ad781bd645381f469285f0e4d20cc8c416818c27d98c0033f070b708a6ab27933f9c3660c83e6cbfb3afcb7ec753f9c186b0c75b99db37dff1cde658
-DIST byteorder-1.2.7.crate 19640 BLAKE2B e5225871a7b55be755a28878f330f165092d576e4e4447816d4908998d4c6103eccd7f1d962c06709823331143ec8279c5cb1ebc9ed49f7bc30b20586568cdfa SHA512 166bf831dac44332fb05679add5ed8c54d692a582cdb8584486dee8295080a625d12eebe40de6f3b82ef98a1f4c65503da9c84d570b14d58dd5e31a3cc6b7391
-DIST byteorder-1.3.1.crate 20959 BLAKE2B dcc5d3b97a0bd82272616599454673790d64d799b699b9e339feaf1d8a75b64b6f4cde19642d5359babf6c769b14325b89a51d29594f1e8ce48c2190348bd4cf SHA512 b8d8273293f776cf567dbb9357e73a65cfd352461963b2ba202959bb48338f5e14eaebb221f940c09dc0b3214924e40194f6952c32631f20a18030ad22258c25
-DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3
-DIST cc-1.0.37.crate 44499 BLAKE2B d12551225fc4e20691a09fecc8a2a487090ce10ad7fe64b385cf54b74a124cf737aa31966f82d9a68e1a932dccb4ec495eb32cdb4dc808c985384fd0fa4b6950 SHA512 85cf4679d16df14a815563c459227ae85206eb79826099fcbd5f602fdfdc052f36237916a842d65d9a5ab57c559c18e645bb219422d85aa3690c11c0a8dcc92c
-DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
+DIST bindgen-0.50.0.crate 180902 BLAKE2B 05c7697397c96ba8a089c0ec8c3cfdc78c9ec7d60502ad57aed0865551871850c7fc6d903a8dbe10917eff736f3f457bc420a3305f92910200d0120055cf3800 SHA512 3c1102ac91dd434bba7fe88c6a3463f62bac5d090cd828a6efc29a71125f6750133861d8bf128dbc5005bd5593e1a22c3b0371d30f38712fefbff23130ae5942
+DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
+DIST blake2b_simd-0.5.7.crate 33562 BLAKE2B f735cc9e462c5618329f65b6b60f756d9f29b082f81e5615935cfbe79e19cf26739d75e891f4e48339b2e7cd6cf12c8b360b977f09d25446f1b6a276c415f5a3 SHA512 3f624d8d6f10461701484ffe6087ce6a0c98f7b0f4173556035940dd069f89bc913f65aa23ecd7b0d08e53cfc5d9d129b0d6a9ccd18577613d7bfce20860e946
+DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
+DIST cc-1.0.41.crate 48185 BLAKE2B 7fb7eba2079aed5bc7775e9e8585f9b1267066bf51cf7aa9f5ad25789f7b57021a457d2811f705d4e6bd0f38d033cea1c6be23894929df8df9f3bf1b2dcb6a20 SHA512 3a39bd28e16c3e7715e0588fb9eaef6b83075e68c1ad7aa0969d89baac1e2753f9e68b56492bf5df5b1a4882fd1b6a1df97ce559149873efacd5aa209a0bf352
+DIST cexpr-0.3.5.crate 16938 BLAKE2B b799530e5b7ad4bee6d72708b410b0f67a344bfe26f9ce66024029db4bec554a696484b3fd367fa8582c3b5b71e99ac9131eb70f48e622b026fd3acd60e66795 SHA512 a6998959c48045cca2795e28e0bec8ba37214d498b75f5b608cce9b2d94f6ad69009adaca250320c7dc22f05af8cc3f7b9777dce90384575d25bc75b0696d93d
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
-DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST clang-sys-0.28.1.crate 34180 BLAKE2B e4428b8e15ac70e08b9b804b838fb1f71503564d57359ffbda9de3c3c8c1d1c9b52ab490bf35cd8448ad9031fa951ed9eb7f3c0eed63bb48f68c1dbecb137760 SHA512 56818d67a45e807e651ce2426b61b8c5e026087d5709cc0cfbef26eb162177746ecb13bf07126615bf41ce0b95b515a5e29aad3b65058f714d37979fe6582a98
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
-DIST clicolors-control-1.0.0.crate 3916 BLAKE2B c66ac33cc078570ec316a2705f8f39662b0f581a3a43c2fe5e35e18de5dc28e22f58f0998690729f4d27495dca83e90ed762f73cb27794b2c06429e84e2c2ec7 SHA512 c3283d590a4d77a38124b3ace4fa4d92831d3a5cbc3c9a694b7a808a07623365d463368608d544b837ecafef5b29e356ebe28cd0d5ab24655912aa122242a5e9
+DIST clicolors-control-1.0.1.crate 4634 BLAKE2B 77feb227a2d05d82201d9b52398715674eb1da4962fc0dad9cf373e661ac416afbdda450e0cc570a0de76203313bd27495ed6d6683b1949b12080ddb66c22635 SHA512 e20e3edec7ff39c32821d9c46c9bffb0224e017a6020f91c142c50d7ebe55f11bba235239a4b48d801d815306af50c20edbd5a973105083561fceb98cc32ac0d
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
-DIST console-0.7.5.crate 15215 BLAKE2B a3daa159c42374ba2dc6f345f0dc4029a3f1b67f3f65cc9dd671f2cf354272e27341a5bc545c9415becf2a8fb09c48e55a413d5a800c769fef4dd190cb07a834 SHA512 61a67ba46cee6485920b9ef9208bc21c7413be3d9583b7c4d5d95d7853a92f25b0cc2202fcc3b53b6fdd28f6d4aed07bbce5ecfb7e2db310bebb5798a1dea499
-DIST constant_time_eq-0.1.3.crate 1279 BLAKE2B 9c67df59e184ff479c5bcd0e11df936b0cac0ab899fe7c4a578df49c9ec6e8c83dd7cd9f1a70bcf08787b8f420ccd3e2c74b02743b350c47ffae8ce117933a6e SHA512 b605ef913ae39c4d9658e9240b9d3dc7736c8d668e83326fc3c68498ca177e40960047de1beee684a23ce96bdf3f80d5b76ef7db6f2758c7aeb14f7a2258a69e
+DIST console-0.8.0.crate 17401 BLAKE2B ae632aafdfd2bcb4e0719e7ad99b35a32f7a7f2ff49f1d816ce547607bc715366ea0e1e5e24d1ccd55856a73c2e91652d3e5845d78063b938843e0dd04847c9f SHA512 4b156adae9dad637e129d5fac26295e9f0cc528677b7b39ce33220b14a2b9e95da2a74236343ad534ef65c38bea55c116cb0f7e5e9abaf7915c6aad99e27f1c6
+DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
 DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f
-DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
 DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
+DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
-DIST dirs-1.0.4.crate 12844 BLAKE2B 41807d6f2f2b69ee66fdfa9bbbe4148caa78afc951b63a4a67bfa0aad46c831fd7a255655e8832f8441ad9840900879cbd90e134e6393b257ee4afbc757b1b1d SHA512 a3416281a22eb4bd6929ff0857c963ffdd53ed9ffdd26d30603fd847ae0de68428b05691aba46232551b86b562d4b9dad18695fe7ee58247f9ad80a776863f44
-DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
-DIST encode_unicode-0.3.5.crate 42677 BLAKE2B d8044f314f03f93965bc4de11c065f08112d33c4e1b42d9054476dd7ea925e22fb7b32fa855250be2053a00d877bbdb83a293c0aede3aa6e48d978b61f0f57df SHA512 e9849cffcffbf66e28b609e86b0d26b1267f6e2858c6564f93b071b1257aa505732dc3b7ae5bcb347874514fb8c21a606282bdcf69de842f8b96e79547f434a2
+DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
+DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
+DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST encoding-0.2.33.crate 88798 BLAKE2B 4163e26e6f38f7fc1d7424f1135fec1dddd2af3d6dd5f5bc6a5edc3eb3fd56af56858cc0fa5ed6a241b55882807f72f2e5d2940c9a7e5c4c6700ef905727044a SHA512 10c186e0f6ffcffeacb11a66fa39960454955b4827dba03e13d9ab5294bf14e77faa8e64956d5c3756fbb7e930081b7b301db8ad6873a6e8d44a7f9d98566e4e
 DIST encoding-index-japanese-1.20141219.5.crate 91495 BLAKE2B 4deb91b0b2dd1b33bc4b43ac2ec31df0552344b1177c9e504481d62a706b1c187eb3f4e8dd78c62871aa58c86ab6e309494b1b7937843de6056f3d1a0120160c SHA512 879fa0b9a294f3a73a4b224318ce5e44bc1ad0496763a518cb9ee251a4cadeb08885df97eb72f27a1e331f36d46a96824f98b7d128d879c0639405a10e08b8e2
 DIST encoding-index-korean-1.20141219.5.crate 103230 BLAKE2B f3acdd4375ddda1f6b3c070566f1a52dbbbe2384bc6be79150e4e55b88740858791d66f95040ad9f637bf13e381b9f316b14bb5617a8949bab4040b91d0d18bd SHA512 0e79eb9b01fe0354532dc7a8ca55e6332add19827905340560ef9b0e4725becda68ffedd5d18b9ac9d0c4a1b64fb337a9a31de5891b9e6469478fc974e5f9884
@@ -47,166 +41,104 @@ DIST encoding-index-simpchinese-1.20141219.5.crate 130962 BLAKE2B 3c1e498c170eda
 DIST encoding-index-singlebyte-1.20141219.5.crate 14950 BLAKE2B 89faf849452f0fe78b82616614f43bffaf658dd81063ae5d130ad6eb64d38e0ee8a26ab078f8c992f0c7f3e1db768e73920482f5e3bd56b0d7370c72fc93755f SHA512 648a5b9dcbdd40184b6026f6d0593df3b75c5eed554c19a199810c99aba857fccbab2acbf5b047ff42a75a6a3f6e8211a07e70e6fa4048f07144f9132af7d17a
 DIST encoding-index-tradchinese-1.20141219.5.crate 120862 BLAKE2B 727a26b32f2bdec20dfeda482fad4235ca3ded489a002c27d0c26cbb9f37ea81f93f7e46ee4750dfcd7385dfc8bc55669a0a21b3acdba2a1fe91b855edd2decb SHA512 3b23213433947af7c56e9ea3e4eaf937b8083ce7e9e481b1351925a6da647be6a037b505116bab08ce73727bec75550bccb877ead6cb7fb0473bb3bd3d40833d
 DIST encoding_index_tests-0.1.4.crate 1631 BLAKE2B 65151672aaa863b169b6139c8e68065ecd6ab602e8fbf8b0f68a5e2af3f34858d363e5f0602f58e4ad3169ddea83d02a0f19a6d635584521397bee63587c9fd9 SHA512 0635e6a879d59aa3373e1c0cae6f61b9bd11138691a1113f3639a1d16ba894c1554f29a6d347353f02395508be4da8a4b16b17db3339cf970a62267874fe93a6
-DIST error-chain-0.12.0.crate 27056 BLAKE2B a6d699ae63838d3b0d40a63977642fc464558fd45a46c2da9c7a57889450f7ce183c43dddfbe325c8cf6db2775c1a41f547bfd3802cda5b46d4a09f6e0a91aa5 SHA512 7e9fd94de9f0f8e61039766953d85b3cc5f87be2b8c37016295031ea3234dbcbccd111f521ddaaf97dab7f8ff8c30828b8949958014ef1e13a02544b6143b9e4
+DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa
 DIST error-chain-0.12.1.crate 27906 BLAKE2B 66c54c3448b8968a70395861469d7b80aa101210a3c96d2f28b0933fce6d77ec28f4ee18d7666402abc8162f567029fe93f7dc80b93644ef6e488ad4062832bf SHA512 1a8baeac9f4d96214a878b5c80ec2c5753c2232a166515c96ad6a42424bbe32410f2acd3aefa70d9dda7036e1965d83aeb9fd1a393b11464fed751aaebc9bbdc
 DIST escargot-0.4.0.crate 17410 BLAKE2B bfed9c7ac31903c23342d6e7d438ba509f7e4dddf2f4dbb7b6110b0af0e4d83eb49d989ee8dead0758f22aa4de7eb4d7ce4401308c8ccd73db0fcb28482ecf43 SHA512 0b1b62b2a34c8d180f9312b3fb8fd788390af2231e0cd28acbea8ef6847e9c654361cc3c244aa70a4ab98b726f74ea1e7a45312a4b6b225cf767aaf451475df3
 DIST escargot-0.5.0.crate 19936 BLAKE2B 54ad5f55816b0bf154b21d043ba5e4992334a2a05cfd542af088fbcf3ed983ebd5eef42c65ea162d078c5072f02010609ee71f9bc023c8f3b7f5f39bb9fd9035 SHA512 7904cbff5f57b4731fad85f45cbe61916593668afddd32834da98d15dccfaa5b25ae20a280d676557b1c797c316929a04ed861d343bc89d35cadba38d984799e
 DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
 DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e916389d034aa3b82521445829e7fcee102e1c03030df9cc55e4b1f14c933ab83faee8be910037d33f15d15ef9c86e SHA512 c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a
-DIST flate2-1.0.4.crate 65683 BLAKE2B cf6d62caa99076db9a5d56f361ec40564fc71cda07da3fc5572dfadae57f912f63b1873dc77782b2c80652b3cb63bbbf3ca67fe1980b50cac4de2ca40198d25d SHA512 267bcd04a31d6409b318c3b1fa493806ca25b1528f6c64beb25c71cb3ce9d2839bac2753213995ac9c9f62a290d12cca5d5bffe23d4805f7d93de620a0ab6343
-DIST flate2-1.0.7.crate 65912 BLAKE2B ace7d04662b4880ca817d7d021d6cd06c09108548880b2eeb5f53329ac1ac482c83e046188a76895ef36d4c62bfeafc831119100c172c2b696f28793e580f751 SHA512 f45bc04ab7b82a2783734c9012eff7a2ca22ba871583229b6267e2798a1dab8e14cf273592e7e67da1e9b193149447419b64b5c4dd0e1b329d79b279c35b41d2
+DIST flate2-1.0.11.crate 68628 BLAKE2B a375952ec5ad14050e741fab7d62a56413bf50961c2c4e174bdc978b2e17681d4ae0398cdceeb5d4500e60c6b0a7d8b4c3692545bd2305d73a20d50874fcb7b6 SHA512 d2d67be2fa687d4a4e2f4486a14e95d2d73704e862940b9cf0072378916d8e41b70081d30ada2184827740450f5f73edd35ba3d960931e3edb4da8ffb4e35a4a
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
-DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
-DIST git2-0.8.0.crate 151568 BLAKE2B b4bf47247e7add92f8c96e4e8c2b1ade9d7db8e79b799ebae9e07f11870b0c660b4355a0581eef627ebeec2167a501a498e4a4bcbfe9ffa1895ca123086d2e73 SHA512 06270d9f1284796d1c56c4bcac7de477b4665f6c32b5d8ea2fe816d4ff72d662f67f3482349d5d2b055232d9f1619f6fb7afcc7fe0a9053df7133efd9fd342d7
-DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
-DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6
+DIST fxhash-0.2.1.crate 4102 BLAKE2B efade6722efed1cff0bcf307ababd9c9031af297baf410367212758411a21d61a473456c7f9b5cb15e444d115a62120f140c082e70dd360a3ae83f2f71bec9e6 SHA512 638e1c0a4e7f365483a329e715afbc2e57e47c03b32e0e1818c879baa96996e81dce8ab39320e24a3e1633f73dec1e5f18a06c37f3ad38043002fc99b55efc38
+DIST git2-0.10.0.crate 157274 BLAKE2B c0ca85d649f19ac1623576632fe2efca7bad190d770188fcdcdf4192074d7d41a288600dee06c9fbc34cecc7d1baa04a1b1cb10f40da59dc9f0090990446d0bd SHA512 bb603b465735ff8567f11ae0e93b2b86d3769877c8119404fcaa55e5c456d62836e5ea7ccc5a1439c8e0a7c4450a4eb4437111a03a9723fadb9dc693ee1262dc
+DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
-DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
-DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
+DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 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 lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
-DIST lazycell-1.2.0.crate 11259 BLAKE2B 87eaa99fcdd691237c54c06f870a71e55ecabcd2d2de06551d2b718c138cdd9ea085b445f0d6a7b773b4a025b2fb9a7a04576cbd7f74be23af4916d8e8d2e7e3 SHA512 194e538f8e2be6748ca56463c9b6e83c7a4598bcc9d3f2680f8e35e391f61e36e0d9aba92bcf8e312f286a5d309f0d83be06e879a52e405bf2c89ec13d3a545d
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
-DIST libc-0.2.43.crate 353810 BLAKE2B 909f92f7014f33404f0525bed202575c7410d19b2383c48faf760c601f88bbd2c61b2b57550d35443483598bd9d213e1f20c2d34ba9619fec2c38c0748c3654d SHA512 d53b9fc460c68ed77b9c1a23c093c927125c0946b5231c343cf239e706d859af42efc2c7a4b95fecb46ab6ea9dd8473f7de308176a7dbab18e220246c5a7a8fe
-DIST libc-0.2.54.crate 401259 BLAKE2B 6fe5f258837fb21af63b445b2679d3d33a498dd10c7676f30df4a95917358f48995461e41b1ac4c944c079ae99edbce77667e68ce963a7447bf1d35a579e3ee0 SHA512 46f0263b227b107aedbd3c4171d8b3fe60ea9c2413ba9fc4cf3f4f8b92090b7aeec630b687ff55ae4507ff44144dad393a3912c6fc81f8864e630c0f15196cb8
-DIST libgit2-sys-0.7.11.crate 1176919 BLAKE2B 9793a5131c805f8474c17d336514c480203938f51fcdb3d4e09bfc609e6599027a05436660077a526ddedbcab3c587a411fd9ec8d7dd921fb352ebb61e52eb1d SHA512 361aa7d75a029209f59c799e2f091f6ab8c0ba6a4677932537eea8e0198a36a2382327e8c5db98a2980f47b6a4baf07708720f128734081ac58e30d8721c3435
+DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
+DIST libgit2-sys-0.9.0.crate 1521698 BLAKE2B e6e40345bf12bcf2908d3222b965e95596960e4fbae60c7dd2b4aaa54e11bf8a7c725fffd1dd0b00b13c2487577a3bcb34cd12462e9228655b4665ead0e5b121 SHA512 d3c7553636150c3780c075d55411224ec2072589edb614717c6e5bad404fc1be0b4052b73830cf9f4417b4105a89fabbdc40912cbfe91f1e6254856b6cf3977c
+DIST libloading-0.5.2.crate 16420 BLAKE2B 1b73f3294830cdd97b7ad42f0458bbdc95f641a182352095c26f835ba4fdc71cf9a0fa85244511b07bb79dd1c4e913625fc69b4b1e2ec28306dada1aaec2750f SHA512 d04cb1bb220c9364c02da4f360593907c875951fc0f6de5da1455bac4e96a470128409f77b21194fd6a87550f3ba00abe3b7a3426e7637acb62b80d61da46be4
 DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
-DIST linked-hash-map-0.5.1.crate 16559 BLAKE2B 00d022d591ef704699ab2aea55db98dbc2e74f45e7d1bbf68698be1529add9494241b7add2515a8b637b05002795d7770b37a5884fe4ec91517f47fa5f098472 SHA512 584644be35f931e0d0c1b085700f90891895e50680b6b8c2afeddb2c6425280af3e997798aeb56db653f8c8a7b6322d31a4fede7703b6e54ea1c4154b9e4bc53
 DIST linked-hash-map-0.5.2.crate 16109 BLAKE2B e65a12161dd8b4c0ca49d25e20d0e5b68c411c349c00c6a1faa01f4db4b3f4c811bf9b64947922b8ab900a6bcc90db30e8a6d58ba9e384201879556408803e5e SHA512 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94
-DIST lock_api-0.1.4.crate 16959 BLAKE2B ad6378b3a80fcb51ace0340cd894ce67226729832fedd60e691e0b8ed27e0880588c3092b941190993f4208f04fba323e127444994f2fe8361b1cfa86368b415 SHA512 2311d7505bcc9f49610597c7f75097d775606aa8bb1fa57adbdcfd57fc09cd2812da3efe4717dd98b9ed6c857890ff15e8f06515e0c8992a476c9e45566eeb39
-DIST lock_api-0.2.0.crate 17694 BLAKE2B a1fed36e21d635cc69f47c22f3311180dcd5dcf0d31f55a76ed5ac644d8aae2232d945d10d9040681fee42569e8808fc071612110424358df798d70a47c919a9 SHA512 23ba50a3b69903a83de43c63c09c56bb24fb69e2c43d020d1dd5df61bf45ad2ee3f49ab4263e069e311a48b5b7220f3e2d1417c7c98e3c6350f0036007564a0e
-DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
-DIST memchr-2.1.1.crate 19591 BLAKE2B dc612eec81f7f802692859cbb63d61e9a92578bb42402062c628e044367df6b02028f0e63f0b577119cd8935e0dc8a78569a1d45c81584ac69678ba49d3b39ac SHA512 62f8ff395a695416b147c600de62aa7acd4dc47aa195fe78001dce7ad13afec45608a1e1f69999048806acf97f8ae61a449caa16115062b0070f2a965b2b12f8
-DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
-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 memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST miniz-sys-0.1.12.crate 78209 BLAKE2B bd6aea3b23382b754a926e8f6f4ba4b1684ea86987100c16556d0567278297e6e5bcfed2ca8a114831f75814692f38ae147f6c1951d218cd5ddfd81231fde86c SHA512 e00ab08d024806ffe68f8d9d0404bf83e62c58d04398bd8b0f8993a6c60a38fcc3a50189cef7a699ad7a93682d9f2353a31f5596d62a72c5f6560d12cf0c0a02
+DIST miniz_oxide-0.3.2.crate 54536 BLAKE2B c804e4a261ef2444ae539ced683af5d0358baf625d7e8a16979b7ae2f10549d08ed97cd1d3ccc2ab4b96867326775b769b451e5dbac168cc9494be627eda9e6d SHA512 ea5eb9236a8797892f0f4bdda07c37cb8a6e48cd2fa8e81e2a07c13961675688307f77533e79cda65a72312451ff46b31cf167507456e4186e2b19a86cf14b95
 DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
-DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
-DIST onig-4.2.1.crate 33267 BLAKE2B 9ce1acef007fe0fb103fbb6328da0d715f73899579ff41ff5236e76af845a57d1ea852386636d3c379a1bcb3b2afba44a46ebfde5c07ea12edc0fa051d2ab0b6 SHA512 0abffff5c809663266873f7618440937cffa3142be1b356a2c8e3676b05f0b7c243e0c9754d62cc3c63da39c6ea6992f817199e6146952d737cc0b429b16fc91
-DIST onig-4.3.2.crate 27432 BLAKE2B 4daf304958a4985833fbf09a7a8f29ca1911648d2f25456dbe42dec709e9a4a34cec575754d6729d0491b191f1f73b324189e1a02438e0ef254535b962992e42 SHA512 f8915e2d001c4f2dbc77bce91f673f07c0bea36f47c9f5579d36de6e68bdd0623d0700f0b3dc6e82b747e17f6b7f35fea84717bf658990dfb284f4bbe5bb66be
-DIST onig_sys-69.0.0.crate 543900 BLAKE2B a363764f87b251213e3db5b1d2c422ebef93cad1eb15ab3029952da0803349731d9ac359886b6f4a9b3c54d44acb35bf28cfbfb920e2cc8721241cb50e9139c8 SHA512 cac9e82326aba9c1a40b31f9f22de5380c11fe5662cff5396cf8647982cba274163cc00fe9d367d7b10e4b52ca68efec1de74f1cd4a0595d06f5184de9fc782e
-DIST onig_sys-69.1.0.crate 544763 BLAKE2B 29e614a2c2eb191e0f132348f841613d85e9877d27397a04e2e20d4e724fe730d6c467140fc02921fa75669110f303fa5182780789cdda2e05208de050b8fc32 SHA512 676884bf338fe2d9726956eec5d26297f3eba03642766ee3e64d7e2f5a945d6da93521c19c2c11881b5bb2785f24e5e91febfc08f12729fe58d74e4494f08ae6
-DIST owning_ref-0.3.3.crate 11710 BLAKE2B adf07d01a82c1eadb5f4e74072a69e0a76603bd5f7a4fe2fe86f71c9733360a769eeaae4bbf830fe125da463a909ad0a690e99a30ffcf766165cf63dc3c43202 SHA512 260f3d77f23b092c5ca96dff6746d378caa1bac965745a71ca18eed30a12c6869af62259daafc91c8666baf95e04619ad0d8fe06b47d5e517688b35f0c59005a
-DIST parking_lot-0.6.4.crate 31890 BLAKE2B 95024d434bc988a3612d231e83808efc96a4184d059b51a1c2a9c86e661fbd3d75ef284381f0fe168e73a1c811754a6386ff6410ea2e248434e524ff9de54de0 SHA512 e2d91dcddb872d09d1f4a9d7fff21ca53c0c8b15f49e46b68e4a59f2ccffe1e852214860bd99d9407a66e4b6ecf102fb96ad792bb3e9676ecde349d728f16028
-DIST parking_lot-0.8.0.crate 34446 BLAKE2B 0b5c1f386f5e67606f911aaefd9022abe01486aba5109ccc5ed72d2e5e87bb2ea93430114c12e0c1d76a799fb5db04c6e689f98bfe66ec693b7a63cb28287c26 SHA512 82937f87811a987652fad9c4018efa2dd214b4142c5a94c6629fc5bb0e9c49c13d9503783e3932fd0834f2a1afde6dce80aa488b2bcd32c95bf9a9d5ce139f93
-DIST parking_lot_core-0.3.1.crate 26635 BLAKE2B c0da77758b3b4a1a5b7982f1304e3cd74b4345bfe4ab1e9dccfcaee828e1024419fc20c6069efad2ee2dcad0180350d240ae689a5b700e4b47a0b3b3808b6539 SHA512 3cca0091e839cb0b63dd17f989c1d3d196e9706b4adb227f9308cd2b43b68806dfdf0b7ea098592cdc520bff249ddcadf23d0c0a7c23eda179ac11594c26e127
-DIST parking_lot_core-0.5.0.crate 29706 BLAKE2B 80f7fdd38ba3afd6882a0c636bba79d995131451bc17d75e9100447812e57b4fbce260a5b957de065d687a655457ed51fa58978438446cdd4235813591a8d2bd SHA512 fd90b0a82713d329045da37ad4ab6b66d1e860f0a6ddcdf102e8740b98badfc83d6c056210618fb339271f1f68545090287528590d337d34a31bd7fdb70b0dc8
-DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
-DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
-DIST plist-0.3.0.crate 20541 BLAKE2B f3245214a6816c72797d16cab22709eb7e10bf6f1147ef0db5f4cfed9fc85fd073997a963c594beee313b348cb4c5274d5bb57e82620a5d2913a8a32fdc38aaf SHA512 8171689f24ad9c8579722d3a6269a80c955f11bb5fbae25050e07f518da339d91091b91cb0c6c41a6980402513f466d4e1e0e56abf6b9d09e68e95dbfc2175e6
-DIST plist-0.4.1.crate 20920 BLAKE2B afa00b7952d4fc9591866f669b68e20a322381f79489e4d34c58d0ac360445c18ee8638ef0c7902af33ef98cca253bdf6f70f3def54c98ed62f3c4fa0a7d7c52 SHA512 062196f66c3ce93cd83a0043d13d6a6173daa9fe57fd5a1c926fafc1c3f0d17b7ac63c2aa81c14a4598f6eb572acd6e3debab5372a3ec51368357806b9ac8b15
-DIST predicates-1.0.0.crate 24632 BLAKE2B a26954a010d35205ad492a165d4840843df599ce1dda983d013985338880ebc8da293555784bfc3bcd3b43c816f1db2704e5f0a7b8351fd567ff31e4250024de SHA512 fa52195cc629a73234aa703e522733e3f93fe9c0e0d416198b8c36a7401dcc006c89b361e7b8395f7ad96e0f7aafa2d9247cc918b022ad35debccf4e33b16d69
+DIST nom-4.2.3.crate 115343 BLAKE2B 03c0d1cf97a0d34adab29d6e21add3da7d8eb78ee6b7987ed11b136db7fc6afeca6a8eb91e00aadc1f6047eb7bff55bc288faa8c481e6a4677e0c43512a68f72 SHA512 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54
+DIST onig-5.0.0.crate 26969 BLAKE2B 4d21a18e078c19993fc5d2998d23cfb4168ecf2b80aa10491241093f531373a84ce8adcbbbe1c73753be34090dca151ab39d8a4d8dc32fffa599a8ebe78c7c92 SHA512 eaecbc1dced5c684173c0e37e775b251a6cc6bd3fcd447495cb9e116a679c67314268dcdd226b8cfb287cf6900ee97fb32e7b62e05c4e9b01cb156542fe4ee36
+DIST onig_sys-69.2.0.crate 561540 BLAKE2B 1bbbf953d74958aad6dd28bdb43d0e5d638d5db12d35aa0c93ea50f35f237902652a319d3b59624be02ade2fe072521efbd7b4524da98b541df3d0c606c88e10 SHA512 279d08cbb6169f34f836812b44179a2efe12b7676ae424c27fee624d2b8d609c8015608c09e2d4adeaffe66308822263d9d0399ab2169dfa749ec73233eafdbc
+DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
+DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST pkg-config-0.3.15.crate 14087 BLAKE2B 39ef9b5d573b8eaf15cfa779ecf877b7de785bf8adf9b3fa20e5bedebb958f950da7b69e69b0e135f46379ba370f51a2bb951d5959553f878ff6f5c4505d5e79 SHA512 645aed8e24ce99085e4f152eac511df50646f17705d57bd8566e70e17c18bd6b05001479c94b2425e45c67d4f84797784053a8299957a1492289853755a7867d
+DIST plist-0.4.2.crate 21132 BLAKE2B c9afab6368357dc906c2a069c63e75708baba6c5762c138385b9ff5976dc377ff5279826607808161e24f12be73f8e2ec24ff7d62be578720443119ec8174e9b SHA512 667de29732a76dd6d7b9768c3e58edd8c21e62fe5dbbfe9a64a37de5488640aa42c04a8683596eee9a58b02dde1cb0f10e3edb9fc48b3d93e61dda0122357162
 DIST predicates-1.0.1.crate 24714 BLAKE2B 678e393fd1f6d8a4d7a6d0e0473f8f7ff6f0da3b612bd4f661fe3ba3b070409837fd3b19dc294e68af3b643eb04f9cf9020d76b4aff8360b0a1c4b4d8bc614ae SHA512 871465df78f22decadba2d797239c465cfc37033084197dc5f2bb047d5e7bada047300f331902b4e2c79036ad512544789932506b1031fe471b9d5ab918c2391
 DIST predicates-core-1.0.0.crate 8066 BLAKE2B 71e70aec3adfae302287a1cd3d7d19eff8a697659d61ced33b89caa8a2a3359ab7251db012d973dd574abecec82acc010c5169d0670096af06e325761363c34d SHA512 024f997976ae618e3b82d59613f8b6c41b3c0b3b595b6cf38d10d2d27a11388e9511ca38c06d46b52a12fc19d3cec36a69ca14e1e21f316a719539e41c86d6f4
 DIST predicates-tree-1.0.0.crate 6251 BLAKE2B 00da28f7de9a7abb386c6a4425d8a2285d1ef22032476b0ac1bab4b8d34d2af69948f80d8f0498e2356caea3fe92ce352b58539413a8f0f052e9dbc26c96cc12 SHA512 29e1818b7cbcb7195dedc78e6a1436e8e8c88b61d43469952c4bba5bef7dbfd5b7f0dfbd9fd31f71e71cefe7c7b8c44ef361bff1a86f40c945caf48cbd87cf05
-DIST proc-macro2-0.4.21.crate 30813 BLAKE2B acf36197ae0bbd69e4b85c360831f9056dffa343165f665621c3e3b1aa29edd5d20d2b046a1dc8a401e758402d80096875c96915b15cb218a019169eab439df9 SHA512 9e0603d634d0748047dbc0e4c44dce54cba1026ed76945b09ed72224c015465cc8541d4045185f8b8cf6ff316daec50bc5a3ad7ddf5015aa971135497e5261ed
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
+DIST proc-macro2-1.0.2.crate 34779 BLAKE2B c99119a8c2158712f16524c568a03d60f0f4a72f79ea310c823c7bbf809f91f5836f4bc3388e2add1e202207fa91c24b64be438c7ee6d0eb0f27175b739382f8 SHA512 012ef53dd8f5abffa10490c95197bd0d303c681fe0da54adee75a9328a194cf827acaddc286b2237a6665a0bf9dd4c94250bce7919994412185c9de3828f733c
 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.12.crate 17541 BLAKE2B 0d09f5075358c8c7cee6503c55ad489a2ed4efa31dd0bb47c77a01b7bcb3ab4319cdcedaf5799cd25738c8f6a9f6256f91e509b60eb18ba99664693efbe45afc SHA512 5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798
-DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
+DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
+DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
 DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
-DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
-DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
-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.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a
+DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
 DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
-DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
-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.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
-DIST redox_syscall-0.1.54.crate 15668 BLAKE2B 2da177fdb698073829b29023e6cd0a2f422ad1cf1ac359b37d3f5cf4c12f6334eb241bd313fde0236afced49714af92469919d62119ad4ddc49448ab5d9a2589 SHA512 38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e
-DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
-DIST redox_users-0.2.0.crate 11104 BLAKE2B 6768f135c7af11233adbdfc142c4d30aa3f802b3078a60d930bcd68385b6cea376ccb87652226d5b21c0d0bd61eed5e5a6fd377dbdfe6f75cc134b171ee0cf11 SHA512 00b15de3db031d94b68f39f60c56aed7f687da6c91a1b39463bfd838f6d39816b84bc2e071ad59e4ef7c142283fc4e6cf69613ce49462debd2cc52e96383aac1
-DIST redox_users-0.3.0.crate 12766 BLAKE2B 491eff42c931f840c3cc23d50ae50ffd731464d5e3e362905f71a8cf8c05a7d0d095bd8c1f4c271b3a81c0a66252ce05fb703140338f68a03d1902caf939c230 SHA512 c58b608971a6c2f38272d864dbaa95a6bcbc7139db0de74afc949c238b8a0a48851cd167c219c3956e81efea46f035e162e0bbdac22cad444cb260cb168a0353
-DIST regex-1.0.6.crate 239455 BLAKE2B 0e81b18a220c6e81fb9185391f15faba2451b0fdebc7facc06a3ea76534ae32a76a6c573a686a72c62b30399939529fde08e6c33c4fe0d126df9cf5e11204456 SHA512 4779fe3896c131b418b07ec2622888b2b8dc64172744e6ff91c46a957646c796c46fcc5b1c37b5349f0c7a5adccee2e7af1e07121dfd2b59976bd0fde5b60bb4
-DIST regex-1.1.6.crate 243429 BLAKE2B a41cf5b9fa83a7fd4e0a18b15d30f9faacc36267ab0546927061323427eabf4b66893a487f5f59043226d04b700e5ccdd77b47df0219562b6a6615453f271ffe SHA512 f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e
-DIST regex-syntax-0.6.3.crate 240173 BLAKE2B 03e33c25c9e7fb90cba231e0ab655bc35135c0f0602de9f977f967de7a9a40a2aba9a48a30f49eb98dedae4277a03b17a64dbd59f0b14023ba9df764d0c9e721 SHA512 95e8556d13337ec25a9baff923528c0d1af10ac3e88cfbb6f5bcc40fb90f962cb473c88a8e3a7007ab9fa36cb063cc2348e79368296baedcc6053bfdf6bc7b6c
-DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
-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.14.crate 18721 BLAKE2B 0722ffdc5cf7ec37b197f23c72569f0f7275cfbec3590360297130aec438fa28f924246699ecec2fc0a6f3c98ad2fc6ade973c3d3e408c373d61bb4deba651a4 SHA512 5c2b09c0e694aa2780fb66b20fe21dd82940254d005dfd518d88b9b363dedd80fb451aec183545ebf41b72b985a4b63bfc4c24247611d62bd7c6667a7b377a8c
-DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
-DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4
-DIST ryu-0.2.8.crate 42798 BLAKE2B 393eba320c417af8d2cc23f5fc2874d7813fc3cd4804f7cba1d374f073f74bda4de8208544f30a5650d21cccad28611c8ab2bbdce15ba63b88d6b17100ac5ea7 SHA512 15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4
-DIST safemem-0.3.0.crate 6947 BLAKE2B 1f3e86944eda42c890a5f5792b7e0a50fe6574b1cbb077b7f08aca7dfd33e26deb0fccb3aa96056de3d637d014658b682aa47b523f0efb1f8145af7bf34ce3a7 SHA512 c7d56204b29e9c0fcf925ccc43a2c910f6cd74d232c500b61996559a783ced3938cefa058128d72759e94edea683bb8922ac5ea631d16e31b58de093d6650b0f
-DIST same-file-1.0.4.crate 8678 BLAKE2B a46a2572f18a9adb3a23c8142c78d55757f04e10ddf68568f6af810a6e30a4b212bbf21c453ccd9b2e5ea7c42c6216505a4119fc6f19645c28e5434e3e8d7847 SHA512 bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea
-DIST scoped_threadpool-0.1.9.crate 7800 BLAKE2B b6f887c1af054666ab7f717dfdafe5701bbc0a778169d885a1837202d4d215970af567ea620c6ef47db69fa664c6be65c782aa87d9efc1d9c8c280b6210e38f1 SHA512 df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33
-DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
-DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
-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-1.0.91.crate 71696 BLAKE2B d281605205a041ee0aae9755bcdb10951fd788b57a8f415628580e520950c98cc0edf0761812ed31a818f0d3858512c88faaaca49d16bb9bd72b187544e85c98 SHA512 8a335e214cddd1e1602d6bf0c01dfc5f19276154d846bde97f5a06914e8558b75bcd7eb8cee3273ed255314bbbee6a05f1f4ccaebd45bc5cc16a18c90e8635f3
-DIST serde_derive-1.0.80.crate 47136 BLAKE2B 467b36ef2ef78a41e05aa2adb1efe865cf2be755d2440039e666e40c6aafb8d7f34e4894b3665655426c4cac4d2ba904cdd9ea521983ec97ea640877481274e5 SHA512 e16bf0af19d325bb86a68eeecf34fb809f16666bce78c4dc281f24264e7977faba8c659cae3829082d8d6045fa347a405ccf68e9d27108debad7c695317e1e34
-DIST serde_derive-1.0.91.crate 48765 BLAKE2B 5aa9ae0904cdec1379dd565458f7ae5df74c2511ea7620e252f90dbcd6a1ca251ac8cb0b22cc6f222ae4a1552844c3afefc37a04cc58bafafd9f6636221a6a3f SHA512 b96aa8f90510460d17427a63a6027e3ef128baea5c20df9b533c396e9524af85e130cad8b3a4c473e704c4cc6b17f1da37e2ae89a2f9a00019441cdeb53b8a57
-DIST serde_json-1.0.33.crate 69738 BLAKE2B 72b396a31b156164c6f300d03a52f501dfc385e55f0abc7b2faf3c83ac361c595a1991e4342bf0e014970713ebf353d24a2233aa3941921e4546bd9779ada8e0 SHA512 5864c5922bed9f6c34db2163a14374fde73653f323ee69622f15510572cb88e8a645b4153ddb1e12e64bbf0e60f37895bb68982df68ac68a1a66c83df6cda2e0
-DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_users-0.3.1.crate 12557 BLAKE2B 42810692ff093b9ce056e5b539834ec3fcecdd5cea6a1ec750fa456c4293ce483a9de6105eeddc6b6f41c591c7f292b744b4f12de65eb634ac4b855e6fb450a6 SHA512 086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5
+DIST regex-1.2.1.crate 227824 BLAKE2B 982772c03ab9c22f31e80f1c0e585887a1c1dbf74d289779186cd9c3a7e62eb7068b01ff3492d8b11f770933efdfc14d64005aa1f0e0d528682ea26d2c576220 SHA512 8eebd914fac9ea0f5c879614acbdfc6dd5de651ebe4f38c886e9e7e14c26a11220df36997fdb6d3fb95aa28ddb77ac416d92cd0e98a18a1996ad4fa0cfb3a986
+DIST regex-syntax-0.6.11.crate 283238 BLAKE2B 37a535b47f90449f6d41d1a5a3de69ff21e74fd5268961ff9f7cffd620080fbb212a1bd315db9b25b20aaaaa4ecd4b1afbb88a45a96b7e23d4b9e4742c081aec SHA512 619e1118aaaab60dcfc653cdae8fe2a8dcf49f2b06e718710f30179b4c95f1e31c04b2289f1d05d0c88b1996a3d8a327180ccf13bbd1d0259a70af7c7f449651
+DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST rust-argon2-0.5.1.crate 27795 BLAKE2B ee178d0009a4c367d813e3e4a6c6f765334a0c366b8f0d98f40d55c6fdcfb64284cc7c490c6185d419430f702a4cd051971463c7994ea3323f331eb6c6eb0132 SHA512 80c1c48db1463e1506bbc8147c147c8e37a8cf26d6297399a8e645c8fe81b6ed9be9048a3b3dda67cbdbd505085e9ae79d50faa2a846021ba65f959160465f4c
+DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
+DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
+DIST safemem-0.3.2.crate 6858 BLAKE2B f5a1b44da1289775e380b109bd458b7bbb17cc04ed718434cf05fbb7d75387c70b51c5d8f9078aebeae7e98d1873b972a70d65a345f632f42f5c67cbe9a421c0 SHA512 6d886d8b96ada623436586ebbbb84d9eea34329bab3164d915a47e3e4de00b724928c6dc224c88541aeb0715de633d129949e7bcedcc2393b348a2692451ddda
+DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
+DIST serde-1.0.99.crate 72436 BLAKE2B 564e206ea5363898300af959efda372115de54812553853679af173fa91562562f1508d4cb570d801ea657af3aabcf8c3bdb40b762d6dc1e6a24c4a02cb09021 SHA512 9e6e55fd38777ef238d7b6c0f9f74da1e0cdc204e4735f70e6644d81e615d90c5b245bb8f2edb88751d126b3d1ca3c1e9f6922dddb645b9a1bb40bb4a8c11a0d
+DIST serde_derive-1.0.99.crate 49786 BLAKE2B 1a8502b8c22053c54cae207dd283402a85a7eec630883de36df85d46bed4519d04c3b82baf660d4863324a3db9875ae62b9486383596487e9648533e05e685d2 SHA512 6b1b17207fb1e593bafc1162d84c6ced08e799aca9c07c32c399fb3c78662fab920ee35e99ea9462b21515b7c3d35e4e2a457cc0577dada51138f5e8a905dd9e
+DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
 DIST shell-words-0.1.0.crate 9750 BLAKE2B c7a613ba7d66d991f994ce339e86706d9b273d878a7b9f5f3611c2175e6749a6bc4038523ff63d395582bc4f41c5913c28ebe0420ce62f4aa30752ce51ad8ff5 SHA512 5a62a625866b04bbc3df8f89dc2bead16ab83691caafd140a8e4df4f7f2dd3e5d61218b447b15f3253173067ec070fdae004f2869aef9ea03c1a1ead5b180731
-DIST smallvec-0.6.5.crate 20238 BLAKE2B 2c75f111c37e8327e18b806cb038713f8e3a7358a40d35289a55dbdcb30961c8ea4bf4e243ddd939b6f9f4a4515f11eeb25ad697ffb52f3b7fc88e6ffdf65bef SHA512 8fed4990c761151bfb2d66392505bdb6a5591aee8b90aaf9032079d0a68c2b3e36c4136d307b6eebc714cf0cabc0155080a0f2cc5f59fa099363c5144e7eed31
-DIST smallvec-0.6.9.crate 21548 BLAKE2B 465f70349baa54a3b0ec1b21e732fc6b79362c866e24cb15acd09c753c4e4469a9f085859b5cc33c5a24849d64554dd64d6c66410c221c4c4bb6f3fae4b55dd9 SHA512 2bfd96b6c07a740b77c9d3221604e108bb730770970e7428a2a38d29711dff16eea08251e826d2d511d13a887c3256ec3a689e3c481ddb9029f47452fb2877e2
-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 shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
+DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a08024554cf8d68b59498a6e3fcd0e8146815bb61a6e1727b209ec85813127ab8520f8ef47716913a6ce6cd952 SHA512 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-0.15.19.crate 145264 BLAKE2B 55671420dcb1d2885b71be2502d097c0a974acc0ad3a722c6de5777a977f1c7e64ab4aa92d313848ade41e3a4e21b4f5db306d4da005cd47ed74694dfca9d465 SHA512 e122c601a4a69641ee15bf4d055662736b367d868738fe51334503e24dda17f7ee0273df6abddd3c0f2d2fcd1fee4a9e56092a7e53c9c17c45bb4161c0b76ea1
-DIST syn-0.15.34.crate 149802 BLAKE2B afd66ce562e85830104d8d9e8232e27153284060c0ee3acad9842f142d6b50633c598f067111f6f6d2e60a43fa78724695d14ee8139e0f7644fb81ff38f523f8 SHA512 3ecf0aec33732c8823ceb27bd1c5ac7e77c3736e45212a680c6cc2703ab3859e0907c09eac10a9540fb7188ad0d78edc82e7e783a01f064e5c11f84112c1963b
-DIST synstructure-0.10.1.crate 17836 BLAKE2B d80745963f581c02a3b9587d45586e2098632a4c21de22547ae97531bbc4f30a1b02989306999c67584c507a5b07978a48f65ad5e00ff55f39e8e0bb4fdbfa8e SHA512 5830eea0eab15c7ed737bfa14c7bbfc73f28af6964ce3148542066fb9760a80dbba82fd9a55078426346ba757e0aaba9addecadb1d0f75eac4f029a6e4c7cc19
+DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
+DIST syn-1.0.5.crate 190286 BLAKE2B 7d5c813bb4cebbc104978181532a050b0a7f79963a539d69a253ebdb15a83c275a5d5b04dfbb66a426afec2c90a450ed7be595619a2b5a31b0725d904f5adb92 SHA512 4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc
 DIST synstructure-0.10.2.crate 17988 BLAKE2B 62bdc896819ba1f0820286dda3596e265dc7ebeda83595d89ad6baf584046242f774141b25ee4cd9b120bd7c392973a99d307abbe956b50eddbd05e9b7b7ce72 SHA512 48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458
-DIST syntect-3.0.2.crate 722541 BLAKE2B 99bfe1d72f6ea573424c86843f2ba407fb7e6f545e144c64e8c4b64e6c0109af0553d9037820da24b2dafa1ae7cb09874a4dfdef7f779ba32411825db796c22f SHA512 3f8ad590a78f4f850560841980c7090de563c774ea128a35277b0a5b9ad922b6eff5f3bfedb07a1252d24e6e3cba08c8e5aa22cdf2a84107aad4cd3a135c75f6
-DIST syntect-3.2.0.crate 733464 BLAKE2B 9b8c40f5d2760e1472ebc399ef926d91cfaeda0f4e36e164da50409ef81e9883114103a8ed8bc3c038e3502982f1c0e9edab17bd35defb90257c6d1c759fbdf3 SHA512 5b684a8f50f56b3f2a69fbde0623835a6a0ff44169ec6a558d6d0f702eb0921894061d9baf8edf9ec6802d7623f9073df365e68b4f33107bbb93807f32e4fadc
+DIST syntect-3.2.1.crate 733622 BLAKE2B 97533fcd36ba96049e5ee5eb15275a8a152d38741a664a4c64270595d0c2d2ab8431b2aafdb72dee75d989c6a91ae6dd43ba1010a1ca81ea7ca9e5ea8a6a76cc SHA512 87d9f45c141dc20e6949580c7336aaba0d0ab440845e4240be68cb6a91531fbad68fc7f0d6b0c8798bf69c068e3bb58f54f6af91aab305a8b97427b00d2d72f6
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
-DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
-DIST termion-1.5.2.crate 22076 BLAKE2B c4a49c9f8bc28f98d6b99109a6eb824b28cb58badcf3254506cd85bcc61026d900cc3fd95c29971953ba6c0979daaa5de33294e7745b816badba912c5c889d41 SHA512 573432550daf6b9edf60783a056df7f1b40ac51585194c8a6181a7b21b22a9d95d9389b3dbf90a050dbacc8988e7b1bbb189756fb5444e11cabd06b3d6c0119b
+DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
 DIST termios-0.3.1.crate 9541 BLAKE2B fb2862550920607bf7ab65157b25392ad67c486227a0298ad2b0b58ef2f2f240ed1b0a6b02bcb905078cd4721b2e56b76a9c1ace1fecdf15643f76d3c39da2c0 SHA512 5f4f423f7aa0ca7e25f1fb0727029e47fbae9024aae6e168b911ee036bd217084332707ae809b2713d0ae35fe6a7fd1d866fbd1f06bebead32c0c2534671b311
-DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
-DIST ucd-util-0.1.2.crate 24992 BLAKE2B 91d59ce88f2ddadcb3f4192ebedddd18bb5b6d9b5f7765a87be04c9e09b7b30c25ad349d41f5b1da9719c0382b8134cab3a7134f496925090ed536f06318b521 SHA512 01b68115b4abfd157e24e187bc633e0d64880a025f88d8b7a33518b79fd29563ef3322c6bdb1527553acfc5dd53d9f18ab127ed498a0cd6e311f08ca19a6cbc0
-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-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
 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 unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST url-2.1.0.crate 64776 BLAKE2B aefc8cd2be90818c757312c354a0bd39ae08a52fb7d5a2a4552ffac3488a4bbc60c3f502ea5cd861aefbab02b0748e4bf35c49592b8fba4377cc17207c666d0c SHA512 1736f512039771b4a365df84937f039e1a0a3c90b827614af47403934ccc4af60077ae13ab585bfb1dc5bd88222edfc890b4ac2ab31872adca2e31bdf5ae45c3
+DIST vcpkg-0.2.7.crate 11012 BLAKE2B 3d97c24c3ddafc4c5c56d54e682c828782d6900a10caa48552892c174e897c6b92d0477a2515df889c25297e43dc57538684cd761b8ff9f6855f6a6b748f4446 SHA512 d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b
 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.6.crate 23072 BLAKE2B 3c53c608cd782b3006ece87d3c99bca80239f1ae9d3b52a925f5e221e8ed55d3669f89a998f549fbb56fcc9e3672c7dc223740f2a918da5f147ddc364c79f41b SHA512 ce828a025356b5e3be1c2b065c8de1d73be787f8718f79ab078afb53eb86a536eafeede6827e6f70e4a3545acea3f6a96cdcc857f1de70bdc2a6fc10dad52945
-DIST walkdir-2.2.7.crate 23507 BLAKE2B 8c26d7970724f7fe2fb6b38f2d25ee4ffeacf115466c019c7fe082e9be1a3c3a0e076f248b53fca5f82234350e5f3d0521d8f7eef5463a372796e2485309dec0 SHA512 bf7c06f982383f4ac7c513bfaf18350924d57dfacb1e9469c1600cf578a759714fd51d261b7fa8c49d29293f24ce4075dc84ee267f5559459622fc97939d338c
-DIST wild-2.0.1.crate 6946 BLAKE2B 00aef7e2de0ed4c055cfdfcd3b1bd03ff53fac394ab76ab9173ed1e13992673252a35ec03a36ff0ce115d1f17e54a9af829301bb9df24ea2cc7cbd084861ee01 SHA512 001f83176ab74b1ebff70fa63bcb93d66aee8eb7519d917af3ba894a208b2346da38ff278b26b11affde90755530ea707918c9476e3b0c72951d23bcb1677ec9
+DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
+DIST which-2.0.1.crate 6953 BLAKE2B 866b1ff726cdefd9b3c201ac5e0649b7b6ea1a8ce42ea26ef5afa3f557326d327728fdb50fb4955476934b0623d3cb2bdab7c57f2c0063d2dae6a7e88748fe27 SHA512 30fffa533f50031b1f0d8cf5b1d7648ee3f0f1dd3e498ab1712fc272983ed415a30198222196cd87c8c0a2a6d342a6927cdf79191f0d81a8390b054169d98a76
+DIST wild-2.0.2.crate 7714 BLAKE2B c55c016fd6e784492d419c11f43eeff1ca7ea6e5598770188a56db1fbd6c8732769041abc36f76ad720dd9a3780806bec943e74333b4f8f36dd9b9f6a3d94a9b SHA512 31f9169b77127c1fb20dcb29cd6b0eeeaa5654086d65db2eae5ffe744e3ffec8de98927caea21f699ec79a1f040d6891070ef7f2e99aba5fee79c13e77ca9f80
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
-DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 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 xml-rs-0.7.0.crate 50980 BLAKE2B 3d0427660327002248823c8b565f83214035d5b58273ff6adbb38b764c1d03d84418769e70bb15bc5dbd986eadbd8d1776dfba175dfb24f04d5e66e5f6209a03 SHA512 8763f37faa24bf5a460f068f16458d5e3f8f5cc8a698202e7db792d61edf580afdd80d6b02d168fa021d28049a48e5a583e346e9608872704e9beb6b3f345bf7
+DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 DIST xml-rs-0.8.0.crate 50974 BLAKE2B 47f5c663e0982b0ca6caa7aceb7029f2bdff948395ffe07da50fe021d7014ecee7c1d45ea9bf370da8ddbbac637bdbf39b9b829769041406958f069ce884e5e2 SHA512 94f0bc729d58564d63b4708518313e3dc7fe7c6ff9ac94019df1507d7ce7bd6428f2bc16fb116a9d676415a94812ce1e54e30b469a2a9b5fe29dc82486c536cd
-DIST yaml-rust-0.4.2.crate 45338 BLAKE2B 2e4f0b488ecbe227dbe83588ebac80686df5b9cff7133a9dc0de0e26f08a39c280a85eaed00e147dcd4e3ea9c3a4e8a7903380150db635a4c481957c8cad9689 SHA512 b1b9e1f9e683a1ec194231e7871418019c6d29ae0424b4b2a423c62a1a4d2ef14f8f3f396513747da91f1f20851ffe3ad69d14db6a75b6e892dc778762cdd423
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
-EBUILD bat-0.10.0-r1.ebuild 3021 BLAKE2B d7c254914446974d3c993954c5a4a138202bf95a00e9a54c115521cda7f373109925e8905918581f969285a69055863ec2286c326cc4c6852befe6a1189e9645 SHA512 a4f0b5e55ecad3ab78c838d0b6ddb144bf9d942c22da5cba7a610cefb18ea8791f83f9c2dc52dd3e2809f393b13f795c4b9b0ed4ceb5224fb037fbcb944549a3
-EBUILD bat-0.11.0-r1.ebuild 3267 BLAKE2B bf9cfb2f5f77b8f77d89f4d6e97934978998a8909d2172bd7e8e767cd42910ee2948622c2d5181104e316f18fe44a3b0eb972d48e9bc227c08981e94ae2e72e3 SHA512 cf5c758ad12ba5c4502963ed71bb36a4461f60a90c662ade5708ea1f26c3a67b5c9df9f7dc4b81dcdf68ef4cf92a7c5f71cee0b819a6c88c59b402f2dbc4173a
+EBUILD bat-0.12.0.ebuild 3236 BLAKE2B 144232a257dedd5c950c36392de9673d4dcaa2900105d086a30bb0503211dca103d793cf034ee4446920ecc72bd9bde4c4a32540c2fe6bfbf38699dd7847b3e7 SHA512 494a163c00fe69318493ed99add67edc65acfb197add22786eda67520d6825d6389c368a61e17c882d4f4fff7710f6504d91d582b97608f37efb7142e3a722a0
 MISC metadata.xml 709 BLAKE2B 5d8265e6f27b8b650024dd6298773ef8b3afaa63b5f210467bff6b35df4b14112fc5b144d73d5074e97d47200c4cc03d6048359f9df4110a18a75d841083c6bd SHA512 779c6d9b6cc09f8f6d06bc256f83aff716ac4638d0ee0be84420b6ea52bb6fae7bec0dd4e672cacbec4d27a537c27c1dcd6d6a49c44be0670c45dc75ca97c0b3
diff --git a/sys-apps/bat/bat-0.10.0-r1.ebuild b/sys-apps/bat/bat-0.10.0-r1.ebuild
deleted file mode 100644
index f684739f23db..000000000000
--- a/sys-apps/bat/bat-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 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_colours-1.0.1
-ansi_term-0.11.0
-argon2rs-0.2.5
-arrayvec-0.4.10
-assert_cmd-0.11.0
-atty-0.2.11
-backtrace-0.3.11
-backtrace-sys-0.1.28
-base64-0.9.3
-bincode-1.0.1
-bitflags-1.0.4
-blake2-rfc-0.2.18
-build_const-0.2.1
-byteorder-1.2.7
-cc-1.0.25
-cfg-if-0.1.6
-clap-2.32.0
-clicolors-control-1.0.0
-cloudabi-0.0.3
-console-0.7.5
-constant_time_eq-0.1.3
-content_inspector-0.2.4
-crc-1.8.1
-difference-2.0.0
-dirs-1.0.4
-encode_unicode-0.3.5
-encoding-0.2.33
-encoding-index-japanese-1.20141219.5
-encoding-index-korean-1.20141219.5
-encoding-index-simpchinese-1.20141219.5
-encoding-index-singlebyte-1.20141219.5
-encoding-index-tradchinese-1.20141219.5
-encoding_index_tests-0.1.4
-error-chain-0.12.0
-escargot-0.4.0
-failure-0.1.5
-failure_derive-0.1.5
-flate2-1.0.4
-fnv-1.0.6
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-git2-0.8.0
-glob-0.2.11
-humantime-1.1.1
-idna-0.1.5
-itoa-0.4.3
-kernel32-sys-0.2.2
-lazy_static-1.2.0
-lazycell-1.2.0
-libc-0.2.43
-libgit2-sys-0.7.11
-libz-sys-1.0.25
-linked-hash-map-0.5.1
-lock_api-0.1.4
-log-0.4.6
-matches-0.1.8
-memchr-2.1.1
-miniz-sys-0.1.11
-miniz_oxide-0.2.0
-miniz_oxide_c_api-0.2.0
-nodrop-0.1.13
-onig-4.2.1
-onig_sys-69.0.0
-owning_ref-0.3.3
-parking_lot-0.6.4
-parking_lot_core-0.3.1
-percent-encoding-1.0.1
-pkg-config-0.3.14
-plist-0.3.0
-predicates-1.0.0
-predicates-core-1.0.0
-predicates-tree-1.0.0
-proc-macro2-0.4.21
-quick-error-1.2.2
-quote-0.6.10
-rand-0.4.3
-rand-0.5.5
-rand_core-0.2.2
-rand_core-0.3.0
-redox_syscall-0.1.40
-redox_termios-0.1.1
-redox_users-0.2.0
-regex-1.0.6
-regex-syntax-0.6.3
-remove_dir_all-0.5.1
-rustc-demangle-0.1.13
-rustc_version-0.2.3
-ryu-0.2.7
-safemem-0.3.0
-same-file-1.0.4
-scoped_threadpool-0.1.9
-scopeguard-0.3.3
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.80
-serde_derive-1.0.80
-serde_json-1.0.33
-shell-words-0.1.0
-smallvec-0.6.5
-stable_deref_trait-1.1.1
-strsim-0.7.0
-syn-0.15.19
-synstructure-0.10.1
-syntect-3.0.2
-tempdir-0.3.7
-term_size-0.3.1
-termion-1.5.1
-termios-0.3.1
-textwrap-0.10.0
-thread_local-0.3.6
-treeline-0.1.0
-ucd-util-0.1.2
-unicode-bidi-0.3.4
-unicode-normalization-0.1.7
-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.6
-wild-2.0.1
-winapi-0.2.8
-winapi-0.3.6
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.1
-winapi-x86_64-pc-windows-gnu-0.4.0
-xml-rs-0.7.0
-yaml-rust-0.4.2
-"
-
-inherit cargo
-
-DESCRIPTION="A cat(1) clone with wings"
-HOMEPAGE="https://github.com/sharkdp/bat"
-SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# >app-backup/bacula-9.2[qt5] has file collisions, #686118
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}
-	!>app-backup/bacula-9.2[qt5]"
-BDEPEND=">=virtual/rust-1.30.0"
-
-QA_FLAGS_IGNORED="/usr/bin/bat"
-
-src_install() {
-	cargo_src_install --path=.
-	einstalldocs
-}
diff --git a/sys-apps/bat/bat-0.11.0-r1.ebuild b/sys-apps/bat/bat-0.11.0-r1.ebuild
deleted file mode 100644
index 14807bd2a14d..000000000000
--- a/sys-apps/bat/bat-0.11.0-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-adler32-1.0.3
-aho-corasick-0.7.3
-ansi_colours-1.0.1
-ansi_term-0.11.0
-argon2rs-0.2.5
-arrayvec-0.4.10
-assert_cmd-0.11.1
-atty-0.2.11
-autocfg-0.1.2
-backtrace-0.3.16
-backtrace-sys-0.1.28
-base64-0.10.1
-bincode-1.1.4
-bitflags-1.0.4
-blake2-rfc-0.2.18
-build_const-0.2.1
-byteorder-1.3.1
-cc-1.0.37
-cfg-if-0.1.9
-clap-2.33.0
-clicolors-control-1.0.0
-cloudabi-0.0.3
-console-0.7.5
-constant_time_eq-0.1.3
-content_inspector-0.2.4
-crc-1.8.1
-crc32fast-1.2.0
-difference-2.0.0
-dirs-1.0.5
-encode_unicode-0.3.5
-encoding-0.2.33
-encoding-index-japanese-1.20141219.5
-encoding-index-korean-1.20141219.5
-encoding-index-simpchinese-1.20141219.5
-encoding-index-singlebyte-1.20141219.5
-encoding-index-tradchinese-1.20141219.5
-encoding_index_tests-0.1.4
-error-chain-0.12.1
-escargot-0.4.0
-escargot-0.5.0
-failure-0.1.5
-failure_derive-0.1.5
-flate2-1.0.7
-fnv-1.0.6
-fuchsia-cprng-0.1.1
-git2-0.8.0
-glob-0.2.11
-humantime-1.2.0
-idna-0.1.5
-itoa-0.4.4
-kernel32-sys-0.2.2
-lazy_static-1.3.0
-lazycell-1.2.1
-libc-0.2.54
-libgit2-sys-0.7.11
-libz-sys-1.0.25
-line-wrap-0.1.1
-linked-hash-map-0.5.2
-lock_api-0.2.0
-log-0.4.6
-matches-0.1.8
-memchr-2.2.0
-miniz-sys-0.1.11
-miniz_oxide-0.2.1
-miniz_oxide_c_api-0.2.1
-nodrop-0.1.13
-numtoa-0.1.0
-onig-4.3.2
-onig_sys-69.1.0
-parking_lot-0.8.0
-parking_lot_core-0.5.0
-percent-encoding-1.0.1
-pkg-config-0.3.14
-plist-0.4.1
-predicates-1.0.1
-predicates-core-1.0.0
-predicates-tree-1.0.0
-proc-macro2-0.4.30
-quick-error-1.2.2
-quote-0.6.12
-rand-0.4.6
-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.4
-rand_os-0.1.3
-rand_pcg-0.1.2
-rand_xorshift-0.1.1
-rdrand-0.4.0
-redox_syscall-0.1.54
-redox_termios-0.1.1
-redox_users-0.3.0
-regex-1.1.6
-regex-syntax-0.6.6
-remove_dir_all-0.5.1
-rustc-demangle-0.1.14
-rustc_version-0.2.3
-ryu-0.2.8
-safemem-0.3.0
-same-file-1.0.4
-scoped_threadpool-0.1.9
-scopeguard-1.0.0
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.91
-serde_derive-1.0.91
-serde_json-1.0.39
-shell-words-0.1.0
-smallvec-0.6.9
-strsim-0.8.0
-syn-0.15.34
-synstructure-0.10.2
-syntect-3.2.0
-tempdir-0.3.7
-term_size-0.3.1
-termion-1.5.2
-termios-0.3.1
-textwrap-0.11.0
-thread_local-0.3.6
-treeline-0.1.0
-ucd-util-0.1.3
-unicode-bidi-0.3.4
-unicode-normalization-0.1.8
-unicode-width-0.1.5
-unicode-xid-0.1.0
-url-1.7.2
-utf8-ranges-1.0.2
-vcpkg-0.2.6
-vec_map-0.8.1
-version_check-0.1.5
-walkdir-2.2.7
-wild-2.0.1
-winapi-0.2.8
-winapi-0.3.7
-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
-xml-rs-0.8.0
-yaml-rust-0.4.3
-"
-
-inherit cargo
-
-DESCRIPTION="A cat(1) clone with wings"
-HOMEPAGE="https://github.com/sharkdp/bat"
-SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# >app-backup/bacula-9.2[qt5] has file collisions, #686118
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}
-	!>app-backup/bacula-9.2[qt5]"
-BDEPEND=">=virtual/rust-1.31.0"
-
-DOCS=( README.md doc/alternatives.md )
-
-QA_FLAGS_IGNORED="/usr/bin/bat"
-
-src_install() {
-	cargo_src_install --path=.
-	doman doc/bat.1
-	einstalldocs
-	insinto /usr/share/fish/vendor_completions.d/
-	doins assets/completions/bat.fish
-}
diff --git a/sys-apps/bat/bat-0.12.0.ebuild b/sys-apps/bat/bat-0.12.0.ebuild
new file mode 100644
index 000000000000..b64e6923594a
--- /dev/null
+++ b/sys-apps/bat/bat-0.12.0.ebuild
@@ -0,0 +1,177 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler32-1.0.3
+aho-corasick-0.7.6
+ansi_colours-1.0.1
+ansi_term-0.11.0
+ansi_term-0.12.0
+arrayref-0.3.5
+arrayvec-0.4.11
+assert_cmd-0.11.1
+atty-0.2.13
+autocfg-0.1.6
+backtrace-0.3.35
+backtrace-sys-0.1.31
+base64-0.10.1
+bat-0.12.0
+bincode-1.1.4
+bindgen-0.50.0
+bitflags-1.1.0
+blake2b_simd-0.5.7
+byteorder-1.3.2
+cc-1.0.41
+cexpr-0.3.5
+cfg-if-0.1.9
+clang-sys-0.28.1
+clap-2.33.0
+clicolors-control-1.0.1
+cloudabi-0.0.3
+console-0.8.0
+constant_time_eq-0.1.4
+content_inspector-0.2.4
+crc32fast-1.2.0
+crossbeam-utils-0.6.6
+difference-2.0.0
+dirs-2.0.2
+dirs-sys-0.3.4
+encode_unicode-0.3.6
+encoding-0.2.33
+encoding-index-japanese-1.20141219.5
+encoding-index-korean-1.20141219.5
+encoding-index-simpchinese-1.20141219.5
+encoding-index-singlebyte-1.20141219.5
+encoding-index-tradchinese-1.20141219.5
+encoding_index_tests-0.1.4
+env_logger-0.6.2
+error-chain-0.12.1
+escargot-0.4.0
+escargot-0.5.0
+failure-0.1.5
+failure_derive-0.1.5
+flate2-1.0.11
+fnv-1.0.6
+fuchsia-cprng-0.1.1
+fxhash-0.2.1
+git2-0.10.0
+glob-0.3.0
+humantime-1.2.0
+idna-0.2.0
+itoa-0.4.4
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+lazycell-1.2.1
+libc-0.2.62
+libgit2-sys-0.9.0
+libloading-0.5.2
+libz-sys-1.0.25
+line-wrap-0.1.1
+linked-hash-map-0.5.2
+log-0.4.8
+matches-0.1.8
+memchr-2.2.1
+miniz-sys-0.1.12
+miniz_oxide-0.3.2
+nodrop-0.1.13
+nom-4.2.3
+onig-5.0.0
+onig_sys-69.2.0
+peeking_take_while-0.1.2
+percent-encoding-2.1.0
+pkg-config-0.3.15
+plist-0.4.2
+predicates-1.0.1
+predicates-core-1.0.0
+predicates-tree-1.0.0
+proc-macro2-0.4.30
+proc-macro2-1.0.2
+quick-error-1.2.2
+quote-0.6.13
+quote-1.0.2
+rand-0.4.6
+rand_core-0.3.1
+rand_core-0.4.2
+rand_os-0.1.3
+rdrand-0.4.0
+redox_syscall-0.1.56
+redox_users-0.3.1
+regex-1.2.1
+regex-syntax-0.6.11
+remove_dir_all-0.5.2
+rust-argon2-0.5.1
+rustc-demangle-0.1.16
+ryu-1.0.0
+safemem-0.3.2
+same-file-1.0.5
+serde-1.0.99
+serde_derive-1.0.99
+serde_json-1.0.40
+shell-words-0.1.0
+shlex-0.1.1
+smallvec-0.6.10
+strsim-0.8.0
+syn-0.15.44
+syn-1.0.5
+synstructure-0.10.2
+syntect-3.2.1
+tempdir-0.3.7
+term_size-0.3.1
+termcolor-1.0.5
+termios-0.3.1
+textwrap-0.11.0
+thread_local-0.3.6
+treeline-0.1.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.8
+unicode-width-0.1.6
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+url-2.1.0
+vcpkg-0.2.7
+vec_map-0.8.1
+version_check-0.1.5
+walkdir-2.2.9
+which-2.0.1
+wild-2.0.2
+winapi-0.2.8
+winapi-0.3.8
+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.2
+xml-rs-0.8.0
+yaml-rust-0.4.3
+"
+
+inherit cargo
+
+DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
+HOMEPAGE="https://github.com/sharkdp/bat"
+SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# >app-backup/bacula-9.2[qt5] has file collisions, #686118
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}
+	!>app-backup/bacula-9.2[qt5]"
+BDEPEND=">=virtual/rust-1.31.0"
+
+DOCS=( README.md doc/alternatives.md )
+
+QA_FLAGS_IGNORED="/usr/bin/bat"
+
+src_install() {
+	cargo_src_install --path=.
+	doman doc/bat.1
+	einstalldocs
+	insinto /usr/share/fish/vendor_completions.d/
+	doins assets/completions/bat.fish
+}
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index ab7aabddb0c0..b569224d1e26 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -2,5 +2,6 @@ DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125e
 DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda
 DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b147fa665f20669e18ac4c6e45ba839dc0dc99e05670eb006d22133475a4a717a5f40b00ebaedfd6e1fbab887674d5 SHA512 ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af
 EBUILD coreutils-8.30.ebuild 6140 BLAKE2B df4b9ef9f15d0e9a1b4129ec69ec6e3bb7f94e3f1d558bdde741d3fe2f989e1b1b96be4b68b070929ccb0fbbe514ef2e4f561de60d9701b9776cb0cf2764014c SHA512 2a5922014839d073dea81dcee72f8aac98c60cc6c1349649b58d9368b6f5a84b412bd3f410c9d9b6d1e7e9645cf9791cfb52d8794c643b67c0d04c61c7f43492
+EBUILD coreutils-8.31-r1.ebuild 5687 BLAKE2B 93bf45bece6caee0ec2c92e2ed61e2553f35aa205b31b9b1ea431c9464aaefee05a7d72a07b15a5d06bb29d963446e128b743c13c506855842046f3ebf41dc2a SHA512 34e965aafc739ee7574dc5c5fde9ffdd50797de7eb8cbc4febbfaa68796480b5b126ab29077c47b6413dda1e529dee51214986702d287a2eda8aa7e26b8273a2
 EBUILD coreutils-8.31.ebuild 6156 BLAKE2B c0c93af4b9b00143897b49100005312c383b6675526b92cc0bb997a790bb3d63f51d3d484c26acc23cf45ff6eb8b1679ddff2288e511c88e60beaaa3a5cb5abf SHA512 f5e02a0c6571865d329f376dc88a88c1ec1580d0b785b59ed53093736946a091a2859b429a57fb3a2efb58029b7a04385578c20add6e915d99146353a967da24
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
new file mode 100644
index 000000000000..4b4527d15146
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit eutils flag-o-matic python-any-r1 toolchain-funcs
+
+PATCH="${PN}-8.30-patches-01"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
+HOMEPAGE="https://www.gnu.org/software/coreutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	mirror://gentoo/${PATCH}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
+IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
+
+LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
+	caps? ( sys-libs/libcap )
+	gmp? ( dev-libs/gmp:=[static-libs] )
+	xattr? ( sys-apps/attr[static-libs] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
+	selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	app-arch/xz-utils
+	test? (
+		dev-lang/perl
+		dev-perl/Expect
+		dev-util/strace
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]')
+	)"
+RDEPEND+="
+	hostname? ( !sys-apps/net-tools[hostname] )
+	kill? (
+		!sys-apps/util-linux[kill]
+		!sys-process/procps[kill]
+	)
+	!app-misc/realpath
+	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
+	!sys-apps/stat
+	!net-mail/base64
+	!sys-apps/mktemp
+	!<app-forensics/tct-1.18-r1
+	!<net-fs/netatalk-2.0.3-r4"
+
+pkg_setup() {
+	if use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	if ! use vanilla ; then
+		eapply "${WORKDIR}"/patch/*.patch
+	fi
+
+	eapply_user
+
+	# Since we've patched many .c files, the make process will try to
+	# re-build the manpages by running `./bin --help`.  When doing a
+	# cross-compile, we can't do that since 'bin' isn't a native bin.
+	# Also, it's not like we changed the usage on any of these things,
+	# so let's just update the timestamps and skip the help2man step.
+	set -- man/*.x
+	touch ${@/%x/1}
+
+	# Avoid perl dep for compiled in dircolors default #348642
+	if ! has_version dev-lang/perl ; then
+		touch src/dircolors.h
+		touch ${@/%x/1}
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		--enable-install-program="arch,$(usev hostname),$(usev kill)"
+		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
+		--enable-largefile
+		$(usex caps '' --disable-libcap)
+		$(use_enable nls)
+		$(use_enable acl)
+		$(use_enable multicall single-binary)
+		$(use_enable xattr)
+		$(use_with gmp)
+	)
+	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
+		export fu_cv_sys_stat_statfs2_bsize=yes #311569
+		export gl_cv_func_realpath_works=yes #416629
+	fi
+
+	export gl_cv_func_mknod_works=yes #409919
+	use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
+	use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
+	# kill/uptime - procps
+	# groups/su   - shadow
+	# hostname    - net-tools
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #439574):
+	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
+	#   -  tests/rm/deep-2.sh (bug #413621)
+	#   -  tests/dd/no-allocate.sh (bug #629660)
+	if has usersandbox ${FEATURES} ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	# Non-root tests will fail if the full path isn't
+	# accessible to non-root users
+	chmod -R go-w "${WORKDIR}"
+	chmod a+rx "${WORKDIR}"
+
+	# coreutils tests like to do `mount` and such with temp dirs
+	# so make sure /etc/mtab is writable #265725
+	# make sure /dev/loop* can be mounted #269758
+	mkdir -p "${T}"/mount-wrappers || die
+	mkwrap() {
+		local w ww
+		for w in "${@}" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!${EPREFIX}/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
+			EOF
+			chmod a+rx "${ww}"
+		done
+	}
+	mkwrap mount umount
+
+	addwrite /dev/full
+	#export RUN_EXPENSIVE_TESTS="yes"
+	#export FETISH_GROUPS="portage wheel"
+	env PATH="${T}/mount-wrappers:${PATH}" \
+	emake -j1 -k check
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS
+
+	if use split-usr ; then
+		cd "${ED%/}"/usr/bin || die
+		dodir /bin
+		# move critical binaries into /bin (required by FHS)
+		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+		           mkdir mknod mv pwd rm rmdir stty sync true uname"
+		mv ${fhs} ../../bin/ || die "could not move fhs bins"
+		if use hostname; then
+			mv hostname ../../bin/ || die
+		fi
+		if use kill; then
+			mv kill ../../bin/ || die
+		fi
+		# move critical binaries into /bin (common scripts)
+		# Why are these required for booting?
+		local com="basename chroot cut dir dirname du env expr head mkfifo
+		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+		mv ${com} ../../bin/ || die "could not move common bins"
+		# create a symlink for uname in /usr/bin/ since autotools require it
+		# Other than uname, we need to figure out why we are
+		# creating symlinks for these in /usr/bin instead of leaving
+		# the files there in the first place.
+		local x
+		for x in ${com} uname ; do
+			dosym ../../bin/${x} /usr/bin/${x}
+		done
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure you run 'hash -r' in your active shells."
+	ewarn "You should also re-source your shell settings for LS_COLORS"
+	ewarn "  changes, such as: source /etc/profile"
+}
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index c0bab36ed093..4f3a284b3287 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -2,5 +2,7 @@ AUX findutils-4.6.0-glibc228.patch 14434 BLAKE2B b125febb478b1abd7db298b6faaab13
 AUX findutils-4.6.0-gnulib-S_MAGIC_NFS.patch 2098 BLAKE2B fcc3687a42fe8b891718acda183bf153cb42bf05bf48c4cb83b95721c0d7e4e2025d58a957fa07ba6fc1406702528b347eb410f627893eacc9ece40aab0cfeab SHA512 2b8024827bea7e0cd4e9f60c52bcef3147e2ba2236d10b2763e510c9e9e7ace8331034db7599f4792802b9dc1619f5086738dcece63b896c0a9ea73ab0068b27
 AUX findutils-4.6.0-gnulib-mb.patch 1005 BLAKE2B 0e08a1c35c8e66b2dcade10b33b53905d727186d2c9c13775b7364da9864e3bde74ee76eb060af5762eac5529754da84a094c4b570cdefce2275462b5a9f35bc SHA512 2bb4f15159e70c8bc9b6a7b36b290bd1c6d6e8b0ab484bd0b0127425efd27fb4a23585b0d43b437a8fb8b311e201c5cae5ef12f0142489b97fe63844145aabd6
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
+DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
 EBUILD findutils-4.6.0-r1.ebuild 1961 BLAKE2B 3834cda1375150479a94144f068780f83172b52df4dbd9eb4457a3720d10d825ec401603e354bc51284047a8988db7bf00f7efa905641a6ce4a257514c385342 SHA512 2e00499ced90bb7df310df4ce25e2c1719838775acbb76b56255b2613af698a118d58f7694e42f377d831fbb48fa2399c26f36b56c2f7ab266d264b303931c67
+EBUILD findutils-4.7.0.ebuild 1692 BLAKE2B 75cbd3efb10759a187e1d986c1c658633ed688d43b28ce1bca89d8225412f1715d94df2a1df9d40def3e9b9d94e6d1c0887e7f3a618db642a0a5a838dad5c400 SHA512 5e963f77b940667925bb2635fe4a207a375666b4df2617f149bd19d8df50ad7986bf773689a0dbe31004722e6fe981d22cab6dbc92986e53f9c62de2ef76ecee
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.7.0.ebuild b/sys-apps/findutils/findutils-4.7.0.ebuild
new file mode 100644
index 000000000000..6783a8ff87fb
--- /dev/null
+++ b/sys-apps/findutils/findutils-4.7.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit flag-o-matic toolchain-funcs python-any-r1
+
+DESCRIPTION="GNU utilities for finding files"
+HOMEPAGE="https://www.gnu.org/software/findutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls selinux static test"
+
+RDEPEND="selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Don't build or install locate because it conflicts with mlocate,
+	# which is a secure version of locate.  See bug 18729
+	sed \
+		-e '/^SUBDIRS/s@locate@@' \
+		-e '/^built_programs/s@ frcode locate updatedb@@' \
+		-i Makefile.in || die
+
+	default
+}
+
+src_configure() {
+	if use static; then
+		append-flags -pthread
+		append-ldflags -static
+	fi
+
+	program_prefix=$(usex userland_GNU '' g)
+	local myeconfargs=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR}"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		--program-prefix=${program_prefix}
+		$(use_enable nls)
+		$(use_with selinux)
+		--libexecdir='$(libdir)'/find
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# We don't build locate, but the docs want a file in there.
+	emake -C locate dblocation.texi
+	default
+}
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 5a4e195ef237..a82d2b3177e4 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -2,7 +2,7 @@ AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2a
 DIST help2man-1.47.10.tar.xz 202176 BLAKE2B 57c19072b1fb696b8ae1fc269d4c44672e692b45f1afe91871621dbed008298154d94813711b8ab89a9ad2e9fffa5ba1e738a613e5e50681b0abea4bfcc92677 SHA512 071383f38fb5264137200439a460e70298fc23d88069a96f150bf50a4e2a08d1d5d29555053b0ea36c809eec8484c4432b55d7d0bddd68f33b07b1abb97556ff
 DIST help2man-1.47.11.tar.xz 202312 BLAKE2B 6baba7fb28f2b28aba8a05eb5df0a8596918767cf43d730052e0bae9293a4a27f207136c22cad246ca7220fb639fabce3bb135edf4e84f866f1ea9b0af26f41d SHA512 786a6bd4336c591cfeb0b4f2dc1429f6545e36514e7b238453c91368b8f531c46db2be025f02dc52e6dd8b971d6edbb4ff1a8e1b519f9253a3957ad7157790be
 DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
-EBUILD help2man-1.47.10.ebuild 1050 BLAKE2B 3137d9a226894343573abe91e8624cf43871e83df3256faf9e25c37210bd176b8b4c4aff20c5fa90d43f5d63729ada02e69ff3b32b5851835c20825ec6fdaaa9 SHA512 314d4646958894b25dc2282af7e068cf3fd832a4250f8340bf05ee176f3231e981f4fe7f40fd690db0715b02bbd0e5611f99daf853440ce8807632007bde71d0
+EBUILD help2man-1.47.10.ebuild 1048 BLAKE2B 5f081dd97a1766ac00b01e2b1387b1073b4e2db8d2c4bc8cc22a9e3dc1ace972df34c1565ec92b35120beca22be2a429cb20efdb0e1746bfeee9ee47bc67d187 SHA512 a6f1b0ecf2a132bbe734b13d6ed1baf02efc1dd7e727e36c5cd74b8e179aa746958f854e4821d57943a0d80d39da5e6a725468eb7eaad0341ca913bbfda76a03
 EBUILD help2man-1.47.11.ebuild 1100 BLAKE2B 70424da45e9d06d459ecfbe426c59b7d6bf8b3ce6f0bed3713ba1c7cff909610e9386684f1025b285bc34a203f54d81cb81bd1fadbc0c2a4be3cf114143d20a8 SHA512 aef361c7aa593641e5cdc420d8de89d00148f2b5d723ae6f7d562b101c1d9f46b4b23ffbe1dfbd16d5ab0f8b59ddea46df21a587c1456e4275fec8005e6ca6ac
 EBUILD help2man-1.47.6.ebuild 1045 BLAKE2B 90b70011d00c687128d269ce5444b895354ee40baf9bfb44febaef503c66b6c4491076fb6167e3b33e73d55c6d34898e4bab45c24e44294880957ac1aa885ce2 SHA512 02d51c1b77a3cb4dfa8b01b2e540d557b2ce5c5303c042e73399300586e652665bdc7a960d9431ead6093ab9ebc3b68fbcf890bccf51dcc6070011701f4080be
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.10.ebuild b/sys-apps/help2man/help2man-1.47.10.ebuild
index 8fb42ea7f5f4..7621fc2ef6fd 100644
--- a/sys-apps/help2man/help2man-1.47.10.ebuild
+++ b/sys-apps/help2man/help2man-1.47.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 7d2c6aa47877..fc04c11fbe97 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,8 +1,10 @@
 DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b4975a02e5735c1b8483214193bcd45a606145a7709f0b9021dd69e0757361bd568f4ba2d66a52641f691aa7f50a SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a
 DIST hwids-20180917.tar.gz 3211960 BLAKE2B d1dc00994a63a6cb6f7c41c73267dcc38b59a46b9e627fac9d6df285b8d1abf5d1335c02c047bff2b09c9ed9f8e4a1c79329c1bd7dd932949d3db2bbb5b9b2e6 SHA512 9fdcd5a7b3adca1bed886aa83e9cf3944391a819fc9f09b673bd815d95e6e70cecf40d8e87287207e34bfeb58c888188fc61b1c0ac13c1ecab0efbdb5100f8d9
 DIST hwids-20190316.tar.gz 3312959 BLAKE2B d9f4c7170979c404a69ca0b51903af34db01a6150ec70dc1416dcb507dfa4d8ad9ce325204791a24e5646dee67aea0c1566c15dcddb65a5d9dddbbbb9b896398 SHA512 6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e
+DIST hwids-20190818.tar.gz 3407208 BLAKE2B c2a0098cba4a34210461a2781f325a95f18696c1917ff3a1c26a2f56383e9edd087ab6b3a1a173a92df829fc250cf460d915a98298f9c38a71396bf232916245 SHA512 74086f96152482af3c9caabc729f34d193cc619aae88d44aa0472d674b7533ab806b13243c95bfa04417bdd40e3bb7069b766c2c0824f19d0c62385b043a01c2
 EBUILD hwids-20171003.ebuild 1692 BLAKE2B f5f7f80998064870b8f7a515e19b40412b5085ec46b33d2ffec5f721138be36de0d4dd3687c844d6988619a0276e7a02f1c3195b4b449f3559a9ecfb9f565fd2 SHA512 a6bae7bddd1ffcfc18965da4e568afc1e5246b3746f3b0c1453126475ef33f6f939c76ad5b5291df589e92489c5a0ea038e808ab38350bd52b7642291f50ca01
 EBUILD hwids-20180917.ebuild 1723 BLAKE2B bd739975959bea7e22c5f145e7fb00be9955071b63e83fc24f9ddb18adc41d1d6efe0c2690c0028595ffd57430599794be87779d9f66d6e7a418bfb37e01c63b SHA512 62e67422b893839bba28d6c19d7212c081d216d3b16c03bf1706ed2e59bf500e888ccb7c71d2d30d18b6ca864ccc916186f52f797b183520e69cca9c2fb66af6
-EBUILD hwids-20190316.ebuild 1747 BLAKE2B a433aa6a8aa6b1413c425fffd64464b3979209618fc71704dd2f2b2af826e6e0fc9a36080a3addb07a84924a7451526dc989b99aae3b91796552804d7cfab04c SHA512 9fb6a80f44fc58075e7e29ad7028e7cba1f51d4b2f0d198ed8008ccbf1897e16893ee8d4c4f1b0b219e92644b7a48bcacedb77b139612a8afac823a83d89f9ed
-EBUILD hwids-99999999.ebuild 1747 BLAKE2B a433aa6a8aa6b1413c425fffd64464b3979209618fc71704dd2f2b2af826e6e0fc9a36080a3addb07a84924a7451526dc989b99aae3b91796552804d7cfab04c SHA512 9fb6a80f44fc58075e7e29ad7028e7cba1f51d4b2f0d198ed8008ccbf1897e16893ee8d4c4f1b0b219e92644b7a48bcacedb77b139612a8afac823a83d89f9ed
+EBUILD hwids-20190316.ebuild 1737 BLAKE2B 6420065931867a382974fc5ab0670327bde6f6e588cbeb65a7e0e143186b4e8ed7db787c464374c17c6f087fdd558eea3f645eedead90e25f6e2e30e8e55a3d8 SHA512 d1755667f4c0ef441b2fd23176c89c3725406c3c73684e52893c659c49ae82e42d1daae48cb5216210e20141767fead8d1619eaa7f3d4e622691a2e3447d8321
+EBUILD hwids-20190818.ebuild 1722 BLAKE2B dcdc1c33133c7b16e2f9ddda850559b02e24474c79a95e904d060eed73ae21b7fa257c64ff45de9b127ea27ce97005a82cff184e44c9d6931e36351d633d9c3d SHA512 e7236b612898123ddcb20a675dcad60ce917c9bf09b9a3316bb4dd0e1d26f30dddec906ea65f26ecbe9b84213dd7608185304e0f0ed40450f2270c2907077f39
+EBUILD hwids-99999999.ebuild 1722 BLAKE2B dcdc1c33133c7b16e2f9ddda850559b02e24474c79a95e904d060eed73ae21b7fa257c64ff45de9b127ea27ce97005a82cff184e44c9d6931e36351d633d9c3d SHA512 e7236b612898123ddcb20a675dcad60ce917c9bf09b9a3316bb4dd0e1d26f30dddec906ea65f26ecbe9b84213dd7608185304e0f0ed40450f2270c2907077f39
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20190316.ebuild b/sys-apps/hwids/hwids-20190316.ebuild
index 17e5beb8c711..99a221a8e85f 100644
--- a/sys-apps/hwids/hwids-20190316.ebuild
+++ b/sys-apps/hwids/hwids-20190316.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-20190818.ebuild b/sys-apps/hwids/hwids-20190818.ebuild
new file mode 100644
index 000000000000..fc424a668c7f
--- /dev/null
+++ b/sys-apps/hwids/hwids-20190818.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2012-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
+HOMEPAGE="https://github.com/gentoo/hwids"
+if [[ ${PV} == 99999999 ]]; then
+	PYTHON_COMPAT=( python3_{6,7} )
+	inherit git-r3 python-any-r1
+	EGIT_REPO_URI="${HOMEPAGE}.git"
+else
+	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="|| ( GPL-2 BSD ) public-domain"
+SLOT="0"
+IUSE="+net +pci +udev +usb"
+
+RDEPEND="
+	udev? ( virtual/udev )
+	!<sys-apps/pciutils-3.1.9-r2
+	!<sys-apps/usbutils-005-r1
+"
+
+if [[ ${PV} == 99999999 ]]; then
+	BDEPEND="
+		net-misc/curl
+		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
+	"
+	python_check_deps() {
+		if use udev; then
+			has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
+		fi
+	}
+else
+	S=${WORKDIR}/hwids-${P}
+fi
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999 ]]; then
+		git-r3_src_unpack
+		cd "${S}" || die
+		emake fetch
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e '/udevadm hwdb/d' Makefile || die
+}
+
+_emake() {
+	emake \
+		NET=$(usex net) \
+		PCI=$(usex pci) \
+		UDEV=$(usex udev) \
+		USB=$(usex usb) \
+		"$@"
+}
+
+src_compile() {
+	if [[ ${PV} == 99999999 ]] && use udev; then
+		python_setup
+		_emake udev-hwdb
+	fi
+	_emake
+}
+
+src_install() {
+	_emake install \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		MISCDIR="${EPREFIX}/usr/share/misc" \
+		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
+		DESTDIR="${D}"
+}
+
+pkg_postinst() {
+	if use udev; then
+		udevadm hwdb --update --root="${ROOT}"
+	fi
+}
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index 17e5beb8c711..fc424a668c7f 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit udev
 
 DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
 HOMEPAGE="https://github.com/gentoo/hwids"
-if [[ ${PV} == "99999999" ]]; then
+if [[ ${PV} == 99999999 ]]; then
 	PYTHON_COMPAT=( python3_{6,7} )
 	inherit git-r3 python-any-r1
 	EGIT_REPO_URI="${HOMEPAGE}.git"
@@ -20,7 +20,6 @@ LICENSE="|| ( GPL-2 BSD ) public-domain"
 SLOT="0"
 IUSE="+net +pci +udev +usb"
 
-DEPEND=""
 RDEPEND="
 	udev? ( virtual/udev )
 	!<sys-apps/pciutils-3.1.9-r2
@@ -28,13 +27,13 @@ RDEPEND="
 "
 
 if [[ ${PV} == 99999999 ]]; then
-	DEPEND+="
+	BDEPEND="
 		net-misc/curl
 		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
 	"
 	python_check_deps() {
 		if use udev; then
-			has_version --host-root "dev-python/pyparsing[${PYTHON_USEDEP}]"
+			has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
 		fi
 	}
 else
@@ -87,6 +86,6 @@ src_install() {
 
 pkg_postinst() {
 	if use udev; then
-		udevadm hwdb --update --root="${ROOT%/}"
+		udevadm hwdb --update --root="${ROOT}"
 	fi
 }
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index 16317e6863aa..6aa3e37e76cf 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,5 +1,5 @@
 DIST i2c-tools-4.0.tar.xz 79972 BLAKE2B 982e4139ed0e2111f9e082d0690fcc0f86f97a433e292e9464b41991f14a1f90147a3612172bad6880f0df6896612e1dea0ae7bf6f459758b2cff45fb35a5dc7 SHA512 ddf86c357c101388193581bc40285089e6ab5e8d870f8aa5d594acc7ecb8596fbd30501e147b88bdea0200b1be88bc0a374356c188d1bcb067bf8e254e3dc51e
 DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248
-EBUILD i2c-tools-4.0.ebuild 1422 BLAKE2B 48b119f6aaf5ce82a7eebfaf20c84f778508a5bc6fccc40d2d35cace27671dcf5dfc9ee2c264426949bcac56232bcf601876ccc027abef98aa664bfbc6007291 SHA512 93b3630aa41e800dc7313be97ff905fc3bff6ee2f622ee44fb7b33a0b88fd0507aba4269bd499c1572468c1fd197b526be3d131f49973cfcfdf1c7274c5737b3
-EBUILD i2c-tools-4.1-r1.ebuild 1948 BLAKE2B 23f2fbb7440200e313c7b13dc3e5f1a3753d2d80218e966d62022d46ecec36c1d3fcf18e678c0fb29fdf069ba90cae2e20538fb8b424d317bb9214a533326fae SHA512 6a9bffae072a2135157796b14961d069d42238ceb7e178caae867f6bad07ec3fac5f067e2d3ed5290a6f762ada929dc93bd54a2ae2d85135e20285772fea566e
+EBUILD i2c-tools-4.0.ebuild 1458 BLAKE2B 607926942381f1e86c38fa3c09cf4ca19a53c1a127790f290dd813a1d44b280c9ede663f03ab6d41daab25734fba8944724853924ced743c3327be068e3343b1 SHA512 54c1e5a50cc0cc04c260d2df23de514e1e2066df0d38ca0644098c4e9476745964721622a54c9c198617205bac333f2d9f2048fe81209798af67fc7e14032a70
+EBUILD i2c-tools-4.1-r1.ebuild 1984 BLAKE2B ecc259b77eb25618d51c9c8dd55a5e77590a1e349fd614a751e6f5d2359c577ba36388923742ac7c43f89208c58524f85bdf75952e198a957df30194f11a487a SHA512 b82f6116e7f14de8887cebf8befafdaf2ad776776b3b6695361c0dc02bc3ffebc54d7cf139c1017e5be3c7ab741da26919c0ee8d85616673dd725a2784a636ee
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
index 1b59636505bc..a8b6cc72dece 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 flag-o-matic toolchain-funcs
 
 DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more"
 HOMEPAGE="https://www.kernel.org/pub/software/utils/i2c-tools"
-SRC_URI="${HOMEPAGE}/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
index e27460b29f84..a90902efeea2 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 flag-o-matic toolchain-funcs
 
 DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more"
 HOMEPAGE="https://www.kernel.org/pub/software/utils/i2c-tools"
-SRC_URI="${HOMEPAGE}/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 28d0db93c8d7..73185bb37b80 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -2,10 +2,10 @@ AUX ipmiutil-2.9.8-flags.patch 712 BLAKE2B d084480396ee8e546c2027e95ce9c95940d1d
 AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b4948446eda7504d81b3854cf8ae65eebdc2f279272ecf09736ff2966dfd477219e19a900cce8665f865bc22a8674ea863f2b SHA512 35912b578b3e61e899f97d2fc6cd6352ac04da638c64c252aa71138d9b7fd1b1de474f2702febfb85ab3f5371971be7a1922a1c6bbe5960c04be2b9171f0e75e
 DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
 DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
-DIST ipmiutil-3.1.2.tar.gz 1698885 BLAKE2B aa6ad98b38c2d2c4a618717842afc88496f88c291a2731fe95072005a4a85f6dcb3a312924c3353e7b902d90a6bfbedc73bef0ce3d7c31d2326db14e4777ee0b SHA512 83dfddb30e8ddb8ac323473873e0920d2f81c059790556a472fb33c4dd140f5045b74f6f63e3300817b2f5c4af3d5ce35f3bacb96dc65c91ad0133bf088ba565
 DIST ipmiutil-3.1.3.tar.gz 1698835 BLAKE2B a540a4522a22f98ad47c89e59f371e5304583cfaab348154dee366a058d78ca6d6ecd6003d8b49c08e8247d38254f7abf48ee05672ddd678566d40a66f63c912 SHA512 bd1f95b59583a07a5b6001b40e59269f25eb63b69e33f7fad6dd40136e1ea7611e647eb5ed2e2a9746944bde2dc2a3aa2def44238947693d75d9ca48697e1b99
+DIST ipmiutil-3.1.4.tar.gz 1693730 BLAKE2B a45de6e33110ae95b19a76be4c70a40025a9b6cbb5faa4555ff8d0b1c0445afcdd839d361052aadf31674b4be8db2c6c7087507727f74123809106b442bb1b8b SHA512 e76f3efbd5a15882607f9f141fe1298bfc80a3bc04f616bb0525c4546f19846616ce5aecc4aba658bcd01678724c05f770f893ba3dac91f5fe9c6cabd2acd579
 EBUILD ipmiutil-3.0.6.ebuild 1334 BLAKE2B 01ed4959fbefdc4487df779d5659a4b9d05893b536da58f1a828e435cf34a4938e2d05ae69568a728b0a91ab6380f040d6ad27b506ba8901f0d191f4ab7241c3 SHA512 a565e97bf6a0875a50033736a8172527f3a745e0ad45ff3d44eb985576e0d597585261bfbce779d552a6d0589ceadf6c453abcb9864e0ecac2867b9ceeacc18c
 EBUILD ipmiutil-3.0.9.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
-EBUILD ipmiutil-3.1.2.ebuild 1459 BLAKE2B 05a9ea153c3da53dab123c1088441e08c246e634aaddbd41b44a13a72917bf70766a1de04a485fab592c7c9e3db87e1e6a0286525d9540f6b183b9dae0869442 SHA512 61dcd5b01576d7eb1fbb8f324c41bfe51788e1e4f58414dbc225145c4a9cd3764b78abf62e127a60be12cdd322cf774f620a3eb413e26406abf3ac2540e387fd
 EBUILD ipmiutil-3.1.3.ebuild 1461 BLAKE2B c0af26a98214d7ec3b6abaa86ed39a33b0a7f1c9e9b6deed89054179148c7197f92cca199f72b0b038144ba1d7ba8d4c83caa53025cba13cf151b97e29c42833 SHA512 444b4bb91e57f3288c15f734a7b88a40559625648af995b0d4d209662cb0c1e09382c0cab8f69132bb236bbeee0cbdd605769d709c554489419a8e7386652cfd
+EBUILD ipmiutil-3.1.4.ebuild 1540 BLAKE2B 3d6c4d4ef714a6bdd3c092c190c3f0d5cfdbcdcbbb8d8156a73341f6754b60831964c302bd4b3b7bf9ca61e8b300306fdce68f44a701be7018d0954be6e9b0f3 SHA512 1b741ffabc2000b5a53abbbec81ae538866449668bed2201258a129f7ffe84bbf073334f1760d2f65464a532cbd4511a7f5782d9e0428e67674bb9098e5ea98d
 MISC metadata.xml 337 BLAKE2B 5f04801092c5d0cf4166c36b508c4cb27e3a08f53f8f86d968d01d1d6911c6dd9cff78d70ec5c9bb60e6f3a028b7e5db1b629a9ba7961b3d729accbc6b62f9c2 SHA512 85f9992b8c7fddbffe99cba761637a897e7ba68f70762f882c039c6492feefefa6bd1ca38fbc73d0a214d04ddb07f5f0ea2106552e4133736d4594e43fae4845
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.2.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.2.ebuild
deleted file mode 100644
index 4a05a288313a..000000000000
--- a/sys-apps/ipmiutil/ipmiutil-3.1.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools systemd
-
-DESCRIPTION="IPMI Management Utilities"
-HOMEPAGE="http://ipmiutil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/openssl-1:0="
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.8-flags.patch
-	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
-	sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-systemd --enable-sha256
-}
-
-src_compile() {
-	# Ulgy workaround. Upstream is misusing the make system here
-	# and it doesn't even work.
-	# Please check on each bump if this workaround is still required.
-	pushd lib/lanplus &>/dev/null || die
-	emake || die "emake lanplus failed"
-	cp libipmi_lanplus.a .. || die
-	popd &>/dev/null || die
-
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
-	dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
-
-	# Init scripts are only for Fedora
-	rm -r "${ED%/}"/etc/init.d || die 'remove initscripts failed'
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-
-	keepdir /var/lib/ipmiutil
-}
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild
new file mode 100644
index 000000000000..4eefd0cd1de8
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools systemd
+
+DESCRIPTION="IPMI Management Utilities"
+HOMEPAGE="http://ipmiutil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/openssl-1:0="
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.8-flags.patch
+	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
+	sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
+
+	# Don't compress man pages
+	sed '/gzip -f/d' -i doc/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-systemd --enable-sha256
+}
+
+src_compile() {
+	# Ulgy workaround. Upstream is misusing the make system here
+	# and it doesn't even work.
+	# Please check on each bump if this workaround is still required.
+	pushd lib/lanplus &>/dev/null || die
+	emake || die "emake lanplus failed"
+	cp libipmi_lanplus.a .. || die
+	popd &>/dev/null || die
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
+	dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
+
+	# Init scripts are only for Fedora
+	rm -r "${ED}"/etc/init.d || die 'remove initscripts failed'
+
+	if ! use static-libs ; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	keepdir /var/lib/ipmiutil
+}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index b65867237109..6915e4966333 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -7,8 +7,8 @@ AUX iproute2-5.1.0-portability.patch 1117 BLAKE2B 8e3a2f275ffb774a30165f46d85ad0
 DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8
 DIST iproute2-5.1.0.tar.xz 722412 BLAKE2B 06330b636d661df5e2128a87bb63455bcbb5c8cda0faab96928e2068bb23b3bc3b2e5a0daa68d2d112e66fa58d7b3360791c7d5a0d679fc01cecb3ca9ad8ea4d SHA512 5c8319b040bd0ba98cf1225b2a77efafc662741344c53877ee38cf108ca01906b03328e4f9b00b7557e301c6e64bca4e42e92af477b4d657bcbff5120c0c4e87
 DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1
-EBUILD iproute2-4.19.0-r1.ebuild 4345 BLAKE2B f012c84544f65c9de8c399b140c4b4916220203ab3b6a623c4ebe649b484bcbc9311efba44b88af96e37c3b87abc888a0574857f9484b0c01beb8c6f326657dc SHA512 34c81d659bf2528a74a97542bf4e9ed120915d0ca41e3e2b9e6d8272915204ab1d68508704997713b99cbab3f6fd63198a4766701079ced270d57a23b68aead1
-EBUILD iproute2-5.1.0.ebuild 4397 BLAKE2B 80305c3ebe8d5f84a65afd89dee7f1e6134f5486f08d9ec0653da6f2c1bd4254bfe53d4c71641ce085755694e189763409be9eca3631d3f60a5a31fe76e505b6 SHA512 79bb975320aeccfdbba221a75435e4b4bb9ad6fbb2556e8603903822e3572469b83c16b1506dfe5b3fd30187c437ac8c80f556f7692022ee3bbae1c777bea6fa
-EBUILD iproute2-5.2.0.ebuild 4397 BLAKE2B 80305c3ebe8d5f84a65afd89dee7f1e6134f5486f08d9ec0653da6f2c1bd4254bfe53d4c71641ce085755694e189763409be9eca3631d3f60a5a31fe76e505b6 SHA512 79bb975320aeccfdbba221a75435e4b4bb9ad6fbb2556e8603903822e3572469b83c16b1506dfe5b3fd30187c437ac8c80f556f7692022ee3bbae1c777bea6fa
-EBUILD iproute2-9999.ebuild 4352 BLAKE2B f2058546d7f7e505b51c58051d5e4a0e94bbeef1c1ed4315944f8547a5fbb4e5a55476e3fd261f7e2561b43d81ccceef092c1fe24bb6d9e58ed09e3686858daf SHA512 ed97829ee9302813189a10eb63c09fca5ea58cc08bc77931fb766d9fc45b7d944655e9c21c35a5b4c465f01fdc9a3041ec0d4bd27dd367ca923fedb119c332a9
+EBUILD iproute2-4.19.0-r1.ebuild 4375 BLAKE2B 478751ceebaef4c53e975120662b7e5e35b845ca0568cd5866107265c976332661448c0fac1ea6277ef57392ab69ac8012d027e190508dc241821c8ad584f7b4 SHA512 630d8677750918d24be161edf6a8793f5c01ab120fd9b538cf3fde75704d52254e117782d30f70145f741a6d0cc6fd99025bfcb4714c8ce9466130c90f5ec277
+EBUILD iproute2-5.1.0.ebuild 4425 BLAKE2B cd695ac496f8b0bb3e017b5b8d2f074902366fa3185db992070984a83300d72851cce584ad8446530d0f303358afe104ad41d640b1188a753aa25349ce267ecb SHA512 21fcf629dd959d8fea205fcb4fd0fcb1ffa1bfe249ddfc68247350a7c9ee5ec7cf9d6d1b36c0282ce0a5791c0f55ee594b465dfa944e05f7725bc00f5f480f7c
+EBUILD iproute2-5.2.0-r1.ebuild 4425 BLAKE2B cd695ac496f8b0bb3e017b5b8d2f074902366fa3185db992070984a83300d72851cce584ad8446530d0f303358afe104ad41d640b1188a753aa25349ce267ecb SHA512 21fcf629dd959d8fea205fcb4fd0fcb1ffa1bfe249ddfc68247350a7c9ee5ec7cf9d6d1b36c0282ce0a5791c0f55ee594b465dfa944e05f7725bc00f5f480f7c
+EBUILD iproute2-9999.ebuild 4380 BLAKE2B 37d298a23f7a6906fcfb6738f37b01af7adf62e51d78200dea1dc21c4fa5ba6d90774b53824c78e3ac8f465df5a4f7aa78cbc1fa501bd87c42da54eafe0bc285 SHA512 642d47e5287d3c5253ae2908ddb47041e398a7460896458f22ca5ad5371511696a05d8dd7f96b0d04bb99336c2cdf72b04ee7a3520ef133678a3fc8fe0b788f3
 MISC metadata.xml 581 BLAKE2B b63c391d8d9ba608c12ea74f0cdf0d4d762d18e5b62ab1e2489f34140def1691bc295d8d252ab984b313b6fb037cd4d5a74d992db7ca670557bd8458501f8c04 SHA512 607dd3006049664a4c780a65b187fb938cbf7c5e79b445eb4a69c3115af8fe6718ea227a68cfcf4b42fd92c3e760579a92b49a58415d01ccb0715fdf9c052a97
diff --git a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
index be6fc65b8dad..cfbd014dfdad 100644
--- a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
@@ -128,6 +128,7 @@ src_install() {
 
 	emake \
 		DESTDIR="${D}" \
+		PREFIX="${EPREFIX%/}/usr" \
 		LIBDIR="${EPREFIX%/}"/$(get_libdir) \
 		SBINDIR="${EPREFIX%/}"/sbin \
 		CONFDIR="${EPREFIX%/}"/etc/iproute2 \
diff --git a/sys-apps/iproute2/iproute2-5.1.0.ebuild b/sys-apps/iproute2/iproute2-5.1.0.ebuild
index 81245c6d74f5..5beda6e4bc4e 100644
--- a/sys-apps/iproute2/iproute2-5.1.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.1.0.ebuild
@@ -133,6 +133,7 @@ src_install() {
 
 	emake \
 		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}"/$(get_libdir) \
 		SBINDIR="${EPREFIX}"/sbin \
 		CONFDIR="${EPREFIX}"/etc/iproute2 \
diff --git a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
new file mode 100644
index 000000000000..5beda6e4bc4e
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	dev-libs/libbsd
+	!minimal? ( net-libs/libmnl )
+	caps? ( sys-libs/libcap )
+	elf? ( virtual/libelf )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	berkdb? ( sys-libs/db:= )
+	atm? ( net-dialup/linux-atm )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/bison-2.4
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
+	"${FILESDIR}"/${PN}-5.1.0-portability.patch
+)
+
+src_prepare() {
+	if ! use ipv6 ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
+		)
+	fi
+
+	default
+
+	# echo -n is not POSIX compliant
+	sed 's@echo -n@printf@' -i configure || die
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Use /run instead of /var/run.
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		include/namespace.h \
+		man/man8/ip-netns.8 || die
+
+	# build against system headers
+	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	if use minimal ; then
+		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'int main(){return 0;}' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	# run "configure" script first which will create "config.mk"...
+	econf
+
+	# ...now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_CAP      := $(usex caps y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}"/$(get_libdir) \
+		SBINDIR="${EPREFIX}"/sbin \
+		CONFDIR="${EPREFIX}"/etc/iproute2 \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		ARPDDIR="${EPREFIX}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		keepdir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+	fi
+}
diff --git a/sys-apps/iproute2/iproute2-5.2.0.ebuild b/sys-apps/iproute2/iproute2-5.2.0.ebuild
deleted file mode 100644
index 81245c6d74f5..000000000000
--- a/sys-apps/iproute2/iproute2-5.2.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
-	!net-misc/arpd
-	dev-libs/libbsd
-	!minimal? ( net-libs/libmnl )
-	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	berkdb? ( sys-libs/db:= )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
-	app-arch/xz-utils
-	>=sys-devel/bison-2.4
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
-	"${FILESDIR}"/${PN}-5.1.0-portability.patch
-)
-
-src_prepare() {
-	if ! use ipv6 ; then
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
-		)
-	fi
-
-	default
-
-	# echo -n is not POSIX compliant
-	sed 's@echo -n@printf@' -i configure || die
-
-	sed -i \
-		-e '/^CC :\?=/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	if use minimal ; then
-		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
-	fi
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'int main(){return 0;}' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	# run "configure" script first which will create "config.mk"...
-	econf
-
-	# ...now switch on/off requested features via USE flags
-	# this is only useful if the test did not set other things, per bug #643722
-	cat <<-EOF >> config.mk
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	TC_CONFIG_NO_XT := $(usex iptables n y)
-	# We've locked in recent enough kernel headers #549948
-	TC_CONFIG_IPSET := y
-	HAVE_BERKELEY_DB := $(usex berkdb y n)
-	HAVE_CAP      := $(usex caps y n)
-	HAVE_MNL      := $(usex minimal n y)
-	HAVE_ELF      := $(usex elf y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}"/$(get_libdir) \
-		SBINDIR="${EPREFIX}"/sbin \
-		CONFDIR="${EPREFIX}"/etc/iproute2 \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		ARPDDIR="${EPREFIX}"/var/lib/arpd \
-		install
-
-	dodir /bin
-	mv "${ED}"/{s,}bin/ip || die #330115
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		keepdir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
-	fi
-}
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index 4db72b734551..2f36415696f2 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -132,6 +132,7 @@ src_install() {
 
 	emake \
 		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
 		LIBDIR="${EPREFIX}"/$(get_libdir) \
 		SBINDIR="${EPREFIX}"/sbin \
 		CONFDIR="${EPREFIX}"/etc/iproute2 \
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 2af1c9a8ef81..edb060b8ce3e 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,6 +3,6 @@ AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52
 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
 EBUILD kmod-25.ebuild 4913 BLAKE2B f17beda49f104502c22d5f1e83b36b0869829460be48a3d30edec854891b836c185afa85cd46d36279fea0cb01415038e0a2682037638a3723d86b6b51bc4b5c SHA512 ff8089459817c08226c91243aa8582e4a275b813b5569f6dcd2c591bade7db8832c38cb21736e50f8440eeb3b734197c3971b63e3e0899a6baf8f8dcf7f074ff
-EBUILD kmod-26-r1.ebuild 5134 BLAKE2B e663244e433893ba30b1776258257d30a26beb87607553cf48688f3989b0675d186bbc8ee6c639ca139396db42311021f6818b177c15f61b6a62bc9660f68b12 SHA512 f025735f5ce30d16d2560660a2d781091940cfb517fd7f6100aaf470055b9f4185bdf282e98b065e35180b68adcca7f98fb0c035d9ac25607735a1e239a9b17c
-EBUILD kmod-9999.ebuild 5002 BLAKE2B f5d77bb0b1bc1b55886a7e31b52bd922e616b080d1ee710d889e6465685a8b47c74500d2852dba03d8068abe5def621628c63ed5e7c096b28f449f7ce0755729 SHA512 2df4cf048aa392368c00f338d5fd46382cc7b362717d6fec5e2efb6f6c38f9783201aecfbf54db02f2e3275cb8dfa6e53aeb8a59f7acedbebedddd0e45ca0172
+EBUILD kmod-26-r2.ebuild 5095 BLAKE2B 2dc6e42003133a2156d5e047bbb60192d2f80e98d28bb204c988732606e8a513b88ec28258763504fdfa748bc1ad280a5e49bdccac77e6c52c31dd6a1837c385 SHA512 1db6bc02adccc043939643d24a2fb99ff73a6157434891137c6eb44e5d71b320889c18269527e5810ea7e3915699850f16b753a1bbd232e6609678e7113ff915
+EBUILD kmod-9999.ebuild 4963 BLAKE2B 327c42627d7d3589b36593375fb110bd157bea879d4e3042bf8ce6f99993e9710f18583f1720c80d8f254165ee59dedc2c627b9e79e761ff5a74b7aba248e762 SHA512 f9ba665735e4de18abf97cef467cf6d9810bc66e277b2c555e69ac71db64eb377756883bfc173d16f942b32626261bdfc2ec8090f2673b1d631908aa09454e59
 MISC metadata.xml 540 BLAKE2B ec5ee262fe76215688d99e32778848e71de5825f488eea2219e076290e020aa86de6138ab8366d5e077d44797789a27c22fea1c64f9c6e2713cf315b4b891455 SHA512 c4f47a77dfa7bc4cbaa61744fc46c5547763b51b48521cd229ac89680325ecbf415bd9e1ce9c71982ea721d0d5c4cf3677a0f70e8dad65235f523840cd14de94
diff --git a/sys-apps/kmod/kmod-26-r1.ebuild b/sys-apps/kmod/kmod-26-r1.ebuild
deleted file mode 100644
index a10a6cdda8d6..000000000000
--- a/sys-apps/kmod/kmod-26-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit bash-completion-r1 multilib python-r1
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-	inherit libtool
-fi
-
-DESCRIPTION="library and tools for managing linux kernel modules"
-HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug doc libressl lzma python ssl static-libs +tools zlib"
-
-# Upstream does not support running the test suite with custom configure flags.
-# I was also told that the test suite is intended for kmod developers.
-# So we have to restrict it.
-# See bug #408915.
-RESTRICT="test"
-
-# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
-RDEPEND="!sys-apps/module-init-tools
-	!sys-apps/modutils
-	!<sys-apps/openrc-0.13.8
-	!<sys-apps/systemd-216-r3
-	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
-	python? ( ${PYTHON_DEPS} )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	lzma? ( virtual/pkgconfig )
-	python? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		virtual/pkgconfig
-		)
-	zlib? ( virtual/pkgconfig )"
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND}
-		dev-libs/libxslt"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS="NEWS README TODO"
-
-PATCHES=(
-	"${FILESDIR}/${P}-libressl.patch" # bug 677960
-)
-
-src_prepare() {
-	default
-
-	if [[ ! -e configure ]] ; then
-		if use doc; then
-			gtkdocize --copy --docdir libkmod/docs || die
-		else
-			touch libkmod/docs/gtk-doc.make
-		fi
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	# Restore possibility of running --enable-static wrt #472608
-	sed -i \
-		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
-		$(use_enable debug)
-		$(use_enable doc gtk-doc)
-		$(use_enable static-libs static)
-		$(use_enable tools)
-		$(use_with lzma xz)
-		$(use_with ssl openssl)
-		$(use_with zlib)
-	)
-
-	local ECONF_SOURCE="${S}"
-
-	kmod_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		run_in_build_dir econf "${myeconfargs[@]}" "$@"
-	}
-
-	BUILD_DIR="${WORKDIR}/build"
-	kmod_configure --disable-python
-
-	if use python; then
-		python_foreach_impl kmod_configure --enable-python
-	fi
-}
-
-src_compile() {
-	emake -C "${BUILD_DIR}"
-
-	if use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_compile() {
-			emake -C "${BUILD_DIR}" -f Makefile -f - python \
-				VPATH="${native_builddir}:${S}" \
-				native_builddir="${native_builddir}" \
-				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
-				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
-		}
-
-		python_foreach_impl python_compile
-	fi
-}
-
-src_install() {
-	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
-	einstalldocs
-
-	if use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_install() {
-			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
-				VPATH="${native_builddir}:${S}" \
-				install-pkgpyexecLTLIBRARIES \
-				install-dist_pkgpyexecPYTHON
-		}
-
-		python_foreach_impl python_install
-	fi
-
-	find "${ED}" -name "*.la" -delete || die
-
-	if use tools; then
-		local bincmd sbincmd
-		for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
-			dosym ../bin/kmod /sbin/${sbincmd}
-		done
-
-		# These are also usable as normal user
-		for bincmd in lsmod modinfo; do
-			dosym kmod /bin/${bincmd}
-		done
-	fi
-
-	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
-	softdep uhci_hcd pre: ehci_hcd
-	softdep ohci_hcd pre: ehci_hcd
-	EOF
-
-	insinto /lib/modprobe.d
-	doins "${T}"/usb-load-ehci-first.conf #260139
-
-	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
-}
-
-pkg_postinst() {
-	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
-		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
-	fi
-
-	# Add kmod to the runlevel automatically if this is the first install of this package.
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
-		fi
-		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
-		fi
-	fi
-
-	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
-			ewarn
-			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
-			ewarn "kernel modules to have required static nodes!"
-			ewarn "Run this command:"
-			ewarn "\trc-update add kmod-static-nodes sysinit"
-		fi
-	fi
-}
diff --git a/sys-apps/kmod/kmod-26-r2.ebuild b/sys-apps/kmod/kmod-26-r2.ebuild
new file mode 100644
index 000000000000..73c5f95d06b5
--- /dev/null
+++ b/sys-apps/kmod/kmod-26-r2.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit bash-completion-r1 multilib python-r1
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	inherit libtool
+fi
+
+DESCRIPTION="library and tools for managing linux kernel modules"
+HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc libressl lzma python ssl static-libs +tools zlib"
+
+# Upstream does not support running the test suite with custom configure flags.
+# I was also told that the test suite is intended for kmod developers.
+# So we have to restrict it.
+# See bug #408915.
+RESTRICT="test"
+
+# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
+RDEPEND="!sys-apps/module-init-tools
+	!sys-apps/modutils
+	!<sys-apps/openrc-0.13.8
+	!<sys-apps/systemd-216-r3
+	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	lzma? ( virtual/pkgconfig )
+	python? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		virtual/pkgconfig
+		)
+	zlib? ( virtual/pkgconfig )"
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND}
+		dev-libs/libxslt"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS="NEWS README TODO"
+
+PATCHES=(
+	"${FILESDIR}/${P}-libressl.patch" # bug 677960
+)
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] ; then
+		if use doc; then
+			gtkdocize --copy --docdir libkmod/docs || die
+		else
+			touch libkmod/docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		elibtoolize
+	fi
+
+	# Restore possibility of running --enable-static wrt #472608
+	sed -i \
+		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
+		configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
+		$(use_enable debug)
+		$(use_enable doc gtk-doc)
+		$(use_enable static-libs static)
+		$(use_enable tools)
+		$(use_with lzma xz)
+		$(use_with ssl openssl)
+		$(use_with zlib)
+	)
+
+	local ECONF_SOURCE="${S}"
+
+	kmod_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		run_in_build_dir econf "${myeconfargs[@]}" "$@"
+	}
+
+	BUILD_DIR="${WORKDIR}/build"
+	kmod_configure --disable-python
+
+	if use python; then
+		python_foreach_impl kmod_configure --enable-python
+	fi
+}
+
+src_compile() {
+	emake -C "${BUILD_DIR}"
+
+	if use python; then
+		local native_builddir=${BUILD_DIR}
+
+		python_compile() {
+			emake -C "${BUILD_DIR}" -f Makefile -f - python \
+				VPATH="${native_builddir}:${S}" \
+				native_builddir="${native_builddir}" \
+				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
+				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
+		}
+
+		python_foreach_impl python_compile
+	fi
+}
+
+src_install() {
+	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+	einstalldocs
+
+	if use python; then
+		local native_builddir=${BUILD_DIR}
+
+		python_install() {
+			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+				VPATH="${native_builddir}:${S}" \
+				install-pkgpyexecLTLIBRARIES \
+				install-dist_pkgpyexecPYTHON
+		}
+
+		python_foreach_impl python_install
+	fi
+
+	find "${ED}" -name "*.la" -delete || die
+
+	if use tools; then
+		local cmd
+		for cmd in depmod insmod modprobe rmmod; do
+			dosym ../bin/kmod /sbin/${cmd}
+		done
+
+		# These are also usable as normal user
+		for cmd in lsmod modinfo; do
+			dosym kmod /bin/${cmd}
+		done
+	fi
+
+	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
+	softdep uhci_hcd pre: ehci_hcd
+	softdep ohci_hcd pre: ehci_hcd
+	EOF
+
+	insinto /lib/modprobe.d
+	doins "${T}"/usb-load-ehci-first.conf #260139
+
+	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
+}
+
+pkg_postinst() {
+	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
+		rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
+	fi
+
+	# Add kmod to the runlevel automatically if this is the first install of this package.
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
+		fi
+		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+		fi
+	fi
+
+	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
+		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+			ewarn
+			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
+			ewarn "kernel modules to have required static nodes!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add kmod-static-nodes sysinit"
+		fi
+	fi
+}
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 0e0722934952..1da1e59fb5c2 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -143,14 +143,14 @@ src_install() {
 	find "${ED}" -name "*.la" -delete || die
 
 	if use tools; then
-		local bincmd sbincmd
-		for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
-			dosym ../bin/kmod /sbin/${sbincmd}
+		local cmd
+		for cmd in depmod insmod modprobe rmmod; do
+			dosym ../bin/kmod /sbin/${cmd}
 		done
 
 		# These are also usable as normal user
-		for bincmd in lsmod modinfo; do
-			dosym kmod /bin/${bincmd}
+		for cmd in lsmod modinfo; do
+			dosym kmod /bin/${cmd}
 		done
 	fi
 
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 8ecb7438f08b..e861755026e4 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,10 +1,10 @@
 AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80d4416743aa2f8f4c2a9246b0037c7cc9fbf23af430af10f69a7bb6c3dbb8f809c9a49cb31cf4 SHA512 81a7082d7f0cdf17d8277af7142aaa98feb8c12cf41bb96c12af53fdd3e436a4d15a57ef76fb90390133cfdb25e1bb1b16e17a39b39b6517afc529b871426331
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301
-DIST man-db-2.8.5.tar.xz 1787244 BLAKE2B b908a6fb0187d42f8d1f842063e0afdf1e052244ea727f0aaaf4d658bb8954a216c0555df5511b27246fd12c2a388c44dcfccf243449d25d6e741c5c3466d3be SHA512 8d1524c3b6459c9ac02d969149c18c198cb171bcd6acc493e863a466c01309958ee9f5ac52df4d7d27da29d35cb7c64132732f5b969181ab336500df2e6dad69
 DIST man-db-2.8.6.1.tar.xz 1829328 BLAKE2B 5dce50a4d5003a370595b3db0b1d7f01c54b53d26f011307bd91447cdeed410ea20a6720b12eae301d21c0b9674ed84b055f38f44e09d5543ce1647dff8b5bca SHA512 0c43cdddf2e07cd4a2225e098ea4cbfb2842a9bbf08bfb073058be0d66efac3a77ca0f8725564677c8f61e671f471c76f1dbba77a7601d7a63bb81350ef51bb5
+DIST man-db-2.8.7.tar.xz 1839012 BLAKE2B 19b438b1083cfd838421f29ed053fe85686929bc9f2105fe399ea99622f138bca2c8888a17cddb9223362db2d5f9c4bb3669865ecf749fe845ea8e4223027f67 SHA512 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9
 EBUILD man-db-2.7.6.1-r2.ebuild 3166 BLAKE2B 12cc1a5704569692825c9487433a604f5752caf366fcf152d5565b58b3b26a4db0e4816afdf2974cc3570142d024d07ccbe5e0a3f8f084c463b50c895f7e2f21 SHA512 95afcd9fd93c690003a3fdeb9ba1f2b794fd8d7fdc882d1d9f0658f6caf62fb0157d4e590033852f2b6f9b4634229b7256826a4799c9f37f68f8e986f12f3335
-EBUILD man-db-2.8.5-r1.ebuild 3556 BLAKE2B 54d767f777edaf57755569261009c4287bb73107913e736482685e30cd93f76c62f31a51f55625e72ada927134ecb8d2ead1b610db16a206a4906858188bea19 SHA512 3b1f03cad7087b28bfe60df5a5a16fe1db4a33518cc43c11a0c79b3fcb8cd10c35a98941f359d8dd35c8b8f6dc5e693eeae917baf4bc2cdf70f9ea154ac4a29b
 EBUILD man-db-2.8.6.1.ebuild 3460 BLAKE2B 4442e511e90674a1b511fde4829b30399a79dc0b483c213e4a7de8d2e331300a5a99a7fa45ad30cd5896d6a57e7c580affc524e41cbbba28b97a2c3af3a6a55a SHA512 0907ed049803b9c04f8b454cdd6ff8f8cb235b8b531502d0ef55f5022b75af2b51189b4472ed382e161f70600dff1e62202bd499a7c7d24577378a44b21f1860
+EBUILD man-db-2.8.7.ebuild 3460 BLAKE2B 4442e511e90674a1b511fde4829b30399a79dc0b483c213e4a7de8d2e331300a5a99a7fa45ad30cd5896d6a57e7c580affc524e41cbbba28b97a2c3af3a6a55a SHA512 0907ed049803b9c04f8b454cdd6ff8f8cb235b8b531502d0ef55f5022b75af2b51189b4472ed382e161f70600dff1e62202bd499a7c7d24577378a44b21f1860
 EBUILD man-db-9999.ebuild 3460 BLAKE2B 4442e511e90674a1b511fde4829b30399a79dc0b483c213e4a7de8d2e331300a5a99a7fa45ad30cd5896d6a57e7c580affc524e41cbbba28b97a2c3af3a6a55a SHA512 0907ed049803b9c04f8b454cdd6ff8f8cb235b8b531502d0ef55f5022b75af2b51189b4472ed382e161f70600dff1e62202bd499a7c7d24577378a44b21f1860
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.8.5-r1.ebuild b/sys-apps/man-db/man-db-2.8.5-r1.ebuild
deleted file mode 100644
index 0bcb6f92ce69..000000000000
--- a/sys-apps/man-db/man-db-2.8.5-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user eapi7-ver systemd
-
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
-
-CDEPEND="
-	!sys-apps/man
-	>=dev-libs/libpipeline-1.5.0
-	sys-apps/groff
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
-	seccomp? ( sys-libs/libseccomp )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? (
-		>=app-text/po4a-0.45
-		sys-devel/gettext
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-mandb )
-"
-PDEPEND="manpager? ( app-text/manpager )"
-
-pkg_setup() {
-	# Create user now as Makefile in src_install does setuid/chown
-	enewgroup man 15
-	enewuser man 13 -1 /usr/share/man man
-
-	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
-		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
-	fi
-}
-
-src_configure() {
-	export ac_cv_lib_z_gzopen=$(usex zlib)
-	local myeconfargs=(
-		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--disable-setuid #662438
-		--enable-cache-owner=man
-		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
-		$(use_enable nls)
-		$(use_enable static-libs static)
-		$(use_with seccomp libseccomp)
-		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
-	)
-	econf "${myeconfargs[@]}"
-
-	# Disable color output from groff so that the manpager can add it. #184604
-	sed -i \
-		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
-		src/man_db.conf || die
-
-	cat > 15man-db <<-EOF || die
-	SANDBOX_PREDICT="/var/cache/man"
-	EOF
-}
-
-src_install() {
-	default
-	dodoc docs/{HACKING,TODO}
-	find "${ED}" -name "*.la" -delete || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
-
-	insinto /etc/sandbox.d
-	doins 15man-db
-}
-
-pkg_preinst() {
-	local cachedir="${EROOT}var/cache/man"
-	# If the system was already exploited, and the attacker is hiding in the
-	# cachedir of the old man-db, let's wipe them out.
-	# see bug  #602588 comment 18
-	local _replacing_version=
-	local _setgid_vuln=0
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
-			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
-		else
-			_setgid_vuln=1
-			debug-print "Applying cleanup for security bug #602588"
-		fi
-	done
-	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
-
-	# Fall back to recreating the cachedir
-	if [[ ! -d ${cachedir} ]] ; then
-		mkdir -p "${cachedir}" || die
-		chown man:man "${cachedir}" || die
-	fi
-
-	# Update the whatis cache
-	if [[ -f ${cachedir}/whatis ]] ; then
-		einfo "Cleaning ${cachedir} from sys-apps/man"
-		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
-	fi
-}
-
-pkg_postinst() {
-	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
-		einfo "Rebuilding man-db from scratch with new database format!"
-		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
-	fi
-}
diff --git a/sys-apps/man-db/man-db-2.8.7.ebuild b/sys-apps/man-db/man-db-2.8.7.ebuild
new file mode 100644
index 000000000000..4d2bfc884fe9
--- /dev/null
+++ b/sys-apps/man-db/man-db-2.8.7.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
+HOMEPAGE="http://www.nongnu.org/man-db/"
+if [[ "${PV}" = 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
+
+CDEPEND="
+	!sys-apps/man
+	>=dev-libs/libpipeline-1.5.0
+	sys-apps/groff
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
+	seccomp? ( sys-libs/libseccomp )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? (
+		>=app-text/po4a-0.45
+		sys-devel/gettext
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/man
+	acct-user/man
+	selinux? ( sec-policy/selinux-mandb )
+"
+PDEPEND="manpager? ( app-text/manpager )"
+
+pkg_setup() {
+	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
+		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
+	fi
+}
+
+src_configure() {
+	export ac_cv_lib_z_gzopen=$(usex zlib)
+	local myeconfargs=(
+		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--disable-setuid #662438
+		--enable-cache-owner=man
+		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_with seccomp libseccomp)
+		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
+	)
+	econf "${myeconfargs[@]}"
+
+	# Disable color output from groff so that the manpager can add it. #184604
+	sed -i \
+		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
+		src/man_db.conf || die
+
+	cat > 15man-db <<-EOF || die
+	SANDBOX_PREDICT="/var/cache/man"
+	EOF
+}
+
+src_install() {
+	default
+	dodoc docs/{HACKING,TODO}
+	find "${ED}" -name "*.la" -delete || die
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
+
+	insinto /etc/sandbox.d
+	doins 15man-db
+}
+
+pkg_preinst() {
+	local cachedir="${EROOT}/var/cache/man"
+	# If the system was already exploited, and the attacker is hiding in the
+	# cachedir of the old man-db, let's wipe them out.
+	# see bug  #602588 comment 18
+	local _replacing_version=
+	local _setgid_vuln=0
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
+			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
+		else
+			_setgid_vuln=1
+			debug-print "Applying cleanup for security bug #602588"
+		fi
+	done
+	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
+
+	# Fall back to recreating the cachedir
+	if [[ ! -d ${cachedir} ]] ; then
+		mkdir -p "${cachedir}" || die
+		chown man:man "${cachedir}" || die
+	fi
+
+	# Update the whatis cache
+	if [[ -f ${cachedir}/whatis ]] ; then
+		einfo "Cleaning ${cachedir} from sys-apps/man"
+		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
+	fi
+}
+
+pkg_postinst() {
+	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
+		einfo "Rebuilding man-db from scratch with new database format!"
+		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
+	fi
+}
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 5ca129610e6e..f3102b121359 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,10 +1,9 @@
 AUX mawk-1.3.4-sandbox-default.patch 2720 BLAKE2B 3f0a25b06f1045659b9dc7decbbd54c9355f94a6879cad0f121e825cb705652b14b7a4c4655f2fe89c2f921aea511f8b8755cd398d28ce9a47ffa6bfef158953 SHA512 bdceb22a51464de5786d469ffcc6fc7157a0aca3e3dc89553418a401de3735b95439691ccf5553d0746b3e793824821db85a2dfe14633db1ad5f1256fa3e65ab
 AUX mawk-1.3.4-sandbox.patch 3805 BLAKE2B a7d55816bea03fb949387c8a1acf310b6dbae60014601bc514f44cbf3a8632c275bf6b786b016e93450ecf60d61052b14b029e56d559656dc87fed72a66239af SHA512 03149ba3d3e0cd5fa6d50573cc50260346e91d82bfd510d8a069a3e076df49d2b85edd2b42632a34e21f9d82c384212272e99b1cf305b4c1a78e252b75da4eb3
-DIST mawk-1.3.4-20150503.tgz 468794 BLAKE2B 10a2942f990d67ebea3cf75c83beefbc58f6ad4ffc560260f8206a8fc79b03d1e4cb8bb4ad23b256a547b10e4885c1a0813f054aa60ab5cb1b20c8d974a508d8 SHA512 ac9dde6948328d8db94458448abdf7389f8862ae6093315dd19ed9d1cbeab60fca1fc7b084cda4ce09505010f7108612585e3c4ba9663ddf3adb869bf1d9d7b6
 DIST mawk-1.3.4-20161120.tgz 461464 BLAKE2B 7481345b391198cc9ec47f6ad84f0f07e31c931a40d59bde401d00ea7bc74b728c8149f80187e5d73923496e2eef1ec70bc097aedf0b68630f73264d45d96ebd SHA512 c5edcbff4ab1e40eb9b178a045fcd426a5f3c93a3ab5bc1ca1fa85a0977b8c9060967fcbda4e4a6e9e68628f50a2814e22939676008dced529377d2cf9bda5b2
 DIST mawk-1.3.4-20171017.tgz 460819 BLAKE2B 91cb4cd039ea7773b788db87389f8ec34914afc8b299fecfdd579fe89fc4e6d731bfdc9c06a2c6c3d75ab9e1022bf5dbe1c662962d6ccd8a8f6fe4f8589927ca SHA512 4ed6ca0ecca12e7409d3d364b72dc6a2b411c61bf53fe8aa0b0cac65a3bdb941921c0b81d94f34c8ac9f4922c8c7566d347b5e6b5c74518ae3a88904f9e20f27
-EBUILD mawk-1.3.4_p20150503.ebuild 825 BLAKE2B 1d5b1fb1ac43e06b019f86bdf8ca9fa2d4392e27fee2160e13b46c90ee567979d70442be3aea5d96f73497502238d919da684a6268d7918802f8d57aa7389db8 SHA512 7f7b0386ae02ee8bd6b2a3df4218f3dd732b22e9154b8bd37ed15afbeba2a145aa02161e64b8e2be78d4e6d9c2b58e3d4fa4c7d5b557f434c1cdf21e593bd749
+DIST mawk-1.3.4-20190203.tgz 466481 BLAKE2B f647c52872ff510f02ab44f13f6c51497abdecf3d6ab40faa2e419f726a15ebdb531607465bcaf2f53d032284251f9fd25e73734a72fc31c014a0a9f200613ed SHA512 64d5b1838d34d30e32966f46cb7457c865caccfe9fe1049d2645ba301b1ddb4efc18588115dbcf96234a2a0b791211a7f82264a3c81899459dc3029e65837646
 EBUILD mawk-1.3.4_p20161120.ebuild 873 BLAKE2B 90007cc447cf574c3077b37beb1d9fe5f68f0512779c8020312e5bab2d31d76501074ec20004bf05743c0ec4e1baa2f95ce0fee553a5a8d1482b39e4a99288d0 SHA512 c263fe5eaaab9709451d4e8ada4143c460303ca754cd96f0206671bd39c926ed227ce6f7814c549434d29a298fd3a2e6c3309c44f44ba09c0de2207eb1b45913
 EBUILD mawk-1.3.4_p20171017-r1.ebuild 1037 BLAKE2B 9c36e6b12d6a7b1c6448ed423509032464388849efc66312b24c8e7ba3efc11d94c3f425077f949514609bfcabb10da2d849a1977c919d068350c8137c942d14 SHA512 550d5d3f9123d402ecf442a94c8ccd87959eb8669a490e766e16d7b93acb5d3d23562527c5aac727cec44f1d068b339016dd901ac192662f06da3803f7ecd6a6
-EBUILD mawk-1.3.4_p20171017.ebuild 883 BLAKE2B deb941193402b058ecf23a7523698416660b09cfefcda6a51b2f2f50aaa72ba5b9230459826d82f9066b4bc8766c72f2a55583e21705f848df0ffa4d966509a5 SHA512 e072d0a8bb7125965bd3e0edea01eff17ef53b17baaf117fa7f5cd910acebd4cbc57f6725a6ae0419cf2eb177fcd3b8f4cdf5c5f0e7bb4d86fdbe86f7b75c9de
+EBUILD mawk-1.3.4_p20190203.ebuild 1038 BLAKE2B a409cea4028b5991e470a917010239ad8fb6db51a9099a3353807195b36d8953a61d0dbd1dfee68be09dbb88e7d46bb0e03d09bd5582c550a0cd4d45be497943 SHA512 d189ed6b296db0572ea1936ad8948b5627e41ec68736542a562292a5d7832a37aae33ed5492c0a122f897b02638061d9db45be40dacf1db8796a6b26aa57006d
 MISC metadata.xml 359 BLAKE2B 988733eff41a4556cdb4f8d66adbe2864f33f4245ab1ba3a1456cb3b189fd12138cec7666d2fc125d275865a028274aaf5a41396430721ac96b913dc2f667f94 SHA512 bb64e60075207240fabd037108c2885b934d0dc0a72bdcce4c8c138555b1ebb4de811745235ee11fde75559ddf55f9488b71f53aab7e92df61099cba5ec28d2f
diff --git a/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild b/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild
deleted file mode 100644
index 8a27fa6e4d1e..000000000000
--- a/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-MY_P=${P/_p/-}
-DESCRIPTION="an (often faster than gawk) awk-interpreter"
-HOMEPAGE="https://invisible-island.net/mawk/mawk.html"
-SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-RDEPEND="app-eselect/eselect-awk"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( ACKNOWLEDGMENT CHANGES README )
-
-src_prepare() {
-	tc-export BUILD_CC
-}
-
-src_install() {
-	default
-
-	exeinto /usr/share/doc/${PF}/examples
-	doexe examples/*
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-pkg_postinst() {
-	eselect awk update ifunset
-}
-
-pkg_postrm() {
-	eselect awk update ifunset
-}
diff --git a/sys-apps/mawk/mawk-1.3.4_p20171017.ebuild b/sys-apps/mawk/mawk-1.3.4_p20171017.ebuild
deleted file mode 100644
index d90cc49f5a39..000000000000
--- a/sys-apps/mawk/mawk-1.3.4_p20171017.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P=${P/_p/-}
-DESCRIPTION="an (often faster than gawk) awk-interpreter"
-HOMEPAGE="https://invisible-island.net/mawk/mawk.html"
-SRC_URI="ftp://ftp.invisible-island.net/mawk/${MY_P}.tgz"
-
-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 ~x86-macos"
-
-RDEPEND="app-eselect/eselect-awk"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( ACKNOWLEDGMENT CHANGES README )
-
-src_prepare() {
-	default
-	tc-export BUILD_CC
-}
-
-src_install() {
-	default
-
-	exeinto /usr/share/doc/${PF}/examples
-	doexe examples/*
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-pkg_postinst() {
-	eselect awk update ifunset
-}
-
-pkg_postrm() {
-	eselect awk update ifunset
-}
diff --git a/sys-apps/mawk/mawk-1.3.4_p20190203.ebuild b/sys-apps/mawk/mawk-1.3.4_p20190203.ebuild
new file mode 100644
index 000000000000..9b6695c63409
--- /dev/null
+++ b/sys-apps/mawk/mawk-1.3.4_p20190203.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${P/_p/-}"
+DESCRIPTION="an (often faster than gawk) awk-interpreter"
+HOMEPAGE="https://invisible-island.net/mawk/mawk.html"
+SRC_URI="ftp://ftp.invisible-island.net/mawk/${MY_P}.tgz"
+
+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 ~x86-macos"
+IUSE="forced-sandbox"
+
+RDEPEND="app-eselect/eselect-awk"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( ACKNOWLEDGMENT CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-sandbox.patch
+	"${FILESDIR}"/${PN}-1.3.4-sandbox-default.patch
+)
+
+src_configure() {
+	tc-export BUILD_CC
+	econf $(use_enable forced-sandbox)
+}
+
+src_install() {
+	default
+
+	exeinto /usr/share/doc/${PF}/examples
+	doexe examples/*
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	eselect awk update ifunset
+}
+
+pkg_postrm() {
+	eselect awk update ifunset
+}
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 1909bb639d73..0ab61362c4a5 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -13,8 +13,8 @@ AUX memtest86+-5.01-reboot-def.patch 326 BLAKE2B a17bcde8563a3f1a8e88c50e981b3d9
 AUX memtest86+-5.01-test-random-cflags.patch 679 BLAKE2B 62ccc56c3f127b3e3213d6bb9605094dd8ba2580d2047873583db8b7a3d48db225eb8b7013319903e92ba9c658569470fb6b3de4f4b7f6b3686efdd5f9c132eb SHA512 a000cf28d69396b0707519bb995f086457f8fa5283299164d969dbf02abea86b566016d71fac7e887c6089bc39c58be9e5c885cfb5f8e7eb815ea1741e097bb6
 DIST memtest86+-4.20.tar.gz 206044 BLAKE2B 69192572fd4d83a0f447683ea48336924b41d623a57a5b9b3ef87b8dc77dedc1472599fb220bd10f8b2ae7280118caa9f3b9676a183ce6617991fc9b2204bfc6 SHA512 2213a64cd3036f840dd816dd49b62b0f082e1fbfe64e02f52370f04e39857f042dc8bc0044c1a88ba678e72c1eb8629aa706fabfd3c052e41c29c073f4e8c441
 DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7
-EBUILD memtest86+-4.20-r1.ebuild 1950 BLAKE2B 7748912836525d02d7909675f7c8b362f253fc3567495d243b0a08e3570d382c300de6239c3052af5b60db1761157754555f6f98793a7c285aeadc7b2f274cee SHA512 5bff802747e652f95f2b8bd7c4d73efaf581c5008f1bb6c17aa492335939012b9ef661a2986447a0e6f9493c522ea9cbd93f4ca3e6164f7142543b8a05adf2c4
-EBUILD memtest86+-4.20-r3.ebuild 1756 BLAKE2B 1e9d161b3358030cfc89d3b1c439d9494ac2063af1db9c28432e60200b5825a675ea421f6c7161bc7a9f151efdcfb1483a669aa60a4bcdd97961e00b2f643111 SHA512 3cc41d0ccd74282b5ed2929359829f4377478605b06c868728e9446f3b1df8a5f38166d793f0c800428b17b724118e0eafdfb44791ef577c8bef87d614d422e2
-EBUILD memtest86+-5.01-r2.ebuild 2384 BLAKE2B 6a7205c3fa74bd10c7c290151a49c2e6cb4bb966bf193a34956c763eca1969d2930a9abae09f5558facb37ce74c5ae32ae20824f6e75809b8f2e9fde310d6963 SHA512 a2912927e8d490829a187959711c85438649a912e440af637f1a9d401a574dcaf368203337123f5c9168897e5bdca0658170c2b07861bc4b10b40e53693820f4
-EBUILD memtest86+-5.01-r4.ebuild 2801 BLAKE2B b601647fa4e8d410eee52de112acdab024875fd8417cc8146979fa7ed4ee5c61efbc390ad029e8ad3a2488c2b69476da6a9890f18912a5040b3b3640a38eed98 SHA512 e92c6b7e9144bffdedf141bb4483f93fa7c7b28e8e20eb17342cc165a778ecac991d5cdfad4f806cef9655b7354e81674d3bcfe0112061025fce1e6c7812cba1
+EBUILD memtest86+-4.20-r1.ebuild 1924 BLAKE2B 86699f1b9d2ad4677b48c0c912187de3de3a772ecbe07f6f7740410db1934a3088d899898088eee5e77b5c26acfa53d9d0e993affc76ba385a9aa009765daa26 SHA512 b44c8e88f926446dfa7d15a9dab6169ab4f74b74577920f1b6483a09e29b91354ad3c081f0ccc50b6fce6d40daf980ca2ce58330aa3feb49913186c97eda8a48
+EBUILD memtest86+-4.20-r3.ebuild 1730 BLAKE2B 896a560eea656f8ba385db8b9551275ce47cca80634cb5a427e45805f97ff036e139a2de2817dfc1e3e9e439b450eceeefec813fd9acad549f7b123c610797f2 SHA512 b9abcab6754b2625ecbcb2aabd404be98927406fdfdd0538566569f8814e67ca53424d96a875917ecde61aa5cb6ceb82bd6fd244ab30643646c15d8ac54c4303
+EBUILD memtest86+-5.01-r2.ebuild 2358 BLAKE2B 7588a1ceee5912cb93ccdc40935a3587d236b5dcb2aeb394ceee34db1c1a2e3f3d87a6a83e69f85f5cd33b11f3a3e3a1e7c730fbd57d10fd9d09fb388a5a4690 SHA512 59f8763cbbfbe21ab08c6c193a51d15d4202c89d68dbce80d93257d6ccd7fb90ce1a2295c2b88c38e7ba4d85a4aa3bc9b91d88eea2fff723003c6980c524395c
+EBUILD memtest86+-5.01-r4.ebuild 2775 BLAKE2B 6f09d52ff4c119a0b2eb64a122fe1fe594ff8c4422baee314d6d65f8eb8b87f59229f3e67cdec6d67b65bf21f05e5edb0fcdfebbd203356f4f37dab376ca7201 SHA512 f27e4bbdefe648a2b88d2db83acf8cc7c8dd7c23faeca535f6140bfa4316ed0aec89f7ad66294c76bf52bdbd544892bf4f901f945c3c14871c17ac1dfb4f231c
 MISC metadata.xml 563 BLAKE2B bd4e7ef2022ed705fc3902cd113f20b057b672dd50a9cf9362f56d4ccf1be9bab1fdb45d162cd646deb2acdab6829942da59f6dce0475a2d51c060662a33b9dd SHA512 26d725110c8b6214fce06feae590d1c437b64c9884ee5bc5421b4804b9391d7b928e11a270d84421ffbb5ea7a7b551dd26484565706499bdfbe871aef7ffb61b
diff --git a/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild
index b7a2c8ac38b3..ef79c442e7a1 100644
--- a/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild
+++ b/sys-apps/memtest86+/memtest86+-4.20-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=4
@@ -17,7 +17,7 @@ IUSE="floppy serial"
 BOOTDIR=/boot/memtest86plus
 QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
 
-RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
+RDEPEND="floppy? ( sys-fs/mtools )"
 DEPEND=""
 
 src_prepare() {
diff --git a/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild b/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild
index 6c1705fa9a2d..5ad27dd25b9b 100644
--- a/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild
+++ b/sys-apps/memtest86+/memtest86+-4.20-r3.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=4
@@ -17,7 +17,7 @@ IUSE="floppy serial"
 BOOTDIR=/boot/memtest86plus
 QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
 
-RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
+RDEPEND="floppy? ( sys-fs/mtools )"
 DEPEND=""
 
 src_prepare() {
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
index 70ce682ffff9..47ecffb46285 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-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=4
@@ -18,7 +18,7 @@ BOOTDIR=/boot/memtest86plus
 QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
 QA_FLAGS_IGNORED="${BOOTDIR}/memtest.netbsd"
 
-RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
+RDEPEND="floppy? ( sys-fs/mtools )"
 DEPEND="iso? ( app-cdr/cdrtools )"
 
 src_prepare() {
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
index ad766837ca18..08cf34af5417 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-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="6"
@@ -18,7 +18,7 @@ BOOTDIR="/boot/memtest86plus"
 QA_PRESTRIPPED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
 QA_FLAGS_IGNORED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
 
-RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
+RDEPEND="floppy? ( sys-fs/mtools )"
 DEPEND="iso? ( app-cdr/cdrtools )"
 
 pkg_pretend() {
diff --git a/sys-apps/mouseemu/Manifest b/sys-apps/mouseemu/Manifest
index 81bf6057eccd..35cec5e7b3f6 100644
--- a/sys-apps/mouseemu/Manifest
+++ b/sys-apps/mouseemu/Manifest
@@ -2,8 +2,8 @@ AUX mouseemu-0.12-fix.diff 1715 BLAKE2B 304d966a994d535b71b119ba4c0e01149e34c46b
 AUX mouseemu-0.13-fix.patch 707 BLAKE2B 6c0eaf3573d856899a43cd435d2c8f59434ab927f2e0c297d6db1da2bf16134344b59ffa2d9c0a61e245f02827a43a159346fef5f2a597e6de8706c2f41af830 SHA512 dfcd90a8e300d98e85ccb16455989a2a8e31f9b782887834e5ab3491391f0a681571f438e808860e095639e95fef4fbfc7f8d1c0edccd4b7b5d9bc915facfc87
 AUX mouseemu-0.15-build.patch 191 BLAKE2B 419963f29c2513906d0ef5f766fe2142e875684055a03726a9e4cb49f3ef39404e92cd7bcb8dd022fd355e22c8da09da1f081ddfab3effbe9beaa83d138c0acf SHA512 e0c55d7b77b18bfadd0b060d9fb6dd534e0fdf3cbcf5768262d8bdb8c26c0beb976c2c000bdf6cb9b26781dfb0e3dd5bb99cd005e34e49cfb0147ab4b19800e9
 AUX mouseemu-0.15-openrc.patch 228 BLAKE2B a05e7fdfb812f800b1c372fbf1d2f27d6eae5f476ae4fe39baee92208220d85e383c407e65f7d4d62aaa2385db2c5b5e9f49523844a6bfe9d15e00fef05ffadf SHA512 e26a9749c777852eb1a0feb5c15f6ed64635f40264e6065b4e9a7fb450db53357132e08b522724ae63735720d24fe92431f9a31d9b5ae2023783fc45f882269a
+DIST mouseemu-0.12.tar.gz 12019 BLAKE2B b4442cbfaf5c950a1ce690d7faabd1f92b7a2ab08fe5ddc86194c70039d92b5bbc54c33ee5d0a9896235c47fc12c52be1583740488637dc55cce078230c7df80 SHA512 192cb502d93ff6347082769444205597ef18f62b901033a9987f70c80b0f59fa0de2d79dc73ae2b04a90321842035549ff0d9c2f45284a2dc8324a944e85f514
 DIST mouseemu-0.15.tar.gz 13958 BLAKE2B 2e27a901309897a208875ab737843ffbe2f733a21daa9bcf0a6c45aea0403898edc4f1aaef7c3fc0243627e09101ec73672b937b4f5fdf3ff25a0b4c6520e30e SHA512 7a6cbb0526a9ca51632d589bf873adb182c02f4a666cf9e94cedba9499d6c6cc1ad2ac7e5a482d22949e64ad69f04f444cb0fa78ea728c5653989d150f62918b
-DIST mouseemu.tar.gz 12019 BLAKE2B b4442cbfaf5c950a1ce690d7faabd1f92b7a2ab08fe5ddc86194c70039d92b5bbc54c33ee5d0a9896235c47fc12c52be1583740488637dc55cce078230c7df80 SHA512 192cb502d93ff6347082769444205597ef18f62b901033a9987f70c80b0f59fa0de2d79dc73ae2b04a90321842035549ff0d9c2f45284a2dc8324a944e85f514
-EBUILD mouseemu-0.12.ebuild 925 BLAKE2B 942c893764794b952288d36b6da5d780144aab00be4d703b47098e82ff658976c3d75f038ca2f10437e4f9531be3c5f129855bdb3c96bc844e3962b69d1f3b08 SHA512 b528fe4cd4b3a0592e67c6da8bb83fd803b0f0f555e12cbf3f4543118c73b61e8417b607a20bddc54540b4fac7e1cbe3c04c74304a62f236fd9288220a2081d3
-EBUILD mouseemu-0.15.ebuild 1010 BLAKE2B f1706f1212557a294067fb80792bd01a7528c67e646943eadb895b2563290277f02202223f4affbb501f47d79d18cfd9361da18b2c3bd2f04ce1380f2d12e135 SHA512 dd4a627c303a281a43435829af6d6e60f61c04b4e53d76154c5b963f6cac0e8c42d44ba90130d7c397105ba50480d68d7887c1856f211d78b838f1c6bffe526e
+EBUILD mouseemu-0.12.ebuild 916 BLAKE2B 9c6ebcb83d9cb5fc3a8413d88465d69b727938787d9de647843f991ff71b3aecb408ea9166ef2b41cbeb84030d4b41cb9d8deccb3de0e278fc0b6dba4e17aae5 SHA512 f0755f1189d53c746dcc4183f77a2c0e90aed3b1b3e351282c1eebf0f91a9bcb618ce4c4f6e9b9621161ac2e0d65e05a140159334755a8bc8499bc84b5525b88
+EBUILD mouseemu-0.15.ebuild 986 BLAKE2B 6d0d2658c75f9c612e0e5400148991d3336c69564ad901c5271ed5208a598490e1dfa6dc6ab9c3cbe97cd10165a3b7b190e0dcd15bdac47584238640f71d75a2 SHA512 1df60bd92ca99c7d17844bfdbcc3c839d4496261112597fa369a5841ec41a81669b7d31fb540304d3f3c381fd6f1156beccdfadafc19c1b1386faaaad49406d8
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-apps/mouseemu/mouseemu-0.12.ebuild b/sys-apps/mouseemu/mouseemu-0.12.ebuild
index 2b972aee53f3..586e5d6ea283 100644
--- a/sys-apps/mouseemu/mouseemu-0.12.ebuild
+++ b/sys-apps/mouseemu/mouseemu-0.12.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Emulates scrollwheel, right- & left-click for one-button mice/touchpads"
 HOMEPAGE="http://geekounet.org/powerbook/"
-SRC_URI="http://geekounet.org/powerbook/files/${PN}.tar.gz"
+SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/mouseemu/mouseemu-0.15.ebuild b/sys-apps/mouseemu/mouseemu-0.15.ebuild
index 2770a2215251..2c2c50856f26 100644
--- a/sys-apps/mouseemu/mouseemu-0.15.ebuild
+++ b/sys-apps/mouseemu/mouseemu-0.15.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Emulates scrollwheel, right- & left-click for one-button mice/touchpads"
 HOMEPAGE="http://geekounet.org/powerbook/"
-SRC_URI="http://geekounet.org/powerbook/files/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 8dc350ccc0b8..99aec0026643 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,6 +1,6 @@
 DIST nvme-cli-1.5.tar.gz 282891 BLAKE2B 31eb9f4acda978977b7de222e1d973aac4ea18a34eaa0ffea73f2603cc2b8936aecd23248c764d05af161943db06533faf881711f2f22ad539b7e7607d5f8652 SHA512 0fc3dafeba8f67c8f3a3f25aac3b454d9e3ebfb1c20d67f96009a4490f269f0fe3642de781cd161896300f91a1cc37bd8a4e61c77f35422ab134c747702ffaca
 DIST nvme-cli-1.6.tar.gz 368461 BLAKE2B e40f4d76314860c966c3cb3de31e8d4a1bceab847b8950f0c99d47e00b8e8de077e91f6da9216ec10e939d37d34ab255b5cc3c641f3bbaf3ac8974f697051329 SHA512 05bcc539febd047f092a236ef2b2e9ad4e1df5d38bdc70416f80217425767f414e72294fda46868323cb7c77662d6000eaf16ebdaf74bdfad1baaed11b025d39
 EBUILD nvme-cli-1.5.ebuild 566 BLAKE2B e723786af2108253b54742b752ea755b84964e2155e68a3500c90a8900a2cf80de952c3a212c3e0809009518b274158aace3afa9c7f2bf16d2e2b31321581c2f SHA512 3fb2c2818a77fe647dc8216004bc817ebcdefff99e18abffc62883d98d0448972975651eae704b945324bd809aaa6215d9803145955a971a15ae19357ca647ee
-EBUILD nvme-cli-1.6-r1.ebuild 630 BLAKE2B bad511c35bf01ecb0630121c0ef4832830fd69baf454abc1f8245e6baa8f8ff68d1f55a25051c69ceee27e7621301b7e432910541314dfe8d261c1120953bff6 SHA512 ee65c1bb534cfda7719ca03d2b8d127c6d95552faf0bcd7febf8e73ba4b764396dc78102a91e1e26136666df0d02e8ac44b52762e3f57825c74a2643fe2a7e8e
+EBUILD nvme-cli-1.6-r1.ebuild 637 BLAKE2B a8b970784c99af27bcd317bd4b246d97593eb6e9db69a35d7e5e5c12d1baeefa9fcbfc94c3055150d45bbd408714d8f756d82f92496512870ccc45e51b7582f2 SHA512 3fe25b46e5fb9135b15847def70cc9c41860e0f0ad9682f434229b2eaef5672a5416a6743fe2e351f3ed9244b33536e1555da4eb7f1b653ee0fc974c3df2b859
 EBUILD nvme-cli-1.6.ebuild 563 BLAKE2B 4494d38c8091d084bffc00ee18e1752cfc78f37f8b78684c738849aaadc93e9edc4cf8c1a3b13879dcc5bd86c9ed5053a72c6e7da367606605eadd7ea5c734fc SHA512 25a4590cc15ef4aff600cd0c18ec52e9bc7f043723ad569d7b1957b808e0d995abc5838f28b5af27350c38098c198274797b9eb6a059412ce86142b0ea18b75b
 MISC metadata.xml 369 BLAKE2B 67a0c73fe0e2de97927a7c827bf4d216c7460c2ec4383c07e028c0b2d10e71a45559482bab635a6b9374fbec557ab83327baf041eb47bbc06c5e624bb29f6925 SHA512 d9439fc99f1bc5051b670e7d287185af8e7db4ba9045fd9a9aeb4c0f04a33716650d3a01f0ad8640e8b62db048a0f536fbd6145d5a7d79bb7aa524d63112db61
diff --git a/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild
index bd44399fd696..76ed63bdc6ae 100644
--- a/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ RESTRICT="test"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="+uuid"
 
 RDEPEND="uuid? ( sys-apps/util-linux:= )"
diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
new file mode 100644
index 000000000000..d38af50046d8
--- /dev/null
+++ b/sys-apps/opal-utils/Manifest
@@ -0,0 +1,5 @@
+AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f82460f84bbf2036f4f7f3da2f8d9c66807a275aa98778d824f8ba5d50d1e5349fd17adbee032816290 SHA512 387ec1d00afeaf7c44e4ee5c7e6a3959e1465b7a8a9a121bf470105c23df1f906f23cedbd1006bed250f50a3c3a77f9f40ea62bafa6d6397dda2152c9dedda06
+AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459
+DIST opal-utils-6.5.tar.gz 2080841 BLAKE2B cd8bda3b7f3bcbc620f922a6baa69f452a95c60a96eb9adf67d781dc5d1a75fc43cba7aa3ed82105de7a04041cfb61f43e909794702564819cda6f11afd23815 SHA512 f756307403ec49f24e5dbc06dbe8fe52898da27f2a0fa761164b1d85efd33dae8a8f96de3859eb7b11f85f43a790c9c213f9ebf0c7f4a859b590dcfb35e38571
+EBUILD opal-utils-6.5.ebuild 2172 BLAKE2B 08a34fecb2957b97edd28259f8d3a4749c184a5a1be06840621c73b902563f1e7c8b565973d4eb919747f392cfe8b84e860afa61d8afe4252c444545093b1892 SHA512 01f37623ff3b6d00c098017676bf9cfcee0cb898be9700682136d0c4352e5b60669aa4e1b64bd61033ed8bb07a8424114cc8e390d5f5426f9b98237de97fbc61
+MISC metadata.xml 975 BLAKE2B e3185490ec22ed5c776c9df2a627e698e6a3d35085694d397df52c965d3c23dd57f628289ea660a24f2623d5821fba838e504bf15a77d86e3a55b42bfc7ffd8b SHA512 0fe842a12d4c5f34b6042b91b5c63fc7354e17f8228841809305006f84613dd6d894d2780725f1046beb7fbec04a17e1e08d54db37ab027f275f3543c5bb5b56
diff --git a/sys-apps/opal-utils/files/opal-prd.confd b/sys-apps/opal-utils/files/opal-prd.confd
new file mode 100644
index 000000000000..a61415ef9345
--- /dev/null
+++ b/sys-apps/opal-utils/files/opal-prd.confd
@@ -0,0 +1,4 @@
+# /etc/conf.d/opal-prd: config file for /etc/init.d/opal-prd
+# see OPAL-PRD(8) 
+
+#OPAL_PRD_OPTS=""
diff --git a/sys-apps/opal-utils/files/opal-prd.initd b/sys-apps/opal-utils/files/opal-prd.initd
new file mode 100644
index 000000000000..935d39f6f94a
--- /dev/null
+++ b/sys-apps/opal-utils/files/opal-prd.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="OPAL PRD daemon"
+description="Processor RunTime Diagnostics daemon"
+command=/usr/sbin/opal-prd
+command_args="${OPAL_PRD_OPTS}"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+	need dev-mount sysfs
+	use logger
+	keyword -containers
+
+}
+
+required_dirs="/sys/firmware/devicetree/base/ibm,opal/diagnostics"
+required_files="/dev/opal-prd"
diff --git a/sys-apps/opal-utils/metadata.xml b/sys-apps/opal-utils/metadata.xml
new file mode 100644
index 000000000000..308277edf698
--- /dev/null
+++ b/sys-apps/opal-utils/metadata.xml
@@ -0,0 +1,22 @@
+<?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">
+		This package contains utility programs for OpenPower systems:
+		'opal-prd' provides a daemon to load and run the OpenPower firmware's Processor Recovery Diagnostics binary.
+			It's responsible for run time maintenance of OpenPower Systems hardware.
+		
+		'gard' utility can read, parse and clear hardware gard partitions on OpenPower platforms.
+		
+		'getscom' and 'putscom' utilities provide an interface to query or modify the registers of the different chipsets of an OpenPower system.
+		
+		'pflash' is a tool to access the flash modules on such systems and update the OpenPower firmware.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">open-power/skiboot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-apps/opal-utils/opal-utils-6.5.ebuild b/sys-apps/opal-utils/opal-utils-6.5.ebuild
new file mode 100644
index 000000000000..bbde6d6db522
--- /dev/null
+++ b/sys-apps/opal-utils/opal-utils-6.5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit linux-info python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="OPAL firmware utilities"
+HOMEPAGE="https://github.com/open-power/skiboot"
+SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~ppc64"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="doc? (
+	$(python_gen_any_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+	')
+)"
+
+CONFIG_CHECK="~MTD_POWERNV_FLASH ~OPAL_PRD ~PPC_DT_CPU_FTRS ~SCOM_DEBUGFS"
+ERROR_MTD_POWERND_FLASH="CONFIG_MTD_POWERND_FLASH is required to use pflash and opal-gard"
+ERROR_OPAL_PRD="CONFIG_OPAL_PRD is required to run opal-prd daemon"
+ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
+
+S="${WORKDIR}/skiboot-${PV}"
+
+python_check_deps() {
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die
+}
+
+src_configure() {
+	tc-export CC LD
+	export OPAL_PRD_VERSION="${PV}"
+	export GARD_VERSION="${PV}"
+	export PFLASH_VERSION="${PV}"
+	export XSCOM_VERSION="${PV}"
+}
+
+src_compile() {
+	emake V=1 -C external/opal-prd
+	emake V=1 -C external/gard
+	emake V=1 -C external/pflash
+	emake V=1 -C external/xscom-utils
+
+	use doc && emake V=1 -C doc html
+}
+
+src_install() {
+	emake -C external/opal-prd DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+	emake -C external/gard DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+	emake -C external/pflash DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+	emake -C external/xscom-utils DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+
+	newinitd "${FILESDIR}"/opal-prd.initd opal-prd
+	newconfd "${FILESDIR}"/opal-prd.confd opal-prd
+
+	systemd_dounit external/opal-prd/opal-prd.service
+
+	if use doc; then
+		rm -r doc/_build/html/_sources || die
+		local HTML_DOCS=( doc/_build/html/. )
+	fi
+	einstalldocs
+}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index c1d0067c716c..1c2a5cabcf0a 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,11 +1,8 @@
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
-DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
-DIST openrc-0.38.3.tar.gz 238031 BLAKE2B 87d1546e21d581feda4064cd64bf43f762203becdcc4b002bf868f17403bd42770cb1106a8bc383c8d69e19ad66ad2bedaa7090c95206597e8a9b6e2ba481dcc SHA512 6bb42ccdab5fb24b11f5042bf19850f440d3494b6bd1d7b8db31b592f051fcd26feac1c8d9ef515238c53c6f5bf98a8c367a48471c178ae829e05c56bd24cfde
 DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d25e90d0239325be05561e5802f22c47013fde82650f5ce08cf99f16f5f479d8617c254647b8c40cec9609d0b6b SHA512 ebfa691cae4704bb3023ea0508a712a45b8c20809828729dfa5292e96f3fd1b309813d80d7c286d0c09680bf5378aba40cfd994f27951f43a3ffb1fd0d69a58b
-EBUILD openrc-0.34.11.ebuild 10106 BLAKE2B e692651c5fdf62040819ad528cac336df93f2b93169f25dba8e1cc37b31fab50c10066053d108d77a826842b6a1f3bc721e0567b06e32f310a39e08bea786025 SHA512 f6121acf134baae65ff6a264e901cf01da92216c20ca4df95f7855f088be1081d31705768f36881377d90743d8994390b8d984cbbe251b83158d68272a95c964
-EBUILD openrc-0.38.3-r1.ebuild 9786 BLAKE2B fc8a25d65fa13aa21ec16ebbed7f3f08a8986f1af70b26064d474ab5aad0d2d9ee9d4dd7b1c06f4a1b267a9bdf8e914188dd10132869166d695e7cce5a5845fa SHA512 199e4adb759d4a4d55f8dbee24904894fd4970b3c54ebe0dd3b5dd1599c2acd1d61433b29c41000516e45582710481bab25ef6fed894e4e0950af0be713645b0
-EBUILD openrc-0.38.3.ebuild 9848 BLAKE2B a9a2f112c032d234e65c682208e229728c24b97c7ea2656655d4f66a9f9396cad6e6cb75bd48235a9f1affdaa62e9e165822126aaa75e507f8bf8db4b46dbdb6 SHA512 0aae8c02e67b473f5df71b056aef1af8b8b05f0bbe214a3cfe75605d9ae367e3bebcc50c31607360152f536d31c96422628abd413ccdf49721d99c8cb3225f59
-EBUILD openrc-0.41.2.ebuild 5810 BLAKE2B 9bc1fc576bc52172c9c1227b8470d79b847bbaa498a9b7e701c81cd7fdc3dab551ed681b907531495a253cde51a2d8a2b7dd8ca63f7d860f7e99d978e64de758 SHA512 10900d5a7daceeb77f54e2f90ef4cc0e8f5f82309c7d287c98414031ba9eac04076148f289b78e80cbcf118053aa0513f6b70925a4761563b85c4dd6955b0a22
-EBUILD openrc-9999.ebuild 5912 BLAKE2B 04f3dc950d050f94782549833e58f3703c39f0e09764dab6d55538dad2ca4c02c11e71038a7724cbb99134aac3222cb41ba697526f37f468375e8c930438dfe2 SHA512 432c8580e5335918e96b9ae352aac74c4a9234c3b98bd7a8a7f9859a5dcf1295202bcaefb27d3bdca576ebf64313901a32e243fbe0d57964d9a4b87004540a8e
+DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
+EBUILD openrc-0.41.2.ebuild 5808 BLAKE2B 18e7a7a5fba7c8aa73f31d7b8d3b4c375ce9fe41cdca0070de697fc741ac285e7d80baca5ce540f93b7180c2110c790cbbfeffc4ce41cf4f698b7218093a98a5 SHA512 a29a99a664e956b891bb05cc1e7d295de4185488809874a564cc2de4a189d4545f682782451a64a8dea7d1ea27288ebd9573f3af692b5c1769dd03f4a01ca1ff
+EBUILD openrc-0.42.1.ebuild 5923 BLAKE2B 5f14234d049902f60cab34b3d967cdf4115103cefac7e27d9a951aafafebb4e5d806c19669befa52a7bd09acdd4ff26624541104cb60ed6cff8ed1440e734c32 SHA512 a192c291a7faf02079671bc78c2c7edae228e2ff092de7f37906e1ead1f334847a71d1c8667117d66360e6e5eb4c2301414c1ca651303c15f2c304b24f7cb796
+EBUILD openrc-9999.ebuild 5923 BLAKE2B 5f14234d049902f60cab34b3d967cdf4115103cefac7e27d9a951aafafebb4e5d806c19669befa52a7bd09acdd4ff26624541104cb60ed6cff8ed1440e734c32 SHA512 a192c291a7faf02079671bc78c2c7edae228e2ff092de7f37906e1ead1f334847a71d1c8667117d66360e6e5eb4c2301414c1ca651303c15f2c304b24f7cb796
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/openrc-0.34.11.ebuild b/sys-apps/openrc/openrc-0.34.11.ebuild
deleted file mode 100644
index 9ae507eb58b0..000000000000
--- a/sys-apps/openrc/openrc-0.34.11.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs usr-ldscript
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-	unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-	)
-	audit? ( sys-process/audit )
-	kernel_linux? (
-		sys-process/psmisc
-		!<sys-process/procps-3.3.9-r2
-	)
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	!prefix? (
-		kernel_linux? (
-			>=sys-apps/sysvinit-2.86-r6[selinux?]
-			virtual/tmpfiles
-		)
-		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-	default
-
-	sed -i 's:0444:0644:' mk/sys.mk || die
-
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-}
-
-src_compile() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)"
-
-	local brand="Unknown"
-	if use kernel_linux ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-		brand="Linux"
-	elif use kernel_FreeBSD ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-		brand="FreeBSD"
-	fi
-	export BRANDING="Gentoo ${brand}"
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-	# move the shared libs back to /usr so ldscript can install
-	# more of a minimal set of files
-	# disabled for now due to #270646
-	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-	#gen_usr_ldscript -a einfo rc
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
-	if ! use kernel_linux; then
-		keepdir /$(get_libdir)/rc/init.d
-	fi
-	keepdir /$(get_libdir)/rc/tmp
-
-	# Backup our default runlevels
-	dodir /usr/share/"${PN}"
-	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-	rm -rf "${ED}"/etc/runlevels
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	# install gentoo pam.d files
-	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-	# install documentation
-	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
-}
-
-add_boot_init() {
-	local initd=$1
-	local runlevel=${2:-boot}
-	# if the initscript is not going to be installed and is not
-	# currently installed, return
-	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-		|| return
-	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-	# if runlevels dont exist just yet, then create it but still flag
-	# to pkg_postinst that it needs real setup #277323
-	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-		touch "${EROOT}"etc/runlevels/.add_boot_init.created
-	fi
-
-	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-	local config=$1 initd=$2
-	if [[ -e ${EROOT}${config} ]] ; then
-		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-			add_boot_init ${initd}
-		fi
-	fi
-}
-
-pkg_preinst() {
-	local f LIBDIR=$(get_libdir)
-
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-	# termencoding was added in 0.2.1 and needed in boot
-	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
-	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-	if ! has_version ">=sys-apps/openrc-0.11"; then
-		add_boot_init sysfs sysinit
-	fi
-
-	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-		migrate_udev_mount_script
-	fi
-
-	# these were added in 0.12.
-	if ! has_version ">=sys-apps/openrc-0.12"; then
-		add_boot_init loopback
-
-		# ensure existing /etc/conf.d/net is not removed
-		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-		# this needs to stay in openrc ebuilds for a long time. :(
-		# Added in 0.12.
-		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-			einfo "Modifying conf.d/net to keep it from being removed"
-			cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-		fi
-	fi
-	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-	if ! has_version ">=sys-apps/openrc-0.18.3"; then
-		add_boot_init mtab
-		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-			ewarn "${EROOT}etc/mtab will be replaced with a"
-			ewarn "symbolic link to /proc/self/mounts on the next"
-			ewarn "reboot."
-			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-			ewarn "if you do not want this to happen."
-		fi
-	fi
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-		add_boot_init udev-mount sysinit
-	fi
-	return 0
-}
-
-pkg_postinst() {
-	local LIBDIR=$(get_libdir)
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-		einfo "Copying across default runlevels"
-		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-	else
-		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/sysinit
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-				"${EROOT}"etc/runlevels/sysinit
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/shutdown
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-				"${EROOT}"etc/runlevels/shutdown
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-				"${EROOT}"etc/runlevels
-		fi
-	fi
-
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	# Handle the conf.d/local.{start,stop} -> local.d transition
-	if [[ -f ${EROOT}etc/conf.d/local.start || -f ${EROOT}etc/conf.d/local.stop ]] ; then
-		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
-		elog "files to ${EROOT}etc/local.d"
-		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
-		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
-		chmod +x "${EROOT}"etc/local.d/*{start,stop}
-	fi
-
-	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
-		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
-			ewarn "The dependency data could not be migrated to /run/openrc."
-			ewarn "This means you need to reboot your system."
-		fi
-	fi
-
-	# update the dependency tree after touching all files #224171
-	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/openrc/openrc-0.38.3-r1.ebuild b/sys-apps/openrc/openrc-0.38.3-r1.ebuild
deleted file mode 100644
index e9d7ad4ad0c1..000000000000
--- a/sys-apps/openrc/openrc-0.38.3-r1.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs usr-ldscript
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-	unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-	)
-	audit? ( sys-process/audit )
-	kernel_linux? (
-		sys-process/psmisc
-		!<sys-process/procps-3.3.9-r2
-	)
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	!prefix? (
-		kernel_linux? (
-			>=sys-apps/sysvinit-2.86-r6[selinux?]
-			virtual/tmpfiles
-		)
-		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-	!<app-shells/gentoo-bashcomp-20180302
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-}
-
-src_compile() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/lib/rc
-		MKBASHCOMP=yes
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)
-		MKZSHCOMP=yes"
-
-	local brand="Unknown"
-	if use kernel_linux ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-		brand="Linux"
-	elif use kernel_FreeBSD ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-		brand="FreeBSD"
-	fi
-	export BRANDING="Gentoo ${brand}"
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-	# move the shared libs back to /usr so ldscript can install
-	# more of a minimal set of files
-	# disabled for now due to #270646
-	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-	#gen_usr_ldscript -a einfo rc
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
-	if ! use kernel_linux; then
-		keepdir /lib/rc/init.d
-	fi
-	keepdir /lib/rc/tmp
-
-	# Backup our default runlevels
-	dodir /usr/share/"${PN}"
-	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-	rm -rf "${ED}"/etc/runlevels
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	# install gentoo pam.d files
-	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-	# install documentation
-	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
-}
-
-add_boot_init() {
-	local initd=$1
-	local runlevel=${2:-boot}
-	# if the initscript is not going to be installed and is not
-	# currently installed, return
-	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-		|| return
-	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-	# if runlevels dont exist just yet, then create it but still flag
-	# to pkg_postinst that it needs real setup #277323
-	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-		touch "${EROOT}"etc/runlevels/.add_boot_init.created
-	fi
-
-	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-	local config=$1 initd=$2
-	if [[ -e ${EROOT}${config} ]] ; then
-		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-			add_boot_init ${initd}
-		fi
-	fi
-}
-
-pkg_preinst() {
-	local f LIBDIR=$(get_libdir)
-
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-	# termencoding was added in 0.2.1 and needed in boot
-	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
-	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-	if ! has_version ">=sys-apps/openrc-0.11"; then
-		add_boot_init sysfs sysinit
-	fi
-
-	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-		migrate_udev_mount_script
-	fi
-
-	# these were added in 0.12.
-	if ! has_version ">=sys-apps/openrc-0.12"; then
-		add_boot_init loopback
-
-		# ensure existing /etc/conf.d/net is not removed
-		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-		# this needs to stay in openrc ebuilds for a long time. :(
-		# Added in 0.12.
-		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-			einfo "Modifying conf.d/net to keep it from being removed"
-			cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-		fi
-	fi
-	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-	if ! has_version ">=sys-apps/openrc-0.18.3"; then
-		add_boot_init mtab
-		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-			ewarn "${EROOT}etc/mtab will be replaced with a"
-			ewarn "symbolic link to /proc/self/mounts on the next"
-			ewarn "reboot."
-			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-			ewarn "if you do not want this to happen."
-		fi
-	fi
-
-	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
-
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-		add_boot_init udev-mount sysinit
-	fi
-	return 0
-}
-
-pkg_postinst() {
-	local LIBDIR=$(get_libdir)
-
-	# Make our runlevels if they don't exist
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		einfo "Copying across default runlevels"
-		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-	else
-		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/sysinit
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-				"${EROOT}"etc/runlevels/sysinit
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/shutdown
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-				"${EROOT}"etc/runlevels/shutdown
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-				"${EROOT}"etc/runlevels
-		fi
-	fi
-
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	# Added for 0.35.
-	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	elif ! use kernel_linux; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	fi
-
-	# update the dependency tree after touching all files #224171
-	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/openrc/openrc-0.38.3.ebuild b/sys-apps/openrc/openrc-0.38.3.ebuild
deleted file mode 100644
index f11de7bde25d..000000000000
--- a/sys-apps/openrc/openrc-0.38.3.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs usr-ldscript
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-	unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-	)
-	audit? ( sys-process/audit )
-	kernel_linux? (
-		sys-process/psmisc
-		!<sys-process/procps-3.3.9-r2
-	)
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	!prefix? (
-		kernel_linux? (
-			>=sys-apps/sysvinit-2.86-r6[selinux?]
-			virtual/tmpfiles
-		)
-		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-	!<app-shells/gentoo-bashcomp-20180302
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-}
-
-src_compile() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/lib/rc
-		MKBASHCOMP=yes
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)
-		MKZSHCOMP=yes"
-
-	local brand="Unknown"
-	if use kernel_linux ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-		brand="Linux"
-	elif use kernel_FreeBSD ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-		brand="FreeBSD"
-	fi
-	export BRANDING="Gentoo ${brand}"
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-	# move the shared libs back to /usr so ldscript can install
-	# more of a minimal set of files
-	# disabled for now due to #270646
-	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-	#gen_usr_ldscript -a einfo rc
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
-	if ! use kernel_linux; then
-		keepdir /lib/rc/init.d
-	fi
-	keepdir /lib/rc/tmp
-
-	# Backup our default runlevels
-	dodir /usr/share/"${PN}"
-	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-	rm -rf "${ED}"/etc/runlevels
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	# install gentoo pam.d files
-	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-	# install documentation
-	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
-}
-
-add_boot_init() {
-	local initd=$1
-	local runlevel=${2:-boot}
-	# if the initscript is not going to be installed and is not
-	# currently installed, return
-	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-		|| return
-	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-	# if runlevels dont exist just yet, then create it but still flag
-	# to pkg_postinst that it needs real setup #277323
-	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-		touch "${EROOT}"etc/runlevels/.add_boot_init.created
-	fi
-
-	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-	local config=$1 initd=$2
-	if [[ -e ${EROOT}${config} ]] ; then
-		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-			add_boot_init ${initd}
-		fi
-	fi
-}
-
-pkg_preinst() {
-	local f LIBDIR=$(get_libdir)
-
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-	# termencoding was added in 0.2.1 and needed in boot
-	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
-	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-	if ! has_version ">=sys-apps/openrc-0.11"; then
-		add_boot_init sysfs sysinit
-	fi
-
-	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-		migrate_udev_mount_script
-	fi
-
-	# these were added in 0.12.
-	if ! has_version ">=sys-apps/openrc-0.12"; then
-		add_boot_init loopback
-
-		# ensure existing /etc/conf.d/net is not removed
-		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-		# this needs to stay in openrc ebuilds for a long time. :(
-		# Added in 0.12.
-		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-			einfo "Modifying conf.d/net to keep it from being removed"
-			cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-		fi
-	fi
-	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-	if ! has_version ">=sys-apps/openrc-0.18.3"; then
-		add_boot_init mtab
-		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-			ewarn "${EROOT}etc/mtab will be replaced with a"
-			ewarn "symbolic link to /proc/self/mounts on the next"
-			ewarn "reboot."
-			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-			ewarn "if you do not want this to happen."
-		fi
-	fi
-
-	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
-
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-		add_boot_init udev-mount sysinit
-	fi
-	return 0
-}
-
-pkg_postinst() {
-	local LIBDIR=$(get_libdir)
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-		einfo "Copying across default runlevels"
-		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-	else
-		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/sysinit
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-				"${EROOT}"etc/runlevels/sysinit
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/shutdown
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-				"${EROOT}"etc/runlevels/shutdown
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-				"${EROOT}"etc/runlevels
-		fi
-	fi
-
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	# Added for 0.35.
-	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	elif ! use kernel_linux; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	fi
-
-	# update the dependency tree after touching all files #224171
-	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/openrc/openrc-0.41.2.ebuild b/sys-apps/openrc/openrc-0.41.2.ebuild
index efd8b930cfff..602cb5c3c494 100644
--- a/sys-apps/openrc/openrc-0.41.2.ebuild
+++ b/sys-apps/openrc/openrc-0.41.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/openrc/openrc-0.42.1.ebuild b/sys-apps/openrc/openrc-0.42.1.ebuild
new file mode 100644
index 000000000000..dea79c65bd1c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.42.1.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic pam toolchain-funcs usr-ldscript
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux static-libs
+	sysv-utils unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	bash? ( app-shells/bash )
+	!prefix? (
+		kernel_linux? (
+		sysv-utils? ( !sys-apps/sysvinit )
+		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKSYSVINIT=$(usex sysv-utils)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)
+		MKZSHCOMP=yes
+		SH=$(usex bash /bin/bash /bin/sh)"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /lib/rc/init.d
+	fi
+	keepdir /lib/rc/tmp
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/etc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+pkg_preinst() {
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+	return 0
+}
+
+pkg_postinst() {
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
+		fi
+	elif ! use kernel_linux; then
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
+		fi
+	fi
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 6bf7ded639ba..dea79c65bd1c 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
@@ -182,12 +182,12 @@ pkg_postinst() {
 
 	# Added for 0.35.
 	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"/lib
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
 		fi
 	elif ! use kernel_linux; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"/lib
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
 		fi
 	fi
 
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 9b07dfbdd02e..26035b45e496 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,4 +1,6 @@
+DIST pkgcore-0.10.2.tar.gz 644452 BLAKE2B e89045c76e12cea3d4750e5a03a3c8a7fde16a497c8ccba4618f97235382a2708d0a83bc1d1f1fb6ef2ba3cbfd0c04dff00e8b29af2cc3571dd30c9ef7f2a608 SHA512 4242f08084234288eeecede1122fead03781c74764668683493873962cfc5972efefb553c1587c72b29939084d033cafa815e36787165f8d2124309989efcde6
 DIST pkgcore-0.9.7.tar.gz 592202 BLAKE2B fa16380e89ad2fb2a05d8f08387c3cfa2203b4e6faad3fc4758d572eb08d6c64f781eef8c2d56151f1facec3a202325d4c4a271a1a3ced88df7371f2af75dbf3 SHA512 cb996fd35a8e4e73acfacf1942d498932ec092a282397bd41df72eea26b6d08c15e01b96ece8ebb6876e84281d85d4f8ef81e1f2ef107adff1b984ee592d6a6f
+EBUILD pkgcore-0.10.2.ebuild 1418 BLAKE2B 0859ca2a08cb9005a6e5b878fb27304d68fd5917d87777e545eefb9fb6d81a6c8a560e5871358a280b57e992efabf42d9a9dd410e304aff5fd69208d10854835 SHA512 ff28372817c98d556a038de4bd7e22cf7ed06103dacfc1a1855af3b243e8ff76251853e9ac4c502ac6f616646a019501a39f9dfe778f33767ddb6e5327e11dad
 EBUILD pkgcore-0.9.7.ebuild 1490 BLAKE2B 867dacbb663e06ddfc7595da418bf5b71a5481972317496a9c93ca00ebee64233abec8790304c1b10097ba6b2444fc01f1713803b09940608cd1b4535ccfeac5 SHA512 362e413b8ea9d0bcefdfeeb66272ce9e922a2461ac158977634c33a9b9fb672b6ac6741223feb43c82ba393dc8b8274a7825781c4f3a8790b6f1da7dd75731e7
-EBUILD pkgcore-9999.ebuild 1444 BLAKE2B e0c21c8d621b1e744b4fd75628fd5d5ceaf2d640850eaff8829e6cb71487964dd2f2c63e2df53b091b52e7add8cd54973c619a3300eb34fccbdc1663147fd389 SHA512 0dcc2275d0049f6e00a7dacd8ef1a4ec70ecfaff6e7081e6054d040026fe26e14a2b47a0d65ed29ddac6b7ba4e412e48f33e9ef053c45591397234113ff60d0a
+EBUILD pkgcore-9999.ebuild 1418 BLAKE2B 0859ca2a08cb9005a6e5b878fb27304d68fd5917d87777e545eefb9fb6d81a6c8a560e5871358a280b57e992efabf42d9a9dd410e304aff5fd69208d10854835 SHA512 ff28372817c98d556a038de4bd7e22cf7ed06103dacfc1a1855af3b243e8ff76251853e9ac4c502ac6f616646a019501a39f9dfe778f33767ddb6e5327e11dad
 MISC metadata.xml 409 BLAKE2B 42709aa3a13109a21d1cfa0db9ef758216a2e902d68a10f0db14b4019464a702ef0c91079d0856f9389a2221886bbd3d5d5480ca99efc708543d198d00b7ed3e SHA512 ec04202f105a62a697511c7a89dad118b3618fdce4044c25648492e1557a95b9e29c01a08fca21e106273485471af98c52a6db6b2a40605a67a632938faebd29
diff --git a/sys-apps/pkgcore/pkgcore-0.10.2.ebuild b/sys-apps/pkgcore/pkgcore-0.10.2.ebuild
new file mode 100644
index 000000000000..9c3d2f6fb067
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.10.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]"
+fi
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	local esetup_args=( $(usex doc "--enable-html-docs" "") )
+	# only build man pages for live ebuilds if doc USE flag is enabled
+	[[ ${PV} == *9999 ]] && esetup_args+=( $(usex doc "--enable-man-pages" "") )
+	esetup.py build "${esetup_args[@]}"
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	esetup.py install_docs \
+		--docdir="${ED%/}/usr/share/doc/${PF}" \
+		--mandir="${ED%/}/usr/share/man"
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 308d58adcb67..9c3d2f6fb067 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -17,19 +17,19 @@ fi
 DESCRIPTION="a framework for package management"
 HOMEPAGE="https://github.com/pkgcore/pkgcore"
 
-LICENSE="|| ( BSD GPL-2 )"
+LICENSE="BSD"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]"
 fi
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c0569e71e7e8..64ecb47a76a0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,10 +2,10 @@ AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a7
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B dc378b714101b287fa33defeb778e586da83275cdc2d0bc7a98e9f2ea568568313d6a2767f693f3111fc41f0c6f07451315021186a1719bd52520da327c103d6 SHA512 f8642237e0127d9838c6e91430a19b8886295f8ce6b18cf915d6eb63204c7a8c65783f1554eec90b7ce7d0b613ef4206643eec8751b0594de1dcb4ede4491779
 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
-DIST portage-2.3.71.tar.bz2 1028966 BLAKE2B 26c1e8835cde39479d1cf510b1fbc14f7edf9b785dc26f6c439cf982a2ccdd6b8a9108bb7edc5358d8fe641ba32fba1b62abb6f39060cb568984e6c271524b42 SHA512 55f5f4f5ccfb2964ad7a3f99cb17cb2a5125392e4f37d5986fc8afcf90924f92ba5c2a278f84b4ef03c5a3f98f75c14646861086c0fd8491526608897b6d30ce
+DIST portage-2.3.75.tar.bz2 1032575 BLAKE2B c4f3e9a7e7056af19da6a56599fb79a26331d6ab88981f966b77e2d17ee5dac1a585f54b1185f64855c9c2af544684b759143f657a529878a4e6eb9df4757340 SHA512 06dabc9bff2992b197575ceab5b4f117aca01a10d2556bb006bb28bd4c1d99edfbff753e83aba706782da1e365b923e081ce2037053fed31e18baa5fab6da4a2
 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c SHA512 0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12
 EBUILD portage-2.3.66-r1.ebuild 8243 BLAKE2B 2fb6301048727460fb3defc8ccde74b05807a0492ee7429924301e94f36d5b8d75336c721e82e41737f3ce257e24506a4894633639a96e28233d6244d17f1fd6 SHA512 58174afb4c008e0aa18616ea0d06297577f01344398fe7fbcb2ee0d80570258eba9010134dbd4ef3218d0f31652c1de09ad3c6b7fa43282116ee97a2f7d7c6b8
 EBUILD portage-2.3.69.ebuild 8100 BLAKE2B 7f50fad1739d128b7437044bacb43338ee9638aeb79fad691824f0d4749a3432f7d62a1ba3ffbcd00f13eaa33e0089268d3c4d78628752861598a483ab3876b5 SHA512 8bc0ddfc45c8f2d63911be82d5cd38efd7a06697a08688624f86a7963c264d4f1cb9b1e7e8d0a45a321041556ecaad0ed4cfa2fefa13f24a867226c810016061
-EBUILD portage-2.3.71.ebuild 8113 BLAKE2B aa8ce1512efa34d10fbbdc6fd1ce45ac9d59a415b48975c22651bee0b0a0a8da9c2738e246395a15d51d96ed3dee33329bc8d7efce8ab0c88d5bb6b4e1054339 SHA512 73b5dcdf9eb4e2da5c522f7a6e36f3ce263178c5cc5089bb6635722a9b8027c1bb6de8de77275282f8c71baedbf589ea588a6fccd83d01ce17a453b378712ebe
+EBUILD portage-2.3.75.ebuild 8117 BLAKE2B a4d7360426ea26118e2f845d65a23de19c1e766f098094389a2ba7132d7d3b7c2eae03928fbfb837e578bd523ac74708d2d4c8591a930b9dc3e6f52c55c7a3b8 SHA512 ccc722d645070edce7a371b295888959241350161afd4be2c844115c8966afcc3274d1ae3034ba946020ce08ccbcf606469e78e34181c2a37a21c287ea5c2111
 EBUILD portage-9999.ebuild 7909 BLAKE2B 1116fee5fe17096e2a5b33cce164c6dd8e1f7a8cb04716e0218d001df4a09e957541b8267f0bf92e2b7f80a868aa0aeb081a4f83d8fa9529e619e682b8f4b480 SHA512 8b0b42bf555c092fc43aedc3c38f9eb78f7ea77b315dda867aacaddae4f7eba05434accfad2aa91e4d1a31d9ebeb9453483d3a5d6e5cdb785bb4c30ef6aaaa79
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.71.ebuild b/sys-apps/portage/portage-2.3.71.ebuild
deleted file mode 100644
index 969ce20d8767..000000000000
--- a/sys-apps/portage/portage-2.3.71.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_5 python3_6 python3_7
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 linux-info systemd prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f ! -name etc-update -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	python_export PYTHON_SITEDIR
-	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/portage/portage-2.3.75.ebuild b/sys-apps/portage/portage-2.3.75.ebuild
new file mode 100644
index 000000000000..b45fedf35292
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.75.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_5 python3_6 python3_7
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<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} 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|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f ! -name etc-update -print0)
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	python_setup
+	python_export PYTHON_SITEDIR
+	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 81324f545fd5..34d9d638aa83 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -5,19 +5,15 @@ AUX 242-networkd-ipv6-token.patch 6525 BLAKE2B 4bbf64154f96419df91caf03f827f37bf
 AUX 242-rdrand-ryzen.patch 16177 BLAKE2B 7d1d3709098a233ba58727788b77c30025c0497fff9abb1df007e21160da3f93a7e9d14b0eeb7e6855bbe5fa93abfeda118156cbba355fc2976c83debcbb91d4 SHA512 38d00535a118b060accb8ed4e87681bab5e547270ef7e0abcdcf4766367e22761ffc35d0db7c829e86e0ad45f13cf4c761e71cfdfc70c2675056ef217c85618d
 AUX 242-socket-util-flush-accept.patch 2123 BLAKE2B 74bfbe440ae548b96d90b41ac45c440b21a63c61ae75a9d2b725d2bdec74a03aeca7b673a656821eb925e6740d6728a41d0dc30275287a92519b47d9c477c487 SHA512 7dd0daa70de4ee264d0b3dfe6f80b5e0c563e5bb5255ca2a92f26c4a993fca178f275f85c9048305b82b258d41c9bcbb28d74f9e2b6c2a0e77748464890cb907
 AUX 242-wireguard-listenport.patch 1598 BLAKE2B 3266fe600db530ebb5b8eb726822daf14ee87292b035c09a1eb9a46638cc2dc3b8a3f11dd74684a79f3e521d3999b6b8c3a641f8f7475a5d45706567e00d26f6 SHA512 69e047000eb5ed36850bcbc6b8ef37a646b60a642a07a68547624e81aa6e49c77b848745ca4daad883151ddcaee9e7957ea6430f5a0c0c67ffc7887778f536e9
-AUX 243-rc1-analyze.patch 5053 BLAKE2B 5c2a5b320193406c7850762f51c007f94ba3ecba088539ac53f66a8e8af9c8c69b2e778b9d83776878505dc53a011321489b0259516e51ef27be576401d19a11 SHA512 49ce62b19e58b512997ad4c4d70f5f29c089890c502899a1bb930d9b69df00d7bed1d4e7e4a901cb1404df64add99037c04d962c95a05b0ac3b4e70a7023be7d
-AUX 243-rc1-cryptsetup.patch 5712 BLAKE2B 614572e920f3fb914fa8b4d6317626613dd4fd3fc21630664bc008a874b2522d2cc7957c63e5989b7883eb22f225f82572dd15d5f4d1dff0884c1c2b6afb5e90 SHA512 e99c74bfa1857cd7f83b91b10ed6b93b83acad59ae333f4cf94f2b0d4fd3b8909fbdb4f488499456da45b4167bb32cd354caf473020f6edfcfaab23623a5391d
-AUX 243-rc1-revert-logind-remove-unused-check.patch 1148 BLAKE2B 83b908c06bb452943e6f65e7c3acb7759eccada7eb0323eb20f60150f8d95c9186c0f3d6175cfc60ac4ef897b86b12ecd1fa094deec77cd2da7ab9da159987a4 SHA512 17f48b76508069093b4fc5b4678997e2c1f286bae0d10c4ffafd09b082e65d7fd7e6cc65a103628b930166aee8de201c2cac0a77afcef4e63adb7a2f670fdd91
-AUX 243-rc1-udev-properties.patch 1961 BLAKE2B 8f75ddf715de2c0ff8479dfdc276eb29c642658699a567b2cbdf1f91d230a8953d4b257e592fa07629e5fae952d8b3ea89d3d8e3ee51f13d9fd58bd52d02cfec SHA512 ea9bfca902cbb4fc90796026e66f11a564ac9b646aaed1221a33d8a531da109775d9e19cf0fb2115ef69d7e12ea1511c423d7992f08e2faec4c22e0b41c77eec
-AUX CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch 1848 BLAKE2B 348c35881ce039f92d8fc8dc8c87af2efa95696afbe79ad8fc4e01129524bdf28b529ab86ec611d08446e589176c0678018d94d8c5fc068c65ab4eb429746cf9 SHA512 693afe328ebc20d34cbf07c632a8da90ee293147e793a599a4d2aac6f757738bfab93048a2f8ed6e68d16f865e9b4112e737c692ad01c7d4946f8c430714161d
-AUX CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch 6660 BLAKE2B 45acb2595245a5cbd10c2a9c7ffa2db0c4bd5b03ef8dc25eb51fc35dd51a49b3acd18bf4cf8db7f639e7a4e61592f3ce0bcb031bf27b0bf3ae6fc96c74445f77 SHA512 7c082ab4effc36543bab08700b84a3ccddfba5d5e87b324d6b935d75f5debb7a5f7be1c2e21208e8d1715f5d40619c8f775629acdde40d3c7b2f406b5c6d9460
+AUX CVE-2019-15718.patch 1232 BLAKE2B e5be62414a1f9c19c8834e093d166a025fbd5215223845df365c70afb35487bd393bcd5463a046107e384a43976dcbb57e9e0a4013355558982abe8b6baf35de SHA512 45017c2c6ff5b16206e4c2e78c82c231372fd13c965a64908d70c0019a0894f1599a4412df3efc1ad6b799df018c05560fbbc8a24ffb86f793a149d9aec2080f
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68fca1a49f5f5eb5a1576329d30c93d2fe7c121920099d74962eacf7ed1d3747250f103a57e4be246320a99871521a3b6a SHA512 1b0d1c2f96cb4aa95adfa5940efaeb2bd940110720399358317906d21d08b0caf625474980e101bba001afd626f8ad64367b09b40bec0b2d46b977021c4adfc5
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
-DIST systemd-243-rc1.tar.gz 8209533 BLAKE2B 6f28d839563104b488bfe030483bf1b24c3d01cedb59ffa655f03a37d7c636c2daef34ca9d13b9fbe848b131d21920138583c63a049c1747f7e569c68384c0bf SHA512 6626d7fd5781578d01a30c0d2647a293668d0819f2f85ce78a6aaf62ae1aa4b2c687cf237ca833c5befbc00321a344ff5ca56747cedc6ce00cd0f51c71dd25ff
+DIST systemd-243-rc2.tar.gz 8239802 BLAKE2B 9ab6a12f6dff855265be381616601fb2caf79be810bba7f5c24fa6e91ae34d8d1ead0ae1b45c374e8c9752b883daba01863e5622ef1d34718e8390c0ad837cf0 SHA512 7e9b996c1eeb299fb971f2fd4a39fa62c7cc9178bacaaae6c168008dec438f392b949deb72d08f27060b3cde54b46b70f6a18b1bc70725a56ca2a28a1f96b6a1
 EBUILD systemd-242-r6.ebuild 14156 BLAKE2B e3f993817df49534a0fa0960f7232ee6168330511bbba2deef09d58e0e3d1e6efa727bc5909151683b77604e51d872daf4d05346e5ef6e1daa3270e9b331d3ee SHA512 9a4e424d9cf0dffe5928d9238c6173d7376db0a7f4b9e547f49d939759c47d74e51ed00584ec0410c33474bae33f47b4f2053b204fe2c5236d2c3a0c10e0855a
-EBUILD systemd-243_rc1-r2.ebuild 13916 BLAKE2B 4a9a326ba07267db738329ef758dbdde4a024807b630429f50117ac33186684798590b5105daeb18e36480b9b2a6594d8254702f5cfb7c2629d78d05b8efd18e SHA512 5d94ab7d327be92c9ddee57f6d26fa8f4d9d825df7745d9a3fb3b14fb52ab519cc89fa6622b18b62cf6351c843e3ce39fe782c639054ef9aa1f7abe8aa890db3
-EBUILD systemd-9999.ebuild 13734 BLAKE2B a5d5c38099bef787f76aada7cf222b64ec329e054085a106d5bcfaecc02b13dad1670e6b0e016fd000974b87270fad5fb1fff39e1ef615b1fdf786dfe2c27164 SHA512 6ea1c2a6c4642be7d2cef52d180a8f7334c22ea71eb3d4530d5403f3eb6b39c8afd6c213828b1071bab401a59204d52297310945fc6df2de95856918a4e6469e
+EBUILD systemd-242-r7.ebuild 14199 BLAKE2B 78e3e55ab8c5d82b955a7ac08173bc2d87331e04b50fdac3df941f50f93d59ddb69b95d3dd3cf49fb1c69bf0a0acf1cc89a13600b8a0500c83f7e9dd3d3c9a28 SHA512 58f66c35f4026c2471bf59b559208882591b68f04a84cc551a4dc9987c8df7cd8ed33c9bf97d60b2026e4e89b963e1b7f088d7b18640793a5601d59cf68cfb7c
+EBUILD systemd-243_rc2-r1.ebuild 13774 BLAKE2B f2e4e2d00e151684203b1029d60532204afaf0edd7583418ce639097ecc89a83848c81ac61b8809772d86974f3d078a713aca60869696f4dd22c3e4a962681ff SHA512 7da1b91da0f77f1da31f68f0b56f902dc3cbc128fe514c705c0576677f7911baebed8eeab3ee75bce791fac3b6d3ab9f7fed0bfbe013383f7fbf42b3205f0394
+EBUILD systemd-9999.ebuild 13737 BLAKE2B 1bfaba9766c5182b54dd9cceb42b21a8a3c0fbd215270b015c051b582e1b54dfec9a4c2efc3b0a839b210ccc3f193cfe88535447437d7dbcf181b0256080a521 SHA512 7aff86c80448ac59fdb2c7bee4774836a794f47fde879793e1cf67ad37cd046335831eb3beb3d81aa5d5f7b2f9115995e8d5658f32b97298a9d87c2d82e0750d
 MISC metadata.xml 2126 BLAKE2B 8478ef3f19109c9654e894b20148d06a38ae0ffc45d47425fd4275825ba2d28c1de8ebf2e0a67d30a1ce88df9cbf1a04ea3a57a2e37127378f6e3ee5f3efccfd SHA512 642f406a6aee2644920aefdfcd14fb956eab1de98054a9b68e0b4e5683b7ca9b7e3f6dbbfec0d5a21b2eb96fee3511deae0cb4cf69f799b20a04528151f51da8
diff --git a/sys-apps/systemd/files/243-rc1-analyze.patch b/sys-apps/systemd/files/243-rc1-analyze.patch
deleted file mode 100644
index e38b51eb1210..000000000000
--- a/sys-apps/systemd/files/243-rc1-analyze.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 417b82e1c341946d277383471f2972b7227061ff Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 30 Jul 2019 14:51:38 -0400
-Subject: [PATCH] analyze: declare dump_exit_status outside of HAVE_SECCOMP
- block
-
-Fixes: 76ed04d936f757763c32db5dbaaebd8b13785d7b
-Closes: https://github.com/systemd/systemd/issues/13230
----
- src/analyze/analyze.c | 92 +++++++++++++++++++++----------------------
- 1 file changed, 46 insertions(+), 46 deletions(-)
-
-diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
-index f62879371d..4d81026084 100644
---- a/src/analyze/analyze.c
-+++ b/src/analyze/analyze.c
-@@ -1608,6 +1608,52 @@ static int dump_unit_paths(int argc, char *argv[], void *userdata) {
-         return 0;
- }
- 
-+static int dump_exit_status(int argc, char *argv[], void *userdata) {
-+        _cleanup_(table_unrefp) Table *table = NULL;
-+        int r;
-+
-+        table = table_new("name", "status", "class");
-+        if (!table)
-+                return log_oom();
-+
-+        r = table_set_align_percent(table, table_get_cell(table, 0, 1), 100);
-+        if (r < 0)
-+                return log_error_errno(r, "Failed to right-align status: %m");
-+
-+        if (strv_isempty(strv_skip(argv, 1)))
-+                for (size_t i = 0; i < ELEMENTSOF(exit_status_mappings); i++) {
-+                        if (!exit_status_mappings[i].name)
-+                                continue;
-+
-+                        r = table_add_many(table,
-+                                           TABLE_STRING, exit_status_mappings[i].name,
-+                                           TABLE_INT, (int) i,
-+                                           TABLE_STRING, exit_status_class(i));
-+                        if (r < 0)
-+                                return r;
-+                }
-+        else
-+                for (int i = 1; i < argc; i++) {
-+                        int status;
-+
-+                        status = exit_status_from_string(argv[i]);
-+                        if (status < 0)
-+                                return log_error_errno(r, "Invalid exit status \"%s\": %m", argv[i]);
-+
-+                        assert(status >= 0 && (size_t) status < ELEMENTSOF(exit_status_mappings));
-+                        r = table_add_many(table,
-+                                           TABLE_STRING, exit_status_mappings[status].name ?: "-",
-+                                           TABLE_INT, status,
-+                                           TABLE_STRING, exit_status_class(status) ?: "-");
-+                        if (r < 0)
-+                                return r;
-+                }
-+
-+        (void) pager_open(arg_pager_flags);
-+
-+        return table_print(table, NULL);
-+}
-+
- #if HAVE_SECCOMP
- 
- static int load_kernel_syscalls(Set **ret) {
-@@ -1685,52 +1731,6 @@ static void dump_syscall_filter(const SyscallFilterSet *set) {
-                 printf("    %s%s%s\n", syscall[0] == '@' ? ansi_underline() : "", syscall, ansi_normal());
- }
- 
--static int dump_exit_status(int argc, char *argv[], void *userdata) {
--        _cleanup_(table_unrefp) Table *table = NULL;
--        int r;
--
--        table = table_new("name", "status", "class");
--        if (!table)
--                return log_oom();
--
--        r = table_set_align_percent(table, table_get_cell(table, 0, 1), 100);
--        if (r < 0)
--                return log_error_errno(r, "Failed to right-align status: %m");
--
--        if (strv_isempty(strv_skip(argv, 1)))
--                for (size_t i = 0; i < ELEMENTSOF(exit_status_mappings); i++) {
--                        if (!exit_status_mappings[i].name)
--                                continue;
--
--                        r = table_add_many(table,
--                                           TABLE_STRING, exit_status_mappings[i].name,
--                                           TABLE_INT, (int) i,
--                                           TABLE_STRING, exit_status_class(i));
--                        if (r < 0)
--                                return r;
--                }
--        else
--                for (int i = 1; i < argc; i++) {
--                        int status;
--
--                        status = exit_status_from_string(argv[i]);
--                        if (status < 0)
--                                return log_error_errno(r, "Invalid exit status \"%s\": %m", argv[i]);
--
--                        assert(status >= 0 && (size_t) status < ELEMENTSOF(exit_status_mappings));
--                        r = table_add_many(table,
--                                           TABLE_STRING, exit_status_mappings[status].name ?: "-",
--                                           TABLE_INT, status,
--                                           TABLE_STRING, exit_status_class(status) ?: "-");
--                        if (r < 0)
--                                return r;
--                }
--
--        (void) pager_open(arg_pager_flags);
--
--        return table_print(table, NULL);
--}
--
- static int dump_syscall_filters(int argc, char *argv[], void *userdata) {
-         bool first = true;
- 
--- 
-2.22.0
-
diff --git a/sys-apps/systemd/files/243-rc1-cryptsetup.patch b/sys-apps/systemd/files/243-rc1-cryptsetup.patch
deleted file mode 100644
index e922d4d29cbd..000000000000
--- a/sys-apps/systemd/files/243-rc1-cryptsetup.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From f4ea8432e67110b73b07dd0e47a5339d83b350fb Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Wed, 31 Jul 2019 09:38:15 +0200
-Subject: [PATCH] cryptsetup-generator: fix coverity issue
-
-Fixes coverity issue 1403772
----
- src/cryptsetup/cryptsetup-generator.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index c51bb9ae189..960f4762b7d 100644
---- a/src/cryptsetup/cryptsetup-generator.c
-+++ b/src/cryptsetup/cryptsetup-generator.c
-@@ -46,30 +46,30 @@ STATIC_DESTRUCTOR_REGISTER(arg_disks, hashmap_freep);
- STATIC_DESTRUCTOR_REGISTER(arg_default_options, freep);
- STATIC_DESTRUCTOR_REGISTER(arg_default_keyfile, freep);
- 
--static int split_keyspec(const char *keyspec, char **keyfile, char **keydev) {
-+static int split_keyspec(const char *keyspec, char **ret_keyfile, char **ret_keydev) {
-         _cleanup_free_ char *kfile = NULL, *kdev = NULL;
--        char *c;
-+        const char *c;
- 
-         assert(keyspec);
--        assert(keyfile);
--        assert(keydev);
-+        assert(ret_keyfile);
-+        assert(ret_keydev);
- 
-         c = strrchr(keyspec, ':');
-         if (c) {
-                 kfile = strndup(keyspec, c-keyspec);
-                 kdev = strdup(c + 1);
--                if (!*kfile || !*kdev)
-+                if (!kfile || !kdev)
-                         return log_oom();
-         } else {
-                 /* No keydev specified */
-                 kfile = strdup(keyspec);
-                 kdev = NULL;
--                if (!*kfile)
-+                if (!kfile)
-                         return log_oom();
-         }
- 
--        *keyfile = TAKE_PTR(kfile);
--        *keydev = TAKE_PTR(kdev);
-+        *ret_keyfile = TAKE_PTR(kfile);
-+        *ret_keydev = TAKE_PTR(kdev);
- 
-         return 0;
- }
-From 5d2100dc4c32abbce4109e75cbfbbef6e1b2b7b1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Thu, 1 Aug 2019 08:13:13 +0200
-Subject: [PATCH] cryptsetup: use unabbrieviated variable names
-
-Now that "ret_" has been added to the output variables, we can name
-the internal variables without artificial abbrevs.
----
- src/cryptsetup/cryptsetup-generator.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index 960f4762b7d..84483143945 100644
---- a/src/cryptsetup/cryptsetup-generator.c
-+++ b/src/cryptsetup/cryptsetup-generator.c
-@@ -47,7 +47,7 @@ STATIC_DESTRUCTOR_REGISTER(arg_default_options, freep);
- STATIC_DESTRUCTOR_REGISTER(arg_default_keyfile, freep);
- 
- static int split_keyspec(const char *keyspec, char **ret_keyfile, char **ret_keydev) {
--        _cleanup_free_ char *kfile = NULL, *kdev = NULL;
-+        _cleanup_free_ char *keyfile = NULL, *keydev = NULL;
-         const char *c;
- 
-         assert(keyspec);
-@@ -56,20 +56,20 @@ static int split_keyspec(const char *keyspec, char **ret_keyfile, char **ret_key
- 
-         c = strrchr(keyspec, ':');
-         if (c) {
--                kfile = strndup(keyspec, c-keyspec);
--                kdev = strdup(c + 1);
--                if (!kfile || !kdev)
-+                keyfile = strndup(keyspec, c-keyspec);
-+                keydev = strdup(c + 1);
-+                if (!keyfile || !keydev)
-                         return log_oom();
-         } else {
-                 /* No keydev specified */
--                kfile = strdup(keyspec);
--                kdev = NULL;
--                if (!kfile)
-+                keyfile = strdup(keyspec);
-+                keydev = NULL;
-+                if (!keyfile)
-                         return log_oom();
-         }
- 
--        *ret_keyfile = TAKE_PTR(kfile);
--        *ret_keydev = TAKE_PTR(kdev);
-+        *ret_keyfile = TAKE_PTR(keyfile);
-+        *ret_keydev = TAKE_PTR(keydev);
- 
-         return 0;
- }
-From fef716b28be6e866b8afe995805d5ebe2af6bbfa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Thu, 1 Aug 2019 08:15:43 +0200
-Subject: [PATCH] cryptsetup: don't assert on variable which is optional
-
-https://github.com/systemd/systemd/commit/50d2eba27b9bfc77ef6b40e5721713846815418b#commitcomment-34519739
-
-In add_crypttab_devices() split_keyspec is called on the keyfile argument,
-which may be NULL.
----
- src/cryptsetup/cryptsetup-generator.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index 84483143945..4815ded753f 100644
---- a/src/cryptsetup/cryptsetup-generator.c
-+++ b/src/cryptsetup/cryptsetup-generator.c
-@@ -50,10 +50,14 @@ static int split_keyspec(const char *keyspec, char **ret_keyfile, char **ret_key
-         _cleanup_free_ char *keyfile = NULL, *keydev = NULL;
-         const char *c;
- 
--        assert(keyspec);
-         assert(ret_keyfile);
-         assert(ret_keydev);
- 
-+        if (!keyspec) {
-+                *ret_keyfile = *ret_keydev = NULL;
-+                return 0;
-+        }
-+
-         c = strrchr(keyspec, ':');
-         if (c) {
-                 keyfile = strndup(keyspec, c-keyspec);
-@@ -567,7 +571,7 @@ static int add_crypttab_devices(void) {
-         }
- 
-         for (;;) {
--                _cleanup_free_ char *line = NULL, *name = NULL, *device = NULL, *keydev = NULL, *keyfile = NULL, *keyspec = NULL, *options = NULL;
-+                _cleanup_free_ char *line = NULL, *name = NULL, *device = NULL, *keyspec = NULL, *options = NULL, *keyfile = NULL, *keydev = NULL;
-                 crypto_device *d = NULL;
-                 char *l, *uuid;
-                 int k;
diff --git a/sys-apps/systemd/files/243-rc1-revert-logind-remove-unused-check.patch b/sys-apps/systemd/files/243-rc1-revert-logind-remove-unused-check.patch
deleted file mode 100644
index 30a20c17661d..000000000000
--- a/sys-apps/systemd/files/243-rc1-revert-logind-remove-unused-check.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 18f689b1fa35c53580da62bfce875fb15d20d448 Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Sun, 4 Aug 2019 05:43:34 +0900
-Subject: [PATCH] Revert "logind: remove unused check"
-
-This reverts commit f2330acda408a34451d5e15380fcdd225a672473.
-
-Fixes #13255.
----
- src/login/logind-action.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/login/logind-action.c b/src/login/logind-action.c
-index fa92f4870a2..140953eec10 100644
---- a/src/login/logind-action.c
-+++ b/src/login/logind-action.c
-@@ -61,8 +61,12 @@ int manager_handle_action(
-         int r;
- 
-         assert(m);
--        /* We should be called only with valid actions different than HANDLE_IGNORE. */
--        assert(handle > HANDLE_IGNORE && handle < _HANDLE_ACTION_MAX);
-+
-+        /* If the key handling is turned off, don't do anything */
-+        if (handle == HANDLE_IGNORE) {
-+                log_debug("Refusing operation, as it is turned off.");
-+                return 0;
-+        }
- 
-         if (inhibit_key == INHIBIT_HANDLE_LID_SWITCH) {
-                 /* If the last system suspend or startup is too close,
diff --git a/sys-apps/systemd/files/243-rc1-udev-properties.patch b/sys-apps/systemd/files/243-rc1-udev-properties.patch
deleted file mode 100644
index 5e2ffa1868a3..000000000000
--- a/sys-apps/systemd/files/243-rc1-udev-properties.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 41c81c4a626fda0969fc09ddeb8addb7aae6e4d9 Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Sun, 4 Aug 2019 06:08:06 +0900
-Subject: [PATCH] udev: do not try to import properties on commented out lines
-
-Fixes #13257.
----
- src/udev/udev-rules.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
-index 3473a7eb7e5..1642f105354 100644
---- a/src/udev/udev-rules.c
-+++ b/src/udev/udev-rules.c
-@@ -1401,8 +1401,10 @@ static int get_property_from_string(char *line, char **ret_key, char **ret_value
-         key = skip_leading_chars(line, NULL);
- 
-         /* comment or empty line */
--        if (IN_SET(key[0], '#', '\0'))
-+        if (IN_SET(key[0], '#', '\0')) {
-+                *ret_key = *ret_value = NULL;
-                 return 0;
-+        }
- 
-         /* split key/value */
-         val = strchr(key, '=');
-@@ -1429,7 +1431,7 @@ static int get_property_from_string(char *line, char **ret_key, char **ret_value
- 
-         *ret_key = key;
-         *ret_value = val;
--        return 0;
-+        return 1;
- }
- 
- static int import_parent_into_properties(sd_device *dev, const char *filter) {
-@@ -1681,6 +1683,8 @@ static int udev_rule_apply_token_to_event(
-                                                      line);
-                                 continue;
-                         }
-+                        if (r == 0)
-+                                continue;
- 
-                         r = device_add_property(dev, key, value);
-                         if (r < 0)
-@@ -1719,6 +1723,8 @@ static int udev_rule_apply_token_to_event(
-                                                      line);
-                                 continue;
-                         }
-+                        if (r == 0)
-+                                continue;
- 
-                         r = device_add_property(dev, key, value);
-                         if (r < 0)
diff --git a/sys-apps/systemd/files/CVE-2019-15718.patch b/sys-apps/systemd/files/CVE-2019-15718.patch
new file mode 100644
index 000000000000..8186f7096f82
--- /dev/null
+++ b/sys-apps/systemd/files/CVE-2019-15718.patch
@@ -0,0 +1,31 @@
+From 35e528018f315798d3bffcb592b32a0d8f5162bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 27 Aug 2019 19:00:34 +0200
+Subject: [PATCH] shared/but-util: drop trusted annotation from
+ bus_open_system_watch_bind_with_description()
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1746057
+
+This only affects systemd-resolved. bus_open_system_watch_bind_with_description()
+is also used in timesyncd, but it has no methods, only read-only properties, and
+in networkd, but it annotates all methods with SD_BUS_VTABLE_UNPRIVILEGED and does
+polkit checks.
+---
+ src/shared/bus-util.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
+index 6af115e7aa..821339d4ae 100644
+--- a/src/shared/bus-util.c
++++ b/src/shared/bus-util.c
+@@ -1705,10 +1705,6 @@ int bus_open_system_watch_bind_with_description(sd_bus **ret, const char *descri
+         if (r < 0)
+                 return r;
+ 
+-        r = sd_bus_set_trusted(bus, true);
+-        if (r < 0)
+-                return r;
+-
+         r = sd_bus_negotiate_creds(bus, true, SD_BUS_CREDS_UID|SD_BUS_CREDS_EUID|SD_BUS_CREDS_EFFECTIVE_CAPS);
+         if (r < 0)
+                 return r;
diff --git a/sys-apps/systemd/files/CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch b/sys-apps/systemd/files/CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
deleted file mode 100644
index 6a0c8d1b0c51..000000000000
--- a/sys-apps/systemd/files/CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 29de632674473729d1e9497b6fe47e7c88682ed9 Mon Sep 17 00:00:00 2001
-From: Riccardo Schirone <rschiron@redhat.com>
-Date: Mon, 4 Feb 2019 14:29:09 +0100
-Subject: [PATCH 1/3] Refuse dbus message paths longer than BUS_PATH_SIZE_MAX
- limit.
-
-Even though the dbus specification does not enforce any length limit on the
-path of a dbus message, having to analyze too long strings in PID1 may be
-time-consuming and it may have security impacts.
-
-In any case, the limit is set so high that real-life applications should not
-have a problem with it.
----
- src/libsystemd/sd-bus/bus-internal.c | 2 +-
- src/libsystemd/sd-bus/bus-internal.h | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/sd-bus/bus-internal.c
-index 40acae2133..598b7f110c 100644
---- a/src/libsystemd/sd-bus/bus-internal.c
-+++ b/src/libsystemd/sd-bus/bus-internal.c
-@@ -43,7 +43,7 @@ bool object_path_is_valid(const char *p) {
-         if (slash)
-                 return false;
- 
--        return true;
-+        return (q - p) <= BUS_PATH_SIZE_MAX;
- }
- 
- char* object_path_startswith(const char *a, const char *b) {
-diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
-index f208b294d8..a8d61bf72a 100644
---- a/src/libsystemd/sd-bus/bus-internal.h
-+++ b/src/libsystemd/sd-bus/bus-internal.h
-@@ -332,6 +332,10 @@ struct sd_bus {
- 
- #define BUS_MESSAGE_SIZE_MAX (128*1024*1024)
- #define BUS_AUTH_SIZE_MAX (64*1024)
-+/* Note that the D-Bus specification states that bus paths shall have no size limit. We enforce here one
-+ * anyway, since truly unbounded strings are a security problem. The limit we pick is relatively large however,
-+ * to not clash unnecessarily with real-life applications. */
-+#define BUS_PATH_SIZE_MAX (64*1024)
- 
- #define BUS_CONTAINER_DEPTH 128
- 
--- 
-2.20.1
-
diff --git a/sys-apps/systemd/files/CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch b/sys-apps/systemd/files/CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
deleted file mode 100644
index bbc6db974d4a..000000000000
--- a/sys-apps/systemd/files/CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From 1ffe59592c5cbf924eb81a3662b4252ba6de7132 Mon Sep 17 00:00:00 2001
-From: Riccardo Schirone <rschiron@redhat.com>
-Date: Mon, 4 Feb 2019 14:29:28 +0100
-Subject: [PATCH 2/3] Allocate temporary strings to hold dbus paths on the heap
-
-Paths are limited to BUS_PATH_SIZE_MAX but the maximum size is anyway too big
-to be allocated on the stack, so let's switch to the heap where there is a
-clear way to understand if the allocation fails.
----
- src/libsystemd/sd-bus/bus-objects.c | 68 +++++++++++++++++++++++------
- 1 file changed, 54 insertions(+), 14 deletions(-)
-
-diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
-index 58329f3fe7..54b977418e 100644
---- a/src/libsystemd/sd-bus/bus-objects.c
-+++ b/src/libsystemd/sd-bus/bus-objects.c
-@@ -1133,7 +1133,8 @@ static int object_manager_serialize_path_and_fallbacks(
-                 const char *path,
-                 sd_bus_error *error) {
- 
--        char *prefix;
-+        _cleanup_free_ char *prefix = NULL;
-+        size_t pl;
-         int r;
- 
-         assert(bus);
-@@ -1149,7 +1150,12 @@ static int object_manager_serialize_path_and_fallbacks(
-                 return 0;
- 
-         /* Second, add fallback vtables registered for any of the prefixes */
--        prefix = newa(char, strlen(path) + 1);
-+        pl = strlen(path);
-+        assert(pl <= BUS_PATH_SIZE_MAX);
-+        prefix = new(char, pl + 1);
-+        if (!prefix)
-+                return -ENOMEM;
-+
-         OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
-                 r = object_manager_serialize_path(bus, reply, prefix, path, true, error);
-                 if (r < 0)
-@@ -1345,6 +1351,7 @@ static int object_find_and_run(
- }
- 
- int bus_process_object(sd_bus *bus, sd_bus_message *m) {
-+        _cleanup_free_ char *prefix = NULL;
-         int r;
-         size_t pl;
-         bool found_object = false;
-@@ -1369,9 +1376,12 @@ int bus_process_object(sd_bus *bus, sd_bus_message *m) {
-         assert(m->member);
- 
-         pl = strlen(m->path);
--        do {
--                char prefix[pl+1];
-+        assert(pl <= BUS_PATH_SIZE_MAX);
-+        prefix = new(char, pl + 1);
-+        if (!prefix)
-+                return -ENOMEM;
- 
-+        do {
-                 bus->nodes_modified = false;
- 
-                 r = object_find_and_run(bus, m, m->path, false, &found_object);
-@@ -1498,9 +1508,15 @@ static int bus_find_parent_object_manager(sd_bus *bus, struct node **out, const
- 
-         n = hashmap_get(bus->nodes, path);
-         if (!n) {
--                char *prefix;
-+                _cleanup_free_ char *prefix = NULL;
-+                size_t pl;
-+
-+                pl = strlen(path);
-+                assert(pl <= BUS_PATH_SIZE_MAX);
-+                prefix = new(char, pl + 1);
-+                if (!prefix)
-+                        return -ENOMEM;
- 
--                prefix = newa(char, strlen(path) + 1);
-                 OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
-                         n = hashmap_get(bus->nodes, prefix);
-                         if (n)
-@@ -2083,8 +2099,9 @@ _public_ int sd_bus_emit_properties_changed_strv(
-                 const char *interface,
-                 char **names) {
- 
-+        _cleanup_free_ char *prefix = NULL;
-         bool found_interface = false;
--        char *prefix;
-+        size_t pl;
-         int r;
- 
-         assert_return(bus, -EINVAL);
-@@ -2105,6 +2122,12 @@ _public_ int sd_bus_emit_properties_changed_strv(
- 
-         BUS_DONT_DESTROY(bus);
- 
-+        pl = strlen(path);
-+        assert(pl <= BUS_PATH_SIZE_MAX);
-+        prefix = new(char, pl + 1);
-+        if (!prefix)
-+                return -ENOMEM;
-+
-         do {
-                 bus->nodes_modified = false;
- 
-@@ -2114,7 +2137,6 @@ _public_ int sd_bus_emit_properties_changed_strv(
-                 if (bus->nodes_modified)
-                         continue;
- 
--                prefix = newa(char, strlen(path) + 1);
-                 OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
-                         r = emit_properties_changed_on_interface(bus, prefix, path, interface, true, &found_interface, names);
-                         if (r != 0)
-@@ -2246,7 +2268,8 @@ static int object_added_append_all_prefix(
- 
- static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *path) {
-         _cleanup_set_free_ Set *s = NULL;
--        char *prefix;
-+        _cleanup_free_ char *prefix = NULL;
-+        size_t pl;
-         int r;
- 
-         assert(bus);
-@@ -2291,7 +2314,12 @@ static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *p
-         if (bus->nodes_modified)
-                 return 0;
- 
--        prefix = newa(char, strlen(path) + 1);
-+        pl = strlen(path);
-+        assert(pl <= BUS_PATH_SIZE_MAX);
-+        prefix = new(char, pl + 1);
-+        if (!prefix)
-+                return -ENOMEM;
-+
-         OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
-                 r = object_added_append_all_prefix(bus, m, s, prefix, path, true);
-                 if (r < 0)
-@@ -2430,7 +2458,8 @@ static int object_removed_append_all_prefix(
- 
- static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char *path) {
-         _cleanup_set_free_ Set *s = NULL;
--        char *prefix;
-+        _cleanup_free_ char *prefix = NULL;
-+        size_t pl;
-         int r;
- 
-         assert(bus);
-@@ -2462,7 +2491,12 @@ static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char
-         if (bus->nodes_modified)
-                 return 0;
- 
--        prefix = newa(char, strlen(path) + 1);
-+        pl = strlen(path);
-+        assert(pl <= BUS_PATH_SIZE_MAX);
-+        prefix = new(char, pl + 1);
-+        if (!prefix)
-+                return -ENOMEM;
-+
-         OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
-                 r = object_removed_append_all_prefix(bus, m, s, prefix, path, true);
-                 if (r < 0)
-@@ -2612,7 +2646,8 @@ static int interfaces_added_append_one(
-                 const char *path,
-                 const char *interface) {
- 
--        char *prefix;
-+        _cleanup_free_ char *prefix = NULL;
-+        size_t pl;
-         int r;
- 
-         assert(bus);
-@@ -2626,7 +2661,12 @@ static int interfaces_added_append_one(
-         if (bus->nodes_modified)
-                 return 0;
- 
--        prefix = newa(char, strlen(path) + 1);
-+        pl = strlen(path);
-+        assert(pl <= BUS_PATH_SIZE_MAX);
-+        prefix = new(char, pl + 1);
-+        if (!prefix)
-+                return -ENOMEM;
-+
-         OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
-                 r = interfaces_added_append_one_prefix(bus, m, prefix, path, interface, true);
-                 if (r != 0)
--- 
-2.20.1
-
diff --git a/sys-apps/systemd/systemd-242-r7.ebuild b/sys-apps/systemd/systemd-242-r7.ebuild
new file mode 100644
index 000000000000..a6a723357390
--- /dev/null
+++ b/sys-apps/systemd/systemd-242-r7.ebuild
@@ -0,0 +1,500 @@
+# 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
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.5.3: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=[epoll(+)]
+		>=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= )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	acct-group/adm
+	acct-group/wheel
+	acct-group/kmem
+	acct-group/tty
+	acct-group/utmp
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/input
+	acct-group/kvm
+	acct-group/render
+	acct-group/tape
+	acct-group/video
+	acct-group/systemd-journal
+	acct-user/systemd-journal-remote
+	acct-user/systemd-coredump
+	acct-user/systemd-network
+	acct-user/systemd-resolve
+	acct-user/systemd-timesync
+	>=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 )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	sys-devel/m4
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+		"${FILESDIR}"/242-gcc-9.patch
+		"${FILESDIR}"/242-socket-util-flush-accept.patch
+		"${FILESDIR}"/242-wireguard-listenport.patch
+		"${FILESDIR}"/242-file-max.patch
+		"${FILESDIR}"/242-rdrand-ryzen.patch
+		"${FILESDIR}"/242-networkd-ipv6-token.patch
+		"${FILESDIR}"/242-network-domains.patch
+		"${FILESDIR}"/CVE-2019-15718.patch
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.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"
+		-Dsupport-url="https://gentoo.org/support/"
+		-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)
+		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		-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
+		-Dcreate-log-dirs=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/kernel/install.d
+	keepdir /etc/systemd/{network,user}
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	local udevdir=/lib/udev
+	use split-usr || udevdir=/usr/lib/udev
+
+	rm -r "${ED}${udevdir}/hwdb.d" || die
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-243_rc1-r2.ebuild b/sys-apps/systemd/systemd-243_rc1-r2.ebuild
deleted file mode 100644
index 988973dd9a7e..000000000000
--- a/sys-apps/systemd/systemd-243_rc1-r2.ebuild
+++ /dev/null
@@ -1,483 +0,0 @@
-# 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
-
-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 cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.5.3: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=[epoll(+)]
-		>=net-libs/gnutls-3.1.4:0=
-	)
-	idn? ( net-dns/libidn2:= )
-	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= )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	acct-group/adm
-	acct-group/wheel
-	acct-group/kmem
-	acct-group/tty
-	acct-group/utmp
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	acct-group/systemd-journal
-	acct-user/systemd-journal-remote
-	acct-user/systemd-coredump
-	acct-user/systemd-network
-	acct-user/systemd-resolve
-	acct-user/systemd-timesync
-	>=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 )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	sys-devel/m4
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-		"${FILESDIR}"/243-rc1-analyze.patch
-		"${FILESDIR}"/243-rc1-cryptsetup.patch
-		"${FILESDIR}"/243-rc1-revert-logind-remove-unused-check.patch
-		"${FILESDIR}"/243-rc1-udev-properties.patch
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.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"
-		-Dsupport-url="https://gentoo.org/support/"
-		-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
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# 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)
-		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		-Didn=$(meson_multilib_native_use idn)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		-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
-		-Dcreate-log-dirs=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)
-	)
-
-	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/kernel/install.d
-	keepdir /etc/systemd/{network,user}
-	keepdir /etc/udev/{hwdb.d,rules.d}
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	local udevdir=/lib/udev
-	use split-usr || udevdir=/usr/lib/udev
-
-	rm -r "${ED}${udevdir}/hwdb.d" || die
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-save_enabled_units() {
-	ENABLED_UNITS=()
-	type systemctl &>/dev/null || return
-	for x; do
-		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
-			ENABLED_UNITS+=( "${x}" )
-		fi
-	done
-}
-
-pkg_preinst() {
-	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${ENABLED_UNITS[@]} ]]; then
-		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-243_rc2-r1.ebuild b/sys-apps/systemd/systemd-243_rc2-r1.ebuild
new file mode 100644
index 000000000000..56cfe509a088
--- /dev/null
+++ b/sys-apps/systemd/systemd-243_rc2-r1.ebuild
@@ -0,0 +1,480 @@
+# 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
+
+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 cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.5.3: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=[epoll(+)]
+		>=net-libs/gnutls-3.1.4:0=
+	)
+	idn? ( net-dns/libidn2:= )
+	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= )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	acct-group/adm
+	acct-group/wheel
+	acct-group/kmem
+	acct-group/tty
+	acct-group/utmp
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/input
+	acct-group/kvm
+	acct-group/render
+	acct-group/tape
+	acct-group/video
+	acct-group/systemd-journal
+	acct-user/systemd-journal-remote
+	acct-user/systemd-coredump
+	acct-user/systemd-network
+	acct-user/systemd-resolve
+	acct-user/systemd-timesync
+	>=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 )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	sys-devel/m4
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+		"${FILESDIR}"/CVE-2019-15718.patch
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.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"
+		-Dsupport-url="https://gentoo.org/support/"
+		-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
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# 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)
+		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		-Didn=$(meson_multilib_native_use idn)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		-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
+		-Dcreate-log-dirs=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)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_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/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	local udevdir=/lib/udev
+	use split-usr || udevdir=/usr/lib/udev
+
+	rm -r "${ED}${udevdir}/hwdb.d" || die
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 7556cea0b553..f00c416fa382 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -310,7 +310,7 @@ multilib_src_compile() {
 
 multilib_src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	eninja test
+	meson_src_test
 }
 
 multilib_src_install() {
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 9eb857f45210..441c22b49014 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,5 +1,5 @@
 AUX bootlogd.initd 259 BLAKE2B 78c1a1fe8583685656edb85e29f8dbed40bdd7272590bbdaccb52fe6e54cce0a077a28501c7c87bec55f046172545d940c52345551cd3c01cff0895d12b32a15 SHA512 05a3c2542ceaff85c02c5c30a52be8f1bb95741fffef306777ad1b248b527cdd921f009571e1f43d7a6ede0cc61cf490a1dbbbfe0a50b234c258ad7688a37ad9
-AUX halt.sh 99 BLAKE2B 461ca8402ff0e867f4fed8d8bc740f1306e7c62c863748f88966e3f75e0cf84c222a4a20d55c840731e501b67dd533a9421e40936336abf12e02f6bf24727aae SHA512 532caf8247071fb0c726da42aa2e6025c7cc14e45dd6c4a75396895b82a9097ff0d9e56bc0497188df07525f944a061911a834e4fbc82a31bee06fff7e561660
+AUX halt.sh 101 BLAKE2B f3b8a24b6efce0ccffeb76f401af9f9bce752a541ea646dd6d357eaaa834be2049411148ec18b591283d85f42b0c3c1e41f442ba95c5f5b4cd9e87b39a83d51e SHA512 aaf46f9c74ae58027e59f32e5e929ff6529206d07fdf4e3f17962ccbc46c68d34e4e2839019708a763dead93b83ca8f457379491830ab43d6407247fd7ac2a77
 AUX inittab-2.91 1981 BLAKE2B 4917bad0474c3ab7aa02d481697ed0ce207b3c4c0f54beac794af07e76ad7d98420da77d7a08a32cbec32199196f630c92f67b9d57fedda23f49c97be113aa81 SHA512 2020a37686c3800335693b0ad977b4fcb5d6ee5abb09b5e683369ff0ab943e17c15a9a7cae02ca96d11ee310d7b8ad2814562f5a56fb82abedb3d60e2a7d2aef
 AUX inittab-2.95 1978 BLAKE2B b6fb1e0c6eaa68fb5d451d8065d1b1b5a53b15339f46a03f1c1ae410d03b40d102fe27e377750c1059377a4c741b30641c7f5e0f6f38c9d36180c43e25cac0ed SHA512 cae9909916b23c1bb6573b4b9bfc14ffb9d0b98e7c1546851713269528443b29417656c420f95810619fb0ae67f309bbe51804238825e938f53b75a0c4d76b81
 AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de6319153cce234b0d1dc7546beecf67296f8b7d6e3eb0f633d8a4ebc83fc4cc586c4f92cdb48df1f766aa4af72b0fa0e1 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee
@@ -10,8 +10,10 @@ AUX sysvinit-2.95_beta-shutdown-h.patch 2752 BLAKE2B a7174eaf34d5f9547d5d79c16bf
 DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72
 DIST sysvinit-2.94.tar.xz 120900 BLAKE2B e45a95246325e93ef49f11573924216937e238761cb9f5979ae2b272838fb3280b1d12c9553992271f7926dc7c7bc18e352a8019a70f54c592971fe043453804 SHA512 8d3b7b777f7c37cf5eaf73d4cdfad8ac54c6115577052bd7ddf3588da8fb7d16b812ffaade0ce300c2c6b7d2acd6e7778130544befc171eab174ee8766b3ec50
 DIST sysvinit-2.95.tar.xz 124576 BLAKE2B 1b0770e3bc7c5a32b8a634ab70d16854446816f9c22f57befb2602a8680d5d4a4adc51747b6199867ba73a3ac5118073a8bfa9ea4317de86b3b42867ae0cf6e7 SHA512 367990d166ec6dcc4de81e748f15035e2a4c2838da7336b064aeadac2db95ca77e8d11fb6aa7e7745874ef3e27118c9a68070062fffb16a886f32d6ab2529d28
+DIST sysvinit-2.96-beta.tar.xz 122212 BLAKE2B d819e0444b6d99129552b2ea6e1ab5b80d9b0967d68a53cd879995ca635ad54425a6a473fa2ea37ee43cd2f5bdfddffe1ad44f7115018ae3ec5925938ed1e72c SHA512 89116a473656033b974205f5eb296bc32fb558136511e087252248be8f444d0eebcb7c9473385913a00d15b9e5855068c1a8135d681114171728cd78ef278530
 EBUILD sysvinit-2.93.ebuild 3575 BLAKE2B f327a05eaa2e82baa05b0473f31591da2e61cff22db7fb1e3f8a6302990cc70df166484dc138bb03f8494a32a21c5af4ee4adeaff9f37e1edfa0db702bcfd57b SHA512 159ca13a88b9868ec717fa8d786322d04cc7f67ea3e3ec32e0369060a295a43a33fe6a19d5f3be1b8d30f8dfb659d596b5c0d01f49fd1fa28cce1a150decb900
 EBUILD sysvinit-2.94.ebuild 3817 BLAKE2B dcf4a1ce3f2eb774783e0d3bab5a189e45f43bafefb05c8f6d60f3f09639c691576447c0b6922c974ed8f0f5ab7ecbacba1b427dcb569470163658c64dadaa06 SHA512 7b60c4537ad8f1d4bd70a3c922a8778501b89343ab103f5413322745077ae8c85c16344773746a8e7ae3ef1d185420c26fd30598e33b5641d57563d32f9c7179
 EBUILD sysvinit-2.95-r1.ebuild 3850 BLAKE2B 35c48ee36606087e84cfcb400bd79cb239546d0fdf37de2f1100947903d37520fed21e3997cfae398d88167132e341682feaa7e86a76719ef75c456bae650494 SHA512 24c2e92865047a41abe3a08e83f9a14445f9628e2730bd8f67475b182d79b94291abea92662ccf5343277e509d70b337f313bb5be93b1160c0c0a089ec23631e
 EBUILD sysvinit-2.95.ebuild 3812 BLAKE2B 945467b8f510628c055cfd83b9c5a36198b1aacdf5f05918a34b0478576c941eba6d690ba4523f10e729b5cdcd696643e01c8ceadf4374d49a371e1c5e090079 SHA512 5d0b8a20b6e2380e841cfa529ba867368db64725f776fafe3d4381ded00f3550906e6baa9a58b3eb065155d20f8c3376ab1ec0bac50f27dadc18b9ff9da71352
+EBUILD sysvinit-2.96_beta.ebuild 3850 BLAKE2B 35c48ee36606087e84cfcb400bd79cb239546d0fdf37de2f1100947903d37520fed21e3997cfae398d88167132e341682feaa7e86a76719ef75c456bae650494 SHA512 24c2e92865047a41abe3a08e83f9a14445f9628e2730bd8f67475b182d79b94291abea92662ccf5343277e509d70b337f313bb5be93b1160c0c0a089ec23631e
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/files/halt.sh b/sys-apps/sysvinit/files/halt.sh
index 07a32b99574f..ff68c425cd4d 100644
--- a/sys-apps/sysvinit/files/halt.sh
+++ b/sys-apps/sysvinit/files/halt.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ "$INIT_HALT" = HALT ]; then
+if [ "${INIT_HALT}" = HALT ]; then
 	exec /sbin/halt -dhn
 else
 	exec /sbin/poweroff -dhn
diff --git a/sys-apps/sysvinit/sysvinit-2.96_beta.ebuild b/sys-apps/sysvinit/sysvinit-2.96_beta.ebuild
new file mode 100644
index 000000000000..6dd6484ee442
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.96_beta.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="/sbin/init - parent of all processes"
+HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
+SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" == *beta* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="selinux ibm static kernel_FreeBSD"
+
+CDEPEND="
+	selinux? (
+		>=sys-libs/libselinux-1.28
+	)"
+DEPEND="${CDEPEND}
+	virtual/os-headers"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-shutdown )
+	!<sys-apps/openrc-0.13
+"
+
+S="${WORKDIR}/${P/_*}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.86-kexec.patch" #80220
+	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615
+	"${FILESDIR}/${PN}-2.95_beta-shutdown-h.patch" #449354
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CPPFLAGS =$/d' \
+		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
+		src/Makefile || die
+
+	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
+		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
+		src/Makefile || die
+
+	# pidof has moved to >=procps-3.3.9
+	sed -i -r \
+		-e '/\/bin\/pidof/d' \
+		-e '/^MAN8/s:\<pidof.8\>::g' \
+		src/Makefile || die
+
+	# logsave is already in e2fsprogs
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
+		-e '/^MAN8/s:\<logsave.8\>::g' \
+		src/Makefile || die
+
+	# Mung inittab for specific architectures
+	cd "${WORKDIR}" || die
+	cp "${FILESDIR}"/inittab-2.95 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
+	into /
+	dosbin "${FILESDIR}"/halt.sh
+}
+
+pkg_postinst() {
+	# Reload init to fix unmounting problems of / on next reboot.
+	# This is really needed, as without the new version of init cause init
+	# not to quit properly on reboot, and causes a fsck of / on next reboot.
+	if [[ ${ROOT} == / ]] ; then
+		if [[ -e /dev/initctl && ! -e /run/initctl ]]; then
+			ln -s /dev/initctl /run/initctl
+		fi
+		# Do not return an error if this fails
+		/sbin/telinit U &>/dev/null
+	fi
+
+	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
+	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
+
+	# Required for new bootlogd service
+	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
+		touch "${EROOT}/var/log/boot"
+	fi
+}
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index ab086fa468d0..37400d959e14 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -1,9 +1,10 @@
 AUX hosts.allow.example 585 BLAKE2B 18a7786b0eb9d08b0536de6ef135189aa0527af34a9bfec378ceedf6b6479998f81bd40237bdb5ad09239f7221cdc076077c964a111f6eb651ce258496d1010f SHA512 63587dd4552b688dc5ed0adde3932e43e5287129315211498063f09e37c1f8beee0de60d7d4f69df7149bd500546a2fd59a6094d71f9c0be221426eae3cb869b
 AUX tcp-wrappers-7.6-headers.patch 5419 BLAKE2B 6d56c77652299c8bc75ea76ff42c5dfa915b94b4466c79a23529e1d815487145dffef73d262a1d79e209caaf627fbf81b4f5402fca45af6f995c129fcb2539e4 SHA512 48cd3d8951ef0f0106c51f1a1de6116fe1f68bf49f321b956d4f9dac1b3f1b6c2964163deb3d1bb449a2ac672e471c4b216e0e616de4a2dad0665d767d13f786
 AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae680b189158c9936428644e7b93981403ed017ef26806f3de184f66eace573cf385ae350f3b0fa1b3f250b2a0b4708908289c558 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4
+AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8139c2dfd0a4a061b6113898560436ae0e5fb6e5a74c3c4c163c27f99e9957ec89665186beed30e7a57810db886b8a86148f6b58f5f594 SHA512 bdefe3dd35e96d1e140d1dc363f1904526aaf0c44952b8ec5e206c8e53693437f07be2ad136a0e22c38e09c1dcd1c73c755165cc68b4588715f6997f9c6affb8
 DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 BLAKE2B 2e507269b14e5cf3e1a599b4cdae40c2900b098a1e40fc1b74e6b5565183fc71e25306e8dd0863fb16e6e52a6c471aeccb73c0b7c42d6f3f98aa9f95274583fb SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8
 DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
 EBUILD tcp-wrappers-7.6.22-r1.ebuild 2510 BLAKE2B 6d3f6d9a39394aeb243816bf787b6a9c93b3627d00fa784864b93b44ec127e9b5e8851a99a08b5d692887184b6d24fddb1326a64f96e791a8db37dda01296241 SHA512 7357160a8a1de09761e7b454974f319701691ed09f9cde27e655f77252053b50573e442549b322f00b21d40c472d6290432d3df90d16a9acf92afed1be35a6e6
-EBUILD tcp-wrappers-7.6.28.ebuild 2402 BLAKE2B 3fbe739b8ff71cc4d55ff6ba7bcb9c066262fac84e9118fc167ac25cc1d03643744ae6f62a84a906b646467b8230fde760bf27646322c6233b58253c7b37a9bf SHA512 a03b62a74d15b111e276a37795476bee9620e300ac81bc43b272367811df9ec1564301e1e8d4c5a1943504fd5677f00f9db2f0b2fb0851714b63c240841b65e5
+EBUILD tcp-wrappers-7.6.28.ebuild 2462 BLAKE2B cb84a42f91d9f6999242236b056f5831744c94cd4ca4a02b1174fd57869a2bc482b9219a463441dca5b272f5d5122e5923056f098d0c5a65e9accf9464edab89 SHA512 e6ffe541b229e35ccd68561ddff3822c502873f139dd4c815204d5da704c68cc40af113772e1969365636d81815af35ce53c098adb5cd1835605813f87172c34
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6.28-no-external-malloc.patch b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6.28-no-external-malloc.patch
new file mode 100644
index 000000000000..eebd600aab24
--- /dev/null
+++ b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6.28-no-external-malloc.patch
@@ -0,0 +1,15 @@
+We use malloc() from stdlib.h.
+
+--- a/scaffold.c
++++ b/scaffold.c
+@@ -26,10 +26,6 @@ static char sccs_id[] = "@(#) scaffold.c 1.6 97/03/21 19:27:24";
+ #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
+ #endif
+ 
+-#ifndef INET6
+-extern char *malloc();
+-#endif
+-
+ /* Application-specific. */
+ 
+ #include "tcpd.h"
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
index 00e58c8c433f..8e96239d9162 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
@@ -25,6 +25,7 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
 	eapply $(sed -e 's:^:../debian/patches/:' ../debian/patches/series)
 	eapply "${FILESDIR}"/${PN}-7.6-redhat-bug11881.patch
+	eapply "${FILESDIR}"/${PN}-7.6.28-no-external-malloc.patch
 
 	eapply_user
 
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 86cd4fa1dea2..b7dac7d03936 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,6 +1,6 @@
 DIST texinfo-6.3.tar.xz 4468048 BLAKE2B ef255225e1f66dc5e6646761d78dcf3e7ba9c79aa2654dbb527ef10db54b8417af9e1a58a270683956624049c2fb624b29bc2f22763c79bab9858cdcf5e2edce SHA512 ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4
 DIST texinfo-6.6.tar.xz 4946900 BLAKE2B bd33297549d5285d7a4a65041b6025c489c6b436e9591eaf5187ef34f6e869bf7a2a82a00ebe11adc1c4b2904119e9e3f25d2496b5507f91f4b9ba548ba98604 SHA512 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0
 EBUILD texinfo-6.3.ebuild 1110 BLAKE2B d3bdfaa29efc4c4eb951f78c4cbf9de4d4259dfc769867ef75c243d768b6ccb226467229328d7b07f1fd50b12150a0d18fe659b621662375f68fa58b9a66d9ff SHA512 634274842a789f5d906c553f413a8775b3050a7fc9c86a9c0a8320c8fe5f342354522e56fa0cefb15b42169c9503d9e851182ad98b93b5c7351d388750a0f738
-EBUILD texinfo-6.6-r1.ebuild 1367 BLAKE2B 716ff075cd4174f822d08f270086326f6c664078d152e146fab04c4fd05323f4a3fd78fadacd1dee801f1add66abc576d90e0cc2dcf742a52280ea40b0a15a4a SHA512 96f85073fc80f08a94a7a2ca8bf73ec20fd441e36bd158ad7336e39f919f6f8b52f851b6641b450167b35fd02d03fc4acfb840d735f987063d6543b78fa39d88
+EBUILD texinfo-6.6-r1.ebuild 1365 BLAKE2B d889a54e6fa9d6c0c9345aa750d89685a361cbcab435560f18627ba161b2b06f405b3f84c2c6c2fa6a98e0064816cc18aab4a4713b8724bb3d68a08fc1cae28e SHA512 65dc7656de1ba4361109acf25590722420253a7d6153391bdff82ef0afc2ad1fb5d4e889c508c47ae6c582b128fe4499b9ce51021d5285d737d6872c1503d93c
 EBUILD texinfo-6.6-r3.ebuild 1698 BLAKE2B f26539f4f66bbdd1a627ec0b3e3bc950c664eeb608bc0139e3a189bd77b9cf507a06e4aca81f723f78aaab5eae0a62d494e64ba29dd07096a427e8cae4534d44 SHA512 3f8ff94cd57d506654b352577f21737d0717f1d04cc268e39c8e7604f78a4fd1b9994fe6f7464ea9c0499305384c8929ae3d9df846242f2d516d9a9d0993cdc4
 MISC metadata.xml 462 BLAKE2B 2e3c58437bda45610f7a2ed95cc8a1ec38c64b256e980816946e02ed6edaf69f20b152a1bda59f8d58f5af6aa7afe1e6dce219a2ba1624aa3f00c36028dfbe4c SHA512 b2015a2dc9e82b7284df86fe013d12f846d19246153526a8b48d1e5124682fd823ad1fb9b6276896b8f4e991efd3daead9e5d02cc43662e6f5be0cf11dbb6260
diff --git a/sys-apps/texinfo/texinfo-6.6-r1.ebuild b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
index f18a2d3c771c..f2a76fdfe639 100644
--- a/sys-apps/texinfo/texinfo-6.6-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 60def0eeb3b2..2c991233c6ff 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/oath-toolkit/Manifest b/sys-auth/oath-toolkit/Manifest
index 8d3afeaf0c69..ae2123459c8c 100644
--- a/sys-auth/oath-toolkit/Manifest
+++ b/sys-auth/oath-toolkit/Manifest
@@ -3,5 +3,5 @@ AUX oath-toolkit-2.6.2-glibc228.patch 4786 BLAKE2B 7690a2b5249b7c668be5a516fa0a2
 DIST oath-toolkit-2.6.1.tar.gz 4238966 BLAKE2B 7af4f4997b18278aa1903470c79e5a7734e9e97e62a2de4685eee58ead59e3294cef0d6da0147746932a2891f59648b5473f02b5edd6c4fd81b4a9c80d9bde60 SHA512 59feadbc06d11a52bf5879493227c40358fc1f4f17ec3ff92e3a313e47b92f3154396fa3ff38ef163852b32c8bfcef1f59753b614d0138478b8f7e7971f55e62
 DIST oath-toolkit-2.6.2.tar.gz 4295786 BLAKE2B 2b97ab73339647b560b46373922095f18655a167b613b15d4ee2fd507d430025628d20eb111ff1d8025e78646b1d61d9680a7082caba1c75d247bb1d8b9b99dd SHA512 201a702a05a2e9fb3a66d04750e1a34e293342126caf02c344954a0d9fd0daafe73ca7f1fe273be129ae555a29b82b72fa2b4770ea2ad10711924e1926ec2cfb
 EBUILD oath-toolkit-2.6.1.ebuild 1456 BLAKE2B cf19d07cdb90a67e55e581593b5819ad9c4d75e0751afc21db7dd0dda4dc6d239b3d43bd377106591af4769edc36ed12b8a90b6cc47fa1183d3babde017d67fb SHA512 0c03c380e36070e9030575d63435554ec573cd0ea75bb87bc28cfda3e5a8ca10c025fdc6b14f670a3db200c78064ff12e92db4b8ae1f935c71b778728ffab414
-EBUILD oath-toolkit-2.6.2.ebuild 1800 BLAKE2B b3cbdc4e9b4b3ffd1f7ee3e323c46de29972887ad978c905e871ccd8610190efa45efc60f4d67699697096a0508f7bcb509d9d68201a990c9c9112dcb2c51dd4 SHA512 93af314c61dc92ee261603c120d0686e298b3dd0cf53f0841ae7eac27e99e1799bcbac4c26a4acb2ad8ff402362f73930cfe7726c0c9a00b31f18a6079318f2f
+EBUILD oath-toolkit-2.6.2.ebuild 1799 BLAKE2B 829eb857e69df9aa6157e168ece8ecd3215638ff50aca186ff17e7e11e0ad874fdcc93c5e4107980b88ff74fcdf1608934bf0c529ed4dc5bbb76320ba0a2dc15 SHA512 a2c4e5ab37d678aa3c5e0c941c39b6d5eb1f891891a3fc50c128661cc7f44925d5b7b9663e64c9c7d522510de9d69814fe51d9bd6ddb730d96a7d392a4dba13d
 MISC metadata.xml 560 BLAKE2B 946cac9a0134fb3291ad816283326746067411e000e98be05cd8f87dfa0455ef3558b1bdabcb537356fed867d8667850d929747592e7c79212c7ad3357434c84 SHA512 4d6506e02bb4a6f6069dfe357cc3e05c897699a067771baa995af823d4de587d2580b01bf1c2a38cb8f8f679ba0702498ad904b6bb1d685a2759c2b7752be7f2
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
index 28725920c261..1fd990ee3d13 100644
--- a/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="pam pskc test"
 
 RDEPEND="
diff --git a/sys-auth/pam_skey/Manifest b/sys-auth/pam_skey/Manifest
index 2a3053781a8f..e71cd8a7a14c 100644
--- a/sys-auth/pam_skey/Manifest
+++ b/sys-auth/pam_skey/Manifest
@@ -1,5 +1,4 @@
 DIST pam_skey-1.1.5-patches-6.tar.xz 9264 BLAKE2B aa3a1f66b5511489ad542af2802ff0aab99d79fdc5bff0cf661b55f1c118cfda2644006ce3d494e6f6fafd85ad2832449fbdaec73ee8edf99a20a3cb2616e9b5 SHA512 c777ed094efe9cbfb275cfb30d036e3a1bd9477b08297815f07156b432a2724f8c08e9e841ef6bf7ba62ccf7df361f541e59024b42164bd35d7eef16da1f75ec
 DIST pam_skey-1.1.5.tar.gz 76963 BLAKE2B ded4a4e43b174338cd1beefce65314cc906db928593dd5eba2ba1be9cab33844d8fd38cb7d3b952a29da632b671c468e0dfe7f0f1e0d167397320cd9ca6d35e1 SHA512 12817cedf15a3b2287982e4beab5d3b388239cc0a1e141e66e41759ddb2da7fb9dd0df12202dcc8140db0868c8df1a8d19d5859224179e2419ffefd691cb9834
-EBUILD pam_skey-1.1.5-r5.ebuild 1551 BLAKE2B edbab23c1a66829d858422bc9efd670fea2ee5a8a833ee40353c87fbb7c3a6f464d06f7dd3bff4ee7c5539a175f798745c9396508e75ce339f386e71e6a607d8 SHA512 30a05dd63926440d529d3fe6f0252e0e7c2d1a9b40293cd3c123d47afecb55599aa4892200405e81a221b1e6365cfc77af28da1f2d40c3488b83415252e2130d
-EBUILD pam_skey-1.1.5-r6.ebuild 1576 BLAKE2B 735df1184f18c70ee7ceb7af506135f39c383b4cf2e17bbea6271af3e93607c0528bc08470cde9106c797f1bf8eade92ecfdf1fcaa82449011fce3806083b9e2 SHA512 2c37d9b893683c8541f207f07be434eb7788fcc5d15a0490bf9897091e1655d53b4f166dc4341e366272a6cd5fa03a91e8c6e724b009eca8a5a4395524898914
+EBUILD pam_skey-1.1.5-r6.ebuild 1574 BLAKE2B be69bd5bb193907fe81995141c65f7bf08292c71f6e963befff2ebb98fe0fa1b6f34bc3f206fbaff39b3505a1e525209e9302e17d0b9843d11c354289af42ff9 SHA512 8c00b4088a29cac198dfba76a85167e556ed317b07060da70a951d139ddd55061bface82dc9ef10a92ca4be4e1b3c5762f9be9ab227b3d551205c4347eaf3daf
 MISC metadata.xml 298 BLAKE2B d846164710bf706b6d7fda795b74a5bf0a3303eb7c5c67b6ed422ad9002d6f3ae96abaaa086b2c223b71efd19ed2b8bb7a3313a0b3fda523f816a34e9b639f14 SHA512 97d05da80a58ee2510de2ba718681ebb5b183dd113de6b8ff3c05a43b2fbd488fff78a2e7381b0cbf0b36aeab09e125a629c2259d0ce871e9cc7a80cff1bebf5
diff --git a/sys-auth/pam_skey/pam_skey-1.1.5-r5.ebuild b/sys-auth/pam_skey/pam_skey-1.1.5-r5.ebuild
deleted file mode 100644
index 662347a3b86d..000000000000
--- a/sys-auth/pam_skey/pam_skey-1.1.5-r5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils pam autotools multilib readme.gentoo-r1
-
-DESCRIPTION="PAM interface for the S/Key authentication system"
-HOMEPAGE="http://freshmeat.net/projects/pam_skey/"
-SRC_URI="http://dkorunic.net/tarballs/${P}.tar.gz
-	mirror://gentoo/${P}-patches-6.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="net-libs/libnsl:0=
-	>=sys-libs/pam-0.78-r3
-	>=sys-auth/skey-1.1.5-r4"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-DOCS="README INSTALL"
-DOC_CONTENTS="To use the pam_skey module, you need to configure PAM
-	by adding a line like:
-	\n\nauth [success=done ignore=ignore auth_err=die default=bad] pam_skey.so\n
-	\nto an appropriate place in the /etc/pam.d/system-auth file.
-	Consult the README and INSTALL files in /usr/share/doc/${PF}
-	for detailed instructions.
-	\n\nPlease note that calling this module from unprivileged
-	applications, e.g. screensavers, is not supported.
-	\n\nError checking has become stricter in pam_skey-1.1.5-r4;
-	errors returned from the underlying skey library when accessing
-	the S/Key data base will no longer be ignored.
-	Make sure that your PAM configuration is correct."
-
-src_prepare() {
-	EPATCH_SUFFIX=patch epatch
-	epatch_user
-
-	cd autoconf
-	eautoconf
-	eautoheader
-	mv configure defs.h.in .. || die "mv failed"
-}
-
-src_configure() {
-	econf --libdir="/$(get_libdir)" CFLAGS="${CFLAGS} -fPIC"
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-auth/pam_skey/pam_skey-1.1.5-r6.ebuild b/sys-auth/pam_skey/pam_skey-1.1.5-r6.ebuild
index c286358b4e13..bf556e0b6380 100644
--- a/sys-auth/pam_skey/pam_skey-1.1.5-r6.ebuild
+++ b/sys-auth/pam_skey/pam_skey-1.1.5-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=7
@@ -12,7 +12,7 @@ SRC_URI="http://dkorunic.net/tarballs/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="net-libs/libnsl:0=
 	>=sys-libs/pam-0.78-r3
diff --git a/sys-auth/polkit-qt/Manifest b/sys-auth/polkit-qt/Manifest
index cae29b1d55a1..477d6db09a63 100644
--- a/sys-auth/polkit-qt/Manifest
+++ b/sys-auth/polkit-qt/Manifest
@@ -1,3 +1,5 @@
 DIST polkit-qt-1-0.112.0_p20160416.tar.xz 64540 BLAKE2B fbc3631585801f42ff92324576a2bd82d61aa5b24317f95e1182c300073a8e746007fa3409127a50d7d3433c5092f56d72e2e579683d08145067d4424c4dfe7e SHA512 90677af780a2bbcb33b6a54702ba96f965eb8561f2636af7aa0146f9b2450f9e89f67e022ffa99742afe50e3d1f570eabfad686e9e08e629a1e662d9f5abf2ea
+DIST polkit-qt-1-0.113.0.tar.xz 64652 BLAKE2B 52d8c5c8009e2595c70db5b6a6349e4524d6d9cbec12c5a535f25d737da1d16e77fadf3572eebbede7a5ed583c818e878119b416d69a076e03bb37d2f7da7b41 SHA512 deea5d75f547eaa0279c664ec9608b65f464db97fd5fdea27437f8ed4ec033de2b9f91d967deacb28bf0a1e54f131f997acb862cc3e1f8dfcb1f6c337e719b38
 EBUILD polkit-qt-0.112.0_p20160416-r2.ebuild 771 BLAKE2B 37d1a80ae56b09e70e834b882d28b5a211662657cc666365a0d9a214e4772ecd42a321e9bbe1caaf379c47192f17f646e0c4139dd8a7a56fc9cf34be1b5434f9 SHA512 d9bf61fe356c7923b4f4ad1dd9a400a0ed023f01b90b6358e48b77e4a1ad09efaacce64d776530172a61d969678118383a703cfdc5691a1517e8ffc357f79b0a
+EBUILD polkit-qt-0.113.0.ebuild 758 BLAKE2B 522d1e9b53ebe67f366b88bec5c6327ccc3e135098c5e323dec440cb7daf09c9264acf5c1ba3b1dc748b42b1bda62ce4f7a59154c5d1a73ba37b78e6d5c68b68 SHA512 e744d252b993265440cc9c1da74e40ec3c8d00bcd3fea44d8e52820a03de6600af84be6db5f07c56eb4a3637dbd9b4689d8774d800953e381ebe0b62859ec2c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild b/sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
new file mode 100644
index 000000000000..7191cd244da6
--- /dev/null
+++ b/sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN}-1"
+MY_P="${MY_PN}-${PV}"
+inherit cmake-utils
+
+DESCRIPTION="Qt wrapper around polkit-1 client libraries"
+HOMEPAGE="https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/"
+SRC_URI="mirror://kde/stable/${MY_PN}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=sys-auth/polkit-0.103
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README README.porting TODO )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=OFF
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index ec0b5925fc05..05e70e0ebd4b 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index cef6ea6449ba..34fcc8e8506a 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -4,8 +4,8 @@ DIST thin-provisioning-tools-0.7.0.tar.gz 230595 BLAKE2B 00238a682f80600e3a5bb6d
 DIST thin-provisioning-tools-0.7.6.tar.gz 285428 BLAKE2B af74eff6d435f00e347872786fee8627f02844af122a9f1bf9ffd00234ce5275d3a61d9b4204313a19813cadbc0197bbeb9a1bd92d55992c6d9a03a299579e29 SHA512 395035b6f59fafb1c0f3e68750611e04f10223bc8d57b257e25c28c928647d1d2c6e94014b64ed90eeae1151fc7e5d23cf1aa428716e343338cb3c8fe55ed704
 DIST thin-provisioning-tools-0.8.3.tar.gz 305338 BLAKE2B 619f73ef7bd802eb72649d0bdaa8ce1d6afb4d7ae442ac7d2d709764aaa5058bf77b12710a332cf5f8215cfb94e1d63c189951058e2373467ca88c847e32cd8d SHA512 a69645d45fd62a487903a07f922fd622b5fb9c7858e656b9468903005ab7daa3098aa89ae356f2458fcf95e3c0672bf486b424553d82ffae54b83c0b71599541
 DIST thin-provisioning-tools-0.8.5.tar.gz 305585 BLAKE2B 7e4bde537535db79e97ddab3cba775c89854362dac7da491c040badf5e3546d2e6ac4b8da8462edb59f50a2ecd95fe9c5e3349fca5e9acd588efaaf990617ca4 SHA512 1f9a1b6b9059f0b23ec3a00ddef223599292d447894316525f13b9c1e4f29d0371cb901d199cb503be4342555e016e5e6eb2d6e0e10c44b08e6c9478c573e1d4
-EBUILD thin-provisioning-tools-0.7.0.ebuild 1305 BLAKE2B 0a7ff0dc3d9051262d35ecd614043e43244b3b53038e56d18cae2933b839ea2f148aa0cad5e775dbc88b432dfe9695c764f8e43deb542934079443a4cf78f920 SHA512 8eb3e578dc7810e70b79d6476e3cf814e0838d6e03644cc507240dcc14cc240b387460389443718fbadc87c1a79e63f4a5ee15de3f27400c8f9aa6ca1e173cc1
-EBUILD thin-provisioning-tools-0.7.6.ebuild 1320 BLAKE2B 9e6308a4d050c42ef84b12d60fb11a0fdd122060127a8e5b44b1e48fa2e75bfd2186bec24fcab46afe104408b76b8655685db4b34850eab748928b27b2edd9e9 SHA512 72e4fb319e715afc5af130fc4d2cfb5d80992bbb9e803b4d8d8a63c46da9df66997f4862ce6d39c7b4895c6a8cec7260e3b4baca09500acf1bb9b2e9cccf91e8
+EBUILD thin-provisioning-tools-0.7.0.ebuild 1287 BLAKE2B eac7c95d4bdb07265220be0e2c7a09c9ac7b28ffed87f0c34ad1def7c09dac172840eccd3d1c9568d92764ec2b5c304b139731607c6fc0d5d04d31fb9f81d9d8 SHA512 c20c6985fda6e1dbab486379451c4f01f45d0defc2621388ed67b5c906cd972fb3a54fd22c76c7b409a5220a6b9d9cef0edb85666bb908f2ffe3c432930c62e2
+EBUILD thin-provisioning-tools-0.7.6.ebuild 1299 BLAKE2B 69e880adafb6fe248594a3e05bd93ab5326847802c58a8b9f8da681c156544ccc98be820980d900eac9a5224c37fa4ef5160d8198faea93af9203305cb026a4d SHA512 914813914508f93788fff7952ee3c6bb9a044165697e38056ac61035ae8323614dea1d5df97db05b993308bb390ae4ddf070cc3ad35096eed42efc3cf1d1af50
 EBUILD thin-provisioning-tools-0.8.3.ebuild 1492 BLAKE2B df177df671080545e68ef381dea34b0a64a03f3c57ed88c184d1b893dd5a6f0a688b02c171f840bfb166eacb27f905c65f982fa26d56cbba7a7b3685d1081ff4 SHA512 41942199c194f92521cc2476502ac7405dc3c1f23a8f5a232ffb2edaa5a5407a27ad6a690991414b768c5277ead1f148e02236fe9f195c61eaae4b9d84d2bf61
 EBUILD thin-provisioning-tools-0.8.5.ebuild 1540 BLAKE2B a8f83d0cec08c5418020093c521e3576170369bfa1365478d4d5e4b697b99c546d9c253efd958d0cb0bbdb2b169cdd1a8e97989fd7da69573bd1e90bd3f1223f SHA512 9cea7b24cd3249834bf38c4377bddd219e8df5f4b1f593d5d1793730fbbdc528fde68f8ee68f2f3bef7114aaf11ada86b3162908e9a179fbc1c95e7fb6324bda
 EBUILD thin-provisioning-tools-9999.ebuild 1492 BLAKE2B df177df671080545e68ef381dea34b0a64a03f3c57ed88c184d1b893dd5a6f0a688b02c171f840bfb166eacb27f905c65f982fa26d56cbba7a7b3685d1081ff4 SHA512 41942199c194f92521cc2476502ac7405dc3c1f23a8f5a232ffb2edaa5a5407a27ad6a690991414b768c5277ead1f148e02236fe9f195c61eaae4b9d84d2bf61
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
index b945b92a8b9a..01b09c331b44 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
@@ -20,7 +20,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	test? (
-		|| ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 )
+		|| ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 )
 		>=dev-cpp/gtest-1.8.0
 		dev-util/cucumber
 		dev-util/aruba
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild
index 22a1164fc489..2458a29d5d7c 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.6.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.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
@@ -20,7 +20,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	test? (
-		|| ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 )
+		|| ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 )
 		>=dev-cpp/gtest-1.8.0
 		dev-util/cucumber
 		dev-util/aruba
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 0b5ce6a72364..99b1b4e6702b 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/palo/Manifest b/sys-boot/palo/Manifest
index 265127c34a70..95763ba1b6d9 100644
--- a/sys-boot/palo/Manifest
+++ b/sys-boot/palo/Manifest
@@ -3,7 +3,9 @@ AUX palo-2.00-toolchain.patch 532 BLAKE2B ef8df5bd7874ac88aa27b2864ee0baeb57e470
 AUX palo.conf 260 BLAKE2B 1e81466dcecedc4ca1894863491f4c91e88becc9a5c5815e69028eeadc98ca61e99951fb754a8261a6cdb763aaa22201ae77f65fd4de07bbbd3f3c801322e277 SHA512 4147e480362161cd61ad9af8fb7048b87f9126c213661ab26f77ba98fe7f1acd03791b154667137e4a265e3c31e54e703d32daa86ff0805f47bc7c1b8b03cfe6
 DIST palo-2.00.tar.gz 124484 BLAKE2B b46b616acf51534382f6a775b456cdcbd4771d6bc9d7a8339ad788a5c5a4a333e98a6e4815c40a6750408b1e8168a19800da11ddf7125621f77d478a651d9c75 SHA512 b6dab81e6c2641a64a40561a65b5412ee702136ac79dab94619e0094faf011e158c67e681f45d5aa51423f5f162da7c1fd07b391b58e8a2100e1306eb7148056
 DIST palo-2.11.tar.gz 129144 BLAKE2B 25ea9462e7a87da333ace52be624aab65cc1fa4d20848bdec4ba1cea468b3ecd850dd7ceb936e9f2bd5761add766df65d054dc1b5d3f9cee991e9b3e4ddf864a SHA512 26e989ce0c652d6fafdc98d3ab3564d4adc5c943e3d44b0275beb8c385ad52cad0a29ad360e4992fb35c0f2036e29d3eee9b8f6594a53eaea9c3b973a60d9029
+DIST palo-2.12.tar.gz 124911 BLAKE2B 79fa572e118e77114dcb3b888abc65163bd56cb44cf69cd25bcaa33a7c6151b8254bf00c459ad17ca1d948f9b440378133f048e2add123a757908c108b802703 SHA512 6ea20490b84bf18a1d1e8037de453f5f480cba8403b267d4d63fceceffb39e18545c6d20c8dd7b07044ff5567eedd2c58b2a626971b53d1d35c5b3a4e8fefbf0
 EBUILD palo-2.00.ebuild 882 BLAKE2B 1dd41909eccd63f451b5e244d5cb6aef7ea70b51a2a59c70f2fda1e260ce103d43326c551efc703efccebd2fd7507d913ecbed06a18a0924fb4a9db003f7a449 SHA512 d58a792304194d3d8a5ff652292f3a4d990ea058c9f1b9b50063620fe1b686e8abc23a4e30c378f6db87622ed4b31e7c04b21837a562c68d3f832ccd9b7edd93
 EBUILD palo-2.11.ebuild 860 BLAKE2B e3f78d1c29436f352f5b82ee77ab8df66e62090e737a4aac8448529de724788b316877028c032c8dfb5cab0a844a6759c28f7042889891a296fbaefbf77f9975 SHA512 9b9b7d6a95b32375387f199cc4b92bed2ffc5a01053a06d33b2d2dd774795c325a634a4fd3ef9fffe008f5e8269a639d2b31be41a335e572588b8089a40cd0b4
+EBUILD palo-2.12.ebuild 860 BLAKE2B e3f78d1c29436f352f5b82ee77ab8df66e62090e737a4aac8448529de724788b316877028c032c8dfb5cab0a844a6759c28f7042889891a296fbaefbf77f9975 SHA512 9b9b7d6a95b32375387f199cc4b92bed2ffc5a01053a06d33b2d2dd774795c325a634a4fd3ef9fffe008f5e8269a639d2b31be41a335e572588b8089a40cd0b4
 EBUILD palo-9999.ebuild 947 BLAKE2B 16b35ad0d3a63090cafe43747ccdefb093dade8a9c645bd7d8b1da7c3e9a211694983cc98692926ec08db7abd1cc1f851f87d58445b82baeddbd4458ae91bfc5 SHA512 640752c59c52830fe9b7ec464cc07fbcd7642eeb21aeb923f93d16df241ff0aa9ffc5d6de5719ca0c21ef263dc927036bfc728cd72832fe5900ba99a0350c88c
 MISC metadata.xml 318 BLAKE2B 0d17e33c45886d0c0e03044b5b2513d44c1bb4a28d758a8575929536e866419328c68971ba3f324a5677ff68bf37b38a22645e4b02810a118b5f18026d0476c4 SHA512 7ff12a5eb42ac39840f8c9eb78b24aeecd9cbfe780d11eccd75fd6f02b11f4abafd514bc32f47f727047b069e446e9252914dcaf5c33d6f1054981a3c175fdef
diff --git a/sys-boot/palo/palo-2.12.ebuild b/sys-boot/palo/palo-2.12.ebuild
new file mode 100644
index 000000000000..cf05c9a92a79
--- /dev/null
+++ b/sys-boot/palo/palo-2.12.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="PALO : PArisc Linux Loader"
+HOMEPAGE="http://parisc-linux.org/ https://parisc.wiki.kernel.org/"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/${PN}.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~hppa"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.00-toolchain.patch
+)
+
+src_compile() {
+	local target
+	for target in '-C palo' '-C ipl' 'iplboot'; do
+		emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) ${target}
+	done
+}
+
+src_install() {
+	into /
+	dosbin palo/palo
+
+	insinto /usr/share/palo
+	doins iplboot
+
+	insinto /etc
+	doins "${FILESDIR}"/palo.conf
+
+	insinto /etc/kernel/postinst.d
+	insopts -m 0744
+	doins "${FILESDIR}"/99palo
+
+	doman palo.8
+
+	dodoc TODO debian/changelog README.html
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index ba65a16bc8b7..334ce269c53f 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 90c40c9ee423..c3924bd95b5f 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -21,15 +21,15 @@ AUX ceph-13.2.2-dont-install-sysvinit-script.patch 471 BLAKE2B 85ef94f4940849636
 AUX ceph-13.2.5-no-automagic-deps.patch 1056 BLAKE2B dbae76e4be1ca690ff59c0b905ef63b9fbcddcb25d181af2a514113f4bfd5028a8b5bce98c965d195ae69f8532731b2e9d9002f01bb91ccfcde5a29eb43b8f41 SHA512 60616eaaadbf4431769bc2e192718ee28842efc818ee561af1c2c7a5269e393efeb455260c36582d3265730d482a92fb911b4c501e486a3a6387ab4a10d1589d
 AUX ceph-13.2.6-dpdk-alignment.patch 612 BLAKE2B 7f75b53383979d5790862c91ff67b41c16d94e6572c9c387ae511401d22562493bddb296f47bef60ebf586683df36b5b62744ac30d43b1c4eede053d6ae4438a SHA512 058bf0a564a158356e5a87099ea8d1372123eeee8bfdb3c25870911dccc351f33e00793456c5c04f670946559cd49bc6a8cab5553dc99bebb570910b4a787d58
 AUX ceph-13.2.6-no-virtualenvs.patch 4137 BLAKE2B 9cef3ed31ec0ab2d13091b0b76071532ffd021a5627fa91808bb7eff382a4b29945eaa6bc529e8ee3176056caf9f62af0fb4b4210d2549bbc05f018fd4ecd75c SHA512 051c80c70a951135e2a00f6688ff03f604f89c65be47c4e00e2f72ee1a071be067cc8a7a60fd4ef78587a6b79b2b26d52d5dc3efbdcf0e11d4e3e1156483b03e
-AUX ceph-14.2.0-boost-1.70-sonames.patch 13703 BLAKE2B a619a07217895ae34a84c145930d9b477cc557d5088d1fb915f0427556330a24cb4385e953facf7cb2dcf99c1245bd25d2ebe25db56dec40648ad065bce7e873 SHA512 69f82d5f10b1237c17428b11e746422fcd0e1be735500032892d834361e636a23135cb7e6f537cbd808b74378325c24132a88f256abcce40ec1bdfe212b7648c
-AUX ceph-14.2.0-boost-1.70.patch 5556 BLAKE2B 7610a48c30fe5cf8462f498501a36c17c33289967e7d50456d6b8e6c467db89b768f73bb6e69ecd4c6dec0432d4fbb47af339f02eb510ba69770b9b122b41dbf SHA512 71ee1d583f71b2c52fee40e5105d1ff1d4b676230eac7c19f42754316c3958808304155a48992f8766eded52d3e28007b631680dca8b4672153fa44b8eccbbb8
-AUX ceph-14.2.0-boost-sonames.patch 14155 BLAKE2B 766a3e40c8a4d94d1cc52a511f0d440178c199cb37b1d06a792fe627df4f01793d8555005054604397d02d9e366521b10788f6e56381a6d967814370e4298844 SHA512 91184e32d3ef28a43bc8e0d53b4f359c5b2177250b39bbcc7921e38d044ba54610713826bc64450a0b2232450f68e724d23757cc5c6d39e50855060e86890ed2
 AUX ceph-14.2.0-cflags.patch 545 BLAKE2B 0f5c4e509b2252de7a4b914b99fb4abe13010a1c21b2b701530f6a29dcd41924e3b81841cb65b7b949af42b168ce9fe756b0551c31babf9c9498d394b2ea6aa8 SHA512 9e6bb46d5bbdc5d93f4f026b2a8d6bdb692d9ea6e7018c1bb0188d95ea8574c76238d968b340fd67ddaa3d8183b310e393e3549dc3a63a795fde696413b0ca94
 AUX ceph-14.2.0-cython-0.29.patch 946 BLAKE2B c251b6a171e5e0bab3f8716b79eb3138a177c1f39e7cf433ba52d03d73de4b45abc2db6742237c8044519337297025cf577d210ace81457ff05325073aa5bb43 SHA512 82c1608928ee669ef60b8930ce82c443152c446e669e7bde9ce32f78571afb19a9620c3818b69ac8cb3ea33e7d7ac40f77c89162c71b19b157336d907fa23e3d
 AUX ceph-14.2.0-dpdk-cflags.patch 1171 BLAKE2B a6815317d3828cee8d2476d6cc77b60d089db5b5ab0b30fd24c0ac10270ce930ce3049f1b22af71e5b39a6e323c672245fb78753e7ed901055afac8371cbcb9f SHA512 ece01fcaf0b82c441618eea1f37fc2658aa356de1128121d368769fdbf6316b226ea15a781353b115c0a81921c8872bb3d003ecbb1e8f1b456bb8cf6db8f091e
 AUX ceph-14.2.0-link-crc32-statically.patch 428 BLAKE2B d324855dab736eeecf5835e79c4f2fad9ea4d10aa29b2b03ab6274efa2f54a5cfdad710552662a49d5f61466e1cd9d6c2fc8a42373961e3334f39b806e647feb SHA512 3efe70f826ebc207f1ce8744483c9a82ebbf8f3cfa81c9cbb3152b40f5b540cc9cc21e6bd3370197bee9a27a01c3e3725754d044069bb760c3dbfbc97fe4276d
 AUX ceph-14.2.0-mgr-python-version.patch 685 BLAKE2B fbd36e0f5fe45be7cc58cf11b2b83613c2f7f7fdfd64d4f04729c36e5ebc110341aa4c5521d9be590bfb7a7812525130e773a346827461df0a108fbde359b161 SHA512 af0851913cf8b42bad71ece4e41017f71e91db19aeeebb5ea0306055d6d6d9e7eb9ba34224bb2583ca437d44827de8852727e8a9dd809d942d4c277ec3da3214
 AUX ceph-14.2.0-no-virtualenvs.patch 2349 BLAKE2B a012ab044f92c2a22c8f04661d2210585dbacb531ece528cc3d8d026ba692f46d1306b920826d02b93317de24c325542ac222a4e2b42684aa44f5c12019e2a29 SHA512 623eacb30565725768b80e56e876cef6f52c07b63d8a0f0cc9b16d82677014636f1fdffbf7ca77b21d6465fc84b7fa429153b5c51e6202c85b1fdd6c5ae96a38
+AUX ceph-14.2.3-boost-1.6-python-sonames.patch 987 BLAKE2B c70ee9689cbe2f7b3ad437285d9ab58a029ef35ea1a9f4a34891a32f3ac21068d28e0bbedcdefeee7f1748566e2133ce8c2c79eaf2a74b416a53c9cee4f3a7b9 SHA512 f8596e0c22270e771ae24498ea959e4d0079433198950fba05e172bdb6caa6ece75515f2fefc8aebc93cfd1b0a8ac087bf917bd99f6dd486fe855ba81a448c53
+AUX ceph-14.2.3-boost-1.70.patch 3591 BLAKE2B 12a947de968155cc9b73299757acb04f1588e988658f40b5bb6ef781d273a280543fd78a37cd5565599fe1bc7c187f7beaaa63a103d4b9ba1e7f3981e1027c87 SHA512 1bff4165c44a26950de22b01221e791b6cffe32653eceab0e9f03d3ae893b0b1fdab5659d5742335aa1fb519e34d2d841984ed8c844e8b8f1db8bc78bbed2472
+AUX ceph-14.2.3-boost-sonames.patch 13701 BLAKE2B 7d8fa01f56922770190d7cada4cd5404e1584cf8afc2a84aae9d0031e66d778af6e9b2072e405982ca652229b86169f5cdefcd7fe321a1626f9bec5ca014c54e SHA512 c6e7497a427c0ca10b4aa006020467e9ae6c2fb167f500d72d92adc953490a1f7062bbc2dcdeee61a6ab251fa3a27ddd6c64b190bb88e7993df1fd4084d39882
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
@@ -50,11 +50,11 @@ DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7
 DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac
 DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8
 DIST ceph-13.2.6.tar.gz 90808224 BLAKE2B cd7b4f4838eafc9dd580102cbb5247b86a153f90127f81355b556f32dbbacd2d7fb0144d15f99869a318a7148d2f50a9f995eb05aee056d7a5843830ede5702c SHA512 1e9c08d16b14447bf6b8bb72144e053aa9d5cf390bb4a6e878869e38895d3698073502fe9c4f8b775a3da872b920444bd01260105d3a839e53cf90cd27c6ab9c
-DIST ceph-14.2.2.tar.gz 117536881 BLAKE2B 2926c3d6fde5e9540d4e797dabf61451ce78e5d2f8d382d192fd8c1759620075860ab0cea7512330f2965d11e4b37a0ecce4fa11d9c5d256ecc884fa5f604922 SHA512 1ce61fb75e331cca39aaa8c0498bbb3cb874edb22ea45a4c2d82171b5e0c7c4ab2b081674b77177d5e612a0efdfa01de10a4becc4a7ee0eed1b2b3d358a72dc1
+DIST ceph-14.2.3.tar.gz 118349530 BLAKE2B db73d6adeca84426eee1b47a8ee68c4f94ee7a61e60ef1127153d19e02472a658877ebb7adfad5b4725d2c8c38855636bad1c44e79a3d3c397b56f74bf4b53fa SHA512 3d02e766a1d53d39355ee88738dd0233dc02f8a3cb44935194cb538b888507de8f8acdd99bf7890895f68795a310f53e2a8652305d5f2be5212efbd9046bd3a9
 EBUILD ceph-12.2.11.ebuild 8025 BLAKE2B 0b7a0acd31afef011b05907332ecafd8ca72fe6d90244bcdfd879eb1b554a6293349b16638ad151052048019863ede89da0aa5024a6561c9016fab15f24f1778 SHA512 b6d0203fb1aec6ba62a2d7db6ee62794efab5389f4ac9a86cb4ad796f6f81985f8d8e107d55abfdc669a6beb55ecaeaa2e71d4283f3d93ee135803bc2d17293f
 EBUILD ceph-12.2.12-r2.ebuild 8390 BLAKE2B dbbf53017559230bfc03f4cf267e325e5c2c112657ced392c9ce93653fe796d2793b198150f24e8217c5b8c8a1fde750cb1ffa16cde2d5c990cd77e69001bfd8 SHA512 48e7f521c584aba6373f5e63c5769671cd016f0726fb30233b57c8a1598b01570fcee9765c3a58a6bdbdd92fe5c3bd8bf4e16aca340a47986c546624fb5c20d5
 EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B e99590739ce73d96895c282108d3b945bb0e13bdb73e34b06d2da5c9e7d74dc4fdceddfb6330a106b775c612c7cca6b67325b83389f1c6d5af712e59a6f1fd55 SHA512 ab8d2a1ee7c4a7d7179f81e18dc601a18da365663351d88cf6dfee32e2aaaf40412bc2fde98d7c07012f79f8b6c19bac773ef97b872a32b663748ce41a5954c1
 EBUILD ceph-13.2.5-r4.ebuild 9007 BLAKE2B fc84d7fee8572582743979cd3da76cdd337667843410f8efb167ec80442d006b6d4c1c947ffeeb9c6265c47116a6cf15a012f4277c619cb55ad942b0e95f6cdb SHA512 eec2780a80d98b3a535a33c86efaae4112605b8c6e220b61beb9956ece895a8807024fe71f86b626c89b3ca8af3b94a4c0e990c47e9951cc31490a90c1841ff3
 EBUILD ceph-13.2.6.ebuild 9133 BLAKE2B d5990d637edaa460b90eadc0b97c8952b2e7688c4916f0978bb15e9c2b99c206f3be5c2f57ded889393e5ba32fa63bf08a89138ea96a7045b6a47a3cd59d0381 SHA512 7a510c208b8b15fe124aafba24d25c0f181bc2ff61710d274e59c383f5d0a27ef83fbbd6b19e1020953887a0a4221769d88e8f75e720d0af3fa93ba5d9c50792
-EBUILD ceph-14.2.2.ebuild 10064 BLAKE2B 541bfe6eab26c3d8fa2a9dd64ac6287252eace7d2648d3395431956cf79687740eb3c11f6af5f0cbfc484a789b16d0e2b019289f88981ec013f9160a71687648 SHA512 4879ef1d46d9e152f8199fa7811d6341f7e7dcdc1a9904b5cda4129319ca89104141a93b82b227fb548753fbe889791e46c065349c0c71b1c9fc76a53a866c2f
+EBUILD ceph-14.2.3.ebuild 9770 BLAKE2B 8827e1e4d8c734942599b393ec9625c378c81a4532e640860419067feb7b687f04ec8a7d5852e30bfac90c4baa26a37245aaf19a576f956cd70201195751edd3 SHA512 84e76634c608fad0488ca3992c91915eb8108f93b7f7211e1eb8cd6dbfbc99c486dec4ef88015a2b6cb51ac19760aa8695e12adc2e3603c3a9555b8dc60b1494
 MISC metadata.xml 1588 BLAKE2B c3a1f7afa0e61fc589e60ec00bc1702a6f953bbbbc1ab6a8582fe08bad9f6af9217350641399bc7de4dfb69a79ee0e41b46d971eef53348f3b568c6dcd439273 SHA512 ac2196349f897b7dfafaa924cda3f4eb094233bd04e7949b9f8fafd135775202c3c1bdc11cc4a931e752fb40b9d1c86524cdd849a23d364e4f2aa240bbdf1250
diff --git a/sys-cluster/ceph/ceph-14.2.2.ebuild b/sys-cluster/ceph/ceph-14.2.2.ebuild
deleted file mode 100644
index 0f25b21d3b71..000000000000
--- a/sys-cluster/ceph/ceph-14.2.2.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
-		multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \
-		systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl"
-IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost"
-IUSE+=" systemd +tcmalloc test xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-COMMON_DEPEND="
-	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs?]
-	app-arch/zstd:=[static-libs?]
-	app-misc/jq:=[static-libs?]
-	dev-libs/crypto++:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	dev-libs/nss:=
-	sys-auth/oath-toolkit:=
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
-	sys-libs/ncurses:0=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
-	lttng? ( dev-util/lttng-ust:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	kerberos? ( virtual/krb5 )
-	rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:=[static-libs?] )
-		libressl? ( dev-libs/libressl:=[static-libs?] )
-	)
-	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
-	radosgw? (
-		dev-libs/expat:=[static-libs?]
-		!libressl? (
-			dev-libs/openssl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_openssl,static-libs?]
-		)
-		libressl? (
-			dev-libs/libressl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_libressl,static-libs?]
-		)
-	)
-	system-boost? (
-		|| (
-			~dev-libs/boost-1.70.0[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-			~dev-libs/boost-1.67.0[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-		)
-		dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/cunit
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)
-	"
-BDEPEND="	app-arch/cpio
-	>=dev-util/cmake-3.5.0
-	dev-util/gperf
-	dev-util/valgrind
-	sys-apps/which
-	sys-devel/bc
-	virtual/pkgconfig
-	"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lvm2[-device-mapper-only(-)]
-	!<sys-apps/openrc-0.26.3
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python3*') )
-	?? ( jemalloc tcmalloc )
-	rabbitmq? ( radosgw )
-	"
-
-# the tests need root access
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-14.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-13.2.0-cflags.patch"
-	"${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
-	"${FILESDIR}/ceph-14.2.0-no-virtualenvs.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
-	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
-	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-)
-
-# dpdk and ninja don't get along
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-check-reqs_export_vars() {
-	if use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="460M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
-	enewgroup ceph ${CEPH_GID}
-	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-
-	if use system-boost && has_version '~dev-libs/boost-1.70.0'; then
-		ewarn "Building with boost-1.70 is experimental, and may cause runtime"
-		ewarn "failures. Disable the system-boost USE flag to use bundled boost"
-		ewarn "if you want an upstream supported configuration."
-	fi
-}
-
-pkg_setup() {
-	python_setup 'python3*'
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-boost; then
-		if has_version '~dev-libs/boost-1.70.0'; then
-			eapply "${FILESDIR}/ceph-14.2.0-boost-1.70-sonames.patch" \
-				"${FILESDIR}/ceph-14.2.0-boost-1.70.patch"
-		else
-			eapply "${FILESDIR}/ceph-14.2.0-boost-sonames.patch"
-		fi
-	fi
-
-	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		src/bash_completion/CMakeLists.txt || die
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t || die
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi)
-		-DWITH_DPDK=$(usex dpdk)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_GSSAPI=$(usex kerberos)
-		-DWITH_GRAFANA=$(usex grafana)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND=NO
-		-DWITH_NUMA=$(usex numa)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
-		-DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi)
-		-DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi)
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF')
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=no
-		-DWITH_TBB=no
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		#-Wno-dev
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
-		|| die "failed to remove cmake cache"
-
-	cmake-utils_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${S}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 clean
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake-utils_src_make VERBOSE=1 all
-
-	# we have to do this here to prevent from building everything multiple times
-	python_copy_sources
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${ED}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_foreach_impl python_install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python3*'
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
-		"${ED}"/usr/sbin/{mount.*,ceph-volume{,-systemd}} || die "sed failed"
-
-	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
-	dostrip -x "${rados_classes[@]#${ED}}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-14.2.3.ebuild b/sys-cluster/ceph/ceph-14.2.3.ebuild
new file mode 100644
index 000000000000..f440a49160c9
--- /dev/null
+++ b/sys-cluster/ceph/ceph-14.2.3.ebuild
@@ -0,0 +1,355 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
+		multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \
+		systemd
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl"
+IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost"
+IUSE+=" systemd +tcmalloc test xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+COMMON_DEPEND="
+	virtual/libudev:=
+	app-arch/bzip2:=[static-libs?]
+	app-arch/lz4:=[static-libs?]
+	app-arch/snappy:=[static-libs?]
+	app-arch/zstd:=[static-libs?]
+	app-misc/jq:=[static-libs?]
+	dev-libs/crypto++:=[static-libs?]
+	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
+	dev-libs/libaio:=[static-libs?]
+	dev-libs/libxml2:=[static-libs?]
+	dev-libs/nss:=
+	sys-auth/oath-toolkit:=
+	sys-apps/keyutils:=[static-libs?]
+	sys-apps/util-linux:=[static-libs?]
+	sys-libs/ncurses:0=[static-libs?]
+	sys-libs/zlib:=[static-libs?]
+	babeltrace? ( dev-util/babeltrace )
+	ldap? ( net-nds/openldap:=[static-libs?] )
+	lttng? ( dev-util/lttng-ust:= )
+	fuse? ( sys-fs/fuse:0=[static-libs?] )
+	kerberos? ( virtual/krb5 )
+	rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:=[static-libs?] )
+		libressl? ( dev-libs/libressl:=[static-libs?] )
+	)
+	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
+	zfs? ( sys-fs/zfs:=[static-libs?] )
+	radosgw? (
+		dev-libs/expat:=[static-libs?]
+		!libressl? (
+			dev-libs/openssl:=[static-libs?]
+			net-misc/curl:=[curl_ssl_openssl,static-libs?]
+		)
+		libressl? (
+			dev-libs/libressl:=[static-libs?]
+			net-misc/curl:=[curl_ssl_libressl,static-libs?]
+		)
+	)
+	system-boost? (
+		|| (
+			~dev-libs/boost-1.70.0[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+			~dev-libs/boost-1.67.0[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+		)
+		dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+	)
+	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
+	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
+	${PYTHON_DEPS}
+	"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/cunit
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+	"
+BDEPEND="	app-arch/cpio
+	>=dev-util/cmake-3.5.0
+	dev-util/gperf
+	dev-util/valgrind
+	sys-apps/which
+	sys-devel/bc
+	virtual/pkgconfig
+	"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lvm2[-device-mapper-only(-)]
+	!<sys-apps/openrc-0.26.3
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python3*') )
+	?? ( jemalloc tcmalloc )
+	rabbitmq? ( radosgw )
+	"
+
+# the tests need root access
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI="no"
+
+UNBUNDLE_LIBS=(
+	src/erasure-code/jerasure/jerasure
+	src/erasure-code/jerasure/gf-complete
+)
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-14.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-13.2.0-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
+	"${FILESDIR}/ceph-14.2.0-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
+	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
+	"${FILESDIR}/ceph-14.2.3-boost-1.70.patch"
+)
+
+# dpdk and ninja don't get along
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+check-reqs_export_vars() {
+	if use amd64; then
+		CHECKREQS_DISK_BUILD="12G"
+		CHECKREQS_DISK_USR="460M"
+	else
+		CHECKREQS_DISK_BUILD="1400M"
+		CHECKREQS_DISK_USR="450M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+user_setup() {
+	enewgroup ceph ${CEPH_GID}
+	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup 'python3*'
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+	user_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use system-boost; then
+		eapply "${FILESDIR}/ceph-14.2.3-boost-sonames.patch"
+
+		has_version '>=dev-libs/boost-1.70.0' || \
+			eapply "${FILESDIR}/ceph-14.2.3-boost-1.6-python-sonames.patch"
+	fi
+
+	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		src/bash_completion/CMakeLists.txt || die
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+}
+
+ceph_src_configure() {
+	local flag
+	local mycmakeargs=(
+		-DWITH_BABELTRACE=$(usex babeltrace)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi)
+		-DWITH_DPDK=$(usex dpdk)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_GSSAPI=$(usex kerberos)
+		-DWITH_GRAFANA=$(usex grafana)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND=NO
+		-DWITH_NUMA=$(usex numa)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
+		-DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi)
+		-DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi)
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF')
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_RDMA=no
+		-DWITH_TBB=no
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		#-Wno-dev
+	)
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+		done
+	fi
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
+		|| die "failed to remove cmake cache"
+
+	cmake-utils_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${S}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	ceph_src_configure
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	emake VERBOSE=1 clean
+	emake VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_compile() {
+	cmake-utils_src_make VERBOSE=1 all
+
+	# we have to do this here to prevent from building everything multiple times
+	python_copy_sources
+	python_foreach_impl python_compile
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${ED}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_foreach_impl python_install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+			"ceph-mds@.service"
+
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+			"ceph-osd@.service"
+	fi
+
+	udev_dorules udev/*.rules
+
+	readme.gentoo_create_doc
+
+	python_setup 'python3*'
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
+		"${ED}"/usr/sbin/{mount.*,ceph-volume{,-systemd}} || die "sed failed"
+
+	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${ED}}"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch
deleted file mode 100644
index 6d7120037424..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
-index bfab4ca436..90ed0cbb17 100644
---- a/cmake/modules/FindBoost.cmake
-+++ b/cmake/modules/FindBoost.cmake
-@@ -1181,10 +1181,10 @@ endif()
- # on all platforms to keep end user code free from platform dependent
- # code.  Also provide convenience targets to disable autolinking and
- # enable dynamic linking.
--if(NOT TARGET Boost::diagnostic_definitions)
--  add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)
--  add_library(Boost::disable_autolinking INTERFACE IMPORTED)
--  add_library(Boost::dynamic_linking INTERFACE IMPORTED)
-+if(NOT TARGET boost_diagnostic_definitions)
-+  add_library(boost_diagnostic_definitions INTERFACE IMPORTED)
-+  add_library(boost_disable_autolinking INTERFACE IMPORTED)
-+  add_library(boost_dynamic_linking INTERFACE IMPORTED)
- endif()
- if(WIN32)
-   # In windows, automatic linking is performed, so you do not have
-@@ -1205,11 +1205,11 @@ if(WIN32)
-   # code to emit a #pragma message each time a library is selected
-   # for linking.
-   set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
--  set_target_properties(Boost::diagnostic_definitions PROPERTIES
-+  set_target_properties(boost_diagnostic_definitions PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC")
--  set_target_properties(Boost::disable_autolinking PROPERTIES
-+  set_target_properties(boost_disable_autolinking PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
--  set_target_properties(Boost::dynamic_linking PROPERTIES
-+  set_target_properties(boost_dynamic_linking PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")
- endif()
- 
-@@ -2018,52 +2018,52 @@ if(Boost_FOUND)
-   endif()
- 
-   foreach(COMPONENT ${Boost_FIND_COMPONENTS})
--    if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT})
-+    if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT})
-       string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-       if(Boost_${UPPERCOMPONENT}_FOUND)
-         if(Boost_USE_STATIC_LIBS)
--          add_library(Boost::${COMPONENT} STATIC IMPORTED)
-+          add_library(boost_${COMPONENT} STATIC IMPORTED)
-         else()
-           # Even if Boost_USE_STATIC_LIBS is OFF, we might have static
-           # libraries as a result.
--          add_library(Boost::${COMPONENT} UNKNOWN IMPORTED)
-+          add_library(boost_${COMPONENT} UNKNOWN IMPORTED)
-         endif()
-         if(Boost_INCLUDE_DIRS)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}")
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-             IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
--          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+          set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
-             IMPORTED_CONFIGURATIONS RELEASE)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
-             IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
--          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+          set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
-             IMPORTED_CONFIGURATIONS DEBUG)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
-             IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
-         endif()
-         if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES)
-           unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
-           foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
--            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep})
-+            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep})
-           endforeach()
-           if(COMPONENT STREQUAL "thread")
-             list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads)
-           endif()
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}")
-         endif()
-         if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}")
-         endif()
-       endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1b1f19d464..21c222280f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -353,12 +353,12 @@ set(ceph_common_objs
- set(ceph_common_deps
-   json_spirit erasure_code arch crc32
-   ${LIB_RESOLV}
--  Boost::thread
--  Boost::system
--  Boost::random
--  Boost::program_options
--  Boost::date_time
--  Boost::iostreams
-+  boost_thread
-+  boost_system
-+  boost_random
-+  boost_program_options
-+  boost_date_time
-+  boost_iostreams
-   ${BLKID_LIBRARIES}
-   ${Backtrace_LIBRARIES}
-   ${BLKIN_LIBRARIES}
-@@ -518,7 +518,7 @@ if (WITH_CEPHFS)
-     ceph_mds.cc)
-   add_executable(ceph-mds ${ceph_mds_srcs})
-   target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
--    Boost::thread)
-+    boost_thread)
-   install(TARGETS ceph-mds DESTINATION bin)
- endif()
- 
-diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
-index d7b58521d4..e1533af33f 100644
---- a/src/crimson/CMakeLists.txt
-+++ b/src/crimson/CMakeLists.txt
-@@ -106,8 +106,8 @@ target_link_libraries(crimson-common
-   PRIVATE
-     crc32
-     crimson::cflags
--    Boost::iostreams
--    Boost::random
-+    boost_iostreams
-+    boost_random
-     ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto)
- 
- set(crimson_auth_srcs
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
-index 252fb3e5e3..213482da16 100644
---- a/src/mgr/CMakeLists.txt
-+++ b/src/mgr/CMakeLists.txt
-@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
- target_link_libraries(ceph-mgr
-   osdc client heap_profiler
-   global-static ceph-common
--  Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-+  boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-   ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
- set_target_properties(ceph-mgr PROPERTIES
-   POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
-index e9d3804c5f..5c6eb58de1 100644
---- a/src/rbd_replay/CMakeLists.txt
-+++ b/src/rbd_replay/CMakeLists.txt
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
-     global
-     babeltrace
-     babeltrace-ctf
--    Boost::date_time
-+    boost_date_time
-     )
-   install(TARGETS rbd-replay-prep DESTINATION bin)
- endif(HAVE_BABELTRACE)
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
-index ccc4f74cfe..854aa6e5e9 100644
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -199,7 +199,7 @@ if(WITH_CURL_OPENSSL)
- endif()
- 
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context)
-+  target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context)
- endif()
- 
- set(rgw_libs rgw_a)
-@@ -341,7 +341,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
-   target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ)
- endif()
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context)
-+  target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context)
- endif()
- 
- if(WITH_TESTS)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index 20a64fd41b..a8bb323614 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -158,7 +158,7 @@ add_executable(ceph_omapbench
-   )
- target_link_libraries(ceph_omapbench
-   librados
--  Boost::program_options
-+  boost_program_options
-   global
-   ${BLKID_LIBRARIES}
-   ${CMAKE_DL_LIBS}
-diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
-index 71fb77cda9..aff8fb6565 100644
---- a/src/test/common/CMakeLists.txt
-+++ b/src/test/common/CMakeLists.txt
-@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject)
- 
- add_executable(unittest_async_completion test_async_completion.cc)
- add_ceph_unittest(unittest_async_completion)
--target_link_libraries(unittest_async_completion Boost::system)
-+target_link_libraries(unittest_async_completion boost_system)
- 
- add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc)
- add_ceph_unittest(unittest_async_shared_mutex)
--target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system)
-+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system)
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
-index 721f6c3675..1cd9635c77 100644
---- a/src/test/erasure-code/CMakeLists.txt
-+++ b/src/test/erasure-code/CMakeLists.txt
-@@ -2,15 +2,15 @@
- add_executable(ceph_erasure_code_benchmark 
-   ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
-   ceph_erasure_code_benchmark.cc)
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code_benchmark
-   DESTINATION bin)
- 
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- 
- add_executable(ceph_erasure_code ceph_erasure_code.cc)
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code
-   DESTINATION bin)
- 
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
-index 4fc53d2406..e6304394f8 100644
---- a/src/test/librados/CMakeLists.txt
-+++ b/src/test/librados/CMakeLists.txt
-@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc)
- target_link_libraries(ceph_test_rados_api_asio global
-   librados ${UNITTEST_LIBS})
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
-+  target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
- endif()
- 
- add_executable(ceph_test_rados_api_list
-@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp
-   tier_cxx.cc
-   $<TARGET_OBJECTS:unit-main>)
- target_link_libraries(ceph_test_rados_api_tier_pp
--  librados global ${UNITTEST_LIBS} Boost::system radostest-cxx)
-+  librados global ${UNITTEST_LIBS} boost_system radostest-cxx)
- 
- add_executable(ceph_test_rados_api_snapshots
-   snapshots.cc)
-diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
-index 2bf6723c40..e99b8afa11 100644
---- a/src/test/librbd/CMakeLists.txt
-+++ b/src/test/librbd/CMakeLists.txt
-@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE
-   radostest
-   radostest-cxx
-   librados
--  Boost::thread
-+  boost_thread
-   GMock::GMock
-   GTest::GTest)
- 
-diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
-index 9b2c6b6321..80e4cb7829 100644
---- a/src/test/rgw/CMakeLists.txt
-+++ b/src/test/rgw/CMakeLists.txt
-@@ -143,7 +143,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
- target_link_libraries(unittest_rgw_dmclock_scheduler ${rgw_libs} dmclock)
- if(WITH_BOOST_CONTEXT)
-   target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
--  target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
-+  target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context)
- endif()
- 
- if(WITH_RADOSGW_AMQP_ENDPOINT)
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index d31f3d2408..6945018b11 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -35,20 +35,20 @@ install(PROGRAMS
- endif(WITH_TESTS)
- 
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
- 
- add_executable(ceph-monstore-tool
-   ceph_monstore_tool.cc
-   ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
- 
- add_executable(ceph-objectstore-tool
-   ceph_objectstore_tool.cc
-   rebuild_mondb.cc
-   RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
-   target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES})
- endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch b/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch
deleted file mode 100644
index ce2ee92b3d8e..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f97f96b5bf..f5e5d06d35 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -657,13 +657,13 @@ if(WITH_SYSTEM_BOOST)
-   if(BOOST_ROOT AND CMAKE_LIBRARY_ARCHITECTURE)
-     set(BOOST_LIBRARYDIR "${BOOST_ROOT}/lib/${CMAKE_LIBRARY_ARCHITECTURE}")
-   endif()
--  find_package(Boost 1.67 COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
-+  find_package(Boost 1.70 COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
- else()
-   set(BOOST_J 1 CACHE STRING
-     "max jobs for Boost build") # override w/-DBOOST_J=<n>
-   set(Boost_USE_STATIC_LIBS ON)
-   include(BuildBoost)
--  build_boost(1.67
-+  build_boost(1.70
-     COMPONENTS ${BOOST_COMPONENTS} ${BOOST_HEADER_COMPONENTS})
- endif()
- include_directories(BEFORE SYSTEM ${Boost_INCLUDE_DIRS})
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index f46cc0d485..4254508570 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -137,14 +137,14 @@ function(do_build_boost version)
-     check_boost_version("${PROJECT_SOURCE_DIR}/src/boost" ${version})
-     set(source_dir
-       SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost")
--  elseif(version VERSION_GREATER 1.67)
-+  elseif(version VERSION_GREATER 1.70)
-     message(FATAL_ERROR "Unknown BOOST_REQUESTED_VERSION: ${version}")
-   else()
-     message(STATUS "boost will be downloaded...")
-     # NOTE: If you change this version number make sure the package is available
-     # at the three URLs below (may involve uploading to download.ceph.com)
--    set(boost_version 1.67.0)
--    set(boost_sha256 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba)
-+    set(boost_version 1.70.0)
-+    set(boost_sha256 430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778)
-     string(REPLACE "." "_" boost_version_underscore ${boost_version} )
-     set(boost_url
-       https://dl.bintray.com/boostorg/release/${boost_version}/source/boost_${boost_version_underscore}.tar.bz2)
-diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
-index e4be074ec7..4af3695dc1 100644
---- a/src/rgw/rgw_asio_frontend.cc
-+++ b/src/rgw/rgw_asio_frontend.cc
-@@ -81,7 +81,8 @@ class StreamIO : public rgw::asio::ClientIO {
- using SharedMutex = ceph::async::SharedMutex<boost::asio::io_context::executor_type>;
-
- template <typename Stream>
--void handle_connection(RGWProcessEnv& env, Stream& stream,
-+void handle_connection(boost::asio::io_context& context,
-+                       RGWProcessEnv& env, Stream& stream,
-                        boost::beast::flat_buffer& buffer, bool is_ssl,
-                        SharedMutex& pause_mutex,
-                        rgw::dmclock::Scheduler *scheduler,
-@@ -152,7 +153,7 @@ void handle_connection(RGWProcessEnv& env, Stream& stream,
-                                   rgw::io::add_conlen_controlling(
-                                     &real_client))));
-       RGWRestfulIO client(cct, &real_client_io);
--      auto y = optional_yield{socket.get_io_context(), yield};
-+      auto y = optional_yield{context, yield};
-       process_request(env.store, env.rest, &req, env.uri_prefix,
-                       *env.auth_registry, &client, env.olog, y, scheduler);
-     }
-@@ -560,7 +561,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
-           return;
-         }
-         buffer.consume(bytes);
--        handle_connection(env, stream, buffer, true, pause_mutex,
-+        handle_connection(context, env, stream, buffer, true, pause_mutex,
-                           scheduler.get(), ec, yield);
-         if (!ec) {
-           // ssl shutdown (ignoring errors)
-@@ -578,7 +579,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
-         auto c = connections.add(conn);
-         boost::beast::flat_buffer buffer;
-         boost::system::error_code ec;
--        handle_connection(env, s, buffer, false, pause_mutex,
-+        handle_connection(context, env, s, buffer, false, pause_mutex,
-                           scheduler.get(), ec, yield);
-         s.shutdown(tcp::socket::shutdown_both, ec);
-       });
-diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h
-index 70487a5253..1d454acd2e 100644
---- a/src/rgw/rgw_dmclock_async_scheduler.h
-+++ b/src/rgw/rgw_dmclock_async_scheduler.h
-@@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler {
-   using Completion = async::Completion<Signature, async::AsBase<Request>>;
-
-   using Clock = ceph::coarse_real_clock;
-+#if BOOST_VERSION < 107000
-   using Timer = boost::asio::basic_waitable_timer<Clock>;
-+#else
-+  using Timer = boost::asio::basic_waitable_timer<Clock,
-+        boost::asio::wait_traits<Clock>, executor_type>;
-+#endif
-   Timer timer; //< timer for the next scheduled request
-
-   CephContext *const cct;
-diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h
-index d99a6ff68d..213fc238d2 100644
---- a/src/rgw/rgw_reshard.h
-+++ b/src/rgw/rgw_reshard.h
-@@ -183,7 +183,14 @@ class RGWReshardWait {
-   ceph::condition_variable cond;
-
-   struct Waiter : boost::intrusive::list_base_hook<> {
--    boost::asio::basic_waitable_timer<Clock> timer;
-+#if BOOST_VERSION < 107000
-+    using Timer = boost::asio::basic_waitable_timer<Clock>;
-+#else
-+    using Executor = boost::asio::io_context::executor_type;
-+    using Timer = boost::asio::basic_waitable_timer<Clock,
-+          boost::asio::wait_traits<Clock>, Executor>;
-+#endif
-+    Timer timer;
-     explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {}
-   };
-   boost::intrusive::list<Waiter> waiters;
diff --git a/sys-cluster/ceph/files/ceph-14.2.0-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.0-boost-sonames.patch
deleted file mode 100644
index 497d59530511..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.0-boost-sonames.patch
+++ /dev/null
@@ -1,334 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dbabecbe97..d12b696bb5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -640,7 +640,7 @@ set(BOOST_HEADER_COMPONENTS container)
- 
- if(WITH_MGR)
-   list(APPEND BOOST_COMPONENTS
--    python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR})
-+    python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR})
- endif()
- if(WITH_BOOST_CONTEXT)
-   list(APPEND BOOST_COMPONENTS context coroutine)
-diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
-index bfab4ca436..90ed0cbb17 100644
---- a/cmake/modules/FindBoost.cmake
-+++ b/cmake/modules/FindBoost.cmake
-@@ -1181,10 +1181,10 @@ endif()
- # on all platforms to keep end user code free from platform dependent
- # code.  Also provide convenience targets to disable autolinking and
- # enable dynamic linking.
--if(NOT TARGET Boost::diagnostic_definitions)
--  add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)
--  add_library(Boost::disable_autolinking INTERFACE IMPORTED)
--  add_library(Boost::dynamic_linking INTERFACE IMPORTED)
-+if(NOT TARGET boost_diagnostic_definitions)
-+  add_library(boost_diagnostic_definitions INTERFACE IMPORTED)
-+  add_library(boost_disable_autolinking INTERFACE IMPORTED)
-+  add_library(boost_dynamic_linking INTERFACE IMPORTED)
- endif()
- if(WIN32)
-   # In windows, automatic linking is performed, so you do not have
-@@ -1205,11 +1205,11 @@ if(WIN32)
-   # code to emit a #pragma message each time a library is selected
-   # for linking.
-   set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
--  set_target_properties(Boost::diagnostic_definitions PROPERTIES
-+  set_target_properties(boost_diagnostic_definitions PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC")
--  set_target_properties(Boost::disable_autolinking PROPERTIES
-+  set_target_properties(boost_disable_autolinking PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
--  set_target_properties(Boost::dynamic_linking PROPERTIES
-+  set_target_properties(boost_dynamic_linking PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")
- endif()
- 
-@@ -2018,52 +2018,52 @@ if(Boost_FOUND)
-   endif()
- 
-   foreach(COMPONENT ${Boost_FIND_COMPONENTS})
--    if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT})
-+    if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT})
-       string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-       if(Boost_${UPPERCOMPONENT}_FOUND)
-         if(Boost_USE_STATIC_LIBS)
--          add_library(Boost::${COMPONENT} STATIC IMPORTED)
-+          add_library(boost_${COMPONENT} STATIC IMPORTED)
-         else()
-           # Even if Boost_USE_STATIC_LIBS is OFF, we might have static
-           # libraries as a result.
--          add_library(Boost::${COMPONENT} UNKNOWN IMPORTED)
-+          add_library(boost_${COMPONENT} UNKNOWN IMPORTED)
-         endif()
-         if(Boost_INCLUDE_DIRS)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}")
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-             IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
--          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+          set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
-             IMPORTED_CONFIGURATIONS RELEASE)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
-             IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
-         endif()
-         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
--          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+          set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
-             IMPORTED_CONFIGURATIONS DEBUG)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
-             IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
-         endif()
-         if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES)
-           unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
-           foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
--            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep})
-+            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep})
-           endforeach()
-           if(COMPONENT STREQUAL "thread")
-             list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads)
-           endif()
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}")
-         endif()
-         if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)
--          set_target_properties(Boost::${COMPONENT} PROPERTIES
-+          set_target_properties(boost_${COMPONENT} PROPERTIES
-             INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}")
-         endif()
-       endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1b1f19d464..21c222280f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -353,12 +353,12 @@ set(ceph_common_objs
- set(ceph_common_deps
-   json_spirit erasure_code arch crc32
-   ${LIB_RESOLV}
--  Boost::thread
--  Boost::system
--  Boost::random
--  Boost::program_options
--  Boost::date_time
--  Boost::iostreams
-+  boost_thread
-+  boost_system
-+  boost_random
-+  boost_program_options
-+  boost_date_time
-+  boost_iostreams
-   ${BLKID_LIBRARIES}
-   ${Backtrace_LIBRARIES}
-   ${BLKIN_LIBRARIES}
-@@ -518,7 +518,7 @@ if (WITH_CEPHFS)
-     ceph_mds.cc)
-   add_executable(ceph-mds ${ceph_mds_srcs})
-   target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
--    Boost::thread)
-+    boost_thread)
-   install(TARGETS ceph-mds DESTINATION bin)
- endif()
- 
-diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
-index d7b58521d4..e1533af33f 100644
---- a/src/crimson/CMakeLists.txt
-+++ b/src/crimson/CMakeLists.txt
-@@ -106,8 +106,8 @@ target_link_libraries(crimson-common
-   PRIVATE
-     crc32
-     crimson::cflags
--    Boost::iostreams
--    Boost::random
-+    boost_iostreams
-+    boost_random
-     ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto)
- 
- set(crimson_auth_srcs
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
-index 252fb3e5e3..3f3823a68e 100644
---- a/src/mgr/CMakeLists.txt
-+++ b/src/mgr/CMakeLists.txt
-@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
- target_link_libraries(ceph-mgr
-   osdc client heap_profiler
-   global-static ceph-common
--  Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-+  boost_python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR}
-   ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
- set_target_properties(ceph-mgr PROPERTIES
-   POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
-index e9d3804c5f..5c6eb58de1 100644
---- a/src/rbd_replay/CMakeLists.txt
-+++ b/src/rbd_replay/CMakeLists.txt
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
-     global
-     babeltrace
-     babeltrace-ctf
--    Boost::date_time
-+    boost_date_time
-     )
-   install(TARGETS rbd-replay-prep DESTINATION bin)
- endif(HAVE_BABELTRACE)
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
-index ccc4f74cfe..854aa6e5e9 100644
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -199,7 +199,7 @@ if(WITH_CURL_OPENSSL)
- endif()
- 
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context)
-+  target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context)
- endif()
- 
- set(rgw_libs rgw_a)
-@@ -341,7 +341,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
-   target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ)
- endif()
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context)
-+  target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context)
- endif()
- 
- if(WITH_TESTS)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index 20a64fd41b..a8bb323614 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -158,7 +158,7 @@ add_executable(ceph_omapbench
-   )
- target_link_libraries(ceph_omapbench
-   librados
--  Boost::program_options
-+  boost_program_options
-   global
-   ${BLKID_LIBRARIES}
-   ${CMAKE_DL_LIBS}
-diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
-index 71fb77cda9..aff8fb6565 100644
---- a/src/test/common/CMakeLists.txt
-+++ b/src/test/common/CMakeLists.txt
-@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject)
- 
- add_executable(unittest_async_completion test_async_completion.cc)
- add_ceph_unittest(unittest_async_completion)
--target_link_libraries(unittest_async_completion Boost::system)
-+target_link_libraries(unittest_async_completion boost_system)
- 
- add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc)
- add_ceph_unittest(unittest_async_shared_mutex)
--target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system)
-+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system)
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
-index 721f6c3675..1cd9635c77 100644
---- a/src/test/erasure-code/CMakeLists.txt
-+++ b/src/test/erasure-code/CMakeLists.txt
-@@ -2,15 +2,15 @@
- add_executable(ceph_erasure_code_benchmark 
-   ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
-   ceph_erasure_code_benchmark.cc)
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code_benchmark
-   DESTINATION bin)
- 
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- 
- add_executable(ceph_erasure_code ceph_erasure_code.cc)
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code
-   DESTINATION bin)
- 
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
-index 4fc53d2406..e6304394f8 100644
---- a/src/test/librados/CMakeLists.txt
-+++ b/src/test/librados/CMakeLists.txt
-@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc)
- target_link_libraries(ceph_test_rados_api_asio global
-   librados ${UNITTEST_LIBS})
- if(WITH_BOOST_CONTEXT)
--  target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
-+  target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
- endif()
- 
- add_executable(ceph_test_rados_api_list
-@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp
-   tier_cxx.cc
-   $<TARGET_OBJECTS:unit-main>)
- target_link_libraries(ceph_test_rados_api_tier_pp
--  librados global ${UNITTEST_LIBS} Boost::system radostest-cxx)
-+  librados global ${UNITTEST_LIBS} boost_system radostest-cxx)
- 
- add_executable(ceph_test_rados_api_snapshots
-   snapshots.cc)
-diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
-index 2bf6723c40..e99b8afa11 100644
---- a/src/test/librbd/CMakeLists.txt
-+++ b/src/test/librbd/CMakeLists.txt
-@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE
-   radostest
-   radostest-cxx
-   librados
--  Boost::thread
-+  boost_thread
-   GMock::GMock
-   GTest::GTest)
- 
-diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
-index 9b2c6b6321..80e4cb7829 100644
---- a/src/test/rgw/CMakeLists.txt
-+++ b/src/test/rgw/CMakeLists.txt
-@@ -143,7 +143,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
- target_link_libraries(unittest_rgw_dmclock_scheduler ${rgw_libs} dmclock)
- if(WITH_BOOST_CONTEXT)
-   target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
--  target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
-+  target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context)
- endif()
- 
- if(WITH_RADOSGW_AMQP_ENDPOINT)
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index d31f3d2408..6945018b11 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -35,20 +35,20 @@ install(PROGRAMS
- endif(WITH_TESTS)
- 
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
- 
- add_executable(ceph-monstore-tool
-   ceph_monstore_tool.cc
-   ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
- 
- add_executable(ceph-objectstore-tool
-   ceph_objectstore_tool.cc
-   rebuild_mondb.cc
-   RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
-   target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES})
- endif(WITH_FUSE)
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch
new file mode 100644
index 000000000000..860bd9624e89
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 05d1e61270..8b939b8af6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -640,7 +640,7 @@ set(BOOST_HEADER_COMPONENTS container)
+ 
+ if(WITH_MGR)
+   list(APPEND BOOST_COMPONENTS
+-    python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR})
++    python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR})
+ endif()
+ if(WITH_BOOST_CONTEXT)
+   list(APPEND BOOST_COMPONENTS context coroutine)
+diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
+index f46cc0d485..3cc6340b2c 100644
+--- a/cmake/modules/BuildBoost.cmake
++++ b/cmake/modules/BuildBoost.cmake
+@@ -205,7 +205,7 @@ macro(build_boost version)
+     endif()
+     add_dependencies(Boost::${c} Boost)
+     if(c MATCHES "^python")
+-      set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
++      set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
+     endif()
+     if(Boost_USE_STATIC_LIBS)
+       set(Boost_${upper_c}_LIBRARY
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch
new file mode 100644
index 000000000000..26cea1e394bc
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch
@@ -0,0 +1,78 @@
+diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
+index e4be074ec7..4af3695dc1 100644
+--- a/src/rgw/rgw_asio_frontend.cc
++++ b/src/rgw/rgw_asio_frontend.cc
+@@ -81,7 +81,8 @@ class StreamIO : public rgw::asio::ClientIO {
+ using SharedMutex = ceph::async::SharedMutex<boost::asio::io_context::executor_type>;
+
+ template <typename Stream>
+-void handle_connection(RGWProcessEnv& env, Stream& stream,
++void handle_connection(boost::asio::io_context& context,
++                       RGWProcessEnv& env, Stream& stream,
+                        boost::beast::flat_buffer& buffer, bool is_ssl,
+                        SharedMutex& pause_mutex,
+                        rgw::dmclock::Scheduler *scheduler,
+@@ -152,7 +153,7 @@ void handle_connection(RGWProcessEnv& env, Stream& stream,
+                                   rgw::io::add_conlen_controlling(
+                                     &real_client))));
+       RGWRestfulIO client(cct, &real_client_io);
+-      auto y = optional_yield{socket.get_io_context(), yield};
++      auto y = optional_yield{context, yield};
+       process_request(env.store, env.rest, &req, env.uri_prefix,
+                       *env.auth_registry, &client, env.olog, y, scheduler);
+     }
+@@ -560,7 +561,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
+           return;
+         }
+         buffer.consume(bytes);
+-        handle_connection(env, stream, buffer, true, pause_mutex,
++        handle_connection(context, env, stream, buffer, true, pause_mutex,
+                           scheduler.get(), ec, yield);
+         if (!ec) {
+           // ssl shutdown (ignoring errors)
+@@ -578,7 +579,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
+         auto c = connections.add(conn);
+         boost::beast::flat_buffer buffer;
+         boost::system::error_code ec;
+-        handle_connection(env, s, buffer, false, pause_mutex,
++        handle_connection(context, env, s, buffer, false, pause_mutex,
+                           scheduler.get(), ec, yield);
+         s.shutdown(tcp::socket::shutdown_both, ec);
+       });
+diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h
+index 70487a5253..1d454acd2e 100644
+--- a/src/rgw/rgw_dmclock_async_scheduler.h
++++ b/src/rgw/rgw_dmclock_async_scheduler.h
+@@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler {
+   using Completion = async::Completion<Signature, async::AsBase<Request>>;
+
+   using Clock = ceph::coarse_real_clock;
++#if BOOST_VERSION < 107000
+   using Timer = boost::asio::basic_waitable_timer<Clock>;
++#else
++  using Timer = boost::asio::basic_waitable_timer<Clock,
++        boost::asio::wait_traits<Clock>, executor_type>;
++#endif
+   Timer timer; //< timer for the next scheduled request
+
+   CephContext *const cct;
+diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h
+index d99a6ff68d..213fc238d2 100644
+--- a/src/rgw/rgw_reshard.h
++++ b/src/rgw/rgw_reshard.h
+@@ -183,7 +183,14 @@ class RGWReshardWait {
+   ceph::condition_variable cond;
+
+   struct Waiter : boost::intrusive::list_base_hook<> {
+-    boost::asio::basic_waitable_timer<Clock> timer;
++#if BOOST_VERSION < 107000
++    using Timer = boost::asio::basic_waitable_timer<Clock>;
++#else
++    using Executor = boost::asio::io_context::executor_type;
++    using Timer = boost::asio::basic_waitable_timer<Clock,
++          boost::asio::wait_traits<Clock>, Executor>;
++#endif
++    Timer timer;
+     explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {}
+   };
+   boost::intrusive::list<Waiter> waiters;
diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch
new file mode 100644
index 000000000000..92ca32f5c8e0
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch
@@ -0,0 +1,321 @@
+diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
+index dd08ba5e45..19d3b8ad37 100644
+--- a/cmake/modules/FindBoost.cmake
++++ b/cmake/modules/FindBoost.cmake
+@@ -1235,10 +1235,10 @@ endif()
+ # on all platforms to keep end user code free from platform dependent
+ # code.  Also provide convenience targets to disable autolinking and
+ # enable dynamic linking.
+-if(NOT TARGET Boost::diagnostic_definitions)
+-  add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)
+-  add_library(Boost::disable_autolinking INTERFACE IMPORTED)
+-  add_library(Boost::dynamic_linking INTERFACE IMPORTED)
++if(NOT TARGET boost_diagnostic_definitions)
++  add_library(boost_diagnostic_definitions INTERFACE IMPORTED)
++  add_library(boost_disable_autolinking INTERFACE IMPORTED)
++  add_library(boost_dynamic_linking INTERFACE IMPORTED)
+ endif()
+ if(WIN32)
+   # In windows, automatic linking is performed, so you do not have
+@@ -1259,11 +1259,11 @@ if(WIN32)
+   # code to emit a #pragma message each time a library is selected
+   # for linking.
+   set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
+-  set_target_properties(Boost::diagnostic_definitions PROPERTIES
++  set_target_properties(boost_diagnostic_definitions PROPERTIES
+     INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC")
+-  set_target_properties(Boost::disable_autolinking PROPERTIES
++  set_target_properties(boost_disable_autolinking PROPERTIES
+     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
+-  set_target_properties(Boost::dynamic_linking PROPERTIES
++  set_target_properties(boost_dynamic_linking PROPERTIES
+     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")
+ endif()
+ 
+@@ -2088,52 +2088,52 @@ if(Boost_FOUND)
+   endif()
+ 
+   foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+-    if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT})
++    if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT})
+       string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+       if(Boost_${UPPERCOMPONENT}_FOUND)
+         if(Boost_USE_STATIC_LIBS)
+-          add_library(Boost::${COMPONENT} STATIC IMPORTED)
++          add_library(boost_${COMPONENT} STATIC IMPORTED)
+         else()
+           # Even if Boost_USE_STATIC_LIBS is OFF, we might have static
+           # libraries as a result.
+-          add_library(Boost::${COMPONENT} UNKNOWN IMPORTED)
++          add_library(boost_${COMPONENT} UNKNOWN IMPORTED)
+         endif()
+         if(Boost_INCLUDE_DIRS)
+-          set_target_properties(Boost::${COMPONENT} PROPERTIES
++          set_target_properties(boost_${COMPONENT} PROPERTIES
+             INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
+         endif()
+         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}")
+-          set_target_properties(Boost::${COMPONENT} PROPERTIES
++          set_target_properties(boost_${COMPONENT} PROPERTIES
+             IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+             IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}")
+         endif()
+         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
+-          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
++          set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
+             IMPORTED_CONFIGURATIONS RELEASE)
+-          set_target_properties(Boost::${COMPONENT} PROPERTIES
++          set_target_properties(boost_${COMPONENT} PROPERTIES
+             IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
+             IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
+         endif()
+         if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
+-          set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
++          set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
+             IMPORTED_CONFIGURATIONS DEBUG)
+-          set_target_properties(Boost::${COMPONENT} PROPERTIES
++          set_target_properties(boost_${COMPONENT} PROPERTIES
+             IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
+             IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
+         endif()
+         if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES)
+           unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
+           foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
+-            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep})
++            list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep})
+           endforeach()
+           if(COMPONENT STREQUAL "thread")
+             list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads)
+           endif()
+-          set_target_properties(Boost::${COMPONENT} PROPERTIES
++          set_target_properties(boost_${COMPONENT} PROPERTIES
+             INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}")
+         endif()
+         if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)
+-          set_target_properties(Boost::${COMPONENT} PROPERTIES
++          set_target_properties(boost_${COMPONENT} PROPERTIES
+             INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}")
+         endif()
+       endif()
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4895e84df6..55814e3b96 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -356,12 +356,12 @@ set(ceph_common_objs
+ set(ceph_common_deps
+   json_spirit erasure_code arch crc32
+   ${LIB_RESOLV}
+-  Boost::thread
+-  Boost::system
+-  Boost::random
+-  Boost::program_options
+-  Boost::date_time
+-  Boost::iostreams
++  boost_thread
++  boost_system
++  boost_random
++  boost_program_options
++  boost_date_time
++  boost_iostreams
+   ${BLKID_LIBRARIES}
+   ${Backtrace_LIBRARIES}
+   ${BLKIN_LIBRARIES}
+@@ -522,7 +522,7 @@ if (WITH_CEPHFS)
+     ceph_mds.cc)
+   add_executable(ceph-mds ${ceph_mds_srcs})
+   target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
+-    Boost::thread)
++    boost_thread)
+   install(TARGETS ceph-mds DESTINATION bin)
+ endif()
+ 
+diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
+index d7b58521d4..e1533af33f 100644
+--- a/src/crimson/CMakeLists.txt
++++ b/src/crimson/CMakeLists.txt
+@@ -106,8 +106,8 @@ target_link_libraries(crimson-common
+   PRIVATE
+     crc32
+     crimson::cflags
+-    Boost::iostreams
+-    Boost::random
++    boost_iostreams
++    boost_random
+     ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto)
+ 
+ set(crimson_auth_srcs
+diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
+index 252fb3e5e3..213482da16 100644
+--- a/src/mgr/CMakeLists.txt
++++ b/src/mgr/CMakeLists.txt
+@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
+ target_link_libraries(ceph-mgr
+   osdc client heap_profiler
+   global-static ceph-common
+-  Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
++  boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
+   ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
+ set_target_properties(ceph-mgr PROPERTIES
+   POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
+diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
+index e9d3804c5f..5c6eb58de1 100644
+--- a/src/rbd_replay/CMakeLists.txt
++++ b/src/rbd_replay/CMakeLists.txt
+@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
+     global
+     babeltrace
+     babeltrace-ctf
+-    Boost::date_time
++    boost_date_time
+     )
+   install(TARGETS rbd-replay-prep DESTINATION bin)
+ endif(HAVE_BABELTRACE)
+diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
+index 8d5b0638a0..a147c55bc3 100644
+--- a/src/rgw/CMakeLists.txt
++++ b/src/rgw/CMakeLists.txt
+@@ -196,7 +196,7 @@ if(WITH_CURL_OPENSSL)
+ endif()
+ 
+ if(WITH_BOOST_CONTEXT)
+-  target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context)
++  target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context)
+ endif()
+ 
+ set(rgw_libs rgw_a)
+@@ -347,7 +347,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
+   target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ)
+ endif()
+ if(WITH_BOOST_CONTEXT)
+-  target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context)
++  target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context)
+ endif()
+ 
+ if(WITH_TESTS)
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index 5dcee1694d..60743be698 100644
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -159,7 +159,7 @@ add_executable(ceph_omapbench
+   )
+ target_link_libraries(ceph_omapbench
+   librados
+-  Boost::program_options
++  boost_program_options
+   global
+   ${BLKID_LIBRARIES}
+   ${CMAKE_DL_LIBS}
+diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
+index 71fb77cda9..aff8fb6565 100644
+--- a/src/test/common/CMakeLists.txt
++++ b/src/test/common/CMakeLists.txt
+@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject)
+ 
+ add_executable(unittest_async_completion test_async_completion.cc)
+ add_ceph_unittest(unittest_async_completion)
+-target_link_libraries(unittest_async_completion Boost::system)
++target_link_libraries(unittest_async_completion boost_system)
+ 
+ add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc)
+ add_ceph_unittest(unittest_async_shared_mutex)
+-target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system)
++target_link_libraries(unittest_async_shared_mutex ceph-common boost_system)
+diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
+index 721f6c3675..1cd9635c77 100644
+--- a/src/test/erasure-code/CMakeLists.txt
++++ b/src/test/erasure-code/CMakeLists.txt
+@@ -2,15 +2,15 @@
+ add_executable(ceph_erasure_code_benchmark 
+   ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
+   ceph_erasure_code_benchmark.cc)
+-target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
++target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
+ install(TARGETS ceph_erasure_code_benchmark
+   DESTINATION bin)
+ 
+ add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
+-target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
++target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
+ 
+ add_executable(ceph_erasure_code ceph_erasure_code.cc)
+-target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
++target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
+ install(TARGETS ceph_erasure_code
+   DESTINATION bin)
+ 
+diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
+index 4fc53d2406..e6304394f8 100644
+--- a/src/test/librados/CMakeLists.txt
++++ b/src/test/librados/CMakeLists.txt
+@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc)
+ target_link_libraries(ceph_test_rados_api_asio global
+   librados ${UNITTEST_LIBS})
+ if(WITH_BOOST_CONTEXT)
+-  target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
++  target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
+ endif()
+ 
+ add_executable(ceph_test_rados_api_list
+@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp
+   tier_cxx.cc
+   $<TARGET_OBJECTS:unit-main>)
+ target_link_libraries(ceph_test_rados_api_tier_pp
+-  librados global ${UNITTEST_LIBS} Boost::system radostest-cxx)
++  librados global ${UNITTEST_LIBS} boost_system radostest-cxx)
+ 
+ add_executable(ceph_test_rados_api_snapshots
+   snapshots.cc)
+diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
+index 3988e94bd3..b2a720b8a0 100644
+--- a/src/test/librbd/CMakeLists.txt
++++ b/src/test/librbd/CMakeLists.txt
+@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE
+   radostest
+   radostest-cxx
+   librados
+-  Boost::thread
++  boost_thread
+   GMock::GMock
+   GTest::GTest)
+ 
+diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
+index 36df883a66..43d3456089 100644
+--- a/src/test/rgw/CMakeLists.txt
++++ b/src/test/rgw/CMakeLists.txt
+@@ -144,7 +144,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
+ target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock)
+ if(WITH_BOOST_CONTEXT)
+   target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
+-  target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
++  target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context)
+ endif()
+ 
+ if(WITH_RADOSGW_AMQP_ENDPOINT)
+diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
+index d31f3d2408..6945018b11 100644
+--- a/src/tools/CMakeLists.txt
++++ b/src/tools/CMakeLists.txt
+@@ -35,20 +35,20 @@ install(PROGRAMS
+ endif(WITH_TESTS)
+ 
+ add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
+-target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
++target_link_libraries(ceph-osdomap-tool os global boost_program_options)
+ install(TARGETS ceph-osdomap-tool DESTINATION bin)
+ 
+ add_executable(ceph-monstore-tool
+   ceph_monstore_tool.cc
+   ../mgr/mgr_commands.cc)
+-target_link_libraries(ceph-monstore-tool os global Boost::program_options)
++target_link_libraries(ceph-monstore-tool os global boost_program_options)
+ install(TARGETS ceph-monstore-tool DESTINATION bin)
+ 
+ add_executable(ceph-objectstore-tool
+   ceph_objectstore_tool.cc
+   rebuild_mondb.cc
+   RadosDump.cc)
+-target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
++target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
+ if(WITH_FUSE)
+   target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES})
+ endif(WITH_FUSE)
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 7140b683890f..cd440570fe52 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,20 +1,16 @@
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
-DIST kubernetes-1.13.7.tar.gz 28861902 BLAKE2B 16704365a00cee83eb461f21df2d2e6c5d9b721585c62a3b650b1ecb40f8ad044c2b68cadc5f6251ccccbe22b059112f2c206ff352715fef1322505e655645ff SHA512 2cfc0b3739679da7e9bb9ce0aa71ef5842e45af382d616ce6188f20fec929aca579427b866b5cd71cca005d88d1717803c8f3be60eab8c99b200d422bdc40f04
-DIST kubernetes-1.13.8.tar.gz 28863825 BLAKE2B a796e25d6c4c751bf4bce1d4c8b48b0d0c9ddfcf7aa4356fe4a0ac990f2bfc11e2b4ee0267a1ddd8478c9af1470b53bb88d51d60db8bb650396181381d5de3b9 SHA512 f65263c32afc28fa6f32f762824545f6a2a10ca791d4d175914834f0b8bcadbf578f9c3e7224a2744b71049d6d3d71cbe11b3ede83c23f3ff15bbd4da919439f
+DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
 DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.3.tar.gz 28058624 BLAKE2B 11a1bd98cf6270e0035d6f01a3b14cce641ab1af421e4f060d6616ae6f3e2fd84074c1fad48d4182ce49e62466be40181ff17fce9fd300b84afbdcc3a4f9dc22 SHA512 3fab0b5f142644454d22abfc99454adb3d3055b132cf93b6a0f6a0088b6a7938835edee813611756e80a21b1473e62c179905d77d3f2288bd5c60c6a43e60361
-DIST kubernetes-1.14.4.tar.gz 28066996 BLAKE2B 1738564f1a6406d934faf10f1f7dd380f9c12bf522e5a1394e591da27865695abe8f015a2776907414b335ffa619283b675b6eb9cc1de923665c027d38d80d29 SHA512 b221c34e980965c9973d2fc576fd8f55488e2d0cd7b8e03fac5f9b5a807eb604cf2230f6feb975759f893454891bdea7abd6362b948cae1469dc5c1570f93c40
 DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
-DIST kubernetes-1.15.0.tar.gz 26591862 BLAKE2B 114ae651bb1827913ff5294878956b46dba288928b9fec45796ce5f3c01ab611a7333bd955fb96e7fe970a9f4afc901570ff911dd946c1a72ff8e2c6b3bc927a SHA512 764268020e0fc27e8325058fefbc53200996e5a8f963c9156cf079425cdfed7545522ff8c779bfa074db8739e3ab97e829a049deaf0a0568f1434d7c1ed8446b
+DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
-EBUILD kube-apiserver-1.13.7.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.13.8.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+EBUILD kube-apiserver-1.13.10.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.13.9.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.14.3.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.14.4.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.14.5.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
-EBUILD kube-apiserver-1.15.0.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+EBUILD kube-apiserver-1.14.6.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 EBUILD kube-apiserver-1.15.2.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
+EBUILD kube-apiserver-1.15.3.ebuild 1242 BLAKE2B 2b677d886d177f9a44759f0aff6529bb91fc95b9821b37b8f7c48fc71232a5cc8cc4a134299011e34273e1f9cfeea7516a343cddb0776cfb645f13162ac3b334 SHA512 32112ce3b97667ca5563a93c88723a159be8ae8657b2dcb2435470f25857b368e238aa689bb2ce76b3da61a27cab9dc84a78fea9945b4c56373a0e530e7633e5
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.13.7.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.13.10.ebuild
index a1931590ff31..a1931590ff31 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.13.7.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.13.10.ebuild
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.14.4.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.14.4.ebuild
deleted file mode 100644
index a1931590ff31..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.14.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.13.8.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.14.6.ebuild
index a1931590ff31..a1931590ff31 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.13.8.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.14.6.ebuild
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.15.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.15.0.ebuild
deleted file mode 100644
index a1931590ff31..000000000000
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.15.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes API server"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.14.3.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.15.3.ebuild
index a1931590ff31..a1931590ff31 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.14.3.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.15.3.ebuild
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index f97e08db59ae..f74c52d578b3 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,20 +1,16 @@
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
-DIST kubernetes-1.13.7.tar.gz 28861902 BLAKE2B 16704365a00cee83eb461f21df2d2e6c5d9b721585c62a3b650b1ecb40f8ad044c2b68cadc5f6251ccccbe22b059112f2c206ff352715fef1322505e655645ff SHA512 2cfc0b3739679da7e9bb9ce0aa71ef5842e45af382d616ce6188f20fec929aca579427b866b5cd71cca005d88d1717803c8f3be60eab8c99b200d422bdc40f04
-DIST kubernetes-1.13.8.tar.gz 28863825 BLAKE2B a796e25d6c4c751bf4bce1d4c8b48b0d0c9ddfcf7aa4356fe4a0ac990f2bfc11e2b4ee0267a1ddd8478c9af1470b53bb88d51d60db8bb650396181381d5de3b9 SHA512 f65263c32afc28fa6f32f762824545f6a2a10ca791d4d175914834f0b8bcadbf578f9c3e7224a2744b71049d6d3d71cbe11b3ede83c23f3ff15bbd4da919439f
+DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
 DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.3.tar.gz 28058624 BLAKE2B 11a1bd98cf6270e0035d6f01a3b14cce641ab1af421e4f060d6616ae6f3e2fd84074c1fad48d4182ce49e62466be40181ff17fce9fd300b84afbdcc3a4f9dc22 SHA512 3fab0b5f142644454d22abfc99454adb3d3055b132cf93b6a0f6a0088b6a7938835edee813611756e80a21b1473e62c179905d77d3f2288bd5c60c6a43e60361
-DIST kubernetes-1.14.4.tar.gz 28066996 BLAKE2B 1738564f1a6406d934faf10f1f7dd380f9c12bf522e5a1394e591da27865695abe8f015a2776907414b335ffa619283b675b6eb9cc1de923665c027d38d80d29 SHA512 b221c34e980965c9973d2fc576fd8f55488e2d0cd7b8e03fac5f9b5a807eb604cf2230f6feb975759f893454891bdea7abd6362b948cae1469dc5c1570f93c40
 DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
-DIST kubernetes-1.15.0.tar.gz 26591862 BLAKE2B 114ae651bb1827913ff5294878956b46dba288928b9fec45796ce5f3c01ab611a7333bd955fb96e7fe970a9f4afc901570ff911dd946c1a72ff8e2c6b3bc927a SHA512 764268020e0fc27e8325058fefbc53200996e5a8f963c9156cf079425cdfed7545522ff8c779bfa074db8739e3ab97e829a049deaf0a0568f1434d7c1ed8446b
+DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
-EBUILD kube-controller-manager-1.13.7.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.13.8.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
+DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+EBUILD kube-controller-manager-1.13.10.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.13.9.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.14.3.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.14.4.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.14.5.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
-EBUILD kube-controller-manager-1.15.0.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
+EBUILD kube-controller-manager-1.14.6.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 EBUILD kube-controller-manager-1.15.2.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
+EBUILD kube-controller-manager-1.15.3.ebuild 1250 BLAKE2B 367bbaa1890d0aea1d27b2768a7795b5669f6940f1f9c2c13928d6258df44130a87b98947836d8eccc3a33100075f022a249460cfd4b44b0655d39d942f67aa2 SHA512 b0c76c72a65347b41057f5e77c681a4d2692d94adcbf6a565e2c65bd2a32ed441a920abacaa53f29a91378a3467a09ec5d5e58de47bfc6902af7c1411fd3dca7
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.10.ebuild
index 6aa71f51b8b1..6aa71f51b8b1 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.7.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.10.ebuild
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.4.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.4.ebuild
deleted file mode 100644
index 6aa71f51b8b1..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.8.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.6.ebuild
index 6aa71f51b8b1..6aa71f51b8b1 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.8.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.6.ebuild
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.0.ebuild
deleted file mode 100644
index 6aa71f51b8b1..000000000000
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Controller Manager"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.3.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.3.ebuild
index 6aa71f51b8b1..6aa71f51b8b1 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.3.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.15.3.ebuild
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index a812824db73a..1fc82d152f03 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,20 +1,16 @@
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
-DIST kubernetes-1.13.7.tar.gz 28861902 BLAKE2B 16704365a00cee83eb461f21df2d2e6c5d9b721585c62a3b650b1ecb40f8ad044c2b68cadc5f6251ccccbe22b059112f2c206ff352715fef1322505e655645ff SHA512 2cfc0b3739679da7e9bb9ce0aa71ef5842e45af382d616ce6188f20fec929aca579427b866b5cd71cca005d88d1717803c8f3be60eab8c99b200d422bdc40f04
-DIST kubernetes-1.13.8.tar.gz 28863825 BLAKE2B a796e25d6c4c751bf4bce1d4c8b48b0d0c9ddfcf7aa4356fe4a0ac990f2bfc11e2b4ee0267a1ddd8478c9af1470b53bb88d51d60db8bb650396181381d5de3b9 SHA512 f65263c32afc28fa6f32f762824545f6a2a10ca791d4d175914834f0b8bcadbf578f9c3e7224a2744b71049d6d3d71cbe11b3ede83c23f3ff15bbd4da919439f
+DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
 DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.3.tar.gz 28058624 BLAKE2B 11a1bd98cf6270e0035d6f01a3b14cce641ab1af421e4f060d6616ae6f3e2fd84074c1fad48d4182ce49e62466be40181ff17fce9fd300b84afbdcc3a4f9dc22 SHA512 3fab0b5f142644454d22abfc99454adb3d3055b132cf93b6a0f6a0088b6a7938835edee813611756e80a21b1473e62c179905d77d3f2288bd5c60c6a43e60361
-DIST kubernetes-1.14.4.tar.gz 28066996 BLAKE2B 1738564f1a6406d934faf10f1f7dd380f9c12bf522e5a1394e591da27865695abe8f015a2776907414b335ffa619283b675b6eb9cc1de923665c027d38d80d29 SHA512 b221c34e980965c9973d2fc576fd8f55488e2d0cd7b8e03fac5f9b5a807eb604cf2230f6feb975759f893454891bdea7abd6362b948cae1469dc5c1570f93c40
 DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
-DIST kubernetes-1.15.0.tar.gz 26591862 BLAKE2B 114ae651bb1827913ff5294878956b46dba288928b9fec45796ce5f3c01ab611a7333bd955fb96e7fe970a9f4afc901570ff911dd946c1a72ff8e2c6b3bc927a SHA512 764268020e0fc27e8325058fefbc53200996e5a8f963c9156cf079425cdfed7545522ff8c779bfa074db8739e3ab97e829a049deaf0a0568f1434d7c1ed8446b
+DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
-EBUILD kube-proxy-1.13.7.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.13.8.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
+DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+EBUILD kube-proxy-1.13.10.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.13.9.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.14.3.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.14.4.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.14.5.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
-EBUILD kube-proxy-1.15.0.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
+EBUILD kube-proxy-1.14.6.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 EBUILD kube-proxy-1.15.2.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
+EBUILD kube-proxy-1.15.3.ebuild 1194 BLAKE2B 0a479cb4eadeb456fb57064548556eec0c91c549a215b4044d0efe4cfb84c8824334e024a1130277a8a7dc3c817e1928495a01594577e7ca6f39286222bbe453 SHA512 8034a9eebac25ab13cad932623c3a672a3b89a0e004f87cc14328e05d30ea9d5a4cb0bdf3fe15e65d698082da14ec9f77b81df9536c976950286f97c9e598a6f
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.13.7.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.13.10.ebuild
index f519690e8b2f..f519690e8b2f 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.13.7.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.13.10.ebuild
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.14.4.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.14.4.ebuild
deleted file mode 100644
index f519690e8b2f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.14.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.13.8.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.14.6.ebuild
index f519690e8b2f..f519690e8b2f 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.13.8.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.14.6.ebuild
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.15.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.15.0.ebuild
deleted file mode 100644
index f519690e8b2f..000000000000
--- a/sys-cluster/kube-proxy/kube-proxy-1.15.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Proxy service"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RDEPEND="net-firewall/conntrack-tools"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN} /var/lib/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.14.3.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.15.3.ebuild
index f519690e8b2f..f519690e8b2f 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.14.3.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.15.3.ebuild
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 7ec62c814922..11306cb2f140 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,20 +1,16 @@
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
-DIST kubernetes-1.13.7.tar.gz 28861902 BLAKE2B 16704365a00cee83eb461f21df2d2e6c5d9b721585c62a3b650b1ecb40f8ad044c2b68cadc5f6251ccccbe22b059112f2c206ff352715fef1322505e655645ff SHA512 2cfc0b3739679da7e9bb9ce0aa71ef5842e45af382d616ce6188f20fec929aca579427b866b5cd71cca005d88d1717803c8f3be60eab8c99b200d422bdc40f04
-DIST kubernetes-1.13.8.tar.gz 28863825 BLAKE2B a796e25d6c4c751bf4bce1d4c8b48b0d0c9ddfcf7aa4356fe4a0ac990f2bfc11e2b4ee0267a1ddd8478c9af1470b53bb88d51d60db8bb650396181381d5de3b9 SHA512 f65263c32afc28fa6f32f762824545f6a2a10ca791d4d175914834f0b8bcadbf578f9c3e7224a2744b71049d6d3d71cbe11b3ede83c23f3ff15bbd4da919439f
+DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
 DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.3.tar.gz 28058624 BLAKE2B 11a1bd98cf6270e0035d6f01a3b14cce641ab1af421e4f060d6616ae6f3e2fd84074c1fad48d4182ce49e62466be40181ff17fce9fd300b84afbdcc3a4f9dc22 SHA512 3fab0b5f142644454d22abfc99454adb3d3055b132cf93b6a0f6a0088b6a7938835edee813611756e80a21b1473e62c179905d77d3f2288bd5c60c6a43e60361
-DIST kubernetes-1.14.4.tar.gz 28066996 BLAKE2B 1738564f1a6406d934faf10f1f7dd380f9c12bf522e5a1394e591da27865695abe8f015a2776907414b335ffa619283b675b6eb9cc1de923665c027d38d80d29 SHA512 b221c34e980965c9973d2fc576fd8f55488e2d0cd7b8e03fac5f9b5a807eb604cf2230f6feb975759f893454891bdea7abd6362b948cae1469dc5c1570f93c40
 DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
-DIST kubernetes-1.15.0.tar.gz 26591862 BLAKE2B 114ae651bb1827913ff5294878956b46dba288928b9fec45796ce5f3c01ab611a7333bd955fb96e7fe970a9f4afc901570ff911dd946c1a72ff8e2c6b3bc927a SHA512 764268020e0fc27e8325058fefbc53200996e5a8f963c9156cf079425cdfed7545522ff8c779bfa074db8739e3ab97e829a049deaf0a0568f1434d7c1ed8446b
+DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
-EBUILD kube-scheduler-1.13.7.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.13.8.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
+DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+EBUILD kube-scheduler-1.13.10.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.13.9.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.14.3.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.14.4.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.14.5.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
-EBUILD kube-scheduler-1.15.0.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
+EBUILD kube-scheduler-1.14.6.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 EBUILD kube-scheduler-1.15.2.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
+EBUILD kube-scheduler-1.15.3.ebuild 1241 BLAKE2B 451442dcde047db8034591661d7187a8245f3aa0fee715d9bfab9144c6907f50a1bf0456b2776de157a2a1b94a9bfd9bac58837c200ae65a5c741dfe5c29e212 SHA512 9287cc5ce8688e053fab20a9c53412cf53df57c48b27b026f74b5ddba6097f21210dcca7fab9ce4f45839341f41204c1f313ab2317762d651c3195c3499b3274
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.13.7.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.13.10.ebuild
index 2830ac40ff36..2830ac40ff36 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.13.7.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.13.10.ebuild
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.14.4.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.14.4.ebuild
deleted file mode 100644
index 2830ac40ff36..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.14.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.13.8.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.14.6.ebuild
index 2830ac40ff36..2830ac40ff36 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.13.8.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.14.6.ebuild
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.15.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.15.0.ebuild
deleted file mode 100644
index 2830ac40ff36..000000000000
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.15.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Scheduler"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.14.3.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.15.3.ebuild
index 2830ac40ff36..2830ac40ff36 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.14.3.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.15.3.ebuild
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 5b1a14dea0bb..98d55ec2e4a8 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,20 +1,14 @@
 AUX kubeadm-1.14-openrc.patch 3523 BLAKE2B bbcc45a82984afe2a8ab567ce1319b6c14c84eade26aba21393ba6fe44de35b654000468e15fd44e49da329c85cd4d3dac3fe643d8c83183ab126edaf4a5f4c9 SHA512 8aec0a1cda24fcd7001e34ff6163aee7eaf679dea953068b58df3578c016f70e1406903e032a51519bc16ac0dbe583159d1cf4d504adbb2930d811cc2f762cfe
-DIST kubernetes-1.13.7.tar.gz 28861902 BLAKE2B 16704365a00cee83eb461f21df2d2e6c5d9b721585c62a3b650b1ecb40f8ad044c2b68cadc5f6251ccccbe22b059112f2c206ff352715fef1322505e655645ff SHA512 2cfc0b3739679da7e9bb9ce0aa71ef5842e45af382d616ce6188f20fec929aca579427b866b5cd71cca005d88d1717803c8f3be60eab8c99b200d422bdc40f04
-DIST kubernetes-1.13.8.tar.gz 28863825 BLAKE2B a796e25d6c4c751bf4bce1d4c8b48b0d0c9ddfcf7aa4356fe4a0ac990f2bfc11e2b4ee0267a1ddd8478c9af1470b53bb88d51d60db8bb650396181381d5de3b9 SHA512 f65263c32afc28fa6f32f762824545f6a2a10ca791d4d175914834f0b8bcadbf578f9c3e7224a2744b71049d6d3d71cbe11b3ede83c23f3ff15bbd4da919439f
+DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
 DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.3.tar.gz 28058624 BLAKE2B 11a1bd98cf6270e0035d6f01a3b14cce641ab1af421e4f060d6616ae6f3e2fd84074c1fad48d4182ce49e62466be40181ff17fce9fd300b84afbdcc3a4f9dc22 SHA512 3fab0b5f142644454d22abfc99454adb3d3055b132cf93b6a0f6a0088b6a7938835edee813611756e80a21b1473e62c179905d77d3f2288bd5c60c6a43e60361
-DIST kubernetes-1.14.4.tar.gz 28066996 BLAKE2B 1738564f1a6406d934faf10f1f7dd380f9c12bf522e5a1394e591da27865695abe8f015a2776907414b335ffa619283b675b6eb9cc1de923665c027d38d80d29 SHA512 b221c34e980965c9973d2fc576fd8f55488e2d0cd7b8e03fac5f9b5a807eb604cf2230f6feb975759f893454891bdea7abd6362b948cae1469dc5c1570f93c40
 DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
-DIST kubernetes-1.15.0.tar.gz 26591862 BLAKE2B 114ae651bb1827913ff5294878956b46dba288928b9fec45796ce5f3c01ab611a7333bd955fb96e7fe970a9f4afc901570ff911dd946c1a72ff8e2c6b3bc927a SHA512 764268020e0fc27e8325058fefbc53200996e5a8f963c9156cf079425cdfed7545522ff8c779bfa074db8739e3ab97e829a049deaf0a0568f1434d7c1ed8446b
-DIST kubernetes-1.15.1.tar.gz 26623024 BLAKE2B dcd30345a4fcef318b05a9b5cb2fceeb3c33cabe4ce15af8dc3eecfbf5803707fa514c800035ae695c1e7abc5f0dbedb0839dab3e99b2588e01f54ea0659fb0b SHA512 4d662869db8c62dfcbab1aa2ddb1dcdda81385987c864b324312113fafa61143c481e4e5e601d0e00df539a7e71323745e2c0182b6b06a38d926c2e2ca492f1b
+DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
-EBUILD kubeadm-1.13.7.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
-EBUILD kubeadm-1.13.8.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
+DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+EBUILD kubeadm-1.13.10.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
 EBUILD kubeadm-1.13.9.ebuild 1259 BLAKE2B 721d1a723f2335bbfa228f0be26de54b401a507d4b2f914ca211e6a43eb3b0f6b14ade55aa2f6847d9b8d06d332201c6e57789d5f75e2937e7a00321bf83cfc8 SHA512 56389c63daf66c881bb064229979db7722381713eb02084d83b6aaf378d2e9cd4912053b2d75255810f2536fbaf06d8b15f877dc330bb044a07c508bbbb055d7
-EBUILD kubeadm-1.14.3.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
-EBUILD kubeadm-1.14.4.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
 EBUILD kubeadm-1.14.5.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
-EBUILD kubeadm-1.15.0.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
-EBUILD kubeadm-1.15.1.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
+EBUILD kubeadm-1.14.6.ebuild 1346 BLAKE2B 5577bf77097cda800fa952f89ef6dc1f64748100e92b6b0f2b16cc9320ac41b629c5dcbb1d06c2ce5e7a4a65b6ee4e7ac29cfb9f5c08323a3b6acc201828968c SHA512 5c45b4ea190d63afb399e6c676de353d93212936cad1d7e8d22e9a103037f107bf4402430c6d67366aa8616cd2b28f79af8397df80248a3db7ae179d18fdfc6b
 EBUILD kubeadm-1.15.2.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
+EBUILD kubeadm-1.15.3.ebuild 1259 BLAKE2B c457240648b86a60b75e27b277caba17f98ab8488eebf619b36215a9b785da856cec30b926bdd4ed877886e985789304dd12e1325eb31beb0c82a9c08036ef08 SHA512 7123e4fda317531803d885a0593a5f00a8671321ea87984f4572b059735304552d66e61d0394338759b8c107ca9d7556b009eb088cdccda869ed31a2830abc4e
 MISC metadata.xml 1128 BLAKE2B b5ad31ef126f2d95646a37c256b82d2ad5e008968f928fb56b05c39514d4a9e0a252ebcefbeac8679f5349acac170886859af44f095aafea97fc8bf00a34bc44 SHA512 b9246624712068cf304fc5329ae851c26d52204b684b5f547892b23e68948b04b4ed4654a49d7bb5fe7eea658b58fbdbbe51a7a9ba1f4a94c5d0499a033b7f5a
diff --git a/sys-cluster/kubeadm/kubeadm-1.13.7.ebuild b/sys-cluster/kubeadm/kubeadm-1.13.10.ebuild
index 6c4b699b7594..6c4b699b7594 100644
--- a/sys-cluster/kubeadm/kubeadm-1.13.7.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.13.10.ebuild
diff --git a/sys-cluster/kubeadm/kubeadm-1.13.8.ebuild b/sys-cluster/kubeadm/kubeadm-1.13.8.ebuild
deleted file mode 100644
index 6c4b699b7594..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.13.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.14.4.ebuild b/sys-cluster/kubeadm/kubeadm-1.14.4.ebuild
deleted file mode 100644
index 763c3838067b..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.14.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-	pushd src/${EGO_PN} || die
-	eapply "${FILESDIR}/${PN}-1.14-openrc.patch"
-	popd || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.14.3.ebuild b/sys-cluster/kubeadm/kubeadm-1.14.6.ebuild
index 763c3838067b..763c3838067b 100644
--- a/sys-cluster/kubeadm/kubeadm-1.14.3.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.14.6.ebuild
diff --git a/sys-cluster/kubeadm/kubeadm-1.15.1.ebuild b/sys-cluster/kubeadm/kubeadm-1.15.1.ebuild
deleted file mode 100644
index ffd3646b62e1..000000000000
--- a/sys-cluster/kubeadm/kubeadm-1.15.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12
-	dev-go/go-bindata"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-	pushd src/${EGO_PN} || die
-	_output/bin/${PN} completion bash > ${PN}.bash || die
-	_output/bin/${PN} completion zsh > ${PN}.zsh || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	popd || die
-}
diff --git a/sys-cluster/kubeadm/kubeadm-1.15.0.ebuild b/sys-cluster/kubeadm/kubeadm-1.15.3.ebuild
index ffd3646b62e1..ffd3646b62e1 100644
--- a/sys-cluster/kubeadm/kubeadm-1.15.0.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.15.3.ebuild
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 0ba40a86a99f..650938741f72 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,7 +1,11 @@
-DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
+DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
 DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
+DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
-EBUILD kubectl-1.13.9.ebuild 1254 BLAKE2B 2743900120a1056c1a533a63144ffb2c2f76efdc4bc9efed8689126396ce83a80f55b9c65cfeb20e859471c3cb6f8a60d6c0c7e61a0bbcfb059858b72caa45a1 SHA512 b5d88e62e375cf74e1ffac496f5a931fe2df7fd119618cb0e0f6e062940a1f566cff14dcd74d27f0455b303b309de2f184a960a66d2e5e8b0f72572a6b699ce1
+DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+EBUILD kubectl-1.13.10.ebuild 1254 BLAKE2B 2743900120a1056c1a533a63144ffb2c2f76efdc4bc9efed8689126396ce83a80f55b9c65cfeb20e859471c3cb6f8a60d6c0c7e61a0bbcfb059858b72caa45a1 SHA512 b5d88e62e375cf74e1ffac496f5a931fe2df7fd119618cb0e0f6e062940a1f566cff14dcd74d27f0455b303b309de2f184a960a66d2e5e8b0f72572a6b699ce1
 EBUILD kubectl-1.14.5.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
+EBUILD kubectl-1.14.6.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
 EBUILD kubectl-1.15.2.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
+EBUILD kubectl-1.15.3.ebuild 1255 BLAKE2B ac9e05e1da4524183f369898e5e4e492e43f8c17b1e2ebf71c7594cf7a55bbfcb5a4d19a8fd855e760028a722c0832c0e60299e97748c7bff599202e8e0d83e0 SHA512 25390c464c6b280185b525bb3a978e8e80b8309a174746603889627e18f9d564548a42a39600eac8ac39d4952c4ffc3e52add133061a9e4a4afcfe7d936184e3
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.13.9.ebuild b/sys-cluster/kubectl/kubectl-1.13.10.ebuild
index 6f0d80ff6350..6f0d80ff6350 100644
--- a/sys-cluster/kubectl/kubectl-1.13.9.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.13.10.ebuild
diff --git a/sys-cluster/kubectl/kubectl-1.14.6.ebuild b/sys-cluster/kubectl/kubectl-1.14.6.ebuild
new file mode 100644
index 000000000000..7a61b25dce90
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.14.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.12
+	dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+	pushd src/${EGO_PN} || die
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	popd || die
+}
diff --git a/sys-cluster/kubectl/kubectl-1.15.3.ebuild b/sys-cluster/kubectl/kubectl-1.15.3.ebuild
new file mode 100644
index 000000000000..7a61b25dce90
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.15.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.12
+	dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+	pushd src/${EGO_PN} || die
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	popd || die
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index c938f653c450..96a23f3ed47a 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -3,22 +3,14 @@ AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbc
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
-DIST kubernetes-1.13.7.tar.gz 28861902 BLAKE2B 16704365a00cee83eb461f21df2d2e6c5d9b721585c62a3b650b1ecb40f8ad044c2b68cadc5f6251ccccbe22b059112f2c206ff352715fef1322505e655645ff SHA512 2cfc0b3739679da7e9bb9ce0aa71ef5842e45af382d616ce6188f20fec929aca579427b866b5cd71cca005d88d1717803c8f3be60eab8c99b200d422bdc40f04
-DIST kubernetes-1.13.8.tar.gz 28863825 BLAKE2B a796e25d6c4c751bf4bce1d4c8b48b0d0c9ddfcf7aa4356fe4a0ac990f2bfc11e2b4ee0267a1ddd8478c9af1470b53bb88d51d60db8bb650396181381d5de3b9 SHA512 f65263c32afc28fa6f32f762824545f6a2a10ca791d4d175914834f0b8bcadbf578f9c3e7224a2744b71049d6d3d71cbe11b3ede83c23f3ff15bbd4da919439f
-DIST kubernetes-1.13.9.tar.gz 28870425 BLAKE2B d09a8654fe0704562f383dc1d475db064c79c01f7213aba2374d56b834051827e04ed62d8d74bb5a3d70eec9981ccfec5991f264c9882177528782ce95a733e2 SHA512 94086ac8b12e874b8045cc32ceaf8ceeea9718eee9f7eeed4f44f515ee738ba486bb8e124c1dcaa4e7b3f49f99fc70481571c6f972115da11348a9c9722e434c
-DIST kubernetes-1.14.3.tar.gz 28058624 BLAKE2B 11a1bd98cf6270e0035d6f01a3b14cce641ab1af421e4f060d6616ae6f3e2fd84074c1fad48d4182ce49e62466be40181ff17fce9fd300b84afbdcc3a4f9dc22 SHA512 3fab0b5f142644454d22abfc99454adb3d3055b132cf93b6a0f6a0088b6a7938835edee813611756e80a21b1473e62c179905d77d3f2288bd5c60c6a43e60361
-DIST kubernetes-1.14.4.tar.gz 28066996 BLAKE2B 1738564f1a6406d934faf10f1f7dd380f9c12bf522e5a1394e591da27865695abe8f015a2776907414b335ffa619283b675b6eb9cc1de923665c027d38d80d29 SHA512 b221c34e980965c9973d2fc576fd8f55488e2d0cd7b8e03fac5f9b5a807eb604cf2230f6feb975759f893454891bdea7abd6362b948cae1469dc5c1570f93c40
+DIST kubernetes-1.13.10.tar.gz 28887744 BLAKE2B 3d3e5d487c475a9cc648874f2e9b4c0012f5e2af50ec4be2cc7457ad7f36d61bc034686af4be88b32f5c46948ec20010d4bafe3492d2a5148f6e361355a8d0c2 SHA512 599dd3536b42ea469d8e021efdd52ed30b03dd4425acbe27a6eb730d81ca33dfe56167ca07c6b6ee4f988b46dab908419adce20d58368af5288f773d7e1f39d0
 DIST kubernetes-1.14.5.tar.gz 28071522 BLAKE2B 1d949f53ebae03c5ce02d32253e85e96c7c0fef85d16dac8442ca379b980ba553d1602a5ae5e984eb6ae5abe5998155f62521292a3683612a251e7b81c940b05 SHA512 3c15c3663fd81dbbfbfa15219cbf94306af1cb846f9e3a6739db8c188d90b8ae25c601e0c746e93c13cbc4734fe612f9b5ca42fad97055903ccc473e5f3e15c3
-DIST kubernetes-1.15.0.tar.gz 26591862 BLAKE2B 114ae651bb1827913ff5294878956b46dba288928b9fec45796ce5f3c01ab611a7333bd955fb96e7fe970a9f4afc901570ff911dd946c1a72ff8e2c6b3bc927a SHA512 764268020e0fc27e8325058fefbc53200996e5a8f963c9156cf079425cdfed7545522ff8c779bfa074db8739e3ab97e829a049deaf0a0568f1434d7c1ed8446b
-DIST kubernetes-1.15.1.tar.gz 26623024 BLAKE2B dcd30345a4fcef318b05a9b5cb2fceeb3c33cabe4ce15af8dc3eecfbf5803707fa514c800035ae695c1e7abc5f0dbedb0839dab3e99b2588e01f54ea0659fb0b SHA512 4d662869db8c62dfcbab1aa2ddb1dcdda81385987c864b324312113fafa61143c481e4e5e601d0e00df539a7e71323745e2c0182b6b06a38d926c2e2ca492f1b
+DIST kubernetes-1.14.6.tar.gz 28077478 BLAKE2B 8d4d3904b465e97822695f51b0b0becdd55bd623147a2af6bfd5429971dc300a87ee59f45e105909170e41c4dbed1db56bb7d17441a561fbfe03914cbed796f9 SHA512 b6ea20955d15d9980154f1c4a5d9a3153702632cfbd18d3e727daee7307465c0d4694b9a0c20a405fbe491c130dae7bfa23b1459c2733a7239918bbca531076f
 DIST kubernetes-1.15.2.tar.gz 26628888 BLAKE2B 49c72f9355e1bb00f743571f4253261b46d58fe6252b1f9284d0982a201502ef13ccc77da588087e407a7d6ed250d1ab224b9fcf99d2542225d6736a8dffb4d9 SHA512 0de798631a3bf82766b797f05084f40df4422808c8ec8651480c5c27ecd4adb51148d15c7260b06482eba11c9bbb68966abc03a2d472b98d12cb0fe2ccf38473
-EBUILD kubelet-1.13.7.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.13.8.ebuild 1370 BLAKE2B 266582d9525e760a83c267cee55e51402121c8b70f5392cfb428eb47da7a5087a3d8c419f22ee8d1f17ff8471e610b0cb29605079118f64470b0b3ebc4198731 SHA512 8efbd5783cf009f22ee4687d20fb09ad495cd8cb65be297c168f47871ed1d7a945066ad49b114511987d97c6196dc30c58e774a9ddbee3d5b292807ec9abae3a
-EBUILD kubelet-1.13.9.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.14.3.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.14.4.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
+DIST kubernetes-1.15.3.tar.gz 26635140 BLAKE2B 3189d1e79c47bd5e656972c9e2944a41b827f601e43d397fd2b1ea3f20b65acd80105556607a7699cacf8e0c819d2e09dd35e0283003c22972f4aeb83822ae98 SHA512 b4c3f65f7ae6c9b3e1bb8efd5182a0c922e372c0b8db77b71cd52025c7a00f592ad450c042d78b1d54b716c328c0b291296b36c102579a416b9cd8dda1be8ad2
+EBUILD kubelet-1.13.10.ebuild 1370 BLAKE2B 266582d9525e760a83c267cee55e51402121c8b70f5392cfb428eb47da7a5087a3d8c419f22ee8d1f17ff8471e610b0cb29605079118f64470b0b3ebc4198731 SHA512 8efbd5783cf009f22ee4687d20fb09ad495cd8cb65be297c168f47871ed1d7a945066ad49b114511987d97c6196dc30c58e774a9ddbee3d5b292807ec9abae3a
 EBUILD kubelet-1.14.5.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.15.0.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
-EBUILD kubelet-1.15.1.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
+EBUILD kubelet-1.14.6.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 EBUILD kubelet-1.15.2.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
+EBUILD kubelet-1.15.3.ebuild 1371 BLAKE2B 7628789a9bbc7a6b93daf01a31b120b29782fdd342aab3614b0d6ef79f2adff1e1d49813122dfb6e57c851a9c515999c9f7afd16c0d9e32bef5666895442a8b9 SHA512 fddab15ad061f5601e817cded247683f05df0ecc5cab1955cc25112cf8f6e0e6cd4cc96315918256f8e270d7db3b25d616439cc3c0c770b54eda2b05fa1f738f
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.13.8.ebuild b/sys-cluster/kubelet/kubelet-1.13.10.ebuild
index 447655a3a284..447655a3a284 100644
--- a/sys-cluster/kubelet/kubelet-1.13.8.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.13.10.ebuild
diff --git a/sys-cluster/kubelet/kubelet-1.14.3.ebuild b/sys-cluster/kubelet/kubelet-1.14.3.ebuild
deleted file mode 100644
index f38ce59e625d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.14.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.14.4.ebuild b/sys-cluster/kubelet/kubelet-1.14.4.ebuild
deleted file mode 100644
index f38ce59e625d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.14.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.13.7.ebuild b/sys-cluster/kubelet/kubelet-1.14.6.ebuild
index f38ce59e625d..f38ce59e625d 100644
--- a/sys-cluster/kubelet/kubelet-1.13.7.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.14.6.ebuild
diff --git a/sys-cluster/kubelet/kubelet-1.15.0.ebuild b/sys-cluster/kubelet/kubelet-1.15.0.ebuild
deleted file mode 100644
index f38ce59e625d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.15.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.15.1.ebuild b/sys-cluster/kubelet/kubelet-1.15.1.ebuild
deleted file mode 100644
index f38ce59e625d..000000000000
--- a/sys-cluster/kubelet/kubelet-1.15.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot systemd
-
-EGO_PN="k8s.io/kubernetes"
-ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Node Agent"
-HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	>=dev-lang/go-1.11"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
-	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin _output/bin/${PN}
-	popd || die
-	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotated ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc/kubernetes
-	newins "${FILESDIR}"/${PN}.env ${PN}.env
-}
diff --git a/sys-cluster/kubelet/kubelet-1.13.9.ebuild b/sys-cluster/kubelet/kubelet-1.15.3.ebuild
index f38ce59e625d..f38ce59e625d 100644
--- a/sys-cluster/kubelet/kubelet-1.13.9.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.15.3.ebuild
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index c4261ad19f8e..5fed03728b2a 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -3,4 +3,4 @@ DIST mpich-3.0.4.tar.gz 10921075 BLAKE2B 341aaac23277aed05a4448ea03d9caf1ee14cfe
 DIST mpich-3.3.tar.gz 27209008 BLAKE2B 3010f847456ed71a27e728b91887e04303a83b4abea883bf73d9794ff697052efe3bccd238933dc6e5fbc75e0be36004f1ae9fc7695a4e8887984552ae005917 SHA512 1ed6d8d30db4923fd1bd39b6e9622f0db939a45edf8d9f8bdbccfa619fde7fb920c5a0d3f2442f0dd63cf8fda823dbd2983ac5f7c16308bc79e04f61d8e119be
 EBUILD mpich-3.0.4.ebuild 2529 BLAKE2B d60c5eb9d4a9b7838de58dbc93c695ccf379136004a9ea670f9002c8b1173c5d8d7fb5107d29940025bf417dd5f2b3289ed44d062ba0de1f2ccfe77b14ee217b SHA512 c4588f2b52025fe4fca70b6b0b0c83b5595c4f2d281b744cede8f9ccfc73c0c880dea5f2271fb54a52f64a759488e194a14e5c55e017be63690a7aea9e9d2707
 EBUILD mpich-3.3.ebuild 3795 BLAKE2B f712a7c70d2e444c3aa8fa3d32a0751eae7cee897e845537d05e7c8f7cc400a30a2bef493f9a7d29e1499856d930798d535ac19ec3be9ce919abbe31cfa7a971 SHA512 8da57e216efb628c9a523b433b67de59b77e627bf5c6dfd37ea2a16a4acb6c812ec147eedfc45edaaeb17fdef1e002965b1f9ff7cb140cc2af3111798ac00769
-MISC metadata.xml 658 BLAKE2B 2fc81d1e02086392471d734b5837e8a7ddf9bc8f06ac24766f7bb2e2c7f735a92fd80ed5de47f693224058dcad1c8e89d764c81a2568c363f28a59c50f275112 SHA512 fb8427b6757ba0571f5f78ee71bfd80ebf9e0835a1016b3ef1f66d27a2022033118c7a1fbfe4011e591d321bae9df48c4e4554e3daaa1a3033bee74b5f4c08fe
+MISC metadata.xml 547 BLAKE2B e96f9ca4c9bca4aabd1ecda3b3b03713e3841b8a09facc5058f8dd1ec34a4948d1cb1b314b55c2a9d76975babf8ddccabb6c5496ad77abb0b07da43c7e05cfa8 SHA512 850e8575f14a0b0c5bbf81ff738975211a611d6938abddeb98b28538d7176c1f167690f59e705c953792c6bc93f38424247ef1295d56556e82c345131d43dca1
diff --git a/sys-cluster/mpich/metadata.xml b/sys-cluster/mpich/metadata.xml
index 6cbe440faf21..6884ae20d36c 100644
--- a/sys-cluster/mpich/metadata.xml
+++ b/sys-cluster/mpich/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jsbronder@gentoo.org</email>
-		<name>Justin Bronder</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>balaji@mcs.anl.gov</email>
 		<name>Pavan Balaji</name>
 		<description>Upstream Contact</description>
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 99f54b428e42..016b72e29d20 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -1,3 +1,3 @@
 DIST mpich2-1.5.tar.gz 22826035 BLAKE2B 75075fbdd0111725e5bce1e828561125cdba2c91ecfb5af7c6ebd0603f8de05aa5813e57bf05b276607d0a6c0a378862b5631ab988f87e67299e7f651efdc76b SHA512 01ef68accdd60af805705c1c7a144a570eee6f01984939fe151a093f963c956fba366247b1058885ba1a2ff626278d30e928e03d394bd6cf2a4b6dab99586c15
 EBUILD mpich2-1.5.ebuild 2617 BLAKE2B 6cdfb3eae7f0e5289770f39b3b6a303dbde63e57b5ad8f59c6de1e7c6d67b54f0cb22f9222a7b2eb139bb461492c060f9a87b09f3d137c2e24a04e355646e860 SHA512 92f21d4a01e118f1f8a4b993aafe09dbb3712b7acda868abf32b0fc2458beda379bed9edbb3d73bb0b3066c8131708e79845b1586ea5b0e194f3a24c911dd438
-MISC metadata.xml 537 BLAKE2B 9eae46c14d7c3a9005282ded5342fcec178348c6a408427d0e27344201ffd46f3de3fb68c5ad981a8054d48362f71c5ef1bed6833afcadcbdfc237b6ab74c4de SHA512 6fef333f26872e307ad083ef2e9feafcd264b363feb519e61dea1e2b254b5f3035ff152d84f61311eb3e54c0d08f2a858f446da60ceaa74bd31466fee9ac5500
+MISC metadata.xml 426 BLAKE2B c84c0b456040e5826bbe33d90969ce14cc9e7ed7e1724935ae785fe7dcd14c00e1abbd877e2b57860cc049fefe7483e1a4145270ebbe3b07ec716a43a595dd9a SHA512 b684cf0962e273dc2c9472c5e05575c1ad31801fa31e30bab9792e407269d436186063d9be3e63fb8417995689a4308442a100878f2d2e6946c49c3150ef3f7f
diff --git a/sys-cluster/mpich2/metadata.xml b/sys-cluster/mpich2/metadata.xml
index d88fa13bcaf8..9c96829dcdf1 100644
--- a/sys-cluster/mpich2/metadata.xml
+++ b/sys-cluster/mpich2/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jsbronder@gentoo.org</email>
-		<name>Justin Bronder</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 7265a0a53bb6..a004fe358ee3 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -16,8 +16,8 @@ DIST neutron-ml2-plugins-13.0.4.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8
 DIST neutron-ml2-plugins-14.0.2.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2
 DIST neutron-ml2-plugins-2018.2.9999.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f
 DIST neutron-ml2-plugins-2019.1.9999.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2
-EBUILD neutron-13.0.4.ebuild 8373 BLAKE2B a8fe7ffaed5896881e6f48bfe605927f6785dc4722a6a110e8bd9c441f2dc8e33aab524b15b1aad2e40d9025a7ad273868ca6f0b7eeee462a33490d79eb3e50f SHA512 24abe3297c803492b6aa2fa7809dc2e6583a509eb16f52fbb6b2c86f46cc3297998f6d3c9fd136e644159479f679639a821dfb20f09d8bf133e5031c36ea54ed
-EBUILD neutron-14.0.2.ebuild 8414 BLAKE2B 32b24492c363e5852af75248d15989982d773771e5ddb2e5c4c1e1665fb7f0d173ed26a53f0260b62bb872f16000720606dbc10863b2ea6920b9ef742e6a5f01 SHA512 88db9ff23bc6b0a4f4ff33ff3bec7e5c4974942ffd5f62f5dae7996e3be5c4cd5f924f93db924d3a6028b4698804029edcbad077e5c3d305ff581975ef402af5
-EBUILD neutron-2018.2.9999.ebuild 8375 BLAKE2B 2da1a016c34f317d120e83b62f3bbffb245fba4767cc61be924eb8dd6a143066c600fb63bd701b3a156c9704ecd18ab53a5661e81445c22f0f27eb46575f514e SHA512 9294e49832641af2133b1fd1d098c58cc44b23b06188648a87ef4eb12df0a96119de5486c94bb1ac2b0e5401f46cd073e5e8b55bed081fc9d6fade64c046445e
-EBUILD neutron-2019.1.9999.ebuild 8416 BLAKE2B ddf244c9bf918d4b1decae18cbf6f6b9fc674c45ac2d4fa1ffe6cb49a5e8e0aedd7b1346a8505dd477519a7d2813c680a3eedc1f0c4a3f24b39bc06d59a37869 SHA512 a87ee79367d3c01e8a3a688f925a517f6956b95a4465fab0775541a3b63b454ed991f21258ff245b43811930d8210351041e005e7089d6133be5a0e1e4604a28
+EBUILD neutron-13.0.4.ebuild 8347 BLAKE2B 329f7e858f922aaf211dcd925fefcbd61418f5198d63b644a109634765aef14142b99cd68e7a8436eba730078ae0f21179819b121c020ecd3d2d7e743ae305a5 SHA512 57d8d5f18f1d45d23418f4599770fb35b757c4ca1e584d559e64d839308a9d71928db37a7276abf074294718b54c83f7e485d6c88978ec7f2bf26de29aacb46a
+EBUILD neutron-14.0.2.ebuild 8388 BLAKE2B 3716d11d139f7ecee31b49009e07f2b5219c6a953a83a375d933aa6fb67c961a697341cdbe13da38bf09819607eafd07e3df6a106e41cfa1eccd38fc209a30c1 SHA512 42759d4cb73245f0fd5ce6a75d8c659e06eb552dc58b7c1723ebc37a1e49f56e74dce78e0b74d5befa8dae0389ed5b089e1c9c4bae5eeeb4025ab5daf12c3fa2
+EBUILD neutron-2018.2.9999.ebuild 8350 BLAKE2B 40303975455b8e20a9b55d228b0653104ddaa8f1a20000188d86da895af95c7030b3931b1d71c3038235cac8efd37dfe547ee8da0a57611fedc2de743f388a96 SHA512 c9240d19364c27113ec1e63893f86c2a5df66af5e5610becf53d6366868ebe6777d20f4324905a5a502cfe224dd05a3820255b016b1cbdd3b30ac8678092e224
+EBUILD neutron-2019.1.9999.ebuild 8391 BLAKE2B 6182fa27064f390f6dc459d7a0d6b926ff1e1ad43d380e654e6ef5ed63fa91e130bed6fdc93a815e0c7eca598848a61596766e9fedca44439a2b99b589757224 SHA512 56d78135fed5fbbd23c789ce9037bcaa805ab42da39492dc2d41b5256d1f7139db92f119ab6c03b74a898e18a5e20ba8295ca54b17fcf2629d8f8ca06bb4777b
 MISC metadata.xml 1619 BLAKE2B 462b212e519778c98632ec3230e5f0d1a006a229edef034ed0d462559cb0c1763dafb997198241cca4f9c7cb056ebada214c82745dce35b269c2c27d554145a4 SHA512 8f9075719eeec3c3a939e8a1b05a5604bc1e801b227feb5775bfa9f2812e67c41165dc0b2b377685645d9fd9988523356ac77a8db8e73139ab3f035ae59b70ce
diff --git a/sys-cluster/neutron/neutron-13.0.4.ebuild b/sys-cluster/neutron/neutron-13.0.4.ebuild
index 7379b294ab07..d862d7790857 100644
--- a/sys-cluster/neutron/neutron-13.0.4.ebuild
+++ b/sys-cluster/neutron/neutron-13.0.4.ebuild
@@ -215,9 +215,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
+	python_moduleinto neutron/db/migration/alembic_migrations
+	python_domodule "neutron/db/migration/alembic_migrations/versions"
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/neutron/neutron-14.0.2.ebuild b/sys-cluster/neutron/neutron-14.0.2.ebuild
index a73abfd16ba5..137caa2c7569 100644
--- a/sys-cluster/neutron/neutron-14.0.2.ebuild
+++ b/sys-cluster/neutron/neutron-14.0.2.ebuild
@@ -215,9 +215,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
+	python_moduleinto neutron/db/migration/alembic_migrations
+	python_domodule "neutron/db/migration/alembic_migrations/versions"
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/neutron/neutron-2018.2.9999.ebuild b/sys-cluster/neutron/neutron-2018.2.9999.ebuild
index bd81ba27f6cd..5bd5528fe264 100644
--- a/sys-cluster/neutron/neutron-2018.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2018.2.9999.ebuild
@@ -215,9 +215,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
+	python_moduleinto neutron/db/migration/alembic_migrations
+	python_domodule "neutron/db/migration/alembic_migrations/versions"
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/neutron/neutron-2019.1.9999.ebuild b/sys-cluster/neutron/neutron-2019.1.9999.ebuild
index 58d765b61988..dca9c322db0c 100644
--- a/sys-cluster/neutron/neutron-2019.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2019.1.9999.ebuild
@@ -215,9 +215,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insopts -m 0644
-	insinto "$(python_get_sitedir)/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
+	python_moduleinto neutron/db/migration/alembic_migrations
+	python_domodule "neutron/db/migration/alembic_migrations/versions"
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 3e107484b19c..d57a71b5f736 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -9,8 +9,8 @@ DIST nova.conf.sample-18.2.2 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a3396
 DIST nova.conf.sample-19.0.2 387769 BLAKE2B 2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12 SHA512 4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
 DIST nova.conf.sample-2018.2.9999 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
 DIST nova.conf.sample-2019.1.9999 387769 BLAKE2B 2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12 SHA512 4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
-EBUILD nova-18.2.2.ebuild 9500 BLAKE2B c4fa7159a2fddcf8a3c5eaa598d6ce30074701f6f56c12f7e7f96717cb96748676f4e2f6b562d04abf89b4662a8b1c4fc6d6c93da3a61849ab1e39e4b3951d0e SHA512 bbb0b6b791c39681ad14dbfd63534d74ce40872b2cbb14181e151d93bbfd60f89daa4e702eacb7e7fdce25adb08aef70c525f3b41a2618cba9bb9f21128bb5d7
-EBUILD nova-19.0.2.ebuild 9589 BLAKE2B e8af169540a4a7d9980416cc2c60cf4a4b3eefebafbac928f50bfd7cab407e5b0778105349b3c19edab023fb27cda9e4181c911f718ac98cc1721de32a6838be SHA512 32c3f2888abaced0c49a0b43809cd5789fd4d4ebd4c602bd9ccd3a37c3762120fedb0de10772009a3c329cf62194c795b4df45afe9c345619fc91b2f9b398ee6
-EBUILD nova-2018.2.9999.ebuild 9503 BLAKE2B 93d037866011c61dc8d61283d8d6a3897f8df51d35e9f5688ad8831d07033a5420ea280e2c51ebf5fb700520463f89e0fd1a596b20f0948bc63a44287da5ad61 SHA512 08acb5d955ef369c3b352009be92885c90e9632a5cacdca9ccc52ea11ca6c32d726a18b290df79ff60c00601b4b8715fa14721e4ebf67788c504fda743d098c7
-EBUILD nova-2019.1.9999.ebuild 9592 BLAKE2B b9d936d1b245e40280053f76dbcfd25730c2b9aa1d64b4c5e815c8256e4827023dce5ee39d1b9cbb977a8e9765114193f91e049e9022e4520e2371ee6602bc5b SHA512 f78cd0043406c2d62ca01f86f4c36efd3e21623cb625ad5a459e2e17496b040afedd32411033218ebcc4627d6c14f6ff203d0f4dc207bfe1da05e3ebd79daf27
+EBUILD nova-18.2.2.ebuild 9493 BLAKE2B 1b9ec29a2a6ff3eb43933d2871d5c7c2caec586cbd2e15df1b79e98a39e852de164b43647c1c00ff2a3557d39c6b697686bee3a3c53a9201a8b0726e88406356 SHA512 fbb3e4561c7b5ff86da1216ad3ab9e891da0564ce77b290d1abeec910a13738da14b46caf902ddf388513f835e15dd0774811ec885ba6b919894db349c9a7b57
+EBUILD nova-19.0.2.ebuild 9582 BLAKE2B 285306242428951b117928d492e8babe5786e03e4065e8556395c7cf67afaea3c10d04acc6cb74907a23aa44535b4c8661635dafe0727ade47fdae1359395a38 SHA512 9d61543f6809972a18843d122a3c098f956f27f1954e179fb0bbe235c974bc01c255c400563b4c21d4ffcb991174792548991c402aebedb76851d05cb9c15486
+EBUILD nova-2018.2.9999.ebuild 9496 BLAKE2B c962c25fe0107327d30eb0fde3163e4722763db4e2b3b0ff0250f9dbee071807db7a5dd9404e4425d758cb6408efafa571f79fa50cd0756355ca6754513668e6 SHA512 62756e826de4bed6fa6d185e92defe459e9e32ca53b7b860c882896e0dd306d04918cd932c25311d0700ccefc3effb16e5fadcc4e17d7e2074088d90e3f49734
+EBUILD nova-2019.1.9999.ebuild 9354 BLAKE2B 92302f07eb36bcf62aaefaa51cec5795692823fa886978c70bbbcae000fa46f6b4baeb355831fa58bc8a9bd8fd57fe4dde23c7d50a250d6492c080929979c375 SHA512 cca0284a3e11f5b4509bc755e1390aa383809d8acb7baaa40345d41d09da9222ac7aa968fe14fa95528268410a1bc5f474c3acc7145256709109a4c26278ebd4
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-18.2.2.ebuild b/sys-cluster/nova/nova-18.2.2.ebuild
index 123609323504..f57c926d0e3e 100644
--- a/sys-cluster/nova/nova-18.2.2.ebuild
+++ b/sys-cluster/nova/nova-18.2.2.ebuild
@@ -242,8 +242,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	python_moduleinto db/sqlalchemy/migrate_repo
+	python_domodule nova/db/sqlalchemy/migrate_repo/migrate.cfg
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/nova/nova-19.0.2.ebuild b/sys-cluster/nova/nova-19.0.2.ebuild
index ffc81bcc8570..d25e3939bb40 100644
--- a/sys-cluster/nova/nova-19.0.2.ebuild
+++ b/sys-cluster/nova/nova-19.0.2.ebuild
@@ -244,8 +244,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	python_moduleinto db/sqlalchemy/migrate_repo
+	python_domodule nova/db/sqlalchemy/migrate_repo/migrate.cfg
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/nova/nova-2018.2.9999.ebuild b/sys-cluster/nova/nova-2018.2.9999.ebuild
index f0694e7ed9a0..dd30ccf5b550 100644
--- a/sys-cluster/nova/nova-2018.2.9999.ebuild
+++ b/sys-cluster/nova/nova-2018.2.9999.ebuild
@@ -242,8 +242,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	python_moduleinto db/sqlalchemy/migrate_repo
+	python_domodule nova/db/sqlalchemy/migrate_repo/migrate.cfg
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/nova/nova-2019.1.9999.ebuild b/sys-cluster/nova/nova-2019.1.9999.ebuild
index a28cdc16dcc1..4eaf50a66197 100644
--- a/sys-cluster/nova/nova-2019.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2019.1.9999.ebuild
@@ -241,13 +241,6 @@ python_install_all() {
 	rm -r "${ED}/usr/etc"
 }
 
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-}
-
 pkg_postinst() {
 	if use iscsi ; then
 		elog "iscsid needs to be running if you want cinder to connect"
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 2708949b4e9d..36b018820331 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -27,5 +27,5 @@ EBUILD openmpi-2.0.4.ebuild 5995 BLAKE2B f0e8b0971b2e9cdae4a46b771bee622a4c35584
 EBUILD openmpi-2.1.6.ebuild 5606 BLAKE2B 2303401b7048a5e5a05552f79e964e45f1d0df2d315c993ebb05bac0f46fd156cd1cdb98ab47e1e730bbfb162343e6a457e69432c4901dcf236f88721dc3ad90 SHA512 e0ed1db674b40c82bbe85a22dbfcdd0271c95e76769799708be0ca2c652910ef378d7ea07c1a87d6b0bdd2557a6920b02cb75f4aaa702bef114a1ed505e7abc2
 EBUILD openmpi-3.0.4.ebuild 5492 BLAKE2B 18dcd4347f186116781da19bce63083d0f0bda9c4096e8a38bcd066bea3d655fa348fed4a5b8ac760e110ec91ec205fc33d91dd407d57165362b3c03ae4e37e5 SHA512 fe63abca4c2883e5801ef1886a06e0300031400bdb2a28f39099159185c33f9998b6bc3066f4b9b9b6e0d7d86f98e8bdbe724050b7eeead3c83320bd1148588e
 EBUILD openmpi-3.1.4.ebuild 5492 BLAKE2B 18dcd4347f186116781da19bce63083d0f0bda9c4096e8a38bcd066bea3d655fa348fed4a5b8ac760e110ec91ec205fc33d91dd407d57165362b3c03ae4e37e5 SHA512 fe63abca4c2883e5801ef1886a06e0300031400bdb2a28f39099159185c33f9998b6bc3066f4b9b9b6e0d7d86f98e8bdbe724050b7eeead3c83320bd1148588e
-EBUILD openmpi-4.0.1.ebuild 5432 BLAKE2B 21fff5d4df3150c1b7e420ac01000f9f350ee65f948d96e177a7b0bf59fa8e9ddaea021dbe23bbb9ac85dd94f7dcc68af4b7eb1589dd6291bfd81800b460edd0 SHA512 aa5f710e1485729b0f39f9eb993bad586bd93a1fc32476478bb69313c8e4810b703889a47364b5af5a4ed1d8cf344ac570bafebbdd427cf834e79d86bb8f739d
-MISC metadata.xml 901 BLAKE2B 8cdef4e4438351cb99b59bafb932e4b2b960f08b4eaa9917ac2a5d97fd2423781b1ec27a16005ae6470b8f50509ae3c08c2d06f95e452bd2cf00505b7a79ac35 SHA512 6f30f50d2f2173a01e7ef0d4b808352be98b64945b6af1f05cfaa28024f6efccad28984fe0ad31094f8822c5e251c1270765d5905c7737e1b84302143fe4ac09
+EBUILD openmpi-4.0.1-r1.ebuild 5434 BLAKE2B 30b8695cacf0f65506d99a63df4cccac15af7aaac3ad54b75ca3240b646fe6a6efc5952426b61b12fa1c35c9aab1303d98a9ecc19293dd9804f4bb9e5efa7aa9 SHA512 de78d49aea8df2db7e9e2c43d8d577e95c5a3064afe2f988ad45fa463d5ae8b3e87d12c626b24048354ece58bfdb50b7894e634d00f2b5a9febfea2bc7eabaf0
+MISC metadata.xml 820 BLAKE2B b606cd3e91faba78d213cd55ef0f23f03085b78374b604dfa5f2f4ff3add9a6cc4c42b071579e30f9b72197c2b41dbb302d8f393881392f400296ff6b59fe0db SHA512 9025216b610924a248c80843da4e90e615078933d332ca06f4ac9c1fa46bf94a444c6b2704f1ad470f7beed797c66ee59cb961cd88e17c5b5c18d315a2233f5d
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index d909acfe0a0a..e319ff476a17 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jsbronder@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
diff --git a/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild b/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..aaf63224f630
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+IUSE_OPENMPI_FABRICS="
+	openmpi_fabrics_ofed
+	openmpi_fabrics_knem
+	openmpi_fabrics_psm"
+
+IUSE_OPENMPI_RM="
+	openmpi_rm_pbs
+	openmpi_rm_slurm"
+
+IUSE_OPENMPI_OFED_FEATURES="
+	openmpi_ofed_features_control-hdr-padding
+	openmpi_ofed_features_udcm
+	openmpi_ofed_features_rdmacm
+	openmpi_ofed_features_dynamic-sl"
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="http://www.open-mpi.org"
+SRC_URI="http://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java romio
+	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
+
+REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
+	openmpi_rm_pbs? ( !openmpi_rm_slurm )
+	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
+
+CDEPEND="
+	!sys-cluster/mpich
+	!sys-cluster/mpich2
+	!sys-cluster/nullmpi
+	!sys-cluster/mpiexec
+	>=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
+	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
+	openmpi_fabrics_knem? ( sys-cluster/knem )
+	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
+	openmpi_rm_pbs? ( sys-cluster/torque )
+	openmpi_rm_slurm? ( sys-cluster/slurm )
+	openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )"
+
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.6 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mpi.h
+	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
+
+	elog
+	elog "OpenMPI has an overwhelming count of configuration options."
+	elog "Don't forget the EXTRA_ECONF environment variable can let you"
+	elog "specify configure options if you find them necessary."
+	elog
+}
+
+src_prepare() {
+	default
+
+	# Necessary for scalibility, see
+	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+	echo 'oob_tcp_listen_mode = listen_thread' \
+		>> opal/etc/openmpi-mca-params.conf || die
+}
+
+multilib_src_configure() {
+	if use java; then
+		# We must always build with the right -source and -target
+		# flags. Passing flags to javac isn't explicitly supported here
+		# but we can cheat by overriding the configure test for javac.
+		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	fi
+
+	ECONF_SOURCE=${S} econf \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
+		--enable-pretty-print-stacktrace \
+		--enable-orterun-prefix-by-default \
+		--with-hwloc="${EPREFIX}/usr" \
+		--with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-libltdl="${EPREFIX}/usr" \
+		--with-libevent="${EPREFIX}/usr" \
+		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--enable-mpi-fortran=$(usex fortran all no) \
+		$(use_enable cxx mpi-cxx) \
+		$(use_with cma) \
+		$(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \
+		$(use_enable romio io-romio) \
+		$(use_enable heterogeneous) \
+		$(use_enable ipv6) \
+		$(multilib_native_use_enable java mpi-java) \
+		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
+		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
+		$(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
+		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
+		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
+		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
+		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
+		$(multilib_native_use_with openmpi_rm_pbs tm) \
+		$(multilib_native_use_with openmpi_rm_slurm slurm)
+}
+
+multilib_src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	emake -j1 check
+}
+
+multilib_src_install() {
+	default
+
+	# fortran header cannot be wrapped (bug #540508), workaround part 1
+	if multilib_is_native_abi && use fortran; then
+		mkdir "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
+	else
+		# some fortran files get installed unconditionally
+		rm \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			|| die
+	fi
+}
+
+multilib_src_install_all() {
+	# fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
+	fi
+
+	# Remove la files, no static libs are installed and we have pkg-config
+	find "${ED}" -name '*.la' -delete || die
+
+	if use java; then
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
+		java-pkg_dojar "${mpi_jar}"
+		# We don't want to install the jar file twice
+		# so let's clean after ourselves.
+		rm "${mpi_jar}" || die
+	fi
+	einstalldocs
+}
diff --git a/sys-cluster/openmpi/openmpi-4.0.1.ebuild b/sys-cluster/openmpi/openmpi-4.0.1.ebuild
deleted file mode 100644
index 25592104fbbc..000000000000
--- a/sys-cluster/openmpi/openmpi-4.0.1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem
-	openmpi_fabrics_psm"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java romio
-	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
-
-REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
-
-CDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/nullmpi
-	!sys-cluster/mpiexec
-	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpi.h
-	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	java-pkg-opt-2_pkg_setup
-
-	elog
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	elog
-}
-
-src_prepare() {
-	default
-
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	echo 'oob_tcp_listen_mode = listen_thread' \
-		>> opal/etc/openmpi-mca-params.conf || die
-}
-
-multilib_src_configure() {
-	if use java; then
-		# We must always build with the right -source and -target
-		# flags. Passing flags to javac isn't explicitly supported here
-		# but we can cheat by overriding the configure test for javac.
-		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	fi
-
-	ECONF_SOURCE=${S} econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		--enable-pretty-print-stacktrace \
-		--enable-orterun-prefix-by-default \
-		--with-hwloc="${EPREFIX}/usr" \
-		--with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-libltdl="${EPREFIX}/usr" \
-		--with-libevent="${EPREFIX}/usr" \
-		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--enable-mpi-fortran=$(usex fortran all no) \
-		$(use_enable cxx mpi-cxx) \
-		$(use_with cma) \
-		$(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_enable ipv6) \
-		$(multilib_native_use_enable java mpi-java) \
-		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
-		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
-		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
-		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
-		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
-		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
-		$(multilib_native_use_with openmpi_rm_pbs tm) \
-		$(multilib_native_use_with openmpi_rm_slurm slurm)
-}
-
-multilib_src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
-
-multilib_src_install() {
-	default
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 1
-	if multilib_is_native_abi && use fortran; then
-		mkdir "${T}"/fortran || die
-		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
-	else
-		# some fortran files get installed unconditionally
-		rm \
-			"${ED}"/usr/include/mpif* \
-			"${ED}"/usr/bin/mpif* \
-			|| die
-	fi
-}
-
-multilib_src_install_all() {
-	# fortran header cannot be wrapped (bug #540508), workaround part 2
-	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
-	fi
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}" -name '*.la' -delete || die
-
-	if use java; then
-		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
-		java-pkg_dojar "${mpi_jar}"
-		# We don't want to install the jar file twice
-		# so let's clean after ourselves.
-		rm "${mpi_jar}" || die
-	fi
-	einstalldocs
-}
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index d7c9a5a535e2..ac986f886456 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -7,7 +7,7 @@ DIST swift-2.21.0.tar.gz 3025042 BLAKE2B 847b11fa61620cdd07acadd1d4fcc43c9fc53ec
 DIST swift-2.22.0.tar.gz 3070436 BLAKE2B 53049ba901cf5a46d4567c7fa3620b0ad486d88897beb75887d81c5beb747a08ff52e7eba93eab9e9e087c82447d99f0fd85c97211fb4e930ce5b27a1bba41f1 SHA512 855f9d35399251ac86d687b652a9372da4d2f03dff8dee1743357c14c79f6ea8903b7c67d99fed08b6b4cdfa2cfd6ecb78b010b2ee83195eda30c4a9463a5a0c
 EBUILD swift-2.20.0.ebuild 3930 BLAKE2B a34c98f02fe58bf7091945fc3730b40d8b8ffc4523dabf7b6e74daf665d5f41ace12f1907a2dafc96262ed13ab64601aef3d055963602d807d01da794a860ec9 SHA512 0e9f6d58e26c77ade950c749e91cfa0239c0f94ab116600ce20e4250c29618a56492ba93435225373edf2f165a9a6f4a2c3a6781381f571190d1e6e3db72f518
 EBUILD swift-2.21.0-r1.ebuild 4016 BLAKE2B 2234265b662c37a0dcaf5eaab7662d4e8c756c254e25fd95ad02ead7dcb78039d6af7d61f53e17a19f1571e32a612a958e83797e05f568ad33a73adfe5ab0e09 SHA512 4e5a3fd19e2689652f14246401da49245f9d84716b92f1593de2444b5d003218054b957449354a3308bb8af62aa9e27d8b51e9117d6d264cb261c5205403a138
-EBUILD swift-2.22.0.ebuild 3957 BLAKE2B 5787186650f21c35b49f6d34249b385cc9bfe9f8518f79e6d658eb5f7c7d689d6fd0f4029bf54956ee348c7cda29685f967af331d4ffa79051c9ee056b68f1ae SHA512 53aba322f59211cfb3dfd5f158fe9c2e6fecb46688bf6b28bb820d71093a80aaf849ef48239aee398833aa026cbeb433ea1638c5e3c75110a39a6943619b865b
+EBUILD swift-2.22.0.ebuild 3955 BLAKE2B 762991f57c3e94f7179f658402f864b3cb956c722725da35dd431c713e9cb15aa3e3a751513330bd7bb7a64df0d88955f21be73d4440c322f49364771dc4ec7f SHA512 5fd0d198687daf9da9ffe2d304620ed98355772071faa3929b83876599528837e47a732e534616d96b67d800ca94438bc14e52c9b4ee9f1499f55bffe2ecece6
 EBUILD swift-2018.2.9999.ebuild 3936 BLAKE2B 8aedceb1506d24c0a6f4c0d219c3d1a734eb220bb5528c1f4e71e036b78da65bb96a656ba1d253a2a2181362711ec3d121106b3bd2013f3db103f5a61f63745e SHA512 d14f2c823a0d900aab54f7d4c919874372f3f996a4dfcb54595564bc2bafdec9761c5fecb041c54308851b7a1ad1da0ccc3136a399ccf0dd9b94fd329c11918f
 EBUILD swift-2019.1.9999.ebuild 4018 BLAKE2B ded5587949b6bcb9db88032898134cf177990cc6248618cece257093e018253dd343887c8ec106025fa0d999a3f87ffac2e071706b9b968f4522ffe6a2e94557 SHA512 263739a2220d4933511bd3ca8f7d0525f3cfca78511924125d84a02ce7012bc63e7b6c284af31908e769dd0fbb5e2b69eb09b4a436470f17d873f27e92ad7093
 MISC metadata.xml 898 BLAKE2B 3d502769ba44cdc1e3a500929d60a1ed82d8540297b2dfddb6d6745ec9b5b56bd9fe7130a738858b9bac653b49634efae1841600325194d69ec30222b2e8b3f2 SHA512 3f9d2cf7538fe32010b811d3a49802eb085dde793b29d9590fe3032d63a743f620e3c1dcf1226b59aa5938ea239f440997a3d4d489f9887816621879e19a0c4c
diff --git a/sys-cluster/swift/swift-2.22.0.ebuild b/sys-cluster/swift/swift-2.22.0.ebuild
index 20826c55bc75..a88677f29fd8 100644
--- a/sys-cluster/swift/swift-2.22.0.ebuild
+++ b/sys-cluster/swift/swift-2.22.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="stable/stein"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 8dabf44983d3..cd20199f2d03 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index 175523d550b7..94779e95a815 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -10,7 +10,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-r1.ebuild 1628 BLAKE2B 19a04fe8871142b79852f2104d7e0a5986cb56cf33426a1c7f060a43c5301e203a17982aff36b94c2587242d0b19860d06b844904fbd1573b482b935ddf56718 SHA512 53c036ea3571cdf5afd1eece6a6f3a139f11372e273747344da7aa40ffb847c29230ad8ecc17af2a5dcb94a2bafce96cd1885b505adadfc1f23ad1c11fa31aac
+EBUILD autogen-5.18.16-r1.ebuild 1869 BLAKE2B 232d34c5ca35de43fa4441fd058ba46b653cb5298a477f7539382b7331ee2edd1af6d78924d4f5373d02346c4873e0fe701f5372feed0d041c133c35a36f5f7e SHA512 b1bd9e7ea47561b38b8e763fd25860aecb3bfeceaaeb85326adc8226662bfb56b84e67da1f149300e1b78e3c83864bb240b3cc4a82c67b9caa919b7540b381b1
 EBUILD autogen-5.18.16.ebuild 1567 BLAKE2B f3077c810d9e1bff53730a57b687bf3c82b899035c84d193f5d491999c87c29ea16ef5622501dad821e9af27556ae2f8ba7a9c5fd25cf24c9bb5488ebe3bfca8 SHA512 4125f2681f8973577e0667d09017145b3c91b3eda8f8ae1504f605893ada5e22a0cb7ae9572f752527f54af3e27091f7ed9f1e7fc138567a5f42f665c7918677
 EBUILD autogen-5.18.4-r1.ebuild 964 BLAKE2B 61f358436309dea7b7f8f7336e9d1bbb689f4c5b901fe0997cf01f8f682e2d8d40a69555f71a1dd57067301e3be520866f1abe7cb59a16643ca97024144c7c3d SHA512 ff910273519ed23d1307b1e37180eb2678c3b2474db7458a62caf187480b076187c1129e32274d7ce11058f92e79c0dfefefd91ad17046f2239c39a91c5e7567
 EBUILD autogen-5.18.4.ebuild 977 BLAKE2B 959781466ca3fbb9b5a1a1817502c674628dee24c021fe37ff84294355a604d1015c22191a15e1dfb740b9dac03ba827d9e581bcca3431c930aa601180933d7b SHA512 597b14fcaefb0f95a8add36e74418060857abfb622769b813f1701a87c6ea8c3d78a61a71183e9ee60c2e348643696233cf47a6647860615ada22c0bd50843d3
diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
index d69abe1e265b..b2f45d68237b 100644
--- a/sys-devel/autogen/autogen-5.18.16-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
@@ -43,6 +43,13 @@ src_configure() {
 	# suppress possibly incorrect -R flag
 	export ag_cv_test_ldflags=
 
+	# autogen requires run-time sanity of regex and string functions.
+	# Use defaults of linux-glibc until we need somethig more advanced.
+	if tc-is-cross-compiler ; then
+		export ag_cv_run_strcspn=no
+		export libopts_cv_with_libregex=yes
+	fi
+
 	econf $(use_enable static-libs static)
 }
 
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 21e7466b3c0c..c466dec31d6e 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -21,6 +21,6 @@ EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bdd
 EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289
 EBUILD binutils-2.30-r4.ebuild 12023 BLAKE2B a30f16d4bd14247b3528ec6647190e066a01cd1b5b11f8eb14f132b73bb520c38acfbe648d683c64b50feb46dd70f6ca8835ac4405100ceefc918552e80a0239 SHA512 208574e5c850d00402d6630d7ef30b9216fdabec8aa0287f3f379b3c9d4d1315c8b4b0e55016807906c1bb01c3fb6941712606004ad627c78a950b632a45f2ec
 EBUILD binutils-2.31.1-r6.ebuild 12418 BLAKE2B cc585caed5c8f42bec4b4c9023b0f3dfbc2c128c158f1a907d226129dab62958f1ac5da6c063fc5581b42254dbacde585985849f3de160c9b4a730712cb661fe SHA512 379bcc5f5d4742be1537398db91d5941d2f069341018f67011d56ec8c094319d0b33368564cc8e0769fa3168d0de37a8b66d14d7cd41d2002b0dcd13796eba17
-EBUILD binutils-2.32-r1.ebuild 12624 BLAKE2B 76fa20733bd5066fabe2e4590657dba83a32d3cdbadfa09ced6d5d8a92362aa33ca089ec5c9c0b909926757fc8a22cecd1c2c91a85f6a09803c6289f6ca49462 SHA512 2c4df0c315e7ed32d21a794a4e19d6ae985f6d867728454630634b5641e391e0efcc5297907492ebea15b8eebde655975f797be4e330c19df52b9df04028990e
+EBUILD binutils-2.32-r1.ebuild 12623 BLAKE2B 54fa4f6ed2c4a96b78eea139fa9992243706d2cda8ba6c50688ad55678cde610e9de5f945694b2de1e087c282b48458dce7e4102d5302edd4d653b60e1324968 SHA512 a2e9db9f3535abf9db17a81c2d006188f4894df7e4188ed4b06212bcfd40f834525026a12e0571c35ca71051b6caf1177a1fb4969cfdad5c6d364f5be0c4e447
 EBUILD binutils-9999.ebuild 12128 BLAKE2B 593fbabb2debe0faedface04a49f94e16c5c8aa4b7276a365bb159f8e2334b525315f91c8123f3b47420acac3efd05188629f98e609e964879ba4d0e91f0e4e5 SHA512 423085df8080716a64589d7bf80582d5bd26a46eaf0e6a8213bc684d5784ebb857cdf894f527a39f5a67b3be45428b8bc54241e8a85225f096ff095e9d7962d4
 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2
diff --git a/sys-devel/binutils/binutils-2.32-r1.ebuild b/sys-devel/binutils/binutils-2.32-r1.ebuild
index c1e39fee45ef..184c0d38265d 100644
--- a/sys-devel/binutils/binutils-2.32-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.32-r1.ebuild
@@ -45,7 +45,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(get_version_component_range 1-2)
-		KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+		KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 		;;
 esac
 
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 0542128e4aea..764b23e41619 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -2,9 +2,11 @@ DIST crossdev-20181020.tar.xz 27172 BLAKE2B 8a388d5201ab419b865b96a4314190a693a7
 DIST crossdev-20181202.tar.xz 27184 BLAKE2B d1770f5148d666b22a20576b638e71bf6325e8a61776b8b47ecaf2e5437150554f6973c5306d233a836e4ffe3ff0480167c9b877c5f9e733681fd502016a19d4 SHA512 896bf050c81f3f34b2be187a851832494c039aa93177c806b689a75d16567f178e4ca33c21282fc320506b76e09b0cde8a45976b6309bf9bc5be8290db3dd8af
 DIST crossdev-20190311.tar.xz 27176 BLAKE2B 444828314b4e5363e9603a1fea8034e0b2b604a164d8efd6c31bf15591080daebd936eb2881c83e165f945742d11f54b04bf5f59b4ff39c048e55fef9989d268 SHA512 1f572df09204e297efd6e97001aad929226f26e9ddc706568680d75b1746a624e86c1578c5d3ee1e52ece0bbafdd17ae59565f3098864f018768c2901821f4ff
 DIST crossdev-20190712.tar.xz 27240 BLAKE2B a2d09a21df1eeeb16ad03c7415a58e3d3424221b08d1a672167945df8ebe9b6c1898ee3f684d8653ed088cc1ef0155de0156b14e2a77bb47389c6f3e277039d7 SHA512 987c29b7e36f94e1bd14c4072514a04d6655a41a922cc179e6cd12bc78a71dd60202d202c40a107365297fe11c6e2bdcbd2a3cea21b5b7260c0b8608d9d3ade5
+DIST crossdev-20190901.tar.xz 27180 BLAKE2B 879616453e883c54c9646e9111aba0fca86bda36c3f1fb327a4036a140c58b6b09498fb8e2b6d8e19dcd5efe15245d70585c6b4b463ec9f58ed5c2b84395fa49 SHA512 42d31626f798136df1d9000d0de325d53d51746a8f187001279090b112fe05862930110d2ef877d14dfc9a6d111649f3e335e1bb8e023696a69129592b6a8976
 EBUILD crossdev-20181020.ebuild 853 BLAKE2B d9a5fe47015d1d73a4b54b91cbf745780ad2fcafd857a11e4bf7b4ba2cc3c54c75918a491f5146c25626bbb271c2ff121fd6b524a2b54a52e4a4d5e1ba1cf262 SHA512 d19b06a4d29e3a43829db890b5b24180a3a6979f446dd9ce4e131ebdbd4f1dd547133d2aae718c146d085813323ad2223a5f9ef8b07091757927a06bca86ac78
 EBUILD crossdev-20181202.ebuild 853 BLAKE2B d9a5fe47015d1d73a4b54b91cbf745780ad2fcafd857a11e4bf7b4ba2cc3c54c75918a491f5146c25626bbb271c2ff121fd6b524a2b54a52e4a4d5e1ba1cf262 SHA512 d19b06a4d29e3a43829db890b5b24180a3a6979f446dd9ce4e131ebdbd4f1dd547133d2aae718c146d085813323ad2223a5f9ef8b07091757927a06bca86ac78
 EBUILD crossdev-20190311.ebuild 873 BLAKE2B 6ba21dec4b1fcf5a36f23ce56c07cef4eb5f00ae08cba636354c966e83f19569c9d3772f112e4a033863cab938ebd6a476fd731f18284eaa4d64f7e8acbfd961 SHA512 4ca24706a276064a3c4a89667ac4d8c6033796db077e06d7bd28f18e218a6c0c018a890789216cace24bb228c3344975eb287a79df49a5c40b851d77a7bf3e78
-EBUILD crossdev-20190712.ebuild 873 BLAKE2B 6ba21dec4b1fcf5a36f23ce56c07cef4eb5f00ae08cba636354c966e83f19569c9d3772f112e4a033863cab938ebd6a476fd731f18284eaa4d64f7e8acbfd961 SHA512 4ca24706a276064a3c4a89667ac4d8c6033796db077e06d7bd28f18e218a6c0c018a890789216cace24bb228c3344975eb287a79df49a5c40b851d77a7bf3e78
+EBUILD crossdev-20190712.ebuild 860 BLAKE2B dbd958904546375349ac0ea43abc0614cbddc0ef834d9134ebf4a70fcaa59c62f13cd5ba1d5687fac9e6f4ea33cfa5fa99dcfad1e1345cbbe7e34ec56f9c4857 SHA512 9cd21e0ad7c5744226e75931e9c3c0fc3598ad8e3c015042418fa65007ea21061b91a698622cc806a53c7d8ac26fef28302ab5c560356896cf3ffca900209948
+EBUILD crossdev-20190901.ebuild 873 BLAKE2B 6ba21dec4b1fcf5a36f23ce56c07cef4eb5f00ae08cba636354c966e83f19569c9d3772f112e4a033863cab938ebd6a476fd731f18284eaa4d64f7e8acbfd961 SHA512 4ca24706a276064a3c4a89667ac4d8c6033796db077e06d7bd28f18e218a6c0c018a890789216cace24bb228c3344975eb287a79df49a5c40b851d77a7bf3e78
 EBUILD crossdev-99999999.ebuild 879 BLAKE2B 9ac2da81d2ce3e295b1ddf9b4c5febb91718a37badefcadc32c984523169a455001e14d591d4873bcb3e691fe4b8b532c45e379935de71d573aef47b438275a7 SHA512 f3420056b96dc3bbd175638eeb4cd16779d8676db61a25635d60533f9f1d08ec434e4e70e8c00001eb8a961bd79aa3b50d20729c2cddf14c4225fe18d801bab0
-MISC metadata.xml 356 BLAKE2B 2220babfa5cc38c63a0e8361b84d1f3b288e5d050fd587562cac160621a60efb109df5af98b6108c1cd442947911d76db38cc9b82ef83c7a52553d5dab231116 SHA512 9b90e3370e18885739fad8a1ff7fd420eae5cf188fde84e8aec8002bbbc390291bd37481e308ad584d33e643e9d17a47000c8ce0852780ff18c0bfddb7327cae
+MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20190712.ebuild b/sys-devel/crossdev/crossdev-20190712.ebuild
index 36e054f04b26..81c40d108dab 100644
--- a/sys-devel/crossdev/crossdev-20190712.ebuild
+++ b/sys-devel/crossdev/crossdev-20190712.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/crossdev/crossdev-20190901.ebuild b/sys-devel/crossdev/crossdev-20190901.ebuild
new file mode 100644
index 000000000000..36e054f04b26
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20190901.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-2.1
+	>=app-portage/portage-utils-0.55
+	app-shells/bash
+	sys-apps/gentoo-functions
+	!sys-devel/crossdev-wrappers"
+DEPEND="app-arch/xz-utils"
+
+src_install() {
+	default
+
+	if [[ "${PV}" == "99999999" ]] ; then
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
+	fi
+}
diff --git a/sys-devel/crossdev/metadata.xml b/sys-devel/crossdev/metadata.xml
index 496c0ca9a6fe..1721f3415795 100644
--- a/sys-devel/crossdev/metadata.xml
+++ b/sys-devel/crossdev/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>crossdev@gentoo.org</email>
-<name>Gentoo Crossdev Team</name>
-</maintainer>
-<maintainer type="project">
-<email>embedded@gentoo.org</email>
-<name>Embedded Gentoo</name>
-</maintainer>
+  <maintainer type="project">
+    <email>crossdev@gentoo.org</email>
+    <name>Gentoo Crossdev Team</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>embedded@gentoo.org</email>
+    <name>Embedded Gentoo</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 94a710c80dd7..62342df87e3a 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,4 +1,4 @@
 DIST gdb-8.3.tar.xz 20490300 BLAKE2B 24b2a2a9bda7ae8093f757e42d6d0ab5642ff1d7e5a832896c28c5b17961166072c0dae158c04d7f7660cb059194c259bcff71ad5763960027b0ac3d7045eb1a SHA512 47ac074d20a09a3fac8f4a41dce0a0cbe6ef702f7dc21ba8b7d650d306128dcae481e9a16bf65e596b3a541dc82ae57c02bcbb786d551b4ef3e2917b9b6f0ae1
-EBUILD gdb-8.3.ebuild 7195 BLAKE2B cf61ce4e763dac7ba2ac06c09187347e91a4e977add25e56beb7936cd7fe657f3b0601f37e9ad17bde908f104c4ee906f6c9c9e7208b0d14e1485746317fced1 SHA512 64926d922cf7109e6ade7daa7d51b1942d7da0fd5a523b74c5ee9ceba454b00f4dfee9701227b869ffe2a60ba45dae20aa3239b099c363f16381fb673ac4d968
+EBUILD gdb-8.3.ebuild 7194 BLAKE2B b99060f1a38cb582e5455ddd334c49c1a4dbcbd7a97fdd5983c19d60a503bdb3bf90957e835070b823d5a43eda584b625081e484a772f6be0dc7cebb46711aa1 SHA512 18476bc11a487720655b30128da1aa4a1d929ef14393a4da0cfce65522f1c801ccbb6b20a53bca7fb66298ce02753dae4a77e1fb22cfb67f075e55e21a44c166
 EBUILD gdb-9999.ebuild 7207 BLAKE2B abb0fa5f13c95a6dd64e9672e7149b871eaf6fcfad0d74ef69addb10779d0cbf299dfa730f117748ad5debf56fafd56807a7853c976eee1017240b5a3a442ecf SHA512 db11a68493bbddebc1a703dddc3455afd7417d7e2c57fd9aab57c18e3372c35a52aef4d37bfe7ec0e861e7dd324e904d55f92d9098bad35bdbf8febc54dde8b0
 MISC metadata.xml 1021 BLAKE2B 81d865fbf0282b889509edfd6901654f25e60474be0eeca406803dbee20260da840f323f036818edbe27635e5a8c944b53bfba9fd7b715301d1a3eaa50898dfc SHA512 2255a18e7275069a9d8011f8360399444924ca6a3baef788c2e44e790896ba388c974fceb36ae2d394afc943b481a785ec3c11657e5018b7cd5db0eaa869c530
diff --git a/sys-devel/gdb/gdb-8.3.ebuild b/sys-devel/gdb/gdb-8.3.ebuild
index b6dffddab4cc..7a92d8c02987 100644
--- a/sys-devel/gdb/gdb-8.3.ebuild
+++ b/sys-devel/gdb/gdb-8.3.ebuild
@@ -60,7 +60,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml"
 REQUIRED_USE="
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index 8afd131a4d34..c0ea63ede103 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -43,6 +43,8 @@ DIST gcc-8.3.0-patches-1.0.tar.bz2 12278 BLAKE2B 793465c5de0af850c7f3017b3011e68
 DIST gcc-8.3.0.tar.xz 63694700 BLAKE2B 71df2ff5bd6874d57519c2e9af6b22152c8c4d7fab906a5f427b41bc4e8e742127592a8684120d9d3c9ce6241439531850be08ec0a4f29dbfdee95435655fdca SHA512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
 DIST gcc-9.1.0-patches-1.1.tar.bz2 13931 BLAKE2B 55e863514f41f1af11b1f6f618604edf7f173b4c4ef8df1301ccaf4577355ed03a34b04ab50a6cf4e50317b7f047f279e4212215b183d0642f138ee5163f655d SHA512 ab850bd38902c52586fc84dd1b2da31bab857412db08dce96642f17f213c95bae029bb1be5e0ac4bb12e55f863ecfc2ccda67635e8bc7b54383b2813642d991d
 DIST gcc-9.1.0.tar.xz 70546856 BLAKE2B 0f7e5575aebc24113d12a56eb3dbf4bcdba3c656a76513c44dbbcded9ee71629727f24949bf2e1424682a9e5eda7c51eed93317e6f80013f5a837aaf25b82805 SHA512 b6134df027e734cee5395afd739fcfa4ea319a6017d662e54e89df927dea19d3fff7a6e35d676685383034e3db01c9d0b653f63574c274eeb15a2cb0bc7a1f28
+DIST gcc-9.2.0-patches-1.tar.bz2 12836 BLAKE2B c29516d2877229129cc69ebb781198918f0e59e2a4631f3b2933b5a6db61d50ef0d2e78ee9acaaf1c50c597aad3203d81e49d4e0674f7ac74bdedc401238940b SHA512 0382ed0d483955079bd20fc15066b8f45772651bcba83dbed2c35e51f7259cfd28b825243c6a49a0bf51d9ab1eacec3cf55c47a00d2873d6122d32b9fc05d87c
+DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
 EBUILD kgcc64-4.1.2.ebuild 1168 BLAKE2B b9092641f591201dcb6c59767dac678edc30552927d0850358b308544ea5c85edcdb160db582348679b24dd2a56350476ac6292ab5bed5b0f9fee6df23618896 SHA512 20afe58f1789807d68af569b54cfa0222d82cc8b9f73a50a754f8d0c8ed70a9655ddfb33043caf252fad28563211f716e51204a25fedbfbe5c0d8d47fb8f5fd4
 EBUILD kgcc64-4.2.4.ebuild 1044 BLAKE2B fe27d00088a1dbbafe880dd2ab3fcbb3a5588e918b9a0222225aa8ce0cf46b378bee9f2c77ebb8ad0a1fc7e81d4f6aac5f7fe47428164674adda74d760e49e8e SHA512 604992390f8babdeeacc5afa90934a7b6bf0d2d70d31e4dfda597da8a5f8d62f1ba6c1ccd491ef4ca814e87cc0d9491b3907e452ab51c84f15c5d5486c302c02
 EBUILD kgcc64-4.3.5.ebuild 1101 BLAKE2B 9dc7c4a0948ad9d187749c4a4334cb1755150069d73be88b5e297bc904cc2f54204af9da37347dc787cf6d9ba16401eb422f260480d132d7aedf6f74ef897481 SHA512 04f1dda7aab17364756555b4bbec110437166b6a361067b6e29dd134cdf912581ec76605be99e06a93861b71654867a3af98f91e3e1c35556401422ee9857628
@@ -64,4 +66,5 @@ EBUILD kgcc64-7.3.0.ebuild 1256 BLAKE2B b87b6ed043bd9fb82e3082d4ebf52faa1ad0d27d
 EBUILD kgcc64-8.2.0.ebuild 1417 BLAKE2B 5719bf546721d85a78dcf81a0264cb51bbbfef5f6963dbf0219018c34a65da0ba4d36d0e8f9be4228b7da3d291f29b3f822ae0dd4511fed864275ef6726caf95 SHA512 b347147977439b6257675f4fb1fca9f0bd5828571c7ad6bd0623d7350bb85ef472906728ac7b4f17e8cd6a16b9a0ed56396c68c371eb984191c4225e3cd74c5c
 EBUILD kgcc64-8.3.0.ebuild 1253 BLAKE2B 380cc764ddf5e4619e33f62795922ba3cf64c196c8937b74e491dfce25427c60fda3105a38a484c465123852f6ec89343a301a74043541db786e2d828c499cea SHA512 08d00606e0b5f603d66e3d7398c56831c4a9f8c612a42955eff195c60c3e6a2cdaa9bb203fd076a70795eb4ef9eb41e445f0f41dc204e250fcd770bd9c1c53ce
 EBUILD kgcc64-9.1.0.ebuild 1084 BLAKE2B 4fd8dafcfd8dacbe4daea58457434a0f66da7b09589b4ac4281d9b13cfad92f9bc82e6f19f7f3742267b2b3d20a0d86d135daf82ba1e729535054850dfe3ede3 SHA512 4892d29f5a0ef47402b37966e218ecc722a0352ffcb4fc8b77681b58b2c77788a523be434df77f6b252cc3542fcc0d8950a6553d05077bafe44dc6ba3065edc8
+EBUILD kgcc64-9.2.0.ebuild 1082 BLAKE2B baff05bc1722cdf84f36cdf9500cbe04e861a47a20626e0f2bf49754355b21684ff83d8135367fbd9a43e9e6cc0496733036bf4f75290536fb507dd5b655ce15 SHA512 8982f56eaf2a0d7957464ef18b5ab560eaf1bf3578876a58c0290d4895a7e0450058dbd2cbd642ff2077d4faa2be83cb54206ec64425c453bb27a2e0bba85862
 MISC metadata.xml 391 BLAKE2B 74b9e74159068a03a6bd89c2f746c0da70d46da728916e67743ce770511962f9312937502be1540c3ca00e4bc94699f792c0f26b847d97f989a67282aee8b7b7 SHA512 2706ffd3bd99ac2ddb63bee433322d96264cf2a1f7abbc1356dd8ea9ba3ca6e43f5aa7a9723defe5bf01153c1eb4deef18df55fe904bba25a9c2ed75755e83c1
diff --git a/sys-devel/kgcc64/kgcc64-9.2.0.ebuild b/sys-devel/kgcc64/kgcc64-9.2.0.ebuild
new file mode 100644
index 000000000000..73a7576ad10e
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-9.2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+case ${CHOST} in
+	hppa*)    CTARGET=hppa64-${CHOST#*-};;
+	mips*)    CTARGET=${CHOST/mips/mips64};;
+	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+	s390*)    CTARGET=${CHOST/s390/s390x};;
+	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+	i?86*)    CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+TOOLCHAIN_ALLOWED_LANGS="c"
+GCC_TARGET_NO_MULTILIB=true
+
+PATCH_VER="1"
+inherit toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa ~mips"
+
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+DEPEND="
+	hppa? ( sys-devel/binutils-hppa64 )
+	!sys-devel/gcc-hppa64
+	!sys-devel/gcc-mips64
+	!sys-devel/gcc-powerpc64
+	!sys-devel/gcc-sparc64"
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	cd "${ROOT}"/usr/bin
+	local x
+	for x in gcc cpp ; do
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
+	done
+}
diff --git a/sys-devel/parity/Manifest b/sys-devel/parity/Manifest
index d309b71e86cf..92428ad3bbb1 100644
--- a/sys-devel/parity/Manifest
+++ b/sys-devel/parity/Manifest
@@ -5,5 +5,5 @@ DIST parity-1.2.6.tar.gz 559357 BLAKE2B 733721306e02e50d5fc65859b77d562c4fd5a7df
 EBUILD parity-1.2.4.ebuild 1840 BLAKE2B b2f7e16a0991c862e70e32a6dbd1c5b0825579983e408cd5230b2b6678272405f8c538cc79e8cd89ce981251a66b17f9f5841dc3ba810fb7306ef6e035fcac83 SHA512 b9a729395449b6265357c134b56046bd3928dfb2c99a526e402be319c74f04ddfeca107ca15db3c405ec1d9a9ed2b512e24aa48f7d57db0ae485c6ce86ff1379
 EBUILD parity-1.2.5.ebuild 1840 BLAKE2B b2f7e16a0991c862e70e32a6dbd1c5b0825579983e408cd5230b2b6678272405f8c538cc79e8cd89ce981251a66b17f9f5841dc3ba810fb7306ef6e035fcac83 SHA512 b9a729395449b6265357c134b56046bd3928dfb2c99a526e402be319c74f04ddfeca107ca15db3c405ec1d9a9ed2b512e24aa48f7d57db0ae485c6ce86ff1379
 EBUILD parity-1.2.6.ebuild 1912 BLAKE2B aa23528b4e873248845648dbeb3b065f1b96e7dc402779f572c12bcb094396bba497ce9aedae51d5c8adc0e89fc5193287fab44c06c8793644e2dc9af32a5ce6 SHA512 3472126d0cca7f23f207187fe648c48a31abfafb7440a815f1a7dae952b53a42732fa3d50dae3b3e3eb5f5b42c00bfcd847f108a9845ecd21ecc440245b47c99
-EBUILD parity-9999.ebuild 1587 BLAKE2B a905b5192b5a9501c4c2daaad839647cc88757925e3c1de980a8838442e8c64771b2594ef76f33fa6e8af6f6200f84571ca4c5d98a160a3ed64fec36c6810128 SHA512 ea01e0224b73c1bf94995908467ba82062f6775083ada2a62f1a381eb368bbcc90636a44852de3a336166c166bdf0c1465dfba9ce0dd722ecc83ad6983090c28
-MISC metadata.xml 1089 BLAKE2B 42f41264a860009c3edc2a64bb87cc797e2b9fb9d11b7b8aa6dad187518b30c65c514adb931b9a5d5afb4b10faed6faac389aae1579aa06a670025a58d602794 SHA512 95540f4712c65941bbe51acaedd715a6b18cf4945d0d5157f6157255596365842c4f1bb0cc79dc63aa4cbed4ef130f10ea4b6f8d6e04f269eaf1c96230feefd8
+EBUILD parity-9999.ebuild 1764 BLAKE2B 3a8275c1a5807cb47b8797079c0e0e014b9bd6c91fe4499991cb06dc983cd8b0845e58fce6bcf13787806ae5a516c86f511900cfe752ed1d9d91aade66900336 SHA512 54d31b9ded689c7c4fef7277ae0da942009e87c94f5e66fe14fea42b61a9df8ecdc8598bec16edf3246d4fbf06a654adec91a87a97eb7df85b7aecf4257b797e
+MISC metadata.xml 1167 BLAKE2B 3d67fe08381e493a73ff9add1c70c1894ddb9cf250a022a39093fe9460dc1defaf771b0c6589f0d4026f4f75d142970b189fe59ab1f8c12db3c338e3dec1a7ba SHA512 c4f930164516bf18f2b911684e5a3bc11b337e50314ece31210abc58d327b91ce5845d0e3d7da85e71026f5e3657e362a66c34bcfa3f1569bce5c348dbcefccc
diff --git a/sys-devel/parity/metadata.xml b/sys-devel/parity/metadata.xml
index f6466ef21aa1..b5ae82a3cc83 100644
--- a/sys-devel/parity/metadata.xml
+++ b/sys-devel/parity/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="vc14_0">Enable support for Visual Studio 2015</flag>
 		<flag name="vc15_0">Enable support for Visual Studio 2017</flag>
 		<flag name="vc16_2">Enable support for Visual Studio 2019</flag>
+		<flag name="vc_x64">Enable support for 64bit Visual Studio compilers</flag>
 		<flag name="vc_x86">Enable support for 32bit Visual Studio compilers</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-devel/parity/parity-9999.ebuild b/sys-devel/parity/parity-9999.ebuild
index 38577c8f86b1..50ab4b1e491e 100644
--- a/sys-devel/parity/parity-9999.ebuild
+++ b/sys-devel/parity/parity-9999.ebuild
@@ -14,14 +14,20 @@ fi
 DESCRIPTION="A POSIX to native Win32 Cross-Compiler Tool (requires Visual Studio)"
 HOMEPAGE="https://github.com/haubi/parity"
 
-parity-vcarchs() { echo x86 ; }
-parity-vcvers() { echo 7_0 7_1 8_0 9_0 10_0 11_0 12_0 14_0 15_0 16_2 ; }
+parity-vcarchs() { echo x64 x86 ; }
+parity-vcvers-legacy() { echo 7_0 7_1 8_0 9_0 ; }
+parity-vcvers-current() { echo 10_0 11_0 12_0 14_0 15_0 16_2 ; }
+parity-vcvers() {
+	parity-vcvers-legacy
+	parity-vcvers-current
+}
 
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="$(
 	for a in $(parity-vcarchs); do echo "+vc_${a}"; done
-	for v in $(parity-vcvers); do echo "+vc${v}"; done
+	for v in $(parity-vcvers-legacy); do echo "vc${v}"; done
+	for v in $(parity-vcvers-current); do echo "+vc${v}"; done
 )"
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index 644d11554a80..8b168493e102 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -11,6 +11,5 @@ AUX patch-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch 860 B
 AUX patch-2.7.6-fix-error-handling-with-git-style-patches.patch 3582 BLAKE2B c443abb5112283aeb20db4ccf57c0d1241bfa586ad8d54d0ff2e1ae9026174f560df37dda1fedfc39db8178db05f77a4f94827ede80982311f475f460e4ae57f SHA512 1c05cf05b7348b86c878bd464a3f2f978b3e97655bf4f9aa83732af8bfd1e82046b88db39b7ce70e33ffc00c7f09c28ba777fba3fbd9538fd76767bfc396f382
 AUX patch-2.7.6-fix-test-suite.patch 2610 BLAKE2B e750283b85f0cb9d52324f28b8a03087980e8a61b16c3465914eeca65a3b800d8946a10c4dd0ab08b18c1cbc37810e55fb5c35314082a8c11e383b7d50d1bd3f SHA512 7ced1f9b937bf62131654d8a25c8d2a3f3cfe5fa8961e2e000542cce68061b10895bc0001ded898b9a43608af1f9c07903dc5c2f0a41662470d97188ed682115
 DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd
-EBUILD patch-2.7.6-r3.ebuild 1298 BLAKE2B 877407aae8120af22287b88e18b6ee7c32b4b0a23b38b1d6d32aa59ead1b04f7d8c88255502200992a2f81b3de6ef4ce0034ecffebb331d94244e81df2fcfd1c SHA512 17273f1362407e6e3841e859329b80bed8bee532dc865f54e046f858cac2d7b7f92b3fe5aa2409b7bed8236ad15b7c55841ddea0db7d89238f3c6b21f4c8f179
-EBUILD patch-2.7.6-r4.ebuild 1685 BLAKE2B 64246ce2a49e6e8314a1adf051a4b5cb58bab797acc296ecacf5a602a26256e2870b96b52d6522faf10c543c4250eb04d24953581bc7b1c3900c998240155c69 SHA512 73d04bf12481de8f2476c40af3c8e499acc17fd48455494905b2f94ce5751266bc8dd0e8f353df5034d8d4ebb455d97b5b4a83e58575565c70500f02191646f0
+EBUILD patch-2.7.6-r4.ebuild 1679 BLAKE2B 7a5facb177d8ab7d160abc12abf4b1dadab2607f998d9bc53977757d27f3c9c33ab9c00a85062fe6b5d136675ddc895e9c47e0a30abdc51dde871652d8b88fac SHA512 51cdb683e5b0f239a4a0612503a2a6a1498a8686cf2540601fcc93a2bbdad42597388d2478c52926413653c7cb47d7f8da9cf70f50597039191e50db1aaee861
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/patch/patch-2.7.6-r3.ebuild b/sys-devel/patch/patch-2.7.6-r3.ebuild
deleted file mode 100644
index 6efd86348705..000000000000
--- a/sys-devel/patch/patch-2.7.6-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic
-
-DESCRIPTION="Utility to apply diffs to files"
-HOMEPAGE="https://www.gnu.org/software/patch/patch.html"
-SRC_URI="mirror://gnu/patch/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static test xattr"
-
-RDEPEND="xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/ed )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-test-suite.patch
-	"${FILESDIR}"/${PN}-2.7.6-fix-error-handling-with-git-style-patches.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-6951.patch
-	"${FILESDIR}"/${PN}-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-6952.patch
-)
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myeconfargs=(
-		$(use_enable xattr)
-		--program-prefix="$(use userland_BSD && echo g)"
-	)
-	# Do not let $ED mess up the search for `ed` 470210.
-	ac_cv_path_ED=$(type -P ed) \
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild
index ef42ee0ed008..b480b40246ed 100644
--- a/sys-devel/patch/patch-2.7.6-r4.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static test xattr"
 
 RDEPEND="xattr? ( sys-apps/attr )"
diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index d7d7bc7d6d33..2d88dd2dbad4 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -2,7 +2,7 @@ AUX prelink-20130503-libiberty-md5.patch 2604 BLAKE2B 4e6eb6cbcd91ea31a090eddb92
 AUX prelink-20130503-prelink-conf.patch 910 BLAKE2B 71049a340b7f2d01c3b68b417296023bac432581ee5d9569ab707b1f9c308947e9d515711bbc528d99594f079700655046e9ea773eb7165758408e124cdc3d9e SHA512 640fce42bac33d76a9ed312a138817695b57b03e7b0d1c57b074903739c3fb3b7c64b8c0d839687dd60fd50054d682f2f095c3f0eff7d5f4fe505d6c334267b2
 AUX prelink-armhf-dynamic-linker.patch 519 BLAKE2B 1cc1790256e9c9cfedccb200dbcfcacd61e6dfe5165c9703a1ccd098c0e5b07c4053b9da6a46a309242347e27478ab47b12c95bf3b9e83e6e6f19e118b97669b SHA512 af898440f11af102d6d4b95ade2ed267dc5e3e01407ded17ca2df7454ee845f8177c0316e9bc73838f3965f5000f58ac51055588fdb4a90293cc431e07e9e467
 AUX prelink.confd 1677 BLAKE2B 009d62e2b8342d9b1ee1f4a4f09ba290099071624c1d5165e672855a99a49537fb0791390bd7943ba15a082836f5ab985f93c95342b46364e1afff0497e39643 SHA512 d9edf2535d0b5f1effa797882abfc1cae71a4944e7a443880845a6f860d160125f2ab3a1d69db444e31a35b62a09ed661adcbc1ee62539e9a73f270d33602e9b
-AUX prelink.cron 2424 BLAKE2B 511745b46843015f61965b8f81c01b12fc54dc36e77a1649d07cf940d338083eaba178f752be4243c823b442b59bde2212bfc51f9e4fe52afe6354f05b514584 SHA512 0c336bcd3b77fabd978d637b4063bb88ac6a675ba910b374af0373a0a7567ecffd356bf5a5532d66fab119d975fd7cc4f3c359b46f2696d313388aa6eb140f7d
+AUX prelink.cron 2452 BLAKE2B 5e6ad6afd895c09e12e6bf1836e94fb3461e2184464f09c2afb31d45554a66ac14236f463568c644897c1b82404d4cb8f2c290bafd85dac4f001f39db07ab4ad SHA512 1123d01fb08fc943d21362d53ce7c1fa79e3997f3567e854982ced9cdd4a7b0e73d860401d09a35382ef7af9f246c9911aac182197a87938e6b3b0c178524151
 DIST prelink-20130503.tar.bz2 928040 BLAKE2B cb0e6fbff85b57c8698f22750377461e127bf89f6d03e6fab2338cc50dc280036ab5d1f56b0e8eed5ebaf391f8e3e0d3c32d9df6499fa17e2e556656ba13966d SHA512 69138a695e3e535deacd8224f6f8364ff64b8868b87b516d1f3392d9df968f77265177e9fede09c38f16aa878f9fd57a9ec39f0d9deabc0c9c01609b11156ba3
 DIST prelink-cross-20151030.tar.bz2 701337 BLAKE2B 4875b936254a03afd0eeb1ee81ee99f97a2d654b7c0379acb80ea3763412f3e892c366a9962ff3e1493bba9c83a8a140e79a1d5fb08b269a08ef596d63fd1d32 SHA512 75edd8617b95ae5bd3bfc968732ee142c968855c97c5b2b93784d3476a9724e0fd9a4eb7af681a5356616a4f023e24d5c5a2e75fb57e2a25b142cc901d9bfcaf
 DIST prelink.pdf 474129 BLAKE2B 6df5d4998d0822a8032c5dcd1103d7eafa8e9002f2cbfa8fa821131d7c804d2998100dc98d310ae3ae601137b6815435ecdd2684d547a8d25025984c20c06318 SHA512 86b7163fcf6f43d1764183b3dfc30aad8de99ce198b2721af276c81fc361e9f5fd8f4aea1e8e0c653f0566e8346dff4b4ba72909359167aa92c094f5561d2e1e
diff --git a/sys-devel/prelink/files/prelink.cron b/sys-devel/prelink/files/prelink.cron
index a3edc429fee7..067fc2ea97a2 100644
--- a/sys-devel/prelink/files/prelink.cron
+++ b/sys-devel/prelink/files/prelink.cron
@@ -55,7 +55,7 @@ fi
 echo /usr/sbin/prelink -av $PRELINK_OPTS > ${log}
 /usr/sbin/prelink -av $PRELINK_OPTS >> ${log} 2>&1 \
   || echo Prelink failed with return value $? >> ${log}
-# Restart init if needed
-[ -n "$(find `ldd /sbin/init | awk 'NF == 4 { print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u
+# Restart init if needed (and if exists)
+[ -n "$(find `ldd /sbin/init 2>/dev/null | awk 'NF == 4 { print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u
 
 exit 0
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 582bce56a1ed..921d0609564d 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index b4164e082b2a..bfa4d835ace8 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,10 +1,6 @@
-AUX edk2-ovmf-2017_p20180211-build_system_fixes.patch 11790 BLAKE2B 0df5e575f344867a02b8923b891180b2ba8884301988246bed83cc6090a627871e68a0e2a15738f52ba9e5492d496edfef72eb535638fc10dab5899b26866adf SHA512 8406f65f1c595c0a2057b15302cd87e3be722a9151589163b828cac3109d9b98f7573ffb45436e17362ca1bee44f3158c13c4327bfaebdf6fd856d5a6c4cfc05
-DIST edk2-ovmf-2017_p20180211-bin.tar.xz 910896 BLAKE2B 2d2ead282cebc1254cae2b10042f809e887a17a83fe67998ddcadf86cdf07e615594b243ab35d3fa8a6d6ce218f8f0bad758ee1db2ab4ff6c08d65419f4078b0 SHA512 88c3c4d7cecc2af1cc4dfa06686f34cc3a5facfb24750c766b47f53dec7267b95b58b391d23038e6a589d1687d2c117f1912d10118e26f99c0906c3d8e90deed
-DIST edk2-ovmf-2017_p20180211.tar.xz 22977736 BLAKE2B 4d95eaf3017668197632ab7e035ad6c9f1490bde3d27e575170541fd64773fef8676406c88451b8dc996d9d7dd625fa389279105951f02e08f6de025075bd172 SHA512 ee3d70da562ed7dc4647576da8605d25fd9f991b4a96c2ed106e0d1b697af9e0624ad161750ccba7ab3db553ab1c6177780dd9c29a70073eb17729e9ae24c5a7
 DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d
 DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774
 DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1
-EBUILD edk2-ovmf-2017_p20180211.ebuild 2554 BLAKE2B 5b7e7fafcf7ff3ca0e84e2cb39ec5d92ae6b11aaf178c0c7d1376db05ed461b70ab6e0be89f39afb05ad6c5e90e675b95d13ca960ecdd8359ffe4b1dcab1ed5f SHA512 bd6b178fc3e05f5e8e9a0a31ad167ca387e446eaec6ad9c84c96a347dc4856257e80240919ff370313fec4a4f6251f29c7246888fab59efe43a541adef9917b7
-EBUILD edk2-ovmf-201905.ebuild 4380 BLAKE2B 4dc30ad743baf55404c67f22d3b4dac02b0988814f77b9e2d830fb8d2cecdad021a3c32c73320cb1d5a283210e96694ffe598a9640d48c7b68e2d1918a9d50f4 SHA512 5f84ff1d3c640bb7b228fd5ae95e73ffb557381e62ee722c15163f3181ba46eb632d455891f8750e8244fcd3031c141bcdc1a37bbd9f5f036a891a80c5600ae7
+EBUILD edk2-ovmf-201905.ebuild 4378 BLAKE2B b69d2b18a5c505b7cc85fbce45f2f8f0b9bebd0f0a0d258da5256d670bd6b754705d4374e3665a334fdd0a4309dfbe667290c79561f82035e4d4149981db49dd SHA512 54da6a1a8420ccba841218aed4cbe35d285947cfb23241e77d3b57b86108985f7fe2a5641a23bd4ab1558d1c301559d923cb0fb6a2231b9cf32706048bfc2af9
 EBUILD edk2-ovmf-999999.ebuild 3910 BLAKE2B a88f3514db3f34b15baba6f27a53e15f807af8d1fbc40448ae2dc1e325e2f91d12a22db6af0af55452c46bacfcb75f02a54d6411bcabff6218b51dc7c37263c2 SHA512 5fb77d51219ab605e57ccf804e634aca3900ddd90c0c3ea3798ae35e29612ce244a2cace0d904e36aa0b06719e98fc6f8c023a983bf6c1316258c91683d5ecb0
 MISC metadata.xml 435 BLAKE2B b33371654b280e097ad5d112081f115446cb01a0efcf3e712bcad7e5a51d95b77f55d0e218c4767803675b71d24b405616849f57051fda492acf5d3c0e8fd1dc SHA512 d1e6233650fc1ea3a25bead14091877b9f507d2bc78cec6436e1b6e17477e40517b74da66e26b6bd39259e4ca308d724324296f1a6c353fed2f8bf112029b90f
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
deleted file mode 100644
index 380bbdaac45c..000000000000
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-2017_p20180211.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
-HOMEPAGE="https://github.com/tianocore/edk2"
-
-SOURCE_DEPEND="
-	>=dev-lang/nasm-2.0.7
-	>=sys-power/iasl-20160729
-	${PYTHON_DEPS}
-"
-DEPEND=""
-RDEPEND=""
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tianocore/edk2"
-	DEPEND+="
-		${SOURCE_DEPEND}"
-else
-	SRC_URI="
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
-		!binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz )"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
-	IUSE="+binary"
-	REQUIRED_USE+="
-		!amd64? ( binary )
-	"
-	DEPEND+="
-		!binary? ( amd64? ( ${SOURCE_DEPEND} ) )"
-fi
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-
-DISABLE_AUTOFORMATTING=true
-DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
-virtual machines. The firmware is located under
-	/usr/share/edk2-ovmf/OVMF.fd
-	/usr/share/edk2-ovmf/OVMF_CODE.fd
-	/usr/share/edk2-ovmf/OVMF_VARS.fd
-
-The firmware does not support csm (due to no free csm implementation
-available). If you need a firmware with csm support you have to download
-one for yourself. Firmware blobs are commonly labeled
-	OVMF{,_CODE,_VARS}-with-csm.fd
-
-In order to use the firmware you can run qemu the following way
-
-	$ qemu-system-x86_64 \
-		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
-	nvram = [
-		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-	]"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build_system_fixes.patch
-)
-
-pkg_setup() {
-	 [[ ${PV} != "9999" ]] && use binary || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if  [[ ${PV} != "9999" ]] && use binary; then
-		eapply_user
-		return
-	fi
-	default
-}
-
-src_compile() {
-	TARGET_ARCH=X64
-	TARGET_NAME=RELEASE
-	TARGET_TOOLS=GCC49
-
-	[[ ${PV} != "9999" ]] && use binary && return
-
-	emake ARCH=${TARGET_ARCH} -C BaseTools -j1
-
-	. ./edksetup.sh
-
-	./OvmfPkg/build.sh \
-		-a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
-		-D FD_SIZE_2MB \
-		|| die "OvmfPkg/build.sh failed"
-}
-
-src_install() {
-	local builddir="Build/OvmfX64/${TARGET_NAME}_${TARGET_TOOLS}/FV"
-
-	insinto /usr/share/${PN}
-	doins "${builddir}"/OVMF{,_CODE,_VARS}.fd
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index 6e9f4e3babf5..45682bed9bfe 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -36,7 +36,7 @@ else
 		)
 		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
 		"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )
diff --git a/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_p20180211-build_system_fixes.patch b/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_p20180211-build_system_fixes.patch
deleted file mode 100644
index cdb465336e14..000000000000
--- a/sys-firmware/edk2-ovmf/files/edk2-ovmf-2017_p20180211-build_system_fixes.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index 427ad60..c2b6d83 100755
---- a/BaseTools/Conf/tools_def.template
-+++ b/BaseTools/Conf/tools_def.template
-@@ -4500,7 +4500,7 @@ RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG   =
- NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug

- *_*_*_DTC_FLAGS                    = -H epapr

- 

--DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common

-+DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Wno-array-bounds -include AutoGen.h -fno-common

- DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe

- DEFINE GCC_X64_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe

- DEFINE GCC_IPF_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency

-@@ -4535,7 +4535,7 @@ DEFINE GCC_IPF_RC_FLAGS            = -I binary -O elf64-ia64-little   -B ia64
- DEFINE GCC_ARM_RC_FLAGS            = -I binary -O elf32-littlearm     -B arm     --rename-section .data=.hii

- DEFINE GCC_AARCH64_RC_FLAGS        = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii

- 

--DEFINE GCC44_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings

-+DEFINE GCC44_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings

- DEFINE GCC44_IA32_CC_FLAGS           = DEF(GCC44_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -fno-stack-protector -D EFI32 -fno-asynchronous-unwind-tables

- DEFINE GCC44_X64_CC_FLAGS            = DEF(GCC44_ALL_CC_FLAGS) -m64 -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie -fno-asynchronous-unwind-tables

- DEFINE GCC44_IA32_X64_DLINK_COMMON   = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20

-@@ -6139,7 +6139,7 @@ RELEASE_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl
- *_ELFGCC_X64_VFRPP_PATH            = DEF(ELFGCC_BIN)/gcc

- *_ELFGCC_X64_RC_PATH               = DEF(ELFGCC_BIN)/objcopy

- 

--*_ELFGCC_X64_CC_FLAGS              = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-address -Wno-array-bounds -include AutoGen.h -D_EFI_P64

-+*_ELFGCC_X64_CC_FLAGS              = -Os -fshort-wchar -fno-strict-aliasing -Wall -Wno-address -Wno-array-bounds -include AutoGen.h -D_EFI_P64

- *_ELFGCC_X64_DLINK_FLAGS           = -nostdlib --shared --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

- *_ELFGCC_X64_SLINK_FLAGS           =

- *_ELFGCC_X64_ASM_FLAGS             = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h

-@@ -6162,7 +6162,7 @@ RELEASE_CLANG38_AARCH64_DLINK_FLAGS = DEF(CLANG38_AARCH64_DLINK_FLAGS) -flto -Wl
- *_ELFGCC_IPF_VFRPP_PATH           = DEF(ELFGCC_BIN)/gcc

- *_ELFGCC_IPF_RC_PATH              = DEF(ELFGCC_BIN)/objcopy

- 

--*_ELFGCC_IPF_CC_FLAGS             = -Os -fshort-wchar -Wall -Werror -include AutoGen.h -D_EFI_P64

-+*_ELFGCC_IPF_CC_FLAGS             = -Os -fshort-wchar -Wall -include AutoGen.h -D_EFI_P64

- *_ELFGCC_IPF_DLINK_FLAGS          = -nostdlib --shared --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

- *_ELFGCC_IPF_SLINK_FLAGS          =

- *_ELFGCC_IPF_ASM_FLAGS            = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h

-@@ -7553,7 +7553,7 @@ NOOPT_MYTOOLS_IPF_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
- ##################

- # ASL definitions

- ##################

--*_XCODE5_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h

-+*_XCODE5_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Wno-missing-braces -c -include AutoGen.h

- *_XCODE5_*_ASLDLINK_FLAGS   = -e _ReferenceAcpiTable -preload -segalign 0x20  -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map

- *_XCODE5_*_ASLPP_FLAGS      = -x c -E -include AutoGen.h

- *_XCODE5_*_ASL_FLAGS        =

-@@ -7581,9 +7581,9 @@ RELEASE_XCODE5_IA32_ASM_FLAGS  = -arch i386
-       *_XCODE5_IA32_NASM_FLAGS = -f macho32

- 

- 

--  DEBUG_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -Os       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

--RELEASE_XCODE5_IA32_CC_FLAGS   = -arch i386 -c    -Os       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

--  NOOPT_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -O0       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

-+  DEBUG_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -Os       -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

-+RELEASE_XCODE5_IA32_CC_FLAGS   = -arch i386 -c    -Os       -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

-+  NOOPT_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -O0       -Wall -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)

- 

- ##################

- # X64 definitions

-@@ -7600,9 +7600,9 @@ RELEASE_XCODE5_X64_ASM_FLAGS  = -arch x86_64
- *_XCODE5_*_PP_FLAGS         = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h 

- *_XCODE5_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h 

- 

--  DEBUG_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -Os       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)

--  NOOPT_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -O0       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)

--RELEASE_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c    -Os       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)

-+  DEBUG_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -Os       -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)

-+  NOOPT_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -O0       -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)

-+RELEASE_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c    -Os       -Wall -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-varargs -Wno-unused-const-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)

- 

- ####################################################################################

- #

-diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
-index 0976973..d9ee70e 100644
---- a/BaseTools/Source/C/Makefiles/header.makefile
-+++ b/BaseTools/Source/C/Makefiles/header.makefile
-@@ -71,9 +71,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKE
- BUILD_CPPFLAGS = $(INCLUDE) -O2

- ifeq ($(DARWIN),Darwin)

- # assume clang or clang compatible flags on OS X

--BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g

-+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g

- else

--BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g

-+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g

- endif

- BUILD_LFLAGS =

- BUILD_CXXFLAGS = -Wno-unused-result

diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 0bff17e6dbde..bc5a6c5362db 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,4 +1,4 @@
-DIST intel-microcode-collection-20190722.tar.xz 5172324 BLAKE2B 50930467d939b15e1d57619afd035e0ab591854c271dfde0e06c9994ac95200bdf4febb6ba6caedc3bfe92b4464a7b3922b203e7dab3f67ead26e199f9bdcf61 SHA512 f5adf8560adc81288e974d51d516a548534ee61fed599c865cbc095c328a85a9c766d11d852ef3167e10c9b283dff0b6d5fb88725a4c123c2004971cdd22873c
+DIST intel-microcode-collection-20190819.tar.xz 5309072 BLAKE2B b3c6167f0d380795ef1d22f8d0d39e7db54fa37357e4d650ca5948f049c3e9e51872a9c40c70d2a9103a2e53c5ac28510a4300aea025de38d9ef1b7a96dd3ffa SHA512 e9942ef3bced654433e356db58ca1647dc54caaab4511236ffdbec513871ead02838d50f81f298381f6376d2ff5dc33704f50cb0cc4e021bfca4c7681763233f
 DIST microcode-20190618.tar.gz 2446418 BLAKE2B f5e4846c7d6d4251c8a53e7a238ce0be9530827d16a015b91beec9d2ba2186d6632d370342b4b7a898f32d294b3c8c12522d07ea40c13ebc75d40b8b83eb1da3 SHA512 f7717f476465705e14ea26b516cf7b1d04e29842da0924d7da5582346ad5dd5dfd8755041bdca8f3afa7fe64f138e91354498d87006fe4487701242858c24c17
-EBUILD intel-microcode-20190618_p20190722.ebuild 8571 BLAKE2B 47d02586b98c8b78b798b07577e3b2ec609af2cb4e14e3c428acedd4dd673d3a2ccd37a06a2da338c00d2104f7d3f34d60cd3d1d2562d0a36a2a76810309f47f SHA512 933c15406dc5277896ccda6075b0afc02f5a86b70716d7e6ddafd81faeef2daa6970353cafa89a98cd31741fd0dbfefc5c6f388a22d85bd3e82656af8f1561f2
+EBUILD intel-microcode-20190618_p20190819.ebuild 8571 BLAKE2B 47d02586b98c8b78b798b07577e3b2ec609af2cb4e14e3c428acedd4dd673d3a2ccd37a06a2da338c00d2104f7d3f34d60cd3d1d2562d0a36a2a76810309f47f SHA512 933c15406dc5277896ccda6075b0afc02f5a86b70716d7e6ddafd81faeef2daa6970353cafa89a98cd31741fd0dbfefc5c6f388a22d85bd3e82656af8f1561f2
 MISC metadata.xml 667 BLAKE2B f229775df839b3ddf34fcc289803ae113ad4b0ce293e036c24f3025bbd146d51c6e3ac55b4a7eb9b2ff0b6829aa020179ea4603f5e481de1c822a1deb66fd594 SHA512 a2d6bc54901a9eb12732e8fa0720c03b51ab615383f12a52019453b3a13f5c70233ee88a8d81706ce7e86eaec6d85155484cf32da288c3486d4b1a19647d2698
diff --git a/sys-firmware/intel-microcode/intel-microcode-20190618_p20190722.ebuild b/sys-firmware/intel-microcode/intel-microcode-20190618_p20190819.ebuild
index c38383872511..c38383872511 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20190618_p20190722.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20190618_p20190819.ebuild
diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
index 55e0ba68fb2c..7da9fc36fdd8 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -3,5 +3,5 @@ DIST ipxe-1.0.0_p20180211-546dd51.tar.bz2 2954305 BLAKE2B 8232b1afe017ff5d038953
 DIST ipxe-1.0.0_p20190728-a4f8c6e-bin.tar.xz 1839688 BLAKE2B b28772b928690646e1b0cb1c27ef56e2cb1c0637a43c6174dea7c8ca401d8c8819938fa358a0bed5d57b8cf992b8c2060b52e32a970ef813f1cf705fb0805beb SHA512 1e5838b8c530257dc544f6e25f80e6e223480917db393ca3ff8c577f07e60180e18f2eed4e71f7b1965157d6e7001f65e224d3c8b56a98f84739e2504ca38985
 DIST ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 2985776 BLAKE2B 5a85505404978d51f80e30332f6eb0417d6d97eb9b3bc05eec5ad649c446c7d17dc841f8cd34a1b29c31dc6f5cf08baa69191de9c8dd4bcdb098c5d7f13a7824 SHA512 3af0da9058b39966bfd8f9d7dfe518ae7b26e18f58d1a3fa2cba8922ec3c50775b82dd9f23bf51be3ca3f69b705f92bcf80988a1817b30f7ab1826a4b159c5a6
 EBUILD ipxe-1.0.0_p20180211.ebuild 2804 BLAKE2B b1aaf4b606d62fdc12fcacbb5917ef0ba11e82b9e31b9d6b5f4a703e5cbc959a915847aadea45c031974821a2c7a5ab8d500a6f8d41fc438fdef99325afc8d0a SHA512 9bbdabfc8f6809c75080520052b570c996932280c0f41cc913f11e86d600a4e68af5cd61e28db243158887cfe830f6b3fdcf16046cc2307222db12a301be9b30
-EBUILD ipxe-1.0.0_p20190728.ebuild 2803 BLAKE2B ebb5fd6717e9fb5aba382ea0fcf15c1d5b478b5592de2809468496621b3f7abb4f57da72422466ae82a65c81fe9128ffa862f9df6a2c3c2336c5768a06d18a4e SHA512 cd59abef29be47d91af1eedf838cc7f34f1cb8d923cdb85d785a93bc0ffa59b81a482862283a20fcbe8eaa7a5e7bb3353b343f8188e2b0bb3c706a0345a6ed3b
+EBUILD ipxe-1.0.0_p20190728.ebuild 2801 BLAKE2B ea8f403f82eb8a87751e5e12d0e22cb29b7c695a4c1ed493455c93f23df08a8c53cdbea9315b90fa0d60b5662822b19193e9618a759c554bb0f6d2c8a84bc403 SHA512 bbcc96d7d54fe5c4d9259839b3d0cc66de159643f12cb4b8f818532a3667e9ea7a85b2093d79230539dcdf64082e3747eca914853bdcc2f8f936a8b964f8a02a
 MISC metadata.xml 996 BLAKE2B 41f19340003c0213578fb1b3f7ae6aaff718eb150cdb398b463e695dcc931da45251ab5d70fbdff0277f52ad7a231f93f878d9fa4ce9fe5a338cc3d4e2708124 SHA512 123f401010d157b928390599a3125c9c18ba721757a16ac3fcce4fe30e3ff298ad9a3dcda64b779bf2fe0fcb52c9057e382b7ac618a3ae27b92dd94cf0dde0d7
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
index 3850249adbd2..cb5cc15b84e7 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
 IUSE="+binary efi ipv6 iso lkrn +qemu undi usb vmware"
 
 REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
diff --git a/sys-firmware/nvidia-firmware/Manifest b/sys-firmware/nvidia-firmware/Manifest
index 19121d65634c..1090d38cfb34 100644
--- a/sys-firmware/nvidia-firmware/Manifest
+++ b/sys-firmware/nvidia-firmware/Manifest
@@ -2,6 +2,6 @@ DIST NVIDIA-Linux-x86-325.15.run 27409286 BLAKE2B cb6de2c7a95cdeab18b3c5c61d7b99
 DIST NVIDIA-Linux-x86-340.32.run 38587515 BLAKE2B d7ebf5ece0f01c132c91e1f45cbfe8bd8354cf8a97e64820938c0cd0d3f3091a1ff778950f25b53c863a8e95d31b1656efbd516293c75a0e5395b264d95b8af1 SHA512 a67e57a1bd70a9cd5ae2bed70403920ed94d8eac9d08dcd380f6065cd597d5824e26ae25a0bcd56626190124c07d128f3b0429040794c8e8d3ead85860fcb646
 DIST nvidia_extract_firmware-325.15.py 12715 BLAKE2B 996d6cfcc87cb8d6f1d3f3a93bd2cf6af24df6aba403cccf0f3ca0e04b9bbe43cf069f9a6b4430e52b0d3502c2f8d4210e74e61b0fa1a4786b80575301e0f5e3 SHA512 ede9bed14bdae0684a5091fbaa1edcd5ed57463a19a4aee72633167ade5490f8de1d373ebf541678fa53d952da5cd9251c429329aa487578083d9622e6b926a4
 DIST nvidia_extract_firmware-340.32.py 13097 BLAKE2B 7c50734a8f6a9b94f3c111ca0eef055a5a638e2498b2dcb93a6d47547c202606783bcc3f1fba7cdba88d4f204abb173fc50fd52a3d23198f415588330710607b SHA512 a90a8907288ee841dc063a80afb1fea02e0034becddd75e367cf8fbdc065f321746e0d1bb77f158f7b011cfc03ad517e658ad1cc7a1b596e1452363862528b89
-EBUILD nvidia-firmware-325.15.ebuild 1046 BLAKE2B 09aaebb136bb648866f6fb31cd2b4d85b74a65cade5f0564c64b3a11001f853910c263e38f8b27786f4d0adad83782cf9b470d015db3b6ae9e59739d4d36f1e1 SHA512 407d76e1200073b56bbf76c607a0dadfcf78a130ef7906977921147a15b75efd1ce5974341d1aa72d45916493f46bcb39dad957db1fb75ce1643c4f93ec29a0e
+EBUILD nvidia-firmware-325.15.ebuild 1087 BLAKE2B 380a4200f9ab347f96f810869b097ca983471860f44cf512846a74a0341204b2c32427f76873dfe9491c8938bd2a3394562214069e8584adba7bc95b2def3248 SHA512 bc81df26cabf3f04c0d8ae274b72c6156a57be32a92e3f12ab3621304f2ab8a7565784ce4cd38932ecda76b97fb6092a26cd8290c2bd722f9788b10c9fdb31ee
 EBUILD nvidia-firmware-340.32.ebuild 1092 BLAKE2B 9abfb68d1cbfa44600c7463065c92d79a57375979e8da0b3a3eca8a9993252d67c31ca9ece1c9f57317364c2414f665f3d6bf487f2485465371bb7c8cd2064dc SHA512 70f1c906733ae08b5a2da3afba498787c5504aa2ccf8d4549bdef3d79639b9091ab331130846b6c1fba5ae9e3567141bbacfc4048e11a5bba31fc2e90eba1b4c
 MISC metadata.xml 249 BLAKE2B f870f9dc7bc1a515f782f4c1c544b6473b3ec16235b88a9930783ed8f7aa7f010838c37e225840b61a56c5f01c70ac3b50560fc2f5bc908418c341f51620ffe7 SHA512 1723b9b2663814b898832e18aea1a02520775e545e256fb70a8829e2b0515e59b5abab985c995b9ae2f509d95ea4601ac0085ab0d1653cdda0ebe90f775f6e5b
diff --git a/sys-firmware/nvidia-firmware/nvidia-firmware-325.15.ebuild b/sys-firmware/nvidia-firmware/nvidia-firmware-325.15.ebuild
index 551be618ef34..dd9d399df59c 100644
--- a/sys-firmware/nvidia-firmware/nvidia-firmware-325.15.ebuild
+++ b/sys-firmware/nvidia-firmware/nvidia-firmware-325.15.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=5
 
-inherit unpacker
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 unpacker
 
 NV_URI="http://us.download.nvidia.com/XFree86/"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
@@ -19,7 +20,7 @@ LICENSE="MIT NVIDIA-r2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="=dev-lang/python-2*"
+DEPEND="${PYTHON_DEPS}"
 RDEPEND=""
 
 RESTRICT="bindist mirror"
@@ -33,7 +34,7 @@ src_unpack() {
 }
 
 src_compile() {
-	python2 "${DISTDIR}"/nvidia_extract_firmware-${PV}.py || die "Extracting firmwares failed..."
+	"${PYTHON}" "${DISTDIR}"/nvidia_extract_firmware-${PV}.py || die "Extracting firmwares failed..."
 }
 
 src_install() {
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index b1fc4cf2f171..c6a103431e31 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -16,5 +16,5 @@ DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96e
 EBUILD seabios-1.10.2.ebuild 3409 BLAKE2B b39299fbca9c8641333882be197c181fc780e440f5f05309ffe1155afaddd2c73a4d9114fd060b6cf6c8fea364ad2094d89b17ba50cf17038d6114038eb7ee7d SHA512 27c2b5482787cd9e52d7784059971cf3eaaaf89d9930edafda3346b13462c9fd093afc02d648f10f4295922b1425f75b9cdd1c17521f36f99aef6235ec27efa7
 EBUILD seabios-1.11.0-r1.ebuild 3485 BLAKE2B 06b5cd36ca5abf255c5f76785ac457c0017bca5755ace55a4065a4ba0237471f1728233ea7fe12f68f86abf136a18fe5ea12e070169f93aff1857923ba944fbb SHA512 1415659b8dded4f3bb0b7bf311641d7fef5920ee8f3aac7bfd4dbacb48e427259fa234535fb1a2049f6b419bb4ad47b4c684e4dfe2902ca1717d5abb5e8e943e
 EBUILD seabios-1.11.0.ebuild 3325 BLAKE2B f90f4e73373ca40ecc98e0f11e16f9b2f9e527cc83c1f5a7e12052626ea3d6a5b2596475a122c2effe899f120d629c56026c829dbabd5a16af8da6bbf8748424 SHA512 aa8a8292ae43057165c7cbf40949d15b4472e279196315459c3a795f5552902da9cf77375dfd5e7f4c74a7af3d5b12106e3f5bb9393ed79457863199081d445f
-EBUILD seabios-1.12.0.ebuild 3482 BLAKE2B 0740d90d7b99f4c19e16184c283632d888c9da0c9e7d8ca6bd3d6fbb0da18288319bacef472bca4e333151d90093664c40f6b1900daee1ec902ccffd8c76f58f SHA512 627c41557300a3982e4ecce60afabf816759e09479e717d8ac044c02e5d81c627c67e0021c4c6a05e7ef1d4a36917a8d6ce0a3477e002bd49c1c5656cfa44eb1
+EBUILD seabios-1.12.0.ebuild 3480 BLAKE2B ee6aac19a6f0f15ccb785cf09d9f98f358cd7cd7694219a14528f31fc677190b332a4e809a5018236608710151dbb1f56d1e6ef4679e217b58d677d6c954bf35 SHA512 ebd724faafc3df91122defba546c29df96af39355a39517d5b5233850a4a291e3e0ece5d9254f912e2465470cba74562d8352822d041a04d29a8410007a9b031
 MISC metadata.xml 659 BLAKE2B ec90c7e7dec453a99ac7d431f3d431cfbbbdfe4ba5fef5d57b7923ed5a8b1f3511c1a8e260c51080f754aa1f27b4d63e6cfba97fadfa00765fcf14277431c583 SHA512 62dbf23559c5c19e9157fcaab10356fd51f52e98a1c39ac138445b058a45a350c758ecb2e6b36eb2e05a384bf6c5c7413deea3b5db7a3a2468248b677136b246
diff --git a/sys-firmware/seabios/seabios-1.12.0.ebuild b/sys-firmware/seabios/seabios-1.12.0.ebuild
index 1ab0b09fd5c2..39fcf77d8074 100644
--- a/sys-firmware/seabios/seabios-1.12.0.ebuild
+++ b/sys-firmware/seabios/seabios-1.12.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
 	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
 	inherit git-r3
 else
-	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"
 
 	# Binary versions taken from fedora:
 	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 275c3e31875e..225925ecbf43 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest
index 401bbcaa3159..1c9c7e68cc4a 100644
--- a/sys-fs/avfs/Manifest
+++ b/sys-fs/avfs/Manifest
@@ -1,9 +1,7 @@
-DIST avfs-1.0.4.tar.bz2 719761 BLAKE2B 6bbe47136a6aedd399800ea3ee16f82c367e11f723785ebacf4ef7bd12319ad2f8fe528580e20f368934423ee41afc75b9a73ce7389a100f70e42180e2fb2dcc SHA512 3cfda7a471b5e696984acf9101312e898bc68fe16196bfee8e6a255bd182c279a6ad53fee09c0d6554a968f837e97652e95d794fa46f0d384dd41ae426d49516
-DIST avfs-1.0.5.tar.bz2 723937 BLAKE2B 49a7ba0f88e126804c8ae12d1ad9a2924311198baee85f56a17c1e9dd810bdac8d519f0fc8a8cf23b5e4d7319460108e3e27cb28a1dc7320760c42f7257460d0 SHA512 d50d8fc31a56a0dac17a14c19de3f1bae2519feb965768810d19192eba6dbe24ab181c4574ff8982883d9b76f77241a1e27f3ef12d05ab8112f3caf14e59bd3c
 DIST avfs-1.0.6.tar.bz2 729592 BLAKE2B 41c703e92921ba9393d95455f7d3dd18587b2d7f2ff46de02d290515cf6c8182d19ff117a7ce040ccaab491240b4f27a3ebd58026045ae9b0d69f47a8beeabc7 SHA512 6b9c070896c5d5abbb6a8c14a7dfd39d9b58d13a6db122b5bf1756b2da7435dfbc00a1fd04bedf99b94b76d9ec7f8c05fccc21de6b9e713fc60cfe0ec88064b4
 DIST avfs-1.1.0.tar.bz2 605637 BLAKE2B c9c64d1fdcda84ede92e0a8896e0b6508f6f2b2f086acd1edeacc87d01ba431d052d51535abd483a0652cf999df842432d02a8e90049ddeb7c5d9a269e2e5885 SHA512 415a52bfecb58cc67818a7e247e0cc40892c81431cdf13a607b4a233aa312ac900f1d33c060aa7495df50c3dda553115ab0b159950811318ca6850847ddbd4fa
-EBUILD avfs-1.0.4.ebuild 1491 BLAKE2B 44b686e4f157e63704afe64ceee6d000b81665e2e66263eaefb104baa63906dae2471b54e4b18514dbbf90658eb25ad8f8e5cf45e23f19c97143ca6ff0fd98aa SHA512 1428602ce6a1770e82b1a958e35f9fcb51dc244cafc6bd9dbecff1d5f4b8a0748fb23dc517c2703e19096c1a48f2ad8e671d33ed217ed41415ffb9b352da2f5c
-EBUILD avfs-1.0.5.ebuild 1495 BLAKE2B 6e3ba071c4ff9722a71fd3886798565145b62fbbb298a7199153814eac56ae2c13536032e260c8733dccf585d40442e5d50c8d82854ac674e67d22c612378a87 SHA512 59fc962e1989ad8759dbe8c93511c738dd4fdc276a462348249a7dfee8b6a93adc9a3f4978ddc317dc6e424888d2ea95299d052fd1bd4c3d4cf10c506b97bebc
+DIST avfs-1.1.1.tar.bz2 606819 BLAKE2B 240bb342dc9f993ac8deb60941411b1419c190f9909b5b1bde65777b82f622e121f44f238d2bd8ddc303c86ef376950d4af773c8fae79848b466ec3a3c5aafc1 SHA512 0707f8e746d8d3633755b1a1efb944a400c095b517a7befd75de4d25e2fad1a1b5132b9cf94285b05ad1344bfc138ec75e9cb5f8a5d7775a69595b9b35266f92
 EBUILD avfs-1.0.6.ebuild 1493 BLAKE2B d362bed34a4ad4b28ec669ba4e87b3762adc824e3a6b9014aee0b4d8bc0fb711b7be80221f9a7619fed5f834e108aeeda7566a8be650a56971919539562cda17 SHA512 ca67c66c16f0a4a5e12aef9bd9dce0379b6c5da25626168f6b536658613452bedae198c502bc119a64640210611c47a2b58ac595a95950d4911a4f6aa40a0af7
 EBUILD avfs-1.1.0.ebuild 1485 BLAKE2B 0d6c8890fd19de44803b8c8b271b167e8f1e82349cdfe5b5a303846cb6aa450ab6be18904a1fc37525e68320543b2902bd0dedc5457a64cfd95fd8b1dcb24ee2 SHA512 a654908b37c840774128d6c77b397346d812b0c7d00d937594e4d89f1d8f5abf0a761b66b4d7c24fc2838a6c6889245c7b57feac65a2995f10d772c088102a2b
+EBUILD avfs-1.1.1.ebuild 1494 BLAKE2B a9076c09d451277a427871db0d1d502f76714c2f0f3fb4c1dcc7cb0617bb9335f948917afad05c723a09c6b21a9caa0d80bd1f5218c94d078a3c3520b2072621 SHA512 c49eb991267b1610f7c2d87d51fe19d5efdccf967a1af4b958e58b285b554b10162c6624c8e96067383ae803b1fe23c9297fcbea6c84e5c08ece76ccb2df1999
 MISC metadata.xml 319 BLAKE2B d0597cca90871778d014601140806702319a3a34784c9864d4e70a5b72fd04ec566622d8be8ba1fa3363ca5964ba63822af72ef524767c86b2f9f5535ed846b3 SHA512 805edf3205c69e9bb435c3b86d259e08044da746dfa6205343ccf4e2c2f802c8b51324d140e567a32019f79b5dc63203222221ddc9bc881683d8c9d511a38540
diff --git a/sys-fs/avfs/avfs-1.0.4.ebuild b/sys-fs/avfs/avfs-1.0.4.ebuild
deleted file mode 100644
index a96449ae56b2..000000000000
--- a/sys-fs/avfs/avfs-1.0.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune
-
-DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files"
-HOMEPAGE="https://sourceforge.net/projects/avf"
-SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="static-libs +lzma"
-
-RDEPEND=">=sys-fs/fuse-2.4:0
-	sys-libs/zlib
-	app-arch/bzip2
-	lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--enable-fuse \
-		--enable-library \
-		--enable-shared \
-		--with-system-zlib \
-		--with-system-bzlib \
-		$(use_enable static-libs static) \
-		$(use_with lzma xz)
-}
-
-src_install() {
-	default
-
-	# remove cruft
-	rm "${D}"/usr/bin/{davpass,ftppass} || die
-
-	# install docs
-	dodoc doc/{api-overview,background,FORMAT,INSTALL.*,README.avfs-fuse}
-	dosym ../../../$(get_libdir)/avfs/extfs/README /usr/share/doc/${PF}/README.extfs
-
-	docinto scripts
-	dodoc scripts/{avfscoda*,*pass}
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "This version of AVFS includes FUSE support. It is user-based."
-		einfo "To execute:"
-		einfo "1) as user, mkdir ~/.avfs"
-		einfo "2) make sure fuse is either compiled into the kernel OR"
-		einfo "   modprobe fuse or add to startup."
-		einfo "3) run mountavfs"
-		einfo "To unload daemon, type umountavfs"
-		einfo
-		einfo "READ the documentation! Enjoy :)"
-	fi
-}
diff --git a/sys-fs/avfs/avfs-1.0.5.ebuild b/sys-fs/avfs/avfs-1.0.5.ebuild
deleted file mode 100644
index 141208a376cf..000000000000
--- a/sys-fs/avfs/avfs-1.0.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune
-
-DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files"
-HOMEPAGE="https://sourceforge.net/projects/avf"
-SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="static-libs +lzma"
-
-RDEPEND=">=sys-fs/fuse-2.4:0
-	sys-libs/zlib
-	app-arch/bzip2
-	lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--enable-fuse \
-		--enable-library \
-		--enable-shared \
-		--with-system-zlib \
-		--with-system-bzlib \
-		$(use_enable static-libs static) \
-		$(use_with lzma xz)
-}
-
-src_install() {
-	default
-
-	# remove cruft
-	rm "${D}"/usr/bin/{davpass,ftppass} || die
-
-	# install docs
-	dodoc doc/{api-overview,background,FORMAT,INSTALL.*,README.avfs-fuse}
-	dosym ../../../$(get_libdir)/avfs/extfs/README /usr/share/doc/${PF}/README.extfs
-
-	docinto scripts
-	dodoc scripts/{avfscoda*,*pass}
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "This version of AVFS includes FUSE support. It is user-based."
-		einfo "To execute:"
-		einfo "1) as user, mkdir ~/.avfs"
-		einfo "2) make sure fuse is either compiled into the kernel OR"
-		einfo "   modprobe fuse or add to startup."
-		einfo "3) run mountavfs"
-		einfo "To unload daemon, type umountavfs"
-		einfo
-		einfo "READ the documentation! Enjoy :)"
-	fi
-}
diff --git a/sys-fs/avfs/avfs-1.1.1.ebuild b/sys-fs/avfs/avfs-1.1.1.ebuild
new file mode 100644
index 000000000000..b89cc6aa4b34
--- /dev/null
+++ b/sys-fs/avfs/avfs-1.1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files"
+HOMEPAGE="https://sourceforge.net/projects/avf"
+SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="static-libs +lzma"
+
+RDEPEND=">=sys-fs/fuse-2.4:0
+	sys-libs/zlib
+	app-arch/bzip2
+	lzma? ( app-arch/xz-utils )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--enable-fuse \
+		--enable-library \
+		--enable-shared \
+		--with-system-zlib \
+		--with-system-bzlib \
+		$(use_enable static-libs static) \
+		$(use_with lzma xz)
+}
+
+src_install() {
+	default
+
+	# remove cruft
+	rm "${D}"/usr/bin/{davpass,ftppass} || die
+
+	# install docs
+	dodoc doc/{api-overview,background,FORMAT,INSTALL.*,README.avfs-fuse}
+	dosym ../../../$(get_libdir)/avfs/extfs/README /usr/share/doc/${PF}/README.extfs
+
+	docinto scripts
+	dodoc scripts/*pass
+
+	find "${ED}" -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		einfo "This version of AVFS includes FUSE support. It is user-based."
+		einfo "To execute:"
+		einfo "1) as user, mkdir ~/.avfs"
+		einfo "2) make sure fuse is either compiled into the kernel OR"
+		einfo "   modprobe fuse or add to startup."
+		einfo "3) run mountavfs"
+		einfo "To unload daemon, type umountavfs"
+		einfo
+		einfo "READ the documentation! Enjoy :)"
+	fi
+}
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 12c85f1a01ed..f530cadc809c 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -9,7 +9,7 @@ DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5
 DIST btrfs-progs-v5.1.1.tar.xz 2041940 BLAKE2B ca032cf17e78e5892788b677b5a0fead7cf1108fd464facb48e713b259c8c75f8b7714377f75e7b9e595c7c8fa5927fa37d11f43f51e4d898698f9fc5d26a808 SHA512 0f7582893e76d73ac7c0061dd43f65c465ca6308d3447a4e12f95397edcf3b74cc4dd3fad4a139739322650a0d228c4b2d43eb6eb9a09eb92f8fa2a5ef1519cd
 DIST btrfs-progs-v5.2.1.tar.xz 2049856 BLAKE2B 841a506f07f1d965c3443fbea39c81a833c41ce1215db3feb41650c964a3a6ba8f5f964c61838921f2df90f6de7fdb057f0d41856549f26b9c4d580b4707d18f SHA512 7da495df7dd2ef1c7961eda132c5f587785c7a91d2531a0c5ed3917f07c708d02acd48681520c10c375edd7a8a7ecab371e806077ccae7899eb41a5ddea89c59
-DIST btrfs-progs-v5.2.tar.xz 2047448 BLAKE2B 5b30e82036c33d0fb7b562c3fcd512247cd7946eb0679a5389e6891b205e8b06ed9d4c29fdd1f13f13a5dd30c4204a94ffa78843f9e5001dbb715e67f2efb46a SHA512 a62d3977aa62d7bd71a589525b7dde140fa8f5f2d484d6bd0546606be124b9776667ef3a5e9a084a1ea2b905b6a9125e5892637fcf9cabc79f0707b967aac9c0
+DIST btrfs-progs-v5.2.2.tar.xz 2073592 BLAKE2B 6c477ad2599a2f629b5d85a28dee7286af744e4d684ff9a0e9b5ae433b7b1450ac66caa41103781d159c172d8c6fdf26f4590d1476e457f09d7f52d6ea87e481 SHA512 97eaf3dd8ce1629f0acace23f3eedc7c6942299ddb65cdc3b0a7b623026db1063d72f3c1b6297782705e08dfc4c361384e17b5e27a16e756cd0a81e35e79aa9c
 EBUILD btrfs-progs-3.18.2.ebuild 1264 BLAKE2B 097f4c5717fb4824868811c82bae7a382a4fa7afe15eafe647945e5ba9e72a0157ab9d5bef694bd8836ef46396e79382ceac74c341b26b2a5cc957fef03a94f1 SHA512 152cd4da549f7b2af7fb90b4e06bfa52e1cc06f64a704e72e1172fd39b667fb6e083367901f857334590018845243ec56c4cd03a9886faa80fdc054f1586a148
 EBUILD btrfs-progs-4.1.2.ebuild 1891 BLAKE2B 6164d918d4452a4d91ee812a84fe7a2859fd303396ccacde0fa2dcd5fe7ed1e974bee47e9deece3b621e62d8176379d45b12c2ce6b52497d406425781cb35a3a SHA512 9f0771068eae7ec9bd54545d1f7d1146e9c1a221599dacb40c15106f73ea15bded433adc13dda8d2f7e302b2b4a989fd3a4442904ab222901eab70652e43d28c
 EBUILD btrfs-progs-4.10.2.ebuild 2195 BLAKE2B b2fc7318648463c6a9dd12fdca7f92fd4e6f03c85b84cc5e25f6f7ce8c471e8c2830cae58125145a794f42f17724edd82aaf0de71ad73db05b6e4b32da0ea177 SHA512 ad7aee9448e252f09291ddf82ca9e4c992cbb7b3cf25dfe968b3ed1d5a3958b6c63289f49d829621f2d08bbe3fe75f8e8a1888a6802c186db2a1617576a5b2c8
@@ -20,6 +20,6 @@ EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb33
 EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
 EBUILD btrfs-progs-5.1.1.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
 EBUILD btrfs-progs-5.2.1.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
-EBUILD btrfs-progs-5.2.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
+EBUILD btrfs-progs-5.2.2.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
 EBUILD btrfs-progs-9999.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
 MISC metadata.xml 759 BLAKE2B 3f94ebaadb23c54121e8ffa1b80549b9e8a9d977d26ddcfdd8772e549e55fc762fcca5c8e2374a562dd9992086949eff626be71aa6da8326f8847cbc4f791fb7 SHA512 ababf03834be253af5402e167e7883fc73c6ad47198369eba02557e07ec8baaa81140837315e98979dc4b95ca160d2d984e970acdbf0ea4db9c2a9e9deddc9a8
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.2.2.ebuild
index 4680b387969c..4680b387969c 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.2.2.ebuild
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 6c24d8ede072..a304f73da90d 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -13,5 +13,5 @@ EBUILD cryptsetup-1.7.5-r1.ebuild 4033 BLAKE2B 77146c613eefaf677f4a0f77cb773b488
 EBUILD cryptsetup-2.0.5-r1.ebuild 4151 BLAKE2B eb67cb9e3424b5444bf298fafeb3cbf050e5420b4a2137c75e437a13b2b8a1ff642b40186d37f10ee92785074833f833cad44eca3bc3e9c0f91fd710ac9fcc50 SHA512 71c6948ff51c919ac6052ad65355ffb620049049ef21fe6545d39bb6d56adb843d5de25b722911d979becca9945f7d05d7cf1b240bb0d5448513a4fa7baad8cd
 EBUILD cryptsetup-2.0.6.ebuild 4167 BLAKE2B 0aaa413b365a5b3986e3908709e54af38af8191c2086168076d380321c8577cc686826b7f57fb1671bdf45adf141630f65e815842f0cf4703636a8caf7cee46b SHA512 c707d533fcfc71e5adcd3eacd9556ae0d87c65b9e283008daafe5aaa29056ed175bf5354c08638454677b75e99f0f77d51a0ea76a0006bb8812d721a46e8cef7
 EBUILD cryptsetup-2.1.0.ebuild 4411 BLAKE2B 4098102c4571866c9030bb68c489d078b590fe0e7b5cac6e134a90ecff3e083277d82cb9bad9778eaec098268d3ce5b8d89dcbf34f4108334536cc5e7529c789 SHA512 4fc4743afac269525e2bd108bf7bf033719df987acf5d1431be98d75f4af1fee9a3abb07397ec9cba2bb527cbf7f225e235142ed4bb6968eb3a2a721c9f25579
-EBUILD cryptsetup-2.2.0.ebuild 4435 BLAKE2B caca1edde30b54c6617434cf975406cd5d6f8ee6f272bc40f2cd9c6aed31756b6cfc88dcf8160e70abc33f2833843a630b68b8ef1fbcf10473968ec8aa837ecd SHA512 14141c72fe9d5bed000a20d0775e5e001604e94b2b8ef02949bdd987d12af765d0cbbabc01842da1d9115eeb891d521267eb154761cb2076882924661f3823d7
+EBUILD cryptsetup-2.2.0.ebuild 4230 BLAKE2B b79655191d45d68eeece99538db185206cfe825042e98e055d83149d04c538b813ae350733b1bc7ab77fcbdeb6092f47cf10b67124b6f8199d94c39202c1704a SHA512 d1c10829bf880cb841b622819d16148e606f7654758f2e0943143d85292d074c1a52e756151e0a0526aeee5908f782d55d36f44b7c89855e9f38c916272dac2d
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild
index 49cad800b719..8cb062389bc5 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild
@@ -13,13 +13,12 @@ LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-# cryptsetup does _not_ have a libressl backend. We only have this for REQUIRED_USE
-# and change "libressl" to "openssl" in our econf call.
-CRYPTO_BACKENDS="gcrypt kernel libressl nettle +openssl"
+CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
 IUSE="${CRYPTO_BACKENDS} +argon2 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	libressl? ( openssl )
 	static? ( !gcrypt )" #496612
 
 LIB_DEPEND="
@@ -32,7 +31,7 @@ LIB_DEPEND="
 	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
 	openssl? (
 		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
 	)
 	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
 	sys-fs/lvm2[static-libs(+)]
@@ -83,11 +82,6 @@ src_configure() {
 		ewarn "userspace crypto libraries."
 	fi
 
-	local x cryptobackend
-	for x in ${CRYPTO_BACKENDS//+/} ; do
-		use ${x} && cryptobackend="${x/libressl/openssl}"
-	done
-
 	local myeconfargs=(
 		--disable-internal-argon2
 		--enable-shared
@@ -95,7 +89,7 @@ src_configure() {
 		# for later use
 		--with-default-luks-format=LUKS$(usex luks1_default 1 2)
 		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=${cryptobackend}
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
 		$(use_enable argon2 libargon2)
 		$(use_enable nls)
 		$(use_enable pwquality)
diff --git a/sys-fs/hfsplusutils/Manifest b/sys-fs/hfsplusutils/Manifest
index b30576b85096..edd7688ac86f 100644
--- a/sys-fs/hfsplusutils/Manifest
+++ b/sys-fs/hfsplusutils/Manifest
@@ -1,9 +1,9 @@
 AUX hfsplusutils-1.0.4-cflags.patch 702 BLAKE2B 90c41a588979dc7966aa9a889d5c200f44e513b5cc04eaef0da904a5f635f325deeae6b68b99436b6e7ccefdb883dc3e8531e08ae81ccaab4024bdc5f1e31317 SHA512 b66a64a085abdb2c6c2b1f8008019ea41e9e4ee4b58ecbbf96aad4500392d1935a9aa9bd2694fc62af7cf196ddf556e754908bbcdeb64842e8e72a3cbb125a05
-AUX hfsplusutils-1.0.4-errno.patch 445 BLAKE2B dd029daea33967741613d5946950686efaf71a4ef8509f74937e0879735ba9872e7e044ea413aebb647058532fb059b10fad0a48c4f50464f2f02d98440f1241 SHA512 c8df462d82870f027c4c9af5e5c8036d8a9eab89f04d46f6bbdd4679325f751296b99f4f48aa36dcf6dde5b4db3a15f6791e6984f9f02f0e58e8cc47516bb8fd
-AUX hfsplusutils-1.0.4-gcc4.patch 6221 BLAKE2B d21d178149a31e19dced7a030bc3d1f5362a477a5128c6ebb37cbaade0b867ad40140f7b94aba049b2c1b16a9a8deb9f00b214b5908a71949ef428273051c384 SHA512 a1919c6aaee1369cf1d99fd0ee5a47051318f624960a52528d546cec5fe6a6c57f4b3f8ce9824457ec9be9b0d8cd3aca816c990542aae50f140bd22d93153616
-AUX hfsplusutils-1.0.4-glob.patch 288 BLAKE2B 2d7366907b417f087ca4965190b5d349d16387d44043aa5864259971adc32e2d071eeb2bdaf63fd1f2e6047a3663d3310f2f95b3a648f5cd83b4223c7fa3dcd9 SHA512 43f2c51977193d4ac1d9f4d056a6bf1bee2d9b82d27e50edfaa35545710e5a8f8010a6606e868c6670e8958fb52a605e3618299fa61dcf943f8a729186a59291
+AUX hfsplusutils-1.0.4-errno.patch 214 BLAKE2B a2b48502ac7789a0d035f5d68bdd2834e93348c2e0463c0043fbef64a7d2a4d7434c3b34fa96765e26d5131351ebe8ea37022bd70d486a05800a75dfb339e8bc SHA512 97cb9d90d57f3ddc1b9083198664db6da755cc40f416d79d7ded4e94846302e1ea9b0ebc389dfc8996c1c30931d686e09abd908d44fc92044081c75a61d57d24
+AUX hfsplusutils-1.0.4-gcc4.patch 5736 BLAKE2B c88d82b15ae7126d61bee78a5f10cab757ae462f73dfa5b7892290e8bd8405c11309162cb72159620e38ed47add63c41b43a0e370e53d712a0bd9311393cee6b SHA512 fb357a52452f6f8b16a9f3c9f02f1a7c213f6b8adfaf7fd7da70a15cb6ec3469ca8705f3dcd6419385a340e7b5644c17c323c6b951f0c56f4776b86ee86b267d
+AUX hfsplusutils-1.0.4-glob.patch 215 BLAKE2B bd1aed8730e8695efc713908d33c64be14cbb24adbc0aa26b01ced08f741f1f8c3af1cd545fe556e1c6c89e0baf26a94b4317653e795103dc058c1ab6cb710c4 SHA512 da53dc8f18f77b15bb8b76bff371515da0fac03ae79bdd8450dad60063fd18f47d0e95577451ff5da285acf167e547ec392aa42ae254d77fc1789ba4cf2025aa
 AUX hfsplusutils-1.0.4-stdlib.patch 403 BLAKE2B 20ee7a1c8d96d8a4aee549a24b0795b0a9f0d4b5e5d3102b50962d03147b7a26f7f29e6f3652c55df912ccc68db104c4565ea2d563b97d7c67abade7affea437 SHA512 23361a4cae07b679cb5c6122cf1a74aac19a11b0b892a369683881ed1bed63cfb1369aa84762b0447f2c91b1226a73c9f42b06fe8cb25a40dd7fc58fbf22806a
 AUX hfsplusutils-1.0.4-string.patch 606 BLAKE2B a9c789fe631c94577c32a330803c490b882c7cccbec213882a297a16e5ef5e0cc4fa805f9df454d4b278ed460eca42189ae1d65c00c4555e0df129bffe68c902 SHA512 5f7d4a7bbbb15479d00d3ff49fac08328b5d3fb4549d3278b43c73025ab4f0f5657c7b084b2671a5e1524a88bbcf5bc459b88c8d944cdc98fbf0c2ba4e6b0339
 DIST hfsplus_1.0.4.src.tar.bz2 185461 BLAKE2B 81b93f59c4e57d80a979b9d9c56b841bcc32747136d01dc0e90afa0af486e527bda241d7c21f0f3f61a5d2efe6215e29499405aad9623a7ec9906b876aa6303f SHA512 94cf6bc8e9d561dea5e8b5860c4ef979f21349d6546c767b43c18156fa1f805e843fae8a64096c147a28886467f5e2012b06b93918773457eaf486b85958b2ee
-EBUILD hfsplusutils-1.0.4-r1.ebuild 1023 BLAKE2B 854bcb31d3f54ab713e87f8d756ac7eb3d335c884a4e8f6918bd9fcda3537851641f5cb0cf4eaa74f57760bb3638e2c617b4dc79c68dc6b5061c255ec12f30be SHA512 f1f59aa8d9e938cbc4b72529eb5474b272d34c1dae30d08fe77ca4e2ce4879d2fd19181c7a14ba369a0870a21b257b8bff9dc2636b4a892104bc22ffd3ac7199
-MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
+EBUILD hfsplusutils-1.0.4-r2.ebuild 1006 BLAKE2B b12ebfcd380b5e741e1ded3f506930b44c17986a09621a69ce5643e81f661ab91519e05cac95159e486f5c72a2582509f01ec26a9e601554534c6c279a213c14 SHA512 726d8386f0945644b7d34161a00c9b3f7c5d6c128cc124d5a24d0ccdf760d091aef6cb1cc3c739844379e46877bcb495a98692a60d4b31751b00bf72d65dd804
+MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch
index c9caeb4208fb..f15e56cc1d91 100644
--- a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch
@@ -1,6 +1,5 @@
-diff -ruN hfsplus.orig/src/hpmkdir.c hfsplus-1.0.4/src/hpmkdir.c
---- hfsplus.orig/src/hpmkdir.c	2003-03-30 20:09:59.000000000 +0200
-+++ hfsplus-1.0.4/src/hpmkdir.c	2003-03-30 20:11:15.000000000 +0200
+--- a/src/hpmkdir.c
++++ b/src/hpmkdir.c
 @@ -46,8 +46,9 @@
  # include <string.h>
  # include <time.h>
@@ -12,8 +11,3 @@ diff -ruN hfsplus.orig/src/hpmkdir.c hfsplus-1.0.4/src/hpmkdir.c
  # include <stdio.h>
  # include <stdlib.h>
  
-@@ -164,3 +165,4 @@
-     hfsputil_perrorp(argv0);
-     return -1;
- }
-+
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch
index 04724440ddbf..6f633454d3d5 100644
--- a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch
@@ -1,5 +1,5 @@
---- hfsplus-1.0.4/libhfsp/src/btree.c~	2002-03-05 19:50:28.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/btree.c	2005-04-30 12:48:48.000000000 +0100
+--- a/libhfsp/src/btree.c
++++ b/libhfsp/src/btree.c
 @@ -393,7 +393,7 @@ static int btree_init(btree* bt, volume*
  	{
  	    p = volume_readfromfork(vol, nodebuf, fork, 0, bt->blkpernode,
@@ -9,8 +9,8 @@
  	}
  	
  	bt->alloc_bits = malloc(alloc_size);
---- hfsplus-1.0.4/libhfsp/src/swab.h~	2002-03-05 19:50:29.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/swab.h	2005-04-30 12:48:05.000000000 +0100
+--- a/libhfsp/src/swab.h
++++ b/libhfsp/src/swab.h
 @@ -36,28 +36,28 @@
  
  #define bswabU16(val) bswap_16(val)
@@ -56,8 +56,8 @@
 -#define bstoreU8_inc(ptr,val)	(*((UInt8*) (ptr))++) = val
 +#define bswabU8_inc(ptr)	(*(*((UInt8**) (void *)(&ptr)))++)
 +#define bstoreU8_inc(ptr,val)	(*(*((UInt8**) (void *)(&ptr)))++) = val
---- hfsplus-1.0.4/libhfsp/src/btreecheck.c~	2002-03-05 19:50:29.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/btreecheck.c	2005-04-30 12:49:22.000000000 +0100
+--- a/libhfsp/src/btreecheck.c
++++ b/libhfsp/src/btreecheck.c
 @@ -264,7 +264,7 @@ static int fscheck_btree_init(btree* bt,
  	{
  	    p = volume_readfromfork(vol, nodebuf, fork, 0, bt->blkpernode,
@@ -67,8 +67,8 @@
  	}
  	
  	bt->alloc_bits = malloc(alloc_size);
---- hfsplus-1.0.4/libhfsp/src/fscheck.c~	2002-03-25 15:48:37.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/fscheck.c	2005-04-30 12:50:26.000000000 +0100
+--- a/libhfsp/src/fscheck.c
++++ b/libhfsp/src/fscheck.c
 @@ -230,7 +230,7 @@ static int fscheck_volume_readbuf(volume
      vh->write_count	= bswabU32_inc(p);
      vh->encodings_bmp	= bswabU64_inc(p);
@@ -94,8 +94,8 @@
  	signature = bswabU16_inc(p);	/* offset 0x7C, drEmbedSigWord */
  	if (signature != HFSP_VOLHEAD_SIG)
  	    HFSP_ERROR(-1, "This looks like a normal HFS volume");
---- hfsplus-1.0.4/libhfsp/src/volume.c~	2002-03-26 18:00:29.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/volume.c	2005-04-30 12:51:41.000000000 +0100
+--- a/libhfsp/src/volume.c
++++ b/libhfsp/src/volume.c
 @@ -345,7 +345,7 @@ static int volume_readbuf(hfsp_vh* vh, v
      vh->write_count	= bswabU32_inc(p);
      vh->encodings_bmp	= bswabU64_inc(p);
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch
index cd92d0a0a86d..776d69ed825d 100644
--- a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch
@@ -1,5 +1,5 @@
---- src/glob.c.orig	2002-10-09 08:02:31.000000000 -0500
-+++ src/glob.c	2002-10-09 08:02:46.000000000 -0500
+--- a/src/glob.c
++++ b/src/glob.c
 @@ -48,7 +48,7 @@
  
  	switch (*pat)
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
deleted file mode 100644
index 71cc51b2ebaa..000000000000
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic
-
-MY_P="hfsplus_${PV}"
-DESCRIPTION="HFS+ Filesystem Access Utilities (a PPC filesystem)"
-HOMEPAGE="http://penguinppc.org/historical/hfsplus/"
-SRC_URI="http://penguinppc.org/historical/hfsplus/${MY_P}.src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc ppc64 x86"
-IUSE="static-libs"
-
-DEPEND="app-arch/bzip2"
-RDEPEND=""
-
-S=${WORKDIR}/hfsplus-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-glob.patch"
-	epatch "${FILESDIR}/${P}-errno.patch"
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-	epatch "${FILESDIR}/${P}-string.patch"
-	epatch "${FILESDIR}/${P}-stdlib.patch"
-	epatch "${FILESDIR}/${P}-cflags.patch"
-	# let's avoid the Makefile.cvs since isn't working for us
-	eautoreconf
-
-	append-flags -fgnu89-inline
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}"/usr/ -name libhfsp.la -delete
-	newman doc/man/hfsp.man hfsp.1
-}
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..4e624f1b33c8
--- /dev/null
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+MY_P="hfsplus_${PV}"
+DESCRIPTION="HFS+ Filesystem Access Utilities (a PPC filesystem)"
+HOMEPAGE="http://penguinppc.org/historical/hfsplus/"
+SRC_URI="http://penguinppc.org/historical/hfsplus/${MY_P}.src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ppc64 x86"
+IUSE="static-libs"
+
+S="${WORKDIR}/hfsplus-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glob.patch
+	"${FILESDIR}"/${P}-errno.patch
+	"${FILESDIR}"/${P}-gcc4.patch
+	"${FILESDIR}"/${P}-string.patch
+	"${FILESDIR}"/${P}-stdlib.patch
+	"${FILESDIR}"/${P}-cflags.patch
+)
+
+src_prepare() {
+	default
+
+	# let's avoid the Makefile.cvs since isn't working for us
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	# bug 580620
+	append-flags -fgnu89-inline
+
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	newman doc/man/hfsp.man hfsp.1
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-fs/hfsplusutils/metadata.xml b/sys-fs/hfsplusutils/metadata.xml
index 5eb05198076b..70f78a5392df 100644
--- a/sys-fs/hfsplusutils/metadata.xml
+++ b/sys-fs/hfsplusutils/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ppc@gentoo.org</email>
-	<name>Gentoo Linux PowerPC Development</name>
-</maintainer>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/pytagsfs/Manifest b/sys-fs/pytagsfs/Manifest
deleted file mode 100644
index 7c0185e1fb0f..000000000000
--- a/sys-fs/pytagsfs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytagsfs-0.9.2.tar.gz 221155 BLAKE2B 6ed2aaa52ba7b970ecb909988ddb69cfbd666360fd4bc5136747b373e9304617b016296cfe870e44c35053020d791fe383c095d7dcb195bd2b974dd2bff97895 SHA512 1c9b8e1e6b40ac2114435b8c973168442ff125560f37cfae36e2bf70da229dc57eec74de77b8a3e35d28a5bd92cec6e559ff6d59b49fd09ba94599409805cac8
-EBUILD pytagsfs-0.9.2.ebuild 976 BLAKE2B df5989ade3c5de5fbb12229b3962d2a803ffc596d974503429ac39a5d54378ecb955f2af961061d0c135bd0f718f8820947d00fb5fdc74308d70690b519ab808 SHA512 0bbd2aff1745e56a32b167a3a17eace9e93e8b42c6b385f1109498e8009056dd42aae4abb977033d7aea831d25280615eb0feab1d924caf4898438892536cc4b
-MISC metadata.xml 325 BLAKE2B 60fe6be54e87bc23253adf6157d9cce5f1b34115d658e4c241c8d870de1185361c714613d6b808321dfabc6a75e5be117d77f48558b54427e7067bdac2c87701 SHA512 e399ddcc17a2686321126a4ad4cbf90c79aa721ecc15ba9e1dfab55cee23ae4f8b10ddd71f4c6de7af39dc0a5a7546a1f7a3fdb028287e4791c7133dcd7aefd5
diff --git a/sys-fs/pytagsfs/metadata.xml b/sys-fs/pytagsfs/metadata.xml
deleted file mode 100644
index 031cc7f8beb0..000000000000
--- a/sys-fs/pytagsfs/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>sping@gentoo.org</email>
-		<name>Sebastian Pipping</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">pytagsfs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-fs/pytagsfs/pytagsfs-0.9.2.ebuild b/sys-fs/pytagsfs/pytagsfs-0.9.2.ebuild
deleted file mode 100644
index 9128fcc77f67..000000000000
--- a/sys-fs/pytagsfs/pytagsfs-0.9.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_IN_SOURCE_BUILD=yes
-
-inherit distutils-r1
-
-MY_PV="${PV/_/}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="File system that arranges media files based their tags"
-HOMEPAGE="https://launchpad.net/pytagsfs"
-SRC_URI="http://www.alittletooquiet.net/media/release/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND=">=dev-python/fuse-python-0.2-r1
-	>=dev-python/sclapp-0.5.2
-	|| ( dev-python/inotifyx
-		( dev-libs/libgamin[python]
-			app-admin/gam-server ) )
-	media-libs/mutagen"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2[python]
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	test? ( dev-python/inotifyx
-		dev-libs/libgamin[python]
-		app-admin/gam-server
-		media-sound/madplay
-		media-sound/vorbis-tools
-		media-libs/flac )"
-
-python_test() {
-	${PYTHON} setup.py test || die
-}
diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index fcd9270dc6fe..9b834d2f9710 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,4 +1,6 @@
 DIST squashfs-tools-ng-0.5.tar.xz 158048 BLAKE2B e8d53336a0955875eaf5a301329f620f6efd27d27d985c760a7eaaded94a60e1a7384f076311101b4a6de36b1330d7b42866079b074b6af1829d4162c1f62b38 SHA512 b39cd6e9627e71eb0fcc59a587612fe062c3f437e11342e6ec1a1fee1e6a51b38dcc881bf9a1d69578ad4686f939ece8ec02ed79a6cc6c69afe06bc6753390bf
+DIST squashfs-tools-ng-0.6.1.tar.xz 203756 BLAKE2B 94d20ed11f53df4b9d6a413ad52e3d968bdbacaa0a68988672eab07664a0b3681f0de916288fdf6ce5f6d4eea4b77af08fe2da3fbbf19cc745a3a24c7ac23ba2 SHA512 f82506d298be4fbf878f68e118dbcf8377fe72ef89d8cb9a24b8cecc23c6d431b021f6b3d5312c0da155ab148a3c55aacb962e8215ac28511b203b5c5dbfb855
 EBUILD squashfs-tools-ng-0.5.ebuild 1069 BLAKE2B fe678e7d13fffbaaeb7722b78db10a16d37f38788ac3850b785ad59aed89787cdc9cb6b867549f78532835e269684efaa74aa7ed6d4f6a5fb2ded18cae5fc380 SHA512 d332d401829b10aac7518df6717ee53f0152380a49789d893b489f8b8895fcda4bc76114346caae218403ba5470a8f4696bec8be22454f94b3cc8207f938c047
-EBUILD squashfs-tools-ng-9999.ebuild 1069 BLAKE2B fe678e7d13fffbaaeb7722b78db10a16d37f38788ac3850b785ad59aed89787cdc9cb6b867549f78532835e269684efaa74aa7ed6d4f6a5fb2ded18cae5fc380 SHA512 d332d401829b10aac7518df6717ee53f0152380a49789d893b489f8b8895fcda4bc76114346caae218403ba5470a8f4696bec8be22454f94b3cc8207f938c047
+EBUILD squashfs-tools-ng-0.6.1.ebuild 983 BLAKE2B af83b5bade10a52a5429ba33672ac17bca57ecfd2f88a3a4b93197a786913f2bada77d0b509ff4bb5719400afa3f764b71826665adb5b9887f49b6bb03b7ef0d SHA512 1b0b2367c3bb73aa284955b93b68f258bfd4c3727036ed4d0a083a60306c74077734ce7b560663d7972bff239115722c13f5a83c75bc5a7e41f0332aac4ec2b9
+EBUILD squashfs-tools-ng-9999.ebuild 983 BLAKE2B af83b5bade10a52a5429ba33672ac17bca57ecfd2f88a3a4b93197a786913f2bada77d0b509ff4bb5719400afa3f764b71826665adb5b9887f49b6bb03b7ef0d SHA512 1b0b2367c3bb73aa284955b93b68f258bfd4c3727036ed4d0a083a60306c74077734ce7b560663d7972bff239115722c13f5a83c75bc5a7e41f0332aac4ec2b9
 MISC metadata.xml 545 BLAKE2B 23c96d1109e1a1e89bba2c00bbbd80954b900f6a40aa45a97d29d15aa31ec10ee1020f43013bdfebba29df7cc1dff106ef7f56b65d175953992629edbdbc79c6 SHA512 0de80916d5a7a88a356533ce0194542e5e26792c0c2d0fc0336ac3d0524e1d78c47b2f0870a2c34d886a83ed2017eab2f56edce325c8344c31865a426016d485
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.1.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.1.ebuild
new file mode 100644
index 000000000000..b77878296fdf
--- /dev/null
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A new set of tools for working with SquashFS images"
+HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"
+if [[ ${PV} = 9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="lz4 lzo selinux +xz zstd"
+
+DEPEND="
+	sys-libs/zlib:=
+	lz4?     ( app-arch/lz4:= )
+	lzo?     ( dev-libs/lzo:= )
+	xz?      ( app-arch/xz-utils:= )
+	selinux? ( sys-libs/libselinux:= )
+	zstd?    ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with lz4)
+		$(use_with lzo)
+		$(use_with selinux)
+		$(use_with xz)
+		$(use_with zstd)
+	)
+	econf "${myconf[@]}"
+}
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
index fc732972175d..b77878296fdf 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
@@ -15,15 +15,14 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="lz4 lzo selinux +xz +zlib zstd"
-REQUIRED_USE="|| ( lz4 lzo xz zlib zstd )"
+IUSE="lz4 lzo selinux +xz zstd"
 
 DEPEND="
+	sys-libs/zlib:=
 	lz4?     ( app-arch/lz4:= )
 	lzo?     ( dev-libs/lzo:= )
 	xz?      ( app-arch/xz-utils:= )
 	selinux? ( sys-libs/libselinux:= )
-	zlib?    ( sys-libs/zlib:= )
 	zstd?    ( app-arch/zstd:= )
 "
 RDEPEND="${DEPEND}"
@@ -39,7 +38,6 @@ src_configure() {
 		$(use_with lzo)
 		$(use_with selinux)
 		$(use_with xz)
-		$(use_with zlib gzip)
 		$(use_with zstd)
 	)
 	econf "${myconf[@]}"
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 4300627dea45..15de8c70e2ab 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -6,15 +6,14 @@ AUX squashfs-tools-4.3-mem-overflow.patch 981 BLAKE2B 135d7a985ae0e795e2d2464059
 AUX squashfs-tools-4.3-musl.patch 688 BLAKE2B c5c7dc479fe50e581c7546265be622a88cca5973a56efc1ad2896034d5fe071461da2d947a1d9009fa354e49f668ee56b4cb900af1842be8dad34a51bdb4c8e9 SHA512 61fb8eaedc4e649eb8fb362150cf5faef2289cb42514300f63448d164a12c9b21539ae49f6dc0d78fa1e4a3be01b26cb9084cec7f0159fe026fc1caa19df18dd
 AUX squashfs-tools-4.3-sysmacros.patch 611 BLAKE2B eb4a634987a902329d1debcb992b5ed60e1b70feae03860b09267d76abfb19c817887e613b0cedc9d02e265c10f34f8b697e9f390fdb011d2931f13705b30804 SHA512 c21466b2f0aa6d6ae65b3693148274250bc42d8e7ea5142d6d4048d663ff4343dc539822320cf732d88c5bac048766a9771e1d2b739b1176cb9fafa96c4d306a
 AUX squashfs-tools-4.3-xattrs.patch 1076 BLAKE2B deca0eb05d6ac4302b82193b333dec531c0165041af2777d914039671d228d426a2576ae06f6edf86886bd59e7a76fc3a6443337976d7c96b40a1c5dbd7ea8be SHA512 3899bb72cabeb296eb12fdd1c2e77e82a4354e58c91c69be918950c7fc88f56fbc0265c915b7363704579b710a69a35312fa9ab3d43236900774ae97efd473a8
-DIST squashfs-tools_4.3-11.debian.tar.xz 27108 BLAKE2B 948a69f79fbec6af2467a56457410253676d693e1d67efef034f85523c17e6db6d85f1f9e9b2f8ae391ac5783d37b7d2cdb3434acee96c19880bbf6a5b771e40 SHA512 ef22436a6da925f8ac0c61ae4450b4cc9a87930b456035dd2588c3edf0d7530cd1a9d1e7bde90c9462e39687a9a8d0caedea5f181cd2414e4caa8af1d3965b0a
+DIST squashfs-tools-4.4.tar.gz 241842 BLAKE2B 006e2d340bcf6e20873221fb51fa30e0808c4a4d9e1838ca71c11ddbff3bf472dffe730e9edf07c34f535650e6486a8a80a88f82d6c9ef7a7c19aa22098e9197 SHA512 133ce437fb8c929933d52cff710b61dd9181f6f8be58250b0d6a59a7bb79a2b350f68f456b06a0e17c469409a71272d586802d570248273ddcd5dad088c00308
 DIST squashfs-tools_4.3-12.debian.tar.xz 27300 BLAKE2B 60e127f0ab2fde08c58bf255926b47812b8103793ee187633bf0ee12c9b74ae55faf930f992be3eee87b998da9ed7bb42b1150e58903b2855b159b861b542669 SHA512 13b04a85b1237b5a88a0e01f82b992d98e1b29e3a90a29230607c5232e0188d5402de55a08b6cf78b09f7da2eea05ccc6d15ac0de375af8004c468cfac1fe940
 DIST squashfs-tools_4.3-3.debian.tar.xz 15252 BLAKE2B 5273eb8007192190786513f49be68eded38a7acae80d0c84067e8d239d53304a79be454cc4970af0d1c1eff6e58b75403201497dfd18d175f9d5aae5e0102834 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae
 DIST squashfs-tools_4.3-7.debian.tar.xz 19612 BLAKE2B 7894b6fa27e7e46aec82b680a1ce521c895436ccb1cafcfd3d95e09f56546e08539a7c152854ee14e9516e217339617d25e68c0cc1a4c41b3bdd689caeefa94a SHA512 88df37e0c13483c5591f925156628b3ae27279f56d2453f7f1f82558da1bc3338e23e9481d704b785a40846c6dedc6b0a0e1dd2ea70fe26ea2f1e855fd6d6fdf
 DIST squashfs4.3.tar.gz 182550 BLAKE2B f56ff33a505f7d60cced11224526bfce003bc06184ad7e8cb9cd08b14854164da8d2ecc64694d44085c46bcfa3aaa85939c97820415345053f7956af04066fdb SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79
 EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c528665123ab08b9d2fc212faea1f460d8be277ff26f7d9f58c4fd912d1b3a4d2a36d8a65028d922e9e50fbc2198859207ee44103 SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec
-EBUILD squashfs-tools-4.3_p11-r1.ebuild 2261 BLAKE2B 621d709448cb692443f1719d2337b6f1e275d70c381aa07291aba2cd9e9c06b04ec1fb30770567983cf8d14034586e56373c09a7e239e41e1e74a03dc6859101 SHA512 d1f85f6eb6fc21d2da1ef708d8a823de71f6e014196cbd9f97ffc93a2c9dc87b87244b7a841529bb1939c244c914d45239619ca1162ac4124c267b2fe8aaebf8
-EBUILD squashfs-tools-4.3_p11.ebuild 2169 BLAKE2B efc0e6110c461d7a36415f782e07d2b5f6681b2ac5271c185c62a573bb5c1df36d18bf967fccdb959851c5de3518fd433022b8aa59f3cd6ce5c59fb43812b58f SHA512 78315a8b0617dcaff29805f05b0245b32e86665a3c3e554e7545219800776bccdf03e3a5b05794c64e6938ad22187cd2e81f96222f6103ad69d222d3b9c3f77b
 EBUILD squashfs-tools-4.3_p12.ebuild 2176 BLAKE2B b55b7e215becdd233a43fbd2abfb4676b694270257b87f49b9a301c2271fb7de29f6a4e41ec1af4c89ed777e000d2bb27025c1314e74e4ea263d8928f6896f89 SHA512 13537ed71d3c8f4a599107eed5efb20f3a70633bb1e4cd193f98febfa89ddc4c38b2fd6eadfec2c0aca187044a40198d01c0d16b33685db85e7a9433e9b625b6
-EBUILD squashfs-tools-4.3_p7.ebuild 2082 BLAKE2B d601c94217cec7ddfcc5cbb43801b1b5c68bc0e7710ecf7959e03a5a07990a9fb3964330eb8aed711c7c71e65654553ec69869af89405785edab87852ec7f681 SHA512 7e84bef886c2d10573c86aca5221f4012917fae4ae87fb959bc36d03da9528cef71cb376cd588fd0a3d78804a8ddff4c8529a48659c2f74aca6ed5c342862a13
+EBUILD squashfs-tools-4.3_p7.ebuild 2081 BLAKE2B 4a8dd3b2d9aeab4dd62e837ccad73c3978a38cc6eab1bed7b325cae5df5b86eb07a72c7fb41d15c6f3c8d359e7f737e42378bf1f8cd27449fbdee0feabe3e757 SHA512 7502683661d1ce9dceae275695f727153fa3215735e8d65089f3953244ec9e4a37e0be4df02300001d8ea49e1819e4d9a14529b6a6f654ee6332b6bbc2ce63f8
+EBUILD squashfs-tools-4.4.ebuild 1662 BLAKE2B d4fc1fcbcfdb32722d5c5b6d9106f29c92d30f33073d4f4fc054a80cef6fb51c8a16f811e7ad46937aa9c91fc0b9851aadf5a1255a3fbc27bb53189505889b43 SHA512 29801eda9ea12f4fdba8d2ce967049af5cbcbfb3ed5d4ba1b47dab6a24386f37a9ae62b20af5567342e6353b39957aee93fcfaff9c0359f2f6c896463cdc0135
 EBUILD squashfs-tools-9999.ebuild 1657 BLAKE2B ad5692c2f5cc0ab9a33b47cfcba96361a26fd07ea36d2f8ca23826deedc563978ae74aeb52884806db45b531f3b9b9c6691b2462ae7546e27be8188683c0b484 SHA512 2a90c73888a9f7295ba19a884eabf52d97b562741f015df5bf6a712ea7bbc18c39af6c03c57735a60462e3cca83d4ed1c8a5951eb87789d9d1c06bf708dc5257
 MISC metadata.xml 527 BLAKE2B 05e98989ffc60b95f4436d733483025dd1b60dd108aa9116d99b7c6e219a30344815ce1c9a269424f0e0e42b587f08b43ad76bc49a95b0e835f71be097259db5 SHA512 802855b76ddf5d220fbc6f8b6562a27d8f32a43e8dde7ec451fd6c2d1aefb5362d79db35023634a9b6d4ec94588f12e06ba29d9bd0b434cad93d4e34ea043cf1
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p11-r1.ebuild
deleted file mode 100644
index b0c96a39261a..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="tools to create and extract Squashfs filesystems"
-HOMEPAGE="http://squashfs.sourceforge.net"
-SRC_URI="
-	mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug lz4 lzma lzo static xattr +xz zstd"
-
-LIB_DEPEND="
-	sys-libs/zlib[static-libs(+)]
-	!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
-	lz4? ( app-arch/lz4[static-libs(+)] )
-	lzma? ( app-arch/xz-utils[static-libs(+)] )
-	lzo? ( dev-libs/lzo[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xz? ( app-arch/xz-utils[static-libs(+)] )
-	zstd? ( app-arch/zstd[static-libs(+)] )
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-PATCHES=(
-	"${FILESDIR}"/${P/_p*}-sysmacros.patch
-	"${FILESDIR}"/${P/_p*}-aligned-data.patch
-	"${FILESDIR}"/${P/_p*}-local-cve-fix.patch
-	"${FILESDIR}"/${P/_p*}-mem-overflow.patch
-	"${FILESDIR}"/${P/_p*}-extmatch.patch
-	"${FILESDIR}"/${P/_p*}-musl.patch
-)
-
-S="${WORKDIR}/squashfs${PV/_p*}/${PN}"
-
-src_prepare() {
-	mv "${WORKDIR}"/debian/patches/0016-remove-frag_deflator_thread.patch "${WORKDIR}"/ || die
-	eapply -p2 "${WORKDIR}"/debian/patches/*.patch
-	eapply -p2 ${PATCHES[@]}
-	eapply_user
-}
-
-use10() { usex $1 1 0 ; }
-
-src_configure() {
-	# restore GNU89 inline semantics to
-	# emit function symbols, bug 595290
-	append-cflags -std=gnu89
-
-	# set up make command line variables in EMAKE_SQUASHFS_CONF
-	EMAKE_SQUASHFS_CONF=(
-		LZMA_XZ_SUPPORT=$(use10 lzma)
-		LZO_SUPPORT=$(use10 lzo)
-		LZ4_SUPPORT=$(use10 lz4)
-		XATTR_SUPPORT=$(use10 xattr)
-		XZ_SUPPORT=$(use10 xz)
-		ZSTD_SUPPORT=$(use10 zstd)
-	)
-
-	tc-export CC
-	use debug && append-cppflags -DSQUASHFS_TRACE
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	emake "${EMAKE_SQUASHFS_CONF[@]}"
-}
-
-src_install() {
-	dobin mksquashfs unsquashfs
-	cd ..
-	dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
-	doman "${WORKDIR}"/debian/manpages/*.[0-9]
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p11.ebuild
deleted file mode 100644
index 48c56a335453..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="tools to create and extract Squashfs filesystems"
-HOMEPAGE="http://squashfs.sourceforge.net"
-SRC_URI="
-	mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug lz4 lzma lzo static xattr +xz zstd"
-
-LIB_DEPEND="
-	sys-libs/zlib[static-libs(+)]
-	!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
-	lz4? ( app-arch/lz4[static-libs(+)] )
-	lzma? ( app-arch/xz-utils[static-libs(+)] )
-	lzo? ( dev-libs/lzo[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xz? ( app-arch/xz-utils[static-libs(+)] )
-	zstd? ( app-arch/zstd[static-libs(+)] )
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-PATCHES=(
-	"${FILESDIR}"/${P/_p*}-sysmacros.patch
-	"${FILESDIR}"/${P/_p*}-aligned-data.patch
-	"${FILESDIR}"/${P/_p*}-local-cve-fix.patch
-	"${FILESDIR}"/${P/_p*}-mem-overflow.patch
-	"${FILESDIR}"/${P/_p*}-extmatch.patch
-	"${FILESDIR}"/${P/_p*}-musl.patch
-)
-
-S="${WORKDIR}/squashfs${PV/_p*}/${PN}"
-
-src_prepare() {
-	eapply -p2 "${WORKDIR}"/debian/patches/*.patch
-	eapply -p2 ${PATCHES[@]}
-	eapply_user
-}
-
-use10() { usex $1 1 0 ; }
-
-src_configure() {
-	# restore GNU89 inline semantics to
-	# emit function symbols, bug 595290
-	append-cflags -std=gnu89
-
-	# set up make command line variables in EMAKE_SQUASHFS_CONF
-	EMAKE_SQUASHFS_CONF=(
-		LZMA_XZ_SUPPORT=$(use10 lzma)
-		LZO_SUPPORT=$(use10 lzo)
-		LZ4_SUPPORT=$(use10 lz4)
-		XATTR_SUPPORT=$(use10 xattr)
-		XZ_SUPPORT=$(use10 xz)
-		ZSTD_SUPPORT=$(use10 zstd)
-	)
-
-	tc-export CC
-	use debug && append-cppflags -DSQUASHFS_TRACE
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	emake "${EMAKE_SQUASHFS_CONF[@]}"
-}
-
-src_install() {
-	dobin mksquashfs unsquashfs
-	cd ..
-	dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
-	doman "${WORKDIR}"/debian/manpages/*.[0-9]
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
index 623cbad1b177..48fb0075411c 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 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="debug lz4 lzma lzo static xattr +xz"
 
 LIB_DEPEND="
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
new file mode 100644
index 000000000000..fc9ce8107b27
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
@@ -0,0 +1,66 @@
+# 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="tools to create and extract Squashfs filesystems"
+HOMEPAGE="https://github.com/plougher/squashfs-tools"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="debug lz4 lzma lzo static xattr +xz zstd"
+
+LIB_DEPEND="
+	sys-libs/zlib[static-libs(+)]
+	!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
+	lz4? ( app-arch/lz4[static-libs(+)] )
+	lzma? ( app-arch/xz-utils[static-libs(+)] )
+	lzo? ( dev-libs/lzo[static-libs(+)] )
+	xattr? ( sys-apps/attr[static-libs(+)] )
+	xz? ( app-arch/xz-utils[static-libs(+)] )
+	zstd? ( app-arch/zstd[static-libs(+)] )
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+S=${WORKDIR}/${P}/${PN}
+
+use10() { usex $1 1 0 ; }
+
+src_configure() {
+	# restore GNU89 inline semantics to
+	# emit function symbols, bug 595290
+	append-cflags -std=gnu89
+
+	# set up make command line variables in EMAKE_SQUASHFS_CONF
+	EMAKE_SQUASHFS_CONF=(
+		LZMA_XZ_SUPPORT=$(use10 lzma)
+		LZO_SUPPORT=$(use10 lzo)
+		LZ4_SUPPORT=$(use10 lz4)
+		XATTR_SUPPORT=$(use10 xattr)
+		XZ_SUPPORT=$(use10 xz)
+		ZSTD_SUPPORT=$(use10 zstd)
+	)
+
+	tc-export CC
+	use debug && append-cppflags -DSQUASHFS_TRACE
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	emake "${EMAKE_SQUASHFS_CONF[@]}"
+}
+
+src_install() {
+	dobin mksquashfs unsquashfs
+	cd ..
+	dodoc ACKNOWLEDGEMENTS CHANGES README*
+	dodoc -r RELEASE-READMEs
+}
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index df4be83b350e..e3c58376d098 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -1,6 +1,4 @@
-DIST udev-init-scripts-32.tar.gz 3661 BLAKE2B 11736f1e6c44bf032571008e907f97d5c64afafa7fe7fcd4fa5f398fce1fa6698adc66c933a0a451adde31c44fc09339129d6352cc2fd0389fecee8d34c095f6 SHA512 da6291ae5c2aa1e8e41656fbe2ed6700e46360809119c0f8a26bf6c3f23f05c861b2c2943b55e47140462049474725e96105e68b204f3d931050409f34d19699
 DIST udev-init-scripts-33.tar.gz 3698 BLAKE2B fc79b3f6984131180324919f7be4309715976309ee582147662634bb020b8162b293e7fd0e675a9cc7a3b1630ce0fc49b29c899e393c7748d47cf924b1ca2809 SHA512 2119aace937da02f47a5adc9af720587d25c2852cf70a9bcb04138e3ee511308c8f30cf0301fbec58cf0432b7fd6672ae6a02d1740c774703959197b3511fbcc
-EBUILD udev-init-scripts-32.ebuild 1312 BLAKE2B 6ee1cd14dacb4401e13def376869418219823a4302eb5c6c55a5c426626209d708bff30cf7bd5fc816a778dbed836ccbf4faf7430ea83a5d1ca97ca77a043d1d SHA512 e17028b8d8ea22f44e595835bfe882d59a7314098eb33203b23e555bd886f282aa183356cbb6a1aca925cd1b7267f290f15b8a1f98198db0ed29237ef33f745a
-EBUILD udev-init-scripts-33.ebuild 1400 BLAKE2B e9e386e567aa782c97025e3b6a5babe14efdfa58c6c31fce761c504bfb7b114557352cdd459a0620be0abe4a134c60f2c01279ab0f6a559d22ca05a7dfe0fd57 SHA512 d35c600eb8b0f1829f926fc4a9a26e9990c31bdfc20c06be9cbd4b02ba6dabb09801322bcf56daa5bbd97aab8cce2fb75ddd60fbbb08385053f522f5db168a46
-EBUILD udev-init-scripts-9999.ebuild 1410 BLAKE2B d0e3393b484a9bd399709a500310f6f8a0126d24a8b294afde04c7b1886212c48e5c547b67434bb7cddea857ebf5d2863a968f2e331acb54ab7316b531eec76e SHA512 36a24933ff3c43a9061801c2085b3f02997e446910c113b8241c5b6fa9144ff4b98cf75859715a859cfe8e38338a3c9151fc61151bdf8c6e11ffe316274f4ac4
+EBUILD udev-init-scripts-33.ebuild 1478 BLAKE2B ed3c40f6c759369e8af632b330d62e0e562af23f82266430032a92a78b28d9158da9f266ef9d7c95dc471c4f401c943dfa7e44a09fd881644d6281630961e85d SHA512 a706664d4d3d2c8aa6dfa6596a5ed41fc1c06e48ccba7c1d5fbcb9e75af357ac7d1de910f9c9bf097b94ec44b47d1eb5e707e5cb1aedd50b230ea0b5dbfb85f8
+EBUILD udev-init-scripts-9999.ebuild 1488 BLAKE2B a0e3675e423214b4b96f52aea796d215497222367669fcecef0fb5d0d0a13a748485e24abbcba34979026e0814d8005c9a295eafe4ac379cc45ed94713d3378b SHA512 2974bb69e988f43dc66eb83bb2e4148c1df74dee5c1ae4af0bc3224e0120349f70730cdd4b594edafc5cad99b8579ee0577f458129e22de030266368b518166b
 MISC metadata.xml 221 BLAKE2B 9e0d24573ec598eccd3ad7e41a38ead4192d9e757ff4b870b51b02a96f04a13596b15c5c05ee2a4d888c4b9b0b9b30aafe5ba96d39ff9faa157b58e30e91ba55 SHA512 accbe81ec1cf4c8d7c6eb99b7ceb7a8119eb1f2f55dcaf6d368610c255e7a21ff222e7c613ca4be37083ce9527ca325f3ee91515dadad7c5929f60f4fda334df
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild
deleted file mode 100644
index 400159dfab88..000000000000
--- a/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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="git://anongit.gentoo.org/proj/udev-gentoo-scripts.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-fi
-
-DESCRIPTION="udev startup scripts for openrc"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=">=virtual/udev-217
-	!<sys-apps/openrc-0.14"
-
-pkg_postinst() {
-	# Add udev and udev-trigger to the sysinit runlevel automatically.
-	for f in udev udev-trigger; do
-		if [[ -x ${ROOT%/}/etc/init.d/${f} &&
-			-d ${ROOT%/}/etc/runlevels/sysinit &&
-			! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then
-			ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f}
-			ewarn "Adding ${f} to the sysinit runlevel"
-		fi
-	done
-
-	if ! has_version "sys-fs/eudev[rule-generator]" && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
-		ewarn "The udev-postmount service has been removed because the reasons for"
-		ewarn "its existance have been removed upstream."
-		ewarn "Please remove it from your runlevels."
-	fi
-}
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
index 2090016f2a50..1646e4a87e88 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
@@ -25,13 +25,18 @@ RESTRICT="test"
 RDEPEND=">=virtual/udev-217
 	!<sys-apps/openrc-0.14"
 
+src_install() {
+	local -x SYSCONFDIR="${EPREFIX}/etc"
+	default
+}
+
 pkg_postinst() {
 	# Add udev and udev-trigger to the sysinit runlevel automatically.
 	for f in udev udev-trigger; do
-		if [[ -x ${ROOT%/}/etc/init.d/${f} &&
-			-d ${ROOT%/}/etc/runlevels/sysinit &&
-			! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then
-			ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f}
+		if [[ -x "${EROOT}/etc/init.d/${f}" &&
+			-d "${EROOT}/etc/runlevels/sysinit" &&
+			! -L "${EROOT}/etc/runlevels/sysinit/${f}" ]]; then
+			ln -snf "${EPREFIX}/etc/init.d/${f}" "${EROOT}/etc/runlevels/sysinit/${f}"
 			ewarn "Adding ${f} to the sysinit runlevel"
 		fi
 	done
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
index b514fc5923dd..4ce4b403509b 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -25,13 +25,18 @@ RESTRICT="test"
 RDEPEND=">=virtual/udev-217
 	!<sys-apps/openrc-0.14"
 
+src_install() {
+	local -x SYSCONFDIR="${EPREFIX}/etc"
+	default
+}
+
 pkg_postinst() {
 	# Add udev and udev-trigger to the sysinit runlevel automatically.
 	for f in udev udev-trigger; do
-		if [[ -x ${ROOT%/}/etc/init.d/${f} &&
-			-d ${ROOT%/}/etc/runlevels/sysinit &&
-			! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then
-			ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f}
+		if [[ -x "${EROOT}/etc/init.d/${f}" &&
+			-d "${EROOT}/etc/runlevels/sysinit" &&
+			! -L "${EROOT}/etc/runlevels/sysinit/${f}" ]]; then
+			ln -snf "${EPREFIX}/etc/init.d/${f}" "${EROOT}/etc/runlevels/sysinit/${f}"
 			ewarn "Adding ${f} to the sysinit runlevel"
 		fi
 	done
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index e3a69c3fee15..30b70a607bc8 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -22,6 +22,6 @@ EBUILD udev-240-r3.ebuild 9664 BLAKE2B 2daaa3124df1ce0ea5b3247200a55020d75b92383
 EBUILD udev-241.ebuild 9673 BLAKE2B 33c6d4cf7c1d58645481dcb957f1a3e28587911dc5a2ead16d1a91d2b0eca5ad0765203661a8088fac4699e501162759cc927f2692bfb170c98394b8e03e7978 SHA512 f1d6f1aa6d131605b6a63aea994bd7c7c2354714a41f0de85fe884389d0893d737ebbacea2a34d9a15f7173cf10f0d225125aacef33725684565044c6d1edcd8
 EBUILD udev-241_rc1.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
 EBUILD udev-241_rc2.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
-EBUILD udev-242.ebuild 9611 BLAKE2B 44037308847edaa3d7050392784e10e17dabb1b6d2b906b62ec815a6daf394b7d99d02b85ca8fe1c096ae1cd25bc53dae57738e1a16bb859bb72961d037efb67 SHA512 6f24c9c2b115ba77c09911080795b2d9c8e40f5a111ff5e91da58d125f3235cc66e9e885c5fe343990f2130de5fdf3a517ebf20090ecf94b978bc2aeb751d06a
+EBUILD udev-242.ebuild 9610 BLAKE2B 03c9d20e26bf3da9a397fcad196d9c9a037776cc8f121c1bd1ed4d1a01e6e9189ed512e5aa7c8c74c5d4a17446459a24f3c77b02bcdec2c15878c69ee2a7ec5c SHA512 1a8b87cd84bd431b2e8bc483285c9700a5f0cda8d372779da7da728dd4589f416eea15e1009a281b2568a099cdc733ef711c2b6801834630a4289d2b0665f3c2
 EBUILD udev-9999.ebuild 9591 BLAKE2B 72ccdcaf7791558859483b8d161908a040cae8284e01b3c3f333ce55715d5c61f4173a34fdbf3b910a8b258a5d6f4feff5880b3366853f5b2c39c3b3ed5eafbb SHA512 f8d7823de0ff335ea169c312a5e79111463005714858ccd248de73df76fce4dfab872b5387bef596f4113dfb4c3a97c0c4d14680c53fe194aaa37816fcab79bf
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-242.ebuild b/sys-fs/udev/udev-242.ebuild
index 6aa2af42bb05..b678d66aaffa 100644
--- a/sys-fs/udev/udev-242.ebuild
+++ b/sys-fs/udev/udev-242.ebuild
@@ -13,7 +13,7 @@ else
 	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"
+	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/vhba/Manifest b/sys-fs/vhba/Manifest
index f14fe3ecc090..db22426a5d0a 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,3 +1,7 @@
 DIST vhba-module-20190410.tar.bz2 15741 BLAKE2B 6d513877c771b1c4c5805231cf8bb13333d29dd3c6de7d91879ef1898fdc424df026b0835a772f398dcdc7d8900db462164a40e46c9b66b38ed70f5b5f6a0e7e SHA512 e4b30bea8464d8ac24fd2fddca9d41052af2f5b3dc9e054ead47991bff41366be377600075627c40261722c88c20ed2eaf65fa7afb34690ef09a6f4ea6f9351f
+DIST vhba-module-20190827.tar.bz2 15570 BLAKE2B 54a50f14659e388c0d53edce842633a3d85bae66483d27e458a83fcc7c547a804e83d34bba0e9a11a0b7e4e533f78c7014ac8e1235a83a7dc6aa13671cb9a823 SHA512 e84ffbbace9964b5fda844d3dd5201ae969ca017886a709d814670a371631376ebb2b1f05775c14ace43e84ed7fc0340638e485ac2a386db530cc25a9fa6e534
+DIST vhba-module-20190831.tar.bz2 15570 BLAKE2B 202f28a0729eddce907f5fc46f99a52b116948a376c0f2aaab3b9340f88fc248151c3ec592f2f60e52a07eeed4f551d6f270b4464605bce9df4badf9fa8ed322 SHA512 f43cb9b5730c4d634b58d3dd204610dbc86fdc520d4cfee6c9efbae3bb2acb88f5663e5fbd2b11b5ef9e3b6ad7d4dd0ecf9728dc36ac0b492bd06e0806223591
 EBUILD vhba-20190410.ebuild 2146 BLAKE2B 7b02077e20c319d2d9197719c00e115119b3e825c706fbfbc64de6a018b374605a5d06e4ac7d830c365b3ee1cae7299a207a49eb8d55385d775a73a0bc3f8c8f SHA512 ab5fc77641921817989917b9b47e0f4766db4e02238c8826d2eeb90d6a23c7ef7a1fc21d4ed99ddd1ea002f06d4ff7f63c7df660923cd71db5ab34d9a8b0dc5c
+EBUILD vhba-20190827.ebuild 1116 BLAKE2B a670b0a7448539bb06a02947d1ba7a60569314e385d52d620e962356cd738ab669012a6429c6d0b6d8a4d397f33c8e00d4ad80dc15ca5890b54eae9235090832 SHA512 ef147e91d85a526786b0df3fe8d4e1b4208877b97d5724dfb11f89cdd3bde8091c00b185c67baac72e8f5ffc799fbb6712f6c35f81ba2a4f505fdd100ed01fad
+EBUILD vhba-20190831.ebuild 1152 BLAKE2B 647af5526d5e9fa94d7872ccd9d4ddc0231667416eda790346df121a22d0cb7cd5b218eee2f681c4ad095692e7ef2a89c3c99d6af478b41a8b7e4ddc00839c4f SHA512 e54af6afcd856f417ece53880bce3f0c6611c7375b4b99f4ee85743f9a08904dfc967fb5cba76bbf0b9958eebb75532ed77572ac4c6b6d82be1417bcceceec67
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/sys-fs/vhba/vhba-20190827.ebuild b/sys-fs/vhba/vhba-20190827.ebuild
new file mode 100644
index 000000000000..a049dfd927d2
--- /dev/null
+++ b/sys-fs/vhba/vhba-20190827.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils linux-mod udev
+
+MY_P=vhba-module-${PV}
+DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/udev"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+MODULE_NAMES="vhba(block:${S})"
+BUILD_TARGETS=modules
+
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
+	check_extra_config
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	# Avoid -Werror problems
+	sed -i -e '/ccflags/s/-Werror/-Wall/' Makefile || die "sed failed"
+
+	eapply_user
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog README
+	linux-mod_src_install
+
+	einfo "Generating udev rules ..."
+	dodir "$(get_udevdir)"/rules.d
+	cat > "${D}$(get_udevdir)"/rules.d/69-vhba.rules <<-EOF || die
+		# do not edit this file, it will be overwritten on update
+		#
+		KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"
+	EOF
+}
diff --git a/sys-fs/vhba/vhba-20190831.ebuild b/sys-fs/vhba/vhba-20190831.ebuild
new file mode 100644
index 000000000000..5dea07de5793
--- /dev/null
+++ b/sys-fs/vhba/vhba-20190831.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils linux-mod udev
+
+MY_P=vhba-module-${PV}
+DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
+HOMEPAGE="https://cdemu.sourceforge.io"
+SRC_URI="https://download.sourceforge.net/cdemu/vhba-module/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/udev"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+MODULE_NAMES="vhba(block:${S})"
+BUILD_TARGETS=modules
+
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
+	check_extra_config
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	# Avoid -Werror problems
+	sed -i -e '/ccflags/s/-Werror/-Wall/' Makefile || die "sed failed"
+
+	eapply_user
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog README
+	linux-mod_src_install
+
+	einfo "Generating udev rules ..."
+	dodir "$(get_udevdir)"/rules.d
+	cat > "${D}$(get_udevdir)"/rules.d/69-vhba.rules <<-EOF || die
+		# do not edit this file, it will be overwritten on update
+		#
+		KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"
+	EOF
+}
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index cbb56325e9ed..9a4f31858ed8 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -2,9 +2,11 @@ AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b
 AUX xfsprogs-4.15.0-sharedlibs.patch 3022 BLAKE2B cfa23520a55750af375ada8c35fb9f4b3ea2f401ddebd95aef6d46f9195ac6ab3fb38f5f9d08529d3c2658623a49eadc7db0be68159753025310605fdfc35a6b SHA512 5a6e62f2914e372f2bf679b10c32fe65f60677b4bf0e58f60c40a297ed8974d5ec0af3bcba5801ba19cadbb689a6dad62c1e2cd88587f6f3d30f21f1472f3ac0
 AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13fe3d217a6c4c8dd21fce1986793cefaa4777e827945adb3807f2d644665fbf66e7fbd5318d6f5c58d37c49260c24ca46181 SHA512 2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7
 DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775 SHA512 a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58
-DIST xfsprogs-5.0.0.tar.xz 1218476 BLAKE2B ef6eaab43531f696f739972c362e31c3304baaecb3485b45c16441a8bf7f1da7f47cd74a21660ba2c2bb45858a2b13b7af41c94671135f6a32a36eb745c024a0 SHA512 cebe3d2ea80676a99cc7f9cc014894398fbe3bdaf237829e9c7aa0404558c1ab16f2055acb5afd8234b2bc8475117bcef3c7500c553adb12bbaf3262bd077d18
 DIST xfsprogs-5.1.0.tar.xz 1223736 BLAKE2B bfadb13cf3a4f9231eb13f4e7d3c803c2143abb776c0fee758ea7257097ef3fb79253c16133942041c20ff6078a1704fa18d08866c6a2e1a61b63f4de11d00c7 SHA512 ca5959edb299be8574b2ca51e907a418fab796ae92f588075a2aab0c2a3cf8dae49e2b68679c65c361201223e8f8ac29b1e5618eb1e519496c3aca9218620881
+DIST xfsprogs-5.2.0.tar.xz 1225884 BLAKE2B bec075d2adbafc5f6be215b658b8617141ade481558477525251c8547162f462af5464af5ac25d9498aca99b960a59071cc6651c36c6d30e5757e8d177c1b898 SHA512 b65ffb4d293f1ee0a9ec5aa35bf7a9491c2d536ad0da7f8e1d533743caebd98abffd1b93508969bac4135dc15434a9e170a516cedd373466ef762b65029f013f
+DIST xfsprogs-5.2.1.tar.xz 1227012 BLAKE2B af6c25d88d0a50fc82ecb2d9d00545ffdf906d6e85361360130b5a2b0d362e566c097f15be04a61023bd5c7815b77d0bab6258d8f188c5afe68098c51ae26ee0 SHA512 a2ecd8e2ae8a4e7357b4133beaeffeae4d6c9d0ece9855d9780a84c2d4072e3d4e0b8ffa3baa995862ec38dcbc5dd74205f7f4456676826082c4811867508a43
 EBUILD xfsprogs-4.19.0.ebuild 2434 BLAKE2B cc6ca0e0425994414497bb9ac27541408958d9da936a659028b38cdaf3ed6527c741efeff812b023ce513b091b301723fa21fce1a4512939c5d3f6ddb8f42ab4 SHA512 bcef5fcc339809950886dd2a37fa696892216e1ddc5fc85b773ba40fe94fd1430a0b34b71a1ea22ce5d3cb947a8de23c800993067b5f909358ed037a2c18a198
-EBUILD xfsprogs-5.0.0.ebuild 2446 BLAKE2B 56b0df730592b592b2fec03628d77b23c85fa83c327aa79576a4e7a3ade9eeb2b7ce37c94ec28372cfd90ca627e975aaeb9410d3b92976e40b7efa046a6ce613 SHA512 0346edc9cca81230879dd85b7eec3db552c48ae14cc97d2ca00c7a47e743c360b5a7a66533705f302e6062368e4497df7bbc114294cc0693c02acb804f4221a9
 EBUILD xfsprogs-5.1.0.ebuild 2466 BLAKE2B 568609a5a361342a9eba9c591910ef0304f0a362dcddd3c4629671bcc28600b9155e17a59111bdd28e90d4be51f26d9e0ca4c313b0daea82fe4eafd4af77813e SHA512 5a4c27c82ea4e20c0e8a1428cbbff72e58c84e72281dbe2e5a91fb52ab3e6824fe778e375c0c8318df1ebf83975c5bef637b4749e21fc5f5309d8b82743867a0
+EBUILD xfsprogs-5.2.0.ebuild 2847 BLAKE2B 21b2d3dd8fb503e435a97af0bec0b2a6d4c51dc3be92bf1bc12c41e568e154b44d41e5c559c5893da7962ad05d9a08f25ee3f9f51983ece8631c8601d942a7f6 SHA512 c76c5830628b64bbed2af76f3529e6354bcc9c89667836c107c7f8f25bbac48de6ef5b36b55b71273441a0a17289f51ee12017c23ed0c2bf16448e5f16160466
+EBUILD xfsprogs-5.2.1.ebuild 2782 BLAKE2B 13add8a58236a489688016d3d58800be7542c8ae31d334c72999fc7bc280063112ce5c642da5b01cd922d9c54706899e72c8af7b9becd8c910c4314cb30f39f3 SHA512 9c51e3b40019277aeb1751bc5686157601cdb9b477e086584d5d68866b1f2062690ad2e85f4140d4f5a9f13468609df041007c5e077e848da300083c62d051d7
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-fs/xfsprogs/xfsprogs-5.0.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.0.0.ebuild
deleted file mode 100644
index 79a212d5e50d..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-5.0.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib systemd usr-ldscript
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="icu libedit nls readline static-libs"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-	icu? ( dev-libs/icu:=[static-libs(+)] )
-	readline? ( sys-libs/readline:0=[static-libs(+)] )
-	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
-	"${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
-	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
-)
-
-pkg_setup() {
-	if use readline && use libedit ; then
-		ewarn "You have USE='readline libedit' but these are exclusive."
-		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Clear out -static from all flags since we want to link against dynamic xfs libs.
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-	# Don't install compressed docs
-	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
-	find -name Makefile -exec \
-		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-}
-
-src_configure() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-
-	local myconf=(
-		--disable-lto #655638
-		--enable-blkid
-		--with-crond-dir="${EPREFIX}/etc/cron.d"
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		$(use_enable icu libicu)
-		$(use_enable nls gettext)
-		$(use_enable readline)
-		$(usex readline --disable-editline $(use_enable libedit editline))
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-
-	MAKEOPTS+=" V=1"
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" install
-	# parallel install fails on this target for >=xfsprogs-3.2.0
-	emake -j1 DIST_ROOT="${ED}" install-dev
-
-	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a handle xcmd xfs xlog frog
-	# removing unnecessary .la files if not needed
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-5.2.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.2.0.ebuild
new file mode 100644
index 000000000000..22a5cc55eeaa
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-5.2.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs systemd
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="icu libedit nls readline"
+
+LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
+	icu? ( dev-libs/icu:=[static-libs(+)] )
+	readline? ( sys-libs/readline:0=[static-libs(+)] )
+	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
+RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
+	!<sys-fs/xfsdump-3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
+	"${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
+	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
+)
+
+pkg_setup() {
+	if use readline && use libedit ; then
+		ewarn "You have USE='readline libedit' but these are exclusive."
+		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Fix doc dir
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+}
+
+src_configure() {
+	export DEBUG=-DNDEBUG
+	export OPTIMIZER=${CFLAGS}
+	unset PLATFORM # if set in user env, this breaks configure
+
+	# Upstream does NOT support --disable-static anymore,
+	# https://www.spinics.net/lists/linux-xfs/msg30185.html
+	# https://www.spinics.net/lists/linux-xfs/msg30272.html
+	local myconf=(
+		--enable-blkid
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		$(use_enable icu libicu)
+		$(use_enable nls gettext)
+		$(use_enable readline)
+		$(usex readline --disable-editline $(use_enable libedit editline))
+	)
+
+	if is-flagq -fno-lto ; then
+		einfo "LTO disabled via {C,CXX,F,FC}FLAGS"
+		myconf+=( --disable-lto )
+	else
+		if is-flagq -flto ; then
+			einfo "LTO forced via {C,CXX,F,FC}FLAGS"
+			myconf+=( --enable-lto )
+		elif use amd64 || use x86  ; then
+			# match upstream default
+			myconf+=( --enable-lto )
+		else
+			# LTO can cause problems on some architectures, bug 655638
+			myconf+=( --disable-lto )
+		fi
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	# Unset {CF,LD}FLAGS which are already set via configure
+	# but will cause problems when available during make.
+	# Fixed in >=xfsprogs-5.3.0.
+	unset CFLAGS LDFLAGS
+
+	emake V=1
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" install
+	# parallel install fails on this target for >=xfsprogs-3.2.0
+	emake -j1 DIST_ROOT="${ED}" install-dev
+
+	# removing unnecessary .la files if not needed
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sys-fs/xfsprogs/xfsprogs-5.2.1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.2.1.ebuild
new file mode 100644
index 000000000000..a546b735ad7c
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-5.2.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs systemd
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="icu libedit nls readline"
+
+LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
+	icu? ( dev-libs/icu:=[static-libs(+)] )
+	readline? ( sys-libs/readline:0=[static-libs(+)] )
+	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
+RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
+	!<sys-fs/xfsdump-3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
+	"${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
+	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
+)
+
+pkg_setup() {
+	if use readline && use libedit ; then
+		ewarn "You have USE='readline libedit' but these are exclusive."
+		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Fix doc dir
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+}
+
+src_configure() {
+	export DEBUG=-DNDEBUG
+	export OPTIMIZER=${CFLAGS}
+	unset PLATFORM # if set in user env, this breaks configure
+
+	# Upstream does NOT support --disable-static anymore,
+	# https://www.spinics.net/lists/linux-xfs/msg30185.html
+	# https://www.spinics.net/lists/linux-xfs/msg30272.html
+	local myconf=(
+		--enable-blkid
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		$(use_enable icu libicu)
+		$(use_enable nls gettext)
+		$(use_enable readline)
+		$(usex readline --disable-editline $(use_enable libedit editline))
+	)
+
+	if is-flagq -fno-lto ; then
+		einfo "LTO disabled via {C,CXX,F,FC}FLAGS"
+		myconf+=( --disable-lto )
+	else
+		if is-flagq -flto ; then
+			einfo "LTO forced via {C,CXX,F,FC}FLAGS"
+			myconf+=( --enable-lto )
+		elif use amd64 || use x86  ; then
+			# match upstream default
+			myconf+=( --enable-lto )
+		else
+			# LTO can cause problems on some architectures, bug 655638
+			myconf+=( --disable-lto )
+		fi
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	# Unset {CF,LD}FLAGS which are already set via configure
+	# but will cause problems when available during make.
+	# Fixed in >=xfsprogs-5.3.0.
+	unset CFLAGS LDFLAGS
+
+	emake V=1
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" install 
+	emake DIST_ROOT="${ED}" install-dev
+
+	# removing unnecessary .la files if not needed
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 54baf330e6a0..538b4a130bf2 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -6,5 +6,5 @@ DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d
 DIST zfs-0.8.1.tar.gz 8668360 BLAKE2B f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b SHA512 1fb3957f65dbe94edaffcedb5b2694390dc14e472c11f7e63184a9ea6a774e79a43d47a2d789b7ced233fc67c76583bf7d5c1bda0692bb07929673e2a57f4667
 EBUILD zfs-0.7.13.ebuild 6286 BLAKE2B 8ff2c44069a13fe26b02a7a490ffcf1cb9833f5d5ba9ca1b151e1ed6bcc706bc46083a86663c073660d7a80792989335f8a1f4d71d162fcc8a16a635336ef175 SHA512 35127bc47361845a18bba3b60b27ae900a16ad2b94c1c479a62b30079b6688236b2feccb9d902ce93e3d8ff0a95504bc00d52fba6120b763d69057227e50a8a6
 EBUILD zfs-0.8.1.ebuild 6818 BLAKE2B b787b718b658937297f35acda6b41c0eaa5b9a41398eb19b0617e2faba0fa41c54d19e96d1ceaab3367e46235f54286d95212cc4de9bb1306f25d5f2ec1b260a SHA512 8719b4b46066a3a2c2bf5f9518082814aba9ecba5e1d977c412432213c1baad89922b13eaf13e3e422fbb4001dc92602444f182847e2e08375d38c812496fe10
-EBUILD zfs-9999.ebuild 5790 BLAKE2B 1197983ec254f6b49f1b60a2f40a10d00b85efb86238b60de241a1c7370e68b3bc73d6def21a8a0b9d045f9b82f250dbbe89922390eb02e89f2496dc076689c1 SHA512 ba4504fe1c70997433b4c08aa2e1850721799a681e62cfbcff0a53c62bd1d2cb700b42edc4ccbab91240dfdf9c5643989eae68f95e6a442fe135a233184bdccb
+EBUILD zfs-9999.ebuild 5587 BLAKE2B 4645ed8a61534158c7420c707876c009a81b176f9e21df817844c8019f2768dbf67f254532260c6a21694e304598beb7260941670ac8aefffbf9834e928e82d6 SHA512 6c232d76438b42149c517f50421ad6e12c63c01a09446b012ed77e10d56d4349e89d95c9c2a45e0b68835ce2ea70ed8459d8d2c2cd1d5e049eb854ed138aaf3a
 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 267450980af8..4c9ec8687286 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -108,22 +108,15 @@ src_prepare() {
 		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
 	fi
 
-	# Update paths
-	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
-		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
-		-e "s|/sbin/parted|/usr/sbin/parted|" \
-		-i scripts/common.sh.in || die
-
 	if use python; then
 		pushd contrib/pyzfs >/dev/null || die
 		distutils-r1_src_prepare
 		popd >/dev/null || die
 	fi
 
-	# prevent errors showing up on zfs-mount stop, openrc will unmount all filesystems anyway
-	if use rootfs; then
-		sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/init.d/zfs.in || die
-	fi
+	# prevent errors showing up on zfs-mount stop, #647688
+	# openrc will unmount all filesystems anyway.
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/init.d/zfs.in || die
 }
 
 src_configure() {
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 004541bd24b9..251e5c7c6298 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 0ef0d516306d..759ab5588903 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -24,6 +24,7 @@ EBUILD dracut-047-r1.ebuild 4650 BLAKE2B 6847c8bc55aac1ccabaf258577a0cd07d749a54
 EBUILD dracut-048-r1.ebuild 4541 BLAKE2B e9be5a23344987322fd1d8a00d17aaf41359664ec378da2c121d5537172c3f17e995127b451e2ff968408630a39913589fd76aa02b0a912075cc7c15a8f411ab SHA512 d112aace95b18abde2e1a6aaa9e3ac79338e5f951e5655a664f09137516b518589b221c0ee4a1aa2ad8ed10177fc5e09f32037af67f29d664faee4c422fa94fc
 EBUILD dracut-048.ebuild 4467 BLAKE2B f6c816fac85d808363953c15cc73a7d6da99934129de297258114c6117a711b58aea818d568604215b3bfc7bf86934130c358701bb2380fd559d2bcd16fe69dc SHA512 11062f8ae2506bd54f6bb784c6c2be6416748fcd84a33554e4b58d66b87aea2b3324c2216a01a211e9bbd207e7e4065537cbcc5bd612b6aac46e2e0912ecec77
 EBUILD dracut-049-r1.ebuild 4615 BLAKE2B ea43727ba91acd3a31b902dae3f80945957f1bbe5397c76bc3d46eb323ab5249b8edea1366c77253a792373d0cdc5ebb075484305dfafd86bbebccd9c0268bfb SHA512 bc0ac08a471ba994f9da4beb5ded4db2da8770e1a973d324e0b7b28845e357dde4401367defdc421c323103408318098386b9228c28e94de71b95c1726d802fa
+EBUILD dracut-049-r2.ebuild 4654 BLAKE2B 8d3da740bf354e82e6bfd155ea5858d21ce0904b255e83d43c70c9987152ea0027b797d19f59bae703e515ac6a4b04c9034fa770bcaf83de7e9f2c6cf002a743 SHA512 de9257ca8c56b065aaf104514670777159b5ad64005ab596c348765ae5b0e9c64e1f18ac3907c5f68cd9edef94385805ef1efe5256d1c78c420f4ef3fa02485c
 EBUILD dracut-049.ebuild 4808 BLAKE2B 70418167cc13d508df24865d2c598dd208ce92963acc0c67b3106e24f3d97c8d82766cec91bbb475649b4003a2590f2279c663ff5b4b8785c3618c9bdca21f09 SHA512 cc9568f59f5d5be6605ff679cbaa55521beab37b7c9438fc096e4ceef7f194c6b21f35f1da177de17816eb7a1835bc27040b3ae21b3b31558e2606e7495e817b
-EBUILD dracut-9999.ebuild 4414 BLAKE2B 1c66e7ff9a12a1011112c4fbbf06930e6fd2593b3c75e71e1778818016e47dfb289b2ea1872013c8da684f5bb07ab9118a941c4152483a60932d2eec83a7b344 SHA512 659b3a626629778bbae1bdb3098a3743f6f9a5dffe41b4c6c095969a2b629294296dc723e6c151c383b5d15f92ccf6e9aaa95d5b452d87fe3acc28d8f0fbbfc7
+EBUILD dracut-9999.ebuild 4453 BLAKE2B 88879375ee46fb12f9c5ec8222d175e4ddce74b6ab2301af931242e961389fc1e239ae5346cfba223a28b4b1d6308ff8e4cf4c43d0286fe9d4078a54e0cc1f43 SHA512 5c60db3be8cec3c309549665dc84e425a87da53e23987b922409abd75fcaf6b236c3a5ab2a5dc90f6d128198c4414e5718d355822ad41b47d072f995d8e796cf
 MISC metadata.xml 725 BLAKE2B 475d51f4e2bebf318ef94ea1fec40a34bcf04b4f0c69e051c8840e0965a92fd9861c5aa8acfb2ccb5a4cf354665ab3efc6adfdf7d0191325c1f798ea5e49594e SHA512 b708d0eb6a792d5ba3495f321af5e10672af3354f1f42c60b175b7fb48ae836e24db7768511c44cbb0a949c1cca75948890d3b32904bbe47e50d9c43d71787fb
diff --git a/sys-kernel/dracut/dracut-049-r2.ebuild b/sys-kernel/dracut/dracut-049-r2.ebuild
new file mode 100644
index 000000000000..872f2ff3a242
--- /dev/null
+++ b/sys-kernel/dracut/dracut-049-r2.ebuild
@@ -0,0 +1,157 @@
+# 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 ~arm64 ~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/openrc[sysv-utils,selinux?]
+		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 d271f1a2dd3a..8cd97656094e 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	>=sys-apps/kmod-23[tools]
 	|| (
 		>=sys-apps/sysvinit-2.87-r3
+		sys-apps/openrc[sysv-utils,selinux?]
 		sys-apps/systemd[sysv-utils]
 	)
 	>=sys-apps/util-linux-2.21
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 5e2fdafda0ca..9f7eca0d5c06 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -7,17 +7,18 @@ AUX initramfs.mounts 816 BLAKE2B 4f36e51fef78435369d43647db853c7bfde217cc93002fc
 DIST LVM2.2.02.173.tgz 2363504 BLAKE2B a516bc9b68b7b7529f4436d8849ca741eb3ca1b5ac2eb2fb2915507935bdd28b5e234e74c1bce827e5761f57b5936510d08107e0dc1c320190f952c706f128d3 SHA512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e
 DIST LVM2.2.02.185.tgz 2386328 BLAKE2B d2e31de3eedd7518ea2d239cb9b36b38e351d7fc070097a1fc4e7934e3636195da3247fba57d684bb0b31b7f3dbdfe29161bd121b2962b2c35c8c9d7914b4506 SHA512 f421505551aec2a09bc862f2fcc1ee825bc4d94c53a01d13265631e99308d60fbca40112be5bc7824cce3ef223c0775d2f6c345f6a3f227229a0566c903841bf
 DIST LVM2.2.02.88.tgz 1029151 BLAKE2B e3ce91b6c43155a66b79cf25da3973abb19decde3acc37d28daf80d14b1bd574f7d31fbcee4b397f0a146b2e221599079e521d0ac21932ff58b7c9d4fdf93501 SHA512 5c334c2c78220f4f9f082a74cbf0b156e96f2a07b5e55f054ff70c752ada97a67f83fa1d89c02accb7cbe5a62e356588831d96a102b7bf16cdce2591d4e37e4b
+DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
 DIST btrfs-progs-v5.2.1.tar.xz 2049856 BLAKE2B 841a506f07f1d965c3443fbea39c81a833c41ce1215db3feb41650c964a3a6ba8f5f964c61838921f2df90f6de7fdb057f0d41856549f26b9c4d580b4707d18f SHA512 7da495df7dd2ef1c7961eda132c5f587785c7a91d2531a0c5ed3917f07c708d02acd48681520c10c375edd7a8a7ecab371e806077ccae7899eb41a5ddea89c59
 DIST busybox-1.20.2.tar.bz2 2186738 BLAKE2B 3efa01ee81a9f3af0ccbcf28b1a24e817a28012d27a27c714b3f13fe4a73200af66fb93dcd9adc65de3e3abb26757939ff3d3ba620af08101c27c5f3550e7501 SHA512 089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd
 DIST busybox-1.26.0.tar.bz2 2143958 BLAKE2B 3a4a227a4308d9d5e00c00fc5e90ee9a1d6345574bdb571cd8b4adab63dcdad3ff7edf30154bb8f8f31a3a658c85641af0f7875d4d533d56bb7c79f28980ebe6 SHA512 9e38c2f4c5ddb6c3a184170b5526c1a78cf53a575ed359fb18c407976cab9788fa95a26ca2d4e5c32e1d639890944d98e118149ee1402b18fe085b0baf0186d3
 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
 DIST busybox-1.31.0.tar.bz2 2427873 BLAKE2B 7fff2ac2c39232f9dbd8ea4af55539e9eb7ab2ddabf2f53534f57cabe00a6096643415275dcfa2730f970994282776f9ce661e99e681989449473182ffe820e1 SHA512 cd58f0b2b6e3bb1b771fcf3d15f420518fb9b10086a45cfb1d7f136ac035be89eec28f9350e42b3fc38454d8bef9190eae0376497487c73785e8fde44c793730
-DIST cryptsetup-2.1.0.tar.xz 10662576 BLAKE2B c79b24c986d5925aed31eddf8f271c3d0f12c89b3f99f953cfa39fe0d9dca2ab3dd2f6ea22141aca0148d6d533d197378b011561075ca26a14ca2e90500a1689 SHA512 f1b68e4d9d0ca2361fe9bdd51c60630dd4ab7a689b7be7756edf4dee12929d2356dd0658c9b940ffe27c033ef289efaf49daf21d250d37fdfa15394b5d821928
 DIST cryptsetup-2.2.0.tar.xz 10763072 BLAKE2B 0ffc228bde15e3427f38402b7411207d1402dcd648903d9c1565689462103c07ab23c4d5c1439674693cf7ed6d14cf62c8a2d19e266da60658c91a37549ba74e SHA512 903ef5811999ce3836bc348334192a432a971f94aa9c850491c8ba856a2c87385f75abc9296b0913ee6785149b8a7bd40457ad07e01f4ac7a1e62e97c7b18e6e
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
 DIST dropbear-2019.78.tar.bz2 2708659 BLAKE2B 212b173cfea8655b43a8d93422dd4d3e0d669a67681cb17d6494b6083e6e4c58d21d52850c0cdf414617ee3dcaa071e376d0b5b156b6856cee2e4fe111550f7d SHA512 f667ba8dae17ea89c118642b566f2c134c71bfd0b8bacea5cf7ec87d75ac79bd7cd1864a8788367a89d30ee35427d389ef6416375adff6e83caae30ff3e0549f
 DIST e2fsprogs-1.45.3.tar.xz 5561452 BLAKE2B ee41f35c3294ccb8dad4274e44d9c07dc94f93d2e921472c34da7913cdb2d60f998fa154c98f6ba4f9e598de152006a0fdb63a9006bbf3bb1847166d9342a29f SHA512 9f898d353af48a1d357cb01f64187b6dfef671bb2e0450438530fe4fa9454fccc6b755c9469d81e702e6d85a4defd02ae0a493897a4b3284cb112e8444c9bf52
 DIST eudev-3.2.8.tar.gz 1894193 BLAKE2B 8709a13031744d5dd2f57853375b920bdaa6ea028624111dc96be9d46748de8423ac749f27183c668336701c16735d7ca2db4566621e0e741a2604785c14c64f SHA512 13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42
+DIST expat-2.2.7.tar.xz 424264 BLAKE2B acf2fa5cf374a671603f4a12b81239ba3b1634bab66d736e87fb516ce52d599711b3014218bef822640781b8852c7238b6f071b5bd439a13838fcbc7767d06a7 SHA512 bf3af5b5a8e1a1b76658a41f67dbe7b10104e3b724e1882f529fecc509b07c75dde02d8f8b89b1522e05484e8dc417d47651c5f8d4aac1749676ba5c4752c107
 DIST fuse-2.8.6.tar.gz 505334 BLAKE2B c44533625ead8acc5a16f61064635492c54aa91780018e3895baf18abe3ca00c9ec7f6606183a4f986037201db79697c07d03adf57c5a87e7888b8823d83aa8a SHA512 03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST genkernel-3.4.52.3.tar.xz 282976 BLAKE2B 69eb6a964c5c20ee32ea6143b576a85090dfb50c011c641ae8415fba1cb99e7f239f4ba7fdc450b7c0eb93a248610c47e751f3993b8fff6e51b9602c37145af9 SHA512 a68b0149b9a69f59ab3e8d772f35f12643b9500c0c684d4824ca1f3c669b0ea01989a55643cd5b413f35d6fff284cd5ede7183971e202b3788caeb399259191f
@@ -31,13 +32,13 @@ DIST genkernel-3.5.2.4.tar.xz 318152 BLAKE2B 101bd8011b73699a3d8410fcb93adca2417
 DIST genkernel-3.5.2.5.tar.xz 318652 BLAKE2B 9b0e1b07f61b54edc1d263cc679b36d7e9062fd1e7cf11fc9442cf60b217274bc73425150ca963b6a91cd504d7817a852fa5bf4ad7634ff8d1ec3b43748ded41 SHA512 096aa77f4a52afefcef81ff6c7eb281e539af304854572389e38bbdd735ca723c7a5f2f7163fa9f387e3a2a78a2ba117260f1c8396ed4e51e12a91ad0fb0ff90
 DIST genkernel-3.5.3.2.tar.xz 320644 BLAKE2B 14eaf05aab02287c3dbb98f1a596e73bcbea39ceb2c8e44c5bdbb77b656958cee666f4353a2401bad531c2a7a98ee11b2531b251c19edc86db517cf3cc2869ec SHA512 1bee8ebdb8c2c30e90e0a1c573ad09b0eb79da54f0829859305eb50ffab95e69aa219ce82d4969140dea3d8788d66d3490fc03d38e190b533666e9278c7f96a6
 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231 SHA512 9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71
-DIST genkernel-4.0.0_beta12.tar.xz 400648 BLAKE2B 18d9efd683855b22caefc8b7ec25f3aae396ceb74c7e31f53bf91c3de41dbcef7ad4c437f3058e2cb2b47a79dfecab1ba0d0a9dd0e703796bedb125e1300f614 SHA512 ddf6650ffab732b5387aa664c7852c68c58ff493d7c3a77b0a562b5c850dea35e3d1849a70b9bbe5c4348a390532f292932b336fb75e5600a773d9c2feaa294d
+DIST genkernel-4.0.0_beta16.tar.xz 407172 BLAKE2B 917fe2f399e0806473a09f8240af28916b5a039a52c0d9246ecfc0de614ead3bcc917ca5e71313085d64460b9a1974c118ecf974a3a1aa8244ce14e00c1bc832 SHA512 c04483a715eecb3cee38dadf3db275b371c9a85c9808385282a57d47dbbe59c758f85b1a2fc850300941f1e3a6d5e63584b5babc8c07998d263da92eada3d246
 DIST gnupg-1.4.11.tar.bz2 3407075 BLAKE2B 85d35d2e4da65d54add1010ea0486b943b328785e28c4efcaa2b65daafd53410a355d1df79ae45c5f7767d2eb7ff1f0b9637f417e65b084d2c760a281abd317a SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae
 DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 9a2d37eeab10f2a7353804098e865ad45db846696a00a47f5bebf47145f79e0d2bf9c01c0195e2fe79af07946a3feac0d4589656c3e698a3a548ff1dd74ce759 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
-DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
+DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89
 DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
 DIST mdadm-3.1.5.tar.bz2 292709 BLAKE2B a21fb41c6fd9f332e358339537cffd520788140976bf37fece072ee15eb512b1455e3a927abca0a4315e59659d3d114e407bb98a0ca8e6e559e1d1b83be4abbf SHA512 6fcf426d63ede01f99ebeee9be686857a04f9b601b37f76722c091ae2999b3ff66fdba52d47323f27900553125a897fc1815fe7be850aa9cc991dd5fa91a5d5d
@@ -48,6 +49,7 @@ DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2a
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
 DIST strace-5.2.tar.xz 1515544 BLAKE2B 919a689741eabd843a43fdb557953ee6095a4d1abea808d7c35049b93afd338e0df7c69014486dfb88d22dd7cdb2f74b939ed55f08e85cdb9793d8150d08bde0 SHA512 41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35
+DIST thin-provisioning-tools-0.8.5.tar.gz 305585 BLAKE2B 7e4bde537535db79e97ddab3cba775c89854362dac7da491c040badf5e3546d2e6ac4b8da8462edb59f50a2ecd95fe9c5e3349fca5e9acd588efaaf990617ca4 SHA512 1f9a1b6b9059f0b23ec3a00ddef223599292d447894316525f13b9c1e4f29d0371cb901d199cb503be4342555e016e5e6eb2d6e0e10c44b08e6c9478c573e1d4
 DIST unionfs-fuse-0.24.tar.bz2 30381 BLAKE2B c3886d7b0cbd4ac62712d7d94bf9544481200e4354539b29770a88974ea3298b0f594cecfc6f7accff3595004ad1453075b947a2633b5300a3684fedba4995e5 SHA512 e0e414f4edbf641ec9d0135a8723e43fc75412359b482f7aedd66fe8245e4df03943c5ecb6f8de4fdbd97f0346033c691e766cc4f4a755f5b43748e1441d3fbd
 DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea4a9a5f2f3809fc724af43cf2a4b309e4220e46647e3f3fc9b19d48c8d62692e190cf8536182abfe551bfacfcc24 SHA512 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
 DIST userspace-rcu-0.10.2.tar.bz2 503833 BLAKE2B 17e2102e096903f301d1a08d606cf98e28a413ef26a3dc8fa6f400ba74aa14aabdef5e28d4fed5fb01cee33b0bd5de9fb0682523aaa50c6053fd3471711a02e7 SHA512 47413b4a593d19185ee3d455e5744042c060cb50008dac25e9135c5cd2250ef5129a419258b18c665c8c794ad3b09234fdd70a106c72d8fc64631172b13d0e22
@@ -68,6 +70,6 @@ EBUILD genkernel-3.5.2.4.ebuild 4919 BLAKE2B 64b2dcbefae58d8fc4ec5901f00e2858c02
 EBUILD genkernel-3.5.2.5.ebuild 4919 BLAKE2B 64b2dcbefae58d8fc4ec5901f00e2858c02641ef77315b46d092f18df4b8f2c32544a3baf53f36a789eec7d11652155831f3c89efba83156fd4cdff3f11a2ac6 SHA512 f4c5f8362b80c1475e4ae7a870afc2681e00e1eba8dbf3b452c23fd85cd2c9c3f9c9291522782ce6bf34234fb663a81871582afb7d2a6efd752db1f108b287ba
 EBUILD genkernel-3.5.3.2.ebuild 4920 BLAKE2B eab47ca81c1ccab3ff07ec9bc6ac4622a258f68d2d4278fbaa27d2d8e5a636f50ce916773a93f2f1b222476aa1f54cd5544735abd54acbac43bb37f5dccb6397 SHA512 3becb2fc4e9a0c400c19e56eb22e8d9cdb6349c1101ce6435a7273dd4b7e28acbc2d472ca633a70f11dbb8dc9136825fd26b1e9867b741b7be835aec78d909c6
 EBUILD genkernel-3.5.3.3.ebuild 4909 BLAKE2B 0ec28cd64a6f719fc41dc6034e3ff8ccf2b69ac35273222a9649e73d08544c2e87e6d3dc6496346902f04d9fecf2a08673af6baa583225f1452a77235a6f18a3 SHA512 6e76e7c21aad6870c9da0f293b4e29dafffcf66e3dcd030f9b2d21c9053aa6f51068d27e9a8771f2fe22363ffdb6dc420b60d2b1cd6bbd927bc9e89f51d3277a
-EBUILD genkernel-4.0.0_beta12.ebuild 9112 BLAKE2B 736ba79f58d41eee6c1e227a8330efacbb970a1fe8562d7e0206fda7af2c95788eaeabdf4e65c10ef51e201a20278ec321be5ea569cfd3fca91787a64dddc9ec SHA512 d3aa94439d7d44fd3d903152b5809d94107e2203948c935d7d1025bd110a2c8247453af960651c1b39847571585b9abaeb485da0afd6247dfac6ba9cfb938560
-EBUILD genkernel-9999.ebuild 9112 BLAKE2B 567751e05ff76929eb2b4a8255f8536406db4def634d7b79ec3d6cd9a467d27940a105a1deed3aa2189a76b1212118b514fe5297f4221e2f33fe752e9a78eee1 SHA512 745576db70d74f55e8c52eb6687e5e92519284adc78821e488df18409899865183593bdd3f97d35f0d43e4c7714951d5fa011261f37fecee26c6e5b4dc7aa01e
+EBUILD genkernel-4.0.0_beta16.ebuild 9708 BLAKE2B aa901db13ef4d1ce11fdbd3eac108439acac14cb42a230751077ab8e0140c964a65db91af1438b2346f2bb5a8d42d2fc2bfd3a86d8d78d5a7ac5a5db988764e6 SHA512 e7144b3760379f25d6da50b0ccf18bd01ddc9bdda6d68016a2f5aae1ebce118862d674a597af83dc539c6b9455a920ac35f80061df8b994aeac289c3846124db
+EBUILD genkernel-9999.ebuild 9708 BLAKE2B aa901db13ef4d1ce11fdbd3eac108439acac14cb42a230751077ab8e0140c964a65db91af1438b2346f2bb5a8d42d2fc2bfd3a86d8d78d5a7ac5a5db988764e6 SHA512 e7144b3760379f25d6da50b0ccf18bd01ddc9bdda6d68016a2f5aae1ebce118862d674a597af83dc539c6b9455a920ac35f80061df8b994aeac289c3846124db
 MISC metadata.xml 637 BLAKE2B 8498132ea1773f537d7f463fb420e9b7c80f24e6a8e3eefbb88bc942707d37d3c7a0e8a80cbbace2c8068411d06f8a1923efbc23e80e6fa87fa06766af1a6627 SHA512 10753c6db20c7e5d2c805d309aa69945f66d27287bbb240626baa2179263b5cf0e703c589f1951aecc2ed1e7e8259097434cc4e7f36d9dff8e1c6d8f50b684db
diff --git a/sys-kernel/genkernel/genkernel-4.0.0_beta12.ebuild b/sys-kernel/genkernel/genkernel-4.0.0_beta12.ebuild
deleted file mode 100644
index b8929b0de29a..000000000000
--- a/sys-kernel/genkernel/genkernel-4.0.0_beta12.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-inherit bash-completion-r1 mount-boot
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BTRFS_PROGS="5.2.1"
-VERSION_BUSYBOX="1.31.0"
-VERSION_CRYPTSETUP="2.1.0"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2019.78"
-VERSION_EUDEV="3.2.8"
-VERSION_E2FSPROGS="1.45.3"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_ISCSI="2.0.875"
-VERSION_JSON_C="0.13.1"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.8.4"
-VERSION_LIBGPGERROR="1.36"
-VERSION_LVM="2.02.185"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_MULTIPATH_TOOLS="0.8.0"
-VERSION_POPT="1.16"
-VERSION_STRACE="5.2"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_USERSPACE_RCU="0.10.2"
-VERSION_UTIL_LINUX="2.34"
-VERSION_XFSPROGS="5.1.0"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.4.1"
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="
-	mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://kernel/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
-	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${VERSION_MULTIPATH_TOOLS};sf=tgz -> multipath-tools-${VERSION_MULTIPATH_TOOLS}.tar.gz
-	http://ftp.rpm.org/mirror/popt/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://lttng.org/files/urcu/userspace-rcu-${VERSION_USERSPACE_RCU}.tar.bz2
-	mirror://kernel/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool
-	virtual/pkgconfig
-	firmware? ( sys-kernel/linux-firmware )
-	!<sys-apps/openrc-0.9.9"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	mount-boot_mount_boot_partition
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-	mount-boot_pkg_postinst
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT%/}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-}
diff --git a/sys-kernel/genkernel/genkernel-4.0.0_beta16.ebuild b/sys-kernel/genkernel/genkernel-4.0.0_beta16.ebuild
new file mode 100644
index 000000000000..493149efc031
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-4.0.0_beta16.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="7"
+
+inherit bash-completion-r1 mount-boot
+
+# Whenever you bump a GKPKG, check if you have to move
+# or add new patches!
+VERSION_BOOST="1.70.0"
+VERSION_BTRFS_PROGS="5.2.1"
+VERSION_BUSYBOX="1.31.0"
+VERSION_CRYPTSETUP="2.2.0"
+VERSION_DMRAID="1.0.0.rc16-3"
+VERSION_DROPBEAR="2019.78"
+VERSION_EUDEV="3.2.8"
+VERSION_EXPAT="2.2.7"
+VERSION_E2FSPROGS="1.45.3"
+VERSION_FUSE="2.9.9"
+VERSION_GPG="1.4.23"
+VERSION_ISCSI="2.0.875"
+VERSION_JSON_C="0.13.1"
+VERSION_LIBAIO="0.3.112"
+VERSION_LIBGCRYPT="1.8.5"
+VERSION_LIBGPGERROR="1.36"
+VERSION_LVM="2.02.185"
+VERSION_LZO="2.10"
+VERSION_MDADM="4.1"
+VERSION_MULTIPATH_TOOLS="0.8.0"
+VERSION_POPT="1.16"
+VERSION_STRACE="5.2"
+VERSION_THIN_PROVISIONING_TOOLS="0.8.5"
+VERSION_UNIONFS_FUSE="2.0"
+VERSION_USERSPACE_RCU="0.10.2"
+VERSION_UTIL_LINUX="2.34"
+VERSION_XFSPROGS="5.1.0"
+VERSION_ZLIB="1.2.11"
+VERSION_ZSTD="1.4.1"
+
+RH_HOME="ftp://sourceware.org/pub"
+DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="https://busybox.net/downloads"
+
+COMMON_URI="
+	mirror://sourceforge/boost/boost_${VERSION_BOOST//./_}.tar.bz2
+	mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
+	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
+	mirror://kernel/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
+	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
+	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
+	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
+	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
+	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
+	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
+	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
+	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
+	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
+	mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+	https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${VERSION_MULTIPATH_TOOLS};sf=tgz -> multipath-tools-${VERSION_MULTIPATH_TOOLS}.tar.gz
+	http://ftp.rpm.org/mirror/popt/popt-${VERSION_POPT}.tar.gz
+	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
+	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
+	https://lttng.org/files/urcu/userspace-rcu-${VERSION_USERSPACE_RCU}.tar.bz2
+	mirror://kernel/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
+	mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
+	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
+	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
+"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+	SRC_URI="${COMMON_URI}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		${COMMON_URI}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="ibm +firmware"
+
+# Note:
+# We need sys-devel/* deps like autoconf or automake at _runtime_
+# because genkernel will usually build things like LVM2, cryptsetup,
+# mdadm... during initramfs generation which will require these
+# things.
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-arch/cpio
+	>=app-misc/pax-utils-1.2.2
+	app-portage/elt-patches
+	sys-apps/sandbox
+	sys-devel/autoconf
+	sys-devel/autoconf-archive
+	sys-devel/automake
+	sys-devel/libtool
+	virtual/pkgconfig
+	firmware? ( sys-kernel/linux-firmware )
+	!<sys-apps/openrc-0.9.9"
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		local gk_src_file
+		for gk_src_file in ${A} ; do
+			if [[ ${gk_src_file} == genkernel-* ]] ; then
+				unpack "${gk_src_file}"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Updating version tag"
+		GK_V="$(git describe --tags | sed 's:^v::')-git"
+		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
+		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
+		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
+		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
+		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
+		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
+		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
+		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
+		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
+		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
+		-e "s:VERSION_GPG:${VERSION_GPG}:"\
+		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
+		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
+		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
+		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
+		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
+		-e "s:VERSION_LVM:${VERSION_LVM}:"\
+		-e "s:VERSION_LZO:${VERSION_LZO}:"\
+		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
+		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
+		-e "s:VERSION_POPT:${VERSION_POPT}:"\
+		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
+		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
+		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
+		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
+		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
+		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
+		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
+		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]] ; then
+		emake
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf
+
+	doman genkernel.8
+	dodoc AUTHORS ChangeLog README TODO
+	dobin genkernel
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+
+	insinto /usr/share/genkernel
+	doins -r "${S}"/*
+
+	fperms +x /usr/share/genkernel/gen_worker.sh
+
+	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	pushd "${DISTDIR}" &>/dev/null || die
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	# Wiki is out of date
+	#echo
+	#elog 'Documentation is available in the genkernel manual page'
+	#elog 'as well as the following URL:'
+	#echo
+	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	#echo
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt 4 ; then
+			# This is an upgrade which requires user review
+
+			ewarn ""
+			ewarn "Genkernel v4.x is a new major release which touches"
+			ewarn "nearly everything. Be careful, read updated manpage"
+			ewarn "and pay special attention to program output regarding"
+			ewarn "changed kernel command-line parameters!"
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	mount-boot_mount_boot_partition
+	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
+		ewarn ''
+		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
+		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
+		ewarn '*default* boot entry in your boot manager could still point to last kernel'
+		ewarn 'built with genkernel before that name change, resulting in booting old'
+		ewarn 'kernel when not paying attention on boot.'
+	fi
+	mount-boot_pkg_postinst
+
+	# Show special warning for users depending on remote unlock capabilities
+	local gk_config="${EROOT%/}/etc/genkernel.conf"
+	if [[ -f "${gk_config}" ]] ; then
+		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
+			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
+				ewarn ""
+				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
+				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
+				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
+				ewarn "in genkernel v4+ initramfs!"
+			fi
+		fi
+
+		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
+			elog ""
+			elog "Please remove 'emerge @module-rebuild' from genkernel config"
+			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
+			elog "instead."
+		fi
+	fi
+}
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index af5de9cab9ef..493149efc031 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -10,19 +10,21 @@ inherit bash-completion-r1 mount-boot
 
 # Whenever you bump a GKPKG, check if you have to move
 # or add new patches!
+VERSION_BOOST="1.70.0"
 VERSION_BTRFS_PROGS="5.2.1"
 VERSION_BUSYBOX="1.31.0"
 VERSION_CRYPTSETUP="2.2.0"
 VERSION_DMRAID="1.0.0.rc16-3"
 VERSION_DROPBEAR="2019.78"
 VERSION_EUDEV="3.2.8"
+VERSION_EXPAT="2.2.7"
 VERSION_E2FSPROGS="1.45.3"
 VERSION_FUSE="2.9.9"
 VERSION_GPG="1.4.23"
 VERSION_ISCSI="2.0.875"
 VERSION_JSON_C="0.13.1"
 VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.8.4"
+VERSION_LIBGCRYPT="1.8.5"
 VERSION_LIBGPGERROR="1.36"
 VERSION_LVM="2.02.185"
 VERSION_LZO="2.10"
@@ -30,6 +32,7 @@ VERSION_MDADM="4.1"
 VERSION_MULTIPATH_TOOLS="0.8.0"
 VERSION_POPT="1.16"
 VERSION_STRACE="5.2"
+VERSION_THIN_PROVISIONING_TOOLS="0.8.5"
 VERSION_UNIONFS_FUSE="2.0"
 VERSION_USERSPACE_RCU="0.10.2"
 VERSION_UTIL_LINUX="2.34"
@@ -42,12 +45,14 @@ DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
 BB_HOME="https://busybox.net/downloads"
 
 COMMON_URI="
+	mirror://sourceforge/boost/boost_${VERSION_BOOST//./_}.tar.bz2
 	mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
 	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
 	mirror://kernel/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
 	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
 	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
 	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
+	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
 	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
 	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
 	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
@@ -62,6 +67,7 @@ COMMON_URI="
 	https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${VERSION_MULTIPATH_TOOLS};sf=tgz -> multipath-tools-${VERSION_MULTIPATH_TOOLS}.tar.gz
 	http://ftp.rpm.org/mirror/popt/popt-${VERSION_POPT}.tar.gz
 	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
 	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
 	https://lttng.org/files/urcu/userspace-rcu-${VERSION_USERSPACE_RCU}.tar.bz2
 	mirror://kernel/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
@@ -140,12 +146,14 @@ src_prepare() {
 
 	# Update software.sh
 	sed -i \
+		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
 		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
 		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
 		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
 		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
 		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
 		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
+		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
 		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
 		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
 		-e "s:VERSION_GPG:${VERSION_GPG}:"\
@@ -160,6 +168,7 @@ src_prepare() {
 		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
 		-e "s:VERSION_POPT:${VERSION_POPT}:"\
 		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
+		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
 		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
 		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
 		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 833215a168d1..cb179a0ff8d3 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -16,6 +16,12 @@ DIST genpatches-4.14-147.extras.tar.xz 17496 BLAKE2B fa2d6d25a3a906cf7962b311776
 DIST genpatches-4.14-148.base.tar.xz 3155144 BLAKE2B f6fba92e3374cf5a47c6cbc3a78aa243cdf22d04c4e87b2dc8202f361661728a6ba63004646f696afde9c0d4d247e5e235715773c39ea389ad65ffb7c6478c55 SHA512 b7f482e8c41cf91902591472f8172c564f22e411a8550ebe5d2637d77fb88d0d91ba4af3ec185826ed8ba168cf00524fa827ebfc039028cb83eeb67d212c358f
 DIST genpatches-4.14-148.experimental.tar.xz 5220 BLAKE2B 1e71a0a217c5bc18c733942f450b47c29aa2fc006a233aa773efa24158f804326abaeb8b14d7cfaa35864bd1468fab33219e1151612b531cb8bb2ed135a06d14 SHA512 fce8a24c8b1d552f57d9c64f10d33fc20b88954dbfd4d9a7452b2418760a8e2346b0193349bda648c1693bc2a526561c95b872b5cf8dfcff6a946c24d91a63b1
 DIST genpatches-4.14-148.extras.tar.xz 17488 BLAKE2B 51ab2c699fd4f80fd5412a60e03fd4f5bc5058f1fa55904149a7915a28ff6c0b95b32bf49193a9a5588bd2a69b243e5013c4e336f48bbd0addec60688b4cde40 SHA512 1e2749a936013743413af9e508ed589557c300e33b8ecea18cdeba277d1f0880f1ec07ea73e46f6ac8a87c7edcac2587e8204099b5933be9bb3e340021fe7e75
+DIST genpatches-4.14-149.base.tar.xz 3171280 BLAKE2B 714124480d0cb73d06762d63f0d1a0c7701165051f98ecb340a83872d2769663db01ec03068c9e3ec74cba78d66112b995640e2c6ba8b13b840161ebdb6365c1 SHA512 2abbc901579120862d5ebfc79c27267897ee71d76729e6f1c25846f82effaf5f34842d3531db869ab9da54c7dd03646d56f7f508041f96eeafd5f2c276d4d829
+DIST genpatches-4.14-149.experimental.tar.xz 5936 BLAKE2B 24c5a4c4f646a7cba4ca16d59ef38fc1de57b49963d994aa5d31008b5f49d9b3e0944ac89a9406ac756b9372bde2b3f2775b18a13f2fc291d1f098fa195bcc7c SHA512 874f0bd023bad20562790f64db7cacf30e83755d94830a48b55fc8685570f4ab266d7151a1bad32bf7b34541f5327cdba2acb4d93c6588400cce85e1300d37f1
+DIST genpatches-4.14-149.extras.tar.xz 17484 BLAKE2B 4728d5c52016968243ae46f6fd8b690b1107728473a5e44507b62de235ab194a9a6d7eaabebf1179d218ffbf4af7c6c1377e3892dfcb6ac7a2aacfcc20134b8a SHA512 d3a24fcc48e973149e991212bbc10a189eec34f8b6189c67418060ffc4cdae6f231915c5988bc91287f992eb1a52568f0bced3e52219f2070fa4a4479168f671
+DIST genpatches-4.14-150.base.tar.xz 3187432 BLAKE2B f721ebf5c357a8b8dede8679df6b7d4c98b9a3a39ccfd3ab5c0ae269c1cf8da1cc797f0714128f991d2ff9bdaf3a5e3b13918b9410479c09a8c9309730286b42 SHA512 e78fe45b4d55e40de92027cefbf32f0047bed6d8b9f2dcd9cac6f23cf99e121463ffcda37cd106a65fafe8f1625b3c57674aaf9737833bc1a5f7133d82aaf811
+DIST genpatches-4.14-150.experimental.tar.xz 5936 BLAKE2B bf30bf69d17633c9b0e1fb68b55a12569fff7c74ea38f73b5b4840f5fcddc73596aaad47974653ca1a9d9a5b5d97597dda1837a939f3e11548a5722869574fba SHA512 9c226289abc44aa84ac823ad86f502670543d9bd189bb9495bc0af3e76043ac385de84530bdb588096c9a15c1b5189e6ce1ef8d1fc929593a512be595a0c6150
+DIST genpatches-4.14-150.extras.tar.xz 17484 BLAKE2B 58d632aa901a07a4c8172a12bb54dd7dcdacce37441ce90392d7c21749b167359319320211edf5511b47b4b7e84ba895ef6aa4fbd8d8a639a0bf93e90f008e0b SHA512 ff842bf9fdb0e285d5ef264f94b3d39969fe1027763e24b517f39a12a5c13a0aa9faf4623e053819181d40eac35472a798f4bd18ed9b8c97b9336a7d07c0a36a
 DIST genpatches-4.19-57.base.tar.xz 1555700 BLAKE2B e1d6d04de6b22dadf737a927883580aff444d18e2b16010ea5b0cc64a7c14f66615f6bbe117edc3b4a09df93e70b2b4bfb2183509bc539922da82de3c59fe508 SHA512 598f7f85cdd5f63e9cdadc2e33ac556e71a0711bfbc518b7f1b0f77f76c65a68c4844a160fe7092f7c2ac3b123c0aeaa147064007fae03ff97b3e1b16ee4a01d
 DIST genpatches-4.19-57.experimental.tar.xz 5808 BLAKE2B 44f72723d72260c39200227610fc4c952bac4e2d767020ad69f8f58bc68e154a30772e612c799aef4f0ca52906cb02a326275dd3d3286c6f0bf846fd3303e2b2 SHA512 94a00f9b6c72486f869245176e311a6fffd6d6b4a0a3b533b19b25d4571f8c149d0ed34a90357cd43135596f9901b25af7bc8cec9f8bb78748a12082a48f79bb
 DIST genpatches-4.19-57.extras.tar.xz 17476 BLAKE2B 6ba89592e66f964600d509d1ed4e01c5e59dbb00df75cc7fbde3d3aa6505e50722c4d4b565df03a595dd4fc55d89ce133421fb7e29816c751559929198d3842d SHA512 5e67c9f60306c915a1645b522039c4f4436073babaaae8029beb53104f407f242d8f6bf539b4c54e2ce9494fb271e5bfa33da1e3992ae6e1ecb2627aaf216cb3
@@ -34,6 +40,12 @@ DIST genpatches-4.19-66.extras.tar.xz 17484 BLAKE2B d58678ad2e9848d564766e70dda0
 DIST genpatches-4.19-67.base.tar.xz 1790664 BLAKE2B 213a58ae6ea9a304e2f7bbb851510ca259e6276742598defaab1f280b810bb5ade33c84f815a898a4bc89e774d3abd183ec0d8c596186666353c05018f011fe4 SHA512 aa024bc49164d3a3f5f5050aeebb4465f1db6c9bd9235142eb9f23c41c26fec776bf1dee96125d521094b80133bd2cafb17f4291381a08c1d555f42430d04282
 DIST genpatches-4.19-67.experimental.tar.xz 5808 BLAKE2B daec7743f48ade59ab5d3dac319addc0bfdc94e9a9dc3c9587e24f2ec205dae02fda9c8387ba644091b12c46ba46758f654c3f74826b233ba91a6a03ea3ab7b2 SHA512 1c9ff82ce73d651efd42c62eb681818759f93ebd791ec25d180d840784d6ed685ba433ceebbfa9f82ebb36bedeee07802da495c3af2d0278409170c3ded63695
 DIST genpatches-4.19-67.extras.tar.xz 17484 BLAKE2B f748de315297413d20dbb9d97fe952debec8854624f7870bc69d0590505ff4cb33e1b40b0b9d3482349b2a72e6a74094e58686e963b6ae1b3a43720a6fd45544 SHA512 4a4f055391379adff4c23411200d8ab76d29e02ac3fe0694c42aa7839e78c904ee8671ebdbb8c9728e2f36b7f725305ce01dada56cde82b1915037b8c30236bc
+DIST genpatches-4.19-68.base.tar.xz 1807372 BLAKE2B 7ccbbb1586b17b66d5e97afdf4b671e0be5ffb4c78715007b43b749017ecd5d7b9515d65175ba29ccf40e79f790c688b6035b26492882ad2fe959028956f0754 SHA512 3512a67314cf0abdd8e4265f5fa1cfacf89d8688784ca4e4d22ee32fe60c82d0329044a60e3756e99677cc706a8f03f5748f7c1d42736fecbd5d0506e923ec78
+DIST genpatches-4.19-68.experimental.tar.xz 6436 BLAKE2B 89610892217d9f56e9dc9a23042b6b2b941bb314d4d5794b2897424c0344e462d55425d6076d469dcc8eea4b440a61851a8f7e59746aea4fe9f981c0b709bb0a SHA512 9e64835c3eb43518d9868da9073961808c4896ac720f554685223d7004728d768f37539458dc35c901946e5975be4aeddd2b714b071f4edcedf98d7fe40d5380
+DIST genpatches-4.19-68.extras.tar.xz 17480 BLAKE2B 4a2a0ad935300b781b2fe72a71785447bc18c19e13910bcb33c73b1a6ff4fad8d213c972d2bfb1cb1ff8f2b1b54a62e1dc4dc1f447b0862286dec8cc4cd4c2b6 SHA512 7fe844129bf3f5a58a23847041d6393fd654e30a5df4f386a74a6f27919663f8c4a8a5c2f9178821f5d9b4df29ed5487621ba46c9caa2981f1043ebeddf3fe5a
+DIST genpatches-4.19-69.base.tar.xz 1835800 BLAKE2B 8e81ace09b0482af1a521a811af1474194e54b12e22adb236bb5129885f8d5c278db63166c4a48f2b4f97cc52d8e0a9f8a86e92dc36aff17447385552c60ca45 SHA512 a3af2a0b0354dd91b5d6df77401340f61b9404eb6271c5e70cf3490f1242c9367a30fecdee89b7aa12d2737a2512ae0f8e965cda4356fbe81e65c5e2382ca583
+DIST genpatches-4.19-69.experimental.tar.xz 6428 BLAKE2B 14a7e045c0499c0534b308e3563396cacb12e860b615c3e3ccc83a0e9fdcc11d742ef855998670d54e5fb71ff61037af9b9e6a15b8614e41a068ef8bac103edf SHA512 d88d2259587c81bfe6a7db997f1a5a03d11c26b7c5b7cb50bb409cd1748ccc4a2510dc3039279a81ec6cba17e0565d9515d7d58e4013e5a72067775d935defe8
+DIST genpatches-4.19-69.extras.tar.xz 17484 BLAKE2B d5da9682c06aabf5b0c17d01cc0ebc0ddf4840e9f14eb43611fd140ed83d79e5c9705fe7ec934edb8dbc6e9f4a45c6dc1ad838f9149c54a35d24ba9a56a1b30c SHA512 64c6b82912eec6ad955fb95c9a06d856a332064a1aa8f94133ea7c956453d9fd13bdc40731826a41afa712a79f698145e4c8fb2228453f7e0d53f161095df4d4
 DIST genpatches-4.4-185.base.tar.xz 2920876 BLAKE2B 7dffd426998699bd64aeea62f0c1bae1c41d39c894182ff667e257d5dbce84a175185f68044f324aca6b0d921933c4270fe5f304e491405182aee0371a5026dc SHA512 7e6d92800e79049851cf9230b323e50fd370f293372f850e6fc7fde850bfd166161dadc98575f6abdb4a06c733b31b68476645a0a6cbcf2321c4a28dde99bd63
 DIST genpatches-4.4-185.experimental.tar.xz 83300 BLAKE2B 2942b87434124f9de90e69c34f5dd67ecfc84fd4b2362e0a9f180d4af77f70ab3a0f35d513eacc7b1080f611b2082feb36637b8bc38870e09f225fee42625a34 SHA512 4e5890679d5a89864d2dfd00c963259a08476b80f57728bfd4060c9057eec6173e5582fccc43cd3213e643f7fef88cb4a59a22ec7bac41652df2121aba6646d8
 DIST genpatches-4.4-185.extras.tar.xz 16464 BLAKE2B 54b3a1a6ee38b7cffc363bbbbb576acf97f3d229b745241758bcb568d18c1b7b5a7640fdd6d30cb951efef72bd7a1bf9a39c834199aaeef2b52ad459a2f6c64e SHA512 e254d39a766212d9b7bcd90945f623ecdfa97ab861d6be728e4afd4d4407fbefca66f1fb129f6af16844ad4fe82539118188f4248f8c1f3ab2b8a89d8fa8a3e3
@@ -49,6 +61,9 @@ DIST genpatches-4.4-189.extras.tar.xz 16464 BLAKE2B 52cc5056622961ff922a18eec208
 DIST genpatches-4.4-190.base.tar.xz 2999876 BLAKE2B 9b1574fbe235af236cfedaca29483861fb49554d31190b8ddc2345ddf9efa0d7949629dca51d3c7d3cc0c8739a87e6d97787728d8d6e8109818ce128fb176768 SHA512 6edb909e94ea4c1417b059e07702038c1c041e4840897444ac31f84a9e9fb20d3ad47a1ff55a71220cc4a35a025644dd08b7d2c8bbb57e233e2e1ad37992d237
 DIST genpatches-4.4-190.experimental.tar.xz 83292 BLAKE2B e758fe04e48703b973cdfdd5b8c80ccbdea3a15c3c26546af609dcaf668527db2ac806995bcb8363700d77888d893cf18216a439ca3e0b8a520a0c49fc16ca79 SHA512 d892cdefb89f19e309962c1a9b3f36acc70cf374686b46c40a3aa7be6eb7cef6ba2caf4bb2f202ce71bed3cb9bb9c5c6dc50898f0778d627b57574e0127942fd
 DIST genpatches-4.4-190.extras.tar.xz 16472 BLAKE2B 84b99eeac57df3abe085e4260ef145ec49f5b5c46489a3a5e31e32e58aff535ec8b6db28179e2c73472d05a7e53f7b15e0fb095289433c4830f55e4943f79120 SHA512 07bf26f7c9b06e195845f573ba4c7416a92d65c476d11ccd3a12c9323b4c0bde33a23878ec4e93a22863639aac96831b4ff0e1d1734d858c8fc8d48d0925dcdb
+DIST genpatches-4.4-191.base.tar.xz 3012800 BLAKE2B f06e1f8acb6fa386ce464cb55e50d663748f35b86b6234cd66221f71e0b8561a57658d1657afaab4b2331ab409a2a902d370b9ed04c9d43e3ea21814e72aa271 SHA512 0c2d0cddcddf566cd134adb13d5b7018673da8be28a481d2d69308c75bf7f8376e39514332a40b16d634fec3fbe101e6604135b96490cb95cba751149f1308b3
+DIST genpatches-4.4-191.experimental.tar.xz 83292 BLAKE2B 6256a8356687c856ad84db43b4ee9c6757bd654cc564fe532ab4aec41978efc7adabd387dae3b81cef6319c4644895a6a540fc00e478eb806dfb269ffe94fe6f SHA512 8f35e4770cba3a1b6d727f01c42c7eb0848f4c221d894ee78131598a960c5d25bba1bc0e4adf57c1a2453e76cfd604c2f3dd9f4bea5b00fc19039d4ce5d20268
+DIST genpatches-4.4-191.extras.tar.xz 16464 BLAKE2B 07ecac9a3d9a4f5308ec298b76e1d43a36bc832c30482e3e52f7f66795a162900b6dbc26ba5759d0085564e1ca5eb577871303aa1b86544059a8cac4dbfd12a1 SHA512 2df52851f58abceb32836c06e93ce90d6146fa2a4e1f7d6bbdab45e65c50b9f29056ba0928ed18d0f5ab14323b43a1f25bb8c985e4fb667535318ac218b4ec12
 DIST genpatches-4.9-189.base.tar.xz 3186152 BLAKE2B 888bed66a88257d6383cffaea48c3f46b4ab563773d68c16e28b1e1f786f59439251b1f7d638fa74abacabc56a9955102639b69e129a4af5ee5c91e9bc58da8a SHA512 726d1d54a0e2a98e94043185e1051be2b76f94874c191bda742b98519110dd0bbf0821325b21f6af1f0ea1be5aac21409f82a560fc84a309736268d3e5c96977
 DIST genpatches-4.9-189.experimental.tar.xz 106380 BLAKE2B 6d426845614e1fbb33773643711ff9fab2e73a02358d55438926a7bd05f4b7ce8046c115a0c5dc295ce6db18a6eda5b3ff71d0b413408073dfeb427797f070b0 SHA512 6b70e2fa5bf3a313261fcaf4a3037b713015dfb5ba7ad969e6e08a47f41f19df10ed3fd9f791daaf4fe15d0808ed2059c807dcbf1b12d0919fb254c8dab987be
 DIST genpatches-4.9-189.extras.tar.xz 17360 BLAKE2B c84fb1fecabed0d6c8c9e2e387e6cfab58d015e260927e6e9403a6c4088c2774c1e4f7e8b78d319e7147be1056dc273f2ed59905e1d3fed0064a1addc5113402 SHA512 7357730f4176ae49c5e221d1fdaae6529d0a48cd9046dd1954a0e18fc6c583ea3126a7aa7d15936caf19d45edae5baf6a87ffb4b68ebf5b58c6ffd94bd69a810
@@ -64,9 +79,18 @@ DIST genpatches-4.9-193.extras.tar.xz 17352 BLAKE2B 9189100ee8e67b6f1f3bc362d6b7
 DIST genpatches-4.9-194.base.tar.xz 3303424 BLAKE2B c31452cd3e7548812bd941aa75082b36dd28f742cd923759857078e7835b0a2672d679b5a228b1093400844ddfb51ed88c527d203572dd4d4321a361e6e385c2 SHA512 60b1cea0799c5d429635d778e0daf082fdfa66dfa46d1702094d0945f7a23bea68a25b1895309e62595a906d590e6e938928369bf08b4a4ff198a8af4885c22c
 DIST genpatches-4.9-194.experimental.tar.xz 106460 BLAKE2B 74c1fa350137bb9d36d6f1cf4fbbc450512306c3d16799a3e9ed101c9beedca7a6f04873fc8e3ba80aef3ce0de495331fca6dd328eabe2dee1b15338725fb9f4 SHA512 b8d832fa5dcabd4d0cd62619432c7984cf4fa3c7fda8860984236bfe9d1f96954fc78f54f50832d828705e83246d1d2b0e74c2a71c1c61f36f08a7ad2843339a
 DIST genpatches-4.9-194.extras.tar.xz 17364 BLAKE2B 5c91b812e38b4648829ac87c10d435060ba3cd7c5ad50d1a41c658c5f6019802a3937e6160e08fea56579550687cb8c5c37fc1a86128d12ae375398556834635 SHA512 b4fce359d505282d02339564f0908696ac866033730f593f4991df1c223551716bf44cfb89ea1310f300248676fde4c633ccd453ee73d5b4ae6bfb5635283b18
+DIST genpatches-4.9-195.base.tar.xz 3330524 BLAKE2B a15e524cfff5d67198c89afbb14d04bb2ef1124fbdad3e51fededd5a351f3d15059fd95bf120fa279224ad16a15a572f44537e6cee2a7e64368895389cb1bc0f SHA512 a3e399ec87990aad343aa1f4069b263e49221cb8d390dabeb46ebb7bf06ee1ef12e007a9cef90fe7b035320ee862d67d7c9ecb36d2debbd2da6dc7c965858eee
+DIST genpatches-4.9-195.experimental.tar.xz 106380 BLAKE2B b244a88befc7a51c1ed4bd0775ea0a2906c667babf4aef374edbce4620da1d633fbf3d1be5f7416603e0764004022781970625faad379a4fede82872a9544855 SHA512 060e82bb4a7881fd87f3394515c1250a30c2cef38a610ca02d65799e2fab531b89ef4d518c6add1cba87fe2e71e125baa5780a67c7707e99f884bdb1f83a0468
+DIST genpatches-4.9-195.extras.tar.xz 17356 BLAKE2B 5dd79dea04e8a2f7dbc056afe0d2cc60295ee63573a5ca44790275fadfba4d671de9ca945a5372977f3b8157599f892811b2dc303e1e75eea91384f181dae283 SHA512 74e92323653fca86a4b0eab324892df32ecee41c1468c83b4b4454f6e9dcd6081d5c35435502665966cfa66d0ac5e17fd32cdc242d3e1470b81990428bb497aa
 DIST genpatches-5.2-10.base.tar.xz 368492 BLAKE2B bce92540f9a84d4955b12a9a05b97614da1bd0d84cb705cbd258b33bcaecfa97394dcab04391e1b8b6e85437d9dcbe8fa7ed40c8f348e6eda4874a3c4be223b7 SHA512 eeed6e5a72a73cdaf0e557454c5f6cf5c1c5083ed8f9180b105e31f2cd9efc56e8381920d68e9e92bbea597945d10d37cbe9c799d3a13f759445caad64f0ba18
 DIST genpatches-5.2-10.experimental.tar.xz 5392 BLAKE2B 8cbde09ae8b161b5ca3901625df9708709d682ab323d55fcad2be482512dab102836b1e015bc03810052383203260c5eb0e4b7daced375ac8017a242e04174f5 SHA512 02d31ee46686ff8acf97b60814bc4f2c972223477197b9da86e40e3000d0b435668ae7f4810adde4349896b77e8e3343b0532a61dca97af13f4430e35d877f4d
 DIST genpatches-5.2-10.extras.tar.xz 1720 BLAKE2B 59b259581f7f75f04077f09a6a089b00663be2a0d39731d485d5fd5e28d9a2bdaf89d74f9d555c899615b5911d3b0e270aa0ae03150da66f73063acdf2e69973 SHA512 e8dd3eb262108059d15cd590869dfbe9d0c70728bb2b6b658872f8b705c15c6d7f6fbdeab6c0bdb2e34a9d2312df3570a5724937282cc12c42f435095b6b1b96
+DIST genpatches-5.2-11.base.tar.xz 407652 BLAKE2B 0ec36001af807f81710be7dee30170da720fb3cfe6d8b822180d40320cb354682a4b78a0ccd16730bdf6e416e66daec443a4dce7173c643140f0704504c059cd SHA512 7f58182ce6b90592bcf5b7ce1242bce6414e5f93b8975f5dd17b39949405d4de39386c3033b77f55d766e22f2901192c52e338ff8144bdc5b48660b04552093b
+DIST genpatches-5.2-11.experimental.tar.xz 5396 BLAKE2B 05a709b1b2f0287f008f09df06370ae150913700bee0c1bb0fd60703e7ce562aa81419e4b378959fc1942f07b4e8cde3a728149fae0fa4aec00979c1f9806678 SHA512 1859c4f0829f8c573eb7b368f5737ba2ffb66177516ed1cae55df018a3ff8bd96b0848cf692060999040b7b86d47236e4b2855ce3dca106c269888b13788f749
+DIST genpatches-5.2-11.extras.tar.xz 1720 BLAKE2B 7c9dd5025cc7c6147128afd34f3a934c512b1092852bb08b1f078c3363102acbbbec8f05ba6bc5a32b236ce7d8f17ce821396fed5792f2bef265c54288b66077 SHA512 35aa35eac28dff1f4cdc6d57a19fb53bd2345053083887abb54827fd2d2ee33662947e7b4fa8fc333093a4041864bc0604b5664f304b605d2ebdaec6b8c93072
+DIST genpatches-5.2-12.base.tar.xz 452972 BLAKE2B 9778095d7002f41c9a2ad7250898207a0a9c30cefe8ca6598504218cfe2210a4e8018e48bd2e5b4b7008e41e7b50fe3fbb19ad7d3c987c89cab702049f142c68 SHA512 ab73ba99ece21153329e227baa23953600dbcc4f5090bf20c80939169b530a5a175cc4e8dc163d34374cc1fbec1113e34724f626ae74639faa4cf672f8b66379
+DIST genpatches-5.2-12.experimental.tar.xz 6144 BLAKE2B 2298a368c9d025ff4e381452f10b9a592225ce9bdb12f1a0cfd96540f3789d11ee3169aac949c4de0f3710e77a249e7d2bdaad75c234b14032fb9bc71dbe4641 SHA512 bf6f90f07f653a497ef54bdfb8d17735016397ee2c7ecd55fc6f4646f736d8e0ca985b84cd5583e99d573ba1db5834700f556c4e9808e37ac9e86194b9a870d9
+DIST genpatches-5.2-12.extras.tar.xz 1720 BLAKE2B 63af9caef4e48fdf228337f76fa5ec6a04ff7da55e7ecb3ab16bc326f83875cadf4a07362cb8f24dc22557ff8cae236dd9981713d0536825b2cf7657e4e2e5a6 SHA512 d102b8ea2031c8dd5a01923b52ebf4eabe3f66fc392c36386e155d5eef55bf24f72c36e291b6247b31f4db9c3d95d8c3be78855fb38f29ad90ac788cf826490b
 DIST genpatches-5.2-6.base.tar.xz 265524 BLAKE2B dce32f49af02d34432c43063e197b8fdc9d2436ff9ef947f6a5c807a719d63777a2c394b7582cd74e4a9cac12d7e993c2753fa42a698f6a11cd13be39f0eef04 SHA512 2dae1e73eb28020886af2921bc8f34519a92b1e6d7cdee9517e38078cdcb84afda08eeda7154e4513c35d83def74170c89c0ed76b116d6b3eb3d8749ea7a461a
 DIST genpatches-5.2-6.experimental.tar.xz 5388 BLAKE2B 6f95c1d6213b8975ba7bf63a90299426c96d85b6ba3b5d87804fc5561aad0f91c2623a825c73fffab2426a70ebedb53f292c4fc6645ba05af0d4673074023985 SHA512 c728b030fc9b204d7d4e4d2c7ff19661095b62a16e0d2e3d8ccbc281e23b514ff32d21313e92ddf8e681ee5526982227711d606b7f730831e50dfce807217738
 DIST genpatches-5.2-6.extras.tar.xz 1724 BLAKE2B 1512792ee07dd6e623d19650024254fe5bd93726b2198fe99f8fa3d8b27c4dc465114ed75d0c0f4bbe082a70fe8bf0af47735d065f6ba4d24d4884a023866368 SHA512 a6995ab3b3b49603601580628af0d15b80272a7f817368e99d37884b1d175bafd3f59e20b6cafd83baa7d6823618fb82b31c6119d6710d4819e88760223e7987
@@ -88,24 +112,32 @@ EBUILD gentoo-sources-4.14.132.ebuild 731 BLAKE2B 8fe04d070ddf17bdb1e090f742aced
 EBUILD gentoo-sources-4.14.135.ebuild 740 BLAKE2B 233c807856dab2b507bc4a955306329373b1416833fd47fc9078e54cb2a6b2f61f62c700f6f337ccfd93e236d85a25bfa87a89aea3305be2b928d3d4ed2825fa SHA512 dce6f0be7399475401b8593ae5e8a44022a74006e65413678ca9e6ed330a561899912046f9060f12ccd3e0c2f7c3fe9bcf94ad02760f51e8e2112094fed09d51
 EBUILD gentoo-sources-4.14.136.ebuild 740 BLAKE2B 6e40d8da72c6419bbaaf15885493f937a35dda9c5dba67585255b9f6df07c04505f4d629b869c385dff796f6261ef2cf144c01397d4adab0920a9a62cfee59d4 SHA512 e35c5fc786a779573e85593cce8bd6e16ca12952a6f22f8c3cdbe43c972aa806948baaf74aa0666e50c618306390e5b1adca98815e2056de9345d900c3a75faa
 EBUILD gentoo-sources-4.14.137.ebuild 740 BLAKE2B 8f1b104c14dd1b47fecb1bedeafc81b82fd3e5dc253cfa789dc460f432fcf2c01ce098f481be36a1607ef36c44f52631cf2f2752e77c70fdef16a182cee38f49 SHA512 d352bf64b35467f4dbf903c473fb112dfaca09f6360e87f74fd34708f479c695bb648948e643a382800a80313b453055e60865ddb27ff94bb3ad8b63c454967c
-EBUILD gentoo-sources-4.14.138.ebuild 733 BLAKE2B f3cdc08c804f446510b7264cb0f12663b905a5a92c207a46e8a950847ab0bffb3cf09138e2411844738790c78ac25eba7dc46764c59f6de186f81ab959c26a4f SHA512 e4552bd7b046568f223656b47781164c9133f6cc02f216e9e7ff0d4a72c8f20dc0ce0adbbaf9153ddb97bb10e06207fe7503c5b0588d89b1241131e89266d38d
+EBUILD gentoo-sources-4.14.138.ebuild 732 BLAKE2B c24095de934528b760631dafb9ee83849bcb54b26a81b74c2c87735f14e9f50e0984e72010f5749a1740344c71bdad17c4ad60d79bdaf5fa03a9b74129c5efcc SHA512 519fd87f1aa524752fd2b19ac06b3c928ddf538d68685e61c65211f8bc28ad339c06fdeaec609d812ec212a27334999a5a7a3dfbad7d6ea24acd3a02eee939c1
 EBUILD gentoo-sources-4.14.139.ebuild 740 BLAKE2B 0352eb7caf6e99e001c7c28252995fea61c2d98be3ecae8e4951227fc8b3f78eba1597a3aa77c2d7c76401b4148b948ed773c245d415ced58883b609d470729c SHA512 824b08aef9fab60debd26c71ea766eec9623a994d0fdaf19d3e27dcd99c83bb759e15d4fa87bdf271fe6fb147dfa9de73920e3bdd60ae4b38a33e156cdbfd09c
+EBUILD gentoo-sources-4.14.140.ebuild 740 BLAKE2B 4e548d6e2afd65a0efe1d4d81495c1ad642c5989ea0bad4372f98a8fd826c1c34acc7549b86be5ab36b4f9861ccfff673dd26cec6f015fe4551cd218178fc9a4 SHA512 38643a00c5bd48e4ed2b53a88ca3db4a79a996ec74b60f562b9fd17b25a61d784a66e8fabc4448074492eb445447342563b57766dea4c82fe27c52d4e43c3607
+EBUILD gentoo-sources-4.14.141.ebuild 740 BLAKE2B cff84dc9338e8557e7d6ab0c2b7f36dbd6d454acf6883889966fd1affd8c845803e7c043ad4867e605a8393a83f97ab7e9c94395ea57246f926904163ba82d94 SHA512 9691808072525b2cd8718e7c85ea9f8303955e7a726a874022e1c7b75f0cf1338abb998e6ee5a82b5d1947e333caffb62f1c00291007b318de65a2677cb38ebf
 EBUILD gentoo-sources-4.19.57.ebuild 730 BLAKE2B 8582f73a21682c2ef7507ec3f7e8c4456b5f168a7de9c097ca3e090779c65e86f89d449fc9d824a5d75ffea0a48203beaeeb3705b1bf671da8332abac2d1e00c SHA512 a803e9a5ef868b4a1bc57c12ea7bd7b3b1e1755b9611c9255e56cb26db11d7ce59e992a90b87ce30c666a7bf25dd53061db30971ca5cd089635cfaee3e4761d2
 EBUILD gentoo-sources-4.19.63.ebuild 739 BLAKE2B 07e730493c11c160a3bba22a4da108420bde1f9364db4af3090007307e46a399b91f202b39dbeb62ff45b99ba709d8d6378997d0021478ef26df5d8178bb50bc SHA512 48ec6c18386277aca59f2ee8e440c6a727e0c19e84519d6c6c1c88a5b1fd752b9cc0637373809406cf1d440608075b82e19bc448a8d1ef5fe498a80acc37a52b
 EBUILD gentoo-sources-4.19.64.ebuild 739 BLAKE2B 0df210bbc91e67ad3a8aae219d844b8a9153a3a205a5681b6d89ba1852543f74fc2cf0402b2d1cdb07405bfc399aabfa426203ac4ba73e1546f9946e823e2822 SHA512 1a9264c6c3c5e4ed8018ff2c696d9a9fc837e249e953359ad2783e8677d44a80024c8de826d58836995acb2c3e873973938713d818b55fdedeac29eed8db6841
 EBUILD gentoo-sources-4.19.65.ebuild 739 BLAKE2B 93b8a7ed96e5ed7e19c68df9963c4f090633ed557f36d9724c6cfa71f4861958e0670eb2341884fb740123633607e32a1e1da07a881bdf25e8392424e831e859 SHA512 a4156f4a9c4f6899ac5a876d75057380234d77a0f8ef1d66a49b1773d5b1dfceed47776bcdd8fb9221e7389afcb502ebe52c3df874aef3d3f92de5cfa5c814bc
-EBUILD gentoo-sources-4.19.66.ebuild 732 BLAKE2B 1e68e1f29d36604877349bcc834b6ca88c591895e70f3bf7c6b4996ead9b41ef49eb0c256c59daecabc2c164bbce520d750c6c3674d624c9e028062da4bf1a95 SHA512 f1328eb467d5b81bd7baffef46eb46a7d47999cb0e4a51c89fb09b06e2cf870fe31c5b13c05d61191a3f2bea83b537defe2f4b368848e7b92b6932b77c84cb96
+EBUILD gentoo-sources-4.19.66.ebuild 731 BLAKE2B 2bbcb81a37608aa822a882612858032761a43b874a53a296a45581771d0ad9fbf07e86e568150e2469c89624c2330b3dc4ae64881387ba63dc92b9ed41daa8ec SHA512 40cd380408ca34946284abe3fa40b649733b8eba5b35e3ebcdeba64f6c4e6859c47c76d23da4a0670fce81d90ed2bce69eb8d776caf637f6036294e72059beb5
 EBUILD gentoo-sources-4.19.67.ebuild 739 BLAKE2B b98b08882b10e87d0e2534fb1dec2ecd07c469e2210ec250fec162a8b4f0797a910fee3e3ee560ad7168806c5e99caa8fd5deef196e786f89fcd9543bee32574 SHA512 c10272a65629f537610a19c5f9c3d73dfa346edf0b36da2c71d8b1a9813ccee03a0049acc50aadebd068ec1d1d86e1be68f52df5e68168521d02019da62f972d
+EBUILD gentoo-sources-4.19.68.ebuild 739 BLAKE2B 18ff93f19e991703dcddbf15311abfb45e371ce26893c492c350669a3c6fc81133f9eacd6dcd6729d3a659da4feb69455c4cdeae1bf89fc30ccf6e109a7d00b7 SHA512 46f7ba43067d6af54892b19e2e641a0a9dab126a8a81657c123e9220e4db06d6c023316671e49a9babf6b7f6b23daa7e7c86d1b794dd1c14e4c876a77e138da6
+EBUILD gentoo-sources-4.19.69.ebuild 739 BLAKE2B bb67f3e3f029c4ebc3b445510ffb19562c3c0ba9dfd5400ee5001900568e46ba5bfcf9042f1d3d8d2b6b7da5cd4a3f98febe27b6603036500dd5e9de75a986eb SHA512 53dbb0b848d5483b737cd13e26182b6856e165dc9ecdf8c39b36297efcbaf8b7b892c93ce6eeb62ff99e478fe0ae57390fb86e1065dd7c05011f93bb82add5df
 EBUILD gentoo-sources-4.4.184.ebuild 731 BLAKE2B bbd17e5eccbb68f6bf54eccc0c793052782776b06ab3dc665e2af619f231ab140f9599ea7c609b4d2cd0e16da560bd7c188cbd63ed25c604c2ed8fd59ad02e47 SHA512 fa0d0597d96ea09cd2ed07b72823f38ae6c640446355be89a1cd65f72e305a449a965a73eae4c3fd5574e17cf7aa9bff63dd414f10d678fe5f34d51b640195d4
 EBUILD gentoo-sources-4.4.186.ebuild 740 BLAKE2B 4c33f07d0dee69a18cae881da489b6f5c7de477e10909f7c3758ab7a1dbfaa7f97c1af4efbf1b8719d7457fd47ad9e7d22635aa0189727c9d6a5adb04e5e87c6 SHA512 bafae94b0546f7a7fbae18acb762dd488f739bd407f2dab2a8e77b46f96e4a9f49d4c6b099b2f9283ca22e69b17404fa40ac9d21bb6287588f7ca8b73ea9e573
 EBUILD gentoo-sources-4.4.187.ebuild 740 BLAKE2B 4d8447d324124a32b79f415e4d566b570d99218d896d5a6e1c61e736231ce71ba06fa8dd5fec29714cdff335026c536326b78fef1608d26d2dcee86a6341db3e SHA512 c35610d118b4d98fc392987ec6a6dfc2c57db60275d9a3a6d43f948a00b05da2689f49da50d80384fc074f1827579a421088e832955e1a80c4c97efc858ea7bb
 EBUILD gentoo-sources-4.4.188.ebuild 740 BLAKE2B f01fab86fcce2c064ae7216166b219c6d0fe89c1b5aeefcc4e8b93e7e6f4c20e35054ee1d4c81693c5c59a567fef999abe3b6b4fef4e93431163be5d1a35da01 SHA512 f0817251261743e842fb1bb6d72f8c0c4af1085f3c825e4031fc8c9a518e22e6cdb06c43bfd766c01124948724bb2fac3a79b47ec887efab548670e0594d5488
-EBUILD gentoo-sources-4.4.189.ebuild 733 BLAKE2B 1b00ba1f5e73a38e0d046ebb598c5300641f240881a0fa74681923c25e138f6a6eba388fdf90417f795a8222a590dfccc4c20469647d793f794dc1bafa4b0f9e SHA512 b75c0c4c148ce2fd11503c7d00c3972d2ac24145453c408cbde56fa116740ab8b1ec48b1fbf38b7d9631b75d1dfea1abf278052d5db3bc2ecb3b7044959493ae
+EBUILD gentoo-sources-4.4.189.ebuild 732 BLAKE2B 468b09a4e24af6b8a92035288995c139ff511cfa09f8af4087aa3570bce95afce3f714fbebd08f1b54f84791997923dc62fa4a376510e592aaa2bf0b3ba2b10e SHA512 10e1a0bbce8d523968d8641e2a69b592a5ca8bc7f5c37636d8ac665c74a6501e0d09daf319f7b6b6ba0fbb188eea09e76fe6e85e21b55475fec75b0224975304
+EBUILD gentoo-sources-4.4.190.ebuild 740 BLAKE2B dce8fe1733d4f6d484b22336838fa3873c6ada1facfb9dc28c92aa2fde44de62819c5e1b559f90f1fb2b8ffbc180735a0557d1c3c516c43e326746ae8ab4b244 SHA512 6308a3c6745b031ef0404d24bf1c7a517126b5ecb67c430cbd4e686634da1a5f83455bd1dd53db99fd278f239e1fa1d3d66ae750733facf87a5fa88fb6e7eb4a
 EBUILD gentoo-sources-4.9.184.ebuild 731 BLAKE2B 9762b8f14a4f1612ea730267322b7f7814b9b5ccd526af4327f2d3b9adeb2653abef0d563b154e7da50bae795af0d9056cebca9cf1da28797400551bd07fb410 SHA512 bde0972c737ba5162bdbbde1799014668e7463ff7566c4ecf8564b32b850bcf2e5f7eb2ec69063a6b1fcb579a50035668a9bc5783b809ca04385f1bb80dce15a
 EBUILD gentoo-sources-4.9.186.ebuild 740 BLAKE2B dce8fe1733d4f6d484b22336838fa3873c6ada1facfb9dc28c92aa2fde44de62819c5e1b559f90f1fb2b8ffbc180735a0557d1c3c516c43e326746ae8ab4b244 SHA512 6308a3c6745b031ef0404d24bf1c7a517126b5ecb67c430cbd4e686634da1a5f83455bd1dd53db99fd278f239e1fa1d3d66ae750733facf87a5fa88fb6e7eb4a
 EBUILD gentoo-sources-4.9.187.ebuild 740 BLAKE2B aef3320640f73c0d4c43405edaf9347acfd9f5198f1156ce4fb51bc362d61639690f330c817655a5829aacd10dfcb5a8794c96b82a3e20148884072ce849318b SHA512 d38362aa0dd4f4b08c32252d6cc24f20625ccf8aad08e910baa142970f4c7ceee5012c503b325256fc824fd8dbbbdd848532e625b8e79c9a3e38c551775902df
 EBUILD gentoo-sources-4.9.188.ebuild 740 BLAKE2B 1924caa40b98f05e5105ac2e9afe5ad9fe4a60b7c0a2297f30f619245fd42093b94920ce5f4f28118a6af106a64ec7ecfa1a39f8c19aa342afcfa132245fb84b SHA512 55e491c26058e9cb447c94e0840cfca2736836b07f133dc9fd40ad31bdc61a257c5d7e37125be21da7e89f58e26fde4956d4459203edeffa61d49ed8f081ee75
-EBUILD gentoo-sources-4.9.189.ebuild 733 BLAKE2B 778b7c51573aca92798db7f48738ca9743c816b52c42598ebb5935d7f751d40b3808ac8eb8c3a66edab9f5cba9d06a9cf8ac1b30acdf391747e4914328d6c6ec SHA512 8723a41a1856f6408f3e1bc6f2b819305074033bf9afcc87619198ef4fb24493504f306d313b8010362d1b4fbbf8b4b8c18758eb533babb77d0ae99002ddb82b
+EBUILD gentoo-sources-4.9.189.ebuild 732 BLAKE2B f65e80eb940397695a9c5bac0052dd344d1d354bfd7f8a3ea7ede9467295e420b7563069ba4dd6a37dd86fe8e429e254d66be143c32326773049499937855462 SHA512 e31f06b6be0f67cde6167cb1d37967dd15d05c9e1835594109b69ecfdff7a474af1f41d44e42d0da2e1ff4235e65d16ba0756108bcd054994c1a1d079642f431
+EBUILD gentoo-sources-4.9.190.ebuild 740 BLAKE2B 2325cfe04572f00ad4dda808578faf261567125cdd58d8df751b0885dc5bc700fe04004d1e904058ffeed0531752f78a238d7f9a74c794e08c9263af2450dfb9 SHA512 e18b354cf9e066aa1d986dcf537ca48ee1588af7df810a72ca3ce886629488f34f7a7acd89a2739a442c52f9995bcec3bc4c8dbd172a2171e8a34866e7637ae6
+EBUILD gentoo-sources-5.2.10.ebuild 739 BLAKE2B 5ad7bed7245733db3c6cb9fe2b19ea72443c6b709fc5f59a57089e28b4a5747fa30d93727095d756de20946f473436b322204630f8f40c3402f62840f5aa4f58 SHA512 e484e29f173ec1031cde544d16d061456c1941dc25eb01bf33ab0ffe403dfacf16a8416df156ff2063dd107cf75503459a9c309c9cb677d5cbbddd481a7ab8de
+EBUILD gentoo-sources-5.2.11.ebuild 739 BLAKE2B 77af4185938936243a61c9707c4da428304cb18fa1eaeff9f23b09a9b881656cc123320b18abfcc6c25be29361bac91401c3ea5eb37bd4b5c7763bdf02ed7f8a SHA512 0c609a383805332da69b09056bd50641671c44b498d3e8eae775124f8d089246287d11d6754b1862499a42955ddc6fb3aff88e5ac724fc91bb608e84d2f2760a
 EBUILD gentoo-sources-5.2.5.ebuild 738 BLAKE2B 3a563b3d46eabac3a4b6fa8cc0cc2e94afef9fa9193a2cf3bc14ae03f12e3ccd36562c73b75248851bdccad2b64ea0e023217b75facb721b0e2b546a1d4f8cc2 SHA512 c6c70da5283e6513f294c99cfa97ae6d69d93596564b82b81ea2bc188030e5c26e729de3b25b7a0cc7e76c7eac69d65a2d6e09f91cf236b1b7e636dd00681655
 EBUILD gentoo-sources-5.2.6.ebuild 738 BLAKE2B c61efe89320428b1f993491fc821976b28930fb076dd20e2959cb26960b43025d5862762c3c9eabbecee8766eeb479a701d962086f5d51c30b03dc40b83a75ea SHA512 de0986e0b957f6ef2f8fe88e784bd05025424b29f696f1916559214599b4d206ded1450278edc97d78bfde09fc500ed599a325f02e20f63d494e3ceb22787d1d
 EBUILD gentoo-sources-5.2.7.ebuild 738 BLAKE2B 22e7f8227add007af0e9108383ef18d15e809711c89e336b1552ed5e17506215499d29a03df774bddc29652b7a73444d41aef87a9de4e2dd7051170f2318b7d9 SHA512 947e1d97d0c3acb066b46252b0e70ef45cf167e0c32f4f610e5d9d895058de75caac0fe43a0bb4f056cf0fc018461b1a03f69fdaba9a1b2c60e88316226eb96c
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.138.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.138.ebuild
index 8e323ee01798..a6a7abbab4c7 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.138.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.138.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.140.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.140.ebuild
new file mode 100644
index 000000000000..93c6de59da8c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.140.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="149"
+
+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.141.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.141.ebuild
new file mode 100644
index 000000000000..cfe25d954642
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.141.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="150"
+
+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.66.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.66.ebuild
index c133d0a89e53..286d860276df 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.66.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.66.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.68.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.68.ebuild
new file mode 100644
index 000000000000..ae1d7f350fe7
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.68.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="68"
+
+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.69.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.69.ebuild
new file mode 100644
index 000000000000..546df0ea515a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.69.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="69"
+
+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.189.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.189.ebuild
index 6ae423762fc4..54a07f4a448e 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.189.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.189.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.190.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.190.ebuild
new file mode 100644
index 000000000000..68f8815fedc7
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.190.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="191"
+
+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.189.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.189.ebuild
index b1e237b64c67..2163aa25df33 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.189.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.189.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.190.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.190.ebuild
new file mode 100644
index 000000000000..5663adcd693e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.190.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="195"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.2.10.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.2.10.ebuild
new file mode 100644
index 000000000000..8c80a8d92a3f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.2.10.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="11"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.2.11.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.2.11.ebuild
new file mode 100644
index 000000000000..15f3a0ffff88
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.2.11.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="12"
+
+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 a297f7ae618b..876b539d5571 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -3,8 +3,14 @@ DIST patch-5.3-rc1.patch 92211979 BLAKE2B 984990a073e8c2fed14078f10b97143d387af8
 DIST patch-5.3-rc2.patch 94028243 BLAKE2B 872fbe722cdc38f2a7799ea56cfa7916095d921cec841df4420b1409c2e0447e44e00cd0613e695605fd56eae24cec901b526270cf1d2616c49b937a803110cd SHA512 d3ec6cc0d4062a448a0e7470e86910d6d114b262d8dc8fa88d4e010e9a2ed6a4b1342afe49c5851121577a1b2ce83344f511157d09f339de8b3f96caaf7d2ec5
 DIST patch-5.3-rc3.patch 94324876 BLAKE2B e68fbf8b24b1c8b0a0b5c751ef1b13eedd338db0dcb1060a155e09888ec6f3a60a8a64259bfe6888dc09e818bd12e4559447f8b00d6d9d94681a05ea9bae9dff SHA512 b9e3ac03827d9cc1b0c63ecf29c94f34494fae4f2a2cb6f77dfda04aa0798b2ee3b8d5251bdd95e7fa7665755dc3f7950f31009ddb4f085b4642cb8074c91c36
 DIST patch-5.3-rc4.patch 94800817 BLAKE2B 3998bbc5c0147cb759920052e60b391e53cf73ca1d3e3dc1abe541b630fca18cc0b768b777beb5f8fe53b537464ef109a6e58a85291930fa16b3b1569b16181d SHA512 a9cb59ecb1b2f8e622c8debfeb1073127d2891e7f6790aa902e4c20de0cad9ac5a09ce652364d8792249c69b41be0ba8d0bdd7141ea0175e9c76e62a3acaba7f
+DIST patch-5.3-rc5.patch 94949483 BLAKE2B 656d9c20de02f6203ba1d5b011f6cbfdca8a953905880287e1d645da1cb5851fd7422c7f9ed00c6487b03b578fa1ef08f9745771b8436ce06710a54e7e2375e9 SHA512 2736a8228ecda89948ac4df91eb3b930f76da442ae14ff72155048d9db048d7a4a0b3b25a5f83f06cd8d1b87abdd82cce5f3e6d5c575db6d9df72a029c7c3b3b
+DIST patch-5.3-rc6.patch 95212932 BLAKE2B 22bda01b2cb8eff5b57e757c2b53c9be3db5f82458794988449ff45b6ba44f2e9d867f8e214c80ebaa54101caa0ca5a4a96bf1936d84ba8c0e4ebe51b103780f SHA512 47f212970ab571609bc5f51cbd0207be7baa0c5fa9ba47eb348613fbbdaa3f8031f57624e6b05d5873594c82f811eaec4608de44e8ee5ce5df53112f3b192df0
+DIST patch-5.3-rc7.patch 95534361 BLAKE2B 427dd100e4ff4557316c92bae3d59ecd43ea9c37bbbda92fd3c36d106587f5494b9339e2dfd436479d0c43fa13d98aeb17ee62b01fd0c3fdddc3195e24af41ca SHA512 6004b20248c340f7c35d254787e156f5ac6ec072a4a4fea96f6feed76c8f9b5f0cb3f1037c2940288898d8778ec503ed847f8df7e2801db884186e8f624b1835
 EBUILD git-sources-5.3_rc1.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386eac539116fa0ab6db5bec3c09ede64560c22358828972d185fde307fec584b0e13b169b424b9398851f9f9e520622591 SHA512 9f9c58ad3248da75dc0f157ee221294051fc7f55122e8a279c28259b123afc72680ead52d819bb39e70a518c6e51a73868837667c65e76123945891e1e0d104a
 EBUILD git-sources-5.3_rc2.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386eac539116fa0ab6db5bec3c09ede64560c22358828972d185fde307fec584b0e13b169b424b9398851f9f9e520622591 SHA512 9f9c58ad3248da75dc0f157ee221294051fc7f55122e8a279c28259b123afc72680ead52d819bb39e70a518c6e51a73868837667c65e76123945891e1e0d104a
 EBUILD git-sources-5.3_rc3.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386eac539116fa0ab6db5bec3c09ede64560c22358828972d185fde307fec584b0e13b169b424b9398851f9f9e520622591 SHA512 9f9c58ad3248da75dc0f157ee221294051fc7f55122e8a279c28259b123afc72680ead52d819bb39e70a518c6e51a73868837667c65e76123945891e1e0d104a
 EBUILD git-sources-5.3_rc4.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386eac539116fa0ab6db5bec3c09ede64560c22358828972d185fde307fec584b0e13b169b424b9398851f9f9e520622591 SHA512 9f9c58ad3248da75dc0f157ee221294051fc7f55122e8a279c28259b123afc72680ead52d819bb39e70a518c6e51a73868837667c65e76123945891e1e0d104a
+EBUILD git-sources-5.3_rc5.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386eac539116fa0ab6db5bec3c09ede64560c22358828972d185fde307fec584b0e13b169b424b9398851f9f9e520622591 SHA512 9f9c58ad3248da75dc0f157ee221294051fc7f55122e8a279c28259b123afc72680ead52d819bb39e70a518c6e51a73868837667c65e76123945891e1e0d104a
+EBUILD git-sources-5.3_rc6.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386eac539116fa0ab6db5bec3c09ede64560c22358828972d185fde307fec584b0e13b169b424b9398851f9f9e520622591 SHA512 9f9c58ad3248da75dc0f157ee221294051fc7f55122e8a279c28259b123afc72680ead52d819bb39e70a518c6e51a73868837667c65e76123945891e1e0d104a
+EBUILD git-sources-5.3_rc7.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386eac539116fa0ab6db5bec3c09ede64560c22358828972d185fde307fec584b0e13b169b424b9398851f9f9e520622591 SHA512 9f9c58ad3248da75dc0f157ee221294051fc7f55122e8a279c28259b123afc72680ead52d819bb39e70a518c6e51a73868837667c65e76123945891e1e0d104a
 MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-5.3_rc5.ebuild b/sys-kernel/git-sources/git-sources-5.3_rc5.ebuild
new file mode 100644
index 000000000000..71a45a3201b9
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.3_rc5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.2"
+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/git-sources/git-sources-5.3_rc6.ebuild b/sys-kernel/git-sources/git-sources-5.3_rc6.ebuild
new file mode 100644
index 000000000000..71a45a3201b9
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.3_rc6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.2"
+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/git-sources/git-sources-5.3_rc7.ebuild b/sys-kernel/git-sources/git-sources-5.3_rc7.ebuild
new file mode 100644
index 000000000000..71a45a3201b9
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.3_rc7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.2"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index bd3b964ee819..6b562ddd3019 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,6 +1,6 @@
 DIST linux-firmware-20190603.tar.gz 186855626 BLAKE2B 66e3bf709ae9a3df1ac9b7b9bd4e1fa556b07696896e7db086c7b60887a8e8854638d86ecead091d32b3d9a83adc1ab88e8b2fde730f8f97a3225492c2229512 SHA512 9027ae7f649b7e1ff15177c1edb23def93d8fe90a63a90e72e7ab98414d557c9f4545ced30363c68eb1715cd74d19c0dd9e395e82320427b4aab2432a173e62b
 DIST linux-firmware-20190815.tar.gz 195268794 BLAKE2B bc67b4501e1d0c4375000bbcbae754b072a3769703eb214f85468d910f29becbe79f6989d3bf223ffa259326c964cbf153326b64d7756882165d29b576e13703 SHA512 99bcc1372ed51be1692cbc3c7b7c34940ee2f9b89f611afa5266b2b0825ed602cde27ff383edb776c1239eaf37002cd19be7cbb7cdf81e0721c3167d38018e9a
 EBUILD linux-firmware-20190603.ebuild 8027 BLAKE2B 55e8f8436056b1db693383dc41c93b10601e000a9865b06823ce0c34743f23573f6fbf2743bc7edb9a53ad2e7f206d9e979c441e09163eb26d21d0d535258b8d SHA512 4c0149cd856aaa704f8c241e4e60cf3bbaf245555f7166bca0b65d04a321da8d891c693f11e434328994b1b893c661f8e952babe083ac92b2b8d71928a37d5b8
-EBUILD linux-firmware-20190815.ebuild 9601 BLAKE2B bf981b636bf363d63beae6bd087d76620ef5a3f0abe180ba5811008e938b206d2e3fc4a642d03e7be3db886455e563f449b1b0e0c59ba4d912e3932f83de28fe SHA512 5f4fc32272cfdb30b213efde5724969b0507d9ea6ca280757d660c29a4934376020ed0b5998ffe9f4afbcb866948dc7c2fb9088545c1a80bb406028dc74b1b5b
-EBUILD linux-firmware-99999999.ebuild 9574 BLAKE2B 2b59e459fcb0056f319c4d2b7e52d7fc84e738f0dd088ca4dbdb16082ac08a38f436a45b2f819839b7b9ff360fd809348149bd90ab3626b1d06677c6aca95165 SHA512 1fd7485a9dd93cf4d04405d4e46ea6e5e4e5dae88900db2be368e500b68494c8424a176285792def0296d3573b11ac86b13e99bb0d3966f4826078046b4a3226
+EBUILD linux-firmware-20190815.ebuild 9648 BLAKE2B 70bee7f6ccc9be4dab18bd71aa480da91bfe3fec0614d272b64cf03a6c413a04f6f01c4995e399c8bc97267631326f05a6930d7395e9bf7c62795e09fa8c12d3 SHA512 2ede9aabf11122cdc0912f8ec07a267329177f19f04fe5b7246f7c9c329c0c900b854a70ac742dc841fc4a6c1100c9a645947d338d73abaeb2e50f8cefe99bb3
+EBUILD linux-firmware-99999999.ebuild 9621 BLAKE2B 1a3ff9ddab3ceee929a91747a1195528405e37eee8a1f9f02a385ab66c5b153c69004dc3d46ca20c0cbeea59006838c50e15b68a63431f9cdafdf721ceba031f SHA512 44e9cef586b7d908ae2c9057827edc25929677fa4d865674524f022dd6b7ea4caad4a9996993deed6629480c89d50e4773596ce2c3e5639a67075ea8adb157d9
 MISC metadata.xml 867 BLAKE2B db510434e654367fb0ae439b1a3ca3fc170f558022f07634a534ea982f2445ff656fa618b9dac5ebb6ac2f64d9ee93dcc59525c1f3d429eda4ebce05a678298c SHA512 5429e7424fac663e3448e80dad98365239b855f09522fe7ea3cd2c731bec37fee29209cc8ead46e73ea03cd85a3e9c8fafe18ddf4a35e5bb55513d63ad5ae7ff
diff --git a/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild
index 43b7793f2ab9..f8d6a7cf0030 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild
@@ -25,6 +25,8 @@ IUSE="initramfs +redistributable savedconfig unknown-license"
 RESTRICT="binchecks strip
 	unknown-license? ( bindist )"
 
+REQUIRED_USE="initramfs? ( redistributable )"
+
 BDEPEND="initramfs? ( app-arch/cpio )"
 
 #add anything else that collides to this
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index c32364b9d6a2..7bc4d9624e2d 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -25,6 +25,8 @@ IUSE="initramfs +redistributable savedconfig unknown-license"
 RESTRICT="binchecks strip
 	unknown-license? ( bindist )"
 
+REQUIRED_USE="initramfs? ( redistributable )"
+
 BDEPEND="initramfs? ( app-arch/cpio )"
 
 #add anything else that collides to this
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 46c96b0bfb00..7ee3498b7742 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -10,10 +10,14 @@ DIST pf-sources-5.2_p2.patch 556688 BLAKE2B cbcfc2b0949386e72a5bfe2a7e4eb5fe56a3
 DIST pf-sources-5.2_p3.patch 1101135 BLAKE2B f56ff7a269e48513ac2d8360531eef0b60b0d86ec3af223729870c3461746aef1f7370a6448558e921bfacf345043ca4f97d56c1f8069d5a6f607f9cb615e096 SHA512 0b81cf9927bcec69910f18046ccfead4ad3072e8926315f7eed122edd09ca87c43d345402051249f55de2f98c12b04bd87096653051eb1dc77e27fe24c2e85f3
 DIST pf-sources-5.2_p4.patch 1370761 BLAKE2B 54a489784bdfa42879931eb5f05d4ee91bccb9b8b755bc4a3a1221259f5d16df12b1bb240518f8ee86b93383f8ec2f5eb29541548c5d4ca6d4d3aa41b1b92dc2 SHA512 4489218cd370cb38cda5c79b05d26e7150ac8ce97eaf0a03013743f9507fff82cd1024e0f95e226bd5d1f3c4741a5ab8934002e4a0c0e13fc2666513b41b6491
 DIST pf-sources-5.2_p5.patch 1632051 BLAKE2B 71fe6365e1e8fee65480bc3b6081f410516dcd6cecdffe0ad03b95c63b8aa2f59dc7357190aa49d9c10637ef7ae5516588c27140afe594eaa1282f565ea4bf70 SHA512 27eff105625ce917e009d5e29ba991682731bb6b7e77ae16948456b820a78271ca666634ee30ef6ebf7d8d1dd13aa9999dfc68acead55eaecca4081746cbba5f
+DIST pf-sources-5.2_p6.patch 1777289 BLAKE2B 11a913546dcd8a4ad39b4b924aa085bdf0b711cfe8f8697efe3983a09afe4ce377e6ab61730be115617645e0c32be3970b2c4c60de3beb1e2580c560da9561d4 SHA512 5af6631d86c59e076ba9d48bd866b8aaa1903b9d29b4e478ca328cc6352bc0b4f8b0d41f54f750f2ba03bc6a0cf6a9925a795965e051f4ef77fafba2da18bf8d
+DIST pf-sources-5.2_p7.patch 2142830 BLAKE2B 000e4f464b8d81e0ec767b6cfde56f001f51ed39c90d4dcb3c962460bf0fc184334cd631e9c05e26a0e49814665aad88df066f87f04cc3dee3f42a806d405d7d SHA512 2532cf8d6278321a6b757fca4e5405164ff3fe9349059f5f0983bcf302de2ea0a46a4c70c5cc2af185083050cb086a85be5fffb6104fb2df8f396af822dc841b
 EBUILD pf-sources-5.1_p7.ebuild 1943 BLAKE2B b21d2989f5532ddc528ec7996b1f447fe78e8106fd540816e5e77fac684f044e20dd119ee4e57aec04948662485e4565c23202ea06ee632a1f43ccb336e76f20 SHA512 9e31de214070b8a7e9d4b0358859efe7361bf881c045520cfe1b841efafba5e64c7ddc5d6a3641dfde92b2f37d31ae85f53fa4a3832b77139bda458632c756f8
 EBUILD pf-sources-5.2_p1.ebuild 1902 BLAKE2B 0481e16f025f088eb9c5a0417f229709e4a36e63283e8addbf3547f4bfd27b2ebba8b3fcba1192224ae9165767300250b00380286e6a612e17c7161570e4584a SHA512 c9e76fb9a4c2d0a4ca53dc0c8d27060e213e0347187c0fd439d82c4e8ad4fdb84700800a48426cf0fd032b2cbd86522f1cc06fe5a73da4c3e59b8b6b9e05f71c
 EBUILD pf-sources-5.2_p2.ebuild 1902 BLAKE2B 0481e16f025f088eb9c5a0417f229709e4a36e63283e8addbf3547f4bfd27b2ebba8b3fcba1192224ae9165767300250b00380286e6a612e17c7161570e4584a SHA512 c9e76fb9a4c2d0a4ca53dc0c8d27060e213e0347187c0fd439d82c4e8ad4fdb84700800a48426cf0fd032b2cbd86522f1cc06fe5a73da4c3e59b8b6b9e05f71c
 EBUILD pf-sources-5.2_p3.ebuild 1902 BLAKE2B 0481e16f025f088eb9c5a0417f229709e4a36e63283e8addbf3547f4bfd27b2ebba8b3fcba1192224ae9165767300250b00380286e6a612e17c7161570e4584a SHA512 c9e76fb9a4c2d0a4ca53dc0c8d27060e213e0347187c0fd439d82c4e8ad4fdb84700800a48426cf0fd032b2cbd86522f1cc06fe5a73da4c3e59b8b6b9e05f71c
 EBUILD pf-sources-5.2_p4.ebuild 1902 BLAKE2B 0481e16f025f088eb9c5a0417f229709e4a36e63283e8addbf3547f4bfd27b2ebba8b3fcba1192224ae9165767300250b00380286e6a612e17c7161570e4584a SHA512 c9e76fb9a4c2d0a4ca53dc0c8d27060e213e0347187c0fd439d82c4e8ad4fdb84700800a48426cf0fd032b2cbd86522f1cc06fe5a73da4c3e59b8b6b9e05f71c
 EBUILD pf-sources-5.2_p5.ebuild 2030 BLAKE2B 607fd965a08b6be56cca4e3b7f6e511588117c2aa9e522601a212fce05cef7522f9e3943f8b3f17bda291550908f587c7ef9cfaac619437ea483ee2fc29e6a1d SHA512 fccc06bb103b959768227faeece80b29c81eacb958fb4b1a3d18bf7a3ea825fe8ae9bdd670c72bc4b98747e763946bb3b6f4840098ef02c22c0227ec9e972692
+EBUILD pf-sources-5.2_p6.ebuild 2030 BLAKE2B 607fd965a08b6be56cca4e3b7f6e511588117c2aa9e522601a212fce05cef7522f9e3943f8b3f17bda291550908f587c7ef9cfaac619437ea483ee2fc29e6a1d SHA512 fccc06bb103b959768227faeece80b29c81eacb958fb4b1a3d18bf7a3ea825fe8ae9bdd670c72bc4b98747e763946bb3b6f4840098ef02c22c0227ec9e972692
+EBUILD pf-sources-5.2_p7.ebuild 1999 BLAKE2B 0fd6841de5f35f0a923837f58992e56b37f448b0c8949f5f4d26550ac65f55c240866fb9139ce19cbc9ab1913255ac6d8acaef18f1a16ba7bba9e9b395b9ef8b SHA512 4fb684a031faef367ba4ae5fb95bd6310820dd324087804de4ffd33fde0f0e89774a1e6e2a7f3b833b79bc8079c96c1c3c3929867a0bfcc1e1e44c7497f39108
 MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/pf-sources-5.2_p6.ebuild b/sys-kernel/pf-sources/pf-sources-5.2_p6.ebuild
new file mode 100644
index 000000000000..827ed9e330fc
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.2_p6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+ETYPE="sources"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+
+IUSE=""
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# No reason to bump this number unless something new gets included in genpatches,
+# in that case we can manually remove the linux kernel patches from genpatches.
+K_GENPATCHES_VER="1"
+
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security crew
+K_SECURITY_UNSUPPORTED="1"
+
+K_USEPV="yes"
+
+# We want the very basic patches from gentoo-sources, experimental patch
+# is already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+UNIPATCH_STRICTORDER="yes"
+
+inherit eutils kernel-2
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+
+PF_URI="https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch"
+SRC_URI="
+	${KERNEL_URI}
+	${PF_URI}
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz
+"
+
+KV_FULL="${PVR}-pf"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+PATCHES=(
+	"${DISTDIR}/${P}.patch"
+)
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+see: ${HOMEPAGE}."
+
+pkg_setup(){
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	einfo "Additional features:"
+	optfeature "Userspace KSM helper" sys-process/uksmd
+}
diff --git a/sys-kernel/pf-sources/pf-sources-5.2_p7.ebuild b/sys-kernel/pf-sources/pf-sources-5.2_p7.ebuild
new file mode 100644
index 000000000000..82d79915f607
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.2_p7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+ETYPE="sources"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+
+IUSE=""
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# No reason to bump this number unless something new gets included in genpatches,
+# in that case we can manually remove the linux kernel patches from genpatches.
+K_GENPATCHES_VER="1"
+
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security crew
+K_SECURITY_UNSUPPORTED="1"
+
+K_USEPV="yes"
+
+# We want the very basic patches from gentoo-sources, experimental patch
+# is already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+UNIPATCH_STRICTORDER="yes"
+
+inherit eutils kernel-2
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+
+PF_URI="https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch"
+SRC_URI="
+	${KERNEL_URI}
+	${PF_URI}
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz
+"
+
+KV_FULL="${PVR}-pf"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+PATCHES=(
+	"${DISTDIR}/${P}.patch"
+)
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+see: ${HOMEPAGE}."
+
+pkg_setup(){
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	optfeature "Userspace KSM helper" sys-process/uksmd
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 40b0bea3c5bd..9f8966cfc825 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -5,18 +5,18 @@ DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.1.tar.xz 106244476 BLAKE2B ae3c63ced819737e34f8ec3a78138f87704a2f2956454411e3a4830ec8c0aaf2c288af6ca080f1892540e50f4a422482360010be8641afdeeeaf7231e7d8da97 SHA512 ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
 DIST linux-5.2.tar.xz 107029708 BLAKE2B f0cf6e3a15a4bd019edbfa33cb4556d0672e807f7d139eff3ab053d0ad7649198b229475955a1f51eb90d0e9f8268cafb782f6312793fdf38472f3c6d7c2d7ee SHA512 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c
-DIST patch-3.16.72.xz 2485820 BLAKE2B 49949cd843fb14301d32814de795e6da60a858bb34d8010d69f1ea90bc7c881d73a89ef9ac5047cbe8a9dd718941026ce6dad071cceb4f989ce8f428a02e53f0 SHA512 1ebbee1c2037203145450644ad74fc3a3b7d02146d4b36e0e01202405670111530d5742f6c66852cf78211999e0674a6b0b3612549b564fdd1211ef7d9acf56a
-DIST patch-4.14.138.xz 2800504 BLAKE2B 256f50f2e0fd3f19cc0e660d8c03561f88a3265729a714f74ee2f4553e18118ffacb5a7c070be90ae5bc477eb9024ec2640d749d3a14b2b7b3783f4d3e537309 SHA512 0047d2e4ec7ebd5abcda5115d90f63a2dc02327df5515211a41fd0fc769e48b0948e0ec9c074db3a3549cbfbe26da6bc7a4f4b6b9541116ea1e7fc67859ffdc4
-DIST patch-4.19.66.xz 1659044 BLAKE2B 2eac670da0fa0fd9388713ae41d21bbe336f556837326aa43c6710d69607fbad6ef75969647a0f09760931cad313f312865f04f530018f275e3e8ca25cf38590 SHA512 06bcf3caffe2a5810841913921a3a9c10528173905f5bf8efc005b363c451606e59f1208bafb44c00cf599113768bd3f701aadc9469611320be85ab6d83c25f4
-DIST patch-4.4.189.xz 2668944 BLAKE2B d4d1077f1e595ca09387c46850762c16fa97b33ac8d2ffdf69f3615fa3f0872f33f2f9c37990a2f5a6d35c53e02384b6ae0d9c263b0f7a69199deeeed15cfc71 SHA512 c5bdd2d3b6a6654c5e1b23974dcfbe01b30ab6d4ae893b69c579c6a24f89b99245a0de27f4a38951bd888f6ca4bd0d98f07eba2c4b2e05727265006ec64d9640
-DIST patch-4.9.189.xz 2920816 BLAKE2B 820b097cf9748f7d224a702b86a8ba77f79e17d94698b1a8b2aff78929fe2b9bbccf93f11cd765b07fa86f0c46d86babdb240a2d82d328482b94d6325755c69d SHA512 9a54865f309b17bd62a23f72d766f608428b196f779ead6fe22f65871ed92af3d2786e63cdddaaecb3f3269edce0afaba7e490fb6dbe4675989cc59b2d9707f9
+DIST patch-3.16.73.xz 2488000 BLAKE2B d60b6db3e5de716031667bf367c278e06a7d3ae6cb045d9558e5b3550a4bc11c478d0daca8b08c901b09ce5d27f49fb27610cd4c0e6694f885c263c9b7ea99bc SHA512 64b07867a0c22f1d122b0cd0e52b2039f7ddea3bc22390ce1b43da7b09c35eb235b6e44d4715746573861fba2df73b52227da885b761b097bcc5cc5c91506054
+DIST patch-4.14.141.xz 2837420 BLAKE2B e803978c8a7ee7b30e698b05c34da956d66df1c613b875e90ff5b5673dc85f691633ef9c0e534a586ae5d8c866827289c1077d7dab5239e9f4bd4c47fab02dfe SHA512 a4a4690a94a799f9a9f65fb44967fd2e7506ee7aa22c3cd487eefc72eefd8f87a76f78356ae7b6d941b5d31370026bb049fa06b47c7d5f77ae4e74c59eaa8071
+DIST patch-4.19.69.xz 1716340 BLAKE2B c1a9b09184f2d8dc1f630ef04da236b8e24f88a1f9963883fae09cd44c390231af263816bb22176af5eddccfaab8ee5bc73df2020006461bd25a82a0dad92988 SHA512 4c255378c97410f854737a3fa655bdd3e77b36f7dae198770158d8e68b98774a49689e93e6593adea3d427870a79fa09c410b40d590bcd3018051a3b56aaadcd
+DIST patch-4.4.190.xz 2678804 BLAKE2B b290bad1047c175e4c245b5b03057a9f6e27b961435d50469ce733753bc2648a11e332ddb5ad82c391f1377efe2c531206b9880b31842b0a675241c63116fdc9 SHA512 01a26ad455fb8b6b4b315c76edec50d13cb00eacefa5814622d67e8b57bb11e0023f5a8a5b1b0000b585fa9d0fe72072f4c3ffe975aa41ddd1bb1c42a351a075
+DIST patch-4.9.190.xz 2943196 BLAKE2B 21b29311ba64fdd2b7d1ece9e21e35f50dc1ff995443ddce866c11685d7792b81ca85cae1de83e7873d0c5851b6e20d28d6a628255cce5509c59844ce7e04b02 SHA512 5325b07e849c9b4b0cc55d805a83b8f8a8ac8d392e1c4d8535ab9b4ad185ba3cfd740a5383525bbce3a3c3a858ac17bb7219baa156658d2a8de9309a0544c781
 DIST patch-5.1.21.xz 651764 BLAKE2B cf928fa0453a3460af3a2889596e49383f975d22c9e891be0096c5d37cde2bdf6391301855504f8c2522d3c8a8433f865f80c6937992be67e9bbe296afae8901 SHA512 124bded280ada37ab8af76c11aeb688fcc37f335e2318c5a28ab6bec351e516614540cea0bfa93dfec66c1a74500e39a031deaaf67047b1eca5cbc2cde5f7165
-DIST patch-5.2.8.xz 325304 BLAKE2B 9e9e995e10d036fe4895ee48bbdb0356260b276c436c5fd7f17a75cb5eb2ff432ab22290f8ba0e866dd88beedd0858779dcb378198e141d1d952e9a3fcbfec5e SHA512 9f971b84ef83deb15f618c0d903806273fbe5b06ffbf47654c454b1da302132edc3159fd345b497f778062af5c47572ca77c0ea0580bd017d076db82ca897901
-EBUILD vanilla-sources-3.16.72.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.14.138.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.19.66.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.4.189.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.9.189.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+DIST patch-5.2.11.xz 439288 BLAKE2B 7a2ce50c1baf82a4baf891cf52f5d2cf702884506508bc9a2f0a40e7ac9a42cc7105a306a2ac0b1c926eab4cee90d1620b4cb37d7d83ebc7cc60e9e30274dd95 SHA512 585c5f2578201f302c8017c2b406bc863418b6ffca90d641c035a56b750aea8b837a8ae5401d1070bf63983861574f1bced4a16f1b5e385f81f0a286f46f52e5
+EBUILD vanilla-sources-3.16.73.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.14.141.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.19.69.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.4.190.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.9.190.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
 EBUILD vanilla-sources-5.1.21.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-5.2.8.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-5.2.11.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.16.72.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.16.73.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.16.72.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.16.73.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.138.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.141.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.138.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.141.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.66.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.69.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.66.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.69.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.189.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.190.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.189.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.190.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.189.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.190.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.189.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.190.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.2.8.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.2.11.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.2.8.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.2.11.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index c04e090ecc0a..2b7848ddfafc 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 20803d8030a0..2569295ca23f 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -15,5 +15,5 @@ EBUILD binutils-libs-2.28.1.ebuild 2872 BLAKE2B f0ef199dfc0025b06dbdab74f76f0a17
 EBUILD binutils-libs-2.29.1-r1.ebuild 2921 BLAKE2B f38060716462c9c51bc84b98348b82952b6bb47cd33136d7eaaca822ba6e40504fad2b0c778a4a02989ca9e20f812d928d718295376141dd02e519e541a605a3 SHA512 8fc849244e3cdb9b1a35e9bed1f2e57e8bba210e6ab9aa7408904b5a04cc532dfff52a9840e866df5985f6b1d05c96ce7549c7514389a8dae9a4d5d798d48c8e
 EBUILD binutils-libs-2.30-r4.ebuild 3594 BLAKE2B 60b602ed843164cceee4c490fba486e38b4fe8272ec94dafc652aa891a2a148f4e8f69d88c9fb6ca6fa154cd1365bf1473ea73ce2f9bab4d1a36d08259eb7f89 SHA512 fed6718f162b379e381900b1b4c7fcfa3bfe0710f8d489e3ba19ff1d3accb51dfde7d44df5c608d8c9cf6f5d5cc92e7e518b7719ccb832b89d285507507022ee
 EBUILD binutils-libs-2.31.1-r6.ebuild 3573 BLAKE2B ab5423831f517f01dfea0f4c9ecda3c4b44a6bbd780831ac93258d8f8a2074669ea334aba2c3d8dac787e922605f00c21543ffa9186997fdab73d51cbb05f593 SHA512 66bedc93c56f13390db3676061297e958eee5b480dbf5414c6c58d150684e799b4b522f39340296ebad4e746da140cb20d026e6bc252143a04f04aa96453c26b
-EBUILD binutils-libs-2.32-r1.ebuild 3582 BLAKE2B 56d2e3d9050e7b48c8c9236d3aca5ce285fd33742db03e316b3208e0508f9c5de82bfd36c58a807404f56c745a645c682491eb5a706421cfa01d8df5ace8ec16 SHA512 fd14800afb4b656fff121c1b3246e2a5f226cf1ecfc61069e9456253a4dfcce3df51828e4cb18b9d55929e5bfe44ff0a994393c957ec52b61d9db0de4bc6c71a
+EBUILD binutils-libs-2.32-r1.ebuild 3581 BLAKE2B 1dea490837436fb97b9a39e25a230175981daa0c17dbc88c7041180dc36d1f6377772623e76f29273b2c339bdcf85ae65878975418b65c30227acb65147fdfb4 SHA512 2b4e7a27e2d78abadba650ba232bbe86a2fff1bb8814d4b172c820e3c911b1115ea9e89e5ea3332d5cd23bce9ac59770c77447e293e8383ff9070bc2746eb71e
 MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
index a87833e47d0f..a1095c8e3c92 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.32-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0/${PV}"
 IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index 9679019e0157..ec8060930b48 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -3,12 +3,10 @@ AUX bmc-watchdog.initd.4 404 BLAKE2B 4f975fdccb09a8505d59ded187be17e52b746a5239c
 AUX freeipmi.icinga 117 BLAKE2B 12409a509d0b06d54196961f703fbe91034e1f68cfc19e5cb90c00a3481e29e8bca45fcaca2cc1d780ba5ca6deee58a06b24a2b928ce4a73067efb83d34201f8 SHA512 813aeebe5e663073f3bce7917b35c6ec493f5222bb759d47238aa2b382459661a90165b0bd3a74c2e6e1940d373eccb43ab03a4270d2d2c91a03be361ce46032
 AUX ipmidetectd.confd 185 BLAKE2B ea7164e6b126cc684482557cafae3ac0c39611484243e95a3e8946488cc234f4d3100f931549f08c917d454768845e276d83fa3f9e2d7a57c4454a55090bfa38 SHA512 f10e908a451c646b2c61338d79e69663c05216a54093745bd2b659041e0b91adb9be4077c92d63f6f3d62cb5510168b6a57e5e86375533e235fd3abb2b72a49c
 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.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
+DIST freeipmi-1.6.4.tar.gz 3415832 BLAKE2B 6ea1bc7a0ecd36e0fafda05eb67c2ac128e17103058108443b20c64d1cc98228308bd8283fcaaf8390ddcdbdd2f18ed9cc95277ec5ad67b23f2edf16a5585002 SHA512 c0a543abed2c6c20f797379423efe56c165ed5b89885568eafc9bfb78c31f409f367140f85f86c01e378be83085e979dfce30bbd560e6d6e242e5a7e2a923e0b
 EBUILD freeipmi-1.5.7.ebuild 2369 BLAKE2B 9c2d64cd04e96409e6a1b5d1388ec20cd69092a0994556624b4dab33983695a6f65a92eef7b5ac29e2d2f4d95365f777fa503dcd981cdbe972eaef81a2cceb0b SHA512 cd19b406cf6f5d93d4cfb69da014fa548ac70ee60ddbd1f1ad2064ab449811570db8bebfa4397918f774de4a5d1f6fa25e5185758075ee9059a6edaca91699ac
-EBUILD freeipmi-1.6.2.ebuild 2377 BLAKE2B 1268b57f078dcd3f2de3cfe8e1118f7b5ec1aa12f95d2d12fabf7caca90619d012d3cdc9808bfcba4f5941102a55d4e72ef5c891365641b16323bff8d882c574 SHA512 3db2f55c4d99aa33c640ec930a203951c7787f9d14d8ae49daad3359f82f43ba8cef8e0f7f837927e0e67047572039725bdae28dfa7c5da873059cc7de4097b8
 EBUILD freeipmi-1.6.3.ebuild 2407 BLAKE2B d37b0656b06e4f635b662a402dc32ce5fdbce6d66b9e9e2812a5d13b21fb75c878917cd910182c7c958561d429ccc183e79831f168c80e105211237f501673df SHA512 9faa6a1b420faf4936f5172be2fbfd9e0bce48d99c993d6893c3a0790369cc6d112453ebd19960bcddee92e6048bc9ff65a60eb7d382d12c0c45d0cc12af7a6e
+EBUILD freeipmi-1.6.4.ebuild 2427 BLAKE2B c36ab708c207f8a491e78aac5be9065b28d41b2bdc7cafe0024967c1cd06c5ab7fb42fd79d730724ea4e42d13accaa5cabff936c6dacaba80f7e3db73ac9ce36 SHA512 f9f162b8732bbc5b9a11a028d7bacf330e4e43204302767d8a8de8a24ffa135edae800abfae84ae857cd3437d0477e23ca2351a3d482c3a9e743c6fe8600d5ad
 MISC metadata.xml 376 BLAKE2B f9bd1d470315ace8e1a7b71b77a2616131dec7530cba329cf10118df75e78b5c26e2891f3f5ff78b5df94f1ff67e93e05721d941a94cef847eabfea90b860abf SHA512 10922a1b392edce6cdb447eb2a06694570a88f765fd49eb7f154deed1cb3a33901c68ff1881f3068ae212ba6182c61e598e7ab7d4d683602f4016adc3ca7d7e8
diff --git a/sys-libs/freeipmi/freeipmi-1.4.8.ebuild b/sys-libs/freeipmi/freeipmi-1.4.8.ebuild
deleted file mode 100644
index 58dd6e67e7d7..000000000000
--- a/sys-libs/freeipmi/freeipmi-1.4.8.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#AUTOTOOLS_AUTORECONF=1
-AT_M4DIR="config"
-
-inherit eutils multilib autotools-utils
-
-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
-	)
-
-	autotools-utils_src_configure
-}
-
-# There are no tests
-src_test() { :; }
-
-src_install() {
-	autotools-utils_src_install
-
-	# 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.2.ebuild b/sys-libs/freeipmi/freeipmi-1.6.2.ebuild
deleted file mode 100644
index dc39770131eb..000000000000
--- a/sys-libs/freeipmi/freeipmi-1.6.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~ppc ~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.4.ebuild b/sys-libs/freeipmi/freeipmi-1.6.4.ebuild
new file mode 100644
index 000000000000..13778cd4d674
--- /dev/null
+++ b/sys-libs/freeipmi/freeipmi-1.6.4.ebuild
@@ -0,0 +1,92 @@
+# 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
+	local prog
+	for prog in ipmi{detect,ping,power,console}; do
+		mv "${ED}"/usr/{s,}bin/${prog} || 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/${prog/ipmi/ipmi-}
+		dosym ${prog} /usr/bin/${prog/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}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 1b41b2987e50..1cdb443c8057 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,5 +1,4 @@
-AUX 2.19/glibc-2.19-hardened-configure-picdefault.patch 865 BLAKE2B 81431d341d389f5401bdcbc162a52d0419d97afedaee71ab417780bbc273579fa9ccd8966a7afd172325460e1010f50843ce37574390b17a6156e7751093e0bd SHA512 d8e6fea72e240f1fde8a487958463140a84e8bd6bb5b176f8ce84a34df3137943db9016300884f3efdd4da130e342448e57ed0c0dc6eb2956d647286ce1d00ce
-AUX 2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch 1360 BLAKE2B 19d218e91b1d3d38c526838600d0393de47a0e59ca3e05651bd28becb401021ddd2f6ef77b8740ca4e400f094ab5fd196f092cf25b20729eb4d42e2a200b9e03 SHA512 79876b12871b3e7693340bfdf99276ac0dfd6ff30bc977a9526af9e681fcbab2f25d3ac9e2b33f027c968b38a4b670237de54ffd08edc418423ecd82dddd1d67
+AUX 2.19/glibc-2.19-kernel-2.6.16-compat.patch 3214 BLAKE2B 64af88703bddaa301ce25d4400e00140fae536882443510466510766a60ac1cf4ceca35ca0ad4384f0cdc05b79352ac7da92f555561d1f6cdd65f7cc8464c6d7 SHA512 c21d80b7ae5b2691e5b6d43a42153193822ccc2b4418728edd5f2fa72412992d103b61418b57f9cf26e72378b24aa7cbaed05eeb31a4ec312a715d258cf5232b
 AUX 2.25/glibc-2.25-gentoo-chk_fail.c 9068 BLAKE2B 6fabcbb981d92101ff3b97e8eed4da3c0ee4fc3d09ca344c2d0b7ee5e04fec66b5db314263541beeb1290bafa837795fef1a6300986de938d2958ba89a9c1f2f SHA512 4503002b0e2cee0b6efc4599152d24fcff330157d4e35992a77d0d83a2decc4cf2da2b8645a44d90d428a1d82300a4fd8d13c5937b7c89f368c12b3c9139be6f
 AUX nscd.service 337 BLAKE2B 6b163465dd8db024652921892dc913da8dfc0984eec7ffce621229e48fa99dcedc3b5944844529190122c81f4884b6a6fe7836d37d2d812f34059c530856dec1 SHA512 2001100f3b054843c69b6fd2d38852c7c824282aa8998c25a3c0352db993705429d25c70d8ce6cb3579f836b7089644c520acac423ebd69cb1b36e94a77c5bea
 AUX nscd.tmpfilesd 111 BLAKE2B 4abb7220564e248fc7eeeced41077f186f42594facbfac9a4c0ff36209baac529c219ad6ead8d8aa53ab2b092002f1006a4479459b9e9a7c5a0294cb7d822100 SHA512 53b80b331e1a85d8ee16eb2ce547a7249e944926c3d1cdd4a47a5301a5c842ffc7ec1e3dc0a731542a8facf8261c1c57121802d01741aa89898a3476c09da340
@@ -19,18 +18,22 @@ DIST glibc-2.28-patches-9.tar.xz 98588 BLAKE2B 4ab583be712994f949dee2512da6e12fd
 DIST glibc-2.28.tar.xz 16484344 BLAKE2B 9aa8cbd5a145c2a6fde3a60b3d0a14b12b46ed79333ad1ca3e73464adcfe700277a17a9e7fd0ca36e355a0c5b0b27decfa091da320ba802741ad75cc955bbcc8 SHA512 521f820953ff07c69ece4c2186f59fc061a7f9747932cd70ef2995c2b2deee76eeb6de700d85071cdca5949179aa8ccee75eda7feca1394121ec7b821ad0a3f3
 DIST glibc-2.29-patches-3.tar.xz 35812 BLAKE2B 90b8bc57b7a63f03617795c368b92e525eccfec462d638dbc25c581e5b7a2a72ffd5191842f5ac443a868cbc950838d7e5120e866d343a14b80c55dcbfa48f30 SHA512 4c9b78d9d1a8aa629418f2d758ef800857780b8a1fd8d3582b88348a513ca26ca7f6ac9110a8c6bae16949b360ba36840d184f42293cd4324760273592d1b438
 DIST glibc-2.29-patches-5.tar.xz 64032 BLAKE2B 6c3104bd80aaba617201812a631b734ded4b02f8d4dadb5e353af48692f2a1509ddae1d34098de913ae5b3ac1a29111a44dfae71c3024fab4a805a22e9d66e33 SHA512 39add1388268ecf2029cb90b8312fb610b203f459a092dc1da8b46ce91ccfbbdff235592aa6174edf9efe71039d984ee121dc9adf7e18490cf92fe24561b1267
+DIST glibc-2.29-patches-6.tar.xz 64076 BLAKE2B 04c1baf838eff9275e79145d4a5a642dcd6572aadcdfc6782769f2de107dcd1648b81d0690068db8c0d53229efe2130e279f4aafe8a91238e5dd6a8a7120a433 SHA512 6494dcd23441fe308de97706f7abbea1571e0015d1456e719268b8026e1fb23733c2efd5256840f4b9f0df4f02ac7827b1fad56905cbd8919bca9c25b0afe822
 DIST glibc-2.29.tar.xz 16515488 BLAKE2B b754e6825176538a2b8ca03fce014f0d87d333dc4d038bf0cda5ee8a2f484cd3ce93ad78ec126737e093ab64b55ceedf04cd08aecb4f8041daaa329e99717afa SHA512 146bc0769fe853d9edbf93cea7f74c5b3d84d69cb7614c62588e7acdecd1ec789a9d8949f3e8b99f8f36f2ccac740a003bed94f32b07817baf780b06cfeb6ed0
 DIST glibc-2.30-patches-1.tar.xz 19364 BLAKE2B 853ae651cf48a78796ac0a3c9c84098731d5a43b37644ee5029d2e2b06dab0d1d96b9dd7c3fd896c5513f5f712beca13845c1e24c698fe824ce0f529a2a827d4 SHA512 23065ec67b1a6302eece79da1ba731aa158a2abc0c65aed755cafea388c19aa1f545a6ea6d9db1fd128d06c6878b4c73aea07c6acc053b56bc416143e96e1c05
+DIST glibc-2.30-patches-2.tar.xz 19588 BLAKE2B 672343ef8a44486304f03091844635febef9d1bc8000ab3382d702dcc1111a107b5e758355beaef8db5012f7e324e4c2365e10fc642b01c9f9a3a315de2dc7f6 SHA512 494155147b56e094a4427aed79e278b4a350928ddaff84330d6a40fad079131a4574f20c591dc95e572391b68ef72c49790571ee5323a2a541ec0757bcaeb161
 DIST glibc-2.30.tar.xz 16576920 BLAKE2B bd5aae4c9854f40785b91f83c3b632de6d48d811027ddfe61651cb1bc617db8017d7914c23a770cdd3feed06fcc316da841eea916cdba54179e7eace4ea45484 SHA512 37483990cd653685873e96c45dd1651b32b441b6d7919a68ebe3bae31a0c3f7ce183fc9b110f0b268b353f80312f18370559a1e7aecea0e5aa755c8f2aef1d6b
-DIST glibc-9999-patches-13.tar.xz 18316 BLAKE2B c55359dda094dabfec85f53e48fcd43985d41211f29c0c3ba0d07c4ce28994f96c334c9fcc2a6b78e64123363253c701ed6e9335f4e74274c984734ac8881731 SHA512 627799f65f79e60ed3a9ba1a499d21e771f1b109934967c9fbdf3300b0c1509ef5382834e63c8ead23ffbaee80becf541da5b25e4e2cfa8f6baa801c3838c69d
-EBUILD glibc-2.19-r2.ebuild 40503 BLAKE2B 86f512cbe4154292834e51109b7f233aea8e8fb2a90c643a6d875553f91e03c2e214c165fe3d08f4f0943cfe1627fc7b7e42f885a93ac50cffbe9d3f6b917e4e SHA512 8dce817f9e5fc8a252d61f89df010485e267f0612506cd8b128f151d9965d8e5a84033d07e1caefe23da9aaab95f058675c831bc410fc7cb613b2e329663f656
+DIST glibc-9999-patches-14.tar.xz 17908 BLAKE2B a6e1f22a4358111ff757431c5d42fd020f6095584c3517aa854ea266129d1a177a7c09b310643f1cea32ffaf253806ac08f3aed864fb477097aaa2c4010450f4 SHA512 ef28b409b26472ec1d868167345aecfee70b1edf1863374dc2f25892f40c10f0826620a8b22fbbc9f737c8f611569b3412e8e2ea041da1ad1ef7f6398b82cddc
+EBUILD glibc-2.19-r2.ebuild 37974 BLAKE2B bff1f1a082705e06fdc44d91615a5e137b126e56006b2c2894b765738f710f9365eba0a7d3e7c21433419ffda53a0675d785fe389b1939b8a05c8a60cd05bc82 SHA512 edf5b1e688b438af20d46ef0b7c234abc8b1f3d0e6118146d7c5aa80fbc7bf40670c2ba59a9d16e115d5f0e32c8774ffb3d3c498d4a2a5853c868f9a2cbd5c39
 EBUILD glibc-2.24-r4.ebuild 4988 BLAKE2B 8e08345c96e176984b73a073efca21f771d41af1af75106ec88a22bd55d7f69f28d9c01989026a3e58f3df4fac2a59db68d5ac8a8bbb0f411c75da8792f3402a SHA512 dd1d996eaf35197f7b7b6c111957eb98ef776d0a76a949b95f9bb17075dca43b2a354f8d15be133b9f3ff6c40a5b1f4ec28bd8d41c5cfc51da006eda8b005a05
 EBUILD glibc-2.25-r11.ebuild 4975 BLAKE2B cef32f5d160644845e7cf45a9dd4c8cef1dcff8fca6b64c083c3e05d07533e445a6139939710b9284f7587bbf3977ca556caeb964e73ac21a382d942423d886a SHA512 f26645acc02f16209ec068641a800ef0a4ad2a422c9473e14a273fdece9b53074b837907d635a8585cf9dbb1acea14178166a4a3410aa4c70a745b89a764b6f1
 EBUILD glibc-2.26-r7.ebuild 25509 BLAKE2B 49166ae538135fe9663954a2f2ae6778b240ba32ab77e600091e56f44ef06df91f856c1389e78431420a33cb381743f4b44d5f02bbe6041a01134795fd2fad14 SHA512 82111610d0de42b52cdd6452d8a7f09464a2aaceea8fee1d8d6dcc6a9ee35396a093448361111e62b8acdec06d84795600dab65dbbe4e951663827106e81268f
 EBUILD glibc-2.27-r6.ebuild 41564 BLAKE2B 7a0d3bf89587630f59c8f4e271ec26db8695f1ccec95148d1d79c8bb14fb1382a37ada421c002ca0d66661b28ab1166acbfe884bcfeed8da413ff82d448ff141 SHA512 02d6d45d177bc43438a74918a8dcbd19507100b00ebd079102296ca197c05a957cdf9d58ffa11e1710d781016c4b6ab98c2aa492b2dd1483ad02de856fa2a54b
 EBUILD glibc-2.28-r6.ebuild 41334 BLAKE2B 4de861388f365a5b38aa09bac691d2a6e22f4ff54942eb1fa044d125b9214d5519f10549214cfa46d96e968a6ec80b6e022a9e7000db8d351e2a03cb02530aa8 SHA512 52174bb1cafbf8401851efa950398a31d84319bf3b403f6db9bbbc0e0044b18f1c08e64ae181d062a33139d139eaca5706dd0df1a3b9f555a73a35389dcc2a6a
-EBUILD glibc-2.29-r2.ebuild 42670 BLAKE2B bc32330106dc20ad803ac3fc8a59d9ec81bc6007f62550127eb7b20c1994d461db3460f18d5791c5ac40457ce8670fc917fe5c0a120381fdab3e90132ad96975 SHA512 2f9073351fa328a99d2c16df6633815930a865199a9412328c277ac80eb4f5d7795026e88b0ebb1982ab3c0170fe0d6cd15a63ffa6a8bfc33c0b08628d57feea
+EBUILD glibc-2.29-r2.ebuild 42668 BLAKE2B 9fe4878b9f99c4c06185f8ff6cca5592e9650fbffa6ee5fdf8fe4f1f5a383a1c93998d7501d2441abd99eb59175dea3f8a156b3425f89f6b6d5a8240005ff615 SHA512 4fe050deca50f9ae95296b2da538d2d1cb47eddbc7e66cedc8090f6d8df9ff697dae42d615b9e71c5fbcadeaa0cc3011f5c1e28ebbe5ac352aac19e233a95f5f
 EBUILD glibc-2.29-r4.ebuild 42974 BLAKE2B d156327652eae83c2ec8f1d30dde09d4b0a57c8ce1957277d6b5df6d72b3abfaf18fc092bda0256ae4b4bdd838a685ee3be647fa7978a72f06795d6a01ac543e SHA512 1eba277054fabaa88e236c26a2b38c8aa52d391b73d1e31686e659b228f2521a1914546220f67e7ea9b3bf54102b82cd6b6b2e3b85b7517e0ad497add4cdfcbd
-EBUILD glibc-2.30.ebuild 43395 BLAKE2B 15b7816fa3cabdebafad8d4667e77eff425b6f609170f120a9b2879e1d217013e81a1a8c67128fccbcafe2bc1fd297d2ac369d0b35266a36dcd3e32c4bf1c6d4 SHA512 7942bd9011ba05b652da3a1f93309f10e04be47bd55eaa32327a41c1f2733e3c6f0dfed22ab4c145644ae25327ba8d77e78c1875fa59728b860c90936a691632
-EBUILD glibc-9999.ebuild 42876 BLAKE2B 55a04ac734d2c4322e98123c4d28cea9c3c226c623efdd23fe3f6da39431b1ab26e9bc045c8ae488f11fe1e82a43d1d292da4a463dd7a06c9b50d00a522575d7 SHA512 51cc8edd2e3380e0519811f71c098e10f5b9080c376b93ac1db8148ed3a68665510db61fecbf66a3e0f87a224f21af462d8c52b95bd5acff48601cf587600bff
+EBUILD glibc-2.29-r5.ebuild 42971 BLAKE2B 4073abe9e595e85a7832bcbfeca702ddd505d66fd250a038551156ff94b9729ae6e2a471cec8f4738ffafae62089cfbbf8ae1bf63792c7711fcd095b941a31fc SHA512 6b9b1b2a4319d70b9d1001300e4c874b9eda053ee3edcde79a7be38e8aebb3a29859df006a446a0975af46c6c066e42ec991eebed9215df7be7a04f788c4855f
+EBUILD glibc-2.30-r1.ebuild 43261 BLAKE2B 33fa4f4accb38b7e60376db35932c33c0f3c11f671ae506e657600f64a0acf859155eb4f5b3b4507119aef941e289359f4d043397ea1ec8e1e300965d77cfc56 SHA512 c2e38e311820edcd508928c53f7a7b66e2aa88b547c29d1c4499ed48f80e27ee8a85f193cd950886240d681826b06726ddc6b6cd88a52e3a371b2969d36f159f
+EBUILD glibc-2.30.ebuild 43264 BLAKE2B a7a2c31914e2cce3ba035d3e5d58747e6568a195ebec44d758a93e1c2e76043c28662322cccf6ccf3f34e61690c55a6c6e32e67576b947594447cf545b6bf56d SHA512 070ee6fa0b537d345bcd03c69b299092285da386f456d609c5b3a11271d5202179b17d446436c5a7a2640fe1e03380745db448b6cf55f72e33cc70749fe7685d
+EBUILD glibc-9999.ebuild 42745 BLAKE2B d6193d86b916247f16a8f83a9ffd1d94203f480ae02eba99f5a6e755fecd1363ef8203ebc5b4bd3f8628e0f78d9a493fbb75b25ebe41f9a50a87a48a1a215e23 SHA512 e46ee7850be4a95d2563a054bb19296f73db2e7f23906e2e7d64310d5e6c9041d982deb1770a534ff902ac2e72ca36f85093dba046a715163f593aae0d7de090
 MISC metadata.xml 1323 BLAKE2B 6a19ccbf9f068c6c3d3b945d3011dce3d7712dd74a2daeaa8244eef73fd86723b275ce018ec5557862278c23883fabfb27e91e0b88ff62c34fffdadd4b024411 SHA512 848adbf531103d69b8b0e7017c25de730daecccae220e337e475ba8dbcaa95c6d5e440330be56367974607050dfa1964026ed90bc699ab5f12fef35c88d67505
diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-hardened-configure-picdefault.patch b/sys-libs/glibc/files/2.19/glibc-2.19-hardened-configure-picdefault.patch
deleted file mode 100644
index 341d8c5028e1..000000000000
--- a/sys-libs/glibc/files/2.19/glibc-2.19-hardened-configure-picdefault.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Prevent default-fPIE from confusing configure into thinking
-PIC code is default.  This causes glibc to build both PIC and
-non-PIC code as normal, which on the hardened compiler generates
-PIC and PIE.
-
-Patch by Kevin F. Quinn <kevquinn@gentoo.org>
-Fixed for glibc 2.19 by Magnus Granberg <zorry@ume.nu>
-
---- configure.ac
-+++ configure.ac
-@@ -2145,7 +2145,7 @@
- # error PIC is default.
- #endif
- EOF
--if eval "${CC-cc} -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then
-+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then
-   libc_cv_pic_default=no
- fi
- rm -f conftest.*])
---- configure
-+++ configure
-@@ -7698,7 +7698,7 @@
- # error PIC is default.
- #endif
- EOF
--if eval "${CC-cc} -S conftest.c 2>&5 1>&5"; then
-+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&5 1>&5"; then
-   libc_cv_pic_default=no
- fi
- rm -f conftest.*
diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch b/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch
deleted file mode 100644
index 72a616a046a8..000000000000
--- a/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/503838
-http://gcc.gnu.org/PR60465
-https://sourceware.org/ml/libc-alpha/2015-12/msg00556.html
-https://trofi.github.io/posts/189-glibc-on-ia64-or-how-relocations-bootstrap.html
-
-newer versions of gcc generate relocations in the elf_get_dynamic_info func
-which glibc relies on to populate some info structs.  those structs are then
-used by ldso to process relocations in itself.  glibc requires that there are
-no relocations until that point (*after* elf_get_dynamic_info), so we end up
-crashing during elf_get_dynamic_info because the relocation has not yet been
-processed.
-
-this hack shuffles the code in a way that tricks gcc into not generating the
-relocation.  we need to figure out something better for upstream.
-
---- a/elf/get-dynamic-info.h
-+++ b/elf/get-dynamic-info.h
-@@ -66,8 +66,12 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
- 	info[DT_VALTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
- 	     + DT_VERSIONTAGNUM + DT_EXTRANUM] = dyn;
-       else if ((d_tag_utype) DT_ADDRTAGIDX (dyn->d_tag) < DT_ADDRNUM)
--	info[DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
--	     + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] = dyn;
-+	{
-+	  d_tag_utype i =
-+	      DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
-+	      + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM;
-+	  info[i] = dyn;
-+	}
-       ++dyn;
-     }
- 
diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-kernel-2.6.16-compat.patch b/sys-libs/glibc/files/2.19/glibc-2.19-kernel-2.6.16-compat.patch
new file mode 100644
index 000000000000..bf75f80cb7cc
--- /dev/null
+++ b/sys-libs/glibc/files/2.19/glibc-2.19-kernel-2.6.16-compat.patch
@@ -0,0 +1,85 @@
+Remove newer symbols that does not work on linux-2.6.16.
+
+This is only for Prefix standalone.
+
+Index: glibc-2.19/io/sys/stat.h
+===================================================================
+--- glibc-2.19.orig/io/sys/stat.h
++++ glibc-2.19/io/sys/stat.h
+@@ -361,10 +361,6 @@ extern int mkfifoat (int __fd, const cha
+ #ifdef __USE_ATFILE
+ /* Set file access and modification times relative to directory file
+    descriptor.  */
+-extern int utimensat (int __fd, const char *__path,
+-		      const struct timespec __times[2],
+-		      int __flags)
+-     __THROW __nonnull ((2));
+ #endif
+ 
+ #ifdef __USE_XOPEN2K8
+Index: glibc-2.19/posix/unistd.h
+===================================================================
+--- glibc-2.19.orig/posix/unistd.h
++++ glibc-2.19/posix/unistd.h
+@@ -419,7 +419,6 @@ extern int pipe (int __pipedes[2]) __THR
+ #ifdef __USE_GNU
+ /* Same as pipe but apply flags passed in FLAGS to the new file
+    descriptors.  */
+-extern int pipe2 (int __pipedes[2], int __flags) __THROW __wur;
+ #endif
+ 
+ /* Schedule an alarm.  In SECONDS seconds, the process will get a SIGALRM.
+Index: glibc-2.19/sysdeps/unix/sysv/linux/x86/bits/epoll.h
+===================================================================
+--- glibc-2.19.orig/sysdeps/unix/sysv/linux/x86/bits/epoll.h
++++ glibc-2.19/sysdeps/unix/sysv/linux/x86/bits/epoll.h
+@@ -19,11 +19,5 @@
+ # error "Never use <bits/epoll.h> directly; include <sys/epoll.h> instead."
+ #endif
+ 
+-/* Flags to be passed to epoll_create1.  */
+-enum
+-  {
+-    EPOLL_CLOEXEC = 02000000
+-#define EPOLL_CLOEXEC EPOLL_CLOEXEC
+-  };
+ 
+ #define __EPOLL_PACKED __attribute__ ((__packed__))
+Index: glibc-2.19/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
+===================================================================
+--- glibc-2.19.orig/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
++++ glibc-2.19/sysdeps/unix/sysv/linux/bits/fcntl-linux.h
+@@ -187,8 +187,6 @@
+ # define F_GETPIPE_SZ	1032	/* Set pipe page size array.  */
+ #endif
+ #ifdef __USE_XOPEN2K8
+-# define F_DUPFD_CLOEXEC 1030	/* Duplicate file descriptor with
+-				   close-on-exit set.  */
+ #endif
+ 
+ /* For F_[GET|SET]FD.  */
+Index: glibc-2.19/sysdeps/unix/sysv/linux/sys/epoll.h
+===================================================================
+--- glibc-2.19.orig/sysdeps/unix/sysv/linux/sys/epoll.h
++++ glibc-2.19/sysdeps/unix/sysv/linux/sys/epoll.h
+@@ -101,7 +101,6 @@ extern int epoll_create (int __size) __T
+ 
+ /* Same as epoll_create but with an FLAGS parameter.  The unused SIZE
+    parameter has been dropped.  */
+-extern int epoll_create1 (int __flags) __THROW;
+ 
+ 
+ /* Manipulate an epoll instance "epfd". Returns 0 in case of success,
+Index: glibc-2.19/time/sys/time.h
+===================================================================
+--- glibc-2.19.orig/time/sys/time.h
++++ glibc-2.19/time/sys/time.h
+@@ -140,8 +140,6 @@ extern int utimes (const char *__file, c
+ 
+ #ifdef __USE_BSD
+ /* Same as `utimes', but does not follow symbolic links.  */
+-extern int lutimes (const char *__file, const struct timeval __tvp[2])
+-     __THROW __nonnull ((1));
+ 
+ /* Same as `utimes', but takes an open file descriptor instead of a name.  */
+ extern int futimes (int __fd, const struct timeval __tvp[2]) __THROW;
diff --git a/sys-libs/glibc/glibc-2.19-r2.ebuild b/sys-libs/glibc/glibc-2.19-r2.ebuild
index 58038d81dd61..42ed9d4e04de 100644
--- a/sys-libs/glibc/glibc-2.19-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit prefix eutils versionator toolchain-funcs flag-o-matic gnuconfig usr-ldscript \
+inherit prefix eutils toolchain-funcs flag-o-matic gnuconfig usr-ldscript \
 	multilib systemd multiprocessing
 
 DESCRIPTION="GNU libc C library"
@@ -32,7 +32,7 @@ PATCH_VER=9
 SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )"
 
-IUSE="audit caps compile-locales debug doc gd hardened headers-only multilib nscd profile selinux suid systemtap vanilla"
+IUSE="audit caps compile-locales debug doc gd headers-only multilib nscd profile selinux suid systemtap vanilla"
 
 # Minimum kernel version that glibc requires
 # hppa requires 2.6.20
@@ -255,20 +255,10 @@ setup_target_flags() {
 			sparc64-*)
 				case $(get-flag mcpu) in
 				niagara[234])
-					if version_is_at_least 2.8 ; then
-						cpu="sparc64v2"
-					elif version_is_at_least 2.4 ; then
-						cpu="sparc64v"
-					elif version_is_at_least 2.2.3 ; then
-						cpu="sparc64b"
-					fi
+					cpu="sparc64v2"
 					;;
 				niagara)
-					if version_is_at_least 2.4 ; then
-						cpu="sparc64v"
-					elif version_is_at_least 2.2.3 ; then
-						cpu="sparc64b"
-					fi
+					cpu="sparc64v"
 					;;
 				ultrasparc3)
 					cpu="sparc64b"
@@ -284,24 +274,10 @@ setup_target_flags() {
 			sparc-*)
 				case $(get-flag mcpu) in
 				niagara[234])
-					if version_is_at_least 2.8 ; then
-						cpu="sparcv9v2"
-					elif version_is_at_least 2.4 ; then
-						cpu="sparcv9v"
-					elif version_is_at_least 2.2.3 ; then
-						cpu="sparcv9b"
-					else
-						cpu="sparcv9"
-					fi
+					cpu="sparcv9v2"
 					;;
 				niagara)
-					if version_is_at_least 2.4 ; then
-						cpu="sparcv9v"
-					elif version_is_at_least 2.2.3 ; then
-						cpu="sparcv9b"
-					else
-						cpu="sparcv9"
-					fi
+					cpu="sparcv9v"
 					;;
 				ultrasparc3)
 					cpu="sparcv9b"
@@ -368,21 +344,6 @@ setup_flags() {
 
 	filter-flags '-fstack-protector*'
 	append-flags '-fno-stack-protector'
-
-	# Starting with gcc-6 (and fully upstreamed pie patches) we control
-	# default enabled/disabled pie via use flags. So nothing to do
-	# here then. #618160
-	if [[ $(gcc-major-version) -lt 6 ]]; then
-		if use hardened && tc-enables-pie ; then
-			# Force PIC macro definition for all compilations since they're all
-			# either -fPIC or -fPIE with the default-PIE compiler.
-			append-cppflags -DPIC
-		else
-			# Don't build -fPIE without the default-PIE compiler and the
-			# hardened-pie patch
-			filter-flags -fPIE
-		fi
-	fi
 }
 
 want_tls() {
@@ -412,25 +373,6 @@ want__thread() {
 	return ${WANT__THREAD}
 }
 
-use_multiarch() {
-	# Make sure binutils is new enough to support indirect functions,
-	# #336792. This funky sed supports gold and bfd linkers.
-	local bver nver
-	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
-	case $(tc-arch ${CTARGET}) in
-	amd64|x86) nver="2.20" ;;
-	arm)       nver="2.22" ;;
-	hppa)      nver="2.23" ;;
-	ppc|ppc64) nver="2.20" ;;
-	# ifunc support was added in 2.23, but glibc also needs
-	# machinemode which is in 2.24.
-	s390)      nver="2.24" ;;
-	sparc)     nver="2.21" ;;
-	*)         return 1 ;;
-	esac
-	version_is_at_least ${nver} ${bver}
-}
-
 # Setup toolchain variables that had historically been defined in the
 # profiles for these archs.
 setup_env() {
@@ -757,6 +699,8 @@ src_prepare() {
 
 	gnuconfig_update
 
+	eapply "${FILESDIR}"/2.19/glibc-2.19-kernel-2.6.16-compat.patch
+
 	cd "${WORKDIR}"
 	find . -name configure -exec touch {} +
 
@@ -764,25 +708,6 @@ src_prepare() {
 
 	# Fix permissions on some of the scripts.
 	chmod u+x "${S}"/scripts/*.sh
-
-	cd "${S}"
-
-	if use hardened ; then
-		# We don't enable these for non-hardened as the output is very terse --
-		# it only states that a crash happened.  The default upstream behavior
-		# includes backtraces and symbols.
-		einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
-		cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
-		cp "${FILESDIR}"/2.25/glibc-2.25-gentoo-chk_fail.c debug/chk_fail.c || die
-
-		if use debug ; then
-			# Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
-			sed -i \
-				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				-e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
-				debug/Makefile || die
-		fi
-	fi
 }
 
 glibc_do_configure() {
@@ -892,7 +817,6 @@ glibc_do_configure() {
 		--libexecdir='$(libdir)'/misc/glibc
 		--with-bugurl=https://bugs.gentoo.org/
 		--with-pkgversion="$(glibc_banner)"
-		$(use_multiarch || echo --disable-multi-arch)
 		$(use_enable systemtap)
 		$(use_enable nscd)
 		${EXTRA_ECONF}
diff --git a/sys-libs/glibc/glibc-2.29-r2.ebuild b/sys-libs/glibc/glibc-2.29-r2.ebuild
index a9ed33739e85..5352ae1f92b3 100644
--- a/sys-libs/glibc/glibc-2.29-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
diff --git a/sys-libs/glibc/glibc-2.29-r5.ebuild b/sys-libs/glibc/glibc-2.29-r5.ebuild
new file mode 100644
index 000000000000..d02d0fcb97d6
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.29-r5.ebuild
@@ -0,0 +1,1473 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig usr-ldscript \
+	multilib systemd multiprocessing
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+RESTRICT="strip" # Strip ourself #46186
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER=20180511
+
+# Gentoo patchset
+PATCH_VER=6
+
+SRC_URI+=" https://dev.gentoo.org/~slyfox/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+
+IUSE="audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux +ssp suid systemtap test vanilla"
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+COMMON_DEPEND="
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-util/systemtap )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-misc/pax-utils-0.1.10
+	sys-devel/bison
+	!<sys-apps/sandbox-1.6
+	!<sys-apps/portage-2.1.2
+	!<sys-devel/bison-2.7
+	!<sys-devel/make-4
+	doc? ( sys-apps/texinfo )
+	test? ( >=net-dns/libidn2-2.0.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/gentoo-functions
+	!sys-kernel/ps3-sources
+	!sys-libs/nss-db
+"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	DEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.24
+		>=${CATEGORY}/gcc-6
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	DEPEND+="
+		>=sys-devel/binutils-2.24
+		>=sys-devel/gcc-6
+		virtual/os-headers
+	"
+	RDEPEND+="
+		>=net-dns/libidn2-2.0.5
+		vanilla? ( !sys-libs/timezone-data )
+	"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+#
+# Small helper functions
+#
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# This prefix is applicable to CHOST when building against this
+# glibc. It is baked into the library at configure time.
+host_eprefix() {
+	is_crosscompile || echo "${EPREFIX}"
+}
+
+# This prefix is applicable to CBUILD when building against this
+# glibc. It determines the destination path at install time.
+build_eprefix() {
+	is_crosscompile && echo "${EPREFIX}"
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	nonfatal emake -s glibc-test
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# Note: This test only matters when the x86 ABI is enabled, so we could
+			# optimize a bit and elide it.
+			# TODO: See cross-compile issues listed above for x86.
+			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				# Normally the target is x86_64-xxx, so turn that into the -march that
+				# gcc actually accepts. #528708
+				[[ ${t} == "x86_64" ]] && t="x86-64"
+				filter-flags '-march=*'
+				# ugly, ugly, ugly.  ugly.
+				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404"
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			# If the CHOST is the basic one (e.g. not sparcv9-xxx already),
+			# try to pick a better one so glibc can use cpu-specific .S files.
+			# We key off the CFLAGS to get a good value.  Also need to handle
+			# version skew.
+			# We can't force users to set their CHOST to their exact machine
+			# as many of these are not recognized by config.sub/gcc and such :(.
+			# Note: If the mcpu values don't scale, we might try probing CPP defines.
+			# Note: Should we factor in -Wa,-AvXXX flags too ?  Or -mvis/etc... ?
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if ver_test -ge 2.8 ; then
+						cpu="sparc64v2"
+					elif ver_test -ge 2.4 ; then
+						cpu="sparc64v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				niagara)
+					if ver_test -ge 2.4 ; then
+						cpu="sparc64v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparc64b"
+					;;
+				*)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					[[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if ver_test -ge 2.8 ; then
+						cpu="sparcv9v2"
+					elif ver_test -ge 2.4 ; then
+						cpu="sparcv9v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				niagara)
+					if ver_test -ge 2.4 ; then
+						cpu="sparcv9v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparcv9b"
+					;;
+				v9|ultrasparc)
+					cpu="sparcv9"
+					;;
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Over-zealous CFLAGS can often cause problems.  What may work for one
+	# person may not work for another.  To avoid a large influx of bugs
+	# relating to failed builds, we strip most CFLAGS out to ensure as few
+	# problems as possible.
+	strip-flags
+	strip-unsupported-flags
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# Lock glibc at -O2; we want to be conservative here.
+	# -fno-strict-aliasing is to work around #155906.
+	filter-flags '-O?'
+	append-flags -O2 -fno-strict-aliasing
+
+	filter-flags '-fstack-protector*'
+}
+
+want_tls() {
+	# Archs that can use TLS (Thread Local Storage)
+	case $(tc-arch) in
+		x86)
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
+			return 1
+		;;
+	esac
+	return 0
+}
+
+want__thread() {
+	want_tls || return 1
+
+	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
+	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
+
+	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
+
+	# only test gcc -- can't test linking yet
+	tc-has-tls -c ${CTARGET}
+	WANT__THREAD=$?
+
+	return ${WANT__THREAD}
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if just_headers ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+	local VAR=CFLAGS_${ABI}
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other.
+	: ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})}
+	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+	echo "${b}"
+}
+
+check_devpts() {
+	# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
+
+	# If merely building the binary package, then there's nothing to verify.
+	[[ ${MERGE_TYPE} == "buildonly" ]] && return
+
+	# Only sanity check when installing the native glibc.
+	[[ ${ROOT} != "/" ]] && return
+
+	# If they're opting in to the old suid code, then no need to check.
+	use suid && return
+
+	if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
+		eerror "In order to use glibc with USE=-suid, you must make sure that"
+		eerror "you have devpts mounted at /dev/pts with the gid=5 option."
+		eerror "Openrc should do this for you, so you should check /etc/fstab"
+		eerror "and make sure you do not have any invalid settings there."
+		die "mount & fix your /dev/pts settings"
+	fi
+}
+
+# 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.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_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
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Make sure devpts is mounted correctly for use w/out setuid pt_chown
+	check_devpts
+
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ ${ROOT} == "/" ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	# Users have had a chance to phase themselves, time to give em the boot
+	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
+		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
+		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
+		die "Lazy upgrader detected"
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
+		local entry
+		for entry in passwd group shadow; do
+			if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
+				eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
+				eerror "Please make sure you have 'files' entries for"
+				eerror "'passwd:', 'group:' and 'shadow:' databases."
+				eerror "For more details see:"
+				eerror "  https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
+				die "nsswitch.conf has no 'files' provider in '${entry}'."
+			fi
+		done
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers ; then
+		ebegin "Checking gcc for __thread support"
+		if ! eend $(want__thread ; echo $?) ; then
+			echo
+			eerror "Could not find a gcc that supports the __thread directive!"
+			eerror "Please update your binutils/gcc and try again."
+			die "No __thread support in gcc!"
+		fi
+
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
+			fi
+
+			ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+			if ! eend_KV ${build_kv} ${want_kv} ; then
+				echo
+				eerror "You need linux-headers of at least ${want_kv}!"
+				die "linux-headers version too low!"
+			fi
+		fi
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	# All the checks...
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+}
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
+# src_unpack
+
+src_unpack() {
+	# Consistency is not guaranteed between pkg_ and src_ ...
+	sanity_prechecks
+
+	use multilib && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	setup_env
+
+	if [[ -n ${EGIT_REPO_URI} ]] ; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+	fi
+
+	cd "${WORKDIR}" || die
+	unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
+}
+
+src_prepare() {
+	if ! use vanilla ; then
+		elog "Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}"
+	find . -name configure -exec touch {} +
+
+	eprefixify extra/locale/locale-gen
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}"
+}
+
+glibc_do_configure() {
+	# Glibc does not work with gold (for various reasons) #269274.
+	tc-ld-disable-gold
+
+	# CXX isnt handled by the multilib system, so if we dont unset here
+	# we accumulate crap across abis
+	unset CXX
+
+	einfo "Configuring glibc for nptl"
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="$(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS) ${CFLAGS}"
+
+	if is_crosscompile; then
+		# Assume worst-case bootstrap: glibc is buil first time
+		# when ${CTARGET}-g++ is not available yet. We avoid
+		# building auxiliary programs that require C++: bug #683074
+		# It should not affect final result.
+		export libc_cv_cxx_link_ok=no
+		# The line above has the same effect. We set CXX explicitly
+		# to make build logs less confusing.
+		export CXX=
+	fi
+	einfo " $(printf '%15s' 'Manual CXX:')   ${CXX}"
+
+	echo
+
+	local myconf=()
+
+	case ${CTARGET} in
+		m68k*)
+			# setjmp() is not compatible with stack protection:
+			# https://sourceware.org/PR24202
+			myconf+=( --enable-stack-protector=no )
+			;;
+		powerpc-*)
+			# Currently gcc on powerpc32 generates invalid code for
+			# __builtin_return_address(0) calls. Normally programs
+			# don't do that but malloc hooks in glibc do:
+			# https://gcc.gnu.org/PR81996
+			# https://bugs.gentoo.org/629054
+			myconf+=( --enable-stack-protector=no )
+			;;
+		*)
+			myconf+=( --enable-stack-protector=$(usex ssp all no) )
+			;;
+	esac
+	myconf+=( --enable-stackguard-randomization )
+
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
+	case ${CTARGET} in
+		x86_64-*) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		--sysconfdir="$(host_eprefix)/etc"
+		--localstatedir="$(host_eprefix)/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
+	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
+
+	# We take care of patching our binutils to use both hash styles,
+	# and many people like to force gnu hash style only, so disable
+	# this overriding check.  #347761
+	export libc_cv_hashstyle=no
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# ia64 static cross-compilers are a pita in so much that they
+	# can't produce static ELFs (as the libgcc.a is broken).  so
+	# disable building of the programs for those targets if it
+	# doesn't work.
+	# XXX: We could turn this into a compiler test, but ia64 is
+	# the only one that matters, so this should be fine for now.
+	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+		sed -i '1i+link-static = touch $@' config.make
+	fi
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then
+		echo 'main(){}' > "${T}"/test.c
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	case ${CTARGET} in
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	local myconf=()
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+do_src_compile() {
+	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+	emake check
+}
+
+do_src_test() {
+	local ret=0
+
+	glibc_src_test
+	: $(( ret |= $? ))
+
+	return ${ret}
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	# Give tests more time to complete.
+	export TIMEOUTFACTOR=5
+
+	foreach_abi do_src_test || die "tests failed"
+}
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local inplace=""
+
+	if [[ "${root}" == "--inplace-glibc" ]] ; then
+		inplace="--inplace-glibc"
+		root="$2"
+	fi
+
+	local locale_list="${root}/etc/locale.gen"
+
+	pushd "${ED}"/$(get_libdir)
+
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root}/usr/share/i18n/SUPPORTED"
+	fi
+
+	locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
+		--destdir "${root}"
+
+	popd
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}$(build_eprefix)$(alt_prefix)" install || die
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	if [[ -e ${ED}$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		ppc64   /lib64/ld64.so.1
+		# riscv
+		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
+		lp64    /lib/ld-linux-riscv64-lp64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+	cd "${WORKDIR}"/extra/locale
+	dosbin locale-gen
+	doman *.[0-8]
+	insinto /etc
+	doins locale.gen
+
+	# Make sure all the ABI's can find the locales and so we only
+	# have to generate one set
+	local a
+	keepdir /usr/$(get_libdir)/locale
+	for a in $(get_install_abis) ; do
+		if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
+			dosym ../$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
+		fi
+	done
+
+	# HACK: If we're building for riscv, we need to additionally make sure that
+	# we can find the locale archive afterwards
+	case ${CTARGET} in
+		riscv*)
+			if [[ ! -e ${ED}/usr/lib/locale ]] ; then
+				dosym ../$(get_libdir)/locale /usr/lib/locale
+			fi
+			;;
+		*) ;;
+	esac
+
+	cd "${S}"
+
+	# Install misc network config files
+	insinto /etc
+	doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf
+	doins "${WORKDIR}"/extra/etc/*.conf
+
+	if use nscd ; then
+		doinitd "$(prefixify_ro "${WORKDIR}"/extra/etc/nscd)"
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		systemd_dounit nscd/nscd.service
+		systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf
+	else
+		# Do this since extra/etc/*.conf above might have nscd.conf.
+		rm -f "${ED}"/etc/nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen --inplace-glibc "${ED}"
+		sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}$(build_eprefix)$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_strip() {
+	# gdb is lame and requires some debugging information to remain in
+	# libpthread, so we need to strip it by hand.  libthread_db makes no
+	# sense stripped as it is only used when debugging.
+	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
+	env \
+		-uRESTRICT \
+		CHOST=${CTARGET} \
+		STRIP_MASK="/*/{,tls/}${pthread}*" \
+		prepallstrip
+	# if user has stripping enabled and does not have split debug turned on,
+	# then leave the debugging sections in libpthread.
+	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
+		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
+	fi
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+	src_strip
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		./ld-*.so --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ ${ROOT} != "/" ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
+	fi
+
+	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
+		# Reload init ... if in a chroot or a diff init package, ignore
+		# errors from this step #253697
+		/sbin/telinit U 2>/dev/null
+
+		use compile-locales || run_locale_gen "${EROOT}"
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+}
diff --git a/sys-libs/glibc/glibc-2.30-r1.ebuild b/sys-libs/glibc/glibc-2.30-r1.ebuild
new file mode 100644
index 000000000000..2846ee6a61c4
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.30-r1.ebuild
@@ -0,0 +1,1482 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig usr-ldscript \
+	multilib systemd multiprocessing
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+RESTRICT="strip" # Strip ourself #46186
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+	inherit git-r3
+else
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS=""
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER=20180511
+
+# Gentoo patchset
+PATCH_VER=2
+
+SRC_URI+=" https://dev.gentoo.org/~slyfox/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+
+IUSE="audit caps cet compile-locales custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs suid systemtap test vanilla"
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+COMMON_DEPEND="
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-util/systemtap )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-misc/pax-utils-0.1.10
+	sys-devel/bison
+	!<sys-apps/sandbox-1.6
+	!<sys-apps/portage-2.1.2
+	!<sys-devel/bison-2.7
+	!<sys-devel/make-4
+	doc? ( sys-apps/texinfo )
+	test? ( >=net-dns/libidn2-2.0.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/gentoo-functions
+	!sys-kernel/ps3-sources
+	!sys-libs/nss-db
+"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	DEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.24
+		>=${CATEGORY}/gcc-6
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	DEPEND+="
+		>=sys-devel/binutils-2.24
+		>=sys-devel/gcc-6
+		virtual/os-headers
+	"
+	RDEPEND+="
+		>=net-dns/libidn2-2.0.5
+		vanilla? ( !sys-libs/timezone-data )
+	"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+#
+# Small helper functions
+#
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# This prefix is applicable to CHOST when building against this
+# glibc. It is baked into the library at configure time.
+host_eprefix() {
+	is_crosscompile || echo "${EPREFIX}"
+}
+
+# This prefix is applicable to CBUILD when building against this
+# glibc. It determines the destination path at install time.
+build_eprefix() {
+	is_crosscompile && echo "${EPREFIX}"
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	nonfatal emake -s glibc-test
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# Note: This test only matters when the x86 ABI is enabled, so we could
+			# optimize a bit and elide it.
+			# TODO: See cross-compile issues listed above for x86.
+			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				# Normally the target is x86_64-xxx, so turn that into the -march that
+				# gcc actually accepts. #528708
+				[[ ${t} == "x86_64" ]] && t="x86-64"
+				filter-flags '-march=*'
+				# ugly, ugly, ugly.  ugly.
+				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404"
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			# If the CHOST is the basic one (e.g. not sparcv9-xxx already),
+			# try to pick a better one so glibc can use cpu-specific .S files.
+			# We key off the CFLAGS to get a good value.  Also need to handle
+			# version skew.
+			# We can't force users to set their CHOST to their exact machine
+			# as many of these are not recognized by config.sub/gcc and such :(.
+			# Note: If the mcpu values don't scale, we might try probing CPP defines.
+			# Note: Should we factor in -Wa,-AvXXX flags too ?  Or -mvis/etc... ?
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if ver_test -ge 2.8 ; then
+						cpu="sparc64v2"
+					elif ver_test -ge 2.4 ; then
+						cpu="sparc64v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				niagara)
+					if ver_test -ge 2.4 ; then
+						cpu="sparc64v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparc64b"
+					;;
+				*)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					[[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if ver_test -ge 2.8 ; then
+						cpu="sparcv9v2"
+					elif ver_test -ge 2.4 ; then
+						cpu="sparcv9v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				niagara)
+					if ver_test -ge 2.4 ; then
+						cpu="sparcv9v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparcv9b"
+					;;
+				v9|ultrasparc)
+					cpu="sparcv9"
+					;;
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Allow users to explicitly avoid flag sanitization via
+	# USE=custom-cflags.
+	if ! use custom-cflags; then
+		# Over-zealous CFLAGS can often cause problems.  What may work for one
+		# person may not work for another.  To avoid a large influx of bugs
+		# relating to failed builds, we strip most CFLAGS out to ensure as few
+		# problems as possible.
+		strip-flags
+		# Lock glibc at -O2; we want to be conservative here.
+		filter-flags '-O?'
+		append-flags -O2
+	fi
+	strip-unsupported-flags
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# glibc's headers disallow -O0 and fail at build time:
+	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
+	replace-flags -O0 -O1
+
+	filter-flags '-fstack-protector*'
+}
+
+want_tls() {
+	# Archs that can use TLS (Thread Local Storage)
+	case $(tc-arch) in
+		x86)
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
+			return 1
+		;;
+	esac
+	return 0
+}
+
+want__thread() {
+	want_tls || return 1
+
+	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
+	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
+
+	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
+
+	# only test gcc -- can't test linking yet
+	tc-has-tls -c ${CTARGET}
+	WANT__THREAD=$?
+
+	return ${WANT__THREAD}
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if just_headers ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+	local VAR=CFLAGS_${ABI}
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other.
+	: ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})}
+	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+	echo "${b}"
+}
+
+check_devpts() {
+	# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
+
+	# If merely building the binary package, then there's nothing to verify.
+	[[ ${MERGE_TYPE} == "buildonly" ]] && return
+
+	# Only sanity check when installing the native glibc.
+	[[ ${ROOT} != "/" ]] && return
+
+	# If they're opting in to the old suid code, then no need to check.
+	use suid && return
+
+	if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
+		eerror "In order to use glibc with USE=-suid, you must make sure that"
+		eerror "you have devpts mounted at /dev/pts with the gid=5 option."
+		eerror "Openrc should do this for you, so you should check /etc/fstab"
+		eerror "and make sure you do not have any invalid settings there."
+		die "mount & fix your /dev/pts settings"
+	fi
+}
+
+# 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.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_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
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Make sure devpts is mounted correctly for use w/out setuid pt_chown
+	check_devpts
+
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ ${ROOT} == "/" ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	# Users have had a chance to phase themselves, time to give em the boot
+	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
+		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
+		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
+		die "Lazy upgrader detected"
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
+		local entry
+		for entry in passwd group shadow; do
+			if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
+				eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
+				eerror "Please make sure you have 'files' entries for"
+				eerror "'passwd:', 'group:' and 'shadow:' databases."
+				eerror "For more details see:"
+				eerror "  https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
+				die "nsswitch.conf has no 'files' provider in '${entry}'."
+			fi
+		done
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers ; then
+		ebegin "Checking gcc for __thread support"
+		if ! eend $(want__thread ; echo $?) ; then
+			echo
+			eerror "Could not find a gcc that supports the __thread directive!"
+			eerror "Please update your binutils/gcc and try again."
+			die "No __thread support in gcc!"
+		fi
+
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
+			fi
+
+			ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+			if ! eend_KV ${build_kv} ${want_kv} ; then
+				echo
+				eerror "You need linux-headers of at least ${want_kv}!"
+				die "linux-headers version too low!"
+			fi
+		fi
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	# All the checks...
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+}
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
+# src_unpack
+
+src_unpack() {
+	# Consistency is not guaranteed between pkg_ and src_ ...
+	sanity_prechecks
+
+	use multilib && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	setup_env
+
+	if [[ -n ${EGIT_REPO_URI} ]] ; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+	fi
+
+	cd "${WORKDIR}" || die
+	unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
+}
+
+src_prepare() {
+	if ! use vanilla ; then
+		elog "Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}"
+	find . -name configure -exec touch {} +
+
+	eprefixify extra/locale/locale-gen
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}"
+}
+
+glibc_do_configure() {
+	# Glibc does not work with gold (for various reasons) #269274.
+	tc-ld-disable-gold
+
+	# CXX isnt handled by the multilib system, so if we dont unset here
+	# we accumulate crap across abis
+	unset CXX
+
+	einfo "Configuring glibc for nptl"
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="$(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS) ${CFLAGS}"
+
+	if is_crosscompile; then
+		# Assume worst-case bootstrap: glibc is buil first time
+		# when ${CTARGET}-g++ is not available yet. We avoid
+		# building auxiliary programs that require C++: bug #683074
+		# It should not affect final result.
+		export libc_cv_cxx_link_ok=no
+		# The line above has the same effect. We set CXX explicitly
+		# to make build logs less confusing.
+		export CXX=
+	fi
+	einfo " $(printf '%15s' 'Manual CXX:')   ${CXX}"
+
+	echo
+
+	local myconf=()
+
+	case ${CTARGET} in
+		m68k*)
+			# setjmp() is not compatible with stack protection:
+			# https://sourceware.org/PR24202
+			myconf+=( --enable-stack-protector=no )
+			;;
+		powerpc-*)
+			# Currently gcc on powerpc32 generates invalid code for
+			# __builtin_return_address(0) calls. Normally programs
+			# don't do that but malloc hooks in glibc do:
+			# https://gcc.gnu.org/PR81996
+			# https://bugs.gentoo.org/629054
+			myconf+=( --enable-stack-protector=no )
+			;;
+		*)
+			myconf+=( --enable-stack-protector=$(usex ssp all no) )
+			;;
+	esac
+	myconf+=( --enable-stackguard-randomization )
+
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
+	case ${CTARGET} in
+		x86_64-*) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		--sysconfdir="$(host_eprefix)/etc"
+		--localstatedir="$(host_eprefix)/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
+	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
+
+	# We take care of patching our binutils to use both hash styles,
+	# and many people like to force gnu hash style only, so disable
+	# this overriding check.  #347761
+	export libc_cv_hashstyle=no
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# ia64 static cross-compilers are a pita in so much that they
+	# can't produce static ELFs (as the libgcc.a is broken).  so
+	# disable building of the programs for those targets if it
+	# doesn't work.
+	# XXX: We could turn this into a compiler test, but ia64 is
+	# the only one that matters, so this should be fine for now.
+	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+		sed -i '1i+link-static = touch $@' config.make
+	fi
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then
+		echo 'main(){}' > "${T}"/test.c
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	case ${CTARGET} in
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	local myconf=()
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+do_src_compile() {
+	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+	emake check
+}
+
+do_src_test() {
+	local ret=0
+
+	glibc_src_test
+	: $(( ret |= $? ))
+
+	return ${ret}
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	# Give tests more time to complete.
+	export TIMEOUTFACTOR=5
+
+	foreach_abi do_src_test || die "tests failed"
+}
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local inplace=""
+
+	if [[ "${root}" == "--inplace-glibc" ]] ; then
+		inplace="--inplace-glibc"
+		root="$2"
+	fi
+
+	local locale_list="${root}/etc/locale.gen"
+
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root}/usr/share/i18n/SUPPORTED"
+	fi
+
+	locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
+		--destdir "${root}"
+
+	popd >/dev/null
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}$(build_eprefix)$(alt_prefix)" install || die
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	if [[ -e ${ED}$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		ppc64   /lib64/ld64.so.1
+		# riscv
+		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
+		lp64    /lib/ld-linux-riscv64-lp64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+	cd "${WORKDIR}"/extra/locale
+	dosbin locale-gen
+	doman *.[0-8]
+	insinto /etc
+	doins locale.gen
+
+	# Make sure all the ABI's can find the locales and so we only
+	# have to generate one set
+	local a
+	keepdir /usr/$(get_libdir)/locale
+	for a in $(get_install_abis) ; do
+		if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
+			dosym ../$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
+		fi
+	done
+
+	# HACK: If we're building for riscv, we need to additionally make sure that
+	# we can find the locale archive afterwards
+	case ${CTARGET} in
+		riscv*)
+			if [[ ! -e ${ED}/usr/lib/locale ]] ; then
+				dosym ../$(get_libdir)/locale /usr/lib/locale
+			fi
+			;;
+		*) ;;
+	esac
+
+	cd "${S}"
+
+	# Install misc network config files
+	insinto /etc
+	doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf
+	doins "${WORKDIR}"/extra/etc/*.conf
+
+	if use nscd ; then
+		doinitd "$(prefixify_ro "${WORKDIR}"/extra/etc/nscd)"
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		systemd_dounit nscd/nscd.service
+		systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf
+	else
+		# Do this since extra/etc/*.conf above might have nscd.conf.
+		rm -f "${ED}"/etc/nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen --inplace-glibc "${ED}"
+		sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}$(build_eprefix)$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_strip() {
+	# gdb is lame and requires some debugging information to remain in
+	# libpthread, so we need to strip it by hand.  libthread_db makes no
+	# sense stripped as it is only used when debugging.
+	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
+	env \
+		-uRESTRICT \
+		CHOST=${CTARGET} \
+		STRIP_MASK="/*/{,tls/}${pthread}*" \
+		prepallstrip
+	# if user has stripping enabled and does not have split debug turned on,
+	# then leave the debugging sections in libpthread.
+	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
+		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
+	fi
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+
+	if ! use static-libs ; then
+		elog "Not installing static glibc libraries"
+		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
+	fi
+
+	src_strip
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		./ld-*.so --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ ${ROOT} != "/" ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
+	fi
+
+	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
+		use compile-locales || run_locale_gen "${EROOT}"
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+}
diff --git a/sys-libs/glibc/glibc-2.30.ebuild b/sys-libs/glibc/glibc-2.30.ebuild
index eafa9c84edb3..743f14c253d4 100644
--- a/sys-libs/glibc/glibc-2.30.ebuild
+++ b/sys-libs/glibc/glibc-2.30.ebuild
@@ -1462,10 +1462,6 @@ pkg_postinst() {
 	fi
 
 	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
-		# Reload init ... if in a chroot or a diff init package, ignore
-		# errors from this step #253697
-		/sbin/telinit U 2>/dev/null
-
 		use compile-locales || run_locale_gen "${EROOT}"
 	fi
 
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index e1955052ee36..cd66539a9220 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -29,7 +29,7 @@ RELEASE_VER=${PV}
 GCC_BOOTSTRAP_VER=20180511
 
 # Gentoo patchset
-PATCH_VER=13
+PATCH_VER=14
 
 SRC_URI+=" https://dev.gentoo.org/~slyfox/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
@@ -1449,10 +1449,6 @@ pkg_postinst() {
 	fi
 
 	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
-		# Reload init ... if in a chroot or a diff init package, ignore
-		# errors from this step #253697
-		/sbin/telinit U 2>/dev/null
-
 		use compile-locales || run_locale_gen "${EROOT}/"
 	fi
 
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 79fb15f0eb0f..0fbdcd9f3264 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -1,4 +1,3 @@
-AUX ldb-1.1.24-optional-python.patch 2746 BLAKE2B 429a98e0f27c6ae0d1738b2eaf4de8a850dd54f18525f3f2fce382990e378d608164dc0b6a6e8b950f4c512f6c67e7f8f5f6880f9ea43b2a7922eaca9f112596 SHA512 caf287ceaa980cebf667d0dcb76f302ff5ab7e1a13f0dca94dfc0da5e96f9cc5d31a2f0facd1d82a74a19507f090e1138216ad7a6d847323c56344c13735ddcc
 AUX ldb-1.1.27-optional_packages.patch 3596 BLAKE2B 0913225b0bb4a0918102d3eb399cf0f4eb690eb55483e24ade75d064e47d423714cdac00f816d8676e9f56e29f79f98c044cc50c9c42bd665b14311b1027708b SHA512 ddc567f926a82fd855ef1690ff14dd6995f3beec9cec3796377edf10d787f89bca7375c6990c29fc8a0dfd88a519f29bf331d8ecdc7a37a6f6e1de21780e4b4a
 AUX ldb-1.1.29-disable-python.patch 2294 BLAKE2B 3a9d7da3c6c82e849d2b0fad8bd4906203645eeee23d69088ff3dfc2ac86eb2c6b3826fecb6328343de6897ff52d7ca2ce1b72acb63c05f950059cb8ef514911 SHA512 f13ebcae2b4c1a844cad65729b31926249887d82ad6d295857c5402a07fd88e76150adce5b34e1a4dc059e4ba29356d60f7f7a8e24b8ae622f2a3477914d7fe1
 AUX ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch 701 BLAKE2B dd2398f9e1fa39bfc3de89928dd3b935fd6ee9db4bc2c4e381ba5672098ae9209b2d6e475fa2549a9cef2e3ce5e9a789557413fbdb1bbd68842cca89ce1e8094 SHA512 35ba295d94ab5ce767f39c4cd5eb48d57a6e4993977013ee6ae0d640f74b5437a4dff6f1d14dc44dbcdc25d4e51e5084b0e3216353b2af383d8f544993228170
@@ -7,30 +6,26 @@ AUX ldb-1.1.31-talloc-disable-python.patch 1706 BLAKE2B cc447f5077c82d7eb5846921
 AUX ldb-1.2.3-disable_python.patch 2632 BLAKE2B c46ac5265168b37e94730b3a8a30b49199fdc722492248a69eb23306761df5764667e5c2e1f09e97c06a7c2a7932a8cdd047fb2d9d8e2ba9cff4d21bee148b06 SHA512 3b32d478318ef37fd221b06f427f0efce943c6da9a0a58b92ad935657fc29105b1ab79f2c9d1e1fa24cd6c4e8b701e6d631cbd04b3ebed8adeee47c4510f89a8
 AUX ldb-1.4.0-optional_packages.patch 1662 BLAKE2B 3d6c8c31ad53b62a999934d1994475e502e83498df86ca590b560dc2bf34e6cce7b0896f2d747fadaf69da277b116f1cedbe27443f75e85206d482bd1df3dd15 SHA512 7e26631f93dbca355eaf08e32bbc95eeabdf196e75ba8cd0618ef8c772f17661e68e307d8742dabcde34ebe02aaf50c5ad966b77e862394f0683279babbdfb01
 AUX ldb-1.5.2-optional_packages.patch 1441 BLAKE2B 0b9413cd9690aae2b2eb26f097d2509c0bbe0fc59f81bab22add57ffe0c603a8fb0c9be038d06693dcbb1d3817d4ad97a5931120b18bd9783efaac599fe0ccbc SHA512 2f313c3377385279ca3da6db21d926df0559d971e1fd42f8cce57b4001078c3817f472b85088a1f3b0e5ddcdfbbfd943199485d6e4a00412f62c883c6ea04afd
-DIST ldb-1.1.26.tar.gz 1262660 BLAKE2B 66dcc38eb97fe4357d06b301ed1de5cf868adc5f33ea8341a7cbdd5be45c85c31cda58782a66daf9fcada9d873971fc29556f0c331794ede9fc2a7f592480f52 SHA512 484689c5b87f223820e3613c056de5528a87736baef7b884df506fc47a3412b35ba2ef8e85f62e2d3da803fdab6b37bb328d4347a20bfc8fef8ed557646b6bbe
 DIST ldb-1.1.29.tar.gz 1277551 BLAKE2B 449333d40073fd63d6d013ba0ae43fc3a0b8201948eabd440d164d182492002c1d92047d652105c2fb6a3e8383d4b75f45e38cc52efc5d9a0e2811113676203a SHA512 d37bbe84358e05d17483e2e963b8477da5ea351b855b454142c94af35f7987bede0f19faeaff17779efe04e3bb37c510437fcc59be99a17c826620fc25fd659c
 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.2.4.tar.gz 1346413 BLAKE2B 441cdf679ab4852e1c8d90ca8d9544d7983436c864cb3ea76b63f45177061c2763f9700b4be4be9ba53a4bcc9cec49b509dd39efb8f5f2171bc432641d1329c2 SHA512 093815cfa9e950299c4f09c58362136d72c439692f7d8670ecbf9cac49ecef6fd365f8fab5d39f41a4dd39e07f6c8d1a2616e843653d2fa0d7bdff346a118aa9
 DIST ldb-1.3.6.tar.gz 1374574 BLAKE2B 654f35eb25aeb373540ead7cb10da66c92970ea6b100631cb14bacf937fec64e09b19ed3e09a976406e3f8d6347c4e17144c0a0bff8795316559be45353edbf7 SHA512 8fcd72598e948c55adaa832d6ebcbc03b979281032cb900af4304c1c68ce9cc94a1e1d4729d0c2a0b83a618cab716749d851160005a0093cf8a178e6dbea298d
 DIST ldb-1.3.8.tar.gz 1375782 BLAKE2B dbca935e762af86b268308253615019b24af6727411e77947ceeadd3e0114c2ad2a14d4a4f1121bf58ccb080d44a8513d2094314b043604d885977a26e622c57 SHA512 06d1b4c2badbf0c27733a64f979c48af8b599747cef7cd7f5417cd55a76447e8f8987bd061694c5af63261fdb35433e3844122c14103d5cc8b4eaab1f4752541
-DIST ldb-1.4.6.tar.gz 1431798 BLAKE2B 748d6054af4b898fa475692a425d96541fa2c055ffdd4b8ca6635fea04d7b143b4e7301886f307300662140bc449a3ee3932801c7c5df10f6ba3ee5a10c7a46b SHA512 fb2be7842ecfda8788e8982831e34487f016814d1e8a757e93f8716019aaba4b9b7dd469e4ba11eb3990846fb55cdb2db2ec494eb7b0ff04f261d8309b1c98f4
 DIST ldb-1.4.7.tar.gz 1430560 BLAKE2B b6b9a12b6f17ffee8e9a47673786d1247310655ca87bb0280fb8ce04a69c52435721fe5e8ab1ce18406e28dfeef57fe30b3b3fc42a4951505f8772bf5e7553ce SHA512 e53bdd831d37b87b5adaf17f46b883f177f97541ad957d134dbfc196bc37749074df7c8cafb8e2993c6aae9bc150ae8d88daad56c26de9f62c5259c479da7016
 DIST ldb-1.5.4.tar.gz 1629123 BLAKE2B 3c71af079f2e5cb81e493d16d453c53bd0ee4c63720b0261ea6116244b2652ca581499c0b8c64949dccc95460aba7b4ef3afe7850563a830f3fb4b8753bdea2f SHA512 fc323e4283671c14d6dd4feb7e9ca943a63a166688077dbf3591f9d957cf821f9e739869842e15ca1ec4fd3764123d5afc6f4954b1af437bd1ec54df58366a22
 DIST ldb-1.5.5.tar.gz 1629070 BLAKE2B 374042c77c9ec7bd88ad1d97757f171ae831a630751fc06bf22190355c1448fa8c2327d308cdbe5b46ca21236738548d2c1041c3dfb428e1dfee8053edf90050 SHA512 562e08b3d6564d08fed80dc43ca299c38fbd958dbe27ed1400e5eb5c3df0f4c7b7eaf502b13eec5544b168f26c5e6537615f65e28dcaeb6473d2ff3c3c7a4e4b
-DIST ldb-1.6.2.tar.gz 1629794 BLAKE2B 5219479c773aa87c4bd6917e60b963df9cf3c481468ed020b4e9c4a175110ce80fd1c7a4ca4e28d99c972e0891287485261310eab1bbd7b8b138ea59f168ac8c SHA512 089dee2465efe0811ff745b52b15d2d7638b940112a06680706d5401231864859605ff0392245d4c815e9b85f5a4ba782fc61d8dba215cc8198e7d9a6ddd255e
 DIST ldb-1.6.3.tar.gz 1628668 BLAKE2B e9b6535eddf49496151e544f6879641c58a614f6de95463f7d0bf1953744953a5d55dde935d39b690d4c87e66914d8de0f0f5d4816a61fdecc81f8797584013e SHA512 a41b1fd2afa9a02dec37519f28e0e720b649c2a0aa6caebeb6697dbefdc6a055ef26500c5ccb0439b495d8c03218920b389fb9601d1cf5ca4d5046f192a5fefd
-EBUILD ldb-1.1.26.ebuild 2354 BLAKE2B d2842c0d9fab64092bdba589836f0e488ba3544bb4b74946c6aa881036dbcfba82ac94184ec04f3a12e752d065da61f3c1b2898b053dd260afec6cde14d2112d SHA512 195f61f5c6e120d159ec222105d2652b160a7a6c0aae1c6c97967a65cfca59acff8e895d121f375d3eefa7604e5b26fe84abc6136bf882ab6b100a838b44ee67
+DIST ldb-2.0.5.tar.gz 1669846 BLAKE2B d68046b385955c376118cb60e16939115332d88e8e67d157029397915c3e8f3d754abc9d93c64250ce990f7b82fb3947bdf5fba0f6f8bc457bc6dfd08e8bc534 SHA512 de9325f8bdd9ac782b3f8633444780f4aaa030e2c74c643220e845d9a779f8c8e174f0b9d9d8668de028cb832eb9d81965cb8e4471d90f9344dc48877a3abbe8
+DIST ldb-2.0.7.tar.gz 1674063 BLAKE2B e61f7bf4cfefcb5c1bf735c19a00027ce20ef393b613117e5637f7680ba7fcab1798744505b0db88e8bbdab41e0264e0fd1e643110ec47864de02ef315bd0dfd SHA512 0b1bd5970421c32bee1209179eac60682d7304aca597bca11dd477903f59b53a2fbc7d9e1717809e9a8e550564a9ca9139dd1127b9f4cefcc2437d7c8050985a
 EBUILD ldb-1.1.29-r1.ebuild 2553 BLAKE2B 6e77ff3e4104829ac2555d8d6101acd72fd1d911cd0655a56ca4d49dd9c17f3b216bcab97717a90da10bf34f53d992176e58e1deeba50a660a3b76ee8717a9b7 SHA512 006f2462061ed3a4d988fec903fbde1bd09e9e6af0aad823056149b7b3d1b9c38c9a4ac21e35b02585c722d478ea70b6af8e379f9fec9d161e3fa28d20301759
 EBUILD ldb-1.1.31.ebuild 2687 BLAKE2B e73862e80290279281942008ee500b877497cca22d3d8d31ea648f898e398fd780b595f6571e7f18bc51c9c83a573619472be9df14cd5cb516dd3c102c3b9be4 SHA512 bb16dc9c4a84b6c7174e0364237e7147138c90b1fc25f5635f923bfb6b2bf0871ebbab2e72f23522d6a7647e007c4fa5e7941611281040420c8850beda47f8c9
-EBUILD ldb-1.2.3.ebuild 2615 BLAKE2B a3ff83d0e194d99a08ba4a019ff2fab43b74656967d0d7ad2dcece072f15c3586516dce6a14dc2ab55b917c09b73651135a46907d65bfa1db179568777b722b0 SHA512 14a1cdb225b7e91ef6be3cad735b1abdae87330649e3e1db3ffc0fe8f98a54d66b8de17f5a9072307c1dcad3c3b99f57fd665f6008442782690ced25dc51a7ec
 EBUILD ldb-1.2.4.ebuild 2615 BLAKE2B 00c6367deafa557c937672d501cb815bab81a48fe2a754a5f7a7cde7d37df458707f5693348aa0980864f0de99cbfcde694700efddb2d3b292046a76b6536216 SHA512 7986afc96409a48acf6fa484bd441a00387c39ab3d1961ea1bbaf6550a74830ef47b7f41e274b2b1bb9c2dcf52947acd722f85f65b9b78fb00ff5f6cb53d0179
 EBUILD ldb-1.3.6.ebuild 2562 BLAKE2B f268d0fe7467c236f2b4c4ef82ca5d8c2b64f8b024e68a4b39e95494b79e427916aaf530e264ddd1a8c8fb72831bc81707b9c6b923ee2f57bbeae5d2d16638e8 SHA512 e3f7d92e8dd25c28100df928e5fcc9b6c2923ccadeed3ed3b3452d0b239caac93bc88eefc909695c9c8ffa590554b1798350b6301d1537167bc04a6f94746442
 EBUILD ldb-1.3.8.ebuild 2568 BLAKE2B 70a6e2fbe4a120c37e97f724b308b051f4ff6affbf5b5800491e0e21e5f1bfdd864b9e0822830d9b9846e40201abd9ff1298bc3874a2c6fc127f7145d9d0aaef SHA512 53d06ad156952198db0a10472a4a78c910fda0fe4e7a9caf1f5938be916a41f5e4f242e865f0fd5df72ceab084ae75687b813597338a9509a54c3ea4f8c1f428
-EBUILD ldb-1.4.6.ebuild 2662 BLAKE2B 0ac8736523b19c57bae4ce81f2bf49aa6f5a0afc9a4698c96bf5ed240feddb0323dc1214525aba6171582bfdabf988c55861150c78be0834c514a157adae4b4d SHA512 dddb70565ce98942ecbdffa9114effa9ba9547d9517f893ddfdd63498e1b0728fe9725a1f622b9580da4323b14f0a72c8e77e0014b94b54bf54c6ffce069eb07
 EBUILD ldb-1.4.7.ebuild 2662 BLAKE2B 0ac8736523b19c57bae4ce81f2bf49aa6f5a0afc9a4698c96bf5ed240feddb0323dc1214525aba6171582bfdabf988c55861150c78be0834c514a157adae4b4d SHA512 dddb70565ce98942ecbdffa9114effa9ba9547d9517f893ddfdd63498e1b0728fe9725a1f622b9580da4323b14f0a72c8e77e0014b94b54bf54c6ffce069eb07
 EBUILD ldb-1.5.4.ebuild 2670 BLAKE2B 92adb14f3d666618f7e47eac844db836fb3af68ddb4c979d8dc6fcaa092df30686447e153584cc6ff6f25274c2243fe00de14539ad438f82b425a8b890b11b1f SHA512 10ff985fb74cb70b1ac96882d13e2697dd1eddee2f4c60a54929d5188ed5c5cac28c6dc4e23dc37b357a8e5e757ea82be0b582bca716c34e50d8dfb096cad996
 EBUILD ldb-1.5.5.ebuild 2671 BLAKE2B fa05fba1b86166a83019bbf6d09595ab6210803d63e91718beab283106a0c21c6f9fee6bc399a8bb4ac9c4947c540e3cdfb8ce02a7dfa51e6acfb79c9def65f7 SHA512 9b39921c760d1c73a4fd3aa96fe94765728844b438b0ee9d6c42e87330667eb017f346b57e7679bcdd8daa2c91e0584502922792d45e5e81a547539fd14c0643
-EBUILD ldb-1.6.2.ebuild 2671 BLAKE2B fa05fba1b86166a83019bbf6d09595ab6210803d63e91718beab283106a0c21c6f9fee6bc399a8bb4ac9c4947c540e3cdfb8ce02a7dfa51e6acfb79c9def65f7 SHA512 9b39921c760d1c73a4fd3aa96fe94765728844b438b0ee9d6c42e87330667eb017f346b57e7679bcdd8daa2c91e0584502922792d45e5e81a547539fd14c0643
 EBUILD ldb-1.6.3.ebuild 2671 BLAKE2B fa05fba1b86166a83019bbf6d09595ab6210803d63e91718beab283106a0c21c6f9fee6bc399a8bb4ac9c4947c540e3cdfb8ce02a7dfa51e6acfb79c9def65f7 SHA512 9b39921c760d1c73a4fd3aa96fe94765728844b438b0ee9d6c42e87330667eb017f346b57e7679bcdd8daa2c91e0584502922792d45e5e81a547539fd14c0643
+EBUILD ldb-2.0.5.ebuild 2669 BLAKE2B 20600ca8a56727fd4984e107dfb28569dc850c79c0b719ffa95201d8932916c51e44bc5a0fc2084537c1c4ced2ec290c6f9a16a22f2cf8433fa6f82f862ed717 SHA512 7e75e5505fd1193e3b604b5ea52945342c9264a38b8d2b0d27031a6cf4e291c826ca1945e72cbd8bd600eeba8fa49deebc45a413818f0976e219b166506c9645
+EBUILD ldb-2.0.7.ebuild 2669 BLAKE2B c8ed063507dadd7d69098b2f830e46558ab2e527006c0bd6f96fd2ccc9906cc5f8f9a11bc05943ae21de08d37e16e8262729d25119923c98eb09c6b41b0a0bf7 SHA512 3976d24cdcdd1d6159c80d71ec4bddb25fcf20f2ef2ba5d67a17f4748ff147e1a2d09820417947be6cdf514b83b9129fcf2339a7b83aa28c0f8f0d64c3bb1f92
 MISC metadata.xml 445 BLAKE2B 959f0dc450ab8518bcbdbaf2802a3660c180e0eb95028e7b13fb0c0c0b47c8e68a81a1c970ca023ac441a1c43027b4b567c3643519b7c33ac6c0d1e11dcd0ff3 SHA512 b701ef9375735fb561c2e7c46ad13d30b62739fbf780e4343882898ecf13961e4f8381997109290e70a79993692aec2adc602bbc4bb9c881780349bebc75e4e1
diff --git a/sys-libs/ldb/files/ldb-1.1.24-optional-python.patch b/sys-libs/ldb/files/ldb-1.1.24-optional-python.patch
deleted file mode 100644
index d8dda63d44b7..000000000000
--- a/sys-libs/ldb/files/ldb-1.1.24-optional-python.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/wscript	2015-12-10 06:01:40.000000000 -0500
-+++ b/wscript	2016-01-06 15:05:57.013617848 -0500
-@@ -5,6 +5,7 @@
- 
- blddir = 'bin'
- 
-+import Logs
- import sys, os
- 
- # find the buildtools directory
-@@ -13,7 +14,7 @@
-     srcdir = srcdir + '/..'
- sys.path.insert(0, srcdir + '/buildtools/wafsamba')
- 
--import wafsamba, samba_dist, Utils
-+import wafsamba, samba_dist, Utils, Options
- 
- samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
-                         lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent
-@@ -28,8 +29,17 @@
-     opt.RECURSE('lib/tevent')
-     opt.RECURSE('lib/replace')
-     opt.tool_options('python') # options for disabling pyc or pyo compilation
-+    if opt.IN_LAUNCH_DIR():
-+        opt.add_option('--disable-python',
-+        help=("disable the pyldb modules"),
-+        action="store_true", dest='disable_python', default=False)
-+
- 
- def configure(conf):
-+    conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
-+
-+    conf.env.disable_python = getattr(Options.options, 'disable_python', False)
-+
-     conf.RECURSE('lib/tdb')
-     conf.RECURSE('lib/tevent')
- 
-@@ -44,16 +54,18 @@
-     conf.RECURSE('lib/replace')
-     conf.find_program('python', var='PYTHON')
-     conf.find_program('xsltproc', var='XSLTPROC')
--    conf.check_tool('python')
--    conf.check_python_version((2,4,2))
--    conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
-+
-+    if not conf.env.disable_python:
-+      conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,4,2))
-+      conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False)
-+      if not conf.env.HAVE_PYTHON_H:
-+        Logs.warn('Disabling pyldb-util as python devel libs not found')
-+        conf.env.disable_python = True
- 
-     # where does the default LIBDIR end up? in conf.env somewhere?
-     #
-     conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb')
- 
--    conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
--
-     if not conf.env.standalone_ldb:
-         if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=VERSION,
-                                      onlyif='talloc tdb tevent',
---- a/lib/talloc/wscript	2015-11-06 08:28:25.000000000 -0500
-+++ b/lib/talloc/wscript	2016-01-06 15:07:43.673478788 -0500
-@@ -48,7 +48,7 @@
-         if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION,
-                                      implied_deps='replace'):
-             conf.define('USING_SYSTEM_TALLOC', 1)
--        if conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
-+        if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
-                                      implied_deps='talloc replace'):
-             conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
- 
diff --git a/sys-libs/ldb/ldb-1.1.26.ebuild b/sys-libs/ldb/ldb-1.1.26.ebuild
deleted file mode 100644
index 57f127cf033a..000000000000
--- a/sys-libs/ldb/ldb-1.1.26.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit 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"
-
-RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.5[python,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.27[python(+),${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.8[python,${MULTILIB_USEDEP}]
-	net-nds/openldap
-	!!<net-fs/samba-3.6.0[ldb]
-	!!>=net-fs/samba-4.0.0[ldb]
-	${PYTHON_DEPS}
-	"
-
-DEPEND="dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.24-optional-python.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--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 )
-	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.2.3.ebuild b/sys-libs/ldb/ldb-1.2.3.ebuild
deleted file mode 100644
index 9d3ffe48109b..000000000000
--- a/sys-libs/ldb/ldb-1.2.3.ebuild
+++ /dev/null
@@ -1,103 +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 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 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.10[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.33[python(+)?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${MULTILIB_USEDEP}]
-	python? ( ${PYTHON_DEPS} )
-	ldap? ( net-nds/openldap )
-"
-
-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.1.31-optional_packages.patch
-	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
-	"${FILESDIR}"/${PN}-1.2.3-disable_python.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		--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.6.ebuild b/sys-libs/ldb/ldb-1.4.6.ebuild
deleted file mode 100644
index deef89dbbf01..000000000000
--- a/sys-libs/ldb/ldb-1.4.6.ebuild
+++ /dev/null
@@ -1,105 +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 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.6.2.ebuild b/sys-libs/ldb/ldb-1.6.2.ebuild
deleted file mode 100644
index 102b52891a13..000000000000
--- a/sys-libs/ldb/ldb-1.6.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-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.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.1.16[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.18[python?,${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.39[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.5.2-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-2.0.5.ebuild b/sys-libs/ldb/ldb-2.0.5.ebuild
new file mode 100644
index 000000000000..d6605ba80356
--- /dev/null
+++ b/sys-libs/ldb/ldb-2.0.5.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=( python3_{5,6,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.3[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.2.0[python?,${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.1[python?,${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.0[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.5.2-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-2.0.7.ebuild b/sys-libs/ldb/ldb-2.0.7.ebuild
new file mode 100644
index 000000000000..f9b1e7524441
--- /dev/null
+++ b/sys-libs/ldb/ldb-2.0.7.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=( python3_{5,6,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.3[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.2.0[python?,${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.2[python?,${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.0[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.5.2-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/libkudzu/Manifest b/sys-libs/libkudzu/Manifest
index acf1a65fb931..e89ef57b5e01 100644
--- a/sys-libs/libkudzu/Manifest
+++ b/sys-libs/libkudzu/Manifest
@@ -1,5 +1,5 @@
 AUX kudzu-1.2.57.1-sbusfix.patch 2217 BLAKE2B 27506402bd81f1a1be3e5213945dd6c6ca814085da9b7becf9cd2845242e17acf8a7936ce843eddc49f6e46590f09c9077d852fb21d15d051d9beeb6d57b4c4b SHA512 5b94734f63e1bb62cbfc349646c6dc4663e6ed2309e554e701943c35649193b14ea779a0c08e531ee931a94afdcc3e15529a8f410c658ea26d26659fe4147c71
 AUX kudzu-1.2.57.1-sparc-keyboard.patch 5389 BLAKE2B b49bd002dcadf6f79ee468fe222f150660908e983e8ffa44cbbc446c8162e3494ecb2b959e11f59e19d56437cc163199e2f4e773cdb8e5e6bc86aa7e6b39606b SHA512 6b89de1ede96e1a523880a33975488957e87cfc31cc0155014bb8152123cafb7ad793edcd9d228b9946bc6005b544e6fb908185f4ff901e623ce200435982708
 DIST kudzu-1.2.57.1.tar.gz 165855 BLAKE2B cd7a71a45a234701dd3e94b7378b37017a03cc78bf5230cc267c273fee4baf5338a5509572f0ba1bb23c8f585ec452c4a7f2d02159326c4133ad6abd80d36c3f SHA512 799e7cea840b7495fc007f4e34adc50fecd2fa7ceda2e2779e39639d0b93b10419bd44a0eb910b2e47024a49a4376330653a6fd96e5560c4828d55e18ab5d641
-EBUILD libkudzu-1.2.57.1.ebuild 1252 BLAKE2B 76ad04676691be22502cb0c8e5753c6e6fe906875ae199fa1e4c5281ca6dc84c5a399be153305b9badf7a9a45940cc709aa6fc79af724ffd434ba75a4fd72dc2 SHA512 ebed822a652dd36abeca95b8d397e4b181c2ba5719bc309847e678e57bd4448321b40251e518fe838619193cb71fc7acb2e4ee8f7a35ef0379e13628f84b0594
+EBUILD libkudzu-1.2.57.1.ebuild 1298 BLAKE2B fb2a64e5786715b2c9fa00c474dde55246f6c1f4a5ea2ccc2e90c7e8ea5a1a7027980b94ba55c8fe42d673f5e3ff8cd78d9a53ef72f99c67b2c1ec91553fd101 SHA512 b6be7a4022ad9e54b14db39ff0bfe9b2d97731212d1ccfde7b7db7f20ea82a8f0e92f7a44018cc4a7df7e2c9f401e4319a7e8521d00b0dbf11063470e548b7d8
 MISC metadata.xml 251 BLAKE2B 914f6ce3b97ef33310dd17c219739df48b081adb06e58d6a38a10cf4368eea50a9096c7b274077b6ca67d17ab9601b7c46995bbc89479d2842705dcc3ba75461 SHA512 2da7a6b2b1b7153b8803cc52201fa006313bf75a25f7d917f26eadd7a6426529e4b30a57c3c24cca20865d9dc4f3d56fdfa14b10254158bea2dfeb2c64fcc18c
diff --git a/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild b/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
index c7b44d76b7b2..c541f30d5fc9 100644
--- a/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
+++ b/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
@@ -27,6 +27,8 @@ RDEPEND="
 S=${WORKDIR}/kudzu-${PV}
 
 src_prepare() {
+	sed -i -e 's/-fpic/-fPIC/g' Makefile || die
+
 	epatch \
 		"${FILESDIR}"/kudzu-${PV}-sbusfix.patch \
 		"${FILESDIR}"/kudzu-${PV}-sparc-keyboard.patch
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 448577b25480..a668cdec05f0 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,6 +1,8 @@
+AUX 0001-libselinux-Use-Python-distutils-to-install-SELinux-p.patch 8172 BLAKE2B 3c301b206a809311fd7eb1eb35b3925c064731146e35702b7dab5b47f41cb2a61723db7243d67caf4ce317f3b4ca2d1a999b0533e0185c44b2892e72d8cf8bb0 SHA512 287e82b5888f973bc3545b1777d9baa33965fb2bb3810834871b6843b163d11e4dacde9a7361088f715f70947e9087de89331b0b35dec1e37bddd523e5a12c1b
 DIST libselinux-2.8.tar.gz 187759 BLAKE2B 1e0e1a5aa2230fd6080e921efe871e97fa9412176b72a0c9721f60c6190459e508644fa3370f3b5f513f088428844c7c615cda4567990ddee91c13e1ee88f9ed SHA512 2f15d08888fbef9b0cf7bf01893b513edc6738974e2d0eab7e3f79cef9be79cf966742b0d2693b5d2ec7defddb5f4d6c6f6280be9d4158ed41f7a18d50b9f019
 DIST libselinux-2.9.tar.gz 211546 BLAKE2B 5b06b922690e48924865c98ed34ebfc1ce5e30e78dbeaccb6b9c931a35bed113c030f8f8575084429fe13b91aeafc73abaa24fe609a17ba54c8472d783f6ac61 SHA512 727b211d09f374d45aa3fa4dec7fd5463dfdcf5aaa47f7fcaccee51fb74896c3aa1a6f0bac9cdd47ebe4929effff13f66f5f70447b27b783dca5f7b1576d30d0
 EBUILD libselinux-2.8-r1.ebuild 4185 BLAKE2B 215867146c515772f63c579ac9d3cb5e65b6493da8bcc5abf641aa1fb5e63d966c4c59ac0ed1e27c92834983bce308fa8c032f4da395c1857bbb317e0cce20ff SHA512 979454cea09f81e3b63ff62672deebb8b3dce3192ff27c6abb3382058182994c9de90e8660b421d1c671b87366588163f6b507de24b7ee5a8db4b78d6bc4a289
-EBUILD libselinux-2.9.ebuild 4168 BLAKE2B 3d6730ec0aca0a71dd050ab16975e94a2f7489f138374a9d8ad0f05f63d0b8dec5612ef4b60d56568d8635ba4d2220b7af184976a717aa28fc92967478e87830 SHA512 be33345efd9c20f91fd20acd8389fde057c0381dda2b1bd9bf15b0a17ec9868cfd932e5af87f5e4c69214450d016e8b1d6e3327bd200495e1d80cebfd5f106ac
+EBUILD libselinux-2.9-r1.ebuild 4257 BLAKE2B fdebf286772e557341bc0be3a893cfd3fc9ef4681f4a586f977fdf4dbcaafc0923ea3085a106cfccbf793ba11bd2ce06e88ff133477e93908268cfb02da342d5 SHA512 37e8ad4cb92d059841232e7bcfe6170b7ae3a11d1daba18df540604912e6211d899bfce577908540eba0e6b80bbf000a3121f91eca089b0b8f7070f5aaad3f7c
+EBUILD libselinux-2.9.ebuild 4166 BLAKE2B 820eebc2087a9731775a43fe7d8b34b692369e11419867a66e68ecd78a61608c8716d43ef390d8e4d39360dfb97e0e317e3ed24c7ab6a7bd2db4f5928c5ed59d SHA512 d575fa59d838a18e827d489c9a9212128e5f9c07eaa90ecaecc3a24565b467220893074149818f907b87611ca02595ac175bb98f8d30bc12616f56b08f7fb11e
 EBUILD libselinux-9999.ebuild 4170 BLAKE2B e23a62ba8d06085e9bc2b5ea42e84637a503b243332c78d0429d407a49a482dc966b669ff061dc9f58895efe54ec423f175312d9081c5ccbe2760cf0e529f434 SHA512 c100b626adec06317ecefe13954a846f4d8d7c537e48bd39c7945231d0f5041a9db63d543e341b2ef7fbe751049856c64a2f8a398d1ed6ea099b73a4935ed711
 MISC metadata.xml 676 BLAKE2B 530269a4d717ef305f4b15fe02c54e26f6acb9d73d6c7ac6ecd1f947712912f98120820a362e7cdc8e17019e88bc9c30162d54002bdea6facb2c41931e9c54f2 SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7
diff --git a/sys-libs/libselinux/files/0001-libselinux-Use-Python-distutils-to-install-SELinux-p.patch b/sys-libs/libselinux/files/0001-libselinux-Use-Python-distutils-to-install-SELinux-p.patch
new file mode 100644
index 000000000000..896876a00d6b
--- /dev/null
+++ b/sys-libs/libselinux/files/0001-libselinux-Use-Python-distutils-to-install-SELinux-p.patch
@@ -0,0 +1,205 @@
+From 2efa06857575e4118e91ca250b6b92da68b130d5 Mon Sep 17 00:00:00 2001
+From: Petr Lautrbach <plautrba@redhat.com>
+Date: Fri, 7 Jun 2019 17:35:44 +0200
+Subject: [PATCH] libselinux: Use Python distutils to install SELinux python
+ bindings
+
+Follow officially documented way how to build C extension modules using
+distutils - https://docs.python.org/3.8/extending/building.html#building
+
+Fixes:
+
+- selinux python module fails to load when it's built using SWIG-4.0:
+
+>>> import selinux
+Traceback (most recent call last):
+  File "<stdin>", line 1, in <module>
+  File "/usr/lib64/python3.7/site-packages/selinux/__init__.py", line 13, in <module>
+    from . import _selinux
+ImportError: cannot import name '_selinux' from 'selinux' (/usr/lib64/python3.7/site-packages/selinux/__init__.py)
+
+SWIG-4.0 changed (again?) its behavior so that it uses: from . import _selinux
+which looks for _selinux module in the same directory as where __init__.py is -
+$(PYLIBDIR)/site-packages/selinux. But _selinux module is installed into
+$(PYLIBDIR)/site-packages/ since a9604c30a5e2f ("libselinux: Change the location
+of _selinux.so").
+
+- audit2why python module fails to build with Python 3.8
+
+cc -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -DOVERRIDE_GETTID=0 -I../include -D_GNU_SOURCE -DDISABLE_RPM -DNO_ANDROID_BACKEND -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8  -Wl,-z,relro -Wl,--as-needed  -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -L. -shared -o python-3.8audit2why.so python-3.8audit2why.lo -lselinux -l:libsepol.a  -Wl,-soname,audit2why.so,--version-script=audit2why.map,-z,defs
+/usr/bin/ld: python-3.8audit2why.lo: in function `finish':
+/builddir/build/BUILD/libselinux-2.9/src/audit2why.c:166: undefined reference to `PyArg_ParseTuple'
+/usr/bin/ld: python-3.8audit2why.lo: in function `_Py_INCREF':
+/usr/include/python3.8/object.h:449: undefined reference to `_Py_NoneStruct'
+/usr/bin/ld: /usr/include/python3.8/object.h:449: undefined reference to `_Py_NoneStruct'
+/usr/bin/ld: python-3.8audit2why.lo: in function `check_booleans':
+/builddir/build/BUILD/libselinux-2.9/src/audit2why.c:84: undefined reference to `PyExc_RuntimeError'
+...
+
+It's related to the following Python change
+https://docs.python.org/dev/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
+
+Python distutils adds correct link options automatically.
+
+- selinux python module doesn't provide any Python metadata
+
+When selinux python module was built manually, it didn't provide any metadata.
+distutils takes care about that so that selinux Python module is visible for
+pip:
+
+$ pip3 list | grep selinux
+selinux              2.9
+
+Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
+---
+ libselinux/src/.gitignore |  2 +-
+ libselinux/src/Makefile   | 36 ++++++++----------------------------
+ libselinux/src/setup.py   | 24 ++++++++++++++++++++++++
+ 3 files changed, 33 insertions(+), 29 deletions(-)
+ create mode 100644 libselinux/src/setup.py
+
+diff --git libselinux/src/.gitignore libselinux/src/.gitignore
+index 4dcc3b3b..428afe5a 100644
+--- libselinux/src/.gitignore
++++ libselinux/src/.gitignore
+@@ -1,4 +1,4 @@
+ selinux.py
+-selinuxswig_wrap.c
++selinuxswig_python_wrap.c
+ selinuxswig_python_exception.i
+ selinuxswig_ruby_wrap.c
+diff --git libselinux/src/Makefile libselinux/src/Makefile
+index e9ed0383..2b1696a0 100644
+--- libselinux/src/Makefile
++++ libselinux/src/Makefile
+@@ -36,7 +36,7 @@ TARGET=libselinux.so
+ LIBPC=libselinux.pc
+ SWIGIF= selinuxswig_python.i selinuxswig_python_exception.i
+ SWIGRUBYIF= selinuxswig_ruby.i
+-SWIGCOUT= selinuxswig_wrap.c
++SWIGCOUT= selinuxswig_python_wrap.c
+ SWIGPYOUT= selinux.py
+ SWIGRUBYCOUT= selinuxswig_ruby_wrap.c
+ SWIGLOBJ:= $(patsubst %.c,$(PYPREFIX)%.lo,$(SWIGCOUT))
+@@ -55,7 +55,7 @@ ifeq ($(LIBSEPOLA),)
+         LDLIBS_LIBSEPOLA := -l:libsepol.a
+ endif
+ 
+-GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) selinuxswig_python_exception.i
++GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) $(SWIGCOUT) selinuxswig_python_exception.i
+ SRCS= $(filter-out $(GENERATED) audit2why.c, $(sort $(wildcard *.c)))
+ 
+ MAX_STACK_SIZE=32768
+@@ -125,25 +125,18 @@ DISABLE_FLAGS+= -DNO_ANDROID_BACKEND
+ SRCS:= $(filter-out label_backends_android.c, $(SRCS))
+ endif
+ 
+-SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ $(DISABLE_FLAGS)
+-
+ SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS)
+ 
+ all: $(LIBA) $(LIBSO) $(LIBPC)
+ 
+-pywrap: all $(SWIGFILES) $(AUDIT2WHYSO)
++pywrap: all selinuxswig_python_exception.i
++	CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext -I $(DESTDIR)$(INCLUDEDIR) -L $(DESTDIR)$(LIBDIR)
+ 
+ rubywrap: all $(SWIGRUBYSO)
+ 
+-$(SWIGLOBJ): $(SWIGCOUT)
+-	$(CC) $(CFLAGS) $(SWIG_CFLAGS) $(PYINC) -fPIC -DSHARED -c -o $@ $<
+-
+ $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)
+ 	$(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $<
+ 
+-$(SWIGSO): $(SWIGLOBJ)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $< -lselinux $(PYLIBS)
+-
+ $(SWIGRUBYSO): $(SWIGRUBYLOBJ)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(RUBYLIBS)
+ 
+@@ -161,29 +154,15 @@ $(LIBPC): $(LIBPC).in ../VERSION
+ selinuxswig_python_exception.i: ../include/selinux/selinux.h
+ 	bash -e exception.sh > $@ || (rm -f $@ ; false)
+ 
+-$(AUDIT2WHYLOBJ): audit2why.c
+-	$(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $<
+-
+-$(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) $(LIBSEPOLA)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(LDLIBS_LIBSEPOLA) $(PYLIBS) -Wl,-soname,audit2why.so,--version-script=audit2why.map,-z,defs
+-
+ %.o:  %.c policy.h
+ 	$(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $<
+ 
+ %.lo:  %.c policy.h
+ 	$(CC) $(CFLAGS) -fPIC -DSHARED -c -o $@ $<
+ 
+-$(SWIGCOUT): $(SWIGIF)
+-	$(SWIG) $<
+-
+-$(SWIGPYOUT): $(SWIGCOUT)
+-
+ $(SWIGRUBYCOUT): $(SWIGRUBYIF)
+ 	$(SWIGRUBY) $<
+ 
+-swigify: $(SWIGIF)
+-	$(SWIG) $<
+-
+ install: all 
+ 	test -d $(DESTDIR)$(LIBDIR) || install -m 755 -d $(DESTDIR)$(LIBDIR)
+ 	install -m 644 $(LIBA) $(DESTDIR)$(LIBDIR)
+@@ -194,10 +173,9 @@ install: all
+ 	ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET)
+ 
+ install-pywrap: pywrap
+-	test -d $(DESTDIR)$(PYTHONLIBDIR)/selinux || install -m 755 -d $(DESTDIR)$(PYTHONLIBDIR)/selinux
+-	install -m 755 $(SWIGSO) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT)
+-	install -m 755 $(AUDIT2WHYSO) $(DESTDIR)$(PYTHONLIBDIR)/selinux/audit2why$(PYCEXT)
++	$(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
+ 	install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py
++	ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT)
+ 
+ install-rubywrap: rubywrap
+ 	test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) 
+@@ -208,6 +186,8 @@ relabel:
+ 
+ clean-pywrap:
+ 	-rm -f $(SWIGLOBJ) $(SWIGSO) $(AUDIT2WHYLOBJ) $(AUDIT2WHYSO)
++	$(PYTHON) setup.py clean
++	-rm -rf build *~ \#* *pyc .#*
+ 
+ clean-rubywrap:
+ 	-rm -f $(SWIGRUBYLOBJ) $(SWIGRUBYSO)
+diff --git libselinux/src/setup.py libselinux/src/setup.py
+new file mode 100644
+index 00000000..4dc03f55
+--- /dev/null
++++ libselinux/src/setup.py
+@@ -0,0 +1,24 @@
++#!/usr/bin/python3
++
++from distutils.core import Extension, setup
++
++setup(
++    name="selinux",
++    version="2.9",
++    description="SELinux python 3 bindings",
++    author="SELinux Project",
++    author_email="selinux@vger.kernel.org",
++    ext_modules=[
++        Extension('selinux._selinux',
++                  sources=['selinuxswig_python.i'],
++                  include_dirs=['../include'],
++                  library_dirs=['.'],
++                  libraries=['selinux']),
++        Extension('selinux.audit2why',
++                  sources=['audit2why.c'],
++                  include_dirs=['../include'],
++                  library_dirs=['.'],
++                  libraries=['selinux'],
++                  extra_link_args=['-l:libsepol.a', '-Wl,--version-script=audit2why.map'])
++    ],
++)
+-- 
+2.21.0
+
diff --git a/sys-libs/libselinux/libselinux-2.9-r1.ebuild b/sys-libs/libselinux/libselinux-2.9-r1.ebuild
new file mode 100644
index 000000000000..0a941fc9a829
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.9-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+USE_RUBY="ruby24 ruby25"
+
+# No, I am not calling ruby-ng
+inherit multilib python-r1 toolchain-funcs multilib-minimal
+
+MY_P="${P//_/-}"
+SEPOL_VER="${PV}"
+MY_RELEASEDATE="20190315"
+
+DESCRIPTION="SELinux userland library"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby24 ruby_targets_ruby25"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
+	!pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
+	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+		ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+	)
+	elibc_musl? ( sys-libs/fts-standalone )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.9 )
+	ruby? ( >=dev-lang/swig-2.0.9 )"
+PATCHES=(
+	"${FILESDIR}/0001-libselinux-Use-Python-distutils-to-install-SELinux-p.patch"
+)
+
+src_prepare() {
+	default
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export AR CC PKG_CONFIG RANLIB
+
+	emake \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
+		USE_PCRE2="$(usex pcre2 y n)" \
+		FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+		all
+
+	if multilib_is_native_abi && use python; then
+		building() {
+			emake \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+				pywrap
+		}
+		python_foreach_impl building
+	fi
+
+	if multilib_is_native_abi && use ruby; then
+		building() {
+			einfo "Calling rubywrap for ${1}"
+			# Clean up .lo file to force rebuild
+			rm -f src/selinuxswig_ruby_wrap.lo || die
+			emake \
+				RUBY=${1} \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \
+				rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			building ${RUBYTARGET}
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		USE_PCRE2="$(usex pcre2 y n)" \
+		install
+
+	if multilib_is_native_abi && use python; then
+		installation() {
+			emake DESTDIR="${D}" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				install-pywrap
+			python_optimize # bug 531638
+		}
+		python_foreach_impl installation
+	fi
+
+	if multilib_is_native_abi && use ruby; then
+		installation() {
+			einfo "Calling install-rubywrap for ${1}"
+			# Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
+			rm src/selinuxswig_ruby_wrap.lo
+			emake DESTDIR="${D}" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				RUBY=${1} \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				install-rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			installation ${RUBYTARGET}
+		done
+	fi
+
+	use static-libs || rm "${D}"/usr/lib*/*.a || die
+}
+
+pkg_postinst() {
+	# Fix bug 473502
+	for POLTYPE in ${POLICY_TYPES};
+	do
+		mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
+		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
+		# Fix bug 516608
+		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
+			if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then
+				sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \
+				|| die "Failed to recompile contexts"
+			fi
+		done
+	done
+}
diff --git a/sys-libs/libselinux/libselinux-2.9.ebuild b/sys-libs/libselinux/libselinux-2.9.ebuild
index 8c1c79a1faec..01eb86ea822f 100644
--- a/sys-libs/libselinux/libselinux-2.9.ebuild
+++ b/sys-libs/libselinux/libselinux-2.9.ebuild
@@ -41,8 +41,8 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.9 )
-	ruby? ( >=dev-lang/swig-2.0.9 )"
+	python? ( <dev-lang/swig-4_pre )
+	ruby? ( <dev-lang/swig-4_pre )"
 
 src_prepare() {
 	eapply_user
diff --git a/sys-libs/libudev-compat/Manifest b/sys-libs/libudev-compat/Manifest
index 8eca20f65616..a8ad9d804aac 100644
--- a/sys-libs/libudev-compat/Manifest
+++ b/sys-libs/libudev-compat/Manifest
@@ -1,3 +1,3 @@
 AUX udev_old.c 895 BLAKE2B ccc45a3820556764fe16303c92e7e8d91cd79e9ba3cf488b05f505c867fdac43e9c40d26f263a63484ca14bf0e1eccaccb4618a5794f79babde97b22c211c9ba SHA512 4eafd908621857d0f4b415b7349d8ab992f40e5c2297270973462bd022b1b3e34cb365d4969e2f7801ad41c303f55649ea7bcfe9d8a32c997dd681bdc41a0237
 EBUILD libudev-compat-186-r1.ebuild 991 BLAKE2B 6a87f451a19c3eab44fd9b07a332315c74a56a67c722b0da420bc7a716eff310ba45a68f2c4f963adbcb76522bae47fc63de75d528c707e62137e653e6056a69 SHA512 8885e4fdfc78d54cc574a5ef42c41f5052391f5122d95308d8bb3dc47b5aaaf62e9d8ad61c5f34f4d0d59b1ecaebf738bb9b50f9da02615f4b38a1d6579b666a
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
+MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/sys-libs/libudev-compat/metadata.xml b/sys-libs/libudev-compat/metadata.xml
index 58f638b2ac3e..54be7ff7e5d6 100644
--- a/sys-libs/libudev-compat/metadata.xml
+++ b/sys-libs/libudev-compat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/libutempter/Manifest b/sys-libs/libutempter/Manifest
index 1efb45551440..b8d00694b690 100644
--- a/sys-libs/libutempter/Manifest
+++ b/sys-libs/libutempter/Manifest
@@ -1,3 +1,3 @@
 DIST libutempter-1.1.6.tar.bz2 15705 BLAKE2B 147bf96990913019c35565507eb635ba60ff5ed67134805e9f146f8f70882615ff96d7b2e52b40fb73110905afb87893a72bdec4327d879e5bdc2ec1d39ff9f0 SHA512 6ada410b981d157ae20b578de8ce20997ec0446ec6de6859549b080aa65976fc9900d211600dab09dc3d0d109daabad0994a648b093b8781b442ff26ca17fede
 EBUILD libutempter-1.1.6-r2.ebuild 1700 BLAKE2B 816a23d7d191ec7d86e700ca0c39c01994c21847fb088de981774ecd8860f4a8d63387ca47ecfa0d5972d34721cfc23fa947df15475287f4fc9777439248b2a0 SHA512 0989bf1f30a55aea2b98c2943c6d3d450bfccd7e2fb26dc38edce1dd46e5ad3cf5be53137ebbb4cd0cac7fec632a36b5c522c592e1973f455af48a6b23500b1b
-MISC metadata.xml 344 BLAKE2B 090f0e14a3a7fec427cbffa3abc85b6caf242a4f471358ba0614a23682a183a2ac93fd4d6695ab0059b0c7e5573d8429ea4600506050753e2ceca3c1217c394a SHA512 77307533cb1ddb71561957493f7062330c1748f62ab1381f369c5fb864f0e2a6608cfa5c86005b816c2a9a2523bb9a2264c807f1d6c31a5e2bb6177876b94ed9
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libutempter/metadata.xml b/sys-libs/libutempter/metadata.xml
index 910808b6e1f8..56c124413057 100644
--- a/sys-libs/libutempter/metadata.xml
+++ b/sys-libs/libutempter/metadata.xml
@@ -5,8 +5,4 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
 </pkgmetadata>
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 7396deb538fe..e56128c30532 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -3,13 +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.20.tar.gz 977827 BLAKE2B c8ce3cc1885e8103e1cf9d67183d89e5e222fd317158b20f25a8e1855a3cd5d16c79b4d95ff896fe7262f233141c3f3ca4dfc6a26a2373ab1d29a3c66b904e61 SHA512 d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d
-DIST musl-1.1.21.tar.gz 987341 BLAKE2B e080ee040ad5b7901f72d27a7e269ae4173eed8774510546abc8e53727a7443ed3590a802e6d750e2841313efb23e0c4097e3bf6232f4b84a777317e9b8260e7 SHA512 fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363
 DIST musl-1.1.22.tar.gz 987296 BLAKE2B 0326751e1d1bd5b909938159e709daa1ca0b2e51a3f3dc1fc80caa3e7fc0e9fe0fa64d6dfe7d870057fa8e97100a3a89bfe4449fd4c04fe3af17d0f105dfb9cd SHA512 08a40d722672504427238e71c9e52a723c6a14735abe9581d6d4bb3f86662d5d51a3f32a6aed6420c1f9680e22a3a554a9b87ae342635be971e2db49cc9fdb87
 DIST musl-1.1.23.tar.gz 1013779 BLAKE2B 0251604697f6e243d173c6a72d0a24ddbbce298f8e3a53d9d3a18d7f5ebf19f4e85584a494639c2470530b61c3189150bfaed3376e31acf4e1b2daa1c30860dc SHA512 a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09
-EBUILD musl-1.1.20-r1.ebuild 3131 BLAKE2B aa772ac4c028022eb5bebffeb746b8f9393376966f1b1feaa2d6c10d58d0cabf91bbafd9d70aa37fdf00e458141da01498d9e4c90d28c92538ea5f12ca0fe7ea SHA512 7312e4ed0a7d7de47e8ccaba7d5e752f8afac2d4c2e128500f93101e4cd02702ecf96acf0107e0359df8e96228fc276540541146cc4d062f5687ec26b10dc2ad
-EBUILD musl-1.1.21.ebuild 3050 BLAKE2B bec489a792cf8793c8a1ce14041f8210eb96a9159fb3a93ae52d810e878fb9a29e3a0fc5fcbc466a4756fdf73d45b4c28a154df2887067898430ef1f29a372d2 SHA512 40ca12c1c2e65b0f598f91ea0fbc2ddf374e7d6797d5fea19c5c33d4f68882da9e69f333a34e26bb54bef4741920f964e4a5941704d675963f8c10c36af79816
 EBUILD musl-1.1.22.ebuild 3049 BLAKE2B a48d0553b5442614e9a4c11b8d5daf6dad9b3f9dcfa0f1b8fa83afc34eed9ae7655b5928baf1b1f2e7ebdd34e76bb5380fd51b4c5ba4870b04ed89716b5484b2 SHA512 d41cd576d8907045c97f7221e294955faef2be38190f3664b4f90b99c4d48570c277b4d2cc3408e60d65a43c94d28dd43a618dff9ec6f4f73cf99b185dd33f14
-EBUILD musl-1.1.23.ebuild 3054 BLAKE2B a7fab7e588b3dc356ebcae705ba9eecd5656fdeb01a0fb76b7d7815642e33b356cb655cfefa98c4a471c0b2c7bc40073b8b36ecde8e331ae6585ba059a9b54eb SHA512 1251eab79c1aeb716912d350cef661fe67bc1c030f57e5922d7b534d03c2d0de3e8b3d2c61bedef6160fcceeefd62524d987d067de443cde048e598a5c8f0346
+EBUILD musl-1.1.23.ebuild 3052 BLAKE2B b4c1eefdbeb949335f599afe5962d77936e8fd1c8e311bfccf10929f1f0c5cd33750821db1be42ac3bed869e1d38c5ca258850fafa4518a700c607074ce348c0 SHA512 1deaed83a3ed4685116550fb7960141e7b3b12be4d8d985bc31ea82cc2dba075aad3267fca3cadfa1f2bf3033551025d7eab96ee8057fe2d4d56c01ad101a514
 EBUILD musl-9999.ebuild 3054 BLAKE2B a7fab7e588b3dc356ebcae705ba9eecd5656fdeb01a0fb76b7d7815642e33b356cb655cfefa98c4a471c0b2c7bc40073b8b36ecde8e331ae6585ba059a9b54eb SHA512 1251eab79c1aeb716912d350cef661fe67bc1c030f57e5922d7b534d03c2d0de3e8b3d2c61bedef6160fcceeefd62524d987d067de443cde048e598a5c8f0346
 MISC metadata.xml 453 BLAKE2B d7b2840a6b0bb2ede2124f22bde34a9f77ac258792a9fbf9d9e3f552a85d6ee539a98c8704729efb75dec627db62b33759fc0cfdfd01614abbc4960a163c5019 SHA512 5d8bebce119ed34a6a6b8cb07b3ce056db5efc91db80709fc8031c955b16e29965f3741f75e9afbe9f428bbac1e39e7c30278cd63f04479e3a1493b006195e0a
diff --git a/sys-libs/musl/musl-1.1.20-r1.ebuild b/sys-libs/musl/musl-1.1.20-r1.ebuild
deleted file mode 100644
index 13a18acc7023..000000000000
--- a/sys-libs/musl/musl-1.1.20-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 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_prepare() {
-	eapply "${FILESDIR}/${P}-fix-getaddrinfo.patch"
-	eapply_user
-}
-
-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
deleted file mode 100644
index 7ce0d5e96bc4..000000000000
--- a/sys-libs/musl/musl-1.1.21.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib 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.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
index 22f16fa8bfb0..455b845402c8 100644
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ b/sys-libs/musl/musl-1.1.23.ebuild
@@ -17,7 +17,7 @@ else
 	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"
+	KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc x86"
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 14067120dec7..5ccf5159a40d 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -49,5 +49,5 @@ EBUILD readline-5.2_p14.ebuild 1592 BLAKE2B e93c757eef8ee119694e15c59723e77caba2
 EBUILD readline-6.3_p8-r3.ebuild 4390 BLAKE2B 2121e1c1d5b045fa0ae14db133a80e4b5290e0ce37e8a5e0406c7245a1cb21455573d1468221def3830c4290c49b0cb1189c020727f0292c3c639e82d9f9e7ac SHA512 90c7643acf92343a49ede4f776c23e16c8070018d912a2872cd555a88ea9f56b6b207cc415f451d1a1341e2c64aa41a7b126938f5436c9e866b4c2a7ee3ae3bb
 EBUILD readline-7.0_p5.ebuild 4843 BLAKE2B 77f5eca75e11a2a2c3de59020a3030593670e402c2c58efe786507a3cbbda015f9714f187434d53eeb13b9d47a3fb8ae9f2a032c67272326e076fe56c44333cb SHA512 b116fd9a52913d615845f23ab5d37bca0b478b03779ed7aa229dc929565e47bcd757625f636088788721debd43171e133ea5f40e685918f6df519dd670e7db78
 EBUILD readline-8.0.ebuild 4812 BLAKE2B 34c5b37ae51086570439f333067a8276f2160c9ab7d2b6e1a4639164ce9d199b253689dd69beba935231b251729b8af36ee938c12bba03d1440ae463b8f8f128 SHA512 c1afbacd9c1297570a6c8a116faad750a3236e25b7ec30bf2861492e0c3578d2002e9995c11aa9cce86c88cb5567c89c6f9b6343fc4d57f98a5edf5bb8e83c3b
-EBUILD readline-8.0_p1.ebuild 4826 BLAKE2B 289b16beca550658cffc74a87847620fa05ce8c0c91098715f3f568e3e8fdb5c5382bc7867d289179d44734e56f237b4093b01e2149135a84fe82b30496ab788 SHA512 358225d5c31629f8f21ed7e47d05e1c73a3a5eda761e2da070fa52697bcbb4c23292606e2f546d4c9d6a307d3c54d5e814d84f574674e1d99861bf0d7c254744
+EBUILD readline-8.0_p1.ebuild 4840 BLAKE2B d0dddfb82d703dd45801ff9079861a0213cb11063fa7608a195eb30b97b4d7e635eef028ff8f17daf37716b701ce514284bb7422ee5720c2bbcd7203a42dec1d SHA512 a8079e8578f0cc5c7fc616a76d69135fb3e95965328cd38097398458f760f812612951381b143106612f316068871a941d5d0c1b3ec396fbc457f4fd902e79b4
 MISC metadata.xml 394 BLAKE2B e4fee9daaa3d2c66a9425c988c855768ddb74af714f9e259fad1e3a470ab10af041ec8ca82d106fd967317e555a492b35723d60fa913ffac200212af14ca5ae1 SHA512 e27930a59d80535721eda0d3c481b1d13a66915c6d9552d960c9ac788f3dcdb0ef3fc411803a36cc98441ebbb8a4e0c1086bc2bda01511549fbf2921a7017784
diff --git a/sys-libs/readline/readline-8.0_p1.ebuild b/sys-libs/readline/readline-8.0_p1.ebuild
index 7e6b19160ad4..b000aa3b553c 100644
--- a/sys-libs/readline/readline-8.0_p1.ebuild
+++ b/sys-libs/readline/readline-8.0_p1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib-minimal toolchain-funcs usr-ldscript
+inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index f68be02e5794..1be4a20c68a2 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,13 +1,11 @@
 DIST talloc-2.1.14.tar.gz 444589 BLAKE2B 3e47126eb41dc08befd22d7d41443dc5502d0bed239fa0fd32d63fe5374b4422165a7b364a8ad4a9f6e2d73b2db1dd4bada6aec3271c7b264f148d32974adcff SHA512 1fcc70bf283a4d9fb61faf1c57f80a9c158efbe996452740db9755e879ad72ee7bff6f6c9bed358e085c5c7f97c78800bb903161143af2202952b702141cc130
-DIST talloc-2.1.15.tar.gz 634092 BLAKE2B e7dfad56e0f6325f50a025e4c92bb1d3d2b1d93897ebef59103c3ca40065c2724a47bb2d1104238b368870d2a944aacabb5f686f20e55134fa83dd68b2e27f6f SHA512 41896f8877e9a52e70b9881c41667dc52d7c1b03c3b248020fd909b794a4c5a4addee3eb944aa80ecfa3b03e6e5e1f67a62b5f3a5dcdc412b3e975352057ff40
 DIST talloc-2.1.16.tar.gz 634906 BLAKE2B 5f9f2e5ad53944d9a7b5bdb990aa6ab65a3f0d90cd9e368c16b11192e90fdecc873d59618dbf3e15896ecf7bbbbb2deaac91df6e231ad6b22b8e7c14bd382956 SHA512 a1affe4ad2a4cf19d4494017e0e6e37cdf9f8e6a98839c9e4e5c02758a7da7ea0040518de9b26707a60eb0a0eab29f939c6823e5840096dc124d351993e05c74
-DIST talloc-2.1.5.tar.gz 436193 BLAKE2B 88a9ca32b6c6ae869e1761cb027847797e4ef3bb58dc618bae4b00f95637a0a8511f8704fa03ca1ca935127413a10d5297ba3843f0ea6992a97ce586f66cb705 SHA512 b938d67fcf4c6618f1149b4ec665957a604e3b07ee26e96ed36d94312db8f56b50498f69f9a07782f7f10a25047604e32b0d1786e1051d5f36b696c2755f8741
 DIST talloc-2.1.9.tar.gz 440335 BLAKE2B dde37d99b3cfb63209cdb832444f0416b7c05151cec537e220e13b1148d59b89fb712b4211e078b23f1c6608c8be6df6055d5f394b091ccdea3966c04cbb73be SHA512 a8f051bb15aba769ca286acad0946605d0053b0d149b4da2e6ecc333345f3e603d13a7f062452ae0f165615a4170ebdd7f41fc1b46c7a360000d5308bc304cbb
 DIST talloc-2.2.0.tar.gz 633467 BLAKE2B efdb53dbd4d43ce5d682faec01fb53d9c4b5dd7e97cf125e12661e7432bb968f577416cccbd8ee5003811bdd03dcc949b2e7a06312c497fb9eef54667209a653 SHA512 e762c6443ff2c0c35a9dbf7ac6e64a9182c04a218ad0f26fd67ac9620d9ae26d68b8dd2b21ff37e1df0e53748c84bece27890c5c4939eaeb61c502a698802388
+DIST talloc-2.3.0.tar.gz 642364 BLAKE2B 148ad3b478617c34c16c2ef454796a5dc918fc0a3e91bd965943ba66860b9b7df21fd2b69f5481f46a712a55a8f1a5e39db9f4ac779896d17d090290292b2ed6 SHA512 f0020d83520ea24711040c44600180fabae7b0e0668a961a66f5d4f77d89b09d799ddadf781ee2d044ad059b2d6a2e5232068fd77b300a8366592c0ce2289837
 EBUILD talloc-2.1.14.ebuild 2428 BLAKE2B 1c2e8e21042957a9d95ed3d70b60708e66764d488781aa7c022d5b85c1707983a3dd7053cfc747f41651c5351f423f2c5d3f350059b5b9abea39472eb1a44193 SHA512 742db47be8ccfbd887c9de07425df86de883b2d06c9a626404c4cf5e4b896f4e4c97451d8f47dbd5abee670df0e87bef880b3205a075773265a765a6dc3cca26
-EBUILD talloc-2.1.15.ebuild 2513 BLAKE2B e964cab897cdb8c81026453b5e93be852bfbc18bd905e1cc33d8fb6ce385cf9d29792f373da0158e54812a100e4c501d46115dedf59dc6f13be1792387fa279a SHA512 c3cfa0e4680e6d6c34d79e4e569f92fc719cbff4763ccaeafd31f495308a1f2849b0fcf4dde853089dbd7850236fccf164d91d647cccadf07dd620d164298400
 EBUILD talloc-2.1.16.ebuild 2513 BLAKE2B e964cab897cdb8c81026453b5e93be852bfbc18bd905e1cc33d8fb6ce385cf9d29792f373da0158e54812a100e4c501d46115dedf59dc6f13be1792387fa279a SHA512 c3cfa0e4680e6d6c34d79e4e569f92fc719cbff4763ccaeafd31f495308a1f2849b0fcf4dde853089dbd7850236fccf164d91d647cccadf07dd620d164298400
-EBUILD talloc-2.1.5.ebuild 2282 BLAKE2B 9e895c62d6c90cf1556167492fdf5b3b4c08c138d7ee587ab8bedbeca5b5d01058022ed1c3eefc501dfb1a73bfb08757c6fdd199093f23be56f27c6ec44cb46e SHA512 8fbcffaa4ed36ae6dc507344f67dccbcf971baafdc71bde8b374ee60db36d7f5798a3278f62454bc15bee84f0505b336272b2823cd3002a74d185cefb5037806
 EBUILD talloc-2.1.9.ebuild 2464 BLAKE2B 45c4b0941d72cca82bc5b1ed376cdc55268b064ea5de412e19aff23c7c230b00997ed8673637025a4377283de06646e02bcd5df1047018a493f8ba10d4a42eb5 SHA512 2cfcbe1828a508e6e0c4ea0136f1896e7767c2e8a7493c28c269cfe7ce52e24c97e238946ded2aafbc43a36520010bd7351e5b98a693ca411d0dd6d686337138
 EBUILD talloc-2.2.0.ebuild 2577 BLAKE2B 497e92e4cfb306e9c6d3058bd8069e0b1f855bb0b672a717c607e31b939b55964b51a030a0f2fbf5e2a9af931adb3ddbde3e80ec2f58c27d07d92fefdcc152f9 SHA512 82e354452f3d80cd8be969d12e14509f37343708ca573ac8957cc4c9538e0477a397693351d2c9c9490644ae8d722f19602032c1fbcc8de11ddd0f3383533c3b
+EBUILD talloc-2.3.0.ebuild 2578 BLAKE2B 394e9c02640c54af327edebcda7afb7ff2c33257156975974f5403982b7d987d00f5c8e58413b0cad39bf5e43167a42e604167b92955960a0f8f6ec124394117 SHA512 41bcc9d45cbd3125957816f6e5fa5ff57b6cb73aeb66a084cb70746b985b330e2c221b6e8d66e1d0dc2c4526e62f0f63237cb6953331dee8c205e61c7b7a22a5
 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
deleted file mode 100644
index 077f0c05371a..000000000000
--- a/sys-libs/talloc/talloc-2.1.15.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit waf-utils python-single-r1 multilib multilib-minimal
-
-DESCRIPTION="Samba talloc library"
-HOMEPAGE="https://talloc.samba.org/"
-SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3+ LGPL-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 ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="compat +python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	!!<sys-libs/talloc-2.0.5"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-libs/libxslt
-	${PYTHON_DEPS}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# python goes only for native
-	/usr/include/pytalloc.h
-)
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# what would you expect of waf? i won't even waste time trying.
-	multilib_copy_sources
-}
-
-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[@]}"
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# waf is stupid, and no, we can't fix the build-system, since it's provided
-	# as a brilliant binary blob thats decompressed on the fly
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-			"${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
-		if use python ; then
-			install_name_tool \
-				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
-			install_name_tool \
-				-change "${S}/bin/default/libtalloc.dylib" \
-					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
-			install_name_tool \
-				-change "${S}/bin/default/libtalloc.dylib" \
-					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${D}"$(python_get_sitedir)/talloc.bundle || die
-		fi
-	fi
-}
diff --git a/sys-libs/talloc/talloc-2.1.5.ebuild b/sys-libs/talloc/talloc-2.1.5.ebuild
deleted file mode 100644
index b98d2dfa5797..000000000000
--- a/sys-libs/talloc/talloc-2.1.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit waf-utils python-single-r1 multilib multilib-minimal
-
-DESCRIPTION="Samba talloc library"
-HOMEPAGE="https://talloc.samba.org/"
-SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3+ LGPL-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 ~x64-macos ~sparc-solaris"
-IUSE="compat +python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	!!<sys-libs/talloc-2.0.5"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-libs/libxslt
-	${PYTHON_DEPS}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# python goes only for native
-	/usr/include/pytalloc.h
-)
-
-src_prepare() {
-	# what would you expect of waf? i won't even waste time trying.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local extra_opts=()
-
-	use compat && extra_opts+=( --enable-talloc-compat1 )
-	if ! multilib_is_native_abi || ! use python; then
-		extra_opts+=( --disable-python )
-	fi
-
-	waf-utils_src_configure \
-		"${extra_opts[@]}"
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# waf is stupid, and no, we can't fix the build-system, since it's provided
-	# as a brilliant binary blob thats decompressed on the fly
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-			"${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
-		if use python ; then
-			install_name_tool \
-				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
-			install_name_tool \
-				-change "${S}/bin/default/libtalloc.dylib" \
-					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
-			install_name_tool \
-				-change "${S}/bin/default/libtalloc.dylib" \
-					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
-				"${D}"$(python_get_sitedir)/talloc.bundle || die
-		fi
-	fi
-}
diff --git a/sys-libs/talloc/talloc-2.3.0.ebuild b/sys-libs/talloc/talloc-2.3.0.ebuild
new file mode 100644
index 000000000000..320f1bbb31d1
--- /dev/null
+++ b/sys-libs/talloc/talloc-2.3.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit waf-utils python-single-r1 multilib multilib-minimal
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="https://talloc.samba.org/"
+SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3+ LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="compat +python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="!elibc_FreeBSD? (
+			!elibc_SunOS? (
+				!elibc_Darwin? (
+					dev-libs/libbsd[${MULTILIB_USEDEP}]
+				)
+			)
+		)
+	python? ( ${PYTHON_DEPS} )
+	!!<sys-libs/talloc-2.0.5"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-libs/libxslt
+	${PYTHON_DEPS}"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# python goes only for native
+	/usr/include/pytalloc.h
+)
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# what would you expect of waf? i won't even waste time trying.
+	multilib_copy_sources
+}
+
+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[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# waf is stupid, and no, we can't fix the build-system, since it's provided
+	# as a brilliant binary blob thats decompressed on the fly
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+			"${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
+		if use python ; then
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+			install_name_tool \
+				-change "${S}/bin/default/libtalloc.dylib" \
+					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+			install_name_tool \
+				-change "${S}/bin/default/libtalloc.dylib" \
+					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${D}"$(python_get_sitedir)/talloc.bundle || die
+		fi
+	fi
+}
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index 5ffdf41af107..33aff7b83f23 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -1,13 +1,11 @@
 DIST tdb-1.3.13.tar.gz 498002 BLAKE2B bf29b535acf3838942820a7dc841f635c457999d1ab7456bc598d73c79404dea9ab397eec1725d739bdc9b4a46b6b0ad068ad36d0e7247afccb795d410b15b06 SHA512 d12382a2f75e56d62d151df3390b3ae41c7502d67582812ec6da30913b13feb7ee98572ab5ad5b5ed3bceb41666c3154855727cf5ce249ef583c033819c05f0f
 DIST tdb-1.3.16.tar.gz 504330 BLAKE2B 686b6b3d026094a0219f2c5d76f7258cf2f96538f614fa9078ca00368ad64c4e93f2e184c98f3d6f480fec909d94105fdf527d96f3b4ea291d81bb63420d2a99 SHA512 7b17852986e48a32f3f8f303dd2a26503a69fcf7849f22f51483334c9abda9f189b521679e51b4ee5a80197a8f304a084dde0f56d92cfe953d3a4ede557526d2
-DIST tdb-1.3.17.tar.gz 697224 BLAKE2B 6231c48924a2c164a6f55fc5cea0ce284fc5a34519e3cf26709322539118ed3dcdf21ecdeeb1a958a47c7502a625e66695f452d858a865965ce4fa60d65c55cd SHA512 ef25dad520a12d75e541802a46e418fe61ac691126600f24158cd5b95091b4c536ffc4d4aff6608cca087291fde0b86b44ff7b1a7837d816cd534e9688c39eff
 DIST tdb-1.3.18.tar.gz 697970 BLAKE2B a6dff8dbe444ce35f6470dae7da1b6719052fb2030fd5526157c67374b0f54fb815c8f799060ea2a811e85ce208f626f18a48df9169e3f45d3f92998246b81cd SHA512 9b856b2a5b2d852ff0048ba7b1700ea46b8dad5d4e94027472fdce9f1db4b5afba9aec127b7a4c2a38d4722c8e0ea78c1734d102fa134ac802eace6b24358034
-DIST tdb-1.3.8.tar.gz 494106 BLAKE2B 3ac4418b642472859c37c20477ffcc255be6e435b84f59ee634fb5b80caa38aadbcc761fd2daf7c797f9d9a120dcf6e597b31306f8c67d3e890570dd94e4263f SHA512 9a7040206bbaae419a296714fe14fcbd3b67c0cef2b0f33563d52336aac2fe814049f5136a148fb049a273bb36fe81e3d777df58869c93f45d6e42b4adf9970b
 DIST tdb-1.4.0.tar.gz 696994 BLAKE2B f1dc29d3a66bd898f0e69f195879aea56235c1b6f542c532b4335d87482a5a2d8a8bc9bd5b463a0a110431535a2b0ccebb779449536696e0b5aa7ea5f3bce02c SHA512 3c5e17f8011e61e855a745dbff18ba9f778534f34e1538a68c8854d8d1022494bcc3bf7a19f2b79c478e091b1b6b183723fe27b935c4cc6d058b6b147b6a325e
+DIST tdb-1.4.2.tar.gz 706236 BLAKE2B 5ec8938f2e62c146c73d8ef01dd73bc44f38df2ea65b9cd62694bfc532315ab8b0594975e5edfccd84f3ad504dbfc6eb08be96d9d0e5b679f2613c2f69a5f58b SHA512 1d1f83e1b79cc6ea2b5cbc755de4a370fb95ef0f592f3bd2b6d23b1be18555cd417a9254fdf276dc6bd7f3368af82a4569c1f1cdde13d98405a5d38f1291d832
 EBUILD tdb-1.3.13.ebuild 1391 BLAKE2B 4be42a42cdd19e1d7dd1daae48a4267deb895ef0063d17f8676be06cb107215bfcc8623096e3b3e27d100723c58941f24c8d53c4b377f14b7e39592c5b6ffe69 SHA512 313984b1ffbdd4a200b5de2af741d4fd11e3bf31f9410776e704b5d3bbf4bbc36fe68fb32d2fd713967d74668f3f92eed5b0754780e319232e117cb18d611d1e
 EBUILD tdb-1.3.16.ebuild 1387 BLAKE2B 850b09c126d0fb37c712c0644d5625710a2a8e50d6afbe42cd7bda39bef3b370c5f75ab6f49c16ed561b0eaa20d644b846d362b8dd39919b95f470c8bca8b11c SHA512 d949fe01f13419c886e20b323dc42591ebc0fe83792f893d69f851451c9c59defae060187c72a0853975268f61aeb7786ad418b4d7ef7aab8b5bda3c5718b097
-EBUILD tdb-1.3.17.ebuild 1415 BLAKE2B 6d8e4445727e2fc2cdb1fecc26d3812a6597bb4653d3f0d644d598c55ee259783c21b4eb219634b109f3c8ad47faf61c29a54e016daa7d31ee33a800166202f7 SHA512 cd39f0acdf6398778682ece69c604a91560a0145cb3a4048791df21987c635489cb1698d96e8f12954dcd3e5549edb6ee2f6df9b0f4722c79a469ccb91877693
 EBUILD tdb-1.3.18.ebuild 1415 BLAKE2B 6d8e4445727e2fc2cdb1fecc26d3812a6597bb4653d3f0d644d598c55ee259783c21b4eb219634b109f3c8ad47faf61c29a54e016daa7d31ee33a800166202f7 SHA512 cd39f0acdf6398778682ece69c604a91560a0145cb3a4048791df21987c635489cb1698d96e8f12954dcd3e5549edb6ee2f6df9b0f4722c79a469ccb91877693
-EBUILD tdb-1.3.8.ebuild 1388 BLAKE2B 0367256f62c3f53f3e48ca2368290308a5aa08ab3868ac865364aa7c3d65395c2e3afe7f865797e41559fd76b77d310b5ed983ba87cb7b78ab87101f12dca16a SHA512 205a7f0fd792057f9c6777b3efc43e6f5afbc5f0a6a33613353eaa7398fd43a12e471952128abfe05df7523b45327e5cea8c42c211d3700091685bd4f900b5cb
 EBUILD tdb-1.4.0.ebuild 1414 BLAKE2B ea602298422a15bb79a67d5306994aaf621f79e82e21bbe8ae8ac166b58c6ab18df90d5284ba67bffd65c9c291dfb585c54829db36eb533056a8cfc4aed2438c SHA512 81488f28112855b8c341b9331b95f2c63f19bc7ceb7541640682b404e129b70067dba293461ff5425d0d5a343cc155949b21f0409500ec2e9f71976775f38785
+EBUILD tdb-1.4.2.ebuild 1415 BLAKE2B 6d8e4445727e2fc2cdb1fecc26d3812a6597bb4653d3f0d644d598c55ee259783c21b4eb219634b109f3c8ad47faf61c29a54e016daa7d31ee33a800166202f7 SHA512 cd39f0acdf6398778682ece69c604a91560a0145cb3a4048791df21987c635489cb1698d96e8f12954dcd3e5549edb6ee2f6df9b0f4722c79a469ccb91877693
 MISC metadata.xml 356 BLAKE2B 89cee65fc3e653bd568f34339d7d5e4ca0486ea124b175c88a966dde42a4128789669f2e0179e8d3ee2e4eb3df90f9de95441c3f2d61f3bdf47c1d87c95e1248 SHA512 59095952e57315232ef95494f2c30f520f13538f279df25f17a923a836194c4df78e11a03ff6fab814c1db1fe5a81cae2cf20988d77ef30e0c0d47f9a74f01cb
diff --git a/sys-libs/tdb/tdb-1.3.8.ebuild b/sys-libs/tdb/tdb-1.3.8.ebuild
deleted file mode 100644
index 0f88e563fdde..000000000000
--- a/sys-libs/tdb/tdb-1.3.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit waf-utils multilib-minimal python-single-r1 eutils
-
-DESCRIPTION="A simple database API"
-HOMEPAGE="https://tdb.samba.org/"
-SRC_URI="https://www.samba.org/ftp/tdb/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.2"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-src_prepare() {
-	python_fix_shebang .
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local extra_opts=()
-	if ! multilib_is_native_abi || ! use python; then
-		extra_opts+=( --disable-python )
-	fi
-
-	waf-utils_src_configure \
-		"${extra_opts[@]}"
-}
-
-multilib_src_compile() {
-	# need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
-	unset MAKEOPTS
-	waf-utils_src_compile
-}
-
-multilib_src_test() {
-	# the default src_test runs 'make test' and 'make check', letting
-	# the tests fail occasionally (reason: unknown)
-	emake check
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
diff --git a/sys-libs/tdb/tdb-1.3.17.ebuild b/sys-libs/tdb/tdb-1.4.2.ebuild
index 8e8d3ce12a4b..8e8d3ce12a4b 100644
--- a/sys-libs/tdb/tdb-1.3.17.ebuild
+++ b/sys-libs/tdb/tdb-1.4.2.ebuild
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 63cacb4e7916..473066b67926 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -6,5 +6,6 @@ DIST tzdata2019a.tar.gz 378961 BLAKE2B f8ab67f1fac34ab81fa9995cd70399728e6755303
 DIST tzdata2019b.tar.gz 384667 BLAKE2B c045d137cbb09e1109916dfdb1265ceb560d589ded9b05aa0cfe75f5fcb19057ded4d4f12f47c895020ed02bc4138de995eadac497eb3663579b094164d7e3ad SHA512 c0104078d994e501d80a41bea31364b1390a75c2fbf42968a8343a090e2ac2eddbc58770ca470b192ea19dec89fcc634141a1de703ea2ffa0325176a64afe1fc
 EBUILD timezone-data-2018i.ebuild 5143 BLAKE2B 80f02bc5a5f5dc1c9bb7d2cb715ac12c485c9d921767f77b49eddb08ce99e94134b9a0fc9eb5117622674bcac50c8ba97a3e9bb146acc368cb9c537e101fb7eb SHA512 29975f74113f5f1bac6773627d86d40b0ce1b2446f7eede184dff32d6c36f730e92d8fc8fbe97c94ce4b11e7760477c1ea340c7eb233522ccbb57f421678d12f
 EBUILD timezone-data-2019a.ebuild 5153 BLAKE2B a2ea08d19dbccfd1ae9b46d0c10fc6a41c2007a6a30c6a1d4eecb04f0ca79944be7fa6419fb23ab7fdaafd3ecd78209f8dd366bd7a6d987cdbadb734ee8ef468 SHA512 3337a58a66295785d1708c0121c60785d856f13d05da120e1963fa7fd08dec0e0815b998e9693810cb600f594db55cfd27955403e6123d5c8bfb9bee6b914b0d
-EBUILD timezone-data-2019b-r1.ebuild 5173 BLAKE2B ba837151c0ca678a826f03f21a63a32c50201022199031babfa563e364960e93259c807c1c48b246d8a932e5fb99276b8c8efa72f342da503ba79ece05a407e1 SHA512 75e0bb2299d4e0d44c7280e57ee3a6750f25d6732c2f890dcb901d9a55e3fb9f24852d5c89595db64e42d8525aaa38d35a12bcdd63a2fcbaf4e2fbc04df43d1e
+EBUILD timezone-data-2019b-r1.ebuild 5163 BLAKE2B 8717237ecf1b5e347d62f0745ba634615b7ac8c89be2e8f05e837dce1662393b338c5b7a63a1141202981bc484dc9d584ab9a127ba07f22eb7f57927927403b1 SHA512 5cdac6dd35d855edda5c42d107bca78a585e0333ad86904c49e2d3461579a0b2b89ebf93166106fa969ecd2c4d8418ca2e47e56c96e44fd77ded8247b49b2a32
+EBUILD timezone-data-2019b-r2.ebuild 5169 BLAKE2B e24c5e7f08e6ca0e8677ec49c0813dfc6ec040f696e6482bd8ba17fc6d4266faaa8e9d7dc77a7408f901fed050fad4bcdab496413209c38d6b965cf21e6acd1a SHA512 657bf2245e3477d2a34fda3a93bf5ad1b86d35b6a909853a5e6348d0bfcc22a74085bf8d00fd027e4afaaf201b5a39632331556e2f354af5dc94ad4dba987b52
 MISC metadata.xml 658 BLAKE2B 75ee5deafa4e9c1336119b2b2b87de6f8520a29f8fa7901c4995bddbb0cb185de9a019ff7703d0a8aa7b2f685a9ec2ca518641ea0c0a1b6123aa05faa04274a1 SHA512 94b68a5195b17cd1a7283a90a42ba9e1dfb0e7dde7c16f48202233cc2fc20ea718a1588b57b2af372e3c35ed403276cdd59456165a225f149a813abff2144c73
diff --git a/sys-libs/timezone-data/timezone-data-2019b-r1.ebuild b/sys-libs/timezone-data/timezone-data-2019b-r1.ebuild
index a52e4d3a7263..f295c2eeaafa 100644
--- a/sys-libs/timezone-data/timezone-data-2019b-r1.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2019b-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
 
 LICENSE="BSD public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390  sh  sparc  x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="nls leaps_timezone elibc_FreeBSD"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-libs/timezone-data/timezone-data-2019b-r2.ebuild b/sys-libs/timezone-data/timezone-data-2019b-r2.ebuild
new file mode 100644
index 000000000000..7a1382e40e91
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2019b-r2.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs flag-o-matic
+
+code_ver=${PV}
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="https://www.iana.org/time-zones"
+SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
+	https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="nls leaps_timezone elibc_FreeBSD"
+
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	!sys-libs/glibc[vanilla(+)]"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+
+	# check_web contacts validator.w3.org
+	sed -i -e 's/check_tables check_web/check_tables/g' \
+		Makefile || die "Failed to disable check_web"
+
+	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
+}
+
+src_configure() {
+	tc-export CC
+
+	append-lfs-flags #471102
+
+	if use elibc_FreeBSD || use elibc_Darwin ; then
+		append-cppflags -DSTD_INSPIRED #138251
+	fi
+
+	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
+	LDLIBS=""
+	if use nls ; then
+		# See if an external libintl is available. #154181 #578424
+		local c="${T}/test"
+		echo 'main(){}' > "${c}.c"
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
+			LDLIBS+=" -lintl"
+		fi
+	fi
+}
+
+_emake() {
+	emake \
+		REDO=$(usex leaps_timezone posix_right posix_only) \
+		TZDATA_TEXT= \
+		TOPDIR="${EPREFIX}" \
+		ZICDIR='$(TOPDIR)/usr/bin' \
+		"$@"
+}
+
+src_compile() {
+	_emake \
+		AR="$(tc-getAR)" \
+		cc="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LDLIBS="${LDLIBS}"
+	if tc-is-cross-compiler ; then
+		_emake -C "${S}"-native \
+			AR="$(tc-getBUILD_AR)" \
+			cc="$(tc-getBUILD_CC)" \
+			RANLIB="$(tc-getBUILD_RANLIB)" \
+			CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			LDLIBS="${LDLIBS}" \
+			zic
+	fi
+}
+
+src_test() {
+	# VALIDATE_ENV is used for extended/web based tests.  Punt on them.
+	emake check VALIDATE_ENV=true
+}
+
+src_install() {
+	local zic=""
+	tc-is-cross-compiler && zic="zic=${S}-native/zic"
+	_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
+	rm -rf "${D}/nukeit" "${ED}/etc" || die
+
+	insinto /usr/share/zoneinfo
+	doins "${S}"/leap-seconds.list
+
+	# Delete man pages installed by man-pages package.
+	rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
+	dodoc CONTRIBUTING README NEWS *.html
+}
+
+get_TIMEZONE() {
+	local tz src="${EROOT}/etc/timezone"
+	if [[ -e ${src} ]] ; then
+		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
+	else
+		tz="FOOKABLOIE"
+	fi
+	[[ -z ${tz} ]] && return 1 || echo "${tz}"
+}
+
+pkg_preinst() {
+	local tz=$(get_TIMEZONE)
+	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
+		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
+		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
+		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
+		eerror "be using right/xxx for the system timezone as it breaks programs."
+		die "Please fix your timezone setting"
+	fi
+
+	# Trim the symlink by hand to avoid portage's automatic protection checks.
+	rm -f "${EROOT}"/usr/share/zoneinfo/posix
+
+	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
+		elog "Support for accessing posix/ and right/ directly has been dropped to match"
+		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
+		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
+		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
+	fi
+}
+
+configure_tz_data() {
+	# make sure the /etc/localtime file does not get stale #127899
+	local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime"
+
+	# If it's a symlink, assume the user knows what they're doing and
+	# they're managing it themselves. #511474
+	if [[ -L "${etc_lt}" ]] ; then
+		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
+		return 0
+	fi
+
+	if ! tz=$(get_TIMEZONE) ; then
+		einfo "Assuming your empty ${etc_lt} file is what you want; skipping update."
+		return 0
+	fi
+	if [[ "${tz}" == "FOOKABLOIE" ]] ; then
+		elog "You do not have TIMEZONE set in ${src}."
+
+		if [[ ! -e "${etc_lt}" ]] ; then
+			cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
+			elog "Setting ${etc_lt} to Factory."
+		else
+			elog "Skipping auto-update of ${etc_lt}."
+		fi
+		return 0
+	fi
+
+	if [[ ! -e "${EROOT}/usr/share/zoneinfo/${tz}" ]] ; then
+		elog "You have an invalid TIMEZONE setting in ${src}"
+		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
+		tz="Factory"
+	fi
+	einfo "Updating ${etc_lt} with ${EROOT}/usr/share/zoneinfo/${tz}"
+	cp -f "${EROOT}/usr/share/zoneinfo/${tz}" "${etc_lt}"
+}
+
+pkg_config() {
+	configure_tz_data
+}
+
+pkg_postinst() {
+	configure_tz_data
+}
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index fa98ebf2ebc0..3aa506ebf411 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 94f6022090b8..d5961a5f6e9f 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -1,4 +1,6 @@
 DIST acpid-2.0.31.tar.xz 155620 BLAKE2B 11338d72156dfd90f680367e23e373f8c4ee5e553ad4a8a9c9688163e9a97ee99a9b866940320ee5af5a9e9fe956dd3e675d0b879ea984c2cca56162c0d163fd SHA512 05eb96cdae698731b14caa89aa01239a0f16ce732f897d295447753aab7c8d49227c9b9ce901c6fd3bfdb117688e6ed80ec61aea0f64d75c9c0afe2aea2aa91a
+DIST acpid-2.0.32.tar.xz 155768 BLAKE2B 829b2f78f497d9c0bbd90d952cadad96beece3070240bee69f2a5cf28903e9e5f969a3bf9000552c63a52c17f8b94285a181f4301449a9b64c573032d9a4d255 SHA512 c7afffdf9818504e1ac03b0ad693a05f772bfd07af9808262b3b6bb82ca4dabe6253c94e6dc59e5be6f0da9e815e8bcf2d3e16f02b23d0248b6bad4509e78be7
 DIST sys-power_acpid_2.0.29-r1_extras.tar.xz 2548 BLAKE2B 4568f0e44d33382fd294248d48c8852f689f0a6082d9b74b33b77918d3ce21d7f1bf8a3aafeaa252e8fe170b3829155344a256f01fe80414369f02d50a17ff55 SHA512 f2c366c50c75790df32a1f6573b7de640fd09a97c4598155ebd0aad2eba118961ddc82fe0fbb4dc935aa5b6d7fcfe3ade73fff555b4588b0e4579a1028bef12f
 EBUILD acpid-2.0.31.ebuild 1962 BLAKE2B 4095dace6957e021be73c336ccf9b33049abcdc789be44820a99f06f092f0b309b6629ebeab97246fdbe12a72fedee5c4fb7a4ce029f79a11e7f79ea05b046a7 SHA512 a4178b8e8d93aabadc3b9be21728ff387a7e2259ff78fa4431cb32cbd913e6463c942bbaf19cce2132b3b1bd7a20ceae0d59a24be313337598cd345130b7a1b1
+EBUILD acpid-2.0.32.ebuild 1966 BLAKE2B ec877eb0334d301be61fe4ebc3d458e1c4b98895137d92d8fa6e6c320aa83c9b2199fe61a40ceb5d0fa3cb153da7c11f005d41705b1f0955c1bc223d28e72882 SHA512 ac8d3f67c720261d3d3757118e8196df612e024c0025ffd55861089e85ba8e63fee0ff6daa0ae5d64f90f02f3fd4ecc45f08c884a1afceb2c07d9b4f8579c1f3
 MISC metadata.xml 327 BLAKE2B f6c546808131faaccf65580107772b21a3fe59b681b1ae6c66846ce230c9bb4ce9209287ff88f150f4bd691d71cdbf7e2c4fd4ac8a049a2e8b9d9ab57967c1b3 SHA512 8e93170bc36e09c1cf6c1db7eb751cc1ddf737d3ed240ef69a5ba00279ea3d9e92c5ba5185faa5f2f3c86fca9922adfb8e8e0ffe673817984948aa941a2a7a3a
diff --git a/sys-power/acpid/acpid-2.0.32.ebuild b/sys-power/acpid/acpid-2.0.32.ebuild
new file mode 100644
index 000000000000..229b3a21d7ee
--- /dev/null
+++ b/sys-power/acpid/acpid-2.0.32.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit linux-info systemd
+
+DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
+HOMEPAGE="https://sourceforge.net/projects/acpid2"
+EXTRAS_VER="2.0.29-r1"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
+	https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-apm )"
+DEPEND=">=sys-kernel/linux-headers-3"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~INPUT_EVDEV"
+	local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
+	[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
+}
+
+pkg_setup() { :; }
+
+PATCHES=(
+)
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newdoc kacpimon/README README.kacpimon
+	dodoc -r samples
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
+
+	exeinto /etc/acpi
+	newexe "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.6-default.sh" default.sh
+	exeinto /etc/acpi/actions
+	newexe samples/powerbtn/powerbtn.sh powerbtn.sh
+	insinto /etc/acpi/events
+	newins "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.4-default" default
+
+	newinitd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.26-init.d" ${PN}
+	newconfd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.16-conf.d" ${PN}
+
+	systemd_dounit "${WORKDIR}"/${EXTRAS_NAME}/systemd/${PN}.{service,socket}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "You may wish to read the Gentoo Linux Power Management Guide,"
+		elog "which can be found online at:"
+		elog "https://wiki.gentoo.org/wiki/Power_management/Guide"
+		elog
+	fi
+
+	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
+	mkdir -p "${ROOT%/}"/run
+
+	if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}
diff --git a/sys-power/intel-undervolt/Manifest b/sys-power/intel-undervolt/Manifest
index 1f01f4330b39..a15c08193ab7 100644
--- a/sys-power/intel-undervolt/Manifest
+++ b/sys-power/intel-undervolt/Manifest
@@ -1,6 +1,8 @@
 AUX confd 75 BLAKE2B 48999f73a7bf3809383904c90a40d6e53a7c338f76585238260bb9d0261ec1b7a31db4ea8039ee31598b042b87c97e6487d048d7880a118864e7bf11cd474344 SHA512 335fc14643b6b0f8f19152966d41d40021b5e6a894f3c27211dcb42c106eef9c03e1b623b8a7bd9e48aeb904854b11d3ac9681738baa87d6eabfd4ac3df9b188
 AUX initd 506 BLAKE2B 0ead334ec3eb2cbfef7a02e326fe73f91a159b60080391b56dba10c021936fe02cc49fd99141b351e17b6231299a4c2ee7c4751744fa3c057ac06a5a8513d751 SHA512 22ba7987ea2dbebf88740967cb326dc6cc2e6797920d8f850494d3bd95280b41655598d07807fd7c2c3f653ee7b65c5e8ad6260dde083f953804497b40f19594
 DIST intel-undervolt-1.6.tar.gz 22465 BLAKE2B 947f3e3f94316a9988fc0311faa23b07e8e0a99afb737232e6e581f45cca89124a49e47bbc85eb0e836b7fc7f966869910fe4d42581e47d98d8c036390c3dec2 SHA512 1c1de1083654085d6711aad28d2815f2aa05d08b7fddbee425b59ab8109dc1e635c2a9bdda8ba0221420e9e00fcd61013bd4a4633d05ede87808c49898772db3
+DIST intel-undervolt-1.7.tar.gz 31481 BLAKE2B 0daade381b492184616356f097de32d14c76d6ab3f7dd59240fb25f92ee1b9aebb16cbef8b6836e16e361a9560b000655470140c31b5822fed7bd90e0b9d9bf2 SHA512 727eddd47a92f6092e89f9326c6b453785fac6155f2c2c50887f9a90704226e6abaf27b4a91cabd4783c4477371699a92186fe7847ac9218da9c26fb295a5304
 EBUILD intel-undervolt-1.6.ebuild 1148 BLAKE2B 8f84169e6bcb0d30fdb3b1901ba7cdbce971e933514e447d67c4cabde2078a57194107f900cd430306d81bfbd245c960d2c9c48780c8ff84694eed8f7afe3385 SHA512 8116d5545b70c0a3a8e81f4c5258462f4f1912712725574177cc92c61e58b355abdc2e70abe854f748eeca1ee747d5c0d436485fd49831580445fbb3e477bd5d
-EBUILD intel-undervolt-9999.ebuild 1148 BLAKE2B 8f84169e6bcb0d30fdb3b1901ba7cdbce971e933514e447d67c4cabde2078a57194107f900cd430306d81bfbd245c960d2c9c48780c8ff84694eed8f7afe3385 SHA512 8116d5545b70c0a3a8e81f4c5258462f4f1912712725574177cc92c61e58b355abdc2e70abe854f748eeca1ee747d5c0d436485fd49831580445fbb3e477bd5d
-MISC metadata.xml 462 BLAKE2B 6d4509f86962260abc93564e10dd087dcc1a7aa4b18c804a4a78c0c51d8659c8bd16227dcc654f60c05a0db178d81643a0a301135cb6a0857122a9b591f20e2c SHA512 99358e143a74ab36d352331d30a65ca100818edd57e62258f5ffb32f8c33f41be06e190b9f1291779db5e68228ce82241c7e30af7052c204df2c70ed7dafae1a
+EBUILD intel-undervolt-1.7.ebuild 1219 BLAKE2B 7e03cb969aa0e8852c21e09f2f5505bb6e375198f5a25eb8944570df30d309d8a4b293c0ccb6a5274d3628d46b8840f2aeaa359b22414af8a43925394e97ad3a SHA512 42142c857b9bbcb1c273b725e3aaee484c81b0de48e8a840fb4c49f932b0e284a2523d3a125d6e7e2d15a2b38729fb36221165f4a2a6da9d2e897c8b21e85d79
+EBUILD intel-undervolt-9999.ebuild 1219 BLAKE2B 7e03cb969aa0e8852c21e09f2f5505bb6e375198f5a25eb8944570df30d309d8a4b293c0ccb6a5274d3628d46b8840f2aeaa359b22414af8a43925394e97ad3a SHA512 42142c857b9bbcb1c273b725e3aaee484c81b0de48e8a840fb4c49f932b0e284a2523d3a125d6e7e2d15a2b38729fb36221165f4a2a6da9d2e897c8b21e85d79
+MISC metadata.xml 560 BLAKE2B 64440b4ecea98975cee61547bd93e8ce22f2c718cc8d2cf8b0cfbb76634585fa1c20309099f0b62c05b847b9db34b5b49832ffd1473f21015d74c3894b2ce972 SHA512 4c7c00d520f219cf24e4828f023d617b3829f2df70960a4156b214e2de5b94d1b33b865c72fff5c53215c236061ed0e1623c2f8f1a397bca960880548a00ec3c
diff --git a/sys-power/intel-undervolt/intel-undervolt-1.7.ebuild b/sys-power/intel-undervolt/intel-undervolt-1.7.ebuild
new file mode 100644
index 000000000000..4fa869561791
--- /dev/null
+++ b/sys-power/intel-undervolt/intel-undervolt-1.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="Intel CPU undervolting and throttling configuration tool"
+HOMEPAGE="https://github.com/kitsunyan/intel-undervolt"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kitsunyan/${PN}.git"
+else
+	SRC_URI="https://github.com/kitsunyan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="elogind"
+
+DEPEND="elogind? ( sys-auth/elogind )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~INTEL_RAPL ~X86_MSR"
+
+src_configure() {
+	local myconf=(
+		# it's a non-standard build system
+		$(usex elogind --enable-elogind '')
+		--enable-openrc
+		--enable-systemd
+		--unitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	tc-export CC
+
+	local myemakeargs=(
+		CC="${CC}"
+		CFLAGS="${CFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v} == 1.6 ]] ; then
+			elog "openrc service has been renamed to intel-undervolt-loop"
+			elog "please update your startup configuration"
+		fi
+	done
+}
diff --git a/sys-power/intel-undervolt/intel-undervolt-9999.ebuild b/sys-power/intel-undervolt/intel-undervolt-9999.ebuild
index 74c44d3fe535..4fa869561791 100644
--- a/sys-power/intel-undervolt/intel-undervolt-9999.ebuild
+++ b/sys-power/intel-undervolt/intel-undervolt-9999.ebuild
@@ -18,45 +18,44 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+IUSE="elogind"
 
-DEPEND=""
-RDEPEND=""
-BDEPEND=""
+DEPEND="elogind? ( sys-auth/elogind )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
 CONFIG_CHECK="~INTEL_RAPL ~X86_MSR"
 
-src_prepare() {
-	# respect CC, CFLAGS and avoid calling pkg-config
-	sed -i \
-		-e 's/^CC=/CC?=/' \
-		-e 's/^CFLAGS=/CFLAGS?=/' \
-		-e '/^UNITDIR=/d' \
-		Makefile || die
+src_configure() {
+	local myconf=(
+		# it's a non-standard build system
+		$(usex elogind --enable-elogind '')
+		--enable-openrc
+		--enable-systemd
+		--unitdir="$(systemd_get_systemunitdir)"
+	)
 
-	default
+	econf "${myconf[@]}"
 }
 
 src_compile() {
-
 	tc-export CC
 
-	myemakeargs=(
-		BINDIR="${EPREFIX}"/usr/bin
-		SYSCONFDIR="${EPREFIX}"/etc
-		UNITDIR="$(systemd_get_systemunitdir)"
+	local myemakeargs=(
+		CC="${CC}"
+		CFLAGS="${CFLAGS}"
 	)
+
 	emake "${myemakeargs[@]}"
 }
 
-src_install() {
-	myemakeargs+=(
-		DESTDIR="${D}"
-	)
-	emake "${myemakeargs[@]}" install
-
-	newinitd "${FILESDIR}"/initd "${PN}"
-	newconfd "${FILESDIR}"/confd "${PN}"
-
-	einstalldocs
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v} == 1.6 ]] ; then
+			elog "openrc service has been renamed to intel-undervolt-loop"
+			elog "please update your startup configuration"
+		fi
+	done
 }
diff --git a/sys-power/intel-undervolt/metadata.xml b/sys-power/intel-undervolt/metadata.xml
index 52dabf8e7809..ae8c6fe793f2 100644
--- a/sys-power/intel-undervolt/metadata.xml
+++ b/sys-power/intel-undervolt/metadata.xml
@@ -8,6 +8,9 @@
 	<longdescription lang="en">
 		Tool for undervolting and throttling limits alteration for Intel CPUs
 	</longdescription>
+	<use>
+		<flag name="elogind">Use elogind hook to apply voltage after system sleep</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">kitsunyan/intel-undervolt</remote-id>
 	</upstream>
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index ba8dd50b516c..d4144e6340da 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -13,4 +13,4 @@ DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf92652
 EBUILD nut-2.7.4-r1.ebuild 9000 BLAKE2B 53cf51da6aaa6d9655b9fe68a2eeab13c53ce284fbd09b7fc5aee790220cc32a5d9c11ef50b31cae409ec034609e5e2ad7ab2d3f95db4f8fe6b38f69a4123968 SHA512 3fa055f36890e108ac31cd2cb79598a58c926ac887022c3871e7e31461b843b74744c064008afdb7e936c6b19c675881f6f53742479f5f5f070efe1167447807
 EBUILD nut-2.7.4-r2.ebuild 9730 BLAKE2B c8f4c2854ab90599e3d0d3813835d66af8bc94f21ddda161f9252edca05128aef019e7d38e4fb1ab0c394b00204d784889fbfd5c501223a8b547719dc5cc6a8a SHA512 ed9339618cca6caed393b8bce150900d86438fccb6a63ca863c60465b6b032e79ece41b3be931e864868031291a3045d16d6d5afa99ce73f9d64983705dcd21a
 EBUILD nut-2.7.4-r3.ebuild 9770 BLAKE2B 213ab23a9ba2e470f0cdb81511dc95ddf89719b90577cd429fbd823155ba62a01ae6a897332268da33f516fd68a49e3276bca37236f58afc39de073fe4a6dfd0 SHA512 0fa8444fc165f82c3027a2a8187d4d077af728b2e300b19f02fb744357781d60aaddcc58f415d5978e435e58ba567276219524d1f4e73471ba2843747067763f
-MISC metadata.xml 5178 BLAKE2B 4fd7fd1ac52507faf24113bd583784bb1c14b37e6b68cd9b670580262e05d82992cb87ce3d5b9573ffed35ada17fe0399cc1437ad503b7c1d49cd781be01bad9 SHA512 d94f262b166977866e94b7a81b8c625fc78bbd0861ef04de4dc8124773c5f2374999d9cdbc1c82b7fa258548b6b2d9a5f4db1647cf3e106a09ce7049f510b3b0
+MISC metadata.xml 5329 BLAKE2B a97167cdd654c0a1cfc035fbab98a8c94150522b77651186f8c706ac2ebadac6b3e38c8c563a6fa16ac91fc8da760efd204ce3d3ce8e3e0c5239a9dd8c1adf4e SHA512 e57d635a530b16627fbc4807a07a227900189a8796285f309b710c4acb951c990b4f613dc9b3cbab71c480641d8ebfd942520a13e5712527d0058ca07c16b67d
diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml
index 85d0b12815ae..bde98d03e531 100644
--- a/sys-power/nut/metadata.xml
+++ b/sys-power/nut/metadata.xml
@@ -63,4 +63,8 @@
 		<flag name="ups_drivers_snmp-ups">Multi-MIB Driver for SNMP UPS equipment</flag>
 		<flag name="ups_drivers_nut-ipmipsu">Driver for IPMI Power Supply Units (PSU)</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">networkupstools/nut</remote-id>
+		<bugs-to>https://github.com/networkupstools/nut/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 4acf35aacd9c..0b0a9c706de8 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/evisum/Manifest b/sys-process/evisum/Manifest
index 6a27d9bb177a..a41278be3606 100644
--- a/sys-process/evisum/Manifest
+++ b/sys-process/evisum/Manifest
@@ -1,4 +1,6 @@
 AUX evisum-0.2.2-respect-cflags-ldflags.patch 458 BLAKE2B 9c40cb1b47b6fa52f870e281e18f7858aac131ea542d4afdeb7e9a52cb6cbc7658b5ff425d359e9471c101bfdd81cd0f94b90bfefacb4d1dc1da5aafea5bdd97 SHA512 e2399269e346f50c3c265cefdf3996e89fb9fd5d9da060e8cd27c70284279cae3ae6fcb183573cd286a7e4a028dfab7efe41fabeaa5eb74e2a5c227383f2e025
 DIST evisum-0.2.3.tar.xz 85000 BLAKE2B 3f3a43ff569d05550d092930f1cf61eb4deef2a449bd1b407b0f460c15887b76fc430ecbbe8357e6a06d6c34cdce68321d38922635ec4b9caccad084d9c619d6 SHA512 0043432f2b434c2bbdbe03b96d29a3f9515d063bdf5ae61ef5273aad1ec6dbc532860af4a22bebf275f171585e793e3851eec9c98a7eaa4645e32d3a79eafdc1
+DIST evisum-0.2.4.tar.xz 84604 BLAKE2B 36219949fdc63ee08be2577591ebb8c746abdf583ae7d9683be0809bd452f0ec8026e65221f8094b18340d54440f303b6ac21d4ff99cf7919a20046ef3ffa1b2 SHA512 31360e8965e9078e8d66ddbffd7f71fec75e327ac1a1a00b9e6337cfc5e80028beaa141f6feb64221098c4a202a410497ad96280e2510d91e84e44038662d540
 EBUILD evisum-0.2.3.ebuild 647 BLAKE2B 5be77ea47801cf4dc982300559d2bc3d21cdfdbc807c3ae87b17a15a517e9cb11934a9ccdf4e232d449e694d5b880458156a05c3a27b98a4bab10fdd0a7ce653 SHA512 828700dc6177e8c8904635848b8a19d3ccfaac2dd251789e28174d67229a595e50b1b66ef0083c83b5e8807422276f2d75a097821f6be5b618ada15f8d10e666
+EBUILD evisum-0.2.4.ebuild 647 BLAKE2B 5be77ea47801cf4dc982300559d2bc3d21cdfdbc807c3ae87b17a15a517e9cb11934a9ccdf4e232d449e694d5b880458156a05c3a27b98a4bab10fdd0a7ce653 SHA512 828700dc6177e8c8904635848b8a19d3ccfaac2dd251789e28174d67229a595e50b1b66ef0083c83b5e8807422276f2d75a097821f6be5b618ada15f8d10e666
 MISC metadata.xml 815 BLAKE2B d969cde79150c0cd2977017520a7ac95713b1c43aad52645f4d354f5a3ef3320638f5da097f0b7999689135036f1f8594b5331d2ca3420af93a2c3bfc726569e SHA512 c1b2c28863e8572ddfb79f8159e9ffc0defb4dc9c7b02c3ad7b1a4804ddcad06034471d9774f4e09bda1c84a8ce72393172f194c30cb5e5fda0a1177db842c3e
diff --git a/sys-process/evisum/evisum-0.2.4.ebuild b/sys-process/evisum/evisum-0.2.4.ebuild
new file mode 100644
index 000000000000..9ea74684dde2
--- /dev/null
+++ b/sys-process/evisum/evisum-0.2.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="System and process monitor written with EFL"
+HOMEPAGE="https://www.enlightenment.org/"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/efl"
+RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.2.2-respect-cflags-ldflags.patch" )
+
+src_install() {
+	emake PREFIX="${D}"/usr install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sys-process/fuser-bsd/Manifest b/sys-process/fuser-bsd/Manifest
deleted file mode 100644
index b1e73a450147..000000000000
--- a/sys-process/fuser-bsd/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST fuser-1142334561.tar.bz2 11008 BLAKE2B 9aae4c2e9bce4ff459864126661485b173542a2195972eb9b2e543639875064fec702d770154157e82388af2e2aad954ceb1a8b5dfe59b664455f2e79c68ddb5 SHA512 49c6a2773da47a55c59210e878c40f3313cef21795ab5c67bb61632a5d8bc7857f9e3501f54029b3187809bb927ae93690687a0cbcf34e296b6e53d6e9dc6ee4
-DIST fuser-bsd-patches-1.tar.bz2 1694 BLAKE2B 09b6fda0f9d6b5b7c4fde67c4a7174844c81dcc354354abfd15cce35da345b324f23600df0f60ba7bf0f38035e0de602caba7f48fabc9016661cd3c85ef4ad49 SHA512 7dad917c3a9ff628f4fe6893fad5aa42d1e206182ce9d7b831fd3713b2757b39d4134a1d4f085e0ac90ea392fae6006cd446944128035dda5e4272b778457ef4
-EBUILD fuser-bsd-1142334561.ebuild 801 BLAKE2B 65d81bb6b5fdd794386e62b8bfb55ae51a0c7b93898301accf1be584f1ae837c3f47e179875e0bfcbf23d0fac227b6ed549cb5efe46ff4a3eefc5821335d52aa SHA512 7f5e4e5d2a0cbacdebda9aee8cd923272e998005f6dc48affae9231b411f1a04a12bb076435d6f67f7eda520c1048c40a64c37a8c1c06e25a6355fcd52753f03
-MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-process/fuser-bsd/fuser-bsd-1142334561.ebuild b/sys-process/fuser-bsd/fuser-bsd-1142334561.ebuild
deleted file mode 100644
index 31ba1b8b40da..000000000000
--- a/sys-process/fuser-bsd/fuser-bsd-1142334561.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit base bsdmk eutils
-
-MY_P="${PN/-bsd/}-${PV}"
-
-PATCHLEVEL=1
-DESCRIPTION="fuser(1) utility for *BSD"
-HOMEPAGE="http://mbsd.msk.ru/stas/fuser.html"
-SRC_URI="http://mbsd.msk.ru/dist/${MY_P}.tar.bz2
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-freebsd/freebsd-mk-defs"
-# virtual/libc needed here for has_version to work.
-RDEPEND="virtual/libc
-	!sys-process/psmisc"
-
-S="${WORKDIR}/${PN/-bsd/}"
-
-src_prepare() {
-	if has_version '>=sys-freebsd/freebsd-lib-8' ; then # any better way to	check it?
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	fi
-}
-
-src_install() {
-	into /
-	dosbin fuser
-
-	doman fuser.1
-}
diff --git a/sys-process/fuser-bsd/metadata.xml b/sys-process/fuser-bsd/metadata.xml
deleted file mode 100644
index a00f3aeb1f81..000000000000
--- a/sys-process/fuser-bsd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 6335c7631d41..bc1091727900 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,7 +1,9 @@
 DIST Glances-2.11.1.tar.gz 5665685 BLAKE2B 5de75e7770cc01a0ddd6fcb0583e5d23c02e5188c7d6cbd55d2999be9321a1affda351094b8614d206e640e5a1338266b5c77629ec53bb280b9166f7b6a996e2 SHA512 99adccff7d1531760834b76f9a9525df0bf9a8f6f57dbd1f7c3c0515ba3b5c94f26172e19bbc7c93cecbe4bdebcca87ab3a11dd592259509eff85346780ef43a
 DIST glances-3.1.0.tar.gz 6688798 BLAKE2B 9ae2e6a4944d1af871b88ea325bc23cad24f11e70ff4871eeb6e4a510eb3a1e6f03fa5fa2cfde30d8b9aa0c32137aacb51d2dcb335c7ee6729e8d5913ec4e999 SHA512 a888cafa5987ab7a88caa0248e0cb3d9f65466d71ee8f1ca63565c5a8a59282be77c14f29afb2302fba0e79294c39e96384791cd89d23aa7727bfd4f20e2814d
 DIST glances-3.1.1.tar.gz 6737781 BLAKE2B ffd20d6ee994428dccb9b4aea481c9c3f618f0f7895098ff9be3cda206c1dc82b924eef002d13d9a93b53c28ba4faa8d88cfdb5f0691097cf31d89b7e3237d50 SHA512 d42ced74c9dc5150ff7242b61aaba94fd6009e150f637cadd4b6c9a7fc7b8028ea2e8835ae0ecf66bd12321cbc3f68e75cd526c97f5aecad6cf6df578e1b222f
+DIST glances-3.1.2.tar.gz 6740649 BLAKE2B 109ce18d045aafd921ccfff64aaab12a8106fbf44bb8a1ca352d544244d5fcf911f85158964c84142e279112e8add3f7bbcc1eff22fb5b3e05b40c94d13e960e SHA512 f9b839532d2b53edb9dfeac9abe8f5a9e314b7bdf34e54083614c02262bb15f0db745762f06b609071d2a6fead8b52eed16b6f5a569904ef56dafb41b85b991b
 EBUILD glances-2.11.1.ebuild 2422 BLAKE2B 823c3d94cf61f8d7a430d69822b51197757aae76355769241e5306db2ad5e45efaf3e52a31ccbc233d0013889b206c50deeb63c7d987ee9ccd86dec2b5006b2e SHA512 a6a8e69cea51daec3426ff7bb26f0653c88f82d84350cb5177a4fbfb9166cf92688dd9d65552e5c74111b6ec43afab1a170882ca76e31505ca69c49cdc2a5535
 EBUILD glances-3.1.0.ebuild 2666 BLAKE2B 428fd07a27872326a4ffedded04a25b24ae09bb0f93f81cdccaee69ab0b8f82b2c7b76b5b52f3c459f177d6af61635212c9b630afa3d699ec2cde159f819c488 SHA512 32eced872c4e2322b606f64db4798f973bbeafecda0f20aa14b525d6aaf32c4ff8837681b5ae3e889400fafbe45733e15f11f48435d51dc4eabc610a133d44ee
 EBUILD glances-3.1.1.ebuild 2759 BLAKE2B 9dcbe39e40359fecc84a27eca3986b1999ce8ff044494ca075a0abdc68b728bd89f8ba008bebde189ef383445464f419f754e4c688657003d8a827c67e95bcf1 SHA512 f4734856e1ea7525bfcfd1940eb0e35065a3cfd65d521ea577d2485adb07d964a2d951f4b651a89653aba6d8badc3c2e6d3805e34f5a47954d9fbc9397996d9c
+EBUILD glances-3.1.2.ebuild 2759 BLAKE2B 9dcbe39e40359fecc84a27eca3986b1999ce8ff044494ca075a0abdc68b728bd89f8ba008bebde189ef383445464f419f754e4c688657003d8a827c67e95bcf1 SHA512 f4734856e1ea7525bfcfd1940eb0e35065a3cfd65d521ea577d2485adb07d964a2d951f4b651a89653aba6d8badc3c2e6d3805e34f5a47954d9fbc9397996d9c
 MISC metadata.xml 493 BLAKE2B 97c23025c2d239873dbdea975ab7d559895eb7373fab2bf0f47020890f5127f12bc3a5b5adc98f0538e4854886fb9ad1a4b20e2781abfb1832de9a6a436a4fe5 SHA512 10c02f8acca9afc8d09ac4ad42e8ae3f30d956fcc6ffb065feb3d43a5de8f5039d5da1115db3ada249b59993c3e4b18ea47f3178013710507b29b9cc0ccb6bec
diff --git a/sys-process/glances/glances-3.1.2.ebuild b/sys-process/glances/glances-3.1.2.ebuild
new file mode 100644
index 000000000000..3b83d26080fc
--- /dev/null
+++ b/sys-process/glances/glances-3.1.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1 eutils linux-info
+
+DESCRIPTION="CLI curses based monitoring tool"
+HOMEPAGE="https://github.com/nicolargo/glances"
+SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? ( ${RDEPEND} )
+"
+
+CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+python_prepare_all() {
+	# Remove duplicate entries of a prebuilt doc build and
+	# ensure install of the file glances.conf in /etc/${PN}
+	sed \
+		-e '/share\/doc\/glances/d' \
+		-e "s/'CONTRIBUTING.md',//" \
+		-e "s:'conf/glances.conf':('${EPREFIX}/etc/glances', ['conf/glances.conf':g" \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	# add an intended file from original data set from setup.py to DOCS
+	local DOCS=( README.rst CONTRIBUTING.md conf/glances.conf )
+	# build docs
+	if use doc; then
+		pushd docs
+		make html
+		popd
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	optfeature "Action script feature" dev-python/pystache
+	optfeature "Autodiscover mode" dev-python/zeroconf
+	optfeature "Cloud support" dev-python/requests
+	optfeature "Quicklook CPU info" dev-python/py-cpuinfo
+	optfeature "Docker monitoring support" dev-python/docker-py
+	#optfeature "Export module" \
+	#	unpackaged/bernhard \
+	#	unpackaged/cassandra-driver \
+	#	unpackaged/potsdb \
+	#	dev-python/couchdb-python \
+	#	dev-python/elasticsearch-py \
+	#	dev-python/influxdb \
+	#	dev-python/kafka-python \
+	#	dev-python/pika \
+	#	dev-python/paho-mqtt \
+	#	dev-python/prometheus_client \
+	#	dev-python/pyzmq \
+	#	dev-python/statsd
+	optfeature "Folder monitoring" dev-python/scandir
+	#optfeature "Nvidia GPU monitoring" unpackaged/nvidia-ml-py3
+	optfeature "SVG graph support" dev-python/pygal
+	optfeature "IP plugin" dev-python/netifaces
+	optfeature "RAID monitoring" dev-python/pymdstat
+	#optfeature "SMART support" unpackaged/pySMART.smartx
+	optfeature "RAID support" dev-python/pymdstat
+	optfeature "SNMP support" dev-python/pysnmp
+	#optfeature "sparklines plugin" unpackaged/sparklines
+	optfeature "Web server mode" dev-python/bottle dev-python/requests
+	optfeature "WIFI plugin" net-wireless/python-wifi
+}
diff --git a/sys-process/numactl/Manifest b/sys-process/numactl/Manifest
index 931ba881c9e3..262f762ffe9c 100644
--- a/sys-process/numactl/Manifest
+++ b/sys-process/numactl/Manifest
@@ -1,10 +1,7 @@
 AUX numactl-2.0.10-numademo-cflags.patch 504 BLAKE2B f2346a298b86b9c667d0d9550af881f09fed1d56e507379f59f480cb8b6da8a57ad406273bec044eb8a95f9bb6b6a0f80fcb3288ba9da113725c6b8e2ed0748c SHA512 15266d98c375241fd84146a010f329265644666ab90d517865675618a8f793ea6bdc39e7c8b64836fa5b393afad1cd3c89452e838d751adbb315668a2cd29b78
-AUX numactl-2.0.11-sysmacros.patch 1391 BLAKE2B f761353e82bbb79a70839c34f4ad0759c24b3671bfa8c8ba2869beff4528e9b0241d4b208097c5b6c381dbd4ee532fc6d3b8934f6cac70290ddd48217d0b9185 SHA512 39c5841000650af58ae4f6b15a2e2af7b4fb45e7514537f1d081cc0be74bf13aaa3d336a31ef15386b897cc3478ec58b8c194850e99ca2605f5f25be1650a63f
-AUX numactl-2.0.8-cpuid-pic.patch 697 BLAKE2B 0446f983eab3eefa553027c70e373d6693cb7325979d5ca3cb9aaa2f9f00f5c6545fb2d949e0fb068a857b9cb41e2dbda176ba27e12eeeb664841b3fbaaec9ae SHA512 d9624110a7f8459c13b67eb990f05bc54ffe55818d586691b307dcc4ca5861f064a7269f1038cba5f8abf0f2b6d359d30e4f8d6e904a7e5c0da3404ef1bd4d51
-DIST numactl-2.0.11.tar.gz 408175 BLAKE2B 0767d555d5254e780ef50bd66215e84208e88fb37422fd86443e53ee52faef4242ff21e6028bdb92c4e1fa7815cdb23e87cd084763539dc1d560097f43bd563f SHA512 1969d7ee0ff3de0d6f1fa42ec089a17cdb3f92cb35d453b8f8b2eec49724c43787ecbd213357013a8f2500a260b0df9844d515815ca3a0376314a0eed050a0d4
 DIST numactl-2.0.12.tar.gz 423020 BLAKE2B 39d33612591df805715c51280bf34b8328ba6fc49bdaf9dd3bd67e076f9d319c9622ef72766c12e319f4be27ee9ec7f5ecb054a6e8c7c3cf568a69aea624d511 SHA512 316b10f50e6eee4cee9cf191f19381ec4a61980354eec3f9fe43fef21465bee28a82adeb9c235d4877e82950ccd14c9473b79fd1e2f5a7f598ec2fac230780ff
-EBUILD numactl-2.0.11-r1.ebuild 1668 BLAKE2B 14394a9c9620741f45c43b11d8272253f3fb643626aa654edc5fbde9bbe1796e4fa48fc2d4248ff7fc2e6469f04658c0aeb2119de101d30208dd1f3e61c79fec SHA512 f7a4265e81b14d1d5b6814ecddc5640f30fb1ca9c7cf7e8750a754bd397e7327d9af00598a7c19b8906f405487205cbee62f1937faee83fb56a5d1adbe48d740
-EBUILD numactl-2.0.11.ebuild 1527 BLAKE2B 64b4e024b16d1ba057f3bc61613229ff5659613149567ee52440205baac3a793a390724104883da1241daafaf11fccffd764ec68efef41c138b904be800f6c1f SHA512 0a0a6eff479e075be84a48dbe2994c1ce884ad3dee6da4d2d83c770ec7db42cdde077bcd3e17c23166bf19eb83eeecbeb86d1b7c48df34c3146bfece8db481dd
-EBUILD numactl-2.0.12.ebuild 1684 BLAKE2B b6ec387ed6594b5d17ee9e3f8a194979bb53e718432ad01e09ebfe8a6553e65de0a01301e4e95c8353a3dff6199beff2c5fdc208317934db87f14d5dd95fae42 SHA512 7b0e7bdbeb49aea6a0db81e261f8fa2bef14e85b4c3697db561f5c213c42cdd65e847179cae22c96c3261797d91a3b2a5b1b1b8cdb5f0eb424e4c951523a8edb
-EBUILD numactl-9999.ebuild 1685 BLAKE2B 7cc6cb2a721489583a179a97b244a48c45f0767e44ed1d9f2fa9740e2eeb7eedd82031a86b60a1a0a9c2636228ef288c2d6bbb213f1972449a7db03ff57a201d SHA512 1e9d8b3863c12794f2fbd917d06e99e448a66e80de3a01f08dce3a6c290a806b2e24537876cd6792c278bbc35a2cd901b78ae5e972b02b14ae94dcc3d265b0ae
+DIST numactl-2.0.13.tar.gz 438096 BLAKE2B f615fafdb366930c6cdee1e4ef3d1e1d5e21f8f1c09aa904c0ebfa56972a99144991c6907127ef35794ca19d711e41b54488c5bfaeca8a0149ab9697d8c1ef75 SHA512 f7b747eb8f3ded9f3661cb0fc7b65b5ed490677f881f8fe6a000baf714747515853b4e5c8781b014241180bf16e9f0bfdf2c6f758725e34b4938696ba496b72a
+EBUILD numactl-2.0.12.ebuild 1789 BLAKE2B d234c8294a8cbeb6736677ef1d0596b8d8b7849112c7b6e06dd85ce94cffd4bd0afb28e7557c3e62ebf607eb3407549b15fce64b5926b8b5ba39ee3b9dc6c961 SHA512 ccf279f92a775a083d4b9517641d3e0cff5ee9dccd673ce668ed4802134ba3eb6619e45a65560e8295e46b61c944b5068860ef45b63edbd3c18b5a2d4c15f4bd
+EBUILD numactl-2.0.13.ebuild 1802 BLAKE2B 1ec41a7684cc2855cc69a543650228cb972f27502f7b8de0cd7174f76585c996aa091080dc70ffd35a8ee45abf5aa07c71f998177cba49655bf0d6656751fe3b SHA512 f11f804d514bc934715728f3e695814cdd1ac5b4664b7c5233c6f119df42ed7efb97c2e5545fd5b785078f076e3ee0c0ca2ccd29a1e44841ea7e2e07323f30b9
+EBUILD numactl-9999.ebuild 1802 BLAKE2B 1ec41a7684cc2855cc69a543650228cb972f27502f7b8de0cd7174f76585c996aa091080dc70ffd35a8ee45abf5aa07c71f998177cba49655bf0d6656751fe3b SHA512 f11f804d514bc934715728f3e695814cdd1ac5b4664b7c5233c6f119df42ed7efb97c2e5545fd5b785078f076e3ee0c0ca2ccd29a1e44841ea7e2e07323f30b9
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/numactl/files/numactl-2.0.11-sysmacros.patch b/sys-process/numactl/files/numactl-2.0.11-sysmacros.patch
deleted file mode 100644
index 3f9536757391..000000000000
--- a/sys-process/numactl/files/numactl-2.0.11-sysmacros.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/580098
-
-From c1644f92e340d797e490c41a9ef9961125d202b9 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 18 Apr 2016 18:49:51 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor
-
-These functions are not part of any official spec, and glibc has always
-kept them in sys/sysmacros.h.  As glibc moves to conform to POSIX, and
-more alternative C libraries come up, we need to include this header
-explicitly to get the prototypes.  Otherwise we fail to build like:
-
-affinity.c: In function 'affinity_file':
-affinity.c:177:7: warning: implicit declaration of function 'major' [-Wimplicit-function-declaration]
-   if (major(d) != maj || minor(d) != min)
-       ^
-affinity.c:177:26: warning: implicit declaration of function 'minor' [-Wimplicit-function-declaration]
-   if (major(d) != maj || minor(d) != min)
-                          ^
-./.libs/libnuma.so: undefined reference to 'minor'
-./.libs/libnuma.so: undefined reference to 'major'
-collect2: error: ld returned 1 exit status
----
- affinity.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/affinity.c b/affinity.c
-index 9fbd6af..984291c 100644
---- a/affinity.c
-+++ b/affinity.c
-@@ -40,6 +40,7 @@
- #include <linux/rtnetlink.h>
- #include <linux/netlink.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <ctype.h>
- #include <assert.h>
- #include <regex.h>
--- 
-2.7.4
-
diff --git a/sys-process/numactl/files/numactl-2.0.8-cpuid-pic.patch b/sys-process/numactl/files/numactl-2.0.8-cpuid-pic.patch
deleted file mode 100644
index 02e84b725772..000000000000
--- a/sys-process/numactl/files/numactl-2.0.8-cpuid-pic.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-make the code work on x86/PIC.  this code is only used in the demo,
-and the overhead of always running this is system noise, so don't
-bother bracketing with __i386__/__PIC__ defines.
-
-http://bugs.gentoo.org/456238
-
---- a/clearcache.c
-+++ b/clearcache.c
-@@ -57,7 +57,7 @@ void clearcache(unsigned char *mem, unsigned size)
- #if defined(__i386__) || defined(__x86_64__)
- 	unsigned i, cl, eax, feat;
- 	/* get clflush unit and feature */
--	asm("cpuid" : "=a" (eax), "=b" (cl), "=d" (feat) : "0" (1) : "cx");
-+	asm("xchg %%ebx, %%esi; cpuid; xchg %%esi, %%ebx;" : "=a" (eax), "=S" (cl), "=d" (feat) : "0" (1) : "cx");
- 	if (!(feat & (1 << 19)))
- 		fallback_clearcache();
- 	cl = ((cl >> 8) & 0xff) * 8;
diff --git a/sys-process/numactl/numactl-2.0.11-r1.ebuild b/sys-process/numactl/numactl-2.0.11-r1.ebuild
deleted file mode 100644
index ff96a5ace1b1..000000000000
--- a/sys-process/numactl/numactl-2.0.11-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils toolchain-funcs multilib-minimal
-
-DESCRIPTION="Utilities and libraries for NUMA systems"
-HOMEPAGE="http://oss.sgi.com/projects/libnuma/"
-SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# ARM lacks the __NR_migrate_pages syscall.
-KEYWORDS="~amd64 -arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.8-cpuid-pic.patch #456238
-	epatch "${FILESDIR}"/${PN}-2.0.10-numademo-cflags.patch #540856
-	epatch "${FILESDIR}"/${PN}-2.0.11-sysmacros.patch #580098
-	eautoreconf
-	# We need to copy the sources or else tests will fail
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf $(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	multilib_is_native_abi && default || emake libnuma.la
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		if [ -d /sys/devices/system/node ]; then
-			einfo "The only generically safe test is regress2."
-			einfo "The other test cases require 2 NUMA nodes."
-			emake regress2
-		else
-			ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
-		fi
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS")
-	find "${ED}"/usr/ -name libnuma.la -delete
-}
-
-multilib_src_install_all() {
-	DOCS=( README TODO CHANGES DESIGN )
-	einstalldocs
-	# delete man pages provided by the man-pages package #238805
-	rm -r "${ED}"/usr/share/man/man[25] || die
-}
diff --git a/sys-process/numactl/numactl-2.0.11.ebuild b/sys-process/numactl/numactl-2.0.11.ebuild
deleted file mode 100644
index 513866b7c61a..000000000000
--- a/sys-process/numactl/numactl-2.0.11.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 eutils toolchain-funcs multilib-minimal
-
-DESCRIPTION="Utilities and libraries for NUMA systems"
-HOMEPAGE="http://oss.sgi.com/projects/libnuma/"
-SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# ARM lacks the __NR_migrate_pages syscall.
-KEYWORDS="amd64 -arm ia64 ~mips ppc ppc64 x86 ~amd64-linux"
-IUSE=""
-
-ECONF_SOURCE=${S}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.8-cpuid-pic.patch #456238
-	epatch "${FILESDIR}"/${PN}-2.0.10-numademo-cflags.patch #540856
-	epatch "${FILESDIR}"/${PN}-2.0.11-sysmacros.patch #580098
-	eautoreconf
-	# We need to copy the sources or else tests will fail
-	multilib_copy_sources
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		if [ -d /sys/devices/system/node ]; then
-			einfo "The only generically safe test is regress2."
-			einfo "The other test cases require 2 NUMA nodes."
-			emake regress2
-		else
-			ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
-		fi
-	fi
-}
-
-multilib_src_compile() {
-	multilib_is_native_abi && default || emake libnuma.la
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS")
-}
-
-multilib_src_install_all() {
-	DOCS=( README TODO CHANGES DESIGN )
-	einstalldocs
-	# delete man pages provided by the man-pages package #238805
-	rm -r "${ED}"/usr/share/man/man[25] || die
-}
diff --git a/sys-process/numactl/numactl-2.0.12.ebuild b/sys-process/numactl/numactl-2.0.12.ebuild
index 382d2e6496e8..f97df3e27045 100644
--- a/sys-process/numactl/numactl-2.0.12.ebuild
+++ b/sys-process/numactl/numactl-2.0.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
 
-inherit autotools toolchain-funcs multilib-minimal
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
 
 DESCRIPTION="Utilities and libraries for NUMA systems"
 HOMEPAGE="https://github.com/numactl/numactl"
@@ -13,7 +13,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
 	# ARM lacks the __NR_migrate_pages syscall.
-	KEYWORDS="~amd64 -arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="amd64 -arm arm64 ia64 ~mips ppc ppc64 x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-2"
@@ -26,6 +26,11 @@ PATCHES=(
 
 src_prepare() {
 	default
+
+	# lto not supported yet
+	# gcc-9 with -flto leads to link failures: #692254
+	filter-flags -flto*
+
 	eautoreconf
 	# We need to copy the sources or else tests will fail
 	multilib_copy_sources
diff --git a/sys-process/numactl/numactl-2.0.13.ebuild b/sys-process/numactl/numactl-2.0.13.ebuild
new file mode 100644
index 000000000000..6bcda4fcddba
--- /dev/null
+++ b/sys-process/numactl/numactl-2.0.13.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 flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Utilities and libraries for NUMA systems"
+HOMEPAGE="https://github.com/numactl/numactl"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/numactl/numactl.git"
+else
+	SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
+	# ARM lacks the __NR_migrate_pages syscall.
+	KEYWORDS="~amd64 -arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.10-numademo-cflags.patch #540856
+)
+
+src_prepare() {
+	default
+
+	# lto not supported yet
+	# gcc-9 with -flto leads to link failures: #692254
+	filter-flags -flto*
+
+	eautoreconf
+	# We need to copy the sources or else tests will fail
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	multilib_is_native_abi && default || emake libnuma.la
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		if [[ -d /sys/devices/system/node ]] ; then
+			einfo "The only generically safe test is regress2."
+			einfo "The other test cases require 2 NUMA nodes."
+			emake regress2
+		else
+			ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
+		fi
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS")
+	find "${ED}"/usr/ -type f -name libnuma.la -delete || die
+}
+
+multilib_src_install_all() {
+	local DOCS=( README.md )
+	einstalldocs
+	# delete man pages provided by the man-pages package #238805
+	rm -r "${ED}"/usr/share/man/man[25] || die
+}
diff --git a/sys-process/numactl/numactl-9999.ebuild b/sys-process/numactl/numactl-9999.ebuild
index 312ab570210b..6bcda4fcddba 100644
--- a/sys-process/numactl/numactl-9999.ebuild
+++ b/sys-process/numactl/numactl-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
+EAPI=7
 
-inherit autotools toolchain-funcs multilib-minimal
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
 
 DESCRIPTION="Utilities and libraries for NUMA systems"
 HOMEPAGE="https://github.com/numactl/numactl"
@@ -26,6 +26,11 @@ PATCHES=(
 
 src_prepare() {
 	default
+
+	# lto not supported yet
+	# gcc-9 with -flto leads to link failures: #692254
+	filter-flags -flto*
+
 	eautoreconf
 	# We need to copy the sources or else tests will fail
 	multilib_copy_sources
@@ -41,7 +46,7 @@ multilib_src_compile() {
 
 multilib_src_test() {
 	if multilib_is_native_abi ; then
-		if [ -d /sys/devices/system/node ]; then
+		if [[ -d /sys/devices/system/node ]] ; then
 			einfo "The only generically safe test is regress2."
 			einfo "The other test cases require 2 NUMA nodes."
 			emake regress2
@@ -54,12 +59,12 @@ multilib_src_test() {
 multilib_src_install() {
 	emake DESTDIR="${D}" \
 		install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS")
-	find "${ED%/}"/usr/ -name libnuma.la -delete || die
+	find "${ED}"/usr/ -type f -name libnuma.la -delete || die
 }
 
 multilib_src_install_all() {
 	local DOCS=( README.md )
 	einstalldocs
 	# delete man pages provided by the man-pages package #238805
-	rm -r "${ED%/}"/usr/share/man/man[25] || die
+	rm -r "${ED}"/usr/share/man/man[25] || die
 }
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 3d2c02ca04ca..e826c487f183 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,7 +1,9 @@
 DIST parallel-20190422.tar.bz2 2011139 BLAKE2B 09da0f286ae0b7ed09225d0281eee1e73dfcec40723a35c6107f737d4d8cb50cda8df0391ac65f9a9a23d4e2af106991e3584007dd1828369c8e9decdf3b3433 SHA512 0b08b2883d8eb33ccebfdd3707a53f16db9d70ac3ca0637d369e6159408c494d34c494c868c7b537083f17a1145040f3f2e6290380d302a18d337d752ae219ef
 DIST parallel-20190622.tar.bz2 2037056 BLAKE2B 4fee4635e5643a07001f159a7748b1bba97b73813f893194ccd94fee1443130bd99bfbf430e6f0d8b78963e4e628d34a8b25b3dd0adb479ab1f4fa1f2d8edf92 SHA512 c785537d127492d52c1eb40b5e3111f0ace3197dfacf0af4676d0722dac22dbf3e70f37c90508e8cadb3fa9a709ac647615dd221f27c231ab4ea7a2d2c3d23b4
 DIST parallel-20190722.tar.bz2 2055028 BLAKE2B 4c0d21eb44298ee970e9bb1838a869c874b1057081010a990c1122f615df3eb83a99c2e8bd6b5ea6612fdebe7db213ee631ab143772c6b64dae7bad59ea08d4f SHA512 37d76081863c05200082cd4d6b97c03628c2a77e6565df69c099923ef5025d3509bb4802791cc4a6e79056471664f7eae146c48c293f71c6f7719ff91dda1217
+DIST parallel-20190822.tar.bz2 2066472 BLAKE2B 02dc53d9074ba3e41f1c9aaaab216b0a56eb03d1821c0e75383cdf9a5b08c0091fbf971a27651c39c435ad9211a024b9461f8cfd9e9c0bb466bdd8945b7fba17 SHA512 60adc8b0283fe5111864be08e02383d6dd49304268dd48dd2fb48c8417b3545bdb1cd6ef7820b1688f3ac22316bebd2573639af0f57c196c94cda5321daf623e
 EBUILD parallel-20190422.ebuild 875 BLAKE2B 343f4c995cada466af2808fcf4446bd4335423998d212313ab2797433617f61c307fca7ff65bd00ec124c6814b76c7010ef12e01f198337fb2702394fac0816b SHA512 2e5275b74295ca8cd480314dfa5e5c941eb61f52a47e852c3d0c2e397b56aa20ec2dc5f7808302a8b97a0e2920749efb9e5b058c54bf4d7811174c1c6ece02a8
 EBUILD parallel-20190622.ebuild 877 BLAKE2B 2c7d88b69284f33cb6143cbc446029473d55edb7dd34b7a76731c3611d272deb0a8824160b288444d9bd618a6346070b7b8ae11d507f67461ee6417752162d1b SHA512 f02bf01d25ced665d53e21fc5b6c42f935c356aae8dce6d85fd713000c35c865dc9c7cdff51a4ae2b346789f20f2202281929775f27d4a8bb1d0407ba3cfa3a1
 EBUILD parallel-20190722.ebuild 877 BLAKE2B 2c7d88b69284f33cb6143cbc446029473d55edb7dd34b7a76731c3611d272deb0a8824160b288444d9bd618a6346070b7b8ae11d507f67461ee6417752162d1b SHA512 f02bf01d25ced665d53e21fc5b6c42f935c356aae8dce6d85fd713000c35c865dc9c7cdff51a4ae2b346789f20f2202281929775f27d4a8bb1d0407ba3cfa3a1
+EBUILD parallel-20190822.ebuild 877 BLAKE2B 2c7d88b69284f33cb6143cbc446029473d55edb7dd34b7a76731c3611d272deb0a8824160b288444d9bd618a6346070b7b8ae11d507f67461ee6417752162d1b SHA512 f02bf01d25ced665d53e21fc5b6c42f935c356aae8dce6d85fd713000c35c865dc9c7cdff51a4ae2b346789f20f2202281929775f27d4a8bb1d0407ba3cfa3a1
 MISC metadata.xml 1003 BLAKE2B a5a05ad6fb91321ade93dc8534764af73614a4495ae0ae023825b155be4a2d8f095df51971bb174c3e5fa335d7753121b09b22d8fef5ec4ffce3460b95fa2ed1 SHA512 a9da23fd3dc9476e2934a06ed8c0638fb3ee2530ea0ed9305a88ef0fa517a2996494d4e97492a709a601937d794748b0cba794d0b919667decdace77123c700f
diff --git a/sys-process/parallel/parallel-20190822.ebuild b/sys-process/parallel/parallel-20190822.ebuild
new file mode 100644
index 000000000000..30fa03438813
--- /dev/null
+++ b/sys-process/parallel/parallel-20190822.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
+HOMEPAGE="https://www.gnu.org/software/parallel/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-lang/perl:=
+	dev-perl/Devel-Size
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-IO"
+DEPEND="${RDEPEND}"
+
+DOCS="NEWS README"
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# See src/Makefile.am for this one:
+	rm -f "${ED}"/usr/bin/sem || die
+	dosym ${PN} /usr/bin/sem
+}
+
+pkg_postinst() {
+	elog "To distribute jobs to remote machines you'll need these dependencies"
+	elog " net-misc/openssh"
+	elog " net-misc/rsync"
+}
diff --git a/sys-process/systemd-cron/Manifest b/sys-process/systemd-cron/Manifest
index 228604776bb8..b4ee91be1253 100644
--- a/sys-process/systemd-cron/Manifest
+++ b/sys-process/systemd-cron/Manifest
@@ -1,10 +1,6 @@
 AUX 1.5.12-generatordir.patch 2452 BLAKE2B 43b6dacabd148b3aebc41bcf4f9430b72632fa7ff50f8f1e713a020b1050060f07a762640e050419294d0cd28b5947a27fce6b425e45a9924e4a33720040f478 SHA512 9b0bffdae0eb7958f6a5deabd1f60063a8571e16f715f82296e4776106f5f15d65be10a4b67de723b41e0dc92ad8b0e585ab477cde3d81422e0548db11ee9f2f
-DIST systemd-cron-1.5.10.tar.gz 31191 BLAKE2B c58a0cfec82534baf3daba6f706d054347f3bc5a2d272eb003228b48fc58c9df61ed2045526403295aed3edc9a0c84eaa589c5aea66562bf35d531b4f5ffacd7 SHA512 9a4bbf78c81adf74e589cd9431b5742d5dab63b0346a2330403a7e24bdab62833096445d9fd3e5f6a91f722b3f8176e52734dcc5e2ee0ec23b555e6d01805094
 DIST systemd-cron-1.5.12.tar.gz 31417 BLAKE2B d0776d2c4aa2d86289dd8ab5dade47f083ee7abc16f54c9527130f587049064d6100eaccd4a3a0a461d21ac8286910d3cb0590db14ea1d3a32e591b7ede0a59e SHA512 6f85cef0870cde5ff6b397fb640a30a8a567e09e3cac48456498f1f102395f12f174731ca9cc8e826bb6c49a0d3a6dd49a9aec63e7b75648b7dccfaa499dcea4
-DIST systemd-cron-1.5.3.tar.gz 29105 BLAKE2B c7c95df9be0383aa39a8525d3a5179a04ef1edc77d6c0e34095eb0fe26045c139e4d0c340d6999405baa99d00181cc6c2fb14d87ad401a685aaf3ad7adb5e006 SHA512 ea0241f93b8d92497fa020d84630ee153dc299d9b16b17567784a4dcb5ddf0a4589e7e033428562a862218ef79b192245178df2d7dcc69f779ef9156921674c7
-DIST systemd-cron-1.5.4.tar.gz 30436 BLAKE2B 5ce72e30e68cafbf812690704de4841d0436a97e6a9df12802374a0ef7fe2af4294310e4c14c68d5aa2508c9664402c17dcacb7b6a637f7b83853d97c78c557f SHA512 e6fe60de9d6cbc223b8358bd6b1a060e11f1ea16a8f0b24662914ddb18d827f7b4c62fd40dbefed3d0ac38b1e748998ec5e0430d4ea751e8a20b94b9803bcb89
-EBUILD systemd-cron-1.5.10.ebuild 1929 BLAKE2B 1850edf8c8dd22ace25ea4721fec6e156e0dc76d6295c1cb50dc6bd3610d9a2c94a389b991d261ad365a72db598e3d0c81f25b516837f96421fa97178d90cfcf SHA512 f5db6a9bb29a28487a8d5dbabc542eb811a61ba65bd49c97e8507ccd34128d38979c0f82e0bd62083ed9f34c0725a18e8b44a8f56cfcff81be3c6ec9a7b2bb2a
-EBUILD systemd-cron-1.5.12-r1.ebuild 2038 BLAKE2B c48943ef36a31d9553ada65f0d6741d8e2a5e543c2d5cb18a955c192052a311b51ec13cb3bff80d599181523ce2faaacc44ef51515ba996c50e34da4dbec0155 SHA512 cce9c8bf31f7a83013c74209b56933033c8f2682906c5bb241ea2f16d0fc8c68e87bb6677eb0856a9ac33b60483e82e45b2f2340934d6f2ac7914dbdec05f33a
-EBUILD systemd-cron-1.5.3.ebuild 1915 BLAKE2B 21ac53684e6b2ed3d6f248096d984e1b0835ddc64bb665cceefa58f1140372a8f4fdd72a6a5944acfb8222dff720628db777db73225804663b9a6ab505fea28a SHA512 ddaefbaac19317ad68a64bc7f66d30e059bf935a29bde1d3582bf0b939fb5a4d11d47e9e637e7b391b4fb78258db7849734c2f89bef0b8a34c26c0ea0a4757ff
-EBUILD systemd-cron-1.5.4.ebuild 1927 BLAKE2B e50b00ca4dd4bd9d338b5ba52325fcf9a1feaa8829c0ac00a65132668c7a59af32471aee925c77864dcd229ca1de4e3cd43ed9babf8b495edb8b582b0ed8d26d SHA512 c1a2b684930647e695d0ee0f87eaf6b1b8f6c1f4a971d62058a9c1b161b8d483fa60e8148c0048cfdf651e54474c1e0884346f85af0a5e7aa00719459f9c7cd7
+DIST systemd-cron-1.5.14.tar.gz 31634 BLAKE2B 59394128145dbd04a2b1bb10a6ac8821a97a465e3c0d43f3ca8fdfe60db273352d46b1200c966adaf772272835269c5c553b040cb0e0340ec56340181c9b7245 SHA512 772a4f8181a0f8039a8138fdc43bfe0f2bd89222fe19fa971727be265036f86435334d6230e116440f6969425fc6d59dc26e9cf230c00d030ea5d62ba351713c
+EBUILD systemd-cron-1.5.12-r1.ebuild 2037 BLAKE2B 6f969adaa14801ff8475257cbc398a98a7d59b677bb23308603f137f1ad80f9a28e1c1d94dad7597ec23bdee357254f226600a7bc19acad02437565300199e63 SHA512 4715a90f0d5b8ed810516e1a1dfde5bc0cad51a4f9ccaad90a7e41b04f2ace55033b6ee930ace2a54b2ee50359d22c73f5026aa2f1a2d3534701af6288e9656b
+EBUILD systemd-cron-1.5.14.ebuild 1975 BLAKE2B be43966177978a6e10782591ec7deb901a353e02781809831c66548dfe78e745749af94c58f83761d93e5205e3d9ac8c736a4d93d550ad580e7dcf5478c677c9 SHA512 62795cfef263df43562d17ead279ac48320bd1b205c40715de74a4469757cbbce1683095f5a5342880b99ce91576152ff5ad1914ea7a1c4b457599db23ad320d
 MISC metadata.xml 696 BLAKE2B 9487789802e271bb95d8c44c5f279f8c850b928e8a2547ce7a1b47e2db3aef119265c0d8e36b8dfba3c62e3b7d4ccc040ba7983dec6c6328fc11e10e7ffd4ecc SHA512 54efb7e34c7e83c0ac3e964e300705b3b33c2dd93dc711c6e71b9d93d83a627f0318ce757b01feb6d6e1edd228f94ab180394617803dcc23c5e73aece9c9f7c1
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.10.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.10.ebuild
deleted file mode 100644
index dc4017fa0a1d..000000000000
--- a/sys-process/systemd-cron/systemd-cron-1.5.10.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( pypy3 python3_{5,6} )
-inherit eutils python-single-r1 systemd
-
-DESCRIPTION="systemd units to create timers for cron directories and crontab"
-HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"
-SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-cron-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cron-boot etc-crontab-systemd minutely setgid test yearly"
-
-RDEPEND=">=sys-apps/systemd-217
-	     sys-apps/debianutils
-	     !etc-crontab-systemd? ( !sys-process/dcron )
-	     ${PYTHON_DEPS}
-		 sys-process/cronbase"
-
-DEPEND="sys-process/cronbase
-	test? ( sys-apps/man-db dev-python/pyflakes )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	python_fix_shebang --force "${S}/src/bin"
-
-	sed -i \
-		-e 's/^crontab/crontab-systemd/' \
-		-e 's/^CRONTAB/CRONTAB-SYSTEMD/' \
-		-- "${S}/src/man/crontab."{1,5}".in" || die
-
-	sed -i \
-		-e 's!/crontab$!/crontab-systemd!' \
-		-e 's!/crontab\(\.[15]\)$!/crontab-systemd\1!' \
-		-e 's/pyflakes3/pyflakes/' \
-		-- "${S}/Makefile.in" || die
-
-	if use etc-crontab-systemd
-	then	sed -i \
-			-e "s!/etc/crontab!/etc/crontab-systemd!" \
-			-- "${S}/src/man/crontab."{1,5}".in" \
-			"${S}/src/bin/systemd-crontab-generator.py" || die
-	fi
-
-	epatch_user
-}
-
-my_use_enable() {
-	if use ${1}; then
-		echo --enable-${2:-${1}}=yes
-	else
-		echo --enable-${2:-${1}}=no
-	fi
-}
-
-src_configure() {
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--confdir="${EPREFIX}/etc" \
-		--runparts="${EPREFIX}/bin/run-parts" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--unitdir="$(systemd_get_unitdir)" \
-		$(my_use_enable cron-boot boot) \
-		$(my_use_enable minutely) \
-		$(my_use_enable yearly) \
-		$(my_use_enable yearly quarterly) \
-		$(my_use_enable yearly semi_annually) \
-		$(my_use_enable setgid) \
-		--enable-persistent=yes
-}
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild
index 51db20d0b8ef..b5058f2594e3 100644
--- a/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild
+++ b/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
+KEYWORDS="amd64 sparc x86"
 IUSE="cron-boot etc-crontab-systemd minutely setgid test yearly"
 
 RDEPEND=">=sys-apps/systemd-217
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild
new file mode 100644
index 000000000000..ef1605bcbad1
--- /dev/null
+++ b/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy3 python3_{5,6,7} )
+inherit python-single-r1 systemd
+
+DESCRIPTION="systemd units to create timers for cron directories and crontab"
+HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"
+SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-cron-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="cron-boot etc-crontab-systemd minutely setgid test yearly"
+
+RDEPEND=">=sys-apps/systemd-217
+	sys-apps/debianutils
+	!etc-crontab-systemd? ( !sys-process/dcron )
+	${PYTHON_DEPS}
+	sys-process/cronbase"
+
+DEPEND="sys-process/cronbase
+	test? ( sys-apps/man-db dev-python/pyflakes )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	python_fix_shebang --force "${S}/src/bin"
+
+	sed -i \
+		-e 's/^crontab/crontab-systemd/' \
+		-e 's/^CRONTAB/CRONTAB-SYSTEMD/' \
+		-- "${S}/src/man/crontab."{1,5}".in" || die
+
+	sed -i \
+		-e 's!/crontab$!/crontab-systemd!' \
+		-e 's!/crontab\(\.[15]\)$!/crontab-systemd\1!' \
+		-e 's/pyflakes3/pyflakes/' \
+		-- "${S}/Makefile.in" || die
+
+	if use etc-crontab-systemd
+	then	sed -i \
+			-e "s!/etc/crontab!/etc/crontab-systemd!" \
+			-- "${S}/src/man/crontab."{1,5}".in" \
+			"${S}/src/bin/systemd-crontab-generator.py" || die
+	fi
+
+	eapply_user
+}
+
+my_use_enable() {
+	if use ${1}; then
+		echo --enable-${2:-${1}}=yes
+	else
+		echo --enable-${2:-${1}}=no
+	fi
+}
+
+src_configure() {
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--confdir="${EPREFIX}/etc" \
+		--runparts="${EPREFIX}/bin/run-parts" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--unitdir="$(systemd_get_systemunitdir)" \
+		--generatordir="$(systemd_get_systemgeneratordir)" \
+		$(my_use_enable cron-boot boot) \
+		$(my_use_enable minutely) \
+		$(my_use_enable yearly) \
+		$(my_use_enable yearly quarterly) \
+		$(my_use_enable yearly semi_annually) \
+		$(my_use_enable setgid) \
+		--enable-persistent=yes
+}
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.3.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.3.ebuild
deleted file mode 100644
index eeecd44aa316..000000000000
--- a/sys-process/systemd-cron/systemd-cron-1.5.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( pypy3 )
-inherit eutils python-single-r1 systemd
-
-DESCRIPTION="systemd units to create timers for cron directories and crontab"
-HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"
-SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-cron-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cron-boot etc-crontab-systemd minutely setgid test yearly"
-
-RDEPEND=">=sys-apps/systemd-217
-	     sys-apps/debianutils
-	     !etc-crontab-systemd? ( !sys-process/dcron )
-	     ${PYTHON_DEPS}
-		 sys-process/cronbase"
-
-DEPEND="sys-process/cronbase
-	test? ( sys-apps/man-db dev-python/pyflakes )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	python_fix_shebang --force "${S}/src/bin"
-
-	sed -i \
-		-e 's/^crontab/crontab-systemd/' \
-		-e 's/^CRONTAB/CRONTAB-SYSTEMD/' \
-		-- "${S}/src/man/crontab."{1,5}".in" || die
-
-	sed -i \
-		-e 's!/crontab$!/crontab-systemd!' \
-		-e 's!/crontab\(\.[15]\)$!/crontab-systemd\1!' \
-		-e 's/pyflakes3/pyflakes/' \
-		-- "${S}/Makefile.in" || die
-
-	if use etc-crontab-systemd
-	then	sed -i \
-			-e "s!/etc/crontab!/etc/crontab-systemd!" \
-			-- "${S}/src/man/crontab."{1,5}".in" \
-			"${S}/src/bin/systemd-crontab-generator.py" || die
-	fi
-
-	epatch_user
-}
-
-my_use_enable() {
-	if use ${1}; then
-		echo --enable-${2:-${1}}=yes
-	else
-		echo --enable-${2:-${1}}=no
-	fi
-}
-
-src_configure() {
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--confdir="${EPREFIX}/etc" \
-		--runparts="${EPREFIX}/bin/run-parts" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--unitdir="$(systemd_get_unitdir)" \
-		$(my_use_enable cron-boot boot) \
-		$(my_use_enable minutely) \
-		$(my_use_enable yearly) \
-		$(my_use_enable yearly quarterly) \
-		$(my_use_enable yearly semi_annually) \
-		$(my_use_enable setgid) \
-		--enable-persistent=yes
-}
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.4.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.4.ebuild
deleted file mode 100644
index 96e862e9114e..000000000000
--- a/sys-process/systemd-cron/systemd-cron-1.5.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( pypy3 python3_{5,6} )
-inherit eutils python-single-r1 systemd
-
-DESCRIPTION="systemd units to create timers for cron directories and crontab"
-HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"
-SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-cron-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cron-boot etc-crontab-systemd minutely setgid test yearly"
-
-RDEPEND=">=sys-apps/systemd-217
-	     sys-apps/debianutils
-	     !etc-crontab-systemd? ( !sys-process/dcron )
-	     ${PYTHON_DEPS}
-		 sys-process/cronbase"
-
-DEPEND="sys-process/cronbase
-	test? ( sys-apps/man-db dev-python/pyflakes )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	python_fix_shebang --force "${S}/src/bin"
-
-	sed -i \
-		-e 's/^crontab/crontab-systemd/' \
-		-e 's/^CRONTAB/CRONTAB-SYSTEMD/' \
-		-- "${S}/src/man/crontab."{1,5}".in" || die
-
-	sed -i \
-		-e 's!/crontab$!/crontab-systemd!' \
-		-e 's!/crontab\(\.[15]\)$!/crontab-systemd\1!' \
-		-e 's/pyflakes3/pyflakes/' \
-		-- "${S}/Makefile.in" || die
-
-	if use etc-crontab-systemd
-	then	sed -i \
-			-e "s!/etc/crontab!/etc/crontab-systemd!" \
-			-- "${S}/src/man/crontab."{1,5}".in" \
-			"${S}/src/bin/systemd-crontab-generator.py" || die
-	fi
-
-	epatch_user
-}
-
-my_use_enable() {
-	if use ${1}; then
-		echo --enable-${2:-${1}}=yes
-	else
-		echo --enable-${2:-${1}}=no
-	fi
-}
-
-src_configure() {
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--confdir="${EPREFIX}/etc" \
-		--runparts="${EPREFIX}/bin/run-parts" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--unitdir="$(systemd_get_unitdir)" \
-		$(my_use_enable cron-boot boot) \
-		$(my_use_enable minutely) \
-		$(my_use_enable yearly) \
-		$(my_use_enable yearly quarterly) \
-		$(my_use_enable yearly semi_annually) \
-		$(my_use_enable setgid) \
-		--enable-persistent=yes
-}
diff --git a/sys-process/xjobs/Manifest b/sys-process/xjobs/Manifest
index 77782ff9fcff..2f7347aca2d5 100644
--- a/sys-process/xjobs/Manifest
+++ b/sys-process/xjobs/Manifest
@@ -1,6 +1,4 @@
 AUX search-libtinfo-for-tigetstr-and-tparm.patch 833 BLAKE2B 26c96c1769272fe9c1f0da72083d7878a8cc59c5319d0d3c03b3e20bc9bdfd5b24970b5f50774faee1b0a25a25fcac7ea3c5e5dbb54dedc77943d924951fcb80 SHA512 38fdb82a721f7baded31bc8aaeff0093485d8bd5afd2ffe6c9c800b74236e50b41dccca062ce83861a0c9fb1ab1075302c82c073a20e74c5ff77421faf2ef58d
-DIST xjobs-20170829.tgz 109732 BLAKE2B 7c1db1b8bd5a382364d62093f7c28d4f6d13220c01b757c0f92fe1d20acdce699234e8e0c3fc98105a0e9cd93eb10738473ef95bb1e5bb64725155bc878bdb4e SHA512 9308c239ebf0dfa8374a85d753b2234c083b29e2b65b19028e5e67864df80df345ec232c13777cef8a21d3872408967a065fa8d54761b14a2f452b483b86f80c
 DIST xjobs-20190725.tgz 113216 BLAKE2B 079b6e104bb160101b2c4ef11e73ff040a8efa30839a39f9c91121b4928ddeefaefa43c3a94e18c9359fb6f66862ad7554598561a4e0c7f36b8f622d9a394340 SHA512 23ead9d33ebacb1b3d7a03c72c40dfb34b6254add81b0fde9e458a4be54f6298d2ce6a0b65742ac050685212eea8c5f83d48ea98b09c3928b16e36c7447a9551
-EBUILD xjobs-20170829.ebuild 449 BLAKE2B 5279615eee18292c8c83d2821efb14964f9854f4a783de5b4e86f2a262f9d646e4d1791ca2e4ab22410ebb8682ea618ab3bd3fa11d2cad20707c1f1c0f48f2a7 SHA512 15a3fa66ed30bc1458d690cc5a13c5740fed9c96ef6abe698ef342e3991c782924d142f3f6ec1ecfb02248df54525eb86a32ca4d35f03cc8f0b4ae502359f82b
-EBUILD xjobs-20190725.ebuild 856 BLAKE2B 63f448f1576d3034b9908396d80af0f6de367153f553d985c80870c7b6672372395a816a3dc5e0536383c4cc66444d90233510bac0611ec91274a29b08ce007f SHA512 2c7f8c6e4da7da324b8b665edd22959e56c21f453429bbd635f208dc86aafbbbb6b7e03e6afd9ee5184ebcf20f38f92b20d957fff8dc1862e31206e982a94097
+EBUILD xjobs-20190725.ebuild 854 BLAKE2B 11547a4ac882fbe6147f21f0928b25b329f7578d7ae425ae993e05430d1a340a63e7d40e0fa0ad632fe3946180f4401bd2f4b6e9cf630c3a9d42f62ac88df90f SHA512 00b38eef16fd6261950ba6bae0f937449adaa9f8bedf0c8959f8a9f6855dbf6813f381f4cad0d09e007b40601b5497586696c1a7581a0d76dc31c37584e40beb
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/sys-process/xjobs/xjobs-20170829.ebuild b/sys-process/xjobs/xjobs-20170829.ebuild
deleted file mode 100644
index 00bfacb70cb4..000000000000
--- a/sys-process/xjobs/xjobs-20170829.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Reads commands line by line and executes them in parallel"
-HOMEPAGE="http://www.maier-komor.de/xjobs.html"
-SRC_URI="http://www.maier-komor.de/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-DEPEND="sys-devel/flex"
-RDEPEND=""
-
-src_install() {
-	default
-	use examples && dodoc -r examples
-}
diff --git a/sys-process/xjobs/xjobs-20190725.ebuild b/sys-process/xjobs/xjobs-20190725.ebuild
index 9a5ad730ef3c..b42479647a0c 100644
--- a/sys-process/xjobs/xjobs-20190725.ebuild
+++ b/sys-process/xjobs/xjobs-20190725.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.maier-komor.de/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 BDEPEND="sys-devel/flex"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 91021bc4efed..44f46ce2788e 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/emacs/Manifest b/virtual/emacs/Manifest
index f6e1582b17f8..1423f61007cb 100644
--- a/virtual/emacs/Manifest
+++ b/virtual/emacs/Manifest
@@ -1,5 +1,5 @@
 EBUILD emacs-23.ebuild 328 BLAKE2B e6dbd5a4d576ece6b0cad2735af1fa1c45992eb75ee044cda604fe4caa24cf0bc57f210b00d8b076e6c49e4bb0cac9db98a1785fc4ce40210e4ed2f6bd0316e4 SHA512 11b299b5ed0cbd6eea68b1533defaff0374f782c8aae5e919a14ae0631d2c4cd78346fe4eb29fbf99dfb1a314f3428864d0f4063ea914e9b5d136105d251f83f
-EBUILD emacs-24.ebuild 339 BLAKE2B cae87e842ed652d027ffab4b8afa048fd7b6c04b4949aef273febf9a695466780e7781851b8a6581d26a6c79cb27eceefe66d499f73834b4deeb0e92c258690c SHA512 2d8f9c96242f9240a60b902f6bb07cbd3ea2bee48e3d334c66f0ebb2af1dfa7e1099a3f02f7fa2cfdfce74483b7be51973edf424fbceb38754c2110504325334
+EBUILD emacs-24.ebuild 340 BLAKE2B e622f96a4e77ea60020fa5027fdc8d848aa5faf9b0d4ae8b74cccd3758e5d7fe1e6e78ff1a37ab770709ad48cecb27ebdb824b7a4e651f4e8c20ee88ff367942 SHA512 8359aa1c34ee26dd43e9b1f9fd87116f75656645aea14935d5beb5dac9492913ac8c59e43c9a799f9e7091efddee0e7a714a079aeb68f75db39f62055a0a9873
 EBUILD emacs-25.ebuild 350 BLAKE2B 123c3b9e5f71a0cef721aa6fb96de3a7cdbbeab1637dc30cf6b60e710ceaa2ddff734bded986e630da9410681043566d64b1a9e45d663aff0c8bdf55e7259e14 SHA512 2e771d4d6eba1989fadca5150f46a902cf5ab279f50c24ae7981b16f152e889068c03dce8a67c82d47989120bc2a6ff145a05fa9101218c974960fe57f572957
 EBUILD emacs-26.ebuild 396 BLAKE2B f1d38a5a8bedc622556bdf23634824830f5c51b0b34e4025f98278b80ebdce16123f41e7cddc9e2e932e865e6cc0a3241225fe6bbf1cdbce7990bad5c3352141 SHA512 785c0e4be54db12cb1b9eebc276bfff5dbd0fee66b77bc610b6ce91708b6b95fb58e1f86a2adc4530083cfcc44cb613127a40b961d18c1a971351ad1472f3d83
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/virtual/emacs/emacs-24.ebuild b/virtual/emacs/emacs-24.ebuild
index 165a68448521..5d13080e9643 100644
--- a/virtual/emacs/emacs-24.ebuild
+++ b/virtual/emacs/emacs-24.ebuild
@@ -5,6 +5,6 @@ EAPI=6
 
 DESCRIPTION="Virtual for GNU Emacs"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="app-editors/emacs:24"
diff --git a/virtual/python-dnspython/Manifest b/virtual/python-dnspython/Manifest
deleted file mode 100644
index e4d24fc057b1..000000000000
--- a/virtual/python-dnspython/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD python-dnspython-2.ebuild 449 BLAKE2B 41020933a481a6a96fe3ea4b9ca49926d939f1651de561163af2aab60de18dd360b782f34d26c50dabad738f3adc99fb6c23d268e8f53ac3ae6a8a460999b532 SHA512 64867226e084f4e52a95ac0821e97cdc1e5f55249df63345cbca4f07503b9c492580415bd256a6e8acb5bc81d7972ff8425b6c72ad9e105e79cc115f42352301
-MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/virtual/python-dnspython/metadata.xml b/virtual/python-dnspython/metadata.xml
deleted file mode 100644
index e24dd86faa2a..000000000000
--- a/virtual/python-dnspython/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/virtual/python-dnspython/python-dnspython-2.ebuild b/virtual/python-dnspython/python-dnspython-2.ebuild
deleted file mode 100644
index 8c358155c9dc..000000000000
--- a/virtual/python-dnspython/python-dnspython-2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit python-r1
-
-DESCRIPTION="A virtual for dnspython, for Python 2 & 3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/dnspython-1.15.0:0[${PYTHON_USEDEP}]"
diff --git a/virtual/ruby-ssl/Manifest b/virtual/ruby-ssl/Manifest
index e0a0e059d4da..5c8d4fdb5b80 100644
--- a/virtual/ruby-ssl/Manifest
+++ b/virtual/ruby-ssl/Manifest
@@ -1,3 +1,3 @@
 EBUILD ruby-ssl-10.ebuild 706 BLAKE2B ae4bee957163d3c84ed42c9215c0368de84643c5c5281952d76c20ae4d1170295b32f0927a02d7a81d772d41ae73271710e91baf0e208c8fcefed7af1999b620 SHA512 32cca84a62d31c85052000dabfacc72c3b5c5a2358511dabfc372f283201f30274b8a06d27e03ad6bf65cecece59e5c047bfa2b977bff7f92ea971ad3361aca9
-EBUILD ruby-ssl-11.ebuild 772 BLAKE2B 83269af22af9c1c6fb37622cb60c787185ff5452168201f4f93f7cb2fa883cfb3382f40f1bfe81a84fa31d96f10a5410b19e312d03589c3e98b3ed01df0fa0eb SHA512 81d5ee24bad98c5c7d2527d7fec38615badad2db2da2c265065a68cf119047491ca619479aafa648d496f73ce873c869118dbda25493d15289e21bbbb0076f2b
+EBUILD ruby-ssl-11.ebuild 761 BLAKE2B d05bcc7f695a957f0ea90c9aebe88e88d8a6a7ac95f0ec7d7e8d5eb2565fece351a9d1dfe71f61bed970a61e7663e27f8588fdc998b2acd96944dc34d36cd089 SHA512 42608d40064299b1b1f5b8e4f0525c1a205f01e00832ac5e95a1058610610b9d73e4f845b45a47ef5e51a74c2f0d8f0195de2bed5e0e84b61ede211da73a988e
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/virtual/ruby-ssl/ruby-ssl-11.ebuild b/virtual/ruby-ssl/ruby-ssl-11.ebuild
index f9e391bbd921..5f81fc9bd66f 100644
--- a/virtual/ruby-ssl/ruby-ssl-11.ebuild
+++ b/virtual/ruby-ssl/ruby-ssl-11.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for the Ruby OpenSSL bindings"
 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="
 	ruby_targets_ruby24? ( dev-lang/ruby:2.4[ssl] )
diff --git a/virtual/rubygems/Manifest b/virtual/rubygems/Manifest
index b7323767f379..2381105da25e 100644
--- a/virtual/rubygems/Manifest
+++ b/virtual/rubygems/Manifest
@@ -1,3 +1,3 @@
 EBUILD rubygems-14.ebuild 791 BLAKE2B 1aa8680898dcb38c8498ba516c3abc0ab4db263627a0e62cc6f0b7b4d242765be205fbeb4f83ece2cffb4b8030f820d3ee8c27b94030a9daeed0ee17bc898852 SHA512 4196e3a6dc384316df17740bacd6e5f95f4e310954b3192c7b69d156756a97adba0778052edde2a48c88814d828dba87b94fba9d95afa39cd4b0bcf792af58bb
-EBUILD rubygems-15.ebuild 847 BLAKE2B 1ce3943f8b0c653776ade40ac48ad186ba58d2e86e79e8f5b13681c91b15d5695c5c61fadb87e8b492ece5495951dbec0d112fe5f89a502711e7e698bab5b4ad SHA512 35a9a213b12012d38a0f52ac71f5486bfa20dc851d11b6dc71489f01d5fda6ab08206f7ec8adebede58ad7b96047905183f825be80ef7452adb0fe12023da857
+EBUILD rubygems-15.ebuild 836 BLAKE2B 3949749897001e090bc6e64e6a36ae2eba9db5d550bd2122aa3f2ab3e9e0416cbe3c028a0d518bc9ae37237327a9c83e8c3bea45e96a9383506d4758d5aac770 SHA512 de8d6f7e67f9d7a963c5c714ab6e78e6cd73e3bff1672fd2663a004b7585918341851a449354081d667d35d8e16230aae8a71ffa77d4cbda2332cc614b3b74f3
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/virtual/rubygems/rubygems-15.ebuild b/virtual/rubygems/rubygems-15.ebuild
index 615b1a740170..039c87910cfc 100644
--- a/virtual/rubygems/rubygems-15.ebuild
+++ b/virtual/rubygems/rubygems-15.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
 
 DESCRIPTION="Virtual ebuild for rubygems"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ruby_targets_ruby24? ( >=dev-ruby/rubygems-2.6.11[ruby_targets_ruby24] )
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index b95adbbc34df..32123cb2f524 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_vhost_ldap/Manifest b/www-apache/mod_vhost_ldap/Manifest
index 2b1bf2db1e91..909959ef1a60 100644
--- a/www-apache/mod_vhost_ldap/Manifest
+++ b/www-apache/mod_vhost_ldap/Manifest
@@ -1,4 +1,4 @@
 AUX 99_mod_vhost_ldap.conf 274 BLAKE2B c5449edc94d927247078ad34a58abecc3dc857e6ea475e8c79da2ff9d1dfe62f9b673cf8975736df88cd037d975fcf6ff7df5ea525c14cf413318e0e86003e08 SHA512 597fe675c63118477d8883cc53a7c21c287c0a6446392b2b96243256ebc0a9e30f758b0af5254d0be10cce91aea04bfe030cd6d8793121bebee2c445964e9885
 DIST mod_vhost_ldap-2.4.0.tar.xz 9628 BLAKE2B 8a8fc0718905f43c153a7ae5c7e551a15bb10b1aa77e24010edaff42adffc9d5d9a4f9c6d1a2b4a0d64bf27014c001ce45e4e564ac7624651d688c828f03e0bd SHA512 b9715881ca704207fd852dfa2370dd71993bc85f390b353201aaf40c4252978e720abeda8b29b6c676f3cac66e50b67989825d7a6d3992829fbbfed725c75330
-EBUILD mod_vhost_ldap-2.4.0-r1.ebuild 1140 BLAKE2B b9f75153c04d4e5738c4c3390069c8fb66b0f330f346e419ed500ff67b9ad0a7c01d2c5315d7f399409c9e2a8645337f2d80c1253ab21ce713b6509ffd3bdc71 SHA512 eb9e749e8de39fe1d839f894857c9ec5ddef4e30e9e938778e01f8c3c906775b75e2ba813d87194000380634684d9831d02ec811e2521be7a870df797b255c63
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD mod_vhost_ldap-2.4.0-r1.ebuild 1139 BLAKE2B 0ba3405ae81e1df05057a7efab0303e4445a7d01e449893513087bba802672a5db72e228dfcca7eafbd28a640fd762ced150e25efbe2d3abd8ce13d28d86ccec SHA512 9afb258fae166a3e7272f77af6690a967ac3e4ab56ff494d1116725afc3964946add003b5f571ad7e3b5ae9099f75cb7e752e714b2d367fe750777b79fb470e8
+MISC metadata.xml 252 BLAKE2B 47412b0a561d325d5d054118741229f6cadb2c9eeafa7065512d7d7a341b00ee39c8193ec48450fbecde5475e0f2226acd1ab5b65a15a4eda0f2875549c4b686 SHA512 5ebc803f4287d15f3ccababd8c9ded5f646705930ba45453e0416b00b175beda2e35ac5c053f7aa98df16173e01ab27b04616913472b0f0777aa66374fd66064
diff --git a/www-apache/mod_vhost_ldap/metadata.xml b/www-apache/mod_vhost_ldap/metadata.xml
index 6f49eba8f496..3aedcf9770cc 100644
--- a/www-apache/mod_vhost_ldap/metadata.xml
+++ b/www-apache/mod_vhost_ldap/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">oerdnj/mod-vhost-ldap</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-r1.ebuild b/www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-r1.ebuild
index ee9241f2d64a..6ecb1a326d4c 100644
--- a/www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-r1.ebuild
+++ b/www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-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
@@ -6,7 +6,7 @@ EAPI=5
 inherit apache-module
 
 DESCRIPTION="Store and configure Apache virtual hosts using LDAP"
-HOMEPAGE="http://modvhostldap.alioth.debian.org/"
+HOMEPAGE="https://github.com/oerdnj/mod-vhost-ldap"
 SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index edc0f1668154..591943bb0763 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index ffe063ee460c..8b60aebc2618 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -3,14 +3,12 @@ AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
 DIST grafana-bin-5.4.3.tar.gz 55228439 BLAKE2B 63ee14b1ab074f453c8f1b870b8c0c51365106cb2af59fa20f56805f7add7fec29bc5ecd7e2ffc1f3f6811049e839893433e14b1871cb2aea359f58537b9e0dc SHA512 781466c7477ecb4fbca59006600adc3569d0ee2158da3b75831b1934fd39456030471d4508fbf2d3296d3660dcc8b92782295d7afe458229bad1d64de88ad33b
 DIST grafana-bin-5.4.4.tar.gz 55227302 BLAKE2B f80fcf4447de6eb2f8a450650eb054da6a426e61142c2882cb5faef91b1d9779b77016b822d2f9082c81fe7b6ec14f23996132d880067bd956ac6260b171388e SHA512 c95a3e9b40fdd8fff88c01a66efdda1fc64c258a768bdf65f738562b0c039020de1aa2500cbaa93dff4220715c57ce803ca0ff01344d63a9b8548e4d27dc1af1
-DIST grafana-bin-6.1.6.tar.gz 56569580 BLAKE2B b8122e5ec6104ba211d7d331fd99e3caaea6b4bc2cdeae3315ea84abc6634723d106fb19b27f68ad5f5f0ff84648f8ea84254a3b0c96519702349acfeb6bd753 SHA512 b8851df5a00b752777c168446326603c5e00ed66e7217551c75a976961c9de1f5a5bf0d262068866ecd0dae685a09ac8829db2bb5201c32e1ecaed6bafc149e4
-DIST grafana-bin-6.2.5.tar.gz 58512371 BLAKE2B 6b56930c620e25948a6f1d662c7fb5632d3ca0a6476b605e9623d9b96e1c29e400bb3e17613e32aaf79bda5f6e7451867d0a14b7f9c1f4d47e8f92c13a226311 SHA512 b260616f0df47ce97084648d392a405b78ada4ff3aa8c8414da463ad865549e3118ab084cbba6edb7e427109dc19a5ab1ecc723d28a564e98d654df4dbb92b64
-DIST grafana-bin-6.3.2.tar.gz 58757623 BLAKE2B 91fc5a6af7076d121673d76ca13e47884dd498cdc6c9a53dfdf068f4710a8f802a64a5f81dc0c311f696285cd50d0490b5baf123a9f43eb2e5ea2e2387113852 SHA512 d758b57755a30af3eee86e8c3e302c9288473c947edbedace7dabbfa125faeb9453aa3e37ae983cd6c6954edb97235a4d4df26ea5ff65cdc903c3ef6b8c62958
-DIST grafana-bin-6.3.3.tar.gz 58755664 BLAKE2B 59c542ac033fde899e6a3fa042378ce245bf31c1ba832c3b0913256a5771316a234b98a53fdb433d0368f6169d16a1d0cb9138de4476c43b4a51e22a49b3cad4 SHA512 dc24695d77755e51718eaadfbba61627637146b3110ac8f06b76812a37e6fe16a97934d512d632fee7b61c9410454f9c867dc2c6e1206881fe1808064a6ff576
+DIST grafana-bin-5.4.5.tar.gz 55227168 BLAKE2B 23201dfc85a748b62f5289b53c5ea6549c7c3ddfe278b51a10c22f5be9ec85cc925f3fb4c130adacd1dc036c89f956a867f47d1d6e876fbd55c437aa740116e6 SHA512 861a6c082b006ee3a4cbafad0a65e117912d76aede2073faa264c34452dc6f93d3d0c727a66891bc1155924d1c8419232f794ca621aab1d768302668380c15e7
+DIST grafana-bin-6.3.4.tar.gz 58756149 BLAKE2B 847e88cc81aabbb208aeb4bb3e3c8c98346021e6445189d3dfbe526a007f3754ac1912fee8d8ced82cfb30555ac88d4a76bbb3bc9ee0bde604048c865850dddc SHA512 6ea604c25776420355e3d1daa0ac138884587ad16cb9b293e0f771edc57eb070a32691ab24dcf937fd4d8fb8f6562f3600c0663d17fb24c40ecffc33b0320d69
+DIST grafana-bin-6.3.5.tar.gz 58756804 BLAKE2B ffa96e5fd067dbe3590c8102c8ac93337679d968c19ec0decf44a39118d4473da82ac2f6702400cc57c22ea7703af3e7cd39aad9a1c63f41c5613b3d5bbe2bed SHA512 0298894f845fa6e322f3fa51364ba24617f3847c2f597a336ba3c1e761165a11efb9a884c3cce8856281bcb8ea3b66341c5ba301f58ce6bf2a8d0328ecd774bd
 EBUILD grafana-bin-5.4.3-r1.ebuild 1969 BLAKE2B f90d9c8c479edfd60eff8a4c6823fad5ba9683411a6e9b4e137a77990f528d6184ecf0f917520209dd4497e1cfef9198fe305bb76a9c6c4911cd09204481a69a SHA512 d674745ae0614747c945e96990c17c89c1c7e027e909c92a8e08a898d9567d531900e56ea5f2714128549b2094fdc568da3949b6578fd9bb84f3d78c4b339a10
 EBUILD grafana-bin-5.4.4.ebuild 1944 BLAKE2B be7426448610d8b2875bd13a8f37d7c771193e236f572699224dced158835b1fb050573fc425e1d1c8ff4b216aab730ceccd666052c3467d86cca0b88a57fae2 SHA512 ae168b08b5f7c14b0f54d94be5e10fb9ef2c2c4875c8db7b2299cf087734687dc448d08b5f4fdd06ad2c219c29dd5a82802e7e2f68dd0be0daf698fdded24ccd
-EBUILD grafana-bin-6.1.6.ebuild 1971 BLAKE2B f8d887e76e958c29296e441bb7165590d910ec9e43c717244e264bd266abdf4874c5ac63c789a61afdf81c5602ac2411cf992507d03b3a941a28a870a3f00051 SHA512 cad905e8e9aa9a8f02431b6fe3c0f780cba7c2ddf3db9477a48bbc0fae8f3b800407e95a926b203b34414be2386bcc21c6b590d9657266f709be95a5e6ed1305
-EBUILD grafana-bin-6.2.5.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
-EBUILD grafana-bin-6.3.2.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
-EBUILD grafana-bin-6.3.3.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
+EBUILD grafana-bin-5.4.5.ebuild 1944 BLAKE2B be7426448610d8b2875bd13a8f37d7c771193e236f572699224dced158835b1fb050573fc425e1d1c8ff4b216aab730ceccd666052c3467d86cca0b88a57fae2 SHA512 ae168b08b5f7c14b0f54d94be5e10fb9ef2c2c4875c8db7b2299cf087734687dc448d08b5f4fdd06ad2c219c29dd5a82802e7e2f68dd0be0daf698fdded24ccd
+EBUILD grafana-bin-6.3.4.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
+EBUILD grafana-bin-6.3.5.ebuild 1969 BLAKE2B e90820bbe240031ddf9556073f2b1947730d4d6b667257a0015b61db350f3b78b74f416c9b47cd272296e6fef023945f15e896680f809e661b3a6adc59795297 SHA512 1d7ced95a186b315fbda5dd7bd2a1ccb45daa5a4706fe36d7f35853747fc51350ffaaa199a326bc6998e7299bb9104319fc58ae606d0429ce0c4147581e6ce2a
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-5.4.5.ebuild b/www-apps/grafana-bin/grafana-bin-5.4.5.ebuild
new file mode 100644
index 000000000000..33385776ece0
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-5.4.5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/${MY_PN}-${PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
+QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	exeinto /usr/share/grafana/tools/phantomjs
+	doexe tools/phantomjs/phantomjs
+
+	insinto /usr/share/grafana/tools/phantomjs
+	doins tools/phantomjs/render.js
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/grafana-bin/grafana-bin-6.1.6.ebuild b/www-apps/grafana-bin/grafana-bin-6.1.6.ebuild
deleted file mode 100644
index 7760f27c61fd..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.1.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-pkg_setup() {
-	enewgroup grafana
-	enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	exeinto /usr/share/grafana/tools/phantomjs
-	doexe tools/phantomjs/phantomjs
-
-	insinto /usr/share/grafana/tools/phantomjs
-	doins tools/phantomjs/render.js
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	elog "${PN} has built-in log rotation. Please see [log.file] section of"
-	elog "/etc/grafana/grafana.ini for related settings."
-	elog
-	elog "You may add your own custom configuration for app-admin/logrotate if you"
-	elog "wish to use external rotation of logs. In this case, you also need to make"
-	elog "sure the built-in rotation is turned off."
-}
diff --git a/www-apps/grafana-bin/grafana-bin-6.3.3.ebuild b/www-apps/grafana-bin/grafana-bin-6.3.3.ebuild
deleted file mode 100644
index ed520bacd97a..000000000000
--- a/www-apps/grafana-bin/grafana-bin-6.3.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_beta/-beta}
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="https://grafana.org"
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	media-libs/fontconfig"
-
-QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs"
-QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}"
-QA_PRESTRIPPED=${QA_PREBUILT}
-
-pkg_setup() {
-	enewgroup grafana
-	enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini || die
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	exeinto /usr/share/grafana/tools/phantomjs
-	doexe tools/phantomjs/phantomjs
-
-	insinto /usr/share/grafana/tools/phantomjs
-	doins tools/phantomjs/render.js
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.3 grafana
-	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
-
-	keepdir /var/{lib,log}/grafana
-	keepdir /var/lib/grafana/{dashboards,plugins}
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
-	fperms 0750 /var/{lib,log}/grafana
-	fperms 0750 /var/lib/grafana/{dashboards,plugins}
-}
-
-postinst() {
-	elog "${PN} has built-in log rotation. Please see [log.file] section of"
-	elog "/etc/grafana/grafana.ini for related settings."
-	elog
-	elog "You may add your own custom configuration for app-admin/logrotate if you"
-	elog "wish to use external rotation of logs. In this case, you also need to make"
-	elog "sure the built-in rotation is turned off."
-}
diff --git a/www-apps/grafana-bin/grafana-bin-6.2.5.ebuild b/www-apps/grafana-bin/grafana-bin-6.3.4.ebuild
index ed520bacd97a..ed520bacd97a 100644
--- a/www-apps/grafana-bin/grafana-bin-6.2.5.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.3.4.ebuild
diff --git a/www-apps/grafana-bin/grafana-bin-6.3.2.ebuild b/www-apps/grafana-bin/grafana-bin-6.3.5.ebuild
index ed520bacd97a..ed520bacd97a 100644
--- a/www-apps/grafana-bin/grafana-bin-6.3.2.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-6.3.5.ebuild
diff --git a/www-apps/hiawatha-monitor/Manifest b/www-apps/hiawatha-monitor/Manifest
index c998c17cbaaa..991159aabe9d 100644
--- a/www-apps/hiawatha-monitor/Manifest
+++ b/www-apps/hiawatha-monitor/Manifest
@@ -1,3 +1,3 @@
-DIST monitor-1.3.tar.gz 588836 BLAKE2B c9ecfadd2210c0eb48960741da0ad4c1239407d416e427e6faaebf7e25a2bc90894eb4f8649c8b054bb203f06e206d4af74c821ed3afbabc9124854569d0a560 SHA512 480ef2d2216a47a7b5758e2ceb089233b5f5b3174460a2b7b43f006c76ce9e12a592574d23b6661b7a5408333a40d6867eee3417ea4aa1a9a0c82772114a21b1
-EBUILD hiawatha-monitor-1.3-r1.ebuild 604 BLAKE2B f575704869b547af69e76d808eda0d0c1927f8b5ba22b25ec4af93dac2c126bd278ecf2ca4be3cd8bc392c071dc74647471e453b81db1a12da76d893b7f329b4 SHA512 dbfef4f0427d21e1d74988aca395013d32a3183e4bd6108266b443f429982f9951ffe9189f072b67b294959629491b3df8747ec2167f9631a03cdd27e11dc96f
+DIST monitor-1.6.tar.gz 622470 BLAKE2B 79813f162dae9a72b9e62550e58b737b878e69d1eb6ce348f62dd9d8c4309529b9dd77eeba6876fec90d0db6c3894aea5c62ada940a17d53bb8cba876ec31855 SHA512 4983638bfa0bfbe3f391b2319cf2f5ba63527cddc8c667618aba001929140453c8058f35d83bedb53f4dc0e5d5139d3a33dd7d9bac46f94e32dff81e65d53f5e
+EBUILD hiawatha-monitor-1.6.ebuild 659 BLAKE2B c01cb2ee90f04d2e555cdeb364d4defa1cbe69d65cfda691f21fdade0c97eada188072500877b58a5f048c16001dc0347990f6f799513362afd82d816f921673 SHA512 1de850cccf438c939f3759338dc00211d06b83470a66bffa3815f3a4954469cde6d9acb3b202d41cae0198d387f9d3c8d4f3fb38120e58c67729a7fc4a0b7348
 MISC metadata.xml 249 BLAKE2B 78cf5de7cc4f9c49b514c40b2d0f5fed411e2e0db2949740f1fd94a3a030e7d71f3399943c3bfe3a01a5fffcb47d27c81e246eeb2f1f371f372fd0a516a6e409 SHA512 c6ce77692bce0084c97651da1c6ecbe2859ce92244618f128c0e74a3ff918b38a29563d40c5d1ddd8beacc17ea306d62f536dd4587f0538158b1e283172a3f74
diff --git a/www-apps/hiawatha-monitor/hiawatha-monitor-1.3-r1.ebuild b/www-apps/hiawatha-monitor/hiawatha-monitor-1.3-r1.ebuild
deleted file mode 100644
index 5ba20143b6b2..000000000000
--- a/www-apps/hiawatha-monitor/hiawatha-monitor-1.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="monitor"
-
-DESCRIPTION="Monitoring application for www-servers/hiawatha"
-HOMEPAGE="https://www.hiawatha-webserver.org/howto/monitor"
-SRC_URI="https://www.hiawatha-webserver.org/files/${MY_P}-${PV}.tar.gz "
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-lang/php-5*[mysql,xslt]
-	virtual/cron
-	virtual/mysql
-	www-servers/hiawatha[xslt]"
-
-S=${WORKDIR}/${MY_P}
-
-src_install () {
-	default
-
-	rm -f ChangeLog README LICENSE
-
-	insinto /usr/share/${PN}
-	doins -r *
-}
diff --git a/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild b/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild
new file mode 100644
index 000000000000..8444fca6d85a
--- /dev/null
+++ b/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="monitor"
+
+DESCRIPTION="Monitoring application for www-servers/hiawatha"
+HOMEPAGE="https://www.hiawatha-webserver.org/howto/monitor"
+SRC_URI="https://www.hiawatha-webserver.org/files/${MY_P}-${PV}.tar.gz "
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/php-5:*[mysql,mysqli,xslt]
+	virtual/cron
+	virtual/mysql
+	www-servers/hiawatha[xslt]"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ChangeLog README.md INSTALL )
+
+src_install () {
+	default
+
+	rm -f ChangeLog README.md LICENSE INSTALL
+
+	insinto /usr/share/${PN}
+	doins -r *
+}
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 5f850dc1d72c..5f92c97da446 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,10 +1,6 @@
-DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 2a7ebe4ee84ea311a1e0cac14021db66c0950be74d5984bb055983cd24e0277b43945f0b78ee98edb123412dfd116f875803c988612cd2a8b247f36b7c55f04a SHA512 f5fffbec237b892dbcfeee75a23ba26005cad9b4a1505a4d500bcbd16a8fa29125ed255ee320d3efcd8e43dcfb835244234a5607c562dd8bebe871d1a356b520
 DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb SHA512 f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710
-DIST icingaweb2-2.7.0.tar.gz 8332315 BLAKE2B 7295208ef1805bd42fd7e173b238c3e939d499e79f674b7b4e4111e33f76bc5dac303216755997808fa7ad043ece3c5c17a158b5531647187135748c0fdcf846 SHA512 37bb15eebfc68bbdf4a20131d279d9696587d265084fcfb9b1c52d52d4f91a2cc04ff1b9ab1a2db5177250ad4baf9e9fbcfafc069645d9aaf297b9667b471994
 DIST icingaweb2-2.7.1.tar.gz 8389123 BLAKE2B f5e469c1fde2b7bc2c22f898a5fb5370ca3788571501f070ed56b32afe8a155aafe70a06bbe09b77cd996725c3e176363aaf0fa885bc843102c56ddfa14da11d SHA512 0300e483e83699a79750dcfd4467a151fcfa95a1eb8735e8d0d8e5d59595ad252b630add3cb462fa4c115b2891f9ab904739ee36d5eb7fcdfb489c9d7658f1b6
-EBUILD icingaweb2-2.6.2.ebuild 2750 BLAKE2B f3a93c50db31b0d18d442a76ad42777bc26136a1aa10baed09c31ebf8b31529e76c21f9c26375e17bf9bce3ff10325e8e6f9cf7dde0cb7a7ddcb34a6788450b0 SHA512 1eff0bc5243c531f4d869ad8d0cf91551649dcae50489dfaad45d342777a6714dc58e752a315a00bae9967664b5b5c74386ebc2fef9193f3553c1027ea0fde70
 EBUILD icingaweb2-2.6.3.ebuild 2527 BLAKE2B 804935e74b5969090cd6caca25e16e0537ce9c467007fa72a56011b0b852b01920bb3592bba24da63a57767d3385229851749eb1a829e62523b6995ebbc6d9ce SHA512 7030468c78d304c7d745d95b3acbe1f8782b323126664449785ce9145fab750dccff5daf2c97e72179fb483790e9a978585ffc9d9e81c6723db337ba9fe96d1c
-EBUILD icingaweb2-2.7.0.ebuild 2529 BLAKE2B 49280ea2832b73adbbb3a246cbea7bb10871be65e2741a1324712727508f0f4d344217568e1f77a8f520cd1a490f614d44bb22c762c57103d98625c82f940e69 SHA512 7d4c16ee5dcf92a26096c8ec7ca084d5b36afa25652246d0c34207d1a53a83fef34d625377b0c44e2648df3573a7241c7d4f16a6356fbc17c1f0bd969d59f0ea
-EBUILD icingaweb2-2.7.1.ebuild 2529 BLAKE2B 49280ea2832b73adbbb3a246cbea7bb10871be65e2741a1324712727508f0f4d344217568e1f77a8f520cd1a490f614d44bb22c762c57103d98625c82f940e69 SHA512 7d4c16ee5dcf92a26096c8ec7ca084d5b36afa25652246d0c34207d1a53a83fef34d625377b0c44e2648df3573a7241c7d4f16a6356fbc17c1f0bd969d59f0ea
+EBUILD icingaweb2-2.7.1.ebuild 2527 BLAKE2B 804935e74b5969090cd6caca25e16e0537ce9c467007fa72a56011b0b852b01920bb3592bba24da63a57767d3385229851749eb1a829e62523b6995ebbc6d9ce SHA512 7030468c78d304c7d745d95b3acbe1f8782b323126664449785ce9145fab750dccff5daf2c97e72179fb483790e9a978585ffc9d9e81c6723db337ba9fe96d1c
 EBUILD icingaweb2-9999.ebuild 2529 BLAKE2B 49280ea2832b73adbbb3a246cbea7bb10871be65e2741a1324712727508f0f4d344217568e1f77a8f520cd1a490f614d44bb22c762c57103d98625c82f940e69 SHA512 7d4c16ee5dcf92a26096c8ec7ca084d5b36afa25652246d0c34207d1a53a83fef34d625377b0c44e2648df3573a7241c7d4f16a6356fbc17c1f0bd969d59f0ea
 MISC metadata.xml 530 BLAKE2B 855edf88f825a4c2f286068f7195264f1ca75f15aecf56d322a2e96b79ccdbea0b45c0a9a6cc4025dd2632cb0c97b60ffda3dd859adb7a2cfb35c0373c72bc0f SHA512 4ec6c57d7342dc1fa154f16e262f762374e37f6e4db09290c1b1188cc27ee605697d28b8349c51dee71fbfd5a90fd091e17b1dff4c9c9745bd6e69df8191897a
diff --git a/www-apps/icingaweb2/icingaweb2-2.6.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.2.ebuild
deleted file mode 100644
index da0929cc43f7..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.6.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 ldap mysql nginx pdf postgres"
-REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2? (
-			>=www-servers/apache-2.4.0
-			|| (
-				dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.2[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			)
-		)
-		nginx? (
-			>=www-servers/nginx-1.7.0:*
-			|| (
-				dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.2[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			)
-		)"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	enewgroup icingaweb2
-	enewgroup icingacmd
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.7.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.7.0.ebuild
deleted file mode 100644
index 45655f2ebdb1..000000000000
--- a/www-apps/icingaweb2/icingaweb2-2.7.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
-REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-		dev-php/pecl-imagick
-		pdf? ( media-gfx/imagemagick[png] )
-		apache2-server? ( >=www-servers/apache-2.4.0 )
-		nginx? ( >=www-servers/nginx-1.7.0:* )
-		|| (
-			dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-		)"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-
-	enewgroup icingaweb2
-	enewgroup icingacmd
-	use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-	use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
-pkg_config() {
-	if [[ -d /etc/icingaweb2 ]] ; then
-		einfo "Updating existing installation ..."
-	else
-		einfo "Running first time setup ..."
-		einfo "Creating configuration directory ..."
-		/usr/share/${PN}/bin/icingacli setup config directory
-		einfo "Creating authentication token for web setup ..."
-		/usr/share/${PN}/bin/icingacli setup token create
-		if use apache2 ; then
-			einfo "The following might be useful for your Apache2 configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
-		fi
-		if use nginx ; then
-			einfo "The following might be useful for your NGinx configuration:"
-			/usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
-		fi
-	fi
-	einfo "All done."
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	fperms -R a+rX "/usr/share/${PN}/public/"
-	fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
-	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.7.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.7.1.ebuild
index 45655f2ebdb1..4d66e260c407 100644
--- a/www-apps/icingaweb2/icingaweb2-2.7.1.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.7.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 3979b2c7e05a..5ced1eee8e0c 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,7 +1,13 @@
 DIST nextcloud-14.0.13.tar.bz2 54819878 BLAKE2B 2c53f30fac29d012b4d2ad0015c1d875389182d8c6c538a27b1f1602ca726acbfdb5ee79adeb653a9595ec70bc3d9fd5fe6896322574c76b83021ab03d624f80 SHA512 827bd34fb7e0388ebd289ad8e71b18dd54ad25c833730f64b1d1b0d0fb188ec5c61afcce8727079381df65acc431cab491fbc293946423cf9c704bfb7277a4d4
+DIST nextcloud-14.0.14.tar.bz2 54774735 BLAKE2B 41016b45f3a07081daafeca39267f78cea5e04dcbebad62a73764f88749e628f6399929e07c2438c8cea2971891241d8b7ba066b1d02673c5827c0cd1d2429c6 SHA512 8efdcafb9cb1b52964cb6a8319e7bbdd633fa7a65b497b3cabd1a58763c88ce5de9f09eee0b9b6916f4c9c6aec86cd3df5c617c33120bf6280c43cfdfd789164
 DIST nextcloud-15.0.10.tar.bz2 56629162 BLAKE2B 4248b8c6fe9ea3f7459821f57bf3c03e6d4b6d164a79ee20d451748b10d32c51debc2527083c895317ee7cf510f542f62257b2724bcc0d57ad6fb86ad9f98d1d SHA512 7bf769cec9cb5cefcd685c8e5bea394d2f46361eb4a576df667c19ffb40342533add8c8cd9e7645a1c2a35377ff73af699836fb6f80a041a18646eca6742bd40
+DIST nextcloud-15.0.11.tar.bz2 56842330 BLAKE2B f60f16081125b327b0426ab6406d71d94d6ee3a6b8b45c023476e142caf8a4d5c435bac83635e05a6e711e55d1f8503fb18935fab0de44348cdff12be66da86f SHA512 578c73696efb5c2f2ffff5a0259c5bafa7f1c9d2c7a69e7359946fbe5a53350b096c78a00f9efe601583044e6fb1128202ab3f3e708c8d7ed7e334f07dc9683c
 DIST nextcloud-16.0.3.tar.bz2 61612508 BLAKE2B 39d46eebcabdda443d7f517283be14a869f3ea21a7bd870f53ea93a9621ff86186e136a5cafd8f72ffa4663e05a65e87a9d77e16a95a59f26b697d64d5f95c14 SHA512 024060da6e1085206c962576b2d69ea914916073886df984e86d0c9c31d6e64916a67dbc3e7ad581aec3c2cf618688eedd67f4f0c0d5e099b3dbecc00a6761fe
+DIST nextcloud-16.0.4.tar.bz2 61914385 BLAKE2B cfdcccb85c80186c6e1ccb6ddb7f6aab4908ada0053d40cfd4bb5d2974eb35c3665801f59cbbd1f33db3982f5510523716438243092a9aee35d5359fabaa573f SHA512 4f061cec58225ee28bd15049db0fdcd51215ef0135cb28272b8209aaea0221f92fce1766b5ea1d98e3dd66e14eb3edf943485e4fc7b9f07887be8ebcb0fa3f13
 EBUILD nextcloud-14.0.13.ebuild 968 BLAKE2B af3ec1330181013ef1ccd788b7f49202027a1d58982579ffa191f98ad811b874c84944dba9ec3818b7a801bdc8c6fdd6f0543f5f2b9310ed46c07590c2e97a18 SHA512 3bf786cc606d6dfdaa433db9b234827c8aad4905c708507146c9b24eb5f7d320fd00faa2eaaeb8e24a862c8198bb2ec8f8056a50d88943aba89185913f9c6a51
+EBUILD nextcloud-14.0.14.ebuild 968 BLAKE2B af3ec1330181013ef1ccd788b7f49202027a1d58982579ffa191f98ad811b874c84944dba9ec3818b7a801bdc8c6fdd6f0543f5f2b9310ed46c07590c2e97a18 SHA512 3bf786cc606d6dfdaa433db9b234827c8aad4905c708507146c9b24eb5f7d320fd00faa2eaaeb8e24a862c8198bb2ec8f8056a50d88943aba89185913f9c6a51
 EBUILD nextcloud-15.0.10.ebuild 1020 BLAKE2B 0f66534ceeed2b0fc137c8866df2d39b1edf05e833cd4f90b8042d0d8f18bbed2276e9da9eb0404a7b70630f3b0c2fb6d80a8462104d8e8b55977f8f0b2d0920 SHA512 b20ac83dab116a2e604b00d4a26d5f0efd75598d69d76575c70e543be089fc3db45097f2fb4a58b7491730ccbc3bcd34dbd5f39162bea8db0f4937e2b62c7730
+EBUILD nextcloud-15.0.11.ebuild 1020 BLAKE2B 0f66534ceeed2b0fc137c8866df2d39b1edf05e833cd4f90b8042d0d8f18bbed2276e9da9eb0404a7b70630f3b0c2fb6d80a8462104d8e8b55977f8f0b2d0920 SHA512 b20ac83dab116a2e604b00d4a26d5f0efd75598d69d76575c70e543be089fc3db45097f2fb4a58b7491730ccbc3bcd34dbd5f39162bea8db0f4937e2b62c7730
 EBUILD nextcloud-16.0.3.ebuild 1020 BLAKE2B 0f66534ceeed2b0fc137c8866df2d39b1edf05e833cd4f90b8042d0d8f18bbed2276e9da9eb0404a7b70630f3b0c2fb6d80a8462104d8e8b55977f8f0b2d0920 SHA512 b20ac83dab116a2e604b00d4a26d5f0efd75598d69d76575c70e543be089fc3db45097f2fb4a58b7491730ccbc3bcd34dbd5f39162bea8db0f4937e2b62c7730
+EBUILD nextcloud-16.0.4.ebuild 1020 BLAKE2B 0f66534ceeed2b0fc137c8866df2d39b1edf05e833cd4f90b8042d0d8f18bbed2276e9da9eb0404a7b70630f3b0c2fb6d80a8462104d8e8b55977f8f0b2d0920 SHA512 b20ac83dab116a2e604b00d4a26d5f0efd75598d69d76575c70e543be089fc3db45097f2fb4a58b7491730ccbc3bcd34dbd5f39162bea8db0f4937e2b62c7730
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-14.0.14.ebuild b/www-apps/nextcloud/nextcloud-14.0.14.ebuild
new file mode 100644
index 000000000000..403ce74658a7
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-14.0.14.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/nextcloud-15.0.11.ebuild b/www-apps/nextcloud/nextcloud-15.0.11.ebuild
new file mode 100644
index 000000000000..6762ab12cd6b
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-15.0.11.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/nextcloud-16.0.4.ebuild b/www-apps/nextcloud/nextcloud-16.0.4.ebuild
new file mode 100644
index 000000000000..6762ab12cd6b
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-16.0.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 2c53f15f82e6..1e518d09bdc5 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index b559ad60884f..e56071f0c602 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -10,16 +10,17 @@ AUX chromium-76-gcc-private.patch 3159 BLAKE2B 0b902c4f3e679af034cbe557b057cfd68
 AUX chromium-76-gcc-pure-virtual.patch 2358 BLAKE2B e591bdeb128877e2d0ee1e873033220efd4c75f4130bf1cda940cd2596c7ccec92d8f39e6b57b55fc72c4a9c58ff3ca634b9cb66064b5e4eed6906ef24c97071 SHA512 0401d9c105a1e8d13018a1d06e15e163c4db40810188a8f2623808e5ef2c220b5a9da520e20ffac8a91220ee13f51f391a82401b8d1de47476557e30d853cb65
 AUX chromium-76-gcc-uint32.patch 1203 BLAKE2B f87e17576c32cdebcb59d158bd102b12207549d553d94c05b397f357308eb89eb44a317f2368247670cd74b8ea17be2d6f81545da411f5b4ad3fe7d5cc27466c SHA512 ff840d0520b1515b64ba5c4e7d8f17f58ef783b8b9002f6952e194887dd7b78ca19c743e7c3c5ef8d427ee03559d3ad5b00bb518ef12e8688fa7335ef50b9dbc
 AUX chromium-76-gcc-vulkan.patch 5870 BLAKE2B 3bbe5eca8b70d244a734e1c2b4e237dfb67f1782206d50663caf47035c53d422ab33c82ba13af9ee668463f2c55329b228f03cbce4152f0b809f7f486c2fa4bb SHA512 77ccefbed977e92dc1645760569a51c1602b0701aaaddf9141ea946f1762fa2eeb7e9e8b2486589e7a21822835ea70ca230dd9fa392d3a444efbf14afeaa746b
+AUX chromium-76-no-cups.patch 1725 BLAKE2B fc4161771977668ff3e00e2b884609697b0141fd77a8cca41e4517f781b19d89c437593b1c47fae6918f88d0f28069dc5866facf533d0164a5982829029837de SHA512 1afe9d7ab111642ec2abd169e5665f6a24d58e5c5dcfa12baa4188459cc5a0880ec737e012b27162aeace98ef4f01cb0851f7b4dcae3eefe28d433b98d75d300
 AUX chromium-76-quiche.patch 10020 BLAKE2B 54b2bd89ac3bdba6e770e55c03957af9149c6259ae33e1e57a50feb7fbc7d6b98f02f0a9212acab8a075f682121f4e8413b3f5cd03cf3a557ce0329c17a7f661 SHA512 759db973253687e915e446aa92ae882d0e9a030b10ac134bbae37c6b43b3e91cb47a11d50957a860e3d0c41f3ae07e091c917626d38a0eafa06b9fbb68f91915
 AUX chromium-77-blink-include.patch 1065 BLAKE2B 09efdaac62f5bf47fd368b08c90b58d0f61d849a8a365fe3963712d3adc3dcea4fef36e15666b5fd907e8204c7bedc400c8c2021425fc9b98b2e2328b6c5ffe7 SHA512 2e7ec441108ef36a6cfd711a35ca728a5464bfd0dd3ee78ee9659eed3266ce673b53402499fd8b8ca5f1366e2d1b8f8c5903585fd20924d0393a655d5d0ef369
 AUX chromium-77-clang.patch 411 BLAKE2B 95209cbf367f62cd77c7acad3b4a0e55e0f3fd509e58a53cbd3579edf37211f4a55180f77e8b1589fdeb0b6e1d38ca6eada6d67b08c19fe2a1bd019c587afeb2 SHA512 501c33ef25abf8148c4b0ae474cb354c2a32edfb36a4f041a14a5d1a8706a80395a2e2f117bcc31e5671e6e58710faa29f9ac9dcae8b4af8952310f578a572cc
 AUX chromium-77-fix-gn-gen.patch 383 BLAKE2B 63cc165468ef1db93b9b4764d73790526cb71d91c384dd2d7d3a4c9e212e34ef8edbdab3a01213a0fc7f378cbe80d3a6e726f2448a1e9f97fa31848a80b854fb SHA512 3e690af4cd5e5631da30abb75704270fd5176419e515c8e6541265a73d490df2018646b27e867bd2f26d7ca918ea276a2a7608b463d8a2acc26ec43f8f52ee6c
 AUX chromium-77-gcc-abstract.patch 2667 BLAKE2B ad316c185b12e1c7b2a378eac908590e7db546ab72387266db4315bf7a40015381a0cc494aa9d3d6e14873cf28d7e5bb5f6dde4576f301297e0f711eeaa6fbc8 SHA512 e2c69dd72d7cb9f0fa29b56f5c9788cea7c60e753129a69731b94e1854a3db0e07cd4cb53e3c8c2bb1a999cdda546886292e47ba159f3138c211ee3c3e3ffca6
-AUX chromium-77-gcc-include.patch 2306 BLAKE2B 6a5189df9411e4f1ad71d68cd28a24fbf7b5aad6ed48e8da98efe0e68252a0758cbf84726462205a5f1f9223d01554a6e54d9ea489d32f9ff37f340099f46e83 SHA512 11ba37fbca5fe32ca94473e8cfd1d5124745f63bbb9dec318828727e4f9ac03ea9946dc20fdfa920c5ccf3681cb9922c2a16b119266e7c541663da3d588ab04e
+AUX chromium-77-gcc-include.patch 966 BLAKE2B e73bf54cd864b8afb4a7a0b5c3472aac9ad8112c5d9d6dd4c7e7a915f8612cb303b5235a2fdda2ba54ede1467c84c4feb1fd310aeefcede1b16b0ac4e617cf18 SHA512 f47c07493870abd97ddfdd7f01c81c90109db804e50ac174b59ce98f161ae2f7721e01a8865f9bc35fabf439be2bd70d944cb1ca8e2e84e340b7da0ed26633e0
+AUX chromium-77-no-cups.patch 1748 BLAKE2B 3b3fc92f9be0ad0c4b8f7918c290385f408b04731f5587be42277312bb9a78739a5e3697a6386143c6700db805ac52086d9f3aa0556682ee6134135dec606129 SHA512 3c8ee9cd42b81ba9ae95090dda9d22efabc86c151e35a6f74a949d3f6d760f0e8d7e654602beee71420670cb0b3532788ca563076f389557c097af2569d455db
 AUX chromium-77-std-string.patch 4640 BLAKE2B 9561bf2049364960b0cfd340eb29b86810354a5d20f5785b2c1fbe8c44e584f2c98c4af9e80633760c09f3908266765c0c234a38dd3e26601b5fc21f0dd6127f SHA512 9dbad2497cd3e5a47e9135c1553eebbc8ae8098dd6cf2a9a5625a6bbed70a478434167f2de7c52ff84711a8da0c9636c499dd6c4495bf6904796fdb023a6510d
 AUX chromium-77-system-hb.patch 459 BLAKE2B b1ac6e0007ca3aa26acd7f60e1c48ef8c0bdd80fa3e7f6ac97dc6a977864208e66e333b28bc64b9410fc368c27166b177669d09caa42909a9249059848a9f4aa SHA512 03696d8083127fd689a7953724c625a5eda3f67bad8121531dbaaefa01e2a91007d4c27bca07d137f50c5c03f14d45ba76e79ca859abf36f0fe34b9ec56dd1ac
 AUX chromium-77-system-icu.patch 649 BLAKE2B 7910fcb64460ef965eafdd05e98d41d14399fd337ac8f79bcb2c7059fccd61d552ab6efa1dbf8bdcce564716b3d12b41a587077034cb72ef610eff76f4e052d6 SHA512 7413e0cca7102008dd5bee443dcde90be69ef1d0973fee576f70544f0d0a66aa8bc7099e619c89160915d6cd6186384be46ffab4a1d747000133dda9a84e15e5
-AUX chromium-78-const-std-string.patch 1315 BLAKE2B b6fe7bb77fce7594ffa674128e092fd7c583ac0be45931d518426d9a54bb231cefb50cfa9c70bd36008e7d0b5a646ea05ed159f9e1d682c2e76cdf018335ae74 SHA512 7623dc8cf7f56b2df5da3f71154559579899eff81e7d81cbb383a1696e209c646f7296bc37a3583e38800925c603ae3a64a76e49359cacd88cb43e83f8e587be
 AUX chromium-78-include.patch 534 BLAKE2B 831b26734ca029b64069f80c339170f8d06e6300f8f3c1228eeecf6054bba4f58b9a384607414da3b2467ea1ccedb7db8d6294ff30258f10f00197e54400ee7a SHA512 bc27d07fcc8747948976f80b538dae304d2f3387caeb2e93dd89e03d4c0a32ce8158c250e1e26c152c0ceecf40861ac3639949dd166308f7bffaa7dd94fdd547
 AUX chromium-angle-inline.patch 4775 BLAKE2B a4021ec1e11309bf901b09e6925d7bc90f1b30c4db08dae7d80d97a9ca4111f1f34c169465017b50f459f2c638b0ba8696fd8ddf01aa27bad3c2b3bfbf22ebb9 SHA512 ad413e8178b6004ec03887132d77d8648e5a0c9bf48552c8665f0782c8cb342d4ea417caabbae3a1e62d32046afaab0033574aff2399b0b74a721d44fcd257e3
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
@@ -29,10 +30,10 @@ AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d9
 AUX chromium-unbundle-zlib.patch 750 BLAKE2B ffce4f4069fa8f04c41b8395105d4dbe2f7e38fb9a3b2fa826972b894825dd64ed23c2a86d1445e454a96d35ebaa059ae7c2df3d2baf986be068a47be072563d SHA512 539990ce23d38c10274d9f44bf61ad53adacccaa16646ebe9535c03d2fd468d5e722aadeae82ac244d64851bbfa48832ae0895743b957fc0f4e8f47f959b1e97
 AUX chromium-widevine-r4.patch 1155 BLAKE2B 7ba02c4b80883fa7ae5c46d95072798683bdc5c9d65b3cab40e6a3c21b29ce7eb9c45493ec10e522341033a80132818f946569ee774c662daafa4e09fbc2a988 SHA512 8f78c0e22f14f81f1903a77b315c7818603caaadbb5d517a3184a11e9553b99fd42d5a1d2ff19b3d79c03352b2e279a5102afa2fa66f276da2d9c42988a94366
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-76.0.3809.100.tar.xz 728852892 BLAKE2B 1bd80f7fd50f82843f9367bd8d5648bcbe4b763594679cc7f57084390da840cc89d7771ffd844e3d0a3c3248d8f98a1babecabaf4c3104fa7a89efed88eae608 SHA512 63cfb45dc6bb0b1662ba4ffebc6313c24d65dae10a61752575e34a24d8d3d6f80e0422a984b560b259c299d6e493dfa177907201a1c1f785a7e294c9a03bd8a1
-DIST chromium-77.0.3865.35.tar.xz 733139780 BLAKE2B ac4040901efe6772e93dc30e371a1d63b4ea95e0a38632bcdd1aa5603674eb5696186f848916893b9138f0d1018c7b08293803afdf20e8c61e30af42c2ba26d0 SHA512 c2aa64f7153dc2992e35e8a2fa9c56fbc0684133a44e50b0986d6c423527f12cdb57f1ca503a9d4b4424003ab04eb33c270d2c4f3af6aeb23cb8506e92040f36
-DIST chromium-78.0.3880.4.tar.xz 734959036 BLAKE2B e93497cdc00c123f31b98be87c2b4c7e4e7ac18fdddf15e9c4ba6c08c89386c38f9451e432a8365cc6e1a47af244ba8d10da94acca3f108c0993f993b47a18b6 SHA512 4adf66caca7565c17571b2c9056acac3b1edbcf29ad9f8937cde241406242f4e30ac361047dddf2a60f4319245698d6872a24eae0374a142d13e3fea0c5b12ea
-EBUILD chromium-76.0.3809.100.ebuild 22117 BLAKE2B a63602ff67abc95423e9cdb8fbfeec9ed454abf8022530ef6a8710838bfc8d303ca5bf107c9756202411903ff5c4920131be5f71c69a656b9d7b3ae8d83ab38a SHA512 0a09ebd1da29fa16454568be08bb76745e2be99352d201265e27367f3e09c7d2a4f78e642e47f8ccc5ea49ae49ce895bfe494deab56d4c35b95b19685a5d9002
-EBUILD chromium-77.0.3865.35.ebuild 22313 BLAKE2B ae6c70034ea309554307c2e5c0209a721dbe92d6a05a0984779fe67d37d6eeebc620501ea00d28490ac09b7094ad35dfca567bc0a883d255ce51216bf6db0473 SHA512 efd063de7e08214c29c875521b82f52e16f9de4e1c33ec010302aac6d8f4af3183c09487be9541030f04d5eeea878261d38c191c3484c99fce6d3d0ff06b28e4
-EBUILD chromium-78.0.3880.4.ebuild 22316 BLAKE2B 07b7cde1c548175358087f91776a3bad3f62a414959917a9cb85cf04e7974fd13b492ff09ee85597fe3012cf4a73fe8721cfa43b21cf2916f55de20cd6225475 SHA512 a52ea78bc5df486b173a64b3e364d255a59ec633dcb9aade5eeb43ea7a08078e9f87e0935f7afe1e7944056f27902da948ea9bde297856d2b489232ea351d035
+DIST chromium-76.0.3809.132.tar.xz 728899912 BLAKE2B 725513b659f613c5827f5e847dde8c5ea448adb3a3d5561312ad05d54293c72150b010e6c804fb17be22882e4c87f2ebcdd40d08dbd601d78573678fd9d195c9 SHA512 e267d4a975fdcc33125d8fed1597e2dc8ec37a78ee2f9a4e03a1aaf6b83b594b444280b7f2ee68b41d227e7daf31b9de91ab2f998f9146613ebd50651c0d16e8
+DIST chromium-77.0.3865.56.tar.xz 733257056 BLAKE2B 7915e97952361f9a28f345fe664398f6abd6532e57b9736687cae59d51d1b9d4ce1655dc756bb3a3764fc98d14866cbee743eb095348f1fa081532508ba88a9c SHA512 945a8aa721e4a3d35be79698b298c4c69e0850f5621fa565e25cd01aac0a67fb966a9ed90f597464ed117680794503205cc1f257bd41dc2454b02c3333c0c64e
+DIST chromium-78.0.3887.7.tar.xz 737057024 BLAKE2B b4754f1fa9a243c29e83d6136494c6db1726a6d3f23013115a4a576428f7ca3c0fcd3f81cf7fe4037f2c3e6901b3fce015aeed7b7b945b4a3e368f2e6fb9afa1 SHA512 9b8eb33c6f19e5b247372e19a61ec1ae6c804bd7b9731222430e2e1b585146fc543a686ccfc9553d6d137999570c544cdb45696db6ce50c38dfead1b0760c1a4
+EBUILD chromium-76.0.3809.132.ebuild 22158 BLAKE2B 22157255629bb75571e3350d980b39e40dd682d3657369b992a7b0407bfb76523f876b0af89c8feaf935b88527a4df1ab1b133bcbb95cfad43a896d2f45d7491 SHA512 eaa8d69571ae28459d34fac97f0c4f12a4d1a3dde339636890a8468e54202cbe5f3f8280045940dd901d7bb202297edcf910ce64d430287bb0d230d314fce9f3
+EBUILD chromium-77.0.3865.56.ebuild 22354 BLAKE2B e2f1c20c0ab057c5f91b8df41de485ff413d04a167f0fdc8de515168fa502fb2a9935977a7dc1822a7a8ea15c83b306c8fc09802017d143c903fdbd1a6cfae34 SHA512 251062c4ccab20af592f1e7c847de294f9cdadd7a2e81948e02f8416cd4f38eca909bda663f523b346feb452b25f7961af4032dd599e609e7650dfe00fe1b5d0
+EBUILD chromium-78.0.3887.7.ebuild 22248 BLAKE2B e66aec65771fdad9271dba342d3c8e5fa5079798de3711f8b82457d826e59f39768bb2e892a5b0e6c2f7ad944174712a470b373d18f372cdd2aa54dfd30e03ed SHA512 66f493b768d041bea1cc87a52c591e32f7198086d60c79b5d38aa6a3a6ffa91e1b6f22b4e627a44717660121703d77b86b20e74ed7b8bbd5f4164752f977418f
 MISC metadata.xml 1538 BLAKE2B 6c68f673e2892063f4b7a5afc8314356e3e8182d8765a193c36be7ed6b61e7680dbd0a58e2386904ff2877c81ad45cdae07754996f706f986f16f3a159500930 SHA512 16e98f9dc01cfdce307dd17fc2ba83ff1eff10eaeb65aaf9154b0dedfc61086334d56f50b6ce1d673715148e29e045eb0eed21495efef942ef56e4ba4e514187
diff --git a/www-client/chromium/chromium-76.0.3809.100.ebuild b/www-client/chromium/chromium-76.0.3809.100.ebuild
deleted file mode 100644
index 2771f0fc1ff6..000000000000
--- a/www-client/chromium/chromium-76.0.3809.100.ebuild
+++ /dev/null
@@ -1,719 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-REQUIRED_USE="component-build? ( !suid )"
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.26:2
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/atk-2.26
-	dev-libs/expat:=
-	dev-libs/glib:2
-	system-icu? ( >=dev-libs/icu-64:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=dev-libs/re2-0.2016.11.01:=
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-2.2.0:0=[icu(-)]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
-	>=media-libs/openh264-1.6.0:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		!=net-fs/samba-4.5.12-r0
-		media-libs/opus:=
-	)
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!<www-plugins/chrome-binary-plugins-57
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	<dev-util/gn-0.1583
-	dev-vcs/git
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-7.6.0[inspector]
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	closure-compile? ( virtual/jre )
-	virtual/pkgconfig
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-7"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-"
-
-PATCHES=(
-	"${FILESDIR}/chromium-compiler-r10.patch"
-	"${FILESDIR}/chromium-widevine-r4.patch"
-	"${FILESDIR}/chromium-fix-char_traits.patch"
-	"${FILESDIR}/chromium-angle-inline.patch"
-	"${FILESDIR}/chromium-76-arm64-skia.patch"
-	"${FILESDIR}/chromium-76-quiche.patch"
-	"${FILESDIR}/chromium-76-gcc-vulkan.patch"
-	"${FILESDIR}/chromium-76-gcc-private.patch"
-	"${FILESDIR}/chromium-76-gcc-noexcept.patch"
-	"${FILESDIR}/chromium-76-gcc-gl-init.patch"
-	"${FILESDIR}/chromium-76-gcc-blink-namespace1.patch"
-	"${FILESDIR}/chromium-76-gcc-blink-namespace2.patch"
-	"${FILESDIR}/chromium-76-gcc-blink-constexpr.patch"
-	"${FILESDIR}/chromium-76-gcc-uint32.patch"
-	"${FILESDIR}/chromium-76-gcc-ambiguous-nodestructor.patch"
-	"${FILESDIR}/chromium-76-gcc-include.patch"
-	"${FILESDIR}/chromium-76-gcc-pure-virtual.patch"
-)
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
-			die "At least gcc 8.0 is required"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="7G"
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
-		CHECKREQS_DISK_BUILD="25G"
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/third_party/glslang
-		third_party/angle/third_party/spirv-headers
-		third_party/angle/third_party/spirv-tools
-		third_party/angle/third_party/vulkan-headers
-		third_party/angle/third_party/vulkan-loader
-		third_party/angle/third_party/vulkan-tools
-		third_party/angle/third_party/vulkan-validation-layers
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/boringssl/src/third_party/sike
-		third_party/boringssl/linux-aarch64/crypto/third_party/sike
-		third_party/boringssl/linux-x86_64/crypto/third_party/sike
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4
-		third_party/catapult/third_party/html5lib-python
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/emoji-segmenter
-		third_party/flatbuffers
-		third_party/flot
-		third_party/freetype
-		third_party/glslang
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/modp_b64
-		third_party/nasm
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/openscreen
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/sfntly
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/gif
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/spirv-headers
-		third_party/SPIRV-Tools
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/llvm-7.0
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/subzero
-		third_party/unrar
-		third_party/usrsctp
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/fft4g
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-libvpx; then
-		keeplibs+=( third_party/libvpx )
-		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
-		# Force clang since gcc is pretty broken at the moment.
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
-	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		libxml
-		libxslt
-		openh264
-		re2
-		snappy
-		yasm
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-libvpx; then
-		gn_system_libraries+=( libvpx )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=true"
-
-	# Optional dependencies.
-	myconf_gn+=" closure_compile=$(usex closure-compile true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	doins out/Release/*.so
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser \
-		"Chromium" \
-		chromium-browser \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-76.0.3809.132.ebuild b/www-client/chromium/chromium-76.0.3809.132.ebuild
new file mode 100644
index 000000000000..89e2260d1695
--- /dev/null
+++ b/www-client/chromium/chromium-76.0.3809.132.ebuild
@@ -0,0 +1,720 @@
+# Copyright 2009-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+REQUIRED_USE="component-build? ( !suid )"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.26:2
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/atk-2.26
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-64:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2016.11.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-2.2.0:0=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12-r0
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	<dev-util/gn-0.1583
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	closure-compile? ( virtual/jre )
+	virtual/pkgconfig
+"
+
+: ${CHROMIUM_FORCE_CLANG=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-7"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-compiler-r10.patch"
+	"${FILESDIR}/chromium-widevine-r4.patch"
+	"${FILESDIR}/chromium-fix-char_traits.patch"
+	"${FILESDIR}/chromium-angle-inline.patch"
+	"${FILESDIR}/chromium-76-arm64-skia.patch"
+	"${FILESDIR}/chromium-76-quiche.patch"
+	"${FILESDIR}/chromium-76-no-cups.patch"
+	"${FILESDIR}/chromium-76-gcc-vulkan.patch"
+	"${FILESDIR}/chromium-76-gcc-private.patch"
+	"${FILESDIR}/chromium-76-gcc-noexcept.patch"
+	"${FILESDIR}/chromium-76-gcc-gl-init.patch"
+	"${FILESDIR}/chromium-76-gcc-blink-namespace1.patch"
+	"${FILESDIR}/chromium-76-gcc-blink-namespace2.patch"
+	"${FILESDIR}/chromium-76-gcc-blink-constexpr.patch"
+	"${FILESDIR}/chromium-76-gcc-uint32.patch"
+	"${FILESDIR}/chromium-76-gcc-ambiguous-nodestructor.patch"
+	"${FILESDIR}/chromium-76-gcc-include.patch"
+	"${FILESDIR}/chromium-76-gcc-pure-virtual.patch"
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
+			die "At least gcc 8.0 is required"
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="7G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/third_party/glslang
+		third_party/angle/third_party/spirv-headers
+		third_party/angle/third_party/spirv-tools
+		third_party/angle/third_party/vulkan-headers
+		third_party/angle/third_party/vulkan-loader
+		third_party/angle/third_party/vulkan-tools
+		third_party/angle/third_party/vulkan-validation-layers
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/boringssl/src/third_party/sike
+		third_party/boringssl/linux-aarch64/crypto/third_party/sike
+		third_party/boringssl/linux-x86_64/crypto/third_party/sike
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/emoji-segmenter
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/nasm
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/openscreen
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/sfntly
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/SPIRV-Tools
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-7.0
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/unrar
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/fft4g
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Optional dependencies.
+	myconf_gn+=" closure_compile=$(usex closure-compile true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-77.0.3865.35.ebuild b/www-client/chromium/chromium-77.0.3865.35.ebuild
deleted file mode 100644
index 8dafa2ccfc00..000000000000
--- a/www-client/chromium/chromium-77.0.3865.35.ebuild
+++ /dev/null
@@ -1,727 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-REQUIRED_USE="component-build? ( !suid )"
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.26:2
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/atk-2.26
-	dev-libs/expat:=
-	dev-libs/glib:2
-	system-icu? ( >=dev-libs/icu-64:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=dev-libs/re2-0.2016.11.01:=
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
-	>=media-libs/openh264-1.6.0:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		!=net-fs/samba-4.5.12-r0
-		media-libs/opus:=
-	)
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!<www-plugins/chrome-binary-plugins-57
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-util/gn
-	dev-vcs/git
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-7.6.0[inspector]
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	closure-compile? ( virtual/jre )
-	virtual/pkgconfig
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-7"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-"
-
-PATCHES=(
-	"${FILESDIR}/chromium-compiler-r10.patch"
-	"${FILESDIR}/chromium-widevine-r4.patch"
-	"${FILESDIR}/chromium-fix-char_traits.patch"
-	"${FILESDIR}/chromium-unbundle-zlib.patch"
-	"${FILESDIR}/chromium-77-fix-gn-gen.patch"
-	"${FILESDIR}/chromium-77-system-icu.patch"
-	"${FILESDIR}/chromium-77-system-hb.patch"
-	"${FILESDIR}/chromium-77-clang.patch"
-	"${FILESDIR}/chromium-77-blink-include.patch"
-	"${FILESDIR}/chromium-77-std-string.patch"
-	"${FILESDIR}/chromium-77-gcc-abstract.patch"
-	"${FILESDIR}/chromium-77-gcc-include.patch"
-)
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
-			die "At least gcc 8.0 is required"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="7G"
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
-		CHECKREQS_DISK_BUILD="25G"
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/third_party/glslang
-		third_party/angle/third_party/spirv-headers
-		third_party/angle/third_party/spirv-tools
-		third_party/angle/third_party/vulkan-headers
-		third_party/angle/third_party/vulkan-loader
-		third_party/angle/third_party/vulkan-tools
-		third_party/angle/third_party/vulkan-validation-layers
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/boringssl/src/third_party/sike
-		third_party/boringssl/linux-aarch64/crypto/third_party/sike
-		third_party/boringssl/linux-x86_64/crypto/third_party/sike
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4
-		third_party/catapult/third_party/html5lib-python
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/emoji-segmenter
-		third_party/flatbuffers
-		third_party/flot
-		third_party/freetype
-		third_party/glslang
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/modp_b64
-		third_party/nasm
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/sfntly
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/gif
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/spirv-headers
-		third_party/SPIRV-Tools
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/llvm-7.0
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
-		third_party/unrar
-		third_party/usrsctp
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/fft4g
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-libvpx; then
-		keeplibs+=( third_party/libvpx )
-		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
-		# Force clang since gcc is pretty broken at the moment.
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
-	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		libxml
-		libxslt
-		openh264
-		re2
-		snappy
-		yasm
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-libvpx; then
-		gn_system_libraries+=( libvpx )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=true"
-
-	# Optional dependencies.
-	myconf_gn+=" closure_compile=$(usex closure-compile true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	doins out/Release/*.so
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser \
-		"Chromium" \
-		chromium-browser \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-77.0.3865.56.ebuild b/www-client/chromium/chromium-77.0.3865.56.ebuild
new file mode 100644
index 000000000000..bf0999f43cd5
--- /dev/null
+++ b/www-client/chromium/chromium-77.0.3865.56.ebuild
@@ -0,0 +1,728 @@
+# Copyright 2009-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+REQUIRED_USE="component-build? ( !suid )"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.26:2
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/atk-2.26
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-64:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2016.11.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12-r0
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-util/gn
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	closure-compile? ( virtual/jre )
+	virtual/pkgconfig
+"
+
+: ${CHROMIUM_FORCE_CLANG=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-7"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-compiler-r10.patch"
+	"${FILESDIR}/chromium-widevine-r4.patch"
+	"${FILESDIR}/chromium-fix-char_traits.patch"
+	"${FILESDIR}/chromium-unbundle-zlib.patch"
+	"${FILESDIR}/chromium-77-fix-gn-gen.patch"
+	"${FILESDIR}/chromium-77-system-icu.patch"
+	"${FILESDIR}/chromium-77-system-hb.patch"
+	"${FILESDIR}/chromium-77-clang.patch"
+	"${FILESDIR}/chromium-77-blink-include.patch"
+	"${FILESDIR}/chromium-77-std-string.patch"
+	"${FILESDIR}/chromium-77-no-cups.patch"
+	"${FILESDIR}/chromium-77-gcc-abstract.patch"
+	"${FILESDIR}/chromium-77-gcc-include.patch"
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
+			die "At least gcc 8.0 is required"
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="7G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/third_party/glslang
+		third_party/angle/third_party/spirv-headers
+		third_party/angle/third_party/spirv-tools
+		third_party/angle/third_party/vulkan-headers
+		third_party/angle/third_party/vulkan-loader
+		third_party/angle/third_party/vulkan-tools
+		third_party/angle/third_party/vulkan-validation-layers
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/boringssl/src/third_party/sike
+		third_party/boringssl/linux-aarch64/crypto/third_party/sike
+		third_party/boringssl/linux-x86_64/crypto/third_party/sike
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/emoji-segmenter
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/nasm
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/openscreen
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/sfntly
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/SPIRV-Tools
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-7.0
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/unrar
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/fft4g
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Optional dependencies.
+	myconf_gn+=" closure_compile=$(usex closure-compile true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-78.0.3880.4.ebuild b/www-client/chromium/chromium-78.0.3880.4.ebuild
deleted file mode 100644
index 82c1da7516b0..000000000000
--- a/www-client/chromium/chromium-78.0.3880.4.ebuild
+++ /dev/null
@@ -1,727 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-REQUIRED_USE="component-build? ( !suid )"
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.26:2
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/atk-2.26
-	dev-libs/expat:=
-	dev-libs/glib:2
-	system-icu? ( >=dev-libs/icu-64:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=dev-libs/re2-0.2016.11.01:=
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
-	>=media-libs/openh264-1.6.0:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		!=net-fs/samba-4.5.12-r0
-		media-libs/opus:=
-	)
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!<www-plugins/chrome-binary-plugins-57
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-util/gn
-	dev-vcs/git
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-7.6.0[inspector]
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	closure-compile? ( virtual/jre )
-	virtual/pkgconfig
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-7"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-"
-
-PATCHES=(
-	"${FILESDIR}/chromium-compiler-r10.patch"
-	"${FILESDIR}/chromium-widevine-r4.patch"
-	"${FILESDIR}/chromium-fix-char_traits.patch"
-	"${FILESDIR}/chromium-unbundle-zlib.patch"
-	"${FILESDIR}/chromium-77-fix-gn-gen.patch"
-	"${FILESDIR}/chromium-77-system-icu.patch"
-	"${FILESDIR}/chromium-77-clang.patch"
-	"${FILESDIR}/chromium-77-blink-include.patch"
-	"${FILESDIR}/chromium-78-const-std-string.patch"
-	"${FILESDIR}/chromium-78-include.patch"
-)
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
-			die "At least gcc 8.0 is required"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="7G"
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
-		CHECKREQS_DISK_BUILD="25G"
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/third_party/glslang
-		third_party/angle/third_party/spirv-headers
-		third_party/angle/third_party/spirv-tools
-		third_party/angle/third_party/vulkan-headers
-		third_party/angle/third_party/vulkan-loader
-		third_party/angle/third_party/vulkan-tools
-		third_party/angle/third_party/vulkan-validation-layers
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/boringssl/src/third_party/sike
-		third_party/boringssl/linux-aarch64/crypto/third_party/sike
-		third_party/boringssl/linux-x86_64/crypto/third_party/sike
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4
-		third_party/catapult/third_party/html5lib-python
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/emoji-segmenter
-		third_party/flatbuffers
-		third_party/flot
-		third_party/freetype
-		third_party/glslang
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/modp_b64
-		third_party/nasm
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/sfntly
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/gif
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/spirv-headers
-		third_party/SPIRV-Tools
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/llvm-7.0
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
-		third_party/unrar
-		third_party/usrsctp
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/fft4g
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-libvpx; then
-		keeplibs+=( third_party/libvpx )
-		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
-		# Force clang since gcc is pretty broken at the moment.
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
-	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		libxml
-		libxslt
-		openh264
-		re2
-		snappy
-		yasm
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-libvpx; then
-		gn_system_libraries+=( libvpx )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=true"
-
-	# Optional dependencies.
-	myconf_gn+=" closure_compile=$(usex closure-compile true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	doins out/Release/*.so
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser \
-		"Chromium" \
-		chromium-browser \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-78.0.3887.7.ebuild b/www-client/chromium/chromium-78.0.3887.7.ebuild
new file mode 100644
index 000000000000..a0d651ecea5e
--- /dev/null
+++ b/www-client/chromium/chromium-78.0.3887.7.ebuild
@@ -0,0 +1,726 @@
+# Copyright 2009-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+REQUIRED_USE="component-build? ( !suid )"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.26:2
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/atk-2.26
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-64:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2016.11.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12-r0
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-util/gn
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	closure-compile? ( virtual/jre )
+	virtual/pkgconfig
+"
+
+: ${CHROMIUM_FORCE_CLANG=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-7"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-compiler-r10.patch"
+	"${FILESDIR}/chromium-widevine-r4.patch"
+	"${FILESDIR}/chromium-fix-char_traits.patch"
+	"${FILESDIR}/chromium-unbundle-zlib.patch"
+	"${FILESDIR}/chromium-77-fix-gn-gen.patch"
+	"${FILESDIR}/chromium-77-system-icu.patch"
+	"${FILESDIR}/chromium-77-clang.patch"
+	"${FILESDIR}/chromium-78-include.patch"
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
+			die "At least gcc 8.0 is required"
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="7G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/third_party/glslang
+		third_party/angle/third_party/spirv-headers
+		third_party/angle/third_party/spirv-tools
+		third_party/angle/third_party/vulkan-headers
+		third_party/angle/third_party/vulkan-loader
+		third_party/angle/third_party/vulkan-tools
+		third_party/angle/third_party/vulkan-validation-layers
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/boringssl/src/third_party/sike
+		third_party/boringssl/linux-aarch64/crypto/third_party/sike
+		third_party/boringssl/linux-x86_64/crypto/third_party/sike
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/emoji-segmenter
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/nasm
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/openscreen
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/sfntly
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/SPIRV-Tools
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-7.0
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/unrar
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/fft4g
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		tools/grit/third_party/six
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Optional dependencies.
+	myconf_gn+=" closure_compile=$(usex closure-compile true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-76-no-cups.patch b/www-client/chromium/files/chromium-76-no-cups.patch
new file mode 100644
index 000000000000..28732c2b4314
--- /dev/null
+++ b/www-client/chromium/files/chromium-76-no-cups.patch
@@ -0,0 +1,41 @@
+From f768afdd3104e7da663aa82e1e8f969aea3f85c3 Mon Sep 17 00:00:00 2001
+From: Lei Zhang <thestig@chromium.org>
+Date: Thu, 22 Aug 2019 11:44:27 -0700
+Subject: [PATCH] Handle unsupported configs in CreatePrinterHandlerTaskRunner().
+
+CreatePrinterHandlerTaskRunner(), which was added in
+https://crrev.com/658397, used ifdefs to only handle the supported build
+configs. Add a #else case as a catch-all to conservatively handle the
+unsupported configs. Since it is only a couple lines of trivial code,
+doing this does not create much of a maintenance burden.
+
+(backported to chromium-76)
+
+Bug: 990727
+Change-Id: I07bd21abaeffc8223e88b519c3891185d5d2be12
+---
+
+diff --git a/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc b/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc
+index 03bd08a..e9c6996 100644
+--- a/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc
++++ b/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc
+@@ -33,12 +33,15 @@ scoped_refptr<base::TaskRunner> CreatePrinterHandlerTaskRunner() {
+   static constexpr base::TaskTraits kTraits = {
+       base::MayBlock(), base::TaskPriority::USER_VISIBLE};
+
+-#if defined(OS_WIN)
+-  // Windows drivers are likely not thread-safe.
+-  return base::CreateSingleThreadTaskRunnerWithTraits(kTraits);
+-#elif defined(USE_CUPS)
++#if defined(USE_CUPS)
+   // CUPS is thread safe.
+   return base::CreateTaskRunnerWithTraits(kTraits);
++#elif defined(OS_WIN)
++  // Windows drivers are likely not thread-safe.
++  return base::CreateSingleThreadTaskRunnerWithTraits(kTraits);
++#else
++  // Be conservative on unsupported platforms.
++  return base::CreateSingleThreadTaskRunnerWithTraits(kTraits);
+ #endif
+ }
+
diff --git a/www-client/chromium/files/chromium-77-gcc-include.patch b/www-client/chromium/files/chromium-77-gcc-include.patch
index f46403992c1d..391f48fd2d91 100644
--- a/www-client/chromium/files/chromium-77-gcc-include.patch
+++ b/www-client/chromium/files/chromium-77-gcc-include.patch
@@ -24,33 +24,3 @@ index 7f8d15b..a8cd0ab 100644
  #include "low_pass_filter.h"
  
  namespace one_euro_filter {
-
-From 258f5f182f8dd72f727af26e614794c67a5996e6 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Fri, 26 Jul 2019 15:17:54 +0000
-Subject: [PATCH] IWYU: ScopedObserver of TabStripModel requires it to be included
-
-Build with GCC and libstdc++ is failing in files using tab_sharing_ui.h
-as it has a ScopedObserver of a TabStripModel without including it
-in advance.
-
-Bug: 819294
-Change-Id: I4b12073484f65ad2bb873119daa748245296d282
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1713526
-Reviewed-by: Guido Urdaneta <guidou@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Cr-Commit-Position: refs/heads/master@{#681290}
----
-
-diff --git a/chrome/browser/ui/tab_sharing/tab_sharing_ui.h b/chrome/browser/ui/tab_sharing/tab_sharing_ui.h
-index 6d931129..147868f 100644
---- a/chrome/browser/ui/tab_sharing/tab_sharing_ui.h
-+++ b/chrome/browser/ui/tab_sharing/tab_sharing_ui.h
-@@ -14,6 +14,7 @@
- #include "base/strings/string16.h"
- #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
- #include "chrome/browser/ui/browser_list_observer.h"
-+#include "chrome/browser/ui/tabs/tab_strip_model.h"
- #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
- #include "components/infobars/core/infobar_manager.h"
- #include "content/public/browser/desktop_media_id.h"
diff --git a/www-client/chromium/files/chromium-77-no-cups.patch b/www-client/chromium/files/chromium-77-no-cups.patch
new file mode 100644
index 000000000000..ac714178ed3b
--- /dev/null
+++ b/www-client/chromium/files/chromium-77-no-cups.patch
@@ -0,0 +1,42 @@
+From f768afdd3104e7da663aa82e1e8f969aea3f85c3 Mon Sep 17 00:00:00 2001
+From: Lei Zhang <thestig@chromium.org>
+Date: Thu, 22 Aug 2019 11:44:27 -0700
+Subject: [PATCH] Handle unsupported configs in CreatePrinterHandlerTaskRunner().
+
+CreatePrinterHandlerTaskRunner(), which was added in
+https://crrev.com/658397, used ifdefs to only handle the supported build
+configs. Add a #else case as a catch-all to conservatively handle the
+unsupported configs. Since it is only a couple lines of trivial code,
+doing this does not create much of a maintenance burden.
+
+(backported to chromium-77)
+
+Bug: 990727
+Change-Id: I07bd21abaeffc8223e88b519c3891185d5d2be12
+---
+
+diff --git a/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc b/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc
+index a1f3fd3..6e81f5e 100644
+--- a/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc
++++ b/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc
+@@ -33,12 +33,15 @@ scoped_refptr<base::TaskRunner> CreatePrinterHandlerTaskRunner() {
+   static constexpr base::TaskTraits kTraits = {
+       base::MayBlock(), base::TaskPriority::USER_VISIBLE};
+
+-#if defined(OS_WIN)
+-  // Windows drivers are likely not thread-safe.
+-  return base::CreateSingleThreadTaskRunnerWithTraits(kTraits);
+-#elif defined(USE_CUPS)
++#if defined(USE_CUPS)
+   // CUPS is thread safe.
+-  return base::CreateTaskRunnerWithTraits(kTraits);
++  return base::CreateTaskRunner(kTraits);
++#elif defined(OS_WIN)
++  // Windows drivers are likely not thread-safe.
++  return base::CreateSingleThreadTaskRunner(kTraits);
++#else
++  // Be conservative on unsupported platforms.
++  return base::CreateSingleThreadTaskRunner(kTraits);
+ #endif
+ }
+
diff --git a/www-client/chromium/files/chromium-78-const-std-string.patch b/www-client/chromium/files/chromium-78-const-std-string.patch
deleted file mode 100644
index e16377aff414..000000000000
--- a/www-client/chromium/files/chromium-78-const-std-string.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/chrome/test/chromedriver/webauthn_commands.cc b/chrome/test/chromedriver/webauthn_commands.cc
-index b0d4d62..6369d74 100644
---- a/chrome/test/chromedriver/webauthn_commands.cc
-+++ b/chrome/test/chromedriver/webauthn_commands.cc
-@@ -36,8 +36,8 @@ base::DictionaryValue MapParams(
- // Converts the string |keys| in |params| from base64url to base64. Returns a
- // status error if conversion of one of the keys failed.
- Status ConvertBase64UrlToBase64(base::Value* params,
--                                const std::vector<const std::string> keys) {
--  for (const std::string key : keys) {
-+                                const std::vector<std::string> keys) {
-+  for (std::string key : keys) {
-     base::Value* maybe_value = params->FindKey(key);
-     if (!maybe_value)
-       continue;
-@@ -60,8 +60,8 @@ Status ConvertBase64UrlToBase64(base::Value* params,
- 
- // Converts the string |keys| in |params| from base64 to base64url.
- void ConvertBase64ToBase64Url(base::Value* params,
--                              const std::vector<const std::string> keys) {
--  for (const std::string key : keys) {
-+                              const std::vector<std::string> keys) {
-+  for (std::string key : keys) {
-     std::string* maybe_value = params->FindStringKey(key);
-     if (!maybe_value)
-       continue;
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 2c5ef0e3f021..155cc6e40ebc 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -14,6 +14,6 @@ DIST elinks-0.12pre6.tar.bz2 2854500 BLAKE2B 3d91c2a4b03cf77a2a86131cfb5339a40c6
 DIST elinks-0.13_pre_pre20180225.tar.gz 3518990 BLAKE2B 89c95b1d6e438975f5711f2e83960c90ced451953f395f3d73eeca40e6187b423b3c7d50b065c11673ee9fe03e8ee99a4c7642ebc01eea888c417645a0e53d7d SHA512 3f817768766e6dd6df042f7512163c5de70766e4d565fc081f4f755f7f7958d5487b9ff2ea29187a5cc813dc0841d75d440087fbdaf99f73d2a269dca70d5725
 EBUILD elinks-0.12_pre6-r1.ebuild 6160 BLAKE2B 8e23af9e2335735c94a13ed52d80f109188b5071f764f1213df53c7b2a09f67023df36d6275255c3a928b39472f60b4ab35b569ad8602bb81148f73f12e1acc7 SHA512 6c2e451b1e36ef5fe299a75016165f1260b5035760305d3a3320b3aeb8d9322d742db4fc88c1dc71a2826f5acc9bfba0425b66d00aad10f05d5fc92e979cb4c1
 EBUILD elinks-0.12_pre6-r4.ebuild 4895 BLAKE2B 5dd5737f8cbf54373ccabb3e1397da05e2f000cae498d449b20e525cca35bc917cc78c177ba835be3aafced0b7f589292e5795e9cd1bc5044c5091fe6bf2d186 SHA512 a95a3d6dfb587a554e355803258e00862448f1122bab8981860aa1d4b2cbe3aed8c4291e2b89de8338da932c6a51c45137e22cff11a5768ec2ed9225e8e94c12
-EBUILD elinks-0.13_pre_pre20180225.ebuild 4027 BLAKE2B dfa5d94951de7a64ffa861885305ff34bd0518980c9905cd6b3fafadc3a7359a534ae2686fc69471ced64935b2679117a16eb6afc2169d216f01d47d1bb29830 SHA512 9711f92e6a771e88ac1042051e11b523725744ef40554e0970ecd2a68110ed048006bee01918c3cf36acfc7c602904b926a00d841302bdc078f2db2b6869784c
-EBUILD elinks-9999.ebuild 3734 BLAKE2B 4be8674da8f76604c62ae251f7a87c215d0e72704bca572bb9bef3e9241abc39cd41a4b8f9107e4df7819d8f3eaff6e449f70f88deb627f66783cd867273273f SHA512 39ba17ed64382173113e1aac40320ebe4aa85b8267ccefc8e838caad2ef02dd8225c5c6c3262a371c30284f98c8382fbee791d3af59e3ee698e460297d4576ac
+EBUILD elinks-0.13_pre_pre20180225.ebuild 4026 BLAKE2B 4c07b4c2d3e0b3a6d81b2e55e05c512b2a13cc77efb5a8489ba3735714d18eedabbb097193d7c3171627619e529a8edbe9da4ba0dd182a6d234575de4fd52024 SHA512 fcb12bb065bd968a7c750542e2728723100b3b835f1514ca89b9afbcaab4f02366e5640228d75992ea3f43eec867b2fb4848cf04614b8cbd5b6acd618a0fac8b
+EBUILD elinks-9999.ebuild 3733 BLAKE2B eb3b5c16cdc99b701350551c2c4da2cc4b20bd7ca66b2c8e4035bf51fce17c9bb36a9376840251c07a61c9280c84f5727131c0b71a7ea68869cab1510f73af89 SHA512 f858c2f1509d60766e57802638e890b88ae391e1cab12136aa11065c0298697754acb6230c669dc194cd6d98c2efc88dcb4d4371aaa6ec51c4ecd6eabf3c3721
 MISC metadata.xml 989 BLAKE2B 4b2f65d67e922e7e9cce74761cebca030866842af469ef4776d7cf2f8e685a52f9cbdfee25fb6a29546543e71127f48f93f78593745f6ab151e49250fe1b0259 SHA512 66a3bb8694de90a61d37a4fe5029afc894b12eba7ce7832159f88ca3168ee99c324179b27edf2876f94b4465e81cc218f5d271fff92a495bed11dd6b8ffad990
diff --git a/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild b/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
index d83e5634a103..65ed8a7f4d49 100644
--- a/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
+++ b/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
@@ -17,10 +17,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm guile idn ipv6
-	  javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
+	javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
 
-DEPEND="
-	${PYTHON_DEPS}
+RDEPEND="
 	brotli? ( app-arch/brotli )
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
@@ -39,7 +38,8 @@ DEPEND="
 	X? ( x11-libs/libX11 x11-libs/libXt )
 	xml? ( >=dev-libs/expat-1.95.4 )
 	zlib? ( >=sys-libs/zlib-1.1.4 )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-parallel-make.patch
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 5f0bf215d165..0d10ee080caf 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -15,10 +15,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm guile idn ipv6
-	  javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
+	javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
 
-DEPEND="
-	${PYTHON_DEPS}
+RDEPEND="
 	brotli? ( app-arch/brotli )
 	bzip2? ( >=app-arch/bzip2-1.0.2 )
 	gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
@@ -37,7 +36,8 @@ DEPEND="
 	X? ( x11-libs/libX11 x11-libs/libXt )
 	xml? ( >=dev-libs/expat-1.95.4 )
 	zlib? ( >=sys-libs/zlib-1.1.4 )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-parallel-make.patch
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 167004e87011..aeebe0d0df2c 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -2,5 +2,5 @@ AUX var-tmp-tests.patch 659 BLAKE2B 2869f1c28c3a59974758986bd464aeb5c1d86d1b4e23
 DIST epiphany-3.30.4.tar.xz 4531732 BLAKE2B a4741d353800517c0233456e513a974ecd7641799395df7cafe6940cbfa49402836484010634ef3c59e36bd3bb2ced331d19a4ed05d1630c00d7ee385961227b SHA512 8574a26a22a24db7e65254f65723f6e4405fccd783bb7e122f8a5f6aff62d3ef1dd0b3ce903eb1f750e7ae28c2f1154a2c1c15970892216211d51edee318bd47
 DIST epiphany-3.32.4.tar.xz 5468576 BLAKE2B 8d9ed9f522a7f18c1e9b0fa6aea043c11e69eda8ee779e8cb05cbef1920154ee7e307ea92eac713c74f7a81a08d9fc31dfd3ba8fad59d5697f4aa652e12a6e8e SHA512 34f9f4267862b494cbeb225ce63cd7767851f1cca16b4c8e03057b074999954477f2ed891c60f20910abcc7a553371f8f03e59fc9da4cf459dd5cbfde8a6d67c
 EBUILD epiphany-3.30.4.ebuild 1710 BLAKE2B fd5953d07509ca9ae9b983ebf494750b2d0e26547f592f25b0a80e6fef5cd204d33917b7a5c98a0aa165a5a351ff4c20478562d9a3d71232b6e4de718f3d690f SHA512 c5af8b6866199eab89811ebd58a92b82a2d56235e8d50a7426a453224448dfda61c5a8f0cf8f16762859d736942e6b794e70db6b73fd65b10039baaf96ee2e68
-EBUILD epiphany-3.32.4.ebuild 1857 BLAKE2B c0b3c0a280bb0f25ad8a2b4964c54f42e48669b89121730893dd3c80285c15eebf2c2a7f00b68a4414b391601e399ac3c34a4a268f5ebd48e2b1b459b4eeaa8e SHA512 4b44ba84878481cd541d73229d19ecd7f2db056bb75da36542c223050d806852d41a6736b1f73d1df7f9aafe4a68daec049dd508aeea05b406bb7c80530a0955
+EBUILD epiphany-3.32.4.ebuild 1864 BLAKE2B d7a6a3d6b825094b3b9a6d853deb0f36a213c617d23f5550c8115b3664dbf4d1d132c90e8d92273f79fba4034cb563e922d0c1db1996d1803dc5b256370ca4d1 SHA512 e5d1e03c217a90953c4df4010796d5c49477c30146f379d1a5357f603d88ced2690784523ec9b2303724987686f8b53bd6aee52fa2926c981c542d1fe2e1d671
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/www-client/epiphany/epiphany-3.32.4.ebuild b/www-client/epiphany/epiphany-3.32.4.ebuild
index c69aaaf7987a..d9f85340b6a6 100644
--- a/www-client/epiphany/epiphany-3.32.4.ebuild
+++ b/www-client/epiphany/epiphany-3.32.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Web"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index e5372a0649ac..8e3838558ba9 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -3,7 +3,7 @@ AUX all-gentoo-1.js 500 BLAKE2B 2860ee21769b18b4c6dfcd4e5ff3a09aa5ffab60c9f7745a
 AUX all-gentoo-2.js 472 BLAKE2B 0600a8ed7fb5dbadaa6c897db41af18410a75201dcc0e7db51d6ce0b9cb96dfd28322f41853fc2c7d5af72cde7f50fa6acacbe37a306fcf4d43e9689381211b8 SHA512 f2331dcf2825533d7032bb687e7aa43046a08dbd79974b24055a969958efcd03c400c2ca0038ea29be42955e06288e44f61146aa627896230b0879e076a9fc31
 AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
 AUX firefox-bin-prefs.js 305 BLAKE2B 864d8545cbff81d9a1a7d615d3a244c9060c646abf0fbf4d09fad2c9dd2b312d0fedb97b0fae7efb60def0e5494069d12a8e9e6d1d638744d77535eef8ac4fcd SHA512 ef65b9a24f22cf04def4962721056869392dddabdac80e6f9cd92c57d58174667475ae55d83fa43603e93dcb1745568d82bcad8c810fb597dd51f2b5099bd69e
-AUX firefox-bin.desktop 344 BLAKE2B 31ed4887d1fadbb899c6a790ec263f683df4fdc2d1eea674b5389caf98ef101ef83371b3141e13fa4bf39d06f9cbddc7387e20ab2bc9449a308801117b955401 SHA512 46b590a7af797db3d2622b50fb4139777fc78fd3379c2ab3de48a1a898b0e28235d537c71a6f77739e80356b608721bf98c14148aa92c79b7da9c0d7831e3b49
+AUX firefox-bin.desktop 325 BLAKE2B 563cea3569a5a4952ded5c0324fa7d3a574a1c5d0fcd310f3f82de2b0fe07412d9768f6be2f467e3e315d89f501b1fe2cc319ffa92f072f4fa6cf6e2af4c2d20 SHA512 409ec95a1ee449e2a0a915358fb9c8c3e4bcec8026cb503f1b7dcd815bda9ff5745158ed01cc190c9a0adf5b4e9d644efe5ee3e0232bd8419324c1b6600c863f
 AUX local-settings.js 129 BLAKE2B 8d6778900d4746baeec5d167bcb73476d36de38e4ba5a09904a66ba094ce3c003467a22de32113abf3fce80e7159d5faf501be2e2c45d2e7cbb31d1046f5ed6b SHA512 2ae80875251d0ea322acb64370a0077b10f2e2c8bd258cd4792c6cf7152c0a6f8786353167d71fc99607b5f15142af28eb565483a3115b25c2f040c06319ba6c
 DIST firefox-52.9.0esr-ach.xpi 420286 BLAKE2B 41643f6cdc43722dc2a61249720902a503c5f547979e80ace08bef097e2efef7b67d6d44b04a66965ee80722194b2183feed15d3b2f13d5b6ccdc993415eb9e3 SHA512 8a28262b9bb44592801e063348401924b2dc8ab1b4e042d11f560d892e276b7d14279a1a2ab3f6ad27068113969ca59377493839f1efbdd61a77f5246815989c
 DIST firefox-52.9.0esr-af.xpi 429469 BLAKE2B 224617fcee13cbc62863dca9ecde4f45f1dc1a83535780a0f3b13f74ddd492ffd46b544ba93cb0ba505e99afc7327a5398c7bce735ba2d24612ea5ea80717221 SHA512 a723edc72c1e373e250fb878a73024054c670f0fd3ceadbd4a1306981f8cb560ec8f078a017cafb84dc49a11bb0d17046b102a6f67dba65b67d64946d909b189
@@ -89,188 +89,282 @@ DIST firefox-52.9.0esr-vi.xpi 450805 BLAKE2B 9dacebac235a738cf7f068e16335b8b15ca
 DIST firefox-52.9.0esr-xh.xpi 441173 BLAKE2B 3e1b907a7659c639d17d25a1825f472853242891d55f6a5ad93c1f5a12e12f05706173dc6ef5594f27e049d9b9a4c748d7371780843f1da204c5d93a39213197 SHA512 54ac64f0c119ab42d4f87dd2663ba7e14310c215a1ea76acd463b4c1a9073491f8df8c9b03d391ecc6f9ffbbdccc3756a7b13ed559336a6d1527fad3097ddb53
 DIST firefox-52.9.0esr-zh-CN.xpi 461679 BLAKE2B 745b2cfb86e93a379e13fa73b7e3721bae06694768316e31a2aed608e3050f585a9603375cd35b90affca11b3e5e44401b1e676f9c8050ade287ed0feb442a7a SHA512 ca62e0e2ab075086741159b185b5eba44c6bdfc29fd9ba1cf25808f127c1aed8875ea61c1c33e4f742fa26af4455a8873730f96ad9c7bec1f66aed0595f253f1
 DIST firefox-52.9.0esr-zh-TW.xpi 453068 BLAKE2B 84e08ea4fd119db1f1c6f84b212fbbb5d6999c5ac6010c0e7836d8734726d281107f3d91ba7bac1aeaf855dc36d3b018ae3913dccdbe2b11aad02a8d8aaa893c SHA512 a99042ef7d00820e341dfcf2c45a8b5bd77eaf2cc8ecf0ff5ee982b7bd9beac7cb4bf051c57ef3b7a5d9b67cd35858dca396d21e65718e248f3b1fdba5273999
-DIST firefox-60.8.0esr-ach.xpi 512788 BLAKE2B 155c72980b4a0573f2d4e2d80f1bfce095bc2aedb6ab265b2fd4aa35046c0a91ee64a8f00dcea957a7889133e8969efdb49c76dcd67f7a8a0e6b4532aeebab0d SHA512 59980e52d51095a6dfff48044fc2a1fd8c237f251dc1dc681eb0f799700e1b4d08c10862a34a77a41a6d5b90cd96ac6271af6ad63c0d6be815c0e687d6218ccf
-DIST firefox-60.8.0esr-af.xpi 503031 BLAKE2B 74cd2d6169cc455fdff7a93d8327388f8247375bc362b5f0efbbf3f2fef80a05f73c3d761a09b427057e8de81da3b8b4bd2a551d4f1b627a4639bf3117f252f7 SHA512 5187dbbd3e025ab7523377f262e02a7ff9a83091b657ea7f22da85de78a71a1f839af05a6ec38aaa2b1c38254b9cd3b95e1ba69dd1ffd6d71919c63e8b3dd469
-DIST firefox-60.8.0esr-an.xpi 536226 BLAKE2B f110e39d28d98c916b2b74b05c634f87a8ccb52b41c87931eb2449301d723af9b2703be411e2ae9506138bd0f9193da315d511c207d9030efb7bf926a627c1c2 SHA512 524e75c7e186aeffb29360fb6044d334d37e0e0495259bc6b12b43c44566a26159cc04b715174ad836086e4950e0f012ea118aeed33d8cca99a25b2a8872c7a3
-DIST firefox-60.8.0esr-ar.xpi 563542 BLAKE2B 448a7a88254bc27922d30f9a6c4657c8d2f6581baa3bf976a73cfab1fcecf919de7b77544ec83a128c622d11815c26cbcd2f56196245aff1bc316308b14cfad0 SHA512 33ee7cee0b06ec8930dae61e5b3e48c4c1e51fafbb127f756e88809f8ea83d97f6fcc154d78d26cb944230d0a80c6b3f6a695300d81aa2cd8f0c8fc226606e9c
-DIST firefox-60.8.0esr-as.xpi 546437 BLAKE2B 7be219893258f1ecb3ccc27b85a79d968b6ea35986fb74a5b23a9e711de1aa23057d2a49dc9d163c619607b188b37f1094f31920bde603a3c6dc615ee1194bde SHA512 84081960df0e6fca213bb86af690d7935834ccbef6cd3ed2b8aed220755651a7b081c37e3570cece78658e199a31215c988849f46224030bf21c54f5c083bb3a
-DIST firefox-60.8.0esr-ast.xpi 524607 BLAKE2B e6b78e54119a02a8b58927ca8cfd4030d9b099326750622675c27224c469a3e0b1f4c5614f1eb1e066e09373d073a1721ea3680d1ac0e1a1fadb98d8fb7c0255 SHA512 9c5d8697abdb12bf7562880d02d52bb7329f9ff715718835b600ef8138f1201612fcd2726fc24b11dd27561d74134527d1d4bff0fc8c7ee7ac4e238a6e185d35
-DIST firefox-60.8.0esr-az.xpi 540469 BLAKE2B 608a0c8883df8d6aa553497a3189cab73abac231df19bca142628160c63cf750c6d92b0934ecc75833f00fa41914d198e5d27ffeb589503af721b3727938ab33 SHA512 72cd3b8071d9e5a2984d688283e431eff677b5f41dc0a77cdbaabc8a259e3e5a1ebbe734cb4a0c1e6038c8fce8adcd6d9f244122acc049dbe84f5ecccbb2e2f2
-DIST firefox-60.8.0esr-bg.xpi 589576 BLAKE2B 458375e0c2ad6fd280fc1e548cbcf22f6b5bfb47fd93598cb630742c6ff4d9ed1dc0963344329b9817503a7af57ca5eff582624db4635850b7125455e10bcd65 SHA512 ac2c273edd8d1367e5b17b89bd8edf993831bce9623db1ff3e3047bdf784a4c0aa27262786f7af03c9f292d36cc2c4bbca9b33c2421f6ef4a4bef945c843f887
-DIST firefox-60.8.0esr-bn-BD.xpi 606817 BLAKE2B 04699643a433dd6a266feb07f9ff4f6f7335e46af808a36512fd85389ad7a17ac4016022c51c0fba6f9bf0b855dab0e4c6d1be0e9f6045f2eed81b39453a396b SHA512 351d674efd9acf3c68f8c2f96c7325338f402a49c3239b709056592bb43840c8c9f0fcf302cbc9c9881d21e55e2552d0cec72996ec278404e13162047f9b815e
-DIST firefox-60.8.0esr-bn-IN.xpi 587255 BLAKE2B b2f7b13ceae7f7b119c3f358008ab2b4d17e1473fd1eb445a99a201a2a4759c6c52d444571d9279455bfaa3466b30ad5ce5087a7fe7645b0d11b25acab3df901 SHA512 90d0056ac6ad76d7389b777c69d89fc6d413b4b5a543e57b1ef8dc1a5e1e327a919fa23d9052a277410b1da788150d892897a7951ab02cf39b11d293386a83b3
-DIST firefox-60.8.0esr-br.xpi 527757 BLAKE2B 440a43a28ea01159d924e72ef99254cc442b624e603927bac9d7d75541a8bf1317bc61dc56873f44bb00d8ed81b77b74a33fabc32a7ba24dfef024155c959cb6 SHA512 9930acc0cfc501aa4059bee95c56990427b018c72b1bf5de86971fc027007c53baafb5efe7363279b7db6a1bceb0b4692e5d259c133b67f6956ad2cb4dc91d61
-DIST firefox-60.8.0esr-bs.xpi 530426 BLAKE2B a8127345707989cf78c01dd32afcc18817f81675089d0ddedeb8a6da49e45b0520a1986fe0fc742c70b6e0f5aeedbbf74935819972e86789f1507ee08c4ac37c SHA512 6cea1f3eba3f9b75f46c4d215c72c55742bc17020503c8c4a721ab9e7ae1b4b36112f3b099ebd5cd7a57308e6761521ad5d09e7a5c80cf92b23ea3255fd66fd9
-DIST firefox-60.8.0esr-ca.xpi 540990 BLAKE2B 97fc19cb1634787f54792e085e7768f41082d6427e80be42df8f9d9d16ca74c7f50694a4bcc65029c8d2143c6eaf44de93f967028ddea2bd811fada91b9e5835 SHA512 02497c871fd333a4a4e2e4f454e7a2312f218999a5ad8c14bacfa9541ca1d3b25dc0c21d01b706808374cc2989e3f02053bd95a86f113a2c1d8e0a63be32de1d
-DIST firefox-60.8.0esr-cs.xpi 547514 BLAKE2B 116daaf11b03c97413cf35147a4982e30ebb07e9a3d56c7fcd87014c857aebba00979e567819d4decd51545df42f7a3c6fdb3049f3db450f17ab3786a3f304e8 SHA512 e3d657edd0bc79b753eee96d07957bf1fe21ad94a22bb477cc485026b2f4fa3e5b92da1ded42cb07aa1af7533ffe79eef02b08f3ad3c15a8e74eb2d8ad320507
-DIST firefox-60.8.0esr-cy.xpi 532366 BLAKE2B d705f0eb9ceac90c0f4f80bd1fefde31ef8d13a3d38b3612f8a8037bd3f8ed970fa2817e2c14d125336edbb304f197816f658028c09d58a1de1c46a94a7dafee SHA512 5cd44136c1137f6c01065cf409b415435d65e7e80822d1e8f44d98cb8d498836bee64bdbd4ae66fe7bf474e18db23997ec42ac644099bf7065cb6d2d9c0be5b3
-DIST firefox-60.8.0esr-da.xpi 526479 BLAKE2B 09c754d309d62a46761c30392304585932bbf335870379e8a2fa60dd291decfe0f7cfcacc8ee543ecdfe989730d716639e37fe2845a77bb2ea7b77eedab99e99 SHA512 9e98b7daa7d9e661b3cb5710f0d85714bf66fa7bd23cd8d8bc35bcf1cf96b995889c44ab291e2f4dd25a96f0e60fe75ffa64cc8ae1dd6231de9daa90629ae922
-DIST firefox-60.8.0esr-de.xpi 542253 BLAKE2B 02b2b4dc7292b5b19c1d63bf15d4546c83dc32560fc31d60cc7809dbd250b95cb891381ccc1c15c366d06a5fb745dc54bb22a88be5fbd06889155767ad61abba SHA512 5225415f90d32a535eedd2d3d1a730d9c0552f82b1b3ea57c8f50ea8b48dc36cb34eca9da4d404c0cc13434b1717bed200188488754e2fb2e176021aef9b8c98
-DIST firefox-60.8.0esr-el.xpi 609423 BLAKE2B 4790d546c71cc62cb459b40d93617f6dbfd0d6e8e00358767095ab887bd76ad98caaa10432bc6513cf4101924d4ec486a08e82941db414389259df26b1054d4d SHA512 9581691d4d9a908894eba849f7773c2d4d1bc6616f55e56ff848a90205a10c2b33c5e72f455d71ed85d55b8b6fbadea5e9f6b564807264b8eb056a3b3d483335
-DIST firefox-60.8.0esr-en-GB.xpi 508089 BLAKE2B c4e6436d8e718f677a7b0f15dbf85d61da10317cd16445f5211c4eab64729cb6ac41d7c5fd3aa48d6668fe0de0b7e9c1b8b018c20cb7d0f4b01cd8b7656d7854 SHA512 79e9ae89868271b5de7fde1c1ea0932fa1d2c027e62c9c92a7ac9213b900ca29d3232db8ae66cbf9fa3bfc5923b014b132b24800aabc0fc33a55461e2cb1b3a5
-DIST firefox-60.8.0esr-en-ZA.xpi 491066 BLAKE2B 3699ffec61649dab2f145b669e08e5b4b67af31436a5983364112f491b09925c21b01c8988298de6dca9e06472a2b3fb469129c3c9bf53f03343ad392629401a SHA512 6f38cb6b0a9a866272cd5f5a063ac4d5c2c8f7246fd4bac33d71ea828bc4ecfadd430abc3ca39c598fd3769a0d9335486d16fc5e2b658e15b7d4b2e6816c45da
-DIST firefox-60.8.0esr-eo.xpi 526982 BLAKE2B f1f808c0aa431242ebc655dba8a03c032a05bb89062010e5e0c003f84d95568ec6d5829caecd22f5a6514d316dd2d609b65b8855bdcf6fdb3c6ce0e3f4a34a54 SHA512 67d06a9bb60890ff5cb99274be77bebddeee2554bfa37b3aa3fbd8be9c22e77285e07d4a37b095891a1194e69cc8b52dc736821b8af856f7fdb273a51bfadc0e
-DIST firefox-60.8.0esr-es-AR.xpi 541043 BLAKE2B b38b6f5fbe1aa7a6d8b72287ea561755f18b672ca9a3c9b805713b350965bd59cab9ed6150e737d7ba493302560f1bbafaec8975133fe46e0622b966ae84cbe9 SHA512 7189c7122ba3721ad1980f5cebef9c0585c107628ac384b41f61faacefbaedf782edb8a387bc40814842051239ab9990d39200b71c3a03a29198cece0e084e06
-DIST firefox-60.8.0esr-es-CL.xpi 543730 BLAKE2B e1ebf2449ffdec2d48e48b63a5e88434f182266d419fc580b4cf9520737ef87d7076ebe1b95eb62b8d1abd1283516b20050230884f750a8554e4a0d81d7b8565 SHA512 cee9756d7925352a4e47a88d0ad5d5550ea362ec1e79c964692894f52e542a3122857d3e13e5e3025ea0f39329a75af0389d6d9820b68d984a3045ec33727060
-DIST firefox-60.8.0esr-es-ES.xpi 476369 BLAKE2B cd3734640c19707e2a825efbfb472339bb79ebc93cc6c0b549bb9da0b673d9b579ea7b024a181124d3736819e49c20d799a4b336ded2482a6bf2eac3ecc071ed SHA512 85930a7a73c0fae9cf527a661ea0d3883a9bda1aa7b89e0d1325e04e58e7644a3597e2d4e52a6947df17178f12094cb9272727cdecb20506aebadc4bf80cccd5
-DIST firefox-60.8.0esr-es-MX.xpi 545044 BLAKE2B 55a1d88dc31186bbf4900837991aa1ed053a1c6a551135eb4eb8b40fd66f10ce8664ca334fcfa9d17741247fe98b7a75052f65f05e48037f2cce8ee32b986c64 SHA512 142aab032ede44234b7e447d53cf1c8304db22303638272912412c9ec01b5c52dcce6d20f6a70b1dd751b2e5d7e015c626c14829a9d224d8b4010a6865e19ba7
-DIST firefox-60.8.0esr-et.xpi 520689 BLAKE2B 1b743a6c3e658db5abe850d8697905c8010ffccaab572378259af7e0af1a0708f676bbfe5e5401b53ef382e19eec805d2904a1a6414180db8111814033257f59 SHA512 42a4d6e3852b1263342966b6b8b7126758b68c40d94609431092c0c06872b53c4c45f96d1e85f47cab71d07692b3fcbf8d16d002e49e3dd6acb95b9dff19cb19
-DIST firefox-60.8.0esr-eu.xpi 527432 BLAKE2B d3d66b2a139c9b148172e7bdaddc207e3491c4ec7deed6997558d6bf323416f6c3d809d5dc5c571ce07cf59e5d8b00d6e4e5846b824f1cb7541c57a0c93ba422 SHA512 c2d7840505922e8bc5c6efe2ee1d231b21dd7f951956f86af8c773c9187fc879e4286841672a903bf16d02236cb827f9f59578f598cc4ec39ac325731874bf1f
-DIST firefox-60.8.0esr-fa.xpi 581993 BLAKE2B 8c50faaa1f3797819efb16158c893d1e87ab0aa0da7ed99f8fa82f0647d57881d00e8503954ffebe697214a433febc89f83755bea856c633880498c8f7b18600 SHA512 c31e94c95b8a5b4b03a914c33903fde817f194156dec87cdcd59ed59438cc69eca957be93e3afa581a117f720f41c12525da5931d0ce11aead672421efc8ce70
-DIST firefox-60.8.0esr-fi.xpi 521913 BLAKE2B a7a861650e375eebf594707e71a0a7b89db557aea415ddf4adf1b4364732905d14192a335c27d4ab4b3136da81912ca3a63795070b47cfe97b2b6e0ce370e055 SHA512 b11944da43e696ff11762a49224a40b60071c60f9c9c8c3cf80551b1d5186fdc323de345572610feab425099971813ac4b83ef0a16dcc7c9812bb8f0b2d91b1d
-DIST firefox-60.8.0esr-fr.xpi 551796 BLAKE2B 7e8775feba42625917d9382166f8079f41e83b7618a10c9e485a89ecc9fb70c2f819a67a167900c2fcd93f99553417fe1c10822602c2753b55c479b7cf6fe6e9 SHA512 41e0cdc0391c565e6a73211f46a427556ab69672b8d954c9610a08ce8d33d10d33f1999907a6df8a017dc610a173586b234397a2ac9e75e896be66368a24b287
-DIST firefox-60.8.0esr-fy-NL.xpi 540915 BLAKE2B b4554df17db9178c0f28d32e37c28a60243c75fe6a2e6b4374f4408f2a32e29db55297735187e2c26e680123ce1209de47abe1e37503266a729d59621a2e17a4 SHA512 71bf9bade61badd4a907895b8cb98e1c0a581230c8e872880dcfd2a56aa8d72c270af3298f19161247b3c22c956339312564987d32d54e57abf7e90e7ed210dc
-DIST firefox-60.8.0esr-ga-IE.xpi 543377 BLAKE2B 74e8115a4f31c47e302d5434ab3c273ae4ef5627f2e8f6904504b69cdb824b88292abcb6302494350ccfc4272b0b0ae0d074a31bb217acc10e10af9dbfdbb18c SHA512 69c26b3e346529a36289a6b215f44d0f8ecce7fa38020092bddb61c5fd4407ab19bb052d817ba1b33cf365ed3a9574e0f1a87bdc8985b2d8b610fbfcf101312a
-DIST firefox-60.8.0esr-gd.xpi 536588 BLAKE2B aaf7ba835faa933483fa85edb74e8f909907e84fa8a27facebfaa811d661d29a073006fcaf39d00993ce2b402db2b2dcbe903e3906e6e003fbcedc8052b77032 SHA512 259a786faccff9749e8acef61d5fe9bd569c954e23176d0be224dcb627313db35ded5cb92e7a791c440af701b9ef1364cf9f35d3598def57b2ef1e0cd410de04
-DIST firefox-60.8.0esr-gl.xpi 513086 BLAKE2B 68a2848c828b2d655eb229e97f475dbc705b78a09e2edeedb2ed184a3294f42f91baefd6d1a64562a140b74b8cc0b8f34686046f0614b0d07f29163110cb1b17 SHA512 cc8ae70c8adaab02801664bf2c601fac6a23204542c3333e38fb6e70dc8cec2015840edfd1d0a70226a5834379a84fd299cf2dfc92854c3c2ca6d283f3ce47c5
-DIST firefox-60.8.0esr-gu-IN.xpi 606672 BLAKE2B c345d34ca6cf60a9142be6aff771e44b6e93722f0e3f466d1c8d1baff85fe3455be51eb38334c31aac38b97592dcab97f1b3b09e855eced7864ad32cf8046ad0 SHA512 9b09a3d944fe9a6d130c3f41c4f9eb18d5829aa9e5d64645f85b8e443159c219e484dfdd317b87983e6d455a6e755c280aafd66fb4fd30d2b0edc82f3dd93fe5
-DIST firefox-60.8.0esr-he.xpi 551703 BLAKE2B 367d5eafe2080b7945e2565ac0c902d8480744b62c96ed72da1e1c2ea76fded6d70bc272ce2c96b73c72f044ebef14fd8f1e557e8d2f274d599b0c8da0a272a0 SHA512 2b333273a72724ce9f19c82d7b77930736061400c2aabcca1ca8851f51a71189d3f05369fb4688c59217ec682ccb885342880ceff002b4c4927afaeb52129c87
-DIST firefox-60.8.0esr-hi-IN.xpi 607256 BLAKE2B d8b0aceebce03d37c34e04fdb3e30f5b99de4c11cd80ff04742d69c3eb4a92674980f58e360d0ff56f72467a1ad836bf94b0a7d4d30ca33f6ce0b9faafa275a0 SHA512 1d0392531fdd19c5b02f4407638e4c7596bf81289465db0f6a9f117c3e044c62538ab65ced2fcc2ec2c38c83f3b96e35370c9c3da20be295a7f266575814ece5
-DIST firefox-60.8.0esr-hr.xpi 531679 BLAKE2B 98fb68376a62a51bb0b83517cceb91f6bfb64328b6715b09c37e5cd49224d7225c5708ce602b343e5404257e76ebce44986840c55b4cb29f8077ecd9741659f0 SHA512 e952b4c7ed8044c79323e33f3874df8568669fd250996eeba182df4d682e29ae338fb52acb2171bbd6836fd915fd3b59ae1f32e549306be46e06ba575e140402
-DIST firefox-60.8.0esr-hsb.xpi 553014 BLAKE2B e3726efd8b755c1ecc11647db683099c44463102cba544eb206c031c79912a92d2c9ca027d3de72bec35286700de508e5907e1a469c2fd945e3665dab22fe735 SHA512 4057926b10b54ea4b72b1ff09bcf3ecc14b30c4b416d7724540214263050f3d2250fd75dc740fd5c149a1f036d94f6a27b3d076d28373b52f7699305981355d9
-DIST firefox-60.8.0esr-hu.xpi 554135 BLAKE2B 5ea31669cc91d27983b7421316e4eea26bb7b54bb60ec0c8d34d01650b11ad0f78928afb0945d782450ff0e79a901724dbf776e68dd685111f3f61a32ee1a52a SHA512 9e82fc5b8cd81f64ef219f5e33fd334c6f311552c01c2c2cf6955e64a4491f683c42ec6e2afbc81bdb63293daf2915e8ed9c5e213978b95f16933180948704a4
-DIST firefox-60.8.0esr-hy-AM.xpi 585821 BLAKE2B 160a189beb3fa92a264e2926d05dc0ccde4da1672c134c5d10d1b41073b7fe3edd2511a96d86b8aab81ac39ba7ee624632919d117e870fefaee65ce928043961 SHA512 1b44f49d124558ef94b67ca3917f810b73ec4f56dafd949a7de94941741e7c15bd27e00a97e9714a75520124910a47647e6a4a341afef828966d48612dac9c84
-DIST firefox-60.8.0esr-id.xpi 517939 BLAKE2B 3cda186f2b0e6f401820b93420aa28cd66e1d654ec71e047eebca1ba85531b42f11badd5b5dfb9b368760f293e6874e1db896e2415a420548f9a709356ae8e05 SHA512 13b1abbf4599f7fb876ee83e6108c1565fe13dfc6ad1ba49655993c1f1e5bf02168f13c2f470a271c92186324567b7211478b9910d118b10975e1a41c1162ab8
-DIST firefox-60.8.0esr-is.xpi 529000 BLAKE2B 1ff1908cf5a497e064ce538325486686734a60dd879bb34214fdf88dc21e2dd372f1fcddb91a46f255a28755c661aa8d62eee748d9061fa0382047e8ea5965a8 SHA512 5886bc216b46710c5f8d1fa83ce62adaeb10e9ce924033eef0c0d72007653a598d20379f596a165605b9ce1865cc6397cc4485b693ec42e57cf04148f9a50437
-DIST firefox-60.8.0esr-it.xpi 414823 BLAKE2B 47c4bd1cc04b19eaf0f8897ec35f31ac3aed51b1a07a85385dd16ad4feef3c89786867539dea769bdfb8692191e3f676e974e73b222b99968756878dcd0b028b SHA512 fbf77f6c55a502e422c97befad6ff7ec06d54b02b7c448e46c8ccb57642027a1cac61d096559494a56f31075252a6afd63cc119597b7596eb4e0c715fbcd5ac7
-DIST firefox-60.8.0esr-ja.xpi 587748 BLAKE2B 3236bf74425f4b400ec91cfb2a9f9d1b77ae8bdc243729870ae9137aadc4c728747a57e50d8f83dd381dd692c7d107c0bbca2b5f2b4247fc09ec9a405bd9fc11 SHA512 eaf797269881bc6329495096918e7c660060f71c4eeba7a99cd42a94752249c71f23b89d4c3d3797eabdc688d7ad4d38a8e081226ff52de11dff51c8c1c3d142
-DIST firefox-60.8.0esr-kk.xpi 598694 BLAKE2B e4d0a9ea6fdbfd9eb4295f9a123282e7232ade6bb45e89302fd0276743adf5fa07209545fa2ae1666753563e79dc3fb34b1f79339a12752ee247641ede9a926f SHA512 8fd54f32872513c57a491074379231a97ce29475e49e701c2c81b26faa4cdf9bfa941f4f4f9f6e0f3dcaf56fcec0a0281580ff9ac8c61a7e97d87eb0e3a96cc4
-DIST firefox-60.8.0esr-km.xpi 598812 BLAKE2B 5809f50ad35c7344e8b4bf9e8297e75f732334ba3aa6ada4f805d4058191a399e549ac71d4107c5a310c3e74a2645e4396ae00d1b4c8da24db6eff6d242da3b1 SHA512 27540394ab8e597a0256c3b7a8370b8191574ba0dfa1fa8c17e2e8df08b79157b36dd85672e7f49c703417ce1c02287462efe22870c5ab7e2a7bab386a2dd193
-DIST firefox-60.8.0esr-kn.xpi 601585 BLAKE2B fdd5b97c7348423c913aeac0392b90dd3cd80e16c32a00df864e64c924ba15b48a2658a6fd049c0d321a9c7e13ba6819d3d91cb0c3452e73428877626c29216d SHA512 08380b89c8f099ebcffb05a0af1ce216c977cd00e0098febb16b11dc68c83a990074754adeeac34cfea31a13a3f7b259b2a9f1b01f192bbdbb9f9e63b70c41ae
-DIST firefox-60.8.0esr-ko.xpi 563551 BLAKE2B 24f44952915c8b690829e13241673ae4784a7c9040ca43fb125869f46d59a8d97435c69afda68d9009a99ef5117797db27264768d40a311a940032ed6f1c8ff5 SHA512 a2825e370bd99211f203b705825fd90391b3f689b1274507eacfbde21fa8cbaf16790f142876fea4f29feac839521c4b2c6a695ab2f5f88a298cba90ba805fcd
-DIST firefox-60.8.0esr-lt.xpi 552184 BLAKE2B e00502daf85f20955425b616474cf3f1d234b376bdf6a13325db527a5a0bc734995f8be4c864fe1eec83f8180be9b5b62132bb9226d9bc55fec271d6cb9599d4 SHA512 b88510f49a24f9032f66c4cf1e9e9895f5294eac007201d8a725d5a2c3f331f41cad58ef1053fe091cbc3256d2ae1324531833dd0ee4609fc21c611d83b7b745
-DIST firefox-60.8.0esr-lv.xpi 542137 BLAKE2B 265e6df2c81a7509bfe228dd553c656e825c8bd2f8116eac6b6d0bf9b6a481a915f5cc2eec05a5f639b2f706583f668ed41c656a4bccb323640270475411b9f2 SHA512 5f7f9a89bdc4a765a7c2744ec75448718a73ba816e617d95d8e1058e5370851e501662394cf24305883cfa6b5fb0da1f27a296d6f25402e4f341c323e01e328c
-DIST firefox-60.8.0esr-mai.xpi 565193 BLAKE2B 0990f4fa2bee2713a60b62086d5de7413835d97ec2d93871bb38169dd0f81ce33060a08436429ec2b6f3349d366f76f4eb799e104c0cbd823443ed5487346cd5 SHA512 bbbb420f8ce84e305af940dfd1f49ff3c134a86dbbdc0b44e8d176806a0658103b3c31567f8f5e958d2319c3383d4c5cdecb94a03e70701890e7e88030849a89
-DIST firefox-60.8.0esr-mk.xpi 529517 BLAKE2B 3f20abbd2e34ebf9d4b0c0ef2ce4ca03d7da8d5a87981ef3a2a436cfaee7fc0857bd5fa8aa74f1f74e2f28b093ba34fbd32cbbd4154f5a4dc6233bf42a9e7d2e SHA512 4db41618f202b34841e50866fac83549fc24712365ac285c03994b355d08b8454c73091a427a7b0752c7d71e83f8a4f075cce6341ce9f828450df13642509ee0
-DIST firefox-60.8.0esr-ml.xpi 614690 BLAKE2B 581c1a730d571450e61f23904475929a45ac248e83cd1b69f45099155ceda0e6ca9f470919f616d98c0c2da0ff0338276f7fae4b6a4cba0b82bd223df6ee4100 SHA512 3e94d9fdb5c9337cabae7971e52f452ae0df0070f4ffca55560b6a332cdad2b3cb96ba59fefce61c239f1585607fd49cf4d31988b41e9910913dfb0961165b69
-DIST firefox-60.8.0esr-mr.xpi 594836 BLAKE2B 3ef2215f8e7814223d84ce8e0a17ed6d332f0f90eb92843423c547775503f13bbb6a840cc4552cbb7428ecad91e2e566100e425f32744f0a8a1ca7c9e827c0ee SHA512 ee634d38b5fd0b3630c2df306541b21984ff5e9507768976ec095b4cab8f0a89a223d99c098eec635c704dcd8f87e4f915213a387c017f79779ce6ac76ef806e
-DIST firefox-60.8.0esr-ms.xpi 525277 BLAKE2B 63a33e5eab60676678ee4f675eccaf8c9ed2d540730acf7d5bf8006065e7b302ae7d43a5cfb1718d841a23b40f127e21c8b2f6bdee2d0052ec8ab7e246903533 SHA512 ca5360a300d0f0c7f475bb15dd0b026673352ac2588b9cfd261937a27cbf951b2562b9f0bb7dfbab61eb328064c21e22bfae5088fa7cf72d3bce8a97e540aebb
-DIST firefox-60.8.0esr-nb-NO.xpi 526286 BLAKE2B 4d1bc0a657950480f284deebff3bdd1b0b82963c5d203aec6537c0d3d9dedffb0815654598747642c8a9d2440f86a6e8f207f14bad16f305cae9862cf3a2dc29 SHA512 3990e9947ee615b77a1516d5bc7878e8a16afd73345372e321983b213c021d8ccb79a05b934fd99fe138d878760bfbfb4298b26b5956500789d1bcef15cc6d00
-DIST firefox-60.8.0esr-nl.xpi 533196 BLAKE2B 90049de30e71a243d84eb369c0895c1970aabd9e4f1f9d2e71a89a14ac6332f0bf07270ce18f6f2f3fc285fb7c0858d915b32f1bb84a169c6292acd4aa0de622 SHA512 a0c640da27a11d0f651e6b87f31c7d368e0794841bc33586e8b0f330d6acdbcd0c698359597e869853bc34300a3a9f0db9c38fd4d9cdc7f638975868286da332
-DIST firefox-60.8.0esr-nn-NO.xpi 527834 BLAKE2B e4efc8bf3befd4aa372334ef79cadedac39767985f7f2e5e50c3b00605bc069f28829a1fa5b0c9f77fb6dacfe07ab1720dac077354850bb2ff172208aab6e029 SHA512 5ad89c2fc80e80c1d323cfc3c6eba0ab6123a9dffff8243cae76df768a500947ee62f281a1de7a486e038547b185e5e1ab1aff8e0d409927c071057417458db6
-DIST firefox-60.8.0esr-or.xpi 556580 BLAKE2B cd8b95cd28592587af25be96ab5de3eef06149346fd69d743ddcdbfad238326be971ec024e6b005331e495693dc45a26b73b4b9d2f56669d7d04568f33867a16 SHA512 bdd2d01a902609a877a478c61aaf8304cd285a3472cb80abe5a09ebd208184829bff6fb52228534debce4a658fc08a2ecdd77010916f74c7bbb102c2d78493f6
-DIST firefox-60.8.0esr-pa-IN.xpi 574271 BLAKE2B 23f1e6e90fa77d096fe26ed6c16efca4eb22241ab6e3f8558ee9c057ab6c2b762ced100c9d9d01b2d6b7c74183d586408c0e611947679ada2d45ed03010459d5 SHA512 4f09aa0e7aa8907fd4dd36f3697e13d4989c5dadebe7da50cbb0e111e2a52b8ec8d545d67f56e81ce7abf2b443579695858561ebea891814963c1a5afed93c27
-DIST firefox-60.8.0esr-pl.xpi 434748 BLAKE2B e7be4850ab1c64a590265ef6b65ff372baeff55cb044803927c6cbf7537d2bceb96bec4ab87daa61f2946b4d90616df854a9c9be7d1a73f7b4984b276c7b2939 SHA512 535d5de28cd98a34aea1110fd8845c091b5e567632fa1639dbea0732c0cb148b59bae2523511ccbbca4bbed6431ec3abe83f7cd85ea64eed553b951af7c25f75
-DIST firefox-60.8.0esr-pt-BR.xpi 531151 BLAKE2B d60268c5511f4d697e6121a2d06ccd44d7b09be89481d10f482fd620548ac8c3920fc33308878d904500d814e616d472e5a82fee7b5ea9e393e1600a9f7da2cd SHA512 0ef7c295edad701bf9778922250bc4d6fcf0df35d1966681aa281c1d1c42317c75bd633f8cff63875198fc508dd662f04d6be4b7eed3084b1f03957dca286352
-DIST firefox-60.8.0esr-pt-PT.xpi 535763 BLAKE2B 7ceac7711cf39fb8c0f5d7ef7e9195389285496920392492d54e663e4fa6525a30cd17acfd40dbef27bad686239ae7015ace8e3be644e09eb93b54384a0e1e9a SHA512 4ba94384ab2054631b57882d91f5b74b8de66fe9e6cdfb834316df5c72b8cb31450e6a14bf62ea0000849f357bfd9b51ed327e78df11902ba63b74f4667d16f1
-DIST firefox-60.8.0esr-rm.xpi 521760 BLAKE2B 5f495bebfbc7c3d559c4e8c00637344e1d951b080866ca9931fc8d9d16102e80bfabeb8f3f7565ca4c68795913b353ada95eab1590e4f470286e67bc72f1093e SHA512 956a474b162b8ac3d1a4d77c97bcdc199868f445423bb249b32dd71f3e1732e0c74d292808f895c7539b855d3a81d1fb0f0d34c3f505c70e480a1f466bf9e7a0
-DIST firefox-60.8.0esr-ro.xpi 529779 BLAKE2B 5f0744b99aecaea2e723278f2cb776fce9360704348fc5c55e3286ad71591a57013140e596f78dd3446063daa02ca81e27eeca2fb3b8aa892dab9c3201869f6c SHA512 62b8cbe3f24011f247885bee7b3cba08e9ef55e2eee4ca94806138e2fe628e5fab97824599092ee6a4ec7ac54b0ea846970434b6ff74efd87e6ec61cdef8fd0b
-DIST firefox-60.8.0esr-ru.xpi 607128 BLAKE2B 6113e1157e744cdd544028aabf2c08b4c5427ed44a527434e033bb6fb6955e43fd091f5eff9a99dd52a3a426406a67a5edcc6c9f8761b5c1364b076644690f32 SHA512 4157220130ba0ea1f2c2a885cb5ddf9888bc6766911387f373307a66b2552a2f4b945ad99a2ace6db267c2818434769ddb617f8272c2bcb93af2ec94e74de513
-DIST firefox-60.8.0esr-si.xpi 561290 BLAKE2B 92f5b3ce152e6da8843624c3df1dc682119d20b7c7a6b690c1657611e2c9e9f4865c64191b84b408039b8155d92a061301a33ef33adb5460baf63fce0b7bc869 SHA512 2c65615735bc9e2480d1cf2c3e7137b35fbf5ec064979df234ebfdb01e6e145e284132fb93f8a8a7e46db5d98dd4af1d63a7632a40d1c396d6e7985ac7772e3e
-DIST firefox-60.8.0esr-sk.xpi 557433 BLAKE2B 02e7ff2a27e2d37890fe4494e8a90cab081cd708f9a625f067e9ed247b179dacf57d4cd525701b611713737625c2dafdebacd015b090cae7cd5a55c596f30d32 SHA512 9ab15044e34c48ec656290c35a834c0d5f28659c4227042948f92836a8445334d23d5c6ff9927103f166d76a06f9a8e01a3d4c38ce049b9785e2e6ed499f36c4
-DIST firefox-60.8.0esr-sl.xpi 535088 BLAKE2B baa634996668d62e431397aa1e586d9ccf3b7f9f1b95c84e0a152de62381e0428e769e27b715ba337a6725e61cf88468ac8b787a126613bc85e65d690a3f96e5 SHA512 cf20cde94c6b13b5d58181beda9fbeeca0336fc2fa7571e3c4bb864e02a0cbf035268374a966e10a6e6d941182646b508ad793204ba70c06e2db21cf65462113
-DIST firefox-60.8.0esr-son.xpi 513647 BLAKE2B d71d287b8dcf4fecb2d4e4113279edf2c7af7ea25e7ad9a589832261b874bc80eeb4c4a4b312569f9af8f2a276b9b728a39eee10ea3dc00fb7e9f6c856b82228 SHA512 4d42ed9cb567490dfb17fb73fce6fb66656931b71ec756bc5e5a20becabada792292c82df340d91bab231fdde98b5bde5aa9e326fdab6d1966c69f0e3605b614
-DIST firefox-60.8.0esr-sq.xpi 536982 BLAKE2B 45692b17abeeb3592296232befe5ce850141caaebe33fc42f5269beabb2136aba48ffdfb99242ffafef17fd8a67556bdc278aa2185a5ee0d0619908ce867ad7d SHA512 6036d16830cfaec30cac590723c9b1bf126eb29a18903e8b1d20487b4f58f2b0127f8794c0112899fdbff6fe420820b0bbb862ea5b1d9c4ac185b426f6237d63
-DIST firefox-60.8.0esr-sr.xpi 564497 BLAKE2B 819179a9793f76821f6a3ec36b986ec01b9b704bb9da4a33e0e3b5f209720cfba311a860fbea3e2846937f3ba0494a64e5a73f37666e4b1f53563478f52b8079 SHA512 1fe8a42962486ce77a3fe6fb9550609c6b3ed97ae79c6e7d729974ac8e7324f0e101bb0eab87cd68469583b43613e08825f74de65f5ea778fc97c3cbb2c54500
-DIST firefox-60.8.0esr-sv-SE.xpi 535061 BLAKE2B e68501e2c3a11b77a3d129d26ffebc88eebb829520f5c85709ed57dc794c999679f3d214e844a63dc1563bac9b79eeacad8651fff6358bfb736b8b08f957ac71 SHA512 e342ffcf417c67c90181540615b1a19aab961fa803493f939605dd8b0480f385ba2bf28be524dc0d904f2689318ddadbc950d79f0d795ea3c19eb395c3d46423
-DIST firefox-60.8.0esr-ta.xpi 593639 BLAKE2B 1981c2eb72f1611edb5ce549ddb3060a379c274b3c28a66d4888ee56ade9d3a0ae4f6541d45010cedc175c70564662e1f8112044c6ee791b61ed951f02ca48fb SHA512 00382aef01723bd52ae43a0c7294439ab8ba022b068712a4d707563388d81fd5d76479a7d79fb52642f538c6a6a137e9eb97791a59a547c7b08aa5fb461acac9
-DIST firefox-60.8.0esr-te.xpi 606690 BLAKE2B 7990362daf24ed84d84e0866fee24e96dec014721ad40becdd090199d7c2eeadff7d8254e74e6364cd9b137c725e4473c78b7fa388f1d38c53ced3f8d57ec5e6 SHA512 024ebe8f35bebc8f2cf1c08ab55383862c512c274e155ccb3d55b14b442b4d65ca13ba0715bc944d2e768c50db1578d38eb8b82ecfcc09fbf61f95ba7b4857c5
-DIST firefox-60.8.0esr-th.xpi 578533 BLAKE2B 655d94b95c0674ace609b0a9ebe0b7a12b12ac04b756eef6997ce785a5dbbe286b0fd1db6d2c42f6652574110bafe130b7b920ab5ac879607b4efa0d7162030d SHA512 79e2e3ae20726ff388898c2b479acf8590188e060262a3d3945606a1a35a28c05bf23df8b2086f98585474a2b4ce9176c6ad17f5060074f6e29e57ddcd806bef
-DIST firefox-60.8.0esr-tr.xpi 541582 BLAKE2B bbbdc3903897c6a6da09059f3607eabd34538d1f07c96afe8ea9068d0755e6d1f8110dc3f9f0f2de24601f2ace553903c53703710b48ac08ebdee35d2accfefb SHA512 d4847be63219bf66c4b3d1aa56cd78535612bddf240babc7e542d0d3a83bc84648dede88c8cc10bbe908bd2c8d77add4fe9b948d9331956e89db90a172622717
-DIST firefox-60.8.0esr-uk.xpi 596649 BLAKE2B 69e5aa5c30214b512e37ed849e2cdf4070b2e47ef612b2999ba4983cb5ba53db2ef724a25de9842aa2829b160a3840964d251f5443a214ced2c80f0553e55d2a SHA512 d8fc652dd1af7a60a7f7044b1e99fcc77fe69eb728401ba0d98cf1b901733850968cfb1291a11ad46735ac750af2b217c28ad7ae535cdf4441f1119170e294ea
-DIST firefox-60.8.0esr-uz.xpi 529399 BLAKE2B 0ecb8b9891f373c543b60f7751d0bad3a134bc36e0629b3abe47cf3580e3e1bf151b4a0da2cdc1f2108d15d213e2363572a9abdba1a18f1571ede3777b62c9c7 SHA512 de7bf13f6cbdf43e5a607c0e46f233fc65c24e7ca2bd74b0a08b1c4be15eda44ac040f569ecb44116bbdfbe0df156a67fc5e3a187a553c2523ad638406187d07
-DIST firefox-60.8.0esr-vi.xpi 543907 BLAKE2B 9c7360a1e244a626670848e75778c2650c33f9b6bc6c0b0833614fc337f829bfbbae86311d90ca907cbab891cc9e31fac7688455078b28710382529cf1dae9b5 SHA512 4c571dcd3015cb651e6af462214384e01aa4eb02204fa01dfbc6a270919feb91110d60df5e483b6404231f3fd1437d64430179c030bc188bbbfad1317fb933d2
-DIST firefox-60.8.0esr-xh.xpi 527565 BLAKE2B 6b357e8887f61aed2ed513efb9beb034d126c3ef9b73959b6f10c25f221f73f334a8bc87ffa6f983df956a5fd54f66c6185f9f87825be2b00759d4b6e38ad4f8 SHA512 5bb606666ffb6598987953fec0bc555d2a37c4233a8ae98e738eb1dd5fb3432a4ed39f6b2ef0bdb6e7af2570506460b0319830a9ce9a21b8a8f2fa37f1d6c3f0
-DIST firefox-60.8.0esr-zh-CN.xpi 559980 BLAKE2B cee4fab650cd87bd8e1c4bd14500c4036d54fdcd6524fd24d5e67f08a6926ebae10a70f0a961942a2ce752e8017cad965bf9e45ec32e825f35e5605539e30a86 SHA512 d5d63cad9411d615c0aa0814beca1f48cc033327ae989641a9e4930a8f6e7e5e6a4cbcb875b26fa5e82b631aa9a99aa35ad3710308933cbfbb0a15b9686094de
-DIST firefox-60.8.0esr-zh-TW.xpi 558304 BLAKE2B 94736adc0f3c74466f560ccfbab45ad6cdf436f2987cba65d25995dda15838109f5189e4d4bc87bd64f8a232d953ad69cdbe56cfc3ca3562b780a465180f0eae SHA512 dc2359c2d7245592034b58558357f986e612c119b54ba2b979ce1df0e7dab2a5a0a1422fad6958349a03832c96e9cf1df32bd55be167025a0c8eab5f14a27146
-DIST firefox-68.0.2-ach.xpi 471799 BLAKE2B 7b90971b3a3244a2b4005ed617f34d9b6a7e3be466d2ad462a9ac719405980b766013bb35c20a3d6b5320f782d55559da746c39fada7ee38031dc41bd6fefba5 SHA512 0cd2edab1e4420827ef0ea1d4be70819dfa58ebc7149e8c181947f8385cdbd15b590f577e3e5d29286d8c1e0a8fe35531a8e1fe323487e71a4a15b51b290c29e
-DIST firefox-68.0.2-af.xpi 450628 BLAKE2B 08ea70856d8af333a596d902f2175fc35cee7885c5757b0b3ab03393ff1c4898b766bf5748fdc3ca72ded1edba8735b69ed3042314e526af1fdfce8dfac1ecc5 SHA512 402325aaee3964e5d61dcca1d2e8a82c5e3d2ce812cd2a8870adaf1be8bb1a376ee26b6cc9b2f17d72306af6e92245a8302790218fa72e4b9b0823d1e84798cb
-DIST firefox-68.0.2-an.xpi 483102 BLAKE2B 1ad2e709d3289018fbe7e35eca993771123ee0c4172c77dfd76891d9f9369d96e43a71ccefefa70ed7fd46fefcc669e330ae8db21582e03624c4a805747fd411 SHA512 27433fad92ebbf584746ec1e93ea0528dcc5c6ac7367694aab9bd4223639e089d9fa23546e594f225db238d5bb890f20e924c692a2d8b61765b61a7d2f02276b
-DIST firefox-68.0.2-ar.xpi 538966 BLAKE2B 5b04636606bfef02f4bfb46bd520d7a5a8c2c18bfd9f321b739e8f4a5ac2c7ef4cb3bf7b1be0f809159ccd35600adaf01340d0d8f4f60aa7614075d75c9d702c SHA512 fc36f39f3ad24dfc3f94b62a84ebd31e2092eb58e88dce8928d97758b5a7e3a99e18b3e6210dbc4e9983fd836f40a8d8d480659e09983148782aaaa1ae365429
-DIST firefox-68.0.2-ast.xpi 480822 BLAKE2B fc41bca444364a675c7dc1c2c4aa1bf11231125651cff942f37f6dea75f45a6f99238422dd62e89282305f488be22f0d2705c14f5c3fa32571e2788173073f75 SHA512 2523c9c1d57ecfbbfce1ad421a95e0c222957eb519e715a8bf891aa823d094a13b7497c014c9f6f36e921ece55504d2b4cb06820dfbea5024e942635c8000e2d
-DIST firefox-68.0.2-az.xpi 510303 BLAKE2B cb5c30430054057ef6de4beba45d400b4039a1efe4cc9144ea2b0fb2e9e400f99c9e634d71e24a2c36265022dcc93b21ccb16647e60d611f7c7d71d3bda85c77 SHA512 1dab2b957642d6fdc2e954603a851da2df685021e614afab3f734dbd0e507b237bf5b0c08248d744015f698948342d91dbad7102fb2624bcc3d09f82a9c9b528
-DIST firefox-68.0.2-be.xpi 582146 BLAKE2B 4d58b258e8577ea1cfbc3608f26f22c9c9c1e766bb609de28059270e893363d3ec2dd651544b0895211c0cb69802566dfaed64765a428a486e9609481b0b0461 SHA512 1a6597909cc0042aaed765b65e10ff4769ab2646bf7a6fb4daf6e0393f583abc4e977e980ccf6980fa5102df01caaa7a6c2a2fcec8e1dc6614de1f22641109fc
-DIST firefox-68.0.2-bg.xpi 545359 BLAKE2B 0847bb6c73144964f9add5c230175072bd3ece6cd691e532c68c0cebf71e49154f6334b0e22bfbca8a6c0362c79ebaedf2ea55b2458aa6af915e54424136151c SHA512 9673164f44b4e0a4368cdc88c5f9c76cfed6c7ef2359d4a8a4305ead9009050438c2d01535ab9ac6e90712f833b81a3322f347d82f6c42ff9b8ec41cbfc0ded6
-DIST firefox-68.0.2-bn.xpi 566601 BLAKE2B 750073c9a64bda4579f1084c37cb684793bc5fd58f1fe047fc62fdb79669ce66f9b99ea1c07661eb812436dbd51ce7f0b62bf723e9800f177b5b90827eb03004 SHA512 1f8eac5d9bc3f60076108b670e74e3014a494b362b7a1b0278caed0d42f6aa97790773cf8bf1060d91e4957a31271bacec89700def8fc44bf6214da8502942c0
-DIST firefox-68.0.2-br.xpi 501692 BLAKE2B ee088044629c91cb1abbecb4c29389045d0d3bffeb1433f0d6cdd7f25231c606fbfec3e5e9bdc8cf922afb45b2da35d46d167cfd5cf384c202b60f0bfe73019a SHA512 70d15325dc9cc20414ac7bf3fee203fd3db7815e40175af0f7ee513d1724c1e5bcec770291454d3d2afb90ce34bbc5f87ef397bd09efd127929c35c5fcfeeaa6
-DIST firefox-68.0.2-bs.xpi 483155 BLAKE2B 61d5d7027601aa722bc76dbfa3254051bbd76e90a3f0d18dd0b51073d1fb5f145d5bf00b2606f6cc02ce53c09abd6ac3044a94341dbc0f66d69e6c8aae046387 SHA512 523b3b697eb207d8f5bf41b6ff0dbd1d9fe668634451ed6df80730cfdc3d9fbfff580724aeda2d14bd6b220fab8327a2613922244486f4a6ca166dd7230db039
-DIST firefox-68.0.2-ca.xpi 499861 BLAKE2B d2b6cf554fad8de6d2fc9dc2d8559898e20da873dbb8a425056bb915103423c089226ff9770090cf4cba6bc930bc56fa2ee9adc7d753ba661e54e7eca377992c SHA512 0da3ce3f8dcc2582c45a70c32ff53e541a5444df6d476248b83e10179997ececec41b8858cbf8ee7e1f1bbd76ef77c99c41a4277a6ff3f1262e41dc42df0f829
-DIST firefox-68.0.2-cak.xpi 527483 BLAKE2B 0f98e4ed66a7cf2ac40d3ff510c4fe7d52d21f174d408c21d9c70def9b49501c9f9384a15a712c342f1e2e017266e4b2dcc31f58db9f447ff6024034c79ed1ab SHA512 f5bad503887aec937df978cf03286dd9dc4992fb8f0db3dee46bab5678fe2a1023c5b6cf1c2283e833ecac1a9d3116054311444f8180c01c1dee8568b674b41d
-DIST firefox-68.0.2-cs.xpi 519961 BLAKE2B 11c154336a81fa103d46a5f81351e8e7741dcfd9b6d215031960eeaef75961a4a133f4a35afd7c5a4856dcb722a4ee0ee7426c8edc306988bd966f4dd0ddd1cd SHA512 4c6efe823fd233c4a248586504b48d39864515331327af7c9fd3d6d25ab6f36f6610d23479243779779d8792ba60532ab224cadcb57154aaa64819c1c1f10a42
-DIST firefox-68.0.2-cy.xpi 507183 BLAKE2B 573050a443c29d4065faead32356a635db35eb6b42ef07724d4bc605f60c86700ae7cad1cef2a5ea7935e116579f4e48cc14818f195d254bc2d428f22ecd0cd8 SHA512 db0921ee7cff2b3c24ea5cc60c6608a6f716cd06784c0d28e8b2b17998ff034662ea43215538861eb79ca5b32e0d08f1c66ea713f59a65b140005d1df4f621ba
-DIST firefox-68.0.2-da.xpi 520282 BLAKE2B 95a070d632196e490f21f354ad2aab808ca9b00aede5498a4ac92caef4babf3d3d0103769ab6e49b0779b93d8097193166f5b7eac15a00775d78bc1f3fee8703 SHA512 f96af5ef904d75205e4af8cfa2df6d9a47ac9bfaf5736a36a46bcf60d50ce56bc95dba6fd9a48492b05ba11be1f5c563907118c4dbd0837cc0fe1bacfcb77e2e
-DIST firefox-68.0.2-de.xpi 523751 BLAKE2B f555ccd10e07bf62073af53270560803f17ee85ccef8e6b59b4e629cf97ccbefdff12b7b0eca58746bec22cf27fb72b5a10843037aa22373525615c41be5a7f2 SHA512 c3bb00967bf0c4b532b2386f3c273a930c1b8ca107451b37541d8af5513b2ed76d44169d9e0e772c40a67568df8eb1cfe9df4a6193aee58b5b8abe103176532d
-DIST firefox-68.0.2-dsb.xpi 528680 BLAKE2B 4280c8eb5638dcbfcc83eba89ba9b2b1e8d9d9db64ff304966d05ef960e81c7621469c43fdaed9f002e3506c023dbecdfb96e6581267369df6aad8cbcaaf3661 SHA512 581415cfbdc0d56fd666c3a5d7afb629534832544d82ed8d41d99675c41efb113b408d2d062db1a898227232a702da6fe170617a9edc39f0987a47e7dc5ab5fe
-DIST firefox-68.0.2-el.xpi 597400 BLAKE2B 6dff693ac5d2926c6d2217bb34146be50a875c6b54580118afaef9ee9c1589b403af4bad60e13535a0be2ddac16ac090e26c54b5c9281254f2c24f27f714f243 SHA512 4472c7d2b3a65237201f7c5700b36bfaeb5d5559a8f361bb5e44bd3648d28afbd0a084c6d2d093282e086e1509d83898f4cfe39b7826c78e48de23e2519d099b
-DIST firefox-68.0.2-en-CA.xpi 478533 BLAKE2B e755004ebe6ac4129d40f1f6d6a6c17602e27b1e10c8193dd7e460cb3b9aaeaa11dd62af69f9c2162abfb45a35de9b09a7bffc562c2b3ae7f5100808a433b089 SHA512 62ca278839d4f2e007a08e31e2a53f4d1eb4b45ba7d1362941104e24b7993f1c9d17f67a35b647eddc869c8f2f9499fed6167052b2bc951bf38422f1080ac206
-DIST firefox-68.0.2-en-GB.xpi 478285 BLAKE2B 5280e0b22d137f6bdf970a96fa7415ced4d5e5aecc9375d6b7a207e76bc0294a2e3b2af58502b6a66af0ecd77b024eb38fefba4dfcd89440bb546786371cc386 SHA512 4f3de7cfc5bb87432f2798a46ccf5f68c821f51d438f0dcdef75d834af49ed2c8341ef19b5159cf6d543a90456a7b33ce22de316ab38de5170468763bdc2ef7c
-DIST firefox-68.0.2-eo.xpi 504237 BLAKE2B 55221de739d10d1c2d7339366592d59d655852576681ab0222cdd6e33da727771b48183d5448365726129c3d7fa49380cb433cb20ad23f82e9b6b859e4856e8c SHA512 7762c9651101481c80fe5a697bfcc176116b9ed1818baceca13072605fa98be130bb6e949e5df3feb3f903c608a8446975ba237e7b4c7f27ab6bfdbadcc75f46
-DIST firefox-68.0.2-es-AR.xpi 512458 BLAKE2B f45b89367f40bc0b4016ac2dae95deb3a7b17f4be7c7551620a718b13649b66710a0fad470851096def64e19c5ba022f3b1e0b7580949e9974c6f0b36fe8085e SHA512 4270d07d8495378e650d4f54fd3bc9c6ab03ced51daa7338671a0f848d08e80ef3d87c4f7af0e4573b2ab7a138956fe04a705f21ffa1ccf5a16793a493fa0593
-DIST firefox-68.0.2-es-CL.xpi 511934 BLAKE2B 593e721ae3c3c8e252216d3b48b06ad271a0e1d20fdf95d1633c2607dcc457a2b51043d8d67cc2158278a8557224ee549758a85c9d699c2a5fafa9792bb6cee7 SHA512 b7f452a270a790bb187ac85b1d1fab5f6c83775e4f3af31a244f257b31f5b169e3640979ea7202d6f24ef5c68ef4e309eab63ac522be98bdb68b6ccb8a083590
-DIST firefox-68.0.2-es-ES.xpi 481471 BLAKE2B 62dc4898b36e5e769dd30584f2ac3df4b70906e7a4643d50908f2c0871e1ecdf92fea2421192b6c0ceaf10aab8d503a524c73059afd4cd6436b3b8798b46d40a SHA512 edf0f5e2a392adcc6a4a9d1917d69eab28f5eb2794ccf704f59a32a01bc8f5679b38130fcc0cb4f137d2e25e4ed7107f9c0214979dbe4f72fcdcefd9aa346e8d
-DIST firefox-68.0.2-es-MX.xpi 504717 BLAKE2B b5cf02af5d6370d06fa1999a2f5ff7095fe8c46d8854a3be7e3fdf7aa3e18aa16cfd9da77efaaacaacc6c6c07f64975ab5a8671bc20dea48f07b3b09992fa2cd SHA512 54e437203202a3f9c01fc1916a7d3737639955c1b44d94371b9c36ef461f3d512b3bc70cd13ce3db5ce5b1ba1a905009382b03c594427e0ba7d6f1f4039a5997
-DIST firefox-68.0.2-et.xpi 488549 BLAKE2B e6d839fce6e3b94982055c3b222d23977042f33981ee82333a6c4f7e776c0c97a1d261f0e39c92c627e4e4889c4edbad313dc8397fbffb858dab621b6d89c745 SHA512 80d94efe5f5e65bb26a318b92978b6a9a80b8645be55478efa294b45068d46eabe0fc0fe0cc1833e7ecba5b40a75f5dc3ed18afce14bc25d5f6b0c566b4ad446
-DIST firefox-68.0.2-eu.xpi 502489 BLAKE2B 17bf15210492948fe1404dbe20f83efac649df1e1e4baa1649232c0a98603b3f79df51c1c025e6e27693c3aca94e36314b20f61006acc56119ef1c0582f918d4 SHA512 d88e7ac06106cef5c09df0859487bfaf83ebbe38e5daafd8aca75919577fc515a8b153c37c5e9b28fa4b52b58aece1e9d5b998da6998d43f7e998762f0c5ae83
-DIST firefox-68.0.2-fa.xpi 547859 BLAKE2B 74275af10821740521b10cfcecf7e530bbc7902973667dca46d46db8f4a1e51f9069140d823f0b1f60dbba00b91fbdedb82a544bff0c7fd66ec7fed11c932535 SHA512 78d7c7b766ae660597ab427e20882714789757021229c1f46536eb0e82c65546b75154947b4bd8c07926addf00d8d3cdbfb7708b27c864819f650d28243ef539
-DIST firefox-68.0.2-ff.xpi 484097 BLAKE2B c7f86c0803ce358615efa2b294ac14250b5aebc97e8ec7105033c0973d55e227716f5adc955e9d34f72e2603ce850cb3ad12eddaab208682664cb31df49c9e51 SHA512 05e8a1e2aebf844e3f6ef7bb5d6dfd3bd6be1742e0cfca574cfa4c20c6359411e49d2d023d554b46eb408470984ba8ae6d11fc61f02f13f9f34c9640f55f7ace
-DIST firefox-68.0.2-fi.xpi 494314 BLAKE2B 9768db3984b57c9031e93b81aba3603ee5216e789b640d976c10532031662eb30cc35f901978e8f2d271ba94c3a0653727d3b8da7901eeafec9bd3438e3822b3 SHA512 a1e12a6c7f940534fd902752d2389c367cb8f319d89451ea4e97912ac97ba2dd1645074ec2a14fdaed7cc93fddd245ace3b42af115a0098eeee275b6aa9263e5
-DIST firefox-68.0.2-fr.xpi 523088 BLAKE2B 5f35eca208bd00c942436afe46660a88f95680cdd0e6ccfefc0100f314613b5e35153213bbc7edfae87d9bc5de39b4ffd26deadaecce32a0acac75db79d770b3 SHA512 c505da94323ec3ada35061e67aa1d1b6d8706ce41d4926c8631b165743911b07839ffdc2bb31281efeaf5f5b2be8d12eeb1cac3fcb8358058dbbf355a1d88371
-DIST firefox-68.0.2-fy-NL.xpi 510430 BLAKE2B 83f6b4693176373e4953c2b7ea5662caae8343612ed3ab498d3cca177a54a313c63c078df57b5ca80e059fdf7df60043e68213f2f2d6fe73b70ba3ec0251f6aa SHA512 3d9bd035728f30008fb1ca9ceb26d2ee2da307f5f55b70dfb6437c96256d3605493e55b92aba2e9183fd537685639245c075387a69a15eb0e717d934ba66044d
-DIST firefox-68.0.2-ga-IE.xpi 489720 BLAKE2B 13993190c5e8b066a56cdbbad11a1aa0fce6741c8cb2fa34c29c9f39eba4114938564788556ba295e3e516bc05306642edaf25d6939972272c1eac107bea5e24 SHA512 df1242e90b2236e2196359bb8448ee7f96dda577a2182f95180d5275ce48c4d93b4dfad0eeece15a4c2459f02c5e6920e7c3e30e463dc66ea7765febdfb418b7
-DIST firefox-68.0.2-gd.xpi 506586 BLAKE2B d23817b322ebed2d91d82d91618e3c014aa76d44c615e8134d544aadee2f16ed4a606691dcd98d057c0e489313092cb001bf8ba2a8ab8ceba16998f33a0583fb SHA512 dd818eee777bd864e5f5d247ffc30af890d8b3bee7221c450f97f573c14647409b2160a765200f085c1d73be96591de98a06b484a00fd92ea235d3971b57bd13
-DIST firefox-68.0.2-gl.xpi 484026 BLAKE2B 887c1034f14f3bdca83a5b093c897dfe025f2710f41734926fd3e49d168b6ce52f5e1558fc7fa65212cfd0bc0793a89d7653752c271982a19e4cb4aae444003e SHA512 db5a3b35e700d739361a1a37a0a8d2bdbcec9a27f0af2782a2b7f2965591ca9f8bf64c6bc31b2786cdce5a0b750edbb27270850544c99638e4d1cfd3893f69c9
-DIST firefox-68.0.2-gn.xpi 522019 BLAKE2B 0d26300b59cf676e17536b71fcfa67a88bcd01ca6b790f514f6da5267158e70522027a6c42b9a22ae314dac8c9ed70206a6f5a6cd6f5c89b176e6544160da595 SHA512 7c32290953cf92c5f03bae757f2b7d3e5f328de3619eae6a75b90a9f02ef20eb4e9ffd7564176add7aa4ef7a9290e55f8e4cf51be0f6557866bf59f2ea67bf38
-DIST firefox-68.0.2-gu-IN.xpi 571751 BLAKE2B 6d7e58cb9b63471b8fe5a61a7b3f2e5e9ad590b068cfc4707c94a7ddf78ae52df6eaa8a73d22765cc9759824c46d25760c4432611e7476998df2fe7f00d571ef SHA512 94fed75bf58cb27e31a9975c847dca301fa6912a5303691daa39813c3c6f43b2f7469c04e30b4360a9fb86fede15562d5362f152bde5b77c2bda2fda1f782bce
-DIST firefox-68.0.2-he.xpi 514041 BLAKE2B da6488c57fba5181b8734113fd20f0d291b5819a1d1f7ae7d47a4924edc1646cc65815b50fe47a14d548e311f6b507d145731793f47c3216c958b5692687b838 SHA512 17e13b9c741e491ecf1b5e3662687889a822567720f822f40921798bbe454cbac2c2af495ce8d0c7140d6dd7a81f3944a19833cf3d9cb59c3f26ecaa1333311d
-DIST firefox-68.0.2-hi-IN.xpi 555497 BLAKE2B 565fa00cdc021eb1b80261c42e26cd6ead26be27f5f37ef94ac54643e9b70ec9906c7f16665ffea1e8d5c46e09845c3f7991392f6e435073bd34d7097a5bf76e SHA512 9e40c79ae97fbed467eab499682f8bd9ff2d41e2226a64546c6602c6820e362a17a8d907baa30f18981a73c8a0ee64e698d5a16ef53deff5553a83ab7a210b34
-DIST firefox-68.0.2-hr.xpi 491327 BLAKE2B d398031463dca8672fa7925a2451831a2a9f7c5ed25dc7591841f6f7dd8f9217d9a6053bb72b9d78984b0585693aa683337841c28f15aa004a091b0136f58c25 SHA512 7f47b678658114c45a9ed52c06cb8573c5fca754f7da678a1ef5a0a2517d7e659da975bf867345e09e1c3c255bf7831f65dd8d1a6f9a609dbe705ae502f77c12
-DIST firefox-68.0.2-hsb.xpi 527932 BLAKE2B faebf4561e851ed2da1d3c22b9eb08bd7471382848c15d660fd6664f6bff117531449adf090f707d97bbe548d7c70b92e0919e64b9d80abb570c24ec378385e1 SHA512 7d7d84a4d884a9f7e7bfef78b48e361ff6a38c356eabd8107a3949cf2db130e7bd77fcc2deadc2c0e92c10d8fb78d4694edfec808ab87810160f8c906421eae2
-DIST firefox-68.0.2-hu.xpi 526254 BLAKE2B c98461acfa6fd2adbfae0f5bb1e81390ea8c4cdd22440ffa6781abee3ce0d6fc5778aad3962406b68f2019550b09cdb75e13be289a8279cacab0842924b32094 SHA512 4c03f008739a4ad38aa4d8d5dc83f36ef777eb211cf723dd01ce5d38f9b8f45a60c43d5e82e1eacecf0dfec8e36e155ca074c6a37e89330815ddcc7a07fa0c1a
-DIST firefox-68.0.2-hy-AM.xpi 542619 BLAKE2B 05ce45a84266ff2e01aeb779e4071e2e95fdfda44b6254942a508ca2c21a3df6c45e13eccab52be6d03acf7d65d924ff757104ba6263825b5a023ec936b102a4 SHA512 29b8e36aecd0746008381c7f42409691ee48cb951d6d75d691275beb82671748c80e6849da76a7017a717548537a4dcb14337e100104d730fd86aa9dc8a08204
-DIST firefox-68.0.2-ia.xpi 496504 BLAKE2B 3cf1997c4ce76a452b493ceee7f5b0d583fae9b9b994cb5b002d71cf0ef9bb71870eb2c63792c1538bf67937c25582338dfd2ea5a3648365776cd727609c5b7d SHA512 a176126486621326cb59b975a28f1873c3a46d5b96495dd064e975716a231c54304f268920a0dbb90fb32b34a7f12f0550e3a0a4c3569dd35ff276831089fbe9
-DIST firefox-68.0.2-id.xpi 491923 BLAKE2B c931e9d44241f115ea12743721319e650527a9e3153a0d7f3c9dbbd7dfaf96f6dba5ef706585047712268a55548d856b9491b9a12d020d0684f8146b723aa49f SHA512 27e396f40c3429169ed0b27665071da606276196e9b1e6474e7433fbe7414b104040bfb639eed3e61292549ae37ca02e0d871236c3790cb3b5cb427007b75f00
-DIST firefox-68.0.2-is.xpi 499981 BLAKE2B 1e703a6fa20682feb690583922f9cdb1055ee326e03ca3af607e8ccd543115bef8f6ce31c124bb969461e1e992b130dee1e0bceee291c011a288571b046aed8c SHA512 eb5c81b7e4dbed401e1647fbd25eb73ebc0729444f50af75e97180c41cb53ab5cc5b7f11147a129525e448eae71b05e636ff1d2cf7763a227e382cab256ca848
-DIST firefox-68.0.2-it.xpi 383774 BLAKE2B 3eacc55a9c7c76dc128282fb58ac03767d482fcd5c1266327c15521b164fbfa73f930e3f95857c76b9b05d368ab238bb8aebc24b312da0f347025d16a78b0883 SHA512 2b2b7c26c6410af643d8d9cd87cba725707a06b2b8fc4e8f44472ec0aec314985b3081a7eac90e975f52dd0acc617780d502de9a44a5cfe98c02f04400f96b9f
-DIST firefox-68.0.2-ja.xpi 537086 BLAKE2B 4eaf04b5d0fac6a2436619f181e154726c10a61ac3a05ecea98230b75530989b5becb4b0e5ce20029da77bf940cfd447d7528a31fe4f846ced364cb36a2abfb8 SHA512 431ecddb4fcd050624410808252f66b3365cb56a6481b9ba2e5b5d3884ec47e9ea5105ee7801a9a51a65b00b986082cf061e0bebc0a8baa8cbec46661ffaad10
-DIST firefox-68.0.2-ka.xpi 544708 BLAKE2B 47fd6475e989c707cbad96ac1979cdb4f8cf705c22e1382d35678ea6b22cdb8759ce12a18293357218cacbad8fd383298e434bc110b0ddb267f6c52009241291 SHA512 182f9687e7db52d393d299a3069f1e5e57d01bb55ec3774e5801ff9e7ac897268d3b01f731bdb5b46381e717dbe2893eeaa80e6c1c71594b72605e7dcd82a2ce
-DIST firefox-68.0.2-kab.xpi 508639 BLAKE2B 7141e5bb901d224132a66599674f8904e58e41321e82661aace0c2b0aefd891b949e3f8f0c57dbece3470cdd589035f668782634ecd3b4fbd79d63f007c7e506 SHA512 8090ab4f0def627bff936f18325f9df001d343f8e587060efa819139a4548c9fb222325fa840a7f34f688cade578b35e070f1718e27806c66146f536e24bb532
-DIST firefox-68.0.2-kk.xpi 578955 BLAKE2B 96697f9ac306fd1e64a37e309e002e2cf919093fd9bac9909006b68ddcaa830fd4cb6ebb3ba871ca5e5d0a43b8c926bba202065e494a1163d4cf1c5ae5753630 SHA512 6bdbc0186859dcef0fc8119093508380f7f999dfcdd329bd7c31a7093e2a4e16e26613e4f7867183b6c9f0481234ff469388fad5ba4aea5781c7b930067f7255
-DIST firefox-68.0.2-km.xpi 551379 BLAKE2B 48bafc6de92118d4f1ba26b1c43002b4fe12c8f49bb4fca4c14b47b3c821f9f2e143991883ac79f22f3d9ac532e2de9f80c7788407504ef82207b20db2c2749f SHA512 488b73212fc296b5b3709328f93a31c5e5f5e77cf885d6f5102fd4430dd77c2ca0cfcb2fc88ab2d577ef78d314eced16e2637685cfde0f34b2b3882133d8eb8d
-DIST firefox-68.0.2-kn.xpi 547732 BLAKE2B 9e5e09cd7246c51a1eded1b868cb787e08cca967302f88ec16f37d69bbe16a511675b6a7fbcb570e7dccfadc3f3e5b403e00fad143f4899d7fa7127e7d85dc7a SHA512 e3d015650cc72f0ef277935c01616d61eb074e96c9a094f8730a2a586ae3fbebbafb1a65a576eae4769ecba72c65ab14d6b7925d7eacf663766a04636c532c2b
-DIST firefox-68.0.2-ko.xpi 535982 BLAKE2B d8d69ea4a2b39c8bdc7b5e6cc22462aa7946e1cf9557a9593a698e5a1f62e47d5639bdc3bab8a4a058aa48bd592df646d3a14354695585e5ada998dd0e0ba24d SHA512 f61c215b4849478036d13c39bf35aaa4521e01bd83b352b6e52bda674977d8d5598fbdb17a8ebb9ec7d50b993750d7b50cb465f958c4e5f1c49352d8f5cdb415
-DIST firefox-68.0.2-lij.xpi 482047 BLAKE2B 8bd0013a5e8ff9cb784b2d49886db6e42ea53eec581b8f8f1795d14c4928cf5a32b3c953bfa3c0fbe25031b1ebcacb2fdc112b5f4e81497d67e62d8309349f2d SHA512 5d89a1f6740937d1601ebb654b7b7f47916995ce67fdf76c0f7780596d4542a8851bf853826315e706fcc33d8aa16baaa8d0c86770e70154273db2c592fe4035
-DIST firefox-68.0.2-lt.xpi 527597 BLAKE2B f8d0325fb0e0c2cf6bf08e0c70d0ddcced5f5ef51d04c377563f2c39f8f154307f1b25132646748d519038b6972c1b168663881723519edbe5b953935dc211aa SHA512 891591f74b305684b8488006d1ca2c19304cbacf5533f696eb09bca9cc4e1fcd5cd19c9f8158d476db027a06f18d439fb2c1742a2301f3730e26348e9fa44e49
-DIST firefox-68.0.2-lv.xpi 500467 BLAKE2B 0fbf61a715ed46744482cc6e9565a331642dcbc4ff8a076793fdd8b9765688b75273d08988b9983d1dadc6c721456681c54beb38fbaeeeaeac875f58378fe12c SHA512 c691bdb21f7999cc4b298a008816b1c0bbd5671a3aa69b237631463ed9bcbcfefec25103ae01f5c6147c63f68e2401e428c4f9e9bcf6efdda1f1b0a745122b97
-DIST firefox-68.0.2-mk.xpi 485313 BLAKE2B 2a5562a050fface56552c0abf30be93af208b5ea8381ab461762292050bbc9431e79754988c7da97e13085ebfd5d97ff9e1a400c067fc8f85545cd379504991c SHA512 16ec7ce8f446a395e44dc776649b2f3d703f6724c9f6fdbc9f5ecf9671aa84c0bc7b363e81d41a96bfc50da263e1847e751d0103484302f7b85a93e457db8af5
-DIST firefox-68.0.2-mr.xpi 559178 BLAKE2B d6de37eb6c4f425a64b9ec290e35bed7e399901187b3834263974936b8995db89fcf8f7b13ec3c2dcbada46c06bab9a1319f0f3059818dd0a59178680e10f84b SHA512 aabc5300d527341469f3b34560eed8a240f92b2f48ae4e0c1a44959da774603004dcca0d9ef8a970307b285c9ec97d4e7ae6417b9df32d39ee4de22e68f42251
-DIST firefox-68.0.2-ms.xpi 480454 BLAKE2B 4c488f478db18aae240df0900b208282474410be290ce7655ea8f48cc41a7bc49f37172e5b76d48c66ee6750b45cec8a046e1c338511d584046302da75805935 SHA512 1ae3a019686022631737af261258c07d068bdefd7e524fdeda3f3ae50db69358d870ade9b2126ecfc5a9149910289f61cdedad0e1c21604a8484a84ffbf4e4b9
-DIST firefox-68.0.2-my.xpi 552182 BLAKE2B 68add7de135d079254c9ec17692df6fc0a059b003009bd8cb3c5c1e89f2ec8a5b8b846261fe883eef361cf1d83a4b09d8b07b021b11ee0d0ec46640fffd38f30 SHA512 0d0c2e3d28cd49d439425c22ac5419f64eac30a5b40aae786533f2ed3fd88dae8f82620939dbea9c999326d496088b5b7bf68d1b5e19b1cc00dfd41a69f280ee
-DIST firefox-68.0.2-nb-NO.xpi 496171 BLAKE2B 17675933360f31fc5de94a6682fa343cd0416c4dafdc537a760fd824678987f232a5a9d9d3373b940ae78b623ca855b1122b2bdaebcbd4d0785374687c4d90c4 SHA512 78a91b49c8c7f0b655bbdae50391c2586c2f0a8bc7208f3917e3d8ea381ceb3a4d7c7e70179907cc79bf8d137e703781049aedf4f37de186fcddd7739a4289a6
-DIST firefox-68.0.2-nl.xpi 492180 BLAKE2B d7a7ebfb4c5aed848acedfee925e5c2532919273b9ff0419f6b0e6800c3302113d3155dd35a27a713ca559bf8cd45152d76efd684565536d523d84339b6e5227 SHA512 113a9a69e41cec3cec319f894b407a85ec785f4893c453ae698b1674fd7e02b8fab62c77f80f4adab5fb39338be746191ede5e3a805c87514f606c8d7a35f025
-DIST firefox-68.0.2-nn-NO.xpi 494801 BLAKE2B 57c5600e9e470421d6f1a2e2a81bb4bdfd6b9249470e103d82c3533e5c54dc3bd4bc970bcdae6e8b57a0da3e3ebae3b4b34d1b0246afd1ee426ffcb4e4186209 SHA512 eb35cd0cf91efdc3312f035c50aa509551639ec8b083f8d5f21b1d71b105b68c004c5b69840b9a200bc1045076cb71de7d9de8a232a2084a771392b3dc4aec26
-DIST firefox-68.0.2-oc.xpi 498792 BLAKE2B 51350bcf457929d8a8792c79fde5001ef79a22846b51c9d8c859ec1e703738684d43f2a716b10e85b37e424e4770045c538fdc14d87901522935105d11f6becd SHA512 4ac4a61ecb92b969c23ddb8aeac02640a81c9945c2f744babf7615fd3f54fe5c5ffa787600f86071f9a4831e4bb46bd34940951e17ce5baa9a2113bd95cb301f
-DIST firefox-68.0.2-pa-IN.xpi 542697 BLAKE2B b426d4bc50e582fcca7fd86321f60303d513421bbddc020d281f29b21256956584ee28a7c0b7b800eca7aa5d8353f10af4d086c7a09bc6387f6d62ba1a3e9fe5 SHA512 dfff5100dfa35d1311e31efa3df04cddd6359c3681739b2f0fde2cd10d4c37c421768a7ebd332c5728cb4ff2b17bbee050bacc3f0fbb4c1edae3d0b77c172ef6
-DIST firefox-68.0.2-pl.xpi 495837 BLAKE2B ed367ec1d43f361b021da25df7ceb603981a2e9e96b4ba96fa8e84acedce56383f00a953c0cdc795c55bbc9120f8bbb46589eae1c2d7d9e686fa120f127e3625 SHA512 68d3c3a48487941ba8e263966a8d92d698e5f44279bb1760df7bd042ff5a875953900a3f497db35da36d763d542c01c0ab8a0d7a727b106bfab9492f9c48ad66
-DIST firefox-68.0.2-pt-BR.xpi 498245 BLAKE2B 88967a44bf40254295de6228d1a73aaefe0a92ad9b95fe76f7f38975f2890cb8a799344f3f794d208b9bb48696c18f64809fe46c6321df8bb054485a62637740 SHA512 34e579d7c91d9ee7252e082db6f3d735c6334435f14b44a2c81ff8b618a5038fb999588d8c7a9dbc1bfbb348c14ee0df2e9d2518c14e27c580b88d20417e6541
-DIST firefox-68.0.2-pt-PT.xpi 507863 BLAKE2B 9b2aefa5e81e7dc3ff0c638399da2d781413b350d902dac3b1f5eac9df8d81583d0b5e5d24bea870842611c5ce44eda407de29c58229efcba28875bcb927fab6 SHA512 c4e8d286aa662cf339d274ae49efbd467cd903e2b9ed698fea6b1959df300a46fef8057e8a47e2882825ed2dc5c67783dcfa26bc288e746b3c47a4c5b9a16d23
-DIST firefox-68.0.2-rm.xpi 495529 BLAKE2B 1e98c4aa5327f44b16aafc62e42fc34c7c2992bc163478dfdd870f939f84a22937bb93dbb9b00d0e7fc5715d30a37a2ace6655e119a4f2f5728491febdfb4936 SHA512 2bbc83e05154f00bef73889789234048dddf524760de5c1079f8d5667424df5d5d4fc4e700472644b3c78356afaddffba08b81d98d70245b82b47d2c360f73d5
-DIST firefox-68.0.2-ro.xpi 508822 BLAKE2B 757d5af49e8dab060d9307a8f40fca215584ca22a8afadae5813bac94f91e7128b9bc41f68820736d32063341961fca9c9d4d5da0b86b534dd0ba8a8c8cb127b SHA512 6809aee000a83b90ee657da21216695f687b7933cbb082c0b9e58ae846abcbcdc0b01391613c73108799b8ec80eda29d68135fb4ac9083006ac57193eb14364a
-DIST firefox-68.0.2-ru.xpi 583983 BLAKE2B b440a8d7c017df2a4d930881d6551ceb2a9f4e571817f71f99b8ef02c39267fd8794be4ef3af32b18734470469c5bd2ee3ce6e3ab475cc5cfcd1ab868b153f7d SHA512 c522d6dc4865b2c7aa1a0dbe290ea13c0e36f78951c66dad143e3a498152a9f9586b4b408dfd207cd960f9965fd2e0a9443267061fea6e61e208ccc93ebc4ff5
-DIST firefox-68.0.2-si.xpi 528260 BLAKE2B f095ba767e28c642c9c9d167110e8f97dcd20ede8664e1d29215deadc9332aca75156da3c2223db1c7c66755bdbec05d33ed4d406202b15cbff3975912ad0bd1 SHA512 83682d6efa9345e47b54b943f9b33eefd0b50bc7fdfbc93c5b837cebf0760636f7dbd6e58883a7de2f555e0c33aa40ab0d317f6728052aa9e30fdaa6ea8d559b
-DIST firefox-68.0.2-sk.xpi 525301 BLAKE2B 11ae56c56958b684ba9de40e5a6a9ca3b8ec32c531ad092b848f062f8ac55c0fc8e47e2bbc8ab2dae9ac84fd7271d0ed11c85e5445231157fabb7e5cfebdab0d SHA512 3490cbf8bc53a54040b8696f6b6eb4dc53b16abc1a821a9ec9dfd41e8917567ced90ddb899e76f6e837494670c9240348942198ac3e94cafbc6de923a5f61515
-DIST firefox-68.0.2-sl.xpi 502400 BLAKE2B 7edda5369fab0afa3d1b7b85e8e37298e8c555dfe70558d27b3158225ba17259229ab21103c31eca76bec4b5d595c4d2f45833d3e04e10b197fd1f7bb937ee47 SHA512 274abedb65230342f524f9b42dc9df114b15d551bbef74bb626e3fe82a8f50469317636d7be520cb0c1c26f6a5efecb3e72c847a42608658abbb92593e522c9d
-DIST firefox-68.0.2-son.xpi 459045 BLAKE2B 0fccc1daf58ebf78c7c8181ee44600237188afcd3333c48b510e1f5dd1afd1dc4791e82fcf9025aaca64a855b40250ef4343d2b977b352548409fe3d5406bed4 SHA512 30386556139893f41a915ac3f6fe8a421c4de7c9ff6db626926472f6537d209fc1f316dc0ce0cbe49a923c83ecebd38c8ce21901a92e1328ccdc5deaa435133f
-DIST firefox-68.0.2-sq.xpi 521628 BLAKE2B 874e97696611d1627bba970222bf89679d464a04b9e6258966d78b785fc14df790cd69534e6adeba9a009cdb568669d77ba5cfe3848ec2e85194e17674c33fb7 SHA512 a62b464f18923a7f11b636b86475bc221161ce79cf909f5295762d8c6a02100c78df7373b373aac071584614d8a193f2a3d1c55421263121866bee0c7fb8401a
-DIST firefox-68.0.2-sr.xpi 527537 BLAKE2B 388ba6072623c056515865efbab9ffa3c488bc888ab2da79363dec6582ddbc4fc03643c4e75c778335a3df45eddb315015f6d4e55f40cb59d0cf8f93492aef09 SHA512 b2c9606aa185d4e8ef636a0b484ca6bef5a4cb58be072e53ce0449e0c3e6e31d3c49f458a4db17764a18449c400b00425b8a7768f7b5f4e8dcb93352dcbaddb2
-DIST firefox-68.0.2-sv-SE.xpi 506919 BLAKE2B 50b809c84fe76a7d54a685659d66587b433b325b5743c6ed9c1d42475c548ba41391e93ea519df95c6fccab5a1ee32bba99cf18a6edcb0c19bf8ec607735885b SHA512 724220afe405e6f33a69aac68dd1dafb7cf7681186d2893055716fdce35e39c6cc4714bba72af80351c796b335b5e8da85f9389e908fd8da95c48a7a9485477a
-DIST firefox-68.0.2-ta.xpi 549379 BLAKE2B 811e8225d6143ed02b048ddf3ce90579b79ae5ca4bab3bb70b94a6576a563d22eb2e38b50319e368225dc63333f70e07e45f25743733e85458c0a548349ec590 SHA512 30ba55e3cb804bb26366259b957f3264544ae6cb0cd18924f3f8ecb2545d629bb10a5f33adc4c15222d6bc4cc3eed2cf5d94465dc6041ce8ac8dd2ceb5b5dfc3
-DIST firefox-68.0.2-te.xpi 561721 BLAKE2B 81199e6bee1ecd47c6ee37e2eebb26e4d8b2b9d8c604341bd6ad8b88acf21e676d5b4d5357d2d165eb256f7d657e217a7366bcc17171632813f4eaa05010dfb3 SHA512 e2f4d227a4215c26750d58d20ad6ac7cc33781c766d5b68a1b7938b8e3f16b0dd94aaef54dd0dc1e4a78cb26a4282565c32ef1d46d641cf747dde66eede12305
-DIST firefox-68.0.2-th.xpi 550955 BLAKE2B e3fb29692404b636a8921f4bb8875c43fa8937d7bcef62d0b1e3dd8eac229339501d363fb2a8f2d6efcbc9b0e6bfdaa8c1a125ee95a4c24f679dc6c139b0a601 SHA512 8752f698671a5d336cf956c578332cd3db6014bf0d20358acecc603ba089e96f04edc56ce5e15f8576c256b76410f12988afee756458e4178a2fe3d49365053f
-DIST firefox-68.0.2-tr.xpi 515318 BLAKE2B 3015b3de7e660338433705913b843e42a6550aed850ff18c638cf8ccbd199d39ac81fe049a8e4f7e2c955b0f4dc894c0aae064439d6355382a5a2e17c6e4d38b SHA512 56b84f8a862ced6958d4334d4ca177aa1921361bcae49d727514beb3a4b4889e79ce922812489a6cb5cc524d3c872b032416cd03d87ee4752177fa27e597debc
-DIST firefox-68.0.2-uk.xpi 569041 BLAKE2B 71139b30cf9d3ce735cb886ba5837cc712fc500682310381ecf5b6a29356c13544f884eeabc0522e08916febec135c2493cf45f85dc92d79732ad4df494d3e94 SHA512 00cbaf11839edfb694582b8fbfe1df2618fbb8ef057466d6b118130ab280d683e77cc580d49a730c7fc9b72fe28a385a0654c15a1934b40989bc78ab8d80260b
-DIST firefox-68.0.2-ur.xpi 542516 BLAKE2B fba79e102c657b83466799bb7849ccbe79697314030b0d5a02633bd51abb66676118b0e00a4a938c26bee3e043394826160d236e78e5b083cf86548a085689f2 SHA512 a35c5040b46bd7e077091a30a8323620b8a885f735e0d22c3d8e21b89d6899bb5c382393325de1f3ab5b269761533ff3e9590bbb75e2c93e615bbe3b0a4dc5dd
-DIST firefox-68.0.2-uz.xpi 482653 BLAKE2B 73723741197ec9c9bca847cb41212b6e83bedff5a1555ce9a400a0b449e32c073eb156a222b7833764d509b1436d2d72baa57a5806c6d2e8eab3591c565d0fc4 SHA512 2865540da8d48eb6856fd0df3b6f26c2e4fbe2d98b1337b7ca949838f8b23f93a2907738af0354f6a62d135702604afbfb61d45c35c1c62f199e37272a9b6104
-DIST firefox-68.0.2-vi.xpi 529344 BLAKE2B 81e6e8350c7b2b0c7590fb296f39eb1b309a567d31d5af7cae24512c0853a7a8c56665c60fc14698d63d0fde33f642c82b93865e252c02c5b7cd308f1f427a62 SHA512 181e518b86957f6bbdc6e025d631a361d564e6c24916bbf54cf955e5284284c10be38ef36020e4399258075812a08a8fc836096dbc28a5d7ca30b23868b87361
-DIST firefox-68.0.2-xh.xpi 470582 BLAKE2B 49528ad8adb72f968030f9df600841f1bede3469091dcc3b1a938e3ffd3217a571a1dfdeb599448b7bc34fe57f75290ebf5f9dbe2449be31fc86ffacf7b01e31 SHA512 0def428a9cadf6ddb7569e62896776e2eb4913db763511203e64c48b7e5d7a4df9a4006f5127efb3e7dfe63ceecb20cf1861d3d994f903c44cc8da40179ecb52
-DIST firefox-68.0.2-zh-CN.xpi 536613 BLAKE2B 723d926b9133b26b2d662276460c9588fbce939380a008fd3b5074275b94736a4e5bb941f82ecc7efb5d5e67298ac7a57f755272329a80386e148545138b6661 SHA512 757ec3baf9bcced011d59f33866f3b7f0d8097303e1b17f2ee7bce1ccc96b72ef239fa1c66c72f41ebb22acf09b1bf28a56ced9518f9eb9e20ee2a7482d9ad95
-DIST firefox-68.0.2-zh-TW.xpi 536156 BLAKE2B 6f683db409bcba53e6393278cba331c204d32ad61e450aefd047d83812430bf290b5be847ffc1e58e5868062cfd10fa5759cde317ccf1ac2cd01e56ae55c5ede SHA512 50b6f492b39f6596fcf14ea6c31d13afd1d033db7dfabc262942b79ff9e22acb17aac9420f13c7976e02cfd3d3d0bd38702a9c2d3f2b54f258da49e00a588bb5
+DIST firefox-60.9.0esr-ach.xpi 512788 BLAKE2B 155c72980b4a0573f2d4e2d80f1bfce095bc2aedb6ab265b2fd4aa35046c0a91ee64a8f00dcea957a7889133e8969efdb49c76dcd67f7a8a0e6b4532aeebab0d SHA512 59980e52d51095a6dfff48044fc2a1fd8c237f251dc1dc681eb0f799700e1b4d08c10862a34a77a41a6d5b90cd96ac6271af6ad63c0d6be815c0e687d6218ccf
+DIST firefox-60.9.0esr-af.xpi 503031 BLAKE2B 74cd2d6169cc455fdff7a93d8327388f8247375bc362b5f0efbbf3f2fef80a05f73c3d761a09b427057e8de81da3b8b4bd2a551d4f1b627a4639bf3117f252f7 SHA512 5187dbbd3e025ab7523377f262e02a7ff9a83091b657ea7f22da85de78a71a1f839af05a6ec38aaa2b1c38254b9cd3b95e1ba69dd1ffd6d71919c63e8b3dd469
+DIST firefox-60.9.0esr-an.xpi 536226 BLAKE2B f110e39d28d98c916b2b74b05c634f87a8ccb52b41c87931eb2449301d723af9b2703be411e2ae9506138bd0f9193da315d511c207d9030efb7bf926a627c1c2 SHA512 524e75c7e186aeffb29360fb6044d334d37e0e0495259bc6b12b43c44566a26159cc04b715174ad836086e4950e0f012ea118aeed33d8cca99a25b2a8872c7a3
+DIST firefox-60.9.0esr-ar.xpi 563542 BLAKE2B 448a7a88254bc27922d30f9a6c4657c8d2f6581baa3bf976a73cfab1fcecf919de7b77544ec83a128c622d11815c26cbcd2f56196245aff1bc316308b14cfad0 SHA512 33ee7cee0b06ec8930dae61e5b3e48c4c1e51fafbb127f756e88809f8ea83d97f6fcc154d78d26cb944230d0a80c6b3f6a695300d81aa2cd8f0c8fc226606e9c
+DIST firefox-60.9.0esr-as.xpi 546437 BLAKE2B 7be219893258f1ecb3ccc27b85a79d968b6ea35986fb74a5b23a9e711de1aa23057d2a49dc9d163c619607b188b37f1094f31920bde603a3c6dc615ee1194bde SHA512 84081960df0e6fca213bb86af690d7935834ccbef6cd3ed2b8aed220755651a7b081c37e3570cece78658e199a31215c988849f46224030bf21c54f5c083bb3a
+DIST firefox-60.9.0esr-ast.xpi 524607 BLAKE2B e6b78e54119a02a8b58927ca8cfd4030d9b099326750622675c27224c469a3e0b1f4c5614f1eb1e066e09373d073a1721ea3680d1ac0e1a1fadb98d8fb7c0255 SHA512 9c5d8697abdb12bf7562880d02d52bb7329f9ff715718835b600ef8138f1201612fcd2726fc24b11dd27561d74134527d1d4bff0fc8c7ee7ac4e238a6e185d35
+DIST firefox-60.9.0esr-az.xpi 540469 BLAKE2B 608a0c8883df8d6aa553497a3189cab73abac231df19bca142628160c63cf750c6d92b0934ecc75833f00fa41914d198e5d27ffeb589503af721b3727938ab33 SHA512 72cd3b8071d9e5a2984d688283e431eff677b5f41dc0a77cdbaabc8a259e3e5a1ebbe734cb4a0c1e6038c8fce8adcd6d9f244122acc049dbe84f5ecccbb2e2f2
+DIST firefox-60.9.0esr-bg.xpi 589576 BLAKE2B 458375e0c2ad6fd280fc1e548cbcf22f6b5bfb47fd93598cb630742c6ff4d9ed1dc0963344329b9817503a7af57ca5eff582624db4635850b7125455e10bcd65 SHA512 ac2c273edd8d1367e5b17b89bd8edf993831bce9623db1ff3e3047bdf784a4c0aa27262786f7af03c9f292d36cc2c4bbca9b33c2421f6ef4a4bef945c843f887
+DIST firefox-60.9.0esr-bn-BD.xpi 606817 BLAKE2B 04699643a433dd6a266feb07f9ff4f6f7335e46af808a36512fd85389ad7a17ac4016022c51c0fba6f9bf0b855dab0e4c6d1be0e9f6045f2eed81b39453a396b SHA512 351d674efd9acf3c68f8c2f96c7325338f402a49c3239b709056592bb43840c8c9f0fcf302cbc9c9881d21e55e2552d0cec72996ec278404e13162047f9b815e
+DIST firefox-60.9.0esr-bn-IN.xpi 587255 BLAKE2B b2f7b13ceae7f7b119c3f358008ab2b4d17e1473fd1eb445a99a201a2a4759c6c52d444571d9279455bfaa3466b30ad5ce5087a7fe7645b0d11b25acab3df901 SHA512 90d0056ac6ad76d7389b777c69d89fc6d413b4b5a543e57b1ef8dc1a5e1e327a919fa23d9052a277410b1da788150d892897a7951ab02cf39b11d293386a83b3
+DIST firefox-60.9.0esr-br.xpi 527757 BLAKE2B 440a43a28ea01159d924e72ef99254cc442b624e603927bac9d7d75541a8bf1317bc61dc56873f44bb00d8ed81b77b74a33fabc32a7ba24dfef024155c959cb6 SHA512 9930acc0cfc501aa4059bee95c56990427b018c72b1bf5de86971fc027007c53baafb5efe7363279b7db6a1bceb0b4692e5d259c133b67f6956ad2cb4dc91d61
+DIST firefox-60.9.0esr-bs.xpi 530426 BLAKE2B a8127345707989cf78c01dd32afcc18817f81675089d0ddedeb8a6da49e45b0520a1986fe0fc742c70b6e0f5aeedbbf74935819972e86789f1507ee08c4ac37c SHA512 6cea1f3eba3f9b75f46c4d215c72c55742bc17020503c8c4a721ab9e7ae1b4b36112f3b099ebd5cd7a57308e6761521ad5d09e7a5c80cf92b23ea3255fd66fd9
+DIST firefox-60.9.0esr-ca.xpi 540990 BLAKE2B 97fc19cb1634787f54792e085e7768f41082d6427e80be42df8f9d9d16ca74c7f50694a4bcc65029c8d2143c6eaf44de93f967028ddea2bd811fada91b9e5835 SHA512 02497c871fd333a4a4e2e4f454e7a2312f218999a5ad8c14bacfa9541ca1d3b25dc0c21d01b706808374cc2989e3f02053bd95a86f113a2c1d8e0a63be32de1d
+DIST firefox-60.9.0esr-cs.xpi 547514 BLAKE2B 116daaf11b03c97413cf35147a4982e30ebb07e9a3d56c7fcd87014c857aebba00979e567819d4decd51545df42f7a3c6fdb3049f3db450f17ab3786a3f304e8 SHA512 e3d657edd0bc79b753eee96d07957bf1fe21ad94a22bb477cc485026b2f4fa3e5b92da1ded42cb07aa1af7533ffe79eef02b08f3ad3c15a8e74eb2d8ad320507
+DIST firefox-60.9.0esr-cy.xpi 532366 BLAKE2B d705f0eb9ceac90c0f4f80bd1fefde31ef8d13a3d38b3612f8a8037bd3f8ed970fa2817e2c14d125336edbb304f197816f658028c09d58a1de1c46a94a7dafee SHA512 5cd44136c1137f6c01065cf409b415435d65e7e80822d1e8f44d98cb8d498836bee64bdbd4ae66fe7bf474e18db23997ec42ac644099bf7065cb6d2d9c0be5b3
+DIST firefox-60.9.0esr-da.xpi 526479 BLAKE2B 09c754d309d62a46761c30392304585932bbf335870379e8a2fa60dd291decfe0f7cfcacc8ee543ecdfe989730d716639e37fe2845a77bb2ea7b77eedab99e99 SHA512 9e98b7daa7d9e661b3cb5710f0d85714bf66fa7bd23cd8d8bc35bcf1cf96b995889c44ab291e2f4dd25a96f0e60fe75ffa64cc8ae1dd6231de9daa90629ae922
+DIST firefox-60.9.0esr-de.xpi 542253 BLAKE2B 02b2b4dc7292b5b19c1d63bf15d4546c83dc32560fc31d60cc7809dbd250b95cb891381ccc1c15c366d06a5fb745dc54bb22a88be5fbd06889155767ad61abba SHA512 5225415f90d32a535eedd2d3d1a730d9c0552f82b1b3ea57c8f50ea8b48dc36cb34eca9da4d404c0cc13434b1717bed200188488754e2fb2e176021aef9b8c98
+DIST firefox-60.9.0esr-el.xpi 609423 BLAKE2B 4790d546c71cc62cb459b40d93617f6dbfd0d6e8e00358767095ab887bd76ad98caaa10432bc6513cf4101924d4ec486a08e82941db414389259df26b1054d4d SHA512 9581691d4d9a908894eba849f7773c2d4d1bc6616f55e56ff848a90205a10c2b33c5e72f455d71ed85d55b8b6fbadea5e9f6b564807264b8eb056a3b3d483335
+DIST firefox-60.9.0esr-en-GB.xpi 508089 BLAKE2B c4e6436d8e718f677a7b0f15dbf85d61da10317cd16445f5211c4eab64729cb6ac41d7c5fd3aa48d6668fe0de0b7e9c1b8b018c20cb7d0f4b01cd8b7656d7854 SHA512 79e9ae89868271b5de7fde1c1ea0932fa1d2c027e62c9c92a7ac9213b900ca29d3232db8ae66cbf9fa3bfc5923b014b132b24800aabc0fc33a55461e2cb1b3a5
+DIST firefox-60.9.0esr-en-ZA.xpi 491066 BLAKE2B 3699ffec61649dab2f145b669e08e5b4b67af31436a5983364112f491b09925c21b01c8988298de6dca9e06472a2b3fb469129c3c9bf53f03343ad392629401a SHA512 6f38cb6b0a9a866272cd5f5a063ac4d5c2c8f7246fd4bac33d71ea828bc4ecfadd430abc3ca39c598fd3769a0d9335486d16fc5e2b658e15b7d4b2e6816c45da
+DIST firefox-60.9.0esr-eo.xpi 526982 BLAKE2B f1f808c0aa431242ebc655dba8a03c032a05bb89062010e5e0c003f84d95568ec6d5829caecd22f5a6514d316dd2d609b65b8855bdcf6fdb3c6ce0e3f4a34a54 SHA512 67d06a9bb60890ff5cb99274be77bebddeee2554bfa37b3aa3fbd8be9c22e77285e07d4a37b095891a1194e69cc8b52dc736821b8af856f7fdb273a51bfadc0e
+DIST firefox-60.9.0esr-es-AR.xpi 541043 BLAKE2B b38b6f5fbe1aa7a6d8b72287ea561755f18b672ca9a3c9b805713b350965bd59cab9ed6150e737d7ba493302560f1bbafaec8975133fe46e0622b966ae84cbe9 SHA512 7189c7122ba3721ad1980f5cebef9c0585c107628ac384b41f61faacefbaedf782edb8a387bc40814842051239ab9990d39200b71c3a03a29198cece0e084e06
+DIST firefox-60.9.0esr-es-CL.xpi 543730 BLAKE2B e1ebf2449ffdec2d48e48b63a5e88434f182266d419fc580b4cf9520737ef87d7076ebe1b95eb62b8d1abd1283516b20050230884f750a8554e4a0d81d7b8565 SHA512 cee9756d7925352a4e47a88d0ad5d5550ea362ec1e79c964692894f52e542a3122857d3e13e5e3025ea0f39329a75af0389d6d9820b68d984a3045ec33727060
+DIST firefox-60.9.0esr-es-ES.xpi 476369 BLAKE2B cd3734640c19707e2a825efbfb472339bb79ebc93cc6c0b549bb9da0b673d9b579ea7b024a181124d3736819e49c20d799a4b336ded2482a6bf2eac3ecc071ed SHA512 85930a7a73c0fae9cf527a661ea0d3883a9bda1aa7b89e0d1325e04e58e7644a3597e2d4e52a6947df17178f12094cb9272727cdecb20506aebadc4bf80cccd5
+DIST firefox-60.9.0esr-es-MX.xpi 545044 BLAKE2B 55a1d88dc31186bbf4900837991aa1ed053a1c6a551135eb4eb8b40fd66f10ce8664ca334fcfa9d17741247fe98b7a75052f65f05e48037f2cce8ee32b986c64 SHA512 142aab032ede44234b7e447d53cf1c8304db22303638272912412c9ec01b5c52dcce6d20f6a70b1dd751b2e5d7e015c626c14829a9d224d8b4010a6865e19ba7
+DIST firefox-60.9.0esr-et.xpi 520689 BLAKE2B 1b743a6c3e658db5abe850d8697905c8010ffccaab572378259af7e0af1a0708f676bbfe5e5401b53ef382e19eec805d2904a1a6414180db8111814033257f59 SHA512 42a4d6e3852b1263342966b6b8b7126758b68c40d94609431092c0c06872b53c4c45f96d1e85f47cab71d07692b3fcbf8d16d002e49e3dd6acb95b9dff19cb19
+DIST firefox-60.9.0esr-eu.xpi 527432 BLAKE2B d3d66b2a139c9b148172e7bdaddc207e3491c4ec7deed6997558d6bf323416f6c3d809d5dc5c571ce07cf59e5d8b00d6e4e5846b824f1cb7541c57a0c93ba422 SHA512 c2d7840505922e8bc5c6efe2ee1d231b21dd7f951956f86af8c773c9187fc879e4286841672a903bf16d02236cb827f9f59578f598cc4ec39ac325731874bf1f
+DIST firefox-60.9.0esr-fa.xpi 581993 BLAKE2B 8c50faaa1f3797819efb16158c893d1e87ab0aa0da7ed99f8fa82f0647d57881d00e8503954ffebe697214a433febc89f83755bea856c633880498c8f7b18600 SHA512 c31e94c95b8a5b4b03a914c33903fde817f194156dec87cdcd59ed59438cc69eca957be93e3afa581a117f720f41c12525da5931d0ce11aead672421efc8ce70
+DIST firefox-60.9.0esr-fi.xpi 521913 BLAKE2B a7a861650e375eebf594707e71a0a7b89db557aea415ddf4adf1b4364732905d14192a335c27d4ab4b3136da81912ca3a63795070b47cfe97b2b6e0ce370e055 SHA512 b11944da43e696ff11762a49224a40b60071c60f9c9c8c3cf80551b1d5186fdc323de345572610feab425099971813ac4b83ef0a16dcc7c9812bb8f0b2d91b1d
+DIST firefox-60.9.0esr-fr.xpi 551796 BLAKE2B 7e8775feba42625917d9382166f8079f41e83b7618a10c9e485a89ecc9fb70c2f819a67a167900c2fcd93f99553417fe1c10822602c2753b55c479b7cf6fe6e9 SHA512 41e0cdc0391c565e6a73211f46a427556ab69672b8d954c9610a08ce8d33d10d33f1999907a6df8a017dc610a173586b234397a2ac9e75e896be66368a24b287
+DIST firefox-60.9.0esr-fy-NL.xpi 540915 BLAKE2B b4554df17db9178c0f28d32e37c28a60243c75fe6a2e6b4374f4408f2a32e29db55297735187e2c26e680123ce1209de47abe1e37503266a729d59621a2e17a4 SHA512 71bf9bade61badd4a907895b8cb98e1c0a581230c8e872880dcfd2a56aa8d72c270af3298f19161247b3c22c956339312564987d32d54e57abf7e90e7ed210dc
+DIST firefox-60.9.0esr-ga-IE.xpi 543377 BLAKE2B 74e8115a4f31c47e302d5434ab3c273ae4ef5627f2e8f6904504b69cdb824b88292abcb6302494350ccfc4272b0b0ae0d074a31bb217acc10e10af9dbfdbb18c SHA512 69c26b3e346529a36289a6b215f44d0f8ecce7fa38020092bddb61c5fd4407ab19bb052d817ba1b33cf365ed3a9574e0f1a87bdc8985b2d8b610fbfcf101312a
+DIST firefox-60.9.0esr-gd.xpi 536588 BLAKE2B aaf7ba835faa933483fa85edb74e8f909907e84fa8a27facebfaa811d661d29a073006fcaf39d00993ce2b402db2b2dcbe903e3906e6e003fbcedc8052b77032 SHA512 259a786faccff9749e8acef61d5fe9bd569c954e23176d0be224dcb627313db35ded5cb92e7a791c440af701b9ef1364cf9f35d3598def57b2ef1e0cd410de04
+DIST firefox-60.9.0esr-gl.xpi 513086 BLAKE2B 68a2848c828b2d655eb229e97f475dbc705b78a09e2edeedb2ed184a3294f42f91baefd6d1a64562a140b74b8cc0b8f34686046f0614b0d07f29163110cb1b17 SHA512 cc8ae70c8adaab02801664bf2c601fac6a23204542c3333e38fb6e70dc8cec2015840edfd1d0a70226a5834379a84fd299cf2dfc92854c3c2ca6d283f3ce47c5
+DIST firefox-60.9.0esr-gu-IN.xpi 606672 BLAKE2B c345d34ca6cf60a9142be6aff771e44b6e93722f0e3f466d1c8d1baff85fe3455be51eb38334c31aac38b97592dcab97f1b3b09e855eced7864ad32cf8046ad0 SHA512 9b09a3d944fe9a6d130c3f41c4f9eb18d5829aa9e5d64645f85b8e443159c219e484dfdd317b87983e6d455a6e755c280aafd66fb4fd30d2b0edc82f3dd93fe5
+DIST firefox-60.9.0esr-he.xpi 551703 BLAKE2B 367d5eafe2080b7945e2565ac0c902d8480744b62c96ed72da1e1c2ea76fded6d70bc272ce2c96b73c72f044ebef14fd8f1e557e8d2f274d599b0c8da0a272a0 SHA512 2b333273a72724ce9f19c82d7b77930736061400c2aabcca1ca8851f51a71189d3f05369fb4688c59217ec682ccb885342880ceff002b4c4927afaeb52129c87
+DIST firefox-60.9.0esr-hi-IN.xpi 607256 BLAKE2B d8b0aceebce03d37c34e04fdb3e30f5b99de4c11cd80ff04742d69c3eb4a92674980f58e360d0ff56f72467a1ad836bf94b0a7d4d30ca33f6ce0b9faafa275a0 SHA512 1d0392531fdd19c5b02f4407638e4c7596bf81289465db0f6a9f117c3e044c62538ab65ced2fcc2ec2c38c83f3b96e35370c9c3da20be295a7f266575814ece5
+DIST firefox-60.9.0esr-hr.xpi 531679 BLAKE2B 98fb68376a62a51bb0b83517cceb91f6bfb64328b6715b09c37e5cd49224d7225c5708ce602b343e5404257e76ebce44986840c55b4cb29f8077ecd9741659f0 SHA512 e952b4c7ed8044c79323e33f3874df8568669fd250996eeba182df4d682e29ae338fb52acb2171bbd6836fd915fd3b59ae1f32e549306be46e06ba575e140402
+DIST firefox-60.9.0esr-hsb.xpi 553014 BLAKE2B e3726efd8b755c1ecc11647db683099c44463102cba544eb206c031c79912a92d2c9ca027d3de72bec35286700de508e5907e1a469c2fd945e3665dab22fe735 SHA512 4057926b10b54ea4b72b1ff09bcf3ecc14b30c4b416d7724540214263050f3d2250fd75dc740fd5c149a1f036d94f6a27b3d076d28373b52f7699305981355d9
+DIST firefox-60.9.0esr-hu.xpi 554135 BLAKE2B 5ea31669cc91d27983b7421316e4eea26bb7b54bb60ec0c8d34d01650b11ad0f78928afb0945d782450ff0e79a901724dbf776e68dd685111f3f61a32ee1a52a SHA512 9e82fc5b8cd81f64ef219f5e33fd334c6f311552c01c2c2cf6955e64a4491f683c42ec6e2afbc81bdb63293daf2915e8ed9c5e213978b95f16933180948704a4
+DIST firefox-60.9.0esr-hy-AM.xpi 585821 BLAKE2B 160a189beb3fa92a264e2926d05dc0ccde4da1672c134c5d10d1b41073b7fe3edd2511a96d86b8aab81ac39ba7ee624632919d117e870fefaee65ce928043961 SHA512 1b44f49d124558ef94b67ca3917f810b73ec4f56dafd949a7de94941741e7c15bd27e00a97e9714a75520124910a47647e6a4a341afef828966d48612dac9c84
+DIST firefox-60.9.0esr-id.xpi 517939 BLAKE2B 3cda186f2b0e6f401820b93420aa28cd66e1d654ec71e047eebca1ba85531b42f11badd5b5dfb9b368760f293e6874e1db896e2415a420548f9a709356ae8e05 SHA512 13b1abbf4599f7fb876ee83e6108c1565fe13dfc6ad1ba49655993c1f1e5bf02168f13c2f470a271c92186324567b7211478b9910d118b10975e1a41c1162ab8
+DIST firefox-60.9.0esr-is.xpi 529000 BLAKE2B 1ff1908cf5a497e064ce538325486686734a60dd879bb34214fdf88dc21e2dd372f1fcddb91a46f255a28755c661aa8d62eee748d9061fa0382047e8ea5965a8 SHA512 5886bc216b46710c5f8d1fa83ce62adaeb10e9ce924033eef0c0d72007653a598d20379f596a165605b9ce1865cc6397cc4485b693ec42e57cf04148f9a50437
+DIST firefox-60.9.0esr-it.xpi 414823 BLAKE2B 47c4bd1cc04b19eaf0f8897ec35f31ac3aed51b1a07a85385dd16ad4feef3c89786867539dea769bdfb8692191e3f676e974e73b222b99968756878dcd0b028b SHA512 fbf77f6c55a502e422c97befad6ff7ec06d54b02b7c448e46c8ccb57642027a1cac61d096559494a56f31075252a6afd63cc119597b7596eb4e0c715fbcd5ac7
+DIST firefox-60.9.0esr-ja.xpi 587748 BLAKE2B 3236bf74425f4b400ec91cfb2a9f9d1b77ae8bdc243729870ae9137aadc4c728747a57e50d8f83dd381dd692c7d107c0bbca2b5f2b4247fc09ec9a405bd9fc11 SHA512 eaf797269881bc6329495096918e7c660060f71c4eeba7a99cd42a94752249c71f23b89d4c3d3797eabdc688d7ad4d38a8e081226ff52de11dff51c8c1c3d142
+DIST firefox-60.9.0esr-kk.xpi 598694 BLAKE2B e4d0a9ea6fdbfd9eb4295f9a123282e7232ade6bb45e89302fd0276743adf5fa07209545fa2ae1666753563e79dc3fb34b1f79339a12752ee247641ede9a926f SHA512 8fd54f32872513c57a491074379231a97ce29475e49e701c2c81b26faa4cdf9bfa941f4f4f9f6e0f3dcaf56fcec0a0281580ff9ac8c61a7e97d87eb0e3a96cc4
+DIST firefox-60.9.0esr-km.xpi 598812 BLAKE2B 5809f50ad35c7344e8b4bf9e8297e75f732334ba3aa6ada4f805d4058191a399e549ac71d4107c5a310c3e74a2645e4396ae00d1b4c8da24db6eff6d242da3b1 SHA512 27540394ab8e597a0256c3b7a8370b8191574ba0dfa1fa8c17e2e8df08b79157b36dd85672e7f49c703417ce1c02287462efe22870c5ab7e2a7bab386a2dd193
+DIST firefox-60.9.0esr-kn.xpi 601585 BLAKE2B fdd5b97c7348423c913aeac0392b90dd3cd80e16c32a00df864e64c924ba15b48a2658a6fd049c0d321a9c7e13ba6819d3d91cb0c3452e73428877626c29216d SHA512 08380b89c8f099ebcffb05a0af1ce216c977cd00e0098febb16b11dc68c83a990074754adeeac34cfea31a13a3f7b259b2a9f1b01f192bbdbb9f9e63b70c41ae
+DIST firefox-60.9.0esr-ko.xpi 563551 BLAKE2B 24f44952915c8b690829e13241673ae4784a7c9040ca43fb125869f46d59a8d97435c69afda68d9009a99ef5117797db27264768d40a311a940032ed6f1c8ff5 SHA512 a2825e370bd99211f203b705825fd90391b3f689b1274507eacfbde21fa8cbaf16790f142876fea4f29feac839521c4b2c6a695ab2f5f88a298cba90ba805fcd
+DIST firefox-60.9.0esr-lt.xpi 552184 BLAKE2B e00502daf85f20955425b616474cf3f1d234b376bdf6a13325db527a5a0bc734995f8be4c864fe1eec83f8180be9b5b62132bb9226d9bc55fec271d6cb9599d4 SHA512 b88510f49a24f9032f66c4cf1e9e9895f5294eac007201d8a725d5a2c3f331f41cad58ef1053fe091cbc3256d2ae1324531833dd0ee4609fc21c611d83b7b745
+DIST firefox-60.9.0esr-lv.xpi 542137 BLAKE2B 265e6df2c81a7509bfe228dd553c656e825c8bd2f8116eac6b6d0bf9b6a481a915f5cc2eec05a5f639b2f706583f668ed41c656a4bccb323640270475411b9f2 SHA512 5f7f9a89bdc4a765a7c2744ec75448718a73ba816e617d95d8e1058e5370851e501662394cf24305883cfa6b5fb0da1f27a296d6f25402e4f341c323e01e328c
+DIST firefox-60.9.0esr-mai.xpi 565193 BLAKE2B 0990f4fa2bee2713a60b62086d5de7413835d97ec2d93871bb38169dd0f81ce33060a08436429ec2b6f3349d366f76f4eb799e104c0cbd823443ed5487346cd5 SHA512 bbbb420f8ce84e305af940dfd1f49ff3c134a86dbbdc0b44e8d176806a0658103b3c31567f8f5e958d2319c3383d4c5cdecb94a03e70701890e7e88030849a89
+DIST firefox-60.9.0esr-mk.xpi 529517 BLAKE2B 3f20abbd2e34ebf9d4b0c0ef2ce4ca03d7da8d5a87981ef3a2a436cfaee7fc0857bd5fa8aa74f1f74e2f28b093ba34fbd32cbbd4154f5a4dc6233bf42a9e7d2e SHA512 4db41618f202b34841e50866fac83549fc24712365ac285c03994b355d08b8454c73091a427a7b0752c7d71e83f8a4f075cce6341ce9f828450df13642509ee0
+DIST firefox-60.9.0esr-ml.xpi 614690 BLAKE2B 581c1a730d571450e61f23904475929a45ac248e83cd1b69f45099155ceda0e6ca9f470919f616d98c0c2da0ff0338276f7fae4b6a4cba0b82bd223df6ee4100 SHA512 3e94d9fdb5c9337cabae7971e52f452ae0df0070f4ffca55560b6a332cdad2b3cb96ba59fefce61c239f1585607fd49cf4d31988b41e9910913dfb0961165b69
+DIST firefox-60.9.0esr-mr.xpi 594836 BLAKE2B 3ef2215f8e7814223d84ce8e0a17ed6d332f0f90eb92843423c547775503f13bbb6a840cc4552cbb7428ecad91e2e566100e425f32744f0a8a1ca7c9e827c0ee SHA512 ee634d38b5fd0b3630c2df306541b21984ff5e9507768976ec095b4cab8f0a89a223d99c098eec635c704dcd8f87e4f915213a387c017f79779ce6ac76ef806e
+DIST firefox-60.9.0esr-ms.xpi 525277 BLAKE2B 63a33e5eab60676678ee4f675eccaf8c9ed2d540730acf7d5bf8006065e7b302ae7d43a5cfb1718d841a23b40f127e21c8b2f6bdee2d0052ec8ab7e246903533 SHA512 ca5360a300d0f0c7f475bb15dd0b026673352ac2588b9cfd261937a27cbf951b2562b9f0bb7dfbab61eb328064c21e22bfae5088fa7cf72d3bce8a97e540aebb
+DIST firefox-60.9.0esr-nb-NO.xpi 526286 BLAKE2B 4d1bc0a657950480f284deebff3bdd1b0b82963c5d203aec6537c0d3d9dedffb0815654598747642c8a9d2440f86a6e8f207f14bad16f305cae9862cf3a2dc29 SHA512 3990e9947ee615b77a1516d5bc7878e8a16afd73345372e321983b213c021d8ccb79a05b934fd99fe138d878760bfbfb4298b26b5956500789d1bcef15cc6d00
+DIST firefox-60.9.0esr-nl.xpi 533196 BLAKE2B 90049de30e71a243d84eb369c0895c1970aabd9e4f1f9d2e71a89a14ac6332f0bf07270ce18f6f2f3fc285fb7c0858d915b32f1bb84a169c6292acd4aa0de622 SHA512 a0c640da27a11d0f651e6b87f31c7d368e0794841bc33586e8b0f330d6acdbcd0c698359597e869853bc34300a3a9f0db9c38fd4d9cdc7f638975868286da332
+DIST firefox-60.9.0esr-nn-NO.xpi 527834 BLAKE2B e4efc8bf3befd4aa372334ef79cadedac39767985f7f2e5e50c3b00605bc069f28829a1fa5b0c9f77fb6dacfe07ab1720dac077354850bb2ff172208aab6e029 SHA512 5ad89c2fc80e80c1d323cfc3c6eba0ab6123a9dffff8243cae76df768a500947ee62f281a1de7a486e038547b185e5e1ab1aff8e0d409927c071057417458db6
+DIST firefox-60.9.0esr-or.xpi 556580 BLAKE2B cd8b95cd28592587af25be96ab5de3eef06149346fd69d743ddcdbfad238326be971ec024e6b005331e495693dc45a26b73b4b9d2f56669d7d04568f33867a16 SHA512 bdd2d01a902609a877a478c61aaf8304cd285a3472cb80abe5a09ebd208184829bff6fb52228534debce4a658fc08a2ecdd77010916f74c7bbb102c2d78493f6
+DIST firefox-60.9.0esr-pa-IN.xpi 574271 BLAKE2B 23f1e6e90fa77d096fe26ed6c16efca4eb22241ab6e3f8558ee9c057ab6c2b762ced100c9d9d01b2d6b7c74183d586408c0e611947679ada2d45ed03010459d5 SHA512 4f09aa0e7aa8907fd4dd36f3697e13d4989c5dadebe7da50cbb0e111e2a52b8ec8d545d67f56e81ce7abf2b443579695858561ebea891814963c1a5afed93c27
+DIST firefox-60.9.0esr-pl.xpi 434748 BLAKE2B e7be4850ab1c64a590265ef6b65ff372baeff55cb044803927c6cbf7537d2bceb96bec4ab87daa61f2946b4d90616df854a9c9be7d1a73f7b4984b276c7b2939 SHA512 535d5de28cd98a34aea1110fd8845c091b5e567632fa1639dbea0732c0cb148b59bae2523511ccbbca4bbed6431ec3abe83f7cd85ea64eed553b951af7c25f75
+DIST firefox-60.9.0esr-pt-BR.xpi 531151 BLAKE2B d60268c5511f4d697e6121a2d06ccd44d7b09be89481d10f482fd620548ac8c3920fc33308878d904500d814e616d472e5a82fee7b5ea9e393e1600a9f7da2cd SHA512 0ef7c295edad701bf9778922250bc4d6fcf0df35d1966681aa281c1d1c42317c75bd633f8cff63875198fc508dd662f04d6be4b7eed3084b1f03957dca286352
+DIST firefox-60.9.0esr-pt-PT.xpi 535763 BLAKE2B 7ceac7711cf39fb8c0f5d7ef7e9195389285496920392492d54e663e4fa6525a30cd17acfd40dbef27bad686239ae7015ace8e3be644e09eb93b54384a0e1e9a SHA512 4ba94384ab2054631b57882d91f5b74b8de66fe9e6cdfb834316df5c72b8cb31450e6a14bf62ea0000849f357bfd9b51ed327e78df11902ba63b74f4667d16f1
+DIST firefox-60.9.0esr-rm.xpi 521760 BLAKE2B 5f495bebfbc7c3d559c4e8c00637344e1d951b080866ca9931fc8d9d16102e80bfabeb8f3f7565ca4c68795913b353ada95eab1590e4f470286e67bc72f1093e SHA512 956a474b162b8ac3d1a4d77c97bcdc199868f445423bb249b32dd71f3e1732e0c74d292808f895c7539b855d3a81d1fb0f0d34c3f505c70e480a1f466bf9e7a0
+DIST firefox-60.9.0esr-ro.xpi 529779 BLAKE2B 5f0744b99aecaea2e723278f2cb776fce9360704348fc5c55e3286ad71591a57013140e596f78dd3446063daa02ca81e27eeca2fb3b8aa892dab9c3201869f6c SHA512 62b8cbe3f24011f247885bee7b3cba08e9ef55e2eee4ca94806138e2fe628e5fab97824599092ee6a4ec7ac54b0ea846970434b6ff74efd87e6ec61cdef8fd0b
+DIST firefox-60.9.0esr-ru.xpi 607128 BLAKE2B 6113e1157e744cdd544028aabf2c08b4c5427ed44a527434e033bb6fb6955e43fd091f5eff9a99dd52a3a426406a67a5edcc6c9f8761b5c1364b076644690f32 SHA512 4157220130ba0ea1f2c2a885cb5ddf9888bc6766911387f373307a66b2552a2f4b945ad99a2ace6db267c2818434769ddb617f8272c2bcb93af2ec94e74de513
+DIST firefox-60.9.0esr-si.xpi 561290 BLAKE2B 92f5b3ce152e6da8843624c3df1dc682119d20b7c7a6b690c1657611e2c9e9f4865c64191b84b408039b8155d92a061301a33ef33adb5460baf63fce0b7bc869 SHA512 2c65615735bc9e2480d1cf2c3e7137b35fbf5ec064979df234ebfdb01e6e145e284132fb93f8a8a7e46db5d98dd4af1d63a7632a40d1c396d6e7985ac7772e3e
+DIST firefox-60.9.0esr-sk.xpi 557433 BLAKE2B 02e7ff2a27e2d37890fe4494e8a90cab081cd708f9a625f067e9ed247b179dacf57d4cd525701b611713737625c2dafdebacd015b090cae7cd5a55c596f30d32 SHA512 9ab15044e34c48ec656290c35a834c0d5f28659c4227042948f92836a8445334d23d5c6ff9927103f166d76a06f9a8e01a3d4c38ce049b9785e2e6ed499f36c4
+DIST firefox-60.9.0esr-sl.xpi 535088 BLAKE2B baa634996668d62e431397aa1e586d9ccf3b7f9f1b95c84e0a152de62381e0428e769e27b715ba337a6725e61cf88468ac8b787a126613bc85e65d690a3f96e5 SHA512 cf20cde94c6b13b5d58181beda9fbeeca0336fc2fa7571e3c4bb864e02a0cbf035268374a966e10a6e6d941182646b508ad793204ba70c06e2db21cf65462113
+DIST firefox-60.9.0esr-son.xpi 513647 BLAKE2B d71d287b8dcf4fecb2d4e4113279edf2c7af7ea25e7ad9a589832261b874bc80eeb4c4a4b312569f9af8f2a276b9b728a39eee10ea3dc00fb7e9f6c856b82228 SHA512 4d42ed9cb567490dfb17fb73fce6fb66656931b71ec756bc5e5a20becabada792292c82df340d91bab231fdde98b5bde5aa9e326fdab6d1966c69f0e3605b614
+DIST firefox-60.9.0esr-sq.xpi 536982 BLAKE2B 45692b17abeeb3592296232befe5ce850141caaebe33fc42f5269beabb2136aba48ffdfb99242ffafef17fd8a67556bdc278aa2185a5ee0d0619908ce867ad7d SHA512 6036d16830cfaec30cac590723c9b1bf126eb29a18903e8b1d20487b4f58f2b0127f8794c0112899fdbff6fe420820b0bbb862ea5b1d9c4ac185b426f6237d63
+DIST firefox-60.9.0esr-sr.xpi 564497 BLAKE2B 819179a9793f76821f6a3ec36b986ec01b9b704bb9da4a33e0e3b5f209720cfba311a860fbea3e2846937f3ba0494a64e5a73f37666e4b1f53563478f52b8079 SHA512 1fe8a42962486ce77a3fe6fb9550609c6b3ed97ae79c6e7d729974ac8e7324f0e101bb0eab87cd68469583b43613e08825f74de65f5ea778fc97c3cbb2c54500
+DIST firefox-60.9.0esr-sv-SE.xpi 535061 BLAKE2B e68501e2c3a11b77a3d129d26ffebc88eebb829520f5c85709ed57dc794c999679f3d214e844a63dc1563bac9b79eeacad8651fff6358bfb736b8b08f957ac71 SHA512 e342ffcf417c67c90181540615b1a19aab961fa803493f939605dd8b0480f385ba2bf28be524dc0d904f2689318ddadbc950d79f0d795ea3c19eb395c3d46423
+DIST firefox-60.9.0esr-ta.xpi 593639 BLAKE2B 1981c2eb72f1611edb5ce549ddb3060a379c274b3c28a66d4888ee56ade9d3a0ae4f6541d45010cedc175c70564662e1f8112044c6ee791b61ed951f02ca48fb SHA512 00382aef01723bd52ae43a0c7294439ab8ba022b068712a4d707563388d81fd5d76479a7d79fb52642f538c6a6a137e9eb97791a59a547c7b08aa5fb461acac9
+DIST firefox-60.9.0esr-te.xpi 606690 BLAKE2B 7990362daf24ed84d84e0866fee24e96dec014721ad40becdd090199d7c2eeadff7d8254e74e6364cd9b137c725e4473c78b7fa388f1d38c53ced3f8d57ec5e6 SHA512 024ebe8f35bebc8f2cf1c08ab55383862c512c274e155ccb3d55b14b442b4d65ca13ba0715bc944d2e768c50db1578d38eb8b82ecfcc09fbf61f95ba7b4857c5
+DIST firefox-60.9.0esr-th.xpi 578533 BLAKE2B 655d94b95c0674ace609b0a9ebe0b7a12b12ac04b756eef6997ce785a5dbbe286b0fd1db6d2c42f6652574110bafe130b7b920ab5ac879607b4efa0d7162030d SHA512 79e2e3ae20726ff388898c2b479acf8590188e060262a3d3945606a1a35a28c05bf23df8b2086f98585474a2b4ce9176c6ad17f5060074f6e29e57ddcd806bef
+DIST firefox-60.9.0esr-tr.xpi 541582 BLAKE2B bbbdc3903897c6a6da09059f3607eabd34538d1f07c96afe8ea9068d0755e6d1f8110dc3f9f0f2de24601f2ace553903c53703710b48ac08ebdee35d2accfefb SHA512 d4847be63219bf66c4b3d1aa56cd78535612bddf240babc7e542d0d3a83bc84648dede88c8cc10bbe908bd2c8d77add4fe9b948d9331956e89db90a172622717
+DIST firefox-60.9.0esr-uk.xpi 596649 BLAKE2B 69e5aa5c30214b512e37ed849e2cdf4070b2e47ef612b2999ba4983cb5ba53db2ef724a25de9842aa2829b160a3840964d251f5443a214ced2c80f0553e55d2a SHA512 d8fc652dd1af7a60a7f7044b1e99fcc77fe69eb728401ba0d98cf1b901733850968cfb1291a11ad46735ac750af2b217c28ad7ae535cdf4441f1119170e294ea
+DIST firefox-60.9.0esr-uz.xpi 529399 BLAKE2B 0ecb8b9891f373c543b60f7751d0bad3a134bc36e0629b3abe47cf3580e3e1bf151b4a0da2cdc1f2108d15d213e2363572a9abdba1a18f1571ede3777b62c9c7 SHA512 de7bf13f6cbdf43e5a607c0e46f233fc65c24e7ca2bd74b0a08b1c4be15eda44ac040f569ecb44116bbdfbe0df156a67fc5e3a187a553c2523ad638406187d07
+DIST firefox-60.9.0esr-vi.xpi 543907 BLAKE2B 9c7360a1e244a626670848e75778c2650c33f9b6bc6c0b0833614fc337f829bfbbae86311d90ca907cbab891cc9e31fac7688455078b28710382529cf1dae9b5 SHA512 4c571dcd3015cb651e6af462214384e01aa4eb02204fa01dfbc6a270919feb91110d60df5e483b6404231f3fd1437d64430179c030bc188bbbfad1317fb933d2
+DIST firefox-60.9.0esr-xh.xpi 527565 BLAKE2B 6b357e8887f61aed2ed513efb9beb034d126c3ef9b73959b6f10c25f221f73f334a8bc87ffa6f983df956a5fd54f66c6185f9f87825be2b00759d4b6e38ad4f8 SHA512 5bb606666ffb6598987953fec0bc555d2a37c4233a8ae98e738eb1dd5fb3432a4ed39f6b2ef0bdb6e7af2570506460b0319830a9ce9a21b8a8f2fa37f1d6c3f0
+DIST firefox-60.9.0esr-zh-CN.xpi 559980 BLAKE2B cee4fab650cd87bd8e1c4bd14500c4036d54fdcd6524fd24d5e67f08a6926ebae10a70f0a961942a2ce752e8017cad965bf9e45ec32e825f35e5605539e30a86 SHA512 d5d63cad9411d615c0aa0814beca1f48cc033327ae989641a9e4930a8f6e7e5e6a4cbcb875b26fa5e82b631aa9a99aa35ad3710308933cbfbb0a15b9686094de
+DIST firefox-60.9.0esr-zh-TW.xpi 558304 BLAKE2B 94736adc0f3c74466f560ccfbab45ad6cdf436f2987cba65d25995dda15838109f5189e4d4bc87bd64f8a232d953ad69cdbe56cfc3ca3562b780a465180f0eae SHA512 dc2359c2d7245592034b58558357f986e612c119b54ba2b979ce1df0e7dab2a5a0a1422fad6958349a03832c96e9cf1df32bd55be167025a0c8eab5f14a27146
+DIST firefox-68.1.0esr-ach.xpi 471802 BLAKE2B 7d5033d0bbdc708fb676b411e26e0f617c321101d3db70cae374be4fded2eca17450a3f5521f12c8800a4cc4654eebfd906539cabe426965857edd34d21095b1 SHA512 fc5648470f1ad6f4449613bd4d0e9cbc0d3202e92f00048e9122f2f1b865819af01db1f79a51deb15bfb2f294c3828f15545de71daf0875e09fdf69d84b4cf68
+DIST firefox-68.1.0esr-af.xpi 450637 BLAKE2B ef42b8e046469eb0d2edd7e2aa15b1a22e09374490d2910ef678a713fa0eb8e339d50840a4310377c0288500df4a953702a191571836a7be29f978b4c3edbf3d SHA512 4252bfa0c584f78fcf98b1142b40365f200264c31640f82bd466f8735819d73e32d5be988aaa9ce7d394c12372776e351c5438a9f95e20348e10cdd6bcc6e998
+DIST firefox-68.1.0esr-an.xpi 483094 BLAKE2B 71698125ab03f099abd52520a5fc6ec594d34ab2cd98853eaeba83dc42539592e83bdbe02a8c8014123cb9047448ba1c7b1ccb107e2beee02ef32777ffde490d SHA512 d89fd25d748b68a10469640217dd1923a754421e5868d43299c687864e2a58994e2c1470db64198bfd51191ff08ba2cfb3ed27ef1b05185005c325ebf060db0e
+DIST firefox-68.1.0esr-ar.xpi 538974 BLAKE2B 6bdf3149fd300ddb66503d25f797156897e2b485e3d94ccbb60ff764f9ea9ac7e3b8cb2b788c50fdf3449016009c740f95d01e17c238bfa75e46796096025b67 SHA512 fc3f5c71f1aa9c3138179ec2b6a125d6c576c2e5d4bfb1626a29a9e42c19ec83d687113cd4135fec76d2358f6c1528509d6d94279fb611ad923de9ddc7e8d3d8
+DIST firefox-68.1.0esr-ast.xpi 480817 BLAKE2B bd229da09b0613a253693cfa88a1a77757713396ac172fe86fb89625c390eed4fe891ed79a3570796701b9ca7cfc383175cb1cecd6d6ba1e6d897fbfcb3294b4 SHA512 786ad55d540095d8f5b846803f8c0b6b61e9b269a1ee15fee5ae523749eac1e07004aefce62ca81a1744db8e86259e914b4b0964f34d5908f47babd351c1cf2c
+DIST firefox-68.1.0esr-az.xpi 510305 BLAKE2B a9ecbc2d390b3b0250eeb11cecea5cb18e155820fc98d73c423c3633521e4ac985a841fc9724fc8fe245c6408ff5f84a57b4f568e4fa7844ea5c45734dc59d1b SHA512 9c6e9369980aaaf354560bddd376d7f2e3ad1fcad93f104d4ca0d7823599ea6758581b81ef81c8b52f09d5b61c8c32e4848a2569e349c599c247808212fe48fd
+DIST firefox-68.1.0esr-be.xpi 582139 BLAKE2B d70e0ca8813a088d2503c0e4dd4f3a5d0dc705ac0d020bb41cfcd7cc7bafd95a143f0c917ad7b6e744d7e78e8b528464a19d4e099c9cc643989a92200f3c640c SHA512 2ba30a9984c2808412efe374b4207f75115410fc935450da969e42fb11d8cbeaefbe6e44ef2fd049e4e697b3ba9937af361b521a31d4f6805530a65757537a67
+DIST firefox-68.1.0esr-bg.xpi 545357 BLAKE2B f5b7c3253658c93b711655ccc271bc4514d877e8281a4a775e9abe13f4c2695e881d2cb9dd5be8afce946f9ad208a1f95579a809818cdf6f5ca39c71a688bd8e SHA512 5c2c033740b146906caa44af102af9404e1e75163de8131b116bee35e462a6406a5be322fc7935ca33fdddc740c6a73613a55e08ea5cea9918ba422f1a932133
+DIST firefox-68.1.0esr-bn.xpi 566592 BLAKE2B d02b6fa22e04a6be0128156bc6ec19a2a8a44aba06c6cb916798a77264487ce8c962dd5b894d09db874587ae2ea9a066dd019b5024c69f3736318fb636421b02 SHA512 da3cff01de430bc3153b8e66b618554240b70711857a8e2f2a6ab97472677e466ad6f889f83760c30da1447bc6d142299c1971f6d923c178abce52281c7f675a
+DIST firefox-68.1.0esr-br.xpi 501705 BLAKE2B 88732ed445307e28e97c1cc421a21f6803def9b56fd650d09288b0faba75396b39488aa90b7cec26029420b69d3599721c50e087830d06f765844ae240bdef48 SHA512 54e083cd311823645ed10d5b605a35e2cb3febf93cad97dd4f6f12e9e8d07f897dd6df3fe8cfa8f864bcc78188ecf60b5f5d01ba5495816562867ca921014c7d
+DIST firefox-68.1.0esr-bs.xpi 483166 BLAKE2B b7f8e83a3b8258c71ca09b66928765dd92f903b2f309ba32d95c8b12887cc1ce9c0d16ce581db04bb5022f73e9242ffed546617b0f89676cb9a44318b5935c24 SHA512 bcd7f4109c1845c18c50f639844ae7160c95900a81d49eb010314100e5de6a6de0929c3ef3f9270f8fcd9faae595cf0a1ece80cfda8644bda39126a4e795682c
+DIST firefox-68.1.0esr-ca.xpi 499868 BLAKE2B cf1e37cc217d08428701bcd5e9f5061cac9c787ab7d82eb793b43b6f7d867674845257f9d4798282ead7daa418c7a28e26de1fc7f127a52109067039abdc8b25 SHA512 cece5db10e2f66963d294c745eea4ecd40d98d5633dfe4538540e5c666e713d8c76b54a4b8b99d2f91f68cd8c77c721f31b8f7d8b18595334fe586c74e309273
+DIST firefox-68.1.0esr-cak.xpi 527466 BLAKE2B 46815b9a6faed473a35879596293b65651a92e6ee050c278586b3f6982408d9a3c341716e6c9e66210e1bf8a02715859275594ecaeb01564ebc0def204c52df4 SHA512 77f9cc6e6253fca35ed5a79287381dd5c72f4f5a67f9433f2d113485f8feadb15f497770b43ad969e86b7d3a8816bd6fb2bbeddb0307ddcf05848aba6b379652
+DIST firefox-68.1.0esr-cs.xpi 519947 BLAKE2B a9e0b0d930a10d14f21bd3b024c4383a1f10b477d8180c7600868c6f0034cfc97685072267b48248d42167d22ba9d4fb5303b2d6de32f49bc0eabb9d2d390bad SHA512 ebb4071c057b016bff5b81328344f07097070be27cff3fdd21de014995dfa192652b5a00690d928790ce38241c85fdad0c3e14cffe2f2de886323b179dd2b8ed
+DIST firefox-68.1.0esr-cy.xpi 507177 BLAKE2B 3a4abfeb9132edb7f8633fdf1c8262554321ee38ade1e370f7ef5d72ba0782b007c19e8b6816352e4e778c696704101fc6932c46ceade25021fd036f97b970ca SHA512 ff0465e229661efca3e4bcf807d1083896036bfdc66394fe21138a310973c36343a958c7aa32a8a8520431f361c228c5a3595b718c67c8dbe3c2281e848eb10c
+DIST firefox-68.1.0esr-da.xpi 520278 BLAKE2B b785468bbb4ede4fcb41a2ada4bf09fe1087fa1891baa5be502de0ce3b10d781d82e43ae4b590a69e4fdb03ef7b3c9e21b05ed47c9a76a97e2febc03e567ab60 SHA512 a136c93b4fc3c14394d388a92c573188410b521cd6a4c897d3b4b2b7f518775d5b02fdbb29fd7c401a0dad363d783bbad6ec177ac044f686c7bb54f6ef41f328
+DIST firefox-68.1.0esr-de.xpi 523748 BLAKE2B cc0ece85194eda6df4f592822cf36fcc6b934fd32cf4a19876137880e6f0212a1c0a85678bf48844d7d4776c4a2ec8856eb355aec829e89eea4ed5c4a3640f5f SHA512 957dce6ccac03ff1ea9a0a69fd2e795586e8936d21776a69c0fea6be57e8dba4ba158b0f274458b4ad95330859862e7c538256d389d25c4d26b69c892731408b
+DIST firefox-68.1.0esr-dsb.xpi 528677 BLAKE2B 34334b09da8b552525002c304a76dafb6c9fc06eaeec5445f7720b3dc9f2d463b95712c15f99196fafa6d01aa11ab73bb771b8f0636de48502b7a689eb3deefc SHA512 10a2e937a1a5e5b6da67a91bc2ab8771bf3745b39bfca8f128ec40599cf2e2511cd2a5ec4278f70faf1cc221a4a68d1471ea0c4b6976b4837152b3f0e137b9d4
+DIST firefox-68.1.0esr-el.xpi 597413 BLAKE2B 59f15cbc8b704935e7666b5c08cfd3f76fc04328e6508aea4a81a9f55d3f3b2dd68fedd15f688bc85f0f6e5fbf301070f0f9db1160ec5a8149d8925770aaed7e SHA512 60c7ebfdae617f4cb1714d69d79c5997882ac5deaab8d7a4dec0100b8913ba7fe036a05fdb62c42bcfed61a722f575c3b0f0dae672823c2e9ef753b0a77df864
+DIST firefox-68.1.0esr-en-CA.xpi 478536 BLAKE2B ba265340e51484f16368cdea8b12a09bb16ea1594edbd7f8d40d21d44d104b79464ddfd187aeb9437f327568975c15f79dccbe83e839e92ec8a9d6d87ec87f44 SHA512 269d09c540caf7594635de26298fd9d7b1ba64063b35da14d0a09676dde18beece79296d564a1230ae9953e83587de83d44d45031b45b7e3aea57d2b5a853dc4
+DIST firefox-68.1.0esr-en-GB.xpi 478282 BLAKE2B 362469394a8f9bd8ca08eb1e323582f6ecc384cf5223b4dd6aeeaf98ec76bce8b936206b3850111d88321c4b82f5694e8cca185ee004084a28ae47086d8cce56 SHA512 bbeba734f9c79f90af825805dcc9aefa5312c964e4d83cc7b17ad97ff588e3f89808287a6a130595279cfb3f7f8be53d350318d18774b75a9bd885b3c910da6c
+DIST firefox-68.1.0esr-eo.xpi 504236 BLAKE2B 146da68c4f36db64cf0905c81ef475873be686c792b6863a8c227d1030336c68f923e3a046a10625dc969d11aeccd96b4a16f592f2f3bf9376bbdc8cead5f466 SHA512 eee9e72aa3aa84b921d4e5e37f879932c672ffe98fd5d30f6929e5568ec1ef243f00df8a56a0a5eb8ba408e79f8131064b2415343b3b002ea9725d2057ee9b44
+DIST firefox-68.1.0esr-es-AR.xpi 512460 BLAKE2B edecae9c5f27f10aebac13581efdf9c09794b088fd58f77039b9ce2fde2d22891c9979bf4ff343dd4e51114dc0c28b3b77406878b163cada763d92e84faf46a2 SHA512 6af14381e9d2f5ee07ee4c4bdf01c57e5d263b5d4851de56785d03ad5cbe2bd729d1bd83946a4679ea2544a0d1f484f41a17d7aa9ea6066f9c641f8433be7644
+DIST firefox-68.1.0esr-es-CL.xpi 511925 BLAKE2B 6140ca769947ce50733d4837c5924ac2eef10236434b5b715cc4a73c48c6f71bd4afcdb1b9e886fc8567e9ae6dec1c35c2ad241d5df163eeb0afb17dfd956737 SHA512 f4ef37465d0603ea933a195bf402871d86698cb40c503fe38d5f25319f81de207c151ef61f7c32fe43c2bed72219f91c980ae4f47a28224a8d2330052d70655d
+DIST firefox-68.1.0esr-es-ES.xpi 481479 BLAKE2B c09e9f66ad9236f9cc16e0d501ab48333a0649a1384b36906f5aa9f0e797e1faba6d48e4ffe64aa018e516387ce25b2eb5c16ee1d7ace90ed0902e97003c9342 SHA512 acdf39c7c121ef87c87a563da42f6db264538a6acca425d2e3fdaab2a9ba24fc7c47c85aac21fbc30140c969d6eed1e456e6c4149a5c61b4a5b38d54c2521e8d
+DIST firefox-68.1.0esr-es-MX.xpi 504714 BLAKE2B 66d05fbaa3c1dee4518f273d950efaf381eb2463fec5744d81eb46cffc4a9caa294f54b07a9640650cc5e6e4b8bd3579b0dfdd6c1f5274f64acb0c9dcd0967d1 SHA512 130c47eab042ef212eae2d1008cacff6ca996624b513e1c18951a05e0d4be2ed2594f1ae40a15cb8de26139e3145fe812f32b8230b60cd46669a671c3e617fef
+DIST firefox-68.1.0esr-et.xpi 488530 BLAKE2B 5cc6c2aa657527f03dd3f3e2173ad2b96727dd126700c0bab08be8dab939f4a926c3c64d29be538e269a0e0a44e83d4a747fe95268b81e846e4e13c29b34b73e SHA512 7e6e3fe766c29154458b092b1254de2d4b18e87efe5218301243cde26bd47fa06c9ea8bebcc0de827dafbe023a48ddeadb69b7551299397481aa58a9906fb25a
+DIST firefox-68.1.0esr-eu.xpi 502493 BLAKE2B 50d051e6c0147356d7ae6f74455cbc80c11e1e51ffc370992592b16be14b2eac623c4bdaba4b4b93052ad0a52ee1b5a7ab773e5c0f09acebc992fa1e8d4ba9ce SHA512 8e99621b5605e68fefdac179385283f677e74eb66711d43365561eb5d68a4c771fc7f4bf52f87e5846bfab4f619db7f516ad6515a2b97824b34a6c6cd4343233
+DIST firefox-68.1.0esr-fa.xpi 547873 BLAKE2B dce399dbda11198af381ba0ba610b36f38511fd6310d5e2f942faf32111a12579004c261c14bdfc1596a35b044ce2ba15a7af5728e6735ce3181a86cbf0fa055 SHA512 0cdad7dd2e294d9262657b369ea697247cdbf4bee38de5e73e3b57108901aecd03726d7c3194d2b1340013c1f4a2b0e54ccc0233726b1d2645a7dfb25a20be5c
+DIST firefox-68.1.0esr-ff.xpi 484101 BLAKE2B 13ea22d1b0d36f80c88e05684eab59e1fdb02f9fc4c4cd1ced9e178f7837d2cff49521f61e8b150ff068e8c403c15768b87b21d7b2f694e01c0ffda61ac08121 SHA512 d27ea16b74e8f887467ba224013186fff17319cccb3d985af23f562a5ddf5d5694633ed3fdcd848a98b9559d742aede8433768f14413b660ed28baad73a6601c
+DIST firefox-68.1.0esr-fi.xpi 494315 BLAKE2B 2fba002327203edc4b92506b08e60d1e83415d094e1171e83187d9e4168f055c2a835f421f5415ed92231e7cc37201b4e9f148942da13e01230126da6e51f5bf SHA512 068b3b2838f5eaecbbe97a1bb4bac5eb9bafc796ef0c8dcc3480d5ce052eb6fad81e27bc5678f81a690d53673f4c3e27a84168b042d17fd028dce323b82db6c1
+DIST firefox-68.1.0esr-fr.xpi 523090 BLAKE2B 440ae2846cb05fd66350a8420c9cd94377d93be11016223d9b9e17d56e638f6ad250d0cb6f0091d7d18f344dc96b5d3c463d7052c80cb24bb3558ecbaefc875d SHA512 6b4d86a19d123083fd6d790d0beaea551ba5b4ff5236fb8d77b33495eea5aad214b8ccafeca8cafe8e58b977fdb8c5f86f50df43663185c3fc4aecd8bd3318ce
+DIST firefox-68.1.0esr-fy-NL.xpi 510426 BLAKE2B 6c37c0e0c09d5ee520f312cff1270c897b945559583270ec27f963c14a7796e815b57090bf5edda53f746548e8fa707883b5002cabe8669dbe4693ee343b31ea SHA512 1cdd150dfd458778bfe24841de9fb86c27fa66f0f6f13bfdc56ee91ddac3a6efbd73763c791c00c9ec6dba501f653288ed3e44d52522b56cce449219b1ddd62a
+DIST firefox-68.1.0esr-ga-IE.xpi 489727 BLAKE2B da2c89cd8eb230df40a884fce5435d0139a76baedaa5187b0cdc3a3af1f0d995754aba79bea3a23b454c9b6f11aadc040c18da30af02daba3b31822ae0f64423 SHA512 83d2bef2755db95157951029c689b85b8c003759e29fb6ac5a50163307d6fdc476de82fdd71cb6621a920bd103664d68b6e01ce3471e78e30ac45262be16f23b
+DIST firefox-68.1.0esr-gd.xpi 506589 BLAKE2B ddc9f5976010f6cec0f3ad7dd8b34aaac47c48ed9317006d5daedba8c9f07322b205d7bbacf69fda647386fed09a1b733b79eb5151d3cd669f99a5cd6547673e SHA512 e744c649b9dfe189de27dbf88750a7ac27b5bece07c51edf5c8630931a1f1dcdee24271f0dcb93f2bb84952e2df400dfd58093a67a530ee63199a1757a1aa080
+DIST firefox-68.1.0esr-gl.xpi 484028 BLAKE2B ad939139db191cf5f8967641252a734ad808288924837330b7e28057a30f1b896f968dcec241feb98debbf560225e3b1fbbaa07068535ca0bfa0c155536839a1 SHA512 66ae57a2a2fbc3ab202d143b9fc09142ad5cf1202b7b0874cb3ba4765cd1a69c506bb2b23e0783d3b3c384c23e3ea1d992a21f8f530019b37e65a23c1aa887db
+DIST firefox-68.1.0esr-gn.xpi 522018 BLAKE2B 95141631faaae99db5bc0965a06e52b1191bb2f1e55be31428e031fee55c38e87348a5ecbdc5c4dfa2bb7f0f7dd5ae9c0a9107661d6db561d3ca66393fc1c9ac SHA512 28135d4f709f8a59eb1fb674fc9862fb4c36da3758e15b6063b8f92bc7b66b13317ce2fa22eceabfc66fdf1560cbacc6e483c112aa69e408fcea7c289a4eb2d5
+DIST firefox-68.1.0esr-gu-IN.xpi 571763 BLAKE2B 48bfbb444027e01179453630cec225c6687cd65b1540e2e926f8839e9aeaa977530aa53027be6a61b2df73f3bac2ba790049d0abaaa6a3d6bf3e9242949bf959 SHA512 6defb1ef906760a4fc373c111c9cc6744d23eb55381baafad126afdb42a4ebc3d7195958517452aac5819d5e1df778aad39131c47597a812a8514165688519d1
+DIST firefox-68.1.0esr-he.xpi 514045 BLAKE2B 8b1e742a04611298251f1eff3f725f8fd7bd4f419be61635c8698bc76c116b7fe31b9814ff71a25c67cf28bc478f5405e8d59aeea2620f0593fcbffec5c6884d SHA512 4fd754de8a694c32ca086448f2bc61c2de5b3a7cbafea920b1d6e71b11b49b12515539caafe4f5eb28e0ed36744c58fcdfaf7b8545faab0b8026c8dfbb400e35
+DIST firefox-68.1.0esr-hi-IN.xpi 555500 BLAKE2B 4093b1c586aa5a705e0a49e19e9e7cbe7518d653ee26beddb81e716a1ca6c89a56ca98a483179425b18c684b97c6eec7dc945241060f7950684d8135db018e57 SHA512 255fd412b9225f782e6cf299344382ff53cbc6c938106b08ac6346b3695de5108f06efbf9a02bf26f076ac9f60cf3119c77111392a4252f54bb6813e0e50d125
+DIST firefox-68.1.0esr-hr.xpi 491322 BLAKE2B b9eb874c04d65b077993d00bbb0d2be44ae488afed0340f64e9b108bbc2a52897390aad87c33ddad5b8a5c8c12e38a987f85a36b52f10bddc35af9b8571ec5f7 SHA512 5295b19dcc26272f171c9a77d58b5dc6a0e559b8a705573f1dea40de03ffdd67634d0ca76b6d0a668a998384398dffa2c204e43f4a33d57aa9688c5b4f432e1d
+DIST firefox-68.1.0esr-hsb.xpi 527923 BLAKE2B 083a0da3c47bcdb12130e7cf8a36bddb5923254e5d351dcbb533caab70a3d1446bc4b515b5ce5534824c120f2975d31e3443c28ef8ed2b0e10e4ad687f928d58 SHA512 68bea5c15ebc43e01ebf7440de3c57e087db32485e1990c087b814edeb876412e8e87c6cd0736f7634a0873ef9ee7f1c10338cb2d500defb81493735b61f3589
+DIST firefox-68.1.0esr-hu.xpi 526252 BLAKE2B eb3a4dc21b645c348457c42f915928cb4da0cc53fe47db25727058e978dbf1f5c749f4843c86f950cfa63b8f76957caf125df805953e9b15482c63d190ba431f SHA512 7c0db841f70fe7f69c655e7c79d4f48b031121bf0011026fbf71922841a9ba8bb5176e4db30503f55995a3a96aff6465b129f87a34ff1caca0e6a71990092171
+DIST firefox-68.1.0esr-hy-AM.xpi 542627 BLAKE2B 0e7629e6e75428124fc35fb859d7948c67fb5e641928b2e2074ee4f5f5df1bf10435e6428d9b2d8fa52d6efb6461831cca2069f6be279c23393df0111a3d054d SHA512 31726f30e4b264bfb09b07c51130ac203145ee743b62d6db512cba0c0a9fa9ee69c0dc7427ad864723f1dd9e40e855738297bb273f8d488a1947c165aafb2d81
+DIST firefox-68.1.0esr-ia.xpi 496507 BLAKE2B 63c5c10c212ceeadcc3f1a63ac3512d16d50fe0f5164db9dcac2ccd56375125e0503a6e00ebf56b69498fed51287cad1897fd857015763fcecc555ad7b791d0d SHA512 4fa7344f794421ce4f2346c32882f3463033b42e3bce25d17b51dd514d73f8ae3e32d27dd739abdb0af98c932c19132094720c91a64a32d05f5135cda9bbc796
+DIST firefox-68.1.0esr-id.xpi 491919 BLAKE2B c55820bfd997ad96ff087cad3f42cb772b92beec7317bfbfd06626cc18cae8c0ddda55007c9c3bd017884c7dbd07d84568ec49bbd2810fa32d627cf5a6e9de3c SHA512 e0bf1b7f3f356a1da833009203bcb8eb0510c9cfd29e143309777d482a543a0b5c2902500b2c3199ea60269ddf18d0be88f1c8779229d3ad016f6a97c9a39625
+DIST firefox-68.1.0esr-is.xpi 499986 BLAKE2B 4b26b6d5cc882a9ea338e5eb472c89f9bec1724fc326f4f8b58c0cabd30d481b1db30701290379d8d0da0ef5c48c4c66e2b2703066f8eb4ec2dd32ce05e6b616 SHA512 7f0f6ededd7d3f3009f8b2f69aa9a47e97c287347490f179f622dc5763499fbb76c3a4cd21bb9692c4755aecc04095ef7c93c01431c8d22aa0b3aca9e1aed8a2
+DIST firefox-68.1.0esr-it.xpi 383769 BLAKE2B ce5a05b07833daa1d67c4425d0919655f10de40ef511f658bd49122e55f261cfdb1943bdc912489908c11e8a972e650bf518a2b72757dedc16e3b00bc0833483 SHA512 ceaaf4f051b4300bbd9e4f6bacfbeb54e3d2e525fbe53a642fca3e4b44e7c2b6c355891aed2ca75bf42ed95e74d6309f75fe6189d71dfd3cbd9734f84ac1a6d7
+DIST firefox-68.1.0esr-ja.xpi 537100 BLAKE2B 29a14d11212f4ef6fa8c62be2872b63d1e9907dd8812c9a80aeaa4157cbe8e75aceb2ae9bf776eb91c2060016207d74bf1d141d0c6fdac20dbb8b919b4ee7838 SHA512 068d32febc0f46fa758e4a92622f09f2a698d2b5f4a5e3de5fc82e8ab428c59650d0c1eb1aa6ca8461f2b2feaaf3da8a39b40c18b84f5c8d88ae88965a965ccc
+DIST firefox-68.1.0esr-ka.xpi 544708 BLAKE2B e0bfd3f04b042f16c10ce6be2e85dd882a67ab7d519e12b83967ac613498410c51919dddc4b1fab8f694a5edb1c6efe19ca1a0b51af7d5501c3a8ce57996f977 SHA512 44bee7761c1daf85fbb5b200f2723e799bb8bff27bd129256a21468dd41cef13b9ee38aa6b9a30130783e13b7bf869b7473789b8dbca281f88e81fed4768b0e6
+DIST firefox-68.1.0esr-kab.xpi 508638 BLAKE2B d78b8c61c927256abadeab82fd1dea4d78e8aa4d8e2865f56a63c93f3af315a1187dc7197d8ee1b067ea264cef7f9e233e4a60e3af1199b01f2399bd39cc2295 SHA512 d2bc3a0c27714fdc478b3cafcbeccc0c7337c0a0d13b463b0964da4b17ec432d581910123a7a3862200ed4e4e46f8f58218bc33d2358f0cf95687524f02ff211
+DIST firefox-68.1.0esr-kk.xpi 578943 BLAKE2B d14fea835bc43d7cfe881f24ba6174392fe6ea09963ace4f553f384a9a79fc9892fb44c6b67d184904dd034298e3459662f5b72b29bbb4056a553ce82f4d3b32 SHA512 4dec416b630cf05a1212949df6137debc82e4791a535348b524f6a0736e090fcc52b0dc4fbf5be99f52f40ef6b952c36126f5521a6a24336ed103965f31c368b
+DIST firefox-68.1.0esr-km.xpi 551383 BLAKE2B 6a29a10b4ab6552ad82f1bbf08f4af386d85f6a56d00b27304ae206b3431b848eeab219ce5056fc264294ee114de0ab809f2bc0b7e54ae9ae049dd87a37f1774 SHA512 b3ac69c0971ad9a026e326946cac5abec1e5b125ee0382bbedb2613a00038e4425c090d3f2867f2c0d31c8560db97b237b4ddd4c2f889f8c314fcc41328dc0b8
+DIST firefox-68.1.0esr-kn.xpi 547729 BLAKE2B 857eaed1f4ad7869f75e93b15afa16b2bed9a997036f7b3803b1e05eb9013eea0f9a8c1a80b445456e3e60c06aada86cef264ab65a9eebfe9bd1f4a89b5d5949 SHA512 6858542a304c5eb959df25dcccd1a1c0068a7197a775ae9b47709ad5625d4a6cb11589767dd47f0b6640d031974ea4015dde3f2fdde1dc85a6d2fae8417f7fa5
+DIST firefox-68.1.0esr-ko.xpi 535961 BLAKE2B f599a471cc3edeea175b61981af4ea09bff5f75c28eecb87d3bde161c8da689053a0f305debf7c6ce7deff223b06d523238780fdade256bf6d0dd65c06dbd14a SHA512 67d889c4b17620887a9ae3b9c468970e12994d16174ffe121c1a72a18d0aff946f9a7ac82fbc7466c3343f437d3ea895cb9bec7cf372f69c85e9422aa1242afd
+DIST firefox-68.1.0esr-lij.xpi 482050 BLAKE2B 17c5c256136aa948484438ab73d2cabc7ec98e90f33204a69bd7bc8746b902ca74913142a885a5d2f580305c587c25759828215b5fa2db7d68d502ba756926b6 SHA512 ab35b617b61c539ef47d89434463c047acbd88e828d421417e7643bc9567aeda1877bade6512073fd2f1915151ede68e98579f62e70adbfe28af9bf7f594fe6e
+DIST firefox-68.1.0esr-lt.xpi 527595 BLAKE2B ef542a96a4c3781a81688f3c60e0231e42f159c44d2c1f474759dcd7e528488830bb76394b093efe34b03600240a21b0d6828af483181474ffa72206dea015f9 SHA512 3212212b352b203f13a510eab4db03fa6fb2fbd45bb0991db86cddb907e6191c5bc55854d2032638f8b8993a72faa37c880eaad415187c3999575ba49f147a1a
+DIST firefox-68.1.0esr-lv.xpi 500471 BLAKE2B 862db7f28e338df276c9a144d6439d9660043a6e97ac476c7c435c4e4739e0e2442a94fccfe80f00b43de1364669537a67fe7737d05f9f27211a4585ef2a69c2 SHA512 69cdc354f6fe27f3fc522b18c048b77df714766060060bccc73bbb727cf06d225578628a6e94834490091f24ddf1846b306ce277490c13bc6bc3a3b4d53a6054
+DIST firefox-68.1.0esr-mk.xpi 485317 BLAKE2B aedade0386fad3b0e29e66d667cc003f1efdc49a57da95493ed5272a509f5bbea9ffa63fe9784c475891daefac886be905edd7e114e6844668008c99c74c17e1 SHA512 2ed881f19efd11c26652ba408e0050c8076dd3409548877c3f9d5476106d0449a54e8f661aa335204e714be21fdd066d44816221a418b58bbd76c46ae5d46673
+DIST firefox-68.1.0esr-mr.xpi 559184 BLAKE2B 3ef28521fdff141671b083fa84adb737e271c96bef1dcb882b71dc3a098debc46ae3fc104d20b0d417a16aa4187b95f4f218197f129d1d245443d58d5950bf4d SHA512 194592944015a6f602c42265be1ac55220e195ab45f89760195e8cacfc9c0479383d374bb11d243042ed2106800dfc2af8106cd7a180ab041af141a03d8fae30
+DIST firefox-68.1.0esr-ms.xpi 480466 BLAKE2B 0a154ab74939d2b59574965c61d2aca44af118eae95ad0259135f84a4b270f2b1fb96bff0a6284a2752085ea73a0ed3cc1cfc80e10e4691d850e74959d13ba61 SHA512 ccb63fd16bb35829404e92f754b94980645c68c42a0404e20950965fa0ed9a30514d4b283669264bdf15dbbfc53113c3cb14bb57f4f1b37c7dc1c90ec519b044
+DIST firefox-68.1.0esr-my.xpi 552171 BLAKE2B 2f3f750a9efc8f639550fea5f12d48eef41a3290025b1257e66cf0cf6fedb046a645b52077da3a69b67b16533378bdae80cf66095b51ce8dbefacc727df13c3f SHA512 3c1c2f416f65f490d0107db99a8649294ed8a9138355dc1a5daca20f6b1b55692f5a51f9ad249823621e8074d5af8a5b257590dbfcc1a8a6e36bca511768a749
+DIST firefox-68.1.0esr-nb-NO.xpi 496184 BLAKE2B 06e039662a07ca977488474ed27064bab79911c0148eb549d7899266f68e90609f804042bde29e18b94585df3fd4bff483d2bb32f43f0b549c7ba48644c0e100 SHA512 8a44c5d8b7528ff53c2221a99e631441cfae0e7d1cf3efec663efb07e2959b8115a554ea8e5a43efe5298052db9aa6ff2c0940a2a46d3b55a225c3c6a7a44a5e
+DIST firefox-68.1.0esr-nl.xpi 492189 BLAKE2B b84a144a88f11b71d16beff9fa9220f8d1178497d66ad065fb68f2c52ee65f45296c6adc9a0abc96629da072dde686bd04e62e7559ec10b55038647db26b21ff SHA512 a546f738b92a9f763131e8b469ed11b54713bc30c0522a5cec4cc7ab99bdbcc3553dcabfe59328b5d84bfb75e77abec9e045ed2619f580266a532d8bf11cb6eb
+DIST firefox-68.1.0esr-nn-NO.xpi 494802 BLAKE2B 8f5486efb0684ec93649911df0ad39911b39c5043326fe7f572d449e95554782b41a7efcbdb40b92f599c4f085e5bbf2a0a129bcb57526a33bb1004f19d69e7d SHA512 8fc84cb48cfb5a687c506ed804e6d79890e71782694e5ec365468515873b179572ffe3323695d4c7035d4a01e4d6617f09751f10806aa8c5b04977a1d7ae7632
+DIST firefox-68.1.0esr-oc.xpi 498798 BLAKE2B 19d8358301139d46e26f714fe92386458c1258d5ac0076b7a3d741f556929592cd309ae2a25d64a8d30235b2b2f9e3485533397c53d93cd27fc2ba0455b1c33e SHA512 eaeb5edfe0e5f5ac2ad7cd3a7698c18e77c74d09433af4dc6861bcc2da928e5aceafbe8531c844046e78293289bfe7c4a1fd26ed8e00c49755d9ea8bca56a1fd
+DIST firefox-68.1.0esr-pa-IN.xpi 542701 BLAKE2B 362f376a74c6e2fa99429c87bb229f5454caf4e5039968e0bb1314d22341b80d00cbbb30881c839f09349751b85fae156b27fa4807b9ff18b82d1b4ff6b3efca SHA512 60cbeb36ad1b3f15bc7b2f908f08307db2777512423d8310c4b203901b104ad4722e85ebfe860c567c7bfbd0137ee7381e2322ecacfb86becfa0cc738c92b7ce
+DIST firefox-68.1.0esr-pl.xpi 495839 BLAKE2B 96d20dc040dfd5526fef6465a8af7312fa4f7213be8d067d39faf3decd72e5aa62661a66f98d515a280e4a216ea37fe98a17b3b25470c50a9b1d6eacbe738d93 SHA512 0b36f795053e8f2b996dbdbc29f9569f2a3d6ab638c859d5f571029e8f29f3c5b9c64831c3ec5aac48ec4cb41dd19027bd7c7453f988ec64a6dc872d2b00d62b
+DIST firefox-68.1.0esr-pt-BR.xpi 498241 BLAKE2B dff2b8b77523a3a1865a857ad7c1b5589a92f14de9376238625de645fc44802918ee795511b8bc60c30ff8dbbd5fd1711e65273cde32768a771f5bb1d421f7a1 SHA512 c7627d202424fb25235d1e23c51a59bfb9ca5abc55ad24499ea3e25beaecd31ba349c725ecfd32d440ec6013e2512630d53e7715b5375e8f88f0f2664afc5448
+DIST firefox-68.1.0esr-pt-PT.xpi 507855 BLAKE2B 1230c218397149f611aa5f9628e665dde851df01054ac16e3e5db9b5b89fcb9efec8e8df89580319f83b7dd370f543eda38be21b12662c19ff8f650e8ba9e6f6 SHA512 07abbf2609d6a9d3205e00d1f9dd2cd6c3f6d531726f287ee81e9157c576fda47faabd721744b9cac76fecde63ad16ac7c1ad47ecb01dbace6ee061dbd28adf4
+DIST firefox-68.1.0esr-rm.xpi 495523 BLAKE2B cb79a0730a290b662724a7c470bfc13106eb5a75537f6fb06007f9e8e49bb21bf5ebd90df7adec680bb4fc19afb230e853ff159ddd43afaca68ebcba1e56beb6 SHA512 a6ce066b71aedd3372864a2ebf1085ba560f6e5e91eb250dc94f14d7b0176bc3605cdf0c268d77545f908450e43d01df1e758e2002bc1caf76c358142b277129
+DIST firefox-68.1.0esr-ro.xpi 508808 BLAKE2B 6f6807d47e442550a31f52eaf359325e90b858cfd2c30bed010ae91317d2950423d3ce7a7cc5d0075eef01cd24569995ecb79b3677e3004830c651e61a997e41 SHA512 5a4a66d45d392cf30a47d133e77c8195e7a125a543bece3540f0b40303c66060464453cb4f5ff611b31cc13d89797d0f42633280a142dded503985346e7c37b3
+DIST firefox-68.1.0esr-ru.xpi 583979 BLAKE2B eba70dc24ac8ee674c1d7176847245a7b5992be0e9a1c50bec0f981fce0955a685d22b4a4714c37f38d2c52f6c038ea47a306970ae9d320f8381ab59fcc0f144 SHA512 f10824ca48d0387b61fa00397ee5190627d42ba21d6bdeeaa70a259a85c6e54a4becd5e2f7b954a050886ef8ce099bdafb4977bc55bb2c12e07c169984c433f3
+DIST firefox-68.1.0esr-si.xpi 528265 BLAKE2B 182223709c857a595123c4ae958e6deae0d095d87f9e3d0d1210f7ab07a0c2ade15a7331976b9e8892ae4ccc5caa59cc3da0d72118eec3ee0f975ed46747af35 SHA512 e859faeb8a31d7af6c4809d69fc619c0bd23cb04cdaa503d39d8bcffac4c592845be79110e892db35ff5667bf623644e05f38191f8146b7f3439a029280fe83c
+DIST firefox-68.1.0esr-sk.xpi 525299 BLAKE2B 1830d2c9e1e2a4fa720a63d4632997de75e2e2599161da51ec6746679ffba00338b1fb102b5b801b9dfa70b7a9de49557e0e8a125628729d41ea289e2b99bad8 SHA512 c057238331781db0488cf08ce5da6671ab95dabf5de82f9a0034663f0c22020dda14e2a22801bfbeabfacbe7e17e1539f99029a0a58cb7c88cd8d5d5b40ba198
+DIST firefox-68.1.0esr-sl.xpi 502411 BLAKE2B c2f7254443352bcef0f27a4d32ca229bfd17ddc1f80c7306295b4a578c30f33db55863c325dc5fbad2ac8ffe0d8344ef77676cf59679e0b59a6d86a32aec2ee1 SHA512 07f6c4e133cd18946bf5dffd036c70fb3e578f3fbdca2fbdc449ed08d9c110954aa395d908a4c0d7d91c43ba212ecbece184d179c748c97b41ca6f3787f7f8f0
+DIST firefox-68.1.0esr-son.xpi 459040 BLAKE2B c14f8a984726998d672cfa8125588335a94573b1cf500c0ad0d0896ec86ce63d54dde66e2a4faf35f11595924f04afcbd2a7c1a44ce6d29b672dea0927d9937b SHA512 1bc85ca311c3cdf2322d34cf7f3f5ab60505de846d70da03b5f12486fd288ce1b3676938f43436fdd5cde34189a2f3d3063424031df88e0bfdf3a3e3fdb7bac7
+DIST firefox-68.1.0esr-sq.xpi 521626 BLAKE2B 5beb02c01fbdb29e5107bb00f45125df79f102957f80dbdd069852c374a7c3e7123437ab11f12554622022404def7bb0a961179f4520b17450e564fa450ddd50 SHA512 23297a5edab8ed493df8703b49e949d445917ae55978b97e1cfcad0b1cbc3a0da2b38281ea98271ddcee2a3d445da7840a696b90546488440ba0b42dab6a8343
+DIST firefox-68.1.0esr-sr.xpi 527536 BLAKE2B b58ab7645814d01426badeabf51f7501d7ff3652cd8d727efdd9bb447df9772bc0f05c16fbe1a4027771dee0c648dcf5ec2b0565222f5342e3446fca3e2f2035 SHA512 ffee9ca085b5d51a9e0bc3451df57cec9d0902d82a65cd5f2725d96768f17e41431e0755c48aa21ccc27a5d18a8a279053f871fcebc46ed8b8ab6647fe52fd1b
+DIST firefox-68.1.0esr-sv-SE.xpi 506913 BLAKE2B 4dab32dcad0008f89d70a966fba38244d3e14b0f07f019099423870ce16ef8810ab248a74007d3cf9c2b02b74b576e96eaaadf4e76fb3ac5a90eb4cc552ad167 SHA512 85e5ab7675be344d17bbe9d39a17d32354e91e61357f3a26154404b9b1b29d22de1f8e284c44b87ac964f88536f70118626728a6fc9765786fdba3618251b020
+DIST firefox-68.1.0esr-ta.xpi 549375 BLAKE2B a5c8983939aab6828a172a16679ee57883ee2a445e81ee67ee3c73945c06638cd9c409ac21bdd5b2b0ff656ad204034a742568e6f121b389cc4fa10fb85e792d SHA512 2018619193eb937291e036e438b9ae8fd1a235a3bbe5f806c8f4957348440c9ba1e5e2e6ab1cba0c110f8358563f211cb23f6f97a7127aceedf73ad623e6db07
+DIST firefox-68.1.0esr-te.xpi 561721 BLAKE2B fc2e5bc67269ee8a9517f68fd067b968c6928144fb7af0966303d9eb096b13a70285dd47525792ac87be541b8244725d86f0b8a3610117f29d65c5257e5bad4c SHA512 2ace379121263dcbc82804886b100d32484397ffcbb27420a39b2a9b513be483f7b92d702c5962a98b5c1a821517abba6978e8e980ae183ba9e3653141ea02fc
+DIST firefox-68.1.0esr-th.xpi 550953 BLAKE2B f112a1850ed5fc5f0fe1a6167051201e1c5c4866ca54ac1941541427342cd6bef05755e3c490a604744d01afed95a1827308ece2644fe0e1c17de2f078e591b0 SHA512 fec0a49ac515fc22b180a729b91288c3744cfea565684b1757ed72d26cf6e4dfa49d59907ac9319e7e819147db08d2bb6f84d4e6b21ec8aad9f90ce19fe2f7bd
+DIST firefox-68.1.0esr-tr.xpi 515319 BLAKE2B 433eef0aee2486c5f03733bb0b92e101c11369a7c79cca4b99056d11b9f459b1aacc13e2564cedc290604135adf72b0e660df2a20d2a83ee59a417961dfd1c69 SHA512 83d39da9391be97cf1cb3a4eef8b7d08665bac8ebcd8ffb8dc11ca3312ffdb42251fac9d980999e35821240416be160a4a8d71ff4991512d3fd0754c35eaba81
+DIST firefox-68.1.0esr-uk.xpi 569041 BLAKE2B c84f57457e0173a1c5a2873a1c94ccc689002c869da2e23b5f595d1813deaf04096e37beff330d0d447600001da504c6a83d1caddb556dd36b503f6f2834a93f SHA512 abaa6047c01ad9da79039d55ffb364241dc37bafc99e9fee827532e9a14b5053055114f9e52ee5813be87f72dcc25b0f273cc11f9a49f1857ffd071701d8d031
+DIST firefox-68.1.0esr-ur.xpi 542524 BLAKE2B f0e94f3912d882c0b010d50eb066cd05de28d2f36e7667ef5f06d5e246919e564bd9343f25a0e46067c50c418ede08758225494ffa9ed22e9d40f33f6f71c191 SHA512 e31f508690fb958bae75355b9e1f78ced87b3680c8122eb4e3ec4333ea28829e8dc869162fd99d9c1e912dc16ce7fad0949287989978d4649badfd95dac8e1f2
+DIST firefox-68.1.0esr-uz.xpi 482647 BLAKE2B 29f702f1fa56d87568b6fa20a3986003a08611f78707be4ca32f1a4717e61af83a55bcc15d74e929ea0da1d2e36cc69ceaf74b359e99e48f8487f1d56e027774 SHA512 557c744e654f6d068065c840fbec872eac1cf4b9b05b3f1a90863cc19df35c0d65293bbdf51908fc1beb9d4c58405efb76af0b0bd01b4ce4b6a7cef3028ff663
+DIST firefox-68.1.0esr-vi.xpi 529349 BLAKE2B c30529d5d7eda32a74f5a0188096c1bea9182b39f6aa2d3fe22f43cdae2d1c16c2984d06ff0fb34ebfd19a9f08cf17d0234b1478874fcbf2aea657bd144ee878 SHA512 c0571e38cce92c2b4c64363682c6980303156e13376491e94389b78eee6046e85ab1103363b4ffeea7e04fe538960d371f7db5b5bddea0033e4c238c08aa7d96
+DIST firefox-68.1.0esr-xh.xpi 470586 BLAKE2B 24a2aaae2358b8902c3ba236563dadbff8e48507ba2e286c8b93ccba576b7204412bdc7151c038d7f2853fb8f0165e3c3af7b29054b7c087368eae69625e00de SHA512 704c7140e20ef443ad2ff76d6c6bce04ad76f3be7e88db4fe9655081c7e8f8951be2b78970e8551feebddb81973864bae24a3363f9f6bff139eb75d9d8a789d6
+DIST firefox-68.1.0esr-zh-CN.xpi 536620 BLAKE2B d99473dd06c33bc715a0bd451a5b30151f9fa8bd10051ffcb81bda7ae6002bfe5d3ba54f76fbabd82113fd31e9cc559e821085d3e5c6c383a36b14c8d30c096d SHA512 dfc25cc63f936b01cf90fd1234354c61d803cf81fdeec5378b39550e44b9aacae6601c27c31a9c18524ccfb115e63cb99e33e7454ef2b4112dff54dba6a81ca8
+DIST firefox-68.1.0esr-zh-TW.xpi 536144 BLAKE2B bfe6a5d79a89975ba60c14cf9be25d2c9f79ce710220a2140b26336172419a516cea0aca5a459ef0d28c96b2cb3f2dc78d7bba41746cf31f27967561a02f489c SHA512 a689e054a36ff146c0bc39246545b28592e1a0cc0db919af99cd56577b2da8357b84fbeac539bfc9b5907f63acfddcbbc7c6a4f95ab4e35955c60f1778b15f2c
+DIST firefox-69.0-ach.xpi 471464 BLAKE2B 16f7fd96c155c89adca15ff61ec95df9204a8876421b2fb81c314b453e063904f793a94819ff9e5742d699884f9210f1a9e9c6854be4db0db6edee64ba295bbe SHA512 0ef9af9f8c1dd9e3f33434686005cbb4e3d41b5b627caafded8cee264ef1b8ad6eaf282a4f7c44dcdc50f29fe0f39dc57724c1cca16598bbab14b6367640373d
+DIST firefox-69.0-af.xpi 449151 BLAKE2B 25ebf00f6ec1bf528d44d314e19457f453ff553a803b3ca775f489cc5c6419733459d47c04232effa5a715800ddbdad6f5dcb7a30fca9186b68f42bea69cbe4b SHA512 ec7da41601dc744d321b129c2e891b53988e2cd579268aeec810900e38d2d4ff0219acfe358a83c9cb51967f9d25fa38da5e06e1c274f76ef51248b79eaca562
+DIST firefox-69.0-an.xpi 482733 BLAKE2B 3cb92ff748188423067978dc364968eb5b48e6049b143228d3ca0f6216d37c2ecb4d3b8c4a4d072a0eb6cbde9c9ae3d5eef91672e32875c889f0f0dc4c798230 SHA512 7ddf561e2a17db1b897834dbc86d1e2dfe168da4fd0119fe02fcc1b86b73509952d89de7c14b8a3695255b8b591c32b3cc7f882bc96c6c56713c4afcf2fe56b4
+DIST firefox-69.0-ar.xpi 541411 BLAKE2B 25fe08762d5a20e186caf9dff2240bfbd6faa1e708001758dfcb8aa3cdfd59ffac64ab4d086689ac8aae2a15eb28daf8153288d3367293f5b5db6330877986a8 SHA512 0cbf0bca4f5c759abb8cf67011dccbcc2aa8d9062639834d98d0a7be9062ec2cbbc627804cca0b38e15435ccdeacb5a924b810e2fe0ef5b2914f3e5d3e1f1ad9
+DIST firefox-69.0-ast.xpi 479365 BLAKE2B f5c9141fc699c4a8922a130590a11d21bf28c2391946a3bbb70f42ae3048a838764da5badbdb51d29634210142e9283b21303ebc12eef984c1d10ab42202f836 SHA512 46555778f1417f431cc3bc68495130d21f60be3e7441706e6f654bfd2b441b0ecc8942e252866ba8037f7695c776be909f24e9b5f94e6184c35b7b32c3e6c156
+DIST firefox-69.0-az.xpi 509588 BLAKE2B 9719d4bfc4e9252d1b6177c7af86c1bca6a62cbbee2a8386ff3ef480f63c760036b9128cec8480138466510620b76ddd4dce3839bb932bc5e62de499b341767d SHA512 92f4d261cb0df45dabb858e2074c80e105ff802df8ba5b296f85bd2a2b2197f7f6ee39d92e4d2260a3ce6c7edba307e45f83a2400597ddb6b1b1cfee895d116c
+DIST firefox-69.0-be.xpi 594812 BLAKE2B 521bc289de861fa04d727abf2dbebb4d13da30ffc1fae209f165a81a0df417e3fb9d78baac8dd935c5a16c288affdf5a713f9b58b26f960c2b267a645daece64 SHA512 6a0f931855c7aee9ed4ae35593c8e8d9b710b38e7533d74805b3789de42fb41f8a0e842d44868a85e12528c50b0abffcc4d9bd26e455e03e9193173ff28b1718
+DIST firefox-69.0-bg.xpi 553023 BLAKE2B 4a66a12dfbb96ce2f483104201983a62d49bfb84f96279c9bb2bc52c1ba1f70ba3ccbb5ba6c91f09c79cccd22331c45d43df0900f2c38ef3038167e4000997db SHA512 5c392e56c6a85950203ceb685ed5e96bd4b0fb274171f768c0104c4a6a7e2c600a2a69e5f785cedf6bb19684c6f7f44b5a66acdf1da71c6f26c1e4660689de19
+DIST firefox-69.0-bn.xpi 572160 BLAKE2B fe7d1f1515a19013339c7d30bbe7acab01f3c9271c62f96daca28e1a8df880d20d58671a81ecfe72c7bc89d9b900b4eb5fb6ffe049e9ad903c7497602e87fb60 SHA512 2f3c660c0974937bb5ff773d8824358e877fb0212e8d7bb9a9b6bbd97d06169d2656c3100963a1bf5e252d4b65c903cbf3733cab1bba3de695e347e9895e9cba
+DIST firefox-69.0-br.xpi 501726 BLAKE2B ae152066104e2162209884afe9003101d4ebf849c496afdb04245bc1fd9c802791f7b667fd1cddcc8d217e448b9e0a45bdea209d0fa9e9311d2da1feb824ac08 SHA512 d9d68e8ca3f670ad0a2b8e5d7426385b07b518084af9f06a28eef04cd38ea443caf6f4907ff69bc41ec000ef2503e38eac8cd36cc87fc0a74f5bce1d86e2fea9
+DIST firefox-69.0-bs.xpi 482432 BLAKE2B f8a5006a039ff099a6d2fe64590d25f376e01e4a1b676f102c2ea6201871f6e6929098245e86fe6de2c71ecd4ebaad6e8c1a51e3c986399dac1fa79850364357 SHA512 8850b4ca73eb017f878162b0677fda711c47c5cec393dbdaef25d4e067f54fdad7d45942f37dd6c24f29a08c436f533353b17f2c7bf3189391e48e011031625d
+DIST firefox-69.0-ca.xpi 504083 BLAKE2B 7d834e4fd9cc7f872de0e352e7aed3e44984d7415648bb095d130b4007a8bfd68bb4756a691616aed40897f1ae6a61e326eddcaa17356eb1aaa79e56cb1af799 SHA512 2a5bb71d789eaf326430ca52bf70e6622ac85cd51e94848195ad26f7b3ec5a3e1f648673243187f910eb39673ddd39bc997ed300cd03d214b570628e257f3788
+DIST firefox-69.0-cak.xpi 539423 BLAKE2B 2bf80b6b256681ae6d909e8dfd9e449a70b6b2ba2f5b67ad6b7f6d8585e05153773257e37dfb1cf9f01f3f104aaf828135cf0e6341ffc3b7c9e6fa1fad097059 SHA512 e51e4b02f1ae550eae5506a53e817370fd6f17b870f95aede39513a063cd0ed000a2b74e3d2e2fb8c7f0870f8e9c49a0f4da308bc96ed4316c0f40e9830dbf65
+DIST firefox-69.0-cs.xpi 524200 BLAKE2B fd5492bca193e3b95203905ea7699c3d36e309ef9dec294330f6dba13b7ebf8d3f4e094eb3b2f4b4391676139a4a9cdfe819a804d9e38e5e5919432f85219719 SHA512 f72ddfd49064f7eee24b10ec4d76760056429ae7e4af7610d179ea544a1e57fefabd898f1d0681472e57e9ead876fd3dd5aa1de6c774cc8f5ac7db000b746b93
+DIST firefox-69.0-cy.xpi 517169 BLAKE2B e3f28127af1c40f232086a351cd557ea8da3fc6a0f6e08a46da3f0969883d16156038bb3aaf587c34a04cb4947bb0c33eaa1a41b6dc72164e538f34a987cbab6 SHA512 b5aea9f3ffcad523cb71a7fad9782570cc7eb4dbe798cde8f7628f99cdafb7d2cd3315beb07ed0e99f38ac685a0bb933773dd47534ac95a0b33acd8ccec93fef
+DIST firefox-69.0-da.xpi 505090 BLAKE2B c5bf7debf8ffaad4af8ab0fcc471c99eba9338122c54f7ac53ca4405b8c98861e4441c21154c0a2fd708e0deda89e17dbc23ba38f25336d3560411871470fbe4 SHA512 d32733568d22df2839c19c63031d3d6610372023c7ddcc51c3c2eb04e9681782f5fddcc7241d4c675f7b779b7526da36403a00a2c6e10b5fdb201f4e070728f7
+DIST firefox-69.0-de.xpi 525392 BLAKE2B 2bf9b3912484163bb84f1aa25fafb703e06143f3fc204053ab3bf24968ee322ab61c39b9a75642bf2e315174b7d59bc8cc79eee5d9cd334e6b8b8e056ff120be SHA512 29344283ad76d56e1b808fdb1cb6d3c7c8e7e5698dd1cd857ada815003070a68ba4dabb1c25fb31e057e524a5b323f733269edf6ce66d172147316024634995b
+DIST firefox-69.0-dsb.xpi 539379 BLAKE2B fc9ae23af77c8a204cc25aa459a77fc1c39e8d11e9803afd4ca479b038d5ca39664de91335d897bdb8435b5161cb6637e12f7156bffd32af6bf8c4e0d82b3ab4 SHA512 5542e41c79e9d47e52fd446a76d3a1ac8d6cd40aca6d97db86216bc7b5c0ad0067deb84fee66036cac17ae9d74a6cdb5b69ce6c6227c3b5fb0e7e2b7f8137a6f
+DIST firefox-69.0-el.xpi 601037 BLAKE2B 337a63caa0c1c76a206383c19638ed9a2a0df67d0d2fed6e1f2aa462459c0cf5b8ff0fc268f0434024f22067fc65b163071f484792c55e269f7b3580e6bc76c0 SHA512 5c72b00efc87f8a43a5a3af8b7e3642ca016bd9a27103a2b1e2e89b3c1645f8d2cd118224dac551052e3b41f47e1558a08e2e2af4e3292810fc17bf61481d4ce
+DIST firefox-69.0-en-CA.xpi 486037 BLAKE2B 8787bfb8c339c12c0f8e3083ab3e4c4660e2486653e78413e58cea478db2e2c59b2c19dd1fde4e2e8c5b1910f5686c2f4e08394813f3bffe2d396ac552c1855e SHA512 cb75ddf9ddfc6f00437401d277ca480e8a1d0c0319a632c957af3e92e27f399395942e9cb6b9eded36ebea3711488e631bc1f183604a2c7b3a0bb7623874c976
+DIST firefox-69.0-en-GB.xpi 481971 BLAKE2B 5a78dd9d2d2a281d0d28958f2c6e75a2d2d3ce8c50b12c46a90fc7a365c9c894be5c5babb780c90aa87ecc693f552e1d8c36f89605403ec6c056b844367ad243 SHA512 508cd525a429240eb907876f5769d6580d02f91e30e69b429bd2922f18b7576557b99f8703857a1383c39faa2f20938ccda9df21b22e82d39d297c2a2da48b61
+DIST firefox-69.0-eo.xpi 512825 BLAKE2B 4f4e6a57f3a9cb5bbf3e61bd8b4ee74f4f1e9b186548d7acb27368808ba49d195f490d0928d447787e3bf8bc1984ce64b7bcb33d5a04495d251c7f3723cb7645 SHA512 71d1181464f491cb34cf41826416b4f5d26a851e32156bc3a3a51a6c014a132ebf0719c658ffba5603e74f71d1292690a7dc74707e8ca11eadd7864eb7f2519a
+DIST firefox-69.0-es-AR.xpi 522456 BLAKE2B 4d117a7c03574e1856bfbace986e7c5bf0ea6abc19776d7ba0e66bae3c581d5281131be51323914c365e95e50707401d5e044059a5ac9d72937b962c6017b59d SHA512 701a3551c8ff3ee167dc477bf239f751433067149b4ce1ab6d4e267301eb117d4bed838f2fc1733e0b471fa31f19426a057a448c7ad1073a1626c8bd68089b92
+DIST firefox-69.0-es-CL.xpi 519212 BLAKE2B 255ac26d70c503a0338a5dd92dccf7def24b39eb27db2de14d07272bc67b214c99ba5afe5beff4d43dcae23dde625a6715d3fbcbd095e56cadc00c8823ecb2cc SHA512 5590edf74aa94542b9a09c2b29e8d63f950e490481693baac44600cf8eb2a3349498aa9f2d5239ee120328ced46e47fda6924c7755cd95d6e6eaef850cd7b0c2
+DIST firefox-69.0-es-ES.xpi 484554 BLAKE2B 06e0aaddb8b5870ada01dc0c207e99d3d43710ded741c0d1d61e9b59ee31a191518f2d7edf0d9172ff7f070163885f5b0e4607b2483f0d475ebecd4a18db8f17 SHA512 db33fce89ad636bb3baf1a4ee50acde78c7763ddd59acfe303b9e5f03f5f7cfdd45387d0741425a5b0379af10a79de195bc34a1ce33aea92ffbaeec974684051
+DIST firefox-69.0-es-MX.xpi 517638 BLAKE2B 8d6d2ec1ccf46b17364723c957b89cd3e96f012aaefce19c8465da5f36b4c3c663ce40fc89197230adb937820784b9b2fafcd2898c457892a08b27128587b94b SHA512 c622c238e9b043b3977a2fd4304271801bbcc77e9f1eb030f21aad07347650e80df28083daab8c4447cce5440e34c389891abb2f109d1321d040f6695c289d3d
+DIST firefox-69.0-et.xpi 494288 BLAKE2B 91a6882043095f57ba8849afc49d20d9afcd578a01b10c8bd412fa83793a3c0976b318195c422166afc024685fa6702e9227258857225cbb62d3b13abb460749 SHA512 ccf974eb5dce61d59a78853025798fb25b9faff905939701b4618dd247ae9b00498af271d633afe8a90995ccaa551a10c20937ff05d9a2907319f793b25cda27
+DIST firefox-69.0-eu.xpi 509505 BLAKE2B 8c9fe5365183e7fbfad39981e779c26d170ec5739fb66c3055019c80b8a5bd9f428caa200f950d7c0035c2c9a47026a0d3f4371f0fa8d12281d921738f16c229 SHA512 48b52ac7eb7529259e402fe602a1ec42197e1f0432e260f91e4291dbde9ea20a8c2e61375d99e9f9d8ef5dd4b81f3f559f553a6e6acc9717e99962846b9d0c6d
+DIST firefox-69.0-fa.xpi 548024 BLAKE2B 30bf128f34fb084e69f462eb016dc1b49501c83766bffb4105c481b1b564c6739c78f78814777920f6a8e8787fd11ed1e3c21ed8d416477e9b953bda3ef871bc SHA512 f62b14960be8e157fbb4368e103f5280547b493789fc389a5b9883d8a6817157d539604f17ba83d298edf6e30d0ce05586fa711c251519c09282584f69e4dfb3
+DIST firefox-69.0-ff.xpi 482402 BLAKE2B 35812cc76fcd50c7522701b7f3339680e0fe41c9943d7c1e8ecbc922bb497020a516c7d4bdad38bd6dff4edfce0fde36eda369e724d2ab488c133bddc6947eaa SHA512 b8bc9745cffd0ebed71df29af9392edc89c024c89e42c9507ccf33c037f17b456fadc2eac0d2fe0aa6448def7bede770bc0b95be99d934a460c5347f1c88f9a9
+DIST firefox-69.0-fi.xpi 499077 BLAKE2B 8b43f0f6dc6684e4177e458fec43069b6ac90ba0827c2f4c5e160656af17641dbf7f04112c178c35006e8010533d647a9f9671eaa7045e7d4185b7d4a40a907c SHA512 aeba6bd7c2c77f99b13305cac4ca2955cb3830ae33ac1d7c10ec36b3ea6cf43dadd8bbc003b655e8a0b861661caa7100a2e792ad9659511e366cca4004075581
+DIST firefox-69.0-fr.xpi 532790 BLAKE2B 9db4d95a160a8ae8f5df81398e8139dd146481da81b390040e995af86b0eebb753f23a10694b537ff0b01c7236f97983b6948c050582462e508de437e3308e90 SHA512 16b43d0171b99d6d9d001d3e6eafddf362b8696b00a2fd7b51f19afbd4d1a7349fb4c5162e667bb9196ec6eab188e8a8373664f7c07033d43e7e3ddea1c7a934
+DIST firefox-69.0-fy-NL.xpi 519616 BLAKE2B 7746f0e618e120d7c7a029af66e9ddb7325b04c3225d5fc772278e4dfaaa4652a97bac0a8a0ee23275ff92fc03a87428d1b878b603d5b4fcce5e7cac97d2d05e SHA512 82caaf44daa3dc1359fc4caa60df6e22d32ea6265d1e36c74dab1351e1319aa6e89f769bdb11fde599467c6bbe4beb28e36da95c3911092f55c71106817b1059
+DIST firefox-69.0-ga-IE.xpi 487337 BLAKE2B 7baa3d46c4906057ef279e398bdc8f43c7afc006e37c3967dcae79b5dfeaf4775605a207cbe54cde5153d3531f3324af9a925f97b725cde7ba0b3691c2b0efce SHA512 2d0c332839919f6261cc54f98ff9c63f6181c0e7a3bda6bfbbd45a34ffe2c7d3e4fbd70bd28dc491651fd7bb8b032c14970d7675c56e9bf4da1ca78eb65caf24
+DIST firefox-69.0-gd.xpi 510047 BLAKE2B fe2299788834e4aad82b40614cb155db413afedf5a249da5a9a487266b708c5c2bc9bbce06981f5c8b214b1e250ad3f71537c7ab34dc4950b57c8d19b691e319 SHA512 6f65d9a88a160cba3a3b2f7d3b96ace76226795c16921cedbe4ee7afd506cc137805e4e0ae91e6c2001d5d180fb43fd406fef299a8b091705ba319e83edb28f1
+DIST firefox-69.0-gl.xpi 482714 BLAKE2B c96876af10c80d907e6dc4034e9f73651019e8faf4feababa858c11cdb1d819ed28e347d2ea2b5d2ad3222e49ebaa2a77b8a7606023ce933cc7d748bb77252f1 SHA512 37b0781a5c6291f6649f1ab45b978ff193d75453fd8096872ad74f988379eadd10d67570a38006c76477ee3ec3d981b1ba0fd623f4719831702f1d5e32c82f80
+DIST firefox-69.0-gn.xpi 529552 BLAKE2B d377f84a6fc88dd0a3e698f1dc36d533ddd27d19b9203c1b31132f5cafccb68595c90bec4a746d23afd46edf8f059443695812b7d77761b8501c57d7f1147948 SHA512 9197b293850f02e7ab189e84e309969fe584ae2c4a36fbd36a57b0eb1ec284994a3eb42d9daf31cf632aa6aff237dcc976a59f4e274a9c51ed4f638bd653a359
+DIST firefox-69.0-gu-IN.xpi 572910 BLAKE2B 8e56d34647b2e4b476fed81bdb5dfbb2344a736f8464d84cfc340e24d433cc0b42ae0873c84a8b8a01f62f1425aa8258518e6765ce7a6bb2b749cf665473da2f SHA512 54fa12c9a474f776d61e65b30493174186b01ff96e05816b1a920f8df62d76b8215b7cf542991efa2d8010e4f162aaea54447a1a51301a215f0a03f8f0abb545
+DIST firefox-69.0-he.xpi 525997 BLAKE2B 93c69f422a8233e9f3e6c44baeae7d7e1d21d052aef47ba68b1cacfd15261bad60193efb6cc2d5093105d694687e60625b59af8327800a5ac504018fc813538d SHA512 c2298dd7d4b85dde881cd3f5a0a616ed6c3d4e914a4b132bf185e04a6fa2de426ee43fc9229b0717346c1a40344c520ac23e36d8d33d3661238331f01d8ce0b6
+DIST firefox-69.0-hi-IN.xpi 566505 BLAKE2B 5dc07ee17aa2526300de86d727038417bec710ccf99132c22874744f1994b90d968b447301bbf2ec23ef1168a3629ee886d8bfe299ed31433b8baba032117c34 SHA512 97251e095f69adefab565d607bb93bac02ec9c15dbd84e7bf4eba889832c2c8e596cef4c819256339708980e223551a66d11630920856643dc869f62462172f1
+DIST firefox-69.0-hr.xpi 503670 BLAKE2B cae6061c40f30deea35a004166477dd97b07ba1457952e1502734c27c5961fee4b4c8e538ae43be8c90c6369401da8666b1fe99db55814be5f88c88be1eb41b5 SHA512 917b538ce53348573c4e5ba351285e38e5d2d89fae37332ebed80a43b33ce38fc5e79dd01a2fc33fd4dff2bc493f690ab49082e1955391af9bf0516dc840b64f
+DIST firefox-69.0-hsb.xpi 538170 BLAKE2B 21ffc13b3e487127315ceede52aa171ef8a47078008dbd950bfd79034f7c0d09a2dd466b3641116eb0a5b2d7afb4f2dcf364268d0b2735364b89ac2927e79fed SHA512 a817b96bb37c13ee369e2f771bf45c16310838149959bad7adf5560c0272028eb0bee77db03f435113ce910d16f6ca5fb6ea1f2cb8951ae2abe7913074b07cbd
+DIST firefox-69.0-hu.xpi 535846 BLAKE2B 65153877c262e75192e813c9e195ad4e127c15d9788e513eca1cde0d8259083536b65c6e0037a50a43b81a2ec7c8bd70a027185b65428f1ffea340d8efe21d77 SHA512 85125094b28a85226692875f3c080919b6a5f91d7077855b96470ee579877130f2432d6120814472eaa328b6e2dc88ecd1caf77e5eb24b1f7519cc01af558cee
+DIST firefox-69.0-hy-AM.xpi 545000 BLAKE2B 4b5fa719a400affcaa179dd6eb2d3624cac4f44fda20ac6226d4f27a8241cfa89d8e40d50d0e6208930ec9fe2a4964277f7410ee93171776958107ec15f0ed6e SHA512 f80f0d5ec22240996b71cbbcc7d226469ee9c23ee973e4118eaab3438dabc539306bacc64b44a60c02f2a7a0c4b9c514cd2082c78456ece8c3ecebd092a1085f
+DIST firefox-69.0-ia.xpi 506336 BLAKE2B f1ec178c4759a6c24e8cc7ef466bc192f687c18feda2e95408d108eab385c6af2fb2b79990435d94cccb1a74b5afaf32b4d5814bb907c4ce830d197e109b70c4 SHA512 b98d87a9970ed1b3974cc1704e8775628e20d64bbc95860839638d5a036a78fcf553f06a61c2883486317ff7069af2bc9e4c87037cb191998f172c6670091e0f
+DIST firefox-69.0-id.xpi 496640 BLAKE2B 48a0f0bb88f7e968fc11e3226094661cba9e1ac03db3dc63b69f0f2b582118fba0ff55ed5b5b00fb7091d4a9ab9452b738fc8fc8066285d9c328896c16ddaef9 SHA512 8b2d2338540a3949b386af72cfefeb908d76b75d1a5eb95664d661fbbcc6b5e8d46616d5849152aba2334fe17576343d504807d012a0ac217ebab0434340b431
+DIST firefox-69.0-is.xpi 498119 BLAKE2B cbf7993239a6ab0bbcfcbc54ef94776261536a2596cbd72ce9ac791764515e55e655a7c8f42c7a3d9733ebf12548a5b08ce536d492f4633038c53c782bf4f94a SHA512 48cd25a02190a8c1cf1e658edf6504290820fca8664e2a1e183921662cf80913299af43189f8b5499b4f02a75f36a72a0fe1f197ce026a3ff738c56f96b9cbc5
+DIST firefox-69.0-it.xpi 398737 BLAKE2B fb3a2026ad7b07f65a9a0108f3a53df80e53991aee48e97ad0caf2a624d448c5afe48e6e3328a02718efbeef0433f0598ef0670a15de6b990add51c1ac01cbb4 SHA512 bbbfd0eb47142b36927cbab30c996644f56ac53781c475784b61f8b25e2540eb63f0a36273d7fae83232407d9dc831a84c82bf93f12f37dbbd6aae3b65ba9c9e
+DIST firefox-69.0-ja.xpi 553444 BLAKE2B 6ff388058c1e8fbc9c00fb84f9bce934a5ee4a2f96898c8657b9ef61e637cd80e34add6008f8003e8f723f28f50c366f46aaa62c5ffa4a2d22bc6e78969d9576 SHA512 b9aa951bfa1b4c1f10afb376dd4e3299d46308f1baa250b2535c237d9e9fefb12ba742889015754a978ad2cbdb567db5870d39943954921e1b84ff8e324a3821
+DIST firefox-69.0-ka.xpi 555811 BLAKE2B faf21940622593c8bc3363c65a5a938f90e09341f6eda0e157e30616500c6e57b203f82e99e347b602e83a64b90b336baf4b7e0937250c1136f51e8bcc154350 SHA512 6c9239f51ab0a1598141b7b195d0d794d134b480b071c6138b7ce32623ec431da6480a54f3bb1f62951280c477d855cbff11b0b1e4db7c05020183b539b5b18b
+DIST firefox-69.0-kab.xpi 511533 BLAKE2B 48d039d7f0f7941cca6928f734aa332a9920ae2f4c6782333991f3bd05c53e00188c40bd29f8496cc6eed5183f07ec2a8d1d807e954e800de486dac1c5c641fc SHA512 a5bc4e22c8f61e44b89088410b747b9e33f49d2de7fdb35604c2b2dda58fb781561dd75a0bbafa325cee4e85dd4faddae34cb9e208ad9372f6947c0319012ce2
+DIST firefox-69.0-kk.xpi 581229 BLAKE2B 5a46aac29fd0d9610eb63e07307f51249c2061a64d964c154ae6ff010433dfd1996ec0d4b95ae27203823f1347075709ecf689eeb095b32c0972f25bb42c1b53 SHA512 321902be9cf45e304a431649abfb3c004442a4404fc876af9289e66a821393c2c1a32e84239967e240d3f88a2a1f3c01249cbd1c508a22ecd3108f0ce217d089
+DIST firefox-69.0-km.xpi 553113 BLAKE2B eda399ef5037964649bb43f471b22839b8969d66f19ef869419779a616b9f7a10e67e9cd600acc8e34732415862b254115184391a8ebf4994bc859ec7b54b446 SHA512 fb0486c1b0ca6a6db3c809b85be3e15c3139e98d6b6b2bcda83d2fd9a272089517a65aa1ea95279ab41fcd72d7333bde604dfd350642e769b636af9be4f7c3eb
+DIST firefox-69.0-kn.xpi 545866 BLAKE2B e3a36a302b6fd6762d60832e106d397e9eaa12b7a9c4a7220e53b6911a62f5cad4e4005255dd54072efd595a79089df75bc065d2b02dc5193ce4483323547e17 SHA512 79acf30283dc33c93f06250a8fcb16a95014e915e00d6b19ca54419579491f0538787542043e177be6cc7600d515092339e456b7123c3e3fbe0c4bbae6f1a8b7
+DIST firefox-69.0-ko.xpi 545926 BLAKE2B 7d8eac152844b0f1a1358547ef434a1fb20e05b8e5686b34bd590843f1511c2928c2ae046c93b36311af0266cdee553eec486885ebad5b3ebb7a59ef25bbc5d5 SHA512 66147ea1129d09af57a6e35535433f9d57cf8bdacd24bbe6b6cf1d06b20044484210c36c0d22197970a6c6d56b9a640e10979d9cc52f5ea1c5144678477df76c
+DIST firefox-69.0-lij.xpi 481096 BLAKE2B 79023135d388d744a6dc55d13a3cd8cb5d62ddf97534c43d3eb3f393f720ebedf2be180e490fe0dd22babd71fdf37745588163d61d04b77e1e62ba1200098c23 SHA512 94a6f2d2f9196857a33f77ebe23308b2617988d0f3e19fee9583dd3db453e31c52f54f1a8dab8001fdd47e9b1933058bb4fc545bb999cc8815f5b5294e666be5
+DIST firefox-69.0-lt.xpi 537440 BLAKE2B 1182c37bd3333207dc9069a20a6128b36e637d157ad620a502a0be9b491f89b97a9f23e6861c76c3309522d702d4b59549a2b59640e1d965160a5579fac516c4 SHA512 43ed445f336f057cd039d5dc35b28683c0373e29e1ad2815365fda754ba96dc9eee794cc12a2afff684731f2711816726c4b9bfc520e0cb3a380dfa60d34c703
+DIST firefox-69.0-lv.xpi 498842 BLAKE2B 2150b4eb51cd7a89c5c4fbfbb312ca2c568490b97539cdcd542de3c63a0a9b58effe0d4bd85569aa5905d446ef05149c406e29cc7eacb63d1bcf4027df52abf3 SHA512 e363bc31572c9bfbeeb5fe4c00ff4dc2b549fd4ecbe20284e1e7f4c1970da7359ff31dad190eb83a4e2d3f4c6fa2f5db00272c84be690860a5e49ae92fae11ab
+DIST firefox-69.0-mk.xpi 488122 BLAKE2B 4ac87a79803a340169f1520ef419429c8f85294d78f299790f2ede3e903ce4f409f002fa058250d4e3ac6d17f9245c052ee39144039598e70c7b06537c2c8391 SHA512 1101b6c1843f32a90c4b2dc80a3de9a74b58733563a16d3783fae69b33bd8c5fec3d130e9f4f6b2f41dd502f3103563f3e9f7d670a3889df61b0c86db3643777
+DIST firefox-69.0-mr.xpi 560187 BLAKE2B 6f611c8327c3aeb79b8f4301c97e2eb805aeb3729740b62a825b0c34629f6627739aa62ca9738e15fa3bc7ef6042c8a65678ef4c31b3e9173effa5ce95ce6cf9 SHA512 335040abb07dffacb0c4850bfe6153ce41bad637eca2864f39e7295db0d03525ebc7c4d9dfedd359423ac6f513f6c83d6c7efe45003daeb59bdf9ba5b0c4df42
+DIST firefox-69.0-ms.xpi 478893 BLAKE2B 4e75fb28fd9e826370418c8d9d42aa38b70ddf707ea654cf01811ea0192827f2b9333aabc9af5211d40c4639d04f2314a9bff9243411f9b743bd88f55feb8022 SHA512 1c529e0d6e26cfe57725a832ad194a0346b4aa89e97d47f657b1fa6f1221ca15ebbe5af2a647e6fb433c83b89805e9022153a9085078b09aff445f64906c5cb9
+DIST firefox-69.0-my.xpi 553518 BLAKE2B 008159767974a1aa6dd327a1318f6bdb350c681d4af7163995403b682de5708b5e68651017bdb798c4fa981d16afef707f76d78dd2936ad88e529094f9b93dab SHA512 b637dd84ac791ab222f054e634ff5b12cf9b6096144d625b8754e99cb1333adf4a64b984294d5bb3338913c0deb927118aac55da977219826d933b60f6868593
+DIST firefox-69.0-nb-NO.xpi 505949 BLAKE2B 464ff040adafcbb71b8839daa03007a0dc7cbf790f2bc0bfaacba029a7836df88d4228a97f7396cdf8cfd4cfefd61e4fbcffe586e5e7949267658ea96c86432e SHA512 cb345783da0768f85889a3e9d44bc63e16b66dccbc8584aeaa78de97a718db5b46bc47468ca00be64f0c55c8f7d9be2491019aaf266371568d3a687bbdba7d0b
+DIST firefox-69.0-nl.xpi 501273 BLAKE2B 2683a58ed917a009549ef5c9b3b0fe3dcca154c72341ce213b695144c5f82e9e5cbb49e6794417feb08644510d92fd8e62c35c6dbf9073b587d3a0d4a6c7623b SHA512 6d9cd9ef8a0dc98803d3e2410cff8dcffc668fb288f37828aa681c342df20cbb4c2fbe9a11ef822d8aad9bdef6bd11a5c52732052d133e6b47a22bb1569c9fe4
+DIST firefox-69.0-nn-NO.xpi 503353 BLAKE2B 44c331ca057a9e01876ab312b782ef69fa01d2f55e7e7adf2d9870b44e5e930ce6ab413b470723eefd3f06985549a83e534b8c26decce0c8b3d994778bdc7df2 SHA512 2c17ff265efa1c34b9373129ed6c8c6dfab7507668ee0c204813ed8d4f951a5b8ee9ae79e2602e76aa11d08316c8aca571274bccadee3b31a2a621ddf545c196
+DIST firefox-69.0-oc.xpi 497834 BLAKE2B 96fff585429355e097dca16985a0c2409b333ac83a26b91566b4282f8bfc5cfd05b812e49a54304bb8b18f84eea0790e4e94c0cf46aa3ece4eae0b5e8114dd2c SHA512 00af8d3ac3475293e7b91484a09abfa8e423c700fccec50d3ad717ae21d60af740747159df60bf5bbd4b0711183edd6fa7aed025bd42a3e5be7a7f9550f11e9d
+DIST firefox-69.0-pa-IN.xpi 555496 BLAKE2B de9715afade585ec21017ea1e21273d7037de3fdde045bb548ab1b268f864b63ad774e0d4c44f3fd7032a170567cc68c3e2431b6c9fe09ae3ea0408e6caca202 SHA512 369c9941ec2189332f4ba1b11ddfce61383567f64f1c81e7881edf2af9b5a1567ad9c9d8c67f57b8d867c229806f2b5ac0d153731380199361d97385ba2756e9
+DIST firefox-69.0-pl.xpi 509640 BLAKE2B 472e7a761e4e762a59d36c6729dbe5fa3a1eedd80d099006548679d23ecf5f97a011d17b4d5a434cb01d928cce0cd134160638852444023320724a0747eeb629 SHA512 2a52616f325b6402c71ebe11ad5ee6380881a06c58e85ecacd5410e407f30ede8896240a7da4bdd124665e17c855ba841aefff5f74da401fdf7f1ba42fd42917
+DIST firefox-69.0-pt-BR.xpi 504914 BLAKE2B 0b672b11faf314a136693935cec9163d3887cb8f0e223af59f68c8ea2e7b9e3c8f71410534b30b2e136f8da71de5782564b44dff28de9ed835a08f0c91f50021 SHA512 ad90dd5c6648a5c748ef97d0b8b295885c8e7efd064410c9bb2f10fd6d2b264efddc7ac9a8055658357f069df835cbe85125eb45b18b1931af2a092406cca8ce
+DIST firefox-69.0-pt-PT.xpi 510859 BLAKE2B 6655bf8528683763105bf9d7d03f562f8b492ffebc13e5b0a0d291ee630b25555cb6250877b2a1749b1b36aad876e67d43a7bfb3a7785eeda0642b8b593772b1 SHA512 428f1c2ddbd438a5f1fe3e703b233dfc76054f7401a1932775e8025ed27a8a9f666d4d31904e5f4d4cb0287aa670070b4dab68ad11e62526763d127f4b57657c
+DIST firefox-69.0-rm.xpi 497030 BLAKE2B d6eb4222c5479b143e9cda5adc34394a23ecc3ccc0782e636eb1704fb3811c416358e94313b18e9397e832a40901ef946af0b15c85543fa713fef02721e3b7ad SHA512 4b7d44da98b897286a7cbe42c871d54b5c1016db971b9231699d5f1e4b3cee82a131f00b706c2d44a3ab11810431994f73135f09670173f28ee16f204581f692
+DIST firefox-69.0-ro.xpi 515549 BLAKE2B eb975b49fbe3b1777b315d642c739d31f73686627983a9b6643233b8f9f5d9894aaceb35986c99c084a4b8f02d4c1dd37ad896ae03aac40c32a53910ff31f2a7 SHA512 04a595970d18462119c4949bda19c48576e489f24e9b16eb05d37d1d36d6ce96d829b9bc02ed783ad637a1dbd70cf0f3b00d0b948d9bcbd0472e4d7b2c121cde
+DIST firefox-69.0-ru.xpi 596363 BLAKE2B 0f1b7578e3ddc9f13961f1f6344adae1d30af4cdb7a8a0490247429c238421fdea418b2fea6df5620e62a8de7d57b2da9355908d263105ea6199f31ed2c89c5a SHA512 ac5b6e438a1493aba29cce399a51369fd222c2bed54455dbef7828f84839fd68463aa6fdf607f67a7880150c0831abc2f4740b5ba8c41bdb2acf61835f3bcedb
+DIST firefox-69.0-si.xpi 526461 BLAKE2B 2171ca32d3d80903e59a187b72551f80702ba563c06807ce305434a0e53915f6ef1afdd809101707e606df682a2847a286d0d8cd4a8a6d87427b4a08fda488c5 SHA512 a55b43e06df730f6209ad3cfc757e8d3bc46a755466f6b3b2fe634f8df3eae8b44e098faf34b6f5c7c6cf1acf9f01bce3bb0c46d7595bbddb9080b010bd5df7e
+DIST firefox-69.0-sk.xpi 531495 BLAKE2B 077931029c75b46867b248d076339468f2207302a68e76860619dbfdc258a54fdcb79d5b562abaa7add681fc6d76fab7450c21aa072657e0f4e01395d6ad3bb6 SHA512 4557c58f6259dc4f65f6b75b4ac113c1ea3e2e7292da5f1b8d115a345424e46776f6d8433605cb2b7360b38824ace5535fe20454b2304f4d8cf24a6e7efb91db
+DIST firefox-69.0-sl.xpi 511994 BLAKE2B a67ac444616559421821d444f434795c3a00ca536de7689ada632632c793fa934a03293ed7257450ed3c8d3138e2ea89d0c150fccbc11b2b0f740bdf83cff687 SHA512 a2b12b6947a29595aa91791a174444489b666886f4fed01246f6049557c463208bb03610874afc182a187c936c2ed3e48a81532a3f39439728f8e875f310daea
+DIST firefox-69.0-son.xpi 454034 BLAKE2B 20dbcac2e3db4895168a77dbc9dd62aed0733b97143a9deb34f43cdc5bb2d6385d788fa585dca7424900dd02a05069386f26d929accf63d2c785a6ab830d84da SHA512 c39dc31a59273101a43f309b47a39e3b8a73fa45fd45593899f2a029e058755546265a9f1b631cfc25da35f1c7f1dd3f335628ce89690d00aa40522b568601a7
+DIST firefox-69.0-sq.xpi 520263 BLAKE2B 3e7d83189f4ae7f9b885f191a4fcdd1c1d5b25d7048f3a50c74a15680cbe45c1792a71620c973a89f23a14a365190c6cca88a72811a9b7355f63e677e45676df SHA512 87418e435f9e5e735391325c61560b17490f75ac5a8ed3f27a9c9c0f1680e854ac10d587f731988e9345c827a8e6376af727c2d73f040bb6670d51915afd32af
+DIST firefox-69.0-sr.xpi 530546 BLAKE2B 0198789bfda5e3d62eba36e097a14fc5f2aef711d89fd3b89800f857935f6908a51e6f83be565357db07b42037dd1896c79ff63ca4eb2d5d0afef98a0fe22a7a SHA512 cedc351db5051ed7dc4d3b190aa4633b4e17e6df702dfe2e9d4d3ed9143401d35fea04dc4dd41ffd5ba491d209e9656c4f912656baac37427ea8230fc6eba401
+DIST firefox-69.0-sv-SE.xpi 515166 BLAKE2B 33a43466076246bd799e87aa3118a6af46c0502dab7784f9bd31c031cc5883c60ba1d9b53bc22f1f35b517d31df05733574c2f8fe6821fc760595328db171844 SHA512 662c325df822c3f82dfa5c9e69097bf7330b5faef4b29e47d6b6190c162183046b4fef1caac0c957185964826eabf4af003da0ed09f0340242b1b964ba279193
+DIST firefox-69.0-ta.xpi 553442 BLAKE2B 5224704a90131b507da0a2384c2bac6710169df5722aa0d9894d15f1a8799cc9428426548196e1d0dbd46c8727deb5e872871e8dc894ee786b03b896feb2265d SHA512 6427770b3261c0959374efbdee1cb5792a11a4665bae44fb2d2d6d43ad0d0ffde31e5bd5aca79aab46312aa7e95d590a2830e234548628947578a727288bc34f
+DIST firefox-69.0-te.xpi 563396 BLAKE2B 484ae4ce879911158e43e69b916c767967ffd30cd2d114f211367b164e5eea6877086253868783e6d5404f179f4ace5bff6c94faefabe934d22e8a876abb62c3 SHA512 bf8ddf364282a20864ad5cc88b25444a7571f052da2d5069a84b04a647e788a518ac4576bc0fc74b159711b82941f6943522bea21f05a40e5e3aa3b22aac3f4d
+DIST firefox-69.0-th.xpi 556987 BLAKE2B 06eb6e3dcb8c1a96c29f3a849f8e700e3b0dbd0aad89de87cf80f29132d3eaf79881040a1926763928a9f1117ed31579f9fb523127da8ec45b79cda49808632f SHA512 5d63be4574c14db3bf97f6518d8eebcf41482be924a286159e8401bf7b4ad8d15adf424df2b40b03332479b9929ea5eabc7746023c37295742670623426e0066
+DIST firefox-69.0-tr.xpi 526401 BLAKE2B 9481a6ec79d36912d71dbfbc60a5e66ec2d7f5d97c65a5db2c40429f7221ee948f69a0068ee3942a0018a0e409d6e24160f6ba6b9dae86a455aadf355f82adf4 SHA512 e5f6ba94e396e4e71e6eb8620a3120fd6d625b9a80155157c148e87bd4c24c97b8372de689ba67f432602b839b231450861af2b6fed5071efd8a40fd7e55d83b
+DIST firefox-69.0-uk.xpi 580541 BLAKE2B 41b59df23abba280113880c24a6e70e080fb0cc7a69de4895e8d7dcbf31137a37e2b6446bff6b5bd5c9081c4e9f351c31c3813e76a0ebb3c82e7dfbe927b8460 SHA512 d927ce8c7b1164cbb13cc3f838034d136ceca18b646a7f40c5da81b8f7f251e6fd581e47961b5a6a6bc4e42f3b43ee3e2f88b9502185f932ccf862428deed05c
+DIST firefox-69.0-ur.xpi 540403 BLAKE2B 0911fd1c4175c7f25d9ad17a4bcf74c2c100cf3e8777f4407f2fc3156b4451f6ad7b1e061e1e7d5e6fd0badb7b859da3a9414f8818c7650ee845428e35646079 SHA512 ce9802a1a6902325d9f739fb2430301d93f1879ff32409e7d04bd5b0fa54b9b4774e0ef3d171d8a46da9b51553b9f152916756061da440f77c87c33038d2c74f
+DIST firefox-69.0-uz.xpi 481331 BLAKE2B 1e31d131477772a0a284f095d6ba947fddd82d5b997f96c648d938dc6996d7ae3fde560898c03cc7f0f34f6a1325cec7365f670bad3929f91d0fafe14f6079ed SHA512 30352fa876567eac69fe3f38ebafdabcb1357a11e52088375daf4ebecc96ebe4eb18ea6d55f7fc4055674f8a9fbf5e7bb5d61386783d29ffefb1605cd9d387de
+DIST firefox-69.0-vi.xpi 538589 BLAKE2B 786e94a1d47097f49b028220bf2cb3503df44cdb33510821196cc4a6b37471f34d9a00ef48871d428622c24178d9684b14f7253a2c18b902c1cadee1fdcb2ea0 SHA512 bbc9467addbde00f4b966b59f5c727d6309ffc490230e726466034adb711a93a82862270ed311e07f0754e8010ea489b2760777b0187fa15c600e7bd32e18f48
+DIST firefox-69.0-xh.xpi 465706 BLAKE2B 726cc89eda553f96162c2636feb831f0b6972f4a64161ff503174b6688e4bc9c8afb97f49e01a3d14b7bb1dcbc814bed01083f06b6e8ea8bdfe193297b43670c SHA512 47ed91bfa73fee745ef77c5f4491b1eec328d8aea5788cf9e5a41638108b3e5747a2773fa7006e671cf85460cc8f710d79e21d2d7218ee8311d839b4aade2d14
+DIST firefox-69.0-zh-CN.xpi 545781 BLAKE2B 637af78c771cb15862d528cdb9f916d4f441c38aeda6f6c96ed07ff5362f7bd494a880ef2d03f7b99a5fb1090f97c5f105acabb844cd6ef5733d5afcb6deb1b7 SHA512 2be684fa390f9732f940b12d8921694953620a3f877d9c7671452745438b069ff9c1a45b24a91ac1c54c6e2ee5c9081803b15fc5624252b425dce3936bb0b7f0
+DIST firefox-69.0-zh-TW.xpi 545667 BLAKE2B d1f4117739c4a18712dec26725e2740b2e2d0a2e9d5fa049fe44b7530636911b61880c4e765d4896c45e05af87b9ee6ec6da770c03688e302ede791204fdf4a1 SHA512 2946c78c6faa8ca18330b91088698383002d278920e7d37b1c3cc98e99bf5fd540f00772e18256c885e91eae3abdb0ea5f1d129110cc263304a494cf55778850
 DIST firefox-bin_i686-52.9.0.tar.bz2 58598632 BLAKE2B b9cde89261bcaa57841d2ff5e440c2fd86ce0011a1a6c4c6292abe51f2d479324a5e6c9f6a6a135c2811975ca850656cb35d922a169ea2604f3c13aa5aee4856 SHA512 f0f6b494eed4f84eb013065ed1a586efb03b50441023fea866306fbb65de3e7ebe5ff572575d868c17e3ca11958d90b1d6a8cffda0babfa8432e4bd3f19eda15
-DIST firefox-bin_i686-60.8.0.tar.bz2 55598268 BLAKE2B 189a20182875c14e267d04ad44e9b485f9618e2a033b222331719f62a790186884cdacb189077adae9a3f44e8936e2f3b137ec1322ba0ab9c5dec2a986f60115 SHA512 9aaddcb5c43226cabb1844e31917d25bd34a3f51a24dea17beb3a414da1c05ce854c858e0b87544a4a4890beaf04b11a248d66ce5be991fb1f10e3ad571bd47b
-DIST firefox-bin_i686-68.0.2.tar.bz2 65852739 BLAKE2B 437dace9d28fc85c26fc0966665a8ab0f6e1d111eb98c898f6c29abb05008928b51acddf71a2f967fb1b21b32bd6cca22b6386345f9436de2fb05cc3a1447cba SHA512 d6acd7725858a512805676f6fa215b949e631f4493bdb060921bc51c2f2526bd0e69641b41168ce756556510e354cd98fe1d1bced42a1e0a7100ee797c2eec00
+DIST firefox-bin_i686-60.9.0.tar.bz2 55777734 BLAKE2B 1f4914ac85d7a267c9ff128bc282fa63068177777700607bb6013192ed522fbfd4f4beb3fa2e2df41bc7bc5f99c7e6b393d5dd9cc08e75e53c581965dde97d6d SHA512 77e1ec461677251887217146977e3200054e26a64f963860165b8f8e755f54a93822af309b484fa393c5f274bcb3469dbde77692b2bd482742df0dbabc461dd7
+DIST firefox-bin_i686-68.1.0.tar.bz2 66018889 BLAKE2B 31ee04c8b732752f34931d7df92b78e552cd068ada341b71df7200a3e6b2196a0e4232481b28f88324e7d4fc953754e63ed4581608269c5db558626496ed0013 SHA512 d7c8fafe34d71b0ed09c2f505f201d03df15acb2e5b406b825bbbb3e25f61ef08bcdd8fcbeb069e08955120865bc509cf4c346dd0f400716c0ea4930a8f60943
+DIST firefox-bin_i686-69.0.tar.bz2 67811676 BLAKE2B e8e80a10e5af6734e44368c648e09616eb9d950de1182268e45d0380b7c8c183255fb9add24054418d7a4ee2c46637b33f46bd2601a57c56b74e17fa8255ec3f SHA512 da231783ed7ef640d02fa7bea95191af2081f694594e08160b682bd2725a49db56b54eed868ce11aac6f664d81d588243987ac80adc71bf11f0d03d85e90e14b
 DIST firefox-bin_x86_64-52.9.0.tar.bz2 57795546 BLAKE2B d767749ed07a0d54da8acf0273c59d9a4d7f46491aab34b7995ce76fe43366c06b859dd2ea1d8566861e1086e73aa30df28ff4d9dd634c1948868fad7643ce6a SHA512 b5d7da00766354e72f5a48f4f2143623428256d79d0b3e958ed6764b680afdf2b3188c61b09a02dd1537c8b8d3ddd1a1b828b1cc13a16df02a52538a42c62954
-DIST firefox-bin_x86_64-60.8.0.tar.bz2 53465045 BLAKE2B ea3f14fcbff4a0bb162d8f7b7e639840380e6cec618925e11afb56a4c0e5b6f6d8da78712a3b8d7836036791d773b41ea33b75a5cdb9b508341e12ebfaee5d6f SHA512 18574dc772ad06d0e71ee7a37633ffdca43fabde3380b1d89e80760ca601cfafb9187f2650c7d7c44555ea5b910c0f74ba2623939f3005a29aceea232ba3f4ba
-DIST firefox-bin_x86_64-68.0.2.tar.bz2 64055414 BLAKE2B a6c2c83b13d6e44c40ffe9e9a80fa38513f75d5bc9e7fbd28ff51a4228b26bd87de54894d7003ad39fea9578711074d069b2d6f115f4d225d6e80d526a14cc39 SHA512 8742f7831dbb888554532583c0dae319c1e30424901bbfeab62011088755067df63f360e5aed8fe3675706c4a64dbfaafbf832e66f559dd3c1f58afe8468bff0
+DIST firefox-bin_x86_64-60.9.0.tar.bz2 53465985 BLAKE2B c9685c9afc6edff83c376eb31a614585cf100aa93e8056609af4eddae28352ab5fc92c5e2d33a1ede385299eccba09f650c400100832eeb8ab1050d78e882528 SHA512 7f935f4c5d6b59327c668014ab6920951fe756b7fe568b84a2ecdb9182e32e66b83f103b0f2dbe4c1cd17f912b03265a119be3a0fc6b088910d440e94a6442fe
+DIST firefox-bin_x86_64-68.1.0.tar.bz2 64064775 BLAKE2B 6f998f2a9747e7b1175a964486053e6febb92bb1ebcd5e523d025f1f3751b0fa890690442d4de853c5d53ba15d2ea2a3ea8918ba522d4fd6c1f2f1031e5cd7ef SHA512 4829ace2ae8cb2d4ec82868bed06cecd740527e72cf7df8c470838f84a462d9174f222cb5ace7229dbfb803c7882e5d40b9dc5c0b2db42c9f90eae00b8b9cb70
+DIST firefox-bin_x86_64-69.0.tar.bz2 66210770 BLAKE2B 9090ef0ca19310730a0cae6d5b40adf6c986c913a10b2c6ff3e50843e26432ac704d6a6aa036060520d3094132177a104cf42d61ecc9c64217aee52ede56e657 SHA512 f4f57ec920bed699a986512dac01adff30fa446ffc35b50039f9b321d4c5a1ede9ccd311f81aa3b7a0ed844a5ba4de1e676ce50bfe138f69f786e6d86afa790f
 EBUILD firefox-bin-52.9.0.ebuild 5498 BLAKE2B b41af46ad84a043be3957ea1032fe35b38b7f5f03f966e4723e6e33f7a87f706da13e19cf05d3d5cff775e5dffd5817702b88d6b3361b2fef34b0daf3d06eb7e SHA512 47254987ef534c0ff7b1514334c26fe7636efe60a1a4735beb111242fc393664eff9a05e45975d6b6d7db3e8b3da68f2d886fc58b253f4e0640edc4c0e03c30b
-EBUILD firefox-bin-60.8.0.ebuild 5458 BLAKE2B 8a501b349dc914f9793ac392c43491fffbe124df6ba44ac98a91229e0827bc1a17dc82b27691be98081ef3f9206b3f162c788f17d4bbde18fd8805ee2a313035 SHA512 95fbca6ed92394accc8d2acc4fb2da397aad8665ee10f4cd839dca3627974c369cbe4cc510a1ea2ebbf8ed847266aafd4851dc50c7b33490e8eaad50d166c244
-EBUILD firefox-bin-68.0.2.ebuild 5371 BLAKE2B d276eebdcea6c8de1df92cab0ebe66649a92cf0d8d15550027e4f662b97ede08dea872d5c7f54509323f5bf7d634ff7926fc99316ed89d6e54dff8da13dc631b SHA512 93046a063bf706e2f633988c1a518e2e122830972fdb64f21a66a754b8dcc6d369f2be490d5efd2bab87cda196cd5397c14e85ee2ccf98543665d645e247aa4f
+EBUILD firefox-bin-60.9.0.ebuild 5391 BLAKE2B ed567b189a9b69185d346782f890466b5fb6a5e449d43a9815297938232a7a6d76dad975091dd9d69a20153dd0732b92bc2f3dda1ba37f2c1f14c7e2d50904a3 SHA512 55da29fde35a6a9f56b1b1aa64b2abf24b0dbaa85194ac92e471b627de30dbdfd452f942637e922d26e959ec6cac8cc95826e15fada4084e2925276bdc194a7e
+EBUILD firefox-bin-68.1.0.ebuild 5304 BLAKE2B 24e5563ffcb1b5dc8597ac04a2e25e286760f7e2b52a3775688ecbf5c27ffef14514043c4e38229a298cb8f4a2e8afe44091949ba62fd0f2b7c016dd7de37d6a SHA512 547406e3bba663352cd89cc919da47f357b760dccba329e73f99fe6f833bd4149788f30ed418cb199aa5f5607bccae11657dbbf85be30ead257b77a155d4ebdb
+EBUILD firefox-bin-69.0.ebuild 5304 BLAKE2B 67c1e36c6b47468de370460bf43c89703b1de6363ce970ce221de3e1f24c9141725b80a94425fa6914bfff4c6b8345a67d7e9af27149df9f2307547eb0b6727e SHA512 a38858f4ef045a2aed26d04f51f0874758c9c9c8bcb20e4092235818016264940e11135bc81b821109577d1423949881bb160231c99779c3a519a35f87ed45d1
 MISC metadata.xml 587 BLAKE2B f38f7c9fffdc422e11b9fd2d8aa2f9c4cab6b91cb5616a3fc324038bfdf720bcce97a80a22b012e61d3d466ac5569f76a29512ac8e7e209efea1bf6d3dce05b4 SHA512 c74cebdc88753d406ab9edd9b51f7dcb17dc1ce5eebc3d6d674d2e54d9af1619147e07a110629a5df003a0c506002e470563d36521a1708c40a10221a26c421f
diff --git a/www-client/firefox-bin/files/firefox-bin.desktop b/www-client/firefox-bin/files/firefox-bin.desktop
index 434feaecac1e..cf88bfd83e03 100644
--- a/www-client/firefox-bin/files/firefox-bin.desktop
+++ b/www-client/firefox-bin/files/firefox-bin.desktop
@@ -7,4 +7,3 @@ Terminal=false
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
 Categories=Network;WebBrowser;
-StartupNotify=true
diff --git a/www-client/firefox-bin/firefox-bin-60.8.0.ebuild b/www-client/firefox-bin/firefox-bin-60.8.0.ebuild
deleted file mode 100644
index ff208f5fe26d..000000000000
--- a/www-client/firefox-bin/firefox-bin-60.8.0.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# 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 )
-
-# Must be removed next bump
-MOZ_LANGPACK_PREFIX="60.6.1esr/linux-i686/xpi/"
-
-# 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-60.9.0.ebuild b/www-client/firefox-bin/firefox-bin-60.9.0.ebuild
new file mode 100644
index 000000000000..5eb4e561b90f
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-60.9.0.ebuild
@@ -0,0 +1,178 @@
+# 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 )
+
+# Must be removed next bump
+MOZ_LANGPACK_PREFIX="60.6.1esr/linux-i686/xpi/"
+
+# 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 mozlinguas-v2 nsplugins pax-utils xdg-utils
+
+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_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
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/www-client/firefox-bin/firefox-bin-68.0.2.ebuild b/www-client/firefox-bin/firefox-bin-68.0.2.ebuild
deleted file mode 100644
index fd63be9fb506..000000000000
--- a/www-client/firefox-bin/firefox-bin-68.0.2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=0
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
-en-GB en-US 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 ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk ur 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-68.1.0.ebuild b/www-client/firefox-bin/firefox-bin-68.1.0.ebuild
new file mode 100644
index 000000000000..8e6dfcb8afc4
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-68.1.0.ebuild
@@ -0,0 +1,174 @@
+# 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
+MOZ_LANGS=(ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
+en-GB en-US 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 ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk ur 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 mozlinguas-v2 nsplugins pax-utils xdg-utils
+
+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_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
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/www-client/firefox-bin/firefox-bin-69.0.ebuild b/www-client/firefox-bin/firefox-bin-69.0.ebuild
new file mode 100644
index 000000000000..485198e90a15
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-69.0.ebuild
@@ -0,0 +1,174 @@
+# 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
+MOZ_LANGS=(ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
+en-GB en-US 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 ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk ur 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 mozlinguas-v2 nsplugins pax-utils xdg-utils
+
+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_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
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 3f31789cb737..164141fd4928 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -3,7 +3,7 @@ AUX firefox-52.9.0-blessings-TERM.patch 2276 BLAKE2B 2413368995dd8421a634e2a50f4
 AUX gentoo-default-prefs.js-1 821 BLAKE2B 2af9a9e9f3a71fae918a4098397e931c02df5a8021d0bc87ebc4981076674aba99d88c5b8acf2380c915e92ad07a7636891ea8a07cfc850e9c4d15e58d0cd276 SHA512 b63542c51edfe0158ce487b317ea6d36ffc17cf8457534adb6aa3f613d9a027f4285c9dcf76eb1b96de6bbc10ba09948fa6c081e00cfb25ca47450cbc32923f2
 AUX gentoo-default-prefs.js-2 880 BLAKE2B 5a40aabaf6678b3c73f06adffebac3ebc9908da02e55250dc6a544f6dcda1b738d6e6f45dd84d08ad14f733fc313d7b2852160cc1a95ad290010f75d2d1286bd SHA512 d03da4b9692b5b71aa2a170093cff2e4f8e5e32e314f918b5aaeb5a07c3b5edf52e096ac60830ec54a0dfe50834218c899c262176c0719f81aa68b475bbeb87a
 AUX gentoo-hwaccel-prefs.js-1 100 BLAKE2B 08be790b58524077a5681cc06e10890b72dc6e8155c9e03e6ef9165035087d4b8cbcac4a6b8997f61db3721895c9247a12171eec7d082fa15e1d5312bf51fbee SHA512 cf5385c793056e66b8853fd641dce2e7804d6878675afd24485487f2201801e1bdd5d27c15cb0d483eb34bfb75e7a21c01f1bbf701cb1c2dfa48f8f6422ed42c
-AUX icon/firefox.desktop 295 BLAKE2B 2278498a3a9e3fa67faf486b6bb33ac37e4b3a69f30139b2663253948c2a346b88d84cd7245959ee6d2eebe69b72ec6e1c9b743d4edadce7359bcf2c5de2bdf5 SHA512 9aba1f14555b2600364afe859e3d24446a784a700c4f391be96dfc5ae10d6ffb680f99e52f325a4f4cdbe76a2de85f7ff72fd4568219c7158a8692f19bc45088
+AUX icon/firefox.desktop 277 BLAKE2B 944a7b4706ba5f6b93a1369416adc31203dfaf0d12291a035ce05830f2c79bd14d1f7d5324c16d3e5be21fdda2a9237223901030a974f3ff778b1def7f8bb3e3 SHA512 99b57d36601bba420bb2e6647e0fa4baa1c31f15bf7c602ac43a347d7fe78f4350b3fb10af3a709a5aac02a4c4f283dcfacd780bacb43e7e8ed46b83b97d6f4d
 DIST firefox-52.5-patches-02.tar.xz 15084 BLAKE2B 538dd61dbb7b290add4782b323a62f9ab4dbc57326a9a085710d207752118c504eb030a8741c1eed2e281c8d18e5453210b1905d71439250caa588137bbc37d0 SHA512 b80f9acaf49226cd5c2864714826c5b0e7e918e94c31ec81521b90c47edbb88ea85faa34fc22791efefbcd3867ddc413c563de58ca0f8ce21e10a3858899efce
 DIST firefox-52.9.0esr-ach.xpi 420286 BLAKE2B 41643f6cdc43722dc2a61249720902a503c5f547979e80ace08bef097e2efef7b67d6d44b04a66965ee80722194b2183feed15d3b2f13d5b6ccdc993415eb9e3 SHA512 8a28262b9bb44592801e063348401924b2dc8ab1b4e042d11f560d892e276b7d14279a1a2ab3f6ad27068113969ca59377493839f1efbdd61a77f5246815989c
 DIST firefox-52.9.0esr-af.xpi 429469 BLAKE2B 224617fcee13cbc62863dca9ecde4f45f1dc1a83535780a0f3b13f74ddd492ffd46b544ba93cb0ba505e99afc7327a5398c7bce735ba2d24612ea5ea80717221 SHA512 a723edc72c1e373e250fb878a73024054c670f0fd3ceadbd4a1306981f8cb560ec8f078a017cafb84dc49a11bb0d17046b102a6f67dba65b67d64946d909b189
@@ -190,99 +190,99 @@ DIST firefox-60.8.0esr-xh.xpi 527565 BLAKE2B 6b357e8887f61aed2ed513efb9beb034d12
 DIST firefox-60.8.0esr-zh-CN.xpi 559980 BLAKE2B cee4fab650cd87bd8e1c4bd14500c4036d54fdcd6524fd24d5e67f08a6926ebae10a70f0a961942a2ce752e8017cad965bf9e45ec32e825f35e5605539e30a86 SHA512 d5d63cad9411d615c0aa0814beca1f48cc033327ae989641a9e4930a8f6e7e5e6a4cbcb875b26fa5e82b631aa9a99aa35ad3710308933cbfbb0a15b9686094de
 DIST firefox-60.8.0esr-zh-TW.xpi 558304 BLAKE2B 94736adc0f3c74466f560ccfbab45ad6cdf436f2987cba65d25995dda15838109f5189e4d4bc87bd64f8a232d953ad69cdbe56cfc3ca3562b780a465180f0eae SHA512 dc2359c2d7245592034b58558357f986e612c119b54ba2b979ce1df0e7dab2a5a0a1422fad6958349a03832c96e9cf1df32bd55be167025a0c8eab5f14a27146
 DIST firefox-60.8.0esr.source.tar.xz 268791200 BLAKE2B 8903c5ab580f7a3fabe95cdd37da7915a99da3b1f312c9da980c1bb202804c91dc4948b01737eaf4a61d6ad2b66e7dcd94782997cdcc70b8b734d0bf762268d9 SHA512 0332b6049b97e488e55a3b9540baad3bd159e297084e9a625b8492497c73f86eb3e144219dabc5e9f2c2e4a27630d83d243c919cd4f86b7f59f47133ed3afc54
-DIST firefox-68.0-patches-09.tar.xz 13780 BLAKE2B 76b79b1290ee136f21de4804d3e598f00e402e8b7ebfb7abd36b98ae3cc7fa610dcaa9a09cb017b1a809d32314a95eedb5e17519309f93d37cab61e579551b58 SHA512 981207606a868ec67cf7f6c914bc71dc1b44a4276f937838d2b4cf3e2f10b2c78edc1949275bd990f5aaf64739e43dcf6051a1bb93d170bc572f5d8f3d453a1b
-DIST firefox-68.0.1-ach.xpi 471779 BLAKE2B 7bbeba232ff1f29aa9c6edf40da2b6ef01d64c4a4df57312bcb7675382529f643825eff3613298641b06cbee1b9144b8dae6dd3b2a20e321cdf90753412b5e6b SHA512 999500c804c970e9fd32670b8503492609827fa832910c5f8d79b169b332a61bf119c3173b576b1470e0d9f3ed03135f38d42b6eee0cae6548d26945a1f04b01
-DIST firefox-68.0.1-af.xpi 450612 BLAKE2B a2a3d00072682adb525c4f60c9051470acb47b6840b12f48e3a54b5b9c292f75692a240302e3a82d49a9eada777974ebac1688d3ac1b37b2e98c17db53da8d32 SHA512 065f09565341f6f11928940275e5990d38374782bfc67ec82b8ba50df42fc16b04964cdf2aca83b425a782de1f0ea25ce69defebff1c6a2431bc15d3c168026c
-DIST firefox-68.0.1-an.xpi 483076 BLAKE2B f7207ba0d157d579891716a200217d7f3f82e24664392d023da964b79b096bf016d7d42674aa1eb8eefdd89c6c6674e3060cc62ee915dd4e1f518a9996e0f65b SHA512 dc80aa1f71911ce2780cfdefa47ea62cd7792c26c7e73d38099948000720d41e5498152ade870c5abaeffd05e41a8921a2769b89b5e3002b10fd2bf0ff9f4083
-DIST firefox-68.0.1-ar.xpi 538977 BLAKE2B 906c02529a964058e2d9b69a6214544ba46f0636d2f654ddb4b7a7098cd11f18f370a30f53d73e4c82977e662554718fbffa3ef78d72b73114246baef414f429 SHA512 b0983b084fbf8104c67b0ab032fbacb67bc82d5a079285460c1f22d927490305cae90357353e62e224f658cd289dd2dfb775597c73621b29aeaba6fb3a6effa8
-DIST firefox-68.0.1-ast.xpi 480808 BLAKE2B 1943ec48ab628e6d8982d947c8956ec47b4a009b13a68eb91ce30dd57bdefb98cb4df73a10bf7c18870adfc0e24fb9ab4e8d49587b61b32b8f9bbdbf9db03f07 SHA512 2563f5e8d51d993bf1450501cff0f4e995c18db49aa8eabedc116bac810dc132770c4c3952851634daa5656ef5a3d55a76972196b834d560eade21055b364a58
-DIST firefox-68.0.1-az.xpi 510295 BLAKE2B 892e3c95c49c7532262fb6f284beeb9fbd11068fa266f21a00a57af34d9fa550a3b3888ba6f84c27b41b198139b5e890e4c07d0806222e577280a14a7277f769 SHA512 487d2d05ca13d5c136faef3b7f2a64040dc518253a5e4d3ebb76d4e25f70f5d88388b77b698510df61b2528eee7739d0894bd380ffca830b9498b678ed663752
-DIST firefox-68.0.1-be.xpi 582107 BLAKE2B e05ac0b46e848a205cb88d9697a018c5d5c3566f28fbce657088a5624ee295d1cec6ec2eb131ac31df78fc886cd473df7b47b6da765aed0c34acf9b84adcffbe SHA512 e4ebdf3e31cfbf8755b5acda6c78141dd9c7178263813d95290e835f4c5f5fe8efefecd29d2240e2848726483c08c6bb61a5b0dc7c446260ea98da49fc89922d
-DIST firefox-68.0.1-bg.xpi 545362 BLAKE2B 594d8bb378c35c8841fd05d561680ee13a19b519f46a2a6f6987fa735fb2bd48ffe85745ac9ae049f7600f73a600e4f6eefb1277f35b9514e3a782643fb399de SHA512 9e1d4b31996eea39b9149cbcef59f4b5921b5315f68d0ebe29b0736042f809c958be79db0f9cc6f61a4631a4666ad975c13756ad6226f8add1a91758a044a6ff
-DIST firefox-68.0.1-bn.xpi 566584 BLAKE2B ecec86b8f8ac228dcb479e481581d4b49479594356e7a025790b9057a27cf0000a6dc8737be104eb38c8261032b61e9479c73ed8c8548737e2111e7e4e44fbd4 SHA512 90ffc67077c522634d302190e415017c5a379ae7b69b2e037845a4caede12b7b0b63b16fc0585394cfefb37ac4ea1ec0f68c48683419996075a9f0bbe7db6cea
-DIST firefox-68.0.1-br.xpi 501687 BLAKE2B 83c15b9d57fa782a35da3464e833147b7dd36486b9c95ea701a81d09f997c7e5d27150f2e0c6d8afcd109550f837dae458e67719f25936355dffc9fdeec1ef56 SHA512 6fd680b5cee03dc3a58ea68ebeb7707e866e1c6e6f25d0967743d80fb66e18e48e78ff0214e8b2454c5ac5ac489644cac07db783daae28a548d2162dc15bab9d
-DIST firefox-68.0.1-bs.xpi 483149 BLAKE2B 7560be99b5419c729c1b3fdb5fcbaac8112f839c1c9f4b31cff545e99b265768e2a05d31f9d6a1bb6aa4d5d251f4bd517099f5c7be5a94e38c6c50100633966c SHA512 e5d1cbd29a79183cdeae0eb22c2c3f8d5fa399a15ec9294280055143b3443728e5844124855aed18cb6ee7f3ad58913a5e28b9bf911e8c2a8a27d56aaf091ccc
-DIST firefox-68.0.1-ca.xpi 499849 BLAKE2B 7828dcfd0fb212efb38eda2087c52729b3dde735d365cd7418bc9c5a334e3df08a1c0a7540dca357485940b704572178603f768165431841e675943b0cfc7bab SHA512 21960e9bb6f95c00607da4eee264045d92f8c554608cac1cdc43948c30cee31ce9e98c315924a1da6b1c23d615d1d9e57e97f2e006b83db297ccf1cc32d0bc21
-DIST firefox-68.0.1-cak.xpi 527465 BLAKE2B de4dc5c1373b7b9d28c27ed220e98dec4810a8424992781cfa4d34353ca723cea4811145a1c2cc23b03075332616d220c2d8595f4120fb6e9631a3329201b6d9 SHA512 bcbdd02ad8f54d71be6033f78cbb1065078052aea287760d02f62d68de3e645ad750b2627d032a5908f7bde1b7c5a6001054a9ba7627d31291c7c1010f8b8be6
-DIST firefox-68.0.1-cs.xpi 519934 BLAKE2B fe5a234ec19a74f485d9227b48baafd044fe8c80201a8e1cacbd6dca27dca8eea38cde6331ea6c62429c35f2472ae232b6e493b26d637904001aecd7bdab05ca SHA512 7d5a8e9a53ab04c7ec116253e1b0dd0858c67fee739228f516d23476376dbe5d49408c1ff0b533011b85d18deae6e3b668c09a460172fb91639005a8d51a6134
-DIST firefox-68.0.1-cy.xpi 507151 BLAKE2B cf6e3034c04f1deb982c932b578cd0ed41e4207924d4a7dcd0e54d0442326436d73db6cda613ac83939520550f537849aaed1d817daba4a2b5ce9c59d32ca0f8 SHA512 e4584ff0860d1895fa26e24f9e3ed31501f0a3afe074e8afd40e86d9b8ac75fde7fe7562ce68b5d33c4958f33433f2b3a7dbb3e4d9293064256680d5ea1fd03b
-DIST firefox-68.0.1-da.xpi 520279 BLAKE2B d7bbffd85a586a68d878424252f417b0a1283635c8b4e6a0d59065484f69c803db8c1f823efaccf0a0af9be04dd3ed085fd6ca909d62b4ed3b7084ef1edd2e5f SHA512 98975e39e03eee75ff4b55931fced77c5f6189b5cf023ad9b4752e8aabc7153796e92d6afeaf03ce727fed1c0453e056a9b5d9b05e0780b2fcda700f24dee836
-DIST firefox-68.0.1-de.xpi 523751 BLAKE2B 7aa737dac8cc13f1038b65e76cae65b0b830f7613bc43b3e74a0e08ad30c3d1447daa7d02b79ee2660c260e44e4a1c3aac8b5ab063b956eddf8b4a56041426a9 SHA512 1b41fafe6ff6443e0b35939b129ac7a08945cc42ee8666cf527f60b266f0e1d6249cefb9ff73097cfb68dbf1d56ed4fa288ebcfbb54b3bb60e0ad0586b8934d4
-DIST firefox-68.0.1-dsb.xpi 528670 BLAKE2B 7bfdb743750d08ede890f12d6b29bbb1055d23ee4f9c2cf4b7a4312af143533890ee1d4cfa0c3e03b12141dac75aa53f2987a7f121c57e5794dbbc57bc8c7898 SHA512 6ec409ad9ec6a00ac8aa0c2540907c678c2a5ad3e4d34306daf0aeb579aaebb5082168384b869a3f0b09cedbb761ef9960716b63bf7513e7bddb820d9cb74d99
-DIST firefox-68.0.1-el.xpi 597390 BLAKE2B 2ba67e5b33f2cb6e4c081b057c42462c22f521a05b64c8d202ca947c7b0894933e3ec79b5a96f43084d663c91ab072af0375268beafd787bcfdb2fa12b4feb11 SHA512 fb147e5a96717a4a4aafd067a82f125fdf69c085443ae0f5e1d53c775a642bf6d31c44d9abe71e28a7d7833d935553e1fd70a893a19c4669db65300d168c1837
-DIST firefox-68.0.1-en-CA.xpi 478534 BLAKE2B 6376c819207f84631c234069da98f29e7748fff5073c464641ca7fbcf7dfc956946b9150887fe970cfe8fb2a10813ef9d804fbc8ac4cb643747fcc4d17ae4342 SHA512 f07c050bbb6d8ea6f3b93ae863fdf5dd7efc53a740f221a11c0718490cff20e810543a7f2e0c3f7833a6a32c3150e2675f5fb09796a00181b32d4395ac30af6a
-DIST firefox-68.0.1-en-GB.xpi 478264 BLAKE2B aec7952f9932b4ca88c2000cee426a322666b1b6638475037d9715e290300baa4e47400b70de38def4a02809bdad70394d6c72d3f6da50d19aec827d769c30c4 SHA512 8788d4b409aa3583e9ed4bbd25637068f9b88850ef4ca019d35b4066b2bc10e40aea166bf1a8cb5548891de81122e2dae824cf47801e0cc673bc0b528ad3a5ba
-DIST firefox-68.0.1-eo.xpi 504221 BLAKE2B bcf4c4ea2c4f0229f0b607bede4c10366d4d76a6e64a9713d22e9c2b9f67f27aa41515d42eb79918d16f8f57c3b4fd392dbd04506318509e934fd50327e920a0 SHA512 73a7b53532f007b552a7dcfd8545cc54465e23142cd709800ac443892741c45ecd9f413224f0ef74d8716428b74a81b3324a56090f978f845ece0a54107da114
-DIST firefox-68.0.1-es-AR.xpi 512452 BLAKE2B 04280746dc18acb75d192bee90f5d3f3344bca9c4ddd2ce5402efccc5c1864f2e638a57020f171b42799df09b63bf1570ac8774a74ed817b2bf6b08e96e61f2f SHA512 cd43523334322f5db585d81fcd079d1806c3d41098b9b7bde1d33eac27bd02250b06d456ddaca502d9c9c14a8c1122aafce98fa3c677ef2345929d00e66979cd
-DIST firefox-68.0.1-es-CL.xpi 511926 BLAKE2B e29dc3f431d901fb3a6093d47c49dbc38ef9211741795bab34ac0bffdb6ea9a3704fa60fa9b21e5ce6b2024504839197193d8cfd695256dc38e423f6feed3df6 SHA512 76ccd0aa1581f2801068b366b0e47075636488a5231b23f3ee15b4dec42874b7a676896dd0717a3eded8a52a6b99f966b12326e1728696dd8deefa466aab1a2f
-DIST firefox-68.0.1-es-ES.xpi 481460 BLAKE2B 74f9fc3a29474b4bb8a2f7fcd1a7891ea096138fdc1776b9497af96302f378f21db67c1b4881920f8fb58552d13569a8401bdb80e1d98fe6f22a22c45209d36b SHA512 9092c346a3969548844a3990ac00a852f1d6d891b48ff2a424ca4470ad6ca9679a621999776759dacb4147bb67956b27fa5e6ccec8fac232928d514785308a3e
-DIST firefox-68.0.1-es-MX.xpi 504708 BLAKE2B d2470f2b619d8321a24b46b61a87c9c11acd009662429050b7a3424bb6899510418e9f180e3025bb70ab971d7125fa8f045fdc44d87c1ef8a1ed5900a8d4d02c SHA512 65ddfd22d661dba5d3c941b9107959f8be7708c83892f85bb0ffa63b6d39da8a6bf5e20cdfecf51ee892ff2a94d1a5bd38ce4d32ea63bfa93313eae3b48871fc
-DIST firefox-68.0.1-et.xpi 488529 BLAKE2B cff323ac45d1b046a73350064fa08a1a4f7eee799321a5641af685dcc2c8eee6a20bda4100e5aafefdf7a63507bdd9417bbf39f05454791bdfed913ad1745134 SHA512 56847f666f9304307c6a8353a51b16e6164a6dccf2550cca2c9f273f8f58a84deff9fffb31696eb831311c64c4550d5c0ac8c3ff646ebd51ed91fd0ae57ed6b5
-DIST firefox-68.0.1-eu.xpi 502496 BLAKE2B 284d55ba718d6009514b2c6dc807fc252c452536f62c10bcb28b21ead24902de734daf032049e79449a23e1ffac253522a4c0920df72a0e11b1902a1c13f4237 SHA512 bda4c7b030df2b4a086038e2e94afef48a7d7575a6f66958a9802eb47d6124ed273fbe1e4cf7215b5f3493202fe7a5371f10ef511dfd20ec8bd216753006c810
-DIST firefox-68.0.1-fa.xpi 547840 BLAKE2B ea917a68da902d77761d986d163314a6698597b2d448e99544b2c29e912aa06d2979393966f0947caf85870bfe2a90e798f9e5a981df24c1d3c5c86ead830a8f SHA512 9fe75bfb2c98f254b2c10fea51f99bf3211df23429ad3e0ab35a56131394e105ce0003093c72189a3ef227a0b1a9d5241f843b2c86ed718ee9c8e3cee8e84154
-DIST firefox-68.0.1-ff.xpi 484090 BLAKE2B 628345e28a85149b43333f5c00b148d1b12af1e67408bfa763f377e79f46c7e9f4691527e357277d5bef6c14be3eb02fe2afa608f87bf5971ec5d139bfa5926d SHA512 a1460153332e3370906b8f622e8ddec18ad5c9d60acf63d2f8cbd36be0887af529caf429477893c8a409e0d043d25e3de7885263e84bd833c36551173b9bb69c
-DIST firefox-68.0.1-fi.xpi 494302 BLAKE2B 52346cdf6bb66d9472747391430ed02137457116407352991320ffb92cb9eb590cfae231c83d1ec8de598eecb8728df6f6826606112487c0c0407787d4873152 SHA512 86fb72eeef26306f60d70d161a666a79085fa1f282ebedf42e58aa2cdc254120024c973ec00ed3894f672bf998e89499113e0d921f6ec8d908f6f9619ce69b95
-DIST firefox-68.0.1-fr.xpi 523081 BLAKE2B bd515d7c45f54a7b658efb73db463ecc96257e23ca2cf437a77794243f1c7e8035dfe36607e04ccc09dfdc098e6469b8750715836e960beccc936b7861661a7d SHA512 361e1d739440953153a395d2176d21045414c4be5af5cc3d26ca6dce617199bed9162894077befa4dab6dc938bccd519c9f0e8d3a1b18d8160af0446222b56b3
-DIST firefox-68.0.1-fy-NL.xpi 510412 BLAKE2B 6a86a5e342351db5d707114740f0197a1de9f643e64418e2e531cf2b614b69cff961f8d1ac8b60341edd89ae13b7bcf97b08ba475f819622edf32fb9d4f405df SHA512 80e6b2c69413aeb79d9600ddf343a2525106bb589ec41adf5346a12d7fe6e7eb543e3acc6d118270f2a5d76017fc5bc073aa2b40014d5dfd7ebdd041bbb02466
-DIST firefox-68.0.1-ga-IE.xpi 489715 BLAKE2B 7dee9eb34e99a18158455940db3e37af0289fd0d03bcd791ea31dedc8dfa0a941dc909f576eb744475c887c9ff467a422447ae10012324bbd9688ac2baaf5b23 SHA512 69ee2b3dbf4d64e7fe288a5acd4beff2ecfef667406682f9898bdae84a8aac9c14dea175f4dc2b87f3066353933fcdb18ab01f19f857fd88b89f0333f235a9d7
-DIST firefox-68.0.1-gd.xpi 506579 BLAKE2B 1deb8491d84034c56eeafeca3e00127fa7e808f0b4a6dcd13636f14438597ca6c72d166b4a80fdd18dffd7928f1b44d7822f75fdb6f67ac9eab2babfd9a0ec3c SHA512 a5c715f0b9d9acf3607e1771c02d7bf36e8eab81d6c2e61091ffa5e14197770fba19c46fea2dcf0a4f1b81f81558a007d375ea24543a15eb346299de206469b9
-DIST firefox-68.0.1-gl.xpi 484026 BLAKE2B 761ac080243fb792abd55cf93b4bdd2e07abff29a614c6e0b87dc949a8fc869592dd3e1050f529804bc062605dba5baa23ee32f844dee50fbc68b318b029c23f SHA512 2bbf92bd418aa4f3e3335c0b1ba2731b9189f031705e0677826c8b800382178c2806dc2cdc57e0c948c263f9d8f4a71446c36891eb183c4fbf3fa6e5adf85d40
-DIST firefox-68.0.1-gn.xpi 522004 BLAKE2B 8a91a1e6daf1a0801c16ff59e4c4d9e2b82b3cf5659c679950dc3d7ec860a91eb12d455a21ab1e2ae71db43e80bb842e3fff296c837e6538fa14c9a467eb37b6 SHA512 4c67f57acc9489d657408df10ad67cb7bf25a0209a880115f4e411644e5f128d616a6c1bcd46350fefa4fda998bba1188b4d6171299ed6a442c7d2312d949767
-DIST firefox-68.0.1-gu-IN.xpi 571745 BLAKE2B 90b3145b2bc63df740ab7bf363e41da89ddb3790a9e7ac551f6f15d3d0bf9575bfca6124e17d6c69fd23a71a1ee769cd74d37871679dbe5a0d58130854415ebf SHA512 bd9eded6af9846828020aa3c9eede81248886b19162e4b772c5412deeb4c1920b0cbd9dad352ce0addec4de18f260ffe252e64d15876a0c676c35db74346185a
-DIST firefox-68.0.1-he.xpi 514028 BLAKE2B f28d98b2fc07e6a946e730876343b4ba1d25a9100e2a605ffd59a9440c0a75ceec4e304b2da981c0d6b44b42e3cd04f31e3257e29262124f2614ea79465511d1 SHA512 e0aa8f3e302b04517443af2167a2aeef698bb088f0c5532a72d559956a62a861323c03fae26cd9de12d91ef8167ff10c8f5c53576dc9e0278023a0479f33312a
-DIST firefox-68.0.1-hi-IN.xpi 555479 BLAKE2B 8e6fd209f475c30ed5b07806e14dc0b7121b36c18ce0fd9b48b79c27e7132e36fda2a98e1750ee85956c5b55c30e3d69624d54951e6a22cfc5aee78aab0754a7 SHA512 39ab127dd7c516afe34984e205104151972cb8d71777ac8d58a77ca7990e7e1ee2c08f955bddef0d824305e986715dcabc999b8a9d0d7c29315693cbbe00b983
-DIST firefox-68.0.1-hr.xpi 491312 BLAKE2B dd001b517555d89f2bc8507d6dde2d4eb322379c15921c3d291d473a56e63adadb5845c58be2e964ed0fcbdefa921cfb9bf1e6ba38f5635fbf0582dcd9017225 SHA512 4cb9eddac0e80ad147da81b0fc80a4952c693199a289ff96e37825e1e2f9735bab4a809b816b49bb518bd94604bf64d42daa0eb8d3f6502fdc5c2e0bd17d8cc3
-DIST firefox-68.0.1-hsb.xpi 527912 BLAKE2B a3e9604748ea4a8f8ea4b49f609dff79c38d584a5c80f602f8aa82ed69db4008934326b1a03d56dd41e8b9493f364196183cfe424e586aeacdb969c206ef47c7 SHA512 28ef95d6f0bac4a558e14249e98cbaa61e3d2636145a4068d48aae01c84ea300d8c6583549db8931e04fa6e2256e0f2fd8dff3538218c6f36252d0d4e7a721a4
-DIST firefox-68.0.1-hu.xpi 526233 BLAKE2B 0efcfd23f49d204b5e8da9ee3d5c3c1eeb86bbd0b2b7ec0e5e2b7f1e478330d26a223041d4b9c176c2dd282426d22e0e27a0d48d0b0624d74e5a506d5ec740df SHA512 bfa0e927d957e04d237b944fc385b9c6614763f444f044e33975f21b3007f23adeac8eab3acd26f6585c2c6fdf246b3f9a2bae8ac698900d98187efd34a98ebc
-DIST firefox-68.0.1-hy-AM.xpi 542602 BLAKE2B 9a45d468a38c19a0873926b9d32a6d4ea5cdd099b2ea316e516a2dceb666cadf70dda29f1788309fb5af5c5869c1b416684f5df8201deac607cff6652748ff25 SHA512 f9392c7b5b76b5089d27206d789866984b32ef08cacc6e49cd26a255a471fa2ecfa0b25277ce00bb8187659a2a2360236698cd9f95a1e17232b3bc5d12a87137
-DIST firefox-68.0.1-ia.xpi 496498 BLAKE2B 0cd8e74d46c6d6fa76305d95eeb6c75b865d1cd737dca02867ac0ef46c21e42bcaf3be111e85144e295605e261210aa4225fa37215a3b80037e78ad4aa753783 SHA512 8f1f25a4e293290ae5b8276541e5e1332a4601dc27f6bf8649ceeee591437f5f8c492700e854511ea15b5c2ebe4c6d40328e2511bd2049ba6cf7e635f52dcfb9
-DIST firefox-68.0.1-id.xpi 491908 BLAKE2B 4744293293a798a2dc24ad4f02f5ed2b6d34386e8a55aa5d5f88547d608bd27f0127589d4afb9b64565859fb56b7c6c42ca664f2255a54613017a40e424ea6d5 SHA512 89f3c6c2209c5bdbae2493d2295d2826de5362e4a1c6489d047db20891e36dc9d6b5213cdb7933077c8483d868a09fb23e14e558c3f0101becbd49c6f9da7074
-DIST firefox-68.0.1-is.xpi 499981 BLAKE2B 586f4d0733272bbaa7be371fb9a3e7ed8e7241217a09d81164b83f392053c0470f2b1763d2d2ffe34a5add3ead1757ba4ca6993010b09b76d71bda4d431cb4b0 SHA512 78baf05212b57bb50320a995c62d0fb1b819c85c0358005a6c9a2392b934240c2961c301491d9ccd22bac6de67a20873ea93a91ea0e3a55a2a183c5d43aa4cb7
-DIST firefox-68.0.1-it.xpi 383758 BLAKE2B 5d00e07a9d18686511cf4324227086bbec6f706da354cc7491511e8fb23e60f8e7096a8e1abfc928618a09a03159fdf63dc3db1aadbe32538437e481ec18bd0a SHA512 64b87cb409725da1f88a95b861cad09ad57a8cc4d292d0babc6475e4a23fba15722b21b0021e0ab0f41557906e25085533ccd2d4db73bb3abb5bde23fcda0380
-DIST firefox-68.0.1-ja.xpi 537086 BLAKE2B f8bbc756649001a92444aaf6ae96a0d07b3e340fccd14b535a1518669983659c586de05882c4799f43ea024623a7a08934408412f5de56775eaefa98d238b85a SHA512 1fe6bcccc52ff5adfdde466c89fbfecb2961741639b0d618c7923d518f97e29b7381620377a97cc9c4df394a53b14670d3ce508f131987e58e77f6105ee3d41e
-DIST firefox-68.0.1-ka.xpi 544711 BLAKE2B e88794734be026fe78455ca474031a40ecbc083a9b8c44cca257618d7249bd98b4eb86a413c3b6205d2efa013538c83857ad28ec1640b45ebedab32849cc466a SHA512 0cc2146c2b436e72c51d0b2245d8f8e3d38c782e0eda8a73679f07e06a04d5135c39867c82a807f536cd06cfe6aa737ccab2cee1019d836ed01ade0d6330bf3f
-DIST firefox-68.0.1-kab.xpi 508625 BLAKE2B 77d1fd77fbbe953d3e95188709e5904bb2b544fb91d26c8a2dd6c79789913630587c39cb234c62372bde8c960d70535bdcefffbca3adba70615382a476ccb9b0 SHA512 5e9e8ee6622006064a5493d7d37aa065acb82d3cbc5adbb738b75bdb0ec1861ad054d154c7903756624a075f2b204fe418a75d0057ac47c60e94f82d8a6e54ad
-DIST firefox-68.0.1-kk.xpi 578941 BLAKE2B 604da856d9114bce54c780a0a54c08479ec7bb088492e737ae5a715c4a7727ed9324254cb87e9519e73a72b50f49904691375b5c5e716cfeb4161e5a21caede4 SHA512 50072652140336bad9652eff1a9480495dc3c88e2d9e39906bc5f97caedc770a828c7a8bc752d6fd127290943bbaa794a118ea44c661c02cd80985f65b7bfa29
-DIST firefox-68.0.1-km.xpi 551364 BLAKE2B 5b113393ef12e7576bcce4c875d693aba2c45b9f47c6efe766f382c64f97705735c435e7cc842ee4c4a652539388f1683ae7375c74a2384f7ca5d031ed5b7a36 SHA512 271e77ab4f5f62e14e158e29c02fa18dbab1ab454f058484c75ea696703da1217d74343445fbfda0ec7a0c30935eca3f61e7cea81faea49823bdce51c72f2b11
-DIST firefox-68.0.1-kn.xpi 547722 BLAKE2B 00f8a99c0f1ccede2199d731700817fa01830e0e078db1c30c43afa5a3af04a38b412219bc01161d435986de678bd6583603f90fb84d853873f91e40490f30ef SHA512 d4ac151b381ab98c49b1c895f90f8996c5507bcbe1d30fdfffdd08eee20af641b69e583822b4ef42bb687536280ccb68c42bd246ff20af49eedf21ac393fda72
-DIST firefox-68.0.1-ko.xpi 535961 BLAKE2B 0c46806258cd20d2e0390b4674b1cb416f07910c3d80969ebd67ff9cde08a9b9cc20171837997fe7cd94448c30bb890213f88385b676901910c50bd682f96a9b SHA512 69b58573e06c3c13fb87a28dde1d9b7f2f7973211da4a8a7101ab576b77bbf5547ef58db05b2abf2153c45d5426e02db63f170278568e0186187227a9e42a26d
-DIST firefox-68.0.1-lij.xpi 482025 BLAKE2B 0735b3712a78b630c5d5d36b9ad91634e603c70dea3e54e84f502a88e36c6aa84333af2f258a5167425107c5927f7e6e054416e4335a3df7656ac726eda4b44d SHA512 ed8f2885a1697b7c9ac6e83858feb526eaa76bbad25c1327a02c2629d175db8dab172c549c21c5d347fe55b6cde450c3f3dabec1fa159545d96be07da8a951f1
-DIST firefox-68.0.1-lt.xpi 527577 BLAKE2B 5cdd9282b191a3017d7ca8a53506c17e59f2b480886c027eef2b8cb6d533ba1ccf86ea7526b0d0c1c60fe412fe02f2e047048e057c75b831f58da949870abdb6 SHA512 20482de5732c3af5025b7899b560c57532d7ad4966096b1c4642a7fe1b6c871d3c39abec57177a9b095b032a03b790975f363db2733792897edb33fe0a50dd61
-DIST firefox-68.0.1-lv.xpi 500447 BLAKE2B 6392bf9bd06ba40b56339eff41ea6637278029d9a8880083bec9b5ccbb89829fa15193a4ea67ecfeb7e6554b5a1e8f1575c26fae54336d94241a4ad0b70a34f5 SHA512 218be6a36168c481e594be4f58eb019dc5cec8954eef2a49d76962f9d18f2386a88c225a10067a6271a539d4e067cf641d399324fecb67345647055320c3fe80
-DIST firefox-68.0.1-mk.xpi 485304 BLAKE2B ba5f53b342bc4fc67d38a32101abbd45d7bf7624cef3374192c46fae1b192312f84e4a4f5ef442776f949bc1918f46cdf9fd0e33eb6820e040a0b09c268cb0b9 SHA512 b23128bd3ad0d99023df611b65a560ccb97da63c6e33b94c75479ce3021aedb2e093b802ed2cb0d96cbbb76a4b2e1788eb763453b7e0747187ba966bc8f627ef
-DIST firefox-68.0.1-mr.xpi 559167 BLAKE2B db769353473c7a5a52c58d3d67e187967a27fb13ed0c1ce2f499b872e6070865943bbb25a1ee507b02ef972ac7fae575b5621a11149525af4c1f91db62452119 SHA512 7d7fa49b0742a21a8a2d0544b54453bc9afd9e80c7e7457074410fc3eec466699f8ba6a876c5ca34b4f2ac171b69348240528dadcc596212dbac45b281cc0ff8
-DIST firefox-68.0.1-ms.xpi 480451 BLAKE2B e65538bd9b15ad997b56df189d0e85c3fc30d175aae32329cae36e7d7ac5591eb6ba768f7503d15d44c7ac3009aae5ef3560567d21664bf173d38fc2e6e3c054 SHA512 5af142771a4150d864a7370e692211ff57b3eb589408ab67223adeb05cf87da6a4bc1c892d231db2648af285c827a55766fd129df932fcf6d1fa61a9482752fc
-DIST firefox-68.0.1-my.xpi 552159 BLAKE2B 6089f2557df02e86abd654e0040824e98806a6e7e2d3cda1efc9b4e8d15f11a0095c121d0b916a2f55f2c0245489a8e9700186e44e2792feabfc62adc559868b SHA512 4763edad15a8d5481306a0cda7905ebc5d0492a25b604e96b0de07a5892252e1b019f773abbc2e5eae4dffbe02a7ce03d8217f84dd502fce965a3a3d4c3b0414
-DIST firefox-68.0.1-nb-NO.xpi 496167 BLAKE2B 3440a973d2e538e5c43fb5e03c09227abab418e796f16bc835128678b25bf3733a1281684c0cda74d4e3268ce0e49e7612d1f9b30e8bebde904a802a37dbeee1 SHA512 92ca61e222869ed95183ae3d9aa6fb1749c4770e35841a6c0ac570b5ab8281b474f2d1692c813ed5b016dc87ecfb626ed7a920c60acc39e6600e62e154f0a4df
-DIST firefox-68.0.1-nl.xpi 492178 BLAKE2B f198ad767ff4ee01314d7b331dffe5f01931bee8f964acda3d0039a0ca3f8e5c5f9a0cb08b3877a3fd571182d559afc63b69ba8c24afc1250e0a42d3d462fca1 SHA512 d0102eac017b5d2c7ab4e3b1ad395ef8c1dc779e6e25745a80e94ceec957c1b6f258ac1e2081e8ee05298e6585309cb8d074adf0893f182321685436dd39c402
-DIST firefox-68.0.1-nn-NO.xpi 494803 BLAKE2B 3dab05e6dc3e5b56219c677708edbd01cbb725b1aac72b43cc126495ca9039d527a73d6c77de525be4ed1de7c6e40af131044c0018cba54132099c9a369505de SHA512 4dcd1a45613690294bf3968f3c21d42ebbcde3b31b5c3fa2e00ae88b3dc59d00a150efcc4e96eee5f6db17bfbbae256c79ef906352c745ad3aff5a07e2d981ba
-DIST firefox-68.0.1-oc.xpi 498792 BLAKE2B e9b282c5f6f7e5bc656dff3abc66b23344d46121e56b7f896eda3fb29a5841a8f50155ad0a28c3955743793df381bd9086ed5e63a7f8f9ee7427ac742f0e4d1e SHA512 523a7aebce445622c9c4bcdd849487eb204728c164e16ae685d70c4bf02665ef1f9145007ef11f5df36fd3484b1aa956a6ce2a29c2cb7cddaa0d75e36e42a286
-DIST firefox-68.0.1-pa-IN.xpi 542691 BLAKE2B 0b49bcdff7846e9de75a2cd7f307112f217f91f6cd9adb17e5b9f31782922db9be3251586f3132f5a044e6100897657c5c469bf63c4c6a68940fd542469281b0 SHA512 c5942d334a7a513d0d4875dd3e983a5a2be276ac07ea2553044784c06ef90e7617463c5e2005b437881390c24a4df17e70f517517c3ef30a2fc369ea4f50773c
-DIST firefox-68.0.1-pl.xpi 495825 BLAKE2B e3a23bbd12d6a7df4d781cb8f81a9409c7375b278f6ad1854c9a49cdebabcd65cc7fc84a0945bfeccb52536ff122ea3b32786bf0ba155fed55bb756406b76388 SHA512 7a496ce7bfbd4026426eb75070d1163f4849f0c501127b57201975c68d9bd59413b8ad848d47c6f1481adb721246e68c56d9310fe8e4c792917023150f905085
-DIST firefox-68.0.1-pt-BR.xpi 498232 BLAKE2B bc5ad72041978242f289a3fbb9cb75f30f2a1a7828fe9f72a4bc799e86cf67ea8fcec2aaaf55e40fd7d338fca61f494fbdd3cf070d5693c67f53b58818a33ebc SHA512 9235e25478ecf10ce883c1353b7ed1d815e1574410c59419dbb2eeeeac02dfdb3eab1040f4ece75dd1cdaadb7c540dd474498083c3e53c4480bc97acfeeabae7
-DIST firefox-68.0.1-pt-PT.xpi 507837 BLAKE2B 974473566aa1a91fc46daacfe511301840d446c28ce10418bee95ad06a876a8e20939db4f69c70f22f340ad4a1d2e08e29197973d9a436e20ea653bf3b78fc49 SHA512 6c28d155dea8fdb493b22173ea489776f13c7af28b9764da729eac8622ca52a144e4b1eb395143679cdfd60622da955e6d4be572d3bd1ed145e71e680c955b50
-DIST firefox-68.0.1-rm.xpi 495512 BLAKE2B 68c1c9daac5f6742864a617a6e6c2935947e635ed84c192b90288bf246211e9d12392fbe52aca3af9a2491a4a013ee046f519cd8cfd9e66612e71fe9bf9edfd9 SHA512 ac384e21b286068b8cd64fb641301677d6013e128f516dc49733ee6f7b373f2f1f7552cee226e5243e33ca5e8cc014c386830f06512660086a76a2a223e2f749
-DIST firefox-68.0.1-ro.xpi 508798 BLAKE2B 3868e7e3500b26f78a854c1fbd692ad4976868a415bd51c9f565358a32cc82177ba4451716fe54eb7b9288e740b0da87d063daf5535da3eaf805c69337d0af48 SHA512 914cb4f8113a656fceb53b9e3aaaafa29c00c15e513a6bc077bb496fefc12750659913d2d4e97ac2f4204f3a9db99fec4eda32fc3a9822d300d921be2a2ebce4
-DIST firefox-68.0.1-ru.xpi 583986 BLAKE2B c5b5d67f54f8597138ed115304e9b4d76cb3e3b780b452f223d099c579576a55866e299548e00003addd3b8f84c9295324a9e39e82b5ca8c1c364a5f930acd55 SHA512 e571f19f2d8fc8d2b9bd573c7431f56abd606a16654fa6a9ff3fc6d1a8c8dc94f08ea278f6f17ead868395ca67d65d14c720ebf92852d0eb734a6f40b0d7d240
-DIST firefox-68.0.1-si.xpi 528251 BLAKE2B 4a26c8c254b24a3ed5b43ae34bb8b22c5a0f27ffda4f0971007e4cdf4bc67521619e6f7f5a129fddba1333806093e162ab9da54532ef1641eb5ca9ceabdcfe7f SHA512 b8c61919fed78345d5b51425d3f855700e5f9f51e437f6af76a6e52e40774ba574176812ae28eff3cb64e497b9389149489152bebf680d05f06a05f01895f4e5
-DIST firefox-68.0.1-sk.xpi 525290 BLAKE2B 15eee14dde66facd71b550f288083aeeb7f809852a6bae431bca1b2a0cc834b0c17197b6463d905b8608e1084391942e754976916c96caa186d7a917aa1c596e SHA512 41476877532f80d4f6f9db13103b6923068a88a5659436409cb7648b64df35b85fa9a76cbf256cff5ef75d0d0ffb0c34178b0d4c42294c13429a7c8147afb406
-DIST firefox-68.0.1-sl.xpi 502403 BLAKE2B 284a66cc899b5e5223e89eb819aa57905e9186fa06590b1741999beccf0df7409fc5ecd5df45da97ca37934008b73baca487f201b1afb8667d35804e782880f6 SHA512 23b491c93e8a957412256ca3f6b1c2c88c624993666f6fd4fb31a10af6d9cda10b13611fb9d9747a18a70ec9b9d44589f6856856fe51deea2e5896339b17b042
-DIST firefox-68.0.1-son.xpi 459043 BLAKE2B 62820482473360f7f850ab3253e450efd6c6b4de21d490267585bd34201c003bea16f73c88a13e885d33f93a0119aa4648a80ce16b333b6eae55b39958f87c23 SHA512 a958c8986b9c621517985fadd45f669679a754f5231770870ba3ffa259268686381be7a5447cfad629e93878727ca16fa7cb0c48525b07ec00ae0ead51e3a986
-DIST firefox-68.0.1-sq.xpi 521608 BLAKE2B b13a654e2d782d835b5d38d70a8350181fc2bdcc711fc5ad7416418da47908d96779c29548f95893b89945fee2e6ad3f36dd3ccceb2894569ed6d2159e700442 SHA512 4b0108c980ea7cccf85319225aa20304debb41833f3b5fe165a09d193c3744ce7847c4e209c09e91ee93c6bbee2a56093eedf5620b778391f5343f908aa9900f
-DIST firefox-68.0.1-sr.xpi 527524 BLAKE2B 26c4a8dece531b6ae9c408a3e07f9248c8586fc8f049249059bb2ac0cb7ba6359da8e4cb9b08ab28e34c4ffff3af993cd0e300d535156afcaf63cc0ad8537e42 SHA512 a8c3a5fa9a25bcef9b4cf9956a57c773a4ad2264a0e66271ffe30de3978985edd43dfda04bbd430011c755b8576979c7bf8241dd85a6427bdd54b1022472d41f
-DIST firefox-68.0.1-sv-SE.xpi 506892 BLAKE2B 40aa894089a25e8427c0ebd5abcf2d89d2574651dd3321bb9d33407facd5f0cb6198ddd6763f15ff88e20c2c1d12bdae53c3c6dc0e6a7ef72f8797a5b667c80f SHA512 bc25426473e6ba9f7323f2a1dc37411c53f72d0107edf420474ac00621240ba9aa50da0bb444aef3d4a89950f37572fdeea655a19776eb960273a9011a7b95e3
-DIST firefox-68.0.1-ta.xpi 549366 BLAKE2B 9531fce6432197965ce2df72d3290b1420e48d44ede59c9115d7be7383dd7c448239aa2e50ae078f35cba1d22b91a69bcdbd9a25def739c7b3a41dd763b6ea09 SHA512 d731028f965d05172c41d80ba4351c75a829c5b25624d1a42bbc78bba17c890b1a3617f6a811fa6e16e4e755644f456de13f7ca375699a796521868dfc0d44ca
-DIST firefox-68.0.1-te.xpi 561718 BLAKE2B d4dd0c252d92edcec719668f2f6d60fa5fa06a9c1ac71b4e78100fe7776ef489143f553305f2bb7e161eca934d24c36ac81032dbf863557a57d8a0df99f997bf SHA512 0894b855c5f2c22fd1aed6de877d94e3dadab032357454a8d88afffaff0d2247787049958fc797ce401d1104ac27b99d52c6f35509b53336c5703fbf7e2c0a05
-DIST firefox-68.0.1-th.xpi 550949 BLAKE2B a78a44e21836e03c206e2617ba3d373221b9704d5baf4fbf592ae7ecfed14d87286829e1b20ff3ee8ecd5e45aee268905a352d526fa8498838d4993c2de957a5 SHA512 8f486c00481adf87110a5f59a62fbf60854e83d0cdee332ba462adcec5337a919439b6b9aef6cc707ac709b467e60f84f3141c5d8cb7702641a7db247559db8d
-DIST firefox-68.0.1-tr.xpi 515300 BLAKE2B d55e73d9eb2323d86b83a3728cf5d100e2643b61924d5c655fdd91c359d5661ec474f78d5a4ee48c4f3e76a7920f0bfa90c943b41c2e185ce12b6578bbc1daf8 SHA512 acfccf17b56b8d331f69c5809af489487b39089e5420fa2e84dc728109a185d3e5e25a900f0d04345bfbd1bc726750d1e621ff908be0eb320d3217b7c92f9f37
-DIST firefox-68.0.1-uk.xpi 569040 BLAKE2B f573aa9b52f41ed92951197a1e18a7425fe8d6ddead6f16e9ea1f8acf6818e884f3083a2f3bfca1a33a8d404772566f24b0927150629ff99de90a3b5ed8cb0e8 SHA512 df861df0aa6be490abc7dac794c653d7a227be33f9794bb4dda1e5612441bf583ff40f53beade72e6f4e30bf6722ef5707ba513b8c29a8d1eb97b6870add20e4
-DIST firefox-68.0.1-ur.xpi 542512 BLAKE2B 0523af4588aab8f39d0174a2a43645d523a16fc40264af309409e55f86c05d5a610f53178ae603c8d04ccfeaa1780cc642c4229189ea72482ec68c6cec078ed7 SHA512 b4dc8dbec03dfb02267680fd4115c7bc13bff4a851f5734efa4a42253bcba248777c2b5d58a6a5db963cea56433926481d2736088a5d4b6915d815859c834460
-DIST firefox-68.0.1-uz.xpi 482642 BLAKE2B 6e5cb6353debb4e4b0201fd03b8fb76e12a765847cc75023cb0fbf516d096a1dc3751cee50e53c349b0d2211440f1b126116ac8eab4230031b0a3cc9e1461b7f SHA512 0c265d6eb8105110596eb0ba121db4534b65446523893d2c7e1eb464e8861857e78e38bb30f88ab3a7400806bbf0b50fd0e25a36d87d76d21531728ae276bb07
-DIST firefox-68.0.1-vi.xpi 529339 BLAKE2B a3a2bea7361994439ecb1b6ca4ab2738c2158e65ed1e6a3a3d1a121c9c13db6d099d5d1381732e301d09883f450520ec2d0dbdc99e2ffbe44c31d4d4cb2c79fb SHA512 4e67e6c37523d60df9e6c3daa2543ce524cf17a48e432e9db961d5739f8a210e16f3047569f1be5e0e82b4ee57d52a0f7cacd7a21adf906d2a58d74ca672da0e
-DIST firefox-68.0.1-xh.xpi 470576 BLAKE2B 65ec7eb7e66c1c0314eedbf7df49a46755f58d621e5a9acd4470d2a51e2ab323d0e41f5914090304ba18df8cae97bdd8068c4abb867de18ab006d0b19db74130 SHA512 1d63238f8932644955b57cbcd942be35177db92765a944485f8f4cef1e238bd10d47dae9ae1375b54caedaf929083c7ec2cc51852bb7b623132c273e3d644608
-DIST firefox-68.0.1-zh-CN.xpi 536603 BLAKE2B 7d79c0702172a7fbc818474ab88213ef901ebee62f96bbbf7c6946dc84bce716048eafe2ac38efeab063d9ab8197930a41d6a5dc43d3486bd6446d679e2fd42b SHA512 bf618fc9166a261238f95f8a7a3f64929a7a0b916420529833d7c8566c1bb991641ac7b64aff0595c6d9d197a3d7c0678d09ba8752528163b94042903d823b7d
-DIST firefox-68.0.1-zh-TW.xpi 536124 BLAKE2B 6647d8c95cf953f9df57fbbc15f0e966c88b222cd80f4dbdb435c2b391d11933c375898811ffb80720f6595125fe91ec0c67fcc66f5ec5c0ef348114f830f570 SHA512 3e1456dc1d2bbbfc780df6cb7078314bb810db1bdff2906239d94a61aeaad25f6ce8760386cd6868aac479f729d611093abeed3bf1cdc33421b5bcfeda088826
-DIST firefox-68.0.1.source.tar.xz 311390092 BLAKE2B 19eba46eb2ad491f4799b0cf2e1da790df102fbdbde88e870939f1d967747def3f4451d52c35b308d6b69b86d10a29cbfaf9381ef4432fd89fef4b4c2a291b6f SHA512 96b45135cf0b2368013afccb8c375de54d591a4e11016e8b65fc83904cedc362096dd15814cd02be23f6e52e392c605817b86a59ee2300d3e7a754d345399c81
+DIST firefox-60.9.0esr-ach.xpi 512788 BLAKE2B 155c72980b4a0573f2d4e2d80f1bfce095bc2aedb6ab265b2fd4aa35046c0a91ee64a8f00dcea957a7889133e8969efdb49c76dcd67f7a8a0e6b4532aeebab0d SHA512 59980e52d51095a6dfff48044fc2a1fd8c237f251dc1dc681eb0f799700e1b4d08c10862a34a77a41a6d5b90cd96ac6271af6ad63c0d6be815c0e687d6218ccf
+DIST firefox-60.9.0esr-af.xpi 503031 BLAKE2B 74cd2d6169cc455fdff7a93d8327388f8247375bc362b5f0efbbf3f2fef80a05f73c3d761a09b427057e8de81da3b8b4bd2a551d4f1b627a4639bf3117f252f7 SHA512 5187dbbd3e025ab7523377f262e02a7ff9a83091b657ea7f22da85de78a71a1f839af05a6ec38aaa2b1c38254b9cd3b95e1ba69dd1ffd6d71919c63e8b3dd469
+DIST firefox-60.9.0esr-an.xpi 536226 BLAKE2B f110e39d28d98c916b2b74b05c634f87a8ccb52b41c87931eb2449301d723af9b2703be411e2ae9506138bd0f9193da315d511c207d9030efb7bf926a627c1c2 SHA512 524e75c7e186aeffb29360fb6044d334d37e0e0495259bc6b12b43c44566a26159cc04b715174ad836086e4950e0f012ea118aeed33d8cca99a25b2a8872c7a3
+DIST firefox-60.9.0esr-ar.xpi 563542 BLAKE2B 448a7a88254bc27922d30f9a6c4657c8d2f6581baa3bf976a73cfab1fcecf919de7b77544ec83a128c622d11815c26cbcd2f56196245aff1bc316308b14cfad0 SHA512 33ee7cee0b06ec8930dae61e5b3e48c4c1e51fafbb127f756e88809f8ea83d97f6fcc154d78d26cb944230d0a80c6b3f6a695300d81aa2cd8f0c8fc226606e9c
+DIST firefox-60.9.0esr-as.xpi 546437 BLAKE2B 7be219893258f1ecb3ccc27b85a79d968b6ea35986fb74a5b23a9e711de1aa23057d2a49dc9d163c619607b188b37f1094f31920bde603a3c6dc615ee1194bde SHA512 84081960df0e6fca213bb86af690d7935834ccbef6cd3ed2b8aed220755651a7b081c37e3570cece78658e199a31215c988849f46224030bf21c54f5c083bb3a
+DIST firefox-60.9.0esr-ast.xpi 524607 BLAKE2B e6b78e54119a02a8b58927ca8cfd4030d9b099326750622675c27224c469a3e0b1f4c5614f1eb1e066e09373d073a1721ea3680d1ac0e1a1fadb98d8fb7c0255 SHA512 9c5d8697abdb12bf7562880d02d52bb7329f9ff715718835b600ef8138f1201612fcd2726fc24b11dd27561d74134527d1d4bff0fc8c7ee7ac4e238a6e185d35
+DIST firefox-60.9.0esr-az.xpi 540469 BLAKE2B 608a0c8883df8d6aa553497a3189cab73abac231df19bca142628160c63cf750c6d92b0934ecc75833f00fa41914d198e5d27ffeb589503af721b3727938ab33 SHA512 72cd3b8071d9e5a2984d688283e431eff677b5f41dc0a77cdbaabc8a259e3e5a1ebbe734cb4a0c1e6038c8fce8adcd6d9f244122acc049dbe84f5ecccbb2e2f2
+DIST firefox-60.9.0esr-bg.xpi 589576 BLAKE2B 458375e0c2ad6fd280fc1e548cbcf22f6b5bfb47fd93598cb630742c6ff4d9ed1dc0963344329b9817503a7af57ca5eff582624db4635850b7125455e10bcd65 SHA512 ac2c273edd8d1367e5b17b89bd8edf993831bce9623db1ff3e3047bdf784a4c0aa27262786f7af03c9f292d36cc2c4bbca9b33c2421f6ef4a4bef945c843f887
+DIST firefox-60.9.0esr-bn-BD.xpi 606817 BLAKE2B 04699643a433dd6a266feb07f9ff4f6f7335e46af808a36512fd85389ad7a17ac4016022c51c0fba6f9bf0b855dab0e4c6d1be0e9f6045f2eed81b39453a396b SHA512 351d674efd9acf3c68f8c2f96c7325338f402a49c3239b709056592bb43840c8c9f0fcf302cbc9c9881d21e55e2552d0cec72996ec278404e13162047f9b815e
+DIST firefox-60.9.0esr-bn-IN.xpi 587255 BLAKE2B b2f7b13ceae7f7b119c3f358008ab2b4d17e1473fd1eb445a99a201a2a4759c6c52d444571d9279455bfaa3466b30ad5ce5087a7fe7645b0d11b25acab3df901 SHA512 90d0056ac6ad76d7389b777c69d89fc6d413b4b5a543e57b1ef8dc1a5e1e327a919fa23d9052a277410b1da788150d892897a7951ab02cf39b11d293386a83b3
+DIST firefox-60.9.0esr-br.xpi 527757 BLAKE2B 440a43a28ea01159d924e72ef99254cc442b624e603927bac9d7d75541a8bf1317bc61dc56873f44bb00d8ed81b77b74a33fabc32a7ba24dfef024155c959cb6 SHA512 9930acc0cfc501aa4059bee95c56990427b018c72b1bf5de86971fc027007c53baafb5efe7363279b7db6a1bceb0b4692e5d259c133b67f6956ad2cb4dc91d61
+DIST firefox-60.9.0esr-bs.xpi 530426 BLAKE2B a8127345707989cf78c01dd32afcc18817f81675089d0ddedeb8a6da49e45b0520a1986fe0fc742c70b6e0f5aeedbbf74935819972e86789f1507ee08c4ac37c SHA512 6cea1f3eba3f9b75f46c4d215c72c55742bc17020503c8c4a721ab9e7ae1b4b36112f3b099ebd5cd7a57308e6761521ad5d09e7a5c80cf92b23ea3255fd66fd9
+DIST firefox-60.9.0esr-ca.xpi 540990 BLAKE2B 97fc19cb1634787f54792e085e7768f41082d6427e80be42df8f9d9d16ca74c7f50694a4bcc65029c8d2143c6eaf44de93f967028ddea2bd811fada91b9e5835 SHA512 02497c871fd333a4a4e2e4f454e7a2312f218999a5ad8c14bacfa9541ca1d3b25dc0c21d01b706808374cc2989e3f02053bd95a86f113a2c1d8e0a63be32de1d
+DIST firefox-60.9.0esr-cak.xpi 552250 BLAKE2B 9acf359b7548db8112164775a34d7e6067b3322b541caeaecc3b35623f8984c7701a5b0684c228f7428be1fcbbb24008db52dab649cb9816a4030bca5f168505 SHA512 a251c7c4530c32881e7eb55766bc355784c1e9a996b5c478ccf58bb41d263273ca26f262b39b52977a877e83a64086cbeca3a19ffb1916366db562d97552dfca
+DIST firefox-60.9.0esr-cs.xpi 547514 BLAKE2B 116daaf11b03c97413cf35147a4982e30ebb07e9a3d56c7fcd87014c857aebba00979e567819d4decd51545df42f7a3c6fdb3049f3db450f17ab3786a3f304e8 SHA512 e3d657edd0bc79b753eee96d07957bf1fe21ad94a22bb477cc485026b2f4fa3e5b92da1ded42cb07aa1af7533ffe79eef02b08f3ad3c15a8e74eb2d8ad320507
+DIST firefox-60.9.0esr-cy.xpi 532366 BLAKE2B d705f0eb9ceac90c0f4f80bd1fefde31ef8d13a3d38b3612f8a8037bd3f8ed970fa2817e2c14d125336edbb304f197816f658028c09d58a1de1c46a94a7dafee SHA512 5cd44136c1137f6c01065cf409b415435d65e7e80822d1e8f44d98cb8d498836bee64bdbd4ae66fe7bf474e18db23997ec42ac644099bf7065cb6d2d9c0be5b3
+DIST firefox-60.9.0esr-da.xpi 526479 BLAKE2B 09c754d309d62a46761c30392304585932bbf335870379e8a2fa60dd291decfe0f7cfcacc8ee543ecdfe989730d716639e37fe2845a77bb2ea7b77eedab99e99 SHA512 9e98b7daa7d9e661b3cb5710f0d85714bf66fa7bd23cd8d8bc35bcf1cf96b995889c44ab291e2f4dd25a96f0e60fe75ffa64cc8ae1dd6231de9daa90629ae922
+DIST firefox-60.9.0esr-de.xpi 542253 BLAKE2B 02b2b4dc7292b5b19c1d63bf15d4546c83dc32560fc31d60cc7809dbd250b95cb891381ccc1c15c366d06a5fb745dc54bb22a88be5fbd06889155767ad61abba SHA512 5225415f90d32a535eedd2d3d1a730d9c0552f82b1b3ea57c8f50ea8b48dc36cb34eca9da4d404c0cc13434b1717bed200188488754e2fb2e176021aef9b8c98
+DIST firefox-60.9.0esr-dsb.xpi 555476 BLAKE2B abf9024f9ff8720f9de22620c818864d6c019a33b9067704bed380f5f53b5c9a5e1db7ede5d3359da5d8cba9f3043c828df546a87cabe001f2a735b40f09f9b5 SHA512 79e3560e0997b36bee0b8539b5906115ba0e5acea9af874e6fd623d255b9d2ef4c76214365b12f54f1640e60d6137c57e54dd14d6d8898aae064488b791186f9
+DIST firefox-60.9.0esr-el.xpi 609423 BLAKE2B 4790d546c71cc62cb459b40d93617f6dbfd0d6e8e00358767095ab887bd76ad98caaa10432bc6513cf4101924d4ec486a08e82941db414389259df26b1054d4d SHA512 9581691d4d9a908894eba849f7773c2d4d1bc6616f55e56ff848a90205a10c2b33c5e72f455d71ed85d55b8b6fbadea5e9f6b564807264b8eb056a3b3d483335
+DIST firefox-60.9.0esr-en-GB.xpi 508089 BLAKE2B c4e6436d8e718f677a7b0f15dbf85d61da10317cd16445f5211c4eab64729cb6ac41d7c5fd3aa48d6668fe0de0b7e9c1b8b018c20cb7d0f4b01cd8b7656d7854 SHA512 79e9ae89868271b5de7fde1c1ea0932fa1d2c027e62c9c92a7ac9213b900ca29d3232db8ae66cbf9fa3bfc5923b014b132b24800aabc0fc33a55461e2cb1b3a5
+DIST firefox-60.9.0esr-en-ZA.xpi 491066 BLAKE2B 3699ffec61649dab2f145b669e08e5b4b67af31436a5983364112f491b09925c21b01c8988298de6dca9e06472a2b3fb469129c3c9bf53f03343ad392629401a SHA512 6f38cb6b0a9a866272cd5f5a063ac4d5c2c8f7246fd4bac33d71ea828bc4ecfadd430abc3ca39c598fd3769a0d9335486d16fc5e2b658e15b7d4b2e6816c45da
+DIST firefox-60.9.0esr-eo.xpi 526982 BLAKE2B f1f808c0aa431242ebc655dba8a03c032a05bb89062010e5e0c003f84d95568ec6d5829caecd22f5a6514d316dd2d609b65b8855bdcf6fdb3c6ce0e3f4a34a54 SHA512 67d06a9bb60890ff5cb99274be77bebddeee2554bfa37b3aa3fbd8be9c22e77285e07d4a37b095891a1194e69cc8b52dc736821b8af856f7fdb273a51bfadc0e
+DIST firefox-60.9.0esr-es-AR.xpi 541043 BLAKE2B b38b6f5fbe1aa7a6d8b72287ea561755f18b672ca9a3c9b805713b350965bd59cab9ed6150e737d7ba493302560f1bbafaec8975133fe46e0622b966ae84cbe9 SHA512 7189c7122ba3721ad1980f5cebef9c0585c107628ac384b41f61faacefbaedf782edb8a387bc40814842051239ab9990d39200b71c3a03a29198cece0e084e06
+DIST firefox-60.9.0esr-es-CL.xpi 543730 BLAKE2B e1ebf2449ffdec2d48e48b63a5e88434f182266d419fc580b4cf9520737ef87d7076ebe1b95eb62b8d1abd1283516b20050230884f750a8554e4a0d81d7b8565 SHA512 cee9756d7925352a4e47a88d0ad5d5550ea362ec1e79c964692894f52e542a3122857d3e13e5e3025ea0f39329a75af0389d6d9820b68d984a3045ec33727060
+DIST firefox-60.9.0esr-es-ES.xpi 476369 BLAKE2B cd3734640c19707e2a825efbfb472339bb79ebc93cc6c0b549bb9da0b673d9b579ea7b024a181124d3736819e49c20d799a4b336ded2482a6bf2eac3ecc071ed SHA512 85930a7a73c0fae9cf527a661ea0d3883a9bda1aa7b89e0d1325e04e58e7644a3597e2d4e52a6947df17178f12094cb9272727cdecb20506aebadc4bf80cccd5
+DIST firefox-60.9.0esr-es-MX.xpi 545044 BLAKE2B 55a1d88dc31186bbf4900837991aa1ed053a1c6a551135eb4eb8b40fd66f10ce8664ca334fcfa9d17741247fe98b7a75052f65f05e48037f2cce8ee32b986c64 SHA512 142aab032ede44234b7e447d53cf1c8304db22303638272912412c9ec01b5c52dcce6d20f6a70b1dd751b2e5d7e015c626c14829a9d224d8b4010a6865e19ba7
+DIST firefox-60.9.0esr-et.xpi 520689 BLAKE2B 1b743a6c3e658db5abe850d8697905c8010ffccaab572378259af7e0af1a0708f676bbfe5e5401b53ef382e19eec805d2904a1a6414180db8111814033257f59 SHA512 42a4d6e3852b1263342966b6b8b7126758b68c40d94609431092c0c06872b53c4c45f96d1e85f47cab71d07692b3fcbf8d16d002e49e3dd6acb95b9dff19cb19
+DIST firefox-60.9.0esr-eu.xpi 527432 BLAKE2B d3d66b2a139c9b148172e7bdaddc207e3491c4ec7deed6997558d6bf323416f6c3d809d5dc5c571ce07cf59e5d8b00d6e4e5846b824f1cb7541c57a0c93ba422 SHA512 c2d7840505922e8bc5c6efe2ee1d231b21dd7f951956f86af8c773c9187fc879e4286841672a903bf16d02236cb827f9f59578f598cc4ec39ac325731874bf1f
+DIST firefox-60.9.0esr-fa.xpi 581993 BLAKE2B 8c50faaa1f3797819efb16158c893d1e87ab0aa0da7ed99f8fa82f0647d57881d00e8503954ffebe697214a433febc89f83755bea856c633880498c8f7b18600 SHA512 c31e94c95b8a5b4b03a914c33903fde817f194156dec87cdcd59ed59438cc69eca957be93e3afa581a117f720f41c12525da5931d0ce11aead672421efc8ce70
+DIST firefox-60.9.0esr-ff.xpi 527929 BLAKE2B 8156345c34b0726898244f81c8c3f0ecd63dbc873c627790c6100408c0bcf62f8ef602ce359cc54014e986f0444e83b844268079de885158260e7d1b9132711d SHA512 2651980824353a804fb82e85ba267dbb5694fefddf87ed4b226acc9a156702a628b1210a801e0c9cc8da3714751ab9f0908f1e75314e1f5ed0b3bf49e27cbbb7
+DIST firefox-60.9.0esr-fi.xpi 521913 BLAKE2B a7a861650e375eebf594707e71a0a7b89db557aea415ddf4adf1b4364732905d14192a335c27d4ab4b3136da81912ca3a63795070b47cfe97b2b6e0ce370e055 SHA512 b11944da43e696ff11762a49224a40b60071c60f9c9c8c3cf80551b1d5186fdc323de345572610feab425099971813ac4b83ef0a16dcc7c9812bb8f0b2d91b1d
+DIST firefox-60.9.0esr-fr.xpi 551796 BLAKE2B 7e8775feba42625917d9382166f8079f41e83b7618a10c9e485a89ecc9fb70c2f819a67a167900c2fcd93f99553417fe1c10822602c2753b55c479b7cf6fe6e9 SHA512 41e0cdc0391c565e6a73211f46a427556ab69672b8d954c9610a08ce8d33d10d33f1999907a6df8a017dc610a173586b234397a2ac9e75e896be66368a24b287
+DIST firefox-60.9.0esr-fy-NL.xpi 540915 BLAKE2B b4554df17db9178c0f28d32e37c28a60243c75fe6a2e6b4374f4408f2a32e29db55297735187e2c26e680123ce1209de47abe1e37503266a729d59621a2e17a4 SHA512 71bf9bade61badd4a907895b8cb98e1c0a581230c8e872880dcfd2a56aa8d72c270af3298f19161247b3c22c956339312564987d32d54e57abf7e90e7ed210dc
+DIST firefox-60.9.0esr-ga-IE.xpi 543377 BLAKE2B 74e8115a4f31c47e302d5434ab3c273ae4ef5627f2e8f6904504b69cdb824b88292abcb6302494350ccfc4272b0b0ae0d074a31bb217acc10e10af9dbfdbb18c SHA512 69c26b3e346529a36289a6b215f44d0f8ecce7fa38020092bddb61c5fd4407ab19bb052d817ba1b33cf365ed3a9574e0f1a87bdc8985b2d8b610fbfcf101312a
+DIST firefox-60.9.0esr-gd.xpi 536588 BLAKE2B aaf7ba835faa933483fa85edb74e8f909907e84fa8a27facebfaa811d661d29a073006fcaf39d00993ce2b402db2b2dcbe903e3906e6e003fbcedc8052b77032 SHA512 259a786faccff9749e8acef61d5fe9bd569c954e23176d0be224dcb627313db35ded5cb92e7a791c440af701b9ef1364cf9f35d3598def57b2ef1e0cd410de04
+DIST firefox-60.9.0esr-gl.xpi 513086 BLAKE2B 68a2848c828b2d655eb229e97f475dbc705b78a09e2edeedb2ed184a3294f42f91baefd6d1a64562a140b74b8cc0b8f34686046f0614b0d07f29163110cb1b17 SHA512 cc8ae70c8adaab02801664bf2c601fac6a23204542c3333e38fb6e70dc8cec2015840edfd1d0a70226a5834379a84fd299cf2dfc92854c3c2ca6d283f3ce47c5
+DIST firefox-60.9.0esr-gn.xpi 548926 BLAKE2B cbd8e30bbe4624199dff5d4f11249ae779dfc90e98b56020e95ac12515c2e18417771ba603a06d754248dba3c520afcdeb66095db27ecbaaf717e12dde605b29 SHA512 a71fec710e75f09ff56836af9772145586f2c8af3b2b41347291204926be20966d0ddaf97a84fbef60e8d084bbc0fdae2852df8539f5456011cf00d4e937666d
+DIST firefox-60.9.0esr-gu-IN.xpi 606672 BLAKE2B c345d34ca6cf60a9142be6aff771e44b6e93722f0e3f466d1c8d1baff85fe3455be51eb38334c31aac38b97592dcab97f1b3b09e855eced7864ad32cf8046ad0 SHA512 9b09a3d944fe9a6d130c3f41c4f9eb18d5829aa9e5d64645f85b8e443159c219e484dfdd317b87983e6d455a6e755c280aafd66fb4fd30d2b0edc82f3dd93fe5
+DIST firefox-60.9.0esr-he.xpi 551703 BLAKE2B 367d5eafe2080b7945e2565ac0c902d8480744b62c96ed72da1e1c2ea76fded6d70bc272ce2c96b73c72f044ebef14fd8f1e557e8d2f274d599b0c8da0a272a0 SHA512 2b333273a72724ce9f19c82d7b77930736061400c2aabcca1ca8851f51a71189d3f05369fb4688c59217ec682ccb885342880ceff002b4c4927afaeb52129c87
+DIST firefox-60.9.0esr-hi-IN.xpi 607256 BLAKE2B d8b0aceebce03d37c34e04fdb3e30f5b99de4c11cd80ff04742d69c3eb4a92674980f58e360d0ff56f72467a1ad836bf94b0a7d4d30ca33f6ce0b9faafa275a0 SHA512 1d0392531fdd19c5b02f4407638e4c7596bf81289465db0f6a9f117c3e044c62538ab65ced2fcc2ec2c38c83f3b96e35370c9c3da20be295a7f266575814ece5
+DIST firefox-60.9.0esr-hr.xpi 531679 BLAKE2B 98fb68376a62a51bb0b83517cceb91f6bfb64328b6715b09c37e5cd49224d7225c5708ce602b343e5404257e76ebce44986840c55b4cb29f8077ecd9741659f0 SHA512 e952b4c7ed8044c79323e33f3874df8568669fd250996eeba182df4d682e29ae338fb52acb2171bbd6836fd915fd3b59ae1f32e549306be46e06ba575e140402
+DIST firefox-60.9.0esr-hsb.xpi 553014 BLAKE2B e3726efd8b755c1ecc11647db683099c44463102cba544eb206c031c79912a92d2c9ca027d3de72bec35286700de508e5907e1a469c2fd945e3665dab22fe735 SHA512 4057926b10b54ea4b72b1ff09bcf3ecc14b30c4b416d7724540214263050f3d2250fd75dc740fd5c149a1f036d94f6a27b3d076d28373b52f7699305981355d9
+DIST firefox-60.9.0esr-hu.xpi 554135 BLAKE2B 5ea31669cc91d27983b7421316e4eea26bb7b54bb60ec0c8d34d01650b11ad0f78928afb0945d782450ff0e79a901724dbf776e68dd685111f3f61a32ee1a52a SHA512 9e82fc5b8cd81f64ef219f5e33fd334c6f311552c01c2c2cf6955e64a4491f683c42ec6e2afbc81bdb63293daf2915e8ed9c5e213978b95f16933180948704a4
+DIST firefox-60.9.0esr-hy-AM.xpi 585821 BLAKE2B 160a189beb3fa92a264e2926d05dc0ccde4da1672c134c5d10d1b41073b7fe3edd2511a96d86b8aab81ac39ba7ee624632919d117e870fefaee65ce928043961 SHA512 1b44f49d124558ef94b67ca3917f810b73ec4f56dafd949a7de94941741e7c15bd27e00a97e9714a75520124910a47647e6a4a341afef828966d48612dac9c84
+DIST firefox-60.9.0esr-id.xpi 517939 BLAKE2B 3cda186f2b0e6f401820b93420aa28cd66e1d654ec71e047eebca1ba85531b42f11badd5b5dfb9b368760f293e6874e1db896e2415a420548f9a709356ae8e05 SHA512 13b1abbf4599f7fb876ee83e6108c1565fe13dfc6ad1ba49655993c1f1e5bf02168f13c2f470a271c92186324567b7211478b9910d118b10975e1a41c1162ab8
+DIST firefox-60.9.0esr-is.xpi 529000 BLAKE2B 1ff1908cf5a497e064ce538325486686734a60dd879bb34214fdf88dc21e2dd372f1fcddb91a46f255a28755c661aa8d62eee748d9061fa0382047e8ea5965a8 SHA512 5886bc216b46710c5f8d1fa83ce62adaeb10e9ce924033eef0c0d72007653a598d20379f596a165605b9ce1865cc6397cc4485b693ec42e57cf04148f9a50437
+DIST firefox-60.9.0esr-it.xpi 414823 BLAKE2B 47c4bd1cc04b19eaf0f8897ec35f31ac3aed51b1a07a85385dd16ad4feef3c89786867539dea769bdfb8692191e3f676e974e73b222b99968756878dcd0b028b SHA512 fbf77f6c55a502e422c97befad6ff7ec06d54b02b7c448e46c8ccb57642027a1cac61d096559494a56f31075252a6afd63cc119597b7596eb4e0c715fbcd5ac7
+DIST firefox-60.9.0esr-ja.xpi 587748 BLAKE2B 3236bf74425f4b400ec91cfb2a9f9d1b77ae8bdc243729870ae9137aadc4c728747a57e50d8f83dd381dd692c7d107c0bbca2b5f2b4247fc09ec9a405bd9fc11 SHA512 eaf797269881bc6329495096918e7c660060f71c4eeba7a99cd42a94752249c71f23b89d4c3d3797eabdc688d7ad4d38a8e081226ff52de11dff51c8c1c3d142
+DIST firefox-60.9.0esr-ka.xpi 572565 BLAKE2B eaf19540797a1a9a0b7953ce04089bbf302acbe62dc18c5577bd3c9781db2e986b4919cd22ae572c1e16ab29f3a381036dd121c2f32df12726bddcf209d59ef0 SHA512 442c83ffdcff0e3ebf5c6f3f842f7e4076789335aa77edec2d366161c28e7d11e7badd905fd65591b67cc49bbe2f6006a23a8a6ea0c46ed0d6192311d8750d25
+DIST firefox-60.9.0esr-kab.xpi 536341 BLAKE2B 97678f57033f7e5a2e8d578a93d51a76367ff5622f4924334c1421f232fb768139c270743d93e09ece0b570ac37d2660a7e3362bafaa54fdf007d8793f7a51e1 SHA512 19602cadfd53a0d70a5a198eb8c3a44d3cebe3eb4b474ec43550e9df9765b10cecdd2cc97e500d82bdcbcd603ed5e6db1acec1ce70c01aa11dc57b4435e62f3a
+DIST firefox-60.9.0esr-kk.xpi 598694 BLAKE2B e4d0a9ea6fdbfd9eb4295f9a123282e7232ade6bb45e89302fd0276743adf5fa07209545fa2ae1666753563e79dc3fb34b1f79339a12752ee247641ede9a926f SHA512 8fd54f32872513c57a491074379231a97ce29475e49e701c2c81b26faa4cdf9bfa941f4f4f9f6e0f3dcaf56fcec0a0281580ff9ac8c61a7e97d87eb0e3a96cc4
+DIST firefox-60.9.0esr-km.xpi 598812 BLAKE2B 5809f50ad35c7344e8b4bf9e8297e75f732334ba3aa6ada4f805d4058191a399e549ac71d4107c5a310c3e74a2645e4396ae00d1b4c8da24db6eff6d242da3b1 SHA512 27540394ab8e597a0256c3b7a8370b8191574ba0dfa1fa8c17e2e8df08b79157b36dd85672e7f49c703417ce1c02287462efe22870c5ab7e2a7bab386a2dd193
+DIST firefox-60.9.0esr-kn.xpi 601585 BLAKE2B fdd5b97c7348423c913aeac0392b90dd3cd80e16c32a00df864e64c924ba15b48a2658a6fd049c0d321a9c7e13ba6819d3d91cb0c3452e73428877626c29216d SHA512 08380b89c8f099ebcffb05a0af1ce216c977cd00e0098febb16b11dc68c83a990074754adeeac34cfea31a13a3f7b259b2a9f1b01f192bbdbb9f9e63b70c41ae
+DIST firefox-60.9.0esr-ko.xpi 563551 BLAKE2B 24f44952915c8b690829e13241673ae4784a7c9040ca43fb125869f46d59a8d97435c69afda68d9009a99ef5117797db27264768d40a311a940032ed6f1c8ff5 SHA512 a2825e370bd99211f203b705825fd90391b3f689b1274507eacfbde21fa8cbaf16790f142876fea4f29feac839521c4b2c6a695ab2f5f88a298cba90ba805fcd
+DIST firefox-60.9.0esr-lij.xpi 529124 BLAKE2B 0d8c37a97d29a48ebe5d94173b2a0cdc436d89c41ee1d047400e540e149331d766b09d8bff23c47019b7ecdbcef347583d4819f7e61ce02dd118879c41e4892e SHA512 5702298ce9056c37d350d96f82d56ac0cde36c4301b05ca111bb66b0b76e1be04382054228fdb7059a6380b4924d949dd2706177efd04a7c96418c69db306ca3
+DIST firefox-60.9.0esr-lt.xpi 552184 BLAKE2B e00502daf85f20955425b616474cf3f1d234b376bdf6a13325db527a5a0bc734995f8be4c864fe1eec83f8180be9b5b62132bb9226d9bc55fec271d6cb9599d4 SHA512 b88510f49a24f9032f66c4cf1e9e9895f5294eac007201d8a725d5a2c3f331f41cad58ef1053fe091cbc3256d2ae1324531833dd0ee4609fc21c611d83b7b745
+DIST firefox-60.9.0esr-lv.xpi 542137 BLAKE2B 265e6df2c81a7509bfe228dd553c656e825c8bd2f8116eac6b6d0bf9b6a481a915f5cc2eec05a5f639b2f706583f668ed41c656a4bccb323640270475411b9f2 SHA512 5f7f9a89bdc4a765a7c2744ec75448718a73ba816e617d95d8e1058e5370851e501662394cf24305883cfa6b5fb0da1f27a296d6f25402e4f341c323e01e328c
+DIST firefox-60.9.0esr-mai.xpi 565193 BLAKE2B 0990f4fa2bee2713a60b62086d5de7413835d97ec2d93871bb38169dd0f81ce33060a08436429ec2b6f3349d366f76f4eb799e104c0cbd823443ed5487346cd5 SHA512 bbbb420f8ce84e305af940dfd1f49ff3c134a86dbbdc0b44e8d176806a0658103b3c31567f8f5e958d2319c3383d4c5cdecb94a03e70701890e7e88030849a89
+DIST firefox-60.9.0esr-mk.xpi 529517 BLAKE2B 3f20abbd2e34ebf9d4b0c0ef2ce4ca03d7da8d5a87981ef3a2a436cfaee7fc0857bd5fa8aa74f1f74e2f28b093ba34fbd32cbbd4154f5a4dc6233bf42a9e7d2e SHA512 4db41618f202b34841e50866fac83549fc24712365ac285c03994b355d08b8454c73091a427a7b0752c7d71e83f8a4f075cce6341ce9f828450df13642509ee0
+DIST firefox-60.9.0esr-ml.xpi 614690 BLAKE2B 581c1a730d571450e61f23904475929a45ac248e83cd1b69f45099155ceda0e6ca9f470919f616d98c0c2da0ff0338276f7fae4b6a4cba0b82bd223df6ee4100 SHA512 3e94d9fdb5c9337cabae7971e52f452ae0df0070f4ffca55560b6a332cdad2b3cb96ba59fefce61c239f1585607fd49cf4d31988b41e9910913dfb0961165b69
+DIST firefox-60.9.0esr-mr.xpi 594836 BLAKE2B 3ef2215f8e7814223d84ce8e0a17ed6d332f0f90eb92843423c547775503f13bbb6a840cc4552cbb7428ecad91e2e566100e425f32744f0a8a1ca7c9e827c0ee SHA512 ee634d38b5fd0b3630c2df306541b21984ff5e9507768976ec095b4cab8f0a89a223d99c098eec635c704dcd8f87e4f915213a387c017f79779ce6ac76ef806e
+DIST firefox-60.9.0esr-ms.xpi 525277 BLAKE2B 63a33e5eab60676678ee4f675eccaf8c9ed2d540730acf7d5bf8006065e7b302ae7d43a5cfb1718d841a23b40f127e21c8b2f6bdee2d0052ec8ab7e246903533 SHA512 ca5360a300d0f0c7f475bb15dd0b026673352ac2588b9cfd261937a27cbf951b2562b9f0bb7dfbab61eb328064c21e22bfae5088fa7cf72d3bce8a97e540aebb
+DIST firefox-60.9.0esr-nb-NO.xpi 526286 BLAKE2B 4d1bc0a657950480f284deebff3bdd1b0b82963c5d203aec6537c0d3d9dedffb0815654598747642c8a9d2440f86a6e8f207f14bad16f305cae9862cf3a2dc29 SHA512 3990e9947ee615b77a1516d5bc7878e8a16afd73345372e321983b213c021d8ccb79a05b934fd99fe138d878760bfbfb4298b26b5956500789d1bcef15cc6d00
+DIST firefox-60.9.0esr-nl.xpi 533196 BLAKE2B 90049de30e71a243d84eb369c0895c1970aabd9e4f1f9d2e71a89a14ac6332f0bf07270ce18f6f2f3fc285fb7c0858d915b32f1bb84a169c6292acd4aa0de622 SHA512 a0c640da27a11d0f651e6b87f31c7d368e0794841bc33586e8b0f330d6acdbcd0c698359597e869853bc34300a3a9f0db9c38fd4d9cdc7f638975868286da332
+DIST firefox-60.9.0esr-nn-NO.xpi 527834 BLAKE2B e4efc8bf3befd4aa372334ef79cadedac39767985f7f2e5e50c3b00605bc069f28829a1fa5b0c9f77fb6dacfe07ab1720dac077354850bb2ff172208aab6e029 SHA512 5ad89c2fc80e80c1d323cfc3c6eba0ab6123a9dffff8243cae76df768a500947ee62f281a1de7a486e038547b185e5e1ab1aff8e0d409927c071057417458db6
+DIST firefox-60.9.0esr-or.xpi 556580 BLAKE2B cd8b95cd28592587af25be96ab5de3eef06149346fd69d743ddcdbfad238326be971ec024e6b005331e495693dc45a26b73b4b9d2f56669d7d04568f33867a16 SHA512 bdd2d01a902609a877a478c61aaf8304cd285a3472cb80abe5a09ebd208184829bff6fb52228534debce4a658fc08a2ecdd77010916f74c7bbb102c2d78493f6
+DIST firefox-60.9.0esr-pa-IN.xpi 574271 BLAKE2B 23f1e6e90fa77d096fe26ed6c16efca4eb22241ab6e3f8558ee9c057ab6c2b762ced100c9d9d01b2d6b7c74183d586408c0e611947679ada2d45ed03010459d5 SHA512 4f09aa0e7aa8907fd4dd36f3697e13d4989c5dadebe7da50cbb0e111e2a52b8ec8d545d67f56e81ce7abf2b443579695858561ebea891814963c1a5afed93c27
+DIST firefox-60.9.0esr-pl.xpi 434748 BLAKE2B e7be4850ab1c64a590265ef6b65ff372baeff55cb044803927c6cbf7537d2bceb96bec4ab87daa61f2946b4d90616df854a9c9be7d1a73f7b4984b276c7b2939 SHA512 535d5de28cd98a34aea1110fd8845c091b5e567632fa1639dbea0732c0cb148b59bae2523511ccbbca4bbed6431ec3abe83f7cd85ea64eed553b951af7c25f75
+DIST firefox-60.9.0esr-pt-BR.xpi 531151 BLAKE2B d60268c5511f4d697e6121a2d06ccd44d7b09be89481d10f482fd620548ac8c3920fc33308878d904500d814e616d472e5a82fee7b5ea9e393e1600a9f7da2cd SHA512 0ef7c295edad701bf9778922250bc4d6fcf0df35d1966681aa281c1d1c42317c75bd633f8cff63875198fc508dd662f04d6be4b7eed3084b1f03957dca286352
+DIST firefox-60.9.0esr-pt-PT.xpi 535763 BLAKE2B 7ceac7711cf39fb8c0f5d7ef7e9195389285496920392492d54e663e4fa6525a30cd17acfd40dbef27bad686239ae7015ace8e3be644e09eb93b54384a0e1e9a SHA512 4ba94384ab2054631b57882d91f5b74b8de66fe9e6cdfb834316df5c72b8cb31450e6a14bf62ea0000849f357bfd9b51ed327e78df11902ba63b74f4667d16f1
+DIST firefox-60.9.0esr-rm.xpi 521760 BLAKE2B 5f495bebfbc7c3d559c4e8c00637344e1d951b080866ca9931fc8d9d16102e80bfabeb8f3f7565ca4c68795913b353ada95eab1590e4f470286e67bc72f1093e SHA512 956a474b162b8ac3d1a4d77c97bcdc199868f445423bb249b32dd71f3e1732e0c74d292808f895c7539b855d3a81d1fb0f0d34c3f505c70e480a1f466bf9e7a0
+DIST firefox-60.9.0esr-ro.xpi 529779 BLAKE2B 5f0744b99aecaea2e723278f2cb776fce9360704348fc5c55e3286ad71591a57013140e596f78dd3446063daa02ca81e27eeca2fb3b8aa892dab9c3201869f6c SHA512 62b8cbe3f24011f247885bee7b3cba08e9ef55e2eee4ca94806138e2fe628e5fab97824599092ee6a4ec7ac54b0ea846970434b6ff74efd87e6ec61cdef8fd0b
+DIST firefox-60.9.0esr-ru.xpi 607128 BLAKE2B 6113e1157e744cdd544028aabf2c08b4c5427ed44a527434e033bb6fb6955e43fd091f5eff9a99dd52a3a426406a67a5edcc6c9f8761b5c1364b076644690f32 SHA512 4157220130ba0ea1f2c2a885cb5ddf9888bc6766911387f373307a66b2552a2f4b945ad99a2ace6db267c2818434769ddb617f8272c2bcb93af2ec94e74de513
+DIST firefox-60.9.0esr-si.xpi 561290 BLAKE2B 92f5b3ce152e6da8843624c3df1dc682119d20b7c7a6b690c1657611e2c9e9f4865c64191b84b408039b8155d92a061301a33ef33adb5460baf63fce0b7bc869 SHA512 2c65615735bc9e2480d1cf2c3e7137b35fbf5ec064979df234ebfdb01e6e145e284132fb93f8a8a7e46db5d98dd4af1d63a7632a40d1c396d6e7985ac7772e3e
+DIST firefox-60.9.0esr-sk.xpi 557433 BLAKE2B 02e7ff2a27e2d37890fe4494e8a90cab081cd708f9a625f067e9ed247b179dacf57d4cd525701b611713737625c2dafdebacd015b090cae7cd5a55c596f30d32 SHA512 9ab15044e34c48ec656290c35a834c0d5f28659c4227042948f92836a8445334d23d5c6ff9927103f166d76a06f9a8e01a3d4c38ce049b9785e2e6ed499f36c4
+DIST firefox-60.9.0esr-sl.xpi 535088 BLAKE2B baa634996668d62e431397aa1e586d9ccf3b7f9f1b95c84e0a152de62381e0428e769e27b715ba337a6725e61cf88468ac8b787a126613bc85e65d690a3f96e5 SHA512 cf20cde94c6b13b5d58181beda9fbeeca0336fc2fa7571e3c4bb864e02a0cbf035268374a966e10a6e6d941182646b508ad793204ba70c06e2db21cf65462113
+DIST firefox-60.9.0esr-son.xpi 513647 BLAKE2B d71d287b8dcf4fecb2d4e4113279edf2c7af7ea25e7ad9a589832261b874bc80eeb4c4a4b312569f9af8f2a276b9b728a39eee10ea3dc00fb7e9f6c856b82228 SHA512 4d42ed9cb567490dfb17fb73fce6fb66656931b71ec756bc5e5a20becabada792292c82df340d91bab231fdde98b5bde5aa9e326fdab6d1966c69f0e3605b614
+DIST firefox-60.9.0esr-sq.xpi 536982 BLAKE2B 45692b17abeeb3592296232befe5ce850141caaebe33fc42f5269beabb2136aba48ffdfb99242ffafef17fd8a67556bdc278aa2185a5ee0d0619908ce867ad7d SHA512 6036d16830cfaec30cac590723c9b1bf126eb29a18903e8b1d20487b4f58f2b0127f8794c0112899fdbff6fe420820b0bbb862ea5b1d9c4ac185b426f6237d63
+DIST firefox-60.9.0esr-sr.xpi 564497 BLAKE2B 819179a9793f76821f6a3ec36b986ec01b9b704bb9da4a33e0e3b5f209720cfba311a860fbea3e2846937f3ba0494a64e5a73f37666e4b1f53563478f52b8079 SHA512 1fe8a42962486ce77a3fe6fb9550609c6b3ed97ae79c6e7d729974ac8e7324f0e101bb0eab87cd68469583b43613e08825f74de65f5ea778fc97c3cbb2c54500
+DIST firefox-60.9.0esr-sv-SE.xpi 535061 BLAKE2B e68501e2c3a11b77a3d129d26ffebc88eebb829520f5c85709ed57dc794c999679f3d214e844a63dc1563bac9b79eeacad8651fff6358bfb736b8b08f957ac71 SHA512 e342ffcf417c67c90181540615b1a19aab961fa803493f939605dd8b0480f385ba2bf28be524dc0d904f2689318ddadbc950d79f0d795ea3c19eb395c3d46423
+DIST firefox-60.9.0esr-ta.xpi 593639 BLAKE2B 1981c2eb72f1611edb5ce549ddb3060a379c274b3c28a66d4888ee56ade9d3a0ae4f6541d45010cedc175c70564662e1f8112044c6ee791b61ed951f02ca48fb SHA512 00382aef01723bd52ae43a0c7294439ab8ba022b068712a4d707563388d81fd5d76479a7d79fb52642f538c6a6a137e9eb97791a59a547c7b08aa5fb461acac9
+DIST firefox-60.9.0esr-te.xpi 606690 BLAKE2B 7990362daf24ed84d84e0866fee24e96dec014721ad40becdd090199d7c2eeadff7d8254e74e6364cd9b137c725e4473c78b7fa388f1d38c53ced3f8d57ec5e6 SHA512 024ebe8f35bebc8f2cf1c08ab55383862c512c274e155ccb3d55b14b442b4d65ca13ba0715bc944d2e768c50db1578d38eb8b82ecfcc09fbf61f95ba7b4857c5
+DIST firefox-60.9.0esr-th.xpi 578533 BLAKE2B 655d94b95c0674ace609b0a9ebe0b7a12b12ac04b756eef6997ce785a5dbbe286b0fd1db6d2c42f6652574110bafe130b7b920ab5ac879607b4efa0d7162030d SHA512 79e2e3ae20726ff388898c2b479acf8590188e060262a3d3945606a1a35a28c05bf23df8b2086f98585474a2b4ce9176c6ad17f5060074f6e29e57ddcd806bef
+DIST firefox-60.9.0esr-tr.xpi 541582 BLAKE2B bbbdc3903897c6a6da09059f3607eabd34538d1f07c96afe8ea9068d0755e6d1f8110dc3f9f0f2de24601f2ace553903c53703710b48ac08ebdee35d2accfefb SHA512 d4847be63219bf66c4b3d1aa56cd78535612bddf240babc7e542d0d3a83bc84648dede88c8cc10bbe908bd2c8d77add4fe9b948d9331956e89db90a172622717
+DIST firefox-60.9.0esr-uk.xpi 596649 BLAKE2B 69e5aa5c30214b512e37ed849e2cdf4070b2e47ef612b2999ba4983cb5ba53db2ef724a25de9842aa2829b160a3840964d251f5443a214ced2c80f0553e55d2a SHA512 d8fc652dd1af7a60a7f7044b1e99fcc77fe69eb728401ba0d98cf1b901733850968cfb1291a11ad46735ac750af2b217c28ad7ae535cdf4441f1119170e294ea
+DIST firefox-60.9.0esr-uz.xpi 529399 BLAKE2B 0ecb8b9891f373c543b60f7751d0bad3a134bc36e0629b3abe47cf3580e3e1bf151b4a0da2cdc1f2108d15d213e2363572a9abdba1a18f1571ede3777b62c9c7 SHA512 de7bf13f6cbdf43e5a607c0e46f233fc65c24e7ca2bd74b0a08b1c4be15eda44ac040f569ecb44116bbdfbe0df156a67fc5e3a187a553c2523ad638406187d07
+DIST firefox-60.9.0esr-vi.xpi 543907 BLAKE2B 9c7360a1e244a626670848e75778c2650c33f9b6bc6c0b0833614fc337f829bfbbae86311d90ca907cbab891cc9e31fac7688455078b28710382529cf1dae9b5 SHA512 4c571dcd3015cb651e6af462214384e01aa4eb02204fa01dfbc6a270919feb91110d60df5e483b6404231f3fd1437d64430179c030bc188bbbfad1317fb933d2
+DIST firefox-60.9.0esr-xh.xpi 527565 BLAKE2B 6b357e8887f61aed2ed513efb9beb034d126c3ef9b73959b6f10c25f221f73f334a8bc87ffa6f983df956a5fd54f66c6185f9f87825be2b00759d4b6e38ad4f8 SHA512 5bb606666ffb6598987953fec0bc555d2a37c4233a8ae98e738eb1dd5fb3432a4ed39f6b2ef0bdb6e7af2570506460b0319830a9ce9a21b8a8f2fa37f1d6c3f0
+DIST firefox-60.9.0esr-zh-CN.xpi 559980 BLAKE2B cee4fab650cd87bd8e1c4bd14500c4036d54fdcd6524fd24d5e67f08a6926ebae10a70f0a961942a2ce752e8017cad965bf9e45ec32e825f35e5605539e30a86 SHA512 d5d63cad9411d615c0aa0814beca1f48cc033327ae989641a9e4930a8f6e7e5e6a4cbcb875b26fa5e82b631aa9a99aa35ad3710308933cbfbb0a15b9686094de
+DIST firefox-60.9.0esr-zh-TW.xpi 558304 BLAKE2B 94736adc0f3c74466f560ccfbab45ad6cdf436f2987cba65d25995dda15838109f5189e4d4bc87bd64f8a232d953ad69cdbe56cfc3ca3562b780a465180f0eae SHA512 dc2359c2d7245592034b58558357f986e612c119b54ba2b979ce1df0e7dab2a5a0a1422fad6958349a03832c96e9cf1df32bd55be167025a0c8eab5f14a27146
+DIST firefox-60.9.0esr.source.tar.xz 269089044 BLAKE2B 92532280063cb93515e9d791ec38b9062355fabf90efea15612ee6e66459aca32b71e1bff1f7c8dff16bb479fcb4ca0cb6c1200aa99b3810048e459bea702193 SHA512 4baea5c9c4eff257834bbaee6d7786f69f7e6bacd24ca13c2705226f4a0d88315ab38c650b2c5e9c76b698f2debc7cea1e5a99cb4dc24e03c48a24df5143a3cf
+DIST firefox-68.0-patches-11.tar.xz 15404 BLAKE2B 5322c64f7605e30aa1daf650cea19b66ce6c305d2862d76c4a4103676392cbd3029a8f35cbe8ed8077ac7cfe8194c08a0cd3cf25fef75c62a086077d0c5a419a SHA512 1897303b6864ca941afe6ee1d95fd975fb29a01f52d68f9f42c1a9a62d7e4fee0a797aa169b58dc4cf068916e01edaf5c9ad8ade23a997e52c37bd393a142ade
 DIST firefox-68.0.2-ach.xpi 471799 BLAKE2B 7b90971b3a3244a2b4005ed617f34d9b6a7e3be466d2ad462a9ac719405980b766013bb35c20a3d6b5320f782d55559da746c39fada7ee38031dc41bd6fefba5 SHA512 0cd2edab1e4420827ef0ea1d4be70819dfa58ebc7149e8c181947f8385cdbd15b590f577e3e5d29286d8c1e0a8fe35531a8e1fe323487e71a4a15b51b290c29e
 DIST firefox-68.0.2-af.xpi 450628 BLAKE2B 08ea70856d8af333a596d902f2175fc35cee7885c5757b0b3ab03393ff1c4898b766bf5748fdc3ca72ded1edba8735b69ed3042314e526af1fdfce8dfac1ecc5 SHA512 402325aaee3964e5d61dcca1d2e8a82c5e3d2ce812cd2a8870adaf1be8bb1a376ee26b6cc9b2f17d72306af6e92245a8302790218fa72e4b9b0823d1e84798cb
 DIST firefox-68.0.2-an.xpi 483102 BLAKE2B 1ad2e709d3289018fbe7e35eca993771123ee0c4172c77dfd76891d9f9369d96e43a71ccefefa70ed7fd46fefcc669e330ae8db21582e03624c4a805747fd411 SHA512 27433fad92ebbf584746ec1e93ea0528dcc5c6ac7367694aab9bd4223639e089d9fa23546e594f225db238d5bb890f20e924c692a2d8b61765b61a7d2f02276b
@@ -375,8 +375,195 @@ DIST firefox-68.0.2-xh.xpi 470582 BLAKE2B 49528ad8adb72f968030f9df600841f1bede34
 DIST firefox-68.0.2-zh-CN.xpi 536613 BLAKE2B 723d926b9133b26b2d662276460c9588fbce939380a008fd3b5074275b94736a4e5bb941f82ecc7efb5d5e67298ac7a57f755272329a80386e148545138b6661 SHA512 757ec3baf9bcced011d59f33866f3b7f0d8097303e1b17f2ee7bce1ccc96b72ef239fa1c66c72f41ebb22acf09b1bf28a56ced9518f9eb9e20ee2a7482d9ad95
 DIST firefox-68.0.2-zh-TW.xpi 536156 BLAKE2B 6f683db409bcba53e6393278cba331c204d32ad61e450aefd047d83812430bf290b5be847ffc1e58e5868062cfd10fa5759cde317ccf1ac2cd01e56ae55c5ede SHA512 50b6f492b39f6596fcf14ea6c31d13afd1d033db7dfabc262942b79ff9e22acb17aac9420f13c7976e02cfd3d3d0bd38702a9c2d3f2b54f258da49e00a588bb5
 DIST firefox-68.0.2.source.tar.xz 311257408 BLAKE2B 5995ab3cf3b4322fb11d1d70877a3a224d69b86d03270b9d4bc8c59cd840c1bf0dbf2c0710cdc4a825095c7fd276e40e95d6ae9de09b509fd04534b48c0fea80 SHA512 5c289825fd0de062b9943eabcc16e09c1821c04717e689aa8df03162e722b72ea698195f3ea93e1e746c481dacd77d125301dba951468d134b986e35eb4ef5bb
+DIST firefox-68.1.0esr-ach.xpi 471802 BLAKE2B 7d5033d0bbdc708fb676b411e26e0f617c321101d3db70cae374be4fded2eca17450a3f5521f12c8800a4cc4654eebfd906539cabe426965857edd34d21095b1 SHA512 fc5648470f1ad6f4449613bd4d0e9cbc0d3202e92f00048e9122f2f1b865819af01db1f79a51deb15bfb2f294c3828f15545de71daf0875e09fdf69d84b4cf68
+DIST firefox-68.1.0esr-af.xpi 450637 BLAKE2B ef42b8e046469eb0d2edd7e2aa15b1a22e09374490d2910ef678a713fa0eb8e339d50840a4310377c0288500df4a953702a191571836a7be29f978b4c3edbf3d SHA512 4252bfa0c584f78fcf98b1142b40365f200264c31640f82bd466f8735819d73e32d5be988aaa9ce7d394c12372776e351c5438a9f95e20348e10cdd6bcc6e998
+DIST firefox-68.1.0esr-an.xpi 483094 BLAKE2B 71698125ab03f099abd52520a5fc6ec594d34ab2cd98853eaeba83dc42539592e83bdbe02a8c8014123cb9047448ba1c7b1ccb107e2beee02ef32777ffde490d SHA512 d89fd25d748b68a10469640217dd1923a754421e5868d43299c687864e2a58994e2c1470db64198bfd51191ff08ba2cfb3ed27ef1b05185005c325ebf060db0e
+DIST firefox-68.1.0esr-ar.xpi 538974 BLAKE2B 6bdf3149fd300ddb66503d25f797156897e2b485e3d94ccbb60ff764f9ea9ac7e3b8cb2b788c50fdf3449016009c740f95d01e17c238bfa75e46796096025b67 SHA512 fc3f5c71f1aa9c3138179ec2b6a125d6c576c2e5d4bfb1626a29a9e42c19ec83d687113cd4135fec76d2358f6c1528509d6d94279fb611ad923de9ddc7e8d3d8
+DIST firefox-68.1.0esr-ast.xpi 480817 BLAKE2B bd229da09b0613a253693cfa88a1a77757713396ac172fe86fb89625c390eed4fe891ed79a3570796701b9ca7cfc383175cb1cecd6d6ba1e6d897fbfcb3294b4 SHA512 786ad55d540095d8f5b846803f8c0b6b61e9b269a1ee15fee5ae523749eac1e07004aefce62ca81a1744db8e86259e914b4b0964f34d5908f47babd351c1cf2c
+DIST firefox-68.1.0esr-az.xpi 510305 BLAKE2B a9ecbc2d390b3b0250eeb11cecea5cb18e155820fc98d73c423c3633521e4ac985a841fc9724fc8fe245c6408ff5f84a57b4f568e4fa7844ea5c45734dc59d1b SHA512 9c6e9369980aaaf354560bddd376d7f2e3ad1fcad93f104d4ca0d7823599ea6758581b81ef81c8b52f09d5b61c8c32e4848a2569e349c599c247808212fe48fd
+DIST firefox-68.1.0esr-be.xpi 582139 BLAKE2B d70e0ca8813a088d2503c0e4dd4f3a5d0dc705ac0d020bb41cfcd7cc7bafd95a143f0c917ad7b6e744d7e78e8b528464a19d4e099c9cc643989a92200f3c640c SHA512 2ba30a9984c2808412efe374b4207f75115410fc935450da969e42fb11d8cbeaefbe6e44ef2fd049e4e697b3ba9937af361b521a31d4f6805530a65757537a67
+DIST firefox-68.1.0esr-bg.xpi 545357 BLAKE2B f5b7c3253658c93b711655ccc271bc4514d877e8281a4a775e9abe13f4c2695e881d2cb9dd5be8afce946f9ad208a1f95579a809818cdf6f5ca39c71a688bd8e SHA512 5c2c033740b146906caa44af102af9404e1e75163de8131b116bee35e462a6406a5be322fc7935ca33fdddc740c6a73613a55e08ea5cea9918ba422f1a932133
+DIST firefox-68.1.0esr-bn.xpi 566592 BLAKE2B d02b6fa22e04a6be0128156bc6ec19a2a8a44aba06c6cb916798a77264487ce8c962dd5b894d09db874587ae2ea9a066dd019b5024c69f3736318fb636421b02 SHA512 da3cff01de430bc3153b8e66b618554240b70711857a8e2f2a6ab97472677e466ad6f889f83760c30da1447bc6d142299c1971f6d923c178abce52281c7f675a
+DIST firefox-68.1.0esr-br.xpi 501705 BLAKE2B 88732ed445307e28e97c1cc421a21f6803def9b56fd650d09288b0faba75396b39488aa90b7cec26029420b69d3599721c50e087830d06f765844ae240bdef48 SHA512 54e083cd311823645ed10d5b605a35e2cb3febf93cad97dd4f6f12e9e8d07f897dd6df3fe8cfa8f864bcc78188ecf60b5f5d01ba5495816562867ca921014c7d
+DIST firefox-68.1.0esr-bs.xpi 483166 BLAKE2B b7f8e83a3b8258c71ca09b66928765dd92f903b2f309ba32d95c8b12887cc1ce9c0d16ce581db04bb5022f73e9242ffed546617b0f89676cb9a44318b5935c24 SHA512 bcd7f4109c1845c18c50f639844ae7160c95900a81d49eb010314100e5de6a6de0929c3ef3f9270f8fcd9faae595cf0a1ece80cfda8644bda39126a4e795682c
+DIST firefox-68.1.0esr-ca.xpi 499868 BLAKE2B cf1e37cc217d08428701bcd5e9f5061cac9c787ab7d82eb793b43b6f7d867674845257f9d4798282ead7daa418c7a28e26de1fc7f127a52109067039abdc8b25 SHA512 cece5db10e2f66963d294c745eea4ecd40d98d5633dfe4538540e5c666e713d8c76b54a4b8b99d2f91f68cd8c77c721f31b8f7d8b18595334fe586c74e309273
+DIST firefox-68.1.0esr-cak.xpi 527466 BLAKE2B 46815b9a6faed473a35879596293b65651a92e6ee050c278586b3f6982408d9a3c341716e6c9e66210e1bf8a02715859275594ecaeb01564ebc0def204c52df4 SHA512 77f9cc6e6253fca35ed5a79287381dd5c72f4f5a67f9433f2d113485f8feadb15f497770b43ad969e86b7d3a8816bd6fb2bbeddb0307ddcf05848aba6b379652
+DIST firefox-68.1.0esr-cs.xpi 519947 BLAKE2B a9e0b0d930a10d14f21bd3b024c4383a1f10b477d8180c7600868c6f0034cfc97685072267b48248d42167d22ba9d4fb5303b2d6de32f49bc0eabb9d2d390bad SHA512 ebb4071c057b016bff5b81328344f07097070be27cff3fdd21de014995dfa192652b5a00690d928790ce38241c85fdad0c3e14cffe2f2de886323b179dd2b8ed
+DIST firefox-68.1.0esr-cy.xpi 507177 BLAKE2B 3a4abfeb9132edb7f8633fdf1c8262554321ee38ade1e370f7ef5d72ba0782b007c19e8b6816352e4e778c696704101fc6932c46ceade25021fd036f97b970ca SHA512 ff0465e229661efca3e4bcf807d1083896036bfdc66394fe21138a310973c36343a958c7aa32a8a8520431f361c228c5a3595b718c67c8dbe3c2281e848eb10c
+DIST firefox-68.1.0esr-da.xpi 520278 BLAKE2B b785468bbb4ede4fcb41a2ada4bf09fe1087fa1891baa5be502de0ce3b10d781d82e43ae4b590a69e4fdb03ef7b3c9e21b05ed47c9a76a97e2febc03e567ab60 SHA512 a136c93b4fc3c14394d388a92c573188410b521cd6a4c897d3b4b2b7f518775d5b02fdbb29fd7c401a0dad363d783bbad6ec177ac044f686c7bb54f6ef41f328
+DIST firefox-68.1.0esr-de.xpi 523748 BLAKE2B cc0ece85194eda6df4f592822cf36fcc6b934fd32cf4a19876137880e6f0212a1c0a85678bf48844d7d4776c4a2ec8856eb355aec829e89eea4ed5c4a3640f5f SHA512 957dce6ccac03ff1ea9a0a69fd2e795586e8936d21776a69c0fea6be57e8dba4ba158b0f274458b4ad95330859862e7c538256d389d25c4d26b69c892731408b
+DIST firefox-68.1.0esr-dsb.xpi 528677 BLAKE2B 34334b09da8b552525002c304a76dafb6c9fc06eaeec5445f7720b3dc9f2d463b95712c15f99196fafa6d01aa11ab73bb771b8f0636de48502b7a689eb3deefc SHA512 10a2e937a1a5e5b6da67a91bc2ab8771bf3745b39bfca8f128ec40599cf2e2511cd2a5ec4278f70faf1cc221a4a68d1471ea0c4b6976b4837152b3f0e137b9d4
+DIST firefox-68.1.0esr-el.xpi 597413 BLAKE2B 59f15cbc8b704935e7666b5c08cfd3f76fc04328e6508aea4a81a9f55d3f3b2dd68fedd15f688bc85f0f6e5fbf301070f0f9db1160ec5a8149d8925770aaed7e SHA512 60c7ebfdae617f4cb1714d69d79c5997882ac5deaab8d7a4dec0100b8913ba7fe036a05fdb62c42bcfed61a722f575c3b0f0dae672823c2e9ef753b0a77df864
+DIST firefox-68.1.0esr-en-CA.xpi 478536 BLAKE2B ba265340e51484f16368cdea8b12a09bb16ea1594edbd7f8d40d21d44d104b79464ddfd187aeb9437f327568975c15f79dccbe83e839e92ec8a9d6d87ec87f44 SHA512 269d09c540caf7594635de26298fd9d7b1ba64063b35da14d0a09676dde18beece79296d564a1230ae9953e83587de83d44d45031b45b7e3aea57d2b5a853dc4
+DIST firefox-68.1.0esr-en-GB.xpi 478282 BLAKE2B 362469394a8f9bd8ca08eb1e323582f6ecc384cf5223b4dd6aeeaf98ec76bce8b936206b3850111d88321c4b82f5694e8cca185ee004084a28ae47086d8cce56 SHA512 bbeba734f9c79f90af825805dcc9aefa5312c964e4d83cc7b17ad97ff588e3f89808287a6a130595279cfb3f7f8be53d350318d18774b75a9bd885b3c910da6c
+DIST firefox-68.1.0esr-eo.xpi 504236 BLAKE2B 146da68c4f36db64cf0905c81ef475873be686c792b6863a8c227d1030336c68f923e3a046a10625dc969d11aeccd96b4a16f592f2f3bf9376bbdc8cead5f466 SHA512 eee9e72aa3aa84b921d4e5e37f879932c672ffe98fd5d30f6929e5568ec1ef243f00df8a56a0a5eb8ba408e79f8131064b2415343b3b002ea9725d2057ee9b44
+DIST firefox-68.1.0esr-es-AR.xpi 512460 BLAKE2B edecae9c5f27f10aebac13581efdf9c09794b088fd58f77039b9ce2fde2d22891c9979bf4ff343dd4e51114dc0c28b3b77406878b163cada763d92e84faf46a2 SHA512 6af14381e9d2f5ee07ee4c4bdf01c57e5d263b5d4851de56785d03ad5cbe2bd729d1bd83946a4679ea2544a0d1f484f41a17d7aa9ea6066f9c641f8433be7644
+DIST firefox-68.1.0esr-es-CL.xpi 511925 BLAKE2B 6140ca769947ce50733d4837c5924ac2eef10236434b5b715cc4a73c48c6f71bd4afcdb1b9e886fc8567e9ae6dec1c35c2ad241d5df163eeb0afb17dfd956737 SHA512 f4ef37465d0603ea933a195bf402871d86698cb40c503fe38d5f25319f81de207c151ef61f7c32fe43c2bed72219f91c980ae4f47a28224a8d2330052d70655d
+DIST firefox-68.1.0esr-es-ES.xpi 481479 BLAKE2B c09e9f66ad9236f9cc16e0d501ab48333a0649a1384b36906f5aa9f0e797e1faba6d48e4ffe64aa018e516387ce25b2eb5c16ee1d7ace90ed0902e97003c9342 SHA512 acdf39c7c121ef87c87a563da42f6db264538a6acca425d2e3fdaab2a9ba24fc7c47c85aac21fbc30140c969d6eed1e456e6c4149a5c61b4a5b38d54c2521e8d
+DIST firefox-68.1.0esr-es-MX.xpi 504714 BLAKE2B 66d05fbaa3c1dee4518f273d950efaf381eb2463fec5744d81eb46cffc4a9caa294f54b07a9640650cc5e6e4b8bd3579b0dfdd6c1f5274f64acb0c9dcd0967d1 SHA512 130c47eab042ef212eae2d1008cacff6ca996624b513e1c18951a05e0d4be2ed2594f1ae40a15cb8de26139e3145fe812f32b8230b60cd46669a671c3e617fef
+DIST firefox-68.1.0esr-et.xpi 488530 BLAKE2B 5cc6c2aa657527f03dd3f3e2173ad2b96727dd126700c0bab08be8dab939f4a926c3c64d29be538e269a0e0a44e83d4a747fe95268b81e846e4e13c29b34b73e SHA512 7e6e3fe766c29154458b092b1254de2d4b18e87efe5218301243cde26bd47fa06c9ea8bebcc0de827dafbe023a48ddeadb69b7551299397481aa58a9906fb25a
+DIST firefox-68.1.0esr-eu.xpi 502493 BLAKE2B 50d051e6c0147356d7ae6f74455cbc80c11e1e51ffc370992592b16be14b2eac623c4bdaba4b4b93052ad0a52ee1b5a7ab773e5c0f09acebc992fa1e8d4ba9ce SHA512 8e99621b5605e68fefdac179385283f677e74eb66711d43365561eb5d68a4c771fc7f4bf52f87e5846bfab4f619db7f516ad6515a2b97824b34a6c6cd4343233
+DIST firefox-68.1.0esr-fa.xpi 547873 BLAKE2B dce399dbda11198af381ba0ba610b36f38511fd6310d5e2f942faf32111a12579004c261c14bdfc1596a35b044ce2ba15a7af5728e6735ce3181a86cbf0fa055 SHA512 0cdad7dd2e294d9262657b369ea697247cdbf4bee38de5e73e3b57108901aecd03726d7c3194d2b1340013c1f4a2b0e54ccc0233726b1d2645a7dfb25a20be5c
+DIST firefox-68.1.0esr-ff.xpi 484101 BLAKE2B 13ea22d1b0d36f80c88e05684eab59e1fdb02f9fc4c4cd1ced9e178f7837d2cff49521f61e8b150ff068e8c403c15768b87b21d7b2f694e01c0ffda61ac08121 SHA512 d27ea16b74e8f887467ba224013186fff17319cccb3d985af23f562a5ddf5d5694633ed3fdcd848a98b9559d742aede8433768f14413b660ed28baad73a6601c
+DIST firefox-68.1.0esr-fi.xpi 494315 BLAKE2B 2fba002327203edc4b92506b08e60d1e83415d094e1171e83187d9e4168f055c2a835f421f5415ed92231e7cc37201b4e9f148942da13e01230126da6e51f5bf SHA512 068b3b2838f5eaecbbe97a1bb4bac5eb9bafc796ef0c8dcc3480d5ce052eb6fad81e27bc5678f81a690d53673f4c3e27a84168b042d17fd028dce323b82db6c1
+DIST firefox-68.1.0esr-fr.xpi 523090 BLAKE2B 440ae2846cb05fd66350a8420c9cd94377d93be11016223d9b9e17d56e638f6ad250d0cb6f0091d7d18f344dc96b5d3c463d7052c80cb24bb3558ecbaefc875d SHA512 6b4d86a19d123083fd6d790d0beaea551ba5b4ff5236fb8d77b33495eea5aad214b8ccafeca8cafe8e58b977fdb8c5f86f50df43663185c3fc4aecd8bd3318ce
+DIST firefox-68.1.0esr-fy-NL.xpi 510426 BLAKE2B 6c37c0e0c09d5ee520f312cff1270c897b945559583270ec27f963c14a7796e815b57090bf5edda53f746548e8fa707883b5002cabe8669dbe4693ee343b31ea SHA512 1cdd150dfd458778bfe24841de9fb86c27fa66f0f6f13bfdc56ee91ddac3a6efbd73763c791c00c9ec6dba501f653288ed3e44d52522b56cce449219b1ddd62a
+DIST firefox-68.1.0esr-ga-IE.xpi 489727 BLAKE2B da2c89cd8eb230df40a884fce5435d0139a76baedaa5187b0cdc3a3af1f0d995754aba79bea3a23b454c9b6f11aadc040c18da30af02daba3b31822ae0f64423 SHA512 83d2bef2755db95157951029c689b85b8c003759e29fb6ac5a50163307d6fdc476de82fdd71cb6621a920bd103664d68b6e01ce3471e78e30ac45262be16f23b
+DIST firefox-68.1.0esr-gd.xpi 506589 BLAKE2B ddc9f5976010f6cec0f3ad7dd8b34aaac47c48ed9317006d5daedba8c9f07322b205d7bbacf69fda647386fed09a1b733b79eb5151d3cd669f99a5cd6547673e SHA512 e744c649b9dfe189de27dbf88750a7ac27b5bece07c51edf5c8630931a1f1dcdee24271f0dcb93f2bb84952e2df400dfd58093a67a530ee63199a1757a1aa080
+DIST firefox-68.1.0esr-gl.xpi 484028 BLAKE2B ad939139db191cf5f8967641252a734ad808288924837330b7e28057a30f1b896f968dcec241feb98debbf560225e3b1fbbaa07068535ca0bfa0c155536839a1 SHA512 66ae57a2a2fbc3ab202d143b9fc09142ad5cf1202b7b0874cb3ba4765cd1a69c506bb2b23e0783d3b3c384c23e3ea1d992a21f8f530019b37e65a23c1aa887db
+DIST firefox-68.1.0esr-gn.xpi 522018 BLAKE2B 95141631faaae99db5bc0965a06e52b1191bb2f1e55be31428e031fee55c38e87348a5ecbdc5c4dfa2bb7f0f7dd5ae9c0a9107661d6db561d3ca66393fc1c9ac SHA512 28135d4f709f8a59eb1fb674fc9862fb4c36da3758e15b6063b8f92bc7b66b13317ce2fa22eceabfc66fdf1560cbacc6e483c112aa69e408fcea7c289a4eb2d5
+DIST firefox-68.1.0esr-gu-IN.xpi 571763 BLAKE2B 48bfbb444027e01179453630cec225c6687cd65b1540e2e926f8839e9aeaa977530aa53027be6a61b2df73f3bac2ba790049d0abaaa6a3d6bf3e9242949bf959 SHA512 6defb1ef906760a4fc373c111c9cc6744d23eb55381baafad126afdb42a4ebc3d7195958517452aac5819d5e1df778aad39131c47597a812a8514165688519d1
+DIST firefox-68.1.0esr-he.xpi 514045 BLAKE2B 8b1e742a04611298251f1eff3f725f8fd7bd4f419be61635c8698bc76c116b7fe31b9814ff71a25c67cf28bc478f5405e8d59aeea2620f0593fcbffec5c6884d SHA512 4fd754de8a694c32ca086448f2bc61c2de5b3a7cbafea920b1d6e71b11b49b12515539caafe4f5eb28e0ed36744c58fcdfaf7b8545faab0b8026c8dfbb400e35
+DIST firefox-68.1.0esr-hi-IN.xpi 555500 BLAKE2B 4093b1c586aa5a705e0a49e19e9e7cbe7518d653ee26beddb81e716a1ca6c89a56ca98a483179425b18c684b97c6eec7dc945241060f7950684d8135db018e57 SHA512 255fd412b9225f782e6cf299344382ff53cbc6c938106b08ac6346b3695de5108f06efbf9a02bf26f076ac9f60cf3119c77111392a4252f54bb6813e0e50d125
+DIST firefox-68.1.0esr-hr.xpi 491322 BLAKE2B b9eb874c04d65b077993d00bbb0d2be44ae488afed0340f64e9b108bbc2a52897390aad87c33ddad5b8a5c8c12e38a987f85a36b52f10bddc35af9b8571ec5f7 SHA512 5295b19dcc26272f171c9a77d58b5dc6a0e559b8a705573f1dea40de03ffdd67634d0ca76b6d0a668a998384398dffa2c204e43f4a33d57aa9688c5b4f432e1d
+DIST firefox-68.1.0esr-hsb.xpi 527923 BLAKE2B 083a0da3c47bcdb12130e7cf8a36bddb5923254e5d351dcbb533caab70a3d1446bc4b515b5ce5534824c120f2975d31e3443c28ef8ed2b0e10e4ad687f928d58 SHA512 68bea5c15ebc43e01ebf7440de3c57e087db32485e1990c087b814edeb876412e8e87c6cd0736f7634a0873ef9ee7f1c10338cb2d500defb81493735b61f3589
+DIST firefox-68.1.0esr-hu.xpi 526252 BLAKE2B eb3a4dc21b645c348457c42f915928cb4da0cc53fe47db25727058e978dbf1f5c749f4843c86f950cfa63b8f76957caf125df805953e9b15482c63d190ba431f SHA512 7c0db841f70fe7f69c655e7c79d4f48b031121bf0011026fbf71922841a9ba8bb5176e4db30503f55995a3a96aff6465b129f87a34ff1caca0e6a71990092171
+DIST firefox-68.1.0esr-hy-AM.xpi 542627 BLAKE2B 0e7629e6e75428124fc35fb859d7948c67fb5e641928b2e2074ee4f5f5df1bf10435e6428d9b2d8fa52d6efb6461831cca2069f6be279c23393df0111a3d054d SHA512 31726f30e4b264bfb09b07c51130ac203145ee743b62d6db512cba0c0a9fa9ee69c0dc7427ad864723f1dd9e40e855738297bb273f8d488a1947c165aafb2d81
+DIST firefox-68.1.0esr-ia.xpi 496507 BLAKE2B 63c5c10c212ceeadcc3f1a63ac3512d16d50fe0f5164db9dcac2ccd56375125e0503a6e00ebf56b69498fed51287cad1897fd857015763fcecc555ad7b791d0d SHA512 4fa7344f794421ce4f2346c32882f3463033b42e3bce25d17b51dd514d73f8ae3e32d27dd739abdb0af98c932c19132094720c91a64a32d05f5135cda9bbc796
+DIST firefox-68.1.0esr-id.xpi 491919 BLAKE2B c55820bfd997ad96ff087cad3f42cb772b92beec7317bfbfd06626cc18cae8c0ddda55007c9c3bd017884c7dbd07d84568ec49bbd2810fa32d627cf5a6e9de3c SHA512 e0bf1b7f3f356a1da833009203bcb8eb0510c9cfd29e143309777d482a543a0b5c2902500b2c3199ea60269ddf18d0be88f1c8779229d3ad016f6a97c9a39625
+DIST firefox-68.1.0esr-is.xpi 499986 BLAKE2B 4b26b6d5cc882a9ea338e5eb472c89f9bec1724fc326f4f8b58c0cabd30d481b1db30701290379d8d0da0ef5c48c4c66e2b2703066f8eb4ec2dd32ce05e6b616 SHA512 7f0f6ededd7d3f3009f8b2f69aa9a47e97c287347490f179f622dc5763499fbb76c3a4cd21bb9692c4755aecc04095ef7c93c01431c8d22aa0b3aca9e1aed8a2
+DIST firefox-68.1.0esr-it.xpi 383769 BLAKE2B ce5a05b07833daa1d67c4425d0919655f10de40ef511f658bd49122e55f261cfdb1943bdc912489908c11e8a972e650bf518a2b72757dedc16e3b00bc0833483 SHA512 ceaaf4f051b4300bbd9e4f6bacfbeb54e3d2e525fbe53a642fca3e4b44e7c2b6c355891aed2ca75bf42ed95e74d6309f75fe6189d71dfd3cbd9734f84ac1a6d7
+DIST firefox-68.1.0esr-ja.xpi 537100 BLAKE2B 29a14d11212f4ef6fa8c62be2872b63d1e9907dd8812c9a80aeaa4157cbe8e75aceb2ae9bf776eb91c2060016207d74bf1d141d0c6fdac20dbb8b919b4ee7838 SHA512 068d32febc0f46fa758e4a92622f09f2a698d2b5f4a5e3de5fc82e8ab428c59650d0c1eb1aa6ca8461f2b2feaaf3da8a39b40c18b84f5c8d88ae88965a965ccc
+DIST firefox-68.1.0esr-ka.xpi 544708 BLAKE2B e0bfd3f04b042f16c10ce6be2e85dd882a67ab7d519e12b83967ac613498410c51919dddc4b1fab8f694a5edb1c6efe19ca1a0b51af7d5501c3a8ce57996f977 SHA512 44bee7761c1daf85fbb5b200f2723e799bb8bff27bd129256a21468dd41cef13b9ee38aa6b9a30130783e13b7bf869b7473789b8dbca281f88e81fed4768b0e6
+DIST firefox-68.1.0esr-kab.xpi 508638 BLAKE2B d78b8c61c927256abadeab82fd1dea4d78e8aa4d8e2865f56a63c93f3af315a1187dc7197d8ee1b067ea264cef7f9e233e4a60e3af1199b01f2399bd39cc2295 SHA512 d2bc3a0c27714fdc478b3cafcbeccc0c7337c0a0d13b463b0964da4b17ec432d581910123a7a3862200ed4e4e46f8f58218bc33d2358f0cf95687524f02ff211
+DIST firefox-68.1.0esr-kk.xpi 578943 BLAKE2B d14fea835bc43d7cfe881f24ba6174392fe6ea09963ace4f553f384a9a79fc9892fb44c6b67d184904dd034298e3459662f5b72b29bbb4056a553ce82f4d3b32 SHA512 4dec416b630cf05a1212949df6137debc82e4791a535348b524f6a0736e090fcc52b0dc4fbf5be99f52f40ef6b952c36126f5521a6a24336ed103965f31c368b
+DIST firefox-68.1.0esr-km.xpi 551383 BLAKE2B 6a29a10b4ab6552ad82f1bbf08f4af386d85f6a56d00b27304ae206b3431b848eeab219ce5056fc264294ee114de0ab809f2bc0b7e54ae9ae049dd87a37f1774 SHA512 b3ac69c0971ad9a026e326946cac5abec1e5b125ee0382bbedb2613a00038e4425c090d3f2867f2c0d31c8560db97b237b4ddd4c2f889f8c314fcc41328dc0b8
+DIST firefox-68.1.0esr-kn.xpi 547729 BLAKE2B 857eaed1f4ad7869f75e93b15afa16b2bed9a997036f7b3803b1e05eb9013eea0f9a8c1a80b445456e3e60c06aada86cef264ab65a9eebfe9bd1f4a89b5d5949 SHA512 6858542a304c5eb959df25dcccd1a1c0068a7197a775ae9b47709ad5625d4a6cb11589767dd47f0b6640d031974ea4015dde3f2fdde1dc85a6d2fae8417f7fa5
+DIST firefox-68.1.0esr-ko.xpi 535961 BLAKE2B f599a471cc3edeea175b61981af4ea09bff5f75c28eecb87d3bde161c8da689053a0f305debf7c6ce7deff223b06d523238780fdade256bf6d0dd65c06dbd14a SHA512 67d889c4b17620887a9ae3b9c468970e12994d16174ffe121c1a72a18d0aff946f9a7ac82fbc7466c3343f437d3ea895cb9bec7cf372f69c85e9422aa1242afd
+DIST firefox-68.1.0esr-lij.xpi 482050 BLAKE2B 17c5c256136aa948484438ab73d2cabc7ec98e90f33204a69bd7bc8746b902ca74913142a885a5d2f580305c587c25759828215b5fa2db7d68d502ba756926b6 SHA512 ab35b617b61c539ef47d89434463c047acbd88e828d421417e7643bc9567aeda1877bade6512073fd2f1915151ede68e98579f62e70adbfe28af9bf7f594fe6e
+DIST firefox-68.1.0esr-lt.xpi 527595 BLAKE2B ef542a96a4c3781a81688f3c60e0231e42f159c44d2c1f474759dcd7e528488830bb76394b093efe34b03600240a21b0d6828af483181474ffa72206dea015f9 SHA512 3212212b352b203f13a510eab4db03fa6fb2fbd45bb0991db86cddb907e6191c5bc55854d2032638f8b8993a72faa37c880eaad415187c3999575ba49f147a1a
+DIST firefox-68.1.0esr-lv.xpi 500471 BLAKE2B 862db7f28e338df276c9a144d6439d9660043a6e97ac476c7c435c4e4739e0e2442a94fccfe80f00b43de1364669537a67fe7737d05f9f27211a4585ef2a69c2 SHA512 69cdc354f6fe27f3fc522b18c048b77df714766060060bccc73bbb727cf06d225578628a6e94834490091f24ddf1846b306ce277490c13bc6bc3a3b4d53a6054
+DIST firefox-68.1.0esr-mk.xpi 485317 BLAKE2B aedade0386fad3b0e29e66d667cc003f1efdc49a57da95493ed5272a509f5bbea9ffa63fe9784c475891daefac886be905edd7e114e6844668008c99c74c17e1 SHA512 2ed881f19efd11c26652ba408e0050c8076dd3409548877c3f9d5476106d0449a54e8f661aa335204e714be21fdd066d44816221a418b58bbd76c46ae5d46673
+DIST firefox-68.1.0esr-mr.xpi 559184 BLAKE2B 3ef28521fdff141671b083fa84adb737e271c96bef1dcb882b71dc3a098debc46ae3fc104d20b0d417a16aa4187b95f4f218197f129d1d245443d58d5950bf4d SHA512 194592944015a6f602c42265be1ac55220e195ab45f89760195e8cacfc9c0479383d374bb11d243042ed2106800dfc2af8106cd7a180ab041af141a03d8fae30
+DIST firefox-68.1.0esr-ms.xpi 480466 BLAKE2B 0a154ab74939d2b59574965c61d2aca44af118eae95ad0259135f84a4b270f2b1fb96bff0a6284a2752085ea73a0ed3cc1cfc80e10e4691d850e74959d13ba61 SHA512 ccb63fd16bb35829404e92f754b94980645c68c42a0404e20950965fa0ed9a30514d4b283669264bdf15dbbfc53113c3cb14bb57f4f1b37c7dc1c90ec519b044
+DIST firefox-68.1.0esr-my.xpi 552171 BLAKE2B 2f3f750a9efc8f639550fea5f12d48eef41a3290025b1257e66cf0cf6fedb046a645b52077da3a69b67b16533378bdae80cf66095b51ce8dbefacc727df13c3f SHA512 3c1c2f416f65f490d0107db99a8649294ed8a9138355dc1a5daca20f6b1b55692f5a51f9ad249823621e8074d5af8a5b257590dbfcc1a8a6e36bca511768a749
+DIST firefox-68.1.0esr-nb-NO.xpi 496184 BLAKE2B 06e039662a07ca977488474ed27064bab79911c0148eb549d7899266f68e90609f804042bde29e18b94585df3fd4bff483d2bb32f43f0b549c7ba48644c0e100 SHA512 8a44c5d8b7528ff53c2221a99e631441cfae0e7d1cf3efec663efb07e2959b8115a554ea8e5a43efe5298052db9aa6ff2c0940a2a46d3b55a225c3c6a7a44a5e
+DIST firefox-68.1.0esr-nl.xpi 492189 BLAKE2B b84a144a88f11b71d16beff9fa9220f8d1178497d66ad065fb68f2c52ee65f45296c6adc9a0abc96629da072dde686bd04e62e7559ec10b55038647db26b21ff SHA512 a546f738b92a9f763131e8b469ed11b54713bc30c0522a5cec4cc7ab99bdbcc3553dcabfe59328b5d84bfb75e77abec9e045ed2619f580266a532d8bf11cb6eb
+DIST firefox-68.1.0esr-nn-NO.xpi 494802 BLAKE2B 8f5486efb0684ec93649911df0ad39911b39c5043326fe7f572d449e95554782b41a7efcbdb40b92f599c4f085e5bbf2a0a129bcb57526a33bb1004f19d69e7d SHA512 8fc84cb48cfb5a687c506ed804e6d79890e71782694e5ec365468515873b179572ffe3323695d4c7035d4a01e4d6617f09751f10806aa8c5b04977a1d7ae7632
+DIST firefox-68.1.0esr-oc.xpi 498798 BLAKE2B 19d8358301139d46e26f714fe92386458c1258d5ac0076b7a3d741f556929592cd309ae2a25d64a8d30235b2b2f9e3485533397c53d93cd27fc2ba0455b1c33e SHA512 eaeb5edfe0e5f5ac2ad7cd3a7698c18e77c74d09433af4dc6861bcc2da928e5aceafbe8531c844046e78293289bfe7c4a1fd26ed8e00c49755d9ea8bca56a1fd
+DIST firefox-68.1.0esr-pa-IN.xpi 542701 BLAKE2B 362f376a74c6e2fa99429c87bb229f5454caf4e5039968e0bb1314d22341b80d00cbbb30881c839f09349751b85fae156b27fa4807b9ff18b82d1b4ff6b3efca SHA512 60cbeb36ad1b3f15bc7b2f908f08307db2777512423d8310c4b203901b104ad4722e85ebfe860c567c7bfbd0137ee7381e2322ecacfb86becfa0cc738c92b7ce
+DIST firefox-68.1.0esr-pl.xpi 495839 BLAKE2B 96d20dc040dfd5526fef6465a8af7312fa4f7213be8d067d39faf3decd72e5aa62661a66f98d515a280e4a216ea37fe98a17b3b25470c50a9b1d6eacbe738d93 SHA512 0b36f795053e8f2b996dbdbc29f9569f2a3d6ab638c859d5f571029e8f29f3c5b9c64831c3ec5aac48ec4cb41dd19027bd7c7453f988ec64a6dc872d2b00d62b
+DIST firefox-68.1.0esr-pt-BR.xpi 498241 BLAKE2B dff2b8b77523a3a1865a857ad7c1b5589a92f14de9376238625de645fc44802918ee795511b8bc60c30ff8dbbd5fd1711e65273cde32768a771f5bb1d421f7a1 SHA512 c7627d202424fb25235d1e23c51a59bfb9ca5abc55ad24499ea3e25beaecd31ba349c725ecfd32d440ec6013e2512630d53e7715b5375e8f88f0f2664afc5448
+DIST firefox-68.1.0esr-pt-PT.xpi 507855 BLAKE2B 1230c218397149f611aa5f9628e665dde851df01054ac16e3e5db9b5b89fcb9efec8e8df89580319f83b7dd370f543eda38be21b12662c19ff8f650e8ba9e6f6 SHA512 07abbf2609d6a9d3205e00d1f9dd2cd6c3f6d531726f287ee81e9157c576fda47faabd721744b9cac76fecde63ad16ac7c1ad47ecb01dbace6ee061dbd28adf4
+DIST firefox-68.1.0esr-rm.xpi 495523 BLAKE2B cb79a0730a290b662724a7c470bfc13106eb5a75537f6fb06007f9e8e49bb21bf5ebd90df7adec680bb4fc19afb230e853ff159ddd43afaca68ebcba1e56beb6 SHA512 a6ce066b71aedd3372864a2ebf1085ba560f6e5e91eb250dc94f14d7b0176bc3605cdf0c268d77545f908450e43d01df1e758e2002bc1caf76c358142b277129
+DIST firefox-68.1.0esr-ro.xpi 508808 BLAKE2B 6f6807d47e442550a31f52eaf359325e90b858cfd2c30bed010ae91317d2950423d3ce7a7cc5d0075eef01cd24569995ecb79b3677e3004830c651e61a997e41 SHA512 5a4a66d45d392cf30a47d133e77c8195e7a125a543bece3540f0b40303c66060464453cb4f5ff611b31cc13d89797d0f42633280a142dded503985346e7c37b3
+DIST firefox-68.1.0esr-ru.xpi 583979 BLAKE2B eba70dc24ac8ee674c1d7176847245a7b5992be0e9a1c50bec0f981fce0955a685d22b4a4714c37f38d2c52f6c038ea47a306970ae9d320f8381ab59fcc0f144 SHA512 f10824ca48d0387b61fa00397ee5190627d42ba21d6bdeeaa70a259a85c6e54a4becd5e2f7b954a050886ef8ce099bdafb4977bc55bb2c12e07c169984c433f3
+DIST firefox-68.1.0esr-si.xpi 528265 BLAKE2B 182223709c857a595123c4ae958e6deae0d095d87f9e3d0d1210f7ab07a0c2ade15a7331976b9e8892ae4ccc5caa59cc3da0d72118eec3ee0f975ed46747af35 SHA512 e859faeb8a31d7af6c4809d69fc619c0bd23cb04cdaa503d39d8bcffac4c592845be79110e892db35ff5667bf623644e05f38191f8146b7f3439a029280fe83c
+DIST firefox-68.1.0esr-sk.xpi 525299 BLAKE2B 1830d2c9e1e2a4fa720a63d4632997de75e2e2599161da51ec6746679ffba00338b1fb102b5b801b9dfa70b7a9de49557e0e8a125628729d41ea289e2b99bad8 SHA512 c057238331781db0488cf08ce5da6671ab95dabf5de82f9a0034663f0c22020dda14e2a22801bfbeabfacbe7e17e1539f99029a0a58cb7c88cd8d5d5b40ba198
+DIST firefox-68.1.0esr-sl.xpi 502411 BLAKE2B c2f7254443352bcef0f27a4d32ca229bfd17ddc1f80c7306295b4a578c30f33db55863c325dc5fbad2ac8ffe0d8344ef77676cf59679e0b59a6d86a32aec2ee1 SHA512 07f6c4e133cd18946bf5dffd036c70fb3e578f3fbdca2fbdc449ed08d9c110954aa395d908a4c0d7d91c43ba212ecbece184d179c748c97b41ca6f3787f7f8f0
+DIST firefox-68.1.0esr-son.xpi 459040 BLAKE2B c14f8a984726998d672cfa8125588335a94573b1cf500c0ad0d0896ec86ce63d54dde66e2a4faf35f11595924f04afcbd2a7c1a44ce6d29b672dea0927d9937b SHA512 1bc85ca311c3cdf2322d34cf7f3f5ab60505de846d70da03b5f12486fd288ce1b3676938f43436fdd5cde34189a2f3d3063424031df88e0bfdf3a3e3fdb7bac7
+DIST firefox-68.1.0esr-sq.xpi 521626 BLAKE2B 5beb02c01fbdb29e5107bb00f45125df79f102957f80dbdd069852c374a7c3e7123437ab11f12554622022404def7bb0a961179f4520b17450e564fa450ddd50 SHA512 23297a5edab8ed493df8703b49e949d445917ae55978b97e1cfcad0b1cbc3a0da2b38281ea98271ddcee2a3d445da7840a696b90546488440ba0b42dab6a8343
+DIST firefox-68.1.0esr-sr.xpi 527536 BLAKE2B b58ab7645814d01426badeabf51f7501d7ff3652cd8d727efdd9bb447df9772bc0f05c16fbe1a4027771dee0c648dcf5ec2b0565222f5342e3446fca3e2f2035 SHA512 ffee9ca085b5d51a9e0bc3451df57cec9d0902d82a65cd5f2725d96768f17e41431e0755c48aa21ccc27a5d18a8a279053f871fcebc46ed8b8ab6647fe52fd1b
+DIST firefox-68.1.0esr-sv-SE.xpi 506913 BLAKE2B 4dab32dcad0008f89d70a966fba38244d3e14b0f07f019099423870ce16ef8810ab248a74007d3cf9c2b02b74b576e96eaaadf4e76fb3ac5a90eb4cc552ad167 SHA512 85e5ab7675be344d17bbe9d39a17d32354e91e61357f3a26154404b9b1b29d22de1f8e284c44b87ac964f88536f70118626728a6fc9765786fdba3618251b020
+DIST firefox-68.1.0esr-ta.xpi 549375 BLAKE2B a5c8983939aab6828a172a16679ee57883ee2a445e81ee67ee3c73945c06638cd9c409ac21bdd5b2b0ff656ad204034a742568e6f121b389cc4fa10fb85e792d SHA512 2018619193eb937291e036e438b9ae8fd1a235a3bbe5f806c8f4957348440c9ba1e5e2e6ab1cba0c110f8358563f211cb23f6f97a7127aceedf73ad623e6db07
+DIST firefox-68.1.0esr-te.xpi 561721 BLAKE2B fc2e5bc67269ee8a9517f68fd067b968c6928144fb7af0966303d9eb096b13a70285dd47525792ac87be541b8244725d86f0b8a3610117f29d65c5257e5bad4c SHA512 2ace379121263dcbc82804886b100d32484397ffcbb27420a39b2a9b513be483f7b92d702c5962a98b5c1a821517abba6978e8e980ae183ba9e3653141ea02fc
+DIST firefox-68.1.0esr-th.xpi 550953 BLAKE2B f112a1850ed5fc5f0fe1a6167051201e1c5c4866ca54ac1941541427342cd6bef05755e3c490a604744d01afed95a1827308ece2644fe0e1c17de2f078e591b0 SHA512 fec0a49ac515fc22b180a729b91288c3744cfea565684b1757ed72d26cf6e4dfa49d59907ac9319e7e819147db08d2bb6f84d4e6b21ec8aad9f90ce19fe2f7bd
+DIST firefox-68.1.0esr-tr.xpi 515319 BLAKE2B 433eef0aee2486c5f03733bb0b92e101c11369a7c79cca4b99056d11b9f459b1aacc13e2564cedc290604135adf72b0e660df2a20d2a83ee59a417961dfd1c69 SHA512 83d39da9391be97cf1cb3a4eef8b7d08665bac8ebcd8ffb8dc11ca3312ffdb42251fac9d980999e35821240416be160a4a8d71ff4991512d3fd0754c35eaba81
+DIST firefox-68.1.0esr-uk.xpi 569041 BLAKE2B c84f57457e0173a1c5a2873a1c94ccc689002c869da2e23b5f595d1813deaf04096e37beff330d0d447600001da504c6a83d1caddb556dd36b503f6f2834a93f SHA512 abaa6047c01ad9da79039d55ffb364241dc37bafc99e9fee827532e9a14b5053055114f9e52ee5813be87f72dcc25b0f273cc11f9a49f1857ffd071701d8d031
+DIST firefox-68.1.0esr-ur.xpi 542524 BLAKE2B f0e94f3912d882c0b010d50eb066cd05de28d2f36e7667ef5f06d5e246919e564bd9343f25a0e46067c50c418ede08758225494ffa9ed22e9d40f33f6f71c191 SHA512 e31f508690fb958bae75355b9e1f78ced87b3680c8122eb4e3ec4333ea28829e8dc869162fd99d9c1e912dc16ce7fad0949287989978d4649badfd95dac8e1f2
+DIST firefox-68.1.0esr-uz.xpi 482647 BLAKE2B 29f702f1fa56d87568b6fa20a3986003a08611f78707be4ca32f1a4717e61af83a55bcc15d74e929ea0da1d2e36cc69ceaf74b359e99e48f8487f1d56e027774 SHA512 557c744e654f6d068065c840fbec872eac1cf4b9b05b3f1a90863cc19df35c0d65293bbdf51908fc1beb9d4c58405efb76af0b0bd01b4ce4b6a7cef3028ff663
+DIST firefox-68.1.0esr-vi.xpi 529349 BLAKE2B c30529d5d7eda32a74f5a0188096c1bea9182b39f6aa2d3fe22f43cdae2d1c16c2984d06ff0fb34ebfd19a9f08cf17d0234b1478874fcbf2aea657bd144ee878 SHA512 c0571e38cce92c2b4c64363682c6980303156e13376491e94389b78eee6046e85ab1103363b4ffeea7e04fe538960d371f7db5b5bddea0033e4c238c08aa7d96
+DIST firefox-68.1.0esr-xh.xpi 470586 BLAKE2B 24a2aaae2358b8902c3ba236563dadbff8e48507ba2e286c8b93ccba576b7204412bdc7151c038d7f2853fb8f0165e3c3af7b29054b7c087368eae69625e00de SHA512 704c7140e20ef443ad2ff76d6c6bce04ad76f3be7e88db4fe9655081c7e8f8951be2b78970e8551feebddb81973864bae24a3363f9f6bff139eb75d9d8a789d6
+DIST firefox-68.1.0esr-zh-CN.xpi 536620 BLAKE2B d99473dd06c33bc715a0bd451a5b30151f9fa8bd10051ffcb81bda7ae6002bfe5d3ba54f76fbabd82113fd31e9cc559e821085d3e5c6c383a36b14c8d30c096d SHA512 dfc25cc63f936b01cf90fd1234354c61d803cf81fdeec5378b39550e44b9aacae6601c27c31a9c18524ccfb115e63cb99e33e7454ef2b4112dff54dba6a81ca8
+DIST firefox-68.1.0esr-zh-TW.xpi 536144 BLAKE2B bfe6a5d79a89975ba60c14cf9be25d2c9f79ce710220a2140b26336172419a516cea0aca5a459ef0d28c96b2cb3f2dc78d7bba41746cf31f27967561a02f489c SHA512 a689e054a36ff146c0bc39246545b28592e1a0cc0db919af99cd56577b2da8357b84fbeac539bfc9b5907f63acfddcbbc7c6a4f95ab4e35955c60f1778b15f2c
+DIST firefox-68.1.0esr.source.tar.xz 312155752 BLAKE2B ec5c8283beff4a00b97f1a8732eafa9dd8a6a6a7726187c9e435ecf387f07f1db5851f78b74e015d56dd82b8f792933e76f21c05ba86bd4d5572f3ffcd28682c SHA512 a53b04b6a4fc98065596117b6bc0aee40c36f74bca02dc7486fda7e9556ad6f221f5ead94db1dc5db572f277556a21b22a0395dae107b67336ca91e33df9882c
+DIST firefox-69.0-ach.xpi 471464 BLAKE2B 16f7fd96c155c89adca15ff61ec95df9204a8876421b2fb81c314b453e063904f793a94819ff9e5742d699884f9210f1a9e9c6854be4db0db6edee64ba295bbe SHA512 0ef9af9f8c1dd9e3f33434686005cbb4e3d41b5b627caafded8cee264ef1b8ad6eaf282a4f7c44dcdc50f29fe0f39dc57724c1cca16598bbab14b6367640373d
+DIST firefox-69.0-af.xpi 449151 BLAKE2B 25ebf00f6ec1bf528d44d314e19457f453ff553a803b3ca775f489cc5c6419733459d47c04232effa5a715800ddbdad6f5dcb7a30fca9186b68f42bea69cbe4b SHA512 ec7da41601dc744d321b129c2e891b53988e2cd579268aeec810900e38d2d4ff0219acfe358a83c9cb51967f9d25fa38da5e06e1c274f76ef51248b79eaca562
+DIST firefox-69.0-an.xpi 482733 BLAKE2B 3cb92ff748188423067978dc364968eb5b48e6049b143228d3ca0f6216d37c2ecb4d3b8c4a4d072a0eb6cbde9c9ae3d5eef91672e32875c889f0f0dc4c798230 SHA512 7ddf561e2a17db1b897834dbc86d1e2dfe168da4fd0119fe02fcc1b86b73509952d89de7c14b8a3695255b8b591c32b3cc7f882bc96c6c56713c4afcf2fe56b4
+DIST firefox-69.0-ar.xpi 541411 BLAKE2B 25fe08762d5a20e186caf9dff2240bfbd6faa1e708001758dfcb8aa3cdfd59ffac64ab4d086689ac8aae2a15eb28daf8153288d3367293f5b5db6330877986a8 SHA512 0cbf0bca4f5c759abb8cf67011dccbcc2aa8d9062639834d98d0a7be9062ec2cbbc627804cca0b38e15435ccdeacb5a924b810e2fe0ef5b2914f3e5d3e1f1ad9
+DIST firefox-69.0-ast.xpi 479365 BLAKE2B f5c9141fc699c4a8922a130590a11d21bf28c2391946a3bbb70f42ae3048a838764da5badbdb51d29634210142e9283b21303ebc12eef984c1d10ab42202f836 SHA512 46555778f1417f431cc3bc68495130d21f60be3e7441706e6f654bfd2b441b0ecc8942e252866ba8037f7695c776be909f24e9b5f94e6184c35b7b32c3e6c156
+DIST firefox-69.0-az.xpi 509588 BLAKE2B 9719d4bfc4e9252d1b6177c7af86c1bca6a62cbbee2a8386ff3ef480f63c760036b9128cec8480138466510620b76ddd4dce3839bb932bc5e62de499b341767d SHA512 92f4d261cb0df45dabb858e2074c80e105ff802df8ba5b296f85bd2a2b2197f7f6ee39d92e4d2260a3ce6c7edba307e45f83a2400597ddb6b1b1cfee895d116c
+DIST firefox-69.0-be.xpi 594812 BLAKE2B 521bc289de861fa04d727abf2dbebb4d13da30ffc1fae209f165a81a0df417e3fb9d78baac8dd935c5a16c288affdf5a713f9b58b26f960c2b267a645daece64 SHA512 6a0f931855c7aee9ed4ae35593c8e8d9b710b38e7533d74805b3789de42fb41f8a0e842d44868a85e12528c50b0abffcc4d9bd26e455e03e9193173ff28b1718
+DIST firefox-69.0-bg.xpi 553023 BLAKE2B 4a66a12dfbb96ce2f483104201983a62d49bfb84f96279c9bb2bc52c1ba1f70ba3ccbb5ba6c91f09c79cccd22331c45d43df0900f2c38ef3038167e4000997db SHA512 5c392e56c6a85950203ceb685ed5e96bd4b0fb274171f768c0104c4a6a7e2c600a2a69e5f785cedf6bb19684c6f7f44b5a66acdf1da71c6f26c1e4660689de19
+DIST firefox-69.0-bn.xpi 572160 BLAKE2B fe7d1f1515a19013339c7d30bbe7acab01f3c9271c62f96daca28e1a8df880d20d58671a81ecfe72c7bc89d9b900b4eb5fb6ffe049e9ad903c7497602e87fb60 SHA512 2f3c660c0974937bb5ff773d8824358e877fb0212e8d7bb9a9b6bbd97d06169d2656c3100963a1bf5e252d4b65c903cbf3733cab1bba3de695e347e9895e9cba
+DIST firefox-69.0-br.xpi 501726 BLAKE2B ae152066104e2162209884afe9003101d4ebf849c496afdb04245bc1fd9c802791f7b667fd1cddcc8d217e448b9e0a45bdea209d0fa9e9311d2da1feb824ac08 SHA512 d9d68e8ca3f670ad0a2b8e5d7426385b07b518084af9f06a28eef04cd38ea443caf6f4907ff69bc41ec000ef2503e38eac8cd36cc87fc0a74f5bce1d86e2fea9
+DIST firefox-69.0-bs.xpi 482432 BLAKE2B f8a5006a039ff099a6d2fe64590d25f376e01e4a1b676f102c2ea6201871f6e6929098245e86fe6de2c71ecd4ebaad6e8c1a51e3c986399dac1fa79850364357 SHA512 8850b4ca73eb017f878162b0677fda711c47c5cec393dbdaef25d4e067f54fdad7d45942f37dd6c24f29a08c436f533353b17f2c7bf3189391e48e011031625d
+DIST firefox-69.0-ca.xpi 504083 BLAKE2B 7d834e4fd9cc7f872de0e352e7aed3e44984d7415648bb095d130b4007a8bfd68bb4756a691616aed40897f1ae6a61e326eddcaa17356eb1aaa79e56cb1af799 SHA512 2a5bb71d789eaf326430ca52bf70e6622ac85cd51e94848195ad26f7b3ec5a3e1f648673243187f910eb39673ddd39bc997ed300cd03d214b570628e257f3788
+DIST firefox-69.0-cak.xpi 539423 BLAKE2B 2bf80b6b256681ae6d909e8dfd9e449a70b6b2ba2f5b67ad6b7f6d8585e05153773257e37dfb1cf9f01f3f104aaf828135cf0e6341ffc3b7c9e6fa1fad097059 SHA512 e51e4b02f1ae550eae5506a53e817370fd6f17b870f95aede39513a063cd0ed000a2b74e3d2e2fb8c7f0870f8e9c49a0f4da308bc96ed4316c0f40e9830dbf65
+DIST firefox-69.0-cs.xpi 524200 BLAKE2B fd5492bca193e3b95203905ea7699c3d36e309ef9dec294330f6dba13b7ebf8d3f4e094eb3b2f4b4391676139a4a9cdfe819a804d9e38e5e5919432f85219719 SHA512 f72ddfd49064f7eee24b10ec4d76760056429ae7e4af7610d179ea544a1e57fefabd898f1d0681472e57e9ead876fd3dd5aa1de6c774cc8f5ac7db000b746b93
+DIST firefox-69.0-cy.xpi 517169 BLAKE2B e3f28127af1c40f232086a351cd557ea8da3fc6a0f6e08a46da3f0969883d16156038bb3aaf587c34a04cb4947bb0c33eaa1a41b6dc72164e538f34a987cbab6 SHA512 b5aea9f3ffcad523cb71a7fad9782570cc7eb4dbe798cde8f7628f99cdafb7d2cd3315beb07ed0e99f38ac685a0bb933773dd47534ac95a0b33acd8ccec93fef
+DIST firefox-69.0-da.xpi 505090 BLAKE2B c5bf7debf8ffaad4af8ab0fcc471c99eba9338122c54f7ac53ca4405b8c98861e4441c21154c0a2fd708e0deda89e17dbc23ba38f25336d3560411871470fbe4 SHA512 d32733568d22df2839c19c63031d3d6610372023c7ddcc51c3c2eb04e9681782f5fddcc7241d4c675f7b779b7526da36403a00a2c6e10b5fdb201f4e070728f7
+DIST firefox-69.0-de.xpi 525392 BLAKE2B 2bf9b3912484163bb84f1aa25fafb703e06143f3fc204053ab3bf24968ee322ab61c39b9a75642bf2e315174b7d59bc8cc79eee5d9cd334e6b8b8e056ff120be SHA512 29344283ad76d56e1b808fdb1cb6d3c7c8e7e5698dd1cd857ada815003070a68ba4dabb1c25fb31e057e524a5b323f733269edf6ce66d172147316024634995b
+DIST firefox-69.0-dsb.xpi 539379 BLAKE2B fc9ae23af77c8a204cc25aa459a77fc1c39e8d11e9803afd4ca479b038d5ca39664de91335d897bdb8435b5161cb6637e12f7156bffd32af6bf8c4e0d82b3ab4 SHA512 5542e41c79e9d47e52fd446a76d3a1ac8d6cd40aca6d97db86216bc7b5c0ad0067deb84fee66036cac17ae9d74a6cdb5b69ce6c6227c3b5fb0e7e2b7f8137a6f
+DIST firefox-69.0-el.xpi 601037 BLAKE2B 337a63caa0c1c76a206383c19638ed9a2a0df67d0d2fed6e1f2aa462459c0cf5b8ff0fc268f0434024f22067fc65b163071f484792c55e269f7b3580e6bc76c0 SHA512 5c72b00efc87f8a43a5a3af8b7e3642ca016bd9a27103a2b1e2e89b3c1645f8d2cd118224dac551052e3b41f47e1558a08e2e2af4e3292810fc17bf61481d4ce
+DIST firefox-69.0-en-CA.xpi 486037 BLAKE2B 8787bfb8c339c12c0f8e3083ab3e4c4660e2486653e78413e58cea478db2e2c59b2c19dd1fde4e2e8c5b1910f5686c2f4e08394813f3bffe2d396ac552c1855e SHA512 cb75ddf9ddfc6f00437401d277ca480e8a1d0c0319a632c957af3e92e27f399395942e9cb6b9eded36ebea3711488e631bc1f183604a2c7b3a0bb7623874c976
+DIST firefox-69.0-en-GB.xpi 481971 BLAKE2B 5a78dd9d2d2a281d0d28958f2c6e75a2d2d3ce8c50b12c46a90fc7a365c9c894be5c5babb780c90aa87ecc693f552e1d8c36f89605403ec6c056b844367ad243 SHA512 508cd525a429240eb907876f5769d6580d02f91e30e69b429bd2922f18b7576557b99f8703857a1383c39faa2f20938ccda9df21b22e82d39d297c2a2da48b61
+DIST firefox-69.0-eo.xpi 512825 BLAKE2B 4f4e6a57f3a9cb5bbf3e61bd8b4ee74f4f1e9b186548d7acb27368808ba49d195f490d0928d447787e3bf8bc1984ce64b7bcb33d5a04495d251c7f3723cb7645 SHA512 71d1181464f491cb34cf41826416b4f5d26a851e32156bc3a3a51a6c014a132ebf0719c658ffba5603e74f71d1292690a7dc74707e8ca11eadd7864eb7f2519a
+DIST firefox-69.0-es-AR.xpi 522456 BLAKE2B 4d117a7c03574e1856bfbace986e7c5bf0ea6abc19776d7ba0e66bae3c581d5281131be51323914c365e95e50707401d5e044059a5ac9d72937b962c6017b59d SHA512 701a3551c8ff3ee167dc477bf239f751433067149b4ce1ab6d4e267301eb117d4bed838f2fc1733e0b471fa31f19426a057a448c7ad1073a1626c8bd68089b92
+DIST firefox-69.0-es-CL.xpi 519212 BLAKE2B 255ac26d70c503a0338a5dd92dccf7def24b39eb27db2de14d07272bc67b214c99ba5afe5beff4d43dcae23dde625a6715d3fbcbd095e56cadc00c8823ecb2cc SHA512 5590edf74aa94542b9a09c2b29e8d63f950e490481693baac44600cf8eb2a3349498aa9f2d5239ee120328ced46e47fda6924c7755cd95d6e6eaef850cd7b0c2
+DIST firefox-69.0-es-ES.xpi 484554 BLAKE2B 06e0aaddb8b5870ada01dc0c207e99d3d43710ded741c0d1d61e9b59ee31a191518f2d7edf0d9172ff7f070163885f5b0e4607b2483f0d475ebecd4a18db8f17 SHA512 db33fce89ad636bb3baf1a4ee50acde78c7763ddd59acfe303b9e5f03f5f7cfdd45387d0741425a5b0379af10a79de195bc34a1ce33aea92ffbaeec974684051
+DIST firefox-69.0-es-MX.xpi 517638 BLAKE2B 8d6d2ec1ccf46b17364723c957b89cd3e96f012aaefce19c8465da5f36b4c3c663ce40fc89197230adb937820784b9b2fafcd2898c457892a08b27128587b94b SHA512 c622c238e9b043b3977a2fd4304271801bbcc77e9f1eb030f21aad07347650e80df28083daab8c4447cce5440e34c389891abb2f109d1321d040f6695c289d3d
+DIST firefox-69.0-et.xpi 494288 BLAKE2B 91a6882043095f57ba8849afc49d20d9afcd578a01b10c8bd412fa83793a3c0976b318195c422166afc024685fa6702e9227258857225cbb62d3b13abb460749 SHA512 ccf974eb5dce61d59a78853025798fb25b9faff905939701b4618dd247ae9b00498af271d633afe8a90995ccaa551a10c20937ff05d9a2907319f793b25cda27
+DIST firefox-69.0-eu.xpi 509505 BLAKE2B 8c9fe5365183e7fbfad39981e779c26d170ec5739fb66c3055019c80b8a5bd9f428caa200f950d7c0035c2c9a47026a0d3f4371f0fa8d12281d921738f16c229 SHA512 48b52ac7eb7529259e402fe602a1ec42197e1f0432e260f91e4291dbde9ea20a8c2e61375d99e9f9d8ef5dd4b81f3f559f553a6e6acc9717e99962846b9d0c6d
+DIST firefox-69.0-fa.xpi 548024 BLAKE2B 30bf128f34fb084e69f462eb016dc1b49501c83766bffb4105c481b1b564c6739c78f78814777920f6a8e8787fd11ed1e3c21ed8d416477e9b953bda3ef871bc SHA512 f62b14960be8e157fbb4368e103f5280547b493789fc389a5b9883d8a6817157d539604f17ba83d298edf6e30d0ce05586fa711c251519c09282584f69e4dfb3
+DIST firefox-69.0-ff.xpi 482402 BLAKE2B 35812cc76fcd50c7522701b7f3339680e0fe41c9943d7c1e8ecbc922bb497020a516c7d4bdad38bd6dff4edfce0fde36eda369e724d2ab488c133bddc6947eaa SHA512 b8bc9745cffd0ebed71df29af9392edc89c024c89e42c9507ccf33c037f17b456fadc2eac0d2fe0aa6448def7bede770bc0b95be99d934a460c5347f1c88f9a9
+DIST firefox-69.0-fi.xpi 499077 BLAKE2B 8b43f0f6dc6684e4177e458fec43069b6ac90ba0827c2f4c5e160656af17641dbf7f04112c178c35006e8010533d647a9f9671eaa7045e7d4185b7d4a40a907c SHA512 aeba6bd7c2c77f99b13305cac4ca2955cb3830ae33ac1d7c10ec36b3ea6cf43dadd8bbc003b655e8a0b861661caa7100a2e792ad9659511e366cca4004075581
+DIST firefox-69.0-fr.xpi 532790 BLAKE2B 9db4d95a160a8ae8f5df81398e8139dd146481da81b390040e995af86b0eebb753f23a10694b537ff0b01c7236f97983b6948c050582462e508de437e3308e90 SHA512 16b43d0171b99d6d9d001d3e6eafddf362b8696b00a2fd7b51f19afbd4d1a7349fb4c5162e667bb9196ec6eab188e8a8373664f7c07033d43e7e3ddea1c7a934
+DIST firefox-69.0-fy-NL.xpi 519616 BLAKE2B 7746f0e618e120d7c7a029af66e9ddb7325b04c3225d5fc772278e4dfaaa4652a97bac0a8a0ee23275ff92fc03a87428d1b878b603d5b4fcce5e7cac97d2d05e SHA512 82caaf44daa3dc1359fc4caa60df6e22d32ea6265d1e36c74dab1351e1319aa6e89f769bdb11fde599467c6bbe4beb28e36da95c3911092f55c71106817b1059
+DIST firefox-69.0-ga-IE.xpi 487337 BLAKE2B 7baa3d46c4906057ef279e398bdc8f43c7afc006e37c3967dcae79b5dfeaf4775605a207cbe54cde5153d3531f3324af9a925f97b725cde7ba0b3691c2b0efce SHA512 2d0c332839919f6261cc54f98ff9c63f6181c0e7a3bda6bfbbd45a34ffe2c7d3e4fbd70bd28dc491651fd7bb8b032c14970d7675c56e9bf4da1ca78eb65caf24
+DIST firefox-69.0-gd.xpi 510047 BLAKE2B fe2299788834e4aad82b40614cb155db413afedf5a249da5a9a487266b708c5c2bc9bbce06981f5c8b214b1e250ad3f71537c7ab34dc4950b57c8d19b691e319 SHA512 6f65d9a88a160cba3a3b2f7d3b96ace76226795c16921cedbe4ee7afd506cc137805e4e0ae91e6c2001d5d180fb43fd406fef299a8b091705ba319e83edb28f1
+DIST firefox-69.0-gl.xpi 482714 BLAKE2B c96876af10c80d907e6dc4034e9f73651019e8faf4feababa858c11cdb1d819ed28e347d2ea2b5d2ad3222e49ebaa2a77b8a7606023ce933cc7d748bb77252f1 SHA512 37b0781a5c6291f6649f1ab45b978ff193d75453fd8096872ad74f988379eadd10d67570a38006c76477ee3ec3d981b1ba0fd623f4719831702f1d5e32c82f80
+DIST firefox-69.0-gn.xpi 529552 BLAKE2B d377f84a6fc88dd0a3e698f1dc36d533ddd27d19b9203c1b31132f5cafccb68595c90bec4a746d23afd46edf8f059443695812b7d77761b8501c57d7f1147948 SHA512 9197b293850f02e7ab189e84e309969fe584ae2c4a36fbd36a57b0eb1ec284994a3eb42d9daf31cf632aa6aff237dcc976a59f4e274a9c51ed4f638bd653a359
+DIST firefox-69.0-gu-IN.xpi 572910 BLAKE2B 8e56d34647b2e4b476fed81bdb5dfbb2344a736f8464d84cfc340e24d433cc0b42ae0873c84a8b8a01f62f1425aa8258518e6765ce7a6bb2b749cf665473da2f SHA512 54fa12c9a474f776d61e65b30493174186b01ff96e05816b1a920f8df62d76b8215b7cf542991efa2d8010e4f162aaea54447a1a51301a215f0a03f8f0abb545
+DIST firefox-69.0-he.xpi 525997 BLAKE2B 93c69f422a8233e9f3e6c44baeae7d7e1d21d052aef47ba68b1cacfd15261bad60193efb6cc2d5093105d694687e60625b59af8327800a5ac504018fc813538d SHA512 c2298dd7d4b85dde881cd3f5a0a616ed6c3d4e914a4b132bf185e04a6fa2de426ee43fc9229b0717346c1a40344c520ac23e36d8d33d3661238331f01d8ce0b6
+DIST firefox-69.0-hi-IN.xpi 566505 BLAKE2B 5dc07ee17aa2526300de86d727038417bec710ccf99132c22874744f1994b90d968b447301bbf2ec23ef1168a3629ee886d8bfe299ed31433b8baba032117c34 SHA512 97251e095f69adefab565d607bb93bac02ec9c15dbd84e7bf4eba889832c2c8e596cef4c819256339708980e223551a66d11630920856643dc869f62462172f1
+DIST firefox-69.0-hr.xpi 503670 BLAKE2B cae6061c40f30deea35a004166477dd97b07ba1457952e1502734c27c5961fee4b4c8e538ae43be8c90c6369401da8666b1fe99db55814be5f88c88be1eb41b5 SHA512 917b538ce53348573c4e5ba351285e38e5d2d89fae37332ebed80a43b33ce38fc5e79dd01a2fc33fd4dff2bc493f690ab49082e1955391af9bf0516dc840b64f
+DIST firefox-69.0-hsb.xpi 538170 BLAKE2B 21ffc13b3e487127315ceede52aa171ef8a47078008dbd950bfd79034f7c0d09a2dd466b3641116eb0a5b2d7afb4f2dcf364268d0b2735364b89ac2927e79fed SHA512 a817b96bb37c13ee369e2f771bf45c16310838149959bad7adf5560c0272028eb0bee77db03f435113ce910d16f6ca5fb6ea1f2cb8951ae2abe7913074b07cbd
+DIST firefox-69.0-hu.xpi 535846 BLAKE2B 65153877c262e75192e813c9e195ad4e127c15d9788e513eca1cde0d8259083536b65c6e0037a50a43b81a2ec7c8bd70a027185b65428f1ffea340d8efe21d77 SHA512 85125094b28a85226692875f3c080919b6a5f91d7077855b96470ee579877130f2432d6120814472eaa328b6e2dc88ecd1caf77e5eb24b1f7519cc01af558cee
+DIST firefox-69.0-hy-AM.xpi 545000 BLAKE2B 4b5fa719a400affcaa179dd6eb2d3624cac4f44fda20ac6226d4f27a8241cfa89d8e40d50d0e6208930ec9fe2a4964277f7410ee93171776958107ec15f0ed6e SHA512 f80f0d5ec22240996b71cbbcc7d226469ee9c23ee973e4118eaab3438dabc539306bacc64b44a60c02f2a7a0c4b9c514cd2082c78456ece8c3ecebd092a1085f
+DIST firefox-69.0-ia.xpi 506336 BLAKE2B f1ec178c4759a6c24e8cc7ef466bc192f687c18feda2e95408d108eab385c6af2fb2b79990435d94cccb1a74b5afaf32b4d5814bb907c4ce830d197e109b70c4 SHA512 b98d87a9970ed1b3974cc1704e8775628e20d64bbc95860839638d5a036a78fcf553f06a61c2883486317ff7069af2bc9e4c87037cb191998f172c6670091e0f
+DIST firefox-69.0-id.xpi 496640 BLAKE2B 48a0f0bb88f7e968fc11e3226094661cba9e1ac03db3dc63b69f0f2b582118fba0ff55ed5b5b00fb7091d4a9ab9452b738fc8fc8066285d9c328896c16ddaef9 SHA512 8b2d2338540a3949b386af72cfefeb908d76b75d1a5eb95664d661fbbcc6b5e8d46616d5849152aba2334fe17576343d504807d012a0ac217ebab0434340b431
+DIST firefox-69.0-is.xpi 498119 BLAKE2B cbf7993239a6ab0bbcfcbc54ef94776261536a2596cbd72ce9ac791764515e55e655a7c8f42c7a3d9733ebf12548a5b08ce536d492f4633038c53c782bf4f94a SHA512 48cd25a02190a8c1cf1e658edf6504290820fca8664e2a1e183921662cf80913299af43189f8b5499b4f02a75f36a72a0fe1f197ce026a3ff738c56f96b9cbc5
+DIST firefox-69.0-it.xpi 398737 BLAKE2B fb3a2026ad7b07f65a9a0108f3a53df80e53991aee48e97ad0caf2a624d448c5afe48e6e3328a02718efbeef0433f0598ef0670a15de6b990add51c1ac01cbb4 SHA512 bbbfd0eb47142b36927cbab30c996644f56ac53781c475784b61f8b25e2540eb63f0a36273d7fae83232407d9dc831a84c82bf93f12f37dbbd6aae3b65ba9c9e
+DIST firefox-69.0-ja.xpi 553444 BLAKE2B 6ff388058c1e8fbc9c00fb84f9bce934a5ee4a2f96898c8657b9ef61e637cd80e34add6008f8003e8f723f28f50c366f46aaa62c5ffa4a2d22bc6e78969d9576 SHA512 b9aa951bfa1b4c1f10afb376dd4e3299d46308f1baa250b2535c237d9e9fefb12ba742889015754a978ad2cbdb567db5870d39943954921e1b84ff8e324a3821
+DIST firefox-69.0-ka.xpi 555811 BLAKE2B faf21940622593c8bc3363c65a5a938f90e09341f6eda0e157e30616500c6e57b203f82e99e347b602e83a64b90b336baf4b7e0937250c1136f51e8bcc154350 SHA512 6c9239f51ab0a1598141b7b195d0d794d134b480b071c6138b7ce32623ec431da6480a54f3bb1f62951280c477d855cbff11b0b1e4db7c05020183b539b5b18b
+DIST firefox-69.0-kab.xpi 511533 BLAKE2B 48d039d7f0f7941cca6928f734aa332a9920ae2f4c6782333991f3bd05c53e00188c40bd29f8496cc6eed5183f07ec2a8d1d807e954e800de486dac1c5c641fc SHA512 a5bc4e22c8f61e44b89088410b747b9e33f49d2de7fdb35604c2b2dda58fb781561dd75a0bbafa325cee4e85dd4faddae34cb9e208ad9372f6947c0319012ce2
+DIST firefox-69.0-kk.xpi 581229 BLAKE2B 5a46aac29fd0d9610eb63e07307f51249c2061a64d964c154ae6ff010433dfd1996ec0d4b95ae27203823f1347075709ecf689eeb095b32c0972f25bb42c1b53 SHA512 321902be9cf45e304a431649abfb3c004442a4404fc876af9289e66a821393c2c1a32e84239967e240d3f88a2a1f3c01249cbd1c508a22ecd3108f0ce217d089
+DIST firefox-69.0-km.xpi 553113 BLAKE2B eda399ef5037964649bb43f471b22839b8969d66f19ef869419779a616b9f7a10e67e9cd600acc8e34732415862b254115184391a8ebf4994bc859ec7b54b446 SHA512 fb0486c1b0ca6a6db3c809b85be3e15c3139e98d6b6b2bcda83d2fd9a272089517a65aa1ea95279ab41fcd72d7333bde604dfd350642e769b636af9be4f7c3eb
+DIST firefox-69.0-kn.xpi 545866 BLAKE2B e3a36a302b6fd6762d60832e106d397e9eaa12b7a9c4a7220e53b6911a62f5cad4e4005255dd54072efd595a79089df75bc065d2b02dc5193ce4483323547e17 SHA512 79acf30283dc33c93f06250a8fcb16a95014e915e00d6b19ca54419579491f0538787542043e177be6cc7600d515092339e456b7123c3e3fbe0c4bbae6f1a8b7
+DIST firefox-69.0-ko.xpi 545926 BLAKE2B 7d8eac152844b0f1a1358547ef434a1fb20e05b8e5686b34bd590843f1511c2928c2ae046c93b36311af0266cdee553eec486885ebad5b3ebb7a59ef25bbc5d5 SHA512 66147ea1129d09af57a6e35535433f9d57cf8bdacd24bbe6b6cf1d06b20044484210c36c0d22197970a6c6d56b9a640e10979d9cc52f5ea1c5144678477df76c
+DIST firefox-69.0-lij.xpi 481096 BLAKE2B 79023135d388d744a6dc55d13a3cd8cb5d62ddf97534c43d3eb3f393f720ebedf2be180e490fe0dd22babd71fdf37745588163d61d04b77e1e62ba1200098c23 SHA512 94a6f2d2f9196857a33f77ebe23308b2617988d0f3e19fee9583dd3db453e31c52f54f1a8dab8001fdd47e9b1933058bb4fc545bb999cc8815f5b5294e666be5
+DIST firefox-69.0-lt.xpi 537440 BLAKE2B 1182c37bd3333207dc9069a20a6128b36e637d157ad620a502a0be9b491f89b97a9f23e6861c76c3309522d702d4b59549a2b59640e1d965160a5579fac516c4 SHA512 43ed445f336f057cd039d5dc35b28683c0373e29e1ad2815365fda754ba96dc9eee794cc12a2afff684731f2711816726c4b9bfc520e0cb3a380dfa60d34c703
+DIST firefox-69.0-lv.xpi 498842 BLAKE2B 2150b4eb51cd7a89c5c4fbfbb312ca2c568490b97539cdcd542de3c63a0a9b58effe0d4bd85569aa5905d446ef05149c406e29cc7eacb63d1bcf4027df52abf3 SHA512 e363bc31572c9bfbeeb5fe4c00ff4dc2b549fd4ecbe20284e1e7f4c1970da7359ff31dad190eb83a4e2d3f4c6fa2f5db00272c84be690860a5e49ae92fae11ab
+DIST firefox-69.0-mk.xpi 488122 BLAKE2B 4ac87a79803a340169f1520ef419429c8f85294d78f299790f2ede3e903ce4f409f002fa058250d4e3ac6d17f9245c052ee39144039598e70c7b06537c2c8391 SHA512 1101b6c1843f32a90c4b2dc80a3de9a74b58733563a16d3783fae69b33bd8c5fec3d130e9f4f6b2f41dd502f3103563f3e9f7d670a3889df61b0c86db3643777
+DIST firefox-69.0-mr.xpi 560187 BLAKE2B 6f611c8327c3aeb79b8f4301c97e2eb805aeb3729740b62a825b0c34629f6627739aa62ca9738e15fa3bc7ef6042c8a65678ef4c31b3e9173effa5ce95ce6cf9 SHA512 335040abb07dffacb0c4850bfe6153ce41bad637eca2864f39e7295db0d03525ebc7c4d9dfedd359423ac6f513f6c83d6c7efe45003daeb59bdf9ba5b0c4df42
+DIST firefox-69.0-ms.xpi 478893 BLAKE2B 4e75fb28fd9e826370418c8d9d42aa38b70ddf707ea654cf01811ea0192827f2b9333aabc9af5211d40c4639d04f2314a9bff9243411f9b743bd88f55feb8022 SHA512 1c529e0d6e26cfe57725a832ad194a0346b4aa89e97d47f657b1fa6f1221ca15ebbe5af2a647e6fb433c83b89805e9022153a9085078b09aff445f64906c5cb9
+DIST firefox-69.0-my.xpi 553518 BLAKE2B 008159767974a1aa6dd327a1318f6bdb350c681d4af7163995403b682de5708b5e68651017bdb798c4fa981d16afef707f76d78dd2936ad88e529094f9b93dab SHA512 b637dd84ac791ab222f054e634ff5b12cf9b6096144d625b8754e99cb1333adf4a64b984294d5bb3338913c0deb927118aac55da977219826d933b60f6868593
+DIST firefox-69.0-nb-NO.xpi 505949 BLAKE2B 464ff040adafcbb71b8839daa03007a0dc7cbf790f2bc0bfaacba029a7836df88d4228a97f7396cdf8cfd4cfefd61e4fbcffe586e5e7949267658ea96c86432e SHA512 cb345783da0768f85889a3e9d44bc63e16b66dccbc8584aeaa78de97a718db5b46bc47468ca00be64f0c55c8f7d9be2491019aaf266371568d3a687bbdba7d0b
+DIST firefox-69.0-nl.xpi 501273 BLAKE2B 2683a58ed917a009549ef5c9b3b0fe3dcca154c72341ce213b695144c5f82e9e5cbb49e6794417feb08644510d92fd8e62c35c6dbf9073b587d3a0d4a6c7623b SHA512 6d9cd9ef8a0dc98803d3e2410cff8dcffc668fb288f37828aa681c342df20cbb4c2fbe9a11ef822d8aad9bdef6bd11a5c52732052d133e6b47a22bb1569c9fe4
+DIST firefox-69.0-nn-NO.xpi 503353 BLAKE2B 44c331ca057a9e01876ab312b782ef69fa01d2f55e7e7adf2d9870b44e5e930ce6ab413b470723eefd3f06985549a83e534b8c26decce0c8b3d994778bdc7df2 SHA512 2c17ff265efa1c34b9373129ed6c8c6dfab7507668ee0c204813ed8d4f951a5b8ee9ae79e2602e76aa11d08316c8aca571274bccadee3b31a2a621ddf545c196
+DIST firefox-69.0-oc.xpi 497834 BLAKE2B 96fff585429355e097dca16985a0c2409b333ac83a26b91566b4282f8bfc5cfd05b812e49a54304bb8b18f84eea0790e4e94c0cf46aa3ece4eae0b5e8114dd2c SHA512 00af8d3ac3475293e7b91484a09abfa8e423c700fccec50d3ad717ae21d60af740747159df60bf5bbd4b0711183edd6fa7aed025bd42a3e5be7a7f9550f11e9d
+DIST firefox-69.0-pa-IN.xpi 555496 BLAKE2B de9715afade585ec21017ea1e21273d7037de3fdde045bb548ab1b268f864b63ad774e0d4c44f3fd7032a170567cc68c3e2431b6c9fe09ae3ea0408e6caca202 SHA512 369c9941ec2189332f4ba1b11ddfce61383567f64f1c81e7881edf2af9b5a1567ad9c9d8c67f57b8d867c229806f2b5ac0d153731380199361d97385ba2756e9
+DIST firefox-69.0-patches-06.tar.xz 15528 BLAKE2B 7adfa9b3d1247b78d58932ea35a78fcc1599a4e462dc14f162892ed0567204f143d8a899f099f2b64dadc94bb33f98ce77463872d8c41af08dffee5e58996ff1 SHA512 93eba2fdd3b180ddc9af369c13b8f5e6aec39edbcd2005b33d7b9fc4c0f9cb4e29c52ecd592663486601a6cc4d162653312d1cf730523e6f3bc24ab07a33076b
+DIST firefox-69.0-pl.xpi 509640 BLAKE2B 472e7a761e4e762a59d36c6729dbe5fa3a1eedd80d099006548679d23ecf5f97a011d17b4d5a434cb01d928cce0cd134160638852444023320724a0747eeb629 SHA512 2a52616f325b6402c71ebe11ad5ee6380881a06c58e85ecacd5410e407f30ede8896240a7da4bdd124665e17c855ba841aefff5f74da401fdf7f1ba42fd42917
+DIST firefox-69.0-pt-BR.xpi 504914 BLAKE2B 0b672b11faf314a136693935cec9163d3887cb8f0e223af59f68c8ea2e7b9e3c8f71410534b30b2e136f8da71de5782564b44dff28de9ed835a08f0c91f50021 SHA512 ad90dd5c6648a5c748ef97d0b8b295885c8e7efd064410c9bb2f10fd6d2b264efddc7ac9a8055658357f069df835cbe85125eb45b18b1931af2a092406cca8ce
+DIST firefox-69.0-pt-PT.xpi 510859 BLAKE2B 6655bf8528683763105bf9d7d03f562f8b492ffebc13e5b0a0d291ee630b25555cb6250877b2a1749b1b36aad876e67d43a7bfb3a7785eeda0642b8b593772b1 SHA512 428f1c2ddbd438a5f1fe3e703b233dfc76054f7401a1932775e8025ed27a8a9f666d4d31904e5f4d4cb0287aa670070b4dab68ad11e62526763d127f4b57657c
+DIST firefox-69.0-rm.xpi 497030 BLAKE2B d6eb4222c5479b143e9cda5adc34394a23ecc3ccc0782e636eb1704fb3811c416358e94313b18e9397e832a40901ef946af0b15c85543fa713fef02721e3b7ad SHA512 4b7d44da98b897286a7cbe42c871d54b5c1016db971b9231699d5f1e4b3cee82a131f00b706c2d44a3ab11810431994f73135f09670173f28ee16f204581f692
+DIST firefox-69.0-ro.xpi 515549 BLAKE2B eb975b49fbe3b1777b315d642c739d31f73686627983a9b6643233b8f9f5d9894aaceb35986c99c084a4b8f02d4c1dd37ad896ae03aac40c32a53910ff31f2a7 SHA512 04a595970d18462119c4949bda19c48576e489f24e9b16eb05d37d1d36d6ce96d829b9bc02ed783ad637a1dbd70cf0f3b00d0b948d9bcbd0472e4d7b2c121cde
+DIST firefox-69.0-ru.xpi 596363 BLAKE2B 0f1b7578e3ddc9f13961f1f6344adae1d30af4cdb7a8a0490247429c238421fdea418b2fea6df5620e62a8de7d57b2da9355908d263105ea6199f31ed2c89c5a SHA512 ac5b6e438a1493aba29cce399a51369fd222c2bed54455dbef7828f84839fd68463aa6fdf607f67a7880150c0831abc2f4740b5ba8c41bdb2acf61835f3bcedb
+DIST firefox-69.0-si.xpi 526461 BLAKE2B 2171ca32d3d80903e59a187b72551f80702ba563c06807ce305434a0e53915f6ef1afdd809101707e606df682a2847a286d0d8cd4a8a6d87427b4a08fda488c5 SHA512 a55b43e06df730f6209ad3cfc757e8d3bc46a755466f6b3b2fe634f8df3eae8b44e098faf34b6f5c7c6cf1acf9f01bce3bb0c46d7595bbddb9080b010bd5df7e
+DIST firefox-69.0-sk.xpi 531495 BLAKE2B 077931029c75b46867b248d076339468f2207302a68e76860619dbfdc258a54fdcb79d5b562abaa7add681fc6d76fab7450c21aa072657e0f4e01395d6ad3bb6 SHA512 4557c58f6259dc4f65f6b75b4ac113c1ea3e2e7292da5f1b8d115a345424e46776f6d8433605cb2b7360b38824ace5535fe20454b2304f4d8cf24a6e7efb91db
+DIST firefox-69.0-sl.xpi 511994 BLAKE2B a67ac444616559421821d444f434795c3a00ca536de7689ada632632c793fa934a03293ed7257450ed3c8d3138e2ea89d0c150fccbc11b2b0f740bdf83cff687 SHA512 a2b12b6947a29595aa91791a174444489b666886f4fed01246f6049557c463208bb03610874afc182a187c936c2ed3e48a81532a3f39439728f8e875f310daea
+DIST firefox-69.0-son.xpi 454034 BLAKE2B 20dbcac2e3db4895168a77dbc9dd62aed0733b97143a9deb34f43cdc5bb2d6385d788fa585dca7424900dd02a05069386f26d929accf63d2c785a6ab830d84da SHA512 c39dc31a59273101a43f309b47a39e3b8a73fa45fd45593899f2a029e058755546265a9f1b631cfc25da35f1c7f1dd3f335628ce89690d00aa40522b568601a7
+DIST firefox-69.0-sq.xpi 520263 BLAKE2B 3e7d83189f4ae7f9b885f191a4fcdd1c1d5b25d7048f3a50c74a15680cbe45c1792a71620c973a89f23a14a365190c6cca88a72811a9b7355f63e677e45676df SHA512 87418e435f9e5e735391325c61560b17490f75ac5a8ed3f27a9c9c0f1680e854ac10d587f731988e9345c827a8e6376af727c2d73f040bb6670d51915afd32af
+DIST firefox-69.0-sr.xpi 530546 BLAKE2B 0198789bfda5e3d62eba36e097a14fc5f2aef711d89fd3b89800f857935f6908a51e6f83be565357db07b42037dd1896c79ff63ca4eb2d5d0afef98a0fe22a7a SHA512 cedc351db5051ed7dc4d3b190aa4633b4e17e6df702dfe2e9d4d3ed9143401d35fea04dc4dd41ffd5ba491d209e9656c4f912656baac37427ea8230fc6eba401
+DIST firefox-69.0-sv-SE.xpi 515166 BLAKE2B 33a43466076246bd799e87aa3118a6af46c0502dab7784f9bd31c031cc5883c60ba1d9b53bc22f1f35b517d31df05733574c2f8fe6821fc760595328db171844 SHA512 662c325df822c3f82dfa5c9e69097bf7330b5faef4b29e47d6b6190c162183046b4fef1caac0c957185964826eabf4af003da0ed09f0340242b1b964ba279193
+DIST firefox-69.0-ta.xpi 553442 BLAKE2B 5224704a90131b507da0a2384c2bac6710169df5722aa0d9894d15f1a8799cc9428426548196e1d0dbd46c8727deb5e872871e8dc894ee786b03b896feb2265d SHA512 6427770b3261c0959374efbdee1cb5792a11a4665bae44fb2d2d6d43ad0d0ffde31e5bd5aca79aab46312aa7e95d590a2830e234548628947578a727288bc34f
+DIST firefox-69.0-te.xpi 563396 BLAKE2B 484ae4ce879911158e43e69b916c767967ffd30cd2d114f211367b164e5eea6877086253868783e6d5404f179f4ace5bff6c94faefabe934d22e8a876abb62c3 SHA512 bf8ddf364282a20864ad5cc88b25444a7571f052da2d5069a84b04a647e788a518ac4576bc0fc74b159711b82941f6943522bea21f05a40e5e3aa3b22aac3f4d
+DIST firefox-69.0-th.xpi 556987 BLAKE2B 06eb6e3dcb8c1a96c29f3a849f8e700e3b0dbd0aad89de87cf80f29132d3eaf79881040a1926763928a9f1117ed31579f9fb523127da8ec45b79cda49808632f SHA512 5d63be4574c14db3bf97f6518d8eebcf41482be924a286159e8401bf7b4ad8d15adf424df2b40b03332479b9929ea5eabc7746023c37295742670623426e0066
+DIST firefox-69.0-tr.xpi 526401 BLAKE2B 9481a6ec79d36912d71dbfbc60a5e66ec2d7f5d97c65a5db2c40429f7221ee948f69a0068ee3942a0018a0e409d6e24160f6ba6b9dae86a455aadf355f82adf4 SHA512 e5f6ba94e396e4e71e6eb8620a3120fd6d625b9a80155157c148e87bd4c24c97b8372de689ba67f432602b839b231450861af2b6fed5071efd8a40fd7e55d83b
+DIST firefox-69.0-uk.xpi 580541 BLAKE2B 41b59df23abba280113880c24a6e70e080fb0cc7a69de4895e8d7dcbf31137a37e2b6446bff6b5bd5c9081c4e9f351c31c3813e76a0ebb3c82e7dfbe927b8460 SHA512 d927ce8c7b1164cbb13cc3f838034d136ceca18b646a7f40c5da81b8f7f251e6fd581e47961b5a6a6bc4e42f3b43ee3e2f88b9502185f932ccf862428deed05c
+DIST firefox-69.0-ur.xpi 540403 BLAKE2B 0911fd1c4175c7f25d9ad17a4bcf74c2c100cf3e8777f4407f2fc3156b4451f6ad7b1e061e1e7d5e6fd0badb7b859da3a9414f8818c7650ee845428e35646079 SHA512 ce9802a1a6902325d9f739fb2430301d93f1879ff32409e7d04bd5b0fa54b9b4774e0ef3d171d8a46da9b51553b9f152916756061da440f77c87c33038d2c74f
+DIST firefox-69.0-uz.xpi 481331 BLAKE2B 1e31d131477772a0a284f095d6ba947fddd82d5b997f96c648d938dc6996d7ae3fde560898c03cc7f0f34f6a1325cec7365f670bad3929f91d0fafe14f6079ed SHA512 30352fa876567eac69fe3f38ebafdabcb1357a11e52088375daf4ebecc96ebe4eb18ea6d55f7fc4055674f8a9fbf5e7bb5d61386783d29ffefb1605cd9d387de
+DIST firefox-69.0-vi.xpi 538589 BLAKE2B 786e94a1d47097f49b028220bf2cb3503df44cdb33510821196cc4a6b37471f34d9a00ef48871d428622c24178d9684b14f7253a2c18b902c1cadee1fdcb2ea0 SHA512 bbc9467addbde00f4b966b59f5c727d6309ffc490230e726466034adb711a93a82862270ed311e07f0754e8010ea489b2760777b0187fa15c600e7bd32e18f48
+DIST firefox-69.0-xh.xpi 465706 BLAKE2B 726cc89eda553f96162c2636feb831f0b6972f4a64161ff503174b6688e4bc9c8afb97f49e01a3d14b7bb1dcbc814bed01083f06b6e8ea8bdfe193297b43670c SHA512 47ed91bfa73fee745ef77c5f4491b1eec328d8aea5788cf9e5a41638108b3e5747a2773fa7006e671cf85460cc8f710d79e21d2d7218ee8311d839b4aade2d14
+DIST firefox-69.0-zh-CN.xpi 545781 BLAKE2B 637af78c771cb15862d528cdb9f916d4f441c38aeda6f6c96ed07ff5362f7bd494a880ef2d03f7b99a5fb1090f97c5f105acabb844cd6ef5733d5afcb6deb1b7 SHA512 2be684fa390f9732f940b12d8921694953620a3f877d9c7671452745438b069ff9c1a45b24a91ac1c54c6e2ee5c9081803b15fc5624252b425dce3936bb0b7f0
+DIST firefox-69.0-zh-TW.xpi 545667 BLAKE2B d1f4117739c4a18712dec26725e2740b2e2d0a2e9d5fa049fe44b7530636911b61880c4e765d4896c45e05af87b9ee6ec6da770c03688e302ede791204fdf4a1 SHA512 2946c78c6faa8ca18330b91088698383002d278920e7d37b1c3cc98e99bf5fd540f00772e18256c885e91eae3abdb0ea5f1d129110cc263304a494cf55778850
+DIST firefox-69.0.source.tar.xz 323421020 BLAKE2B 18b176caf5c848f6386ec9cab0b614e54d3f5c32c504720399ef1d21d9119be4817f353442858beaf42ac2a93486ff1f0d411961224129f846aab678dd0c7aad SHA512 83b4b9a3466d2686ae5b72f9495172dcb37037f3301c68f7940604180e28a40720256f66b34b090dffbdd7b377fbb815df1bb80c3df842bc9ae59551c7cf07b0
 EBUILD firefox-52.9.0.ebuild 12991 BLAKE2B f6fd3bb3145bccf8ecdc85da7fc102ec71ccafd9dcff9f5c0d4ab8fd274bb438b1ea271c556f5153e44e7ed58acf7aeb6a095d49f43664ace69a4cce280555af SHA512 f30ca31284836f835bf37eb06d88a40fb49820b0bef66b200e20877eadc823d3220adcf1b5c050e207d8626577abe0d3986a8722a3fba2845d9b663423ee3d63
 EBUILD firefox-60.8.0.ebuild 13727 BLAKE2B a4611f7e61e3a5ee70de08726648596491fc7bbbe36873ea295e2f0abf18629b6e0c4343b97266f4977e85b05f2d1b2db298ac6e6b77697fdc4378c2a41071e0 SHA512 c2a8a9d194d04edc929743a000abebf15999b25dd4a702b18c1994bd07ba16abbbe7e5fec60617c7b645f52dfe715e8e3c7761d40f7ad229c39abffadf162770
-EBUILD firefox-68.0.1.ebuild 24471 BLAKE2B 16f3e055be54cef082fb26a2ff933f91e64760de14e5d9addc35fc7a9249ca620fcf4200b56fb89c253ed27ae6dafa8acf20191fd1da957c6ff627be134d0e25 SHA512 cd7e379ef8abff24c72539d0fd74c2f474a8ee1aa8d8cec1d16b3e11476a8be45a72b37214a3f14e6f87bd88b8a9fad3033e9fdf49cf16880820a3f787d189e9
-EBUILD firefox-68.0.2.ebuild 24369 BLAKE2B 5facb4c4b35238407c159552a06e93e6a82a2cfc25cd39afea379e5c48ae44c10d49dbafe7a7e4a14e6256f6d2dc087f685aad988bc107705c55a8f4ea94882d SHA512 b9283945e971b1de0babc22cba2ae4ccb70b9b381a09571c251b03e3fd9e743769f62366897d266a1c2d059cc778737c73ac0a49098e8c808c105d7d90b2adc6
+EBUILD firefox-60.9.0.ebuild 13705 BLAKE2B 52f88a5bfe0bd25e291da482c7d6e1bf0120a732c483a632732832f67f1dc9d251482de986c1fba0dfd758b625c720c1727eeb4c164edc93d4d95315a04ebd62 SHA512 a8ea62dc9154be361cf67e77e3a84ce5ba135b7cca3ec741fe55589cc93f3efe473316579b342c8220af8e284df5065fe63341cc78692ed24c40a890f613d7de
+EBUILD firefox-68.0.2.ebuild 24369 BLAKE2B bc1c471727125f61f14a9c690141876cdd2157b326359b6ceab9eb07af361e52d3316a5af1f7764277d960ff99ccb4eaec49cac62455de628a17bdb96ebd195e SHA512 140745b8de871b5167e7aa7a468ed8ff670a5c28407c83629cf98fa3e6bc4fbe3f931d74f1621533b91000cc50af19f49c5b2a3543ec351b1047622c11c410e5
+EBUILD firefox-68.1.0.ebuild 24438 BLAKE2B 65b0daccd4a412878202e4e033219f760a29f959e278e4ab8da248d33fc10fba2e2ae0b1b0979ddd674932121549520ebe7a00c967e3d2a6c4abd4b8f1dff0e3 SHA512 89fad8cd3c93603bc7bc7d47043cfa36acb7c4570201af115bda14bd7f5498571b412cca529bd9dab58111b6600ece5ca9f5529ce8bc8ee7351e736ddeee2e28
+EBUILD firefox-69.0.ebuild 24450 BLAKE2B eb42dc80e6532fd0410a8a1eed7bd2aad99d8a62e55f50340e38054385466cd261ae0c348851cfec8db271eeca60798b7caca2dc9b685c2bab7a0f4b69e45f63 SHA512 bc30e4d37614a4dfbf3041d6cb135d4c01df7de151c66dd5c00b7fd1db749e3d55ac1caa50c916765ad0db591dd1362777fe3522f519b4f17b5fd6950e101dc8
 MISC metadata.xml 2540 BLAKE2B 458e01980f6c0dd1722289fa23d3934d66b1cebe4e0f80b89cb1901bf823c67acc852f1a14f6fd2e59829209dead122ddaf77eacc81d3cc3c957d73fc649b187 SHA512 c2d232195fdc5950a1005c9f46e9b304cbe0c2c991312a82d35363021123719bd0f52058d6f33d075c091a02b920baa479a425c07a9bd7ed0c87857ef6479dcc
diff --git a/www-client/firefox/files/icon/firefox.desktop b/www-client/firefox/files/icon/firefox.desktop
index 54bb2919e165..1affce8f5703 100644
--- a/www-client/firefox/files/icon/firefox.desktop
+++ b/www-client/firefox/files/icon/firefox.desktop
@@ -7,4 +7,4 @@ Terminal=false
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
 Categories=Network;WebBrowser;
-StartupNotify=true
+
diff --git a/www-client/firefox/firefox-60.9.0.ebuild b/www-client/firefox/firefox-60.9.0.ebuild
new file mode 100644
index 000000000000..e8a829f7dc92
--- /dev/null
+++ b/www-client/firefox/firefox-60.9.0.ebuild
@@ -0,0 +1,435 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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 )
+
+# Must be removed next bump
+MOZ_LANGPACK_PREFIX="60.6.1esr/linux-i686/xpi/"
+
+# 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.6-patches-07"
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_WIFI=1
+
+LLVM_MAX_SLOT=8
+
+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 ~arm64 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.8
+	>=dev-libs/nspr-4.19
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${RDEPEND}
+	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() {
+	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+			return 1
+		fi
+	fi
+
+	einfo "Will use LLVM slot ${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 and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	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-68.0.1.ebuild b/www-client/firefox/firefox-68.0.1.ebuild
deleted file mode 100644
index 39bdfe00f4fb..000000000000
--- a/www-client/firefox/firefox-68.0.1.ebuild
+++ /dev/null
@@ -1,763 +0,0 @@
-# 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 ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
-en-GB en-US 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 ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk ur 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*}" # 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}-68.0-patches-09"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
-fi
-
-LLVM_MAX_SLOT=8
-
-inherit check-reqs eapi7-ver 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 ~arm64 ~ppc64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver
-	+gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio
-	+screenshot selinux startup-notification +system-av1
-	+system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-sqlite +system-libvpx +system-webp test wayland wifi"
-RESTRICT="!bindist? ( bindist )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_SRC_URI}
-	${PATCH_URIS[@]}"
-
-CDEPEND="
-	>=dev-libs/nss-3.44.1
-	>=dev-libs/nspr-4.21
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3=[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	dbus? ( >=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=virtual/libffi-3.0.10:=
-	virtual/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
-	system-icu? ( >=dev-libs/icu-63.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? (
-		>=media-libs/libvpx-1.7.0:0=[postproc]
-		<media-libs/libvpx-1.8:0=[postproc]
-	)
-	system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
-	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
-	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager ) )
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-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.8.7
-	>=net-libs/nodejs-8.11.0
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	|| (
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:6
-			!clang? ( sys-devel/llvm:6 )
-			clang? (
-				=sys-devel/lld-6*
-				sys-devel/llvm:6[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	>=virtual/cargo-1.34.0
-	>=virtual/rust-1.34.0
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-# We use virtx eclass which cannot handle wayland
-REQUIRED_USE="wifi? ( dbus )
-	pgo? (
-		lto
-		!wayland
-	)"
-
-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() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-		return 1
-	fi
-
-	if use pgo ; then
-		if ! has usersandbox $FEATURES ; then
-			eerror "You must enable usersandbox as X server can not run as root!"
-		fi
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${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() {
-	use !wayland && rm -f "${WORKDIR}/firefox/2019_mozilla-bug1539471.patch"
-	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
-
-	# 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
-
-	if use pgo ; then
-		if ! has userpriv $FEATURES ; then
-			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
-		fi
-	fi
-
-	# 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
-
-			if ! use cpu_flags_x86_avx2 ; then
-				local _gcc_version_with_ipa_cdtor_fix="8.3"
-				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
-				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
-					# due to a GCC bug, GCC will produce AVX2 instructions
-					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
-					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
-					append-ldflags -fdisable-ipa-cdtor
-				else
-					einfo "No GCC workaround required, GCC version is already patched!"
-				fi
-			else
-				einfo "No GCC workaround required, system supports AVX2"
-			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
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
-	if use wayland ; then
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-av1
-	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 and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-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
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		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
-
-	# Finalize and report settings
-	mozconfig_final
-
-	mkdir -p "${S}"/third_party/rust/libloading/.deps
-
-	# 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/firefox-68.0.2.ebuild b/www-client/firefox/firefox-68.0.2.ebuild
index 486b02715a14..8517bf2a9230 100644
--- a/www-client/firefox/firefox-68.0.2.ebuild
+++ b/www-client/firefox/firefox-68.0.2.ebuild
@@ -27,7 +27,7 @@ if [[ ${MOZ_ESR} == 1 ]] ; then
 fi
 
 # Patch version
-PATCH="${PN}-68.0-patches-09"
+PATCH="${PN}-68.0-patches-11"
 
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
diff --git a/www-client/firefox/firefox-68.1.0.ebuild b/www-client/firefox/firefox-68.1.0.ebuild
new file mode 100644
index 000000000000..6859fc923303
--- /dev/null
+++ b/www-client/firefox/firefox-68.1.0.ebuild
@@ -0,0 +1,764 @@
+# 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 ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
+en-GB en-US 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 ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk ur 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*}" # 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}-68.0-patches-11"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
+
+if [[ "${PV}" == *_rc* ]]; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
+fi
+
+LLVM_MAX_SLOT=8
+
+inherit check-reqs eapi7-ver 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 ~arm64 ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver
+	+gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio
+	+screenshot selinux startup-notification +system-av1
+	+system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-sqlite +system-libvpx +system-webp test wayland wifi"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_SRC_URI}
+	${PATCH_URIS[@]}"
+
+CDEPEND="
+	>=dev-libs/nss-3.44.1
+	>=dev-libs/nspr-4.21
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	dbus? ( >=sys-apps/dbus-0.60
+		>=dev-libs/dbus-glib-0.72 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=virtual/libffi-3.0.10:=
+	virtual/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
+	system-icu? ( >=dev-libs/icu-63.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
+	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
+	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager ) )
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+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.8.7
+	>=net-libs/nodejs-8.11.0
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	|| (
+		(
+			sys-devel/clang:8
+			!clang? ( sys-devel/llvm:8 )
+			clang? (
+				=sys-devel/lld-8*
+				sys-devel/llvm:8[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:7
+			!clang? ( sys-devel/llvm:7 )
+			clang? (
+				=sys-devel/lld-7*
+				sys-devel/llvm:7[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:6
+			!clang? ( sys-devel/llvm:6 )
+			clang? (
+				=sys-devel/lld-6*
+				sys-devel/llvm:6[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
+			)
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	>=virtual/cargo-1.34.0
+	>=virtual/rust-1.34.0
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+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() {
+	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+		return 1
+	fi
+
+	if use pgo ; then
+		if ! has usersandbox $FEATURES ; then
+			eerror "You must enable usersandbox as X server can not run as root!"
+		fi
+	fi
+
+	if use clang ; then
+		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Will use LLVM slot ${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() {
+	rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch
+	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
+
+	# 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
+
+	if use pgo ; then
+		if ! has userpriv $FEATURES ; then
+			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
+		fi
+	fi
+
+	# 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
+
+			# Bug 689358
+			append-cxxflags -flto
+
+			if ! use cpu_flags_x86_avx2 ; then
+				local _gcc_version_with_ipa_cdtor_fix="8.3"
+				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
+
+				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
+					# due to a GCC bug, GCC will produce AVX2 instructions
+					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
+					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
+					append-ldflags -fdisable-ipa-cdtor
+				else
+					einfo "No GCC workaround required, GCC version is already patched!"
+				fi
+			else
+				einfo "No GCC workaround required, system supports AVX2"
+			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
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
+	if use wayland ; then
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	mozconfig_use_enable startup-notification
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-av1
+	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 and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-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
+
+	# allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		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
+
+	# Finalize and report settings
+	mozconfig_final
+
+	mkdir -p "${S}"/third_party/rust/libloading/.deps
+
+	# 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
+
+	GDK_BACKEND=x11 \
+		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/firefox-69.0.ebuild b/www-client/firefox/firefox-69.0.ebuild
new file mode 100644
index 000000000000..2e433986d59d
--- /dev/null
+++ b/www-client/firefox/firefox-69.0.ebuild
@@ -0,0 +1,766 @@
+# 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 ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
+en-GB en-US 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 ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk ur 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*}" # 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}-69.0-patches-06"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
+
+if [[ "${PV}" == *_rc* ]]; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
+fi
+
+LLVM_MAX_SLOT=8
+
+inherit check-reqs eapi7-ver 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 ~arm64 ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang cpu_flags_x86_avx2 debug eme-free geckodriver
+	+gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio
+	+screenshot selinux startup-notification +system-av1
+	+system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-sqlite +system-libvpx +system-webp test wayland wifi"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_SRC_URI}
+	${PATCH_URIS[@]}"
+
+CDEPEND="
+	>=dev-libs/nss-3.45
+	>=dev-libs/nspr-4.22
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3=[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	sys-apps/dbus
+	dev-libs/dbus-glib
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=virtual/libffi-3.0.10:=
+	virtual/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? ( >=media-libs/harfbuzz-2.5.3:0= >=media-gfx/graphite2-1.3.13 )
+	system-icu? ( >=dev-libs/icu-63.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
+	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
+	wifi? (
+		kernel_linux? (
+			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.9.0
+	>=net-libs/nodejs-8.11.0
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	|| (
+		(
+			sys-devel/clang:8
+			!clang? ( sys-devel/llvm:8 )
+			clang? (
+				=sys-devel/lld-8*
+				sys-devel/llvm:8[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:7
+			!clang? ( sys-devel/llvm:7 )
+			clang? (
+				=sys-devel/lld-7*
+				sys-devel/llvm:7[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:6
+			!clang? ( sys-devel/llvm:6 )
+			clang? (
+				=sys-devel/lld-6*
+				sys-devel/llvm:6[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
+			)
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	>=virtual/cargo-1.35.0
+	>=virtual/rust-1.35.0
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+REQUIRED_USE="pgo? ( lto )"
+
+RESTRICT="!test? ( test )"
+
+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() {
+	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+		return 1
+	fi
+
+	if use pgo ; then
+		if ! has usersandbox $FEATURES ; then
+			eerror "You must enable usersandbox as X server can not run as root!"
+		fi
+	fi
+
+	if use clang ; then
+		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Will use LLVM slot ${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() {
+	use !wayland && rm -f "${WORKDIR}/firefox/2019_mozilla-bug1539471.patch"
+	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
+
+	# 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
+
+	# libclang.so is not properly detected work around issue
+	mozconfig_annotate '' --with-libclang-path="$(llvm-config --libdir)"
+
+	if use pgo ; then
+		if ! has userpriv $FEATURES ; then
+			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
+		fi
+	fi
+
+	# 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
+
+			# Bug 689358
+			append-cxxflags -flto
+
+			if ! use cpu_flags_x86_avx2 ; then
+				local _gcc_version_with_ipa_cdtor_fix="8.3"
+				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
+
+				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
+					# due to a GCC bug, GCC will produce AVX2 instructions
+					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
+					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
+					append-ldflags -fdisable-ipa-cdtor
+				else
+					einfo "No GCC workaround required, GCC version is already patched!"
+				fi
+			else
+				einfo "No GCC workaround required, system supports AVX2"
+			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
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
+	if use wayland ; then
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	mozconfig_use_enable startup-notification
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-av1
+	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 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 and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-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
+
+	# allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		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
+
+	# Finalize and report settings
+	mozconfig_final
+
+	mkdir -p "${S}"/third_party/rust/libloading/.deps
+
+	# 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
+
+	GDK_BACKEND=x11 \
+		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() {
+	# 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() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	if ! use gmp-autoupdate && ! use eme-free ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+		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() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 9264678202fb..9368527d7596 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_77.0.3865.35-1_amd64.deb 63958210 BLAKE2B 60ee5a53c3e7a0ec7a49c204f9ef75be78668fcbcc2c9490d36cbd4a9313c9aa7edea354a32e7e933551817bf43dac3e9d0c715e6e5580eb9dd82c6666187c8f SHA512 dab37b300d98c3f37322d3dce0d81fb16f1b3a31520d39b9a566e03f3c093a22a06bdd1234a8075a1e2a6adbc8235c893d25f1bcbda31189ff1a56de67ad2bd2
-EBUILD google-chrome-beta-77.0.3865.35.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740
+DIST google-chrome-beta_77.0.3865.56-1_amd64.deb 64064808 BLAKE2B e4af6abf9385068921844bb8300c73f2c1787eba972526b3d1d16ddc2fc1c78a5f2b2f05982f8c51228f11e74c9353715c566f998ad83306b0accec2d1df314f SHA512 34a3a888c4743b60624cc28278aa91d93a1c6baf9f8ef9bd43228a6abcbbbce31d40fdd4465871b4a12f19cba1967f01a0868270f475e126b38d70f532b85dc6
+EBUILD google-chrome-beta-77.0.3865.56.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-77.0.3865.35.ebuild b/www-client/google-chrome-beta/google-chrome-beta-77.0.3865.56.ebuild
index fa060d36e118..fa060d36e118 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-77.0.3865.35.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-77.0.3865.56.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index dd20945e4203..86255da13970 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_78.0.3880.4-1_amd64.deb 64053288 BLAKE2B 8f250140bf508627fc47bf9609da9606dd11b81a68674893fd5fcac89950ae2e580287ed42dfff82b995e464064a475711a88b206e6af642c6076aec63995d79 SHA512 1352f063178bf5e5ee780fc17406b856cbf5d9d135c2be29fbb9cdeb439d6f8facae103a55978fd70c684a402fd430e40a9bd4ea88554c22803d0d50239bc4a9
-EBUILD google-chrome-unstable-78.0.3880.4.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740
+DIST google-chrome-unstable_78.0.3887.7-1_amd64.deb 64363722 BLAKE2B b4cad58e0f2aa316bd61acea30fbe27c0d513e2584972b2ba1ea9220206accd2806303bb592fb1992b8d8587990c18cf0b2eab35afb885138076a7ddd401e82d SHA512 74849670d05eb31b1cfb531397dab33af891007eae5ae299cbb4c8e9296f3d6bf2710c58b8993c48c37482139795bafd89b65892c9073d1c3a01629f01c49fc6
+EBUILD google-chrome-unstable-78.0.3887.7.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-78.0.3880.4.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-78.0.3887.7.ebuild
index fa060d36e118..fa060d36e118 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-78.0.3880.4.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-78.0.3887.7.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 3bde795d7a46..a3d02914b68f 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_76.0.3809.100-1_amd64.deb 59477810 BLAKE2B 7fd5e64f00cb80070c396f6414cbe921bd05b3405120c21d89777bb0da6e4b082f3209927dcb39397970024daffc80c5d5c182e34ba783309bddc1a3a0ec7b22 SHA512 73d742f69b2208383cbadc4432d217ad65a1dae4050ebe7b4e9b7f109563c9565863b8703517a004aa9eee3bd75de66a650d2602db7d1733b1fedb651e6fe085
-EBUILD google-chrome-76.0.3809.100.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+DIST google-chrome-stable_76.0.3809.132-1_amd64.deb 59170956 BLAKE2B 3eea5ff9c3bafa4c4e7f0dd27a8f85a505f2c8a7260f6c517264343c57ddddeb0694e66203622c01d19f89f01c90a384255eaabf2c43e62c7a510e379f3c0a73 SHA512 c93aa39776ae5ca3f24092668c5d3e7fd873ce1b0ce05fa9a5d8a4a164981cf9cb4724a368026cab2475467bc0c85247626ac4f859d6e71f3072af9b7f8f1393
+EBUILD google-chrome-76.0.3809.132.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-76.0.3809.100.ebuild b/www-client/google-chrome/google-chrome-76.0.3809.132.ebuild
index e75218fcde20..e75218fcde20 100644
--- a/www-client/google-chrome/google-chrome-76.0.3809.100.ebuild
+++ b/www-client/google-chrome/google-chrome-76.0.3809.132.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index af935da07617..106996599fd0 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,3 @@
-DIST opera-beta_63.0.3368.29_amd64.deb 61643970 BLAKE2B 975c0401cb5e3b5ddd4208b54374b922f5766f5cbfc9a7a70fdae6ecf8175d90c81b1a8d63d025acad8fb7af4c9e372c72fca66329b5913fcefe90d054ac41fd SHA512 a84cef8ca8f435e058770340e8c4b623ad0f76c5a9d0ad87cf643769c8405f4b1f53423366d44348635051df7f85fce55e9622fe343eb2a6f4b6cc2e12b1b657
-DIST opera-beta_63.0.3368.33_amd64.deb 60993852 BLAKE2B ebc7ef2bc0281a24be4b67bed32078f20d15736a8030f17a7c42dfd7559b540076559287ba9a3bd613b33b2e3df766f1fc7e39b73af1655a7182571aab3b8944 SHA512 d50171df199f804fb5178ce7afc83b79413be528171837039b41b6f345277aa855ecc1b710ba4c4905a560b0f9e7efbc3ecf6351e90c332e04746c3879a7052e
-EBUILD opera-beta-63.0.3368.29.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12
-EBUILD opera-beta-63.0.3368.33.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12
+DIST opera-beta_64.0.3417.8_amd64.deb 66468202 BLAKE2B cacfce4db714ef83e7130bb2d5729541aa4e86d1645e0b80009c7b6a354fbf459976a692b4b24a5f5a4afabb292a87f5be8c5b1f74d6ac5ba0e2724f2bc52569 SHA512 783d875986f0ca64bbe049370cac718982075412fa07e27830452b0b6df630f9121add83caa5dae5758bf6f67d71876aea36ef0011739eaf98980bb053680569
+EBUILD opera-beta-64.0.3417.8.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-63.0.3368.33.ebuild b/www-client/opera-beta/opera-beta-63.0.3368.33.ebuild
deleted file mode 100644
index 59a8587ec4bd..000000000000
--- a/www-client/opera-beta/opera-beta-63.0.3368.33.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-pkg_setup() {
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-beta/opera-beta-63.0.3368.29.ebuild b/www-client/opera-beta/opera-beta-64.0.3417.8.ebuild
index 59a8587ec4bd..59a8587ec4bd 100644
--- a/www-client/opera-beta/opera-beta-63.0.3368.29.ebuild
+++ b/www-client/opera-beta/opera-beta-64.0.3417.8.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index b4be2c21f439..a8e8fe0fa9f7 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_64.0.3407.0_amd64.deb 65947994 BLAKE2B 5533f55491057387b6fbdc76296ad66329154504a7c9c062efdcb5850ea33afa8cdd2ffee703b2fe31e0d29c69743117b85725d082fe705a18f183ec6509d767 SHA512 f30f97b6ffb1c97402ce3f1afe23b343e790349b05fdf76013f7f804dd1c2c08edcf7512d82497cf72732cf87262bd97cab6a85cfd6e7d402a38b6cce6a7794d
-DIST opera-developer_64.0.3409.0_amd64.deb 66076622 BLAKE2B 45c8fa96d8abcfa2f26343465e1fe9c49cb6b7c82f023b7b5ad655d8995a3a6e00dda55d81196c1c5d89cc0aacd0844327fea45340566f4ccd8c649c278b1a1f SHA512 870c0a3a6250fb4fba3c1bb27ab1fa5cff3f37b50924ddf393b5fd4d854cefee4bbff33965bf832625714037a2cb595861c4a25a2d3c5ffc3b9d5cd192a2fe37
-EBUILD opera-developer-64.0.3407.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
-EBUILD opera-developer-64.0.3409.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
+DIST opera-developer_65.0.3425.0_amd64.deb 66352440 BLAKE2B 3c7cdd6cab22d1334e9fcda0cd3fd9be106b22988edd5dd8b98300e74c46e4acbf3d765898e91f8e4d847a92b0553d6a9d567ecfa7e2c10523c51964b1043845 SHA512 8fa0a787e9b3bfed900e08eb67b86ba5f7a650357215920aca743c193c5fb167a00683719487bdde44967c66dd1617951ad7db41d79d64458c768dc3c75bfc54
+DIST opera-developer_65.0.3430.0_amd64.deb 66348184 BLAKE2B 728ace2befaa4a252a2178db06ac1715483a732b4d3484c4322441eae4515a8ec6c126cfe8f7943361d64236211f81ec40fbd25adafa86ca21aa1086493c8f30 SHA512 dc8f4e03546eadbd3b7827c4ea976d03ea7f59b6def40a007933cee4ccc761c8c869471797263f39fd2fd5f24625b34fe4d55dd46309daa4d1cc77d0fbb99827
+EBUILD opera-developer-65.0.3425.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
+EBUILD opera-developer-65.0.3430.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-64.0.3407.0.ebuild b/www-client/opera-developer/opera-developer-65.0.3425.0.ebuild
index 132f88d22363..132f88d22363 100644
--- a/www-client/opera-developer/opera-developer-64.0.3407.0.ebuild
+++ b/www-client/opera-developer/opera-developer-65.0.3425.0.ebuild
diff --git a/www-client/opera-developer/opera-developer-64.0.3409.0.ebuild b/www-client/opera-developer/opera-developer-65.0.3430.0.ebuild
index 132f88d22363..132f88d22363 100644
--- a/www-client/opera-developer/opera-developer-64.0.3409.0.ebuild
+++ b/www-client/opera-developer/opera-developer-65.0.3430.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 0c45358774ab..3770779e85e3 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,8 +1,5 @@
-DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 BLAKE2B 2c4cd52a07999c5beabec8474d6d855d04e06b4e3264ff1f279822e7cf89311fb49cab9254f4c2d83fa01e98c7597372cf439c4d5b9e9b8a6a0b1f444c4e67e8 SHA512 e08547a8c966ec64c00e7058cb17856c9e2174b8b6e327d3e8b4c69226c9d1a1ff98f07557b607d8db68811b8a4f94a349ec9c882b480a706d3f28f7430e5ff8
-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_62.0.3331.116_amd64.deb 66479598 BLAKE2B 1015f740686ce3ff8164040f6bdc3f495123dc4d8d7d30c39524d93150eda0de5d5282198103552c952dd6b268f7e88d7fc3de4b0a1fa09099542971e4d0abb8 SHA512 8bbcb77d12f86f3a37ee77f6c4de636b976a1f1367e0992d7efed76e718037bce8e651b0e1a4a722e7c8d9b2a2ad2223c0b6dfd7084191c2e4d670d682a23a52
-EBUILD opera-12.16_p1860-r1.ebuild 6118 BLAKE2B 72e7be2d8786ef62b3a7b9fe93019e0df26b60d37826789c0e1ff691571a84d9f964c18517cb2acee0c4a6ba98c86ba00a032cb309197b83101ab8edf4a17dda SHA512 109edf5cd49938f57a59ce704efa46abfa93e1f72edabc57cffd8ca72e15193b3d35280b458ceb569a7163e7f7ec25cf84aaf602114855fad849f3c6c2125937
-EBUILD opera-62.0.3331.116.ebuild 2283 BLAKE2B 8b99aa39e7bc0b4c206f3ac54ddc5d6495a62a2eac6ef33cd92a09fd91149d55ca5a8615d8300fe4288e92fb4afce1687ae1f1e7d571613ccacc879552bbfa6f SHA512 af90586375d9560be2b636707e531120fa5f7c29309431961b542a09d743ea91718f5a7e6276b7e26301efcdfe2f8925189620b2f4959e6f23fb2583c5555d78
-MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
+DIST opera-stable_63.0.3368.53_amd64.deb 60374636 BLAKE2B 4cb6726f275504972d5d97b8fdde1d96f9d122a31e241914cd3f62a0e2eb94d25ada8e1ad10b4416456dfd173d01e680134a94ae2a68b1ab087fbe78d36558d1 SHA512 f3d89f4a7857b76cab2480efb2c43d9997b110a049a9a8a84509d05a35d691e12b9ffd58e5e85f2ee6520ee172662008d6d021653807df49638931ac1e7f6eb9
+DIST opera-stable_63.0.3368.66_amd64.deb 60668118 BLAKE2B b580a6e946c02bf4fb549a511b11a4c7f5edd18061428f154204e798d35e8c5488c441602a344895e06b4275c4d61c069566a022497499cbd12f9cef511376ec SHA512 4877f8582afb0edbdee4e03adc60c586ca063f863b64139bbbac156800e9f3ca81505944f56434f6f227a6bff49eec68a25c7281174d482dbe34b474099d494b
+EBUILD opera-63.0.3368.53.ebuild 2283 BLAKE2B 9ae44a98f7d4631a10ef1178ee4ecddb7fbf18ca1ea0398132470f5210819f711c44c2bb9b66e629363fd2ac184533ea8fd42c8f6a6957777a0a286294d3942e SHA512 77ef1f88d31a043dd6f786dafcd9c110916bd4cd4c1ed11548a429cc91e3edf47beec5ac73148c1c4265a019f378dba1289903040f623939f87bd6b00f55e6b3
+EBUILD opera-63.0.3368.66.ebuild 2284 BLAKE2B 156eb6922c60ae7be4f229911315969b149b356f969c1949e4c169662b1bea23c2900870f25b02a96fd1f9325a7ece296dcdc4e8baab4fd9daa5fcf91ff82327 SHA512 17e8f2a02a120d69e7b35f9a2d3f896595d541322c32a42a1deae3c913ca5de06b33bda04fd1925878adf403e2d096563703afa3b95e89765bac1b4cdda43891
+MISC metadata.xml 446 BLAKE2B dbd473cdfed1e48919a7d03f61999b3bbeb294a8ab917bb438b52dcffc304d6cd954f79817b0a73a396a9d153eb5917cfba1c1bd33e419918dc8b9a5dc449379 SHA512 42d93f4994820e8ca5f6d56a94709f8194046395f9aff8f445ce2f80777a43763c124a4ab514bab55751c6a651c9d0002c61c92d77bf9c841ef9e112abd26105
diff --git a/www-client/opera/metadata.xml b/www-client/opera/metadata.xml
index 2078dce63900..2ac7edc2a6f3 100644
--- a/www-client/opera/metadata.xml
+++ b/www-client/opera/metadata.xml
@@ -10,7 +10,4 @@ Opera is a graphical Web browser available on several platforms. The desktop
 version runs on GNU/Linux and FreeBSD. Versions for Macintosh and
 Windows are also available.
 </longdescription>
-<use>
-<flag name="gtk">Install support libraries and runtime dependencies to support GTK+/GNOME desktop integration</flag>
-</use>
 </pkgmetadata>
diff --git a/www-client/opera/opera-12.16_p1860-r1.ebuild b/www-client/opera/opera-12.16_p1860-r1.ebuild
deleted file mode 100644
index 9ea33719af12..000000000000
--- a/www-client/opera/opera-12.16_p1860-r1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils multilib pax-utils versionator xdg-utils
-
-DESCRIPTION="A fast and secure web browser and Internet suite"
-HOMEPAGE="https://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-12 LGPL-2 LGPL-3"
-KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk multilib"
-
-O_V="$(get_version_component_range 1-2)" # Version, i.e. 11.00
-O_B="$(get_version_component_range 3)"   # Build number, i.e. 1156
-
-# == Variables that often change ==
-# All other variables should be accounted for by _pre/_p
-
-O_K="noserch" # The key to the snapshot URL
-
-O_LINGUAS="
-	af ar az be bg bn cnr cs da de el en-GB es-419 es-ES et fa fi fr fr-CA fy
-	gd he hi hr hu id it ja ka kk ko lt lv mk ms nb nl nn pa pl pt pt-BR ro ru
-	sk sr sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
-" # Supported linguas
-
-# == End of variables that often change ==
-
-if [[ "pre${O_B/pre/}" = "${O_B}" ]]; then	# snapshot: _pre
-	HOMEPAGE="https://my.opera.com/desktopteam/blog/"
-
-	O_D="${O_K}_${O_V}-${O_B/pre}"			# directory string
-	O_P="${PN}-${O_V}-${O_B/pre}"			# package string
-	O_U="https://snapshot.opera.com/unix/"	# base URI
-
-	SRC_URI="
-		amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
-		amd64-fbsd? ( ${O_U}${O_D}/${O_P}.amd64.freebsd.tar.xz )
-		x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
-		x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
-	"
-else							# release: _p
-	O_D="${O_V/./}"				# directory string
-	O_P="${PN}-${O_V}-${O_B/p}"	# package string
-	O_U="mirror://opera/"		# base URI
-
-	SRC_URI="
-		amd64? ( ${O_U}linux/${O_D}/${O_P}.x86_64.linux.tar.xz )
-		amd64-fbsd? ( ${O_U}unix/${O_D}/${O_P}.amd64.freebsd.tar.xz )
-		x86? ( ${O_U}linux/${O_D}/${O_P}.i386.linux.tar.xz )
-		x86-fbsd? ( ${O_U}unix/${O_D}/${O_P}.i386.freebsd.tar.xz )
-	"
-fi
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE+=" l10n_${O_LINGUA}"
-done
-
-DEPEND="
-	>=sys-apps/sed-4
-	app-arch/xz-utils
-"
-GTKRDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	gtk? ( x11-libs/gtk+:2 )
-	x11-libs/pango
-	x11-libs/pixman
-"
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-misc/xdg-utils
-	gtk? ( ${GTKRDEPEND} )
-"
-
-QA_PREBUILT="*"
-
-pkg_setup() {
-	OPREFIX="/usr/$(get_abi_LIBDIR)"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv -v ${PN}* "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	local LNGDIR="share/${PN}/locale"
-
-	# Count linguas
-	count() { echo ${#}; }
-	local lingua_count=$(count ${O_LINGUAS} en)
-	local locale_count=$(count ${LNGDIR}/*)
-	[[ ${lingua_count} = ${locale_count} ]] \
-		|| die "Number of LINGUAS does not match number of locales"
-	unset count
-
-	# Remove unwanted linguas
-	for LINGUA in ${O_LINGUAS}; do
-		if ! use l10n_${LINGUA}; then
-			# Remap codes for Montenegrin and Spanish (Latin America)
-			case ${LINGUA} in
-				cnr) LINGUA=me ;;
-				es-419) LINGUA=es-LA ;;
-			esac
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
-		fi
-	done
-
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
-	rm -rf share/doc
-	for locale in share/${PN}/locale/*; do
-		rm -f "${locale}/license.txt"
-		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
-			|| die
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	rm -r lib/${PN}/gstreamer || die
-
-	# Optional libraries
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk2.so || die
-	fi
-
-	rm lib/${PN}/liboperakde4.so || die
-
-	if use amd64 && ! use multilib; then
-		rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die
-
-	local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX=
-	if [[ ${PN} = opera-next ]]; then
-		OPERA_SUFFIX="-next"
-		OPERA__SUFFIX=" Next"
-		OPERA_USUFFIX="-NEXT"
-	fi
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \
-		-e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \
-		-e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \
-		share/man/man1/* \
-		share/mime/packages/* \
-		share/applications/${PN}-*.desktop \
-		|| die
-
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/sh' > ${PN}
-	echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
-	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
-		>> ${PN}
-	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
-
-	# Change libfreetype.so.9 to libfreetype.so.6 for Gentoo/FreeBSD, bug #477594
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libfreetype.so.9 -F "#N" lib/${PN}/ | \
-		while read i; do
-			if [[ $(strings "$i" | fgrep -c libfreetype.so.9) -ne 1 ]];
-			then
-				export SANITY_CHECK_LIBFREETYPE_FAILED=1
-				break
-			fi
-			sed -i \
-				"$i" \
-				-e 's/libfreetype\.so\.9/libfreetype.so.6/g'
-		done
-		[[ "$SANITY_CHECK_LIBFREETYPE_FAILED" = "1" ]] && die
-	fi
-}
-
-src_install() {
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	if ! use elibc_FreeBSD; then
-		rm lib/${PN}/opera_autoupdatechecker || die
-	fi
-	mv lib/ "${D}/${OPREFIX}" || die
-	mv share/ "${D}/usr/" || die
-
-	# Install startup scripts
-	dobin ${PN}
-
-	# Stop revdep-rebuild from checking opera binaries
-	dodir /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
-		> "${D}"/etc/revdep-rebuild/90${PN}
-
-	# Set PaX markings for hardened/PaX (bug #344267)
-	pax-mark m $( list-paxables $( find "${D}"/${OPREFIX}/${PN}/ ) )
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/opera/opera-62.0.3331.116.ebuild b/www-client/opera/opera-62.0.3331.116.ebuild
deleted file mode 100644
index 2144791d1fbe..000000000000
--- a/www-client/opera/opera-62.0.3331.116.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
-"
-done
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}-stable/copyright || die
-	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	pushd "${OPERA_HOME}"/localization > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	rm "${OPERA_HOME}"/${PN}_autoupdate || die
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /"${OPERA_HOME}"/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera/opera-63.0.3368.53.ebuild b/www-client/opera/opera-63.0.3368.53.ebuild
new file mode 100644
index 000000000000..b28807261d09
--- /dev/null
+++ b/www-client/opera/opera-63.0.3368.53.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+
+"
+inherit chromium-2 multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
+"
+done
+KEYWORDS="amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	pushd "${OPERA_HOME}"/localization > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	rm "${OPERA_HOME}"/${PN}_autoupdate || die
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /"${OPERA_HOME}"/opera_sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera/opera-63.0.3368.66.ebuild b/www-client/opera/opera-63.0.3368.66.ebuild
new file mode 100644
index 000000000000..eec568e74cf4
--- /dev/null
+++ b/www-client/opera/opera-63.0.3368.66.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+
+"
+inherit chromium-2 multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
+"
+done
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	pushd "${OPERA_HOME}"/localization > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	rm "${OPERA_HOME}"/${PN}_autoupdate || die
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /"${OPERA_HOME}"/opera_sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index e6f69509036c..7dfdf215f1f5 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -3,4 +3,4 @@ DIST qutebrowser-1.7.0.tar.gz 3595849 BLAKE2B 5ace5f756550fe10a3bd09819a3d556292
 EBUILD qutebrowser-1.6.3.ebuild 2522 BLAKE2B 0eef6585e93cccfb2c7afdc4528ece62578d12fd2eb731d8794b3f582592dee71242da36beeab4d62b89d4ee58807f05f3fcd0e7955aea8ca58d994b4c8801d0 SHA512 2755a791ed5633894ed76bd337dde0712cd7f24c9b7f53bf7935e9959c972f5340c56339149c90f71b1b07578fb25a5c3fe60308f208608600c1bf98c8debfa4
 EBUILD qutebrowser-1.7.0.ebuild 2532 BLAKE2B cb3f420100e7071c43f859c210883f566aec699ce34d5e1183c958d50d1eb35ad9ab0e48431f73ec94ce0cc285d856bbb83f8022f5900e416f47d6301522e97b SHA512 0f4b818ca22ce1c01509469dbddb86c2d4bae94cb2d0fd82c5a470ba7eb28306f71604e2502057192e7c7d5146b3422819a2b0132d8f10c1dee9ffccf1fefba4
 EBUILD qutebrowser-9999.ebuild 2532 BLAKE2B cb3f420100e7071c43f859c210883f566aec699ce34d5e1183c958d50d1eb35ad9ab0e48431f73ec94ce0cc285d856bbb83f8022f5900e416f47d6301522e97b SHA512 0f4b818ca22ce1c01509469dbddb86c2d4bae94cb2d0fd82c5a470ba7eb28306f71604e2502057192e7c7d5146b3422819a2b0132d8f10c1dee9ffccf1fefba4
-MISC metadata.xml 589 BLAKE2B 40485aca150508671b8b7fd65567c25abb73617b1f9d0d981c6ec9579b563904fefe5828e819276bb2c6e2c19883574334ffce0be7b047ad182bf3cdcadb70ea SHA512 e042cd2ad99080de919fce9f26a09cd6b1dd779cf2d2c8c26f8b214845635efc90e96e41acc025875ad7f8473ef750638ce4bf2f1ac3eeca6f7f762a44062ec0
+MISC metadata.xml 478 BLAKE2B a63f582fb2b39ae44cbbc8b8f0c356de59238d31193dfb82822394b272a5cf3d80502766761067e80cdc38b4fe84a11d841b5f4200791600ed98155bbae85b8c SHA512 9cc31ac7c20bc61526e9db3947bbb2c203821fd4c339e61afadf0b6618699a1e2780545926ef80ea5de81d8e7b252986feb3d8607638478834b9236de4347f5f
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index 3c4b9436adf9..1184665eaa7c 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -5,10 +5,6 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>jsbronder@gentoo.org</email>
-		<name>Justin Bronder</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">qutebrowser/qutebrowser</remote-id>
 	</upstream>
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index df2bf4de1dfd..3f8718f10cba 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -5,6 +5,9 @@ DIST chatzilla-SEA2_48_RELBRANCH.tar.bz2 440336 BLAKE2B 3fe09e3d2ba698d95054cbb6
 DIST dom-inspector-DOMI_2_0_17.tar.bz2 155095 BLAKE2B e67e90a09db4c5acd4f58d004992094bec38145d48f8aa4abf1b39289222aa9be0498ebc45f01c7e94e90936ffe8b0cb415e3fb42d09b4bb8855317b1b9b4522 SHA512 0b9915566270d1d6670075263fffb0c59f834c4bfae933e6da23747914f069918f6f3dcf1ab3de6ea3b456623ef6e008f2d2aadcad0da84e483cae02e11f0b9b
 DIST firefox-52.4-patches-02.tar.xz 14412 BLAKE2B 9c15aa293dfc36efe1236d9b5736012a3efd0480f0d8eb243687b50245ccdb6e0ed13e564271569211eb767bd01ba3c7688c350005ce862403335dcc2e87bca7 SHA512 6befeaefc118bc161ad05eed619142814e5cf31aaeede3fb5618b1f5ace887e9e1fa6914320b513404380a426cfb0f45107435f92b2d7e95d95cd7c44e03ad96
 DIST seamonkey-2.46-patches-01.tar.xz 768 BLAKE2B e886f8c43cd856bb7cc4ea2a03c2a364bde1faef5c77156456d161c87867c52e0fb9bd348cc92330a22cff8ae0ebbab997b3d3985bb40c6c0883da4a35789f9c SHA512 2bbf09c8285f9f1ef5e194da7c43a8d1bbd4f2366ba182c78a7be4f0c36f549eb8cfee5e42d2eea87ea5d6920b36196e901b31ddca94e792aa2d3fb28de097ad
+DIST seamonkey-2.49.5-patches-01.tar.xz 14488 BLAKE2B 6619f5d8e034e72cac37ba2421ebcdd62a23054b118c40e0daabe6943a45b8b98ee3cfeb46ac60280d34d5bef5facc7bdadb01af23ad54631ad4dd2021d5b8d3 SHA512 f39cd1518d060a384fb2fcac1e394329ef3728f121a0b777233e1d2887cecc0a0df64530de344edfad098a462f048c031a4cd01828d9fe4a9e45f88035536196
+DIST seamonkey-2.49.5.source-l10n.tar.xz 11706060 BLAKE2B 24b8185cc958ac82433d7bbaab48f4ce4b6d18fd5299a6d2e24f804178f162edc9b29664e0f8437a69b767b8e3e6d0b860301de25daa89b4181af58ef1053c37 SHA512 eda23c334123e7fb060e93a5495b061e96a71944ce4216eee1dbf017d4803310da0882ff9fcf2c986e016ac8bbcca1fe7c2837dd04ea8208fe7127bf6e92afc5
+DIST seamonkey-2.49.5.source.tar.xz 231748204 BLAKE2B eeae383fabb596fdc25ab3a68f1c1161b6bb3aa2d1086b53b2f843047182e68cf9f8a0ce689e4b037068f08a0467b7911947415bc9f141b6c0ddc52e0a749d88 SHA512 31309def1ad4276f13ecb343e936c7cade4b6850db88d9d84700f86bff7024b2b217b9e50fc3756b1d1beea483ceaa2a5a3afd053da00f6ac06e3795e9116789
 DIST seamonkey-2.49.9.1-cs.xpi 941974 BLAKE2B 4de71b190c63e4284b5915ab3f9f9672026fd2375996df26064598a6e1859f3e9b56c668c63a4741c37471c23dadb6eefc018a1715d7afa3e5ced8477a16eb50 SHA512 c3b061e0b735c6949a0ce7f8be22c7818e6bd039de5284015b0ff63b8456f18bd51db9f3a3d1f9a5df2a6d0610043ea9e33f16ccd3ba64e20ac53e901196afd3
 DIST seamonkey-2.49.9.1-de.xpi 949902 BLAKE2B a51a5ccf0a86708b26c9394cc88d3a05f6108760933b5ccca92d54390090f379ab34b4d90796e77764bcba1fbb20a8ffe56f7cf5ba7aeefc80e0e01d3f5cc86b SHA512 fb85fa867b5b9417190aa25cc678d68e3afed04bfe052896167aaf46042397da6e1bbeb70acc321f46bd0bed4f0856152d80a348b478a336d28825c4120af1c6
 DIST seamonkey-2.49.9.1-en-GB.xpi 911789 BLAKE2B 495cd6fcb8cde5dcbab636bad20e1da5f89dcfb3bbafea12fec1c2fc68bdf9145d533828163884dd25988f792839739a3374a233567820cdf97fb49c44d7228c SHA512 973fc7f693abe9b87bd971f79e050bd4bd9a16e4e6f6a50d9298f2c71d45aa328c4279055382b7f9bf8c807dff9c1ab8855d97dbbe3eb4d71c40ee5e3a02f3b6
@@ -24,5 +27,6 @@ DIST seamonkey-2.49.9.1-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1
 DIST seamonkey-2.49.9.1-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
 DIST seamonkey-2.49.9.1-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
 DIST thunderbird-52.9.1.source.tar.xz 230475264 BLAKE2B ec2763d21bf88779867f4478dfc544b5afbe1062ce51f09c1ecc423c3289f0cd91ae79bc87d726ae77d885290843631f36800fff18d802cd4a998966e7793b74 SHA512 0de80a5036b1e8a5a8549c546b4693cb285ee4d10f546f4b4aceed9e1d6c64b9dbafce7bacaaf057112130036f7b41fb2e0fa3343412140e6ac926dd94c27d23
-EBUILD seamonkey-2.49.9.1_p0.ebuild 12831 BLAKE2B d3f14482e69b09a73fe7e5b707c7dc5febfcf947aecdb37b3d6609a5063a706f0f1c317d8f38ba1df3bc6366b027b6089d2dfcfdda5f760e3bf9cb6df13c155b SHA512 5cc1b7b8c6e301c45a4bca593a6b07c4360a0faacd60557ef934da4b59549e86f74ee0cb697413a18443a5c4460f29ce023f87f76ec2520bf7ef81d01b88996c
-MISC metadata.xml 1824 BLAKE2B 877054e919c97e12d11882714747601b9f455dc73304be2656583fc2875ae68a2178b2afd4d4adbd25c1f13b938c24d6f7d07c4808d85c70c4753dda1dd2677c SHA512 b5a1ea2051d02dc8ccd79d36c7d7b169dbb4fa694d1319596386b93cc9c695cde8aeac15741ff668f6e6ec6e1b77e3140c260f81579a91ca4e581107b51749c6
+EBUILD seamonkey-2.49.5.ebuild 11441 BLAKE2B db021be0190cd6955338d85f2c90d3ac9af95123ddb013e328c9b4068aa89a87224b2f13979041658e5044d118de1442b014a57aa742dbcacebbfff5df6bebb8 SHA512 f7bc4847b6f6262f0ab8f1f4e98d2753eb369b2005d189ade8a386f72d2bdfe70f395a38aac637e3820a5c0ba7bee2eccc5e45b0245d11daa7947407357221f5
+EBUILD seamonkey-2.49.9.1_p0.ebuild 12830 BLAKE2B a6ea3e452ede51bbbc4ece369b53eff09e57979bd2ce59b84d729cf3ae4489f0cde248e88d4947023c702c6dfcd34306f9f067f37f13f18f9c38869543c93425 SHA512 f99ee01fdcec4fd79ada651e1f8883416e64a5ffadd58ee4df3757cda9813a704d584100882f5704e18b2d62b3fec66b6ab2215054f578a03acbb2dc23a3a6da
+MISC metadata.xml 1886 BLAKE2B 115f4e7702bd57b14e45441d97f68efd636b9d5feaa52f748ee6c12f1c46d7d662adb277a7dc2acba66637755d3e82946f4456c5af86ef15f9d36f63aec2d602 SHA512 f5fd2c419cac3d4ce3ea9d19b37794ff0ceab15252d0d3d69427fac97b3692040f1b11c21b5e09cf4e553accc55a510e3c1d753f754fd4492652837641697774
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index b240cff91141..2256a85bb170 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -12,6 +12,7 @@
 	<use>
 		<flag name="calendar">Build Mozilla's calendar</flag>
 		<flag name="chatzilla">Build Mozilla's IRC client (default on)</flag>
+		<flag name="clang">Use Clang compiler instead of GCC</flag>
 		<flag name="custom-optimization">Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
 		<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles</flag>
 		<flag name="force-gtk3">Use the cairo-gtk3 rendering engine</flag>
diff --git a/www-client/seamonkey/seamonkey-2.49.5.ebuild b/www-client/seamonkey/seamonkey-2.49.5.ebuild
new file mode 100644
index 000000000000..e15e13a1e7e1
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.49.5.ebuild
@@ -0,0 +1,374 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.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
+# note - could not roll langpacks for: ca fi
+#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
+#	    ru sk sv-SE tr uk zh-CN zh-TW)
+MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
+	    ru sk sv-SE zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_PV="${MOZ_PV/_p[0-9]}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+	#MOZ_LANGPACK_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/2.49.4"
+	#MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	SRC_URI+=" ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+		${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz"
+	S="${WORKDIR}/${MY_MOZ_P}"
+else
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+	#MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
+	#MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+	S="${WORKDIR}/${PN}-${MOZ_PV}"
+	SRC_URI+=" ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+		${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz"
+fi
+
+MOZCONFIG_OPTIONAL_WIFI=1
+MOZ_GENERATE_LANGPACKS=1
+MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
+inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.60 pax-utils xdg-utils autotools mozextension nsplugins mozlinguas-v2
+
+PATCH="${PN}-2.49.5-patches-01"
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
+KEYWORDS="amd64 ~ppc64 x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test"
+
+SRC_URI+="
+	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND="
+	>=dev-libs/nss-3.28.3
+	>=dev-libs/nspr-4.13.1
+	jack? ( virtual/jack )
+	crypt? ( <x11-plugins/enigmail-2.1.0 )
+"
+
+DEPEND="
+	${RDEPEND}
+	!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )
+"
+
+# 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
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+pkg_setup() {
+	if [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	moz_pkgsetup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local l10n_sources="${P}.source-l10n.tar.xz"
+	unpack ${A/ ${l10n_sources}}
+
+	mkdir "${S}/${P}-l10n" || die
+	cd "${S}/${P}-l10n" || die
+	unpack ${l10n_sources}
+}
+
+src_prepare() {
+	# Apply our patches
+	eapply "${WORKDIR}"/seamonkey
+
+	# browser patches go here
+	pushd "${S}"/mozilla &>/dev/null || die
+	rm -f "${WORKDIR}"/firefox/1000_gentoo_install_dir.patch \
+		"${WORKDIR}"/firefox/1001_disable_sdk_install.patch
+	eapply "${WORKDIR}"/firefox
+	popd &>/dev/null || die
+
+	# gcc9 patch #685092
+	eapply "${FILESDIR}"/${PN}-gcc9.patch
+
+	if grep -q '^sdkdir.*$(MOZ_APP_NAME)-devel' mozilla/config/baseconfig.mk ; then
+		sed '/^sdkdir/s@-devel@@' \
+			-i mozilla/config/baseconfig.mk || die
+	else
+		einfo "baseconfig.mk hackery no longer needed."
+	fi
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	local ms="${S}/mozilla"
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
+	# (this is hard-coded in the build system at present rather than being based on configuration)
+	if ! use chatzilla ; then
+		sed '/extensions\/irc\/locales libs-/s@^@#@' \
+			-i "${S}"/suite/locales/Makefile.in || die
+	fi
+
+	eautoreconf old-configure.in
+	cd "${S}"/mozilla || die
+	eautoconf old-configure.in
+	cd "${S}"/mozilla/js/src || die
+	eautoconf old-configure.in
+	cd "${S}"/mozilla/memory/jemalloc/src || die
+	WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	if ! use chatzilla ; then
+		MEXTENSIONS+=",-irc"
+	fi
+	if ! use roaming ; then
+		MEXTENSIONS+=",-sroaming"
+	fi
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# Other sm-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --enable-safe-browsing
+	mozconfig_use_enable calendar
+
+	# 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
+
+	# Required until seamonkey-2.53 is available
+	sed \
+		-e '/--enable-application/s@comm/suite@suite@' \
+		-e '/--enable-linker/d' \
+		-i .mozconfig || die
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if [[ $(gcc-major-version) -lt 4 ]] ; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+		if use amd64 || use x86 ; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake V=1 -f client.mk configure
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake V=1 -f client.mk
+
+	mozlinguas_src_compile
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	local emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	local plugin
+	if ! use gmp-autoupdate ; then
+		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+				|| dir
+		done
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake DESTDIR="${D}" install
+	MOZ_P="${P/_*}" mozlinguas_src_install
+	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Add StartupNotify=true bug 290401
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
+	fi
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
+	domenu "${T}"/${PN}.desktop
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+	if use minimal ; then
+		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
+	fi
+
+	if use chatzilla ; then
+		local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
+
+		# remove the en_US-only xpi file so a version with all requested locales can be installed
+		if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]]; then
+			rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+		fi
+
+		# merge the extra locales into the main extension
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla
+
+		# install the merged extension
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla/* || die
+		insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# Handle plugins dir through nsplugins.eclass
+	share_plugins_dir
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+	doins "${T}"/11${PN}
+}
+
+pkg_preinst() {
+	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
+
+	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
+		rm ${MOZILLA_FIVE_HOME}/plugins -rf
+	fi
+}
+
+pkg_postinst() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+	fi
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}
diff --git a/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild
index 4b7e0269c381..d841b16c8238 100644
--- a/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild
+++ b/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild
@@ -90,7 +90,7 @@ RDEPEND="
 	>=dev-libs/nss-3.28.3
 	>=dev-libs/nspr-4.13.1
 	jack? ( virtual/jack )
-	crypt? ( >=x11-plugins/enigmail-2.0.5 )
+	crypt? ( <x11-plugins/enigmail-2.1.0 )
 "
 
 DEPEND="
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 9c4fd0f1aa6a..315e7704830d 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-snapshot-2.7.1628.21_p1-amd64.deb 63520088 BLAKE2B 338744b702981896dc1a072eb6f76dbbabaa78d956f8e866fdda7beaca480c7c6fbd4d67f6df39396a4612eb8c82a3801e8793bf3582eced3f14687ae163f53e SHA512 842f9b3b41fdceb5bd055e511d21f61dac16198ec118963a0bd138351ebeae7adde60a9556db4e80af3580e88701f4b1d77842c6d00bf02cd39349d5c936205a
-DIST vivaldi-snapshot-2.7.1628.21_p1-arm64.deb 56905032 BLAKE2B b1f9d941bda06626ec517647c737f7884f59eb9db8d1de91f1f8b9c25565607069c3768d1344b4f8e54cae593fecf699e1a29cc81d14941559faef92c6a563d0 SHA512 e07265ccae4522657c77d3c2356cfc21ef35eecc92dc8a8eaed3c9a11774431da1a9e63cc595639e298ca0b81e7594da98ab12c1f67cd6b76466181894a18ada
-DIST vivaldi-snapshot-2.7.1628.21_p1-i386.deb 61993780 BLAKE2B 98e787d2c5b5a8ff71527840fa5711745132106ea363532f1a623416a5ab14743b69009884840a212faeb71a49ac7734b5bba6ff9fda4caff9d37b5871644339 SHA512 8ca06c78dce72948dcedd8b7a1d955bc1abcedc3e19b2b4e25bfa92ef24fd03311c06c397108298ffac85b465c196a966592c730f2d1209782becd57f34c96ce
-DIST vivaldi-snapshot-2.7.1628.26_p1-amd64.deb 63561740 BLAKE2B 669ee724cb967e297c3e86e2e7fac292f839814150bf1505fce8b3117291601c80706f9f168bfc43ee3089053ec1a63292c6958fd6795a0f6fddfb3a88b94044 SHA512 ec761e3822354aa9cf19f2770e4ed56f4703645fafda3decebcd6728d3f1ba36ee6bfd54fc228efc868d36c172a62e328c9d81aa90c74a3decccb991c84fdf3b
-DIST vivaldi-snapshot-2.7.1628.26_p1-arm64.deb 56888812 BLAKE2B 29af1099adcc95cf1d1781b3a6417ac827a4900d67d4e9c751186de7bf73655d4f2f4e478890f7c22add940ce4bfe4c867b5e1db7133cc366c34e76753eb8776 SHA512 cdc2909db5b20f5c407c5d659d854e74ea3409cdf245404fe97e46ccd0e4b2513880a58859ec16762524bfdf65d23d7fbd5cf6607bc1f66f6fddb470920377d4
-DIST vivaldi-snapshot-2.7.1628.26_p1-i386.deb 61966124 BLAKE2B 04e40c1e2442f3bc07c4184a016ae7b63c39e05170bb7896f1bbda2f1194c5376eec2f32240e80f062496e0655a8e851e3c3e2e29eb2ea356101f02784e961e3 SHA512 19aed979e3336119d02e880d93a4ec27c41e264a4f38630939d66ea1ec997cbc7b09d2c8c157c81e43390e3a498e1baaa4753f2f059c9a2074e44eba3d1ad87e
-EBUILD vivaldi-snapshot-2.7.1628.21_p1.ebuild 2558 BLAKE2B 0112466ce4abb940cd992c851e1cc9f272f5ce2f5a5cee385be42b3a0c4605585ac22818883e806b35b120872129e108739a0c471b2e73c549202ebae87f5369 SHA512 7bdb369ed0d80eca18af3605edf09b300ae646680a30fc9021b7e1d8a43e4b8ffc658a42bb710ad45ce8672c3ec8543ec442ab0e657cb5e7fbb00bf1baa9ca78
-EBUILD vivaldi-snapshot-2.7.1628.26_p1.ebuild 2558 BLAKE2B 0112466ce4abb940cd992c851e1cc9f272f5ce2f5a5cee385be42b3a0c4605585ac22818883e806b35b120872129e108739a0c471b2e73c549202ebae87f5369 SHA512 7bdb369ed0d80eca18af3605edf09b300ae646680a30fc9021b7e1d8a43e4b8ffc658a42bb710ad45ce8672c3ec8543ec442ab0e657cb5e7fbb00bf1baa9ca78
+DIST vivaldi-snapshot-2.8.1649.4_p1-amd64.deb 64432432 BLAKE2B b995597237d5b24d47dde29dfba94d85459943571c7f770329248cfa1639e11e3a9df0d23a62f8aa9814c27d5208500c5ddd029e04f2b669ebae1571de5e5251 SHA512 d29dbcdbdbda401ec2e867e258763f3d90ca5da5f4c2207c45ec027292200ced738e060a5991d3827c50e037dd55557acaf7e5abeada44769b93584a86169793
+DIST vivaldi-snapshot-2.8.1649.4_p1-arm64.deb 57632240 BLAKE2B ad3439a2fec9c9a08bfa914ab60b32fe31f633e42317e8b7477b3613aab14411418ecdb22cf2b63e28c836d5b73974f49c93ac0ecbf3bfb0f0dca2066ab5da8e SHA512 ad05996779d31b38c21fdd2b9f787a97fad7c00dbcc267f77a3c79d68a79af8ed410efbdecd52ba679f028c7ca50be8da8e71bf29eb655f83b556c808b05d711
+DIST vivaldi-snapshot-2.8.1649.4_p1-i386.deb 62799772 BLAKE2B 57a2d19d4de637ead74f69390e9cedf07c4c2951b4773fe25566c10bc1c993ebb3ed702141efc286034b054297205709241703f57f2c916061302ff87a791f47 SHA512 63ae466a9aa6a983c8b221dc9a88b96e50aa54bf9adfec1e472c780c891cdb0b8035495cbc74488319ab9da59c424e5465de429b82407e699531112a497e5642
+DIST vivaldi-snapshot-2.8.1650.3_p1-amd64.deb 64441352 BLAKE2B bd58e560f4119cd9b25795ee2e32d890795cc816cd8d7865dbed3039bebabe88dcc521b75ebe9b2182eda75efdf0619a21d4854fb6d5d3bfcc5312481f9abc43 SHA512 eaebd3a2d718490d73f5b02c37c4bb0f04c68923268325df8f1cc79474ffacd07f48dbe5789a3c3ace03a0a19e2395c147996cb5c199dc4d13af8d190b655fc8
+DIST vivaldi-snapshot-2.8.1650.3_p1-arm64.deb 57594708 BLAKE2B e60c2dedb9d8cde365611ee4ea6b69d6c31ab430901428ab6e6d28421b6444fdd93547405f297b32ac42d00e49c9ff405b36d2c291f748d1be5b84091ca7f5e0 SHA512 70a110bd62ef0222aa532945815c8a73b9c6e7dd213dab07ee4bff9aa3c0989ea78608fa84645d4df9c8c510bd45e83372bd896bfbfd14bc232fd05c4a9c4212
+DIST vivaldi-snapshot-2.8.1650.3_p1-i386.deb 62803076 BLAKE2B 31195dfcf5727e484c3b7b172c8ca3acefaf81a595c81b179cff1937112b0d92a527c197b326e14d81a530bfd5cf6de2bda0ba112cf64e669028670a993a906e SHA512 ea08c75a538250881091291e98bae348dbe4e0cf5ae2a494c63c5c21dc84fd5b9b4389f72566bb666d4661dcc63f8585afc454094c17c282a66c3aca4b83daee
+EBUILD vivaldi-snapshot-2.8.1649.4_p1.ebuild 2558 BLAKE2B 0112466ce4abb940cd992c851e1cc9f272f5ce2f5a5cee385be42b3a0c4605585ac22818883e806b35b120872129e108739a0c471b2e73c549202ebae87f5369 SHA512 7bdb369ed0d80eca18af3605edf09b300ae646680a30fc9021b7e1d8a43e4b8ffc658a42bb710ad45ce8672c3ec8543ec442ab0e657cb5e7fbb00bf1baa9ca78
+EBUILD vivaldi-snapshot-2.8.1650.3_p1.ebuild 2558 BLAKE2B 0112466ce4abb940cd992c851e1cc9f272f5ce2f5a5cee385be42b3a0c4605585ac22818883e806b35b120872129e108739a0c471b2e73c549202ebae87f5369 SHA512 7bdb369ed0d80eca18af3605edf09b300ae646680a30fc9021b7e1d8a43e4b8ffc658a42bb710ad45ce8672c3ec8543ec442ab0e657cb5e7fbb00bf1baa9ca78
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.7.1628.21_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.8.1649.4_p1.ebuild
index 3777ea957e1e..3777ea957e1e 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.7.1628.21_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.8.1649.4_p1.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.7.1628.26_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.8.1650.3_p1.ebuild
index 3777ea957e1e..3777ea957e1e 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.7.1628.26_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.8.1650.3_p1.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 15a519d86f3c..765da4cf7a60 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,5 +1,9 @@
-DIST vivaldi-2.6.1566.40_p1-amd64.deb 61151748 BLAKE2B b87be9d93798c8b94826d83af62f0c18a9b9e31cbcd8499ac2b00b969b92953dec0c4427f4d242180982648592f984b7477be830bf8899e4d3eff704b5949cd4 SHA512 3a5c68b8660a1940f4a9d6a949e112c9c966d4ccad8608e9e84e6ef33c864701b930b9a51ac04e359e0b96213324cfec987c9346a0093b70df722430d338692a
-DIST vivaldi-2.6.1566.40_p1-armhf.deb 54411476 BLAKE2B 515320db7da8cb2eeb0fe8c639921b41d0debf7d19c31e70694603aa06516d282e8ce05c75230ba706364af40892f16fd95e92e07619e51c1f33defc24926a28 SHA512 f60b6b6572f8b22c921a8f2fa03171a6e09301ee0a09617dd2addc307466a2e941e77b6f495221ef96b2f72026c50281a20fc074875aeaf1bba10cc8d4463e5c
-DIST vivaldi-2.6.1566.40_p1-i386.deb 60685292 BLAKE2B e30cf79718238e4d221749668ca3098b5a6c39b764b34edb7d3cb428d891ffcf949b26f004babb0207388241882cf35adf43dc9d65f21ea6bea380c16edd2bdf SHA512 8a873436af9c0059e6995b6d0905abcd14adbe3643795358ca43812d98989bc3f7a5a0034e86b188b245a90302a078ab2c8b219484a0387fb3e57aa190bbe202
-EBUILD vivaldi-2.6.1566.40_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7
+DIST vivaldi-2.7.1628.30_p1-amd64.deb 61729696 BLAKE2B acf5b3f9405122191655dc90be39ed1beb41d98d0f89596f731402caea0df32b4e806669cdc629bddcf8aeb301fddf62c3dfd88a8890178b3903682846a4a7bd SHA512 66fc19193c45ecec87b7a2e57650d14bdc3760d0334d72e2908c39ad1b0fcf7a3f90f03683680d0a957cd449848e569a3e12f7a28f1bf709d340973bd6aa6607
+DIST vivaldi-2.7.1628.30_p1-armhf.deb 54616352 BLAKE2B 1b11e52d25bfe67e408ec42cea3b6ab6a8bbadabb97734ee42a81473ccb6d15582e731d81560703969333c180a745eac3e810ad5439faf6629e45bab33815622 SHA512 a32571579c97ed5227985c698ac1812b4b079b16bb82e9994ee1519bb8206bc235d0a4e01b165e6e8691ed56adb0f3a2fc4c5bfad15194b248db265d643259ea
+DIST vivaldi-2.7.1628.30_p1-i386.deb 60218100 BLAKE2B e9cf2fa0b9c6dbb38df1807d8462dc7d6012db4dd1c279f963e1ce4954ebd1f36713be7c3d4d0c5896e243dfafd89303a2456919a686d28e5e77e702ec29d57d SHA512 8c4d6074ca35e8181a901cddb4412418b3a3c3981220d08e71ea3783508b649fd3e1f4b9d1c7f4bfd1ec713a04be609336345a5cab13d303eb61dbfb0c872ad1
+DIST vivaldi-2.7.1628.33_p1-amd64.deb 61738688 BLAKE2B cb685ced9184a252deb203cc70296b8ea3c7e47bf12a43f12c3a636ada2dce81df340bbdec07271aa3832396e446dc93ebee4123290509b8c8d6c5bca64c28fe SHA512 5c098335e79aa2eb17bce6fa5bfdbf1713050b8fb90d412b218dcd39fcd5f597e7a41bff81eb783f32712261e9bd2333777c6fd1f9d246d60fb5d1e8460a0077
+DIST vivaldi-2.7.1628.33_p1-armhf.deb 54632760 BLAKE2B aafebbf2c406e860676e95f13ffb86c5d887f78c6860315cd9921e4682064a04db9620d524efafbe0d83d94d25472d9723f725ae1d78d3486b9eff985259b529 SHA512 db35c67911093d11c48bcf9bbe404a5d9ff362afb7dd53c782201d5b5a733af0cc88f9dbcdcceb7f3587b4fe651f40529d2167ca335c96cd80d957794a6666f3
+DIST vivaldi-2.7.1628.33_p1-i386.deb 60221768 BLAKE2B 448b2ed57f6770fe378deec0024368274ca05bd767afa10f537386d5a1afeb54a0fcff976b108ab87b62a410a40578f4be8e184511bc04afd74bcce5d6d6885b SHA512 b8abd46b13d5ded6b3e8856cd5fe749a39f672094adcfb8b7a32d6fceb7c4a7b07cfa00cc69b9160d2190a21276296e61dc6ebe82adf7dc66c28a461d3782b88
+EBUILD vivaldi-2.7.1628.30_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7
+EBUILD vivaldi-2.7.1628.33_p1.ebuild 2900 BLAKE2B 7adba11b98e251040fbab8239a89e82d65beb1f157be0de612f11e6b0b0866c42c3718198e59d3db5d46473c727a64505e7b8c20f648831d0c6bcf9ad69545af SHA512 947799d605ac25bf48c59453ff92414db1f0202169892b727161647eedc9a50ca30aa325df5417eb289370feb53ef46f1d7d90af95116e9be8eb9c659b06c19a
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi/vivaldi-2.6.1566.40_p1.ebuild b/www-client/vivaldi/vivaldi-2.7.1628.30_p1.ebuild
index 479dfcff4842..479dfcff4842 100644
--- a/www-client/vivaldi/vivaldi-2.6.1566.40_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-2.7.1628.30_p1.ebuild
diff --git a/www-client/vivaldi/vivaldi-2.7.1628.33_p1.ebuild b/www-client/vivaldi/vivaldi-2.7.1628.33_p1.ebuild
new file mode 100644
index 000000000000..69ed6a41d087
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-2.7.1628.33_p1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
+	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
+	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker toolchain-funcs xdg-utils
+
+#VIVALDI_BRANCH="snapshot"
+
+VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
+VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
+VIVALDI_HOME="opt/${VIVALDI_BIN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
+	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
+
+	sed -i \
+		-e "s|${VIVALDI_BIN}|${PN}|g" \
+		usr/share/applications/${VIVALDI_PN}.desktop \
+		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
+
+	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${VIVALDI_BIN} \
+		${VIVALDI_HOME}/libwidevinecdm.so \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 04be80b9b740..74ce8c0556e5 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 6ce5ffc7f0a2..2c55da01f8fc 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_77.0.3865.35-1_amd64.deb 63958210 BLAKE2B 60ee5a53c3e7a0ec7a49c204f9ef75be78668fcbcc2c9490d36cbd4a9313c9aa7edea354a32e7e933551817bf43dac3e9d0c715e6e5580eb9dd82c6666187c8f SHA512 dab37b300d98c3f37322d3dce0d81fb16f1b3a31520d39b9a566e03f3c093a22a06bdd1234a8075a1e2a6adbc8235c893d25f1bcbda31189ff1a56de67ad2bd2
-DIST google-chrome-stable_76.0.3809.100-1_amd64.deb 59477810 BLAKE2B 7fd5e64f00cb80070c396f6414cbe921bd05b3405120c21d89777bb0da6e4b082f3209927dcb39397970024daffc80c5d5c182e34ba783309bddc1a3a0ec7b22 SHA512 73d742f69b2208383cbadc4432d217ad65a1dae4050ebe7b4e9b7f109563c9565863b8703517a004aa9eee3bd75de66a650d2602db7d1733b1fedb651e6fe085
-DIST google-chrome-unstable_78.0.3880.4-1_amd64.deb 64053288 BLAKE2B 8f250140bf508627fc47bf9609da9606dd11b81a68674893fd5fcac89950ae2e580287ed42dfff82b995e464064a475711a88b206e6af642c6076aec63995d79 SHA512 1352f063178bf5e5ee780fc17406b856cbf5d9d135c2be29fbb9cdeb439d6f8facae103a55978fd70c684a402fd430e40a9bd4ea88554c22803d0d50239bc4a9
-EBUILD chrome-binary-plugins-76.0.3809.100.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb
-EBUILD chrome-binary-plugins-77.0.3865.35_beta.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
-EBUILD chrome-binary-plugins-78.0.3880.4_alpha.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
+DIST google-chrome-beta_77.0.3865.56-1_amd64.deb 64064808 BLAKE2B e4af6abf9385068921844bb8300c73f2c1787eba972526b3d1d16ddc2fc1c78a5f2b2f05982f8c51228f11e74c9353715c566f998ad83306b0accec2d1df314f SHA512 34a3a888c4743b60624cc28278aa91d93a1c6baf9f8ef9bd43228a6abcbbbce31d40fdd4465871b4a12f19cba1967f01a0868270f475e126b38d70f532b85dc6
+DIST google-chrome-stable_76.0.3809.132-1_amd64.deb 59170956 BLAKE2B 3eea5ff9c3bafa4c4e7f0dd27a8f85a505f2c8a7260f6c517264343c57ddddeb0694e66203622c01d19f89f01c90a384255eaabf2c43e62c7a510e379f3c0a73 SHA512 c93aa39776ae5ca3f24092668c5d3e7fd873ce1b0ce05fa9a5d8a4a164981cf9cb4724a368026cab2475467bc0c85247626ac4f859d6e71f3072af9b7f8f1393
+DIST google-chrome-unstable_78.0.3887.7-1_amd64.deb 64363722 BLAKE2B b4cad58e0f2aa316bd61acea30fbe27c0d513e2584972b2ba1ea9220206accd2806303bb592fb1992b8d8587990c18cf0b2eab35afb885138076a7ddd401e82d SHA512 74849670d05eb31b1cfb531397dab33af891007eae5ae299cbb4c8e9296f3d6bf2710c58b8993c48c37482139795bafd89b65892c9073d1c3a01629f01c49fc6
+EBUILD chrome-binary-plugins-76.0.3809.132.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb
+EBUILD chrome-binary-plugins-77.0.3865.56_beta.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
+EBUILD chrome-binary-plugins-78.0.3887.7_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-76.0.3809.100.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3809.132.ebuild
index c60abbfa5a56..c60abbfa5a56 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3809.100.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3809.132.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.35_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.56_beta.ebuild
index 3fd84e77d226..3fd84e77d226 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.35_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.56_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3880.4_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3887.7_alpha.ebuild
index 3fd84e77d226..3fd84e77d226 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3880.4_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3887.7_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index dbe2fbc0a2da..dd38c3a7d6da 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index a980b3a05566..2cfa18e28083 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,13 +1,12 @@
 AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d922453bae6133e2458a7009035156f47c1dbba42bd6830ab5bef8c56d151821b0b56e9b41ef9b3db885411 SHA512 3d56a24ea98bc3188e5d6f8e2e0148e4b718e04f23452e77750bca984c44fc7c3acd4521a945b4c415284d0a5dac0f7e846bb60daf70fe61ce2632e8fa201ed6
+AUX apache-2.4.41-libressl.patch 1082 BLAKE2B 98428a5653f47e6dd38452809bee92ef7ab32b63b92220a70e7b1c2fb1776969aab1ec385546d6879786e6879e36bd26133a7d78ffca0c67cad75812a09a46ba SHA512 0ee34af486625e7a2a7ffd6e40e9ff24224d2785ea0ccba7402bcbbffedd3194526f38585b5d99f0492cca2edc3ed67234a4e6e6c5c73f1e68540d7ff8db4cef
 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
 AUX apache2.2.service 716 BLAKE2B 0006b5f5eee85bf4bae7b1b49944cedb057df974b7ed6e74cee21eed109846d91537c997241554ee4ff7b8d0534dcc54fc435f6a1e9d1f07817091f93f986500 SHA512 5f736c803772077598248bbb41f76dff396dfd2f11a60d1ba929a619275efb8c1b4c0dab78cbcdf83b9ec94db67b958b3333b01f67d71eb3b2e07dba4bca2a7c
 DIST gentoo-apache-2.2.34-20170918.tar.bz2 64390 BLAKE2B d3f6d85192706d7c49a38cc36e816b3ae531f8c0d42111c33ec32ed39900d36d8a2a85a5d1b5afca22331137f04fb24fb424a42a21caa7eb4f6906fa39cb8224 SHA512 10b42e50dcc196f60bcaefe90c382d62a61339dd8a56e899d6afb6998be4acdd376e2c3509791f22a0acf99d06add497e32703b6d523f640306a6db5e05f358a
 DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4
 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
-DIST httpd-2.4.39.tar.bz2 7030539 BLAKE2B 1e378833efb9bbdd6fdc277a779620a08752d064524489f9ad747cf85350fbb6ad65f57b30c81d57273cd6693d8a2c4e988f5a2c42bd5c9c538b305b9b7719e8 SHA512 9742202040b3dc6344b301540f54b2d3f8e36898410d24206a7f8dcecb1bea7d7230fabc7256752724558af249facf64bffe2cf678b8f7cccb64076737abfda7
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
 EBUILD apache-2.2.34.ebuild 2976 BLAKE2B 8816d1f547ba7e8de670ef0f45cde40748fc5d611e1060f0c76a8b35ce9771a493f89f2277afcd90ac36fc6f4f684be1e19913d2d3a2ecd78e63e9f4f0d97470 SHA512 32b49f813a80f28b50a2170878d3b204c51db243bbd117b60b8aff63627b42d2cb76e87282ad9053ac1513f0faf8489a60edc7dec0c8087f12650a74d3a533b7
-EBUILD apache-2.4.39.ebuild 8133 BLAKE2B 3a9be40933d261b6b92e55ca6971065c55a98670920c9c5f4668895af7d952626cd3712c9b3bd87260fc0058fb23b261c00cae5042ec5cd8e5f3b7c7e3aa7f10 SHA512 f83cd7f34845bbb73617171eb80c0b7e0c68dcbd4d3c2f314e9d3e2fb18f7772f94fbca386ebbcec5e6b083f32928ea8da504a3ec132bf650ed9ddca514c54c3
-EBUILD apache-2.4.41.ebuild 8495 BLAKE2B 916516c5e902c42ea230b55250c4a7bd28a4c5143c07bc989fc92f9f75a8535d830b772062d589ae2923398103cd8b3864631225c0e03e6af4698726b97d9834 SHA512 64aba385007b1cb2cd7999074141cda26fe3bd76f84d83f6cfe2d298ec48f0ca3b81ad2b059552aff6813f91d514944c12c80ea64e8e46bff6ad7a5e9e153335
+EBUILD apache-2.4.41.ebuild 8556 BLAKE2B 47b9c03ff5e300069862e397f372c39036d04b2fe8eb4a3d0124914a947d85ca4178f3272b7a39e632bef79944bd3439c4b0946d35b730fa66a0598c924ac267 SHA512 e08037cbf804a2a5bca91d956f7d08e36f7f6d75d440cb4a411abe10fdb819bbf7b23afa14315a35d1efe1454aa4f728a8d0aca70b2c45bedfaf04236d439a89
 MISC metadata.xml 1012 BLAKE2B ca2238f428144240f64b5c9e48087a07a3f77278958efb240edeb864050ca01d1e042a37fb304fde76925fb651d7d97755d354a45aff34ac0589b7405b848d54 SHA512 a4e903bb75740c54256fa96359f6a97cd75008ffeeadfd6353648f5bfa2295fb108ec9de398956c79633bc465475f5db365d20d71caa34fc14a07c4715cc8683
diff --git a/www-servers/apache/apache-2.4.39.ebuild b/www-servers/apache/apache-2.4.39.ebuild
deleted file mode 100644
index 7c3e8d290f84..000000000000
--- a/www-servers/apache/apache-2.4.39.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20190402"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.39"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
-brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
-dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
-ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
-lbmethod_heartbeat log_config log_forensic logio macro md mime mime_magic negotiation
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
-proxy_http2 proxy_fcgi  proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
-slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
-unixd version vhost_alias watchdog xml2enc"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	brotli:filter
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	cache_socache:cache
-	md:watchdog
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_balancer:slotmem_shm
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_html:proxy
-	proxy_html:xml2enc
-	proxy_http:proxy
-	proxy_scgi:proxy
-	proxy_fcgi:proxy
-	proxy_wstunnel:proxy
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	cache_socache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	http2:HTTP2
-	info:INFO
-	ldap:LDAP
-	md:SSL
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_html:PROXY
-	proxy_http:PROXY
-	proxy_fcgi:PROXY
-	proxy_scgi:PROXY
-	proxy_wstunnel:PROXY
-	socache_shmcb:SSL
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-inherit apache-2 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="https://httpd.apache.org/"
-
-# some helper scripts are Apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
-
-# Enable http2 by default (bug #563452)
-# FIXME: Move to apache-2.eclass once this has reached stable.
-IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
-# New suexec options (since 2.4.34)
-IUSE="${IUSE} +suexec-caps suexec-syslog"
-
-CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
-	apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
-	apache2_modules_md? ( >=dev-libs/jansson-2.10 )"
-
-DEPEND+="${CDEPEND}
-	suexec? ( suexec-caps? ( sys-libs/libcap ) )"
-RDEPEND+="${CDEPEND}"
-
-REQUIRED_USE="apache2_modules_http2? ( ssl )
-	apache2_modules_md? ( ssl )"
-
-pkg_setup() {
-	# dependend critical modules which are not allowed in global scope due
-	# to USE flag conditionals (bug #499260)
-	use ssl && MODULE_CRITICAL+=" socache_shmcb"
-	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-	apache-2_pkg_setup
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		pushd server >/dev/null
-		emake gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
-		popd >/dev/null
-	fi
-
-	default
-}
-
-src_install() {
-	apache-2_src_install
-	local i
-	local apache_tools_prune_list=(
-		/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
-		/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
-		/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
-		/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
-	)
-	for i in ${apache_tools_prune_list[@]} ; do
-		rm "${ED%/}"/${i} || die "Failed to prune apache-tools bits"
-	done
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	dobin support/apxs
-	dosym ../bin/apxs /usr/sbin/apxs
-
-	# Note: wait for mod_systemd to be included in some forthcoming release,
-	# Then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
-	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-
-	# Install http2 module config
-	insinto /etc/apache2/modules.d
-	doins "${FILESDIR}"/41_mod_http2.conf
-
-	# Fix path to apache libdir
-	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die
-}
-
-pkg_postinst() {
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-
-	tmpfiles_process apache.conf #662544
-
-	# warnings that default config might not work out of the box
-	local mod cmod
-	for mod in ${MODULE_CRITICAL} ; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in ${MODULE_CRITICAL} ; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [ ! ${lbset} ] ; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/apache-2.4.41.ebuild b/www-servers/apache/apache-2.4.41.ebuild
index eabea18d914c..36acc74b4126 100644
--- a/www-servers/apache/apache-2.4.41.ebuild
+++ b/www-servers/apache/apache-2.4.41.ebuild
@@ -136,7 +136,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 # Enable http2 by default (bug #563452)
 # FIXME: Move to apache-2.eclass once this has reached stable.
@@ -160,6 +160,10 @@ RDEPEND+="${CDEPEND}"
 REQUIRED_USE="apache2_modules_http2? ( ssl )
 	apache2_modules_md? ( ssl )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060
+)
+
 pkg_setup() {
 	# dependend critical modules which are not allowed in global scope due
 	# to USE flag conditionals (bug #499260)
diff --git a/www-servers/apache/files/apache-2.4.41-libressl.patch b/www-servers/apache/files/apache-2.4.41-libressl.patch
new file mode 100644
index 000000000000..86a1a7d02361
--- /dev/null
+++ b/www-servers/apache/files/apache-2.4.41-libressl.patch
@@ -0,0 +1,27 @@
+From d446b977f28ec79fffc2d2b45c671e037b709f19 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Wed, 28 Aug 2019 02:15:42 +0300
+Subject: [PATCH] mod_ssl: fix compilation with LibreSSL
+
+Upstream-Status: Submitted [https://github.com/apache/httpd/pull/64]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ modules/ssl/ssl_engine_init.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
+index f54c922fc7..646c903fea 100644
+--- a/modules/ssl/ssl_engine_init.c
++++ b/modules/ssl/ssl_engine_init.c
+@@ -1512,7 +1512,7 @@ static apr_status_t ssl_init_proxy_certs(server_rec *s,
+     X509_STORE_CTX *sctx;
+     X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER)
+     /* For OpenSSL >=1.1.1, turn on client cert support which is
+      * otherwise turned off by default (by design).
+      * https://github.com/openssl/openssl/issues/6933 */
+-- 
+2.23.0
+
diff --git a/www-servers/civetweb/Manifest b/www-servers/civetweb/Manifest
index 6f8e1387e7e1..912324d26c69 100644
--- a/www-servers/civetweb/Manifest
+++ b/www-servers/civetweb/Manifest
@@ -1,5 +1,3 @@
-DIST civetweb-1.10.tar.gz 11350512 BLAKE2B b0a2ef514a0d9f821a1e05e72000901092f722a5628b759401ef4118301ef79ee8b00f44a9fe9e9f64a14b4af6511419d1684cbe9d2b7c0eb18dbd9d98cd7cbe SHA512 54035883fbec590f339a2b4b5bf1b9a93591ea50bff056830d0c45b874cf6e46ce5af39e9dd9d4e0e6c82bec844aa0f159503f337998e9e10e59099b8ecc3f79
 DIST civetweb-1.11.tar.gz 11421650 BLAKE2B 487044a313c2ff005a8dfa247b3d8a3c3b52ef048cbc3050ec8c0402ccef4e12e28de53fed5a3a91df1e7f59ba6c03bf545413ffdd0ce3e4d604148c16c661e9 SHA512 e1520fd2f4a54b6ab4838f4da2ce3f0956e9884059467d196078935a3fce61dad619f3bb1bc2b4c6a757e1a8abfed0e83cba38957c7c52fff235676e9dd1d428
-EBUILD civetweb-1.10.ebuild 786 BLAKE2B f31897949f848003bfc2ad5b00644c34ebb728944145ab8bcd190476255689dad49837f5c52cec64b7f666836dc418c8fcde31a2a0b522cce760d100245d0e12 SHA512 9a0d2c27b48274e511279c79227e228f6735b6390a61c6ebdbce3f56a09b08bac100b3c4161ab5939a42abacae9690ec9d9ab27c88828b49dd91ac55133d632b
 EBUILD civetweb-1.11.ebuild 919 BLAKE2B f1fd8bbfaafbb7623895ef6084d9959a8203ca1f7f56283a057376e4bd69870d4117d0fd225cb07a8909799287107277a1b4efe8b9ac1dab6db632eb5a7318a2 SHA512 50577978d94dddf28657145055a3fd0513ec9e86779e84a5357128d4d2b7ad209b8d772990f52ada74a1d9b5a3148ef919044c7d2afd0a35a750af0ac458d1a6
 MISC metadata.xml 404 BLAKE2B fabc0ad84971b528fe36760060c3daf34ef0e9e7a730a4ab7624813e8262ec2dc9e336f077d510877a8151b14934c3af2ad6a2617081fd6729b08b3e043111e3 SHA512 4444aa744d80abf7d64042a1a34fc425f76054a2d8c8e8d892007f4ef94742e0e367663f222bf39f76c611ec36af075b1c5972e5fea3c82d8b062494dfced5f4
diff --git a/www-servers/civetweb/civetweb-1.10.ebuild b/www-servers/civetweb/civetweb-1.10.ebuild
deleted file mode 100644
index 62190ba870ba..000000000000
--- a/www-servers/civetweb/civetweb-1.10.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 cmake-utils
-
-HOMEPAGE="https://github.com/civetweb/civetweb/"
-DESCRIPTION="Embedded C/C++ web server"
-SRC_URI="https://github.com/civetweb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e 's|DESTINATION lib$|DESTINATION ${CMAKE_INSTALL_LIBDIR}|' \
-		-i src/CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
-		-DBUILD_SHARED_LIBS=ON
-		-DCIVETWEB_ENABLE_LUA=OFF
-		-DCIVETWEB_ENABLE_DUKTAPE=OFF
-		-DCIVETWEB_ENABLE_SSL="$(usex ssl)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index 8291594515f3..faf74eb820d1 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1,6 +1,8 @@
 AUX nginx-unit.initd 291 BLAKE2B a4ce1b0269de3d991bfdf30b6183418d32e2c94d21ca0ab154b9f44521895227057cad1fd2ca72015a4c25c90250cc31a6aa2f637caaa564eee7769a48b4d355 SHA512 89db5f2116d11ff8e741b23e41692585ee7e2446fb6d214666af913a1fec9a2f6d300512cb8d3b6a83795e714d6f17403e22dc12fd9c76b0551c14b71b6fd998
+DIST nginx-unit-1.10.0.tar.gz 564348 BLAKE2B 82339422b4b3b696ff4bbb216d6c0d54f046531aa56f6e0f5602a9bbe18db878b6bc9c9e9b1513be0cee3197f288549d8a6f826bf69ffbb91fc35757775bde4d SHA512 da2b248ba22e5d46fa1c8c21041a875655fad0e1a09683c58cb5bb33ed0a671a921c7a13f99269f0574da02d0efaeff0233abc901e4e333f3f7ac9383334c781
 DIST nginx-unit-1.8.0.tar.gz 511226 BLAKE2B e396b27954840a5f1ad3a4cd9501a5e5fe769a754c51043da784a2c4596e6acc33089f495bf412a0db086e5c715a51292c7dece004a6512564421a431b6c339e SHA512 1d0ad05343ff70aff4c6e221a36c20df95fa2e2262ae5c69963a9bcb9ef883151e8a2fa9fef29f43ac5489aa5cbb3e9dfd10cf5e7f6d7a98742b490ebf3a0413
 DIST nginx-unit-1.9.0.tar.gz 522420 BLAKE2B 8fabd8a43c8e5b07a8d9db41bb1d9790a6d434a20b762649557bc4e715a00b663416cd9556c9e5fc1894487172c1549de4d5511259876ea6bcd306e258e0ff5f SHA512 25beda88e3e92cace7acfee45a640c351f4e15f20f2aa0f047c3ba61351c6119f270754186f39ab3f1fcc16b1bef9009da4f507d5cdf511538825f2a4c879d62
+EBUILD nginx-unit-1.10.0.ebuild 1704 BLAKE2B 89e32ac74a41281be6fd66d069a7ee8068cddbd20cc3c82af9d21a9dacb3a6ce770c39547758e2653bbe82b86110985fde7b71f875437f9ec158b2148b664d00 SHA512 1620db91709ccff3a3ed4e79cdb01616aadc2c9790049cc23ffa45e9c0f54c3f8d0460a8bded8e49d44179592d9db979fa43b473f23d08fd6fa2d905e8289b9e
 EBUILD nginx-unit-1.8.0.ebuild 1702 BLAKE2B d1e3ca67f25ffe4f4538acb00a0e5c2ed91c3e56facc2c9e7591d7944f12a070fc3dd839154ee848795756f87dfcc60cadfa6ed2e5396a8abe189569f6ba18b6 SHA512 a09d58603a0d9529ad3684ba3306d0a0f603a3dc8479c6c12e9841f88c2b4f9daf6a261fbf60682b9596d6f7eea9fba5dafa4ccb514ae0667b834c0384ddf5e0
 EBUILD nginx-unit-1.9.0.ebuild 1703 BLAKE2B 3a4c56e73525fdd7159b760e18edcef3bf1b0c2f6f52c47b9ff0cd410231a63490986ff6e43dc1fb18a4394574c9c17a298a316eb4d42b14cce4847c9c70a715 SHA512 b62f1f824239da514b89f4a8475e9ca0e424978eb42e5b2cf02f6a7a8ea5ead25215872c5477f37bb5aaa91718fc6078dcf4c81dc5aa9ffaacf55b7564821e43
 MISC metadata.xml 998 BLAKE2B 89d0469b5b21967d1526d121fea36c3312a43e0a4c703aea36f451d4ef8cb4926435aca6a8af2d1ba9964498166da7551bcb6a87bb86a24896f08bf1d2016fc4 SHA512 c9e76bb48c5e1297354c25c7bf01cc80a3d0e2d21f130e24df5647987e9ac6747a9f02851070eea3fa948a7bfbb030b12f869f604ab3c63d82f481ee6c7d3ef3
diff --git a/www-servers/nginx-unit/nginx-unit-1.10.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.10.0.ebuild
new file mode 100644
index 000000000000..72e543d89536
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.10.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python2_7 python3_{5,6,7})
+
+inherit python-single-r1
+
+MY_P="unit-${PV}"
+DESCRIPTION="A dynamic web and application server"
+HOMEPAGE="https://unit.nginx.org"
+SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+MY_USE="perl python ruby"
+MY_USE_PHP="php5-6 php7-1 php7-2 php7-3"
+IUSE="${MY_USE} ${MY_USE_PHP}"
+REQUIRED_USE="|| ( ${IUSE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+	php5-6? ( dev-lang/php:5.6[embed] )
+	php7-1? ( dev-lang/php:7.1[embed] )
+	php7-2? ( dev-lang/php:7.2[embed] )
+	php7-3? ( dev-lang/php:7.3[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( dev-lang/ruby:= )"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	./configure \
+		--control=unix:/run/${PN}.sock \
+		--ld-opt="${LDFLAGS}" \
+		--log=/var/log/${PN} \
+		--modules=$(get_libdir)/${PN} \
+		--pid=/run/${PN}.pid \
+		--prefix=/usr \
+		--state=/var/lib/${PN} || die "Core configuration failed"
+	for flag in ${MY_USE} ; do
+		if use ${flag} ; then
+			./configure ${flag} || die "Module configuration failed: ${flag}"
+		fi
+	done
+	for flag in ${MY_USE_PHP} ; do
+		if use ${flag} ; then
+			local php_slot="/usr/$(get_libdir)/${flag/-/.}"
+			./configure php \
+				--module=${flag} \
+				--config=${php_slot}/bin/php-config \
+				--lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
+		fi
+	done
+}
+
+src_install() {
+	default
+	diropts -m 0770
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index fc7bd7060e05..8a2ba2dbbe3e 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -12,8 +12,10 @@ DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421
 DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
 DIST apache-tomcat-8.5.42-src.tar.gz 5293083 BLAKE2B 4439b6a894aaa8d8db041ff25d3614271d895155d86250e25dfffc8355452d7c230bf81c22f4b75dcdb5cb528af489a8dcad6c93561a89a2aa8cea5173792331 SHA512 e06f3a0cacde6317a1f10f95a17cb7a460c81e3437a68f53da94aafdcbd528e29ed612bd0ffc5f2a3641417558348c4c0e66c1ae937bf709f9f74f79a339ad05
 DIST apache-tomcat-8.5.43-src.tar.gz 5283886 BLAKE2B 2d76e66eedf4de474d439289a9a491e5c490e2373bc91ae30113b8f3c624255339d24149b58fba640aaf3131ab3c9a449930049d26928627e1b7910f0cddd40f SHA512 f6a0439dbfd3f233bd1eb395d37466ba2cce32cd456d067fb2bb45099ac173dec7e42e7fbfab2cb50c0fce2e9dba1f1afe6c8d65877525cb13cb116489cf27a7
+DIST apache-tomcat-8.5.45-src.tar.gz 5324847 BLAKE2B 5ef3388b9324bb04772543c03686057b3035f5a5f40009d0aa1ec34fe18d04af87527bcc9ae0566f41faf64de8ce191f8ea4e2ed2869da569777621aad227d6c SHA512 1fe94b9d5ccf63d2c5fc3dd7a47dabade160ed2882848e0a41422b5a67215d53e8265535ee8e645157d56c4eba9093722982684be6668064648b0782fc48927a
 DIST apache-tomcat-9.0.21-src.tar.gz 5717051 BLAKE2B 004c5256e72c62e885a9d9040396d144d9fa73789a9699eb38210212f4ca6fa5f98c4b092f6fa2165166fd8cccc892eabcaee7a21570645ee057b0b61d3e1942 SHA512 6df978bbe9bb3a327d784d81a46affa4cfe5d370c2b847e102d25a792752ba487ebae329d1763ed7459cb3d49098c3d0cf6b01155536a04c17c4ffdf9e9a774f
 DIST apache-tomcat-9.0.22-src.tar.gz 5722896 BLAKE2B 1a006840e870ec01455285b324405e3d1ab7214daf9ea929be749a05149d6b84bcccf34787ba791a31be0d2bb295ede0dddff5053adef885080b31bc39e24ac1 SHA512 b3806caaef24821fb4b96fb1af86e0c04381d9e8943a9f94064e028e623f57b6f2ba056e62f1997bbca934fb929ee92ffecd0d0192dd08d59e2f7dde6848c5cf
+DIST apache-tomcat-9.0.24-src.tar.gz 5746934 BLAKE2B fe0ff76fd8b3caa2860c0798d66f0dfff1e907ca02d10913c768d8513b207ef11e8fe885cd7578348136b8d007e08ccc2044952198259ffcdb2d58acf9fbb8b6 SHA512 de11d0e992cce08edb83474bd4cab04857e3e2bf63ef334c8c9f3ad053edcc76691e831cc95b8c489b820773a6fa5d2755837b470d73471f9587bb7062d75a31
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
 DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4 SHA512 2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30
@@ -22,7 +24,9 @@ EBUILD tomcat-7.0.96.ebuild 4231 BLAKE2B 1a84a9567f3ff6bec85c96bca9af6144ffc64f8
 EBUILD tomcat-8.0.53.ebuild 4554 BLAKE2B acdadf7f369b1c69ad391056abbe79dccfbaa1b561cdf050f7da1cb1da0bd3b8be0004ebfd9795bd1cdaa2b9b58d2b3cbfd84e97453a8a70455bd99d2d46b524 SHA512 665c4bd33e542f36268f4c4b1384f10a69e65dd81aca1a603e9b3969380a050754c215684131683940e346300bca77e7c1fee0714a5e4ee785531c5c3edeb2e9
 EBUILD tomcat-8.5.42.ebuild 4610 BLAKE2B a866bc62257c5e626d3d87d2fac5bc5bbe8e78c9a10f4e7c3fa54ba189dc0b91809004ce7a694a542f2d731d1c9ffaec92c7e69215b5cd837f756569ae30e6ab SHA512 9384a10d39b2558c468b720e6f80d232cf60b9d511017dc774ab035db03ccdca4d328e4daf2775d525f73eba488d44f4bf5c284523018140d50213b596501ebc
 EBUILD tomcat-8.5.43.ebuild 4611 BLAKE2B cc605cde3f85f6bd888a95caaa8876b832c0a4004a0a204a43a7e98eb6f0f8659c730d1daefd0d017a505c85f87f4f4fda4b617dd3c7288543470bdebaa411a9 SHA512 af20afd3a50be9e9424f250022f97f314e97f38dc252f9cfa9be692f1cc7f144cbedf662e56dfdfba18b28f2f3fcf788303b9365ec57c868caf60555d2696651
+EBUILD tomcat-8.5.45.ebuild 4611 BLAKE2B cc605cde3f85f6bd888a95caaa8876b832c0a4004a0a204a43a7e98eb6f0f8659c730d1daefd0d017a505c85f87f4f4fda4b617dd3c7288543470bdebaa411a9 SHA512 af20afd3a50be9e9424f250022f97f314e97f38dc252f9cfa9be692f1cc7f144cbedf662e56dfdfba18b28f2f3fcf788303b9365ec57c868caf60555d2696651
 EBUILD tomcat-9.0.21.ebuild 5521 BLAKE2B 6e93568948c6019823c0bc206a5ad977e4dc1baba0071644a32c0e84cd6b5e6bf5f8085c92a4976c4ca76cb51ea2162615697fcd118ddb7d17bc4d4f6c6c820b SHA512 2bcb2c9002e2566c64d74990ede3c4dddc72cdc8e1a783326987afadbd10b8a073d21b8ca6fbf300f1e9d82d104a34f52ca2c525449a15a7d7fda4ce17b2da26
 EBUILD tomcat-9.0.22.ebuild 5521 BLAKE2B 6e93568948c6019823c0bc206a5ad977e4dc1baba0071644a32c0e84cd6b5e6bf5f8085c92a4976c4ca76cb51ea2162615697fcd118ddb7d17bc4d4f6c6c820b SHA512 2bcb2c9002e2566c64d74990ede3c4dddc72cdc8e1a783326987afadbd10b8a073d21b8ca6fbf300f1e9d82d104a34f52ca2c525449a15a7d7fda4ce17b2da26
+EBUILD tomcat-9.0.24.ebuild 5521 BLAKE2B 6e93568948c6019823c0bc206a5ad977e4dc1baba0071644a32c0e84cd6b5e6bf5f8085c92a4976c4ca76cb51ea2162615697fcd118ddb7d17bc4d4f6c6c820b SHA512 2bcb2c9002e2566c64d74990ede3c4dddc72cdc8e1a783326987afadbd10b8a073d21b8ca6fbf300f1e9d82d104a34f52ca2c525449a15a7d7fda4ce17b2da26
 EBUILD tomcat-9.0.7.ebuild 4564 BLAKE2B bb3e1e254fc8eada11610515139c5edf3e4c310dca7990a3d1595862848dbd4157eb7380362a893ae2a904cadfc1f1e6e5c576f89a2c1b5fb48c047e9bb70328 SHA512 cc933b2ddccd45542d8be98cb18b2288ef7eb1db9f587405cc0d04591b0de9334394b4962b0c1deecbd3e8cb0429b2cacabb5de607203030aaf6fcc4134fe9c4
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/tomcat-8.5.45.ebuild b/www-servers/tomcat/tomcat-8.5.45.ebuild
new file mode 100644
index 000000000000..04794c75c5e0
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.45.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	>=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	!<dev-java/tomcat-native-1.1.24
+	>=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=dev-java/ant-core-1.9.13
+	>=virtual/jdk-1.7
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	eapply "${FILESDIR}/${PN}-8.5.40-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-9.0.24.ebuild b/www-servers/tomcat/tomcat-9.0.24.ebuild
new file mode 100644
index 000000000000..653707b85ff7
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.24.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="4.1.0"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.10"
+SAPI_SLOT="4.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/glassfish-xmlrpc-api:0
+	dev-java/tomcat-servlet-api:${SAPI_SLOT}
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	!<dev-java/tomcat-native-1.1.24
+	>=virtual/jre-11"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=dev-java/ant-core-1.9.13
+	>=virtual/jdk-11
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	eapply "${FILESDIR}/${PN}-9.0.19-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},glassfish-xmlrpc-api,wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 8ec0a7144dd7..902db6a875e6 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/viewres/Manifest b/x11-apps/viewres/Manifest
index b16207f6ee5c..280b269cefb6 100644
--- a/x11-apps/viewres/Manifest
+++ b/x11-apps/viewres/Manifest
@@ -1,5 +1,7 @@
 DIST viewres-1.0.4.tar.bz2 126186 BLAKE2B 355d1d7813f72cf2d8366fff83fbf8fcffe496ea70cd974b4a1257223b4cb056b98b131749db07f3092d8a11aceaffc7f31ca4bc1eab559babe0b8195a48ce1e SHA512 79edf987cb6232f604e31320fd6737325d2559dd6f0eaef667731b5790a709c81519b41ff5dc8f9aabb49a2a245b10584ed85c94c24ab82f466c776c182aa9f0
 DIST viewres-1.0.5.tar.bz2 134793 BLAKE2B 9dad0d6e21ddc8d927836d20b601d29c05eb9a0f7f7a4d95a8d6aab5304635c98849249dc4366c46a3ef10b01bd771c359cb8b0010f103fb7c98e45b7c064011 SHA512 fe573e9b5ae679b65eee95733cbea20c86c92089c3a2dadfe977bc9c54d1f58c5e5f4663e51a1cf206543a43592b3a3c266da1769279f08be85c66b0aa5b0f7f
+DIST viewres-1.0.6.tar.bz2 135200 BLAKE2B 96677c7c02e56be5da7f8f9d492f22cca5c6ea83a783725fd9fd86381b00062f3b83cbdb88c4030d9f0a52ccb8f06978232adb8e5f0002db06abcb7ff6d35ac9 SHA512 3f4cfc61608bc6c9b35ef66ceb473661ca01946d3306d54040d32803e8e0eec506a0ce37ea22bfe514544a6ba9645fd30f39b20c063aff696b3c0fda3fe95dff
 EBUILD viewres-1.0.4.ebuild 328 BLAKE2B 17e0a21acecc14195f538a8d096538da791851d2156d472d819ad0968f9aca89d1e79f2a55189dbbc4b2924de66a786ef575f427966a0ce92954855d34dbfda4 SHA512 36eba34a20fb8ce00d385f7b5ed29127efa24fae58e6e1b0dd1e6e63515ecfb5ab100ee65ee76cc229686a45eb36032c26f6bf76a25ead78fcec743d5bd65cfd
 EBUILD viewres-1.0.5.ebuild 328 BLAKE2B 3f318add1b75044157a55f724d667646939cdb2e2b2d689cae8ff0b64e77d79a5ce21ff9803e42b3aea786ffefc3c965511d36e493502faa275c4b2c53616850 SHA512 d63ae5b6f8f4e522728fcaadb1196ce04004bee0d8643c6fcfd203f4f1b939945a383e411078fddd6b57ecb2d101c4eb155bedb6f47e9bbc3198c9d2632ab66d
+EBUILD viewres-1.0.6.ebuild 371 BLAKE2B b7dd9017d03123ec87805a76559a786a118649420b7663d77e9c41aabfe3d96ff0c4b2ed42eb740bfd8f208426a914dc8f745979eca0fe8315619e3b1905e167 SHA512 8273ab5eb56636397282be3198ff28f7273cdaa6e5f386d33aa2174e6ce326418ae3918884e69b7b595d0aadc39fda40cdf1de581a0ef4542c4b05a82622358a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/viewres/viewres-1.0.6.ebuild b/x11-apps/viewres/viewres-1.0.6.ebuild
new file mode 100644
index 000000000000..c57a6567044d
--- /dev/null
+++ b/x11-apps/viewres/viewres-1.0.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit xorg-3
+
+DESCRIPTION="graphical class browser for Xt"
+
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXt
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 640d7e7f98c0..bc0548eb2926 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 34e3d5258fd8..efda45d2441a 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -21,6 +21,7 @@ DIST NVIDIA-FreeBSD-x86_64-415.27.tar.gz 62389955 BLAKE2B 39ac5970ef1a6ffbb03abe
 DIST NVIDIA-FreeBSD-x86_64-418.88.tar.gz 62076023 BLAKE2B 10f9fc4073c926d170a57e165454171c31624824d44a67f78bad68843b87f965361db509a5b86989a1224a347ca0550015ffd8e137ad17974708e802604b397b SHA512 d3a0f029f3d8c78a7419dbf7fd3af1b22ab01cf8d6d770572e44f2b61635e05f17d3262b611a7760b66bdc3ad4283a558c393f0f8c0e64d87eacbc929bb657bc
 DIST NVIDIA-FreeBSD-x86_64-430.40.tar.gz 62712042 BLAKE2B 6791f5931c715888dc76a0e4d2d28deecce24fc7ab989eba6def0369c3f30ccb680dbc792a0a9c3df9194c21286612c9a02f3130e0db53e06a2071f7b3662097 SHA512 a8fd481bafaff2a5aa68a4b1bc57bed80eb794c2d2a35d26546e113610276d0aec79116fb31bd34283da9fae559eef6357e5639baf8a5ced63eb8af6c26fc7bc
 DIST NVIDIA-FreeBSD-x86_64-435.17.tar.gz 64151018 BLAKE2B 22e18998d2b169de759e8f2951f6ffd4bfea643985d45895b267d1a36e211565b30d3937f75c17fe9a0cc3368902b9968eb817767053e691a15eaecc6b5d7412 SHA512 203727be00e8dd2a3df140058c111527bcb2b2689559cccbfd4557b45f832898cd89f04fda810262d4d91a8629c4c85b3a360f10b77a57dbf5c123549a5da0c0
+DIST NVIDIA-FreeBSD-x86_64-435.21.tar.gz 64153630 BLAKE2B fee655cc843c004ac0c1ec85b9417292016a013136e04ad047d2513edbdc7c732561d6bcc4603c658905972dce6618de49d4d6ac583e84fdf212cf45397b48c1 SHA512 2c160c06ca58e3009deb1ba4a4a28d39419e251ced3bfa9a442942f9cce17003d67e8a8bfa23036d3916cc0e66f4bff0fbedaae73db6f10b995235a56d7eba7c
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.129.run 29102893 BLAKE2B 19f73b7ac4df7d0584f180492676eba65a42c527566175308ebb78bd10e0a43c3f300f013193cafc9eccf1cb32a58f8d6dc574073d4197d2d71d90f224e6a5c4 SHA512 9e7a10e0bbd856a7a630fb8d1660a3e5cd224a04243989dbd24f3cc2e869a817a1fabe98b4257e9e5870a96f8d6dbcf51312c960a4a185457cb011ac9a0246fc
 DIST NVIDIA-Linux-x86-340.107.run 39016798 BLAKE2B 2632c8f257d0cf7c5b9294eb2c0b763eee6feb60eacc316024655971e4d067c4af6548aab3b7b2b295792b064f3f3ac3e6403a2ecfa096761d308dfb6b2569b8 SHA512 0add713942bcdb639d19b5c36f5e0cea14f9e07490191d46dfeba0515ede7700fd8e9467ec531d38329fe1e76bf45905e70e0d440e7bc2dc79c1d767eab03338
 DIST NVIDIA-Linux-x86-390.129.run 47560033 BLAKE2B e9b34c51d63dada2714c74cdb4ab199a141b1f5dd9f0d3222b1f5eec6a6a07dd2fdc2a609b9d0683b99c26078f4426082ea25b663c47f33fff4bb84599ac41e2 SHA512 b31d8f6b663fa7da1291fc25b4b08e17019476da521baea41201410a1d8a803b8ac9bad18485ff53589cea281ae4ece749118fa23a63e2c0720aafc60367255f
@@ -31,6 +32,7 @@ DIST NVIDIA-Linux-x86_64-415.27.run 108399659 BLAKE2B 05fb81a4ab8626d0170a30b70e
 DIST NVIDIA-Linux-x86_64-418.88.run 109217245 BLAKE2B fd7e4aee2306cda92e99a3adeb74ada4ac64f81f0ffbc72bac6eb5f0f9815e4f71452e7fdbf49c749b0a7dd0e147e12c44282c2d8be6747b8504b1621b982844 SHA512 c4ee1eae30e8158007c3bbcff941bc8ee0bef9bba216b8a57c42305bc338d2d98d5fc56ec90b0809216a7eba8d7a67fe5be298943f2688daccf5c78efc0dd119
 DIST NVIDIA-Linux-x86_64-430.40.run 111258448 BLAKE2B 9782181d5044430b374305fc868dd753d0f27c3b2f1f6b4bd34b3a49226730c4cf34b1ea4f3ba2c4fce5739c0408c64cc79f1a2c5a312ff3e09a5d20a79ce625 SHA512 68e6187fe74b43e92de6159589463db5f74eba09652b0f55d5fcc790c315405df6cd27129185f4dbe18790abdbb61e79b52977d47c6407e74d3372b5511a4e1b
 DIST NVIDIA-Linux-x86_64-435.17.run 142539690 BLAKE2B 0e196128496fce634dfe8eceb873af5beebe1ac6c1c040c449e24bf00336b16716d065b622ab2a0f26c41c570db156afd5f3b36f2145d96988e9dff1e2a6dff6 SHA512 28f1d82f00d4c46431ec8ce6e2357b94c2eb68516e650ca941ab04e202b0aa15ee6573eb692b43a3eff6afc974a5702b2873a864c43b9f2b0e5b2feb8fe00923
+DIST NVIDIA-Linux-x86_64-435.21.run 144387574 BLAKE2B e9afd6335182a28f5136dbef55195a2f2d8f768376ebc148190a0a82470a34d008ce04170ffc1aab36585605910c1300567a90443b5f58cb46ec3bff6ab9409c SHA512 e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270
 DIST nvidia-settings-340.107.tar.bz2 1549413 BLAKE2B 127442ee2c35ceec47ab4f103bdd2d0278c621fcb9be47051111f6f8728ef5699bdc95fe33a3812a807c38c4868b04c2176e2ed218a422171d2a88ac0c00de96 SHA512 593e7e83aa350a3a7beaaa32aca8660d7e203f6f2e460a6e6eabcdc092087f9917ee4e6d141e37ad4e3b0a1b9908c085e4a71d2f579e481a03bbd1c6f75ca776
 DIST nvidia-settings-390.129.tar.bz2 1109456 BLAKE2B cdce0bba52697e214ea26514467ea6f61fa06429f0a58ca549b74d8da1f7b07cbc52b1c9de6a13aed77545c2ba8c98b212a7865fdc5026dcd74f5565b73c4e1e SHA512 bf004608fbee6a12521fbcd9ab4e3d0333896b320c943ed9f2dc5373d8ffb2eb9cb4c6873a263acac87a9ab67a5f4589344d2bbd70bce36cf14242f4d57e1b87
 DIST nvidia-settings-410.104.tar.bz2 1120639 BLAKE2B 75554b0cca7c022a0f1cc02091f81ccd930e30e1dd5f674cf35b0cfed83c5e235c360b0f28701d39d42017b35b816f975ff177398eb9f59280851c0b8bfd57d3 SHA512 08d938117fca4d471bdff451219e6772fdd1e9c37c0ed623be8506c1cb5ce7ccde4d073848ade9f5bfca14b1a3cf9eb90b4b4bf44375bff43d023815b622b424
@@ -38,6 +40,7 @@ DIST nvidia-settings-415.27.tar.bz2 1128013 BLAKE2B 36513252ff3d5f2036c80250e012
 DIST nvidia-settings-418.88.tar.bz2 1127894 BLAKE2B 04b7c888e006f49e1745ede6eb8db35563c248b3c6be0c15539af1f9224c13ac7273037827e20294b03db0d5a56a62da8544ec605c40fcc0a2a15c741d76af9d SHA512 fbd46aaf41da4f04e8cdb3c484c9170633921673adfc878588f1e5464cc690b8a9fcb37b3c3cb8f0fdb496ed1abafcf0694039543c1354f7b481a46418309099
 DIST nvidia-settings-430.40.tar.bz2 1131627 BLAKE2B da55a08d3a4d096afe5aec5fc7faf36b10d814cf135a444f06a115b225d94fe20046a266e6afee3660b588561c4fadb1581e6f9ab9196fe19eb171140f05ba9c SHA512 9273887c2487476fc004839320b66726a766b0378dfd81d030386918d67e6a25ec6b26bed1db5c07634347e8cd6782f826c75e9ba8977b06e37880e4b55a1b9f
 DIST nvidia-settings-435.17.tar.bz2 1131069 BLAKE2B 9c0b13b5a023b819a4ce88cb238efe8b5b6eb7a7b72d0affe947e84629b55e42ee1f6eddb2c874fb2856918fe7bfb9ea2e844ffdfd6bc298d95ba23ca8b86947 SHA512 30e683f0ad0b663946cdc5bd8aa9eb4e52774f378e1499536b0f7e37c32960ba2a6901cd4dec3eb0ffd874cf0225c5e95f4d69e78ca99d44a93a2de054251344
+DIST nvidia-settings-435.21.tar.bz2 1131222 BLAKE2B 855f5c7667f4a5ec0f917fbb017d70ec6ee5e768f7087e77e54a66dea852c471bd1810a2163fb33204e5f381998a27a4254e0a5d2c73e2b6b624813ff8294f24 SHA512 8b408cc70118df3a138a99fe7fc14f6370d500b8ae26888b27b07de22f6fc6eebd65bd437d83ee82e18a1d8ee4cceec601c414b1947302ca808fff48165f31bb
 EBUILD nvidia-drivers-340.107-r1.ebuild 14337 BLAKE2B 9d69d838adcbb2bcc20d69ae60156cb99baa4b5030c9f895def311f561b1fe8066936aa9d4fe7863e55077fdc00a7d136e51c463edb4472431e15d046f77f118 SHA512 ff1bd377e6eef99415eb245a1027ad6c2645edaa8a341305884147d36a7d0347c40baa5053bb807237d28c6ce25d8d130f3f00e062333f3c1397e97ccf8cc46c
 EBUILD nvidia-drivers-390.129.ebuild 16279 BLAKE2B 2f8198c3715397f4c707f90f79d5fa5d6639a649669ff1552501e8e6fe995850e64883a3d85159200c1e7cedbaf6b739993cb60822c32048eabaaebdf3be8fbd SHA512 3b0bafb836b3eb686c2dd063502b5a19a5012c866c588c34d2a4248ce25d5b27fc0c84ad143946d7dbe5f1c369f3f7a9ddbfd2a008bab00915257e60a75ed6bf
 EBUILD nvidia-drivers-410.104-r2.ebuild 16168 BLAKE2B 8087579f48a012b3045e01ad0a3a7137df515b22c5775b3acb1e43ca3d449af539e6f95b767884bde57a814b555c430b509024b2cdba115ad3643643054811b1 SHA512 4112f8727e141e5a074bae84f70a18d0c175827fdcff3624f2caf8301b192c8bec138af7d502614908d283db912c5470be1d99a7c7c055e981ddfb9bf6bea091
@@ -45,4 +48,5 @@ EBUILD nvidia-drivers-415.27-r2.ebuild 16179 BLAKE2B 5a22bb5a3fadaf892565f5f6c4c
 EBUILD nvidia-drivers-418.88.ebuild 16026 BLAKE2B fd64c1da1e2b0eca1b9c6d70d56271b6b15c28ac187e4409a19f04ac3fe43755b85a1a88fc732f95b91d1855508934ac20b503c96cc743ecc42dd774191c92fb SHA512 16166fd6182670e15fd03b38550960d4fcbd6eff0833839b2fdb1fea0e597dfa3d00cc4170945244a9b5918a4d29112f172e3ef50a87359bd6c41c942ee58316
 EBUILD nvidia-drivers-430.40.ebuild 15841 BLAKE2B 1b18946c96999a975c1356f14b14be1c89b92ef218291553fe893fbc84eba4c8e3faf739f291a06433adbd0fbbe0a0957d1d46bbd265b5a53486a03fc1ffc332 SHA512 092c0b41af44315f149074c089c660b022a7851c7bab17add8aeb588da6e9e4fb975fe6e60554c8c3fce3bf0e9eab6bbcc675c35463ec939a0717f0b5867f9b7
 EBUILD nvidia-drivers-435.17.ebuild 15857 BLAKE2B e1a905c3cd9b29205367310d18035ee6700432fc10b65f9060c9f7ae8ebab593ffcdbfe8ad91904a81f7b79c293db9dc2a50d10e9c0045892e1295f2eae65bca SHA512 998067efd5b29ce135fd2011eecc5312d75d85741c4bcc39df3641cd3c912e99d360e70005ed7f148f77f124ce4e0fb7f65648e42cb33b1d3aedd4e536179715
-MISC metadata.xml 1207 BLAKE2B 6fd00cf82a2940c84a3802484c9c752e5bd9786158f6f6e983cf5fe56f5018b7f1f90108525234bf8c98b0f63abba54a468509609f34b9e7647f7bfa7491bea1 SHA512 2a3274c9c81c05f1d722974a5f73dfec9ae778745092c4441e441d87f2554cb0c4822e8ce63c89a90e11d7237e6dc5a3a11ca12cdfd9813054e3abf75e7f9ba1
+EBUILD nvidia-drivers-435.21.ebuild 16200 BLAKE2B 07519af8290da16184f606eba6c9a79ec6dffc5e7d123c477c7f7dad551ac80e39e61c9ed54d76ec9d6b6fa23165b0913dd2012e94865ac5db27cdcbd545bae8 SHA512 4a531c79ed95d6a473b481f446b9a570d9231b3b7bfeafd1289c3efafae4433b3aedef64e88ff6f2adee4a57a33261288d43ce617dceab3cb10de6c34977321f
+MISC metadata.xml 1284 BLAKE2B 0e13b2eae77fee75a4757da7ae80540093962b6e8ccc3b0950caa3a0957ff79c6b08c80ceeec8ffcde47b293c258159f8722a13334fe06868589a18802ec0434 SHA512 0a3c6679f7fc23bf87340145f3a97945c9e8c7fc9c8721fa4643fb662347af312b4b927635901e95acb9349a7b191ef088ff0e51bbbc0cbd333603bb60984020
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index dea17321a16e..4bdb2f83abc8 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -14,11 +14,12 @@ You can use http://www.nvidia.com/Download/Find.aspx to figure out which branch
 best matches your hardware.
 </longdescription>
 <use>
+<flag name="X">Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries</flag>
 <flag name="compat">Install non-GLVND libGL for backwards compatibility</flag>
 <flag name="driver">Install the kernel driver module</flag>
-<flag name="X">Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries</flag>
 <flag name="gtk3">Install nvidia-settings with support for GTK+ 3</flag>
 <flag name="kms">Enable support for kernel mode setting (KMS)</flag>
+<flag name="libglvnd">Use <pkg>media-libs/libglvnd</pkg> for dispatch</flag>
 <flag name="tools">Install additional tools such as nvidia-settings</flag>
 <flag name="uvm">Install the Unified Memory kernel module (nvidia-uvm) for sharing memory between CPU and GPU in CUDA programs</flag>
 </use>
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
new file mode 100644
index 000000000000..328511e0cf6f
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
@@ -0,0 +1,603 @@
+# 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="https://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 libglvnd multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+RESTRICT="test"
+
+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? (
+		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
+		libglvnd? (
+			media-libs/libglvnd[${MULTILIB_USEDEP}]
+			!app-eselect/eselect-opengl
+		)
+		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 5 3; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-5.3"
+		ewarn "<sys-kernel/vanilla-sources-5.3"
+		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_configure() {
+	tc-export AR CC LD
+
+	default
+}
+
+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() {
+	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/libXNVCtrl \
+			DO_STRIP= \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			RANLIB="$(tc-getRANLIB)"
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=.
+	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
+		if use uvm; then
+			doins "${FILESDIR}"/nvidia-rmmod.conf
+			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
+		else
+			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+				> "${T}"/nvidia-rmmod.conf || die
+			doins "${T}"/nvidia-rmmod.conf
+		fi
+
+		# 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
+
+	# 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}" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			PREFIX=/usr \
+			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"
+
+	# 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
+
+	readme.gentoo_create_doc
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	if use libglvnd; then
+		local GL_ROOT="/usr/$(get_libdir)"
+	else
+		local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	fi
+	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_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_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 libglvnd; then
+			NV_GLX_LIBRARIES+=(
+				"libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}"
+				"libGL.so.1.7.0 ${GL_ROOT}"
+				"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+				"libGLESv2.so.2.1.0 ${GL_ROOT}"
+				"libGLX.so.0 ${GL_ROOT}"
+				"libGLdispatch.so.0 ${GL_ROOT}"
+				"libOpenGL.so.0 ${GL_ROOT}"
+			)
+		fi
+
+		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.1.3"
+			)
+		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
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	fi
+	"${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() {
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+	fi
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	if ! use libglvnd; then
+		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+	fi
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 399acdff4ce6..a3acc68ce234 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 67985c9c0336..f445486d9561 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -2,6 +2,6 @@ AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e
 DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9
 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
 DIST gdk-pixbuf-2.38.1.tar.xz 5509328 BLAKE2B 9180e833b264e4eb1bec1ec92e6ee7cb07a208459a7b58da9edd3f1872cdc1a98a6d7c27a147674d5dbded1b74098a4b1f197479c7addd1a6b307ced82a2e4dd SHA512 e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
-EBUILD gdk-pixbuf-2.36.12.ebuild 4076 BLAKE2B bc49bef8fc97cb3adcbfa5262713d700089f06cc7392bb85faf080ae02804520a6c89e36c024757cfa7f0e865e70a84639d4094d6a45de6968e3fc1953cf08f5 SHA512 516b6f8b9643e86bd19e10172ccc430e38a289f319a521b45ba336a6f87e163b26c51077a9e4a855502c240b7bedd63021a82b878ce1c779581b82e78a82a0de
-EBUILD gdk-pixbuf-2.38.1.ebuild 4086 BLAKE2B 5befd1e92bbae70ff6294fcac99f24d3f23d327295fbd2751c5da9ff8936d495371acbbcedf0eb8853223639e8089325247a18792f8cf82325d2fe3f8a75f8b7 SHA512 b9072ab977f05347445ee0c696113be679b887c4be0c4b5d42f23ca71e2a21fc4d2dd117e57cb28e9fed38143be11cf9ee453e099c0c4dd98589cbaa4b213e2b
+EBUILD gdk-pixbuf-2.36.12.ebuild 4007 BLAKE2B de6f3819c976e33c87a1f9f84fc8d85ce16ca793b147282545a796493cd43b827e034c7a0f5f529f160165781c02465f71859a863c6af8fa9882aa1a8235aa72 SHA512 98f39a76ebec24dc4f22559b487fff324f2b714d3203a5e98d6d4a18e85b4b8ab7f9c584e0f9c57dbb5d3f727e66b932458901408bc20a3c84eac7aafaa6be03
+EBUILD gdk-pixbuf-2.38.1.ebuild 4014 BLAKE2B b9d4e2cee94e4ee563804f6e98ac687063b2604c4a37b9ec64a981e3632beb516d11a9588cab341d9e0dba4fa1ff176fc9d99152fb760191c01b301e160f5ae4 SHA512 b1f1061e9d833667d4ebf4c7107b7446b21d66a6d955f79fdf64043c1fc7ce13b329f11b0a738f4aab3bd2c2104f8733f7f1ff6da4586491fdcb014a259734ec
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
index fba332527c16..abf08b26b453 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 LICENSE="LGPL-2+"
 SLOT="2"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X debug +introspection jpeg jpeg2k tiff test"
+IUSE="X debug +introspection jpeg tiff test"
 
 # Remove SRC_URI when gnome bug #795069 is fixed
 SRC_URI="${SRC_URI} test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug753605-atsize.jpg?h=2.36.12 -> ${PN}-2.36.12-bug753605-atsize.jpg )"
@@ -22,7 +22,6 @@ COMMON_DEPEND="
 	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
 	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
 	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 "
@@ -74,7 +73,7 @@ multilib_src_configure() {
 	gnome2_src_configure \
 		$(usex debug --enable-debug=yes "") \
 		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
+		--without-libjasper \
 		$(use_with tiff libtiff) \
 		$(multilib_native_use_enable introspection) \
 		$(use_with X x11) \
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
index feca458cf8df..d6594527cccb 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 LICENSE="LGPL-2+"
 SLOT="2"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X gtk-doc +introspection jpeg jpeg2k tiff"
+IUSE="X gtk-doc +introspection jpeg tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
 COMMON_DEPEND="
@@ -20,7 +20,6 @@ COMMON_DEPEND="
 	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
 	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
 	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
@@ -66,7 +65,7 @@ multilib_src_configure() {
 		-Dpng=true
 		$(meson_use tiff)
 		$(meson_use jpeg)
-		$(meson_use jpeg2k jasper)
+		-Djasper=false
 		$(meson_use X x11)
 		-Dbuiltin_loaders=png
 		-Drelocatable=false
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 9c38dd549bbb..a8e7c470f437 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -15,7 +15,7 @@ DIST gtk+-3.24.8-patchset.tar.xz 3684 BLAKE2B 686356993b95f5342942764af5f92ab52b
 DIST gtk+-3.24.8.tar.xz 22419364 BLAKE2B 262384d0bf1d843edfcb13007eae3584235fa166286f071b8b98803d452df3f4f8934f2b1830427d0c0cd956b67170e576f8c3f733e9b6323b8f89f6d0ddea71 SHA512 a988ca2e25f0f32e55b2931f16c72f9649ed98405579d217e8a5e7f0ac10bcd1969090c622c5d9eb7d75235813ff7ccb90e30e252afd71ba283c6172ee459fe5
 EBUILD gtk+-2.24.32-r1.ebuild 10008 BLAKE2B 8bceca83e3a73a2565cd980c80d1baa5fa2a79de61b4b8cb984738bbf6740c59a5df4b04e878fa2282d46642970e11dc4db8dadbf479447576b854f597b274cc SHA512 f3dca376a7794bc8ecdc47362a09dc58d46de7636dc0fec7dda86727ed47cb0d2105d5901884b60ae0601159ba1a79d0da2e05d725e0d119d9382a7771369ad2
 EBUILD gtk+-3.24.1.ebuild 6911 BLAKE2B 2320cdd69304ba179e9d3a679f4fcbbbef233f454b4661fa1268e7f209401fac175d1a50f57c931ec669ff64168891d66abea8f057b84837cf3801404f6cc6e8 SHA512 0df091ae2f0ad31ef4a77c77ea62e1e6075af62234483bc841b9c027aff45e0c7632354895d3066f9d480177f90eaa25069b6082b21da48640e7525b96000194
-EBUILD gtk+-3.24.10.ebuild 7325 BLAKE2B 5462361af2e23d93b6fb6f55666a2c15552edefa201bc22443688e628a13bfab77714e3b55e0be2c57d92b18e01d4681d2730967e55a393eb1f3009b1880a29e SHA512 dfe6cffe3836606a87ce162b7c5668c284c0da4dfb0848941ed2a41b95efcda2d098997ce20921f7e149c89ed4c3978f484d3640f674f4bf1b000f5889a85adb
+EBUILD gtk+-3.24.10.ebuild 7319 BLAKE2B c95b010239374cb401c75b885e149519b75dbeb880be1e77d86fb829142ce86c19638376eee58dd6829852aeaddc3d13b2d63394eafc50010f46f59332eb666c SHA512 8303ad265908b470a9268266600035a5657acaecf77221f46fdbb6765152a2b458d0e8d197fb3b63ca6c95316b10e50e585b9ecdb36cfc8b729e316a2b3c3ed2
 EBUILD gtk+-3.24.4-r1.ebuild 7277 BLAKE2B 833c8d22a401ba319fce77e3dc17223213d96e3d170b382377af5aa95fcee179c357e69d7dabc02e653a21877e199c5871e9843f800887dfe87985e3a068e231 SHA512 a26d38f97f1186452abb836ae7508f1d70d8913f466915afc7f6970af52a389bfb1b16914ee933be4ef0e2cd9eed99684f7b3aa2c41cbd793a3d55bbb0b4e0fa
 EBUILD gtk+-3.24.8.ebuild 7107 BLAKE2B d7f5db20d8f6821c5c50568493ffa0a01fe0b50c935055cd6d4cc0ea0ee34ea8fb3cbb8737f15868267017430466c0404c2c8084f759001d4642af4970c25b99 SHA512 051a2cbad61cff75b30fc8c889f7a1884bb8ee483cf304f92cd5b04a81dadae664aee1994d71111b2b3ff8389f794b0d02dbf998826367ffab70a7441f5ce4b9
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.24.10.ebuild b/x11-libs/gtk+/gtk+-3.24.10.ebuild
index 5f80a015c446..efd5436f0669 100644
--- a/x11-libs/gtk+/gtk+-3.24.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.10.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/guile-gtk/Manifest b/x11-libs/guile-gtk/Manifest
deleted file mode 100644
index a89de6defcd4..000000000000
--- a/x11-libs/guile-gtk/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX 2.1-brokentest.patch 1029 BLAKE2B 96336de7d1efcfcff9ba7ac04c00e2972b5aac0051e586c381a24ef45efe62814cf75a34b4634f7812a96342781d6bbc088b889874757977586fc4cf806729a4 SHA512 e398ba38b19a2076a0974da3b8c2a038fe7b49e59cf187e20eb33df1bc74f6d34afcec5ffac5b288ed59b0f131a2a30254e248b6c63ff10cbf9107005ca56625
-AUX 2.1-prll-install.patch 421 BLAKE2B 137bb381668c7540d56f15c8246d79a08c4931b2eaed7828f4b1e0bbecc0e88ad752e639331784cc2b24fcfabea050d374e92d13887587865aeb5029debbd02a SHA512 ff30ed5edb3a9a2bfde6b480b2bbf2d8487cfe6583f73bbefb35e434b37e727037005e6e11e91aa115fcc75ed558883e36aa64d46f34d9ab40a94792eb201e10
-AUX 2.1_migrate_gh_functions.patch 1872 BLAKE2B a82d98508469b3233215f672f15018a32752ca2505bbf414a01382553ea45fcb8b075cec0647198021d165bdc01e4364f7f8f919049a94a15b2861216d2a78e3 SHA512 7b749c4a438da1a98d266ca7e1e7923400121af47c52b3f8715a1cebc1c60c7c6e2fda9992891b49c866d9121f64182c629615900d285209fe3aee22e9976ba8
-AUX guile-gtk-2.0-g-object-ref.diff 1239 BLAKE2B 8ee7fc847befc089e7e9171c17b5a950b5e930241dccff2bd497909206c54c31f1384b204ed7c3ad4fbda8c0961dba494945609ed1ad7c0f78ee2bb9bee46b29 SHA512 ad72eff398d573450127dab756207974b56b48161d79a13b907ed58dc17ba63b1256478ab8d2d6c22ec03fd106d9814e6a4d9ca030ee203c1af474a28faea513
-DIST guile-gtk-2.1.tar.gz 781985 BLAKE2B b3387ef9ac79935fa9cf2b7d35f4012dc0748ecbade131b2c73d8d4513d90f84164ec3f196fafda8ba77abfd2a0b8dadf9dbc0118281fc06db0a36d2f533592a SHA512 ab9bc66c97099d6958c401e16db57ceedaf23f1944cb7cf1e6899547c77cafff67455f228edd156a5a7ee0b62264e6af0ff82fa3ec31bcb499710bc5cb2070a7
-EBUILD guile-gtk-2.1-r2.ebuild 936 BLAKE2B bf3f7b37cdfac6b5430157311049f38dae49bf290b6401352be2a429437151f9dd1cc12c4b6d0a5c142e29abbbc9c0db16d254966b5bbb78eb851cb528ea47b2 SHA512 b570fe2dc0060f3a03d5c710ad3fc742636f598f9332f711f94291268dc02dbcad090e91b4e3207487a9dd4ddabbce3bd8b1cfeea6729100db4b757f7f119280
-EBUILD guile-gtk-2.1-r3.ebuild 1003 BLAKE2B d0e02f0f57cf6af74526c993c600819398aa2c9738ffcfbed4e43bedd1f36b8051037ad00ad7a89c9dd444c1752f4a4f20bb022d33925d0ee8dff72ded9f4211 SHA512 63203feb3293e955d417cdc6f33e6ff577cfe21ae09cec11cbecd6c5149613de2b451e96ab63d21954ae00f65e0a77776dfe8af4bd77c7ecf571a76dffcfbf8a
-MISC metadata.xml 384 BLAKE2B 0825ebf9da828bd733111afeafa845331623c6f61a7a8c396ea594d0cfef2a0fa5a3786e4e4de3709df5e493aae56263548206ebd82296e15fb807e403595022 SHA512 d249b966de131fb538bccbdf9ff10501b54058de809a9c8e4405e79aacaa3c232c429183a57b955bd044207ff84a8056883eec3dad1583c6fd58c06ee912bd77
diff --git a/x11-libs/guile-gtk/files/2.1-brokentest.patch b/x11-libs/guile-gtk/files/2.1-brokentest.patch
deleted file mode 100644
index ecba95174e0c..000000000000
--- a/x11-libs/guile-gtk/files/2.1-brokentest.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/tests/gdk.scm b/tests/gdk.scm
-index 6e08f9f..6b01e83 100644
---- a/tests/gdk.scm
-+++ b/tests/gdk.scm
-@@ -1102,28 +1102,6 @@
- 	  (got  (exact-positive-integer? (gdk-screen-height-mm))))
-      (test "gdk-screen-height-mm" #f want got))))
- 
--;;
--;; gdk-selection-property-get
--;;
--
--(malloced-steady  ;; with nothing ever requested
-- (lambda ()
--   (let* ((win    sample-win)
--	  (want   '(#f NONE 0))
--	  (got    (gdk-selection-property-get win)))
--     (test "gdk-selection-property-get" sample-win want got))))
--
--(malloced-steady  ;; on a destroyed window
-- (lambda ()
--   (let* ((win    (gdk-window-new #f 100 100 '() 'input-output 'toplevel))
--	  (want   '(#f NONE 0))
--	  (got    (begin
--		    (gdk-window-destroy win)
--		    (gdk-selection-property-get win))))
--     ;; final free()s only take place under the main loop, so need this to
--     ;; satisfy `malloced-steady
--     (gtk-main-iteration-do #f)
--     (test "gdk-selection-property-get" (list "destroyed win" win) want got))))
- 
- ;;
- ;; gdk-text-extents
diff --git a/x11-libs/guile-gtk/files/2.1-prll-install.patch b/x11-libs/guile-gtk/files/2.1-prll-install.patch
deleted file mode 100644
index b00fc29ca34a..000000000000
--- a/x11-libs/guile-gtk/files/2.1-prll-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 822a170..37f43b5 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -72,7 +72,7 @@ gdkdefs = gdk-2.0.defs
- defsdir = $(datadir)/guile-gtk/
- defs_DATA = $(gtkdefs) $(gdkdefs) 
- 
--install-exec-local:
-+install-exec-hook:
- 	rm -f $(DESTDIR)$(bindir)/build-guile-gtk
- 	rm -f $(DESTDIR)$(bindir)/guile-gtk
- 	ln $(DESTDIR)$(bindir)/build-guile-gtk-2.0 $(DESTDIR)$(bindir)/build-guile-gtk
diff --git a/x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch b/x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch
deleted file mode 100644
index 5a194874f155..000000000000
--- a/x11-libs/guile-gtk/files/2.1_migrate_gh_functions.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur guile-gtk-2.1.orig/glade/glade-support.c guile-gtk-2.1/glade/glade-support.c
---- guile-gtk-2.1.orig/glade/glade-support.c	2016-08-12 12:00:45.894290499 -0600
-+++ guile-gtk-2.1/glade/glade-support.c	2016-08-12 12:02:33.186666585 -0600
-@@ -17,7 +17,6 @@
- 
- #include <glade/glade-xml.h>
- #include <libguile.h>
--#include <guile/gh.h>
- 
- #include "config.h"
- #include "guile-gtk.h"
-@@ -83,7 +82,7 @@
-       sgtk_protshell *protshell;
-       GClosure *closure;
- 
--      cb = scm_internal_cwdr ((scm_t_catch_body) gh_eval_str, (char*) handler_name,
-+      cb = scm_internal_cwdr ((scm_t_catch_body) scm_c_eval_string, (char*) handler_name,
- 			      scm_handle_by_message_noexit, "glade",
- 			      &stack_item);
- 
-diff -ur guile-gtk-2.1.orig/gtk-gl/gdk-gl-support.c guile-gtk-2.1/gtk-gl/gdk-gl-support.c
---- guile-gtk-2.1.orig/gtk-gl/gdk-gl-support.c	2016-08-12 12:00:45.894290499 -0600
-+++ guile-gtk-2.1/gtk-gl/gdk-gl-support.c	2016-08-12 12:02:19.530121760 -0600
-@@ -19,7 +19,6 @@
- #include <gtkgl/gdkgl.h>
- 
- #include <libguile.h>
--#include <guile/gh.h>
- 
- typedef struct {
-   char*		name;
-@@ -100,7 +99,7 @@
- 	    if (! SCM_INUMP (s_value))
- 	      goto error;
- 	    
--	    *aptr++ = gh_scm2int (s_value);
-+	    *aptr++ = scm_to_int (s_value);
- 	  }
-       }
-     }
-diff -ur guile-gtk-2.1.orig/guile-gtk.c guile-gtk-2.1/guile-gtk.c
---- guile-gtk-2.1.orig/guile-gtk.c	2016-08-12 12:00:45.890957197 -0600
-+++ guile-gtk-2.1/guile-gtk.c	2016-08-12 12:01:59.346968496 -0600
-@@ -28,7 +28,6 @@
- #include <gdk/gdkx.h>
- 
- #include <libguile.h>
--#include <guile/gh.h>
- #include <libguile/dynl.h>
- #include <libguile/tags.h>
- 
-@@ -2196,7 +2195,7 @@
- #if 0
-       /* Gone in Gtk 2 */
-     case GTK_TYPE_CALLBACK:
--      return gh_procedure_p (obj);
-+      return scm_is_true (scm_procedure_p (obj));
- #endif
-     case G_TYPE_OBJECT:
-       return sgtk_is_a_gtkobj (type, obj);
diff --git a/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff b/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff
deleted file mode 100644
index bd582117f621..000000000000
--- a/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- guile-gtk-2.0.orig/gtk-gl/gdk-gl.defs
-+++ guile-gtk-2.0/gtk-gl/gdk-gl.defs
-@@ -22,14 +22,14 @@
- ;--- Types ... --------------------------------------------------------
- 
- (define-struct GdkGLContext
--  (copy gdk_gl_context_ref)
--  (free gdk_gl_context_unref)
-+  (copy g_object_ref)
-+  (free g_object_unref)
-   (size "0")
-   (canonical-name "Gdk" "GL" "Context"))
- 
- (define-struct GdkGLPixmap
--  (copy gdk_gl_pixmap_ref)
--  (free gdk_gl_pixmap_unref)
-+  (copy g_object_ref)
-+  (free g_object_unref)
-   (size "0")
-   (canonical-name "Gdk" "GL" "Pixmap"))
- 
---- guile-gtk-2.0.orig/gtk-gl/gdk-gl-glue.c
-+++ guile-gtk-2.0/gtk-gl/gdk-gl-glue.c
-@@ -83,8 +83,8 @@
- 
- sgtk_boxed_info sgtk_gdk_gl_context_info = {
-   { "GdkGLContext", GTK_TYPE_BOXED, NULL },
--  (void *(*)(void*))gdk_gl_context_ref,
--  (void (*)(void*))gdk_gl_context_unref,
-+  (void *(*)(void*))g_object_ref,
-+  (void (*)(void*))g_object_unref,
-   (void (*)(SCM)) NULL,
-   0
- };
-@@ -100,8 +100,8 @@
- 
- sgtk_boxed_info sgtk_gdk_gl_pixmap_info = {
-   { "GdkGLPixmap", GTK_TYPE_BOXED, NULL },
--  (void *(*)(void*))gdk_gl_pixmap_ref,
--  (void (*)(void*))gdk_gl_pixmap_unref,
-+  (void *(*)(void*))g_object_ref,
-+  (void (*)(void*))g_object_unref,
-   (void (*)(SCM)) NULL,
-   0
- };
diff --git a/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild
deleted file mode 100644
index 0b766606e53e..000000000000
--- a/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils virtualx
-
-DESCRIPTION="GTK+ bindings for guile"
-HOMEPAGE="https://www.gnu.org/software/guile-gtk/"
-SRC_URI="mirror://gnu/guile-gtk/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-scheme/guile:12[deprecated(+)]
-	x11-libs/gtk+:2
-	gnome-base/libglade:2.0
-	>=x11-libs/gtkglarea-1.90:2"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0-g-object-ref.diff
-	"${FILESDIR}"/${PV}-prll-install.patch
-	"${FILESDIR}"/${PV}-brokentest.patch
-)
-
-src_prepare() {
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	Xemake check
-}
-
-src_install() {
-	autotools-utils_src_install
-	insinto /usr/share/doc/${PF}/
-	doins -r examples
-}
diff --git a/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild
deleted file mode 100644
index 66fb90b3a5a2..000000000000
--- a/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-WANT_AUTOMAKE=1.9
-
-inherit autotools-utils virtualx
-
-DESCRIPTION="GTK+ bindings for guile"
-HOMEPAGE="https://www.gnu.org/software/guile-gtk/"
-SRC_URI="mirror://gnu/guile-gtk/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-scheme/guile-2[deprecated(+)]
-	x11-libs/gtk+:2
-	gnome-base/libglade:2.0
-	>=x11-libs/gtkglarea-1.90:2"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0-g-object-ref.diff
-	"${FILESDIR}"/${PV}-prll-install.patch
-	"${FILESDIR}"/${PV}-brokentest.patch
-	"${FILESDIR}"/${PV}_migrate_gh_functions.patch
-)
-
-src_prepare() {
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	Xemake check
-}
-
-src_install() {
-	autotools-utils_src_install
-	insinto /usr/share/doc/${PF}/
-	doins -r examples
-}
diff --git a/x11-libs/guile-gtk/metadata.xml b/x11-libs/guile-gtk/metadata.xml
deleted file mode 100644
index fe1bacfb1309..000000000000
--- a/x11-libs/guile-gtk/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>scheme@gentoo.org</email>
-		<name>Gentoo Scheme Project</name>
-	</maintainer>
-	<longdescription lang="en">
-The guile-gtk project brings the power of Scheme to your graphical application.
-	</longdescription>
-</pkgmetadata>
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index a735b35089eb..c31a9755a0f6 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,10 +1,6 @@
-DIST libdrm-2.4.96.tar.bz2 829518 BLAKE2B d9a21ce31af65812c1b23968ef6c1901aea106b4cc68d76d3641a17b98423024b804bfda509862174eba98271bd7156c7f08d81bc0a520ea4a25c8e2e0bfd598 SHA512 008cb7658d953b44e11fa3cc6e00dfeb3efb59c7fdadd59f7066101aff138acbbc2f2508e9ebe0528340e39dc7693937755d1641816ddde135c10a13e7d81e3b
 DIST libdrm-2.4.97.tar.bz2 837329 BLAKE2B b47393d81917a0b43c22f7798ff2e1c21a05fc716a63092dbe0e49cda0fe3bd899d5cc4d703ae49f781e283f5067c62cd37a4931362427e21c3356584cb5e810 SHA512 3e08ee9d6c9ce265d783a59b51e22449905ea73aa27f25a082a1e9e1532f7c99e1c9f7cb966eb0970be2a08e2e5993dc9aa55093b1bff548689fdb465e7145ed
-DIST libdrm-2.4.98.tar.bz2 833295 BLAKE2B abcb51046d95dd0620d8ae705a731c4a0b9db817cc897c6bf2063c3c25c13f45019b5c016248fe93269b77252de96724c3215eaf5be990b925a38034bfe4a4e4 SHA512 3d333d060ceb14fa8e204ef468ca2c95d6f07205185ca90a044b685832b9b2d7256faa5e81d5871ce8b70aa1fdf9fb1ade18b4e582ff0c7ef5551da8506eb27b
 DIST libdrm-2.4.99.tar.bz2 853659 BLAKE2B 66fb3f757ab468b6f6285ae740f67d6c38473f3866b57c6a1e24b322bdd46f2d21132b5ea7a737f1d3fa8dcf55162d4c904f181f17227c239b3322c0af50181c SHA512 04702eebe8dca97fac61653623804fdcb0b8b3714bdc6f5e72f0dfdce9c9524cf16f69d37aa9feac79ddc1c11939be44a216484563a612414668ea5eaeadf191
-EBUILD libdrm-2.4.96.ebuild 2143 BLAKE2B 3e2c8d221b892ec17c3f36036be0398061ac3aa50b05259ef89acc2b86309953a5c87382cdda95df152a603ff624216b3108c9754a6bfe88b6c6053ccd24a06f SHA512 30cfc0c66b0a8b6b303e68c891ed02239a9a9767289523d7cbb74b37ed7b592975450d0f130ed47ed67ff82e0ea32250a7d4e3d07706ae1030e32096e8e0a108
 EBUILD libdrm-2.4.97.ebuild 2143 BLAKE2B 3e2c8d221b892ec17c3f36036be0398061ac3aa50b05259ef89acc2b86309953a5c87382cdda95df152a603ff624216b3108c9754a6bfe88b6c6053ccd24a06f SHA512 30cfc0c66b0a8b6b303e68c891ed02239a9a9767289523d7cbb74b37ed7b592975450d0f130ed47ed67ff82e0ea32250a7d4e3d07706ae1030e32096e8e0a108
-EBUILD libdrm-2.4.98.ebuild 2154 BLAKE2B ce5a70ac7497f4dd11c616e24ae1407a4a0d4e96635fcc2a3c915777c2892b7dfe3cedf561e5391d2df13f15a06a07c13cfc0f693f8a19342a0e89b2f9429642 SHA512 99bf291b61db6b47ddfb2f2c515ff2d58a169186e4ae8b6b7f8366d04b700fed9c7c720149a16209f18b829a7c96e57d7da59e8a87ebce39e840f5d21b87331c
 EBUILD libdrm-2.4.99.ebuild 2154 BLAKE2B ce5a70ac7497f4dd11c616e24ae1407a4a0d4e96635fcc2a3c915777c2892b7dfe3cedf561e5391d2df13f15a06a07c13cfc0f693f8a19342a0e89b2f9429642 SHA512 99bf291b61db6b47ddfb2f2c515ff2d58a169186e4ae8b6b7f8366d04b700fed9c7c720149a16209f18b829a7c96e57d7da59e8a87ebce39e840f5d21b87331c
 EBUILD libdrm-9999.ebuild 2154 BLAKE2B ce5a70ac7497f4dd11c616e24ae1407a4a0d4e96635fcc2a3c915777c2892b7dfe3cedf561e5391d2df13f15a06a07c13cfc0f693f8a19342a0e89b2f9429642 SHA512 99bf291b61db6b47ddfb2f2c515ff2d58a169186e4ae8b6b7f8366d04b700fed9c7c720149a16209f18b829a7c96e57d7da59e8a87ebce39e840f5d21b87331c
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.96.ebuild b/x11-libs/libdrm/libdrm-2.4.96.ebuild
deleted file mode 100644
index 76499a8ff61b..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.96.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson multilib-minimal
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		-Damdgpu=$(usex video_cards_amdgpu true false)
-		-Dexynos=$(usex video_cards_exynos true false)
-		-Dfreedreno=$(usex video_cards_freedreno true false)
-		-Dintel=$(usex video_cards_intel true false)
-		-Dnouveau=$(usex video_cards_nouveau true false)
-		-Domap=$(usex video_cards_omap true false)
-		-Dradeon=$(usex video_cards_radeon true false)
-		-Dtegra=$(usex video_cards_tegra true false)
-		-Dvc4=$(usex video_cards_vc4 true false)
-		-Detnaviv=$(usex video_cards_vivante true false)
-		-Dvmwgfx=$(usex video_cards_vmware true false)
-		-Dlibkms=$(usex libkms true false)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.98.ebuild b/x11-libs/libdrm/libdrm-2.4.98.ebuild
deleted file mode 100644
index 29daf988738c..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.98.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson multilib-minimal
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		-Damdgpu=$(usex video_cards_amdgpu true false)
-		-Dexynos=$(usex video_cards_exynos true false)
-		-Dfreedreno=$(usex video_cards_freedreno true false)
-		-Dintel=$(usex video_cards_intel true false)
-		-Dnouveau=$(usex video_cards_nouveau true false)
-		-Domap=$(usex video_cards_omap true false)
-		-Dradeon=$(usex video_cards_radeon true false)
-		-Dtegra=$(usex video_cards_tegra true false)
-		-Dvc4=$(usex video_cards_vc4 true false)
-		-Detnaviv=$(usex video_cards_vivante true false)
-		-Dvmwgfx=$(usex video_cards_vmware true false)
-		-Dlibkms=$(usex libkms true false)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 6aab121f7224..ff4e677bd327 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,4 +1,6 @@
+DIST libvdpau-1.3.tar.bz2 139009 BLAKE2B d535c7723638339d4e67002721e9d0d8aae89a6001fccc41d9c3b21d52f0fae9237705bca448fbf1c244dd7eeb71f5fc74ed81f05c975bed798fce503a571c90 SHA512 c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330
 DIST libvdpau-libvdpau-1.2.tar.bz2 140017 BLAKE2B 0420961c48fcd5c92e7e98f84f629946f6234c28781bd7d8c9eb4aa2ab11b76e89e05f50cc423a2935b3376ff3b919ad9e6ef1710ff3549369567f298b5efa50 SHA512 f76c2283a1bd2e854aa6b86a564f7f08c1ff7da34e971c7c39f36e77fbd51fe0440d1ba01bff0b80be6c0326817ee4e6bff719dbe8dbf5e1ec7a94fad5016b7e
 EBUILD libvdpau-1.2.ebuild 1141 BLAKE2B 58d92ed94816b94efc377b9e8788853b6e0e3c6474998727e03ea5287814007f960f921f0b38b978ea7caae78cc915bb85fb42c07cfecd36cc43df01688f6b62 SHA512 ca5e09592d0de74fe1b430b562e486d0bdee721eb42e0fcf41cbe54b4fcb46f168a36f882097f0903e276257b6bbacecd98194322949910099536f70a5b472a6
+EBUILD libvdpau-1.3.ebuild 1184 BLAKE2B 9f423e68f5c409a5444a659d70bbaa8410770ac5908c2c906cfd79b8c6a913e609c4610b2bbee874691c067e349c96977793797b65d20b4830f320bc3db5fc9b SHA512 1d8c4175393e0b88bbc40965f8f7c456fc7b0d2876c022a192a17630b2704f4a7d8a2ef45ef5ef61f230bdf4088bfc3f97f5e66913a00ecf8adfe585b6eba9ab
 EBUILD libvdpau-99999.ebuild 1122 BLAKE2B b2e74c53c093e22e58257b67b91b59f51e98cc3715f68c67958a57e366df36bb660436e3bb7abdcb0fe11490f60d6a0c5bc8b2658c58d3979125385f6d7f7276 SHA512 8da6e8637191f4b8c198498e4f81fb4e7a0f5fa8108c16edf3ae89d52ee7ab360a2c2e505b3b5341076e7cfe18f1ad1093c251cad96f456ad81f134fdd940851
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/x11-libs/libvdpau/libvdpau-1.3.ebuild b/x11-libs/libvdpau/libvdpau-1.3.ebuild
new file mode 100644
index 000000000000..2dc4d12a5faa
--- /dev/null
+++ b/x11-libs/libvdpau/libvdpau-1.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic meson virtualx multilib-minimal
+
+DESCRIPTION="VDPAU wrapper and trace libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
+SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc dri"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+		virtual/latex-base
+		)
+	dri? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	sed -i -e "/^docdir/s|${PN}|${PF}|g" doc/meson.build || die
+	default
+}
+
+multilib_src_configure() {
+	append-cppflags -D_GNU_SOURCE
+	local emesonargs=(
+		-Ddri2=$(usex dri true false)
+		-Ddocumentation=$(usex doc true false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+multilib_src_test() {
+	virtx meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 85dc6d2bb1d7..599ee434f913 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -3,6 +3,6 @@ AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbe
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 EBUILD pango-1.42.4-r1.ebuild 2287 BLAKE2B ca72e458f6d20aa04760e5e683ec5bc4c92a5966ee87b6cea8661f46c35f4d463f1c390dfaad9836bbe6859bf91d49eabfd4fe8220c30647103f5bdf468090e4 SHA512 8497a2a3a992eb6405161691e985c561fac5b387a43ba7567ca2ba4227358f6a18ccc174e36557b5b296197f7138fd3f7bd5a231ee529f493918ef3b66294d88
-EBUILD pango-1.42.4-r2.ebuild 2335 BLAKE2B 91b269ef582a419a2f9b51430392af9176f026aa33a73be70518becd961e2061deb07d5ba06457ab0fd485a04db85ad827ddc12deb06a9e044848d8bd84c8eed SHA512 10a82a2386317fb19b2669114857d61d896acf6a18c04bd1534bd4a10958c068afa8832ec649716f515dfd1a241f8a9ac755ac6b373755bca59dd2ef734f4d44
+EBUILD pango-1.42.4-r2.ebuild 2330 BLAKE2B a8a28d031cccd35f3a8b7accb93351c1627740608df580d099a9df1f743100b9ffa887803392f055062eeace16fbd55b7c3573ccaf630aef8fd788a9e9b5dc17 SHA512 ea5892786884915465815b497928f144239212c172f7b38e12201bab3ca38072bb23e7a0c83c0caf8b65d584d3b5c0f30c637a3e98548f903edd3aff7eff2947
 EBUILD pango-1.42.4.ebuild 2047 BLAKE2B 1248ddc636fd6345ddf29062120a48e81e6047f609e0ee2f18d62ebb543163b7b0c37ad7457882b50c07af0a781c95e5e93a31bd033755f50ccab3c9e337a79f SHA512 4da1edd151fc0bc03c8712520ea21145b9bc84209372ca9d81023d0f59e66a0883820c0a5f188f575d709ffefb91b81c8eef04b0b4a5f13b3392d49a9da624c5
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild b/x11-libs/pango/pango-1.42.4-r2.ebuild
index f740511e7bca..f9f788295a87 100644
--- a/x11-libs/pango/pango-1.42.4-r2.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index ad380047d6f0..7a79592a356a 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,4 @@
 DIST pixman-0.38.4.tar.gz 897926 BLAKE2B 2c27069411e709391a1cc0af6c37acf2f06b4fad433a3197e24a0636d5d828ddbf1ca339d91470514d75e126452bc2300d14a2b862671bd11a8b85057d86b31c SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af
 EBUILD pixman-0.38.4.ebuild 1753 BLAKE2B e86ec9678222c2c6db62519aa6fc2838a88ce2e6ec9ea700a8fc8748b59a18cd4fd6c489cf866d43394352ddc470df0098e49d56e918abd9938e5b420dbcfe13 SHA512 e842f8d972f82f218d5426a819b00b3c44690ec2437fd5612a06d349b32cb3c87bbc7701cc36f697cedf808f44f18b9f8c26c2170cc8d90652dea98b6b3f1fee
-EBUILD pixman-9999.ebuild 1764 BLAKE2B fb330736a030bcba2c1f852e8fcf87832e4d3a0a43916d6dff1c662ba11c54e8c8c6894d29f28fd2ab73f06bc441b77ff4fe8214f290262e864fd683f4ac8374 SHA512 4980ac5eda703bc87585a31e5902f6c450e921c2bc3dd74d158472b6eb1b4a7852551ce82df90c0e3a3218da9134bd212dc85ca49b6ababa2d8a78f995e765cf
+EBUILD pixman-9999.ebuild 1725 BLAKE2B ba5cc714e618976708ce2edcfae88c380a984455a06bff9a1d8b278bc06ebdc7f30ed5b8a0a3435eb822db18c63795f7ce97f2447d54ee9b5b1010f9491295ab SHA512 7e2408dd9f703a7f042067d64bf76eb35f65ce3959b4190c8cbda34161fda53cddeed7df3fee96dc4c6cbd673cc88dc9a668b6482999b1ff582b22ef648d940d
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 17ea41af3389..97ba3b6a51a8 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -22,12 +22,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
+IUSE="altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 
 multilib_src_configure() {
 	local openmp=disabled
@@ -40,7 +35,7 @@ multilib_src_configure() {
 		$(meson_feature cpu_flags_x86_sse2 sse2)
 		$(meson_feature cpu_flags_x86_ssse3 ssse3)
 		$(meson_feature altivec vmx)
-		$(meson_feature neon neon)
+		$(meson_feature cpu_flags_arm_neon neon)
 		$(meson_feature loongson2f loongson-mmi)
 		-Dgtk=disabled
 		-Dlibpng=disabled
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 8f76c23b0cc7..3408d2c4cbb9 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -13,9 +13,9 @@ DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce
 EBUILD wxGTK-3.0.3-r300.ebuild 5056 BLAKE2B 187c4e043e912beee9a58c9796866493fe83b85e5c814b30029bf5e4d92a3c561d814cd41e635028d97b9e9d8b7dbdb9b19694023caed063976b9ec1b919d5fe SHA512 aa1ba5f27f7593e0a3f57010509169173ab6521f66890400d2f654f636cbc154723cc2fea403c02bdfca516ef7ec5cf83e71be74ef5cdc543b2676d01ec3d65e
 EBUILD wxGTK-3.0.3.ebuild 3982 BLAKE2B 5b49474a6ab03648d801c2cc1e1df298bb52b2cc61c2e957368f1d2bb06f910d20b533ab1cf80dcf9fdf124b9c37b56b9233b775e3fc07803173d440e3a28e29 SHA512 4c63f058ba1c7eded7978a9adac5637d3d4b40de6cdb92eb079eb697a3792581a32641f4d8e6062181d1c2e763e2528416691f5b4fe8d88d7bd41092eeda0509
 EBUILD wxGTK-3.0.4-r1.ebuild 3989 BLAKE2B 114505f94787230c4dd9cdf61211178fa0cf738ffccee3d73bda054d6611286084a7025fc1317508d93d263547cd90414a78ca619f328407fd30f1bc49c2826d SHA512 481a9bad6508a6bddae036838394560a82aea6be5591ec6b53e56e97aaba615b70486362bf142497e0980c8a25105a6730bae6dff6cd6175cfac0f636ed72581
-EBUILD wxGTK-3.0.4-r2.ebuild 4030 BLAKE2B ce44d342436d6c558e1b0b0b284a43d987277487d9a8845940a57731113fd93324b56e0e913f8eed148e07843c74fdbbf2881104724d129a53231ebcc71de7f0 SHA512 1b86f7c4d4a6600aded907efc346ebe59e56d73549f97baeeb515a2ef97bfc1f26fdea8932859e93a06f048e6d830e724a9cd73aa48f4e1267e2dd2fb46b7867
+EBUILD wxGTK-3.0.4-r2.ebuild 4029 BLAKE2B 1a694bfe23eff849225ba8609da19af4df65f106ab10a42ad2636d953e11d72e1e9d96b4997180ae413a85e3c994b517df51f8ef78741cb8607bfb503320507a SHA512 40c7efb74afc2f9427c60870f1dcf8d14874fb730856eca9e2af75b69fa872235053c9df85ebee21b64f4fcdcbaa7dac118d2ce54969f4df228054ea25012a88
 EBUILD wxGTK-3.0.4-r300.ebuild 5206 BLAKE2B 2dd0c671bc03e6a1d5e1725c04abfe182ddf9e580a20fc5c191d6ae108cada7df303514022feff00e40c76a051d34348c1f1d8ddcf7a7c1f69d1d8ae924a142d SHA512 a529c3de9c9bcd54770661ae1861a1331402153018969eb592b1e04e743a8faf0ad8c8157151da29cc84f55fb8854bcf12d3205c25953d7ac0950b0d0f6886ff
 EBUILD wxGTK-3.0.4-r301.ebuild 5206 BLAKE2B 3f3b13b90dfc95527d7c2a0aaa31728f5a299143cb43b7faa5077167e9191273e9f150ac1f2e5b8be90b9d11d2d9c5fb8603254c6a22794037e85fb8d0d58a9e SHA512 4283fc65d9284b98ccbffc689164bbdbe70d1b9160003b9c722a855ec58b73ea80f57efba8320b66ea6124a9197e8fa76c5aaf49bc294491c4abb1867507e34e
-EBUILD wxGTK-3.0.4-r302.ebuild 5257 BLAKE2B 45d6bde1955533aa8298bf8ce9690a5458a5860522c9e62ad3683ce1c616cbcf4a572afd6e84e64d106ae58a759365e1d788680df7fbe666894289eb3b2ae048 SHA512 84a4f811e2288e09fd09e466746c54ca654a6b5d428ca4ae24be3d19c6f87c6c1abcea4b2bcc1bcbbe9241caf3f0dd18d1f92ce17a2fce66df8581978f2c3309
+EBUILD wxGTK-3.0.4-r302.ebuild 5256 BLAKE2B bec5507d4187e8747cd09a4355114e85c2d7ed3cef57b7f6c68cba094449b331f82d87ae2d9eb1d8a2e5f8ded854d676bd10f33395ed6393b8ac7a1a3f39b0d1 SHA512 8f82e33fc023ca59eaad59687a1c5cfd08392a1d122709a78e27dd9d4d66d91b69e95218c7c79a416589bade18dbb090abb3d85829921a01f3480168416a2be9
 EBUILD wxGTK-3.0.4.ebuild 3978 BLAKE2B b11f966c518da65ab09703128eec655f13fb5713b2736c934dd82e941ec5031cd8ca1448f2895df5210a91f2a91dd40ca55129cd3016bb2bf4a83a3feb78f902 SHA512 39ad229bab491bec77d88336b7ff036aff0f5628e8648ed933d0573a9dae8ef1107ee2a0d06d73efb54012094834b22cfc7e1121f6d9866d80e7d3460e893aa5
 MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
index 5821004698f5..13c4e43a5f02 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
index b4479fe7201d..84bc2610f00c 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
 
 WXSUBVERSION=${PV}.0-gtk3			# 3.0.3.0-gtk3
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0de8df69ff81..4ae860184660 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/kronometer/Manifest b/x11-misc/kronometer/Manifest
index 371d168b8291..51bf75a65de3 100644
--- a/x11-misc/kronometer/Manifest
+++ b/x11-misc/kronometer/Manifest
@@ -1,5 +1,3 @@
-DIST kronometer-2.2.2.tar.xz 123980 BLAKE2B 2652c2a48de5571de22a95aa0b42f4b6620fb538033c0ec7d2c63c8ae8729b6feeecd8b7acc9c7542fe6eb2be0fb145a9dab53e5e9f97ff0511e2a12f5017dbb SHA512 2c808d7b3fafdc2cf507b0bb64be1b36be166a43543b18569e430d86f75cc64505de9dafd9a06e5b8b9e7fde0c0e624f598da7539026885b12585e3628067f93
 DIST kronometer-2.2.3.tar.xz 124208 BLAKE2B f9d91bf19ba64e2c337b8181e2529b409a450c1e821c6b1358a1d57627959c65b5c4db0acd15a4c8f4cd3fb12197ce6a1bf3b95d4dc4922409223b528f5f62aa SHA512 77f948ae3a03b15a0cd49bc1048897bff0788a4831beff8f336270d8af6ee1a245d2174f5a3adc224257e9f319958197af7900ce8389b312f8fe7cd6c53a71d1
-EBUILD kronometer-2.2.2.ebuild 722 BLAKE2B cd9fc9acb635b73be2d07eac01d27d63e6e1eea6e2bfdc2c5e3835eb8b6e5e419561d14d9b67e22b42cefa062dcdb94022be07741be5205174add487034bfc34 SHA512 87c7afbb47a6d16cdb60caa7a440a063b2c25102fe2d4894e32ec60b29321153a57fca00cd76f8effbf08eae8bfbae16097d0f534bc38c0d44da391cf408cc3f
-EBUILD kronometer-2.2.3.ebuild 781 BLAKE2B 246e430c726c59acbd0e030f9b405d5e8b8a8a6898bc5b92acc152e1c6d9abd22f114f776ea7320b94a64d6af89ee0ac10284cc6e3ddd922f4353518daaed8c1 SHA512 93342c3a41209a2ef5a5001e4a92f1889820e78e6a32564930bbc3727b97f1b6740958f83e8d5bbdc13044f7082a2ea64a4ad8c617fb09a581e181e79f4a9f29
+EBUILD kronometer-2.2.3.ebuild 780 BLAKE2B d36bcba9f9214a0b621587ef5849bb8c1479589ca6bb782814c3ef99a703938cb1cc46ddc3a67e3c8a647bdb78a3b0802867da2010ac526086a343e88fb1d2ae SHA512 2dbbcb04fe9d530cb9c5f05d47ee3943ec727c61f4c805d3f3341444c4d3e0d8a20a4124f18a3878e76f3b85f83fad38eff5215761d806423395fa5f775d34d4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-misc/kronometer/kronometer-2.2.2.ebuild b/x11-misc/kronometer/kronometer-2.2.2.ebuild
deleted file mode 100644
index dff9d003d23c..000000000000
--- a/x11-misc/kronometer/kronometer-2.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Stopwatch application"
-HOMEPAGE="https://userbase.kde.org/Kronometer"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/x11-misc/kronometer/kronometer-2.2.3.ebuild b/x11-misc/kronometer/kronometer-2.2.3.ebuild
index f7b40cd35ae5..906074ce0a76 100644
--- a/x11-misc/kronometer/kronometer-2.2.3.ebuild
+++ b/x11-misc/kronometer/kronometer-2.2.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/utilities/org.kde.kronometer https://user
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="
diff --git a/x11-misc/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
index 3876855ac51d..2f538870322b 100644
--- a/x11-misc/sxhkd/Manifest
+++ b/x11-misc/sxhkd/Manifest
@@ -1,5 +1,7 @@
 DIST sxhkd-0.5.9.tar.gz 34649 BLAKE2B e07d9a7a99cd3ab1436ece589a57023de87c6a1e74ef509e9bfc9db3bcda9680f826dc2edad1474004775cf307b9280dc60e18060a803deb801022c004bf0e8c SHA512 32ee7261b4fa10d5a62a7fa61e689977d12afd654e81123711bda1f006e4b6baa7524352086037594e6ef1989dd8fcb6eddc1114085ee91546a69f6d1146924e
 DIST sxhkd-0.6.0.tar.gz 34756 BLAKE2B e0bf9cc50893baa345ea0dcfae096b5f76408bf1c5e8b5405a2175f33c6201c14c3683da2202cc2a9eaa07327df484f921863178b464164cdf931ca3a0c21848 SHA512 0ccafa2b29b87dcf6bdcb45b67b8aeb5f70c2855fe99c0cd2b271052cd7b6bbf5186b3ae2da3ae9b411f0766a8ab85a35b3a325442a80527a7c959280d36b46b
+DIST sxhkd-0.6.1.tar.gz 34808 BLAKE2B b25ff934d0a7f28b3950152ef800da90c5f990f2efd92e9178fef8a77939dc1ed1bbde55bb5a990c33fd3d0be7490dfb2e799ca56abf3c3c6f20c258169eb100 SHA512 d8cd6166ff7e7bc800ed79c5d63cbdfad4f9824c5a5e19b6a315b2ec570295150600651376265932f5fde8b6127f629a553337c6454a1c78c62b3395aaeb55a2
 EBUILD sxhkd-0.5.9.ebuild 621 BLAKE2B 05eeeed1ed437e4cec5a2ec97a33661ce59bd0a593d2903076d8e7622b3436bdf677d7c03be69af69274e97affa9f3de8d6cfbc7cd4d92633fc4e95fb636df0c SHA512 102ae432d7907d96bf658ec6f7585f6fa2f130751265bad4969193420160ab458ca26c3bf0180ecffa99d6dc8087737cd1c535d8d6dae4d4ccefd2e033a37325
 EBUILD sxhkd-0.6.0.ebuild 618 BLAKE2B 5251bee57da1c1b07e00c7b2936cb72dfab1566ae1515c71014e0626c567ce1ce4d4bcfd1c685b000e73a44722cb77d1ff968467d1c88c7abbe016b8ebbe6bfd SHA512 fbf6e5f5e8f72e7653e314670576ff1b650af3d8a604b959a5175c1ffcb723d0ae9019860db05459d74dee48c6129757b3e596a0ce566b01addaffb503ad1d2f
+EBUILD sxhkd-0.6.1.ebuild 618 BLAKE2B 5251bee57da1c1b07e00c7b2936cb72dfab1566ae1515c71014e0626c567ce1ce4d4bcfd1c685b000e73a44722cb77d1ff968467d1c88c7abbe016b8ebbe6bfd SHA512 fbf6e5f5e8f72e7653e314670576ff1b650af3d8a604b959a5175c1ffcb723d0ae9019860db05459d74dee48c6129757b3e596a0ce566b01addaffb503ad1d2f
 MISC metadata.xml 328 BLAKE2B 503f3c67609b0e822426a2d2512ac98a3d4eb384780d92e7a951ed3e04a8e5f21319315c9d23bcb1705baa617cef3a77380d3fcbb9ef136eab95c12a8999a387 SHA512 406fcd58fede7d97f38c9eaa79143aedb9b5a8a8d83670b71df62a1e7bc65f4a5e7070bd077feb31410a8b2a4bf3fc21433e25f0e51bf80bd8ec8cf57920feab
diff --git a/x11-misc/sxhkd/sxhkd-0.6.1.ebuild b/x11-misc/sxhkd/sxhkd-0.6.1.ebuild
new file mode 100644
index 000000000000..72d597e89864
--- /dev/null
+++ b/x11-misc/sxhkd/sxhkd-0.6.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs systemd
+
+DESCRIPTION="Simple X hotkey daemon"
+HOMEPAGE="https://github.com/baskerville/sxhkd/"
+SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libxcb
+	x11-libs/xcb-util-keysyms"
+DEPEND="${RDEPEND}
+	x11-libs/xcb-util"
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+	systemd_dounit contrib/systemd/${PN}.service
+}
diff --git a/x11-misc/vym/Manifest b/x11-misc/vym/Manifest
index 641e88dbffb9..abe8fd341f70 100644
--- a/x11-misc/vym/Manifest
+++ b/x11-misc/vym/Manifest
@@ -1,8 +1,4 @@
-DIST vym-2.6.11.tar.bz2 6769869 BLAKE2B a528bb84275800f2aefc8a67b03d7b5dcdfab7e8f0f64f42bba46cda8c9dfad6e16aaeecf778b8bbbd99aac5d28bcbe2ff1c3546806395bbaf40f659e42cd31f SHA512 d6ae8346152ab10e12a68f25b4c13c4d40e1a8471df348ba0df9c05bdbe60f86a97912fcca268ec510246fe655a7dcc2d2e9a9332daee09a2a7dda7d6f880aa1
-DIST vym-2.7.0.tar.bz2 6776315 BLAKE2B 1b25f1fc6b08f9582c2df716db9f9361d89cbe1d96862595eda59708bebc08db1d28755516e4096b63427cd069c59c3542d58c6572ac723a97081033b5e97eaf SHA512 4da1ce7f62e29dca798646a114544b5b4b2d42b0b030113eb231c5cb0d8c990c78fcfb78bd47ce1f3efb43647fa8033d1d8eb87907f6c7f486b4dea552e345e8
 DIST vym-2.7.1.tar.bz2 6718924 BLAKE2B d7be8f2d40cedabb1bfaa3b89aac64de5e579f56ebfd757c22d4393ee712c4c4f5bf4747037683e4c6640ab0556ce4ef34bac5b27ecb747a15e58443d57f229f SHA512 985dbf18f743c36b484050ae24e4392eeae701c6c72fca6bd3dc5b70b38a283211946e279804c66253b5a394a642683ca4e3a66a7288400a9193fbcbfd8c9582
-EBUILD vym-2.6.11.ebuild 1409 BLAKE2B 0603472bb4ae494911dd38511e59e41104abd92b99efaffddff178e5a5b6d7ab5d1d0f31f5d2ade4535221227b2807e411b05e630b8983b8d3284a2ccece6af2 SHA512 de7db950fdde7195193a1be7808caa1d3dd0ca33d66e66c3a388af5096d0527472db5b745c8069b42969f53a3677c451f3eba0579d1306221539b276633967b7
-EBUILD vym-2.7.0.ebuild 1404 BLAKE2B 7a59a7574a500296fdc3ced293d086aa673c0d6640f23242d6fade6d3bbc24ceb0a57b29617dd5a3260af9023c6b695e90932b70d278bffa05c88c584a473944 SHA512 7949993038fd707ce724e5a63e4f4405f20e4ef5b6fa8a4906da67a1ee163ecfaaee1ccdf654e2820739c367ca251b45dd6d4a5fa3828f2beb241198882ce54d
-EBUILD vym-2.7.1.ebuild 1411 BLAKE2B c21f2b833eb6eae27cbb154246189d14f32c4aac7a8996d01e5c0039c76d44b53701c40111e676b1f467644fcd00f27dd394b0ae49aa1a1efaf663d21de78dae SHA512 d8bd941230f65f6cba40baec9c1b68dffe58367a5f060657ffcd6e3fa3ec2dd723db9ba7f1cda8ba25192f9fc1e15e71022e6cee6ba0b323ad86a4b01e46fa5f
+EBUILD vym-2.7.1.ebuild 1430 BLAKE2B d1a9b288dcd069e383da292d4b14ca824e55e71211f379672ee48924818e96fcf668971458b7846e73d231b463443929ecadfb075bfb6e06a0c797652aca25d4 SHA512 cb114cd235eb1670fb35e229cc6b68adc1c6448c48b8414eff33cca06b768d359cd6fd15c52923bc31cdd67f7ab0fafd544645b3f6ffe94221399e6d392b40c1
 EBUILD vym-9999.ebuild 1389 BLAKE2B acc59d6a479129646d31b4e9693ca90a2317ddef792c5a76af2399090e30a69fcb6c09788b3d53b2b6b599192996ca8738433aba0488df32edf6ef7507660181 SHA512 421995c8d0379b65330a6d1e52c57322632bf883e8d628b9ddc60767385e158619f187ba9860a2bb405e297b7cbf67f8330bbfd2dc4f9a88a3494e67f44e6c60
 MISC metadata.xml 349 BLAKE2B 2cddfba3480871cb020e1ea5ac3c8af1f0c5be07b9e41880fbf5a36301cd283e941e8c7d8ac47dc27613364e2a003784811c721d31ce2c768d83ea7d86dd2982 SHA512 968e3560ba95072811086fd007ec5397467a9e520ec3bb368c7c3617b94d222fbb3c3929b5b9694e1bebc6af9e736dd17a43321e38e1999c562192687561cca9
diff --git a/x11-misc/vym/vym-2.6.11.ebuild b/x11-misc/vym/vym-2.6.11.ebuild
deleted file mode 100644
index 5a6721089991..000000000000
--- a/x11-misc/vym/vym-2.6.11.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs_CZ de_DE el es fr ia it ja pt_BR ru sv zh_CN zh_TW"
-
-inherit eutils l10n qmake-utils
-
-DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( README.md doc/vym.pdf )
-
-src_prepare() {
-	default
-
-	if has es ${LINGUAS-es} ; then
-		DOCS+=( doc/vym_es.pdf )
-	fi
-	if has fr ${LINGUAS-fr} ; then
-		DOCS+=( doc/vym_fr.pdf )
-	fi
-
-	remove_locale() {
-		sed -i \
-			-e "/TRANSLATIONS += lang\/vym.${1}.ts/d" \
-			vym.pro || die
-	}
-
-	gunzip doc/vym.1.gz || die
-
-	#remove dead en translation
-	rm lang/vym.en.ts || die
-	remove_locale en
-
-	l10n_find_plocales_changes lang ${PN}. .ts
-	l10n_for_each_disabled_locale_do remove_locale
-
-	"$(qt5_get_bindir)"/lrelease vym.pro || die
-}
-
-src_configure() {
-	eqmake5 vym.pro \
-		PREFIX="${EPREFIX}"/usr \
-		DATADIR="${EPREFIX}"/usr/share \
-		$(usex dbus "" NO_DBUS=1 )
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	einstalldocs
-
-	doman doc/vym.1
-
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
-}
diff --git a/x11-misc/vym/vym-2.7.0.ebuild b/x11-misc/vym/vym-2.7.0.ebuild
deleted file mode 100644
index 8420300310dc..000000000000
--- a/x11-misc/vym/vym-2.7.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PLOCALES="cs_CZ de_DE el es fr ia it ja pt_BR ru sv zh_CN zh_TW"
-inherit desktop l10n qmake-utils
-
-DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-DOCS=( README.md doc/vym.pdf )
-
-src_prepare() {
-	default
-
-	if has es ${LINGUAS-es} ; then
-		DOCS+=( doc/vym_es.pdf )
-	fi
-	if has fr ${LINGUAS-fr} ; then
-		DOCS+=( doc/vym_fr.pdf )
-	fi
-
-	remove_locale() {
-		sed -i \
-			-e "/TRANSLATIONS += lang\/vym.${1}.ts/d" \
-			vym.pro || die
-	}
-
-	gunzip doc/vym.1.gz || die
-
-	#remove dead en translation
-	rm lang/vym.en.ts || die
-	remove_locale en
-
-	l10n_find_plocales_changes lang ${PN}. .ts
-	l10n_for_each_disabled_locale_do remove_locale
-
-	"$(qt5_get_bindir)"/lrelease vym.pro || die
-}
-
-src_configure() {
-	eqmake5 vym.pro \
-		PREFIX="${EPREFIX}"/usr \
-		DATADIR="${EPREFIX}"/usr/share \
-		$(usex dbus "" NO_DBUS=1 )
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	einstalldocs
-
-	doman doc/vym.1
-
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
-}
diff --git a/x11-misc/vym/vym-2.7.1.ebuild b/x11-misc/vym/vym-2.7.1.ebuild
index 7dd60221c778..55b9262e9329 100644
--- a/x11-misc/vym/vym-2.7.1.ebuild
+++ b/x11-misc/vym/vym-2.7.1.ebuild
@@ -18,6 +18,7 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
 	dev-qt/qtsvg:5
 	dev-qt/qtxml:5
 	dbus? ( dev-qt/qtdbus:5 )
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 8af14285b015..a3b0fb287531 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -9,11 +9,9 @@ AUX xscreensaver-5.35-offensive.patch 1678 BLAKE2B 6479ad1d5f081d3ae0ab7e9f08edf
 AUX xscreensaver-5.41-comments.patch 462 BLAKE2B 6df2d5573bd3a1c44582116f3653c7c0f2ea3738e94695dd3a680a5e0333c490c9a308554ae370e6565d766768e87a49a28d0c7cefbf7e69c8e32a4a1f4dba82 SHA512 672ee1c9d455883215bbf09bc5ebb7c38efa132419a27352d0b6b570e94f193e374524e6a4e5a75f8bb178cccd1d72442b7adf5866a0c2dc389704f123f8f931
 AUX xscreensaver-5.43-gentoo.patch 1340 BLAKE2B 177631b961b97d339149fd969d68ebbab5bd6444aea4f1379c199efbcbe5924106890578a5210bae5c55249ea1883af437e7edebb32fbccd35022acc3d7c29de SHA512 53ec2d02e20139389f832750ecee92e634ec8ecea5bfd5ef27a58ab0e6f3cbde299263bd92006581a4076f4b0721c036c1ac28cac50b1a2bf47c24df08347d04
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
-DIST xscreensaver-5.40.tar.gz 12248135 BLAKE2B 78ca8effdfae1360d4fbf79c269884b6f7e1648e3be841f99d63cfc6e43f2c813f01cc5e87ec3b502c286e7d1d5562b3f00fe831e1e2f55dd47c4dd98cf84866 SHA512 e3b5fe03ee56596fd5b0bf4e805ec341906db9665d553a110b4e874e37406fbb596f7bd29da57871c59e8d90bcc97eba9ba92afd79c48139ac021eb9cf6af68d
 DIST xscreensaver-5.42.tar.gz 26903469 BLAKE2B a82716a3f1f19f85eb1bc7a8ba1981221ac2ad47c1411687f1043da7e50edada73ab9c7465d655546f8a9015db69ab4f35ef8ff2a0b3d79f5a59d3e02aa2f819 SHA512 84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd
-DIST xscreensaver-5.43.tar.gz 26968319 BLAKE2B 799f37f7851dc717e1bf09d63c83a07aca3c51be138d854c0d904c1d6878ef015e1750c55f7b083b6aa020c6be86e9e5a08c1aa8f47f5d063407d8a151c30d6d SHA512 e745711c5760434652aa6bee99c1060717f15cad5946fba2fa3aadbcb300bec6620935c27d095b6e8a68c06e5bbe6fc1879474674b6d07f04b2af82d05cc383a
+DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
 EBUILD xscreensaver-5.38.ebuild 3397 BLAKE2B 9848d30fdb05f6ddc95d11272832f4b79e7b775e4aa08119a7892e373db9e5698fd3034749a64faa3a99b1bc964481270926df750ce151a824508bc58d410853 SHA512 950d1b8b3646c14bee671f75aaf5ed25cb6b2443922f131eb1c6d024efb4e5a2c856b4fd9d59a1d5727f738a6ccf340b99e304f2af4a5986a859100d5e835077
-EBUILD xscreensaver-5.40.ebuild 3351 BLAKE2B 8c649d16315f36741e47c58dfc42de728c3010dfefcc33a9572252f87a90359d66af3feb938215078ca88a6ffe9b0af7cf13d4bdeb099635af8b75aec1a41ac7 SHA512 7b61319958afb344ac5569d78e0db09f8287e9bf1ecbeccb2bdefa261fcd972fb31deadff0c8faec440fd000151dabb55a3ea6178bd2f7edd6c03b477c8079b7
 EBUILD xscreensaver-5.42.ebuild 3388 BLAKE2B d31c7b81e9bb04c7bd4f7d247bd59ecbdbb2e8e96564a7a156feab6a80c90bcc0b625d4a642b2a4235ddbce98fecff813e16c2b1f3cf1fd78246cfcb6987f4d2 SHA512 98b1a0900da9f16d7dd0120cfa426739f4236e11c46b33446e254fb5aa94a3221e164b25fbb7718e2f9404e042878fabb37b13625893500237e79ebad645dc2f
-EBUILD xscreensaver-5.43.ebuild 3350 BLAKE2B 345415f9154b41d4ce525e2e34062a09cc08b6ff2a250b172c3a34c8091b696dedcc8aecb29f578c4949ca155c5df03f9fb84adfc15e10daf41cf6908f7a051a SHA512 7bd7ccd067cfdedce8f7673a90f1279277f1be14c4005540ee6d6a585770aac4e8342ed045393b3e0a43b2542666356055569c31bffdc4ca5a8fe2fc68f4e137
+EBUILD xscreensaver-5.43-r1.ebuild 3363 BLAKE2B b555c2faac9d448c53f5b401e0e6c0005b101b9f5a1dedfa539489dc3ba9a1568c5b88b837cd30515ba3bdc4975f1347cacf861ffc5233fca9d07eb1b15000e5 SHA512 f09005d3c2e59fa4d95539b4c1789a756e155ca15610b7ec9a7bf69d2de092671266431440e80b37834527ad24311c63052214583d8b6d014b3f26c1ca8580a3
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.40.ebuild b/x11-misc/xscreensaver/xscreensaver-5.40.ebuild
deleted file mode 100644
index ba1e3200fe98..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.40.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="
-	${HOMEPAGE}${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( virtual/pam )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.in} || die
-	fi
-
-	eapply \
-		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
-		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.31-pragma.patch \
-		"${FILESDIR}"/${PN}-5.35-gentoo.patch
-
-	use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
-
-	eapply_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
new file mode 100644
index 000000000000..b28860a3b225
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop flag-o-matic multilib pam
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="
+	${HOMEPAGE}${P}.tar.gz -> ${PF}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
+
+COMMON_DEPEND="
+	>=gnome-base/libglade-2
+	dev-libs/libxml2
+	media-libs/netpbm
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/gdk-pixbuf:2[X]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( virtual/pam )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.05-interix.patch
+	"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
+	"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch
+	"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-5.43-gentoo.patch
+)
+
+src_prepare() {
+	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.in} || die
+	fi
+
+	default
+
+	use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
+
+	eapply_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+	export RPM_PACKAGE_VERSION=no #368025
+
+	econf \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with xinerama xinerama-ext) \
+		--enable-locking \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-gtk \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-pixbuf \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	dodoc README{,.hacking}
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43.ebuild
deleted file mode 100644
index 57235e1532a9..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.43.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="
-	${HOMEPAGE}${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( virtual/pam )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.05-interix.patch
-	"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
-	"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch
-	"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
-	"${FILESDIR}"/${PN}-5.31-pragma.patch
-	"${FILESDIR}"/${PN}-5.43-gentoo.patch
-)
-
-src_prepare() {
-	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.in} || die
-	fi
-
-	default
-
-	use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
-
-	eapply_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index b8818f7576b6..3b7b4c8733d2 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -1,8 +1,9 @@
 AUX xvkbd-3.6-last_altgr_mask.patch 202 BLAKE2B d980f06b4975bf5dadd6e6e656fd3471fbfc651cfee7f4c118010b1c38d41f7597f7bd6d7e07e6c261f7fed0b07efefdfd4f09fcee38029f0047ed5fc2a1317f SHA512 d3d58b1ba3a7dc71a0240ba3240fd06cc1719ac35ab8f1b119f7d79823fddcdbe1605a457722ec75d4b74804f0a68ec221c5ec3d6c15bd2c4130ce96c01f771e
+AUX xvkbd-4.0-destdir.patch 1026 BLAKE2B 473a1499bff1f00846ae81de75973bc77f63f456d071ebd70fc1d112d254345bda108d34d6934075268e1f5c6e02bcc0107bbd1565380ad01dc1c08ce9b243ef SHA512 8c675dd76eb2f126c48cc669dbb5bf87e337816ef4ac5d6c4730f4259862353e4de1dfc255fda36e35f9a93b507add5922595f53e7c91257996e4c5ee6c8043b
 DIST xvkbd-3.7.tar.gz 81645 BLAKE2B 9133b3b8e176034f2c39deb3ad9b334f553c834ba3285aaed59ab2a6f531c0184879c7bfe8c702313c9b0d4089883603c2f8430160f3c2af243705e5328b4ed0 SHA512 19ac5e78c34889d80571bb9feea65582fa413cdce0ba2f949840a08e70c900d720ca789d90d1118aa9667d32183b0f1edb33b7b0029ef5abb1d6faf058134385
-DIST xvkbd-3.8.tar.gz 88508 BLAKE2B bdaa3b31322ef2393298cb6987e4980536f3a6707df4016acc698a6713f25bff3e92cdecfcbf0c513af5cb8290e9b434fc61108095138c15cbbba9765ba856a1 SHA512 8a1ff96d90d1021bfd60ac6c251e62d68a65e86a1f1ee1fbdbf67344bdd07d7e1929a646e7e80f1da5f3e12e50c655e2be180c9ae4129fa7912f32aa5f40f5f5
 DIST xvkbd-3.9.tar.gz 88440 BLAKE2B d024e97c3e134fd4270db07b1eb54c45380b74bdbffb3fbcf7778e839b51ad8a74a7a236e440215eaea38062ae321db866c5344ecb7eaf2ed9ce15d663cbde9a SHA512 f85d94f9b8012023eb4e901c1962ea39a491df2af67b617efb0817023eb93c460446ab9414fb20dcaee02e270cb9cb7b058a83ae96ffae73291b799f15a04b98
+DIST xvkbd-4.0.tar.gz 408256 BLAKE2B 12f18dc6af9636021a9a067528b9ee2387c43aec0d7a23e01e7e4979273ccfa1eae7752cd2814465da906eeada44a31ff70a3f00f030e87ff66db35e3f3c7f5a SHA512 17fe50b86974f21f1456c522cec107f42a8915fa4ffa60849e03d56a3eb8b600aba46becfde458799e30b073d435c60ee8b3b61d79f4c0d86575770cb4bfd951
 EBUILD xvkbd-3.7.ebuild 1039 BLAKE2B 0e1530b3eb6453dea3da454de2012414831c5108bccc208f69ee6514ff27e66f9d6c8b2a0d0c1cb4e2ad30ddba08921b1e1107643241701bfa1a24623e7e35fa SHA512 a33d41cf74553169337716e060398061397e4d399696234a214a1887efa3326761fe36b0c351d25dfa8e42d1bff6885ff287df91ac587964b5c6d84adea38e15
-EBUILD xvkbd-3.8.ebuild 1007 BLAKE2B 4b2ed2fd51d0c4f569bb3712870e8b1cec359e1da441b5f54a114533bc1dcb489c3bffcbf7697021222512d964224868ae59a9cab3c9d13493f6abd074649782 SHA512 486c7453c758d5374be0c8bfc5e59faf7a8a335de67ed1eee07fabf74c1357d6d569de7d681f37ea8ee0393f24910a8ed41ce2d7bf28272df9178ef5d9f62486
 EBUILD xvkbd-3.9.ebuild 1007 BLAKE2B 4b2ed2fd51d0c4f569bb3712870e8b1cec359e1da441b5f54a114533bc1dcb489c3bffcbf7697021222512d964224868ae59a9cab3c9d13493f6abd074649782 SHA512 486c7453c758d5374be0c8bfc5e59faf7a8a335de67ed1eee07fabf74c1357d6d569de7d681f37ea8ee0393f24910a8ed41ce2d7bf28272df9178ef5d9f62486
+EBUILD xvkbd-4.0.ebuild 706 BLAKE2B 1ce003b13e95fb0f3152e148e774ece79b7a76eb1a1c74e5f02f961ed48188249fc00449f4f407fbc5af610591b8a67fafa03b8b276720d285f68c832591e57f SHA512 dd41fb0962c6538163cbc34493806148a4c741947c86a5e01977f011399559c3ebecf1f4b01be175c673cb4d93eb3a824dde68e8f7a04980f93b25dfc1dde88b
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch b/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch
new file mode 100644
index 000000000000..83879dd9fd02
--- /dev/null
+++ b/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch
@@ -0,0 +1,25 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,4 @@
+-appdefaultdir=$(shell pkg-config --variable=appdefaultdir xt)
+-datarootdir=$(shell pkg-config --variable=datarootdir xt)
++appdefaultdir = $(shell $(PKG_CONFIG) --variable=appdefaultdir xt)
+ 
+ SUBDIRS = .
+ bin_PROGRAMS = xvkbd
+@@ -17,11 +16,12 @@
+ 	[ which ad2c > /dev/null ] || ad2c XVkbd-common.ad > XVkbd-common.h
+ 
+ install-data-hook:
++	[ -d $(DESTDIR)/$(appdefaultdir)/xvkbd/ ] || mkdir $(DESTDIR)/$(appdefaultdir)/xvkbd/
+ 	for file in *.ad; do \
+-		$(INSTALL_DATA) $$file $(appdefaultdir)/$${file%.ad}; \
++		$(INSTALL_DATA) $$file $(DESTDIR)/$(appdefaultdir)/$${file%.ad}; \
+ 	done
+-	[ -d $(datarootdir)/xvkbd/ ] || mkdir $(datarootdir)/xvkbd/
+-	$(INSTALL_DATA) words.english $(datarootdir)/xvkbd/words.english
++	[ -d $(DESTDIR)/$(datarootdir)/xvkbd/ ] || mkdir $(DESTDIR)/$(datarootdir)/xvkbd/
++	$(INSTALL_DATA) words.english $(DESTDIR)/$(datarootdir)/xvkbd/words.english
+ 
+ EXTRA_DIST = XVkbd-common.h *.ad *.xbm xvkbd.man README ChangeLog Imakefile words.english
+ 
diff --git a/x11-misc/xvkbd/xvkbd-3.8.ebuild b/x11-misc/xvkbd/xvkbd-3.8.ebuild
deleted file mode 100644
index 3033ea4d6dd8..000000000000
--- a/x11-misc/xvkbd/xvkbd-3.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib toolchain-funcs
-
-DESCRIPTION="virtual keyboard for X window system"
-HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXaw3d
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXtst
-"
-DEPEND="
-	${RDEPEND}
-	app-text/rman
-	x11-base/xorg-proto
-	x11-misc/gccmakedep
-	x11-misc/imake
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch
-)
-
-src_configure() {
-	xmkmf -a || die
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) LD=$(tc-getCC) \
-		XAPPLOADDIR="/usr/share/X11/app-defaults" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		CDEBUGFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake \
-		XAPPLOADDIR="/usr/share/X11/app-defaults" \
-		DESTDIR="${D}" \
-		install
-
-	rm -r "${D}"/usr/$(get_libdir) "${D}"/etc || die
-
-	dodoc README
-	newman ${PN}.man ${PN}.1
-}
diff --git a/x11-misc/xvkbd/xvkbd-4.0.ebuild b/x11-misc/xvkbd/xvkbd-4.0.ebuild
new file mode 100644
index 000000000000..52f200bc9b23
--- /dev/null
+++ b/x11-misc/xvkbd/xvkbd-4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="virtual keyboard for X window system"
+HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXaw3d
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-destdir.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	dodir /usr/share/X11/app-defaults
+
+	default
+
+	dodoc ChangeLog README
+	newman ${PN}.man ${PN}.1
+}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 1c8205f8e4fd..2a8863e48207 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,10 +1,8 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
 DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5acf9023dfd87819b4c8834bba09f2211c901512d9fe186eee7939e44a5f098c09ef65f1d28cc55eb97e9b7 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb
-DIST zim-0.69.tar.gz 2044631 BLAKE2B 447fa4fb2d11b1399668ec6b627e23150577b574afb1e5c33738cb690779f49adb2d60e0b01eb82d2cf0dfd4a430099c1ae4b52186b60a2564c501b93aa01822 SHA512 452b2119d63927765c3807dbbdfadea94be31ee7fd3eb9b8cf79e8699c57478ec9cd392299a6e1dc3690dbe520925cddf5fca4596db809a2cc296bb6669d12af
-DIST zim-0.71.0.tar.gz 2882942 BLAKE2B f1701baf547d43d7a9687e6a1d72313649064f1d3927e14bffd5c8e348fa7a311e307f9b1704c19058bfad07d6715c79399acfdc5701efa9291db3e68065175a SHA512 7c82e19d547795f57c563383aca04a51da02463df71cfe18c4cab0307f46fb425ff0f348b43ae0ab26cb29037bc9d99aed63dbf721a542d071f9674f17f0a64a
 DIST zim-0.71.1.tar.gz 2883082 BLAKE2B 66d1c571a67e12d8d38cbc6d8bd32918f98f47bff0aa34971986896b3aeec91170cd1f2a87a411a8fccda502addd3de8176cc70ebfbafedc87c462a751e87036 SHA512 0da59955f730cc0bbee033a292c7e531b1a302c950773aed68bd8a18bf1485826086522c4144f24f500e9240ebcb9b592b33dda390923ca0eba6ab57273c0896
+DIST zim-0.72.0.tar.gz 2590406 BLAKE2B 0d77052e9eaa62b855be30eee64863197498ee54949f8610528ccd86cf32e7c9c55fb2faca719a4d92e0568941dc6b100299e76a33f8c49bddc5e367ec98d923 SHA512 60f59c2cf2ebb920515ecbc77e7fb1ddb9b0a6f6179503176b582b6b87ada759707ec4ccee929896a8a7d489f25ff13f7a6ff61fa637ecdb3d02640182cda0b9
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
-EBUILD zim-0.69.ebuild 1849 BLAKE2B 7bad44da4be87ee0b8c9a9dde44264035bf7ef330f22db53a0086badfae364285f1d51592671e36f05af67a3e025c8f58fe394bdbb370de94469042f0254bdf1 SHA512 5346b7821aa43fd866af288a9cb8ff9374cb463a68123ae931d1f4145bd8e8bd3ea23ae8faa40c95a5dc9f0ac085fd21d108aad8aaaf5c396a830e96e4628250
-EBUILD zim-0.71.0.ebuild 1897 BLAKE2B e13582f180fa5ff958f31b70be3be0fb672b27fecba7e096c301cd2c8c53865f3c5e6d22e983816116429f973486d9de89b22db64d24a4a27470782fa1c580af SHA512 a37fbb05b2277d32a6adff6f0e1d96e8dbb9bbca3aafc75ebb1e0907377b68a1fb703df0838291b6cac7a90096ec5f2fa25e1491ccae56acca257b8c19275cc1
 EBUILD zim-0.71.1.ebuild 1914 BLAKE2B 200ce1f95158a46e7a1f3ccba21045b5af15b549af734dab620c42bf91c60e1c2b251bc15eacc3be962eeb110961d0dc0fa6f75e6ed91956e10176360be6810a SHA512 7fa5f84d0c42b02f9d1df0cee355b5f5e4938bd96a3e96db3b0336c8ca1bc4de3816845c39fdbdf0559ba057cb73eaa39e3c23c6236221792db29a12d8fb7a94
+EBUILD zim-0.72.0.ebuild 1895 BLAKE2B 066acc255bb356c9841b4e7eae17b3baa632b4b9c7ad9dba8ec926ba1590484a87f0525ab8e73dadbb9bdf92c624da37e84ef117bbca2e03ed9449695799826e SHA512 8d05dbf1c1db89f4dbbc0de727b8be11a6c908bd08b11f9b4601af9feb78a6e80422bc8dd3a11869abdd73295ce48d4bc3bf9eb86238b48a55288ef786a8f5ae
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.69.ebuild b/x11-misc/zim/zim-0.69.ebuild
deleted file mode 100644
index ba87523f013c..000000000000
--- a/x11-misc/zim/zim-0.69.ebuild
+++ /dev/null
@@ -1,81 +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="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-inherit xdg-utils distutils-r1 gnome2-utils virtualx
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	x11-misc/xdg-utils
-	test? (
-		dev-vcs/bzr
-		dev-vcs/git
-		dev-vcs/mercurial
-	)
-"
-DOCS=( CHANGELOG.txt README.txt HACKING )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-
-python_prepare_all() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
-}
-
-python_install() {
-	distutils-r1_python_install --skip-xdg-cmd
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-	if ! has_version ${CATEGORY}/${PN}; then
-		einfo "Please install these packages for additional functionality"
-		einfo "    dev-lang/R"
-		einfo "    dev-python/gtkspell-python"
-		einfo "    dev-vcs/bzr"
-		einfo "    media-gfx/graphviz"
-		einfo "    media-gfx/imagemagick"
-		einfo "    media-gfx/scrot"
-		einfo "    media-sound/lilypond"
-		einfo "    sci-visualization/gnuplot"
-		einfo "    virtual/latex-base app-text/dvipng"
-	fi
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/zim/zim-0.71.0.ebuild b/x11-misc/zim/zim-0.71.0.ebuild
deleted file mode 100644
index e9579e77339b..000000000000
--- a/x11-misc/zim/zim-0.71.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-inherit xdg-utils distutils-r1 gnome2-utils virtualx
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="
-	http://zim-wiki.org/
-	https://github.com/zim-desktop-wiki/
-"
-SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	x11-misc/xdg-utils
-"
-DEPEND="
-	${RDEPEND}
-"
-DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
-
-python_prepare_all() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Please install these packages for additional functionality"
-		elog "    dev-lang/R"
-		elog "    dev-python/gtkspell-python"
-		elog "    dev-vcs/bzr"
-		elog "    media-gfx/graphviz"
-		elog "    media-gfx/imagemagick"
-		elog "    media-gfx/scrot"
-		elog "    media-sound/lilypond"
-		elog "    sci-visualization/gnuplot"
-		elog "    virtual/latex-base app-text/dvipng"
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/zim/zim-0.72.0.ebuild b/x11-misc/zim/zim-0.72.0.ebuild
new file mode 100644
index 000000000000..1dbe5acb22de
--- /dev/null
+++ b/x11-misc/zim/zim-0.72.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+inherit xdg-utils distutils-r1 virtualx
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+	https://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/zim-desktop-wiki
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	x11-misc/xdg-utils
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Please install these packages for additional functionality"
+		elog "    dev-lang/R"
+		elog "    dev-python/gtkspell-python"
+		elog "    dev-vcs/bzr"
+		elog "    media-gfx/graphviz"
+		elog "    media-gfx/imagemagick"
+		elog "    media-gfx/scrot"
+		elog "    media-sound/lilypond"
+		elog "    sci-visualization/gnuplot"
+		elog "    virtual/latex-base app-text/dvipng"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 06a3ef363034..d6e083c64e9c 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 181f400e6446..3084109b8bfa 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,9 +1,10 @@
+AUX enigmail-2.0.12-enable_seamonkey_support.patch 646 BLAKE2B a7c16bcc7f220997fec4309aaccc6e5ee62ec4ed1c82698a1aa7fbeb6badd0e972b8adcceaa1697d454c3f1d63bb913dce86fe5d85b184d78e3616c34d6c0122 SHA512 f775f3608b6078e51ba335eacf5858f03956c592f31fd9184341f773fd13376e8216cf05e762f83f04e47e251b2485657eb1f7cd8779cafbc8d2a321cb42b851
 AUX enigmail-no_pEp_auto_download.patch 1356 BLAKE2B 1e3c440e3bcaeed42b3de75130372343b7118ea3dc3c0a421d04a8a8b12a9695ba515b7dc3d566b4a0686c2bf4d12fc72b722ceb0d4dc9985eaeedaf67c90210 SHA512 1b5ff31a7ed8d17224ec915d56ee61e817dd41d035445d16a2b0caedd315215c37d2f98e42597fc599c60a39ba4d276a57c644268d12c2929a89f8802164a3d2
 DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74
 DIST enigmail-2.0.8.tar.gz 2525691 BLAKE2B cd69efe72b661bb103837c987937e1cee64a5888795bda7126c59cf99a39c0245f505cdfd6538d54cec5dc3fc95c64bbeca3aebc4b0823249be4c0465d4d68a1 SHA512 9d2e95c2eae6ca22897eb8b2961964d96fd633e7d33a8c0c04a29b4cbc8585777598578abfb0484b96827ca165fe9c8b873e5e7f7cb3ba8cd0779ddc4f10e305
-DIST enigmail-2.1.tar.gz 2783802 BLAKE2B 39450fc16709356fac4a7dc827bd39f9030e7f27df1568d9bcf6da281f2b75dc7e0a708dde1350f2e6c250fac0aaa0d712c9ca6668e1f86bc7f2814c90da5db2 SHA512 c6c5023cd6f1d19b7cd9bc5f3100e7697bb594df05624512a7118e0b49c151094b97675b9d6e6c1d9e51d4e7d560bd43f9bf3376251c5f41f3a27c5faddf120d
-EBUILD enigmail-2.0.12.ebuild 2204 BLAKE2B 58fb7d39a5ad5bf63c24806b7c9a41fbac28a6893cbee369d72093cd1a134ac4a212e606610e51926b8fbc2809cae4486a95eccc7945ba732ff5f01de469cacf SHA512 4b76527a0b0b8438a204f9f9c29ebed2ff1b40dee727facf6fd529488198b0406f32394bd550696139441690d75b9412eb49ca423c4dee2d7c0b33c1dd5b7c41
-EBUILD enigmail-2.0.8-r1.ebuild 2202 BLAKE2B 28a7d37cc47f3a13ce1e2fab227819fc63cb693d1e7d267e4dc41d1c56c8bbc7beb76c87fa48af2a747f965eb018a908cae8a1461814afaae7bb00566efde6c4 SHA512 c7d44cfff7042739a47c16629cdc657425d7f978dbd01f7254a4260e85d05e231a0e5c150bc96b6f5f1f328990020b5b0e5715f0b3e422b42a8dc586c58204a8
-EBUILD enigmail-2.1.ebuild 2271 BLAKE2B acb1eb17b064af77471a178afad44fb7d4c6672a1bcb87c3e1fe3896eda4ddf9f20efb216c7f5612a30c78da5284ce41416bd36fc732e7becba8840364a9e3ea SHA512 becd243a44b0b8a533edc4e2220197394d71aff16a33fa7ea75df8facd19081840082ae4f1b19e78903cd841197cbafd4e87d35ca0f6ab229f170996ff382985
-EBUILD enigmail-9999.ebuild 2271 BLAKE2B acb1eb17b064af77471a178afad44fb7d4c6672a1bcb87c3e1fe3896eda4ddf9f20efb216c7f5612a30c78da5284ce41416bd36fc732e7becba8840364a9e3ea SHA512 becd243a44b0b8a533edc4e2220197394d71aff16a33fa7ea75df8facd19081840082ae4f1b19e78903cd841197cbafd4e87d35ca0f6ab229f170996ff382985
+DIST enigmail-2.1.2.tar.gz 2819073 BLAKE2B 335c7569e2c46dde645c8992cd7017dc57a0174e109ddada2719cb60de010c8ca3691c1d31e8435986b459936bd1602153e462fb5f93d7ffd1244ea867d8d3bc SHA512 c76dcdb0561ee6e94ab19c2ed8cddac71297ffc9ad14ac3d37cd8966cc4111cbc74d1b01ccaa044acef699de27a2cc7ba1ade7a31db8ab930095722ffc62be93
+EBUILD enigmail-2.0.12-r1.ebuild 2191 BLAKE2B 4181d5b60105ddfcb5ba8305c9b5e920ac2772fec95cedcfbeb457880ad0568568b462c95aac8377d232cc66c5ea81157bbb2ff358dbd0c945a97cd4efa8d216 SHA512 f284449997adff3096d7d791a4fc872b86f6d45d15962d0db696f851f1e892388cbf16aa97134c60a72919c505add8e4e96f151ddf0e12098e77b360b9380800
+EBUILD enigmail-2.0.8-r1.ebuild 2129 BLAKE2B 2e48f7a61497bbb7b0922db91ae11315f4bfdc5bdf345806e8695f91f31ecad986b2ff2792b2c94f2aa26b3332e5ed3a8c2bac4fc238d493e8090e2c8947f140 SHA512 2b421bbad8edb65b09281d617944df0ecfe38433c6c8ccf93078da68284799b97de94340c5e6d87ea7b52fb9756a57fb31d326387dd8aebee32c8e1f2b6c7151
+EBUILD enigmail-2.1.2.ebuild 2198 BLAKE2B fbb740c772ff429abb3e8188514495beeea3f2c2820c01d35b9cc46097d38de261d6b30f8eca58a16c8964242f6f19365a89da92d8bd3d415b874e1fdae0fdba SHA512 f5c448dfdbc84d16daba98320f2a668876fd5d345871176d7678004f99d78b75f0916fce9eff8b1f59679f9cde04d4eb2839cd6ee1070cea31993af8cf2b3fe3
+EBUILD enigmail-9999.ebuild 2198 BLAKE2B fbb740c772ff429abb3e8188514495beeea3f2c2820c01d35b9cc46097d38de261d6b30f8eca58a16c8964242f6f19365a89da92d8bd3d415b874e1fdae0fdba SHA512 f5c448dfdbc84d16daba98320f2a668876fd5d345871176d7678004f99d78b75f0916fce9eff8b1f59679f9cde04d4eb2839cd6ee1070cea31993af8cf2b3fe3
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
new file mode 100644
index 000000000000..75b2315eab36
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
@@ -0,0 +1,84 @@
+# 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
+
+DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
+HOMEPAGE="https://www.enigmail.net/"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-3"
+IUSE=""
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
+	S="${WORKDIR}/${P}"
+else
+	if [[ ${PV} = *_beta* ]] ; then
+		SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
+	else
+		SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
+		KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	fi
+	S="${WORKDIR}/${PN}"
+fi
+
+RDEPEND="
+	( >=app-crypt/gnupg-2.0
+		|| (
+			app-crypt/pinentry[gtk(-)]
+			app-crypt/pinentry[qt5(-)]
+		)
+	)
+	!<mail-client/thunderbird-52.5.0
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/zip
+	dev-lang/perl
+	"
+
+PATCHES=(
+	"${FILESDIR}"/enigmail-no_pEp_auto_download.patch
+	"${FILESDIR}/${PN}-2.0.12-enable_seamonkey_support.patch"
+)
+
+src_compile() {
+	emake ipc public ui package lang stdlib
+	emake xpi
+
+}
+
+src_install() {
+	local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
+	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
+
+	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+
+	# thunderbird
+	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+	doins build/"${emid}.xpi"
+
+	# seamonkey
+	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+	doins build/"${emid}.xpi"
+}
+
+pkg_postinst() {
+	local peimpl=$(eselect --brief --colour=no pinentry show)
+	case "${peimpl}" in
+	*gtk*|*qt*) ;;
+	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+		ewarn "You may be prompted for your password in an inaccessible shell!!"
+		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+		;;
+	esac
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "the newly installed version of enigmail."
+	fi
+}
diff --git a/x11-plugins/enigmail/enigmail-2.0.12.ebuild b/x11-plugins/enigmail/enigmail-2.0.12.ebuild
deleted file mode 100644
index 8af2ce693d92..000000000000
--- a/x11-plugins/enigmail/enigmail-2.0.12.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="https://www.enigmail.net/"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
-	S="${WORKDIR}/${P}"
-else
-	if [[ ${PV} = *_beta* ]] ; then
-		SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
-	else
-		SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
-		KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	fi
-	S="${WORKDIR}/${PN}"
-fi
-
-RDEPEND="|| (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt5(-)]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	)
-	!<mail-client/thunderbird-52.5.0
-	!<www-client/seamonkey-2.49.5.0_p0
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch )
-
-src_compile() {
-	emake ipc public ui package lang stdlib
-	emake xpi
-
-}
-
-src_install() {
-	local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
-	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
-
-	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
-
-	# thunderbird
-	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-	doins build/"${emid}.xpi"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins build/"${emid}.xpi"
-}
-
-pkg_postinst() {
-	local peimpl=$(eselect --brief --colour=no pinentry show)
-	case "${peimpl}" in
-	*gtk*|*qt*) ;;
-	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-		ewarn "You may be prompted for your password in an inaccessible shell!!"
-		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-		;;
-	esac
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
-		elog "the newly installed version of enigmail."
-	fi
-}
diff --git a/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild
index ad90c83498c2..64b6344ac5e7 100644
--- a/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.0.8-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
@@ -26,17 +26,14 @@ else
 	S="${WORKDIR}/${PN}"
 fi
 
-RDEPEND="|| (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt5(-)]
-			)
+RDEPEND="
+	( >=app-crypt/gnupg-2.0
+		|| (
+			app-crypt/pinentry[gtk(-)]
+			app-crypt/pinentry[qt5(-)]
 		)
-		=app-crypt/gnupg-1.4*
 	)
 	!<mail-client/thunderbird-52.5.0
-	!<www-client/seamonkey-2.49.5.0_p0
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
diff --git a/x11-plugins/enigmail/enigmail-2.1.2.ebuild b/x11-plugins/enigmail/enigmail-2.1.2.ebuild
new file mode 100644
index 000000000000..ad3a5e7a78e7
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.1.2.ebuild
@@ -0,0 +1,84 @@
+# 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
+
+DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
+HOMEPAGE="https://www.enigmail.net/"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-3"
+IUSE=""
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
+	S="${WORKDIR}/${P}"
+else
+	if [[ ${PV} = *_beta* ]] ; then
+		SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
+	else
+		SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
+		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	fi
+	S="${WORKDIR}/${PN}"
+fi
+
+RDEPEND="
+	( >=app-crypt/gnupg-2.0
+		|| (
+			app-crypt/pinentry[gtk(-)]
+			app-crypt/pinentry[qt5(-)]
+		)
+	)
+	!<mail-client/thunderbird-52.5.0
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/zip
+	dev-lang/perl
+	"
+
+PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch )
+
+src_compile() {
+	# Required or parallel make fails
+	emake -C stdlib createlib
+
+	emake ipc public ui package lang stdlib
+	emake xpi
+
+}
+
+src_install() {
+	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/manifest.json)
+	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
+
+	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+
+	# thunderbird
+	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+	doins build/"${emid}.xpi"
+
+	# seamonkey
+	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+	doins build/"${emid}.xpi"
+}
+
+pkg_postinst() {
+	local peimpl=$(eselect --brief --colour=no pinentry show)
+	case "${peimpl}" in
+	*gtk*|*qt*) ;;
+	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+		ewarn "You may be prompted for your password in an inaccessible shell!!"
+		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+		;;
+	esac
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "the newly installed version of enigmail."
+	fi
+}
diff --git a/x11-plugins/enigmail/enigmail-2.1.ebuild b/x11-plugins/enigmail/enigmail-2.1.ebuild
deleted file mode 100644
index d2c798ea5030..000000000000
--- a/x11-plugins/enigmail/enigmail-2.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="https://www.enigmail.net/"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
-	S="${WORKDIR}/${P}"
-else
-	if [[ ${PV} = *_beta* ]] ; then
-		SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
-	else
-		SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
-		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	fi
-	S="${WORKDIR}/${PN}"
-fi
-
-RDEPEND="|| (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt5(-)]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	)
-	!<mail-client/thunderbird-52.5.0
-	!<www-client/seamonkey-2.49.5.0_p0
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch )
-
-src_compile() {
-	# Required or parallel make fails
-	emake -C stdlib createlib
-
-	emake ipc public ui package lang stdlib
-	emake xpi
-
-}
-
-src_install() {
-	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/manifest.json)
-	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
-
-	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
-
-	# thunderbird
-	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-	doins build/"${emid}.xpi"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins build/"${emid}.xpi"
-}
-
-pkg_postinst() {
-	local peimpl=$(eselect --brief --colour=no pinentry show)
-	case "${peimpl}" in
-	*gtk*|*qt*) ;;
-	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-		ewarn "You may be prompted for your password in an inaccessible shell!!"
-		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-		;;
-	esac
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
-		elog "the newly installed version of enigmail."
-	fi
-}
diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
index d2c798ea5030..ad3a5e7a78e7 100644
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ b/x11-plugins/enigmail/enigmail-9999.ebuild
@@ -26,17 +26,14 @@ else
 	S="${WORKDIR}/${PN}"
 fi
 
-RDEPEND="|| (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt5(-)]
-			)
+RDEPEND="
+	( >=app-crypt/gnupg-2.0
+		|| (
+			app-crypt/pinentry[gtk(-)]
+			app-crypt/pinentry[qt5(-)]
 		)
-		=app-crypt/gnupg-1.4*
 	)
 	!<mail-client/thunderbird-52.5.0
-	!<www-client/seamonkey-2.49.5.0_p0
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
diff --git a/x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch b/x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch
new file mode 100644
index 000000000000..11d9702eb970
--- /dev/null
+++ b/x11-plugins/enigmail/files/enigmail-2.0.12-enable_seamonkey_support.patch
@@ -0,0 +1,20 @@
+--- enigmail/package/install.rdf
++++ enigmail/package/install.rdf
+@@ -19,14 +19,14 @@
+         <em:maxVersion>60.*</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+-    <!--em:targetApplication>
+-      < ! - - Seamonkey is no longer supported - - >
++    <em:targetApplication>
++      <!-- Seamonkey -->
+       <Description>
+         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+         <em:minVersion>2.49</em:minVersion>
+         <em:maxVersion>2.57</em:maxVersion>
+       </Description>
+-    </em:targetApplication -->
++    </em:targetApplication>
+ 
+     <!-- Front End MetaData -->
+     <em:name>Enigmail</em:name>
diff --git a/x11-plugins/gkrellflynn/Manifest b/x11-plugins/gkrellflynn/Manifest
deleted file mode 100644
index 7dadf64445ad..000000000000
--- a/x11-plugins/gkrellflynn/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gkrellflynn-0.8-makefile.patch 931 BLAKE2B 6cd8037d5645014247768991448a61259413f955b10fbf34c191eb729b52aef806bd40d254510befc2cc8edc55dd69d8afe2f499120f567d1e237cce19d7ed86 SHA512 20936480ac1129fe5d4cd5ac0bdfe00dfa137e27e2fbbe1e7f60aeead5c450f9a7fbf6e344bb7505b160fd63bb49b03bed29de21098eb2699ed45b832aa1ab9e
-DIST gkrellflynn-0.8.tar.gz 26722 BLAKE2B 92c11c57181ec800b6b4dd34fe26d20cb6160b668d3a8a0f0fdf5a67126a691993aac3673283fb3fcec811afc25cfa847dc96b1d13edade891e589c8687f9ef7 SHA512 36c643adcfb1ecb994eb6c2bb590225df1f268e885508ede28ea8b9760bdca33bfb48821d356ce0c56e38be5f7b16ad7062bc191e8a77aef1c792bd02da2f366
-EBUILD gkrellflynn-0.8.ebuild 607 BLAKE2B a78d48bf1795416dd596339315bcd081aa131425e3241a60437658fed4e10eada0fbf5f9597506b10f297a02410869ca1960ae7f31ee45997c750e5458352d74 SHA512 d71e5e559607a82f870f1916c47e6d49af8db4d4035f197b2d5ad87e815cbb60be2f2e27f8fe9b0c2516ea51a8f0448364a61f2ace981779914c6f8eec3a3f52
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch b/x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch
deleted file mode 100644
index bcfef8b8f824..000000000000
--- a/x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -3,11 +3,10 @@
- #
- # updated for gkrellm2.0
- 
--CC = gcc
--CFLAGS = -c -O -Wall -fPIC `${EXTRACONF}`
-+CC = $(CC)
-+INCLUDE = -c -fPIC `${EXTRACONF}`
- 
--LD = $(CC)
--LDFLAGS = -shared -Wl -o
-+LDFLAGS = $(LDFLAGS)
- INCPATH  = -I.
- INCPATH += ${GKRELL_INC}
- 
-@@ -25,10 +24,10 @@
- 	(make GKRELL_INC=-DGKRELLM EXTRACONF="gtk-config --cflags;imlib-config --cflags-gdk" ${TARGET})
- 
- gkrellm2:
--	(make GKRELL_INC=-DGKRELLM2 EXTRACONF="pkg-config --cflags gtk+-2.0 gthread-2.0" ${TARGET})
-+	($(MAKE) GKRELL_INC=-DGKRELLM2 EXTRACONF="pkg-config --cflags gtk+-2.0 gthread-2.0" ${TARGET})
- 
- ${TARGET}:	${OBJS}
--		${LD} ${DEBUG} ${LDFLAGS} ${TARGET} ${OBJS}
-+		${CC} -shared ${LDFLAGS} ${CFLAGS} -o ${TARGET} ${OBJS} 
- 
- clean:
- 	rm -f ${OBJS}
-@@ -47,5 +46,5 @@
- 	./install-sub.sh	${TARGET} gkrellm2
- 
- %.o :	%.c
--	${CC} ${CFLAGS} $(INCPATH) -o $@ $<
-+	${CC} ${CFLAGS} $(INCLUDE) ${LDFLAGS} $(INCPATH) -o $@ $<
- 
diff --git a/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild b/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
deleted file mode 100644
index 10c704f676c6..000000000000
--- a/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gkrellm-plugin toolchain-funcs
-
-HOMEPAGE="http://bax.comlab.uni-rostock.de/en/projects/flynn.html"
-SRC_URI="http://bax.comlab.uni-rostock.de/fileadmin/downloads/${P}.tar.gz"
-DESCRIPTION="A funny GKrellM2 load monitor (for Doom(tm) fans)"
-
-KEYWORDS="alpha amd64 ppc sparc x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="app-admin/gkrellm:2[X]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" gkrellm2
-}
diff --git a/x11-plugins/gkrellflynn/metadata.xml b/x11-plugins/gkrellflynn/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/x11-plugins/gkrellflynn/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 66ac6bd6d91c..16c8022f2d0c 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index 1b20fce74a66..319bcfa0ff2c 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -275,4 +275,5 @@ DIST xml-rs-0.8.0.crate 50974 BLAKE2B 47f5c663e0982b0ca6caa7aceb7029f2bdff948395
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
 DIST zip-0.5.2.crate 29522 BLAKE2B e86f9036b0e68be7e1a95a9a4d461fc4fefd89445d67d102fbaec0f1a8b6aeaf9ae4ec6415e88bf5d4a320e5e86dc84ac7855975a4d410e6776d02308f4ae465 SHA512 4433cb75ec8bbaa946c8ffd8f1ee2f50b4117a660b850ceb5f38e688ad903979fbb4a885926cba14fac11eb8089e1155ce9041ec132be78952baa7fc4666880d
 EBUILD alacritty-0.3.3-r1.ebuild 6182 BLAKE2B 6bb4a3c246eb55f8b3ad483a22f7670fc3866047432730dafc03c48b78d65c7c9b18c1bb175d4e82286ea6343ae3c76a7fef252753fd97ba9818879ef73f5efa SHA512 57f7f533df53ff4ec8b2c972f6dad5d913f8087860908bcc925a56779d5e3aefad9820749600ebc04636ece777973e43e70d57dea1a98333a360966a4077583a
+EBUILD alacritty-9999.ebuild 6416 BLAKE2B 0bcc6f0afb384457e8394c8c82ae3c0f6ef01b5cc5329d6100f6a82aaa2f19b48f3abf30538d5f5168291389f59c398fc7a05fdce83c7bf267f6327f31897fe8 SHA512 f13ec9eb48c1caf941a505047232a61bc26f9d56922bdb8973a257596585af249e921a50780cef230dec4b4ca2896096e8b1aa4d3de68d1475978b1982496cc1
 MISC metadata.xml 539 BLAKE2B c0a28bc8f4b41ab9ddce4600ad92883ec00a8a9eeff8372dc49f1a69e96d87baaee67b361b8b52a259ca5294b4cb609872561829abc5a96deb720e9636a92015 SHA512 aa33a410483c86613a032850c40f33f73d2a5c580cc47abff1e6c98d28b29a9ed5bdde94d38e1946fdb02ad8f035bc31186a4655b37baccf3b41cc2b6201247c
diff --git a/x11-terms/alacritty/alacritty-9999.ebuild b/x11-terms/alacritty/alacritty-9999.ebuild
new file mode 100644
index 000000000000..fe1402f1e106
--- /dev/null
+++ b/x11-terms/alacritty/alacritty-9999.ebuild
@@ -0,0 +1,363 @@
+# 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.10
+aho-corasick-0.7.3
+andrew-0.2.1
+android_glue-0.2.3
+ansi_term-0.11.0
+approx-0.3.2
+arc-swap-0.3.11
+argon2rs-0.2.5
+arrayvec-0.4.10
+atty-0.2.11
+autocfg-0.1.4
+backtrace-0.3.30
+backtrace-sys-0.1.28
+base64-0.10.1
+bindgen-0.33.2
+bitflags-1.1.0
+blake2-rfc-0.2.18
+block-0.1.6
+byteorder-1.3.2
+bzip2-0.3.3
+bzip2-sys-0.1.7
+cc-1.0.37
+cexpr-0.2.3
+cfg-if-0.1.9
+cgl-0.2.3
+clang-sys-0.22.0
+clap-2.33.0
+clipboard-win-2.2.0
+cloudabi-0.0.3
+cmake-0.1.40
+cocoa-0.18.4
+color_quant-1.0.1
+constant_time_eq-0.1.3
+core-foundation-0.6.4
+core-foundation-sys-0.6.2
+core-graphics-0.17.3
+core-text-13.2.0
+crc32fast-1.2.0
+crossbeam-channel-0.3.8
+crossbeam-deque-0.6.3
+crossbeam-epoch-0.7.1
+crossbeam-queue-0.1.2
+crossbeam-utils-0.6.5
+deflate-0.7.19
+derivative-1.0.2
+dirs-1.0.5
+dlib-0.4.1
+downcast-rs-1.0.4
+dtoa-0.4.4
+dunce-1.0.0
+dwrote-0.9.0
+either-1.5.2
+embed-resource-1.2.0
+env_logger-0.5.13
+env_logger-0.6.1
+errno-0.2.4
+errno-dragonfly-0.1.1
+euclid-0.19.9
+euclid_macros-0.1.0
+expat-sys-2.1.6
+failure-0.1.5
+failure_derive-0.1.5
+filetime-0.2.5
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-0.4.0
+foreign-types-macros-0.1.0
+foreign-types-shared-0.1.1
+foreign-types-shared-0.2.0
+freetype-rs-0.19.1
+freetype-sys-0.7.1
+fsevent-0.4.0
+fsevent-sys-2.0.1
+fuchsia-cprng-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+gcc-0.3.55
+gif-0.10.2
+gleam-0.6.17
+gl_generator-0.11.0
+glob-0.2.11
+glutin-0.21.0
+glutin_egl_sys-0.1.3
+glutin_emscripten_sys-0.1.0
+glutin_gles2_sys-0.1.3
+glutin_glx_sys-0.1.5
+glutin_wgl_sys-0.1.3
+http_req-0.5.0
+humantime-1.2.0
+idna-0.1.5
+image-0.21.2
+inflate-0.4.5
+inotify-0.6.1
+inotify-sys-0.1.3
+iovec-0.1.2
+itoa-0.4.4
+jpeg-decoder-0.1.15
+kernel32-sys-0.2.2
+khronos_api-3.1.0
+lazycell-1.2.1
+lazy_static-1.3.0
+libc-0.2.58
+libflate-0.1.23
+libloading-0.5.1
+libz-sys-1.0.25
+line_drawing-0.7.0
+linked-hash-map-0.5.2
+lock_api-0.1.5
+log-0.4.6
+lzw-0.10.0
+malloc_buf-0.0.6
+matches-0.1.8
+memchr-1.0.2
+memchr-2.2.0
+memmap-0.7.0
+memoffset-0.2.1
+mio-0.6.19
+mio-anonymous-pipes-0.1.0
+mio-extras-2.0.5
+mio-named-pipes-0.1.6
+mio-uds-0.6.7
+miow-0.2.1
+miow-0.3.3
+named_pipe-0.3.0
+native-tls-0.2.3
+net2-0.2.33
+nix-0.14.1
+nodrop-0.1.13
+nom-3.2.1
+nom-4.2.3
+notify-4.0.12
+num_cpus-1.10.1
+num-derive-0.2.5
+num-integer-0.1.41
+num-iter-0.1.39
+num-rational-0.2.2
+numtoa-0.1.0
+num-traits-0.2.8
+objc-0.2.6
+objc-foundation-0.1.1
+objc_id-0.1.1
+openssl-0.10.23
+openssl-probe-0.1.2
+openssl-sys-0.9.47
+ordered-float-1.0.2
+osmesa-sys-0.1.2
+owning_ref-0.4.0
+parking_lot-0.7.1
+parking_lot_core-0.4.0
+peeking_take_while-0.1.2
+percent-encoding-1.0.1
+phf-0.7.24
+phf_codegen-0.7.24
+phf_generator-0.7.24
+phf_shared-0.7.24
+pkg-config-0.3.14
+png-0.14.1
+podio-0.1.6
+proc-macro2-0.4.30
+quick-error-1.2.2
+quote-0.3.15
+quote-0.6.12
+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.4
+rand_os-0.1.3
+rand_pcg-0.1.2
+rand_xorshift-0.1.1
+rayon-1.1.0
+rayon-core-1.5.0
+rdrand-0.4.0
+redox_syscall-0.1.54
+redox_termios-0.1.1
+redox_users-0.3.0
+regex-0.2.11
+regex-1.1.7
+regex-syntax-0.5.6
+regex-syntax-0.6.7
+remove_dir_all-0.5.2
+rustc-demangle-0.1.15
+rustc_tools_util-0.2.0
+rustc_version-0.2.3
+rusttype-0.7.7
+ryu-0.2.8
+same-file-1.0.4
+schannel-0.1.15
+scoped_threadpool-0.1.9
+scopeguard-0.3.3
+security-framework-0.3.1
+security-framework-sys-0.3.1
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.92
+serde_derive-1.0.92
+serde_json-1.0.39
+serde_yaml-0.8.9
+servo-fontconfig-0.4.0
+servo-fontconfig-sys-4.0.7
+shared_library-0.1.9
+signal-hook-0.1.9
+signal-hook-registry-1.0.1
+siphasher-0.2.3
+slab-0.4.2
+smallvec-0.6.10
+smithay-client-toolkit-0.4.6
+smithay-client-toolkit-0.6.2
+smithay-clipboard-0.3.3
+socket2-0.3.9
+spsc-buffer-0.1.1
+stable_deref_trait-1.1.1
+static_assertions-0.3.3
+stb_truetype-0.2.6
+strsim-0.8.0
+syn-0.15.36
+synstructure-0.10.2
+tempfile-3.0.8
+termcolor-1.0.5
+terminfo-0.6.1
+termion-1.5.3
+textwrap-0.11.0
+thread_local-0.3.6
+tiff-0.2.2
+time-0.1.42
+ucd-util-0.1.3
+unicase-2.4.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.8
+unicode-width-0.1.5
+unicode-xid-0.1.0
+url-1.7.2
+utf8parse-0.1.1
+utf8-ranges-1.0.3
+vcpkg-0.2.6
+vec_map-0.8.1
+version_check-0.1.5
+void-1.0.2
+vswhom-0.1.0
+vswhom-sys-0.1.0
+vte-0.3.3
+walkdir-2.2.8
+wayland-client-0.21.13
+wayland-client-0.23.5
+wayland-commons-0.21.13
+wayland-commons-0.23.5
+wayland-protocols-0.21.13
+wayland-protocols-0.23.5
+wayland-scanner-0.21.13
+wayland-scanner-0.23.5
+wayland-sys-0.21.13
+wayland-sys-0.23.5
+which-1.0.5
+widestring-0.4.0
+winapi-0.2.8
+winapi-0.3.7
+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
+winit-0.19.1
+winpty-sys-0.4.3
+winreg-0.5.1
+ws2_32-sys-0.2.1
+x11-clipboard-0.3.2
+x11-dl-2.18.3
+xcb-0.8.2
+xdg-2.2.0
+xml-rs-0.8.0
+yaml-rust-0.4.3
+zip-0.5.2
+"
+
+MY_PV="${PV//_rc/-rc}"
+
+inherit bash-completion-r1 cargo desktop eutils
+
+DESCRIPTION="GPU-accelerated terminal emulator"
+HOMEPAGE="https://github.com/jwilm/alacritty"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jwilm/alacritty"
+else
+	SRC_URI="https://github.com/jwilm/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="amd64 ~ppc64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	media-libs/fontconfig:=
+	media-libs/freetype:2
+	x11-libs/libxcb
+"
+
+RDEPEND="${DEPEND}
+	sys-libs/zlib
+	sys-libs/ncurses:0
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXrandr
+	virtual/opengl
+"
+
+BDEPEND="dev-util/cmake
+	>=virtual/rust-1.32.0
+"
+
+DOCS=( CHANGELOG.md docs/ansicode.txt INSTALL.md README.md alacritty.yml )
+
+QA_FLAGS_IGNORED="usr/bin/alacritty"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_install() {
+	cargo_src_install --path=alacritty
+
+	newbashcomp extra/completions/alacritty.bash alacritty
+
+	insinto /usr/share/fish/vendor_completions.d/
+	doins extra/completions/alacritty.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins extra/completions/_alacritty
+
+	domenu extra/linux/alacritty.desktop
+	newicon extra/logo/alacritty-term.svg Alacritty.svg
+
+	newman extra/alacritty.man alacritty.1
+
+	insinto /usr/share/alacritty/scripts
+	doins -r scripts/*
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "wayland support" dev-libs/wayland
+	optfeature "apply-tilix-colorscheme script dependency" dev-python/pyyaml
+}
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 2f2d35a170ef..29502990ed3c 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,11 +1,12 @@
 AUX kitty-0.11.0-svg-icon.patch 668 BLAKE2B 53fbe58492ebc9e78a9aab1f7ecd977c1daee9a097e34ebd0a98efefc2cf3625dc785e4c6e074f348cf24c9425734d3d521779d0c5fc5dd546f8322d35c3b11a SHA512 9b0aa40447d9ff137d45bdb3c2e4f5a8d9d68cdbc62c486a080107b02c6251d7075eaf212274c53f07977a370c8688cb3ace46828aac3b9467080d0334a05a21
-AUX kitty-0.13.2-flags.patch 1622 BLAKE2B 003a236d3817d744012883d9fb4be5029d5b83351c56e6b257ac5acd9bdd791fc7dcc5ad428be5aa227ba3f36aae40b90e04bdd6efbafc7f424b0163aa8f3abb SHA512 d24adbce0c5deee7418998d43d384fa5fb3ecc24fcf9728337c99b01bedb529fec8fd327c5dd2e71fec4957ad802e738a02cdc061f8b0dd78cbcbeffdd9c126c
 AUX kitty-0.14.2-flags.patch 1658 BLAKE2B debb36362a1130c2ec55d51814d6ca1fb93190e9a7f29a2450440a8c808a5604ed2000c43f317d56098f6af74e1076ae71f34523b8a762c93434d7ddb611599a SHA512 f8e46c2b699ed4a9495f1afcce6a932d89710b01f8ac35aef9cbf035ead3b7e2186ad67af5b09f156b08052bbe9e42fc5ffb87b5af5e9b36ca403bfa6b0d8e78
+AUX kitty-0.14.4-flags.patch 1662 BLAKE2B a936f445ad9d0ab7eb23ef9d50b94d52e49233e4890bbcde1de873c2d094687870b97261f3c0b01e059ce5debf67ae3dd1829835f2c4c06713996547f345dead SHA512 f8c2c2b9888d644e3f43b2893d9719b50fbd8627976ac81dcfd26e4409b2644c544fb610e39a84e8b4b7bf0851224f247716c5358c02e053ec571361b694d00e
+AUX kitty-0.14.4-svg-icon.patch 616 BLAKE2B 2e362e1ea134f98839b8e21e337faa530de7a0613965c762589c1d85220fe2f89a17b4691dad7248669e29d511a5e9b5ded446bccc9a6d1cbdce56d715c137cb SHA512 3a60dbafc8567535a9eed422bd1ee0382ee2afa79b815dff7e8f68f090a67374741962206368ca7723e15b241556dc2ede3935b40fa67f4e6c20300b1a4850fa
 AUX kitty-9999-flags.patch 1907 BLAKE2B 1c859ed7ee8f789b9c00b80b45972d889085640a1c13c45026310fa1ac33727760c47e229f80ce849bfdc9e33dd96bac13cd77d1f6e4097091381ac436c75a40 SHA512 863e0fa216df0424b0b92f7ee0909e7d7914681312fda9bae5343769ee8c660cf71800682f6e9c5ad03ec78b943f049413bc874a0610e315d87ab953e5577c53
 AUX kitty-9999-svg-icon.patch 659 BLAKE2B ad6e085984784344cf4d92b5d66ea63e384290d7de3ac63af29ac6906b535ec8d7cf8549fb8b03f28dac775b5154f6e69185dc2c03b3b4760d348d11112810b4 SHA512 7d0a5c26cb16efe2de79a0055ba8d8be1c348e86712f6bae8280d0582e406c3e2f21e2e0ca40f21a57e8f19e1aed78e87cdc120e10338965d104190922a601f8
-DIST kitty-0.13.3.tar.xz 2846220 BLAKE2B cb2da9e64696298471001f28bc5cc568a6ec21331153929fa86b8bc7262b5928430fc053f86b7ef669eafde676439f6ee644f14cd942e2f11fba7b7dadfcb294 SHA512 9ce803469057245f9e1c50b53e03d48d3f2483b01f9441be6eadbfea8edcba01652177cbff11d1dd2b35e9415db6822fd72a0494f00ee3be30f58c1f1991c37b
 DIST kitty-0.14.2.tar.xz 2867116 BLAKE2B 20f3d66caa5242502f2699d4a5e8364eda357b00c72d50650ab0d03fbbb552152a2d4447e37ce20660d6d8f9ffc285aee057f6adf7a03ac57fa8ab6d1da61013 SHA512 191a37424c51776d271008c6b4b0cb43b60cd2abea3ea7b2a08cca9a8d44c4932ca11470f3efb8debc0e2ef3641bb68c05374401073b23cf81042af467b1dbf4
-EBUILD kitty-0.13.3.ebuild 2061 BLAKE2B a60fb0f1798d2abe1dd4cae7eba8cec13ab092312a24120a3938c850265d8b3566e095aa5158bb6ccb841d658728ed980a43b6533f5491982aa03a745d7bdfa9 SHA512 931a21ba970fd1782538b9c83c7ab4e80a9ca262d48fcfe3cf3c412b071a60429a2104441809409da8144dcd080852355de912a296f8fd9e783fa5ce18a12d70
+DIST kitty-0.14.4.tar.xz 2946268 BLAKE2B e06cdb1081d821bd65190ec7526482f7471f7a04c8a559e48465b602559079c10d220024ac521d2fce34e0eb90af7bee01d1da408082bfa724ac61e59709a860 SHA512 1550883232bff21217fc0d294598d6d828e67a944fc69b324079e87bf2505344c58ade75cec8bff1dca7821c4f490c066f2645281cee0e71792d317ef7df3779
 EBUILD kitty-0.14.2.ebuild 2084 BLAKE2B 7228195ed8acf32d1ae3f85038ca0c8b9f9e12512fd8b9108dd743eb1a33e37f8615d47ef67343022f6c1d7c7a9607ccb59dac6985daf1016c6f1ddf9d59266a SHA512 c49483d89c05403cd461f1be9990a5bd76861b14e846b62bb33039fdf4c7b7b539a298d7133cf32a6be666c751bc0ccbe5c7b7e1382202823bf238ae3576d1a0
-EBUILD kitty-9999.ebuild 2068 BLAKE2B f16b804500a99a6ac7159bf34fb999fecdaafb2111e19da35b10081e0d23021a95999550ad75f4e001e4d04403fa7679c2a95454e8cfe4066fb8d53435aa3ab4 SHA512 4cca2911729b2dac4410e43c5ff57dd54ee6b321db8c9c872801afe3bb5b13403e8f6b33e53861787202a587738067711d708675aa301c67e98ea2708dd72e20
+EBUILD kitty-0.14.4.ebuild 2108 BLAKE2B bab3fb480cee99c0a3a53ae697784d1203cbdeb85dce37aac9958eeee3b787eaf6b0bbd0475d2f6e3ae71017d00d600583f2fd063328a9125f08074d1199d819 SHA512 effa3b97cc8f7f4ce312e455d6096fdc0229f7950b96af27426e6c1700e411250c2516478ffc10a35f6375ee9733a9dbd0348ebac5ccbe1291b7e45dfd27ef8e
+EBUILD kitty-9999.ebuild 2092 BLAKE2B aaf4bd9d7bd759ae28746a3d4a44e32f0a05b55d9174592ff663e1f45bd6bf62e361506f6e9bda5041c7f513e34a173c2153d2b3cf093164b8a494a644a01a66 SHA512 b8c9b792204a5e9ef8182a9364c965cdf90c6567158d0057eee6097801813fbdedeadc8fb1494f47d7f4a816dff2d880184e3c956028887319a25af5baf5a099
 MISC metadata.xml 428 BLAKE2B 961cd7fc3036c8f5a641cb97de57765c423f157430bf1fd68ce7febf24713ab1b15080e03f568d20f6360da467044ea4ed1d3ee7bfb132250951b4239df58980 SHA512 49ffa8dee6be29ab8adacbc0717dc574ad15f690fa1e0726b2a9de439f90867d3770e3628734d9a7457aa45896334d96f15a51e217ad248c766271aa62d85061
diff --git a/x11-terms/kitty/files/kitty-0.13.2-flags.patch b/x11-terms/kitty/files/kitty-0.13.2-flags.patch
deleted file mode 100644
index b79edaf884fa..000000000000
--- a/x11-terms/kitty/files/kitty-0.13.2-flags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- kitty-0.13.2/setup.py
-+++ kitty-0.13.2/setup.py
-@@ -178,7 +178,7 @@
-     df = '-g3'
-     if ccver >= (5, 0):
-         df += ' -Og'
--    optimize = df if debug or sanitize else '-O3'
-+    optimize = ''
-     sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
-     cppflags = os.environ.get(
-         'OVERRIDE_CPPFLAGS', (
-@@ -191,7 +191,7 @@
-     cflags = os.environ.get(
-         'OVERRIDE_CFLAGS', (
-             '-Wextra -Wno-missing-field-initializers -Wall -std=c11'
--            ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
-+            ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden'
-         ).format(
-             optimize,
-             ' '.join(sanitize_args),
-@@ -205,7 +205,7 @@
-     )
-     ldflags = os.environ.get(
-         'OVERRIDE_LDFLAGS',
--        '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
-+        '-Wall ' + ' '.join(sanitize_args)
-     )
-     ldflags = shlex.split(ldflags)
-     ldflags.append('-shared')
-@@ -517,14 +517,14 @@
- 
- 
- def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False):
--    cflags = '-Wall -Werror -fpie'.split()
-+    cflags = '-Wall -fpie'.split()
-     cppflags = []
-     libs = []
-     if args.profile:
-         cppflags.append('-DWITH_PROFILER'), cflags.append('-g')
-         libs.append('-lprofiler')
--    else:
--        cflags.append('-O3')
-+    #else:
-+    #    cflags.append('-O3')
-     if for_bundle or for_freeze:
-         cppflags.append('-DFOR_BUNDLE')
-         cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/files/kitty-0.14.4-flags.patch b/x11-terms/kitty/files/kitty-0.14.4-flags.patch
new file mode 100644
index 000000000000..5bf301efd5a8
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.14.4-flags.patch
@@ -0,0 +1,49 @@
+Respect user CFLAGS.
+
+--- kitty-0.14.4/setup.py
++++ kitty-0.14.4/setup.py
+@@ -202,7 +202,7 @@
+     df = '-g3'
+     if ccver >= (5, 0):
+         df += ' -Og'
+-    optimize = df if debug or sanitize else '-O3'
++    optimize = ''
+     sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
+     cppflags = os.environ.get(
+         'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'),
+@@ -213,7 +213,7 @@
+     cflags = os.environ.get(
+         'OVERRIDE_CFLAGS', (
+             '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
+-            ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
++            ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden'
+         ).format(
+             optimize,
+             ' '.join(sanitize_args),
+@@ -227,7 +227,7 @@
+     )
+     ldflags = os.environ.get(
+         'OVERRIDE_LDFLAGS',
+-        '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
++        '-Wall ' + ' '.join(sanitize_args)
+     )
+     ldflags = shlex.split(ldflags)
+     ldflags.append('-shared')
+@@ -608,7 +608,7 @@
+ 
+ 
+ def build_launcher(args, launcher_dir='.', bundle_type='source'):
+-    cflags = '-Wall -Werror -fpie'.split()
++    cflags = '-Wall -fpie'.split()
+     cppflags = []
+     libs = []
+     if args.profile or args.sanitize:
+@@ -620,8 +620,6 @@
+             cflags.append('-g')
+         if args.profile:
+             libs.append('-lprofiler')
+-    else:
+-        cflags.append('-O3')
+     if bundle_type.endswith('-freeze'):
+         cppflags.append('-DFOR_BUNDLE')
+         cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch b/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch
new file mode 100644
index 000000000000..13f874dd3c14
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch
@@ -0,0 +1,16 @@
+Use SVG icon instead of PNG.
+
+--- kitty-0.14.4/setup.py
++++ kitty-0.14.4/setup.py
+@@ -710,9 +710,9 @@
+         run_tool(['make', 'docs'])
+     copy_man_pages(ddir)
+     copy_html_docs(ddir)
+-    icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps')
++    icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', 'scalable', 'apps')
+     safe_makedirs(icdir)
+-    shutil.copy2('logo/kitty.png', icdir)
++    shutil.copy2('logo/kitty.svg', icdir)
+     deskdir = os.path.join(ddir, 'share', 'applications')
+     safe_makedirs(deskdir)
+     with open(os.path.join(deskdir, 'kitty.desktop'), 'w') as f:
diff --git a/x11-terms/kitty/kitty-0.13.3.ebuild b/x11-terms/kitty/kitty-0.13.3.ebuild
deleted file mode 100644
index 74d2102fb6d1..000000000000
--- a/x11-terms/kitty/kitty-0.13.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1 toolchain-funcs gnome2-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug doc imagemagick wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPS="
-	${PYTHON_DEPS}
-	>=media-libs/harfbuzz-1.5.0:=
-	sys-apps/dbus
-	sys-libs/zlib
-	media-libs/libpng:0=
-	media-libs/freetype:2
-	media-libs/fontconfig
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	x11-libs/libxcb[xkb]
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.17
-	)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	imagemagick? ( virtual/imagemagick-tools )
-"
-DEPEND="${RDEPEND}
-	sys-libs/ncurses
-	virtual/pkgconfig
-"
-[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.13.2-flags.patch
-	"${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	# respect doc dir
-	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
-
-	tc-export CC
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	doecho "${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		linux-package
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	mkdir -p "${ED}"usr || die
-	cp -r linux-package/* "${ED}usr" || die
-	python_fix_shebang "${ED}"
-
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/doc || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.14.4.ebuild b/x11-terms/kitty/kitty-0.14.4.ebuild
new file mode 100644
index 000000000000..85c9ba13dfc8
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.14.4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit python-single-r1 toolchain-funcs gnome2-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug doc imagemagick wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPS="
+	${PYTHON_DEPS}
+	>=media-libs/harfbuzz-1.5.0:=
+	sys-apps/dbus
+	sys-libs/zlib
+	media-libs/libcanberra
+	media-libs/libpng:0=
+	media-libs/freetype:2
+	media-libs/fontconfig
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libxkbcommon[X]
+	x11-libs/libxcb[xkb]
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.17
+	)
+"
+RDEPEND="
+	${COMMON_DEPS}
+	imagemagick? ( virtual/imagemagick-tools )
+"
+DEPEND="${RDEPEND}
+	media-libs/mesa[X(+)]
+	sys-libs/ncurses
+	virtual/pkgconfig
+"
+[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.4-flags.patch
+	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
+)
+
+src_prepare() {
+	default
+
+	# disable wayland as required
+	if ! use wayland; then
+		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+	fi
+
+	# respect doc dir
+	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
+
+	tc-export CC
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	doecho "${EPYTHON}" setup.py \
+		--verbose $(usex debug --debug "") \
+		--libdir-name $(get_libdir) \
+		linux-package
+}
+
+src_test() {
+	export KITTY_CONFIG_DIRECTORY=${T}
+	"${EPYTHON}" test.py || die
+}
+
+src_install() {
+	mkdir -p "${ED}"usr || die
+	cp -r linux-package/* "${ED}usr" || die
+	python_fix_shebang "${ED}"
+
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/doc || die
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 623cddae6fb0..c51e3ffd52d4 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -27,6 +27,7 @@ COMMON_DEPS="
 	>=media-libs/harfbuzz-1.5.0:=
 	sys-apps/dbus
 	sys-libs/zlib
+	media-libs/libcanberra
 	media-libs/libpng:0=
 	media-libs/freetype:2
 	media-libs/fontconfig
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 70bf519c8f31..7b5942b3bcbd 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/adapta-gtk-theme/Manifest b/x11-themes/adapta-gtk-theme/Manifest
index 8aa6fe7ea8eb..586b628bc75f 100644
--- a/x11-themes/adapta-gtk-theme/Manifest
+++ b/x11-themes/adapta-gtk-theme/Manifest
@@ -1,3 +1,3 @@
 DIST adapta-gtk-theme-3.95.0.11.tar.gz 664080 BLAKE2B 1cc69ac61982f1bccefef38e0315e87af95551a453c6a1fc2289e787d571b43a3bf9ff09854cc0ddd27445e8fb12588a0209311c48c93ab30af624c4eca00f8b SHA512 648f8ad2cf8095c599ff4be4d6d47e0935d6b5bea65c27a36ea69cca89129c59fd078b629a38a048ef300c1bb4ca506c18c4ef0afc9753134894d3a99c83fff1
-EBUILD adapta-gtk-theme-3.95.0.11.ebuild 600 BLAKE2B 9aa6b5e418da4f3b4d95041d5cf9318ba46ad42b971d5fe89f5a428ae0cd9aca30c33c570b87ee82443b2627720cead052881c8ed9372d8d40af6885832be4e5 SHA512 17d7285f5b9725f09afd4b703416185b863b6e20cb7604ac3d6d0293de2440331fcffbf5085cf960f81f354882fb199dc482f0eb7d01c3b89ad1cdbf9b1c480c
+EBUILD adapta-gtk-theme-3.95.0.11.ebuild 598 BLAKE2B 9932eb147c18583411b8959c3f37acd78d63479aad1cef53da3190223ec7e3313718bfcb5761729e604aab7df2e70695c703b3a2d75df0a4fb4a1d6360c24148 SHA512 45a8180594fe6bb830d0046185025bbc1e0d1fa7554843e18a2bb64170cca39e062a9aeecdf8934865073e0c05016b0a99c0784343d542c6fb16fbc022dbe77e
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/x11-themes/adapta-gtk-theme/adapta-gtk-theme-3.95.0.11.ebuild b/x11-themes/adapta-gtk-theme/adapta-gtk-theme-3.95.0.11.ebuild
index 0cbe378bfae9..139a9272942a 100644
--- a/x11-themes/adapta-gtk-theme/adapta-gtk-theme-3.95.0.11.ebuild
+++ b/x11-themes/adapta-gtk-theme/adapta-gtk-theme-3.95.0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/adapta-project/adapta-gtk-theme/archive/${PV}.tar.gz
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_prepare(){
 	default
diff --git a/x11-themes/greybird/Manifest b/x11-themes/greybird/Manifest
index 13ec3913abda..336fcb67d62b 100644
--- a/x11-themes/greybird/Manifest
+++ b/x11-themes/greybird/Manifest
@@ -1,8 +1,8 @@
 DIST greybird-3.20.1.tar.gz 193824 BLAKE2B d4e5cba92e9acf2fd084ee5b1bb5db332bb541193980ee7c74ba98da3b1bb675efd171078fac6051be21d2c2fd03b88f45bf7dff3101ec91578dc28bed212ec9 SHA512 9fe8662fa1c3c9b51aa1ba6d9cb9a54a8e7640386dc43cb695e87ed733a40893067bd86277a03d1c17c48596ba0897a0a41ed48db985727b0d65f2ce2de2227e
-DIST greybird-3.22.8.tar.gz 211084 BLAKE2B 958b1dd837bbf91c40ef9ec3e5944d24d83d984e46b53cee8297dbf93931efd3f2efbda496929c3ced875f7a1d9046804b48b870bdca37a7bcffd57271e80470 SHA512 c6ac0dafc926ec2a0b01b4d44f602e533f97f806be32096208c08461502cadcda3f1e63012ad78ffaaa9c791c5af72ce2b7e0578b1f7c0d3ab407763bc40f94b
+DIST greybird-3.22.10.tar.gz 212225 BLAKE2B d38d05d3a2523e58ed8fc8474bd8607a45b4f63d33f6053f5b9cc749504be3c3930d6f156a26abae9dfcd9214e68f92343bbcd0ecef7e53640a597b28562875e SHA512 c950de36c9733f98b454fde1ff5f8005169fab3b2782ab9f13a95a1aba938766f38666ad1229ab429fa163cf0e97cf5ecc8a84f3eb63cc378c35d79ea54b513c
 DIST greybird-3.22.9.tar.gz 211750 BLAKE2B bfce416c55cc03d1f98c4d14916bcecb6cdc857ed3f813d90cae2a9e92f607d4ae3798d0eb39b0e548f7b4c7964b60d4970c442b91eb78db02772b9a2c02f3a2 SHA512 d09638c78d74e26a428edfbbe00719208fac5e574db11eac2e538d25fa9f3270c9c7b636f770061807a59b200c8afa4252a9513cffe1f4af3d186425b6a14744
 EBUILD greybird-3.20.1-r2.ebuild 1334 BLAKE2B 9345926c3d85689c910c590ceb36a5368129c09790adcf091bd8cc358a9696706490451294149640a5d127c0167e01252f1c36687074103dd4a1af140b96a455 SHA512 3334a278c7ab07961de8e545aa75355136dbe770c1240ccd3ffc15bec2fe0498083a4e6566cfab9e5296993eca9f37fbc1b0b65e7b36d1bfe8ac29175150b783
-EBUILD greybird-3.22.8.ebuild 1338 BLAKE2B 5acae1774de4ca86032452f47d41f9cb5765b8895b0ea0d56dd9c65edb2968f29d425d930707e0b387b656671835f66f5ae9291324a3b85644ec20e6f83e2e09 SHA512 cae81741dad1726a8d50d543f0c19415b9a1f7651fb57c135f98a95fcf22afa21abab2f2addb19fefbed4adc1a984ae2e18a3d9684deebf32be249f50c0b5f17
+EBUILD greybird-3.22.10.ebuild 1338 BLAKE2B 74a2d975b43c6a238490c55c046f895e7f6c01d562f581e8ec826c8b1e31db6bb9548f2d1f5d9b2b73d79096c4fbe2f5ef1edd1074265dc846a2caa5e4226216 SHA512 f516d50df77b38d5378a7480557103f2447a1766912600fedbbef63fa74b212712c63d421a227b951a0e6bd384e63933051ffe3a32cf0466857558cc51e2dd52
 EBUILD greybird-3.22.9.ebuild 1338 BLAKE2B 74a2d975b43c6a238490c55c046f895e7f6c01d562f581e8ec826c8b1e31db6bb9548f2d1f5d9b2b73d79096c4fbe2f5ef1edd1074265dc846a2caa5e4226216 SHA512 f516d50df77b38d5378a7480557103f2447a1766912600fedbbef63fa74b212712c63d421a227b951a0e6bd384e63933051ffe3a32cf0466857558cc51e2dd52
 EBUILD greybird-9999.ebuild 1263 BLAKE2B 10623ef97f49b0608dcbee136b273d5c56de5b4cf60c4d349f301a629127f15279b0d448cef72e2090cfd84b8bce2df90ec780d062171b7dd0cacee54586482a SHA512 0886455ee850ad11ad1b8f9b889a759abfde9e5b9737b8f3621c347d813652f69f22d9aeebb0e500fcbc6a65d511c8db64b8202e2c4bb28029ccd0579da9f480
 MISC metadata.xml 437 BLAKE2B 2c6f93604ac1c8b907f31e1a3ac813c13fd72a97bd0ecd5071c61d9729d05de4bb7dd1f4f35c1af2fd8c48beb674534d58a9b40e4b441ba75ca1210cb88b4a3a SHA512 06ee186a69379acc1e8dc3b353e3a86c4a914a1c529d9148eda9f9b11887d58183dc24da8a600fb37252f806d9703a9dc37b14ee7b080204d89d53c3d940193e
diff --git a/x11-themes/greybird/greybird-3.22.10.ebuild b/x11-themes/greybird/greybird-3.22.10.ebuild
new file mode 100644
index 000000000000..7d775459b57c
--- /dev/null
+++ b/x11-themes/greybird/greybird-3.22.10.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_PN=${PN/g/G}
+
+DESCRIPTION="The default theme from Xubuntu"
+HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
+SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
+LICENSE="CC-BY-SA-3.0 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ayatana gnome xfce"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.22:3
+	>=x11-themes/gtk-engines-murrine-0.90
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/sassc
+	dev-libs/glib:2
+	dev-ruby/sass:3.5
+"
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	pushd "${ED}"/usr/share/themes/${MY_PN} > /dev/null || die
+	use ayatana || rm -rf unity
+	use gnome || rm -rf metacity-1
+	use xfce || rm -rf xfce* xfwm4*
+	popd > /dev/null || die
+}
+
+pkg_postinst() {
+	if ! has_version x11-themes/elementary-xfce-icon-theme ; then
+		elog "For upstream's default icon theme, please emerge"
+		elog "x11-themes/elementary-xfce-icon-theme"
+	fi
+	if ! has_version x11-themes/vanilla-dmz-xcursors ; then
+		elog "For upstream's default cursor theme, please emerge"
+		elog "x11-themes/vanilla-dmz-xcursors"
+	fi
+}
diff --git a/x11-themes/greybird/greybird-3.22.8.ebuild b/x11-themes/greybird/greybird-3.22.8.ebuild
deleted file mode 100644
index aa8b49e170fd..000000000000
--- a/x11-themes/greybird/greybird-3.22.8.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
-inherit autotools
-
-MY_PN=${PN/g/G}
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
-LICENSE="CC-BY-SA-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="ayatana gnome"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.22:3
-	>=x11-themes/gtk-engines-murrine-0.90
-"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	dev-ruby/sass:3.5
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-#RESTRICT="binchecks strip"
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	pushd "${ED}"usr/share/themes/${MY_PN} > /dev/null || die
-	use ayatana || rm -rf unity
-	use gnome || rm -rf metacity-1
-	popd > /dev/null || die
-}
-
-pkg_postinst() {
-	if ! has_version x11-themes/elementary-xfce-icon-theme ; then
-		elog "For upstream's default icon theme, please emerge"
-		elog "x11-themes/elementary-xfce-icon-theme"
-	fi
-	if ! has_version x11-themes/vanilla-dmz-xcursors ; then
-		elog "For upstream's default cursor theme, please emerge"
-		elog "x11-themes/vanilla-dmz-xcursors"
-	fi
-}
diff --git a/x11-themes/gtk-engines-rezlooks/Manifest b/x11-themes/gtk-engines-rezlooks/Manifest
index 9f23ef8820ea..9dde701cb3af 100644
--- a/x11-themes/gtk-engines-rezlooks/Manifest
+++ b/x11-themes/gtk-engines-rezlooks/Manifest
@@ -1,4 +1,5 @@
-AUX gtk-engines-rezlooks-0.6-glib-single-include.patch 329 BLAKE2B 5eba0964ee33c104904671393ad493df89c977e0ac8760da6d8677d21b22304c2c77d05e3f10323d2f5f9a6e35860e6d77fb0cfa36c1192d0af6de86e869841e SHA512 e75a797605909a1f10b37d026b03df9248431ced764beb8faf9fac4d1d8758feeece8c6bce58066c79a35c1aad2d2c98f35bfb823e2b67533645d93a88d32cb4
+AUX gtk-engines-rezlooks-0.6-glib-single-include.patch 198 BLAKE2B 1008d5bb3af370d03428b593b3a1d7b6851ad8f2088a0d5b109fcf47a72d09c944517799d8ebdce76e1510ca7c2458484d3d79e2efed89a7f74bbd84e011cccd SHA512 0a91046c290072fe75fbc62f67e1f50a60a992a10c871a2f8909bf2a28d91b8439e0cde8bbaffd7d8ec3e7f21178d7bd67e74f8167cbf123830425fbb3e30a05
 DIST 39179-rezlooks-0.6.tar.gz 290016 BLAKE2B d6d713ee2ebe24c8fe1259cde41c2a6f7db75c0351bde99d3e4347cd0c74403893107806dd047e1807ef8f0817b67667927d4e6203180dbe59b2493a1bcc9979 SHA512 98b1eda414c5a33f1357d408aa4bd4b01c140afed0981941004db81d34f8f76c0bd49434009b776eb8f9adb24bfce9f22b72fb463200401409caba8effd3f0bd
+EBUILD gtk-engines-rezlooks-0.6-r1.ebuild 960 BLAKE2B f0cedb1f4ca39a76e6512791f48ac8a55f31ea614bf59b0856f176fc15e6f9a9acc8a116884cb94349a2da539cd9097dd9b50212d94155aa61045a26623659dd SHA512 35ad8c494287d5e3b19f3a618cf5fce4f790599f2c131e73336ad7e6154577f6e521027590288f0c618f5af0b97b24a1b47e78de4e61cfda21c7ce3b189f75fb
 EBUILD gtk-engines-rezlooks-0.6.ebuild 998 BLAKE2B 6e7da8965fea3553c17dcac39fae91bfa0102acc07475c50a577855570f22b382d5c07cff899f6210479bcd6aa97fd19475122478ac00f9945ceec42a54e17f1 SHA512 678a4df7104d649a6e5ea5d5428c33dbd45f159229800e88d261981b2fb8fd13e45e0936fcb4971c50a5bdcbab44ceac13e74fd94a125dc142f9cb071803e32d
 MISC metadata.xml 404 BLAKE2B 51d32e00ae6e7368399cb1724e10d8c3c9c340fd6460c26eee80eefc2c43b4616b9e5ac7c9c0034cb430bb0ec90ed26c6ea57abb24e5123717d564a03e7eb279 SHA512 86358b1175dda7c2e0f69595eff87dd58c448eba3ccad9136f44b19e428c7abe0cabaf4ec250f1962eba36feb3946aa2382420743f8f7bc178252ae5c15a4577
diff --git a/x11-themes/gtk-engines-rezlooks/files/gtk-engines-rezlooks-0.6-glib-single-include.patch b/x11-themes/gtk-engines-rezlooks/files/gtk-engines-rezlooks-0.6-glib-single-include.patch
index 340bd046fb0e..d9b035ac53b3 100644
--- a/x11-themes/gtk-engines-rezlooks/files/gtk-engines-rezlooks-0.6-glib-single-include.patch
+++ b/x11-themes/gtk-engines-rezlooks/files/gtk-engines-rezlooks-0.6-glib-single-include.patch
@@ -1,7 +1,5 @@
-Index: rezlooks-0.6/src/animation.c
-===================================================================
---- rezlooks-0.6.orig/src/animation.c
-+++ rezlooks-0.6/src/animation.c
+--- a/src/animation.c
++++ b/src/animation.c
 @@ -7,7 +7,7 @@
  #include "animation.h"
  
diff --git a/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r1.ebuild b/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r1.ebuild
new file mode 100644
index 000000000000..2cc642b0031a
--- /dev/null
+++ b/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Rezlooks GTK+ Engine"
+HOMEPAGE="https://www.gnome-look.org/content/show.php?content=39179"
+SRC_URI="https://www.gnome-look.org/content/files/39179-rezlooks-0.6.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.8:2
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6-glib-single-include.patch
+)
+S=${WORKDIR}/rezlooks-${PV}
+
+src_prepare() {
+	default
+
+	# automake complains: ChangeLog missing. There however is a Changelog.
+	# to avoid problems with case insensitive fs, move somewhere else first.
+	mv Changelog{,.1} || die
+	mv Changelog.1 ChangeLog || die
+
+	eautoreconf # required for interix
+}
+
+src_configure() {
+	econf --enable-animation
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/x11-themes/numix-icon-theme-circle/Manifest b/x11-themes/numix-icon-theme-circle/Manifest
index 7971f715c0fb..bd073d1be7f6 100644
--- a/x11-themes/numix-icon-theme-circle/Manifest
+++ b/x11-themes/numix-icon-theme-circle/Manifest
@@ -17,5 +17,5 @@ EBUILD numix-icon-theme-circle-19.02.07.ebuild 653 BLAKE2B 797c9df13d53cbd894126
 EBUILD numix-icon-theme-circle-19.02.22.ebuild 653 BLAKE2B 797c9df13d53cbd8941269a33bdc9deb8b4bfd3d9030c1114c638cd3dcdca8ea6e027a0164f9434a20faf657667992428a421b90f22a15727e1587074a89cc5d SHA512 db7bdd66e6a1f663ffb788b1a6060d6d0c026a4fa6f9612aa9bdb115cab72bddb3d55a291ef73dbbd4478c787eecd797ad2681bd601f6d151efed5f9b2a7b4ee
 EBUILD numix-icon-theme-circle-19.03.20.ebuild 653 BLAKE2B 797c9df13d53cbd8941269a33bdc9deb8b4bfd3d9030c1114c638cd3dcdca8ea6e027a0164f9434a20faf657667992428a421b90f22a15727e1587074a89cc5d SHA512 db7bdd66e6a1f663ffb788b1a6060d6d0c026a4fa6f9612aa9bdb115cab72bddb3d55a291ef73dbbd4478c787eecd797ad2681bd601f6d151efed5f9b2a7b4ee
 EBUILD numix-icon-theme-circle-19.04.15.ebuild 653 BLAKE2B 797c9df13d53cbd8941269a33bdc9deb8b4bfd3d9030c1114c638cd3dcdca8ea6e027a0164f9434a20faf657667992428a421b90f22a15727e1587074a89cc5d SHA512 db7bdd66e6a1f663ffb788b1a6060d6d0c026a4fa6f9612aa9bdb115cab72bddb3d55a291ef73dbbd4478c787eecd797ad2681bd601f6d151efed5f9b2a7b4ee
-EBUILD numix-icon-theme-circle-19.05.07.ebuild 655 BLAKE2B 8d544960483a02ee55c7b58ff027fbea3c995ef558acdb18f505c582e1e2056a921ff7edd52c675346feecd314e603c7ff9df668227a5766f0550d8f0442adee SHA512 f3e25bde3e6afa629bd65aee679d3cb4ce8e463ed2a6a6aebd1dbf81068cb2e052243a18e8c03154ab0f00c32b8b064045a577fb938514e32e4644e869b36e37
+EBUILD numix-icon-theme-circle-19.05.07.ebuild 653 BLAKE2B 797c9df13d53cbd8941269a33bdc9deb8b4bfd3d9030c1114c638cd3dcdca8ea6e027a0164f9434a20faf657667992428a421b90f22a15727e1587074a89cc5d SHA512 db7bdd66e6a1f663ffb788b1a6060d6d0c026a4fa6f9612aa9bdb115cab72bddb3d55a291ef73dbbd4478c787eecd797ad2681bd601f6d151efed5f9b2a7b4ee
 MISC metadata.xml 341 BLAKE2B e5184c4dd30e2cb0aa7d87a8aab5cc9886b6f3ef0351bbaedefa7565231dc7933c4c37958bc5f4ede9286ae795edf16896576274882156b998b70bfd4b34d293 SHA512 a013dcf5530f09aac85d3098dc08eee4746f0a25439cdecf2824209177cf9a05759602bb5b3f5d7118ccf9e8c8e234fc7fc99d089c9f4749945b4c6b438374e9
diff --git a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-19.05.07.ebuild b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-19.05.07.ebuild
index e552e442f10f..d88f88cffa05 100644
--- a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-19.05.07.ebuild
+++ b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-19.05.07.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/numixproject/numix-icon-theme-circle/archive/${PV}.t
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="x11-themes/numix-icon-theme"
 RDEPEND="${DEPEND}"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 77cb5fee67a0..0bf020a76805 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index 7d71858bb4de..2fd1bb0ca35a 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -1,7 +1,6 @@
 AUX bspwm-session 1876 BLAKE2B 8e1a9eaf2a1721d2b6272b6f0e1f9692fbab8b94aacf2dd52db7dc4ebd97189d36f6d464e588c06084fd433f16901576ea9f682dd54858b7780a9c8732767fdd SHA512 04d89bdd5ca5a9163e576c41dee9420fff8c51ab4a53aca179060b9f6b348537ad96d4257964e7bc4422d836a21c52f82fdc30a6b7b07c229c9934d7620d90ee
-DIST bspwm-0.9.5.tar.gz 106893 BLAKE2B 6059fd31cb4d4ee262f5a60bac9d21efb61b55e2f47785310e5101abb77023307ff0b9e858701f9558e1e8980905bf323fb310e426c714cf05f09251947c19a3 SHA512 7f50caca3b049f7401f4db8c9d1a9a2d098a3d67a3f8fe87d433c14ad1d0443be9ed4296163628fd7180614d340b672350e02538f36d0e812418aafaef16ba09
 DIST bspwm-0.9.7.tar.gz 110956 BLAKE2B 75fb711d9c2fa519ff88faea20b1e74f562c1fa207dfe18990d6131b859ad06c15c92f2352e9e045d8b634fd8f15c3758501044107be6aa4d09bba5c3ab4ee2f SHA512 57115cd3ea9eea7a50a3dc26497354355c86b6dd86136c1899cc58bbefa228104eb292bdecf5f9eac5203d3eb326457e35dc9bedc5f18ec3e3c178dd3ca9926a
-EBUILD bspwm-0.9.5.ebuild 956 BLAKE2B b3f3a540952e78128abffcf7e58185e5816706918027e98fc204490388fb6418ef24ee575c5246140e11c608ef364e6c9a0827effa3a7eb8c859337efafdfbe1 SHA512 962e64f7418f45264cc295cc08dc59d21f9d87b05a4c0ef4d17d6d7c8475fea32af1c83a04060b9befb66feaa5a72f12a9ec0e09690bd84e0f5a416a5242db11
+DIST bspwm-0.9.9.tar.gz 111119 BLAKE2B b4f80f090582c48ff5322bf6b03db5aee5bab1868b39ee3c4a3ca9f46f0f5d243a94bd869f2c91dcfbca22136c632b4fa0a2dee0e5fd2f27bd170b1f85c69545 SHA512 17f70e44667813fafcf0df144ed211df5a4479af6dfaf6e0a6bb7154a7380fa48d6135e8c440b6202d07012b76ac7372f73d4bf2f0c3a6716ed998d2ee4e59a2
 EBUILD bspwm-0.9.7-r1.ebuild 947 BLAKE2B 6056a3e0a90d66d4e9a33d2e52eda3f106deba13ab40acc6598981e6822938e694321fe1cc9fd70eb2d7ba9744b96b9f6fabbbaefdf25979dc27c46d1c4cafbd SHA512 20a3df368a673ed89a8acd7906777d154ef73767cb76a729967e2e9839ec5374407094fc6be9b6dfbf7e825c84d5289ec2f81d35be5422e2de9bb24c4a79b785
-EBUILD bspwm-0.9.7.ebuild 953 BLAKE2B f2a039d7f2eb2d7e5f15bb3bcaef272f7651541800d0424fe9807b2e7614be0d5ceceb6e70e8106cee176b4c97a98a8436508e66f6f5a438e42127eedd94a58c SHA512 916613740a14267e5f94101268ca447bac8c8c25c298ca78b9429fb4dab8adc0d8541a181680b5e8d55e7c4aa8f6568baa23967d81f460092e2bd9967886b961
+EBUILD bspwm-0.9.9.ebuild 947 BLAKE2B 6056a3e0a90d66d4e9a33d2e52eda3f106deba13ab40acc6598981e6822938e694321fe1cc9fd70eb2d7ba9744b96b9f6fabbbaefdf25979dc27c46d1c4cafbd SHA512 20a3df368a673ed89a8acd7906777d154ef73767cb76a729967e2e9839ec5374407094fc6be9b6dfbf7e825c84d5289ec2f81d35be5422e2de9bb24c4a79b785
 MISC metadata.xml 328 BLAKE2B 1c5c86ed67692883d5ed15aad9fb2c773ebe1aab0419c49328630b37577fbf40e7c2cbbecd39551fd702b38fdbfa8c937d78abf6ab4eaf467649ee0af3f52cd3 SHA512 8dccf071f4e82f331d91713b0062c56161b945202da88386c1c21d7f4bb8363ad4b8c164542ad9b68c89b2eb408b8d67a88a322554ccdcc99ccdc046448eba8b
diff --git a/x11-wm/bspwm/bspwm-0.9.5.ebuild b/x11-wm/bspwm/bspwm-0.9.5.ebuild
deleted file mode 100644
index db690abde824..000000000000
--- a/x11-wm/bspwm/bspwm-0.9.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Tiling window manager based on binary space partitioning"
-HOMEPAGE="https://github.com/baskerville/bspwm/"
-SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-"
-RDEPEND="${DEPEND}
-	x11-misc/sxhkd
-"
-
-src_compile() {
-	emake PREFIX=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc doc/{CONTRIBUTING,MISC,TODO}.md
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-
-	insinto /usr/share/xsessions
-	doins contrib/freedesktop/bspwm.desktop
-
-	insinto /etc/xdg/sxhkd
-	doins examples/sxhkdrc
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/x11-wm/bspwm/bspwm-0.9.7.ebuild b/x11-wm/bspwm/bspwm-0.9.7.ebuild
deleted file mode 100644
index 8b132d0fe0a7..000000000000
--- a/x11-wm/bspwm/bspwm-0.9.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Tiling window manager based on binary space partitioning"
-HOMEPAGE="https://github.com/baskerville/bspwm/"
-SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-"
-RDEPEND="${DEPEND}
-	x11-misc/sxhkd
-"
-
-src_compile() {
-	emake PREFIX=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc doc/{CONTRIBUTING,MISC,TODO}.md
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-
-	insinto /usr/share/xsessions
-	doins contrib/freedesktop/bspwm.desktop
-
-	insinto /etc/xdg/sxhkd
-	doins examples/sxhkdrc
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/x11-wm/bspwm/bspwm-0.9.9.ebuild b/x11-wm/bspwm/bspwm-0.9.9.ebuild
new file mode 100644
index 000000000000..484d61f26f28
--- /dev/null
+++ b/x11-wm/bspwm/bspwm-0.9.9.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Tiling window manager based on binary space partitioning"
+HOMEPAGE="https://github.com/baskerville/bspwm/"
+SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+"
+RDEPEND="${DEPEND}
+	x11-misc/sxhkd
+"
+
+src_compile() {
+	emake PREFIX=/usr CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr DOCPREFIX="/usr/share/doc/${PF}" install
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN}
+
+	insinto /usr/share/xsessions
+	doins contrib/freedesktop/bspwm.desktop
+
+	insinto /etc/xdg/sxhkd
+	doins examples/sxhkdrc
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index 3155340b0371..c2183ece815d 100644
--- a/x11-wm/e16/Manifest
+++ b/x11-wm/e16/Manifest
@@ -1,4 +1,6 @@
 AUX e16-user-fonts.patch 412 BLAKE2B c3b7e6b0599eb511afe9c6f969f5c529313be2732e4cad2a772c9860427eaf84eb1083fb10ff28853c19a972f734f0b231e78d4862ce5246d9d3bdde6e532c96 SHA512 6fdcbe6191d93cc5c64efb6039cbe9409fd08734a4c99c29482bde06f044b1e6b88c35ef34dc65ce384ecdfb78883022a18885dde6e1bac8ca8192d5f6901c42
 DIST e16-1.0.19.tar.xz 1433016 BLAKE2B 9c27dd6a8d78d2f765b495e5398041a30bf939a5d3926f9f07e022c9bbbc70716b072e40beb6592159f896cc7a15e2fd4e25c8a07db333a80fc8156a82dce357 SHA512 9dc66a4224eacde92c567f9f5b029f21543675207b782077e25f3082ef2133a547eb955fc877b01b2200d99c26148f54a6b59f1ba191163760ecf3b32d5dd374
+DIST e16-1.0.20.tar.xz 1438516 BLAKE2B 32800ed079eb3c51c34277fa5d49ef7a892c0ccd5956f5f7eb7c34ab2e223fe7a5033b35d53402fa4a18283261a767ac692a5bfa08b46d5ea2a4e5195c656fed SHA512 798225dcfad266febe0911aeeac1a57256c45071e72ed326ae2081efdcf0d110e951f41badf5ece92dd0a40f5e342f80035e46d3c2435eb2f32a08c556893612
 EBUILD e16-1.0.19.ebuild 2890 BLAKE2B bbabc819922d8f4174e44bb53d3e7c68cf3fcd390f08c276a8b06f8506ebdf4b7b3b05334096343c8797acd235222e9de93bf32dc69dd7876f873ed93e6fe841 SHA512 de0d6644a1a998df765d6e827a48c24041eb3d460ddd8a453b1b043ab8fa9e9337e3e2bd8e3a7ec0466bf8efcc637c3ff0f4d4f87c72e026140186b6d44ce6d4
+EBUILD e16-1.0.20.ebuild 2934 BLAKE2B 74bb369190c166513dbb7d918ed657f840a21dd1f849b71e1d7b1bed716d9052cc921edf9b052984c42253889d222c3c8dbdd6856a08e4eec6b495bcd0f0193d SHA512 307eb6d0b721a77eb790475f1da9fbdc72829f9c0efe9bb9701b5add6842e2c869ce01a31c9bfa489805c7ba1c04626a3fe2040642e926ddcc46faad8de879ea
 MISC metadata.xml 1752 BLAKE2B 49a4d0adb7affcaf5d0f5156bc89057b701ea2ed9c469e3e3ff37720624e5d4f3740934b52537902148e7bde019c04d9b5b41ab341a24447fc3caf1394da4459 SHA512 dc40df2c5cc12d8d59d8446f3cb3195ce9f0ec988ba913f6fb6e3cac429fbe1151432226e170e260aa8e61d08cac13d7bf7f191a1fa845c101e0124df82b9ebd
diff --git a/x11-wm/e16/e16-1.0.20.ebuild b/x11-wm/e16/e16-1.0.20.ebuild
new file mode 100644
index 000000000000..5d940a12f3f6
--- /dev/null
+++ b/x11-wm/e16/e16-1.0.20.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Enlightenment Window Manager (E16)"
+HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/"
+SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="audiofile container dbus debug +dialogs doc examples gnome
+libhack modules nls opengl +pango sndfile sound +themes xcomposite
++xft xi2 xinerama xpresent +xrandr +xrender +xsm +xsync zoom"
+
+REQUIRED_USE="
+	audiofile? ( sound )
+	opengl? ( xcomposite )
+	sndfile? ( sound )
+	sound? ( ^^ ( sndfile audiofile ) )
+"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	media-libs/freetype:2
+	media-libs/imlib2[X]
+	virtual/libiconv
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-misc/xbitmaps
+	dbus? ( sys-apps/dbus )
+	opengl? (
+		media-libs/glu
+		media-libs/mesa
+	)
+	pango? (
+		dev-libs/glib:2
+		x11-libs/pango[X]
+	)
+	sound? (
+		|| (
+			media-sound/apulse[sdk]
+			media-sound/pulseaudio
+		)
+		sndfile? ( media-libs/libsndfile )
+		audiofile? ( media-libs/audiofile:= )
+	)
+	xcomposite? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+	)
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpresent? ( x11-libs/libXpresent )
+	xrandr? ( x11-libs/libXrandr )
+	xrender? ( x11-libs/libXrender )
+	xsm? (
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	zoom? ( x11-libs/libXxf86vm )
+"
+RDEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/e16-docs )
+	nls? ( virtual/libintl )
+	themes? ( x11-themes/e16-themes )
+	!x11-wm/enlightenment:0
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+
+PATCHES=( "${FILESDIR}/${PN}-user-fonts.patch" )
+
+src_configure() {
+	local myconf=(
+		$(use_enable container)
+		$(use_enable dbus)
+		$(use_enable debug libtrip)
+		$(use_enable dialogs)
+		$(use_enable doc docs)
+		$(use_enable libhack)
+		$(use_enable modules)
+		$(use_enable nls)
+		$(use_enable opengl glx)
+		$(use_enable pango)
+		$(use_enable sound sound pulseaudio)
+		$(use_enable xcomposite composite)
+		$(use_enable xft)
+		$(use_enable xi2)
+		$(use_enable xinerama)
+		$(use_enable xpresent)
+		$(use_enable xrandr)
+		$(use_enable xrender)
+		$(use_enable xsm sm)
+		$(use_enable xsync)
+		$(use_enable zoom)
+		$(use_with audiofile sndldr audiofile)
+		$(use_with gnome gnome gnome3)
+		$(use_with sndfile sndldr sndfile)
+		--enable-mans
+		--disable-docs
+		--disable-esdtest
+		--disable-gcc-cpp
+		--disable-hints-gnome
+		--disable-werror
+		--disable-xscrnsaver
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	docompress -x /usr/share/doc/${PF}/e16.html
+	dodoc COMPLIANCE docs/e16.html
+	use examples && dodoc -r sample-scripts
+}
+
+pkg_postinst() {
+	einfo "In order to use custom fonts, put them into ~/.e16/fonts/ and use"
+	einfo "appropriate names in ~/.e16/fonts.cfg. \"Use theme font configuration\""
+	einfo "in the Theme setting should be disabled for this to work."
+}
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 7152fed362f1..c43edabaef77 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,6 +1,7 @@
 AUX enlightenment-0.22.4-efl-1.22-wayland.patch 2288 BLAKE2B 6e8a9f4d47318372c06a74bb6e3c233c36f9e57332519e706602a0472285e0b249c45d3d6fbd3074d6d720f157b6ddcf1a37da60b60f52908ee0f006a9e11239 SHA512 7ba3e501d7df99aa3f0336c1db09edaf5b2acd9eb6d2ad4f8465d92c595edd2b85e6a16c1408dc75502d73778cd2634ce2f409319887f6e53707208cd4128335
 AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
 DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba
-EBUILD enlightenment-0.22.4-r1.ebuild 2202 BLAKE2B 452b356c54a8f77a1cc81b8ec7cd9417f62c19a836c7ca2e1c3896ecdce46134c866c50d7ac033fa335a80f9622318fcf8c90185705292124eed3562dd8029f2 SHA512 b2388a95bb84e8e63ba500514360d144549816125465a33b1494f1f6a3ac6a4804d41672017d6df9dae440e37f4c38e030214254447167c5edf30001a6cca1a3
-EBUILD enlightenment-0.22.4.ebuild 2188 BLAKE2B e5edf01ab49f61a0318e0669f9193482bd713e3bdae5167f73d69d1eedfd3f233dec84f02711fbc39f59d3ef592ff1c1406ea605ed2f541e55a913c35f6ff8b6 SHA512 6082de94db744272db7ea7f767b6c3ef5d4320cabdd65c724248f17ba995c4ca9d914374101b6449a201275adc20ad4d580d59f40b3bdab4e853559467869a78
+DIST enlightenment-0.23.0.tar.xz 26425732 BLAKE2B 2b0bd2f27f5589eb4fa9e1cdd0f2713db26eef36ac204f666dded8a07e91edd260192d413b88e82609c700a71a3459defe8dcae6b778601473c32565799c15c8 SHA512 e49ed9d1d1725cbfd488eb654c3fbe60700382e26136d568b23452cff0112c49953633fd7ac9df7b64f910d37679681b2b9b417d710f46608e97c4060362c7d8
+EBUILD enlightenment-0.22.4-r1.ebuild 2200 BLAKE2B ec7e475f9a23d34b0505fd4e17d105e46f5ff678c9f886458a7b80cfa04e40545435105c495e6d8842a5d89b26babf6ae4d29215d99386d8870eb06952a668b0 SHA512 d538a3ebe011b66d0c81c0f18a3614a418d39f19c43ae30d1991af447eda682a1198437589914561c7367c60b3239e0f7b3504277cad4c770bb1172e152e9fbb
+EBUILD enlightenment-0.23.0.ebuild 2714 BLAKE2B f48e6fdccc7aa0059aad47a0c2f97c59c0e31f56b51b6d7ad2b8f0bf8d5e3f8d63899ffd17e87bbc9eb33f8e115a1c9b7ec2b33a8585e642ab4ec1a5aa760b95 SHA512 7da0ee6376955274ca05abb0717f43371056a387d563614a59de457b4db99cbc12e9935327dddf0293e2cca64edeb9e1eb25316a9110082ce1097b759fafc290
 MISC metadata.xml 802 BLAKE2B b7b4f3531b89d5aa743c0153171fc9c36e732ba609eb7703961fd65780c59662ebf796cd7c822ab3cfeed7198fbf4fe8f9b481755f6ac5792729f30e4cc13c6c SHA512 4634f5d13c9f6ae6a7ddeb2c50e8882fac00ac17de37e8eabc24d5edd2470a5e35ffcf21a885be572d1d55f12610eb7496b39a29aad5b3d5f48e67ec26be884b
diff --git a/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild
index 99d2165d2e07..f94da2d87cbc 100644
--- a/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0.17/${PV%%_*}"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland"
 
 REQUIRED_USE="xwayland? ( wayland )"
diff --git a/x11-wm/enlightenment/enlightenment-0.22.4.ebuild b/x11-wm/enlightenment/enlightenment-0.22.4.ebuild
deleted file mode 100644
index 61ce22391698..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.22.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson xdg-utils
-
-DESCRIPTION="Enlightenment window manager"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0.17/${PV%%_*}"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi"
-
-RDEPEND="
-	>=dev-libs/efl-1.20.5[eet,X]
-	virtual/udev
-	x11-libs/libXext
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	x11-misc/xkeyboard-config
-	acpi? ( sys-power/acpid )
-	bluetooth? ( net-wireless/bluez )
-	connman? ( dev-libs/efl[connman] )
-	geolocation? ( app-misc/geoclue:2.0 )
-	packagekit? ( app-admin/packagekit-base )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-	udisks? ( sys-fs/udisks:2 )
-	wayland? (
-		>=dev-libs/efl-1.21.0[drm,wayland]
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-		x11-libs/pixman
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-D device-udev=true
-		-D install-sysactions=false
-		-D mount-udisks=$(usex udisks true false)
-		-D bluez4=$(usex bluetooth true false)
-		-D connman=$(usex connman true false)
-		-D geolocation=$(usex geolocation true false)
-		-D nls=$(usex nls true false)
-		-D packagekit=$(usex packagekit true false)
-		-D pam=$(usex pam true false)
-		-D systemd=$(usex systemd true false)
-		-D wayland=$(usex wayland true false)
-		-D wireless=$(usex wifi true false)
-	)
-
-	if ! use wayland; then
-		emesonargs+=(
-			-D wl-buffer=false
-			-D wl-desktop-shell=false
-			-D wl-drm=false
-			-D wl-text-input=false
-			-D wl-weekeyboard=false
-			-D wl-wl=false
-			-D wl-x11=false
-			-D xwayland=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	insinto /etc/enlightenment
-	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
-
-	if use doc; then
-		local HTML_DOCS=( doc/. )
-	fi
-
-	meson_src_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-wm/enlightenment/enlightenment-0.23.0.ebuild b/x11-wm/enlightenment/enlightenment-0.23.0.ebuild
new file mode 100644
index 000000000000..d3c781b0cb83
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.23.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils meson xdg-utils
+
+DESCRIPTION="Enlightenment window manager"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0.17/${PV%%_*}"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland"
+
+REQUIRED_USE="xwayland? ( wayland )"
+
+RDEPEND="
+	>=dev-libs/efl-1.22.3[eet,X]
+	virtual/udev
+	x11-libs/libXext
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	x11-misc/xkeyboard-config
+	acpi? ( sys-power/acpid )
+	bluetooth? ( net-wireless/bluez )
+	connman? ( dev-libs/efl[connman] )
+	geolocation? ( app-misc/geoclue:2.0 )
+	packagekit? ( app-admin/packagekit-base )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd )
+	udisks? ( sys-fs/udisks:2 )
+	wayland? (
+		>=dev-libs/efl-1.22.0[drm,wayland]
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+		x11-libs/pixman
+	)
+	xwayland? (
+		dev-libs/efl[X,wayland]
+		x11-base/xorg-server[wayland]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-D device-udev=true
+		-D install-enlightenment-menu=true
+
+		-D bluez4=false
+		-D install-sysactions=false
+		-D mount-eeze=false
+
+		$(meson_use udisks mount-udisks)
+		$(meson_use bluetooth bluez5)
+		$(meson_use connman)
+		$(meson_use geolocation)
+		$(meson_use nls)
+		$(meson_use packagekit)
+		$(meson_use pam)
+		$(meson_use systemd)
+		$(meson_use wayland wl)
+		$(meson_use wifi wireless)
+		$(meson_use xwayland)
+	)
+
+	if ! use wayland; then
+		emesonargs+=(
+			-D wl-buffer=false
+			-D wl-desktop-shell=false
+			-D wl-drm=false
+			-D wl-text-input=false
+			-D wl-weekeyboard=false
+			-D wl-wl=false
+			-D wl-x11=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	insinto /etc/enlightenment
+	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
+
+	use doc && local HTML_DOCS=( doc/. )
+	meson_src_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	einfo "Additional programs to complete full EFL suite: "
+	optfeature "an EFL-based IDE" dev-util/edi
+	optfeature "image viewer" media-gfx/ephoto
+	optfeature "ConnMan user interface for Enlightenment" net-misc/econnman
+	optfeature "system and process monitor" sys-process/evisum
+	optfeature "downloading themes and add-ons" x11-misc/enlightenment-extra
+	optfeature "feature rich terminal emulator" x11-terms/terminology
+	optfeature "a matching GTK theme" x11-themes/e-gtk-theme
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index dd8f813de976..e2076ef794e2 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,10 +1,6 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
-AUX icewm-1.3.10-menu.patch 821 BLAKE2B 2274136f91b891c971a84f80c3ace49f4c3e5245ae0de83408219575a25dc1cb42523459a923634ab25565fdafe1b5320b955adbb1de4b3fda3c7613ba93d7ad SHA512 15ad0cd80fa358ef823ad747b873afab7ce07114590cba90710b91daa6421a8b8030c7ce7bd8af245c85983d75583c2701de85809de3059fe3e838e2f88f016e
-AUX icewm-1.3.8-uclibc.patch 1830 BLAKE2B 36037fcdadb7d70d1cc4125170c05e9800a2acca930148eeb091d084a4aca7f4813f452e3565aece03aca7d441755e958cd75a83c875f684beec335355ee7a16 SHA512 ed3abce7aabb21e5fb516f02a6860d140b2d74f288daf8a7edd14f8d70cd377f5bcf9b4172da4c8ca30b176c79e7500ba2c253004ca59a1ab6e9258b6b8a6f2e
-DIST icewm-1.4.2.tar.gz 1709850 BLAKE2B 1a9dde495345f1601b3ae901b3e98554b60a9b9a8e94b7079f3c766971eb31bde5a3cd3972f5c96d86b5e02e413811df2a0689efc15a461bca39a70842f3df69 SHA512 c01661a7b07b4f42a32b20ecc9e45fb1e9c84c27d33105ec165e75aa9ac84129d55e992cac0d53fb10298bae28bc93ef07f68e874c1c2fccd9adecceb987a872
-DIST icewm-1.5.4.tar.xz 1689668 BLAKE2B 19779e0b80da89ca5cdce3525a0f612b126e0e3d4c7569fe249ca78af7cc8ad16162361699d0a068f3394a2105f2afc1f7f644a02c7ad883469a9fa8c1fbf416 SHA512 7b5743872d328f937b49e2b79f7d6c0b8404326ef7e7a3b529c80138b36e8c2b30db79593125a8be76abe40282c779f79ca64b504f980ef2c87052448bdc076e
 DIST icewm-1.5.5.tar.xz 1707656 BLAKE2B 670ab4d1c1648faa24c848ddb04f3e353a3acd8e9a105837229d00ca344a61b3432d7b23b89dc054e220797cfd56d6504ad233d8793a3a5d95d9943c79017797 SHA512 5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e
-EBUILD icewm-1.4.2.ebuild 2438 BLAKE2B de1cc5ef5cf186aa332ebcef371fb562875469b8bbb0f96fe01fb2ac35c5f8272a1eb8ca385ea86210846e79a70eb4dec8911ab8297dc2fe414e7d3ea49e8652 SHA512 6d834977adb9680101d45e2a4cd665cc69f694d1419d1d9133e8ece382d0cfa55299039b12fab2585cf46f1853baa57c252f7f7cea39b3a72c47f7a100cb7894
-EBUILD icewm-1.5.4.ebuild 2343 BLAKE2B 3419d63e8de1b43c5d0560e7d1ad524bdbc7e005bd83c4d0c15b64dec959dcdbbd75c81b28d0396f93f0dc4dac9fff192f0ed52f4879e69330bd71c8e41513cf SHA512 d5d5c3e9d024aad9066fde6ba81fd5fe53dc1cf07f9128cb03bedea1bf1ed9b888d9a6473aac58e9372c4c8045792c1b5334f2dab7b550a3a35221456291485b
-EBUILD icewm-1.5.5.ebuild 2343 BLAKE2B 3419d63e8de1b43c5d0560e7d1ad524bdbc7e005bd83c4d0c15b64dec959dcdbbd75c81b28d0396f93f0dc4dac9fff192f0ed52f4879e69330bd71c8e41513cf SHA512 d5d5c3e9d024aad9066fde6ba81fd5fe53dc1cf07f9128cb03bedea1bf1ed9b888d9a6473aac58e9372c4c8045792c1b5334f2dab7b550a3a35221456291485b
+DIST icewm-1.6.1.tar.lz 1651274 BLAKE2B 85c3bda7bacf8f2e1e6ed250fc1b66d151bb030118c56300fc2ce9ad1a54c8693c3e0f83c81cec1f1878f0c0b300c25ac78bdb6440e235877a18586e07601de3 SHA512 dfc221d9afa6c7949dda983c06bdac5527f8cdb93dd20babdc1de75a7ab6cf9b3b1fe8e8d617cb70bd93ebe9aec70ac419d915b76b564b31dbec42b57d6f6011
+EBUILD icewm-1.5.5.ebuild 2339 BLAKE2B bebb46e2f8508227fa060a88d4afe147fa81c876ed3c615d80080cfec6bcf16ee25592750aa9180073396969e421f5952e84200812e5f7f49d278be46acf01f4 SHA512 bb10e88ae08956a7637d3ce9481c7a48dd64d775723dd1c06f69e44f1fb352f21de655e5bac82ee9a1f2b31132c4e2292169493c6b7dc9846cf7538af4801403
+EBUILD icewm-1.6.1.ebuild 2358 BLAKE2B eee40d6e1337a04b341e597f499575186d2384c70962153dd7845d24e79ea05014fa73e8ce2c089ed4120d3edabae93c4158e71d91bfa4a77d7b603f9511be60 SHA512 ce7fae5d81b38c904b5f3b67636f69c42e251fcf62bee1a776c8ed706efd4f64ce458d6e2735369a9346763d026919124fc5a3566a6f422538946be008186e5c
 MISC metadata.xml 671 BLAKE2B f58cf53a373b1ba887cf376f5fc676b6d533348f186550a55961ac3d77a1867d8302759a83f69a3c8d757d16dcd2b0e4e7fdf52f485575d92a9d3b93fab3c463 SHA512 ea3df07996cdff6f369609a827cb4b23a6d2e3858fabc7fd9e85e382db7a53e0ca3dbe4ca50359c333b93372671e7c8753d2e7f40d1dfe6cd06c4714acf4ab9e
diff --git a/x11-wm/icewm/files/icewm-1.3.10-menu.patch b/x11-wm/icewm/files/icewm-1.3.10-menu.patch
deleted file mode 100644
index 721a15d25ee3..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.10-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- icewm-1.3.10/lib/menu.in
-+++ icewm-1.3.10/lib/menu.in
-@@ -4,14 +4,9 @@
- # since modifications to this file will be discarded when you
- # (re)install icewm.
- #
--prog xterm xterm xterm
--prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
--prog fte fte fte
--prog NEdit nedit nedit
--prog Mozilla mozilla mozilla
--prog XChat xchat xchat
--prog Gimp gimp gimp
-+prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
-+"Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
- separator
--menuprog "Desktop Apps" folder icewm-menu-fdo
--menufile Programs folder programs
--menufile Tool_bar folder toolbar
-+prog "Rebuild program menu" /usr/share/icons/gnome/16x16/actions/edit-find-replace.png /usr/share/icewm/startup
-+separator
-+menufile Programs folder programs.autogen
diff --git a/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch b/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch
deleted file mode 100644
index e790842faed8..000000000000
--- a/x11-wm/icewm/files/icewm-1.3.8-uclibc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur icewm-1.3.7.orig/configure.in icewm-1.3.7/configure.in
---- icewm-1.3.7.orig/configure.in	2010-10-31 10:09:37.000000000 -0400
-+++ icewm-1.3.7/configure.in	2013-10-19 06:20:22.947520430 -0400
-@@ -113,6 +113,7 @@
- AC_CHECK_HEADERS(libgen.h)	dnl --  basename() for FreeBSD
- AC_CHECK_HEADERS(machine/apmvar.h)
- AC_CHECK_HEADERS(machine/apm_bios.h)
-+AC_CHECK_HEADERS(execinfo.h)
- 
- AC_CHECK_HEADERS(kstat.h,
-   [ CORE_LIBS="${CORE_LIBS} -lkstat"
-diff -Naur icewm-1.3.7.orig/src/acpustatus.cc icewm-1.3.7/src/acpustatus.cc
---- icewm-1.3.7.orig/src/acpustatus.cc	2010-10-31 10:09:36.000000000 -0400
-+++ icewm-1.3.7/src/acpustatus.cc	2013-10-19 06:20:18.355519888 -0400
-@@ -25,17 +25,12 @@
- #include "sysdep.h"
- #include "default.h"
- 
--#if defined(linux)
--//#include <linux/kernel.h>
--#include <sys/sysinfo.h>
--#endif
- #if defined(sun) && defined(SVR4)
- #include <sys/loadavg.h>
- #endif
- #ifdef HAVE_KSTAT_H
- #include <sys/resource.h>
- #include <kstat.h>
--#include <sys/sysinfo.h>
- #endif
- 
- #ifdef HAVE_SYS_PARAM_H
-@@ -56,6 +51,10 @@
- #include <dirent.h>
- #include "intl.h"
- 
-+#if defined(linux) || defined(HAVE_KSTAT_H)
-+#include <sys/sysinfo.h>
-+#endif
-+
- #if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(HAVE_SYSCTL_CP_TIME)
- 
- extern ref<YPixmap> taskbackPixmap;
-diff -Naur icewm-1.3.7.orig/src/misc.cc icewm-1.3.7/src/misc.cc
---- icewm-1.3.7.orig/src/misc.cc	2010-10-31 10:09:36.000000000 -0400
-+++ icewm-1.3.7/src/misc.cc	2013-10-19 06:20:22.947520430 -0400
-@@ -15,7 +15,7 @@
- #include <libgen.h>
- #endif
- 
--#ifdef linux
-+#if defined(linux) && defined(HAVE_EXECINFO_H)
- #include <execinfo.h>
- #endif
- 
-@@ -503,7 +503,7 @@
- }
- 
- void show_backtrace() {
--#ifdef linux
-+#if defined(linux) && defined(HAVE_EXECINFO_H)
-     const char head[] = "\nbacktrace:\n";
-     const char tail[] = "end\n";
-     void *array[20];
diff --git a/x11-wm/icewm/icewm-1.4.2.ebuild b/x11-wm/icewm/icewm-1.4.2.ebuild
deleted file mode 100644
index e3ae5642b7ff..000000000000
--- a/x11-wm/icewm/icewm-1.4.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="https://ice-wm.org/ https://github.com/bbidulock/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="bidi debug doc minimal nls truetype uclibc xinerama"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-#fix for icewm preversion package names
-S="${WORKDIR}/${P/_}"
-
-RDEPEND="
-	media-libs/fontconfig
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	doc? ( app-text/linuxdoc-tools )
-	nls? ( >=sys-devel/gettext-0.19.6 )
-	truetype? ( >=media-libs/freetype-2.0.9 )
-"
-
-pkg_setup() {
-	if use truetype && use minimal ; then
-		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
-		ewarn "If you really want a minimal install, you will have to turn off"
-		ewarn "the truetype flag for this package."
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.10-menu.patch
-)
-
-src_prepare() {
-	# Fix bug #486710
-	use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
-
-	default
-
-	if ! use doc ; then
-		sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-menus-gnome2
-		--with-libdir=/usr/share/icewm
-		--with-cfgdir=/etc/icewm
-		--with-docdir=/usr/share/doc/${PF}/html
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable xinerama)
-	)
-	if use truetype ; then
-		myconf+=(
-			--enable-gradients
-			--enable-shape
-			--enable-shaped-decorations
-		)
-	else
-		myconf+=(
-			--disable-xfreetype
-			--enable-corefonts
-			$(use_enable minimal lite)
-		)
-	fi
-
-	CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-}
-
-src_install(){
-	local DOCS=( AUTHORS BUGS CHANGES PLATFORMS README.md TODO VERSION )
-
-	default
-
-	if ! use doc ; then
-		cp doc/${PN}.man "${T}"/${PN}.1 || die
-		doman "${T}"/${PN}.1
-	fi
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-}
diff --git a/x11-wm/icewm/icewm-1.5.4.ebuild b/x11-wm/icewm/icewm-1.5.4.ebuild
deleted file mode 100644
index 1fb78abeecfd..000000000000
--- a/x11-wm/icewm/icewm-1.5.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.xz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="+alsa ao bidi debug nls truetype uclibc xinerama"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-REQUIRED_USE="|| ( alsa ao )"
-
-#fix for icewm preversion package names
-S="${WORKDIR}/${P/_}"
-
-RDEPEND="
-	media-libs/fontconfig
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	alsa? (
-		media-libs/alsa-lib
-		media-libs/libsndfile[alsa]
-	)
-	ao? (
-		media-libs/libao
-		media-libs/libsndfile
-	)
-	bidi? ( dev-libs/fribidi )
-	truetype? ( x11-libs/libXext )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	gnome-base/librsvg
-	x11-base/xorg-proto
-	truetype? ( >=media-libs/freetype-2.0.9 )
-"
-
-BDEPEND="
-	app-text/asciidoc
-	nls? ( >=sys-devel/gettext-0.19.6 )
-"
-
-src_prepare() {
-	# Fix bug #486710 - TODO: Still needed?
-	#use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local icesound
-	if use alsa && use ao ; then
-		icesound="alsa,ao"
-	elif use alsa ; then
-		icesound="alsa"
-	elif use ao ; then
-		icesound="ao"
-	fi
-
-	local myconf=(
-		--enable-gdk-pixbuf
-		--enable-logevents
-		--enable-xrandr
-		--enable-xrender
-		--with-cfgdir=/etc/icewm
-		--with-docdir=/usr/share/doc/${PF}/html
-		--with-icesound="${icesound}"
-		--with-libdir=/usr/share/icewm
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable xinerama)
-	)
-	if use truetype ; then
-		myconf+=(
-			--enable-shape
-		)
-	else
-		myconf+=(
-			--disable-xfreetype
-			--enable-corefonts
-		)
-	fi
-
-	CXXFLAGS="${CXXFLAGS}" econf "${myconf[@]}"
-
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
-}
-
-src_install(){
-	local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION )
-
-	default
-
-	docinto html
-	dodoc doc/icewm.html
-	dodoc man/*.html
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-}
diff --git a/x11-wm/icewm/icewm-1.5.5.ebuild b/x11-wm/icewm/icewm-1.5.5.ebuild
index 1fb78abeecfd..d38893669b3f 100644
--- a/x11-wm/icewm/icewm-1.5.5.ebuild
+++ b/x11-wm/icewm/icewm-1.5.5.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.xz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="+alsa ao bidi debug nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/x11-wm/icewm/icewm-1.6.1.ebuild b/x11-wm/icewm/icewm-1.6.1.ebuild
new file mode 100644
index 000000000000..869277de7f94
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.6.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools unpacker
+
+DESCRIPTION="Ice Window Manager with Themes"
+HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm"
+LICENSE="GPL-2"
+SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="+alsa ao bidi debug nls truetype uclibc xinerama"
+
+# Tests broken in all versions, patches welcome, bug #323907, #389533
+RESTRICT="test"
+
+REQUIRED_USE="|| ( alsa ao )"
+
+#fix for icewm preversion package names
+S="${WORKDIR}/${P/_}"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/gdk-pixbuf:2[X]
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	alsa? (
+		media-libs/alsa-lib
+		media-libs/libsndfile[alsa]
+	)
+	ao? (
+		media-libs/libao
+		media-libs/libsndfile
+	)
+	bidi? ( dev-libs/fribidi )
+	truetype? ( x11-libs/libXext )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	$(unpacker_src_uri_depends)
+	gnome-base/librsvg
+	x11-base/xorg-proto
+	truetype? ( >=media-libs/freetype-2.0.9 )
+"
+
+BDEPEND="
+	app-text/asciidoc
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.6 )
+"
+
+src_prepare() {
+	# Fix bug #486710 - TODO: Still needed?
+	#use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local icesound
+	if use alsa && use ao ; then
+		icesound="alsa,ao"
+	elif use alsa ; then
+		icesound="alsa"
+	elif use ao ; then
+		icesound="ao"
+	fi
+
+	local myconf=(
+		--enable-gdk-pixbuf
+		--enable-logevents
+		--enable-xrandr
+		--with-cfgdir=/etc/icewm
+		--with-docdir=/usr/share/doc/${PF}/html
+		--with-icesound="${icesound}"
+		--with-libdir=/usr/share/icewm
+		$(use_enable bidi fribidi)
+		$(use_enable debug)
+		$(use_enable nls i18n)
+		$(use_enable nls)
+		$(use_enable xinerama)
+	)
+	if use truetype ; then
+		myconf+=(
+			--enable-shape
+		)
+	else
+		myconf+=(
+			--disable-xfreetype
+			--enable-corefonts
+		)
+	fi
+
+	econf "${myconf[@]}"
+
+	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
+	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
+}
+
+src_install(){
+	local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION )
+
+	default
+
+	docinto html
+	dodoc doc/icewm.html
+	dodoc man/*.html
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/icewm"
+}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 82dd1419ddf9..f3a57fb7bcdc 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -6,8 +6,8 @@ DIST mutter-3.30.2-r1-patchset.tar.xz 14096 BLAKE2B 83f2e975a4404b878e832a70fe7a
 DIST mutter-3.30.2-r3-patchset.tar.xz 30208 BLAKE2B 502e9c1d005cf268548e2732d4574b0eb7491940531c77c357e73e2da23b60acfbb183f9e818edd86cf0d6abca4e43c2e687db27544bb4fe7e9a33a162df01da SHA512 22b66395ffae07b208efa3a1305c71ea2282470a08300a5c3de23a2a45f03afef7804d5943934028286406adedbb9851dc562f4e57fdff77df22591893f0908b
 DIST mutter-3.30.2-r4-patchset.tar.xz 44820 BLAKE2B 2448dcd6bca338dbe2b87a93ca4374fd5b4cc5d8834dd40739e74a65280b7f00b99d61361082673f5f41e44fb40e36f0889d5ee00fbc034efe87294540fba48e SHA512 a7024b95bc56ab25cfdb27003b4b1fc39925117795c05f78b2d473fdbcf3bb6ce870ee5bc030ec4ce5e10b42d94fa0007bf5870bd2a4e94de3885c9434a39835
 DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a SHA512 3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e
-EBUILD mutter-3.26.2-r1.ebuild 4036 BLAKE2B ac9aba438fa514748247827c3d6eb87b036c36528fad4818292778605de06423cbb9ef1fce00cca51c4a90581f7429079e563416ab656664e5c3a6d7a45d74ad SHA512 d4d168a12dd1fd3b3f32b036808fd55c976a9234d5f4c4d944fd6c88277d72d260c6e23dea57fd86d7e556029c6a5d6619c8af871e06f60598cbf8bc83388373
-EBUILD mutter-3.30.2-r1.ebuild 4735 BLAKE2B 1900763e23cd4ce19d0a6a8cb9784401f69944ebe5ea0d13ac815b648666c4e34fbfd5d0f0b6974cb38ba1fc5f783bc6725009ec648525c8a46d21a28140037c SHA512 03ac658be19c1c085092a88f60172c01d18a9e6af9c0954a78202a6a609909b22a5df08e786ba665387cd8f3581553395dba8b86d74fed624a0f69db3dbbb87a
-EBUILD mutter-3.30.2-r3.ebuild 4744 BLAKE2B a1247e741936b0e620c320818a7c9e2ad445010312e23720837fc6b97631923581d9722d1e6535bc001f34108da17159c366ff2ae7d55bb44dcf3184cf385ec9 SHA512 e9c8e37faf7cfbce738b6f4f6f816133f77be4f658d0de73301f51a2c447e94825cb77c36010c0ac32135095c42ef7f688348e6c964fde26528d6dad3bf1a78f
-EBUILD mutter-3.30.2-r4.ebuild 4822 BLAKE2B 918ddb2cce457d40990fd1dec775a7885535f6acd10397f571d3902ad1a8d3976f9b7f8564e8e2306df3d16d4413b8026734dc800ee7a208d2663ca27aaec731 SHA512 a4cf62fa0ed50b2e051ede44f34883d0adfe03606036713957db3611792480845b0f895e754fad506ad4b654992eb12e6c84f654864b19ca2731507b1a9178bb
+EBUILD mutter-3.26.2-r1.ebuild 4080 BLAKE2B 1d5f4a3124fefcd5ef813fd53fe4a62b6d7aeec3963e2f0719b58accdbe8ac23e768a420e2d1424282dd476b8c544612c9fe0fe9e5aea5c8781705708c5aef5b SHA512 b551ed5ede7d49b489f89f226dccd4a313f94ae2c429c9b572747782df197157cfe961b5d5bc36abe7f160578ecad248c2c213009abac79d68e943f6ab680892
+EBUILD mutter-3.30.2-r1.ebuild 4779 BLAKE2B a074b6bab4ea5005ec421ed8c7c9529da1ecdded81e6d6a9a25b795a784c77defbfcb6af34bf404ca92adc22faea10c786c9566d6ea2194ccf618b888c679f56 SHA512 2e7a7f68c8d8e3d2c185ee9e073a60e7f72639897b48b0f823b4a5ab3f95452595aa501657f7a5953f92e95170766d55dc661724ea616e088b91b7e98622e533
+EBUILD mutter-3.30.2-r3.ebuild 4788 BLAKE2B c369445d8f99380447ec5d9278ce1753f7b8e41c36aaf05836cdd5e05d5516472dd07dcdc0b4241cba08b58417ed1b16c90c350ceba07bdc8a97def8a76ee908 SHA512 9a474d06a0c71306b9ba8c3e81113abd78f44f22a8b62d045d8da83143b9da3f19f20ad3c7cd6fbcfcd467dcd4431409c05680a29cd31e1f3f5033ab3cb6a5a4
+EBUILD mutter-3.30.2-r4.ebuild 4866 BLAKE2B a174de32d79499cfb7e13562056b3bf768e27b3e8a499cc65a4b6a445431339146b986e5121743d5ce020e95c68f172d2c4520d11f58e05047705e01aa70f3b2 SHA512 5527cc326594e06ddf96522e09cb39c1dee1a688b26c2052061ec89525a80fe90b1f6a372dce59dcb3e1484188be6dbc4842c4844e6569a204db198ce946cc21
 MISC metadata.xml 552 BLAKE2B 1e0ae54a432b5f0882ec17726ae8753e0168a8191c57fe204f7dbbd54ead1eb543224a46e42644508b7c69d6969d8849bf80dd16f0af2f5075f1942725851e40 SHA512 cf8d304399b4af16bcfb43c5ba3b1ea94ea9bf92be925fab584b4febf8ede21bb0f95dd590b12e1a5528f48372792da2ca31c5c469ad443c7fd20e5b8f7cc700
diff --git a/x11-wm/mutter/mutter-3.26.2-r1.ebuild b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
index 6ba7697388f3..717de28c38be 100644
--- a/x11-wm/mutter/mutter-3.26.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.26.2-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
@@ -30,6 +30,7 @@ RDEPEND="
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
 	>=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
+	<gnome-base/gsettings-desktop-schemas-3.31
 	gnome-base/gnome-desktop:3=
 	>sys-power/upower-0.99:=
 
diff --git a/x11-wm/mutter/mutter-3.30.2-r1.ebuild b/x11-wm/mutter/mutter-3.30.2-r1.ebuild
index bd9ea4cb462f..df0e1652d3d7 100644
--- a/x11-wm/mutter/mutter-3.30.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2-r1.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
 	>=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
+	<gnome-base/gsettings-desktop-schemas-3.31
 	gnome-base/gnome-desktop:3=
 
 	x11-libs/libICE
diff --git a/x11-wm/mutter/mutter-3.30.2-r3.ebuild b/x11-wm/mutter/mutter-3.30.2-r3.ebuild
index a6b546ea6ad2..d18e0d664c85 100644
--- a/x11-wm/mutter/mutter-3.30.2-r3.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2-r3.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
 	>=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
+	<gnome-base/gsettings-desktop-schemas-3.31
 	gnome-base/gnome-desktop:3=
 
 	x11-libs/libICE
diff --git a/x11-wm/mutter/mutter-3.30.2-r4.ebuild b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
index 4a195cee4a18..cb9832016954 100644
--- a/x11-wm/mutter/mutter-3.30.2-r4.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
 	>=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
+	<gnome-base/gsettings-desktop-schemas-3.31
 	gnome-base/gnome-desktop:3=
 
 	x11-libs/libICE
diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
index 89193f125be8..ce1a36c093bc 100644
--- a/x11-wm/xmonad-contrib/Manifest
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -4,8 +4,10 @@ DIST xmonad-contrib-0.11.2.tar.gz 401758 BLAKE2B 06697bac621dabbbc3e066c38efbfc8
 DIST xmonad-contrib-0.11.4.tar.gz 401743 BLAKE2B f6962bcb88e88ebf620ef037c08de8c21ebbb10cb863852f60b5f3ba03d72d00dfb737b57ca0bb5f2fa3364a120fe00377d6c27735abbc8f7eb0b1992ec705b7 SHA512 3d747988baa497475255be4cc96f7eba5cf6fc81658f8f877ca92148fb9a154423ee98ebeb23690de00b186d2e34ad13d94cf1fe332d4ca4f1f4a64790e46ed7
 DIST xmonad-contrib-0.12.tar.gz 464978 BLAKE2B 72b08d01a24e1a878bc1d7175755b45d0751236f01c276f3b5baaf332f3baf5c81b2c75c8ab88e221f1cabde0f3ed3f7a613b672b038da95de0ef4d69f249307 SHA512 5bb145fc7d07ebc8e4dde5ba83b5340913fb089581d22e993663402fc6728eab9f6939466b7a262827c0098599073a928700e0acb8245b943b23e6cd01e63056
 DIST xmonad-contrib-0.13.tar.gz 485351 BLAKE2B ef42ad08bf5878046abfbc0c2cbb79853c01e2e0ba0e6ab0723e575531dc106c32dce58fe9e6e35b5e84f18b04456aec03ef838a9cb6fc34396415a311e1b2d5 SHA512 40b8a8fc8a1fa134f2726c273ff75eee26a43c9f18095bad9251e4b37b0cca5ee6c32eec5c42aa00c9e0c5c90ae54e6414739a2cee5b5d2917814358449d55f5
+DIST xmonad-contrib-0.15.tar.gz 524285 BLAKE2B e34b32a4899e98b00ae5ea4539a8566f056f794adb672df035d140532faf0996ef4bcf078998a1a6bd93320c5ebd41d51babf98a5332142c3a8644d3eb0e007d SHA512 c4669a51f6c1fbb50f5d484ae4a24b608d2b03c2e6814fa2ae079fe57a4b599e3072ae23c29b22fe2cf86a04840b4262a646ee4c7ba7c9a859ee78a31f99bc8a
 EBUILD xmonad-contrib-0.11.2.ebuild 1072 BLAKE2B 5ab63d4b64040716bdd2436e146ba473432cf7fd8bae75f2e388d4dc13bfed36b3b746b787113e01e331943c7c60b7ede442f2b1bc862a434f375dbbc57c4212 SHA512 b5efb5b4b81371e5390f1019721b3bdc66f749de928ef296a7fa31f571ed55fd867403d75864eaad2615052be800c07fe159d6d7ca135f6de82b04e876ecdebc
 EBUILD xmonad-contrib-0.11.4.ebuild 1474 BLAKE2B 9b335ddfc737a8dc66c3d0914464a5101a4b3dfbb2747031c2a5f295b9e7e1e2cc1934951878c6275b6272c910ded22021cd9e71d5a02e97bf5c15e3dee7e525 SHA512 6e6105f7cbee4cf008449bb986ce10801a53b221b1d81d4f39f1aa39d57eb86c0d574318ceb886e0a3f005f28d2373c078c405c6378be7c4f9fa9612e5e5e2dc
 EBUILD xmonad-contrib-0.12.ebuild 1108 BLAKE2B bf64cc37ee269fb1637599da5537797a37f8d65e4aa439cbc3073da3b3e011f375276cef1dec019000788f9758cec7f0f928a3ca2bf8a0b68ac681b000589c70 SHA512 a99c25deb7e097a1f3948a8ae59f301728d9ea34da45b030472507c92802fffc7f4391462443d7f63359bfaa3d52d6f7c2456bbc6d38713ce07643086dd8e1ff
 EBUILD xmonad-contrib-0.13.ebuild 1101 BLAKE2B e080c18024bbfecadce12b38070b999f4f84ef22f1a9f9a2e74b5b4939ea239aa6490d797adc9bb985055a7e483c8c7874ef7711400a5d894248151247ce44d5 SHA512 d6defccc0dac8c6bb7754976f30b024a3ee4ed738eec970a3eee81e8e724592fdf8c455f07171d6d5221888fa27c72c9afe44b7e65497412000321745daf7e76
+EBUILD xmonad-contrib-0.15.ebuild 1137 BLAKE2B e6fd958a9d88fdf01cc2293dd110de03871ec418ed365a13208700edb14df0d935b2f808dcdc600f0d64595088e26d004c3236f6cab8a4f520fc5fc3db7e88e0 SHA512 21c6f57ee35adf2299546aca74bb3227c2315ab28446b0df79f22c0fd70ccf1628f50ea4f446d2ccd10b3e96459a5847a3b661b8ec39bc220a5467aade534fee
 MISC metadata.xml 708 BLAKE2B 0aae3704519ca0ffba4e25ae3236ebd02ecb6a9e7bef7d23a32107ad6e6826f09613dc6206fd1e350a8e3536061136cfdd463f7e2a80b16e7f38b30db14c4fc4 SHA512 570916b2bcf06efaeccb486d3161d0b751c675955abae7efc57d471961e2c1649075bc155e75849cd1b56c0a5917341f7ef2cbb12e81255787cfb282a6ea1fb7
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild
new file mode 100644
index 000000000000..4d0d9737f401
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.15.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: -testing,use_xft:xft
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Third party extensions for xmonad"
+HOMEPAGE="http://xmonad.org/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+xft"
+
+RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
+	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/x11-1.6.1:=[profile?] <dev-haskell/x11-1.10:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+	>=x11-wm/xmonad-0.15:=[profile?] <x11-wm/xmonad-0.16:=[profile?]
+	xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-testing \
+		$(cabal_flag xft use_xft)
+}
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index 27a0129813a2..75a35c9148be 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -7,9 +7,11 @@ DIST xmonad-0.11.1.tar.gz 59307 BLAKE2B 98dc31dd53e933f68dbf00121c6a0b4e4a24a19c
 DIST xmonad-0.11.tar.gz 59119 BLAKE2B 75ae39e2e54d4b5ed14f99d0144d4ee7741c611f18b5692aedce49b0a4dc07a17f613280d93fd715b812a2c22e27ad9f7fe8693dba38739ccf6dde9742fe03b9 SHA512 34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc
 DIST xmonad-0.12.tar.gz 61436 BLAKE2B ea42fc105e30be59a2cb0180c05ef88024e51a1a224bdd6bb910d45cddabc2709411e2f0c7aa6c5723f54653db242bda80ab92249204106955be75a4a077f1ea SHA512 e519c038d90db037bc81e7baf7b07cfa53922509e98ffddacfc4a6cc2c7376383be1e721f613057a5febbfcc661807b6382124eb673ac7a7cda23c738d3539ab
 DIST xmonad-0.13.tar.gz 72034 BLAKE2B c95b24ae406268da642168defcc633cf8185f0f2dbcede1122c48c3812bf250df69d917c479f328cca450dec362ae0614d2acaf09d62123d15d646dcae8d98ec SHA512 9d9436f36fe0f6a9732502b0211fc41a224b1320b843d266b6d2dd201e4329b688f7eed5b08597b2edd713cc25f2b88a2a1f1ee43e18615c0a78e97e4716b122
+DIST xmonad-0.15.tar.gz 68822 BLAKE2B 9ee9a070f6743fbab2cffe05ee9e60b64fded0b4916fdec03a550f5d5ec5a34102ab2d4e9586b9a0ca534db284a8058f11ee248072f3f3b312ae30c09873feff SHA512 f881f3faa4f5a0de7a5a37118cd7041083ae3a7569c7094b55dedb9aa858176789aff459d426b237ebae5cc4598b06de790938775a7ac968c2d76be3f0efc8ba
 EBUILD xmonad-0.11-r1.ebuild 1965 BLAKE2B 372045a866c737afc0e782d57507a003acf7d37f9897488390ec03f34e9e2decabbde3bd32252260aeb2b9889dbab6a6fd06cce0cd38d9651c621d069ce287c4 SHA512 492c80d5acc5754ce183f8f916d6cb52e4cb62eeaca064ceca626f7ee874c9821c82228ca7d3dbc68ad8cf5429b397070cbd3b5a7a75cdf474ffc30974d8ca6b
 EBUILD xmonad-0.11-r3.ebuild 2215 BLAKE2B b207cd50e8c547edbb6ec2d5aca8abdc7b87005a3ae8303ce5d850aaab7067bb4472bd7aebba46f1d5078c94c2b4d49abe1e3d12d80ed79d646b6a560fc9e1a7 SHA512 a6d81091312070ebb0d249ea11d4df13c56452404441d8b350ae07817d91946db6c08213f97f60bede4c8262eb2c430d913359b7a28c49994bbb545a9e677279
 EBUILD xmonad-0.11.1.ebuild 2180 BLAKE2B 16928081702afdabb54a56c1e63230132ed394f71fa185bb6c351d7328a1784c1534f2ae77cc616c4dded300fb2ba720e2e3902377bb72e5208f5f3a5bd6f8d7 SHA512 7a2abef771ae04fa73e820c735ab4cc6a3f797ed2dacd1d581404f487612434dc67ec12efafff03df04340c72be14db99bb26f1a759a51f25279433f1dd1a447
 EBUILD xmonad-0.12.ebuild 2457 BLAKE2B 4bf99bc92a8454b2e32c4d1783b1f97ee2199056bc7d3c1bc776fb7be3d73f27efbfd8764e35aeb3f69602f14111da4adfbdeb8dc669eb439a2b3bc142b0d04d SHA512 b3bc1fe747f8db0ba7afe6bffd395e9f4dbe6ee501945ad139145a37d49f129cde09732f42461029745848273d3c7b93ebfedf349c3aafd267322d192222d1c4
 EBUILD xmonad-0.13.ebuild 2192 BLAKE2B 326da365e3d0af7bfb070ad03c99a101e5bada05b30878db19388bd6b64ef371075c92c6b9548ad95151c2b029ed04afb575040989ee40056cb0ade97d65eaaa SHA512 f80c9344470ceb7d888fd007a12123511155a0c32c31cad9ee35951282afa0db757e280ba24916899855b8ab0f70b3a7730f76b1565374259e88b3f5187adf74
+EBUILD xmonad-0.15.ebuild 2344 BLAKE2B cc72ea8319f871356e0180bd5c27c98d1782b257a518efd924c776bd171be90d5785ce4316e3fac6efa514c6e45823b7197a3de2f46c0a1561cd71f357dcee13 SHA512 de104666e778847e6a51e3fcb9c0c2459532b5fa714b6fe2b140e612114c2b2e77fabf353aa941fd4dab9e894c0ce06c6eeaac3d846ddd354f6208a52159d207
 MISC metadata.xml 1068 BLAKE2B 7ca1c1c62c82e0ecc3352798f8b78bf87787534ef1830bde94b08ecca74a51606c05905903c0ad4b0728282669bcfa532ef798ae2c13148fdef55b259c3168fe SHA512 96efc16a7a57b188e72f2db9fdd90c06cc6460e9a596ac68ca5a8187fd7fbb88feb9ab9ff4e9d8436df014a6c6203c459da317cda0f5ada779096ee0806da8d8
diff --git a/x11-wm/xmonad/xmonad-0.15.ebuild b/x11-wm/xmonad/xmonad-0.15.ebuild
new file mode 100644
index 000000000000..a65b517e3950
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-0.15.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: -generatemanpage,-testing,-profiling
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="http://xmonad.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="no-autorepeat-keys"
+
+RDEPEND="dev-haskell/data-default:=[profile?]
+	dev-haskell/extensible-exceptions:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/setlocale:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/x11-1.8:=[profile?] <dev-haskell/x11-1.10:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/quickcheck-2 )
+"
+
+DOCS=( CONFIG README.md CHANGES.md )
+HTML_DOCS=( man/${PN}.1.html )
+
+SAMPLE_CONFIG="${PN}.hs"
+
+src_prepare() {
+	default
+	use no-autorepeat-keys && eapply "${FILESDIR}"/${PN}-0.14-check-repeat.patch
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-generatemanpage \
+		--flag=-profiling \
+		--flag=-testing
+}
+
+src_install() {
+	default
+
+	cabal_src_install
+
+	echo -e "#!/bin/sh\n/usr/bin/${PN}" > "${T}/${PN}"
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	insinto /usr/share/${PF}/ghc-$(ghc-version)/man
+	doins man/${SAMPLE_CONFIG}
+
+	doman man/${PN}.1
+}
+
+pkg_postinst() {
+	haskell-cabal_pkg_postinst
+
+	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
+	elog "    /usr/share/${PF}/ghc-$(ghc-version)/man/${SAMPLE_CONFIG}"
+	elog "The parameters in this file are the defaults used by ${PN}."
+	elog "To customize ${PN}, copy this file to:"
+	elog "    ~/.${PN}/${SAMPLE_CONFIG}"
+	elog "After editing, use 'mod-q' to dynamically restart ${PN} "
+	elog "(where the 'mod' key defaults to 'Alt')."
+	elog ""
+	elog "Read the README or man page for more information, and to see "
+	elog "other possible configurations go to:"
+	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
+	elog "Please note that many of these configurations will require the "
+	elog "x11-wm/xmonad-contrib package to be installed."
+}
diff --git a/x11-wm/xoat/Manifest b/x11-wm/xoat/Manifest
index a3ec16e75489..4458d17b6fe4 100644
--- a/x11-wm/xoat/Manifest
+++ b/x11-wm/xoat/Manifest
@@ -1,2 +1,2 @@
-EBUILD xoat-9999.ebuild 875 BLAKE2B 706794b1ae0a5015cb012264c37518ac57fbc68d5ecb08d0125195baad2254b7e32ed8e99b806ca5ed0dc6b87fecd652103fbd13f0c9e6a3c7613a9174680077 SHA512 3f596b225fd0f428ecb74e45240eb70f77ad2e6ee38a01f0b862c1455680708aef836c21b09b3526910b0a4d31217431895d075cdba1a16719a95839d06b54da
+EBUILD xoat-9999.ebuild 872 BLAKE2B b532ceab8336c8fdcf1b2146186e5c17a0ee6ca69e796bf95c82596029f707659ccd4337e826e83cf3df461966f6af6076f5b6ed82c211516ad2a99ede8b71f1 SHA512 699f4cb3dce846d331bcbe0281862b56cbf4a010f71a8e2682971f324858af967ddf3fc7c81b2351ccb900e15f79795616c30cb4a85cdd905ecf3e2772578356
 MISC metadata.xml 295 BLAKE2B 43f1fc1dcd0e05a888e3ec1d708a588b47b926b357a6c7a9f37b6b6941b3687f61d7d34808f61d90d4dd9a003da8e099ec7cc5917609a3d22768930c9d371874 SHA512 dcf39022dd854a3682c0f4bbd85c3d37ef76d374ffec74b6f3b78108e8eac4c4328937d5476958e00c74d9fd721f82c1555c079425daa9e81b5b5b5018768211
diff --git a/x11-wm/xoat/xoat-9999.ebuild b/x11-wm/xoat/xoat-9999.ebuild
index 5ddef98cef3e..914c769f41f6 100644
--- a/x11-wm/xoat/xoat-9999.ebuild
+++ b/x11-wm/xoat/xoat-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit flag-o-matic git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="X Obstinate Asymmetric Tiler"
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 83005b16de30..851aeb9f1f99 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index d3bcd2315ba8..46fa5f50bdc4 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,7 +1,7 @@
 DIST garcon-0.6.2.tar.bz2 539745 BLAKE2B 1bcbb136cd525f1280f6539ea447b4b84f935297f6bd4391407e31925cf873fdd0cfbeb70dba5ce882e4620f1ce7b89d51c9c26232db88b1202f5a0fca3f6175 SHA512 7a96c33b47302fa989862098bc5b8ed64515a60e19a4b8dbb049398cf847d64584f93f85b1f6e1327653b22f0b44a805b737258bbc9ac69197639ef7f13f20b1
 DIST garcon-0.6.3.tar.bz2 538164 BLAKE2B 98c86491ba833fad261d1a759a33af7fbd69768e0b4a34f5712f2e0a5c8ea7734bdd984df925a50f1948e83e6f09a113e7acdadf428aca9d0aa8d0a764dc50de SHA512 1adc4373728ed19641441e0f38778d7401c78e7db52c76a258c378287c5a324e87e2aa11bca134813de4b1eaa807c62ccdf73a4c5e4d83d6acab27aafa61b5b0
 DIST garcon-0.6.4.tar.bz2 519744 BLAKE2B 3d5e90d8a1159aac4eb2f2455978bbe1de99b523b5383037c021f3490800349bff1d6f5333853b08db34c9d18f3c5fc787f51927d94cfd2cd747e839b1529e38 SHA512 96a99eb163909ba411ca5928c3fc0a569a6d833fba92edcfa845eb90b56abb02e1428a2cbf61fc1c564f1659d51b24ce174e3864fcc987a37158703df0ac2510
-EBUILD garcon-0.6.2.ebuild 1031 BLAKE2B 0a045d8e14929a4b42b7c906369274bff0f526e803073181a86f510d754e5bb19bbb3241bf735dbc96574018a5f9a2ebc1eda77bb780cf4b7f0595075ba86c0f SHA512 f366daaafbaa129fadb059112ba76c044981a6830c0186a34d3edf71e3819c7453cba92f3307b24d4988dcfe257d6c7ecd58229868058adefae8b67edd6f5504
-EBUILD garcon-0.6.3.ebuild 1037 BLAKE2B 0495bcac8428d004ee7ae30ed448a5069eee65468f772a168400f5894dcd58f217e7a1fd9bfe04134ed423e9342ab5155bb79e2621a7cf742e5ae6d69b1c08f9 SHA512 7bcff58af4c0d8eaee7cb088444fe6a3586a076cc553a32885f0a242de1dc4063f7fd2d40c4bb60c24293ea1e1d4e476e292c45b8ff002711c7e29d9eba2e91e
-EBUILD garcon-0.6.4.ebuild 1037 BLAKE2B 0495bcac8428d004ee7ae30ed448a5069eee65468f772a168400f5894dcd58f217e7a1fd9bfe04134ed423e9342ab5155bb79e2621a7cf742e5ae6d69b1c08f9 SHA512 7bcff58af4c0d8eaee7cb088444fe6a3586a076cc553a32885f0a242de1dc4063f7fd2d40c4bb60c24293ea1e1d4e476e292c45b8ff002711c7e29d9eba2e91e
+EBUILD garcon-0.6.2-r1.ebuild 1040 BLAKE2B b58a61f8ce366705f214ebe1b0eb1169b9d585b51bad1435f314ce723f0bb27a20d5cde369711236c0685199c6fab811857a4c59b05b202b36b1bef7856d7a95 SHA512 221fc399d020e3e3975b96f04aefe2937a0aea4e7626651f22a110f2c7255c7e48136ff51e3dba40e1b208ce1a0009607f6d23e2f0b5e6410251aaf24fecbf4a
+EBUILD garcon-0.6.3.ebuild 1046 BLAKE2B 2b5a4cc52a54321e55b55656f836f8337c66f1c0a17ea69b5a44eb08625c0e9355304c0e46091356bf6c12dd0c81f3b7d25db5b0b58b18dbf5dc08f6ad0bb6f4 SHA512 8b84e4f00941586171be8fdf1a4dd023a87a2b9570bcb7d3dbaacc31ee93dad8ddb554e5db8a721aecd63ad90316941cff93d5f3fdd841dbb8fc405ce9e39f1b
+EBUILD garcon-0.6.4-r1.ebuild 1046 BLAKE2B 2b5a4cc52a54321e55b55656f836f8337c66f1c0a17ea69b5a44eb08625c0e9355304c0e46091356bf6c12dd0c81f3b7d25db5b0b58b18dbf5dc08f6ad0bb6f4 SHA512 8b84e4f00941586171be8fdf1a4dd023a87a2b9570bcb7d3dbaacc31ee93dad8ddb554e5db8a721aecd63ad90316941cff93d5f3fdd841dbb8fc405ce9e39f1b
 MISC metadata.xml 395 BLAKE2B 13ea597065b0ffcb8a57e82f980dfa9b271a16f0c6ba824cb66f551d7bd6c49946985d1391a28360c4160bca5b88cc796b578b23f0b321d1670ab9f1c0addf23 SHA512 8783901107619bafc30acd3962284cf56376a14cd61039f862e1a7f0b5e17fc9d51f0e278c85161fb8b42c53b132a1ae7abe00c7e933eccf2ce3b74fa9956d54
diff --git a/xfce-base/garcon/garcon-0.6.2-r1.ebuild b/xfce-base/garcon/garcon-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..edf7baab9f21
--- /dev/null
+++ b/xfce-base/garcon/garcon-0.6.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
+HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+gtk2"
+
+RDEPEND=">=dev-libs/glib-2.30:=
+	>=x11-libs/gtk+-3.20:3=
+	>=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	gtk2? ( >=x11-libs/gtk+-2.24:2= )"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README STATUS TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable gtk2)
+		$(use_enable gtk2 libxfce4ui)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-base/garcon/garcon-0.6.2.ebuild b/xfce-base/garcon/garcon-0.6.2.ebuild
deleted file mode 100644
index 821f2c9ab0cb..000000000000
--- a/xfce-base/garcon/garcon-0.6.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
-HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+gtk2"
-
-RDEPEND=">=dev-libs/glib-2.30:=
-	gtk2? ( >=x11-libs/gtk+-2.24:2= )
-	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README STATUS TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable gtk2)
-		$(use_enable gtk2 libxfce4ui)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-base/garcon/garcon-0.6.3.ebuild b/xfce-base/garcon/garcon-0.6.3.ebuild
index b4bb94d0b25d..fe58837f910d 100644
--- a/xfce-base/garcon/garcon-0.6.3.ebuild
+++ b/xfce-base/garcon/garcon-0.6.3.ebuild
@@ -13,10 +13,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x8
 IUSE="+gtk2"
 
 RDEPEND=">=dev-libs/glib-2.30:=
-	gtk2? ( >=x11-libs/gtk+-2.24:2= )
 	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:="
+	>=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	gtk2? ( >=x11-libs/gtk+-2.24:2= )"
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	dev-util/gtk-doc-am
diff --git a/xfce-base/garcon/garcon-0.6.4-r1.ebuild b/xfce-base/garcon/garcon-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..fe58837f910d
--- /dev/null
+++ b/xfce-base/garcon/garcon-0.6.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
+HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+gtk2"
+
+RDEPEND=">=dev-libs/glib-2.30:=
+	>=x11-libs/gtk+-3.20:3=
+	>=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	gtk2? ( >=x11-libs/gtk+-2.24:2= )"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README STATUS TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable gtk2)
+		$(use_enable gtk2 libxfce4ui)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-base/garcon/garcon-0.6.4.ebuild b/xfce-base/garcon/garcon-0.6.4.ebuild
deleted file mode 100644
index b4bb94d0b25d..000000000000
--- a/xfce-base/garcon/garcon-0.6.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
-HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+gtk2"
-
-RDEPEND=">=dev-libs/glib-2.30:=
-	gtk2? ( >=x11-libs/gtk+-2.24:2= )
-	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:="
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README STATUS TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable gtk2)
-		$(use_enable gtk2 libxfce4ui)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 7c483d5dfcb0..9a222ca3567a 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -3,5 +3,5 @@ DIST libxfce4ui-4.13.7.tar.bz2 738592 BLAKE2B e59727f05d4772a164ed097ad8629a7327
 DIST libxfce4ui-4.14.1.tar.bz2 756175 BLAKE2B d487cc0a04b6053ead6670eeb83cafe1c4098818d5ad6a94a81176720d78cfd65160156961cbb526baa1640ae66a5c6958f707b7078c412d81fcd24cc8cf4013 SHA512 f42f41da3a683a0c56c3b1e7ba420c4f50909d2613e681d053b09b50bc0eb7f750f44c892e94b0ee8b9207983a87c0cadbda1ad93d0df74ae351dc8812025407
 EBUILD libxfce4ui-4.13.4.ebuild 1723 BLAKE2B 698707c36f3a30b529171b1a28bd2718e2d4496222704c91c8b86c47098d2a33d0b0fbb0035cdfa371d4d469b9b79c0918d58aaed708a0e826a0fbdd7017b76f SHA512 d58835c325c64a905ee6d34a9647f2cc9c1691d096b99383b1d165dd1d4d4ac6b21b447e23fc64e13717ab957a2d3ebe93621a283acb4062ef411d3714181412
 EBUILD libxfce4ui-4.13.7.ebuild 1731 BLAKE2B 30d3994b8df3509a67c7244ed62d87169c68dfdafb98089d24939512b9dd9695b3833c006be5e297d6e129fe5183ecbae3fb86367ba303a0fb84dbaa5ae6e86a SHA512 4da02374411dd9bf12809deea135f97ce81da05f2a6c6c7be537cc1ffdd26195087d9ab6aa24efbffb840b703760f2388ec67c4a5775a835a8d6ebbb339144be
-EBUILD libxfce4ui-4.14.1.ebuild 1731 BLAKE2B 30d3994b8df3509a67c7244ed62d87169c68dfdafb98089d24939512b9dd9695b3833c006be5e297d6e129fe5183ecbae3fb86367ba303a0fb84dbaa5ae6e86a SHA512 4da02374411dd9bf12809deea135f97ce81da05f2a6c6c7be537cc1ffdd26195087d9ab6aa24efbffb840b703760f2388ec67c4a5775a835a8d6ebbb339144be
-MISC metadata.xml 348 BLAKE2B b833ebf4da605db088c633bbd7e8a5747edbffae3671d6049154f89b6ecdcf3054624b5e17d55332f405608d57dd3022c1dd78b81376bd2d28c063291d32073c SHA512 f3894d3ccb668e76deaa0651414359838402d2b1e11fbe816375e6147f89847257008d5807766796fb1249217f6454a5f5896941e7ce3bc79dce09b130db4fc6
+EBUILD libxfce4ui-4.14.1.ebuild 1726 BLAKE2B cc9925fb5189c719d48e0eeaf718339ed733b1b87cb2b88c7fdb4fd99128308a90324bdf745d702dd32a14cbe0b0d339a08545d6c0c28458c806f20cf17da8e0 SHA512 677a0c3b1e82681f65704053c0bfbe7d46be063cf58d17543dd728141141eba0a360ab56f4a223bd95bdc8a05a2547d82db7c23003eb4f7455e8c965c5a4fe05
+MISC metadata.xml 422 BLAKE2B b6215119e3f826c198e24eca0a32f244fff44e185be8f17e9c568ea54cf5a40e102e48431539f4797bb07e6dcad1374fb1fe560b637be7864711000efd28dc4c SHA512 e66d13a060043bda0b9eb2c632e3564dc0c81fff21bf0e08725b0d95d7c43d6673147e7bd6752660731316d357d8ec8424b4ee82d4e851af8c5ff36222d43d10
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
index e44453634d38..a3d70f36e050 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.14.1.ebuild
@@ -12,11 +12,11 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug glade introspection startup-notification vala"
+IUSE="debug glade +gtk2 introspection startup-notification vala"
 REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!gtk2? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.42:2=
-	>=x11-libs/gtk+-2.24:2=
 	>=x11-libs/gtk+-3.18:3=[introspection?]
 	x11-libs/libX11:=
 	x11-libs/libICE:=
@@ -24,6 +24,7 @@ RDEPEND=">=dev-libs/glib-2.42:2=
 	>=xfce-base/libxfce4util-4.12:=[introspection?]
 	>=xfce-base/xfconf-4.12:=
 	glade? ( dev-util/glade:3.10= )
+	gtk2? ( >=x11-libs/gtk+-2.24:2= )
 	introspection? ( dev-libs/gobject-introspection:= )
 	startup-notification? ( x11-libs/startup-notification:= )
 	!xfce-base/xfce-utils"
@@ -41,11 +42,10 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
+		$(use_enable gtk2)
 		$(use_enable introspection)
 		$(use_enable startup-notification)
 		$(use_enable vala)
-		# TODO: check revdeps and make it optional one day
-		--enable-gtk2
 		# requires deprecated glade:3 (gladeui-1.0), bug #551296
 		--disable-gladeui
 		# this one's for :3.10
diff --git a/xfce-base/libxfce4ui/metadata.xml b/xfce-base/libxfce4ui/metadata.xml
index f53823b4b9e2..c9c136a2dab2 100644
--- a/xfce-base/libxfce4ui/metadata.xml
+++ b/xfce-base/libxfce4ui/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <use>
     <flag name="glade">Build support for Glade 3's GtkBuilder implementation</flag>
+    <flag name="gtk2">Build deprecated GTK+2 libxfce4ui-1 library.</flag>
   </use>
 </pkgmetadata>
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index be58309ae257..d815d11b882e 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -3,8 +3,8 @@ DIST Thunar-1.6.17.tar.bz2 1995398 BLAKE2B c6bc0ebc29cdf8b0d3d184fd5b5019bb6f4ca
 DIST Thunar-1.8.7.tar.bz2 2326995 BLAKE2B 2eceeedabc66ced9ced70089b2ce66932a2223f4c4f6a6ae624199c00552d3d0fbb98f1c67bb0408d99d4167172698ecc9d020117d7c5fd41363b543b768ef69 SHA512 d4faf28857ee7c29c799bec9c5d7c639596b213f2aeb1089125d074083a4a13e91425cf3f35c63ce313330ee9ef070653a868a1a4526dc443a5d603bd9dec588
 DIST Thunar-1.8.8.tar.bz2 2333563 BLAKE2B be9903ea0d468982d45fa702fcb792150f3c757992f6a561d0a8747b18aec0f9794432c33ad42477f7e0753a83439eba19bea6afc184d15f7170c561d74b19e3 SHA512 364ca63169e01e8d7fe26c300ec7a6b8fd6734a364c9d0dd8943caf9ba08d6721ffdcef4905f9fdabca0da74503b8cbc4995ce271b7a5f787ae4b96b87f6bf96
 DIST Thunar-1.8.9.tar.bz2 2375302 BLAKE2B e98659633b448e1d231e466c72741de71ce448ecf413a4f29df47acd78c9353a8cbc374961b6bb09d4d9d6ff4b98b81d575e987059999a742e30038a7c549604 SHA512 8e1bff80692ee22393a0c0cfa09178aa14cc476a058f406cab7ca873778ac4673cbac2d271f525a51e0120f1b17f8872c58407e8d7b77c6e67b721f4e5318f80
-EBUILD thunar-1.6.16.ebuild 1960 BLAKE2B c019fcce4664c75abe5ba4aabb7164171dbbbaa0e53eea7b210252e6333e3d0b9b3f81c0566dccff3d64e21e92dd487d673336af56246d85cfaf6dcb6cbc1e68 SHA512 5ba324097ce89ba71fc964277b3757a0e870767c87c06fa677a3509d5bd6949e0630b382a051459b03c0fa74d055ba7b67cff5ac5f8422d80e89773471c7cc04
-EBUILD thunar-1.6.17.ebuild 1972 BLAKE2B 2a95e601efc109fb0fb19992eefee63c5ffa83fb7bf7883071f08f58341903257d99321dc0593719b913e5e4f3347a3e51f30e7e9ed05e9d23fc3a45020ad37d SHA512 41f4ef5833d1436a188111a974a24ee7b3b957655d6287f6a09982f420a08bcc011dd50b6b419dcfc8a5ff296faba31c116f6d8d6cb84ff850907bdf6d99e9be
+EBUILD thunar-1.6.16-r1.ebuild 1969 BLAKE2B d4dea0da89421e4d0b8e34e0b03f7741293f2beda52f954a79899ab4b8591207261865f090d7a3bcb09afdfcd13a77fedf2cbe5dc60e8f4aaa47477fd98bd37f SHA512 b17c86fe25ee4bcc596e3a8fdc74e1651895eac3952de6dca9ee7e77fabc3baacc9f7dcb5f8af0dcf802960acfdf4d03a1eada0d1b4a54baad97f274fde1fc52
+EBUILD thunar-1.6.17.ebuild 1981 BLAKE2B 8543702254272adc4e1e9df108a6b3bcb3c231ca2aa3d4b2cccc0d53af92e39e07a8ed257df366cae8eed7d5534995b1b4455c64f40e39d3494f517e005f78ce SHA512 4b391f6a93113adae93446dffa7931b9cbe2592d01bfb16378bafe5de832f645a65f815924146b9561323088ddf61f93ae11debee1375dbdac0b2c9fefa09515
 EBUILD thunar-1.8.7.ebuild 1932 BLAKE2B 0adb8a03b12ba85b46117d9e9e8f50aa601fa9ab9ea1683056f6e215c041c714a62d586ee53dcc66edb47340450c3d6a47389401df061973331047f78a7b7a35 SHA512 1bc55bfafe5789ce04b4fecc88e0f4c1a5a04d0a68dfd46498cdbeafaa1e8e9c4d33078cc7288d07c7eaade869ef9a0fcbbd2321def520facad70450254d3af0
 EBUILD thunar-1.8.8.ebuild 1932 BLAKE2B 0adb8a03b12ba85b46117d9e9e8f50aa601fa9ab9ea1683056f6e215c041c714a62d586ee53dcc66edb47340450c3d6a47389401df061973331047f78a7b7a35 SHA512 1bc55bfafe5789ce04b4fecc88e0f4c1a5a04d0a68dfd46498cdbeafaa1e8e9c4d33078cc7288d07c7eaade869ef9a0fcbbd2321def520facad70450254d3af0
 EBUILD thunar-1.8.9.ebuild 1925 BLAKE2B fea768d4bc5e70fb339a98907d6c9c9fb15c9f78783c79a2b974d45a74688507df50399f31f98efa86b0f52e6fcd199566aa2f813bd8f5b409a3e4d84b51c9aa SHA512 17ae32c3972d9532a8a0555c22feddbaa36bc811f4d75c3dfd0aef6fc2cdf5d420cef943ede9300ca0e3727a75d8902dd79107fc83402c73caf1f9c18170fc57
diff --git a/xfce-base/thunar/thunar-1.6.16-r1.ebuild b/xfce-base/thunar/thunar-1.6.16-r1.ebuild
new file mode 100644
index 000000000000..7ee1cdf4239e
--- /dev/null
+++ b/xfce-base/thunar/thunar-1.6.16-r1.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 ~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:=[gtk2(+)]
+	>=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.6.16.ebuild b/xfce-base/thunar/thunar-1.6.16.ebuild
deleted file mode 100644
index c209d3386cdd..000000000000
--- a/xfce-base/thunar/thunar-1.6.16.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils virtualx xdg-utils
-
-MY_P=${P^}
-
-DESCRIPTION="File manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~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.6.17.ebuild b/xfce-base/thunar/thunar-1.6.17.ebuild
index 229f1f055f14..f713a39b8413 100644
--- a/xfce-base/thunar/thunar-1.6.17.ebuild
+++ b/xfce-base/thunar/thunar-1.6.17.ebuild
@@ -21,7 +21,7 @@ COMMON_DEPEND=">=dev-lang/perl-5.6
 	>=x11-libs/gdk-pixbuf-2.14:=
 	>=x11-libs/gtk+-2.24:2=
 	<xfce-base/exo-0.12.5-r100:=
-	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.10.1:=
 	>=xfce-base/xfconf-4.10:=
 	dbus? ( >=dev-libs/dbus-glib-0.100:= )
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 276d8b793b75..567a2c25e745 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -5,5 +5,5 @@ DIST xfce4-panel-4.14.0.tar.bz2 1291792 BLAKE2B 16cc35eba39440fd03ff0e55ed1750f5
 EBUILD xfce4-panel-4.12.2.ebuild 1491 BLAKE2B 12dab0bd4770c030e2ff4832d223c06d24da5947d324b0d7c0969fee86e70b7821cfc8bbfe8f6031f57c6f683b033a69c68d8b7c975d66ca78ca6890d9b537e1 SHA512 f1207ea0902c5288b81596959c93e0ff0d8a7026d122cf7750e79aa8eeb8c498df2bee5ca74f0dcb77e7c5ac206de6109d13f219da318661255dc8c566b8e8cf
 EBUILD xfce4-panel-4.13.6.ebuild 1332 BLAKE2B cf1d10ab77e93319b1d0e9e0112d40eb848c06d76ab26bdf41d6f9ed18b8709b827a85809c99d2a8d710c7aafb589552659ffabd5ac3c6ffe66d8cad401688a0 SHA512 76d6935c1d25abd10ae953770c2ce13ecc43c28c22d84ff2f53052f839bc0f40857699f7af3d5e7127365914fb46e57d14990b2459d71beff698f44fdf4d4e1f
 EBUILD xfce4-panel-4.13.7.ebuild 1492 BLAKE2B 1a50249d830963389f9f76e35f1c2b86b9be6e7c64373566ded2de7d63a54cf0c5fb4f5a0c8a8a29a11c844898c26514ec2f094ed321edf7b8bc18b443c0c9cc SHA512 992c9b8625b035f57a2d46a496a4bd90f8080d3228ed18b0a89415632f06d18ea84483c7757e8493273268c04ea2e09505f385acca727c3aa95a34a59b12b1b6
-EBUILD xfce4-panel-4.14.0.ebuild 1483 BLAKE2B cb8a24b95bc8cd96ea27b2968df471484598a7c15a89b45bbd0609ebf1574a8df53c3d4773a6855353bbea7660cc7dc0b0913aee71144b8d59114b62f6e122c5 SHA512 a72d1671ede58cde87d8b3d86ced803731beb279befb0ca535644ab8e6678da5aa9b206ba8e8b7763ca13770efe8168e26d66740995cdf0f309e10383ccbbea9
-MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
+EBUILD xfce4-panel-4.14.0.ebuild 1499 BLAKE2B 36a0768d8ee93c8fc33960e304662b52fba9f71c9123f364940ba4696c1c696ed6699fc4c32030182b49ed5220295eb1627754176763c5a501e22dbbeae304d3 SHA512 567f1f199e3f55f8a647d15497b7bc51e0fa53a904fd57be5bba0d57bee45212863a256b434bfbf2126aa2dd1084637c206529ce94e807a790ff9a2badfae96b
+MISC metadata.xml 322 BLAKE2B 30f74676e7071e50ef0a877f83148fb5c90b6706e31b9a9b71540c7d5488ec04eed647e345aefe701315855fd047ca721a91031ef1cd7ca04388236d4a404d5e SHA512 3d6a3a46f9e77eb4904ac9385a4ddb3337b97f450c26895c2c3032095f94eb92420fe8d814da7696e4dc7aed3d8ca395aeca7c46914babfa845c6f61cbbe97c7
diff --git a/xfce-base/xfce4-panel/metadata.xml b/xfce-base/xfce4-panel/metadata.xml
index 359901b31db4..b307dd980e01 100644
--- a/xfce-base/xfce4-panel/metadata.xml
+++ b/xfce-base/xfce4-panel/metadata.xml
@@ -5,4 +5,7 @@
     <email>xfce@gentoo.org</email>
     <name>XFCE Team</name>
   </maintainer>
+  <use>
+    <flag name='gtk2'>Enable GTK+2 plugin support.</flag>
+  </use>
 </pkgmetadata>
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.14.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.14.0.ebuild
index 0bba6eebc237..0598e0545e8d 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.14.0.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.14.0.ebuild
@@ -12,12 +12,12 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="introspection vala"
+IUSE="+gtk2 introspection vala"
 REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!gtk2? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.42
 	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-2.20:2
 	>=x11-libs/gtk+-3.22:3[introspection?]
 	x11-libs/libX11
 	x11-libs/libwnck:3
@@ -26,6 +26,7 @@ RDEPEND=">=dev-libs/glib-2.42
 	>=xfce-base/libxfce4ui-4.13:=
 	>=xfce-base/libxfce4util-4.13:=[introspection?]
 	>=xfce-base/xfconf-4.13:=
+	gtk2? ( >=x11-libs/gtk+-2.20:2 )
 	introspection? ( dev-libs/gobject-introspection:= )"
 DEPEND="${RDEPEND}
 	vala? ( $(vala_depend) )
@@ -42,11 +43,9 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
+		$(use_enable gtk2)
 		$(use_enable introspection)
 		$(use_enable vala)
-
-		# enable GTK+2 compatibility
-		--enable-gtk2
 	)
 
 	use vala && vala_src_prepare
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 10b9fc23c3c7..c0d13898ebec 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,9 +1,7 @@
 DIST xfce4-settings-4.12.4.tar.bz2 1036773 BLAKE2B 512547a172081d75e7eeb97f499e77320a3df1090e80ef548dbbaf84d454b614ddb6a36bbfe4cd06d18b478ada7bd76f385dde374a93380f848ffcc232b133d3 SHA512 9b74daa3f98f15c8cb696dc79f9913fecb37f2ca44c2fd3f24865ae03e9a1db93cb5a8ddb27da3c4af7d7a9e9d718a22e46188ff515caf925a5cedfaab37b189
-DIST xfce4-settings-4.13.7.tar.bz2 1177376 BLAKE2B 3d87347f46e5dcc9ab475a48b6a8c3c953948411f736e57172b200ac8548ebb2ec48b3142f3f37d932ace6c0106c2a2e94e5bfa6f194872ac4fe9060364b8844 SHA512 5fdabb05ba9a5fac7f093bee70f56d0c58f225c649d92071618bdd4c7a5443bc9ee9289878397d7223954a4b3e2533d7ff41b42bb85b5fdb7a69d7bbeb39958d
-DIST xfce4-settings-4.13.8.tar.bz2 1180208 BLAKE2B 179adb1393f474db7848acf15dc40885ba4fda64d4eda5c03a5d325d8bb393cda7bce34c6563cc48cb2bbf6f1206b37cf953a31057939da081178c9a57f8a8ad SHA512 b2f22c7ebe5519a4347e3c3b659e8d2d33fd0ea4c2e2f6edf91950130d555fb3cdbe6c6f17a1e3774468d30a210f327d4f982e0f10cecf0cf3ab68b86b0f4539
 DIST xfce4-settings-4.14.0.tar.bz2 1183972 BLAKE2B 6509deb01dcfab11cf31ca88a9b06a5a1f0a3a00968fccf6c9713482639c0c51e2b38337be6eff86c1edd900eb4ed22e44498b518996c01657e1f93d20b9ea89 SHA512 ab5979d24327e009e3641f75ba37dca7bb4f5bf8bc3a85da4c8355c3d07893b2dd81be1b616c75349e1e33d2fef774c099a47aedcd1bf10d8b245aa9418fe05b
-EBUILD xfce4-settings-4.12.4.ebuild 1493 BLAKE2B 7a741565d640cc17d286eeae654dc07265323fb93bad1c820faeb58abc838d4a72e122632e11b59fc30527a48fb7aa183f3457619168c1233e86fa322402d3ea SHA512 121539f24f69b6ce658dce85ff4c24de0afe7e116804188b83be24cb911af78ac3f42a2c18f884d4d91b581dffdb0896747ee4b2a1895d0b9734b99977ae89e2
-EBUILD xfce4-settings-4.13.7.ebuild 1568 BLAKE2B e660a0ab8ed43d91db4301e90f4efb4f6003f1e573705b6057567ac16a06e1ffe22d1729878a8acceb4bd6a6553ed830f308ced2de22fdfa39a2f6950116db9a SHA512 fae9f9b9b7a901359bc3020af6368d9ea251ca518ef6c7fe45f9ddcf30395a26da6aa9d65b81e34934ea68fcb2d4036c38da890d816ddaad05251e67a4024a92
-EBUILD xfce4-settings-4.13.8.ebuild 1568 BLAKE2B e660a0ab8ed43d91db4301e90f4efb4f6003f1e573705b6057567ac16a06e1ffe22d1729878a8acceb4bd6a6553ed830f308ced2de22fdfa39a2f6950116db9a SHA512 fae9f9b9b7a901359bc3020af6368d9ea251ca518ef6c7fe45f9ddcf30395a26da6aa9d65b81e34934ea68fcb2d4036c38da890d816ddaad05251e67a4024a92
+DIST xfce4-settings-4.14.1.tar.bz2 1187352 BLAKE2B 797b685e583a142f6f23a743233853c52a0247747e31d90bc0bb07103482fbf0495739493cfc19e738f8965834d18deeb1f28e6e85a11849165ef948df682607 SHA512 d854ca93199ce99d63e83ad38d654b86d883ebef5fb62a5c444f08b481df8f29a7ff27c60053c071e887be8d7ea0c51e9691a6209ca515a4e396e2c7405593b5
+EBUILD xfce4-settings-4.12.4-r1.ebuild 1502 BLAKE2B 4b6a3231b351286e5024d0f4b8394231e4193c21c41a9140f2777db1f6dc5b20bc615faa5ae9c64b952a78b4a28d6c3dad04b9ecdec16b6d61d1900aa9dd4f6a SHA512 a25a83bc8ee3dca0a21ced00437901e6917d8298bf584fa6fd761cc783fe6d791316f7cc3b378899f96c3662cb1e13442d975b2d4968c6da0abe8f31aa3ac6e5
 EBUILD xfce4-settings-4.14.0.ebuild 1568 BLAKE2B e660a0ab8ed43d91db4301e90f4efb4f6003f1e573705b6057567ac16a06e1ffe22d1729878a8acceb4bd6a6553ed830f308ced2de22fdfa39a2f6950116db9a SHA512 fae9f9b9b7a901359bc3020af6368d9ea251ca518ef6c7fe45f9ddcf30395a26da6aa9d65b81e34934ea68fcb2d4036c38da890d816ddaad05251e67a4024a92
+EBUILD xfce4-settings-4.14.1.ebuild 1568 BLAKE2B e660a0ab8ed43d91db4301e90f4efb4f6003f1e573705b6057567ac16a06e1ffe22d1729878a8acceb4bd6a6553ed830f308ced2de22fdfa39a2f6950116db9a SHA512 fae9f9b9b7a901359bc3020af6368d9ea251ca518ef6c7fe45f9ddcf30395a26da6aa9d65b81e34934ea68fcb2d4036c38da890d816ddaad05251e67a4024a92
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.4-r1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.4-r1.ebuild
new file mode 100644
index 000000000000..bdba85f2b923
--- /dev/null
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.12.4-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils
+
+DESCRIPTION="Configuration system for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="input_devices_libinput libcanberra libnotify upower +xklavier"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.24
+	media-libs/fontconfig
+	>=x11-libs/gtk+-2.20:2
+	x11-libs/libX11
+	>=x11-libs/libXcursor-1.1
+	>=x11-libs/libXi-1.3
+	>=x11-libs/libXrandr-1.2
+	>=xfce-base/garcon-0.2
+	>=xfce-base/exo-0.8
+	>=xfce-base/libxfce4ui-4.11[gtk2(+)]
+	>=xfce-base/libxfce4util-4.11
+	>=xfce-base/xfconf-4.10
+	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
+	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	upower? ( >=sys-power/upower-0.9.23 )
+	xklavier? ( >=x11-libs/libxklavier-5 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	x11-base/xorg-proto"
+
+src_configure() {
+	econf \
+		$(use_enable upower upower-glib) \
+		$(use_enable input_devices_libinput xorg-libinput) \
+		$(use_enable libnotify) \
+		$(use_enable xklavier libxklavier) \
+		$(use_enable libcanberra sound-settings)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild
deleted file mode 100644
index dc8d924b72b2..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.12.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="input_devices_libinput libcanberra libnotify upower +xklavier"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.24
-	media-libs/fontconfig
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2
-	>=xfce-base/exo-0.8
-	>=xfce-base/libxfce4ui-4.11
-	>=xfce-base/libxfce4util-4.11
-	>=xfce-base/xfconf-4.10
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( >=sys-power/upower-0.9.23 )
-	xklavier? ( >=x11-libs/libxklavier-5 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf \
-		$(use_enable upower upower-glib) \
-		$(use_enable input_devices_libinput xorg-libinput) \
-		$(use_enable libnotify) \
-		$(use_enable xklavier libxklavier) \
-		$(use_enable libcanberra sound-settings)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.8.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.13.8.ebuild
deleted file mode 100644
index 58f8d5568650..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.13.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
-
-RDEPEND="
-	>=dev-libs/glib-2.24
-	media-libs/fontconfig
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2
-	>=xfce-base/exo-0.11
-	>=xfce-base/libxfce4ui-4.12
-	>=xfce-base/libxfce4util-4.12
-	>=xfce-base/xfconf-4.13
-	colord? ( x11-misc/colord:= )
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( >=sys-power/upower-0.9.23 )
-	xklavier? ( >=x11-libs/libxklavier-5 )"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	x11-base/xorg-proto"
-
-src_configure() {
-	local myconf=(
-		$(use_enable upower upower-glib)
-		$(use_enable input_devices_libinput xorg-libinput)
-		$(use_enable libnotify)
-		$(use_enable colord)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.7.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.14.1.ebuild
index 58f8d5568650..58f8d5568650 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.13.7.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.14.1.ebuild
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 9c5b160b17e6..4ab12c3423a5 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -4,8 +4,8 @@ DIST xfdesktop-4.13.5.tar.bz2 1487498 BLAKE2B 3884cba5da1798470462ac3b49537ff3db
 DIST xfdesktop-4.13.6.tar.bz2 1487655 BLAKE2B 288d37e316a13dc7de4ab5964344ac4dbd181719f2d4212e87da797095fd58893a7ff599c7614197ac268c0eae09dfc52b5108039bff45be829c64a71f0913c6 SHA512 260d228439a5ba12b6f5e7ed7f165c5668279a27399f51447ca8a8c493293bbc4fda817d797c0122d1a3e367a4c30f8cd607793225ce22007003705b2fc7a368
 DIST xfdesktop-4.14.0.tar.bz2 1517996 BLAKE2B 8e5938e5ca42b29336a31cd362168d45f5ab23bb2a3e85e1ed808c2058fdb856940fde100babb333e902e51be8451b55233cc315767d8216d6d58dc790bbd4e9 SHA512 c5b61bfdeb2e2d0ff46aa01da561c2a7730044f91e0a3d978861569be3a71c001fd8c13f04cde738515ae5b4af7dcd7749ad5c9ca66677acca2aee8177bdd408
 DIST xfdesktop-4.14.1.tar.bz2 1533788 BLAKE2B ea43c57dc9439b5b4799d3859b28287e7cc807a488d57f79ba83424fc1d5257eba6b2d8f9aa712aef68f8aa81d296376fd3ab507cb90566b0b76aab92665c117 SHA512 05e8e79efe9683d46e69375eb5c3f1d923b5e875bc7dbb8f9405338e44ae0c48172af119c5e7b141595c38b8de00c58c21f7b7d218737f5ddc2428fd7aa4bc6c
-EBUILD xfdesktop-4.12.4.ebuild 1292 BLAKE2B c2211f31ba0d9462f60839dfc2c75b0caeadede66dff7ed70d881ebe4beac4b9c0af31677e9b5960a9d2b12be9fa368964c313e82dc6c5a5aa6b77d89bcf30fc SHA512 4b392b50d8ab465436675c341450f5e60b479d79bc65904e9d2c94105855bfa2a629b4ff4f0dd7ba6da9884104554e4a1eb1cc27bc7a17497bb3a1f88e0f4ab4
-EBUILD xfdesktop-4.12.5.ebuild 1298 BLAKE2B 1a4bf3f0ea5ac49d15c9ca13d001bd902356871365982b4cbc52b90dd691b62aa08ec8bbc2a3d4085e3f028645df9bd8aa80cd055f54125b6944c83221f80e13 SHA512 718a8e49724226f258d59d1723d1cbac294742cffd1ee751d4096797dab984d06c4918119c93078289929de267bcc60446f94fab9c60d3f5697daaa680118c35
+EBUILD xfdesktop-4.12.4.ebuild 1301 BLAKE2B 9743058596fd0eb82beeabac53cec07a018d329b547c4a23a2113f8276559acd8b6b1cffcc69e1827470a75ae78d40fc7a875f87949a9325a2b35c213a1df8ee SHA512 8d4e334b64f57d444d8a87fd15376fda081e17e67edf81442a974799f5f7cc50a7b69cf5acb3c42214ce176076fd79135e7001ad1731d876f1c91ed4a2eec1b8
+EBUILD xfdesktop-4.12.5-r1.ebuild 1307 BLAKE2B 732164bef191d09c431508a556832642beec9e164e2640548a04dcc823d8854042cf689d4bde7023762f374e2127c7487defcf3a973f89a184ec027990fc4b7d SHA512 4d9b204fb5b4fbb9f28edad7306ccd1651fd73ff5c9451ffa3945d2639e02b5c001fe4e62fc95a64b3bb12740275abed823f64b509559b8a10e90dcdc3e87ed1
 EBUILD xfdesktop-4.13.5.ebuild 1205 BLAKE2B 918e7f761f6fb4f352ac071b3603512a96606f75fbb0013b5fc9dec0e0e3d3e5e902e52a99136b5d8cceb5b90a523d4af5ce089c354a48def90e219302250c68 SHA512 cce19e056dd3c0717711aa7910084b7d17528f74bfd5ef3f730e9ac2733872796549635b557a1c463145fa4f5ba8ad824cb7d27814cd40e218e9767e1ebbc82b
 EBUILD xfdesktop-4.13.6.ebuild 1196 BLAKE2B d7ee78521f5ea42d85ec1dfc1ecc6a9cccee1c8cd08d5e3c4f338c9ed37046c343f314a0ae7d9cfd177ae8431fc6bde1a89b0434afc6890399a981ec955989a4 SHA512 98c869bcc9a5db228574dc5ead19be41ad39a8b172e31ecad6d27d6099ca70eba5ad89897b97257e4ac532cd934e2f9ceb82f7621be1fcd9baad6db16287ba75
 EBUILD xfdesktop-4.14.0.ebuild 1159 BLAKE2B 9710bdba5d04fd07da725d74fcbd11fb1945e07d89fab578a7f51ca1c1324d364ffd681f8f05b21fa952622628745e82bcbd76bb4c36394d668f55e736f48b7e SHA512 f25e60e9255995e18cb995c93f5275c5811bb5dda1447485b215a7b4c23e702967164445b45e8ea138080a90f37f8921a48dd4abb854dff847ae6374a3ad18c1
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
index 40b9614aeb97..58c055d5681b 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=x11-libs/cairo-1.6:=
 	x11-libs/libX11:=
 	>=xfce-base/exo-0.8:=
 	>=xfce-base/garcon-0.3:=
-	>=xfce-base/libxfce4ui-4.11:=
+	>=xfce-base/libxfce4ui-4.11:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.11:=
 	>=xfce-base/xfconf-4.10:=
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.5-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.5-r1.ebuild
new file mode 100644
index 000000000000..8334da4176c9
--- /dev/null
+++ b/xfce-base/xfdesktop/xfdesktop-4.12.5-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Desktop manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug libnotify +thunar"
+
+# src/xfdesktop-file-utils.c:#if GLIB_CHECK_VERSION (2, 38, 0)
+RDEPEND=">=x11-libs/cairo-1.6:=
+	>=dev-libs/dbus-glib-0.100:=
+	>=dev-libs/glib-2.20:=
+	>=x11-libs/gtk+-2.24:2=
+	>=x11-libs/libwnck-2.30:1=
+	x11-libs/libX11:=
+	<xfce-base/exo-0.12.5-r100:=
+	>=xfce-base/garcon-0.3:=
+	>=xfce-base/libxfce4ui-4.11:=[gtk2(+)]
+	>=xfce-base/libxfce4util-4.11:=
+	>=xfce-base/xfconf-4.10:=
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	thunar? (
+		>=dev-libs/glib-2.38:=
+		=xfce-base/thunar-1.6*:=[dbus]
+		)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable thunar file-icons)
+		$(use_enable thunar thunarx)
+		$(use_enable libnotify notifications)
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.5.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.5.ebuild
deleted file mode 100644
index 1eb489b1c328..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.12.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify +thunar"
-
-# src/xfdesktop-file-utils.c:#if GLIB_CHECK_VERSION (2, 38, 0)
-RDEPEND=">=x11-libs/cairo-1.6:=
-	>=dev-libs/dbus-glib-0.100:=
-	>=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-2.24:2=
-	>=x11-libs/libwnck-2.30:1=
-	x11-libs/libX11:=
-	<xfce-base/exo-0.12.5-r100:=
-	>=xfce-base/garcon-0.3:=
-	>=xfce-base/libxfce4ui-4.11:=
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/xfconf-4.10:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? (
-		>=dev-libs/glib-2.38:=
-		=xfce-base/thunar-1.6*:=[dbus]
-		)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 6c328c8c3eb4..0719305abc55 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -2,7 +2,7 @@ DIST xfwm4-4.12.5.tar.bz2 1215450 BLAKE2B 3a156af589ec7391245edbedbc6e10ac9c7461
 DIST xfwm4-4.13.3.tar.bz2 1143136 BLAKE2B 3d39b9313e97350c8c914b772262be83aa87255521dfde3f9f57a669e855c31824b717a617d7cf6f0b858b6611475dbe256dec5c1708b967e114f4d3cff87f79 SHA512 cbd410c9a5a997be6582c9bcd0af879be2c6e5b5362c0e950bb1281b4d2f4a1acbf40b3da88fb8dea3b22f491b69bc3c6df4f75c09c8c36cf9c76a02b528785a
 DIST xfwm4-4.13.4.tar.bz2 1144261 BLAKE2B 70b54f0393008706bec4dc2e763bd089908ebffed98ee33b85901d99bdf4de325e31525c1e21a50615318b3558d78808f54e7831cc055d5bdea262e34a098b28 SHA512 a4adbd5212ed34f8877adbe43c12edb17372ad871d34ad844a3c64c647f8c2fd3d8b9e44e7e09e12508bfc92837b32116fae7416b9c16d4f430f2fadcb2b845a
 DIST xfwm4-4.14.0.tar.bz2 1122735 BLAKE2B 1865c0714ddd4107e806de5607ef0e260c3fd1b6c9abcbec112a126bf780f456873786595a4cb924ce2154a40868670699519e4bb4576d971f853f7d3f63e98c SHA512 27261b08b53ba7e70db547db81775154c2f4285ab0f1f8336bd9ef0aeacb3ab705ae8ac5b05f9ac23de550a9065e76487dc93a99e553549bff1c25ceb5216939
-EBUILD xfwm4-4.12.5.ebuild 1539 BLAKE2B 967e753803115f0545775bc70444053bfc897f96e503f8a2e293ff071cb3ebb489e28d876fe6ea5a244e3cf26b36524f11a68a6db5373728932547fdf15941fe SHA512 5152c475ef58719200b3ee1636bacfe72f31712bf7b2ca929e968c2150012cf38c5ad58c374d4e019f81150b63e7230de6c0a3addefdfc71c23f77eaf1973df6
+EBUILD xfwm4-4.12.5-r1.ebuild 1548 BLAKE2B 74e15a4c8873e0ae8f51bbf21e18176337caa0a58256af7d107c78348de4cfb1a98ad944ff960cc822defc7d42f52963fe3ff96021d5890172357498e63fa2e9 SHA512 4adc5ae9ba1f7ba320c2877bf8a538fdce30475bbea0fc74e4b3954b4240713365af4f2f00e4c97358949a1c3b8eb70fab95cce5ce2eb30345330e58a1255874
 EBUILD xfwm4-4.13.3.ebuild 1702 BLAKE2B 612829b87bff6a08c0fcc038e5016b04b3a097e3bdba922ecaaba90480f5c141bee636984f6cd324ed3d693050fa795597567d96e6bbbf572e2b50e67da4db84 SHA512 1b3f47648df9b1962e01a609bca77b29d94f03ce7fd4599daac318b8d3e221f4585ddc0aa89bbb7d5afb7bac72016a53b4e91410b3673c38033925cfcf334cfd
 EBUILD xfwm4-4.13.4.ebuild 1702 BLAKE2B 612829b87bff6a08c0fcc038e5016b04b3a097e3bdba922ecaaba90480f5c141bee636984f6cd324ed3d693050fa795597567d96e6bbbf572e2b50e67da4db84 SHA512 1b3f47648df9b1962e01a609bca77b29d94f03ce7fd4599daac318b8d3e221f4585ddc0aa89bbb7d5afb7bac72016a53b4e91410b3673c38033925cfcf334cfd
 EBUILD xfwm4-4.14.0.ebuild 1676 BLAKE2B 2fc382f1266ff35925f45550d491b4a797401abddff0670be344eb815e54c75e67230597b77110380c2c5921eac8d6a837fdeae2fb34bda3f68b88c1dce09115 SHA512 8875b2c34f02fec9396aa0a7c780f0aa470193dfb5b63407700461f6bfe4bebdf23dbb22d2b549c111b5937b39305298e9ddf393d8474a8850b424f9612244aa
diff --git a/xfce-base/xfwm4/xfwm4-4.12.5-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.12.5-r1.ebuild
new file mode 100644
index 000000000000..c320a367906c
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.12.5-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Window manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="dri startup-notification +xcomposite"
+
+RDEPEND="dev-libs/dbus-glib:=
+	>=dev-libs/glib-2.20:=
+	>=x11-libs/gtk+-2.24:2=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/pango:=
+	>=x11-libs/libwnck-2.30:1=
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/libxfce4ui-4.11:=[gtk2(+)]
+	>=xfce-base/xfconf-4.10:=
+	startup-notification? ( x11-libs/startup-notification:= )
+	xcomposite? (
+		x11-libs/libXcomposite:=
+		x11-libs/libXdamage:=
+		x11-libs/libXfixes:=
+		)"
+# libdrm: only headers are used
+# libICE/liBSM: not really used anywhere but checked by configure
+#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	x11-libs/libICE
+	x11-libs/libSM
+	xfce-base/exo
+	virtual/pkgconfig
+	dri? ( >=x11-libs/libdrm-2.4 )"
+
+DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable dri libdrm)
+		$(use_enable startup-notification)
+		--enable-xsync
+		--enable-render
+		--enable-randr
+		$(use_enable xcomposite compositor)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/xfce-base/xfwm4/xfwm4-4.12.5.ebuild b/xfce-base/xfwm4/xfwm4-4.12.5.ebuild
deleted file mode 100644
index 1edd28d357d9..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.12.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dri startup-notification +xcomposite"
-
-RDEPEND="dev-libs/dbus-glib:=
-	>=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-2.24:2=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/pango:=
-	>=x11-libs/libwnck-2.30:1=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.11:=
-	>=xfce-base/xfconf-4.10:=
-	startup-notification? ( x11-libs/startup-notification:= )
-	xcomposite? (
-		x11-libs/libXcomposite:=
-		x11-libs/libXdamage:=
-		x11-libs/libXfixes:=
-		)"
-# libdrm: only headers are used
-# libICE/liBSM: not really used anywhere but checked by configure
-#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	x11-libs/libICE
-	x11-libs/libSM
-	xfce-base/exo
-	virtual/pkgconfig
-	dri? ( >=x11-libs/libdrm-2.4 )"
-
-DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable dri libdrm)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xcomposite compositor)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index b4f4d4fdc7b1..98393d417c17 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/multiload-nandhp/Manifest b/xfce-extra/multiload-nandhp/Manifest
index 791728598ba2..a52f2ec3cd20 100644
--- a/xfce-extra/multiload-nandhp/Manifest
+++ b/xfce-extra/multiload-nandhp/Manifest
@@ -1,3 +1,3 @@
 DIST multiload-nandhp-0.3.tar.gz 34812 BLAKE2B 79ee7b5b2880e2e8242c40128ef320966fa9ec7c904e79efbc497fd421fe531f94c6ccd44be665bae2a092cf70ee8ac745d1e718ae5e6bf60efaae3339329c93 SHA512 68367d0bca144a9c2c56516254b9f1531aedfbc0c34f924e0264314cd9a1215a13d1b3b6f1d3c1b0781a95abfa0705819e7d886e3c3b84705c3b5b60f7d5806c
-EBUILD multiload-nandhp-0.3-r1.ebuild 885 BLAKE2B 43155d69232bcd783bc747b08c5cd881087cb1f3330c269e07cda5d909bebfc3d117bb80d500813025b3a8a697c28796dbc430dd26d6a49682c05cd3d2c2cc89 SHA512 b2d55fa25a29cf7bff5bcbe92649c612e4924ebce76a84532bea3346653fbd6555486c26381294ea8bc80697704dad0ce86ad19ebe0824f73b794153d0c628b2
+EBUILD multiload-nandhp-0.3-r2.ebuild 900 BLAKE2B 463946cba82a01a3aace3b49bdd17bd74cebd8c00c01e98a0a4d85cef6bc7749d1af1182813f43b2bf25cd9d1872c54d0fbdf51bb3fbf990b1cc0435108ce2b0 SHA512 a096c2fe3df435087c14768a20ef0d7990eabe24e6f06865e017c28682da092a9812552fe03ed2ce064b4a9333ed30d17d85a4f4c27eb58e0f15024fa8b4c823
 MISC metadata.xml 339 BLAKE2B 98c21e065d9e6275f151981d14e5c48c75137dd2d6be1c5510224ff8136ea69fa5c93db58dcd7881d963fe240493b69e9b16a8596cf9af5b9dab5f50349f2054 SHA512 e74cdaaaa8772d4fe0a87ac55d52fc23dac307c2a8378e92350ac6a5f39b25a76f66eabf0e1db850e3f7ed703c6218377a792259f0a4267c54bd96b4104799bd
diff --git a/xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r1.ebuild b/xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r1.ebuild
deleted file mode 100644
index 0affafa8718f..000000000000
--- a/xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_PV=version-${PV/./-}
-
-DESCRIPTION="A port of the GNOME multiload applet for the Xfce panel"
-HOMEPAGE="https://github.com/nandhp/multiload-nandhp"
-SRC_URI="https://github.com/nandhp/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.14:2=
-	x11-libs/cairo:=
-	>=gnome-base/libgtop-2.11.92:=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README.md )
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-xfce4
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r2.ebuild b/xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r2.ebuild
new file mode 100644
index 000000000000..573dd745136a
--- /dev/null
+++ b/xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+MY_PV=version-${PV/./-}
+
+DESCRIPTION="A port of the GNOME multiload applet for the Xfce panel"
+HOMEPAGE="https://github.com/nandhp/multiload-nandhp"
+SRC_URI="https://github.com/nandhp/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.14:2=
+	x11-libs/cairo:=
+	>=gnome-base/libgtop-2.11.92:=
+	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/xfce4-panel-4.10:=[gtk2(+)]"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS README.md )
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-xfce4
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/thunar-volman/Manifest b/xfce-extra/thunar-volman/Manifest
index 153a417a4977..844759a230e5 100644
--- a/xfce-extra/thunar-volman/Manifest
+++ b/xfce-extra/thunar-volman/Manifest
@@ -1,7 +1,7 @@
 DIST thunar-volman-0.8.1.tar.bz2 474769 BLAKE2B 2bf6378b35f0cd868cc7363909cc5d54a997a5a69758a27d45640968e3ef8d7cb3f5af185d1a8f83e8593610490a8566742070808ab85810cd3411856aa0030a SHA512 a82c019b028277d97e7903dcbeaf4704cb7fc1e95b0ea18c6290a7a8581355691990cbdb5fa0c234ed5dd51c1ba7f1bca9a495e60f9f8597a993845481113bb6
 DIST thunar-volman-0.9.4.tar.bz2 501493 BLAKE2B 788b881f40995e95fffcedd70c0c0ea66ec8f9a81386e103d41c853a2d24408d79be04053cf34fbb5a8a28a367713ccd63cc3eaf4e536ec71a3466edb8d387ae SHA512 e75d1d8a6094f9722e170f7dc2978a213b292225ec66cdb602c4a3a2b9dac07b5d5228c970c0a39f46f4f7a0197c089f7f930fbc24dfc202dbdc27501686fb2f
 DIST thunar-volman-0.9.5.tar.bz2 501846 BLAKE2B e64a1593551cb542461be54e7e0624a9e3a3f0db43df166f0922f79e031a0f85da3eb00289a8d30c427c5f6500a3e12b065a7fdf3f34e24d6e88d27be048669a SHA512 843ff1f55b68e6f584da29c2c6c91ed045c4e9ee05cb573db6a0192553cf05faefb4227359bd6ef306c2bbb94e2fe5357c07f70a0d170b35c48d3e9ebac7a9b9
-EBUILD thunar-volman-0.8.1-r1.ebuild 1073 BLAKE2B a0e04fdff65b2f1e4d47708d978c9cb59f5a2cd4057ac856582ca8b5edd82f313db8262878481601d68c3e6cbc690130637f6eabf2070194ba875ded4ce1c648 SHA512 88b8c5709347c550a83ce4a8f2c87aeb7253d1aab87cdcf7e2cb7b70356aca4ce692ec64076df64b041c9b6d08aeb413b6fdabde51c664b4f8d890930b39659a
+EBUILD thunar-volman-0.8.1-r2.ebuild 1082 BLAKE2B bc5e38559e6ec01f9504b0a3d90b04f4b85fb3795cd356dfc354db15af28d8e97e027c958f54e726986aaf5e5200268cf00f8c8fbc8a50082b7131dddd776e08 SHA512 a0a2df2e01f753e0f4f2271fb2bff0d88e55c325c9ef244cc1b85ffdfe45f82124d3e95b6fa45e8cfd14b46d65e195a3f8ee58ba6c5e60be36ecd859acc87016
 EBUILD thunar-volman-0.9.4.ebuild 1071 BLAKE2B 9eb3f41381e1b034ad0dca93479d3b458232839061e3d51973d9ac4117cfa7cb4e29a0da844d1ec21f787affb1ded55ccb4d6dd961a497932c93878ca576e252 SHA512 993de83a46754b447a29765751fa40127e988c42bd5d3dbc658a7f3cc14222f263edec456e41d26d584374c629656a9bcb9e1d7ea7497155132b1e3a269e91e6
 EBUILD thunar-volman-0.9.5.ebuild 1066 BLAKE2B 1c8fe36ff30de7bf1b7d869f4daa27ca4eb68432b6ae3538effef324915ae03456b589b0e8828452e0c46f7170d9b97d1233f5d86ef9916f0fca32ba62da4163 SHA512 2a9f9dd2fbb63aa7b989ebece4a160c030f62052a7d0b9f755f877fa988c9986a2713f90a13ba2e9dd8d75280e12b8ced31851180ee5fc20f52c3f8954c7b02c
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.8.1-r1.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.8.1-r1.ebuild
deleted file mode 100644
index e7c2d621a297..000000000000
--- a/xfce-extra/thunar-volman/thunar-volman-0.8.1-r1.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 gnome2-utils
-
-DESCRIPTION="Daemon that enforces volume-related policies"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-volman"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="libnotify"
-
-COMMON_DEPEND=">=dev-libs/glib-2.30
-	virtual/libgudev:=
-	>=x11-libs/gtk+-2.24:2
-	>=xfce-base/exo-0.10
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/xfconf-4.10
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/udev
-	>=xfce-base/thunar-1.6[udisks]"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-src_configure() {
-	local myconf=(
-		$(use_enable libnotify notifications)
-		)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.8.1-r2.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.8.1-r2.ebuild
new file mode 100644
index 000000000000..c1006380dbe6
--- /dev/null
+++ b/xfce-extra/thunar-volman/thunar-volman-0.8.1-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="Daemon that enforces volume-related policies"
+HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-volman"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+IUSE="libnotify"
+
+COMMON_DEPEND=">=dev-libs/glib-2.30
+	virtual/libgudev:=
+	>=x11-libs/gtk+-2.24:2
+	>=xfce-base/exo-0.10
+	>=xfce-base/libxfce4ui-4.10[gtk2(+)]
+	>=xfce-base/libxfce4util-4.10
+	>=xfce-base/xfconf-4.10
+	libnotify? ( >=x11-libs/libnotify-0.7 )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/udev
+	>=xfce-base/thunar-1.6[udisks]"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+src_configure() {
+	local myconf=(
+		$(use_enable libnotify notifications)
+		)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-alsa-plugin/Manifest b/xfce-extra/xfce4-alsa-plugin/Manifest
index 103cd3d895ec..3a00064fd7fe 100644
--- a/xfce-extra/xfce4-alsa-plugin/Manifest
+++ b/xfce-extra/xfce4-alsa-plugin/Manifest
@@ -1,7 +1,7 @@
 DIST xfce4-alsa-plugin-0.1.1.tar.gz 126701 BLAKE2B a117a737023f0d4ef9473030f9a3e313a53687f4a4b049147be6a63320e346db3d0d2cafef55ff13546fdacab70f849acd1006f39b8606fc8a51323562214c08 SHA512 05273467944a08dd87455fcf20da0292899ace7254afcd2eb141c8d3f10996ad8ee08c6e61abb0178f65d52b066b0804e05a579d0a7f7e65b46fe5c4fd744fd7
 DIST xfce4-alsa-plugin-0.2.0.tar.gz 29283 BLAKE2B 42e93d0968e5275ae5c542b85907e45515eb5886f06675c3e25125796d6ae851540d377e4617c89903b3c8349b2ccdb5b49563f127b82ca7f249514819181c97 SHA512 1d4409aac80d2d0fd3022e8467f77b06df7d6e4bd31e69197caa89c2bf3c4347830054b550d0faf530eaafe05835192c915da36b987847687518e71997620e75
 DIST xfce4-alsa-plugin-0.2.1.tar.gz 29375 BLAKE2B 1bb13203af1c21c472531ecddd4d65b84c5610893a434440585c1e51e2e717cd8642874e7ea784b2c5ae7e0c9203dfa9104e95485045f5749e77ea2d4d56c8a2 SHA512 d04ca015d33bd068cbd45d200181239f1b1ecc2fc7723ed8d4566fe28a8b6b28e916e2c484ef535cbabcfb81813ffc46f5fa2b1f8535fde2f4cd719cc0f65e27
-EBUILD xfce4-alsa-plugin-0.1.1.ebuild 746 BLAKE2B 9bd19d11be77603ea98cb43136fe6b666e5946767f8255acdccd6b3e22fa7ccb01b36b3a7f7bc22a1154c56b5d4775d263488c6c3d4fbda5cfd6e07747c30f87 SHA512 45429f79fb29fe949e86f07daa79454282beb36b830f38b665539683d55db3f87aecf04f0049aab38c3578302efe8b5010b4bda0af07f07dd4634c2d82152843
+EBUILD xfce4-alsa-plugin-0.1.1.ebuild 752 BLAKE2B 3a6aa888ba18f4f874e09138fa0615208f62f68bff68599c2cca620eea8398b48a4f6c56bef7f94eecd216de70ad4d2272e7a8478b8d3d6434182054116b87cd SHA512 9118318448ffb9262be1d1248457bf37a32ebb1a3a130c9535d1f87de0b538a711ebe12ffbbb4f89e747f1946981915f687b272bb91e8fcfed53375378abce3b
 EBUILD xfce4-alsa-plugin-0.2.0.ebuild 668 BLAKE2B ced0f4361ee3a9eb1eeb206bf34c83a77c83130bbb1a6e7ea2a371bf60d3ed538fb7bdc95d216a40fa35b0900426f510887d5d86e74204195eab4604f58e5101 SHA512 eafe8fd6a9f850e7ff6b150a4769656bb561ff39cd4812de0262382332f032bf99076e91fc3bfb3ea1ab25dddcf5515111afff91b1d6a350fa03a9a1c57c00b1
 EBUILD xfce4-alsa-plugin-0.2.1.ebuild 668 BLAKE2B ced0f4361ee3a9eb1eeb206bf34c83a77c83130bbb1a6e7ea2a371bf60d3ed538fb7bdc95d216a40fa35b0900426f510887d5d86e74204195eab4604f58e5101 SHA512 eafe8fd6a9f850e7ff6b150a4769656bb561ff39cd4812de0262382332f032bf99076e91fc3bfb3ea1ab25dddcf5515111afff91b1d6a350fa03a9a1c57c00b1
 MISC metadata.xml 330 BLAKE2B 73c387f918e801398808c85c8f8a3ee064dd4b4a1457c04ab2a7aa75065665427b931ecc198105e0a93a8f17bbce0801966659873c1b54a3c4d5e061821880ff SHA512 4348ea62b4041beca20200b351f0f3914b99c413ba18123f70345ef007a403aadc131f15ba535b6f4efbba745e6fa5b7851d74945d09236f36d000732fd34dba
diff --git a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.1.ebuild b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.1.ebuild
index 436914177d92..d78c37e16b94 100644
--- a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.1.ebuild
+++ b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ IUSE=""
 
 RDEPEND="
 	media-libs/alsa-lib
-	xfce-base/xfce4-panel
+	xfce-base/xfce4-panel[gtk2(+)]
 	x11-libs/gtk+:2
 "
 DEPEND="${RDEPEND}
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index b8f08bca481e..600769caf737 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -2,7 +2,7 @@ DIST xfce4-cpugraph-plugin-1.0.5.tar.bz2 328972 BLAKE2B 7c39aa6fd9d0d6ecc5bedce1
 DIST xfce4-cpugraph-plugin-1.0.90.tar.bz2 386127 BLAKE2B ec1809f64fa2fc142aa6efec315e2c138b7b49261ecce4735cc0dce225c24c69013f4b2a4250dcdf1513029765d81cb757e0bb38ebb3bd024b5b07fe2e0475d0 SHA512 7f2be5b41948ba4c730e6fd58038e96044ef8d007ae55f107a434308bfffc99071706c92854e41a589a807913fb98b9b216c141fc1d37c744275d5a3944aee09
 DIST xfce4-cpugraph-plugin-1.0.91.tar.bz2 377694 BLAKE2B da75c1295dc190923e1a16c2627fcb36517b00ded3a358c198152705ac220720b97db36a9e6b43c1efee11cbd95249acec38a0aa8985ce6b7d1e3c35a6d93d26 SHA512 513fdec6ed9c00b1f979c3ca9223667d7b50ccb55e9be9506497eade4d4495547e60e53507bf114aabd23af911a477f997c6f7c2944c1761125a12227c67ccf5
 DIST xfce4-cpugraph-plugin-1.1.0.tar.bz2 391629 BLAKE2B e1a18df75461466abf908100e3ace73c46751d78527a9928a5712e3b3388cb0908b697055bd229f700f3e36e908cbc90f2732fc65568ebbe47d876aa376fd087 SHA512 c928baac776517da8929b8ce3842be7e02a2b3394b7cc848028d1720ca611e1aa4ef706bd00736fecfed0b3b2d0cce94c09b0f905a226db5e50c036dabb8df2a
-EBUILD xfce4-cpugraph-plugin-1.0.5-r1.ebuild 806 BLAKE2B c3cf088671905511198d5dd34e7c3f83c70b2331a88a62b897330c870da171b8a5985399b01b5a645609c39b6e74f3ed233d37c3795cb0939d9d5877f7c0689e SHA512 aaf788fe49a2cae0e47e6516c5da1294eee91d614a87ffc461a371f819b1f3e807c1a005c321685619600d2f958a2e4ebfb38fa88193a8e6f1c5fb6b1bddfa7b
+EBUILD xfce4-cpugraph-plugin-1.0.5-r2.ebuild 824 BLAKE2B 61d2ec39f2b087ff1adf008ebac108dae32133ef5c91c437579bc6cfc4218bcd8550b7b68ab291306a79e0a7c3120fbc45ed0b5a1d787847254ea6e79d5ba3f7 SHA512 da60d7c948ed9c23ce09660e077186b2f2b3884f3c1f06f291ca22f60e4f41db3e00c45a49d8c25192e3db5cdd38bf54c09427a86a398f5c0ba68f3cf7ab5817
 EBUILD xfce4-cpugraph-plugin-1.0.90.ebuild 807 BLAKE2B 04a3050c839756ca5e0529de2f8a90284b5cf164e2ddc6450ecd84eb21134be810288dc6db6d748299901220b152424297177c26cbd56d9d254691761a8b21f2 SHA512 818d38fd050b00a5cd406fbaca6ef77787dbb111142569c2eab598d5e5f99aac0d4b085cc2a801e526a1aabab699d985a752f71101aca2eeffee645f0c2e8786
 EBUILD xfce4-cpugraph-plugin-1.0.91.ebuild 807 BLAKE2B 04a3050c839756ca5e0529de2f8a90284b5cf164e2ddc6450ecd84eb21134be810288dc6db6d748299901220b152424297177c26cbd56d9d254691761a8b21f2 SHA512 818d38fd050b00a5cd406fbaca6ef77787dbb111142569c2eab598d5e5f99aac0d4b085cc2a801e526a1aabab699d985a752f71101aca2eeffee645f0c2e8786
 EBUILD xfce4-cpugraph-plugin-1.1.0.ebuild 807 BLAKE2B 04a3050c839756ca5e0529de2f8a90284b5cf164e2ddc6450ecd84eb21134be810288dc6db6d748299901220b152424297177c26cbd56d9d254691761a8b21f2 SHA512 818d38fd050b00a5cd406fbaca6ef77787dbb111142569c2eab598d5e5f99aac0d4b085cc2a801e526a1aabab699d985a752f71101aca2eeffee645f0c2e8786
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r1.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r1.ebuild
deleted file mode 100644
index ee9d5edde649..000000000000
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A system load plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=x11-libs/gtk+-2.12:2
-	>=xfce-base/libxfce4ui-4.8
-	>=xfce-base/xfce4-panel-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r2.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r2.ebuild
new file mode 100644
index 000000000000..a2d50c7f1a54
--- /dev/null
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="A system load plug-in for the Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=x11-libs/gtk+-2.12:2
+	>=xfce-base/libxfce4ui-4.8[gtk2(+)]
+	>=xfce-base/xfce4-panel-4.8[gtk2(+)]"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-embed-plugin/Manifest b/xfce-extra/xfce4-embed-plugin/Manifest
index 9f5b0148975e..4ada6496c587 100644
--- a/xfce-extra/xfce4-embed-plugin/Manifest
+++ b/xfce-extra/xfce4-embed-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-embed-plugin-1.6.0.tar.bz2 348026 BLAKE2B 5da2423f2717798070cd8f550db75567263c2632de7109b94899fd2a6b469ee6f92f0b38c8ef5a8833ceec2f9d8d5bb58aa54e06caf7494268175388d605d186 SHA512 0d036a5b3f8394edb9640ea891fa848416ef9f173b67ba2ccc55eb8bdab96619c355c3cdfaa3cd59d6f48e3de0a01c95682a2466452f8c01a631bd5d8196df6c
-EBUILD xfce4-embed-plugin-1.6.0-r1.ebuild 717 BLAKE2B 940a79166509b48ade72a383a1bb22c8a2a81dbeaa89992e23cee6c34d5a90b60e294b9d8224c3d084f9c7a6c857d1b85cdefc448dc073513492a7ac8e889b3e SHA512 9e65d3cceaf6ec13082b8698cb8e946a0a02512b80aa121d4938d43b16aa2ea4f933075ffa3c650833e0b0b3755c2b7f3b3d2dea8de63167c50f389f8d3472ec
+EBUILD xfce4-embed-plugin-1.6.0-r2.ebuild 735 BLAKE2B 0f7a352e056b0ffe0f642597491089bc1e06b06b684253b4fcfb625ac2d441d20d05bae32f8cc3e36204e12c2e13786fc93dd34409573dcc03abaa45a0846f9e SHA512 346fba17102a091214091cbf231ea6d88f67735ee1e13195b49ad85bd501f1e5db3c7e493d75bddb4cb6ca150a0a09a34974699cf62bdd81ee6ebd21a2580eeb
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r1.ebuild b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r1.ebuild
deleted file mode 100644
index f45d45455bff..000000000000
--- a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r1.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
-
-DESCRIPTION="A plug-in for embedding arbitrary application windows into the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.20:2
-	x11-libs/libX11:=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r2.ebuild b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..5228c9e5d641
--- /dev/null
+++ b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A plug-in for embedding arbitrary application windows into the Xfce panel"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.20:2
+	x11-libs/libX11:=
+	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/xfce4-panel-4.10:=[gtk2(+)]"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce4-equake-plugin/Manifest b/xfce-extra/xfce4-equake-plugin/Manifest
index 5834316fca4e..338b49ee11f8 100644
--- a/xfce-extra/xfce4-equake-plugin/Manifest
+++ b/xfce-extra/xfce4-equake-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-equake-plugin-1.3.8.1.tar.bz2 393086 BLAKE2B c34b68ee79cd087b9f0eb178d947c73d596a978415ecb2cef55238bdae65a4443ac83daa6b8350ab8560fa026a8e580c49bcdd4cbba682adc50e53c02ff1782b SHA512 dc9d399ea3f6dd6ee401b29a821130136c1f2ce976d2dfe6a434ec7030e999ad1c903b5c42e8bd3b25397ffb51327cfceb112b1d45193e82efd4fc4f86190890
-EBUILD xfce4-equake-plugin-1.3.8.1.ebuild 833 BLAKE2B 8530af8e25997665eccf5aba6437c53399d096ecdca422e1db00fc245436c3c77ab6a7cc82aa52883fd361bbd461214e18f78b7a7dada7214a1768b91bcf4e93 SHA512 5290e9936ede712a0e8a0f8bea605d0c7cf0e52628be89e2a8ab00031de9b125d3368594b23345b739514a4402203db538a2a7bb078639fcb7ac00fee312a1c4
+EBUILD xfce4-equake-plugin-1.3.8.1.ebuild 848 BLAKE2B edd41503efe41150f075bfad76cd594cf0f91b8aef52f43b352c6cfe8e13b883c2e4f27036b8fa38cbbd7561bfa6ac9d26b224fe0aee9cf63b42dba35a5623a7 SHA512 d97549d689f9a8e06f745a635fcc621cab1cb2d49afee5d123529e01c71a75b56d7be97f73c16f17d74f19772dca9db111e8be8a6a9c4f0f7b2d77f5a5f6e89b
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.1.ebuild b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.1.ebuild
index b6b3c192142a..8ac43429caed 100644
--- a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.1.ebuild
+++ b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.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,9 +17,9 @@ IUSE=""
 RDEPEND=">=dev-libs/glib-2:=
 	x11-libs/gtk+:2=
 	x11-libs/libX11:=
-	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:="
+	>=xfce-base/xfce4-panel-4.10:=[gtk2(+)]"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
diff --git a/xfce-extra/xfce4-eyes-plugin/Manifest b/xfce-extra/xfce4-eyes-plugin/Manifest
index ed2a15d69ce9..a165a8e5cd21 100644
--- a/xfce-extra/xfce4-eyes-plugin/Manifest
+++ b/xfce-extra/xfce4-eyes-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-eyes-plugin-4.4.5.tar.bz2 369297 BLAKE2B c1e7b9e01174e3909306abfb53c9836b2817013b6cb8676cfd7717da986b68827bd286b6319853d79143b7f0b44abec75342abb7e68df3d2fb1c7424a8f763c1 SHA512 f8ac109edbf2edb066af3f13617e2c247151c36fd91551a99b334d85f528663d3764c8566bb4a8b8ad7ae2c021d5b5c46933dc63d523566055d243b440c61e01
-EBUILD xfce4-eyes-plugin-4.4.5-r1.ebuild 744 BLAKE2B cdb56ccd306a6af7eec3e315c8f48f73a4b0b82b307d726e1b33d859ff5e197b200f510d67af4540ad3c11c9e233b1c9ffe54615de644d5276fff6b865de2a26 SHA512 ea839501b75e6b3b61ec30fce8d093d98b154237a446d7b7a42910980111d2747302c92c99c79d678cb4199b1a489f1ac751e5367c0b695f3101ec7415aae3f2
+EBUILD xfce4-eyes-plugin-4.4.5-r2.ebuild 762 BLAKE2B 33c41b8caf1c75fe1f4ae914b9b5962a717b628c58fef5d4f90eafaf63457bfbb93abc078289936f32ca60567b92454d679bf09c354030ef837748a912973cac SHA512 81c10b5f88651bdd78c3b21c270dea7b63e3501ba4759e944b70463fdc3376118366d96c625cc7e5ecccdfe6f08d1713ecc6526ea4e911a44aec87a598ee6af2
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r1.ebuild b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r1.ebuild
deleted file mode 100644
index 89502869fc95..000000000000
--- a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A panel plug-in which adds classic eyes to your every step"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.20
-	>=x11-libs/gtk+-2.14:2
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r2.ebuild b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r2.ebuild
new file mode 100644
index 000000000000..a989f20303ea
--- /dev/null
+++ b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A panel plug-in which adds classic eyes to your every step"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.20
+	>=x11-libs/gtk+-2.14:2
+	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/xfce4-panel-4.10:=[gtk2(+)]"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce4-hdaps/Manifest b/xfce-extra/xfce4-hdaps/Manifest
index 8c0818ec8e27..42f8c29b7738 100644
--- a/xfce-extra/xfce4-hdaps/Manifest
+++ b/xfce-extra/xfce4-hdaps/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-hdaps-0.0.9.tar.bz2 304851 BLAKE2B 1f1318bb27628eb1ff72a1642737271ab37e722a18a6c3c6d40c7a05f56e36813bc7a570d5bc51d169dfcc89467cb6173d61c2f0cc2c90a90a795ba63ef1e07d SHA512 7ee963dacd3e1096fb205fa78c05202925977a4fc88aaa96ba779dc08e32937602fdc83a27457386b2b89847487c5dcc75385f2763201b1613f30eee8124e740
-EBUILD xfce4-hdaps-0.0.9-r1.ebuild 1032 BLAKE2B e426c27c6e77a4fc7c9b8ba273a57f14530dec9fe9500db1c597752fd86881e1433e6e666fe7a15c993643d177ad3a8f1232037da7f174d3c458c547febd3c23 SHA512 5d3866008f82f2002f6aa1e0d770bb2e6be367b971dec4fafca97dff73ca528674b75f55d1e513bc791386b73c8cd81f10a1cfed425b9e210ac2855f15cfb085
+EBUILD xfce4-hdaps-0.0.9-r2.ebuild 1050 BLAKE2B 6c5014a88ea0745d6012d1bd873ea20353ebe7a8082ee84da3509dff78a59a247f67da0cd93bc4a9b77b94dcc8df564bc09d30db62fd8d194d8acb3819686ec8 SHA512 92a50b10c182886ed81eceeac3cfb0400eca8667c422e9a3a9e52f9dd6e07d46b41fbf44eeaf85cee75e28aed1a45cf64a2566980ac586c07bfcdbd214cb1039
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r1.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r1.ebuild
deleted file mode 100644
index 9894b32b51af..000000000000
--- a/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r1.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 gnome2-utils linux-info
-
-DESCRIPTION="A plugin to indicate the status of the IBM Hard Drive Active Protection System"
-HOMEPAGE="http://michael.orlitzky.com/code/xfce4-hdaps.php"
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	>=xfce-base/libxfce4ui-4.8
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/xfce4-panel-4.8"
-RDEPEND="${COMMON_DEPEND}
-	>=app-laptop/hdapsd-20090101
-	>=app-laptop/tp_smapi-0.39"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 28; then
-		ewarn "Unsupported kernel detected. Upgrade to 2.6.28 or above."
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r2.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r2.ebuild
new file mode 100644
index 000000000000..838a7e62f6fe
--- /dev/null
+++ b/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils linux-info
+
+DESCRIPTION="A plugin to indicate the status of the IBM Hard Drive Active Protection System"
+HOMEPAGE="http://michael.orlitzky.com/code/xfce4-hdaps.php"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEPEND=">=x11-libs/gtk+-2.20:2
+	x11-libs/libX11
+	>=xfce-base/libxfce4ui-4.8[gtk2(+)]
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/xfce4-panel-4.8[gtk2(+)]"
+RDEPEND="${COMMON_DEPEND}
+	>=app-laptop/hdapsd-20090101
+	>=app-laptop/tp_smapi-0.39"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 28; then
+		ewarn "Unsupported kernel detected. Upgrade to 2.6.28 or above."
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-kbdleds-plugin/Manifest b/xfce-extra/xfce4-kbdleds-plugin/Manifest
index 1279b62447a2..0e3da056ff5a 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/Manifest
+++ b/xfce-extra/xfce4-kbdleds-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-kbdleds-plugin-0.0.6.tar.bz2 265889 BLAKE2B 1b166dce725f92fe05273d427dd4d185e6a240c984e4e2503f092af222e7a08b8697b8031804490322bb156bc5109c82f38273278fff185a9039b26334541ef2 SHA512 2cc48ec04d24ff55900c511c1fbe3ce1f7c45e59a30098a3b8af292ff5b219e7050e81d22f449f77ac79129b63db20ea61cb49730c5092583b935190149e127f
-EBUILD xfce4-kbdleds-plugin-0.0.6-r1.ebuild 765 BLAKE2B ab2ed5964f5d27c977f77e444237dba08db5dd7d10b13ef8065f6a721df4d32ed08eed7c8d59c2ddf08f6b6ad71a6e8a7bb18f3c6ccd90ae36bfdb3fb183186c SHA512 45e6930efc8ac9302c0001a7ea393927cc6b53466e87ce1327400dedb15bfcdb9a37530f0166f49dd3765c54deb782249465537f416a20e05244c1e7b9beabfc
+EBUILD xfce4-kbdleds-plugin-0.0.6-r2.ebuild 783 BLAKE2B 335960d8acd48e9e9666022452d5001e5da9e106c44264509d84026507860c9c27430cd32661ed236f4461e490db3447d716964711e34c5a513ac40c29e42fdc SHA512 464f10313da3be56bd80cbfc171a73da36dbb928624e2af5a98f174b271d341be436aeb19013a4198d5a57e3072eb6ad7eb34e85019f5363b070bf6be00d7ae0
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r1.ebuild b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r1.ebuild
deleted file mode 100644
index 248b34a75823..000000000000
--- a/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A panel plug-in to show state of Caps, Num and Scroll Lock keys"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-kbdleds-plugin"
-SRC_URI="http://compas.com.ua/oco/file/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=xfce-base/libxfce4ui-4.8
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/xfce4-panel-4.8
-	>=x11-libs/gtk+-2.20:2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r2.ebuild b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r2.ebuild
new file mode 100644
index 000000000000..4d5722a6e549
--- /dev/null
+++ b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="A panel plug-in to show state of Caps, Num and Scroll Lock keys"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-kbdleds-plugin"
+SRC_URI="http://compas.com.ua/oco/file/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=xfce-base/libxfce4ui-4.8[gtk2(+)]
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/xfce4-panel-4.8[gtk2(+)]
+	>=x11-libs/gtk+-2.20:2"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-mailwatch-plugin/Manifest b/xfce-extra/xfce4-mailwatch-plugin/Manifest
index ed43be53ddff..4fe17a1c7269 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/Manifest
+++ b/xfce-extra/xfce4-mailwatch-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-mailwatch-plugin-1.2.0.tar.bz2 509649 BLAKE2B 7749914cf4e8ca34e27c63033e84718c4bc8d9da11ca9f6487bf9291c145f5b062d6b7b07d03d2eb273d0e88b96946641721f6f24dd19c19db9f923e9b33ff53 SHA512 6f5128b2341ab275427e02b1ef063cb2fdcf4027f5c47cfc0ed26086462eb0e9f7353441ea1b9380b91a892414934203b781445f604d67200786e3dd85183a83
-EBUILD xfce4-mailwatch-plugin-1.2.0-r2.ebuild 1058 BLAKE2B 13224d793129aeae617a288f5153604359a77df8874073a11d412ce6af58bcc78b1202058169cc07aaf4e337f76697b709417b94b62aa62cfa4e6bac9df14433 SHA512 902e98486dc1e74d9782c78292c0be299bcc0269ce4cbcf5478277b9a51e0131c72029a2e6a4a4b093bbda8025c1cc0069ae6ab7c60d87941c8f13444e8f3976
+EBUILD xfce4-mailwatch-plugin-1.2.0-r3.ebuild 1076 BLAKE2B 3081d0e48982b71c10da34b13e3516293ab7b72390839c9d42dd61bb343f33ba024ccba7b0f66ec5ec2b4e0b48a1bfd08174325b9ab64f3f183ccc8ee11c6a50 SHA512 f5e10b51dc0471559dbb3bbc3a19cbbe67978e1f437d7d4d9d2d20b5cf82c2ff1fd3aa53a83bf8969091043a30132b8d8d6964a67d856d99fda717455f883d35
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r2.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r2.ebuild
deleted file mode 100644
index f337fb97d368..000000000000
--- a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="An mail notification panel plug-in for the Xfce desktop environment"
-HOMEPAGE="http://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 ssl"
-
-RDEPEND=">=dev-libs/glib-2:=
-	>=x11-libs/gtk+-2.18:2=
-	x11-libs/libX11:=
-	<xfce-base/exo-0.12.5-r100
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10
-	ssl? (
-		dev-libs/libgcrypt:0=
-		>=net-libs/gnutls-2:=
-		)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_enable ssl) $(use_enable ipv6)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r3.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r3.ebuild
new file mode 100644
index 000000000000..35a670cfe278
--- /dev/null
+++ b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="An mail notification panel plug-in for the Xfce desktop environment"
+HOMEPAGE="http://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 ssl"
+
+RDEPEND=">=dev-libs/glib-2:=
+	>=x11-libs/gtk+-2.18:2=
+	x11-libs/libX11:=
+	<xfce-base/exo-0.12.5-r100
+	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/xfce4-panel-4.10[gtk2(+)]
+	ssl? (
+		dev-libs/libgcrypt:0=
+		>=net-libs/gnutls-2:=
+		)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf $(use_enable ssl) $(use_enable ipv6)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-notes-plugin/Manifest b/xfce-extra/xfce4-notes-plugin/Manifest
index 245f6bb440f0..88e9d4c4208c 100644
--- a/xfce-extra/xfce4-notes-plugin/Manifest
+++ b/xfce-extra/xfce4-notes-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-notes-plugin-1.8.1.tar.bz2 479652 BLAKE2B ec23b362627b8bbfdf7dae69aa3217dd902f175b1899ffa07bcbcd17a34acd68ccb5c0acab65fe88a892f5a2c4e6ca7f9f6cc5ed9526a77028679a31bded455b SHA512 3e3f2513aaa5d26880d21ba31458aa8b79c1e01cac47141513d61002df9535e52ca2c14a8da6cddd54fcab3bcda6199c636cce045cea9bd4548f5fc763e069f3
-EBUILD xfce4-notes-plugin-1.8.1-r1.ebuild 877 BLAKE2B c2ccbd48d01af9fb5a69af8c9727d880d47d20c89a9da1368ebe930341ff974b6f99551f137056821163e435d978190065665f8fe447052771dc11358420716e SHA512 2377ce8a328bebeda29d6edfdfc4b5f6f4bcddd140505929c0b81c7f975c8782c72f275c324570638d694a04f90f41bba988b6c55a620ca167fd74b31d69e631
+EBUILD xfce4-notes-plugin-1.8.1-r2.ebuild 895 BLAKE2B 498463a3688f15a35303002b8b244dc61c25ef3479fb82ffb2247c4959a848b8c70fc9c6b0fb744b11e1433196430ea3e8d552a67da6f7ff2f757c4f856fe96b SHA512 1b858f2430f3e4e08d8a514fa962c1af4fbd2fde80eba6e2408aca9462750e940f3374fbc5536fd61f6411888ccb9925c057facb937343561807a876b0d2e6a1
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r1.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r1.ebuild
deleted file mode 100644
index f3f229e31d11..000000000000
--- a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Xfce4 panel sticky notes plugin"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	>=x11-libs/gtk+-2.20:2
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.10:=
-	>=xfce-base/xfconf-4.10:=
-	dev-libs/libunique:1="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r2.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r2.ebuild
new file mode 100644
index 000000000000..716eebe8897c
--- /dev/null
+++ b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Xfce4 panel sticky notes plugin"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.24:2
+	>=x11-libs/gtk+-2.20:2
+	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/xfce4-panel-4.10:=[gtk2(+)]
+	>=xfce-base/xfconf-4.10:=
+	dev-libs/libunique:1="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-places-plugin/Manifest b/xfce-extra/xfce4-places-plugin/Manifest
index 7b08e0bc97d8..8bb6eb50744b 100644
--- a/xfce-extra/xfce4-places-plugin/Manifest
+++ b/xfce-extra/xfce4-places-plugin/Manifest
@@ -1,7 +1,7 @@
 DIST xfce4-places-plugin-1.7.0.tar.bz2 371395 BLAKE2B fe18391e0cabe06d9d63dfc86a829e35461858b5915d7331053dfabbc9bb689bba0a3cc05b7d7f6dced6e19aa6e32308ba052cca9416bbfb2f050768d3e86f5e SHA512 ae324a29584d7dc6beb4840bec7e4c5802e94c25512f449ab959c588c91f4030d895fe185dad87ab9442611e9fe01f8ccec82e8cb5153cf192d1124156be6bd3
 DIST xfce4-places-plugin-1.8.0.tar.bz2 371134 BLAKE2B 5ef5cf79ce565a827520ed281a0be2533df643137d673f12d15393efb2a0ef5db1a18fff3c5e807cdb98d29a8ab4767469fa248cbca85c5a77d9a4e66aff6b59 SHA512 9db3b311881292a9cd380d505be8cd529b51ee92c25e0bbdcbc28dc099369cd7ea078e7c729856d9718967de8f8e2f08db045efb00a4be097d4ebf766da51263
 DIST xfce4-places-plugin-1.8.1.tar.bz2 380906 BLAKE2B 3b5c82fe3fb9fbcc0b9aa79df62da06025f5dd154d4323787d52cbf659351dcc808a4c6e8d4148332eb31a8d292b51d58dba6c81fdf49443b94928a1e82f66f0 SHA512 c0db29050df6ff2862a6ebc6f89d92e39f0c0511f9e719a979b5132935655078a5f5418b8b87bee2fbccaa37f5489d503dc1ae329eb7fd88970dc55b31db3324
-EBUILD xfce4-places-plugin-1.7.0-r1.ebuild 1007 BLAKE2B 0dc4c51423db401e3732366c79e0584cbc0a5a4ab27da18438e8493a9f36f8e24eb355e6078d419ed2b47c2bea402a18590b8a59cccf6c08ab3a806e305718c9 SHA512 8841e61c74f09ca130833378d6eb32c3e7e95b3d5f1aaa4e5fd8f26aa685459d2fb506c44eeaffa63b16677d8490e373ba0a45adac31840273622d1d1e1ee52e
+EBUILD xfce4-places-plugin-1.7.0-r2.ebuild 1034 BLAKE2B 08245960ed7161ba56eb760ae4a94ee8c84488aad3d1a9a3c4a6132a7b6aa305fbfa2ab54c77d24d3cd5a88fb1422eb7311d88c694bf1161e727eca9c3121b59 SHA512 6cada22f2e96a6d7f76097d85a7d0b08a27a735f1bc8b2ed063fa683f19536f5467142e3eefa7aa21db69a696cc38f95a4fd8b83feb97ead4507d181d41e4bf3
 EBUILD xfce4-places-plugin-1.8.0.ebuild 1013 BLAKE2B 9d475e78465d49b0a942034216d011fb60214165ade3ca574d91409f39181852bd6f6b6f4ab7e409a13ee79a5f66f897a119941051c2d81abad698465ba0e1d9 SHA512 4478543b4655ee38fbe7fb6958befbb6b01a5705a36b95f0b156acedf2362fc4e926b2aa339d1833163ad6424290e7ee0d3f7a946389fe522957f478dc3fec2a
 EBUILD xfce4-places-plugin-1.8.1.ebuild 1014 BLAKE2B e212da528857947ec61c07e31c2bb8ecd98fadadfb7d503884710cee017b57e903e50a32ff7184596510d5d91812df0ace6f43c4d7f545053d53c4f9d15d2efd SHA512 ccfcc3ed97a07c7e78935e11825d66a280b92ec1aa797fed33c1bc4908dacca06634c3a4d67983b1bbfb154b55ef6d6924d5a4d3b725b97ddb4a6b4b725e9d42
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0-r1.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0-r1.ebuild
deleted file mode 100644
index b4a80f3dddb6..000000000000
--- a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A panel plug-in to provide quick access to files, folders and removable media"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="libnotify"
-
-RDEPEND=">=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11:=
-	>=xfce-base/exo-0.6:=
-	>=xfce-base/libxfce4ui-4.8:=
-	>=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/xfce4-panel-4.8:=
-	>=xfce-base/xfconf-4.8:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0-r2.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0-r2.ebuild
new file mode 100644
index 000000000000..1b1a4a0bca9f
--- /dev/null
+++ b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A panel plug-in to provide quick access to files, folders and removable media"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="libnotify"
+
+RDEPEND=">=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-2.20:2
+	x11-libs/libX11:=
+	>=xfce-base/exo-0.6:=[gtk2(+)]
+	>=xfce-base/libxfce4ui-4.8:=[gtk2(+)]
+	>=xfce-base/libxfce4util-4.8:=
+	>=xfce-base/xfce4-panel-4.8:=[gtk2(+)]
+	>=xfce-base/xfconf-4.8:=
+	libnotify? ( >=x11-libs/libnotify-0.7:= )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable libnotify notifications)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index 4d842a33a21f..d045ce1da71d 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-screenshooter-1.9.5.tar.bz2 502423 BLAKE2B b71dd5d016ff86ea5b654264dca129fd1b9316a0d0f2926a40556448c11a51992e4921c3ff9da952ac5e2962cf5baa18df8a110127cb68e89ee1b1cb2252bb7a SHA512 e5797a6defa4df94c552e8ff39b21f4203b6795669e8145ea5ef609fc7b29bcfa846b19b253b39b12ab0e6c130c7f9e67dd5aa628cefe9b063fb9f74dd2c3ee1
+DIST xfce4-screenshooter-1.9.6.tar.bz2 529233 BLAKE2B db314b3b451c3f560d8068932b21049f3e9587f8e329b1efb08e25227ab812c15b76a9d9a5bd3ffa1b4663ec81508f6cda2b6d31054b72d7487a111477962a62 SHA512 17d4afb346f09f97225c0fe65ed2389733e98d58729f15f7ec2b601682d7e15a6d9c67b85840593c17298fc32c250d8eb2e8d349ccd355507f4c18b5e312ae35
 EBUILD xfce4-screenshooter-1.9.5.ebuild 1128 BLAKE2B 4d4cdde478b6ea85895f812fcd154129da92cd4c4ea09d2a9a285e1c74c8cb742b717cd10b47658d32563696e45337aed0c0b28ece9422a9a7140632e99fa43d SHA512 74aa0ba4beec8257c7648fb6f6fe25773710db8b0b8427d6684157b03d1ff411a43fa5dc8947a2bc9943fd560d9ec4e64d2925ba6dbf78dc23267aedce5e18b4
+EBUILD xfce4-screenshooter-1.9.6.ebuild 1133 BLAKE2B d7c3b4cfbfb479f5043ebbc6cb90a722a7ef1ed78c16dd4a5cccbf1ee586fe9efdd6348ab6d0fd5915c60642a5faa41de0898ceee7d882293dc1824716d57d71 SHA512 3a48b4f99292613917f470ced2355d64fb08f606acfcc3aa5b311b8b89925d48685b4d2755758f8b50620d96c0376ed4cb7afd0141bb796c243b7179429d6a02
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.6.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.6.ebuild
new file mode 100644
index 000000000000..b65fb42de209
--- /dev/null
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="Xfce4 screenshooter application and panel plugin"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-screenshooter"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.16:=
+	>=net-libs/libsoup-2.26:=
+	>=x11-libs/gdk-pixbuf-2.16:=
+	>=x11-libs/gtk+-3.20:3=
+	dev-libs/libxml2:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=xfce-base/exo-0.11:=
+	>=xfce-base/xfce4-panel-4.12:=
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/libxfce4ui-4.12:="
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-apps/help2man
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		--enable-xfixes
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-time-out-plugin/Manifest b/xfce-extra/xfce4-time-out-plugin/Manifest
index d670e561d2ee..330eda57193c 100644
--- a/xfce-extra/xfce4-time-out-plugin/Manifest
+++ b/xfce-extra/xfce4-time-out-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-time-out-plugin-1.0.2.tar.bz2 337382 BLAKE2B e98102dcb2531ee42950022e484ed57b307ebf9b4ea7adbff3508e75465b9ade24f90e9c800ff0daa8b0da59ffe84aac9fe802267327e9d361de4359b0b95eef SHA512 3f49664fc8fd947627e40de0338e3a115806045c97fa08fd678fdbb831947bcfe14c02e9961d671ce7546d4913fd9319322476df590a70458bdf86fa3bd43464
 DIST xfce4-time-out-plugin-1.0.3.tar.bz2 362390 BLAKE2B db7ba33a1d30dca7361d6ab6be5559786891273a36e00a028a0e27084d3fb4760af18f5cecc5c2edfd9a76640130ba4a4412d2228b26154f8b85173df360fa38 SHA512 c2080abef330e9f783b3e9c008a76d11bdbdfe1a666435237b6b06a50e93191a760441a9d343f24234eb4343b550009ed9e2101dbffbec3d8f53c562d4bb3cfc
-EBUILD xfce4-time-out-plugin-1.0.2-r1.ebuild 838 BLAKE2B 92535906828223a83557e01aa9e1eac27c9de35966fb5dc69f1faef7f6b5141f6765aa19f3420d16b3fa7b52b81ae17190d3b17414f02026aa91b6b084a7446b SHA512 7a8e4da6587c3a1b72799f6c0c318fc7d12350b85795043a7c3869c8d5a731137eb1a07fd3cd24535570d6ed4f68482eecb207740ad881153082ebe4d10b1b19
-EBUILD xfce4-time-out-plugin-1.0.3.ebuild 841 BLAKE2B db41110337754b3f6c61dbb53ab8d858df6f8f66706ed6f0035d72aff258e206f1bfbaeac3f98f745fd8dbb476f762445c4f2450caa5a356fb5c1106a07b6113 SHA512 d2decaa6d47c22326964f91036a2f16f62ee23f0cbcfea48c8986cae5793e8966a0e7912d73cfb7d8d080baf6c4f9f1a44e574ac95532aa1ba5300b2985d873b
+EBUILD xfce4-time-out-plugin-1.0.2-r1.ebuild 856 BLAKE2B 0874c659efc36ae15e5cc91d379d96404381b9a61b6b8d136bd22373ab33fe3df7096b1760eb8ee80e29208a06296a6c9eb9395c90927bc9c8a43393b880a9db SHA512 2597831ac7e5be80861e3a66cda99714441aec93ef0f3713320f718a86e841e7fd14cb7e4fe034b35cf69d553d84e759383b3d7be3ffa17fbc464a25a47ea69b
+EBUILD xfce4-time-out-plugin-1.0.3-r1.ebuild 859 BLAKE2B faffe18321aeca642a0a218e4af9d1b62be63494cb33d90a1e973182b648fcb5099c0b4bf2b4475c72490342ba4f628181ad6e511bbd5efca2375e9572a54bcb SHA512 bb495349b738333f37283ff5f8e9300cb846584ac8df834235ce667e7ee7e1923ae252f27fe80adc4ce5a2039dff3d63c3a58039b6eba4ed3b990b3180009d8d
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2-r1.ebuild b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2-r1.ebuild
index e1f126597899..8bb1c7efcec9 100644
--- a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2-r1.ebuild
+++ b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2-r1.ebuild
@@ -16,9 +16,9 @@ IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
 	x11-libs/libX11:=
-	>=xfce-base/libxfce4ui-4.8:=
+	>=xfce-base/libxfce4ui-4.8:=[gtk2(+)]
 	>=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/xfce4-panel-4.8:="
+	>=xfce-base/xfce4-panel-4.8:=[gtk2(+)]"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig"
diff --git a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.3-r1.ebuild b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..2b0e088a4f61
--- /dev/null
+++ b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A panel plug-in to take periodical breaks from the computer"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libX11
+	>=xfce-base/libxfce4ui-4.8:=[gtk2(+)]
+	>=xfce-base/libxfce4util-4.8:=
+	>=xfce-base/xfce4-panel-4.8:=[gtk2(+)]"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.3.ebuild b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.3.ebuild
deleted file mode 100644
index 0c73355d2e57..000000000000
--- a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A panel plug-in to take periodical breaks from the computer"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libX11
-	>=xfce-base/libxfce4ui-4.8:=
-	>=xfce-base/libxfce4util-4.8:=
-	>=xfce-base/xfce4-panel-4.8:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-windowck-plugin/Manifest b/xfce-extra/xfce4-windowck-plugin/Manifest
index a51a63b66303..e39ce2322833 100644
--- a/xfce-extra/xfce4-windowck-plugin/Manifest
+++ b/xfce-extra/xfce4-windowck-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-windowck-plugin-0.4.6.tar.gz 67622 BLAKE2B 38a1ff76a75b3eb833be586bf93bc9bd73b7237e74cf06fd7540fef85befa4ef9ad8c8351d1d2bfad4af1f342c59b1cb0ebb94e50a3f5cc9c38c5fe9f0377d86 SHA512 a02f6f1b275484dc7ed08f3f9868af7a456c9f3b52bb893c2ac109a0ca8c4376e9d6d714f40d40c491531584486c8be3bebf3669f3186a143f6fcfe923b9f376
-EBUILD xfce4-windowck-plugin-0.4.6.ebuild 1204 BLAKE2B feb6fcb3abb1a89879b5dc8550674845abd8475a39aac69d2b49c4d039099defa46ebd36abb8a7da752ecb61e8a08787a9f15728e9252a1370e4436b42ea0592 SHA512 db0da5d18679ffbf964ceeac728d26cf0e35b669c127458c7de8af5eb1875ff70d27c5225c620541bf6c8ca54b985188d5a569cc39606de72b1b56512761c11f
+EBUILD xfce4-windowck-plugin-0.4.6-r1.ebuild 1222 BLAKE2B 9c6f0e76bf4ebc0d971a6c7cdc6e4d2c7302b8c099828ea35601f7257a7acda550f1aa99ff734fb04a14b7742cbb51129075df3b1d5c22606e77b1517e2423c8 SHA512 07c93cbb9f2ce46c97073c7c9817815fd8949fdcfedf10399c10088eaf26d7c2118d210ed5d8b1619e2bf71d61a83a56fd972afa6723a4f8fb31214b4d2c086b
 MISC metadata.xml 344 BLAKE2B da3508bca7f277819a0903ab1680228f3f9142917f12ddef21086d5a41460b2da0ee494d012fe56414d957c0ccc0c08e323ad7da5009b37a1ebceedcb0b5656e SHA512 4b9ae50a2d6e8b5f3b1e35330c22e4ae5173ca6c5fab8e5d9182a7ca0de8fba3ee8c07c90933b28f4823063009b584e30c471bbbf88113c7cd13a44275aade20
diff --git a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6-r1.ebuild b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6-r1.ebuild
new file mode 100644
index 000000000000..ec4c80869267
--- /dev/null
+++ b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit autotools python-any-r1 xdg-utils
+
+DESCRIPTION="Xfce plugin puts the maximized window title and windows buttons on the panel"
+HOMEPAGE="https://github.com/cedl38/xfce4-windowck-plugin"
+SRC_URI="https://github.com/cedl38/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.20:2
+	x11-libs/libX11
+	>=x11-libs/libwnck-2.30:1
+	>=xfce-base/libxfce4ui-4.10:=[gtk2(+)]
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/xfce4-panel-4.12:=[gtk2(+)]
+	>=xfce-base/xfconf-4.10:="
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/intltool
+	dev-util/xfce4-dev-tools
+	media-gfx/imagemagick[png]
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# run xdt-autogen from xfce4-dev-tools added as dependency by EAUTORECONF=1 to
+	# rename configure.ac.in to configure.ac while grabbing $LINGUAS and $REVISION values
+	NOCONFIGURE=1 xdt-autogen || die
+
+	default
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6.ebuild b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6.ebuild
deleted file mode 100644
index 1731f9cec343..000000000000
--- a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit autotools python-any-r1 xdg-utils
-
-DESCRIPTION="Xfce plugin puts the maximized window title and windows buttons on the panel"
-HOMEPAGE="https://github.com/cedl38/xfce4-windowck-plugin"
-SRC_URI="https://github.com/cedl38/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	>=x11-libs/libwnck-2.30:1
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/xfconf-4.10:="
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/intltool
-	dev-util/xfce4-dev-tools
-	media-gfx/imagemagick[png]
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# run xdt-autogen from xfce4-dev-tools added as dependency by EAUTORECONF=1 to
-	# rename configure.ac.in to configure.ac while grabbing $LINGUAS and $REVISION values
-	NOCONFIGURE=1 xdt-autogen || die
-
-	default
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}